[Libreoffice-commits] core.git: sw/source

[Philipp Riemer]

 sw/source/core/doc/notxtfrm.cxx |   15 ---------------
 1 file changed, 15 deletions(-)

New commits:
commit a2b4ebdf3a3fb305de76080d9b4ffbbebd1a3118
Author: Philipp Riemer <ruderphilipp at gmail.com>
Date:   Sat Aug 10 22:00:39 2013 +0200

    delete dead code
    
    The pJobSetup is never used since the relevant method call is commented out.
    Therefore, not only the variable itself but also the bDummyJobSetup parts can
    be removed here.
    
    This code came from a merge with the AOO code base and is like this
    since 2005 (see commit 750562b47054741cdd4516affe9741908ee45c11).
    
    Change-Id: I19eec322b05634b4b6f3604bf1da57dfc390af4e
    Reviewed-on: https://gerrit.libreoffice.org/5343
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index 222962d..e3be834 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -1051,18 +1051,6 @@ void SwNoTxtFrm::PaintPicture( OutputDevice* pOut, const SwRect &rGrfArea ) cons
             Point aPosition(aAlignedGrfArea.Pos());
             Size aSize(aAlignedGrfArea.SSize());
 
-            // Im BrowseModus gibt es nicht unbedingt einen Drucker und
-            // damit kein JobSetup, also legen wir eines an ...
-            const JobSetup* pJobSetup = pOLENd->getIDocumentDeviceAccess()->getJobsetup();
-            sal_Bool bDummyJobSetup = 0 == pJobSetup;
-            if( bDummyJobSetup )
-                pJobSetup = new JobSetup();
-
-            // #i42323#
-            // The reason for #114233# is gone, so i remove it again
-            //TODO/LATER: is it a problem that the JobSetup isn't used?
-            //xRef->DoDraw( pOut, aAlignedGrfArea.Pos(), aAlignedGrfArea.SSize(), *pJobSetup );
-
             const Graphic* pGraphic = pOLENd->GetGraphic();
             if ( pGraphic && pGraphic->GetType() != GRAPHIC_NONE )
             {
@@ -1078,9 +1066,6 @@ void SwNoTxtFrm::PaintPicture( OutputDevice* pOut, const SwRect &rGrfArea ) cons
             else
                 ::svt::EmbeddedObjectRef::DrawPaintReplacement( Rectangle( aPosition, aSize ), pOLENd->GetOLEObj().GetCurrentPersistName(), pOut );
 
-            if( bDummyJobSetup )
-                delete pJobSetup;
-
             sal_Int64 nMiscStatus = pOLENd->GetOLEObj().GetOleRef()->getStatus( pOLENd->GetAspect() );
             if ( !bPrn && pShell->ISA( SwCrsrShell ) &&
                     nMiscStatus & embed::EmbedMisc::MS_EMBED_ACTIVATEWHENVISIBLE )