CWS gnumake: resync to m91; conflicts unresolved

25 files changed, 138 insertions, 171 deletions

diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx
index 0689dc0e3851..ddbf5cfc4388 100755
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -27,6 +27,8 @@
 
 #include "precompiled_sd.hxx"
 
+#include <com/sun/star/beans/XPropertySet.hpp>
+
 #include "DocumentRenderer.hxx"
 #include "DocumentRenderer.hrc"
 
@@ -466,6 +468,7 @@ namespace {
                                     GetSlidesPerPageSequence(),
                                     0,
                                     OUString( RTL_CONSTASCII_USTRINGPARAM( "List" ) ),
+                                    Sequence< sal_Bool >(),
                                     aContentOpt
                                     )
                                 );
@@ -479,6 +482,7 @@ namespace {
                                     CreateChoice(_STR_IMPRESS_PRINT_UI_ORDER_CHOICES),
                                     0,
                                     OUString( RTL_CONSTASCII_USTRINGPARAM( "List" ) ),
+                                    Sequence< sal_Bool >(),
                                     aSlidesPerPageOpt )
                                 );
             }
@@ -554,6 +558,7 @@ namespace {
                                     CreateChoice(_STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES),
                                     0,
                                     OUString( RTL_CONSTASCII_USTRINGPARAM( "Radio" ) ),
+                                    Sequence< sal_Bool >(),
                                     aPageOptionsOpt
                                     )
                                 );
@@ -569,6 +574,7 @@ namespace {
                                     CreateChoice(_STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES_DRAW),
                                     0,
                                     OUString( RTL_CONSTASCII_USTRINGPARAM( "Radio" ) ),
+                                    Sequence< sal_Bool >(),
                                     aPageOptionsOpt
                                     )
                                 );
@@ -600,6 +606,7 @@ namespace {
                                 CreateChoice(_STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE_LIST),
                                 0,
                                 OUString( RTL_CONSTASCII_USTRINGPARAM( "List" ) ),
+                                Sequence< sal_Bool >(),
                                 aIncludeOpt
                                 )
                             );
@@ -997,6 +1004,9 @@ namespace {
         {
             SdPage& rHandoutPage (*rDocument.GetSdPage(0, PK_HANDOUT));
 
+            Reference< com::sun::star::beans::XPropertySet > xHandoutPage( rHandoutPage.getUnoPage(), UNO_QUERY );
+            const rtl::OUString sPageNumber( RTL_CONSTASCII_USTRINGPARAM( "Number" ) );
+
             // Collect the page objects of the handout master.
             std::vector<SdrPageObj*> aHandoutPageObjects;
             SdrObjListIter aShapeIter (rHandoutPage);
@@ -1051,7 +1061,15 @@ namespace {
                 }
             }
 
-            rViewShell.SetPrintedHandoutPageNum(mnHandoutPageIndex + 1);
+            if( xHandoutPage.is() ) try
+            {
+                xHandoutPage->setPropertyValue( sPageNumber, Any( static_cast<sal_Int16>(mnHandoutPageIndex) ) );
+            }
+            catch( Exception& )
+            {
+            }
+            rViewShell.SetPrintedHandoutPageNum( mnHandoutPageIndex + 1 );
+
             MapMode aMap (rPrinter.GetMapMode());
             rPrinter.SetMapMode(maMap);
 
@@ -1068,6 +1086,13 @@ namespace {
                 msPageString,
                 maPageStringOffset);
 
+            if( xHandoutPage.is() ) try
+            {
+                xHandoutPage->setPropertyValue( sPageNumber, Any( static_cast<sal_Int16>(0) ) );
+            }
+            catch( Exception& )
+            {
+            }
             rViewShell.SetPrintedHandoutPageNum(1);
 
             // Restore outlines.
@@ -1081,7 +1106,8 @@ namespace {
                         pPathObj->SetMergedItem(XLineStyleItem(XLINE_SOLID));
                 }
             }
-        }
+
+       }
 
     private:
         const USHORT mnHandoutPageIndex;
@@ -1224,6 +1250,7 @@ public:
             return;
 
         bool bIsValueChanged = processProperties( rOptions );
+        bool bIsPaperChanged = false;
 
         // The RenderDevice property is handled specially: its value is
         // stored in mpPrinter instead of being retrieved on demand.
@@ -1235,14 +1262,21 @@ public:
             VCLXDevice* pDevice = VCLXDevice::GetImplementation(xRenderDevice);
             OutputDevice* pOut = pDevice ? pDevice->GetOutputDevice() : NULL;
             mpPrinter = dynamic_cast<Printer*>(pOut);
+            Size aPageSizePixel = mpPrinter ? mpPrinter->GetPaperSizePixel() : Size();
+            if( aPageSizePixel != maPrinterPageSizePixel )
+            {
+                bIsPaperChanged = true;
+                maPrinterPageSizePixel = aPageSizePixel;
+            }
         }
 
         if (bIsValueChanged)
         {
             if ( ! mpOptions )
                 mpOptions.reset(new PrintOptions(*this, maSlidesPerPage));
-            PreparePages();
         }
+        if( bIsValueChanged || bIsPaperChanged )
+            PreparePages();
     }
 
 
@@ -1372,6 +1406,7 @@ private:
     ViewShellBase& mrBase;
     bool mbIsDisposed;
     Printer* mpPrinter;
+    Size maPrinterPageSizePixel;
     ::boost::scoped_ptr<PrintOptions> mpOptions;
     ::std::vector< ::boost::shared_ptr< ::sd::PrinterPage> > maPrinterPages;
     ::boost::scoped_ptr<DrawView> mpPrintView;
@@ -1887,12 +1922,17 @@ private:
                 ++nShapeCount;
         }
 
+        const USHORT nPageCount = mrBase.GetDocument()->GetSdPageCount(PK_STANDARD);
+        const USHORT nHandoutPageCount = nShapeCount ? (nPageCount + nShapeCount - 1) / nShapeCount : 0;
+        pViewShell->SetPrintedHandoutPageCount( nHandoutPageCount );
+        mrBase.GetDocument()->setHandoutPageCount( nHandoutPageCount );
+
         // Distribute pages to handout pages.
         ::std::vector<USHORT> aPageIndices;
         std::vector<SdPage*> aPagesVector;
         for (USHORT
                  nIndex=0,
-                 nCount=mrBase.GetDocument()->GetSdPageCount(PK_STANDARD),
+                 nCount= nPageCount,
                  nHandoutPageIndex=0;
              nIndex <= nCount;
              ++nIndex)
diff --git a/sd/source/ui/view/GraphicViewShellBase.cxx b/sd/source/ui/view/GraphicViewShellBase.cxx
index 3f4996d168d2..8845a6b125ad 100755
--- a/sd/source/ui/view/GraphicViewShellBase.cxx
+++ b/sd/source/ui/view/GraphicViewShellBase.cxx
@@ -62,7 +62,11 @@ SfxViewShell* __EXPORT GraphicViewShellBase::CreateInstance (
 void GraphicViewShellBase::RegisterFactory( USHORT nPrio )
 {
     pFactory = new SfxViewFactory(
+<<<<<<< local
         &CreateInstance,&InitFactory,nPrio);
+=======
+        &CreateInstance,&InitFactory,nPrio,"Default");
+>>>>>>> other
     InitFactory();
 }
 void GraphicViewShellBase::InitFactory()
diff --git a/sd/source/ui/view/ImpressViewShellBase.cxx b/sd/source/ui/view/ImpressViewShellBase.cxx
index 0f62dea701e4..c7318c413231 100644..100755
--- a/sd/source/ui/view/ImpressViewShellBase.cxx
+++ b/sd/source/ui/view/ImpressViewShellBase.cxx
@@ -62,7 +62,11 @@ SfxViewShell* __EXPORT ImpressViewShellBase::CreateInstance (
 void ImpressViewShellBase::RegisterFactory( USHORT nPrio )
 {
     pFactory = new SfxViewFactory(
+<<<<<<< local
         &CreateInstance,&InitFactory,nPrio);
+=======
+        &CreateInstance,&InitFactory,nPrio,"Default");
+>>>>>>> other
     InitFactory();
 }
 void ImpressViewShellBase::InitFactory()
diff --git a/sd/source/ui/view/OutlineViewShellBase.cxx b/sd/source/ui/view/OutlineViewShellBase.cxx
index db936a880512..37cbc84ad181 100644..100755
--- a/sd/source/ui/view/OutlineViewShellBase.cxx
+++ b/sd/source/ui/view/OutlineViewShellBase.cxx
@@ -60,7 +60,11 @@ SfxViewShell* __EXPORT OutlineViewShellBase::CreateInstance (
 void OutlineViewShellBase::RegisterFactory( USHORT nPrio )
 {
     pFactory = new SfxViewFactory(
+<<<<<<< local
         &CreateInstance,&InitFactory,nPrio);
+=======
+        &CreateInstance,&InitFactory,nPrio,"Outline");
+>>>>>>> other
     InitFactory();
 }
 void OutlineViewShellBase::InitFactory()
diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index 356c03b82387..7c94e7b27b07 100755
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -942,7 +942,9 @@ void Outliner::RestoreStartPosition (void)
         else if (mpViewShell->ISA(OutlineViewShell))
         {
             // Set cursor to its old position.
-            GetView(0)->SetSelection (maStartSelection);
+            OutlinerView* pView = GetView(0);
+            if (pView != NULL)
+                pView->SetSelection (maStartSelection);
         }
     }
 }
diff --git a/sd/source/ui/view/PresentationViewShellBase.cxx b/sd/source/ui/view/PresentationViewShellBase.cxx
index 46be56156d85..4195f45cb5df 100644..100755
--- a/sd/source/ui/view/PresentationViewShellBase.cxx
+++ b/sd/source/ui/view/PresentationViewShellBase.cxx
@@ -64,7 +64,11 @@ SfxViewShell* __EXPORT PresentationViewShellBase::CreateInstance (
 void PresentationViewShellBase::RegisterFactory( USHORT nPrio )
 {
     pFactory = new SfxViewFactory(
+<<<<<<< local
         &CreateInstance,&InitFactory,nPrio);
+=======
+        &CreateInstance,&InitFactory,nPrio,"FullScreenPresentation");
+>>>>>>> other
     InitFactory();
 }
 void PresentationViewShellBase::InitFactory()
diff --git a/sd/source/ui/view/SlideSorterViewShellBase.cxx b/sd/source/ui/view/SlideSorterViewShellBase.cxx
index 8e13fe869a83..c7b4641f793d 100644..100755
--- a/sd/source/ui/view/SlideSorterViewShellBase.cxx
+++ b/sd/source/ui/view/SlideSorterViewShellBase.cxx
@@ -64,7 +64,11 @@ SfxViewShell* __EXPORT SlideSorterViewShellBase::CreateInstance (
 void SlideSorterViewShellBase::RegisterFactory( USHORT nPrio )
 {
     pFactory = new SfxViewFactory(
+<<<<<<< local
         &CreateInstance,&InitFactory,nPrio);
+=======
+        &CreateInstance,&InitFactory,nPrio,"SlideSorter");
+>>>>>>> other
     InitFactory();
 }
 
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
index 3c686cd26941..107065f8e19c 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -258,7 +258,11 @@ SfxViewShell* __EXPORT ViewShellBase::CreateInstance (
 void ViewShellBase::RegisterFactory( USHORT nPrio )
 {
     pFactory = new SfxViewFactory(
+<<<<<<< local
         &CreateInstance,&InitFactory,nPrio);
+=======
+        &CreateInstance,&InitFactory,nPrio,"Default");
+>>>>>>> other
     InitFactory();
 }
 void ViewShellBase::InitFactory()
diff --git a/sd/source/ui/view/ViewShellManager.cxx b/sd/source/ui/view/ViewShellManager.cxx
index c25c0f11270a..c1ffcb884cd1 100755
--- a/sd/source/ui/view/ViewShellManager.cxx
+++ b/sd/source/ui/view/ViewShellManager.cxx
@@ -228,8 +228,10 @@ private:
 
     DECL_LINK(WindowEventHandler, VclWindowEvent*);
 
+#ifdef VERBOSE
     void DumpShellStack (const ShellStack& rStack);
     void DumpSfxShellStack (void);
+#endif
 
     /** To be called before a shell is taken fom the SFX shell stack.  This
         method deactivates an active text editing to avoid problems with
@@ -1319,6 +1321,7 @@ void ViewShellManager::Implementation::Shutdown (void)
 
 
 
+#ifdef VERBOSE
 void ViewShellManager::Implementation::DumpShellStack (const ShellStack& rStack)
 {
     ShellStack::const_reverse_iterator iEntry;
@@ -1345,7 +1348,7 @@ void ViewShellManager::Implementation::DumpSfxShellStack (void)
         aSfxShellStack.push_back(mrBase.GetSubShell(nIndex));
     DumpShellStack(aSfxShellStack);
 }
-
+#endif
 
 
 
diff --git a/sd/source/ui/view/drtxtob.cxx b/sd/source/ui/view/drtxtob.cxx
index 8b88be3682e3..9eb0a3b2ff8c 100755
--- a/sd/source/ui/view/drtxtob.cxx
+++ b/sd/source/ui/view/drtxtob.cxx
@@ -384,19 +384,25 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet )
 
             case SID_THES:
             {
-                EditView & rEditView = mpView->GetTextEditOutlinerView()->GetEditView();;
-                String          aStatusVal;
-                LanguageType    nLang = LANGUAGE_NONE;
-                bool bIsLookUpWord = GetStatusValueForThesaurusFromContext( aStatusVal, nLang, rEditView );
-                rSet.Put( SfxStringItem( SID_THES, aStatusVal ) );
-
-                // disable "Thesaurus" context menu entry if there is nothing to look up
-                lang::Locale aLocale( SvxCreateLocale( nLang ) );
-                uno::Reference< linguistic2::XThesaurus > xThes( LinguMgr::GetThesaurus() );
-                if (!bIsLookUpWord ||
-                    !xThes.is() || nLang == LANGUAGE_NONE || !xThes->hasLocale( aLocale ))
+                if( mpView && mpView->GetTextEditOutlinerView() )
+                {
+                    EditView & rEditView = mpView->GetTextEditOutlinerView()->GetEditView();;
+                    String          aStatusVal;
+                    LanguageType    nLang = LANGUAGE_NONE;
+                    bool bIsLookUpWord = GetStatusValueForThesaurusFromContext( aStatusVal, nLang, rEditView );
+                    rSet.Put( SfxStringItem( SID_THES, aStatusVal ) );
+
+                    // disable "Thesaurus" context menu entry if there is nothing to look up
+                    lang::Locale aLocale( SvxCreateLocale( nLang ) );
+                    uno::Reference< linguistic2::XThesaurus > xThes( LinguMgr::GetThesaurus() );
+                    if (!bIsLookUpWord ||
+                        !xThes.is() || nLang == LANGUAGE_NONE || !xThes->hasLocale( aLocale ))
+                        rSet.DisableItem( SID_THES );
+                }
+                else
+                {
                     rSet.DisableItem( SID_THES );
-
+                }
                 //! avoid puting the same item as SfxBoolItem at the end of this function
                 nSlotId = 0;
             }
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index 98d0b7551705..5fbd400d7520 100755
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -1244,6 +1244,7 @@ BOOL DrawViewShell::SwitchPage(USHORT nSelectedPage)
         rBindings.Invalidate(SID_DELETE_MASTER_PAGE, TRUE, FALSE);
         rBindings.Invalidate(SID_DELETE_PAGE, TRUE, FALSE);
         rBindings.Invalidate(SID_ASSIGN_LAYOUT,TRUE,FALSE);
+        rBindings.Invalidate(SID_INSERTPAGE,TRUE,FALSE);
         UpdatePreview( mpActualPage );
 
         mpDrawView->AdjustMarkHdl();
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 3102dc726a61..7aaba7d9c4fa 100755
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -958,7 +958,8 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
 SdPage* DrawViewShell::CreateOrDuplicatePage (
     SfxRequest& rRequest,
     PageKind ePageKind,
-    SdPage* pPage)
+    SdPage* pPage,
+    const sal_Int32 nInsertPosition)
 {
     SdPage* pNewPage = NULL;
     if (ePageKind == PK_STANDARD && meEditMode != EM_MASTERPAGE)
@@ -967,7 +968,7 @@ SdPage* DrawViewShell::CreateOrDuplicatePage (
         {
             mpDrawView->SdrEndTextEdit();
         }
-        pNewPage = ViewShell::CreateOrDuplicatePage (rRequest, ePageKind, pPage);
+        pNewPage = ViewShell::CreateOrDuplicatePage (rRequest, ePageKind, pPage, nInsertPosition);
     }
     return pNewPage;
 }
diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx
index 18ff686fc612..433a4e4fa6c1 100644..100755
--- a/sd/source/ui/view/drviews5.cxx
+++ b/sd/source/ui/view/drviews5.cxx
@@ -51,7 +51,7 @@
 #include "res_bmp.hrc"
 #include "glob.hrc"
 #include "app.hrc"
-
+#include "helpids.h"
 #include "optsitem.hxx"
 #include "app.hxx"
 #include "FrameView.hxx"
@@ -597,20 +597,20 @@ void DrawViewShell::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence
         if (mePageKind == PK_NOTES)
         {
             SetHelpId( SID_NOTESMODE );
-            GetActiveWindow()->SetHelpId( SID_NOTESMODE );
-            GetActiveWindow()->SetUniqueId( SID_NOTESMODE );
+            GetActiveWindow()->SetHelpId( CMD_SID_NOTESMODE );
+            GetActiveWindow()->SetUniqueId( CMD_SID_NOTESMODE );
         }
         else if (mePageKind == PK_HANDOUT)
         {
             SetHelpId( SID_HANDOUTMODE );
-            GetActiveWindow()->SetHelpId( SID_HANDOUTMODE );
-            GetActiveWindow()->SetUniqueId( SID_HANDOUTMODE );
+            GetActiveWindow()->SetHelpId( CMD_SID_HANDOUTMODE );
+            GetActiveWindow()->SetUniqueId( CMD_SID_HANDOUTMODE );
         }
         else
         {
             SetHelpId( SD_IF_SDDRAWVIEWSHELL );
-            GetActiveWindow()->SetHelpId( SD_IF_SDDRAWVIEWSHELL );
-            GetActiveWindow()->SetUniqueId( SD_IF_SDDRAWVIEWSHELL );
+            GetActiveWindow()->SetHelpId( HID_SDDRAWVIEWSHELL );
+            GetActiveWindow()->SetUniqueId( HID_SDDRAWVIEWSHELL );
         }
     }
 
diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx
index e853d3944ce0..fa2ddf1120d0 100755
--- a/sd/source/ui/view/drviews7.cxx
+++ b/sd/source/ui/view/drviews7.cxx
@@ -301,7 +301,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
         {
             SdPage* pPage = dynamic_cast< SdPage* >( pPageView->GetPage() );
 
-            if( pPage )
+            if( pPage && !pPage->IsMasterPage() )
             {
                 rSet.Put( SfxUInt32Item( SID_ASSIGN_LAYOUT, static_cast< sal_uInt32 >(pPage->GetAutoLayout()) ) );
                 bDisable = false;
@@ -957,11 +957,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
         rSet.DisableItem( SID_INSERT_PLUGIN );
         rSet.DisableItem( SID_INSERT_SOUND );
         rSet.DisableItem( SID_INSERT_VIDEO );
-        rSet.DisableItem( SID_INSERT_APPLET );
         rSet.DisableItem( SID_INSERT_FLOATINGFRAME );
-#ifdef STARIMAGE_AVAILABLE
-        rSet.DisableItem( SID_INSERT_IMAGE );
-#endif
         rSet.DisableItem( SID_INSERT_MATH );
         rSet.DisableItem( SID_INSERT_DIAGRAM );
         rSet.DisableItem( SID_ATTR_TABLE );
@@ -970,7 +966,6 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
         rSet.DisableItem( SID_SIZE_ALL );
         rSet.DisableItem( SID_SIZE_PAGE_WIDTH );
         rSet.DisableItem( SID_SIZE_PAGE );
-//      rSet.DisableItem( SID_INSERTPAGE );
         rSet.DisableItem( SID_DUPLICATE_PAGE );
         rSet.DisableItem( SID_ZOOM_TOOLBOX );
     }
@@ -1061,12 +1056,8 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
         rSet.DisableItem( SID_INSERT_PLUGIN );
         rSet.DisableItem( SID_INSERT_SOUND );
         rSet.DisableItem( SID_INSERT_VIDEO );
-        rSet.DisableItem( SID_INSERT_APPLET );
         rSet.DisableItem( SID_INSERT_FLOATINGFRAME );
 
-#ifdef STARIMAGE_AVAILABLE
-        rSet.DisableItem( SID_INSERT_IMAGE );
-#endif
         rSet.DisableItem( SID_INSERT_MATH );
         rSet.DisableItem( SID_INSERT_FRAME );
         rSet.DisableItem( SID_INSERTFILE );
@@ -1565,7 +1556,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
     if ( bDisableEditHyperlink )
         rSet.DisableItem( SID_OPEN_HYPERLINK );
 
-#if defined WIN || defined WNT || defined UNX
+#if defined WNT || defined UNX
     if( !mxScannerManager.is() )
     {
         rSet.DisableItem( SID_TWAIN_SELECT );
@@ -1573,11 +1564,6 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
     }
 #endif
 
-// Fuer Win16
-#ifndef SOLAR_JAVA
-    rSet.DisableItem( SID_INSERT_APPLET );
-#endif
-
     // Set the state of two entries in the 'Slide' context sub-menu
     // concerning the visibility of master page background and master page
     // shapes.
diff --git a/sd/source/ui/view/drviews8.cxx b/sd/source/ui/view/drviews8.cxx
index 54cd0c792c94..f4d8ca90687b 100755
--- a/sd/source/ui/view/drviews8.cxx
+++ b/sd/source/ui/view/drviews8.cxx
@@ -196,7 +196,6 @@ void DrawViewShell::FuTemp01(SfxRequest& rReq)
         case SID_INSERT_PLUGIN:
         case SID_INSERT_SOUND:
         case SID_INSERT_VIDEO:
-        case SID_INSERT_APPLET:
         case SID_INSERT_FLOATINGFRAME:
         case SID_INSERT_MATH:
         case SID_INSERT_DIAGRAM:
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index 3628a11ac5a1..36e5d96c97ff 100755
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -61,6 +61,7 @@
 #include <sfx2/dispatch.hxx>
 #include <svtools/cliplistener.hxx>
 #include <svx/float3d.hxx>
+#include "helpids.h"
 
 #include "view/viewoverlaymanager.hxx"
 #include "app.hrc"
@@ -334,16 +335,16 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind)
     if( eDocType == DOCUMENT_TYPE_DRAW )
     {
         SetHelpId( SD_IF_SDGRAPHICVIEWSHELL );
-        GetActiveWindow()->SetHelpId( SD_IF_SDGRAPHICVIEWSHELL );
-        GetActiveWindow()->SetUniqueId( SD_IF_SDGRAPHICVIEWSHELL );
+        GetActiveWindow()->SetHelpId( HID_SDGRAPHICVIEWSHELL );
+        GetActiveWindow()->SetUniqueId( HID_SDGRAPHICVIEWSHELL );
     }
     else
     {
         if (mePageKind == PK_NOTES)
         {
             SetHelpId( SID_NOTESMODE );
-            GetActiveWindow()->SetHelpId( SID_NOTESMODE );
-            GetActiveWindow()->SetUniqueId( SID_NOTESMODE );
+            GetActiveWindow()->SetHelpId( CMD_SID_NOTESMODE );
+            GetActiveWindow()->SetUniqueId( CMD_SID_NOTESMODE );
 
             // AutoLayouts muessen erzeugt sein
             GetDoc()->StopWorkStartupDelay();
@@ -351,8 +352,8 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind)
         else if (mePageKind == PK_HANDOUT)
         {
             SetHelpId( SID_HANDOUTMODE );
-            GetActiveWindow()->SetHelpId( SID_HANDOUTMODE );
-            GetActiveWindow()->SetUniqueId( SID_HANDOUTMODE );
+            GetActiveWindow()->SetHelpId( CMD_SID_HANDOUTMODE );
+            GetActiveWindow()->SetUniqueId( CMD_SID_HANDOUTMODE );
 
             // AutoLayouts muessen erzeugt sein
             GetDoc()->StopWorkStartupDelay();
@@ -360,8 +361,8 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind)
         else
         {
             SetHelpId( SD_IF_SDDRAWVIEWSHELL );
-            GetActiveWindow()->SetHelpId( SD_IF_SDDRAWVIEWSHELL );
-            GetActiveWindow()->SetUniqueId( SD_IF_SDDRAWVIEWSHELL );
+            GetActiveWindow()->SetHelpId( HID_SDDRAWVIEWSHELL );
+            GetActiveWindow()->SetUniqueId( HID_SDDRAWVIEWSHELL );
         }
     }
 
diff --git a/sd/source/ui/view/drviewsb.cxx b/sd/source/ui/view/drviewsb.cxx
index 2574032e3d99..d7cc1fc1d84a 100644..100755
--- a/sd/source/ui/view/drviewsb.cxx
+++ b/sd/source/ui/view/drviewsb.cxx
@@ -33,7 +33,7 @@
 #ifndef _SVXIDS_HXX
 #include <svx/svxids.hrc>
 #endif
-
+#include <sfx2/msgpool.hxx>
 #include <svx/hyprlink.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <svx/hlnkitem.hxx>
@@ -127,7 +127,7 @@ void DrawViewShell::FuTemp02(SfxRequest& rReq)
                 AbstractSdInsertLayerDlg* pDlg = pFact ? pFact->CreateSdInsertLayerDlg(NULL, aNewAttr, true, String( SdResId( STR_INSERTLAYER ) ) ) : 0;
                 if( pDlg )
                 {
-                    pDlg->SetHelpId( SID_INSERTLAYER );
+                    pDlg->SetHelpId( SD_MOD()->GetSlotPool()->GetSlot( SID_INSERTLAYER )->GetCommand() );
 
                     // Ueberpruefung auf schon vorhandene Namen
                     BOOL bLoop = TRUE;
@@ -293,7 +293,7 @@ void DrawViewShell::FuTemp02(SfxRequest& rReq)
                 AbstractSdInsertLayerDlg* pDlg = pFact ? pFact->CreateSdInsertLayerDlg(NULL, aNewAttr, bDelete, String( SdResId( STR_MODIFYLAYER ) ) ) : 0;
                 if( pDlg )
                 {
-                    pDlg->SetHelpId( SID_MODIFYLAYER );
+                    pDlg->SetHelpId( SD_MOD()->GetSlotPool()->GetSlot( SID_MODIFYLAYER )->GetCommand() );
 
                     // Ueberpruefung auf schon vorhandene Namen
                     BOOL    bLoop = TRUE;
diff --git a/sd/source/ui/view/drviewsc.cxx b/sd/source/ui/view/drviewsc.cxx
index eefe0680d2d4..ae47111c8200 100644..100755
--- a/sd/source/ui/view/drviewsc.cxx
+++ b/sd/source/ui/view/drviewsc.cxx
@@ -788,9 +788,6 @@ USHORT DrawViewShell::GetIdBySubId( USHORT nSId )
         break;
 
         case SID_INSERT_DIAGRAM:
-#ifdef STARIMAGE_AVAILABLE
-        case SID_INSERT_IMAGE:
-#endif
         case SID_ATTR_TABLE:
         case SID_INSERTFILE:
         case SID_INSERT_GRAPHIC:
@@ -802,7 +799,6 @@ USHORT DrawViewShell::GetIdBySubId( USHORT nSId )
         case SID_INSERT_PLUGIN:
         case SID_INSERT_SOUND:
         case SID_INSERT_VIDEO:
-        case SID_INSERT_APPLET:
         case SID_INSERT_TABLE:
         {
             nMappedSId = SID_DRAWTBX_INSERT;
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index 955a9d167b49..61f513970662 100755
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -32,7 +32,7 @@
 
 #include "ViewShellImplementation.hxx"
 #include <memory>
-
+#include "helpids.h"
 #include "app.hrc"
 #include <svx/hyprlink.hxx>
 #include <svx/hyperdlg.hxx>
@@ -180,8 +180,8 @@ void OutlineViewShell::Construct(DrawDocShell* )
     SetName (aName);
 
     SetHelpId( SD_IF_SDOUTLINEVIEWSHELL );
-    GetActiveWindow()->SetHelpId( SD_IF_SDOUTLINEVIEWSHELL );
-    GetActiveWindow()->SetUniqueId( SD_IF_SDOUTLINEVIEWSHELL );
+    GetActiveWindow()->SetHelpId( HID_SDOUTLINEVIEWSHELL );
+    GetActiveWindow()->SetUniqueId( HID_SDOUTLINEVIEWSHELL );
 }
 
 
@@ -1775,103 +1775,6 @@ SdPage* OutlineViewShell::GetActualPage()
 }
 
 
-/*************************************************************************
-|*
-|* Retrieve range of marked pages
-|*
-\************************************************************************/
-
-String OutlineViewShell::GetPageRangeString()
-{
-    ::sd::Window*      pWin             = GetActiveWindow();
-    OutlinerView*  pActiveView      = pOlView->GetViewByWindow(pWin);
-    ::Outliner*      pOutl            = pActiveView->GetOutliner();
-    List*          pSelList         = (List*)pActiveView->CreateSelectionList();
-    Paragraph*     pPara            = (Paragraph*)pSelList->First();
-
-    String aStrPageRange;
-    BOOL bFirstPageNo = TRUE;
-    BOOL bOpenRange = FALSE;
-    USHORT nLastPage = 0;
-    USHORT nLastUsedPage = (USHORT)-1;
-
-    USHORT nPageCount = 0;
-    for( USHORT n = 0; n< GetDoc()->GetPageCount(); n++ )
-        if( ( (SdPage*)GetDoc()->GetPage( n ) )->GetPageKind() == PK_STANDARD )
-            nPageCount++;
-
-    while ( pPara )
-    {
-        if ( !pOutl->HasParaFlag(pPara, PARAFLAG_ISPAGE) )
-        {
-            pPara = pOlView->GetPrevTitle(pPara);
-        }
-        USHORT nPageToSelect = 0;
-        while(pPara)
-        {
-            pPara = pOlView->GetPrevTitle(pPara);
-            if (pPara)
-                nPageToSelect++;
-        }
-
-        if( bFirstPageNo )
-        {
-            bFirstPageNo = FALSE;
-            aStrPageRange = String::CreateFromInt32( sal_Int32( nPageToSelect+1 ) );
-            nLastUsedPage = nPageToSelect;
-            nPageCount--;
-        }
-        else
-        {
-            if( nPageToSelect != nLastPage )
-            {
-                if( nPageToSelect == nLastPage+1 )
-                {
-                    bOpenRange = TRUE;
-                    nPageCount--;
-                }
-                else
-                {
-                    if( bOpenRange )
-                    {
-                        if( nLastPage == nLastUsedPage+1 )
-                            aStrPageRange.Append( sal_Unicode(',') );
-                        else
-                            aStrPageRange.Append( sal_Unicode('-') );
-
-                        aStrPageRange.Append( String::CreateFromInt32( sal_Int32( nLastPage+1 ) ) );
-                    }
-                    aStrPageRange.Append( sal_Unicode(',') );
-                    aStrPageRange.Append( String::CreateFromInt32( sal_Int32( nPageToSelect+1 ) ) );
-                    nLastUsedPage = nPageToSelect;
-                    bOpenRange = FALSE;
-                    nPageCount--;
-                }
-            }
-        }
-
-        nLastPage = nPageToSelect;
-        pPara = (Paragraph*)pSelList->Next();
-    }
-
-    if( bOpenRange )
-    {
-        if( nLastPage == nLastUsedPage+1 )
-            aStrPageRange.Append( sal_Unicode(',') );
-        else
-            aStrPageRange.Append( sal_Unicode('-') );
-
-        aStrPageRange.Append( String::CreateFromInt32( sal_Int32( nLastPage+1 ) ) );
-    }
-
-    if( nPageCount == 0 )
-        aStrPageRange.Erase();
-
-    delete pSelList;                // die wurde extra fuer uns erzeugt
-
-    return aStrPageRange;
-}
-
 void OutlineViewShell::UpdatePreview( SdPage* pPage, BOOL )
 {
     const bool bNewPage = pPage != pLastPage;
diff --git a/sd/source/ui/view/sdruler.cxx b/sd/source/ui/view/sdruler.cxx
index 679c28bb3a93..679c28bb3a93 100644..100755
--- a/sd/source/ui/view/sdruler.cxx
+++ b/sd/source/ui/view/sdruler.cxx
diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx
index 28873b3946a3..ed5dda39037c 100755
--- a/sd/source/ui/view/sdwindow.cxx
+++ b/sd/source/ui/view/sdwindow.cxx
@@ -1165,11 +1165,11 @@ void Window::DropScroll(const Point& rMousePos)
     Window::CreateAccessible (void)
 {
     if (mpViewShell != NULL)
-    return mpViewShell->CreateAccessibleDocumentView (this);
+        return mpViewShell->CreateAccessibleDocumentView (this);
     else
     {
         OSL_TRACE ("::sd::Window::CreateAccessible: no view shell");
-    return ::Window::CreateAccessible ();
+        return ::Window::CreateAccessible ();
     }
 }
 
diff --git a/sd/source/ui/view/tabcontr.cxx b/sd/source/ui/view/tabcontr.cxx
index d9d074eee395..d9d074eee395 100644..100755
--- a/sd/source/ui/view/tabcontr.cxx
+++ b/sd/source/ui/view/tabcontr.cxx
diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx
index 447f50ec2222..c1e1d9634844 100755
--- a/sd/source/ui/view/viewoverlaymanager.cxx
+++ b/sd/source/ui/view/viewoverlaymanager.cxx
@@ -559,7 +559,7 @@ bool ViewOverlayManager::CreateTags()
 
     SdPage* pPage = mrBase.GetMainViewShell()->getCurrentPage();
 
-    if( pPage )
+    if( pPage && !pPage->IsMasterPage() && (pPage->GetPageKind() == PK_STANDARD) )
     {
         const std::list< SdrObject* >& rShapes = pPage->GetPresentationShapeList().getList();
 
diff --git a/sd/source/ui/view/viewshe3.cxx b/sd/source/ui/view/viewshe3.cxx
index 4d8986952989..363ff91edf36 100755..100644
--- a/sd/source/ui/view/viewshe3.cxx
+++ b/sd/source/ui/view/viewshe3.cxx
@@ -216,7 +216,8 @@ void  ViewShell::GetMenuState( SfxItemSet &rSet )
 SdPage* ViewShell::CreateOrDuplicatePage (
     SfxRequest& rRequest,
     PageKind ePageKind,
-    SdPage* pPage)
+    SdPage* pPage,
+    const sal_Int32 nInsertPosition)
 {
     USHORT nSId = rRequest.GetSlot();
     SdDrawDocument* pDocument = GetDoc();
@@ -255,7 +256,8 @@ SdPage* ViewShell::CreateOrDuplicatePage (
             && rBase.GetMainViewShell()->GetShellType()!=ViewShell::ST_DRAW)
         {
             framework::FrameworkHelper::Instance(GetViewShellBase())->RequestTaskPanel(
-                framework::FrameworkHelper::msLayoutTaskPanelURL);
+                framework::FrameworkHelper::msLayoutTaskPanelURL,
+                false);
         }
 */
 
@@ -377,7 +379,8 @@ SdPage* ViewShell::CreateOrDuplicatePage (
                         eStandardLayout,
                         eNotesLayout,
                         bIsPageBack,
-                        bIsPageObj);
+                        bIsPageObj,
+                        nInsertPosition);
                     // Select exactly the new page.
                     USHORT nPageCount (pDocument->GetSdPageCount(ePageKind));
                     for (USHORT i=0; i<nPageCount; i++)
@@ -400,7 +403,8 @@ SdPage* ViewShell::CreateOrDuplicatePage (
                     eStandardLayout,
                     eNotesLayout,
                     bIsPageBack,
-                    bIsPageObj);
+                    bIsPageObj,
+                    nInsertPosition);
             break;
 
         case SID_DUPLICATE_PAGE:
@@ -414,7 +418,8 @@ SdPage* ViewShell::CreateOrDuplicatePage (
                     eStandardLayout,
                     eNotesLayout,
                     bIsPageBack,
-                    bIsPageObj);
+                    bIsPageObj,
+                    nInsertPosition);
             break;
 
         default:
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index c1f4bc070bcf..7885d07e5f2c 100755
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -684,9 +684,9 @@ long ViewShell::Notify(NotifyEvent& rNEvt, ::sd::Window* pWin)
 }
 
 
-BOOL ViewShell::HandleScrollCommand(const CommandEvent& rCEvt, ::sd::Window* pWin)
+bool ViewShell::HandleScrollCommand(const CommandEvent& rCEvt, ::sd::Window* pWin)
 {
-    BOOL bDone = FALSE;
+    bool bDone = false;
 
     switch( rCEvt.GetCommand() )
     {
@@ -736,7 +736,7 @@ BOOL ViewShell::HandleScrollCommand(const CommandEvent& rCEvt, ::sd::Window* pWi
                         Invalidate( SID_ATTR_ZOOM );
                         Invalidate( SID_ATTR_ZOOMSLIDER );
 
-                        bDone = TRUE;
+                        bDone = true;
                     }
                 }
                 else
@@ -752,7 +752,7 @@ BOOL ViewShell::HandleScrollCommand(const CommandEvent& rCEvt, ::sd::Window* pWi
                             rCEvt.IsMouseEvent(),(const void *) &aWheelData );
                         bDone = pWin->HandleScrollCommand( aReWrite,
                             mpHorizontalScrollBar.get(),
-                            mpVerticalScrollBar.get());
+                            mpVerticalScrollBar.get()) == TRUE;
                     }
                 }
             }