CWS-TOOLING: integrate CWS sb122

4 files changed, 98 insertions, 8 deletions

diff --git a/offapi/com/sun/star/configuration/Update.idl b/offapi/com/sun/star/configuration/Update.idl
new file mode 100644
index 000000000000..790a4bb40235
--- /dev/null
+++ b/offapi/com/sun/star/configuration/Update.idl
@@ -0,0 +1,45 @@
+/*************************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+************************************************************************/
+
+#ifndef __com_sun_star_configuration_Update_idl__
+#define __com_sun_star_configuration_Update_idl__
+
+#include "com/sun/star/configuration/XUpdate.idl"
+
+module com { module sun { module star { module configuration {
+
+/* Provides access to internal update features of the configuration provider.
+
+   <p>This singleton is unpublished and unstable.</p>
+
+   @since OOo 3.3.0
+*/
+singleton Update: XUpdate;
+
+}; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/configuration/XUpdate.idl b/offapi/com/sun/star/configuration/XUpdate.idl
new file mode 100644
index 000000000000..7514cbcb1b7f
--- /dev/null
+++ b/offapi/com/sun/star/configuration/XUpdate.idl
@@ -0,0 +1,51 @@
+/*************************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+************************************************************************/
+
+#ifndef __com_sun_star_configuration_XUpdate_idl__
+#define __com_sun_star_configuration_XUpdate_idl__
+
+#include "com/sun/star/uno/XInterface.idl"
+
+module com { module sun { module star { module configuration {
+
+/* Provides access to internal update features of the configuration provider.
+
+   <p>This interface is unpublished and unstable.</p>
+
+   @since OOo 3.3.0
+*/
+interface XUpdate {
+    void insertExtensionXcsFile([in] boolean shared, [in] string fileUri);
+    void insertExtensionXcuFile([in] boolean shared, [in] string fileUri);
+    void insertModificationXcuFile(
+        [in] string fileUri, [in] sequence< string > includedPaths,
+        [in] sequence< string > excludedPaths);
+};
+
+}; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/configuration/makefile.mk b/offapi/com/sun/star/configuration/makefile.mk
index 0dc3a42df9ab..00525e9ba355 100644
--- a/offapi/com/sun/star/configuration/makefile.mk
+++ b/offapi/com/sun/star/configuration/makefile.mk
@@ -65,6 +65,8 @@ IDLFILES=\
     PropertyHierarchy.idl\
     XTemplateContainer.idl\
     XTemplateInstance.idl\
+    Update.idl \
+    XUpdate.idl
 
 # ------------------------------------------------------------------
 
diff --git a/sal/rtl/source/bootstrap.cxx b/sal/rtl/source/bootstrap.cxx
index 2ac61e9aaef5..cc7d3336c2d2 100644
--- a/sal/rtl/source/bootstrap.cxx
+++ b/sal/rtl/source/bootstrap.cxx
@@ -281,10 +281,6 @@ static OUString & getIniFileName_Impl()
             fileName += OUString(RTL_CONSTASCII_USTRINGPARAM(SAL_CONFIGFILE("")));
         }
 
-        OUString workDir;
-        osl_getProcessWorkingDir(&workDir.pData);
-        osl::FileBase::getAbsoluteFileURL(workDir, fileName, fileName);
-
         static OUString theFileName;
         if(fileName.getLength())
             theFileName = fileName;
@@ -653,12 +649,8 @@ rtlBootstrapHandle SAL_CALL rtl_bootstrap_args_open (
     rtl_uString * pIniName
 ) SAL_THROW_EXTERN_C()
 {
-    OUString workDir;
     OUString iniName( pIniName );
 
-    osl_getProcessWorkingDir( &workDir.pData );
-    osl::FileBase::getAbsoluteFileURL( workDir, iniName, iniName );
-
     // normalize path
     FileStatus status( FileStatusMask_FileURL );
     DirectoryItem dirItem;