diff options
author | Ivan Timofeev <timofeev.i.s@gmail.com> | 2013-08-10 21:37:06 +0400 |
---|---|---|
committer | Ivan Timofeev <timofeev.i.s@gmail.com> | 2013-08-10 21:37:34 +0400 |
commit | d4ba5995a168a8999734252fe6e9240bde1b7dae (patch) | |
tree | 52aa47b71fcfb9f51a42861d053f78f3560264f6 /sd | |
parent | 8cb156a67b987981efbda3640e503d601c40d88b (diff) |
String->OUString
Change-Id: Ic908590642bac656db78a965c2176d6f53c8d6f4
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/ui/view/DocumentRenderer.cxx | 49 | ||||
-rw-r--r-- | sd/source/ui/view/GraphicObjectBar.cxx | 6 | ||||
-rw-r--r-- | sd/source/ui/view/MediaObjectBar.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/view/Outliner.cxx | 25 | ||||
-rw-r--r-- | sd/source/ui/view/ViewClipboard.cxx | 14 | ||||
-rw-r--r-- | sd/source/ui/view/ViewShellBase.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/view/ViewShellImplementation.cxx | 14 | ||||
-rw-r--r-- | sd/source/ui/view/drbezob.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/view/drtxtob.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/view/drtxtob1.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/view/drviews1.cxx | 32 | ||||
-rw-r--r-- | sd/source/ui/view/drviews2.cxx | 100 |
12 files changed, 122 insertions, 130 deletions
diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx index a2775343344e..51b0a450b86d 100644 --- a/sd/source/ui/view/DocumentRenderer.cxx +++ b/sd/source/ui/view/DocumentRenderer.cxx @@ -194,10 +194,7 @@ namespace { OUString GetPrinterSelection (sal_Int32 nPageCount, sal_Int32 nCurrentPageIndex) const { sal_Int32 nContent = static_cast<sal_Int32>(mrProperties.getIntValue( "PrintContent", 0 )); - OUString sFullRange = OUStringBuffer() - .append(static_cast<sal_Int32>(1)) - .append(static_cast<sal_Unicode>('-')) - .append(nPageCount).makeStringAndClear(); + OUString sFullRange = "1-" + OUString::number(nPageCount); if (nContent == 0) // all pages/slides { @@ -404,9 +401,9 @@ namespace { maProperties.push_back(aOptionsUIFile); SvtModuleOptions aOpt; - String aAppGroupname( String( SdResId( _STR_IMPRESS_PRINT_UI_GROUP_NAME ) ) ); - aAppGroupname.SearchAndReplace( String( "%s" ), - aOpt.GetModuleName( mbImpress ? SvtModuleOptions::E_SIMPRESS : SvtModuleOptions::E_SDRAW ) ); + OUString aAppGroupname(SD_RESSTR(_STR_IMPRESS_PRINT_UI_GROUP_NAME)); + aAppGroupname = aAppGroupname.replaceFirst("%s", aOpt.GetModuleName( + mbImpress ? SvtModuleOptions::E_SIMPRESS : SvtModuleOptions::E_SDRAW)); AddDialogControl(vcl::PrinterOptionsHelper::setGroupControlOpt("tabcontrol-page2", aAppGroupname, ".HelpID:vcl:PrintDialog:TabPage:AppPage")); uno::Sequence< OUString > aHelpIds, aWidgetIds; @@ -415,7 +412,7 @@ namespace { vcl::PrinterOptionsHelper::UIControlOptions aPrintOpt; aPrintOpt.maGroupHint = "JobPage" ; AddDialogControl( vcl::PrinterOptionsHelper::setSubgroupControlOpt("extraimpressprintoptions", - String( SdResId(_STR_IMPRESS_PRINT_UI_PRINT_GROUP) ), + SD_RESSTR(_STR_IMPRESS_PRINT_UI_PRINT_GROUP), "", aPrintOpt )); @@ -423,7 +420,7 @@ namespace { aHelpIds[0] = ".HelpID:vcl:PrintDialog:PageContentType:ListBox" ; AddDialogControl( vcl::PrinterOptionsHelper::setChoiceListControlOpt( "impressdocument", - String( SdResId( _STR_IMPRESS_PRINT_UI_CONTENT ) ), + SD_RESSTR(_STR_IMPRESS_PRINT_UI_CONTENT), aHelpIds, "PageContentType" , CreateChoice(_STR_IMPRESS_PRINT_UI_CONTENT_CHOICES), @@ -434,7 +431,7 @@ namespace { vcl::PrinterOptionsHelper::UIControlOptions aContentOpt( "PageContentType" , 1 ); AddDialogControl( vcl::PrinterOptionsHelper::setChoiceListControlOpt( "slidesperpage", - String( SdResId( _STR_IMPRESS_PRINT_UI_SLIDESPERPAGE ) ), + SD_RESSTR(_STR_IMPRESS_PRINT_UI_SLIDESPERPAGE), aHelpIds, "SlidesPerPage" , GetSlidesPerPageSequence(), @@ -448,7 +445,7 @@ namespace { vcl::PrinterOptionsHelper::UIControlOptions aSlidesPerPageOpt( "SlidesPerPage" , -1, sal_True ); AddDialogControl( vcl::PrinterOptionsHelper::setChoiceListControlOpt( "slidesperpageorder", - String( SdResId( _STR_IMPRESS_PRINT_UI_ORDER ) ), + SD_RESSTR(_STR_IMPRESS_PRINT_UI_ORDER), aHelpIds, "SlidesPerPageOrder" , CreateChoice(_STR_IMPRESS_PRINT_UI_ORDER_CHOICES), @@ -459,13 +456,13 @@ namespace { } AddDialogControl( vcl::PrinterOptionsHelper::setSubgroupControlOpt("contents", - String( SdResId(_STR_IMPRESS_PRINT_UI_INCLUDE_CONTENT) ), "" ) ); + SD_RESSTR(_STR_IMPRESS_PRINT_UI_INCLUDE_CONTENT), "" ) ); if( mbImpress ) { AddDialogControl( vcl::PrinterOptionsHelper::setBoolControlOpt("printname", - String( SdResId(_STR_IMPRESS_PRINT_UI_IS_PRINT_NAME) ), + SD_RESSTR(_STR_IMPRESS_PRINT_UI_IS_PRINT_NAME), ".HelpID:vcl:PrintDialog:IsPrintName:CheckBox" , "IsPrintName" , sal_False @@ -475,7 +472,7 @@ namespace { else { AddDialogControl( vcl::PrinterOptionsHelper::setBoolControlOpt("printname", - String( SdResId(_STR_DRAW_PRINT_UI_IS_PRINT_NAME) ), + SD_RESSTR(_STR_DRAW_PRINT_UI_IS_PRINT_NAME), ".HelpID:vcl:PrintDialog:IsPrintName:CheckBox" , "IsPrintName" , sal_False @@ -484,7 +481,7 @@ namespace { } AddDialogControl( vcl::PrinterOptionsHelper::setBoolControlOpt("printdatetime", - String( SdResId(_STR_IMPRESS_PRINT_UI_IS_PRINT_DATE) ), + SD_RESSTR(_STR_IMPRESS_PRINT_UI_IS_PRINT_DATE), ".HelpID:vcl:PrintDialog:IsPrintDateTime:CheckBox" , "IsPrintDateTime" , sal_False @@ -494,7 +491,7 @@ namespace { if( mbImpress ) { AddDialogControl( vcl::PrinterOptionsHelper::setBoolControlOpt("printhidden", - String( SdResId(_STR_IMPRESS_PRINT_UI_IS_PRINT_HIDDEN) ), + SD_RESSTR(_STR_IMPRESS_PRINT_UI_IS_PRINT_HIDDEN), ".HelpID:vcl:PrintDialog:IsPrintHidden:CheckBox" , "IsPrintHidden" , sal_False @@ -503,7 +500,7 @@ namespace { } AddDialogControl( vcl::PrinterOptionsHelper::setSubgroupControlOpt("color", - String( SdResId(_STR_IMPRESS_PRINT_UI_QUALITY) ), "" ) ); + SD_RESSTR(_STR_IMPRESS_PRINT_UI_QUALITY), "" ) ); aHelpIds.realloc( 3 ); aHelpIds[0] = ".HelpID:vcl:PrintDialog:Quality:RadioButton:0" ; @@ -523,7 +520,7 @@ namespace { ); AddDialogControl( vcl::PrinterOptionsHelper::setSubgroupControlOpt("pagesizes", - String( SdResId(_STR_IMPRESS_PRINT_UI_PAGE_OPTIONS) ), "" ) ); + SD_RESSTR(_STR_IMPRESS_PRINT_UI_PAGE_OPTIONS), "" ) ); aHelpIds.realloc( 4 ); aHelpIds[0] = ".HelpID:vcl:PrintDialog:PageOptions:RadioButton:0" ; @@ -570,12 +567,12 @@ namespace { vcl::PrinterOptionsHelper::UIControlOptions aBrochureOpt; aBrochureOpt.maGroupHint = "LayoutPage" ; AddDialogControl( vcl::PrinterOptionsHelper::setSubgroupControlOpt("pagesides", - String( SdResId(_STR_IMPRESS_PRINT_UI_PAGE_SIDES) ), "", + SD_RESSTR(_STR_IMPRESS_PRINT_UI_PAGE_SIDES), "", aBrochureOpt ) ); // brochure printing AddDialogControl( vcl::PrinterOptionsHelper::setBoolControlOpt("brochure", - String( SdResId(_STR_IMPRESS_PRINT_UI_BROCHURE) ), + SD_RESSTR(_STR_IMPRESS_PRINT_UI_BROCHURE), ".HelpID:vcl:PrintDialog:PrintProspect:CheckBox" , "PrintProspect" , sal_False, @@ -590,7 +587,7 @@ namespace { aHelpIds[0] = ".HelpID:vcl:PrintDialog:PrintProspectInclude:ListBox" ; AddDialogControl( vcl::PrinterOptionsHelper::setChoiceListControlOpt( "brochureinclude", - String( SdResId(_STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE) ), + SD_RESSTR(_STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE), aHelpIds, "PrintProspectInclude" , CreateChoice(_STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE_LIST), @@ -604,7 +601,7 @@ namespace { vcl::PrinterOptionsHelper::UIControlOptions aPaperTrayOpt; aPaperTrayOpt.maGroupHint = "OptionsPageOptGroup" ; AddDialogControl( vcl::PrinterOptionsHelper::setBoolControlOpt("printpaperfromsetup", - String( SdResId(_STR_IMPRESS_PRINT_UI_PAPER_TRAY) ), + SD_RESSTR(_STR_IMPRESS_PRINT_UI_PAPER_TRAY), ".HelpID:vcl:PrintDialog:PrintPaperFromSetup:CheckBox" , "PrintPaperFromSetup" , sal_False, @@ -616,7 +613,7 @@ namespace { aPrintRangeOpt.mbInternalOnly = sal_True; aPrintRangeOpt.maGroupHint = "PrintRange" ; AddDialogControl( vcl::PrinterOptionsHelper::setSubgroupControlOpt("printrange", - String( SdResId( _STR_IMPRESS_PRINT_UI_PAGE_RANGE ) ), + SD_RESSTR(_STR_IMPRESS_PRINT_UI_PAGE_RANGE), "", aPrintRangeOpt ) ); @@ -1364,7 +1361,7 @@ public: WarningBox aWarnBox( pViewShell->GetActiveWindow(), (WinBits)(WB_OK_CANCEL | WB_DEF_CANCEL), - String(SdResId(STR_WARN_PRINTFORMAT_FAILURE))); + SD_RESSTR(STR_WARN_PRINTFORMAT_FAILURE)); if (aWarnBox.Execute() != RET_OK) return; } @@ -1616,7 +1613,7 @@ private: SdrPathObj* pPathObj = new SdrPathObj(OBJ_PATHLINE, aPathPoly ); pPathObj->SetMergedItem(XLineStyleItem(XLINE_SOLID)); - pPathObj->SetMergedItem(XLineColorItem(String(), Color(COL_BLACK))); + pPathObj->SetMergedItem(XLineColorItem(OUString(), Color(COL_BLACK))); pHandout->NbcInsertObject( pPathObj ); } @@ -1729,7 +1726,7 @@ private: pOutliner->AddText(*(pTextObj->GetOutlinerParaObject())); } else - pOutliner->Insert(String()); + pOutliner->Insert(OUString()); pTextObj = NULL; nObj = 0; diff --git a/sd/source/ui/view/GraphicObjectBar.cxx b/sd/source/ui/view/GraphicObjectBar.cxx index aed500bef3c6..64bf53da46ba 100644 --- a/sd/source/ui/view/GraphicObjectBar.cxx +++ b/sd/source/ui/view/GraphicObjectBar.cxx @@ -154,10 +154,8 @@ void GraphicObjectBar::ExecuteFilter( SfxRequest& rReq ) if( pPageView ) { SdrGrafObj* pFilteredObj = (SdrGrafObj*) pObj->Clone(); - String aStr( mpView->GetDescriptionOfMarkedObjects() ); - - aStr.Append( sal_Unicode(' ') ); - aStr.Append( String( SdResId( STR_UNDO_GRAFFILTER ) ) ); + OUString aStr = mpView->GetDescriptionOfMarkedObjects(); + aStr += " " + SD_RESSTR(STR_UNDO_GRAFFILTER); mpView->BegUndo( aStr ); pFilteredObj->SetGraphicObject( aFilterObj ); ::sd::View* const pView = mpView; diff --git a/sd/source/ui/view/MediaObjectBar.cxx b/sd/source/ui/view/MediaObjectBar.cxx index 677ee50e88ec..4fed915dd9da 100644 --- a/sd/source/ui/view/MediaObjectBar.cxx +++ b/sd/source/ui/view/MediaObjectBar.cxx @@ -73,7 +73,7 @@ MediaObjectBar::MediaObjectBar( ViewShell* pSdViewShell, ::sd::View* pSdView ) : SetUndoManager( pDocShell->GetUndoManager() ); SetRepeatTarget( mpView ); SetHelpId( SD_IF_SDDRAWMEDIAOBJECTBAR ); - SetName( String( SdResId( RID_DRAW_MEDIA_TOOLBOX ) ) ); + SetName(SD_RESSTR(RID_DRAW_MEDIA_TOOLBOX)); } // ----------------------------------------------------------------------------- diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx index 26a92fe0bbc8..00551dfc1aa2 100644 --- a/sd/source/ui/view/Outliner.cxx +++ b/sd/source/ui/view/Outliner.cxx @@ -768,7 +768,7 @@ void Outliner::DetectChange (void) pOutlinerView->SetOutputArea( Rectangle( Point(), Size(1, 1) ) ); if (meMode == SPELL) SetPaperSize( Size(1, 1) ); - SetText( String(), GetParagraph( 0 ) ); + SetText(OUString(), GetParagraph(0)); RememberStartPosition (); @@ -980,7 +980,7 @@ void Outliner::ProvideNextTextObject (void) pOutlinerView->SetOutputArea( Rectangle( Point(), Size(1, 1) ) ); if (meMode == SPELL) SetPaperSize( Size(1, 1) ); - SetText( String(), GetParagraph( 0 ) ); + SetText(OUString(), GetParagraph(0)); mpTextObj = NULL; @@ -1084,20 +1084,20 @@ void Outliner::EndOfSearch (void) void Outliner::ShowEndOfSearchDialog (void) { - String aString; + OUString aString; if (meMode == SEARCH) { if (mbStringFound) - aString = String( SdResId(STR_END_SEARCHING) ); + aString = SD_RESSTR(STR_END_SEARCHING); else - aString = String( SdResId(STR_STRING_NOTFOUND) ); + aString = SD_RESSTR(STR_STRING_NOTFOUND); } else { if (mpView->AreObjectsMarked()) - aString = String(SdResId(STR_END_SPELLING_OBJ)); + aString = SD_RESSTR(STR_END_SPELLING_OBJ); else - aString = String(SdResId(STR_END_SPELLING)); + aString = SD_RESSTR(STR_END_SPELLING); } // Show the message in an info box that is modal with respect to the @@ -1148,7 +1148,7 @@ bool Outliner::ShowWrapArroundDialog (void) QueryBox aQuestionBox ( NULL, WB_YES_NO | WB_DEF_YES, - String(SdResId(nStringId))); + SD_RESSTR(nStringId)); aQuestionBox.SetImage (QueryBox::GetStandardImage()); sal_uInt16 nBoxResult = ShowModalMessageBox(aQuestionBox); bDoWrapArround = (nBoxResult == RET_YES); @@ -1204,7 +1204,7 @@ void Outliner::PrepareSpellCheck (void) mbEndOfSearch = sal_True; ErrorBox aErrorBox (NULL, WB_OK, - String(SdResId(STR_NOLANGUAGE))); + SD_RESSTR(STR_NOLANGUAGE)); ShowModalMessageBox (aErrorBox); } else if (eState != EE_SPELL_OK) @@ -1381,7 +1381,7 @@ void Outliner::EnterEditMode (sal_Bool bGrabFocus) IMPL_LINK_INLINE_START( Outliner, SpellError, void *, nLang ) { mbError = true; - String aError( SvtLanguageTable::GetLanguageString( (LanguageType)(sal_uLong)nLang ) ); + OUString aError( SvtLanguageTable::GetLanguageString( (LanguageType)(sal_uLong)nLang ) ); ErrorHandler::HandleError(* new StringErrorInfo( ERRCODE_SVX_LINGU_LANGUAGENOTEXISTS, aError) ); return 0; @@ -1447,8 +1447,7 @@ bool Outliner::HandleFailedSearch (void) if (HasNoPreviousMatch ()) { // No match found in the whole presentation. Tell the user. - InfoBox aInfoBox (NULL, - String(SdResId(STR_SAR_NOT_FOUND))); + InfoBox aInfoBox (NULL, SD_RESSTR(STR_SAR_NOT_FOUND)); ShowModalMessageBox (aInfoBox); } @@ -1788,7 +1787,7 @@ void Outliner::Implementation::ProvideOutlinerView ( rOutliner.SetUpdateMode(sal_False); mpOutlineView->SetOutputArea (Rectangle (Point(), Size(1, 1))); rOutliner.SetPaperSize( Size(1, 1) ); - rOutliner.SetText( String(), rOutliner.GetParagraph( 0 ) ); + rOutliner.SetText(OUString(), rOutliner.GetParagraph(0)); meOriginalEditMode = ::boost::static_pointer_cast<DrawViewShell>(rpViewShell)->GetEditMode(); diff --git a/sd/source/ui/view/ViewClipboard.cxx b/sd/source/ui/view/ViewClipboard.cxx index 4b2691d55566..f7aea48e6b83 100644 --- a/sd/source/ui/view/ViewClipboard.cxx +++ b/sd/source/ui/view/ViewClipboard.cxx @@ -90,7 +90,7 @@ SdPage* ViewClipboard::GetFirstMasterPage (const SdTransferable& rTransferable) std::vector<OUString>::const_iterator pIter; for ( pIter = rBookmarks.begin(); pIter != rBookmarks.end(); ++pIter ) { - String sName (*pIter); + OUString sName (*pIter); sal_Bool bIsMasterPage; // SdPage* GetMasterSdPage(sal_uInt16 nPgNum, PageKind ePgKind); @@ -154,13 +154,11 @@ void ViewClipboard::AssignMasterPage ( // We have to remove the layout suffix from the layout name which is // appended again by SetMasterPage() to the given name. Don't ask. - String sLayoutSuffix (SD_LT_SEPARATOR); - sLayoutSuffix.Append (SdResId(STR_LAYOUT_OUTLINE)); - sal_uInt16 nLength = sLayoutSuffix.Len(); - String sLayoutName (pMasterPage->GetLayoutName()); - if (String(sLayoutName, sLayoutName.Len()-nLength, nLength).Equals ( - sLayoutSuffix)) - sLayoutName = String(sLayoutName, 0, sLayoutName.Len()-nLength); + OUString sLayoutSuffix = SD_LT_SEPARATOR + SD_RESSTR(STR_LAYOUT_OUTLINE); + sal_Int32 nLength = sLayoutSuffix.getLength(); + OUString sLayoutName = pMasterPage->GetLayoutName(); + if (sLayoutName.endsWith(sLayoutSuffix)) + sLayoutName = sLayoutName.copy(0, sLayoutName.getLength() - nLength); rDocument.SetMasterPage ( pPage->GetPageNum() / 2, diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index b1e671fad3b4..a069311e4fa1 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -590,7 +590,7 @@ sal_uInt16 ViewShellBase::SetPrinter ( WarningBox aWarnBox ( GetWindow(), (WinBits)(WB_YES_NO | WB_DEF_YES), - String(SdResId(STR_SCALE_OBJS_TO_PAGE))); + SD_RESSTR(STR_SCALE_OBJS_TO_PAGE)); bScaleAll = (aWarnBox.Execute() == RET_YES); } diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx index 1feabbc4101c..8fdcb847fd60 100644 --- a/sd/source/ui/view/ViewShellImplementation.cxx +++ b/sd/source/ui/view/ViewShellImplementation.cxx @@ -99,12 +99,12 @@ void ViewShell::Implementation::ProcessModifyPageSlot ( { SdDrawDocument* pDocument = mrViewShell.GetDoc(); SdrLayerAdmin& rLayerAdmin = pDocument->GetLayerAdmin(); - sal_uInt8 aBckgrnd = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRND)), sal_False); - sal_uInt8 aBckgrndObj = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), sal_False); + sal_uInt8 aBckgrnd = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), sal_False); + sal_uInt8 aBckgrndObj = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), sal_False); SetOfByte aVisibleLayers; sal_Bool bHandoutMode = sal_False; SdPage* pHandoutMPage = NULL; - String aNewName; + OUString aNewName; AutoLayout aNewAutoLayout; @@ -222,8 +222,8 @@ void ViewShell::Implementation::ProcessModifyPageSlot ( pCurrentPage->SetAutoLayout(aNewAutoLayout, sal_True); - aBckgrnd = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRND)), sal_False); - aBckgrndObj = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), sal_False); + aBckgrnd = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), sal_False); + aBckgrndObj = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), sal_False); aVisibleLayers.Set(aBckgrnd, bBVisible); aVisibleLayers.Set(aBckgrndObj, bBObjsVisible); pCurrentPage->TRG_SetMasterPageVisibleLayers(aVisibleLayers); @@ -283,8 +283,8 @@ void ViewShell::Implementation::AssignLayout ( SfxRequest& rRequest, PageKind eP // Transform the given request into the four argument form that is // understood by ProcessModifyPageSlot(). SdrLayerAdmin& rLayerAdmin (mrViewShell.GetViewShellBase().GetDocument()->GetLayerAdmin()); - sal_uInt8 aBackground (rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRND)), sal_False)); - sal_uInt8 aBackgroundObject (rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), sal_False)); + sal_uInt8 aBackground (rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), sal_False)); + sal_uInt8 aBackgroundObject (rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), sal_False)); SetOfByte aVisibleLayers; diff --git a/sd/source/ui/view/drbezob.cxx b/sd/source/ui/view/drbezob.cxx index 4abd08f6631f..bb912a6b9bc0 100644 --- a/sd/source/ui/view/drbezob.cxx +++ b/sd/source/ui/view/drbezob.cxx @@ -267,7 +267,7 @@ void BezierObjectBar::Execute(SfxRequest& rReq) SdrPathObj* pPathObj = (SdrPathObj*) rMarkList.GetMark(0)->GetMarkedSdrObj(); const bool bUndo = mpView->IsUndoEnabled(); if( bUndo ) - mpView->BegUndo(String(SdResId(STR_UNDO_BEZCLOSE))); + mpView->BegUndo(SD_RESSTR(STR_UNDO_BEZCLOSE)); mpView->UnmarkAllPoints(); diff --git a/sd/source/ui/view/drtxtob.cxx b/sd/source/ui/view/drtxtob.cxx index d65fa4320775..5bbaa045e7d2 100644 --- a/sd/source/ui/view/drtxtob.cxx +++ b/sd/source/ui/view/drtxtob.cxx @@ -243,7 +243,7 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) rSet.Put( SfxTemplateItem( nWhich, pStyleSheet->GetName() ) ); else { - rSet.Put( SfxTemplateItem( nWhich, String() ) ); + rSet.Put( SfxTemplateItem( nWhich, OUString() ) ); } } break; diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx index 6ad4cf19db8f..8f5c81b253a2 100644 --- a/sd/source/ui/view/drtxtob1.cxx +++ b/sd/source/ui/view/drtxtob1.cxx @@ -349,11 +349,11 @@ void TextObjectBar::Execute( SfxRequest &rReq ) case SID_THES: { - String aReplaceText; + OUString aReplaceText; SFX_REQUEST_ARG( rReq, pItem2, SfxStringItem, SID_THES, sal_False ); if (pItem2) aReplaceText = pItem2->GetValue(); - if (aReplaceText.Len() > 0) + if (!aReplaceText.isEmpty()) ReplaceTextWithSynonym( pOLV->GetEditView(), aReplaceText ); } break; diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx index f6eb20f545d5..6d0db828eed5 100644 --- a/sd/source/ui/view/drviews1.cxx +++ b/sd/source/ui/view/drviews1.cxx @@ -372,13 +372,12 @@ void DrawViewShell::ChangeEditMode(EditMode eEMode, bool bIsLayerModeActive) maTabControl.Clear(); SdPage* pPage; - String aPageName; sal_uInt16 nPageCnt = GetDoc()->GetSdPageCount(mePageKind); for (sal_uInt16 i = 0; i < nPageCnt; i++) { pPage = GetDoc()->GetSdPage(i, mePageKind); - aPageName = pPage->GetName(); + OUString aPageName = pPage->GetName(); maTabControl.InsertPage(i + 1, aPageName); if ( pPage->IsSelected() && nActualPageNum == 0 ) @@ -412,8 +411,10 @@ void DrawViewShell::ChangeEditMode(EditMode eEMode, bool bIsLayerModeActive) for (sal_uInt16 i = 0; i < nMasterPageCnt; i++) { SdPage* pMaster = GetDoc()->GetMasterSdPage(i, mePageKind); - String aLayoutName(pMaster->GetLayoutName()); - aLayoutName.Erase(aLayoutName.SearchAscii(SD_LT_SEPARATOR)); + OUString aLayoutName = pMaster->GetLayoutName(); + sal_Int32 nPos = aLayoutName.indexOf(SD_LT_SEPARATOR); + if (nPos != -1) + aLayoutName = aLayoutName.copy(0, nPos); maTabControl.InsertPage(i + 1, aLayoutName); @@ -650,12 +651,11 @@ void DrawViewShell::ResetActualPage() maTabControl.Clear(); SdPage* pPage = NULL; - String aPageName; for (sal_uInt16 i = 0; i < nPageCount; i++) { pPage = GetDoc()->GetSdPage(i, mePageKind); - aPageName = pPage->GetName(); + OUString aPageName = pPage->GetName(); maTabControl.InsertPage(i + 1, aPageName); // correct selection recognition of the pages @@ -674,8 +674,10 @@ void DrawViewShell::ResetActualPage() for (sal_uInt16 i = 0; i < nMasterPageCnt; i++) { SdPage* pMaster = GetDoc()->GetMasterSdPage(i, mePageKind); - String aLayoutName(pMaster->GetLayoutName()); - aLayoutName.Erase(aLayoutName.SearchAscii(SD_LT_SEPARATOR)); + OUString aLayoutName = pMaster->GetLayoutName(); + sal_Int32 nPos = aLayoutName.indexOf(SD_LT_SEPARATOR); + if (nPos != -1) + aLayoutName = aLayoutName.copy(0, nPos); maTabControl.InsertPage(i + 1, aLayoutName); if (pActualPage == pMaster) @@ -1131,13 +1133,13 @@ void DrawViewShell::ResetActualLayer() */ pLayerBar->Clear(); - String aName; - String aActiveLayer = mpDrawView->GetActiveLayer(); - String aBackgroundLayer( SdResId(STR_LAYER_BCKGRND) ); - String aBackgroundObjLayer( SdResId(STR_LAYER_BCKGRNDOBJ) ); - String aLayoutLayer( SdResId(STR_LAYER_LAYOUT) ); - String aControlsLayer( SdResId(STR_LAYER_CONTROLS) ); - String aMeasureLinesLayer( SdResId(STR_LAYER_MEASURELINES) ); + OUString aName; + OUString aActiveLayer = mpDrawView->GetActiveLayer(); + OUString aBackgroundLayer = SD_RESSTR(STR_LAYER_BCKGRND); + OUString aBackgroundObjLayer = SD_RESSTR(STR_LAYER_BCKGRNDOBJ); + OUString aLayoutLayer = SD_RESSTR(STR_LAYER_LAYOUT); + OUString aControlsLayer = SD_RESSTR(STR_LAYER_CONTROLS); + OUString aMeasureLinesLayer = SD_RESSTR(STR_LAYER_MEASURELINES); sal_uInt16 nActiveLayer = SDRLAYER_NOTFOUND; SdrLayerAdmin& rLayerAdmin = GetDoc()->GetLayerAdmin(); sal_uInt16 nLayerCnt = rLayerAdmin.GetLayerCount(); diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index 835cc9302e66..f4f6eeb2136d 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -190,9 +190,8 @@ public: if( pPageView ) { SdrGrafObj* pNewObj = (SdrGrafObj*) m_pObj->Clone(); - String aStr( m_pView->GetDescriptionOfMarkedObjects() ); - aStr.Append( sal_Unicode(' ') ); - aStr.Append( String( "External Edit" ) ); + OUString aStr = m_pView->GetDescriptionOfMarkedObjects(); + aStr += " External Edit"; m_pView->BegUndo( aStr ); pNewObj->SetGraphicObject( aGraphic ); m_pView->ReplaceObjectAtView( m_pObj, *pPageView, pNewObj ); @@ -233,7 +232,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList(); if( rMarkList.GetMarkCount() == 1 ) { - pUndoManager->EnterListAction( String(), String() ); + pUndoManager->EnterListAction("", ""); mpDrawView->BegUndo(); pObj = rMarkList.GetMark(0)->GetMarkedSdrObj(); @@ -432,9 +431,9 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) ? GetDoc()->GetSdPage( nPageId - 1, GetPageKind() ) : GetDoc()->GetMasterSdPage( nPageId - 1, GetPageKind() ); - String aTitle( SdResId( STR_TITLE_RENAMESLIDE ) ); - String aDescr( SdResId( STR_DESC_RENAMESLIDE ) ); - String aPageName = pCurrentPage->GetName(); + OUString aTitle = SD_RESSTR(STR_TITLE_RENAMESLIDE); + OUString aDescr = SD_RESSTR(STR_DESC_RENAMESLIDE); + OUString aPageName = pCurrentPage->GetName(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); DBG_ASSERT(pFact, "Dialogdiet fail!"); @@ -645,7 +644,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) if ( mpDrawView->IsPresObjSelected() ) { ::sd::Window* pWindow = GetActiveWindow(); - InfoBox(pWindow, String(SdResId(STR_ACTION_NOTPOSSIBLE) ) ).Execute(); + InfoBox(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE)).Execute(); } else { @@ -690,7 +689,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) if ( mpDrawView->IsPresObjSelected() ) { ::sd::Window* pWindow = GetActiveWindow(); - InfoBox(pWindow, String(SdResId(STR_ACTION_NOTPOSSIBLE) ) ).Execute(); + InfoBox(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE)).Execute(); } else { @@ -718,7 +717,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) if ( mpDrawView->IsPresObjSelected(true,true,true) ) { ::sd::Window* pWindow = GetActiveWindow(); - InfoBox(pWindow, String(SdResId(STR_ACTION_NOTPOSSIBLE) ) ).Execute(); + InfoBox(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE)).Execute(); } else { @@ -731,7 +730,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) case SID_CONVERT_TO_METAFILE: { // switch on undo for the next operations - mpDrawView->BegUndo( String( SdResId( STR_UNDO_CONVERT_TO_METAFILE ))); + mpDrawView->BegUndo(SD_RESSTR(STR_UNDO_CONVERT_TO_METAFILE)); GDIMetaFile aMetaFile(mpDrawView->GetMarkedObjMetaFile()); aGraphic = Graphic(aMetaFile); } @@ -739,7 +738,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) case SID_CONVERT_TO_BITMAP: { // switch on undo for the next operations - mpDrawView->BegUndo( String( SdResId( STR_UNDO_CONVERT_TO_BITMAP ))); + mpDrawView->BegUndo(SD_RESSTR(STR_UNDO_CONVERT_TO_BITMAP)); bool bDone(false); // I have to get the image here directly since GetMarkedObjBitmapEx works @@ -972,7 +971,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) { GraphicObject aGraphicObject( ( (SdrGrafObj*) pObj )->GetGraphicObject() ); { - GraphicHelper::ExportGraphic( aGraphicObject.GetGraphic(), String("") ); + GraphicHelper::ExportGraphic( aGraphicObject.GetGraphic(), "" ); } } } @@ -1014,8 +1013,8 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) { SdrGrafObj* pNewObject = dialog.GetCompressedSdrGrafObj(); SdrPageView* pPageView = mpDrawView->GetSdrPageView(); - String aUndoString( mpDrawView->GetDescriptionOfMarkedObjects() ); - aUndoString += String( " Compress" ); + OUString aUndoString = mpDrawView->GetDescriptionOfMarkedObjects(); + aUndoString += " Compress"; mpDrawView->BegUndo( aUndoString ); mpDrawView->ReplaceObjectAtView( pObj, *pPageView, pNewObject ); mpDrawView->EndUndo(); @@ -1162,7 +1161,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) if ( mpDrawView->IsPresObjSelected(sal_False, sal_True) ) { ::sd::Window* pWindow = GetActiveWindow(); - InfoBox(pWindow, String(SdResId(STR_ACTION_NOTPOSSIBLE) ) ).Execute(); + InfoBox(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE)).Execute(); } else { @@ -1358,7 +1357,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) #endif ::sd::Window* pWindow = GetActiveWindow(); - InfoBox(pWindow, String( SdResId( nId ) ) ).Execute(); + InfoBox(pWindow, SD_RESSTR(nId)).Execute(); } else { @@ -1396,8 +1395,8 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) SdrLayerAdmin& rLayerAdmin = GetDoc()->GetLayerAdmin(); sal_uInt16 nLayerCnt = rLayerAdmin.GetLayerCount(); sal_uInt16 nLayer = nLayerCnt - 2 + 1; - String aLayerName ( SdResId(STR_LAYER) ), aLayerTitle, aLayerDesc; - aLayerName += OUString::number( (sal_Int32)nLayer ); + OUString aLayerName = SD_RESSTR(STR_LAYER) + OUString::number(nLayer); + OUString aLayerTitle, aLayerDesc; sal_Bool bIsVisible = sal_False; sal_Bool bIsLocked = sal_False; sal_Bool bIsPrintable = sal_False; @@ -1417,7 +1416,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) aNewAttr.Put( SdAttrLayerThisPage() ); SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create(); - AbstractSdInsertLayerDlg* pDlg = pFact ? pFact->CreateSdInsertLayerDlg(NULL, aNewAttr, true, String( SdResId( STR_INSERTLAYER ) ) ) : 0; + AbstractSdInsertLayerDlg* pDlg = pFact ? pFact->CreateSdInsertLayerDlg(NULL, aNewAttr, true, SD_RESSTR(STR_INSERTLAYER)) : 0; if( pDlg ) { pDlg->SetHelpId( SD_MOD()->GetSlotPool()->GetSlot( SID_INSERTLAYER )->GetCommand() ); @@ -1430,13 +1429,13 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) aLayerName = ((SdAttrLayerName &) aNewAttr.Get (ATTR_LAYER_NAME)).GetValue (); if( rLayerAdmin.GetLayer( aLayerName, sal_False ) - || aLayerName.Len()==0 ) + || aLayerName.isEmpty() ) { // name already exists WarningBox aWarningBox ( GetParentWindow(), WinBits( WB_OK ), - String(SdResId( STR_WARN_NAME_DUPLICATE))); + SD_RESSTR(STR_WARN_NAME_DUPLICATE)); aWarningBox.Execute(); } else @@ -1484,8 +1483,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) bIsPrintable = pIsPrintable->GetValue (); } - String aPrevLayer = mpDrawView->GetActiveLayer(); - String aName; + OUString aPrevLayer = mpDrawView->GetActiveLayer(); SdrLayer* pLayer; sal_uInt16 nPrevLayer = 0; nLayerCnt = rLayerAdmin.GetLayerCount(); @@ -1493,7 +1491,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) for ( nLayer = 0; nLayer < nLayerCnt; nLayer++ ) { pLayer = rLayerAdmin.GetLayer(nLayer); - aName = pLayer->GetName(); + OUString aName = pLayer->GetName(); if ( aPrevLayer == aName ) { @@ -1536,15 +1534,15 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) SdrLayerAdmin& rLayerAdmin = GetDoc()->GetLayerAdmin(); sal_uInt16 nCurPage = GetLayerTabControl()->GetCurPageId(); - String aLayerName( GetLayerTabControl()->GetPageText(nCurPage) ); + OUString aLayerName = GetLayerTabControl()->GetPageText(nCurPage); SdrLayer* pLayer = rLayerAdmin.GetLayer(aLayerName, sal_False); - String aLayerTitle( pLayer->GetTitle() ); - String aLayerDesc( pLayer->GetDescription() ); + OUString aLayerTitle = pLayer->GetTitle(); + OUString aLayerDesc = pLayer->GetDescription(); - String aOldLayerName( aLayerName ); - String aOldLayerTitle( aLayerTitle ); - String aOldLayerDesc( aLayerDesc ); + OUString aOldLayerName(aLayerName); + OUString aOldLayerTitle(aLayerTitle); + OUString aOldLayerDesc(aLayerDesc); sal_Bool bIsVisible, bIsLocked, bIsPrintable; sal_Bool bOldIsVisible = bIsVisible = mpDrawView->IsLayerVisible(aLayerName); @@ -1556,11 +1554,11 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) // is it allowed to delete the layer? bool bDelete = true; - String aLayoutLayer ( SdResId(STR_LAYER_LAYOUT) ); - String aControlsLayer ( SdResId(STR_LAYER_CONTROLS) ); - String aMeasureLinesLayer ( SdResId(STR_LAYER_MEASURELINES) ); - String aBackgroundLayer( SdResId(STR_LAYER_BCKGRND) ); - String aBackgroundObjLayer( SdResId(STR_LAYER_BCKGRNDOBJ) ); + OUString aLayoutLayer = SD_RESSTR(STR_LAYER_LAYOUT); + OUString aControlsLayer = SD_RESSTR(STR_LAYER_CONTROLS); + OUString aMeasureLinesLayer = SD_RESSTR(STR_LAYER_MEASURELINES); + OUString aBackgroundLayer = SD_RESSTR(STR_LAYER_BCKGRND); + OUString aBackgroundObjLayer = SD_RESSTR(STR_LAYER_BCKGRNDOBJ); if( aLayerName == aLayoutLayer || aLayerName == aControlsLayer || aLayerName == aMeasureLinesLayer || @@ -1582,7 +1580,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) aNewAttr.Put( SdAttrLayerThisPage() ); SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create(); - AbstractSdInsertLayerDlg* pDlg = pFact ? pFact->CreateSdInsertLayerDlg(NULL, aNewAttr, bDelete, String( SdResId( STR_MODIFYLAYER ) ) ) : 0; + AbstractSdInsertLayerDlg* pDlg = pFact ? pFact->CreateSdInsertLayerDlg(NULL, aNewAttr, bDelete, SD_RESSTR(STR_MODIFYLAYER)) : 0; if( pDlg ) { pDlg->SetHelpId( SD_MOD()->GetSlotPool()->GetSlot( SID_MODIFYLAYER )->GetCommand() ); @@ -1596,13 +1594,13 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) aLayerName = ((SdAttrLayerName &) aNewAttr.Get (ATTR_LAYER_NAME)).GetValue (); if( (rLayerAdmin.GetLayer( aLayerName, sal_False ) && - aLayerName != aOldLayerName) || aLayerName.Len()==0 ) + aLayerName != aOldLayerName) || aLayerName.isEmpty() ) { // name already exists WarningBox aWarningBox ( GetParentWindow(), WinBits( WB_OK ), - String( SdResId( STR_WARN_NAME_DUPLICATE))); + SD_RESSTR(STR_WARN_NAME_DUPLICATE)); aWarningBox.Execute(); } else @@ -1718,7 +1716,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) SfxStringItem aUrl( SID_FILE_NAME, pURLField->GetURL() ); SfxStringItem aTarget( SID_TARGETNAME, pURLField->GetTargetFrame() ); - String aReferName; + OUString aReferName; SfxViewFrame* pFrame = GetViewFrame(); SfxMedium* pMed = pFrame->GetObjectShell()->GetMedium(); if (pMed) @@ -1844,7 +1842,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) case SID_INSERT_FLD_FILE: { - String aName; + OUString aName; if( GetDocSh()->HasName() ) aName = GetDocSh()->GetMedium()->GetName(); pFieldItem = new SvxFieldItem( SvxExtFileField( aName ), EE_FEATURE_FIELD ); @@ -2010,7 +2008,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) if ( mpDrawView->IsPresObjSelected( sal_True, sal_True, sal_True ) ) { ::sd::Window* pWindow = GetActiveWindow(); - InfoBox(pWindow, String(SdResId(STR_ACTION_NOTPOSSIBLE) ) ).Execute(); + InfoBox(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE)).Execute(); } else { @@ -2133,7 +2131,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) if ( mpDrawView->IsPresObjSelected() ) { ::sd::Window* pWindow = GetActiveWindow(); - InfoBox(pWindow, String(SdResId(STR_ACTION_NOTPOSSIBLE) ) ).Execute(); + InfoBox(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE)).Execute(); } else { @@ -2150,7 +2148,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) if ( mpDrawView->IsPresObjSelected() ) { ::sd::Window* pWindow = GetActiveWindow(); - InfoBox(pWindow, String(SdResId(STR_ACTION_NOTPOSSIBLE) ) ).Execute(); + InfoBox(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE)).Execute(); } else { @@ -2170,7 +2168,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) if ( mpDrawView->IsPresObjSelected() ) { ::sd::Window* pWindow = GetActiveWindow(); - InfoBox(pWindow, String(SdResId(STR_ACTION_NOTPOSSIBLE) ) ).Execute(); + InfoBox(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE)).Execute(); } else { @@ -2191,7 +2189,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) if ( mpDrawView->IsPresObjSelected() ) { ::sd::Window* pWindow = GetActiveWindow(); - InfoBox(pWindow, String(SdResId(STR_ACTION_NOTPOSSIBLE) ) ).Execute(); + InfoBox(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE)).Execute(); } else { @@ -2212,7 +2210,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) if ( mpDrawView->IsPresObjSelected() ) { ::sd::Window* pWindow = GetActiveWindow(); - InfoBox(pWindow, String(SdResId(STR_ACTION_NOTPOSSIBLE) ) ).Execute(); + InfoBox(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE)).Execute(); } else { @@ -2241,7 +2239,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) if ( mpDrawView->IsPresObjSelected() ) { ::sd::Window* pWindow = GetActiveWindow(); - InfoBox(pWindow, String(SdResId(STR_ACTION_NOTPOSSIBLE) ) ).Execute(); + InfoBox(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE)).Execute(); } else { @@ -2334,7 +2332,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) if ( mpDrawView->IsPresObjSelected() ) { ::sd::Window* pWindow = GetActiveWindow(); - InfoBox(pWindow, String(SdResId(STR_ACTION_NOTPOSSIBLE) ) ).Execute(); + InfoBox(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE)).Execute(); } else { @@ -2829,9 +2827,9 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) SdrLayerAdmin& rLayerAdmin = GetDoc()->GetLayerAdmin(); sal_uInt8 aLayerId; if (nSId == SID_DISPLAY_MASTER_BACKGROUND) - aLayerId = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRND)), sal_False); + aLayerId = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), sal_False); else - aLayerId = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), sal_False); + aLayerId = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), sal_False); aVisibleLayers.Set(aLayerId, !aVisibleLayers.IsSet(aLayerId)); pPage->TRG_SetMasterPageVisibleLayers(aVisibleLayers); } |