diff options
author | Noel Grandin <noel@peralex.com> | 2013-09-18 15:50:00 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-09-19 10:14:24 +0200 |
commit | a2b86b5fb75925e7e8b24751f83e1ecc8584cf72 (patch) | |
tree | 3fbb39c90b6cd9207b8bdc1e1f590e06b56df742 /sd/source/ui/sidebar | |
parent | 0bfd0378f9615283ed0dd02eb719cd434e5de7ea (diff) |
convert the rest of the .cxx files in sd from String to OUString
Change-Id: I2f68a14baf707d7098b84c68b11a85cd28e49d95
Diffstat (limited to 'sd/source/ui/sidebar')
-rw-r--r-- | sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx | 8 | ||||
-rw-r--r-- | sd/source/ui/sidebar/DocumentHelper.cxx | 10 | ||||
-rw-r--r-- | sd/source/ui/sidebar/LayoutMenu.cxx | 4 |
3 files changed, 11 insertions, 11 deletions
diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx index a1ddbedf83b1..dfe4b7c5b073 100644 --- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx @@ -146,7 +146,7 @@ void CurrentMasterPagesSelector::Fill (ItemList& rItemList) continue; // Use the name of the master page to avoid duplicate entries. - String sName (pMasterPage->GetName()); + OUString sName (pMasterPage->GetName()); if (aMasterPageNames.find(sName)!=aMasterPageNames.end()) continue; aMasterPageNames.insert (sName); @@ -159,9 +159,9 @@ void CurrentMasterPagesSelector::Fill (ItemList& rItemList) SharedMasterPageDescriptor pDescriptor (new MasterPageDescriptor( MasterPageContainer::MASTERPAGE, nIndex, - String(), + OUString(), pMasterPage->GetName(), - String(), + OUString(), pMasterPage->IsPrecious(), ::boost::shared_ptr<PageObjectProvider>(new ExistingPageProvider(pMasterPage)), ::boost::shared_ptr<PreviewProvider>(new PagePreviewProvider()))); @@ -221,7 +221,7 @@ void CurrentMasterPagesSelector::UpdateSelection (void) sal_uInt16 nItemCount (PreviewValueSet::GetItemCount()); for (nIndex=1; nIndex<=nItemCount && bLoop; nIndex++) { - String sName (PreviewValueSet::GetItemText (nIndex)); + OUString sName (PreviewValueSet::GetItemText (nIndex)); if (aNames.find(sName) != aNames.end()) { PreviewValueSet::SelectItem (nIndex); diff --git a/sd/source/ui/sidebar/DocumentHelper.cxx b/sd/source/ui/sidebar/DocumentHelper.cxx index d386841c2431..5e3651e4c514 100644 --- a/sd/source/ui/sidebar/DocumentHelper.cxx +++ b/sd/source/ui/sidebar/DocumentHelper.cxx @@ -262,8 +262,8 @@ void DocumentHelper::ProvideStyles ( SdPage* pPage) { // Get the layout name of the given page. - String sLayoutName (pPage->GetLayoutName()); - sLayoutName.Erase (sLayoutName.SearchAscii (SD_LT_SEPARATOR)); + OUString sLayoutName (pPage->GetLayoutName()); + sLayoutName = sLayoutName.copy(0, sLayoutName.indexOf(SD_LT_SEPARATOR)); // Copy the style sheet from source to target document. SdStyleSheetPool* pSourceStyleSheetPool = @@ -306,8 +306,8 @@ void DocumentHelper::AssignMasterPageToPageList ( // Make the layout name by stripping ouf the layout postfix from the // layout name of the given master page. OUString sFullLayoutName(pMasterPage->GetLayoutName()); - String sBaseLayoutName (sFullLayoutName); - sBaseLayoutName.Erase (sBaseLayoutName.SearchAscii (SD_LT_SEPARATOR)); + OUString sBaseLayoutName (sFullLayoutName); + sBaseLayoutName = sBaseLayoutName.copy(0, sBaseLayoutName.indexOf(SD_LT_SEPARATOR)); if (rpPageList->empty()) return; @@ -329,7 +329,7 @@ void DocumentHelper::AssignMasterPageToPageList ( ::svl::IUndoManager* pUndoMgr = rTargetDocument.GetDocSh()->GetUndoManager(); if( pUndoMgr ) - pUndoMgr->EnterListAction(SD_RESSTR(STR_UNDO_SET_PRESLAYOUT), String()); + pUndoMgr->EnterListAction(SD_RESSTR(STR_UNDO_SET_PRESLAYOUT), OUString()); SdPage* pMasterPageInDocument = ProvideMasterPage(rTargetDocument,pMasterPage,rpPageList); if (pMasterPageInDocument == NULL) diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx index bf392dbe3562..be13bda0fdeb 100644 --- a/sd/source/ui/sidebar/LayoutMenu.cxx +++ b/sd/source/ui/sidebar/LayoutMenu.cxx @@ -583,7 +583,7 @@ SfxRequest LayoutMenu::CreateRequest ( SetOfByte aVisibleLayers (pPage->TRG_GetMasterPageVisibleLayers()); aRequest.AppendItem( - SfxStringItem (ID_VAL_PAGENAME, String()));//pPage->GetName())); + SfxStringItem (ID_VAL_PAGENAME, OUString()));//pPage->GetName())); aRequest.AppendItem(SfxUInt32Item (ID_VAL_WHATLAYOUT, aLayout)); aRequest.AppendItem( SfxBoolItem(ID_VAL_ISPAGEBACK, aVisibleLayers.IsSet(aBackground))); @@ -654,7 +654,7 @@ void LayoutMenu::Fill (void) if (bRightToLeft && (WritingMode_TB_RL != pInfo->meWritingMode)) aBmp.Mirror (BMP_MIRROR_HORZ); - InsertItem (i, aBmp, String (SdResId (pInfo->mnStrResId))); + InsertItem (i, aBmp, SdResId (pInfo->mnStrResId)); SetItemData (i, new AutoLayout(pInfo->maAutoLayout)); n++; } |