Related fdo#46808: Adapt Windows-only code to previous changes

Change-Id: I115fa92ecf0cbcd6159d0de900e5174fe3c96d18

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());

fpicker/source/win32/folderpicker/FolderPicker.hxx

@@ -24,7 +24,7 @@
 #include <osl/mutex.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
-#include <com/sun/star/ui/dialogs/FolderPicker.hpp>
+#include <com/sun/star/ui/dialogs/XFolderPicker2.hpp>
 #include <com/sun/star/util/XCancellable.hpp>
 
 #include <memory>