openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject svn commit: r1441909 [36/45] - in /openoffice/branches/l10n: ./ ext_libraries/apr-util/ ext_libraries/apr/ ext_libraries/hunspell/ ext_sources/ extras/l10n/source/ast/ extras/l10n/source/da/ extras/l10n/source/eu/ extras/l10n/source/gd/ extras/l10n/sou...
Date Sun, 03 Feb 2013 13:24:38 GMT
Modified: openoffice/branches/l10n/main/swext/mediawiki/help/component.txt
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/swext/mediawiki/help/component.txt?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/swext/mediawiki/help/component.txt (original)
+++ openoffice/branches/l10n/main/swext/mediawiki/help/component.txt Sun Feb  3 13:23:59 2013
@@ -1,21 +1 @@
-# *************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-# *************************************************************
 The @WIKIEXTENSIONPRODUCTNAME@ enables you to create Wiki articles on MediaWiki servers without having to know the syntax of the MediaWiki markup language. Publish your new and existing documents transparently with the Writer to a wiki page.

Modified: openoffice/branches/l10n/main/swext/mediawiki/src/com/sun/star/wiki/Helper.java
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/swext/mediawiki/src/com/sun/star/wiki/Helper.java?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/swext/mediawiki/src/com/sun/star/wiki/Helper.java (original)
+++ openoffice/branches/l10n/main/swext/mediawiki/src/com/sun/star/wiki/Helper.java Sun Feb  3 13:23:59 2013
@@ -24,6 +24,7 @@
 package com.sun.star.wiki;
 
 import com.sun.star.awt.MessageBoxButtons;
+import com.sun.star.awt.MessageBoxType;
 import com.sun.star.awt.XControl;
 import com.sun.star.awt.XControlContainer;
 import com.sun.star.awt.XDialog;
@@ -701,8 +702,7 @@ public class Helper 
         {
             try
             {
-                Object oSystemShell = xContext.getServiceManager().createInstanceWithContext( "com.sun.star.system.SystemShellExecute", xContext );
-                XSystemShellExecute xSystemShell = (XSystemShellExecute)UnoRuntime.queryInterface( XSystemShellExecute.class, oSystemShell );
+                XSystemShellExecute xSystemShell = com.sun.star.system.SystemShellExecute.create( xContext );
                 if ( xSystemShell != null )
                     xSystemShell.execute( sURL, "", SystemShellExecuteFlags.DEFAULTS );
             }
@@ -1008,8 +1008,7 @@ public class Helper 
                         {
                             xMB = xMBFactory.createMessageBox(
                                                      xParentPeer,
-                                                     new com.sun.star.awt.Rectangle(),
-                                                     "querybox",
+                                                     MessageBoxType.QUERYBOX,
                                                      MessageBoxButtons.BUTTONS_YES_NO | MessageBoxButtons.DEFAULT_BUTTON_NO,
                                                      sTitle,
                                                      sError );
@@ -1018,8 +1017,7 @@ public class Helper 
                         {
                             xMB = xMBFactory.createMessageBox(
                                                      xParentPeer,
-                                                     new com.sun.star.awt.Rectangle(),
-                                                     "errorbox",
+                                                     MessageBoxType.ERRORBOX,
                                                      MessageBoxButtons.BUTTONS_OK,
                                                      sTitle,
                                                      sError );

Modified: openoffice/branches/l10n/main/swext/mediawiki/src/com/sun/star/wiki/MainThreadDialogExecutor.java
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/swext/mediawiki/src/com/sun/star/wiki/MainThreadDialogExecutor.java?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/swext/mediawiki/src/com/sun/star/wiki/MainThreadDialogExecutor.java (original)
+++ openoffice/branches/l10n/main/swext/mediawiki/src/com/sun/star/wiki/MainThreadDialogExecutor.java Sun Feb  3 13:23:59 2013
@@ -162,8 +162,8 @@ public class MainThreadDialogExecutor im
         else if ( m_xMessageBox != null )
         {
             int nRes = m_xMessageBox.execute();
-            m_bResult = ( nRes == com.sun.star.awt.MessageBoxCommand.OK 
-                          || nRes == com.sun.star.awt.MessageBoxCommand.YES );
+            m_bResult = ( nRes == com.sun.star.awt.MessageBoxResults.OK 
+                          || nRes == com.sun.star.awt.MessageBoxResults.YES );
         }
         
         m_bCalled = true;

Modified: openoffice/branches/l10n/main/swext/mediawiki/src/com/sun/star/wiki/WikiDialog.java
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/swext/mediawiki/src/com/sun/star/wiki/WikiDialog.java?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/swext/mediawiki/src/com/sun/star/wiki/WikiDialog.java (original)
+++ openoffice/branches/l10n/main/swext/mediawiki/src/com/sun/star/wiki/WikiDialog.java Sun Feb  3 13:23:59 2013
@@ -29,7 +29,7 @@ import com.sun.star.awt.XControlModel;
 import com.sun.star.awt.XDialog;
 import com.sun.star.awt.XDialogEventHandler;
 import com.sun.star.awt.XDialogProvider2;
-import com.sun.star.awt.XThrobber;
+import com.sun.star.awt.XAnimation;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.lang.XMultiComponentFactory;
 import com.sun.star.uno.UnoRuntime;
@@ -210,7 +210,7 @@ public class WikiDialog implements XDial
             XMultiServiceFactory xDialogFactory = ( XMultiServiceFactory ) UnoRuntime.queryInterface( XMultiServiceFactory.class, xDialogModel );
             if ( xDialogFactory != null )
             {
-                XControlModel xThrobberModel = (XControlModel)UnoRuntime.queryInterface( XControlModel.class, xDialogFactory.createInstance( "com.sun.star.awt.UnoThrobberControlModel" ) );
+                XControlModel xThrobberModel = (XControlModel)UnoRuntime.queryInterface( XControlModel.class, xDialogFactory.createInstance( "com.sun.star.awt.SpinningProgressControlModel" ) );
                 XPropertySet xThrobberProps = (XPropertySet)UnoRuntime.queryInterface( XPropertySet.class, xThrobberModel );
                 if ( xThrobberProps != null )
                 {
@@ -239,13 +239,13 @@ public class WikiDialog implements XDial
         {
             try
             {
-                XThrobber xThrobber = (XThrobber)UnoRuntime.queryInterface( XThrobber.class, m_xControlContainer.getControl( "WikiThrobber" ) );
+                XAnimation xThrobber = (XAnimation)UnoRuntime.queryInterface( XAnimation.class, m_xControlContainer.getControl( "WikiThrobber" ) );
                 if ( xThrobber != null )
                 {
                     if ( bActive )
-                        xThrobber.start();
+                        xThrobber.startAnimation();
                     else
-                        xThrobber.stop();
+                        xThrobber.stopAnimation();
                 }
             }
             catch( Exception e )
@@ -260,7 +260,7 @@ public class WikiDialog implements XDial
         if ( m_xControlContainer != null )
         {
             try
-            {        
+            {
                 XWindow xWindow = (XWindow)UnoRuntime.queryInterface( XWindow.class, m_xControlContainer.getControl( "WikiThrobber" ) );
                 if ( xWindow != null )
                     xWindow.setVisible( bVisible );
@@ -269,7 +269,7 @@ public class WikiDialog implements XDial
             {
                 e.printStackTrace();
             }
-        }       
+        }
     }
 
     public void SetFocusTo( String aControl )

Modified: openoffice/branches/l10n/main/swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java (original)
+++ openoffice/branches/l10n/main/swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java Sun Feb  3 13:23:59 2013
@@ -25,7 +25,6 @@ package com.sun.star.wiki;
 
 import com.sun.star.awt.XDialog;
 import com.sun.star.awt.XWindowPeer;
-import com.sun.star.awt.XThrobber;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XComponentContext;

Modified: openoffice/branches/l10n/main/swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java (original)
+++ openoffice/branches/l10n/main/swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java Sun Feb  3 13:23:59 2013
@@ -26,7 +26,6 @@ package com.sun.star.wiki;
 import com.sun.star.awt.XControl;
 import com.sun.star.awt.XControlModel;
 import com.sun.star.awt.XDialog;
-import com.sun.star.awt.XThrobber;
 import com.sun.star.awt.XWindowPeer;
 import com.sun.star.beans.UnknownPropertyException;
 import com.sun.star.beans.XPropertySet;

Modified: openoffice/branches/l10n/main/swext/mediawiki/src/description.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/swext/mediawiki/src/description.xml?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/swext/mediawiki/src/description.xml (original)
+++ openoffice/branches/l10n/main/swext/mediawiki/src/description.xml Sun Feb  3 13:23:59 2013
@@ -20,14 +20,14 @@
  * 
  ***********************************************************-->
 <description xmlns="http://openoffice.org/extensions/description/2006" xmlns:d="http://openoffice.org/extensions/description/2006" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <version value="1.2.0"/>
+    <version value="1.2.1"/>
     <identifier value="@WIKIEXTENSIONID@"/>
     <display-name>
         <name lang="en-US">@WIKIEXTENSIONPRODUCTNAME@</name>
     </display-name>
     <registration>
         <simple-license accept-by="admin" default-license-id="lic-en-US">
-            <license-text xlink:href="license/LICENSE" lang="isocode" license-id="lic-isocode"/>
+            <license-text xlink:href="license/LICENSE" lang="en-US" license-id="lic-en-US"/>
         </simple-license>
     </registration>
     <dependencies>

Modified: openoffice/branches/l10n/main/sysui/desktop/debian/control
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sysui/desktop/debian/control?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sysui/desktop/debian/control (original)
+++ openoffice/branches/l10n/main/sysui/desktop/debian/control Sun Feb  3 13:23:59 2013
@@ -1,6 +1,6 @@
 Description: %productname desktop integration
 Maintainer: Apache Software Foundation
 Architecture: all
-Provides: openoffice.org-desktop-integration, openoffice.org-unbundled
-Conflicts: openofficeorg-desktop-integration, openofficeorg-debian-menus, openoffice.org-bundled
-Replaces: openofficeorg-desktop-integration, openofficeorg-debian-menus
+Provides: apache_openoffice-desktop-integration, openoffice.org-unbundled
+Conflicts: apache_openoffice-desktop-integration, openofficeorg-desktop-integration, openofficeorg-debian-menus, openoffice.org-bundled
+Replaces: apache_openoffice-desktop-integration, openofficeorg-debian-menus

Modified: openoffice/branches/l10n/main/sysui/desktop/debian/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sysui/desktop/debian/makefile.mk?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sysui/desktop/debian/makefile.mk (original)
+++ openoffice/branches/l10n/main/sysui/desktop/debian/makefile.mk Sun Feb  3 13:23:59 2013
@@ -41,7 +41,7 @@ TARGET=debian
 
 .IF "$(PKGFORMAT)"!="$(PKGFORMAT:s/deb//)"
 
-DEBFILES=$(foreach,i,{$(PRODUCTLIST)} $(PKGDIR)$/$i3.4-$(TARGET)-menus_$(PKGVERSION.$i)-$(PKGREV)_all.deb)
+DEBFILES=$(foreach,i,{$(PRODUCTLIST)} $(PKGDIR)$/$i3.5-$(TARGET)-menus_$(PKGVERSION.$i)-$(PKGREV)_all.deb)
 
 .ENDIF
 
@@ -56,22 +56,22 @@ ALLTAR : $(DEBFILES) 
 
 %/DEBIAN/control : $$(@:f)
 	@$(MKDIRHIER) $(@:d) $*$/etc $*$/usr/share/applnk/Office $*$/usr/lib/menu
-	ln -sf /opt/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/3.4//)) $*$/etc$/
-	/bin/sh -c -x "cd $(COMMONMISC)$/$(*:f:s/-/ /:1:s/3.4//) && DESTDIR=$(shell @cd $*; pwd) ICON_PREFIX=$(ICONPREFIX) KDEMAINDIR=/usr GNOMEDIR=/usr create_tree.sh"
-        @cat openoffice.org-debian-menus | sed -e 's/%PRODUCTNAME/$(PRODUCTNAME.$(*:f:s/-/ /:1:s/3.4//)) $(PRODUCTVERSION.$(*:f:s/-/ /:1:s/3.4//))/' -e 's/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/3.4//))/' -e 's/%ICONPREFIX/$(ICONPREFIX.$(*:f:s/-/ /:1:s/3.4//))/' > $*$/usr/lib/menu/$(*:f:s/_/ /:1:s/3.4//)
-	echo "Package: $(*:f:s/_/ /:1:s/3.4//)" > $@
-	cat $(@:f) | tr -d "\015" | sed "s/%productname/$(PRODUCTNAME.$(*:f:s/-/ /:1:s/3.4//))/" >> $@
-	echo "Version: $(PKGVERSION.$(*:f:s/-/ /:1:s/3.4//))-$(PKGREV)" >> $@
+	ln -sf /opt/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/3.5//)) $*$/etc$/
+	/bin/sh -c -x "cd $(COMMONMISC)$/$(*:f:s/-/ /:1:s/3.5//) && DESTDIR=$(shell @cd $*; pwd) ICON_PREFIX=$(ICONPREFIX) KDEMAINDIR=/usr GNOMEDIR=/usr create_tree.sh"
+        @cat openoffice.org-debian-menus | sed -e 's/%PRODUCTNAME/$(PRODUCTNAME.$(*:f:s/-/ /:1:s/3.5//)) $(PRODUCTVERSION.$(*:f:s/-/ /:1:s/3.5//))/' -e 's/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/3.5//))/' -e 's/%ICONPREFIX/$(ICONPREFIX.$(*:f:s/-/ /:1:s/3.5//))/' > $*$/usr/lib/menu/$(*:f:s/_/ /:1:s/3.5//)
+	echo "Package: $(*:f:s/_/ /:1:s/3.5//)" > $@
+	cat $(@:f) | tr -d "\015" | sed "s/%productname/$(PRODUCTNAME.$(*:f:s/-/ /:1:s/3.5//))/" >> $@
+	echo "Version: $(PKGVERSION.$(*:f:s/-/ /:1:s/3.5//))-$(PKGREV)" >> $@
 	@du -k -s $* | awk -F ' ' '{ printf "Installed-Size: %s\n", $$1 ; }' >> $@
 
 %/DEBIAN/postinst : $$(@:f)
-	 @cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/3.4//))/g" > $@
+	 @cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/3.5//))/g" > $@
 
 %/DEBIAN/postrm : $$(@:f)
-	 @cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/3.4//))/g" > $@
+	 @cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/3.5//))/g" > $@
 
 %/DEBIAN/prerm : $$(@:f)
-	 @cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/3.4//))/g" > $@
+	 @cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/3.5//))/g" > $@
 
 # --- packaging ---------------------------------------------------
 

Modified: openoffice/branches/l10n/main/sysui/desktop/freedesktop/freedesktop-menus.spec
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sysui/desktop/freedesktop/freedesktop-menus.spec?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sysui/desktop/freedesktop/freedesktop-menus.spec (original)
+++ openoffice/branches/l10n/main/sysui/desktop/freedesktop/freedesktop-menus.spec Sun Feb  3 13:23:59 2013
@@ -27,7 +27,7 @@ Name: %pkgprefix-freedesktop-menus
 #BuildRequires: perl
 Group: Office
 License: ALv2
-Provides: openoffice.org3-desktop-integration
+Provides: apache_openoffice3-desktop-integration
 Conflicts: %pkgprefix-suse-menus
 Conflicts: %pkgprefix-debian-menus
 Conflicts: %pkgprefix-redhat-menus

Modified: openoffice/branches/l10n/main/sysui/desktop/macosx/Info.plist
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sysui/desktop/macosx/Info.plist?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sysui/desktop/macosx/Info.plist (original)
+++ openoffice/branches/l10n/main/sysui/desktop/macosx/Info.plist Sun Feb  3 13:23:59 2013
@@ -32,7 +32,7 @@
 			<key>UTTypeIdentifier</key>
 			<string>org.openoffice.text</string>
 			<key>UTTypeDescription</key>
-			<string>${FILEFORMATNAME} ${FILEFORMATVERSION} Text</string>
+			<string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Text</string>
 			<key>UTTypeConformsTo</key>
 			<array>
 				<string>public.data</string>
@@ -80,7 +80,7 @@
 			<key>UTTypeIdentifier</key>
 			<string>org.openoffice.spreadsheet</string>
 			<key>UTTypeDescription</key>
-			<string>${FILEFORMATNAME} ${FILEFORMATVERSION} Spreadsheet</string>
+			<string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Spreadsheet</string>
 			<key>UTTypeConformsTo</key>
 			<array>
 				<string>public.data</string>
@@ -128,7 +128,7 @@
 			<key>UTTypeIdentifier</key>
 			<string>org.openoffice.presentation</string>
 			<key>UTTypeDescription</key>
-			<string>${FILEFORMATNAME} ${FILEFORMATVERSION} Presentation</string>
+			<string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Presentation</string>
 			<key>UTTypeConformsTo</key>
 			<array>
 				<string>public.data</string>
@@ -178,7 +178,7 @@
 			<key>UTTypeIdentifier</key>
 			<string>org.openoffice.graphics</string>
 			<key>UTTypeDescription</key>
-			<string>${FILEFORMATNAME} ${FILEFORMATVERSION} Drawing</string>
+			<string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Drawing</string>
 			<key>UTTypeConformsTo</key>
 			<array>
 				<string>public.data</string>
@@ -226,7 +226,7 @@
 			<key>UTTypeIdentifier</key>
 			<string>org.openoffice.text-master</string>
 			<key>UTTypeDescription</key>
-			<string>${FILEFORMATNAME} ${FILEFORMATVERSION} Master</string>
+			<string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Master</string>
 			<key>UTTypeConformsTo</key>
 			<array>
 				<string>public.data</string>
@@ -272,7 +272,7 @@
 			<key>UTTypeIdentifier</key>
 			<string>org.openoffice.formula</string>
 			<key>UTTypeDescription</key>
-			<string>${FILEFORMATNAME} ${FILEFORMATVERSION} Formula</string>
+			<string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Formula</string>
 			<key>UTTypeConformsTo</key>
 			<array>
 				<string>public.data</string>
@@ -320,7 +320,7 @@
 			<key>UTTypeIdentifier</key>
 			<string>org.openoffice.text-template</string>
 			<key>UTTypeDescription</key>
-			<string>${FILEFORMATNAME} ${FILEFORMATVERSION} Text Template</string>
+			<string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Text Template</string>
 			<key>UTTypeConformsTo</key>
 			<array>
 				<string>public.data</string>
@@ -366,7 +366,7 @@
 			<key>UTTypeIdentifier</key>
 			<string>org.openoffice.spreadsheet-template</string>
 			<key>UTTypeDescription</key>
-			<string>${FILEFORMATNAME} ${FILEFORMATVERSION} Spreadsheet Template</string>
+			<string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Spreadsheet Template</string>
 			<key>UTTypeConformsTo</key>
 			<array>
 				<string>public.data</string>
@@ -412,7 +412,7 @@
 			<key>UTTypeIdentifier</key>
 			<string>org.openoffice.presentation-template</string>
 			<key>UTTypeDescription</key>
-			<string>${FILEFORMATNAME} ${FILEFORMATVERSION} Presentation Template</string>
+			<string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Presentation Template</string>
 			<key>UTTypeConformsTo</key>
 			<array>
 				<string>public.data</string>
@@ -458,7 +458,7 @@
 			<key>UTTypeIdentifier</key>
 			<string>org.openoffice.graphics-template</string>
 			<key>UTTypeDescription</key>
-			<string>${FILEFORMATNAME} ${FILEFORMATVERSION} Drawing Template</string>
+			<string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Drawing Template</string>
 			<key>UTTypeConformsTo</key>
 			<array>
 				<string>public.data</string>
@@ -868,7 +868,7 @@
 			<key>CFBundleTypeIconFile</key>
 			<string>text.icns</string>
 			<key>CFBundleTypeName</key>
-			<string>${FILEFORMATNAME} ${FILEFORMATVERSION} Text</string>
+			<string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Text</string>
 			<key>CFBundleTypeRole</key>
 			<string>Editor</string>
 			<key>LSIsAppleDefaultForType</key>
@@ -906,7 +906,7 @@
 			<key>CFBundleTypeIconFile</key>
 			<string>spreadsheet.icns</string>
 			<key>CFBundleTypeName</key>
-			<string>${FILEFORMATNAME} ${FILEFORMATVERSION} Spreadsheet</string>
+			<string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Spreadsheet</string>
 			<key>CFBundleTypeRole</key>
 			<string>Editor</string>
 			<key>LSIsAppleDefaultForType</key>
@@ -946,7 +946,7 @@
 			<key>CFBundleTypeIconFile</key>
 			<string>presentation.icns</string>
 			<key>CFBundleTypeName</key>
-			<string>${FILEFORMATNAME} ${FILEFORMATVERSION} Presentation</string>
+			<string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Presentation</string>
 			<key>CFBundleTypeRole</key>
 			<string>Editor</string>
 			<key>LSIsAppleDefaultForType</key>
@@ -984,7 +984,7 @@
 			<key>CFBundleTypeIconFile</key>
 			<string>drawing.icns</string>
 			<key>CFBundleTypeName</key>
-			<string>${FILEFORMATNAME} ${FILEFORMATVERSION} Drawing</string>
+			<string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Drawing</string>
 			<key>CFBundleTypeRole</key>
 			<string>Editor</string>
 			<key>LSIsAppleDefaultForType</key>
@@ -1020,7 +1020,7 @@
 			<key>CFBundleTypeIconFile</key>
 			<string>master-document.icns</string>
 			<key>CFBundleTypeName</key>
-			<string>${FILEFORMATNAME} ${FILEFORMATVERSION} Master</string>
+			<string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Master</string>
 			<key>CFBundleTypeRole</key>
 			<string>Editor</string>
 			<key>LSIsAppleDefaultForType</key>
@@ -1058,7 +1058,7 @@
 			<key>CFBundleTypeIconFile</key>
 			<string>formula.icns</string>
 			<key>CFBundleTypeName</key>
-			<string>${FILEFORMATNAME} ${FILEFORMATVERSION} Formula</string>
+			<string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Formula</string>
 			<key>CFBundleTypeRole</key>
 			<string>Editor</string>
 			<key>LSIsAppleDefaultForType</key>
@@ -1094,7 +1094,7 @@
 			<key>CFBundleTypeIconFile</key>
 			<string>text-template.icns</string>
 			<key>CFBundleTypeName</key>
-			<string>${FILEFORMATNAME} ${FILEFORMATVERSION} Text Template</string>
+			<string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Text Template</string>
 			<key>CFBundleTypeRole</key>
 			<string>Editor</string>
 			<key>LSIsAppleDefaultForType</key>
@@ -1130,7 +1130,7 @@
 			<key>CFBundleTypeIconFile</key>
 			<string>spreadsheet-template.icns</string>
 			<key>CFBundleTypeName</key>
-			<string>${FILEFORMATNAME} ${FILEFORMATVERSION} Spreadsheet Template</string>
+			<string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Spreadsheet Template</string>
 			<key>CFBundleTypeRole</key>
 			<string>Editor</string>
 			<key>LSIsAppleDefaultForType</key>
@@ -1166,7 +1166,7 @@
 			<key>CFBundleTypeIconFile</key>
 			<string>presentation-template.icns</string>
 			<key>CFBundleTypeName</key>
-			<string>${FILEFORMATNAME} ${FILEFORMATVERSION} Presentation Template</string>
+			<string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Presentation Template</string>
 			<key>CFBundleTypeRole</key>
 			<string>Editor</string>
 			<key>LSIsAppleDefaultForType</key>
@@ -1202,7 +1202,7 @@
 			<key>CFBundleTypeIconFile</key>
 			<string>drawing-template.icns</string>
 			<key>CFBundleTypeName</key>
-			<string>${FILEFORMATNAME} ${FILEFORMATVERSION} Drawing Template</string>
+			<string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Drawing Template</string>
 			<key>CFBundleTypeRole</key>
 			<string>Editor</string>
 			<key>LSIsAppleDefaultForType</key>

Modified: openoffice/branches/l10n/main/sysui/desktop/macosx/gen_strings.pl
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sysui/desktop/macosx/gen_strings.pl?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sysui/desktop/macosx/gen_strings.pl (original)
+++ openoffice/branches/l10n/main/sysui/desktop/macosx/gen_strings.pl Sun Feb  3 13:23:59 2013
@@ -99,7 +99,6 @@ sub print_lang
       if ( $lang ne $_ && $lang eq $this_lang && exists $documents{$last_section} ) {
         # replacing product variable doesn't work inside zip files and also not for UTF-16
         next if /%PRODUCTNAME/;
-#        s/%PRODUCTNAME/\${FILEFORMATNAME} \${FILEFORMATVERSION}/g;
         s/$lang/"$documents{$last_section}"/;
         s/\n/;\n/;
         print;

Modified: openoffice/branches/l10n/main/sysui/desktop/mandriva/mandriva-menus.spec
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sysui/desktop/mandriva/mandriva-menus.spec?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sysui/desktop/mandriva/mandriva-menus.spec (original)
+++ openoffice/branches/l10n/main/sysui/desktop/mandriva/mandriva-menus.spec Sun Feb  3 13:23:59 2013
@@ -33,7 +33,7 @@ BuildArch: noarch
 #        here and check for the 'mandriva-release' in the future (next year).
 #
 Requires: mandrake-release
-Provides: openoffice.org3-desktop-integration
+Provides: apache_openoffice3-desktop-integration
 
 %define _unpackaged_files_terminate_build 0
 %define _binary_filedigest_algorithm 1

Modified: openoffice/branches/l10n/main/sysui/desktop/productversion.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sysui/desktop/productversion.mk?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sysui/desktop/productversion.mk (original)
+++ openoffice/branches/l10n/main/sysui/desktop/productversion.mk Sun Feb  3 13:23:59 2013
@@ -40,8 +40,9 @@ PKGDIR=$(BIN)
 .ENDIF
 
 # CAUTION! here the parsing result from openoffice.lst is NOT available, so this is hardcoded
-# but should not be. When replacing with $(UNIXBASISROOTNAME) it will be empty (!)
-PRODUCTLIST = openoffice.org
+# but should not be.
+# It has to be equal to PRODUCTNAME:l:s/\s/\_/g - see solenv/bin/modules/installer/setupscript.pm
+PRODUCTLIST = apache_openoffice
 
 # default values to minimize maintainance effort
 
@@ -65,11 +66,11 @@ ICONVERSION = $(PRODUCTVERSIONSHORT:s/./
 UNIXWRAPPERNAME *= '$${{UNIXPRODUCTNAME}}$${{BRANDPACKAGEVERSION}}'
 
 # CAUTION! $(UNIXBASISROOTNAME) from openoffice.lst NOT available (!)
-PRODUCTNAME.openoffice.org = OpenOffice.org
+PRODUCTNAME.apache_openoffice = Apache OpenOffice
 
-PRODUCTVERSION.openoffice.org = $(PRODUCTVERSION)
-PRODUCTVERSIONSHORT.openoffice.org = $(PRODUCTVERSIONSHORT)
-PKGVERSION.openoffice.org = $(PKGVERSION)
-UNIXFILENAME.openoffice.org = $(PRODUCTNAME.openoffice.org:l)$(PRODUCTVERSIONSHORT.openoffice.org)
-ICONPREFIX.openoffice.org = $(UNIXFILENAME.openoffice.org:s/.//g)
+PRODUCTVERSION.apache_openoffice = $(PRODUCTVERSION)
+PRODUCTVERSIONSHORT.apache_openoffice = $(PRODUCTVERSIONSHORT)
+PKGVERSION.apache_openoffice = $(PKGVERSION)
+UNIXFILENAME.apache_openoffice = $(PRODUCTNAME.apache_openoffice:l:s/ /_/g)$(PRODUCTVERSIONSHORT.apache_openoffice)
+ICONPREFIX.apache_openoffice = $(UNIXFILENAME.apache_openoffice:s/.//g)
 

Modified: openoffice/branches/l10n/main/sysui/desktop/redhat/redhat-menus.spec
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sysui/desktop/redhat/redhat-menus.spec?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sysui/desktop/redhat/redhat-menus.spec (original)
+++ openoffice/branches/l10n/main/sysui/desktop/redhat/redhat-menus.spec Sun Feb  3 13:23:59 2013
@@ -29,7 +29,7 @@ Vendor: Apache Software Foundation
 AutoReqProv: no
 BuildArch: noarch
 Requires: redhat-release
-Provides: openoffice.org3-desktop-integration
+Provides: apache_openoffice3-desktop-integration
 %define _unpackaged_files_terminate_build 0
 %define _binary_filedigest_algorithm 1
 %define _binary_payload w9.gzdio

Modified: openoffice/branches/l10n/main/sysui/desktop/share/brand.pl
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sysui/desktop/share/brand.pl?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sysui/desktop/share/brand.pl (original)
+++ openoffice/branches/l10n/main/sysui/desktop/share/brand.pl Sun Feb  3 13:23:59 2013
@@ -34,8 +34,8 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 $destdir = pop @ARGV;
 mkdir $destdir,0777;
 
-$productname = "OpenOffice.org";
-$productfilename = "openoffice";
+$productname = "Apache OpenOffice";
+$productfilename = "apacheopenoffice";
 $prefix = "";
 $iconprefix = "";
 

Modified: openoffice/branches/l10n/main/sysui/desktop/share/create_mime_xml.pl
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sysui/desktop/share/create_mime_xml.pl?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sysui/desktop/share/create_mime_xml.pl (original)
+++ openoffice/branches/l10n/main/sysui/desktop/share/create_mime_xml.pl Sun Feb  3 13:23:59 2013
@@ -21,7 +21,7 @@
 # *************************************************************
 use File::Basename;
 $basedir = dirname($0);
-$productname = 'OpenOffice.org';
+$productname = 'Apache OpenOffice';
 $mimedir = $basedir.'/../mimetypes';
 
 $FS= ' ';		# field seperator (space) - for documents.ulf 

Modified: openoffice/branches/l10n/main/sysui/desktop/share/create_tree.sh
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sysui/desktop/share/create_tree.sh?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sysui/desktop/share/create_tree.sh (original)
+++ openoffice/branches/l10n/main/sysui/desktop/share/create_tree.sh Sun Feb  3 13:23:59 2013
@@ -121,8 +121,8 @@ cp printeradmin.sh ${DESTDIR}/usr/bin/${
 chmod 0755 ${DESTDIR}/usr/bin/${PREFIX} ${DESTDIR}/usr/bin/${PREFIX}-printeradmin
 
 mkdir -p ${DESTDIR}/usr/share/mime/packages
-cp openoffice.org.xml ${DESTDIR}/usr/share/mime/packages/
-chmod 0644 ${DESTDIR}/usr/share/mime/packages/openoffice.org.xml
+cp apacheopenoffice.xml ${DESTDIR}/usr/share/mime/packages/
+chmod 0644 ${DESTDIR}/usr/share/mime/packages/apacheopenoffice.xml
 
 mkdir -p ${DESTDIR}/usr/share/applications
 for i in `cat launcherlist`; do

Modified: openoffice/branches/l10n/main/sysui/desktop/share/launcher_comment.ulf
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sysui/desktop/share/launcher_comment.ulf?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sysui/desktop/share/launcher_comment.ulf (original)
+++ openoffice/branches/l10n/main/sysui/desktop/share/launcher_comment.ulf Sun Feb  3 13:23:59 2013
@@ -38,5 +38,5 @@ en-US = "Create and edit scientific form
 en-US = "Manage databases, create queries and reports to track and manage your information by using Base."
 
 [startcenter]
-en-US = "The office productivity suite compatible to the open and standardized ODF document format. Supported by Oracle."
+en-US = "The office productivity suite compatible to the open and standardized ODF document format. Supported by Apache OpenOffice."
 

Modified: openoffice/branches/l10n/main/sysui/desktop/share/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sysui/desktop/share/makefile.mk?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sysui/desktop/share/makefile.mk (original)
+++ openoffice/branches/l10n/main/sysui/desktop/share/makefile.mk Sun Feb  3 13:23:59 2013
@@ -157,8 +157,8 @@ $(LAUNCHERFLAGFILE) : $(LAUNCHERDEPN) 
 #
 # Create shared mime info xml file
 #
-$(COMMONMISC)$/{$(PRODUCTLIST)}$/openoffice.org.xml : ../mimetypes/{$(MIMELIST)}.desktop create_mime_xml.pl
-$(COMMONMISC)$/{$(PRODUCTLIST)}$/openoffice.org.xml : $(ULFDIR)$/documents.ulf
+$(COMMONMISC)$/{$(PRODUCTLIST)}$/apacheopenoffice.xml : ../mimetypes/{$(MIMELIST)}.desktop create_mime_xml.pl
+$(COMMONMISC)$/{$(PRODUCTLIST)}$/apacheopenoffice.xml : $(ULFDIR)$/documents.ulf
 	@echo Create shared mime info xml file ..
 	@echo ---------------------------------
 	@$(PERL) create_mime_xml.pl $< > $@.$(INPATH)
@@ -173,8 +173,8 @@ $(COMMONMISC)$/{$(PRODUCTLIST)}$/openoff
 	@@-$(MKDIRHIER) $(@:d)
 	@echo Creating GNOME .keys file for $(@:d:d:f) ..
 	@echo ---------------------------------
-	@$(PERL) brand.pl -p $(PRODUCTNAME.$(@:d:d:f)) -u $(UNIXFILENAME.$(@:d:d:f)) --iconprefix "$(ICONPREFIX.$(@:d:d:f))-" $< $(MISC)/$(@:d:d:f)
-	@$(PERL) translate.pl -p $(PRODUCTNAME.$(@:d:d:f)) -d $(MISC)/$(@:d:d:f) --ext "keys" --key "description" $(ULFDIR)$/documents.ulf
+	@$(PERL) brand.pl -p "$(PRODUCTNAME.$(@:d:d:f))" -u $(UNIXFILENAME.$(@:d:d:f)) --iconprefix "$(ICONPREFIX.$(@:d:d:f))-" $< $(MISC)/$(@:d:d:f)
+	@$(PERL) translate.pl -p "$(PRODUCTNAME.$(@:d:d:f))" -d $(MISC)/$(@:d:d:f) --ext "keys" --key "description" $(ULFDIR)$/documents.ulf
 	@cat $(MISC)/$(@:d:d:f)/{$(MIMELIST)}.keys > $@.$(INPATH)
 	@mv -f $@.$(INPATH) $@
 
@@ -249,7 +249,7 @@ $(COMMONMISC)$/{$(PRODUCTLIST)}$/build.f
 	$(COMMONMISC)$/{$(PRODUCTLIST)}$/create_tree.sh \
 	$(COMMONMISC)$/{$(PRODUCTLIST)}$/openoffice.keys \
 	$(COMMONMISC)$/{$(PRODUCTLIST)}$/openoffice.mime \
-	$(COMMONMISC)$/{$(PRODUCTLIST)}$/openoffice.org.xml	\
+	$(COMMONMISC)$/{$(PRODUCTLIST)}$/apacheopenoffice.xml	\
 	$(COMMONMISC)$/{$(PRODUCTLIST)}$/openoffice.applications \
 	$(COMMONMISC)$/{$(PRODUCTLIST)}$/{openoffice printeradmin}.sh
 	@touch $@

Modified: openoffice/branches/l10n/main/sysui/desktop/share/translate.pl
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sysui/desktop/share/translate.pl?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sysui/desktop/share/translate.pl (original)
+++ openoffice/branches/l10n/main/sysui/desktop/share/translate.pl Sun Feb  3 13:23:59 2013
@@ -32,7 +32,7 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 
 my ($prefix, $ext, $key);
-$productname = "OpenOffice.org";
+$productname = "Apache OpenOffice";
 $workdir = ".";
 
 while ($_ = $ARGV[0], /^-/) {

Modified: openoffice/branches/l10n/main/sysui/desktop/slackware/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sysui/desktop/slackware/makefile.mk?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sysui/desktop/slackware/makefile.mk (original)
+++ openoffice/branches/l10n/main/sysui/desktop/slackware/makefile.mk Sun Feb  3 13:23:59 2013
@@ -36,7 +36,7 @@ TARGET=slackware
 
 # --- Files --------------------------------------------------------
 
-MENUFILES=$(PKGDIR)$/{$(PRODUCTLIST)}3.4-$(TARGET)-menus-$(PKGVERSION)-noarch-$(PKGREV).tgz
+MENUFILES=$(PKGDIR)$/{$(PRODUCTLIST)}3.5-$(TARGET)-menus-$(PKGVERSION)-noarch-$(PKGREV).tgz
 
 # --- Targets -------------------------------------------------------
 
@@ -55,26 +55,26 @@ $(MISC)/$(TARGET)/usr/share/applications
 # FIXME: removal of *-extension.* only to create identical packages to OOF680
 %/usr/share/applications : 
 	@$(MKDIRHIER) $@
-	/bin/sh -c "cd $(COMMONMISC)$/$(*:b:s/-/ /:1:s/3.4//); DESTDIR=$(shell @cd $*; pwd) GNOMEDIR="" ICON_PREFIX=$(ICONPREFIX.$(*:b:s/-/ /:1:s/3.4//)) KDEMAINDIR=/opt/kde .$/create_tree.sh"
+	/bin/sh -c "cd $(COMMONMISC)$/$(*:b:s/-/ /:1:s/3.5//); DESTDIR=$(shell @cd $*; pwd) GNOMEDIR="" ICON_PREFIX=$(ICONPREFIX.$(*:b:s/-/ /:1:s/3.5//)) KDEMAINDIR=/opt/kde .$/create_tree.sh"
 	$(RM) $*$/opt$/kde$/share$/icons$/*$/*$/*$/*-extension.png	
 	$(RM) $*$/opt$/kde$/share$/mimelnk$/application$/*-extension.desktop 
 	$(RM) $*$/usr$/share$/applications$/*.desktop
 	$(RM) $*$/usr$/bin$/soffice
 
 %$/install$/doinst.sh : update-script
-	@echo "( cd etc ; rm -rf $(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.4//)) )" > $@
-	@echo "( cd etc ; ln -snf /opt/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.4//):s/-//) $(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.4//)) )" >> $@
+	@echo "( cd etc ; rm -rf $(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.5//)) )" > $@
+	@echo "( cd etc ; ln -snf /opt/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.5//):s/-//) $(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.5//)) )" >> $@
 	@echo "( cd usr/bin ; rm -rf soffice )" >> $@
-	@echo "( cd usr/bin ; ln -sf /etc/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.4//))/program/soffice soffice )" >> $@
-	@echo -e $(foreach,i,$(shell @cat $(COMMONMISC)$/$(*:b:s/-/ /:1:s/3.4//)/launcherlist) "\n( cd usr/share/applications ; rm -rf $(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.4//))-$i )\n( cd usr/share/applications ; ln -sf /etc/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.4//))/share/xdg/$i $(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.4//))-$i )") >> $@
+	@echo "( cd usr/bin ; ln -sf /etc/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.5//))/program/soffice soffice )" >> $@
+	@echo -e $(foreach,i,$(shell @cat $(COMMONMISC)$/$(*:b:s/-/ /:1:s/3.5//)/launcherlist) "\n( cd usr/share/applications ; rm -rf $(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.5//))-$i )\n( cd usr/share/applications ; ln -sf /etc/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.5//))/share/xdg/$i $(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.5//))-$i )") >> $@
 	@cat $< >> $@
 
 %$/install$/slack-desc : slack-desc
 	@$(MKDIRHIER) $(@:d)
-	@sed -e "s/PKGNAME/$(*:b:s/-/ /:1:s/3.4//)-$(TARGET)-menus/g" -e "s/PKGVERSION/$(PKGVERSION.$(*:b:s/-/ /:1:s/3.4//))/g" \
-		-e "s/LONGPRODUCTNAME/$(PRODUCTNAME.$(*:b:s/-/ /:1:s/3.4//)) $(PRODUCTVERSION.$(*:b:s/-/ /:1:s/3.4//))/g" \
-		-e "s/PRODUCTNAME/$(PRODUCTNAME.$(*:b:s/-/ /:1:s/3.4//))/g" \
-		-e "s/UNIXFILENAME/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.4//))/g" $< > $@
+	@sed -e "s/PKGNAME/$(*:b:s/-/ /:1:s/3.5//)-$(TARGET)-menus/g" -e "s/PKGVERSION/$(PKGVERSION.$(*:b:s/-/ /:1:s/3.5//))/g" \
+		-e "s/LONGPRODUCTNAME/$(PRODUCTNAME.$(*:b:s/-/ /:1:s/3.5//)) $(PRODUCTVERSION.$(*:b:s/-/ /:1:s/3.5//))/g" \
+		-e "s/PRODUCTNAME/$(PRODUCTNAME.$(*:b:s/-/ /:1:s/3.5//))/g" \
+		-e "s/UNIXFILENAME/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.5//))/g" $< > $@
 
 # needed to satisfy the slackware package tools - they need
 # the entries like this

Modified: openoffice/branches/l10n/main/sysui/desktop/solaris/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sysui/desktop/solaris/makefile.mk?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sysui/desktop/solaris/makefile.mk (original)
+++ openoffice/branches/l10n/main/sysui/desktop/solaris/makefile.mk Sun Feb  3 13:23:59 2013
@@ -94,9 +94,9 @@ $(MISC)/{$(PRODUCTLIST)}/postremove : $$
 # --- openoffice.xml---------------------------
 
 .IF "$(common_build)"=="TRUE"
-# Copy the openoffice.org.xml file to $(MISC) 
-#$(MISC)/$(foreach,i,$(PRODUCTLIST) $i/$i.xml) :  $(COMMONMISC)/$$(@:b)/openoffice.org.xml
-$(MISC)/$(foreach,i,$(PRODUCTLIST) $(MISC)/$i/openoffice.org.xml) :  $(COMMONMISC)/$$(@:b)/openoffice.org.xml
+# Copy the apacheopenoffice.xml file to $(MISC) 
+#$(MISC)/$(foreach,i,$(PRODUCTLIST) $i/$i.xml) :  $(COMMONMISC)/$$(@:b)/apacheopenoffice.xml
+$(MISC)/$(foreach,i,$(PRODUCTLIST) $(MISC)/$i/apacheopenoffice.xml) :  $(COMMONMISC)/$$(@:b)/apacheopenoffice.xml
 	$(MKDIRHIER) $(@:d)
 	echo hier hier $@
 	cat $< | tr -d "\015" > $@
@@ -112,7 +112,7 @@ $(MISC)/{$(PRODUCTLIST)}$/prototype : $$
 # --- packaging ---------------------------------------------------
 
 #$(PKGFILES) : $(MISC)/{$(PRODUCTLIST)}/{copyright pkginfo depend mailcap postinstall postremove} makefile.mk $(MISC)/$$(@:b:b:s/-desktop-integration//)/$$(@:b:b:s/-desktop-integration//).xml
-$(PKGFILES) : $(MISC)/{$(PRODUCTLIST)}/{copyright pkginfo depend mailcap postinstall postremove} makefile.mk $(MISC)/$$(@:b:b:s/-desktop-integration//)/openoffice.org.xml
+$(PKGFILES) : $(MISC)/{$(PRODUCTLIST)}/{copyright pkginfo depend mailcap postinstall postremove} makefile.mk $(MISC)/$$(@:b:b:s/-desktop-integration//)/apacheopenoffice.xml
 $(PKGFILES) : $(MISC)$/{$(PRODUCTLIST)}$/prototype
 	@-$(RM) $(BIN)$/$(@:f)
 	@$(MKDIRHIER) $(@:d)

Modified: openoffice/branches/l10n/main/sysui/desktop/solaris/prototype
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sysui/desktop/solaris/prototype?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sysui/desktop/solaris/prototype (original)
+++ openoffice/branches/l10n/main/sysui/desktop/solaris/prototype Sun Feb  3 13:23:59 2013
@@ -21,7 +21,7 @@ d none share/mime/packages 0755 root oth
 !default 0644 root bin
 e build etc/mime.types=./mime.types
 e build etc/mailcap=mailcap
-f none usr/share/mime/packages/%PREFIX.xml=%SOURCE/openoffice.org.xml
+f none usr/share/mime/packages/%PREFIX.xml=%SOURCE/apacheopenoffice.xml
 f none usr/share/application-registry/%PREFIX.applications=%SOURCE/openoffice.applications
 s none usr/share/applications/%PREFIX-writer.desktop=../../../opt/%PREFIX/share/xdg/writer.desktop
 s none usr/share/applications/%PREFIX-calc.desktop=../../../opt/%PREFIX/share/xdg/calc.desktop

Modified: openoffice/branches/l10n/main/sysui/desktop/suse/suse-menus.spec
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sysui/desktop/suse/suse-menus.spec?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sysui/desktop/suse/suse-menus.spec (original)
+++ openoffice/branches/l10n/main/sysui/desktop/suse/suse-menus.spec Sun Feb  3 13:23:59 2013
@@ -32,7 +32,7 @@ BuildArch: noarch
 Requires: /etc/SuSE-release
 # .. but not for Sun JDS
 Conflicts: SunDesktopVersion
-Provides: openoffice.org3-desktop-integration
+Provides: apacheopenoffice3-desktop-integration
 %define _unpackaged_files_terminate_build 0
 %define _binary_filedigest_algorithm 1
 %define _binary_payload w9.gzdio

Modified: openoffice/branches/l10n/main/testtools/source/bridgetest/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/testtools/source/bridgetest/makefile.mk?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/testtools/source/bridgetest/makefile.mk (original)
+++ openoffice/branches/l10n/main/testtools/source/bridgetest/makefile.mk Sun Feb  3 13:23:59 2013
@@ -134,7 +134,7 @@ ALLTAR: \
 
 runtest : $(DLLDEST)$/uno_types.rdb $(DLLDEST)$/uno_services.rdb makefile.mk \
         $(SHL1TARGETN) $(SHL2TARGETN) $(SHL3TARGETN)
-.IF "$(COM)$(OS)$(CPU)" == "GCCMACOSXP" || "$(COM)$(OS)$(CPU)" == "GCCFREEBSDI"
+.IF "$(COM)$(OS)$(CPU)" == "GCCMACOSXP" || "$(COM)$(OS)$(CPU)" == "GCCFREEBSDI" || "$(OS)$(CPU)"=="SOLARISS"
 	@echo "Mac OSX PPC GCC ad FreeBDS/i386 fails this test! likely broken UNO bridge. Fix me."
 .ELSE
         cd $(DLLDEST) && $(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/uno \

Modified: openoffice/branches/l10n/main/testtools/source/bridgetest/pyuno/core.py
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/testtools/source/bridgetest/pyuno/core.py?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/testtools/source/bridgetest/pyuno/core.py (original)
+++ openoffice/branches/l10n/main/testtools/source/bridgetest/pyuno/core.py Sun Feb  3 13:23:59 2013
@@ -211,7 +211,7 @@ class TestCase( unittest.TestCase):
           wasHere = 0
           try:
                 raise ioExc( "huhuh" , self.tobj )
-          except unoExc , instance:
+          except unoExc as instance:
                 wasHere = 1
                 self.failUnless( wasHere , "exceptiont test 1" )
 
@@ -239,7 +239,7 @@ class TestCase( unittest.TestCase):
                 self.failUnless( 0 , "exception test 5a" )
           except ioExc:
                 self.failUnless( 0 , "exception test 5b" )
-          except illegalArg, i:
+          except illegalArg as i:
                 self.failUnless( 1 == i.ArgumentPosition , "exception member test" )
                 self.failUnless( "foo" == i.Message , "exception member test 2 " )
                 wasHere = 1

Modified: openoffice/branches/l10n/main/toolkit/Library_tk.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/toolkit/Library_tk.mk?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/toolkit/Library_tk.mk (original)
+++ openoffice/branches/l10n/main/toolkit/Library_tk.mk Sun Feb  3 13:23:59 2013
@@ -84,8 +84,6 @@ $(eval $(call gb_Library_add_exception_o
 	toolkit/source/awt/vclxwindow \
 	toolkit/source/awt/vclxwindow1 \
 	toolkit/source/awt/vclxwindows \
-	toolkit/source/awt/xsimpleanimation \
-	toolkit/source/awt/xthrobber \
 	toolkit/source/controls/accessiblecontrolcontext \
 	toolkit/source/controls/controlmodelcontainerbase \
 	toolkit/source/controls/dialogcontrol \
@@ -105,9 +103,7 @@ $(eval $(call gb_Library_add_exception_o
 	toolkit/source/controls/stdtabcontroller \
 	toolkit/source/controls/stdtabcontrollermodel \
 	toolkit/source/controls/tkscrollbar \
-	toolkit/source/controls/tksimpleanimation \
 	toolkit/source/controls/tkspinbutton \
-	toolkit/source/controls/tkthrobber \
 	toolkit/source/controls/animatedimages \
 	toolkit/source/controls/spinningprogress \
 	toolkit/source/controls/tree/treecontrol \

Modified: openoffice/branches/l10n/main/toolkit/Module_toolkit.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/toolkit/Module_toolkit.mk?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/toolkit/Module_toolkit.mk (original)
+++ openoffice/branches/l10n/main/toolkit/Module_toolkit.mk Sun Feb  3 13:23:59 2013
@@ -24,7 +24,6 @@
 $(eval $(call gb_Module_Module,toolkit))
 
 $(eval $(call gb_Module_add_targets,toolkit,\
-	AllLangResTarget_tk \
 	Library_tk \
 	Package_inc \
 	Package_source \

Modified: openoffice/branches/l10n/main/toolkit/inc/pch/precompiled_toolkit.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/toolkit/inc/pch/precompiled_toolkit.hxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/toolkit/inc/pch/precompiled_toolkit.hxx (original)
+++ openoffice/branches/l10n/main/toolkit/inc/pch/precompiled_toolkit.hxx Sun Feb  3 13:23:59 2013
@@ -110,7 +110,6 @@
 #include "com/sun/star/awt/XLayoutConstrains.hpp"
 #include "com/sun/star/awt/XListBox.hpp"
 #include "com/sun/star/awt/XMenuBar.hpp"
-#include "com/sun/star/awt/XMenuExtended.hpp"
 #include "com/sun/star/awt/XMenuListener.hpp"
 #include "com/sun/star/awt/XMessageBox.hpp"
 #include "com/sun/star/awt/XMouseListener.hpp"

Modified: openoffice/branches/l10n/main/toolkit/inc/toolkit/awt/vclxgraphics.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/toolkit/inc/toolkit/awt/vclxgraphics.hxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/toolkit/inc/toolkit/awt/vclxgraphics.hxx (original)
+++ openoffice/branches/l10n/main/toolkit/inc/toolkit/awt/vclxgraphics.hxx Sun Feb  3 13:23:59 2013
@@ -26,6 +26,7 @@
 
 
 #include <com/sun/star/awt/XGraphics.hpp>
+#include <com/sun/star/graphic/XGraphic.hpp>
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <cppuhelper/weak.hxx>
@@ -50,7 +51,7 @@ class Region;
 //	class VCLXGraphics
 //	----------------------------------------------------
 
-class VCLXGraphics :	public ::com::sun::star::awt::XGraphics, 
+class VCLXGraphics :	public ::com::sun::star::awt::XGraphics,
 						public ::com::sun::star::lang::XTypeProvider,
 						public ::com::sun::star::lang::XUnoTunnel,
 						public ::cppu::OWeakObject
@@ -68,6 +69,8 @@ private:
 	RasterOp		meRasterOp;
 	Region*			mpClipRegion;
 
+    void initAttrs();
+
 protected:
 	vos::IMutex&	GetMutex() { return mrMutex; }
 
@@ -97,36 +100,47 @@ public:	
 	::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >	SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
 	::com::sun::star::uno::Sequence< sal_Int8 >						SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
 
-	// ::com::sun::star::awt::XGraphics
-    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice >	SAL_CALL getDevice(  ) throw(::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::awt::SimpleFontMetric								SAL_CALL getFontMetric() throw(::com::sun::star::uno::RuntimeException);
-    void		SAL_CALL setFont( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont >& xNewFont ) throw(::com::sun::star::uno::RuntimeException);
-    void		SAL_CALL selectFont( const ::com::sun::star::awt::FontDescriptor& aDescription ) throw(::com::sun::star::uno::RuntimeException);
-    void		SAL_CALL setTextColor( sal_Int32 nColor ) throw(::com::sun::star::uno::RuntimeException);
-    void		SAL_CALL setTextFillColor( sal_Int32 nColor ) throw(::com::sun::star::uno::RuntimeException);
-    void		SAL_CALL setLineColor( sal_Int32 nColor ) throw(::com::sun::star::uno::RuntimeException);
-    void		SAL_CALL setFillColor( sal_Int32 nColor ) throw(::com::sun::star::uno::RuntimeException);
-    void		SAL_CALL setRasterOp( ::com::sun::star::awt::RasterOperation ROP ) throw(::com::sun::star::uno::RuntimeException);
-    void		SAL_CALL setClipRegion( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion >& Clipping ) throw(::com::sun::star::uno::RuntimeException);
-    void		SAL_CALL intersectClipRegion( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion >& xClipping ) throw(::com::sun::star::uno::RuntimeException);
-    void		SAL_CALL push(  ) throw(::com::sun::star::uno::RuntimeException);
-    void		SAL_CALL pop(  ) throw(::com::sun::star::uno::RuntimeException);
-    void		SAL_CALL copy( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice >& xSource, sal_Int32 nSourceX, sal_Int32 nSourceY, sal_Int32 nSourceWidth, sal_Int32 nSourceHeight, sal_Int32 nDestX, sal_Int32 nDestY, sal_Int32 nDestWidth, sal_Int32 nDestHeight ) throw(::com::sun::star::uno::RuntimeException);
-    void		SAL_CALL draw( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDisplayBitmap >& xBitmapHandle, sal_Int32 SourceX, sal_Int32 SourceY, sal_Int32 SourceWidth, sal_Int32 SourceHeight, sal_Int32 DestX, sal_Int32 DestY, sal_Int32 DestWidth, sal_Int32 DestHeight ) throw(::com::sun::star::uno::RuntimeException);
-    void		SAL_CALL drawPixel( sal_Int32 X, sal_Int32 Y ) throw(::com::sun::star::uno::RuntimeException);
-    void		SAL_CALL drawLine( sal_Int32 X1, sal_Int32 Y1, sal_Int32 X2, sal_Int32 Y2 ) throw(::com::sun::star::uno::RuntimeException);
-    void		SAL_CALL drawRect( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height ) throw(::com::sun::star::uno::RuntimeException);
-    void		SAL_CALL drawRoundedRect( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int32 nHorzRound, sal_Int32 nVertRound ) throw(::com::sun::star::uno::RuntimeException);
-    void		SAL_CALL drawPolyLine( const ::com::sun::star::uno::Sequence< sal_Int32 >& DataX, const ::com::sun::star::uno::Sequence< sal_Int32 >& DataY ) throw(::com::sun::star::uno::RuntimeException);
-    void		SAL_CALL drawPolygon( const ::com::sun::star::uno::Sequence< sal_Int32 >& DataX, const ::com::sun::star::uno::Sequence< sal_Int32 >& DataY ) throw(::com::sun::star::uno::RuntimeException);
-    void		SAL_CALL drawPolyPolygon( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< sal_Int32 > >& DataX, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< sal_Int32 > >& DataY ) throw(::com::sun::star::uno::RuntimeException);
-    void		SAL_CALL drawEllipse( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height ) throw(::com::sun::star::uno::RuntimeException);
-    void		SAL_CALL drawArc( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int32 X1, sal_Int32 Y1, sal_Int32 X2, sal_Int32 Y2 ) throw(::com::sun::star::uno::RuntimeException);
-    void		SAL_CALL drawPie( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int32 X1, sal_Int32 Y1, sal_Int32 X2, sal_Int32 Y2 ) throw(::com::sun::star::uno::RuntimeException);
-    void		SAL_CALL drawChord( sal_Int32 nX, sal_Int32 nY, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int32 nX1, sal_Int32 nY1, sal_Int32 nX2, sal_Int32 nY2 ) throw(::com::sun::star::uno::RuntimeException);
-    void		SAL_CALL drawGradient( sal_Int32 nX, sal_Int32 nY, sal_Int32 nWidth, sal_Int32 Height, const ::com::sun::star::awt::Gradient& aGradient ) throw(::com::sun::star::uno::RuntimeException);
-    void		SAL_CALL drawText( sal_Int32 X, sal_Int32 Y, const ::rtl::OUString& Text ) throw(::com::sun::star::uno::RuntimeException);
-    void		SAL_CALL drawTextArray( sal_Int32 X, sal_Int32 Y, const ::rtl::OUString& Text, const ::com::sun::star::uno::Sequence< sal_Int32 >& Longs ) throw(::com::sun::star::uno::RuntimeException);
+    // ::com::sun::star::awt::XGraphics Attributes
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice > SAL_CALL getDevice() throw (::com::sun::star::uno::RuntimeException);
+    virtual ::sal_Int32 SAL_CALL getTextColor() throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setTextColor( ::sal_Int32 _textcolor ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::sal_Int32 SAL_CALL getTextFillColor() throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setTextFillColor( ::sal_Int32 _textfillcolor ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::sal_Int32 SAL_CALL getLineColor() throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setLineColor( ::sal_Int32 _linecolor ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::sal_Int32 SAL_CALL getFillColor() throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setFillColor( ::sal_Int32 _fillcolor ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::awt::RasterOperation SAL_CALL getRasterOp() throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setRasterOp( ::com::sun::star::awt::RasterOperation _rasterop ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont() throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setFont( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont >& _font ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::awt::SimpleFontMetric SAL_CALL getFontMetric() throw (::com::sun::star::uno::RuntimeException);
+
+    // ::com::sun::star::awt::XGraphics Methods
+    virtual void SAL_CALL selectFont( const ::com::sun::star::awt::FontDescriptor& aDescription ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setClipRegion( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion >& Clipping ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL intersectClipRegion( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion >& xClipping ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL push(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL pop(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL clear( const ::com::sun::star::awt::Rectangle& aRect ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL copy( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice >& xSource, ::sal_Int32 nSourceX, ::sal_Int32 nSourceY, ::sal_Int32 nSourceWidth, ::sal_Int32 nSourceHeight, ::sal_Int32 nDestX, ::sal_Int32 nDestY, ::sal_Int32 nDestWidth, ::sal_Int32 nDestHeight ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL draw( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDisplayBitmap >& xBitmapHandle, ::sal_Int32 SourceX, ::sal_Int32 SourceY, ::sal_Int32 SourceWidth, ::sal_Int32 SourceHeight, ::sal_Int32 DestX, ::sal_Int32 DestY, ::sal_Int32 DestWidth, ::sal_Int32 DestHeight ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL drawPixel( ::sal_Int32 X, ::sal_Int32 Y ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL drawLine( ::sal_Int32 X1, ::sal_Int32 Y1, ::sal_Int32 X2, ::sal_Int32 Y2 ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL drawRect( ::sal_Int32 X, ::sal_Int32 Y, ::sal_Int32 Width, ::sal_Int32 Height ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL drawRoundedRect( ::sal_Int32 X, ::sal_Int32 Y, ::sal_Int32 Width, ::sal_Int32 Height, ::sal_Int32 nHorzRound, ::sal_Int32 nVertRound ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL drawPolyLine( const ::com::sun::star::uno::Sequence< ::sal_Int32 >& DataX, const ::com::sun::star::uno::Sequence< ::sal_Int32 >& DataY ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL drawPolygon( const ::com::sun::star::uno::Sequence< ::sal_Int32 >& DataX, const ::com::sun::star::uno::Sequence< ::sal_Int32 >& DataY ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL drawPolyPolygon( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::sal_Int32 > >& DataX, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::sal_Int32 > >& DataY ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL drawEllipse( ::sal_Int32 X, ::sal_Int32 Y, ::sal_Int32 Width, ::sal_Int32 Height ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL drawArc( ::sal_Int32 X, ::sal_Int32 Y, ::sal_Int32 Width, ::sal_Int32 Height, ::sal_Int32 X1, ::sal_Int32 Y1, ::sal_Int32 X2, ::sal_Int32 Y2 ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL drawPie( ::sal_Int32 X, ::sal_Int32 Y, ::sal_Int32 Width, ::sal_Int32 Height, ::sal_Int32 X1, ::sal_Int32 Y1, ::sal_Int32 X2, ::sal_Int32 Y2 ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL drawChord( ::sal_Int32 nX, ::sal_Int32 nY, ::sal_Int32 nWidth, ::sal_Int32 nHeight, ::sal_Int32 nX1, ::sal_Int32 nY1, ::sal_Int32 nX2, ::sal_Int32 nY2 ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL drawGradient( ::sal_Int32 nX, ::sal_Int32 nY, ::sal_Int32 nWidth, ::sal_Int32 Height, const ::com::sun::star::awt::Gradient& aGradient ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL drawText( ::sal_Int32 X, ::sal_Int32 Y, const ::rtl::OUString& Text ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL drawTextArray( ::sal_Int32 X, ::sal_Int32 Y, const ::rtl::OUString& Text, const ::com::sun::star::uno::Sequence< ::sal_Int32 >& Longs ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL drawImage( ::sal_Int32 nX, ::sal_Int32 nY, ::sal_Int32 nWidth, ::sal_Int32 nHeight, ::sal_Int16 nStyle, const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >& aGraphic ) throw (::com::sun::star::uno::RuntimeException);
+
 };
 
 

Modified: openoffice/branches/l10n/main/toolkit/inc/toolkit/awt/vclxmenu.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/toolkit/inc/toolkit/awt/vclxmenu.hxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/toolkit/inc/toolkit/awt/vclxmenu.hxx (original)
+++ openoffice/branches/l10n/main/toolkit/inc/toolkit/awt/vclxmenu.hxx Sun Feb  3 13:23:59 2013
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,176 +7,144 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
-
-
 #ifndef _TOOLKIT_AWT_VCLXMENU_HXX_
 #define _TOOLKIT_AWT_VCLXMENU_HXX_
 
 #include <toolkit/dllapi.h>
-#include <com/sun/star/awt/XMenuBarExtended.hpp>
-#include <com/sun/star/awt/XPopupMenuExtended.hpp>
+#include <toolkit/helper/listenermultiplexer.hxx>
+
+#include <com/sun/star/awt/XMenuBar.hpp>
+#include <com/sun/star/awt/XPopupMenu.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
+
 #include <cppuhelper/weak.hxx>
 #include <osl/mutex.hxx>
-
-#include <tools/list.hxx>
 #include <tools/link.hxx>
+#include <tools/list.hxx>
 
-#include <toolkit/helper/listenermultiplexer.hxx>
+namespace css = ::com::sun::star;
 
 class Menu;
 class MenuBar;
 class VclSimpleEvent;
 
-DECLARE_LIST( PopupMenuRefList, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu >* )
+DECLARE_LIST( PopupMenuRefList, css::uno::Reference< css::awt::XPopupMenu >* )
 
-//	----------------------------------------------------
-//	class VCLXMenu
-//	----------------------------------------------------
-
-class TOOLKIT_DLLPUBLIC VCLXMenu :  public ::com::sun::star::awt::XMenuBarExtended,
-                                    public ::com::sun::star::awt::XPopupMenuExtended,
-                                    public ::com::sun::star::lang::XServiceInfo,
-                                    public ::com::sun::star::lang::XTypeProvider,
-                                    public ::com::sun::star::lang::XUnoTunnel,
-                                    public ::cppu::OWeakObject
+class TOOLKIT_DLLPUBLIC VCLXMenu : public css::awt::XMenuBar,
+                                   public css::awt::XPopupMenu,
+                                   public css::lang::XServiceInfo,
+                                   public css::lang::XTypeProvider,
+                                   public css::lang::XUnoTunnel,
+                                   public ::cppu::OWeakObject
 {
 private:
-	::osl::Mutex			maMutex;
-	Menu*					mpMenu;
-	MenuListenerMultiplexer	maMenuListeners;
-	PopupMenuRefList		maPopupMenueRefs;
+    ::osl::Mutex                maMutex;
+    Menu*                       mpMenu;
+    MenuListenerMultiplexer     maMenuListeners;
+    PopupMenuRefList            maPopupMenueRefs;
 
 protected:
-	::osl::Mutex&			GetMutex() { return maMutex; }
+    ::osl::Mutex&               GetMutex() { return maMutex; }
 
-	DECL_LINK( 	 	MenuEventListener, VclSimpleEvent* );
+    DECL_LINK( MenuEventListener, VclSimpleEvent* );
 
-	void			ImplCreateMenu( sal_Bool bPopup );
+    void ImplCreateMenu( sal_Bool bPopup );
 
 public:
-					VCLXMenu();
-					VCLXMenu( Menu* pMenu );
-					~VCLXMenu();
-
-
-	Menu*			GetMenu() const { return mpMenu; }
-	sal_Bool			IsPopupMenu() const;
-
-	// ::com::sun::star::uno::XInterface
-    ::com::sun::star::uno::Any	SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
-	void						SAL_CALL acquire() throw()	{ OWeakObject::acquire(); }
-	void						SAL_CALL release() throw()	{ OWeakObject::release(); }
-
-	// ::com::sun::star::lang::XUnoTunnel
-	static const ::com::sun::star::uno::Sequence< sal_Int8 >&	GetUnoTunnelId() throw();
-	static VCLXMenu*											GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw();
-	sal_Int64													SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException);
-
-	// ::com::sun::star::lang::XTypeProvider
-	::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >	SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
-	::com::sun::star::uno::Sequence< sal_Int8 >						SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
-
-	// ::com::sun::star::awt::XMenu
-    void SAL_CALL addMenuListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMenuListener >& xListener ) throw(::com::sun::star::uno::RuntimeException);
-    void SAL_CALL removeMenuListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMenuListener >& xListener ) throw(::com::sun::star::uno::RuntimeException);
-    void SAL_CALL insertItem( sal_Int16 nItemId, const ::rtl::OUString& aText, sal_Int16 nItemStyle, sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException);
-    void SAL_CALL removeItem( sal_Int16 nPos, sal_Int16 nCount ) throw(::com::sun::star::uno::RuntimeException);
-    sal_Int16 SAL_CALL getItemCount(  ) throw(::com::sun::star::uno::RuntimeException);
-    sal_Int16 SAL_CALL getItemId( sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException);
-    sal_Int16 SAL_CALL getItemPos( sal_Int16 nId ) throw(::com::sun::star::uno::RuntimeException);
-    void SAL_CALL enableItem( sal_Int16 nItemId, sal_Bool bEnable ) throw(::com::sun::star::uno::RuntimeException);
-    sal_Bool SAL_CALL isItemEnabled( sal_Int16 nItemId ) throw(::com::sun::star::uno::RuntimeException);
-    void SAL_CALL setItemText( sal_Int16 nItemId, const ::rtl::OUString& aText ) throw(::com::sun::star::uno::RuntimeException);
-    ::rtl::OUString SAL_CALL getItemText( sal_Int16 nItemId ) throw(::com::sun::star::uno::RuntimeException);
-    void SAL_CALL setPopupMenu( sal_Int16 nItemId, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu >& aPopupMenu ) throw(::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu > SAL_CALL getPopupMenu( sal_Int16 nItemId ) throw(::com::sun::star::uno::RuntimeException);
-
-	// ::com::sun::star::awt::XPopupMenu
-    void SAL_CALL insertSeparator( sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException);
-    void SAL_CALL setDefaultItem( sal_Int16 nItemId ) throw(::com::sun::star::uno::RuntimeException);
-    sal_Int16 SAL_CALL getDefaultItem(  ) throw(::com::sun::star::uno::RuntimeException);
-    void SAL_CALL checkItem( sal_Int16 nItemId, sal_Bool bCheck ) throw(::com::sun::star::uno::RuntimeException);
-    sal_Bool SAL_CALL isItemChecked( sal_Int16 nItemId ) throw(::com::sun::star::uno::RuntimeException);
-    sal_Int16 SAL_CALL execute( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent, const ::com::sun::star::awt::Rectangle& Area, sal_Int16 Direction ) throw(::com::sun::star::uno::RuntimeException);
-
-	// ::com::sun::star::awt::XMenuBar
-
-    // ::com::sun::star::awt::XMenuExtended
-    virtual void SAL_CALL setCommand( sal_Int16 nItemId, const ::rtl::OUString& aCommand ) throw (::com::sun::star::uno::RuntimeException);
-    virtual ::rtl::OUString SAL_CALL getCommand( sal_Int16 nItemId ) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setHelpCommand( sal_Int16 nItemId, const ::rtl::OUString& aHelp ) throw (::com::sun::star::uno::RuntimeException);
-    virtual ::rtl::OUString SAL_CALL getHelpCommand( sal_Int16 nItemId ) throw (::com::sun::star::uno::RuntimeException);
-
-    // ========================================================================
-    // ========================================================================
-    // ========================================================================
-
-    // XMenuExtended2 Methods
-    virtual ::sal_Bool SAL_CALL isPopupMenu(  ) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL clear(  ) throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::awt::MenuItemType SAL_CALL getItemType( ::sal_Int16 nItemPos ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL hideDisabledEntries( ::sal_Bool bHide ) throw (::com::sun::star::uno::RuntimeException);
-
-    // XMenuBarExtended Methods
-
-    // XPopupMenuExtended Methods
-    virtual ::sal_Bool SAL_CALL isInExecute(  ) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL endExecute(  ) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setLogo( const ::com::sun::star::awt::MenuLogo& aMenuLogo ) throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::awt::MenuLogo SAL_CALL getLogo(  ) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL enableAutoMnemonics( ::sal_Bool bEnable ) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setAcceleratorKeyEvent( ::sal_Int16 nItemId, const ::com::sun::star::awt::KeyEvent& aKeyEvent ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::awt::KeyEvent SAL_CALL getAcceleratorKeyEvent( ::sal_Int16 nItemId ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setHelpText( ::sal_Int16 nItemId, const ::rtl::OUString& sHelpText ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
-    virtual ::rtl::OUString SAL_CALL getHelpText( ::sal_Int16 nItemId ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setTipHelpText( ::sal_Int16 nItemId, const ::rtl::OUString& sTipHelpText ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
-    virtual ::rtl::OUString SAL_CALL getTipHelpText( ::sal_Int16 nItemId ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setItemImage( ::sal_Int16 nItemId, const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >& xGraphic, ::sal_Bool bScale ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > SAL_CALL getItemImage( ::sal_Int16 nItemId ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setItemImageAngle( ::sal_Int16 nItemId, ::sal_Int32 nAngle ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
-    virtual ::sal_Int32 SAL_CALL getItemImageAngle( ::sal_Int16 nItemId ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setItemImageMirrorMode( ::sal_Int16 nItemId, ::sal_Bool bMirror ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
-    virtual ::sal_Bool SAL_CALL isItemImageInMirrorMode( ::sal_Int16 nItemId ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
-
-    // ::com::sun::star::lang::XServiceInfo
-    virtual ::rtl::OUString SAL_CALL getImplementationName(  ) throw (::com::sun::star::uno::RuntimeException);
-    virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) throw (::com::sun::star::uno::RuntimeException);
-
+    VCLXMenu();
+    VCLXMenu( Menu* pMenu );
+    ~VCLXMenu();
+
+    Menu*    GetMenu() const { return mpMenu; }
+    sal_Bool IsPopupMenu() const;
+
+    // css::uno::XInterface
+    css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException);
+    void SAL_CALL acquire() throw() { OWeakObject::acquire(); }
+    void SAL_CALL release() throw() { OWeakObject::release(); }
+
+    // css::lang::XUnoTunnel
+    static const css::uno::Sequence< sal_Int8 >&  GetUnoTunnelId() throw();
+    static VCLXMenu* GetImplementation( const css::uno::Reference< css::uno::XInterface >& rxIFace ) throw();
+    sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rIdentifier ) throw(css::uno::RuntimeException);
+
+    // css::lang::XTypeProvider
+    css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw(css::uno::RuntimeException);
+    css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException);
+
+    // css::awt::XMenu
+    virtual void SAL_CALL addMenuListener( const css::uno::Reference< css::awt::XMenuListener >& xListener ) throw (css::uno::RuntimeException);
+    virtual void SAL_CALL removeMenuListener( const css::uno::Reference< css::awt::XMenuListener >& xListener ) throw (css::uno::RuntimeException);
+    virtual void SAL_CALL insertItem( ::sal_Int16 nItemId, const ::rtl::OUString& aText, ::sal_Int16 nItemStyle, ::sal_Int16 nItemPos ) throw (css::uno::RuntimeException);
+    virtual void SAL_CALL removeItem( ::sal_Int16 nItemPos, ::sal_Int16 nCount ) throw (css::uno::RuntimeException);
+    virtual void SAL_CALL clear(  ) throw (css::uno::RuntimeException);
+    virtual ::sal_Int16 SAL_CALL getItemCount(  ) throw (css::uno::RuntimeException);
+    virtual ::sal_Int16 SAL_CALL getItemId( ::sal_Int16 nItemPos ) throw (css::uno::RuntimeException);
+    virtual ::sal_Int16 SAL_CALL getItemPos( ::sal_Int16 nItemId ) throw (css::uno::RuntimeException);
+    virtual css::awt::MenuItemType SAL_CALL getItemType( ::sal_Int16 nItemPos ) throw (css::uno::RuntimeException);
+    virtual void SAL_CALL enableItem( ::sal_Int16 nItemId, ::sal_Bool bEnable ) throw (css::uno::RuntimeException);
+    virtual ::sal_Bool SAL_CALL isItemEnabled( ::sal_Int16 nItemId ) throw (css::uno::RuntimeException);
+    virtual void SAL_CALL hideDisabledEntries( ::sal_Bool bHide ) throw (css::uno::RuntimeException);
+    virtual void SAL_CALL enableAutoMnemonics( ::sal_Bool bEnable ) throw (css::uno::RuntimeException);
+    virtual void SAL_CALL setItemText( ::sal_Int16 nItemId, const ::rtl::OUString& aText ) throw (css::uno::RuntimeException);
+    virtual ::rtl::OUString SAL_CALL getItemText( ::sal_Int16 nItemId ) throw (css::uno::RuntimeException);
+    virtual void SAL_CALL setCommand( ::sal_Int16 nItemId, const ::rtl::OUString& aCommand ) throw (css::uno::RuntimeException);
+    virtual ::rtl::OUString SAL_CALL getCommand( ::sal_Int16 nItemId ) throw (css::uno::RuntimeException);
+    virtual void SAL_CALL setHelpCommand( ::sal_Int16 nItemId, const ::rtl::OUString& aCommand ) throw (css::uno::RuntimeException);
+    virtual ::rtl::OUString SAL_CALL getHelpCommand( ::sal_Int16 nItemId ) throw (css::uno::RuntimeException);
+    virtual void SAL_CALL setHelpText( ::sal_Int16 nItemId, const ::rtl::OUString& sHelpText ) throw (css::uno::RuntimeException);
+    virtual ::rtl::OUString SAL_CALL getHelpText( ::sal_Int16 nItemId ) throw (css::uno::RuntimeException);
+    virtual void SAL_CALL setTipHelpText( ::sal_Int16 nItemId, const ::rtl::OUString& sTipHelpText ) throw (css::uno::RuntimeException);
+    virtual ::rtl::OUString SAL_CALL getTipHelpText( ::sal_Int16 nItemId ) throw (css::uno::RuntimeException);
+    virtual ::sal_Bool SAL_CALL isPopupMenu(  ) throw (css::uno::RuntimeException);
+    virtual void SAL_CALL setPopupMenu( ::sal_Int16 nItemId, const css::uno::Reference< css::awt::XPopupMenu >& aPopupMenu ) throw (css::uno::RuntimeException);
+    virtual css::uno::Reference< css::awt::XPopupMenu > SAL_CALL getPopupMenu( ::sal_Int16 nItemId ) throw (css::uno::RuntimeException);
+
+    // css::awt::XPopupMenu
+    virtual void SAL_CALL insertSeparator( ::sal_Int16 nItemPos ) throw (css::uno::RuntimeException);
+    virtual void SAL_CALL setDefaultItem( ::sal_Int16 nItemId ) throw (css::uno::RuntimeException);
+    virtual ::sal_Int16 SAL_CALL getDefaultItem(  ) throw (css::uno::RuntimeException);
+    virtual void SAL_CALL checkItem( ::sal_Int16 nItemId, ::sal_Bool bCheck ) throw (css::uno::RuntimeException);
+    virtual ::sal_Bool SAL_CALL isItemChecked( ::sal_Int16 nItemId ) throw (css::uno::RuntimeException);
+    virtual ::sal_Int16 SAL_CALL execute( const css::uno::Reference< css::awt::XWindowPeer >& Parent, const css::awt::Point& Position, ::sal_Int16 Direction ) throw (css::uno::RuntimeException);
+    virtual ::sal_Bool SAL_CALL isInExecute(  ) throw (css::uno::RuntimeException);
+    virtual void SAL_CALL endExecute(  ) throw (css::uno::RuntimeException);
+    virtual void SAL_CALL setAcceleratorKeyEvent( ::sal_Int16 nItemId, const css::awt::KeyEvent& aKeyEvent ) throw (css::uno::RuntimeException);
+    virtual css::awt::KeyEvent SAL_CALL getAcceleratorKeyEvent( ::sal_Int16 nItemId ) throw (css::uno::RuntimeException);
+    virtual void SAL_CALL setItemImage( ::sal_Int16 nItemId, const css::uno::Reference< css::graphic::XGraphic >& xGraphic, ::sal_Bool bScale ) throw (css::uno::RuntimeException);
+    virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL getItemImage( ::sal_Int16 nItemId ) throw (css::uno::RuntimeException);
+
+    // css::lang::XServiceInfo
+    virtual ::rtl::OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException);
+    virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (css::uno::RuntimeException);
+    virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException);
 };
 
-//	----------------------------------------------------
-//	class VCLXMenuBar
-//	----------------------------------------------------
 class TOOLKIT_DLLPUBLIC VCLXMenuBar : public VCLXMenu
 {
 public:
-		VCLXMenuBar();
-        VCLXMenuBar( MenuBar* pMenuBar );
+    VCLXMenuBar();
+    VCLXMenuBar( MenuBar* pMenuBar );
 };
 
-//	----------------------------------------------------
-//	class VCLXPopupMenu
-//	----------------------------------------------------
 class TOOLKIT_DLLPUBLIC VCLXPopupMenu : public VCLXMenu
 {
 public:
-		VCLXPopupMenu();
+    VCLXPopupMenu();
 };
 
-#endif // _TOOLKIT_AWT_VCLXMENU_HXX_
+#endif

Modified: openoffice/branches/l10n/main/toolkit/inc/toolkit/awt/vclxtoolkit.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/toolkit/inc/toolkit/awt/vclxtoolkit.hxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/toolkit/inc/toolkit/awt/vclxtoolkit.hxx (original)
+++ openoffice/branches/l10n/main/toolkit/inc/toolkit/awt/vclxtoolkit.hxx Sun Feb  3 13:23:59 2013
@@ -135,7 +135,7 @@ public:	
 	::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > SAL_CALL createSystemChild( const ::com::sun::star::uno::Any& Parent, const ::com::sun::star::uno::Sequence< sal_Int8 >& ProcessId, sal_Int16 SystemType ) throw(::com::sun::star::uno::RuntimeException);
 
     // ::com::sun::star::awt::XMessageBoxFactory
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMessageBox > SAL_CALL createMessageBox( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& aParent, const ::com::sun::star::awt::Rectangle& aPosSize, const ::rtl::OUString& aType, ::sal_Int32 aButtons, const ::rtl::OUString& aTitle, const ::rtl::OUString& aMessage ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMessageBox > SAL_CALL createMessageBox( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& aParent, ::com::sun::star::awt::MessageBoxType eType, ::sal_Int32 nButtons, const ::rtl::OUString& sTitle, const ::rtl::OUString& sMessage ) throw (::com::sun::star::uno::RuntimeException);
 
     // ::com::sun::star::awt::XDataTransfer
 	::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragGestureRecognizer > SAL_CALL getDragGestureRecognizer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& window ) throw(::com::sun::star::uno::RuntimeException);

Modified: openoffice/branches/l10n/main/toolkit/inc/toolkit/helper/listenermultiplexer.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/toolkit/inc/toolkit/helper/listenermultiplexer.hxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/toolkit/inc/toolkit/helper/listenermultiplexer.hxx (original)
+++ openoffice/branches/l10n/main/toolkit/inc/toolkit/helper/listenermultiplexer.hxx Sun Feb  3 13:23:59 2013
@@ -209,10 +209,10 @@ DECL_LISTENERMULTIPLEXER_END
 //	class MenuListenerMultiplexer
 //	----------------------------------------------------
 DECL_LISTENERMULTIPLEXER_START( MenuListenerMultiplexer, ::com::sun::star::awt::XMenuListener )
-    void SAL_CALL highlight( const ::com::sun::star::awt::MenuEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException);
-    void SAL_CALL select( const ::com::sun::star::awt::MenuEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException);
-    void SAL_CALL activate( const ::com::sun::star::awt::MenuEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException);
-    void SAL_CALL deactivate( const ::com::sun::star::awt::MenuEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException);
+    void SAL_CALL itemHighlighted( const ::com::sun::star::awt::MenuEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException);
+    void SAL_CALL itemSelected( const ::com::sun::star::awt::MenuEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException);
+    void SAL_CALL itemActivated( const ::com::sun::star::awt::MenuEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException);
+    void SAL_CALL itemDeactivated( const ::com::sun::star::awt::MenuEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException);
 DECL_LISTENERMULTIPLEXER_END
 
 //	----------------------------------------------------

Modified: openoffice/branches/l10n/main/toolkit/inc/toolkit/helper/servicenames.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/toolkit/inc/toolkit/helper/servicenames.hxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/toolkit/inc/toolkit/helper/servicenames.hxx (original)
+++ openoffice/branches/l10n/main/toolkit/inc/toolkit/helper/servicenames.hxx Sun Feb  3 13:23:59 2013
@@ -95,10 +95,6 @@ extern const sal_Char __FAR_DATA szServi
 extern const sal_Char __FAR_DATA szServiceName_GridColumn[];
 extern const sal_Char __FAR_DATA szServiceName_SortableGridDataModel[];
 
-extern const sal_Char __FAR_DATA szServiceName_UnoSimpleAnimationControl[], szServiceName2_UnoSimpleAnimationControl[];
-extern const sal_Char __FAR_DATA szServiceName_UnoSimpleAnimationControlModel[], szServiceName2_UnoSimpleAnimationControlModel[];
-extern const sal_Char __FAR_DATA szServiceName_UnoThrobberControl[], szServiceName2_UnoThrobberControl[];
-extern const sal_Char __FAR_DATA szServiceName_UnoThrobberControlModel[], szServiceName2_UnoThrobberControlModel[];
 extern const sal_Char __FAR_DATA szServiceName_AnimatedImagesControl[];
 extern const sal_Char __FAR_DATA szServiceName_AnimatedImagesControlModel[];
 extern const sal_Char __FAR_DATA szServiceName_SpinningProgressControlModel[];

Modified: openoffice/branches/l10n/main/toolkit/qa/unoapi/knownissues.xcl
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/toolkit/qa/unoapi/knownissues.xcl?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/toolkit/qa/unoapi/knownissues.xcl (original)
+++ openoffice/branches/l10n/main/toolkit/qa/unoapi/knownissues.xcl Sun Feb  3 13:23:59 2013
@@ -122,22 +122,6 @@ toolkit.UnoControlFormattedField
 toolkit.UnoControlListBox
 # -> disabled in toolkit.sce
 
-### i86020 ###
-toolkit.UnoSimpleAnimationControl
-# -> disabled in toolkit.sce
-
-### i86021 ###
-toolkit.UnoSimpleAnimationControlModel
-# -> disabled in toolkit.sce
-
-### i86022 ###
-toolkit.UnoThrobberControl
-# -> disabled in toolkit.sce
-
-### i86023 ###
-toolkit.UnoThrobberControlModel
-# -> disabled in toolkit.sce
-
 ### i86298 ###
 toolkit.UnoTreeControl
 # -> disabled in toolkit.sce
@@ -161,10 +145,8 @@ toolkit.UnoControlListBox::com::sun::sta
 toolkit.UnoControlEdit::com::sun::star::awt::XView
 toolkit.UnoControlImageControl::com::sun::star::awt::XView
 toolkit.UnoControlDialog::com::sun::star::awt::XView
-toolkit.UnoThrobberControl::com::sun::star::awt::XView
 toolkit.UnoControlFileControl::com::sun::star::awt::XView
 toolkit.UnoControlCurrencyField::com::sun::star::awt::XView
-toolkit.UnoSimpleAnimationControl::com::sun::star::awt::XView
 toolkit.UnoControlComboBox::com::sun::star::awt::XView
 toolkit.UnoControlNumericField::com::sun::star::awt::XView
 toolkit.UnoControlCheckBox::com::sun::star::awt::XView
@@ -201,7 +183,6 @@ toolkit.UnoControlContainer::com::sun::s
 toolkit.UnoControlFixedText::com::sun::star::lang::XComponent
 toolkit.UnoControlListBox::com::sun::star::lang::XComponent
 toolkit.UnoControlCheckBoxModel::com::sun::star::lang::XComponent
-toolkit.UnoThrobberControlModel::com::sun::star::lang::XComponent
 toolkit.UnoControlEditModel::com::sun::star::lang::XComponent
 toolkit.UnoControlEdit::com::sun::star::lang::XComponent
 toolkit.UnoControlImageControl::com::sun::star::lang::XComponent
@@ -209,12 +190,9 @@ toolkit.UnoControlDialog::com::sun::star
 toolkit.UnoControlGroupBoxModel::com::sun::star::lang::XComponent
 toolkit.UnoControlImageControlModel::com::sun::star::lang::XComponent
 toolkit.UnoControlNumericFieldModel::com::sun::star::lang::XComponent
-toolkit.UnoSimpleAnimationControlModel::com::sun::star::lang::XComponent
-toolkit.UnoThrobberControl::com::sun::star::lang::XComponent
 toolkit.UnoControlFileControl::com::sun::star::lang::XComponent
 toolkit.UnoControlCurrencyField::com::sun::star::lang::XComponent
 toolkit.UnoControlComboBoxModel::com::sun::star::lang::XComponent
-toolkit.UnoSimpleAnimationControl::com::sun::star::lang::XComponent
 toolkit.UnoControlComboBox::com::sun::star::lang::XComponent
 toolkit.UnoControlNumericField::com::sun::star::lang::XComponent
 toolkit.UnoControlScrollBarModel::com::sun::star::lang::XComponent

Modified: openoffice/branches/l10n/main/toolkit/qa/unoapi/toolkit.sce
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/toolkit/qa/unoapi/toolkit.sce?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/toolkit/qa/unoapi/toolkit.sce (original)
+++ openoffice/branches/l10n/main/toolkit/qa/unoapi/toolkit.sce Sun Feb  3 13:23:59 2013
@@ -87,11 +87,7 @@
 -o toolkit.UnoControlTimeField
 -o toolkit.UnoControlTimeFieldModel
 -o toolkit.UnoScrollBarControl
-#i86020 -o toolkit.UnoSimpleAnimationControl
-#i86021 -o toolkit.UnoSimpleAnimationControlModel
 -o toolkit.UnoSpinButtonControl
 -o toolkit.UnoSpinButtonControlModel
-#i86022 -o toolkit.UnoThrobberControl
-#i86023 -o toolkit.UnoThrobberControlModel
 #i86298 -o toolkit.UnoTreeControl
 -o toolkit.UnoTreeModel



Mime
View raw message