[Libreoffice-commits] .: 2 commits - sfx2/source sw/source

[Takeshi Abe]

 sfx2/source/appl/shutdownicon.cxx |    8 ++++----
 sw/source/ui/shells/textsh.cxx    |    3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 0cf0382d4eb8588c91e850adbd874c3cb5ef6f03
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date:   Sat Jan 21 04:42:55 2012 +0900

    replaced UniString by rtl::OUString
    
    See also d2991722b34fb597d34a3270cd4a806277c52da5

diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx
index 141aacd..ffaa63d 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -391,8 +391,8 @@ OUString ShutdownIcon::GetResString( int id )
     if( !m_pResMgr || !m_pResMgr->IsAvailable( aResId ) )
         return OUString();
 
-    UniString aRes( ResId(id, *m_pResMgr) );
-    return OUString( aRes );
+    ResId aRes( id, *m_pResMgr );
+    return ResId::toString( aRes );
 }
 
 // ---------------------------------------------------------------------------
@@ -831,8 +831,8 @@ rtl::OUString ShutdownIcon::getShortcutName()
     if( pMgr )
     {
         ::SolarMutexGuard aGuard;
-        UniString aRes( SfxResId( STR_QUICKSTART_LNKNAME ) );
-        aShortcutName = OUString( aRes );
+        SfxResId aRes( STR_QUICKSTART_LNKNAME );
+        aShortcutName = ResId::toString( aRes );
     }
 #ifdef WNT
     aShortcutName += OUString( RTL_CONSTASCII_USTRINGPARAM( ".lnk" ) );
commit a06e1a6b63dfcb84cb1a3a7c5fd30829b9d33c82
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date:   Fri Jan 20 00:14:44 2012 +0900

    It does not require SwAppletImpl but only a couple of subheaders

diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/ui/shells/textsh.cxx
index 59bb69c..ef2f4b9 100644
--- a/sw/source/ui/shells/textsh.cxx
+++ b/sw/source/ui/shells/textsh.cxx
@@ -32,6 +32,8 @@
 #include <hintids.hxx>
 
 #include <svl/globalnameitem.hxx>
+#include <svl/ownlist.hxx>
+#include <sfx2/frmdescr.hxx>
 #include <sfx2/objface.hxx>
 #include <sfx2/lnkbase.hxx>
 
@@ -100,7 +102,6 @@
 #include <shells.hrc>
 #include <popup.hrc>
 #include <swerror.h>
-#include <SwAppletImpl.hxx>
 #include <unochart.hxx>
 
 #include <chartins.hxx>