From e2e2cc61144cb22227eebfadff0ea24b51ccfbd0 Mon Sep 17 00:00:00 2001 From: Luboš Luňák Date: Mon, 6 May 2013 16:32:22 +0200 Subject: remove usage of RTL_CONSTASCII_USTRINGPARAM Mechanical removal of usage together with OUString ctor, done by compiler plugin. Change-Id: I554227f76df0dac620b1b46fca32516f78b462c5 --- svx/source/customshapes/EnhancedCustomShape2d.cxx | 4 ++-- svx/source/form/datanavi.cxx | 12 ++++++------ svx/source/form/fmpgeimp.cxx | 4 ++-- svx/source/items/viewlayoutitem.cxx | 4 ++-- svx/source/items/zoomslideritem.cxx | 8 ++++---- svx/source/stbctrls/pszctrl.cxx | 6 +++--- svx/source/table/tablelayouter.cxx | 2 +- svx/source/table/tablertfexporter.cxx | 2 +- svx/source/tbxctrls/extrusioncontrols.cxx | 14 +++++++------- svx/source/tbxctrls/fontworkgallery.cxx | 6 +++--- svx/source/tbxctrls/tbxalign.cxx | 4 ++-- svx/source/tbxctrls/tbxdrctl.cxx | 2 +- .../textconversiondlgs/chinese_dictionarydialog.cxx | 4 ++-- svx/source/unodraw/XPropertyTable.cxx | 2 +- svx/source/unodraw/unoprov.cxx | 2 +- svx/source/unodraw/unoshap2.cxx | 4 ++-- svx/source/xml/xmleohlp.cxx | 10 +++++----- svx/source/xoutdev/xattrbmp.cxx | 4 ++-- 18 files changed, 47 insertions(+), 47 deletions(-) (limited to 'svx') diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx index c37e17b013d7..f74e938c84e6 100644 --- a/svx/source/customshapes/EnhancedCustomShape2d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx @@ -1606,7 +1606,7 @@ void EnhancedCustomShape2d::CreateSubPath( sal_uInt16& rSrcPt, sal_uInt16& rSegm if(seqCoordinates1 == seqCoordinates2) bIsDefaultPath = true; - const rtl::OUString sType( RTL_CONSTASCII_USTRINGPARAM ( "Type" ) ); + const rtl::OUString sType( "Type" ); rtl::OUString sShpType; SdrCustomShapeGeometryItem& rGeometryItem = (SdrCustomShapeGeometryItem&)(const SdrCustomShapeGeometryItem&)pCustomShapeObj->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ); Any* pAny = rGeometryItem.GetPropertyValueByName( sType ); @@ -1630,7 +1630,7 @@ void EnhancedCustomShape2d::CreateSubPath( sal_uInt16& rSrcPt, sal_uInt16& rSegm fWidth = nCoordWidth/2; fHeight = nCoordHeight/2; - const rtl::OUString sViewBox( RTL_CONSTASCII_USTRINGPARAM ( "ViewBox" ) ); + const rtl::OUString sViewBox( "ViewBox" ); const Any* pViewBox = ((SdrCustomShapeGeometryItem&)rGeometryItem).GetPropertyValueByName( sViewBox ); com::sun::star::awt::Rectangle aViewBox; if ( pViewBox && (*pViewBox >>= aViewBox ) ) diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index 71986a62782f..e41f41031822 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -824,9 +824,9 @@ namespace svxform lcl_ReplaceString() : lcl_ResourceString(), - m_sDoc_API( RTL_CONSTASCII_USTRINGPARAM("all") ), - m_sInstance_API( RTL_CONSTASCII_USTRINGPARAM("instance") ), - m_sNone_API( RTL_CONSTASCII_USTRINGPARAM("none") ) + m_sDoc_API( "all" ), + m_sInstance_API( "instance" ), + m_sNone_API( "none" ) { init(); } @@ -897,9 +897,9 @@ namespace svxform lcl_MethodString() : lcl_ResourceString(), - m_sPost_API( RTL_CONSTASCII_USTRINGPARAM("post") ), - m_sPut_API( RTL_CONSTASCII_USTRINGPARAM("put") ), - m_sGet_API( RTL_CONSTASCII_USTRINGPARAM("get") ) + m_sPost_API( "post" ), + m_sPut_API( "put" ), + m_sGet_API( "get" ) { init(); } diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx index 88e42ef86866..eebc4aba5749 100644 --- a/svx/source/form/fmpgeimp.cxx +++ b/svx/source/form/fmpgeimp.cxx @@ -115,7 +115,7 @@ namespace size_t lhsCount = m_aComponentInfo.childCount( _components.first ); size_t rhsCount = m_aComponentInfo.childCount( _components.second ); if ( lhsCount != rhsCount ) - throw RuntimeException( OUString( RTL_CONSTASCII_USTRINGPARAM( "Found inconsistent form component hierarchies (1)!" ) ), NULL ); + throw RuntimeException( OUString( "Found inconsistent form component hierarchies (1)!" ), NULL ); return lhsCount; } @@ -145,7 +145,7 @@ namespace Reference< XControlModel > lhsControlModel( _component.first, UNO_QUERY ); Reference< XControlModel > rhsControlModel( _component.second, UNO_QUERY ); if ( lhsControlModel.is() != rhsControlModel.is() ) - throw RuntimeException( OUString( RTL_CONSTASCII_USTRINGPARAM( "Found inconsistent form component hierarchies (2)!" ) ), NULL ); + throw RuntimeException( OUString( "Found inconsistent form component hierarchies (2)!" ), NULL ); if ( lhsControlModel.is() ) m_rControlModelMap[ lhsControlModel ] = rhsControlModel; diff --git a/svx/source/items/viewlayoutitem.cxx b/svx/source/items/viewlayoutitem.cxx index 94d88e8562fd..c45635eb137c 100644 --- a/svx/source/items/viewlayoutitem.cxx +++ b/svx/source/items/viewlayoutitem.cxx @@ -99,9 +99,9 @@ bool SvxViewLayoutItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nM case 0 : { ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aSeq( VIEWLAYOUT_PARAMS ); - aSeq[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( VIEWLAYOUT_PARAM_COLUMNS )); + aSeq[0].Name = OUString( VIEWLAYOUT_PARAM_COLUMNS ); aSeq[0].Value <<= sal_Int32( GetValue() ); - aSeq[1].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( VIEWLAYOUT_PARAM_BOOKMODE )); + aSeq[1].Name = OUString( VIEWLAYOUT_PARAM_BOOKMODE ); aSeq[1].Value <<= sal_Bool( mbBookMode ); rVal <<= aSeq; } diff --git a/svx/source/items/zoomslideritem.cxx b/svx/source/items/zoomslideritem.cxx index ef19d6dc52a3..eb04b54c04e0 100644 --- a/svx/source/items/zoomslideritem.cxx +++ b/svx/source/items/zoomslideritem.cxx @@ -96,13 +96,13 @@ bool SvxZoomSliderItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nM case 0 : { ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aSeq( ZOOMSLIDER_PARAMS ); - aSeq[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( ZOOMSLIDER_PARAM_CURRENTZOOM )); + aSeq[0].Name = OUString( ZOOMSLIDER_PARAM_CURRENTZOOM ); aSeq[0].Value <<= sal_Int32( GetValue() ); - aSeq[1].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( ZOOMSLIDER_PARAM_SNAPPINGPOINTS )); + aSeq[1].Name = OUString( ZOOMSLIDER_PARAM_SNAPPINGPOINTS ); aSeq[1].Value <<= maValues; - aSeq[2].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( ZOOMSLIDER_PARAM_MINZOOM ) ); + aSeq[2].Name = OUString( ZOOMSLIDER_PARAM_MINZOOM ); aSeq[2].Value <<= mnMinZoom; - aSeq[3].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( ZOOMSLIDER_PARAM_MAXZOOM ) ); + aSeq[3].Name = OUString( ZOOMSLIDER_PARAM_MAXZOOM ); aSeq[3].Value <<= mnMaxZoom; rVal <<= aSeq; } diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx index cfd39393c855..21d42773f19c 100644 --- a/svx/source/stbctrls/pszctrl.cxx +++ b/svx/source/stbctrls/pszctrl.cxx @@ -178,9 +178,9 @@ SvxPosSizeStatusBarControl::SvxPosSizeStatusBarControl( sal_uInt16 _nSlotId, pImp->aPosImage = Image( ResId( RID_SVXBMP_POSITION, DIALOG_MGR() ) ); pImp->aSizeImage = Image( ResId( RID_SVXBMP_SIZE, DIALOG_MGR() ) ); - addStatusListener( OUString( RTL_CONSTASCII_USTRINGPARAM( STR_POSITION ))); // SID_ATTR_POSITION - addStatusListener( OUString( RTL_CONSTASCII_USTRINGPARAM( STR_TABLECELL ))); // SID_TABLE_CELL - addStatusListener( OUString( RTL_CONSTASCII_USTRINGPARAM( STR_FUNC ))); // SID_PSZ_FUNCTION + addStatusListener( OUString( STR_POSITION )); // SID_ATTR_POSITION + addStatusListener( OUString( STR_TABLECELL )); // SID_TABLE_CELL + addStatusListener( OUString( STR_FUNC )); // SID_PSZ_FUNCTION } // ----------------------------------------------------------------------- diff --git a/svx/source/table/tablelayouter.cxx b/svx/source/table/tablelayouter.cxx index a4dfefb60bf8..779ee150e477 100644 --- a/svx/source/table/tablelayouter.cxx +++ b/svx/source/table/tablelayouter.cxx @@ -60,7 +60,7 @@ static SvxBorderLine gEmptyBorder; TableLayouter::TableLayouter( const TableModelRef& xTableModel ) : mxTable( xTableModel ) , meWritingMode( WritingMode_LR_TB ) -, msSize( RTL_CONSTASCII_USTRINGPARAM( "Size" ) ) +, msSize( "Size" ) { } diff --git a/svx/source/table/tablertfexporter.cxx b/svx/source/table/tablertfexporter.cxx index c3f0afcedcf5..117715d71979 100644 --- a/svx/source/table/tablertfexporter.cxx +++ b/svx/source/table/tablertfexporter.cxx @@ -73,7 +73,7 @@ SdrTableRtfExporter::SdrTableRtfExporter( SvStream& rStrm, SdrTableObj& rObj ) : mrStrm( rStrm ) , mrObj( rObj ) , mxTable( rObj.getTable() ) -, msSize( RTL_CONSTASCII_USTRINGPARAM("Size") ) +, msSize( "Size" ) { } diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx index 3ede27ad2ff5..b4ce7cde262e 100644 --- a/svx/source/tbxctrls/extrusioncontrols.cxx +++ b/svx/source/tbxctrls/extrusioncontrols.cxx @@ -80,8 +80,8 @@ ExtrusionDirectionWindow::ExtrusionDirectionWindow( mrController( rController ) , maImgPerspective( SVX_RES( IMG_PERSPECTIVE ) ) , maImgParallel( SVX_RES( IMG_PARALLEL ) ) , - msExtrusionDirection( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionDirection" ) ) , - msExtrusionProjection( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionProjection" ) ) + msExtrusionDirection( ".uno:ExtrusionDirection" ) , + msExtrusionProjection( ".uno:ExtrusionProjection" ) { SetHelpId( HID_MENU_EXTRUSION_DIRECTION ); @@ -343,8 +343,8 @@ ExtrusionDepthWindow::ExtrusionDepthWindow( , maImgDepth4( SVX_RES( IMG_DEPTH_4 ) ) , maImgDepthInfinity( SVX_RES( IMG_DEPTH_INFINITY ) ) , mfDepth( -1.0 ) - , msExtrusionDepth( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionDepth" ) ) - , msMetricUnit( RTL_CONSTASCII_USTRINGPARAM( ".uno:MetricUnit" ) ) + , msExtrusionDepth( ".uno:ExtrusionDepth" ) + , msMetricUnit( ".uno:MetricUnit" ) { SetHelpId( HID_MENU_EXTRUSION_DEPTH ); @@ -578,8 +578,8 @@ ExtrusionLightingWindow::ExtrusionLightingWindow( svt::ToolboxController& rContr , mbLevelEnabled( false ) , mnDirection( FROM_FRONT ) , mbDirectionEnabled( false ) -, msExtrusionLightingDirection( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionLightingDirection" )) -, msExtrusionLightingIntensity( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionLightingIntensity" )) +, msExtrusionLightingDirection( ".uno:ExtrusionLightingDirection" ) +, msExtrusionLightingIntensity( ".uno:ExtrusionLightingIntensity" ) { sal_uInt16 i; for( i = FROM_TOP_LEFT; i <= FROM_BOTTOM_RIGHT; i++ ) @@ -838,7 +838,7 @@ ExtrusionSurfaceWindow::ExtrusionSurfaceWindow( , maImgSurface2( SVX_RES( IMG_MATTE ) ) , maImgSurface3( SVX_RES( IMG_PLASTIC ) ) , maImgSurface4( SVX_RES( IMG_METAL ) ) - , msExtrusionSurface( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionSurface" ) ) + , msExtrusionSurface( ".uno:ExtrusionSurface" ) { SetHelpId( HID_MENU_EXTRUSION_SURFACE ); SetSelectHdl( LINK( this, ExtrusionSurfaceWindow, SelectHdl ) ); diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx index bf04524fda8e..03d91e727f4c 100644 --- a/svx/source/tbxctrls/fontworkgallery.cxx +++ b/svx/source/tbxctrls/fontworkgallery.cxx @@ -310,7 +310,7 @@ FontWorkAlignmentWindow::FontWorkAlignmentWindow( svt::ToolboxController& rContr , maImgAlgin3( SVX_RES( IMG_FONTWORK_ALIGN_RIGHT_16 ) ) , maImgAlgin4( SVX_RES( IMG_FONTWORK_ALIGN_WORD_16 ) ) , maImgAlgin5( SVX_RES( IMG_FONTWORK_ALIGN_STRETCH_16 ) ) -, msFontworkAlignment( RTL_CONSTASCII_USTRINGPARAM( ".uno:FontworkAlignment" ) ) +, msFontworkAlignment( ".uno:FontworkAlignment" ) { SetHelpId( HID_POPUP_FONTWORK_ALIGN ); SetSelectHdl( LINK( this, FontWorkAlignmentWindow, SelectHdl ) ); @@ -496,8 +496,8 @@ private: FontWorkCharacterSpacingWindow::FontWorkCharacterSpacingWindow( svt::ToolboxController& rController, const Reference< XFrame >& rFrame, Window* pParentWindow ) : ToolbarMenu( rFrame, pParentWindow, SVX_RES( RID_SVXFLOAT_FONTWORK_CHARSPACING )) , mrController( rController ) -, msFontworkCharacterSpacing( RTL_CONSTASCII_USTRINGPARAM( ".uno:FontworkCharacterSpacing" ) ) -, msFontworkKernCharacterPairs( RTL_CONSTASCII_USTRINGPARAM( ".uno:FontworkKernCharacterPairs" ) ) +, msFontworkCharacterSpacing( ".uno:FontworkCharacterSpacing" ) +, msFontworkKernCharacterPairs( ".uno:FontworkKernCharacterPairs" ) { SetHelpId( HID_POPUP_FONTWORK_CHARSPACE ); SetSelectHdl( LINK( this, FontWorkCharacterSpacingWindow, SelectHdl ) ); diff --git a/svx/source/tbxctrls/tbxalign.cxx b/svx/source/tbxctrls/tbxalign.cxx index 7e06ceeec637..b566c1f8ef64 100644 --- a/svx/source/tbxctrls/tbxalign.cxx +++ b/svx/source/tbxctrls/tbxalign.cxx @@ -42,8 +42,8 @@ SFX_IMPL_TOOLBOX_CONTROL(SvxTbxCtlAlign, SfxAllEnumItem); SvxTbxCtlAlign::SvxTbxCtlAlign( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SfxToolBoxControl( nSlotId, nId, rTbx ) - , m_aSubTbName( RTL_CONSTASCII_USTRINGPARAM( "alignmentbar" )) - , m_aSubTbResName( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/alignmentbar" )) + , m_aSubTbName( "alignmentbar" ) + , m_aSubTbResName( "private:resource/toolbar/alignmentbar" ) { rTbx.SetItemBits( nId, TIB_DROPDOWN | rTbx.GetItemBits( nId ) ); rTbx.Invalidate(); diff --git a/svx/source/tbxctrls/tbxdrctl.cxx b/svx/source/tbxctrls/tbxdrctl.cxx index 95269bed34da..2453f4593d72 100644 --- a/svx/source/tbxctrls/tbxdrctl.cxx +++ b/svx/source/tbxctrls/tbxdrctl.cxx @@ -47,7 +47,7 @@ SvxTbxCtlDraw::SvxTbxCtlDraw( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx SfxToolBoxControl( nSlotId, nId, rTbx ), - m_sToolboxName( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/drawbar" ) ) + m_sToolboxName( "private:resource/toolbar/drawbar" ) { rTbx.SetItemBits( nId, TIB_CHECKABLE | rTbx.GetItemBits( nId ) ); diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx index 656c06a3b2ba..5ea698be0261 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx @@ -482,7 +482,7 @@ ChineseDictionaryDialog::ChineseDictionaryDialog( Window* pParent ) SvtLinguConfig aLngCfg; sal_Bool bValue = sal_Bool(); - Any aAny( aLngCfg.GetProperty( OUString(RTL_CONSTASCII_USTRINGPARAM( UPN_IS_REVERSE_MAPPING )) ) ); + Any aAny( aLngCfg.GetProperty( OUString( UPN_IS_REVERSE_MAPPING ) ) ); if( aAny >>= bValue ) m_aCB_Reverse.Check( bValue ); @@ -831,7 +831,7 @@ short ChineseDictionaryDialog::Execute() SvtLinguConfig aLngCfg; Any aAny; aAny <<= sal_Bool( !!m_aCB_Reverse.IsChecked() ); - aLngCfg.SetProperty( OUString(RTL_CONSTASCII_USTRINGPARAM( UPN_IS_REVERSE_MAPPING )), aAny ); + aLngCfg.SetProperty( OUString( UPN_IS_REVERSE_MAPPING ), aAny ); m_aCT_DictionaryToSimplified.save(); m_aCT_DictionaryToTraditional.save(); diff --git a/svx/source/unodraw/XPropertyTable.cxx b/svx/source/unodraw/XPropertyTable.cxx index 1eb1d74c50ac..c9b9603fae67 100644 --- a/svx/source/unodraw/XPropertyTable.cxx +++ b/svx/source/unodraw/XPropertyTable.cxx @@ -668,7 +668,7 @@ uno::Reference< uno::XInterface > SAL_CALL SvxUnoXBitmapTable_createInstance( XP // SvxUnoXPropertyTable uno::Any SvxUnoXBitmapTable::getAny( const XPropertyEntry* pEntry ) const throw() { - OUString aURL( RTL_CONSTASCII_USTRINGPARAM(UNO_NAME_GRAPHOBJ_URLPREFIX)); + OUString aURL( UNO_NAME_GRAPHOBJ_URLPREFIX); const GraphicObject& rGraphicObject(((XBitmapEntry*)pEntry)->GetGraphicObject()); aURL += OStringToOUString(rGraphicObject.GetUniqueID(), RTL_TEXTENCODING_ASCII_US); diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx index 71d40cb3f733..b2fd24f7e75b 100644 --- a/svx/source/unodraw/unoprov.cxx +++ b/svx/source/unodraw/unoprov.cxx @@ -1414,7 +1414,7 @@ comphelper::PropertySetInfo* SvxPropertySetInfoPool::getOrCreate( sal_Int32 nSer break; case SVXUNO_SERVICEID_COM_SUN_STAR_DRAWING_DEFAULTS_WRITER: mpInfos[SVXUNO_SERVICEID_COM_SUN_STAR_DRAWING_DEFAULTS_WRITER]->add( ImplGetSvxDrawingDefaultsPropertyMap() ); - mpInfos[SVXUNO_SERVICEID_COM_SUN_STAR_DRAWING_DEFAULTS_WRITER]->remove( OUString( RTL_CONSTASCII_USTRINGPARAM( UNO_NAME_EDIT_PARA_IS_HANGING_PUNCTUATION ) ) ); + mpInfos[SVXUNO_SERVICEID_COM_SUN_STAR_DRAWING_DEFAULTS_WRITER]->remove( OUString( UNO_NAME_EDIT_PARA_IS_HANGING_PUNCTUATION ) ); // OD 13.10.2003 #i18732# - add property map for writer item 'IsFollowingTextFlow' mpInfos[SVXUNO_SERVICEID_COM_SUN_STAR_DRAWING_DEFAULTS_WRITER]->add( ImplGetAdditionalWriterDrawingDefaultsPropertyMap() ); break; diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx index d47a69d5347d..e96f7e12b560 100644 --- a/svx/source/unodraw/unoshap2.cxx +++ b/svx/source/unodraw/unoshap2.cxx @@ -1647,7 +1647,7 @@ bool SvxGraphicObject::getPropertyValueImpl( const OUString& rName, const SfxIte { sal_Bool bSwapped = static_cast< SdrGrafObj* >( mpObj.get() )->IsSwappedOut(); const GraphicObject& rGrafObj = static_cast< SdrGrafObj*>( mpObj.get() )->GetGraphicObject(true); - OUString aURL( RTL_CONSTASCII_USTRINGPARAM(UNO_NAME_GRAPHOBJ_URLPREFIX)); + OUString aURL( UNO_NAME_GRAPHOBJ_URLPREFIX); aURL += OStringToOUString(rGrafObj.GetUniqueID(), RTL_TEXTENCODING_ASCII_US); rValue <<= aURL; if ( bSwapped ) @@ -1662,7 +1662,7 @@ bool SvxGraphicObject::getPropertyValueImpl( const OUString& rName, const SfxIte if(pGrafObj) { - OUString aURL(RTL_CONSTASCII_USTRINGPARAM(UNO_NAME_GRAPHOBJ_URLPREFIX)); + OUString aURL(UNO_NAME_GRAPHOBJ_URLPREFIX); aURL += OStringToOUString(pGrafObj->GetUniqueID(), RTL_TEXTENCODING_ASCII_US); rValue <<= aURL; } diff --git a/svx/source/xml/xmleohlp.cxx b/svx/source/xml/xmleohlp.cxx index 02839abbe05e..71447f942c61 100644 --- a/svx/source/xml/xmleohlp.cxx +++ b/svx/source/xml/xmleohlp.cxx @@ -135,8 +135,8 @@ struct OUStringLess DBG_NAME(SvXMLEmbeddedObjectHelper) SvXMLEmbeddedObjectHelper::SvXMLEmbeddedObjectHelper() : WeakComponentImplHelper2< XEmbeddedObjectResolver, XNameAccess >( maMutex ), - maReplacementGraphicsContainerStorageName( RTL_CONSTASCII_USTRINGPARAM(XML_CONTAINERSTORAGE_NAME) ), - maReplacementGraphicsContainerStorageName60( RTL_CONSTASCII_USTRINGPARAM(XML_CONTAINERSTORAGE_NAME_60) ), + maReplacementGraphicsContainerStorageName( XML_CONTAINERSTORAGE_NAME ), + maReplacementGraphicsContainerStorageName60( XML_CONTAINERSTORAGE_NAME_60 ), mpDocPersist( 0 ), meCreateMode( EMBEDDEDOBJECTHELPER_MODE_READ ), mpStreamMap( 0 ) @@ -146,8 +146,8 @@ SvXMLEmbeddedObjectHelper::SvXMLEmbeddedObjectHelper() : SvXMLEmbeddedObjectHelper::SvXMLEmbeddedObjectHelper( ::comphelper::IEmbeddedHelper& rDocPersist, SvXMLEmbeddedObjectHelperMode eCreateMode ) : WeakComponentImplHelper2< XEmbeddedObjectResolver, XNameAccess >( maMutex ), - maReplacementGraphicsContainerStorageName( RTL_CONSTASCII_USTRINGPARAM(XML_CONTAINERSTORAGE_NAME) ), - maReplacementGraphicsContainerStorageName60( RTL_CONSTASCII_USTRINGPARAM(XML_CONTAINERSTORAGE_NAME_60) ), + maReplacementGraphicsContainerStorageName( XML_CONTAINERSTORAGE_NAME ), + maReplacementGraphicsContainerStorageName60( XML_CONTAINERSTORAGE_NAME_60 ), mpDocPersist( 0 ), meCreateMode( EMBEDDEDOBJECTHELPER_MODE_READ ), mpStreamMap( 0 ) @@ -482,7 +482,7 @@ OUString SvXMLEmbeddedObjectHelper::ImplInsertEmbeddedObjectURL( } ImplReadObject( aContainerStorageName, aObjectStorageName, pClassId, pOut ? pOut->GetStream() : 0 ); - sRetURL = OUString( RTL_CONSTASCII_USTRINGPARAM(XML_EMBEDDEDOBJECT_URL_BASE) ); + sRetURL = OUString( XML_EMBEDDEDOBJECT_URL_BASE ); sRetURL += aObjectStorageName; if( pOut ) diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx index b29dda0dce75..8a6be6b8737a 100644 --- a/svx/source/xoutdev/xattrbmp.cxx +++ b/svx/source/xoutdev/xattrbmp.cxx @@ -519,8 +519,8 @@ bool XFillBitmapItem::QueryValue(::com::sun::star::uno::Any& rVal, sal_uInt8 nMe if( nMemberId == MID_GRAFURL || nMemberId == 0 ) { - aURL = OUString(RTL_CONSTASCII_USTRINGPARAM( - UNO_NAME_GRAPHOBJ_URLPREFIX)); + aURL = OUString( + UNO_NAME_GRAPHOBJ_URLPREFIX); aURL += OStringToOUString( GetGraphicObject().GetUniqueID(), RTL_TEXTENCODING_ASCII_US); -- cgit v1.2.3