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

Thorsten Behrens (via logerrit) logerrit at kemper.freedesktop.org
Tue Apr 21 08:26:09 UTC 2020


 vcl/source/gdi/pdfwriter_impl2.cxx |   82 -------------------------------------
 1 file changed, 82 deletions(-)

New commits:
commit 9f5439e83f5506011f5b1d3acf01182a2b1f3e0e
Author:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
AuthorDate: Mon Apr 20 03:42:36 2020 +0200
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Tue Apr 21 10:25:23 2020 +0200

    vcl: cleanup swaths of commented code
    
    Change-Id: I7acff3d136794dcb0f044bb3922fafeb13b6fa5a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92600
    Tested-by: Jenkins
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx
index 309b631af745..f08067f356f5 100644
--- a/vcl/source/gdi/pdfwriter_impl2.cxx
+++ b/vcl/source/gdi/pdfwriter_impl2.cxx
@@ -675,88 +675,6 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa
                                     else if ( fTransparency == 1.0 )
                                         bSkipSequence = true;
                                 }
-/* #i81548# removing optimization for fill textures, because most of the texture settings are not
-   exported properly. In OpenOffice 3.1 the drawing layer will support graphic primitives, then it
-   will not be a problem to optimize the filltexture export. But for wysiwyg is more important than
-   filesize.
-                                else if( aFill.getFillType() == SvtGraphicFill::fillTexture && aFill.isTiling() )
-                                {
-                                    sal_Int32 nPattern = mnCachePatternId;
-                                    Graphic aPatternGraphic;
-                                    aFill.getGraphic( aPatternGraphic );
-                                    bool bUseCache = false;
-                                    SvtGraphicFill::Transform aPatTransform;
-                                    aFill.getTransform( aPatTransform );
-
-                                    if(  mnCachePatternId >= 0 )
-                                    {
-                                        SvtGraphicFill::Transform aCacheTransform;
-                                        maCacheFill.getTransform( aCacheTransform );
-                                        if( aCacheTransform.matrix[0] == aPatTransform.matrix[0] &&
-                                            aCacheTransform.matrix[1] == aPatTransform.matrix[1] &&
-                                            aCacheTransform.matrix[2] == aPatTransform.matrix[2] &&
-                                            aCacheTransform.matrix[3] == aPatTransform.matrix[3] &&
-                                            aCacheTransform.matrix[4] == aPatTransform.matrix[4] &&
-                                            aCacheTransform.matrix[5] == aPatTransform.matrix[5]
-                                            )
-                                        {
-                                            Graphic aCacheGraphic;
-                                            maCacheFill.getGraphic( aCacheGraphic );
-                                            if( aCacheGraphic == aPatternGraphic )
-                                                bUseCache = true;
-                                        }
-                                    }
-
-                                    if( ! bUseCache )
-                                    {
-
-                                        // paint graphic to metafile
-                                        GDIMetaFile aPattern;
-                                        pDummyVDev->SetConnectMetaFile( &aPattern );
-                                        pDummyVDev->Push();
-                                        pDummyVDev->SetMapMode( aPatternGraphic.GetPrefMapMode() );
-
-                                        aPatternGraphic.Draw( &rDummyVDev, Point( 0, 0 ) );
-                                        pDummyVDev->Pop();
-                                        pDummyVDev->SetConnectMetaFile( NULL );
-                                        aPattern.WindStart();
-
-                                        MapMode aPatternMapMode( aPatternGraphic.GetPrefMapMode() );
-                                        // prepare pattern from metafile
-                                        Size aPrefSize( aPatternGraphic.GetPrefSize() );
-                                        // FIXME: this magic -1 shouldn't be necessary
-                                        aPrefSize.Width() -= 1;
-                                        aPrefSize.Height() -= 1;
-                                        aPrefSize = m_rOuterFace.GetReferenceDevice()->
-                                            LogicToLogic( aPrefSize,
-                                                          &aPatternMapMode,
-                                                          &m_rOuterFace.GetReferenceDevice()->GetMapMode() );
-                                        // build bounding rectangle of pattern
-                                        Rectangle aBound( Point( 0, 0 ), aPrefSize );
-                                        m_rOuterFace.BeginPattern( aBound );
-                                        m_rOuterFace.Push();
-                                        pDummyVDev->Push();
-                                        m_rOuterFace.SetMapMode( aPatternMapMode );
-                                        pDummyVDev->SetMapMode( aPatternMapMode );
-                                        ImplWriteActions( m_rOuterFace, NULL, aPattern, rDummyVDev );
-                                        pDummyVDev->Pop();
-                                        m_rOuterFace.Pop();
-
-                                        nPattern = m_rOuterFace.EndPattern( aPatTransform );
-
-                                        // try some caching and reuse pattern
-                                        mnCachePatternId = nPattern;
-                                        maCacheFill = aFill;
-                                    }
-
-                                    // draw polypolygon with pattern fill
-                                    tools::PolyPolygon aPath;
-                                    aFill.getPath( aPath );
-                                    m_rOuterFace.DrawPolyPolygon( aPath, nPattern, aFill.getFillRule() == SvtGraphicFill::fillEvenOdd );
-
-                                    bSkipSequence = true;
-                                }
-*/
                             }
                             if ( bSkipSequence )
                             {


More information about the Libreoffice-commits mailing list