From d32be3ace8c8fd430bbecdf69f88a116b0ee91d1 Mon Sep 17 00:00:00 2001 From: Brij Mohan Lal Srivastava Date: Wed, 12 Nov 2014 14:24:10 +0530 Subject: 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 --- writerfilter/source/dmapper/DomainMapper.cxx | 2 +- writerfilter/source/dmapper/DomainMapperTableManager.cxx | 2 +- writerfilter/source/filter/WriterFilterDetection.cxx | 2 +- writerfilter/source/rtftok/rtfdocumentimpl.cxx | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'writerfilter') diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 1c7b19d00db6..e719805c9992 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -227,7 +227,7 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) //contains the bookmark identifier - has to be added to the bookmark name imported before //if it is already available then the bookmark should be inserted m_pImpl->AddBookmark( sLocalBookmarkName, sStringValue ); - sLocalBookmarkName = OUString(); + sLocalBookmarkName.clear(); break; case NS_ooxml::LN_CT_MarkupRange_displacedByCustomXml: break; diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx index 51cfd9b6b815..3a9153c328dd 100644 --- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx @@ -846,7 +846,7 @@ void DomainMapperTableManager::endOfRowAction() void DomainMapperTableManager::clearData() { m_nRow = m_nCellBorderIndex = m_nHeaderRepeat = m_nTableWidth = m_nLayoutType = 0; - m_sTableStyleName = OUString(); + m_sTableStyleName.clear(); m_pTableStyleTextProperies.reset(); } diff --git a/writerfilter/source/filter/WriterFilterDetection.cxx b/writerfilter/source/filter/WriterFilterDetection.cxx index 7622d22f2400..727c57660974 100644 --- a/writerfilter/source/filter/WriterFilterDetection.cxx +++ b/writerfilter/source/filter/WriterFilterDetection.cxx @@ -95,7 +95,7 @@ OUString WriterFilterDetection::detect( uno::Sequence< beans::PropertyValue >& r OSL_FAIL("exception while opening storage"); } if( !bWord ) - sTypeName = OUString(); + sTypeName.clear(); return sTypeName; } diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 2e98dd74b890..0b596592ecad 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -5226,7 +5226,7 @@ int RTFDocumentImpl::popState() if (aStr.getLength() > nLength) aStr = aStr.copy(nLength+1); // zero-terminated string else - aStr = OString(); + aStr.clear(); // extract default text nLength = aStr.toChar(); if (!aStr.isEmpty()) -- cgit ra/cp-4.2 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2015-10-23Breeze Icons: some 32px action iconsandreas kainz