From 1b088c6e496b799ca9ddb0d6f7b98bcb5c132ecc Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Fri, 30 Mar 2012 23:40:05 +0100
Subject: pointer is always non-null

---
 sd/source/ui/view/drviews3.cxx       |  4 ++--
 svx/source/form/navigatortree.cxx    |  7 +++----
 svx/source/svdraw/svdotext.cxx       |  2 +-
 uui/source/iahndl-authentication.cxx |  3 +--
 uui/source/logindlg.cxx              | 10 +++++-----
 uui/source/logindlg.hxx              |  2 +-
 6 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx
index b498d4e7292a..4435d29346b5 100644
--- a/sd/source/ui/view/drviews3.cxx
+++ b/sd/source/ui/view/drviews3.cxx
@@ -422,7 +422,7 @@ void  DrawViewShell::ExecCtrl(SfxRequest& rReq)
 
                 if (pBookmark)
                 {
-                    UniString sBookmark( INetURLObject::decode( pBookmark->GetValue(), '%', INetURLObject::DECODE_WITH_CHARSET ) );
+                    rtl::OUString sBookmark(INetURLObject::decode(pBookmark->GetValue(), '%', INetURLObject::DECODE_WITH_CHARSET));
 
                     rtl::Reference< sd::SlideShow > xSlideshow( SlideShow::GetSlideShow( GetViewShellBase() ) );
                     if(xSlideshow.is() && xSlideshow->isRunning())
@@ -431,7 +431,7 @@ void  DrawViewShell::ExecCtrl(SfxRequest& rReq)
                     }
                     else
                     {
-                        GotoBookmark( sBookmark );
+                        GotoBookmark(sBookmark);
                     }
                 }
             }
diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx
index 9dd61e9ee169..2c664376abe7 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -1480,12 +1480,11 @@ namespace svxform
 
         //////////////////////////////////////////////////////////////////////
         // BasisNamen erzeugen
-        UniString aBaseName;
+        rtl::OUString aBaseName;
         if( pEntryData->ISA(FmFormData) )
-            aBaseName = SVX_RES( RID_STR_STDFORMNAME );
-
+            aBaseName = SVX_RESSTR( RID_STR_STDFORMNAME );
         else if( pEntryData->ISA(FmControlData) )
-            aBaseName = SVX_RES( RID_STR_CONTROL );
+            aBaseName = SVX_RESSTR( RID_STR_CONTROL );
 
         //////////////////////////////////////////////////////////////////////
         // Neuen Namen erstellen
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 7df368f3acdc..96c9b34545a6 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -870,7 +870,7 @@ void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Size& rTextS
     {
         // check whether CharStretching is possible at all
         GDIMetaFile* pMtf = pOut->GetConnectMetaFile();
-        UniString aTestString(sal_Unicode('J'));
+        rtl::OUString aTestString(static_cast<sal_Unicode>('J'));
 
         if(pMtf && (!pMtf->IsRecord() || pMtf->IsPause()))
             pMtf = NULL;
diff --git a/uui/source/iahndl-authentication.cxx b/uui/source/iahndl-authentication.cxx
index 3844804a3cb1..76eaada570f1 100644
--- a/uui/source/iahndl-authentication.cxx
+++ b/uui/source/iahndl-authentication.cxx
@@ -95,9 +95,8 @@ executeLoginDialog(
             nFlags |= LF_NO_USESYSCREDS;
 
         boost::scoped_ptr< ResMgr > xManager(ResMgr::CreateResMgr("uui"));
-        UniString aRealm(rRealm);
         boost::scoped_ptr< LoginDialog > xDialog(
-                new LoginDialog( pParent, nFlags, rInfo.GetServer(), &aRealm, xManager.get()));
+                new LoginDialog( pParent, nFlags, rInfo.GetServer(), rRealm, xManager.get()));
         if (rInfo.GetErrorText().Len() != 0)
             xDialog->SetErrorText(rInfo.GetErrorText());
         xDialog->SetName(rInfo.GetUserName());
diff --git a/uui/source/logindlg.cxx b/uui/source/logindlg.cxx
index 78a29c86078e..8a15dfe7a8ba 100644
--- a/uui/source/logindlg.cxx
+++ b/uui/source/logindlg.cxx
@@ -250,8 +250,8 @@ LoginDialog::LoginDialog
 (
     Window* pParent,
     sal_uInt16 nFlags,
-    const String& rServer,
-    const String* pRealm,
+    const rtl::OUString& rServer,
+    const rtl::OUString& rRealm,
     ResMgr* pResMgr
 ) :
 
@@ -280,10 +280,10 @@ LoginDialog::LoginDialog
 
 {
     UniString aRequest;
-    if ((nFlags & LF_NO_ACCOUNT) != 0 && pRealm && pRealm->Len() != 0)
+    if ((nFlags & LF_NO_ACCOUNT) != 0 && !rRealm.isEmpty())
     {
-        aRequest = ResId(STR_LOGIN_REALM, *pResMgr);
-        aRequest.SearchAndReplaceAscii("%2", *pRealm);
+        aRequest = ResId::toString(ResId(STR_LOGIN_REALM, *pResMgr));
+        aRequest.SearchAndReplaceAscii("%2", rRealm);
     }
     else
         aRequest = aRequestInfo.GetText();
diff --git a/uui/source/logindlg.hxx b/uui/source/logindlg.hxx
index 7ce8d5c21593..bd533f157a52 100644
--- a/uui/source/logindlg.hxx
+++ b/uui/source/logindlg.hxx
@@ -82,7 +82,7 @@ class LoginDialog : public ModalDialog
 
 public:
     LoginDialog( Window* pParent, sal_uInt16 nFlags,
-                 const String& rServer, const String* pRealm,
+                 const rtl::OUString& rServer, const rtl::OUString &rRealm,
                  ResMgr * pResMgr );
     virtual ~LoginDialog();
 
-- 
cgit