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

7 files changed, 15 insertions, 16 deletions

diff --git a/fpicker/prj/build.lst b/fpicker/prj/build.lst
index 423d94800fb9..91586058bf56 100644
--- a/fpicker/prj/build.lst
+++ b/fpicker/prj/build.lst
@@ -1,2 +1,2 @@
-fp	fpicker	: LIBXSLT:libxslt DESKTOP:rdbmaker svtools ucb NULL
+fp	fpicker	: LIBXSLT:libxslt svtools ucb NULL
 fp	fpicker\prj			nmake	-	all	fp_prj NULL
diff --git a/fpicker/source/office/PlacesListBox.cxx b/fpicker/source/office/PlacesListBox.cxx
index f514296673d0..9c27d948be60 100644
--- a/fpicker/source/office/PlacesListBox.cxx
+++ b/fpicker/source/office/PlacesListBox.cxx
@@ -144,7 +144,7 @@ void PlacesListBox::RemovePlace( sal_uInt16 nPos )
             mbUpdated = true;
         }
         maPlaces.erase( maPlaces.begin() + nPos );
-        SvLBoxEntry* pEntry = mpImpl->GetEntry( nPos );
+        SvTreeListEntry* pEntry = mpImpl->GetEntry( nPos );
         mpImpl->RemoveEntry( pEntry );
     }
 }
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index f44c4c3f34ce..2eef8ee1b60e 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -1523,7 +1523,7 @@ void SvtFileDialog::OpenMultiSelection_Impl()
 {
     String aPath;
     sal_uLong nCount = _pFileView->GetSelectionCount();
-    SvLBoxEntry* pEntry = nCount ? _pFileView->FirstSelected() : NULL;
+    SvTreeListEntry* pEntry = nCount ? _pFileView->FirstSelected() : NULL;
 
     if ( nCount && pEntry )
         _aPath = _pFileView->GetURL( pEntry );
@@ -1598,7 +1598,7 @@ void SvtFileDialog::UpdateControls( const String& rURL )
 
 IMPL_LINK( SvtFileDialog, SelectHdl_Impl, SvTabListBox*, pBox )
 {
-    SvLBoxEntry* pEntry = pBox->FirstSelected();
+    SvTreeListEntry* pEntry = pBox->FirstSelected();
     DBG_ASSERT( pEntry, "SelectHandler without selected entry" );
     SvtContentEntry* pUserData = (SvtContentEntry*)pEntry->GetUserData();
 
@@ -2458,7 +2458,7 @@ std::vector<rtl::OUString> SvtFileDialog::GetPathList() const
 {
     std::vector<rtl::OUString> aList;
     sal_uLong           nCount = _pFileView->GetSelectionCount();
-    SvLBoxEntry*    pEntry = nCount ? _pFileView->FirstSelected() : NULL;
+    SvTreeListEntry*    pEntry = nCount ? _pFileView->FirstSelected() : NULL;
 
     if ( ! pEntry )
     {
diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.cxx b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
index f05aefc97f54..da1cc07ae105 100644
--- a/fpicker/source/win32/filepicker/VistaFilePicker.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
@@ -38,6 +38,7 @@
 
 #include <cppuhelper/interfacecontainer.h>
 #include <comphelper/configurationhelper.hxx>
+#include <comphelper/processfactory.hxx>
 #include <osl/diagnose.h>
 #include <osl/mutex.hxx>
 #include <osl/file.hxx>
@@ -221,13 +222,13 @@ void SAL_CALL VistaFilePicker::setDisplayDirectory(const ::rtl::OUString& sDirec
     const ::rtl::OUString aKey( RTL_CONSTASCII_USTRINGPARAM("WorkPathChanged"));
 
     css::uno::Any aValue = ::comphelper::ConfigurationHelper::readDirectKey(
-        m_xSMGR, aPackage, aRelPath, aKey, ::comphelper::ConfigurationHelper::E_READONLY);
+        comphelper::getComponentContext(m_xSMGR), aPackage, aRelPath, aKey, ::comphelper::ConfigurationHelper::E_READONLY);
 
     bool bChanged(false);
     if (( aValue >>= bChanged ) && bChanged )
     {
         ::comphelper::ConfigurationHelper::writeDirectKey(
-            m_xSMGR, aPackage, aRelPath, aKey, css::uno::makeAny(false), ::comphelper::ConfigurationHelper::E_STANDARD);
+            comphelper::getComponentContext(m_xSMGR), aPackage, aRelPath, aKey, css::uno::makeAny(false), ::comphelper::ConfigurationHelper::E_STANDARD);
     }
 
     RequestRef rRequest(new Request());
diff --git a/fpicker/source/win32/filepicker/filepickerstate.cxx b/fpicker/source/win32/filepicker/filepickerstate.cxx
index f4cac5049e31..3684d4a82f9b 100644
--- a/fpicker/source/win32/filepicker/filepickerstate.cxx
+++ b/fpicker/source/win32/filepicker/filepickerstate.cxx
@@ -498,7 +498,6 @@ OUString SAL_CALL CExecuteFilePickerState::getLabel( sal_Int16 aControlId )
     OUString ctrlLabel;
     if ( nRet )
     {
-        ctrlLabel = OUString( aLabel, rtl_ustr_getLength( aLabel ) );
         ctrlLabel = WindowsToSOfficeLabel( aLabel );
     }
 
diff --git a/fpicker/source/win32/folderpicker/FolderPicker.hxx b/fpicker/source/win32/folderpicker/FolderPicker.hxx
index a795f5fbfd71..1f1e4c8f8ad3 100644
--- a/fpicker/source/win32/folderpicker/FolderPicker.hxx
+++ b/fpicker/source/win32/folderpicker/FolderPicker.hxx
@@ -20,11 +20,11 @@
 #ifndef _FOLDERPICKER_HXX_
 #define _FOLDERPICKER_HXX_
 
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase2.hxx>
 #include <osl/mutex.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
-#include <com/sun/star/ui/dialogs/XFolderPicker.hpp>
+#include <com/sun/star/ui/dialogs/XFolderPicker2.hpp>
 #include <com/sun/star/util/XCancellable.hpp>
 
 #include <memory>
@@ -36,10 +36,9 @@
 //----------------------------------------------------------
 
 class CFolderPicker :
-    public  cppu::WeakImplHelper3<
-                com::sun::star::ui::dialogs::XFolderPicker,
-                com::sun::star::lang::XServiceInfo,
-                com::sun::star::util::XCancellable >
+    public  cppu::WeakImplHelper2<
+                com::sun::star::ui::dialogs::XFolderPicker2,
+                com::sun::star::lang::XServiceInfo >
 {
 public:
 
diff --git a/fpicker/test/svdem.cxx b/fpicker/test/svdem.cxx
index eea40b7d76cd..e6627187b60f 100644
--- a/fpicker/test/svdem.cxx
+++ b/fpicker/test/svdem.cxx
@@ -79,9 +79,9 @@ SAL_IMPLEMENT_MAIN()
        xMSch.set(xComponentContext->getServiceManager(), com::sun::star::uno::UNO_QUERY);
        comphelper::setProcessServiceFactory(xMSch);
 
-//    comphelper::setProcessServiceFactory( xMS);
+    comphelper::setProcessServiceFactory(xMS);
 
-    InitVCL( xMS );
+    InitVCL();
     ::Main();
     DeInitVCL();