summaryrefslogtreecommitdiff
path: root/embeddedobj/source
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2013-11-14 13:13:19 +0200
committerNoel Grandin <noel@peralex.com>2013-11-19 10:29:30 +0200
commit2c35fff7eca3a143d28dc75e6a73fe1101d2af77 (patch)
treefb31b64880b06b0e2bd867aa6216ae0259c7c091 /embeddedobj/source
parentccc297097891e62489e5d281a4ea128ec6b71361 (diff)
remove most use of RTL_CONSTASCII_USTRINGPARAM macro
This is largely unnecessary when working with OUString Change-Id: I3cf4d68357a43665d01162ef4a2d5346a45da9be
Diffstat (limited to 'embeddedobj/source')
-rw-r--r--embeddedobj/source/msole/olecomponent.cxx8
-rw-r--r--embeddedobj/source/msole/olevisual.cxx2
-rw-r--r--embeddedobj/source/msole/xdialogcreator.cxx2
3 files changed, 6 insertions, 6 deletions
diff --git a/embeddedobj/source/msole/olecomponent.cxx b/embeddedobj/source/msole/olecomponent.cxx
index e4a11c9d8847..1bbec2121ca2 100644
--- a/embeddedobj/source/msole/olecomponent.cxx
+++ b/embeddedobj/source/msole/olecomponent.cxx
@@ -189,17 +189,17 @@ struct OleComponentNative_Impl {
m_aSupportedGraphFormats.realloc( 5 );
m_aSupportedGraphFormats[0] = datatransfer::DataFlavor(
- OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-emf;windows_formatname=\"Image EMF\"" )),
+ OUString( "application/x-openoffice-emf;windows_formatname=\"Image EMF\"" ),
OUString( "Windows Enhanced Metafile" ),
getCppuType( (const uno::Sequence< sal_Int8 >*) 0 ) );
m_aSupportedGraphFormats[1] = datatransfer::DataFlavor(
- OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" )),
+ OUString( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" ),
OUString( "Windows Metafile" ),
getCppuType( (const uno::Sequence< sal_Int8 >*) 0 ) );
m_aSupportedGraphFormats[2] = datatransfer::DataFlavor(
- OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"" )),
+ OUString( "application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"" ),
OUString( "Bitmap" ),
getCppuType( (const uno::Sequence< sal_Int8 >*) 0 ) );
@@ -209,7 +209,7 @@ struct OleComponentNative_Impl {
getCppuType( (const uno::Sequence< sal_Int8 >*) 0 ) );
m_aSupportedGraphFormats[0] = datatransfer::DataFlavor(
- OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"" )),
+ OUString( "application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"" ),
OUString( "GDIMetafile" ),
getCppuType( (const uno::Sequence< sal_Int8 >*) 0 ) );
}
diff --git a/embeddedobj/source/msole/olevisual.cxx b/embeddedobj/source/msole/olevisual.cxx
index bd3747c3bd66..f05ebe41747a 100644
--- a/embeddedobj/source/msole/olevisual.cxx
+++ b/embeddedobj/source/msole/olevisual.cxx
@@ -359,7 +359,7 @@ embed::VisualRepresentation SAL_CALL OleEmbeddedObject::getPreferredVisualRepres
changeState( embed::EmbedStates::RUNNING );
datatransfer::DataFlavor aDataFlavor(
- OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" )),
+ OUString( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" ),
OUString( "Windows Metafile" ),
::getCppuType( (const uno::Sequence< sal_Int8 >*) NULL ) );
diff --git a/embeddedobj/source/msole/xdialogcreator.cxx b/embeddedobj/source/msole/xdialogcreator.cxx
index d2c9cfb7e8fe..c191075076db 100644
--- a/embeddedobj/source/msole/xdialogcreator.cxx
+++ b/embeddedobj/source/msole/xdialogcreator.cxx
@@ -253,7 +253,7 @@ embed::InsertedObjectInfo SAL_CALL MSOLEDialogObjectCreator::createInstanceByDia
if ( nBufSize && nBufSize == GetMetaFileBitsEx( pMF->hMF, nBufSize, pBuf+22 ) )
{
datatransfer::DataFlavor aFlavor(
- OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" )),
+ OUString( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" ),
OUString( "Image WMF" ),
getCppuType( ( const uno::Sequence< sal_Int8 >* ) 0 ) );