diff options
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/form/fmshimp.cxx | 8 | ||||
| -rw-r--r-- | svx/source/inc/datanavi.hxx | 5 | ||||
| -rw-r--r-- | svx/source/inc/fmshimp.hxx | 9 |
3 files changed, 12 insertions, 10 deletions
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index d532ff4aaeee..878f7f60f412 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -1032,7 +1032,7 @@ OString FmXFormShell::SlotToIdent(sal_uInt16 nSlot) return OString(); } -bool FmXFormShell::isControlConversionSlot(const OString& rIdent) +bool FmXFormShell::isControlConversionSlot(std::string_view rIdent) { for (const auto& rConvertSlot : aConvertSlots) if (rIdent == rConvertSlot) @@ -1040,7 +1040,7 @@ bool FmXFormShell::isControlConversionSlot(const OString& rIdent) return false; } -void FmXFormShell::executeControlConversionSlot_Lock(const OString &rIdent) +void FmXFormShell::executeControlConversionSlot_Lock(std::string_view rIdent) { OSL_PRECOND( canConvertCurrentSelectionToControl_Lock(rIdent), "FmXFormShell::executeControlConversionSlot: illegal call!" ); InterfaceBag::const_iterator aSelectedElement = m_aCurrentSelection.begin(); @@ -1050,7 +1050,7 @@ void FmXFormShell::executeControlConversionSlot_Lock(const OString &rIdent) executeControlConversionSlot_Lock(Reference<XFormComponent>(*aSelectedElement, UNO_QUERY), rIdent); } -bool FmXFormShell::executeControlConversionSlot_Lock(const Reference<XFormComponent>& _rxObject, const OString& rIdent) +bool FmXFormShell::executeControlConversionSlot_Lock(const Reference<XFormComponent>& _rxObject, std::string_view rIdent) { if (impl_checkDisposed_Lock()) return false; @@ -1249,7 +1249,7 @@ bool FmXFormShell::executeControlConversionSlot_Lock(const Reference<XFormCompon return false; } -bool FmXFormShell::canConvertCurrentSelectionToControl_Lock(const OString& rIdent) +bool FmXFormShell::canConvertCurrentSelectionToControl_Lock(std::string_view rIdent) { if ( m_aCurrentSelection.empty() ) return false; diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx index a208dc2062ef..3899fc3d3745 100644 --- a/svx/source/inc/datanavi.hxx +++ b/svx/source/inc/datanavi.hxx @@ -45,6 +45,7 @@ #include "datalistener.hxx" #include <memory> +#include <string_view> #include <vector> class FmFormShell; @@ -98,7 +99,7 @@ namespace svxform /** convert submission replace string from API value to UI value. Use 'none' as default. */ - OUString const & toUI( const OUString& rStr ) const + OUString const & toUI( std::u16string_view rStr ) const { if( rStr == m_sDoc_API ) return m_sDoc_UI; @@ -143,7 +144,7 @@ namespace svxform } /** convert from API to UI; put is default. */ - OUString const & toUI( const OUString& rStr ) const + OUString const & toUI( std::u16string_view rStr ) const { if( rStr == m_sGet_API ) return m_sGet_UI; diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx index affa74dfcaf9..23bb34cc3a43 100644 --- a/svx/source/inc/fmshimp.hxx +++ b/svx/source/inc/fmshimp.hxx @@ -51,6 +51,7 @@ #include <o3tl/typed_flags_set.hxx> #include <queue> +#include <string_view> #include <vector> #include <memory> @@ -411,17 +412,17 @@ public: SAL_DLLPRIVATE static void GetConversionMenu_Lock(weld::Menu& rMenu); /// checks whether a given control conversion slot can be applied to the current selection - SAL_DLLPRIVATE bool canConvertCurrentSelectionToControl_Lock(const OString& rIdent); + SAL_DLLPRIVATE bool canConvertCurrentSelectionToControl_Lock(std::string_view rIdent); /// enables or disables all conversion slots in a menu, according to the current selection SAL_DLLPRIVATE void checkControlConversionSlotsForCurrentSelection_Lock(weld::Menu& rMenu); /// executes a control conversion slot for a given object - SAL_DLLPRIVATE bool executeControlConversionSlot_Lock(const css::uno::Reference< css::form::XFormComponent >& _rxObject, const OString& rIdent); + SAL_DLLPRIVATE bool executeControlConversionSlot_Lock(const css::uno::Reference< css::form::XFormComponent >& _rxObject, std::string_view rIdent); /** executes a control conversion slot for the current selection @precond canConvertCurrentSelectionToControl( <arg>_nSlotId</arg> ) must return <TRUE/> */ - SAL_DLLPRIVATE void executeControlConversionSlot_Lock(const OString& rIdent); + SAL_DLLPRIVATE void executeControlConversionSlot_Lock(std::string_view rIdent); /// checks whether the given slot id denotes a control conversion slot - SAL_DLLPRIVATE static bool isControlConversionSlot(const OString& rIdent); + SAL_DLLPRIVATE static bool isControlConversionSlot(std::string_view rIdent); SAL_DLLPRIVATE void ExecuteTextAttribute_Lock(SfxRequest& _rReq); SAL_DLLPRIVATE void GetTextAttributeState_Lock(SfxItemSet& _rSet); |