summaryrefslogtreecommitdiff
path: root/sfx2/source
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-10-06 14:48:16 +0200
committerStephan Bergmann <sbergman@redhat.com>2014-10-13 17:45:57 +0200
commitaf5ebbf7835441c767f91a620f109ee6722e57bd (patch)
treec72b2a1ddb5aa0a0a369be7babd516a5592d5fac /sfx2/source
parent1156d11ef0bb2bc3d71ae9299656db4fed66f073 (diff)
create a macro library for implementing bit-flags types
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>, changed from a macro- to a template-based solution. (Unfortunately MSVC 2012 does not support explicit conversion operators. Worked around that with explicit #ifs rather than some HAVE_EXPLICIT_CONVERSION_OPERATORS and SAL_EXPLICIT_CONVERSION_OPERATOR ainticipating we hopefully soon move to a baseline that requires unconditional support for them.) Change-Id: I4a89643b218d247e8e4a861faba458ec6dfe1396
Diffstat (limited to 'sfx2/source')
-rw-r--r--sfx2/source/dialog/backingwindow.cxx2
-rw-r--r--sfx2/source/dialog/titledockwin.cxx2
-rw-r--r--sfx2/source/sidebar/TitleBar.cxx4
3 files changed, 4 insertions, 4 deletions
diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx
index 08ccff1d73ea..53a09bae2539 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -356,7 +356,7 @@ void BackingWindow::Paint( const Rectangle& )
aClip.Exclude( maStartCentButtons );
- Push( PUSH_CLIPREGION );
+ Push( PushFlags::CLIPREGION );
IntersectClipRegion( aClip );
DrawWallpaper( Rectangle( Point( 0, 0 ), GetOutputSizePixel() ), aBack );
Pop();
diff --git a/sfx2/source/dialog/titledockwin.cxx b/sfx2/source/dialog/titledockwin.cxx
index b63f4bbf8d26..3d5c8e2baf61 100644
--- a/sfx2/source/dialog/titledockwin.cxx
+++ b/sfx2/source/dialog/titledockwin.cxx
@@ -162,7 +162,7 @@ namespace sfx2
SfxDockingWindow::Paint( i_rArea );
- Push( PUSH_FONT | PUSH_FILLCOLOR | PUSH_LINECOLOR );
+ Push( PushFlags::FONT | PushFlags::FILLCOLOR | PushFlags::LINECOLOR );
SetFillColor( GetSettings().GetStyleSettings().GetDialogColor() );
SetLineColor();
diff --git a/sfx2/source/sidebar/TitleBar.cxx b/sfx2/source/sidebar/TitleBar.cxx
index ca59c4b1c3df..fb1597cade79 100644
--- a/sfx2/source/sidebar/TitleBar.cxx
+++ b/sfx2/source/sidebar/TitleBar.cxx
@@ -157,7 +157,7 @@ css::uno::Reference<css::accessibility::XAccessible> TitleBar::CreateAccessible
void TitleBar::PaintTitle (const Rectangle& rTitleBox)
{
- Push(PUSH_FONT | PUSH_TEXTCOLOR);
+ Push(PushFlags::FONT | PushFlags::TEXTCOLOR);
Rectangle aTitleBox (rTitleBox);
@@ -192,7 +192,7 @@ void TitleBar::PaintTitle (const Rectangle& rTitleBox)
void TitleBar::PaintFocus (const Rectangle& rFocusBox)
{
- Push(PUSH_FONT | PUSH_TEXTCOLOR);
+ Push(PushFlags::FONT | PushFlags::TEXTCOLOR);
vcl::Font aFont(GetFont());
aFont.SetWeight(WEIGHT_BOLD);