[Libreoffice-commits] core.git: svx/source
Gabor Kelemen
kelemeng at ubuntu.com
Thu Apr 26 09:30:25 UTC 2018
svx/source/engine3d/cube3d.cxx | 6 +--
svx/source/engine3d/extrud3d.cxx | 6 +--
svx/source/engine3d/lathe3d.cxx | 6 +--
svx/source/engine3d/obj3d.cxx | 6 +--
svx/source/engine3d/scene3d.cxx | 6 +--
svx/source/engine3d/sphere3d.cxx | 6 +--
svx/source/svdraw/ActionDescriptionProvider.cxx | 4 +-
svx/source/svdraw/svdattr.cxx | 34 +++++++++-----------
svx/source/svdraw/svddrgmt.cxx | 25 +++++++--------
svx/source/svdraw/svddrgv.cxx | 6 +--
svx/source/svdraw/svdedtv.cxx | 6 +--
svx/source/svdraw/svdedtv1.cxx | 20 ++++++------
svx/source/svdraw/svdedtv2.cxx | 40 ++++++++++++------------
svx/source/svdraw/svdedxv.cxx | 4 +-
svx/source/svdraw/svdglev.cxx | 22 ++++++-------
svx/source/svdraw/svdlayer.cxx | 4 +-
svx/source/svdraw/svdmark.cxx | 12 +++----
svx/source/svdraw/svdmodel.cxx | 6 +--
svx/source/svdraw/svdmrkv.cxx | 3 -
svx/source/svdraw/svdoashp.cxx | 6 +--
svx/source/svdraw/svdobj.cxx | 8 ++--
svx/source/svdraw/svdocapt.cxx | 6 +--
svx/source/svdraw/svdocirc.cxx | 6 +--
svx/source/svdraw/svdoedge.cxx | 6 +--
svx/source/svdraw/svdograf.cxx | 30 +++++++++---------
svx/source/svdraw/svdogrp.cxx | 10 +++---
svx/source/svdraw/svdomeas.cxx | 6 +--
svx/source/svdraw/svdomedia.cxx | 6 +--
svx/source/svdraw/svdoole2.cxx | 6 +--
svx/source/svdraw/svdopage.cxx | 6 +--
svx/source/svdraw/svdopath.cxx | 40 ++++++++++++------------
svx/source/svdraw/svdorect.cxx | 6 +--
svx/source/svdraw/svdotext.cxx | 18 +++++-----
svx/source/svdraw/svdouno.cxx | 6 +--
svx/source/svdraw/svdpoev.cxx | 16 ++++-----
svx/source/svdraw/svdundo.cxx | 16 ++++-----
svx/source/svdraw/svdview.cxx | 18 +++++-----
svx/source/svdraw/svdxcgv.cxx | 4 +-
svx/source/table/cellcursor.cxx | 6 +--
svx/source/table/svdotable.cxx | 6 +--
svx/source/table/tablecontroller.cxx | 26 +++++++--------
svx/source/table/tablemodel.cxx | 10 +++---
svx/source/unodraw/unopage.cxx | 4 +-
43 files changed, 245 insertions(+), 249 deletions(-)
New commits:
commit 73156a5073fea9e1df45aa67c6cb8efb02da1275
Author: Gabor Kelemen <kelemeng at ubuntu.com>
Date: Wed Apr 25 23:37:39 2018 +0200
Drop uses of ImpGetResStr l10n method from svx
This is a wrapper above SvxResId without added value
Change-Id: I1b0cdad3c01e741df1032d6a13aea74d66502144
Reviewed-on: https://gerrit.libreoffice.org/53489
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/svx/source/engine3d/cube3d.cxx b/svx/source/engine3d/cube3d.cxx
index 509688fe2f77..db33f75517da 100644
--- a/svx/source/engine3d/cube3d.cxx
+++ b/svx/source/engine3d/cube3d.cxx
@@ -19,7 +19,7 @@
#include <svx/strings.hrc>
-#include <svdglob.hxx>
+#include <svx/dialmgr.hxx>
#include <svx/cube3d.hxx>
#include <svx/globl3d.hxx>
#include <basegfx/point/b3dpoint.hxx>
@@ -129,7 +129,7 @@ void E3dCubeObj::SetPosIsCenter(bool bNew)
OUString E3dCubeObj::TakeObjNameSingul() const
{
- OUStringBuffer sName(ImpGetResStr(STR_ObjNameSingulCube3d));
+ OUStringBuffer sName(SvxResId(STR_ObjNameSingulCube3d));
OUString aName(GetName());
if (!aName.isEmpty())
@@ -146,7 +146,7 @@ OUString E3dCubeObj::TakeObjNameSingul() const
OUString E3dCubeObj::TakeObjNamePlural() const
{
- return ImpGetResStr(STR_ObjNamePluralCube3d);
+ return SvxResId(STR_ObjNamePluralCube3d);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/engine3d/extrud3d.cxx b/svx/source/engine3d/extrud3d.cxx
index 0a929970e50e..3292c7092365 100644
--- a/svx/source/engine3d/extrud3d.cxx
+++ b/svx/source/engine3d/extrud3d.cxx
@@ -19,7 +19,7 @@
#include <svx/strings.hrc>
-#include <svdglob.hxx>
+#include <svx/dialmgr.hxx>
#include <svx/svdpage.hxx>
#include <svx/globl3d.hxx>
#include <svx/extrud3d.hxx>
@@ -129,7 +129,7 @@ void E3dExtrudeObj::SetExtrudePolygon(const basegfx::B2DPolyPolygon &rNew)
OUString E3dExtrudeObj::TakeObjNameSingul() const
{
- OUStringBuffer sName(ImpGetResStr(STR_ObjNameSingulExtrude3d));
+ OUStringBuffer sName(SvxResId(STR_ObjNameSingulExtrude3d));
OUString aName(GetName());
if (!aName.isEmpty())
@@ -146,7 +146,7 @@ OUString E3dExtrudeObj::TakeObjNameSingul() const
OUString E3dExtrudeObj::TakeObjNamePlural() const
{
- return ImpGetResStr(STR_ObjNamePluralExtrude3d);
+ return SvxResId(STR_ObjNamePluralExtrude3d);
}
bool E3dExtrudeObj::IsBreakObjPossible()
diff --git a/svx/source/engine3d/lathe3d.cxx b/svx/source/engine3d/lathe3d.cxx
index 74097eb29f63..4e35be70ab0e 100644
--- a/svx/source/engine3d/lathe3d.cxx
+++ b/svx/source/engine3d/lathe3d.cxx
@@ -19,7 +19,7 @@
#include <svx/strings.hrc>
-#include <svdglob.hxx>
+#include <svx/dialmgr.hxx>
#include <tools/poly.hxx>
#include <svx/svdpage.hxx>
#include <svx/globl3d.hxx>
@@ -157,7 +157,7 @@ void E3dLatheObj::SetPolyPoly2D(const basegfx::B2DPolyPolygon& rNew)
OUString E3dLatheObj::TakeObjNameSingul() const
{
- OUStringBuffer sName(ImpGetResStr(STR_ObjNameSingulLathe3d));
+ OUStringBuffer sName(SvxResId(STR_ObjNameSingulLathe3d));
OUString aName(GetName());
if (!aName.isEmpty())
@@ -174,7 +174,7 @@ OUString E3dLatheObj::TakeObjNameSingul() const
OUString E3dLatheObj::TakeObjNamePlural() const
{
- return ImpGetResStr(STR_ObjNamePluralLathe3d);
+ return SvxResId(STR_ObjNamePluralLathe3d);
}
bool E3dLatheObj::IsBreakObjPossible()
diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx
index 93cad1bbe6c7..80055f7a54d9 100644
--- a/svx/source/engine3d/obj3d.cxx
+++ b/svx/source/engine3d/obj3d.cxx
@@ -20,7 +20,7 @@
#include <o3tl/numeric.hxx>
#include <svx/strings.hrc>
-#include <svdglob.hxx>
+#include <svx/dialmgr.hxx>
#include <svx/svdview.hxx>
#include <svx/svdattr.hxx>
#include <svx/svdpage.hxx>
@@ -401,7 +401,7 @@ basegfx::B3DPolyPolygon E3dObject::CreateWireframe() const
// Get the name of the object (singular)
OUString E3dObject::TakeObjNameSingul() const
{
- OUStringBuffer sName(ImpGetResStr(STR_ObjNameSingulObj3d));
+ OUStringBuffer sName(SvxResId(STR_ObjNameSingulObj3d));
OUString aName(GetName());
if (!aName.isEmpty())
@@ -417,7 +417,7 @@ OUString E3dObject::TakeObjNameSingul() const
// Get the name of the object (plural)
OUString E3dObject::TakeObjNamePlural() const
{
- return ImpGetResStr(STR_ObjNamePluralObj3d);
+ return SvxResId(STR_ObjNamePluralObj3d);
}
E3dObject* E3dObject::Clone(SdrModel* pTargetModel) const
diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx
index 2ff169357836..5992fbae38b6 100644
--- a/svx/source/engine3d/scene3d.cxx
+++ b/svx/source/engine3d/scene3d.cxx
@@ -19,7 +19,7 @@
#include <svx/strings.hrc>
-#include <svdglob.hxx>
+#include <svx/dialmgr.hxx>
#include <svx/svditer.hxx>
#include <stdlib.h>
@@ -555,7 +555,7 @@ void E3dScene::RotateScene (const Point& rRef, double sn, double cs)
OUString E3dScene::TakeObjNameSingul() const
{
- OUStringBuffer sName(ImpGetResStr(STR_ObjNameSingulScene3d));
+ OUStringBuffer sName(SvxResId(STR_ObjNameSingulScene3d));
OUString aName(GetName());
if (!aName.isEmpty())
@@ -570,7 +570,7 @@ OUString E3dScene::TakeObjNameSingul() const
OUString E3dScene::TakeObjNamePlural() const
{
- return ImpGetResStr(STR_ObjNamePluralScene3d);
+ return SvxResId(STR_ObjNamePluralScene3d);
}
// The NbcRotate routine overrides the one of the SdrObject. The idea is
diff --git a/svx/source/engine3d/sphere3d.cxx b/svx/source/engine3d/sphere3d.cxx
index 75670c2e28d7..af07d916ac4a 100644
--- a/svx/source/engine3d/sphere3d.cxx
+++ b/svx/source/engine3d/sphere3d.cxx
@@ -19,7 +19,7 @@
#include <svx/strings.hrc>
-#include <svdglob.hxx>
+#include <svx/dialmgr.hxx>
#include <svx/svdmodel.hxx>
#include <svx/svdpage.hxx>
#include <svx/globl3d.hxx>
@@ -128,7 +128,7 @@ void E3dSphereObj::SetSize(const basegfx::B3DVector& rNew)
OUString E3dSphereObj::TakeObjNameSingul() const
{
- OUStringBuffer sName(ImpGetResStr(STR_ObjNameSingulSphere3d));
+ OUStringBuffer sName(SvxResId(STR_ObjNameSingulSphere3d));
OUString aName(GetName());
if (!aName.isEmpty())
@@ -145,7 +145,7 @@ OUString E3dSphereObj::TakeObjNameSingul() const
OUString E3dSphereObj::TakeObjNamePlural() const
{
- return ImpGetResStr(STR_ObjNamePluralSphere3d);
+ return SvxResId(STR_ObjNamePluralSphere3d);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/ActionDescriptionProvider.cxx b/svx/source/svdraw/ActionDescriptionProvider.cxx
index 4c3c939143d7..b2e38ebd99d8 100644
--- a/svx/source/svdraw/ActionDescriptionProvider.cxx
+++ b/svx/source/svdraw/ActionDescriptionProvider.cxx
@@ -19,7 +19,7 @@
#include <svx/ActionDescriptionProvider.hxx>
-#include <svdglob.hxx>
+#include <svx/dialmgr.hxx>
#include <svx/strings.hrc>
OUString ActionDescriptionProvider::createDescription( ActionType eActionType
@@ -59,7 +59,7 @@ OUString ActionDescriptionProvider::createDescription( ActionType eActionType
if (!pResID)
return OUString();
- OUString aStr(ImpGetResStr(pResID));
+ OUString aStr(SvxResId(pResID));
return aStr.replaceAll("%1", rObjectName);
}
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index db74c787fba9..43bc7c26301f 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -46,9 +46,7 @@
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
-#include <svdglob.hxx>
#include <svx/strings.hrc>
-
#include <svx/dialmgr.hxx>
#include <svx/sdgcpitm.hxx>
#include <svx/sdtfchim.hxx>
@@ -694,8 +692,8 @@ SfxPoolItem* SdrOnOffItem::Clone(SfxItemPool* /*pPool*/) const
OUString SdrOnOffItem::GetValueTextByVal(bool bVal) const
{
if (bVal)
- return ImpGetResStr(STR_ItemValON);
- return ImpGetResStr(STR_ItemValOFF);
+ return SvxResId(STR_ItemValON);
+ return SvxResId(STR_ItemValOFF);
}
bool SdrOnOffItem::GetPresentation(SfxItemPresentation ePres,
@@ -720,8 +718,8 @@ SfxPoolItem* SdrYesNoItem::Clone(SfxItemPool* /*pPool*/) const
OUString SdrYesNoItem::GetValueTextByVal(bool bVal) const
{
if (bVal)
- return ImpGetResStr(STR_ItemValYES);
- return ImpGetResStr(STR_ItemValNO);
+ return SvxResId(STR_ItemValYES);
+ return SvxResId(STR_ItemValNO);
}
bool SdrYesNoItem::GetPresentation(SfxItemPresentation ePres,
@@ -896,7 +894,7 @@ OUString SdrCaptionTypeItem::GetValueTextByPos(sal_uInt16 nPos) const
STR_ItemValCAPTIONTYPE4
};
assert(nPos < SAL_N_ELEMENTS(ITEMVALCAPTIONTYPES) && "wrong pos!");
- return ImpGetResStr(ITEMVALCAPTIONTYPES[nPos]);
+ return SvxResId(ITEMVALCAPTIONTYPES[nPos]);
}
bool SdrCaptionTypeItem::GetPresentation(SfxItemPresentation ePres,
@@ -926,7 +924,7 @@ OUString SdrCaptionEscDirItem::GetValueTextByPos(sal_uInt16 nPos) const
STR_ItemValCAPTIONESCBESTFIT
};
assert(nPos < SAL_N_ELEMENTS(ITEMVALCAPTIONTYPES) && "wrong pos!");
- return ImpGetResStr(ITEMVALCAPTIONTYPES[nPos]);
+ return SvxResId(ITEMVALCAPTIONTYPES[nPos]);
}
bool SdrCaptionEscDirItem::GetPresentation(SfxItemPresentation ePres,
@@ -964,7 +962,7 @@ OUString SdrTextFitToSizeTypeItem::GetValueTextByPos(sal_uInt16 nPos) const
STR_ItemValFITTOSIZERESIZEAT
};
assert(nPos < SAL_N_ELEMENTS(ITEMVALFITTISIZETYPES) && "wrong pos!");
- return ImpGetResStr(ITEMVALFITTISIZETYPES[nPos]);
+ return SvxResId(ITEMVALFITTISIZETYPES[nPos]);
}
bool SdrTextFitToSizeTypeItem::GetPresentation(SfxItemPresentation ePres,
@@ -1030,7 +1028,7 @@ OUString SdrTextVertAdjustItem::GetValueTextByPos(sal_uInt16 nPos) const
STR_ItemValTEXTVADJSTRETCH
};
assert(nPos < SAL_N_ELEMENTS(ITEMVALTEXTVADJTYPES) && "wrong pos!");
- return ImpGetResStr(ITEMVALTEXTVADJTYPES[nPos]);
+ return SvxResId(ITEMVALTEXTVADJTYPES[nPos]);
}
bool SdrTextVertAdjustItem::GetPresentation(SfxItemPresentation ePres,
@@ -1092,7 +1090,7 @@ OUString SdrTextHorzAdjustItem::GetValueTextByPos(sal_uInt16 nPos) const
STR_ItemValTEXTHADJSTRETCH
};
assert(nPos < SAL_N_ELEMENTS(ITEMVALTEXTHADJTYPES) && "wrong pos!");
- return ImpGetResStr(ITEMVALTEXTHADJTYPES[nPos]);
+ return SvxResId(ITEMVALTEXTHADJTYPES[nPos]);
}
bool SdrTextHorzAdjustItem::GetPresentation(SfxItemPresentation ePres,
@@ -1147,7 +1145,7 @@ OUString SdrTextAniKindItem::GetValueTextByPos(sal_uInt16 nPos) const
STR_ItemValTEXTANI_SLIDE
};
assert(nPos < SAL_N_ELEMENTS(ITEMVALTEXTANITYPES) && "wrong pos!");
- return ImpGetResStr(ITEMVALTEXTANITYPES[nPos]);
+ return SvxResId(ITEMVALTEXTANITYPES[nPos]);
}
bool SdrTextAniKindItem::GetPresentation(SfxItemPresentation ePres,
@@ -1200,7 +1198,7 @@ OUString SdrTextAniDirectionItem::GetValueTextByPos(sal_uInt16 nPos) const
STR_ItemValTEXTANI_DOWN
};
assert(nPos < SAL_N_ELEMENTS(ITEMVALTEXTANITYPES) && "wrong pos!");
- return ImpGetResStr(ITEMVALTEXTANITYPES[nPos]);
+ return SvxResId(ITEMVALTEXTANITYPES[nPos]);
}
bool SdrTextAniDirectionItem::GetPresentation(SfxItemPresentation ePres,
@@ -1369,7 +1367,7 @@ OUString SdrEdgeKindItem::GetValueTextByPos(sal_uInt16 nPos) const
STR_ItemValEDGE_BEZIER
};
assert(nPos < SAL_N_ELEMENTS(ITEMVALEDGES) && "wrong pos!");
- return ImpGetResStr(ITEMVALEDGES[nPos]);
+ return SvxResId(ITEMVALEDGES[nPos]);
}
bool SdrEdgeKindItem::GetPresentation(SfxItemPresentation ePres,
@@ -1538,7 +1536,7 @@ OUString SdrMeasureKindItem::GetValueTextByPos(sal_uInt16 nPos) const
STR_ItemValMEASURE_RADIUS
};
assert(nPos < SAL_N_ELEMENTS(ITEMVALMEASURETYPES) && "wrong pos!");
- return ImpGetResStr(ITEMVALMEASURETYPES[nPos]);
+ return SvxResId(ITEMVALMEASURETYPES[nPos]);
}
bool SdrMeasureKindItem::GetPresentation(SfxItemPresentation ePres,
@@ -1591,7 +1589,7 @@ OUString SdrMeasureTextHPosItem::GetValueTextByPos(sal_uInt16 nPos) const
STR_ItemValMEASURE_TEXTRIGHTOUTSID
};
assert(nPos < SAL_N_ELEMENTS(ITEMVALMEASURETEXTTYPES) && "wrong pos!");
- return ImpGetResStr(ITEMVALMEASURETEXTTYPES[nPos]);
+ return SvxResId(ITEMVALMEASURETEXTTYPES[nPos]);
}
bool SdrMeasureTextHPosItem::GetPresentation(SfxItemPresentation ePres,
@@ -1645,7 +1643,7 @@ OUString SdrMeasureTextVPosItem::GetValueTextByPos(sal_uInt16 nPos) const
STR_ItemValMEASURETEXT_VERTICALCEN
};
assert(nPos < SAL_N_ELEMENTS(ITEMVALMEASURETEXTTYPES) && "wrong pos!");
- return ImpGetResStr(ITEMVALMEASURETEXTTYPES[nPos]);
+ return SvxResId(ITEMVALMEASURETEXTTYPES[nPos]);
}
bool SdrMeasureTextVPosItem::GetPresentation(SfxItemPresentation ePres,
@@ -1743,7 +1741,7 @@ OUString SdrCircKindItem::GetValueTextByPos(sal_uInt16 nPos) const
STR_ItemValCIRC_ARC
};
assert(nPos < SAL_N_ELEMENTS(ITEMVALCIRCTYPES) && "wrong pos!");
- return ImpGetResStr(ITEMVALCIRCTYPES[nPos]);
+ return SvxResId(ITEMVALCIRCTYPES[nPos]);
}
bool SdrCircKindItem::GetPresentation(SfxItemPresentation ePres,
diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx
index 7492063bd766..347724576bcb 100644
--- a/svx/source/svdraw/svddrgmt.cxx
+++ b/svx/source/svdraw/svddrgmt.cxx
@@ -32,7 +32,6 @@
#include <svx/svdmark.hxx>
#include <svx/svdocapt.hxx>
#include <svx/svdpagv.hxx>
-#include <svdglob.hxx>
#include <svx/svddrgv.hxx>
#include <svx/svdograf.hxx>
#include <svx/strings.hrc>
@@ -940,8 +939,8 @@ void SdrDragMovHdl::createSdrDragEntries()
void SdrDragMovHdl::TakeSdrDragComment(OUString& rStr) const
{
- rStr=ImpGetResStr(STR_DragMethMovHdl);
- if (getSdrDragView().IsDragWithCopy()) rStr+=ImpGetResStr(STR_EditWithCopy);
+ rStr=SvxResId(STR_DragMethMovHdl);
+ if (getSdrDragView().IsDragWithCopy()) rStr+=SvxResId(STR_EditWithCopy);
}
bool SdrDragMovHdl::BeginSdrDrag()
@@ -1493,7 +1492,7 @@ void SdrDragMove::TakeSdrDragComment(OUString& rStr) const
{
if(!getSdrDragView().IsInsObjPoint() && !getSdrDragView().IsInsGluePoint())
{
- rStr += ImpGetResStr(STR_EditWithCopy);
+ rStr += SvxResId(STR_EditWithCopy);
}
}
}
@@ -1774,7 +1773,7 @@ void SdrDragResize::TakeSdrDragComment(OUString& rStr) const
}
if(getSdrDragView().IsDragWithCopy())
- rStr += ImpGetResStr(STR_EditWithCopy);
+ rStr += SvxResId(STR_EditWithCopy);
}
bool SdrDragResize::BeginSdrDrag()
@@ -2081,7 +2080,7 @@ void SdrDragRotate::TakeSdrDragComment(OUString& rStr) const
rStr += SdrModel::GetAngleString(nTmpAngle) + ")";
if(getSdrDragView().IsDragWithCopy())
- rStr += ImpGetResStr(STR_EditWithCopy);
+ rStr += SvxResId(STR_EditWithCopy);
}
bool SdrDragRotate::BeginSdrDrag()
@@ -2222,7 +2221,7 @@ void SdrDragShear::TakeSdrDragComment(OUString& rStr) const
rStr += SdrModel::GetAngleString(nTmpAngle) + ")";
if(getSdrDragView().IsDragWithCopy())
- rStr += ImpGetResStr(STR_EditWithCopy);
+ rStr += SvxResId(STR_EditWithCopy);
}
bool SdrDragShear::BeginSdrDrag()
@@ -2428,7 +2427,7 @@ bool SdrDragShear::EndSdrDrag(bool bCopy)
ImpTakeDescriptionStr(STR_EditShear,aStr);
if (bCopy)
- aStr += ImpGetResStr(STR_EditWithCopy);
+ aStr += SvxResId(STR_EditWithCopy);
getSdrDragView().BegUndo(aStr);
}
@@ -2507,7 +2506,7 @@ void SdrDragMirror::TakeSdrDragComment(OUString& rStr) const
ImpTakeDescriptionStr(STR_DragMethMirrorFree,rStr);
if (getSdrDragView().IsDragWithCopy())
- rStr+=ImpGetResStr(STR_EditWithCopy);
+ rStr+=SvxResId(STR_EditWithCopy);
}
bool SdrDragMirror::BeginSdrDrag()
@@ -2797,7 +2796,7 @@ void SdrDragCrook::TakeSdrDragComment(OUString& rStr) const
}
if(getSdrDragView().IsDragWithCopy())
- rStr += ImpGetResStr(STR_EditWithCopy);
+ rStr += SvxResId(STR_EditWithCopy);
}
// These defines parametrize the created raster
@@ -3322,7 +3321,7 @@ bool SdrDragCrook::EndSdrDrag(bool bCopy)
ImpTakeDescriptionStr(!bContortion?STR_EditCrook:STR_EditCrookContortion,aStr);
if (bCopy)
- aStr += ImpGetResStr(STR_EditWithCopy);
+ aStr += SvxResId(STR_EditWithCopy);
getSdrDragView().BegUndo(aStr);
}
@@ -3408,7 +3407,7 @@ void SdrDragDistort::TakeSdrDragComment(OUString& rStr) const
+ ")";
if(getSdrDragView().IsDragWithCopy())
- rStr += ImpGetResStr(STR_EditWithCopy);
+ rStr += SvxResId(STR_EditWithCopy);
}
void SdrDragDistort::createSdrDragEntries()
@@ -3556,7 +3555,7 @@ void SdrDragCrop::TakeSdrDragComment(OUString& rStr) const
+ ")";
if(getSdrDragView().IsDragWithCopy())
- rStr += ImpGetResStr(STR_EditWithCopy);
+ rStr += SvxResId(STR_EditWithCopy);
}
bool SdrDragCrop::BeginSdrDrag()
diff --git a/svx/source/svdraw/svddrgv.cxx b/svx/source/svdraw/svddrgv.cxx
index 5d18d6840d27..73ff381b877c 100644
--- a/svx/source/svdraw/svddrgv.cxx
+++ b/svx/source/svdraw/svddrgv.cxx
@@ -30,7 +30,7 @@
#include <svx/svdopath.hxx>
#include <svx/svdoedge.hxx>
#include <svx/strings.hrc>
-#include <svdglob.hxx>
+#include <svx/dialmgr.hxx>
#include "svddrgm1.hxx"
#include <svx/obj3d.hxx>
#include <svx/svdoashp.hxx>
@@ -633,7 +633,7 @@ bool SdrDragView::ImpBegInsObjPoint(bool bIdxZwang, const Point& rPnt, bool bNew
mpInsPointUndo = dynamic_cast< SdrUndoGeoObj* >( GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*mpMarkedObj) );
DBG_ASSERT( mpInsPointUndo, "svx::SdrDragView::BegInsObjPoint(), could not create correct undo object!" );
- OUString aStr(ImpGetResStr(STR_DragInsertPoint));
+ OUString aStr(SvxResId(STR_DragInsertPoint));
maInsPointUndoStr = aStr.replaceFirst("%1", mpMarkedObj->TakeObjNameSingul() );
@@ -730,7 +730,7 @@ bool SdrDragView::BegInsGluePoint(const Point& rPnt)
UnmarkAllGluePoints();
mpInsPointUndo= dynamic_cast< SdrUndoGeoObj* >( GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pObj) );
DBG_ASSERT( mpInsPointUndo, "svx::SdrDragView::BegInsObjPoint(), could not create correct undo object!" );
- OUString aStr(ImpGetResStr(STR_DragInsertGluePoint));
+ OUString aStr(SvxResId(STR_DragInsertGluePoint));
maInsPointUndoStr = aStr.replaceFirst("%1", pObj->TakeObjNameSingul() );
diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx
index f22c780640d0..f19c01479069 100644
--- a/svx/source/svdraw/svdedtv.cxx
+++ b/svx/source/svdraw/svdedtv.cxx
@@ -30,7 +30,7 @@
#include <svx/svdpage.hxx>
#include <svx/svdpoev.hxx>
#include <svx/strings.hrc>
-#include <svdglob.hxx>
+#include <svx/dialmgr.hxx>
#include <svx/e3dsceneupdater.hxx>
#include <rtl/strbuf.hxx>
#include <svx/svdview.hxx>
@@ -201,7 +201,7 @@ void SdrEditView::DeleteLayer(const OUString& rName)
const bool bUndo = IsUndoEnabled();
if( bUndo )
- BegUndo(ImpGetResStr(STR_UndoDelLayer));
+ BegUndo(SvxResId(STR_UndoDelLayer));
bool bMaPg(true);
@@ -772,7 +772,7 @@ void SdrEditView::DeleteMarkedObj()
// moved breaking action and undo start outside loop
BrkAction();
- BegUndo(ImpGetResStr(STR_EditDelete),GetDescriptionOfMarkedObjects(),SdrRepeatFunc::Delete);
+ BegUndo(SvxResId(STR_EditDelete),GetDescriptionOfMarkedObjects(),SdrRepeatFunc::Delete);
std::vector<SdrObject*> lazyDeleteObjects;
// remove as long as something is selected. This allows to schedule objects for
diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx
index 8297cd96d3d0..cffae4f8bed4 100644
--- a/svx/source/svdraw/svdedtv1.cxx
+++ b/svx/source/svdraw/svdedtv1.cxx
@@ -30,7 +30,7 @@
#include <vcl/weld.hxx>
#include <getallcharpropids.hxx>
-#include <svdglob.hxx>
+#include <svx/dialmgr.hxx>
#include <svx/svditer.hxx>
#include <svx/strings.hrc>
@@ -177,9 +177,9 @@ void SdrEditView::MoveMarkedObj(const Size& rSiz, bool bCopy)
if( bUndo )
{
- OUString aStr(ImpGetResStr(STR_EditMove));
+ OUString aStr(SvxResId(STR_EditMove));
if (bCopy)
- aStr += ImpGetResStr(STR_EditWithCopy);
+ aStr += SvxResId(STR_EditWithCopy);
// needs its own UndoGroup because of its parameters
BegUndo(aStr,GetDescriptionOfMarkedObjects(),SdrRepeatFunc::Move);
}
@@ -212,7 +212,7 @@ void SdrEditView::ResizeMarkedObj(const Point& rRef, const Fraction& xFact, cons
{
OUString aStr {ImpGetDescriptionString(STR_EditResize)};
if (bCopy)
- aStr+=ImpGetResStr(STR_EditWithCopy);
+ aStr+=SvxResId(STR_EditWithCopy);
BegUndo(aStr);
}
@@ -307,7 +307,7 @@ void SdrEditView::RotateMarkedObj(const Point& rRef, long nAngle, bool bCopy)
if( bUndo )
{
OUString aStr {ImpGetDescriptionString(STR_EditRotate)};
- if (bCopy) aStr+=ImpGetResStr(STR_EditWithCopy);
+ if (bCopy) aStr+=SvxResId(STR_EditWithCopy);
BegUndo(aStr);
}
@@ -373,7 +373,7 @@ void SdrEditView::MirrorMarkedObj(const Point& rRef1, const Point& rRef2, bool b
aStr = ImpGetDescriptionString(STR_EditMirrorDiag);
else
aStr = ImpGetDescriptionString(STR_EditMirrorFree);
- if (bCopy) aStr+=ImpGetResStr(STR_EditWithCopy);
+ if (bCopy) aStr+=SvxResId(STR_EditWithCopy);
BegUndo(aStr);
}
@@ -465,7 +465,7 @@ void SdrEditView::ShearMarkedObj(const Point& rRef, long nAngle, bool bVShear, b
{
OUString aStr {ImpGetDescriptionString(STR_EditShear)};
if (bCopy)
- aStr+=ImpGetResStr(STR_EditWithCopy);
+ aStr+=SvxResId(STR_EditWithCopy);
BegUndo(aStr);
}
@@ -581,7 +581,7 @@ void SdrEditView::CrookMarkedObj(const Point& rRef, const Point& rRad, SdrCrookM
{
OUString aStr {ImpGetDescriptionString(bNoContortion ? STR_EditCrook : STR_EditCrookContortion)};
if (bCopy)
- aStr+=ImpGetResStr(STR_EditWithCopy);
+ aStr+=SvxResId(STR_EditWithCopy);
BegUndo(aStr);
}
@@ -654,7 +654,7 @@ void SdrEditView::DistortMarkedObj(const tools::Rectangle& rRef, const XPolygon&
{
OUString aStr {ImpGetDescriptionString(STR_EditDistort)};
if (bCopy)
- aStr+=ImpGetResStr(STR_EditWithCopy);
+ aStr+=SvxResId(STR_EditWithCopy);
BegUndo(aStr);
}
@@ -1578,7 +1578,7 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr)
ForcePossibilities();
- BegUndo(ImpGetResStr(STR_EditTransform),GetDescriptionOfMarkedObjects());
+ BegUndo(SvxResId(STR_EditTransform),GetDescriptionOfMarkedObjects());
if (bSetAttr) {
SetAttrToMarked(aSetAttr,false);
diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx
index a3ef121d777c..551079c0ce0b 100644
--- a/svx/source/svdraw/svdedtv2.cxx
+++ b/svx/source/svdraw/svdedtv2.cxx
@@ -28,7 +28,7 @@
#include <svx/svditer.hxx>
#include <svx/svdograf.hxx>
#include <svx/svdoole2.hxx>
-#include <svdglob.hxx>
+#include <svx/dialmgr.hxx>
#include "svdfmtf.hxx"
#include <svx/svdetc.hxx>
#include <sfx2/basedlgs.hxx>
@@ -67,7 +67,7 @@ void SdrEditView::MovMarkedToTop()
const bool bUndo = IsUndoEnabled();
if( bUndo )
- BegUndo(ImpGetResStr(STR_EditMovToTop),GetDescriptionOfMarkedObjects(),SdrRepeatFunc::MoveToTop);
+ BegUndo(SvxResId(STR_EditMovToTop),GetDescriptionOfMarkedObjects(),SdrRepeatFunc::MoveToTop);
SortMarkedObjects();
for (size_t nm=0; nm<nCount; ++nm)
@@ -154,7 +154,7 @@ void SdrEditView::MovMarkedToBtm()
const bool bUndo = IsUndoEnabled();
if( bUndo )
- BegUndo(ImpGetResStr(STR_EditMovToBtm),GetDescriptionOfMarkedObjects(),SdrRepeatFunc::MoveToBottom);
+ BegUndo(SvxResId(STR_EditMovToBtm),GetDescriptionOfMarkedObjects(),SdrRepeatFunc::MoveToBottom);
SortMarkedObjects();
for (size_t nm=0; nm<nCount; ++nm)
@@ -249,7 +249,7 @@ void SdrEditView::PutMarkedInFrontOfObj(const SdrObject* pRefObj)
const bool bUndo = IsUndoEnabled();
if( bUndo )
- BegUndo(ImpGetResStr(STR_EditPutToTop),GetDescriptionOfMarkedObjects(),SdrRepeatFunc::PutToTop);
+ BegUndo(SvxResId(STR_EditPutToTop),GetDescriptionOfMarkedObjects(),SdrRepeatFunc::PutToTop);
SortMarkedObjects();
@@ -351,7 +351,7 @@ void SdrEditView::PutMarkedBehindObj(const SdrObject* pRefObj)
const bool bUndo = IsUndoEnabled();
if( bUndo )
- BegUndo(ImpGetResStr(STR_EditPutToBtm),GetDescriptionOfMarkedObjects(),SdrRepeatFunc::PutToBottom);
+ BegUndo(SvxResId(STR_EditPutToBtm),GetDescriptionOfMarkedObjects(),SdrRepeatFunc::PutToBottom);
SortMarkedObjects();
if (pRefObj!=nullptr)
@@ -432,7 +432,7 @@ void SdrEditView::ReverseOrderOfMarked()
bool bUndo = IsUndoEnabled();
if( bUndo )
- BegUndo(ImpGetResStr(STR_EditRevOrder),GetDescriptionOfMarkedObjects(),SdrRepeatFunc::ReverseOrder);
+ BegUndo(SvxResId(STR_EditRevOrder),GetDescriptionOfMarkedObjects(),SdrRepeatFunc::ReverseOrder);
size_t a=0;
do {
@@ -977,7 +977,7 @@ void SdrEditView::DistributeMarkedObjects()
}
// UNDO-Comment and end of UNDO
- mpModel->SetUndoComment(ImpGetResStr(STR_DistributeMarkedObjects));
+ mpModel->SetUndoComment(SvxResId(STR_DistributeMarkedObjects));
if( bUndo )
EndUndo();
@@ -1146,21 +1146,21 @@ void SdrEditView::MergeMarkedObjects(SdrMergeMode eMode)
case SdrMergeMode::Merge:
{
SetUndoComment(
- ImpGetResStr(STR_EditMergeMergePoly),
+ SvxResId(STR_EditMergeMergePoly),
aRemove.GetMarkDescription());
break;
}
case SdrMergeMode::Subtract:
{
SetUndoComment(
- ImpGetResStr(STR_EditMergeSubstractPoly),
+ SvxResId(STR_EditMergeSubstractPoly),
aRemove.GetMarkDescription());
break;
}
case SdrMergeMode::Intersect:
{
SetUndoComment(
- ImpGetResStr(STR_EditMergeIntersectPoly),
+ SvxResId(STR_EditMergeIntersectPoly),
aRemove.GetMarkDescription());
break;
}
@@ -1218,7 +1218,7 @@ void SdrEditView::EqualizeMarkedObjects(bool bWidth)
}
SetUndoComment(
- ImpGetResStr(bWidth ? STR_EqualizeWidthMarkedObjects : STR_EqualizeHeightMarkedObjects),
+ SvxResId(bWidth ? STR_EqualizeWidthMarkedObjects : STR_EqualizeHeightMarkedObjects),
rMarkList.GetMarkDescription());
if (bUndo)
@@ -1387,7 +1387,7 @@ void SdrEditView::CombineMarkedObjects(bool bNoPolyPoly)
// build an UndoComment from the objects actually used
aRemoveMerker.ForceSort(); // important for remove (see below)
if( bUndo )
- SetUndoComment(ImpGetResStr(bNoPolyPoly?STR_EditCombine_OnePoly:STR_EditCombine_PolyPoly),aRemoveMerker.GetMarkDescription());
+ SetUndoComment(SvxResId(bNoPolyPoly?STR_EditCombine_OnePoly:STR_EditCombine_PolyPoly),aRemoveMerker.GetMarkDescription());
// remove objects actually used from the list
DeleteMarkedList(aRemoveMerker);
@@ -1705,7 +1705,7 @@ void SdrEditView::DismantleMarkedObjects(bool bMakeLines)
if( bUndo )
{
// construct UndoComment from objects actually used
- SetUndoComment(ImpGetResStr(bMakeLines?STR_EditDismantle_Lines:STR_EditDismantle_Polys),aRemoveMerker.GetMarkDescription());
+ SetUndoComment(SvxResId(bMakeLines?STR_EditDismantle_Lines:STR_EditDismantle_Polys),aRemoveMerker.GetMarkDescription());
// remove objects actually used from the list
EndUndo();
}
@@ -1724,7 +1724,7 @@ void SdrEditView::GroupMarked()
const bool bUndo = IsUndoEnabled();
if( bUndo )
{
- BegUndo(ImpGetResStr(STR_EditGroup),GetDescriptionOfMarkedObjects(),SdrRepeatFunc::Group);
+ BegUndo(SvxResId(STR_EditGroup),GetDescriptionOfMarkedObjects(),SdrRepeatFunc::Group);
for(size_t nm = GetMarkedObjectCount(); nm>0; )
{
@@ -1896,8 +1896,8 @@ void SdrEditView::UnGroupMarked()
if (nCount!=0)
{
if (!bNameOk)
- aName=ImpGetResStr(STR_ObjNamePluralGRUP); // Use the term "Group Objects," if different objects are grouped.
- SetUndoComment(ImpGetResStr(STR_EditUngroup),aName);
+ aName=SvxResId(STR_ObjNamePluralGRUP); // Use the term "Group Objects," if different objects are grouped.
+ SetUndoComment(SvxResId(STR_EditUngroup),aName);
}
if( bUndo )
@@ -1949,18 +1949,18 @@ void SdrEditView::ImpConvertTo(bool bPath, bool bLineToArea)
else
pDscrID = STR_EditConvToContours;
- BegUndo(ImpGetResStr(pDscrID), GetDescriptionOfMarkedObjects());
+ BegUndo(SvxResId(pDscrID), GetDescriptionOfMarkedObjects());
}
else
{
if (bPath) {
if (nMarkCount==1) pDscrID=STR_EditConvToCurve;
else pDscrID=STR_EditConvToCurves;
- BegUndo(ImpGetResStr(pDscrID),GetDescriptionOfMarkedObjects(),SdrRepeatFunc::ConvertToPath);
+ BegUndo(SvxResId(pDscrID),GetDescriptionOfMarkedObjects(),SdrRepeatFunc::ConvertToPath);
} else {
if (nMarkCount==1) pDscrID=STR_EditConvToPoly;
else pDscrID=STR_EditConvToPolys;
- BegUndo(ImpGetResStr(pDscrID),GetDescriptionOfMarkedObjects(),SdrRepeatFunc::ConvertToPoly);
+ BegUndo(SvxResId(pDscrID),GetDescriptionOfMarkedObjects(),SdrRepeatFunc::ConvertToPoly);
}
}
for (size_t nm=nMarkCount; nm>0;) {
@@ -2127,7 +2127,7 @@ void SdrEditView::DoImportMarkedMtf(SvdProgressInfo *pProgrInfo)
if( bUndo )
{
- SetUndoComment(ImpGetResStr(STR_EditImportMtf),aForTheDescription.GetMarkDescription());
+ SetUndoComment(SvxResId(STR_EditImportMtf),aForTheDescription.GetMarkDescription());
EndUndo();
}
}
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 6cbc0eb14f8d..21e1f10d43f7 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -48,7 +48,7 @@
#endif
#include <svx/svddrgv.hxx>
#include <svx/strings.hrc>
-#include <svdglob.hxx>
+#include <svx/dialmgr.hxx>
#include <svx/globl3d.hxx>
#include <svx/textchain.hxx>
#include <svx/textchaincursor.hxx>
@@ -1462,7 +1462,7 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(bool bDontDeleteReally)
if( bUndo )
{
OUString aObjName(pTEObj->TakeObjNameSingul());
- BegUndo(ImpGetResStr(STR_UndoObjSetText),aObjName);
+ BegUndo(SvxResId(STR_UndoObjSetText),aObjName);
}
pTEObj->EndTextEdit(*pTEOutliner);
diff --git a/svx/source/svdraw/svdglev.cxx b/svx/source/svdraw/svdglev.cxx
index 3bbd461923fd..c3badca8c0c6 100644
--- a/svx/source/svdraw/svdglev.cxx
+++ b/svx/source/svdraw/svdglev.cxx
@@ -23,7 +23,7 @@
#include <svx/svdundo.hxx>
#include <svx/strings.hrc>
-#include <svdglob.hxx>
+#include <svx/dialmgr.hxx>
#include <svx/svdpagv.hxx>
#include <svx/svdglue.hxx>
#include <svx/svdtrans.hxx>
@@ -120,7 +120,7 @@ static void ImpSetEscDir(SdrGluePoint& rGP, const SdrObject* /*pObj*/, const voi
void SdrGlueEditView::SetMarkedGluePointsEscDir(SdrEscapeDirection nThisEsc, bool bOn)
{
ForceUndirtyMrkPnt();
- BegUndo(ImpGetResStr(STR_EditSetGlueEscDir),GetDescriptionOfMarkedGluePoints());
+ BegUndo(SvxResId(STR_EditSetGlueEscDir),GetDescriptionOfMarkedGluePoints());
ImpDoMarkedGluePoints(ImpSetEscDir,false,&nThisEsc,&bOn);
EndUndo();
}
@@ -160,7 +160,7 @@ static void ImpSetPercent(SdrGluePoint& rGP, const SdrObject* pObj, const void*
void SdrGlueEditView::SetMarkedGluePointsPercent(bool bOn)
{
ForceUndirtyMrkPnt();
- BegUndo(ImpGetResStr(STR_EditSetGluePercent),GetDescriptionOfMarkedGluePoints());
+ BegUndo(SvxResId(STR_EditSetGluePercent),GetDescriptionOfMarkedGluePoints());
ImpDoMarkedGluePoints(ImpSetPercent,false,&bOn);
EndUndo();
}
@@ -215,7 +215,7 @@ static void ImpSetAlign(SdrGluePoint& rGP, const SdrObject* pObj, const void* pb
void SdrGlueEditView::SetMarkedGluePointsAlign(bool bVert, SdrAlign nAlign)
{
ForceUndirtyMrkPnt();
- BegUndo(ImpGetResStr(STR_EditSetGlueAlign),GetDescriptionOfMarkedGluePoints());
+ BegUndo(SvxResId(STR_EditSetGlueAlign),GetDescriptionOfMarkedGluePoints());
ImpDoMarkedGluePoints(ImpSetAlign,false,&bVert,&nAlign);
EndUndo();
}
@@ -226,7 +226,7 @@ void SdrGlueEditView::DeleteMarkedGluePoints()
ForceUndirtyMrkPnt();
const bool bUndo = IsUndoEnabled();
if( bUndo )
- BegUndo(ImpGetResStr(STR_EditDelete),GetDescriptionOfMarkedGluePoints(),SdrRepeatFunc::Delete);
+ BegUndo(SvxResId(STR_EditDelete),GetDescriptionOfMarkedGluePoints(),SdrRepeatFunc::Delete);
const size_t nMarkCount=GetMarkedObjectCount();
for (size_t nm=0; nm<nMarkCount; ++nm)
@@ -354,8 +354,8 @@ static void ImpMove(Point& rPt, const void* p1, const void* /*p2*/, const void*
void SdrGlueEditView::MoveMarkedGluePoints(const Size& rSiz, bool bCopy)
{
ForceUndirtyMrkPnt();
- OUString aStr(ImpGetResStr(STR_EditMove));
- if (bCopy) aStr += ImpGetResStr(STR_EditWithCopy);
+ OUString aStr(SvxResId(STR_EditMove));
+ if (bCopy) aStr += SvxResId(STR_EditWithCopy);
BegUndo(aStr,GetDescriptionOfMarkedGluePoints(),SdrRepeatFunc::Move);
if (bCopy) ImpCopyMarkedGluePoints();
ImpTransformMarkedGluePoints(ImpMove,&rSiz);
@@ -372,8 +372,8 @@ static void ImpResize(Point& rPt, const void* p1, const void* p2, const void* p3
void SdrGlueEditView::ResizeMarkedGluePoints(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bCopy)
{
ForceUndirtyMrkPnt();
- OUString aStr(ImpGetResStr(STR_EditResize));
- if (bCopy) aStr+=ImpGetResStr(STR_EditWithCopy);
+ OUString aStr(SvxResId(STR_EditResize));
+ if (bCopy) aStr+=SvxResId(STR_EditWithCopy);
BegUndo(aStr,GetDescriptionOfMarkedGluePoints(),SdrRepeatFunc::Resize);
if (bCopy) ImpCopyMarkedGluePoints();
ImpTransformMarkedGluePoints(ImpResize,&rRef,&xFact,&yFact);
@@ -390,8 +390,8 @@ static void ImpRotate(Point& rPt, const void* p1, const void* /*p2*/, const void
void SdrGlueEditView::RotateMarkedGluePoints(const Point& rRef, long nAngle, bool bCopy)
{
ForceUndirtyMrkPnt();
- OUString aStr(ImpGetResStr(STR_EditRotate));
- if (bCopy) aStr+=ImpGetResStr(STR_EditWithCopy);
+ OUString aStr(SvxResId(STR_EditRotate));
+ if (bCopy) aStr+=SvxResId(STR_EditWithCopy);
BegUndo(aStr,GetDescriptionOfMarkedGluePoints(),SdrRepeatFunc::Rotate);
if (bCopy) ImpCopyMarkedGluePoints();
double nSin=sin(nAngle*nPi180);
diff --git a/svx/source/svdraw/svdlayer.cxx b/svx/source/svdraw/svdlayer.cxx
index 72cba8e5d3fa..ff497d3d6104 100644
--- a/svx/source/svdraw/svdlayer.cxx
+++ b/svx/source/svdraw/svdlayer.cxx
@@ -21,7 +21,7 @@
#include <svx/svdlayer.hxx>
#include <svx/svdmodel.hxx>
-#include <svdglob.hxx>
+#include <svx/dialmgr.hxx>
#include <svx/strings.hrc>
bool SdrLayerIDSet::IsEmpty() const
@@ -100,7 +100,7 @@ SdrLayer::SdrLayer(SdrLayerID nNewID, const OUString& rNewName) :
void SdrLayer::SetStandardLayer()
{
nType=sal_uInt16(true);
- maName = ImpGetResStr(STR_StandardLayerName);
+ maName = SvxResId(STR_StandardLayerName);
if (pModel!=nullptr) {
SdrHint aHint(SdrHintKind::LayerChange);
pModel->Broadcast(aHint);
diff --git a/svx/source/svdraw/svdmark.cxx b/svx/source/svdraw/svdmark.cxx
index c1bcf353d536..da4f03051999 100644
--- a/svx/source/svdraw/svdmark.cxx
+++ b/svx/source/svdraw/svdmark.cxx
@@ -30,7 +30,7 @@
#include <svx/svdogrp.hxx>
#include <svx/svdorect.hxx>
#include <svx/strings.hrc>
-#include <svdglob.hxx>
+#include <svx/dialmgr.hxx>
#include <svx/obj3d.hxx>
@@ -458,7 +458,7 @@ const OUString& SdrMarkList::GetMarkDescription() const
if(!nCount)
{
- const_cast<SdrMarkList*>(this)->maMarkName = ImpGetResStr(STR_ObjNameNoObj);
+ const_cast<SdrMarkList*>(this)->maMarkName = SvxResId(STR_ObjNameNoObj);
}
else if(1 == nCount)
{
@@ -483,7 +483,7 @@ const OUString& SdrMarkList::GetMarkDescription() const
if(!bEq)
{
- aNam = ImpGetResStr(STR_ObjNamePlural);
+ aNam = SvxResId(STR_ObjNamePlural);
}
}
@@ -581,7 +581,7 @@ const OUString& SdrMarkList::GetPointMarkDescription(bool bGlue) const
if(!bEq)
{
- aNam = ImpGetResStr(STR_ObjNamePlural);
+ aNam = SvxResId(STR_ObjNamePlural);
}
aNam = OUString::number( nMarkPtObjCnt ) + " " + aNam;
@@ -591,11 +591,11 @@ const OUString& SdrMarkList::GetPointMarkDescription(bool bGlue) const
if(1 == nMarkPtCnt)
{
- aStr1 = ImpGetResStr(bGlue ? STR_ViewMarkedGluePoint : STR_ViewMarkedPoint);
+ aStr1 = SvxResId(bGlue ? STR_ViewMarkedGluePoint : STR_ViewMarkedPoint);
}
else
{
- aStr1 = ImpGetResStr(bGlue ? STR_ViewMarkedGluePoints : STR_ViewMarkedPoints);
+ aStr1 = SvxResId(bGlue ? STR_ViewMarkedGluePoints : STR_ViewMarkedPoints);
aStr1 = aStr1.replaceFirst("%2", OUString::number( nMarkPtCnt ));
}
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index 531a1a4cc98e..ccb3e52d3416 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -61,7 +61,7 @@
#include <svx/svdetc.hxx>
#include <svx/svdoutl.hxx>
#include <svx/svdoole2.hxx>
-#include <svdglob.hxx>
+#include <svx/dialmgr.hxx>
#include <svx/strings.hrc>
#include <svdoutlinercache.hxx>
@@ -1439,7 +1439,7 @@ void SdrModel::CopyPages(sal_uInt16 nFirstPageNum, sal_uInt16 nLastPageNum,
bUndo = false;
if( bUndo )
- BegUndo(ImpGetResStr(STR_UndoMergeModel));
+ BegUndo(SvxResId(STR_UndoMergeModel));
sal_uInt16 nPageCnt=GetPageCount();
sal_uInt16 nMaxPage=nPageCnt;
@@ -1527,7 +1527,7 @@ void SdrModel::Merge(SdrModel& rSourceModel,
bUndo = false;
if (bUndo)
- BegUndo(ImpGetResStr(STR_UndoMergeModel));
+ BegUndo(SvxResId(STR_UndoMergeModel));
sal_uInt16 nSrcPageCnt=rSourceModel.GetPageCount();
sal_uInt16 nSrcMasterPageCnt=rSourceModel.GetMasterPageCount();
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index 0bf87a21f6e7..f8ad13562968 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -21,7 +21,6 @@
#include <svx/svdmrkv.hxx>
#include <svx/svdetc.hxx>
#include <svx/svdoedge.hxx>
-#include <svdglob.hxx>
#include <svx/svdview.hxx>
#include <svx/svdpagv.hxx>
#include <svx/svdpage.hxx>
@@ -2079,7 +2078,7 @@ const tools::Rectangle& SdrMarkView::GetMarkedObjRect() const
OUString SdrMarkView::ImpGetDescriptionString(const char* pStrCacheID, ImpGetDescriptionOptions nOpt) const
{
- OUString sStr = ImpGetResStr(pStrCacheID);
+ OUString sStr = SvxResId(pStrCacheID);
const sal_Int32 nPos = sStr.indexOf("%1");
if(nPos != -1)
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 783c5e9b5b58..26a947a830cb 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -46,7 +46,7 @@
#include <svx/svdtrans.hxx>
#include <svx/svdetc.hxx>
#include <svx/svdoedge.hxx>
-#include <svdglob.hxx>
+#include <svx/dialmgr.hxx>
#include <svx/strings.hrc>
#include <editeng/eeitem.hxx>
#include <editeng/editstat.hxx>
@@ -2757,7 +2757,7 @@ SdrObjCustomShape& SdrObjCustomShape::operator=(const SdrObjCustomShape& rObj)
OUString SdrObjCustomShape::TakeObjNameSingul() const
{
- OUStringBuffer sName(ImpGetResStr(STR_ObjNameSingulCUSTOMSHAPE));
+ OUStringBuffer sName(SvxResId(STR_ObjNameSingulCUSTOMSHAPE));
OUString aNm(GetName());
if (!aNm.isEmpty())
{
@@ -2771,7 +2771,7 @@ OUString SdrObjCustomShape::TakeObjNameSingul() const
OUString SdrObjCustomShape::TakeObjNamePlural() const
{
- return ImpGetResStr(STR_ObjNamePluralCUSTOMSHAPE);
+ return SvxResId(STR_ObjNamePluralCUSTOMSHAPE);
}
basegfx::B2DPolyPolygon SdrObjCustomShape::TakeXorPoly() const
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 54f7b0d487fe..2444bc0222bf 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -57,7 +57,6 @@
#include <vector>
#include <svx/shapepropertynotifier.hxx>
-#include <svdglob.hxx>
#include <svx/svdotable.hxx>
#include <svx/xlinjoit.hxx>
@@ -93,6 +92,7 @@
#include <svx/svdpage.hxx>
#include <svx/svdpool.hxx>
#include <svx/strings.hrc>
+#include <svx/dialmgr.hxx>
#include <svx/svdtrans.hxx>
#include <svx/svdundo.hxx>
#include <svx/svdview.hxx>
@@ -991,7 +991,7 @@ SdrObject& SdrObject::operator=(const SdrObject& rObj)
OUString SdrObject::TakeObjNameSingul() const
{
- OUStringBuffer sName(ImpGetResStr(STR_ObjNameSingulNONE));
+ OUStringBuffer sName(SvxResId(STR_ObjNameSingulNONE));
OUString aName(GetName());
if (!aName.isEmpty())
@@ -1006,12 +1006,12 @@ OUString SdrObject::TakeObjNameSingul() const
OUString SdrObject::TakeObjNamePlural() const
{
- return ImpGetResStr(STR_ObjNamePluralNONE);
+ return SvxResId(STR_ObjNamePluralNONE);
}
void SdrObject::ImpTakeDescriptionStr(const char* pStrCacheID, OUString& rStr) const
{
- rStr = ImpGetResStr(pStrCacheID);
+ rStr = SvxResId(pStrCacheID);
sal_Int32 nPos = rStr.indexOf("%1");
if (nPos >= 0)
{
diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx
index cd688f348842..47d51561375e 100644
--- a/svx/source/svdraw/svdocapt.cxx
+++ b/svx/source/svdraw/svdocapt.cxx
@@ -32,7 +32,7 @@
#include <tools/helpers.hxx>
#include "svdconv.hxx"
-#include <svdglob.hxx>
+#include <svx/dialmgr.hxx>
#include <svx/strings.hrc>
#include <sdr/contact/viewcontactofsdrcaptionobj.hxx>
@@ -256,7 +256,7 @@ SdrCaptionObj& SdrCaptionObj::operator=(const SdrCaptionObj& rObj)
OUString SdrCaptionObj::TakeObjNameSingul() const
{
- OUStringBuffer sName(ImpGetResStr(STR_ObjNameSingulCAPTION));
+ OUStringBuffer sName(SvxResId(STR_ObjNameSingulCAPTION));
OUString aName(GetName());
if (!aName.isEmpty())
@@ -272,7 +272,7 @@ OUString SdrCaptionObj::TakeObjNameSingul() const
OUString SdrCaptionObj::TakeObjNamePlural() const
{
- return ImpGetResStr(STR_ObjNamePluralCAPTION);
+ return SvxResId(STR_ObjNamePluralCAPTION);
}
basegfx::B2DPolyPolygon SdrCaptionObj::TakeXorPoly() const
diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx
index 1dc049f07d17..1738eb167562 100644
--- a/svx/source/svdraw/svdocirc.cxx
+++ b/svx/source/svdraw/svdocirc.cxx
@@ -26,7 +26,7 @@
#include <math.h>
#include <svl/style.hxx>
-#include <svdglob.hxx>
+#include <svx/dialmgr.hxx>
#include <svx/strings.hrc>
#include <sdr/contact/viewcontactofsdrcircobj.hxx>
@@ -311,7 +311,7 @@ OUString SdrCircObj::TakeObjNameSingul() const
default: break;
}
}
- OUStringBuffer sName(ImpGetResStr(pID));
+ OUStringBuffer sName(SvxResId(pID));
OUString aName(GetName());
if (!aName.isEmpty())
@@ -345,7 +345,7 @@ OUString SdrCircObj::TakeObjNamePlural() const
default: break;
}
}
- return ImpGetResStr(pID);
+ return SvxResId(pID);
}
SdrCircObj* SdrCircObj::Clone(SdrModel* pTargetModel) const
diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx
index ce5a636a5e03..c044e6f013f1 100644
--- a/svx/source/svdraw/svdoedge.cxx
+++ b/svx/source/svdraw/svdoedge.cxx
@@ -18,7 +18,7 @@
*/
#include "svddrgm1.hxx"
-#include <svdglob.hxx>
+#include <svx/dialmgr.hxx>
#include <svx/strings.hrc>
#include <basegfx/matrix/b2dhommatrix.hxx>
@@ -1638,7 +1638,7 @@ SdrEdgeObj& SdrEdgeObj::operator=(const SdrEdgeObj& rObj)
OUString SdrEdgeObj::TakeObjNameSingul() const
{
- OUStringBuffer sName(ImpGetResStr(STR_ObjNameSingulEDGE));
+ OUStringBuffer sName(SvxResId(STR_ObjNameSingulEDGE));
OUString aName(GetName());
if (!aName.isEmpty())
@@ -1653,7 +1653,7 @@ OUString SdrEdgeObj::TakeObjNameSingul() const
OUString SdrEdgeObj::TakeObjNamePlural() const
{
- return ImpGetResStr(STR_ObjNamePluralEDGE);
+ return SvxResId(STR_ObjNamePluralEDGE);
}
basegfx::B2DPolyPolygon SdrEdgeObj::TakeXorPoly() const
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index 48949649e8f5..296027c96386 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -36,7 +36,7 @@
#include <sfx2/linkmgr.hxx>
#include <sfx2/docfile.hxx>
#include <svx/svdetc.hxx>
-#include <svdglob.hxx>
+#include <svx/dialmgr.hxx>
#include <svx/strings.hrc>
#include <svx/svdpool.hxx>
#include <svx/svdmodel.hxx>
@@ -732,17 +732,17 @@ OUString SdrGrafObj::TakeObjNameSingul() const
{
case VectorGraphicDataType::Wmf:
{
- sName.append(ImpGetResStr(STR_ObjNameSingulGRAFWMF));
+ sName.append(SvxResId(STR_ObjNameSingulGRAFWMF));
break;
}
case VectorGraphicDataType::Emf:
{
- sName.append(ImpGetResStr(STR_ObjNameSingulGRAFEMF));
+ sName.append(SvxResId(STR_ObjNameSingulGRAFEMF));
break;
}
default: // case VectorGraphicDataType::Svg:
{
- sName.append(ImpGetResStr(STR_ObjNameSingulGRAFSVG));
+ sName.append(SvxResId(STR_ObjNameSingulGRAFSVG));
break;
}
}
@@ -757,20 +757,20 @@ OUString SdrGrafObj::TakeObjNameSingul() const
( IsLinkedGraphic() ? STR_ObjNameSingulGRAFBMPTRANSLNK : STR_ObjNameSingulGRAFBMPTRANS ) :
( IsLinkedGraphic() ? STR_ObjNameSingulGRAFBMPLNK : STR_ObjNameSingulGRAFBMP ) );
- sName.append(ImpGetResStr(pId));
+ sName.append(SvxResId(pId));
}
break;
case GraphicType::GdiMetafile:
- sName.append(ImpGetResStr(IsLinkedGraphic() ? STR_ObjNameSingulGRAFMTFLNK : STR_ObjNameSingulGRAFMTF));
+ sName.append(SvxResId(IsLinkedGraphic() ? STR_ObjNameSingulGRAFMTFLNK : STR_ObjNameSingulGRAFMTF));
break;
case GraphicType::NONE:
- sName.append(ImpGetResStr(IsLinkedGraphic() ? STR_ObjNameSingulGRAFNONELNK : STR_ObjNameSingulGRAFNONE));
+ sName.append(SvxResId(IsLinkedGraphic() ? STR_ObjNameSingulGRAFNONELNK : STR_ObjNameSingulGRAFNONE));
break;
default:
- sName.append(ImpGetResStr(IsLinkedGraphic() ? STR_ObjNameSingulGRAFLNK : STR_ObjNameSingulGRAF));
+ sName.append(SvxResId(IsLinkedGraphic() ? STR_ObjNameSingulGRAFLNK : STR_ObjNameSingulGRAF));
break;
}
}
@@ -802,17 +802,17 @@ OUString SdrGrafObj::TakeObjNamePlural() const
{
case VectorGraphicDataType::Wmf:
{
- sName.append(ImpGetResStr(STR_ObjNamePluralGRAFWMF));
+ sName.append(SvxResId(STR_ObjNamePluralGRAFWMF));
break;
}
case VectorGraphicDataType::Emf:
{
- sName.append(ImpGetResStr(STR_ObjNamePluralGRAFEMF));
+ sName.append(SvxResId(STR_ObjNamePluralGRAFEMF));
break;
}
default: // case VectorGraphicDataType::Svg:
{
- sName.append(ImpGetResStr(STR_ObjNamePluralGRAFSVG));
+ sName.append(SvxResId(STR_ObjNamePluralGRAFSVG));
break;
}
}
@@ -827,20 +827,20 @@ OUString SdrGrafObj::TakeObjNamePlural() const
( IsLinkedGraphic() ? STR_ObjNamePluralGRAFBMPTRANSLNK : STR_ObjNamePluralGRAFBMPTRANS ) :
( IsLinkedGraphic() ? STR_ObjNamePluralGRAFBMPLNK : STR_ObjNamePluralGRAFBMP ) );
- sName.append(ImpGetResStr(pId));
+ sName.append(SvxResId(pId));
}
break;
case GraphicType::GdiMetafile:
- sName.append(ImpGetResStr(IsLinkedGraphic() ? STR_ObjNamePluralGRAFMTFLNK : STR_ObjNamePluralGRAFMTF));
+ sName.append(SvxResId(IsLinkedGraphic() ? STR_ObjNamePluralGRAFMTFLNK : STR_ObjNamePluralGRAFMTF));
break;
case GraphicType::NONE:
- sName.append(ImpGetResStr(IsLinkedGraphic() ? STR_ObjNamePluralGRAFNONELNK : STR_ObjNamePluralGRAFNONE));
+ sName.append(SvxResId(IsLinkedGraphic() ? STR_ObjNamePluralGRAFNONELNK : STR_ObjNamePluralGRAFNONE));
break;
default:
- sName.append(ImpGetResStr(IsLinkedGraphic() ? STR_ObjNamePluralGRAFLNK : STR_ObjNamePluralGRAF));
+ sName.append(SvxResId(IsLinkedGraphic() ? STR_ObjNamePluralGRAFLNK : STR_ObjNamePluralGRAF));
break;
}
}
diff --git a/svx/source/svdraw/svdogrp.cxx b/svx/source/svdraw/svdogrp.cxx
index 9476a5074613..60c66de5bc3e 100644
--- a/svx/source/svdraw/svdogrp.cxx
+++ b/svx/source/svdraw/svdogrp.cxx
@@ -37,7 +37,7 @@
#include <svx/svdtrans.hxx>
#include <svx/svdetc.hxx>
#include <svx/svdoedge.hxx>
-#include <svdglob.hxx>
+#include <svx/dialmgr.hxx>
#include <svx/strings.hrc>
#include <svx/svxids.hrc>
@@ -233,11 +233,11 @@ OUString SdrObjGroup::TakeObjNameSingul() const
if(!maSdrObjList.GetObjCount())
{
- sName.append(ImpGetResStr(STR_ObjNameSingulGRUPEMPTY));
+ sName.append(SvxResId(STR_ObjNameSingulGRUPEMPTY));
}
else
{
- sName.append(ImpGetResStr(STR_ObjNameSingulGRUP));
+ sName.append(SvxResId(STR_ObjNameSingulGRUP));
}
const OUString aName(GetName());
@@ -257,8 +257,8 @@ OUString SdrObjGroup::TakeObjNameSingul() const
OUString SdrObjGroup::TakeObjNamePlural() const
{
if (maSdrObjList.GetObjCount()==0)
- return ImpGetResStr(STR_ObjNamePluralGRUPEMPTY);
- return ImpGetResStr(STR_ObjNamePluralGRUP);
+ return SvxResId(STR_ObjNamePluralGRUPEMPTY);
+ return SvxResId(STR_ObjNamePluralGRUP);
}
diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx
index bcb83fb92003..9cbb15df0e17 100644
--- a/svx/source/svdraw/svdomeas.cxx
+++ b/svx/source/svdraw/svdomeas.cxx
@@ -18,7 +18,7 @@
*/
#include "svdconv.hxx"
-#include <svdglob.hxx>
+#include <svx/dialmgr.hxx>
#include <svx/strings.hrc>
#include <basegfx/matrix/b2dhommatrix.hxx>
@@ -721,7 +721,7 @@ SdrMeasureObj& SdrMeasureObj::operator=(const SdrMeasureObj& rObj)
OUString SdrMeasureObj::TakeObjNameSingul() const
{
- OUStringBuffer sName(ImpGetResStr(STR_ObjNameSingulMEASURE));
+ OUStringBuffer sName(SvxResId(STR_ObjNameSingulMEASURE));
OUString aName( GetName() );
if (!aName.isEmpty())
@@ -737,7 +737,7 @@ OUString SdrMeasureObj::TakeObjNameSingul() const
OUString SdrMeasureObj::TakeObjNamePlural() const
{
- return ImpGetResStr(STR_ObjNamePluralMEASURE);
+ return SvxResId(STR_ObjNamePluralMEASURE);
}
basegfx::B2DPolyPolygon SdrMeasureObj::TakeXorPoly() const
diff --git a/svx/source/svdraw/svdomedia.cxx b/svx/source/svdraw/svdomedia.cxx
index 012dc1d35879..8a2d04f12523 100644
--- a/svx/source/svdraw/svdomedia.cxx
+++ b/svx/source/svdraw/svdomedia.cxx
@@ -34,7 +34,7 @@
#include <vcl/svapp.hxx>
#include <svx/svdmodel.hxx>
-#include <svdglob.hxx>
+#include <svx/dialmgr.hxx>
#include <svx/strings.hrc>
#include <svx/sdr/contact/viewcontactofsdrmediaobj.hxx>
#include <avmedia/mediawindow.hxx>
@@ -122,7 +122,7 @@ sal_uInt16 SdrMediaObj::GetObjIdentifier() const
OUString SdrMediaObj::TakeObjNameSingul() const
{
- OUStringBuffer sName(ImpGetResStr(STR_ObjNameSingulMEDIA));
+ OUStringBuffer sName(SvxResId(STR_ObjNameSingulMEDIA));
OUString aName(GetName());
@@ -139,7 +139,7 @@ OUString SdrMediaObj::TakeObjNameSingul() const
OUString SdrMediaObj::TakeObjNamePlural() const
{
- return ImpGetResStr(STR_ObjNamePluralMEDIA);
+ return SvxResId(STR_ObjNamePluralMEDIA);
}
SdrMediaObj* SdrMediaObj::Clone(SdrModel* pTargetModel) const
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index a0af361797a1..8587f34205bd 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -66,7 +66,7 @@
#include <svx/charthelper.hxx>
#include <svx/svdmodel.hxx>
-#include <svdglob.hxx>
+#include <svx/dialmgr.hxx>
#include <svx/strings.hrc>
#include <svx/svdetc.hxx>
#include <svx/svdview.hxx>
@@ -1372,7 +1372,7 @@ sal_uInt16 SdrOle2Obj::GetObjIdentifier() const
OUString SdrOle2Obj::TakeObjNameSingul() const
{
- OUStringBuffer sName(ImpGetResStr(mpImpl->mbFrame ? STR_ObjNameSingulFrame : STR_ObjNameSingulOLE2));
+ OUStringBuffer sName(SvxResId(mpImpl->mbFrame ? STR_ObjNameSingulFrame : STR_ObjNameSingulOLE2));
const OUString aName(GetName());
@@ -1388,7 +1388,7 @@ OUString SdrOle2Obj::TakeObjNameSingul() const
OUString SdrOle2Obj::TakeObjNamePlural() const
{
- return ImpGetResStr(mpImpl->mbFrame ? STR_ObjNamePluralFrame : STR_ObjNamePluralOLE2);
+ return SvxResId(mpImpl->mbFrame ? STR_ObjNamePluralFrame : STR_ObjNamePluralOLE2);
}
SdrOle2Obj* SdrOle2Obj::Clone(SdrModel* pTargetModel) const
diff --git a/svx/source/svdraw/svdopage.cxx b/svx/source/svdraw/svdopage.cxx
index af38237fa632..bd5f595c3a9d 100644
--- a/svx/source/svdraw/svdopage.cxx
+++ b/svx/source/svdraw/svdopage.cxx
@@ -19,7 +19,7 @@
#include <svx/svdopage.hxx>
-#include <svdglob.hxx>
+#include <svx/dialmgr.hxx>
#include <svx/strings.hrc>
#include <svx/svdtrans.hxx>
#include <svx/svdetc.hxx>
@@ -166,7 +166,7 @@ SdrPageObj& SdrPageObj::operator=(const SdrPageObj& rObj)
OUString SdrPageObj::TakeObjNameSingul() const
{
- OUStringBuffer sName(ImpGetResStr(STR_ObjNameSingulPAGE));
+ OUStringBuffer sName(SvxResId(STR_ObjNameSingulPAGE));
OUString aName(GetName());
if (!aName.isEmpty())
@@ -182,7 +182,7 @@ OUString SdrPageObj::TakeObjNameSingul() const
OUString SdrPageObj::TakeObjNamePlural() const
{
- return ImpGetResStr(STR_ObjNamePluralPAGE);
+ return SvxResId(STR_ObjNamePluralPAGE);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx
index 81b70bc17fa0..5270b223dc77 100644
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -31,7 +31,7 @@
#include <svx/svdpage.hxx>
#include <svx/svdhdl.hxx>
#include <svx/svdview.hxx>
-#include <svdglob.hxx>
+#include <svx/dialmgr.hxx>
#include <svx/strings.hrc>
#include <svx/xlnwtit.hxx>
@@ -995,7 +995,7 @@ OUString ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag
aStr = aTmp;
// delete %O
- OUString aStr2(ImpGetResStr(STR_EditDelete));
+ OUString aStr2(SvxResId(STR_EditDelete));
// UNICODE: delete point of ...
aStr2 = aStr2.replaceFirst("%1", aStr);
@@ -1879,7 +1879,7 @@ OUString SdrPathObj::TakeObjNameSingul() const
}
}
- sName.append(ImpGetResStr(pId));
+ sName.append(SvxResId(pId));
}
else if(OBJ_PLIN == meKind || OBJ_POLY == meKind)
{
@@ -1897,7 +1897,7 @@ OUString SdrPathObj::TakeObjNameSingul() const
pId = STR_ObjNameSingulPLIN;
}
- sName.append(ImpGetResStr(pId));
+ sName.append(SvxResId(pId));
}
else
{
@@ -1919,7 +1919,7 @@ OUString SdrPathObj::TakeObjNameSingul() const
pId = STR_ObjNameSingulPLIN_PointCount;
}
- OUString sTemp(ImpGetResStr(pId));
+ OUString sTemp(SvxResId(pId));
// #i96537#
sName.append(sTemp.replaceFirst("%2", OUString::number(nPointCount)));
}
@@ -1928,12 +1928,12 @@ OUString SdrPathObj::TakeObjNameSingul() const
{
switch (meKind)
{
- case OBJ_PATHLINE: sName.append(ImpGetResStr(STR_ObjNameSingulPATHLINE)); break;
- case OBJ_FREELINE: sName.append(ImpGetResStr(STR_ObjNameSingulFREELINE)); break;
- case OBJ_SPLNLINE: sName.append(ImpGetResStr(STR_ObjNameSingulNATSPLN)); break;
- case OBJ_PATHFILL: sName.append(ImpGetResStr(STR_ObjNameSingulPATHFILL)); break;
- case OBJ_FREEFILL: sName.append(ImpGetResStr(STR_ObjNameSingulFREEFILL)); break;
- case OBJ_SPLNFILL: sName.append(ImpGetResStr(STR_ObjNameSingulPERSPLN)); break;
+ case OBJ_PATHLINE: sName.append(SvxResId(STR_ObjNameSingulPATHLINE)); break;
+ case OBJ_FREELINE: sName.append(SvxResId(STR_ObjNameSingulFREELINE)); break;
+ case OBJ_SPLNLINE: sName.append(SvxResId(STR_ObjNameSingulNATSPLN)); break;
+ case OBJ_PATHFILL: sName.append(SvxResId(STR_ObjNameSingulPATHFILL)); break;
+ case OBJ_FREEFILL: sName.append(SvxResId(STR_ObjNameSingulFREEFILL)); break;
+ case OBJ_SPLNFILL: sName.append(SvxResId(STR_ObjNameSingulPERSPLN)); break;
default: break;
}
}
@@ -1955,15 +1955,15 @@ OUString SdrPathObj::TakeObjNamePlural() const
OUString sName;
switch(meKind)
{
- case OBJ_LINE : sName=ImpGetResStr(STR_ObjNamePluralLINE ); break;
- case OBJ_PLIN : sName=ImpGetResStr(STR_ObjNamePluralPLIN ); break;
- case OBJ_POLY : sName=ImpGetResStr(STR_ObjNamePluralPOLY ); break;
- case OBJ_PATHLINE: sName=ImpGetResStr(STR_ObjNamePluralPATHLINE); break;
- case OBJ_FREELINE: sName=ImpGetResStr(STR_ObjNamePluralFREELINE); break;
- case OBJ_SPLNLINE: sName=ImpGetResStr(STR_ObjNamePluralNATSPLN); break;
- case OBJ_PATHFILL: sName=ImpGetResStr(STR_ObjNamePluralPATHFILL); break;
- case OBJ_FREEFILL: sName=ImpGetResStr(STR_ObjNamePluralFREEFILL); break;
- case OBJ_SPLNFILL: sName=ImpGetResStr(STR_ObjNamePluralPERSPLN); break;
+ case OBJ_LINE : sName=SvxResId(STR_ObjNamePluralLINE ); break;
+ case OBJ_PLIN : sName=SvxResId(STR_ObjNamePluralPLIN ); break;
+ case OBJ_POLY : sName=SvxResId(STR_ObjNamePluralPOLY ); break;
+ case OBJ_PATHLINE: sName=SvxResId(STR_ObjNamePluralPATHLINE); break;
+ case OBJ_FREELINE: sName=SvxResId(STR_ObjNamePluralFREELINE); break;
+ case OBJ_SPLNLINE: sName=SvxResId(STR_ObjNamePluralNATSPLN); break;
+ case OBJ_PATHFILL: sName=SvxResId(STR_ObjNamePluralPATHFILL); break;
+ case OBJ_FREEFILL: sName=SvxResId(STR_ObjNamePluralFREEFILL); break;
+ case OBJ_SPLNFILL: sName=SvxResId(STR_ObjNamePluralPERSPLN); break;
default: break;
}
return sName;
diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx
index 115b3a7adf27..7aebe89c3d7a 100644
--- a/svx/source/svdraw/svdorect.cxx
+++ b/svx/source/svdraw/svdorect.cxx
@@ -34,7 +34,7 @@
#include <svx/svdview.hxx>
#include <svx/svdundo.hxx>
#include <svx/svdopath.hxx>
-#include <svdglob.hxx>
+#include <svx/dialmgr.hxx>
#include <svx/strings.hrc>
#include <svx/xflclit.hxx>
#include <svx/xlnclit.hxx>
@@ -224,7 +224,7 @@ OUString SdrRectObj::TakeObjNameSingul() const
{
pResId = bRounded ? STR_ObjNameSingulQUADRND : STR_ObjNameSingulQUAD; // square
}
- sName.append(ImpGetResStr(pResId));
+ sName.append(SvxResId(pResId));
OUString aName(GetName());
if (!aName.isEmpty())
@@ -256,7 +256,7 @@ OUString SdrRectObj::TakeObjNamePlural() const
pResId = bRounded ? STR_ObjNamePluralQUADRND : STR_ObjNamePluralQUAD; // square
}
- return ImpGetResStr(pResId);
+ return SvxResId(pResId);
}
SdrRectObj* SdrRectObj::Clone(SdrModel* pTargetModel) const
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 4be76cbdd7a8..d221d28b1530 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -26,7 +26,7 @@
#include <svx/svdetc.hxx>
#include <svx/svdoutl.hxx>
#include <svx/svdmodel.hxx>
-#include <svdglob.hxx>
+#include <svx/dialmgr.hxx>
#include <svx/strings.hrc>
#include <editeng/writingmodeitem.hxx>
#include <svx/sdtfchim.hxx>
@@ -933,22 +933,22 @@ OUString SdrTextObj::TakeObjNameSingul() const
{
case OBJ_OUTLINETEXT:
{
- aStr = ImpGetResStr(STR_ObjNameSingulOUTLINETEXT);
+ aStr = SvxResId(STR_ObjNameSingulOUTLINETEXT);
break;
}
case OBJ_TITLETEXT :
{
- aStr = ImpGetResStr(STR_ObjNameSingulTITLETEXT);
+ aStr = SvxResId(STR_ObjNameSingulTITLETEXT);
break;
}
default:
{
if(IsLinkedText())
- aStr = ImpGetResStr(STR_ObjNameSingulTEXTLNK);
+ aStr = SvxResId(STR_ObjNameSingulTEXTLNK);
else
- aStr = ImpGetResStr(STR_ObjNameSingulTEXT);
+ aStr = SvxResId(STR_ObjNameSingulTEXT);
break;
}
}
@@ -997,13 +997,13 @@ OUString SdrTextObj::TakeObjNamePlural() const
{
OUString sName;
switch (eTextKind) {
- case OBJ_OUTLINETEXT: sName=ImpGetResStr(STR_ObjNamePluralOUTLINETEXT); break;
- case OBJ_TITLETEXT : sName=ImpGetResStr(STR_ObjNamePluralTITLETEXT); break;
+ case OBJ_OUTLINETEXT: sName=SvxResId(STR_ObjNamePluralOUTLINETEXT); break;
+ case OBJ_TITLETEXT : sName=SvxResId(STR_ObjNamePluralTITLETEXT); break;
default: {
if (IsLinkedText()) {
- sName=ImpGetResStr(STR_ObjNamePluralTEXTLNK);
+ sName=SvxResId(STR_ObjNamePluralTEXTLNK);
} else {
- sName=ImpGetResStr(STR_ObjNamePluralTEXT);
+ sName=SvxResId(STR_ObjNamePluralTEXT);
}
} break;
} // switch
diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx
index 4a0e071ca8b9..830b5d8361f8 100644
--- a/svx/source/svdraw/svdouno.cxx
+++ b/svx/source/svdraw/svdouno.cxx
@@ -37,7 +37,7 @@
#include <svx/svdouno.hxx>
#include <svx/svdpagv.hxx>
#include <svx/svdmodel.hxx>
-#include <svdglob.hxx>
+#include <svx/dialmgr.hxx>
#include <svx/strings.hrc>
#include <svx/svdetc.hxx>
#include <svx/svdview.hxx>
@@ -236,7 +236,7 @@ void SdrUnoObj::SetContextWritingMode( const sal_Int16 _nContextWritingMode )
OUString SdrUnoObj::TakeObjNameSingul() const
{
- OUStringBuffer sName(ImpGetResStr(STR_ObjNameSingulUno));
+ OUStringBuffer sName(SvxResId(STR_ObjNameSingulUno));
OUString aName(GetName());
if (!aName.isEmpty())
@@ -252,7 +252,7 @@ OUString SdrUnoObj::TakeObjNameSingul() const
OUString SdrUnoObj::TakeObjNamePlural() const
{
- return ImpGetResStr(STR_ObjNamePluralUno);
+ return SvxResId(STR_ObjNamePluralUno);
}
SdrUnoObj* SdrUnoObj::Clone(SdrModel* pTargetModel) const
diff --git a/svx/source/svdraw/svdpoev.cxx b/svx/source/svdraw/svdpoev.cxx
index 56e32865e012..064aa07bb650 100644
--- a/svx/source/svdraw/svdpoev.cxx
+++ b/svx/source/svdraw/svdpoev.cxx
@@ -25,7 +25,7 @@
#include <svx/svdopath.hxx>
#include <svx/svdundo.hxx>
#include <svx/strings.hrc>
-#include <svdglob.hxx>
+#include <svx/dialmgr.hxx>
#include <svx/svdtrans.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>
#include <basegfx/polygon/b2dpolygontools.hxx>
@@ -197,7 +197,7 @@ void SdrPolyEditView::SetMarkedPointsSmooth(SdrPathSmoothKind eKind)
const bool bUndo = IsUndoEnabled();
if( bUndo )
- BegUndo(ImpGetResStr(STR_EditSetPointsSmooth), GetDescriptionOfMarkedPoints());
+ BegUndo(SvxResId(STR_EditSetPointsSmooth), GetDescriptionOfMarkedPoints());
const size_t nMarkCount(GetMarkedObjectCount());
for(size_t nMarkNum(nMarkCount); nMarkNum > 0;)
@@ -231,7 +231,7 @@ void SdrPolyEditView::SetMarkedSegmentsKind(SdrPathSegmentKind eKind)
const bool bUndo = IsUndoEnabled();
if( bUndo )
- BegUndo(ImpGetResStr(STR_EditSetSegmentsKind), GetDescriptionOfMarkedPoints());
+ BegUndo(SvxResId(STR_EditSetSegmentsKind), GetDescriptionOfMarkedPoints());
const size_t nMarkCount(GetMarkedObjectCount());
for(size_t nMarkNum=nMarkCount; nMarkNum > 0;)
@@ -297,7 +297,7 @@ void SdrPolyEditView::DeleteMarkedPoints()
if( bUndo )
{
// Description
- BegUndo(ImpGetResStr(STR_EditDelete),GetDescriptionOfMarkedPoints(),SdrRepeatFunc::Delete);
+ BegUndo(SvxResId(STR_EditDelete),GetDescriptionOfMarkedPoints(),SdrRepeatFunc::Delete);
}
for (size_t nMarkNum=nMarkCount; nMarkNum>0;)
@@ -348,7 +348,7 @@ void SdrPolyEditView::RipUpAtMarkedPoints()
const bool bUndo = IsUndoEnabled();
if( bUndo )
- BegUndo(ImpGetResStr(STR_EditRipUp), GetDescriptionOfMarkedPoints());
+ BegUndo(SvxResId(STR_EditRipUp), GetDescriptionOfMarkedPoints());
for(size_t nMarkNum = nMarkCount; nMarkNum > 0;)
{
@@ -612,7 +612,7 @@ static void ImpMove(Point& rPt, Point* pC1, Point* pC2, const void* p1, const vo
void SdrPolyEditView::MoveMarkedPoints(const Size& rSiz)
{
ForceUndirtyMrkPnt();
- OUString aStr(ImpGetResStr(STR_EditMove));
+ OUString aStr(SvxResId(STR_EditMove));
BegUndo(aStr,GetDescriptionOfMarkedPoints(),SdrRepeatFunc::Move);
ImpTransformMarkedPoints(ImpMove,&rSiz);
EndUndo();
@@ -629,7 +629,7 @@ static void ImpResize(Point& rPt, Point* pC1, Point* pC2, const void* p1, const
void SdrPolyEditView::ResizeMarkedPoints(const Point& rRef, const Fraction& xFact, const Fraction& yFact)
{
ForceUndirtyMrkPnt();
- OUString aStr(ImpGetResStr(STR_EditResize));
+ OUString aStr(SvxResId(STR_EditResize));
BegUndo(aStr,GetDescriptionOfMarkedPoints(),SdrRepeatFunc::Resize);
ImpTransformMarkedPoints(ImpResize,&rRef,&xFact,&yFact);
EndUndo();
@@ -646,7 +646,7 @@ static void ImpRotate(Point& rPt, Point* pC1, Point* pC2, const void* p1, const
void SdrPolyEditView::RotateMarkedPoints(const Point& rRef, long nAngle)
{
ForceUndirtyMrkPnt();
- OUString aStr(ImpGetResStr(STR_EditResize));
+ OUString aStr(SvxResId(STR_EditResize));
BegUndo(aStr,GetDescriptionOfMarkedPoints(),SdrRepeatFunc::Rotate);
double nSin=sin(nAngle*nPi180);
double nCos=cos(nAngle*nPi180);
diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx
index 6dc3788ab30e..c08bd7785e38 100644
--- a/svx/source/svdraw/svdundo.cxx
+++ b/svx/source/svdraw/svdundo.cxx
@@ -30,7 +30,7 @@
#include <svx/svdview.hxx>
#include <svx/xfillit0.hxx>
#include <svx/strings.hrc>
-#include <svdglob.hxx>
+#include <svx/dialmgr.hxx>
#include <svx/scene3d.hxx>
#include <editeng/editdata.hxx>
#include <editeng/outlobj.hxx>
@@ -205,7 +205,7 @@ void SdrUndoGroup::SdrRepeat(SdrView& rView)
OUString SdrUndoGroup::GetSdrRepeatComment(SdrView& /*rView*/) const
{
- return aComment.replaceAll("%1", ImpGetResStr(STR_ObjNameSingulPlural));
+ return aComment.replaceAll("%1", SvxResId(STR_ObjNameSingulPlural));
}
SdrUndoObj::SdrUndoObj(SdrObject& rNewObj)
@@ -216,14 +216,14 @@ SdrUndoObj::SdrUndoObj(SdrObject& rNewObj)
OUString SdrUndoObj::GetDescriptionStringForObject( const SdrObject& _rForObject, const char* pStrCacheID, bool bRepeat )
{
- const OUString rStr {ImpGetResStr(pStrCacheID)};
+ const OUString rStr {SvxResId(pStrCacheID)};
const sal_Int32 nPos = rStr.indexOf("%1");
if (nPos < 0)
return rStr;
if (bRepeat)
- return rStr.replaceAt(nPos, 2, ImpGetResStr(STR_ObjNameSingulPlural));
+ return rStr.replaceAt(nPos, 2, SvxResId(STR_ObjNameSingulPlural));
return rStr.replaceAt(nPos, 2, _rForObject.TakeObjNameSingul());
}
@@ -1289,7 +1289,7 @@ void SdrUndoNewLayer::Redo()
OUString SdrUndoNewLayer::GetComment() const
{
- return ImpGetResStr(STR_UndoNewLayer);
+ return SvxResId(STR_UndoNewLayer);
}
@@ -1310,7 +1310,7 @@ void SdrUndoDelLayer::Redo()
OUString SdrUndoDelLayer::GetComment() const
{
- return ImpGetResStr(STR_UndoDelLayer);
+ return SvxResId(STR_UndoDelLayer);
}
@@ -1330,7 +1330,7 @@ void SdrUndoMoveLayer::Redo()
OUString SdrUndoMoveLayer::GetComment() const
{
- return ImpGetResStr(STR_UndoMovLayer);
+ return SvxResId(STR_UndoMovLayer);
}
@@ -1392,7 +1392,7 @@ void SdrUndoPage::ImpMovePage(sal_uInt16 nOldNum, sal_uInt16 nNewNum)
void SdrUndoPage::ImpTakeDescriptionStr(const char* pStrCacheID, OUString& rStr)
{
- rStr = ImpGetResStr(pStrCacheID);
+ rStr = SvxResId(pStrCacheID);
}
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index 8bfea2399a26..c831ce9b26e9 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -21,7 +21,7 @@
#include <editeng/outlobj.hxx>
#include <svx/strings.hrc>
-#include <svdglob.hxx>
+#include <svx/dialmgr.hxx>
#include <svx/svdpagv.hxx>
#include <svx/svdmrkv.hxx>
#include <svx/svdedxv.hxx>
@@ -1177,7 +1177,7 @@ OUString SdrView::GetStatusText()
if(aStr.isEmpty())
{
aName = pCurrentCreate->TakeObjNameSingul();
- aStr = ImpGetResStr(STR_ViewCreateObj);
+ aStr = SvxResId(STR_ViewCreateObj);
}
}
else if (mpCurrentSdrDragMethod)
@@ -1201,36 +1201,36 @@ OUString SdrView::GetStatusText()
{
if(AreObjectsMarked())
{
- aStr = ImpGetResStr(STR_ViewMarkMoreObjs);
+ aStr = SvxResId(STR_ViewMarkMoreObjs);
}
else
{
- aStr = ImpGetResStr(STR_ViewMarkObjs);
+ aStr = SvxResId(STR_ViewMarkObjs);
}
}
else if(IsMarkPoints())
{
if(HasMarkedPoints())
{
- aStr = ImpGetResStr(STR_ViewMarkMorePoints);
+ aStr = SvxResId(STR_ViewMarkMorePoints);
}
else
{
- aStr = ImpGetResStr(STR_ViewMarkPoints);
+ aStr = SvxResId(STR_ViewMarkPoints);
}
} else if (IsMarkGluePoints())
{
if(HasMarkedGluePoints())
{
- aStr = ImpGetResStr(STR_ViewMarkMoreGluePoints);
+ aStr = SvxResId(STR_ViewMarkMoreGluePoints);
}
else
{
- aStr = ImpGetResStr(STR_ViewMarkGluePoints);
+ aStr = SvxResId(STR_ViewMarkGluePoints);
}
}
else if (IsTextEdit() && pTextEditOutlinerView!=nullptr) {
- aStr=ImpGetResStr(STR_ViewTextEdit); // "TextEdit - Row y, Column x";
+ aStr=SvxResId(STR_ViewTextEdit); // "TextEdit - Row y, Column x";
ESelection aSel(pTextEditOutlinerView->GetSelection());
long nPar=aSel.nEndPara,nLin=0,nCol=aSel.nEndPos;
if (aSel.nEndPara>0) {
diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx
index 5b4031e631b6..9e7ee9b300d3 100644
--- a/svx/source/svdraw/svdxcgv.cxx
+++ b/svx/source/svdraw/svdxcgv.cxx
@@ -36,7 +36,7 @@
#include <svx/svdpagv.hxx>
#include <svx/svdtrans.hxx>
#include <svx/strings.hrc>
-#include <svdglob.hxx>
+#include <svx/dialmgr.hxx>
#include <svx/xoutbmp.hxx>
#include <vcl/metaact.hxx>
#include <svl/poolitem.hxx>
@@ -241,7 +241,7 @@ bool SdrExchangeView::Paste(
const bool bUndo = IsUndoEnabled();
if( bUndo )
- BegUndo(ImpGetResStr(STR_ExchangePaste));
+ BegUndo(SvxResId(STR_ExchangePaste));
if( mxSelectionController.is() && mxSelectionController->PasteObjModel( rMod ) )
{
diff --git a/svx/source/table/cellcursor.cxx b/svx/source/table/cellcursor.cxx
index b6368837cfc5..d77dbb3ffc59 100644
--- a/svx/source/table/cellcursor.cxx
+++ b/svx/source/table/cellcursor.cxx
@@ -26,7 +26,7 @@
#include <cell.hxx>
#include <svx/svdmodel.hxx>
#include <svx/strings.hrc>
-#include <svdglob.hxx>
+#include <svx/dialmgr.hxx>
using namespace ::com::sun::star::uno;
@@ -246,7 +246,7 @@ void SAL_CALL CellCursor::merge( )
const bool bUndo(mxTable->getSdrTableObj()->IsInserted() && rModel.IsUndoEnabled());
if( bUndo )
- rModel.BegUndo( ImpGetResStr(STR_TABLE_MERGE) );
+ rModel.BegUndo( SvxResId(STR_TABLE_MERGE) );
try
{
@@ -506,7 +506,7 @@ void SAL_CALL CellCursor::split( sal_Int32 nColumns, sal_Int32 nRows )
const bool bUndo(mxTable->getSdrTableObj()->IsInserted() && rModel.IsUndoEnabled());
if( bUndo )
- rModel.BegUndo( ImpGetResStr(STR_TABLE_SPLIT) );
+ rModel.BegUndo( SvxResId(STR_TABLE_SPLIT) );
try
{
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index fb41772d3bf0..889dbccff77a 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -51,7 +51,7 @@
#include <svx/sdr/table/tabledesign.hxx>
#include <svx/svdundo.hxx>
#include <svx/strings.hrc>
-#include <svdglob.hxx>
+#include <svx/dialmgr.hxx>
#include <editeng/writingmodeitem.hxx>
#include <editeng/frmdiritem.hxx>
#include <svx/xflhtit.hxx>
@@ -1625,7 +1625,7 @@ EEAnchorMode SdrTableObj::GetOutlinerViewAnchorMode() const
OUString SdrTableObj::TakeObjNameSingul() const
{
- OUStringBuffer sName(ImpGetResStr(STR_ObjNameSingulTable));
+ OUStringBuffer sName(SvxResId(STR_ObjNameSingulTable));
OUString aName(GetName());
if (!aName.isEmpty())
@@ -1642,7 +1642,7 @@ OUString SdrTableObj::TakeObjNameSingul() const
OUString SdrTableObj::TakeObjNamePlural() const
{
- return ImpGetResStr(STR_ObjNamePluralTable);
+ return SvxResId(STR_ObjNamePluralTable);
}
diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx
index aaf4af78bc8f..0e2b612c85e4 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -60,7 +60,7 @@
#include <editeng/colritem.hxx>
#include <editeng/lineitem.hxx>
#include <svx/strings.hrc>
-#include <svdglob.hxx>
+#include <svx/dialmgr.hxx>
#include <svx/svdpage.hxx>
#include "tableundo.hxx"
#include "tablelayouter.hxx"
@@ -565,7 +565,7 @@ void SvxTableController::onInsert( sal_uInt16 nSId, const SfxItemSet* pArgs )
if( bUndo )
{
- rModel.BegUndo( ImpGetResStr(STR_TABLE_INSCOL) );
+ rModel.BegUndo( SvxResId(STR_TABLE_INSCOL) );
rModel.AddUndo(rModel.GetSdrUndoFactory().CreateUndoGeoObject(rTableObj));
}
@@ -674,7 +674,7 @@ void SvxTableController::onInsert( sal_uInt16 nSId, const SfxItemSet* pArgs )
if( bUndo )
{
- rModel.BegUndo( ImpGetResStr(STR_TABLE_INSROW ) );
+ rModel.BegUndo( SvxResId(STR_TABLE_INSROW ) );
rModel.AddUndo(rModel.GetSdrUndoFactory().CreateUndoGeoObject(rTableObj));
}
@@ -1059,7 +1059,7 @@ void SvxTableController::SetTableStyle( const SfxItemSet* pArgs )
if( bUndo )
{
- rModel.BegUndo(ImpGetResStr(STR_TABLE_STYLE));
+ rModel.BegUndo(SvxResId(STR_TABLE_STYLE));
rModel.AddUndo(new TableStyleUndo(rTableObj));
}
@@ -1153,7 +1153,7 @@ void SvxTableController::SetTableStyleSettings( const SfxItemSet* pArgs )
if( bUndo )
{
- rModel.BegUndo( ImpGetResStr(STR_TABLE_STYLE_SETTINGS) );
+ rModel.BegUndo( SvxResId(STR_TABLE_STYLE_SETTINGS) );
rModel.AddUndo(new TableStyleUndo(rTableObj));
}
@@ -1176,7 +1176,7 @@ void SvxTableController::SetVertical( sal_uInt16 nSId )
if (bUndo)
{
- rModel.BegUndo(ImpGetResStr(STR_TABLE_NUMFORMAT));
+ rModel.BegUndo(SvxResId(STR_TABLE_NUMFORMAT));
rModel.AddUndo(rModel.GetSdrUndoFactory().CreateUndoAttrObject(rTableObj));
}
@@ -1268,7 +1268,7 @@ void SvxTableController::SplitMarkedCells()
if( bUndo )
{
- rModel.BegUndo( ImpGetResStr(STR_TABLE_SPLIT) );
+ rModel.BegUndo( SvxResId(STR_TABLE_SPLIT) );
rModel.AddUndo(rModel.GetSdrUndoFactory().CreateUndoGeoObject(rTableObj));
}
@@ -1302,7 +1302,7 @@ void SvxTableController::DistributeColumns()
if( bUndo )
{
- rModel.BegUndo( ImpGetResStr(STR_TABLE_DISTRIBUTE_COLUMNS) );
+ rModel.BegUndo( SvxResId(STR_TABLE_DISTRIBUTE_COLUMNS) );
rModel.AddUndo(rModel.GetSdrUndoFactory().CreateUndoGeoObject(rTableObj));
}
@@ -1325,7 +1325,7 @@ void SvxTableController::DistributeRows()
if( bUndo )
{
- rModel.BegUndo( ImpGetResStr(STR_TABLE_DISTRIBUTE_ROWS) );
+ rModel.BegUndo( SvxResId(STR_TABLE_DISTRIBUTE_ROWS) );
rModel.AddUndo(rModel.GetSdrUndoFactory().CreateUndoGeoObject(rTableObj));
}
@@ -1352,7 +1352,7 @@ bool SvxTableController::DeleteMarked()
const bool bUndo(rModel.IsUndoEnabled());
if (bUndo)
- rModel.BegUndo(ImpGetResStr(STR_TABLE_DELETE_CELL_CONTENTS));
+ rModel.BegUndo(SvxResId(STR_TABLE_DELETE_CELL_CONTENTS));
CellPos aStart, aEnd;
getSelectedCells( aStart, aEnd );
@@ -1815,7 +1815,7 @@ void SvxTableController::MergeRange( sal_Int32 nFirstCol, sal_Int32 nFirstRow, s
if( bUndo )
{
- rModel.BegUndo( ImpGetResStr(STR_TABLE_MERGE) );
+ rModel.BegUndo( SvxResId(STR_TABLE_MERGE) );
rModel.AddUndo(rModel.GetSdrUndoFactory().CreateUndoGeoObject(rTableObj));
}
@@ -2539,7 +2539,7 @@ void SvxTableController::SetAttrToSelectedCells(const SfxItemSet& rAttr, bool bR
const bool bUndo(rModel.IsUndoEnabled());
if( bUndo )
- rModel.BegUndo( ImpGetResStr(STR_TABLE_NUMFORMAT) );
+ rModel.BegUndo( SvxResId(STR_TABLE_NUMFORMAT) );
CellPos aStart, aEnd;
getSelectedCells( aStart, aEnd );
@@ -2740,7 +2740,7 @@ bool SvxTableController::ApplyFormatPaintBrush( SfxItemSet& rFormatSet, bool bNo
const bool bUndo(rModel.IsUndoEnabled());
if( bUndo )
- rModel.BegUndo(ImpGetResStr(STR_TABLE_NUMFORMAT));
+ rModel.BegUndo(SvxResId(STR_TABLE_NUMFORMAT));
CellPos aStart, aEnd;
getSelectedCells( aStart, aEnd );
diff --git a/svx/source/table/tablemodel.cxx b/svx/source/table/tablemodel.cxx
index 812e3de7fe26..76ef46d9ce7e 100644
--- a/svx/source/table/tablemodel.cxx
+++ b/svx/source/table/tablemodel.cxx
@@ -40,7 +40,7 @@
#include <svx/svdotable.hxx>
#include <svx/svdmodel.hxx>
#include <svx/strings.hrc>
-#include <svdglob.hxx>
+#include <svx/dialmgr.hxx>
using namespace ::osl;
using namespace ::com::sun::star::uno;
@@ -622,7 +622,7 @@ void TableModel::insertColumns( sal_Int32 nIndex, sal_Int32 nCount )
if( bUndo )
{
- rModel.BegUndo( ImpGetResStr(STR_TABLE_INSCOL) );
+ rModel.BegUndo( SvxResId(STR_TABLE_INSCOL) );
rModel.AddUndo( rModel.GetSdrUndoFactory().CreateUndoGeoObject(*mpTableObj) );
TableModelRef xThis( this );
@@ -694,7 +694,7 @@ void TableModel::removeColumns( sal_Int32 nIndex, sal_Int32 nCount )
if( bUndo )
{
- rModel.BegUndo( ImpGetResStr(STR_UNDO_COL_DELETE) );
+ rModel.BegUndo( SvxResId(STR_UNDO_COL_DELETE) );
rModel.AddUndo( rModel.GetSdrUndoFactory().CreateUndoGeoObject(*mpTableObj) );
TableModelRef xThis( this );
@@ -805,7 +805,7 @@ void TableModel::insertRows( sal_Int32 nIndex, sal_Int32 nCount )
if( bUndo )
{
- rModel.BegUndo( ImpGetResStr(STR_TABLE_INSROW) );
+ rModel.BegUndo( SvxResId(STR_TABLE_INSROW) );
rModel.AddUndo( rModel.GetSdrUndoFactory().CreateUndoGeoObject(*mpTableObj) );
TableModelRef xThis( this );
rModel.AddUndo( new InsertRowUndo( xThis, nIndex, aNewRows ) );
@@ -862,7 +862,7 @@ void TableModel::removeRows( sal_Int32 nIndex, sal_Int32 nCount )
if( bUndo )
{
- rModel.BegUndo( ImpGetResStr(STR_UNDO_ROW_DELETE) );
+ rModel.BegUndo( SvxResId(STR_UNDO_ROW_DELETE) );
rModel.AddUndo( rModel.GetSdrUndoFactory().CreateUndoGeoObject(*mpTableObj) );
TableModelRef xThis( this );
diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx
index 3dc69e899965..fadad482fe7f 100644
--- a/svx/source/unodraw/unopage.cxx
+++ b/svx/source/unodraw/unopage.cxx
@@ -39,7 +39,7 @@
#include <svx/svdundo.hxx>
#include <svx/unopage.hxx>
#include "shapeimpl.hxx"
-#include <svdglob.hxx>
+#include <svx/dialmgr.hxx>
#include <svx/globl3d.hxx>
#include <svx/unoprov.hxx>
#include <svx/svdopath.hxx>
@@ -308,7 +308,7 @@ void SAL_CALL SvxDrawPage::remove( const Reference< drawing::XShape >& xShape )
if (bUndoEnabled)
{
- mpModel->BegUndo(ImpGetResStr(STR_EditDelete),
+ mpModel->BegUndo(SvxResId(STR_EditDelete),
pObj->TakeObjNameSingul(), SdrRepeatFunc::Delete);
SdrUndoAction * pAction = mpModel->GetSdrUndoFactory().CreateUndoDeleteObject(*pObj);
More information about the Libreoffice-commits
mailing list