summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--svx/source/gallery2/galbrws1.cxx6
-rw-r--r--svx/source/gallery2/galbrws2.cxx10
-rw-r--r--svx/source/gallery2/galctrl.cxx6
-rw-r--r--svx/source/gallery2/galexpl.cxx6
-rw-r--r--svx/source/gallery2/gallery1.cxx22
-rw-r--r--svx/source/gallery2/galmisc.cxx34
-rw-r--r--svx/source/gallery2/galobj.cxx6
-rw-r--r--svx/source/gallery2/galtheme.cxx62
8 files changed, 76 insertions, 76 deletions
diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx
index 1119e3b80bbc..cd58e54e759e 100644
--- a/svx/source/gallery2/galbrws1.cxx
+++ b/svx/source/gallery2/galbrws1.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: galbrws1.cxx,v $
*
- * $Revision: 1.10 $
+ * $Revision: 1.11 $
*
- * last change: $Author: ka $ $Date: 2001-06-06 12:10:59 $
+ * last change: $Author: ka $ $Date: 2001-07-30 13:05:20 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -213,7 +213,7 @@ void GalleryBrowser1::ImplFillExchangeData( const GalleryTheme* pThm, ExchangeDa
try
{
- Content aCnt( pThm->GetThmURL().GetMainURL(), uno::Reference< XCommandEnvironment >() );
+ Content aCnt( pThm->GetThmURL().GetMainURL( INetURLObject::NO_DECODE ), uno::Reference< XCommandEnvironment >() );
util::DateTime aDateTimeCreated, aDateTimeModified;
DateTime aDateTime;
diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index ee94bf99b17f..02c5e677004e 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: galbrws2.cxx,v $
*
- * $Revision: 1.21 $
+ * $Revision: 1.22 $
*
- * last change: $Author: ka $ $Date: 2001-07-03 10:51:01 $
+ * last change: $Author: ka $ $Date: 2001-07-30 13:05:20 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -167,9 +167,9 @@ void GalleryBackgroundPopup::Select()
Menu::Select();
const INetURLObject aURL( mpTheme->GetObjectURL( mnObjectPos ) );
- const SvxBrushItem aBrushItem( aURL.GetMainURL(), String(), GPOS_TILED, SID_GALLERY_BG_BRUSH );
+ const SvxBrushItem aBrushItem( aURL.GetMainURL( INetURLObject::NO_DECODE ), String(), GPOS_TILED, SID_GALLERY_BG_BRUSH );
const SfxUInt16Item aPosItem( SID_GALLERY_BG_POS, GetCurItemId() - 1 );
- const SfxStringItem aPathItem( SID_FILE_NAME, aURL.GetMainURL() );
+ const SfxStringItem aPathItem( SID_FILE_NAME, aURL.GetMainURL( INetURLObject::NO_DECODE ) );
SfxViewFrame::Current()->GetBindings().GetDispatcher()->Execute( SID_GALLERY_BG_BRUSH,
SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD,
@@ -732,7 +732,7 @@ String GalleryBrowser2::GetItemText( const GalleryTheme& rTheme, const SgaObject
if( !aTitle.Len() )
{
- aTitle = aURL.GetMainURL();
+ aTitle = aURL.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS );
aTitle = aTitle.GetToken( aTitle.GetTokenCount( '/' ) - 1, '/' );
}
diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx
index 158e4de9ea0f..a9ab0168acce 100644
--- a/svx/source/gallery2/galctrl.cxx
+++ b/svx/source/gallery2/galctrl.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: galctrl.cxx,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
- * last change: $Author: ka $ $Date: 2001-07-24 09:14:49 $
+ * last change: $Author: ka $ $Date: 2001-07-30 13:05:20 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -231,7 +231,7 @@ void GalleryPreview::StartDrag( sal_Int8 nAction, const Point& rPosPixel )
void GalleryPreview::PreviewSound( const INetURLObject& rURL )
{
- aSound.SetSoundName( rURL.GetMainURL() );
+ aSound.SetSoundName( rURL.GetMainURL( INetURLObject::NO_DECODE ) );
if( rURL.GetProtocol() != INET_PROT_NOT_VALID )
aSound.Play();
diff --git a/svx/source/gallery2/galexpl.cxx b/svx/source/gallery2/galexpl.cxx
index 5d1c943b8494..5930202a729c 100644
--- a/svx/source/gallery2/galexpl.cxx
+++ b/svx/source/gallery2/galexpl.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: galexpl.cxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: ka $ $Date: 2000-12-01 14:03:35 $
+ * last change: $Author: ka $ $Date: 2001-07-30 13:06:09 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -165,7 +165,7 @@ BOOL GalleryExplorer::FillObjList( const String& rThemeName, List& rObjList )
if( pTheme )
{
for( ULONG i = 0, nCount = pTheme->GetObjectCount(); i < nCount; i++ )
- rObjList.Insert( new String( pTheme->GetObjectURL( i ).GetMainURL() ), LIST_APPEND );
+ rObjList.Insert( new String( pTheme->GetObjectURL( i ).GetMainURL( INetURLObject::NO_DECODE ) ), LIST_APPEND );
pGal->ReleaseTheme( pTheme, aDummyListener );
}
diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx
index 65421fe87d56..234b3193aef9 100644
--- a/svx/source/gallery2/gallery1.cxx
+++ b/svx/source/gallery2/gallery1.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: gallery1.cxx,v $
*
- * $Revision: 1.10 $
+ * $Revision: 1.11 $
*
- * last change: $Author: ka $ $Date: 2000-12-09 16:14:53 $
+ * last change: $Author: ka $ $Date: 2001-07-30 13:06:09 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -212,7 +212,7 @@ SvStream& operator<<( SvStream& rOut, const GalleryImportThemeEntry& rEntry )
rOut << ByteString( rEntry.aThemeName, RTL_TEXTENCODING_UTF8 ) <<
ByteString( rEntry.aUIName, RTL_TEXTENCODING_UTF8 ) <<
- ByteString( rEntry.aURL.GetMainURL(), RTL_TEXTENCODING_UTF8 ) <<
+ ByteString( rEntry.aURL.GetMainURL( INetURLObject::NO_DECODE ), RTL_TEXTENCODING_UTF8 ) <<
ByteString( rEntry.aImportName, RTL_TEXTENCODING_UTF8 ) <<
aDummy;
@@ -358,7 +358,7 @@ void Gallery::ImplLoadSubDirs( const INetURLObject& rBaseURL, BOOL bReadOnly )
try
{
uno::Reference< XCommandEnvironment > xEnv;
- Content aCnt( rBaseURL.GetMainURL(), xEnv );
+ Content aCnt( rBaseURL.GetMainURL( INetURLObject::NO_DECODE ), xEnv );
uno::Sequence< OUString > aProps( 1 );
aProps.getArray()[ 0 ] == OUString::createFromAscii( "Url" );
@@ -384,9 +384,9 @@ void Gallery::ImplLoadSubDirs( const INetURLObject& rBaseURL, BOOL bReadOnly )
OUString aTitle;
sal_Bool bReadOnly = sal_False;
- Content aThmCnt( aThmURL.GetMainURL(), xEnv );
- Content aSdgCnt( aSdgURL.GetMainURL(), xEnv );
- Content aSdvCnt( aSdvURL.GetMainURL(), xEnv );
+ Content aThmCnt( aThmURL.GetMainURL( INetURLObject::NO_DECODE ), xEnv );
+ Content aSdgCnt( aSdgURL.GetMainURL( INetURLObject::NO_DECODE ), xEnv );
+ Content aSdvCnt( aSdvURL.GetMainURL( INetURLObject::NO_DECODE ), xEnv );
aThmCnt.getPropertyValue( aTitleProp ) >>= aTitle;
@@ -447,7 +447,7 @@ void Gallery::ImplLoadImports()
if( FileExists( aURL ) )
{
- SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL(), STREAM_READ );
+ SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ );
if( pIStm )
{
@@ -497,7 +497,7 @@ void Gallery::ImplWriteImportList()
{
INetURLObject aURL( GetUserURL() );
aURL.Append( ( String( "gallery.sdi", RTL_TEXTENCODING_UTF8 ) ) );
- SvStream* pOStm = ::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL(), STREAM_WRITE | STREAM_TRUNC );
+ SvStream* pOStm = ::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE | STREAM_TRUNC );
if( pOStm )
{
@@ -621,7 +621,7 @@ BOOL Gallery::CreateImportTheme( const INetURLObject& rURL, const String& rImpor
if( FileExists( aURL ) )
{
- SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL(), STREAM_READ );
+ SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ );
if( pIStm )
{
@@ -817,7 +817,7 @@ GalleryTheme* Gallery::ImplGetCachedTheme( const GalleryThemeEntry* pThemeEntry
if( FileExists( aURL ) )
{
- SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL(), STREAM_READ );
+ SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ );
if( pIStm )
{
diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx
index 1258ed96133a..82b24a6b55d3 100644
--- a/svx/source/gallery2/galmisc.cxx
+++ b/svx/source/gallery2/galmisc.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: galmisc.cxx,v $
*
- * $Revision: 1.13 $
+ * $Revision: 1.14 $
*
- * last change: $Author: thb $ $Date: 2001-07-10 11:08:59 $
+ * last change: $Author: ka $ $Date: 2001-07-30 13:06:09 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -148,7 +148,7 @@ USHORT SGAImport( const INetURLObject& rURL, Graphic& rGraphic,
String& rFilterName, BOOL bShowProgress )
{
USHORT nRet = SGA_IMPORT_NONE;
- SfxMedium aMedium( rURL.GetMainURL(), STREAM_READ, TRUE );
+ SfxMedium aMedium( rURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ, TRUE );
String aFilterName;
aMedium.SetTransferPriority( SFX_TFPRIO_VISIBLE_HIGHRES_GRAPHIC | SFX_TFPRIO_SYNCHRON );
@@ -162,7 +162,7 @@ USHORT SGAImport( const INetURLObject& rURL, Graphic& rGraphic,
GalleryProgress* pProgress = bShowProgress ? new GalleryProgress( pGraphicFilter ) : NULL;
USHORT nFormat;
- if( !pGraphicFilter->ImportGraphic( rGraphic, rURL.GetMainURL(), *pIStm, GRFILTER_FORMAT_DONTKNOW, &nFormat ) )
+ if( !pGraphicFilter->ImportGraphic( rGraphic, rURL.GetMainURL( INetURLObject::NO_DECODE ), *pIStm, GRFILTER_FORMAT_DONTKNOW, &nFormat ) )
{
rFilterName = pGraphicFilter->GetImportFormatName( nFormat );
nRet = SGA_IMPORT_FILE;
@@ -226,7 +226,7 @@ BOOL SGAIsSoundFile( const INetURLObject& rURL )
}
else
{
- SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( rURL.GetMainURL(), STREAM_READ );
+ SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( rURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ );
if( pIStm )
{
@@ -291,17 +291,17 @@ String GetReducedString( const INetURLObject& rURL )
{
String aStr;
- if ( rURL.GetMainURL().Len() > 30 )
+ if ( rURL.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ).Len() > 30 )
{
const String aName( rURL.GetName() );
- aStr = rURL.GetMainURL().Copy( 0, 30 - aName.Len() - 4 );
+ aStr = rURL.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ).Copy( 0, 30 - aName.Len() - 4 );
aStr += String( RTL_CONSTASCII_USTRINGPARAM( "..." ) );
aStr += '/';
aStr += aName;
}
else
- aStr = rURL.GetMainURL();
+ aStr = rURL.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS );
return aStr;
}
@@ -313,9 +313,9 @@ String GetSvDrawStreamNameFromURL( const INetURLObject& rSvDrawObjURL )
String aRet;
if( rSvDrawObjURL.GetProtocol() == INET_PROT_PRIV_SOFFICE &&
- rSvDrawObjURL.GetMainURL().GetTokenCount( '/' ) == 3 )
+ rSvDrawObjURL.GetMainURL( INetURLObject::NO_DECODE ).GetTokenCount( '/' ) == 3 )
{
- aRet = rSvDrawObjURL.GetMainURL().GetToken( 2, '/' );
+ aRet = rSvDrawObjURL.GetMainURL( INetURLObject::NO_DECODE ).GetToken( 2, '/' );
}
return aRet;
@@ -331,7 +331,7 @@ BOOL FileExists( const INetURLObject& rURL )
{
try
{
- Content aCnt( rURL.GetMainURL(), uno::Reference< XCommandEnvironment >() );
+ Content aCnt( rURL.GetMainURL( INetURLObject::NO_DECODE ), uno::Reference< XCommandEnvironment >() );
OUString aTitle;
aCnt.getPropertyValue( OUString::createFromAscii( "Title" ) ) >>= aTitle;
@@ -363,7 +363,7 @@ BOOL CreateDir( const INetURLObject& rURL )
uno::Reference< XCommandEnvironment > aCmdEnv;
INetURLObject aNewFolderURL( rURL );
INetURLObject aParentURL( aNewFolderURL ); aParentURL.removeSegment();
- Content aParent( aParentURL.GetMainURL(), aCmdEnv );
+ Content aParent( aParentURL.GetMainURL( INetURLObject::NO_DECODE ), aCmdEnv );
uno::Sequence< OUString > aProps( 1 );
uno::Sequence< uno::Any > aValues( 1 );
@@ -371,7 +371,7 @@ BOOL CreateDir( const INetURLObject& rURL )
aValues.getArray()[ 0 ] = uno::makeAny( OUString( aNewFolderURL.GetName() ) );
bRet = aParent.insertNewContent( OUString::createFromAscii( "application/vnd.sun.staroffice.fsys-folder" ),
- aProps, aValues, Content( aNewFolderURL.GetMainURL(), aCmdEnv ) );
+ aProps, aValues, Content( aNewFolderURL.GetMainURL( INetURLObject::NO_DECODE ), aCmdEnv ) );
}
catch( const ContentCreationException& )
{
@@ -394,10 +394,10 @@ BOOL CopyFile( const INetURLObject& rSrcURL, const INetURLObject& rDstURL )
try
{
- Content aDestPath( rDstURL.GetMainURL(), uno::Reference< XCommandEnvironment >() );
+ Content aDestPath( rDstURL.GetMainURL( INetURLObject::NO_DECODE ), uno::Reference< XCommandEnvironment >() );
aDestPath.executeCommand( OUString::createFromAscii( "transfer" ),
- uno::makeAny( TransferInfo( sal_False, rSrcURL.GetMainURL(),
+ uno::makeAny( TransferInfo( sal_False, rSrcURL.GetMainURL( INetURLObject::NO_DECODE ),
rDstURL.GetName(), NameClash::OVERWRITE ) ) );
bRet = TRUE;
}
@@ -423,7 +423,7 @@ BOOL KillFile( const INetURLObject& rURL )
{
try
{
- Content aCnt( rURL.GetMainURL(), uno::Reference< XCommandEnvironment >() );
+ Content aCnt( rURL.GetMainURL( INetURLObject::NO_DECODE ), uno::Reference< XCommandEnvironment >() );
aCnt.executeCommand( OUString::createFromAscii( "delete" ), uno::makeAny( sal_Bool( sal_True ) ) );
}
catch( const ContentCreationException& )
@@ -658,7 +658,7 @@ sal_Bool GalleryTransferable::GetData( const ::com::sun::star::datatransfer::Dat
}
else if( ( FORMAT_FILE == nFormat ) && mpURL )
{
- bRet = SetString( mpURL->GetMainURL(), rFlavor );
+ bRet = SetString( mpURL->GetMainURL( INetURLObject::NO_DECODE ), rFlavor );
}
else if( ( SOT_FORMATSTR_ID_SVXB == nFormat ) && mpGraphicObject )
{
diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx
index 97437db7746b..50032ce9cf47 100644
--- a/svx/source/gallery2/galobj.cxx
+++ b/svx/source/gallery2/galobj.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: galobj.cxx,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
- * last change: $Author: ka $ $Date: 2001-06-08 13:56:40 $
+ * last change: $Author: ka $ $Date: 2001-07-30 13:07:02 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -173,7 +173,7 @@ void SgaObject::WriteData( SvStream& rOut ) const
else
rOut << aThumbMtf;
- rOut << ByteString( aURL.GetMainURL(), RTL_TEXTENCODING_UTF8 );
+ rOut << ByteString( aURL.GetMainURL( INetURLObject::NO_DECODE ), RTL_TEXTENCODING_UTF8 );
}
// ------------------------------------------------------------------------
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index cb0cc9166d0e..4dbba5d5f554 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: galtheme.cxx,v $
*
- * $Revision: 1.15 $
+ * $Revision: 1.16 $
*
- * last change: $Author: ka $ $Date: 2001-06-08 13:56:40 $
+ * last change: $Author: ka $ $Date: 2001-07-30 13:07:02 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -130,7 +130,7 @@ GalleryTheme::~GalleryTheme()
void GalleryTheme::ImplCreateSvDrawStorage()
{
if( !pThm->IsImported() )
- aSvDrawStorageRef = new SvStorage( FALSE, GetSdvURL().GetMainURL(), pThm->IsReadOnly() ? STREAM_READ : STREAM_STD_READWRITE );
+ aSvDrawStorageRef = new SvStorage( FALSE, GetSdvURL().GetMainURL( INetURLObject::NO_DECODE ), pThm->IsReadOnly() ? STREAM_READ : STREAM_STD_READWRITE );
else
aSvDrawStorageRef.Clear();
}
@@ -139,7 +139,7 @@ void GalleryTheme::ImplCreateSvDrawStorage()
BOOL GalleryTheme::ImplWriteSgaObject( const SgaObject& rObj, ULONG nPos, GalleryObject* pExistentEntry )
{
- SvStream* pOStm = ::utl::UcbStreamHelper::CreateStream( GetSdgURL().GetMainURL(), STREAM_WRITE );
+ SvStream* pOStm = ::utl::UcbStreamHelper::CreateStream( GetSdgURL().GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE );
BOOL bRet = FALSE;
if( pOStm )
@@ -180,7 +180,7 @@ SgaObject* GalleryTheme::ImplReadSgaObject( GalleryObject* pEntry )
if( pEntry )
{
- SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( GetSdgURL().GetMainURL(), STREAM_READ );
+ SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( GetSdgURL().GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ );
if( pIStm )
{
@@ -224,7 +224,7 @@ SgaObject* GalleryTheme::ImplReadSgaObject( GalleryObject* pEntry )
void GalleryTheme::ImplRead()
{
- SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( GetThmURL().GetMainURL(), STREAM_READ );
+ SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( GetThmURL().GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ );
if( pIStm )
{
@@ -249,9 +249,9 @@ void GalleryTheme::ImplWrite()
if( FileExists( aPathURL ) || CreateDir( aPathURL ) )
{
#ifdef UNX
- SvStream* pOStm = ::utl::UcbStreamHelper::CreateStream( GetThmURL().GetMainURL(), STREAM_WRITE | STREAM_COPY_ON_SYMLINK | STREAM_TRUNC );
+ SvStream* pOStm = ::utl::UcbStreamHelper::CreateStream( GetThmURL().GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE | STREAM_COPY_ON_SYMLINK | STREAM_TRUNC );
#else
- SvStream* pOStm = ::utl::UcbStreamHelper::CreateStream( GetThmURL().GetMainURL(), STREAM_WRITE | STREAM_TRUNC );
+ SvStream* pOStm = ::utl::UcbStreamHelper::CreateStream( GetThmURL().GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE | STREAM_TRUNC );
#endif
if( pOStm )
@@ -308,7 +308,7 @@ INetURLObject GalleryTheme::ImplCreateUniqueURL( SgaObjKind eObjKind, ULONG nFor
// read next possible number
if( FileExists( aInfoFileURL ) )
{
- SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( aInfoFileURL.GetMainURL(), STREAM_READ );
+ SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( aInfoFileURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ );
if( pIStm )
{
@@ -371,7 +371,7 @@ INetURLObject GalleryTheme::ImplCreateUniqueURL( SgaObjKind eObjKind, ULONG nFor
while( bExists );
// write updated number
- SvStream* pOStm = ::utl::UcbStreamHelper::CreateStream( aInfoFileURL.GetMainURL(), STREAM_WRITE );
+ SvStream* pOStm = ::utl::UcbStreamHelper::CreateStream( aInfoFileURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE );
if( pOStm )
{
@@ -478,7 +478,7 @@ BOOL GalleryTheme::RemoveObject( ULONG nPos )
if( pEntry )
{
if( SGA_OBJ_SVDRAW == pEntry->eObjKind )
- aSvDrawStorageRef->Remove( pEntry->aURL.GetMainURL() );
+ aSvDrawStorageRef->Remove( pEntry->aURL.GetMainURL( INetURLObject::NO_DECODE ) );
delete pEntry;
ImplSetModified( TRUE );
@@ -664,8 +664,8 @@ void GalleryTheme::Actualize( const Link& rActualizeLink, GalleryProgress* pProg
DBG_ASSERT( aInURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" );
DBG_ASSERT( aTmpURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" );
- SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( aInURL.GetMainURL(), STREAM_READ );
- SvStream* pTmpStm = ::utl::UcbStreamHelper::CreateStream( aTmpURL.GetMainURL(), STREAM_WRITE | STREAM_TRUNC );
+ SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( aInURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ );
+ SvStream* pTmpStm = ::utl::UcbStreamHelper::CreateStream( aTmpURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE | STREAM_TRUNC );
if( pIStm && pTmpStm )
{
@@ -714,7 +714,7 @@ void GalleryTheme::Actualize( const Link& rActualizeLink, GalleryProgress* pProg
ULONG nStorErr = 0;
{
- SvStorageRef aTempStorageRef( new SvStorage( FALSE, aTmpURL.GetMainURL(), STREAM_STD_READWRITE ) );
+ SvStorageRef aTempStorageRef( new SvStorage( FALSE, aTmpURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_STD_READWRITE ) );
aSvDrawStorageRef->CopyTo( aTempStorageRef );
nStorErr = aSvDrawStorageRef->GetError();
}
@@ -743,7 +743,7 @@ GalleryThemeEntry* GalleryTheme::CreateThemeEntry( const INetURLObject& rURL, BO
if( FileExists( rURL ) )
{
- SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( rURL.GetMainURL(), STREAM_READ );
+ SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( rURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ );
if( pIStm )
{
@@ -943,7 +943,7 @@ BOOL GalleryTheme::InsertGraphic( const Graphic& rGraphic, ULONG nInsertPos )
}
const INetURLObject aURL( ImplCreateUniqueURL( SGA_OBJ_BMP, nExportFormat ) );
- SvStream* pOStm = ::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL(), STREAM_WRITE | STREAM_TRUNC );
+ SvStream* pOStm = ::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE | STREAM_TRUNC );
if( pOStm )
{
@@ -972,7 +972,7 @@ BOOL GalleryTheme::InsertGraphic( const Graphic& rGraphic, ULONG nInsertPos )
if( bRet )
{
- const SgaObjectBmp aObjBmp( aURL.GetMainURL() );
+ const SgaObjectBmp aObjBmp( aURL.GetMainURL( INetURLObject::NO_DECODE ) );
InsertObject( aObjBmp, nInsertPos );
}
}
@@ -1137,7 +1137,7 @@ BOOL GalleryTheme::InsertTransferable( const ::com::sun::star::uno::Reference< :
try
{
- Content aCnt( aURL.GetMainURL(), uno::Reference< XCommandEnvironment >() );
+ Content aCnt( aURL.GetMainURL( INetURLObject::NO_DECODE ), uno::Reference< XCommandEnvironment >() );
sal_Bool bFolder;
aCnt.getPropertyValue( OUString::createFromAscii( "IsFolder" ) ) >>= bFolder;
@@ -1269,27 +1269,27 @@ SvStream& GalleryTheme::WriteData( SvStream& rOStm ) const
}
else
{
- aPath = pObj->aURL.GetMainURL();
- bRel = ( ( aPath.Erase( aRelURL1.GetMainURL().Len() ) ) == aRelURL1.GetMainURL() );
+ aPath = pObj->aURL.GetMainURL( INetURLObject::NO_DECODE );
+ bRel = ( ( aPath.Erase( aRelURL1.GetMainURL( INetURLObject::NO_DECODE ).Len() ) ) == aRelURL1.GetMainURL( INetURLObject::NO_DECODE ) );
- if( bRel && ( pObj->aURL.GetMainURL().Len() > ( aRelURL1.GetMainURL().Len() + 1 ) ) )
+ if( bRel && ( pObj->aURL.GetMainURL( INetURLObject::NO_DECODE ).Len() > ( aRelURL1.GetMainURL( INetURLObject::NO_DECODE ).Len() + 1 ) ) )
{
- aPath = pObj->aURL.GetMainURL();
- aPath = aPath.Erase( 0, aRelURL1.GetMainURL().Len() );
+ aPath = pObj->aURL.GetMainURL( INetURLObject::NO_DECODE );
+ aPath = aPath.Erase( 0, aRelURL1.GetMainURL( INetURLObject::NO_DECODE ).Len() );
}
else
{
- aPath = pObj->aURL.GetMainURL();
+ aPath = pObj->aURL.GetMainURL( INetURLObject::NO_DECODE );
- bRel = ( ( aPath.Erase( aRelURL2.GetMainURL().Len() ) ) == aRelURL2.GetMainURL() );
+ bRel = ( ( aPath.Erase( aRelURL2.GetMainURL( INetURLObject::NO_DECODE ).Len() ) ) == aRelURL2.GetMainURL( INetURLObject::NO_DECODE ) );
- if( bRel && ( pObj->aURL.GetMainURL().Len() > ( aRelURL2.GetMainURL().Len() + 1 ) ) )
+ if( bRel && ( pObj->aURL.GetMainURL( INetURLObject::NO_DECODE ).Len() > ( aRelURL2.GetMainURL( INetURLObject::NO_DECODE ).Len() + 1 ) ) )
{
- aPath = pObj->aURL.GetMainURL();
- aPath = aPath.Erase( 0, aRelURL2.GetMainURL().Len() );
+ aPath = pObj->aURL.GetMainURL( INetURLObject::NO_DECODE );
+ aPath = aPath.Erase( 0, aRelURL2.GetMainURL( INetURLObject::NO_DECODE ).Len() );
}
else
- aPath = pObj->aURL.GetMainURL();
+ aPath = pObj->aURL.GetMainURL( INetURLObject::NO_DECODE );
}
}
@@ -1375,7 +1375,7 @@ SvStream& GalleryTheme::ReadData( SvStream& rIStm )
if( bRel )
{
aFileName.SearchAndReplaceAll( '\\', '/' );
- aPath = aRelURL1.GetMainURL();
+ aPath = aRelURL1.GetMainURL( INetURLObject::NO_DECODE );
if( aFileName.GetChar( 0 ) != '/' )
aPath += '/';
@@ -1386,7 +1386,7 @@ SvStream& GalleryTheme::ReadData( SvStream& rIStm )
if( !FileExists( pObj->aURL ) )
{
- aPath = aRelURL2.GetMainURL();
+ aPath = aRelURL2.GetMainURL( INetURLObject::NO_DECODE );
if( aFileName.GetChar( 0 ) != '/' )
aPath += '/';
generated by cgit (git 2.34.1) at 2025-03-15 18:36:29 +0000