summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-01-09 16:29:43 +0200
committerNoel Grandin <noel@peralex.com>2015-01-12 12:57:04 +0200
commita5b5ad9f9306d868430ed9efd210b95c24a15161 (patch)
treed028638ef38e1e7a062944923b0db1fd6f03d3f5 /sfx2
parent4b8f1dc1c8635c412b4669101e8871fa0cf26ff9 (diff)
fdo#84938: replace DATACHANGED_ constants with 'enum class'
and drop DATACHANGED_DATETIME because no-one is using it Change-Id: Id5ac9a7fbba0e35501ed82e5252f66858621f7ff
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/appl/newhelp.cxx8
-rw-r--r--sfx2/source/control/thumbnailview.cxx8
-rw-r--r--sfx2/source/dialog/templdlg.cxx2
-rw-r--r--sfx2/source/dialog/titledockwin.cxx7
-rw-r--r--sfx2/source/sidebar/SidebarController.cxx2
5 files changed, 14 insertions, 13 deletions
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 61fa1596f66a..f9b1377b4c54 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -1647,8 +1647,8 @@ void SfxHelpIndexWindow_Impl::DataChanged( const DataChangedEvent& rDCEvt )
{
Window::DataChanged( rDCEvt );
- if ( ( ( rDCEvt.GetType() == DATACHANGED_SETTINGS ) ||
- ( rDCEvt.GetType() == DATACHANGED_DISPLAY ) ) &&
+ if ( ( ( rDCEvt.GetType() == DataChangedEventType::SETTINGS ) ||
+ ( rDCEvt.GetType() == DataChangedEventType::DISPLAY ) ) &&
( rDCEvt.GetFlags() & SETTINGS_STYLE ) )
{
SetBackground( Wallpaper( GetSettings().GetStyleSettings().GetFaceColor() ) );
@@ -2468,8 +2468,8 @@ void SfxHelpTextWindow_Impl::DataChanged( const DataChangedEvent& rDCEvt )
{
Window::DataChanged( rDCEvt );
- if ( ( ( rDCEvt.GetType() == DATACHANGED_SETTINGS ) ||
- ( rDCEvt.GetType() == DATACHANGED_DISPLAY ) ) &&
+ if ( ( ( rDCEvt.GetType() == DataChangedEventType::SETTINGS ) ||
+ ( rDCEvt.GetType() == DataChangedEventType::DISPLAY ) ) &&
( rDCEvt.GetFlags() & SETTINGS_STYLE ) )
{
SetBackground( Wallpaper( GetSettings().GetStyleSettings().GetFaceColor() ) );
diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx
index 0ee422f94db6..91696f8efb7c 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -963,10 +963,10 @@ void ThumbnailView::DataChanged( const DataChangedEvent& rDCEvt )
{
Control::DataChanged( rDCEvt );
- if ( (rDCEvt.GetType() == DATACHANGED_FONTS) ||
- (rDCEvt.GetType() == DATACHANGED_DISPLAY) ||
- (rDCEvt.GetType() == DATACHANGED_FONTSUBSTITUTION) ||
- ((rDCEvt.GetType() == DATACHANGED_SETTINGS) &&
+ if ( (rDCEvt.GetType() == DataChangedEventType::FONTS) ||
+ (rDCEvt.GetType() == DataChangedEventType::DISPLAY) ||
+ (rDCEvt.GetType() == DataChangedEventType::FONTSUBSTITUTION) ||
+ ((rDCEvt.GetType() == DataChangedEventType::SETTINGS) &&
(rDCEvt.GetFlags() & SETTINGS_STYLE)) )
{
ImplInitSettings( true, true, true );
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 387069a395ae..5f9c4d062f93 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -292,7 +292,7 @@ SfxTemplatePanelControl::~SfxTemplatePanelControl (void)
void SfxTemplatePanelControl::DataChanged( const DataChangedEvent& _rDCEvt )
{
- if ( ( DATACHANGED_SETTINGS == _rDCEvt.GetType() ) &&
+ if ( ( DataChangedEventType::SETTINGS == _rDCEvt.GetType() ) &&
( 0 != ( SETTINGS_STYLE & _rDCEvt.GetFlags() ) ) )
{
pImpl->updateFamilyImages();
diff --git a/sfx2/source/dialog/titledockwin.cxx b/sfx2/source/dialog/titledockwin.cxx
index 74bc4eed5e01..fd57865e2dcb 100644
--- a/sfx2/source/dialog/titledockwin.cxx
+++ b/sfx2/source/dialog/titledockwin.cxx
@@ -287,12 +287,12 @@ namespace sfx2
switch ( i_rDataChangedEvent.GetType() )
{
- case DATACHANGED_SETTINGS:
+ case DataChangedEventType::SETTINGS:
if ( ( i_rDataChangedEvent.GetFlags() & SETTINGS_STYLE ) == 0)
break;
// else fall through.
- case DATACHANGED_FONTS:
- case DATACHANGED_FONTSUBSTITUTION:
+ case DataChangedEventType::FONTS:
+ case DataChangedEventType::FONTSUBSTITUTION:
{
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
@@ -315,6 +315,7 @@ namespace sfx2
Invalidate();
}
break;
+ default: break;
}
}
diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx
index 22223c32a52f..60b61c4dbd62 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -284,7 +284,7 @@ void SAL_CALL SidebarController::requestLayout (void)
void SidebarController::BroadcastPropertyChange (void)
{
- DataChangedEvent aEvent (DATACHANGED_USER);
+ DataChangedEvent aEvent (DataChangedEventType::USER);
mpParentWindow->NotifyAllChildren(aEvent);
mpParentWindow->Invalidate(INVALIDATE_CHILDREN);
}