strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

#89545#: GetMainURL changes (no default parameter anymore)

Browse source
This commit is contained in:
Kai Ahrens 2001-07-30 14:31:39 +00:00
parent 00d0779cd5
commit 1ecc896528
6 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sd/source/core/anminfo.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: anminfo.cxx,v $
*
* $Revision: 1.2 $
* $Revision: 1.3 $
*
* last change: $Author: ka $ $Date: 2000-11-10 16:41:38 $
* last change: $Author: ka $ $Date: 2001-07-30 15:27:14 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -323,7 +323,7 @@ void SdAnimationInfo::ReadData(SvStream& rIn)
INetURLObject aURLObj(::URIHelper::SmartRelToAbs( aSoundFileRel, FALSE,
INetURLObject::WAS_ENCODED,
INetURLObject::DECODE_UNAMBIGUOUS ));
aSoundFile = aURLObj.GetMainURL();
aSoundFile = aURLObj.GetMainURL( INetURLObject::NO_DECODE );
}
// ab hier werden Daten der Versionen > 1 eingelesen
@ -363,7 +363,7 @@ void SdAnimationInfo::ReadData(SvStream& rIn)
INetURLObject aURLObj(::URIHelper::SmartRelToAbs(aBookmarkRel, FALSE,
INetURLObject::WAS_ENCODED,
INetURLObject::DECODE_UNAMBIGUOUS));
aBookmark = aURLObj.GetMainURL();
aBookmark = aURLObj.GetMainURL( INetURLObject::NO_DECODE );
}
else
rIn.ReadByteString( aBookmark, eTextEnc );
@ -373,7 +373,7 @@ void SdAnimationInfo::ReadData(SvStream& rIn)
INetURLObject aURLObjSound(::URIHelper::SmartRelToAbs(aSecondSoundFileRel, FALSE,
INetURLObject::WAS_ENCODED,
INetURLObject::DECODE_UNAMBIGUOUS));
aSecondSoundFile = aURLObjSound.GetMainURL();
aSecondSoundFile = aURLObjSound.GetMainURL( INetURLObject::NO_DECODE );
rIn >> nTemp; bInvisibleInPresentation = (BOOL)nTemp;
rIn >> nTemp; nVerb = (USHORT)nTemp;

8
sd/source/core/sdpage2.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: sdpage2.cxx,v $
*
* $Revision: 1.7 $
* $Revision: 1.8 $
*
* last change: $Author: thb $ $Date: 2001-04-26 17:11:08 $
* last change: $Author: ka $ $Date: 2001-07-30 15:27:14 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -542,7 +542,7 @@ void __EXPORT SdPage::ReadData(const SdrIOHeader& rHead, SvStream& rIn)
INetURLObject aURLObj(::URIHelper::SmartRelToAbs(aSoundFileRel, FALSE,
INetURLObject::WAS_ENCODED,
INetURLObject::DECODE_UNAMBIGUOUS));
aSoundFile = aURLObj.GetMainURL();
aSoundFile = aURLObj.GetMainURL( INetURLObject::NO_DECODE );
}
// ab hier werden Daten der Versionen >=4 eingelesen
@ -553,7 +553,7 @@ void __EXPORT SdPage::ReadData(const SdrIOHeader& rHead, SvStream& rIn)
INetURLObject aURLObj(::URIHelper::SmartRelToAbs(aFileNameRel, FALSE,
INetURLObject::WAS_ENCODED,
INetURLObject::DECODE_UNAMBIGUOUS));
aFileName = aURLObj.GetMainURL();
aFileName = aURLObj.GetMainURL( INetURLObject::NO_DECODE );
rIn.ReadByteString( aBookmarkName );
}

6
sd/source/filter/cgm/sdcgmfilter.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: sdcgmfilter.cxx,v $
*
* $Revision: 1.1 $
* $Revision: 1.2 $
*
* last change: $Author: ka $ $Date: 2001-02-13 12:07:34 $
* last change: $Author: ka $ $Date: 2001-07-30 15:30:27 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -126,7 +126,7 @@ sal_Bool SdCGMFilter::Import()
if( pLibrary && mxModel.is() )
{
ImportCGM FncImportCGM = ( ImportCGM ) pLibrary->getSymbol( ::rtl::OUString::createFromAscii( "ImportCGM" ) );
::rtl::OUString aFileURL( mrMedium.GetURLObject().GetMainURL() );
::rtl::OUString aFileURL( mrMedium.GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) );
UINT32 nRetValue;
if( mrDocument.GetPageCount() == 0L )

6
sd/source/filter/grf/sdgrffilter.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: sdgrffilter.cxx,v $
*
* $Revision: 1.1 $
* $Revision: 1.2 $
*
* last change: $Author: ka $ $Date: 2001-02-13 12:08:24 $
* last change: $Author: ka $ $Date: 2001-07-30 15:30:55 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -148,7 +148,7 @@ sal_Bool SdGRFFilter::Import()
{
Graphic aGraphic;
const String aName( mrMedium.GetFilter()->GetName() );
const String aFileName( mrMedium.GetURLObject().GetMainURL() );
const String aFileName( mrMedium.GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) );
GraphicFilter* pGraphicFilter = GetGrfFilter();
const USHORT nFilter = pGraphicFilter->GetImportFormatNumber( aName );
sal_Bool bRet = sal_False;

10
sd/source/filter/pptin.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: pptin.cxx,v $
*
* $Revision: 1.29 $
* $Revision: 1.30 $
*
* last change: $Author: sj $ $Date: 2001-06-28 14:58:59 $
* last change: $Author: ka $ $Date: 2001-07-30 15:29:52 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -1631,7 +1631,7 @@ String SdPPTImport::ReadSound(UINT32 nSoundRef) const
UINT8* pBuf = new UINT8[ nSoundLen ];
rStCtrl.Read( pBuf, nSoundLen );
SvStream* pOStm = ::utl::UcbStreamHelper::CreateStream( aGalleryUserSound.GetMainURL(), STREAM_WRITE | STREAM_TRUNC );
SvStream* pOStm = ::utl::UcbStreamHelper::CreateStream( aGalleryUserSound.GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE | STREAM_TRUNC );
if( pOStm )
{
@ -1639,8 +1639,8 @@ String SdPPTImport::ReadSound(UINT32 nSoundRef) const
if( pOStm->GetError() == ERRCODE_NONE )
{
GalleryExplorer::InsertURL( GALLERY_THEME_USERSOUNDS, aGalleryUserSound.GetMainURL() );
aRetval = aGalleryUserSound.GetMainURL();
GalleryExplorer::InsertURL( GALLERY_THEME_USERSOUNDS, aGalleryUserSound.GetMainURL( INetURLObject::NO_DECODE ) );
aRetval = aGalleryUserSound.GetMainURL( INetURLObject::NO_DECODE );
}
delete pOStm;

6
sd/source/ui/app/sdmod.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: sdmod.cxx,v $
*
* $Revision: 1.9 $
* $Revision: 1.10 $
*
* last change: $Author: ka $ $Date: 2001-06-19 15:04:53 $
* last change: $Author: ka $ $Date: 2001-07-30 15:31:39 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -333,7 +333,7 @@ SvStorageStreamRef SdModule::GetOptionStream( const String& rOptionName,
aURL.Append( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "drawing.cfg" ) ) );
SvStream* pStm = ::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL(), STREAM_READWRITE );
SvStream* pStm = ::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READWRITE );
if( pStm )
xOptionStorage = new SvStorage( pStm, TRUE );