Kaydet (Commit) ddac8522 authored tarafından Miklos Vajna's avatar Miklos Vajna

-Werror=shadow

Change-Id: I940661c947307dc5dea371e5e6f9a9aedbfc904d
üst 69bf3713
...@@ -50,13 +50,13 @@ public: ...@@ -50,13 +50,13 @@ public:
// checken bzw. setzen/loeschen will. // checken bzw. setzen/loeschen will.
// Moegliche Werte fuer nThisEsc sind z.Zt. // Moegliche Werte fuer nThisEsc sind z.Zt.
// SDRESC_LEFT, SDRESC_RIGHT, SDRESC_TOP und SDRESC_BOTTOM // 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); void SetMarkedGluePointsEscDir(sal_uInt16 nThisEsc, bool bOn);
bool IsSetMarkedGluePointsEscDirPossible() const { return !IsReadOnly() && HasMarkedGluePoints(); } bool IsSetMarkedGluePointsEscDirPossible() const { return !IsReadOnly() && HasMarkedGluePoints(); }
// Checken/setzen, ob die Klebepunktpositionen relativ zur // Checken/setzen, ob die Klebepunktpositionen relativ zur
// Objektgroesse sind (Percent=sal_True) oder nicht (Percent=sal_False) // Objektgroesse sind (Percent=sal_True) oder nicht (Percent=sal_False)
TRISTATE IsMarkedGluePointsPercent() const; SDR_TRISTATE IsMarkedGluePointsPercent() const;
void SetMarkedGluePointsPercent(bool bOn); void SetMarkedGluePointsPercent(bool bOn);
bool IsSetMarkedGluePointsPercentPossible() const { return !IsReadOnly() && HasMarkedGluePoints(); } bool IsSetMarkedGluePointsPercentPossible() const { return !IsReadOnly() && HasMarkedGluePoints(); }
......
...@@ -76,7 +76,7 @@ enum SdrAnimationMode ...@@ -76,7 +76,7 @@ enum SdrAnimationMode
// Typedef's und defines // Typedef's und defines
typedef unsigned char TRISTATE; typedef unsigned char SDR_TRISTATE;
#define FUZZY (2) #define FUZZY (2)
#define SDR_ANYFORMAT (0xFFFFFFFF) #define SDR_ANYFORMAT (0xFFFFFFFF)
#define SDR_ANYITEM (0xFFFF) #define SDR_ANYITEM (0xFFFF)
......
...@@ -461,7 +461,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) ...@@ -461,7 +461,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
SfxItemState::DEFAULT == rSet.GetItemState( SID_GLUE_VERTALIGN_BOTTOM ) ) SfxItemState::DEFAULT == rSet.GetItemState( SID_GLUE_VERTALIGN_BOTTOM ) )
{ {
// percent // percent
TRISTATE eState = mpDrawView->IsMarkedGluePointsPercent(); SDR_TRISTATE eState = mpDrawView->IsMarkedGluePointsPercent();
if( eState == TRISTATE_INDET ) if( eState == TRISTATE_INDET )
rSet.InvalidateItem( SID_GLUE_PERCENT ); rSet.InvalidateItem( SID_GLUE_PERCENT );
else else
......
...@@ -106,13 +106,13 @@ static void ImpGetEscDir(SdrGluePoint& rGP, const SdrObject* /*pObj*/, const voi ...@@ -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(); ForceUndirtyMrkPnt();
bool bFirst=true; bool bFirst=true;
sal_uInt16 nRet=0; sal_uInt16 nRet=0;
((SdrGlueEditView*)this)->ImpDoMarkedGluePoints(ImpGetEscDir,true,&bFirst,&nThisEsc,&nRet); ((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*) 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 ...@@ -144,13 +144,13 @@ static void ImpGetPercent(SdrGluePoint& rGP, const SdrObject* /*pObj*/, const vo
} }
} }
TRISTATE SdrGlueEditView::IsMarkedGluePointsPercent() const SDR_TRISTATE SdrGlueEditView::IsMarkedGluePointsPercent() const
{ {
ForceUndirtyMrkPnt(); ForceUndirtyMrkPnt();
bool bFirst=true; bool bFirst=true;
sal_uInt16 nRet=sal_True; sal_uInt16 nRet=sal_True;
((SdrGlueEditView*)this)->ImpDoMarkedGluePoints(ImpGetPercent,true,&bFirst,&nRet); ((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*) static void ImpSetPercent(SdrGluePoint& rGP, const SdrObject* pObj, const void* pbOn, const void*, const void*, const void*, const void*)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment