[Libreoffice-commits] .: basic/source

David Tardon dtardon at kemper.freedesktop.org
Thu Oct 27 07:49:15 PDT 2011


 basic/source/uno/namecont.cxx |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 8ff172492431d77f4a09a36bec51b8c6361c1854
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Oct 27 15:54:28 2011 +0200

    these are files--no trailing /

diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index c0733a3..988c5c9 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -762,7 +762,7 @@ sal_Bool SfxLibraryContainer::init_Impl(
                     pLibInfoInetObj = new INetURLObject( String(maLibraryPath).GetToken(0) );
                 else
                     pLibInfoInetObj = new INetURLObject( String(maLibraryPath).GetToken(1) );
-                pLibInfoInetObj->insertName( maInfoFileName, sal_True, INetURLObject::LAST_SEGMENT, sal_True, INetURLObject::ENCODE_ALL );
+                pLibInfoInetObj->insertName( maInfoFileName, sal_False, INetURLObject::LAST_SEGMENT, sal_True, INetURLObject::ENCODE_ALL );
                 pLibInfoInetObj->setExtension( OUString( RTL_CONSTASCII_USTRINGPARAM("xlc") ) );
                 aFileName = pLibInfoInetObj->GetMainURL( INetURLObject::NO_DECODE );
             }
@@ -786,7 +786,7 @@ sal_Bool SfxLibraryContainer::init_Impl(
             if( !xInput.is() && nPass == 0 )
             {
                 INetURLObject aLibInfoInetObj( String(maLibraryPath).GetToken(1) );
-                aLibInfoInetObj.insertName( maOldInfoFileName, sal_True, INetURLObject::LAST_SEGMENT, sal_True, INetURLObject::ENCODE_ALL );
+                aLibInfoInetObj.insertName( maOldInfoFileName, sal_False, INetURLObject::LAST_SEGMENT, sal_True, INetURLObject::ENCODE_ALL );
                 aLibInfoInetObj.setExtension( OUString( RTL_CONSTASCII_USTRINGPARAM("xli") ) );
                 aFileName = aLibInfoInetObj.GetMainURL( INetURLObject::NO_DECODE );
 
@@ -1105,7 +1105,7 @@ sal_Bool SfxLibraryContainer::init_Impl(
                 }
 
                 INetURLObject aPrevUserBasicLibInfoInetObj( aUserBasicInetObj );
-                aPrevUserBasicLibInfoInetObj.insertName( maInfoFileName, sal_True, INetURLObject::LAST_SEGMENT,
+                aPrevUserBasicLibInfoInetObj.insertName( maInfoFileName, sal_False, INetURLObject::LAST_SEGMENT,
                                                     sal_True, INetURLObject::ENCODE_ALL );
                 aPrevUserBasicLibInfoInetObj.setExtension( OUString( RTL_CONSTASCII_USTRINGPARAM("xlc") ) );
                 OUString aLibInfoFileName = aPrevUserBasicLibInfoInetObj.GetMainURL( INetURLObject::NO_DECODE );
@@ -1302,7 +1302,7 @@ void SfxLibraryContainer::checkStorageURL( const OUString& aSourceURL,
     {
         // URL to library folder
         aStorageURL = aExpandedSourceURL;
-        aInetObj.insertName( maInfoFileName, sal_True, INetURLObject::LAST_SEGMENT, sal_True, INetURLObject::ENCODE_ALL );
+        aInetObj.insertName( maInfoFileName, sal_False, INetURLObject::LAST_SEGMENT, sal_True, INetURLObject::ENCODE_ALL );
         aInetObj.setExtension( OUString( RTL_CONSTASCII_USTRINGPARAM("xlb") ) );
         aLibInfoFileURL = aInetObj.GetMainURL( INetURLObject::NO_DECODE );
     }
@@ -1609,7 +1609,7 @@ void SfxLibraryContainer::implStoreLibraryIndexFile( SfxLibrary* pLib,
             if( !xSFI->isFolder( aLibDirPath ) )
                 xSFI->createFolder( aLibDirPath );
 
-            aInetObj.insertName( maInfoFileName, sal_True, INetURLObject::LAST_SEGMENT, sal_True, INetURLObject::ENCODE_ALL );
+            aInetObj.insertName( maInfoFileName, sal_False, INetURLObject::LAST_SEGMENT, sal_True, INetURLObject::ENCODE_ALL );
             aInetObj.setExtension( OUString( RTL_CONSTASCII_USTRINGPARAM("xlb") ) );
             aLibInfoPath = aInetObj.GetMainURL( INetURLObject::NO_DECODE );
         }
@@ -2067,7 +2067,7 @@ void SfxLibraryContainer::storeLibraries_Impl( const uno::Reference< embed::XSto
     {
         // Create Output stream
         INetURLObject aLibInfoInetObj( String(maLibraryPath).GetToken(1) );
-        aLibInfoInetObj.insertName( maInfoFileName, sal_True, INetURLObject::LAST_SEGMENT, sal_True, INetURLObject::ENCODE_ALL );
+        aLibInfoInetObj.insertName( maInfoFileName, sal_False, INetURLObject::LAST_SEGMENT, sal_True, INetURLObject::ENCODE_ALL );
         aLibInfoInetObj.setExtension( OUString( RTL_CONSTASCII_USTRINGPARAM("xlc") ) );
         String aLibInfoPath( aLibInfoInetObj.GetMainURL( INetURLObject::NO_DECODE ) );
 


More information about the Libreoffice-commits mailing list