summaryrefslogtreecommitdiff
path: root/editeng
diff options
context:
space:
mode:
authorBrij Mohan Lal Srivastava <contactbrijmohan@gmail.com>2014-11-12 14:24:10 +0530
committerStephan Bergmann <sbergman@redhat.com>2014-11-14 09:20:38 +0100
commitd32be3ace8c8fd430bbecdf69f88a116b0ee91d1 (patch)
treeb373c084cb124434e0498867b24bc7bb333155dd /editeng
parentf5e86ebc097f0f8bc5b282511149cb026710ecde (diff)
fdo#86023 - O[U]String needs a 'clear' method
Added clear() method to OString and OUString class, Updated appropriate call-sites. Change-Id: I0ba97fa6dc7af3e31b605953089a4e8e9c3e61ac Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'editeng')
-rw-r--r--editeng/source/editeng/editattr.cxx2
-rw-r--r--editeng/source/editeng/textconv.cxx2
-rw-r--r--editeng/source/items/frmitems.cxx6
-rw-r--r--editeng/source/items/paraitem.cxx6
-rw-r--r--editeng/source/items/textitem.cxx10
-rw-r--r--editeng/source/misc/hangulhanja.cxx2
6 files changed, 14 insertions, 14 deletions
diff --git a/editeng/source/editeng/editattr.cxx b/editeng/source/editeng/editattr.cxx
index ac55335f0d17..85676abb035e 100644
--- a/editeng/source/editeng/editattr.cxx
+++ b/editeng/source/editeng/editattr.cxx
@@ -363,7 +363,7 @@ void EditCharAttribField::SetFieldValue(const OUString& rVal)
void EditCharAttribField::Reset()
{
- aFieldValue = OUString();
+ aFieldValue.clear();
delete pTxtColor; pTxtColor = NULL;
delete pFldColor; pFldColor = NULL;
}
diff --git a/editeng/source/editeng/textconv.cxx b/editeng/source/editeng/textconv.cxx
index dbf19b950cd2..b7ac6448cd11 100644
--- a/editeng/source/editeng/textconv.cxx
+++ b/editeng/source/editeng/textconv.cxx
@@ -234,7 +234,7 @@ bool TextConvWrapper::ConvContinue_impl()
// modified version of EditSpellWrapper::SpellContinue
// get next convertible text portion and its language
- m_aConvText = OUString();
+ m_aConvText.clear();
m_nConvTextLang = LANGUAGE_NONE;
m_pEditView->GetImpEditEngine()->ImpConvert( m_aConvText, m_nConvTextLang,
m_pEditView, GetSourceLanguage(), m_aConvSel,
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index 30253e446cd6..de18d85475d6 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -2048,7 +2048,7 @@ bool SvxBoxItem::GetPresentation
{
case SFX_ITEM_PRESENTATION_NAMELESS:
{
- rText = OUString();
+ rText.clear();
if ( pTop )
{
@@ -2561,7 +2561,7 @@ bool SvxBoxInfoItem::GetPresentation
OUString& rText, const IntlWrapper *
) const
{
- rText = OUString();
+ rText.clear();
return false;
}
@@ -3184,7 +3184,7 @@ bool SvxLineItem::GetPresentation
OUString& rText, const IntlWrapper *pIntl
) const
{
- rText = OUString();
+ rText.clear();
if ( pLine )
rText = pLine->GetValueString( eCoreUnit, ePresUnit, pIntl,
diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx
index 0b2e078681ad..aeca389ba342 100644
--- a/editeng/source/items/paraitem.cxx
+++ b/editeng/source/items/paraitem.cxx
@@ -233,7 +233,7 @@ bool SvxLineSpacingItem::GetPresentation
#ifdef DBG_UTIL
rText = "SvxLineSpacingItem";
#else
- rText = OUString();
+ rText.clear();
#endif
return false;
}
@@ -1081,7 +1081,7 @@ bool SvxTabStopItem::GetPresentation
OUString& rText, const IntlWrapper *pIntl
) const
{
- rText = OUString();
+ rText.clear();
bool bComma = false;
@@ -1300,7 +1300,7 @@ bool SvxPageModelItem::GetPresentation
OUString& rText, const IntlWrapper *
) const
{
- rText = OUString();
+ rText.clear();
bool bSet = !GetValue().isEmpty();
switch ( ePres )
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index c471b45b3052..b4f5303ff383 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -202,7 +202,7 @@ bool SvxFontListItem::GetPresentation
OUString& rText, const IntlWrapper * /*pIntl*/
) const
{
- rText = OUString();
+ rText.clear();
return false;
}
@@ -1790,7 +1790,7 @@ bool SvxPropSizeItem::GetPresentation
OUString& rText, const IntlWrapper * /*pIntl*/
) const
{
- rText = OUString();
+ rText.clear();
return false;
}
@@ -2015,7 +2015,7 @@ bool SvxCharSetColorItem::GetPresentation
OUString& rText, const IntlWrapper * /*pIntl*/
) const
{
- rText = OUString();
+ rText.clear();
return false;
}
@@ -2549,7 +2549,7 @@ bool SvxNoLinebreakItem::GetPresentation
OUString& rText, const IntlWrapper * /*pIntl*/
) const
{
- rText = OUString();
+ rText.clear();
return false;
}
@@ -2594,7 +2594,7 @@ bool SvxNoHyphenItem::GetPresentation
OUString& rText, const IntlWrapper * /*pIntl*/
) const
{
- rText = OUString();
+ rText.clear();
return false;
}
diff --git a/editeng/source/misc/hangulhanja.cxx b/editeng/source/misc/hangulhanja.cxx
index a4c12e1262e1..0d2e6d7ab4cd 100644
--- a/editeng/source/misc/hangulhanja.cxx
+++ b/editeng/source/misc/hangulhanja.cxx
@@ -471,7 +471,7 @@ namespace editeng
{
const bool bAllowImplicitChanges = m_eConvType == HHC::eConvSimplifiedTraditional;
- m_sCurrentPortion = OUString();
+ m_sCurrentPortion.clear();
m_nCurrentPortionLang = LANGUAGE_NONE;
m_pAntiImpl->GetNextPortion( m_sCurrentPortion, m_nCurrentPortionLang, bAllowImplicitChanges );
m_nReplacementBaseIndex = 0;