sc/source/ui/vba/vbainterior.cxx | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-)
New commits: commit 3471d83f49dcaab2cbbe18521ab1a405f15a0788 Author: Julien Nabet <serval2...@yahoo.fr> AuthorDate: Sun Dec 1 22:21:20 2019 +0100 Commit: Julien Nabet <serval2...@yahoo.fr> CommitDate: Sun Dec 1 23:18:14 2019 +0100 Use initializer list instead of using several inserts (sc/vba) Change-Id: I41c5c7c5e6c6298c8fe1e7b7a13f4ee8a1f12ec8 Reviewed-on: https://gerrit.libreoffice.org/84172 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2...@yahoo.fr> diff --git a/sc/source/ui/vba/vbainterior.cxx b/sc/source/ui/vba/vbainterior.cxx index 16328c6eaa1d..30c651b7a016 100644 --- a/sc/source/ui/vba/vbainterior.cxx +++ b/sc/source/ui/vba/vbainterior.cxx @@ -38,7 +38,7 @@ using namespace ::ooo::vba::excel::XlPattern; static const char BACKCOLOR[] = "CellBackColor"; static const char PATTERN[] = "Pattern"; static const char PATTERNCOLOR[] = "PatternColor"; - +/* static PatternMap lcl_getPatternMap() { PatternMap aPatternMap; @@ -64,8 +64,30 @@ static PatternMap lcl_getPatternMap() aPatternMap.insert( PatternPair( xlPatternVertical, 6 ) ); return aPatternMap; } - -static PatternMap aPatternMap( lcl_getPatternMap() ); +*/ + +static PatternMap aPatternMap { + { xlPatternAutomatic, 0 }, + { xlPatternChecker, 9 }, + { xlPatternCrissCross, 16 }, + { xlPatternDown, 7 }, + { xlPatternGray16, 17 }, + { xlPatternGray25, 4 }, + { xlPatternGray50, 2 }, + { xlPatternGray75, 3 }, + { xlPatternGray8, 18 }, + { xlPatternGrid, 15 }, + { xlPatternHorizontal, 5 }, + { xlPatternLightDown, 13 }, + { xlPatternLightHorizontal, 11 }, + { xlPatternLightUp, 14 }, + { xlPatternLightVertical, 12 }, + { xlPatternNone, 0 }, + { xlPatternSemiGray75, 10 }, + { xlPatternSolid, 0 }, + { xlPatternUp, 8 }, + { xlPatternVertical, 6 } +}; ScVbaInterior::ScVbaInterior( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< beans::XPropertySet >& xProps, ScDocument* pScDoc ) : ScVbaInterior_BASE( xParent, xContext ), m_xProps(xProps), m_pScDoc( pScDoc ) { _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits