summaryrefslogtreecommitdiff
path: root/svx/source
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source')
-rw-r--r--svx/source/dialog/charmap.cxx4
-rw-r--r--svx/source/dialog/dialcontrol.cxx7
-rw-r--r--svx/source/dialog/dlgctrl.cxx8
-rw-r--r--svx/source/dialog/fntctrl.cxx4
-rw-r--r--svx/source/fmcomp/gridctrl.cxx16
-rw-r--r--svx/source/sidebar/paragraph/ParaBulletsControl.cxx4
-rw-r--r--svx/source/sidebar/paragraph/ParaNumberingControl.cxx4
-rw-r--r--svx/source/tbxctrls/tbcontrl.cxx4
8 files changed, 27 insertions, 24 deletions
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index 62418f043dd2..b72821245796 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -107,9 +107,9 @@ void SvxShowCharSet::LoseFocus()
void SvxShowCharSet::StateChanged( StateChangedType nType )
{
- if ( nType == STATE_CHANGE_CONTROLFOREGROUND )
+ if ( nType == StateChangedType::CONTROLFOREGROUND )
InitSettings( true, false );
- else if ( nType == STATE_CHANGE_CONTROLBACKGROUND )
+ else if ( nType == StateChangedType::CONTROLBACKGROUND )
InitSettings( false, true );
Control::StateChanged( nType );
diff --git a/svx/source/dialog/dialcontrol.cxx b/svx/source/dialog/dialcontrol.cxx
index c14125ddb0e6..e826363fef4d 100644
--- a/svx/source/dialog/dialcontrol.cxx
+++ b/svx/source/dialog/dialcontrol.cxx
@@ -294,7 +294,7 @@ void DialControl::Paint( const Rectangle& )
void DialControl::StateChanged( StateChangedType nStateChange )
{
- if( nStateChange == STATE_CHANGE_ENABLE )
+ if( nStateChange == StateChangedType::ENABLE )
InvalidateControl();
// update the linked edit field
@@ -303,8 +303,9 @@ void DialControl::StateChanged( StateChangedType nStateChange )
NumericField& rField = *mpImpl->mpLinkField;
switch( nStateChange )
{
- case STATE_CHANGE_VISIBLE: rField.Show( IsVisible() ); break;
- case STATE_CHANGE_ENABLE: rField.Enable( IsEnabled() ); break;
+ case StateChangedType::VISIBLE: rField.Show( IsVisible() ); break;
+ case StateChangedType::ENABLE: rField.Enable( IsEnabled() ); break;
+ default:;
}
}
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index 10b7f40f0679..6290079307d1 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -361,9 +361,9 @@ void SvxRectCtl::KeyInput( const KeyEvent& rKeyEvt )
void SvxRectCtl::StateChanged( StateChangedType nType )
{
- if ( nType == STATE_CHANGE_CONTROLFOREGROUND )
+ if ( nType == StateChangedType::CONTROLFOREGROUND )
InitSettings( true, false );
- else if ( nType == STATE_CHANGE_CONTROLBACKGROUND )
+ else if ( nType == StateChangedType::CONTROLBACKGROUND )
InitSettings( false, true );
Window::StateChanged( nType );
@@ -1899,11 +1899,11 @@ void SvxPreviewBase::StateChanged(StateChangedType nType)
{
Control::StateChanged(nType);
- if(STATE_CHANGE_CONTROLFOREGROUND == nType)
+ if(StateChangedType::CONTROLFOREGROUND == nType)
{
InitSettings(true, false);
}
- else if(STATE_CHANGE_CONTROLBACKGROUND == nType)
+ else if(StateChangedType::CONTROLBACKGROUND == nType)
{
InitSettings(false, true);
}
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index 5e20a83fad8f..fc7656920688 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -522,9 +522,9 @@ SvxFont& SvxFontPrevWindow::GetCJKFont()
void SvxFontPrevWindow::StateChanged( StateChangedType nType )
{
- if ( nType == STATE_CHANGE_CONTROLFOREGROUND )
+ if ( nType == StateChangedType::CONTROLFOREGROUND )
InitSettings( true, false );
- else if ( nType == STATE_CHANGE_CONTROLBACKGROUND )
+ else if ( nType == StateChangedType::CONTROLBACKGROUND )
InitSettings( false, true );
Window::StateChanged( nType );
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index 317e2d1069b8..f651c6385f2d 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -726,7 +726,7 @@ void DbGridControl::NavigationBar::StateChanged( StateChangedType nType )
switch ( nType )
{
- case STATE_CHANGE_MIRRORING:
+ case StateChangedType::MIRRORING:
{
bool bIsRTLEnabled = IsRTLEnabled();
for ( size_t i=0; i < (sizeof (pWindows) / sizeof(pWindows[0])); ++i )
@@ -734,7 +734,7 @@ void DbGridControl::NavigationBar::StateChanged( StateChangedType nType )
}
break;
- case STATE_CHANGE_ZOOM:
+ case StateChangedType::ZOOM:
{
boost::rational<long> aZoom = GetZoom();
@@ -755,6 +755,7 @@ void DbGridControl::NavigationBar::StateChanged( StateChangedType nType )
m_nDefaultWidth = ArrangeControls();
}
break;
+ default:;
}
}
@@ -968,12 +969,12 @@ void DbGridControl::StateChanged( StateChangedType nType )
switch (nType)
{
- case STATE_CHANGE_MIRRORING:
+ case StateChangedType::MIRRORING:
ImplInitWindow( InitWritingMode );
Invalidate();
break;
- case STATE_CHANGE_ZOOM:
+ case StateChangedType::ZOOM:
{
ImplInitWindow( InitFontFacet );
@@ -984,18 +985,19 @@ void DbGridControl::StateChanged( StateChangedType nType )
ReserveControlArea((sal_uInt16)nX);
}
break;
- case STATE_CHANGE_CONTROLFONT:
+ case StateChangedType::CONTROLFONT:
ImplInitWindow( InitFontFacet );
Invalidate();
break;
- case STATE_CHANGE_CONTROLFOREGROUND:
+ case StateChangedType::CONTROLFOREGROUND:
ImplInitWindow( InitForeground );
Invalidate();
break;
- case STATE_CHANGE_CONTROLBACKGROUND:
+ case StateChangedType::CONTROLBACKGROUND:
ImplInitWindow( InitBackground );
Invalidate();
break;
+ default:;
}
}
diff --git a/svx/source/sidebar/paragraph/ParaBulletsControl.cxx b/svx/source/sidebar/paragraph/ParaBulletsControl.cxx
index 268728a4a76e..d33d490a0c6b 100644
--- a/svx/source/sidebar/paragraph/ParaBulletsControl.cxx
+++ b/svx/source/sidebar/paragraph/ParaBulletsControl.cxx
@@ -88,8 +88,8 @@ ParaBulletsControl::~ParaBulletsControl()
void ParaBulletsControl::UpdateValueSet()
{
- maBulletsVS.StateChanged(STATE_CHANGE_STYLE);
- maBulletsVS.StateChanged(STATE_CHANGE_INITSHOW);
+ maBulletsVS.StateChanged(StateChangedType::STYLE);
+ maBulletsVS.StateChanged(StateChangedType::INITSHOW);
const sal_uInt16 nTypeIndex = mrParaPropertyPanel.GetBulletTypeIndex();
if ( nTypeIndex != (sal_uInt16)0xFFFF )
diff --git a/svx/source/sidebar/paragraph/ParaNumberingControl.cxx b/svx/source/sidebar/paragraph/ParaNumberingControl.cxx
index 7125ef9b443a..86fe21f6cb38 100644
--- a/svx/source/sidebar/paragraph/ParaNumberingControl.cxx
+++ b/svx/source/sidebar/paragraph/ParaNumberingControl.cxx
@@ -127,8 +127,8 @@ IMPL_LINK(ParaNumberingControl, MoreButtonClickHdl_Impl, void*, EMPTYARG)
void ParaNumberingControl::UpdateValueSet()
{
- maNumberVS.StateChanged(STATE_CHANGE_STYLE);
- maNumberVS.StateChanged(STATE_CHANGE_INITSHOW);
+ maNumberVS.StateChanged(StateChangedType::STYLE);
+ maNumberVS.StateChanged(StateChangedType::INITSHOW);
const sal_uInt16 nTypeIndex = mrParaPropertyPanel.GetNumTypeIndex();
if ( nTypeIndex != (sal_uInt16)0xFFFF )
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 7d59ac0b2b1c..6900cda8184f 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -535,13 +535,13 @@ void SvxStyleBox_Impl::StateChanged( StateChangedType nStateChange )
{
ComboBox::StateChanged( nStateChange );
- if ( nStateChange == STATE_CHANGE_VISIBLE )
+ if ( nStateChange == StateChangedType::VISIBLE )
{
bVisible = IsReallyVisible();
if ( aVisibilityListener.IsSet() )
aVisibilityListener.Call( this );
}
- else if ( nStateChange == STATE_CHANGE_INITSHOW )
+ else if ( nStateChange == StateChangedType::INITSHOW )
{
bVisible = true;
if ( aVisibilityListener.IsSet() )
generated by cgit (git 2.34.1) at 2025-01-06 09:52:05 +0000