summaryrefslogtreecommitdiff
path: root/accessibility
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2017-02-15 22:31:33 +0200
committerTor Lillqvist <tml@collabora.com>2017-02-15 21:50:23 +0000
commit013d9789c753d46f0a038e54db6e21f4d4922891 (patch)
tree52480d6515d2def1f568a2f6023ee0799cd9b2af /accessibility
parentd007cef2dfd0c4d7b009b4f943464c6c4854d88d (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 'accessibility')
-rw-r--r--accessibility/inc/extended/accessiblelistboxentry.hxx2
-rw-r--r--accessibility/inc/extended/accessibletabbar.hxx2
-rw-r--r--accessibility/inc/extended/accessibletabbarpagelist.hxx2
-rw-r--r--accessibility/inc/extended/textwindowaccessibility.hxx4
-rw-r--r--accessibility/inc/helper/characterattributeshelper.hxx2
-rw-r--r--accessibility/inc/standard/accessiblemenubasecomponent.hxx2
-rw-r--r--accessibility/inc/standard/vclxaccessiblestatusbar.hxx2
-rw-r--r--accessibility/inc/standard/vclxaccessibletabcontrol.hxx2
-rw-r--r--accessibility/source/extended/accessiblelistboxentry.cxx2
-rw-r--r--accessibility/source/extended/textwindowaccessibility.cxx18
-rw-r--r--accessibility/source/standard/vclxaccessibleedit.cxx4
-rw-r--r--accessibility/source/standard/vclxaccessibleradiobutton.cxx2
12 files changed, 22 insertions, 22 deletions
diff --git a/accessibility/inc/extended/accessiblelistboxentry.hxx b/accessibility/inc/extended/accessiblelistboxentry.hxx
index 8c233ec3025d..90d4b0a3811e 100644
--- a/accessibility/inc/extended/accessiblelistboxentry.hxx
+++ b/accessibility/inc/extended/accessiblelistboxentry.hxx
@@ -77,7 +77,7 @@ namespace accessibility
private:
/** The treelistbox control */
- ::std::deque< sal_Int32 > m_aEntryPath;
+ std::deque< sal_Int32 > m_aEntryPath;
SvTreeListEntry* m_pSvLBoxEntry; // Needed for a11y focused item...
diff --git a/accessibility/inc/extended/accessibletabbar.hxx b/accessibility/inc/extended/accessibletabbar.hxx
index 9b95e994a885..f538c13e8683 100644
--- a/accessibility/inc/extended/accessibletabbar.hxx
+++ b/accessibility/inc/extended/accessibletabbar.hxx
@@ -47,7 +47,7 @@ namespace accessibility
public AccessibleTabBar_BASE
{
private:
- typedef ::std::vector< css::uno::Reference< css::accessibility::XAccessible > > AccessibleChildren;
+ typedef std::vector< css::uno::Reference< css::accessibility::XAccessible > > AccessibleChildren;
AccessibleChildren m_aAccessibleChildren;
diff --git a/accessibility/inc/extended/accessibletabbarpagelist.hxx b/accessibility/inc/extended/accessibletabbarpagelist.hxx
index be287316b426..7f7d045b1a4d 100644
--- a/accessibility/inc/extended/accessibletabbarpagelist.hxx
+++ b/accessibility/inc/extended/accessibletabbarpagelist.hxx
@@ -49,7 +49,7 @@ namespace accessibility
public AccessibleTabBarPageList_BASE
{
private:
- typedef ::std::vector< css::uno::Reference< css::accessibility::XAccessible > > AccessibleChildren;
+ typedef std::vector< css::uno::Reference< css::accessibility::XAccessible > > AccessibleChildren;
AccessibleChildren m_aAccessibleChildren;
sal_Int32 m_nIndexInParent;
diff --git a/accessibility/inc/extended/textwindowaccessibility.hxx b/accessibility/inc/extended/textwindowaccessibility.hxx
index f7e739eb2d6e..8db74f5c8b38 100644
--- a/accessibility/inc/extended/textwindowaccessibility.hxx
+++ b/accessibility/inc/extended/textwindowaccessibility.hxx
@@ -125,7 +125,7 @@ private:
::sal_Int32 m_nHeight;
};
-typedef ::std::vector< ParagraphInfo > Paragraphs;
+typedef std::vector< ParagraphInfo > Paragraphs;
typedef ::cppu::WeakAggComponentImplHelper7<
css::accessibility::XAccessible,
@@ -615,7 +615,7 @@ private:
Paragraphs::iterator m_aFocused;
- ::std::queue< ::TextHint > m_aParagraphNotifications;
+ std::queue< ::TextHint > m_aParagraphNotifications;
bool m_bSelectionChangedNotification;
};
diff --git a/accessibility/inc/helper/characterattributeshelper.hxx b/accessibility/inc/helper/characterattributeshelper.hxx
index bbffd80c5058..50e36902eae1 100644
--- a/accessibility/inc/helper/characterattributeshelper.hxx
+++ b/accessibility/inc/helper/characterattributeshelper.hxx
@@ -34,7 +34,7 @@ class CharacterAttributesHelper
{
private:
- typedef ::std::map< OUString, css::uno::Any > AttributeMap;
+ typedef std::map< OUString, css::uno::Any > AttributeMap;
AttributeMap m_aAttributeMap;
diff --git a/accessibility/inc/standard/accessiblemenubasecomponent.hxx b/accessibility/inc/standard/accessiblemenubasecomponent.hxx
index af8e9d640301..43039facbbee 100644
--- a/accessibility/inc/standard/accessiblemenubasecomponent.hxx
+++ b/accessibility/inc/standard/accessiblemenubasecomponent.hxx
@@ -57,7 +57,7 @@ private:
VCLExternalSolarLock* m_pExternalLock;
protected:
- typedef ::std::vector< css::uno::Reference< css::accessibility::XAccessible > > AccessibleChildren;
+ typedef std::vector< css::uno::Reference< css::accessibility::XAccessible > > AccessibleChildren;
AccessibleChildren m_aAccessibleChildren;
VclPtr<Menu> m_pMenu;
diff --git a/accessibility/inc/standard/vclxaccessiblestatusbar.hxx b/accessibility/inc/standard/vclxaccessiblestatusbar.hxx
index ebe9ac1a6ae4..5e0dce31e493 100644
--- a/accessibility/inc/standard/vclxaccessiblestatusbar.hxx
+++ b/accessibility/inc/standard/vclxaccessiblestatusbar.hxx
@@ -34,7 +34,7 @@ class StatusBar;
class VCLXAccessibleStatusBar : public VCLXAccessibleComponent
{
private:
- typedef ::std::vector< css::uno::Reference< css::accessibility::XAccessible > > AccessibleChildren;
+ typedef std::vector< css::uno::Reference< css::accessibility::XAccessible > > AccessibleChildren;
AccessibleChildren m_aAccessibleChildren;
VclPtr<StatusBar> m_pStatusBar;
diff --git a/accessibility/inc/standard/vclxaccessibletabcontrol.hxx b/accessibility/inc/standard/vclxaccessibletabcontrol.hxx
index bdef5ef291da..d30aa57959de 100644
--- a/accessibility/inc/standard/vclxaccessibletabcontrol.hxx
+++ b/accessibility/inc/standard/vclxaccessibletabcontrol.hxx
@@ -39,7 +39,7 @@ class VCLXAccessibleTabControl : public VCLXAccessibleComponent,
public VCLXAccessibleTabControl_BASE
{
private:
- typedef ::std::vector< css::uno::Reference< css::accessibility::XAccessible > > AccessibleChildren;
+ typedef std::vector< css::uno::Reference< css::accessibility::XAccessible > > AccessibleChildren;
AccessibleChildren m_aAccessibleChildren;
VclPtr<TabControl> m_pTabControl;
diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx b/accessibility/source/extended/accessiblelistboxentry.cxx
index 3b2971063d92..2eb8f395e8ff 100644
--- a/accessibility/source/extended/accessiblelistboxentry.cxx
+++ b/accessibility/source/extended/accessiblelistboxentry.cxx
@@ -326,7 +326,7 @@ namespace accessibility
{ // we have a entry as parent -> get its accessible
// shorten our access path by one
- ::std::deque< sal_Int32 > aParentPath( m_aEntryPath );
+ std::deque< sal_Int32 > aParentPath( m_aEntryPath );
aParentPath.pop_back();
// get the entry for this shortened access path
diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx
index a82311c705be..198fd2a84fef 100644
--- a/accessibility/source/extended/textwindowaccessibility.cxx
+++ b/accessibility/source/extended/textwindowaccessibility.cxx
@@ -814,8 +814,8 @@ void Document::retrieveParagraphSelection(Paragraph const * pParagraph,
Paragraphs::size_type nNumber = pParagraph->getNumber();
TextPaM aStartPaM( rSelection.GetStart() );
TextPaM aEndPaM( rSelection.GetEnd() );
- TextPaM aMinPaM( ::std::min( aStartPaM, aEndPaM ) );
- TextPaM aMaxPaM( ::std::max( aStartPaM, aEndPaM ) );
+ TextPaM aMinPaM( std::min( aStartPaM, aEndPaM ) );
+ TextPaM aMaxPaM( std::max( aStartPaM, aEndPaM ) );
if ( nNumber >= aMinPaM.GetPara() && nNumber <= aMaxPaM.GetPara() )
{
@@ -827,7 +827,7 @@ void Document::retrieveParagraphSelection(Paragraph const * pParagraph,
// XXX numeric overflow (3x)
if ( aStartPaM > aEndPaM )
- ::std::swap( *pBegin, *pEnd );
+ std::swap( *pBegin, *pEnd );
}
else
{
@@ -2218,8 +2218,8 @@ void Document::handleSelectionChangeNotification()
case 2:
{
//old has no selection but new has selection
- nMin = ::std::min(nNewFirstPara, nNewLastPara);
- nMax = ::std::max(nNewFirstPara, nNewLastPara);
+ nMin = std::min(nNewFirstPara, nNewLastPara);
+ nMax = std::max(nNewFirstPara, nNewLastPara);
sendEvent(nMin, nMax, css::accessibility::AccessibleEventId::SELECTION_CHANGED);
sendEvent(nMin, nMax, css::accessibility::AccessibleEventId::TEXT_SELECTION_CHANGED);
}
@@ -2227,8 +2227,8 @@ void Document::handleSelectionChangeNotification()
case 3:
{
//old has selection but new has no selection.
- nMin = ::std::min(m_nSelectionFirstPara, m_nSelectionLastPara);
- nMax = ::std::max(m_nSelectionFirstPara, m_nSelectionLastPara);
+ nMin = std::min(m_nSelectionFirstPara, m_nSelectionLastPara);
+ nMax = std::max(m_nSelectionFirstPara, m_nSelectionLastPara);
sendEvent(nMin, nMax, css::accessibility::AccessibleEventId::SELECTION_CHANGED);
sendEvent(nMin, nMax, css::accessibility::AccessibleEventId::TEXT_SELECTION_CHANGED);
}
@@ -2348,12 +2348,12 @@ void Document::handleSelectionChangeNotification()
else
{
// old and new selection not empty => notify events for the two ranges left and right of the overlap
- ::std::vector< TextPaM > aTextPaMs(4);
+ std::vector< TextPaM > aTextPaMs(4);
aTextPaMs[0] = aOldTextStart;
aTextPaMs[1] = aOldTextEnd;
aTextPaMs[2] = aNewTextStart;
aTextPaMs[3] = aNewTextEnd;
- ::std::sort( aTextPaMs.begin(), aTextPaMs.end() );
+ std::sort( aTextPaMs.begin(), aTextPaMs.end() );
nFirst1 = aTextPaMs[0].GetPara();
nLast1 = aTextPaMs[1].GetPara() + ( aTextPaMs[0] != aTextPaMs[1] ? 1 : 0 );
diff --git a/accessibility/source/standard/vclxaccessibleedit.cxx b/accessibility/source/standard/vclxaccessibleedit.cxx
index 05fdad815d20..363b03dda67d 100644
--- a/accessibility/source/standard/vclxaccessibleedit.cxx
+++ b/accessibility/source/standard/vclxaccessibleedit.cxx
@@ -591,8 +591,8 @@ sal_Bool VCLXAccessibleEdit::replaceText( sal_Int32 nStartIndex, sal_Int32 nEndI
if ( !implIsValidRange( nStartIndex, nEndIndex, sText.getLength() ) )
throw IndexOutOfBoundsException();
- sal_Int32 nMinIndex = ::std::min( nStartIndex, nEndIndex );
- sal_Int32 nMaxIndex = ::std::max( nStartIndex, nEndIndex );
+ sal_Int32 nMinIndex = std::min( nStartIndex, nEndIndex );
+ sal_Int32 nMaxIndex = std::max( nStartIndex, nEndIndex );
VCLXEdit* pVCLXEdit = static_cast< VCLXEdit* >( GetVCLXWindow() );
if ( pVCLXEdit && pVCLXEdit->isEditable() )
diff --git a/accessibility/source/standard/vclxaccessibleradiobutton.cxx b/accessibility/source/standard/vclxaccessibleradiobutton.cxx
index 55f8675bedea..2064365cd834 100644
--- a/accessibility/source/standard/vclxaccessibleradiobutton.cxx
+++ b/accessibility/source/standard/vclxaccessibleradiobutton.cxx
@@ -90,7 +90,7 @@ void VCLXAccessibleRadioButton::FillAccessibleRelationSet( utl::AccessibleRelati
VclPtr< RadioButton > pRadioButton = GetAsDynamic< RadioButton >();
if ( pRadioButton )
{
- ::std::vector< VclPtr<RadioButton> > aGroup(pRadioButton->GetRadioButtonGroup());
+ std::vector< VclPtr<RadioButton> > aGroup(pRadioButton->GetRadioButtonGroup());
if (!aGroup.empty())
{
sal_Int32 i = 0;