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
6cc15957
Kaydet (Commit)
6cc15957
authored
Nis 25, 2012
tarafından
Noel Grandin
Kaydeden (comit)
Michael Stahl
May 09, 2012
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Convert SV_DECL_PTRARR(SwHTMLTxtFtns) to std::vector
üst
e79a62e1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
11 deletions
+8
-11
htmlftn.cxx
sw/source/filter/html/htmlftn.cxx
+5
-10
wrthtml.hxx
sw/source/filter/html/wrthtml.hxx
+3
-1
No files found.
sw/source/filter/html/htmlftn.cxx
Dosyayı görüntüle @
6cc15957
...
...
@@ -40,9 +40,6 @@
#include "swhtml.hxx"
#include "wrthtml.hxx"
typedef
SwTxtFtn
*
SwTxtFtnPtr
;
SV_DECL_PTRARR
(
SwHTMLTxtFtns
,
SwTxtFtnPtr
,
1
)
struct
SwHTMLFootEndNote_Impl
{
SwHTMLTxtFtns
aTxtFtns
;
...
...
@@ -226,9 +223,7 @@ void SwHTMLParser::FinishFootEndNote()
// In Kopf- und Fusszeilen duerfen keine Fussnoten eingefuegt werden.
if
(
pTxtFtn
)
{
pFootEndNoteImpl
->
aTxtFtns
.
Insert
(
pTxtFtn
,
pFootEndNoteImpl
->
aTxtFtns
.
Count
()
);
pFootEndNoteImpl
->
aTxtFtns
.
push_back
(
pTxtFtn
);
pFootEndNoteImpl
->
aNames
.
push_back
(
pFootEndNoteImpl
->
sName
);
}
pFootEndNoteImpl
->
sName
=
aEmptyStr
;
...
...
@@ -264,7 +259,7 @@ SwNodeIndex *SwHTMLParser::GetFootEndNoteSection( const String& rName )
{
pStartNodeIdx
=
pFootEndNoteImpl
->
aTxtFtns
[
i
]
->
GetStartNode
();
pFootEndNoteImpl
->
aNames
.
erase
(
pFootEndNoteImpl
->
aNames
.
begin
()
+
i
);
pFootEndNoteImpl
->
aTxtFtns
.
Remove
(
i
,
1
);
pFootEndNoteImpl
->
aTxtFtns
.
erase
(
pFootEndNoteImpl
->
aTxtFtns
.
begin
()
+
i
);
if
(
pFootEndNoteImpl
->
aNames
.
empty
())
{
delete
pFootEndNoteImpl
;
...
...
@@ -292,7 +287,7 @@ Writer& OutHTML_SwFmtFtn( Writer& rWrt, const SfxPoolItem& rHt )
sal_uInt16
nPos
;
if
(
rFmtFtn
.
IsEndNote
()
)
{
nPos
=
rHTMLWrt
.
pFootEndNotes
?
rHTMLWrt
.
pFootEndNotes
->
Count
()
:
0
;
nPos
=
rHTMLWrt
.
pFootEndNotes
?
rHTMLWrt
.
pFootEndNotes
->
size
()
:
0
;
OSL_ENSURE
(
nPos
==
rHTMLWrt
.
nFootNote
+
rHTMLWrt
.
nEndNote
,
"OutHTML_SwFmtFtn: Position falsch"
);
sClass
.
AssignAscii
(
OOO_STRING_SVTOOLS_HTML_sdendnote_anc
);
...
...
@@ -309,7 +304,7 @@ Writer& OutHTML_SwFmtFtn( Writer& rWrt, const SfxPoolItem& rHt )
if
(
!
rHTMLWrt
.
pFootEndNotes
)
rHTMLWrt
.
pFootEndNotes
=
new
SwHTMLTxtFtns
;
rHTMLWrt
.
pFootEndNotes
->
Insert
(
pTxtFtn
,
nPos
);
rHTMLWrt
.
pFootEndNotes
->
insert
(
rHTMLWrt
.
pFootEndNotes
->
begin
()
+
nPos
,
pTxtFtn
);
rtl
::
OStringBuffer
sOut
;
sOut
.
append
(
'<'
).
append
(
OOO_STRING_SVTOOLS_HTML_anchor
).
append
(
' '
)
...
...
@@ -350,7 +345,7 @@ void SwHTMLWriter::OutFootEndNotes()
#endif
nFootNote
=
0
,
nEndNote
=
0
;
for
(
sal_uInt16
i
=
0
;
i
<
pFootEndNotes
->
Count
();
i
++
)
for
(
sal_uInt16
i
=
0
;
i
<
pFootEndNotes
->
size
();
i
++
)
{
SwTxtFtn
*
pTxtFtn
=
(
*
pFootEndNotes
)[
i
];
pFmtFtn
=
&
pTxtFtn
->
GetFtn
();
...
...
sw/source/filter/html/wrthtml.hxx
Dosyayı görüntüle @
6cc15957
...
...
@@ -61,7 +61,9 @@ class SvxBrushItem;
class
SvxFontItem
;
class
SwHTMLNumRuleInfo
;
class
SwHTMLPosFlyFrms
;
class
SwHTMLTxtFtns
;
class
SwTxtFtn
;
typedef
std
::
vector
<
SwTxtFtn
*>
SwHTMLTxtFtns
;
extern
SwAttrFnTab
aHTMLAttrFnTab
;
...
...
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