Kaydet (Commit) 975bfbe2 authored tarafından Caolán McNamara's avatar Caolán McNamara

make this a member of SvxBrushItem

Change-Id: If1216b03a313885bb284ca5ddcd8a91167a3638b
üst b9c1eb5d
...@@ -45,7 +45,6 @@ ...@@ -45,7 +45,6 @@
#include <com/sun/star/drawing/ShadingPattern.hpp> #include <com/sun/star/drawing/ShadingPattern.hpp>
#include <i18nutil/unicode.hxx> #include <i18nutil/unicode.hxx>
#include <unotools/securityoptions.hxx>
#include <unotools/ucbstreamhelper.hxx> #include <unotools/ucbstreamhelper.hxx>
#include <limits.h> #include <limits.h>
#include <comphelper/processfactory.hxx> #include <comphelper/processfactory.hxx>
...@@ -3801,7 +3800,7 @@ const GraphicObject* SvxBrushItem::GetGraphicObject(OUString const & referer) co ...@@ -3801,7 +3800,7 @@ const GraphicObject* SvxBrushItem::GetGraphicObject(OUString const & referer) co
if (bLoadAgain && !maStrLink.isEmpty() && !xGraphicObject) if (bLoadAgain && !maStrLink.isEmpty() && !xGraphicObject)
// when graphics already loaded, use as a cache // when graphics already loaded, use as a cache
{ {
if (SvtSecurityOptions().isUntrustedReferer(referer)) { if (maSecOptions.isUntrustedReferer(referer)) {
return nullptr; return nullptr;
} }
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include <svl/poolitem.hxx> #include <svl/poolitem.hxx>
#include <vcl/wall.hxx> #include <vcl/wall.hxx>
#include <tools/link.hxx> #include <tools/link.hxx>
#include <unotools/securityoptions.hxx>
#include <editeng/editengdllapi.h> #include <editeng/editengdllapi.h>
#include <memory> #include <memory>
...@@ -49,6 +50,7 @@ class EDITENG_DLLPUBLIC SvxBrushItem : public SfxPoolItem ...@@ -49,6 +50,7 @@ class EDITENG_DLLPUBLIC SvxBrushItem : public SfxPoolItem
mutable std::unique_ptr<GraphicObject> xGraphicObject; mutable std::unique_ptr<GraphicObject> xGraphicObject;
sal_Int8 nGraphicTransparency; //contains a percentage value which is sal_Int8 nGraphicTransparency; //contains a percentage value which is
//copied to the GraphicObject when necessary //copied to the GraphicObject when necessary
SvtSecurityOptions maSecOptions;
OUString maStrLink; OUString maStrLink;
OUString maStrFilter; OUString maStrFilter;
SvxGraphicPosition eGraphicPos; SvxGraphicPosition eGraphicPos;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment