[ooo-build-commit] patches/dev300

[Bernhard Rosenkraenzer]

 patches/dev300/kde4-fpicker.diff                   |    7 ++-----
 patches/dev300/kde4-kdebe.diff                     |    5 ++---
 patches/dev300/testing-more-optimizations-ark.diff |    8 ++++----
 3 files changed, 8 insertions(+), 12 deletions(-)

New commits:
commit 18079c76e6ce62f2c2f21a25eed1d809d48ce66f
Author: Bernhard Rosenkraenzer <bero at arklinux.org>
Date:   Wed Jun 10 19:55:32 2009 +0000

    Make kde4-fpicker.diff, kde4-kdebe.diff and testing-more-optimizations-ark.diff
    apply on current trees

diff --git a/patches/dev300/kde4-fpicker.diff b/patches/dev300/kde4-fpicker.diff
index 2b95503..00f22d1 100644
--- a/patches/dev300/kde4-fpicker.diff
+++ b/patches/dev300/kde4-fpicker.diff
@@ -256,23 +256,20 @@
  
                      sendCommand( qString );
                      setCanNotifySelection( true );
-@@ -314,7 +317,7 @@ void FileDialog::customEvent( QCustomEve
+@@ -314,6 +317,6 @@ void FileDialog::customEvent( QCustomEve
                  break;
              case CommandEvent::Exec:
                  {
 -                    filterWidget->setEditable( false );
 +                    filterWidget()->setEditable( false );
-                     QString qSelectedURL;
                      setIsExecuting( true );
                      bool bCanExit = false;
-@@ -322,7 +325,7 @@ void FileDialog::customEvent( QCustomEve
+@@ -322,5 +325,5 @@ void FileDialog::customEvent( QCustomEve
                          setCanNotifySelection( true );
                          exec();
  
 -                        KURL qLocalSelectedURL = mostLocalURL( selectedURL() );
 +                        KUrl qLocalSelectedURL = mostLocalURL( selectedUrl() );
- 
-                         qSelectedURL = addExtension( qLocalSelectedURL.url() );
                          QString qProtocol( qLocalSelectedURL.protocol() );
 @@ -338,7 +341,7 @@ void FileDialog::customEvent( QCustomEve
                                                                   i18n( "A file named \"%1\" already exists. "
diff --git a/patches/dev300/kde4-kdebe.diff b/patches/dev300/kde4-kdebe.diff
index c435a8d..590e318 100644
--- a/patches/dev300/kde4-kdebe.diff
+++ b/patches/dev300/kde4-kdebe.diff
@@ -123,15 +123,14 @@
          aPropInfoList[nProperties].Name = rtl::OUString(
 --- shell/source/backends/kdebe/kdepathslayer.cxx.old	2008-03-26 02:19:55.000000000 +0100
 +++ shell/source/backends/kdebe/kdepathslayer.cxx	2008-03-26 02:27:24.000000000 +0100
-@@ -107,7 +107,7 @@
-     aDocumentsDir += KGlobalSettings::documentPath();
+@@ -108,6 +108,6 @@
      if ( aDocumentsDir.endsWith(QChar('/')) )
          aDocumentsDir.truncate ( aDocumentsDir.length() - 1 );
 -    sDocumentsDir = (const sal_Unicode *) aDocumentsDir.ucs2();
 +    sDocumentsDir = (const sal_Unicode *) aDocumentsDir.utf16();
+     osl_getFileURLFromSystemPath( sDocumentsDir.pData, &sDocumentsURL.pData );
  
      aPropInfoList[nProperties].Name = rtl::OUString(
-         RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Office.Paths/Variables/Work") );
 @@ -137,7 +137,7 @@
      QString aDocumentsDir;
      aDocumentsDir = KGlobalSettings::documentPath();
diff --git a/patches/dev300/testing-more-optimizations-ark.diff b/patches/dev300/testing-more-optimizations-ark.diff
index 4f8f0a2..322a424 100644
--- a/patches/dev300/testing-more-optimizations-ark.diff
+++ b/patches/dev300/testing-more-optimizations-ark.diff
@@ -71,8 +71,8 @@
  	@param	hKey identifies a currently open key which name will be returned.
  	@param	pKeyName contains the keyname if succeeds else an empty string. 
  */
--const RegError REGISTRY_CALLTYPE reg_getKeyName(RegKeyHandle hKey, rtl_uString** pKeyName);
-+const RegError REGISTRY_CALLTYPE SAL_DLLPUBLIC_EXPORT reg_getKeyName(RegKeyHandle hKey, rtl_uString** pKeyName);
+-RegError REGISTRY_CALLTYPE reg_getKeyName(RegKeyHandle hKey, rtl_uString** pKeyName);
++RegError REGISTRY_CALLTYPE SAL_DLLPUBLIC_EXPORT reg_getKeyName(RegKeyHandle hKey, rtl_uString** pKeyName);
  
  
  /**	This function sets a value of a key.
@@ -260,8 +260,8 @@
  	@param  pName returns the name of the registry if the function succeeds otherwise an empty string. 
  	@return	REG_NO_ERROR if succeeds else an error code. 
  */
--const RegError REGISTRY_CALLTYPE reg_getName(RegHandle hRegistry, rtl_uString** pName);
-+const RegError REGISTRY_CALLTYPE SAL_DLLPUBLIC_EXPORT reg_getName(RegHandle hRegistry, rtl_uString** pName);
+-RegError REGISTRY_CALLTYPE reg_getName(RegHandle hRegistry, rtl_uString** pName);
++RegError REGISTRY_CALLTYPE SAL_DLLPUBLIC_EXPORT reg_getName(RegHandle hRegistry, rtl_uString** pName);
  
  
  /**	This function returns the access mode of the registry.