[Libreoffice-commits] core.git: svx/source

[Caolán McNamara]

 svx/source/accessibility/AccessibleSvxFindReplaceDialog.cxx |    8 ++++----
 svx/source/accessibility/svxpixelctlaccessiblecontext.cxx   |    6 +++---
 svx/source/accessibility/svxrectctaccessiblecontext.cxx     |   10 +++++-----
 3 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 8bdf8dc075928bd0eb3e49ac0f51727c0677dc37
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Nov 27 16:58:11 2013 +0000

    error C2872: 'accessibility' : ambiguous symbol
    
    Change-Id: Ibff922712e25a846bab1628e87d0d322d1ff0a33
    Reviewed-on: https://gerrit.libreoffice.org/6836
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/svx/source/accessibility/AccessibleSvxFindReplaceDialog.cxx b/svx/source/accessibility/AccessibleSvxFindReplaceDialog.cxx
index c710f13..1e9d02e 100644
--- a/svx/source/accessibility/AccessibleSvxFindReplaceDialog.cxx
+++ b/svx/source/accessibility/AccessibleSvxFindReplaceDialog.cxx
@@ -47,12 +47,12 @@ void VCLXAccessibleSvxFindReplaceDialog::FillAccessibleRelationSet( utl::Accessi
         {
             return;
         }
-        Reference < accessibility::XAccessible > xDocAcc = pDocWin->GetAccessible();
+        Reference < css::accessibility::XAccessible > xDocAcc = pDocWin->GetAccessible();
         if ( !xDocAcc.is() )
         {
             return;
         }
-        Reference< accessibility::XAccessibleGetAccFlowTo > xGetAccFlowTo( xDocAcc, UNO_QUERY );
+        Reference< css::accessibility::XAccessibleGetAccFlowTo > xGetAccFlowTo( xDocAcc, UNO_QUERY );
         if ( !xGetAccFlowTo.is() )
         {
             return;
@@ -69,11 +69,11 @@ void VCLXAccessibleSvxFindReplaceDialog::FillAccessibleRelationSet( utl::Accessi
             uno::Sequence< uno::Reference< uno::XInterface > > aSequence( nLen );
             for ( sal_Int32 i = 0; i < nLen; i++ )
             {
-                uno::Reference < accessibility::XAccessible > xAcc;
+                uno::Reference < css::accessibility::XAccessible > xAcc;
                 aAnySeq[i] >>= xAcc;
                 aSequence[i] = xAcc;
             }
-            rRelationSet.AddRelation( accessibility::AccessibleRelation( accessibility::AccessibleRelationType::CONTENT_FLOWS_TO, aSequence ) );
+            rRelationSet.AddRelation( css::accessibility::AccessibleRelation( css::accessibility::AccessibleRelationType::CONTENT_FLOWS_TO, aSequence ) );
         }
     }
 }
diff --git a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
index 3b0a4ae..38ee6c6 100644
--- a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
+++ b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
@@ -172,7 +172,7 @@ uno::Reference< XAccessibleRelationSet > SvxPixelCtlAccessible::getAccessibleRel
     IsValid();
     Window* pWindow = (Window*)pPixelCtl;
     utl::AccessibleRelationSetHelper* rRelationSet = new utl::AccessibleRelationSetHelper;
-    uno::Reference< accessibility::XAccessibleRelationSet > rSet = rRelationSet;
+    uno::Reference< css::accessibility::XAccessibleRelationSet > rSet = rRelationSet;
     if ( pWindow )
     {
         Window *pLabeledBy = pWindow->GetAccessibleRelationLabeledBy();
@@ -180,7 +180,7 @@ uno::Reference< XAccessibleRelationSet > SvxPixelCtlAccessible::getAccessibleRel
         {
             uno::Sequence< uno::Reference< uno::XInterface > > aSequence(1);
             aSequence[0] = pLabeledBy->GetAccessible();
-            rRelationSet->AddRelation( accessibility::AccessibleRelation( accessibility::AccessibleRelationType::LABELED_BY, aSequence ) );
+            rRelationSet->AddRelation( css::accessibility::AccessibleRelation( css::accessibility::AccessibleRelationType::LABELED_BY, aSequence ) );
         }
 
         Window* pMemberOf = pWindow->GetAccessibleRelationMemberOf();
@@ -188,7 +188,7 @@ uno::Reference< XAccessibleRelationSet > SvxPixelCtlAccessible::getAccessibleRel
         {
             uno::Sequence< uno::Reference< uno::XInterface > > aSequence(1);
             aSequence[0] = pMemberOf->GetAccessible();
-            rRelationSet->AddRelation( accessibility::AccessibleRelation( accessibility::AccessibleRelationType::MEMBER_OF, aSequence ) );
+            rRelationSet->AddRelation( css::accessibility::AccessibleRelation( css::accessibility::AccessibleRelationType::MEMBER_OF, aSequence ) );
         }
         return rSet;
     }
diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
index cda769a..15a2ed0 100644
--- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx
+++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
@@ -366,7 +366,7 @@ Reference< XAccessibleRelationSet > SAL_CALL SvxRectCtlAccessibleContext::getAcc
 {
     //return Reference< XAccessibleRelationSet >();
     utl::AccessibleRelationSetHelper* pRelationSetHelper = new utl::AccessibleRelationSetHelper;
-    uno::Reference< accessibility::XAccessibleRelationSet > xSet = pRelationSetHelper;
+    uno::Reference< css::accessibility::XAccessibleRelationSet > xSet = pRelationSetHelper;
     Window* pWindow = mpRepr;
     if ( pWindow )
     {
@@ -376,14 +376,14 @@ Reference< XAccessibleRelationSet > SAL_CALL SvxRectCtlAccessibleContext::getAcc
         {
             uno::Sequence< uno::Reference< uno::XInterface > > aSequence(1);
             aSequence[0] = pLabeledBy->GetAccessible();
-            pRelationSetHelper->AddRelation( accessibility::AccessibleRelation( accessibility::AccessibleRelationType::LABELED_BY, aSequence ) );
+            pRelationSetHelper->AddRelation( css::accessibility::AccessibleRelation( css::accessibility::AccessibleRelationType::LABELED_BY, aSequence ) );
         }
         Window* pMemberOf = pWindow->GetAccessibleRelationMemberOf();
         if ( pMemberOf && pMemberOf != pWindow )
         {
             uno::Sequence< uno::Reference< uno::XInterface > > aSequence(1);
             aSequence[0] = pMemberOf->GetAccessible();
-            pRelationSetHelper->AddRelation( accessibility::AccessibleRelation( accessibility::AccessibleRelationType::MEMBER_OF, aSequence ) );
+            pRelationSetHelper->AddRelation( css::accessibility::AccessibleRelation( css::accessibility::AccessibleRelationType::MEMBER_OF, aSequence ) );
         }
     }
     return xSet;
@@ -978,12 +978,12 @@ OUString SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleName( void ) th
 Reference<XAccessibleRelationSet> SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleRelationSet( void ) throw( RuntimeException )
 {
     utl::AccessibleRelationSetHelper* pRelationSetHelper = new utl::AccessibleRelationSetHelper;
-    uno::Reference< accessibility::XAccessibleRelationSet > xSet = pRelationSetHelper;
+    uno::Reference< css::accessibility::XAccessibleRelationSet > xSet = pRelationSetHelper;
     if( mxParent.is() )
       {
         uno::Sequence< uno::Reference< uno::XInterface > > aSequence(1);
         aSequence[0] = mxParent;
-        pRelationSetHelper->AddRelation( accessibility::AccessibleRelation( accessibility::AccessibleRelationType::MEMBER_OF, aSequence ) );
+        pRelationSetHelper->AddRelation( css::accessibility::AccessibleRelation( css::accessibility::AccessibleRelationType::MEMBER_OF, aSequence ) );
 
     }