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 /svtools | |
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 'svtools')
-rw-r--r-- | svtools/source/contnr/svtabbx.cxx | 6 | ||||
-rw-r--r-- | svtools/source/control/headbar.cxx | 4 | ||||
-rw-r--r-- | svtools/source/control/tabbar.cxx | 2 | ||||
-rw-r--r-- | svtools/source/dialogs/addresstemplate.cxx | 2 | ||||
-rw-r--r-- | svtools/source/graphic/descriptor.cxx | 2 | ||||
-rw-r--r-- | svtools/source/misc/embedhlp.cxx | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx index 266b195f01eb..88c7b10d6532 100644 --- a/svtools/source/contnr/svtabbx.cxx +++ b/svtools/source/contnr/svtabbx.cxx @@ -205,7 +205,7 @@ SvTreeListEntry* SvTabListBox::InsertEntryToColumn(const OUString& rStr,SvTreeLi aCurEntry = aStr.copy(++nEnd); } else - aCurEntry = OUString(); + aCurEntry.clear(); return SvTreeListBox::InsertEntry( aFirstStr, pParent, false, nPos, pUser ); } @@ -231,7 +231,7 @@ SvTreeListEntry* SvTabListBox::InsertEntryToColumn( const OUString& rStr, aCurEntry = aStr.copy(++nEnd); } else - aCurEntry = OUString(); + aCurEntry.clear(); return SvTreeListBox::InsertEntry( aFirstStr, @@ -999,7 +999,7 @@ OUString SvHeaderTabListBox::GetAccessibleObjectName( ::svt::AccessibleBrowseBox case ::svt::BBTYPE_TABLE: case ::svt::BBTYPE_COLUMNHEADERBAR: // should be empty now (see #i63983) - aRetText = OUString(); + aRetText.clear(); break; case ::svt::BBTYPE_TABLECELL: diff --git a/svtools/source/control/headbar.cxx b/svtools/source/control/headbar.cxx index c26beda45b00..8f3c2626287b 100644 --- a/svtools/source/control/headbar.cxx +++ b/svtools/source/control/headbar.cxx @@ -435,7 +435,7 @@ void HeaderBar::ImplDrawItem( OutputDevice* pDev, if ( pItem->maOutText.getLength() == 3 ) { nTxtWidth = 0; - pItem->maOutText = OUString(); + (pItem->maOutText).clear(); } } @@ -1131,7 +1131,7 @@ void HeaderBar::RequestHelp( const HelpEvent& rHEvt ) if ( pItem->maOutText != pItem->maText ) aStr = pItem->maText; else if (!pItem->maText.isEmpty()) - aStr = OUString(); + aStr.clear(); } if (!aStr.isEmpty()) diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx index e2d018997066..9fa8b99f7d23 100644 --- a/svtools/source/control/tabbar.cxx +++ b/svtools/source/control/tabbar.cxx @@ -2345,7 +2345,7 @@ void TabBar::EndEditMode( bool bCancel ) } // reset - maEditText = OUString(); + maEditText.clear(); mbEditCanceled = false; } } diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index a35fe0f9e7d9..bfc972a50bf0 100644 --- a/svtools/source/dialogs/addresstemplate.cxx +++ b/svtools/source/dialogs/addresstemplate.cxx @@ -882,7 +882,7 @@ void AssignmentPersistentData::Commit() // set the old table, if the new data source knows a table with this name, too. Else reset the tables edit field. if (!bKnowOldTable) - sOldTable = OUString(); + sOldTable.clear(); m_pTable->SetText(sOldTable); resetFields(); diff --git a/svtools/source/graphic/descriptor.cxx b/svtools/source/graphic/descriptor.cxx index 2ea8773dd5ec..8b5fa7b490f2 100644 --- a/svtools/source/graphic/descriptor.cxx +++ b/svtools/source/graphic/descriptor.cxx @@ -97,7 +97,7 @@ void GraphicDescriptor::implCreate( SvStream& rIStm, const OUString* pURL ) ::GraphicDescriptor aDescriptor( rIStm, &aURL ); mpGraphic = NULL; - maMimeType = OUString(); + maMimeType.clear(); meType = GRAPHIC_NONE; mnBitsPerPixel = 0; mbTransparent = false; diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx index 228ad1f26fc4..eb2aea48fd50 100644 --- a/svtools/source/misc/embedhlp.cxx +++ b/svtools/source/misc/embedhlp.cxx @@ -418,7 +418,7 @@ void EmbeddedObjectRef::GetReplacement( bool bUpdate ) if ( bUpdate ) { DELETEZ( mpImpl->pGraphic ); - mpImpl->aMediaType = OUString(); + (mpImpl->aMediaType).clear(); mpImpl->pGraphic = new Graphic; mpImpl->mnGraphicVersion++; } |