Index: inc/numfmtsh.hxx =================================================================== RCS file: /cvs/graphics/svx/inc/numfmtsh.hxx,v retrieving revision 1.6 retrieving revision 1.6.104.2 diff -u -r1.6 -r1.6.104.2 --- inc/numfmtsh.hxx 8 Sep 2005 18:08:03 -0000 1.6 +++ inc/numfmtsh.hxx 15 Nov 2005 14:18:54 -0000 1.6.104.2 @@ -113,12 +113,12 @@ { public: SvxNumberFormatShell( SvNumberFormatter* pNumFormatter, - ULONG nFormatKey, + sal_uInt32 nFormatKey, SvxNumberValueType eNumValType, const String& rNumStr ); SvxNumberFormatShell( SvNumberFormatter* pNumFormatter, - ULONG nFormatKey, + sal_uInt32 nFormatKey, SvxNumberValueType eNumValType, double nNumVal, const String* pNumStr = NULL ); @@ -127,12 +127,12 @@ static SvxNumberFormatShell* Create( SvNumberFormatter* pNumFormatter, - ULONG nFormatKey, + sal_uInt32 nFormatKey, SvxNumberValueType eNumValType, const String& rNumStr ); static SvxNumberFormatShell* Create( SvNumberFormatter* pNumFormatter, - ULONG nFormatKey, + sal_uInt32 nFormatKey, SvxNumberValueType eNumValType, double nNumVal, const String* pNumStr = NULL ); @@ -158,7 +158,7 @@ Color*& rpFontColor ); BOOL AddFormat( String& rFormat, - ULONG& rErrPos, + xub_StrLen& rErrPos, USHORT& rCatLbSelPos, short& rFmtSelPos, SvStrings& rFmtEntries ); @@ -193,15 +193,15 @@ BOOL IsUserDefined( const String& rFmtString ); BOOL IsTmpCurrencyFormat( const String& rFmtString ); - BOOL FindEntry( const String& rFmtString, ULONG* pAt = NULL ); + BOOL FindEntry( const String& rFmtString, sal_uInt32* pAt = NULL ); void ValidateNewEntries( BOOL bValidate = TRUE ) { bUndoAddList = !bValidate; } - ULONG GetUpdateDataCount() const; - void GetUpdateData( ULONG* pDelArray, const ULONG nSize ); + sal_uInt32 GetUpdateDataCount() const; + void GetUpdateData( sal_uInt32* pDelArray, const sal_uInt32 nSize ); - void SetCurNumFmtKey( ULONG nNew ) { nCurFormatKey = nNew; } + void SetCurNumFmtKey( sal_uInt32 nNew ) { nCurFormatKey = nNew; } void SetCurLanguage( LanguageType eNew ) { eCurLanguage = eNew; } - ULONG GetCurNumFmtKey() const { return nCurFormatKey; } + sal_uInt32 GetCurNumFmtKey() const { return nCurFormatKey; } LanguageType GetCurLanguage() const { return eCurLanguage; } String GetComment4Entry(short nEntry); @@ -212,12 +212,12 @@ BOOL IsBankingSymbol(USHORT nPos); void SetCurrencySymbol(USHORT nPos); - ULONG GetCurrencySymbol(); + sal_uInt32 GetCurrencySymbol(); USHORT FindCurrencyFormat( const String& rFmtString ); USHORT FindCurrencyFormat(const NfCurrencyEntry* pTmpCurrencyEntry,BOOL bTmpBanking); NfCurrencyEntry* GetCurCurrencyEntry(); void SetCurCurrencyEntry(NfCurrencyEntry*); - short GetListPos4Entry(ULONG nIdx); + short GetListPos4Entry(sal_uInt32 nIdx); short GetListPos4Entry( const String& rFmtString ); void GetCurrencySymbols(SvStringsDtor& rList,const XubString& rStrEurope,USHORT* pPos); @@ -240,8 +240,8 @@ SvULongs aAddList; SvULongs aDelList; SvULongs aCurEntryList; - ULONG nInitFormatKey; - ULONG nCurFormatKey; + sal_uInt32 nInitFormatKey; + sal_uInt32 nCurFormatKey; short nCurCategory; LanguageType eCurLanguage; SvUShorts aCurCurrencyList; @@ -264,8 +264,8 @@ SVX_DLLPRIVATE short FillEListWithUserCurrencys( SvStrings& rList,short nSelPos); SVX_DLLPRIVATE short FillEListWithUsD_Impl( SvStrings& rList, sal_uInt16 nPrivCat, short Pos ); - SVX_DLLPRIVATE BOOL IsRemoved_Impl( ULONG nKey ); - SVX_DLLPRIVATE BOOL IsAdded_Impl( ULONG nKey ); + SVX_DLLPRIVATE BOOL IsRemoved_Impl( sal_uInt32 nKey ); + SVX_DLLPRIVATE BOOL IsAdded_Impl( sal_uInt32 nKey ); SVX_DLLPRIVATE void GetPreviewString_Impl( String& rString, Color*& rpColor ); SVX_DLLPRIVATE void PosToCategory_Impl( USHORT nPos, short& rCategory ); Index: inc/numinf.hxx =================================================================== RCS file: /cvs/graphics/svx/inc/numinf.hxx,v retrieving revision 1.5 retrieving revision 1.5.102.1 diff -u -r1.5 -r1.5.102.1 --- inc/numinf.hxx 8 Sep 2005 18:08:18 -0000 1.5 +++ inc/numinf.hxx 26 Oct 2005 17:51:17 -0000 1.5.102.1 @@ -92,12 +92,12 @@ double GetValueDouble() const { return nDoubleVal; } void SetDoubleValue( const double& rNewVal ); - const ULONG* GetDelArray() const { return pDelFormatArr; } - void SetDelFormatArray( const ULONG* pData, - const ULONG nCount ); + const sal_uInt32* GetDelArray() const { return pDelFormatArr; } + void SetDelFormatArray( const sal_uInt32* pData, + const sal_uInt32 nCount ); SvxNumberValueType GetValueType() const { return eValueType; } - ULONG GetDelCount() const { return nDelCount; } + sal_uInt32 GetDelCount() const { return nDelCount; } private: SvNumberFormatter* pFormatter; @@ -105,8 +105,8 @@ String aStringVal; double nDoubleVal; - ULONG* pDelFormatArr; - ULONG nDelCount; + sal_uInt32* pDelFormatArr; + sal_uInt32 nDelCount; }; #endif Index: source/dialog/numfmt.cxx =================================================================== RCS file: /cvs/graphics/svx/source/dialog/numfmt.cxx,v retrieving revision 1.22 retrieving revision 1.22.102.2 diff -u -r1.22 -r1.22.102.2 --- source/dialog/numfmt.cxx 8 Sep 2005 21:35:40 -0000 1.22 +++ source/dialog/numfmt.cxx 15 Nov 2005 14:18:54 -0000 1.22.102.2 @@ -832,7 +832,7 @@ // OK chosen - Is format code input entered already taken over? // If not, simulate Add. Upon syntax error ignore input and prevent Put. String aFormat = aEdFormat.GetText(); - ULONG nCurKey = pNumFmtShell->GetCurNumFmtKey(); + sal_uInt32 nCurKey = pNumFmtShell->GetCurNumFmtKey(); if ( aIbAdd.IsEnabled() || pNumFmtShell->IsTmpCurrencyFormat(aFormat) ) { // #79599# It is not sufficient to just add the format code (or @@ -867,11 +867,11 @@ // -------------------------------------------------------------- // List of changed user defined formats: // ------------------------------------- - const ULONG nDelCount = pNumFmtShell->GetUpdateDataCount(); + const sal_uInt32 nDelCount = pNumFmtShell->GetUpdateDataCount(); if ( nDelCount > 0 ) { - ULONG* pDelArr = new ULONG[nDelCount]; + sal_uInt32* pDelArr = new sal_uInt32[nDelCount]; pNumFmtShell->GetUpdateData( pDelArr, nDelCount ); pNumItem->SetDelFormatArray( pDelArr, nDelCount ); @@ -1112,7 +1112,7 @@ } else if ( aLbFormat.GetEntryCount() > 0 ) { - ULONG nCurEntryKey=NUMKEY_UNDEFINED; + sal_uInt32 nCurEntryKey=NUMKEY_UNDEFINED; if(!pNumFmtShell->FindEntry( aEdFormat.GetText(),&nCurEntryKey)) { aLbFormat.SetNoSelection(); @@ -1489,7 +1489,7 @@ SvxDelStrgs a2EntryList; USHORT nCatLbSelPos = 0; short nFmtLbSelPos = SELPOS_NONE; - ULONG nErrPos=0; + xub_StrLen nErrPos=0; pNumFmtShell->SetCurCurrencyEntry(NULL); bAdded = pNumFmtShell->AddFormat( aFormat, nErrPos, @@ -1644,7 +1644,7 @@ IMPL_LINK( SvxNumberFormatTabPage, EditHdl_Impl, Edit*, pEdFormat ) { - ULONG nCurKey = NUMKEY_UNDEFINED; + sal_uInt32 nCurKey = NUMKEY_UNDEFINED; if ( aEdFormat.GetText().Len() == 0 ) { Index: source/items/flditem.cxx =================================================================== RCS file: /cvs/graphics/svx/source/items/flditem.cxx,v retrieving revision 1.19 retrieving revision 1.19.32.1 diff -u -r1.19 -r1.19.32.1 --- source/items/flditem.cxx 11 Oct 2005 08:24:28 -0000 1.19 +++ source/items/flditem.cxx 26 Oct 2005 17:51:34 -0000 1.19.32.1 @@ -780,7 +780,7 @@ break; } - ULONG nFormatKey; + sal_uInt32 nFormatKey; switch( eFormat ) { Index: source/items/numfmtsh.cxx =================================================================== RCS file: /cvs/graphics/svx/source/items/numfmtsh.cxx,v retrieving revision 1.11 retrieving revision 1.11.104.1 diff -u -r1.11 -r1.11.104.1 --- source/items/numfmtsh.cxx 8 Sep 2005 23:37:15 -0000 1.11 +++ source/items/numfmtsh.cxx 15 Nov 2005 14:18:55 -0000 1.11.104.1 @@ -268,7 +268,7 @@ } // ----------------------------------------------------------------------- -sal_Bool SvxNumberFormatShell::AddFormat( String& rFormat, sal_uInt32& rErrPos, +sal_Bool SvxNumberFormatShell::AddFormat( String& rFormat, xub_StrLen& rErrPos, sal_uInt16& rCatLbSelPos, short& rFmtSelPos, SvStrings& rFmtEntries ) { @@ -300,11 +300,9 @@ } else // neues Format { - xub_StrLen nErrPos = (xub_StrLen)rErrPos; - bInserted = pFormatter->PutEntry( rFormat, nErrPos, + bInserted = pFormatter->PutEntry( rFormat, rErrPos, nCurCategory, nAddKey, eCurLanguage ); - rErrPos = sal_uInt32(nErrPos); } if ( bInserted ) // eingefuegt @@ -387,7 +385,7 @@ { if(aCurrencyFormatList.Count()>nCurrencyPos) { - sal_uInt32 rErrPos=0; + xub_StrLen rErrPos=0; sal_uInt16 rCatLbSelPos=0; short rFmtSelPos=0; SvStrings aFmtEList;