2 files changed, 24 insertions, 23 deletions
diff --git a/basic/source/classes/image.cxx b/basic/source/classes/image.cxx
index 6ce3b8894ca9..e17b391f3d55 100644
--- a/basic/source/classes/image.cxx
+++ b/basic/source/classes/image.cxx
@@ -30,18 +30,18 @@
 #include <memory>
 
 SbiImage::SbiImage()
+    : bError(false)
+    , nFlags(SbiImageFlags::NONE)
+    , nStringSize(0)
+    , nCodeSize(0)
+    , nLegacyCodeSize(0)
+    , nDimBase(0)
+    , eCharSet(osl_getThreadTextEncoding())
+    , nStringIdx(0)
+    , nStringOff(0)
+    , bInit(false)
+    , bFirstInit(true)
 {
-    nFlags     = SbiImageFlags::NONE;
-    nStringSize= 0;
-    nCodeSize  = 0;
-    nLegacyCodeSize  =
-    nDimBase   = 0;
-    bInit      =
-    bError     = false;
-    bFirstInit = true;
-    eCharSet   = osl_getThreadTextEncoding();
-    nStringIdx = 0;
-    nStringOff = 0;
 }
 
 SbiImage::~SbiImage()
diff --git a/basic/source/classes/sbintern.cxx b/basic/source/classes/sbintern.cxx
index c1366801d3be..fd72949d5466 100644
--- a/basic/source/classes/sbintern.cxx
+++ b/basic/source/classes/sbintern.cxx
@@ -31,19 +31,20 @@ SbiGlobals* GetSbData()
 }
 
 SbiGlobals::SbiGlobals()
+    : pInst(nullptr)
+    , pMod(nullptr)
+    , pCompMod(nullptr) // JSM
+    , nInst(0)
+    , nCode(ERRCODE_NONE)
+    , nLine(0)
+    , nCol1(0)
+    , nCol2(0)
+    , bCompilerError(false)
+    , bGlobalInitErr(false)
+    , bRunInit(false)
+    , bBlockCompilerError(false)
+    , pMSOMacroRuntimLib(nullptr)
 {
-    pInst = nullptr;
-    pMod = nullptr;
-    pCompMod = nullptr; // JSM
-    nInst = 0;
-    nCode = ERRCODE_NONE;
-    nLine = 0;
-    nCol1 = nCol2 = 0;
-    bCompilerError = false;
-    bGlobalInitErr = false;
-    bRunInit = false;
-    bBlockCompilerError = false;
-    pMSOMacroRuntimLib = nullptr;
 }
 
 SbiGlobals::~SbiGlobals() = default;