[Libreoffice-commits] .: svx/source

[Kohei Yoshida]

 svx/source/items/numfmtsh.cxx |   37 ++++++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 17 deletions(-)

New commits:
commit 12cac6ffcc4cee89637b0900be0847c6023c2a85
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Fri Feb 25 12:34:26 2011 -0500

    Removed macros.
    
    This messes up context tagging again.

diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx
index c228603..92d7693 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