diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-08-29 20:44:22 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-08-30 11:39:01 +0100 |
| commit | 74929bba736cc6cceed3c088e13f5952abb1bd2b (patch) | |
| tree | 8a026d95bc586ca6a41686dee32dfa53b659b252 /svx | |
| parent | fc7e7b683112e9ccd23104f38d4acc3417e9d5b8 (diff) | |
Related: fdo#38838 remove UniString::ToUpperAscii
things got a little out of hand and I ended up
converting quite a bit of calc to OUString
Change-Id: I056326d37ffefa8c120cb2e564d166dd9f20f216
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/accessibility/AccessibleFrameSelector.cxx | 10 | ||||
| -rw-r--r-- | svx/source/items/hlnkitem.cxx | 9 |
2 files changed, 9 insertions, 10 deletions
diff --git a/svx/source/accessibility/AccessibleFrameSelector.cxx b/svx/source/accessibility/AccessibleFrameSelector.cxx index ee90e33c9b90..1a21e7cfd5dd 100644 --- a/svx/source/accessibility/AccessibleFrameSelector.cxx +++ b/svx/source/accessibility/AccessibleFrameSelector.cxx @@ -472,12 +472,12 @@ Any AccFrameSelector::getAccessibleKeyBinding( ) throw (RuntimeException) Window* pPrev = mpFrameSel->GetWindow( WINDOW_PREV ); if(pPrev && WINDOW_FIXEDTEXT == pPrev->GetType()) { - String sText = pPrev->GetText(); - xub_StrLen nFound = sText.Search( MNEMONIC_CHAR ); - if(STRING_NOTFOUND != nFound && ++nFound < sText.Len()) + OUString sText = pPrev->GetText(); + sal_Int32 nFound = sText.indexOf(MNEMONIC_CHAR); + if(-1 != nFound && ++nFound < sText.getLength()) { - sText.ToUpperAscii(); - sal_Unicode cChar = sText.GetChar(nFound); + sText = sText.toAsciiUpperCase(); + sal_Unicode cChar = sText[nFound]; AwtKeyEvent aEvent; aEvent.KeyCode = 0; diff --git a/svx/source/items/hlnkitem.cxx b/svx/source/items/hlnkitem.cxx index 4919251e09ba..9014196dd620 100644 --- a/svx/source/items/hlnkitem.cxx +++ b/svx/source/items/hlnkitem.cxx @@ -297,7 +297,7 @@ bool SvxHyperlinkItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMe rVal <<= OUString(sIntName.GetBuffer()); break; case MID_HLINK_TEXT : - rVal <<= OUString(sName.GetBuffer()); + rVal <<= sName; break; case MID_HLINK_URL: rVal <<= OUString(sURL.GetBuffer()); @@ -317,7 +317,6 @@ bool SvxHyperlinkItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMe bool SvxHyperlinkItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) { -// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; OUString aStr; sal_Int32 nVal = 0; @@ -326,12 +325,12 @@ bool SvxHyperlinkItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 case MID_HLINK_NAME : if(!(rVal >>= aStr)) return sal_False; - sIntName = aStr.getStr(); + sIntName = aStr; break; case MID_HLINK_TEXT : if(!(rVal >>= aStr)) return sal_False; - sName = aStr.getStr(); + sName = aStr; break; case MID_HLINK_URL: if(!(rVal >>= aStr)) @@ -341,7 +340,7 @@ bool SvxHyperlinkItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 case MID_HLINK_TARGET: if(!(rVal >>= aStr)) return sal_False; - sTarget = aStr.getStr(); + sTarget = aStr; break; case MID_HLINK_TYPE: if(!(rVal >>= nVal)) |