Kaydet (Commit) af92290f authored tarafından Noel Grandin's avatar Noel Grandin Kaydeden (comit) Noel Grandin

dyncolcontainer: convert aColWidthPath to std::map

Change-Id: Ifb86372de3671b81c0438c0096b375b07d2f6754
Reviewed-on: https://gerrit.libreoffice.org/43468Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 77d6f56d
...@@ -1063,7 +1063,7 @@ bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) ...@@ -1063,7 +1063,7 @@ bool ScDocShell::ConvertFrom( SfxMedium& rMedium )
// Set optimal col width after import? // Set optimal col width after import?
bool bSetColWidths = false; bool bSetColWidths = false;
bool bSetSimpleTextColWidths = false; bool bSetSimpleTextColWidths = false;
ScColWidthParam aColWidthParam[MAXCOLCOUNT]; std::map<SCCOL, ScColWidthParam> aColWidthParam;
ScRange aColWidthRange; ScRange aColWidthRange;
// Set optimal row height after import? // Set optimal row height after import?
bool bSetRowHeights = false; bool bSetRowHeights = false;
......
...@@ -288,7 +288,7 @@ static void lcl_setScalesToColumns(ScDocument& rDoc, const vector<long>& rScales ...@@ -288,7 +288,7 @@ static void lcl_setScalesToColumns(ScDocument& rDoc, const vector<long>& rScales
#endif // HAVE_FEATURE_DBCONNECTIVITY #endif // HAVE_FEATURE_DBCONNECTIVITY
ErrCode ScDocShell::DBaseImport( const OUString& rFullFileName, rtl_TextEncoding eCharSet, ErrCode ScDocShell::DBaseImport( const OUString& rFullFileName, rtl_TextEncoding eCharSet,
ScColWidthParam aColWidthParam[MAXCOLCOUNT], ScFlatBoolRowSegments& rRowHeightsRecalc ) std::map<SCCOL, ScColWidthParam>& aColWidthParam, ScFlatBoolRowSegments& rRowHeightsRecalc )
{ {
#if !HAVE_FEATURE_DBCONNECTIVITY #if !HAVE_FEATURE_DBCONNECTIVITY
(void) rFullFileName; (void) rFullFileName;
......
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
#include <memory> #include <memory>
#include <unordered_map> #include <unordered_map>
#include <map>
class ScRefreshTimerProtector; class ScRefreshTimerProtector;
class ScEditEngineDefaulter; class ScEditEngineDefaulter;
...@@ -132,7 +133,7 @@ class SC_DLLPUBLIC ScDocShell final: public SfxObjectShell, public SfxListener ...@@ -132,7 +133,7 @@ class SC_DLLPUBLIC ScDocShell final: public SfxObjectShell, public SfxListener
SAL_DLLPRIVATE static bool SaveCurrentChart( SfxMedium& rMedium ); SAL_DLLPRIVATE static bool SaveCurrentChart( SfxMedium& rMedium );
SAL_DLLPRIVATE ErrCode DBaseImport( const OUString& rFullFileName, rtl_TextEncoding eCharSet, SAL_DLLPRIVATE ErrCode DBaseImport( const OUString& rFullFileName, rtl_TextEncoding eCharSet,
ScColWidthParam aColWidthParam[MAXCOLCOUNT], ScFlatBoolRowSegments& rRowHeightsRecalc ); std::map<SCCOL, ScColWidthParam>& aColWidthParam, ScFlatBoolRowSegments& rRowHeightsRecalc );
SAL_DLLPRIVATE ErrCode DBaseExport( SAL_DLLPRIVATE ErrCode DBaseExport(
const OUString& rFullFileName, rtl_TextEncoding eCharSet, bool& bHasMemo ); const OUString& rFullFileName, rtl_TextEncoding eCharSet, bool& bHasMemo );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment