diff options
| author | Noel Grandin <noel@peralex.com> | 2012-03-08 15:53:57 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2012-03-08 16:07:22 +0200 |
| commit | 4b4fb33c606fd068e024669efcbd7ad2aefdaacd (patch) | |
| tree | 2cea747768a081773303ba0844c0ea0f558530f9 /sw/source/ui/chrdlg | |
| parent | 1fad074f43e3301420900918881ad1a8b0bc8687 (diff) | |
Convert from tools/table.hxx to std::map in SvxMacroTableDtor
In this case, we also convert from storing pointers to storing
the items directly because SvxMacroTableDtor completely controls
the lifecycle of the SvxMacro objects it contains.
Also add an operator== to SvxMacroTableDtor and remove the out-of-line
implementations of equals from two other places.
Diffstat (limited to 'sw/source/ui/chrdlg')
| -rw-r--r-- | sw/source/ui/chrdlg/chardlg.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx index c57df00efd65..54c7c9bdd4b2 100644 --- a/sw/source/ui/chrdlg/chardlg.cxx +++ b/sw/source/ui/chrdlg/chardlg.cxx @@ -298,7 +298,7 @@ sal_Bool SwCharURLPage::FillItemSet(SfxItemSet& rSet) aINetFmt.SetINetFmtId( nId ); aINetFmt.SetINetFmt(nId == RES_POOLCHR_INET_NORMAL ? aEmptyStr : sEntry); - if( pINetItem && pINetItem->GetMacroTable().Count() ) + if( pINetItem && !pINetItem->GetMacroTable().empty() ) aINetFmt.SetMacroTbl( &pINetItem->GetMacroTable() ); if(aVisitedLB.GetSavedValue() != aVisitedLB.GetSelectEntryPos()) |