sc/inc/dbdata.hxx | 10 +++++----- sc/inc/tablestyle.hxx | 5 +++++ sc/source/filter/oox/defaulttablestyles.cxx | 2 ++ sc/source/filter/oox/defaulttablestyles.inc | 2 +- 4 files changed, 13 insertions(+), 6 deletions(-)
New commits: commit 9eb546d0bed3fb636c7d58e259db89647772713a Author: Balazs Varga <[email protected]> AuthorDate: Mon Sep 29 18:32:34 2025 +0200 Commit: Andras Timar <[email protected]> CommitDate: Mon Nov 17 19:00:56 2025 +0100 Fix windows MSVC build errors and warnings Change-Id: I4a26f6aaf50a2f2392ca3f05297915468f005d38 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192469 Reviewed-by: Balazs Varga <[email protected]> Tested-by: Balazs Varga <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193673 Reviewed-by: Andras Timar <[email protected]> Tested-by: Andras Timar <[email protected]> diff --git a/sc/inc/dbdata.hxx b/sc/inc/dbdata.hxx index 8ff355c3dc98..972b06c85521 100644 --- a/sc/inc/dbdata.hxx +++ b/sc/inc/dbdata.hxx @@ -121,7 +121,7 @@ protected: }; -struct SAL_DLLPUBLIC ScTableStyleParam +struct SAL_DLLPUBLIC_RTTI ScTableStyleParam { OUString maStyleName; bool mbRowStripes; @@ -129,8 +129,8 @@ struct SAL_DLLPUBLIC ScTableStyleParam bool mbFirstColumn; bool mbLastColumn; - ScTableStyleParam(); - ScTableStyleParam(const ScTableStyleParam& rParam) = default; + SC_DLLPUBLIC ScTableStyleParam(); + SC_DLLPUBLIC ScTableStyleParam(const ScTableStyleParam& rParam) = default; bool operator== (const ScTableStyleParam& rData) const; }; @@ -308,8 +308,8 @@ public: void CalcSaveFilteredCount(SCSIZE nNonFilteredRowCount); void GetFilterSelCount(SCSIZE& nSelected, SCSIZE& nTotal); - void SetTableStyleInfo(const ScTableStyleParam& rParams); - const ScTableStyleParam* GetTableStyleInfo() const; + SC_DLLPUBLIC void SetTableStyleInfo(const ScTableStyleParam& rParams); + SC_DLLPUBLIC const ScTableStyleParam* GetTableStyleInfo() const; private: diff --git a/sc/inc/tablestyle.hxx b/sc/inc/tablestyle.hxx index 01a06c6f9fa6..fd39336e71a1 100644 --- a/sc/inc/tablestyle.hxx +++ b/sc/inc/tablestyle.hxx @@ -207,6 +207,11 @@ public: class SC_DLLPUBLIC ScTableStyles { private: + ScTableStyles(ScTableStyles const&) = delete; + ScTableStyles(ScTableStyles&&) = delete; + void operator=(ScTableStyles const&) = delete; + void operator=(ScTableStyles&&) = delete; + std::unordered_map<OUString, std::unique_ptr<ScTableStyle>> maTableStyles; public: diff --git a/sc/source/filter/oox/defaulttablestyles.cxx b/sc/source/filter/oox/defaulttablestyles.cxx index 918b49549182..8d3f9b948a82 100644 --- a/sc/source/filter/oox/defaulttablestyles.cxx +++ b/sc/source/filter/oox/defaulttablestyles.cxx @@ -68,6 +68,8 @@ void DefaultOOXMLTableStyles::importBorderElement(oox::xls::BorderRef xBorder, case BorderElementStyle::DOUBLE: nBorderStyle = oox::XML_double; break; + default: + nBorderStyle = oox::XML_none; } oox::xls::XlsColor& rColor = maColors[rBorderElement.nColorId]; diff --git a/sc/source/filter/oox/defaulttablestyles.inc b/sc/source/filter/oox/defaulttablestyles.inc index b6635f84e0ab..d2547e5bc8f4 100644 --- a/sc/source/filter/oox/defaulttablestyles.inc +++ b/sc/source/filter/oox/defaulttablestyles.inc @@ -13,7 +13,7 @@ #include <defaulttablestyles.hxx> -constexpr ThemeColor aThemeColors[] = { { 0, -0.3499862666707358 }, { 0, -0.1499984740745262 }, { 0, 0.0 }, { 1, 0.0 }, { 1, 0.1499984740745262 }, { 1, 0.249977111117893 }, { 1, 0.4499954222235786 }, { 4, -0.499984740745262 }, { 4, -0.249977111117893 }, { 4, 0.0 }, { 4, 0.3999755851924192 }, { 4, 0.5999938962981048 }, { 4, 0.7999816888943144 }, { 5, -0.499984740745262 }, { 5, -0.249977111117893 }, { 5, 0.0 }, { 5, 0.3999755851924192 }, { 5, 0.5999938962981048 }, { 5, 0.7999816888943144 }, { 6, -0.499984740745262 }, { 6, -0.249977111117893 }, { 6, 0.0 }, { 6, 0.3999755851924192 }, { 6, 0.5999938962981048 }, { 6, 0.7999816888943144 }, { 7, -0.499984740745262 }, { 7, -0.249977111117893 }, { 7, 0.0 }, { 7, 0.3999755851924192 }, { 7, 0.5999938962981048 }, { 7, 0.7999816888943144 }, { 8, -0.499984740745262 }, { 8, -0.249977111117893 }, { 8, 0.0 }, { 8, 0.3999755851924192 }, { 8, 0.5999938962981048 }, { 8, 0.7999816888943144 }, { 9, -0.499984740745262 }, { 9, -0.249977111117893 }, { 9, 0.0 }, { 9, 0.3999755851924192 }, { 9, 0.5999938962981048 }, { 9, 0.7999816888943144 } }; +constexpr ThemeColor aThemeColors[] = { { 0, -0.3499862666707358f }, { 0, -0.1499984740745262f }, { 0, 0.0f }, { 1, 0.0f }, { 1, 0.1499984740745262f }, { 1, 0.249977111117893f }, { 1, 0.4499954222235786f }, { 4, -0.499984740745262f }, { 4, -0.249977111117893f }, { 4, 0.0f }, { 4, 0.3999755851924192f }, { 4, 0.5999938962981048f }, { 4, 0.7999816888943144f }, { 5, -0.499984740745262f }, { 5, -0.249977111117893f }, { 5, 0.0f }, { 5, 0.3999755851924192f }, { 5, 0.5999938962981048f }, { 5, 0.7999816888943144f }, { 6, -0.499984740745262f }, { 6, -0.249977111117893f }, { 6, 0.0f }, { 6, 0.3999755851924192f }, { 6, 0.5999938962981048f }, { 6, 0.7999816888943144f }, { 7, -0.499984740745262f }, { 7, -0.249977111117893f }, { 7, 0.0f }, { 7, 0.3999755851924192f }, { 7, 0.5999938962981048f }, { 7, 0.7999816888943144f }, { 8, -0.499984740745262f }, { 8, -0.249977111117893f }, { 8, 0.0f }, { 8, 0.3999755851924192f }, { 8, 0.5999938962981048f }, { 8, 0.7999816888943144f }, { 9, -0.499984740745262f }, { 9, -0.249977111117893f }, { 9, 0.0f }, { 9, 0.3999755851924192f }, { 9, 0.5999938962981048f }, { 9, 0.7999816888943144f } }; constexpr Fill aFills[] = { { 0, 0 }, { 1, 1 }, { 3, 3 }, { 4, 4 }, { 5, 5 }, { 6, 6 }, { 7, 7 }, { 8, 8 }, { 9, 9 }, { 11, 11 }, { 12, 12 }, { 13, 13 }, { 14, 14 }, { 15, 15 }, { 17, 17 }, { 18, 18 }, { 19, 19 }, { 20, 20 }, { 21, 21 }, { 23, 23 }, { 24, 24 }, { 25, 25 }, { 26, 26 }, { 27, 27 }, { 29, 29 }, { 30, 30 }, { 31, 31 }, { 32, 32 }, { 33, 33 }, { 35, 35 }, { 36, 36 }, { 37, 37 }, { 38, 38 }, { 39, 39 }, { 41, 41 }, { 42, 42 } };
