CWS-TOOLING: integrate CWS renaissance1

2 files changed, 17 insertions, 4 deletions

diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx
index 6811da762934..7cdee6a4efa5 100755
--- a/sd/inc/drawdoc.hxx
+++ b/sd/inc/drawdoc.hxx
@@ -493,6 +493,9 @@ public:
             This flag indicates whether to show the background shape.
         @param bIsPageObj
             This flag indicates whether to show the shapes on the master page.
+        @param nInsertPosition
+            Position where to insert the standard page.  When -1 then the
+            new page set is inserted after the current page.
 
         @return
             Returns an index of the inserted pages that can be used with the
@@ -506,7 +509,8 @@ public:
         AutoLayout eStandardLayout,
         AutoLayout eNotesLayout,
         BOOL bIsPageBack,
-        BOOL bIsPageObj);
+        BOOL bIsPageObj,
+        const sal_Int32 nInsertPosition = -1);
 
     /** This method acts as a simplified front end for the more complex
         <member>DuplicatePage()</member> method.
@@ -549,6 +553,9 @@ public:
             This flag indicates whether to show the background shape.
         @param bIsPageObj
             This flag indicates whether to show the shapes on the master page.
+        @param nInsertPosition
+            Position where to insert the standard page.  When -1 then the
+            new page set is inserted after the current page.
 
         @return
             Returns an index of the inserted pages that can be used with the
@@ -562,7 +569,8 @@ public:
         AutoLayout eStandardLayout,
         AutoLayout eNotesLayout,
         BOOL bIsPageBack,
-        BOOL bIsPageObj);
+        BOOL bIsPageObj,
+        const sal_Int32 nInsertPosition = -1);
 
     /** return the document fonts for latin, cjk and ctl according to the current
         languages set at this document */
@@ -620,6 +628,9 @@ private:
             The standard page to insert.
         @param pNotesPage
             The notes page to insert.
+        @param nInsertPosition
+            Position where to insert the standard page.  When -1 then the
+            new page set is inserted after the current page.
 
         @return
             Returns an index of the inserted pages that can be used with the
@@ -634,9 +645,9 @@ private:
         AutoLayout eNotesLayout,
         BOOL bIsPageBack,
         BOOL bIsPageObj,
-
         SdPage* pStandardPage,
-        SdPage* pNotesPage);
+        SdPage* pNotesPage,
+        sal_Int32 nInsertPosition = -1);
 
     /** Set up a newly created page and insert it into the list of pages.
         @param pPreviousPage
diff --git a/sd/inc/glob.hrc b/sd/inc/glob.hrc
index 73189f135e62..89b2b670adf9 100755
--- a/sd/inc/glob.hrc
+++ b/sd/inc/glob.hrc
@@ -154,5 +154,7 @@
 #define STR_CUSTOMANIMATIONPANE                 RID_GLOB_START+227
 #define STR_SLIDE_TRANSITION_PANE               RID_GLOB_START+228
 
+#define RID_SLIDESORTER_ICONS                   RID_GLOB_START+227
+