diff options
Diffstat (limited to 'svx/source')
98 files changed, 428 insertions, 442 deletions
diff --git a/svx/source/accessibility/AccessibleFrameSelector.cxx b/svx/source/accessibility/AccessibleFrameSelector.cxx index 986d8eb72297..91e97317d03b 100644 --- a/svx/source/accessibility/AccessibleFrameSelector.cxx +++ b/svx/source/accessibility/AccessibleFrameSelector.cxx @@ -59,8 +59,8 @@ AccFrameSelector::AccFrameSelector( FrameSelector& rFrameSel, FrameBorderType eB meBorder( eBorder ), maFocusListeners( maFocusMutex ), maPropertyListeners( maPropertyMutex ), - maNames( SVX_RES( RID_SVXSTR_FRMSEL_TEXTS ) ), - maDescriptions( SVX_RES(RID_SVXSTR_FRMSEL_DESCRIPTIONS) ), + maNames( ResId(RID_SVXSTR_FRMSEL_TEXTS, DIALOG_MGR()) ), + maDescriptions( ResId(RID_SVXSTR_FRMSEL_DESCRIPTIONS, DIALOG_MGR()) ), mnClientId( 0 ) { if ( mpFrameSel ) diff --git a/svx/source/accessibility/DescriptionGenerator.cxx b/svx/source/accessibility/DescriptionGenerator.cxx index f75757d4c78a..1f51bf425960 100644 --- a/svx/source/accessibility/DescriptionGenerator.cxx +++ b/svx/source/accessibility/DescriptionGenerator.cxx @@ -73,7 +73,7 @@ void DescriptionGenerator::Initialize (sal_Int32 nResourceId) OUString sPrefix; { SolarMutexGuard aGuard; - sPrefix = OUString (SVX_RESSTR (nResourceId)); + sPrefix = OUString (SvxResId (nResourceId)); } // Forward the call with the resulting string. @@ -90,10 +90,10 @@ void DescriptionGenerator::Initialize (const OUString& sPrefix) SolarMutexGuard aGuard; msDescription.append(' '); - msDescription.append(OUString (SVX_RESSTR(RID_SVXSTR_A11Y_WITH))); + msDescription.append(OUString (SvxResId(RID_SVXSTR_A11Y_WITH))); msDescription.append(' '); - msDescription.append(OUString (SVX_RESSTR (RID_SVXSTR_A11Y_STYLE))); + msDescription.append(OUString (SvxResId (RID_SVXSTR_A11Y_STYLE))); msDescription.append('='); } @@ -133,7 +133,7 @@ void DescriptionGenerator::AddProperty ( OUString sLocalizedName; { SolarMutexGuard aGuard; - sLocalizedName = SVX_RESSTR (nLocalizedNameId); + sLocalizedName = SvxResId (nLocalizedNameId); } AddProperty (sPropertyName, aType, sLocalizedName, nWhichId); } @@ -155,7 +155,7 @@ void DescriptionGenerator::AddProperty (const OUString& sPropertyName, SolarMutexGuard aGuard; msDescription.append(' '); - msDescription.append(OUString (SVX_RESSTR(RID_SVXSTR_A11Y_AND))); + msDescription.append(OUString (SvxResId(RID_SVXSTR_A11Y_AND))); msDescription.append(' '); mbIsFirstProperty = false; } @@ -325,19 +325,19 @@ void DescriptionGenerator::AddFillStyle (const OUString& sPropertyName, switch (aFillStyle) { case drawing::FillStyle_NONE: - sFillStyleName = SVX_RESSTR(RID_SVXSTR_A11Y_FILLSTYLE_NONE); + sFillStyleName = SvxResId(RID_SVXSTR_A11Y_FILLSTYLE_NONE); break; case drawing::FillStyle_SOLID: - sFillStyleName = SVX_RESSTR(RID_SVXSTR_A11Y_FILLSTYLE_SOLID); + sFillStyleName = SvxResId(RID_SVXSTR_A11Y_FILLSTYLE_SOLID); break; case drawing::FillStyle_GRADIENT: - sFillStyleName = SVX_RESSTR(RID_SVXSTR_A11Y_FILLSTYLE_GRADIENT); + sFillStyleName = SvxResId(RID_SVXSTR_A11Y_FILLSTYLE_GRADIENT); break; case drawing::FillStyle_HATCH: - sFillStyleName = SVX_RESSTR(RID_SVXSTR_A11Y_FILLSTYLE_HATCH); + sFillStyleName = SvxResId(RID_SVXSTR_A11Y_FILLSTYLE_HATCH); break; case drawing::FillStyle_BITMAP: - sFillStyleName = SVX_RESSTR(RID_SVXSTR_A11Y_FILLSTYLE_BITMAP); + sFillStyleName = SvxResId(RID_SVXSTR_A11Y_FILLSTYLE_BITMAP); break; default: break; diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx index 2d85c66c4d63..0f970ee347d2 100644 --- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx +++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx @@ -93,8 +93,8 @@ SvxGraphCtrlAccessibleContext::SvxGraphCtrlAccessibleContext( { ::SolarMutexGuard aSolarGuard; - msName = SVX_RESSTR( RID_SVXSTR_GRAPHCTRL_ACC_NAME ); - msDescription = SVX_RESSTR( RID_SVXSTR_GRAPHCTRL_ACC_DESCRIPTION ); + msName = SvxResId( RID_SVXSTR_GRAPHCTRL_ACC_NAME ); + msDescription = SvxResId( RID_SVXSTR_GRAPHCTRL_ACC_DESCRIPTION ); } maTreeInfo.SetSdrView( mpView ); diff --git a/svx/source/accessibility/ShapeTypeHandler.cxx b/svx/source/accessibility/ShapeTypeHandler.cxx index 0fbeac31e756..021592269fc8 100644 --- a/svx/source/accessibility/ShapeTypeHandler.cxx +++ b/svx/source/accessibility/ShapeTypeHandler.cxx @@ -318,7 +318,7 @@ OUString if (nResourceId != -1) { SolarMutexGuard aGuard; - sName = OUString (SVX_RESSTR((unsigned short)nResourceId)); + sName = OUString (SvxResId((unsigned short)nResourceId)); } return sName; diff --git a/svx/source/accessibility/charmapacc.cxx b/svx/source/accessibility/charmapacc.cxx index 3292514fd62c..579cf6e6e1f5 100644 --- a/svx/source/accessibility/charmapacc.cxx +++ b/svx/source/accessibility/charmapacc.cxx @@ -176,13 +176,13 @@ sal_Int16 SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleRole( ) OUString SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleDescription( ) { OExternalLockGuard aGuard( this ); - return SVX_RESSTR( RID_SVXSTR_CHARACTER_SELECTION); + return SvxResId( RID_SVXSTR_CHARACTER_SELECTION); } OUString SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleName( ) { OExternalLockGuard aGuard( this ); - return SVX_RESSTR( RID_SVXSTR_CHAR_SEL_DESC); + return SvxResId( RID_SVXSTR_CHAR_SEL_DESC); } Reference< XAccessibleRelationSet > SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleRelationSet( ) @@ -370,7 +370,7 @@ sal_Int16 SAL_CALL SvxShowCharSetAcc::getAccessibleRole() OUString SAL_CALL SvxShowCharSetAcc::getAccessibleDescription() { OExternalLockGuard aGuard( this ); - return SVX_RESSTR( RID_SVXSTR_CHARACTER_SELECTION ); + return SvxResId( RID_SVXSTR_CHARACTER_SELECTION ); } @@ -378,7 +378,7 @@ OUString SAL_CALL SvxShowCharSetAcc::getAccessibleName() { OExternalLockGuard aGuard( this ); ensureAlive(); - return SVX_RESSTR( RID_SVXSTR_CHAR_SEL_DESC ); + return SvxResId( RID_SVXSTR_CHAR_SEL_DESC ); } @@ -637,7 +637,7 @@ OUString SAL_CALL SvxShowCharSetItemAcc::getAccessibleDescription() if( c < 256 ) snprintf( buf+6, 10, " (%" SAL_PRIuUINT32 ")", c ); - sDescription = SVX_RESSTR( RID_SVXSTR_CHARACTER_CODE ) + sDescription = SvxResId( RID_SVXSTR_CHARACTER_CODE ) + " " + OUString(buf, strlen(buf), RTL_TEXTENCODING_ASCII_US); diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx b/svx/source/accessibility/svxrectctaccessiblecontext.cxx index 0b091932c1d1..6bdc0c05c3e2 100644 --- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx +++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx @@ -113,8 +113,8 @@ SvxRectCtlAccessibleContext::SvxRectCtlAccessibleContext( { { ::SolarMutexGuard aSolarGuard; - msName = SVX_RESSTR( RID_SVXSTR_RECTCTL_ACC_CORN_NAME ); - msDescription = SVX_RESSTR( RID_SVXSTR_RECTCTL_ACC_CORN_DESCR ); + msName = SvxResId( RID_SVXSTR_RECTCTL_ACC_CORN_NAME ); + msDescription = SvxResId( RID_SVXSTR_RECTCTL_ACC_CORN_DESCR ); } mpChildren = new SvxRectCtlChildAccessibleContext*[ MAX_NUM_OF_CHILDREN ]; @@ -226,8 +226,8 @@ Reference< XAccessible > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleChil if( !xChild.is() ) { const ChildIndexToPointData* p = IndexToPoint( nIndex ); - OUString aName(SVX_RESSTR(p->nResIdName)); - OUString aDescr(SVX_RESSTR(p->nResIdDescr)); + OUString aName(SvxResId(p->nResIdName)); + OUString aDescr(SvxResId(p->nResIdDescr)); tools::Rectangle aFocusRect( mpRepr->CalculateFocusRectangle( p->ePoint ) ); diff --git a/svx/source/core/graphichelper.cxx b/svx/source/core/graphichelper.cxx index 33f2dc508530..f307083f5245 100644 --- a/svx/source/core/graphichelper.cxx +++ b/svx/source/core/graphichelper.cxx @@ -109,7 +109,7 @@ OUString GraphicHelper::ExportGraphic( const Graphic& rGraphic, const OUString& // fish out the graphic's name - aDialogHelper.SetTitle( SVX_RESSTR(RID_SVXSTR_EXPORT_GRAPHIC_TITLE)); + aDialogHelper.SetTitle( SvxResId(RID_SVXSTR_EXPORT_GRAPHIC_TITLE)); aDialogHelper.SetDisplayDirectory( aPath.GetMainURL(INetURLObject::DecodeMechanism::ToIUri) ); INetURLObject aURL; aURL.SetSmartURL( rGraphicName ); @@ -217,7 +217,7 @@ void GraphicHelper::SaveShapeAsGraphic( const Reference< drawing::XShape >& xSha FileDialogHelper aDialogHelper( TemplateDescription::FILESAVE_AUTOEXTENSION ); Reference < XFilePicker2 > xFilePicker = aDialogHelper.GetFilePicker(); - aDialogHelper.SetTitle( SVX_RESSTR(RID_SVXSTR_SAVEAS_IMAGE) ); + aDialogHelper.SetTitle( SvxResId(RID_SVXSTR_SAVEAS_IMAGE) ); INetURLObject aPath; aPath.SetSmartURL( sGraphicPath ); diff --git a/svx/source/dialog/SafeModeDialog.cxx b/svx/source/dialog/SafeModeDialog.cxx index d8b41899cdb4..33f4e23b7969 100644 --- a/svx/source/dialog/SafeModeDialog.cxx +++ b/svx/source/dialog/SafeModeDialog.cxx @@ -375,7 +375,7 @@ IMPL_LINK(SafeModeDialog, CreateZipBtnHdl, Button*, /*pBtn*/, void) } catch (uno::Exception) { - ScopedVclPtrInstance< MessageDialog > aErrorBox(this, SVX_RESSTR(RID_SVXSTR_SAFEMODE_ZIP_FAILURE)); + ScopedVclPtrInstance< MessageDialog > aErrorBox(this, SvxResId(RID_SVXSTR_SAFEMODE_ZIP_FAILURE)); aErrorBox->Execute(); return; } diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx index 3b56e960416c..c0bd9c222eb7 100644 --- a/svx/source/dialog/_bmpmask.cxx +++ b/svx/source/dialog/_bmpmask.cxx @@ -37,7 +37,6 @@ #include <memory> #include "helpid.hrc" -#define BMP_RESID(nId) ResId(nId, DIALOG_MGR()) #define OWN_CALLMODE SfxCallMode::ASYNCHRON | SfxCallMode::RECORD @@ -427,7 +426,7 @@ SvxBmpMask::SvxBmpMask(SfxBindings *pBindinx, SfxChildWindow *pCW, vcl::Window* m_pLbColor4->SetGetFocusHdl( LINK( pData, MaskData, FocusLbHdl ) ); m_pLbColorTrans->Disable(); - OUString sColorPalette (BMP_RESID( RID_SVXDLG_BMPMASK_STR_PALETTE)); + OUString sColorPalette (SvxResId( RID_SVXDLG_BMPMASK_STR_PALETTE)); OUString sColorPaletteN; m_pQSet1->SetStyle( m_pQSet1->GetStyle() | WB_DOUBLEBORDER | WB_ITEMBORDER ); @@ -1096,7 +1095,7 @@ bool SvxBmpMask::IsEyedropping() const void SvxBmpMask::SetAccessibleNames() { // set the accessible name for valueset - OUString sColorPalette (BMP_RESID( RID_SVXDLG_BMPMASK_STR_PALETTE)); + OUString sColorPalette (SvxResId( RID_SVXDLG_BMPMASK_STR_PALETTE)); OUString sColorPaletteN; sColorPaletteN = sColorPalette + " 1"; diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx index 21d2dcd50cce..e1b298df858d 100644 --- a/svx/source/dialog/charmap.cxx +++ b/svx/source/dialog/charmap.cxx @@ -793,7 +793,7 @@ void SubsetMap::InitList() { bInit = false; - ResStringArray aStringList(SVX_RES(RID_SUBSETMAP)); + ResStringArray aStringList(ResId(RID_SUBSETMAP, DIALOG_MGR())); //I wish icu had a way to give me the block ranges for (int i = UBLOCK_BASIC_LATIN; i < UBLOCK_COUNT; ++i) diff --git a/svx/source/dialog/compressgraphicdialog.cxx b/svx/source/dialog/compressgraphicdialog.cxx index fb5c545ad4ec..683cc80ed0d6 100644 --- a/svx/source/dialog/compressgraphicdialog.cxx +++ b/svx/source/dialog/compressgraphicdialog.cxx @@ -151,34 +151,34 @@ void CompressGraphicsDialog::Update() switch(aLinkType) { case GfxLinkType::NativeGif: - aGraphicTypeString = SVX_RESSTR(STR_IMAGE_GIF); + aGraphicTypeString = SvxResId(STR_IMAGE_GIF); break; case GfxLinkType::NativeJpg: - aGraphicTypeString = SVX_RESSTR(STR_IMAGE_JPEG); + aGraphicTypeString = SvxResId(STR_IMAGE_JPEG); break; case GfxLinkType::NativePng: - aGraphicTypeString = SVX_RESSTR(STR_IMAGE_PNG); + aGraphicTypeString = SvxResId(STR_IMAGE_PNG); break; case GfxLinkType::NativeTif: - aGraphicTypeString = SVX_RESSTR(STR_IMAGE_TIFF); + aGraphicTypeString = SvxResId(STR_IMAGE_TIFF); break; case GfxLinkType::NativeWmf: - aGraphicTypeString = SVX_RESSTR(STR_IMAGE_WMF); + aGraphicTypeString = SvxResId(STR_IMAGE_WMF); break; case GfxLinkType::NativeMet: - aGraphicTypeString = SVX_RESSTR(STR_IMAGE_MET); + aGraphicTypeString = SvxResId(STR_IMAGE_MET); break; case GfxLinkType::NativePct: - aGraphicTypeString = SVX_RESSTR(STR_IMAGE_PCT); + aGraphicTypeString = SvxResId(STR_IMAGE_PCT); break; case GfxLinkType::NativeSvg: - aGraphicTypeString = SVX_RESSTR(STR_IMAGE_SVG); + aGraphicTypeString = SvxResId(STR_IMAGE_SVG); break; case GfxLinkType::NativeBmp: - aGraphicTypeString = SVX_RESSTR(STR_IMAGE_BMP); + aGraphicTypeString = SvxResId(STR_IMAGE_BMP); break; default: - aGraphicTypeString = SVX_RESSTR(STR_IMAGE_UNKNOWN); + aGraphicTypeString = SvxResId(STR_IMAGE_UNKNOWN); break; } m_pLabelGraphicType->SetText(aGraphicTypeString); @@ -194,7 +194,7 @@ void CompressGraphicsDialog::Update() Size aPixelSize = m_aGraphic.GetSizePixel(); Size aOriginalSize100mm( pDummyVDev->PixelToLogic( m_aGraphic.GetSizePixel(), MapUnit::Map100thMM ) ); - OUString aBitmapSizeString = SVX_RESSTR(STR_IMAGE_ORIGINAL_SIZE); + OUString aBitmapSizeString = SvxResId(STR_IMAGE_ORIGINAL_SIZE); OUString aWidthString = GetUnitString( aOriginalSize100mm.Width(), eFieldUnit, cSeparator ); OUString aHeightString = GetUnitString( aOriginalSize100mm.Height(), eFieldUnit, cSeparator ); aBitmapSizeString = aBitmapSizeString.replaceAll("$(WIDTH)", aWidthString); @@ -205,7 +205,7 @@ void CompressGraphicsDialog::Update() int aValX = (int) (aPixelSize.Width() / GetViewWidthInch()); - OUString aViewSizeString = SVX_RESSTR(STR_IMAGE_VIEW_SIZE); + OUString aViewSizeString = SvxResId(STR_IMAGE_VIEW_SIZE); aWidthString = GetUnitString( m_aViewSize100mm.Width(), eFieldUnit, cSeparator ); aHeightString = GetUnitString( m_aViewSize100mm.Height(), eFieldUnit, cSeparator ); @@ -220,7 +220,7 @@ void CompressGraphicsDialog::Update() aMemStream.Seek( STREAM_SEEK_TO_END ); sal_Int32 aNativeSize = aMemStream.Tell(); - OUString aNativeSizeString = SVX_RESSTR(STR_IMAGE_CAPACITY); + OUString aNativeSizeString = SvxResId(STR_IMAGE_CAPACITY); aNativeSizeString = aNativeSizeString.replaceAll("$(CAPACITY)", OUString::number(aNativeSize / 1024)); m_pFixedText5->SetText(aNativeSizeString); @@ -385,7 +385,7 @@ IMPL_LINK_NOARG( CompressGraphicsDialog, CalculateClickHdl, Button*, void ) { OUString aSizeAsString = OUString::number(aSize / 1024); - OUString aNewSizeString = SVX_RESSTR(STR_IMAGE_CAPACITY); + OUString aNewSizeString = SvxResId(STR_IMAGE_CAPACITY); aNewSizeString = aNewSizeString.replaceAll("$(CAPACITY)", aSizeAsString); m_pFixedText6->SetText(aNewSizeString); } diff --git a/svx/source/dialog/contimp.hxx b/svx/source/dialog/contimp.hxx index 3291d066ec71..971f31cf21c4 100644 --- a/svx/source/dialog/contimp.hxx +++ b/svx/source/dialog/contimp.hxx @@ -25,8 +25,6 @@ #include <vcl/status.hxx> #include <vcl/idle.hxx> -#define CONT_RESID(nId) ResId( nId, DIALOG_MGR() ) - class SvxSuperContourDlg; class SvxContourDlgItem : public SfxControllerItem diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx index 258fe69f1c4a..17952278e00d 100644 --- a/svx/source/dialog/dlgctl3d.cxx +++ b/svx/source/dialog/dlgctl3d.cxx @@ -959,7 +959,7 @@ void SvxLightCtl3D::Init() maHorScroller->SetHelpId(HID_CTRL3D_HSCROLL); maVerScroller->SetHelpId(HID_CTRL3D_VSCROLL); maSwitcher->SetHelpId(HID_CTRL3D_SWITCHER); - maSwitcher->SetAccessibleName(SVX_RESSTR(STR_SWITCH)); + maSwitcher->SetAccessibleName(SvxResId(STR_SWITCH)); // Light preview maLightControl->Show(); diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx index def4825ac14d..6926e8e268dc 100644 --- a/svx/source/dialog/dlgctrl.cxx +++ b/svx/source/dialog/dlgctrl.cxx @@ -1228,12 +1228,12 @@ void FillTypeLB::Fill() { SetUpdateMode( false ); - InsertEntry( SVX_RESSTR(RID_SVXSTR_INVISIBLE) ); - InsertEntry( SVX_RESSTR(RID_SVXSTR_COLOR) ); - InsertEntry( SVX_RESSTR(RID_SVXSTR_GRADIENT) ); - InsertEntry( SVX_RESSTR(RID_SVXSTR_HATCH) ); - InsertEntry( SVX_RESSTR(RID_SVXSTR_BITMAP) ); - InsertEntry( SVX_RESSTR(RID_SVXSTR_PATTERN) ); + InsertEntry( SvxResId(RID_SVXSTR_INVISIBLE) ); + InsertEntry( SvxResId(RID_SVXSTR_COLOR) ); + InsertEntry( SvxResId(RID_SVXSTR_GRADIENT) ); + InsertEntry( SvxResId(RID_SVXSTR_HATCH) ); + InsertEntry( SvxResId(RID_SVXSTR_BITMAP) ); + InsertEntry( SvxResId(RID_SVXSTR_PATTERN) ); AdaptDropDownLineCountToMaximum(); SetUpdateMode( true ); diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx index 90fd4805b660..0d5814ce75ea 100644 --- a/svx/source/dialog/docrecovery.cxx +++ b/svx/source/dialog/docrecovery.cxx @@ -831,7 +831,7 @@ void RecovDocList::InitEntry(SvTreeListEntry* pEntry, short impl_askUserForWizardCancel(vcl::Window* pParent, sal_Int16 nRes) { - ScopedVclPtrInstance< MessageDialog > aQuery(pParent, SVX_RES(nRes), VclMessageType::Question, VclButtonsType::YesNo); + ScopedVclPtrInstance< MessageDialog > aQuery(pParent, SvxResId(nRes), VclMessageType::Question, VclButtonsType::YesNo); if (aQuery->Execute() == RET_YES) return DLG_RET_OK; else @@ -841,9 +841,9 @@ short impl_askUserForWizardCancel(vcl::Window* pParent, sal_Int16 nRes) RecoveryDialog::RecoveryDialog(vcl::Window* pParent, RecoveryCore* pCore) : Dialog(pParent, "DocRecoveryRecoverDialog", "svx/ui/docrecoveryrecoverdialog.ui") - , m_aTitleRecoveryInProgress(SVX_RESSTR(RID_SVXSTR_RECOVERY_INPROGRESS)) - , m_aRecoveryOnlyFinish (SVX_RESSTR(RID_SVXSTR_RECOVERYONLY_FINISH)) - , m_aRecoveryOnlyFinishDescr(SVX_RESSTR(RID_SVXSTR_RECOVERYONLY_FINISH_DESCR)) + , m_aTitleRecoveryInProgress(SvxResId(RID_SVXSTR_RECOVERY_INPROGRESS)) + , m_aRecoveryOnlyFinish (SvxResId(RID_SVXSTR_RECOVERYONLY_FINISH)) + , m_aRecoveryOnlyFinishDescr(SvxResId(RID_SVXSTR_RECOVERYONLY_FINISH_DESCR)) , m_pCore(pCore) , m_eRecoveryState(RecoveryDialog::E_RECOVERY_PREPARED) , m_bWaitForCore(false) diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx index b6bd8a1422b4..1bb997084716 100644 --- a/svx/source/dialog/langbox.cxx +++ b/svx/source/dialog/langbox.cxx @@ -56,7 +56,7 @@ OUString GetDicInfoStr( const OUString& rName, const LanguageType nLang, bool bN } if ( LANGUAGE_NONE == nLang ) - aTmp += SVX_RESSTR(RID_SVXSTR_LANGUAGE_ALL); + aTmp += SvxResId(RID_SVXSTR_LANGUAGE_ALL); else { aTmp += "["; @@ -149,7 +149,7 @@ void SvxLanguageBoxBase::ImplLanguageBoxBaseInit() { m_aNotCheckedImage = Image(BitmapEx(RID_SVXBMP_NOTCHECKED)); m_aCheckedImage = Image(BitmapEx(RID_SVXBMP_CHECKED)); - m_aAllString = SVX_RESSTR( RID_SVXSTR_LANGUAGE_ALL ); + m_aAllString = SvxResId( RID_SVXSTR_LANGUAGE_ALL ); m_nLangList = SvxLanguageListFlags::EMPTY; m_bHasLangNone = false; m_bLangNoneIsLangAll = false; diff --git a/svx/source/dialog/pagenumberlistbox.cxx b/svx/source/dialog/pagenumberlistbox.cxx index 9a6859293333..88d6789cf18e 100644 --- a/svx/source/dialog/pagenumberlistbox.cxx +++ b/svx/source/dialog/pagenumberlistbox.cxx @@ -27,7 +27,7 @@ PageNumberListBox::PageNumberListBox(vcl::Window* pParent) : ListBox( pParent, WB_BORDER | WB_DROPDOWN) { - ResStringArray aPaperAry( SVX_RES( RID_SVXSTRARY_NUMBERINGTYPE ) ); + ResStringArray aPaperAry( ResId(RID_SVXSTRARY_NUMBERINGTYPE, DIALOG_MGR()) ); sal_uInt32 nCnt = aPaperAry.Count(); for ( sal_uInt32 i = 0; i < nCnt; ++i ) diff --git a/svx/source/dialog/papersizelistbox.cxx b/svx/source/dialog/papersizelistbox.cxx index 57cc63fe3acd..263de1e0712a 100644 --- a/svx/source/dialog/papersizelistbox.cxx +++ b/svx/source/dialog/papersizelistbox.cxx @@ -34,8 +34,8 @@ VCL_BUILDER_FACTORY(PaperSizeListBox); void PaperSizeListBox::FillPaperSizeEntries( PaperSizeApp eApp ) { - ResStringArray aPaperAry( SVX_RES( ( eApp == PaperSizeApp::Std ) ? - RID_SVXSTRARY_PAPERSIZE_STD : RID_SVXSTRARY_PAPERSIZE_DRAW ) ); + ResStringArray aPaperAry( ResId( ( eApp == PaperSizeApp::Std ) ? + RID_SVXSTRARY_PAPERSIZE_STD : RID_SVXSTRARY_PAPERSIZE_DRAW, DIALOG_MGR() ) ); sal_uInt32 nCnt = aPaperAry.Count(); for ( sal_uInt32 i = 0; i < nCnt; ++i ) diff --git a/svx/source/dialog/passwd.cxx b/svx/source/dialog/passwd.cxx index 10b54deb49a8..ef8a0372a1cc 100644 --- a/svx/source/dialog/passwd.cxx +++ b/svx/source/dialog/passwd.cxx @@ -67,8 +67,8 @@ IMPL_LINK_NOARG(SvxPasswordDialog, EditModifyHdl, Edit&, void) SvxPasswordDialog::SvxPasswordDialog(vcl::Window* pParent, bool bAllowEmptyPasswords, bool bDisableOldPassword) : SfxModalDialog(pParent, "PasswordDialog", "svx/ui/passwd.ui") - , aOldPasswdErrStr(SVX_RESSTR(RID_SVXSTR_ERR_OLD_PASSWD)) - , aRepeatPasswdErrStr(SVX_RESSTR(RID_SVXSTR_ERR_REPEAT_PASSWD )) + , aOldPasswdErrStr(SvxResId(RID_SVXSTR_ERR_OLD_PASSWD)) + , aRepeatPasswdErrStr(SvxResId(RID_SVXSTR_ERR_REPEAT_PASSWD )) , bEmpty(bAllowEmptyPasswords) { get(m_pOldFL, "oldpass"); diff --git a/svx/source/dialog/prtqry.cxx b/svx/source/dialog/prtqry.cxx index b67d5916473d..a7876a19e106 100644 --- a/svx/source/dialog/prtqry.cxx +++ b/svx/source/dialog/prtqry.cxx @@ -24,15 +24,15 @@ SvxPrtQryBox::SvxPrtQryBox(vcl::Window* pParent) : MessBox(pParent, 0, - SVX_RESSTR(RID_SVXSTR_QRY_PRINT_TITLE), - SVX_RESSTR(RID_SVXSTR_QRY_PRINT_MSG)) + SvxResId(RID_SVXSTR_QRY_PRINT_TITLE), + SvxResId(RID_SVXSTR_QRY_PRINT_MSG)) { SetImage( QueryBox::GetStandardImage() ); - AddButton(SVX_RESSTR(RID_SVXSTR_QRY_PRINT_SELECTION), RET_OK, + AddButton(SvxResId(RID_SVXSTR_QRY_PRINT_SELECTION), RET_OK, ButtonDialogFlags::Default | ButtonDialogFlags::OK | ButtonDialogFlags::Focus); - AddButton(SVX_RESSTR(RID_SVXSTR_QRY_PRINT_ALL), 2); + AddButton(SvxResId(RID_SVXSTR_QRY_PRINT_ALL), 2); AddButton(StandardButtonType::Cancel, RET_CANCEL, ButtonDialogFlags::Cancel); SetButtonHelpText( RET_OK, OUString() ); } diff --git a/svx/source/dialog/samecontentlistbox.cxx b/svx/source/dialog/samecontentlistbox.cxx index 4fe85739e909..5e46d593cd87 100644 --- a/svx/source/dialog/samecontentlistbox.cxx +++ b/svx/source/dialog/samecontentlistbox.cxx @@ -25,7 +25,7 @@ SameContentListBox::SameContentListBox(vcl::Window* pParent) : ListBox( pParent, WB_BORDER | WB_DROPDOWN) { - ResStringArray aSameContentAry( SVX_RES( RID_SVXSTRARY_SAMECONTENT ) ); + ResStringArray aSameContentAry( ResId(RID_SVXSTRARY_SAMECONTENT, DIALOG_MGR()) ); sal_uInt32 nCnt = aSameContentAry.Count(); for ( sal_uInt32 i = 0; i < nCnt; ++i ) diff --git a/svx/source/dialog/spacinglistbox.cxx b/svx/source/dialog/spacinglistbox.cxx index b30a3c69adcc..14b8a05ad975 100644 --- a/svx/source/dialog/spacinglistbox.cxx +++ b/svx/source/dialog/spacinglistbox.cxx @@ -25,7 +25,7 @@ SpacingListBox::SpacingListBox(vcl::Window* pParent) : ListBox( pParent, WB_BORDER | WB_DROPDOWN) { - ResStringArray aSpacingAry( SVX_RES( RID_SVXSTRARY_SPACING ) ); + ResStringArray aSpacingAry( ResId(RID_SVXSTRARY_SPACING, DIALOG_MGR()) ); sal_uInt32 nCnt = aSpacingAry.Count(); for ( sal_uInt32 i = 0; i < nCnt; ++i ) diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index b3fac6fb6413..2fbeeaf30088 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -426,9 +426,9 @@ void SvxSearchDialog::Construct_Impl() aCalcStr += "#"; aCalcStr += m_pWordBtn->GetText(); - aLayoutStr = SVX_RESSTR( RID_SVXSTR_SEARCH_STYLES ); - aLayoutWriterStr = SVX_RESSTR( RID_SVXSTR_WRITER_STYLES ); - aLayoutCalcStr = SVX_RESSTR( RID_SVXSTR_CALC_STYLES ); + aLayoutStr = SvxResId( RID_SVXSTR_SEARCH_STYLES ); + aLayoutWriterStr = SvxResId( RID_SVXSTR_WRITER_STYLES ); + aLayoutCalcStr = SvxResId( RID_SVXSTR_CALC_STYLES ); aStylesStr = m_pLayoutBtn->GetText(); // Get stored search-strings from the application @@ -1996,12 +1996,12 @@ IMPL_LINK_NOARG(SvxSearchDialog, FormatHdl_Impl, Button*, void) if ( bSearch ) { - aTxt = SVX_RESSTR( RID_SVXSTR_SEARCH ); + aTxt = SvxResId( RID_SVXSTR_SEARCH ); pSearchList->Get( aSet ); } else { - aTxt = SVX_RESSTR( RID_SVXSTR_REPLACE ); + aTxt = SvxResId( RID_SVXSTR_REPLACE ); pReplaceList->Get( aSet ); } aSet.DisableItem(SID_ATTR_PARA_MODEL); @@ -2160,7 +2160,7 @@ OUString& SvxSearchDialog::BuildAttrText_Impl( OUString& rStr, default: ;//prevent warning } - ResStringArray aAttrNames( SVX_RES( RID_ATTR_NAMES ) ); + ResStringArray aAttrNames(ResId(RID_ATTR_NAMES, DIALOG_MGR())); for ( sal_uInt16 i = 0; i < pList->Count(); ++i ) { @@ -2179,7 +2179,7 @@ OUString& SvxSearchDialog::BuildAttrText_Impl( OUString& rStr, else if ( rItem.nSlot == SID_ATTR_BRUSH_CHAR ) { // Special treatment for text background - rStr += SVX_RESSTR( RID_SVXITEMS_BRUSH_CHAR ); + rStr += SvxResId( RID_SVXITEMS_BRUSH_CHAR ); } else { @@ -2399,13 +2399,13 @@ void SvxSearchDialogWrapper::SetSearchLabel(const SearchLabel& rSL) { OUString sStr; if (rSL == SearchLabel::End) - sStr = SVX_RESSTR(RID_SVXSTR_SEARCH_END); + sStr = SvxResId(RID_SVXSTR_SEARCH_END); else if (rSL == SearchLabel::Start) - sStr = SVX_RESSTR(RID_SVXSTR_SEARCH_START); + sStr = SvxResId(RID_SVXSTR_SEARCH_START); else if (rSL == SearchLabel::EndSheet) - sStr = SVX_RESSTR(RID_SVXSTR_SEARCH_END_SHEET); + sStr = SvxResId(RID_SVXSTR_SEARCH_END_SHEET); else if (rSL == SearchLabel::NotFound) - sStr = SVX_RESSTR(RID_SVXSTR_SEARCH_NOT_FOUND); + sStr = SvxResId(RID_SVXSTR_SEARCH_NOT_FOUND); if (vcl::Window *pSearchLabel = lcl_GetSearchLabelWindow()) { diff --git a/svx/source/dialog/strarray.cxx b/svx/source/dialog/strarray.cxx index 6b2b319fade8..a30be0454610 100644 --- a/svx/source/dialog/strarray.cxx +++ b/svx/source/dialog/strarray.cxx @@ -21,15 +21,12 @@ #include <svx/dialmgr.hxx> #include <svx/strarray.hxx> - SvxStringArray::SvxStringArray( sal_uInt32 nResId ) : - - ResStringArray( SVX_RES( nResId ) ) + ResStringArray(ResId(nResId, DIALOG_MGR())) { } - SvxStringArray::SvxStringArray( const ResId& rResId ) : ResStringArray( rResId ) { @@ -40,7 +37,6 @@ SvxStringArray::~SvxStringArray() { } - const OUString SvxStringArray::GetStringByPos( sal_uInt32 nPos ) const { if ( RESARRAY_INDEX_NOTFOUND != nPos && nPos < Count() ) diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx index 79791f414242..7a5230b845f3 100644 --- a/svx/source/dialog/svxbmpnumvalueset.cxx +++ b/svx/source/dialog/svxbmpnumvalueset.cxx @@ -398,7 +398,7 @@ void SvxNumValueSet::init(NumberingPageType eType) for ( sal_uInt16 i = 0; i < 8; i++ ) { InsertItem( i + 1, i ); - SetItemText( i + 1, SVX_RESSTR( RID_SVXSTR_BULLET_DESCRIPTIONS + i ) ); + SetItemText( i + 1, SvxResId( RID_SVXSTR_BULLET_DESCRIPTIONS + i ) ); } } } @@ -428,7 +428,7 @@ void SvxNumValueSet::SetNumberingSettings( { InsertItem( i + 1, i ); if( i < 8 ) - SetItemText( i + 1, SVX_RESSTR( RID_SVXSTR_SINGLENUM_DESCRIPTIONS + i )); + SetItemText( i + 1, SvxResId( RID_SVXSTR_SINGLENUM_DESCRIPTIONS + i )); } } @@ -446,7 +446,7 @@ void SvxNumValueSet::SetOutlineNumberingSettings( { InsertItem( i + 1, i ); if( i < 8 ) - SetItemText( i + 1, SVX_RESSTR( RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + i )); + SetItemText( i + 1, SvxResId( RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + i )); } } diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx index 7aa3cbb9ccec..806b36e17004 100644 --- a/svx/source/dialog/svxruler.cxx +++ b/svx/source/dialog/svxruler.cxx @@ -3395,7 +3395,7 @@ void SvxRuler::Command( const CommandEvent& rCommandEvent ) nStyle |= static_cast<sal_uInt16>(bHorz ? WB_HORZ : WB_VERT); DrawTab(*pDev, aFillColor, aPt, nStyle); aMenu->InsertItem(i + 1, - ResId(RID_SVXSTR_RULER_START + i, DIALOG_MGR()).toString(), + SvxResId(RID_SVXSTR_RULER_START + i), Image(BitmapEx(pDev->GetBitmap(Point(), aSz), Color(COL_WHITE)))); aMenu->CheckItem(i + 1, i == mpTabs[mxRulerImpl->nIdx + TAB_GAP].nStyle); pDev->SetOutputSize(aSz); // delete device diff --git a/svx/source/dialog/swframeposstrings.cxx b/svx/source/dialog/swframeposstrings.cxx index 731b17d7c5a5..5deb147a62f5 100644 --- a/svx/source/dialog/swframeposstrings.cxx +++ b/svx/source/dialog/swframeposstrings.cxx @@ -24,7 +24,7 @@ #include <svx/dialogs.hrc> SvxSwFramePosString::SvxSwFramePosString() : - pImpl(new ResStringArray(SVX_RES(RID_SVXSW_FRAMEPOSITIONS))) + pImpl(new ResStringArray(ResId(RID_SVXSW_FRAMEPOSITIONS, DIALOG_MGR()))) { assert(pImpl->Count() == SvxSwFramePosString::STR_MAX); } diff --git a/svx/source/dialog/txenctab.cxx b/svx/source/dialog/txenctab.cxx index 4da766fa9ef6..497acba45171 100644 --- a/svx/source/dialog/txenctab.cxx +++ b/svx/source/dialog/txenctab.cxx @@ -23,8 +23,7 @@ #include "svx/txenctab.hxx" SvxTextEncodingTable::SvxTextEncodingTable() - : - ResStringArray( SVX_RES( RID_SVXSTR_TEXTENCODING_TABLE ) ) + : ResStringArray(ResId(RID_SVXSTR_TEXTENCODING_TABLE, DIALOG_MGR())) { } diff --git a/svx/source/engine3d/dragmt3d.cxx b/svx/source/engine3d/dragmt3d.cxx index 8488f13e3d60..14a4b993e1f8 100644 --- a/svx/source/engine3d/dragmt3d.cxx +++ b/svx/source/engine3d/dragmt3d.cxx @@ -151,7 +151,7 @@ bool E3dDragMethod::EndSdrDrag(bool /*bCopy*/) { const bool bUndo = getSdrDragView().IsUndoEnabled(); if( bUndo ) - getSdrDragView().BegUndo(SVX_RESSTR(RID_SVX_3D_UNDO_ROTATE)); + getSdrDragView().BegUndo(SvxResId(RID_SVX_3D_UNDO_ROTATE)); sal_uInt32 nOb(0); for(nOb=0;nOb<nCnt;nOb++) diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx index a5e285ee1416..41a97fd226bf 100644 --- a/svx/source/engine3d/float3d.cxx +++ b/svx/source/engine3d/float3d.cxx @@ -2767,13 +2767,13 @@ namespace { OUString lcl_makeColorName(const Color& rColor) { - OUString aStr = SVX_RESSTR(RID_SVXFLOAT3D_FIX_R) + + OUString aStr = SvxResId(RID_SVXFLOAT3D_FIX_R) + OUString::number(rColor.GetRed()) + " " + - SVX_RESSTR(RID_SVXFLOAT3D_FIX_G) + + SvxResId(RID_SVXFLOAT3D_FIX_G) + OUString::number(rColor.GetGreen()) + " " + - SVX_RESSTR(RID_SVXFLOAT3D_FIX_B) + + SvxResId(RID_SVXFLOAT3D_FIX_B) + OUString::number(rColor.GetBlue()); return aStr; } diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx index deb4ffe1d24d..9540d3f1cd52 100644 --- a/svx/source/engine3d/view3d.cxx +++ b/svx/source/engine3d/view3d.cxx @@ -460,7 +460,7 @@ bool E3dView::Paste( if(pOwner && dynamic_cast< const E3dScene* >(pOwner) != nullptr) { E3dScene* pDstScene = static_cast<E3dScene*>(pOwner); - BegUndo(SVX_RESSTR(RID_SVX_3D_UNDO_EXCHANGE_PASTE)); + BegUndo(SvxResId(RID_SVX_3D_UNDO_EXCHANGE_PASTE)); // Copy all objects from E3dScenes and insert them directly for(sal_uInt16 nPg(0); nPg < rMod.GetPageCount(); nPg++) @@ -833,9 +833,9 @@ void E3dView::ConvertMarkedObjTo3D(bool bExtrude, const basegfx::B2DPoint& rPnt1 { // Create undo if(bExtrude) - BegUndo(SVX_RESSTR(RID_SVX_3D_UNDO_EXTRUDE)); + BegUndo(SvxResId(RID_SVX_3D_UNDO_EXTRUDE)); else - BegUndo(SVX_RESSTR(RID_SVX_3D_UNDO_LATHE)); + BegUndo(SvxResId(RID_SVX_3D_UNDO_LATHE)); // Create a new scene for the created 3D object E3dScene* pScene = new E3dScene; @@ -1566,7 +1566,7 @@ void E3dView::Break3DObj() // ALL selected objects are changed const size_t nCount = GetMarkedObjectCount(); - BegUndo(SVX_RESSTR(RID_SVX_3D_UNDO_BREAK_LATHE)); + BegUndo(SvxResId(RID_SVX_3D_UNDO_BREAK_LATHE)); for(size_t a=0; a<nCount; ++a) { E3dObject* pObj = static_cast<E3dObject*>(GetMarkedObjectByIndex(a)); diff --git a/svx/source/engine3d/view3d1.cxx b/svx/source/engine3d/view3d1.cxx index 649e2ddf4fb8..74ada1128d04 100644 --- a/svx/source/engine3d/view3d1.cxx +++ b/svx/source/engine3d/view3d1.cxx @@ -58,7 +58,7 @@ void E3dView::ConvertMarkedToPolyObj() pNewObj = pScene->ConvertToPolyObj(bBezier, false/*bLineToArea*/); if (pNewObj) { - BegUndo(SVX_RESSTR(RID_SVX_3D_UNDO_EXTRUDE)); + BegUndo(SvxResId(RID_SVX_3D_UNDO_EXTRUDE)); ReplaceObjectAtView(pObj, *GetSdrPageView(), pNewObj); EndUndo(); } diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index 9f913c0ec943..8cdb4b59e055 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -539,10 +539,10 @@ IMPL_LINK_NOARG( FmGridHeader, OnAsyncExecuteDrop, void*, void ) if (bDateNTimeCol) { - OUString sTimePostfix(SVX_RESSTR(RID_STR_POSTFIX_TIME)); + OUString sTimePostfix(SvxResId(RID_STR_POSTFIX_TIME)); xCol->setPropertyValue(FM_PROP_LABEL, makeAny( OUString( sFieldName + sTimePostfix ) ) ); - OUString sDatePostfix(SVX_RESSTR( RID_STR_POSTFIX_DATE)); + OUString sDatePostfix(SvxResId( RID_STR_POSTFIX_DATE)); xSecondCol->setPropertyValue(FM_PROP_LABEL, makeAny( OUString( sFieldName + sDatePostfix ) ) ); } else @@ -567,8 +567,8 @@ IMPL_LINK_NOARG( FmGridHeader, OnAsyncExecuteDrop, void*, void ) OUString sRealName,sPurePostfix; OUString aPostfix[] = { - SVX_RESSTR(RID_STR_POSTFIX_DATE), - SVX_RESSTR(RID_STR_POSTFIX_TIME) + SvxResId(RID_STR_POSTFIX_DATE), + SvxResId(RID_STR_POSTFIX_TIME) }; for ( size_t i=0; i<2; ++i ) diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index f7da0e13f846..c52e4764da5d 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -487,7 +487,7 @@ void DbGridColumn::Paint(OutputDevice& rDev, nStyle |= DrawTextFlags::Left; } - rDev.DrawText(rRect, SVX_RESSTR(RID_STR_AUTOFIELD), nStyle); + rDev.DrawText(rRect, SvxResId(RID_STR_AUTOFIELD), nStyle); } else if (pRow->HasField(m_nFieldPos)) { diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index a9b9a4ab74f9..af464e75a3ee 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -359,8 +359,8 @@ DbGridControl::NavigationBar::NavigationBar(vcl::Window* pParent) m_aLastBtn->SetClickHdl(LINK(this,NavigationBar,OnClick)); m_aNewBtn->SetClickHdl(LINK(this,NavigationBar,OnClick)); - m_aRecordText->SetText(SVX_RESSTR(RID_STR_REC_TEXT)); - m_aRecordOf->SetText(SVX_RESSTR(RID_STR_REC_FROM_TEXT)); + m_aRecordText->SetText(SvxResId(RID_STR_REC_TEXT)); + m_aRecordOf->SetText(SvxResId(RID_STR_REC_FROM_TEXT)); m_aRecordCount->SetText(OUString('?')); m_aFirstBtn->Disable(); @@ -975,7 +975,7 @@ DbGridControl::DbGridControl( ,m_bUpdating(false) { - OUString sName(SVX_RESSTR(RID_STR_NAVIGATIONBAR)); + OUString sName(SvxResId(RID_STR_NAVIGATIONBAR)); m_aBar->SetAccessibleName(sName); m_aBar->Show(); ImplInitWindow( InitWindowFacet::All ); diff --git a/svx/source/form/ParseContext.cxx b/svx/source/form/ParseContext.cxx index c5a2654750ba..82f432ac9192 100644 --- a/svx/source/form/ParseContext.cxx +++ b/svx/source/form/ParseContext.cxx @@ -36,7 +36,7 @@ OSystemParseContext::OSystemParseContext() : IParseContext() { SolarMutexGuard aGuard; - ResStringArray aLocalizedKeywords(SVX_RES(RID_RSC_SQL_INTERNATIONAL)); + ResStringArray aLocalizedKeywords(ResId(RID_RSC_SQL_INTERNATIONAL, DIALOG_MGR())); for (sal_uInt32 i = 0; i < aLocalizedKeywords.Count(); ++i) m_aLocalizedKeywords.push_back(aLocalizedKeywords.GetString(i)); } @@ -56,18 +56,18 @@ OUString OSystemParseContext::getErrorMessage(ErrorCode _eCode) const SolarMutexGuard aGuard; switch (_eCode) { - case ErrorCode::General: aMsg = SVX_RESSTR(RID_STR_SVT_SQL_SYNTAX_ERROR); break; - case ErrorCode::ValueNoLike: aMsg = SVX_RESSTR(RID_STR_SVT_SQL_SYNTAX_VALUE_NO_LIKE); break; - case ErrorCode::FieldNoLike: aMsg = SVX_RESSTR(RID_STR_SVT_SQL_SYNTAX_FIELD_NO_LIKE); break; - case ErrorCode::InvalidCompare: aMsg = SVX_RESSTR(RID_STR_SVT_SQL_SYNTAX_CRIT_NO_COMPARE); break; - case ErrorCode::InvalidIntCompare: aMsg = SVX_RESSTR(RID_STR_SVT_SQL_SYNTAX_INT_NO_VALID); break; - case ErrorCode::InvalidDateCompare: aMsg = SVX_RESSTR(RID_STR_SVT_SQL_SYNTAX_ACCESS_DAT_NO_VALID); break; - case ErrorCode::InvalidRealCompare: aMsg = SVX_RESSTR(RID_STR_SVT_SQL_SYNTAX_REAL_NO_VALID); break; - case ErrorCode::InvalidTableNosuch: aMsg = SVX_RESSTR(RID_STR_SVT_SQL_SYNTAX_TABLE); break; - case ErrorCode::InvalidTableOrQuery: aMsg = SVX_RESSTR(RID_STR_SVT_SQL_SYNTAX_TABLE_OR_QUERY); break; - case ErrorCode::InvalidColumn: aMsg = SVX_RESSTR(RID_STR_SVT_SQL_SYNTAX_COLUMN); break; - case ErrorCode::InvalidTableExist: aMsg = SVX_RESSTR(RID_STR_SVT_SQL_SYNTAX_TABLE_EXISTS); break; - case ErrorCode::InvalidQueryExist: aMsg = SVX_RESSTR(RID_STR_SVT_SQL_SYNTAX_QUERY_EXISTS); break; + case ErrorCode::General: aMsg = SvxResId(RID_STR_SVT_SQL_SYNTAX_ERROR); break; + case ErrorCode::ValueNoLike: aMsg = SvxResId(RID_STR_SVT_SQL_SYNTAX_VALUE_NO_LIKE); break; + case ErrorCode::FieldNoLike: aMsg = SvxResId(RID_STR_SVT_SQL_SYNTAX_FIELD_NO_LIKE); break; + case ErrorCode::InvalidCompare: aMsg = SvxResId(RID_STR_SVT_SQL_SYNTAX_CRIT_NO_COMPARE); break; + case ErrorCode::InvalidIntCompare: aMsg = SvxResId(RID_STR_SVT_SQL_SYNTAX_INT_NO_VALID); break; + case ErrorCode::InvalidDateCompare: aMsg = SvxResId(RID_STR_SVT_SQL_SYNTAX_ACCESS_DAT_NO_VALID); break; + case ErrorCode::InvalidRealCompare: aMsg = SvxResId(RID_STR_SVT_SQL_SYNTAX_REAL_NO_VALID); break; + case ErrorCode::InvalidTableNosuch: aMsg = SvxResId(RID_STR_SVT_SQL_SYNTAX_TABLE); break; + case ErrorCode::InvalidTableOrQuery: aMsg = SvxResId(RID_STR_SVT_SQL_SYNTAX_TABLE_OR_QUERY); break; + case ErrorCode::InvalidColumn: aMsg = SvxResId(RID_STR_SVT_SQL_SYNTAX_COLUMN); break; + case ErrorCode::InvalidTableExist: aMsg = SvxResId(RID_STR_SVT_SQL_SYNTAX_TABLE_EXISTS); break; + case ErrorCode::InvalidQueryExist: aMsg = SvxResId(RID_STR_SVT_SQL_SYNTAX_QUERY_EXISTS); break; default: break; } return aMsg; diff --git a/svx/source/form/databaselocationinput.cxx b/svx/source/form/databaselocationinput.cxx index be1665d8eebd..bf7355729a28 100644 --- a/svx/source/form/databaselocationinput.cxx +++ b/svx/source/form/databaselocationinput.cxx @@ -127,7 +127,7 @@ namespace svx { if ( ::utl::UCBContentHelper::Exists( sURL ) ) { - ScopedVclPtrInstance< QueryBox > aBox( m_rLocationInput.GetSystemWindow(), WB_YES_NO, SVX_RESSTR(RID_STR_ALREADYEXISTOVERWRITE) ); + ScopedVclPtrInstance< QueryBox > aBox( m_rLocationInput.GetSystemWindow(), WB_YES_NO, SvxResId(RID_STR_ALREADYEXISTOVERWRITE) ); if ( aBox->Execute() != RET_YES ) return false; } diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index 0cc5b768e009..5a382dbe6fd1 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -238,15 +238,15 @@ namespace svxform if ( DGTSubmission == m_eGroup ) { - m_xMenu->SetItemText(m_xMenu->GetItemId("additem"), SVX_RESSTR(RID_STR_DATANAV_ADD_SUBMISSION)); - m_xMenu->SetItemText(m_xMenu->GetItemId("edit"), SVX_RESSTR(RID_STR_DATANAV_EDIT_SUBMISSION)); - m_xMenu->SetItemText(m_xMenu->GetItemId("delete"), SVX_RESSTR(RID_STR_DATANAV_REMOVE_SUBMISSION)); + m_xMenu->SetItemText(m_xMenu->GetItemId("additem"), SvxResId(RID_STR_DATANAV_ADD_SUBMISSION)); + m_xMenu->SetItemText(m_xMenu->GetItemId("edit"), SvxResId(RID_STR_DATANAV_EDIT_SUBMISSION)); + m_xMenu->SetItemText(m_xMenu->GetItemId("delete"), SvxResId(RID_STR_DATANAV_REMOVE_SUBMISSION)); } else { - m_xMenu->SetItemText(m_xMenu->GetItemId("additem"), SVX_RESSTR(RID_STR_DATANAV_ADD_BINDING)); - m_xMenu->SetItemText(m_xMenu->GetItemId("edit"), SVX_RESSTR(RID_STR_DATANAV_EDIT_BINDING)); - m_xMenu->SetItemText(m_xMenu->GetItemId("delete"), SVX_RESSTR(RID_STR_DATANAV_REMOVE_BINDING)); + m_xMenu->SetItemText(m_xMenu->GetItemId("additem"), SvxResId(RID_STR_DATANAV_ADD_BINDING)); + m_xMenu->SetItemText(m_xMenu->GetItemId("edit"), SvxResId(RID_STR_DATANAV_EDIT_BINDING)); + m_xMenu->SetItemText(m_xMenu->GetItemId("delete"), SvxResId(RID_STR_DATANAV_REMOVE_BINDING)); } } m_pXFormsPage->EnableMenuItems(m_xMenu.get()); @@ -359,15 +359,15 @@ namespace svxform if ( DGTSubmission == m_eGroup ) { - m_pToolBox->SetItemText( m_nAddId, SVX_RESSTR( RID_STR_DATANAV_ADD_SUBMISSION ) ); - m_pToolBox->SetItemText( m_nEditId, SVX_RESSTR( RID_STR_DATANAV_EDIT_SUBMISSION ) ); - m_pToolBox->SetItemText( m_nRemoveId, SVX_RESSTR( RID_STR_DATANAV_REMOVE_SUBMISSION ) ); + m_pToolBox->SetItemText( m_nAddId, SvxResId( RID_STR_DATANAV_ADD_SUBMISSION ) ); + m_pToolBox->SetItemText( m_nEditId, SvxResId( RID_STR_DATANAV_EDIT_SUBMISSION ) ); + m_pToolBox->SetItemText( m_nRemoveId, SvxResId( RID_STR_DATANAV_REMOVE_SUBMISSION ) ); } else { - m_pToolBox->SetItemText( m_nAddId, SVX_RESSTR( RID_STR_DATANAV_ADD_BINDING ) ); - m_pToolBox->SetItemText( m_nEditId, SVX_RESSTR( RID_STR_DATANAV_EDIT_BINDING ) ); - m_pToolBox->SetItemText( m_nRemoveId, SVX_RESSTR( RID_STR_DATANAV_REMOVE_BINDING ) ); + m_pToolBox->SetItemText( m_nAddId, SvxResId( RID_STR_DATANAV_ADD_BINDING ) ); + m_pToolBox->SetItemText( m_nEditId, SvxResId( RID_STR_DATANAV_EDIT_BINDING ) ); + m_pToolBox->SetItemText( m_nRemoveId, SvxResId( RID_STR_DATANAV_REMOVE_BINDING ) ); } } @@ -622,7 +622,7 @@ namespace svxform } ScopedVclPtrInstance< AddDataItemDialog > aDlg( this, pNode, m_xUIHelper ); - aDlg->SetText( SVX_RESSTR( nResId ) ); + aDlg->SetText( SvxResId( nResId ) ); aDlg->InitText( eType ); short nReturn = aDlg->Execute(); if ( DGTInstance == m_eGroup ) @@ -718,7 +718,7 @@ namespace svxform nResId = RID_STR_DATANAV_EDIT_BINDING; eType = DITBinding; } - aDlg->SetText( SVX_RESSTR( nResId ) ); + aDlg->SetText( SvxResId( nResId ) ); aDlg->InitText( eType ); if ( aDlg->Execute() == RET_OK ) { @@ -761,7 +761,7 @@ namespace svxform else { ScopedVclPtrInstance< AddSubmissionDialog > aDlg( this, pNode, m_xUIHelper ); - aDlg->SetText( SVX_RESSTR( RID_STR_DATANAV_EDIT_SUBMISSION ) ); + aDlg->SetText( SvxResId( RID_STR_DATANAV_EDIT_SUBMISSION ) ); if ( aDlg->Execute() == RET_OK ) { EditEntry( pNode->m_xPropSet ); @@ -828,27 +828,27 @@ namespace svxform pEntry = m_pItemList->InsertEntry( sTemp, aImage, aImage, nullptr, false, TREELIST_APPEND, pNode ); // Action _rEntry->getPropertyValue( PN_SUBMISSION_ACTION ) >>= sTemp; - OUString sEntry = SVX_RESSTR( RID_STR_DATANAV_SUBM_ACTION ); + OUString sEntry = SvxResId( RID_STR_DATANAV_SUBM_ACTION ); sEntry += sTemp; m_pItemList->InsertEntry( sEntry, aImage, aImage, pEntry ); // Method _rEntry->getPropertyValue( PN_SUBMISSION_METHOD ) >>= sTemp; - sEntry = SVX_RESSTR( RID_STR_DATANAV_SUBM_METHOD ); + sEntry = SvxResId( RID_STR_DATANAV_SUBM_METHOD ); sEntry += m_aMethodString.toUI( sTemp ); m_pItemList->InsertEntry( sEntry, aImage, aImage, pEntry ); // Ref _rEntry->getPropertyValue( PN_SUBMISSION_REF ) >>= sTemp; - sEntry = SVX_RESSTR( RID_STR_DATANAV_SUBM_REF ); + sEntry = SvxResId( RID_STR_DATANAV_SUBM_REF ); sEntry += sTemp; m_pItemList->InsertEntry( sEntry, aImage, aImage, pEntry ); // Bind _rEntry->getPropertyValue( PN_SUBMISSION_BIND ) >>= sTemp; - sEntry = SVX_RESSTR( RID_STR_DATANAV_SUBM_BIND ); + sEntry = SvxResId( RID_STR_DATANAV_SUBM_BIND ); sEntry += sTemp; m_pItemList->InsertEntry( sEntry, aImage, aImage, pEntry ); // Replace _rEntry->getPropertyValue( PN_SUBMISSION_REPLACE ) >>= sTemp; - sEntry = SVX_RESSTR( RID_STR_DATANAV_SUBM_REPLACE ); + sEntry = SvxResId( RID_STR_DATANAV_SUBM_REPLACE ); sEntry += m_aReplaceString.toUI( sTemp ); m_pItemList->InsertEntry( sEntry, aImage, aImage, pEntry ); } @@ -903,28 +903,28 @@ namespace svxform m_pItemList->SetEntryText( pEntry, sTemp ); _rEntry->getPropertyValue( PN_SUBMISSION_BIND ) >>= sTemp; - OUString sEntry = SVX_RESSTR( RID_STR_DATANAV_SUBM_BIND ); + OUString sEntry = SvxResId( RID_STR_DATANAV_SUBM_BIND ); sEntry += sTemp; sal_uIntPtr nPos = 0; SvTreeListEntry* pChild = m_pItemList->GetEntry( pEntry, nPos++ ); m_pItemList->SetEntryText( pChild, sEntry ); _rEntry->getPropertyValue( PN_SUBMISSION_REF ) >>= sTemp; - sEntry = SVX_RESSTR( RID_STR_DATANAV_SUBM_REF ); + sEntry = SvxResId( RID_STR_DATANAV_SUBM_REF ); sEntry += sTemp; pChild = m_pItemList->GetEntry( pEntry, nPos++ ); m_pItemList->SetEntryText( pChild, sEntry ); _rEntry->getPropertyValue( PN_SUBMISSION_ACTION ) >>= sTemp; - sEntry = SVX_RESSTR( RID_STR_DATANAV_SUBM_ACTION ); + sEntry = SvxResId( RID_STR_DATANAV_SUBM_ACTION ); sEntry += sTemp; pChild = m_pItemList->GetEntry( pEntry, nPos++ ); m_pItemList->SetEntryText( pChild, sEntry ); _rEntry->getPropertyValue( PN_SUBMISSION_METHOD ) >>= sTemp; - sEntry = SVX_RESSTR( RID_STR_DATANAV_SUBM_METHOD ); + sEntry = SvxResId( RID_STR_DATANAV_SUBM_METHOD ); sEntry += m_aMethodString.toUI( sTemp ); pChild = m_pItemList->GetEntry( pEntry, nPos++ ); m_pItemList->SetEntryText( pChild, sEntry ); _rEntry->getPropertyValue( PN_SUBMISSION_REPLACE ) >>= sTemp; - sEntry = SVX_RESSTR( RID_STR_DATANAV_SUBM_REPLACE ); + sEntry = SvxResId( RID_STR_DATANAV_SUBM_REPLACE ); sEntry += m_aReplaceString.toUI( sTemp ); pChild = m_pItemList->GetEntry( pEntry, nPos++ ); m_pItemList->SetEntryText( pChild, sEntry ); @@ -958,7 +958,7 @@ namespace svxform bool bIsElement = ( eChildType == css::xml::dom::NodeType_ELEMENT_NODE ); sal_uInt16 nResId = bIsElement ? RID_STR_QRY_REMOVE_ELEMENT : RID_STR_QRY_REMOVE_ATTRIBUTE; OUString sVar = bIsElement ? OUString(ELEMENTNAME) : OUString(ATTRIBUTENAME); - ScopedVclPtrInstance< MessageDialog > aQBox(this, SVX_RES(nResId), VclMessageType::Question, VclButtonsType::YesNo); + ScopedVclPtrInstance< MessageDialog > aQBox(this, SvxResId(nResId), VclMessageType::Question, VclButtonsType::YesNo); OUString sMessText = aQBox->get_primary_text(); sMessText = sMessText.replaceFirst( sVar, m_xUIHelper->getNodeDisplayName( pNode->m_xNode, false ) ); @@ -1000,7 +1000,7 @@ namespace svxform { SAL_WARN( "svx.form", "XFormsPage::RemoveEntry(): exception caught" ); } - ScopedVclPtrInstance<MessageDialog> aQBox(this, SVX_RES(nResId), + ScopedVclPtrInstance<MessageDialog> aQBox(this, SvxResId(nResId), VclMessageType::Question, VclButtonsType::YesNo); OUString sMessText = aQBox->get_primary_text(); sMessText = sMessText.replaceFirst( sSearch, sName); @@ -1345,12 +1345,12 @@ namespace svxform } } } - m_pToolBox->SetItemText( m_nEditId, SVX_RESSTR( nResId1 ) ); - m_pToolBox->SetItemText( m_nRemoveId, SVX_RESSTR( nResId2 ) ); + m_pToolBox->SetItemText( m_nEditId, SvxResId( nResId1 ) ); + m_pToolBox->SetItemText( m_nRemoveId, SvxResId( nResId2 ) ); if ( _pMenu ) { - _pMenu->SetItemText(_pMenu->GetItemId("edit"), SVX_RESSTR( nResId1 ) ); - _pMenu->SetItemText(_pMenu->GetItemId("delete"), SVX_RESSTR( nResId2 ) ); + _pMenu->SetItemText(_pMenu->GetItemId("edit"), SvxResId( nResId1 ) ); + _pMenu->SetItemText(_pMenu->GetItemId("delete"), SvxResId( nResId2 ) ); } } } @@ -1506,7 +1506,7 @@ namespace svxform if ( m_pModelsBox->GetEntryPos( sNewName ) != LISTBOX_ENTRY_NOTFOUND ) { // error: model name already exists - ScopedVclPtrInstance< MessageDialog > aErrBox( this, SVX_RES( RID_STR_DOUBLE_MODELNAME ) ); + ScopedVclPtrInstance< MessageDialog > aErrBox( this, SvxResId( RID_STR_DOUBLE_MODELNAME ) ); aErrBox->set_primary_text(aErrBox->get_primary_text().replaceFirst(MSG_VARIABLE, sNewName)); aErrBox->Execute(); bShowDialog = true; @@ -1596,7 +1596,7 @@ namespace svxform } else if (sIdent == "modelsremove") { - ScopedVclPtrInstance<MessageDialog> aQBox(this, SVX_RES( RID_STR_QRY_REMOVE_MODEL), + ScopedVclPtrInstance<MessageDialog> aQBox(this, SvxResId( RID_STR_QRY_REMOVE_MODEL), VclMessageType::Question, VclButtonsType::YesNo); OUString sText = aQBox->get_primary_text(); sText = sText.replaceFirst( MODELNAME, sSelectedModel ); @@ -1696,7 +1696,7 @@ namespace svxform if ( pPage ) { OUString sInstName = pPage->GetInstanceName(); - ScopedVclPtrInstance<MessageDialog> aQBox(this, SVX_RES(RID_STR_QRY_REMOVE_INSTANCE), + ScopedVclPtrInstance<MessageDialog> aQBox(this, SvxResId(RID_STR_QRY_REMOVE_INSTANCE), VclMessageType::Question, VclButtonsType::YesNo); OUString sMessText = aQBox->get_primary_text(); sMessText = sMessText.replaceFirst( INSTANCENAME, sInstName ); @@ -2150,7 +2150,7 @@ namespace svxform { - SetText( SVX_RES( RID_STR_DATANAVIGATOR ) ); + SetText( SvxResId( RID_STR_DATANAVIGATOR ) ); Size aSize = m_aDataWin->GetOutputSizePixel(); Size aLogSize = PixelToLogic( aSize, MapUnit::MapAppFont ); @@ -2241,10 +2241,10 @@ namespace svxform , m_xUIHelper(_rUIHelper) , m_pItemNode(_pNode) , m_eItemType(DITNone) - , m_sFL_Element(SVX_RESSTR(RID_STR_ELEMENT)) - , m_sFL_Attribute(SVX_RESSTR(RID_STR_ATTRIBUTE)) - , m_sFL_Binding(SVX_RESSTR(RID_STR_BINDING)) - , m_sFT_BindingExp(SVX_RESSTR(RID_STR_BINDING_EXPR)) + , m_sFL_Element(SvxResId(RID_STR_ELEMENT)) + , m_sFL_Attribute(SvxResId(RID_STR_ATTRIBUTE)) + , m_sFL_Binding(SvxResId(RID_STR_BINDING)) + , m_sFT_BindingExp(SvxResId(RID_STR_BINDING_EXPR)) { get(m_pItemFrame, "itemframe"); get(m_pNameFT, "nameft"); @@ -2451,7 +2451,7 @@ namespace svxform ( bIsHandleBinding && sNewName.isEmpty() ) ) { // Error and don't close the dialog - ScopedVclPtrInstance< MessageDialog > aErrBox( this, SVX_RES( RID_STR_INVALID_XMLNAME ) ); + ScopedVclPtrInstance< MessageDialog > aErrBox( this, SvxResId( RID_STR_INVALID_XMLNAME ) ); aErrBox->set_primary_text(aErrBox->get_primary_text().replaceFirst(MSG_VARIABLE, sNewName)); aErrBox->Execute(); return; @@ -3084,7 +3084,7 @@ namespace svxform { if ( !m_pConditionDlg->GetUIHelper()->isValidPrefixName( sPrefix ) ) { - ScopedVclPtrInstance< MessageDialog > aErrBox(this, SVX_RES( RID_STR_INVALID_XMLPREFIX ) ); + ScopedVclPtrInstance< MessageDialog > aErrBox(this, SvxResId( RID_STR_INVALID_XMLPREFIX ) ); aErrBox->set_primary_text(aErrBox->get_primary_text().replaceFirst(MSG_VARIABLE, sPrefix)); aErrBox->Execute(); return; @@ -3158,7 +3158,7 @@ namespace svxform OUString sName(m_pNameED->GetText()); if(sName.isEmpty()) { - ScopedVclPtrInstance< MessageDialog > aErrorBox(this,SVX_RES(RID_STR_EMPTY_SUBMISSIONNAME)); + ScopedVclPtrInstance< MessageDialog > aErrorBox(this,SvxResId(RID_STR_EMPTY_SUBMISSIONNAME)); aErrorBox->set_primary_text( Application::GetDisplayName() ); aErrorBox->Execute(); return; @@ -3219,9 +3219,9 @@ namespace svxform void AddSubmissionDialog::FillAllBoxes() { // method box - m_pMethodLB->InsertEntry( SVX_RESSTR( RID_STR_METHOD_POST ) ); - m_pMethodLB->InsertEntry( SVX_RESSTR( RID_STR_METHOD_PUT ) ); - m_pMethodLB->InsertEntry( SVX_RESSTR( RID_STR_METHOD_GET ) ); + m_pMethodLB->InsertEntry( SvxResId( RID_STR_METHOD_POST ) ); + m_pMethodLB->InsertEntry( SvxResId( RID_STR_METHOD_PUT ) ); + m_pMethodLB->InsertEntry( SvxResId( RID_STR_METHOD_GET ) ); m_pMethodLB->SelectEntryPos(0); // binding box @@ -3278,9 +3278,9 @@ namespace svxform } // replace box - m_pReplaceLB->InsertEntry( SVX_RESSTR( RID_STR_REPLACE_NONE ) ); - m_pReplaceLB->InsertEntry( SVX_RESSTR( RID_STR_REPLACE_INST ) ); - m_pReplaceLB->InsertEntry( SVX_RESSTR( RID_STR_REPLACE_DOC ) ); + m_pReplaceLB->InsertEntry( SvxResId( RID_STR_REPLACE_NONE ) ); + m_pReplaceLB->InsertEntry( SvxResId( RID_STR_REPLACE_INST ) ); + m_pReplaceLB->InsertEntry( SvxResId( RID_STR_REPLACE_DOC ) ); // init the controls with the values of the submission @@ -3366,7 +3366,7 @@ namespace svxform m_pFilePickerBtn->SetClickHdl( LINK( this, AddInstanceDialog, FilePickerHdl ) ); // load the filter name from fps_office resource - m_sAllFilterName = ResId(STR_FILTERNAME_ALL, *ResMgr::CreateResMgr("fps_office")).toString(); + m_sAllFilterName = ResId(STR_FILTERNAME_ALL, *ResMgr::CreateResMgr("fps_office")); } AddInstanceDialog::~AddInstanceDialog() diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index 124b3d6bd67b..50c7f557e6ce 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -434,7 +434,7 @@ void SAL_CALL FmFilterAdapter::disjunctiveTermRemoved( const FilterEvent& Event // if the first term was removed, then the to-be first term needs its text updated if ( Event.DisjunctiveTerm == 0 ) { - rTermItems[1]->SetText( SVX_RESSTR(RID_STR_FILTER_FILTER_FOR)); + rTermItems[1]->SetText( SvxResId(RID_STR_FILTER_FILTER_FOR)); FmFilterTextChangedHint aChangeHint( rTermItems[1] ); m_pModel->Broadcast( aChangeHint ); } @@ -470,7 +470,7 @@ void SAL_CALL FmFilterAdapter::disjunctiveTermAdded( const FilterEvent& Event ) const ::std::vector< FmFilterData* >::iterator insertPos = pFormItem->GetChildren().begin() + nInsertPos; - FmFilterItems* pFilterItems = new FmFilterItems(pFormItem, SVX_RESSTR(RID_STR_FILTER_FILTER_OR)); + FmFilterItems* pFilterItems = new FmFilterItems(pFormItem, SvxResId(RID_STR_FILTER_FILTER_OR)); m_pModel->Insert( insertPos, pFilterItems ); } @@ -566,7 +566,7 @@ void FmFilterModel::Update(const Reference< XIndexAccess > & xControllers, FmPar Reference< XFilterController > xFilterController( pFormItem->GetFilterController(), UNO_SET_THROW ); // insert the existing filters for the form - OUString aTitle(SVX_RESSTR(RID_STR_FILTER_FILTER_FOR)); + OUString aTitle(SvxResId(RID_STR_FILTER_FILTER_FOR)); Sequence< Sequence< OUString > > aExpressions = xFilterController->getPredicateExpressions(); for ( const Sequence< OUString >* pConjunctionTerm = aExpressions.getConstArray(); @@ -600,7 +600,7 @@ void FmFilterModel::Update(const Reference< XIndexAccess > & xControllers, FmPar } // title for the next conditions - aTitle = SVX_RESSTR( RID_STR_FILTER_FILTER_OR ); + aTitle = SvxResId( RID_STR_FILTER_FILTER_OR ); } // now add dependent controllers @@ -1186,7 +1186,7 @@ bool FmFilterNavigator::EditedEntry( SvTreeListEntry* pEntry, const OUString& rN { // display the error and return sal_False SQLContext aError; - aError.Message = SVX_RESSTR(RID_STR_SYNTAXERROR); + aError.Message = SvxResId(RID_STR_SYNTAXERROR); aError.Details = aErrorMsg; displayException(aError, this); @@ -1811,7 +1811,7 @@ FmFilterNavigatorWin::FmFilterNavigatorWin( SfxBindings* _pBindings, SfxChildWin m_pNavigator = VclPtr<FmFilterNavigator>::Create( this ); m_pNavigator->Show(); - SetText( SVX_RES(RID_STR_FILTER_NAVIGATOR) ); + SetText( SvxResId(RID_STR_FILTER_NAVIGATOR) ); SfxDockingWindow::SetFloatingSize( Size(200,200) ); } diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx index 2f1fd012ec42..2819be221ed4 100644 --- a/svx/source/form/fmPropBrw.cxx +++ b/svx/source/form/fmPropBrw.cxx @@ -180,7 +180,7 @@ OUString GetUIHeadlineName(sal_Int16 nClassId, const Any& aUnoObj) nClassNameResourceId = RID_STR_CONTROL; break; } - return SVX_RESSTR(nClassNameResourceId); + return SvxResId(nClassNameResourceId); } FmPropBrw::FmPropBrw( const Reference< XComponentContext >& _xORB, SfxBindings* _pBindings, @@ -414,13 +414,13 @@ void FmPropBrw::implSetNewSelection( const InterfaceBag& _rSelection ) if ( _rSelection.empty() ) { - sTitle = SVX_RESSTR(RID_STR_NO_PROPERTIES); + sTitle = SvxResId(RID_STR_NO_PROPERTIES); } else if ( _rSelection.size() > 1 ) { // no form component and (no form or no name) -> Multiselection - sTitle = SVX_RESSTR(RID_STR_PROPERTIES_CONTROL); - sTitle += SVX_RESSTR(RID_STR_PROPTITLE_MULTISELECT); + sTitle = SvxResId(RID_STR_PROPERTIES_CONTROL); + sTitle += SvxResId(RID_STR_PROPTITLE_MULTISELECT); } else { @@ -430,15 +430,15 @@ void FmPropBrw::implSetNewSelection( const InterfaceBag& _rSelection ) sal_Int16 nClassID = FormComponentType::CONTROL; xSingleSelection->getPropertyValue( FM_PROP_CLASSID ) >>= nClassID; - sTitle = SVX_RESSTR(RID_STR_PROPERTIES_CONTROL); + sTitle = SvxResId(RID_STR_PROPERTIES_CONTROL); sTitle += GetUIHeadlineName(nClassID, makeAny(xSingleSelection)); } else if ( Reference< XForm >( xSingleSelection, UNO_QUERY ).is() ) - sTitle = SVX_RESSTR(RID_STR_PROPERTIES_FORM); + sTitle = SvxResId(RID_STR_PROPERTIES_FORM); } if ( implIsReadOnlyModel() ) - sTitle += SVX_RESSTR(RID_STR_READONLY_VIEW); + sTitle += SvxResId(RID_STR_READONLY_VIEW); SetText( sTitle ); diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx index 481293b29bb2..00f6157064c2 100644 --- a/svx/source/form/fmexpl.cxx +++ b/svx/source/form/fmexpl.cxx @@ -476,7 +476,7 @@ namespace svxform m_pNavigatorTree = VclPtr<NavigatorTree>::Create( this ); m_pNavigatorTree->Show(); - SetText( SVX_RES(RID_STR_FMEXPLORER) ); + SetText( SvxResId(RID_STR_FMEXPLORER) ); SfxDockingWindow::SetFloatingSize( Size(200,200) ); } diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx index 15980afc1579..e97ba5832b8f 100644 --- a/svx/source/form/fmpgeimp.cxx +++ b/svx/source/form/fmpgeimp.cxx @@ -372,7 +372,7 @@ Reference< XForm > FmFormPageImpl::getDefaultForm() if ( Reference<XNameAccess>(xForms,UNO_QUERY_THROW)->hasElements() ) { // find the standard form - OUString sStandardFormname = SVX_RESSTR(RID_STR_STDFORMNAME); + OUString sStandardFormname = SvxResId(RID_STR_STDFORMNAME); try { @@ -401,8 +401,8 @@ Reference< XForm > FmFormPageImpl::getDefaultForm() if( pModel->IsUndoEnabled() ) { - OUString aStr(SVX_RESSTR(RID_STR_FORM)); - OUString aUndoStr(SVX_RESSTR(RID_STR_UNDO_CONTAINER_INSERT)); + OUString aStr(SvxResId(RID_STR_FORM)); + OUString aUndoStr(SvxResId(RID_STR_UNDO_CONTAINER_INSERT)); pModel->BegUndo(aUndoStr.replaceFirst("'#'", aStr)); } @@ -415,7 +415,7 @@ Reference< XForm > FmFormPageImpl::getDefaultForm() xFormProps->setPropertyValue( FM_PROP_COMMANDTYPE, makeAny( sal_Int32( CommandType::TABLE ) ) ); // and the "Standard" name - OUString sName = SVX_RESSTR(RID_STR_STDFORMNAME); + OUString sName = SvxResId(RID_STR_STDFORMNAME); xFormProps->setPropertyValue( FM_PROP_NAME, makeAny( sName ) ); if( pModel->IsUndoEnabled() ) @@ -481,8 +481,8 @@ Reference< css::form::XForm > FmFormPageImpl::findPlaceInFormComponentHierarchy if( bUndo ) { - OUString aStr(SVX_RESSTR(RID_STR_FORM)); - OUString aUndoStr(SVX_RESSTR(RID_STR_UNDO_CONTAINER_INSERT)); + OUString aStr(SvxResId(RID_STR_FORM)); + OUString aUndoStr(SvxResId(RID_STR_UNDO_CONTAINER_INSERT)); aUndoStr = aUndoStr.replaceFirst("#", aStr); pModel->BegUndo(aUndoStr); } @@ -509,7 +509,7 @@ Reference< css::form::XForm > FmFormPageImpl::findPlaceInFormComponentHierarchy const bool bTableOrQuery = ( CommandType::TABLE == nCommandType ) || ( CommandType::QUERY == nCommandType ); OUString sName = FormControlFactory::getUniqueName( xNamedSet, - bTableOrQuery ? rCursorSource : SVX_RESSTR(RID_STR_STDFORMNAME) ); + bTableOrQuery ? rCursorSource : SvxResId(RID_STR_STDFORMNAME) ); xFormProps->setPropertyValue( FM_PROP_NAME, makeAny( sName ) ); diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index 7898637535d1..37cc0f4b59f1 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -1472,7 +1472,7 @@ void FmXFormShell::ExecuteSearch() if (m_aSearchForms.empty() ) { // there are no controls that meet all the conditions for a search - ScopedVclPtrInstance<MessageDialog>(nullptr, SVX_RESSTR(RID_STR_NODATACONTROLS))->Execute(); + ScopedVclPtrInstance<MessageDialog>(nullptr, SvxResId(RID_STR_NODATACONTROLS))->Execute(); return; } @@ -3147,7 +3147,7 @@ void FmXFormShell::CreateExternalView() if (!bHaveUsableControls) { - ScopedVclPtrInstance<MessageDialog>(nullptr, SVX_RESSTR(RID_STR_NOCONTROLS_FOR_EXTERNALDISPLAY))->Execute(); + ScopedVclPtrInstance<MessageDialog>(nullptr, SvxResId(RID_STR_NOCONTROLS_FOR_EXTERNALDISPLAY))->Execute(); return; } } diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx index 78e0ed31cd5a..4a0022e59674 100644 --- a/svx/source/form/fmundo.cxx +++ b/svx/source/form/fmundo.cxx @@ -968,7 +968,7 @@ FmUndoPropertyAction::FmUndoPropertyAction(FmFormModel& rNewMod, const PropertyC if (rNewMod.GetObjectShell()) rNewMod.GetObjectShell()->SetModified(); if(static_STR_UNDO_PROPERTY.isEmpty()) - static_STR_UNDO_PROPERTY = SVX_RESSTR(RID_STR_UNDO_PROPERTY); + static_STR_UNDO_PROPERTY = SvxResId(RID_STR_UNDO_PROPERTY); } @@ -1260,7 +1260,7 @@ void FmUndoModelReplaceAction::Undo() OUString FmUndoModelReplaceAction::GetComment() const { - return SVX_RESSTR(RID_STR_UNDO_MODEL_REPLACE); + return SvxResId(RID_STR_UNDO_MODEL_REPLACE); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx index ab0c63826f8c..4ce10fd6f692 100644 --- a/svx/source/form/fmvwimp.cxx +++ b/svx/source/form/fmvwimp.cxx @@ -1325,7 +1325,7 @@ SdrObject* FmXFormView::implCreateFieldControl( const svx::ODataAccessDescriptor break; case DataType::TIMESTAMP: bDateNTimeField = true; - sLabelPostfix = SVX_RESSTR(RID_STR_POSTFIX_DATE); + sLabelPostfix = SvxResId(RID_STR_POSTFIX_DATE); SAL_FALLTHROUGH; case DataType::DATE: nOBJID = OBJ_FM_DATEFIELD; @@ -1367,7 +1367,7 @@ SdrObject* FmXFormView::implCreateFieldControl( const svx::ODataAccessDescriptor { // so far we created a date field only, but we also need a time field pLabel = pControl = nullptr; if ( createControlLabelPair( *pOutDev, 0, 1000, xField, xNumberFormats, OBJ_FM_TIMEFIELD, - SVX_RESSTR(RID_STR_POSTFIX_TIME), pLabel, pControl, + SvxResId(RID_STR_POSTFIX_TIME), pLabel, pControl, xDataSource, sDataSource, sCommand, nCommandType ) ) { @@ -1602,7 +1602,7 @@ bool FmXFormView::createControlLabelPair( OutputDevice& _rOutDev, sal_Int32 _nXO sLabel = sFieldName; xLabelModel->setPropertyValue( FM_PROP_LABEL, makeAny( sLabel + _rFieldPostfix ) ); - OUString sObjectLabel(SVX_RESSTR(RID_STR_OBJECT_LABEL).replaceAll("#object#", sFieldName)); + OUString sObjectLabel(SvxResId(RID_STR_OBJECT_LABEL).replaceAll("#object#", sFieldName)); xLabelModel->setPropertyValue(FM_PROP_NAME, makeAny(sObjectLabel)); } diff --git a/svx/source/form/formcontrolfactory.cxx b/svx/source/form/formcontrolfactory.cxx index d4aeebd3c530..8224dcc6b79a 100644 --- a/svx/source/form/formcontrolfactory.cxx +++ b/svx/source/form/formcontrolfactory.cxx @@ -475,7 +475,7 @@ namespace svxform } if ( nTitleResId ) - sInitialLabel = SVX_RESSTR(nTitleResId); + sInitialLabel = SvxResId(nTitleResId); _rxControlModel->setPropertyValue( FM_PROP_LABEL, @@ -679,7 +679,7 @@ namespace svxform nResId = RID_STR_CONTROL; break; } - return SVX_RESSTR(nResId); + return SvxResId(nResId); } diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index 2089ae19b6bf..74a34e24aba4 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -478,7 +478,7 @@ void FmXAutoControl::createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XTextComponent > xText(getPeer() , UNO_QUERY); if (xText.is()) { - xText->setText(SVX_RESSTR(RID_STR_AUTOFIELD)); + xText->setText(SvxResId(RID_STR_AUTOFIELD)); xText->setEditable(false); } } @@ -3585,7 +3585,7 @@ namespace void displayErrorSetFocus( const OUString& _rMessage, const Reference< XControl >& _rxFocusControl, vcl::Window* _pDialogParent ) { SQLContext aError; - aError.Message = SVX_RESSTR(RID_STR_WRITEERROR); + aError.Message = SvxResId(RID_STR_WRITEERROR); aError.Details = _rMessage; displayException( aError, _pDialogParent ); @@ -3708,7 +3708,7 @@ sal_Bool SAL_CALL FormController::approveRowChange(const RowChangeEvent& _rEvent if ( !rColInfo.xColumn->getString().isEmpty() || !rColInfo.xColumn->wasNull() ) continue; - OUString sMessage( SVX_RESSTR( RID_ERR_FIELDREQUIRED ) ); + OUString sMessage( SvxResId( RID_ERR_FIELDREQUIRED ) ); sMessage = sMessage.replaceFirst( "#", rColInfo.sName ); // the control to focus @@ -3971,11 +3971,11 @@ sal_Bool SAL_CALL FormController::confirmDelete(const RowChangeEvent& aEvent) sal_Int32 nLength = aEvent.Rows; if ( nLength > 1 ) { - sTitle = SVX_RESSTR( RID_STR_DELETECONFIRM_RECORDS ); + sTitle = SvxResId( RID_STR_DELETECONFIRM_RECORDS ); sTitle = sTitle.replaceFirst( "#", OUString::number(nLength) ); } else - sTitle = SVX_RESSTR( RID_STR_DELETECONFIRM_RECORD ); + sTitle = SvxResId( RID_STR_DELETECONFIRM_RECORD ); try { @@ -3990,7 +3990,7 @@ sal_Bool SAL_CALL FormController::confirmDelete(const RowChangeEvent& aEvent) SQLWarning aWarning; aWarning.Message = sTitle; SQLWarning aDetails; - aDetails.Message = SVX_RESSTR(RID_STR_DELETECONFIRM); + aDetails.Message = SvxResId(RID_STR_DELETECONFIRM); aWarning.NextException <<= aDetails; OInteractionRequest* pRequest = new OInteractionRequest( makeAny( aWarning ) ); diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index d1983f657108..fd91d43e9a39 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -450,8 +450,8 @@ namespace svxform sIdent = aContextMenu->GetCurItemIdent(); if (sIdent == "form") { - OUString aStr(SVX_RESSTR(RID_STR_FORM)); - OUString aUndoStr = SVX_RESSTR(RID_STR_UNDO_CONTAINER_INSERT).replaceAll("#", aStr); + OUString aStr(SvxResId(RID_STR_FORM)); + OUString aUndoStr = SvxResId(RID_STR_UNDO_CONTAINER_INSERT).replaceAll("#", aStr); pFormModel->BegUndo(aUndoStr); // slot was only available, if there is only one selected entry, @@ -461,8 +461,8 @@ namespace svxform } else if (sIdent == "hidden") { - OUString aStr(SVX_RESSTR(RID_STR_CONTROL)); - OUString aUndoStr = SVX_RESSTR(RID_STR_UNDO_CONTAINER_INSERT).replaceAll("#", aStr); + OUString aStr(SvxResId(RID_STR_CONTROL)); + OUString aUndoStr = SvxResId(RID_STR_UNDO_CONTAINER_INSERT).replaceAll("#", aStr); pFormModel->BegUndo(aUndoStr); // slot was valid for (exactly) one selected form @@ -585,7 +585,7 @@ namespace svxform // default-entry "Forms" Image aRootImage(BitmapEx(RID_SVXBMP_FORMS)); - m_pRootEntry = InsertEntry( SVX_RESSTR(RID_STR_FORMS), aRootImage, aRootImage, + m_pRootEntry = InsertEntry( SvxResId(RID_STR_FORMS), aRootImage, aRootImage, nullptr, false, 0 ); } else if (!m_bMarkingObjects && dynamic_cast<const FmNavRequestSelectHint*>(&rHint)) @@ -956,8 +956,8 @@ namespace svxform // within undo if (pFormModel) { - OUString aStr(SVX_RESSTR(RID_STR_CONTROL)); - OUString aUndoStr = SVX_RESSTR(RID_STR_UNDO_CONTAINER_INSERT).replaceAll("#", aStr); + OUString aStr(SvxResId(RID_STR_CONTROL)); + OUString aUndoStr = SvxResId(RID_STR_UNDO_CONTAINER_INSERT).replaceAll("#", aStr); pFormModel->BegUndo(aUndoStr); } @@ -1031,7 +1031,7 @@ namespace svxform if( bUndo ) { - OUString strUndoDescription(SVX_RESSTR(RID_STR_UNDO_CONTAINER_REPLACE)); + OUString strUndoDescription(SvxResId(RID_STR_UNDO_CONTAINER_REPLACE)); pFormModel->BegUndo(strUndoDescription); } @@ -1425,9 +1425,9 @@ namespace svxform // create base name OUString aBaseName; if( dynamic_cast<const FmFormData*>( pEntryData) != nullptr ) - aBaseName = SVX_RESSTR( RID_STR_STDFORMNAME ); + aBaseName = SvxResId( RID_STR_STDFORMNAME ); else if( dynamic_cast<const FmControlData*>( pEntryData) != nullptr ) - aBaseName = SVX_RESSTR( RID_STR_CONTROL ); + aBaseName = SvxResId( RID_STR_CONTROL ); // create new name @@ -1747,16 +1747,16 @@ namespace svxform OUString aUndoStr; if ( m_arrCurrentSelection.size() == 1 ) { - aUndoStr = SVX_RESSTR(RID_STR_UNDO_CONTAINER_REMOVE); + aUndoStr = SvxResId(RID_STR_UNDO_CONTAINER_REMOVE); if (m_nFormsSelected) - aUndoStr = aUndoStr.replaceFirst( "#", SVX_RESSTR( RID_STR_FORM ) ); + aUndoStr = aUndoStr.replaceFirst( "#", SvxResId( RID_STR_FORM ) ); else // it must be a control (else the root would be selected, but it cannot be deleted) - aUndoStr = aUndoStr.replaceFirst( "#", SVX_RESSTR( RID_STR_CONTROL ) ); + aUndoStr = aUndoStr.replaceFirst( "#", SvxResId( RID_STR_CONTROL ) ); } else { - aUndoStr = SVX_RESSTR(RID_STR_UNDO_CONTAINER_REMOVE_MULTIPLE); + aUndoStr = SvxResId(RID_STR_UNDO_CONTAINER_REMOVE_MULTIPLE); aUndoStr = aUndoStr.replaceFirst( "#", OUString::number( m_arrCurrentSelection.size() ) ); } pFormModel->BegUndo(aUndoStr); diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx index 47481b7e3877..f7d6d3673973 100644 --- a/svx/source/form/navigatortreemodel.cxx +++ b/svx/source/form/navigatortreemodel.cxx @@ -262,9 +262,9 @@ namespace svxform { OUString aStr; if (dynamic_cast<const FmFormData*>( pEntry) != nullptr) - aStr = SVX_RESSTR(RID_STR_FORM); + aStr = SvxResId(RID_STR_FORM); else - aStr = SVX_RESSTR(RID_STR_CONTROL); + aStr = SvxResId(RID_STR_CONTROL); Reference< XIndexContainer > xContainer; if (pFolder) @@ -276,7 +276,7 @@ namespace svxform if( bUndo ) { - OUString aUndoStr(SVX_RESSTR(RID_STR_UNDO_CONTAINER_INSERT)); + OUString aUndoStr(SvxResId(RID_STR_UNDO_CONTAINER_INSERT)); aUndoStr = aUndoStr.replaceFirst("#", aStr); m_pFormModel->BegUndo(aUndoStr); } @@ -367,13 +367,13 @@ namespace svxform { OUString aStr; if (dynamic_cast<const FmFormData*>( pEntry) != nullptr) - aStr = SVX_RESSTR(RID_STR_FORM); + aStr = SvxResId(RID_STR_FORM); else - aStr = SVX_RESSTR(RID_STR_CONTROL); + aStr = SvxResId(RID_STR_CONTROL); if( bUndo ) { - OUString aUndoStr(SVX_RESSTR(RID_STR_UNDO_CONTAINER_REMOVE)); + OUString aUndoStr(SvxResId(RID_STR_UNDO_CONTAINER_REMOVE)); aUndoStr = aUndoStr.replaceFirst("#", aStr); m_pFormModel->BegUndo(aUndoStr); } diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx index 307209796edd..c426054fcb7c 100644 --- a/svx/source/form/tabwin.cxx +++ b/svx/source/form/tabwin.cxx @@ -281,7 +281,7 @@ void FmFieldWin::StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPoo void FmFieldWin::UpdateContent(FmFormShell* pShell) { pListBox->Clear(); - OUString aTitle(SVX_RESSTR(RID_STR_FIELDSELECTION)); + OUString aTitle(SvxResId(RID_STR_FIELDSELECTION)); SetText( aTitle ); if (!pShell || !pShell->GetImpl()) @@ -299,7 +299,7 @@ void FmFieldWin::UpdateContent(const css::uno::Reference< css::form::XForm > & x { // delete ListBox pListBox->Clear(); - OUString aTitle(SVX_RES(RID_STR_FIELDSELECTION)); + OUString aTitle(SvxResId(RID_STR_FIELDSELECTION)); SetText(aTitle); if (!xForm.is()) @@ -332,7 +332,7 @@ void FmFieldWin::UpdateContent(const css::uno::Reference< css::form::XForm > & x // set prefix OUString aPrefix; - ResStringArray aPrefixes(SVX_RES(RID_RSC_TABWIN_PREFIX)); + ResStringArray aPrefixes(ResId(RID_RSC_TABWIN_PREFIX, DIALOG_MGR())); switch (m_nObjectType) { diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx index 43f8ca72016c..ead49e1532f2 100644 --- a/svx/source/form/tbxform.cxx +++ b/svx/source/form/tbxform.cxx @@ -153,7 +153,7 @@ SvxFmTbxCtlRecText::~SvxFmTbxCtlRecText() VclPtr<vcl::Window> SvxFmTbxCtlRecText::CreateItemWindow( vcl::Window* pParent ) { - OUString aText(SVX_RESSTR(RID_STR_REC_TEXT)); + OUString aText(SvxResId(RID_STR_REC_TEXT)); VclPtrInstance<FixedText> pFixedText( pParent ); Size aSize( pFixedText->GetTextWidth( aText ), pFixedText->GetTextHeight( ) ); pFixedText->SetText( aText ); @@ -179,7 +179,7 @@ SvxFmTbxCtlRecFromText::~SvxFmTbxCtlRecFromText() VclPtr<vcl::Window> SvxFmTbxCtlRecFromText::CreateItemWindow( vcl::Window* pParent ) { - OUString aText(SVX_RESSTR(RID_STR_REC_FROM_TEXT)); + OUString aText(SvxResId(RID_STR_REC_FROM_TEXT)); VclPtrInstance<FixedText> pFixedText( pParent, WB_CENTER ); Size aSize( pFixedText->GetTextWidth( aText ), pFixedText->GetTextHeight( ) ); aSize.Width() += 12; diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx index 93ee81d1b7a3..b53c711b1061 100644 --- a/svx/source/gallery2/galbrws1.cxx +++ b/svx/source/gallery2/galbrws1.cxx @@ -121,7 +121,7 @@ GalleryBrowser1::GalleryBrowser1( StartListening( *mpGallery ); maNewTheme->SetHelpId( HID_GALLERY_NEWTHEME ); - maNewTheme->SetText( GAL_RESSTR(RID_SVXSTR_GALLERY_CREATETHEME)); + maNewTheme->SetText( GalResId(RID_SVXSTR_GALLERY_CREATETHEME)); maNewTheme->SetClickHdl( LINK( this, GalleryBrowser1, ClickNewThemeHdl ) ); // disable creation of new themes if a writable directory is not available @@ -130,7 +130,7 @@ GalleryBrowser1::GalleryBrowser1( mpThemes->SetHelpId( HID_GALLERY_THEMELIST ); mpThemes->SetSelectHdl( LINK( this, GalleryBrowser1, SelectThemeHdl ) ); - mpThemes->SetAccessibleName(SVX_RESSTR(RID_SVXSTR_GALLERYPROPS_GALTHEME)); + mpThemes->SetAccessibleName(SvxResId(RID_SVXSTR_GALLERYPROPS_GALTHEME)); for( sal_uIntPtr i = 0, nCount = mpGallery->GetThemeCount(); i < nCount; i++ ) ImplInsertThemeEntry( mpGallery->GetThemeInfo( i ) ); @@ -604,7 +604,7 @@ IMPL_LINK_NOARG(GalleryBrowser1, SelectThemeHdl, ListBox&, void) IMPL_LINK_NOARG(GalleryBrowser1, ClickNewThemeHdl, Button*, void) { - OUString aNewTheme( GAL_RESSTR(RID_SVXSTR_GALLERY_NEWTHEME) ); + OUString aNewTheme( GalResId(RID_SVXSTR_GALLERY_NEWTHEME) ); OUString aName( aNewTheme ); sal_uIntPtr nCount = 0; diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx index 1b2d3c9d3fd1..9384734e71ba 100644 --- a/svx/source/gallery2/galbrws2.cxx +++ b/svx/source/gallery2/galbrws2.cxx @@ -402,19 +402,19 @@ GalleryBrowser2::GalleryBrowser2( vcl::Window* pParent, Gallery* pGallery ) : maViewBox->InsertItem( TBX_ID_ICON, aDummyImage ); maViewBox->SetItemBits( TBX_ID_ICON, ToolBoxItemBits::RADIOCHECK | ToolBoxItemBits::AUTOCHECK ); maViewBox->SetHelpId( TBX_ID_ICON, HID_GALLERY_ICONVIEW ); - maViewBox->SetQuickHelpText( TBX_ID_ICON, GAL_RESSTR(RID_SVXSTR_GALLERY_ICONVIEW) ); + maViewBox->SetQuickHelpText( TBX_ID_ICON, GalResId(RID_SVXSTR_GALLERY_ICONVIEW) ); maViewBox->InsertItem( TBX_ID_LIST, aDummyImage ); maViewBox->SetItemBits( TBX_ID_LIST, ToolBoxItemBits::RADIOCHECK | ToolBoxItemBits::AUTOCHECK ); maViewBox->SetHelpId( TBX_ID_LIST, HID_GALLERY_LISTVIEW ); - maViewBox->SetQuickHelpText( TBX_ID_LIST, GAL_RESSTR(RID_SVXSTR_GALLERY_LISTVIEW) ); + maViewBox->SetQuickHelpText( TBX_ID_LIST, GalResId(RID_SVXSTR_GALLERY_LISTVIEW) ); MiscHdl( nullptr ); maViewBox->SetSelectHdl( LINK( this, GalleryBrowser2, SelectTbxHdl ) ); maViewBox->Show(); - mpIconView->SetAccessibleName(SVX_RESSTR(RID_SVXSTR_GALLERY_THEMEITEMS)); - mpListView->SetAccessibleName(SVX_RESSTR(RID_SVXSTR_GALLERY_THEMEITEMS)); + mpIconView->SetAccessibleName(SvxResId(RID_SVXSTR_GALLERY_THEMEITEMS)); + mpListView->SetAccessibleName(SvxResId(RID_SVXSTR_GALLERY_THEMEITEMS)); maInfoBar->Show(); maSeparator->Show(); @@ -713,9 +713,9 @@ void GalleryBrowser2::SelectTheme( const OUString& rThemeName ) mpListView = VclPtr<GalleryListView>::Create( this, mpCurTheme ); mpPreview = VclPtr<GalleryPreview>::Create( this, WB_TABSTOP | WB_BORDER, mpCurTheme ); - mpIconView->SetAccessibleName(SVX_RESSTR(RID_SVXSTR_GALLERY_THEMEITEMS)); - mpListView->SetAccessibleName(SVX_RESSTR(RID_SVXSTR_GALLERY_THEMEITEMS)); - mpPreview->SetAccessibleName(SVX_RESSTR(RID_SVXSTR_GALLERY_PREVIEW)); + mpIconView->SetAccessibleName(SvxResId(RID_SVXSTR_GALLERY_THEMEITEMS)); + mpListView->SetAccessibleName(SvxResId(RID_SVXSTR_GALLERY_THEMEITEMS)); + mpPreview->SetAccessibleName(SvxResId(RID_SVXSTR_GALLERY_PREVIEW)); mpIconView->SetSelectHdl( LINK( this, GalleryBrowser2, SelectObjectValueSetHdl ) ); mpListView->SetSelectHdl( LINK( this, GalleryBrowser2, SelectObjectHdl ) ); diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx index ad58f46cdc3b..9e10d6786228 100644 --- a/svx/source/gallery2/galctrl.cxx +++ b/svx/source/gallery2/galctrl.cxx @@ -411,7 +411,7 @@ GalleryListView::GalleryListView( GalleryBrowser2* pParent, GalleryTheme* pTheme SetMode( BrowserMode::AUTO_VSCROLL | BrowserMode::AUTOSIZE_LASTCOL | BrowserMode::AUTO_HSCROLL ); SetDataRowHeight( 28 ); - InsertDataColumn( GALLERY_BRWBOX_TITLE, GAL_RESSTR(RID_SVXSTR_GALLERY_TITLE), 256 ); + InsertDataColumn( GALLERY_BRWBOX_TITLE, GalResId(RID_SVXSTR_GALLERY_TITLE), 256 ); } void GalleryListView::InitSettings() diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx index 6f8992fafb46..46bebc7032b2 100644 --- a/svx/source/gallery2/gallery1.cxx +++ b/svx/source/gallery2/gallery1.cxx @@ -123,7 +123,7 @@ GalleryThemeEntry::GalleryThemeEntry( bool bCreateUniqueURL, } //look up the rest of the ids in string resources if (aName.isEmpty()) - aName = GAL_RESSTR(RID_GALLERYSTR_THEME_START + (sal_uInt16) nId); + aName = GalResId(RID_GALLERYSTR_THEME_START + (sal_uInt16) nId); } if( aName.isEmpty() ) @@ -474,13 +474,13 @@ OUString Gallery::GetThemeName( sal_uIntPtr nThemeId ) const switch( nThemeId ) { case GALLERY_THEME_3D: - aFallback = GAL_RESSTR(RID_GALLERYSTR_THEME_3D); + aFallback = GalResId(RID_GALLERYSTR_THEME_3D); break; case GALLERY_THEME_BULLETS: - aFallback = GAL_RESSTR(RID_GALLERYSTR_THEME_BULLETS); + aFallback = GalResId(RID_GALLERYSTR_THEME_BULLETS); break; case GALLERY_THEME_HOMEPAGE: - aFallback = GAL_RESSTR(RID_GALLERYSTR_THEME_HOMEPAGE); + aFallback = GalResId(RID_GALLERYSTR_THEME_HOMEPAGE); break; case GALLERY_THEME_POWERPOINT: aFallback = RID_GALLERYSTR_THEME_POWERPOINT; @@ -492,7 +492,7 @@ OUString Gallery::GetThemeName( sal_uIntPtr nThemeId ) const aFallback = RID_GALLERYSTR_THEME_FONTWORK_VERTICAL; break; case GALLERY_THEME_SOUNDS: - aFallback = GAL_RESSTR(RID_GALLERYSTR_THEME_SOUNDS); + aFallback = GalResId(RID_GALLERYSTR_THEME_SOUNDS); break; case RID_GALLERYSTR_THEME_ARROWS: case RID_GALLERYSTR_THEME_COMPUTERS: @@ -504,7 +504,7 @@ OUString Gallery::GetThemeName( sal_uIntPtr nThemeId ) const case RID_GALLERYSTR_THEME_SYMBOLS: case RID_GALLERYSTR_THEME_TRANSPORT: case RID_GALLERYSTR_THEME_TXTSHAPES: - aFallback = GAL_RESSTR(static_cast<sal_uInt32>(nThemeId)); + aFallback = GalResId(static_cast<sal_uInt32>(nThemeId)); break; default: break; diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx index b49b042317e6..4fac07003ebc 100644 --- a/svx/source/gallery2/galmisc.cxx +++ b/svx/source/gallery2/galmisc.cxx @@ -371,7 +371,7 @@ GalleryProgress::GalleryProgress( GraphicFilter* pFilter ) : if( mpFilter ) { - aProgressText = GAL_RESSTR(RID_SVXSTR_GALLERY_FILTER); + aProgressText = GalResId(RID_SVXSTR_GALLERY_FILTER); // mpFilter->SetUpdatePercentHdl( LINK( this, GalleryProgress, Update ) ); // sj: progress wasn't working up from SO7 at all // // so I am removing this. The gallery progress should // // be changed to use the XStatusIndicator instead of XProgressMonitor diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx index a28047a740db..2f23545905ce 100644 --- a/svx/source/gallery2/galobj.cxx +++ b/svx/source/gallery2/galobj.cxx @@ -239,7 +239,7 @@ const OUString SgaObject::GetTitle() const aResId.SetRT( RSC_STRING ); if ( pResMgr->IsAvailable( aResId ) ) { - aReturnValue = aResId.toString(); + aReturnValue = aResId; } } } diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx index 96028160a949..1f4626a2d048 100644 --- a/svx/source/gallery2/galtheme.cxx +++ b/svx/source/gallery2/galtheme.cxx @@ -1531,7 +1531,7 @@ const OUString& GalleryTheme::GetName() const { return pThm->GetThemeName(); } void GalleryTheme::InsertAllThemes( ListBox& rListBox ) { for( sal_uInt16 i = RID_GALLERYSTR_THEME_FIRST; i <= RID_GALLERYSTR_THEME_LAST; i++ ) - rListBox.InsertEntry(GAL_RESSTR(i)); + rListBox.InsertEntry(GalResId(i)); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx index b40eb78daeee..34e791ab2cee 100644 --- a/svx/source/inc/datanavi.hxx +++ b/svx/source/inc/datanavi.hxx @@ -156,9 +156,9 @@ namespace svxform m_sInstance_API( "instance" ), m_sNone_API( "none" ) { - m_sDoc_UI = SVX_RESSTR(RID_STR_REPLACE_DOC); - m_sInstance_UI = SVX_RESSTR(RID_STR_REPLACE_INST); - m_sNone_UI = SVX_RESSTR(RID_STR_REPLACE_NONE); + m_sDoc_UI = SvxResId(RID_STR_REPLACE_DOC); + m_sInstance_UI = SvxResId(RID_STR_REPLACE_INST); + m_sNone_UI = SvxResId(RID_STR_REPLACE_NONE); } /** convert submission replace string from API value to UI value. @@ -205,9 +205,9 @@ namespace svxform m_sPut_API( "put" ), m_sGet_API( "get" ) { - m_sPost_UI = SVX_RESSTR(RID_STR_METHOD_POST); - m_sPut_UI = SVX_RESSTR(RID_STR_METHOD_PUT); - m_sGet_UI = SVX_RESSTR(RID_STR_METHOD_GET); + m_sPost_UI = SvxResId(RID_STR_METHOD_POST); + m_sPut_UI = SvxResId(RID_STR_METHOD_PUT); + m_sGet_UI = SvxResId(RID_STR_METHOD_GET); } /** convert from API to UI; put is default. */ diff --git a/svx/source/items/algitem.cxx b/svx/source/items/algitem.cxx index fb36f4fcdb1d..e05a1348ebe4 100644 --- a/svx/source/items/algitem.cxx +++ b/svx/source/items/algitem.cxx @@ -118,7 +118,7 @@ bool SvxOrientationItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ OUString SvxOrientationItem::GetValueText( sal_uInt16 nVal ) { DBG_ASSERT( nVal <= SVX_ORIENTATION_STACKED, "enum overflow!" ); - return SVX_RESSTR(RID_SVXITEMS_ORI_STANDARD + nVal); + return SvxResId(RID_SVXITEMS_ORI_STANDARD + nVal); } @@ -222,19 +222,19 @@ bool SvxMarginItem::GetPresentation } case SfxItemPresentation::Complete: { - rText = SVX_RESSTR(RID_SVXITEMS_MARGIN_LEFT) + + rText = SvxResId(RID_SVXITEMS_MARGIN_LEFT) + GetMetricText( (long)nLeftMargin, eCoreUnit, ePresUnit, pIntl ) + " " + EditResId::GetString(GetMetricId(ePresUnit)) + cpDelimTmp + - SVX_RESSTR(RID_SVXITEMS_MARGIN_TOP) + + SvxResId(RID_SVXITEMS_MARGIN_TOP) + GetMetricText( (long)nTopMargin, eCoreUnit, ePresUnit, pIntl ) + " " + EditResId::GetString(GetMetricId(ePresUnit)) + cpDelimTmp + - SVX_RESSTR(RID_SVXITEMS_MARGIN_RIGHT) + + SvxResId(RID_SVXITEMS_MARGIN_RIGHT) + GetMetricText( (long)nRightMargin, eCoreUnit, ePresUnit, pIntl ) + " " + EditResId::GetString(GetMetricId(ePresUnit)) + cpDelimTmp + - SVX_RESSTR(RID_SVXITEMS_MARGIN_BOTTOM) + + SvxResId(RID_SVXITEMS_MARGIN_BOTTOM) + GetMetricText( (long)nBottomMargin, eCoreUnit, ePresUnit, pIntl ) + " " + EditResId::GetString(GetMetricId(ePresUnit)); return true; diff --git a/svx/source/items/pageitem.cxx b/svx/source/items/pageitem.cxx index 2796103f1138..7d256e4db7a9 100644 --- a/svx/source/items/pageitem.cxx +++ b/svx/source/items/pageitem.cxx @@ -74,10 +74,10 @@ inline OUString GetUsageText( const SvxPageUsage eU ) { switch( eU ) { - case SvxPageUsage::Left : return SVX_RESSTR(RID_SVXITEMS_PAGE_USAGE_LEFT); - case SvxPageUsage::Right : return SVX_RESSTR(RID_SVXITEMS_PAGE_USAGE_RIGHT); - case SvxPageUsage::All : return SVX_RESSTR(RID_SVXITEMS_PAGE_USAGE_ALL); - case SvxPageUsage::Mirror: return SVX_RESSTR(RID_SVXITEMS_PAGE_USAGE_MIRROR); + case SvxPageUsage::Left : return SvxResId(RID_SVXITEMS_PAGE_USAGE_LEFT); + case SvxPageUsage::Right : return SvxResId(RID_SVXITEMS_PAGE_USAGE_RIGHT); + case SvxPageUsage::All : return SvxResId(RID_SVXITEMS_PAGE_USAGE_ALL); + case SvxPageUsage::Mirror: return SvxResId(RID_SVXITEMS_PAGE_USAGE_MIRROR); default: return OUString(); } } @@ -103,11 +103,11 @@ bool SvxPageItem::GetPresentation rText = aDescName + cpDelimTmp; } DBG_ASSERT( eNumType <= css::style::NumberingType::NUMBER_NONE, "enum overflow" ); - rText += SVX_RESSTR(RID_SVXITEMS_PAGE_NUM_BEGIN + eNumType) + cpDelimTmp; + rText += SvxResId(RID_SVXITEMS_PAGE_NUM_BEGIN + eNumType) + cpDelimTmp; if ( bLandscape ) - rText += SVX_RESSTR(RID_SVXITEMS_PAGE_LAND_TRUE); + rText += SvxResId(RID_SVXITEMS_PAGE_LAND_TRUE); else - rText += SVX_RESSTR(RID_SVXITEMS_PAGE_LAND_FALSE); + rText += SvxResId(RID_SVXITEMS_PAGE_LAND_FALSE); OUString aUsageText = GetUsageText( eUse ); if (!aUsageText.isEmpty()) { @@ -117,17 +117,17 @@ bool SvxPageItem::GetPresentation } case SfxItemPresentation::Complete: { - rText += SVX_RESSTR(RID_SVXITEMS_PAGE_COMPLETE); + rText += SvxResId(RID_SVXITEMS_PAGE_COMPLETE); if ( !aDescName.isEmpty() ) { rText += aDescName + cpDelimTmp; } DBG_ASSERT( eNumType <= css::style::NumberingType::NUMBER_NONE, "enum overflow" ); - rText += SVX_RESSTR(RID_SVXITEMS_PAGE_NUM_BEGIN + eNumType) + cpDelimTmp; + rText += SvxResId(RID_SVXITEMS_PAGE_NUM_BEGIN + eNumType) + cpDelimTmp; if ( bLandscape ) - rText += SVX_RESSTR(RID_SVXITEMS_PAGE_LAND_TRUE); + rText += SvxResId(RID_SVXITEMS_PAGE_LAND_TRUE); else - rText += SVX_RESSTR(RID_SVXITEMS_PAGE_LAND_FALSE); + rText += SvxResId(RID_SVXITEMS_PAGE_LAND_FALSE); OUString aUsageText = GetUsageText( eUse ); if (!aUsageText.isEmpty()) { diff --git a/svx/source/items/postattr.cxx b/svx/source/items/postattr.cxx index a31d6e33e785..056a9e13dba9 100644 --- a/svx/source/items/postattr.cxx +++ b/svx/source/items/postattr.cxx @@ -55,7 +55,7 @@ bool SvxPostItAuthorItem::GetPresentation rText = GetValue(); return true; case SfxItemPresentation::Complete: - rText = SVX_RESSTR(RID_SVXITEMS_AUTHOR_COMPLETE) + GetValue(); + rText = SvxResId(RID_SVXITEMS_AUTHOR_COMPLETE) + GetValue(); return true; default: ;//prevent warning } @@ -95,7 +95,7 @@ bool SvxPostItDateItem::GetPresentation rText = GetValue(); return true; case SfxItemPresentation::Complete: - rText = SVX_RESSTR(RID_SVXITEMS_DATE_COMPLETE) + GetValue(); + rText = SvxResId(RID_SVXITEMS_DATE_COMPLETE) + GetValue(); return true; default: ;//prevent warning } @@ -133,7 +133,7 @@ bool SvxPostItTextItem::GetPresentation rText = GetValue(); return true; case SfxItemPresentation::Complete: - rText = SVX_RESSTR(RID_SVXITEMS_TEXT_COMPLETE) + GetValue(); + rText = SvxResId(RID_SVXITEMS_TEXT_COMPLETE) + GetValue(); return true; default: ;//prevent warning } diff --git a/svx/source/sidebar/EmptyPanel.cxx b/svx/source/sidebar/EmptyPanel.cxx index 00579c3ca1f9..b94b59be08fb 100644 --- a/svx/source/sidebar/EmptyPanel.cxx +++ b/svx/source/sidebar/EmptyPanel.cxx @@ -27,7 +27,7 @@ EmptyPanel::EmptyPanel (vcl::Window* pParent) : Control(pParent) , maMessageControl(VclPtr<FixedText>::Create(this)) { - maMessageControl->SetText(SVX_RES(RID_SIDEBAR_EMPTY_PANEL_TEXT)); + maMessageControl->SetText(SvxResId(RID_SIDEBAR_EMPTY_PANEL_TEXT)); maMessageControl->setPosSizePixel(5, 5, 250, 15); maMessageControl->SetStyle(WB_WORDBREAK); maMessageControl->Show(); diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx index 11df045cc559..4285b5fd007b 100644 --- a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx +++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx @@ -97,10 +97,10 @@ void GraphicPropertyPanel::Initialize() mpMtrContrast->SetModifyHdl( LINK( this, GraphicPropertyPanel, ModifyContrastHdl ) ); mpMtrTrans->SetModifyHdl( LINK( this, GraphicPropertyPanel, ModifyTransHdl ) ); - mpLBColorMode->InsertEntry(SVX_RESSTR(RID_SVXSTR_GRAFMODE_STANDARD)); - mpLBColorMode->InsertEntry(SVX_RESSTR(RID_SVXSTR_GRAFMODE_GREYS)); - mpLBColorMode->InsertEntry(SVX_RESSTR(RID_SVXSTR_GRAFMODE_MONO)); - mpLBColorMode->InsertEntry(SVX_RESSTR(RID_SVXSTR_GRAFMODE_WATERMARK)); + mpLBColorMode->InsertEntry(SvxResId(RID_SVXSTR_GRAFMODE_STANDARD)); + mpLBColorMode->InsertEntry(SvxResId(RID_SVXSTR_GRAFMODE_GREYS)); + mpLBColorMode->InsertEntry(SvxResId(RID_SVXSTR_GRAFMODE_MONO)); + mpLBColorMode->InsertEntry(SvxResId(RID_SVXSTR_GRAFMODE_WATERMARK)); mpLBColorMode->SetSelectHdl( LINK( this, GraphicPropertyPanel, ClickColorModeHdl )); mpMtrRed->SetModifyHdl( LINK( this, GraphicPropertyPanel, RedHdl ) ); diff --git a/svx/source/sidebar/line/LinePropertyPanelBase.cxx b/svx/source/sidebar/line/LinePropertyPanelBase.cxx index 7ff47c173011..191600c4ca16 100644 --- a/svx/source/sidebar/line/LinePropertyPanelBase.cxx +++ b/svx/source/sidebar/line/LinePropertyPanelBase.cxx @@ -58,7 +58,7 @@ namespace void FillLineEndListBox(ListBox& rListBoxStart, ListBox& rListBoxEnd, const XLineEndList& rList, const Bitmap& rBitmapZero) { const sal_uInt32 nCount(rList.Count()); - const OUString sNone(SVX_RESSTR(RID_SVXSTR_NONE)); + const OUString sNone(SvxResId(RID_SVXSTR_NONE)); rListBoxStart.SetUpdateMode(false); rListBoxEnd.SetUpdateMode(false); diff --git a/svx/source/sidebar/line/LineWidthPopup.cxx b/svx/source/sidebar/line/LineWidthPopup.cxx index 5bc0619f950b..45c9f0db3d54 100644 --- a/svx/source/sidebar/line/LineWidthPopup.cxx +++ b/svx/source/sidebar/line/LineWidthPopup.cxx @@ -32,7 +32,7 @@ LineWidthPopup::LineWidthPopup(LinePropertyPanelBase& rParent) : FloatingWindow(&rParent, "FloatingLineProperty", "svx/ui/floatinglineproperty.ui") , m_rParent(rParent) , m_pStr(nullptr) - , m_sPt(SVX_RESSTR(RID_SVXSTR_PT)) + , m_sPt(SvxResId(RID_SVXSTR_PT)) , m_eMapUnit(MapUnit::MapTwip) , m_bVSFocus(true) , m_bCustom(false) @@ -60,7 +60,7 @@ LineWidthPopup::LineWidthPopup(LinePropertyPanelBase& rParent) m_pStr[5] = "3.0"; m_pStr[6] = "4.5"; m_pStr[7] = "6.0"; - m_pStr[8] = SVX_RESSTR(RID_SVXSTR_WIDTH_LAST_CUSTOM); + m_pStr[8] = SvxResId(RID_SVXSTR_WIDTH_LAST_CUSTOM); const LocaleDataWrapper& rLocaleWrapper( Application::GetSettings().GetLocaleDataWrapper() ); const sal_Unicode cSep = rLocaleWrapper.getNumDecimalSep()[0]; diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx index 1e9f1b10e064..a07634897d1f 100644 --- a/svx/source/sidebar/nbdtmg.cxx +++ b/svx/source/sidebar/nbdtmg.cxx @@ -267,7 +267,7 @@ void BulletsTypeMgr::Init() pActualBullets[i] = new BulletsSettings; pActualBullets[i]->cBulletChar = aDefaultBulletTypes[i]; pActualBullets[i]->aFont = rActBulletFont; - pActualBullets[i]->sDescription = SVX_RESSTR( RID_SVXSTR_BULLET_DESCRIPTION_0 + i ); + pActualBullets[i]->sDescription = SvxResId( RID_SVXSTR_BULLET_DESCRIPTION_0 + i ); } } sal_uInt16 BulletsTypeMgr::GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 mLevel,sal_uInt16 nFromIndex) @@ -365,7 +365,7 @@ void BulletsTypeMgr::RelplaceNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uI pActualBullets[nIndex]->aFont = *pFont; pActualBullets[nIndex]->bIsCustomized = true; - OUString aStrFromRES = SVX_RESSTR( RID_SVXSTR_NUMBULLET_CUSTOM_BULLET_DESCRIPTION); + OUString aStrFromRES = SvxResId( RID_SVXSTR_NUMBULLET_CUSTOM_BULLET_DESCRIPTION); OUString aReplace = "%LIST_NUM"; OUString sNUM = OUString::number( nIndex + 1 ); aStrFromRES = aStrFromRES.replaceFirst(aReplace,sNUM); @@ -465,7 +465,7 @@ void NumberingTypeMgr::Init() pNumEntry->nIndexDefault = i; pNumEntry->pNumSetting = pNew; if ( i < 8 ) - pNumEntry->sDescription = SVX_RESSTR( RID_SVXSTR_SINGLENUM_DESCRIPTIONS + i ); + pNumEntry->sDescription = SvxResId( RID_SVXSTR_SINGLENUM_DESCRIPTIONS + i ); maNumberSettingsArr.push_back(std::shared_ptr<NumberSettings_Impl>(pNumEntry)); } } @@ -537,7 +537,7 @@ void NumberingTypeMgr::RelplaceNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_ ApplyNumRule(aTmpRule2,nIndex,mLevel); if (aTmpRule1==aTmpRule2) _pSet->bIsCustomized=false; if (_pSet->bIsCustomized) { - OUString aStrFromRES = SVX_RESSTR( RID_SVXSTR_NUMBULLET_CUSTOM_NUMBERING_DESCRIPTION); + OUString aStrFromRES = SvxResId( RID_SVXSTR_NUMBULLET_CUSTOM_NUMBERING_DESCRIPTION); OUString sNUM = OUString::number( nIndex + 1 ); aStrFromRES = aStrFromRES.replaceFirst("%LIST_NUM",sNUM); _pSet->sDescription = aStrFromRES; @@ -647,7 +647,7 @@ void OutlineTypeMgr::Init() { pOutlineSettingsArrs[ nItem ] = new OutlineSettings_Impl; OutlineSettings_Impl* pItemArr = pOutlineSettingsArrs[ nItem ]; - pItemArr->sDescription = SVX_RESSTR( RID_SVXSTR_OUTLINENUM_DESCRIPTION_0 + nItem ); + pItemArr->sDescription = SvxResId( RID_SVXSTR_OUTLINENUM_DESCRIPTION_0 + nItem ); pItemArr->pNumSettingsArr = new NumSettingsArr_Impl; Reference<XIndexAccess> xLevel = aOutlineAccess.getConstArray()[nItem]; for(sal_Int32 nLevel = 0; nLevel < xLevel->getCount() && nLevel < 5; nLevel++) @@ -800,7 +800,7 @@ void OutlineTypeMgr::RelplaceNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uI ApplyNumRule(aTmpRule2,nIndex,mLevel); if (aTmpRule1==aTmpRule2) pItemArr->bIsCustomized=false; if (pItemArr->bIsCustomized) { - OUString aStrFromRES = SVX_RESSTR( RID_SVXSTR_NUMBULLET_CUSTOM_MULTILEVEL_DESCRIPTION); + OUString aStrFromRES = SvxResId( RID_SVXSTR_NUMBULLET_CUSTOM_MULTILEVEL_DESCRIPTION); OUString sNUM = OUString::number( nIndex + 1 ); aStrFromRES = aStrFromRES.replaceFirst("%LIST_NUM",sNUM); pItemArr->sDescription = aStrFromRES; diff --git a/svx/source/stbctrls/insctrl.cxx b/svx/source/stbctrls/insctrl.cxx index 128f8c973154..62f7220959e6 100644 --- a/svx/source/stbctrls/insctrl.cxx +++ b/svx/source/stbctrls/insctrl.cxx @@ -54,9 +54,9 @@ void SvxInsertStatusBarControl::StateChanged( sal_uInt16 , SfxItemState eState, bInsert = pItem->GetValue(); if ( bInsert ) - GetStatusBar().SetQuickHelpText( GetId(), SVX_RESSTR( RID_SVXSTR_INSERT_HELPTEXT ) ); + GetStatusBar().SetQuickHelpText( GetId(), SvxResId( RID_SVXSTR_INSERT_HELPTEXT ) ); else - GetStatusBar().SetQuickHelpText( GetId(), SVX_RESSTR( RID_SVXSTR_OVERWRITE_HELPTEXT ) ); + GetStatusBar().SetQuickHelpText( GetId(), SvxResId( RID_SVXSTR_OVERWRITE_HELPTEXT ) ); DrawItemText_Impl(); } @@ -71,7 +71,7 @@ void SvxInsertStatusBarControl::DrawItemText_Impl() { OUString aText; if ( !bInsert ) - aText = SVX_RESSTR( RID_SVXSTR_OVERWRITE_TEXT ); + aText = SvxResId( RID_SVXSTR_OVERWRITE_TEXT ); GetStatusBar().SetItemText( GetId(), aText ); } diff --git a/svx/source/stbctrls/modctrl.cxx b/svx/source/stbctrls/modctrl.cxx index 247d0dc62f06..33b0bd5e3c95 100644 --- a/svx/source/stbctrls/modctrl.cxx +++ b/svx/source/stbctrls/modctrl.cxx @@ -89,7 +89,7 @@ void SvxModifyControl::StateChanged( sal_uInt16, SfxItemState eState, _repaint(); int nResId = modified ? RID_SVXSTR_DOC_MODIFIED_YES : RID_SVXSTR_DOC_MODIFIED_NO; - GetStatusBar().SetQuickHelpText(GetId(), SVX_RESSTR(nResId)); + GetStatusBar().SetQuickHelpText(GetId(), SvxResId(nResId)); if ( start ) mxImpl->maIdle.Start(); diff --git a/svx/source/stbctrls/xmlsecctrl.cxx b/svx/source/stbctrls/xmlsecctrl.cxx index 327b36425407..f294a945726d 100644 --- a/svx/source/stbctrls/xmlsecctrl.cxx +++ b/svx/source/stbctrls/xmlsecctrl.cxx @@ -96,7 +96,7 @@ void XmlSecStatusBarControl::StateChanged( sal_uInt16, SfxItemState eState, cons else if ( mpImpl->mnState == SignatureState::PARTIAL_OK ) nResId = RID_SVXSTR_XMLSEC_SIG_CERT_OK_PARTIAL_SIG; - GetStatusBar().SetQuickHelpText( GetId(), SVX_RESSTR( nResId ) ); + GetStatusBar().SetQuickHelpText( GetId(), SvxResId( nResId ) ); } void XmlSecStatusBarControl::Command( const CommandEvent& rCEvt ) diff --git a/svx/source/stbctrls/zoomctrl.cxx b/svx/source/stbctrls/zoomctrl.cxx index 31073cad96d9..ea1059862330 100644 --- a/svx/source/stbctrls/zoomctrl.cxx +++ b/svx/source/stbctrls/zoomctrl.cxx @@ -105,7 +105,7 @@ SvxZoomStatusBarControl::SvxZoomStatusBarControl( sal_uInt16 _nSlotId, nZoom( 100 ), nValueSet( SvxZoomEnableFlags::ALL ) { - GetStatusBar().SetQuickHelpText(GetId(), SVX_RESSTR(RID_SVXSTR_ZOOMTOOL_HINT)); + GetStatusBar().SetQuickHelpText(GetId(), SvxResId(RID_SVXSTR_ZOOMTOOL_HINT)); } void SvxZoomStatusBarControl::StateChanged( sal_uInt16, SfxItemState eState, @@ -184,7 +184,7 @@ SvxZoomPageStatusBarControl::SvxZoomPageStatusBarControl(sal_uInt16 _nSlotId, : SfxStatusBarControl(_nSlotId, _nId, rStb) , maImage(BitmapEx(RID_SVXBMP_ZOOM_PAGE)) { - GetStatusBar().SetQuickHelpText(GetId(), SVX_RESSTR(RID_SVXSTR_FIT_SLIDE)); + GetStatusBar().SetQuickHelpText(GetId(), SvxResId(RID_SVXSTR_FIT_SLIDE)); } void SvxZoomPageStatusBarControl::Paint(const UserDrawEvent& rUsrEvt) diff --git a/svx/source/stbctrls/zoomsliderctrl.cxx b/svx/source/stbctrls/zoomsliderctrl.cxx index 01fb793e9359..3c871557c00c 100644 --- a/svx/source/stbctrls/zoomsliderctrl.cxx +++ b/svx/source/stbctrls/zoomsliderctrl.cxx @@ -366,11 +366,11 @@ bool SvxZoomSliderControl::MouseMove( const MouseEvent & rEvt ) // click to - button if ( nXDiff >= nButtonLeftOffset && nXDiff <= nButtonRightOffset ) - GetStatusBar().SetQuickHelpText(GetId(), SVX_RESSTR(RID_SVXSTR_ZOOM_OUT)); + GetStatusBar().SetQuickHelpText(GetId(), SvxResId(RID_SVXSTR_ZOOM_OUT)); // click to + button else if ( nXDiff >= aControlRect.GetWidth() - nSliderXOffset + nButtonLeftOffset && nXDiff <= aControlRect.GetWidth() - nSliderXOffset + nButtonRightOffset ) - GetStatusBar().SetQuickHelpText(GetId(), SVX_RESSTR(RID_SVXSTR_ZOOM_IN)); + GetStatusBar().SetQuickHelpText(GetId(), SvxResId(RID_SVXSTR_ZOOM_IN)); else // don't hide the slider and its handle with a tooltip during zooming GetStatusBar().SetQuickHelpText(GetId(), ""); diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx index 94e502646798..3e78145dcf7f 100644 --- a/svx/source/svdraw/svdetc.cxx +++ b/svx/source/svdraw/svdetc.cxx @@ -395,7 +395,7 @@ ResMgr* ImpGetResMgr() OUString ImpGetResStr(sal_uInt16 nResID) { - return ResId(nResID, *ImpGetResMgr()).toString(); + return ResId(nResID, *ImpGetResMgr()); } namespace sdr diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx index 5f8212d6b7f7..c17f7a0adc6d 100644 --- a/svx/source/svdraw/svdhdl.cxx +++ b/svx/source/svdraw/svdhdl.cxx @@ -1375,7 +1375,7 @@ void SdrHdlGradient::FromIAOToItem(SdrObject* _pObj, bool bSetItemOnObject, bool if(bUndo && pModel->IsUndoEnabled()) { - pModel->BegUndo(SVX_RESSTR(IsGradient() ? SIP_XA_FILLGRADIENT : SIP_XA_FILLTRANSPARENCE)); + pModel->BegUndo(SvxResId(IsGradient() ? SIP_XA_FILLGRADIENT : SIP_XA_FILLTRANSPARENCE)); pModel->AddUndo(pModel->GetSdrUndoFactory().CreateUndoAttrObject(*_pObj)); pModel->EndUndo(); } diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx index d72bfbcf0bc8..333eb014a9c9 100644 --- a/svx/source/svdraw/svdmrkv.cxx +++ b/svx/source/svdraw/svdmrkv.cxx @@ -1014,7 +1014,7 @@ void SdrMarkView::AddDragModeHdl(SdrDragMode eMode) // add undo to allow user to take back this step if( pModel->IsUndoEnabled() ) { - pModel->BegUndo(SVX_RESSTR(SIP_XA_FILLTRANSPARENCE)); + pModel->BegUndo(SvxResId(SIP_XA_FILLTRANSPARENCE)); pModel->AddUndo(pModel->GetSdrUndoFactory().CreateUndoAttrObject(*pObj)); pModel->EndUndo(); } diff --git a/svx/source/table/tabledesign.cxx b/svx/source/table/tabledesign.cxx index 31afe88eb2fe..3b56970ad81d 100644 --- a/svx/source/table/tabledesign.cxx +++ b/svx/source/table/tabledesign.cxx @@ -701,7 +701,7 @@ Any TableDesignFamily::getPropertyValue( const OUString& PropertyName ) { if ( PropertyName == "DisplayName" ) { - OUString sDisplayName( SVX_RESSTR( RID_SVXSTR_STYLEFAMILY_TABLEDESIGN ) ); + OUString sDisplayName( SvxResId( RID_SVXSTR_STYLEFAMILY_TABLEDESIGN ) ); return Any( sDisplayName ); } else diff --git a/svx/source/tbxctrls/PaletteManager.cxx b/svx/source/tbxctrls/PaletteManager.cxx index 140f515268d2..4aaadfb22eda 100644 --- a/svx/source/tbxctrls/PaletteManager.cxx +++ b/svx/source/tbxctrls/PaletteManager.cxx @@ -143,7 +143,7 @@ void PaletteManager::ReloadColorSet(SvxColorValueSet &rColorSet) std::set<Color> aColors = pDocSh->GetDocColors(); mnColorCount = aColors.size(); rColorSet.Clear(); - rColorSet.addEntriesForColorSet(aColors, SVX_RESSTR( RID_SVXSTR_DOC_COLOR_PREFIX ) + " " ); + rColorSet.addEntriesForColorSet(aColors, SvxResId( RID_SVXSTR_DOC_COLOR_PREFIX ) + " " ); } } else @@ -175,12 +175,12 @@ std::vector<OUString> PaletteManager::GetPaletteList() { std::vector<OUString> aPaletteNames; - aPaletteNames.push_back( SVX_RESSTR( RID_SVXSTR_CUSTOM_PAL ) ); + aPaletteNames.push_back( SvxResId( RID_SVXSTR_CUSTOM_PAL ) ); for (auto const& it : m_Palettes) { aPaletteNames.push_back( (*it).GetName() ); } - aPaletteNames.push_back( SVX_RESSTR ( RID_SVXSTR_DOC_COLORS ) ); + aPaletteNames.push_back( SvxResId ( RID_SVXSTR_DOC_COLORS ) ); return aPaletteNames; } diff --git a/svx/source/tbxctrls/bulletsnumbering.cxx b/svx/source/tbxctrls/bulletsnumbering.cxx index bf81afb5e032..ab931156aa7e 100644 --- a/svx/source/tbxctrls/bulletsnumbering.cxx +++ b/svx/source/tbxctrls/bulletsnumbering.cxx @@ -106,17 +106,17 @@ NumberingPopup::NumberingPopup( NumberingToolBoxControl& rController, OUString aMoreItemText; if ( mePageType == NumberingPageType::BULLET ) { - aMoreItemText = SVX_RESSTR( RID_SVXSTR_MOREBULLETS ); + aMoreItemText = SvxResId( RID_SVXSTR_MOREBULLETS ); AddStatusListener( ".uno:CurrentBulletListType" ); } else if ( mePageType == NumberingPageType::SINGLENUM ) { - aMoreItemText = SVX_RESSTR( RID_SVXSTR_MORENUMBERING ); + aMoreItemText = SvxResId( RID_SVXSTR_MORENUMBERING ); AddStatusListener( ".uno:CurrentNumListType" ); } else { - aMoreItemText = SVX_RESSTR( RID_SVXSTR_MORE ); + aMoreItemText = SvxResId( RID_SVXSTR_MORE ); AddStatusListener( ".uno:CurrentOutlineType" ); } diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx index 46f333287fcf..de140408609d 100644 --- a/svx/source/tbxctrls/colrctrl.cxx +++ b/svx/source/tbxctrls/colrctrl.cxx @@ -90,7 +90,7 @@ SvxColorValueSet_docking::SvxColorValueSet_docking( vcl::Window* _pParent ) : DragSourceHelper( this ), mbLeftButton(true) { - SetAccessibleName(SVX_RESSTR(STR_COLORTABLE)); + SetAccessibleName(SvxResId(STR_COLORTABLE)); } void SvxColorValueSet_docking::MouseButtonDown( const MouseEvent& rMEvt ) @@ -183,7 +183,7 @@ SvxColorDockingWindow::SvxColorDockingWindow nLines ( 1 ), nCount ( 0 ) { - SetText(SVX_RESSTR(STR_COLORTABLE)); + SetText(SvxResId(STR_COLORTABLE)); SetSizePixel(LogicToPixel(Size(150, 22), MapMode(MapUnit::MapAppFont))); SetHelpId(HID_CTRL_COLOR); @@ -277,7 +277,7 @@ void SvxColorDockingWindow::FillValueSet() Bitmap aBmp( pVD->GetBitmap( Point(), aColorSize ) ); - aColorSet->InsertItem( (sal_uInt16)1, Image(aBmp), SVX_RESSTR( RID_SVXSTR_INVISIBLE ) ); + aColorSet->InsertItem( (sal_uInt16)1, Image(aBmp), SvxResId( RID_SVXSTR_INVISIBLE ) ); aColorSet->addEntriesForXColorList(*pColorList, 2); } diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx index cbfd1bb7c5c7..59282aae85da 100644 --- a/svx/source/tbxctrls/extrusioncontrols.cxx +++ b/svx/source/tbxctrls/extrusioncontrols.cxx @@ -134,7 +134,7 @@ ExtrusionDirectionWindow::ExtrusionDirectionWindow( for (sal_uInt16 i = DIRECTION_NW; i <= DIRECTION_SE; ++i) { - OUString aText(SVX_RESSTR(RID_SVXSTR_DIRECTION + i)); + OUString aText(SvxResId(RID_SVXSTR_DIRECTION + i)); mpDirectionSet->InsertItem(i + 1, maImgDirection[i], aText); } @@ -142,8 +142,8 @@ ExtrusionDirectionWindow::ExtrusionDirectionWindow( appendEntry(2, mpDirectionSet ); appendSeparator(); - appendEntry(0, SVX_RESSTR(RID_SVXSTR_PERSPECTIVE), maImgPerspective); - appendEntry(1, SVX_RESSTR(RID_SVXSTR_PARALLEL), maImgParallel); + appendEntry(0, SvxResId(RID_SVXSTR_PERSPECTIVE), maImgPerspective); + appendEntry(1, SvxResId(RID_SVXSTR_PARALLEL), maImgParallel); SetOutputSizePixel( getMenuSize() ); @@ -393,8 +393,8 @@ ExtrusionDepthWindow::ExtrusionDepthWindow( appendEntry(2, "", maImgDepth2); appendEntry(3, "", maImgDepth3); appendEntry(4, "", maImgDepth4); - appendEntry(5, SVX_RESSTR(RID_SVXSTR_INFINITY), maImgDepthInfinity); - appendEntry(6, SVX_RESSTR(RID_SVXSTR_CUSTOM)); + appendEntry(5, SvxResId(RID_SVXSTR_INFINITY), maImgDepthInfinity); + appendEntry(6, SvxResId(RID_SVXSTR_CUSTOM)); SetOutputSizePixel( getMenuSize() ); @@ -427,7 +427,7 @@ void ExtrusionDepthWindow::implFillStrings( FieldUnit eUnit ) for( int i = 0; i < 5; i++ ) { - OUString aStr( SVX_RESSTR( nResource + i ) ); + OUString aStr( SvxResId( nResource + i ) ); setEntryText( i, aStr ); } } @@ -622,9 +622,9 @@ ExtrusionLightingWindow::ExtrusionLightingWindow(svt::ToolboxController& rContro appendEntry(3, mpLightingSet); appendSeparator(); - appendEntry(0, SVX_RESSTR(RID_SVXSTR_BRIGHT), maImgBright); - appendEntry(1, SVX_RESSTR(RID_SVXSTR_NORMAL), maImgNormal); - appendEntry(2, SVX_RESSTR(RID_SVXSTR_DIM), maImgDim); + appendEntry(0, SvxResId(RID_SVXSTR_BRIGHT), maImgBright); + appendEntry(1, SvxResId(RID_SVXSTR_NORMAL), maImgNormal); + appendEntry(2, SvxResId(RID_SVXSTR_DIM), maImgDim); SetOutputSizePixel( getMenuSize() ); @@ -855,10 +855,10 @@ ExtrusionSurfaceWindow::ExtrusionSurfaceWindow( { SetSelectHdl( LINK( this, ExtrusionSurfaceWindow, SelectHdl ) ); - appendEntry(0, SVX_RESSTR(RID_SVXSTR_WIREFRAME), maImgSurface1); - appendEntry(1, SVX_RESSTR(RID_SVXSTR_MATTE), maImgSurface2); - appendEntry(2, SVX_RESSTR(RID_SVXSTR_PLASTIC), maImgSurface3); - appendEntry(3, SVX_RESSTR(RID_SVXSTR_METAL), maImgSurface4); + appendEntry(0, SvxResId(RID_SVXSTR_WIREFRAME), maImgSurface1); + appendEntry(1, SvxResId(RID_SVXSTR_MATTE), maImgSurface2); + appendEntry(2, SvxResId(RID_SVXSTR_PLASTIC), maImgSurface3); + appendEntry(3, SvxResId(RID_SVXSTR_METAL), maImgSurface4); SetOutputSizePixel( getMenuSize() ); diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx index 3c9d23c959c4..f5e4a426156d 100644 --- a/svx/source/tbxctrls/fontworkgallery.cxx +++ b/svx/source/tbxctrls/fontworkgallery.cxx @@ -170,7 +170,7 @@ void FontWorkGalleryDialog::fillFavorites(sal_uInt16 nThemeId) for( std::vector<Bitmap *>::size_type nFavorite = 1; nFavorite <= nFavCount; nFavorite++ ) { - OUString aStr(SVX_RESSTR(RID_SVXFLOAT3D_FAVORITE)); + OUString aStr(SvxResId(RID_SVXFLOAT3D_FAVORITE)); aStr += " "; aStr += OUString::number(nFavorite); Image aThumbImage( maFavoritesHorizontal[nFavorite-1] ); @@ -278,11 +278,11 @@ FontworkAlignmentWindow::FontworkAlignmentWindow(svt::ToolboxController& rContro { SetSelectHdl( LINK( this, FontworkAlignmentWindow, SelectHdl ) ); - appendEntry(0, SVX_RESSTR(RID_SVXSTR_ALIGN_LEFT), maImgAlgin1); - appendEntry(1, SVX_RESSTR(RID_SVXSTR_ALIGN_CENTER), maImgAlgin2); - appendEntry(2, SVX_RESSTR(RID_SVXSTR_ALIGN_RIGHT), maImgAlgin3); - appendEntry(3, SVX_RESSTR(RID_SVXSTR_ALIGN_WORD), maImgAlgin4); - appendEntry(4, SVX_RESSTR(RID_SVXSTR_ALIGN_STRETCH), maImgAlgin5); + appendEntry(0, SvxResId(RID_SVXSTR_ALIGN_LEFT), maImgAlgin1); + appendEntry(1, SvxResId(RID_SVXSTR_ALIGN_CENTER), maImgAlgin2); + appendEntry(2, SvxResId(RID_SVXSTR_ALIGN_RIGHT), maImgAlgin3); + appendEntry(3, SvxResId(RID_SVXSTR_ALIGN_WORD), maImgAlgin4); + appendEntry(4, SvxResId(RID_SVXSTR_ALIGN_STRETCH), maImgAlgin5); SetOutputSizePixel( getMenuSize() ); @@ -434,14 +434,14 @@ FontworkCharacterSpacingWindow::FontworkCharacterSpacingWindow(svt::ToolboxContr { SetSelectHdl( LINK( this, FontworkCharacterSpacingWindow, SelectHdl ) ); - appendEntry(0, SVX_RESSTR(RID_SVXSTR_CHARS_SPACING_VERY_TIGHT), MenuItemBits::RADIOCHECK); - appendEntry(1, SVX_RESSTR(RID_SVXSTR_CHARS_SPACING_TIGHT), MenuItemBits::RADIOCHECK); - appendEntry(2, SVX_RESSTR(RID_SVXSTR_CHARS_SPACING_NORMAL), MenuItemBits::RADIOCHECK); - appendEntry(3, SVX_RESSTR(RID_SVXSTR_CHARS_SPACING_LOOSE), MenuItemBits::RADIOCHECK); - appendEntry(4, SVX_RESSTR(RID_SVXSTR_CHARS_SPACING_VERY_LOOSE), MenuItemBits::RADIOCHECK); - appendEntry(5, SVX_RESSTR(RID_SVXSTR_CHARS_SPACING_CUSTOM), MenuItemBits::RADIOCHECK); + appendEntry(0, SvxResId(RID_SVXSTR_CHARS_SPACING_VERY_TIGHT), MenuItemBits::RADIOCHECK); + appendEntry(1, SvxResId(RID_SVXSTR_CHARS_SPACING_TIGHT), MenuItemBits::RADIOCHECK); + appendEntry(2, SvxResId(RID_SVXSTR_CHARS_SPACING_NORMAL), MenuItemBits::RADIOCHECK); + appendEntry(3, SvxResId(RID_SVXSTR_CHARS_SPACING_LOOSE), MenuItemBits::RADIOCHECK); + appendEntry(4, SvxResId(RID_SVXSTR_CHARS_SPACING_VERY_LOOSE), MenuItemBits::RADIOCHECK); + appendEntry(5, SvxResId(RID_SVXSTR_CHARS_SPACING_CUSTOM), MenuItemBits::RADIOCHECK); appendSeparator(); - appendEntry(6, SVX_RESSTR(RID_SVXSTR_CHARS_SPACING_KERN_PAIRS), MenuItemBits::CHECKABLE); + appendEntry(6, SvxResId(RID_SVXSTR_CHARS_SPACING_KERN_PAIRS), MenuItemBits::CHECKABLE); SetOutputSizePixel( getMenuSize() ); diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index 92d7a7593df8..19a41f4e6f2d 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -337,10 +337,10 @@ ImplGrafModeControl::ImplGrafModeControl( vcl::Window* pParent, const Reference< { SetSizePixel( Size( 100, 260 ) ); - InsertEntry( SVX_RESSTR( RID_SVXSTR_GRAFMODE_STANDARD ) ); - InsertEntry( SVX_RESSTR( RID_SVXSTR_GRAFMODE_GREYS ) ); - InsertEntry( SVX_RESSTR( RID_SVXSTR_GRAFMODE_MONO ) ); - InsertEntry( SVX_RESSTR( RID_SVXSTR_GRAFMODE_WATERMARK ) ); + InsertEntry( SvxResId( RID_SVXSTR_GRAFMODE_STANDARD ) ); + InsertEntry( SvxResId( RID_SVXSTR_GRAFMODE_GREYS ) ); + InsertEntry( SvxResId( RID_SVXSTR_GRAFMODE_MONO ) ); + InsertEntry( SvxResId( RID_SVXSTR_GRAFMODE_WATERMARK ) ); Show(); } @@ -577,7 +577,7 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView ) { aSet.Put( SdrGrafRedItem( static_cast<const SfxInt16Item*>(pItem)->GetValue() )); if( bUndo ) - aUndoStr += SVX_RESSTR( RID_SVXSTR_UNDO_GRAFRED ); + aUndoStr += SvxResId( RID_SVXSTR_UNDO_GRAFRED ); } } break; @@ -588,7 +588,7 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView ) { aSet.Put( SdrGrafGreenItem( static_cast<const SfxInt16Item*>(pItem)->GetValue() )); if( bUndo ) - aUndoStr += SVX_RESSTR( RID_SVXSTR_UNDO_GRAFGREEN ); + aUndoStr += SvxResId( RID_SVXSTR_UNDO_GRAFGREEN ); } } break; @@ -599,7 +599,7 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView ) { aSet.Put( SdrGrafBlueItem( static_cast<const SfxInt16Item*>(pItem)->GetValue() )); if( bUndo ) - aUndoStr += SVX_RESSTR( RID_SVXSTR_UNDO_GRAFBLUE ); + aUndoStr += SvxResId( RID_SVXSTR_UNDO_GRAFBLUE ); } } break; @@ -610,7 +610,7 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView ) { aSet.Put( SdrGrafLuminanceItem( static_cast<const SfxInt16Item*>(pItem)->GetValue() )); if( bUndo ) - aUndoStr += SVX_RESSTR( RID_SVXSTR_UNDO_GRAFLUMINANCE ); + aUndoStr += SvxResId( RID_SVXSTR_UNDO_GRAFLUMINANCE ); } } break; @@ -621,7 +621,7 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView ) { aSet.Put( SdrGrafContrastItem( static_cast<const SfxInt16Item*>(pItem)->GetValue() )); if( bUndo ) - aUndoStr += SVX_RESSTR( RID_SVXSTR_UNDO_GRAFCONTRAST ); + aUndoStr += SvxResId( RID_SVXSTR_UNDO_GRAFCONTRAST ); } } break; @@ -632,7 +632,7 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView ) { aSet.Put( SdrGrafGamma100Item( static_cast<const SfxUInt32Item*>(pItem)->GetValue() )); if( bUndo ) - aUndoStr += SVX_RESSTR( RID_SVXSTR_UNDO_GRAFGAMMA ); + aUndoStr += SvxResId( RID_SVXSTR_UNDO_GRAFGAMMA ); } } break; @@ -643,7 +643,7 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView ) { aSet.Put( SdrGrafTransparenceItem( static_cast<const SfxUInt16Item*>(pItem)->GetValue() )); if( bUndo ) - aUndoStr += SVX_RESSTR( RID_SVXSTR_UNDO_GRAFTRANSPARENCY ); + aUndoStr += SvxResId( RID_SVXSTR_UNDO_GRAFTRANSPARENCY ); } } break; @@ -654,7 +654,7 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView ) { aSet.Put( SdrGrafModeItem( (GraphicDrawMode) static_cast<const SfxUInt16Item*>(pItem)->GetValue() )); if( bUndo ) - aUndoStr += SVX_RESSTR( RID_SVXSTR_UNDO_GRAFMODE ); + aUndoStr += SvxResId( RID_SVXSTR_UNDO_GRAFMODE ); } } break; @@ -705,7 +705,7 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView ) ScopedVclPtrInstance<SfxSingleTabDialog> aCropDialog( SfxViewShell::Current() ? SfxViewShell::Current()->GetWindow() : nullptr, aCropDlgAttr); - const OUString aCropStr(SVX_RESSTR(RID_SVXSTR_GRAFCROP)); + const OUString aCropStr(SvxResId(RID_SVXSTR_GRAFCROP)); SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); assert(pFact && "Dialog creation failed!"); @@ -722,7 +722,7 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView ) if( pOutAttr ) { - aUndoStr += SVX_RESSTR( RID_SVXSTR_UNDO_GRAFCROP ); + aUndoStr += SvxResId( RID_SVXSTR_UNDO_GRAFCROP ); // set crop attributes if( SfxItemState::SET <= pOutAttr->GetItemState( SDRATTR_GRAFCROP ) ) diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx index ee5e69f2fc3f..33da56fe3227 100644 --- a/svx/source/tbxctrls/layctrl.cxx +++ b/svx/source/tbxctrls/layctrl.cxx @@ -139,7 +139,7 @@ TableWindow::TableWindow( sal_uInt16 nSlotId, const OUString& rCmd, const OUStri aTableButton->SetPosSizePixel( Point( mnTablePosX, mnTableHeight + 5 ), Size( mnTableWidth - mnTablePosX, 24 ) ); - aTableButton->SetText( SVX_RESSTR( RID_SVXSTR_MORE ) ); + aTableButton->SetText( SvxResId( RID_SVXSTR_MORE ) ); aTableButton->SetClickHdl( LINK( this, TableWindow, SelectHdl ) ); aTableButton->Show(); @@ -285,7 +285,7 @@ void TableWindow::Paint(vcl::RenderContext& rRenderContext, const tools::Rectang if(GetId() == FN_SHOW_MULTIPLE_PAGES) { aText += " "; - aText += SVX_RESSTR(RID_SVXSTR_PAGES); + aText += SvxResId(RID_SVXSTR_PAGES); } Size aTextSize(rRenderContext.GetTextWidth(aText), rRenderContext.GetTextHeight()); diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx index 3794901daa82..79abd6a95705 100644 --- a/svx/source/tbxctrls/lboxctrl.cxx +++ b/svx/source/tbxctrls/lboxctrl.cxx @@ -150,7 +150,7 @@ void SvxUndoRedoControl::Impl_SetInfo( sal_Int32 nCount ) else nId = SID_UNDO == GetSlotId() ? RID_SVXSTR_NUM_UNDO_ACTIONS : RID_SVXSTR_NUM_REDO_ACTIONS; - aActionStr = SVX_RESSTR(nId); + aActionStr = SvxResId(nId); OUString aText = aActionStr.replaceAll("$(ARG1)", OUString::number(nCount)); pPopupWin->SetText(aText); @@ -245,7 +245,7 @@ VclPtr<SfxPopupWindow> SvxUndoRedoControl::CreatePopupWindow() rListBox.InsertEntry( s ); rListBox.SelectEntryPos( 0 ); - aActionStr = SVX_RESSTR(SID_UNDO == GetSlotId() ? + aActionStr = SvxResId(SID_UNDO == GetSlotId() ? RID_SVXSTR_NUM_UNDO_ACTIONS : RID_SVXSTR_NUM_REDO_ACTIONS); Impl_SetInfo( rListBox.GetSelectEntryCount() ); diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx index 721355db6dbe..b512aa16a8e8 100644 --- a/svx/source/tbxctrls/linectrl.cxx +++ b/svx/source/tbxctrls/linectrl.cxx @@ -174,8 +174,8 @@ void SvxLineStyleToolBoxControl::Update( const SfxPoolItem* pState ) OUString aString( pBox->GetSelectEntry() ); pBox->Clear(); - pBox->InsertEntry( SVX_RESSTR(RID_SVXSTR_INVISIBLE) ); - pBox->InsertEntry( SVX_RESSTR(RID_SVXSTR_SOLID) ); + pBox->InsertEntry( SvxResId(RID_SVXSTR_INVISIBLE) ); + pBox->InsertEntry( SvxResId(RID_SVXSTR_SOLID) ); pBox->Fill( static_cast<const SvxDashListItem*>(pState)->GetDashList() ); pBox->SelectEntry( aString ); } @@ -276,7 +276,7 @@ SvxLineEndWindow::SvxLineEndWindow( svt::ToolboxController& rController, vcl::Wi mnLines ( 12 ), mrController ( rController ) { - SetText( SVX_RESSTR( RID_SVXSTR_LINEEND ) ); + SetText( SvxResId( RID_SVXSTR_LINEEND ) ); SetHelpId( HID_POPUP_LINEEND ); mpLineEndSet->SetHelpId( HID_POPUP_LINEEND_CTRL ); @@ -374,7 +374,7 @@ void SvxLineEndWindow::FillValueSet() // First entry: no line end. // An entry is temporarily added to get the UI bitmap basegfx::B2DPolyPolygon aNothing; - mpLineEndList->Insert(o3tl::make_unique<XLineEndEntry>(aNothing, SVX_RESSTR(RID_SVXSTR_NONE))); + mpLineEndList->Insert(o3tl::make_unique<XLineEndEntry>(aNothing, SvxResId(RID_SVXSTR_NONE))); const XLineEndEntry* pEntry = mpLineEndList->GetLineEnd(nCount); Bitmap aBmp = mpLineEndList->GetUiBitmap( nCount ); OSL_ENSURE( !aBmp.IsEmpty(), "UI bitmap was not created" ); diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index a41c01027c31..a617fedb1013 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -1015,7 +1015,7 @@ IMPL_LINK( SvxFontNameBox_Impl, CheckAndMarkUnknownFont, VclWindowEvent&, event, { font.SetItalic( ITALIC_NONE ); SetControlFont( font ); - SetQuickHelpText( SVX_RESSTR( RID_SVXSTR_CHARFONTNAME )); + SetQuickHelpText( SvxResId( RID_SVXSTR_CHARFONTNAME )); } } else @@ -1024,7 +1024,7 @@ IMPL_LINK( SvxFontNameBox_Impl, CheckAndMarkUnknownFont, VclWindowEvent&, event, { font.SetItalic( ITALIC_NORMAL ); SetControlFont( font ); - SetQuickHelpText( SVX_RESSTR( RID_SVXSTR_CHARFONTNAME_NOTAVAILABLE )); + SetQuickHelpText( SvxResId( RID_SVXSTR_CHARFONTNAME_NOTAVAILABLE )); } } } @@ -1286,17 +1286,17 @@ SvxColorWindow::SvxColorWindow(const OUString& rCommand, case SID_BACKGROUND_COLOR: case SID_ATTR_CHAR_BACK_COLOR: { - mpButtonAutoColor->SetText( SVX_RESSTR( RID_SVXSTR_NOFILL ) ); + mpButtonAutoColor->SetText( SvxResId( RID_SVXSTR_NOFILL ) ); break; } case SID_AUTHOR_COLOR: { - mpButtonAutoColor->SetText( SVX_RESSTR( RID_SVXSTR_BY_AUTHOR ) ); + mpButtonAutoColor->SetText( SvxResId( RID_SVXSTR_BY_AUTHOR ) ); break; } case SID_BMPMASK_COLOR: { - mpButtonAutoColor->SetText( SVX_RESSTR( RID_SVXSTR_TRANSPARENT ) ); + mpButtonAutoColor->SetText( SvxResId( RID_SVXSTR_TRANSPARENT ) ); break; } case SID_ATTR_CHAR_COLOR: @@ -1405,15 +1405,15 @@ namespace case SID_BACKGROUND_COLOR: case SID_ATTR_CHAR_BACK_COLOR: aColor = COL_TRANSPARENT; - sColorName = SVX_RESSTR(RID_SVXSTR_NOFILL); + sColorName = SvxResId(RID_SVXSTR_NOFILL); break; case SID_AUTHOR_COLOR: aColor = COL_TRANSPARENT; - sColorName = SVX_RESSTR(RID_SVXSTR_BY_AUTHOR); + sColorName = SvxResId(RID_SVXSTR_BY_AUTHOR); break; case SID_BMPMASK_COLOR: aColor = COL_TRANSPARENT; - sColorName = SVX_RESSTR(RID_SVXSTR_TRANSPARENT); + sColorName = SvxResId(RID_SVXSTR_TRANSPARENT); break; case SID_ATTR_CHAR_COLOR: case SID_ATTR_CHAR_COLOR2: @@ -1429,7 +1429,7 @@ namespace NamedColor GetNoneColor() { - return std::make_pair(Color(COL_NONE_COLOR), SVX_RESSTR(RID_SVXSTR_NONE)); + return std::make_pair(Color(COL_NONE_COLOR), SvxResId(RID_SVXSTR_NONE)); } } @@ -1730,8 +1730,8 @@ SvxFrameWindow_Impl::SvxFrameWindow_Impl ( svt::ToolboxController& rController, CalcSizeValueSet(); SetHelpId( HID_POPUP_FRAME ); - SetText( SVX_RESSTR(RID_SVXSTR_FRAME) ); - aFrameSet->SetAccessibleName( SVX_RESSTR(RID_SVXSTR_FRAME) ); + SetText( SvxResId(RID_SVXSTR_FRAME) ); + aFrameSet->SetAccessibleName( SvxResId(RID_SVXSTR_FRAME) ); aFrameSet->Show(); } @@ -2029,7 +2029,7 @@ SvxCurrencyList_Impl::SvxCurrencyList_Impl( } } m_pCurrencyLb->SetSelectHdl( LINK( this, SvxCurrencyList_Impl, SelectHdl ) ); - SetText( SVX_RESSTR( RID_SVXSTR_TBLAFMT_CURRENCY ) ); + SetText( SvxResId( RID_SVXSTR_TBLAFMT_CURRENCY ) ); if ( nSelectedPos >= 0 ) m_pCurrencyLb->SelectEntryPos( nSelectedPos ); m_pCurrencyLb->Show(); @@ -2060,7 +2060,7 @@ SvxLineWindow_Impl::SvxLineWindow_Impl( svt::ToolboxController& rController, vcl SetOutputSizePixel( Size( 114, 144 ) ); m_aLineStyleLb->SetSourceUnit( FUNIT_TWIP ); - m_aLineStyleLb->SetNone( SVX_RESSTR(RID_SVXSTR_NONE) ); + m_aLineStyleLb->SetNone( SvxResId(RID_SVXSTR_NONE) ); m_aLineStyleLb->InsertEntry( SvxBorderLine::getWidthImpl( SvxBorderLineStyle::SOLID ), SvxBorderLineStyle::SOLID ); m_aLineStyleLb->InsertEntry( SvxBorderLine::getWidthImpl( SvxBorderLineStyle::DOTTED ), SvxBorderLineStyle::DOTTED ); @@ -2093,7 +2093,7 @@ SvxLineWindow_Impl::SvxLineWindow_Impl( svt::ToolboxController& rController, vcl m_aLineStyleLb->SetSelectHdl( LINK( this, SvxLineWindow_Impl, SelectHdl ) ); SetHelpId( HID_POPUP_LINE ); - SetText( SVX_RESSTR(RID_SVXSTR_FRAME_STYLE) ); + SetText( SvxResId(RID_SVXSTR_FRAME_STYLE) ); m_aLineStyleLb->Show(); } @@ -2199,8 +2199,8 @@ struct SvxStyleToolBoxControl::Impl bool bSpecModeCalc; Impl() - :aClearForm ( SVX_RESSTR( RID_SVXSTR_CLEARFORM ) ) - ,aMore ( SVX_RESSTR( RID_SVXSTR_MORE_STYLES ) ) + :aClearForm ( SvxResId( RID_SVXSTR_CLEARFORM ) ) + ,aMore ( SvxResId( RID_SVXSTR_MORE_STYLES ) ) ,bSpecModeWriter ( false ) ,bSpecModeCalc ( false ) { diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx index a3b2a06a2c61..90d104ae5e14 100644 --- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx +++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx @@ -172,7 +172,7 @@ FindTextFieldControl::FindTextFieldControl( vcl::Window* pParent, WinBits nStyle m_xFrame(xFrame), m_xContext(xContext) { - SetPlaceholderText(SVX_RESSTR(RID_SVXSTR_FINDBAR_FIND)); + SetPlaceholderText(SvxResId(RID_SVXSTR_FINDBAR_FIND)); EnableAutocomplete(true, true); } @@ -821,7 +821,7 @@ css::uno::Reference< css::awt::XWindow > SAL_CALL MatchCaseToolboxController::cr { ToolBox* pToolbar = static_cast<ToolBox*>(pParent.get()); m_pMatchCaseControl = VclPtr<CheckBox>::Create( pToolbar, 0 ); - m_pMatchCaseControl->SetText( SVX_RESSTR( RID_SVXSTR_FINDBAR_MATCHCASE ) ); + m_pMatchCaseControl->SetText( SvxResId( RID_SVXSTR_FINDBAR_MATCHCASE ) ); Size aSize( m_pMatchCaseControl->GetOptimalSize() ); m_pMatchCaseControl->SetSizePixel( aSize ); } @@ -940,7 +940,7 @@ css::uno::Reference< css::awt::XWindow > SAL_CALL SearchFormattedToolboxControll { ToolBox* pToolbar = static_cast<ToolBox*>(pParent.get()); m_pSearchFormattedControl = VclPtr<CheckBox>::Create( pToolbar, 0 ); - m_pSearchFormattedControl->SetText( SVX_RESSTR( RID_SVXSTR_FINDBAR_SEARCHFORMATTED ) ); + m_pSearchFormattedControl->SetText( SvxResId( RID_SVXSTR_FINDBAR_SEARCHFORMATTED ) ); Size aSize( m_pSearchFormattedControl->GetOptimalSize() ); m_pSearchFormattedControl->SetSizePixel( aSize ); } diff --git a/svx/source/toolbars/extrusionbar.cxx b/svx/source/toolbars/extrusionbar.cxx index 5dea6c528bd6..89b2a0fa7a10 100644 --- a/svx/source/toolbars/extrusionbar.cxx +++ b/svx/source/toolbars/extrusionbar.cxx @@ -69,7 +69,7 @@ ExtrusionBar::ExtrusionBar(SfxViewShell* pViewShell ) if( pViewShell ) SetPool(&pViewShell->GetPool()); - SetName(SVX_RESSTR(RID_SVX_EXTRUSION_BAR)); + SetName(SvxResId(RID_SVX_EXTRUSION_BAR)); } ExtrusionBar::~ExtrusionBar() @@ -541,7 +541,7 @@ void ExtrusionBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rB { if( bUndo ) { - OUString aStr( SVX_RESSTR( nStrResId ) ); + OUString aStr( SvxResId( nStrResId ) ); pSdrView->BegUndo( aStr ); pSdrView->AddUndo( pSdrView->GetModel()->GetSdrUndoFactory().CreateUndoAttrObject( *pObj ) ); } diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx index ec473f4b5e9e..2a0cdc451ac9 100644 --- a/svx/source/toolbars/fontworkbar.cxx +++ b/svx/source/toolbars/fontworkbar.cxx @@ -190,7 +190,7 @@ FontworkBar::FontworkBar(SfxViewShell* pViewShell ) if( pViewShell ) SetPool(&pViewShell->GetPool()); - SetName( SVX_RESSTR( RID_SVX_FONTWORK_BAR )); + SetName( SvxResId( RID_SVX_FONTWORK_BAR )); } FontworkBar::~FontworkBar() @@ -451,7 +451,7 @@ void FontworkBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rBi if( bUndo ) { - OUString aStr( SVX_RESSTR( RID_SVXSTR_UNDO_APPLY_FONTWORK_SHAPE ) ); + OUString aStr( SvxResId( RID_SVXSTR_UNDO_APPLY_FONTWORK_SHAPE ) ); pSdrView->BegUndo( aStr ); pSdrView->AddUndo( pSdrView->GetModel()->GetSdrUndoFactory().CreateUndoAttrObject( *pObj ) ); } @@ -529,7 +529,7 @@ void FontworkBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rBi const bool bUndo = pSdrView->IsUndoEnabled(); if( bUndo ) { - OUString aStr( SVX_RESSTR( nStrResId ) ); + OUString aStr( SvxResId( nStrResId ) ); pSdrView->BegUndo( aStr ); pSdrView->AddUndo( pSdrView->GetModel()->GetSdrUndoFactory().CreateUndoAttrObject( *pObj ) ); } diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx index f1ef61726f50..f0d5a1f4a686 100644 --- a/svx/source/unodraw/unoprov.cxx +++ b/svx/source/unodraw/unoprov.cxx @@ -1120,20 +1120,17 @@ bool SvxUnoConvertResourceString( int nSourceResIds, int nDestResIds, int nCount for( i = 0; i < nCount; i++ ) { sal_uInt16 nResId = (sal_uInt16)(nSourceResIds + i); - const ResId aRes( SVX_RES(nResId)); - const OUString aCompare( aRes.toString() ); + const OUString aCompare(SvxResId(nResId)); if( aShortString == aCompare ) { sal_uInt16 nNewResId = (sal_uInt16)(nDestResIds + i); - ResId aNewRes( SVX_RES( nNewResId )); - rString = rString.replaceAt( 0, aShortString.getLength(), aNewRes.toString() ); + rString = rString.replaceAt( 0, aShortString.getLength(), SvxResId( nNewResId ) ); return true; } else if( rString == aCompare ) { sal_uInt16 nNewResId = (sal_uInt16)(nDestResIds + i); - ResId aNewRes( SVX_RES( nNewResId )); - rString = aNewRes.toString(); + rString = SvxResId(nNewResId); return true; } } @@ -1258,10 +1255,10 @@ bool SvxUnoConvertResourceString( const sal_uInt16* pSourceResIds, const sal_uIn for(int i = 0; i < nCount; ++i ) { - OUString aStrDefName = SVX_RESSTR( pSourceResIds[i] ); + OUString aStrDefName = SvxResId( pSourceResIds[i] ); if( sStr == aStrDefName ) { - OUString aReplace = SVX_RESSTR( pDestResIds[i] ); + OUString aReplace = SvxResId( pDestResIds[i] ); rString = rString.replaceAt( 0, aStrDefName.getLength(), aReplace ); return true; } diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx index eb8afb7d5532..9d34c7382900 100644 --- a/svx/source/xoutdev/xattr.cxx +++ b/svx/source/xoutdev/xattr.cxx @@ -168,8 +168,7 @@ OUString NameOrIndex::CheckNamedItem( const NameOrIndex* pCheckItem, const sal_u if (aUniqueName.isEmpty()) { sal_Int32 nUserIndex = 1; - const ResId aRes(SVX_RES(nPrefixResId)); - OUString aUser( aRes.toString() ); + OUString aUser(SvxResId(nPrefixResId)); aUser += " "; if( pDefaults.get() ) @@ -402,7 +401,7 @@ bool XLineStyleItem::GetPresentation } if ( nId ) - rText = SVX_RESSTR( nId ); + rText = SvxResId( nId ); return true; } @@ -1484,8 +1483,7 @@ XLineStartItem* XLineStartItem::checkForUniqueItem( SdrModel* pModel ) const bool bFoundExisting = false; sal_Int32 nUserIndex = 1; - const ResId aRes(SVX_RES(RID_SVXSTR_LINEEND)); - const OUString aUser( aRes.toString() ); + const OUString aUser(SvxResId(RID_SVXSTR_LINEEND)); if( pPool1 ) { @@ -1767,8 +1765,7 @@ XLineEndItem* XLineEndItem::checkForUniqueItem( SdrModel* pModel ) const bool bFoundExisting = false; sal_Int32 nUserIndex = 1; - const ResId aRes(SVX_RES(RID_SVXSTR_LINEEND)); - const OUString aUser( aRes.toString() ); + const OUString aUser(SvxResId(RID_SVXSTR_LINEEND)); if( pPool1 ) { @@ -2160,7 +2157,7 @@ bool XFillStyleItem::GetPresentation } if ( nId ) - rText = SVX_RESSTR( nId ); + rText = SvxResId( nId ); return true; } diff --git a/svx/source/xoutdev/xattr2.cxx b/svx/source/xoutdev/xattr2.cxx index d2460e16838e..f5116b0eef25 100644 --- a/svx/source/xoutdev/xattr2.cxx +++ b/svx/source/xoutdev/xattr2.cxx @@ -67,7 +67,7 @@ bool XLineTransparenceItem::GetPresentation switch ( ePres ) { case SfxItemPresentation::Complete: - rText = OUString( ResId( RID_SVXSTR_TRANSPARENCE, DIALOG_MGR() ) ) + ": "; + rText = OUString( SvxResId(RID_SVXSTR_TRANSPARENCE) ) + ": "; SAL_FALLTHROUGH; case SfxItemPresentation::Nameless: rText += unicode::formatPercent(GetValue(), @@ -146,7 +146,7 @@ bool XLineJointItem::GetPresentation( SfxItemPresentation /*ePres*/, MapUnit /*e } if( nId ) - rText = SVX_RESSTR( nId ); + rText = SvxResId( nId ); return true; } @@ -338,7 +338,7 @@ bool XLineCapItem::GetPresentation( SfxItemPresentation /*ePres*/, MapUnit /*eCo } if( nId ) - rText = SVX_RESSTR( nId ); + rText = SvxResId( nId ); return true; } @@ -425,7 +425,7 @@ bool XFillTransparenceItem::GetPresentation switch ( ePres ) { case SfxItemPresentation::Complete: - rText = OUString( ResId( RID_SVXSTR_TRANSPARENCE, DIALOG_MGR() ) ) + ": "; + rText = SvxResId(RID_SVXSTR_TRANSPARENCE) + ": "; SAL_FALLTHROUGH; case SfxItemPresentation::Nameless: rText += unicode::formatPercent(GetValue(), diff --git a/svx/source/xoutdev/xtabcolr.cxx b/svx/source/xoutdev/xtabcolr.cxx index 50a9d02e14ee..cb83d76a9dbe 100644 --- a/svx/source/xoutdev/xtabcolr.cxx +++ b/svx/source/xoutdev/xtabcolr.cxx @@ -65,9 +65,9 @@ bool XColorList::Create() sal_uInt32 b(0); // <!-- Gray palette from white to black --> - const OUString aStrGrey( SVX_RESSTR( RID_SVXSTR_COLOR_GREY ) ); + const OUString aStrGrey( SvxResId( RID_SVXSTR_COLOR_GREY ) ); - Insert( o3tl::make_unique<XColorEntry>( Color( 0xff, 0xff, 0xff ), SVX_RESSTR( RID_SVXSTR_COLOR_WHITE ) ) ); + Insert( o3tl::make_unique<XColorEntry>( Color( 0xff, 0xff, 0xff ), SvxResId( RID_SVXSTR_COLOR_WHITE ) ) ); Insert( o3tl::make_unique<XColorEntry>( Color( 0xee, 0xee, 0xee ), aStrGrey + " 1" ) ); Insert( o3tl::make_unique<XColorEntry>( Color( 0xdd, 0xdd, 0xdd ), aStrGrey + " 2" ) ); Insert( o3tl::make_unique<XColorEntry>( Color( 0xcc, 0xcc, 0xcc ), aStrGrey + " 3" ) ); @@ -78,24 +78,24 @@ bool XColorList::Create() Insert( o3tl::make_unique<XColorEntry>( Color( 0x33, 0x33, 0x33 ), aStrGrey + " 8" ) ); Insert( o3tl::make_unique<XColorEntry>( Color( 0x1c, 0x1c, 0x1c ), aStrGrey + " 9" ) ); Insert( o3tl::make_unique<XColorEntry>( Color( 0x11, 0x11, 0x11 ), aStrGrey + " 10") ); - Insert( o3tl::make_unique<XColorEntry>( Color( 0x00, 0x00, 0x00 ), SVX_RESSTR( RID_SVXSTR_COLOR_BLACK ) ) ); + Insert( o3tl::make_unique<XColorEntry>( Color( 0x00, 0x00, 0x00 ), SvxResId( RID_SVXSTR_COLOR_BLACK ) ) ); // <!-- Base colors step 0 to 10 --> const sal_uInt32 nNumColorsInGroup(12); const sal_uInt32 nNumGroups(11); const OUString aStrCol[nNumColorsInGroup] = { - SVX_RESSTR(RID_SVXSTR_COLOR_YELLOW), - SVX_RESSTR(RID_SVXSTR_COLOR_ORANGE), - SVX_RESSTR(RID_SVXSTR_COLOR_RED), - SVX_RESSTR(RID_SVXSTR_COLOR_PINK), - SVX_RESSTR(RID_SVXSTR_COLOR_MAGENTA), - SVX_RESSTR(RID_SVXSTR_COLOR_PURPLE), - SVX_RESSTR(RID_SVXSTR_COLOR_BLUE), - SVX_RESSTR(RID_SVXSTR_COLOR_SKYBLUE), - SVX_RESSTR(RID_SVXSTR_COLOR_CYAN), - SVX_RESSTR(RID_SVXSTR_COLOR_TURQUOISE), - SVX_RESSTR(RID_SVXSTR_COLOR_GREEN), - SVX_RESSTR(RID_SVXSTR_COLOR_YELLOWGREEN) }; + SvxResId(RID_SVXSTR_COLOR_YELLOW), + SvxResId(RID_SVXSTR_COLOR_ORANGE), + SvxResId(RID_SVXSTR_COLOR_RED), + SvxResId(RID_SVXSTR_COLOR_PINK), + SvxResId(RID_SVXSTR_COLOR_MAGENTA), + SvxResId(RID_SVXSTR_COLOR_PURPLE), + SvxResId(RID_SVXSTR_COLOR_BLUE), + SvxResId(RID_SVXSTR_COLOR_SKYBLUE), + SvxResId(RID_SVXSTR_COLOR_CYAN), + SvxResId(RID_SVXSTR_COLOR_TURQUOISE), + SvxResId(RID_SVXSTR_COLOR_GREEN), + SvxResId(RID_SVXSTR_COLOR_YELLOWGREEN) }; const sal_uInt32 aStdCol[nNumColorsInGroup * nNumGroups] = { 0xffff99, 0xff6600, 0xff3333, 0xff00cc, 0xff33ff, 0x9900ff, 0x6666ff, 0x00ccff, 0x66ffff, 0x33ff99, 0x99ff66, 0xccff00, 0xffff66, 0xffcc00, 0xff9999, 0xff66cc, 0xff99ff, 0xcc66ff, 0x9999ff, 0x9999ff, 0x99ffff, 0x66ff99, 0x99ff99, 0xccff66, @@ -123,20 +123,20 @@ bool XColorList::Create() } // <!-- use some 'nice' colors from original palette --> - Insert( o3tl::make_unique<XColorEntry>( Color( 0xe6, 0xe6, 0xff ), SVX_RESSTR( RID_SVXSTR_COLOR_BLUEGREY) ) ); - Insert( o3tl::make_unique<XColorEntry>( Color( 0xCF, 0xE7, 0xF5 ), SVX_RESSTR( RID_SVXSTR_COLOR_BLUE_CLASSIC ) ) ); + Insert( o3tl::make_unique<XColorEntry>( Color( 0xe6, 0xe6, 0xff ), SvxResId( RID_SVXSTR_COLOR_BLUEGREY) ) ); + Insert( o3tl::make_unique<XColorEntry>( Color( 0xCF, 0xE7, 0xF5 ), SvxResId( RID_SVXSTR_COLOR_BLUE_CLASSIC ) ) ); // <!-- add 'pale' colors from original palette --> - Insert( o3tl::make_unique<XColorEntry>( Color( 0x99, 0x99, 0xff ), SVX_RESSTR( RID_SVXSTR_COLOR_VIOLET ) ) ); - Insert( o3tl::make_unique<XColorEntry>( Color( 0x99, 0x33, 0x66 ), SVX_RESSTR( RID_SVXSTR_COLOR_BORDEAUX ) ) ); - Insert( o3tl::make_unique<XColorEntry>( Color( 0xff, 0xff, 0xcc ), SVX_RESSTR( RID_SVXSTR_COLOR_PALE_YELLOW ) ) ); - Insert( o3tl::make_unique<XColorEntry>( Color( 0xcc, 0xff, 0xff ), SVX_RESSTR( RID_SVXSTR_COLOR_PALE_GREEN ) ) ); - Insert( o3tl::make_unique<XColorEntry>( Color( 0x66, 0x00, 0x66 ), SVX_RESSTR( RID_SVXSTR_COLOR_DARKVIOLET ) ) ); - Insert( o3tl::make_unique<XColorEntry>( Color( 0xff, 0x80, 0x80 ), SVX_RESSTR( RID_SVXSTR_COLOR_SALMON ) ) ); - Insert( o3tl::make_unique<XColorEntry>( Color( 0x00, 0x66, 0xcc ), SVX_RESSTR( RID_SVXSTR_COLOR_SEABLUE ) ) ); + Insert( o3tl::make_unique<XColorEntry>( Color( 0x99, 0x99, 0xff ), SvxResId( RID_SVXSTR_COLOR_VIOLET ) ) ); + Insert( o3tl::make_unique<XColorEntry>( Color( 0x99, 0x33, 0x66 ), SvxResId( RID_SVXSTR_COLOR_BORDEAUX ) ) ); + Insert( o3tl::make_unique<XColorEntry>( Color( 0xff, 0xff, 0xcc ), SvxResId( RID_SVXSTR_COLOR_PALE_YELLOW ) ) ); + Insert( o3tl::make_unique<XColorEntry>( Color( 0xcc, 0xff, 0xff ), SvxResId( RID_SVXSTR_COLOR_PALE_GREEN ) ) ); + Insert( o3tl::make_unique<XColorEntry>( Color( 0x66, 0x00, 0x66 ), SvxResId( RID_SVXSTR_COLOR_DARKVIOLET ) ) ); + Insert( o3tl::make_unique<XColorEntry>( Color( 0xff, 0x80, 0x80 ), SvxResId( RID_SVXSTR_COLOR_SALMON ) ) ); + Insert( o3tl::make_unique<XColorEntry>( Color( 0x00, 0x66, 0xcc ), SvxResId( RID_SVXSTR_COLOR_SEABLUE ) ) ); // <!-- add Chart colors from original palette (also 12, coincidence?) --> - const OUString aStrChart( SVX_RESSTR( RID_SVXSTR_COLOR_CHART ) ); + const OUString aStrChart( SvxResId( RID_SVXSTR_COLOR_CHART ) ); Insert( o3tl::make_unique<XColorEntry>( Color( 0x00, 0x45, 0x86 ), aStrChart + " 1" ) ); Insert( o3tl::make_unique<XColorEntry>( Color( 0xff, 0x42, 0x0e ), aStrChart + " 2" ) ); Insert( o3tl::make_unique<XColorEntry>( Color( 0xff, 0xd3, 0x20 ), aStrChart + " 3" ) ); diff --git a/svx/source/xoutdev/xtabdash.cxx b/svx/source/xoutdev/xtabdash.cxx index d2d309b9bd70..19c7cce2b1e0 100644 --- a/svx/source/xoutdev/xtabdash.cxx +++ b/svx/source/xoutdev/xtabdash.cxx @@ -66,7 +66,7 @@ uno::Reference< container::XNameContainer > XDashList::createInstance() bool XDashList::Create() { - const OUString aStr(SVX_RESSTR(RID_SVXSTR_LINESTYLE)); + const OUString aStr(SvxResId(RID_SVXSTR_LINESTYLE)); Insert(o3tl::make_unique<XDashEntry>(XDash(css::drawing::DashStyle_RECT,1, 50,1, 50, 50),aStr + " 1")); Insert(o3tl::make_unique<XDashEntry>(XDash(css::drawing::DashStyle_RECT,1,500,1,500,500),aStr + " 2")); @@ -199,7 +199,7 @@ OUString const & XDashList::GetStringForUiSolidLine() const { if(maStringSolidLine.isEmpty()) { - const_cast< XDashList* >(this)->maStringSolidLine = ResId(RID_SVXSTR_SOLID, DIALOG_MGR()).toString(); + const_cast< XDashList* >(this)->maStringSolidLine = SvxResId(RID_SVXSTR_SOLID); } return maStringSolidLine; @@ -211,7 +211,7 @@ OUString const & XDashList::GetStringForUiNoLine() const { // formerly was RID_SVXSTR_INVISIBLE, but to make equal // everywhere, use RID_SVXSTR_NONE - const_cast< XDashList* >(this)->maStringNoLine = ResId(RID_SVXSTR_NONE, DIALOG_MGR()).toString(); + const_cast< XDashList* >(this)->maStringNoLine = SvxResId(RID_SVXSTR_NONE); } return maStringNoLine; diff --git a/svx/source/xoutdev/xtabgrdt.cxx b/svx/source/xoutdev/xtabgrdt.cxx index 4a21b58903e9..fc5518f4a3bc 100644 --- a/svx/source/xoutdev/xtabgrdt.cxx +++ b/svx/source/xoutdev/xtabgrdt.cxx @@ -65,7 +65,7 @@ uno::Reference< container::XNameContainer > XGradientList::createInstance() bool XGradientList::Create() { - rtl::OUStringBuffer aStr(SVX_RESSTR(RID_SVXSTR_GRADIENT)); + rtl::OUStringBuffer aStr(SvxResId(RID_SVXSTR_GRADIENT)); aStr.append(" 1"); sal_Int32 nLen = aStr.getLength() - 1; Insert(o3tl::make_unique<XGradientEntry>(XGradient(RGB_Color(COL_BLACK ),RGB_Color(COL_WHITE ),css::awt::GradientStyle_LINEAR , 0,10,10, 0,100,100),aStr.toString())); diff --git a/svx/source/xoutdev/xtabhtch.cxx b/svx/source/xoutdev/xtabhtch.cxx index 34438a4f1ea5..3979c8ce8ebb 100644 --- a/svx/source/xoutdev/xtabhtch.cxx +++ b/svx/source/xoutdev/xtabhtch.cxx @@ -63,7 +63,7 @@ uno::Reference< container::XNameContainer > XHatchList::createInstance() bool XHatchList::Create() { - OUStringBuffer aStr(SVX_RESSTR(RID_SVXSTR_HATCH)); + OUStringBuffer aStr(SvxResId(RID_SVXSTR_HATCH)); aStr.append(" 1"); sal_Int32 nLen = aStr.getLength() - 1; diff --git a/svx/source/xoutdev/xtablend.cxx b/svx/source/xoutdev/xtablend.cxx index ec94f1730bd1..f14cc81b565f 100644 --- a/svx/source/xoutdev/xtablend.cxx +++ b/svx/source/xoutdev/xtablend.cxx @@ -63,7 +63,7 @@ bool XLineEndList::Create() aTriangle.append(basegfx::B2DPoint(0.0, 30.0)); aTriangle.append(basegfx::B2DPoint(20.0, 30.0)); aTriangle.setClosed(true); - Insert( o3tl::make_unique<XLineEndEntry>( basegfx::B2DPolyPolygon(aTriangle), SVX_RESSTR( RID_SVXSTR_ARROW ) ) ); + Insert( o3tl::make_unique<XLineEndEntry>( basegfx::B2DPolyPolygon(aTriangle), SvxResId( RID_SVXSTR_ARROW ) ) ); basegfx::B2DPolygon aSquare; aSquare.append(basegfx::B2DPoint(0.0, 0.0)); @@ -71,10 +71,10 @@ bool XLineEndList::Create() aSquare.append(basegfx::B2DPoint(10.0, 10.0)); aSquare.append(basegfx::B2DPoint(0.0, 10.0)); aSquare.setClosed(true); - Insert( o3tl::make_unique<XLineEndEntry>( basegfx::B2DPolyPolygon(aSquare), SVX_RESSTR( RID_SVXSTR_SQUARE ) ) ); + Insert( o3tl::make_unique<XLineEndEntry>( basegfx::B2DPolyPolygon(aSquare), SvxResId( RID_SVXSTR_SQUARE ) ) ); basegfx::B2DPolygon aCircle(basegfx::tools::createPolygonFromCircle(basegfx::B2DPoint(0.0, 0.0), 100.0)); - Insert( o3tl::make_unique<XLineEndEntry>( basegfx::B2DPolyPolygon(aCircle), SVX_RESSTR( RID_SVXSTR_CIRCLE ) ) ); + Insert( o3tl::make_unique<XLineEndEntry>( basegfx::B2DPolyPolygon(aCircle), SvxResId( RID_SVXSTR_CIRCLE ) ) ); return true; } diff --git a/svx/source/xoutdev/xtabptrn.cxx b/svx/source/xoutdev/xtabptrn.cxx index f0c16f0e6909..12cb480e4f7c 100644 --- a/svx/source/xoutdev/xtabptrn.cxx +++ b/svx/source/xoutdev/xtabptrn.cxx @@ -47,7 +47,7 @@ uno::Reference< container::XNameContainer > XPatternList::createInstance() bool XPatternList::Create() { - OUStringBuffer aStr(SVX_RESSTR(RID_SVXSTR_PATTERN)); + OUStringBuffer aStr(SvxResId(RID_SVXSTR_PATTERN)); sal_uInt16 aArray[64]; Bitmap aBitmap; const sal_Int32 nLen(aStr.getLength() - 1); |