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

[Tor Lillqvist]

 vcl/inc/sallayout.hxx        |    4 ++--
 vcl/source/gdi/sallayout.cxx |   10 +++++-----
 vcl/source/outdev/font.cxx   |    2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 509907cea798cc74fbc6d91ce41105c52f41ba06
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Nov 24 13:18:24 2015 +0200

    It's "incomplete", not "in complete"
    
    Change-Id: Ib3960e8facc0104c4d19fc19ea587c138f998a42

diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx
index f2b2744..47d75da 100644
--- a/vcl/inc/sallayout.hxx
+++ b/vcl/inc/sallayout.hxx
@@ -253,7 +253,7 @@ public:
     virtual void    AdjustLayout( ImplLayoutArgs& ) override;
     virtual void    InitFont() const override;
 
-    void SetInComplete(bool bInComplete = true);
+    void SetIncomplete(bool bIncomplete = true);
 
 protected:
     virtual         ~MultiSalLayout();
@@ -272,7 +272,7 @@ private:
     const PhysicalFontFace* mpFallbackFonts[ MAX_FALLBACK ];
     ImplLayoutRuns  maFallbackRuns[ MAX_FALLBACK ];
     int             mnLevel;
-    bool            mbInComplete;
+    bool            mbIncomplete;
 };
 
 struct GlyphItem
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index 505b558..57c3b32 100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -1460,7 +1460,7 @@ void GenericSalLayout::SortGlyphItems()
 MultiSalLayout::MultiSalLayout( SalLayout& rBaseLayout, const PhysicalFontFace* pBaseFont )
 :   SalLayout()
 ,   mnLevel( 1 )
-,   mbInComplete( false )
+,   mbIncomplete( false )
 {
     //maFallbackRuns[0].Clear();
     mpFallbackFonts[ 0 ] = pBaseFont;
@@ -1468,9 +1468,9 @@ MultiSalLayout::MultiSalLayout( SalLayout& rBaseLayout, const PhysicalFontFace*
     mnUnitsPerPixel = rBaseLayout.GetUnitsPerPixel();
 }
 
-void MultiSalLayout::SetInComplete(bool bInComplete)
+void MultiSalLayout::SetIncomplete(bool bIncomplete)
 {
-    mbInComplete = bInComplete;
+    mbIncomplete = bIncomplete;
     maFallbackRuns[mnLevel-1] = ImplLayoutRuns();
 }
 
@@ -1497,7 +1497,7 @@ bool MultiSalLayout::LayoutText( ImplLayoutArgs& rArgs )
 {
     if( mnLevel <= 1 )
         return false;
-    if (!mbInComplete)
+    if (!mbIncomplete)
         maFallbackRuns[ mnLevel-1 ] = rArgs.maRuns;
     return true;
 }
@@ -1613,7 +1613,7 @@ void MultiSalLayout::AdjustLayout( ImplLayoutArgs& rArgs )
         // remove unused parts of component
         if( n > 0 )
         {
-            if (mbInComplete && (n == mnLevel-1))
+            if (mbIncomplete && (n == mnLevel-1))
                 mpLayouts[n]->Simplify( true );
             else
                 mpLayouts[n]->Simplify( false );
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index dc5f3c3..5f9f07d 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -2164,7 +2164,7 @@ SalLayout* OutputDevice::ImplGlyphFallbackLayout( SalLayout* pSalLayout, ImplLay
             pMultiSalLayout->AddFallback( *pFallback,
                 rLayoutArgs.maRuns, aFontSelData.mpFontData );
             if (nFallbackLevel == MAX_FALLBACK-1)
-                pMultiSalLayout->SetInComplete();
+                pMultiSalLayout->SetIncomplete();
         }
 
         mpFontCache->Release( pFallbackFont );