diff options
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/accessibility/AccessibleOLEShape.cxx | 6 | ||||
| -rw-r--r-- | svx/source/accessibility/AccessibleShape.cxx | 2 | ||||
| -rw-r--r-- | svx/source/form/fmscriptingenv.cxx | 4 | ||||
| -rw-r--r-- | svx/source/form/fmshimp.cxx | 2 | ||||
| -rw-r--r-- | svx/source/items/viewlayoutitem.cxx | 4 | ||||
| -rw-r--r-- | svx/source/items/zoomslideritem.cxx | 8 | ||||
| -rw-r--r-- | svx/source/svdraw/svdoashp.cxx | 3 |
7 files changed, 14 insertions, 15 deletions
diff --git a/svx/source/accessibility/AccessibleOLEShape.cxx b/svx/source/accessibility/AccessibleOLEShape.cxx index 7f0051d30809..9e5c27f80b20 100644 --- a/svx/source/accessibility/AccessibleOLEShape.cxx +++ b/svx/source/accessibility/AccessibleOLEShape.cxx @@ -164,11 +164,9 @@ uno::Any SAL_CALL AccessibleOLEShape::getExtendedAttributes() ::rtl::OUString style; if( m_pShape ) { - //style = ::rtl::OUString::createFromAscii("style="); - style = ::rtl::OUString::createFromAscii("style:"); - style += static_cast<SdrOle2Obj*>(m_pShape)->GetStyleString(); + style = "style:" + static_cast<SdrOle2Obj*>(m_pShape)->GetStyleString(); } - style += ::rtl::OUString::createFromAscii(";"); + style += ";"; strRet <<= style; return strRet; } diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx index 3b0c496875c8..838556bb3455 100644 --- a/svx/source/accessibility/AccessibleShape.cxx +++ b/svx/source/accessibility/AccessibleShape.cxx @@ -755,7 +755,7 @@ sal_Int32 SAL_CALL AccessibleShape::getBackground (void) uno::Any aColor; aColor = aSet->getPropertyValue ("FillColor"); aColor >>= nColor; - aColor = aSet->getPropertyValue (OUString::createFromAscii ("FillTransparence")); + aColor = aSet->getPropertyValue ("FillTransparence"); short nTrans=0; aColor >>= nTrans; Color crBk(nColor); diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx index e69d9974a3fb..fb352bc94808 100644 --- a/svx/source/form/fmscriptingenv.cxx +++ b/svx/source/form/fmscriptingenv.cxx @@ -936,8 +936,8 @@ namespace svxform { // and it has such a prefix sMacroLocation = sScriptCode.copy( 0, nPrefixLen ); - DBG_ASSERT( sMacroLocation.equalsAscii( "document" ) - || sMacroLocation.equalsAscii( "application" ), + DBG_ASSERT( sMacroLocation == "document" + || sMacroLocation == "application", "FormScriptingEnvironment::doFireScriptEvent: invalid (unknown) prefix!" ); // strip the prefix: the SfxObjectShell::CallScript knows nothing about such prefixes diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index b12779cf8882..e3fdac5f1f16 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -3569,7 +3569,7 @@ void FmXFormShell::Notify( const com::sun::star::uno::Sequence< OUString >& _rPr const OUString* pSearch = _rPropertyNames.getConstArray(); const OUString* pSearchTil = pSearch + _rPropertyNames.getLength(); for (;pSearch < pSearchTil; ++pSearch) - if (pSearch->equalsAscii("FormControlPilotsEnabled")) + if (*pSearch == "FormControlPilotsEnabled") { implAdjustConfigCache(); InvalidateSlot( SID_FM_USE_WIZARDS, true ); diff --git a/svx/source/items/viewlayoutitem.cxx b/svx/source/items/viewlayoutitem.cxx index c8e2f0502637..304d48f6d68a 100644 --- a/svx/source/items/viewlayoutitem.cxx +++ b/svx/source/items/viewlayoutitem.cxx @@ -134,12 +134,12 @@ bool SvxViewLayoutItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt sal_Int16 nConvertedCount( 0 ); for ( sal_Int32 i = 0; i < aSeq.getLength(); i++ ) { - if ( aSeq[i].Name.equalsAscii( VIEWLAYOUT_PARAM_COLUMNS )) + if ( aSeq[i].Name == VIEWLAYOUT_PARAM_COLUMNS ) { bAllConverted &= ( aSeq[i].Value >>= nColumns ); ++nConvertedCount; } - else if ( aSeq[i].Name.equalsAscii( VIEWLAYOUT_PARAM_BOOKMODE )) + else if ( aSeq[i].Name == VIEWLAYOUT_PARAM_BOOKMODE ) { bAllConverted &= ( aSeq[i].Value >>= bBookMode ); ++nConvertedCount; diff --git a/svx/source/items/zoomslideritem.cxx b/svx/source/items/zoomslideritem.cxx index 285a4644410a..a26a30b2cbb0 100644 --- a/svx/source/items/zoomslideritem.cxx +++ b/svx/source/items/zoomslideritem.cxx @@ -157,22 +157,22 @@ bool SvxZoomSliderItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt for ( sal_Int32 i = 0; i < aSeq.getLength(); i++ ) { - if ( aSeq[i].Name.equalsAscii( ZOOMSLIDER_PARAM_CURRENTZOOM )) + if ( aSeq[i].Name == ZOOMSLIDER_PARAM_CURRENTZOOM ) { bAllConverted &= ( aSeq[i].Value >>= nCurrentZoom ); ++nConvertedCount; } - else if ( aSeq[i].Name.equalsAscii( ZOOMSLIDER_PARAM_SNAPPINGPOINTS )) + else if ( aSeq[i].Name == ZOOMSLIDER_PARAM_SNAPPINGPOINTS ) { bAllConverted &= ( aSeq[i].Value >>= aValues ); ++nConvertedCount; } - else if( aSeq[i].Name.equalsAscii( ZOOMSLIDER_PARAM_MINZOOM ) ) + else if( aSeq[i].Name == ZOOMSLIDER_PARAM_MINZOOM ) { bAllConverted &= ( aSeq[i].Value >>= nMinZoom ); ++nConvertedCount; } - else if( aSeq[i].Name.equalsAscii( ZOOMSLIDER_PARAM_MAXZOOM ) ) + else if( aSeq[i].Name == ZOOMSLIDER_PARAM_MAXZOOM ) { bAllConverted &= ( aSeq[i].Value >>= nMaxZoom ); ++nConvertedCount; diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index c92aa0951eaa..8ae276892ffd 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -3254,7 +3254,8 @@ OUString SdrObjCustomShape::GetCustomShapeName() { OUString sShapeName; OUString aEngine( static_cast<const SdrCustomShapeEngineItem&>(GetMergedItem( SDRATTR_CUSTOMSHAPE_ENGINE )).GetValue() ); - if ( aEngine.isEmpty() || aEngine.equalsAscii( "com.sun.star.drawing.EnhancedCustomShapeEngine" ) ) + if ( aEngine.isEmpty() + || aEngine == "com.sun.star.drawing.EnhancedCustomShapeEngine" ) { OUString sShapeType; const OUString sType("Type"); |