CWS-TOOLING: integrate CWS c07v026_OOO320

2009-10-19 10:26:11 +0200 mav  r277008 : #b6886425# use standard solution to encode the URL for the Gnome
2009-10-19 08:38:28 +0200 mav  r276998 : #b6886425# encode the URL correctly for the Gnome
2009-10-07 12:49:32 +0200 os  r276749 : #b6887668# resize items depending on the item text length
2009-09-28 18:42:32 +0200 dr  r276499 : #b6883075# shrink print ranges to Excel sheet limits
2009-09-28 16:50:25 +0200 od  r276497 : #b6882166# method <SwSectionFrm::SimpleFormat(..)>
           - assure notification on position changes, otherwise the layout will not be correct.
2009-09-15 18:31:37 +0200 dr  r276185 : #b6872823# check cursor before using, patch by aw
2009-09-09 10:52:52 +0200 od  r275975 : #b6879723# correct handling of new list level attributes regarding paragraph indent values,
	   especially in case of OOo 2.0 and former hidden compatibility option "Ignore first line
	   indent on numbering"
2009-09-08 11:10:31 +0200 od  r275918 : #b6876367# method <lcl_SetTxtFmtColl(..)>
	   - do not reset list attributes at paragraph, if its applied list style 
	     will not change due to the newly applied paragraph style.
2009-09-07 12:48:58 +0200 obo  r275890 : Merge from c07v025 into this CWS

4 files changed, 20 insertions, 5 deletions

diff --git a/fpicker/source/unx/gnome/SalGtkPicker.cxx b/fpicker/source/unx/gnome/SalGtkPicker.cxx
index 0d9289d89a..3a9b3a3a5d 100644
--- a/fpicker/source/unx/gnome/SalGtkPicker.cxx
+++ b/fpicker/source/unx/gnome/SalGtkPicker.cxx
@@ -73,6 +73,8 @@ rtl::OUString SalGtkPicker::uritounicode(const gchar* pIn)
     INetURLObject aURL(sURL);
     if (INET_PROT_FILE == aURL.GetProtocol())
     {
+        // all the URLs are handled by office in UTF-8
+        // so the Gnome FP related URLs should be converted accordingly
         gchar *pEncodedFileName = g_filename_from_uri(pIn, NULL, NULL);
         if ( pEncodedFileName )
         {
@@ -94,12 +96,19 @@ rtl::OUString SalGtkPicker::uritounicode(const gchar* pIn)
 
 rtl::OString SalGtkPicker::unicodetouri(const rtl::OUString &rURL)
 {
+    // all the URLs are handled by office in UTF-8 ( and encoded with "%xx" codes based on UTF-8 )
+    // so the Gnome FP related URLs should be converted accordingly
     OString sURL = OUStringToOString(rURL, RTL_TEXTENCODING_UTF8);
     INetURLObject aURL(rURL);
     if (INET_PROT_FILE == aURL.GetProtocol())
     {
-        rtl::OUString sOUURL = aURL.getExternalURL(INetURLObject::DECODE_WITH_CHARSET, osl_getThreadTextEncoding());
-        sURL = OUStringToOString( sOUURL, osl_getThreadTextEncoding());
+        OUString aNewURL = Reference<uri::XExternalUriReferenceTranslator>(Reference<XMultiServiceFactory>(comphelper::getProcessServiceFactory(), UNO_QUERY_THROW)->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uri.ExternalUriReferenceTranslator"))), UNO_QUERY_THROW)->translateToExternal( rURL );
+
+        if( aNewURL.getLength() )
+        {
+            // At this point the URL should contain ascii characters only actually
+            sURL = OUStringToOString( aNewURL, osl_getThreadTextEncoding() );
+        }
     }
     return sURL;
 }
diff --git a/sfx2/inc/sfx2/filedlghelper.hxx b/sfx2/inc/sfx2/filedlghelper.hxx
index d50cf4b93c..7a312a5726 100644
--- a/sfx2/inc/sfx2/filedlghelper.hxx
+++ b/sfx2/inc/sfx2/filedlghelper.hxx
@@ -230,12 +230,15 @@ public:
     void                    SetTitle( const String&  rNewTitle );
     String                  GetPath() const;
 
-    /** @deprected: Don't use this method to retrieve the selected files
+    /** @deprected: Don't use this method to retrieve the selected files 
         There are file picker which can provide multiple selected file which belong
         to different folders. As this method always provides the root folder for all selected
         files this cannot work.
     */
     ::com::sun::star::uno::Sequence< ::rtl::OUString > GetMPath() const;
+    
+    /** Provides the selected files with full path information */
+    ::com::sun::star::uno::Sequence< ::rtl::OUString > GetSelectedFiles() const;
 
     /** Provides the selected files with full path information */
     ::com::sun::star::uno::Sequence< ::rtl::OUString > GetSelectedFiles() const;
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
index 4bf2a95cc4..e14d9118f0 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -2612,7 +2612,7 @@ Sequence< ::rtl::OUString > FileDialogHelper::GetSelectedFiles() const
         if ( nFiles > 1 )
         {
             aResultSeq = Sequence< ::rtl::OUString >( nFiles-1 );
-
+            
             INetURLObject aPath( lFiles[0] );
             aPath.setFinalSlash();
 
@@ -2629,7 +2629,7 @@ Sequence< ::rtl::OUString > FileDialogHelper::GetSelectedFiles() const
         else
             aResultSeq = lFiles;
     }
-
+    
     return aResultSeq;
 }
 
diff --git a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
index 91393a4047..31fe3da220 100644
--- a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
+++ b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
@@ -370,6 +370,9 @@ namespace sdr
                     OverlayManager::ImpDrawMembers(aBufferRememberedRangeLogic, getOutputDevice());
                 }
 
+                // #i80730# removed: VCL hack for transparent child windows
+                // No longer needed, checked in DEV300 m54
+
                 // #i80730# restore visibility of VCL cursor
                 if(bCursorWasEnabled)
                 {