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 /dbaccess/source/ui/app | |
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 'dbaccess/source/ui/app')
-rw-r--r-- | dbaccess/source/ui/app/AppController.cxx | 42 | ||||
-rw-r--r-- | dbaccess/source/ui/app/AppController.hxx | 18 | ||||
-rw-r--r-- | dbaccess/source/ui/app/AppControllerDnD.cxx | 42 | ||||
-rw-r--r-- | dbaccess/source/ui/app/AppControllerGen.cxx | 16 | ||||
-rw-r--r-- | dbaccess/source/ui/app/AppDetailPageHelper.cxx | 4 | ||||
-rw-r--r-- | dbaccess/source/ui/app/AppDetailPageHelper.hxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/app/AppDetailView.cxx | 6 | ||||
-rw-r--r-- | dbaccess/source/ui/app/AppDetailView.hxx | 6 | ||||
-rw-r--r-- | dbaccess/source/ui/app/AppView.cxx | 4 | ||||
-rw-r--r-- | dbaccess/source/ui/app/AppView.hxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/app/subcomponentmanager.cxx | 12 | ||||
-rw-r--r-- | dbaccess/source/ui/app/subcomponentmanager.hxx | 2 |
12 files changed, 78 insertions, 78 deletions
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx index 9b58b9a8d0f9..02ddc0f3eb1f 100644 --- a/dbaccess/source/ui/app/AppController.cxx +++ b/dbaccess/source/ui/app/AppController.cxx @@ -480,7 +480,7 @@ void SAL_CALL OApplicationController::disposing(const EventObject& _rSource) Reference<XContainer> xContainer( _rSource.Source, UNO_QUERY ); if ( xContainer.is() ) { - TContainerVector::iterator aFind = ::std::find(m_aCurrentContainers.begin(),m_aCurrentContainers.end(),xContainer); + TContainerVector::iterator aFind = std::find(m_aCurrentContainers.begin(),m_aCurrentContainers.end(),xContainer); if ( aFind != m_aCurrentContainers.end() ) m_aCurrentContainers.erase(aFind); } @@ -768,10 +768,10 @@ FeatureState OApplicationController::GetState(sal_uInt16 _nId) const && ( getContainer()->isALeafSelected() ) ) { - ::std::vector< OUString > aSelected; + std::vector< OUString > aSelected; getSelectionElementNames( aSelected ); bool bAlterableViews = true; - for ( ::std::vector< OUString >::const_iterator selectedName = aSelected.begin(); + for ( std::vector< OUString >::const_iterator selectedName = aSelected.begin(); bAlterableViews && ( selectedName != aSelected.end() ) ; ++selectedName ) @@ -1006,7 +1006,7 @@ void OApplicationController::Execute(sal_uInt16 _nId, const Sequence< PropertyVa case E_TABLE: { // get the selected tablename - ::std::vector< OUString > aList; + std::vector< OUString > aList; getSelectionElementNames( aList ); if ( !aList.empty() ) m_aTableCopyHelper.SetTableNameForAppend( *aList.begin() ); @@ -1023,7 +1023,7 @@ void OApplicationController::Execute(sal_uInt16 _nId, const Sequence< PropertyVa break; default: { - ::std::vector< OUString> aList; + std::vector< OUString> aList; getSelectionElementNames(aList); OUString sFolderNameToInsertInto; if ( !aList.empty() ) @@ -1049,10 +1049,10 @@ void OApplicationController::Execute(sal_uInt16 _nId, const Sequence< PropertyVa { SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); ScopedVclPtr<SfxAbstractPasteDialog> pDlg(pFact->CreatePasteDialog( getView() )); - ::std::vector<SotClipboardFormatId> aFormatIds; + std::vector<SotClipboardFormatId> aFormatIds; getSupportedFormats(getContainer()->getElementType(),aFormatIds); - const ::std::vector<SotClipboardFormatId>::const_iterator aEnd = aFormatIds.end(); - for (::std::vector<SotClipboardFormatId>::const_iterator aIter = aFormatIds.begin();aIter != aEnd; ++aIter) + const std::vector<SotClipboardFormatId>::const_iterator aEnd = aFormatIds.end(); + for (std::vector<SotClipboardFormatId>::const_iterator aIter = aFormatIds.begin();aIter != aEnd; ++aIter) pDlg->Insert(*aIter,""); const TransferableDataHelper& rClipboard = getViewClipboard(); @@ -1507,7 +1507,7 @@ void SAL_CALL OApplicationController::elementInserted( const ContainerEvent& _rE ::osl::MutexGuard aGuard( getMutex() ); Reference< XContainer > xContainer(_rEvent.Source, UNO_QUERY); - if ( ::std::find(m_aCurrentContainers.begin(),m_aCurrentContainers.end(),xContainer) != m_aCurrentContainers.end() ) + if ( std::find(m_aCurrentContainers.begin(),m_aCurrentContainers.end(),xContainer) != m_aCurrentContainers.end() ) { OSL_ENSURE(getContainer(),"View is NULL! -> GPF"); if ( getContainer() ) @@ -1543,7 +1543,7 @@ void SAL_CALL OApplicationController::elementRemoved( const ContainerEvent& _rEv ::osl::MutexGuard aGuard( getMutex() ); Reference< XContainer > xContainer(_rEvent.Source, UNO_QUERY); - if ( ::std::find(m_aCurrentContainers.begin(),m_aCurrentContainers.end(),xContainer) != m_aCurrentContainers.end() ) + if ( std::find(m_aCurrentContainers.begin(),m_aCurrentContainers.end(),xContainer) != m_aCurrentContainers.end() ) { OSL_ENSURE(getContainer(),"View is NULL! -> GPF"); OUString sName; @@ -1577,7 +1577,7 @@ void SAL_CALL OApplicationController::elementReplaced( const ContainerEvent& _rE ::osl::MutexGuard aGuard( getMutex() ); Reference< XContainer > xContainer(_rEvent.Source, UNO_QUERY); - if ( ::std::find(m_aCurrentContainers.begin(),m_aCurrentContainers.end(),xContainer) != m_aCurrentContainers.end() ) + if ( std::find(m_aCurrentContainers.begin(),m_aCurrentContainers.end(),xContainer) != m_aCurrentContainers.end() ) { OSL_ENSURE(getContainer(),"View is NULL! -> GPF"); OUString sName; @@ -1795,7 +1795,7 @@ Reference< XComponent > OApplicationController::openElementWithArguments( const { if ( isStandaloneDocument || !m_pSubComponentManager->activateSubFrame( _sName, _eType, _eOpenMode, xRet ) ) { - ::std::unique_ptr< OLinkedDocumentsAccess > aHelper = getDocumentsAccess( _eType ); + std::unique_ptr< OLinkedDocumentsAccess > aHelper = getDocumentsAccess( _eType ); if ( !aHelper->isConnected() ) break; @@ -1817,7 +1817,7 @@ Reference< XComponent > OApplicationController::openElementWithArguments( const if ( !xConnection.is() ) break; - ::std::unique_ptr< DatabaseObjectView > pDesigner; + std::unique_ptr< DatabaseObjectView > pDesigner; ::comphelper::NamedValueCollection aArguments( _rAdditionalArguments ); Any aDataSource; @@ -1899,7 +1899,7 @@ void OApplicationController::newElementWithPilot( ElementType _eType ) case E_REPORT: case E_FORM: { - ::std::unique_ptr<OLinkedDocumentsAccess> aHelper = getDocumentsAccess(_eType); + std::unique_ptr<OLinkedDocumentsAccess> aHelper = getDocumentsAccess(_eType); if ( aHelper->isConnected() ) { sal_Int32 nCommandType = -1; @@ -1914,7 +1914,7 @@ void OApplicationController::newElementWithPilot( ElementType _eType ) case E_QUERY: case E_TABLE: { - ::std::unique_ptr<OLinkedDocumentsAccess> aHelper = getDocumentsAccess(_eType); + std::unique_ptr<OLinkedDocumentsAccess> aHelper = getDocumentsAccess(_eType); if ( aHelper->isConnected() ) { if ( E_QUERY == _eType ) @@ -1945,7 +1945,7 @@ Reference< XComponent > OApplicationController::newElement( ElementType _eType, case E_FORM: case E_REPORT: { - ::std::unique_ptr<OLinkedDocumentsAccess> aHelper = getDocumentsAccess( _eType ); + std::unique_ptr<OLinkedDocumentsAccess> aHelper = getDocumentsAccess( _eType ); if ( !aHelper->isConnected() ) break; @@ -1956,7 +1956,7 @@ Reference< XComponent > OApplicationController::newElement( ElementType _eType, case E_QUERY: case E_TABLE: { - ::std::unique_ptr< DatabaseObjectView > pDesigner; + std::unique_ptr< DatabaseObjectView > pDesigner; SharedConnection xConnection( ensureConnection() ); if ( !xConnection.is() ) break; @@ -1994,7 +1994,7 @@ void OApplicationController::addContainerListener(const Reference<XNameAccess>& if ( xCont.is() ) { // add as listener to get notified if elements are inserted or removed - TContainerVector::const_iterator aFind = ::std::find(m_aCurrentContainers.begin(),m_aCurrentContainers.end(),xCont); + TContainerVector::const_iterator aFind = std::find(m_aCurrentContainers.begin(),m_aCurrentContainers.end(),xCont); if ( aFind == m_aCurrentContainers.end() ) { xCont->addContainerListener(this); @@ -2014,7 +2014,7 @@ void OApplicationController::renameEntry() ::osl::MutexGuard aGuard( getMutex() ); OSL_ENSURE(getContainer(),"View is NULL! -> GPF"); - ::std::vector< OUString> aList; + std::vector< OUString> aList; getSelectionElementNames(aList); Reference< XNameAccess > xContainer = getElements(getContainer()->getElementType()); @@ -2026,7 +2026,7 @@ void OApplicationController::renameEntry() { if ( xContainer.is() ) { - ::std::unique_ptr< IObjectNameCheck > pNameChecker; + std::unique_ptr< IObjectNameCheck > pNameChecker; VclPtr< OSaveAsDlg > aDialog; Reference<XRename> xRename; @@ -2339,7 +2339,7 @@ sal_Int8 OApplicationController::queryDrop( const AcceptDropEvent& _rEvt, const if ( eType != E_NONE && (eType != E_TABLE || !isConnectionReadOnly()) ) { // check for the concrete type - if(::std::any_of(_rFlavors.begin(),_rFlavors.end(),TAppSupportedSotFunctor(eType))) + if(std::any_of(_rFlavors.begin(),_rFlavors.end(),TAppSupportedSotFunctor(eType))) return DND_ACTION_COPY; if ( eType == E_FORM || eType == E_REPORT ) { diff --git a/dbaccess/source/ui/app/AppController.hxx b/dbaccess/source/ui/app/AppController.hxx index 4557ef0e408a..24dbc9c7e749 100644 --- a/dbaccess/source/ui/app/AppController.hxx +++ b/dbaccess/source/ui/app/AppController.hxx @@ -84,7 +84,7 @@ namespace dbaui ,public IContextMenuProvider { public: - typedef ::std::vector< css::uno::Reference< css::container::XContainer > > TContainerVector; + typedef std::vector< css::uno::Reference< css::container::XContainer > > TContainerVector; private: @@ -118,9 +118,9 @@ namespace dbaui bool m_bNeedToReconnect; // true when the settings of the data source were modified and the connection is no longer up to date bool m_bSuspended; // is true when the controller was already suspended - ::std::unique_ptr< SelectionNotifier > + std::unique_ptr< SelectionNotifier > m_pSelectionNotifier; - typedef ::std::map< ElementType, ::std::vector< OUString > > SelectionByElementType; + typedef std::map< ElementType, std::vector< OUString > > SelectionByElementType; SelectionByElementType m_aPendingSelection; private: @@ -190,7 +190,7 @@ namespace dbaui bool isConnectionReadOnly() const; /// fills the list with the selected entries. - void getSelectionElementNames( ::std::vector< OUString>& _rNames ) const; + void getSelectionElementNames( std::vector< OUString>& _rNames ) const; /// deletes the entries selected. void deleteEntries(); @@ -207,14 +207,14 @@ namespace dbaui determines whether the user must confirm the deletion */ void deleteObjects( ElementType _eType, - const ::std::vector< OUString>& _rList, + const std::vector< OUString>& _rList, bool _bConfirm ); /** deletes tables. @param _rList The list of tables. */ - void deleteTables(const ::std::vector< OUString>& _rList); + void deleteTables(const std::vector< OUString>& _rList); /// copies the current object into clipboard TransferableHelper* copyObject(); @@ -225,9 +225,9 @@ namespace dbaui /** returns the document access for the specific type @param _eType the type - @return ::std::unique_ptr<OLinkedDocumentsAccess> + @return std::unique_ptr<OLinkedDocumentsAccess> */ - ::std::unique_ptr<OLinkedDocumentsAccess> getDocumentsAccess(ElementType _eType); + std::unique_ptr<OLinkedDocumentsAccess> getDocumentsAccess(ElementType _eType); /// returns the query definitions of the active data source. css::uno::Reference< css::container::XNameContainer> getQueryDefinitions() const; @@ -264,7 +264,7 @@ namespace dbaui @param _rFormatIds The vector to be filled up. */ - static void getSupportedFormats(ElementType _eType,::std::vector<SotClipboardFormatId>& _rFormatIds); + static void getSupportedFormats(ElementType _eType,std::vector<SotClipboardFormatId>& _rFormatIds); /** adds a listener to the current name access. @param _xCollection diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx b/dbaccess/source/ui/app/AppControllerDnD.cxx index d763bf18889b..813ac916746f 100644 --- a/dbaccess/source/ui/app/AppControllerDnD.cxx +++ b/dbaccess/source/ui/app/AppControllerDnD.cxx @@ -98,7 +98,7 @@ using namespace ::com::sun::star::frame; using namespace ::com::sun::star::ucb; using namespace ::com::sun::star::util; -void OApplicationController::deleteTables(const ::std::vector< OUString>& _rList) +void OApplicationController::deleteTables(const std::vector< OUString>& _rList) { SharedConnection xConnection( ensureConnection() ); @@ -111,8 +111,8 @@ void OApplicationController::deleteTables(const ::std::vector< OUString>& _rList if ( xDrop.is() ) { bool bConfirm = true; - ::std::vector< OUString>::const_iterator aEnd = _rList.end(); - for (::std::vector< OUString>::const_iterator aIter = _rList.begin(); aIter != aEnd; ++aIter) + std::vector< OUString>::const_iterator aEnd = _rList.end(); + for (std::vector< OUString>::const_iterator aIter = _rList.begin(); aIter != aEnd; ++aIter) { OUString sTableName = *aIter; @@ -182,7 +182,7 @@ void OApplicationController::deleteTables(const ::std::vector< OUString>& _rList } } -void OApplicationController::deleteObjects( ElementType _eType, const ::std::vector< OUString>& _rList, bool _bConfirm ) +void OApplicationController::deleteObjects( ElementType _eType, const std::vector< OUString>& _rList, bool _bConfirm ) { Reference< XNameContainer > xNames( getElements( _eType ), UNO_QUERY ); Reference< XHierarchicalNameContainer > xHierarchyName( xNames, UNO_QUERY ); @@ -195,19 +195,19 @@ void OApplicationController::deleteObjects( ElementType _eType, const ::std::vec // be the ancestor or child of another element from the list. // We want to ensure that ancestors get deleted first, so we normalize the list in this respect. // #i33353# - ::std::set< OUString > aDeleteNames; - // Note that this implicitly uses ::std::less< OUString > a comparison operation, which + std::set< OUString > aDeleteNames; + // Note that this implicitly uses std::less< OUString > a comparison operation, which // results in lexicographical order, which is exactly what we need, because "foo" is *before* // any "foo/bar" in this order. - ::std::copy( + std::copy( _rList.begin(), _rList.end(), - ::std::insert_iterator< ::std::set< OUString > >( aDeleteNames, aDeleteNames.begin() ) + std::insert_iterator< std::set< OUString > >( aDeleteNames, aDeleteNames.begin() ) ); - ::std::set< OUString >::size_type nCount = aDeleteNames.size(); - for ( ::std::set< OUString >::size_type nObjectsLeft = nCount; !aDeleteNames.empty(); ) + std::set< OUString >::size_type nCount = aDeleteNames.size(); + for ( std::set< OUString >::size_type nObjectsLeft = nCount; !aDeleteNames.empty(); ) { - ::std::set< OUString >::const_iterator aThisRound = aDeleteNames.begin(); + std::set< OUString >::const_iterator aThisRound = aDeleteNames.begin(); if ( eResult != svtools::QUERYDELETE_ALL ) { @@ -252,12 +252,12 @@ void OApplicationController::deleteObjects( ElementType _eType, const ::std::vec OUStringBuffer sSmallestSiblingName( *aThisRound ); sSmallestSiblingName.append( (sal_Unicode)( '/' + 1) ); - ::std::set< OUString >::const_iterator aUpperChildrenBound = aDeleteNames.lower_bound( sSmallestSiblingName.makeStringAndClear() ); - for ( ::std::set< OUString >::const_iterator aObsolete = aThisRound; + std::set< OUString >::const_iterator aUpperChildrenBound = aDeleteNames.lower_bound( sSmallestSiblingName.makeStringAndClear() ); + for ( std::set< OUString >::const_iterator aObsolete = aThisRound; aObsolete != aUpperChildrenBound; ) { - ::std::set< OUString >::const_iterator aNextObsolete = aObsolete; ++aNextObsolete; + std::set< OUString >::const_iterator aNextObsolete = aObsolete; ++aNextObsolete; aDeleteNames.erase( aObsolete ); --nObjectsLeft; aObsolete = aNextObsolete; @@ -299,7 +299,7 @@ void OApplicationController::deleteEntries() if ( getContainer() ) { - ::std::vector< OUString> aList; + std::vector< OUString> aList; getSelectionElementNames(aList); ElementType eType = getContainer()->getElementType(); switch(eType) @@ -483,7 +483,7 @@ Reference< XNameAccess > OApplicationController::getElements( ElementType _eType return xElements; } -void OApplicationController::getSelectionElementNames(::std::vector< OUString>& _rNames) const +void OApplicationController::getSelectionElementNames(std::vector< OUString>& _rNames) const { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); @@ -493,7 +493,7 @@ void OApplicationController::getSelectionElementNames(::std::vector< OUString>& getContainer()->getSelectionElementNames( _rNames ); } -::std::unique_ptr< OLinkedDocumentsAccess > OApplicationController::getDocumentsAccess( ElementType _eType ) +std::unique_ptr< OLinkedDocumentsAccess > OApplicationController::getDocumentsAccess( ElementType _eType ) { OSL_ENSURE( ( _eType == E_TABLE ) || ( _eType == E_QUERY ) || ( _eType == E_FORM ) || ( _eType == E_REPORT ), "OApplicationController::getDocumentsAccess: only forms and reports are supported here!" ); @@ -507,7 +507,7 @@ void OApplicationController::getSelectionElementNames(::std::vector< OUString>& OSL_ENSURE( xDocContainer.is(), "OApplicationController::getDocumentsAccess: invalid container!" ); } - ::std::unique_ptr< OLinkedDocumentsAccess > pDocuments( new OLinkedDocumentsAccess( + std::unique_ptr< OLinkedDocumentsAccess > pDocuments( new OLinkedDocumentsAccess( getView(), this, getORB(), xDocContainer, xConnection, getDatabaseName() ) ); return pDocuments; @@ -551,7 +551,7 @@ TransferableHelper* OApplicationController::copyObject() case E_FORM: case E_REPORT: { - ::std::vector< OUString> aList; + std::vector< OUString> aList; getSelectionElementNames(aList); Reference< XHierarchicalNameAccess > xElements(getElements(eType),UNO_QUERY); if ( xElements.is() && !aList.empty() ) @@ -775,7 +775,7 @@ Reference<XNameContainer> OApplicationController::getQueryDefinitions() const return xNames; } -void OApplicationController::getSupportedFormats(ElementType _eType,::std::vector<SotClipboardFormatId>& _rFormatIds) +void OApplicationController::getSupportedFormats(ElementType _eType,std::vector<SotClipboardFormatId>& _rFormatIds) { switch( _eType ) { @@ -816,7 +816,7 @@ IMPL_LINK_NOARG( OApplicationController, OnAsyncDrop, void*, void ) { Reference<XContent> xContent; m_aAsyncDrop.aDroppedData[DataAccessDescriptorProperty::Component] >>= xContent; - ::std::vector< OUString> aList; + std::vector< OUString> aList; sal_Int32 nIndex = 0; OUString sName = xContent->getIdentifier()->getContentIdentifier(); OUString sErase = sName.getToken(0,'/',nIndex); // we don't want to have the "private:forms" part diff --git a/dbaccess/source/ui/app/AppControllerGen.cxx b/dbaccess/source/ui/app/AppControllerGen.cxx index 72202357a71d..96eee0c85e3b 100644 --- a/dbaccess/source/ui/app/AppControllerGen.cxx +++ b/dbaccess/source/ui/app/AppControllerGen.cxx @@ -618,7 +618,7 @@ bool OApplicationController::isRenameDeleteAllowed(ElementType _eType, bool _bDe bCompareRes = getContainer()->getSelectionCount() == 1; if ( bEnabled && bCompareRes && E_TABLE == eType ) { - ::std::vector< OUString> aList; + std::vector< OUString> aList; getSelectionElementNames(aList); try @@ -675,7 +675,7 @@ void OApplicationController::onLoadedMenu(const Reference< css::frame::XLayoutMa void OApplicationController::doAction(sal_uInt16 _nId, const ElementOpenMode _eOpenMode) { - ::std::vector< OUString> aList; + std::vector< OUString> aList; getSelectionElementNames(aList); ElementType eType = getContainer()->getElementType(); ::comphelper::NamedValueCollection aArguments; @@ -686,16 +686,16 @@ void OApplicationController::doAction(sal_uInt16 _nId, const ElementOpenMode _eO eOpenMode = E_OPEN_NORMAL; } - ::std::vector< ::std::pair< OUString ,Reference< XModel > > > aComponents; - ::std::vector< OUString>::const_iterator aEnd = aList.end(); - for (::std::vector< OUString>::const_iterator aIter = aList.begin(); aIter != aEnd; ++aIter) + std::vector< std::pair< OUString ,Reference< XModel > > > aComponents; + std::vector< OUString>::const_iterator aEnd = aList.end(); + for (std::vector< OUString>::const_iterator aIter = aList.begin(); aIter != aEnd; ++aIter) { if ( SID_DB_APP_CONVERTTOVIEW == _nId ) convertToView(*aIter); else { Reference< XModel > xModel( openElementWithArguments( *aIter, eType, eOpenMode, _nId,aArguments ), UNO_QUERY ); - aComponents.push_back( ::std::pair< OUString, Reference< XModel > >( *aIter, xModel ) ); + aComponents.push_back( std::pair< OUString, Reference< XModel > >( *aIter, xModel ) ); } } @@ -703,8 +703,8 @@ void OApplicationController::doAction(sal_uInt16 _nId, const ElementOpenMode _eO if ( _eOpenMode == E_OPEN_FOR_MAIL ) { - ::std::vector< ::std::pair< OUString ,Reference< XModel > > >::const_iterator componentIter = aComponents.begin(); - ::std::vector< ::std::pair< OUString ,Reference< XModel > > >::const_iterator componentEnd = aComponents.end(); + std::vector< std::pair< OUString ,Reference< XModel > > >::const_iterator componentIter = aComponents.begin(); + std::vector< std::pair< OUString ,Reference< XModel > > >::const_iterator componentEnd = aComponents.end(); OUString aDocTypeString; SfxMailModel aSendMail; SfxMailModel::SendMailResult eResult = SfxMailModel::SEND_MAIL_OK; diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx index 2a65a8852832..ac36ea17bc1d 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx @@ -311,7 +311,7 @@ void OAppDetailPageHelper::sortUp() sort(nPos,SortAscending); } -void OAppDetailPageHelper::getSelectionElementNames( ::std::vector< OUString>& _rNames ) const +void OAppDetailPageHelper::getSelectionElementNames( std::vector< OUString>& _rNames ) const { int nPos = getVisibleControlIndex(); if ( nPos < E_ELEMENT_TYPE_COUNT ) @@ -366,7 +366,7 @@ void OAppDetailPageHelper::describeCurrentSelectionForType( const ElementType _e if ( !pList ) return; - ::std::vector< NamedDatabaseObject > aSelected; + std::vector< NamedDatabaseObject > aSelected; SvTreeListEntry* pEntry = pList->FirstSelected(); while( pEntry ) diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.hxx b/dbaccess/source/ui/app/AppDetailPageHelper.hxx index 7aeda4283357..b94c4c77624b 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.hxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.hxx @@ -209,7 +209,7 @@ namespace dbaui @param _rNames The list will be filled. */ - void getSelectionElementNames( ::std::vector< OUString>& _rNames ) const; + void getSelectionElementNames( std::vector< OUString>& _rNames ) const; /** describes the current selection for the given control */ diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx index d9f8a0b3fe62..9961e28beb2d 100644 --- a/dbaccess/source/ui/app/AppDetailView.cxx +++ b/dbaccess/source/ui/app/AppDetailView.cxx @@ -162,8 +162,8 @@ Rectangle OCreationList::GetFocusRect( SvTreeListEntry* _pEntry, long _nLine ) aRect.Left() = pTab->GetPos() - pItemData->maSize.Width() / 2; // inflate the rectangle a little bit - looks better, too - aRect.Left() = ::std::max< long >( 0, aRect.Left() - 2 ); - aRect.Right() = ::std::min< long >( GetOutputSizePixel().Width() - 1, aRect.Right() + 2 ); + aRect.Left() = std::max< long >( 0, aRect.Left() - 2 ); + aRect.Right() = std::min< long >( GetOutputSizePixel().Width() - 1, aRect.Right() + 2 ); return aRect; } @@ -785,7 +785,7 @@ sal_Int32 OApplicationDetailView::getElementCount() return m_pControlHelper->getElementCount(); } -void OApplicationDetailView::getSelectionElementNames( ::std::vector< OUString>& _rNames ) const +void OApplicationDetailView::getSelectionElementNames( std::vector< OUString>& _rNames ) const { m_pControlHelper->getSelectionElementNames( _rNames ); } diff --git a/dbaccess/source/ui/app/AppDetailView.hxx b/dbaccess/source/ui/app/AppDetailView.hxx index 988be3f003b9..03cb81134b6a 100644 --- a/dbaccess/source/ui/app/AppDetailView.hxx +++ b/dbaccess/source/ui/app/AppDetailView.hxx @@ -99,7 +99,7 @@ namespace dbaui TaskEntry( const sal_Char* _pAsciiUNOCommand, sal_uInt16 _nHelpID, sal_uInt16 _nTitleResourceID, bool _bHideWhenDisabled = false ); }; - typedef ::std::vector< TaskEntry > TaskEntryList; + typedef std::vector< TaskEntry > TaskEntryList; struct TaskPaneData { @@ -150,7 +150,7 @@ namespace dbaui VclPtr<OTitleWindow> m_aContainer; OAppBorderWindow& m_rBorderWin; // my parent VclPtr<OAppDetailPageHelper> m_pControlHelper; - ::std::vector< TaskPaneData > m_aTaskPaneData; + std::vector< TaskPaneData > m_aTaskPaneData; MnemonicGenerator m_aExternalMnemonics; void ImplInitSettings(); @@ -256,7 +256,7 @@ namespace dbaui @param _rNames The list will be filled. */ - void getSelectionElementNames(::std::vector< OUString>& _rNames ) const; + void getSelectionElementNames(std::vector< OUString>& _rNames ) const; /** describes the current selection for the given control */ diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx index c4b1a92908ac..f8831c38ef4b 100644 --- a/dbaccess/source/ui/app/AppView.cxx +++ b/dbaccess/source/ui/app/AppView.cxx @@ -122,7 +122,7 @@ void OAppBorderWindow::Resize() if ( pSwap->GetEntryCount() != 0 ) nX = pSwap->GetBoundingBox( pSwap->GetEntry(0) ).GetWidth() + aFLSize.Height(); } - nX = ::std::max(m_pPanel->GetWidthPixel() ,nX); + nX = std::max(m_pPanel->GetWidthPixel() ,nX); m_pPanel->SetPosSizePixel(Point(0,0),Size(nX,nOutputHeight)); } @@ -401,7 +401,7 @@ sal_Int32 OApplicationView::getElementCount() return getDetailView()->getElementCount(); } -void OApplicationView::getSelectionElementNames( ::std::vector< OUString>& _rNames ) const +void OApplicationView::getSelectionElementNames( std::vector< OUString>& _rNames ) const { OSL_ENSURE(m_pWin && getDetailView(),"Detail view is NULL! -> GPF"); getDetailView()->getSelectionElementNames( _rNames ); diff --git a/dbaccess/source/ui/app/AppView.hxx b/dbaccess/source/ui/app/AppView.hxx index d057ea3eb6ff..136c25535962 100644 --- a/dbaccess/source/ui/app/AppView.hxx +++ b/dbaccess/source/ui/app/AppView.hxx @@ -189,7 +189,7 @@ namespace dbaui @param _rNames The list will be filled. */ - void getSelectionElementNames( ::std::vector< OUString>& _rNames ) const; + void getSelectionElementNames( std::vector< OUString>& _rNames ) const; /** describes the current selection for the given control */ diff --git a/dbaccess/source/ui/app/subcomponentmanager.cxx b/dbaccess/source/ui/app/subcomponentmanager.cxx index fbe1bdc05f54..900f6845441c 100644 --- a/dbaccess/source/ui/app/subcomponentmanager.cxx +++ b/dbaccess/source/ui/app/subcomponentmanager.cxx @@ -157,7 +157,7 @@ namespace dbaui } }; - struct SelectSubComponent : public ::std::unary_function< SubComponentDescriptor, Reference< XComponent > > + struct SelectSubComponent : public std::unary_function< SubComponentDescriptor, Reference< XComponent > > { Reference< XComponent > operator()( const SubComponentDescriptor &_desc ) const { @@ -168,9 +168,9 @@ namespace dbaui } }; - typedef ::std::vector< SubComponentDescriptor > SubComponents; + typedef std::vector< SubComponentDescriptor > SubComponents; - struct SubComponentMatch : public ::std::unary_function< SubComponentDescriptor, bool > + struct SubComponentMatch : public std::unary_function< SubComponentDescriptor, bool > { public: SubComponentMatch( const OUString& i_rName, const sal_Int32 i_nComponentType, @@ -413,7 +413,7 @@ namespace dbaui ::osl::MutexGuard aGuard( m_pData->getMutex() ); Sequence< Reference< XComponent > > aComponents( m_pData->m_aComponents.size() ); - ::std::transform( + std::transform( m_pData->m_aComponents.begin(), m_pData->m_aComponents.end(), aComponents.getArray(), @@ -461,7 +461,7 @@ namespace dbaui if ( !_rName.isEmpty() ) { // check there does not already exist such a component - SubComponents::const_iterator existentPos = ::std::find_if( + SubComponents::const_iterator existentPos = std::find_if( m_pData->m_aComponents.begin(), m_pData->m_aComponents.end(), SubComponentMatch( _rName, _nComponentType, _eOpenMode ) @@ -492,7 +492,7 @@ namespace dbaui { ::osl::MutexGuard aGuard( m_pData->getMutex() ); - SubComponents::const_iterator pos = ::std::find_if( + SubComponents::const_iterator pos = std::find_if( m_pData->m_aComponents.begin(), m_pData->m_aComponents.end(), SubComponentMatch( _rName, _nComponentType, _eOpenMode ) diff --git a/dbaccess/source/ui/app/subcomponentmanager.hxx b/dbaccess/source/ui/app/subcomponentmanager.hxx index 8572f2342e69..a7a1fb8bed96 100644 --- a/dbaccess/source/ui/app/subcomponentmanager.hxx +++ b/dbaccess/source/ui/app/subcomponentmanager.hxx @@ -113,7 +113,7 @@ namespace dbaui ); private: - ::std::unique_ptr< SubComponentManager_Data > m_pData; + std::unique_ptr< SubComponentManager_Data > m_pData; }; } // namespace dbaui |