diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2013-09-05 14:22:12 +0200 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2013-09-08 03:06:32 +0000 |
| commit | 9de3cff361fc49322689e26709ca4709866f485c (patch) | |
| tree | d95e13f88e624b29bda67c642c0e094633584b8f /sd/source/ui/view | |
| parent | 8848c6ec29919deec2f242ccdd336bc710da6646 (diff) | |
String to OUString
Change-Id: I5ff57ede2217f1464571fb2beaa62a34425064ae
Reviewed-on: https://gerrit.libreoffice.org/5826
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
Diffstat (limited to 'sd/source/ui/view')
| -rw-r--r-- | sd/source/ui/view/outlnvsh.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/view/viewoverlaymanager.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/view/viewshe2.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index 6e0cee76bc43..5e2b20930012 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -1857,7 +1857,7 @@ bool OutlineViewShell::UpdateOutlineObject( SdPage* pPage, Paragraph* pPara ) /** * Fill Outliner from Stream */ -sal_uLong OutlineViewShell::Read(SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat) +sal_uLong OutlineViewShell::Read(SvStream& rInput, const OUString& rBaseURL, sal_uInt16 eFormat) { sal_uLong bRet = 0; diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx index a0cc1332a5c2..70da4bea74d4 100644 --- a/sd/source/ui/view/viewoverlaymanager.cxx +++ b/sd/source/ui/view/viewoverlaymanager.cxx @@ -218,7 +218,7 @@ void ImageButtonHdl::onMouseEnter(const MouseEvent& rMEvt) SdResId aResId( gButtonToolTips[mnHighlightId] ); aResId.SetRT( RSC_STRING ); - String aHelpText( aResId ); + OUString aHelpText( aResId ); Rectangle aScreenRect( pDev->LogicToPixel( GetPos() ), maImageSize ); mnTip = Help::ShowTip( static_cast< ::Window* >( pHdlList->GetView()->GetFirstOutputDevice() ), aScreenRect, aHelpText, 0 ) ; } diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx index b6d7c5fdf7b1..1e7ddcd9e32e 100644 --- a/sd/source/ui/view/viewshe2.cxx +++ b/sd/source/ui/view/viewshe2.cxx @@ -75,7 +75,7 @@ using namespace com::sun::star; namespace sd { -const String aEmptyStr; +const OUString aEmptyStr; /** * adjust Thumbpos and VisibleSize |