sd/source/ui/app/optsitem.cxx | 199 ++++++++++++++++++------------------------ sd/source/ui/inc/optsitem.hxx | 9 - 2 files changed, 90 insertions(+), 118 deletions(-)
New commits: commit 772c251919bfaa19b618e4c3093a195cb9bb0b1d Author: Arnaud VERSINI <[email protected]> AuthorDate: Mon Feb 2 12:38:38 2026 +0100 Commit: Arnaud Versini <[email protected]> CommitDate: Tue Feb 3 14:29:45 2026 +0100 sd : use more OUString literal and simplify code Change-Id: Ia481390554ba4b64764039b31a79893385afbb7f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198537 Tested-by: Jenkins Reviewed-by: Arnaud Versini <[email protected]> diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx index 021f5877aca2..64e8de54ae95 100644 --- a/sd/source/ui/app/optsitem.cxx +++ b/sd/source/ui/app/optsitem.cxx @@ -147,22 +147,6 @@ void SdOptionsGeneric::Commit( SdOptionsItem& rCfgItem ) const } } -Sequence< OUString > SdOptionsGeneric::GetPropertyNames() const -{ - sal_uLong nCount; - const char* const* ppPropNames; - - GetPropNameArray( ppPropNames, nCount ); - - Sequence< OUString > aNames( nCount ); - OUString* pNames = aNames.getArray(); - - for( sal_uLong i = 0; i < nCount; i++ ) - pNames[ i ] = OUString::createFromAscii( ppPropNames[ i ] ); - - return aNames; -} - void SdOptionsGeneric::Store() { if( mpCfgItem ) @@ -254,47 +238,47 @@ bool SdOptionsMisc::operator==( const SdOptionsMisc& rOpt ) const ); } -void SdOptionsMisc::GetPropNameArray( const char* const*& ppNames, sal_uLong& rCount ) const +Sequence< OUString > SdOptionsMisc::GetPropertyNames() const { - static const char* const aPropNames[] = + static constexpr OUString aPropNames[] = { - "ObjectMoveable", - "NoDistort", - "TextObject/QuickEditing", - "BackgroundCache", - "CopyWhileMoving", - "TextObject/Selectable", - "DclickTextedit", - "RotateClick", - "Preview", - "ModifyWithAttributes", - "DefaultObjectSize/Width", - "DefaultObjectSize/Height", - - "Compatibility/PrinterIndependentLayout", - - "ShowComments", - "DragThresholdPixels", + u"ObjectMoveable"_ustr, + u"NoDistort"_ustr, + u"TextObject/QuickEditing"_ustr, + u"BackgroundCache"_ustr, + u"CopyWhileMoving"_ustr, + u"TextObject/Selectable"_ustr, + u"DclickTextedit"_ustr, + u"RotateClick"_ustr, + u"Preview"_ustr, + u"ModifyWithAttributes"_ustr, + u"DefaultObjectSize/Width"_ustr, + u"DefaultObjectSize/Height"_ustr, + + u"Compatibility/PrinterIndependentLayout"_ustr, + + u"ShowComments"_ustr, + u"DragThresholdPixels"_ustr, // just for impress - "NewDoc/AutoPilot", - "Compatibility/AddBetween", - "ShowUndoDeleteWarning", - "SlideshowRespectZOrder", + u"NewDoc/AutoPilot"_ustr, + u"Compatibility/AddBetween"_ustr, + u"ShowUndoDeleteWarning"_ustr, + u"SlideshowRespectZOrder"_ustr, - "PreviewNewEffects", - "PreviewChangedEffects", - "PreviewTransitions", + u"PreviewNewEffects"_ustr, + u"PreviewChangedEffects"_ustr, + u"PreviewTransitions"_ustr, - "Display", + u"Display"_ustr, - "PenColor", - "PenWidth", - "TabBarVisible" + u"PenColor"_ustr, + u"PenWidth"_ustr, + u"TabBarVisible"_ustr }; - rCount = ( IsImpress() ? std::size(aPropNames) : 15 ); - ppNames = aPropNames; + size_t len = ( IsImpress() ? std::size(aPropNames) : 15 ); + return Sequence<OUString>(aPropNames, len); } bool SdOptionsMisc::ReadData( const Any* pValues ) @@ -529,37 +513,31 @@ void SdOptionsGrid::SetDefaults() SetGridVisible( false ); } -void SdOptionsGrid::GetPropNameArray( const char* const*& ppNames, sal_uLong& rCount ) const +Sequence< OUString > SdOptionsGrid::GetPropertyNames() const { if( isMetricSystem() ) { - static const char* const aPropNamesMetric[] = - { - "Resolution/XAxis/Metric", - "Resolution/YAxis/Metric", - "Subdivision/XAxis", - "Subdivision/YAxis", - "Option/SnapToGrid", - "Option/Synchronize", - "Option/VisibleGrid" - }; - ppNames = aPropNamesMetric; - rCount = std::size(aPropNamesMetric); + return Sequence({ + u"Resolution/XAxis/Metric"_ustr, + u"Resolution/YAxis/Metric"_ustr, + u"Subdivision/XAxis"_ustr, + u"Subdivision/YAxis"_ustr, + u"Option/SnapToGrid"_ustr, + u"Option/Synchronize"_ustr, + u"Option/VisibleGrid"_ustr + }); } else { - static const char* const aPropNamesNonMetric[] = - { - "Resolution/XAxis/NonMetric", - "Resolution/YAxis/NonMetric", - "Subdivision/XAxis", - "Subdivision/YAxis", - "Option/SnapToGrid", - "Option/Synchronize", - "Option/VisibleGrid" - }; - ppNames = aPropNamesNonMetric; - rCount = std::size(aPropNamesNonMetric); + return Sequence({ + u"Resolution/XAxis/NonMetric"_ustr, + u"Resolution/YAxis/NonMetric"_ustr, + u"Subdivision/XAxis"_ustr, + u"Subdivision/YAxis"_ustr, + u"Option/SnapToGrid"_ustr, + u"Option/Synchronize"_ustr, + u"Option/VisibleGrid"_ustr + }); } } @@ -696,60 +674,55 @@ bool SdOptionsPrint::operator==( const SdOptionsPrint& rOpt ) const GetHandoutPages() == rOpt.GetHandoutPages() ); } -void SdOptionsPrint::GetPropNameArray( const char* const*& ppNames, sal_uLong& rCount ) const +Sequence< OUString > SdOptionsPrint::GetPropertyNames() const { if (IsImpress()) { - static const char* const aImpressPropNames[] = - { - "Other/Date", - "Other/Time", - "Other/PageName", - "Other/HiddenPage", - "Page/PageSize", - "Page/PageTile", + return Sequence({ + + u"Other/Date"_ustr, + u"Other/Time"_ustr, + u"Other/PageName"_ustr, + u"Other/HiddenPage"_ustr, + u"Page/PageSize"_ustr, + u"Page/PageTile"_ustr, // bWarningPrinter // bWarningSize // bWarningOrientation - "Page/Booklet", - "Page/BookletFront", - "Page/BookletBack", + u"Page/Booklet"_ustr, + u"Page/BookletFront"_ustr, + u"Page/BookletBack"_ustr, // bCutPage - "Other/FromPrinterSetup", - "Other/Quality", - "Content/Presentation", - "Content/Note", - "Content/Handout", - "Content/Outline", - "Other/HandoutHorizontal", - "Other/PagesPerHandout" - }; - rCount = std::size(aImpressPropNames); - ppNames = aImpressPropNames; + u"Other/FromPrinterSetup"_ustr, + u"Other/Quality"_ustr, + u"Content/Presentation"_ustr, + u"Content/Note"_ustr, + u"Content/Handout"_ustr, + u"Content/Outline"_ustr, + u"Other/HandoutHorizontal"_ustr, + u"Other/PagesPerHandout"_ustr + }); } else { - static const char* const aDrawPropNames[] = - { - "Other/Date", - "Other/Time", - "Other/PageName", - "Other/HiddenPage", - "Page/PageSize", - "Page/PageTile", + return Sequence({ + u"Other/Date"_ustr, + u"Other/Time"_ustr, + u"Other/PageName"_ustr, + u"Other/HiddenPage"_ustr, + u"Page/PageSize"_ustr, + u"Page/PageTile"_ustr, // bWarningPrinter // bWarningSize // bWarningOrientation - "Page/Booklet", - "Page/BookletFront", - "Page/BookletBack", + u"Page/Booklet"_ustr, + u"Page/BookletFront"_ustr, + u"Page/BookletBack"_ustr, // bCutPage - "Other/FromPrinterSetup", - "Other/Quality", - "Content/Drawing", - }; - rCount = std::size(aDrawPropNames); - ppNames = aDrawPropNames; + u"Other/FromPrinterSetup"_ustr, + u"Other/Quality"_ustr, + u"Content/Drawing"_ustr, + }); } } diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx index aa55997e7b80..fa84a41a2d6a 100644 --- a/sd/source/ui/inc/optsitem.hxx +++ b/sd/source/ui/inc/optsitem.hxx @@ -76,7 +76,6 @@ private: bool mbEnableModify : 1; SAL_DLLPRIVATE void Commit( SdOptionsItem& rCfgItem ) const; - SAL_DLLPRIVATE css::uno::Sequence< OUString > GetPropertyNames() const; protected: @@ -85,7 +84,7 @@ protected: protected: - virtual void GetPropNameArray( const char* const*& ppNames, sal_uLong& rCount ) const = 0; + virtual css::uno::Sequence< OUString > GetPropertyNames() const = 0; virtual bool ReadData( const css::uno::Any* pValues ) = 0; virtual bool WriteData( css::uno::Any* pValues ) const = 0; @@ -153,7 +152,7 @@ private: protected: - virtual void GetPropNameArray( const char* const*& ppNames, sal_uLong& rCount ) const override; + virtual css::uno::Sequence< OUString > GetPropertyNames() const override; virtual bool ReadData( const css::uno::Any* pValues ) override; virtual bool WriteData( css::uno::Any* pValues ) const override; @@ -260,7 +259,7 @@ class SdOptionsGrid : public SdOptionsGeneric, public SvxOptionsGrid { protected: - virtual void GetPropNameArray( const char* const*& ppNames, sal_uLong& rCount ) const override; + virtual css::uno::Sequence< OUString > GetPropertyNames() const override; virtual bool ReadData( const css::uno::Any* pValues ) override; virtual bool WriteData( css::uno::Any* pValues ) const override; @@ -326,7 +325,7 @@ private: protected: - virtual void GetPropNameArray( const char* const*& ppNames, sal_uLong& rCount ) const override; + virtual css::uno::Sequence< OUString > GetPropertyNames() const override; virtual bool ReadData( const css::uno::Any* pValues ) override; virtual bool WriteData( css::uno::Any* pValues ) const override;
