diff options
| author | Eike Rathke <erack@redhat.com> | 2012-02-08 13:04:17 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2012-02-08 13:15:30 +0100 |
| commit | 9472e9c77d55a0b9cdf75ce91375765243c0e1f1 (patch) | |
| tree | 3aa6fea6c5eadf7b42b24f669568c98e9b67ca86 /svx/inc | |
| parent | 0979307bbf769399f97da10a29f04936a6cf117c (diff) | |
changes to "tools/table.hxx to std::map conversion"
* use consistent indenting with 4 spaces (instead of tabs (plus one space))
* use erase(it++) instead of erase(it); ++it to not access invalidated
iterator
* for First(); Remove(); Next() loops over entire Table use map::clear()
at the end if it isn't in a dtor
* use existing typedef SvNumberFormatTable in numfmtsh.hxx instead of
redefining, which means include zforlist.hxx now and some other forward
declarations can be removed
* removed inlined duplicated code of GetEntry(), implemented it in
zforlist.cxx instead and made const GetFormatEntry() just call GetEntry()
* removed the temporary sal_uIntPtr nFormat to be used as key, the sal_uIntPtr
was only used because Table effectively had pointer size as keys.
* made initial assignments of nDefaultFormat and nDefaultCurrencyFormat use
the ternary conditional operator
Diffstat (limited to 'svx/inc')
| -rw-r--r-- | svx/inc/svx/numfmtsh.hxx | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/svx/inc/svx/numfmtsh.hxx b/svx/inc/svx/numfmtsh.hxx index 32a7da363a35..850b46d48667 100644 --- a/svx/inc/svx/numfmtsh.hxx +++ b/svx/inc/svx/numfmtsh.hxx @@ -34,15 +34,12 @@ #include "svx/svxdllapi.h" #include <svl/svstdarr.hxx> +#include <svl/zforlist.hxx> #include <vector> #include <map> class Color; -class SvNumberFormatter; -class SvNumberformat; -typedef std::map<sal_uInt32, SvNumberformat*> SvNumberFormatTable; -class NfCurrencyEntry; enum SvxNumberValueType { |