[ooo-build-commit] Branch 'ooo-build-3-1-1' - patches/dev300

[Jan Holesovsky]

 patches/dev300/fpicker-show-checkbox.diff |   23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

New commits:
commit 74c40d7255ad3ee23746509bb312235dd3617ea3
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Wed Oct 14 13:55:27 2009 +0200

    KDE4: Be able to switch off the KDE4 fpicker too.
    
    * patches/dev300/fpicker-show-checkbox.diff: Update for KDE4.

diff --git a/patches/dev300/fpicker-show-checkbox.diff b/patches/dev300/fpicker-show-checkbox.diff
index 7cc8984..3afe0d7 100644
--- a/patches/dev300/fpicker-show-checkbox.diff
+++ b/patches/dev300/fpicker-show-checkbox.diff
@@ -1,6 +1,6 @@
 --- svx/source/dialog/makefile.mk.old	2009-04-02 11:03:28.000000000 +0000
 +++ svx/source/dialog/makefile.mk	2009-04-06 16:41:56.000000000 +0000
-@@ -43,6 +43,14 @@ ENABLE_EXCEPTIONS=TRUE
+@@ -43,6 +43,18 @@ ENABLE_EXCEPTIONS=TRUE
  CFLAGS+= -DENABLE_LAYOUT=1 -I../$(PRJ)/layout/inc -I../$(PRJ)/layout/$(INPATH)/inc
  .ENDIF # ENABLE_LAYOUT == TRUE
  
@@ -12,6 +12,10 @@
 +CFLAGS+=-DENABLE_KDE
 +.ENDIF
 +
++.IF "$(ENABLE_KDE4)" != ""
++CFLAGS+=-DENABLE_KDE4
++.ENDIF
++
  # --- Files --------------------------------------------------------
  
  SRS1NAME=dialogs
@@ -22,21 +26,32 @@
  }
  
 -#	ifdef ENABLE_GTK
-+#if defined( ENABLE_GTK ) || defined( ENABLE_KDE )
++#if defined( ENABLE_GTK ) || defined( ENABLE_KDE ) || defined( ENABLE_KDE4 )
  namespace
  {
  		::rtl::OUString impl_SystemFileOpenServiceName()
+@@ -152,6 +152,10 @@ int OfaMiscTabPage::DeactivatePage( SfxI
+ 			{
+ 				return ::rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.KDEFilePicker" );
+ 			}
++			else if ( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "kde4" ) )
++			{
++				return ::rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.KDE4FilePicker" );
++			}
+ 			return ::rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.SystemFilePicker" );
+ 		}
+ 
 @@ -212,17 +212,15 @@ OfaMiscTabPage::OfaMiscTabPage(Window* p
  
      //system fileopen only available in Windows and with gtk vclplug based
      //picker and on MacOSX (aqua version)
 -#if !defined( WNT ) && !defined( ENABLE_GTK ) && !(defined(MACOSX) && defined(QUARTZ))
-+#if !defined( WNT ) && !defined( ENABLE_GTK ) && !(defined(MACOSX) && defined(QUARTZ)) && !defined( ENABLE_KDE )
++#if !defined( WNT ) && !defined( ENABLE_GTK ) && !(defined(MACOSX) && defined(QUARTZ)) && !defined( ENABLE_KDE ) && !defined( ENABLE_KDE4 )
      aFileDlgFL.Hide();
      aFileDlgCB.Hide();
 -#else
 -#	ifdef ENABLE_GTK
-+#elif defined( ENABLE_GTK ) || defined( ENABLE_KDE )
++#elif defined( ENABLE_GTK ) || defined( ENABLE_KDE ) || defined( ENABLE_KDE4 )
  	if (!lcl_HasSystemFilePicker())
  	{
          aFileDlgFL.Hide();