vcl: rename other members of StateChangedType for consistency

Change-Id: Ifd3339813e5d3dfb54566fd226aaf2d2a199d59a
This commit is contained in:
Michael Stahl 2015-05-05 13:46:44 +02:00
parent f24590521c
commit 8fca0c44e8
104 changed files with 425 additions and 425 deletions

View File

@ -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() );

View File

@ -416,7 +416,7 @@ namespace svx
void SuggestionDisplay::StateChanged( StateChangedType nStateChange )
{
if( StateChangedType::VISIBLE == nStateChange )
if( StateChangedType::Visible == nStateChange )
implUpdateDisplay();
}

View File

@ -120,7 +120,7 @@ void IconChoicePage::StateChanged( StateChangedType nType )
{
Window::StateChanged( nType );
if ( nType == StateChangedType::CONTROLBACKGROUND )
if ( nType == StateChangedType::ControlBackground )
{
ImplInitSettings();
Invalidate();

View File

@ -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 );
}

View File

@ -920,7 +920,7 @@ void OfaAutocorrReplacePage::StateChanged(StateChangedType nStateChange)
{
SfxTabPage::StateChanged(nStateChange);
if (nStateChange == StateChangedType::INITSHOW)
if (nStateChange == StateChangedType::InitShow)
{
setTabs();
}

View File

@ -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 );

View File

@ -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.

View File

@ -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();
}

View File

@ -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.

View File

@ -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();

View File

@ -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();

View File

@ -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();

View File

@ -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();

View File

@ -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());
}

View File

@ -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();

View File

@ -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();
}

View File

@ -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 );

View File

@ -458,7 +458,7 @@ IMPL_LINK_NOARG(AddonsToolBarManager, Deactivate)
IMPL_LINK( AddonsToolBarManager, StateChanged, StateChangedType*, pStateChangedType )
{
if ( *pStateChangedType == StateChangedType::CONTROLBACKGROUND )
if ( *pStateChangedType == StateChangedType::ControlBackground )
{
CheckAndUpdateImages();
}

View File

@ -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();
}

View File

@ -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();

View File

@ -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;
};

View File

@ -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; }

View File

@ -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 )

View File

@ -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...

View File

@ -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; }

View File

@ -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

View File

@ -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

View File

@ -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 )

View File

@ -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
}

View File

@ -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();

View File

@ -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())
{

View File

@ -75,7 +75,7 @@ void ScRangeManagerTable::StateChanged( StateChangedType nStateChange )
{
SvSimpleTable::StateChanged(nStateChange);
if (nStateChange == StateChangedType::INITSHOW)
if (nStateChange == StateChangedType::InitShow)
{
if (GetEntryCount())
{

View File

@ -275,7 +275,7 @@ void CustomAnimationPane::StateChanged( StateChangedType nStateChange )
{
Control::StateChanged( nStateChange );
if( nStateChange == StateChangedType::VISIBLE )
if( nStateChange == StateChangedType::Visible )
updateMotionPathTags();
}

View File

@ -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

View File

@ -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();

View File

@ -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() )

View File

@ -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 );

View File

@ -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();

View File

@ -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 );

View File

@ -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();

View File

@ -270,7 +270,7 @@ namespace sfx2
{
switch ( i_nType )
{
case StateChangedType::INITSHOW:
case StateChangedType::InitShow:
impl_scheduleLayout();
break;
default:;

View File

@ -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() )

View File

@ -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() )

View File

@ -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 );

View File

@ -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

View File

@ -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 );

View File

@ -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() )

View File

@ -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());
}

View File

@ -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) )

View File

@ -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 );
}

View File

@ -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();
}

View File

@ -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;

View File

@ -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() );

View File

@ -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();

View File

@ -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();

View File

@ -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)

View File

@ -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();

View File

@ -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 );

View File

@ -401,7 +401,7 @@ void WizardDialog::Resize()
void WizardDialog::StateChanged( StateChangedType nType )
{
if ( nType == StateChangedType::INITSHOW )
if ( nType == StateChangedType::InitShow )
{
if ( IsDefaultSize() )
{

View File

@ -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

View File

@ -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 );

View File

@ -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:;
}
}

View File

@ -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);
}

View File

@ -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 );

View File

@ -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;

View File

@ -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() )

View File

@ -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 ) );

View File

@ -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 );
}

View File

@ -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);
}

View File

@ -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();
}
}

View File

@ -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();
}

View File

@ -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();

View File

@ -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 );
}
}

View File

@ -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();
}
}

View File

@ -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();

View File

@ -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 );
}
}

View File

@ -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 );
}
}

View File

@ -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();

View File

@ -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();

View File

@ -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 );
}
}

View File

@ -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 );
}
}

View File

@ -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();
}
else if ( nType == StateChangedType::CONTROLFOREGROUND )
else if ( nType == StateChangedType::ControlForeground )
{
if ( mpEdit )
mpEdit->SetControlForeground( GetControlForeground() );
ImplInitSettings( false, true, false );
Invalidate();
}
else if ( nType == StateChangedType::CONTROLBACKGROUND )
else if ( nType == StateChangedType::ControlBackground )
{
if ( mpEdit )
mpEdit->SetControlBackground( GetControlBackground() );
ImplInitSettings( false, false, true );
Invalidate();
}
else if( nType == StateChangedType::MIRRORING )
else if( nType == StateChangedType::Mirroring )
{
if( mpEdit )
mpEdit->StateChanged( StateChangedType::MIRRORING );
mpEdit->StateChanged( StateChangedType::Mirroring );
Resize();
}
}

View File

@ -1502,29 +1502,29 @@ void TabControl::StateChanged( StateChangedType nType )
{
Control::StateChanged( nType );
if ( nType == StateChangedType::INITSHOW )
if ( nType == StateChangedType::InitShow )
{
ImplPosCurTabPage();
if( mpTabCtrlData->mpListBox )
Resize();
}
else if ( nType == StateChangedType::UPDATEMODE )
else if ( nType == StateChangedType::UpdateMode )
{
if ( 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();

View File

@ -1248,43 +1248,43 @@ void VclMultiLineEdit::GetMaxVisColumnsAndLines( sal_uInt16& rnCols, sal_uInt16&
void VclMultiLineEdit::StateChanged( StateChangedType nType )
{
if( nType == StateChangedType::ENABLE )
if( nType == StateChangedType::Enable )
{
pImpVclMEdit->Enable( IsEnabled() );
ImplInitSettings( true, false, false );
}
else if( nType == StateChangedType::READONLY )
else if( nType == StateChangedType::ReadOnly )
{
pImpVclMEdit->SetReadOnly( IsReadOnly() );
}
else if ( nType == StateChangedType::ZOOM )
else if ( nType == StateChangedType::Zoom )
{
pImpVclMEdit->GetTextWindow()->SetZoom( GetZoom() );
ImplInitSettings( true, false, false );
Resize();
}
else if ( nType == StateChangedType::CONTROLFONT )
else if ( nType == StateChangedType::ControlFont )
{
ImplInitSettings( true, false, false );
Resize();
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 )
{
pImpVclMEdit->InitFromStyle( GetStyle() );
SetStyle( ImplInitStyle( GetStyle() ) );
}
else if ( nType == StateChangedType::INITSHOW )
else if ( nType == StateChangedType::InitShow )
{
if( IsPaintTransparent() )
{

View File

@ -80,7 +80,7 @@ int UIPreviewApp::Main()
pRealDialog->SetText(OUString("LibreOffice ui-previewer"));
pRealDialog->SetStyle(pDialog->GetStyle()|WB_CLOSEABLE);
/*
Force a new StateChangedType::INITSHOW for the edge case where pRoot
Force a new StateChangedType::InitShow for the edge case where pRoot
is not a dialog or contents of a dialog, but instead a visible floating window
which may have had initshow already done before it was given children
*/

View File

@ -1980,9 +1980,9 @@ void ImplBorderWindow::Resize()
void ImplBorderWindow::StateChanged( StateChangedType nType )
{
if ( (nType == StateChangedType::TEXT) ||
(nType == StateChangedType::IMAGE) ||
(nType == StateChangedType::DATA) )
if ( (nType == StateChangedType::Text) ||
(nType == StateChangedType::Image) ||
(nType == StateChangedType::Data) )
{
if ( IsReallyVisible() && mbFrameBorder )
{

View File

@ -234,7 +234,7 @@ void ButtonDialog::Resize()
void ButtonDialog::StateChanged( StateChangedType nType )
{
if ( nType == StateChangedType::INITSHOW )
if ( nType == StateChangedType::InitShow )
{
ImplPosControls();
for (btn_iterator it = maItemList.begin(); it != maItemList.end(); ++it)

View File

@ -635,7 +635,7 @@ Size bestmaxFrameSizeForScreenSize(const Size &rScreenSize)
void Dialog::StateChanged( StateChangedType nType )
{
if (nType == StateChangedType::INITSHOW)
if (nType == StateChangedType::InitShow)
{
DoInitialLayout();
@ -655,7 +655,7 @@ void Dialog::StateChanged( StateChangedType nType )
SystemWindow::StateChanged( nType );
if (nType == StateChangedType::CONTROLBACKGROUND)
if (nType == StateChangedType::ControlBackground)
{
ImplInitSettings();
Invalidate();

View File

@ -135,7 +135,7 @@ void DockingAreaWindow::StateChanged( StateChangedType nType )
{
Window::StateChanged( nType );
if ( nType == StateChangedType::VISIBLE )
if ( nType == StateChangedType::Visible )
ImplInvalidateMenubar( this );
}

View File

@ -742,16 +742,16 @@ void DockingWindow::StateChanged( StateChangedType nType )
{
switch(nType)
{
case StateChangedType::INITSHOW:
case StateChangedType::InitShow:
DoInitialLayout();
break;
case StateChangedType::CONTROLBACKGROUND:
case StateChangedType::ControlBackground:
ImplInitSettings();
Invalidate();
break;
case StateChangedType::STYLE:
case StateChangedType::Style:
mbDockable = (GetStyle() & WB_DOCKABLE) != 0;
break;

View File

@ -418,7 +418,7 @@ void Window::ImplCallInitShow()
{
mpWindowImpl->mbReallyShown = true;
mpWindowImpl->mbInInitShow = true;
StateChanged( StateChangedType::INITSHOW );
StateChanged( StateChangedType::InitShow );
mpWindowImpl->mbInInitShow = false;
vcl::Window* pWindow = mpWindowImpl->mpFirstOverlap;

View File

@ -551,14 +551,14 @@ bool FloatingWindow::Notify( NotifyEvent& rNEvt )
void FloatingWindow::StateChanged( StateChangedType nType )
{
if (nType == StateChangedType::INITSHOW)
if (nType == StateChangedType::InitShow)
{
DoInitialLayout();
}
SystemWindow::StateChanged( nType );
if ( nType == StateChangedType::CONTROLBACKGROUND )
if ( nType == StateChangedType::ControlBackground )
{
ImplInitSettings();
Invalidate();

View File

@ -24,7 +24,7 @@ namespace vcl {
void Window::EnableRTL ( bool bEnable )
{
StateChanged( StateChangedType::MIRRORING );
StateChanged( StateChangedType::Mirroring );
OutputDevice::EnableRTL(bEnable);
}

View File

@ -1601,7 +1601,7 @@ void VclExpander::StateChanged(StateChangedType nType)
{
VclBin::StateChanged( nType );
if (nType == StateChangedType::INITSHOW)
if (nType == StateChangedType::InitShow)
{
vcl::Window *pChild = get_child();
if (pChild)

View File

@ -989,8 +989,8 @@ void MenuBarWindow::StateChanged( StateChangedType nType )
{
Window::StateChanged( nType );
if ( ( nType == StateChangedType::CONTROLFOREGROUND ) ||
( nType == StateChangedType::CONTROLBACKGROUND ) )
if ( ( nType == StateChangedType::ControlForeground ) ||
( nType == StateChangedType::ControlBackground ) )
{
ImplInitMenuWindow( this, false, true );
Invalidate();

View File

@ -1160,7 +1160,7 @@ void MenuFloatingWindow::StateChanged( StateChangedType nType )
{
FloatingWindow::StateChanged( nType );
if ( ( nType == StateChangedType::CONTROLFOREGROUND ) || ( nType == StateChangedType::CONTROLBACKGROUND ) )
if ( ( nType == StateChangedType::ControlForeground ) || ( nType == StateChangedType::ControlBackground ) )
{
ImplInitMenuWindow( this, false, false );
Invalidate();

View File

@ -354,7 +354,7 @@ void MessBox::ImplPosControls()
void MessBox::StateChanged( StateChangedType nType )
{
if ( nType == StateChangedType::INITSHOW )
if ( nType == StateChangedType::InitShow )
{
ImplPosControls();
}

View File

@ -2607,15 +2607,15 @@ void SplitWindow::StateChanged( StateChangedType nType )
{
switch ( nType )
{
case StateChangedType::INITSHOW:
case StateChangedType::InitShow:
if ( IsUpdateMode() )
ImplCalcLayout();
break;
case StateChangedType::UPDATEMODE:
case StateChangedType::UpdateMode:
if ( IsUpdateMode() && IsReallyShown() )
ImplCalcLayout();
break;
case StateChangedType::CONTROLBACKGROUND:
case StateChangedType::ControlBackground:
ImplInitSettings();
Invalidate();
break;

View File

@ -824,23 +824,23 @@ void StatusBar::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 )
Invalidate();
else if ( (nType == StateChangedType::ZOOM) ||
(nType == StateChangedType::CONTROLFONT) )
else if ( (nType == StateChangedType::Zoom) ||
(nType == StateChangedType::ControlFont) )
{
mbFormat = true;
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();

View File

@ -233,7 +233,7 @@ void TabDialog::dispose()
void TabDialog::StateChanged( StateChangedType nType )
{
if ( nType == StateChangedType::INITSHOW )
if ( nType == StateChangedType::InitShow )
{
// Calculate the Layout only for the initialized state
if ( mbPosControls )

Some files were not shown because too many files have changed in this diff Show More