diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2018-04-25 23:45:22 +0900 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2018-04-28 03:31:59 +0200 |
| commit | a6a38c6de9c18fd1269fc8cfc0e070ef429c8e2f (patch) | |
| tree | f1ad4d49dff3cb9eb0121389999030841409a7e0 /editeng | |
| parent | ofz#8038 defer subdocument redlining to end of parse like main document (diff) | |
| download | core-a6a38c6de9c18fd1269fc8cfc0e070ef429c8e2f.tar.gz core-a6a38c6de9c18fd1269fc8cfc0e070ef429c8e2f.zip | |
[API CHANGE] deprecate and revert GraphicURL prop. NumberingLevel
This deprecates the GraphicURL properties for NumberingLevel used
for bullet graphic. It also makes the proeprty work again, but
only setting it is supported.
Change-Id: I7727918677514b4846fd271ba606a0255bf9fe1b
Reviewed-on: https://gerrit.libreoffice.org/53458
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'editeng')
| -rw-r--r-- | editeng/source/uno/unonrule.cxx | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/editeng/source/uno/unonrule.cxx b/editeng/source/uno/unonrule.cxx index 7f97607c1f99..3acef998e3d1 100644 --- a/editeng/source/uno/unonrule.cxx +++ b/editeng/source/uno/unonrule.cxx @@ -27,6 +27,7 @@ #include <vcl/svapp.hxx> #include <vcl/graph.hxx> #include <vcl/GraphicObject.hxx> +#include <vcl/GraphicLoader.hxx> #include <editeng/brushitem.hxx> #include <editeng/unoprnms.hxx> @@ -352,10 +353,24 @@ void SvxUnoNumberingRules::setNumberingRuleByIndex(const Sequence<beans::Propert continue; } } + else if ( rPropName == "GraphicURL" ) + { + OUString aURL; + if (aVal >>= aURL) + { + Graphic aGraphic = vcl::graphic::loadFromURL(aURL); + if (aGraphic) + { + SvxBrushItem aBrushItem(aGraphic, GPOS_AREA, SID_ATTR_BRUSH); + aFmt.SetGraphicBrush(&aBrushItem); + } + continue; + } + } else if ( rPropName == "GraphicBitmap" ) { uno::Reference<awt::XBitmap> xBitmap; - if(aVal >>= xBitmap) + if (aVal >>= xBitmap) { uno::Reference<graphic::XGraphic> xGraphic(xBitmap, uno::UNO_QUERY); Graphic aGraphic(xGraphic); |