From 6fc008011e1339681388687833a20c192ef6f938 Mon Sep 17 00:00:00 2001
From: Thorsten Behrens <tbehrens@novell.com>
Date: Tue, 30 Nov 2010 02:16:19 +0100
Subject: Avoid antialiasing for drag rect

Fix for fdo#31860 - slide dragging gets horrendously slow on Linux,
due to excessive antialiased repaints. Visual difference: zero, no
sub-pixel coordinates used.
---
 sd/source/ui/slidesorter/view/SlsViewOverlay.cxx | 1 +
 1 file changed, 1 insertion(+)

(limited to 'sd/source/ui')

diff --git a/sd/source/ui/slidesorter/view/SlsViewOverlay.cxx b/sd/source/ui/slidesorter/view/SlsViewOverlay.cxx
index 2ea1b7e74f35..2e22e85803f6 100644
--- a/sd/source/ui/slidesorter/view/SlsViewOverlay.cxx
+++ b/sd/source/ui/slidesorter/view/SlsViewOverlay.cxx
@@ -201,6 +201,7 @@ SubstitutionOverlay::SubstitutionOverlay (ViewOverlay& rViewOverlay)
       maPosition(0,0),
       maShapes()
 {
+    allowAntiAliase(false);
 }
 
 
-- 
cgit 


From b853aa1b54cc3290ee7cb13014ff8d481f312f47 Mon Sep 17 00:00:00 2001
From: Christian Lippka ORACLE <christian.lippka@oracle.com>
Date: Wed, 8 Dec 2010 14:39:25 +0100
Subject: impress207: #i115993# do not insert objects as presentation objects
 on master pages(cherry picked from commit
 056b298538918df97390c645a1a0fb690a89468e)

---
 sd/source/ui/view/sdview4.cxx | 3 ++-
 sd/source/ui/view/sdview5.cxx | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'sd/source/ui')

diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx
index c649f4d958a6..0ef9417fed4e 100644
--- a/sd/source/ui/view/sdview4.cxx
+++ b/sd/source/ui/view/sdview4.cxx
@@ -100,6 +100,7 @@ SdrGrafObj* View::InsertGraphic( const Graphic& rGraphic, sal_Int8& rAction,
     SdrGrafObj*     pNewGrafObj = NULL;
     SdrPageView*    pPV = GetSdrPageView();
     SdrObject*      pPickObj = pObj;
+    const bool bOnMaster = pPV && pPV->GetPage() && pPV->GetPage()->IsMasterPage();
 
     if(pPV && this->ISA(::sd::slidesorter::view::SlideSorterView))
     {
@@ -116,7 +117,7 @@ SdrGrafObj* View::InsertGraphic( const Graphic& rGraphic, sal_Int8& rAction,
     if( mnAction == DND_ACTION_LINK && pPickObj && pPV )
     {
         const bool bIsGraphic = pPickObj->ISA( SdrGrafObj );
-        if( bIsGraphic || pObj->IsEmptyPresObj() )
+        if( bIsGraphic || (pObj->IsEmptyPresObj() && !bOnMaster) )
         {
             if( IsUndoEnabled() )
                 BegUndo(String(SdResId(STR_INSERTGRAPHIC)));
diff --git a/sd/source/ui/view/sdview5.cxx b/sd/source/ui/view/sdview5.cxx
index 2cc5ccad7c4b..c28d2c5658cf 100644
--- a/sd/source/ui/view/sdview5.cxx
+++ b/sd/source/ui/view/sdview5.cxx
@@ -61,7 +61,7 @@ SdrObject* View::GetEmptyPresentationObject( PresObjKind eKind )
     if( pPV )
     {
         SdPage* pPage = static_cast< SdPage* >( pPV->GetPage() );
-        if( pPage )
+        if( pPage && !pPage->IsMasterPage() )
         {
             // first try selected shape
             if ( AreObjectsMarked() )
-- 
cgit