diff options
author | Noel Grandin <noel@peralex.com> | 2013-10-11 14:54:51 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-10-15 12:25:42 +0200 |
commit | 79ded16799f533bdad852bb111073dfd2c3c017d (patch) | |
tree | 61b7b73ec6cbe10eac32b8a040cbaa7d52c5815c | |
parent | 86989abe6e61f257e600a1e0900d17e0c7aa075b (diff) |
convert sw/source/ui/wrtsh/*.cxx from String to OUString
Change-Id: I325c96ff17168363161a0174704c9f11577d60bc
-rw-r--r-- | sw/source/ui/wrtsh/select.cxx | 10 | ||||
-rw-r--r-- | sw/source/ui/wrtsh/wrtsh1.cxx | 12 | ||||
-rw-r--r-- | sw/source/ui/wrtsh/wrtsh2.cxx | 8 |
3 files changed, 15 insertions, 15 deletions
diff --git a/sw/source/ui/wrtsh/select.cxx b/sw/source/ui/wrtsh/select.cxx index 0603e8af59bd..c55c1e59d30a 100644 --- a/sw/source/ui/wrtsh/select.cxx +++ b/sw/source/ui/wrtsh/select.cxx @@ -851,7 +851,7 @@ int SwWrtShell::IntelligentCut(int nSelection, sal_Bool bCut) if( IsAddMode() || !(nSelection & nsSelectionType::SEL_TXT) ) return sal_False; - String sTxt; + OUString sTxt; CharClass& rCC = GetAppCharClass(); // If the first character is no word character, @@ -859,8 +859,8 @@ int SwWrtShell::IntelligentCut(int nSelection, sal_Bool bCut) sal_Unicode cPrev = GetChar(sal_False); sal_Unicode cNext = GetChar(sal_True, -1); if( !cPrev || !cNext || - !rCC.isLetterNumeric( ( sTxt = cPrev), 0 ) || - !rCC.isLetterNumeric( ( sTxt = cNext), 0 ) ) + !rCC.isLetterNumeric( ( sTxt = OUString(cPrev) ), 0 ) || + !rCC.isLetterNumeric( ( sTxt = OUString(cNext) ), 0 ) ) return NO_WORD; cPrev = GetChar(sal_False, -1); @@ -871,8 +871,8 @@ int SwWrtShell::IntelligentCut(int nSelection, sal_Bool bCut) if(!cWord && cPrev && cNext && CH_TXTATR_BREAKWORD != cPrev && CH_TXTATR_INWORD != cPrev && CH_TXTATR_BREAKWORD != cNext && CH_TXTATR_INWORD != cNext && - !rCC.isLetterNumeric( ( sTxt = cPrev), 0 ) && - !rCC.isLetterNumeric( ( sTxt = cNext), 0 ) ) + !rCC.isLetterNumeric( ( sTxt = OUString(cPrev) ), 0 ) && + !rCC.isLetterNumeric( ( sTxt = OUString(cNext) ), 0 ) ) cWord = WORD_NO_SPACE; if(cWord == WORD_NO_SPACE && ' ' == cPrev ) diff --git a/sw/source/ui/wrtsh/wrtsh1.cxx b/sw/source/ui/wrtsh/wrtsh1.cxx index 86b4f6df1a50..e23fd4d2d2c6 100644 --- a/sw/source/ui/wrtsh/wrtsh1.cxx +++ b/sw/source/ui/wrtsh/wrtsh1.cxx @@ -208,12 +208,12 @@ void SwWrtShell::Insert( const OUString &rStr ) SwRewriter aRewriter; aRewriter.AddRule(UndoArg1, GetCrsrDescr()); - aRewriter.AddRule(UndoArg2, String(SW_RES(STR_YIELDS))); + aRewriter.AddRule(UndoArg2, OUString(SW_RES(STR_YIELDS))); { - String aTmpStr; - aTmpStr += String(SW_RES(STR_START_QUOTE)); + OUString aTmpStr; + aTmpStr += SW_RES(STR_START_QUOTE); aTmpStr += rStr; - aTmpStr += String(SW_RES(STR_END_QUOTE)); + aTmpStr += SW_RES(STR_END_QUOTE); aRewriter.AddRule(UndoArg3, rStr); } @@ -1269,7 +1269,7 @@ void SwWrtShell::NumOrBulletOn(sal_Bool bNum) } // reset indent attribute on applying list style // start new list - SetCurNumRule( aNumRule, true, String(), true ); + SetCurNumRule( aNumRule, true, OUString(), true ); } EndUndo(UNDO_NUMORNONUM); @@ -1717,7 +1717,7 @@ void SwWrtShell::ChangeHeaderOrFooter( { int bChgd = sal_False; SwPageDesc aDesc( GetPageDesc( nFrom )); - String sTmp(aDesc.GetName()); + OUString sTmp(aDesc.GetName()); if( rStyleName.isEmpty() || rStyleName == sTmp ) { if( bShowWarning && !bOn && GetActiveView() && GetActiveView() == &GetView() && diff --git a/sw/source/ui/wrtsh/wrtsh2.cxx b/sw/source/ui/wrtsh/wrtsh2.cxx index ad9fc2c0370a..041e5177df48 100644 --- a/sw/source/ui/wrtsh/wrtsh2.cxx +++ b/sw/source/ui/wrtsh/wrtsh2.cxx @@ -384,7 +384,7 @@ void LoadURL( ViewShell& rVSh, const OUString& rURL, sal_uInt16 nFilter, sTargetFrame = xDocProps->getDefaultTarget(); } - String sReferer; + OUString sReferer; if( pDShell && pDShell->GetMedium() ) sReferer = pDShell->GetMedium()->GetName(); SfxViewFrame* pViewFrm = rSh.GetView().GetViewFrame(); @@ -444,9 +444,9 @@ void SwWrtShell::NavigatorPaste( const NaviContentBookmark& rBkmk, else { SwSectionData aSection( FILE_LINK_SECTION, GetUniqueSectionName() ); - String aLinkFile( rBkmk.GetURL().getToken(0, '#') ); - aLinkFile += sfx2::cTokenSeparator; - aLinkFile += sfx2::cTokenSeparator; + OUString aLinkFile( rBkmk.GetURL().getToken(0, '#') ); + aLinkFile += OUString(sfx2::cTokenSeparator); + aLinkFile += OUString(sfx2::cTokenSeparator); aLinkFile += rBkmk.GetURL().getToken(1, '#'); aSection.SetLinkFileName( aLinkFile ); aSection.SetProtectFlag( true ); |