summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2013-10-20 23:20:19 +0200
committerStephan Bergmann <sbergman@redhat.com>2013-10-20 23:20:19 +0200
commit41d521e965d26822afecb7a3a46cf825c657ec00 (patch)
treef0e9c5dd4a908d844634d3f39d310783e853d2be /sfx2
parente6e0098be8744c25ee065acc878d237963b80bd5 (diff)
String -> OUString
Change-Id: I7dfb8dfbc216cf4c80701bf7d0bd398afaca3f13
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/appl/shutdowniconaqua.mm8
1 files changed, 3 insertions, 5 deletions
diff --git a/sfx2/source/appl/shutdowniconaqua.mm b/sfx2/source/appl/shutdowniconaqua.mm
index bcc04494338f..5a845955f24b 100644
--- a/sfx2/source/appl/shutdowniconaqua.mm
+++ b/sfx2/source/appl/shutdowniconaqua.mm
@@ -226,14 +226,12 @@ class RecentFilesStringLength : public ::cppu::WeakImplHelper1< ::com::sun::star
{
// Do handle file URL differently => convert it to a system
// path and abbreviate it with a special function:
- String aFileSystemPath( aURL.getFSysPath( INetURLObject::FSYS_DETECT ) );
-
- ::rtl::OUString aSystemPath( aFileSystemPath );
+ ::rtl::OUString aSystemPath( aURL.getFSysPath( INetURLObject::FSYS_DETECT ) );
::rtl::OUString aCompactedSystemPath;
oslFileError nError = osl_abbreviateSystemPath( aSystemPath.pData, &aCompactedSystemPath.pData, 46, NULL );
if ( !nError )
- aMenuTitle = String( aCompactedSystemPath );
+ aMenuTitle = aCompactedSystemPath;
else
aMenuTitle = aSystemPath;
}
@@ -343,7 +341,7 @@ static void appendMenuItem( NSMenu* i_pMenu, NSMenu* i_pDockMenu, const rtl::OUS
}
}
-static void appendRecentMenu( NSMenu* i_pMenu, NSMenu* i_pDockMenu, const String& i_rTitle )
+static void appendRecentMenu( NSMenu* i_pMenu, NSMenu* i_pDockMenu, const OUString& i_rTitle )
{
if( ! pRecentDelegate )
pRecentDelegate = [[RecentMenuDelegate alloc] init];