mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up a usage of OUStringBuffer

Browse Source 
Change-Id: I8435865f1a67a3a6d889c1b8a3d30e632ffc61fd
This commit is contained in:
Stephan Bergmann 2017-01-05 14:24:28 +01:00
parent a1baba6885
commit 21033d04fd
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
connectivity/source/commontools/filtermanager.cxx
View File

@ -120,7 +120,7 @@ namespace dbtools
} }
bool FilterManager::isThereAtMostOneComponent( OUStringBuffer& o_singleComponent ) const bool FilterManager::isThereAtMostOneComponent( OUString& o_singleComponent ) const
{ {
if (m_bApplyPublicFilter) { if (m_bApplyPublicFilter) {
if (!m_aPublicFilterComponent.isEmpty() && !m_aLinkFilterComponent.isEmpty()) if (!m_aPublicFilterComponent.isEmpty() && !m_aLinkFilterComponent.isEmpty())
@ -130,13 +130,13 @@ namespace dbtools
else if (!m_aLinkFilterComponent.isEmpty()) else if (!m_aLinkFilterComponent.isEmpty())
o_singleComponent = m_aLinkFilterComponent; o_singleComponent = m_aLinkFilterComponent;
else else
o_singleComponent.setLength(0); o_singleComponent.clear();
return true; return true;
} }
else else
{ {
if (m_aLinkFilterComponent.isEmpty()) if (m_aLinkFilterComponent.isEmpty())
o_singleComponent.setLength(0); o_singleComponent.clear();
else else
o_singleComponent = m_aLinkFilterComponent; o_singleComponent = m_aLinkFilterComponent;
return true; return true;
@ -146,17 +146,17 @@ namespace dbtools
OUString FilterManager::getComposedFilter( ) const OUString FilterManager::getComposedFilter( ) const
{ {
OUStringBuffer aComposedFilter;
// if we have only one non-empty component, then there's no need to compose anything // if we have only one non-empty component, then there's no need to compose anything
if ( !isThereAtMostOneComponent( aComposedFilter ) ) OUString singleComponent;
if ( isThereAtMostOneComponent( singleComponent ) )
{ {
// append the single components return singleComponent;
if (m_bApplyPublicFilter)
appendFilterComponent( aComposedFilter, m_aPublicFilterComponent );
appendFilterComponent( aComposedFilter, m_aLinkFilterComponent );
} }
// append the single components
OUStringBuffer aComposedFilter(singleComponent);
if (m_bApplyPublicFilter)
appendFilterComponent( aComposedFilter, m_aPublicFilterComponent );
appendFilterComponent( aComposedFilter, m_aLinkFilterComponent );
return aComposedFilter.makeStringAndClear(); return aComposedFilter.makeStringAndClear();
} }

2
include/connectivity/filtermanager.hxx
View File

@ -97,7 +97,7 @@ namespace dbtools
static void appendFilterComponent( OUStringBuffer& io_appendTo, const OUString& i_component ); static void appendFilterComponent( OUStringBuffer& io_appendTo, const OUString& i_component );
/// checks whether there is only one (or even no) non-empty filter component /// checks whether there is only one (or even no) non-empty filter component
bool isThereAtMostOneComponent( OUStringBuffer& o_singleComponent ) const; bool isThereAtMostOneComponent( OUString& o_singleComponent ) const;
}; };