diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-07-31 09:15:14 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-09-02 11:18:44 +0000 |
| commit | 55f0c2f416db716f0cccf1bb05625c264a78d9df (patch) | |
| tree | 175674fae7b7ba7c4d0b3ae1dccb1b6cbaa2a42a /sw/source/core | |
| parent | 4d1e2f8abc37469e9943a24644afccd4f0b88375 (diff) | |
tdf#88986 sw: add missing XPropertyList pool items on TextFrame insertion
Regression from commit 6e61ecd09679a66060f932835622821d39e92f01 (Merge
back branch alg_writerframes to trunk, 2014-03-19), the problem was
while SwFrameShell::Execute() was modified to put the various pool items
related to fill types (colors, gradients, etc) to the item set of the
dialog, the same was missing in SwTextShell::ExecInsert(), so colors
were missing on inserting a new frame, but not when editing an existing
one.
(cherry picked from commit 6c3ca675509101732d3d878d6ceb6226026cd9ac)
Conflicts:
sw/inc/drawdoc.hxx
Change-Id: Id009f914c1c3b6509e31a4887e32a00624678cf4
Reviewed-on: https://gerrit.libreoffice.org/18232
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/source/core')
| -rw-r--r-- | sw/source/core/draw/drawdoc.cxx | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sw/source/core/draw/drawdoc.cxx b/sw/source/core/draw/drawdoc.cxx index 149408b30275..8d312b3ac1a5 100644 --- a/sw/source/core/draw/drawdoc.cxx +++ b/sw/source/core/draw/drawdoc.cxx @@ -150,4 +150,12 @@ uno::Reference< uno::XInterface > SwDrawModel::createUnoModel() return xModel; } +void SwDrawModel::PutAreaListItems(SfxItemSet& rSet) const +{ + rSet.Put(SvxColorListItem(GetColorList(), SID_COLOR_TABLE)); + rSet.Put(SvxGradientListItem(GetGradientList(), SID_GRADIENT_LIST)); + rSet.Put(SvxHatchListItem(GetHatchList(), SID_HATCH_LIST)); + rSet.Put(SvxBitmapListItem(GetBitmapList(), SID_BITMAP_LIST)); +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |