[Libreoffice-commits] .: sd/source

[Olivier Hallot]

 sd/source/ui/app/sdmod1.cxx                  |    2 +-
 sd/source/ui/dlg/animobjs.cxx                |    2 +-
 sd/source/ui/presenter/PresenterTextView.cxx |    6 ++----
 sd/source/ui/unoidl/sddetect.cxx             |    2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)

New commits:
commit 7715779e4b0f9fce364a3429b8775abffa3cd176
Author: Olivier Hallot <olivier.hallot at alta.org.br>
Date:   Sun Apr 15 22:05:11 2012 -0300

    Some Unistring removals
    
    in sd/ui

diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx
index 6cdcec1..d1500dc 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 d73f125..f4dd340 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 db08667..bce7491 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 07c92ac..888285d 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());