diff options
Diffstat (limited to 'dbaccess/source/ui/browser')
-rw-r--r-- | dbaccess/source/ui/browser/brwctrlr.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/browser/dsbrowserDnD.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/browser/formadapter.cxx | 14 | ||||
-rw-r--r-- | dbaccess/source/ui/browser/genericcontroller.cxx | 30 | ||||
-rw-r--r-- | dbaccess/source/ui/browser/sbagrid.cxx | 8 | ||||
-rw-r--r-- | dbaccess/source/ui/browser/unodatbr.cxx | 28 |
6 files changed, 42 insertions, 42 deletions
diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx index f2813dd90764..e854c2435d5c 100644 --- a/dbaccess/source/ui/browser/brwctrlr.cxx +++ b/dbaccess/source/ui/browser/brwctrlr.cxx @@ -1831,7 +1831,7 @@ void SbaXDataBrowserController::ExecuteSearch() VclPtr<AbstractFmSearchDialog> pDialog; if ( pFact ) { - ::std::vector< OUString > aContextNames; + std::vector< OUString > aContextNames; aContextNames.push_back( OUString("Standard") ); pDialog = pFact->CreateFmSearchDialog(getBrowserView(), sInitialText, aContextNames, 0, LINK(this, SbaXDataBrowserController, OnSearchContextRequest)); } diff --git a/dbaccess/source/ui/browser/dsbrowserDnD.cxx b/dbaccess/source/ui/browser/dsbrowserDnD.cxx index 51221cc8b34e..a09b4a000744 100644 --- a/dbaccess/source/ui/browser/dsbrowserDnD.cxx +++ b/dbaccess/source/ui/browser/dsbrowserDnD.cxx @@ -109,7 +109,7 @@ namespace dbaui if ( xChild.is() ) xStore.set( getDataSourceOrModel(xChild->getParent()), UNO_QUERY ); // check for the concrete type - if ( xStore.is() && !xStore->isReadonly() && ::std::any_of(_rFlavors.begin(),_rFlavors.end(),TAppSupportedSotFunctor(E_TABLE)) ) + if ( xStore.is() && !xStore->isReadonly() && std::any_of(_rFlavors.begin(),_rFlavors.end(),TAppSupportedSotFunctor(E_TABLE)) ) return DND_ACTION_COPY; } } diff --git a/dbaccess/source/ui/browser/formadapter.cxx b/dbaccess/source/ui/browser/formadapter.cxx index 20ae83b97b56..083f2f536420 100644 --- a/dbaccess/source/ui/browser/formadapter.cxx +++ b/dbaccess/source/ui/browser/formadapter.cxx @@ -1087,7 +1087,7 @@ void SAL_CALL SbaXFormAdapter::dispose() m_aContainerListeners.disposeAndClear(aEvt); // dispose all children - for ( ::std::vector< Reference< css::form::XFormComponent > >::const_iterator aIter = m_aChildren.begin(); + for ( std::vector< Reference< css::form::XFormComponent > >::const_iterator aIter = m_aChildren.begin(); aIter != m_aChildren.end(); ++aIter ) @@ -1429,9 +1429,9 @@ void SbaXFormAdapter::implInsert(const Any& aElement, sal_Int32 nIndex, const OU sal_Int32 SbaXFormAdapter::implGetPos(const OUString& rName) { - ::std::vector< OUString>::const_iterator aIter = ::std::find_if( m_aChildNames.begin(), + std::vector< OUString>::const_iterator aIter = std::find_if( m_aChildNames.begin(), m_aChildNames.end(), - ::std::bind2nd(::std::equal_to< OUString>(),rName)); + std::bind2nd(std::equal_to< OUString>(),rName)); if(aIter != m_aChildNames.end()) return aIter - m_aChildNames.begin(); @@ -1632,9 +1632,9 @@ void SAL_CALL SbaXFormAdapter::propertyChange(const css::beans::PropertyChangeEv { if (evt.PropertyName == PROPERTY_NAME) { - ::std::vector< css::uno::Reference< css::form::XFormComponent > >::const_iterator aIter = ::std::find_if( m_aChildren.begin(), + std::vector< css::uno::Reference< css::form::XFormComponent > >::const_iterator aIter = std::find_if( m_aChildren.begin(), m_aChildren.end(), - ::std::bind2nd(::std::equal_to< css::uno::Reference< css::uno::XInterface > >(),evt.Source)); + std::bind2nd(std::equal_to< css::uno::Reference< css::uno::XInterface > >(),evt.Source)); if(aIter != m_aChildren.end()) { @@ -1652,9 +1652,9 @@ void SAL_CALL SbaXFormAdapter::disposing(const css::lang::EventObject& Source) if (Source.Source == m_xMainForm) dispose(); - ::std::vector< css::uno::Reference< css::form::XFormComponent > >::const_iterator aIter = ::std::find_if( m_aChildren.begin(), + std::vector< css::uno::Reference< css::form::XFormComponent > >::const_iterator aIter = std::find_if( m_aChildren.begin(), m_aChildren.end(), - ::std::bind2nd(::std::equal_to< css::uno::Reference< css::uno::XInterface > >(),Source.Source)); + std::bind2nd(std::equal_to< css::uno::Reference< css::uno::XInterface > >(),Source.Source)); if(aIter != m_aChildren.end()) removeByIndex(aIter - m_aChildren.begin()); } diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx index f8c6113a5479..dcac408abfce 100644 --- a/dbaccess/source/ui/browser/genericcontroller.cxx +++ b/dbaccess/source/ui/browser/genericcontroller.cxx @@ -78,8 +78,8 @@ using namespace ::dbtools; using namespace ::comphelper; #define ALL_FEATURES -1 -#define FIRST_USER_DEFINED_FEATURE ( ::std::numeric_limits< sal_uInt16 >::max() - 1000 ) -#define LAST_USER_DEFINED_FEATURE ( ::std::numeric_limits< sal_uInt16 >::max() ) +#define FIRST_USER_DEFINED_FEATURE ( std::numeric_limits< sal_uInt16 >::max() - 1000 ) +#define LAST_USER_DEFINED_FEATURE ( std::numeric_limits< sal_uInt16 >::max() ) typedef std::unordered_map< sal_Int16, sal_Int16 > CommandHashMap; @@ -401,7 +401,7 @@ void OGenericUnoController::attachFrame( const Reference< XFrame >& _rxFrame ) namespace { - typedef ::std::vector< Any > States; + typedef std::vector< Any > States; void lcl_notifyMultipleStates( XStatusListener& _rListener, FeatureStateEvent& _rEvent, const States& _rStates ) { @@ -503,10 +503,10 @@ void OGenericUnoController::ImplBroadcastFeatureState(const OUString& _rFeature, bool OGenericUnoController::isFeatureSupported( sal_Int32 _nId ) { - SupportedFeatures::const_iterator aFeaturePos = ::std::find_if( + SupportedFeatures::const_iterator aFeaturePos = std::find_if( m_aSupportedFeatures.begin(), m_aSupportedFeatures.end(), - ::std::bind2nd( CompareFeatureById(), _nId ) + std::bind2nd( CompareFeatureById(), _nId ) ); return ( m_aSupportedFeatures.end() != aFeaturePos && !aFeaturePos->first.isEmpty()); @@ -536,10 +536,10 @@ void OGenericUnoController::InvalidateFeature_Impl() } else { - SupportedFeatures::const_iterator aFeaturePos = ::std::find_if( + SupportedFeatures::const_iterator aFeaturePos = std::find_if( m_aSupportedFeatures.begin(), m_aSupportedFeatures.end(), - ::std::bind2nd( CompareFeatureById(), aNextFeature.nId ) + std::bind2nd( CompareFeatureById(), aNextFeature.nId ) ); #if OSL_DEBUG_LEVEL > 0 @@ -573,10 +573,10 @@ void OGenericUnoController::ImplInvalidateFeature( sal_Int32 _nId, const Referen #if OSL_DEBUG_LEVEL > 0 if ( _nId != -1 ) { - SupportedFeatures::const_iterator aFeaturePos = ::std::find_if( + SupportedFeatures::const_iterator aFeaturePos = std::find_if( m_aSupportedFeatures.begin(), m_aSupportedFeatures.end(), - ::std::bind2nd( CompareFeatureById(), _nId ) + std::bind2nd( CompareFeatureById(), _nId ) ); OSL_ENSURE( aFeaturePos != m_aSupportedFeatures.end(), "OGenericUnoController::ImplInvalidateFeature: invalidating an unsupported feature is suspicious, at least!" ); } @@ -759,9 +759,9 @@ void OGenericUnoController::removeStatusListener(const Reference< XStatusListene // now remove the listener from the deque ::osl::MutexGuard aGuard( m_aFeatureMutex ); m_aFeaturesToInvalidate.erase( - ::std::remove_if( m_aFeaturesToInvalidate.begin(), + std::remove_if( m_aFeaturesToInvalidate.begin(), m_aFeaturesToInvalidate.end(), - ::std::bind2nd(FindFeatureListener(),aListener)) + std::bind2nd(FindFeatureListener(),aListener)) ,m_aFeaturesToInvalidate.end()); } @@ -897,10 +897,10 @@ URL OGenericUnoController::getURLForId(sal_Int32 _nId) const URL aReturn; if ( m_xUrlTransformer.is() ) { - SupportedFeatures::const_iterator aIter = ::std::find_if( + SupportedFeatures::const_iterator aIter = std::find_if( m_aSupportedFeatures.begin(), m_aSupportedFeatures.end(), - ::std::bind2nd( CompareFeatureById(), _nId ) + std::bind2nd( CompareFeatureById(), _nId ) ); if ( m_aSupportedFeatures.end() != aIter && !aIter->first.isEmpty() ) @@ -1452,7 +1452,7 @@ namespace Sequence< DispatchInformation > SAL_CALL OGenericUnoController::getConfigurableDispatchInformation( ::sal_Int16 CommandGroup ) { - ::std::list< DispatchInformation > aInformationList; + std::list< DispatchInformation > aInformationList; DispatchInformation aDispatchInfo; for ( SupportedFeatures::const_iterator aIter = m_aSupportedFeatures.begin(); aIter != m_aSupportedFeatures.end(); @@ -1467,7 +1467,7 @@ Sequence< DispatchInformation > SAL_CALL OGenericUnoController::getConfigurableD } Sequence< DispatchInformation > aInformation( aInformationList.size() ); - ::std::transform( aInformationList.begin(), + std::transform( aInformationList.begin(), aInformationList.end(), aInformation.getArray(), SGI_identity< DispatchInformation >() diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx index a8e8ba27dbfe..e639e8026795 100644 --- a/dbaccess/source/ui/browser/sbagrid.cxx +++ b/dbaccess/source/ui/browser/sbagrid.cxx @@ -696,7 +696,7 @@ void SbaGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupM if(!xField.is()) break; - ::std::vector< std::shared_ptr<OTableRow> > vClipboardList; + std::vector< std::shared_ptr<OTableRow> > vClipboardList; // send it to the clipboard vClipboardList.push_back(std::make_shared<OTableRow>(xField)); OTableRowExchange* pData = new OTableRowExchange(vClipboardList); @@ -1222,7 +1222,7 @@ void SbaGridControl::DoFieldDrag(sal_uInt16 nColumnPos, sal_Int16 nRowPos) } /// unary_function Functor object for class ZZ returntype is void - struct SbaGridControlPrec : ::std::unary_function<DataFlavorExVector::value_type,bool> + struct SbaGridControlPrec : std::unary_function<DataFlavorExVector::value_type,bool> { inline bool operator()(const DataFlavorExVector::value_type& _aType) { @@ -1326,7 +1326,7 @@ sal_Int8 SbaGridControl::AcceptDrop( const BrowserAcceptDropEvent& rEvt ) if(nAction != DND_ACTION_COPY && GetEmptyRow().is()) { const DataFlavorExVector& _rFlavors = GetDataFlavors(); - if(::std::any_of(_rFlavors.begin(),_rFlavors.end(),SbaGridControlPrec())) + if(std::any_of(_rFlavors.begin(),_rFlavors.end(),SbaGridControlPrec())) nAction = DND_ACTION_COPY; } @@ -1387,7 +1387,7 @@ sal_Int8 SbaGridControl::ExecuteDrop( const BrowserExecuteDropEvent& rEvt ) if(GetEmptyRow().is()) { const DataFlavorExVector& _rFlavors = GetDataFlavors(); - if( ::std::any_of(_rFlavors.begin(),_rFlavors.end(), SbaGridControlPrec()) ) + if( std::any_of(_rFlavors.begin(),_rFlavors.end(), SbaGridControlPrec()) ) { TransferableDataHelper aDropped( rEvt.maDropEvent.Transferable ); m_aDataDescriptor = ODataAccessObjectTransferable::extractObjectDescriptor(aDropped); diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index 0282541fcf5a..0b433e3b8146 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -265,11 +265,11 @@ Sequence< Type > SAL_CALL SbaTableQueryBrowser::getTypes( ) if ( !m_aDocScriptSupport || !*m_aDocScriptSupport ) { Sequence< Type > aStrippedTypes( aTypes.getLength() - 1 ); - ::std::remove_copy_if( + std::remove_copy_if( aTypes.getConstArray(), aTypes.getConstArray() + aTypes.getLength(), aStrippedTypes.getArray(), - ::std::bind2nd( ::std::equal_to< Type >(), cppu::UnoType<XScriptInvocationContext>::get() ) + std::bind2nd( std::equal_to< Type >(), cppu::UnoType<XScriptInvocationContext>::get() ) ); aTypes = aStrippedTypes; } @@ -299,7 +299,7 @@ void SAL_CALL SbaTableQueryBrowser::disposing() clearTreeModel(); // clear the tree model { - ::std::unique_ptr<SvTreeList> aTemp(m_pTreeModel); + std::unique_ptr<SvTreeList> aTemp(m_pTreeModel); m_pTreeModel = nullptr; } @@ -387,7 +387,7 @@ bool SbaTableQueryBrowser::Construct(vcl::Window* pParent) namespace { - struct SelectValueByName : public ::std::unary_function< OUString, Any > + struct SelectValueByName : public std::unary_function< OUString, Any > { const Any& operator()( OUString const& i_name ) const { @@ -543,12 +543,12 @@ bool SbaTableQueryBrowser::InitializeForm( const Reference< XPropertySet > & i_f aPropertyValues.put( aTransferPropertie, pData->xObjectProperties->getPropertyValue( aTransferPropertie ) ); } - ::std::vector< OUString > aNames( aPropertyValues.getNames() ); - ::std::sort(aNames.begin(), aNames.end()); + std::vector< OUString > aNames( aPropertyValues.getNames() ); + std::sort(aNames.begin(), aNames.end()); Sequence< OUString > aPropNames( comphelper::containerToSequence(aNames) ); Sequence< Any > aPropValues( aNames.size() ); - ::std::transform( aNames.begin(), aNames.end(), aPropValues.getArray(), SelectValueByName( aPropertyValues ) ); + std::transform( aNames.begin(), aNames.end(), aPropValues.getArray(), SelectValueByName( aPropertyValues ) ); Reference< XMultiPropertySet > xFormMultiSet( i_formProperties, UNO_QUERY_THROW ); xFormMultiSet->setPropertyValues( aPropNames, aPropValues ); @@ -685,8 +685,8 @@ bool SbaTableQueryBrowser::InitializeGridModel(const Reference< css::form::XForm bool bFormattedIsNumeric = true; sal_Int32 nType = ::comphelper::getINT32( xColumn->getPropertyValue( PROPERTY_TYPE ) ); - ::std::vector< NamedValue > aInitialValues; - ::std::vector< OUString > aCopyProperties; + std::vector< NamedValue > aInitialValues; + std::vector< OUString > aCopyProperties; Any aDefault; switch(nType) @@ -791,14 +791,14 @@ bool SbaTableQueryBrowser::InitializeGridModel(const Reference< css::form::XForm aInitialValues.push_back( NamedValue( PROPERTY_MOUSE_WHEEL_BEHAVIOR, makeAny( MouseWheelBehavior::SCROLL_DISABLED ) ) ); // now set all those values - for ( ::std::vector< NamedValue >::const_iterator property = aInitialValues.begin(); + for ( std::vector< NamedValue >::const_iterator property = aInitialValues.begin(); property != aInitialValues.end(); ++property ) { xGridCol->setPropertyValue( property->Name, property->Value ); } - for ( ::std::vector< OUString >::const_iterator copyPropertyName = aCopyProperties.begin(); + for ( std::vector< OUString >::const_iterator copyPropertyName = aCopyProperties.begin(); copyPropertyName != aCopyProperties.end(); ++copyPropertyName ) @@ -2132,7 +2132,7 @@ void SbaTableQueryBrowser::populateTree(const Reference<XNameAccess>& _xNameAcce SvTreeListEntry* SbaTableQueryBrowser::implAppendEntry( SvTreeListEntry* _pParent, const OUString& _rName, void* _pUserData, EntryType _eEntryType ) { - ::std::unique_ptr< ImageProvider > pImageProvider( getImageProviderFor( _pParent ) ); + std::unique_ptr< ImageProvider > pImageProvider( getImageProviderFor( _pParent ) ); Image aImage; pImageProvider->getImages( _rName, getDatabaseObjectType( _eEntryType ), aImage ); @@ -3281,9 +3281,9 @@ bool SbaTableQueryBrowser::ensureConnection(SvTreeListEntry* _pAnyEntry, SharedC return ensureConnection( pDSEntry, pDSData, _rConnection ); } -::std::unique_ptr< ImageProvider > SbaTableQueryBrowser::getImageProviderFor( SvTreeListEntry* _pAnyEntry ) +std::unique_ptr< ImageProvider > SbaTableQueryBrowser::getImageProviderFor( SvTreeListEntry* _pAnyEntry ) { - ::std::unique_ptr< ImageProvider > pImageProvider( new ImageProvider ); + std::unique_ptr< ImageProvider > pImageProvider( new ImageProvider ); SharedConnection xConnection; if ( getExistentConnectionFor( _pAnyEntry, xConnection ) ) pImageProvider.reset( new ImageProvider( xConnection ) ); |