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 /officecfg | |
| 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 'officecfg')
| -rw-r--r-- | officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu index f718fca1dd5a..0b3cf4d44545 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu @@ -320,9 +320,12 @@ Calc, OLE, hidden ; DrawImpress, 3DObject, visible ; DrawImpress, Draw, visible ; + DrawImpress, Graphic, hidden ; DrawImpress, TextObject, hidden ; DrawImpress, OLE, hidden ; WriterVariants, Draw, visible ; + Writer, Graphic, hidden ; + Writer, OLE, hidden ; Writer, Frame, visible ; </value> </prop> |