loplugin:unusedfields make some fields private

this is one of the secondary analyses this plugin performs

Change-Id: I6fac8c926b53f1d909c5b183304744126549f2bc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143181
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

4 files changed, 17 insertions, 6 deletions

diff --git a/include/oox/helper/propertymap.hxx b/include/oox/helper/propertymap.hxx
index 423bb11fcdcb..cf8031d46dd1 100644
--- a/include/oox/helper/propertymap.hxx
+++ b/include/oox/helper/propertymap.hxx
@@ -117,8 +117,6 @@ public:
 #endif
 private:
     const std::vector<OUString>* mpPropNames;
-
-protected:
     std::map< sal_Int32, css::uno::Any > maProperties;
 };
 
diff --git a/include/oox/ole/axbinaryreader.hxx b/include/oox/ole/axbinaryreader.hxx
index eb185f235d49..e5e59b970d2f 100644
--- a/include/oox/ole/axbinaryreader.hxx
+++ b/include/oox/ole/axbinaryreader.hxx
@@ -170,8 +170,9 @@ private:
     /** Complex property for a 32-bit value pair, e.g. point or size. */
     struct PairProperty final : public ComplexProperty
     {
+    private:
         AxPairData&         mrPairData;
-
+    public:
         explicit            PairProperty( AxPairData& rPairData ) :
                                 mrPairData( rPairData ) {}
         virtual bool        readProperty( AxAlignedInputStream& rInStrm ) override;
@@ -180,9 +181,10 @@ private:
     /** Complex property for a string value. */
     struct StringProperty final : public ComplexProperty
     {
+    private:
         OUString&    mrValue;
         sal_uInt32          mnSize;
-
+    public:
         explicit            StringProperty( OUString& rValue, sal_uInt32 nSize ) :
                                 mrValue( rValue ), mnSize( nSize ) {}
         virtual bool        readProperty( AxAlignedInputStream& rInStrm ) override;
@@ -191,8 +193,10 @@ private:
     /** Complex property for an array of strings. */
     struct ArrayStringProperty final : public ComplexProperty
     {
+    private:
         AxArrayString&      mrArray;
         sal_uInt32          mnSize;
+    public:
         explicit            ArrayStringProperty( AxArrayString& rArray, sal_uInt32 nSize ) :
                                 mrArray( rArray ), mnSize( nSize ) {}
         virtual bool        readProperty( AxAlignedInputStream& rInStrm ) override;
@@ -201,8 +205,10 @@ private:
     /** Complex property for a GUID value. */
     struct GuidProperty final : public ComplexProperty
     {
+    private:
         OUString&    mrGuid;
 
+    public:
         explicit            GuidProperty( OUString& rGuid ) :
                                 mrGuid( rGuid ) {}
         virtual bool        readProperty( AxAlignedInputStream& rInStrm ) override;
@@ -211,8 +217,10 @@ private:
     /** Stream property for a font structure. */
     struct FontProperty final : public ComplexProperty
     {
+    private:
         AxFontData&         mrFontData;
 
+    public:
         explicit            FontProperty( AxFontData& rFontData ) :
                                 mrFontData( rFontData ) {}
         virtual bool        readProperty( AxAlignedInputStream& rInStrm ) override;
@@ -221,8 +229,10 @@ private:
     /** Stream property for a picture or mouse icon. */
     struct PictureProperty final : public ComplexProperty
     {
+    private:
         StreamDataSequence& mrPicData;
 
+    public:
         explicit            PictureProperty( StreamDataSequence& rPicData ) :
                                 mrPicData( rPicData ) {}
         virtual bool        readProperty( AxAlignedInputStream& rInStrm ) override;
diff --git a/include/oox/ole/axbinarywriter.hxx b/include/oox/ole/axbinarywriter.hxx
index eb370473aecb..d19e2ae3b3c3 100644
--- a/include/oox/ole/axbinarywriter.hxx
+++ b/include/oox/ole/axbinarywriter.hxx
@@ -118,8 +118,10 @@ private:
     /** Complex property for a 32-bit value pair, e.g. point or size. */
     struct PairProperty final : public ComplexProperty
     {
+    private:
         AxPairData&         mrPairData;
 
+    public:
         explicit            PairProperty( AxPairData& rPairData ) :
                                 mrPairData( rPairData ) {}
         virtual bool        writeProperty( AxAlignedOutputStream& rOutStrm ) override;
@@ -128,9 +130,10 @@ private:
     /** Complex property for a string value. */
     struct StringProperty final : public ComplexProperty
     {
+    private:
         OUString&    mrValue;
         sal_uInt32          mnSize;
-
+    public:
         explicit            StringProperty( OUString& rValue, sal_uInt32 nSize ) :
                                 mrValue( rValue ), mnSize( nSize ) {}
         virtual bool        writeProperty( AxAlignedOutputStream& rOutStrm ) override;
diff --git a/include/oox/ole/olehelper.hxx b/include/oox/ole/olehelper.hxx
index b6f60ca8b539..a2810460bcd3 100644
--- a/include/oox/ole/olehelper.hxx
+++ b/include/oox/ole/olehelper.hxx
@@ -169,10 +169,10 @@ public:
 // implementation into the sd module itself.
 class OOX_DLLPUBLIC MSConvertOCXControls : public SvxMSConvertOCXControls
 {
-protected:
     css::uno::Reference< css::uno::XComponentContext > mxCtx;
     ::oox::GraphicHelper maGrfHelper;
 
+protected:
     bool importControlFromStream( ::oox::BinaryInputStream& rInStrm,
                                   css::uno::Reference< css::form::XFormComponent > & rxFormComp,
                                   std::u16string_view rGuidString );