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
3168ba6c
Kaydet (Commit)
3168ba6c
authored
Eki 23, 2017
tarafından
Caolán McNamara
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
rework TestImportXLS to take a SvStream arg
Change-Id: I65d02604ac489d8c8649673f3f851d1a6650406e
üst
d8a299e1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
6 deletions
+9
-6
excel.cxx
sc/source/filter/excel/excel.cxx
+5
-2
fftester.cxx
vcl/workben/fftester.cxx
+4
-4
No files found.
sc/source/filter/excel/excel.cxx
Dosyayı görüntüle @
3168ba6c
...
@@ -32,6 +32,7 @@
...
@@ -32,6 +32,7 @@
#include <com/sun/star/document/XImporter.hpp>
#include <com/sun/star/document/XImporter.hpp>
#include <scitems.hxx>
#include <scitems.hxx>
#include <svl/stritem.hxx>
#include <svl/stritem.hxx>
#include <unotools/streamwrap.hxx>
#include <filter.hxx>
#include <filter.hxx>
#include <document.hxx>
#include <document.hxx>
#include <optuno.hxx>
#include <optuno.hxx>
...
@@ -243,10 +244,12 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportCalcRTF(SvStream &rStrea
...
@@ -243,10 +244,12 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportCalcRTF(SvStream &rStrea
return
ScFormatFilter
::
Get
().
ScImportRTF
(
rStream
,
OUString
(),
&
aDocument
,
aRange
)
==
ERRCODE_NONE
;
return
ScFormatFilter
::
Get
().
ScImportRTF
(
rStream
,
OUString
(),
&
aDocument
,
aRange
)
==
ERRCODE_NONE
;
}
}
extern
"C"
SAL_DLLPUBLIC_EXPORT
bool
SAL_CALL
TestImportXLS
(
const
OUString
&
rURL
)
extern
"C"
SAL_DLLPUBLIC_EXPORT
bool
SAL_CALL
TestImportXLS
(
SvStream
&
rStream
)
{
{
ScDLL
::
Init
();
ScDLL
::
Init
();
SfxMedium
aMedium
(
rURL
,
StreamMode
::
READ
);
SfxMedium
aMedium
;
css
::
uno
::
Reference
<
css
::
io
::
XInputStream
>
xStm
(
new
utl
::
OInputStreamWrapper
(
rStream
));
aMedium
.
GetItemSet
()
->
Put
(
SfxUsrAnyItem
(
SID_INPUTSTREAM
,
css
::
uno
::
makeAny
(
xStm
)));
ScDocument
aDocument
;
ScDocument
aDocument
;
ScDocOptions
aDocOpt
=
aDocument
.
GetDocOptions
();
ScDocOptions
aDocOpt
=
aDocument
.
GetDocOptions
();
aDocOpt
.
SetLookUpColRowNames
(
false
);
aDocOpt
.
SetLookUpColRowNames
(
false
);
...
...
vcl/workben/fftester.cxx
Dosyayı görüntüle @
3168ba6c
...
@@ -55,7 +55,6 @@ using namespace cppu;
...
@@ -55,7 +55,6 @@ using namespace cppu;
extern
"C"
{
static
void
SAL_CALL
thisModule
()
{}
}
extern
"C"
{
static
void
SAL_CALL
thisModule
()
{}
}
#endif
#endif
typedef
bool
(
*
WFilterCall
)(
const
OUString
&
rUrl
);
typedef
bool
(
*
FFilterCall
)(
SvStream
&
rStream
);
typedef
bool
(
*
FFilterCall
)(
SvStream
&
rStream
);
SAL_IMPLEMENT_MAIN_WITH_ARGS
(
argc
,
argv
)
SAL_IMPLEMENT_MAIN_WITH_ARGS
(
argc
,
argv
)
...
@@ -404,16 +403,17 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
...
@@ -404,16 +403,17 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
}
}
else
if
(
strcmp
(
argv
[
2
],
"xls"
)
==
0
)
else
if
(
strcmp
(
argv
[
2
],
"xls"
)
==
0
)
{
{
static
W
FilterCall
pfnImport
(
nullptr
);
static
F
FilterCall
pfnImport
(
nullptr
);
if
(
!
pfnImport
)
if
(
!
pfnImport
)
{
{
osl
::
Module
aLibrary
;
osl
::
Module
aLibrary
;
aLibrary
.
loadRelative
(
&
thisModule
,
"libscfiltlo.so"
,
SAL_LOADMODULE_LAZY
);
aLibrary
.
loadRelative
(
&
thisModule
,
"libscfiltlo.so"
,
SAL_LOADMODULE_LAZY
);
pfnImport
=
reinterpret_cast
<
W
FilterCall
>
(
pfnImport
=
reinterpret_cast
<
F
FilterCall
>
(
aLibrary
.
getFunctionSymbol
(
"TestImportXLS"
));
aLibrary
.
getFunctionSymbol
(
"TestImportXLS"
));
aLibrary
.
release
();
aLibrary
.
release
();
}
}
ret
=
(
int
)
(
*
pfnImport
)(
out
);
SvFileStream
aFileStream
(
out
,
StreamMode
::
READ
);
ret
=
(
int
)
(
*
pfnImport
)(
aFileStream
);
}
}
else
if
(
strcmp
(
argv
[
2
],
"hwp"
)
==
0
)
else
if
(
strcmp
(
argv
[
2
],
"hwp"
)
==
0
)
{
{
...
...
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