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 /include | |
| parent | b3962c92bfb8d14d908bfeb9142548e9686ee105 (diff) | |
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 'include')
| -rw-r--r-- | include/editeng/brushitem.hxx | 3 | ||||
| -rw-r--r-- | include/editeng/memberids.hrc | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/editeng/brushitem.hxx b/include/editeng/brushitem.hxx index c7130bd2ffa6..d18882ad3cba 100644 --- a/include/editeng/brushitem.hxx +++ b/include/editeng/brushitem.hxx @@ -49,6 +49,7 @@ class SvxBrushItem_Impl; class EDITENG_DLLPUBLIC SvxBrushItem : public SfxPoolItem { Color aColor; + sal_Int32 nShadingValue; SvxBrushItem_Impl* pImpl; String* pStrLink; String* pStrFilter; @@ -104,11 +105,13 @@ public: void PurgeMedium() const; + sal_uInt32 GetShadingValue() const { return nShadingValue; } const Graphic* GetGraphic() const; const GraphicObject* GetGraphicObject() const; const String* GetGraphicLink() const { return pStrLink; } const String* GetGraphicFilter() const { return pStrFilter; } + void SetShadingValue( const sal_uInt32 nNew ); void SetGraphicPos( SvxGraphicPosition eNew ); void SetGraphic( const Graphic& rNew ); void SetGraphicObject( const GraphicObject& rNewObj ); diff --git a/include/editeng/memberids.hrc b/include/editeng/memberids.hrc index 1dbe7ba9da5f..9152c3602ce3 100644 --- a/include/editeng/memberids.hrc +++ b/include/editeng/memberids.hrc @@ -171,6 +171,7 @@ #define MID_GRAPHIC_TRANSPARENCY 8 #define MID_BACK_COLOR_R_G_B 9 #define MID_BACK_COLOR_TRANSPARENCY 10 +#define MID_SHADING_VALUE 11 //SvxFmtBreakItem #define MID_BREAK_BEFORE 0 |