2 files changed, 23 insertions, 3 deletions

diff --git a/vcl/inc/vcl/svapp.hxx b/vcl/inc/vcl/svapp.hxx
index 5fea0317b746..951f817b7aa3 100644
--- a/vcl/inc/vcl/svapp.hxx
+++ b/vcl/inc/vcl/svapp.hxx
@@ -62,8 +62,14 @@ class MouseEvent;
 namespace com {
 namespace sun {
 namespace star {
-namespace lang {
-    class XMultiServiceFactory;
+namespace uno {
+    class XComponentContext;
+}
+namespace ui {
+    namespace dialogs {
+        class XFilePicker2;
+        class XFolderPicker;
+    }
 }
 namespace awt {
     class XToolkit;
@@ -367,6 +373,20 @@ public:
     */
     static void AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType);
 
+    /** Create a platform specific file picker, if one is available,
+        otherwise return an empty reference
+    */
+    static com::sun::star::uno::Reference< com::sun::star::ui::dialogs::XFilePicker2 >
+        createFilePicker( const com::sun::star::uno::Reference<
+                              com::sun::star::uno::XComponentContext >& rServiceManager );
+
+    /** Create a platform specific folder picker, if one is available,
+        otherwise return an empty reference
+    */
+    static com::sun::star::uno::Reference< com::sun::star::ui::dialogs::XFolderPicker >
+        createFolderPicker( const com::sun::star::uno::Reference<
+                              com::sun::star::uno::XComponentContext >& rServiceManager );
+
 private:
 
     DECL_STATIC_LINK( Application, PostEventHandler, void* );
diff --git a/vcl/inc/vcl/window.hxx b/vcl/inc/vcl/window.hxx
index ba52258f9103..68946e267105 100644
--- a/vcl/inc/vcl/window.hxx
+++ b/vcl/inc/vcl/window.hxx
@@ -395,7 +395,7 @@ public:
     SAL_DLLPRIVATE void                ImplRemoveWindow( sal_Bool bRemoveFrameData );
     SAL_DLLPRIVATE Window*             ImplGetWindow();
     SAL_DLLPRIVATE ImplFrameData*      ImplGetFrameData();
-    SAL_DLLPRIVATE SalFrame*           ImplGetFrame() const;
+                   SalFrame*           ImplGetFrame() const;
     SAL_DLLPRIVATE ImplWinData*        ImplGetWinData() const;
     SAL_DLLPRIVATE SalGraphics*        ImplGetFrameGraphics() const;
     SAL_DLLPRIVATE void                ImplCallFocusChangeActivate( Window* pNewOverlapWindow, Window* pOldOverlapWindow );