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
f5299a41
Kaydet (Commit)
f5299a41
authored
Haz 07, 2011
tarafından
Caolán McNamara
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Resolves: rhbz#710556 don't crash on missing graphics
üst
71292f60
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
14 deletions
+14
-14
drawingml.cxx
oox/source/export/drawingml.cxx
+14
-14
No files found.
oox/source/export/drawingml.cxx
Dosyayı görüntüle @
f5299a41
...
@@ -469,7 +469,7 @@ OUString DrawingML::WriteImage( const Graphic& rGraphic )
...
@@ -469,7 +469,7 @@ OUString DrawingML::WriteImage( const Graphic& rGraphic )
{
{
GfxLink
aLink
=
rGraphic
.
GetLink
();
GfxLink
aLink
=
rGraphic
.
GetLink
();
OUString
sMediaType
;
OUString
sMediaType
;
const
char
*
sExtension
=
NULL
;
const
char
*
pExtension
=
""
;
OUString
sRelId
;
OUString
sRelId
;
SvMemoryStream
aStream
;
SvMemoryStream
aStream
;
...
@@ -479,42 +479,42 @@ OUString DrawingML::WriteImage( const Graphic& rGraphic )
...
@@ -479,42 +479,42 @@ OUString DrawingML::WriteImage( const Graphic& rGraphic )
switch
(
aLink
.
GetType
()
)
{
switch
(
aLink
.
GetType
()
)
{
case
GFX_LINK_TYPE_NATIVE_GIF
:
case
GFX_LINK_TYPE_NATIVE_GIF
:
sMediaType
=
US
(
"image/gif"
);
sMediaType
=
US
(
"image/gif"
);
s
Extension
=
".gif"
;
p
Extension
=
".gif"
;
break
;
break
;
case
GFX_LINK_TYPE_NATIVE_JPG
:
case
GFX_LINK_TYPE_NATIVE_JPG
:
sMediaType
=
US
(
"image/jpeg"
);
sMediaType
=
US
(
"image/jpeg"
);
s
Extension
=
".jpeg"
;
p
Extension
=
".jpeg"
;
break
;
break
;
case
GFX_LINK_TYPE_NATIVE_PNG
:
case
GFX_LINK_TYPE_NATIVE_PNG
:
sMediaType
=
US
(
"image/png"
);
sMediaType
=
US
(
"image/png"
);
s
Extension
=
".png"
;
p
Extension
=
".png"
;
break
;
break
;
case
GFX_LINK_TYPE_NATIVE_TIF
:
case
GFX_LINK_TYPE_NATIVE_TIF
:
sMediaType
=
US
(
"image/tiff"
);
sMediaType
=
US
(
"image/tiff"
);
s
Extension
=
".tiff"
;
p
Extension
=
".tiff"
;
break
;
break
;
case
GFX_LINK_TYPE_NATIVE_WMF
:
case
GFX_LINK_TYPE_NATIVE_WMF
:
sMediaType
=
US
(
"image/x-wmf"
);
sMediaType
=
US
(
"image/x-wmf"
);
s
Extension
=
".wmf"
;
p
Extension
=
".wmf"
;
break
;
break
;
case
GFX_LINK_TYPE_NATIVE_MET
:
case
GFX_LINK_TYPE_NATIVE_MET
:
sMediaType
=
US
(
"image/x-met"
);
sMediaType
=
US
(
"image/x-met"
);
s
Extension
=
".met"
;
p
Extension
=
".met"
;
break
;
break
;
case
GFX_LINK_TYPE_NATIVE_PCT
:
case
GFX_LINK_TYPE_NATIVE_PCT
:
sMediaType
=
US
(
"image/x-pict"
);
sMediaType
=
US
(
"image/x-pict"
);
s
Extension
=
".pct"
;
p
Extension
=
".pct"
;
break
;
break
;
default
:
{
default
:
{
GraphicType
aType
=
rGraphic
.
GetType
();
GraphicType
aType
=
rGraphic
.
GetType
();
if
(
aType
==
GRAPHIC_BITMAP
)
{
if
(
aType
==
GRAPHIC_BITMAP
)
{
GraphicConverter
::
Export
(
aStream
,
rGraphic
,
CVT_PNG
);
GraphicConverter
::
Export
(
aStream
,
rGraphic
,
CVT_PNG
);
sMediaType
=
US
(
"image/png"
);
sMediaType
=
US
(
"image/png"
);
s
Extension
=
".png"
;
p
Extension
=
".png"
;
}
else
if
(
aType
==
GRAPHIC_GDIMETAFILE
)
{
}
else
if
(
aType
==
GRAPHIC_GDIMETAFILE
)
{
GraphicConverter
::
Export
(
aStream
,
rGraphic
,
CVT_EMF
);
GraphicConverter
::
Export
(
aStream
,
rGraphic
,
CVT_EMF
);
sMediaType
=
US
(
"image/x-emf"
);
sMediaType
=
US
(
"image/x-emf"
);
s
Extension
=
".emf"
;
p
Extension
=
".emf"
;
}
else
{
}
else
{
OSL_TRACE
(
"unhandled graphic type"
);
OSL_TRACE
(
"unhandled graphic type"
);
break
;
break
;
...
@@ -526,7 +526,7 @@ OUString DrawingML::WriteImage( const Graphic& rGraphic )
...
@@ -526,7 +526,7 @@ OUString DrawingML::WriteImage( const Graphic& rGraphic )
}
}
}
}
const
char
*
pComponent
=
NULL
;
const
char
*
pComponent
=
""
;
switch
(
meDocumentType
)
switch
(
meDocumentType
)
{
{
case
DOCUMENT_DOCX
:
pComponent
=
"word"
;
break
;
case
DOCUMENT_DOCX
:
pComponent
=
"word"
;
break
;
...
@@ -538,13 +538,13 @@ OUString DrawingML::WriteImage( const Graphic& rGraphic )
...
@@ -538,13 +538,13 @@ OUString DrawingML::WriteImage( const Graphic& rGraphic )
.
appendAscii
(
pComponent
)
.
appendAscii
(
pComponent
)
.
appendAscii
(
"/media/image"
)
.
appendAscii
(
"/media/image"
)
.
append
(
(
sal_Int32
)
mnImageCounter
)
.
append
(
(
sal_Int32
)
mnImageCounter
)
.
appendAscii
(
s
Extension
)
.
appendAscii
(
p
Extension
)
.
makeStringAndClear
(),
.
makeStringAndClear
(),
sMediaType
);
sMediaType
);
xOutStream
->
writeBytes
(
Sequence
<
sal_Int8
>
(
(
const
sal_Int8
*
)
aData
,
nDataSize
)
);
xOutStream
->
writeBytes
(
Sequence
<
sal_Int8
>
(
(
const
sal_Int8
*
)
aData
,
nDataSize
)
);
xOutStream
->
closeOutput
();
xOutStream
->
closeOutput
();
const
char
*
pImagePrefix
=
NULL
;
const
char
*
pImagePrefix
=
""
;
switch
(
meDocumentType
)
switch
(
meDocumentType
)
{
{
case
DOCUMENT_DOCX
:
case
DOCUMENT_DOCX
:
...
@@ -561,7 +561,7 @@ OUString DrawingML::WriteImage( const Graphic& rGraphic )
...
@@ -561,7 +561,7 @@ OUString DrawingML::WriteImage( const Graphic& rGraphic )
OUStringBuffer
()
OUStringBuffer
()
.
appendAscii
(
pImagePrefix
)
.
appendAscii
(
pImagePrefix
)
.
append
(
(
sal_Int32
)
mnImageCounter
++
)
.
append
(
(
sal_Int32
)
mnImageCounter
++
)
.
appendAscii
(
s
Extension
)
.
appendAscii
(
p
Extension
)
.
makeStringAndClear
()
);
.
makeStringAndClear
()
);
return
sRelId
;
return
sRelId
;
...
...
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