5 files changed, 7 insertions, 8 deletions
diff --git a/sw/inc/accessibilityoptions.hxx b/sw/inc/accessibilityoptions.hxx
index ce8e94a158be..82d77772eff2 100644
--- a/sw/inc/accessibilityoptions.hxx
+++ b/sw/inc/accessibilityoptions.hxx
@@ -18,11 +18,11 @@
  */
 #pragma once
 
-struct SwAccessibilityOptions
+class SwAccessibilityOptions
 {
     bool bIsAlwaysAutoColor         :1;
     bool bIsStopAnimatedGraphics    :1;
-
+public:
     SwAccessibilityOptions() :
         bIsAlwaysAutoColor(false),
         bIsStopAnimatedGraphics(false) {}
diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index 1fb861748f20..8976452a0dc4 100644
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
@@ -59,7 +59,7 @@ class SvtAccessibilityOptions;
 class SwPagePreviewLayout;
 class SwTextFrame;
 
-struct SwAccessibilityOptions;
+class SwAccessibilityOptions;
 namespace vcl { class Region; }
 class SwPostItMgr;
 class SdrPaintWindow;
diff --git a/sw/source/core/inc/drawfont.hxx b/sw/source/core/inc/drawfont.hxx
index 9a02e881e10e..3d58f5fcd09d 100644
--- a/sw/source/core/inc/drawfont.hxx
+++ b/sw/source/core/inc/drawfont.hxx
@@ -86,8 +86,6 @@ class SW_DLLPUBLIC SwDrawTextInfo
     // inside second half of bound rect, used for Accessibility
     bool m_bPosMatchesBounds :1;
 
-public:
-
 #ifdef DBG_UTIL
     // These flags should control that the appropriate Set-function has been
     // called before calling the Get-function of a member
@@ -107,6 +105,8 @@ public:
     bool m_bDrawSp: 1;
 #endif
 
+public:
+
     /// constructor for simple strings
     SwDrawTextInfo( SwViewShell const *pSh, OutputDevice &rOut,
                     const OUString &rText, sal_Int32 const nIdx, sal_Int32 const nLen,
diff --git a/sw/source/filter/html/wrthtml.hxx b/sw/source/filter/html/wrthtml.hxx
index 00d837259b94..4b6f7ad5c2a6 100644
--- a/sw/source/filter/html/wrthtml.hxx
+++ b/sw/source/filter/html/wrthtml.hxx
@@ -647,7 +647,7 @@ inline void SwHTMLWriter::OutCSS1_Property( std::string_view pProp,
 // positions in the document.
 // In dtor all data is restored and the created PaM is deleted again.
 
-struct HTMLSaveData
+class HTMLSaveData
 {
     SwHTMLWriter& rWrt;
     std::shared_ptr<SwUnoCursor> pOldPam;
@@ -661,6 +661,7 @@ struct HTMLSaveData
     bool bOldOutFooter : 1;
     bool bOldOutFlyFrame : 1;
 
+public:
     HTMLSaveData( SwHTMLWriter&, SwNodeOffset nStt, SwNodeOffset nEnd,
                   bool bSaveNum=true,
                   const SwFrameFormat *pFrameFormat=nullptr  );
diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx
index 0b6f67b1da23..8105a6fd4e33 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -539,7 +539,6 @@ public:
 class SwInsTableDlg;
 class AbstractInsTableDlg_Impl : public AbstractInsTableDlg
 {
-protected:
     std::shared_ptr<weld::DialogController> m_xDlg;
 public:
     explicit AbstractInsTableDlg_Impl(std::shared_ptr<weld::DialogController> p)
@@ -620,7 +619,6 @@ public:
 class SwMultiTOXTabDialog;
 class AbstractMultiTOXTabDialog_Impl : public AbstractMultiTOXTabDialog
 {
-protected:
     std::shared_ptr<SwMultiTOXTabDialog> m_xDlg;
 public:
     explicit AbstractMultiTOXTabDialog_Impl(std::shared_ptr<SwMultiTOXTabDialog> p)