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 /include | |
| parent | 69bf37136c1386c7220f38a896aa9865bdae665f (diff) | |
-Werror=shadow
Change-Id: I940661c947307dc5dea371e5e6f9a9aedbfc904d
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/svdglev.hxx | 4 | ||||
| -rw-r--r-- | include/svx/svdpntv.hxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/svx/svdglev.hxx b/include/svx/svdglev.hxx index a7dd3f361886..75bd5900d601 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 16bdc9d93136..54df1af32fef 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) |