Merge branch 'master' into feature/killsdf

Conflicts:
	Repository.mk
	RepositoryFixes.mk
	connectivity/prj/build.lst
	extensions/prj/build.lst
	filter/prj/build.lst
	fpicker/prj/build.lst
	l10ntools/StaticLibrary_transex.mk
	saxon/build.xml
	shell/prj/build.lst
	solenv/gbuild/AllLangResTarget.mk
	solenv/gbuild/Configuration.mk
	solenv/gbuild/UI.mk
	ucb/source/ucp/webdav/webdavcontent.cxx

15 files changed, 56 insertions, 74 deletions

diff --git a/sdext/Executable_xpdfimport.mk b/sdext/Executable_xpdfimport.mk
index 566baf76f1ee..f333ef9d6bce 100644
--- a/sdext/Executable_xpdfimport.mk
+++ b/sdext/Executable_xpdfimport.mk
@@ -27,6 +27,11 @@
 
 $(eval $(call gb_Executable_Executable,xpdfimport))
 
+$(eval $(call gb_Executable_use_packages,xpdfimport,\
+    sal_generated \
+    sal_inc \
+))
+
 $(eval $(call gb_Executable_use_externals,xpdfimport,\
     poppler \
     zlib \
diff --git a/sdext/Extension_minimizer.mk b/sdext/Extension_minimizer.mk
index 17142fccf66b..8b56ab887dad 100644
--- a/sdext/Extension_minimizer.mk
+++ b/sdext/Extension_minimizer.mk
@@ -43,10 +43,10 @@ $(eval $(call gb_Extension_add_files,presentation-minimizer,bitmaps,\
 $(eval $(call gb_Extension_add_file,presentation-minimizer,registry/schema/org/openoffice/Office/extension/SunPresentationMinimizer.xcs,$(call gb_XcsTarget_get_target,sdext/source/minimizer/registry/schema/org/openoffice/Office/extension/SunPresentationMinimizer.xcs)))
 
 $(eval $(call gb_Extension_add_files,presentation-minimizer,registry/data/org/openoffice/Office,\
-    $(call gb_XcuMergeTarget_get_target,sdext/source/minimizer/registry/data/org/openoffice/Office/Addons.xcu) \
+    $(call gb_XcuFile_for_extension,sdext/source/minimizer/registry/data/org/openoffice/Office/Addons.xcu) \
     $(call gb_XcuDataTarget_get_target,sdext/source/minimizer/registry/data/org/openoffice/Office/ProtocolHandler.xcu) \
 ))
 
-$(eval $(call gb_Extension_add_file,presentation-minimizer,registry/data/org/openoffice/Office/extension/SunPresentationMinimizer.xcu,$(call gb_XcuMergeTarget_get_target,sdext/source/minimizer/registry/data/org/openoffice/Office/extension/SunPresentationMinimizer.xcu)))
+$(eval $(call gb_Extension_add_file,presentation-minimizer,registry/data/org/openoffice/Office/extension/SunPresentationMinimizer.xcu,$(call gb_XcuFile_for_extension,sdext/source/minimizer/registry/data/org/openoffice/Office/extension/SunPresentationMinimizer.xcu)))
 
 # vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sdext/Extension_presenter.mk b/sdext/Extension_presenter.mk
index 29a2aa9dc059..93c18a8740ef 100644
--- a/sdext/Extension_presenter.mk
+++ b/sdext/Extension_presenter.mk
@@ -130,7 +130,7 @@ $(eval $(call gb_Extension_add_files,presenter-screen,bitmaps,\
 
 $(eval $(call gb_Extension_add_file,presenter-screen,registry/schema/org/openoffice/Office/extension/PresenterScreen.xcs,$(call gb_XcsTarget_get_target,sdext/source/presenter/registry/schema/org/openoffice/Office/extension/PresenterScreen.xcs)))
 
-$(eval $(call gb_Extension_add_file,presenter-screen,registry/data/org/openoffice/Office/extension/PresenterScreen.xcu,$(call gb_XcuMergeTarget_get_target,sdext/source/presenter/registry/data/org/openoffice/Office/extension/PresenterScreen.xcu)))
+$(eval $(call gb_Extension_add_file,presenter-screen,registry/data/org/openoffice/Office/extension/PresenterScreen.xcu,$(call gb_XcuFile_for_extension,sdext/source/presenter/registry/data/org/openoffice/Office/extension/PresenterScreen.xcu)))
 
 $(eval $(call gb_Extension_add_files,presenter-screen,registry/data/org/openoffice/Office,\
     $(call gb_XcuDataTarget_get_target,sdext/source/presenter/registry/data/org/openoffice/Office/Jobs.xcu) \
diff --git a/sdext/source/minimizer/manifest.xml b/sdext/source/minimizer/META-INF/manifest.xml
index a70fe27e848c..a70fe27e848c 100644
--- a/sdext/source/minimizer/manifest.xml
+++ b/sdext/source/minimizer/META-INF/manifest.xml
diff --git a/sdext/source/minimizer/configurationaccess.cxx b/sdext/source/minimizer/configurationaccess.cxx
index d55cc63a8935..e0ba19b8f708 100644
--- a/sdext/source/minimizer/configurationaccess.cxx
+++ b/sdext/source/minimizer/configurationaccess.cxx
@@ -21,6 +21,7 @@
 #include "configurationaccess.hxx"
 #include <com/sun/star/frame/XComponentLoader.hpp>
 #include <com/sun/star/container/XHierarchicalNameAccess.hpp>
+#include <com/sun/star/configuration/theDefaultProvider.hpp>
 #include <com/sun/star/util/XChangesBatch.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/util/XMacroExpander.hpp>
@@ -33,13 +34,6 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::container;
 
-static const OUString& GetConfigurationProviderServiceName (void)
-{
-    static const OUString sConfigurationProviderServiceName (
-        RTL_CONSTASCII_USTRINGPARAM(
-            "com.sun.star.configuration.ConfigurationProvider"));
-    return sConfigurationProviderServiceName;
-}
 static const OUString& GetPathToConfigurationRoot (void)
 {
     static const OUString sPathToConfigurationRoot (
@@ -328,28 +322,25 @@ Reference< XInterface > ConfigurationAccess::OpenConfiguration( bool bReadOnly )
     Reference< XInterface > xRoot;
     try
     {
-        Reference< lang::XMultiServiceFactory > xProvider( mxMSF->getServiceManager()->createInstanceWithContext( GetConfigurationProviderServiceName(), mxMSF ), UNO_QUERY );
-        if ( xProvider.is() )
-        {
-            Sequence< Any > aCreationArguments( 2 );
-            aCreationArguments[0] = makeAny( PropertyValue(
-                OUString( RTL_CONSTASCII_USTRINGPARAM( "nodepath" ) ), 0,
-                makeAny( GetPathToConfigurationRoot() ),
-                PropertyState_DIRECT_VALUE ) );
-            aCreationArguments[1] = makeAny(beans::PropertyValue(
-                OUString( RTL_CONSTASCII_USTRINGPARAM( "lazywrite" ) ), 0, makeAny( true ),
-                PropertyState_DIRECT_VALUE ) );
-            OUString sAccessService;
-            if ( bReadOnly )
-                sAccessService = OUString( RTL_CONSTASCII_USTRINGPARAM(
-                    "com.sun.star.configuration.ConfigurationAccess" ) );
-            else
-                sAccessService = OUString( RTL_CONSTASCII_USTRINGPARAM(
-                    "com.sun.star.configuration.ConfigurationUpdateAccess" ) );
-
-            xRoot = xProvider->createInstanceWithArguments(
-                sAccessService, aCreationArguments );
-        }
+        Reference< lang::XMultiServiceFactory > xProvider = configuration::theDefaultProvider::get( mxMSF );
+        Sequence< Any > aCreationArguments( 2 );
+        aCreationArguments[0] = makeAny( PropertyValue(
+            OUString( RTL_CONSTASCII_USTRINGPARAM( "nodepath" ) ), 0,
+            makeAny( GetPathToConfigurationRoot() ),
+            PropertyState_DIRECT_VALUE ) );
+        aCreationArguments[1] = makeAny(beans::PropertyValue(
+            OUString( RTL_CONSTASCII_USTRINGPARAM( "lazywrite" ) ), 0, makeAny( true ),
+            PropertyState_DIRECT_VALUE ) );
+        OUString sAccessService;
+        if ( bReadOnly )
+            sAccessService = OUString( RTL_CONSTASCII_USTRINGPARAM(
+                "com.sun.star.configuration.ConfigurationAccess" ) );
+        else
+            sAccessService = OUString( RTL_CONSTASCII_USTRINGPARAM(
+                "com.sun.star.configuration.ConfigurationUpdateAccess" ) );
+
+        xRoot = xProvider->createInstanceWithArguments(
+            sAccessService, aCreationArguments );
     }
     catch (const Exception&)
     {
diff --git a/sdext/source/minimizer/unodialog.cxx b/sdext/source/minimizer/unodialog.cxx
index c39e90106ed0..bb28f1127638 100644
--- a/sdext/source/minimizer/unodialog.cxx
+++ b/sdext/source/minimizer/unodialog.cxx
@@ -25,6 +25,7 @@
 #include <com/sun/star/view/XSelectionSupplier.hpp>
 #include <com/sun/star/view/XControlAccess.hpp>
 #include <com/sun/star/frame/XDispatch.hpp>
+#include <com/sun/star/awt/Toolkit.hpp>
 #include <com/sun/star/awt/XMessageBoxFactory.hpp>
 #include <com/sun/star/awt/MessageBoxButtons.hpp>
 
@@ -97,7 +98,7 @@ Reference< XWindowPeer > UnoDialog::createWindowPeer( Reference< XWindowPeer > x
     throw ( Exception )
 {
     mxDialogWindow->setVisible( sal_False );
-    Reference< XToolkit > xToolkit( mxMSF->getServiceManager()->createInstanceWithContext( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.Toolkit" ) ), mxMSF ), UNO_QUERY_THROW  );
+    Reference< XToolkit > xToolkit( Toolkit::create( mxMSF ), UNO_QUERY_THROW  );
     if ( !xParentPeer.is() )
         xParentPeer = xToolkit->getDesktopWindow();
     mxReschedule = Reference< XReschedule >( xToolkit, UNO_QUERY );
diff --git a/sdext/source/pdfimport/manifest.xml b/sdext/source/pdfimport/META-INF/manifest.xml
index 2c23a785a584..2c23a785a584 100644
--- a/sdext/source/pdfimport/manifest.xml
+++ b/sdext/source/pdfimport/META-INF/manifest.xml
diff --git a/sdext/source/pdfimport/test/tests.cxx b/sdext/source/pdfimport/test/tests.cxx
index a452ba0b4828..547561916352 100644
--- a/sdext/source/pdfimport/test/tests.cxx
+++ b/sdext/source/pdfimport/test/tests.cxx
@@ -72,16 +72,6 @@ using namespace ::pdfparse;
 using namespace ::pdfi;
 using namespace ::com::sun::star;
 
-namespace rtl
-{
-    template< typename charT, typename traits > std::basic_ostream<charT, traits> &
-        operator <<(
-                std::basic_ostream<charT, traits> & stream, rtl::OString const & string)
-        {
-            return stream << string.getStr();
-        }
-}
-
 namespace
 {
 
diff --git a/sdext/source/pdfimport/tree/drawtreevisiting.cxx b/sdext/source/pdfimport/tree/drawtreevisiting.cxx
index 33d8db9d2a23..4a8e6a9d985f 100644
--- a/sdext/source/pdfimport/tree/drawtreevisiting.cxx
+++ b/sdext/source/pdfimport/tree/drawtreevisiting.cxx
@@ -29,7 +29,8 @@
 #include "basegfx/polygon/b2dpolypolygontools.hxx"
 #include "basegfx/range/b2drange.hxx"
 
-#include "com/sun/star/i18n/XBreakIterator.hpp"
+#include "com/sun/star/i18n/BreakIterator.hpp"
+#include "com/sun/star/i18n/CharacterClassification.hpp"
 #include "com/sun/star/lang/XMultiServiceFactory.hpp"
 #include "comphelper/processfactory.hxx"
 #include "com/sun/star/i18n/ScriptType.hpp"
@@ -46,27 +47,22 @@ using namespace ::com::sun::star::uno;
 namespace pdfi
 {
 
-const ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XBreakIterator >& DrawXmlOptimizer::GetBreakIterator()
+const Reference< XBreakIterator >& DrawXmlOptimizer::GetBreakIterator()
 {
     if ( !mxBreakIter.is() )
     {
         Reference< XComponentContext > xContext( this->m_rProcessor.m_xContext, uno::UNO_SET_THROW );
-        Reference< XMultiComponentFactory > xMSF(  xContext->getServiceManager(), uno::UNO_SET_THROW );
-    Reference < XInterface > xInterface = xMSF->createInstanceWithContext(::rtl::OUString("com.sun.star.i18n.BreakIterator"), xContext);
-
-        mxBreakIter = uno::Reference< i18n::XBreakIterator >( xInterface, uno::UNO_QUERY );
+        mxBreakIter = BreakIterator::create(xContext);
     }
     return mxBreakIter;
 }
 
-const ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XCharacterClassification >& DrawXmlEmitter::GetCharacterClassification()
+const Reference< XCharacterClassification >& DrawXmlEmitter::GetCharacterClassification()
 {
     if ( !mxCharClass.is() )
     {
         Reference< XComponentContext > xContext( m_rEmitContext.m_xContext, uno::UNO_SET_THROW );
-        Reference< XMultiComponentFactory > xMSF(  xContext->getServiceManager(), uno::UNO_SET_THROW );
-    Reference < XInterface > xInterface = xMSF->createInstanceWithContext(::rtl::OUString("com.sun.star.i18n.CharacterClassification"), xContext);
-        mxCharClass = uno::Reference< i18n::XCharacterClassification >( xInterface, uno::UNO_QUERY );
+        mxCharClass = CharacterClassification::create(xContext);
     }
     return mxCharClass;
 }
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
index e6bc7610d431..7adc48718d28 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -34,7 +34,11 @@
 #pragma warning(push, 1)
 #endif
 
+#if POPPLER_CHECK_VERSION(0, 21, 0)
+#include "UTF.h"
+#else
 #include "UTF8.h"
+#endif
 
 #if defined __SUNPRO_CC
 #pragma enable_warn
@@ -485,7 +489,9 @@ void PDFOutDev::endPage()
     printf("endPage\n");
 }
 
-#if POPPLER_CHECK_VERSION(0, 17, 0)
+#if POPPLER_CHECK_VERSION(0, 19, 0)
+void PDFOutDev::processLink(AnnotLink *link)
+#elif POPPLER_CHECK_VERSION(0, 17, 0)
 void PDFOutDev::processLink(AnnotLink *link, Catalog *)
 #else
 void PDFOutDev::processLink(Link* link, Catalog*)
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
index 0a19b9a34b97..e5e48fc8a1a0 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
@@ -189,10 +189,12 @@ namespace pdfi
         // virtual void cvtDevToUser(double dx, double dy, double *ux, double *uy);
         // virtual void cvtUserToDev(double ux, double uy, int *dx, int *dy);
 
-        #if POPPLER_CHECK_VERSION(0, 17, 0)
-        virtual void processLink(AnnotLink *link, Catalog *catalog);
-        #else
         //----- link borders
+	#if POPPLER_CHECK_VERSION(0, 19, 0)
+        virtual void processLink(AnnotLink *link);
+        #elif POPPLER_CHECK_VERSION(0, 17, 0)
+	virtual void processLink(AnnotLink *link, Catalog *catalog);
+        #else
         virtual void processLink(Link *link, Catalog *catalog);
         #endif
 
diff --git a/sdext/source/presenter/manifest.xml b/sdext/source/presenter/META-INF/manifest.xml
index a25f22fdf81a..a25f22fdf81a 100644
--- a/sdext/source/presenter/manifest.xml
+++ b/sdext/source/presenter/META-INF/manifest.xml
diff --git a/sdext/source/presenter/PresenterConfigurationAccess.cxx b/sdext/source/presenter/PresenterConfigurationAccess.cxx
index e321b71215a5..2ae90dc1085a 100644
--- a/sdext/source/presenter/PresenterConfigurationAccess.cxx
+++ b/sdext/source/presenter/PresenterConfigurationAccess.cxx
@@ -22,6 +22,7 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/container/XHierarchicalNameAccess.hpp>
+#include <com/sun/star/configuration/theDefaultProvider.hpp>
 #include <com/sun/star/util/XChangesBatch.hpp>
 
 using namespace ::com::sun::star;
@@ -44,8 +45,7 @@ PresenterConfigurationAccess::PresenterConfigurationAccess (
 {
     try
     {
-        Reference<lang::XMultiComponentFactory> xFactory (rxContext->getServiceManager());
-        if (xFactory.is())
+        if (rxContext.is())
         {
             Sequence<Any> aCreationArguments(3);
             aCreationArguments[0] = makeAny(beans::PropertyValue(
@@ -70,11 +70,8 @@ PresenterConfigurationAccess::PresenterConfigurationAccess (
             else
                 sAccessService = A2S("com.sun.star.configuration.ConfigurationUpdateAccess");
 
-            Reference<lang::XMultiServiceFactory> xProvider (
-                xFactory->createInstanceWithContext(
-                    A2S("com.sun.star.configuration.ConfigurationProvider"),
-                    rxContext),
-                UNO_QUERY_THROW);
+            Reference<lang::XMultiServiceFactory> xProvider =
+                configuration::theDefaultProvider::get( rxContext );
             mxRoot = xProvider->createInstanceWithArguments(
                 sAccessService, aCreationArguments);
             maNode <<= mxRoot;
diff --git a/sdext/source/presenter/PresenterSlideShowView.cxx b/sdext/source/presenter/PresenterSlideShowView.cxx
index ba820ebefe41..2201a1edca2f 100644
--- a/sdext/source/presenter/PresenterSlideShowView.cxx
+++ b/sdext/source/presenter/PresenterSlideShowView.cxx
@@ -25,6 +25,7 @@
 #include "PresenterPaneContainer.hxx"
 #include <com/sun/star/awt/InvalidateStyle.hpp>
 #include <com/sun/star/awt/PosSize.hpp>
+#include <com/sun/star/awt/Toolkit.hpp>
 #include <com/sun/star/awt/WindowAttribute.hpp>
 #include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/awt/XWindow2.hpp>
@@ -834,11 +835,7 @@ Reference<awt::XWindow> PresenterSlideShowView::CreateViewWindow (
         if ( ! xFactory.is())
             return xViewWindow;
 
-        Reference<awt::XToolkit> xToolkit (
-            xFactory->createInstanceWithContext(
-                OUString("com.sun.star.awt.Toolkit"),
-                mxComponentContext),
-            UNO_QUERY_THROW);
+        Reference<awt::XToolkit2> xToolkit = awt::Toolkit::create(mxComponentContext);
         awt::WindowDescriptor aWindowDescriptor (
             awt::WindowClass_CONTAINER,
             OUString(),
diff --git a/sdext/source/presenter/PresenterTextView.cxx b/sdext/source/presenter/PresenterTextView.cxx
index 4277b554b301..6599f4fbfa81 100644
--- a/sdext/source/presenter/PresenterTextView.cxx
+++ b/sdext/source/presenter/PresenterTextView.cxx
@@ -26,6 +26,7 @@
 
 #include <com/sun/star/accessibility/AccessibleTextType.hpp>
 #include <com/sun/star/container/XEnumerationAccess.hpp>
+#include <com/sun/star/i18n/BreakIterator.hpp>
 #include <com/sun/star/i18n/CharType.hpp>
 #include <com/sun/star/i18n/CharacterIteratorMode.hpp>
 #include <com/sun/star/i18n/CTLScriptType.hpp>
@@ -90,11 +91,7 @@ PresenterTextView::PresenterTextView (
         return;
 
     // Create the break iterator that we use to break text into lines.
-    mxBreakIterator = Reference<i18n::XBreakIterator>(
-        xFactory->createInstanceWithContext(
-            A2S("com.sun.star.i18n.BreakIterator"),
-            rxContext),
-        UNO_QUERY_THROW);
+    mxBreakIterator = i18n::BreakIterator::create(rxContext);
 
     // Create the script type detector that is used to split paragraphs into
     // portions of the same text direction.