diff options
Diffstat (limited to 'winaccessibility')
-rw-r--r-- | winaccessibility/inc/AccObject.hxx | 2 | ||||
-rw-r--r-- | winaccessibility/source/UAccCOM/AccActionBase.cxx | 2 | ||||
-rw-r--r-- | winaccessibility/source/UAccCOM/AccEditableText.cxx | 24 | ||||
-rw-r--r-- | winaccessibility/source/UAccCOM/AccEditableText.h | 2 | ||||
-rw-r--r-- | winaccessibility/source/UAccCOM/AccImage.cxx | 2 | ||||
-rw-r--r-- | winaccessibility/source/UAccCOM/AccTable.cxx | 4 | ||||
-rw-r--r-- | winaccessibility/source/UAccCOM/AccTextBase.cxx | 10 | ||||
-rw-r--r-- | winaccessibility/source/UAccCOM/MAccessible.cxx | 16 | ||||
-rw-r--r-- | winaccessibility/source/service/AccObject.cxx | 22 |
9 files changed, 42 insertions, 42 deletions
diff --git a/winaccessibility/inc/AccObject.hxx b/winaccessibility/inc/AccObject.hxx index ef83f343eaf3..2a024642d8ac 100644 --- a/winaccessibility/inc/AccObject.hxx +++ b/winaccessibility/inc/AccObject.hxx @@ -79,7 +79,7 @@ private: DWORD GetMSAAStateFromUNO(short xState);//translate state from UNO to MSAA value css::accessibility::XAccessibleSelection* GetXAccessibleSelection(); void GetExpandedState(sal_Bool* isExpandable, sal_Bool* isExpanded); - ::rtl::OUString GetMAccessibleValueFromAny(css::uno::Any pAny); + OUString GetMAccessibleValueFromAny(css::uno::Any pAny); public: diff --git a/winaccessibility/source/UAccCOM/AccActionBase.cxx b/winaccessibility/source/UAccCOM/AccActionBase.cxx index 514824cd4bdc..a10dd877eae4 100644 --- a/winaccessibility/source/UAccCOM/AccActionBase.cxx +++ b/winaccessibility/source/UAccCOM/AccActionBase.cxx @@ -115,7 +115,7 @@ STDMETHODIMP CAccActionBase::get_description(long actionIndex,BSTR __RPC_FAR *de if(!pRXAct.is()) return E_FAIL; - ::rtl::OUString ouStr = GetXInterface()->getAccessibleActionDescription(actionIndex); + OUString ouStr = GetXInterface()->getAccessibleActionDescription(actionIndex); // #CHECK# SAFE_SYSFREESTRING(*description); diff --git a/winaccessibility/source/UAccCOM/AccEditableText.cxx b/winaccessibility/source/UAccCOM/AccEditableText.cxx index a53d99b0a935..87addcaa5a8f 100644 --- a/winaccessibility/source/UAccCOM/AccEditableText.cxx +++ b/winaccessibility/source/UAccCOM/AccEditableText.cxx @@ -120,7 +120,7 @@ STDMETHODIMP CAccEditableText::insertText(long offset, BSTR * text) if( !pRXEdtTxt.is() ) return E_FAIL; - ::rtl::OUString ouStr(o3tl::toU(*text)); + OUString ouStr(o3tl::toU(*text)); if( GetXInterface()->insertText( ouStr, offset ) ) return S_OK; @@ -197,7 +197,7 @@ STDMETHODIMP CAccEditableText::replaceText(long startOffset, long endOffset, BST if( !pRXEdtTxt.is() ) return E_FAIL; - ::rtl::OUString ouStr(o3tl::toU(*text)); + OUString ouStr(o3tl::toU(*text)); if( GetXInterface()->replaceText( startOffset,endOffset, ouStr) ) return S_OK; @@ -226,13 +226,13 @@ STDMETHODIMP CAccEditableText::setAttributes(long startOffset, long endOffset, B if( !pRXEdtTxt.is() ) return E_FAIL; - ::rtl::OUString ouStr(o3tl::toU(*attributes)); + OUString ouStr(o3tl::toU(*attributes)); sal_Int32 nIndex = 0; - vector< ::rtl::OUString > vecAttr; + vector< OUString > vecAttr; do { - ::rtl::OUString ouToken = ouStr.getToken(0, ';', nIndex); + OUString ouToken = ouStr.getToken(0, ';', nIndex); vecAttr.push_back(ouToken); } while(nIndex >= 0); @@ -240,12 +240,12 @@ STDMETHODIMP CAccEditableText::setAttributes(long startOffset, long endOffset, B Sequence< PropertyValue > beanSeq(vecAttr.size()); for(std::vector<OUString>::size_type i = 0; i < vecAttr.size(); i ++) { - ::rtl::OUString attr = vecAttr[i]; + OUString attr = vecAttr[i]; sal_Int32 nPos = attr.indexOf(':'); if(nPos > -1) { - ::rtl::OUString attrName = attr.copy(0, nPos); - ::rtl::OUString attrValue = attr.copy(nPos + 1); + OUString attrName = attr.copy(0, nPos); + OUString attrValue = attr.copy(nPos + 1); beanSeq[i].Name = attrName; get_AnyFromOLECHAR(attrName, attrValue, beanSeq[i].Value); } @@ -266,7 +266,7 @@ STDMETHODIMP CAccEditableText::setAttributes(long startOffset, long endOffset, B * @param ouValue the string of attribute value. * @param rAny the Any object to be returned. */ -void CAccEditableText::get_AnyFromOLECHAR(const ::rtl::OUString &ouName, const ::rtl::OUString &ouValue, Any &rAny) +void CAccEditableText::get_AnyFromOLECHAR(const OUString &ouName, const OUString &ouValue, Any &rAny) { if(ouName == "CharBackColor" || ouName == "CharColor" || @@ -308,7 +308,7 @@ void CAccEditableText::get_AnyFromOLECHAR(const ::rtl::OUString &ouName, const : else if(ouName == "CharFontName" ) { // Convert to string. - rAny.setValue(&ouValue, cppu::UnoType<rtl::OUString>::get()); + rAny.setValue(&ouValue, cppu::UnoType<OUString>::get()); } else if(ouName == "CharPosture" ) { @@ -322,7 +322,7 @@ void CAccEditableText::get_AnyFromOLECHAR(const ::rtl::OUString &ouName, const : // Convert to the Sequence with TabStop element. vector< css::style::TabStop > vecTabStop; css::style::TabStop tabStop; - ::rtl::OUString ouSubValue; + OUString ouSubValue; sal_Int32 pos = 0, posComma = 0; do @@ -429,7 +429,7 @@ void CAccEditableText::get_AnyFromOLECHAR(const ::rtl::OUString &ouName, const : { // Parse value string. css::style::LineSpacing lineSpacing; - ::rtl::OUString ouSubValue; + OUString ouSubValue; sal_Int32 pos = 0, posComma = 0; pos = ouValue.indexOf("Mode=", pos); diff --git a/winaccessibility/source/UAccCOM/AccEditableText.h b/winaccessibility/source/UAccCOM/AccEditableText.h index c0e002ced15a..62bfc662d3b4 100644 --- a/winaccessibility/source/UAccCOM/AccEditableText.h +++ b/winaccessibility/source/UAccCOM/AccEditableText.h @@ -104,7 +104,7 @@ private: css::uno::Reference<css::accessibility::XAccessibleEditableText> pRXEdtTxt; - static void get_AnyFromOLECHAR(const ::rtl::OUString &ouName, const ::rtl::OUString &ouValue, css::uno::Any &rAny); + static void get_AnyFromOLECHAR(const OUString &ouName, const OUString &ouValue, css::uno::Any &rAny); css::accessibility::XAccessibleEditableText* GetXInterface() { diff --git a/winaccessibility/source/UAccCOM/AccImage.cxx b/winaccessibility/source/UAccCOM/AccImage.cxx index 1bf9449aea5b..4094f5d59314 100644 --- a/winaccessibility/source/UAccCOM/AccImage.cxx +++ b/winaccessibility/source/UAccCOM/AccImage.cxx @@ -55,7 +55,7 @@ STDMETHODIMP CAccImage::get_description(BSTR * description) if( !pRXImg.is() ) return E_FAIL; - ::rtl::OUString ouStr = GetXInterface()->getAccessibleImageDescription(); + OUString ouStr = GetXInterface()->getAccessibleImageDescription(); SAFE_SYSFREESTRING(*description); *description = SysAllocString(o3tl::toW(ouStr.getStr())); diff --git a/winaccessibility/source/UAccCOM/AccTable.cxx b/winaccessibility/source/UAccCOM/AccTable.cxx index 6a872b277dc0..429258fee0d5 100644 --- a/winaccessibility/source/UAccCOM/AccTable.cxx +++ b/winaccessibility/source/UAccCOM/AccTable.cxx @@ -129,7 +129,7 @@ STDMETHODIMP CAccTable::get_columnDescription(long column, BSTR * description) if(!pRXTable.is()) return E_FAIL; - const ::rtl::OUString& ouStr = GetXInterface()->getAccessibleColumnDescription(column); + const OUString& ouStr = GetXInterface()->getAccessibleColumnDescription(column); // #CHECK# SAFE_SYSFREESTRING(*description); @@ -348,7 +348,7 @@ STDMETHODIMP CAccTable::get_rowDescription(long row, BSTR * description) if(!pRXTable.is()) return E_FAIL; - const ::rtl::OUString& ouStr = GetXInterface()->getAccessibleRowDescription(row); + const OUString& ouStr = GetXInterface()->getAccessibleRowDescription(row); // #CHECK# SAFE_SYSFREESTRING(*description); diff --git a/winaccessibility/source/UAccCOM/AccTextBase.cxx b/winaccessibility/source/UAccCOM/AccTextBase.cxx index 4b78d75a4b54..d68c18e89e49 100644 --- a/winaccessibility/source/UAccCOM/AccTextBase.cxx +++ b/winaccessibility/source/UAccCOM/AccTextBase.cxx @@ -112,7 +112,7 @@ STDMETHODIMP CAccTextBase::get_attributes(long offset, long * startOffset, long OUStringBuffer strAttrs("Version:1;"); - Sequence< css::beans::PropertyValue > pValues = GetXInterface()->getCharacterAttributes(offset, Sequence< rtl::OUString >()); + Sequence< css::beans::PropertyValue > pValues = GetXInterface()->getCharacterAttributes(offset, Sequence< OUString >()); int nCount = pValues.getLength(); sal_Int16 numberingLevel = 0; @@ -477,7 +477,7 @@ STDMETHODIMP CAccTextBase::get_text(long startOffset, long endOffset, BSTR * tex return E_FAIL; } - ::rtl::OUString ouStr; + OUString ouStr; if (endOffset == -1 ) { long nLen=0; @@ -575,7 +575,7 @@ STDMETHODIMP CAccTextBase::get_textBeforeOffset(long offset, IA2TextBoundaryType } TextSegment segment = GetXInterface()->getTextBeforeIndex( offset, sal_Int16(lUnoBoundaryType)); - ::rtl::OUString ouStr = segment.SegmentText; + OUString ouStr = segment.SegmentText; SysFreeString(*text); *text = SysAllocString(o3tl::toW(ouStr.getStr())); *startOffset = segment.SegmentStart; @@ -661,7 +661,7 @@ STDMETHODIMP CAccTextBase::get_textAfterOffset(long offset, IA2TextBoundaryType } TextSegment segment = GetXInterface()->getTextBehindIndex( offset, sal_Int16(lUnoBoundaryType)); - ::rtl::OUString ouStr = segment.SegmentText; + OUString ouStr = segment.SegmentText; SysFreeString(*text); *text = SysAllocString(o3tl::toW(ouStr.getStr())); *startOffset = segment.SegmentStart; @@ -748,7 +748,7 @@ STDMETHODIMP CAccTextBase::get_textAtOffset(long offset, IA2TextBoundaryType bou } TextSegment segment = GetXInterface()->getTextAtIndex( offset, sal_Int16(lUnoBoundaryType)); - ::rtl::OUString ouStr = segment.SegmentText; + OUString ouStr = segment.SegmentText; SysFreeString(*text); *text = SysAllocString(o3tl::toW(ouStr.getStr())); *startOffset = segment.SegmentStart; diff --git a/winaccessibility/source/UAccCOM/MAccessible.cxx b/winaccessibility/source/UAccCOM/MAccessible.cxx index 8c7f4fa6aec1..01a90065dde0 100644 --- a/winaccessibility/source/UAccCOM/MAccessible.cxx +++ b/winaccessibility/source/UAccCOM/MAccessible.cxx @@ -589,7 +589,7 @@ STDMETHODIMP CMAccessible::get_accHelpTopic(BSTR *, VARIANT, long *) return E_NOTIMPL; } -static bool GetMnemonicChar( const ::rtl::OUString& aStr, sal_Unicode* wStr) +static bool GetMnemonicChar( const OUString& aStr, sal_Unicode* wStr) { for (sal_Int32 i = 0;; i += 2) { i = aStr.indexOf('~', i); @@ -724,7 +724,7 @@ STDMETHODIMP CMAccessible::get_accKeyboardShortcut(VARIANT varChild, BSTR *pszKe if(!pRXIE.is()) return S_FALSE; - ::rtl::OUString ouStr = pRXIE->getTitledBorderText(); + OUString ouStr = pRXIE->getTitledBorderText(); sal_Unicode key; if(GetMnemonicChar(ouStr, &key)) { @@ -2725,18 +2725,18 @@ OUString CMAccessible::get_StringFromAny(Any const & pAny) } case TypeClass_STRING: { - ::rtl::OUString val; + OUString val; pAny >>= val; return val; } case TypeClass_SEQUENCE: { - if(pAny.getValueType() == cppu::UnoType<Sequence< ::rtl::OUString >>::get()) + if(pAny.getValueType() == cppu::UnoType<Sequence< OUString >>::get()) { - Sequence < ::rtl::OUString > val; + Sequence < OUString > val; pAny >>= val; - ::rtl::OUStringBuffer pString; + OUStringBuffer pString; int count = val.getLength(); @@ -2947,7 +2947,7 @@ void CMAccessible::ConvertAnyToVariant(const css::uno::Any &rAnyVal, VARIANT *pv case TypeClass_STRING: { pvData->vt = VT_BSTR; - ::rtl::OUString val; + OUString val; rAnyVal >>= val; pvData->bstrVal = SysAllocString(o3tl::toW(val.getStr())); break; @@ -3200,7 +3200,7 @@ STDMETHODIMP CMAccessible::get_attributes(/*[out]*/ BSTR *pAttr) pRXAttr = pRXI.get(); css::uno::Any anyVal = pRXAttr->getExtendedAttributes(); - ::rtl::OUString val; + OUString val; anyVal >>= val; if(*pAttr) diff --git a/winaccessibility/source/service/AccObject.cxx b/winaccessibility/source/service/AccObject.cxx index 608a1978409c..96016251a1b0 100644 --- a/winaccessibility/source/service/AccObject.cxx +++ b/winaccessibility/source/service/AccObject.cxx @@ -386,7 +386,7 @@ void AccObject::SetValue( Any pAny ) return ; } Reference< XAccessibleText > pRText(m_xAccContextRef,UNO_QUERY); - ::rtl::OUString val; + OUString val; switch(m_accRole) { case SPIN_BOX: @@ -422,9 +422,9 @@ void AccObject::SetValue( Any pAny ) return; } -::rtl::OUString AccObject::GetMAccessibleValueFromAny(Any pAny) +OUString AccObject::GetMAccessibleValueFromAny(Any pAny) { - ::rtl::OUString strValue; + OUString strValue; if(nullptr == m_pIMAcc) return strValue; @@ -434,19 +434,19 @@ void AccObject::SetValue( Any pAny ) sal_uInt16 val; if (pAny >>= val) { - strValue=::rtl::OUString::number(val); + strValue=OUString::number(val); } } - else if(pAny.getValueType() == cppu::UnoType<rtl::OUString>::get()) + else if(pAny.getValueType() == cppu::UnoType<OUString>::get()) { pAny >>= strValue ; } - else if(pAny.getValueType() == cppu::UnoType<Sequence< ::rtl::OUString >>::get()) + else if(pAny.getValueType() == cppu::UnoType<Sequence< OUString >>::get()) { - Sequence< ::rtl::OUString > val; + Sequence< OUString > val; if (pAny >>= val) { @@ -464,7 +464,7 @@ void AccObject::SetValue( Any pAny ) double val; if (pAny >>= val) { - strValue=::rtl::OUString::number(val); + strValue=OUString::number(val); } } else if(pAny.getValueType() == cppu::UnoType<sal_Int32>::get()) @@ -472,7 +472,7 @@ void AccObject::SetValue( Any pAny ) sal_Int32 val; if (pAny >>= val) { - strValue=::rtl::OUString::number(val); + strValue=OUString::number(val); } } else if (pAny.getValueType() == cppu::UnoType<css::accessibility::TextSegment>::get()) @@ -480,7 +480,7 @@ void AccObject::SetValue( Any pAny ) css::accessibility::TextSegment val; if (pAny >>= val) { - ::rtl::OUString realVal(val.SegmentText); + OUString realVal(val.SegmentText); strValue = realVal; } @@ -752,7 +752,7 @@ void AccObject::UpdateActionDesc() return; } - ::rtl::OUString pXString = m_xAccContextRef->getAccessibleDescription(); + OUString pXString = m_xAccContextRef->getAccessibleDescription(); m_pIMAcc->Put_XAccDescription(o3tl::toW(pXString.getStr())); long Role = m_accRole; |