ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

loplugin:constantparam

Browse Source 
Change-Id: I0e91da1e48326495f841b53f999a0d31ecd1a36e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166419
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2024-04-22 13:26:28 +02:00
parent 257954b740
commit f5b511b847
2 changed files with 15 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/sfx2/objsh.hxx
+1 -1
View File
@@ -446,7 +446,7 @@ public:
bool SetModifyPasswordInfo( const css::uno::Sequence< css::beans::PropertyValue >& aInfo );
static void DetectCharSet(SvStream& stream, rtl_TextEncoding& eCharSet, SvStreamEndian& endian);
static void DetectCsvSeparators(SvStream& stream, rtl_TextEncoding& eCharSet, OUString& separators, sal_Unicode cStringDelimiter, bool bForceCommonSeps = true, bool bAllowMultipleSeps = false);
static void DetectCsvSeparators(SvStream& stream, rtl_TextEncoding& eCharSet, OUString& separators, sal_Unicode cStringDelimiter);
static void DetectCsvFilterOptions(SvStream& stream, OUString& aFilterOptions);
static void DetectFilterOptions(SfxMedium* pMedium);
static ErrCode HandleFilter( SfxMedium* pMedium, SfxObjectShell const * pDoc );
sfx2/source/doc/objstor.cxx
+14 -27
View File
@@ -948,7 +948,7 @@ void SfxObjectShell::DetectCharSet(SvStream& stream, rtl_TextEncoding& eCharSet,
ucsdet_close(ucd);
}
void SfxObjectShell::DetectCsvSeparators(SvStream& stream, rtl_TextEncoding& eCharSet, OUString& separators, sal_Unicode cStringDelimiter, bool bForceCommonSeps, bool bAllowMultipleSeps)
void SfxObjectShell::DetectCsvSeparators(SvStream& stream, rtl_TextEncoding& eCharSet, OUString& separators, sal_Unicode cStringDelimiter)
{
OUString sLine;
std::vector<std::unordered_map<sal_Unicode, sal_uInt32>> aLinesCharsCount;
@@ -968,9 +968,8 @@ void SfxObjectShell::DetectCsvSeparators(SvStream& stream, rtl_TextEncoding& eCh
if (!cStringDelimiter)
cStringDelimiter = '\"';
if (bForceCommonSeps)
for (sal_Int32 nComSepIdx = sCommonSeps.getLength() - 1; nComSepIdx >= 0; nComSepIdx --)
usetCommonSeps.insert(sCommonSeps[nComSepIdx]);
for (sal_Int32 nComSepIdx = sCommonSeps.getLength() - 1; nComSepIdx >= 0; nComSepIdx --)
usetCommonSeps.insert(sCommonSeps[nComSepIdx]);
aLinesCharsCount.reserve(nMaxLinesToProcess);
separators = "";
@@ -1008,7 +1007,7 @@ void SfxObjectShell::DetectCsvSeparators(SvStream& stream, rtl_TextEncoding& eCh
continue;
// If restricted only to common separators then skip the rest
if (bForceCommonSeps && usetCommonSeps.find(*p) == usetCommonSeps.end())
if (usetCommonSeps.find(*p) == usetCommonSeps.end())
continue;
auto it_elem = aCharsCount.find(*p);
@@ -1067,34 +1066,22 @@ void SfxObjectShell::DetectCsvSeparators(SvStream& stream, rtl_TextEncoding& eCh
sInitSeps += OUStringChar(it->first);
// If forced to most common or there are multiple separators then pick up only the most common by importance.
if (bForceCommonSeps || sInitSeps.getLength() > 1)
sal_Int32 nInitSepIdx;
sal_Int32 nComSepIdx;
for (nComSepIdx = 0; nComSepIdx < sCommonSeps.getLength(); nComSepIdx++)
{
sal_Int32 nInitSepIdx;
sal_Int32 nComSepIdx;
for (nComSepIdx = 0; nComSepIdx < sCommonSeps.getLength(); nComSepIdx++)
sal_Unicode c = sCommonSeps[nComSepIdx];
for (nInitSepIdx = sInitSeps.getLength() - 1; nInitSepIdx >= 0; nInitSepIdx --)
{
sal_Unicode c = sCommonSeps[nComSepIdx];
for (nInitSepIdx = sInitSeps.getLength() - 1; nInitSepIdx >= 0; nInitSepIdx --)
if (c == sInitSeps[nInitSepIdx])
{
if (c == sInitSeps[nInitSepIdx])
{
separators += OUStringChar(c);
break;
}
}
if (!bAllowMultipleSeps && nInitSepIdx >= 0)
separators += OUStringChar(c);
break;
}
}
}
// If there are no most common separators then keep the initial list.
if (!bForceCommonSeps && !separators.getLength())
{
if (bAllowMultipleSeps)
separators = sInitSeps;
else
separators = OUStringChar(sInitSeps[0]);
if (nInitSepIdx >= 0)
break;
}
stream.Seek(nInitPos);