[Libreoffice-commits] core.git: include/sfx2 sfx2/source

[Stephan Bergmann]

 include/sfx2/sidebar/Theme.hxx |   20 ++++++++++----------
 sfx2/source/sidebar/Theme.cxx  |   40 ++++++++++++++++++++--------------------
 2 files changed, 30 insertions(+), 30 deletions(-)

New commits:
commit d02a015593fc129d55e03e2b6d4caacd4e6d3787
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Apr 6 17:07:43 2016 +0200

    Avoid reserved identifiers
    
    Change-Id: I5a4415c1f722cfd57d07f656e235a824b5ef521c

diff --git a/include/sfx2/sidebar/Theme.hxx b/include/sfx2/sidebar/Theme.hxx
index 6cec998..2e12de3 100644
--- a/include/sfx2/sidebar/Theme.hxx
+++ b/include/sfx2/sidebar/Theme.hxx
@@ -60,10 +60,10 @@ class SFX2_DLLPUBLIC Theme
 public:
     enum ThemeItem
     {
-        __Begin,
-        __Pre_Image = __Begin,
+        Begin_,
+        Pre_Image_ = Begin_,
 
-        __AnyItem = __Pre_Image,
+        AnyItem_ = Pre_Image_,
 
         Image_Grip,
         Image_Expand,
@@ -73,7 +73,7 @@ public:
         Image_Closer,
         Image_CloseIndicator,
 
-        __Image_Color,
+        Image_Color_,
 
         Color_DeckTitleFont,
         Color_PanelTitleFont,
@@ -83,7 +83,7 @@ public:
         Color_Highlight,
         Color_HighlightText,
 
-        __Color_Paint,
+        Color_Paint_,
 
         Paint_DeckBackground,
         Paint_DeckTitleBarBackground,
@@ -100,7 +100,7 @@ public:
         Paint_ToolBoxBorderBottomRight,
         Paint_DropDownBackground,
 
-        __Paint_Int,
+        Paint_Int_,
 
         Int_DeckTitleBarHeight,
         Int_DeckBorderSize,
@@ -120,18 +120,18 @@ public:
         Int_TabBarBottomPadding,
         Int_ButtonCornerRadius,
 
-        __Int_Bool,
+        Int_Bool_,
 
         Bool_UseSystemColors,
         Bool_IsHighContrastModeActive,
 
-        __Bool_Rect,
+        Bool_Rect_,
 
         Rect_ToolBoxPadding,
         Rect_ToolBoxBorder,
 
-        __Post_Rect,
-        __End=__Post_Rect
+        Post_Rect_,
+        End_=Post_Rect_
     };
 
     static Image GetImage (const ThemeItem eItem);
diff --git a/sfx2/source/sidebar/Theme.cxx b/sfx2/source/sidebar/Theme.cxx
index 241767b..6c6b357 100644
--- a/sfx2/source/sidebar/Theme.cxx
+++ b/sfx2/source/sidebar/Theme.cxx
@@ -448,7 +448,7 @@ void SAL_CALL Theme::setPropertyValue (
         aOldValue,
         rValue);
 
-    if (DoVetoableListenersVeto(GetVetoableListeners(__AnyItem, false), aEvent))
+    if (DoVetoableListenersVeto(GetVetoableListeners(AnyItem_, false), aEvent))
         return;
     if (DoVetoableListenersVeto(GetVetoableListeners(eItem, false), aEvent))
         return;
@@ -456,7 +456,7 @@ void SAL_CALL Theme::setPropertyValue (
     maRawValues[eItem] = rValue;
     ProcessNewValue(rValue, eItem, eType);
 
-    BroadcastPropertyChange(GetChangeListeners(__AnyItem, false), aEvent);
+    BroadcastPropertyChange(GetChangeListeners(AnyItem_, false), aEvent);
     BroadcastPropertyChange(GetChangeListeners(eItem, false), aEvent);
 }
 
@@ -486,7 +486,7 @@ void SAL_CALL Theme::addPropertyChangeListener(
         css::lang::WrappedTargetException,
         css::uno::RuntimeException, std::exception)
 {
-    ThemeItem eItem (__AnyItem);
+    ThemeItem eItem (AnyItem_);
     if (rsPropertyName.getLength() > 0)
     {
         PropertyNameToIdMap::const_iterator iId (maPropertyNameToIdMap.find(rsPropertyName));
@@ -511,7 +511,7 @@ void SAL_CALL Theme::removePropertyChangeListener(
         css::lang::WrappedTargetException,
         css::uno::RuntimeException, std::exception)
 {
-    ThemeItem eItem (__AnyItem);
+    ThemeItem eItem (AnyItem_);
     if (rsPropertyName.getLength() > 0)
     {
         PropertyNameToIdMap::const_iterator iId (maPropertyNameToIdMap.find(rsPropertyName));
@@ -546,7 +546,7 @@ void SAL_CALL Theme::addVetoableChangeListener(
         css::lang::WrappedTargetException,
         css::uno::RuntimeException, std::exception)
 {
-    ThemeItem eItem (__AnyItem);
+    ThemeItem eItem (AnyItem_);
     if (rsPropertyName.getLength() > 0)
     {
         PropertyNameToIdMap::const_iterator iId (maPropertyNameToIdMap.find(rsPropertyName));
@@ -571,7 +571,7 @@ void SAL_CALL Theme::removeVetoableChangeListener(
         css::lang::WrappedTargetException,
         css::uno::RuntimeException, std::exception)
 {
-    ThemeItem eItem (__AnyItem);
+    ThemeItem eItem (AnyItem_);
     if (rsPropertyName.getLength() > 0)
     {
         PropertyNameToIdMap::const_iterator iId (maPropertyNameToIdMap.find(rsPropertyName));
@@ -603,7 +603,7 @@ css::uno::Sequence<css::beans::Property> SAL_CALL Theme::getProperties()
 {
     ::std::vector<beans::Property> aProperties;
 
-    for (sal_Int32 nItem(__Begin),nEnd(__End); nItem!=nEnd; ++nItem)
+    for (sal_Int32 nItem(Begin_),nEnd(End_); nItem!=nEnd; ++nItem)
     {
         const ThemeItem eItem (static_cast<ThemeItem>(nItem));
         const PropertyType eType (GetPropertyType(eItem));
@@ -660,13 +660,13 @@ sal_Bool SAL_CALL Theme::hasPropertyByName (const ::rtl::OUString& rsPropertyNam
 
 void Theme::SetupPropertyMaps()
 {
-    maPropertyIdToNameMap.resize(__Post_Rect);
-    maImages.resize(__Image_Color - __Pre_Image - 1);
-    maColors.resize(__Color_Paint - __Image_Color - 1);
-    maPaints.resize(__Paint_Int - __Color_Paint - 1);
-    maIntegers.resize(__Int_Bool - __Paint_Int - 1);
-    maBooleans.resize(__Bool_Rect - __Int_Bool - 1);
-    maRectangles.resize(__Post_Rect - __Bool_Rect - 1);
+    maPropertyIdToNameMap.resize(Post_Rect_);
+    maImages.resize(Image_Color_ - Pre_Image_ - 1);
+    maColors.resize(Color_Paint_ - Image_Color_ - 1);
+    maPaints.resize(Paint_Int_ - Color_Paint_ - 1);
+    maIntegers.resize(Int_Bool_ - Paint_Int_ - 1);
+    maBooleans.resize(Bool_Rect_ - Int_Bool_ - 1);
+    maRectangles.resize(Post_Rect_ - Bool_Rect_ - 1);
 
     #define AddEntry(e) maPropertyNameToIdMap[OUString(#e)]=e; maPropertyIdToNameMap[e]=#e
 
@@ -833,17 +833,17 @@ sal_Int32 Theme::GetIndex (const ThemeItem eItem, const PropertyType eType)
     switch(eType)
     {
         case PT_Image:
-            return eItem - __Pre_Image-1;
+            return eItem - Pre_Image_-1;
         case PT_Color:
-            return eItem - __Image_Color-1;
+            return eItem - Image_Color_-1;
         case PT_Paint:
-            return eItem - __Color_Paint-1;
+            return eItem - Color_Paint_-1;
         case PT_Integer:
-            return eItem - __Paint_Int-1;
+            return eItem - Paint_Int_-1;
         case PT_Boolean:
-            return eItem - __Int_Bool-1;
+            return eItem - Int_Bool_-1;
         case PT_Rectangle:
-            return eItem - __Bool_Rect-1;
+            return eItem - Bool_Rect_-1;
 
         default:
             OSL_ASSERT(false);