diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-12-18 13:23:07 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-12-18 14:12:25 +0100 |
commit | eb0f855f8cd893d4f9ed99028f58f138ccc1211a (patch) | |
tree | 11a3df954cb011511851eb9f86e69dcf2b4e0585 | |
parent | 0f867ad00c56059e347a9e60b50f29b04e9803a1 (diff) |
editeng: Use appropriate OUString functions on string constants
Change-Id: Iab879390c18a3ce2c5bfc49548ca273ce0b907da
-rw-r--r-- | editeng/qa/unit/core-test.cxx | 2 | ||||
-rw-r--r-- | editeng/source/accessibility/AccessibleEditableTextPara.cxx | 2 | ||||
-rw-r--r-- | editeng/source/editeng/editview.cxx | 2 | ||||
-rw-r--r-- | editeng/source/items/frmitems.cxx | 12 | ||||
-rw-r--r-- | editeng/source/rtf/svxrtf.cxx | 8 |
5 files changed, 13 insertions, 13 deletions
diff --git a/editeng/qa/unit/core-test.cxx b/editeng/qa/unit/core-test.cxx index 81d5ab767281..efb82d83ad4e 100644 --- a/editeng/qa/unit/core-test.cxx +++ b/editeng/qa/unit/core-test.cxx @@ -291,7 +291,7 @@ private: { m_rText = m_rText.replaceAt(rSttPos, nEndPos, pFnd->GetLong()); if( pPara ) - *pPara = "";//&pCurNode->GetString(); + pPara->clear(); // =&pCurNode->GetString(); return true; } diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx index 3c2cdb1b57d2..b95a1b333ea9 100644 --- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx +++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx @@ -861,7 +861,7 @@ namespace accessibility uno::Sequence< OUString >* pSeq = new uno::Sequence< OUString >( 21 ); OUString* pStrings = pSeq->getArray(); sal_Int32 i = 0; - #define STR(x) pStrings[i++] = OUString(x) + #define STR(x) pStrings[i++] = x STR("CharColor"); STR("CharContoured"); STR("CharEmphasis"); diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx index c10fd5510d92..cc3db195b57e 100644 --- a/editeng/source/editeng/editview.cxx +++ b/editeng/source/editeng/editview.cxx @@ -773,7 +773,7 @@ void EditView::ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack ) // implementation here by providing an additional parameter. Sequence< PropertyValue > aPropVals(1); PropertyValue &rVal = aPropVals.getArray()[0]; - rVal.Name = OUString( UPN_MAX_NUMBER_OF_SUGGESTIONS ); + rVal.Name = UPN_MAX_NUMBER_OF_SUGGESTIONS; rVal.Value <<= (sal_Int16) 7; // Are there any replace suggestions? diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index 784326db6345..7244b1de76db 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -3658,7 +3658,7 @@ bool SvxBrushItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) } else if( sLink.startsWith( UNO_NAME_GRAPHOBJ_URLPREFIX ) ) { - maStrLink = ""; + maStrLink.clear(); OString sId(OUStringToOString(sLink.copy( sizeof(UNO_NAME_GRAPHOBJ_URLPREFIX)-1 ), RTL_TEXTENCODING_ASCII_US)); GraphicObject *pOldGrfObj = pImpl->pGraphicObject; @@ -3750,8 +3750,8 @@ SvxBrushItem& SvxBrushItem::operator=( const SvxBrushItem& rItem ) eGraphicPos = rItem.eGraphicPos; DELETEZ( pImpl->pGraphicObject ); - maStrLink = ""; - maStrFilter = ""; + maStrLink.clear(); + maStrFilter.clear(); if ( GPOS_NONE != eGraphicPos ) { @@ -3942,8 +3942,8 @@ void SvxBrushItem::SetGraphicPos( SvxGraphicPosition eNew ) if ( GPOS_NONE == eGraphicPos ) { DELETEZ( pImpl->pGraphicObject ); - maStrLink = ""; - maStrFilter = ""; + maStrLink.clear(); + maStrFilter.clear(); } else { @@ -4003,7 +4003,7 @@ void SvxBrushItem::SetGraphicObject( const GraphicObject& rNewObj ) void SvxBrushItem::SetGraphicLink( const OUString& rNew ) { if ( rNew.isEmpty() ) - maStrLink = ""; + maStrLink.clear(); else { maStrLink = rNew; diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx index d67b49ec0e6b..6e76371de495 100644 --- a/editeng/source/rtf/svxrtf.cxx +++ b/editeng/source/rtf/svxrtf.cxx @@ -138,7 +138,7 @@ SvParserState SvxRTFParser::CallParser() bNewGroup = false; nDfltFont = 0; - sBaseURL = ""; + sBaseURL.clear(); // generate the correct WhichId table from the set WhichIds. BuildWhichTbl(); @@ -575,8 +575,8 @@ void SvxRTFParser::ReadFontTable() aFontTbl.insert( nInsFontNo, pFont ); pFont = new vcl::Font(); pFont->SetCharSet( nSystemChar ); - sAltNm = ""; - sFntNm = ""; + sAltNm.clear(); + sFntNm.clear(); } } // the last one we have to delete manually @@ -600,7 +600,7 @@ void SvxRTFParser::ReadOLEData() OUString& SvxRTFParser::GetTextToEndGroup( OUString& rStr ) { - rStr = ""; + rStr.clear(); int _nOpenBrakets = 1, nToken; // the first was already detected earlier!! while( _nOpenBrakets && IsParserWorking() ) |