mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pointer is always non-null

Browse Source
This commit is contained in:
Caolán McNamara
2012-03-30 23:40:05 +01:00
parent 2658eeb120
commit 1b088c6e49
6 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sd/source/ui/view/drviews3.cxx
View File

@@ -422,7 +422,7 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq)
if (pBookmark) 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() ) ); rtl::Reference< sd::SlideShow > xSlideshow( SlideShow::GetSlideShow( GetViewShellBase() ) );
if(xSlideshow.is() && xSlideshow->isRunning()) if(xSlideshow.is() && xSlideshow->isRunning())
@@ -431,7 +431,7 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq)
} }
else else
{ {
GotoBookmark( sBookmark ); GotoBookmark(sBookmark);
} }
} }
} }

7
svx/source/form/navigatortree.cxx
View File

@@ -1480,12 +1480,11 @@ namespace svxform
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
// BasisNamen erzeugen // BasisNamen erzeugen
UniString aBaseName; rtl::OUString aBaseName;
if( pEntryData->ISA(FmFormData) ) if( pEntryData->ISA(FmFormData) )
aBaseName = SVX_RES( RID_STR_STDFORMNAME ); aBaseName = SVX_RESSTR( RID_STR_STDFORMNAME );
else if( pEntryData->ISA(FmControlData) ) else if( pEntryData->ISA(FmControlData) )
aBaseName = SVX_RES( RID_STR_CONTROL ); aBaseName = SVX_RESSTR( RID_STR_CONTROL );
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
// Neuen Namen erstellen // Neuen Namen erstellen

2
svx/source/svdraw/svdotext.cxx
View File

@@ -870,7 +870,7 @@ void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Size& rTextS
{ {
// check whether CharStretching is possible at all // check whether CharStretching is possible at all
GDIMetaFile* pMtf = pOut->GetConnectMetaFile(); GDIMetaFile* pMtf = pOut->GetConnectMetaFile();
UniString aTestString(sal_Unicode('J')); rtl::OUString aTestString(static_cast<sal_Unicode>('J'));
if(pMtf && (!pMtf->IsRecord() || pMtf->IsPause())) if(pMtf && (!pMtf->IsRecord() || pMtf->IsPause()))
pMtf = NULL; pMtf = NULL;

3
uui/source/iahndl-authentication.cxx
View File

@@ -95,9 +95,8 @@ executeLoginDialog(
nFlags |= LF_NO_USESYSCREDS; nFlags |= LF_NO_USESYSCREDS;
boost::scoped_ptr< ResMgr > xManager(ResMgr::CreateResMgr("uui")); boost::scoped_ptr< ResMgr > xManager(ResMgr::CreateResMgr("uui"));
UniString aRealm(rRealm);
boost::scoped_ptr< LoginDialog > xDialog( 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) if (rInfo.GetErrorText().Len() != 0)
xDialog->SetErrorText(rInfo.GetErrorText()); xDialog->SetErrorText(rInfo.GetErrorText());
xDialog->SetName(rInfo.GetUserName()); xDialog->SetName(rInfo.GetUserName());

10
uui/source/logindlg.cxx
View File

@@ -250,8 +250,8 @@ LoginDialog::LoginDialog
( (
Window* pParent, Window* pParent,
sal_uInt16 nFlags, sal_uInt16 nFlags,
const String& rServer, const rtl::OUString& rServer,
const String* pRealm, const rtl::OUString& rRealm,
ResMgr* pResMgr ResMgr* pResMgr
) : ) :
@@ -280,10 +280,10 @@ LoginDialog::LoginDialog
{ {
UniString aRequest; 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 = ResId::toString(ResId(STR_LOGIN_REALM, *pResMgr));
aRequest.SearchAndReplaceAscii("%2", *pRealm); aRequest.SearchAndReplaceAscii("%2", rRealm);
} }
else else
aRequest = aRequestInfo.GetText(); aRequest = aRequestInfo.GetText();

2
uui/source/logindlg.hxx
View File

@@ -82,7 +82,7 @@ class LoginDialog : public ModalDialog
public: public:
LoginDialog( Window* pParent, sal_uInt16 nFlags, LoginDialog( Window* pParent, sal_uInt16 nFlags,
const String& rServer, const String* pRealm, const rtl::OUString& rServer, const rtl::OUString &rRealm,
ResMgr * pResMgr ); ResMgr * pResMgr );
virtual ~LoginDialog(); virtual ~LoginDialog();