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

[Khaled Hosny]

 vcl/inc/sallayout.hxx        |    1 -
 vcl/source/gdi/sallayout.cxx |    7 -------
 2 files changed, 8 deletions(-)

New commits:
commit 7c2e96a4e7733e315bf948dd89a5d804cef5e67e
Author: Khaled Hosny <khaledhosny at eglug.org>
Date:   Fri Jan 27 18:16:22 2017 +0200

    DisableGlyphInjection does nothing
    
    Change-Id: Ie97eac46fde075bd74c7adb583b8be979f3af829

diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx
index 542eebf..16a83f8 100644
--- a/vcl/inc/sallayout.hxx
+++ b/vcl/inc/sallayout.hxx
@@ -187,7 +187,6 @@ public:
     virtual void    MoveGlyph( int nStart, long nNewXPos ) = 0;
     virtual void    DropGlyph( int nStart ) = 0;
     virtual void    Simplify( bool bIsBase ) = 0;
-    virtual void    DisableGlyphInjection( bool /*bDisable*/ ) {}
 
     virtual std::shared_ptr<vcl::TextLayoutCache>
         CreateTextLayoutCache(OUString const&) const;
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index 6a970f9..79b3140 100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -1203,9 +1203,6 @@ void MultiSalLayout::AdjustLayout( ImplLayoutArgs& rArgs )
         }
         mpLayouts[n]->AdjustLayout( aMultiArgs );
 
-        // disable glyph-injection for glyph-fallback SalLayout iteration
-        SalLayout::DisableGlyphInjection( true );
-
         // remove unused parts of component
         if( n > 0 )
         {
@@ -1433,10 +1430,6 @@ void MultiSalLayout::AdjustLayout( ImplLayoutArgs& rArgs )
     }
 
     mpLayouts[0]->Simplify( true );
-
-    // reenable glyph-injection
-    for( n = 0; n < mnLevel; ++n )
-        SalLayout::DisableGlyphInjection( false );
 }
 
 void MultiSalLayout::InitFont() const