From 8fa7b8234f5b5a0f30972a3ece939363fff4fdae Mon Sep 17 00:00:00 2001 From: Takeshi Abe Date: Sat, 11 May 2013 00:06:16 +0900 Subject: sal_Bool to bool Change-Id: I7e69466f189b845a807edbf3ca4422b0fb2aec94 --- include/vcl/svapp.hxx | 2 +- vcl/source/app/svmain.cxx | 10 ++++---- vcl/source/app/timer.cxx | 20 +++++++-------- vcl/source/control/button.cxx | 20 +++++++-------- vcl/source/control/combobox.cxx | 6 ++--- vcl/source/control/edit.cxx | 50 ++++++++++++++++++------------------ vcl/source/control/field.cxx | 56 ++++++++++++++++++++--------------------- 7 files changed, 82 insertions(+), 82 deletions(-) diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx index b4acc579ad94..f2f59c25d85b 100644 --- a/include/vcl/svapp.hxx +++ b/include/vcl/svapp.hxx @@ -519,7 +519,7 @@ public: VCL_DLLPUBLIC Application* GetpApp(); -VCL_DLLPUBLIC sal_Bool InitVCL(); +VCL_DLLPUBLIC bool InitVCL(); VCL_DLLPUBLIC void DeInitVCL(); VCL_DLLPUBLIC bool InitAccessBridge( bool bAllowCancel, bool &rCancelled ); diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx index f7533fdb5f05..e6ac094f7b6d 100644 --- a/vcl/source/app/svmain.cxx +++ b/vcl/source/app/svmain.cxx @@ -153,7 +153,7 @@ int ImplSVMain() int nReturn = EXIT_FAILURE; - sal_Bool bInit = InitVCL(); + bool bInit = InitVCL(); if( bInit ) { @@ -239,12 +239,12 @@ uno::Any SAL_CALL DesktopEnvironmentContext::getValueByName( const OUString& Nam return retVal; } -sal_Bool InitVCL() +bool InitVCL() { RTL_LOGFILE_CONTEXT( aLog, "vcl (ss112471) ::InitVCL" ); if( pExceptionHandler != NULL ) - return sal_False; + return false; EmbeddedFontsHelper::clearTemporaryFontFiles(); @@ -269,7 +269,7 @@ sal_Bool InitVCL() RTL_LOGFILE_CONTEXT_TRACE( aLog, "{ ::CreateSalInstance" ); pSVData->mpDefInst = CreateSalInstance(); if ( !pSVData->mpDefInst ) - return sal_False; + return false; RTL_LOGFILE_CONTEXT_TRACE( aLog, "} ::CreateSalInstance" ); // Desktop Environment context (to be able to get value of "system.desktop-environment" as soon as possible) @@ -302,7 +302,7 @@ sal_Bool InitVCL() // initialise debug data DBGGUI_INIT(); - return sal_True; + return true; } #ifdef ANDROID diff --git a/vcl/source/app/timer.cxx b/vcl/source/app/timer.cxx index 60147afbd9c8..de5efcae8bbb 100644 --- a/vcl/source/app/timer.cxx +++ b/vcl/source/app/timer.cxx @@ -42,8 +42,8 @@ struct ImplTimerData Timer* mpSVTimer; // Pointer to SV Timer instance sal_uLong mnUpdateTime; // Last Update Time sal_uLong mnTimerUpdate; // TimerCallbackProcs on stack - sal_Bool mbDelete; // Was timer deleted during Update()? - sal_Bool mbInTimeout; // Are we in a timeout handler? + bool mbDelete; // Was timer deleted during Update()? + bool mbInTimeout; // Are we in a timeout handler? }; // ======================================================================= @@ -125,13 +125,13 @@ void Timer::ImplTimerCallbackProc() if ( !pTimerData->mpSVTimer->mbAuto ) { pTimerData->mpSVTimer->mbActive = sal_False; - pTimerData->mbDelete = sal_True; + pTimerData->mbDelete = true; } // call Timeout - pTimerData->mbInTimeout = sal_True; + pTimerData->mbInTimeout = true; pTimerData->mpSVTimer->Timeout(); - pTimerData->mbInTimeout = sal_False; + pTimerData->mbInTimeout = false; } } @@ -233,7 +233,7 @@ Timer::~Timer() { if ( mpTimerData ) { - mpTimerData->mbDelete = sal_True; + mpTimerData->mbDelete = true; mpTimerData->mpSVTimer = NULL; } } @@ -284,8 +284,8 @@ void Timer::Start() mpTimerData->mpSVTimer = this; mpTimerData->mnUpdateTime = Time::GetSystemTicks(); mpTimerData->mnTimerUpdate = pSVData->mnTimerUpdate; - mpTimerData->mbDelete = sal_False; - mpTimerData->mbInTimeout = sal_False; + mpTimerData->mbDelete = false; + mpTimerData->mbInTimeout = false; // insert last due to SFX! ImplTimerData* pPrev = NULL; @@ -312,7 +312,7 @@ void Timer::Start() { mpTimerData->mnUpdateTime = Time::GetSystemTicks(); mpTimerData->mnTimerUpdate = pSVData->mnTimerUpdate; - mpTimerData->mbDelete = sal_False; + mpTimerData->mbDelete = false; } } @@ -323,7 +323,7 @@ void Timer::Stop() mbActive = sal_False; if ( mpTimerData ) - mpTimerData->mbDelete = sal_True; + mpTimerData->mbDelete = true; } // ----------------------------------------------------------------------- diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index d21312d0d23f..4254113aef7c 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -261,9 +261,9 @@ void Button::ImplDrawAlignedImage( OutputDevice* pDev, Point& rPos, bool bAddImageSep ) { OUString aText( GetText() ); - sal_Bool bDrawImage = HasImage() && ! ( ImplGetButtonState() & BUTTON_DRAW_NOIMAGE ); - sal_Bool bDrawText = !aText.isEmpty() && ! ( ImplGetButtonState() & BUTTON_DRAW_NOTEXT ); - sal_Bool bHasSymbol = pSymbolRect ? sal_True : sal_False; + bool bDrawImage = HasImage() && ! ( ImplGetButtonState() & BUTTON_DRAW_NOIMAGE ); + bool bDrawText = !aText.isEmpty() && ! ( ImplGetButtonState() & BUTTON_DRAW_NOTEXT ); + bool bHasSymbol = pSymbolRect ? true : false; // No text and no image => nothing to do => return if ( !bDrawImage && !bDrawText && !bHasSymbol ) @@ -780,7 +780,7 @@ sal_uInt16 PushButton::ImplGetTextStyle( sal_uLong nDrawFlags ) const static void ImplDrawBtnDropDownArrow( OutputDevice* pDev, long nX, long nY, - Color& rColor, sal_Bool bBlack ) + Color& rColor, bool bBlack ) { Color aOldLineColor = pDev->GetLineColor(); Color aOldFillColor = pDev->GetFillColor(); @@ -899,7 +899,7 @@ void PushButton::ImplDrawPushButtonContent( OutputDevice* pDev, sal_uLong nDrawF if ( mnDDStyle == PUSHBUTTON_DROPDOWN_TOOLBOX && !bLayout ) { - sal_Bool bBlack = sal_False; + bool bBlack = false; Color aArrowColor( COL_BLACK ); if ( !(nDrawFlags & WINDOW_DRAW_MONO) ) @@ -909,7 +909,7 @@ void PushButton::ImplDrawPushButtonContent( OutputDevice* pDev, sal_uLong nDrawF else { aArrowColor = Color( COL_LIGHTGREEN ); - bBlack = sal_True; + bBlack = true; } } @@ -972,7 +972,7 @@ void PushButton::ImplDrawPushButton( bool bLayout ) break; } - sal_Bool bDropDown = ( IsSymbol() && (GetSymbol()==SYMBOL_SPIN_DOWN) && GetText().isEmpty() ); + bool bDropDown = ( IsSymbol() && (GetSymbol()==SYMBOL_SPIN_DOWN) && GetText().isEmpty() ); if( bDropDown && (aCtrlType == CTRL_COMBOBOX || aCtrlType == CTRL_LISTBOX ) ) { @@ -1114,7 +1114,7 @@ void PushButton::ImplSetDefButton( sal_Bool bSet ) Size aSize( GetSizePixel() ); Point aPos( GetPosPixel() ); int dLeft(0), dRight(0), dTop(0), dBottom(0); - sal_Bool bSetPos = sal_False; + bool bSetPos = false; if ( (IsNativeControlSupported(CTRL_PUSHBUTTON, PART_ENTIRE_CONTROL)) == sal_True ) { @@ -1551,7 +1551,7 @@ long PushButton::PreNotify( NotifyEvent& rNEvt ) break; } - sal_Bool bDropDown = ( IsSymbol() && (GetSymbol()==SYMBOL_SPIN_DOWN) && GetText().isEmpty() ); + bool bDropDown = ( IsSymbol() && (GetSymbol()==SYMBOL_SPIN_DOWN) && GetText().isEmpty() ); if( bDropDown && GetParent()->IsNativeControlSupported( aCtrlType, PART_ENTIRE_CONTROL) && !GetParent()->IsNativeControlSupported( aCtrlType, PART_BUTTON_DOWN) ) @@ -2221,7 +2221,7 @@ void RadioButton::ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags, } else { - sal_Bool bTopImage = (nWinStyle & WB_TOP) != 0; + bool bTopImage = (nWinStyle & WB_TOP) != 0; Size aImageSize = maImage.GetSizePixel(); Rectangle aImageRect( rPos, rSize ); long nTextHeight = pDev->GetTextHeight(); diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx index 9c8e3b806754..6c2387a23293 100644 --- a/vcl/source/control/combobox.cxx +++ b/vcl/source/control/combobox.cxx @@ -145,7 +145,7 @@ void ComboBox::ImplInit( Window* pParent, WinBits nStyle ) { ImplInitStyle( nStyle ); - sal_Bool bNoBorder = ( nStyle & WB_NOBORDER ) ? sal_True : sal_False; + bool bNoBorder = ( nStyle & WB_NOBORDER ) ? true : false; if ( !(nStyle & WB_DROPDOWN) ) { nStyle &= ~WB_BORDER; @@ -373,7 +373,7 @@ IMPL_LINK( ComboBox, ImplAutocompleteHdl, Edit*, pEdit ) IMPL_LINK_NOARG(ComboBox, ImplSelectHdl) { sal_Bool bPopup = IsInDropDown(); - sal_Bool bCallSelect = sal_False; + bool bCallSelect = false; if ( mpImplLB->IsSelectionChanged() || bPopup ) { OUString aText; @@ -436,7 +436,7 @@ IMPL_LINK_NOARG(ComboBox, ImplSelectHdl) aNewSelection.Min() = aText.getLength(); mpSubEdit->SetSelection( aNewSelection ); - bCallSelect = sal_True; + bCallSelect = true; } // #84652# Call GrabFocus and EndPopupMode before calling Select/Modify, but after changing the text diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index 69d9e17b9d44..41722998160a 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -101,19 +101,19 @@ struct DDInfo Cursor aCursor; Selection aDndStartSel; xub_StrLen nDropPos; - sal_Bool bStarterOfDD; - sal_Bool bDroppedInMe; - sal_Bool bVisCursor; - sal_Bool bIsStringSupported; + bool bStarterOfDD; + bool bDroppedInMe; + bool bVisCursor; + bool bIsStringSupported; DDInfo() { aCursor.SetStyle( CURSOR_SHADOW ); nDropPos = 0; - bStarterOfDD = sal_False; - bDroppedInMe = sal_False; - bVisCursor = sal_False; - bIsStringSupported = sal_False; + bStarterOfDD = false; + bDroppedInMe = false; + bVisCursor = false; + bIsStringSupported = false; } }; @@ -125,8 +125,8 @@ struct Impl_IMEInfos sal_uInt16* pAttribs; xub_StrLen nPos; xub_StrLen nLen; - sal_Bool bCursor; - sal_Bool bWasCursorOverwrite; + bool bCursor; + bool bWasCursorOverwrite; Impl_IMEInfos( xub_StrLen nPos, const OUString& rOldTextAfterStartPos ); ~Impl_IMEInfos(); @@ -142,9 +142,9 @@ Impl_IMEInfos::Impl_IMEInfos( xub_StrLen nP, const OUString& rOldTextAfterStartP { nPos = nP; nLen = 0; - bCursor = sal_True; + bCursor = true; pAttribs = NULL; - bWasCursorOverwrite = sal_False; + bWasCursorOverwrite = false; } // ----------------------------------------------------------------------- @@ -552,7 +552,7 @@ void Edit::ImplRepaint( xub_StrLen nStart, xub_StrLen nEnd, bool bLayout ) } Cursor* pCursor = GetCursor(); - sal_Bool bVisCursor = pCursor ? pCursor->IsVisible() : sal_False; + bool bVisCursor = pCursor ? pCursor->IsVisible() : false; if ( pCursor ) pCursor->Hide(); @@ -585,7 +585,7 @@ void Edit::ImplRepaint( xub_StrLen nStart, xub_StrLen nEnd, bool bLayout ) ImplPaintBorder( 0, GetOutputSizePixel().Width() ); - sal_Bool bDrawSelection = maSelection.Len() && ( HasFocus() || ( GetStyle() & WB_NOHIDESELECTION ) || mbActivePopup ); + bool bDrawSelection = maSelection.Len() && ( HasFocus() || ( GetStyle() & WB_NOHIDESELECTION ) || mbActivePopup ); long nPos = nStart ? pDX[2*nStart] : 0; aPos.X() = nPos + mnXOffset + ImplGetExtraOffset(); @@ -903,7 +903,7 @@ void Edit::ImplInsertText( const OUString& rStr, const Selection* pNewSel, sal_B sal_Bool bCTLSequenceCheckingRestricted = sal_False; sal_Bool bCTLSequenceCheckingTypeAndReplace = sal_False; sal_Bool bCTLFontEnabled = sal_False; - sal_Bool bIsInputSequenceChecking = sal_False; + bool bIsInputSequenceChecking = false; // // get access to the configuration of this office module try @@ -929,7 +929,7 @@ void Edit::ImplInsertText( const OUString& rStr, const Selection* pNewSel, sal_B } catch(...) { - bIsInputSequenceChecking = sal_False; // continue with inserting the new text + bIsInputSequenceChecking = false; // continue with inserting the new text } // uno::Reference < i18n::XBreakIterator > xBI( ImplGetBreakIterator(), UNO_QUERY ); @@ -1935,8 +1935,8 @@ void Edit::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_u // Border/Background pDev->SetLineColor(); pDev->SetFillColor(); - sal_Bool bBorder = !(nFlags & WINDOW_DRAW_NOBORDER ) && (GetStyle() & WB_BORDER); - sal_Bool bBackground = !(nFlags & WINDOW_DRAW_NOBACKGROUND) && IsControlBackground(); + bool bBorder = !(nFlags & WINDOW_DRAW_NOBORDER ) && (GetStyle() & WB_BORDER); + bool bBackground = !(nFlags & WINDOW_DRAW_NOBACKGROUND) && IsControlBackground(); if ( bBorder || bBackground ) { Rectangle aRect( aPos, aSize ); @@ -2451,7 +2451,7 @@ void Edit::ImplShowDDCursor() mpDDInfo->aCursor.SetPos( aCursorRect.TopLeft() ); mpDDInfo->aCursor.SetSize( aCursorRect.GetSize() ); mpDDInfo->aCursor.Show(); - mpDDInfo->bVisCursor = sal_True; + mpDDInfo->bVisCursor = true; } } @@ -2462,7 +2462,7 @@ void Edit::ImplHideDDCursor() if ( mpDDInfo && mpDDInfo->bVisCursor ) { mpDDInfo->aCursor.Hide(); - mpDDInfo->bVisCursor = sal_False; + mpDDInfo->bVisCursor = false; } } @@ -2982,7 +2982,7 @@ void Edit::dragGestureRecognized( const ::com::sun::star::datatransfer::dnd::Dra SolarMutexGuard aVclGuard; if ( !IsTracking() && maSelection.Len() && - !(GetStyle() & WB_PASSWORD) && (!mpDDInfo || mpDDInfo->bStarterOfDD == sal_False) ) // Kein Mehrfach D&D + !(GetStyle() & WB_PASSWORD) && (!mpDDInfo || mpDDInfo->bStarterOfDD == false) ) // Kein Mehrfach D&D { Selection aSel( maSelection ); aSel.Justify(); @@ -2995,7 +2995,7 @@ void Edit::dragGestureRecognized( const ::com::sun::star::datatransfer::dnd::Dra if ( !mpDDInfo ) mpDDInfo = new DDInfo; - mpDDInfo->bStarterOfDD = sal_True; + mpDDInfo->bStarterOfDD = true; mpDDInfo->aDndStartSel = aSel; @@ -3056,7 +3056,7 @@ void Edit::drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent& if ( aSel.Len() && !mpDDInfo->bStarterOfDD ) ImplDelete( aSel, EDIT_DEL_RIGHT, EDIT_DELMODE_SIMPLE ); - mpDDInfo->bDroppedInMe = sal_True; + mpDDInfo->bDroppedInMe = true; aSel.Min() = mpDDInfo->nDropPos; aSel.Max() = mpDDInfo->nDropPos; @@ -3097,14 +3097,14 @@ void Edit::dragEnter( const ::com::sun::star::datatransfer::dnd::DropTargetDragE // search for string data type const Sequence< com::sun::star::datatransfer::DataFlavor >& rFlavors( rDTDE.SupportedDataFlavors ); sal_Int32 nEle = rFlavors.getLength(); - mpDDInfo->bIsStringSupported = sal_False; + mpDDInfo->bIsStringSupported = false; for( sal_Int32 i = 0; i < nEle; i++ ) { sal_Int32 nIndex = 0; OUString aMimetype = rFlavors[i].MimeType.getToken( 0, ';', nIndex ); if ( aMimetype == "text/plain" ) { - mpDDInfo->bIsStringSupported = sal_True; + mpDDInfo->bIsStringSupported = true; break; } } diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx index f1a683d952b0..c0356781a55f 100644 --- a/vcl/source/control/field.cxx +++ b/vcl/source/control/field.cxx @@ -64,12 +64,12 @@ static sal_Int64 ImplPower10( sal_uInt16 n ) // ----------------------------------------------------------------------- -static sal_Bool ImplNumericProcessKeyInput( Edit*, const KeyEvent& rKEvt, - sal_Bool bStrictFormat, sal_Bool bThousandSep, +static bool ImplNumericProcessKeyInput( Edit*, const KeyEvent& rKEvt, + bool bStrictFormat, bool bThousandSep, const LocaleDataWrapper& rLocaleDataWrappper ) { if ( !bStrictFormat ) - return sal_False; + return false; else { sal_Unicode cChar = rKEvt.GetCharCode(); @@ -81,26 +81,26 @@ static sal_Bool ImplNumericProcessKeyInput( Edit*, const KeyEvent& rKEvt, string::equals(rLocaleDataWrappper.getNumDecimalSep(), cChar) || (bThousandSep && string::equals(rLocaleDataWrappper.getNumThousandSep(), cChar)) || (cChar == '-') ) - return sal_False; + return false; else - return sal_True; + return true; } } // ----------------------------------------------------------------------- -static sal_Bool ImplNumericGetValue( const OUString& rStr, sal_Int64& rValue, +static bool ImplNumericGetValue( const OUString& rStr, sal_Int64& rValue, sal_uInt16 nDecDigits, const LocaleDataWrapper& rLocaleDataWrappper, - sal_Bool bCurrency = sal_False ) + bool bCurrency = false ) { OUString aStr = rStr; OUStringBuffer aStr1, aStr2; - sal_Bool bNegative = sal_False; + bool bNegative = false; sal_Int32 nDecPos; // react on empty string if ( rStr.isEmpty() ) - return sal_False; + return false; // remove leading and trailing spaces aStr = aStr.trim(); @@ -119,7 +119,7 @@ static sal_Bool ImplNumericGetValue( const OUString& rStr, sal_Int64& rValue, if ( bCurrency ) { if ( aStr[0] == '(' && aStr[aStr.getLength()-1] == ')' ) - bNegative = sal_True; + bNegative = true; if ( !bNegative ) { for (sal_Int32 i=0; i < aStr.getLength(); i++ ) @@ -128,7 +128,7 @@ static sal_Bool ImplNumericGetValue( const OUString& rStr, sal_Int64& rValue, break; else if ( aStr[i] == '-' ) { - bNegative = sal_True; + bNegative = true; break; } } @@ -145,7 +145,7 @@ static sal_Bool ImplNumericGetValue( const OUString& rStr, sal_Int64& rValue, break; else if ( aStr[i] == '-' ) { - bNegative = sal_True; + bNegative = true; break; } } @@ -155,7 +155,7 @@ static sal_Bool ImplNumericGetValue( const OUString& rStr, sal_Int64& rValue, else { if ( !aStr1.isEmpty() && aStr1[0] == '-') - bNegative = sal_True; + bNegative = true; } // remove all unwanted charaters @@ -175,7 +175,7 @@ static sal_Bool ImplNumericGetValue( const OUString& rStr, sal_Int64& rValue, } if ( aStr1.isEmpty() && aStr2.isEmpty() ) - return sal_False; + return false; if ( aStr1.isEmpty() ) aStr1 = "0"; @@ -206,7 +206,7 @@ static sal_Bool ImplNumericGetValue( const OUString& rStr, sal_Int64& rValue, if( nIndex < aStr.getLength() ) { rValue = bNegative ? SAL_MIN_INT64 : SAL_MAX_INT64; - return sal_True; + return true; } } if (bRound) @@ -219,7 +219,7 @@ static sal_Bool ImplNumericGetValue( const OUString& rStr, sal_Int64& rValue, rValue = nValue; - return sal_True; + return true; } static void ImplUpdateSeparatorString( String& io_rText, @@ -1084,11 +1084,11 @@ void NumericBox::InsertValue( sal_Int64 nValue, sal_uInt16 nPos ) // ----------------------------------------------------------------------- -static sal_Bool ImplMetricProcessKeyInput( Edit* pEdit, const KeyEvent& rKEvt, - sal_Bool, sal_Bool bUseThousandSep, const LocaleDataWrapper& rWrapper ) +static bool ImplMetricProcessKeyInput( Edit* pEdit, const KeyEvent& rKEvt, + bool, bool bUseThousandSep, const LocaleDataWrapper& rWrapper ) { // no meaningfull strict format; therefore allow all characters - return ImplNumericProcessKeyInput( pEdit, rKEvt, sal_False, bUseThousandSep, rWrapper ); + return ImplNumericProcessKeyInput( pEdit, rKEvt, false, bUseThousandSep, rWrapper ); } // ----------------------------------------------------------------------- @@ -1412,13 +1412,13 @@ double MetricField::ConvertDoubleValue( double nValue, sal_uInt16 nDigits, // ----------------------------------------------------------------------- -static sal_Bool ImplMetricGetValue( const OUString& rStr, double& rValue, sal_Int64 nBaseValue, +static bool ImplMetricGetValue( const OUString& rStr, double& rValue, sal_Int64 nBaseValue, sal_uInt16 nDecDigits, const LocaleDataWrapper& rLocaleDataWrapper, FieldUnit eUnit ) { // Zahlenwert holen sal_Int64 nValue; if ( !ImplNumericGetValue( rStr, nValue, nDecDigits, rLocaleDataWrapper ) ) - return sal_False; + return false; // Einheit rausfinden FieldUnit eEntryUnit = ImplMetricGetUnit( rStr ); @@ -1427,7 +1427,7 @@ static sal_Bool ImplMetricGetValue( const OUString& rStr, double& rValue, sal_In // caution: conversion to double loses precision rValue = MetricField::ConvertDoubleValue( (double)nValue, nBaseValue, nDecDigits, eEntryUnit, eUnit ); - return sal_True; + return true; } // ----------------------------------------------------------------------- @@ -2066,20 +2066,20 @@ sal_Int64 MetricBox::GetValue() const // ----------------------------------------------------------------------- -static sal_Bool ImplCurrencyProcessKeyInput( Edit* pEdit, const KeyEvent& rKEvt, - sal_Bool, sal_Bool bUseThousandSep, const LocaleDataWrapper& rWrapper ) +static bool ImplCurrencyProcessKeyInput( Edit* pEdit, const KeyEvent& rKEvt, + bool, bool bUseThousandSep, const LocaleDataWrapper& rWrapper ) { // no strict format set; therefore allow all characters - return ImplNumericProcessKeyInput( pEdit, rKEvt, sal_False, bUseThousandSep, rWrapper ); + return ImplNumericProcessKeyInput( pEdit, rKEvt, false, bUseThousandSep, rWrapper ); } // ----------------------------------------------------------------------- -inline sal_Bool ImplCurrencyGetValue( const OUString& rStr, sal_Int64& rValue, +inline bool ImplCurrencyGetValue( const OUString& rStr, sal_Int64& rValue, sal_uInt16 nDecDigits, const LocaleDataWrapper& rWrapper ) { // fetch number - return ImplNumericGetValue( rStr, rValue, nDecDigits, rWrapper, sal_True ); + return ImplNumericGetValue( rStr, rValue, nDecDigits, rWrapper, true ); } // ----------------------------------------------------------------------- @@ -2087,7 +2087,7 @@ inline sal_Bool ImplCurrencyGetValue( const OUString& rStr, sal_Int64& rValue, sal_Bool CurrencyFormatter::ImplCurrencyReformat( const OUString& rStr, OUString& rOutStr ) { sal_Int64 nValue; - if ( !ImplNumericGetValue( rStr, nValue, GetDecimalDigits(), ImplGetLocaleDataWrapper(), sal_True ) ) + if ( !ImplNumericGetValue( rStr, nValue, GetDecimalDigits(), ImplGetLocaleDataWrapper(), true ) ) return sal_True; else { -- cgit v1.2.3