summaryrefslogtreecommitdiff
path: root/filter/source
diff options
context:
space:
mode:
Diffstat (limited to 'filter/source')
-rw-r--r--filter/source/msfilter/escherex.cxx2
-rw-r--r--filter/source/msfilter/mstoolbar.cxx8
-rw-r--r--filter/source/msfilter/svdfppt.cxx18
-rw-r--r--filter/source/placeware/exporter.cxx10
-rw-r--r--filter/source/svg/svgexport.cxx3
-rw-r--r--filter/source/svg/svgimport.cxx2
-rw-r--r--filter/source/svg/svgwriter.cxx12
-rw-r--r--filter/source/xsltdialog/typedetectionexport.cxx42
-rw-r--r--filter/source/xsltdialog/xmlfilterdialogcomponent.cxx2
-rw-r--r--filter/source/xsltdialog/xmlfilterjar.cxx8
-rw-r--r--filter/source/xsltdialog/xmlfiltertestdialog.cxx4
-rw-r--r--filter/source/xsltfilter/OleHandler.cxx2
12 files changed, 56 insertions, 57 deletions
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index 34fe8a508e7a..25a84438a26c 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -3258,7 +3258,7 @@ MSO_SPT EscherPropertyContainer::GetCustomShapeType( const uno::Reference< drawi
{
try
{
- const OUString sCustomShapeGeometry( RTL_CONSTASCII_USTRINGPARAM ( "CustomShapeGeometry" ) );
+ const OUString sCustomShapeGeometry( "CustomShapeGeometry" );
uno::Any aGeoPropSet = aXPropSet->getPropertyValue( sCustomShapeGeometry );
uno::Sequence< beans::PropertyValue > aGeoPropSeq;
if ( aGeoPropSet >>= aGeoPropSeq )
diff --git a/filter/source/msfilter/mstoolbar.cxx b/filter/source/msfilter/mstoolbar.cxx
index 5a06d41358ab..bc659c4be509 100644
--- a/filter/source/msfilter/mstoolbar.cxx
+++ b/filter/source/msfilter/mstoolbar.cxx
@@ -123,8 +123,8 @@ uno::Any
CustomToolBarImportHelper::createCommandFromMacro( const rtl::OUString& sCmd )
{
//"vnd.sun.star.script:Standard.Module1.Main?language=Basic&location=document"
- static rtl::OUString scheme( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.script:" ));
- static rtl::OUString part2( RTL_CONSTASCII_USTRINGPARAM( "?language=Basic&location=document" ));
+ static rtl::OUString scheme( "vnd.sun.star.script:" );
+ static rtl::OUString part2( "?language=Basic&location=document" );
// create script url
rtl::OUString scriptURL = scheme + sCmd + part2;
return uno::makeAny( scriptURL );
@@ -153,7 +153,7 @@ CustomToolBarImportHelper::createMenu( const rtl::OUString& rName, const uno::Re
try
{
uno::Reference< ui::XUIConfigurationManager > xCfgManager( getCfgManager() );
- rtl::OUString sMenuBar( RTL_CONSTASCII_USTRINGPARAM("private:resource/menubar/") );
+ rtl::OUString sMenuBar("private:resource/menubar/");
sMenuBar += rName;
uno::Reference< container::XIndexContainer > xPopup( xCfgManager->createSettings(), uno::UNO_QUERY_THROW );
uno::Reference< beans::XPropertySet > xProps( xPopup, uno::UNO_QUERY_THROW );
@@ -349,7 +349,7 @@ bool TBCData::ImportToolBarControl( CustomToolBarImportHelper& helper, std::vect
else if ( rHeader.getTct() == 0x0a )
{
aProp.Name = rtl::OUString("CommandURL") ;
- rtl::OUString sMenuBar( RTL_CONSTASCII_USTRINGPARAM("private:resource/menubar/") );
+ rtl::OUString sMenuBar("private:resource/menubar/");
TBCMenuSpecific* pMenu = getMenuSpecific();
if ( pMenu )
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 44a0b5214264..d4b16e392df9 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -7195,7 +7195,7 @@ void CreateTableRows( Reference< XTableRows > xTableRows, const std::set< sal_In
else
nHeight = nTableBottom - nLastPosition;
- static const rtl::OUString sWidth( RTL_CONSTASCII_USTRINGPARAM ( "Height" ) );
+ static const rtl::OUString sWidth( "Height" );
Reference< XPropertySet > xPropSet( xIndexAccess->getByIndex( n ), UNO_QUERY_THROW );
xPropSet->setPropertyValue( sWidth, Any( nHeight ) );
}
@@ -7220,7 +7220,7 @@ void CreateTableColumns( Reference< XTableColumns > xTableColumns, const std::se
else
nWidth = nTableRight - nLastPosition;
- static const rtl::OUString sWidth( RTL_CONSTASCII_USTRINGPARAM ( "Width" ) );
+ static const rtl::OUString sWidth( "Width" );
Reference< XPropertySet > xPropSet( xIndexAccess->getByIndex( n ), UNO_QUERY_THROW );
xPropSet->setPropertyValue( sWidth, Any( nWidth ) );
}
@@ -7255,16 +7255,16 @@ void ApplyCellAttributes( const SdrObject* pObj, Reference< XCell >& xCell )
const sal_Int32 nRightDist(((const SdrTextRightDistItem&)pObj->GetMergedItem(SDRATTR_TEXT_RIGHTDIST)).GetValue());
const sal_Int32 nUpperDist(((const SdrTextUpperDistItem&)pObj->GetMergedItem(SDRATTR_TEXT_UPPERDIST)).GetValue());
const sal_Int32 nLowerDist(((const SdrTextLowerDistItem&)pObj->GetMergedItem(SDRATTR_TEXT_LOWERDIST)).GetValue());
- static const rtl::OUString sTopBorder( RTL_CONSTASCII_USTRINGPARAM( "TextUpperDistance" ) );
- static const rtl::OUString sBottomBorder( RTL_CONSTASCII_USTRINGPARAM( "TextLowerDistance" ) );
- static const rtl::OUString sLeftBorder( RTL_CONSTASCII_USTRINGPARAM( "TextLeftDistance" ) );
- static const rtl::OUString sRightBorder( RTL_CONSTASCII_USTRINGPARAM( "TextRightDistance" ) );
+ static const rtl::OUString sTopBorder( "TextUpperDistance" );
+ static const rtl::OUString sBottomBorder( "TextLowerDistance" );
+ static const rtl::OUString sLeftBorder( "TextLeftDistance" );
+ static const rtl::OUString sRightBorder( "TextRightDistance" );
xPropSet->setPropertyValue( sTopBorder, Any( nUpperDist ) );
xPropSet->setPropertyValue( sRightBorder, Any( nRightDist ) );
xPropSet->setPropertyValue( sLeftBorder, Any( nLeftDist ) );
xPropSet->setPropertyValue( sBottomBorder, Any( nLowerDist ) );
- static const rtl::OUString sTextVerticalAdjust( RTL_CONSTASCII_USTRINGPARAM( "TextVerticalAdjust" ) );
+ static const rtl::OUString sTextVerticalAdjust( "TextVerticalAdjust" );
const SdrTextVertAdjust eTextVertAdjust(((const SdrTextVertAdjustItem&)pObj->GetMergedItem(SDRATTR_TEXT_VERTADJUST)).GetValue());
drawing::TextVerticalAdjust eVA( drawing::TextVerticalAdjust_TOP );
if ( eTextVertAdjust == SDRTEXTVERTADJUST_CENTER )
@@ -7376,8 +7376,8 @@ void ApplyCellLineAttributes( const SdrObject* pLine, Reference< XTable >& xTabl
static const rtl::OUString sBottomBorder( String( RTL_CONSTASCII_USTRINGPARAM( "BottomBorder" ) ) );
static const rtl::OUString sLeftBorder( String( RTL_CONSTASCII_USTRINGPARAM( "LeftBorder" ) ) );
static const rtl::OUString sRightBorder( String( RTL_CONSTASCII_USTRINGPARAM( "RightBorder" ) ) );
- static const rtl::OUString sDiagonalTLBR( RTL_CONSTASCII_USTRINGPARAM ( "DiagonalTLBR" ) );
- static const rtl::OUString sDiagonalBLTR( RTL_CONSTASCII_USTRINGPARAM ( "DiagonalBLTR" ) );
+ static const rtl::OUString sDiagonalTLBR( "DiagonalTLBR" );
+ static const rtl::OUString sDiagonalBLTR( "DiagonalBLTR" );
sal_Int32 nPosition = *aIter & 0xffffff;
sal_Int32 nFlags = *aIter &~0xffffff;
diff --git a/filter/source/placeware/exporter.cxx b/filter/source/placeware/exporter.cxx
index f2096d6105c5..319b42e7e66f 100644
--- a/filter/source/placeware/exporter.cxx
+++ b/filter/source/placeware/exporter.cxx
@@ -313,7 +313,7 @@ sal_Bool PlaceWareExporter::doExport( Reference< XComponent > xDoc, Reference <
nRC = aTempFile.open( osl_File_OpenFlag_Write|osl_File_OpenFlag_Read );
OUString aURL( aTempFile.getFileURL() );
#else
- OUString aURL( RTL_CONSTASCII_USTRINGPARAM("file:///e:/test.zip") );
+ OUString aURL("file:///e:/test.zip");
osl::File::remove( aURL );
osl::File aTempFile( aURL );
nRC = aTempFile.open( osl_File_OpenFlag_Create|osl_File_OpenFlag_Write|osl_File_OpenFlag_Read );
@@ -344,7 +344,7 @@ sal_Bool PlaceWareExporter::doExport( Reference< XComponent > xDoc, Reference <
PageEntry* pEntry = exportPage( xDrawPage );
aPageEntries.push_back( pEntry );
- OUString aName( RTL_CONSTASCII_USTRINGPARAM("i") );
+ OUString aName("i");
aName += OUString::valueOf( nPage );
aName += OUString(".gif");
pEntry->setURL( aName );
@@ -414,8 +414,8 @@ PageEntry* PlaceWareExporter::exportPage( Reference< XDrawPage >&xDrawPage )
pEntry->setName( xNamed->getName() );
// get title text from title presentation shape if available
- const OUString szTitleTextShape( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.TitleTextShape") );
- const OUString szIsEmptyPresObj( RTL_CONSTASCII_USTRINGPARAM("IsEmptyPresentationObject") );
+ const OUString szTitleTextShape("com.sun.star.presentation.TitleTextShape");
+ const OUString szIsEmptyPresObj("IsEmptyPresentationObject");
sal_Int32 nShapeCount = xDrawPage->getCount();
sal_Int32 nShape;
@@ -451,7 +451,7 @@ PageEntry* PlaceWareExporter::exportPage( Reference< XDrawPage >&xDrawPage )
{
Reference< XDrawPage > xNotesPage( xPresPage->getNotesPage() );
- const OUString szNotesShape( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.NotesShape") );
+ const OUString szNotesShape("com.sun.star.presentation.NotesShape");
nShapeCount = xNotesPage->getCount();
for( nShape = 0; nShape < nShapeCount; nShape++ )
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index 81a4435325a2..e1fea4f4d183 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -586,8 +586,7 @@ sal_Bool SVGFilter::implExport( const Sequence< PropertyValue >& rDescriptor )
// font embedding
const char* pSVGDisableFontEmbedding = getenv( "SVG_DISABLE_FONT_EMBEDDING" );
- rtl::OUString aEmbedFontEnv(
- RTL_CONSTASCII_USTRINGPARAM("${SVG_DISABLE_FONT_EMBEDDING}"));
+ rtl::OUString aEmbedFontEnv("${SVG_DISABLE_FONT_EMBEDDING}");
rtl::Bootstrap::expandMacros(aEmbedFontEnv);
const bool bEmbedFonts=pSVGDisableFontEmbedding ? false : (
aEmbedFontEnv.getLength() ? false : true);
diff --git a/filter/source/svg/svgimport.cxx b/filter/source/svg/svgimport.cxx
index e3e7a7b7ee2b..a44b231f599d 100644
--- a/filter/source/svg/svgimport.cxx
+++ b/filter/source/svg/svgimport.cxx
@@ -63,7 +63,7 @@ sal_Bool SVGFilter::implImport( const Sequence< PropertyValue >& rDescriptor )
if(!xInputStream.is())
return sal_False;
- rtl::OUString sXMLImportService ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Draw.XMLOasisImporter" ) );
+ rtl::OUString sXMLImportService ( "com.sun.star.comp.Draw.XMLOasisImporter" );
Reference < XDocumentHandler > xInternalHandler( mxContext->getServiceManager()->createInstanceWithContext( sXMLImportService, mxContext ), UNO_QUERY );
// The XImporter sets up an empty target document for XDocumentHandler to write to..
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index 62b7bb575f55..f9039b2bbce7 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -905,7 +905,7 @@ sal_Bool SVGTextWriter::nextParagraph()
if( xNumRules.is() && ( nListLevel < xNumRules->getCount() ) )
{
sal_Bool bIsNumbered = sal_True;
- OUString msNumberingIsNumber(RTL_CONSTASCII_USTRINGPARAM("NumberingIsNumber"));
+ OUString msNumberingIsNumber("NumberingIsNumber");
if( xPropSetInfo->hasPropertyByName( msNumberingIsNumber ) )
{
if( !(xPropSet->getPropertyValue( msNumberingIsNumber ) >>= bIsNumbered ) )
@@ -1035,7 +1035,7 @@ sal_Bool SVGTextWriter::nextParagraph()
if( xNumRules.is() && ( nListLevel < xNumRules->getCount() ) )
{
sal_Bool bIsNumbered = sal_True;
- OUString msNumberingIsNumber(RTL_CONSTASCII_USTRINGPARAM("NumberingIsNumber"));
+ OUString msNumberingIsNumber("NumberingIsNumber");
if( xPropSetInfo->hasPropertyByName( msNumberingIsNumber ) )
{
if( !(xPropSet->getPropertyValue( msNumberingIsNumber ) >>= bIsNumbered ) )
@@ -1161,8 +1161,8 @@ sal_Bool SVGTextWriter::nextTextPortion()
Reference < XTextField > xTextField( xRangePropSet->getPropertyValue( "TextField" ), UNO_QUERY );
if( xTextField.is() )
{
- const ::rtl::OUString sServicePrefix( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.textfield.") );
- const ::rtl::OUString sPresentationServicePrefix( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.TextField.") );
+ const ::rtl::OUString sServicePrefix("com.sun.star.text.textfield.");
+ const ::rtl::OUString sPresentationServicePrefix("com.sun.star.presentation.TextField.");
Reference< XServiceInfo > xService( xTextField, UNO_QUERY );
const Sequence< OUString > aServices = xService->getSupportedServiceNames();
@@ -1260,8 +1260,8 @@ sal_Bool SVGTextWriter::nextTextPortion()
Reference < XTextField > xTextField( xRangePropSet->getPropertyValue( "TextField" ), UNO_QUERY );
if( xTextField.is() )
{
- const ::rtl::OUString sServicePrefix( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.textfield.") );
- const ::rtl::OUString sPresentationServicePrefix( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.TextField.") );
+ const ::rtl::OUString sServicePrefix("com.sun.star.text.textfield.");
+ const ::rtl::OUString sPresentationServicePrefix("com.sun.star.presentation.TextField.");
Reference< XServiceInfo > xService( xTextField, UNO_QUERY );
const Sequence< OUString > aServices = xService->getSupportedServiceNames();
diff --git a/filter/source/xsltdialog/typedetectionexport.cxx b/filter/source/xsltdialog/typedetectionexport.cxx
index 9fb075306486..9fa3b3dc223e 100644
--- a/filter/source/xsltdialog/typedetectionexport.cxx
+++ b/filter/source/xsltdialog/typedetectionexport.cxx
@@ -65,7 +65,7 @@ static OUString createRelativeURL( const OUString& rFilterName, const OUString&
}
}
- OUString aRelURL( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.Package:" ) );
+ OUString aRelURL( "vnd.sun.star.Package:" );
aRelURL += rFilterName;
aRelURL += OUString( sal_Unicode( '/' ) );
aRelURL += aName;
@@ -81,18 +81,18 @@ void TypeDetectionExporter::doExport( Reference< XOutputStream > xOS, const XML
{
try
{
- const OUString sComponentData ( RTL_CONSTASCII_USTRINGPARAM ( "oor:component-data" ) );
- const OUString sNode ( RTL_CONSTASCII_USTRINGPARAM ( "node" ) );
- const OUString sName ( RTL_CONSTASCII_USTRINGPARAM ( "oor:name" ) );
- const OUString sWhiteSpace ( RTL_CONSTASCII_USTRINGPARAM ( " " ) );
- const OUString sUIName ( RTL_CONSTASCII_USTRINGPARAM ( "UIName" ) );
- const OUString sComma ( RTL_CONSTASCII_USTRINGPARAM ( "," ) );
- const OUString sDelim ( RTL_CONSTASCII_USTRINGPARAM ( ";" ) );
- const OUString sData ( RTL_CONSTASCII_USTRINGPARAM ( "Data" ) );
- const OUString sDocTypePrefix ( RTL_CONSTASCII_USTRINGPARAM ( "doctype:" ) );
- const OUString sFilterAdaptorService( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Writer.XmlFilterAdaptor" ) );
- const OUString sXSLTFilterService ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.documentconversion.XSLTFilter" ) );
- const OUString sCdataAttribute ( RTL_CONSTASCII_USTRINGPARAM( "CDATA" ) );
+ const OUString sComponentData ( "oor:component-data" );
+ const OUString sNode ( "node" );
+ const OUString sName ( "oor:name" );
+ const OUString sWhiteSpace ( " " );
+ const OUString sUIName ( "UIName" );
+ const OUString sComma ( "," );
+ const OUString sDelim ( ";" );
+ const OUString sData ( "Data" );
+ const OUString sDocTypePrefix ( "doctype:" );
+ const OUString sFilterAdaptorService( "com.sun.star.comp.Writer.XmlFilterAdaptor" );
+ const OUString sXSLTFilterService ( "com.sun.star.documentconversion.XSLTFilter" );
+ const OUString sCdataAttribute ( "CDATA" );
// set up sax writer and connect to given output stream
@@ -227,10 +227,10 @@ void TypeDetectionExporter::addProperty( Reference< XWriter > xHandler, const OU
{
try
{
- const OUString sCdataAttribute( RTL_CONSTASCII_USTRINGPARAM( "CDATA" ) );
- const OUString sProp( RTL_CONSTASCII_USTRINGPARAM( "prop" ) );
- const OUString sValue( RTL_CONSTASCII_USTRINGPARAM( "value" ) );
- const OUString sWhiteSpace ( RTL_CONSTASCII_USTRINGPARAM ( " " ) );
+ const OUString sCdataAttribute( "CDATA" );
+ const OUString sProp( "prop" );
+ const OUString sValue( "value" );
+ const OUString sWhiteSpace ( " " );
::comphelper::AttributeList * pAttrList = new ::comphelper::AttributeList;
pAttrList->AddAttribute ( OUString( "oor:name" ), sCdataAttribute, rName );
@@ -257,10 +257,10 @@ void TypeDetectionExporter::addLocaleProperty( Reference< XWriter > xHandler, co
{
try
{
- const OUString sCdataAttribute( RTL_CONSTASCII_USTRINGPARAM( "CDATA" ) );
- const OUString sProp( RTL_CONSTASCII_USTRINGPARAM( "prop" ) );
- const OUString sValue( RTL_CONSTASCII_USTRINGPARAM( "value" ) );
- const OUString sWhiteSpace ( RTL_CONSTASCII_USTRINGPARAM ( " " ) );
+ const OUString sCdataAttribute( "CDATA" );
+ const OUString sProp( "prop" );
+ const OUString sValue( "value" );
+ const OUString sWhiteSpace ( " " );
::comphelper::AttributeList * pAttrList = new ::comphelper::AttributeList;
pAttrList->AddAttribute ( OUString( "oor:name" ), sCdataAttribute, rName );
diff --git a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
index 91691d68e4bf..79f6a6a0442f 100644
--- a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
+++ b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
@@ -197,7 +197,7 @@ OUString XMLFilterDialogComponent_getImplementationName() throw ( RuntimeExcepti
Sequence< OUString > SAL_CALL XMLFilterDialogComponent_getSupportedServiceNames() throw ( RuntimeException )
{
- OUString aServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.ui.XSLTFilterDialog" ) );
+ OUString aServiceName( "com.sun.star.comp.ui.XSLTFilterDialog" );
Sequence< ::rtl::OUString > aSupported( &aServiceName, 1 );
return aSupported;
}
diff --git a/filter/source/xsltdialog/xmlfilterjar.cxx b/filter/source/xsltdialog/xmlfilterjar.cxx
index 5947131be136..f99bd73938b1 100644
--- a/filter/source/xsltdialog/xmlfilterjar.cxx
+++ b/filter/source/xsltdialog/xmlfilterjar.cxx
@@ -177,7 +177,7 @@ bool XMLFilterJarHelper::savePackage( const OUString& rPackageURL, const XMLFilt
// get root zip folder
Reference< XInterface > xRootFolder;
- OUString szRootFolder( RTL_CONSTASCII_USTRINGPARAM("/") );
+ OUString szRootFolder("/");
xIfc->getByHierarchicalName( szRootFolder ) >>= xRootFolder;
// export filters files
@@ -227,7 +227,7 @@ bool XMLFilterJarHelper::savePackage( const OUString& rPackageURL, const XMLFilt
}
Reference< XInputStream > XIS( new utl::OSeekableInputStreamWrapper( new SvFileStream(aTempFileURL, STREAM_READ ), true ) );
- OUString szTypeDetection( RTL_CONSTASCII_USTRINGPARAM( "TypeDetection.xcu" ) );
+ OUString szTypeDetection( "TypeDetection.xcu" );
_addFile( xRootFolder, xFactory, XIS, szTypeDetection );
Reference< XChangesBatch > xBatch( xIfc, UNO_QUERY );
@@ -277,10 +277,10 @@ void XMLFilterJarHelper::openPackage( const OUString& rPackageURL, XMLFilterVect
// get root zip folder
Reference< XInterface > xRootFolder;
- OUString szRootFolder( RTL_CONSTASCII_USTRINGPARAM("/") );
+ OUString szRootFolder("/");
xIfc->getByHierarchicalName( szRootFolder ) >>= xRootFolder;
- OUString szTypeDetection( RTL_CONSTASCII_USTRINGPARAM("TypeDetection.xcu") );
+ OUString szTypeDetection("TypeDetection.xcu");
if( xIfc->hasByHierarchicalName( szTypeDetection ) )
{
Reference< XActiveDataSink > xTypeDetection;
diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.cxx b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
index b90b9cfc748c..c7c78f8d4d28 100644
--- a/filter/source/xsltdialog/xmlfiltertestdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
@@ -404,7 +404,7 @@ void XMLFilterTestDialog::onExportBrowse()
Reference< XDesktop2 > xLoader = Desktop::create( comphelper::getComponentContext(mxMSF) );
Reference< XInteractionHandler2 > xInter( InteractionHandler::createWithParent(comphelper::getComponentContext(mxMSF), 0) );
- OUString aFrame( RTL_CONSTASCII_USTRINGPARAM( "_default" ) );
+ OUString aFrame( "_default" );
Sequence< PropertyValue > aArguments(1);
aArguments[0].Name = OUString( "InteractionHandler" );
aArguments[0].Value <<= xInter;
@@ -590,7 +590,7 @@ void XMLFilterTestDialog::import( const OUString& rURL )
Reference< XDesktop2 > xLoader = Desktop::create( comphelper::getComponentContext(mxMSF) );
Reference< XInteractionHandler2 > xInter( InteractionHandler::createWithParent(comphelper::getComponentContext(mxMSF), 0) );
- OUString aFrame( RTL_CONSTASCII_USTRINGPARAM( "_default" ) );
+ OUString aFrame( "_default" );
Sequence< PropertyValue > aArguments(2);
aArguments[0].Name = OUString( "FilterName" );
aArguments[0].Value <<= m_pFilterInfo->maFilterName;
diff --git a/filter/source/xsltfilter/OleHandler.cxx b/filter/source/xsltfilter/OleHandler.cxx
index eb4336479545..f109011a38b1 100644
--- a/filter/source/xsltfilter/OleHandler.cxx
+++ b/filter/source/xsltfilter/OleHandler.cxx
@@ -85,7 +85,7 @@ namespace XSLT
m_rootStream = createTempFile();
Sequence<Any> args(1);
args[0] <<= m_rootStream->getInputStream();
- OUString serviceName(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.embed.OLESimpleStorage"));
+ OUString serviceName("com.sun.star.embed.OLESimpleStorage");
Reference<XNameContainer> cont(m_msf->createInstanceWithArguments(serviceName, args), UNO_QUERY);
m_storage = cont;