summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cui/source/tabpages/border.cxx36
-rw-r--r--cui/source/tabpages/borderconn.cxx2
-rw-r--r--include/svx/frmsel.hxx8
-rw-r--r--svx/source/dialog/frmsel.cxx50
-rw-r--r--svx/source/inc/frmselimpl.hxx2
5 files changed, 49 insertions, 49 deletions
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index e28f03fc57cb..fabe2774dec9 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -709,10 +709,10 @@ bool SvxBorderTabPage::FillItemSet( SfxItemSet* rCoreAttrs )
if ( ((mbHorEnabled || mbVerEnabled || (nSWMode & SwBorderModes::TABLE)) &&
(m_pLeftMF->IsModified()||m_pRightMF->IsModified()||
m_pTopMF->IsModified()||m_pBottomMF->IsModified()) )||
- m_pFrameSel->GetFrameBorderState( svx::FRAMEBORDER_TOP ) != svx::FRAMESTATE_HIDE
- || m_pFrameSel->GetFrameBorderState( svx::FRAMEBORDER_BOTTOM ) != svx::FRAMESTATE_HIDE
- || m_pFrameSel->GetFrameBorderState( svx::FRAMEBORDER_LEFT ) != svx::FRAMESTATE_HIDE
- || m_pFrameSel->GetFrameBorderState( svx::FRAMEBORDER_RIGHT ) != svx::FRAMESTATE_HIDE )
+ m_pFrameSel->GetFrameBorderState( svx::FRAMEBORDER_TOP ) != svx::FrameBorderState::Hide
+ || m_pFrameSel->GetFrameBorderState( svx::FRAMEBORDER_BOTTOM ) != svx::FrameBorderState::Hide
+ || m_pFrameSel->GetFrameBorderState( svx::FRAMEBORDER_LEFT ) != svx::FrameBorderState::Hide
+ || m_pFrameSel->GetFrameBorderState( svx::FRAMEBORDER_RIGHT ) != svx::FrameBorderState::Hide )
{
const SvxBoxInfoItem* pOldBoxInfoItem = static_cast<const SvxBoxInfoItem*>(GetOldItem(
*rCoreAttrs, SID_ATTR_BORDER_INNER ));
@@ -752,12 +752,12 @@ bool SvxBorderTabPage::FillItemSet( SfxItemSet* rCoreAttrs )
// note Don't Care Status in the Info-Item:
- aBoxInfoItem.SetValid( SvxBoxInfoItemValidFlags::TOP, m_pFrameSel->GetFrameBorderState( svx::FRAMEBORDER_TOP ) != svx::FRAMESTATE_DONTCARE );
- aBoxInfoItem.SetValid( SvxBoxInfoItemValidFlags::BOTTOM, m_pFrameSel->GetFrameBorderState( svx::FRAMEBORDER_BOTTOM ) != svx::FRAMESTATE_DONTCARE );
- aBoxInfoItem.SetValid( SvxBoxInfoItemValidFlags::LEFT, m_pFrameSel->GetFrameBorderState( svx::FRAMEBORDER_LEFT ) != svx::FRAMESTATE_DONTCARE );
- aBoxInfoItem.SetValid( SvxBoxInfoItemValidFlags::RIGHT, m_pFrameSel->GetFrameBorderState( svx::FRAMEBORDER_RIGHT ) != svx::FRAMESTATE_DONTCARE );
- aBoxInfoItem.SetValid( SvxBoxInfoItemValidFlags::HORI, m_pFrameSel->GetFrameBorderState( svx::FRAMEBORDER_HOR ) != svx::FRAMESTATE_DONTCARE );
- aBoxInfoItem.SetValid( SvxBoxInfoItemValidFlags::VERT, m_pFrameSel->GetFrameBorderState( svx::FRAMEBORDER_VER ) != svx::FRAMESTATE_DONTCARE );
+ aBoxInfoItem.SetValid( SvxBoxInfoItemValidFlags::TOP, m_pFrameSel->GetFrameBorderState( svx::FRAMEBORDER_TOP ) != svx::FrameBorderState::DontCare );
+ aBoxInfoItem.SetValid( SvxBoxInfoItemValidFlags::BOTTOM, m_pFrameSel->GetFrameBorderState( svx::FRAMEBORDER_BOTTOM ) != svx::FrameBorderState::DontCare );
+ aBoxInfoItem.SetValid( SvxBoxInfoItemValidFlags::LEFT, m_pFrameSel->GetFrameBorderState( svx::FRAMEBORDER_LEFT ) != svx::FrameBorderState::DontCare );
+ aBoxInfoItem.SetValid( SvxBoxInfoItemValidFlags::RIGHT, m_pFrameSel->GetFrameBorderState( svx::FRAMEBORDER_RIGHT ) != svx::FrameBorderState::DontCare );
+ aBoxInfoItem.SetValid( SvxBoxInfoItemValidFlags::HORI, m_pFrameSel->GetFrameBorderState( svx::FRAMEBORDER_HOR ) != svx::FrameBorderState::DontCare );
+ aBoxInfoItem.SetValid( SvxBoxInfoItemValidFlags::VERT, m_pFrameSel->GetFrameBorderState( svx::FRAMEBORDER_VER ) != svx::FrameBorderState::DontCare );
// Put or Clear of the border?
@@ -811,9 +811,9 @@ void SvxBorderTabPage::HideShadowControls()
IMPL_LINK_NOARG_TYPED(SvxBorderTabPage, SelPreHdl_Impl, ValueSet*, void)
{
- const svx::FrameBorderState SHOW = svx::FRAMESTATE_SHOW;
- const svx::FrameBorderState HIDE = svx::FRAMESTATE_HIDE;
- const svx::FrameBorderState DONT = svx::FRAMESTATE_DONTCARE;
+ const svx::FrameBorderState SHOW = svx::FrameBorderState::Show;
+ const svx::FrameBorderState HIDE = svx::FrameBorderState::Hide;
+ const svx::FrameBorderState DONT = svx::FrameBorderState::DontCare;
static const svx::FrameBorderState ppeStates[][ svx::FRAMEBORDERTYPE_COUNT ] =
{ /* Left Right Top Bot Hor Ver TLBR BLTR */
@@ -1180,10 +1180,10 @@ IMPL_LINK_NOARG_TYPED(SvxBorderTabPage, LinesChanged_Impl, LinkParamNone*, void)
{
if(bLineSet)
{
- nValid = (m_pFrameSel->GetFrameBorderState( svx::FRAMEBORDER_TOP) == svx::FRAMESTATE_SHOW) ? SvxBoxInfoItemValidFlags::TOP : SvxBoxInfoItemValidFlags::NONE;
- nValid |= (m_pFrameSel->GetFrameBorderState( svx::FRAMEBORDER_BOTTOM) == svx::FRAMESTATE_SHOW) ? SvxBoxInfoItemValidFlags::BOTTOM : SvxBoxInfoItemValidFlags::NONE;
- nValid |= (m_pFrameSel->GetFrameBorderState( svx::FRAMEBORDER_LEFT) == svx::FRAMESTATE_SHOW) ? SvxBoxInfoItemValidFlags::LEFT : SvxBoxInfoItemValidFlags::NONE;
- nValid |= (m_pFrameSel->GetFrameBorderState( svx::FRAMEBORDER_RIGHT ) == svx::FRAMESTATE_SHOW) ? SvxBoxInfoItemValidFlags::RIGHT : SvxBoxInfoItemValidFlags::NONE;
+ nValid = (m_pFrameSel->GetFrameBorderState( svx::FRAMEBORDER_TOP) == svx::FrameBorderState::Show) ? SvxBoxInfoItemValidFlags::TOP : SvxBoxInfoItemValidFlags::NONE;
+ nValid |= (m_pFrameSel->GetFrameBorderState( svx::FRAMEBORDER_BOTTOM) == svx::FrameBorderState::Show) ? SvxBoxInfoItemValidFlags::BOTTOM : SvxBoxInfoItemValidFlags::NONE;
+ nValid |= (m_pFrameSel->GetFrameBorderState( svx::FRAMEBORDER_LEFT) == svx::FrameBorderState::Show) ? SvxBoxInfoItemValidFlags::LEFT : SvxBoxInfoItemValidFlags::NONE;
+ nValid |= (m_pFrameSel->GetFrameBorderState( svx::FRAMEBORDER_RIGHT ) == svx::FrameBorderState::Show) ? SvxBoxInfoItemValidFlags::RIGHT : SvxBoxInfoItemValidFlags::NONE;
}
else
nValid = SvxBoxInfoItemValidFlags::NONE;
@@ -1257,7 +1257,7 @@ void SvxBorderTabPage::UpdateRemoveAdjCellBorderCB( sal_uInt16 nPreset )
{
if( pOldBoxItem->GetLine( eTypes2[i] ) || !( pOldBoxInfoItem->IsValid( eTypes1[i].second ) ) )
{
- if( m_pFrameSel->GetFrameBorderState( eTypes1[i].first ) == svx::FRAMESTATE_HIDE )
+ if( m_pFrameSel->GetFrameBorderState( eTypes1[i].first ) == svx::FrameBorderState::Hide )
{
bBorderDeletionReq = true;
break;
diff --git a/cui/source/tabpages/borderconn.cxx b/cui/source/tabpages/borderconn.cxx
index 3f5019a50b98..6d16ab177131 100644
--- a/cui/source/tabpages/borderconn.cxx
+++ b/cui/source/tabpages/borderconn.cxx
@@ -70,7 +70,7 @@ private:
bool FrameSelectorWrapper::IsControlDontKnow() const
{
- return GetControl().GetFrameBorderState( meBorder ) == FRAMESTATE_DONTCARE;
+ return GetControl().GetFrameBorderState( meBorder ) == FrameBorderState::DontCare;
}
void FrameSelectorWrapper::SetControlDontKnow( bool bSet )
diff --git a/include/svx/frmsel.hxx b/include/svx/frmsel.hxx
index 605d87f48801..7e3bff21f619 100644
--- a/include/svx/frmsel.hxx
+++ b/include/svx/frmsel.hxx
@@ -69,11 +69,11 @@ const FrameSelFlags FRAMESEL_DONTCARE = 0x0100;
/** All possible states of a frame border. */
-enum FrameBorderState
+enum class FrameBorderState
{
- FRAMESTATE_SHOW, /// Frame border has a visible style.
- FRAMESTATE_HIDE, /// Frame border is hidden (off).
- FRAMESTATE_DONTCARE /// Frame border is in don't care state (if enabled).
+ Show, /// Frame border has a visible style.
+ Hide, /// Frame border is hidden (off).
+ DontCare /// Frame border is in don't care state (if enabled).
};
diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx
index 9f5e9cfe752a..ec724b7a2379 100644
--- a/svx/source/dialog/frmsel.cxx
+++ b/svx/source/dialog/frmsel.cxx
@@ -108,7 +108,7 @@ inline void lclPolyPolyUnion( tools::PolyPolygon& rDest, const tools::PolyPolygo
FrameBorder::FrameBorder( FrameBorderType eType ) :
meType( eType ),
- meState( FRAMESTATE_HIDE ),
+ meState( FrameBorderState::Hide ),
meKeyLeft( FRAMEBORDER_NONE ),
meKeyRight( FRAMEBORDER_NONE ),
meKeyTop( FRAMEBORDER_NONE ),
@@ -122,7 +122,7 @@ void FrameBorder::Enable( FrameSelFlags nFlags )
{
mbEnabled = (nFlags & lclGetFlagFromType( meType )) != 0;
if( !mbEnabled )
- SetState( FRAMESTATE_HIDE );
+ SetState( FrameBorderState::Hide );
}
void FrameBorder::SetCoreStyle( const SvxBorderLine* pStyle )
@@ -134,7 +134,7 @@ void FrameBorder::SetCoreStyle( const SvxBorderLine* pStyle )
// from twips to points
maUIStyle.Set( maCoreStyle, 0.05, FRAMESEL_GEOM_WIDTH );
- meState = maUIStyle.Prim() ? FRAMESTATE_SHOW : FRAMESTATE_HIDE;
+ meState = maUIStyle.Prim() ? FrameBorderState::Show : FrameBorderState::Hide;
}
void FrameBorder::SetState( FrameBorderState eState )
@@ -142,14 +142,14 @@ void FrameBorder::SetState( FrameBorderState eState )
meState = eState;
switch( meState )
{
- case FRAMESTATE_SHOW:
+ case FrameBorderState::Show:
SAL_WARN( "svx.dialog", "svx::FrameBorder::SetState - use SetCoreStyle to make border visible" );
break;
- case FRAMESTATE_HIDE:
+ case FrameBorderState::Hide:
maCoreStyle = SvxBorderLine();
maUIStyle.Clear();
break;
- case FRAMESTATE_DONTCARE:
+ case FrameBorderState::DontCare:
maCoreStyle = SvxBorderLine();
maUIStyle = frame::Style(3, 0, 0, table::BorderLineStyle::SOLID); //OBJ_FRAMESTYLE_DONTCARE
break;
@@ -610,8 +610,8 @@ void FrameSelectorImpl::DrawAllFrameBorders()
// Translate core colors to current UI colors (regards current background and HC mode).
for( FrameBorderIter aIt( maEnabBorders ); aIt.Is(); ++aIt )
{
- Color aCoreColorPrim = ((*aIt)->GetState() == FRAMESTATE_DONTCARE) ? maMarkCol : (*aIt)->GetCoreStyle().GetColorOut();
- Color aCoreColorSecn = ((*aIt)->GetState() == FRAMESTATE_DONTCARE) ? maMarkCol : (*aIt)->GetCoreStyle().GetColorIn();
+ Color aCoreColorPrim = ((*aIt)->GetState() == FrameBorderState::DontCare) ? maMarkCol : (*aIt)->GetCoreStyle().GetColorOut();
+ Color aCoreColorSecn = ((*aIt)->GetState() == FrameBorderState::DontCare) ? maMarkCol : (*aIt)->GetCoreStyle().GetColorIn();
(*aIt)->SetUIColorPrim( GetDrawLineColor( aCoreColorPrim ) );
(*aIt)->SetUIColorSecn( GetDrawLineColor( aCoreColorSecn ) );
}
@@ -709,7 +709,7 @@ void FrameSelectorImpl::SetBorderState( FrameBorder& rBorder, FrameBorderState e
DBG_ASSERT( rBorder.IsEnabled(), "svx::FrameSelectorImpl::SetBorderState - access to disabled border" );
Any aOld;
Any aNew;
- Any& rMod = eState == FRAMESTATE_SHOW ? aNew : aOld;
+ Any& rMod = eState == FrameBorderState::Show ? aNew : aOld;
rMod <<= AccessibleStateType::CHECKED;
Reference< XAccessible > xRet;
size_t nVecIdx = static_cast< size_t >( rBorder.GetType() );
@@ -717,7 +717,7 @@ void FrameSelectorImpl::SetBorderState( FrameBorder& rBorder, FrameBorderState e
xRet = mxChildVec[ --nVecIdx ];
a11y::AccFrameSelector* pFrameSelector = static_cast<a11y::AccFrameSelector*>(xRet.get());
- if( eState == FRAMESTATE_SHOW )
+ if( eState == FrameBorderState::Show )
SetBorderCoreStyle( rBorder, &maCurrStyle );
else
rBorder.SetState( eState );
@@ -739,14 +739,14 @@ void FrameSelectorImpl::ToggleBorderState( FrameBorder& rBorder )
switch( rBorder.GetState() )
{
// same order as tristate check box: visible -> don't care -> hidden
- case FRAMESTATE_SHOW:
- SetBorderState( rBorder, bDontCare ? FRAMESTATE_DONTCARE : FRAMESTATE_HIDE );
+ case FrameBorderState::Show:
+ SetBorderState( rBorder, bDontCare ? FrameBorderState::DontCare : FrameBorderState::Hide );
break;
- case FRAMESTATE_HIDE:
- SetBorderState( rBorder, FRAMESTATE_SHOW );
+ case FrameBorderState::Hide:
+ SetBorderState( rBorder, FrameBorderState::Show );
break;
- case FRAMESTATE_DONTCARE:
- SetBorderState( rBorder, FRAMESTATE_HIDE );
+ case FrameBorderState::DontCare:
+ SetBorderState( rBorder, FrameBorderState::Hide );
break;
}
}
@@ -863,21 +863,21 @@ void FrameSelector::ShowBorder( FrameBorderType eBorder, const SvxBorderLine* pS
void FrameSelector::SetBorderDontCare( FrameBorderType eBorder )
{
- mxImpl->SetBorderState( mxImpl->GetBorderAccess( eBorder ), FRAMESTATE_DONTCARE );
+ mxImpl->SetBorderState( mxImpl->GetBorderAccess( eBorder ), FrameBorderState::DontCare );
}
bool FrameSelector::IsAnyBorderVisible() const
{
bool bIsSet = false;
for( FrameBorderCIter aIt( mxImpl->maEnabBorders ); !bIsSet && aIt.Is(); ++aIt )
- bIsSet = ((*aIt)->GetState() == FRAMESTATE_SHOW);
+ bIsSet = ((*aIt)->GetState() == FrameBorderState::Show);
return bIsSet;
}
void FrameSelector::HideAllBorders()
{
for( FrameBorderIter aIt( mxImpl->maEnabBorders ); aIt.Is(); ++aIt )
- mxImpl->SetBorderState( **aIt, FRAMESTATE_HIDE );
+ mxImpl->SetBorderState( **aIt, FrameBorderState::Hide );
}
bool FrameSelector::GetVisibleWidth( long& rnWidth, SvxBorderStyle& rnStyle ) const
@@ -976,14 +976,14 @@ void FrameSelector::SetStyleToSelection( long nWidth, SvxBorderStyle nStyle )
mxImpl->maCurrStyle.SetBorderLineStyle( nStyle );
mxImpl->maCurrStyle.SetWidth( nWidth );
for( SelFrameBorderIter aIt( mxImpl->maEnabBorders ); aIt.Is(); ++aIt )
- mxImpl->SetBorderState( **aIt, FRAMESTATE_SHOW );
+ mxImpl->SetBorderState( **aIt, FrameBorderState::Show );
}
void FrameSelector::SetColorToSelection( const Color& rColor )
{
mxImpl->maCurrStyle.SetColor( rColor );
for( SelFrameBorderIter aIt( mxImpl->maEnabBorders ); aIt.Is(); ++aIt )
- mxImpl->SetBorderState( **aIt, FRAMESTATE_SHOW );
+ mxImpl->SetBorderState( **aIt, FrameBorderState::Show );
}
// accessibility
@@ -1101,8 +1101,8 @@ void FrameSelector::MouseButtonDown( const MouseEvent& rMEvt )
else
{
// hide a "don't care" frame border only if it is not clicked
- if( bHideDontCare && ((*aIt)->GetState() == FRAMESTATE_DONTCARE) )
- mxImpl->SetBorderState( **aIt, FRAMESTATE_HIDE );
+ if( bHideDontCare && ((*aIt)->GetState() == FrameBorderState::DontCare) )
+ mxImpl->SetBorderState( **aIt, FrameBorderState::Hide );
// deselect frame borders not clicked (if SHIFT or CTRL are not pressed)
if( !rMEvt.IsShift() && !rMEvt.IsMod1() )
@@ -1121,7 +1121,7 @@ void FrameSelector::MouseButtonDown( const MouseEvent& rMEvt )
// new frame border selected, selection extended, or selected borders different? -> show
for( SelFrameBorderIter aIt( mxImpl->maEnabBorders ); aIt.Is(); ++aIt )
// SetBorderState() sets current style and color to the frame border
- mxImpl->SetBorderState( **aIt, FRAMESTATE_SHOW );
+ mxImpl->SetBorderState( **aIt, FrameBorderState::Show );
}
else
{
@@ -1216,7 +1216,7 @@ void FrameSelector::GetFocus()
SelectBorder(borderType);
}
for( SelFrameBorderIter aIt( mxImpl->maEnabBorders ); aIt.Is(); ++aIt )
- mxImpl->SetBorderState( **aIt, FRAMESTATE_SHOW );
+ mxImpl->SetBorderState( **aIt, FrameBorderState::Show );
Control::GetFocus();
}
diff --git a/svx/source/inc/frmselimpl.hxx b/svx/source/inc/frmselimpl.hxx
index a6dacd4527ce..a74cfd2bc44a 100644
--- a/svx/source/inc/frmselimpl.hxx
+++ b/svx/source/inc/frmselimpl.hxx
@@ -230,7 +230,7 @@ struct FrameBorderDummy_Pred
/** Predicate for frame border iterators to use only visible borders in a container. */
struct FrameBorderVisible_Pred
{
- inline bool operator()( const FrameBorder* pBorder ) const { return pBorder->GetState() == FRAMESTATE_SHOW; }
+ inline bool operator()( const FrameBorder* pBorder ) const { return pBorder->GetState() == FrameBorderState::Show; }
};
/** Predicate for frame border iterators to use only selected borders in a container. */
generated by cgit (git 2.34.1) at 2025-02-03 20:43:11 +0000