[Libreoffice-commits] .: sd/source

[Olivier Hallot]

 sd/source/ui/view/DocumentRenderer.cxx     |    6 +++---
 sd/source/ui/view/ImpressViewShellBase.cxx |    2 +-
 sd/source/ui/view/ViewShellBase.cxx        |    5 ++---
 sd/source/ui/view/drviews5.cxx             |    2 +-
 sd/source/ui/view/frmview.cxx              |    2 +-
 sd/source/ui/view/sdview4.cxx              |    4 ++--
 6 files changed, 10 insertions(+), 11 deletions(-)

New commits:
commit 29598e43c4f1262314274d341532a0143255634b
Author: Olivier Hallot <olivier.hallot at alta.org.br>
Date:   Sat Apr 7 09:02:24 2012 -0300

    More OUString ctor  simplifcations
    
    remove more OUString explicit contructions
    
    (make C++ strings look like Strings)

diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx
index 8a51c20..3ddb7d7 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -901,7 +901,7 @@ namespace {
             const sal_uLong nDrawMode,
             const Orientation eOrientation,
             const sal_uInt16 nPaperTray)
-            : PrinterPage(ePageKind, rMapMode, bPrintMarkedOnly, ::rtl::OUString(),
+            : PrinterPage(ePageKind, rMapMode, bPrintMarkedOnly, "",
                 Point(), nDrawMode, eOrientation, nPaperTray),
               mnFirstPageIndex(nFirstPageIndex),
               mnSecondPageIndex(nSecondPageIndex),
@@ -2006,10 +2006,10 @@ private:
             if (mpOptions->IsPrintPageName())
             {
                 rInfo.msPageString = pPage->GetName();
-                rInfo.msPageString += ::rtl::OUString(sal_Unicode(' '));
+                rInfo.msPageString += rtl::OUString(sal_Unicode(' '));
             }
             else
-                rInfo.msPageString = ::rtl::OUString();
+                rInfo.msPageString = "";
             rInfo.msPageString += rInfo.msTimeDate;
 
             long aPageWidth   = aPageSize.Width() - pPage->GetLftBorder() - pPage->GetRgtBorder();
diff --git a/sd/source/ui/view/ImpressViewShellBase.cxx b/sd/source/ui/view/ImpressViewShellBase.cxx
index 030e32b..eebc01a 100644
--- a/sd/source/ui/view/ImpressViewShellBase.cxx
+++ b/sd/source/ui/view/ImpressViewShellBase.cxx
@@ -50,7 +50,7 @@ SfxViewShell* ImpressViewShellBase::CreateInstance (
     SfxViewFrame *pFrame, SfxViewShell *pOldView)
 {
     ImpressViewShellBase* pBase = new ImpressViewShellBase(pFrame, pOldView);
-    pBase->LateInit(::rtl::OUString());
+    pBase->LateInit("");
     return pBase;
 }
 void ImpressViewShellBase::RegisterFactory( sal_uInt16 nPrio )
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
index 5ad0394..7f514f3 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -236,13 +236,12 @@ SfxViewShell* ViewShellBase::CreateInstance (
     SfxViewFrame *pFrame, SfxViewShell *pOldView)
 {
     ViewShellBase* pBase = new ViewShellBase(pFrame, pOldView);
-    pBase->LateInit(OUString());
+    pBase->LateInit("");
     return pBase;
 }
 void ViewShellBase::RegisterFactory( sal_uInt16 nPrio )
 {
-    pFactory = new SfxViewFactory(
-        &CreateInstance,&InitFactory,nPrio,"Default");
+    pFactory = new SfxViewFactory( &CreateInstance,&InitFactory,nPrio,"Default" );
     InitFactory();
 }
 void ViewShellBase::InitFactory()
diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx
index 673cfe8..62ebfda 100644
--- a/sd/source/ui/view/drviews5.cxx
+++ b/sd/source/ui/view/drviews5.cxx
@@ -551,7 +551,7 @@ void DrawViewShell::WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::
 
     const sal_Int32 nIndex = rSequence.getLength();
     rSequence.realloc( nIndex + 1 );
-    rSequence[nIndex].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( sUNO_View_ZoomOnPage ));
+    rSequence[nIndex].Name = sUNO_View_ZoomOnPage ;
     rSequence[nIndex].Value <<= (sal_Bool)mbZoomOnPage;
 }
 
diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx
index 8724d52..b55d15c 100644
--- a/sd/source/ui/view/frmview.cxx
+++ b/sd/source/ui/view/frmview.cxx
@@ -466,7 +466,7 @@ static OUString createHelpLinesString( const SdrHelpLineList& rHelpLines )
     return aLines.makeStringAndClear();
 }
 
-#define addValue( n, v ) push_back( std::pair< OUString, Any >( OUString( RTL_CONSTASCII_USTRINGPARAM( n ) ), v ) )
+#define addValue( n, v ) push_back( std::pair< OUString, Any >( OUString( n ), v ) )
 void FrameView::WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& rValues, sal_Bool )
 {
     std::vector< std::pair< OUString, Any > > aUserData;
diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx
index bd919e5..030c9f6 100644
--- a/sd/source/ui/view/sdview4.cxx
+++ b/sd/source/ui/view/sdview4.cxx
@@ -488,8 +488,8 @@ IMPL_LINK_NOARG(View, DropInsertFileHdl)
                         //TODO/MBA: testing
                         ::rtl::OUString aName;
                         uno::Sequence < beans::PropertyValue > aMedium(1);
-                        aMedium[0].Name = ::rtl::OUString( "URL" );
-                        aMedium[0].Value <<= ::rtl::OUString( aCurrentDropFile );
+                        aMedium[0].Name = "URL" ;
+                        aMedium[0].Value <<=  ::rtl::OUString(aCurrentDropFile) ;
 
                         uno::Reference < embed::XEmbeddedObject > xObj = mpDocSh->GetEmbeddedObjectContainer().
                                 InsertEmbeddedObject( aMedium, aName );