diff options
author | Caolán McNamara <caolanm@redhat.com> | 2017-03-11 21:21:15 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2017-03-12 16:44:06 +0000 |
commit | 975bfbe29dc92de8d9e081685d2377ea8f7ce62e (patch) | |
tree | 9784f8b4ac6b6ddf39a6bcda99725cba93c95d29 | |
parent | b9c1eb5d929061570c95f7438471e6c07097f40e (diff) |
make this a member of SvxBrushItem
Change-Id: If1216b03a313885bb284ca5ddcd8a91167a3638b
-rw-r--r-- | editeng/source/items/frmitems.cxx | 3 | ||||
-rw-r--r-- | include/editeng/brushitem.hxx | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index 2f235b29dc7e..b10159ba64c6 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -45,7 +45,6 @@ #include <com/sun/star/drawing/ShadingPattern.hpp> #include <i18nutil/unicode.hxx> -#include <unotools/securityoptions.hxx> #include <unotools/ucbstreamhelper.hxx> #include <limits.h> #include <comphelper/processfactory.hxx> @@ -3801,7 +3800,7 @@ const GraphicObject* SvxBrushItem::GetGraphicObject(OUString const & referer) co if (bLoadAgain && !maStrLink.isEmpty() && !xGraphicObject) // when graphics already loaded, use as a cache { - if (SvtSecurityOptions().isUntrustedReferer(referer)) { + if (maSecOptions.isUntrustedReferer(referer)) { return nullptr; } diff --git a/include/editeng/brushitem.hxx b/include/editeng/brushitem.hxx index 83d44675b150..149db46ea4e3 100644 --- a/include/editeng/brushitem.hxx +++ b/include/editeng/brushitem.hxx @@ -22,6 +22,7 @@ #include <svl/poolitem.hxx> #include <vcl/wall.hxx> #include <tools/link.hxx> +#include <unotools/securityoptions.hxx> #include <editeng/editengdllapi.h> #include <memory> @@ -49,6 +50,7 @@ class EDITENG_DLLPUBLIC SvxBrushItem : public SfxPoolItem mutable std::unique_ptr<GraphicObject> xGraphicObject; sal_Int8 nGraphicTransparency; //contains a percentage value which is //copied to the GraphicObject when necessary + SvtSecurityOptions maSecOptions; OUString maStrLink; OUString maStrFilter; SvxGraphicPosition eGraphicPos; |