Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
975bfbe2
Kaydet (Commit)
975bfbe2
authored
Mar 11, 2017
tarafından
Caolán McNamara
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
make this a member of SvxBrushItem
Change-Id: If1216b03a313885bb284ca5ddcd8a91167a3638b
üst
b9c1eb5d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
frmitems.cxx
editeng/source/items/frmitems.cxx
+1
-2
brushitem.hxx
include/editeng/brushitem.hxx
+2
-0
No files found.
editeng/source/items/frmitems.cxx
Dosyayı görüntüle @
975bfbe2
...
@@ -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
;
}
}
...
...
include/editeng/brushitem.hxx
Dosyayı görüntüle @
975bfbe2
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment