diff options
| author | Tor Lillqvist <tml@collabora.com> | 2017-02-17 19:06:24 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2017-02-17 18:41:19 +0000 |
| commit | b57d51e32fb85e9cde64f85719725253162c42e4 (patch) | |
| tree | afe75470b9fc3c12a3d240577b07042985882675 /extensions/source | |
| parent | c910d1dae1a9fcf0591098244debc863dd59618a (diff) | |
Drop :: prefix from std in [de]*/
Change-Id: I3247894fe022dce7f0aa351bd85fefcd7c545dd4
Reviewed-on: https://gerrit.libreoffice.org/34377
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'extensions/source')
56 files changed, 230 insertions, 230 deletions
diff --git a/extensions/source/abpilot/typeselectionpage.cxx b/extensions/source/abpilot/typeselectionpage.cxx index 524bdaa6c7dd..eb4e00b83fca 100644 --- a/extensions/source/abpilot/typeselectionpage.cxx +++ b/extensions/source/abpilot/typeselectionpage.cxx @@ -120,7 +120,7 @@ namespace abp m_aAllTypes.push_back( ButtonItem( m_pOther, AST_OTHER, true ) ); Link<Button*,void> aTypeSelectionHandler = LINK(this, TypeSelectionPage, OnTypeSelected ); - for ( ::std::vector< ButtonItem >::const_iterator loop = m_aAllTypes.begin(); + for ( std::vector< ButtonItem >::const_iterator loop = m_aAllTypes.begin(); loop != m_aAllTypes.end(); ++loop ) { ButtonItem aItem = *loop; @@ -142,7 +142,7 @@ namespace abp void TypeSelectionPage::dispose() { - for ( ::std::vector< ButtonItem >::iterator loop = m_aAllTypes.begin(); + for ( std::vector< ButtonItem >::iterator loop = m_aAllTypes.begin(); loop != m_aAllTypes.end(); ++loop ) { loop->m_bVisible = false; @@ -163,7 +163,7 @@ namespace abp { AddressBookSourcePage::ActivatePage(); - for ( ::std::vector< ButtonItem >::const_iterator loop = m_aAllTypes.begin(); + for ( std::vector< ButtonItem >::const_iterator loop = m_aAllTypes.begin(); loop != m_aAllTypes.end(); ++loop ) { const ButtonItem& rItem = (*loop); @@ -187,7 +187,7 @@ namespace abp void TypeSelectionPage::selectType( AddressSourceType _eType ) { - for ( ::std::vector< ButtonItem >::const_iterator loop = m_aAllTypes.begin(); + for ( std::vector< ButtonItem >::const_iterator loop = m_aAllTypes.begin(); loop != m_aAllTypes.end(); ++loop ) { ButtonItem aItem = (*loop); @@ -198,7 +198,7 @@ namespace abp AddressSourceType TypeSelectionPage::getSelectedType() const { - for ( ::std::vector< ButtonItem >::const_iterator loop = m_aAllTypes.begin(); + for ( std::vector< ButtonItem >::const_iterator loop = m_aAllTypes.begin(); loop != m_aAllTypes.end(); ++loop ) { ButtonItem aItem = (*loop); diff --git a/extensions/source/abpilot/typeselectionpage.hxx b/extensions/source/abpilot/typeselectionpage.hxx index d757cfcd15ad..8b9b9b609468 100644 --- a/extensions/source/abpilot/typeselectionpage.hxx +++ b/extensions/source/abpilot/typeselectionpage.hxx @@ -55,7 +55,7 @@ namespace abp {} }; - ::std::vector< ButtonItem > m_aAllTypes; + std::vector< ButtonItem > m_aAllTypes; public: explicit TypeSelectionPage( OAddressBookSourcePilot* _pParent ); diff --git a/extensions/source/bibliography/formcontrolcontainer.cxx b/extensions/source/bibliography/formcontrolcontainer.cxx index 4da38e35780b..4097bef737a0 100644 --- a/extensions/source/bibliography/formcontrolcontainer.cxx +++ b/extensions/source/bibliography/formcontrolcontainer.cxx @@ -72,7 +72,7 @@ namespace bib m_xForm = _rxForm; } - struct ControlModeSwitch : public ::std::unary_function< Reference< XControl >, void > + struct ControlModeSwitch : public std::unary_function< Reference< XControl >, void > { bool bDesign; explicit ControlModeSwitch( bool _bDesign ) : bDesign( _bDesign ) { } @@ -93,7 +93,7 @@ namespace bib if ( xControlCont.is() ) aControls = xControlCont->getControls(); - ::std::for_each( + std::for_each( aControls.getConstArray(), aControls.getConstArray() + aControls.getLength(), ControlModeSwitch( _bDesign ) diff --git a/extensions/source/logging/filehandler.cxx b/extensions/source/logging/filehandler.cxx index 0096cad1f06c..a59a43cb9800 100644 --- a/extensions/source/logging/filehandler.cxx +++ b/extensions/source/logging/filehandler.cxx @@ -77,7 +77,7 @@ namespace logging Reference<XComponentContext> m_xContext; LogHandlerHelper m_aHandlerHelper; OUString m_sFileURL; - ::std::unique_ptr< ::osl::File > m_pFile; + std::unique_ptr< ::osl::File > m_pFile; FileValidity m_eFileValidity; public: diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx index b5e0cffeddd6..27bcc3463aab 100644 --- a/extensions/source/propctrlr/browserlistbox.cxx +++ b/extensions/source/propctrlr/browserlistbox.cxx @@ -573,7 +573,7 @@ namespace pcr void OBrowserListBox::UpdatePosNSize() { - for ( ::std::set< sal_uInt16 >::const_iterator aLoop = m_aOutOfDateLines.begin(); + for ( std::set< sal_uInt16 >::const_iterator aLoop = m_aOutOfDateLines.begin(); aLoop != m_aOutOfDateLines.end(); ++aLoop ) @@ -1192,8 +1192,8 @@ namespace pcr if ( nScrollOffset ) { long nNewThumbPos = m_aVScroll->GetThumbPos() + nScrollOffset; - nNewThumbPos = ::std::max( nNewThumbPos, m_aVScroll->GetRangeMin() ); - nNewThumbPos = ::std::min( nNewThumbPos, m_aVScroll->GetRangeMax() ); + nNewThumbPos = std::max( nNewThumbPos, m_aVScroll->GetRangeMin() ); + nNewThumbPos = std::min( nNewThumbPos, m_aVScroll->GetRangeMax() ); m_aVScroll->DoScroll( nNewThumbPos ); nNewThumbPos = m_aVScroll->GetThumbPos(); diff --git a/extensions/source/propctrlr/browserlistbox.hxx b/extensions/source/propctrlr/browserlistbox.hxx index be7425b2c54b..ff20fd99125c 100644 --- a/extensions/source/propctrlr/browserlistbox.hxx +++ b/extensions/source/propctrlr/browserlistbox.hxx @@ -66,7 +66,7 @@ namespace pcr { } }; - typedef ::std::vector< ListBoxLine > ListBoxLines; + typedef std::vector< ListBoxLine > ListBoxLines; class OBrowserListBox :public Control @@ -86,7 +86,7 @@ namespace pcr m_xActiveControl; sal_uInt16 m_nTheNameSize; long m_nRowHeight; - ::std::set< sal_uInt16 > m_aOutOfDateLines; + std::set< sal_uInt16 > m_aOutOfDateLines; bool m_bIsActive : 1; bool m_bUpdate : 1; ::rtl::Reference< PropertyControlContext_Impl > diff --git a/extensions/source/propctrlr/buttonnavigationhandler.cxx b/extensions/source/propctrlr/buttonnavigationhandler.cxx index 077660cc9228..f7d441684205 100644 --- a/extensions/source/propctrlr/buttonnavigationhandler.cxx +++ b/extensions/source/propctrlr/buttonnavigationhandler.cxx @@ -175,7 +175,7 @@ namespace pcr Sequence< Property > SAL_CALL ButtonNavigationHandler::doDescribeSupportedProperties() const { - ::std::vector< Property > aProperties; + std::vector< Property > aProperties; if ( isNavigationCapableButton( m_xComponent ) ) { diff --git a/extensions/source/propctrlr/cellbindinghandler.cxx b/extensions/source/propctrlr/cellbindinghandler.cxx index 3ac05914569c..930f717301c7 100644 --- a/extensions/source/propctrlr/cellbindinghandler.cxx +++ b/extensions/source/propctrlr/cellbindinghandler.cxx @@ -107,7 +107,7 @@ namespace pcr if ( !_rxInspectorUI.is() ) throw NullPointerException(); - ::std::vector< PropertyId > aDependentProperties; + std::vector< PropertyId > aDependentProperties; switch ( nActuatingPropId ) { @@ -189,7 +189,7 @@ namespace pcr OSL_FAIL( "CellBindingPropertyHandler::actuatingPropertyChanged: did not register for this property!" ); } - for ( ::std::vector< PropertyId >::const_iterator loopAffected = aDependentProperties.begin(); + for ( std::vector< PropertyId >::const_iterator loopAffected = aDependentProperties.begin(); loopAffected != aDependentProperties.end(); ++loopAffected ) @@ -444,7 +444,7 @@ namespace pcr Sequence< Property > SAL_CALL CellBindingPropertyHandler::doDescribeSupportedProperties() const { - ::std::vector< Property > aProperties; + std::vector< Property > aProperties; bool bAllowCellLinking = m_pHelper.get() && m_pHelper->isCellBindingAllowed(); bool bAllowCellIntLinking = m_pHelper.get() && m_pHelper->isCellIntegerBindingAllowed(); diff --git a/extensions/source/propctrlr/cellbindinghandler.hxx b/extensions/source/propctrlr/cellbindinghandler.hxx index 93b3b84d5c00..33c5c81f19de 100644 --- a/extensions/source/propctrlr/cellbindinghandler.hxx +++ b/extensions/source/propctrlr/cellbindinghandler.hxx @@ -40,7 +40,7 @@ namespace pcr class CellBindingPropertyHandler : public CellBindingPropertyHandler_Base { private: - ::std::unique_ptr< CellBindingHelper > m_pHelper; + std::unique_ptr< CellBindingHelper > m_pHelper; ::rtl::Reference< IPropertyEnumRepresentation > m_pCellExchangeConverter; public: diff --git a/extensions/source/propctrlr/cellbindinghelper.cxx b/extensions/source/propctrlr/cellbindinghelper.cxx index 3c4cf5297755..0a79972c71a5 100644 --- a/extensions/source/propctrlr/cellbindinghelper.cxx +++ b/extensions/source/propctrlr/cellbindinghelper.cxx @@ -60,7 +60,7 @@ namespace pcr namespace { - struct StringCompare : public ::std::unary_function< OUString, bool > + struct StringCompare : public std::unary_function< OUString, bool > { private: OUString m_sReference; @@ -382,7 +382,7 @@ namespace pcr if ( xDocumentFactory.is() ) aAvailableServices = xDocumentFactory->getAvailableServiceNames( ); - const OUString* pFound = ::std::find_if( + const OUString* pFound = std::find_if( aAvailableServices.getConstArray(), aAvailableServices.getConstArray() + aAvailableServices.getLength(), StringCompare( _rService ) diff --git a/extensions/source/propctrlr/composeduiupdate.cxx b/extensions/source/propctrlr/composeduiupdate.cxx index 372193d752d7..c438f3207400 100644 --- a/extensions/source/propctrlr/composeduiupdate.cxx +++ b/extensions/source/propctrlr/composeduiupdate.cxx @@ -47,7 +47,7 @@ namespace pcr namespace { - struct HandlerLess : public ::std::binary_function < Reference< XPropertyHandler > + struct HandlerLess : public std::binary_function < Reference< XPropertyHandler > , Reference< XPropertyHandler > , bool > @@ -59,8 +59,8 @@ namespace pcr }; - typedef ::std::set< OUString > StringBag; - typedef ::std::map< sal_Int16, StringBag > MapIntToStringBag; + typedef std::set< OUString > StringBag; + typedef std::map< sal_Int16, StringBag > MapIntToStringBag; } @@ -352,7 +352,7 @@ namespace pcr // HandlerMap - typedef ::std::map < Reference< XPropertyHandler > + typedef std::map < Reference< XPropertyHandler > , ::rtl::Reference< CachedInspectorUI > , HandlerLess > ImplMapHandlerToUI; @@ -393,7 +393,7 @@ namespace pcr { // an STL-compatible structure which collects strings from a CachedInspectorUI instances - struct StringBagCollector : public ::std::unary_function< ImplMapHandlerToUI::value_type, void > + struct StringBagCollector : public std::unary_function< ImplMapHandlerToUI::value_type, void > { private: StringBag& m_rBag; @@ -410,13 +410,13 @@ namespace pcr static void collectAll( StringBag& _rAll, const ImplMapHandlerToUI& _rMap, CachedInspectorUI::FGetStringBag _pGetter ) { - ::std::for_each( _rMap.begin(), _rMap.end(), StringBagCollector( _rAll, _pGetter ) ); + std::for_each( _rMap.begin(), _rMap.end(), StringBagCollector( _rAll, _pGetter ) ); } }; // an STL-compatible structure which cleans a certain string bag in a CachedInspectorUI instances - struct StringBagClearer : public ::std::unary_function< ImplMapHandlerToUI::value_type, void > + struct StringBagClearer : public std::unary_function< ImplMapHandlerToUI::value_type, void > { private: CachedInspectorUI::FGetStringBag m_pGetter; @@ -431,7 +431,7 @@ namespace pcr static void clearAll( const ImplMapHandlerToUI& _rMap, CachedInspectorUI::FGetStringBag _pGetter ) { - ::std::for_each( _rMap.begin(), _rMap.end(), StringBagClearer( _pGetter ) ); + std::for_each( _rMap.begin(), _rMap.end(), StringBagClearer( _pGetter ) ); } }; @@ -441,7 +441,7 @@ namespace pcr // an STL-compatible struct which calls a certain member method (taking a string) at a // given ->XObjectInspectorUI instance - struct PropertyUIOperator : public ::std::unary_function< OUString, void > + struct PropertyUIOperator : public std::unary_function< OUString, void > { private: Reference< XObjectInspectorUI > m_xUpdater; @@ -461,7 +461,7 @@ namespace pcr static void forEach( const StringBag& _rProperties, const Reference< XObjectInspectorUI >& _rxDelegatorUI, FPropertyUISetter _pSetter ) { - ::std::for_each( _rProperties.begin(), _rProperties.end(), PropertyUIOperator( _rxDelegatorUI, _pSetter ) ); + std::for_each( _rProperties.begin(), _rProperties.end(), PropertyUIOperator( _rxDelegatorUI, _pSetter ) ); } }; @@ -541,7 +541,7 @@ namespace pcr // an STL-compatible structure which applies a ->IStringKeyBooleanUIUpdate::updateUIForKey // operation with a fixed boolean value, for a given string value - struct BooleanUIAspectUpdate : public ::std::unary_function< OUString, void > + struct BooleanUIAspectUpdate : public std::unary_function< OUString, void > { private: const IStringKeyBooleanUIUpdate& m_rUpdater; @@ -561,7 +561,7 @@ namespace pcr static void forEach( const StringBag& _rProperties, const IStringKeyBooleanUIUpdate& _rUpdater, bool _bFlag ) { - ::std::for_each( _rProperties.begin(), _rProperties.end(), BooleanUIAspectUpdate( _rUpdater, _bFlag ) ); + std::for_each( _rProperties.begin(), _rProperties.end(), BooleanUIAspectUpdate( _rUpdater, _bFlag ) ); } }; @@ -569,7 +569,7 @@ namespace pcr // BooleanUIAspectUpdate // an STL-compatible structure subtracting a given string from a fixed ->StringBag - struct StringBagComplement : public ::std::unary_function< OUString, void > + struct StringBagComplement : public std::unary_function< OUString, void > { private: StringBag& m_rMinuend; @@ -584,7 +584,7 @@ namespace pcr static void subtract( StringBag& _rMinuend, const StringBag& _rSubtrahend ) { - ::std::for_each( _rSubtrahend.begin(), _rSubtrahend.end(), StringBagComplement( _rMinuend ) ); + std::for_each( _rSubtrahend.begin(), _rSubtrahend.end(), StringBagComplement( _rMinuend ) ); } }; diff --git a/extensions/source/propctrlr/composeduiupdate.hxx b/extensions/source/propctrlr/composeduiupdate.hxx index f6170861424b..d4fdcedbdb71 100644 --- a/extensions/source/propctrlr/composeduiupdate.hxx +++ b/extensions/source/propctrlr/composeduiupdate.hxx @@ -62,7 +62,7 @@ namespace pcr class ComposedPropertyUIUpdate { private: - ::std::unique_ptr< MapHandlerToUI > m_pCollectedUIs; + std::unique_ptr< MapHandlerToUI > m_pCollectedUIs; css::uno::Reference< css::inspection::XObjectInspectorUI > m_xDelegatorUI; oslInterlockedCount m_nSuspendCounter; diff --git a/extensions/source/propctrlr/defaultforminspection.hxx b/extensions/source/propctrlr/defaultforminspection.hxx index 23dee8a92409..e1ded25292fe 100644 --- a/extensions/source/propctrlr/defaultforminspection.hxx +++ b/extensions/source/propctrlr/defaultforminspection.hxx @@ -37,7 +37,7 @@ namespace pcr bool m_bConstructed; /// access to property meta data - ::std::unique_ptr< OPropertyInfoService > m_pInfoService; + std::unique_ptr< OPropertyInfoService > m_pInfoService; protected: virtual ~DefaultFormComponentInspectorModel() override; diff --git a/extensions/source/propctrlr/editpropertyhandler.cxx b/extensions/source/propctrlr/editpropertyhandler.cxx index 456de960a112..073016ebda91 100644 --- a/extensions/source/propctrlr/editpropertyhandler.cxx +++ b/extensions/source/propctrlr/editpropertyhandler.cxx @@ -212,7 +212,7 @@ namespace pcr Sequence< Property > SAL_CALL EditPropertyHandler::doDescribeSupportedProperties() const { - ::std::vector< Property > aProperties; + std::vector< Property > aProperties; if ( implHaveBothScrollBarProperties() ) addInt32PropertyDescription( aProperties, PROPERTY_SHOW_SCROLLBARS ); @@ -229,7 +229,7 @@ namespace pcr Sequence< OUString > SAL_CALL EditPropertyHandler::getSupersededProperties( ) { ::osl::MutexGuard aGuard( m_aMutex ); - ::std::vector< OUString > aSuperseded; + std::vector< OUString > aSuperseded; if ( implHaveBothScrollBarProperties() ) { aSuperseded.push_back( static_cast<const OUString&>(PROPERTY_HSCROLL) ); @@ -249,7 +249,7 @@ namespace pcr Sequence< OUString > SAL_CALL EditPropertyHandler::getActuatingProperties( ) { ::osl::MutexGuard aGuard( m_aMutex ); - ::std::vector< OUString > aInterestingActuatingProps; + std::vector< OUString > aInterestingActuatingProps; if ( implHaveTextTypeProperty() ) aInterestingActuatingProps.push_back( static_cast<const OUString&>(PROPERTY_TEXTTYPE) ); aInterestingActuatingProps.push_back( static_cast<const OUString&>(PROPERTY_MULTILINE) ); diff --git a/extensions/source/propctrlr/eformshelper.cxx b/extensions/source/propctrlr/eformshelper.cxx index 075b3f1ebcfc..160112fb7dd1 100644 --- a/extensions/source/propctrlr/eformshelper.cxx +++ b/extensions/source/propctrlr/eformshelper.cxx @@ -242,7 +242,7 @@ namespace pcr { if ( !_bDoListen ) { - ::std::unique_ptr< ::comphelper::OInterfaceIteratorHelper2 > pListenerIterator = m_aPropertyListeners.createIterator(); + std::unique_ptr< ::comphelper::OInterfaceIteratorHelper2 > pListenerIterator = m_aPropertyListeners.createIterator(); while ( pListenerIterator->hasMoreElements() ) { PropertyEventTranslation* pTranslator = dynamic_cast< PropertyEventTranslation* >( pListenerIterator->next() ); @@ -276,7 +276,7 @@ namespace pcr } else { - ::std::unique_ptr< ::comphelper::OInterfaceIteratorHelper2 > pListenerIterator = m_aPropertyListeners.createIterator(); + std::unique_ptr< ::comphelper::OInterfaceIteratorHelper2 > pListenerIterator = m_aPropertyListeners.createIterator(); while ( pListenerIterator->hasMoreElements() ) { Reference< XPropertyChangeListener > xListener( pListenerIterator->next(), UNO_QUERY ); @@ -293,7 +293,7 @@ namespace pcr } - void EFormsHelper::getFormModelNames( ::std::vector< OUString >& /* [out] */ _rModelNames ) const + void EFormsHelper::getFormModelNames( std::vector< OUString >& /* [out] */ _rModelNames ) const { if ( m_xDocument.is() ) { @@ -307,7 +307,7 @@ namespace pcr { Sequence< OUString > aModelNames = xForms->getElementNames(); _rModelNames.resize( aModelNames.getLength() ); - ::std::copy( aModelNames.begin(), aModelNames.end(), _rModelNames.begin() ); + std::copy( aModelNames.begin(), aModelNames.end(), _rModelNames.begin() ); } } catch( const Exception& ) @@ -318,7 +318,7 @@ namespace pcr } - void EFormsHelper::getBindingNames( const OUString& _rModelName, ::std::vector< OUString >& /* [out] */ _rBindingNames ) const + void EFormsHelper::getBindingNames( const OUString& _rModelName, std::vector< OUString >& /* [out] */ _rBindingNames ) const { _rBindingNames.resize( 0 ); try @@ -332,7 +332,7 @@ namespace pcr { Sequence< OUString > aNames = xBindings->getElementNames(); _rBindingNames.resize( aNames.getLength() ); - ::std::copy( aNames.begin(), aNames.end(), _rBindingNames.begin() ); + std::copy( aNames.begin(), aNames.end(), _rBindingNames.begin() ); } } } @@ -482,7 +482,7 @@ namespace pcr m_xBindableControl->setValueBinding( xBinding ); impl_toggleBindingPropertyListening_throw( true, nullptr ); - ::std::set< OUString > aSet; + std::set< OUString > aSet; firePropertyChanges( xOldBinding, _rxBinding, aSet ); } catch( const Exception& ) @@ -510,7 +510,7 @@ namespace pcr // determine the model which the binding should belong to if ( sTargetModel.isEmpty() ) { - ::std::vector< OUString > aModelNames; + std::vector< OUString > aModelNames; getFormModelNames( aModelNames ); if ( !aModelNames.empty() ) sTargetModel = *aModelNames.begin(); @@ -570,7 +570,7 @@ namespace pcr namespace { - struct PropertyBagInserter : public ::std::unary_function< Property, void > + struct PropertyBagInserter : public std::unary_function< Property, void > { private: PropertyBag& m_rProperties; @@ -593,7 +593,7 @@ namespace pcr if ( xInfo.is() ) { Sequence< Property > aProperties = xInfo->getProperties(); - ::std::for_each( aProperties.getConstArray(), aProperties.getConstArray() + aProperties.getLength(), + std::for_each( aProperties.getConstArray(), aProperties.getConstArray() + aProperties.getLength(), PropertyBagInserter( _rBag ) ); } @@ -638,7 +638,7 @@ namespace pcr } - void EFormsHelper::getAllElementUINames( const ModelElementType _eType, ::std::vector< OUString >& /* [out] */ _rElementNames, bool _bPrepentEmptyEntry ) + void EFormsHelper::getAllElementUINames( const ModelElementType _eType, std::vector< OUString >& /* [out] */ _rElementNames, bool _bPrepentEmptyEntry ) { MapStringToPropertySet& rMapUINameToElement( ( _eType == Submission ) ? m_aSubmissionUINames : m_aBindingUINames ); rMapUINameToElement.clear(); @@ -650,12 +650,12 @@ namespace pcr try { // obtain the model names - ::std::vector< OUString > aModels; + std::vector< OUString > aModels; getFormModelNames( aModels ); _rElementNames.reserve( aModels.size() * 2 ); // heuristics // for every model, obtain the element - for ( ::std::vector< OUString >::const_iterator pModelName = aModels.begin(); + for ( std::vector< OUString >::const_iterator pModelName = aModels.begin(); pModelName != aModels.end(); ++pModelName ) @@ -700,7 +700,7 @@ namespace pcr } _rElementNames.resize( rMapUINameToElement.size() ); - ::std::transform( rMapUINameToElement.begin(), rMapUINameToElement.end(), _rElementNames.begin(), + std::transform( rMapUINameToElement.begin(), rMapUINameToElement.end(), _rElementNames.begin(), ::o3tl::select1st< MapStringToPropertySet::value_type >() ); } @@ -731,7 +731,7 @@ namespace pcr } - void EFormsHelper::firePropertyChanges( const Reference< XPropertySet >& _rxOldProps, const Reference< XPropertySet >& _rxNewProps, ::std::set< OUString >& _rFilter ) const + void EFormsHelper::firePropertyChanges( const Reference< XPropertySet >& _rxOldProps, const Reference< XPropertySet >& _rxNewProps, std::set< OUString >& _rFilter ) const { if ( m_aPropertyListeners.empty() ) return; diff --git a/extensions/source/propctrlr/eformshelper.hxx b/extensions/source/propctrlr/eformshelper.hxx index 96ebc3934269..5cf57aa3283c 100644 --- a/extensions/source/propctrlr/eformshelper.hxx +++ b/extensions/source/propctrlr/eformshelper.hxx @@ -41,7 +41,7 @@ namespace pcr { - typedef ::std::map< OUString, css::uno::Reference< css::beans::XPropertySet >, ::std::less< OUString > > + typedef std::map< OUString, css::uno::Reference< css::beans::XPropertySet >, std::less< OUString > > MapStringToPropertySet; @@ -117,12 +117,12 @@ namespace pcr /** retrieves the names of all XForms models in the document the control lives in */ - void getFormModelNames( ::std::vector< OUString >& /* [out] */ _rModelNames ) const; + void getFormModelNames( std::vector< OUString >& /* [out] */ _rModelNames ) const; /** retrieves the names of all bindings for a given model @see getFormModelNames */ - void getBindingNames( const OUString& _rModelName, ::std::vector< OUString >& /* [out] */ _rBindingNames ) const; + void getBindingNames( const OUString& _rModelName, std::vector< OUString >& /* [out] */ _rBindingNames ) const; /// retrieves the XForms model (within the control model's document) with the given name css::uno::Reference< css::xforms::XModel > @@ -215,7 +215,7 @@ namespace pcr */ void getAllElementUINames( const ModelElementType _eType, - ::std::vector< OUString >& /* [out] */ _rElementNames, + std::vector< OUString >& /* [out] */ _rElementNames, bool _bPrepentEmptyEntry ); @@ -223,7 +223,7 @@ namespace pcr void firePropertyChanges( const css::uno::Reference< css::beans::XPropertySet >& _rxOldProps, const css::uno::Reference< css::beans::XPropertySet >& _rxNewProps, - ::std::set< OUString >& _rFilter + std::set< OUString >& _rFilter ) const; /** fires a change in a single property, if the property value changed, and if we have a listener diff --git a/extensions/source/propctrlr/eformspropertyhandler.cxx b/extensions/source/propctrlr/eformspropertyhandler.cxx index b0d53fd7809f..a02a615a5bda 100644 --- a/extensions/source/propctrlr/eformspropertyhandler.cxx +++ b/extensions/source/propctrlr/eformspropertyhandler.cxx @@ -285,7 +285,7 @@ namespace pcr Sequence< Property > SAL_CALL EFormsPropertyHandler::doDescribeSupportedProperties() const { - ::std::vector< Property > aProperties; + std::vector< Property > aProperties; if ( m_pHelper.get() ) { @@ -386,7 +386,7 @@ namespace pcr if ( !m_pHelper.get() ) return Sequence< OUString >(); - ::std::vector< OUString > aInterestedInActuations( 2 ); + std::vector< OUString > aInterestedInActuations( 2 ); aInterestedInActuations[ 0 ] = PROPERTY_XML_DATA_MODEL; aInterestedInActuations[ 1 ] = PROPERTY_BINDING_NAME; return Sequence< OUString >( &(*aInterestedInActuations.begin()), aInterestedInActuations.size() ); @@ -415,7 +415,7 @@ namespace pcr LineDescriptor aDescriptor; sal_Int16 nControlType = PropertyControlType::TextField; - ::std::vector< OUString > aListEntries; + std::vector< OUString > aListEntries; PropertyId nPropId( impl_getPropertyId_throwUnknownProperty( _rPropertyName ) ); switch ( nPropId ) { diff --git a/extensions/source/propctrlr/eformspropertyhandler.hxx b/extensions/source/propctrlr/eformspropertyhandler.hxx index 7098811940bf..0d7a9488e34a 100644 --- a/extensions/source/propctrlr/eformspropertyhandler.hxx +++ b/extensions/source/propctrlr/eformspropertyhandler.hxx @@ -38,7 +38,7 @@ namespace pcr class EFormsPropertyHandler : public EFormsPropertyHandler_Base { private: - ::std::unique_ptr< EFormsHelper > m_pHelper; + std::unique_ptr< EFormsHelper > m_pHelper; /** current value of the Model property, if there is no binding, yet */ OUString m_sBindingLessModelName; diff --git a/extensions/source/propctrlr/enumrepresentation.hxx b/extensions/source/propctrlr/enumrepresentation.hxx index 550d0dbcad0b..aa8c1f5bd8ea 100644 --- a/extensions/source/propctrlr/enumrepresentation.hxx +++ b/extensions/source/propctrlr/enumrepresentation.hxx @@ -39,7 +39,7 @@ namespace pcr public: /** retrieves all descriptions of all possible values of the enumeration property */ - virtual ::std::vector< OUString > SAL_CALL getDescriptions( + virtual std::vector< OUString > SAL_CALL getDescriptions( ) const = 0; /** converts a given description into a property value diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx index afe2a4063dcf..025199837fbf 100644 --- a/extensions/source/propctrlr/eventhandler.cxx +++ b/extensions/source/propctrlr/eventhandler.cxx @@ -287,7 +287,7 @@ namespace pcr return _rFormComponentEventDescriptor.ListenerType; } - typedef ::std::set< Type, TypeLessByName > TypeBag; + typedef std::set< Type, TypeLessByName > TypeBag; void lcl_addListenerTypesFor_throw( const Reference< XInterface >& _rxComponent, const Reference< XIntrospection >& _rxIntrospection, TypeBag& _out_rTypes ) @@ -301,8 +301,8 @@ namespace pcr Sequence< Type > aListeners( xIntrospectionAccess->getSupportedListeners() ); - ::std::copy( aListeners.begin(), aListeners.end(), - ::std::insert_iterator< TypeBag >( _out_rTypes, _out_rTypes.begin() ) ); + std::copy( aListeners.begin(), aListeners.end(), + std::insert_iterator< TypeBag >( _out_rTypes, _out_rTypes.begin() ) ); } } @@ -313,7 +313,7 @@ namespace pcr { private: typedef std::unordered_map< OUString, ScriptEventDescriptor, OUStringHash > EventMap; - typedef ::std::map< EventId, EventMap::iterator > EventMapIndexAccess; + typedef std::map< EventId, EventMap::iterator > EventMapIndexAccess; EventMap m_aEventNameAccess; EventMapIndexAccess m_aEventIndexAccess; @@ -356,7 +356,7 @@ namespace pcr void EventHolder::addEvent( EventId _nId, const OUString& _rEventName, const ScriptEventDescriptor& _rScriptEvent ) { - ::std::pair< EventMap::iterator, bool > insertionResult = + std::pair< EventMap::iterator, bool > insertionResult = m_aEventNameAccess.insert( EventMap::value_type( _rEventName, _rScriptEvent ) ); OSL_ENSURE( insertionResult.second, "EventHolder::addEvent: there already was a MacroURL for this event!" ); m_aEventIndexAccess[ _nId ] = insertionResult.first; @@ -743,7 +743,7 @@ namespace pcr } // sort them by ID - this is the relative ordering in the UI - ::std::map< EventId, Property > aOrderedProperties; + std::map< EventId, Property > aOrderedProperties; for ( EventMap::const_iterator loop = m_aEvents.begin(); loop != m_aEvents.end(); ++loop @@ -823,7 +823,7 @@ namespace pcr // the initial selection in the dialog Sequence< OUString > aNames( pEventHolder->getElementNames() ); - const OUString* pChosenEvent = ::std::find( aNames.getConstArray(), aNames.getConstArray() + aNames.getLength(), rForEvent.sListenerMethodName ); + const OUString* pChosenEvent = std::find( aNames.getConstArray(), aNames.getConstArray() + aNames.getLength(), rForEvent.sListenerMethodName ); sal_uInt16 nInitialSelection = (sal_uInt16)( pChosenEvent - aNames.getConstArray() ); // the dialog diff --git a/extensions/source/propctrlr/formbrowsertools.hxx b/extensions/source/propctrlr/formbrowsertools.hxx index 15a2ac6ad9e8..eba6ee1155fb 100644 --- a/extensions/source/propctrlr/formbrowsertools.hxx +++ b/extensions/source/propctrlr/formbrowsertools.hxx @@ -36,7 +36,7 @@ namespace pcr sal_Int16 classifyComponent( const css::uno::Reference< css::uno::XInterface >& _rxComponent ); - struct FindPropertyByHandle : public ::std::unary_function< css::beans::Property, bool > + struct FindPropertyByHandle : public std::unary_function< css::beans::Property, bool > { private: sal_Int32 m_nId; @@ -50,7 +50,7 @@ namespace pcr }; - struct FindPropertyByName : public ::std::unary_function< css::beans::Property, bool > + struct FindPropertyByName : public std::unary_function< css::beans::Property, bool > { private: OUString m_sName; @@ -65,7 +65,7 @@ namespace pcr struct PropertyLessByName - :public ::std::binary_function < css::beans::Property, + :public std::binary_function < css::beans::Property, css::beans::Property, bool > @@ -78,7 +78,7 @@ namespace pcr struct TypeLessByName - :public ::std::binary_function < css::uno::Type, + :public std::binary_function < css::uno::Type, css::uno::Type, bool > @@ -90,7 +90,7 @@ namespace pcr }; - typedef ::std::set< css::beans::Property, PropertyLessByName > PropertyBag; + typedef std::set< css::beans::Property, PropertyLessByName > PropertyBag; } // namespace pcr diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx index 0bd51e8d3e1a..3064ce695848 100644 --- a/extensions/source/propctrlr/formcomponenthandler.cxx +++ b/extensions/source/propctrlr/formcomponenthandler.cxx @@ -830,7 +830,7 @@ namespace pcr if ( !m_xComponentPropertyInfo.is() ) return Sequence< Property >(); - ::std::vector< Property > aProperties; + std::vector< Property > aProperties; Sequence< Property > aAllProperties( m_xComponentPropertyInfo->getProperties() ); aProperties.reserve( aAllProperties.getLength() ); @@ -911,7 +911,7 @@ namespace pcr Sequence< OUString > SAL_CALL FormComponentPropertyHandler::getActuatingProperties( ) { ::osl::MutexGuard aGuard( m_aMutex ); - ::std::vector< OUString > aInterestingProperties; + std::vector< OUString > aInterestingProperties; aInterestingProperties.push_back( static_cast<const OUString&>(PROPERTY_DATASOURCE) ); aInterestingProperties.push_back( static_cast<const OUString&>(PROPERTY_COMMAND) ); aInterestingProperties.push_back( static_cast<const OUString&>(PROPERTY_COMMANDTYPE) ); @@ -1241,9 +1241,9 @@ namespace pcr bool bIsEnumProperty = ( nPropertyUIFlags & PROP_FLAG_ENUM ) != 0; if ( bIsEnumProperty || ( PROPERTY_ID_TARGET_FRAME == nPropId ) ) { - ::std::vector< OUString > aEnumValues = m_pInfoService->getPropertyEnumRepresentations( nPropId ); - ::std::vector< OUString >::const_iterator pStart = aEnumValues.begin(); - ::std::vector< OUString >::const_iterator pEnd = aEnumValues.end(); + std::vector< OUString > aEnumValues = m_pInfoService->getPropertyEnumRepresentations( nPropId ); + std::vector< OUString >::const_iterator pStart = aEnumValues.begin(); + std::vector< OUString >::const_iterator pEnd = aEnumValues.end(); // for a checkbox: if "ambiguous" is not allowed, remove this from the sequence if ( ( PROPERTY_ID_DEFAULT_STATE == nPropId ) @@ -1268,8 +1268,8 @@ namespace pcr ++pStart; // copy the sequence - ::std::vector< OUString > aListEntries( pEnd - pStart ); - ::std::copy( pStart, pEnd, aListEntries.begin() ); + std::vector< OUString > aListEntries( pEnd - pStart ); + std::copy( pStart, pEnd, aListEntries.begin() ); // create the control if ( PROPERTY_ID_TARGET_FRAME == nPropId ) @@ -1290,7 +1290,7 @@ namespace pcr aDescriptor.Control = pControl; pControl->setMinValue( Optional< double >( true, 0 ) ); - pControl->setMaxValue( Optional< double >( true, ::std::numeric_limits< double >::max() ) ); + pControl->setMaxValue( Optional< double >( true, std::numeric_limits< double >::max() ) ); } break; @@ -1333,12 +1333,12 @@ namespace pcr { aDescriptor.PrimaryButtonId = UID_PROP_DLG_ATTR_DATASOURCE; - ::std::vector< OUString > aListEntries; + std::vector< OUString > aListEntries; Reference< XDatabaseContext > xDatabaseContext = sdb::DatabaseContext::create( m_xContext ); Sequence< OUString > aDatasources = xDatabaseContext->getElementNames(); aListEntries.resize( aDatasources.getLength() ); - ::std::copy( aDatasources.begin(), aDatasources.end(), aListEntries.begin() ); + std::copy( aDatasources.begin(), aDatasources.end(), aListEntries.begin() ); aDescriptor.Control = PropertyHandlerHelper::createComboBoxControl( _rxControlFactory, aListEntries, false, true ); } @@ -1346,7 +1346,7 @@ namespace pcr case PROPERTY_ID_CONTROLSOURCE: { - ::std::vector< OUString > aFieldNames; + std::vector< OUString > aFieldNames; impl_initFieldList_nothrow( aFieldNames ); aDescriptor.Control = PropertyHandlerHelper::createComboBoxControl( _rxControlFactory, aFieldNames, false, false ); @@ -1498,7 +1498,7 @@ namespace pcr ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nActuatingPropId( impl_getPropertyId_nothrow( _rActuatingPropertyName ) ); - ::std::vector< PropertyId > aDependentProperties; + std::vector< PropertyId > aDependentProperties; switch ( nActuatingPropId ) { @@ -1768,7 +1768,7 @@ namespace pcr } // switch ( nActuatingPropId ) - for ( ::std::vector< PropertyId >::const_iterator loopAffected = aDependentProperties.begin(); + for ( std::vector< PropertyId >::const_iterator loopAffected = aDependentProperties.begin(); loopAffected != aDependentProperties.end(); ++loopAffected ) @@ -2327,7 +2327,7 @@ namespace pcr } - void FormComponentPropertyHandler::impl_initFieldList_nothrow( ::std::vector< OUString >& _rFieldNames ) const + void FormComponentPropertyHandler::impl_initFieldList_nothrow( std::vector< OUString >& _rFieldNames ) const { clearContainer( _rFieldNames ); try @@ -2451,7 +2451,7 @@ namespace pcr case CommandType::TABLE: case CommandType::QUERY: { - ::std::vector< OUString > aNames; + std::vector< OUString > aNames; if ( impl_ensureRowsetConnection_nothrow() ) { if ( nCommandType == CommandType::TABLE ) @@ -2476,7 +2476,7 @@ namespace pcr } - void FormComponentPropertyHandler::impl_fillTableNames_throw( ::std::vector< OUString >& _out_rNames ) const + void FormComponentPropertyHandler::impl_fillTableNames_throw( std::vector< OUString >& _out_rNames ) const { OSL_PRECOND( m_xRowSetConnection.is(), "FormComponentPropertyHandler::impl_fillTableNames_throw: need a connection!" ); _out_rNames.resize( 0 ); @@ -2498,7 +2498,7 @@ namespace pcr } - void FormComponentPropertyHandler::impl_fillQueryNames_throw( ::std::vector< OUString >& _out_rNames ) const + void FormComponentPropertyHandler::impl_fillQueryNames_throw( std::vector< OUString >& _out_rNames ) const { OSL_PRECOND( m_xRowSetConnection.is(), "FormComponentPropertyHandler::impl_fillQueryNames_throw: need a connection!" ); _out_rNames.resize( 0 ); @@ -2512,7 +2512,7 @@ namespace pcr } } - void FormComponentPropertyHandler::impl_fillQueryNames_throw( const Reference< XNameAccess >& _xQueryNames,::std::vector< OUString >& _out_rNames,const OUString& _sName ) const + void FormComponentPropertyHandler::impl_fillQueryNames_throw( const Reference< XNameAccess >& _xQueryNames,std::vector< OUString >& _out_rNames,const OUString& _sName ) const { DBG_ASSERT( _xQueryNames.is(), "FormComponentPropertyHandler::impl_fillQueryNames_throw: no way to obtain the queries of the connection!" ); if ( !_xQueryNames.is() ) @@ -2567,7 +2567,7 @@ namespace pcr case ListSourceType_TABLE: case ListSourceType_QUERY: { - ::std::vector< OUString > aListEntries; + std::vector< OUString > aListEntries; if ( impl_ensureRowsetConnection_nothrow() ) { if ( nListSourceType == ListSourceType_QUERY ) diff --git a/extensions/source/propctrlr/formcomponenthandler.hxx b/extensions/source/propctrlr/formcomponenthandler.hxx index d0afdf3c8c9a..6d16fa684811 100644 --- a/extensions/source/propctrlr/formcomponenthandler.hxx +++ b/extensions/source/propctrlr/formcomponenthandler.hxx @@ -81,7 +81,7 @@ namespace pcr /// the string indicating a "default" (VOID) value in list-like controls OUString m_sDefaultValueString; /// all properties to whose control's we added ->m_sDefaultValueString - ::std::set< OUString > m_aPropertiesWithDefListEntry; + std::set< OUString > m_aPropertiesWithDefListEntry; /// type of our component ComponentClassification m_eComponentClass; /// is our component a (database) sub form? @@ -159,7 +159,7 @@ namespace pcr /** initializes the list of field names, if we're handling a control which supports the DataField property */ - void impl_initFieldList_nothrow( ::std::vector< OUString >& rFieldNames ) const; + void impl_initFieldList_nothrow( std::vector< OUString >& rFieldNames ) const; /** obtaines the RowSet to which our component belongs @@ -207,14 +207,14 @@ namespace pcr @precond m_xRowSetConnection is not <NULL/> */ - void impl_fillTableNames_throw( ::std::vector< OUString >& _out_rNames ) const; + void impl_fillTableNames_throw( std::vector< OUString >& _out_rNames ) const; /** describes the UI for selecting a query name @precond m_xRowSetConnection is not <NULL/> */ - void impl_fillQueryNames_throw( ::std::vector< OUString >& _out_rNames ) const; + void impl_fillQueryNames_throw( std::vector< OUString >& _out_rNames ) const; /** describes the UI for selecting a query name @@ -222,7 +222,7 @@ namespace pcr m_xRowSetConnection is not <NULL/> */ void impl_fillQueryNames_throw( const css::uno::Reference< css::container::XNameAccess >& _xQueryNames - ,::std::vector< OUString >& _out_rNames + ,std::vector< OUString >& _out_rNames ,const OUString& _sName = OUString() ) const; /** describes the UI for selecting a ListSource (for list-like form controls) @@ -441,7 +441,7 @@ namespace pcr class WaitCursor { private: - ::std::unique_ptr< WaitObject > m_aWaitObject; + std::unique_ptr< WaitObject > m_aWaitObject; public: explicit WaitCursor( vcl::Window* _pWindow ) diff --git a/extensions/source/propctrlr/formgeometryhandler.cxx b/extensions/source/propctrlr/formgeometryhandler.cxx index e7b66273d48a..31f7c0ec5860 100644 --- a/extensions/source/propctrlr/formgeometryhandler.cxx +++ b/extensions/source/propctrlr/formgeometryhandler.cxx @@ -542,7 +542,7 @@ namespace pcr if ( !m_xAssociatedShape.is() ) return Sequence< Property >(); - ::std::vector< Property > aProperties; + std::vector< Property > aProperties; addInt32PropertyDescription( aProperties, PROPERTY_POSITIONX ); addInt32PropertyDescription( aProperties, PROPERTY_POSITIONY ); @@ -722,7 +722,7 @@ namespace pcr { ::comphelper::ComponentMethodGuard aGuard( *this ); - ::std::vector< EventTranslation > aEventTranslations; + std::vector< EventTranslation > aEventTranslations; aEventTranslations.reserve(2); if ( _event.PropertyName == "Position" ) @@ -750,7 +750,7 @@ namespace pcr aTranslatedEvent.Source = m_rParent; aGuard.clear(); - for ( ::std::vector< EventTranslation >::const_iterator t = aEventTranslations.begin(); + for ( std::vector< EventTranslation >::const_iterator t = aEventTranslations.begin(); t != aEventTranslations.end(); ++t ) diff --git a/extensions/source/propctrlr/formlinkdialog.cxx b/extensions/source/propctrlr/formlinkdialog.cxx index b665f7a090c0..381934abb9c5 100644 --- a/extensions/source/propctrlr/formlinkdialog.cxx +++ b/extensions/source/propctrlr/formlinkdialog.cxx @@ -221,8 +221,8 @@ namespace pcr void FormLinkDialog::commitLinkPairs() { // collect the field lists from the rows - ::std::vector< OUString > aDetailFields; aDetailFields.reserve( 4 ); - ::std::vector< OUString > aMasterFields; aMasterFields.reserve( 4 ); + std::vector< OUString > aDetailFields; aDetailFields.reserve( 4 ); + std::vector< OUString > aMasterFields; aMasterFields.reserve( 4 ); const FieldLinkRow* aRows[] = { m_aRow1.get(), m_aRow2.get(), m_aRow3.get(), m_aRow4.get() diff --git a/extensions/source/propctrlr/formmetadata.cxx b/extensions/source/propctrlr/formmetadata.cxx index 3f91a2a8b2e7..fbde6278cf7e 100644 --- a/extensions/source/propctrlr/formmetadata.cxx +++ b/extensions/source/propctrlr/formmetadata.cxx @@ -66,7 +66,7 @@ namespace pcr // Compare PropertyInfo - struct PropertyInfoLessByName : public ::std::binary_function< OPropertyInfoImpl, OPropertyInfoImpl, bool > + struct PropertyInfoLessByName : public std::binary_function< OPropertyInfoImpl, OPropertyInfoImpl, bool > { bool operator()( const OPropertyInfoImpl& _rLHS, const OPropertyInfoImpl& _rRHS ) { @@ -346,7 +346,7 @@ namespace pcr s_nCount = SAL_N_ELEMENTS(aPropertyInfos); // sort - ::std::sort( s_pPropertyInfos, s_pPropertyInfos + s_nCount, PropertyInfoLessByName() ); + std::sort( s_pPropertyInfos, s_pPropertyInfos + s_nCount, PropertyInfoLessByName() ); #if OSL_DEBUG_LEVEL > 0 for ( const OPropertyInfoImpl* pCheck = s_pPropertyInfos; pCheck != s_pPropertyInfos + s_nCount - 1; ++pCheck ) @@ -394,7 +394,7 @@ namespace pcr } - ::std::vector< OUString > OPropertyInfoService::getPropertyEnumRepresentations(sal_Int32 _nId) const + std::vector< OUString > OPropertyInfoService::getPropertyEnumRepresentations(sal_Int32 _nId) const { OSL_ENSURE( ( ( getPropertyUIFlags( _nId ) & PROP_FLAG_ENUM ) != 0 ) || ( _nId == PROPERTY_ID_TARGET_FRAME ), "OPropertyInfoService::getPropertyEnumRepresentations: this is no enum property!" ); @@ -530,7 +530,7 @@ namespace pcr getPropertyInfo(); OPropertyInfoImpl aSearch(_rName, 0L, OUString(), 0, "", 0); - const OPropertyInfoImpl* pInfo = ::std::lower_bound( + const OPropertyInfoImpl* pInfo = std::lower_bound( s_pPropertyInfos, s_pPropertyInfos + s_nCount, aSearch, PropertyInfoLessByName() ); if ( pInfo == s_pPropertyInfos + s_nCount ) @@ -574,7 +574,7 @@ namespace pcr } - ::std::vector< OUString > SAL_CALL DefaultEnumRepresentation::getDescriptions() const + std::vector< OUString > SAL_CALL DefaultEnumRepresentation::getDescriptions() const { return m_rMetaData.getPropertyEnumRepresentations( m_nPropertyId ); } @@ -583,8 +583,8 @@ namespace pcr void SAL_CALL DefaultEnumRepresentation::getValueFromDescription( const OUString& _rDescription, Any& _out_rValue ) const { sal_uInt32 nPropertyUIFlags = m_rMetaData.getPropertyUIFlags( m_nPropertyId ); - ::std::vector< OUString > aEnumStrings = m_rMetaData.getPropertyEnumRepresentations( m_nPropertyId ); - ::std::vector< OUString >::const_iterator pos = ::std::find( aEnumStrings.begin(), aEnumStrings.end(), _rDescription ); + std::vector< OUString > aEnumStrings = m_rMetaData.getPropertyEnumRepresentations( m_nPropertyId ); + std::vector< OUString >::const_iterator pos = std::find( aEnumStrings.begin(), aEnumStrings.end(), _rDescription ); if ( pos != aEnumStrings.end() ) { sal_Int32 nPos = pos - aEnumStrings.begin(); @@ -634,7 +634,7 @@ namespace pcr // enum value starting with 1 --nIntValue; - ::std::vector< OUString > aEnumStrings = m_rMetaData.getPropertyEnumRepresentations( m_nPropertyId ); + std::vector< OUString > aEnumStrings = m_rMetaData.getPropertyEnumRepresentations( m_nPropertyId ); if ( ( nIntValue >= 0 ) && ( nIntValue < (sal_Int32)aEnumStrings.size() ) ) { sReturn = aEnumStrings[ nIntValue ]; diff --git a/extensions/source/propctrlr/formmetadata.hxx b/extensions/source/propctrlr/formmetadata.hxx index 0c9f36904249..a851732f3d7c 100644 --- a/extensions/source/propctrlr/formmetadata.hxx +++ b/extensions/source/propctrlr/formmetadata.hxx @@ -50,7 +50,7 @@ namespace pcr virtual OString getPropertyHelpId(sal_Int32 _nId) const override; virtual sal_Int16 getPropertyPos(sal_Int32 _nId) const override; virtual sal_uInt32 getPropertyUIFlags(sal_Int32 _nId) const override; - virtual ::std::vector< OUString > getPropertyEnumRepresentations(sal_Int32 _nId) const override; + virtual std::vector< OUString > getPropertyEnumRepresentations(sal_Int32 _nId) const override; bool isComposeable( const OUString& _rPropertyName ) const; @@ -89,7 +89,7 @@ namespace pcr protected: // IPropertyEnumRepresentation implementqation - virtual ::std::vector< OUString > + virtual std::vector< OUString > SAL_CALL getDescriptions() const override; virtual void SAL_CALL getValueFromDescription( const OUString& _rDescription, css::uno::Any& _out_rValue ) const override; virtual OUString SAL_CALL getDescriptionForValue( const css::uno::Any& _rEnumValue ) const override; diff --git a/extensions/source/propctrlr/genericpropertyhandler.cxx b/extensions/source/propctrlr/genericpropertyhandler.cxx index 4250f6a82af0..de446b6116e4 100644 --- a/extensions/source/propctrlr/genericpropertyhandler.cxx +++ b/extensions/source/propctrlr/genericpropertyhandler.cxx @@ -75,7 +75,7 @@ namespace pcr EnumRepresentation& operator=(const EnumRepresentation&) = delete; // IPropertyEnumRepresentation implementqation - virtual ::std::vector< OUString > + virtual std::vector< OUString > SAL_CALL getDescriptions() const override; virtual void SAL_CALL getValueFromDescription( const OUString& _rDescription, css::uno::Any& _out_rValue ) const override; virtual OUString SAL_CALL getDescriptionForValue( const css::uno::Any& _rEnumValue ) const override; @@ -104,7 +104,7 @@ namespace pcr } } - ::std::vector< OUString > EnumRepresentation::getDescriptions() const + std::vector< OUString > EnumRepresentation::getDescriptions() const { Sequence< OUString > aNames; try @@ -117,7 +117,7 @@ namespace pcr OSL_FAIL( "EnumRepresentation::getDescriptions: caught an exception!" ); } - return ::std::vector< OUString >( aNames.getConstArray(), aNames.getConstArray() + aNames.getLength() ); + return std::vector< OUString >( aNames.getConstArray(), aNames.getConstArray() + aNames.getLength() ); } void EnumRepresentation::impl_getValues( Sequence< sal_Int32 >& _out_rValues ) const @@ -136,9 +136,9 @@ namespace pcr void EnumRepresentation::getValueFromDescription( const OUString& _rDescription, Any& _out_rValue ) const { - ::std::vector< OUString > aDescriptions( getDescriptions() ); + std::vector< OUString > aDescriptions( getDescriptions() ); - sal_Int32 index = ::std::find( aDescriptions.begin(), aDescriptions.end(), + sal_Int32 index = std::find( aDescriptions.begin(), aDescriptions.end(), _rDescription ) - aDescriptions.begin(); Sequence< sal_Int32 > aValues; @@ -163,10 +163,10 @@ namespace pcr Sequence< sal_Int32 > aValues; impl_getValues( aValues ); - sal_Int32 index = ::std::find( aValues.getConstArray(), aValues.getConstArray() + aValues.getLength(), + sal_Int32 index = std::find( aValues.getConstArray(), aValues.getConstArray() + aValues.getLength(), nAsInt ) - aValues.getConstArray(); - ::std::vector< OUString > aDescriptions( getDescriptions() ); + std::vector< OUString > aDescriptions( getDescriptions() ); if ( ( index >= 0 ) && ( index < (sal_Int32)aDescriptions.size() ) ) sDescription = aDescriptions[ index ]; else diff --git a/extensions/source/propctrlr/genericpropertyhandler.hxx b/extensions/source/propctrlr/genericpropertyhandler.hxx index c64ff2da0068..1ba3b328957d 100644 --- a/extensions/source/propctrlr/genericpropertyhandler.hxx +++ b/extensions/source/propctrlr/genericpropertyhandler.hxx @@ -38,7 +38,7 @@ namespace pcr { - struct TypeLess : ::std::binary_function< css::uno::Type, css::uno::Type, bool > + struct TypeLess : std::binary_function< css::uno::Type, css::uno::Type, bool > { bool operator()( const css::uno::Type& _rLHS, const css::uno::Type& _rRHS ) const { @@ -73,7 +73,7 @@ namespace pcr PropertyMap m_aProperties; /// property change listeners ::comphelper::OInterfaceContainerHelper2 m_aPropertyListeners; - ::std::map< css::uno::Type, ::rtl::Reference< IPropertyEnumRepresentation >, TypeLess > + std::map< css::uno::Type, ::rtl::Reference< IPropertyEnumRepresentation >, TypeLess > m_aEnumConverters; /// has ->m_aProperties been initialized? diff --git a/extensions/source/propctrlr/handlerhelper.cxx b/extensions/source/propctrlr/handlerhelper.cxx index 7bdd98b4fe98..83a3c6fa9aac 100644 --- a/extensions/source/propctrlr/handlerhelper.cxx +++ b/extensions/source/propctrlr/handlerhelper.cxx @@ -114,7 +114,7 @@ namespace pcr { Reference< XPropertyControl > lcl_implCreateListLikeControl( const Reference< XPropertyControlFactory >& _rxControlFactory, - const ::std::vector< OUString >& _rInitialListEntries, + const std::vector< OUString >& _rInitialListEntries, bool _bReadOnlyControl, bool _bSorted, bool _bTrueIfListBoxFalseIfComboBox @@ -127,11 +127,11 @@ namespace pcr UNO_QUERY_THROW ); - ::std::vector< OUString > aInitialEntries( _rInitialListEntries ); + std::vector< OUString > aInitialEntries( _rInitialListEntries ); if ( _bSorted ) - ::std::sort( aInitialEntries.begin(), aInitialEntries.end() ); + std::sort( aInitialEntries.begin(), aInitialEntries.end() ); - for ( ::std::vector< OUString >::const_iterator loop = aInitialEntries.begin(); + for ( std::vector< OUString >::const_iterator loop = aInitialEntries.begin(); loop != aInitialEntries.end(); ++loop ) @@ -141,7 +141,7 @@ namespace pcr } Reference< XPropertyControl > PropertyHandlerHelper::createListBoxControl( const Reference< XPropertyControlFactory >& _rxControlFactory, - const ::std::vector< OUString >& _rInitialListEntries, bool _bReadOnlyControl, bool _bSorted ) + const std::vector< OUString >& _rInitialListEntries, bool _bReadOnlyControl, bool _bSorted ) { return lcl_implCreateListLikeControl(_rxControlFactory, _rInitialListEntries, _bReadOnlyControl, _bSorted, true); } @@ -156,7 +156,7 @@ namespace pcr } Reference< XPropertyControl > PropertyHandlerHelper::createComboBoxControl( const Reference< XPropertyControlFactory >& _rxControlFactory, - const ::std::vector< OUString >& _rInitialListEntries, bool _bReadOnlyControl, bool _bSorted ) + const std::vector< OUString >& _rInitialListEntries, bool _bReadOnlyControl, bool _bSorted ) { return lcl_implCreateListLikeControl( _rxControlFactory, _rInitialListEntries, _bReadOnlyControl, _bSorted, false ); } diff --git a/extensions/source/propctrlr/handlerhelper.hxx b/extensions/source/propctrlr/handlerhelper.hxx index 8e1f7f47f8ab..64b0e9fa0484 100644 --- a/extensions/source/propctrlr/handlerhelper.hxx +++ b/extensions/source/propctrlr/handlerhelper.hxx @@ -94,7 +94,7 @@ namespace pcr static css::uno::Reference< css::inspection::XPropertyControl > createListBoxControl( const css::uno::Reference< css::inspection::XPropertyControlFactory >& _rxControlFactory, - const ::std::vector< OUString >& _rInitialListEntries, + const std::vector< OUString >& _rInitialListEntries, bool _bReadOnlyControl, bool _bSorted ); @@ -146,7 +146,7 @@ namespace pcr static css::uno::Reference< css::inspection::XPropertyControl > createComboBoxControl( const css::uno::Reference< css::inspection::XPropertyControlFactory >& _rxControlFactory, - const ::std::vector< OUString >& _rInitialListEntries, + const std::vector< OUString >& _rInitialListEntries, bool _bReadOnlyControl, bool _bSorted ); diff --git a/extensions/source/propctrlr/inspectorhelpwindow.cxx b/extensions/source/propctrlr/inspectorhelpwindow.cxx index ddf871e5e752..5641015f5461 100644 --- a/extensions/source/propctrlr/inspectorhelpwindow.cxx +++ b/extensions/source/propctrlr/inspectorhelpwindow.cxx @@ -116,7 +116,7 @@ namespace pcr DrawTextFlags::Left | DrawTextFlags::Top | DrawTextFlags::MultiLine | DrawTextFlags::WordBreak ); long nActTextWindowHeight = impl_getHelpTextBorderHeight() + aTextRect.GetHeight(); - long nOptTextWindowHeight = ::std::max( nMinTextWindowHeight, ::std::min( nMaxTextWindowHeight, nActTextWindowHeight ) ); + long nOptTextWindowHeight = std::max( nMinTextWindowHeight, std::min( nMaxTextWindowHeight, nActTextWindowHeight ) ); // --- then add the space above the text window return nOptTextWindowHeight + impl_getSpaceAboveTextWindow(); diff --git a/extensions/source/propctrlr/inspectormodelbase.cxx b/extensions/source/propctrlr/inspectormodelbase.cxx index 31009a8e0682..1d62e50ce517 100644 --- a/extensions/source/propctrlr/inspectormodelbase.cxx +++ b/extensions/source/propctrlr/inspectormodelbase.cxx @@ -61,7 +61,7 @@ namespace pcr sal_Int32 m_nMinHelpTextLines; sal_Int32 m_nMaxHelpTextLines; bool m_bIsReadOnly; - ::std::unique_ptr< ::cppu::IPropertyArrayHelper > + std::unique_ptr< ::cppu::IPropertyArrayHelper > m_pPropertyInfo; public: diff --git a/extensions/source/propctrlr/inspectormodelbase.hxx b/extensions/source/propctrlr/inspectormodelbase.hxx index 365740653002..654f69135f83 100644 --- a/extensions/source/propctrlr/inspectormodelbase.hxx +++ b/extensions/source/propctrlr/inspectormodelbase.hxx @@ -54,7 +54,7 @@ namespace pcr ,public ImplInspectorModel_PBase { protected: - ::std::unique_ptr< InspectorModelProperties > m_pProperties; + std::unique_ptr< InspectorModelProperties > m_pProperties; protected: virtual ~ImplInspectorModel() override; diff --git a/extensions/source/propctrlr/newdatatype.cxx b/extensions/source/propctrlr/newdatatype.cxx index 0fae03df4f7d..1f109ce39a08 100644 --- a/extensions/source/propctrlr/newdatatype.cxx +++ b/extensions/source/propctrlr/newdatatype.cxx @@ -28,7 +28,7 @@ namespace pcr //= NewDataTypeDialog - NewDataTypeDialog::NewDataTypeDialog( vcl::Window* _pParent, const OUString& _rNameBase, const ::std::vector< OUString >& _rProhibitedNames ) + NewDataTypeDialog::NewDataTypeDialog( vcl::Window* _pParent, const OUString& _rNameBase, const std::vector< OUString >& _rProhibitedNames ) : ModalDialog( _pParent, "DataTypeDialog", "modules/spropctrlr/ui/datatypedialog.ui" ) , m_aProhibitedNames( _rProhibitedNames.begin(), _rProhibitedNames.end() ) diff --git a/extensions/source/propctrlr/newdatatype.hxx b/extensions/source/propctrlr/newdatatype.hxx index e45a8a4a1e1b..9185d1f02100 100644 --- a/extensions/source/propctrlr/newdatatype.hxx +++ b/extensions/source/propctrlr/newdatatype.hxx @@ -38,11 +38,11 @@ namespace pcr VclPtr<Edit> m_pName; VclPtr<OKButton> m_pOK; - ::std::set< OUString > m_aProhibitedNames; + std::set< OUString > m_aProhibitedNames; public: NewDataTypeDialog(vcl::Window* _pParent, const OUString& _rNameBase, - const ::std::vector< OUString >& _rProhibitedNames ); + const std::vector< OUString >& _rProhibitedNames ); virtual ~NewDataTypeDialog() override; virtual void dispose() override; diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx index 0d0ab634117d..100a34ffb0e1 100644 --- a/extensions/source/propctrlr/propcontroller.cxx +++ b/extensions/source/propctrlr/propcontroller.cxx @@ -418,7 +418,7 @@ namespace pcr ++handler ) { - if ( ::std::find( aAllHandlers.begin(), aAllHandlers.end(), handler->second ) != aAllHandlers.end() ) + if ( std::find( aAllHandlers.begin(), aAllHandlers.end(), handler->second ) != aAllHandlers.end() ) // already visited this particular handler (m_aPropertyHandlers usually contains // the same handler more than once) continue; @@ -890,7 +890,7 @@ namespace pcr aHandler != m_aPropertyHandlers.end(); ++aHandler ) - if ( ::std::find( aAllHandlers.begin(), aAllHandlers.end(), aHandler->second ) == aAllHandlers.end() ) + if ( std::find( aAllHandlers.begin(), aAllHandlers.end(), aHandler->second ) == aAllHandlers.end() ) aAllHandlers.push_back( aHandler->second ); for ( PropertyHandlerArray::iterator loop = aAllHandlers.begin(); @@ -968,7 +968,7 @@ namespace pcr { // obtain the properties of the object - ::std::vector< Property > aProperties; + std::vector< Property > aProperties; PropertyHandlerArray aPropertyHandlers; getPropertyHandlers( m_aInspectedObjects, aPropertyHandlers ); @@ -992,7 +992,7 @@ namespace pcr aProperties.reserve( aProperties.size() + aThisHandlersProperties.size() ); for (const auto & aThisHandlersPropertie : aThisHandlersProperties) { - ::std::vector< Property >::const_iterator previous = ::std::find_if( + std::vector< Property >::const_iterator previous = std::find_if( aProperties.begin(), aProperties.end(), FindPropertyByName( aThisHandlersPropertie.Name ) @@ -1011,7 +1011,7 @@ namespace pcr // This is 'cause we have a new handler which is responsible for this property, // which means it can give it a completely different meaning than the previous // handler for this property is prepared for. - ::std::pair< PropertyHandlerMultiRepository::iterator, PropertyHandlerMultiRepository::iterator > + std::pair< PropertyHandlerMultiRepository::iterator, PropertyHandlerMultiRepository::iterator > aDepHandlers = m_aDependencyHandlers.equal_range( aThisHandlersPropertie.Name ); m_aDependencyHandlers.erase( aDepHandlers.first, aDepHandlers.second ); } @@ -1020,7 +1020,7 @@ namespace pcr StlSyntaxSequence< OUString > aSupersededByThisHandler( (*aHandler)->getSupersededProperties() ); for (const auto & superseded : aSupersededByThisHandler) { - ::std::vector< Property >::iterator existent = ::std::find_if( + std::vector< Property >::iterator existent = std::find_if( aProperties.begin(), aProperties.end(), FindPropertyByName( superseded ) @@ -1058,7 +1058,7 @@ namespace pcr m_pUIRequestComposer.reset( new ComposedPropertyUIUpdate( getInspectorUI(), this ) ); // sort the properties by relative position, as indicated by the model - for ( ::std::vector< Property >::const_iterator sourceProps = aProperties.begin(); + for ( std::vector< Property >::const_iterator sourceProps = aProperties.begin(); sourceProps != aProperties.end(); ++sourceProps ) @@ -1186,12 +1186,12 @@ namespace pcr // create our tab pages impl_buildCategories_throw(); // (and allow for pages to be actually unused) - ::std::set< sal_uInt16 > aUsedPages; + std::set< sal_uInt16 > aUsedPages; // when building the UI below, remember which properties are actuating, // to allow for a initial actuatinPropertyChanged call - ::std::vector< OUString > aActuatingProperties; - ::std::vector< Any > aActuatingPropertyValues; + std::vector< OUString > aActuatingProperties; + std::vector< Any > aActuatingPropertyValues; // ask the handlers to describe the property UI, and insert the resulting // entries into our list boxes @@ -1236,8 +1236,8 @@ namespace pcr // update any dependencies for the actuating properties which we encountered { - ::std::vector< OUString >::const_iterator aProperty = aActuatingProperties.begin(); - ::std::vector< Any >::const_iterator aPropertyValue = aActuatingPropertyValues.begin(); + std::vector< OUString >::const_iterator aProperty = aActuatingProperties.begin(); + std::vector< Any >::const_iterator aPropertyValue = aActuatingPropertyValues.begin(); for ( ; aProperty != aActuatingProperties.end(); ++aProperty, ++aPropertyValue ) impl_broadcastPropertyChange_nothrow( *aProperty, *aPropertyValue, *aPropertyValue, true ); } @@ -1485,8 +1485,8 @@ namespace pcr else { // create a single handler for every single object - ::std::vector< Reference< XPropertyHandler > > aSingleHandlers( _rObjects.size() ); - ::std::vector< Reference< XPropertyHandler > >::iterator pHandler = aSingleHandlers.begin(); + std::vector< Reference< XPropertyHandler > > aSingleHandlers( _rObjects.size() ); + std::vector< Reference< XPropertyHandler > >::iterator pHandler = aSingleHandlers.begin(); InterfaceArray::const_iterator pObject = _rObjects.begin(); InterfaceArray::const_iterator pObjectEnd = _rObjects.end(); @@ -1694,7 +1694,7 @@ namespace pcr void OPropertyBrowserController::impl_broadcastPropertyChange_nothrow( const OUString& _rPropertyName, const Any& _rNewValue, const Any& _rOldValue, bool _bFirstTimeInit ) const { // are there one or more handlers which are interested in the actuation? - ::std::pair< PropertyHandlerMultiRepository::const_iterator, PropertyHandlerMultiRepository::const_iterator > aInterestedHandlers = + std::pair< PropertyHandlerMultiRepository::const_iterator, PropertyHandlerMultiRepository::const_iterator > aInterestedHandlers = m_aDependencyHandlers.equal_range( _rPropertyName ); if ( aInterestedHandlers.first == aInterestedHandlers.second ) // none of our handlers is interested in this diff --git a/extensions/source/propctrlr/propcontroller.hxx b/extensions/source/propctrlr/propcontroller.hxx index 23180e88d25e..f80d19eea8e8 100644 --- a/extensions/source/propctrlr/propcontroller.hxx +++ b/extensions/source/propctrlr/propcontroller.hxx @@ -90,8 +90,8 @@ namespace pcr ,public IPropertyExistenceCheck { private: - typedef ::std::multimap< sal_Int32, css::beans::Property > OrderedPropertyMap; - typedef ::std::vector< css::uno::Reference< css::uno::XInterface > > + typedef std::multimap< sal_Int32, css::beans::Property > OrderedPropertyMap; + typedef std::vector< css::uno::Reference< css::uno::XInterface > > InterfaceArray; protected: @@ -111,7 +111,7 @@ namespace pcr typedef css::uno::Reference< css::inspection::XPropertyHandler > PropertyHandlerRef; - typedef ::std::vector< PropertyHandlerRef > PropertyHandlerArray; + typedef std::vector< PropertyHandlerRef > PropertyHandlerArray; typedef std::unordered_map< OUString, PropertyHandlerRef, OUStringHash > PropertyHandlerRepository; typedef std::unordered_multimap< OUString, PropertyHandlerRef, OUStringHash > @@ -120,7 +120,7 @@ namespace pcr PropertyHandlerMultiRepository m_aDependencyHandlers; PropertyHandlerRef m_xInteractiveHandler; - ::std::unique_ptr< ComposedPropertyUIUpdate > m_pUIRequestComposer; + std::unique_ptr< ComposedPropertyUIUpdate > m_pUIRequestComposer; /// our InspectorModel css::uno::Reference< css::inspection::XObjectInspectorModel > diff --git a/extensions/source/propctrlr/propertycomposer.cxx b/extensions/source/propctrlr/propertycomposer.cxx index 1ea3b7a00d7e..4c51d017dafe 100644 --- a/extensions/source/propctrlr/propertycomposer.cxx +++ b/extensions/source/propctrlr/propertycomposer.cxx @@ -46,7 +46,7 @@ namespace pcr namespace { - struct SetPropertyValue : public ::std::unary_function< Reference< XPropertyHandler >, void > + struct SetPropertyValue : public std::unary_function< Reference< XPropertyHandler >, void > { OUString sPropertyName; const Any& rValue; @@ -61,8 +61,8 @@ namespace pcr template < class BagType > void putIntoBag( const Sequence< typename BagType::value_type >& _rArray, BagType& /* [out] */ _rBag ) { - ::std::copy( _rArray.begin(), _rArray.end(), - ::std::insert_iterator< BagType >( _rBag, _rBag.begin() ) ); + std::copy( _rArray.begin(), _rArray.end(), + std::insert_iterator< BagType >( _rBag, _rBag.begin() ) ); } @@ -70,7 +70,7 @@ namespace pcr void copyBagToArray( const BagType& /* [out] */ _rBag, Sequence< typename BagType::value_type >& _rArray ) { _rArray.realloc( _rBag.size() ); - ::std::copy( _rBag.begin(), _rBag.end(), _rArray.getArray() ); + std::copy( _rBag.begin(), _rBag.end(), _rArray.getArray() ); } } @@ -84,7 +84,7 @@ namespace pcr // of supported properties per handler). Shouldn't we cache this? So that it is O( log k )? - PropertyComposer::PropertyComposer( const ::std::vector< Reference< XPropertyHandler > >& _rSlaveHandlers ) + PropertyComposer::PropertyComposer( const std::vector< Reference< XPropertyHandler > >& _rSlaveHandlers ) :PropertyComposer_Base ( m_aMutex ) ,m_aSlaveHandlers ( _rSlaveHandlers ) ,m_aPropertyListeners ( m_aMutex ) @@ -134,7 +134,7 @@ namespace pcr void SAL_CALL PropertyComposer::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) { MethodGuard aGuard( *this ); - ::std::for_each( m_aSlaveHandlers.begin(), m_aSlaveHandlers.end(), SetPropertyValue( _rPropertyName, _rValue ) ); + std::for_each( m_aSlaveHandlers.begin(), m_aSlaveHandlers.end(), SetPropertyValue( _rPropertyName, _rValue ) ); } @@ -228,8 +228,8 @@ namespace pcr // the intersection of those properties with all we already have PropertyBag aIntersection; - ::std::set_intersection( aThisRound.begin(), aThisRound.end(), m_aSupportedProperties.begin(), m_aSupportedProperties.end(), - ::std::insert_iterator< PropertyBag >( aIntersection, aIntersection.begin() ), PropertyLessByName() ); + std::set_intersection( aThisRound.begin(), aThisRound.end(), m_aSupportedProperties.begin(), m_aSupportedProperties.end(), + std::insert_iterator< PropertyBag >( aIntersection, aIntersection.begin() ), PropertyLessByName() ); m_aSupportedProperties.swap( aIntersection ); if ( m_aSupportedProperties.empty() ) @@ -262,7 +262,7 @@ namespace pcr void uniteStringArrays( const PropertyComposer::HandlerArray& _rHandlers, Sequence< OUString > (SAL_CALL XPropertyHandler::*pGetter)( void ), Sequence< OUString >& /* [out] */ _rUnion ) { - ::std::set< OUString > aUnitedBag; + std::set< OUString > aUnitedBag; Sequence< OUString > aThisRound; for ( PropertyComposer::HandlerArray::const_iterator loop = _rHandlers.begin(); diff --git a/extensions/source/propctrlr/propertycomposer.hxx b/extensions/source/propctrlr/propertycomposer.hxx index 248500e74919..6a034a9f6436 100644 --- a/extensions/source/propctrlr/propertycomposer.hxx +++ b/extensions/source/propctrlr/propertycomposer.hxx @@ -54,12 +54,12 @@ namespace pcr ,public IPropertyExistenceCheck { public: - typedef ::std::vector< css::uno::Reference< css::inspection::XPropertyHandler > > + typedef std::vector< css::uno::Reference< css::inspection::XPropertyHandler > > HandlerArray; private: HandlerArray m_aSlaveHandlers; - ::std::unique_ptr< ComposedPropertyUIUpdate > m_pUIRequestComposer; + std::unique_ptr< ComposedPropertyUIUpdate > m_pUIRequestComposer; PropertyChangeListeners m_aPropertyListeners; bool m_bSupportedPropertiesAreKnown; PropertyBag m_aSupportedProperties; @@ -71,7 +71,7 @@ namespace pcr @param _rSlaveHandlers the set of slave handlers to invoke. Must not be <NULL/> */ - explicit PropertyComposer( const ::std::vector< css::uno::Reference< css::inspection::XPropertyHandler > >& _rSlaveHandlers ); + explicit PropertyComposer( const std::vector< css::uno::Reference< css::inspection::XPropertyHandler > >& _rSlaveHandlers ); public: // XPropertyHandler overridables diff --git a/extensions/source/propctrlr/propertycontrolextender.hxx b/extensions/source/propctrlr/propertycontrolextender.hxx index 5fb18c901cae..9c1bee8dbfd3 100644 --- a/extensions/source/propctrlr/propertycontrolextender.hxx +++ b/extensions/source/propctrlr/propertycontrolextender.hxx @@ -54,7 +54,7 @@ namespace pcr virtual ~PropertyControlExtender() override; private: - ::std::unique_ptr< PropertyControlExtender_Data > m_pData; + std::unique_ptr< PropertyControlExtender_Data > m_pData; }; diff --git a/extensions/source/propctrlr/propertyeditor.cxx b/extensions/source/propctrlr/propertyeditor.cxx index 76013a7771e1..2da1083025f0 100644 --- a/extensions/source/propctrlr/propertyeditor.cxx +++ b/extensions/source/propctrlr/propertyeditor.cxx @@ -273,7 +273,7 @@ namespace pcr } - void OPropertyEditor::Update(const ::std::mem_fun_t<void,OBrowserListBox>& _aUpdateFunction) + void OPropertyEditor::Update(const std::mem_fun_t<void,OBrowserListBox>& _aUpdateFunction) { // forward this to all our pages sal_uInt16 nCount = m_aTabControl->GetPageCount(); @@ -288,12 +288,12 @@ namespace pcr void OPropertyEditor::EnableUpdate() { - Update(::std::mem_fun(&OBrowserListBox::EnableUpdate)); + Update(std::mem_fun(&OBrowserListBox::EnableUpdate)); } void OPropertyEditor::DisableUpdate() { - Update(::std::mem_fun(&OBrowserListBox::DisableUpdate)); + Update(std::mem_fun(&OBrowserListBox::DisableUpdate)); } @@ -459,7 +459,7 @@ namespace pcr } else { - ::std::map< sal_uInt16, HiddenPage >::iterator aPagePos = m_aHiddenPages.find( _nPageId ); + std::map< sal_uInt16, HiddenPage >::iterator aPagePos = m_aHiddenPages.find( _nPageId ); if ( aPagePos == m_aHiddenPages.end() ) return; diff --git a/extensions/source/propctrlr/propertyeditor.hxx b/extensions/source/propctrlr/propertyeditor.hxx index a40c312b9893..5a74e9200c27 100644 --- a/extensions/source/propctrlr/propertyeditor.hxx +++ b/extensions/source/propctrlr/propertyeditor.hxx @@ -42,7 +42,7 @@ namespace pcr class OPropertyEditor : public Control { private: - typedef ::std::map< OUString, sal_uInt16 > MapStringToPageId; + typedef std::map< OUString, sal_uInt16 > MapStringToPageId; struct HiddenPage { sal_uInt16 nPos; @@ -62,7 +62,7 @@ namespace pcr sal_Int32 m_nMaxHelpLines; MapStringToPageId m_aPropertyPageIds; - ::std::map< sal_uInt16, HiddenPage > m_aHiddenPages; + std::map< sal_uInt16, HiddenPage > m_aHiddenPages; protected: void Resize() override; @@ -123,7 +123,7 @@ namespace pcr OBrowserPage* getPage( const OUString& _rPropertyName ); const OBrowserPage* getPage( const OUString& _rPropertyName ) const; - void Update(const ::std::mem_fun_t<void,OBrowserListBox>& _aUpdateFunction); + void Update(const std::mem_fun_t<void,OBrowserListBox>& _aUpdateFunction); typedef void (OPropertyEditor::*PageOperation)( OBrowserPage&, const void* ); void forEachPage( PageOperation _pOperation ); diff --git a/extensions/source/propctrlr/propertyhandler.cxx b/extensions/source/propctrlr/propertyhandler.cxx index 44352f1b3cad..a3da0893b05e 100644 --- a/extensions/source/propctrlr/propertyhandler.cxx +++ b/extensions/source/propctrlr/propertyhandler.cxx @@ -78,8 +78,8 @@ namespace pcr return; // remove all old property change listeners - ::std::unique_ptr< ::comphelper::OInterfaceIteratorHelper2 > removeListener = m_aPropertyListeners.createIterator(); - ::std::unique_ptr< ::comphelper::OInterfaceIteratorHelper2 > readdListener = m_aPropertyListeners.createIterator(); // will copy the container as needed + std::unique_ptr< ::comphelper::OInterfaceIteratorHelper2 > removeListener = m_aPropertyListeners.createIterator(); + std::unique_ptr< ::comphelper::OInterfaceIteratorHelper2 > readdListener = m_aPropertyListeners.createIterator(); // will copy the container as needed while ( removeListener->hasMoreElements() ) removePropertyChangeListener( static_cast< XPropertyChangeListener* >( removeListener->next() ) ); OSL_ENSURE( m_aPropertyListeners.empty(), "PropertyHandler::inspect: derived classes are expected to forward the removePropertyChangeListener call to their base class (me)!" ); @@ -265,7 +265,7 @@ namespace pcr const Property* PropertyHandler::impl_getPropertyFromId_nothrow( PropertyId _nPropId ) const { const_cast< PropertyHandler* >( this )->getSupportedProperties(); - const Property* pFound = ::std::find_if( m_aSupportedProperties.begin(), m_aSupportedProperties.end(), + const Property* pFound = std::find_if( m_aSupportedProperties.begin(), m_aSupportedProperties.end(), FindPropertyByHandle( _nPropId ) ); if ( pFound != m_aSupportedProperties.end() ) @@ -285,7 +285,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(), + StlSyntaxSequence< Property >::const_iterator pFound = std::find_if( m_aSupportedProperties.begin(), m_aSupportedProperties.end(), FindPropertyByName( _rPropertyName ) ); if ( pFound == m_aSupportedProperties.end() ) @@ -294,7 +294,7 @@ namespace pcr return *pFound; } - void PropertyHandler::implAddPropertyDescription( ::std::vector< Property >& _rProperties, const OUString& _rPropertyName, const Type& _rType, sal_Int16 _nAttribs ) const + void PropertyHandler::implAddPropertyDescription( std::vector< Property >& _rProperties, const OUString& _rPropertyName, const Type& _rType, sal_Int16 _nAttribs ) const { _rProperties.push_back( Property( _rPropertyName, diff --git a/extensions/source/propctrlr/propertyhandler.hxx b/extensions/source/propctrlr/propertyhandler.hxx index a46cfc8d471c..0a39548df5ab 100644 --- a/extensions/source/propctrlr/propertyhandler.hxx +++ b/extensions/source/propctrlr/propertyhandler.hxx @@ -94,7 +94,7 @@ namespace pcr /// type converter, needed on various occasions css::uno::Reference< css::script::XTypeConverter > m_xTypeConverter; /// access to property meta data - ::std::unique_ptr< OPropertyInfoService > m_pInfoService; + std::unique_ptr< OPropertyInfoService > m_pInfoService; protected: explicit PropertyHandler( @@ -164,14 +164,14 @@ namespace pcr Most probably to be called from within getSupportedProperties */ inline void addStringPropertyDescription( - ::std::vector< css::beans::Property >& _rProperties, + std::vector< css::beans::Property >& _rProperties, const OUString& _rPropertyName ) const; /** adds a description for the given int32 property to the given property vector */ inline void addInt32PropertyDescription( - ::std::vector< css::beans::Property >& _rProperties, + std::vector< css::beans::Property >& _rProperties, const OUString& _rPropertyName, sal_Int16 _nAttribs = 0 ) const; @@ -179,7 +179,7 @@ namespace pcr /** adds a description for the given int16 property to the given property vector */ inline void addInt16PropertyDescription( - ::std::vector< css::beans::Property >& _rProperties, + std::vector< css::beans::Property >& _rProperties, const OUString& _rPropertyName, sal_Int16 _nAttribs = 0 ) const; @@ -187,7 +187,7 @@ namespace pcr /** adds a description for the given double property to the given property vector */ inline void addDoublePropertyDescription( - ::std::vector< css::beans::Property >& _rProperties, + std::vector< css::beans::Property >& _rProperties, const OUString& _rPropertyName, sal_Int16 _nAttribs ) const; @@ -195,7 +195,7 @@ namespace pcr /** adds a description for the given date property to the given property vector */ inline void addDatePropertyDescription( - ::std::vector< css::beans::Property >& _rProperties, + std::vector< css::beans::Property >& _rProperties, const OUString& _rPropertyName, sal_Int16 _nAttribs ) const; @@ -203,7 +203,7 @@ namespace pcr /** adds a description for the given time property to the given property vector */ inline void addTimePropertyDescription( - ::std::vector< css::beans::Property >& _rProperties, + std::vector< css::beans::Property >& _rProperties, const OUString& _rPropertyName, sal_Int16 _nAttribs ) const; @@ -211,14 +211,14 @@ namespace pcr /** adds a description for the given DateTime property to the given property vector */ inline void addDateTimePropertyDescription( - ::std::vector< css::beans::Property >& _rProperties, + std::vector< css::beans::Property >& _rProperties, const OUString& _rPropertyName, sal_Int16 _nAttribs ) const; /// adds a Property, given by name only, to a given vector of Properties void implAddPropertyDescription( - ::std::vector< css::beans::Property >& _rProperties, + std::vector< css::beans::Property >& _rProperties, const OUString& _rPropertyName, const css::uno::Type& _rType, sal_Int16 _nAttribs = 0 @@ -303,37 +303,37 @@ namespace pcr }; - inline void PropertyHandler::addStringPropertyDescription( ::std::vector< css::beans::Property >& _rProperties, const OUString& _rPropertyName ) const + inline void PropertyHandler::addStringPropertyDescription( std::vector< css::beans::Property >& _rProperties, const OUString& _rPropertyName ) const { implAddPropertyDescription( _rProperties, _rPropertyName, ::cppu::UnoType<OUString>::get() ); } - inline void PropertyHandler::addInt32PropertyDescription( ::std::vector< css::beans::Property >& _rProperties, const OUString& _rPropertyName, sal_Int16 _nAttribs ) const + inline void PropertyHandler::addInt32PropertyDescription( std::vector< css::beans::Property >& _rProperties, const OUString& _rPropertyName, sal_Int16 _nAttribs ) const { implAddPropertyDescription( _rProperties, _rPropertyName, ::cppu::UnoType<sal_Int32>::get(), _nAttribs ); } - inline void PropertyHandler::addInt16PropertyDescription( ::std::vector< css::beans::Property >& _rProperties, const OUString& _rPropertyName, sal_Int16 _nAttribs ) const + inline void PropertyHandler::addInt16PropertyDescription( std::vector< css::beans::Property >& _rProperties, const OUString& _rPropertyName, sal_Int16 _nAttribs ) const { implAddPropertyDescription( _rProperties, _rPropertyName, ::cppu::UnoType<sal_Int16>::get(), _nAttribs ); } - inline void PropertyHandler::addDoublePropertyDescription( ::std::vector< css::beans::Property >& _rProperties, const OUString& _rPropertyName, sal_Int16 _nAttribs ) const + inline void PropertyHandler::addDoublePropertyDescription( std::vector< css::beans::Property >& _rProperties, const OUString& _rPropertyName, sal_Int16 _nAttribs ) const { implAddPropertyDescription( _rProperties, _rPropertyName, ::cppu::UnoType<double>::get(), _nAttribs ); } - inline void PropertyHandler::addDatePropertyDescription( ::std::vector< css::beans::Property >& _rProperties, const OUString& _rPropertyName, sal_Int16 _nAttribs ) const + inline void PropertyHandler::addDatePropertyDescription( std::vector< css::beans::Property >& _rProperties, const OUString& _rPropertyName, sal_Int16 _nAttribs ) const { implAddPropertyDescription( _rProperties, _rPropertyName, ::cppu::UnoType<css::util::Date>::get(), _nAttribs ); } - inline void PropertyHandler::addTimePropertyDescription( ::std::vector< css::beans::Property >& _rProperties, const OUString& _rPropertyName, sal_Int16 _nAttribs ) const + inline void PropertyHandler::addTimePropertyDescription( std::vector< css::beans::Property >& _rProperties, const OUString& _rPropertyName, sal_Int16 _nAttribs ) const { implAddPropertyDescription( _rProperties, _rPropertyName, ::cppu::UnoType<css::util::Time>::get(), _nAttribs ); } - inline void PropertyHandler::addDateTimePropertyDescription( ::std::vector< css::beans::Property >& _rProperties, const OUString& _rPropertyName, sal_Int16 _nAttribs ) const + inline void PropertyHandler::addDateTimePropertyDescription( std::vector< css::beans::Property >& _rProperties, const OUString& _rPropertyName, sal_Int16 _nAttribs ) const { implAddPropertyDescription( _rProperties, _rPropertyName, ::cppu::UnoType<css::util::DateTime>::get(), _nAttribs ); } diff --git a/extensions/source/propctrlr/propertyinfo.hxx b/extensions/source/propctrlr/propertyinfo.hxx index 7b1ee3b2b2de..ff6a83dc03b4 100644 --- a/extensions/source/propctrlr/propertyinfo.hxx +++ b/extensions/source/propctrlr/propertyinfo.hxx @@ -40,7 +40,7 @@ namespace pcr virtual OString getPropertyHelpId(sal_Int32 _nId) const = 0; virtual sal_Int16 getPropertyPos(sal_Int32 _nId) const = 0; virtual sal_uInt32 getPropertyUIFlags(sal_Int32 _nId) const = 0; - virtual ::std::vector< OUString > getPropertyEnumRepresentations(sal_Int32 _nId) const = 0; + virtual std::vector< OUString > getPropertyEnumRepresentations(sal_Int32 _nId) const = 0; virtual ~IPropertyInfoService() { } }; diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx index c07959322c3f..1b60b7f57a7c 100644 --- a/extensions/source/propctrlr/standardcontrol.cxx +++ b/extensions/source/propctrlr/standardcontrol.cxx @@ -233,8 +233,8 @@ namespace pcr for ( sal_uInt16 d = 0; d < nDigits; ++d ) n *= 10; - if ( n > ::std::numeric_limits< long >::max() ) - return ::std::numeric_limits< long >::max(); + if ( n > std::numeric_limits< long >::max() ) + return std::numeric_limits< long >::max(); return (long)n; } @@ -504,7 +504,7 @@ namespace pcr Optional< double > aReturn( true, 0 ); sal_Int64 minValue = getTypedControlWindow()->GetMin(); - if ( minValue == ::std::numeric_limits< sal_Int64 >::min() ) + if ( minValue == std::numeric_limits< sal_Int64 >::min() ) aReturn.IsPresent = false; else aReturn.Value = (double)minValue; @@ -516,7 +516,7 @@ namespace pcr void SAL_CALL ONumericControl::setMinValue( const Optional< double >& _minvalue ) { if ( !_minvalue.IsPresent ) - getTypedControlWindow()->SetMin( ::std::numeric_limits< sal_Int64 >::min() ); + getTypedControlWindow()->SetMin( std::numeric_limits< sal_Int64 >::min() ); else getTypedControlWindow()->SetMin( impl_apiValueToFieldValue_nothrow( _minvalue.Value ) , m_eValueUnit); } @@ -527,7 +527,7 @@ namespace pcr Optional< double > aReturn( true, 0 ); sal_Int64 maxValue = getTypedControlWindow()->GetMax(); - if ( maxValue == ::std::numeric_limits< sal_Int64 >::max() ) + if ( maxValue == std::numeric_limits< sal_Int64 >::max() ) aReturn.IsPresent = false; else aReturn.Value = (double)maxValue; @@ -539,7 +539,7 @@ namespace pcr void SAL_CALL ONumericControl::setMaxValue( const Optional< double >& _maxvalue ) { if ( !_maxvalue.IsPresent ) - getTypedControlWindow()->SetMax( ::std::numeric_limits< sal_Int64 >::max() ); + getTypedControlWindow()->SetMax( std::numeric_limits< sal_Int64 >::max() ); else getTypedControlWindow()->SetMax( impl_apiValueToFieldValue_nothrow( _maxvalue.Value ), m_eValueUnit ); } diff --git a/extensions/source/propctrlr/submissionhandler.cxx b/extensions/source/propctrlr/submissionhandler.cxx index d6a924aaf453..bef6d5990aac 100644 --- a/extensions/source/propctrlr/submissionhandler.cxx +++ b/extensions/source/propctrlr/submissionhandler.cxx @@ -261,7 +261,7 @@ namespace pcr Sequence< Property > SAL_CALL SubmissionPropertyHandler::doDescribeSupportedProperties() const { - ::std::vector< Property > aProperties; + std::vector< Property > aProperties; if ( m_pHelper.get() ) { implAddPropertyDescription( aProperties, PROPERTY_SUBMISSION_ID, cppu::UnoType<submission::XSubmission>::get() ); @@ -282,7 +282,7 @@ namespace pcr if ( !m_pHelper.get() ) RuntimeException(); - ::std::vector< OUString > aListEntries; + std::vector< OUString > aListEntries; PropertyId nPropId( impl_getPropertyId_throwUnknownProperty( _rPropertyName ) ); switch ( nPropId ) { diff --git a/extensions/source/propctrlr/submissionhandler.hxx b/extensions/source/propctrlr/submissionhandler.hxx index 0d8c035daf0d..410b72cb0259 100644 --- a/extensions/source/propctrlr/submissionhandler.hxx +++ b/extensions/source/propctrlr/submissionhandler.hxx @@ -69,7 +69,7 @@ namespace pcr class SubmissionPropertyHandler : public EditPropertyHandler_Base, public ::comphelper::OPropertyChangeListener { private: - ::std::unique_ptr< SubmissionHelper > m_pHelper; + std::unique_ptr< SubmissionHelper > m_pHelper; rtl::Reference<::comphelper::OPropertyChangeMultiplexer> m_xPropChangeMultiplexer; public: diff --git a/extensions/source/propctrlr/xsdvalidationhelper.cxx b/extensions/source/propctrlr/xsdvalidationhelper.cxx index 284de9f2b163..6e43c5b3f122 100644 --- a/extensions/source/propctrlr/xsdvalidationhelper.cxx +++ b/extensions/source/propctrlr/xsdvalidationhelper.cxx @@ -74,7 +74,7 @@ namespace pcr } - void XSDValidationHelper::getAvailableDataTypeNames( ::std::vector< OUString >& /* [out] */ _rNames ) const + void XSDValidationHelper::getAvailableDataTypeNames( std::vector< OUString >& /* [out] */ _rNames ) const { _rNames.resize( 0 ); @@ -86,7 +86,7 @@ namespace pcr aElements = xRepository->getElementNames(); _rNames.resize( aElements.getLength() ); - ::std::copy( aElements.begin(), aElements.end(), _rNames.begin() ); + std::copy( aElements.begin(), aElements.end(), _rNames.begin() ); } catch( const Exception& ) { diff --git a/extensions/source/propctrlr/xsdvalidationhelper.hxx b/extensions/source/propctrlr/xsdvalidationhelper.hxx index 1f8df853d5d1..017c939a4934 100644 --- a/extensions/source/propctrlr/xsdvalidationhelper.hxx +++ b/extensions/source/propctrlr/xsdvalidationhelper.hxx @@ -52,7 +52,7 @@ namespace pcr /** retrieves the names of all XForms models in the document the control lives in */ - void getAvailableDataTypeNames( ::std::vector< OUString >& /* [out] */ _rNames ) const; + void getAvailableDataTypeNames( std::vector< OUString >& /* [out] */ _rNames ) const; /** retrieves a particular data type given by name */ diff --git a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx index 9d92ed755f16..598f6f0bbed5 100644 --- a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx +++ b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx @@ -171,7 +171,7 @@ namespace pcr Sequence< Property > XSDValidationPropertyHandler::doDescribeSupportedProperties() const { - ::std::vector< Property > aProperties; + std::vector< Property > aProperties; if ( m_pHelper.get() ) { @@ -226,7 +226,7 @@ namespace pcr { ::osl::MutexGuard aGuard( m_aMutex ); - ::std::vector< OUString > aSuperfluous; + std::vector< OUString > aSuperfluous; if ( m_pHelper.get() ) { aSuperfluous.push_back( OUString(PROPERTY_CONTROLSOURCE) ); @@ -260,7 +260,7 @@ namespace pcr Sequence< OUString > SAL_CALL XSDValidationPropertyHandler::getActuatingProperties( ) { ::osl::MutexGuard aGuard( m_aMutex ); - ::std::vector< OUString > aInterestedInActuations; + std::vector< OUString > aInterestedInActuations; if ( m_pHelper.get() ) { aInterestedInActuations.push_back( OUString(PROPERTY_XSD_DATA_TYPE) ); @@ -299,7 +299,7 @@ namespace pcr // collect some information about the to-be-created control sal_Int16 nControlType = PropertyControlType::TextField; - ::std::vector< OUString > aListEntries; + std::vector< OUString > aListEntries; Optional< double > aMinValue( false, 0 ); Optional< double > aMaxValue( false, 0 ); @@ -354,7 +354,7 @@ namespace pcr aMinValue.IsPresent = aMaxValue.IsPresent = true; aMinValue.Value = DataTypeClass::gYear == nTypeClass ? 0 : 1; - aMaxValue.Value = ::std::numeric_limits< sal_Int32 >::max(); + aMaxValue.Value = std::numeric_limits< sal_Int32 >::max(); if ( DataTypeClass::gMonth == nTypeClass ) aMaxValue.Value = 12; else if ( DataTypeClass::gDay == nTypeClass ) @@ -484,7 +484,7 @@ namespace pcr return false; } - ::std::vector< OUString > aExistentNames; + std::vector< OUString > aExistentNames; m_pHelper->getAvailableDataTypeNames( aExistentNames ); ScopedVclPtrInstance<NewDataTypeDialog> aDialog( nullptr, pType->getName(), aExistentNames ); // TODO/eForms: proper parent @@ -643,17 +643,17 @@ namespace pcr } - void XSDValidationPropertyHandler::implGetAvailableDataTypeNames( ::std::vector< OUString >& /* [out] */ _rNames ) const + void XSDValidationPropertyHandler::implGetAvailableDataTypeNames( std::vector< OUString >& /* [out] */ _rNames ) const { OSL_PRECOND( m_pHelper.get(), "XSDValidationPropertyHandler::implGetAvailableDataTypeNames: this will crash!" ); // start with *all* types which are available at the model - ::std::vector< OUString > aAllTypes; + std::vector< OUString > aAllTypes; m_pHelper->getAvailableDataTypeNames( aAllTypes ); _rNames.clear(); _rNames.reserve( aAllTypes.size() ); // then allow only those which are "compatible" with our control - for ( ::std::vector< OUString >::const_iterator dataType = aAllTypes.begin(); + for ( std::vector< OUString >::const_iterator dataType = aAllTypes.begin(); dataType != aAllTypes.end(); ++dataType ) diff --git a/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx b/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx index c65f37a21b92..ea1564525c8b 100644 --- a/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx +++ b/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx @@ -38,7 +38,7 @@ namespace pcr class XSDValidationPropertyHandler : public XSDValidationPropertyHandler_Base { private: - ::std::unique_ptr< XSDValidationHelper > m_pHelper; + std::unique_ptr< XSDValidationHelper > m_pHelper; public: explicit XSDValidationPropertyHandler( @@ -83,7 +83,7 @@ namespace pcr /** retrieves the names of the data types which our introspectee can be validated against */ - void implGetAvailableDataTypeNames( ::std::vector< OUString >& /* [out] */ _rNames ) const; + void implGetAvailableDataTypeNames( std::vector< OUString >& /* [out] */ _rNames ) const; }; diff --git a/extensions/source/resource/ResourceIndexAccess.cxx b/extensions/source/resource/ResourceIndexAccess.cxx index b422bbaff6bf..bebd3af63e2a 100644 --- a/extensions/source/resource/ResourceIndexAccess.cxx +++ b/extensions/source/resource/ResourceIndexAccess.cxx @@ -70,7 +70,7 @@ Any SAL_CALL ResourceIndexAccess::getByName(const OUString& aName) { const Sequence<OUString> aNames(getElementNames()); Reference<XIndexAccess> xResult; - switch(::std::find(aNames.begin(), aNames.end(), aName) - aNames.begin()) + switch(std::find(aNames.begin(), aNames.end(), aName) - aNames.begin()) { case 0: xResult.set(new ResourceStringIndexAccess(m_pResMgr)); @@ -95,7 +95,7 @@ Sequence<OUString> SAL_CALL ResourceIndexAccess::getElementNames( ) sal_Bool SAL_CALL ResourceIndexAccess::hasByName(const OUString& aName) { const Sequence<OUString> aNames(getElementNames()); - return (::std::find(aNames.begin(), aNames.end(), aName) != aNames.end()); + return (std::find(aNames.begin(), aNames.end(), aName) != aNames.end()); } Any SAL_CALL ResourceStringIndexAccess::getByIndex(sal_Int32 nIdx) diff --git a/extensions/source/resource/oooresourceloader.cxx b/extensions/source/resource/oooresourceloader.cxx index d29d34b0d3c0..4c94aab56856 100644 --- a/extensions/source/resource/oooresourceloader.cxx +++ b/extensions/source/resource/oooresourceloader.cxx @@ -80,7 +80,7 @@ namespace extensions { namespace resource { private: typedef std::shared_ptr< StringResourceAccess > ResourceTypePtr; - typedef ::std::map< OUString, ResourceTypePtr > ResourceTypes; + typedef std::map< OUString, ResourceTypePtr > ResourceTypes; ::osl::Mutex m_aMutex; Reference< XResourceBundle > m_xParent; diff --git a/extensions/source/resource/oooresourceloader.hxx b/extensions/source/resource/oooresourceloader.hxx index 50656d514c04..dccc2c2a7fd3 100644 --- a/extensions/source/resource/oooresourceloader.hxx +++ b/extensions/source/resource/oooresourceloader.hxx @@ -31,9 +31,9 @@ namespace extensions { namespace resource { - typedef ::std::pair< OUString, css::lang::Locale> ResourceBundleDescriptor; + typedef std::pair< OUString, css::lang::Locale> ResourceBundleDescriptor; - struct ResourceBundleDescriptorLess : public ::std::binary_function<ResourceBundleDescriptor, ResourceBundleDescriptor, bool> + struct ResourceBundleDescriptorLess : public std::binary_function<ResourceBundleDescriptor, ResourceBundleDescriptor, bool> { bool operator()( const ResourceBundleDescriptor& _lhs, const ResourceBundleDescriptor& _rhs ) const { @@ -52,7 +52,7 @@ namespace extensions { namespace resource class OpenOfficeResourceLoader : public ::cppu::WeakImplHelper< css::resource::XResourceBundleLoader> { public: - typedef ::std::map< + typedef std::map< ResourceBundleDescriptor, css::uno::WeakReference< css::resource::XResourceBundle>, ResourceBundleDescriptorLess> ResourceBundleCache; |