diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-10-25 18:11:47 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-10-25 18:23:01 +0200 |
| commit | 6df9dd68ec4fe457103c0327559653ed187b94ce (patch) | |
| tree | 029f0f85924bde7dc6f042eff645015e5825b669 /filter | |
| parent | 718f155caacb2e969df7afcfc41ab3b207dba484 (diff) | |
move OOXML_COLOR_AUTO from writerfilter to msfilter, we need it from sw
Change-Id: I145c08d17ccb36bfbf734306cd9d27e8423debdd
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/msfilter/util.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/filter/source/msfilter/util.cxx b/filter/source/msfilter/util.cxx index 13bc633bc765..c2e48ce51592 100644 --- a/filter/source/msfilter/util.cxx +++ b/filter/source/msfilter/util.cxx @@ -287,9 +287,13 @@ TextCategory categorizeCodePoint(sal_uInt32 codePoint, const OUString &rBcp47Lan return eRet; } -OString ConvertColor( const Color &rColor ) +OString ConvertColor( const Color &rColor, bool bAutoColor ) { OString color( "auto" ); + + if (bAutoColor && rColor.GetColor() == OOXML_COLOR_AUTO) + return color; + if ( rColor.GetColor() != COL_AUTO ) { const char pHexDigits[] = "0123456789ABCDEF"; |