diff options
| author | Armin Le Grand <alg@apache.org> | 2013-06-04 15:07:09 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-06-04 20:08:24 +0100 |
| commit | 7906c680575374e9cfc68ca991985a63e21ff30d (patch) | |
| tree | 270e9cb2a5a045648d9f73a61d3ce1259ba7f9c7 /cppcanvas | |
| parent | 64ae8beec66a36064a49c2e7c6f46073a645f64c (diff) | |
Related: #i120994# Avoid same error for META_TEXTFILLCOLOR_ACTION...
and META_TEXTLINECOLOR_ACTION
(cherry picked from commit 839e9f69c68fd32a17fc90d31a68f0b2f0c2fff1)
Change-Id: I259ffb9d4710aae2334fd27c1ee0bbab0679df76
Diffstat (limited to 'cppcanvas')
| -rw-r--r-- | cppcanvas/source/mtfrenderer/implrenderer.cxx | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx index 59fead1b6822..769df3df5ee4 100644 --- a/cppcanvas/source/mtfrenderer/implrenderer.cxx +++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx @@ -1519,6 +1519,13 @@ namespace cppcanvas rStates.getState().textFillColor, rCanvas ); } + else + { + // #120994# Do switch on/off TextFillColor, even when a overriding one is set + bool bSetting(static_cast<MetaTextFillColorAction*>(pCurrAct)->IsSetting()); + + rStates.getState().isTextFillColorSet = bSetting; + } break; case META_TEXTLINECOLOR_ACTION: @@ -1529,6 +1536,13 @@ namespace cppcanvas rStates.getState().textLineColor, rCanvas ); } + else + { + // #120994# Do switch on/off TextLineColor, even when a overriding one is set + bool bSetting(static_cast<MetaTextLineColorAction*>(pCurrAct)->IsSetting()); + + rStates.getState().isTextLineColorSet = bSetting; + } break; case META_TEXTALIGN_ACTION: |