diff options
| author | Adam Co <rattles2013@gmail.com> | 2013-06-23 10:49:28 +0300 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2013-06-25 10:04:01 +0200 |
| commit | 26d40686128e70916a636e20f5ccc5763bbb6cc8 (patch) | |
| tree | bf4fa4f957f84482b66fe0bac2197e43ada91a70 /writerfilter/source/dmapper/CellColorHandler.hxx | |
| parent | WaE: unused variable 'aText' [loplugin] (diff) | |
| download | core-26d40686128e70916a636e20f5ccc5763bbb6cc8.tar.gz core-26d40686128e70916a636e20f5ccc5763bbb6cc8.zip | |
fdo65400: fix for Character Shading being lost
This bug fixes the DOCX import and export filters, adds a new property
to the document model and updates the UNO API.
There is no need to add layout \ UI updates, because in Word
the only way to turn this on\off is using a simple button,
and there is no way to control the shading color itself.
However, ODF import \ export filters should be updated in a future
commit.
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Change-Id: I1d34cec79289e38c08e42a4c6265d998e1edfdef
Reviewed-on: https://gerrit.libreoffice.org/4452
Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
Diffstat (limited to 'writerfilter/source/dmapper/CellColorHandler.hxx')
| -rw-r--r-- | writerfilter/source/dmapper/CellColorHandler.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/writerfilter/source/dmapper/CellColorHandler.hxx b/writerfilter/source/dmapper/CellColorHandler.hxx index 05881eeb86d4..27f18fd0bbe5 100644 --- a/writerfilter/source/dmapper/CellColorHandler.hxx +++ b/writerfilter/source/dmapper/CellColorHandler.hxx @@ -32,7 +32,7 @@ class WRITERFILTER_DLLPRIVATE CellColorHandler : public LoggedProperties public: enum OutputFormat { Form, Paragraph, Character }; // for what part of the document private: - sal_Int32 m_nShadowType; + sal_Int32 m_nShadingPattern; sal_Int32 m_nColor; sal_Int32 m_nFillColor; OutputFormat m_OutputFormat; |