diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-10-19 12:02:47 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-10-19 12:02:47 +0200 |
| commit | ddac8522821ae288d4ce1533f9ebe8daf9e2d935 (patch) | |
| tree | 1b046f6fb03f94a5a7fab73b00b8de440cf203ca /svx | |
| parent | 69bf37136c1386c7220f38a896aa9865bdae665f (diff) | |
-Werror=shadow
Change-Id: I940661c947307dc5dea371e5e6f9a9aedbfc904d
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/svdraw/svdglev.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/svx/source/svdraw/svdglev.cxx b/svx/source/svdraw/svdglev.cxx index af7f705d0b29..31a3509ca738 100644 --- a/svx/source/svdraw/svdglev.cxx +++ b/svx/source/svdraw/svdglev.cxx @@ -106,13 +106,13 @@ static void ImpGetEscDir(SdrGluePoint& rGP, const SdrObject* /*pObj*/, const voi } } -TRISTATE SdrGlueEditView::IsMarkedGluePointsEscDir(sal_uInt16 nThisEsc) const +SDR_TRISTATE SdrGlueEditView::IsMarkedGluePointsEscDir(sal_uInt16 nThisEsc) const { ForceUndirtyMrkPnt(); bool bFirst=true; sal_uInt16 nRet=0; ((SdrGlueEditView*)this)->ImpDoMarkedGluePoints(ImpGetEscDir,true,&bFirst,&nThisEsc,&nRet); - return (TRISTATE)nRet; + return (SDR_TRISTATE)nRet; } static void ImpSetEscDir(SdrGluePoint& rGP, const SdrObject* /*pObj*/, const void* pnThisEsc, const void* pbOn, const void*, const void*, const void*) @@ -144,13 +144,13 @@ static void ImpGetPercent(SdrGluePoint& rGP, const SdrObject* /*pObj*/, const vo } } -TRISTATE SdrGlueEditView::IsMarkedGluePointsPercent() const +SDR_TRISTATE SdrGlueEditView::IsMarkedGluePointsPercent() const { ForceUndirtyMrkPnt(); bool bFirst=true; sal_uInt16 nRet=sal_True; ((SdrGlueEditView*)this)->ImpDoMarkedGluePoints(ImpGetPercent,true,&bFirst,&nRet); - return (TRISTATE)nRet; + return (SDR_TRISTATE)nRet; } static void ImpSetPercent(SdrGluePoint& rGP, const SdrObject* pObj, const void* pbOn, const void*, const void*, const void*, const void*) |