UnoControls/source/controls/statusindicator.cxx | 1
avmedia/source/viewer/mediawindow_impl.cxx | 4
cui/source/dialogs/hangulhanjadlg.cxx | 2
cui/source/dialogs/iconcdlg.cxx | 2
cui/source/options/connpooloptions.cxx | 2
cui/source/tabpages/autocdlg.cxx | 2
cui/source/tabpages/numfmt.cxx | 4
dbaccess/source/ui/browser/dataview.cxx | 4
dbaccess/source/ui/control/dbtreelistbox.cxx | 2
dbaccess/source/ui/dlg/indexdialog.cxx | 4
dbaccess/source/ui/dlg/tablespage.cxx | 2
dbaccess/source/ui/querydesign/JoinTableView.cxx | 2
dbaccess/source/ui/querydesign/TableWindow.cxx | 2
dbaccess/source/ui/querydesign/TableWindowTitle.cxx | 2
extensions/source/propctrlr/browserpage.cxx | 2
forms/source/richtext/richtextimplcontrol.hxx | 2
forms/source/richtext/richtextvclcontrol.cxx | 6
forms/source/solar/control/navtoolbar.cxx | 8 -
framework/source/uielement/addonstoolbarmanager.cxx | 2
framework/source/uielement/toolbarmanager.cxx | 6
include/postwin.h | 2
include/svtools/wizdlg.hxx | 2
include/svx/sidebar/PanelLayout.hxx | 2
include/vcl/dialog.hxx | 2
include/vcl/dockwin.hxx | 2
include/vcl/layout.hxx | 2
include/vcl/syswin.hxx | 2
include/vcl/tabctrl.hxx | 2
include/vcl/window.hxx | 44 +++---
reportdesign/inc/pch/precompiled_rptui.hxx | 1
reportdesign/source/ui/report/FixedTextColor.cxx | 1
reportdesign/source/ui/report/FormattedFieldBeautifier.cxx | 1
sc/source/ui/app/inputwin.cxx | 2
sc/source/ui/formdlg/dwfunctr.cxx | 4
sc/source/ui/formdlg/privsplt.cxx | 8 -
sc/source/ui/miscdlgs/anyrefdg.cxx | 2
sc/source/ui/namedlg/namemgrtable.cxx | 2
sd/source/ui/animations/CustomAnimationPane.cxx | 2
sd/source/ui/dlg/PaneDockingWindow.cxx | 4
sfx2/source/control/thumbnailview.cxx | 16 +-
sfx2/source/dialog/basedlgs.cxx | 4
sfx2/source/dialog/dockwin.cxx | 4
sfx2/source/dialog/recfloat.cxx | 2
sfx2/source/dialog/srchdlg.cxx | 2
sfx2/source/dialog/templdlg.cxx | 2
sfx2/source/dialog/titledockwin.cxx | 2
sfx2/source/view/frame2.cxx | 2
sfx2/source/view/viewfrm2.cxx | 2
starmath/source/toolbox.cxx | 2
starmath/source/view.cxx | 4
svtools/source/brwbox/brwbox1.cxx | 2
svtools/source/brwbox/brwbox2.cxx | 14 +-
svtools/source/brwbox/ebbcontrols.cxx | 2
svtools/source/brwbox/editbrowsebox.cxx | 12 -
svtools/source/contnr/fileview.cxx | 2
svtools/source/contnr/treelistbox.cxx | 4
svtools/source/control/calendar.cxx | 4
svtools/source/control/filectrl.cxx | 12 -
svtools/source/control/headbar.cxx | 10 -
svtools/source/control/ruler.cxx | 12 -
svtools/source/control/tabbar.cxx | 12 -
svtools/source/control/toolbarmenu.cxx | 2
svtools/source/control/valueset.cxx | 16 +-
svtools/source/dialogs/wizdlg.cxx | 2
svtools/source/table/tablecontrol.cxx | 8 -
svx/source/dialog/charmap.cxx | 4
svx/source/dialog/dialcontrol.cxx | 6
svx/source/dialog/dlgctrl.cxx | 8 -
svx/source/dialog/fntctrl.cxx | 4
svx/source/fmcomp/gridctrl.cxx | 14 +-
svx/source/tbxctrls/tbcontrl.cxx | 4
sw/source/ui/dbui/mmoutputtypepage.cxx | 2
sw/source/ui/fldui/inpdlg.cxx | 2
sw/source/uibase/dbui/mailmergehelper.cxx | 2
vcl/source/control/button.cxx | 88 ++++++-------
vcl/source/control/combobox.cxx | 20 +-
vcl/source/control/ctrl.cxx | 16 +-
vcl/source/control/edit.cxx | 22 +--
vcl/source/control/fixed.cxx | 56 ++++----
vcl/source/control/group.cxx | 16 +-
vcl/source/control/ilstbox.cxx | 40 ++---
vcl/source/control/lstbox.cxx | 20 +-
vcl/source/control/prgsbar.cxx | 8 -
vcl/source/control/scrbar.cxx | 18 +-
vcl/source/control/slider.cxx | 16 +-
vcl/source/control/spinbtn.cxx | 14 +-
vcl/source/control/spinfld.cxx | 16 +-
vcl/source/control/tabctrl.cxx | 12 -
vcl/source/edit/vclmedit.cxx | 16 +-
vcl/source/filter/wmf/winmtf.cxx | 4
vcl/source/filter/wmf/winmtf.hxx | 2
vcl/source/uipreviewer/previewer.cxx | 2
vcl/source/window/brdwin.cxx | 6
vcl/source/window/btndlg.cxx | 2
vcl/source/window/dialog.cxx | 4
vcl/source/window/dockingarea.cxx | 2
vcl/source/window/dockwin.cxx | 6
vcl/source/window/event.cxx | 2
vcl/source/window/floatwin.cxx | 4
vcl/source/window/globalization.cxx | 2
vcl/source/window/layout.cxx | 2
vcl/source/window/menubarwindow.cxx | 4
vcl/source/window/menufloatingwindow.cxx | 2
vcl/source/window/msgbox.cxx | 2
vcl/source/window/splitwin.cxx | 6
vcl/source/window/status.cxx | 12 -
vcl/source/window/tabdlg.cxx | 2
vcl/source/window/tabpage.cxx | 4
vcl/source/window/toolbox.cxx | 14 +-
vcl/source/window/window.cxx | 34 ++---
vcl/source/window/window2.cxx | 20 +-
vcl/win/source/gdi/salgdi.cxx | 2
vcl/win/source/window/salframe.cxx | 4
113 files changed, 433 insertions(+), 439 deletions(-)
New commits:
commit 8fca0c44e8f21fa2ee1000665856292d5a1c44e9
Author: Michael Stahl <mst...@redhat.com>
Date: Tue May 5 13:46:44 2015 +0200
vcl: rename other members of StateChangedType for consistency
Change-Id: Ifd3339813e5d3dfb54566fd226aaf2d2a199d59a
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx
b/avmedia/source/viewer/mediawindow_impl.cxx
index c0430a0..a2510d7 100644
--- a/avmedia/source/viewer/mediawindow_impl.cxx
+++ b/avmedia/source/viewer/mediawindow_impl.cxx
@@ -639,14 +639,14 @@ void MediaWindowImpl::StateChanged( StateChangedType
eType )
// stop playing when going disabled or hidden
switch( eType )
{
- case StateChangedType::VISIBLE:
+ case StateChangedType::Visible:
{
stopPlayingInternal( !IsVisible() );
mxPlayerWindow->setVisible( IsVisible() );
}
break;
- case StateChangedType::ENABLE:
+ case StateChangedType::Enable:
{
stopPlayingInternal( !IsEnabled() );
mxPlayerWindow->setEnable( IsEnabled() );
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx
b/cui/source/dialogs/hangulhanjadlg.cxx
index 8fbb243..eb8b195 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -416,7 +416,7 @@ namespace svx
void SuggestionDisplay::StateChanged( StateChangedType nStateChange )
{
- if( StateChangedType::VISIBLE == nStateChange )
+ if( StateChangedType::Visible == nStateChange )
implUpdateDisplay();
}
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index d1c8c35..6174603 100644
--- a/cui/source/dialogs/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -120,7 +120,7 @@ void IconChoicePage::StateChanged( StateChangedType nType )
{
Window::StateChanged( nType );
- if ( nType == StateChangedType::CONTROLBACKGROUND )
+ if ( nType == StateChangedType::ControlBackground )
{
ImplInitSettings();
Invalidate();
diff --git a/cui/source/options/connpooloptions.cxx
b/cui/source/options/connpooloptions.cxx
index d6e32b4..1e67b36 100644
--- a/cui/source/options/connpooloptions.cxx
+++ b/cui/source/options/connpooloptions.cxx
@@ -221,7 +221,7 @@ namespace offapp
void DriverListControl::StateChanged( StateChangedType nStateChange )
{
- if (StateChangedType::ENABLE == nStateChange)
+ if (StateChangedType::Enable == nStateChange)
Window::Invalidate(INVALIDATE_UPDATE);
EditBrowseBox::StateChanged( nStateChange );
}
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 32191b1..20fcbcf 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -920,7 +920,7 @@ void OfaAutocorrReplacePage::StateChanged(StateChangedType
nStateChange)
{
SfxTabPage::StateChanged(nStateChange);
- if (nStateChange == StateChangedType::INITSHOW)
+ if (nStateChange == StateChangedType::InitShow)
{
setTabs();
}
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 2663c39..352077e 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -205,9 +205,9 @@ void SvxNumberPreview::InitSettings( bool bForeground, bool
bBackground )
void SvxNumberPreview::StateChanged( StateChangedType nType )
{
- if ( nType == StateChangedType::CONTROLFOREGROUND )
+ if ( nType == StateChangedType::ControlForeground )
InitSettings( true, false );
- else if ( nType == StateChangedType::CONTROLBACKGROUND )
+ else if ( nType == StateChangedType::ControlBackground )
InitSettings( false, true );
Window::StateChanged( nType );
diff --git a/dbaccess/source/ui/browser/dataview.cxx
b/dbaccess/source/ui/browser/dataview.cxx
index d959262..ee1e5e1 100644
--- a/dbaccess/source/ui/browser/dataview.cxx
+++ b/dbaccess/source/ui/browser/dataview.cxx
@@ -151,13 +151,13 @@ namespace dbaui
{
Window::StateChanged( nType );
- if ( nType == StateChangedType::CONTROLBACKGROUND )
+ if ( nType == StateChangedType::ControlBackground )
{
// Check if we need to get new images for normal/high contrast mode
m_xController->notifyHiContrastChanged();
}
- if ( nType == StateChangedType::INITSHOW )
+ if ( nType == StateChangedType::InitShow )
{
// now that there's a view which is finally visible, remove the
"Hidden" value from the
// model's arguments.
diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx
b/dbaccess/source/ui/control/dbtreelistbox.cxx
index 6ecacbc..2780a9c 100644
--- a/dbaccess/source/ui/control/dbtreelistbox.cxx
+++ b/dbaccess/source/ui/control/dbtreelistbox.cxx
@@ -668,7 +668,7 @@ IMPL_LINK_NOARG_TYPED(DBTreeListBox, OnTimeOut, Timer*,
void)
void DBTreeListBox::StateChanged( StateChangedType nStateChange )
{
- if ( nStateChange == StateChangedType::VISIBLE )
+ if ( nStateChange == StateChangedType::Visible )
implStopSelectionTimer();
}
diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx
b/dbaccess/source/ui/dlg/indexdialog.cxx
index a033fab..bfb41ce 100644
--- a/dbaccess/source/ui/dlg/indexdialog.cxx
+++ b/dbaccess/source/ui/dlg/indexdialog.cxx
@@ -817,12 +817,12 @@ namespace dbaui
{
ModalDialog::StateChanged( nType );
- if ( nType == StateChangedType::CONTROLBACKGROUND )
+ if ( nType == StateChangedType::ControlBackground )
{
// Check if we need to get new images for normal/high contrast mode
checkImageList();
}
- else if ( nType == StateChangedType::TEXT )
+ else if ( nType == StateChangedType::Text )
{
// The physical toolbar changed its outlook and shows another
logical toolbar!
// We have to set the correct high contrast mode on the new tbx
manager.
diff --git a/dbaccess/source/ui/dlg/tablespage.cxx
b/dbaccess/source/ui/dlg/tablespage.cxx
index ba53a2a..b8e31e9 100644
--- a/dbaccess/source/ui/dlg/tablespage.cxx
+++ b/dbaccess/source/ui/dlg/tablespage.cxx
@@ -120,7 +120,7 @@ namespace dbaui
{
OGenericAdministrationPage::StateChanged( nType );
- if ( nType == StateChangedType::CONTROLBACKGROUND )
+ if ( nType == StateChangedType::ControlBackground )
{
// Check if we need to get new images for normal/high contrast mode
m_pTablesList->notifyHiContrastChanged();
diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx
b/dbaccess/source/ui/querydesign/JoinTableView.cxx
index 4702382..bcd5d47 100644
--- a/dbaccess/source/ui/querydesign/JoinTableView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx
@@ -1462,7 +1462,7 @@ void OJoinTableView::StateChanged( StateChangedType nType
)
{
Window::StateChanged( nType );
- if ( nType == StateChangedType::ZOOM )
+ if ( nType == StateChangedType::Zoom )
{
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx
b/dbaccess/source/ui/querydesign/TableWindow.cxx
index de29020..31697a3 100644
--- a/dbaccess/source/ui/querydesign/TableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindow.cxx
@@ -556,7 +556,7 @@ void OTableWindow::StateChanged( StateChangedType nType )
{
Window::StateChanged( nType );
- if ( nType == StateChangedType::ZOOM )
+ if ( nType == StateChangedType::Zoom )
{
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
diff --git a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx
b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx
index f1f3149..0c5ca6a 100644
--- a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx
@@ -178,7 +178,7 @@ void OTableWindowTitle::StateChanged( StateChangedType
nType )
{
Window::StateChanged( nType );
- if ( nType == StateChangedType::ZOOM )
+ if ( nType == StateChangedType::Zoom )
{
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
diff --git a/extensions/source/propctrlr/browserpage.cxx
b/extensions/source/propctrlr/browserpage.cxx
index dfb0236..432ba8c 100644
--- a/extensions/source/propctrlr/browserpage.cxx
+++ b/extensions/source/propctrlr/browserpage.cxx
@@ -70,7 +70,7 @@ namespace pcr
void OBrowserPage::StateChanged(StateChangedType nType)
{
Window::StateChanged( nType);
- if (StateChangedType::VISIBLE == nType)
+ if (StateChangedType::Visible == nType)
m_aListBox->ActivateListBox(IsVisible());
}
diff --git a/forms/source/richtext/richtextimplcontrol.hxx
b/forms/source/richtext/richtextimplcontrol.hxx
index 2f0acb1..ce4f221 100644
--- a/forms/source/richtext/richtextimplcontrol.hxx
+++ b/forms/source/richtext/richtextimplcontrol.hxx
@@ -127,7 +127,7 @@ namespace frm
*/
void notifyZoomChanged();
- /** to be called when the StateChangedType::INITSHOW event arrives
+ /** to be called when the StateChangedType::InitShow event arrives
*/
void notifyInitShow();
diff --git a/forms/source/richtext/richtextvclcontrol.cxx
b/forms/source/richtext/richtextvclcontrol.cxx
index d728620..8048137 100644
--- a/forms/source/richtext/richtextvclcontrol.cxx
+++ b/forms/source/richtext/richtextvclcontrol.cxx
@@ -174,16 +174,16 @@ namespace frm
void RichTextControl::StateChanged( StateChangedType _nStateChange )
{
- if ( _nStateChange == StateChangedType::STYLE )
+ if ( _nStateChange == StateChangedType::Style )
{
SetStyle( implInitStyle( GetStyle() ) );
m_pImpl->notifyStyleChanged();
}
- else if ( _nStateChange == StateChangedType::ZOOM )
+ else if ( _nStateChange == StateChangedType::Zoom )
{
m_pImpl->notifyZoomChanged();
}
- else if ( _nStateChange == StateChangedType::INITSHOW )
+ else if ( _nStateChange == StateChangedType::InitShow )
{
m_pImpl->notifyInitShow();
}
diff --git a/forms/source/solar/control/navtoolbar.cxx
b/forms/source/solar/control/navtoolbar.cxx
index 9d4a1d8..d10d448 100644
--- a/forms/source/solar/control/navtoolbar.cxx
+++ b/forms/source/solar/control/navtoolbar.cxx
@@ -478,23 +478,23 @@ namespace frm
switch ( nType )
{
- case StateChangedType::ZOOM:
+ case StateChangedType::Zoom:
// m_pToolbar->SetZoom( GetZoom() );
// forEachItemWindow( setItemWindowZoom, NULL );
// the ToolBox class is not zoomable at the moment, so
// we better have no zoom at all instead of only half a zoom
...
break;
- case StateChangedType::CONTROLFONT:
+ case StateChangedType::ControlFont:
forEachItemWindow( &NavigationToolBar::setItemControlFont,
NULL );
forEachItemWindow( &NavigationToolBar::adjustItemWindowWidth,
NULL );
break;
- case StateChangedType::CONTROLFOREGROUND:
+ case StateChangedType::ControlForeground:
forEachItemWindow(
&NavigationToolBar::setItemControlForeground, NULL );
break;
- case StateChangedType::MIRRORING:
+ case StateChangedType::Mirroring:
{
sal_Bool bIsRTLEnabled( IsRTLEnabled() );
m_pToolbar->EnableRTL( bIsRTLEnabled );
diff --git a/framework/source/uielement/addonstoolbarmanager.cxx
b/framework/source/uielement/addonstoolbarmanager.cxx
index a5f76ec..3c2c716 100644
--- a/framework/source/uielement/addonstoolbarmanager.cxx
+++ b/framework/source/uielement/addonstoolbarmanager.cxx
@@ -458,7 +458,7 @@ IMPL_LINK_NOARG(AddonsToolBarManager, Deactivate)
IMPL_LINK( AddonsToolBarManager, StateChanged, StateChangedType*,
pStateChangedType )
{
- if ( *pStateChangedType == StateChangedType::CONTROLBACKGROUND )
+ if ( *pStateChangedType == StateChangedType::ControlBackground )
{
CheckAndUpdateImages();
}
diff --git a/framework/source/uielement/toolbarmanager.cxx
b/framework/source/uielement/toolbarmanager.cxx
index 5a57484..7913c8d 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -2044,18 +2044,18 @@ IMPL_LINK( ToolBarManager, StateChanged,
StateChangedType*, pStateChangedType )
if ( m_bDisposed )
return 1;
- if ( *pStateChangedType == StateChangedType::CONTROLBACKGROUND )
+ if ( *pStateChangedType == StateChangedType::ControlBackground )
{
CheckAndUpdateImages();
}
- else if ( *pStateChangedType == StateChangedType::VISIBLE )
+ else if ( *pStateChangedType == StateChangedType::Visible )
{
if ( m_pToolBar->IsReallyVisible() )
{
m_aAsyncUpdateControllersTimer.Start();
}
}
- else if ( *pStateChangedType == StateChangedType::INITSHOW )
+ else if ( *pStateChangedType == StateChangedType::InitShow )
{
m_aAsyncUpdateControllersTimer.Start();
}
diff --git a/include/svtools/wizdlg.hxx b/include/svtools/wizdlg.hxx
index 5fb9f5c57..70d7cb1 100644
--- a/include/svtools/wizdlg.hxx
+++ b/include/svtools/wizdlg.hxx
@@ -251,7 +251,7 @@ public:
virtual void ActivatePage();
virtual bool DeactivatePage();
- virtual void queue_resize(StateChangedType eReason =
StateChangedType::LAYOUT) SAL_OVERRIDE;
+ virtual void queue_resize(StateChangedType eReason =
StateChangedType::Layout) SAL_OVERRIDE;
bool ShowPrevPage();
bool ShowNextPage();
diff --git a/include/svx/sidebar/PanelLayout.hxx
b/include/svx/sidebar/PanelLayout.hxx
index d479668..9c58248 100644
--- a/include/svx/sidebar/PanelLayout.hxx
+++ b/include/svx/sidebar/PanelLayout.hxx
@@ -39,7 +39,7 @@ public:
virtual Size GetOptimalSize() const SAL_OVERRIDE;
virtual void setPosSizePixel(long nX, long nY, long nWidth, long nHeight,
sal_uInt16 nFlags = WINDOW_POSSIZE_ALL) SAL_OVERRIDE;
- virtual void queue_resize(StateChangedType eReason =
StateChangedType::LAYOUT) SAL_OVERRIDE;
+ virtual void queue_resize(StateChangedType eReason =
StateChangedType::Layout) SAL_OVERRIDE;
};
diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx
index 0587aef..cf71d70 100644
--- a/include/vcl/dialog.hxx
+++ b/include/vcl/dialog.hxx
@@ -88,7 +88,7 @@ public:
virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE;
virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
- virtual void queue_resize(StateChangedType eReason =
StateChangedType::LAYOUT) SAL_OVERRIDE;
+ virtual void queue_resize(StateChangedType eReason =
StateChangedType::Layout) SAL_OVERRIDE;
virtual bool set_property(const OString &rKey, const OString &rValue)
SAL_OVERRIDE;
VclButtonBox* get_action_area() { return mpActionArea; }
VclBox* get_content_area() { return mpContentArea; }
diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx
index 0456c859..a1617d1 100644
--- a/include/vcl/dockwin.hxx
+++ b/include/vcl/dockwin.hxx
@@ -359,7 +359,7 @@ public:
virtual void SetText( const OUString& rStr ) SAL_OVERRIDE;
virtual OUString GetText() const SAL_OVERRIDE;
virtual Size GetOptimalSize() const SAL_OVERRIDE;
- virtual void queue_resize(StateChangedType eReason =
StateChangedType::LAYOUT) SAL_OVERRIDE;
+ virtual void queue_resize(StateChangedType eReason =
StateChangedType::Layout) SAL_OVERRIDE;
};
inline void DockingWindow::SetPin( bool bPin )
diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx
index 85c6139..e73399c 100644
--- a/include/vcl/layout.hxx
+++ b/include/vcl/layout.hxx
@@ -41,7 +41,7 @@ public:
m_bLayoutDirty = true;
}
- virtual void queue_resize(StateChangedType eReason =
StateChangedType::LAYOUT) SAL_OVERRIDE;
+ virtual void queue_resize(StateChangedType eReason =
StateChangedType::Layout) SAL_OVERRIDE;
protected:
//these are the two that need to be implemented by
//containers, figure out how much space you want...
diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx
index db30b5a..7aef2ea 100644
--- a/include/vcl/syswin.hxx
+++ b/include/vcl/syswin.hxx
@@ -185,7 +185,7 @@ public:
virtual void Resizing( Size& rSize );
virtual void Resize() SAL_OVERRIDE;
virtual Size GetOptimalSize() const SAL_OVERRIDE;
- virtual void queue_resize(StateChangedType eReason =
StateChangedType::LAYOUT) SAL_OVERRIDE;
+ virtual void queue_resize(StateChangedType eReason =
StateChangedType::Layout) SAL_OVERRIDE;
bool isLayoutEnabled() const;
void setOptimalLayoutSize();
bool isCalculatingInitialLayoutSize() const { return
mbIsCalculatingInitialLayoutSize; }
diff --git a/include/vcl/tabctrl.hxx b/include/vcl/tabctrl.hxx
index 82c3e96..3d38996 100644
--- a/include/vcl/tabctrl.hxx
+++ b/include/vcl/tabctrl.hxx
@@ -189,7 +189,7 @@ public:
mbLayoutDirty = true;
}
- virtual void queue_resize(StateChangedType eReason =
StateChangedType::LAYOUT) SAL_OVERRIDE;
+ virtual void queue_resize(StateChangedType eReason =
StateChangedType::Layout) SAL_OVERRIDE;
};
#endif // INCLUDED_VCL_TABCTRL_HXX
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 68a16093..3209906 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -234,27 +234,27 @@ template<class T> class VclPtr;
// Flags for StateChanged()
enum class StateChangedType : sal_uInt16
{
- INITSHOW = 1,
- VISIBLE = 2,
- UPDATEMODE = 3,
- ENABLE = 4,
- TEXT = 5,
- IMAGE = 6,
- DATA = 7,
- STATE = 8,
- STYLE = 9,
- ZOOM = 10,
- BORDER = 11,
+ InitShow = 1,
+ Visible = 2,
+ UpdateMode = 3,
+ Enable = 4,
+ Text = 5,
+ Image = 6,
+ Data = 7,
+ State = 8,
+ Style = 9,
+ Zoom = 10,
+ Border = 11,
Transparent = 12,
- CONTROLFONT = 13,
- CONTROLFOREGROUND = 14,
- CONTROLBACKGROUND = 15,
- READONLY = 16,
- EXTENDEDSTYLE = 17,
- MIRRORING = 18,
- LAYOUT = 19,
- CONTROL_FOCUS = 20,
- USER = 10000
+ ControlFont = 13,
+ ControlForeground = 14,
+ ControlBackground = 15,
+ ReadOnly = 16,
+ ExtendedStyle = 17,
+ Mirroring = 18,
+ Layout = 19,
+ ControlFocus = 20,
+ User = 10000
};
// GetFocusFlags
@@ -1246,7 +1246,7 @@ public:
*
* akin to gtk_widget_queue_resize
*/
- virtual void queue_resize(StateChangedType eReason =
StateChangedType::LAYOUT);
+ virtual void queue_resize(StateChangedType eReason =
StateChangedType::Layout);
/*
* Sets the "width-request" property
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 83452ea..7f57d98 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -784,7 +784,7 @@ void ScInputWindow::StateChanged( StateChangedType nType )
{
ToolBox::StateChanged( nType );
- if ( nType == StateChangedType::INITSHOW ) Resize();
+ if ( nType == StateChangedType::InitShow ) Resize();
}
void ScInputWindow::DataChanged( const DataChangedEvent& rDCEvt )
diff --git a/sc/source/ui/formdlg/dwfunctr.cxx
b/sc/source/ui/formdlg/dwfunctr.cxx
index 7838914..d1a331f 100644
--- a/sc/source/ui/formdlg/dwfunctr.cxx
+++ b/sc/source/ui/formdlg/dwfunctr.cxx
@@ -594,7 +594,7 @@ void ScFunctionDockWin::SetDescription()
aBuf.append(*pDesc->pFuncDesc);
aFiFuncDesc->SetText(aBuf.makeStringAndClear());
- aFiFuncDesc->StateChanged(StateChangedType::TEXT);
+ aFiFuncDesc->StateChanged(StateChangedType::Text);
aFiFuncDesc->Invalidate();
aFiFuncDesc->Update();
@@ -1089,7 +1089,7 @@ void ScFunctionDockWin::StateChanged( StateChangedType
nStateChange )
{
SfxDockingWindow::StateChanged( nStateChange );
- if (nStateChange == StateChangedType::INITSHOW)
+ if (nStateChange == StateChangedType::InitShow)
{
UseSplitterInitPos(); // set initial splitter position if
necessary
}
diff --git a/sc/source/ui/formdlg/privsplt.cxx
b/sc/source/ui/formdlg/privsplt.cxx
index f8d5f82..779b6cd 100644
--- a/sc/source/ui/formdlg/privsplt.cxx
+++ b/sc/source/ui/formdlg/privsplt.cxx
@@ -369,18 +369,18 @@ void ScPrivatSplit::ImplInitSettings( bool bFont, bool
bForeground, bool bBackgr
void ScPrivatSplit::StateChanged( StateChangedType nType )
{
- if ( (nType == StateChangedType::ZOOM) ||
- (nType == StateChangedType::CONTROLFONT) )
+ if ( (nType == StateChangedType::Zoom) ||
+ (nType == StateChangedType::ControlFont) )
{
ImplInitSettings( true, false, false );
Invalidate();
}
- if ( nType == StateChangedType::CONTROLFOREGROUND )
+ 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/sc/source/ui/miscdlgs/anyrefdg.cxx
b/sc/source/ui/miscdlgs/anyrefdg.cxx
index a1a6407..116e0e3 100644
--- a/sc/source/ui/miscdlgs/anyrefdg.cxx
+++ b/sc/source/ui/miscdlgs/anyrefdg.cxx
@@ -947,7 +947,7 @@ void ScRefHandler::stateChanged(const StateChangedType
nStateChange, const bool
{
if( !bBindRef && !m_bInRefMode ) return;
- if(nStateChange == StateChangedType::VISIBLE)
+ if(nStateChange == StateChangedType::Visible)
{
if(m_rWindow->IsVisible())
{
diff --git a/sc/source/ui/namedlg/namemgrtable.cxx
b/sc/source/ui/namedlg/namemgrtable.cxx
index 2df4743..9fea7df 100644
--- a/sc/source/ui/namedlg/namemgrtable.cxx
+++ b/sc/source/ui/namedlg/namemgrtable.cxx
@@ -75,7 +75,7 @@ void ScRangeManagerTable::StateChanged( StateChangedType
nStateChange )
{
SvSimpleTable::StateChanged(nStateChange);
- if (nStateChange == StateChangedType::INITSHOW)
+ if (nStateChange == StateChangedType::InitShow)
{
if (GetEntryCount())
{
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx
b/sd/source/ui/animations/CustomAnimationPane.cxx
index 779cf72..d7a97cb 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -275,7 +275,7 @@ void CustomAnimationPane::StateChanged( StateChangedType
nStateChange )
{
Control::StateChanged( nStateChange );
- if( nStateChange == StateChangedType::VISIBLE )
+ if( nStateChange == StateChangedType::Visible )
updateMotionPathTags();
}
diff --git a/sd/source/ui/dlg/PaneDockingWindow.cxx
b/sd/source/ui/dlg/PaneDockingWindow.cxx
index 4947dd7..4f15c62 100644
--- a/sd/source/ui/dlg/PaneDockingWindow.cxx
+++ b/sd/source/ui/dlg/PaneDockingWindow.cxx
@@ -54,12 +54,12 @@ void PaneDockingWindow::StateChanged( StateChangedType
nType )
{
switch (nType)
{
- case StateChangedType::INITSHOW:
+ case StateChangedType::InitShow:
Resize();
GetContentWindow().SetStyle(GetContentWindow().GetStyle() |
WB_DIALOGCONTROL);
break;
- case StateChangedType::VISIBLE:
+ case StateChangedType::Visible:
{
// The visibility of the docking window has changed. Tell the
// ConfigurationController so that it can activate or deactivate
diff --git a/sfx2/source/control/thumbnailview.cxx
b/sfx2/source/control/thumbnailview.cxx
index 53e017a..25f63c4 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -929,36 +929,36 @@ void ThumbnailView::StateChanged( StateChangedType nType )
{
Control::StateChanged( nType );
- if ( nType == StateChangedType::INITSHOW )
+ if ( nType == StateChangedType::InitShow )
{
if ( IsReallyVisible() && IsUpdateMode() )
Invalidate();
}
- else if ( nType == StateChangedType::UPDATEMODE )
+ else if ( nType == StateChangedType::UpdateMode )
{
if ( IsReallyVisible() && IsUpdateMode() )
Invalidate();
}
- else if ( nType == StateChangedType::TEXT )
+ else if ( nType == StateChangedType::Text )
{
}
- 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) )
{
ImplInitSettings( false, false, true );
Invalidate();
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index 2fd86a7..d33f895 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -202,7 +202,7 @@ void SfxModalDialog::CreateOutputItemSet( const SfxItemSet&
rSet )
void SfxModelessDialog::StateChanged( StateChangedType nStateChange )
{
- if ( nStateChange == StateChangedType::INITSHOW )
+ if ( nStateChange == StateChangedType::InitShow )
{
if ( !pImp->aWinState.isEmpty() )
{
@@ -573,7 +573,7 @@ IMPL_LINK_NOARG_TYPED(SfxFloatingWindow, TimerHdl, Idle *,
void)
void SfxFloatingWindow::StateChanged( StateChangedType nStateChange )
{
- if ( nStateChange == StateChangedType::INITSHOW )
+ if ( nStateChange == StateChangedType::InitShow )
{
// FloatingWindows are not centered by default
if ( !pImp->aWinState.isEmpty() )
diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx
index 4fec7bd..0c6af19 100644
--- a/sfx2/source/dialog/dockwin.cxx
+++ b/sfx2/source/dialog/dockwin.cxx
@@ -280,7 +280,7 @@ bool SfxTitleDockingWindow::Notify( NotifyEvent& rNEvt )
void SfxTitleDockingWindow::StateChanged( StateChangedType nType )
{
- if ( nType == StateChangedType::INITSHOW )
+ if ( nType == StateChangedType::InitShow )
{
vcl::Window* pWindow = GetWrappedWindow();
if ( pWindow )
@@ -1915,7 +1915,7 @@ void SfxDockingWindow::AutoShow_Impl( bool bShow )
void SfxDockingWindow::StateChanged( StateChangedType nStateChange )
{
- if ( nStateChange == StateChangedType::INITSHOW )
+ if ( nStateChange == StateChangedType::InitShow )
Initialize_Impl();
DockingWindow::StateChanged( nStateChange );
diff --git a/sfx2/source/dialog/recfloat.cxx b/sfx2/source/dialog/recfloat.cxx
index 742aa88..60ac3df 100644
--- a/sfx2/source/dialog/recfloat.cxx
+++ b/sfx2/source/dialog/recfloat.cxx
@@ -234,7 +234,7 @@ void SfxRecordingFloat_Impl::FillInfo( SfxChildWinInfo&
rInfo ) const
void SfxRecordingFloat_Impl::StateChanged( StateChangedType nStateChange )
{
- if ( nStateChange == StateChangedType::INITSHOW )
+ if ( nStateChange == StateChangedType::InitShow )
{
SfxViewFrame *pFrame = GetBindings().GetDispatcher_Impl()->GetFrame();
vcl::Window* pEditWin = pFrame->GetViewShell()->GetWindow();
diff --git a/sfx2/source/dialog/srchdlg.cxx b/sfx2/source/dialog/srchdlg.cxx
index 0da322c..57e72cb 100644
--- a/sfx2/source/dialog/srchdlg.cxx
+++ b/sfx2/source/dialog/srchdlg.cxx
@@ -160,7 +160,7 @@ bool SearchDialog::Close()
void SearchDialog::StateChanged( StateChangedType nStateChange )
{
- if ( nStateChange == StateChangedType::INITSHOW )
+ if ( nStateChange == StateChangedType::InitShow )
{
if (!m_sWinState.isEmpty())
SetWindowState( m_sWinState );
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index e3ef5e4a..802f8ba 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -390,7 +390,7 @@ void SfxTemplatePanelControl::FreeResource()
void SfxTemplatePanelControl::StateChanged( StateChangedType nStateChange )
{
- if (nStateChange == StateChangedType::INITSHOW)
+ if (nStateChange == StateChangedType::InitShow)
{
SfxViewFrame* pFrame = mpBindings->GetDispatcher_Impl()->GetFrame();
vcl::Window* pEditWin = pFrame->GetViewShell()->GetWindow();
diff --git a/sfx2/source/dialog/titledockwin.cxx
b/sfx2/source/dialog/titledockwin.cxx
index 5da01bf..402f006 100644
--- a/sfx2/source/dialog/titledockwin.cxx
+++ b/sfx2/source/dialog/titledockwin.cxx
@@ -270,7 +270,7 @@ namespace sfx2
{
switch ( i_nType )
{
- case StateChangedType::INITSHOW:
+ case StateChangedType::InitShow:
impl_scheduleLayout();
break;
default:;
diff --git a/sfx2/source/view/frame2.cxx b/sfx2/source/view/frame2.cxx
index 390a9c5..92cb344 100644
--- a/sfx2/source/view/frame2.cxx
+++ b/sfx2/source/view/frame2.cxx
@@ -182,7 +182,7 @@ void SfxFrameWindow_Impl::Resize()
void SfxFrameWindow_Impl::StateChanged( StateChangedType nStateChange )
{
- if ( nStateChange == StateChangedType::INITSHOW )
+ if ( nStateChange == StateChangedType::InitShow )
{
pFrame->pImp->bHidden = false;
if ( pFrame->IsInPlace() )
diff --git a/sfx2/source/view/viewfrm2.cxx b/sfx2/source/view/viewfrm2.cxx
index d42f483..726e83a 100644
--- a/sfx2/source/view/viewfrm2.cxx
+++ b/sfx2/source/view/viewfrm2.cxx
@@ -58,7 +58,7 @@ using ::com::sun::star::lang::XComponent;
void SfxFrameViewWindow_Impl::StateChanged( StateChangedType nStateChange )
{
- if ( nStateChange == StateChangedType::INITSHOW )
+ if ( nStateChange == StateChangedType::InitShow )
{
SfxObjectShell* pDoc = pFrame->GetObjectShell();
if ( pDoc && !pFrame->IsVisible() )
diff --git a/starmath/source/toolbox.cxx b/starmath/source/toolbox.cxx
index 26a1fbe..7416beb 100644
--- a/starmath/source/toolbox.cxx
+++ b/starmath/source/toolbox.cxx
@@ -211,7 +211,7 @@ void SmToolBoxWindow::DataChanged( const DataChangedEvent
&rEvt )
void SmToolBoxWindow::StateChanged( StateChangedType nStateChange )
{
static bool bSetPosition = true;
- if (StateChangedType::INITSHOW == nStateChange)
+ if (StateChangedType::InitShow == nStateChange)
{
SetCategory( nActiveCategoryRID == USHRT_MAX ? RID_UNBINOPS_CAT :
nActiveCategoryRID );
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index cb391eb..57e3ad9 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -134,7 +134,7 @@ void SmGraphicWindow::dispose()
void SmGraphicWindow::StateChanged( StateChangedType eType )
{
- if ( eType == StateChangedType::INITSHOW )
+ if ( eType == StateChangedType::InitShow )
Show();
ScrollableWindow::StateChanged( eType );
}
@@ -803,7 +803,7 @@ SfxChildAlignment
SmCmdBoxWindow::CheckAlignment(SfxChildAlignment eActual,
void SmCmdBoxWindow::StateChanged( StateChangedType nStateChange )
{
- if (StateChangedType::INITSHOW == nStateChange)
+ if (StateChangedType::InitShow == nStateChange)
{
Resize(); // avoid SmEditWindow not being painted correctly
diff --git a/svtools/source/brwbox/brwbox1.cxx
b/svtools/source/brwbox/brwbox1.cxx
index 04664e5..2da27e8 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 30f71dd..c5c2a50 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 02a32e9..a23e325 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 b70d96a..d206ca7 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 4d1ba9f..0c13c54 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 4755998..c543c67 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 051c71d..6e08841 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 33b5423..974edbf 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 bb53416..01e9445 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 4b802de..ef07e62 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 f8fd9a3..ea11afc 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 2172448..4e20373 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 bf0b654..6b97b9c 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 3e68e17..2855ada 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 0c1bdb3..1b5ffde 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
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index 02117da..2eee3ec 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 == StateChangedType::CONTROLFOREGROUND )
+ if ( nType == StateChangedType::ControlForeground )
InitSettings( true, false );
- else if ( nType == StateChangedType::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 d25f61f..bf6c0c0 100644
--- a/svx/source/dialog/dialcontrol.cxx
+++ b/svx/source/dialog/dialcontrol.cxx
@@ -286,7 +286,7 @@ void DialControl::Paint( vcl::RenderContext&
/*rRenderContext*/, const Rectangle
void DialControl::StateChanged( StateChangedType nStateChange )
{
- if( nStateChange == StateChangedType::ENABLE )
+ if( nStateChange == StateChangedType::Enable )
InvalidateControl();
// update the linked edit field
@@ -295,8 +295,8 @@ void DialControl::StateChanged( StateChangedType
nStateChange )
NumericField& rField = *mpImpl->mpLinkField;
switch( nStateChange )
{
- case StateChangedType::VISIBLE: rField.Show( IsVisible() );
break;
- case StateChangedType::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 230ea82..4a0cf8d 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -368,9 +368,9 @@ void SvxRectCtl::KeyInput( const KeyEvent& rKeyEvt )
void SvxRectCtl::StateChanged( StateChangedType nType )
{
- if ( nType == StateChangedType::CONTROLFOREGROUND )
+ if ( nType == StateChangedType::ControlForeground )
InitSettings( true, false );
- else if ( nType == StateChangedType::CONTROLBACKGROUND )
+ else if ( nType == StateChangedType::ControlBackground )
InitSettings( false, true );
Window::StateChanged( nType );
@@ -1902,11 +1902,11 @@ void SvxPreviewBase::StateChanged(StateChangedType
nType)
{
Control::StateChanged(nType);
- if(StateChangedType::CONTROLFOREGROUND == nType)
+ if(StateChangedType::ControlForeground == nType)
{
InitSettings(true, false);
}
- else if(StateChangedType::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 3bb540a..72eed9f 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -528,9 +528,9 @@ SvxFont& SvxFontPrevWindow::GetCJKFont()
void SvxFontPrevWindow::StateChanged( StateChangedType nType )
{
- if ( nType == StateChangedType::CONTROLFOREGROUND )
+ if ( nType == StateChangedType::ControlForeground )
InitSettings( true, false );
- else if ( nType == StateChangedType::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 f724557..cee4239 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -746,7 +746,7 @@ void DbGridControl::NavigationBar::StateChanged(
StateChangedType nType )
switch ( nType )
{
- case StateChangedType::MIRRORING:
+ case StateChangedType::Mirroring:
{
bool bIsRTLEnabled = IsRTLEnabled();
for ( size_t i=0; i < (sizeof (pWindows) / sizeof(pWindows[0]));
++i )
@@ -754,7 +754,7 @@ void DbGridControl::NavigationBar::StateChanged(
StateChangedType nType )
}
break;
- case StateChangedType::ZOOM:
+ case StateChangedType::Zoom:
{
Fraction aZoom = GetZoom();
@@ -999,12 +999,12 @@ void DbGridControl::StateChanged( StateChangedType nType )
switch (nType)
{
- case StateChangedType::MIRRORING:
+ case StateChangedType::Mirroring:
ImplInitWindow( InitWritingMode );
Invalidate();
break;
- case StateChangedType::ZOOM:
+ case StateChangedType::Zoom:
{
ImplInitWindow( InitFontFacet );
@@ -1015,15 +1015,15 @@ void DbGridControl::StateChanged( StateChangedType
nType )
ReserveControlArea((sal_uInt16)nX);
}
break;
- case StateChangedType::CONTROLFONT:
+ case StateChangedType::ControlFont:
ImplInitWindow( InitFontFacet );
Invalidate();
break;
- case StateChangedType::CONTROLFOREGROUND:
+ case StateChangedType::ControlForeground:
ImplInitWindow( InitForeground );
Invalidate();
break;
- case StateChangedType::CONTROLBACKGROUND:
+ case StateChangedType::ControlBackground:
ImplInitWindow( InitBackground );
Invalidate();
break;
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index c058ef9..ab09ae8 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -552,13 +552,13 @@ void SvxStyleBox_Impl::StateChanged( StateChangedType
nStateChange )
{
ComboBox::StateChanged( nStateChange );
- if ( nStateChange == StateChangedType::VISIBLE )
+ if ( nStateChange == StateChangedType::Visible )
{
bVisible = IsReallyVisible();
if ( aVisibilityListener.IsSet() )
aVisibilityListener.Call( this );
}
- else if ( nStateChange == StateChangedType::INITSHOW )
+ else if ( nStateChange == StateChangedType::InitShow )
{
bVisible = true;
if ( aVisibilityListener.IsSet() )
diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx
b/sw/source/ui/dbui/mmoutputtypepage.cxx
index 72c84cc..105613c 100644
--- a/sw/source/ui/dbui/mmoutputtypepage.cxx
+++ b/sw/source/ui/dbui/mmoutputtypepage.cxx
@@ -547,7 +547,7 @@ void SwSendMailDialog::ShowDialog()
void SwSendMailDialog::StateChanged( StateChangedType nStateChange )
{
ModelessDialog::StateChanged( nStateChange );
- if(StateChangedType::VISIBLE == nStateChange && !IsVisible())
+ if(StateChangedType::Visible == nStateChange && !IsVisible())
{
m_pImpl->aRemoveIdle.SetIdleHdl( LINK( this, SwSendMailDialog,
RemoveThis ) );
diff --git a/sw/source/ui/fldui/inpdlg.cxx b/sw/source/ui/fldui/inpdlg.cxx
index 1da4ca5..6a7c663 100644
--- a/sw/source/ui/fldui/inpdlg.cxx
+++ b/sw/source/ui/fldui/inpdlg.cxx
@@ -122,7 +122,7 @@ void SwFldInputDlg::dispose()
void SwFldInputDlg::StateChanged( StateChangedType nType )
{
- if ( nType == StateChangedType::INITSHOW )
+ if ( nType == StateChangedType::InitShow )
m_pEditED->GrabFocus();
SvxStandardDialog::StateChanged( nType );
}
diff --git a/sw/source/uibase/dbui/mailmergehelper.cxx
b/sw/source/uibase/dbui/mailmergehelper.cxx
index 4a85ad2..c342034 100644
--- a/sw/source/uibase/dbui/mailmergehelper.cxx
+++ b/sw/source/uibase/dbui/mailmergehelper.cxx
@@ -433,7 +433,7 @@ void SwAddressPreview::KeyInput( const KeyEvent& rKEvt )
void SwAddressPreview::StateChanged( StateChangedType nStateChange )
{
- if(nStateChange == StateChangedType::ENABLE)
+ if(nStateChange == StateChangedType::Enable)
Invalidate();
Window::StateChanged(nStateChange);
}
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index ef0c8c3..39fd3c6 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -162,7 +162,7 @@ bool Button::SetModeImage( const Image& rImage )
if ( rImage != mpButtonData->maImage )
{
mpButtonData->maImage = rImage;
- StateChanged( StateChangedType::DATA );
+ StateChanged( StateChangedType::Data );
queue_resize();
}
return true;
@@ -183,7 +183,7 @@ void Button::SetImageAlign( ImageAlign eAlign )
if ( mpButtonData->meImageAlign != eAlign )
{
mpButtonData->meImageAlign = eAlign;
- StateChanged( StateChangedType::DATA );
+ StateChanged( StateChangedType::Data );
}
}
@@ -548,7 +548,7 @@ void Button::ImplSetSymbolAlign( SymbolAlign eAlign )
if ( mpButtonData->meSymbolAlign != eAlign )
{
mpButtonData->meSymbolAlign = eAlign;
- StateChanged( StateChangedType::DATA );
+ StateChanged( StateChangedType::Data );
}
}
@@ -1398,17 +1398,17 @@ void PushButton::StateChanged( StateChangedType nType )
{
Button::StateChanged( nType );
- if ( (nType == StateChangedType::ENABLE) ||
- (nType == StateChangedType::TEXT) ||
- (nType == StateChangedType::IMAGE) ||
- (nType == StateChangedType::DATA) ||
- (nType == StateChangedType::STATE) ||
- (nType == StateChangedType::UPDATEMODE) )
+ if ( (nType == StateChangedType::Enable) ||
+ (nType == StateChangedType::Text) ||
+ (nType == StateChangedType::Image) ||
+ (nType == StateChangedType::Data) ||
+ (nType == StateChangedType::State) ||
+ (nType == StateChangedType::UpdateMode) )
{
if ( IsReallyVisible() && IsUpdateMode() )
Invalidate();
}
- else if ( nType == StateChangedType::STYLE )
+ else if ( nType == StateChangedType::Style )
{
SetStyle( ImplInitStyle( GetWindow( WINDOW_PREV ), GetStyle() ) );
@@ -1424,18 +1424,18 @@ void PushButton::StateChanged( StateChangedType nType )
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();
@@ -1531,7 +1531,7 @@ void PushButton::SetSymbol( SymbolType eSymbol )
if ( meSymbol != eSymbol )
{
meSymbol = eSymbol;
- StateChanged( StateChangedType::DATA );
+ StateChanged( StateChangedType::Data );
}
}
@@ -1545,7 +1545,7 @@ void PushButton::SetDropDown( sal_uInt16 nStyle )
if ( mnDDStyle != nStyle )
{
mnDDStyle = nStyle;
- StateChanged( StateChangedType::DATA );
+ StateChanged( StateChangedType::Data );
}
}
@@ -1567,7 +1567,7 @@ void PushButton::SetState( TriState eState )
ImplGetButtonState() |= BUTTON_DRAW_DONTKNOW;
}
- StateChanged( StateChangedType::STATE );
+ StateChanged( StateChangedType::State );
Toggle();
}
}
@@ -1577,7 +1577,7 @@ void PushButton::SetPressed( bool bPressed )
if ( mbPressed != bPressed )
{
mbPressed = bPressed;
- StateChanged( StateChangedType::DATA );
+ StateChanged( StateChangedType::Data );
}
}
@@ -2520,21 +2520,21 @@ void RadioButton::StateChanged( StateChangedType nType )
{
Button::StateChanged( nType );
- if ( nType == StateChangedType::STATE )
+ if ( nType == StateChangedType::State )
{
if ( IsReallyVisible() && IsUpdateMode() )
Invalidate( maStateRect );
}
- else if ( (nType == StateChangedType::ENABLE) ||
- (nType == StateChangedType::TEXT) ||
- (nType == StateChangedType::IMAGE) ||
- (nType == StateChangedType::DATA) ||
- (nType == StateChangedType::UPDATEMODE) )
+ else if ( (nType == StateChangedType::Enable) ||
+ (nType == StateChangedType::Text) ||
+ (nType == StateChangedType::Image) ||
+ (nType == StateChangedType::Data) ||
+ (nType == StateChangedType::UpdateMode) )
{
if ( IsUpdateMode() )
Invalidate();
}
- else if ( nType == StateChangedType::STYLE )
+ else if ( nType == StateChangedType::Style )
{
SetStyle( ImplInitStyle( GetWindow( WINDOW_PREV ), GetStyle() ) );
@@ -2545,18 +2545,18 @@ void RadioButton::StateChanged( StateChangedType nType )
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();
@@ -2613,7 +2613,7 @@ bool RadioButton::SetModeRadioImage( const Image& rImage )
if ( rImage != maImage )
{
maImage = rImage;
- StateChanged( StateChangedType::DATA );
+ StateChanged( StateChangedType::Data );
queue_resize();
}
return true;
@@ -2631,7 +2631,7 @@ void RadioButton::SetState( bool bCheck )
if ( mbChecked != bCheck )
{
mbChecked = bCheck;
- StateChanged( StateChangedType::STATE );
+ StateChanged( StateChangedType::State );
Toggle();
}
}
@@ -2688,7 +2688,7 @@ void RadioButton::Check( bool bCheck )
mbChecked = bCheck;
ImplDelData aDelData;
ImplAddDel( &aDelData );
- StateChanged( StateChangedType::STATE );
+ StateChanged( StateChangedType::State );
if ( aDelData.IsDead() )
return;
if ( bCheck && mbRadioCheck )
@@ -3454,21 +3454,21 @@ void CheckBox::StateChanged( StateChangedType nType )
{
Button::StateChanged( nType );
- if ( nType == StateChangedType::STATE )
+ if ( nType == StateChangedType::State )
{
if ( IsReallyVisible() && IsUpdateMode() )
Invalidate( maStateRect );
}
- else if ( (nType == StateChangedType::ENABLE) ||
- (nType == StateChangedType::TEXT) ||
- (nType == StateChangedType::IMAGE) ||
- (nType == StateChangedType::DATA) ||
- (nType == StateChangedType::UPDATEMODE) )
+ else if ( (nType == StateChangedType::Enable) ||
+ (nType == StateChangedType::Text) ||
+ (nType == StateChangedType::Image) ||
+ (nType == StateChangedType::Data) ||
+ (nType == StateChangedType::UpdateMode) )
{
if ( IsUpdateMode() )
Invalidate();
}
- else if ( nType == StateChangedType::STYLE )
+ else if ( nType == StateChangedType::Style )
{
SetStyle( ImplInitStyle( GetWindow( WINDOW_PREV ), GetStyle() ) );
@@ -3479,18 +3479,18 @@ void CheckBox::StateChanged( StateChangedType nType )
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();
@@ -3550,7 +3550,7 @@ void CheckBox::SetState( TriState eState )
if ( meState != eState )
{
meState = eState;
- StateChanged( StateChangedType::STATE );
+ StateChanged( StateChangedType::State );
Toggle();
}
}
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index e9e24ee..05b1e7d 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -607,13 +607,13 @@ void ComboBox::StateChanged( StateChangedType nType )
{
Edit::StateChanged( nType );
- if ( nType == StateChangedType::READONLY )
+ if ( nType == StateChangedType::ReadOnly )
{
mpImplLB->SetReadOnly( IsReadOnly() );
if ( mpBtn )
mpBtn->Enable( IsEnabled() && !IsReadOnly() );
}
- else if ( nType == StateChangedType::ENABLE )
+ else if ( nType == StateChangedType::Enable )
{
mpSubEdit->Enable( IsEnabled() );
mpImplLB->Enable( IsEnabled() && !IsReadOnly() );
@@ -621,47 +621,47 @@ void ComboBox::StateChanged( StateChangedType nType )
mpBtn->Enable( IsEnabled() && !IsReadOnly() );
Invalidate();
}
- else if( nType == StateChangedType::UPDATEMODE )
+ else if( nType == StateChangedType::UpdateMode )
{
mpImplLB->SetUpdateMode( IsUpdateMode() );
}
- else if ( nType == StateChangedType::ZOOM )
+ else if ( nType == StateChangedType::Zoom )
{
mpImplLB->SetZoom( GetZoom() );
mpSubEdit->SetZoom( GetZoom() );
ImplCalcEditHeight();
Resize();
}
- else if ( nType == StateChangedType::CONTROLFONT )
+ else if ( nType == StateChangedType::ControlFont )
{
mpImplLB->SetControlFont( GetControlFont() );
mpSubEdit->SetControlFont( GetControlFont() );
ImplCalcEditHeight();
Resize();
}
- else if ( nType == StateChangedType::CONTROLFOREGROUND )
+ else if ( nType == StateChangedType::ControlForeground )
{
mpImplLB->SetControlForeground( GetControlForeground() );
mpSubEdit->SetControlForeground( GetControlForeground() );
}
- else if ( nType == StateChangedType::CONTROLBACKGROUND )
+ else if ( nType == StateChangedType::ControlBackground )
{
mpImplLB->SetControlBackground( GetControlBackground() );
mpSubEdit->SetControlBackground( GetControlBackground() );
}
- else if ( nType == StateChangedType::STYLE )
+ else if ( nType == StateChangedType::Style )
{
SetStyle( ImplInitStyle( GetStyle() ) );
mpImplLB->GetMainWindow()->EnableSort( ( GetStyle() & WB_SORT ) != 0 );
}
- else if( nType == StateChangedType::MIRRORING )
+ else if( nType == StateChangedType::Mirroring )
{
if( mpBtn )
{
mpBtn->EnableRTL( IsRTLEnabled() );
ImplInitDropDownButton( mpBtn );
}
- mpSubEdit->StateChanged( StateChangedType::MIRRORING );
+ mpSubEdit->StateChanged( StateChangedType::Mirroring );
mpImplLB->EnableRTL( IsRTLEnabled() );
Resize();
}
diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx
index 9dcdfc0..af9b3d4 100644
--- a/vcl/source/control/ctrl.cxx
+++ b/vcl/source/control/ctrl.cxx
@@ -81,7 +81,7 @@ void Control::EnableRTL( bool bEnable )
// convenience: for controls also switch layout mode
SetLayoutMode( bEnable ? TEXT_LAYOUT_BIDI_RTL |
TEXT_LAYOUT_TEXTORIGIN_LEFT :
TEXT_LAYOUT_TEXTORIGIN_LEFT );
- StateChanged( StateChangedType::MIRRORING );
+ StateChanged( StateChangedType::Mirroring );
OutputDevice::EnableRTL(bEnable);
}
@@ -261,7 +261,7 @@ bool Control::Notify( NotifyEvent& rNEvt )
if ( !mbHasControlFocus )
{
mbHasControlFocus = true;
- StateChanged( StateChangedType::CONTROL_FOCUS );
+ StateChanged( StateChangedType::ControlFocus );
if ( ImplCallEventListenersAndHandler(
VCLEVENT_CONTROL_GETFOCUS, maGetFocusHdl, this ) )
// been destroyed within the handler
return true;
@@ -275,7 +275,7 @@ bool Control::Notify( NotifyEvent& rNEvt )
if ( !pFocusWin || !ImplIsWindowOrChild( pFocusWin ) )
{
mbHasControlFocus = false;
- StateChanged( StateChangedType::CONTROL_FOCUS );
+ StateChanged( StateChangedType::ControlFocus );
if ( ImplCallEventListenersAndHandler(
VCLEVENT_CONTROL_LOSEFOCUS, maLoseFocusHdl, this ) )
// been destroyed within the handler
return true;
@@ -288,11 +288,11 @@ bool Control::Notify( NotifyEvent& rNEvt )
void Control::StateChanged( StateChangedType nStateChange )
{
- if( nStateChange == StateChangedType::INITSHOW ||
- nStateChange == StateChangedType::VISIBLE ||
- nStateChange == StateChangedType::ZOOM ||
- nStateChange == StateChangedType::BORDER ||
- nStateChange == StateChangedType::CONTROLFONT
+ if( nStateChange == StateChangedType::InitShow ||
+ nStateChange == StateChangedType::Visible ||
+ nStateChange == StateChangedType::Zoom ||
+ nStateChange == StateChangedType::Border ||
+ nStateChange == StateChangedType::ControlFont
)
{
ImplClearLayoutData();
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 0e2dba3..ce232fd 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -2207,7 +2207,7 @@ void Edit::Command( const CommandEvent& rCEvt )
void Edit::StateChanged( StateChangedType nType )
{
- if ( nType == StateChangedType::INITSHOW )
+ if ( nType == StateChangedType::InitShow )
{
if ( !mpSubEdit )
{
@@ -2219,7 +2219,7 @@ void Edit::StateChanged( StateChangedType nType )
// update background (eventual SetPaintTransparent)
ImplInitSettings( false, false, true );
}
- else if ( nType == StateChangedType::ENABLE )
+ else if ( nType == StateChangedType::Enable )
{
if ( !mpSubEdit )
{
@@ -2227,10 +2227,10 @@ void Edit::StateChanged( StateChangedType nType )
ImplInvalidateOrRepaint();
}
}
- else if ( nType == StateChangedType::STYLE || nType ==
StateChangedType::MIRRORING )
+ else if ( nType == StateChangedType::Style || nType ==
StateChangedType::Mirroring )
{
WinBits nStyle = GetStyle();
- if( nType == StateChangedType::STYLE )
+ if( nType == StateChangedType::Style )
{
nStyle = ImplInitStyle( GetStyle() );
SetStyle( nStyle );
@@ -2246,12 +2246,12 @@ void Edit::StateChanged( StateChangedType nType )
{
if( GetParent()->GetStyle() & WB_LEFT )
mnAlign = EDIT_ALIGN_RIGHT;
- if ( nType == StateChangedType::MIRRORING )
+ if ( nType == StateChangedType::Mirroring )
SetLayoutMode( TEXT_LAYOUT_BIDI_RTL |
TEXT_LAYOUT_TEXTORIGIN_LEFT );
}
else if( mbIsSubEdit && !GetParent()->IsRTLEnabled() )
{
- if ( nType == StateChangedType::MIRRORING )
+ if ( nType == StateChangedType::Mirroring )
SetLayoutMode( TEXT_LAYOUT_TEXTORIGIN_LEFT );
}
@@ -2266,7 +2266,7 @@ void Edit::StateChanged( StateChangedType nType )
}
}
- else if ( nType == StateChangedType::ZOOM )
+ else if ( nType == StateChangedType::Zoom )
{
if ( !mpSubEdit )
{
@@ -2275,7 +2275,7 @@ void Edit::StateChanged( StateChangedType nType )
Invalidate();
}
}
- else if ( nType == StateChangedType::CONTROLFONT )
+ else if ( nType == StateChangedType::ControlFont )
{
if ( !mpSubEdit )
{
@@ -2284,7 +2284,7 @@ void Edit::StateChanged( StateChangedType nType )
Invalidate();
}
}
- else if ( nType == StateChangedType::CONTROLFOREGROUND )
+ else if ( nType == StateChangedType::ControlForeground )
{
if ( !mpSubEdit )
{
@@ -2292,7 +2292,7 @@ void Edit::StateChanged( StateChangedType nType )
Invalidate();
}
}
- else if ( nType == StateChangedType::CONTROLBACKGROUND )
+ else if ( nType == StateChangedType::ControlBackground )
{
if ( !mpSubEdit )
{
@@ -2455,7 +2455,7 @@ void Edit::SetReadOnly( bool bReadOnly )
if ( mpSubEdit )
mpSubEdit->SetReadOnly( bReadOnly );
- StateChanged( StateChangedType::READONLY );
+ StateChanged( StateChangedType::ReadOnly );
}
}
diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx
index c8acbd1..7b42fee 100644
--- a/vcl/source/control/fixed.cxx
+++ b/vcl/source/control/fixed.cxx
@@ -287,14 +287,14 @@ void FixedText::StateChanged( StateChangedType nType )
{
Control::StateChanged( nType );
- if ( (nType == StateChangedType::ENABLE) ||
- (nType == StateChangedType::TEXT) ||
- (nType == StateChangedType::UPDATEMODE) )
+ if ( (nType == StateChangedType::Enable) ||
+ (nType == StateChangedType::Text) ||
+ (nType == StateChangedType::UpdateMode) )
{
if ( IsReallyVisible() && IsUpdateMode() )
Invalidate();
}
- else if ( nType == StateChangedType::STYLE )
+ else if ( nType == StateChangedType::Style )
{
SetStyle( ImplInitStyle( GetStyle() ) );
if ( (GetPrevStyle() & FIXEDTEXT_VIEW_STYLE) !=
@@ -304,18 +304,18 @@ void FixedText::StateChanged( StateChangedType nType )
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();
@@ -660,33 +660,33 @@ void FixedLine::StateChanged( StateChangedType nType )
{
Control::StateChanged( nType );
- if ( (nType == StateChangedType::ENABLE) ||
- (nType == StateChangedType::TEXT) ||
- (nType == StateChangedType::UPDATEMODE) )
+ if ( (nType == StateChangedType::Enable) ||
+ (nType == StateChangedType::Text) ||
+ (nType == StateChangedType::UpdateMode) )
{
if ( IsReallyVisible() && IsUpdateMode() )
Invalidate();
}
- else if ( nType == StateChangedType::STYLE )
+ else if ( nType == StateChangedType::Style )
{
SetStyle( ImplInitStyle( GetStyle() ) );
if ( (GetPrevStyle() & FIXEDLINE_VIEW_STYLE) !=
(GetStyle() & FIXEDLINE_VIEW_STYLE) )
Invalidate();
}
- else if ( (nType == StateChangedType::ZOOM) ||
- (nType == StateChangedType::STYLE) ||
- (nType == StateChangedType::CONTROLFONT) )
+ else if ( (nType == StateChangedType::Zoom) ||
+ (nType == StateChangedType::Style) ||
+ (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();
@@ -810,20 +810,20 @@ void FixedBitmap::StateChanged( StateChangedType nType )
{
Control::StateChanged( nType );
- if ( (nType == StateChangedType::DATA) ||
- (nType == StateChangedType::UPDATEMODE) )
+ if ( (nType == StateChangedType::Data) ||
+ (nType == StateChangedType::UpdateMode) )
{
if ( IsReallyVisible() && IsUpdateMode() )
Invalidate();
}
- else if ( nType == StateChangedType::STYLE )
+ else if ( nType == StateChangedType::Style )
{
SetStyle( ImplInitStyle( GetStyle() ) );
if ( (GetPrevStyle() & FIXEDBITMAP_VIEW_STYLE) !=
(GetStyle() & FIXEDBITMAP_VIEW_STYLE) )
Invalidate();
}
- else if ( nType == StateChangedType::CONTROLBACKGROUND )
+ else if ( nType == StateChangedType::ControlBackground )
{
ImplInitSettings();
Invalidate();
@@ -845,7 +845,7 @@ void FixedBitmap::DataChanged( const DataChangedEvent&
rDCEvt )
void FixedBitmap::SetBitmap( const Bitmap& rBitmap )
{
maBitmap = rBitmap;
- StateChanged( StateChangedType::DATA );
+ StateChanged( StateChangedType::Data );
queue_resize();
}
@@ -984,21 +984,21 @@ void FixedImage::StateChanged( StateChangedType nType )
{
Control::StateChanged( nType );
- if ( (nType == StateChangedType::ENABLE) ||
- (nType == StateChangedType::DATA) ||
- (nType == StateChangedType::UPDATEMODE) )
+ if ( (nType == StateChangedType::Enable) ||
+ (nType == StateChangedType::Data) ||
+ (nType == StateChangedType::UpdateMode) )
{
if ( IsReallyVisible() && IsUpdateMode() )
Invalidate();
}
- else if ( nType == StateChangedType::STYLE )
+ else if ( nType == StateChangedType::Style )
{
SetStyle( ImplInitStyle( GetStyle() ) );
if ( (GetPrevStyle() & FIXEDIMAGE_VIEW_STYLE) !=
(GetStyle() & FIXEDIMAGE_VIEW_STYLE) )
Invalidate();
}
- else if ( nType == StateChangedType::CONTROLBACKGROUND )
+ else if ( nType == StateChangedType::ControlBackground )
{
ImplInitSettings();
Invalidate();
@@ -1022,7 +1022,7 @@ void FixedImage::SetImage( const Image& rImage )
if ( rImage != maImage )
{
maImage = rImage;
- StateChanged( StateChangedType::DATA );
+ StateChanged( StateChangedType::Data );
queue_resize();
}
}
diff --git a/vcl/source/control/group.cxx b/vcl/source/control/group.cxx
index e6b0b9a..9d6de9f 100644
--- a/vcl/source/control/group.cxx
+++ b/vcl/source/control/group.cxx
@@ -223,32 +223,32 @@ void GroupBox::StateChanged( StateChangedType nType )
{
Control::StateChanged( nType );
- if ( (nType == StateChangedType::ENABLE) ||
- (nType == StateChangedType::TEXT) ||
- (nType == StateChangedType::UPDATEMODE) )
+ if ( (nType == StateChangedType::Enable) ||
+ (nType == StateChangedType::Text) ||
+ (nType == StateChangedType::UpdateMode) )
{
if ( IsUpdateMode() )
Invalidate();
}
- else if ( nType == StateChangedType::STYLE )
+ else if ( nType == StateChangedType::Style )
{
SetStyle( ImplInitStyle( GetStyle() ) );
if ( (GetPrevStyle() & GROUP_VIEW_STYLE) !=
(GetStyle() & GROUP_VIEW_STYLE) )
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/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx
index fbbcad1..4c93414 100644
--- a/vcl/source/control/ilstbox.cxx
+++ b/vcl/source/control/ilstbox.cxx
@@ -2071,34 +2071,34 @@ void ImplListBoxWindow::StateChanged( StateChangedType
nType )
{
Control::StateChanged( nType );
- if ( nType == StateChangedType::ZOOM )
+ if ( nType == StateChangedType::Zoom )
{
ImplInitSettings( true, false, false );
ImplCalcMetrics();
Invalidate();
}
- else if ( nType == StateChangedType::UPDATEMODE )
+ else if ( nType == StateChangedType::UpdateMode )
{
if ( IsUpdateMode() && IsReallyVisible() )
Invalidate();
}
- else if ( nType == StateChangedType::CONTROLFONT )
+ else if ( nType == StateChangedType::ControlFont )
{
ImplInitSettings( true, false, false );
ImplCalcMetrics();
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::ENABLE )
+ else if( nType == StateChangedType::Enable )
{
Invalidate();
}
@@ -2190,7 +2190,7 @@ void ImplListBox::Clear()
}
mpVScrollBar->SetThumbPos( 0 );
mpHScrollBar->SetThumbPos( 0 );
- StateChanged( StateChangedType::DATA );
+ StateChanged( StateChangedType::Data );
}
sal_Int32 ImplListBox::InsertEntry( sal_Int32 nPos, const OUString& rStr )
@@ -2202,7 +2202,7 @@ sal_Int32 ImplListBox::InsertEntry( sal_Int32 nPos, const
OUString& rStr )
delete pNewEntry;
return nNewPos;
}
- StateChanged( StateChangedType::DATA );
+ StateChanged( StateChangedType::Data );
return nNewPos;
}
@@ -2215,14 +2215,14 @@ sal_Int32 ImplListBox::InsertEntry( sal_Int32 nPos,
const OUString& rStr, const
delete pNewEntry;
return nNewPos;
}
- StateChanged( StateChangedType::DATA );
+ StateChanged( StateChangedType::Data );
return nNewPos;
}
void ImplListBox::RemoveEntry( sal_Int32 nPos )
{
maLBWindow->RemoveEntry( nPos );
- StateChanged( StateChangedType::DATA );
+ StateChanged( StateChangedType::Data );
}
void ImplListBox::SetEntryFlags( sal_Int32 nPos, long nFlags )
@@ -2259,7 +2259,7 @@ void ImplListBox::Resize()
IMPL_LINK_NOARG(ImplListBox, MRUChanged)
{
- StateChanged( StateChangedType::DATA );
+ StateChanged( StateChangedType::Data );
return 1;
}
@@ -2455,18 +2455,18 @@ void ImplListBox::ImplResizeControls()
void ImplListBox::StateChanged( StateChangedType nType )
{
- if ( nType == StateChangedType::INITSHOW )
+ if ( nType == StateChangedType::InitShow )
{
ImplCheckScrollBars();
}
- else if ( ( nType == StateChangedType::UPDATEMODE ) || ( nType ==
StateChangedType::DATA ) )
+ else if ( ( nType == StateChangedType::UpdateMode ) || ( nType ==
StateChangedType::Data ) )
{
bool bUpdate = IsUpdateMode();
maLBWindow->SetUpdateMode( bUpdate );
if ( bUpdate && IsReallyVisible() )
ImplCheckScrollBars();
}
- else if( nType == StateChangedType::ENABLE )
+ else if( nType == StateChangedType::Enable )
{
mpHScrollBar->Enable( IsEnabled() );
mpVScrollBar->Enable( IsEnabled() );
@@ -2475,24 +2475,24 @@ void ImplListBox::StateChanged( StateChangedType nType )
Invalidate();
}
- else if ( nType == StateChangedType::ZOOM )
+ else if ( nType == StateChangedType::Zoom )
{
maLBWindow->SetZoom( GetZoom() );
Resize();
}
- else if ( nType == StateChangedType::CONTROLFONT )
+ else if ( nType == StateChangedType::ControlFont )
{
maLBWindow->SetControlFont( GetControlFont() );
}
- else if ( nType == StateChangedType::CONTROLFOREGROUND )
+ else if ( nType == StateChangedType::ControlForeground )
{
maLBWindow->SetControlForeground( GetControlForeground() );
}
- else if ( nType == StateChangedType::CONTROLBACKGROUND )
+ else if ( nType == StateChangedType::ControlBackground )
{
maLBWindow->SetControlBackground( GetControlBackground() );
}
- else if( nType == StateChangedType::MIRRORING )
+ else if( nType == StateChangedType::Mirroring )
{
maLBWindow->EnableRTL( IsRTLEnabled() );
mpHScrollBar->EnableRTL( IsRTLEnabled() );
@@ -2575,7 +2575,7 @@ void ImplListBox::SetMRUEntries( const OUString&
rEntries, sal_Unicode cSep )
{
maLBWindow->GetEntryList()->SetMRUCount( nMRUCount );
SetSeparatorPos( nMRUCount ? nMRUCount-1 : 0 );
- StateChanged( StateChangedType::DATA );
+ StateChanged( StateChangedType::Data );
}
}
diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx
index 06da9a1..9090184 100644
--- a/vcl/source/control/lstbox.cxx
+++ b/vcl/source/control/lstbox.cxx
@@ -777,14 +777,14 @@ long ListBox::GetIndexForPoint( const Point& rPoint,
sal_Int32& rPos ) const
void ListBox::StateChanged( StateChangedType nType )
{
- if( nType == StateChangedType::READONLY )
+ if( nType == StateChangedType::ReadOnly )
{
if( mpImplWin )
mpImplWin->Enable( !IsReadOnly() );
if( mpBtn )
mpBtn->Enable( !IsReadOnly() );
}
- else if( nType == StateChangedType::ENABLE )
+ else if( nType == StateChangedType::Enable )
{
mpImplLB->Enable( IsEnabled() );
if( mpImplWin )
@@ -801,11 +801,11 @@ void ListBox::StateChanged( StateChangedType nType )
if( mpBtn )
mpBtn->Enable( IsEnabled() );
}
- else if( nType == StateChangedType::UPDATEMODE )
+ else if( nType == StateChangedType::UpdateMode )
{
mpImplLB->SetUpdateMode( IsUpdateMode() );
}
- else if ( nType == StateChangedType::ZOOM )
+ else if ( nType == StateChangedType::Zoom )
{
mpImplLB->SetZoom( GetZoom() );
if ( mpImplWin )
@@ -816,7 +816,7 @@ void ListBox::StateChanged( StateChangedType nType )
}
Resize();
}
- else if ( nType == StateChangedType::CONTROLFONT )
+ else if ( nType == StateChangedType::ControlFont )
{
mpImplLB->SetControlFont( GetControlFont() );
if ( mpImplWin )
@@ -827,7 +827,7 @@ void ListBox::StateChanged( StateChangedType nType )
}
Resize();
}
- else if ( nType == StateChangedType::CONTROLFOREGROUND )
+ else if ( nType == StateChangedType::ControlForeground )
{
mpImplLB->SetControlForeground( GetControlForeground() );
if ( mpImplWin )
@@ -838,7 +838,7 @@ void ListBox::StateChanged( StateChangedType nType )
mpImplWin->Invalidate();
}
}
- else if ( nType == StateChangedType::CONTROLBACKGROUND )
+ else if ( nType == StateChangedType::ControlBackground )
{
mpImplLB->SetControlBackground( GetControlBackground() );
if ( mpImplWin )
@@ -858,14 +858,14 @@ void ListBox::StateChanged( StateChangedType nType )
mpImplWin->Invalidate();
}
}
- else if ( nType == StateChangedType::STYLE )
+ else if ( nType == StateChangedType::Style )
{
SetStyle( ImplInitStyle( GetStyle() ) );
mpImplLB->GetMainWindow()->EnableSort( ( GetStyle() & WB_SORT ) != 0 );
bool bSimpleMode = ( GetStyle() & WB_SIMPLEMODE ) != 0;
mpImplLB->SetMultiSelectionSimpleMode( bSimpleMode );
}
- else if( nType == StateChangedType::MIRRORING )
+ else if( nType == StateChangedType::Mirroring )
{
if( mpBtn )
{
@@ -1404,7 +1404,7 @@ void ListBox::SetReadOnly( bool bReadOnly )
if ( mpImplLB->IsReadOnly() != bReadOnly )
{
mpImplLB->SetReadOnly( bReadOnly );
- StateChanged( StateChangedType::READONLY );
+ StateChanged( StateChangedType::ReadOnly );
}
}
diff --git a/vcl/source/control/prgsbar.cxx b/vcl/source/control/prgsbar.cxx
index 609911c..b480754 100644
--- a/vcl/source/control/prgsbar.cxx
+++ b/vcl/source/control/prgsbar.cxx
@@ -184,20 +184,20 @@ void ProgressBar::SetValue( sal_uInt16 nNewPercent )
void ProgressBar::StateChanged( StateChangedType nType )
{
/* FIXME: !!! We do not support text output at the moment
- if ( (nType == StateChangedType::ZOOM) ||
- (nType == StateChangedType::CONTROLFONT) )
+ if ( (nType == StateChangedType::Zoom) ||
+ (nType == StateChangedType::ControlFont) )
{
ImplInitSettings( true, false, false );
Invalidate();
}
else
*/
- if ( nType == StateChangedType::CONTROLFOREGROUND )
+ 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/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx
index 0f4e831..65960d7 100644
--- a/vcl/source/control/scrbar.cxx
+++ b/vcl/source/control/scrbar.cxx
@@ -1185,14 +1185,14 @@ void ScrollBar::StateChanged( StateChangedType nType )
{
Control::StateChanged( nType );
- if ( nType == StateChangedType::INITSHOW )
+ if ( nType == StateChangedType::InitShow )
ImplCalc( false );
- else if ( nType == StateChangedType::DATA )
+ else if ( nType == StateChangedType::Data )
{
if ( IsReallyVisible() && IsUpdateMode() )
ImplCalc( true );
}
- else if ( nType == StateChangedType::UPDATEMODE )
+ else if ( nType == StateChangedType::UpdateMode )
{
if ( IsReallyVisible() && IsUpdateMode() )
{
@@ -1200,12 +1200,12 @@ void ScrollBar::StateChanged( StateChangedType nType )
Invalidate();
}
}
- else if ( nType == StateChangedType::ENABLE )
+ else if ( nType == StateChangedType::Enable )
{
if ( IsReallyVisible() && IsUpdateMode() )
Invalidate();
}
- else if ( nType == StateChangedType::STYLE )
+ else if ( nType == StateChangedType::Style )
{
ImplInitStyle( GetStyle() );
if ( IsReallyVisible() && IsUpdateMode() )
@@ -1382,7 +1382,7 @@ void ScrollBar::SetRange( const Range& rRange )
if ( mnThumbPos < mnMinRange )
mnThumbPos = mnMinRange;
- StateChanged( StateChangedType::DATA );
+ StateChanged( StateChangedType::Data );
}
}
@@ -1396,7 +1396,7 @@ void ScrollBar::SetThumbPos( long nNewThumbPos )
if ( mnThumbPos != nNewThumbPos )
{
mnThumbPos = nNewThumbPos;
- StateChanged( StateChangedType::DATA );
+ StateChanged( StateChangedType::Data );
}
}
@@ -1411,7 +1411,7 @@ void ScrollBar::SetVisibleSize( long nNewSize )
mnThumbPos = mnMaxRange-mnVisibleSize;
if ( mnThumbPos < mnMinRange )
mnThumbPos = mnMinRange;
- StateChanged( StateChangedType::DATA );
+ StateChanged( StateChangedType::Data );
}
}
@@ -1482,7 +1482,7 @@ void ScrollBarBox::StateChanged( StateChangedType nType )
{
Window::StateChanged( nType );
- if ( nType == StateChangedType::CONTROLBACKGROUND )
+ if ( nType == StateChangedType::ControlBackground )
{
ImplInitSettings();
Invalidate();
diff --git a/vcl/source/control/slider.cxx b/vcl/source/control/slider.cxx
index e85ce80..ba41c6f 100644
--- a/vcl/source/control/slider.cxx
+++ b/vcl/source/control/slider.cxx
@@ -831,14 +831,14 @@ void Slider::StateChanged( StateChangedType nType )
{
Control::StateChanged( nType );
- if ( nType == StateChangedType::INITSHOW )
+ if ( nType == StateChangedType::InitShow )
ImplCalc( false );
- else if ( nType == StateChangedType::DATA )
+ else if ( nType == StateChangedType::Data )
{
if ( IsReallyVisible() && IsUpdateMode() )
ImplCalc( true );
}
- else if ( nType == StateChangedType::UPDATEMODE )
+ else if ( nType == StateChangedType::UpdateMode )
{
if ( IsReallyVisible() && IsUpdateMode() )
{
@@ -846,12 +846,12 @@ void Slider::StateChanged( StateChangedType nType )
Invalidate();
}
}
- else if ( nType == StateChangedType::ENABLE )
+ else if ( nType == StateChangedType::Enable )
{
if ( IsReallyVisible() && IsUpdateMode() )
Invalidate();
}
- else if ( nType == StateChangedType::STYLE )
+ else if ( nType == StateChangedType::Style )
{
if ( IsReallyVisible() && IsUpdateMode() )
{
@@ -864,7 +864,7 @@ void Slider::StateChanged( StateChangedType nType )
}
}
}
- else if ( nType == StateChangedType::CONTROLBACKGROUND )
+ else if ( nType == StateChangedType::ControlBackground )
{
ImplInitSettings();
Invalidate();
@@ -924,7 +924,7 @@ void Slider::SetRange( const Range& rRange )
if ( mnThumbPos < mnMinRange )
mnThumbPos = mnMinRange;
- StateChanged( StateChangedType::DATA );
+ StateChanged( StateChangedType::Data );
}
}
@@ -938,7 +938,7 @@ void Slider::SetThumbPos( long nNewThumbPos )
if ( mnThumbPos != nNewThumbPos )
{
mnThumbPos = nNewThumbPos;
- StateChanged( StateChangedType::DATA );
+ StateChanged( StateChangedType::Data );
}
}
diff --git a/vcl/source/control/spinbtn.cxx b/vcl/source/control/spinbtn.cxx
index 509b520..dd68d91 100644
--- a/vcl/source/control/spinbtn.cxx
+++ b/vcl/source/control/spinbtn.cxx
@@ -76,7 +76,7 @@ void SpinButton::Up()
if ( ImplIsUpperEnabled() )
{
mnValue += mnValueStep;
- StateChanged( StateChangedType::DATA );
+ StateChanged( StateChangedType::Data );
ImplMoveFocus( true );
}
@@ -89,7 +89,7 @@ void SpinButton::Down()
if ( ImplIsLowerEnabled() )
{
mnValue -= mnValueStep;
- StateChanged( StateChangedType::DATA );
+ StateChanged( StateChangedType::Data );
ImplMoveFocus( false );
}
@@ -309,12 +309,12 @@ void SpinButton::StateChanged( StateChangedType nType )
{
switch ( nType )
{
- case StateChangedType::DATA:
- case StateChangedType::ENABLE:
+ case StateChangedType::Data:
+ case StateChangedType::Enable:
Invalidate();
break;
- case StateChangedType::STYLE:
+ case StateChangedType::Style:
{
bool bNewRepeat = 0 != ( GetStyle() & WB_REPEAT );
if ( bNewRepeat != mbRepeat )
@@ -372,7 +372,7 @@ void SpinButton::SetRange( const Range& rRange )
if ( mnValue < mnMinRange )
mnValue = mnMinRange;
- StateChanged( StateChangedType::DATA );
+ StateChanged( StateChangedType::Data );
}
}
@@ -387,7 +387,7 @@ void SpinButton::SetValue( long nValue )
if ( mnValue != nValue )
{
mnValue = nValue;
- StateChanged( StateChangedType::DATA );
+ StateChanged( StateChangedType::Data );
}
}
diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx
index d73eb50..68a9a51 100644
--- a/vcl/source/control/spinfld.cxx
+++ b/vcl/source/control/spinfld.cxx
@@ -779,7 +779,7 @@ void SpinField::StateChanged( StateChangedType nType )
{
Edit::StateChanged( nType );
- if ( nType == StateChangedType::ENABLE )
+ if ( nType == StateChangedType::Enable )
{
if ( mbSpin || ( GetStyle() & WB_DROPDOWN ) )
{
@@ -794,45 +794,45 @@ void SpinField::StateChanged( StateChangedType nType )
Invalidate( maDropDownRect );
}
}
- else if ( nType == StateChangedType::STYLE )
+ else if ( nType == StateChangedType::Style )
{
if ( GetStyle() & WB_REPEAT )
mbRepeat = true;
else
mbRepeat = false;
}
- else if ( nType == StateChangedType::ZOOM )
+ else if ( nType == StateChangedType::Zoom )
{
Resize();
if ( mpEdit )
mpEdit->SetZoom( GetZoom() );
Invalidate();
}
- else if ( nType == StateChangedType::CONTROLFONT )
+ else if ( nType == StateChangedType::ControlFont )
{
if ( mpEdit )
mpEdit->SetControlFont( GetControlFont() );
ImplInitSettings( true, false, false );
Invalidate();
}
... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
