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
bc589d57
Kaydet (Commit)
bc589d57
authored
Eki 30, 2012
tarafından
Armin Le Grand
Kaydeden (comit)
Xisco Fauli
Nis 14, 2013
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
#121221# added boolean state to remember when the StrokeDasharray was set to empty by purpose
üst
f75ca1fd
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
2 deletions
+24
-2
svgstyleattributes.hxx
svgio/inc/svgio/svgreader/svgstyleattributes.hxx
+7
-0
svgstyleattributes.cxx
svgio/source/svgreader/svgstyleattributes.cxx
+17
-2
No files found.
svgio/inc/svgio/svgreader/svgstyleattributes.hxx
Dosyayı görüntüle @
bc589d57
...
...
@@ -203,6 +203,9 @@ namespace svgio
// vaules for fill, stroke, strokeWidth and others
bool
mbIsClipPathContent
:
1
;
// #121221# Defines if evtl. an empty array *is* set
bool
mbStrokeDasharraySet
:
1
;
/// internal helpers
void
add_fillGradient
(
const
basegfx
::
B2DPolyPolygon
&
rPath
,
...
...
@@ -319,6 +322,10 @@ namespace svgio
const
SvgNumberVector
&
getStrokeDasharray
()
const
;
void
setStrokeDasharray
(
const
SvgNumberVector
&
rStrokeDasharray
=
SvgNumberVector
())
{
maStrokeDasharray
=
rStrokeDasharray
;
}
/// #121221# StrokeDasharray needs a set state, it *may* be set to empty by purpose
bool
getStrokeDasharraySet
()
const
{
return
mbStrokeDasharraySet
;
}
void
setStrokeDasharraySet
(
bool
bNew
)
{
mbStrokeDasharraySet
=
bNew
;
}
/// StrokeDashOffset content
const
SvgNumber
getStrokeDashOffset
()
const
;
void
setStrokeDashOffset
(
const
SvgNumber
&
rStrokeDashOffset
=
SvgNumber
())
{
maStrokeDashOffset
=
rStrokeDashOffset
;
}
...
...
svgio/source/svgreader/svgstyleattributes.cxx
Dosyayı görüntüle @
bc589d57
...
...
@@ -1156,7 +1156,8 @@ namespace svgio
mpMarkerEndXLink
(
0
),
maFillRule
(
FillRule_notset
),
maClipRule
(
FillRule_nonzero
),
mbIsClipPathContent
(
SVGTokenClipPathNode
==
mrOwner
.
getType
())
mbIsClipPathContent
(
SVGTokenClipPathNode
==
mrOwner
.
getType
()),
mbStrokeDasharraySet
(
false
)
{
if
(
!
mbIsClipPathContent
)
{
...
...
@@ -1263,9 +1264,18 @@ namespace svgio
{
if
(
aContent
.
getLength
())
{
static
rtl
::
OUString
aStrNone
(
rtl
::
OUString
::
createFromAscii
(
"none"
));
SvgNumberVector
aVector
;
if
(
readSvgNumberVector
(
aContent
,
aVector
))
if
(
aContent
.
match
(
aStrNone
))
{
// #121221# The special value 'none' needs to be handled
// in the sense that *when* it is set, the parent shall not
// be used. Before this was only dependent on the array being
// empty
setStrokeDasharraySet
(
true
);
}
else
if
(
readSvgNumberVector
(
aContent
,
aVector
))
{
setStrokeDasharray
(
aVector
);
}
...
...
@@ -2020,6 +2030,11 @@ namespace svgio
{
return
maStrokeDasharray
;
}
else
if
(
getStrokeDasharraySet
())
{
// #121221# is set to empty *by purpose*, do not visit parent styles
return
maStrokeDasharray
;
}
const
SvgStyleAttributes
*
pSvgStyleAttributes
=
getParentStyle
();
...
...
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