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
35e95414
Kaydet (Commit)
35e95414
authored
Agu 26, 2014
tarafından
Miklos Vajna
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
sw HTML export: don't crash on embedded object without native data
Change-Id: I26fa823b987b2edfbb1be054a5f4d03bbe95a308
üst
d71aff6c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
log-areas.dox
include/sal/log-areas.dox
+1
-0
htmlplug.cxx
sw/source/filter/html/htmlplug.cxx
+3
-2
No files found.
include/sal/log-areas.dox
Dosyayı görüntüle @
35e95414
...
@@ -425,6 +425,7 @@ certain functionality.
...
@@ -425,6 +425,7 @@ certain functionality.
@li @c sw.uno - Writer UNO interfaces
@li @c sw.uno - Writer UNO interfaces
@li @c sw.ww8 - .doc/.docx export filter, .doc import filter (not writerfilter)
@li @c sw.ww8 - .doc/.docx export filter, .doc import filter (not writerfilter)
@li @c sw.ww8.level2 - further info for sw.ww8
@li @c sw.ww8.level2 - further info for sw.ww8
@li @c sw.html - Writer HTML import/export
@section writerfilter
@section writerfilter
...
...
sw/source/filter/html/htmlplug.cxx
Dosyayı görüntüle @
35e95414
...
@@ -1268,14 +1268,15 @@ Writer& OutHTML_FrmFmtOLENodeGrf( Writer& rWrt, const SwFrmFmt& rFrmFmt,
...
@@ -1268,14 +1268,15 @@ Writer& OutHTML_FrmFmtOLENodeGrf( Writer& rWrt, const SwFrmFmt& rFrmFmt,
uno
::
Reference
<
text
::
XTextContent
>
xTextContent
=
SwXTextEmbeddedObject
::
CreateXTextEmbeddedObject
(
*
rHTMLWrt
.
pDoc
,
const_cast
<
SwFrmFmt
*>
(
&
rFrmFmt
));
uno
::
Reference
<
text
::
XTextContent
>
xTextContent
=
SwXTextEmbeddedObject
::
CreateXTextEmbeddedObject
(
*
rHTMLWrt
.
pDoc
,
const_cast
<
SwFrmFmt
*>
(
&
rFrmFmt
));
uno
::
Reference
<
document
::
XEmbeddedObjectSupplier2
>
xEmbeddedObjectSupplier
(
xTextContent
,
uno
::
UNO_QUERY
);
uno
::
Reference
<
document
::
XEmbeddedObjectSupplier2
>
xEmbeddedObjectSupplier
(
xTextContent
,
uno
::
UNO_QUERY
);
uno
::
Reference
<
frame
::
XStorable
>
xStorable
(
xEmbeddedObjectSupplier
->
getEmbeddedObject
(),
uno
::
UNO_QUERY
);
uno
::
Reference
<
frame
::
XStorable
>
xStorable
(
xEmbeddedObjectSupplier
->
getEmbeddedObject
(),
uno
::
UNO_QUERY
);
SAL_WARN_IF
(
!
xStorable
.
is
(),
"sw.html"
,
"OutHTML_FrmFmtOLENodeGrf: no embedded object"
);
// Figure out what is the filter name of the embedded object.
// Figure out what is the filter name of the embedded object.
uno
::
Reference
<
lang
::
XServiceInfo
>
xServiceInfo
(
xStorable
,
uno
::
UNO_QUERY
);
uno
::
Reference
<
lang
::
XServiceInfo
>
xServiceInfo
(
xStorable
,
uno
::
UNO_QUERY
);
OUString
aFilter
;
OUString
aFilter
;
if
(
xServiceInfo
->
supportsService
(
"com.sun.star.sheet.SpreadsheetDocument"
))
if
(
xServiceInfo
.
is
()
&&
xServiceInfo
->
supportsService
(
"com.sun.star.sheet.SpreadsheetDocument"
))
aFilter
=
"HTML (StarCalc)"
;
aFilter
=
"HTML (StarCalc)"
;
if
(
!
aFilter
.
isEmpty
())
if
(
xStorable
.
is
()
&&
!
aFilter
.
isEmpty
())
{
{
SvMemoryStream
aStream
;
SvMemoryStream
aStream
;
uno
::
Reference
<
io
::
XOutputStream
>
xOutputStream
(
new
utl
::
OStreamWrapper
(
aStream
));
uno
::
Reference
<
io
::
XOutputStream
>
xOutputStream
(
new
utl
::
OStreamWrapper
(
aStream
));
...
...
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