More RTL_CONSTASCII_USTRINGPARAM removals

2 files changed, 8 insertions, 10 deletions

diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx
index 96a03316c0f0..f4831f3c593f 100644
--- a/sd/source/ui/annotations/annotationmanager.cxx
+++ b/sd/source/ui/annotations/annotationmanager.cxx
@@ -179,7 +179,7 @@ OUString getAnnotationDateTimeString( const Reference< XAnnotation >& xAnnotatio
 
         Time aTime( aDateTime.Hours, aDateTime.Minutes, aDateTime.Seconds, aDateTime.HundredthSeconds );
         if(aTime.GetTime() != 0)
-            sRet = sRet + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" "))  + rLocalData.getTime( aTime,false );
+            sRet = sRet + " "  + rLocalData.getTime( aTime,false );
     }
     return sRet;
 }
@@ -474,16 +474,16 @@ void AnnotationManagerImpl::ExecuteReplyToAnnotation( SfxRequest& rReq )
 
         aStr.SearchAndReplaceAscii("%1", sAuthor);
 
-        aStr.Append( String(RTL_CONSTASCII_USTRINGPARAM(" (") ) );
-        aStr.Append( String( getAnnotationDateTimeString( xAnnotation ) ) );
-        aStr.Append( String(RTL_CONSTASCII_USTRINGPARAM("): \"") ) );
+        aStr.Append( rtl::OUString(" (") );
+        aStr.Append( rtl::OUString( getAnnotationDateTimeString( xAnnotation ) ) );
+        aStr.Append( rtl::OUString("): \"") );
 
         String sQuote( pTextApi->GetText() );
 
         if( sQuote.Len() == 0 )
-            sQuote = String( RTL_CONSTASCII_USTRINGPARAM( "..." ) );
+            sQuote = rtl::OUString( "..." );
         aStr.Append( sQuote );
-        aStr.Append( String(RTL_CONSTASCII_USTRINGPARAM("\"\n") ) );
+        aStr.Append( rtl::OUString("\"\n") );
 
         sal_uInt16 nParaCount = comphelper::string::getTokenCount(aStr, '\n');
         for( sal_uInt16 nPara = 0; nPara < nParaCount; nPara++ )
@@ -1051,7 +1051,7 @@ void AnnotationManagerImpl::ExecuteAnnotationContextMenu( Reference< XAnnotation
             nId = pMenu->GetItemId( nPos );
             if( pMenu->IsItemEnabled( nId ) )
             {
-                OUString sSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" ));
+                OUString sSlotURL( "slot:" );
                 sSlotURL += OUString::valueOf( sal_Int32( nId ));
 
                 Image aImage( GetImage( xFrame, sSlotURL, false ) );
diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx
index 50fe477e350d..d6bc9177f915 100644
--- a/sd/source/ui/annotations/annotationwindow.cxx
+++ b/sd/source/ui/annotations/annotationwindow.cxx
@@ -105,8 +105,6 @@ using namespace ::com::sun::star::text;
 #define METABUTTON_AREA_WIDTH   30
 #define POSTIT_META_HEIGHT  (sal_Int32)     30
 
-#define EMPTYSTRING             rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(""))
-
 namespace sd {
 
 extern OUString getAnnotationDateTimeString( const Reference< XAnnotation >& xAnnotation );
@@ -579,7 +577,7 @@ void AnnotationWindow::setAnnotation( const Reference< XAnnotation >& xAnnotatio
         if( !sDateTime.isEmpty() )
         {
             if( !sMeta.isEmpty() )
-                sMeta += OUString( RTL_CONSTASCII_USTRINGPARAM( "\n" ) );
+                sMeta += "\n";
 
            sMeta += sDateTime;
         }