Merge branch 'master' into feature/killsdf

Conflicts: Makefile.top Module_tail_build.mk RepositoryExternal.mk RepositoryFixes.mk accessibility/source/standard/vclxaccessibletoolbox.cxx basic/source/uno/dlgcont.cxx connectivity/Library_ado.mk cross_tail_build/prj/build.lst desktop/source/offacc/acceptor.cxx filter/Library_PptImporter.mk filter/source/t602/filterenv.cxx i18npool/Library_textconv_dict.mk ooo.lst.in saxon/ExternalProject_saxon.mk saxon/build.xml sc/sdi/scalc.sdi sc/source/filter/xml/xmlstyli.cxx sc/source/ui/condformat/condformatdlg.cxx sc/source/ui/condformat/condformatmgr.cxx sc/source/ui/view/cellsh1.cxx sdext/source/pdfimport/misc/pwdinteract.cxx shell/qa/zip/makefile.mk shell/qa/zip/testimpl/makefile.mk solenv/gbuild/CppunitTest.mk solenv/gbuild/gbuild.mk solenv/gbuild/platform/android.mk solenv/gbuild/platform/com_GCC_defs.mk solenv/gbuild/platform/macosx.mk soltools/Executable_adjustvisibility.mk soltools/Executable_checkdll.mk soltools/Executable_cpp.mk soltools/Executable_javadep.mk soltools/Executable_makedepend.mk sw/qa/extras/rtfimport/rtfimport.cxx tail_build/prj/build.lst tomcat/ExternalProject_tomcat.mk ucb/source/ucp/webdav/webdavcontent.cxx xml2cmp/Executable_xml2cmp.mk
author: Andras Timar <atimar@suse.com> 2012-10-13 17:41:05 +0200
committer: Andras Timar <atimar@suse.com> 2012-10-13 17:41:05 +0200
commit: e5ce011c3f32f53ef073aec5485450b2588b656a (patch)
tree: 8a838a53bcdd70cc3d4cdbca0ebe07504790952e /extensions
parent: c6b26144c93aa5222e4260c5b0ef45ce5bdc18d2 (diff)
parent: e74fc93e4aba7887e6a278cc44c4bc0962471065 (diff)
50 files changed, 87 insertions, 75 deletions
diff --git a/extensions/Library_bib.mk b/extensions/Library_bib.mk
index 4e46e07c1da8..cd0cc2fcc6de 100644
--- a/extensions/Library_bib.mk
+++ b/extensions/Library_bib.mk
@@ -30,6 +30,12 @@
 
 $(eval $(call gb_Library_Library,bib))
 
+$(eval $(call gb_Library_use_packages,bib,\
+    editeng_inc \
+    sfx2_inc \
+    svx_inc \
+))
+
 $(eval $(call gb_Library_set_componentfile,bib,extensions/source/bibliography/bib))
 
 $(eval $(call gb_Library_set_include,bib,\
diff --git a/extensions/Library_log.mk b/extensions/Library_log.mk
index d09c1d04f552..05a5186c03bb 100644
--- a/extensions/Library_log.mk
+++ b/extensions/Library_log.mk
@@ -30,6 +30,10 @@
 
 $(eval $(call gb_Library_Library,log))
 
+$(eval $(call gb_Library_use_packages,log,\
+    tools_inc \
+))
+
 $(eval $(call gb_Library_set_componentfile,log,extensions/source/logging/log))
 
 $(eval $(call gb_Library_use_sdk_api,log))
diff --git a/extensions/Library_npsoplugin.mk b/extensions/Library_npsoplugin.mk
index 6528b3d3c4b7..00a4785c9f15 100644
--- a/extensions/Library_npsoplugin.mk
+++ b/extensions/Library_npsoplugin.mk
@@ -30,6 +30,10 @@
 
 $(eval $(call gb_Library_Library,npsoplugin))
 
+$(eval $(call gb_Library_use_packages,npsoplugin,\
+	comphelper_inc \
+))
+
 $(eval $(call gb_Library_use_external,npsoplugin,mozilla_headers))
 
 $(eval $(call gb_Library_use_static_libraries,npsoplugin,\
diff --git a/extensions/Library_oleautobridge.mk b/extensions/Library_oleautobridge.mk
index d86a604b1b9a..adbf359271c9 100644
--- a/extensions/Library_oleautobridge.mk
+++ b/extensions/Library_oleautobridge.mk
@@ -38,6 +38,10 @@ $(eval $(call gb_Library_set_include,oleautobridge,\
 	$$(INCLUDE) \
 ))
 
+$(eval $(call gb_Library_add_ldflags,oleautobridge,\
+	-LIBPATH:$(ATL_LIB) \
+))
+
 $(eval $(call gb_Library_use_libraries,oleautobridge,\
 	comphelper \
 	cppuhelper \
diff --git a/extensions/Library_oleautobridge2.mk b/extensions/Library_oleautobridge2.mk
index c7f1a0152034..b6fee4918d9c 100644
--- a/extensions/Library_oleautobridge2.mk
+++ b/extensions/Library_oleautobridge2.mk
@@ -42,6 +42,10 @@ $(eval $(call gb_Library_set_include,oleautobridge2,\
 	$$(INCLUDE) \
 ))
 
+$(eval $(call gb_Library_add_ldflags,oleautobridge2,\
+	-LIBPATH:$(ATL_LIB) \
+))
+
 $(eval $(call gb_Library_use_libraries,oleautobridge2,\
 	comphelper \
 	cppuhelper \
diff --git a/extensions/Library_so_activex.mk b/extensions/Library_so_activex.mk
index 733de14eab86..d618127294c8 100644
--- a/extensions/Library_so_activex.mk
+++ b/extensions/Library_so_activex.mk
@@ -52,6 +52,7 @@ $(eval $(call gb_Library_add_exception_objects,so_activex,\
 
 $(eval $(call gb_Library_add_ldflags,so_activex,\
 	/DEF:$(SRCDIR)/extensions/source/activex/so_activex.def \
+	-LIBPATH:$(ATL_LIB) \
 ))
 
 $(eval $(call gb_Library_use_system_win32_libs,so_activex,\
diff --git a/extensions/Library_so_activex_x64.mk b/extensions/Library_so_activex_x64.mk
index 9bc43840d8a3..132f7f067279 100644
--- a/extensions/Library_so_activex_x64.mk
+++ b/extensions/Library_so_activex_x64.mk
@@ -55,6 +55,7 @@ $(eval $(call gb_Library_add_x64_generated_exception_objects,so_activex_x64,\
 
 $(eval $(call gb_Library_add_ldflags,so_activex_x64,\
 	/DEF:$(SRCDIR)/extensions/source/activex/so_activex.def \
+	-LIBPATH:$(ATL_LIB)/amd64 \
 ))
 
 $(eval $(call gb_Library_use_system_win32_libs,so_activex_x64,\
diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk
index 40ae09b9159c..67133d0df8cc 100644
--- a/extensions/Module_extensions.mk
+++ b/extensions/Module_extensions.mk
@@ -31,10 +31,11 @@ $(eval $(call gb_Module_add_targets,extensions,\
 	AllLangResTarget_abp \
 	AllLangResTarget_scn \
 	AllLangResTarget_upd \
-	Library_abp \
-	Library_log \
 	Library_res \
-	Library_scn \
+	$(if $(filter IOS ANDROID,$(OS)),, \
+		Library_abp \
+		Library_log \
+		Library_scn) \
 ))
 
 ifneq ($(filter-out IOS ANDROID,$(OS)),)
diff --git a/extensions/source/abpilot/abp.component b/extensions/source/abpilot/abp.component
index a07cef986219..83c42e58a383 100644
--- a/extensions/source/abpilot/abp.component
+++ b/extensions/source/abpilot/abp.component
@@ -26,7 +26,7 @@
 *
 **********************************************************************-->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="abp"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="org.openoffice.comp.abp.OAddressBookSourcePilot">
     <service name="com.sun.star.ui.dialogs.AddressBookSourcePilot"/>
diff --git a/extensions/source/abpilot/abpservices.cxx b/extensions/source/abpilot/abpservices.cxx
index c43d97895f32..a7955d6d0d6f 100644
--- a/extensions/source/abpilot/abpservices.cxx
+++ b/extensions/source/abpilot/abpservices.cxx
@@ -53,7 +53,7 @@ extern "C" void SAL_CALL abp_initializeModule()
 }
 
 //---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL abp_component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
                     void* /*pRegistryKey*/)
diff --git a/extensions/source/abpilot/datasourcehandling.cxx b/extensions/source/abpilot/datasourcehandling.cxx
index c37139b48e46..0577224521d7 100644
--- a/extensions/source/abpilot/datasourcehandling.cxx
+++ b/extensions/source/abpilot/datasourcehandling.cxx
@@ -45,7 +45,7 @@
 #include <com/sun/star/sdb/XDocumentDataSource.hpp>
 #include <com/sun/star/sdbc/XConnection.hpp>
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
-#include <com/sun/star/task/XInteractionHandler.hpp>
+#include <com/sun/star/task/InteractionHandler.hpp>
 #include <com/sun/star/uno/XNamingService.hpp>
 
 #include <comphelper/interaction.hxx>
@@ -524,14 +524,12 @@ namespace abp
 
         // ................................................................
         // create the interaction handler (needed for authentication and error handling)
-        static ::rtl::OUString s_sInteractionHandlerServiceName(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.task.InteractionHandler"));
         Reference< XInteractionHandler > xInteractions;
         try
         {
-            xInteractions = Reference< XInteractionHandler >(
-                m_pImpl->xORB->createInstance( s_sInteractionHandlerServiceName ),
-                UNO_QUERY
-            );
+            xInteractions.set(
+                InteractionHandler::createWithParent(comphelper::getComponentContext(m_pImpl->xORB), 0),
+                UNO_QUERY);
         }
         catch(const Exception&)
         {
@@ -541,6 +539,7 @@ namespace abp
         // failure to create the interaction handler is a serious issue ...
         if (!xInteractions.is())
         {
+            ::rtl::OUString s_sInteractionHandlerServiceName(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.task.InteractionHandler"));
             if ( _pMessageParent )
                 ShowServiceNotAvailableError( _pMessageParent, s_sInteractionHandlerServiceName, sal_True );
             return sal_False;
diff --git a/extensions/source/activex/StdAfx2.cxx b/extensions/source/activex/StdAfx2.cxx
index f1cf88d10d14..d06eb872c7ed 100644
--- a/extensions/source/activex/StdAfx2.cxx
+++ b/extensions/source/activex/StdAfx2.cxx
@@ -10,12 +10,10 @@
 
 #ifdef _ATL_STATIC_REGISTRY
 #include <statreg.h>
-#include <statreg.cpp>
 #endif
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1300)
 #undef _DEBUG
 #endif
-#include <atlimpl.cpp>
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/activex/StdAfx2.h b/extensions/source/activex/StdAfx2.h
index 5c540b0ba329..ab267e42352c 100644
--- a/extensions/source/activex/StdAfx2.h
+++ b/extensions/source/activex/StdAfx2.h
@@ -12,7 +12,7 @@
 
 #define STRICT
 #ifndef _WIN32_WINNT
-#define _WIN32_WINNT 0x0400
+#define _WIN32_WINNT 0x0403
 #endif
 #define _ATL_APARTMENT_THREADED
 #define _ATL_STATIC_REGISTRY
diff --git a/extensions/source/bibliography/bib.component b/extensions/source/bibliography/bib.component
index 98627854dffa..b59add76b404 100644
--- a/extensions/source/bibliography/bib.component
+++ b/extensions/source/bibliography/bib.component
@@ -26,7 +26,7 @@
 *
 **********************************************************************-->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="bib"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.extensions.Bibliography">
     <service name="com.sun.star.frame.Bibliography"/>
diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx
index 5753a86f5aee..8dce89ac480f 100644
--- a/extensions/source/bibliography/bibload.cxx
+++ b/extensions/source/bibliography/bibload.cxx
@@ -212,7 +212,7 @@ Sequence< rtl::OUString > BibliographyLoader::getSupportedServiceNames_Static(vo
 
 extern "C"
 {
-    SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+    SAL_DLLPUBLIC_EXPORT void * SAL_CALL bib_component_getFactory(
         const sal_Char * pImplName, XMultiServiceFactory * pServiceManager, void * /*pRegistryKey*/ )
     {
         void * pRet = 0;
@@ -458,7 +458,7 @@ Reference< XResultSet >  BibliographyLoader::GetDataCursor() const
     return m_xCursor;
 }
 
-rtl::OUString lcl_AddProperty(Reference< XNameAccess >  xColumns,
+static rtl::OUString lcl_AddProperty(Reference< XNameAccess >  xColumns,
         const Mapping* pMapping, const String& rColumnName)
 {
     String sColumnName(rColumnName);
diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx
index 05628020b236..3aed96675c01 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -45,7 +45,7 @@
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
 #include <com/sun/star/sdbc/XConnection.hpp>
 #include <com/sun/star/sdb/XCompletedConnection.hpp>
-#include <com/sun/star/task/XInteractionHandler.hpp>
+#include <com/sun/star/task/InteractionHandler.hpp>
 #include <com/sun/star/form/XLoadable.hpp>
 #include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
 #include <com/sun/star/form/XGridColumnFactory.hpp>
@@ -96,7 +96,6 @@ Reference< XConnection > getConnection(const ::rtl::OUString& _rURL)
     // first get the sdb::DataSource corresponding to the url
     Reference< XDataSource >    xDataSource;
     // is it a favorite title ?
-    Reference< XMultiServiceFactory >  xMgr = comphelper::getProcessServiceFactory();
     Reference<XComponentContext>  xContext = comphelper::getProcessComponentContext();
     Reference< XDatabaseContext >  xNamingContext = DatabaseContext::create(xContext);
     if (xNamingContext->hasByName(_rURL))
@@ -120,9 +119,7 @@ Reference< XConnection > getConnection(const ::rtl::OUString& _rURL)
         Reference< XCompletedConnection > xComplConn(xDataSource, UNO_QUERY);
         try
         {
-
-            Reference<XInterface> xHdl = xMgr->createInstance(C2U("com.sun.star.task.InteractionHandler"));
-            Reference<task::XInteractionHandler> xIHdl(xHdl, UNO_QUERY);
+            Reference<task::XInteractionHandler> xIHdl( task::InteractionHandler::createWithParent(xContext, 0), UNO_QUERY_THROW);
             xConn = xComplConn->connectWithCompletion(xIHdl);
         }
         catch (const SQLException&)
@@ -292,7 +289,7 @@ public:
 
 };
 
-sal_uInt16 lcl_FindLogicalName(BibConfig* pConfig ,
+static sal_uInt16 lcl_FindLogicalName(BibConfig* pConfig ,
                                     const ::rtl::OUString& rLogicalColumnName)
 {
     for(sal_uInt16 i = 0; i < COLUMN_COUNT; i++)
diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx
index 554ef62076dd..0ca51d192bf5 100644
--- a/extensions/source/bibliography/framectr.cxx
+++ b/extensions/source/bibliography/framectr.cxx
@@ -409,7 +409,7 @@ sal_Bool BibFrameController_Impl::SaveModified(const Reference< form::runtime::X
     return bResult;
 }
 
-Window* lcl_GetFocusChild( Window* pParent )
+static Window* lcl_GetFocusChild( Window* pParent )
 {
     sal_uInt16 nChildren = pParent->GetChildCount();
     for( sal_uInt16 nChild = 0; nChild < nChildren; ++nChild)
diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx
index ca2507638c6d..eccb955e1f0f 100644
--- a/extensions/source/bibliography/general.cxx
+++ b/extensions/source/bibliography/general.cxx
@@ -65,7 +65,7 @@ using namespace ::rtl;
 #define C2S(cChar) String::CreateFromAscii(cChar)
 #define DISTANCE_CONTROL_TO_FIXEDTEXT 5
 
-::Point lcl_MovePoint(const FixedText& rFixedText)
+static ::Point lcl_MovePoint(const FixedText& rFixedText)
 {
     ::Point aRet(rFixedText.GetPosPixel());
     aRet.X() += rFixedText.GetSizePixel().Width();
@@ -74,7 +74,7 @@ using namespace ::rtl;
 }
 
 //-----------------------------------------------------------------------------
-OUString lcl_GetColumnName( const Mapping* pMapping, sal_uInt16 nIndexPos )
+static OUString lcl_GetColumnName( const Mapping* pMapping, sal_uInt16 nIndexPos )
 {
     BibConfig* pBibConfig = BibModul::GetConfig();
     OUString sRet = pBibConfig->GetDefColumnName(nIndexPos);
diff --git a/extensions/source/config/ldap/componentdef.cxx b/extensions/source/config/ldap/componentdef.cxx
index 86a56c740229..b3ea47b9e9f2 100644
--- a/extensions/source/config/ldap/componentdef.cxx
+++ b/extensions/source/config/ldap/componentdef.cxx
@@ -54,7 +54,7 @@ static const cppu::ImplementationEntry kImplementations_entries[] =
 } ;
 //------------------------------------------------------------------------------
 
-extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(const sal_Char *aImplementationName,
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ldapbe2_component_getFactory(const sal_Char *aImplementationName,
                                       void *aServiceManager,
                                       void *aRegistryKey) {
     return cppu::component_getFactoryHelper(aImplementationName,
diff --git a/extensions/source/config/ldap/ldapbe2.component b/extensions/source/config/ldap/ldapbe2.component
index 071064d1c823..390da1147c4d 100644
--- a/extensions/source/config/ldap/ldapbe2.component
+++ b/extensions/source/config/ldap/ldapbe2.component
@@ -26,7 +26,7 @@
 *
 **********************************************************************-->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="ldapbe2"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.configuration.backend.LdapUserProfileBe">
     <service name="com.sun.star.configuration.backend.LdapUserProfileBe"/>
diff --git a/extensions/source/dbpilots/controlwizard.cxx b/extensions/source/dbpilots/controlwizard.cxx
index 47c6bb55ed48..767088ea8fcb 100644
--- a/extensions/source/dbpilots/controlwizard.cxx
+++ b/extensions/source/dbpilots/controlwizard.cxx
@@ -42,6 +42,7 @@
 #include <com/sun/star/sdb/CommandType.hpp>
 #include <com/sun/star/sdbc/SQLWarning.hpp>
 #include <com/sun/star/sdb/SQLContext.hpp>
+#include <com/sun/star/task/InteractionHandler.hpp>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/types.hxx>
 #include <connectivity/dbtools.hxx>
@@ -514,16 +515,17 @@ namespace dbp
     //---------------------------------------------------------------------
     Reference< XInteractionHandler > OControlWizard::getInteractionHandler(Window* _pWindow) const
     {
-        const ::rtl::OUString sInteractionHandlerServiceName("com.sun.star.task.InteractionHandler");
         Reference< XInteractionHandler > xHandler;
         try
         {
-            if (getServiceFactory().is())
-                xHandler = Reference< XInteractionHandler >(getServiceFactory()->createInstance(sInteractionHandlerServiceName), UNO_QUERY);
+            xHandler = Reference< XInteractionHandler >( InteractionHandler::createWithParent(comphelper::getComponentContext(getServiceFactory()), 0), UNO_QUERY_THROW );
         }
         catch(const Exception&) { }
         if (!xHandler.is())
+        {
+            const ::rtl::OUString sInteractionHandlerServiceName("com.sun.star.task.InteractionHandler");
             ShowServiceNotAvailableError(_pWindow, sInteractionHandlerServiceName, sal_True);
+        }
         return xHandler;
     }
     //---------------------------------------------------------------------
diff --git a/extensions/source/dbpilots/dbp.component b/extensions/source/dbpilots/dbp.component
index 84ec98713b2a..a0657efe8945 100644
--- a/extensions/source/dbpilots/dbp.component
+++ b/extensions/source/dbpilots/dbp.component
@@ -26,7 +26,7 @@
 *
 **********************************************************************-->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="dbp"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="org.openoffice.comp.dbp.OGridWizard">
     <service name="com.sun.star.sdb.GridControlAutoPilot"/>
diff --git a/extensions/source/dbpilots/dbpservices.cxx b/extensions/source/dbpilots/dbpservices.cxx
index 0f0d8922e84e..e8b42cacb2f8 100644
--- a/extensions/source/dbpilots/dbpservices.cxx
+++ b/extensions/source/dbpilots/dbpservices.cxx
@@ -57,7 +57,7 @@ extern "C" void SAL_CALL dbp_initializeModule()
 }
 
 //---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL dbp_component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
                     void* /*pRegistryKey*/)
diff --git a/extensions/source/logging/consolehandler.cxx b/extensions/source/logging/consolehandler.cxx
index 84f1cb7e83d1..5145f3ab1131 100644
--- a/extensions/source/logging/consolehandler.cxx
+++ b/extensions/source/logging/consolehandler.cxx
@@ -39,8 +39,6 @@
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>
 
-#include <tools/diagnose_ex.h>
-
 #include <comphelper/componentcontext.hxx>
 
 #include <cppuhelper/compbase3.hxx>
diff --git a/extensions/source/logging/log.component b/extensions/source/logging/log.component
index 4dd2db56c3cc..0f7093a65ca5 100644
--- a/extensions/source/logging/log.component
+++ b/extensions/source/logging/log.component
@@ -26,7 +26,7 @@
 *
 **********************************************************************-->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="log"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.extensions.ConsoleHandler">
     <service name="com.sun.star.logging.ConsoleHandler"/>
diff --git a/extensions/source/logging/log_services.cxx b/extensions/source/logging/log_services.cxx
index e5af7a66f236..b08410373fe6 100644
--- a/extensions/source/logging/log_services.cxx
+++ b/extensions/source/logging/log_services.cxx
@@ -54,7 +54,7 @@ namespace logging
 } // namespace logging
 //........................................................................
 
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL log_component_getFactory(
     const sal_Char* pImplementationName, SAL_UNUSED_PARAMETER void*,
     SAL_UNUSED_PARAMETER void* )
 {
diff --git a/extensions/source/logging/logger.cxx b/extensions/source/logging/logger.cxx
index 9bdd202fcbc0..8052d618d69f 100644
--- a/extensions/source/logging/logger.cxx
+++ b/extensions/source/logging/logger.cxx
@@ -28,8 +28,6 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/logging/XLoggerPool.hpp>
 
-#include <tools/diagnose_ex.h>
-
 #include <comphelper/componentcontext.hxx>
 
 #include <cppuhelper/basemutex.hxx>
diff --git a/extensions/source/nsplugin/source/npshell.cxx b/extensions/source/nsplugin/source/npshell.cxx
index e9aae6561a84..b7ee74dff9c0 100644
--- a/extensions/source/nsplugin/source/npshell.cxx
+++ b/extensions/source/nsplugin/source/npshell.cxx
@@ -63,6 +63,8 @@
 #pragma warning (pop)
 #endif
 
+#include "tools/pathutils.hxx"
+
 #endif //end of WNT
 
 
@@ -71,7 +73,6 @@
 #include <string.h>
 #include <errno.h>
 #include "boost/scoped_array.hpp"
-#include "tools/pathutils.hxx"
 
 #include "npapi.h"
 #include "npshell.hxx"
diff --git a/extensions/source/ole/oleautobridge.component b/extensions/source/ole/oleautobridge.component
index 6f5309e42ad9..ea7d0214d026 100644
--- a/extensions/source/ole/oleautobridge.component
+++ b/extensions/source/ole/oleautobridge.component
@@ -26,7 +26,7 @@
 *
 **********************************************************************-->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="oleautobridge"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.ole.OleClient">
     <service name="com.sun.star.bridge.OleObjectFactory"/>
diff --git a/extensions/source/ole/oleobjw.cxx b/extensions/source/ole/oleobjw.cxx
index 88ef33662dba..f77cfcca28ed 100644
--- a/extensions/source/ole/oleobjw.cxx
+++ b/extensions/source/ole/oleobjw.cxx
@@ -55,7 +55,6 @@
 
 #include <typelib/typedescription.hxx>
 #include <rtl/uuid.h>
-#include <rtl/memory.h>
 #include <rtl/ustring.hxx>
 
 #include "jscriptclasses.hxx"
diff --git a/extensions/source/ole/servreg.cxx b/extensions/source/ole/servreg.cxx
index b6471e47e6c4..9cd793f5ec8a 100644
--- a/extensions/source/ole/servreg.cxx
+++ b/extensions/source/ole/servreg.cxx
@@ -72,7 +72,7 @@ Reference<XInterface> SAL_CALL OleServer_CreateInstance( const Reference<XMultiS
 }
 } // end namespace
 
-extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL oleautobridge_component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
 {
     void * pRet = 0;
@@ -119,7 +119,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
 }
 
 extern "C"  SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL
-component_canUnload( TimeValue* libUnused)
+oleautobridge_component_canUnload( TimeValue* libUnused)
 {
     return globalModuleCount.canUnload( &globalModuleCount, libUnused);
 }
diff --git a/extensions/source/plugin/base/service.cxx b/extensions/source/plugin/base/service.cxx
index 0d9f5f92111a..cb0ba02dcf13 100644
--- a/extensions/source/plugin/base/service.cxx
+++ b/extensions/source/plugin/base/service.cxx
@@ -55,7 +55,7 @@
 using namespace cppu;
 
 extern "C" {
-    SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
+    SAL_DLLPUBLIC_EXPORT void* SAL_CALL pl_component_getFactory(
         const sal_Char* pImplementationName,
         void* pXUnoSMgr,
         void* /*pXUnoKey*/
diff --git a/extensions/source/plugin/pl.component b/extensions/source/plugin/pl.component
index 4a9d98f7dc7b..e2b7c1a5c2e0 100644
--- a/extensions/source/plugin/pl.component
+++ b/extensions/source/plugin/pl.component
@@ -26,7 +26,7 @@
 *
 **********************************************************************-->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="pl"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.extensions.PluginManager">
     <service name="com.sun.star.plugin.PluginManager"/>
diff --git a/extensions/source/propctrlr/pcr.component b/extensions/source/propctrlr/pcr.component
index 2b606cc01c11..6fc809412cb0 100644
--- a/extensions/source/propctrlr/pcr.component
+++ b/extensions/source/propctrlr/pcr.component
@@ -26,7 +26,7 @@
 *
 **********************************************************************-->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="pcr"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="StringRepresentation">
     <service name="com.sun.star.inspection.StringRepresentation"/>
diff --git a/extensions/source/propctrlr/pcrservices.cxx b/extensions/source/propctrlr/pcrservices.cxx
index ffde3d828451..ab1da1d92cb3 100644
--- a/extensions/source/propctrlr/pcrservices.cxx
+++ b/extensions/source/propctrlr/pcrservices.cxx
@@ -89,7 +89,7 @@ extern "C" void SAL_CALL pcr_initializeModule()
 }
 
 //---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL pcr_component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
                     SAL_UNUSED_PARAMETER void* /*pRegistryKey*/)
diff --git a/extensions/source/propctrlr/selectlabeldialog.hxx b/extensions/source/propctrlr/selectlabeldialog.hxx
index 3c62009187fa..314b7c43daed 100644
--- a/extensions/source/propctrlr/selectlabeldialog.hxx
+++ b/extensions/source/propctrlr/selectlabeldialog.hxx
@@ -21,7 +21,7 @@
 #define _EXTENSIONS_PROPCTRLR_SELECTLABELDIALOG_HXX_
 
 #include <vcl/fixed.hxx>
-#include <svtools/svtreebx.hxx>
+#include <svtools/treelistbox.hxx>
 #include <vcl/button.hxx>
 #include <vcl/image.hxx>
 #include <vcl/dialog.hxx>
diff --git a/extensions/source/propctrlr/taborder.hxx b/extensions/source/propctrlr/taborder.hxx
index 3bc732aef62b..6e3d96925757 100644
--- a/extensions/source/propctrlr/taborder.hxx
+++ b/extensions/source/propctrlr/taborder.hxx
@@ -20,7 +20,7 @@
 #ifndef EXTENSIONS_SOURCE_PROPCTRLR_TABORDER_HXX
 #define EXTENSIONS_SOURCE_PROPCTRLR_TABORDER_HXX
 
-#include <svtools/svtreebx.hxx>
+#include <svtools/treelistbox.hxx>
 #include <com/sun/star/awt/XTabControllerModel.hpp>
 #include <com/sun/star/awt/XControlContainer.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/extensions/source/resource/res.component b/extensions/source/resource/res.component
index b5df9748e464..6ad58b45c7df 100644
--- a/extensions/source/resource/res.component
+++ b/extensions/source/resource/res.component
@@ -26,7 +26,7 @@
 *
 **********************************************************************-->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="res"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.resource.OpenOfficeResourceLoader">
     <service name="com.sun.star.resource.OfficeResourceLoader"/>
diff --git a/extensions/source/resource/resourceservices.cxx b/extensions/source/resource/resourceservices.cxx
index b683484acbe2..670c66347eb1 100644
--- a/extensions/source/resource/resourceservices.cxx
+++ b/extensions/source/resource/resourceservices.cxx
@@ -49,7 +49,7 @@ const sdecl::ServiceDecl OpenOfficeResourceLoaderDecl(
     "com.sun.star.comp.resource.OpenOfficeResourceLoader",
     "com.sun.star.resource.OfficeResourceLoader");
 
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL res_component_getFactory(
     sal_Char const* pImplName,
     ::com::sun::star::lang::XMultiServiceFactory* pServiceManager,
     ::com::sun::star::registry::XRegistryKey* pRegistryKey )
diff --git a/extensions/source/scanner/sanedlg.hxx b/extensions/source/scanner/sanedlg.hxx
index e1aae9e2f247..8b8f93fca198 100644
--- a/extensions/source/scanner/sanedlg.hxx
+++ b/extensions/source/scanner/sanedlg.hxx
@@ -35,7 +35,7 @@
 #include <vcl/group.hxx>
 #include <vcl/field.hxx>
 #include <vcl/edit.hxx>
-#include <svtools/svtreebx.hxx>
+#include <svtools/treelistbox.hxx>
 
 #include <sane.hxx>
 
diff --git a/extensions/source/scanner/scn.component b/extensions/source/scanner/scn.component
index 076b745bd56e..80ca072eb5a3 100644
--- a/extensions/source/scanner/scn.component
+++ b/extensions/source/scanner/scn.component
@@ -26,7 +26,7 @@
 *
 **********************************************************************-->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="scn"
     xmlns="http://openoffice.org/2010/uno-components">
    <implementation name="com.sun.star.scanner.ScannerManager">
     <service name="com.sun.star.scanner.ScannerManager"/>
diff --git a/extensions/source/scanner/scnserv.cxx b/extensions/source/scanner/scnserv.cxx
index 72d37fcee660..56cde1e6979a 100644
--- a/extensions/source/scanner/scnserv.cxx
+++ b/extensions/source/scanner/scnserv.cxx
@@ -36,7 +36,7 @@
 using namespace com::sun::star::registry;
 
 
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /*pRegistryKey*/ )
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL scn_component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /*pRegistryKey*/ )
 {
     REF( ::com::sun::star::lang::XSingleServiceFactory ) xFactory;
     void*                                                pRet = 0;
diff --git a/extensions/source/update/check/updatecheckjob.cxx b/extensions/source/update/check/updatecheckjob.cxx
index 2b7aa0a1dc9b..230d1f16f5de 100644
--- a/extensions/source/update/check/updatecheckjob.cxx
+++ b/extensions/source/update/check/updatecheckjob.cxx
@@ -379,7 +379,7 @@ static const cppu::ImplementationEntry kImplementations_entries[] =
 
 //------------------------------------------------------------------------------
 
-extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(const sal_Char *pszImplementationName, void *pServiceManager, void *pRegistryKey)
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL updchk_component_getFactory(const sal_Char *pszImplementationName, void *pServiceManager, void *pRegistryKey)
 {
     return cppu::component_getFactoryHelper(
         pszImplementationName,
diff --git a/extensions/source/update/check/updatehdl.cxx b/extensions/source/update/check/updatehdl.cxx
index 2dc19c9e1e61..e4d125f8e20d 100644
--- a/extensions/source/update/check/updatehdl.cxx
+++ b/extensions/source/update/check/updatehdl.cxx
@@ -65,6 +65,7 @@
 #include "com/sun/star/frame/XDesktop.hpp"
 
 #include "com/sun/star/lang/XMultiServiceFactory.hpp"
+#include "com/sun/star/task/InteractionHandler.hpp"
 #include "com/sun/star/task/InteractionRequestStringResolver.hpp"
 
 #include <com/sun/star/resource/XResourceBundleLoader.hpp>
@@ -449,13 +450,9 @@ void SAL_CALL UpdateHandler::handle( uno::Reference< task::XInteractionRequest >
         if( !xServiceManager.is() )
             throw uno::RuntimeException( UNISTRING( "UpdateHandler: unable to obtain service manager from component context" ), *this );
 
-        mxInteractionHdl = uno::Reference<task::XInteractionHandler> (
-                                xServiceManager->createInstanceWithContext(
-                                    UNISTRING( "com.sun.star.task.InteractionHandler" ),
-                                    mxContext),
-                                uno::UNO_QUERY_THROW);
-        if( !mxInteractionHdl.is() )
-            throw uno::RuntimeException( UNISTRING( "UpdateHandler:: could not get default interaction handler" ), *this );
+        mxInteractionHdl.set(
+            task::InteractionHandler::createWithParent(mxContext, 0),
+            uno::UNO_QUERY_THROW);
     }
     uno::Reference< task::XInteractionRequestStringResolver > xStrResolver =
             task::InteractionRequestStringResolver::create( mxContext );
diff --git a/extensions/source/update/check/updchk.uno.component b/extensions/source/update/check/updchk.uno.component
index b1eb32917eaf..c19ae2f94085 100644
--- a/extensions/source/update/check/updchk.uno.component
+++ b/extensions/source/update/check/updchk.uno.component
@@ -26,7 +26,7 @@
 *
 **********************************************************************-->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="updchk"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="vnd.sun.UpdateCheck">
     <service name="com.sun.star.setup.UpdateCheck"/>
diff --git a/extensions/source/update/feed/updatefeed.component b/extensions/source/update/feed/updatefeed.component
index 2d53ff5f9398..f43afc11cb29 100644
--- a/extensions/source/update/feed/updatefeed.component
+++ b/extensions/source/update/feed/updatefeed.component
@@ -26,7 +26,7 @@
 *
 **********************************************************************-->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="updatefeed"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="vnd.sun.UpdateInformationProvider">
     <service name="com.sun.star.deployment.UpdateInformationProvider"/>
diff --git a/extensions/source/update/feed/updatefeed.cxx b/extensions/source/update/feed/updatefeed.cxx
index 65016a64af66..310bbe86d864 100644
--- a/extensions/source/update/feed/updatefeed.cxx
+++ b/extensions/source/update/feed/updatefeed.cxx
@@ -57,7 +57,6 @@
 #include <com/sun/star/xml/xpath/XXPathAPI.hpp>
 
 #include <rtl/ref.hxx>
-#include <rtl/memory.h>
 #include <rtl/bootstrap.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <osl/process.h>
@@ -823,7 +822,7 @@ static const cppu::ImplementationEntry kImplementations_entries[] =
 
 //------------------------------------------------------------------------------
 
-extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(const sal_Char *pszImplementationName, void *pServiceManager, void *pRegistryKey)
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL updatefeed_component_getFactory(const sal_Char *pszImplementationName, void *pServiceManager, void *pRegistryKey)
 {
     return cppu::component_getFactoryHelper(
         pszImplementationName,
diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx
index 75143fa018d9..fab97f574f7d 100644
--- a/extensions/source/update/ui/updatecheckui.cxx
+++ b/extensions/source/update/ui/updatecheckui.cxx
@@ -1025,7 +1025,7 @@ static const cppu::ImplementationEntry kImplementations_entries[] =
 
 //------------------------------------------------------------------------------
 
-extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(const sal_Char *pszImplementationName, void *pServiceManager, void *pRegistryKey)
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL updchkui_component_getFactory(const sal_Char *pszImplementationName, void *pServiceManager, void *pRegistryKey)
 {
     return cppu::component_getFactoryHelper(
         pszImplementationName,
diff --git a/extensions/source/update/ui/updchk.component b/extensions/source/update/ui/updchk.component
index bd533e30d1f3..855936c81822 100644
--- a/extensions/source/update/ui/updchk.component
+++ b/extensions/source/update/ui/updchk.component
@@ -26,7 +26,7 @@
 *
 **********************************************************************-->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="updchkui"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="vnd.sun.UpdateCheckUI">
     <service name="com.sun.star.setup.UpdateCheckUI"/>
diff --git a/extensions/workben/testpgp.cxx b/extensions/workben/testpgp.cxx
index e6499dd0c2f1..5dad9bea661e 100644
--- a/extensions/workben/testpgp.cxx
+++ b/extensions/workben/testpgp.cxx
@@ -27,7 +27,6 @@
  ************************************************************************/
 
 #include <sal/types.h>
-#include <rtl/memory.h>
 #ifndef _RTL_WSTRING_
 #include <rtl/wstring>
 #endif
@@ -220,7 +219,7 @@ void DataSource_Impl::setBuffer (const Sequence<sal_Int8> &rBuffer)
     {
         // Fill buffer from file descriptor.
         char buffer[1024];
-        rtl_zeroMemory (buffer, sizeof(buffer));
+        memset (buffer, 0, sizeof(buffer));
 
         int k = read (m_fd, buffer, sizeof(buffer));
         while (k > 0)
@@ -228,10 +227,10 @@ void DataSource_Impl::setBuffer (const Sequence<sal_Int8> &rBuffer)
             sal_Int32 n = m_buffer.getLength();
             m_buffer.realloc (n + k);
 
-            rtl_copyMemory (m_buffer.getArray() + n, buffer, k);
+            memcpy (m_buffer.getArray() + n, buffer, k);
             n += k;
 
-            rtl_zeroMemory (buffer, k);
+            memset (buffer, 0, k);
             k = read (m_fd, buffer, sizeof(buffer));
         }
     }
@@ -283,7 +282,7 @@ sal_Int32 SAL_CALL DataSource_Impl::readBytes (
     if (k > 0)
     {
         rData.realloc(k);
-        rtl_copyMemory (
+        memcpy (
             rData.getArray(), m_buffer.getConstArray() + m_position, k);
         m_position += k;
     }
@@ -390,7 +389,7 @@ void SAL_CALL DataSink_Impl::writeBytes (const Sequence<sal_Int8> &rBuffer)
         sal_Int32 n = m_buffer.getLength();
         m_buffer.realloc (n + rBuffer.getLength());
 
-        rtl_copyMemory (
+        memcpy (
             m_buffer.getArray() + n,
             rBuffer.getConstArray(),
             rBuffer.getLength());
author	Andras Timar <atimar@suse.com>	2012-10-13 17:41:05 +0200
committer	Andras Timar <atimar@suse.com>	2012-10-13 17:41:05 +0200
commit	e5ce011c3f32f53ef073aec5485450b2588b656a (patch)
tree	8a838a53bcdd70cc3d4cdbca0ebe07504790952e /extensions
parent	c6b26144c93aa5222e4260c5b0ef45ce5bdc18d2 (diff)
parent	e74fc93e4aba7887e6a278cc44c4bc0962471065 (diff)