From cc6ec92330ca304f7b8bdb6fb661317141b96882 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Wed, 24 Oct 2012 16:49:39 +0200
Subject: Related fdo#46808: Adapt Windows-only code to previous changes

Change-Id: I115fa92ecf0cbcd6159d0de900e5174fe3c96d18
---
 fpicker/source/win32/filepicker/VistaFilePicker.cxx | 5 +++--
 fpicker/source/win32/folderpicker/FolderPicker.hxx  | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'fpicker')

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/folderpicker/FolderPicker.hxx b/fpicker/source/win32/folderpicker/FolderPicker.hxx
index c7bca8224caa..1f1e4c8f8ad3 100644
--- a/fpicker/source/win32/folderpicker/FolderPicker.hxx
+++ b/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>
-- 
cgit