Skip to content

C
core
Kaydet (Commit) 839e9f69 authored tarafından Armin Le Grand's avatar Armin Le Grand
Dosyalara gözat
Seçenekler

i120994 Avoid same error for META_TEXTFILLCOLOR_ACTION and META_TEXTLINECOLOR_ACTION

üst 2d9ea78c
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 0 deletions
cppcanvas/source/mtfrenderer/implrenderer.cxx
Dosyayı görüntüle @ 839e9f69
...@@ -1551,6 +1551,13 @@ namespace cppcanvas ...@@ -1551,6 +1551,13 @@ namespace cppcanvas
getState( rStates ).textFillColor, getState( rStates ).textFillColor,
rCanvas ); rCanvas );
} }
else
{
// #120994# Do switch on/off TextFillColor, even when a overriding one is set
bool bSetting(static_cast<MetaTextFillColorAction*>(pCurrAct)->IsSetting());
getState( rStates ).isTextFillColorSet = bSetting;
}
break; break;
case META_TEXTLINECOLOR_ACTION: case META_TEXTLINECOLOR_ACTION:
...@@ -1561,6 +1568,13 @@ namespace cppcanvas ...@@ -1561,6 +1568,13 @@ namespace cppcanvas
getState( rStates ).textLineColor, getState( rStates ).textLineColor,
rCanvas ); rCanvas );
} }
else
{
// #120994# Do switch on/off TextLineColor, even when a overriding one is set
bool bSetting(static_cast<MetaTextLineColorAction*>(pCurrAct)->IsSetting());
getState( rStates ).isTextLineColorSet = bSetting;
}
break; break;
case META_TEXTALIGN_ACTION: case META_TEXTALIGN_ACTION:
......
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