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

[René Engelhard]

 patches/dev300/kde4_fpicker_fixes2.diff |   25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

New commits:
commit 8c25329af1f551e3266b0dd5d6f47f9c190b5737
Author: Roman Shtylman <shtylman at namlyths.(none)>
Date:   Mon Oct 12 22:50:48 2009 -0400

    kde4 fpicker: fixed 'new folder' button
    
    * patches/dev300/kde4_fpicker_fixes2.diff:

diff --git a/patches/dev300/kde4_fpicker_fixes2.diff b/patches/dev300/kde4_fpicker_fixes2.diff
index 12efe1c..f398f87 100644
--- a/patches/dev300/kde4_fpicker_fixes2.diff
+++ b/patches/dev300/kde4_fpicker_fixes2.diff
@@ -1,8 +1,8 @@
 diff --git fpicker/source/unx/kde4/KDE4FilePicker.cxx fpicker/source/unx/kde4/KDE4FilePicker.cxx
-index 6c6db9e..61812d5 100644
+index 6c6db9e..cdea45c 100644
 --- fpicker/source/unx/kde4/KDE4FilePicker.cxx
 +++ fpicker/source/unx/kde4/KDE4FilePicker.cxx
-@@ -165,7 +165,6 @@ KDE4FilePicker::KDE4FilePicker( const uno::Reference<lang::XMultiServiceFactory>
+@@ -165,14 +165,12 @@ KDE4FilePicker::KDE4FilePicker( const uno::Reference<lang::XMultiServiceFactory>
  		  _resMgr( CREATEVERSIONRESMGR( fps_office ) )
  {
  	_extraControls = new QWidget();
@@ -10,16 +10,15 @@ index 6c6db9e..61812d5 100644
  	_layout = new QGridLayout(_extraControls);
  	
  	_dialog = new KFileDialog(KUrl("~"), QString(""), 0, _extraControls);
-@@ -173,6 +172,8 @@ KDE4FilePicker::KDE4FilePicker( const uno::Reference<lang::XMultiServiceFactory>
+ 	_dialog->setMode(KFile::File | KFile::LocalOnly);
  	
- 	//default mode
- 	_dialog->setOperationMode(KFileDialog::Opening);
-+	
+-	//default mode
+-	_dialog->setOperationMode(KFileDialog::Opening);
 +	_dialog->setStyleSheet("color: black;");
  }
  
  KDE4FilePicker::~KDE4FilePicker()
-@@ -218,15 +219,8 @@ sal_Int16 SAL_CALL KDE4FilePicker::execute()
+@@ -218,15 +216,8 @@ sal_Int16 SAL_CALL KDE4FilePicker::execute()
  	_dialog->clearFilter();
  	_dialog->setFilter(_filter);
  	
@@ -36,7 +35,7 @@ index 6c6db9e..61812d5 100644
  		return ExecutableDialogResults::OK;
  	
  	return ExecutableDialogResults::CANCEL;
-@@ -288,9 +282,15 @@ uno::Sequence< ::rtl::OUString > SAL_CALL KDE4FilePicker::getFiles()
+@@ -288,9 +279,15 @@ uno::Sequence< ::rtl::OUString > SAL_CALL KDE4FilePicker::getFiles()
  	// make a true list of files
  	const QString dir = "file://" + KUrl(rawFiles[0]).directory();
  	
@@ -55,7 +54,7 @@ index 6c6db9e..61812d5 100644
  	
  	for (USHORT i = 0; i < rawFiles.size(); ++i)
  	{
-@@ -298,7 +298,10 @@ uno::Sequence< ::rtl::OUString > SAL_CALL KDE4FilePicker::getFiles()
+@@ -298,7 +295,10 @@ uno::Sequence< ::rtl::OUString > SAL_CALL KDE4FilePicker::getFiles()
  		// we add the file to list of avail files
  		if ((dir + "/") != ("file://" + rawFiles[i]))
  		{
@@ -67,7 +66,7 @@ index 6c6db9e..61812d5 100644
  			
  			//prevent extension append if we already have one
  			if (filename.endsWith(extension))
-@@ -332,15 +335,18 @@ void SAL_CALL KDE4FilePicker::appendFilter( const ::rtl::OUString &title, const
+@@ -332,15 +332,18 @@ void SAL_CALL KDE4FilePicker::appendFilter( const ::rtl::OUString &title, const
  	//see the docs
  	t.replace("/", "\\/");
  	
@@ -89,7 +88,7 @@ index 6c6db9e..61812d5 100644
  }
  
  rtl::OUString SAL_CALL KDE4FilePicker::getCurrentFilter()
-@@ -355,26 +361,24 @@ rtl::OUString SAL_CALL KDE4FilePicker::getCurrentFilter()
+@@ -355,26 +358,24 @@ rtl::OUString SAL_CALL KDE4FilePicker::getCurrentFilter()
  	return toOUString(filter);
  }
  
@@ -193,7 +192,7 @@ index 5c18575..a5277a2 100644
      style.SetScrollBarSize( kapp->style()->pixelMetric( QStyle::PM_ScrollBarExtent ) );
      
 diff --git vcl/unx/kde4/KDEXLib.cxx vcl/unx/kde4/KDEXLib.cxx
-index f7bf04f..23e8151 100644
+index f7bf04f..c532db8 100644
 --- vcl/unx/kde4/KDEXLib.cxx
 +++ vcl/unx/kde4/KDEXLib.cxx
 @@ -78,23 +78,29 @@ void KDEXLib::Init()
@@ -225,7 +224,7 @@ index f7bf04f..23e8151 100644
  			ki18n( "Accessibility fixes, porting to KDE 4." ),
  			"bischoff at kde.org" );
 +			
-+	//kAboutData->setProgramIconName("OpenOffice");
++	kAboutData->setProgramIconName("x-office-document");
  
      m_nFakeCmdLineArgs = 1;
  	USHORT nIdx;