diff options
Diffstat (limited to 'winaccessibility/source/UAccCOM/AccEditableText.cxx')
-rw-r--r-- | winaccessibility/source/UAccCOM/AccEditableText.cxx | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/winaccessibility/source/UAccCOM/AccEditableText.cxx b/winaccessibility/source/UAccCOM/AccEditableText.cxx index bf1fc69f6d3b..d676493ef58d 100644 --- a/winaccessibility/source/UAccCOM/AccEditableText.cxx +++ b/winaccessibility/source/UAccCOM/AccEditableText.cxx @@ -119,7 +119,7 @@ STDMETHODIMP CAccEditableText::insertText(long offset, BSTR * text) if( !pRXEdtTxt.is() ) return E_FAIL; - ::rtl::OUString ouStr(*text); + ::rtl::OUString ouStr(SAL_U(*text)); if( GetXInterface()->insertText( ouStr, offset ) ) return S_OK; @@ -196,7 +196,7 @@ STDMETHODIMP CAccEditableText::replaceText(long startOffset, long endOffset, BST if( !pRXEdtTxt.is() ) return E_FAIL; - ::rtl::OUString ouStr(*text); + ::rtl::OUString ouStr(SAL_U(*text)); if( GetXInterface()->replaceText( startOffset,endOffset, ouStr) ) return S_OK; @@ -225,7 +225,7 @@ STDMETHODIMP CAccEditableText::setAttributes(long startOffset, long endOffset, B if( !pRXEdtTxt.is() ) return E_FAIL; - ::rtl::OUString ouStr(*attributes); + ::rtl::OUString ouStr(SAL_U(*attributes)); sal_Int32 nIndex = 0; sal_Unicode cTok = ';'; @@ -268,55 +268,55 @@ STDMETHODIMP CAccEditableText::setAttributes(long startOffset, long endOffset, B */ void CAccEditableText::get_AnyFromOLECHAR(const ::rtl::OUString &ouName, const ::rtl::OUString &ouValue, Any &rAny) { - if(ouName.equals(L"CharBackColor") || - ouName.equals(L"CharColor") || - ouName.equals(L"ParaAdjust") || - ouName.equals(L"ParaFirstLineIndent") || - ouName.equals(L"ParaLeftMargin") || - ouName.equals(L"ParaRightMargin") || - ouName.equals(L"ParaTopMargin") || - ouName.equals(L"ParaBottomMargin") || - ouName.equals(L"CharFontPitch") ) + if(ouName.equals(u"CharBackColor") || + ouName.equals(u"CharColor") || + ouName.equals(u"ParaAdjust") || + ouName.equals(u"ParaFirstLineIndent") || + ouName.equals(u"ParaLeftMargin") || + ouName.equals(u"ParaRightMargin") || + ouName.equals(u"ParaTopMargin") || + ouName.equals(u"ParaBottomMargin") || + ouName.equals(u"CharFontPitch") ) { // Convert to int. // NOTE: CharFontPitch is not implemented in java file. sal_Int32 nValue = ouValue.toInt32(); rAny.setValue(&nValue, cppu::UnoType<sal_Int32>::get()); } - else if(ouName.equals(L"CharShadowed") || - ouName.equals(L"CharContoured") ) + else if(ouName.equals(u"CharShadowed") || + ouName.equals(u"CharContoured") ) { // Convert to boolean. rAny <<= ouValue.toBoolean(); } - else if(ouName.equals(L"CharEscapement") || - ouName.equals(L"CharStrikeout") || - ouName.equals(L"CharUnderline") || - ouName.equals(L"CharFontPitch") ) + else if(ouName.equals(u"CharEscapement") || + ouName.equals(u"CharStrikeout") || + ouName.equals(u"CharUnderline") || + ouName.equals(u"CharFontPitch") ) { // Convert to short. short nValue = (short)ouValue.toInt32(); rAny.setValue(&nValue, cppu::UnoType<short>::get()); } - else if(ouName.equals(L"CharHeight") || - ouName.equals(L"CharWeight") ) + else if(ouName.equals(u"CharHeight") || + ouName.equals(u"CharWeight") ) { // Convert to float. float fValue = ouValue.toFloat(); rAny.setValue(&fValue, cppu::UnoType<float>::get()); } - else if(ouName.equals(L"CharFontName") ) + else if(ouName.equals(u"CharFontName") ) { // Convert to string. rAny.setValue(&ouValue, cppu::UnoType<rtl::OUString>::get()); } - else if(ouName.equals(L"CharPosture") ) + else if(ouName.equals(u"CharPosture") ) { // Convert to FontSlant. css::awt::FontSlant fontSlant = (css::awt::FontSlant)ouValue.toInt32(); rAny.setValue(&fontSlant, cppu::UnoType<css::awt::FontSlant>::get()); } - else if(ouName.equals(L"ParaTabStops") ) + else if(ouName.equals(u"ParaTabStops") ) { // Convert to the Sequence with TabStop element. @@ -328,7 +328,7 @@ void CAccEditableText::get_AnyFromOLECHAR(const ::rtl::OUString &ouName, const : do { // Position. - pos = ouValue.indexOf(L"Position=", pos); + pos = ouValue.indexOf(u"Position=", pos); if(pos != -1) { posComma = ouValue.indexOf(',', pos + 9); // 9 = length of "Position=". @@ -339,7 +339,7 @@ void CAccEditableText::get_AnyFromOLECHAR(const ::rtl::OUString &ouName, const : pos = posComma + 1; // TabAlign. - pos = ouValue.indexOf(L"TabAlign=", pos); + pos = ouValue.indexOf(u"TabAlign=", pos); if(pos != -1) { posComma = ouValue.indexOf(',', pos + 9); // 9 = length of "TabAlign=". @@ -350,7 +350,7 @@ void CAccEditableText::get_AnyFromOLECHAR(const ::rtl::OUString &ouName, const : pos = posComma + 1; // DecimalChar. - pos = ouValue.indexOf(L"DecimalChar=", pos); + pos = ouValue.indexOf(u"DecimalChar=", pos); if(pos != -1) { posComma = ouValue.indexOf(',', pos + 11); // 11 = length of "TabAlign=". @@ -361,7 +361,7 @@ void CAccEditableText::get_AnyFromOLECHAR(const ::rtl::OUString &ouName, const : pos = posComma + 1; // FillChar. - pos = ouValue.indexOf(L"FillChar=", pos); + pos = ouValue.indexOf(u"FillChar=", pos); if(pos != -1) { posComma = ouValue.indexOf(',', pos + 9); // 9 = length of "TabAlign=". @@ -425,14 +425,14 @@ void CAccEditableText::get_AnyFromOLECHAR(const ::rtl::OUString &ouName, const : // Assign to Any object. rAny.setValue(&seqTabStop, cppu::UnoType<Sequence< css::style::TabStop >>::get()); } - else if(ouName.equals(L"ParaLineSpacing") ) + else if(ouName.equals(u"ParaLineSpacing") ) { // Parse value string. css::style::LineSpacing lineSpacing; ::rtl::OUString ouSubValue; sal_Int32 pos = 0, posComma = 0; - pos = ouValue.indexOf(L"Mode=", pos); + pos = ouValue.indexOf(u"Mode=", pos); if(pos != -1) { posComma = ouValue.indexOf(',', pos + 5); // 5 = length of "Mode=". @@ -442,7 +442,7 @@ void CAccEditableText::get_AnyFromOLECHAR(const ::rtl::OUString &ouName, const : lineSpacing.Mode = (sal_Int16)ouSubValue.toInt32(); pos = posComma + 1; - pos = ouValue.indexOf(L"Height=", pos); + pos = ouValue.indexOf(u"Height=", pos); if(pos != -1) { ouSubValue = ouValue.copy(pos + 7, ouValue.getLength() - pos - 7); |