openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stev...@apache.org
Subject svn commit: r1441343 [24/35] - in /openoffice/branches/ia2: ./ ext_libraries/apr-util/ ext_libraries/apr/ ext_sources/ extras/l10n/source/ast/ extras/l10n/source/da/ extras/l10n/source/eu/ extras/l10n/source/gd/ extras/l10n/source/ko/ extras/l10n/sourc...
Date Fri, 01 Feb 2013 08:46:35 GMT
Modified: openoffice/branches/ia2/main/scripting/examples/java/build.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/scripting/examples/java/build.xml?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/scripting/examples/java/build.xml (original)
+++ openoffice/branches/ia2/main/scripting/examples/java/build.xml Fri Feb  1 08:46:00 2013
@@ -42,7 +42,7 @@
     <mkdir dir="${outdir}/HelloWorld"/>
 
     <javac srcdir="HelloWorld" destdir="${outdir}/HelloWorld"
-           includes="**/*.java" classpathref="idlclasspath"
+           includes="**/*.java" classpathref="idlclasspath" includeantruntime="false"
            debug="${debug}" optimize="${optimize}" deprecation="on"/>
 
     <copy file="HelloWorld/HelloWorld.java" todir="${outdir}/HelloWorld"/>
@@ -64,7 +64,7 @@
     <mkdir dir="${outdir}/Highlight"/>
 
     <javac srcdir="Highlight" destdir="${outdir}/Highlight"
-           includes="**/*.java" classpathref="idlclasspath"
+           includes="**/*.java" classpathref="idlclasspath" includeantruntime="false"
            debug="${debug}" optimize="${optimize}" deprecation="on"/>
 
     <copy file="Highlight/HighlightText.java" todir="${outdir}/Highlight"/>
@@ -86,7 +86,7 @@
     <mkdir dir="${outdir}/MemoryUsage"/>
 
     <javac srcdir="MemoryUsage" destdir="${outdir}/MemoryUsage"
-           includes="**/*.java" classpathref="idlclasspath"
+           includes="**/*.java" classpathref="idlclasspath" includeantruntime="false"
            debug="${debug}" optimize="${optimize}" deprecation="on"/>
 
     <copy file="MemoryUsage/MemoryUsage.java" todir="${outdir}/MemoryUsage"/>

Modified: openoffice/branches/ia2/main/scripting/java/build.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/scripting/java/build.xml?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/scripting/java/build.xml (original)
+++ openoffice/branches/ia2/main/scripting/java/build.xml Fri Feb  1 08:46:00 2013
@@ -102,7 +102,7 @@
   <!-- ======================== Compile Classes ========================== -->
   <target name="compile" depends="prepare, eval_environment">
     <javac srcdir="com" destdir="${jardir}"
-         includes="**/*.java" classpathref="idlclasspath"
+         includes="**/*.java" classpathref="idlclasspath" includeantruntime="false"
          debug="${debug}" optimize="${optimize}" deprecation="off">
       <exclude name="**/provider/javascript/*.java" unless="with_rhino" />
       <exclude name="**/provider/beanshell/*.java" unless="with_beanshell" />
@@ -110,7 +110,7 @@
     </javac>
     <javac srcdir="Framework/" destdir="${jardir}"
          includes="**/*.java" classpathref="idlclasspath" debug="${debug}" 
-         optimize="${optimize}" deprecation="off">
+         optimize="${optimize}" deprecation="off" includeantruntime="false">
      <compilerarg value="-Xbootclasspath:${toString:my.bootstrap.classpath}"/>
     </javac>
   </target>

Modified: openoffice/branches/ia2/main/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java (original)
+++ openoffice/branches/ia2/main/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java Fri Feb  1 08:46:00 2013
@@ -240,8 +240,7 @@ public class ParcelContainer implements 
      * @param   language language for which entries are stored
      * @param   loadParcels set to <tt>true</tt> if parcels are to be loaded
      *          on construction.
-     * @return    name of <tt>ParcelContainer</tt>
-     * @throws    IllegalArgumentException
+     * @throws    com.sun.star.lang.IllegalArgumentException
      * @throws    WrappedTargetException
      */    
     public ParcelContainer( XComponentContext xCtx, String containerUrl, String language, boolean loadParcels ) throws com.sun.star.lang.IllegalArgumentException, com.sun.star.lang.WrappedTargetException

Modified: openoffice/branches/ia2/main/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java (original)
+++ openoffice/branches/ia2/main/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java Fri Feb  1 08:46:00 2013
@@ -240,4 +240,4 @@ class GlyphGutter extends JComponent {
         g.setColor(Color.black);
         g.drawPolygon(arrow);
     }
-};
+}

Modified: openoffice/branches/ia2/main/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java (original)
+++ openoffice/branches/ia2/main/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java Fri Feb  1 08:46:00 2013
@@ -189,9 +189,8 @@ public class ScriptEditorForBeanShell
      *  If an editor window is already open for that data it will be
      *  moved to the front.
      *
-     * @param  metadata    The metadata describing the script
      * @param  context     The context in which to execute the script
-     *
+     * @param  entry       The metadata describing the script
      */
     public void edit(final XScriptContext context, ScriptMetaData entry) {
         if (entry != null ) {

Modified: openoffice/branches/ia2/main/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java (original)
+++ openoffice/branches/ia2/main/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java Fri Feb  1 08:46:00 2013
@@ -165,7 +165,7 @@ class ScriptImpl implements XScript
          *  Invoke
          *
          *
-         * @param aParams           All parameters; pure, out params are undefined in
+         * @param params            All parameters; pure, out params are undefined in
          *                      sequence, i.e., the value has to be ignored by the callee
          * @param aOutParamIndex    Out indices
          * @param aOutParam         Out parameters
@@ -173,7 +173,7 @@ class ScriptImpl implements XScript
          * @throws IllegalArgumentException If there is no matching script name
          * @throws CannotConvertException   If args do not match or cannot be converted
          *                              the those of the invokee
-         * @throws InvocationTargetException If the running script throws an exception
+         * @throws com.sun.star.reflection.InvocationTargetException If the running script throws an exception
          *              this information is captured and rethrown as this exception type.
          */
 

Modified: openoffice/branches/ia2/main/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java (original)
+++ openoffice/branches/ia2/main/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java Fri Feb  1 08:46:00 2013
@@ -172,9 +172,8 @@ public class ScriptEditorForJavaScript i
      *  If an editor window is already open for that data it will be
      *  moved to the front.
      *
-     * @param  metadata    The metadata describing the script
      * @param  context     The context in which to execute the script
-     *
+     * @param  entry       The metadata describing the script
      */
     public void edit(final XScriptContext context, ScriptMetaData entry)
     {

Modified: openoffice/branches/ia2/main/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java (original)
+++ openoffice/branches/ia2/main/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java Fri Feb  1 08:46:00 2013
@@ -154,7 +154,7 @@ class ScriptImpl implements XScript
          *
          *
          *
-         * @param aParams           All parameters; pure, out params are
+         * @param params            All parameters; pure, out params are
          *                          undefined in sequence, i.e., the value
          *                          has to be ignored by the callee
          *

Modified: openoffice/branches/ia2/main/scripting/source/pyprov/mailmerge.py
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/scripting/source/pyprov/mailmerge.py?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/scripting/source/pyprov/mailmerge.py (original)
+++ openoffice/branches/ia2/main/scripting/source/pyprov/mailmerge.py Fri Feb  1 08:46:00 2013
@@ -66,6 +66,7 @@ from socket import _GLOBAL_DEFAULT_TIMEO
 import sys, smtplib, imaplib, poplib
 
 dbg = False
+out = sys.stderr
 
 class PyMailSMTPService(unohelper.Base, XSmtpService):
     def __init__( self, ctx ):
@@ -76,39 +77,39 @@ class PyMailSMTPService(unohelper.Base, 
         self.connectioncontext = None
         self.notify = EventObject(self)
         if dbg:
-            print >> sys.stderr, "PyMailSMPTService init"
+            out.write("PyMailSMPTService init\n")
     def addConnectionListener(self, xListener):
         if dbg:
-            print >> sys.stderr, "PyMailSMPTService addConnectionListener"
+            out.write("PyMailSMPTService addConnectionListener\n")
         self.listeners.append(xListener)
     def removeConnectionListener(self, xListener):
         if dbg:
-            print >> sys.stderr, "PyMailSMPTService removeConnectionListener"
+            out.write("PyMailSMPTService removeConnectionListener\n")
         self.listeners.remove(xListener)
     def getSupportedConnectionTypes(self):
         if dbg:
-            print >> sys.stderr, "PyMailSMPTService getSupportedConnectionTypes"
+            out.write("PyMailSMPTService getSupportedConnectionTypes\n")
         return self.supportedtypes
     def connect(self, xConnectionContext, xAuthenticator):
         self.connectioncontext = xConnectionContext
         if dbg:
-            print >> sys.stderr, "PyMailSMPTService connect"
+            out.write("PyMailSMPTService connect\n")
 
         server = xConnectionContext.getValueByName("ServerName")
         if dbg:
-            print >> sys.stderr, "ServerName: %s" % server
+            out.write("ServerName: %s\n" % server)
 
         port = xConnectionContext.getValueByName("Port")
         if dbg:
-            print >> sys.stderr, "Port: %d" % port
+            out.write("Port: %d\n" % port)
 
         tout = xConnectionContext.getValueByName("Timeout")
         if dbg:
-            print >> sys.stderr, isinstance(tout,int)
+            out.write("Timeout is instance of int? %s\n" % isinstance(tout,int))
         if not isinstance(tout,int):
             tout = _GLOBAL_DEFAULT_TIMEOUT
         if dbg:
-            print >> sys.stderr, "Timeout: %s" % str(tout)
+            out.write("Timeout: %s\n" % str(tout))
 
         self.server = smtplib.SMTP(server, port,timeout=tout)
         if dbg:
@@ -116,7 +117,7 @@ class PyMailSMTPService(unohelper.Base, 
 
         connectiontype = xConnectionContext.getValueByName("ConnectionType")
         if dbg:
-            print >> sys.stderr, "ConnectionType: %s" % connectiontype
+            out.write("ConnectionType: %s\n" % str(connectiontype))
 
         if connectiontype.upper() == 'SSL':
             self.server.ehlo()
@@ -127,14 +128,14 @@ class PyMailSMTPService(unohelper.Base, 
         password = xAuthenticator.getPassword().encode('ascii')
         if user != '':
             if dbg:
-                print >> sys.stderr, 'Logging in, username of', user
+                out.write('Logging in, username of %s\n' % user)
             self.server.login(user, password)
 
         for listener in self.listeners:
             listener.connected(self.notify)
     def disconnect(self):
         if dbg:
-            print >> sys.stderr, "PyMailSMPTService disconnect"
+            out.write("PyMailSMPTService disconnect\n")
         if self.server:
             self.server.quit()
             self.server = None
@@ -142,17 +143,17 @@ class PyMailSMTPService(unohelper.Base, 
             listener.disconnected(self.notify)
     def isConnected(self):
         if dbg:
-            print >> sys.stderr, "PyMailSMPTService isConnected"
+            out.write("PyMailSMPTService isConnected\n")
         return self.server != None
     def getCurrentConnectionContext(self):
         if dbg:
-            print >> sys.stderr, "PyMailSMPTService getCurrentConnectionContext"
+            out.write("PyMailSMPTService getCurrentConnectionContext\n")
         return self.connectioncontext
     def sendMailMessage(self, xMailMessage):
         COMMASPACE = ', '
 
         if dbg:
-            print >> sys.stderr, "PyMailSMPTService sendMailMessage"
+            out.write("PyMailSMPTService sendMailMessage\n")
         recipients = xMailMessage.getRecipients()
         sendermail = xMailMessage.SenderAddress
         sendername = xMailMessage.SenderName
@@ -160,10 +161,10 @@ class PyMailSMTPService(unohelper.Base, 
         ccrecipients = xMailMessage.getCcRecipients()
         bccrecipients = xMailMessage.getBccRecipients()
         if dbg:
-            print >> sys.stderr, "PyMailSMPTService subject", subject
-            print >> sys.stderr, "PyMailSMPTService from", sendername.encode('utf-8')
-            print >> sys.stderr, "PyMailSMTPService from", sendermail
-            print >> sys.stderr, "PyMailSMPTService send to", recipients
+            out.write("PyMailSMPTService subject %s\n" % subject)
+            out.write("PyMailSMPTService from %s\n" % sendername.encode('utf-8'))
+            out.write("PyMailSMTPService from %s\n" % sendermail)
+            out.write("PyMailSMPTService send to %s\n" % str(recipients))
 
         attachments = xMailMessage.getAttachments()
 
@@ -172,13 +173,13 @@ class PyMailSMTPService(unohelper.Base, 
         content = xMailMessage.Body
         flavors = content.getTransferDataFlavors()
         if dbg:
-            print >> sys.stderr, "PyMailSMPTService flavors len", len(flavors)
+            out.write("PyMailSMPTService flavors len %d\n" % len(flavors))
 
         #Use first flavor that's sane for an email body
         for flavor in flavors:
             if flavor.MimeType.find('text/html') != -1 or flavor.MimeType.find('text/plain') != -1:
                 if dbg:
-                    print >> sys.stderr, "PyMailSMPTService mimetype is", flavor.MimeType
+                    out.write("PyMailSMPTService mimetype is %s\n" % flavor.MimeType)
                 textbody = content.getTransferData(flavor)
                 try:
                     textbody = textbody.value
@@ -258,10 +259,10 @@ class PyMailSMTPService(unohelper.Base, 
         if len(bccrecipients):
             for key in bccrecipients:
                 uniquer[key] = True
-        truerecipients = uniquer.keys()
+        truerecipients = list(uniquer.keys())
 
         if dbg:
-            print >> sys.stderr, "PyMailSMPTService recipients are", truerecipients
+            out.write("PyMailSMPTService recipients are %s\n" % str(truerecipients))
 
         self.server.sendmail(sendermail, truerecipients, msg.as_string())
 
@@ -274,52 +275,52 @@ class PyMailIMAPService(unohelper.Base, 
         self.connectioncontext = None
         self.notify = EventObject(self)
         if dbg:
-            print >> sys.stderr, "PyMailIMAPService init"
+            out.write("PyMailIMAPService init\n")
     def addConnectionListener(self, xListener):
         if dbg:
-            print >> sys.stderr, "PyMailIMAPService addConnectionListener"
+            out.write("PyMailIMAPService addConnectionListener\n")
         self.listeners.append(xListener)
     def removeConnectionListener(self, xListener):
         if dbg:
-            print >> sys.stderr, "PyMailIMAPService removeConnectionListener"
+            out.write("PyMailIMAPService removeConnectionListener\n")
         self.listeners.remove(xListener)
     def getSupportedConnectionTypes(self):
         if dbg:
-            print >> sys.stderr, "PyMailIMAPService getSupportedConnectionTypes"
+            out.write("PyMailIMAPService getSupportedConnectionTypes\n")
         return self.supportedtypes
     def connect(self, xConnectionContext, xAuthenticator):
         if dbg:
-            print >> sys.stderr, "PyMailIMAPService connect"
+            out.write("PyMailIMAPService connect\n")
 
         self.connectioncontext = xConnectionContext
         server = xConnectionContext.getValueByName("ServerName")
         if dbg:
-            print >> sys.stderr, server
+            out.write("Server: %s\n" % server)
         port = xConnectionContext.getValueByName("Port")
         if dbg:
-            print >> sys.stderr, port
+            out.write("Port: %d\n" % port)
         connectiontype = xConnectionContext.getValueByName("ConnectionType")
         if dbg:
-            print >> sys.stderr, connectiontype
-        print >> sys.stderr, "BEFORE"
+            out.write("Connection type: %s\n" % connectiontype)
+        out.write("BEFORE\n")
         if connectiontype.upper() == 'SSL':
             self.server = imaplib.IMAP4_SSL(server, port)
         else:
             self.server = imaplib.IMAP4(server, port)
-        print >> sys.stderr, "AFTER"
+        out.write("AFTER\n")
 
         user = xAuthenticator.getUserName().encode('ascii')
         password = xAuthenticator.getPassword().encode('ascii')
         if user != '':
             if dbg:
-                print >> sys.stderr, 'Logging in, username of', user
+                out.write('Logging in, username of %s\n' % user)
             self.server.login(user, password)
 
         for listener in self.listeners:
             listener.connected(self.notify)
     def disconnect(self):
         if dbg:
-            print >> sys.stderr, "PyMailIMAPService disconnect"
+            out.write("PyMailIMAPService disconnect\n")
         if self.server:
             self.server.logout()
             self.server = None
@@ -327,11 +328,11 @@ class PyMailIMAPService(unohelper.Base, 
             listener.disconnected(self.notify)
     def isConnected(self):
         if dbg:
-            print >> sys.stderr, "PyMailIMAPService isConnected"
+            out.write("PyMailIMAPService isConnected\n")
         return self.server != None
     def getCurrentConnectionContext(self):
         if dbg:
-            print >> sys.stderr, "PyMailIMAPService getCurrentConnectionContext"
+            out.write("PyMailIMAPService getCurrentConnectionContext\n")
         return self.connectioncontext
 
 class PyMailPOP3Service(unohelper.Base, XMailService):
@@ -343,51 +344,51 @@ class PyMailPOP3Service(unohelper.Base, 
         self.connectioncontext = None
         self.notify = EventObject(self)
         if dbg:
-            print >> sys.stderr, "PyMailPOP3Service init"
+            out.write("PyMailPOP3Service init\n")
     def addConnectionListener(self, xListener):
         if dbg:
-            print >> sys.stderr, "PyMailPOP3Service addConnectionListener"
+            out.write("PyMailPOP3Service addConnectionListener\n")
         self.listeners.append(xListener)
     def removeConnectionListener(self, xListener):
         if dbg:
-            print >> sys.stderr, "PyMailPOP3Service removeConnectionListener"
+            out.write("PyMailPOP3Service removeConnectionListener\n")
         self.listeners.remove(xListener)
     def getSupportedConnectionTypes(self):
         if dbg:
-            print >> sys.stderr, "PyMailPOP3Service getSupportedConnectionTypes"
+            out.write("PyMailPOP3Service getSupportedConnectionTypes\n")
         return self.supportedtypes
     def connect(self, xConnectionContext, xAuthenticator):
         if dbg:
-            print >> sys.stderr, "PyMailPOP3Service connect"
+            out.write("PyMailPOP3Service connect\n")
 
         self.connectioncontext = xConnectionContext
         server = xConnectionContext.getValueByName("ServerName")
         if dbg:
-            print >> sys.stderr, server
+            out.write("Server: %s\n" % server)
         port = xConnectionContext.getValueByName("Port")
         if dbg:
-            print >> sys.stderr, port
+            out.write("Port: %s\n" % port)
         connectiontype = xConnectionContext.getValueByName("ConnectionType")
         if dbg:
-            print >> sys.stderr, connectiontype
-        print >> sys.stderr, "BEFORE"
+            out.write("Connection type: %s\n" % str(connectiontype))
+        out.write("BEFORE\n")
         if connectiontype.upper() == 'SSL':
             self.server = poplib.POP3_SSL(server, port)
         else:
             tout = xConnectionContext.getValueByName("Timeout")
             if dbg:
-                print >> sys.stderr, isinstance(tout,int)
+                out.write("Timeout is instance of int? %s\n" % isinstance(tout,int))
             if not isinstance(tout,int):
                 tout = _GLOBAL_DEFAULT_TIMEOUT
             if dbg:
-                print >> sys.stderr, "Timeout: %s" % str(tout)
+                out.write("Timeout: %s\n" % str(tout))
             self.server = poplib.POP3(server, port, timeout=tout)
-        print >> sys.stderr, "AFTER"
+        out.write("AFTER\n")
 
         user = xAuthenticator.getUserName().encode('ascii')
         password = xAuthenticator.getPassword().encode('ascii')
         if dbg:
-            print >> sys.stderr, 'Logging in, username of', user
+            out.write('Logging in, username of %s\n' % user)
         self.server.user(user)
         self.server.pass_(password)
 
@@ -395,7 +396,7 @@ class PyMailPOP3Service(unohelper.Base, 
             listener.connected(self.notify)
     def disconnect(self):
         if dbg:
-            print >> sys.stderr, "PyMailPOP3Service disconnect"
+            out.write("PyMailPOP3Service disconnect\n")
         if self.server:
             self.server.quit()
             self.server = None
@@ -403,21 +404,21 @@ class PyMailPOP3Service(unohelper.Base, 
             listener.disconnected(self.notify)
     def isConnected(self):
         if dbg:
-            print >> sys.stderr, "PyMailPOP3Service isConnected"
+            out.write("PyMailPOP3Service isConnected\n")
         return self.server != None
     def getCurrentConnectionContext(self):
         if dbg:
-            print >> sys.stderr, "PyMailPOP3Service getCurrentConnectionContext"
+            out.write("PyMailPOP3Service getCurrentConnectionContext\n")
         return self.connectioncontext
 
 class PyMailServiceProvider(unohelper.Base, XMailServiceProvider):
     def __init__( self, ctx ):
         if dbg:
-            print >> sys.stderr, "PyMailServiceProvider init"
+            out.write("PyMailServiceProvider init\n")
         self.ctx = ctx
     def create(self, aType):
         if dbg:
-            print >> sys.stderr, "PyMailServiceProvider create with", aType
+            out.write("PyMailServiceProvider create with %s\n" % aType)
         if aType == SMTP:
             return PyMailSMTPService(self.ctx);
         elif aType == POP3:
@@ -425,12 +426,12 @@ class PyMailServiceProvider(unohelper.Ba
         elif aType == IMAP:
             return PyMailIMAPService(self.ctx);
         else:
-            print >> sys.stderr, "PyMailServiceProvider, unknown TYPE", aType
+            out.write("PyMailServiceProvider, unknown TYPE %s\n" % aType)
 
 class PyMailMessage(unohelper.Base, XMailMessage):
     def __init__( self, ctx, sTo='', sFrom='', Subject='', Body=None, aMailAttachment=None ):
         if dbg:
-            print >> sys.stderr, "PyMailMessage init"
+            out.write("PyMailMessage init\n")
         self.ctx = ctx
 
         self.recipients = [sTo]
@@ -445,38 +446,38 @@ class PyMailMessage(unohelper.Base, XMai
         self.Subject = Subject
         self.Body = Body
         if dbg:
-            print >> sys.stderr, "post PyMailMessage init"
+            out.write("post PyMailMessage init\n")
     def addRecipient( self, recipient ):
         if dbg:
-            print >> sys.stderr, "PyMailMessage.addRecipient", recipient
+            out.write("PyMailMessage.addRecipient%s\n" % recipient)
         self.recipients.append(recipient)
     def addCcRecipient( self, ccrecipient ):
         if dbg:
-            print >> sys.stderr, "PyMailMessage.addCcRecipient", ccrecipient
+            out.write("PyMailMessage.addCcRecipient%s\n" % ccrecipient)
         self.ccrecipients.append(ccrecipient)
     def addBccRecipient( self, bccrecipient ):
         if dbg:
-            print >> sys.stderr, "PyMailMessage.addBccRecipient", bccrecipient
+            out.write("PyMailMessage.addBccRecipient%s\n" % bccrecipient)
         self.bccrecipients.append(bccrecipient)
     def getRecipients( self ):
         if dbg:
-            print >> sys.stderr, "PyMailMessage.getRecipients", self.recipients
+            out.write("PyMailMessage.getRecipients%s\n" % self.recipients)
         return tuple(self.recipients)
     def getCcRecipients( self ):
         if dbg:
-            print >> sys.stderr, "PyMailMessage.getCcRecipients", self.ccrecipients
+            out.write("PyMailMessage.getCcRecipients%s\n" % self.ccrecipients)
         return tuple(self.ccrecipients)
     def getBccRecipients( self ):
         if dbg:
-            print >> sys.stderr, "PyMailMessage.getBccRecipients", self.bccrecipients
+            out.write("PyMailMessage.getBccRecipients%s\n" % self.bccrecipients)
         return tuple(self.bccrecipients)
     def addAttachment( self, aMailAttachment ):
         if dbg:
-            print >> sys.stderr, "PyMailMessage.addAttachment"
+            out.write("PyMailMessage.addAttachment\n")
         self.aMailAttachments.append(aMailAttachment)
     def getAttachments( self ):
         if dbg:
-            print >> sys.stderr, "PyMailMessage.getAttachments"
+            out.write("PyMailMessage.getAttachments\n")
         return tuple(self.aMailAttachments)
 
 

Modified: openoffice/branches/ia2/main/scripting/source/pyprov/officehelper.py
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/scripting/source/pyprov/officehelper.py?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/scripting/source/pyprov/officehelper.py (original)
+++ openoffice/branches/ia2/main/scripting/source/pyprov/officehelper.py Fri Feb  1 08:46:00 2013
@@ -81,7 +81,7 @@ def bootstrap():
 
     except BootstrapException:
         raise
-    except Exception, e:  # Any other exception
+    except Exception as e:  # Any other exception
         raise BootstrapException("Caught exception " + str(e), None)
 
     return xContext

Modified: openoffice/branches/ia2/main/scripting/source/pyprov/pythonscript.py
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/scripting/source/pyprov/pythonscript.py?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/scripting/source/pyprov/pythonscript.py (original)
+++ openoffice/branches/ia2/main/scripting/source/pyprov/pythonscript.py Fri Feb  1 08:46:00 2013
@@ -28,6 +28,11 @@ import imp
 import time
 import ast
 
+try:
+    unicode
+except NameError:
+    unicode = str
+
 class LogLevel:
     NONE = 0
     ERROR = 1
@@ -69,8 +74,8 @@ def getLogTarget():
             if len( userInstallation ) > 0:
                 systemPath = uno.fileUrlToSystemPath( userInstallation + "/Scripts/python/log.txt" )
                 ret = file( systemPath , "a" )
-        except Exception,e:
-            print "Exception during creation of pythonscript logfile: "+ lastException2String() + "\n, delagating log to stdout\n"
+        except Exception as e:
+            print("Exception during creation of pythonscript logfile: "+ lastException2String() + "\n, delagating log to stdout\n")
     return ret
 
 class Logger(LogLevel):
@@ -102,8 +107,8 @@ class Logger(LogLevel):
                     encfile(msg) +
                     "\n" )
                 self.target.flush()
-            except Exception,e:
-                print "Error during writing to stdout: " +lastException2String() + "\n"
+            except Exception as e:
+                print("Error during writing to stdout: " +lastException2String() + "\n")
 
 log = Logger( getLogTarget() )
 
@@ -202,10 +207,10 @@ class MyUriHelper:
             ret = self.m_baseUri + "/" + myUri.getName().replace( "|", "/" )
             log.debug( "converting scriptURI="+scriptURI + " to storageURI=" + ret )
             return ret
-        except UnoException, e:
+        except UnoException as e:
             log.error( "error during converting scriptURI="+scriptURI + ": " + e.Message)
             raise RuntimeException( "pythonscript:scriptURI2StorageUri: " +e.getMessage(), None )
-        except Exception, e:
+        except Exception as e:
             log.error( "error during converting scriptURI="+scriptURI + ": " + str(e))
             raise RuntimeException( "pythonscript:scriptURI2StorageUri: " + str(e), None )
 
@@ -320,7 +325,7 @@ class ProviderContext:
 
 
     def removePackageByUrl( self, url ):
-        items = self.mapPackageName2Path.items()
+        items = list(self.mapPackageName2Path.items())
         for i in items:
             if url in i[1].pathes:
                 self.mapPackageName2Path.pop(i[0])
@@ -330,7 +335,7 @@ class ProviderContext:
         packageName = self.getPackageNameFromUrl( url )
         transientPart = self.getTransientPartFromUrl( url )
         log.debug( "addPackageByUrl : " + packageName + ", " + transientPart + "("+url+")" + ", rootUrl="+self.rootUrl )
-        if self.mapPackageName2Path.has_key( packageName ):
+        if packageName in self.mapPackageName2Path:
             package = self.mapPackageName2Path[ packageName ]
             package.pathes = package.pathes + (url, )
         else:
@@ -338,7 +343,7 @@ class ProviderContext:
             self.mapPackageName2Path[ packageName ] = package
 
     def isUrlInPackage( self, url ):
-        values = self.mapPackageName2Path.values()
+        values = list(self.mapPackageName2Path.values())
         for i in values:
 #           print "checking " + url + " in " + str(i.pathes)
             if url in i.pathes:
@@ -432,7 +437,7 @@ class ProviderContext:
                 code = compile( src, encfile(uno.fileUrlToSystemPath( url ) ), "exec" )
             else:
                 code = compile( src, url, "exec" )
-            exec code in entry.module.__dict__
+            exec(code, entry.module.__dict__)
             entry.module.__file__ = url
             self.modules[ url ] = entry
             log.debug( "mapped " + url + " to " + str( entry.module ) )
@@ -475,7 +480,7 @@ class ScriptBrowseNode( unohelper.Base, 
                 ret = not self.provCtx.sfa.isReadOnly( self.uri )
 
             log.debug( "ScriptBrowseNode.getPropertyValue called for " + name + ", returning " + str(ret) )
-        except Exception,e:
+        except Exception as e:
             log.error( "ScriptBrowseNode.getPropertyValue error " + lastException2String())
             raise
 
@@ -520,10 +525,10 @@ class ScriptBrowseNode( unohelper.Base, 
                 code = ensureSourceState( code )
                 mod = imp.new_module("ooo_script_framework")
                 mod.__dict__[GLOBAL_SCRIPTCONTEXT_NAME] = self.provCtx.scriptContext
-                exec code in mod.__dict__
+                exec(code, mod.__dict__)
                 values = mod.__dict__.get( CALLABLE_CONTAINER_NAME , None )
                 if not values:
-                    values = mod.__dict__.values()
+                    values = list(mod.__dict__.values())
 
                 for i in values:
                     if isScript( i ):
@@ -544,7 +549,7 @@ class ScriptBrowseNode( unohelper.Base, 
 #                log.debug("Save is not implemented yet")
 #                text = self.editor.getControl("EditorTextField").getText()
 #                log.debug("Would save: " + text)
-        except Exception,e:
+        except Exception as e:
             # TODO: add an error box here !
             log.error( lastException2String() )
 
@@ -585,7 +590,7 @@ class FileBrowseNode( unohelper.Base, XB
                     self.provCtx, self.uri, self.name, i ))
             ret = tuple( scriptNodeList )
             log.debug( "returning " +str(len(ret)) + " ScriptChildNodes on " + self.uri )
-        except Exception, e:
+        except Exception as e:
             text = lastException2String()
             log.error( "Error while evaluating " + self.uri + ":" + text )
             raise
@@ -594,7 +599,7 @@ class FileBrowseNode( unohelper.Base, XB
     def hasChildNodes(self):
         try:
             return len(self.getChildNodes()) > 0
-        except Exception, e:
+        except Exception as e:
             return False
 
     def getType( self):
@@ -625,7 +630,7 @@ class DirBrowseNode( unohelper.Base, XBr
                     log.debug( "adding DirBrowseNode " + i )
                     browseNodeList.append( DirBrowseNode( self.provCtx, i[i.rfind("/")+1:len(i)],i))
             return tuple( browseNodeList )
-        except Exception, e:
+        except Exception as e:
             text = lastException2String()
             log.error( "DirBrowseNode error: " + str(e) + " while evaluating " + self.rootUrl)
             log.error( text)
@@ -697,7 +702,7 @@ def getPathesFromPackage( rootUrl, sfa )
             if not isPyFileInPath( sfa, i ):
                 handler.urlList.remove(i)
         ret = tuple( handler.urlList )
-    except UnoException, e:
+    except UnoException as e:
         text = lastException2String()
         log.debug( "getPathesFromPackage " + fileUrl + " Exception: " +text )
         pass
@@ -765,7 +770,7 @@ def getModelFromDocUrl(ctx, url):
     try:
         ret = content.execute(c, 0, env)
         doc = ret.getObject(1, None)
-    except Exception, e:
+    except Exception as e:
         log.isErrorLevel() and log.error("getModelFromDocUrl: %s" % url)
     return doc
 
@@ -818,7 +823,7 @@ class PackageBrowseNode( unohelper.Base,
         return self.name
 
     def getChildNodes( self ):
-        items = self.provCtx.mapPackageName2Path.items()
+        items = list(self.provCtx.mapPackageName2Path.items())
         browseNodeList = []
         for i in items:
             if len( i[1].pathes ) == 1:
@@ -851,7 +856,7 @@ class PythonScript( unohelper.Base, XScr
         log.debug( "PythonScript.invoke " + str( args ) )
         try:
             ret = self.func( *args )
-        except UnoException,e:
+        except UnoException as e:
             # UNO Exception continue to fly ...
             text = lastException2String()
             complete = "Error during invoking function " + \
@@ -864,7 +869,7 @@ class PythonScript( unohelper.Base, XScr
             # this is really bad for most users.
             e.Message = e.Message + " (" + complete + ")"
             raise
-        except Exception,e:
+        except Exception as e:
             # General python exception are converted to uno RuntimeException
             text = lastException2String()
             complete = "Error during invoking function " + \
@@ -911,7 +916,7 @@ class PythonScriptProvider( unohelper.Ba
                     "com.sun.star.frame.TransientDocumentsDocumentContentFactory",
                     ctx).createDocumentContent(doc)
                 storageType = content.getIdentifier().getContentIdentifier()
-            except Exception, e:
+            except Exception as e:
                 text = lastException2String()
                 log.error( text )
 
@@ -941,7 +946,7 @@ class PythonScriptProvider( unohelper.Ba
             else:
                 self.dirBrowseNode = DirBrowseNode( self.provCtx, LANGUAGENAME, rootUrl )
 
-        except Exception, e:
+        except Exception as e:
             text = lastException2String()
             log.debug( "PythonScriptProvider could not be instantiated because of : " + text )
             raise e
@@ -980,7 +985,7 @@ class PythonScriptProvider( unohelper.Ba
 
             log.debug( "got func " + str( func ) )
             return PythonScript( func, mod )
-        except Exception, e:
+        except Exception as e:
             text = lastException2String()
             log.error( text )
             raise ScriptFrameworkErrorException( text, self, scriptUri, LANGUAGENAME, 0 )
@@ -1012,7 +1017,7 @@ class PythonScriptProvider( unohelper.Ba
             ret = self.provCtx.isUrlInPackage( uri )
             log.debug( "hasByName " + uri + " " +str( ret ) )
             return ret
-        except Exception, e:
+        except Exception as e:
             text = lastException2String()
             log.debug( "Error in hasByName:" +  text )
             return False

Modified: openoffice/branches/ia2/main/sd/source/ui/app/optsitem.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sd/source/ui/app/optsitem.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sd/source/ui/app/optsitem.cxx (original)
+++ openoffice/branches/ia2/main/sd/source/ui/app/optsitem.cxx Fri Feb  1 08:46:00 2013
@@ -494,12 +494,12 @@ SdOptionsMisc::SdOptionsMisc( sal_uInt16
 	bMasterPageCache( sal_True ),
 	bDragWithCopy( sal_False ),
 	bPickThrough( sal_True ),
-	bBigHandles( sal_False ),
+	bBigHandles( sal_True ),    // new default: Use big handles
 	bDoubleClickTextEdit( sal_True ),
 	bClickChangeRotation( sal_False ),
 	bStartWithActualPage( sal_False ),
 	bSolidDragging( sal_True ),
-	bSolidMarkHdl( sal_True ),
+	bSolidMarkHdl( sal_True ),  // default: Use nice handles
 	bSummationOfParagraphs( sal_False ),
 	// #90356#
 	bShowUndoDeleteWarning( sal_True ),

Modified: openoffice/branches/ia2/main/sd/source/ui/app/sdxfer.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sd/source/ui/app/sdxfer.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sd/source/ui/app/sdxfer.cxx (original)
+++ openoffice/branches/ia2/main/sd/source/ui/app/sdxfer.cxx Fri Feb  1 08:46:00 2013
@@ -548,10 +548,10 @@ sal_Bool SdTransferable::GetData( const 
 			if( mpSdViewIntern )
 				bOK = SetGDIMetaFile( mpSdViewIntern->GetMarkedObjMetaFile(true), rFlavor );
 		}
-		else if( nFormat == FORMAT_BITMAP )
+		else if( FORMAT_BITMAP == nFormat || SOT_FORMATSTR_ID_PNG == nFormat )
 		{
 			if( mpSdViewIntern )
-				bOK = SetBitmap( mpSdViewIntern->GetMarkedObjBitmapEx(true).GetBitmap(), rFlavor );
+				bOK = SetBitmapEx( mpSdViewIntern->GetMarkedObjBitmapEx(true), rFlavor );
 		}
 		else if( ( nFormat == FORMAT_STRING ) && mpBookmark )
 		{

Modified: openoffice/branches/ia2/main/sd/source/ui/docshell/docshel4.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sd/source/ui/docshell/docshel4.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sd/source/ui/docshell/docshel4.cxx (original)
+++ openoffice/branches/ia2/main/sd/source/ui/docshell/docshel4.cxx Fri Feb  1 08:46:00 2013
@@ -294,7 +294,6 @@ sal_Bool DrawDocShell::InitNew( const ::
 
 	if (bRet)
 	{
-		mpDoc->SetDrawingLayerPoolDefaults();
 		if( !mbSdDataObj )
 			mpDoc->NewOrLoadCompleted(NEW_DOC);  // otherwise calling
 			                                    // NewOrLoadCompleted(NEW_LOADED) in

Modified: openoffice/branches/ia2/main/sd/source/ui/unoidl/unopage.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sd/source/ui/unoidl/unopage.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sd/source/ui/unoidl/unopage.cxx (original)
+++ openoffice/branches/ia2/main/sd/source/ui/unoidl/unopage.cxx Fri Feb  1 08:46:00 2013
@@ -19,10 +19,9 @@
  * 
  *************************************************************/
 
-
-
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sd.hxx"
+
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/presentation/ClickAction.hpp>
 #include <com/sun/star/presentation/FadeEffect.hpp>
@@ -59,7 +58,6 @@
 #include <rtl/uuid.h>
 #include <rtl/memory.h>
 #include <comphelper/serviceinfohelper.hxx>
-
 #include <comphelper/extract.hxx>
 #include <list>
 #include <svx/svditer.hxx>
@@ -81,6 +79,7 @@
 #include "unokywds.hxx"
 #include "unopback.hxx"
 #include "unohelp.hxx"
+#include <vcl/dibtools.hxx>
 
 using ::com::sun::star::animations::XAnimationNode;
 using ::com::sun::star::animations::XAnimationNodeSupplier;
@@ -1143,7 +1142,7 @@ Any SAL_CALL SdGenericDrawPage::getPrope
 																  aBitmap ) )
 					{
 						SvMemoryStream aMemStream;
-						aBitmap.GetBitmap().Write( aMemStream, sal_False, sal_False );
+						WriteDIB(aBitmap.GetBitmap(), aMemStream, false, false);
 						uno::Sequence<sal_Int8> aSeq( (sal_Int8*)aMemStream.GetData(), aMemStream.Tell() );
 						aAny <<= aSeq;
 					}

Modified: openoffice/branches/ia2/main/sd/source/ui/view/sdview3.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sd/source/ui/view/sdview3.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sd/source/ui/view/sdview3.cxx (original)
+++ openoffice/branches/ia2/main/sd/source/ui/view/sdview3.cxx Fri Feb  1 08:46:00 2013
@@ -19,8 +19,6 @@
  * 
  *************************************************************/
 
-
-
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sd.hxx"
 
@@ -60,7 +58,6 @@
 #include <vcl/metaact.hxx>
 #include <svx/svxids.hrc>
 #include <toolkit/helper/vclunohelper.hxx>
-
 #include "DrawDocShell.hxx"
 #include "fupoor.hxx"
 #include "Window.hxx"
@@ -75,13 +72,13 @@
 #include "strmname.h"
 #include "unomodel.hxx"
 #include "ViewClipboard.hxx"
-
 #include <sfx2/ipclient.hxx>
 #include <comphelper/storagehelper.hxx>
 #include <comphelper/processfactory.hxx>
 #include <tools/stream.hxx>
 #include <vcl/cvtgrf.hxx>
 #include <svx/sdrhittesthelper.hxx>
+#include <svx/xbtmpit.hxx>
 
 // --------------
 // - Namespaces -
@@ -764,6 +761,7 @@ sal_Bool View::InsertData( const Transfe
 								BegUndo( String( SdResId( STR_UNDO_DRAGDROP ) ) );
 								AddUndo( mpDoc->GetSdrUndoFactory().CreateUndoAttrObject( *pPickObj ) );
 							}
+
 							aSet.Put( pObj->GetMergedItemSet() );
 
 							// Eckenradius soll nicht uebernommen werden.
@@ -772,7 +770,17 @@ sal_Bool View::InsertData( const Transfe
 							// nicht auf das Objekt uebertragen werden.
 							aSet.ClearItem( SDRATTR_ECKENRADIUS );
 
-							pPickObj->SetMergedItemSetAndBroadcast( aSet );
+                            const SdrGrafObj* pSdrGrafObj = dynamic_cast< const SdrGrafObj* >(pObj);
+
+                            if(pSdrGrafObj)
+                            {
+                                // If we have a graphic as source object, use it's graphic
+                                // content as fill style
+                                aSet.Put(XFillStyleItem(XFILL_BITMAP));
+                                aSet.Put(XFillBitmapItem(&mpDoc->GetPool(), pSdrGrafObj->GetGraphic()));
+                            }
+
+                            pPickObj->SetMergedItemSetAndBroadcast( aSet );
 
 							if( pPickObj->ISA( E3dObject ) && pObj->ISA( E3dObject ) )
 							{
@@ -1247,9 +1255,9 @@ sal_Bool View::InsertData( const Transfe
 	}
 	else if( ( !bLink || pPickObj ) && CHECK_FORMAT_TRANS( FORMAT_BITMAP ) )
 	{
-		Bitmap aBmp;
+		BitmapEx aBmpEx;
 
-		if( aDataHelper.GetBitmap( FORMAT_BITMAP, aBmp ) )
+		if( aDataHelper.GetBitmapEx( FORMAT_BITMAP, aBmpEx ) )
 		{
 			Point aInsertPos( rPos );
 
@@ -1270,10 +1278,10 @@ sal_Bool View::InsertData( const Transfe
 			}
 
 			// #90129# restrict movement to WorkArea
-			Size aImageMapSize(aBmp.GetPrefSize());
+			Size aImageMapSize(aBmpEx.GetPrefSize());
 			ImpCheckInsertPos(aInsertPos, aImageMapSize, GetWorkArea());
 
-			InsertGraphic( aBmp, mnAction, aInsertPos, NULL, pImageMap );
+			InsertGraphic( aBmpEx, mnAction, aInsertPos, NULL, pImageMap );
 			bReturn = sal_True;
 		}
 	}

Modified: openoffice/branches/ia2/main/sd/source/ui/view/sdview4.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sd/source/ui/view/sdview4.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sd/source/ui/view/sdview4.cxx (original)
+++ openoffice/branches/ia2/main/sd/source/ui/view/sdview4.cxx Fri Feb  1 08:46:00 2013
@@ -19,8 +19,6 @@
  * 
  *************************************************************/
 
-
-
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sd.hxx"
 
@@ -57,15 +55,14 @@
 #include "sdpage.hxx"
 #include "view/SlideSorterView.hxx"
 #include "undo/undoobjects.hxx"
-
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/embed/ElementModes.hpp>
 #include <com/sun/star/embed/XEmbedPersist.hpp>
 #include <com/sun/star/embed/Aspects.hpp>
 #include <com/sun/star/embed/NoVisualAreaSizeException.hpp>
 #include <svtools/soerr.hxx>
-
 #include <sfx2/ipclient.hxx>
+#include <svx/svdoashp.hxx>
 #include "glob.hrc"
 
 using namespace com::sun::star;
@@ -112,8 +109,9 @@ SdrGrafObj* View::InsertGraphic( const G
 
 	if( mnAction == DND_ACTION_LINK && pPickObj && pPV )
 	{
-		const bool bIsGraphic = pPickObj->ISA( SdrGrafObj );
-		if( bIsGraphic || (pObj->IsEmptyPresObj() && !bOnMaster) )
+		const bool bIsGraphic(0 != dynamic_cast< SdrGrafObj* >(pPickObj));
+
+        if(bIsGraphic || (pPickObj->IsEmptyPresObj() && !bOnMaster)) // #121603# Do not use pObj, it may be NULL
 		{
 			if( IsUndoEnabled() )
 				BegUndo(String(SdResId(STR_INSERTGRAPHIC)));	
@@ -155,11 +153,9 @@ SdrGrafObj* View::InsertGraphic( const G
 			if( IsUndoEnabled() )
 				EndUndo();
 		}
-		else if (pPickObj->IsClosedObj() && !pPickObj->ISA(SdrOle2Obj))
+		else if(pPickObj->IsClosedObj())
 		{
-			/******************************************************************
-			* Das Objekt wird mit der Graphik gefuellt
-			******************************************************************/
+            // fill object with graphic
 			if( IsUndoEnabled() )
 			{
 				BegUndo(String(SdResId(STR_UNDO_DRAGDROP)));

Modified: openoffice/branches/ia2/main/sdext/source/minimizer/unodialog.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sdext/source/minimizer/unodialog.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sdext/source/minimizer/unodialog.cxx (original)
+++ openoffice/branches/ia2/main/sdext/source/minimizer/unodialog.cxx Fri Feb  1 08:46:00 2013
@@ -339,55 +339,6 @@ void UnoDialog::setControlProperty( cons
 }
 
 // -----------------------------------------------------------------------------
-#if 0
-void UnoDialog::showMessageBox( const OUString& rTitle, const OUString& rMessage, sal_Bool bErrorBox ) const
-{
-	try
-	{
-		Reference< XMessageBoxFactory > xMessageBoxFactory( mxMSF->getServiceManager()->createInstanceWithContext( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.Toolkit" ) ), mxMSF ), UNO_QUERY_THROW  );
-		if ( xMessageBoxFactory.is() )
-		{
-			Rectangle aRectangle( 0, 0, 0, 0 );
-			Reference< XMessageBox > xMessageBox( xMessageBoxFactory->createMessageBox( mxWindowPeer, aRectangle,
-				bErrorBox ? OUString( RTL_CONSTASCII_USTRINGPARAM( "errorbox" ) ) : OUString( RTL_CONSTASCII_USTRINGPARAM( "querybox" ) ), MessageBoxButtons::BUTTONS_OK, rTitle, rMessage ) );
-			Reference< XComponent > xComponent( xMessageBox, UNO_QUERY_THROW );
-			/* sal_Int16 nResult = */ xMessageBox->execute();
-			xComponent->dispose();
-		}
-	}
-	catch ( Exception& )
-	{
-	}
-
-/*
-public void showErrorMessageBox(XWindowPeer _xParentWindowPeer, String _sTitle, String _sMessage){
-XComponent xComponent = null;    
-try {
-    Object oToolkit = m_xMCF.createInstanceWithContext("com.sun.star.awt.Toolkit", m_xContext);
-    XMessageBoxFactory xMessageBoxFactory = (XMessageBoxFactory) UnoRuntime.queryInterface(XMessageBoxFactory.class, oToolkit);
-    // rectangle may be empty if position is in the center of the parent peer
-
-	Rectangle aRectangle = new Rectangle();
-    XMessageBox xMessageBox = xMessageBoxFactory.createMessageBox(_xParentWindowPeer, aRectangle, "errorbox", com.sun.star.awt.MessageBoxButtons.BUTTONS_OK, _sTitle, _sMessage);
-    xComponent = (XComponent) UnoRuntime.queryInterface(XComponent.class, xMessageBox);
-    if (xMessageBox != null){
-        short nResult = xMessageBox.execute();
-    }
-} catch (com.sun.star.uno.Exception ex) {
-    ex.printStackTrace(System.out);
-}
-finally{
-    //make sure always to dispose the component and free the memory!
-    if (xComponent != null){
-        xComponent.dispose();
-    }
-}}
-*/
-}
-
-#endif
-
-// -----------------------------------------------------------------------------
 
 sal_Int32 UnoDialog::getMapsFromPixels( sal_Int32 nPixels ) const
 {

Modified: openoffice/branches/ia2/main/setup_native/scripts/langpackscript.sh
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/setup_native/scripts/langpackscript.sh?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/setup_native/scripts/langpackscript.sh (original)
+++ openoffice/branches/ia2/main/setup_native/scripts/langpackscript.sh Fri Feb  1 08:46:00 2013
@@ -80,7 +80,7 @@ SunOS)
   ;;
 Linux)
   SEARCHPACKAGENAME="BASISPACKAGEPREFIXPLACEHOLDEROOOBASEVERSIONPLACEHOLDER-core01"
-  FIXPATH="/openoffice.org"
+  FIXPATH="/apachopenoffice"
   echo
   echo "Searching for the FULLPRODUCTNAMELONGPLACEHOLDER installation ..."
   RPMNAME=`rpm -qa | grep $SEARCHPACKAGENAME`

Modified: openoffice/branches/ia2/main/setup_native/scripts/update.sh
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/setup_native/scripts/update.sh?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/setup_native/scripts/update.sh (original)
+++ openoffice/branches/ia2/main/setup_native/scripts/update.sh Fri Feb  1 08:46:00 2013
@@ -58,7 +58,7 @@ make_tempfile() {
 #
 run_in_terminal () {
 
-  TMPCMD=`make_tempfile 'OpenOffice.org-Online-Update'`
+  TMPCMD=`make_tempfile 'Apache_OpenOffice-Online-Update'`
   
   cat >> $TMPCMD 
 
@@ -119,7 +119,7 @@ elevate() {
 
 
 update_pkg() {
-  ADMINFILE=`make_tempfile 'OpenOffice.org-Online-Update-admin'`
+  ADMINFILE=`make_tempfile 'Apache_OpenOffice-Online-Update-admin'`
   
 cat >> $ADMINFILE << EOF
 action=nocheck

Modified: openoffice/branches/ia2/main/setup_native/source/opensolaris/bundledextensions/README
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/setup_native/source/opensolaris/bundledextensions/README?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/setup_native/source/opensolaris/bundledextensions/README (original)
+++ openoffice/branches/ia2/main/setup_native/source/opensolaris/bundledextensions/README Fri Feb  1 08:46:00 2013
@@ -9,7 +9,7 @@ installed
 ooo_bundled_extensions.xml
 svc-ooo_bundled_extensions
 
-are part of the OpenOffice.org IPS package. They must be added to the package
+are part of the Apache OpenOffice IPS package. They must be added to the package
 after all other files have been added. Those other files are the SVR4 packages
 of OOo which can be imported by pkg (pkg import).
 The files have to be uploaded this way:
@@ -26,7 +26,7 @@ bundled extensions. This path changes wi
 the version number which is part of a folder name. The
 current value is:
 
-EXTENSIONPATH=/opt/openoffice.org3/share/extension/install
+EXTENSIONPATH=/opt/apacheopenoffice3/share/extension/install
 
 The service was tested with OpenSolaris release 2009.6 and may not work with a
 previous release. 
@@ -38,7 +38,7 @@ What do these files do
 
 The three files constitute a SMF service. When this service is started, then it
 installes the bundled extensions which are contained in
-/opt/openoffice.org3/share/extension/install. To install them, the service calls
+/opt/apacheopenoffice3/share/extension/install. To install them, the service calls
 "unopkg add --shared ..." with the appropriate arguments.
 
 The service is started initially after the installation of
@@ -58,7 +58,7 @@ file in every release. Otherwise IPS wou
 The update procedure of OOo will replace 'installed'. 'installed' is associated
 with a restart_fmri of the service ooo_bundled_extensions. That is after
 copying 'installed' the service will be restarted. It then installes all
-extensions contained in /opt/openoffice.org3/share/extension/install, because
+extensions contained in /opt/apacheopenoffice3/share/extension/install, because
 the newly installed 'installed' file does not contain any entries yet, except
 for the version string.
 

Modified: openoffice/branches/ia2/main/setup_native/source/opensolaris/bundledextensions/ooo_bundled_extensions.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/setup_native/source/opensolaris/bundledextensions/ooo_bundled_extensions.xml?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/setup_native/source/opensolaris/bundledextensions/ooo_bundled_extensions.xml (original)
+++ openoffice/branches/ia2/main/setup_native/source/opensolaris/bundledextensions/ooo_bundled_extensions.xml Fri Feb  1 08:46:00 2013
@@ -71,7 +71,7 @@
   <template>
     <common_name>
       <loctext xml:lang="C">
-	Installation of OpenOffice.org's bundled extensions.
+          Installation of Apache OpenOffice's bundled extensions.
       </loctext>
     </common_name>
   </template>

Modified: openoffice/branches/ia2/main/setup_native/source/opensolaris/bundledextensions/svc-ooo_bundled_extensions
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/setup_native/source/opensolaris/bundledextensions/svc-ooo_bundled_extensions?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/setup_native/source/opensolaris/bundledextensions/svc-ooo_bundled_extensions (original)
+++ openoffice/branches/ia2/main/setup_native/source/opensolaris/bundledextensions/svc-ooo_bundled_extensions Fri Feb  1 08:46:00 2013
@@ -49,11 +49,11 @@
 #Create the folder which contains the temporary user installation
 INSTDIR=`/usr/bin/mktemp -d "/tmp/userinstall.XXXXXX"`
 
-OOO_BASE_DIR="/opt/openoffice.org/basis${OOOBASEVERSION}"
+OOO_BASE_DIR="/opt/apacheopenoffice/basis${OOOBASEVERSION}"
 
 case "$1" in
 'start')
-    EXTENSIONDIR=/opt/openoffice.org${OOOBRANDPACKAGEVERSION}/share/extension/install
+    EXTENSIONDIR=/opt/apacheopenoffice${OOOBRANDPACKAGEVERSION}/share/extension/install
     for FILE in $EXTENSIONDIR/*.oxt
     do
 	#We check if the file exist, because if there is no extension
@@ -70,7 +70,7 @@ case "$1" in
 		#list. That is, it has not been installed (with unopkg) yet.
 		#Therefore we do it now.
 		echo installing $FILE
-		/opt/openoffice.org${OOOBRANDPACKAGEVERSION}/program/unopkg add --shared --bundled "$FILE" '-env:UserInstallation=file://$INSTDIR' '-env:UNO_JAVA_JFW_INSTALL_DATA=$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1'
+		/opt/apacheopenoffice${OOOBRANDPACKAGEVERSION}/program/unopkg add --shared --bundled "$FILE" '-env:UserInstallation=file://$INSTDIR' '-env:UNO_JAVA_JFW_INSTALL_DATA=$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1'
 		#Let us remember that this extensions has been installed
 		#by adding the path name of the extension to the file 
 		#installed
@@ -98,7 +98,7 @@ case "$1" in
 # 	    #share/extension/install. Now we remove the installed
 # 	    #extension
 # 	    echo removing `basename $LINE`
-# 	    /opt/openoffice.org${OOOBRANDPACKAGEVERSION}/program/unopkg remove --shared --bundled "`basename $LINE`" '-env:UserInstallation=file://$INSTDIR' '-env:UNO_JAVA_JFW_INSTALL_DATA=$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1'
+# 	    /opt/apacheopenoffice${OOOBRANDPACKAGEVERSION}/program/unopkg remove --shared --bundled "`basename $LINE`" '-env:UserInstallation=file://$INSTDIR' '-env:UNO_JAVA_JFW_INSTALL_DATA=$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1'
 # 	    REMOVED=1
 # 	else
 # 	    NEWCONTENT+=$LINE 

Modified: openoffice/branches/ia2/main/setup_native/source/packinfo/package_names.txt
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/setup_native/source/packinfo/package_names.txt?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/setup_native/source/packinfo/package_names.txt (original)
+++ openoffice/branches/ia2/main/setup_native/source/packinfo/package_names.txt Fri Feb  1 08:46:00 2013
@@ -1,46 +1,46 @@
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING	Language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-base	Base language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-binfilter	Legacy filters (e.g. StarOffice 5.2) for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-calc	Calc language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-draw	Draw language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-fonts	Language fonts module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-help	Language help module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-impress	Impress language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-math	Math language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-onlineupd	Online update language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-res	Language resource module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-writer	Writer language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-activex	ActiveX control for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-base	Base module for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-binfilter	Legacy filters (e.g. StarOffice 5.2) for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-calc	Calc module for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01	Core module for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02	Office core module for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03	Office core module for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04	Office core module for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05	Office core module for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06	Office core module for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07	Office core module for OpenOffice.org %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING	Language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-base	Base language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-binfilter	Legacy filters (e.g. StarOffice 5.2) for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-calc	Calc language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-draw	Draw language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-fonts	Language fonts module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-help	Language help module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-impress	Impress language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-math	Math language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-onlineupd	Online update language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-res	Language resource module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-writer	Writer language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-activex	ActiveX control for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-base	Base module for %APACHEPROJECTNAME%OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-binfilter	Legacy filters (e.g. StarOffice 5.2) for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-calc	Calc module for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01	Core module for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02	Office core module for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03	Office core module for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04	Office core module for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05	Office core module for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06	Office core module for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07	Office core module for %APACHEPROJECTNAME %OOOBASEVERSION
 %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-dict-gl	Gl dictionary for %PRODUCTNAME %PRODUCTVERSION
 %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-dict-vi	Vietnamese dictionary for %PRODUCTNAME %PRODUCTVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-draw	Draw module for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-emailmerge	Email mailmerge module for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-gnome-integratn	Gnome integration module for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-graphicfilter	Graphic filter module for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-headless	Headless display module for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-images	Images module for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-impress	Impress module for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-javafilter	Java filter module for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-kde-integration	KDE integration module for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-math	Math module for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-onlineupdate	Online update modul for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-ooofonts	Mailcap module for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-ooolinguistic	Linguistic module for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-pyuno	Pyuno module for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-spellcheck	English spellchecker module for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-testtool	Testtool module for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-writer	Writer module for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-xsltfilter	XSLT filter samples module for OpenOffice.org %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-draw	Draw module for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-emailmerge	Email mailmerge module for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-gnome-integratn	Gnome integration module for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-graphicfilter	Graphic filter module for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-headless	Headless display module for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-images	Images module for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-impress	Impress module for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-javafilter	Java filter module for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-kde-integration	KDE integration module for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-math	Math module for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-onlineupdate	Online update modul for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-ooofonts	Mailcap module for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-ooolinguistic	Linguistic module for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-pyuno	Pyuno module for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-spellcheck	English spellchecker module for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-testtool	Testtool module for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-writer	Writer module for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-xsltfilter	XSLT filter samples module for %APACHEPROJECTNAME %OOOBASEVERSION
 %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-af	Af dictionary for %PRODUCTNAME %PRODUCTVERSION
 %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-cs	Cs dictionary for %PRODUCTNAME %PRODUCTVERSION
 %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-da	Da dictionary for %PRODUCTNAME %PRODUCTVERSION

Modified: openoffice/branches/ia2/main/setup_native/source/packinfo/packinfo_office.txt
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/setup_native/source/packinfo/packinfo_office.txt?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/setup_native/source/packinfo/packinfo_office.txt (original)
+++ openoffice/branches/ia2/main/setup_native/source/packinfo/packinfo_office.txt Fri Feb  1 08:46:00 2013
@@ -48,7 +48,7 @@ findrequires = "find-requires-gnome.sh"
 copyright = "2012 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "Gnome integration module for OpenOffice.org %OOOBASEVERSION"
+description = "Gnome integration module for %APACHEPROJECTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -63,7 +63,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEV
 copyright = "2012 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "KDE integration module for OpenOffice.org %OOOBASEVERSION"
+description = "KDE integration module for %APACHEPROJECTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -79,7 +79,7 @@ freebsdrequires = "%BASISPACKAGEPREFIX%O
 copyright = "2012 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "Core module for OpenOffice.org %OOOBASEVERSION"
+description = "Core module for %APACHEPROJECTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -95,7 +95,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEV
 copyright = "2012 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "Writer module for OpenOffice.org %OOOBASEVERSION"
+description = "Writer module for %APACHEPROJECTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -111,7 +111,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEV
 copyright = "2012 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "Calc module for OpenOffice.org %OOOBASEVERSION"
+description = "Calc module for %APACHEPROJECTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -127,7 +127,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEV
 copyright = "2012 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "Draw module for OpenOffice.org %OOOBASEVERSION"
+description = "Draw module for %APACHEPROJECTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -143,7 +143,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEV
 copyright = "2012 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "Impress module for OpenOffice.org %OOOBASEVERSION"
+description = "Impress module for %APACHEPROJECTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -159,7 +159,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEV
 copyright = "2012 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "Base module for OpenOffice.org %OOOBASEVERSION"
+description = "Base module for %APACHEPROJECTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -175,7 +175,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEV
 copyright = "2012 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "Math module for OpenOffice.org %OOOBASEVERSION"
+description = "Math module for %APACHEPROJECTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -190,7 +190,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEV
 copyright = "2012 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "Legacy filters (e.g. StarOffice 5.2) for OpenOffice.org %OOOBASEVERSION"
+description = "Legacy filters (e.g. StarOffice 5.2) for %APACHEPROJECTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -205,7 +205,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEV
 copyright = "2012 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "Graphic filter module for OpenOffice.org %OOOBASEVERSION"
+description = "Graphic filter module for %APACHEPROJECTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -220,7 +220,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEV
 copyright = "2012 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "Usage tracking module for OpenOffice.org %OOOBASEVERSION"
+description = "Usage tracking module for %APACHEPROJECTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -235,7 +235,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEV
 copyright = "2012 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "Testtool module for OpenOffice.org %OOOBASEVERSION"
+description = "Testtool module for %APACHEPROJECTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -250,7 +250,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEV
 copyright = "2012 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "English spellchecker module for OpenOffice.org %OOOBASEVERSION"
+description = "English spellchecker module for %APACHEPROJECTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -265,7 +265,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEV
 copyright = "2012 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "XSLT filter samples module for OpenOffice.org %OOOBASEVERSION"
+description = "XSLT filter samples module for %APACHEPROJECTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -280,7 +280,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEV
 copyright = "2012 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "Java filter module for OpenOffice.org %OOOBASEVERSION"
+description = "Java filter module for %APACHEPROJECTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -295,7 +295,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEV
 copyright = "2012 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "ActiveX control for OpenOffice.org %OOOBASEVERSION"
+description = "ActiveX control for %APACHEPROJECTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -309,7 +309,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEV
 copyright = "2012 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "Online update modul for OpenOffice.org %OOOBASEVERSION"
+description = "Online update modul for %APACHEPROJECTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -324,7 +324,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEV
 copyright = "2012 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "Pyuno module for OpenOffice.org %OOOBASEVERSION"
+description = "Pyuno module for %APACHEPROJECTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -339,7 +339,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEV
 copyright = "2012 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "Email mailmerge module for OpenOffice.org %OOOBASEVERSION"
+description = "Email mailmerge module for %APACHEPROJECTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -354,7 +354,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEV
 copyright = "2012 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "Headless display module for OpenOffice.org %OOOBASEVERSION"
+description = "Headless display module for %APACHEPROJECTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -369,7 +369,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEV
 copyright = "2012 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "Images module for OpenOffice.org %OOOBASEVERSION"
+description = "Images module for %APACHEPROJECTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -384,7 +384,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEV
 copyright = "2012 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "Mailcap module for OpenOffice.org %OOOBASEVERSION"
+description = "Mailcap module for %APACHEPROJECTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -399,7 +399,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEV
 copyright = "2012 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "Linguistic module for OpenOffice.org %OOOBASEVERSION"
+description = "Linguistic module for %APACHEPROJECTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -415,7 +415,7 @@ freebsdrequires = ""
 copyright = "2012 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "Office core module for OpenOffice.org %OOOBASEVERSION"
+description = "Office core module for %APACHEPROJECTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -430,7 +430,7 @@ freebsdrequires = ""
 copyright = "2012 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "Office core module for OpenOffice.org %OOOBASEVERSION"
+description = "Office core module for %APACHEPROJECTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -446,7 +446,7 @@ freebsdrequires = ""
 copyright = "2012 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "Office core module for OpenOffice.org %OOOBASEVERSION"
+description = "Office core module for %APACHEPROJECTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -461,7 +461,7 @@ freebsdrequires = ""
 copyright = "2012 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "Office core module for OpenOffice.org %OOOBASEVERSION"
+description = "Office core module for %APACHEPROJECTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -476,7 +476,7 @@ freebsdrequires = ""
 copyright = "2012 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "Office core module for OpenOffice.org %OOOBASEVERSION"
+description = "Office core module for %APACHEPROJECTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -491,7 +491,7 @@ freebsdrequires = ""
 copyright = "2012 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "Office core module for OpenOffice.org %OOOBASEVERSION"
+description = "Office core module for %APACHEPROJECTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -1035,7 +1035,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEV
 copyright = "2012 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "OpenGL slide transitions module for OpenOffice.org %OOOBASEVERSION"
+description = "OpenGL slide transitions module for %APACHEPROJECTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End



Mime
View raw message