[ooo-build-commit] Branch 'ooo/OOO310' - goodies/source

[Jan Holesovsky]

 goodies/source/graphic/grfmgr.cxx |   31 -------------------------------
 1 file changed, 31 deletions(-)

New commits:
commit a4b6fc9a271067fbff3c817447d25a7bea2d1ffe
Author: Oliver Bolte <obo at openoffice.org>
Date:   Thu Jun 25 09:06:48 2009 +0000

    CWS-TOOLING: integrate CWS impress173
    2009-06-16 15:50:22 +0200 sj  r273022 : #i101545# fixed crash - bracketing of graphic links has been done twice leading to a broken graphic state stack
    2009-06-05 10:37:58 +0200 cl  r272669 : #i102298# prevent export of multiple writing-mode attributes for cell styles
    2009-06-05 10:29:42 +0200 cl  r272667 : #i98403# fixed editing of motion path

diff --git a/goodies/source/graphic/grfmgr.cxx b/goodies/source/graphic/grfmgr.cxx
index 80aa73c..bd9dd3c 100644
--- a/goodies/source/graphic/grfmgr.cxx
+++ b/goodies/source/graphic/grfmgr.cxx
@@ -44,7 +44,6 @@
 #include <vcl/metaact.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/salbtype.hxx>
-#include <vcl/pdfextoutdevdata.hxx>
 #include <svtools/cacheoptions.hxx>
 #include "grfmgr.hxx"
 
@@ -674,31 +673,11 @@ BOOL GraphicObject::Draw( OutputDevice* pOut, const Point& rPt, const Size& rSz,
     const sal_uInt32    nOldDrawMode = pOut->GetDrawMode();
     BOOL		        bCropped = aAttr.IsCropped();
     BOOL		        bCached = FALSE;
-    BOOL				bWritingPdfLinkedGraphic = FALSE;
     BOOL		        bRet;
 
     // #i29534# Provide output rects for PDF writer
     Rectangle			aCropRect;
 
-    // #i29534# Notify PDF writer about linked graphic (if any)
-    vcl::ExtOutDevData* pExtOutDevData = pOut->GetExtOutDevData();
-    if( pExtOutDevData && pExtOutDevData->ISA(vcl::PDFExtOutDevData) )
-    {
-        // #i29534# Only delegate image handling to PDF, if no special
-        // treatment is necessary
-        if( GetGraphic().IsLink() &&
-            aSz.Width() > 0L &&
-            aSz.Height() > 0L &&
-            !aAttr.IsSpecialDrawMode() &&
-            !aAttr.IsMirrored() &&
-            !aAttr.IsRotated() &&
-            !aAttr.IsAdjusted() )
-        {
-            bWritingPdfLinkedGraphic = TRUE;
-            static_cast< vcl::PDFExtOutDevData* >( pExtOutDevData )->BeginGroup();
-        }
-    }
-
     if( !( GRFMGR_DRAW_USE_DRAWMODE_SETTINGS & nFlags ) )
         pOut->SetDrawMode( nOldDrawMode & ( ~( DRAWMODE_SETTINGSLINE | DRAWMODE_SETTINGSFILL | DRAWMODE_SETTINGSTEXT | DRAWMODE_SETTINGSGRADIENT ) ) );
 
@@ -749,16 +728,6 @@ BOOL GraphicObject::Draw( OutputDevice* pOut, const Point& rPt, const Size& rSz,
 
     pOut->SetDrawMode( nOldDrawMode );
 
-    // #i29534# Notify PDF writer about linked graphic (if any)
-    if( bWritingPdfLinkedGraphic )
-    {
-        static_cast< vcl::PDFExtOutDevData* >( pExtOutDevData )->EndGroup(
-            const_cast< Graphic& >(GetGraphic()),
-            aAttr.GetTransparency(),
-            Rectangle( aPt, aSz ),
-            aCropRect );
-    }
-
     // #i29534# Moved below OutDev restoration, to avoid multiple swap-ins
     // (code above needs to call GetGraphic twice)
     if( bCached )