[Libreoffice-commits] core.git: sfx2/source
Stephan Bergmann
sbergman at redhat.com
Sun Oct 20 14:20:37 PDT 2013
sfx2/source/appl/shutdowniconaqua.mm | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
New commits:
commit 41d521e965d26822afecb7a3a46cf825c657ec00
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Sun Oct 20 23:20:19 2013 +0200
String -> OUString
Change-Id: I7dfb8dfbc216cf4c80701bf7d0bd398afaca3f13
diff --git a/sfx2/source/appl/shutdowniconaqua.mm b/sfx2/source/appl/shutdowniconaqua.mm
index bcc0449..5a84595 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];
More information about the Libreoffice-commits
mailing list