diff options
| author | Olivier Hallot <olivier.hallot@alta.org.br> | 2012-04-15 22:05:11 -0300 |
|---|---|---|
| committer | Olivier Hallot <olivier.hallot@alta.org.br> | 2012-04-15 22:06:06 -0300 |
| commit | 7715779e4b0f9fce364a3429b8775abffa3cd176 (patch) | |
| tree | 88414665c4cbc8d3f187302ba57da0e857f06e03 /sd | |
| parent | 8dd4fa9a102c705496aef7aca97de0818fea47db (diff) | |
Some Unistring removals
in sd/ui
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/app/sdmod1.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/dlg/animobjs.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/presenter/PresenterTextView.cxx | 6 | ||||
| -rw-r--r-- | sd/source/ui/unoidl/sddetect.cxx | 2 |
4 files changed, 5 insertions, 7 deletions
diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx index 6cdcec121537..d1500dc242c3 100644 --- a/sd/source/ui/app/sdmod1.cxx +++ b/sd/source/ui/app/sdmod1.cxx @@ -616,7 +616,7 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq ) com::sun::star::uno::Sequence< com::sun::star::beans::NamedValue > aPasswrd( pPilotDlg->GetPassword() ); SfxStringItem aFile( SID_FILE_NAME, aFileToOpen ); - SfxStringItem aReferer( SID_REFERER, UniString() ); + SfxStringItem aReferer( SID_REFERER, rtl::OUString()); SfxUnoAnyItem aPassword( SID_ENCRYPTIONDATA, com::sun::star::uno::makeAny(aPasswrd) ); if ( xTargetFrame.is() ) diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx index d73f12542f62..f4dd34084948 100644 --- a/sd/source/ui/dlg/animobjs.cxx +++ b/sd/source/ui/dlg/animobjs.cxx @@ -919,7 +919,7 @@ void AnimationWindow::AddObj (::sd::View& rView ) if( !nLoopCount ) // unendlich aLbLoopCount.SelectEntryPos( aLbLoopCount.GetEntryCount() - 1); else - aLbLoopCount.SelectEntry( UniString::CreateFromInt32( nLoopCount ) ); + aLbLoopCount.SelectEntry(rtl::OUString::valueOf( nLoopCount ) ); } // Time diff --git a/sd/source/ui/presenter/PresenterTextView.cxx b/sd/source/ui/presenter/PresenterTextView.cxx index db086671bd30..bce7491a7701 100644 --- a/sd/source/ui/presenter/PresenterTextView.cxx +++ b/sd/source/ui/presenter/PresenterTextView.cxx @@ -401,8 +401,7 @@ EditEngine* PresenterTextView::Implementation::CreateEditEngine (void) pEditEngine->EnableUndo (sal_True); pEditEngine->SetDefTab (sal_uInt16( - Application::GetDefaultDevice()->GetTextWidth( - UniString::CreateFromAscii("XXXX")))); + Application::GetDefaultDevice()->GetTextWidth(rtl::OUString("XXXX")))); pEditEngine->SetControlWord( (pEditEngine->GetControlWord() @@ -410,8 +409,7 @@ EditEngine* PresenterTextView::Implementation::CreateEditEngine (void) (~EE_CNTRL_UNDOATTRIBS) & (~EE_CNTRL_PASTESPECIAL)); - pEditEngine->SetWordDelimiters ( - UniString::CreateFromAscii(" .=+-*/(){}[];\"")); + pEditEngine->SetWordDelimiters (rtl::OUString(" .=+-*/(){}[];\"")); pEditEngine->SetRefMapMode (MAP_PIXEL); pEditEngine->SetPaperSize (Size(800, 0)); pEditEngine->EraseVirtualDevice(); diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx index 07c92ac1f9ab..888285da5b56 100644 --- a/sd/source/ui/unoidl/sddetect.cxx +++ b/sd/source/ui/unoidl/sddetect.cxx @@ -335,7 +335,7 @@ SdFilterDetect::~SdFilterDetect() SotStorageRef aStorage = new SotStorage ( pStm, sal_False ); if ( !aStorage->GetError() ) { - String aStreamName = UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "PowerPoint Document" ) ); + rtl::OUString aStreamName("PowerPoint Document"); if ( aStorage->IsStream( aStreamName ) && SvtModuleOptions().IsImpress() ) { String aFileName(aMedium.GetName()); |