ooo-build r14351 - in trunk: . patches/dev300

[tml svn gnome org]

Author: tml
Date: Mon Oct 20 12:13:34 2008
New Revision: 14351
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14351&view=rev

Log:
2008-10-20  Tor Lillqvist  <tml novell com>

	Merge from ooo-build-3-0:

	* patches/dev300/novell-win32-odma.diff
	(fpicker/source/odma/ODMAFolderPicker.cxx): Don't claim we support
	the service com.sun.star.ui.dialogs.FolderPicker. Unlike for the
	corresponding file picker, it isn't necessary. It's enough to just
	say that we support the com.sun.star.ui.dialogs.ODMAFolderPicker
	service.

	This fixes the unintended phenomenon that even if one toggles on
	the "Use OpenOffice.org dialogs" on the Tools:Options:General
	page, it is still the ODMAFolderPicker (which forwards to the
	Win32FolderPicker in the usual case of no ODMA server available)
	that gets used. This breaks testtool scripts. When the system
	folder dialog is displayed, it is modal and sticks, and testtool
	loses track of what is going on and everything fails after that.



Modified:
   trunk/ChangeLog
   trunk/patches/dev300/novell-win32-odma.diff

Modified: trunk/patches/dev300/novell-win32-odma.diff
==============================================================================
--- trunk/patches/dev300/novell-win32-odma.diff	(original)
+++ trunk/patches/dev300/novell-win32-odma.diff	Mon Oct 20 12:13:34 2008
@@ -1515,7 +1515,7 @@
 diff -ruN fpicker/source/odma/ODMAFolderPicker.cxx fpicker/source/odma/ODMAFolderPicker.cxx
 --- fpicker/source/odma/ODMAFolderPicker.cxx	1970-01-01 00:00:00.000000000 +0000
 +++ fpicker/source/odma/ODMAFolderPicker.cxx	2006-10-30 01:09:51.281250000 +0000
-@@ -0,0 +1,203 @@
+@@ -0,0 +1,202 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -1701,10 +1701,9 @@
 +
 +Sequence< ::rtl::OUString > ODMAFolderPicker::impl_getStaticSupportedServiceNames( )
 +{
-+    Sequence< ::rtl::OUString > seqServiceNames( 2 );
++    Sequence< ::rtl::OUString > seqServiceNames( 1 );
 +    ::rtl::OUString* pArray = seqServiceNames.getArray();
-+    pArray[0] = ::rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.FolderPicker" );
-+    pArray[1] = ::rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.ODMAFolderPicker" );
++    pArray[0] = ::rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.ODMAFolderPicker" );
 +    return seqServiceNames ;
 +}
 +
@@ -2525,8 +2524,8 @@
 +#include <odma_lib.hxx>
 +#endif
  //#include <tools/solar.hrc>
+ #include <comphelper/uieventslogger.hxx>
  
- //_________________________________________________________________________________________________________________
 @@ -248,6 +248,41 @@
  					else
  						aMenuTitle = aSystemPath;
@@ -2573,7 +2572,7 @@
 --- framework/util/makefile.mk
 +++ framework/util/makefile.mk
 @@ -329,6 +329,7 @@
-                 $(SLO)$/langselectionmenucontroller.obj
+                 $(SLO)$/windowstateconfiguration.obj    \
  
  SHL4STDLIBS=	\
 +		 $(ODMA_LIB_LIB)    \