diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-12-13 11:19:08 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-12-13 11:19:08 +0000 |
| commit | dfee7878af89b4929fbcd26919e28b4a928b912d (patch) | |
| tree | 224ed242319cc285ff85c26f91bee8adc424970d /svx | |
| parent | 9149f782ebf37101f36afff19172afd5c80a127c (diff) | |
INTEGRATION: CWS ineturl1 (1.30.32); FILE MERGED
2004/12/01 14:57:55 cmc 1.30.32.3: RESYNC: (1.31-1.32); FILE MERGED
2004/10/27 12:09:20 cmc 1.30.32.2: RESYNC: (1.30-1.31); FILE MERGED
2004/09/30 16:04:15 cmc 1.30.32.1: #i34006# modify INetURLObject to use rtl::OUString and rtl::OUStringBuffer
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/gallery2/galtheme.cxx | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx index f491ab958f..a5d0dff298 100644 --- a/svx/source/gallery2/galtheme.cxx +++ b/svx/source/gallery2/galtheme.cxx @@ -2,9 +2,9 @@ * * $RCSfile: galtheme.cxx,v $ * - * $Revision: 1.32 $ + * $Revision: 1.33 $ * - * last change: $Author: pjunck $ $Date: 2004-11-03 10:45:09 $ + * last change: $Author: hr $ $Date: 2004-12-13 12:19:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -794,7 +794,7 @@ GalleryThemeEntry* GalleryTheme::CreateThemeEntry( const INetURLObject& rURL, BO aPathURL.removeSegment(); aPathURL.removeFinalSlash(); pRet = new GalleryThemeEntry( aPathURL, aThemeName, - rURL.GetBase().Copy( 2, 6 ).ToInt32(), + String(rURL.GetBase()).Copy( 2, 6 ).ToInt32(), bReadOnly, FALSE, FALSE, nThemeId, bThemeNameFromResource ); } @@ -1401,23 +1401,22 @@ SvStream& GalleryTheme::WriteData( SvStream& rOStm ) const else { aPath = pObj->aURL.GetMainURL( INetURLObject::NO_DECODE ); - bRel = ( ( aPath.Erase( aRelURL1.GetMainURL( INetURLObject::NO_DECODE ).Len() ) ) == aRelURL1.GetMainURL( INetURLObject::NO_DECODE ) ); + bRel = ( ( aPath.Erase( aRelURL1.GetMainURL( INetURLObject::NO_DECODE ).getLength() ) ) == String(aRelURL1.GetMainURL( INetURLObject::NO_DECODE ) )); - if( bRel && ( pObj->aURL.GetMainURL( INetURLObject::NO_DECODE ).Len() > ( aRelURL1.GetMainURL( INetURLObject::NO_DECODE ).Len() + 1 ) ) ) + if( bRel && ( pObj->aURL.GetMainURL( INetURLObject::NO_DECODE ).getLength() > ( aRelURL1.GetMainURL( INetURLObject::NO_DECODE ).getLength() + 1 ) ) ) { aPath = pObj->aURL.GetMainURL( INetURLObject::NO_DECODE ); - aPath = aPath.Erase( 0, aRelURL1.GetMainURL( INetURLObject::NO_DECODE ).Len() ); + aPath = aPath.Erase( 0, aRelURL1.GetMainURL( INetURLObject::NO_DECODE ).getLength() ); } else { aPath = pObj->aURL.GetMainURL( INetURLObject::NO_DECODE ); + bRel = ( ( aPath.Erase( aRelURL2.GetMainURL( INetURLObject::NO_DECODE ).getLength() ) ) == String(aRelURL2.GetMainURL( INetURLObject::NO_DECODE ) )); - bRel = ( ( aPath.Erase( aRelURL2.GetMainURL( INetURLObject::NO_DECODE ).Len() ) ) == aRelURL2.GetMainURL( INetURLObject::NO_DECODE ) ); - - if( bRel && ( pObj->aURL.GetMainURL( INetURLObject::NO_DECODE ).Len() > ( aRelURL2.GetMainURL( INetURLObject::NO_DECODE ).Len() + 1 ) ) ) + if( bRel && ( pObj->aURL.GetMainURL( INetURLObject::NO_DECODE ).getLength() > ( aRelURL2.GetMainURL( INetURLObject::NO_DECODE ).getLength() + 1 ) ) ) { aPath = pObj->aURL.GetMainURL( INetURLObject::NO_DECODE ); - aPath = aPath.Erase( 0, aRelURL2.GetMainURL( INetURLObject::NO_DECODE ).Len() ); + aPath = aPath.Erase( 0, aRelURL2.GetMainURL( INetURLObject::NO_DECODE ).getLength() ); } else aPath = pObj->aURL.GetMainURL( INetURLObject::NO_DECODE ); |