idl/source/objects/object.cxx | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
New commits:
commit 38a2972ec138cbcd57dfdb3e6e203a01c7239d21
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sat Jul 12 17:02:44 2025 +0100
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Tue Jul 15 12:39:13 2025 +0200
fix build with MSVC >= 1931
It was too optimistic to think this worked on msvc
Change-Id: I66c85619d5ad1c93dbc2e03bdc228cf4d674ea88
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187778
Tested-by: Jenkins
Tested-by: Caolán McNamara <caolan.mcnam...@collabora.com>
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
(cherry picked from commit 4ceb8b2f27d43592cb2ee5c99c99f7263dd5c11c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187864
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx
index 92ed643ded30..c9d70933323d 100644
--- a/idl/source/objects/object.cxx
+++ b/idl/source/objects/object.cxx
@@ -270,8 +270,7 @@ void SvMetaClass::WriteSfx( SvIdlDataBase & rBase, SvStream
& rOutStm )
}
// write parameter array
rOutStm.WriteOString("static ");
-#if defined(_MSC_VER) && _MSC_VER < 1931
-
//https://developercommunity.visualstudio.com/t/Taking-the-address-of-a-constexpr-variab/1550408
+#if defined(_MSC_VER)
rOutStm.WriteOString("const");
#else
rOutStm.WriteOString("constexpr");
@@ -312,8 +311,8 @@ void SvMetaClass::WriteSfx( SvIdlDataBase & rBase, SvStream
& rOutStm )
// write slotmap
rOutStm.WriteOString("static ");
-#if defined(_MSC_VER) && _MSC_VER < 1931
-
//https://developercommunity.visualstudio.com/t/Taking-the-address-of-a-constexpr-variab/1550408
+#if defined(_MSC_VER)
+ // otherwise linker error of: unresolved external symbol "struct SfxType0
const aSfxVoidItem_Impl"
rOutStm.WriteOString("const");
#else
rOutStm.WriteOString("constexpr");
