diff options
Diffstat (limited to 'svx/source/items/numfmtsh.cxx')
| -rw-r--r-- | svx/source/items/numfmtsh.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx index 7f4505e37866..95722e3144c9 100644 --- a/svx/source/items/numfmtsh.cxx +++ b/svx/source/items/numfmtsh.cxx @@ -452,7 +452,7 @@ void SvxNumberFormatShell::MakePreviewString( const String& rFormatStr, { rpFontColor = NULL; - ULONG nExistingFormat = pFormatter->GetEntryKey( rFormatStr, eCurLanguage ); + sal_uIntPtr nExistingFormat = pFormatter->GetEntryKey( rFormatStr, eCurLanguage ); if ( nExistingFormat == NUMBERFORMAT_ENTRY_NOT_FOUND ) { // real preview - not implemented in NumberFormatter for text formats @@ -465,7 +465,7 @@ void SvxNumberFormatShell::MakePreviewString( const String& rFormatStr, // format exists // #50441# if a string was set in addition to the value, use it for text formats - BOOL bUseText = ( eValType == SVX_VALUE_TYPE_STRING || + sal_Bool bUseText = ( eValType == SVX_VALUE_TYPE_STRING || ( aValStr.Len() && ( pFormatter->GetType(nExistingFormat) & NUMBERFORMAT_TEXT ) ) ); if ( bUseText ) pFormatter->GetOutputString( aValStr, nExistingFormat, @@ -1027,7 +1027,7 @@ short SvxNumberFormatShell::FillEListWithUserCurrencys( SvStrings& rList,short n aWSStringsDtor, *pTmpCurrencyEntry, bTmpBanking ); if ( !bTmpBanking ) pFormatter->GetCurrencyFormatStrings( - aWSStringsDtor, *pTmpCurrencyEntry, TRUE ); + aWSStringsDtor, *pTmpCurrencyEntry, sal_True ); } else nDefault = 0; @@ -1041,8 +1041,8 @@ short SvxNumberFormatShell::FillEListWithUserCurrencys( SvStrings& rList,short n const NfCurrencyEntry* pCurr = rCurrencyTable[i]; if ( pCurr->GetLanguage() == eLang && pTmpCurrencyEntry != pCurr ) { - pFormatter->GetCurrencyFormatStrings( aWSStringsDtor, *pCurr, FALSE ); - pFormatter->GetCurrencyFormatStrings( aWSStringsDtor, *pCurr, TRUE ); + pFormatter->GetCurrencyFormatStrings( aWSStringsDtor, *pCurr, sal_False ); + pFormatter->GetCurrencyFormatStrings( aWSStringsDtor, *pCurr, sal_True ); } } } @@ -1171,7 +1171,7 @@ void SvxNumberFormatShell::GetPreviewString_Impl( String& rString, Color*& rpCol rpColor = NULL; // #50441# if a string was set in addition to the value, use it for text formats - BOOL bUseText = ( eValType == SVX_VALUE_TYPE_STRING || + sal_Bool bUseText = ( eValType == SVX_VALUE_TYPE_STRING || ( aValStr.Len() && ( pFormatter->GetType(nCurFormatKey) & NUMBERFORMAT_TEXT ) ) ); if ( bUseText ) |