sd/inc/pres.hxx|4 ++--
sd/source/core/sdpage.cxx | 10
+-
sd/source/ui/controller/slidelayoutcontroller.cxx |4 ++--
sd/source/ui/inc/ToolBarManager.hxx|6
+++---
sd/source/ui/sidebar/LayoutMenu.cxx|2 +-
sd/source/ui/slidesorter/cache/SlsRequestPriorityClass.hxx |8
sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx |4 ++--
sd/source/ui/slidesorter/inc/view/SlsTheme.hxx |6
+++---
sd/source/ui/slidesorter/view/SlsTheme.cxx |6
+++---
sd/source/ui/unoidl/DrawController.cxx |4 ++--
sd/source/ui/view/ToolBarManager.cxx |4 ++--
sd/source/ui/view/ViewShellImplementation.cxx |4 ++--
sd/source/ui/view/viewshe3.cxx |2 +-
sd/xml/layoutlist.xml |2 +-
test/user-template/user/config/soffice.cfg/simpress/layoutlist.xml |2 +-
15 files changed, 34 insertions(+), 34 deletions(-)
New commits:
commit fc233b52ce2acc1bcd7cecc3d51bcab870c81932
Author: Stephan Bergmann
Date: Fri Apr 22 09:53:59 2016 +0200
Avoid reserved identifiers
Change-Id: I3542622f6b3752f7254abd07d9f3a8141f10c3dc
diff --git a/sd/inc/pres.hxx b/sd/inc/pres.hxx
index 3bc3db7..1909672 100644
--- a/sd/inc/pres.hxx
+++ b/sd/inc/pres.hxx
@@ -47,7 +47,7 @@ enum PresObjKind
enum AutoLayout
{
// new layouts with enum/text/chart/org/clip merged to content
-AUTOLAYOUT__START = 0,
+AUTOLAYOUT_START = 0,
AUTOLAYOUT_TITLE = 0, ///< Title Slide
AUTOLAYOUT_TITLE_CONTENT = 1, ///< Title, Content
AUTOLAYOUT_TITLE_2CONTENT = 3, ///< Title and 2 Content
@@ -98,7 +98,7 @@ enum AutoLayout
AUTOLAYOUT_HANDOUT9 = 31,
AUTOLAYOUT_4CLIPART = 33,
AUTOLAYOUT_6CLIPART = 34,
-AUTOLAYOUT__END
+AUTOLAYOUT_END
};
enum PageKind
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index c903177..409bf445 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -1198,7 +1198,7 @@ LayoutDescriptor::LayoutDescriptor( int k0, int k1, int
k2, int k3, int k4, int
static const LayoutDescriptor& GetLayoutDescriptor( AutoLayout eLayout )
{
-static const LayoutDescriptor aLayouts[AUTOLAYOUT__END-AUTOLAYOUT__START] =
+static const LayoutDescriptor aLayouts[AUTOLAYOUT_END-AUTOLAYOUT_START] =
{
LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_TEXT ),
// AUTOLAYOUT_TITLE
LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE ),
// AUTOLAYOUT_ENUM
@@ -1240,10 +1240,10 @@ static const LayoutDescriptor& GetLayoutDescriptor(
AutoLayout eLayout )
PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE
)
};
-if( (eLayout < AUTOLAYOUT__START) || (eLayout >= AUTOLAYOUT__END) )
+if( (eLayout < AUTOLAYOUT_START) || (eLayout >= AUTOLAYOUT_END) )
eLayout = AUTOLAYOUT_NONE;
-return aLayouts[ eLayout - AUTOLAYOUT__START ];
+return aLayouts[ eLayout - AUTOLAYOUT_START ];
}
rtl::OUString enumtoString(AutoLayout aut)
@@ -1272,8 +1272,8 @@ rtl::OUString enumtoString(AutoLayout aut)
case AUTOLAYOUT_TITLE_6CONTENT:
retstr="AUTOLAYOUT_TITLE_6CONTENT";
break;
-case AUTOLAYOUT__START:
-retstr="AUTOLAYOUT__START";
+case AUTOLAYOUT_START:
+retstr="AUTOLAYOUT_START";
break;
case AUTOLAYOUT_TITLE_2CONTENT_CONTENT:
retstr="AUTOLAYOUT_TITLE_2CONTENT_CONTENT";
diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx
b/sd/source/ui/controller/slidelayoutcontroller.cxx
index 15742ef..0d03698 100644
--- a/sd/source/ui/controller/slidelayoutcontroller.cxx
+++ b/sd/source/ui/controller/slidelayoutcontroller.cxx
@@ -283,7 +283,7 @@ void LayoutToolbarMenu::SelectHdl(void* pControl)
Sequence< PropertyValue > aArgs;
-AutoLayout eLayout = AUTOLAYOUT__END;
+AutoLayout eLayout = AUTOLAYOUT_END;
OUString sCommandURL( mrController.getCommandURL() );
@@ -296,7 +296,7 @@ void LayoutToolbarMenu::SelectHdl(void* pControl)
eLayout = static_cast< AutoLayout >(mpLayoutSet2->GetSelectItemId()-1);
}
-if( eLayout != AUTOLAYOUT__END )
+if( eLayout != AUTOLAYOUT_END )
{
aArgs = Sequence< PropertyValue >(1);
aArgs[0].Name = "WhatLayout";
diff --git a/sd/source/ui/inc/ToolBarManager.hxx
b/sd/source/ui/inc/ToolBarManager.hxx
index 606ccdd..d9bf41b 100644
--- a/sd/source/ui/inc/ToolBarManager.hxx
+++ b/sd/source/ui/inc/ToolBarManager.hxx
@@ -120,14 +120,14 @@ public:
/** The set of tool bar g