openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stev...@apache.org
Subject svn commit: r1441343 [17/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/odk/examples/DevelopersGuide/GUI/MessageBox.java
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/odk/examples/DevelopersGuide/GUI/MessageBox.java?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/odk/examples/DevelopersGuide/GUI/MessageBox.java (original)
+++ openoffice/branches/ia2/main/odk/examples/DevelopersGuide/GUI/MessageBox.java Fri Feb  1 08:46:00 2013
@@ -22,6 +22,7 @@
 
 
 import com.sun.star.awt.Rectangle;
+import com.sun.star.awt.MessageBoxType;
 import com.sun.star.awt.XMessageBox;
 import com.sun.star.awt.XMessageBoxFactory;
 import com.sun.star.awt.XVclWindowPeer;
@@ -164,9 +165,7 @@ public class MessageBox  {
         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);
+            XMessageBox xMessageBox = xMessageBoxFactory.createMessageBox(_xParentWindowPeer, MessageBoxType.ERRORBOX, com.sun.star.awt.MessageBoxButtons.BUTTONS_OK, _sTitle, _sMessage);
             xComponent = (XComponent) UnoRuntime.queryInterface(XComponent.class, xMessageBox);
             if (xMessageBox != null){
                 short nResult = xMessageBox.execute();

Modified: openoffice/branches/ia2/main/odk/examples/DevelopersGuide/GUI/UnoMenu.java
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/odk/examples/DevelopersGuide/GUI/UnoMenu.java?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/odk/examples/DevelopersGuide/GUI/UnoMenu.java (original)
+++ openoffice/branches/ia2/main/odk/examples/DevelopersGuide/GUI/UnoMenu.java Fri Feb  1 08:46:00 2013
@@ -25,7 +25,6 @@ import com.sun.star.awt.Rectangle;
 import com.sun.star.awt.WindowAttribute;
 import com.sun.star.awt.WindowClass;
 import com.sun.star.awt.XMenuBar;
-import com.sun.star.awt.XMenuExtended;
 import com.sun.star.awt.XMenuListener;
 import com.sun.star.awt.XPopupMenu;
 import com.sun.star.awt.XToolkit;
@@ -67,21 +66,26 @@ public UnoMenu(XComponentContext _xConte
     XPopupMenu xPopupMenu = null;
     try{
         // create a popup menu
-        Object oPopupMenu = m_xMCF.createInstanceWithContext("stardiv.Toolkit.VCLXPopupMenu", m_xContext);
+        Object oPopupMenu = m_xMCF.createInstanceWithContext("com.sun.star.awt.PopupMenu", m_xContext);
         xPopupMenu = (XPopupMenu) UnoRuntime.queryInterface(XPopupMenu.class, oPopupMenu);
-        XMenuExtended xMenuExtended = (XMenuExtended) UnoRuntime.queryInterface(XMenuExtended.class, xPopupMenu);
 
-        xPopupMenu.insertItem((short) 0, "~First Entry", MenuItemStyle.AUTOCHECK, (short) 0);
-        xPopupMenu.insertItem((short) 1, "First ~Radio Entry", (short) (MenuItemStyle.RADIOCHECK + MenuItemStyle.AUTOCHECK), (short) 1);
-        xPopupMenu.insertItem((short) 2, "~Second Radio Entry", (short) (MenuItemStyle.RADIOCHECK + MenuItemStyle.AUTOCHECK), (short) 2);
-        xPopupMenu.insertItem((short) 3, "~Third RadioEntry",(short) (MenuItemStyle.RADIOCHECK + MenuItemStyle.AUTOCHECK), (short) 3);
-        xPopupMenu.insertSeparator((short)4);
-        xPopupMenu.insertItem((short) 4, "F~ifth Entry", (short) (MenuItemStyle.CHECKABLE + MenuItemStyle.AUTOCHECK), (short) 5);
-        xPopupMenu.insertItem((short) 5, "~Fourth Entry", (short) (MenuItemStyle.CHECKABLE + MenuItemStyle.AUTOCHECK), (short) 6);
-        xPopupMenu.enableItem((short) 1, false);
-        xPopupMenu.insertItem((short) 6, "~Sixth Entry", (short) 0, (short) 7);
-        xPopupMenu.insertItem((short) 7, "~Close Dialog", (short) 0, (short) 8);
-        xPopupMenu.checkItem((short) 2, true);
+        // ID must start be > 0
+        short nId = 1;
+        short nPos = 0;
+
+        xPopupMenu.insertItem(nId++, "First Entry", MenuItemStyle.AUTOCHECK, nPos++);
+        xPopupMenu.insertItem(nId++, "First Radio Entry", (short) (MenuItemStyle.RADIOCHECK + MenuItemStyle.AUTOCHECK), nPos++);
+        xPopupMenu.insertItem(nId++, "Second Radio Entry", (short) (MenuItemStyle.RADIOCHECK + MenuItemStyle.AUTOCHECK), nPos++);
+        xPopupMenu.insertItem(nId++, "Third RadioEntry",(short) (MenuItemStyle.RADIOCHECK + MenuItemStyle.AUTOCHECK), nPos++);
+        xPopupMenu.insertSeparator(nPos++);
+        xPopupMenu.insertItem(nId++, "Fifth Entry", (short) (MenuItemStyle.CHECKABLE + MenuItemStyle.AUTOCHECK), nPos++);
+        xPopupMenu.insertItem(nId++, "Fourth Entry", (short) (MenuItemStyle.CHECKABLE + MenuItemStyle.AUTOCHECK), nPos++);
+        xPopupMenu.insertItem(nId++, "Sixth Entry", (short) 0, nPos++);
+        xPopupMenu.insertItem(nId++, "Close Dialog", (short) 0, nPos++);
+
+        xPopupMenu.enableItem((short) 2, false);
+        xPopupMenu.checkItem((short) 3, true);
+
         xPopupMenu.addMenuListener(this);
     }catch( Exception e ) {
         throw new java.lang.RuntimeException("cannot happen...");    
@@ -93,12 +97,12 @@ public UnoMenu(XComponentContext _xConte
     public void addMenuBar(XTopWindow _xTopWindow, XMenuListener _xMenuListener){
     try{
         // create a menubar at the global MultiComponentFactory...
-        Object oMenuBar = m_xMCF.createInstanceWithContext("stardiv.Toolkit.VCLXMenuBar", m_xContext);
+        Object oMenuBar = m_xMCF.createInstanceWithContext("com.sun.star.awt.MenuBar", m_xContext);
         // add the menu items...
         XMenuBar xMenuBar = (XMenuBar) UnoRuntime.queryInterface(XMenuBar.class, oMenuBar);
-        xMenuBar.insertItem((short) 0, "~First MenuBar Item", com.sun.star.awt.MenuItemStyle.AUTOCHECK, (short) 0);
-        xMenuBar.insertItem((short) 1, "~Second MenuBar Item", com.sun.star.awt.MenuItemStyle.AUTOCHECK, (short) 1);
-        xMenuBar.setPopupMenu((short) 0, getPopupMenu());
+        xMenuBar.insertItem((short) 1, "~First MenuBar Item", com.sun.star.awt.MenuItemStyle.AUTOCHECK, (short) 0);
+        xMenuBar.insertItem((short) 2, "~Second MenuBar Item", com.sun.star.awt.MenuItemStyle.AUTOCHECK, (short) 1);
+        xMenuBar.setPopupMenu((short) 1, getPopupMenu());
         xMenuBar.addMenuListener(_xMenuListener);
         _xTopWindow.setMenuBar(xMenuBar);
     }catch( Exception e ) {
@@ -157,31 +161,31 @@ public UnoMenu(XComponentContext _xConte
         addMenuBar(xTopWindow, this);
     }
 
-    public void select(MenuEvent menuEvent){
+    public void itemSelected(MenuEvent menuEvent){
         // find out which menu item has been triggered,
         // by getting the menu-id...
         switch (menuEvent.MenuId){
-            case 0:
+            case 1:
                 // add your menu-item-specific code here:
                 break;
-            case 1:
+            case 2:
                 // add your menu-item-specific code here:
                 break;
-            case 7:
+            case 8:
                 closeDialog();
             default:
                 //..
         }
     }
 
-    public void highlight(MenuEvent menuEvent) {
+    public void itemHighlighted(MenuEvent menuEvent) {
         int i = 0;
     }
 
-    public void deactivate(MenuEvent menuEvent) {
+    public void itemDeactivated(MenuEvent menuEvent) {
         int i = 0;    }
 
-    public void activate(MenuEvent menuEvent) {
+    public void itemActivated(MenuEvent menuEvent) {
         int i = 0;
     }
 

Modified: openoffice/branches/ia2/main/odk/examples/DevelopersGuide/GUI/UnoMenu2.java
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/odk/examples/DevelopersGuide/GUI/UnoMenu2.java?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/odk/examples/DevelopersGuide/GUI/UnoMenu2.java (original)
+++ openoffice/branches/ia2/main/odk/examples/DevelopersGuide/GUI/UnoMenu2.java Fri Feb  1 08:46:00 2013
@@ -20,7 +20,7 @@
  *************************************************************/
 
 import com.sun.star.awt.MouseEvent;
-import com.sun.star.awt.Rectangle;
+import com.sun.star.awt.Point;
 import com.sun.star.awt.XControl;
 import com.sun.star.awt.XMouseListener;
 import com.sun.star.awt.XTopWindow;
@@ -99,9 +99,9 @@ public UnoMenu2(XComponentContext _xCont
 
     public void mousePressed(MouseEvent mouseEvent) {
         if (mouseEvent.PopupTrigger){
-            Rectangle aRectangle = new Rectangle(mouseEvent.X, mouseEvent.Y, 0, 0);
+            Point aPos = new Point(mouseEvent.X, mouseEvent.Y);
             XControl xControl = (XControl) UnoRuntime.queryInterface(XControl.class, mouseEvent.Source);
-            getPopupMenu().execute( xControl.getPeer(), aRectangle, com.sun.star.awt.PopupMenuDirection.DEFAULT);    
+            getPopupMenu().execute( xControl.getPeer(), aPos, com.sun.star.awt.PopupMenuDirection.EXECUTE_DEFAULT);
         }
     }
 

Modified: openoffice/branches/ia2/main/odk/examples/cpp/StatusbarController/ModifiedStatusbarController/project.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/odk/examples/cpp/StatusbarController/ModifiedStatusbarController/project.mk?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/odk/examples/cpp/StatusbarController/ModifiedStatusbarController/project.mk (original)
+++ openoffice/branches/ia2/main/odk/examples/cpp/StatusbarController/ModifiedStatusbarController/project.mk Fri Feb  1 08:46:00 2013
@@ -20,7 +20,7 @@
 #**************************************************************
 
 DESCRIPTION_OOO_MIN_VER=3.5.0
-DESCRIPTION_DEP_NAME=OpenOffice.org $(DESCRIPTION_OOO_MIN_VER)
+DESCRIPTION_DEP_NAME=Apache OpenOffice $(DESCRIPTION_OOO_MIN_VER)
 
 EXTENSION_ID=org.apache.openoffice.framework.statusbar.ModifiedStatus
 EXTENSION_VERSION=0.0.1

Modified: openoffice/branches/ia2/main/odk/examples/cpp/StatusbarController/SelectionModeStatusbarController/SelectionModeStatusbarController.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/odk/examples/cpp/StatusbarController/SelectionModeStatusbarController/SelectionModeStatusbarController.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/odk/examples/cpp/StatusbarController/SelectionModeStatusbarController/SelectionModeStatusbarController.cxx (original)
+++ openoffice/branches/ia2/main/odk/examples/cpp/StatusbarController/SelectionModeStatusbarController/SelectionModeStatusbarController.cxx Fri Feb  1 08:46:00 2013
@@ -186,13 +186,8 @@ void SelectionModeStatusbarController::E
 
         xPopupMenu->checkItem( nIdOffset + m_eSelectionMode, sal_True );
 
-        Rectangle aRect;
-        aRect.X = aPos.X;
-        aRect.Y = aPos.Y;
-
         Reference< XWindowPeer > xParent( m_xStatusbarWindow, UNO_QUERY );
-
-        const sal_Int16 nSelId = xPopupMenu->execute( xParent, aRect, PopupMenuDirection::EXECUTE_UP );
+        const sal_Int16 nSelId = xPopupMenu->execute( xParent, aPos, PopupMenuDirection::EXECUTE_UP );
         if ( nSelId )
         {
             Sequence< PropertyValue > aArgs( 1 );

Modified: openoffice/branches/ia2/main/odk/examples/cpp/StatusbarController/SelectionModeStatusbarController/project.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/odk/examples/cpp/StatusbarController/SelectionModeStatusbarController/project.mk?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/odk/examples/cpp/StatusbarController/SelectionModeStatusbarController/project.mk (original)
+++ openoffice/branches/ia2/main/odk/examples/cpp/StatusbarController/SelectionModeStatusbarController/project.mk Fri Feb  1 08:46:00 2013
@@ -20,7 +20,7 @@
 #**************************************************************
 
 DESCRIPTION_OOO_MIN_VER=3.5.0
-DESCRIPTION_DEP_NAME=OpenOffice.org $(DESCRIPTION_OOO_MIN_VER)
+DESCRIPTION_DEP_NAME=Apache OpenOffice $(DESCRIPTION_OOO_MIN_VER)
 
 EXTENSION_ID=org.apache.openoffice.framework.statusbar.SelectionMode
 EXTENSION_VERSION=0.0.1

Modified: openoffice/branches/ia2/main/odk/examples/cpp/StatusbarController/WordCountStatusbarController/project.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/odk/examples/cpp/StatusbarController/WordCountStatusbarController/project.mk?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/odk/examples/cpp/StatusbarController/WordCountStatusbarController/project.mk (original)
+++ openoffice/branches/ia2/main/odk/examples/cpp/StatusbarController/WordCountStatusbarController/project.mk Fri Feb  1 08:46:00 2013
@@ -20,7 +20,7 @@
 #**************************************************************
 
 DESCRIPTION_OOO_MIN_VER=3.5.0
-DESCRIPTION_DEP_NAME=OpenOffice.org $(DESCRIPTION_OOO_MIN_VER)
+DESCRIPTION_DEP_NAME=Apache OpenOffice $(DESCRIPTION_OOO_MIN_VER)
 
 EXTENSION_ID=org.apache.openoffice.framework.statusbar.StatusWordCount
 EXTENSION_VERSION=0.0.1

Modified: openoffice/branches/ia2/main/odk/examples/cpp/complextoolbarcontrols/Addons.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/odk/examples/cpp/complextoolbarcontrols/Addons.xcu?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/odk/examples/cpp/complextoolbarcontrols/Addons.xcu (original)
+++ openoffice/branches/ia2/main/odk/examples/cpp/complextoolbarcontrols/Addons.xcu Fri Feb  1 08:46:00 2013
@@ -1,27 +1,6 @@
-<!--***********************************************************
- * 
- * 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.
- * 
- ***********************************************************-->
-
 <?xml version='1.0' encoding='UTF-8'?>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -29,183 +8,188 @@
  * 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.
- * 
+ *
  ***********************************************************-->
 <oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="Addons" oor:package="org.openoffice.Office">
-	<node oor:name="AddonUI">
-		<node oor:name="OfficeToolBar">
-			<node oor:name="com.sun.star.comp.framework.addon.complextoolbarcontrols" oor:op="replace">
-				<node oor:name="m1" oor:op="replace">
-					<prop oor:name="URL" oor:type="xs:string">
-						<value>vnd.demo.complextoolbarcontrols.demoaddon:ImageButtonCmd</value>
-					</prop>
-					<prop oor:name="Title" oor:type="xs:string">
-						<value xml:lang="en-US">Image Button</value>
-					</prop>
-					<prop oor:name="Target" oor:type="xs:string">
-						<value>_self</value>
-					</prop>
-					<prop oor:name="Context" oor:type="xs:string">
-						<value>com.sun.star.text.TextDocument,com.sun.star.sheet.SpreadsheetDocument</value>
-					</prop>
-					<prop oor:name="ControlType" oor:type="xs:string">
-						<value>ImageButton</value>
-					</prop>
-				</node>
-				<node oor:name="m2" oor:op="replace">
-					<prop oor:name="URL" oor:type="xs:string">
-                        <value>vnd.demo.complextoolbarcontrols.demoaddon:ComboboxCmd</value>
-					</prop>
-					<prop oor:name="Title" oor:type="xs:string">
-						<value xml:lang="en-US">ComboBox</value>
-					</prop>
-					<prop oor:name="Target" oor:type="xs:string">
-						<value>_self</value>
-					</prop>
-					<prop oor:name="Context" oor:type="xs:string">
-						<value>com.sun.star.text.TextDocument,com.sun.star.sheet.SpreadsheetDocument</value>
-					</prop>
-					<prop oor:name="ControlType" oor:type="xs:string">
-						<value>Combobox</value>
-					</prop>
-					<prop oor:name="Width" oor:type="xs:long">
-					    <value>200</value>
-					</prop>
-				</node>
-				<node oor:name="m3" oor:op="replace">
-					<prop oor:name="URL" oor:type="xs:string">
-                        <value>private:separator</value>
-					</prop>
-				</node>
-				<node oor:name="m4" oor:op="replace">
-					<prop oor:name="URL" oor:type="xs:string">
-                        <value>vnd.demo.complextoolbarcontrols.demoaddon:SpinfieldCmd</value>
-					</prop>
-					<prop oor:name="Title" oor:type="xs:string">
-						<value xml:lang="en-US">Spinfield</value>
-					</prop>
-					<prop oor:name="Target" oor:type="xs:string">
-						<value>_self</value>
-					</prop>
-					<prop oor:name="Context" oor:type="xs:string">
-						<value>com.sun.star.text.TextDocument,com.sun.star.sheet.SpreadsheetDocument</value>
-					</prop>
-					<prop oor:name="ControlType" oor:type="xs:string">
-						<value>Spinfield</value>
-					</prop>
-					<prop oor:name="Width" oor:type="xs:long">
-					    <value>70</value>
-					</prop>
-				</node>
-				<node oor:name="m5" oor:op="replace">
-					<prop oor:name="URL" oor:type="xs:string">
-                        <value>private:separator</value>
-					</prop>
-				</node>
-				<node oor:name="m6" oor:op="replace">
-					<prop oor:name="URL" oor:type="xs:string">
-                        <value>vnd.demo.complextoolbarcontrols.demoaddon:EditfieldCmd</value>
-					</prop>
-					<prop oor:name="Title" oor:type="xs:string">
-						<value xml:lang="en-US">Editfield</value>
-					</prop>
-					<prop oor:name="Target" oor:type="xs:string">
-						<value>_self</value>
-					</prop>
-					<prop oor:name="Context" oor:type="xs:string">
-						<value>com.sun.star.text.TextDocument,com.sun.star.sheet.SpreadsheetDocument</value>
-					</prop>
-					<prop oor:name="ControlType" oor:type="xs:string">
-						<value>Editfield</value>
-					</prop>
-					<prop oor:name="Width" oor:type="xs:long">
-					    <value>130</value>
-					</prop>
-				</node>
-				<node oor:name="m7" oor:op="replace">
-					<prop oor:name="URL" oor:type="xs:string">
-                        <value>private:separator</value>
-					</prop>
-				</node>
-				<node oor:name="m8" oor:op="replace">
-					<prop oor:name="URL" oor:type="xs:string">
-                        <value>vnd.demo.complextoolbarcontrols.demoaddon:DropdownboxCmd</value>
-					</prop>
-					<prop oor:name="Title" oor:type="xs:string">
-						<value xml:lang="en-US">Dropdownbox</value>
-					</prop>
-					<prop oor:name="Target" oor:type="xs:string">
-						<value>_self</value>
-					</prop>
-					<prop oor:name="Context" oor:type="xs:string">
-						<value>com.sun.star.text.TextDocument,com.sun.star.sheet.SpreadsheetDocument</value>
-					</prop>
-					<prop oor:name="ControlType" oor:type="xs:string">
-						<value>Dropdownbox</value>
-					</prop>
-					<prop oor:name="Width" oor:type="xs:long">
-					    <value>80</value>
-					</prop>
-				</node>
-				<node oor:name="m9" oor:op="replace">
-					<prop oor:name="URL" oor:type="xs:string">
-                        <value>vnd.demo.complextoolbarcontrols.demoaddon:ToggleDropdownButtonCmd</value>
-					</prop>
-					<prop oor:name="Title" oor:type="xs:string">
-						<value xml:lang="en-US">Toggle Dropdown Button</value>
-					</prop>
-					<prop oor:name="Target" oor:type="xs:string">
-						<value>_self</value>
-					</prop>
-					<prop oor:name="Context" oor:type="xs:string">
-						<value>com.sun.star.text.TextDocument,com.sun.star.sheet.SpreadsheetDocument</value>
-					</prop>
-					<prop oor:name="ControlType" oor:type="xs:string">
-						<value>ToggleDropdownButton</value>
-					</prop>
-				</node>
-				<node oor:name="m10" oor:op="replace">
-					<prop oor:name="URL" oor:type="xs:string">
-                        <value>vnd.demo.complextoolbarcontrols.demoaddon:DropdownButtonCmd</value>
-					</prop>
-					<prop oor:name="Title" oor:type="xs:string">
-						<value xml:lang="en-US">Dropdown Button</value>
-					</prop>
-					<prop oor:name="Target" oor:type="xs:string">
-						<value>_self</value>
-					</prop>
-					<prop oor:name="Context" oor:type="xs:string">
-						<value>com.sun.star.text.TextDocument,com.sun.star.sheet.SpreadsheetDocument</value>
-					</prop>
-					<prop oor:name="ControlType" oor:type="xs:string">
-						<value>DropdownButton</value>
-					</prop>
-				</node>
-			</node>
-		</node>
-		<node oor:name="Images">
+    <node oor:name="AddonUI">
+        <node oor:name="OfficeToolBar">
+            <node oor:name="com.sun.star.comp.framework.addon.complextoolbarcontrols" oor:op="replace">
+                <prop oor:name="Title" oor:type="xs:string">
+                    <value xml:lang="en-US">Complex Toolbar Controls</value>
+                </prop>
+                <node oor:name="ToolBarItems">
+                    <node oor:name="m1" oor:op="replace">
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>vnd.demo.complextoolbarcontrols.demoaddon:ImageButtonCmd</value>
+                        </prop>
+                        <prop oor:name="Title" oor:type="xs:string">
+                            <value xml:lang="en-US">Image Button</value>
+                        </prop>
+                        <prop oor:name="Target" oor:type="xs:string">
+                            <value>_self</value>
+                        </prop>
+                        <prop oor:name="Context" oor:type="xs:string">
+                            <value>com.sun.star.text.TextDocument,com.sun.star.sheet.SpreadsheetDocument</value>
+                        </prop>
+                        <prop oor:name="ControlType" oor:type="xs:string">
+                            <value>ImageButton</value>
+                        </prop>
+                    </node>
+                    <node oor:name="m2" oor:op="replace">
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>vnd.demo.complextoolbarcontrols.demoaddon:ComboboxCmd</value>
+                        </prop>
+                        <prop oor:name="Title" oor:type="xs:string">
+                            <value xml:lang="en-US">ComboBox</value>
+                        </prop>
+                        <prop oor:name="Target" oor:type="xs:string">
+                            <value>_self</value>
+                        </prop>
+                        <prop oor:name="Context" oor:type="xs:string">
+                            <value>com.sun.star.text.TextDocument,com.sun.star.sheet.SpreadsheetDocument</value>
+                        </prop>
+                        <prop oor:name="ControlType" oor:type="xs:string">
+                            <value>Combobox</value>
+                        </prop>
+                        <prop oor:name="Width" oor:type="xs:long">
+                            <value>200</value>
+                        </prop>
+                    </node>
+                    <node oor:name="m3" oor:op="replace">
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>private:separator</value>
+                        </prop>
+                    </node>
+                    <node oor:name="m4" oor:op="replace">
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>vnd.demo.complextoolbarcontrols.demoaddon:SpinfieldCmd</value>
+                        </prop>
+                        <prop oor:name="Title" oor:type="xs:string">
+                            <value xml:lang="en-US">Spinfield</value>
+                        </prop>
+                        <prop oor:name="Target" oor:type="xs:string">
+                            <value>_self</value>
+                        </prop>
+                        <prop oor:name="Context" oor:type="xs:string">
+                            <value>com.sun.star.text.TextDocument,com.sun.star.sheet.SpreadsheetDocument</value>
+                        </prop>
+                        <prop oor:name="ControlType" oor:type="xs:string">
+                            <value>Spinfield</value>
+                        </prop>
+                        <prop oor:name="Width" oor:type="xs:long">
+                            <value>70</value>
+                        </prop>
+                    </node>
+                    <node oor:name="m5" oor:op="replace">
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>private:separator</value>
+                        </prop>
+                    </node>
+                    <node oor:name="m6" oor:op="replace">
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>vnd.demo.complextoolbarcontrols.demoaddon:EditfieldCmd</value>
+                        </prop>
+                        <prop oor:name="Title" oor:type="xs:string">
+                            <value xml:lang="en-US">Editfield</value>
+                        </prop>
+                        <prop oor:name="Target" oor:type="xs:string">
+                            <value>_self</value>
+                        </prop>
+                        <prop oor:name="Context" oor:type="xs:string">
+                            <value>com.sun.star.text.TextDocument,com.sun.star.sheet.SpreadsheetDocument</value>
+                        </prop>
+                        <prop oor:name="ControlType" oor:type="xs:string">
+                            <value>Editfield</value>
+                        </prop>
+                        <prop oor:name="Width" oor:type="xs:long">
+                            <value>130</value>
+                        </prop>
+                    </node>
+                    <node oor:name="m7" oor:op="replace">
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>private:separator</value>
+                        </prop>
+                    </node>
+                    <node oor:name="m8" oor:op="replace">
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>vnd.demo.complextoolbarcontrols.demoaddon:DropdownboxCmd</value>
+                        </prop>
+                        <prop oor:name="Title" oor:type="xs:string">
+                            <value xml:lang="en-US">Dropdownbox</value>
+                        </prop>
+                        <prop oor:name="Target" oor:type="xs:string">
+                            <value>_self</value>
+                        </prop>
+                        <prop oor:name="Context" oor:type="xs:string">
+                            <value>com.sun.star.text.TextDocument,com.sun.star.sheet.SpreadsheetDocument</value>
+                        </prop>
+                        <prop oor:name="ControlType" oor:type="xs:string">
+                            <value>Dropdownbox</value>
+                        </prop>
+                        <prop oor:name="Width" oor:type="xs:long">
+                            <value>80</value>
+                        </prop>
+                    </node>
+                    <node oor:name="m9" oor:op="replace">
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>vnd.demo.complextoolbarcontrols.demoaddon:ToggleDropdownButtonCmd</value>
+                        </prop>
+                        <prop oor:name="Title" oor:type="xs:string">
+                            <value xml:lang="en-US">Toggle Dropdown Button</value>
+                        </prop>
+                        <prop oor:name="Target" oor:type="xs:string">
+                            <value>_self</value>
+                        </prop>
+                        <prop oor:name="Context" oor:type="xs:string">
+                            <value>com.sun.star.text.TextDocument,com.sun.star.sheet.SpreadsheetDocument</value>
+                        </prop>
+                        <prop oor:name="ControlType" oor:type="xs:string">
+                            <value>ToggleDropdownButton</value>
+                        </prop>
+                    </node>
+                    <node oor:name="m10" oor:op="replace">
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>vnd.demo.complextoolbarcontrols.demoaddon:DropdownButtonCmd</value>
+                        </prop>
+                        <prop oor:name="Title" oor:type="xs:string">
+                            <value xml:lang="en-US">Dropdown Button</value>
+                        </prop>
+                        <prop oor:name="Target" oor:type="xs:string">
+                            <value>_self</value>
+                        </prop>
+                        <prop oor:name="Context" oor:type="xs:string">
+                            <value>com.sun.star.text.TextDocument,com.sun.star.sheet.SpreadsheetDocument</value>
+                        </prop>
+                        <prop oor:name="ControlType" oor:type="xs:string">
+                            <value>DropdownButton</value>
+                        </prop>
+                    </node>
+                </node>
+            </node>
+        </node>
+        <node oor:name="Images">
             <node oor:name="vnd.demo.complextoolbarcontrols.image1" oor:op="replace">
-				<prop oor:name="URL">
+                <prop oor:name="URL">
                     <value>vnd.demo.complextoolbarcontrols.demoaddon:ImageButtonCmd</value>
-				</prop>
-				<node oor:name="UserDefinedImages">
-					<prop oor:name="ImageSmallURL" oor:type="xs:string">
+                </prop>
+                <node oor:name="UserDefinedImages">
+                    <prop oor:name="ImageSmallURL" oor:type="xs:string">
                         <value>%origin%/logo_small.png</value>
-					</prop>
-					<prop oor:name="ImageBigURL" oor:type="xs:string">
+                    </prop>
+                    <prop oor:name="ImageBigURL" oor:type="xs:string">
                         <value>%origin%/logo_big.png</value>
-					</prop>
-				</node>
-			</node>
-		</node>
-	</node>
+                    </prop>
+                </node>
+            </node>
+        </node>
+    </node>
 </oor:component-data>

Modified: openoffice/branches/ia2/main/odk/examples/cpp/complextoolbarcontrols/Makefile
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/odk/examples/cpp/complextoolbarcontrols/Makefile?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/odk/examples/cpp/complextoolbarcontrols/Makefile (original)
+++ openoffice/branches/ia2/main/odk/examples/cpp/complextoolbarcontrols/Makefile Fri Feb  1 08:46:00 2013
@@ -44,10 +44,6 @@ COMP_TYPEFLAG = $(OUT_MISC)/cpp_$(COMP_N
 
 CXXFILES = \
            MyProtocolHandler.cxx \
-           MyJob.cxx \
-           MyListener.cxx \
-           WriterListener.cxx \
-           CalcListener.cxx \
            ListenerHelper.cxx \
            exports.cxx
 
@@ -105,10 +101,6 @@ $(OUT_COMP_GEN)/%/manifest.xml :
 	@echo $(SQM)  $(SQM)$(OSEP)manifest:file-entry manifest:media-type="$(QM)application/vnd.sun.star.configuration-data$(QM)" >> $@
 	@echo $(SQM)                       $(SQM)manifest:full-path="$(QM)Addons.xcu$(QM)"/$(CSEP) >> $@
 	@echo $(SQM)  $(SQM)$(OSEP)manifest:file-entry manifest:media-type="$(QM)application/vnd.sun.star.configuration-data$(QM)" >> $@
-	@echo $(SQM)                       $(SQM)manifest:full-path="$(QM)WriterWindowState.xcu$(QM)"/$(CSEP) >> $@
-	@echo $(SQM)  $(SQM)$(OSEP)manifest:file-entry manifest:meda-type="$(QM)application/vnd.sun.star.configuration-data$(QM)" >> $@
-	@echo $(SQM)                       $(SQM)manifest:full-path="$(QM)CalcWindowState.xcu$(QM)"/$(CSEP) >> $@
-	@echo $(SQM)  $(SQM)$(OSEP)manifest:file-entry manifest:media-type="$(QM)application/vnd.sun.star.configuration-data$(QM)" >> $@
 	@echo $(SQM)                       $(SQM)manifest:full-path="$(QM)ProtocolHandler.xcu$(QM)"/$(CSEP) >> $@
 	@echo $(SQM)  $(SQM)$(OSEP)manifest:file-entry manifest:media-type="$(QM)application/vnd.sun.star.uno-components;platform=$(UNOPKG_PLATFORM)$(QM)">> $@
 	@echo $(SQM)                       $(SQM)manifest:full-path="$(QM)$(COMP_NAME).components$(QM)"/$(CSEP)>> $@
@@ -122,9 +114,6 @@ $(COMP_COMPONENTS) :
 	@echo $(OSEP)?xml version="$(QM)1.0$(QM)" encoding="$(QM)UTF-8$(QM)"?$(CSEP) > $@
 	@echo $(OSEP)components xmlns="$(QM)http://openoffice.org/2010/uno-components$(QM)"$(CSEP) >> $@
 	@echo $(SQM)  $(SQM)$(OSEP)component loader="$(QM)com.sun.star.loader.SharedLibrary$(QM)" uri="$(QM)$(UNOPKG_PLATFORM)/$(COMP_IMPL_NAME)$(QM)"$(CSEP) >> $@
-	@echo $(SQM)    $(SQM)$(OSEP)implementation name="$(QM)vnd.My.impl.NewDocListener$(QM)"$(CSEP) >> $@
-	@echo $(SQM)      $(SQM)$(OSEP)service name="$(QM)vnd.My.NewDocListener$(QM)"/$(CSEP) >> $@
-	@echo $(SQM)    $(SQM)$(OSEP)/implementation$(CSEP) >> $@
 	@echo $(SQM)    $(SQM)$(OSEP)implementation name="$(QM)vnd.demo.Impl.ProtocolHandler$(QM)"$(CSEP) >> $@
 	@echo $(SQM)      $(SQM)$(OSEP)service name="$(QM)vnd.demo.ProtocolHandler$(QM)"/$(CSEP) >> $@
 	@echo $(SQM)    $(SQM)$(OSEP)/implementation$(CSEP) >> $@
@@ -132,13 +121,13 @@ $(COMP_COMPONENTS) :
 	@echo $(OSEP)/components$(CSEP) >> $@
 
 # rule for component package file
-$(COMP_PACKAGE) : $(SHAREDLIB_OUT)/$(COMP_IMPL_NAME) Addons.xcu ProtocolHandler.xcu WriterWindowState.xcu CalcWindowState.xcu $(COMP_UNOPKG_MANIFEST) $(COMP_COMPONENTS)
+$(COMP_PACKAGE) : $(SHAREDLIB_OUT)/$(COMP_IMPL_NAME) Addons.xcu ProtocolHandler.xcu $(COMP_UNOPKG_MANIFEST) $(COMP_COMPONENTS)
 	-$(MKDIR) $(subst /,$(PS),$(@D)) && $(DEL) $(subst \\,\,$(subst /,$(PS),$@))
 	-$(MKDIR) $(subst /,$(PS),$(OUT_COMP_GEN)/$(UNOPKG_PLATFORM))
 	$(COPY) $(subst /,$(PS),$<) $(subst /,$(PS),$(OUT_COMP_GEN)/$(UNOPKG_PLATFORM))
 	cd $(subst /,$(PS),$(OUT_COMP_GEN)) && $(SDK_ZIP) -u ../../bin/$(@F) $(COMP_NAME).components
 	cd $(subst /,$(PS),$(OUT_COMP_GEN)) && $(SDK_ZIP) -u ../../bin/$(@F) $(UNOPKG_PLATFORM)/$(<F)
-	$(SDK_ZIP) -u $@ Addons.xcu ProtocolHandler.xcu WriterWindowState.xcu CalcWindowState.xcu logo_small.png logo_big.png
+	$(SDK_ZIP) -u $@ Addons.xcu ProtocolHandler.xcu logo_small.png logo_big.png
 	cd $(subst /,$(PS),$(OUT_COMP_GEN)/$(subst .$(UNOOXT_EXT),,$(@F))) && $(SDK_ZIP) -u ../../../bin/$(@F) META-INF/manifest.xml
 
 $(COMP_REGISTERFLAG) : $(COMP_PACKAGE)
@@ -156,7 +145,7 @@ endif
 
 Example : $(COMP_REGISTERFLAG)
 	@echo --------------------------------------------------------------------------------
-	@echo The "$(QM)ProtocolHandler$(QM)" addon component was installed if SDK_AUTO_DEPLOYMENT = YES.
+	@echo The "$(QM)Complext Toolbar Controlls$(QM)" component was installed if SDK_AUTO_DEPLOYMENT = YES.
 	@echo You can use this component inside your office installation, see the example
 	@echo description.
 	@echo --------------------------------------------------------------------------------

Modified: openoffice/branches/ia2/main/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx (original)
+++ openoffice/branches/ia2/main/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx Fri Feb  1 08:46:00 2013
@@ -30,7 +30,7 @@
 #include <com/sun/star/text/XTextViewCursorSupplier.hpp>
 #include <com/sun/star/sheet/XSpreadsheetView.hpp>
 #include <com/sun/star/system/SystemShellExecuteFlags.hpp>
-#include <com/sun/star/system/XSystemShellExecute.hpp>
+#include <com/sun/star/system/SystemShellExecute.hpp>
 
 
 using namespace com::sun::star::awt;
@@ -40,7 +40,7 @@ using namespace com::sun::star::uno;
 
 using com::sun::star::beans::NamedValue;
 using com::sun::star::beans::PropertyValue;
-using com::sun::star::lang::XMultiServiceFactory;
+using com::sun::star::uno::XComponentContext;
 using com::sun::star::sheet::XSpreadsheetView;
 using com::sun::star::text::XTextViewCursorSupplier;
 using com::sun::star::util::URL;
@@ -50,16 +50,16 @@ ListenerHelper aListenerHelper;
 void BaseDispatch::ShowMessageBox( const Reference< XFrame >& rFrame, const ::rtl::OUString& aTitle, const ::rtl::OUString& aMsgText )
 {
 	if ( !mxToolkit.is() )
-		mxToolkit = Reference< XToolkit > ( mxMSF->createInstance(
-			::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.Toolkit" ))), UNO_QUERY );
+		mxToolkit = Reference< XToolkit > (
+            mxContext->getServiceManager()->createInstanceWithContext(
+			::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.Toolkit" )), mxContext), UNO_QUERY );
 
     Reference< XMessageBoxFactory > xMsgBoxFactory( mxToolkit, UNO_QUERY );
     if ( rFrame.is() && xMsgBoxFactory.is() )
     {
         Reference< XMessageBox > xMsgBox = xMsgBoxFactory->createMessageBox(
             Reference< XWindowPeer >( rFrame->getContainerWindow(), UNO_QUERY ),
-            Rectangle(0,0,300,200),
-            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "infobox" ) ),
+            com::sun::star::awt::MessageBoxType_INFOBOX,
             MessageBoxButtons::BUTTONS_OK,
             aTitle,
             aMsgText );
@@ -146,8 +146,8 @@ Reference< XDispatch > SAL_CALL MyProtoc
 			xRet = aListenerHelper.GetDispatch( mxFrame, aURL.Path );
 			if ( !xRet.is() )
 			{
-				xRet = xCursor.is() ? (BaseDispatch*) new WriterDispatch( mxMSF, mxFrame ) :
-					(BaseDispatch*) new CalcDispatch( mxMSF, mxFrame );
+				xRet = xCursor.is() ? (BaseDispatch*) new WriterDispatch( mxContext, mxFrame ) :
+					(BaseDispatch*) new CalcDispatch( mxContext, mxFrame );
 				aListenerHelper.AddDispatch( xRet, mxFrame, aURL.Path );
 			}
 		}
@@ -193,10 +193,10 @@ Sequence< ::rtl::OUString > SAL_CALL MyP
 
 #undef SERVICE_NAME
 
-Reference< XInterface > SAL_CALL MyProtocolHandler_createInstance( const Reference< XMultiServiceFactory > & rSMgr)
+Reference< XInterface > SAL_CALL MyProtocolHandler_createInstance( const Reference< XComponentContext > & rContext)
 	throw( Exception )
 {
-	return (cppu::OWeakObject*) new MyProtocolHandler( rSMgr );
+	return (cppu::OWeakObject*) new MyProtocolHandler( rContext );
 }
 
 // XServiceInfo
@@ -233,20 +233,17 @@ void SAL_CALL BaseDispatch::dispatch( co
 	{
 		if ( !aURL.Path.compareToAscii( RTL_CONSTASCII_STRINGPARAM( "ImageButtonCmd" ) ) )
 		{
-            // open the OpenOffice.org web page
+            // open the Apache OpenOffice web page
             ::rtl::OUString sURL( RTL_CONSTASCII_USTRINGPARAM( "http://www.openoffice.org" ) );
-            Reference< XSystemShellExecute > xSystemShellExecute( mxMSF->createInstance(
-                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.system.SystemShellExecute" ) ) ), UNO_QUERY );
-            if ( xSystemShellExecute.is() )
+            Reference< XSystemShellExecute > xSystemShellExecute(
+                com::sun::star::system::SystemShellExecute::create( mxContext ) );
+            try
             {
-                try
-                {
-                    xSystemShellExecute->execute( sURL, ::rtl::OUString(), SystemShellExecuteFlags::DEFAULTS );
-                }
-                catch( Exception& rEx )
-                {
-                    (void)rEx;
-                } 
+                xSystemShellExecute->execute( sURL, ::rtl::OUString(), SystemShellExecuteFlags::DEFAULTS );
+            }
+            catch( Exception& rEx )
+            {
+                (void)rEx;
             }
         }
 		else if ( !aURL.Path.compareToAscii( RTL_CONSTASCII_STRINGPARAM( "ComboboxCmd" ) ) )
@@ -502,9 +499,9 @@ void SAL_CALL BaseDispatch::controlEvent
     }
 }
 
-BaseDispatch::BaseDispatch( const Reference< XMultiServiceFactory > &rxMSF,
+BaseDispatch::BaseDispatch( const Reference< XComponentContext > &rxContext,
         const Reference< XFrame >& xFrame, const rtl::OUString& rServiceName )
-        : mxMSF( rxMSF )
+        : mxContext( rxContext )
 		, mxFrame( xFrame )
         , msDocService( rServiceName )
         , mbButtonEnabled( sal_True )
@@ -515,5 +512,5 @@ BaseDispatch::BaseDispatch( const Refere
 BaseDispatch::~BaseDispatch()
 {
 	mxFrame.clear();
-	mxMSF.clear();
+	mxContext.clear();
 }

Modified: openoffice/branches/ia2/main/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.h?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.h (original)
+++ openoffice/branches/ia2/main/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.h Fri Feb  1 08:46:00 2013
@@ -22,6 +22,7 @@
 #ifndef _MyProtocolHandler_HXX
 #define _MyProtocolHandler_HXX
 
+#include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/awt/XToolkit.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
@@ -58,12 +59,12 @@ class MyProtocolHandler : public cppu::W
 >
 {
 private:
-    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMSF;
+    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > mxContext;
 	::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > mxFrame;
 
 public:
-	MyProtocolHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > &rxMSF)
-        : mxMSF( rxMSF ) {}
+	MyProtocolHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext)
+        : mxContext( rxContext ) {}
 
 	// XDispatchProvider
 	virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >
@@ -98,7 +99,7 @@ sal_Bool SAL_CALL MyProtocolHandler_supp
 	throw ( ::com::sun::star::uno::RuntimeException );
 
 ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
-SAL_CALL MyProtocolHandler_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rSMgr)
+SAL_CALL MyProtocolHandler_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & rContext)
 	throw ( ::com::sun::star::uno::Exception );
 
 class BaseDispatch : public cppu::WeakImplHelper2
@@ -109,14 +110,14 @@ class BaseDispatch : public cppu::WeakIm
 {
 protected:
 	::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > mxFrame;
-    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMSF;
+    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > mxContext;
 	::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit > mxToolkit;
     ::rtl::OUString msDocService;
     ::rtl::OUString maComboBoxText;
     sal_Bool        mbButtonEnabled;
 
 public:
-	BaseDispatch( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > &rxMSF,
+	BaseDispatch( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext,
         const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame, const ::rtl::OUString& rServiceName );
 
 	virtual ~BaseDispatch();
@@ -142,18 +143,18 @@ public:
 class WriterDispatch : public BaseDispatch
 {
 public:
-	WriterDispatch( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > &rxMSF,
+	WriterDispatch( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext,
 		const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame )
-        : BaseDispatch( rxMSF, xFrame, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextDocument" ) ) )
+        : BaseDispatch( rxContext, xFrame, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextDocument" ) ) )
 	{}
 };
 
 class CalcDispatch : public BaseDispatch
 {
 public:
-	CalcDispatch( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > &rxMSF,
+	CalcDispatch( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext,
 		const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame )
-        : BaseDispatch( rxMSF, xFrame, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SpreadSheetDocument" ) ) )
+        : BaseDispatch( rxContext, xFrame, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SpreadSheetDocument" ) ) )
 	{}
 };
 

Modified: openoffice/branches/ia2/main/odk/examples/cpp/complextoolbarcontrols/exports.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/odk/examples/cpp/complextoolbarcontrols/exports.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/odk/examples/cpp/complextoolbarcontrols/exports.cxx (original)
+++ openoffice/branches/ia2/main/odk/examples/cpp/complextoolbarcontrols/exports.cxx Fri Feb  1 08:46:00 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,110 +7,56 @@
  * 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.
- * 
+ *
  *************************************************************/
 
-
-
-#include <cppuhelper/factory.hxx>
-
 #include "MyProtocolHandler.h"
-#include "MyListener.h"
 
-namespace css = ::com::sun::star;
+#include <cppuhelper/factory.hxx>
+#include <cppuhelper/implementationentry.hxx>
 
-#if 0
-static void writeInfo(const css::uno::Reference< css::registry::XRegistryKey >& xRegistryKey       ,
-                      const char*                                               pImplementationName,
-                      const char*                                               pServiceName       )
+namespace framework
 {
-    ::rtl::OUStringBuffer sKey(256);
-	sKey.append     (::rtl::OUString::createFromAscii(pImplementationName));
-    sKey.appendAscii("/UNO/SERVICES/");
-    sKey.append     (::rtl::OUString::createFromAscii(pServiceName));
-
-    xRegistryKey->createKey(sKey.makeStringAndClear());
+    namespace complex_toolbar_controls
+    {
+        static ::cppu::ImplementationEntry const s_impl_entries[] =
+        {
+            {
+                MyProtocolHandler_createInstance,
+                MyProtocolHandler_getImplementationName,
+                MyProtocolHandler_getSupportedServiceNames,
+                ::cppu::createSingleComponentFactory,
+                0,
+                0
+            },
+            { 0, 0, 0, 0, 0, 0 }
+        };
+    }
 }
-#endif
 
 extern "C"
 {
-//==================================================================================================
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(const sal_Char**        ppEnvTypeName,
-                                                                                 uno_Environment** ppEnv        )
-{
-	*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
-#if 0
-/**
- * This method not longer necessary since OOo 3.4 where the component registration was
- * was changed to passive component registration. For more details see
- * http://wiki.services.openoffice.org/wiki/Passive_Component_Registration
- */
-//==================================================================================================
-SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(void* pServiceManager,
-                                                            void* pRegistryKey   )
-{
-    if (!pRegistryKey)
-        return sal_False;
-
-    try
+    SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
+        const sal_Char **ppEnvTypeName, uno_Environment ** )
     {
-        css::uno::Reference< css::registry::XRegistryKey > xKey(reinterpret_cast< css::registry::XRegistryKey* >(pRegistryKey), css::uno::UNO_QUERY);
-
-        writeInfo( xKey, MYLISTENER_IMPLEMENTATIONNAME       , MYLISTENER_SERVICENAME        );
-        writeInfo( xKey, MYPROTOCOLHANDLER_IMPLEMENTATIONNAME, MYPROTOCOLHANDLER_SERVICENAME );
-
-        return sal_True;
+        *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
     }
-    catch(const css::registry::InvalidRegistryException&)
-        { OSL_ENSURE( sal_False, "### InvalidRegistryException!" ); }
-
-    return sal_False;
-}
-#endif
-
-//==================================================================================================
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const sal_Char* pImplName      ,
-                                                                void*     pServiceManager,
-                                                                void*     pRegistryKey   )
-{
-    if ( !pServiceManager || !pImplName )
-        return 0;
 
-    css::uno::Reference< css::lang::XSingleServiceFactory > xFactory  ;
-    css::uno::Reference< css::lang::XMultiServiceFactory >  xSMGR     (reinterpret_cast< css::lang::XMultiServiceFactory* >(pServiceManager), css::uno::UNO_QUERY);
-    ::rtl::OUString                                         sImplName = ::rtl::OUString::createFromAscii(pImplName);
-
-    if (sImplName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( MYLISTENER_IMPLEMENTATIONNAME ) ) )
-	{
-        css::uno::Sequence< ::rtl::OUString > lNames(1);
-        lNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( MYLISTENER_IMPLEMENTATIONNAME ) );
-		xFactory = ::cppu::createSingleFactory(xSMGR, sImplName, MyListener::st_createInstance, lNames);
-	}
-    else
-    if (sImplName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( MYPROTOCOLHANDLER_IMPLEMENTATIONNAME ) ) )
-	{
-        css::uno::Sequence< ::rtl::OUString > lNames(1);
-        lNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( MYPROTOCOLHANDLER_SERVICENAME ) );
-        xFactory = ::cppu::createSingleFactory(xSMGR, sImplName, MyProtocolHandler_createInstance, lNames);
-	}
-
-    if (!xFactory.is())
-        return 0;
-
-    xFactory->acquire();
-    return xFactory.get();
+    SAL_DLLPUBLIC_EXPORT void *SAL_CALL component_getFactory(
+        const sal_Char *pImplName, void *pServiceManager, void *pRegistryKey )
+    {
+        return ::cppu::component_getFactoryHelper( pImplName,
+                pServiceManager,
+                pRegistryKey ,
+                framework::complex_toolbar_controls::s_impl_entries );
+    }
 }
-
-} // extern C

Modified: openoffice/branches/ia2/main/odk/examples/cpp/custompanel/description.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/odk/examples/cpp/custompanel/description.xml?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/odk/examples/cpp/custompanel/description.xml (original)
+++ openoffice/branches/ia2/main/odk/examples/cpp/custompanel/description.xml Fri Feb  1 08:46:00 2013
@@ -31,6 +31,6 @@
     <name>Custom Tool Panel Example</name>
   </display-name>
   <dependencies>
-    <OpenOffice.org-minimal-version value="3.4" d:name="OpenOffice.org 3.4"/>
+    <OpenOffice.org-minimal-version value="3.4" d:name="Apache OpenOffice 3.4"/>
   </dependencies>
 </description>

Modified: openoffice/branches/ia2/main/odk/examples/java/Inspector/Addons.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/odk/examples/java/Inspector/Addons.xcu?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/odk/examples/java/Inspector/Addons.xcu (original)
+++ openoffice/branches/ia2/main/odk/examples/java/Inspector/Addons.xcu Fri Feb  1 08:46:00 2013
@@ -1,27 +1,6 @@
-<!--***********************************************************
- * 
- * 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.
- * 
- ***********************************************************-->
-
 <?xml version='1.0' encoding='UTF-8'?>
 <!--***********************************************************
- * 
+ *
  * 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
@@ -29,36 +8,41 @@
  * 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.
- * 
+ *
  ***********************************************************-->
 <oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="Addons" oor:package="org.openoffice.Office">
-	<node oor:name="AddonUI">
-		<node oor:name="OfficeToolBar">
-			<node oor:name="org.openoffice.Office.addon.Inspector" oor:op="replace">
-				<node oor:name="toolBar_Inspector" oor:op="replace">
-					<prop oor:name="URL" oor:type="xs:string">
-						<value>org.openoffice.Office.addon.Inspector:inspect</value>
-					</prop>
-					<prop oor:name="Title" oor:type="xs:string">
-						<value xml:lang="en-US">Object Inspector</value>
-					</prop>
-					<prop oor:name="Target" oor:type="xs:string">
-						<value>_self</value>
-					</prop>
-					<prop oor:name="Context" oor:type="xs:string">
-					      <value></value>
-					</prop>	      
-				</node>
-			</node>
-		</node>
-	</node>
+    <node oor:name="AddonUI">
+        <node oor:name="OfficeToolBar">
+            <node oor:name="org.openoffice.Office.addon.Inspector" oor:op="replace">
+                <prop oor:name="Title" oor:type="xs:string">
+                    <value xml:lang="en-US">Object Inspector</value>
+                </prop>
+                <node oor:name="ToolBarItems">
+                    <node oor:name="toolBar_Inspector" oor:op="replace">
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>org.openoffice.Office.addon.Inspector:inspect</value>
+                        </prop>
+                        <prop oor:name="Title" oor:type="xs:string">
+                            <value xml:lang="en-US">Object Inspector</value>
+                        </prop>
+                        <prop oor:name="Target" oor:type="xs:string">
+                            <value>_self</value>
+                        </prop>
+                        <prop oor:name="Context" oor:type="xs:string">
+                            <value></value>
+                        </prop>
+                    </node>
+                </node>
+            </node>
+        </node>
+    </node>
 </oor:component-data>

Modified: openoffice/branches/ia2/main/odk/examples/java/Inspector/Inspector.java
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/odk/examples/java/Inspector/Inspector.java?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/odk/examples/java/Inspector/Inspector.java (original)
+++ openoffice/branches/ia2/main/odk/examples/java/Inspector/Inspector.java Fri Feb  1 08:46:00 2013
@@ -178,8 +178,7 @@ public class Inspector{
         try {
             Object oToolkit = m_xComponentContext.getServiceManager().createInstanceWithContext("com.sun.star.awt.Toolkit", m_xComponentContext);
             XMessageBoxFactory xMessageBoxFactory = (XMessageBoxFactory) UnoRuntime.queryInterface(XMessageBoxFactory.class, oToolkit);
-            Rectangle aRectangle = new Rectangle();
-            XMessageBox xMessageBox = xMessageBoxFactory.createMessageBox(_xWindowPeer, aRectangle, "errorbox", com.sun.star.awt.MessageBoxButtons.BUTTONS_OK, _sTitle, _sMessage);
+            XMessageBox xMessageBox = xMessageBoxFactory.createMessageBox(_xWindowPeer, com.sun.star.awt.MessageBoxType.ERRORBOX, com.sun.star.awt.MessageBoxButtons.BUTTONS_OK, _sTitle, _sMessage);
             XComponent xComponent = (XComponent) UnoRuntime.queryInterface(XComponent.class, xMessageBox);
             if (xMessageBox != null){
                 short nResult = xMessageBox.execute();

Modified: openoffice/branches/ia2/main/odk/pack/copying/dk.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/odk/pack/copying/dk.mk?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/odk/pack/copying/dk.mk (original)
+++ openoffice/branches/ia2/main/odk/pack/copying/dk.mk Fri Feb  1 08:46:00 2013
@@ -19,7 +19,7 @@
 #  
 #**************************************************************
 
-# OpenOffice.org @@RELEASE@@ SDK dependent settings
+# Apache OpenOffice @@RELEASE@@ SDK dependent settings
 SDKVERSION=@@RELEASE@@
 BUILDID=@@BUILDID@@
 SCM_REVISION=@@SCMREVISION@@
\ No newline at end of file

Modified: openoffice/branches/ia2/main/odk/pack/copying/idl_chapter_refs.txt
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/odk/pack/copying/idl_chapter_refs.txt?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/odk/pack/copying/idl_chapter_refs.txt (original)
+++ openoffice/branches/ia2/main/odk/pack/copying/idl_chapter_refs.txt Fri Feb  1 08:46:00 2013
@@ -6547,8 +6547,8 @@ com.sun.star.task.JobExecutor
 TOPIC:
 com.sun.star.task.JobExecutor
 
-LINK:Documentation/DevGuide/Database/Data_Sources_in_OpenOffice.org_API#DatabaseContext
-DESCR:Database - Data Sources in OpenOffice.org API - DatabaseContext
+LINK:Documentation/DevGuide/Database/Data_Sources_in_Apache_OpenOffice_API#DatabaseContext
+DESCR:Database - Data Sources in Apache OpenOffice API - DatabaseContext
 REF:
 com.sun.star.sdb.Connection
 com.sun.star.sdb.DatabaseContext
@@ -7510,8 +7510,8 @@ com.sun.star.table.CellAddress
 com.sun.star.sheet.XSheetAnnotationAnchor
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Frame-Controller-Model_Paradigm_in_OpenOffice.org
-DESCR:OfficeDev - Frame-Controller-Model Paradigm in OpenOffice.org
+LINK:Documentation/DevGuide/OfficeDev/Frame-Controller-Model_Paradigm_in_Apache_OpenOffice
+DESCR:OfficeDev - Frame-Controller-Model Paradigm in Apache OpenOffice
 REF:
 TOPIC:
 com.sun.star.frame.XController

Modified: openoffice/branches/ia2/main/odk/setsdkenv_unix
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/odk/setsdkenv_unix?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/odk/setsdkenv_unix (original)
+++ openoffice/branches/ia2/main/odk/setsdkenv_unix Fri Feb  1 08:46:00 2013
@@ -30,7 +30,7 @@ if [ "$OSTYPE" = "Darwin" ] 
 then
     OO_SDK_NAME=`basename $OO_SDK_HOME`
 else
-    OO_SDK_NAME=openoffice.org${OOVERSION}_sdk
+    OO_SDK_NAME=apacheopenoffice${OOVERSION}_sdk
 fi
 
 export OO_SDK_HOME

Modified: openoffice/branches/ia2/main/odk/setsdkenv_unix.sh.in
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/odk/setsdkenv_unix.sh.in?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/odk/setsdkenv_unix.sh.in (original)
+++ openoffice/branches/ia2/main/odk/setsdkenv_unix.sh.in Fri Feb  1 08:46:00 2013
@@ -29,16 +29,16 @@ OO_SDK_NAME=@OO_SDK_NAME@
 export OO_SDK_NAME
 
 # Installation directory of the Software Development Kit.
-# Example: OO_SDK_HOME=/opt/openoffice.org/basis3.0/sdk
+# Example: OO_SDK_HOME=/opt/apacheopenoffice/basis3.0/sdk
 OO_SDK_HOME='@OO_SDK_HOME@'
 
 # Office installation directory.
-# Example: OFFICE_HOME=/opt/openoffice.org3
+# Example: OFFICE_HOME=/opt/apacheopenoffice3
 OFFICE_HOME='@OFFICE_HOME@'
 OFFICE_BASE_HOME='@OFFICE_BASE_HOME@'
 
 # URE installation directory.
-# Example: OO_SDK_URE_HOME=/opt/openoffice.org/ure
+# Example: OO_SDK_URE_HOME=/opt/apacheopenoffice/ure
 OO_SDK_URE_HOME='@OO_SDK_URE_HOME@'
 export OO_SDK_URE_HOME
 
@@ -78,7 +78,7 @@ OO_SDK_OUTPUT_DIR=@OO_SDK_OUTPUT_DIR@
 SDK_AUTO_DEPLOYMENT=@SDK_AUTO_DEPLOYMENT@
 export SDK_AUTO_DEPLOYMENT
 
-# Check installation path for the OpenOffice Development Kit.
+# Check installation path for the Apache OpenOffice Development Kit.
 if [ -z "${OO_SDK_HOME}" ]
 then
     echo Error: Please insert a correct value for the variable OO_SDK_HOME.

Modified: openoffice/branches/ia2/main/odk/setsdkenv_windows.template
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/odk/setsdkenv_windows.template?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/odk/setsdkenv_windows.template (original)
+++ openoffice/branches/ia2/main/odk/setsdkenv_windows.template Fri Feb  1 08:46:00 2013
@@ -23,22 +23,22 @@ REM This script sets all enviroment vari
 REM are necessary for building the examples of the Office Development Kit.
 REM The Script was developed for the operating systems Windows.
 REM The SDK name
-REM Example: set OO_SDK_NAME=openoffice3.0_sdk
-set OO_SDK_NAME=openoffice.org3.0_sdk
+REM Example: set OO_SDK_NAME=apacheopenoffice3.0_sdk
+set OO_SDK_NAME=apacheopenoffice3.0_sdk
 
 REM Installation directory of the Software Development Kit.
-REM Example: set OO_SDK_HOME=C:\Program Files\OpenOffice.org\Basic 3.0\sdk
+REM Example: set OO_SDK_HOME=C:\Program Files\Apache OpenOffice\Basic 3.0\sdk
 set OO_SDK_HOME=
 
 REM Office installation directory.
-REM Example: set OFFICE_HOME=C:\Program Files\OpenOffice.org 3
+REM Example: set OFFICE_HOME=C:\Program Files\Apache OpenOffice 3
 set OFFICE_HOME=
 
-REM Example: set OFFICE_HOME=C:\Program Files\OpenOffice.org\Basis 3.0
+REM Example: set OFFICE_HOME=C:\Program Files\Apache OpenOffice\Basis 3.0
 set OFFICE_BASE_HOME=
 
 REM URE installation directory.
-REM Example: set OO_SDK_URE_HOME=C:\Program Files\OpenOffice.org\URE
+REM Example: set OO_SDK_URE_HOME=C:\Program Files\Apache OpenOffice\URE
 set OO_SDK_URE_HOME=
 
 REM Directory of the make command.
@@ -73,7 +73,7 @@ REM Example: set OO_SDK_JAVA_HOME=C:\Pro
 set OO_SDK_JAVA_HOME=
 
 REM Special output directory
-REM Example: set OO_SDK_OUT=C:\openoffice.org3.0_sdk
+REM Example: set OO_SDK_OUT=C:\apacheopenoffice3.0_sdk
 set OO_SDK_OUT=
 
 REM Automatic deployment

Modified: openoffice/branches/ia2/main/odk/source/com/sun/star/lib/loader/InstallationFinder.java
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/odk/source/com/sun/star/lib/loader/InstallationFinder.java?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/odk/source/com/sun/star/lib/loader/InstallationFinder.java (original)
+++ openoffice/branches/ia2/main/odk/source/com/sun/star/lib/loader/InstallationFinder.java Fri Feb  1 08:46:00 2013
@@ -188,7 +188,7 @@ final class InstallationFinder {
      */    
     private static String getPathFromWindowsRegistry() {
 
-        final String SUBKEYNAME = "Software\\OpenOffice.org\\UNO\\InstallPath";
+        final String SUBKEYNAME = "Software\\Apache OpenOffice\\UNO\\InstallPath";
 
         String path = null;
         

Modified: openoffice/branches/ia2/main/odk/source/unoapploader/win/unoapploader.c
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/odk/source/unoapploader/win/unoapploader.c?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/odk/source/unoapploader/win/unoapploader.c (original)
+++ openoffice/branches/ia2/main/odk/source/unoapploader/win/unoapploader.c Fri Feb  1 08:46:00 2013
@@ -61,7 +61,7 @@ void closeErrorFile();
  * environment variable to the program directory of the UNO installation.
  * If no installation is specified by the user, the default installation on
  * the system will be taken. The default installation is read from the
- * default value of the key "Software\OpenOffice.org\UNO\InstallPath" from the 
+ * default value of the key "Software\Apache OpenOffice\UNO\InstallPath" from the 
  * root key HKEY_CURRENT_USER in the Windows Registry. If this key is missing, 
  * the key is read from the root key HKEY_LOCAL_MACHINE.</p>
  */

Modified: openoffice/branches/ia2/main/odk/util/makefile.pmk
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/odk/util/makefile.pmk?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/odk/util/makefile.pmk (original)
+++ openoffice/branches/ia2/main/odk/util/makefile.pmk Fri Feb  1 08:46:00 2013
@@ -23,8 +23,8 @@
 
 # used for sdk common files
 PRODUCT_RELEASE=3.5
-OFFICENAME=OpenOffice.org
-SDKDIRNAME=openoffice.org$(PRODUCT_RELEASE)_sdk
+OFFICENAME=Apache OpenOffice
+SDKDIRNAME=apacheopenoffice$(PRODUCT_RELEASE)_sdk
 OFFICEPRODUCTNAME=$(OFFICENAME) $(PRODUCT_RELEASE)
 TITLE=$(OFFICENAME) $(PRODUCT_RELEASE) SDK
 IDLDOCREFNAME="$(OFFICENAME) $(PRODUCT_RELEASE) API"

Modified: openoffice/branches/ia2/main/offapi/com/sun/star/awt/ImageScaleMode.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/offapi/com/sun/star/awt/ImageScaleMode.idl?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/offapi/com/sun/star/awt/ImageScaleMode.idl (original)
+++ openoffice/branches/ia2/main/offapi/com/sun/star/awt/ImageScaleMode.idl Fri Feb  1 08:46:00 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,53 +7,43 @@
  * 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 __com_sun_star_awt_ImageScaleMode_idl__
 #define __com_sun_star_awt_ImageScaleMode_idl__
 
-//=============================================================================
-
 module com { module sun { module star { module awt { 
 
-//=============================================================================
-
 /** defines modes how an image displayed in a given area should be scaled to fit this area
  */
 constants ImageScaleMode
 {
     /** specifies that no scaling should happen at all
     */
-    const short None = 0;
+    const short NONE = 0;
 
     /** specifies that the image should be scaled up or down to the size of the surrounding area isotropicly,
         i.e. by keeping its aspect ratio.
     */
-    const short Isotropic = 1;
+    const short ISOTROPIC = 1;
 
-    /** specifies that the image should be scaled up or down to the size of the surrounding area anisotropicly.
+    /** specifies that the image should be scaled up or down to the size of the surrounding area anisotropically.
 
         <p>The image will finally cover all of the surrounding area, but its dimensions might be distorted.</p>
     */
-    const short Anisotropic = 2;
+    const short ANISOTROPIC = 2;
 };
 
-//=============================================================================
-
 }; }; }; }; 
 
-//=============================================================================
-
 #endif

Modified: openoffice/branches/ia2/main/offapi/com/sun/star/awt/MenuBar.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/offapi/com/sun/star/awt/MenuBar.idl?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/offapi/com/sun/star/awt/MenuBar.idl (original)
+++ openoffice/branches/ia2/main/offapi/com/sun/star/awt/MenuBar.idl Fri Feb  1 08:46:00 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,46 +7,36 @@
  * 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 __com_sun_star_awt_MenuBar_idl__
+#define __com_sun_star_awt_MenuBar_idl__
 
-#ifndef __com_sun_star_awt_MenuBar_idl__ 
-#define __com_sun_star_awt_MenuBar_idl__ 
- 
-#ifndef __com_sun_star_awt_XMenuBar_idl__ 
-#include <com/sun/star/awt/XMenuBar.idl> 
-#endif 
+#include <com/sun/star/awt/XMenuBar.idl>
 
-//============================================================================= 
- 
 module com {  module sun {  module star {  module awt {
-    
-//============================================================================= 
- 
+
 /** describes a menu for top-level windows.
-		
-	<p>A menu bar can only be used by top-level windows. They support
+    <p>A menu bar can only be used by top-level windows. They support
        the interface <type scope="com::sun::star::awt">XTopWindow</type>
        to set an menu bar object.
     </p>
  */
 published service MenuBar
-{ 
-	interface XMenuBar; 
-}; 
- 
-//============================================================================= 
- 
-}; }; }; };  
- 
-#endif 
+{
+    interface XMenuBar;
+};
+
+}; }; }; };
+
+#endif

Modified: openoffice/branches/ia2/main/offapi/com/sun/star/awt/MenuEvent.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/offapi/com/sun/star/awt/MenuEvent.idl?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/offapi/com/sun/star/awt/MenuEvent.idl (original)
+++ openoffice/branches/ia2/main/offapi/com/sun/star/awt/MenuEvent.idl Fri Feb  1 08:46:00 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,47 +7,35 @@
  * 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 __com_sun_star_awt_MenuEvent_idl__
+#define __com_sun_star_awt_MenuEvent_idl__
+
+#include <com/sun/star/lang/EventObject.idl>
+
+module com {  module sun {  module star {  module awt {
 
-#ifndef __com_sun_star_awt_MenuEvent_idl__ 
-#define __com_sun_star_awt_MenuEvent_idl__ 
- 
-#ifndef __com_sun_star_lang_EventObject_idl__ 
-#include <com/sun/star/lang/EventObject.idl> 
-#endif 
- 
- 
-//============================================================================= 
- 
- module com {  module sun {  module star {  module awt {  
- 
-//============================================================================= 
- 
 /** specifies a menu event.
  */
 published struct MenuEvent: com::sun::star::lang::EventObject
-{ 
-	//------------------------------------------------------------------------- 
-	 
-	/** contains the item id.
-	 */
-	short MenuId; 
- 
-}; 
- 
-//============================================================================= 
- 
-}; }; }; };  
- 
-#endif 
+{
+    /** contains the item ID.
+     */
+    short MenuId;
+
+};
+
+}; }; }; };
+
+#endif

Modified: openoffice/branches/ia2/main/offapi/com/sun/star/awt/MenuItemStyle.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/offapi/com/sun/star/awt/MenuItemStyle.idl?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/offapi/com/sun/star/awt/MenuItemStyle.idl (original)
+++ openoffice/branches/ia2/main/offapi/com/sun/star/awt/MenuItemStyle.idl Fri Feb  1 08:46:00 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,58 +7,43 @@
  * 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 __com_sun_star_awt_MenuItemStyle_idl__ 
-#define __com_sun_star_awt_MenuItemStyle_idl__ 
- 
- 
-//============================================================================= 
- 
- module com {  module sun {  module star {  module awt {  
- 
-//============================================================================= 
- 
-/** These values are used to specify the properties of a menu item. 
-		 
-	<p>They may be expanded in future versions.</p>
+#ifndef __com_sun_star_awt_MenuItemStyle_idl__
+#define __com_sun_star_awt_MenuItemStyle_idl__
+
+module com {  module sun {  module star {  module awt {
+
+/** These values are used to specify the properties of a menu item.
  */
-published constants MenuItemStyle
-{ 
-	//------------------------------------------------------------------------- 
-		
-	/** specifies an item which can be checked independently.
-	 */
-	const short CHECKABLE = 1; 
- 
-	//------------------------------------------------------------------------- 
-		
-	/** specifies an item which can be checked dependent on the neighbouring
+constants MenuItemStyle
+{
+    /** specifies an item which can be checked independently.
+     */
+    const short CHECKABLE = 1;
+
+    /** specifies an item which can be checked dependent on the neighbouring
         items.
-	 */
-	const short RADIOCHECK = 2; 
- 
-	//------------------------------------------------------------------------- 
-		
-	/** specifies to check this item automatically on select.
-	 */
-	const short AUTOCHECK = 4; 
- 
-}; 
- 
-//============================================================================= 
- 
-}; }; }; };  
- 
-#endif 
+     */
+    const short RADIOCHECK = 2;
+
+    /** specifies to check this item automatically on select.
+     */
+    const short AUTOCHECK = 4;
+
+};
+
+}; }; }; };
+
+#endif

Modified: openoffice/branches/ia2/main/offapi/com/sun/star/awt/MenuItemType.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/offapi/com/sun/star/awt/MenuItemType.idl?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/offapi/com/sun/star/awt/MenuItemType.idl (original)
+++ openoffice/branches/ia2/main/offapi/com/sun/star/awt/MenuItemType.idl Fri Feb  1 08:46:00 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,31 +7,25 @@
  * 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 __com_sun_star_awt_MenuItemType_idl__
 #define __com_sun_star_awt_MenuItemType_idl__
 
-
-//=============================================================================
-
- module com {  module sun {  module star {  module awt {
-
-//=============================================================================
+module com {  module sun {  module star {  module awt {
 
 /** specifies the type of a menu item, as returned by
-    <member scope="com::sun::star::awt">XMenuExtended2::getItemType()</member>.
+    <member scope="com::sun::star::awt">XMenu::getItemType()</member>.
  */
 published enum MenuItemType
 {
@@ -57,8 +51,6 @@ published enum MenuItemType
 
 };
 
-//=============================================================================
-
 }; }; }; };
 
 #endif

Modified: openoffice/branches/ia2/main/offapi/com/sun/star/awt/MessageBoxButtons.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/offapi/com/sun/star/awt/MessageBoxButtons.idl?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/offapi/com/sun/star/awt/MessageBoxButtons.idl (original)
+++ openoffice/branches/ia2/main/offapi/com/sun/star/awt/MessageBoxButtons.idl Fri Feb  1 08:46:00 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,87 +7,78 @@
  * 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 __com_sun_star_awt_MessageBoxButtons_idl__
+#define __com_sun_star_awt_MessageBoxButtons_idl__
 
-#ifndef __com_sun_star_awt_MessageBoxButtons_idl__ 
-#define __com_sun_star_awt_MessageBoxButtons_idl__ 
- 
-//============================================================================= 
- 
- module com {  module sun {  module star {  module awt {  
- 
-//============================================================================= 
- 
-/** defines constants for the possible message box button 
+module com {  module sun {  module star {  module awt {
+
+/** defines constants for the possible message box button
     combinations.
 
  */
 constants MessageBoxButtons
-{ 
-	//------------------------------------------------------------------------- 
-
-	/** specifies a message with "OK" button.
+{
+    /** specifies a message with "OK" button.
      */
     const long BUTTONS_OK                   = 1;
 
-	/** specifies a message box with "OK" and "CANCEL" button.
+    /** specifies a message box with "OK" and "CANCEL" button.
      */
     const long BUTTONS_OK_CANCEL            = 2;
 
-	/** specifies a message box with "YES" and "NO" button.
+    /** specifies a message box with "YES" and "NO" button.
      */
     const long BUTTONS_YES_NO               = 3;
 
-	/** specifies a message box with "YES", "NO" and "CANCEL" button.
+    /** specifies a message box with "YES", "NO" and "CANCEL" button.
      */
     const long BUTTONS_YES_NO_CANCEL        = 4;
 
-	/** specifies a message box with "RETRY" and "CANCEL" button.
+    /** specifies a message box with "RETRY" and "CANCEL" button.
      */
     const long BUTTONS_RETRY_CANCEL         = 5;
 
-	/** specifies a message box with "ABORT", "IGNORE" and "RETRY" button.
+    /** specifies a message box with "ABORT", "IGNORE" and "RETRY" button.
      */
     const long BUTTONS_ABORT_IGNORE_RETRY   = 6;
 
     /** specifies that OK is the default button.
      */
     const long DEFAULT_BUTTON_OK            = 0x10000;
-    
-	/** specifies that CANCEL is the default button.
+
+    /** specifies that CANCEL is the default button.
      */
     const long DEFAULT_BUTTON_CANCEL        = 0x20000;
 
-	/** specifies that RETRY is the default button.
+    /** specifies that RETRY is the default button.
      */
     const long DEFAULT_BUTTON_RETRY         = 0x30000;
-    
-	/** specifies that YES is the default button.
+
+    /** specifies that YES is the default button.
      */
     const long DEFAULT_BUTTON_YES           = 0x40000;
 
-	/** specifies that NO is the default button.
+    /** specifies that NO is the default button.
      */
     const long DEFAULT_BUTTON_NO            = 0x50000;
 
-	/** specifies that IGNORE is the default button.
+    /** specifies that IGNORE is the default button.
      */
     const long DEFAULT_BUTTON_IGNORE        = 0x60000;
-}; 
+};
+
+}; }; }; };
 
-//============================================================================= 
- 
-}; }; }; };  
- 
-#endif 
+#endif

Modified: openoffice/branches/ia2/main/offapi/com/sun/star/awt/PopupMenu.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/offapi/com/sun/star/awt/PopupMenu.idl?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/offapi/com/sun/star/awt/PopupMenu.idl (original)
+++ openoffice/branches/ia2/main/offapi/com/sun/star/awt/PopupMenu.idl Fri Feb  1 08:46:00 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,45 +7,35 @@
  * 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 __com_sun_star_awt_PopupMenu_idl__
+#define __com_sun_star_awt_PopupMenu_idl__
 
-#ifndef __com_sun_star_awt_PopupMenu_idl__ 
-#define __com_sun_star_awt_PopupMenu_idl__ 
- 
-#ifndef __com_sun_star_awt_XPopupMenu_idl__ 
-#include <com/sun/star/awt/XPopupMenu.idl> 
-#endif 
+#include <com/sun/star/awt/XPopupMenu.idl>
 
-//============================================================================= 
- 
 module com {  module sun {  module star {  module awt {
-    
-//============================================================================= 
- 
+
 /** describes a popup menu which is a recursive container for commands
-		
-	<p>A popup menu can be used as a standalone object to display a context 
-       menu. It's also possible to use a popup menu to integrate it into 
+    <p>A popup menu can be used as a standalone object to display a context
+       menu. It's also possible to use a popup menu to integrate it into
        another menu.</p>
  */
 published service PopupMenu
-{ 
-	interface XPopupMenu; 
-}; 
- 
-//============================================================================= 
- 
-}; }; }; };  
- 
-#endif 
+{
+    interface XPopupMenu;
+};
+
+}; }; }; };
+
+#endif



Mime
View raw message