cmcfixes74: merge with DEV300 m76

15 files changed, 29 insertions, 57 deletions

diff --git a/sd/source/ui/view/PresentationViewShellBase.cxx b/sd/source/ui/view/PresentationViewShellBase.cxx
index 273f7a3fd613..a16b12d3cb63 100644
--- a/sd/source/ui/view/PresentationViewShellBase.cxx
+++ b/sd/source/ui/view/PresentationViewShellBase.cxx
@@ -89,10 +89,10 @@ PresentationViewShellBase::PresentationViewShellBase (
     GetUpdateLockManager()->Disable();
 
     // Hide the automatic (non-context sensitive) tool bars.
-    if (_pFrame!=NULL && _pFrame->GetFrame()!=NULL)
+    if (_pFrame!=NULL)
     {
         Reference<beans::XPropertySet> xFrameSet (
-            _pFrame->GetFrame()->GetFrameInterface(),
+            _pFrame->GetFrame().GetFrameInterface(),
             UNO_QUERY);
         if (xFrameSet.is())
         {
diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx
index e2a75849c524..4919a9fe2bbb 100644
--- a/sd/source/ui/view/ToolBarManager.cxx
+++ b/sd/source/ui/view/ToolBarManager.cxx
@@ -718,8 +718,8 @@ void ToolBarManager::Implementation::SetValid (bool bValid)
         if (mbIsValid)
         {
             Reference<frame::XFrame> xFrame;
-            if (mrBase.GetViewFrame() != NULL && mrBase.GetViewFrame()->GetFrame())
-                xFrame = mrBase.GetViewFrame()->GetFrame()->GetFrameInterface();
+            if (mrBase.GetViewFrame() != NULL)
+                xFrame = mrBase.GetViewFrame()->GetFrame().GetFrameInterface();
             try
             {
                 Reference<beans::XPropertySet> xFrameProperties (xFrame, UNO_QUERY_THROW);
diff --git a/sd/source/ui/view/UpdateLockManager.cxx b/sd/source/ui/view/UpdateLockManager.cxx
index 2c992e826f0f..f373042f627b 100644
--- a/sd/source/ui/view/UpdateLockManager.cxx
+++ b/sd/source/ui/view/UpdateLockManager.cxx
@@ -396,11 +396,10 @@ Reference< ::com::sun::star::frame::XLayoutManager>
 
     if (mxLayoutManager.get() == NULL)
     {
-        if (mrBase.GetViewFrame()!=NULL
-            && mrBase.GetViewFrame()->GetFrame()!=NULL)
+        if (mrBase.GetViewFrame()!=NULL)
         {
             Reference<beans::XPropertySet> xFrameProperties (
-                mrBase.GetViewFrame()->GetFrame()->GetFrameInterface(),
+                mrBase.GetViewFrame()->GetFrame().GetFrameInterface(),
                 UNO_QUERY);
             if (xFrameProperties.is())
             {
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
index 4a60d92e6bcb..6640d2455c20 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -280,11 +280,7 @@ ViewShellBase::ViewShellBase (
     SfxViewFrame* _pFrame,
     SfxViewShell*)
     : SfxViewShell (_pFrame,
-        SFX_VIEW_MAXIMIZE_FIRST
-        | SFX_VIEW_OPTIMIZE_EACH
-        | SFX_VIEW_DISABLE_ACCELS
-        | SFX_VIEW_OBJECTSIZE_EMBEDDED
-        | SFX_VIEW_CAN_PRINT
+          SFX_VIEW_CAN_PRINT
         | SFX_VIEW_HAS_PRINTOPTIONS),
       maMutex(),
       mpImpl(),
@@ -1054,7 +1050,7 @@ void ViewShellBase::UpdateBorder ( bool bForce /* = false */ )
     // calls for the views in side panes but prevents calling an already
     // dying SfxViewShell base class.
     // For issue #140703# we have to check the existence of the window,
-    // too.  The SfxTopViewFrame accesses the window without checking it.
+    // too.  The SfxViewFrame accesses the window without checking it.
     ViewShell* pMainViewShell = GetMainViewShell().get();
     if (pMainViewShell != NULL && GetWindow()!=NULL)
     {
@@ -1270,7 +1266,7 @@ CustomHandleManager& ViewShellBase::getCustomHandleManager() const
         Reference< XMultiServiceFactory > xServiceManager( ::comphelper::getProcessServiceFactory(), UNO_QUERY_THROW );
 
         Reference< XModuleManager > xModuleManager( xServiceManager->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ModuleManager") ) ), UNO_QUERY_THROW );
-        Reference< XInterface > xIfac( GetMainViewShell()->GetViewFrame()->GetFrame()->GetFrameInterface(), UNO_QUERY_THROW );
+        Reference< XInterface > xIfac( GetMainViewShell()->GetViewFrame()->GetFrame().GetFrameInterface(), UNO_QUERY_THROW );
 
         ::rtl::OUString aModuleIdentifier( xModuleManager->identify( xIfac ) );
 
diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx
index 304b9bf3de4b..81e69f36300c 100644
--- a/sd/source/ui/view/drawview.cxx
+++ b/sd/source/ui/view/drawview.cxx
@@ -303,8 +303,7 @@ BOOL DrawView::SetAttributes(const SfxItemSet& rSet,
                     String aTemplateName(aLayoutName);
 
                     if (ePresObjKind == PRESOBJ_TITLE ||
-                        ePresObjKind == PRESOBJ_NOTES ||
-                        ePresObjKind == PRESOBJ_BACKGROUND)
+                        ePresObjKind == PRESOBJ_NOTES)
                     {
                         // Presentation object (except outline)
                         SfxStyleSheet* pSheet = rPage.GetStyleSheetForPresObj( ePresObjKind );
@@ -577,17 +576,6 @@ void DrawView::HideSdrPage()
     ::sd::View::HideSdrPage();
 }
 
-SdrObject* DrawView::GetMaxToBtmObj(SdrObject* pObj) const
-{
-    if( pObj )
-    {
-        SdPage* pPage = (SdPage*)pObj->GetPage();
-        if( pPage && pPage->IsMasterPage() )
-            return pPage->GetPresObj( PRESOBJ_BACKGROUND ) ;
-    }
-    return NULL;
-}
-
 void DrawView::DeleteMarked()
 {
     sd::UndoManager* pUndoManager = mpDoc->GetUndoManager();
diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx
index e7ea82bb345a..852e56096a76 100644
--- a/sd/source/ui/view/drviews3.cxx
+++ b/sd/source/ui/view/drviews3.cxx
@@ -98,9 +98,12 @@
 #include <com/sun/star/drawing/framework/XControllerManager.hpp>
 #include <com/sun/star/drawing/framework/XConfigurationController.hpp>
 #include <com/sun/star/drawing/framework/XConfiguration.hpp>
+#include <com/sun/star/frame/XFrame.hpp>
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::drawing::framework;
+using ::com::sun::star::frame::XFrame;
+using ::com::sun::star::frame::XController;
 
 namespace sd {
 
@@ -375,17 +378,15 @@ void  DrawViewShell::ExecCtrl(SfxRequest& rReq)
 
             try
             {
+                Reference< XFrame > xFrame( pFrame->GetFrame().GetFrameInterface(), UNO_SET_THROW );
+
                 // Save the current configuration of panes and views.
                 Reference<XControllerManager> xControllerManager (
                     GetViewShellBase().GetController(), UNO_QUERY_THROW);
                 Reference<XConfigurationController> xConfigurationController (
-                    xControllerManager->getConfigurationController());
-                if ( ! xConfigurationController.is())
-                    throw RuntimeException();
+                    xControllerManager->getConfigurationController(), UNO_QUERY_THROW );
                 Reference<XConfiguration> xConfiguration (
-                    xConfigurationController->getRequestedConfiguration());
-                if ( ! xConfiguration.is())
-                    throw RuntimeException();
+                    xConfigurationController->getRequestedConfiguration(), UNO_SET_THROW );
 
                 SfxChildWindow* pWindow = pFrame->GetChildWindow(nId);
                 if(pWindow)
@@ -398,14 +399,12 @@ void  DrawViewShell::ExecCtrl(SfxRequest& rReq)
                 // Normale Weiterleitung an ViewFrame zur Ausfuehrung
                 GetViewFrame()->ExecuteSlot(rReq);
 
-                // From here on we must cope with this object already being
+                // From here on we must cope with this object and the frame already being
                 // deleted.  Do not call any methods or use data members.
-                ViewShellBase* pBase = ViewShellBase::GetViewShellBase(pFrame);
-                OSL_ASSERT(pBase!=NULL);
+                Reference<XController> xController( xFrame->getController(), UNO_SET_THROW );
 
                 // Restore the configuration.
-                xControllerManager = Reference<XControllerManager>(
-                    pBase->GetController(), UNO_QUERY_THROW);
+                xControllerManager = Reference<XControllerManager>( xController, UNO_QUERY_THROW);
                 xConfigurationController = Reference<XConfigurationController>(
                     xControllerManager->getConfigurationController());
                 if ( ! xConfigurationController.is())
diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx
index f3f4d3ded05e..18ff686fc612 100644
--- a/sd/source/ui/view/drviews5.cxx
+++ b/sd/source/ui/view/drviews5.cxx
@@ -153,7 +153,7 @@ void DrawViewShell::ArrangeGUIElements (void)
     if ( pIPClient && pIPClient->IsObjectInPlaceActive() )
         bClientActive = TRUE;
 
-    BOOL bInPlaceActive = GetViewFrame()->GetFrame()->IsInPlace();
+    BOOL bInPlaceActive = GetViewFrame()->GetFrame().IsInPlace();
 
     if ( mbZoomOnPage && !bInPlaceActive && !bClientActive )
     {
diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx
index f718bc46ba93..e0cb78095bd0 100644
--- a/sd/source/ui/view/drviews7.cxx
+++ b/sd/source/ui/view/drviews7.cxx
@@ -1592,9 +1592,9 @@ void DrawViewShell::GetModeSwitchingMenuState (SfxItemSet &rSet)
     // view mode is allowed.
     const bool bIsRunning = SlideShow::IsRunning(GetViewShellBase());
 
-    if (GetViewFrame()->GetFrame()->IsInPlace() || bIsRunning)
+    if (GetViewFrame()->GetFrame().IsInPlace() || bIsRunning)
     {
-        if ( !GetViewFrame()->GetFrame()->IsInPlace() )
+        if ( !GetViewFrame()->GetFrame().IsInPlace() )
         {
             rSet.ClearItem( SID_DRAWINGMODE );
             rSet.DisableItem( SID_DRAWINGMODE );
diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx
index d3ae49a1f068..1a667b28f6d4 100644
--- a/sd/source/ui/view/drviewse.cxx
+++ b/sd/source/ui/view/drviewse.cxx
@@ -66,7 +66,6 @@
 #include <toolkit/helper/vclunohelper.hxx>
 #include <avmedia/mediawindow.hxx>
 #include <svl/urihelper.hxx>
-#include <sfx2/topfrm.hxx>
 #include <sfx2/docfile.hxx>
 
 #include "DrawViewShell.hxx"
diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx
index e5af6dcf991a..0a5f743bb738 100644
--- a/sd/source/ui/view/drviewsf.cxx
+++ b/sd/source/ui/view/drviewsf.cxx
@@ -59,7 +59,6 @@
 #include <svx/svdouno.hxx>
 #include <tools/urlobj.hxx>
 #include <svx/fmshell.hxx>
-#include <sfx2/topfrm.hxx>
 #include <svl/cjkoptions.hxx>
 
 #ifndef SD_FRAME_VIEW
diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx
index e358ebf4d562..aca0130624ce 100644
--- a/sd/source/ui/view/frmview.cxx
+++ b/sd/source/ui/view/frmview.cxx
@@ -33,7 +33,6 @@
 #ifndef _SVXIDS_HRC
 #include <svx/svxids.hrc>
 #endif
-#include <sfx2/topfrm.hxx>
 #include <com/sun/star/awt/Rectangle.hpp>
 #include <com/sun/star/drawing/framework/ResourceId.hpp>
 #include <rtl/ustrbuf.hxx>
@@ -54,6 +53,7 @@
 #include "sdiocmpt.hxx"
 #include "framework/FrameworkHelper.hxx"
 #include <comphelper/processfactory.hxx>
+#include <sfx2/viewfrm.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -100,8 +100,7 @@ FrameView::FrameView(SdDrawDocument* pDrawDoc, FrameView* pFrameView /* = NULK *
             ULONG nSdViewShellCount = 0;
             ViewShellBase* pBase = NULL;
             SfxViewShell* pSfxViewSh = NULL;
-            SfxViewFrame* pSfxViewFrame = SfxViewFrame::GetFirst(pDocShell,
-                                                                 TYPE(SfxTopViewFrame));
+            SfxViewFrame* pSfxViewFrame = SfxViewFrame::GetFirst(pDocShell);
 
             while (pSfxViewFrame)
             {
@@ -142,8 +141,7 @@ FrameView::FrameView(SdDrawDocument* pDrawDoc, FrameView* pFrameView /* = NULK *
                     }
                 }
 
-                pSfxViewFrame = SfxViewFrame::GetNext(*pSfxViewFrame, pDocShell,
-                                                      TYPE(SfxTopViewFrame));
+                pSfxViewFrame = SfxViewFrame::GetNext(*pSfxViewFrame, pDocShell);
             }
 
             SdDrawDocument* pDoc = pDocShell->GetDoc();
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index 65e92b26c420..1467e6c24bd0 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -58,7 +58,6 @@
 #include <sfx2/tplpitem.hxx>
 #include <svx/svdorect.hxx>
 #include <sot/formats.hxx>
-#include <sfx2/topfrm.hxx>
 #include <com/sun/star/linguistic2/XThesaurus.hpp>
 #include <com/sun/star/i18n/TransliterationModules.hdl>
 #include <editeng/unolingu.hxx>
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index 15b2f0f15d0f..30daec8b636e 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -209,7 +209,7 @@ OutlineView::OutlineView( DrawDocShell* pDocSh, ::Window* pWindow, OutlineViewSh
     maBulletFont.SetShadow(FALSE);
 
 
-    Reference<XFrame> xFrame (mpOutlineViewShell->GetViewShellBase().GetFrame()->GetTopFrame()->GetFrameInterface(), UNO_QUERY);
+    Reference<XFrame> xFrame (mpOutlineViewShell->GetViewShellBase().GetFrame()->GetTopFrame().GetFrameInterface(), UNO_QUERY);
 
     const OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( ".uno:ShowSlide" ));
     maSlideImage = GetImage( xFrame, aSlotURL, true, false /* todo, hc mode */ );
diff --git a/sd/source/ui/view/presvish.cxx b/sd/source/ui/view/presvish.cxx
index fde6287e3038..11f20c7a83d4 100644
--- a/sd/source/ui/view/presvish.cxx
+++ b/sd/source/ui/view/presvish.cxx
@@ -38,7 +38,6 @@
 #include "optsitem.hxx"
 #include "sddll.hxx"
 #include <sfx2/request.hxx>
-#include <sfx2/topfrm.hxx>
 #ifndef _SFX_DISPATCH_HXX
 #include <sfx2/dispatch.hxx>
 #endif
diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx
index 94bf70287ccd..813c6caba95a 100644
--- a/sd/source/ui/view/sdview.cxx
+++ b/sd/source/ui/view/sdview.cxx
@@ -261,11 +261,7 @@ drawinglayer::primitive2d::Primitive2DSequence ViewRedirector::createRedirectedP
                 if( !bSubContentProcessing || !pObject->IsNotVisibleAsMaster() )
                 {
                     eKind = pObjectsSdPage ? pObjectsSdPage->GetPresObjKind(pObject) : PRESOBJ_NONE;
-
-                    if( eKind != PRESOBJ_BACKGROUND )
-                    {
-                        bCreateOutline = true;
-                    }
+                    bCreateOutline = true;
                 }
             }
             else if( ( pObject->GetObjInventor() == SdrInventor ) && ( pObject->GetObjIdentifier() == OBJ_TEXT ) )
@@ -311,7 +307,7 @@ drawinglayer::primitive2d::Primitive2DSequence ViewRedirector::createRedirectedP
                     // create dashed border
                     {
                         // create object polygon
-                        basegfx::B2DPolygon aPolygon(basegfx::tools::createPolygonFromRect(basegfx::B2DRange(0.0, 0.0, 1.0, 1.0)));
+                        basegfx::B2DPolygon aPolygon(basegfx::tools::createUnitPolygon());
                         aPolygon.transform(aObjectMatrix);
 
                         // create line and stroke attribute