summaryrefslogtreecommitdiff
path: root/svtools
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
parentf24590521c5ffea13c0aecdb2f30fdd39bbfbc45 (diff)
vcl: rename other members of StateChangedType for consistency
Change-Id: Ifd3339813e5d3dfb54566fd226aaf2d2a199d59a
Diffstat (limited to 'svtools')
-rw-r--r--svtools/source/brwbox/brwbox1.cxx2
-rw-r--r--svtools/source/brwbox/brwbox2.cxx14
-rw-r--r--svtools/source/brwbox/ebbcontrols.cxx2
-rw-r--r--svtools/source/brwbox/editbrowsebox.cxx12
-rw-r--r--svtools/source/contnr/fileview.cxx2
-rw-r--r--svtools/source/contnr/treelistbox.cxx4
-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
-rw-r--r--svtools/source/dialogs/wizdlg.cxx2
-rw-r--r--svtools/source/table/tablecontrol.cxx8
15 files changed, 57 insertions, 57 deletions
diff --git a/svtools/source/brwbox/brwbox1.cxx b/svtools/source/brwbox/brwbox1.cxx
index 04664e5e4b4a..2da27e8ca2b6 100644
--- a/svtools/source/brwbox/brwbox1.cxx
+++ b/svtools/source/brwbox/brwbox1.cxx
@@ -2333,7 +2333,7 @@ void BrowseBox::SetMode( BrowserMode nMode )
if ( bBootstrapped )
{
- StateChanged( StateChangedType::INITSHOW );
+ StateChanged( StateChangedType::InitShow );
if ( bMultiSelection && !pOldRowSel &&
nOldRowSel != BROWSER_ENDOFSELECTION )
uRow.pSel->Select( nOldRowSel );
diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx
index 30f71ddff50a..c5c2a504202e 100644
--- a/svtools/source/brwbox/brwbox2.cxx
+++ b/svtools/source/brwbox/brwbox2.cxx
@@ -132,7 +132,7 @@ void BrowseBox::StateChanged( StateChangedType nStateChange )
{
Control::StateChanged( nStateChange );
- if ( StateChangedType::MIRRORING == nStateChange )
+ if ( StateChangedType::Mirroring == nStateChange )
{
getDataWindow()->EnableRTL( IsRTLEnabled() );
@@ -144,7 +144,7 @@ void BrowseBox::StateChanged( StateChangedType nStateChange )
pVScroll->EnableRTL( IsRTLEnabled() );
Resize();
}
- else if ( StateChangedType::INITSHOW == nStateChange )
+ else if ( StateChangedType::InitShow == nStateChange )
{
bBootstrapped = true; // must be set first!
@@ -166,7 +166,7 @@ void BrowseBox::StateChanged( StateChangedType nStateChange )
AutoSizeLastColumn();
CursorMoved();
}
- else if (StateChangedType::ZOOM == nStateChange)
+ else if (StateChangedType::Zoom == nStateChange)
{
pDataWin->SetZoom(GetZoom());
HeaderBar* pHeaderBar = getDataWindow()->pHeaderBar;
@@ -184,7 +184,7 @@ void BrowseBox::StateChanged( StateChangedType nStateChange )
// all our controls have to be repositioned
Resize();
}
- else if (StateChangedType::ENABLE == nStateChange)
+ else if (StateChangedType::Enable == nStateChange)
{
// do we have a handle column?
bool bHandleCol = !pCols->empty() && (0 == (*pCols)[ 0 ]->GetId());
@@ -537,7 +537,7 @@ void BrowseBox::ExpandRowSelection( const BrowserMouseEvent& rEvt )
void BrowseBox::Resize()
{
if ( !bBootstrapped && IsReallyVisible() )
- BrowseBox::StateChanged( StateChangedType::INITSHOW );
+ BrowseBox::StateChanged( StateChangedType::InitShow );
if ( pCols->empty() )
{
getDataWindow()->bResizeOnPaint = true;
@@ -617,7 +617,7 @@ void BrowseBox::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle&
// initializations
if ( !bBootstrapped && IsReallyVisible() )
- BrowseBox::StateChanged( StateChangedType::INITSHOW );
+ BrowseBox::StateChanged( StateChangedType::InitShow );
if ( pCols->empty() )
return;
@@ -1098,7 +1098,7 @@ void BrowseBox::ImplPaintData(OutputDevice& _rOut, const Rectangle& _rRect, bool
void BrowseBox::PaintData( vcl::Window& rWin, const Rectangle& rRect )
{
if ( !bBootstrapped && IsReallyVisible() )
- BrowseBox::StateChanged( StateChangedType::INITSHOW );
+ BrowseBox::StateChanged( StateChangedType::InitShow );
// initializations
if ( !pCols || pCols->empty() || !rWin.IsUpdateMode() )
diff --git a/svtools/source/brwbox/ebbcontrols.cxx b/svtools/source/brwbox/ebbcontrols.cxx
index 02a32e96251e..a23e325f1bcb 100644
--- a/svtools/source/brwbox/ebbcontrols.cxx
+++ b/svtools/source/brwbox/ebbcontrols.cxx
@@ -283,7 +283,7 @@ namespace svt
void CheckBoxControl::StateChanged( StateChangedType nStateChange )
{
Control::StateChanged(nStateChange);
- if ( nStateChange == StateChangedType::ZOOM )
+ if ( nStateChange == StateChangedType::Zoom )
pBox->SetZoom(GetZoom());
}
diff --git a/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx
index b70d96a173ec..d206ca7dfbed 100644
--- a/svtools/source/brwbox/editbrowsebox.cxx
+++ b/svtools/source/brwbox/editbrowsebox.cxx
@@ -762,31 +762,31 @@ namespace svt
BrowseBox::StateChanged( nType );
bool bNeedCellReActivation = false;
- if ( nType == StateChangedType::MIRRORING )
+ if ( nType == StateChangedType::Mirroring )
{
bNeedCellReActivation = true;
}
- else if ( nType == StateChangedType::ZOOM )
+ else if ( nType == StateChangedType::Zoom )
{
ImplInitSettings( true, false, false );
bNeedCellReActivation = true;
}
- else if ( nType == StateChangedType::CONTROLFONT )
+ else if ( 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)
+ else if (nType == StateChangedType::Style)
{
WinBits nStyle = GetStyle();
if (!(nStyle & WB_NOTABSTOP) )
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index 4d1ba9f0ad05..0c13c548e5e0 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -1512,7 +1512,7 @@ void SvtFileView::SetConfigString( const OUString& rCfgStr )
void SvtFileView::StateChanged( StateChangedType nStateChange )
{
- if ( nStateChange == StateChangedType::ENABLE )
+ if ( nStateChange == StateChangedType::Enable )
Invalidate();
Control::StateChanged( nStateChange );
}
diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx
index 47559982645c..c543c67165bc 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -3760,12 +3760,12 @@ void SvTreeListBox::DataChanged( const DataChangedEvent& rDCEvt )
void SvTreeListBox::StateChanged( StateChangedType eType )
{
- if( eType == StateChangedType::ENABLE )
+ if( eType == StateChangedType::Enable )
Invalidate( INVALIDATE_CHILDREN );
Control::StateChanged( eType );
- if ( eType == StateChangedType::STYLE )
+ if ( eType == StateChangedType::Style )
ImplInitStyle();
}
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 );
diff --git a/svtools/source/dialogs/wizdlg.cxx b/svtools/source/dialogs/wizdlg.cxx
index 3e68e1719805..2855ada2dbe7 100644
--- a/svtools/source/dialogs/wizdlg.cxx
+++ b/svtools/source/dialogs/wizdlg.cxx
@@ -401,7 +401,7 @@ void WizardDialog::Resize()
void WizardDialog::StateChanged( StateChangedType nType )
{
- if ( nType == StateChangedType::INITSHOW )
+ if ( nType == StateChangedType::InitShow )
{
if ( IsDefaultSize() )
{
diff --git a/svtools/source/table/tablecontrol.cxx b/svtools/source/table/tablecontrol.cxx
index 0c1bdb3b6d8b..1b5ffdef5a32 100644
--- a/svtools/source/table/tablecontrol.cxx
+++ b/svtools/source/table/tablecontrol.cxx
@@ -128,25 +128,25 @@ namespace svt { namespace table
// forward certain settings to the data window
switch ( i_nStateChange )
{
- case StateChangedType::CONTROL_FOCUS:
+ case StateChangedType::ControlFocus:
m_pImpl->invalidateSelectedRows();
break;
- case StateChangedType::CONTROLBACKGROUND:
+ case StateChangedType::ControlBackground:
if ( IsControlBackground() )
getDataWindow().SetControlBackground( GetControlBackground() );
else
getDataWindow().SetControlBackground();
break;
- case StateChangedType::CONTROLFOREGROUND:
+ case StateChangedType::ControlForeground:
if ( IsControlForeground() )
getDataWindow().SetControlForeground( GetControlForeground() );
else
getDataWindow().SetControlForeground();
break;
- case StateChangedType::CONTROLFONT:
+ case StateChangedType::ControlFont:
if ( IsControlFont() )
getDataWindow().SetControlFont( GetControlFont() );
else