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
0de1b33b
Kaydet (Commit)
0de1b33b
authored
Nis 05, 2012
tarafından
Eike Rathke
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
resolved fdo#48347 do not override preselected CSV with SYLK detection
üst
0d5f437b
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
4 deletions
+12
-4
scdetect.cxx
sc/source/ui/unoobj/scdetect.cxx
+12
-4
No files found.
sc/source/ui/unoobj/scdetect.cxx
Dosyayı görüntüle @
0de1b33b
...
...
@@ -444,8 +444,10 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream )
bool
bIsXLS
=
false
;
SvStream
*
pStream
=
aMedium
.
GetInStream
();
const
SfxFilter
*
pPreselectedFilter
=
pFilter
;
bool
bCsvSelected
=
(
pPreselectedFilter
?
pPreselectedFilter
->
GetFilterName
().
EqualsAscii
(
pFilterAscii
)
:
false
);
if
(
pPreselectedFilter
&&
(
(
pPreselectedFilter
->
GetName
().
SearchAscii
(
"Excel"
)
!=
STRING_NOTFOUND
)
||
(
!
aPreselectedFilterName
.
Len
()
&&
pPreselectedFilter
->
GetFilterName
().
EqualsAscii
(
pFilterAscii
)
)
)
)
(
!
aPreselectedFilterName
.
Len
()
&&
bCsvSelected
)
)
)
bIsXLS
=
true
;
pFilter
=
0
;
if
(
pStream
)
...
...
@@ -676,9 +678,15 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream )
for
(
nFilter
=
0
;
nFilter
<
nFilterCount
;
nFilter
++
)
{
pSearch
=
ppFilterPatterns
[
nFilter
];
if
(
bCsvSelected
&&
pSearch
==
pSylk
)
// SYLK 4 characters is really too weak to
// override preselected CSV, already ID;Name
// would trigger that. fdo#48347
continue
;
rStr
.
Seek
(
0
);
// am Anfang war alles Uebel...
rStr
>>
nAkt
;
pSearch
=
ppFilterPatterns
[
nFilter
];
bSync
=
sal_True
;
while
(
!
rStr
.
IsEof
()
&&
bSync
)
{
...
...
@@ -759,7 +767,7 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream )
}
else
if
(
pPreselectedFilter
->
GetName
().
EqualsAscii
(
pFilterDBase
)
&&
lcl_MayBeDBase
(
rStr
)
)
pFilter
=
pPreselectedFilter
;
else
if
(
pPreselectedFilter
->
GetFilterName
().
EqualsAscii
(
pFilterAscii
)
&&
bMaybeText
)
else
if
(
bCsvSelected
&&
bMaybeText
)
pFilter
=
pPreselectedFilter
;
else
if
(
HTMLParser
::
IsHTMLFormat
(
aHeader
.
getStr
())
)
{
...
...
@@ -789,7 +797,7 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream )
{
// 0-length stream, preselected Text/CSV is ok, user
// may want to write to that file later.
if
(
pPreselectedFilter
->
GetFilterName
().
EqualsAscii
(
pFilterAscii
)
)
if
(
bCsvSelected
)
pFilter
=
pPreselectedFilter
;
}
}
...
...
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