diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-07-04 23:58:05 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-07-09 12:16:56 +0100 |
| commit | 104261010aa5ccbb7df4a82a3a3cafcfb0591fa7 (patch) | |
| tree | b8db79d2707ff5925ad01dba8a41bd8ab6d66847 /sd | |
| parent | 1a1e953ee33c213dc8b88dd96a69ca9fc5e42d50 (diff) | |
some UniString->rtl::OUString
Change-Id: Ie69b30094da25df23a36baca2c7723d6a41f48c3
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/core/anminfo.cxx | 2 | ||||
| -rw-r--r-- | sd/source/core/drawdoc2.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/animations/SlideTransitionPane.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/func/fupoor.cxx | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/sd/source/core/anminfo.cxx b/sd/source/core/anminfo.cxx index 7e1e30fd1f9f..2cd0719ca6e3 100644 --- a/sd/source/core/anminfo.cxx +++ b/sd/source/core/anminfo.cxx @@ -108,7 +108,7 @@ void SdAnimationInfo::SetBookmark( const String& rBookmark ) { if( meClickAction == ::com::sun::star::presentation::ClickAction_BOOKMARK ) { - String sURL( '#' ); + String sURL = rtl::OUString('#'); sURL += rBookmark; SvxFieldItem aURLItem( SvxURLField( sURL, sURL ), EE_FEATURE_FIELD ); mrObject.SetMergedItem( aURLItem ); diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx index f423d3f2d1ec..e45999759126 100644 --- a/sd/source/core/drawdoc2.cxx +++ b/sd/source/core/drawdoc2.cxx @@ -334,7 +334,7 @@ void SdDrawDocument::UpdatePageRelativeURLs(SdPage* pPage, sal_uInt16 nPos, sal_ if (aURL.Len() && (aURL.GetChar(0) == 35)) { - XubString aHashSlide('#'); + XubString aHashSlide = rtl::OUString('#'); aHashSlide += SD_RESSTR(STR_PAGE); if (aURL.CompareTo(aHashSlide, aHashSlide.Len()) == COMPARE_EQUAL) diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx index 90fdab461eed..64a17d154f7a 100644 --- a/sd/source/ui/animations/SlideTransitionPane.cxx +++ b/sd/source/ui/animations/SlideTransitionPane.cxx @@ -955,7 +955,7 @@ void SlideTransitionPane::openSoundFileDialog() else { String aStrWarning(SdResId(STR_WARNING_NOSOUNDFILE)); - String aStr( sal_Unicode( '%' )); + rtl::OUString aStr('%'); aStrWarning.SearchAndReplace( aStr , aFile ); WarningBox aWarningBox( NULL, WB_3DLOOK | WB_RETRY_CANCEL, aStrWarning ); aWarningBox.SetModalInputMode (sal_True); diff --git a/sd/source/ui/func/fupoor.cxx b/sd/source/ui/func/fupoor.cxx index 7e468ecb265b..5a07576c34de 100644 --- a/sd/source/ui/func/fupoor.cxx +++ b/sd/source/ui/func/fupoor.cxx @@ -863,7 +863,7 @@ sal_Bool FuPoor::KeyInput(const KeyEvent& rKEvt) if(bPrintable) { // try to activate textedit mode for the selected object - SfxStringItem aInputString(SID_ATTR_CHAR, String(rKEvt.GetCharCode())); + SfxStringItem aInputString(SID_ATTR_CHAR, rtl::OUString(rKEvt.GetCharCode())); mpViewShell->GetViewFrame()->GetDispatcher()->Execute( SID_ATTR_CHAR, @@ -914,7 +914,7 @@ sal_Bool FuPoor::KeyInput(const KeyEvent& rKEvt) { mpView->UnMarkAll(); mpView->MarkObj(pCandidate, mpView->GetSdrPageView()); - SfxStringItem aInputString(SID_ATTR_CHAR, String(rKEvt.GetCharCode())); + SfxStringItem aInputString(SID_ATTR_CHAR, rtl::OUString(rKEvt.GetCharCode())); mpViewShell->GetViewFrame()->GetDispatcher()->Execute( SID_ATTR_CHAR, |