diff options
| author | Ivan Timofeev <timofeev.i.s@gmail.com> | 2013-08-11 21:13:38 +0400 |
|---|---|---|
| committer | Ivan Timofeev <timofeev.i.s@gmail.com> | 2013-08-11 21:53:59 +0400 |
| commit | de973a371c64ef796956d67fd18e4a62a451abc8 (patch) | |
| tree | 190afc47d64d64c58afd36c6e2fa9bd80acdea56 /sd/source/ui/view/drviewsb.cxx | |
| parent | 4fa7e7f563e37deabab26c981d1facde6bc537c0 (diff) | |
String->OUString
Change-Id: I98aae013433adb644d289b5d15625dcce824916e
Diffstat (limited to 'sd/source/ui/view/drviewsb.cxx')
| -rw-r--r-- | sd/source/ui/view/drviewsb.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sd/source/ui/view/drviewsb.cxx b/sd/source/ui/view/drviewsb.cxx index 5280912d142e..e2e402f7544c 100644 --- a/sd/source/ui/view/drviewsb.cxx +++ b/sd/source/ui/view/drviewsb.cxx @@ -65,7 +65,7 @@ namespace sd { -bool DrawViewShell::RenameSlide( sal_uInt16 nPageId, const String & rName ) +bool DrawViewShell::RenameSlide( sal_uInt16 nPageId, const OUString & rName ) { sal_Bool bOutDummy; if( GetDoc()->GetPageByName( rName, bOutDummy ) != SDRPAGE_NOTFOUND ) @@ -81,8 +81,8 @@ bool DrawViewShell::RenameSlide( sal_uInt16 nPageId, const String & rName ) // Undo SdPage* pUndoPage = pPageToRename; SdrLayerAdmin & rLayerAdmin = GetDoc()->GetLayerAdmin(); - sal_uInt8 nBackground = rLayerAdmin.GetLayerID( String( SdResId( STR_LAYER_BCKGRND )), sal_False ); - sal_uInt8 nBgObj = rLayerAdmin.GetLayerID( String( SdResId( STR_LAYER_BCKGRNDOBJ )), sal_False ); + sal_uInt8 nBackground = rLayerAdmin.GetLayerID( SD_RESSTR(STR_LAYER_BCKGRND), sal_False ); + sal_uInt8 nBgObj = rLayerAdmin.GetLayerID( SD_RESSTR(STR_LAYER_BCKGRNDOBJ), sal_False ); SetOfByte aVisibleLayers = mpActualPage->TRG_GetMasterPageVisibleLayers(); ::svl::IUndoManager* pManager = GetDoc()->GetDocSh()->GetUndoManager(); @@ -109,7 +109,7 @@ bool DrawViewShell::RenameSlide( sal_uInt16 nPageId, const String & rName ) GetDoc()->RenameLayoutTemplate( pPageToRename->GetLayoutName(), rName ); } - bool bSuccess = ( sal_False != rName.Equals( pPageToRename->GetName())); + bool bSuccess = (rName == pPageToRename->GetName()); if( bSuccess ) { @@ -159,9 +159,9 @@ IMPL_LINK( DrawViewShell, RenameSlideHdl, AbstractSvxNameDialog*, pDialog ) void DrawViewShell::ModifyLayer ( SdrLayer* pLayer, - const String& rLayerName, - const String& rLayerTitle, - const String& rLayerDesc, + const OUString& rLayerName, + const OUString& rLayerTitle, + const OUString& rLayerDesc, bool bIsVisible, bool bIsLocked, bool bIsPrintable) |