Kaydet (Commit) 509907ce authored tarafından Tor Lillqvist's avatar Tor Lillqvist

It's "incomplete", not "in complete"

Change-Id: Ib3960e8facc0104c4d19fc19ea587c138f998a42
üst 295c7827
......@@ -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
......
......@@ -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 );
......
......@@ -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 );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment