diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2017-10-17 21:26:04 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-10-18 08:35:40 +0200 |
| commit | af92290f7e7afc48a58fa592226f00b0e6f63418 (patch) | |
| tree | 6086bcdd29fdc3bfd93079c5572f1f6d785e9d0f /sc | |
| parent | 77d6f56d70b3a7c43e50c53ff2d78583bb7400e8 (diff) | |
dyncolcontainer: convert aColWidthPath to std::map
Change-Id: Ifb86372de3671b81c0438c0096b375b07d2f6754
Reviewed-on: https://gerrit.libreoffice.org/43468
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/docshell/docsh.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/docshell/docsh8.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/inc/docsh.hxx | 3 |
3 files changed, 4 insertions, 3 deletions
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 ); |