Kaydet (Commit) 75ebd3bd authored tarafından Noel Grandin's avatar Noel Grandin

basic: sal_Bool->bool

Change-Id: Icd78d21495f305c8f00280eee76e7262e542317d
üst f288d7dc
......@@ -102,7 +102,7 @@ uno::Any SAL_CALL DocumentsEnumeration::nextElement() throw (container::NoSuchEl
/** Locks or unlocks the controllers of the specified document model.
*/
void lclLockControllers( const uno::Reference< frame::XModel >& rxModel, sal_Bool bLockControllers )
void lclLockControllers( const uno::Reference< frame::XModel >& rxModel, bool bLockControllers )
{
if( rxModel.is() ) try
{
......@@ -121,7 +121,7 @@ void lclLockControllers( const uno::Reference< frame::XModel >& rxModel, sal_Boo
/** Enables or disables the container windows of all controllers of the
specified document model.
*/
void lclEnableContainerWindows( const uno::Reference< frame::XModel >& rxModel, sal_Bool bEnableWindows )
void lclEnableContainerWindows( const uno::Reference< frame::XModel >& rxModel, bool bEnableWindows )
{
try
{
......@@ -149,12 +149,12 @@ void lclEnableContainerWindows( const uno::Reference< frame::XModel >& rxModel,
typedef void (*ModifyDocumentFunc)( const uno::Reference< frame::XModel >&, sal_Bool );
typedef void (*ModifyDocumentFunc)( const uno::Reference< frame::XModel >&, bool );
/** Implementation iterating over all documents that have the same type as the
specified model, and calling the passed functor.
*/
void lclIterateDocuments( ModifyDocumentFunc pModifyDocumentFunc, const uno::Reference< frame::XModel >& rxModel, sal_Bool bModificator )
void lclIterateDocuments( ModifyDocumentFunc pModifyDocumentFunc, const uno::Reference< frame::XModel >& rxModel, bool bModificator )
{
uno::Reference< container::XEnumeration > xDocumentsEnum( new DocumentsEnumeration( rxModel ) );
// iterate over all open documents
......@@ -182,14 +182,14 @@ struct StaticCurrDirPool : public ::rtl::Static< CurrDirPool, StaticCurrDirPool
void lockControllersOfAllDocuments( const uno::Reference< frame::XModel >& rxModel, sal_Bool bLockControllers )
void lockControllersOfAllDocuments( const uno::Reference< frame::XModel >& rxModel, bool bLockControllers )
{
lclIterateDocuments( &lclLockControllers, rxModel, bLockControllers );
}
void enableContainerWindowsOfAllDocuments( const uno::Reference< frame::XModel >& rxModel, sal_Bool bEnableWindows )
void enableContainerWindowsOfAllDocuments( const uno::Reference< frame::XModel >& rxModel, bool bEnableWindows )
{
lclIterateDocuments( &lclEnableContainerWindows, rxModel, bEnableWindows );
}
......
......@@ -1259,8 +1259,8 @@ sal_uInt16 SbModule::Run( SbMethod* pMeth )
{
}
// VBA always ensures screenupdating is enabled after completing
::basic::vba::lockControllersOfAllDocuments( xModel, sal_False );
::basic::vba::enableContainerWindowsOfAllDocuments( xModel, sal_True );
::basic::vba::lockControllersOfAllDocuments( xModel, false );
::basic::vba::enableContainerWindowsOfAllDocuments( xModel, true );
}
#ifdef DBG_TRACE_BASIC
......
This diff is collapsed.
......@@ -105,13 +105,13 @@ class BASIC_DLLPUBLIC SbxBasicFormater {
OUString BasicFormat( double dNumber, const OUString& sFormatStrg );
OUString BasicFormatNull( const OUString& sFormatStrg );
static sal_Bool isBasicFormat( const OUString& sFormatStrg );
static bool isBasicFormat( const OUString& sFormatStrg );
private:
BASIC_DLLPRIVATE inline void ShiftString( OUStringBuffer& sStrg, sal_uInt16 nStartPos );
BASIC_DLLPRIVATE void AppendDigit( OUStringBuffer& sStrg, short nDigit );
BASIC_DLLPRIVATE void LeftShiftDecimalPoint( OUStringBuffer& sStrg );
BASIC_DLLPRIVATE void StrRoundDigit( OUStringBuffer& sStrg, short nPos, sal_Bool& bOverflow );
BASIC_DLLPRIVATE void StrRoundDigit( OUStringBuffer& sStrg, short nPos, bool& bOverflow );
BASIC_DLLPRIVATE void StrRoundDigit( OUStringBuffer& sStrg, short nPos );
BASIC_DLLPRIVATE void ParseBack( OUStringBuffer& sStrg, const OUString& sFormatStrg,
short nFormatPos );
......@@ -119,30 +119,30 @@ class BASIC_DLLPUBLIC SbxBasicFormater {
// Methods for string conversion with sprintf():
BASIC_DLLPRIVATE void InitScan( double _dNum );
BASIC_DLLPRIVATE void InitExp( double _dNewExp );
BASIC_DLLPRIVATE short GetDigitAtPosScan( short nPos, sal_Bool& bFoundFirstDigit );
BASIC_DLLPRIVATE short GetDigitAtPosScan( short nPos, bool& bFoundFirstDigit );
BASIC_DLLPRIVATE short GetDigitAtPosExpScan( double dNewExponent, short nPos,
sal_Bool& bFoundFirstDigit );
BASIC_DLLPRIVATE short GetDigitAtPosExpScan( short nPos, sal_Bool& bFoundFirstDigit );
bool& bFoundFirstDigit );
BASIC_DLLPRIVATE short GetDigitAtPosExpScan( short nPos, bool& bFoundFirstDigit );
#else
// Methods for direct 'calculation' with log10() and pow():
BASIC_DLLPRIVATE short GetDigitAtPos( double dNumber, short nPos, double& dNextNumber,
sal_Bool& bFoundFirstDigit );
bool& bFoundFirstDigit );
BASIC_DLLPRIVATE short RoundDigit( double dNumber );
#endif
BASIC_DLLPRIVATE OUString GetPosFormatString( const OUString& sFormatStrg, sal_Bool & bFound );
BASIC_DLLPRIVATE OUString GetNegFormatString( const OUString& sFormatStrg, sal_Bool & bFound );
BASIC_DLLPRIVATE OUString Get0FormatString( const OUString& sFormatStrg, sal_Bool & bFound );
BASIC_DLLPRIVATE OUString GetNullFormatString( const OUString& sFormatStrg, sal_Bool & bFound );
BASIC_DLLPRIVATE OUString GetPosFormatString( const OUString& sFormatStrg, bool & bFound );
BASIC_DLLPRIVATE OUString GetNegFormatString( const OUString& sFormatStrg, bool & bFound );
BASIC_DLLPRIVATE OUString Get0FormatString( const OUString& sFormatStrg, bool & bFound );
BASIC_DLLPRIVATE OUString GetNullFormatString( const OUString& sFormatStrg, bool & bFound );
BASIC_DLLPRIVATE short AnalyseFormatString( const OUString& sFormatStrg,
short& nNoOfDigitsLeft, short& nNoOfDigitsRight,
short& nNoOfOptionalDigitsLeft,
short& nNoOfExponentDigits,
short& nNoOfOptionalExponentDigits,
sal_Bool& bPercent, sal_Bool& bCurrency, sal_Bool& bScientific,
sal_Bool& bGenerateThousandSeparator,
bool& bPercent, bool& bCurrency, bool& bScientific,
bool& bGenerateThousandSeparator,
short& nMultipleThousandSeparators );
BASIC_DLLPRIVATE void ScanFormatString( double dNumber, const OUString& sFormatStrg,
OUString& sReturnStrg, sal_Bool bCreateSign );
OUString& sReturnStrg, bool bCreateSign );
//*** Data ***
sal_Unicode cDecPoint; // sign for the decimal point
......
......@@ -50,7 +50,7 @@ namespace vba {
*/
BASIC_DLLPUBLIC void lockControllersOfAllDocuments(
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxModel,
sal_Bool bLockControllers );
bool bLockControllers );
......@@ -71,7 +71,7 @@ BASIC_DLLPUBLIC void lockControllersOfAllDocuments(
*/
BASIC_DLLPUBLIC void enableContainerWindowsOfAllDocuments(
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxModel,
sal_Bool bEnableWindows );
bool bEnableWindows );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment