diff options
| author | Ivan Timofeev <timofeev.i.s@gmail.com> | 2013-08-16 20:35:59 +0400 |
|---|---|---|
| committer | Ivan Timofeev <timofeev.i.s@gmail.com> | 2013-08-16 21:39:12 +0400 |
| commit | da5eb782cb28f806a8ca08ef8ebf21772363307d (patch) | |
| tree | e493bed69b460f3728b58f4dc3ff65b9c14f59d1 /sd/source/ui/app/sdmod1.cxx | |
| parent | fc395e6b312f80976b25a25990791e7fa3d2aa39 (diff) | |
String->OUString
Change-Id: Ibb7483e12d1c14b01cbcff64f881eb88e6c48265
Diffstat (limited to 'sd/source/ui/app/sdmod1.cxx')
| -rw-r--r-- | sd/source/ui/app/sdmod1.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx index 42802ea8cd38..361124f3c590 100644 --- a/sd/source/ui/app/sdmod1.cxx +++ b/sd/source/ui/app/sdmod1.cxx @@ -239,7 +239,7 @@ void SdModule::Execute(SfxRequest& rReq) } else { - ErrorBox(NULL, WB_OK, String(SdResId(STR_CANT_PERFORM_IN_LIVEMODE))).Execute(); + ErrorBox(NULL, WB_OK, SD_RESSTR(STR_CANT_PERFORM_IN_LIVEMODE)).Execute(); SFX_REQUEST_ARG( rReq, pLinkItem, SfxLinkItem, SID_DONELINK, sal_False ); if( pLinkItem ) @@ -573,7 +573,7 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq ) // Open the Pilot if( pPilotDlg.get() && pPilotDlg->Execute()==RET_OK ) { - const String aDocPath( pPilotDlg->GetDocPath()); + const OUString aDocPath( pPilotDlg->GetDocPath()); const sal_Bool bIsDocEmpty = pPilotDlg->IsDocEmpty(); // So that you can open the document without AutoLayout-Dialog @@ -583,10 +583,10 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq ) if( pPilotDlg->GetStartType() == ST_OPEN ) { - String aFileToOpen = aDocPath; + OUString aFileToOpen = aDocPath; - DBG_ASSERT( aFileToOpen.Len()!=0, "The autopilot should have asked for a file itself already!" ); - if(aFileToOpen.Len() != 0) + DBG_ASSERT( !aFileToOpen.isEmpty(), "The autopilot should have asked for a file itself already!" ); + if (!aFileToOpen.isEmpty()) { com::sun::star::uno::Sequence< com::sun::star::beans::NamedValue > aPasswrd( pPilotDlg->GetPassword() ); @@ -688,7 +688,7 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq ) AddSummaryPage(pViewFrame, pDoc); // empty document - if((aDocPath.Len() == 0) && pViewFrame && pViewFrame->GetDispatcher()) + if (aDocPath.isEmpty() && pViewFrame && pViewFrame->GetDispatcher()) { SfxBoolItem aIsChangedItem(SID_MODIFYPAGE, !bIsDocEmpty); SfxUInt32Item eAutoLayout( ID_VAL_WHATLAYOUT, (sal_uInt32) AUTOLAYOUT_TITLE ); @@ -1005,7 +1005,7 @@ void OutlineToImpressFinalizer::operator() (bool) sd::OutlineView* pView = static_cast<sd::OutlineView*>(pOutlineShell->GetView()); // mba: the stream can't contain any relative URLs, because we don't // have any information about a BaseURL! - if ( pOutlineShell->Read(*mpStream, String(), EE_FORMAT_RTF) == 0 ) + if ( pOutlineShell->Read(*mpStream, OUString(), EE_FORMAT_RTF) == 0 ) { } |