Skip to content

C
core
Kaydet (Commit) 8ff17249 authored tarafından David Tardon's avatar David Tardon
Dosyalara gözat
Seçenekler

these are files--no trailing /

üst 06e64daf
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
basic/source/uno/namecont.cxx
Dosyayı görüntüle @ 8ff17249
...@@ -762,7 +762,7 @@ sal_Bool SfxLibraryContainer::init_Impl( ...@@ -762,7 +762,7 @@ sal_Bool SfxLibraryContainer::init_Impl(
pLibInfoInetObj = new INetURLObject( String(maLibraryPath).GetToken(0) ); pLibInfoInetObj = new INetURLObject( String(maLibraryPath).GetToken(0) );
else else
pLibInfoInetObj = new INetURLObject( String(maLibraryPath).GetToken(1) ); 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") ) ); pLibInfoInetObj->setExtension( OUString( RTL_CONSTASCII_USTRINGPARAM("xlc") ) );
aFileName = pLibInfoInetObj->GetMainURL( INetURLObject::NO_DECODE ); aFileName = pLibInfoInetObj->GetMainURL( INetURLObject::NO_DECODE );
} }
...@@ -786,7 +786,7 @@ sal_Bool SfxLibraryContainer::init_Impl( ...@@ -786,7 +786,7 @@ sal_Bool SfxLibraryContainer::init_Impl(
if( !xInput.is() && nPass == 0 ) if( !xInput.is() && nPass == 0 )
{ {
INetURLObject aLibInfoInetObj( String(maLibraryPath).GetToken(1) ); 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") ) ); aLibInfoInetObj.setExtension( OUString( RTL_CONSTASCII_USTRINGPARAM("xli") ) );
aFileName = aLibInfoInetObj.GetMainURL( INetURLObject::NO_DECODE ); aFileName = aLibInfoInetObj.GetMainURL( INetURLObject::NO_DECODE );
...@@ -1105,7 +1105,7 @@ sal_Bool SfxLibraryContainer::init_Impl( ...@@ -1105,7 +1105,7 @@ sal_Bool SfxLibraryContainer::init_Impl(
} }
INetURLObject aPrevUserBasicLibInfoInetObj( aUserBasicInetObj ); INetURLObject aPrevUserBasicLibInfoInetObj( aUserBasicInetObj );
aPrevUserBasicLibInfoInetObj.insertName( maInfoFileName, sal_True, INetURLObject::LAST_SEGMENT, aPrevUserBasicLibInfoInetObj.insertName( maInfoFileName, sal_False, INetURLObject::LAST_SEGMENT,
sal_True, INetURLObject::ENCODE_ALL ); sal_True, INetURLObject::ENCODE_ALL );
aPrevUserBasicLibInfoInetObj.setExtension( OUString( RTL_CONSTASCII_USTRINGPARAM("xlc") ) ); aPrevUserBasicLibInfoInetObj.setExtension( OUString( RTL_CONSTASCII_USTRINGPARAM("xlc") ) );
OUString aLibInfoFileName = aPrevUserBasicLibInfoInetObj.GetMainURL( INetURLObject::NO_DECODE ); OUString aLibInfoFileName = aPrevUserBasicLibInfoInetObj.GetMainURL( INetURLObject::NO_DECODE );
...@@ -1302,7 +1302,7 @@ void SfxLibraryContainer::checkStorageURL( const OUString& aSourceURL, ...@@ -1302,7 +1302,7 @@ void SfxLibraryContainer::checkStorageURL( const OUString& aSourceURL,
{ {
// URL to library folder // URL to library folder
aStorageURL = aExpandedSourceURL; 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") ) ); aInetObj.setExtension( OUString( RTL_CONSTASCII_USTRINGPARAM("xlb") ) );
aLibInfoFileURL = aInetObj.GetMainURL( INetURLObject::NO_DECODE ); aLibInfoFileURL = aInetObj.GetMainURL( INetURLObject::NO_DECODE );
} }
...@@ -1609,7 +1609,7 @@ void SfxLibraryContainer::implStoreLibraryIndexFile( SfxLibrary* pLib, ...@@ -1609,7 +1609,7 @@ void SfxLibraryContainer::implStoreLibraryIndexFile( SfxLibrary* pLib,
if( !xSFI->isFolder( aLibDirPath ) ) if( !xSFI->isFolder( aLibDirPath ) )
xSFI->createFolder( 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") ) ); aInetObj.setExtension( OUString( RTL_CONSTASCII_USTRINGPARAM("xlb") ) );
aLibInfoPath = aInetObj.GetMainURL( INetURLObject::NO_DECODE ); aLibInfoPath = aInetObj.GetMainURL( INetURLObject::NO_DECODE );
} }
...@@ -2067,7 +2067,7 @@ void SfxLibraryContainer::storeLibraries_Impl( const uno::Reference< embed::XSto ...@@ -2067,7 +2067,7 @@ void SfxLibraryContainer::storeLibraries_Impl( const uno::Reference< embed::XSto
{ {
// Create Output stream // Create Output stream
INetURLObject aLibInfoInetObj( String(maLibraryPath).GetToken(1) ); 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") ) ); aLibInfoInetObj.setExtension( OUString( RTL_CONSTASCII_USTRINGPARAM("xlc") ) );
String aLibInfoPath( aLibInfoInetObj.GetMainURL( INetURLObject::NO_DECODE ) ); String aLibInfoPath( aLibInfoInetObj.GetMainURL( INetURLObject::NO_DECODE ) );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment