core.git: sd/source

[Caolán McNamara (via logerrit)]

 sd/source/ui/app/optsitem.cxx |   18 +++++++++---------
 sd/source/ui/inc/optsitem.hxx |    8 ++++----
 2 files changed, 13 insertions(+), 13 deletions(-)

New commits:
commit b21b151dbbdc56d5cf5539918bbaeecec331211d
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sun Jul 13 21:04:13 2025 +0100
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Tue Jul 15 10:37:03 2025 +0200

    const up sd GetPropNameArray cluster
    
    Change-Id: Iaf0b6a495f57091ca7a47e871db07fee6aae54b4
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187830
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx
index f4aa974a036b..894b41d5dc29 100644
--- a/sd/source/ui/app/optsitem.cxx
+++ b/sd/source/ui/app/optsitem.cxx
@@ -150,7 +150,7 @@ void SdOptionsGeneric::Commit( SdOptionsItem& rCfgItem ) 
const
 Sequence< OUString > SdOptionsGeneric::GetPropertyNames() const
 {
     sal_uLong           nCount;
-    const char**    ppPropNames;
+    const char* const*  ppPropNames;
 
     GetPropNameArray( ppPropNames, nCount );
 
@@ -254,9 +254,9 @@ bool SdOptionsMisc::operator==( const SdOptionsMisc& rOpt ) 
const
         );
 }
 
-void SdOptionsMisc::GetPropNameArray( const char**& ppNames, sal_uLong& rCount 
) const
+void SdOptionsMisc::GetPropNameArray( const char* const*& ppNames, sal_uLong& 
rCount ) const
 {
-    static const char* aPropNames[] =
+    static const char* const aPropNames[] =
     {
         "ObjectMoveable",
         "NoDistort",
@@ -530,11 +530,11 @@ void SdOptionsGrid::SetDefaults()
     SetEqualGrid( true );
 }
 
-void SdOptionsGrid::GetPropNameArray( const char**& ppNames, sal_uLong& rCount 
) const
+void SdOptionsGrid::GetPropNameArray( const char* const*& ppNames, sal_uLong& 
rCount ) const
 {
     if( isMetricSystem() )
     {
-        static const char* aPropNamesMetric[] =
+        static const char* const aPropNamesMetric[] =
         {
             "Resolution/XAxis/Metric",
             "Resolution/YAxis/Metric",
@@ -550,7 +550,7 @@ void SdOptionsGrid::GetPropNameArray( const char**& 
ppNames, sal_uLong& rCount )
     }
     else
     {
-        static const char* aPropNamesNonMetric[] =
+        static const char* const aPropNamesNonMetric[] =
         {
             "Resolution/XAxis/NonMetric",
             "Resolution/YAxis/NonMetric",
@@ -698,11 +698,11 @@ bool SdOptionsPrint::operator==( const SdOptionsPrint& 
rOpt ) const
             GetHandoutPages() == rOpt.GetHandoutPages() );
 }
 
-void SdOptionsPrint::GetPropNameArray( const char**& ppNames, sal_uLong& 
rCount ) const
+void SdOptionsPrint::GetPropNameArray( const char* const*& ppNames, sal_uLong& 
rCount ) const
 {
     if (IsImpress())
     {
-        static const char* aImpressPropNames[] =
+        static const char* const aImpressPropNames[] =
         {
             "Other/Date",
             "Other/Time",
@@ -731,7 +731,7 @@ void SdOptionsPrint::GetPropNameArray( const char**& 
ppNames, sal_uLong& rCount
     }
     else
     {
-        static const char* aDrawPropNames[] =
+        static const char* const aDrawPropNames[] =
         {
             "Other/Date",
             "Other/Time",
diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx
index 21ad5153b528..e865979f96b4 100644
--- a/sd/source/ui/inc/optsitem.hxx
+++ b/sd/source/ui/inc/optsitem.hxx
@@ -84,7 +84,7 @@ protected:
 
 protected:
 
-    virtual void            GetPropNameArray( const char**& ppNames, 
sal_uLong& rCount ) const = 0;
+    virtual void            GetPropNameArray( const char* const*& ppNames, 
sal_uLong& rCount ) const = 0;
     virtual bool            ReadData( const css::uno::Any* pValues ) = 0;
     virtual bool            WriteData( css::uno::Any* pValues ) const = 0;
 
@@ -152,7 +152,7 @@ private:
 
 protected:
 
-    virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) 
const override;
+    virtual void GetPropNameArray( const char* const*& ppNames, sal_uLong& 
rCount ) const override;
     virtual bool ReadData( const css::uno::Any* pValues ) override;
     virtual bool WriteData( css::uno::Any* pValues ) const override;
 
@@ -259,7 +259,7 @@ class SdOptionsGrid : public SdOptionsGeneric, public 
SvxOptionsGrid
 {
 protected:
 
-    virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) 
const override;
+    virtual void GetPropNameArray( const char* const*& ppNames, sal_uLong& 
rCount ) const override;
     virtual bool ReadData( const css::uno::Any* pValues ) override;
     virtual bool WriteData( css::uno::Any* pValues ) const override;
 
@@ -327,7 +327,7 @@ private:
 
 protected:
 
-    virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) 
const override;
+    virtual void GetPropNameArray( const char* const*& ppNames, sal_uLong& 
rCount ) const override;
     virtual bool ReadData( const css::uno::Any* pValues ) override;
     virtual bool WriteData( css::uno::Any* pValues ) const override;