More RTL_CONSTASCII_ cleanup

3 files changed, 17 insertions, 18 deletions

diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index 4540d4971e4c..b8489bc94d49 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -553,7 +553,6 @@ void SdDrawDocument::CreateDefaultCellStyles()
     SfxStyleSheetBase*      pSheet = NULL;
     String                  aHelpFile;
 
-    //const OUString sFamilyName( RTL_CONSTASCII_USTRINGPARAM( "table" ) );
     Reference< XNameContainer > xTableFamily( pSSPool->getByName( "table" ), UNO_QUERY );
 
     // ---- Default -----------------------------------------------
@@ -635,7 +634,7 @@ void SdDrawDocument::CreateDefaultCellStyles()
     Any aGray2( implMakeSolidCellStyle( pSSPool, "gray2" , aDefaultCellStyleName, RGB_COLORDATA(204,204,204)));
     Any aGray3( implMakeSolidCellStyle( pSSPool, "gray3" , aDefaultCellStyleName, RGB_COLORDATA(179,179,179)));
 
-    implCreateTableTemplate( xTableFamily, OUString(RTL_CONSTASCII_USTRINGPARAM("default") ), aGray1, aGray3, aGray2 );
+    implCreateTableTemplate( xTableFamily, "default" , aGray1, aGray3, aGray2 );
 
     // ---- BW ------------------------------------------------
 
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index e1aab55c5226..aa1a8b6c2cd6 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -2376,7 +2376,7 @@ void SdPage::SetObjText(SdrTextObj* pObj, SdrOutliner* pOutliner, PresObjKind eO
         // to inside this method to work even when outliner is fetched here.
         pOutl->SetStyleSheet(0, pObj->GetStyleSheet());
 
-        String aString;
+        rtl::OUString aString;
 
         switch( eObjKind )
         {
@@ -2384,29 +2384,29 @@ void SdPage::SetObjText(SdrTextObj* pObj, SdrOutliner* pOutliner, PresObjKind eO
             {
                 pOutl->Init( OUTLINERMODE_OUTLINEOBJECT );
 
-                aString += sal_Unicode( '\t' );
+                aString += "\t";
                 aString += rString;
 
                 if (mbMaster)
                 {
                     pOutl->SetStyleSheet( 0, GetStyleSheetForPresObj(eObjKind) );
-                    aString += String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "\n\t\t" ));
-                    aString += String ( SdResId( STR_PRESOBJ_MPOUTLLAYER2 ) );
+                    aString += "\n\t\t";
+                    aString += ResId::toString( SdResId( STR_PRESOBJ_MPOUTLLAYER2 ) );
 
-                    aString += String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "\n\t\t\t" ));
-                    aString += String ( SdResId( STR_PRESOBJ_MPOUTLLAYER3 ) );
+                    aString += "\n\t\t\t";
+                    aString += ResId::toString( SdResId( STR_PRESOBJ_MPOUTLLAYER3 ) );
 
-                    aString += String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "\n\t\t\t\t" ));
-                    aString += String ( SdResId( STR_PRESOBJ_MPOUTLLAYER4 ) );
+                    aString += "\n\t\t\t\t";
+                    aString += ResId::toString( SdResId( STR_PRESOBJ_MPOUTLLAYER4 ) );
 
-                    aString += String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "\n\t\t\t\t\t" ));
-                    aString += String ( SdResId( STR_PRESOBJ_MPOUTLLAYER5 ) );
+                    aString += "\n\t\t\t\t\t";
+                    aString += ResId::toString( SdResId( STR_PRESOBJ_MPOUTLLAYER5 ) );
 
-                    aString += String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "\n\t\t\t\t\t\t" ));
-                    aString += String ( SdResId( STR_PRESOBJ_MPOUTLLAYER6 ) );
+                    aString += "\n\t\t\t\t\t\t";
+                    aString += ResId::toString( SdResId( STR_PRESOBJ_MPOUTLLAYER6 ) );
 
-                    aString += String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "\n\t\t\t\t\t\t\t" ));
-                    aString += String ( SdResId( STR_PRESOBJ_MPOUTLLAYER7 ) );
+                    aString += "\n\t\t\t\t\t\t\t";
+                    aString += ResId::toString( SdResId( STR_PRESOBJ_MPOUTLLAYER7 ) );
 
                 }
             }
@@ -2458,7 +2458,7 @@ void SdPage::SetObjText(SdrTextObj* pObj, SdrOutliner* pOutliner, PresObjKind eO
 
         pOutl->SetPaperSize( pObj->GetLogicRect().GetSize() );
 
-        if( aString.Len() )
+        if( !aString.isEmpty() )
             pOutl->SetText( aString, pOutl->GetParagraph( 0 ) );
 
         ( (SdrTextObj*) pObj)->SetOutlinerParaObject( pOutl->CreateParaObject() );
diff --git a/sd/source/core/sdpage2.cxx b/sd/source/core/sdpage2.cxx
index 0159b14ba4e1..73b9441a810f 100644
--- a/sd/source/core/sdpage2.cxx
+++ b/sd/source/core/sdpage2.cxx
@@ -621,7 +621,7 @@ void SdPage::addAnnotation( const Reference< XAnnotation >& xAnnotation, int nIn
     {
         pModel->SetChanged();
         Reference< XInterface > xSource( xAnnotation, UNO_QUERY );
-        NotifyDocumentEvent( static_cast< SdDrawDocument* >( pModel ), rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OnAnnotationInserted" ) ), xSource );
+        NotifyDocumentEvent( static_cast< SdDrawDocument* >( pModel ), "OnAnnotationInserted" , xSource );
     }
 }