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
2ee7ad01
Kaydet (Commit)
2ee7ad01
authored
Mar 20, 2017
tarafından
Caolán McNamara
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Resolves: ofz#820 an exception is an acceptable outcome
Change-Id: Ifc5be483387202c371596fd52f1e2ce682151ca8
üst
d31cdf52
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
14 deletions
+20
-14
hwpreader.cxx
hwpfilter/source/hwpreader.cxx
+19
-12
lwpfilter.cxx
lotuswordpro/source/filter/lwpfilter.cxx
+1
-2
No files found.
hwpfilter/source/hwpreader.cxx
Dosyayı görüntüle @
2ee7ad01
...
...
@@ -118,21 +118,28 @@ HwpReader::~HwpReader()
extern
"C"
SAL_DLLPUBLIC_EXPORT
bool
SAL_CALL
TestImportHWP
(
SvStream
&
rStream
)
{
std
::
unique_ptr
<
HStream
>
stream
(
new
HStream
);
byte
aData
[
32768
];
std
::
size_t
nRead
,
nBlock
=
32768
;
try
{
std
::
unique_ptr
<
HStream
>
stream
(
new
HStream
);
byte
aData
[
32768
];
std
::
size_t
nRead
,
nBlock
=
32768
;
while
(
true
)
{
nRead
=
rStream
.
ReadBytes
(
aData
,
nBlock
);
if
(
nRead
==
0
)
break
;
stream
->
addData
(
aData
,
(
int
)
nRead
);
}
while
(
true
)
HWPFile
hwpfile
;
if
(
hwpfile
.
ReadHwpFile
(
stream
.
release
()))
return
false
;
}
catch
(...)
{
nRead
=
rStream
.
ReadBytes
(
aData
,
nBlock
);
if
(
nRead
==
0
)
break
;
stream
->
addData
(
aData
,
(
int
)
nRead
);
return
false
;
}
HWPFile
hwpfile
;
if
(
hwpfile
.
ReadHwpFile
(
stream
.
release
()))
return
false
;
return
true
;
}
...
...
lotuswordpro/source/filter/lwpfilter.cxx
Dosyayı görüntüle @
2ee7ad01
...
...
@@ -215,13 +215,12 @@ int ReadWordproFile(SvStream &rStream, uno::Reference<css::xml::sax::XDocumentHa
//Reset all static objects,because this function may be called many times.
XFGlobalReset
();
reader
.
Read
();
return
0
;
}
catch
(...)
{
return
1
;
}
return
0
;
}
/* 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