[Libreoffice-commits] core.git: sc/source

[Noel Grandin]

 sc/source/ui/docshell/docsh.cxx  |    2 +-
 sc/source/ui/docshell/docsh8.cxx |    2 +-
 sc/source/ui/inc/docsh.hxx       |    3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit af92290f7e7afc48a58fa592226f00b0e6f63418
Author: Noel Grandin <noelgrandin at gmail.com>
Date:   Tue Oct 17 21:26:04 2017 +0200

    dyncolcontainer: convert aColWidthPath to std::map
    
    Change-Id: Ifb86372de3671b81c0438c0096b375b07d2f6754
    Reviewed-on: https://gerrit.libreoffice.org/43468
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index febaf62ecfa2..a4157d0a9ba4 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -1063,7 +1063,7 @@ bool ScDocShell::ConvertFrom( SfxMedium& rMedium )
     // Set optimal col width after import?
     bool bSetColWidths = false;
     bool bSetSimpleTextColWidths = false;
-    ScColWidthParam aColWidthParam[MAXCOLCOUNT];
+    std::map<SCCOL, ScColWidthParam> aColWidthParam;
     ScRange aColWidthRange;
     // Set optimal row height after import?
     bool bSetRowHeights = false;
diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx
index 680addc70bfd..9945bd288efc 100644
--- a/sc/source/ui/docshell/docsh8.cxx
+++ b/sc/source/ui/docshell/docsh8.cxx
@@ -288,7 +288,7 @@ static void lcl_setScalesToColumns(ScDocument& rDoc, const vector<long>& rScales
 #endif // HAVE_FEATURE_DBCONNECTIVITY
 
 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
     (void) rFullFileName;
diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
index 6061967f2e31..edb98cb1d08d 100644
--- a/sc/source/ui/inc/docsh.hxx
+++ b/sc/source/ui/inc/docsh.hxx
@@ -37,6 +37,7 @@
 
 #include <memory>
 #include <unordered_map>
+#include <map>
 
 class ScRefreshTimerProtector;
 class ScEditEngineDefaulter;
@@ -132,7 +133,7 @@ class SC_DLLPUBLIC ScDocShell final: public SfxObjectShell, public SfxListener
     SAL_DLLPRIVATE static bool   SaveCurrentChart( SfxMedium& rMedium );
 
     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(
                                     const OUString& rFullFileName, rtl_TextEncoding eCharSet, bool& bHasMemo );