include/svx/svdglev.hxx | 4 ++--
include/svx/svdpntv.hxx | 2 +-
sd/source/ui/view/drviews7.cxx | 2 +-
svx/source/svdraw/svdglev.cxx | 8 ++++----
4 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit ddac8522821ae288d4ce1533f9ebe8daf9e2d935
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Sun Oct 19 12:02:47 2014 +0200
-Werror=shadow
Change-Id: I940661c947307dc5dea371e5e6f9a9aedbfc904d
diff --git a/include/svx/svdglev.hxx b/include/svx/svdglev.hxx
index a7dd3f3..75bd590 100644
--- a/include/svx/svdglev.hxx
+++ b/include/svx/svdglev.hxx
@@ -50,13 +50,13 @@ public:
// checken bzw. setzen/loeschen will.
// Moegliche Werte fuer nThisEsc sind z.Zt.
// SDRESC_LEFT, SDRESC_RIGHT, SDRESC_TOP und SDRESC_BOTTOM
- TRISTATE IsMarkedGluePointsEscDir(sal_uInt16 nThisEsc) const;
+ SDR_TRISTATE IsMarkedGluePointsEscDir(sal_uInt16 nThisEsc) const;
void SetMarkedGluePointsEscDir(sal_uInt16 nThisEsc, bool bOn);
bool IsSetMarkedGluePointsEscDirPossible() const { return !IsReadOnly() &&
HasMarkedGluePoints(); }
// Checken/setzen, ob die Klebepunktpositionen relativ zur
// Objektgroesse sind (Percent=sal_True) oder nicht (Percent=sal_False)
- TRISTATE IsMarkedGluePointsPercent() const;
+ SDR_TRISTATE IsMarkedGluePointsPercent() const;
void SetMarkedGluePointsPercent(bool bOn);
bool IsSetMarkedGluePointsPercentPossible() const { return !IsReadOnly()
&& HasMarkedGluePoints(); }
diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx
index 16bdc9d..54df1af 100644
--- a/include/svx/svdpntv.hxx
+++ b/include/svx/svdpntv.hxx
@@ -76,7 +76,7 @@ enum SdrAnimationMode
// Typedef's und defines
-typedef unsigned char TRISTATE;
+typedef unsigned char SDR_TRISTATE;
#define FUZZY (2)
#define SDR_ANYFORMAT (0xFFFFFFFF)
#define SDR_ANYITEM (0xFFFF)
diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx
index c47b4a1..6a57586 100644
--- a/sd/source/ui/view/drviews7.cxx
+++ b/sd/source/ui/view/drviews7.cxx
@@ -461,7 +461,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
SfxItemState::DEFAULT == rSet.GetItemState( SID_GLUE_VERTALIGN_BOTTOM
) )
{
// percent
- TRISTATE eState = mpDrawView->IsMarkedGluePointsPercent();
+ SDR_TRISTATE eState = mpDrawView->IsMarkedGluePointsPercent();
if( eState == TRISTATE_INDET )
rSet.InvalidateItem( SID_GLUE_PERCENT );
else
diff --git a/svx/source/svdraw/svdglev.cxx b/svx/source/svdraw/svdglev.cxx
index af7f705..31a3509 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*)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
