diff options
author | Tor Lillqvist <tml@collabora.com> | 2017-02-15 22:31:33 +0200 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2017-02-15 21:50:23 +0000 |
commit | 013d9789c753d46f0a038e54db6e21f4d4922891 (patch) | |
tree | 52480d6515d2def1f568a2f6023ee0799cd9b2af /basctl | |
parent | d007cef2dfd0c4d7b009b4f943464c6c4854d88d (diff) |
Drop :: prefix from std in [a-b]*/
Change-Id: I0422aaf39bbce889c95ed9a81a0784cb03a1badd
Reviewed-on: https://gerrit.libreoffice.org/34320
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'basctl')
-rw-r--r-- | basctl/source/accessibility/accessibledialogwindow.cxx | 6 | ||||
-rw-r--r-- | basctl/source/basicide/basides1.cxx | 2 | ||||
-rw-r--r-- | basctl/source/basicide/basobj2.cxx | 14 | ||||
-rw-r--r-- | basctl/source/basicide/bastypes.cxx | 4 | ||||
-rw-r--r-- | basctl/source/basicide/breakpoint.cxx | 4 | ||||
-rw-r--r-- | basctl/source/basicide/breakpoint.hxx | 2 | ||||
-rw-r--r-- | basctl/source/basicide/documentenumeration.cxx | 2 | ||||
-rw-r--r-- | basctl/source/basicide/documentenumeration.hxx | 4 | ||||
-rw-r--r-- | basctl/source/basicide/macrodlg.cxx | 2 | ||||
-rw-r--r-- | basctl/source/basicide/moduldl2.cxx | 2 | ||||
-rw-r--r-- | basctl/source/basicide/scriptdocument.cxx | 12 | ||||
-rw-r--r-- | basctl/source/dlged/dlgedobj.cxx | 18 | ||||
-rw-r--r-- | basctl/source/inc/accessibledialogwindow.hxx | 2 | ||||
-rw-r--r-- | basctl/source/inc/dlgedobj.hxx | 4 | ||||
-rw-r--r-- | basctl/source/inc/scriptdocument.hxx | 2 |
15 files changed, 40 insertions, 40 deletions
diff --git a/basctl/source/accessibility/accessibledialogwindow.cxx b/basctl/source/accessibility/accessibledialogwindow.cxx index 461c3ab69ef9..a9d4c928e7c5 100644 --- a/basctl/source/accessibility/accessibledialogwindow.cxx +++ b/basctl/source/accessibility/accessibledialogwindow.cxx @@ -241,7 +241,7 @@ bool AccessibleDialogWindow::IsChildVisible( const ChildDescriptor& rDesc ) void AccessibleDialogWindow::InsertChild( const ChildDescriptor& rDesc ) { // check, if object is already in child list - AccessibleChildren::iterator aIter = ::std::find( m_aAccessibleChildren.begin(), m_aAccessibleChildren.end(), rDesc ); + AccessibleChildren::iterator aIter = std::find( m_aAccessibleChildren.begin(), m_aAccessibleChildren.end(), rDesc ); // if not found, insert in child list if ( aIter == m_aAccessibleChildren.end() ) @@ -269,7 +269,7 @@ void AccessibleDialogWindow::InsertChild( const ChildDescriptor& rDesc ) void AccessibleDialogWindow::RemoveChild( const ChildDescriptor& rDesc ) { // find object in child list - AccessibleChildren::iterator aIter = ::std::find( m_aAccessibleChildren.begin(), m_aAccessibleChildren.end(), rDesc ); + AccessibleChildren::iterator aIter = std::find( m_aAccessibleChildren.begin(), m_aAccessibleChildren.end(), rDesc ); // if found, remove from child list if ( aIter != m_aAccessibleChildren.end() ) @@ -325,7 +325,7 @@ void AccessibleDialogWindow::UpdateChildren() void AccessibleDialogWindow::SortChildren() { // sort child list - ::std::sort( m_aAccessibleChildren.begin(), m_aAccessibleChildren.end() ); + std::sort( m_aAccessibleChildren.begin(), m_aAccessibleChildren.end() ); } diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx index 43d40784ee21..4d4cde8b6819 100644 --- a/basctl/source/basicide/basides1.cxx +++ b/basctl/source/basicide/basides1.cxx @@ -637,7 +637,7 @@ void Shell::ExecuteGlobal( SfxRequest& rReq ) long nMaxY = nTextHeight - nVisHeight; long nOldY = pTextView->GetStartDocPos().Y(); long nNewY = nLine * pTextEngine->GetCharHeight() - nVisHeight / 2; - nNewY = ::std::min( nNewY, nMaxY ); + nNewY = std::min( nNewY, nMaxY ); pTextView->Scroll( 0, -( nNewY - nOldY ) ); pTextView->ShowCursor( false ); pModWin->GetEditVScrollBar().SetThumbPos( pTextView->GetStartDocPos().Y() ); diff --git a/basctl/source/basicide/basobj2.cxx b/basctl/source/basicide/basobj2.cxx index ae859336ee64..34eaa8bcfe9e 100644 --- a/basctl/source/basicide/basobj2.cxx +++ b/basctl/source/basicide/basobj2.cxx @@ -98,7 +98,7 @@ static bool StringCompareLessThan( const OUString& rStr1, const OUString& rStr2 Sequence< OUString > GetMergedLibraryNames( const Reference< script::XLibraryContainer >& xModLibContainer, const Reference< script::XLibraryContainer >& xDlgLibContainer ) { // create a sorted list of module library names - ::std::vector<OUString> aModLibList; + std::vector<OUString> aModLibList; if ( xModLibContainer.is() ) { Sequence< OUString > aModLibNames = xModLibContainer->getElementNames(); @@ -106,11 +106,11 @@ Sequence< OUString > GetMergedLibraryNames( const Reference< script::XLibraryCon const OUString* pModLibNames = aModLibNames.getConstArray(); for ( sal_Int32 i = 0 ; i < nModLibCount ; i++ ) aModLibList.push_back( pModLibNames[ i ] ); - ::std::sort( aModLibList.begin() , aModLibList.end() , StringCompareLessThan ); + std::sort( aModLibList.begin() , aModLibList.end() , StringCompareLessThan ); } // create a sorted list of dialog library names - ::std::vector<OUString> aDlgLibList; + std::vector<OUString> aDlgLibList; if ( xDlgLibContainer.is() ) { Sequence< OUString > aDlgLibNames = xDlgLibContainer->getElementNames(); @@ -118,13 +118,13 @@ Sequence< OUString > GetMergedLibraryNames( const Reference< script::XLibraryCon const OUString* pDlgLibNames = aDlgLibNames.getConstArray(); for ( sal_Int32 i = 0 ; i < nDlgLibCount ; i++ ) aDlgLibList.push_back( pDlgLibNames[ i ] ); - ::std::sort( aDlgLibList.begin() , aDlgLibList.end() , StringCompareLessThan ); + std::sort( aDlgLibList.begin() , aDlgLibList.end() , StringCompareLessThan ); } // merge both lists - ::std::vector<OUString> aLibList( aModLibList.size() + aDlgLibList.size() ); - ::std::merge( aModLibList.begin(), aModLibList.end(), aDlgLibList.begin(), aDlgLibList.end(), aLibList.begin(), StringCompareLessThan ); - ::std::vector<OUString>::iterator aIterEnd = ::std::unique( aLibList.begin(), aLibList.end() ); // move unique elements to the front + std::vector<OUString> aLibList( aModLibList.size() + aDlgLibList.size() ); + std::merge( aModLibList.begin(), aModLibList.end(), aDlgLibList.begin(), aDlgLibList.end(), aLibList.begin(), StringCompareLessThan ); + std::vector<OUString>::iterator aIterEnd = std::unique( aLibList.begin(), aLibList.end() ); // move unique elements to the front aLibList.erase( aIterEnd, aLibList.end() ); // remove duplicates // copy to sequence diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx index 14381efba979..c89db1f31c8a 100644 --- a/basctl/source/basicide/bastypes.cxx +++ b/basctl/source/basicide/bastypes.cxx @@ -546,8 +546,8 @@ void TabBar::Sort() } // sort module and dialog lists by page text - ::std::sort( aModuleList.begin() , aModuleList.end() ); - ::std::sort( aDialogList.begin() , aDialogList.end() ); + std::sort( aModuleList.begin() , aModuleList.end() ); + std::sort( aDialogList.begin() , aDialogList.end() ); sal_uInt16 nModules = sal::static_int_cast<sal_uInt16>( aModuleList.size() ); diff --git a/basctl/source/basicide/breakpoint.cxx b/basctl/source/basicide/breakpoint.cxx index 3396a198a772..8e8973d7b2bd 100644 --- a/basctl/source/basicide/breakpoint.cxx +++ b/basctl/source/basicide/breakpoint.cxx @@ -55,7 +55,7 @@ void BreakPointList::transfer(BreakPointList & rList) void BreakPointList::InsertSorted(BreakPoint* pNewBrk) { - for ( ::std::vector< BreakPoint* >::iterator i = maBreakPoints.begin(); i < maBreakPoints.end(); ++i ) + for ( std::vector< BreakPoint* >::iterator i = maBreakPoints.begin(); i < maBreakPoints.end(); ++i ) { if ( pNewBrk->nLine <= (*i)->nLine ) { @@ -131,7 +131,7 @@ void BreakPointList::ResetHitCount() BreakPoint* BreakPointList::remove(BreakPoint* ptr) { - for ( ::std::vector< BreakPoint* >::iterator i = maBreakPoints.begin(); i < maBreakPoints.end(); ++i ) + for ( std::vector< BreakPoint* >::iterator i = maBreakPoints.begin(); i < maBreakPoints.end(); ++i ) { if ( ptr == *i ) { diff --git a/basctl/source/basicide/breakpoint.hxx b/basctl/source/basicide/breakpoint.hxx index 2ade823452bf..5e666e5cdac9 100644 --- a/basctl/source/basicide/breakpoint.hxx +++ b/basctl/source/basicide/breakpoint.hxx @@ -50,7 +50,7 @@ class BreakPointList { private: void operator =(BreakPointList) = delete; - ::std::vector<BreakPoint*> maBreakPoints; + std::vector<BreakPoint*> maBreakPoints; public: BreakPointList(); diff --git a/basctl/source/basicide/documentenumeration.cxx b/basctl/source/basicide/documentenumeration.cxx index 8e91502592be..224189d5e678 100644 --- a/basctl/source/basicide/documentenumeration.cxx +++ b/basctl/source/basicide/documentenumeration.cxx @@ -105,7 +105,7 @@ namespace basctl { namespace docs { const IDocumentDescriptorFilter* _pFilter ) { // ensure we don't encounter some models multiple times - ::std::set< Reference< XModel >, ::comphelper::OInterfaceCompare< XModel > > aEncounteredModels; + std::set< Reference< XModel >, ::comphelper::OInterfaceCompare< XModel > > aEncounteredModels; for ( const Reference< XFrame >* pFrame = _rFrames.getConstArray(); pFrame != _rFrames.getConstArray() + _rFrames.getLength(); diff --git a/basctl/source/basicide/documentenumeration.hxx b/basctl/source/basicide/documentenumeration.hxx index 886c9358c62f..964a2c8c4d92 100644 --- a/basctl/source/basicide/documentenumeration.hxx +++ b/basctl/source/basicide/documentenumeration.hxx @@ -32,7 +32,7 @@ namespace com { namespace sun { namespace star { namespace uno { namespace basctl { namespace docs { - typedef ::std::vector< css::uno::Reference< css::frame::XController > > Controllers; + typedef std::vector< css::uno::Reference< css::frame::XController > > Controllers; struct DocumentDescriptor { @@ -40,7 +40,7 @@ namespace basctl { namespace docs { Controllers aControllers; }; - typedef ::std::vector< DocumentDescriptor > Documents; + typedef std::vector< DocumentDescriptor > Documents; /// allows pre-filtering when enumerating document descriptors diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx index ff3e49c9a31e..e31f618d2d6d 100644 --- a/basctl/source/basicide/macrodlg.cxx +++ b/basctl/source/basicide/macrodlg.cxx @@ -41,7 +41,7 @@ namespace basctl { -using ::std::map; +using std::map; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx index d17f91210c91..efeab6380792 100644 --- a/basctl/source/basicide/moduldl2.cxx +++ b/basctl/source/basicide/moduldl2.cxx @@ -1250,7 +1250,7 @@ void LibPage::ExportAsPackage( const OUString& aLibName ) xSFA->kill( aMetaInfFolder ); xSFA->createFolder( aMetaInfFolder ); - ::std::vector< Sequence<beans::PropertyValue> > manifest; + std::vector< Sequence<beans::PropertyValue> > manifest; const OUString strMediaType = "MediaType" ; const OUString strFullPath = "FullPath" ; const OUString strBasicMediaType = "application/vnd.sun.star.basic-library" ; diff --git a/basctl/source/basicide/scriptdocument.cxx b/basctl/source/basicide/scriptdocument.cxx index 49a0f271b2d4..721dee8330c8 100644 --- a/basctl/source/basicide/scriptdocument.cxx +++ b/basctl/source/basicide/scriptdocument.cxx @@ -1124,7 +1124,7 @@ namespace basctl namespace { - struct DocumentTitleLess : public ::std::binary_function< ScriptDocument, ScriptDocument, bool > + struct DocumentTitleLess : public std::binary_function< ScriptDocument, ScriptDocument, bool > { explicit DocumentTitleLess( const CollatorWrapper& _rCollator ) :m_aCollator( _rCollator ) @@ -1178,7 +1178,7 @@ namespace basctl { CollatorWrapper aCollator( ::comphelper::getProcessComponentContext() ); aCollator.loadDefaultCollator( SvtSysLocale().GetLanguageTag().getLocale(), 0 ); - ::std::sort( aScriptDocs.begin(), aScriptDocs.end(), DocumentTitleLess( aCollator ) ); + std::sort( aScriptDocs.begin(), aScriptDocs.end(), DocumentTitleLess( aCollator ) ); } return aScriptDocs; @@ -1258,7 +1258,7 @@ namespace basctl } // sort - ::std::sort( aModuleNames.getArray() , aModuleNames.getArray() + aModuleNames.getLength() , StringCompareLessThan ); + std::sort( aModuleNames.getArray() , aModuleNames.getArray() + aModuleNames.getLength() , StringCompareLessThan ); return aModuleNames; } @@ -1271,9 +1271,9 @@ namespace basctl OUString aBaseName = _eType == E_SCRIPTS ? OUString("Module") : OUString("Dialog"); Sequence< OUString > aUsedNames( getObjectNames( _eType, _rLibName ) ); - ::std::set< OUString > aUsedNamesCheck; - ::std::copy( aUsedNames.begin(), aUsedNames.end(), - ::std::insert_iterator< ::std::set< OUString > >( aUsedNamesCheck, aUsedNamesCheck.begin() ) ); + std::set< OUString > aUsedNamesCheck; + std::copy( aUsedNames.begin(), aUsedNames.end(), + std::insert_iterator< std::set< OUString > >( aUsedNamesCheck, aUsedNamesCheck.begin() ) ); bool bValid = false; sal_Int32 i = 1; diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx index a2ac76553099..d33dd9d06233 100644 --- a/basctl/source/dlged/dlgedobj.cxx +++ b/basctl/source/dlged/dlgedobj.cxx @@ -527,8 +527,8 @@ void DlgEdObj::TabIndexChange( const beans::PropertyChangeEvent& evt ) if ( pForm ) { // stop listening with all children - ::std::vector<DlgEdObj*> aChildList = pForm->GetChildren(); - ::std::vector<DlgEdObj*>::iterator aIter; + std::vector<DlgEdObj*> aChildList = pForm->GetChildren(); + std::vector<DlgEdObj*>::iterator aIter; for ( aIter = aChildList.begin() ; aIter != aChildList.end() ; ++aIter ) { (*aIter)->EndListening( false ); @@ -565,8 +565,8 @@ void DlgEdObj::TabIndexChange( const beans::PropertyChangeEvent& evt ) } // create a helper list of control names, sorted by tab index - ::std::vector< OUString > aNameList( aIndexToNameMap.size() ); - ::std::transform( + std::vector< OUString > aNameList( aIndexToNameMap.size() ); + std::transform( aIndexToNameMap.begin(), aIndexToNameMap.end(), aNameList.begin(), ::o3tl::select2nd< IndexToNameMap::value_type >( ) @@ -1257,7 +1257,7 @@ void DlgEdForm::AddChild( DlgEdObj* pDlgEdObj ) void DlgEdForm::RemoveChild( DlgEdObj* pDlgEdObj ) { - pChildren.erase( ::std::find( pChildren.begin() , pChildren.end() , pDlgEdObj ) ); + pChildren.erase( std::find( pChildren.begin() , pChildren.end() , pDlgEdObj ) ); } void DlgEdForm::PositionAndSizeChange( const beans::PropertyChangeEvent& evt ) @@ -1389,7 +1389,7 @@ void DlgEdForm::UpdateStep() void DlgEdForm::UpdateTabIndices() { // stop listening with all children - ::std::vector<DlgEdObj*>::iterator aIter; + std::vector<DlgEdObj*>::iterator aIter; for ( aIter = pChildren.begin() ; aIter != pChildren.end() ; ++aIter ) { (*aIter)->EndListening( false ); @@ -1479,7 +1479,7 @@ void DlgEdForm::UpdateGroups() if ( xTabModel.is() ) { // create a global list of controls that belong to the dialog - ::std::vector<DlgEdObj*> aChildList = GetChildren(); + std::vector<DlgEdObj*> aChildList = GetChildren(); sal_uInt32 nSize = aChildList.size(); Sequence< Reference< awt::XControl > > aSeqControls( nSize ); for ( sal_uInt32 i = 0; i < nSize; ++i ) @@ -1546,7 +1546,7 @@ void DlgEdForm::NbcMove( const Size& rSize ) StartListening(); // set geometry properties of all children - ::std::vector<DlgEdObj*>::iterator aIter; + std::vector<DlgEdObj*>::iterator aIter; for ( aIter = pChildren.begin() ; aIter != pChildren.end() ; ++aIter ) { (*aIter)->EndListening(false); @@ -1568,7 +1568,7 @@ void DlgEdForm::NbcResize(const Point& rRef, const Fraction& xFract, const Fract StartListening(); // set geometry properties of all children - ::std::vector<DlgEdObj*>::iterator aIter; + std::vector<DlgEdObj*>::iterator aIter; for ( aIter = pChildren.begin() ; aIter != pChildren.end() ; ++aIter ) { (*aIter)->EndListening(false); diff --git a/basctl/source/inc/accessibledialogwindow.hxx b/basctl/source/inc/accessibledialogwindow.hxx index bc87d60e2b0a..57c16698699e 100644 --- a/basctl/source/inc/accessibledialogwindow.hxx +++ b/basctl/source/inc/accessibledialogwindow.hxx @@ -74,7 +74,7 @@ private: bool operator<( const ChildDescriptor& rDesc ) const; }; - typedef ::std::vector< ChildDescriptor > AccessibleChildren; + typedef std::vector< ChildDescriptor > AccessibleChildren; AccessibleChildren m_aAccessibleChildren; VCLExternalSolarLock* m_pExternalLock; diff --git a/basctl/source/inc/dlgedobj.hxx b/basctl/source/inc/dlgedobj.hxx index f88423976450..babad14c1ef1 100644 --- a/basctl/source/inc/dlgedobj.hxx +++ b/basctl/source/inc/dlgedobj.hxx @@ -31,7 +31,7 @@ namespace basctl { -typedef ::std::multimap< sal_Int16, OUString > IndexToNameMap; +typedef std::multimap< sal_Int16, OUString > IndexToNameMap; class DlgEdForm; @@ -148,7 +148,7 @@ class DlgEdForm: public DlgEdObj private: DlgEditor& rDlgEditor; - ::std::vector<DlgEdObj*> pChildren; + std::vector<DlgEdObj*> pChildren; mutable ::boost::optional< css::awt::DeviceInfo > mpDeviceInfo; diff --git a/basctl/source/inc/scriptdocument.hxx b/basctl/source/inc/scriptdocument.hxx index 68835bf3d074..04db4f1363a9 100644 --- a/basctl/source/inc/scriptdocument.hxx +++ b/basctl/source/inc/scriptdocument.hxx @@ -58,7 +58,7 @@ namespace basctl }; class ScriptDocument; - typedef ::std::vector< ScriptDocument > ScriptDocuments; + typedef std::vector< ScriptDocument > ScriptDocuments; /** encapsulates a document which contains Basic scripts and dialogs */ |