diff options
author | Michael Stahl <mstahl@redhat.com> | 2015-05-05 13:46:44 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2015-05-05 15:51:11 +0200 |
commit | 8fca0c44e8f21fa2ee1000665856292d5a1c44e9 (patch) | |
tree | e750236facc3fd44b051a70aaa0e81be0fc2c002 /sfx2 | |
parent | f24590521c5ffea13c0aecdb2f30fdd39bbfbc45 (diff) |
vcl: rename other members of StateChangedType for consistency
Change-Id: Ifd3339813e5d3dfb54566fd226aaf2d2a199d59a
Diffstat (limited to 'sfx2')
-rw-r--r-- | sfx2/source/control/thumbnailview.cxx | 16 | ||||
-rw-r--r-- | sfx2/source/dialog/basedlgs.cxx | 4 | ||||
-rw-r--r-- | sfx2/source/dialog/dockwin.cxx | 4 | ||||
-rw-r--r-- | sfx2/source/dialog/recfloat.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/dialog/srchdlg.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/dialog/templdlg.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/dialog/titledockwin.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/view/frame2.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/view/viewfrm2.cxx | 2 |
9 files changed, 18 insertions, 18 deletions
diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx index 53e017aae9ed..25f63c48c79a 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 2fd86a789a01..d33f89512308 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 4fec7bdaede8..0c6af19548c8 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 742aa883900a..60ac3df51cb2 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 0da322cbbcfb..57e72cb78015 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 e3ef5e4afa7f..802f8bad263a 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 5da01bfa3aab..402f006589fb 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 390a9c52d241..92cb344cf2cd 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 d42f4832a884..726e83a92f90 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() ) |