strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

convert SDR_TRISTATE to TriState

Browse source 
Change-Id: Iac440d313006d01667e433bea97925ccaa9282da
Reviewed-on: https://gerrit.libreoffice.org/43084
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin 2017-10-03 15:38:57 +02:00
parent c96fb68d95
commit e5c91797d3
4 changed files with 22 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/svx/svdglev.hxx
View file

@ -48,12 +48,12 @@ public:
// which one wished to check,set or delete
// possible values for nThisEsc are:
// SdrEscapeDirection::LEFT, SdrEscapeDirection::RIGHT, SdrEscapeDirection::TOP and SdrEscapeDirection::BOTTOM
SDR_TRISTATE IsMarkedGluePointsEscDir(SdrEscapeDirection nThisEsc) const;
TriState IsMarkedGluePointsEscDir(SdrEscapeDirection nThisEsc) const;
void SetMarkedGluePointsEscDir(SdrEscapeDirection nThisEsc, bool bOn);
// check/set, if the GluePoints are relative to the
// object size (Percent=sal_True) or not (Percent=sal_False)
SDR_TRISTATE IsMarkedGluePointsPercent() const;
TriState IsMarkedGluePointsPercent() const;
void SetMarkedGluePointsPercent(bool bOn);
// bVert=FALSE: check/set hotizontal alignment

4
include/svx/svdpntv.hxx
View file

@ -69,9 +69,7 @@ enum class SdrAnimationMode
};
// Typedefs and defines
typedef unsigned char SDR_TRISTATE;
#define FUZZY (2)
// defines
#define SDR_ANYFORMAT (0xFFFFFFFF)
#define SDR_ANYITEM (0xFFFF)
#define SDRVIEWWIN_NOTFOUND (0xFFFF)

2
sd/source/ui/view/drviews7.cxx
View file

@ -479,7 +479,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
SfxItemState::DEFAULT == rSet.GetItemState( SID_GLUE_VERTALIGN_BOTTOM ) )
{
// percent
SDR_TRISTATE eState = mpDrawView->IsMarkedGluePointsPercent();
TriState eState = mpDrawView->IsMarkedGluePointsPercent();
if( eState == TRISTATE_INDET )
rSet.InvalidateItem( SID_GLUE_PERCENT );
else

32
svx/source/svdraw/svdglev.cxx
View file

@ -85,26 +85,26 @@ void SdrGlueEditView::ImpDoMarkedGluePoints(PGlueDoFunc pDoFunc, bool bConst, co
static void ImpGetEscDir(SdrGluePoint & rGP, const SdrObject* /*pObj*/, const void* pbFirst, const void* pnThisEsc, const void* pnRet, const void*)
{
sal_uInt16& nRet=*const_cast<sal_uInt16 *>(static_cast<sal_uInt16 const *>(pnRet));
if (nRet!=FUZZY) {
TriState& nRet=*const_cast<TriState *>(static_cast<TriState const *>(pnRet));
if (nRet!=TRISTATE_INDET) {
SdrEscapeDirection nEsc = rGP.GetEscDir();
bool bOn = bool(nEsc & *static_cast<SdrEscapeDirection const *>(pnThisEsc));
bool& bFirst=*const_cast<bool *>(static_cast<bool const *>(pbFirst));
if (bFirst) {
nRet = bOn ? 1 : 0;
nRet = bOn ? TRISTATE_TRUE : TRISTATE_FALSE;
bFirst = false;
}
else if (nRet != (bOn ? 1 : 0)) nRet=FUZZY;
else if (nRet != (bOn ? TRISTATE_TRUE : TRISTATE_FALSE)) nRet=TRISTATE_INDET;
}
}
SDR_TRISTATE SdrGlueEditView::IsMarkedGluePointsEscDir(SdrEscapeDirection nThisEsc) const
TriState SdrGlueEditView::IsMarkedGluePointsEscDir(SdrEscapeDirection nThisEsc) const
{
ForceUndirtyMrkPnt();
bool bFirst=true;
sal_uInt16 nRet=0;
TriState nRet=TRISTATE_FALSE;
const_cast<SdrGlueEditView*>(this)->ImpDoMarkedGluePoints(ImpGetEscDir,true,&bFirst,&nThisEsc,&nRet);
return (SDR_TRISTATE)nRet;
return nRet;
}
static void ImpSetEscDir(SdrGluePoint& rGP, const SdrObject* /*pObj*/, const void* pnThisEsc, const void* pbOn, const void*, const void*)
@ -128,22 +128,26 @@ void SdrGlueEditView::SetMarkedGluePointsEscDir(SdrEscapeDirection nThisEsc, boo
static void ImpGetPercent(SdrGluePoint & rGP, const SdrObject* /*pObj*/, const void* pbFirst, const void* pnRet, const void*, const void*)
{
sal_uInt16& nRet=*const_cast<sal_uInt16 *>(static_cast<sal_uInt16 const *>(pnRet));
if (nRet!=FUZZY) {
TriState& nRet=*const_cast<TriState *>(static_cast<TriState const *>(pnRet));
if (nRet!=TRISTATE_INDET) {
bool bOn=rGP.IsPercent();
bool& bFirst=*const_cast<bool *>(static_cast<bool const *>(pbFirst));
if (bFirst) { nRet=sal_uInt16(bOn); bFirst=false; }
else if ((nRet!=0)!=bOn) nRet=FUZZY;
if (bFirst) {
nRet = bOn ? TRISTATE_TRUE : TRISTATE_FALSE;
bFirst = false;
}
else if ((nRet!=TRISTATE_FALSE)!=bOn)
nRet=TRISTATE_INDET;
}
}
SDR_TRISTATE SdrGlueEditView::IsMarkedGluePointsPercent() const
TriState SdrGlueEditView::IsMarkedGluePointsPercent() const
{
ForceUndirtyMrkPnt();
bool bFirst=true;
sal_uInt16 nRet=sal_uInt16(true);
TriState nRet = TRISTATE_TRUE;
const_cast<SdrGlueEditView*>(this)->ImpDoMarkedGluePoints(ImpGetPercent,true,&bFirst,&nRet);
return (SDR_TRISTATE)nRet;
return nRet;
}
static void ImpSetPercent(SdrGluePoint& rGP, const SdrObject* pObj, const void* pbOn, const void*, const void*, const void*)