extensions/source/propctrlr/defaultforminspection.cxx | 7 ++-- extensions/source/propctrlr/defaulthelpprovider.cxx | 5 +-- extensions/source/propctrlr/objectinspectormodel.cxx | 13 ++++---- extensions/source/propctrlr/pcrcommon.hxx | 27 ------------------ extensions/source/propctrlr/propcontroller.cxx | 19 ++++++------ extensions/source/propctrlr/propertycomposer.cxx | 2 - extensions/source/propctrlr/propertyhandler.cxx | 4 +- extensions/source/propctrlr/propertyhandler.hxx | 2 - extensions/source/propctrlr/standardcontrol.cxx | 25 ++++++---------- extensions/source/propctrlr/standardcontrol.hxx | 4 +- 10 files changed, 36 insertions(+), 72 deletions(-)
New commits: commit 8e9bdbaa788d88f42fad470e4eaf2f8a5a1d41c5 Author: Mike Kaganski <[email protected]> AuthorDate: Sun Dec 7 20:25:31 2025 +0500 Commit: Mike Kaganski <[email protected]> CommitDate: Sun Dec 7 18:23:38 2025 +0100 Drop StlSyntaxSequence; use css::uno::Sequence There is no benefit in the wrapper. Change-Id: I813ccc6af437d6adecc7205a9d849d32b85cbe7f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195189 Tested-by: Jenkins Reviewed-by: Mike Kaganski <[email protected]> diff --git a/extensions/source/propctrlr/defaultforminspection.cxx b/extensions/source/propctrlr/defaultforminspection.cxx index af035b339f62..1909b96e030c 100644 --- a/extensions/source/propctrlr/defaultforminspection.cxx +++ b/extensions/source/propctrlr/defaultforminspection.cxx @@ -172,17 +172,16 @@ namespace pcr if ( m_bConstructed ) throw AlreadyInitializedException(); - StlSyntaxSequence< Any > arguments( _arguments ); - if ( arguments.empty() ) + if (!_arguments.hasElements()) { // constructor: "createDefault()" m_bConstructed = true; return; } - if ( arguments.size() == 2 ) + if (_arguments.size() == 2 ) { // constructor: "createWithHelpSection( long, long )" sal_Int32 nMinHelpTextLines( 0 ), nMaxHelpTextLines( 0 ); - if ( !( arguments[0] >>= nMinHelpTextLines ) || !( arguments[1] >>= nMaxHelpTextLines ) ) + if (!(_arguments[0] >>= nMinHelpTextLines) || !(_arguments[1] >>= nMaxHelpTextLines)) throw IllegalArgumentException( OUString(), *this, 0 ); createWithHelpSection( nMinHelpTextLines, nMaxHelpTextLines ); return; diff --git a/extensions/source/propctrlr/defaulthelpprovider.cxx b/extensions/source/propctrlr/defaulthelpprovider.cxx index d087c474cae2..ec6a5f63517e 100644 --- a/extensions/source/propctrlr/defaulthelpprovider.cxx +++ b/extensions/source/propctrlr/defaulthelpprovider.cxx @@ -103,10 +103,9 @@ namespace pcr if ( m_bConstructed ) throw AlreadyInitializedException(); - StlSyntaxSequence< Any > arguments( _arguments ); - if ( arguments.size() == 1 ) + if (_arguments.size() == 1) { // constructor: "create( XObjectInspectorUI )" - Reference< XObjectInspectorUI > xUI( arguments[0], UNO_QUERY ); + Reference<XObjectInspectorUI> xUI(_arguments[0], UNO_QUERY); create( xUI ); return; } diff --git a/extensions/source/propctrlr/objectinspectormodel.cxx b/extensions/source/propctrlr/objectinspectormodel.cxx index d62b5ba3321b..05e2ff742778 100644 --- a/extensions/source/propctrlr/objectinspectormodel.cxx +++ b/extensions/source/propctrlr/objectinspectormodel.cxx @@ -108,27 +108,26 @@ namespace pcr if ( m_aFactories.hasElements() ) throw AlreadyInitializedException(); - StlSyntaxSequence< Any > arguments( _arguments ); - if ( arguments.empty() ) + if (!_arguments.hasElements()) { // constructor: "createDefault()" createDefault(); return; } Sequence< Any > factories; - impl_verifyArgument_throw( arguments[0] >>= factories, 1 ); + impl_verifyArgument_throw(_arguments[0] >>= factories, 1); - if ( arguments.size() == 1 ) + if (_arguments.size() == 1) { // constructor: "createWithHandlerFactories( any[] )" createWithHandlerFactories( factories ); return; } - if ( arguments.size() == 3 ) + if (_arguments.size() == 3) { // constructor: "createWithHandlerFactoriesAndHelpSection( any[], long, long )" sal_Int32 nMinHelpTextLines( 0 ), nMaxHelpTextLines( 0 ); - impl_verifyArgument_throw( arguments[1] >>= nMinHelpTextLines, 2 ); - impl_verifyArgument_throw( arguments[2] >>= nMaxHelpTextLines, 3 ); + impl_verifyArgument_throw(_arguments[1] >>= nMinHelpTextLines, 2); + impl_verifyArgument_throw(_arguments[2] >>= nMaxHelpTextLines, 3); createWithHandlerFactoriesAndHelpSection( factories, nMinHelpTextLines, nMaxHelpTextLines ); return; } diff --git a/extensions/source/propctrlr/pcrcommon.hxx b/extensions/source/propctrlr/pcrcommon.hxx index f2a8b847c000..775c33688d79 100644 --- a/extensions/source/propctrlr/pcrcommon.hxx +++ b/extensions/source/propctrlr/pcrcommon.hxx @@ -68,33 +68,6 @@ namespace pcr }; - //= StlSyntaxSequence - - template< class ELEMENT > - class StlSyntaxSequence : public css::uno::Sequence< ELEMENT > - { - private: - typedef css::uno::Sequence< ELEMENT > UnoBase; - - public: - StlSyntaxSequence() : UnoBase() { } - explicit StlSyntaxSequence( const UnoBase& rSeq ) : UnoBase( rSeq ) { } - explicit StlSyntaxSequence( sal_Int32 len ) : UnoBase( len ) { } - - typedef const ELEMENT* const_iterator; - typedef ELEMENT* iterator; - - const_iterator begin() const { return UnoBase::getConstArray(); } - const_iterator end() const { return UnoBase::getConstArray() + UnoBase::getLength(); } - - iterator begin() { return UnoBase::getArray(); } - iterator end() { return UnoBase::getArray() + UnoBase::getLength(); } - - sal_Int32 size() const { return UnoBase::getLength(); } - bool empty() const { return !UnoBase::hasElements(); } - }; - - //= UNO helpers #define DECLARE_XCOMPONENT() \ diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx index c8704c702e24..14dc23a75206 100644 --- a/extensions/source/propctrlr/propcontroller.cxx +++ b/extensions/source/propctrlr/propcontroller.cxx @@ -278,17 +278,16 @@ namespace pcr if ( m_bConstructed ) throw AlreadyInitializedException(); - StlSyntaxSequence< Any > arguments( _arguments ); - if ( arguments.empty() ) + if (!_arguments.hasElements()) { // constructor: "createDefault()" m_bConstructed = true; return; } Reference< XObjectInspectorModel > xModel; - if ( arguments.size() == 1 ) + if (_arguments.size() == 1) { // constructor: "createWithModel( XObjectInspectorModel )" - if ( !( arguments[0] >>= xModel ) ) + if (!(_arguments[0] >>= xModel)) throw IllegalArgumentException( OUString(), *this, 0 ); createWithModel( xModel ); return; @@ -946,9 +945,9 @@ namespace pcr { DBG_ASSERT( aHandler->get(), "OPropertyBrowserController::doInspection: invalid handler!" ); - StlSyntaxSequence< Property > aThisHandlersProperties( (*aHandler)->getSupportedProperties() ); + Sequence<Property> aThisHandlersProperties((*aHandler)->getSupportedProperties()); - if ( aThisHandlersProperties.empty() ) + if (!aThisHandlersProperties.hasElements()) { // this handler doesn't know anything about the current inspectee -> ignore it (*aHandler)->dispose(); @@ -985,7 +984,7 @@ namespace pcr } // determine the superseded properties - StlSyntaxSequence< OUString > aSupersededByThisHandler( (*aHandler)->getSupersededProperties() ); + Sequence<OUString> aSupersededByThisHandler((*aHandler)->getSupersededProperties()); for (const auto & superseded : aSupersededByThisHandler) { std::vector< Property >::iterator existent = std::find_if( @@ -1012,7 +1011,7 @@ namespace pcr } // see if the handler expresses interest in any actuating properties - StlSyntaxSequence< OUString > aInterestingActuations( (*aHandler)->getActuatingProperties() ); + Sequence<OUString> aInterestingActuations((*aHandler)->getActuatingProperties()); for (const auto & aInterestingActuation : aInterestingActuations) { m_aDependencyHandlers.emplace( aInterestingActuation, *aHandler ); @@ -1127,9 +1126,9 @@ namespace pcr { OSL_PRECOND( m_aPageIds.empty(), "OPropertyBrowserController::impl_buildCategories_throw: duplicate call!" ); - StlSyntaxSequence< PropertyCategoryDescriptor > aCategories; + Sequence<PropertyCategoryDescriptor> aCategories; if ( m_xModel.is() ) - aCategories = StlSyntaxSequence< PropertyCategoryDescriptor >(m_xModel->describeCategories()); + aCategories = m_xModel->describeCategories(); for (auto const& category : aCategories) { diff --git a/extensions/source/propctrlr/propertycomposer.cxx b/extensions/source/propctrlr/propertycomposer.cxx index 869cba77c7fe..01b60b23127a 100644 --- a/extensions/source/propctrlr/propertycomposer.cxx +++ b/extensions/source/propctrlr/propertycomposer.cxx @@ -381,7 +381,7 @@ namespace pcr for (auto const& slaveHandler : m_aSlaveHandlers) { // TODO: make this cheaper (cache it?) - const StlSyntaxSequence< OUString > aThisHandlersActuatingProps( slaveHandler->getActuatingProperties() ); + const Sequence<OUString> aThisHandlersActuatingProps(slaveHandler->getActuatingProperties()); for (const auto & aThisHandlersActuatingProp : aThisHandlersActuatingProps) { if ( aThisHandlersActuatingProp == _rActuatingPropertyName ) diff --git a/extensions/source/propctrlr/propertyhandler.cxx b/extensions/source/propctrlr/propertyhandler.cxx index cdedd0897e5d..ed3d51c59740 100644 --- a/extensions/source/propctrlr/propertyhandler.cxx +++ b/extensions/source/propctrlr/propertyhandler.cxx @@ -109,7 +109,7 @@ namespace pcr ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_bSupportedPropertiesAreKnown ) { - m_aSupportedProperties = StlSyntaxSequence<css::beans::Property>(doDescribeSupportedProperties()); + m_aSupportedProperties = doDescribeSupportedProperties(); m_bSupportedPropertiesAreKnown = true; } return m_aSupportedProperties; @@ -300,7 +300,7 @@ namespace pcr const Property& PropertyHandler::impl_getPropertyFromName_throw( const OUString& _rPropertyName ) const { const_cast< PropertyHandler* >( this )->getSupportedProperties(); - StlSyntaxSequence< Property >::const_iterator pFound = std::find_if( m_aSupportedProperties.begin(), m_aSupportedProperties.end(), + auto pFound = std::find_if( m_aSupportedProperties.begin(), m_aSupportedProperties.end(), FindPropertyByName( _rPropertyName ) ); if ( pFound == m_aSupportedProperties.end() ) diff --git a/extensions/source/propctrlr/propertyhandler.hxx b/extensions/source/propctrlr/propertyhandler.hxx index 944b4d76aa7c..fedb840b44c3 100644 --- a/extensions/source/propctrlr/propertyhandler.hxx +++ b/extensions/source/propctrlr/propertyhandler.hxx @@ -61,7 +61,7 @@ namespace pcr { private: /// cache for getSupportedProperties - mutable StlSyntaxSequence< css::beans::Property > + mutable css::uno::Sequence<css::beans::Property> m_aSupportedProperties; mutable bool m_bSupportedPropertiesAreKnown; diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx index 21d52e506029..b996c29301c6 100644 --- a/extensions/source/propctrlr/standardcontrol.cxx +++ b/extensions/source/propctrlr/standardcontrol.cxx @@ -686,13 +686,13 @@ namespace pcr namespace { - StlSyntaxSequence< OUString > lcl_convertMultiLineToList( std::u16string_view _rCompsedTextWithLineBreaks ) + Sequence<OUString> lcl_convertMultiLineToList(std::u16string_view _rCompsedTextWithLineBreaks) { sal_Int32 nLines = comphelper::string::getTokenCount(_rCompsedTextWithLineBreaks, ' '); - StlSyntaxSequence< OUString > aStrings( nLines ); + Sequence<OUString> aStrings(nLines); if (nLines) { - StlSyntaxSequence< OUString >::iterator stringItem = aStrings.begin(); + auto stringItem = aStrings.getArray(); sal_Int32 nIdx {0}; do { @@ -704,12 +704,10 @@ namespace pcr return aStrings; } - OUString lcl_convertListToMultiLine( const StlSyntaxSequence< OUString >& _rStrings ) + OUString lcl_convertListToMultiLine(const Sequence<OUString>& _rStrings) { OUStringBuffer sMultiLineText; - for ( StlSyntaxSequence< OUString >::const_iterator item = _rStrings.begin(); - item != _rStrings.end(); - ) + for (auto item = _rStrings.begin(); item != _rStrings.end();) { sMultiLineText.append(*item); if ( ++item != _rStrings.end() ) @@ -719,13 +717,10 @@ namespace pcr } - OUString lcl_convertListToDisplayText( const StlSyntaxSequence< OUString >& _rStrings ) + OUString lcl_convertListToDisplayText(const Sequence<OUString>& _rStrings) { OUStringBuffer aComposed; - for ( StlSyntaxSequence< OUString >::const_iterator strings = _rStrings.begin(); - strings != _rStrings.end(); - ++strings - ) + for (auto strings = _rStrings.begin(); strings != _rStrings.end(); ++strings) { if ( strings != _rStrings.begin() ) aComposed.append( ';' ); @@ -742,14 +737,14 @@ namespace pcr m_xEntry->set_sensitive(m_xEntry->get_text() == m_xTextView->get_text()); } - void OMultilineEditControl::SetStringListValue(const StlSyntaxSequence<OUString>& rStrings) + void OMultilineEditControl::SetStringListValue(const Sequence<OUString>& rStrings) { m_xEntry->set_text(lcl_convertListToDisplayText(rStrings)); m_xTextView->set_text(lcl_convertListToMultiLine(rStrings)); CheckEntryTextViewMisMatch(); } - StlSyntaxSequence<OUString> OMultilineEditControl::GetStringListValue() const + Sequence<OUString> OMultilineEditControl::GetStringListValue() const { return lcl_convertMultiLineToList(m_xTextView->get_text()); } @@ -833,7 +828,7 @@ namespace pcr Sequence< OUString > aStringLines; if ( !( _rValue >>= aStringLines ) && _rValue.hasValue() ) throw IllegalTypeException(); - SetStringListValue( StlSyntaxSequence<OUString>(aStringLines) ); + SetStringListValue(aStringLines); break; } } diff --git a/extensions/source/propctrlr/standardcontrol.hxx b/extensions/source/propctrlr/standardcontrol.hxx index 6b4c33e7de04..35888811b155 100644 --- a/extensions/source/propctrlr/standardcontrol.hxx +++ b/extensions/source/propctrlr/standardcontrol.hxx @@ -364,8 +364,8 @@ namespace pcr void SetTextValue(const OUString& rText); OUString GetTextValue() const; - void SetStringListValue( const StlSyntaxSequence< OUString >& _rStrings ); - StlSyntaxSequence< OUString > + void SetStringListValue( const css::uno::Sequence< OUString >& _rStrings ); + css::uno::Sequence<OUString> GetStringListValue() const; DECL_LINK(ButtonHandler, weld::Button&, void);
