[Libreoffice-commits] .: Branch 'libreoffice-3-4' - sc/source

[Petr Mladek]

 sc/source/ui/view/output.cxx |   11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

New commits:
commit 27677513a21ac7c9b4ce9f9236e0b5722d179f38
Author: Petr Mladek <pmladek at suse.cz>
Date:   Fri Jun 24 11:49:24 2011 +0200

    Revert "fdo#36688: Fixed undisplayed calc page and header / footer borders"
    
    It triggered heavy leaking of opened file descriptors (fdo#38590)
    
    This reverts commit 70af08e849a93d56915b7abe14537facf1022a6a.
    
    Signed-off-by: Petr Mladek <pmladek at suse.cz>
    Signed-off-by: Jan Holesovsky <kendy at suse.cz>
    Signed-off-by: Michael Meeks <michael.meeks at novell.com>

diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx
index 22b5d24..f37a2c8 100644
--- a/sc/source/ui/view/output.cxx
+++ b/sc/source/ui/view/output.cxx
@@ -52,7 +52,6 @@
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <svx/sdr/contact/objectcontacttools.hxx>
 #include <svx/unoapi.hxx>
-#include <svx/svdpage.hxx>
 
 #include "output.hxx"
 #include "document.hxx"
@@ -1635,19 +1634,17 @@ void ScOutputData::DrawRotatedFrame( const Color* pForceColor )
 
 drawinglayer::processor2d::BaseProcessor2D* ScOutputData::CreateProcessor2D( )
 {
-    SdrModel aModel;
-    SdrPage aSdrPage( aModel );
-
     ScDrawLayer* pDrawLayer = pDoc->GetDrawLayer();
-    if ( pDrawLayer )
-        aSdrPage = *pDrawLayer->GetPage( static_cast< sal_uInt16 >( nTab ) );
+    if (!pDrawLayer)
+        return NULL;
 
     basegfx::B2DRange aViewRange;
+    SdrPage *pDrawPage = pDrawLayer->GetPage( static_cast< sal_uInt16 >( nTab ) );
     const drawinglayer::geometry::ViewInformation2D aNewViewInfos(
             basegfx::B2DHomMatrix(  ),
             pDev->GetViewTransformation(),
             aViewRange,
-            GetXDrawPageForSdrPage( &aSdrPage ),
+            GetXDrawPageForSdrPage( pDrawPage ),
             0.0,
             uno::Sequence< beans::PropertyValue >() );