diff options
author | Noel Grandin <noel@peralex.com> | 2013-11-14 13:13:19 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-11-19 10:29:30 +0200 |
commit | 2c35fff7eca3a143d28dc75e6a73fe1101d2af77 (patch) | |
tree | fb31b64880b06b0e2bd867aa6216ae0259c7c091 /svx/source | |
parent | ccc297097891e62489e5d281a4ea128ec6b71361 (diff) |
remove most use of RTL_CONSTASCII_USTRINGPARAM macro
This is largely unnecessary when working with OUString
Change-Id: I3cf4d68357a43665d01162ef4a2d5346a45da9be
Diffstat (limited to 'svx/source')
18 files changed, 47 insertions, 47 deletions
diff --git a/svx/source/items/galleryitem.cxx b/svx/source/items/galleryitem.cxx index eac9fc5fe399..1a88cf5de476 100644 --- a/svx/source/items/galleryitem.cxx +++ b/svx/source/items/galleryitem.cxx @@ -51,15 +51,15 @@ bool SvxGalleryItem::QueryValue( css::uno::Any& rVal, sal_uInt8 /* nMemberId */ { css::uno::Sequence< css::beans::PropertyValue > aSeq( SVXGALLERYITEM_PARAMS ); - aSeq[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SVXGALLERYITEM_TYPE )); + aSeq[0].Name = SVXGALLERYITEM_TYPE; aSeq[0].Value <<= m_nType; - aSeq[1].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SVXGALLERYITEM_URL )); + aSeq[1].Name = SVXGALLERYITEM_URL; aSeq[1].Value <<= m_aURL; - aSeq[2].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SVXGALLERYITEM_FILTER )); + aSeq[2].Name = SVXGALLERYITEM_FILTER; aSeq[2].Value <<= m_aURL; - aSeq[3].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SVXGALLERYITEM_DRAWING )); + aSeq[3].Name = SVXGALLERYITEM_DRAWING; aSeq[3].Value <<= m_xDrawing; - aSeq[4].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SVXGALLERYITEM_GRAPHIC )); + aSeq[4].Name = SVXGALLERYITEM_GRAPHIC; aSeq[4].Value <<= m_xGraphic; rVal <<= aSeq; diff --git a/svx/source/sidebar/area/AreaPropertyPanel.cxx b/svx/source/sidebar/area/AreaPropertyPanel.cxx index 75395df17c79..d82e66417ca4 100644 --- a/svx/source/sidebar/area/AreaPropertyPanel.cxx +++ b/svx/source/sidebar/area/AreaPropertyPanel.cxx @@ -154,8 +154,8 @@ void AreaPropertyPanel::Initialize() maGradientRect = maGradientLinear; maGradientRect.SetGradientStyle(XGRAD_RECT); - mpLbFillType->SetAccessibleName(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Fill"))); //wj acc - mpLbFillAttr->SetAccessibleName(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Fill"))); //wj acc + mpLbFillType->SetAccessibleName(OUString( "Fill")); //wj acc + mpLbFillAttr->SetAccessibleName(OUString( "Fill")); //wj acc Link aLink = LINK( this, AreaPropertyPanel, SelectFillTypeHdl ); mpLbFillType->SetSelectHdl( aLink ); @@ -176,11 +176,11 @@ void AreaPropertyPanel::Initialize() //add end mpLBTransType->SetSelectHdl(LINK(this, AreaPropertyPanel, ChangeTrgrTypeHdl_Impl)); - mpLBTransType->SetAccessibleName(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Transparency"))); //wj acc + mpLBTransType->SetAccessibleName(OUString( "Transparency")); //wj acc mpMTRTransparent->SetValue( 50 ); mpMTRTransparent->SetModifyHdl(LINK(this, AreaPropertyPanel, ModifyTransparentHdl_Impl)); - mpMTRTransparent->SetAccessibleName(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Transparency"))); //wj acc + mpMTRTransparent->SetAccessibleName(OUString( "Transparency")); //wj acc const sal_uInt16 nIdGradient = mpBTNGradient->GetItemId(UNO_SIDEBARGRADIENT); mpBTNGradient->SetItemBits( nIdGradient, mpBTNGradient->GetItemBits( nIdGradient ) | TIB_DROPDOWNONLY ); diff --git a/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx b/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx index 4ae8c7edcaae..5037c710167e 100644 --- a/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx +++ b/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx @@ -27,7 +27,7 @@ AreaTransparencyGradientPopup::AreaTransparencyGradientPopup ( : Popup( pParent, rControlCreator, - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Transparency and Gradient"))) + OUString( "Transparency and Gradient")) { } diff --git a/svx/source/sidebar/debug/NotYetImplementedPanel.cxx b/svx/source/sidebar/debug/NotYetImplementedPanel.cxx index 2bb5ae9c1df0..9f060787db2d 100644 --- a/svx/source/sidebar/debug/NotYetImplementedPanel.cxx +++ b/svx/source/sidebar/debug/NotYetImplementedPanel.cxx @@ -25,7 +25,7 @@ NotYetImplementedPanel::NotYetImplementedPanel (::Window* pParent) maMessageControl(this, 0) { maMessageControl.setPosSizePixel(5,5, 250,15); - maMessageControl.SetText(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("not yet implemented"))); + maMessageControl.SetText(OUString("not yet implemented")); maMessageControl.Show(); Show(); diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx index aa4149416ccb..9a7c275a3b76 100644 --- a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx +++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx @@ -77,18 +77,18 @@ GraphicPropertyPanel::~GraphicPropertyPanel() void GraphicPropertyPanel::Initialize() { mpMtrBrightness->SetModifyHdl( LINK( this, GraphicPropertyPanel, ModifyBrightnessHdl ) ); - mpMtrBrightness->SetAccessibleName(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Brightness"))); + mpMtrBrightness->SetAccessibleName(::rtl::OUString( "Brightness")); mpMtrContrast->SetModifyHdl( LINK( this, GraphicPropertyPanel, ModifyContrastHdl ) ); - mpMtrContrast->SetAccessibleName(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Contrast"))); + mpMtrContrast->SetAccessibleName(::rtl::OUString( "Contrast")); mpMtrTrans->SetModifyHdl( LINK( this, GraphicPropertyPanel, ModifyTransHdl ) ); - mpMtrTrans->SetAccessibleName(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Transparency"))); + mpMtrTrans->SetAccessibleName(::rtl::OUString( "Transparency")); mpLBColorMode->InsertEntry(SVX_RESSTR(RID_SVXSTR_GRAFMODE_STANDARD)); mpLBColorMode->InsertEntry(SVX_RESSTR(RID_SVXSTR_GRAFMODE_GREYS)); mpLBColorMode->InsertEntry(SVX_RESSTR(RID_SVXSTR_GRAFMODE_MONO)); mpLBColorMode->InsertEntry(SVX_RESSTR(RID_SVXSTR_GRAFMODE_WATERMARK)); mpLBColorMode->SetSelectHdl( LINK( this, GraphicPropertyPanel, ClickColorModeHdl )); - mpLBColorMode->SetAccessibleName(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Color mode"))); + mpLBColorMode->SetAccessibleName(::rtl::OUString( "Color mode")); mpMtrRed->SetModifyHdl( LINK( this, GraphicPropertyPanel, RedHdl ) ); mpMtrGreen->SetModifyHdl( LINK( this, GraphicPropertyPanel, GreenHdl ) ); @@ -97,7 +97,7 @@ void GraphicPropertyPanel::Initialize() mpMtrRed->SetAccessibleName(mpMtrRed->GetQuickHelpText()); mpMtrGreen->SetAccessibleName(mpMtrGreen->GetQuickHelpText()); mpMtrBlue->SetAccessibleName(mpMtrBlue->GetQuickHelpText()); - mpMtrGamma->SetAccessibleName(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Gamma value"))); + mpMtrGamma->SetAccessibleName(::rtl::OUString( "Gamma value")); mpMtrRed->SetAccessibleRelationLabeledBy(mpMtrRed); mpMtrGreen->SetAccessibleRelationLabeledBy(mpMtrGreen); diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx b/svx/source/sidebar/line/LinePropertyPanel.cxx index 00920f2ff2db..e3b3b5e88079 100644 --- a/svx/source/sidebar/line/LinePropertyPanel.cxx +++ b/svx/source/sidebar/line/LinePropertyPanel.cxx @@ -239,7 +239,7 @@ void LinePropertyPanel::Initialize() SelectLineStyle(); aLink = LINK( this, LinePropertyPanel, ChangeLineStyleHdl ); mpLBStyle->SetSelectHdl( aLink ); - mpLBStyle->SetAccessibleName(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Style"))); + mpLBStyle->SetAccessibleName(OUString( "Style")); mpLBStyle->AdaptDropDownLineCountToMaximum(); const sal_uInt16 nIdWidth = mpTBWidth->GetItemId(UNO_SELECTWIDTH); @@ -254,16 +254,16 @@ void LinePropertyPanel::Initialize() SelectEndStyle(false); aLink = LINK( this, LinePropertyPanel, ChangeStartHdl ); mpLBStart->SetSelectHdl( aLink ); - mpLBStart->SetAccessibleName(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Beginning Style"))); //wj acc + mpLBStart->SetAccessibleName(OUString( "Beginning Style")); //wj acc mpLBStart->AdaptDropDownLineCountToMaximum(); aLink = LINK( this, LinePropertyPanel, ChangeEndHdl ); mpLBEnd->SetSelectHdl( aLink ); - mpLBEnd->SetAccessibleName(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Ending Style"))); //wj acc + mpLBEnd->SetAccessibleName(OUString( "Ending Style")); //wj acc mpLBEnd->AdaptDropDownLineCountToMaximum(); aLink = LINK(this, LinePropertyPanel, ChangeTransparentHdl); mpMFTransparent->SetModifyHdl(aLink); - mpMFTransparent->SetAccessibleName(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Transparency"))); //wj acc + mpMFTransparent->SetAccessibleName(OUString( "Transparency")); //wj acc mpTBWidth->SetAccessibleRelationLabeledBy(mpFTWidth); mpTBColor->SetAccessibleRelationLabeledBy(mpFTColor); @@ -274,11 +274,11 @@ void LinePropertyPanel::Initialize() aLink = LINK( this, LinePropertyPanel, ChangeEdgeStyleHdl ); mpLBEdgeStyle->SetSelectHdl( aLink ); - mpLBEdgeStyle->SetAccessibleName(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Corner Style"))); + mpLBEdgeStyle->SetAccessibleName(OUString( "Corner Style")); aLink = LINK( this, LinePropertyPanel, ChangeCapStyleHdl ); mpLBCapStyle->SetSelectHdl( aLink ); - mpLBCapStyle->SetAccessibleName(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Cap Style"))); + mpLBCapStyle->SetAccessibleName(OUString( "Cap Style")); } diff --git a/svx/source/sidebar/line/LineWidthPopup.cxx b/svx/source/sidebar/line/LineWidthPopup.cxx index 49596941147a..63d6fddb2ab1 100644 --- a/svx/source/sidebar/line/LineWidthPopup.cxx +++ b/svx/source/sidebar/line/LineWidthPopup.cxx @@ -32,7 +32,7 @@ LineWidthPopup::LineWidthPopup ( : Popup( pParent, rControlCreator, - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Width"))) + OUString( "Width")) { SetPopupModeEndHandler(::boost::bind(&LineWidthPopup::PopupModeEndCallback, this)); } @@ -68,7 +68,7 @@ void LineWidthPopup::PopupModeEndCallback (void) { SvtViewOptions aWinOpt( E_WINDOW, SIDEBAR_LINE_WIDTH_GLOBAL_VALUE ); ::com::sun::star::uno::Sequence < ::com::sun::star::beans::NamedValue > aSeq(1); - aSeq[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("LineWidth") ); + aSeq[0].Name = "LineWidth"; aSeq[0].Value <<= ::rtl::OUString::number(pControl->GetTmpCustomWidth()); aWinOpt.SetUserData( aSeq ); } diff --git a/svx/source/sidebar/paragraph/ParaBulletsPopup.cxx b/svx/source/sidebar/paragraph/ParaBulletsPopup.cxx index cd9314827f97..5ab6146fbafa 100644 --- a/svx/source/sidebar/paragraph/ParaBulletsPopup.cxx +++ b/svx/source/sidebar/paragraph/ParaBulletsPopup.cxx @@ -28,7 +28,7 @@ ParaBulletsPopup::ParaBulletsPopup ( : Popup( pParent, rControlCreator, - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Paragraph Bullets"))) + OUString( "Paragraph Bullets")) { } diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx index b37110968de5..3ea05beea1f1 100644 --- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx +++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx @@ -166,12 +166,12 @@ void ParaLineSpacingControl::PopupModeEndCallback() SvtViewOptions aWinOpt( E_WINDOW, LSP_POS_GLOBAL_VALUE ); ::com::sun::star::uno::Sequence < ::com::sun::star::beans::NamedValue > aSeq(1); - aSeq[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("maLinePos") ); + aSeq[0].Name = "maLinePos"; aSeq[0].Value <<= ::rtl::OUString::number(maPos); aWinOpt.SetUserData( aSeq ); SvtViewOptions aWinOpt2( E_WINDOW, LSP_LV_GLOBAL_VALUE ); - aSeq[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("maLineValue") ); + aSeq[0].Name = "maLineValue"; aSeq[0].Value <<= ::rtl::OUString::number(maValue); aWinOpt2.SetUserData( aSeq ); } diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx b/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx index 20f942359bda..877bf4cfa064 100644 --- a/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx +++ b/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx @@ -28,7 +28,7 @@ ParaLineSpacingPopup::ParaLineSpacingPopup ( : Popup( pParent, rControlCreator, - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Paragraph Line Spacing"))) + OUString( "Paragraph Line Spacing")) { SetPopupModeEndHandler(::boost::bind(&ParaLineSpacingPopup::PopupModeEndCallback, this)); } @@ -65,7 +65,7 @@ void ParaLineSpacingPopup::PopupModeEndCallback (void) { SvtViewOptions aWinOpt( E_WINDOW, SIDEBAR_SPACING_GLOBAL_VALUE ); ::com::sun::star::uno::Sequence < ::com::sun::star::beans::NamedValue > aSeq(1); - aSeq[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Spacing") ); + aSeq[0].Name = "Spacing"; aSeq[0].Value <<= ::rtl::OUString( String::CreateFromInt32( pControl->GetLastCustomValue() )); aWinOpt.SetUserData( aSeq ); diff --git a/svx/source/sidebar/paragraph/ParaNumberingPopup.cxx b/svx/source/sidebar/paragraph/ParaNumberingPopup.cxx index de4bc5c5e9a5..ae25ba681e9a 100644 --- a/svx/source/sidebar/paragraph/ParaNumberingPopup.cxx +++ b/svx/source/sidebar/paragraph/ParaNumberingPopup.cxx @@ -28,7 +28,7 @@ ParaNumberingPopup::ParaNumberingPopup ( : Popup( pParent, rControlCreator, - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Paragraph Numbering"))) + OUString( "Paragraph Numbering")) { } diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx index 9b1aa3cbe7c2..acaaff4f7a7a 100644 --- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx +++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx @@ -152,14 +152,14 @@ void PosSizePropertyPanel::Initialize() //Position : Horizontal / Vertical mpMtrPosX->SetModifyHdl( LINK( this, PosSizePropertyPanel, ChangePosXHdl ) ); mpMtrPosY->SetModifyHdl( LINK( this, PosSizePropertyPanel, ChangePosYHdl ) ); - mpMtrPosX->SetAccessibleName(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Horizontal"))); //wj acc - mpMtrPosY->SetAccessibleName(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Vertical"))); //wj acc + mpMtrPosX->SetAccessibleName(OUString( "Horizontal")); //wj acc + mpMtrPosY->SetAccessibleName(OUString( "Vertical")); //wj acc //Size : Width / Height mpMtrWidth->SetModifyHdl( LINK( this, PosSizePropertyPanel, ChangeWidthHdl ) ); mpMtrHeight->SetModifyHdl( LINK( this, PosSizePropertyPanel, ChangeHeightHdl ) ); - mpMtrWidth->SetAccessibleName(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Width"))); //wj acc - mpMtrHeight->SetAccessibleName(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Height"))); //wj acc + mpMtrWidth->SetAccessibleName(OUString( "Width")); //wj acc + mpMtrHeight->SetAccessibleName(OUString( "Height")); //wj acc //Size : Keep ratio mpCbxScale->SetClickHdl( LINK( this, PosSizePropertyPanel, ClickAutoHdl ) ); @@ -167,7 +167,7 @@ void PosSizePropertyPanel::Initialize() //rotation: mpMtrAngle->SetModifyHdl(LINK( this, PosSizePropertyPanel, AngleModifiedHdl)); mpMtrAngle->EnableAutocomplete( false ); - mpMtrAngle->SetAccessibleName(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Rotation"))); //wj acc + mpMtrAngle->SetAccessibleName(OUString( "Rotation")); //wj acc //rotation control mpDial->SetModifyHdl(LINK( this, PosSizePropertyPanel, RotationHdl)); diff --git a/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx b/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx index 56d8e8882f73..29d0bf1a9e8b 100644 --- a/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx +++ b/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx @@ -28,7 +28,7 @@ TextCharacterSpacingPopup::TextCharacterSpacingPopup ( : Popup( pParent, rControlCreator, - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Character Spacing"))) + OUString( "Character Spacing")) { SetPopupModeEndHandler(::boost::bind(&TextCharacterSpacingPopup::PopupModeEndCallback, this)); } @@ -63,7 +63,7 @@ void TextCharacterSpacingPopup::PopupModeEndCallback (void) { SvtViewOptions aWinOpt( E_WINDOW, SIDEBAR_SPACING_GLOBAL_VALUE ); ::com::sun::star::uno::Sequence < ::com::sun::star::beans::NamedValue > aSeq(1); - aSeq[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Spacing") ); + aSeq[0].Name = "Spacing"; aSeq[0].Value <<= ::rtl::OUString::number(pControl->GetLastCustomValue()); aWinOpt.SetUserData( aSeq ); diff --git a/svx/source/sidebar/text/TextUnderlinePopup.cxx b/svx/source/sidebar/text/TextUnderlinePopup.cxx index 76fc10a1d29a..0b4e4e6da6fc 100644 --- a/svx/source/sidebar/text/TextUnderlinePopup.cxx +++ b/svx/source/sidebar/text/TextUnderlinePopup.cxx @@ -27,7 +27,7 @@ TextUnderlinePopup::TextUnderlinePopup ( : Popup( pParent, rControlCreator, - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Character Spacing"))) + OUString( "Character Spacing")) { } diff --git a/svx/source/sidebar/tools/ColorPopup.cxx b/svx/source/sidebar/tools/ColorPopup.cxx index ed51592e6b9b..175d2778405c 100644 --- a/svx/source/sidebar/tools/ColorPopup.cxx +++ b/svx/source/sidebar/tools/ColorPopup.cxx @@ -27,7 +27,7 @@ ColorPopup::ColorPopup ( : Popup( pParent, rControlCreator, - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Color"))) + OUString("Color")) { } diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx index 782f3d0309aa..fe66f10884f3 100644 --- a/svx/source/unodraw/unomod.cxx +++ b/svx/source/unodraw/unomod.cxx @@ -727,7 +727,7 @@ sal_Bool SAL_CALL SvxUnoDrawPagesAccess::supportsService( const OUString& Servic uno::Sequence< OUString > SAL_CALL SvxUnoDrawPagesAccess::getSupportedServiceNames( ) throw(uno::RuntimeException) { - OUString aService( RTL_CONSTASCII_USTRINGPARAM( pSvxUnoDrawPagesAccessService ) ); + OUString aService( pSvxUnoDrawPagesAccessService ); uno::Sequence< OUString > aSeq( &aService, 1 ); return aSeq; } diff --git a/svx/source/xml/xmlxtimp.cxx b/svx/source/xml/xmlxtimp.cxx index 5eba668b376d..246d0940302a 100644 --- a/svx/source/xml/xmlxtimp.cxx +++ b/svx/source/xml/xmlxtimp.cxx @@ -336,16 +336,16 @@ SvxXMLXTableImport::SvxXMLXTableImport( { SetGraphicResolver( xGrfResolver ); - GetNamespaceMap().Add( OUString( RTL_CONSTASCII_USTRINGPARAM ( sXML_np__ooo ) ), GetXMLToken(XML_N_OOO), XML_NAMESPACE_OOO ); - GetNamespaceMap().Add( OUString( RTL_CONSTASCII_USTRINGPARAM ( sXML_np__office ) ), GetXMLToken(XML_N_OFFICE), XML_NAMESPACE_OFFICE ); - GetNamespaceMap().Add( OUString( RTL_CONSTASCII_USTRINGPARAM ( sXML_np__draw ) ), GetXMLToken(XML_N_DRAW), XML_NAMESPACE_DRAW ); - GetNamespaceMap().Add( OUString( RTL_CONSTASCII_USTRINGPARAM ( sXML_np__xlink ) ), GetXMLToken(XML_N_XLINK), XML_NAMESPACE_XLINK ); + GetNamespaceMap().Add( OUString( sXML_np__ooo ), GetXMLToken(XML_N_OOO), XML_NAMESPACE_OOO ); + GetNamespaceMap().Add( OUString( sXML_np__office ), GetXMLToken(XML_N_OFFICE), XML_NAMESPACE_OFFICE ); + GetNamespaceMap().Add( OUString( sXML_np__draw ), GetXMLToken(XML_N_DRAW), XML_NAMESPACE_DRAW ); + GetNamespaceMap().Add( OUString( sXML_np__xlink ), GetXMLToken(XML_N_XLINK), XML_NAMESPACE_XLINK ); // OOo namespaces for reading OOo 1.1 files - GetNamespaceMap().Add( OUString( RTL_CONSTASCII_USTRINGPARAM ( sXML_np__office_ooo ) ), + GetNamespaceMap().Add( OUString( sXML_np__office_ooo ), GetXMLToken(XML_N_OFFICE_OOO), XML_NAMESPACE_OFFICE ); - GetNamespaceMap().Add( OUString( RTL_CONSTASCII_USTRINGPARAM ( sXML_np__draw_ooo ) ), + GetNamespaceMap().Add( OUString( sXML_np__draw_ooo ), GetXMLToken(XML_N_DRAW_OOO), XML_NAMESPACE_DRAW ); } diff --git a/svx/source/xoutdev/xtable.cxx b/svx/source/xoutdev/xtable.cxx index e0d0d4b0da36..755a7038228a 100644 --- a/svx/source/xoutdev/xtable.cxx +++ b/svx/source/xoutdev/xtable.cxx @@ -124,7 +124,7 @@ XPropertyList::XPropertyList( XPropertyListType type, const OUString& rPath, const OUString& rReferer ) : meType ( type ), - maName ( RTL_CONSTASCII_USTRINGPARAM( "standard" ) ), + maName ( "standard" ), maPath ( rPath ), maReferer ( rReferer ), mbListDirty ( true ), |