diff options
| author | Armin Le Grand <alg@apache.org> | 2014-04-17 16:44:58 +0000 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-04-25 13:08:06 +0200 |
| commit | 4a0b5e569d070c286daefb0fdfe45c0dd15d241c (patch) | |
| tree | 67f0a293e7174cb871c49a4e5078920d7b8321b8 /include/xmloff | |
| parent | 474fe287c4c97427a4b48d0c0d17f3231290150a (diff) | |
i#124638 support for DrawingLayre FillStyle for GraphicFrames and ...
... EmbeddedObjectFrames in Writer
(cherry picked from commit 8433ee82c9323501545164ddf6e6008db483ab7a)
Conflicts:
sw/source/core/attr/format.cxx
sw/source/core/layout/paintfrm.cxx
sw/source/core/uibase/shells/grfsh.cxx
sw/source/core/unocore/unomap.cxx
sw/source/core/unocore/unostyle.cxx
sw/source/ui/frmdlg/frmpage.src
xmloff/inc/xmloff/XMLShapeStyleContext.hxx
xmloff/source/draw/XMLShapeStyleContext.cxx
Change-Id: I441378ec3e9a32764781a8063adcc52051efe17f
Diffstat (limited to 'include/xmloff')
| -rw-r--r-- | include/xmloff/XMLShapeStyleContext.hxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/xmloff/XMLShapeStyleContext.hxx b/include/xmloff/XMLShapeStyleContext.hxx index 89662c09be30..a93181a5d71a 100644 --- a/include/xmloff/XMLShapeStyleContext.hxx +++ b/include/xmloff/XMLShapeStyleContext.hxx @@ -36,6 +36,8 @@ protected: OUString m_sControlDataStyleName; OUString m_sListStyleName; bool m_bIsNumRuleAlreadyConverted; + //UUUU + bool m_bIsFillStyleAlreadyConverted; protected: virtual void SetAttribute( sal_uInt16 nPrefixKey, |