diff options
| author | Kohei Yoshida <kyoshida@novell.com> | 2011-02-25 12:34:26 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kyoshida@novell.com> | 2011-02-25 12:35:18 -0500 |
| commit | d675923db0f97892d35144df5c41f65c42bdceae (patch) | |
| tree | 9b5cf588d3c5b5add38e9d1788f2dbb26eb4cc6f | |
| parent | 574b67398c4333fedd5b46582a6f7c6867030456 (diff) | |
Removed macros.
This messes up context tagging again.
| -rw-r--r-- | svx/source/items/numfmtsh.cxx | 37 |
1 files changed, 20 insertions, 17 deletions
diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx index 6314bd5c2cea..2296818739a4 100644 --- a/svx/source/items/numfmtsh.cxx +++ b/svx/source/items/numfmtsh.cxx @@ -77,24 +77,19 @@ SvxNumberFormatShell* SvxNumberFormatShell::Create( SvNumberFormatter* pNumForma // ----------------------------------------------------------------------- -#define _INIT \ - pFormatter ( pNumFormatter ), \ - pCurFmtTable ( NULL ), \ - eValType ( eNumValType ), \ - bUndoAddList ( sal_True ), \ - nInitFormatKey ( nFormatKey ), \ - nCurFormatKey ( nFormatKey ), \ - pCurCurrencyEntry(NULL), \ - bBankingSymbol (sal_False), \ - nCurCurrencyEntryPos((sal_uInt16) SELPOS_NONE) - -// ----------------------------------------------------------------------- - SvxNumberFormatShell::SvxNumberFormatShell( SvNumberFormatter* pNumFormatter, sal_uInt32 nFormatKey, SvxNumberValueType eNumValType, - const String& rNumStr ) - : _INIT + const String& rNumStr ) : + pFormatter ( pNumFormatter ), + pCurFmtTable ( NULL ), + eValType ( eNumValType ), + bUndoAddList ( sal_True ), + nInitFormatKey ( nFormatKey ), + nCurFormatKey ( nFormatKey ), + pCurCurrencyEntry(NULL), + bBankingSymbol (sal_False), + nCurCurrencyEntryPos((sal_uInt16) SELPOS_NONE) { nValNum = DEFAULT_NUMVALUE; @@ -116,8 +111,16 @@ SvxNumberFormatShell::SvxNumberFormatShell( SvNumberFormatter* pNumFormatter, sal_uInt32 nFormatKey, SvxNumberValueType eNumValType, double nNumVal, - const String* pNumStr ) - : _INIT + const String* pNumStr ) : + pFormatter ( pNumFormatter ), + pCurFmtTable ( NULL ), + eValType ( eNumValType ), + bUndoAddList ( sal_True ), + nInitFormatKey ( nFormatKey ), + nCurFormatKey ( nFormatKey ), + pCurCurrencyEntry(NULL), + bBankingSymbol (sal_False), + nCurCurrencyEntryPos((sal_uInt16) SELPOS_NONE) { // #50441# When used in Writer, the SvxNumberInfoItem contains the // original string in addition to the value |