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
09ebcc26
Kaydet (Commit)
09ebcc26
authored
May 01, 2014
tarafından
Caolán McNamara
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
coverity#708321 Uninitialized pointer field
Change-Id: Ia08d454e89d4af08b6db171611f14a66e890094b
üst
088afc62
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
31 additions
and
12 deletions
+31
-12
wmfwr.cxx
vcl/source/filter/wmf/wmfwr.cxx
+30
-6
wmfwr.hxx
vcl/source/filter/wmf/wmfwr.hxx
+1
-6
No files found.
vcl/source/filter/wmf/wmfwr.cxx
Dosyayı görüntüle @
09ebcc26
...
@@ -131,6 +131,33 @@
...
@@ -131,6 +131,33 @@
#define PRIVATE_ESCAPE_UNICODE 2
#define PRIVATE_ESCAPE_UNICODE 2
WMFWriter
::
WMFWriter
()
:
pWMF
(
NULL
)
,
pVirDev
(
NULL
)
,
nMetafileHeaderPos
(
0
)
,
nMaxRecordSize
(
0
)
,
nActRecordPos
(
0
)
,
eSrcRasterOp
(
ROP_OVERPAINT
)
,
eSrcTextAlign
(
ALIGN_BASELINE
)
,
bSrcIsClipping
(
false
)
,
pAttrStack
(
NULL
)
,
eSrcHorTextAlign
(
W_TA_LEFT
)
,
eDstROP2
(
ROP_OVERPAINT
)
,
eDstTextAlign
(
ALIGN_BASELINE
)
,
eDstHorTextAlign
(
W_TA_LEFT
)
,
bDstIsClipping
(
false
)
,
nDstPenHandle
(
0
)
,
nDstFontHandle
(
0
)
,
nDstBrushHandle
(
0
)
,
nNumberOfActions
(
0
)
,
nNumberOfBitmaps
(
0
)
,
nWrittenActions
(
0
)
,
nWrittenBitmaps
(
0
)
,
nActBitmapPercent
(
0
)
,
bEmbedEMF
(
false
)
{
}
void
WMFWriter
::
MayCallback
()
void
WMFWriter
::
MayCallback
()
{
{
if
(
xStatusIndicator
.
is
()
)
if
(
xStatusIndicator
.
is
()
)
...
@@ -1667,13 +1694,11 @@ bool WMFWriter::WriteWMF( const GDIMetaFile& rMTF, SvStream& rTargetStream,
...
@@ -1667,13 +1694,11 @@ bool WMFWriter::WriteWMF( const GDIMetaFile& rMTF, SvStream& rTargetStream,
bEmbedEMF
=
true
;
bEmbedEMF
=
true
;
bStatus
=
true
;
bStatus
=
true
;
pConvert
=
0
;
pVirDev
=
new
VirtualDevice
;
pVirDev
=
new
VirtualDevice
;
pFilterConfigItem
=
pFConfigItem
;
if
(
pFConfigItem
)
if
(
pFilterConfigItem
)
{
{
xStatusIndicator
=
pF
ilter
ConfigItem
->
GetStatusIndicator
();
xStatusIndicator
=
pFConfigItem
->
GetStatusIndicator
();
if
(
xStatusIndicator
.
is
()
)
if
(
xStatusIndicator
.
is
()
)
{
{
OUString
aMsg
;
OUString
aMsg
;
...
@@ -1693,7 +1718,7 @@ bool WMFWriter::WriteWMF( const GDIMetaFile& rMTF, SvStream& rTargetStream,
...
@@ -1693,7 +1718,7 @@ bool WMFWriter::WriteWMF( const GDIMetaFile& rMTF, SvStream& rTargetStream,
{
{
aTargetMapMode
=
aSrcMapMode
;
aTargetMapMode
=
aSrcMapMode
;
aTargetSize
=
rMTF
.
GetPrefSize
();
aTargetSize
=
rMTF
.
GetPrefSize
();
nTargetDivisor
=
CalcSaveTargetMapMode
(
aTargetMapMode
,
aTargetSize
);
sal_uInt16
nTargetDivisor
=
CalcSaveTargetMapMode
(
aTargetMapMode
,
aTargetSize
);
aTargetSize
.
Width
()
/=
nTargetDivisor
;
aTargetSize
.
Width
()
/=
nTargetDivisor
;
aTargetSize
.
Height
()
/=
nTargetDivisor
;
aTargetSize
.
Height
()
/=
nTargetDivisor
;
}
}
...
@@ -1776,7 +1801,6 @@ bool WMFWriter::WriteWMF( const GDIMetaFile& rMTF, SvStream& rTargetStream,
...
@@ -1776,7 +1801,6 @@ bool WMFWriter::WriteWMF( const GDIMetaFile& rMTF, SvStream& rTargetStream,
}
}
delete
pVirDev
;
delete
pVirDev
;
delete
pConvert
;
if
(
xStatusIndicator
.
is
()
)
if
(
xStatusIndicator
.
is
()
)
xStatusIndicator
->
end
();
xStatusIndicator
->
end
();
...
...
vcl/source/filter/wmf/wmfwr.hxx
Dosyayı görüntüle @
09ebcc26
...
@@ -54,16 +54,13 @@ private:
...
@@ -54,16 +54,13 @@ private:
bool
bStatus
;
bool
bStatus
;
sal_uLong
nLastPercent
;
// with which number pCallback was called last time.
sal_uLong
nLastPercent
;
// with which number pCallback was called last time.
FilterConfigItem
*
pFilterConfigItem
;
com
::
sun
::
star
::
uno
::
Reference
<
com
::
sun
::
star
::
task
::
XStatusIndicator
>
xStatusIndicator
;
com
::
sun
::
star
::
uno
::
Reference
<
com
::
sun
::
star
::
task
::
XStatusIndicator
>
xStatusIndicator
;
SvStream
*
pWMF
;
SvStream
*
pWMF
;
VirtualDevice
*
pVirDev
;
VirtualDevice
*
pVirDev
;
StarSymbolToMSMultiFont
*
pConvert
;
MapMode
aTargetMapMode
;
MapMode
aTargetMapMode
;
Size
aTargetSize
;
Size
aTargetSize
;
sal_uInt16
nTargetDivisor
;
sal_uLong
nMetafileHeaderPos
;
sal_uLong
nMetafileHeaderPos
;
sal_uInt32
nMaxRecordSize
;
// in words
sal_uInt32
nMaxRecordSize
;
// in words
...
@@ -201,9 +198,7 @@ private:
...
@@ -201,9 +198,7 @@ private:
sal_uInt16
CalcSaveTargetMapMode
(
MapMode
&
rMapMode
,
const
Size
&
rPrefSize
);
sal_uInt16
CalcSaveTargetMapMode
(
MapMode
&
rMapMode
,
const
Size
&
rPrefSize
);
public
:
public
:
WMFWriter
();
WMFWriter
()
{}
bool
WriteWMF
(
const
GDIMetaFile
&
rMTF
,
SvStream
&
rTargetStream
,
FilterConfigItem
*
pFilterConfigItem
,
bool
bPlaceable
=
true
);
bool
WriteWMF
(
const
GDIMetaFile
&
rMTF
,
SvStream
&
rTargetStream
,
FilterConfigItem
*
pFilterConfigItem
,
bool
bPlaceable
=
true
);
};
};
...
...
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