[Libreoffice-commits] core.git: editeng/source include/editeng

[Caolán McNamara]

 editeng/source/items/frmitems.cxx |    3 +--
 include/editeng/brushitem.hxx     |    2 ++
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 975bfbe29dc92de8d9e081685d2377ea8f7ce62e
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Mar 11 21:21:15 2017 +0000

    make this a member of SvxBrushItem
    
    Change-Id: If1216b03a313885bb284ca5ddcd8a91167a3638b

diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index 2f235b2..b10159b 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 83d4467..149db46 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;