summaryrefslogtreecommitdiff
path: root/svtools/source/control
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2015-05-05 13:46:44 +0200
committerMichael Stahl <mstahl@redhat.com>2015-05-05 15:51:11 +0200
commit8fca0c44e8f21fa2ee1000665856292d5a1c44e9 (patch)
treee750236facc3fd44b051a70aaa0e81be0fc2c002 /svtools/source/control
parentf24590521c5ffea13c0aecdb2f30fdd39bbfbc45 (diff)
vcl: rename other members of StateChangedType for consistency
Change-Id: Ifd3339813e5d3dfb54566fd226aaf2d2a199d59a
Diffstat (limited to 'svtools/source/control')
-rw-r--r--svtools/source/control/calendar.cxx4
-rw-r--r--svtools/source/control/filectrl.cxx12
-rw-r--r--svtools/source/control/headbar.cxx10
-rw-r--r--svtools/source/control/ruler.cxx12
-rw-r--r--svtools/source/control/tabbar.cxx12
-rw-r--r--svtools/source/control/toolbarmenu.cxx2
-rw-r--r--svtools/source/control/valueset.cxx16
7 files changed, 34 insertions, 34 deletions
diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx
index 051c71db7320..6e08841f32e3 100644
--- a/svtools/source/control/calendar.cxx
+++ b/svtools/source/control/calendar.cxx
@@ -1761,7 +1761,7 @@ void Calendar::StateChanged( StateChangedType nType )
{
Control::StateChanged( nType );
- if ( nType == StateChangedType::INITSHOW )
+ if ( nType == StateChangedType::InitShow )
ImplFormat();
}
@@ -2543,7 +2543,7 @@ void CalendarField::StateChanged( StateChangedType nStateChange )
{
DateField::StateChanged( nStateChange );
- if ( ( nStateChange == StateChangedType::STYLE ) && GetSubEdit() )
+ if ( ( nStateChange == StateChangedType::Style ) && GetSubEdit() )
{
WinBits nAllAlignmentBits = ( WB_LEFT | WB_CENTER | WB_RIGHT | WB_TOP | WB_VCENTER | WB_BOTTOM );
WinBits nMyAlignment = GetStyle() & nAllAlignmentBits;
diff --git a/svtools/source/control/filectrl.cxx b/svtools/source/control/filectrl.cxx
index 33b5423eb952..974edbf2f0b7 100644
--- a/svtools/source/control/filectrl.cxx
+++ b/svtools/source/control/filectrl.cxx
@@ -114,21 +114,21 @@ OUString FileControl::GetText() const
void FileControl::StateChanged( StateChangedType nType )
{
- if ( nType == StateChangedType::ENABLE )
+ if ( nType == StateChangedType::Enable )
{
maEdit->Enable( IsEnabled() );
maButton->Enable( IsEnabled() );
}
- else if ( nType == StateChangedType::ZOOM )
+ else if ( nType == StateChangedType::Zoom )
{
GetEdit().SetZoom( GetZoom() );
GetButton().SetZoom( GetZoom() );
}
- else if ( nType == StateChangedType::STYLE )
+ else if ( nType == StateChangedType::Style )
{
SetStyle( ImplInitStyle( GetStyle() ) );
}
- else if ( nType == StateChangedType::CONTROLFONT )
+ else if ( nType == StateChangedType::ControlFont )
{
GetEdit().SetControlFont( GetControlFont() );
// Only use height of the button, as in HTML
@@ -137,12 +137,12 @@ void FileControl::StateChanged( StateChangedType nType )
aFont.SetSize( GetControlFont().GetSize() );
GetButton().SetControlFont( aFont );
}
- else if ( nType == StateChangedType::CONTROLFOREGROUND )
+ else if ( nType == StateChangedType::ControlForeground )
{
GetEdit().SetControlForeground( GetControlForeground() );
GetButton().SetControlForeground( GetControlForeground() );
}
- else if ( nType == StateChangedType::CONTROLBACKGROUND )
+ else if ( nType == StateChangedType::ControlBackground )
{
GetEdit().SetControlBackground( GetControlBackground() );
GetButton().SetControlBackground( GetControlBackground() );
diff --git a/svtools/source/control/headbar.cxx b/svtools/source/control/headbar.cxx
index bb5341661885..01e9445b8adf 100644
--- a/svtools/source/control/headbar.cxx
+++ b/svtools/source/control/headbar.cxx
@@ -1160,20 +1160,20 @@ void HeaderBar::StateChanged( StateChangedType nType )
{
Window::StateChanged( nType );
- if ( nType == StateChangedType::ENABLE )
+ if ( nType == StateChangedType::Enable )
Invalidate();
- else if ( (nType == StateChangedType::ZOOM) ||
- (nType == StateChangedType::CONTROLFONT) )
+ else if ( (nType == StateChangedType::Zoom) ||
+ (nType == StateChangedType::ControlFont) )
{
ImplInitSettings( true, false, false );
Invalidate();
}
- else if ( nType == StateChangedType::CONTROLFOREGROUND )
+ else if ( nType == StateChangedType::ControlForeground )
{
ImplInitSettings( false, true, false );
Invalidate();
}
- else if ( nType == StateChangedType::CONTROLBACKGROUND )
+ else if ( nType == StateChangedType::ControlBackground )
{
ImplInitSettings( false, false, true );
Invalidate();
diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx
index 4b802def8318..ef07e628f2ac 100644
--- a/svtools/source/control/ruler.cxx
+++ b/svtools/source/control/ruler.cxx
@@ -2257,25 +2257,25 @@ void Ruler::StateChanged( StateChangedType nType )
{
Window::StateChanged( nType );
- if ( nType == StateChangedType::INITSHOW )
+ if ( nType == StateChangedType::InitShow )
ImplFormat();
- else if ( nType == StateChangedType::UPDATEMODE )
+ else if ( nType == StateChangedType::UpdateMode )
{
if ( IsReallyVisible() && IsUpdateMode() )
Invalidate();
}
- else if ( (nType == StateChangedType::ZOOM) ||
- (nType == StateChangedType::CONTROLFONT) )
+ else if ( (nType == StateChangedType::Zoom) ||
+ (nType == StateChangedType::ControlFont) )
{
ImplInitSettings( true, false, false );
Invalidate();
}
- else if ( nType == StateChangedType::CONTROLFOREGROUND )
+ else if ( nType == StateChangedType::ControlForeground )
{
ImplInitSettings( false, true, false );
Invalidate();
}
- else if ( nType == StateChangedType::CONTROLBACKGROUND )
+ else if ( nType == StateChangedType::ControlBackground )
{
ImplInitSettings( false, false, true );
Invalidate();
diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx
index f8fd9a35d604..ea11afcb91ef 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -1534,25 +1534,25 @@ void TabBar::StateChanged( StateChangedType nType )
{
Window::StateChanged( nType );
- if ( nType == StateChangedType::INITSHOW )
+ if ( nType == StateChangedType::InitShow )
{
if ( (mbSizeFormat || mbFormat) && !mpImpl->mpItemList.empty() )
ImplFormat();
}
- else if ( (nType == StateChangedType::ZOOM) ||
- (nType == StateChangedType::CONTROLFONT) )
+ else if ( (nType == StateChangedType::Zoom) ||
+ (nType == StateChangedType::ControlFont) )
{
ImplInitSettings( true, false );
Invalidate();
}
- else if ( nType == StateChangedType::CONTROLFOREGROUND )
+ else if ( nType == StateChangedType::ControlForeground )
Invalidate();
- else if ( nType == StateChangedType::CONTROLBACKGROUND )
+ else if ( nType == StateChangedType::ControlBackground )
{
ImplInitSettings( false, true );
Invalidate();
}
- else if ( nType == StateChangedType::MIRRORING )
+ else if ( nType == StateChangedType::Mirroring )
{
// reacts on calls of EnableRTL, have to mirror all child controls
if (mpImpl->mpFirstButton)
diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx
index 217244881db3..4e20373fc9df 100644
--- a/svtools/source/control/toolbarmenu.cxx
+++ b/svtools/source/control/toolbarmenu.cxx
@@ -1508,7 +1508,7 @@ void ToolbarMenu::StateChanged( StateChangedType nType )
{
DockingWindow::StateChanged( nType );
- if ( ( nType == StateChangedType::CONTROLFOREGROUND ) || ( nType == StateChangedType::CONTROLBACKGROUND ) )
+ if ( ( nType == StateChangedType::ControlForeground ) || ( nType == StateChangedType::ControlBackground ) )
{
initWindow();
Invalidate();
diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx
index bf0b654639df..6b97b9c5169f 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -1491,17 +1491,17 @@ void ValueSet::StateChanged( StateChangedType nType )
{
Control::StateChanged( nType );
- if ( nType == StateChangedType::INITSHOW )
+ if ( nType == StateChangedType::InitShow )
{
if ( mbFormat )
Format();
}
- else if ( nType == StateChangedType::UPDATEMODE )
+ else if ( nType == StateChangedType::UpdateMode )
{
if ( IsReallyVisible() && IsUpdateMode() )
Invalidate();
}
- else if ( nType == StateChangedType::TEXT )
+ else if ( nType == StateChangedType::Text )
{
if ( mpNoneItem.get() && !mbFormat && IsReallyVisible() && IsUpdateMode() )
{
@@ -1509,23 +1509,23 @@ void ValueSet::StateChanged( StateChangedType nType )
Invalidate( maNoneItemRect );
}
}
- else if ( (nType == StateChangedType::ZOOM) ||
- (nType == StateChangedType::CONTROLFONT) )
+ else if ( (nType == StateChangedType::Zoom) ||
+ (nType == StateChangedType::ControlFont) )
{
ImplInitSettings( true, false, false );
Invalidate();
}
- else if ( nType == StateChangedType::CONTROLFOREGROUND )
+ else if ( nType == StateChangedType::ControlForeground )
{
ImplInitSettings( false, true, false );
Invalidate();
}
- else if ( nType == StateChangedType::CONTROLBACKGROUND )
+ else if ( nType == StateChangedType::ControlBackground )
{
ImplInitSettings( false, false, true );
Invalidate();
}
- else if ( (nType == StateChangedType::STYLE) || (nType == StateChangedType::ENABLE) )
+ else if ( (nType == StateChangedType::Style) || (nType == StateChangedType::Enable) )
{
mbFormat = true;
ImplInitSettings( false, false, true );