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
b560dc89
Kaydet (Commit)
b560dc89
authored
Ock 01, 2017
tarafından
Caolán McNamara
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
so noone cares about the return of [Read|Write]ImpGraphic
Change-Id: I2e251ff71b1f20e43c797c3fc901f3a70dce7c6c
üst
970edf67
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
11 deletions
+7
-11
impgraph.hxx
vcl/inc/impgraph.hxx
+2
-2
impgraph.cxx
vcl/source/gdi/impgraph.cxx
+5
-9
No files found.
vcl/inc/impgraph.hxx
Dosyayı görüntüle @
b560dc89
...
@@ -138,8 +138,8 @@ private:
...
@@ -138,8 +138,8 @@ private:
bool
ImplExportNative
(
SvStream
&
rOStm
)
const
;
bool
ImplExportNative
(
SvStream
&
rOStm
)
const
;
friend
SvStream
&
WriteImpGraphic
(
SvStream
&
rOStm
,
const
ImpGraphic
&
rImpGraphic
);
friend
void
WriteImpGraphic
(
SvStream
&
rOStm
,
const
ImpGraphic
&
rImpGraphic
);
friend
SvStream
&
ReadImpGraphic
(
SvStream
&
rIStm
,
ImpGraphic
&
rImpGraphic
);
friend
void
ReadImpGraphic
(
SvStream
&
rIStm
,
ImpGraphic
&
rImpGraphic
);
const
SvgDataPtr
&
getSvgData
()
const
{
return
maSvgData
;
}
const
SvgDataPtr
&
getSvgData
()
const
{
return
maSvgData
;
}
};
};
...
...
vcl/source/gdi/impgraph.cxx
Dosyayı görüntüle @
b560dc89
...
@@ -1356,10 +1356,10 @@ bool ImpGraphic::ImplExportNative( SvStream& rOStm ) const
...
@@ -1356,10 +1356,10 @@ bool ImpGraphic::ImplExportNative( SvStream& rOStm ) const
}
}
SvStream
&
ReadImpGraphic
(
SvStream
&
rIStm
,
ImpGraphic
&
rImpGraphic
)
void
ReadImpGraphic
(
SvStream
&
rIStm
,
ImpGraphic
&
rImpGraphic
)
{
{
if
(
rIStm
.
GetError
())
if
(
rIStm
.
GetError
())
return
rIStm
;
return
;
const
sal_uLong
nStmPos1
=
rIStm
.
Tell
();
const
sal_uLong
nStmPos1
=
rIStm
.
Tell
();
sal_uInt32
nTmp
;
sal_uInt32
nTmp
;
...
@@ -1375,7 +1375,7 @@ SvStream& ReadImpGraphic( SvStream& rIStm, ImpGraphic& rImpGraphic )
...
@@ -1375,7 +1375,7 @@ SvStream& ReadImpGraphic( SvStream& rIStm, ImpGraphic& rImpGraphic )
// read nothing. CAUTION: Eof is only true AFTER reading another
// read nothing. CAUTION: Eof is only true AFTER reading another
// byte, a speciality of SvMemoryStream (!)
// byte, a speciality of SvMemoryStream (!)
if
(
rIStm
.
GetError
()
||
rIStm
.
IsEof
())
if
(
rIStm
.
GetError
()
||
rIStm
.
IsEof
())
return
rIStm
;
return
;
if
(
NATIVE_FORMAT_50
==
nTmp
)
if
(
NATIVE_FORMAT_50
==
nTmp
)
{
{
...
@@ -1414,7 +1414,7 @@ SvStream& ReadImpGraphic( SvStream& rIStm, ImpGraphic& rImpGraphic )
...
@@ -1414,7 +1414,7 @@ SvStream& ReadImpGraphic( SvStream& rIStm, ImpGraphic& rImpGraphic )
rIStm
.
Seek
(
nStmPos1
);
rIStm
.
Seek
(
nStmPos1
);
rIStm
.
SetError
(
ERRCODE_IO_WRONGFORMAT
);
rIStm
.
SetError
(
ERRCODE_IO_WRONGFORMAT
);
}
}
return
rIStm
;
return
;
}
}
BitmapEx
aBmpEx
;
BitmapEx
aBmpEx
;
...
@@ -1516,11 +1516,9 @@ SvStream& ReadImpGraphic( SvStream& rIStm, ImpGraphic& rImpGraphic )
...
@@ -1516,11 +1516,9 @@ SvStream& ReadImpGraphic( SvStream& rIStm, ImpGraphic& rImpGraphic )
}
}
rIStm
.
SetEndian
(
nOldFormat
);
rIStm
.
SetEndian
(
nOldFormat
);
return
rIStm
;
}
}
SvStream
&
WriteImpGraphic
(
SvStream
&
rOStm
,
const
ImpGraphic
&
rImpGraphic
)
void
WriteImpGraphic
(
SvStream
&
rOStm
,
const
ImpGraphic
&
rImpGraphic
)
{
{
if
(
!
rOStm
.
GetError
()
)
if
(
!
rOStm
.
GetError
()
)
{
{
...
@@ -1603,8 +1601,6 @@ SvStream& WriteImpGraphic( SvStream& rOStm, const ImpGraphic& rImpGraphic )
...
@@ -1603,8 +1601,6 @@ SvStream& WriteImpGraphic( SvStream& rOStm, const ImpGraphic& rImpGraphic )
else
else
rOStm
.
SetError
(
SVSTREAM_GENERALERROR
);
rOStm
.
SetError
(
SVSTREAM_GENERALERROR
);
}
}
return
rOStm
;
}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
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