merge to m67

18 files changed, 237 insertions, 98 deletions

diff --git a/odk/examples/DevelopersGuide/Accessibility/Makefile b/odk/examples/DevelopersGuide/Accessibility/Makefile
index 95896721d87b..308a25418486 100644
--- a/odk/examples/DevelopersGuide/Accessibility/Makefile
+++ b/odk/examples/DevelopersGuide/Accessibility/Makefile
@@ -68,7 +68,11 @@ JAVAFILES = \
 		TextualDisplay.java
 
 APP1_CLASSFILES = $(patsubst %.java,$(OUT_APP_CLASS)/%.class,$(JAVAFILES))
-APP1_CLASSNAMES = $(patsubst %.java,%.class,$(JAVAFILES))
+APP1_CLASSNAMES = $(patsubst %.java,%.class,$(JAVAFILES)) \
+	 EventListenerProxy$(ICL)1.class \
+	 EventListenerProxy$(ICL)2.class \
+	 EventListenerProxy$(ICL)3.class \
+	 EventListenerProxy$(ICL)4.class
 
 SDK_CLASSPATH = $(subst $(EMPTYSTRING) $(PATH_SEPARATOR),$(PATH_SEPARATOR),$(CLASSPATH)\
 		$(PATH_SEPARATOR)$(OUT_APP_CLASS))
diff --git a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile
index f86b7950ba4b..c081c3747a63 100644
--- a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile
+++ b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile
@@ -90,7 +90,7 @@ $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES)
 	$(LINK) $(COMP_LINK_FLAGS) /OUT:$@ \
 	/MAP:$(OUT_COMP_GEN)/$(subst $(SHAREDLIB_EXT),map,$(@F)) $(SLOFILES) \
 	$(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) msvcrt.lib kernel32.lib
-	$(LINK_MANIFEST_VC8_ONLY)
+	$(LINK_MANIFEST)
 else
 $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) $(COMP_MAPFILE)
 	-$(MKDIR) $(subst /,$(PS),$(@D))
diff --git a/odk/examples/DevelopersGuide/Components/CppComponent/Makefile b/odk/examples/DevelopersGuide/Components/CppComponent/Makefile
index 7e46f679096f..fb7b4a1ab52d 100644
--- a/odk/examples/DevelopersGuide/Components/CppComponent/Makefile
+++ b/odk/examples/DevelopersGuide/Components/CppComponent/Makefile
@@ -123,7 +123,7 @@ $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES)
 	$(LINK) $(COMP_LINK_FLAGS) /OUT:$@ \
 	/MAP:$(SAMPLE_GEN_OUT)/$(subst $(SHAREDLIB_EXT),map,$(@F)) $(SLOFILES) \
 	$(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) msvcrt.lib kernel32.lib
-	$(LINK_MANIFEST_VC8_ONLY)
+	$(LINK_MANIFEST)
 else
 $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) $(COMP_MAPFILE)
 	-$(MKDIR) $(subst /,$(PS),$(@D)) && $(DEL) $(subst \\,\,$(subst /,$(PS),$@))
diff --git a/odk/examples/DevelopersGuide/Components/CppComponent/TestCppComponent.cxx b/odk/examples/DevelopersGuide/Components/CppComponent/TestCppComponent.cxx
index afda5d3cdeba..d3e264f2232c 100644
--- a/odk/examples/DevelopersGuide/Components/CppComponent/TestCppComponent.cxx
+++ b/odk/examples/DevelopersGuide/Components/CppComponent/TestCppComponent.cxx
@@ -39,6 +39,7 @@
  *************************************************************************/
 
 #include <stdio.h>
+#include <sal/main.h>
 #include <cppuhelper/bootstrap.hxx>
 #include <com/sun/star/bridge/XUnoUrlResolver.hpp>
 #include <com/sun/star/frame/XComponentLoader.hpp>
@@ -51,7 +52,7 @@ using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::frame;
 
-int SAL_CALL main( int, char ** )
+SAL_IMPLEMENT_MAIN()
 {
     try
     {
diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/Makefile b/odk/examples/DevelopersGuide/Database/DriverSkeleton/Makefile
index c491eba8b436..076da65424aa 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/Makefile
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/Makefile
@@ -98,7 +98,7 @@ $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES)
 	$(LINK) $(COMP_LINK_FLAGS) /OUT:$@ \
 	/MAP:$(OUT_COMP_MISC)/$(COMP_NAME).map $(SLOFILES) \
 	 $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) msvcrt.lib kernel32.lib
-	$(LINK_MANIFEST_VC8_ONLY)
+	$(LINK_MANIFEST)
 else
 $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) $(COMP_MAPFILE)
 	-$(MKDIR) $(subst /,$(PS),$(@D))	 
diff --git a/odk/examples/DevelopersGuide/FirstSteps/FirstLoadComponent.java b/odk/examples/DevelopersGuide/FirstSteps/FirstLoadComponent.java
index eff9a710b8a6..c217768dec1e 100644
--- a/odk/examples/DevelopersGuide/FirstSteps/FirstLoadComponent.java
+++ b/odk/examples/DevelopersGuide/FirstSteps/FirstLoadComponent.java
@@ -37,34 +37,27 @@
  *  USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *************************************************************************/
-
-import com.sun.star.uno.UnoRuntime;
+import com.sun.star.beans.PropertyValue;
+import com.sun.star.beans.XPropertySet;
 import com.sun.star.uno.XComponentContext;
-import com.sun.star.lang.XMultiComponentFactory;
+import com.sun.star.comp.helper.Bootstrap;
+import com.sun.star.container.XEnumeration;
+import com.sun.star.container.XEnumerationAccess;
+import com.sun.star.frame.XComponentLoader;
+import com.sun.star.frame.XController;
+import com.sun.star.frame.XModel;
 import com.sun.star.lang.XComponent;
-import com.sun.star.beans.XPropertySet;
-import com.sun.star.beans.PropertyValue;
-import com.sun.star.sheet.XSpreadsheetDocument;
-import com.sun.star.sheet.XSpreadsheets;
-import com.sun.star.sheet.XSpreadsheet;
-import com.sun.star.sheet.XSpreadsheetView;
+import com.sun.star.lang.XMultiComponentFactory;
+import com.sun.star.sheet.XCellAddressable;
 import com.sun.star.sheet.XCellRangesQuery;
 import com.sun.star.sheet.XSheetCellRanges;
-import com.sun.star.sheet.XCellAddressable;
+import com.sun.star.sheet.XSpreadsheet;
+import com.sun.star.sheet.XSpreadsheetDocument;
+import com.sun.star.sheet.XSpreadsheetView;
+import com.sun.star.sheet.XSpreadsheets;
 import com.sun.star.table.XCell;
-import com.sun.star.frame.XModel;
-import com.sun.star.frame.XController;
-import com.sun.star.frame.XComponentLoader;
-import com.sun.star.container.XEnumeration;
-import com.sun.star.container.XEnumerationAccess;
-
-import com.sun.star.uno.AnyConverter;
-
+import com.sun.star.uno.UnoRuntime;
 
-/**
- *
- * @author  dschulten
- */
 public class FirstLoadComponent {
 
     /** Creates a new instance of FirstLoadComponent */
@@ -74,37 +67,16 @@ public class FirstLoadComponent {
     /**
      * @param args the command line arguments
      */
-    private XComponentContext xRemoteContext = null;
-    private XMultiComponentFactory xRemoteServiceManager = null;
-
     public static void main(String[] args) {
-        FirstLoadComponent firstLoadComponent1 = new FirstLoadComponent();
-        try {
-            firstLoadComponent1.useConnection();
-        }
-        catch (java.lang.Exception e){
-            System.out.println(e.getMessage());
-            e.printStackTrace();
-        }
-        finally {
-            System.exit(0);
-        }
-    }
-
-    private void useConnection() throws java.lang.Exception {
         try {
             // get the remote office component context
-            xRemoteContext = com.sun.star.comp.helper.Bootstrap.bootstrap();
-            System.out.println("Connected to a running office ...");
+            XComponentContext xRemoteContext = Bootstrap.bootstrap();
+            if (xRemoteContext == null) {
+                System.err.println("ERROR: Could not bootstrap default Office.");
+            }
 
-            xRemoteServiceManager = xRemoteContext.getServiceManager();
-        }
-        catch( Exception e) {
-            e.printStackTrace();
-            System.exit(1);
-        }
+            XMultiComponentFactory xRemoteServiceManager = xRemoteContext.getServiceManager();
 
-        try {
             Object desktop = xRemoteServiceManager.createInstanceWithContext(
                 "com.sun.star.frame.Desktop", xRemoteContext);
             XComponentLoader xComponentLoader = (XComponentLoader)
@@ -191,9 +163,173 @@ public class FirstLoadComponent {
             }
 
         }
-        catch( com.sun.star.lang.DisposedException e ) { //works from Patch 1
-            xRemoteContext = null;
-            throw e;
+        catch (java.lang.Exception e){
+            e.printStackTrace();
+        }
+        finally {
+            System.exit( 0 );
         }
     }
+
 }
+
+
+// import com.sun.star.uno.UnoRuntime;
+// import com.sun.star.uno.XComponentContext;
+// import com.sun.star.lang.XMultiComponentFactory;
+// import com.sun.star.lang.XComponent;
+// import com.sun.star.beans.XPropertySet;
+// import com.sun.star.beans.PropertyValue;
+// import com.sun.star.sheet.XSpreadsheetDocument;
+// import com.sun.star.sheet.XSpreadsheets;
+// import com.sun.star.sheet.XSpreadsheet;
+// import com.sun.star.sheet.XSpreadsheetView;
+// import com.sun.star.sheet.XCellRangesQuery;
+// import com.sun.star.sheet.XSheetCellRanges;
+// import com.sun.star.sheet.XCellAddressable;
+// import com.sun.star.table.XCell;
+// import com.sun.star.frame.XModel;
+// import com.sun.star.frame.XController;
+// import com.sun.star.frame.XComponentLoader;
+// import com.sun.star.container.XEnumeration;
+// import com.sun.star.container.XEnumerationAccess;
+
+// import com.sun.star.uno.AnyConverter;
+
+
+// /**
+//  *
+//  * @author  dschulten
+//  */
+// public class FirstLoadComponent {
+
+//     /** Creates a new instance of FirstLoadComponent */
+//     public FirstLoadComponent() {
+//     }
+
+//     /**
+//      * @param args the command line arguments
+//      */
+//     private XComponentContext xRemoteContext = null;
+//     private XMultiComponentFactory xRemoteServiceManager = null;
+
+//     public static void main(String[] args) {
+//         FirstLoadComponent firstLoadComponent1 = new FirstLoadComponent();
+//         try {
+//             firstLoadComponent1.useConnection();
+//         }
+//         catch (java.lang.Exception e){
+//             System.out.println(e.getMessage());
+//             e.printStackTrace();
+//         }
+//         finally {
+//             System.exit(0);
+//         }
+//     }
+
+//     private void useConnection() throws java.lang.Exception {
+//         try {
+//             // get the remote office component context
+//             xRemoteContext = com.sun.star.comp.helper.Bootstrap.bootstrap();
+//             System.out.println("Connected to a running office ...");
+
+//             xRemoteServiceManager = xRemoteContext.getServiceManager();
+//         }
+//         catch( Exception e) {
+//             e.printStackTrace();
+//             System.exit(1);
+//         }
+
+//         try {
+//             Object desktop = xRemoteServiceManager.createInstanceWithContext(
+//                 "com.sun.star.frame.Desktop", xRemoteContext);
+//             XComponentLoader xComponentLoader = (XComponentLoader)
+//                 UnoRuntime.queryInterface(XComponentLoader.class, desktop);
+
+//             PropertyValue[] loadProps = new PropertyValue[0];
+//             XComponent xSpreadsheetComponent = xComponentLoader.loadComponentFromURL("private:factory/scalc", "_blank", 0, loadProps);
+
+//             XSpreadsheetDocument xSpreadsheetDocument = (XSpreadsheetDocument)
+//                 UnoRuntime.queryInterface(XSpreadsheetDocument.class,
+//                                           xSpreadsheetComponent);
+
+//             XSpreadsheets xSpreadsheets = xSpreadsheetDocument.getSheets();
+//             xSpreadsheets.insertNewByName("MySheet", (short)0);
+//             com.sun.star.uno.Type elemType = xSpreadsheets.getElementType();
+
+//             System.out.println(elemType.getTypeName());
+//             Object sheet = xSpreadsheets.getByName("MySheet");
+//             XSpreadsheet xSpreadsheet = (XSpreadsheet)UnoRuntime.queryInterface(
+//                 XSpreadsheet.class, sheet);
+
+//             XCell xCell = xSpreadsheet.getCellByPosition(0, 0);
+//             xCell.setValue(21);
+//             xCell = xSpreadsheet.getCellByPosition(0, 1);
+//             xCell.setValue(21);
+//             xCell = xSpreadsheet.getCellByPosition(0, 2);
+//             xCell.setFormula("=sum(A1:A2)");
+
+//             XPropertySet xCellProps = (XPropertySet)UnoRuntime.queryInterface(
+//                 XPropertySet.class, xCell);
+//             xCellProps.setPropertyValue("CellStyle", "Result");
+
+//             XModel xSpreadsheetModel = (XModel)UnoRuntime.queryInterface(
+//                 XModel.class, xSpreadsheetComponent);
+//             XController xSpreadsheetController = xSpreadsheetModel.getCurrentController();
+//             XSpreadsheetView xSpreadsheetView = (XSpreadsheetView)
+//                 UnoRuntime.queryInterface(XSpreadsheetView.class,
+//                                           xSpreadsheetController);
+//             xSpreadsheetView.setActiveSheet(xSpreadsheet);
+
+//             // *********************************************************
+//             // example for use of enum types
+//             xCellProps.setPropertyValue("VertJustify",
+//                                         com.sun.star.table.CellVertJustify.TOP);
+
+
+//             // *********************************************************
+//             // example for a sequence of PropertyValue structs
+//             // create an array with one PropertyValue struct, it contains
+//             // references only
+//             loadProps = new PropertyValue[1];
+
+//             // instantiate PropertyValue struct and set its member fields
+//             PropertyValue asTemplate = new PropertyValue();
+//             asTemplate.Name = "AsTemplate";
+//             asTemplate.Value = new Boolean(true);
+
+//             // assign PropertyValue struct to array of references for PropertyValue
+//             // structs
+//             loadProps[0] = asTemplate;
+
+//             // load calc file as template
+//             //xSpreadsheetComponent = xComponentLoader.loadComponentFromURL(
+//             //    "file:///c:/temp/DataAnalysys.ods", "_blank", 0, loadProps);
+
+//             // *********************************************************
+//             // example for use of XEnumerationAccess
+//             XCellRangesQuery xCellQuery = (XCellRangesQuery)
+//                 UnoRuntime.queryInterface(XCellRangesQuery.class, sheet);
+//             XSheetCellRanges xFormulaCells = xCellQuery.queryContentCells(
+//                 (short)com.sun.star.sheet.CellFlags.FORMULA);
+//             XEnumerationAccess xFormulas = xFormulaCells.getCells();
+//             XEnumeration xFormulaEnum = xFormulas.createEnumeration();
+
+//             while (xFormulaEnum.hasMoreElements()) {
+//                 Object formulaCell = xFormulaEnum.nextElement();
+//                 xCell = (XCell)UnoRuntime.queryInterface(XCell.class, formulaCell);
+//                 XCellAddressable xCellAddress = (XCellAddressable)
+//                     UnoRuntime.queryInterface(XCellAddressable.class, xCell);
+//                 System.out.println("Formula cell in column " +
+//                                    xCellAddress.getCellAddress().Column
+//                                    + ", row " + xCellAddress.getCellAddress().Row
+//                                    + " contains " + xCell.getFormula());
+//             }
+
+//         }
+//         catch( com.sun.star.lang.DisposedException e ) { //works from Patch 1
+//             xRemoteContext = null;
+//             throw e;
+//         }
+//     }
+// }
diff --git a/odk/examples/DevelopersGuide/Forms/ButtonOperator.java b/odk/examples/DevelopersGuide/Forms/ButtonOperator.java
index ee9a2c8c511c..bed25416b824 100644
--- a/odk/examples/DevelopersGuide/Forms/ButtonOperator.java
+++ b/odk/examples/DevelopersGuide/Forms/ButtonOperator.java
@@ -37,8 +37,6 @@
  *  USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *************************************************************************/
-package org.openoffice.sdk.forms;
-
 // java base stuff
 import com.sun.star.awt.ActionEvent;
 import com.sun.star.awt.XActionListener;
diff --git a/odk/examples/DevelopersGuide/Forms/DataAwareness.java b/odk/examples/DevelopersGuide/Forms/DataAwareness.java
index 9ac1f6e55ac4..0848f13d9079 100644
--- a/odk/examples/DevelopersGuide/Forms/DataAwareness.java
+++ b/odk/examples/DevelopersGuide/Forms/DataAwareness.java
@@ -37,8 +37,6 @@
  *  USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *************************************************************************/
-package org.openoffice.sdk.forms;
-
 import com.sun.star.beans.PropertyChangeEvent;
 import com.sun.star.beans.XPropertyChangeListener;
 import com.sun.star.beans.XPropertySet;
diff --git a/odk/examples/DevelopersGuide/Forms/DocumentBasedExample.java b/odk/examples/DevelopersGuide/Forms/DocumentBasedExample.java
index a138f8a57070..73a935f7d4f6 100644
--- a/odk/examples/DevelopersGuide/Forms/DocumentBasedExample.java
+++ b/odk/examples/DevelopersGuide/Forms/DocumentBasedExample.java
@@ -27,8 +27,6 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-package org.openoffice.sdk.forms;
-
 import com.sun.star.bridge.XUnoUrlResolver;
 import com.sun.star.lang.XMultiComponentFactory;
 import com.sun.star.uno.UnoRuntime;
diff --git a/odk/examples/DevelopersGuide/Forms/DocumentViewHelper.java b/odk/examples/DevelopersGuide/Forms/DocumentViewHelper.java
index cf7739cb3263..58c2ada73933 100644
--- a/odk/examples/DevelopersGuide/Forms/DocumentViewHelper.java
+++ b/odk/examples/DevelopersGuide/Forms/DocumentViewHelper.java
@@ -27,8 +27,6 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-package org.openoffice.sdk.forms;
-
 import com.sun.star.awt.XControl;
 import com.sun.star.awt.XControlModel;
 import com.sun.star.awt.XWindow;
diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/windows/Makefile b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/windows/Makefile
index 7a0f16e6a687..8b5c2a9ed67f 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/windows/Makefile
+++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/windows/Makefile
@@ -69,16 +69,13 @@ $(OUT_SHL_SLO)/%.$(OBJ_EXT) : %.c
 	-$(MKDIR) $(subst /,$(PS),$(@D))
 	$(CC) $(CC_FLAGS) $(CC_INCLUDES) $(SDK_JAVA_INCLUDES) $(CC_DEFINES) $(CC_OUTPUT_SWITCH)$(subst /,$(PS),$@) $<
 
-$(OUT_SHL_MISC)/%.def : exports.dxp
+$(SHAREDLIB_OUT)/$(SHAREDLIB_PRE)$(SHL_NAME).$(SHAREDLIB_EXT) : $(SLOFILES) $(SHL_NAME).def
 	-$(MKDIR) $(subst /,$(PS),$(@D))
-	@echo EXPORTS > $(OUT_SHL_MISC)/$(SHL_NAME).def
-	$(CAT) exports.dxp >> $(OUT_SHL_MISC)/$(SHL_NAME).def
-
-$(SHAREDLIB_OUT)/$(SHAREDLIB_PRE)$(SHL_NAME).$(SHAREDLIB_EXT) : $(SLOFILES) $(OUT_SHL_MISC)/$(SHL_NAME).def
-	-$(MKDIR) $(subst /,$(PS),$(@D))
-	$(LINK) $(LIBRARY_LINK_FLAGS) /OUT:$@ /MAP:$(OUT_SHL_MISC)/$(SHL_NAME).map \
-	/DEF:$(OUT_SHL_MISC)/$(SHL_NAME).def $(LINK_JAVA_LIBS) \
+	-$(MKDIR) $(subst /,$(PS),$(OUT_SHL_MISC))
+	$(LINK) $(LIBRARY_LINK_FLAGS) /DEF:$(SHL_NAME).def /OUT:$@ \
+	/MAP:$(OUT_SHL_MISC)/$(SHL_NAME).map $(LINK_JAVA_LIBS) \
 	$(SLOFILES) jawt.lib msvcrt.lib kernel32.lib user32.lib
+	$(LINK_MANIFEST)
 
 .PHONY: clean
 clean :
diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/windows/nativeview.def b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/windows/nativeview.def
new file mode 100644
index 000000000000..f9ba2a78b6d1
--- /dev/null
+++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/windows/nativeview.def
@@ -0,0 +1,3 @@
+EXPORTS

+Java_NativeView_getNativeWindowSystemType

+Java_NativeView_getNativeWindow

diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/Makefile b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/Makefile
index 8883c4fe0de9..b292a3fac45b 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/Makefile
+++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/Makefile
@@ -92,7 +92,7 @@ $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES)
 	$(LINK) $(COMP_LINK_FLAGS) /OUT:$@ \
 	/MAP:$(OUT_COMP_GEN)/$(subst $(SHAREDLIB_EXT),map,$(@F)) $(SLOFILES) \
 	$(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) msvcrt.lib kernel32.lib
-	$(LINK_MANIFEST_VC8_ONLY)
+	$(LINK_MANIFEST)
 else
 $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) $(COMP_MAPFILE)
 	-$(MKDIR) $(subst /,$(PS),$(@D))
diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/Makefile b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/Makefile
index 4ab62f8997da..b362c0769774 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/Makefile
+++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/Makefile
@@ -89,7 +89,7 @@ $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES)
 	$(LINK) $(COMP_LINK_FLAGS) /OUT:$@ \
 	/MAP:$(OUT_COMP_GEN)/$(subst $(SHAREDLIB_EXT),map,$(@F)) $(SLOFILES) \
 	$(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) msvcrt.lib kernel32.lib
-	$(LINK_MANIFEST_VC8_ONLY)
+	$(LINK_MANIFEST)
 else
 $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) $(COMP_MAPFILE)
 	-$(MKDIR) $(subst /,$(PS),$(@D))
diff --git a/odk/examples/DevelopersGuide/ProfUNO/CppBinding/office_connect.cxx b/odk/examples/DevelopersGuide/ProfUNO/CppBinding/office_connect.cxx
index 009a2f382f1c..a887390de839 100644
--- a/odk/examples/DevelopersGuide/ProfUNO/CppBinding/office_connect.cxx
+++ b/odk/examples/DevelopersGuide/ProfUNO/CppBinding/office_connect.cxx
@@ -40,6 +40,8 @@
 
 #include <stdio.h>
 
+#include <sal/main.h>
+
 #include <cppuhelper/bootstrap.hxx>
 #include <com/sun/star/bridge/XUnoUrlResolver.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -51,7 +53,7 @@ using namespace com::sun::star::bridge;
 using namespace rtl;
 using namespace cppu;
 
-int main( )
+SAL_IMPLEMENT_MAIN()
 {
     // create the initial component context
     Reference< XComponentContext > rComponentContext =
diff --git a/odk/examples/DevelopersGuide/ProfUNO/CppBinding/string_samples.cxx b/odk/examples/DevelopersGuide/ProfUNO/CppBinding/string_samples.cxx
index 5fd930c0fb94..ef35e3be855d 100644
--- a/odk/examples/DevelopersGuide/ProfUNO/CppBinding/string_samples.cxx
+++ b/odk/examples/DevelopersGuide/ProfUNO/CppBinding/string_samples.cxx
@@ -40,6 +40,8 @@
 
 #include <stdio.h>
 
+#include <sal/main.h>
+
 #include <rtl/ustrbuf.hxx>
 #include <rtl/string.hxx>
 
@@ -47,7 +49,7 @@ using rtl::OUString;
 using rtl::OUStringBuffer;
 using rtl::OString;
 
-int main( int argc, char * argv [] )
+SAL_IMPLEMENT_MAIN()
 {
     // string concatination
 
diff --git a/odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/SimpleBootstrap_cpp.cxx b/odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/SimpleBootstrap_cpp.cxx
index f7c3a78a8dab..a56178fb2b07 100644
--- a/odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/SimpleBootstrap_cpp.cxx
+++ b/odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/SimpleBootstrap_cpp.cxx
@@ -39,6 +39,8 @@
  *************************************************************************/
 
 #include <stdio.h>
+
+#include <sal/main.h>
 #include <cppuhelper/bootstrap.hxx>
 #include <com/sun/star/bridge/XUnoUrlResolver.hpp>
 #include <com/sun/star/frame/XComponentLoader.hpp>
@@ -50,7 +52,7 @@ using namespace com::sun::star::lang;
 using namespace com::sun::star::frame;
 
 
-int SAL_CALL main( int argc, char **argv )
+SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
 {
     try
     {
diff --git a/odk/examples/DevelopersGuide/examples.html b/odk/examples/DevelopersGuide/examples.html
index ba74e68b08a4..edf21ce4e2ba 100644
--- a/odk/examples/DevelopersGuide/examples.html
+++ b/odk/examples/DevelopersGuide/examples.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <title>StarOffice 8 SDK - Developer's Guide Examples</title>
+  <title>[TITLE] - Developer's Guide Examples</title>
   <link rel="stylesheet" type="text/css"
  href="../../docs/sdk_styles.css">
   <meta http-equiv="Content-Type"
@@ -138,7 +138,7 @@ Presentation Documents</a></td>
                   <td class="content3"><img
  src="../../docs/images/arrow-1.gif"></td>
                   <td><a href="#BasicandDialogs"
- title="link to the Basic And Dialogs examples">StarOffice 8 Basic and
+ title="link to the Basic And Dialogs examples">[PRODUCTNAME] Basic and
 Dialogs</a></td>
                 </tr>
                 <tr valign="top">
@@ -237,7 +237,7 @@ examples</a></td>
  href="./FirstSteps/FirstUnoContact.java"
  title="link to FirstSteps/FirstUnoContact.java">FirstUnoContact</a></td>
                   <td class="cell80">Shows how to initialize UNO and
-get a remote office service manager from a running StarOffice 8 in a
+get a remote office service manager from a running [PRODUCTNAME] in a
 different process space.</td>
                 </tr>
                 <tr>
@@ -246,7 +246,7 @@ different process space.</td>
  href="./FirstSteps/FirstLoadComponent.java"
  title="link to FirstSteps/FirstLoadComponent.java">FirstLoadComponent</a></td>
                   <td class="cell80">Demonstrates how to load a
-component into StarOffice 8 by a Java application.</td>
+component into [PRODUCTNAME] by a Java application.</td>
                 </tr>
                 <tr>
                   <td class="cell20"><img
@@ -337,7 +337,7 @@ mechanism in C++.</td>
  href="./ProfUNO/InterprocessConn/ConnectionAwareClient.java"
  title="link to ProfUNO/InterprocessConn/ConnectionAwareClient/.java">ConnectionAwareClient</a></td>
                   <td class="cell80">Implements a client which is aware
-of losing connection to StarOffice 8.</td>
+of losing connection to [PRODUCTNAME].</td>
                 </tr>
                 <tr>
                   <td class="cell20"><img
@@ -345,7 +345,7 @@ of losing connection to StarOffice 8.</td>
  href="./ProfUNO/InterprocessConn/UrlResolver.java"
  title="link to ProfUNO/InterProcessConn/UrlResolver.java">UrlResolver</a></td>
                   <td class="cell80">Builds a connection to
-StarOffice 8 using the URL given on the command line. This example
+[PRODUCTNAME] using the URL given on the command line. This example
 shows the usage of <a
  href="../../docs/common/ref/com/sun/star/bridge/XUnoUrlResolver.html"
  title="link to the reference documentation of com.sun.star.bridge.XUnoResolver"><code>XUnoUrlResolver</code></a>.</td>
@@ -368,7 +368,7 @@ shows the usage of <a
  href="./ProfUNO/CppBinding/office_connect.cxx"
  title="link to ProfUNO/CppBinding/office_connect.java">office_connect.cxx</a></td>
                   <td class="cell80">Builds a connection to
-StarOffice 8 using C++.</td>
+[PRODUCTNAME] using C++.</td>
                 </tr>
                 <tr>
                   <td class="cell20"><img
@@ -729,7 +729,7 @@ for the image shrink component and instantiates it.</td>
  href="./Components/DialogComponent/DialogComponent.java"
  title="link to Components/DialogComponent/DialogComponent.java">DialogComponent.java</a></td>
                   <td class="cell80">Implements a component accessing a dialog created
-                  with the StarOffice 8 Basic IDE. The component provides methods that
+                  with the [PRODUCTNAME] Basic IDE. The component provides methods that
                   can be bound to dialog respectively control events	.</td>
                 </tr>
                 <tr>
@@ -946,7 +946,7 @@ document component.</td>
                   <td class="cell80">This is the main part of a demo
 application based on the framework APIs. It mainly shows the mechanisms
 to load, store and convert documents, as well as dispatch and dispatch
-interception. It integrates windows from StarOffice 8 via system
+interception. It integrates windows from [PRODUCTNAME] via system
 window handle. This is the same mechanism as used by the OOoBean, but
 the OOoBean itself is not used here, just the JNI window handle access.</td>
                 </tr>
@@ -962,7 +962,7 @@ and it's actions.</td>
  href="./OfficeDev/DesktopEnvironment/FunctionHelper.java"
  title="link to OfficeDev/DesktopEnvironment/FunctionHelper.java">FunctionHelper</a></td>
                   <td class="cell80">This helper comprises all
-StarOffice 8 API calls. Thus it is possible to learn about these
+[PRODUCTNAME] API calls. Thus it is possible to learn about these
 aspects separately from the rest of the application example.</td>
                 </tr>
                 <tr>
@@ -977,7 +977,7 @@ asynchronous events from UNO oneway calls.</td>
  href="./OfficeDev/DesktopEnvironment/IShutdownListener.java"
  title="link to OfficeDev/DesktopEnvironment/IShutdownListener.java">IShutdownListener</a></td>
                   <td class="cell80">This is a listener interface to
-clean up on shutdown of StarOffice 8.</td>
+clean up on shutdown of [PRODUCTNAME].</td>
                 </tr>
                 <tr>
                   <td class="cell20"><a
@@ -1008,7 +1008,7 @@ get the window handle of the Java window.</td>
  href="./OfficeDev/DesktopEnvironment/OfficeConnect.java"
  title=" link to OfficeDev/DesktopEnvironment/OfficeConnect.java">OfficeConnect</a></td>
                   <td class="cell80">Builds the remote bridge to
-StarOffice 8 and exports its UNO service manager for the Java side of
+[PRODUCTNAME] and exports its UNO service manager for the Java side of
 the application.</td>
                 </tr>
                 <tr>
@@ -1039,7 +1039,7 @@ the application is registered as an event listener.</td>
  href="./OfficeDev/DesktopEnvironment/ViewContainer.java"
  title="link to OfficeDev/DesktopEnvironment/ViewContainer.java">ViewContainer</a></td>
                   <td class="cell80">Performs a clean up on the Java
-side on StarOffice 8 shutdown.</td>
+side on [PRODUCTNAME] shutdown.</td>
                 </tr>
               </tbody>
             </table>
@@ -1058,7 +1058,7 @@ side on StarOffice 8 shutdown.</td>
  href="./OfficeDev/OfficeConnect.java"
  title="link to OfficeDev/OfficeConnect.java">OfficeConnect</a></td>
                   <td class="cell80">Builds the remote bridge to
-StarOffice 8 and exports its UNO service manager to the Java side.</td>
+[PRODUCTNAME] and exports its UNO service manager to the Java side.</td>
                 </tr>
                 <tr>
                   <td class="cell20"><img
@@ -1114,7 +1114,7 @@ TerminateListener and shows the use of them in a running program.</td>
  href="../../docs/common/ref/com/sun/star/frame/XTerminateListener.html"
  title="link to the reference documentation of com.sun.star.frame.XTerminationListener">
                   <code>XTerminateListener</code></a>. It is called
-when StarOffice 8 terminates.</td>
+when [PRODUCTNAME] terminates.</td>
                 </tr>
               </tbody>
             </table>
@@ -1180,7 +1180,7 @@ of formats.</td>
  href="./OfficeDev/Linguistic/LinguisticExamples.java"
  title="link to OfficeDev/Linguistic/LinguisticExamples.java">LinguisticExamples</a></td>
                   <td class="cell80">A short example that uses most of
-the functionality from the StarOffice 8 linguistic API.</td>
+the functionality from the [PRODUCTNAME] linguistic API.</td>
                 </tr>
                 <tr>
                   <td class="cell20"><a
@@ -1661,7 +1661,7 @@ URLs.</td>
                   <td class="cell20"><a href="./Drawing/Helper.java"
  title="link to Drawing/Helper.java">Helper</a></td>
                   <td class="cell80">Contains a helper class for the
-other examples to connect to StarOffice 8 and open or create a drawing
+other examples to connect to [PRODUCTNAME] and open or create a drawing
 document.</td>
                 </tr>
                 <tr>
@@ -1812,7 +1812,7 @@ is not implemented. To be more precise.</td>
                   <td class="cell20"><a href="./Charts/Helper.java"
  title="link to Charts/Helper.java">Helper</a></td>
                   <td class="cell80">Shows how to connect to
-StarOffice 8 and create text, drawing or spreadsheet document. This
+[PRODUCTNAME] and create text, drawing or spreadsheet document. This
 class is used as a helper class for the other examples.</td>
                 </tr>
                 <tr>
@@ -1867,7 +1867,7 @@ changes.</td>
               <tbody>
                 <tr>
                   <td colspan="2" class="head1"><a
- name="BasicandDialogs">StarOffice 8 Basic and Dialogs examples</a></td>
+ name="BasicandDialogs">[PRODUCTNAME] Basic and Dialogs examples</a></td>
                   <td align="right"> <a href="#examples"
  title="link to the Developer's Guide examples overview"><img
  class="navigate" src="../../docs/images/nav_up.png"></a> <a
@@ -1989,7 +1989,7 @@ the example. </td>
  href="./Database/CodeSamples.java"
  title="link to Database/CodeSamples.java">CodeSamples</a></td>
                   <td class="cell80">Creates the connection to
-StarOffice 8 and executes the code SalesMan samples for database API.</td>
+[PRODUCTNAME] and executes the code SalesMan samples for database API.</td>
                 </tr>
                 <tr>
                   <td class="cell20"><img
@@ -2672,7 +2672,7 @@ Management examples</a></td>
  href="./Config/ConfigExamples.java"
  title="link to Config/ConfigExamples.java">ConfigExamples</a></td>
                   <td class="cell80">This example connects to a
-StarOffice 8, gets the configuration manager and accesses the
+[PRODUCTNAME], gets the configuration manager and accesses the
 configuration in various ways.</td>
                 </tr>
               </tbody>