[Libreoffice-commits] .: fpicker/source

Tor Lillqvist tml at kemper.freedesktop.org
Wed Jul 20 12:30:45 PDT 2011 

 fpicker/source/win32/filepicker/FPentry.cxx                     |    3 +
 fpicker/source/win32/filepicker/FilePicker.cxx                  |    4 -
 fpicker/source/win32/filepicker/VistaFilePicker.cxx             |    9 +++-
 fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx |    7 +++
 fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx |    9 +++-
 fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx         |   11 ++++-
 fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx         |   21 ++++++----
 fpicker/source/win32/filepicker/WinFileOpenImpl.cxx             |    6 +-
 fpicker/source/win32/filepicker/WinFileOpenImpl.hxx             |    2 
 fpicker/source/win32/filepicker/controlaccess.cxx               |    2 
 fpicker/source/win32/filepicker/filepickerstate.cxx             |    4 -
 11 files changed, 56 insertions(+), 22 deletions(-)

New commits:
commit 40fa812f8acee8cb0e5ddd5ac425e36b7bbffbd1
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Jul 20 22:26:55 2011 +0300

    MinGW fixes
    
    Unfortunately IFileDialog is missing from both mingw-w64 and Wine
    headers, so we can't build the specialized file picker for Vista or
    newer with MinGW. That sucks.
    
    Also fix some file name case and backslash botches in #include
    statements.

diff --git a/fpicker/source/win32/filepicker/FPentry.cxx b/fpicker/source/win32/filepicker/FPentry.cxx
index 1fd04a8..68f7b51 100644
--- a/fpicker/source/win32/filepicker/FPentry.cxx
+++ b/fpicker/source/win32/filepicker/FPentry.cxx
@@ -66,6 +66,8 @@ static Reference< XInterface > SAL_CALL createInstance(
     const Reference< XMultiServiceFactory >& rServiceManager )
 {
     Reference< XInterface > xDlg;
+
+#ifdef __IFileDialog_INTERFACE_DEFINED__
     bool					bVistaOrNewer = IsWindowsVistaOrNewer();
 
     if (bVistaOrNewer)
@@ -76,6 +78,7 @@ static Reference< XInterface > SAL_CALL createInstance(
                 new ::fpicker::win32::vista::VistaFilePicker( rServiceManager ) ) );
     }
     else
+#endif
     {
         OSL_TRACE("use normal system file picker ...");
         xDlg.set( 
diff --git a/fpicker/source/win32/filepicker/FilePicker.cxx b/fpicker/source/win32/filepicker/FilePicker.cxx
index c0cbb21..5f2714b 100644
--- a/fpicker/source/win32/filepicker/FilePicker.cxx
+++ b/fpicker/source/win32/filepicker/FilePicker.cxx
@@ -38,11 +38,11 @@
 #include <cppuhelper/interfacecontainer.h>
 #include <osl/diagnose.h>
 
-#include "filepicker.hxx"
+#include "FilePicker.hxx"
 #include "WinFileOpenImpl.hxx"
 
 #include "FPServiceInfo.hxx"
-#include "..\misc\WinImplHelper.hxx"
+#include "../misc/WinImplHelper.hxx"
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include "filepickereventnotification.hxx"
 
diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.cxx b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
index e61a9b0..84624e7 100644
--- a/fpicker/source/win32/filepicker/VistaFilePicker.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
@@ -33,13 +33,18 @@
 // includes
 //------------------------------------------------------------------------
 
+#include <shobjidl.h>
+
+// Without IFileDialog we can't do much
+#ifdef __IFileDialog_INTERFACE_DEFINED__
+
 #ifdef _MSC_VER
 #pragma warning (disable:4917)
 #endif
 
 #include "VistaFilePicker.hxx"
 #include "WinFileOpenImpl.hxx"
-#include "..\misc\WinImplHelper.hxx"
+#include "../misc/WinImplHelper.hxx"
 #include "shared.hxx"
 
 #include <com/sun/star/lang/DisposedException.hpp>
@@ -715,4 +720,6 @@ css::uno::Sequence< ::rtl::OUString > SAL_CALL VistaFilePicker::getSupportedServ
 } // namespace win32
 } // namespace fpicker
 
+#endif // __IFileDialog_INTERFACE_DEFINED__
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
index 7bb206d..1be74ca 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
@@ -29,6 +29,11 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_fpicker.hxx"
 
+#include <shobjidl.h>
+
+// Without IFileDialog we can't do much
+#ifdef __IFileDialog_INTERFACE_DEFINED__
+
 #include "VistaFilePickerEventHandler.hxx"
 #include "asyncrequests.hxx"
 
@@ -461,4 +466,6 @@ void VistaFilePickerEventHandler::impl_sendEvent(  EEventType eEventType,
 } // namespace win32
 } // namespace fpicker
 
+#endif // __IFileDialog_INTERFACE_DEFINED__
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx
index de9983d..a61e644 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx
@@ -37,6 +37,11 @@
 #pragma warning( disable : 4917 )
 #endif
 
+#include <shobjidl.h>
+
+// Without IFileDialog we can't do this
+#ifdef __IFileDialog_INTERFACE_DEFINED__
+
 #include "comptr.hxx"
 #include "vistatypes.h"
 #include "IVistaFilePickerInternalNotify.hxx"
@@ -48,8 +53,6 @@
 #include <cppuhelper/interfacecontainer.h>
 #include <osl/interlck.h>
 
-#include <shobjidl.h>
-
 //-----------------------------------------------------------------------------
 // namespace
 //-----------------------------------------------------------------------------
@@ -223,6 +226,8 @@ class VistaFilePickerEventHandler : public ::cppu::BaseMutex
 
 #undef css
 
+#endif // __IFileDialog_INTERFACE_DEFINED__
+
 #endif  // FPICKER_WIN32_VISTA_FILEPICKER_EVENTHANDLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
index 5e03b11..5afbbf3 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
@@ -30,6 +30,11 @@
 // includes
 //-----------------------------------------------------------------------------
 
+#include <shobjidl.h>
+
+// Without IFileDialog we can't do much
+#ifdef __IFileDialog_INTERFACE_DEFINED__
+
 #include "VistaFilePickerImpl.hxx"
 
 #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
@@ -42,9 +47,9 @@
 #ifdef __MINGW32__
 #include <limits.h>
 #endif
-#include "..\misc\WinImplHelper.hxx"
+#include "../misc/WinImplHelper.hxx"
 
-#include <Shlguid.h>
+#include <shlguid.h>
 
  inline bool is_current_process_window(HWND hwnd)
 {
@@ -1266,4 +1271,6 @@ bool VistaFilePickerImpl::onFileTypeChanged( UINT /*nTypeIndex*/ )
 } // namespace win32
 } // namespace fpicker
 
+#endif // __IFileDialog_INTERFACE_DEFINED__
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx
index 6cb0b9e..ed8e973 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx
@@ -37,6 +37,17 @@
 #pragma warning( disable : 4917 )
 #endif
 
+#if defined _MSC_VER
+#pragma warning(push, 1)
+#endif
+#include <shobjidl.h>
+#if defined _MSC_VER
+#pragma warning(pop)
+#endif
+
+// Without IFileDialog we can't do this
+#ifdef __IFileDialog_INTERFACE_DEFINED__
+
 #include "platform_vista.h"
 #include "asyncrequests.hxx"
 #include "comptr.hxx"
@@ -55,14 +66,6 @@
 #include <osl/conditn.hxx>
 #include <rtl/ustring.hxx>
 
-#if defined _MSC_VER
-#pragma warning(push, 1)
-#endif
-#include <shobjidl.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
-
 //-----------------------------------------------------------------------------
 // namespace
 //-----------------------------------------------------------------------------
@@ -361,6 +364,8 @@ class VistaFilePickerImpl : private ::cppu::BaseMutex
 
 #undef css
 
+#endif // __IFileDialog_INTERFACE_DEFINED__
+
 #endif // FPICKER_WIN32_VISTA_FILEPICKERIMPL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx b/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
index 87d9b09..fffb9ed 100644
--- a/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
+++ b/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
@@ -42,10 +42,10 @@
 #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
 #include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp>
 #include <com/sun/star/ui/dialogs/FilePreviewImageFormats.hpp>
-#include <com/sun/star/ui/dialogs/ListBoxControlActions.hpp>
-#include "..\misc\WinImplHelper.hxx"
+#include <com/sun/star/ui/dialogs/ListboxControlActions.hpp>
+#include "../misc/WinImplHelper.hxx"
 
-#include "filepicker.hxx"
+#include "FilePicker.hxx"
 #include "controlaccess.hxx"
 #include <rtl/ustrbuf.hxx>
 #include <rtl/string.hxx>
diff --git a/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx b/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx
index b7ade2a..6a6b00f 100644
--- a/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx
+++ b/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx
@@ -43,7 +43,7 @@
 #include "helppopupwindow.hxx"
 #include "customcontrol.hxx"
 #include "customcontrolfactory.hxx"
-#include "..\misc\resourceprovider.hxx"
+#include "../misc/resourceprovider.hxx"
 
 #include <utility>
 #include <memory>
diff --git a/fpicker/source/win32/filepicker/controlaccess.cxx b/fpicker/source/win32/filepicker/controlaccess.cxx
index b21fa64..d87b2b3 100644
--- a/fpicker/source/win32/filepicker/controlaccess.cxx
+++ b/fpicker/source/win32/filepicker/controlaccess.cxx
@@ -37,7 +37,7 @@
 #include <sal/macros.h>
 #include <osl/diagnose.h>
 #include "controlaccess.hxx"
-#include "..\misc\WinImplHelper.hxx"
+#include "../misc/WinImplHelper.hxx"
 
 //------------------------------------------------------------
 // we are using a table based algorithm to dispatch control 
diff --git a/fpicker/source/win32/filepicker/filepickerstate.cxx b/fpicker/source/win32/filepicker/filepickerstate.cxx
index 5429a6e..043cba4 100644
--- a/fpicker/source/win32/filepicker/filepickerstate.cxx
+++ b/fpicker/source/win32/filepicker/filepickerstate.cxx
@@ -37,7 +37,7 @@
 #include "controlaccess.hxx"
 #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
 #include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp>
-#include <com/sun/star/ui/dialogs/ListBoxControlActions.hpp>
+#include <com/sun/star/ui/dialogs/ListboxControlActions.hpp>
 #include <com/sun/star/ui/dialogs/ControlActions.hpp>
 #include "controlcommandrequest.hxx"
 #include "controlcommandresult.hxx"
@@ -47,7 +47,7 @@
 #include "FileOpenDlg.hxx"
 
 #include <memory>
-#include "..\misc\WinImplHelper.hxx"
+#include "../misc/WinImplHelper.hxx"
 //---------------------------------------------
 //
 //---------------------------------------------

More information about the Libreoffice-commits mailing list