diff options
| author | Armin Le Grand <alg@apache.org> | 2013-06-04 15:07:09 +0000 |
|---|---|---|
| committer | Armin Le Grand <alg@apache.org> | 2013-06-04 15:07:09 +0000 |
| commit | 839e9f69c68fd32a17fc90d31a68f0b2f0c2fff1 (patch) | |
| tree | 163b32b09978356b8a8b59ca35d75c636becc963 /cppcanvas | |
| parent | 2d9ea78c63a73622cbdd77f8e7ce114cef47deb1 (diff) | |
i120994 Avoid same error for META_TEXTFILLCOLOR_ACTION and META_TEXTLINECOLOR_ACTION
Notes
Notes:
merged as: 7906c680575374e9cfc68ca991985a63e21ff30d
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 2e284c6a13de..771170bb6cbc 100644 --- a/cppcanvas/source/mtfrenderer/implrenderer.cxx +++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx @@ -1551,6 +1551,13 @@ namespace cppcanvas getState( rStates ).textFillColor, 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; case META_TEXTLINECOLOR_ACTION: @@ -1561,6 +1568,13 @@ namespace cppcanvas getState( rStates ).textLineColor, 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; case META_TEXTALIGN_ACTION: |