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
4c45c52b
Kaydet (Commit)
4c45c52b
authored
Nis 24, 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(INetFmts) to std::vector
üst
c353979a
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
21 deletions
+15
-21
htmlatr.cxx
sw/source/filter/html/htmlatr.cxx
+10
-14
htmlfly.cxx
sw/source/filter/html/htmlfly.cxx
+4
-6
wrthtml.hxx
sw/source/filter/html/wrthtml.hxx
+1
-1
No files found.
sw/source/filter/html/htmlatr.cxx
Dosyayı görüntüle @
4c45c52b
...
...
@@ -3107,10 +3107,10 @@ static Writer& OutHTML_SwFmtINetFmt( Writer& rWrt, const SfxPoolItem& rHt )
if
(
rHTMLWrt
.
bTagOn
)
{
// ggf. ein noch offenes Attribut voruebergehend beenden
if
(
rHTMLWrt
.
aINetFmts
.
Count
()
)
if
(
rHTMLWrt
.
aINetFmts
.
size
()
)
{
SwFmtINetFmt
*
pINetFmt
=
rHTMLWrt
.
aINetFmts
[
rHTMLWrt
.
aINetFmts
.
Count
()
-
1
]
;
rHTMLWrt
.
aINetFmts
.
back
()
;
OutHTML_INetFmt
(
rWrt
,
*
pINetFmt
,
sal_False
);
}
...
...
@@ -3118,32 +3118,28 @@ static Writer& OutHTML_SwFmtINetFmt( Writer& rWrt, const SfxPoolItem& rHt )
OutHTML_INetFmt
(
rWrt
,
rINetFmt
,
sal_True
);
// und merken
const
SwFmtINetFmt
*
pINetFmt
=
new
SwFmtINetFmt
(
rINetFmt
);
rHTMLWrt
.
aINetFmts
.
C40_INSERT
(
SwFmtINetFmt
,
pINetFmt
,
rHTMLWrt
.
aINetFmts
.
Count
()
);
SwFmtINetFmt
*
pINetFmt
=
new
SwFmtINetFmt
(
rINetFmt
);
rHTMLWrt
.
aINetFmts
.
push_back
(
pINetFmt
);
}
else
{
// das
OutHTML_INetFmt
(
rWrt
,
rINetFmt
,
sal_False
);
OSL_ENSURE
(
rHTMLWrt
.
aINetFmts
.
Count
(),
"da fehlt doch ein URL-Attribut"
);
if
(
rHTMLWrt
.
aINetFmts
.
Count
()
)
OSL_ENSURE
(
rHTMLWrt
.
aINetFmts
.
size
(),
"da fehlt doch ein URL-Attribut"
);
if
(
rHTMLWrt
.
aINetFmts
.
size
()
)
{
// das eigene Attribut vom Stack holen
SwFmtINetFmt
*
pINetFmt
=
rHTMLWrt
.
aINetFmts
[
rHTMLWrt
.
aINetFmts
.
Count
()
-
1
];
rHTMLWrt
.
aINetFmts
.
Remove
(
rHTMLWrt
.
aINetFmts
.
Count
()
-
1
,
1
);
SwFmtINetFmt
*
pINetFmt
=
rHTMLWrt
.
aINetFmts
.
back
();
rHTMLWrt
.
aINetFmts
.
pop_back
();
delete
pINetFmt
;
}
if
(
rHTMLWrt
.
aINetFmts
.
Count
()
)
if
(
!
rHTMLWrt
.
aINetFmts
.
empty
()
)
{
// es ist noch ein Attribut auf dem Stack, das wieder geoeffnet
// werden muss
SwFmtINetFmt
*
pINetFmt
=
rHTMLWrt
.
aINetFmts
[
rHTMLWrt
.
aINetFmts
.
Count
()
-
1
];
SwFmtINetFmt
*
pINetFmt
=
rHTMLWrt
.
aINetFmts
.
back
();
OutHTML_INetFmt
(
rWrt
,
*
pINetFmt
,
sal_True
);
}
}
...
...
sw/source/filter/html/htmlfly.cxx
Dosyayı görüntüle @
4c45c52b
...
...
@@ -836,10 +836,9 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt,
SwHTMLWriter
&
rHTMLWrt
=
(
SwHTMLWriter
&
)
rWrt
;
// ggf. ein noch offenes Attribut voruebergehend beenden
if
(
rHTMLWrt
.
aINetFmts
.
Count
()
)
if
(
!
rHTMLWrt
.
aINetFmts
.
empty
()
)
{
SwFmtINetFmt
*
pINetFmt
=
rHTMLWrt
.
aINetFmts
[
rHTMLWrt
.
aINetFmts
.
Count
()
-
1
];
SwFmtINetFmt
*
pINetFmt
=
rHTMLWrt
.
aINetFmts
.
back
();
OutHTML_INetFmt
(
rWrt
,
*
pINetFmt
,
sal_False
);
}
...
...
@@ -1198,12 +1197,11 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt,
if
(
!
aEndTags
.
isEmpty
()
)
rWrt
.
Strm
()
<<
aEndTags
.
getStr
();
if
(
rHTMLWrt
.
aINetFmts
.
Count
()
)
if
(
!
rHTMLWrt
.
aINetFmts
.
empty
()
)
{
// es ist noch ein Attribut auf dem Stack, das wieder geoeffnet
// werden muss
SwFmtINetFmt
*
pINetFmt
=
rHTMLWrt
.
aINetFmts
[
rHTMLWrt
.
aINetFmts
.
Count
()
-
1
];
SwFmtINetFmt
*
pINetFmt
=
rHTMLWrt
.
aINetFmts
.
back
();
OutHTML_INetFmt
(
rWrt
,
*
pINetFmt
,
sal_True
);
}
...
...
sw/source/filter/html/wrthtml.hxx
Dosyayı görüntüle @
4c45c52b
...
...
@@ -190,7 +190,7 @@ const sal_uInt32 HTML_FRMOPTS_GENIMG =
// der HTML-Writer
struct
HTMLControl
;
SV_DECL_PTRARR_SORT_DEL
(
HTMLControls
,
HTMLControl
*
,
1
)
SV_DECL_PTRARR
(
INetFmts
,
SwFmtINetFmt
*
,
1
)
typedef
std
::
vector
<
SwFmtINetFmt
*>
INetFmts
;
struct
SwHTMLFmtInfo
;
SV_DECL_PTRARR_SORT_DEL
(
SwHTMLFmtInfos
,
SwHTMLFmtInfo
*
,
1
)
...
...
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