diff options
| author | Gabor Kelemen <kelemeng@ubuntu.com> | 2018-04-21 21:50:09 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-04-26 08:54:32 +0200 |
| commit | 9134a9402610af7bff17b2bba9a4ba30e0b5a65f (patch) | |
| tree | eb68432513600e0ef133ae8ba418cfe6c9ca5490 | |
| parent | 13a1bc409d9b2f0d14f4d316b7977b1fc2eb3c8a (diff) | |
Drop sdr::GetResourceString l10n method from svx
A l10n wrapper method above another wrapper method above SvxResId.
Just use plain SvxResId instead.
Change-Id: I85276caa193c9a20f285e832764cd920df4af3fb
Reviewed-on: https://gerrit.libreoffice.org/53273
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
| -rw-r--r-- | include/svx/svdetc.hxx | 5 | ||||
| -rw-r--r-- | sd/source/ui/animations/CustomAnimationPane.cxx | 8 | ||||
| -rw-r--r-- | svx/source/svdraw/svdetc.cxx | 8 |
3 files changed, 4 insertions, 17 deletions
diff --git a/include/svx/svdetc.hxx b/include/svx/svdetc.hxx index 20d37c3c6d4f..c39e77b7d174 100644 --- a/include/svx/svdetc.hxx +++ b/include/svx/svdetc.hxx @@ -201,11 +201,6 @@ public: SVX_DLLPUBLIC SdrGlobalData & GetSdrGlobalData(); -namespace sdr -{ - SVX_DLLPUBLIC OUString GetResourceString(const char* pResID); -} - // #i101872# isolated GetTextEditBackgroundColor for tooling class SdrObjEditView; diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index c0c5cf887d2c..01c5a1c9283f 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -76,8 +76,8 @@ #include <drawdoc.hxx> #include <app.hrc> -#include <svx/svdetc.hxx> #include <svx/strings.hrc> +#include <svx/dialmgr.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/range/b2drange.hxx> @@ -2211,9 +2211,9 @@ sal_uInt32 CustomAnimationPane::fillAnimationLB( bool bHasText ) { OUString sMotionPathLabel( SdResId( STR_CUSTOMANIMATION_USERPATH ) ); mpLBAnimation->InsertCategory( sMotionPathLabel ); - mnCurvePathPos = mpLBAnimation->InsertEntry( sdr::GetResourceString(STR_ObjNameSingulCOMBLINE) ); - mnPolygonPathPos = mpLBAnimation->InsertEntry( sdr::GetResourceString(STR_ObjNameSingulPOLY) ); - mnFreeformPathPos = mpLBAnimation->InsertEntry( sdr::GetResourceString(STR_ObjNameSingulFREELINE) ); + mnCurvePathPos = mpLBAnimation->InsertEntry( SvxResId(STR_ObjNameSingulCOMBLINE) ); + mnPolygonPathPos = mpLBAnimation->InsertEntry( SvxResId(STR_ObjNameSingulPOLY) ); + mnFreeformPathPos = mpLBAnimation->InsertEntry( SvxResId(STR_ObjNameSingulFREELINE) ); } while(aCategoryIter != aCategoryEnd) diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx index 24479d6e8a06..b1ab9536c7d8 100644 --- a/svx/source/svdraw/svdetc.cxx +++ b/svx/source/svdraw/svdetc.cxx @@ -358,14 +358,6 @@ OUString ImpGetResStr(const char* pResID) return SvxResId(pResID); } -namespace sdr -{ - OUString GetResourceString(const char* pResID) - { - return ImpGetResStr(pResID); - } -} - bool SearchOutlinerItems(const SfxItemSet& rSet, bool bInklDefaults, bool* pbOnlyEE) { bool bHas=false; |