diff options
author | Brij Mohan Lal Srivastava <contactbrijmohan@gmail.com> | 2014-11-12 14:24:10 +0530 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-11-14 09:20:38 +0100 |
commit | d32be3ace8c8fd430bbecdf69f88a116b0ee91d1 (patch) | |
tree | b373c084cb124434e0498867b24bc7bb333155dd /vcl/source | |
parent | f5e86ebc097f0f8bc5b282511149cb026710ecde (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 'vcl/source')
-rw-r--r-- | vcl/source/control/field.cxx | 2 | ||||
-rw-r--r-- | vcl/source/control/fixed.cxx | 2 | ||||
-rw-r--r-- | vcl/source/gdi/impgraph.cxx | 2 | ||||
-rw-r--r-- | vcl/source/gdi/impimagetree.cxx | 2 | ||||
-rw-r--r-- | vcl/source/gdi/pdfwriter_impl.cxx | 2 | ||||
-rw-r--r-- | vcl/source/gdi/print.cxx | 2 | ||||
-rw-r--r-- | vcl/source/window/builder.cxx | 2 | ||||
-rw-r--r-- | vcl/source/window/menuitemlist.cxx | 2 | ||||
-rw-r--r-- | vcl/source/window/winproc.cxx | 2 |
9 files changed, 9 insertions, 9 deletions
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx index 174918035b25..53f0ac9a8eb2 100644 --- a/vcl/source/control/field.cxx +++ b/vcl/source/control/field.cxx @@ -1533,7 +1533,7 @@ void MetricFormatter::Reformat() } else SetValue( mnLastValue ); - maCurUnitText = OUString(); + maCurUnitText.clear(); } sal_Int64 MetricFormatter::GetCorrectedValue( FieldUnit eOutUnit ) const diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx index a0d3da11eccd..0dc4705428ce 100644 --- a/vcl/source/control/fixed.cxx +++ b/vcl/source/control/fixed.cxx @@ -225,7 +225,7 @@ void FixedText::ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags, nTextStyle |= TEXT_DRAW_MONO; if( bFillLayout ) - mpControlData->mpLayoutData->m_aDisplayText = OUString(); + (mpControlData->mpLayoutData->m_aDisplayText).clear(); Rectangle aRect( Rectangle( aPos, rSize ) ); DrawControlText( *pDev, aRect, aText, nTextStyle, diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx index 6d9c3ea51525..b41ecd8d4f51 100644 --- a/vcl/source/gdi/impgraph.cxx +++ b/vcl/source/gdi/impgraph.cxx @@ -395,7 +395,7 @@ void ImpGraphic::ImplClear() mbSwapOut = false; mnDocFilePos = 0UL; - maDocFileURLStr = OUString(); + maDocFileURLStr.clear(); // cleanup ImplClearGraphics( false ); diff --git a/vcl/source/gdi/impimagetree.cxx b/vcl/source/gdi/impimagetree.cxx index e81bafe54269..d58cc8d0cc6b 100644 --- a/vcl/source/gdi/impimagetree.cxx +++ b/vcl/source/gdi/impimagetree.cxx @@ -186,7 +186,7 @@ bool ImplImageTree::doLoadImage( } void ImplImageTree::shutDown() { - m_style = OUString(); + m_style.clear(); // for safety; empty m_style means "not initialized" m_iconCache.clear(); m_linkHash.clear(); diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 7e49bc2e4779..ad6d04d86603 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -730,7 +730,7 @@ void PDFWriterImpl::createWidgetFieldName( sal_Int32 i_nWidgetIndex, const PDFWr // workaround: put the second terminal field as much up in the hierarchy as // necessary to have a non-terminal field as parent (or none at all) // since it->second already is terminal, we just need to use its parent - aDomain = OString(); + aDomain.clear(); aPartialName = aFullName.copy( aFullName.lastIndexOf( '.' )+1 ); if( nLastTokenIndex > 0 ) { diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx index 9904f375c573..f6dd207f679f 100644 --- a/vcl/source/gdi/print.cxx +++ b/vcl/source/gdi/print.cxx @@ -1712,7 +1712,7 @@ bool Printer::EndJob() mbPrinting = false; mnCurPrintPage = 0; - maJobName = OUString(); + maJobName.clear(); mbDevOutput = false; bRet = mpPrinter->EndJob(); diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index 9431819075b7..bac546eda43d 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -561,7 +561,7 @@ void VclBuilder::handleTranslations(xmlreader::XmlReader &reader) } if (res == xmlreader::XmlReader::RESULT_END) - sID = OString(); + sID.clear(); if (res == xmlreader::XmlReader::RESULT_DONE) break; diff --git a/vcl/source/window/menuitemlist.cxx b/vcl/source/window/menuitemlist.cxx index 4fb7526982d8..d6b680adf6dd 100644 --- a/vcl/source/window/menuitemlist.cxx +++ b/vcl/source/window/menuitemlist.cxx @@ -115,7 +115,7 @@ void MenuItemList::InsertSeparator(const OString &rIdent, size_t nPos) aSalMIData.eType = MenuItemType::SEPARATOR; aSalMIData.nBits = MenuItemBits::NONE; aSalMIData.pMenu = NULL; - aSalMIData.aText = OUString(); + aSalMIData.aText.clear(); aSalMIData.aImage = Image(); // Native-support: returns NULL if not supported diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index 6934ed233703..ce5bc24cb900 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -2184,7 +2184,7 @@ static void ImplHandleSurroundingTextRequest( vcl::Window *pWindow, if ( !pChild ) { - rText = OUString(); + rText.clear(); rSelRange.setMin( 0 ); rSelRange.setMax( 0 ); } |