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
08a2c851
Kaydet (Commit)
08a2c851
authored
May 15, 2015
tarafından
Miklos Vajna
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Use comphelper::sequenceToContainer
Change-Id: I9df4b1e04178b99d40aa3e08297b5bc5a30a9bce
üst
0abbb117
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
9 deletions
+7
-9
StyleSheetTable.cxx
writerfilter/source/dmapper/StyleSheetTable.cxx
+7
-9
No files found.
writerfilter/source/dmapper/StyleSheetTable.cxx
Dosyayı görüntüle @
08a2c851
...
...
@@ -1083,7 +1083,7 @@ void StyleSheetTable::ApplyStyleSheets( FontTablePtr rFontTable )
pEntry
->
pProperties
->
Insert
(
PROP_PARA_ADJUST
,
uno
::
makeAny
(
sal_Int16
(
style
::
ParagraphAdjust_LEFT
)
),
false
);
}
uno
::
Sequence
<
beans
::
PropertyValue
>
aPropValues
=
pEntry
->
pProperties
->
GetPropertyValues
(
);
auto
aPropValues
=
comphelper
::
sequenceToContainer
<
std
::
vector
<
beans
::
PropertyValue
>
>
(
pEntry
->
pProperties
->
GetPropertyValues
()
);
bool
bAddFollowStyle
=
false
;
if
(
bParaStyle
&&
!
pEntry
->
sNextStyleIdentifier
.
isEmpty
()
)
{
...
...
@@ -1097,12 +1097,10 @@ void StyleSheetTable::ApplyStyleSheets( FontTablePtr rFontTable )
const
StyleSheetPropertyMap
*
pStyleSheetProperties
=
dynamic_cast
<
const
StyleSheetPropertyMap
*>
(
pEntry
?
pEntry
->
pProperties
.
get
()
:
nullptr
);
if
(
pStyleSheetProperties
)
{
aPropValues
.
realloc
(
aPropValues
.
getLength
(
)
+
1
);
beans
::
PropertyValue
aLvlVal
(
rPropNameSupplier
.
GetName
(
PROP_OUTLINE_LEVEL
),
0
,
uno
::
makeAny
(
sal_Int16
(
pStyleSheetProperties
->
GetOutlineLevel
(
)
+
1
)
),
beans
::
PropertyState_DIRECT_VALUE
);
aPropValues
[
aPropValues
.
getLength
(
)
-
1
]
=
aLvlVal
;
aPropValues
.
push_back
(
aLvlVal
)
;
}
uno
::
Reference
<
beans
::
XPropertyState
>
xState
(
xStyle
,
uno
::
UNO_QUERY_THROW
);
...
...
@@ -1139,17 +1137,17 @@ void StyleSheetTable::ApplyStyleSheets( FontTablePtr rFontTable )
}
}
if
(
bAddFollowStyle
||
aPropValues
.
getLength
())
if
(
bAddFollowStyle
||
!
aPropValues
.
empty
())
{
PropValVector
aSortedPropVals
;
for
(
sal_Int32
nProp
=
0
;
nProp
<
aPropValues
.
getLength
();
++
nProp
)
for
(
const
beans
::
PropertyValue
&
rValue
:
aPropValues
)
{
// Don't add the style name properties
bool
bIsParaStyleName
=
aPropValues
[
nProp
]
.
Name
==
"ParaStyleName"
;
bool
bIsCharStyleName
=
aPropValues
[
nProp
]
.
Name
==
"CharStyleName"
;
bool
bIsParaStyleName
=
rValue
.
Name
==
"ParaStyleName"
;
bool
bIsCharStyleName
=
rValue
.
Name
==
"CharStyleName"
;
if
(
!
bIsParaStyleName
&&
!
bIsCharStyleName
)
{
aSortedPropVals
.
Insert
(
aPropValues
[
nProp
]
);
aSortedPropVals
.
Insert
(
rValue
);
}
}
if
(
bAddFollowStyle
)
...
...
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