1 files changed, 15 insertions, 16 deletions

diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx
index cf41a1ab0..ead974718 100644
--- a/cui/source/inc/numfmt.hxx
+++ b/cui/source/inc/numfmt.hxx
@@ -55,7 +55,7 @@ private:
     String			aPrevStr;
     Color			aPrevCol;
 
-    void			InitSettings( BOOL bForeground, BOOL bBackground );
+    void			InitSettings( sal_Bool bForeground, sal_Bool bBackground );
 
 protected:
     virtual void	Paint( const Rectangle& rRect );
@@ -87,9 +87,9 @@ public:
 
     static SfxTabPage*		Create( Window* pParent,
                                     const SfxItemSet& rAttrSet );
-    static USHORT*			GetRanges();
+    static sal_uInt16*			GetRanges();
 
-    virtual	BOOL 			FillItemSet( SfxItemSet& rSet );
+    virtual	sal_Bool 			FillItemSet( SfxItemSet& rSet );
     virtual	void 			Reset( const SfxItemSet& rSet );
     virtual int 			DeactivatePage	( SfxItemSet* pSet = NULL );
 
@@ -98,7 +98,7 @@ public:
                                 { SetInfoItem( rItem ); }
 
     void					SetOkHdl( const Link& rOkHandler );
-    void					HideLanguage(BOOL nFlag=TRUE);
+    void					HideLanguage(sal_Bool nFlag=sal_True);
     virtual long			PreNotify( NotifyEvent& rNEvt );
     virtual void			PageCreated (SfxAllItemSet aSet);
 private:
@@ -112,14 +112,14 @@ private:
     FixedText				aFtLanguage;
     SvxLanguageBox			aLbLanguage;
     CheckBox                aCbSourceFormat;
-
+    SvxNumberPreviewImpl	aWndPreview;
+    FixedLine               aFlOptions;
     FixedText				aFtDecimals;
     NumericField			aEdDecimals;
+    CheckBox				aBtnNegRed;
     FixedText				aFtLeadZeroes;
     NumericField			aEdLeadZeroes;
-    CheckBox				aBtnNegRed;
     CheckBox				aBtnThousand;
-    FixedLine               aFlOptions;
 
     FixedText				aFtEdFormat;
     Edit					aEdFormat;
@@ -131,15 +131,14 @@ private:
     Edit					aEdComment;
     Timer					aResetWinTimer;
 
-    SvxNumberPreviewImpl	aWndPreview;
 
     SvxNumberInfoItem*		pNumItem;
     SvxNumberFormatShell* 	pNumFmtShell;
-    ULONG					nInitFormat;
+    sal_uLong					nInitFormat;
     Link					fnOkHdl;
 
-    BOOL					bNumItemFlag; //Fuer Handling mit DocShell
-    BOOL					bOneAreaFlag;
+    sal_Bool					bNumItemFlag; //Fuer Handling mit DocShell
+    sal_Bool					bOneAreaFlag;
     short					nFixedCategory;
 
     long					nCatHeight;
@@ -156,16 +155,16 @@ private:
     void 	Init_Impl();
     void	FillCurrencyBox();
     void 	FillFormatListBox_Impl( SvxDelStrgs& rEntries );
-    void 	UpdateOptions_Impl( BOOL bCheckCatChange );
-    void	UpdateFormatListBox_Impl( USHORT bCat, BOOL bUpdateEdit );
+    void 	UpdateOptions_Impl( sal_Bool bCheckCatChange );
+    void	UpdateFormatListBox_Impl( sal_uInt16 bCat, sal_Bool bUpdateEdit );
     void	DeleteEntryList_Impl( SvxDelStrgs& rEntries );
     void	Obstructing();
     void    EnableBySourceFormat_Impl();
-    void	SetCategory( USHORT nPos );
+    void	SetCategory( sal_uInt16 nPos );
     String  GetExpColorString( Color*& rpPreviewColor, const String& aFormatStr, short nTmpCatPos );
     void    MakePreviewText( const String& rFormat );
-    void    ChangePreviewText( USHORT nPos );
-    void    AddAutomaticLanguage_Impl(LanguageType eAutoLang, BOOL bSelect);
+    void    ChangePreviewText( sal_uInt16 nPos );
+    void    AddAutomaticLanguage_Impl(LanguageType eAutoLang, sal_Bool bSelect);
     // Handler
     DECL_LINK( LostFocusHdl_Impl, Edit* pEd );
     DECL_LINK( DoubleClickHdl_Impl, SvxFontListBox* pLb );