[Libreoffice-commits] core.git: 3 commits - filter/source i18nutil/source include/i18nutil include/tools sfx2/source sw/source tools/source UnoControls/inc UnoControls/source
Stephan Bergmann
sbergman at redhat.com
Tue Feb 18 08:18:54 CET 2014
UnoControls/inc/basecontrol.hxx | 6 -
UnoControls/source/base/basecontrol.cxx | 12 +--
UnoControls/source/controls/OConnectionPointHelper.cxx | 10 +-
UnoControls/source/controls/framecontrol.cxx | 8 +-
UnoControls/source/controls/progressbar.cxx | 4 -
UnoControls/source/controls/progressmonitor.cxx | 26 +++---
UnoControls/source/inc/OConnectionPointHelper.hxx | 2
UnoControls/source/inc/progressbar.hxx | 4 -
UnoControls/source/inc/progressmonitor.hxx | 6 -
filter/source/msfilter/svdfppt.cxx | 6 -
i18nutil/source/utility/casefolding.cxx | 2
i18nutil/source/utility/unicode.cxx | 4 -
i18nutil/source/utility/widthfolding.cxx | 10 +-
include/i18nutil/unicode.hxx | 18 ++--
include/i18nutil/widthfolding.hxx | 4 -
include/tools/bigint.hxx | 40 +++++-----
include/tools/ref.hxx | 4 -
include/tools/rtti.hxx | 18 ++--
include/tools/stream.hxx | 2
sfx2/source/appl/lnkbase2.cxx | 2
sw/source/core/docnode/swbaslnk.cxx | 2
tools/source/generic/bigint.cxx | 66 ++++++++---------
22 files changed, 128 insertions(+), 128 deletions(-)
New commits:
commit 736b3970e7a49e0b11997602703852a7a5c0fdc3
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Feb 18 07:20:00 2014 +0100
i18nutil: sal_Bool -> bool
Change-Id: Ic4a198d737692734ae3fbc096f370a3aa0667c5b
diff --git a/i18nutil/source/utility/casefolding.cxx b/i18nutil/source/utility/casefolding.cxx
index c0f58d3..cbe7ea9 100644
--- a/i18nutil/source/utility/casefolding.cxx
+++ b/i18nutil/source/utility/casefolding.cxx
@@ -108,7 +108,7 @@ Mapping& casefolding::getValue(const sal_Unicode* str, sal_Int32 pos, sal_Int32
return dummy;
}
-inline sal_Bool SAL_CALL
+inline bool SAL_CALL
is_ja_voice_sound_mark(sal_Unicode& current, sal_Unicode next)
{
sal_Unicode c = 0;
diff --git a/i18nutil/source/utility/unicode.cxx b/i18nutil/source/utility/unicode.cxx
index ff92805..edea198 100644
--- a/i18nutil/source/utility/unicode.cxx
+++ b/i18nutil/source/utility/unicode.cxx
@@ -378,7 +378,7 @@ unicode::getUnicodeDirection( const sal_Unicode ch ) {
bit(UnicodeType::PARAGRAPH_SEPARATOR)
#define IsType(func, mask) \
-sal_Bool SAL_CALL func( const sal_Unicode ch) {\
+bool SAL_CALL func( const sal_Unicode ch) {\
return (bit(getUnicodeType(ch)) & (mask)) != 0;\
}
@@ -389,7 +389,7 @@ IsType(unicode::isSpace, SPACEMASK)
#define CONTROLSPACE bit(0x09)|bit(0x0a)|bit(0x0b)|bit(0x0c)|bit(0x0d)|\
bit(0x1c)|bit(0x1d)|bit(0x1e)|bit(0x1f)
-sal_Bool SAL_CALL unicode::isWhiteSpace( const sal_Unicode ch) {
+bool SAL_CALL unicode::isWhiteSpace( const sal_Unicode ch) {
return (ch != 0xa0 && isSpace(ch)) || (ch <= 0x1F && (bit(ch) & (CONTROLSPACE)));
}
diff --git a/i18nutil/source/utility/widthfolding.cxx b/i18nutil/source/utility/widthfolding.cxx
index a7ecb98..2d3fcb1 100644
--- a/i18nutil/source/utility/widthfolding.cxx
+++ b/i18nutil/source/utility/widthfolding.cxx
@@ -41,7 +41,7 @@ sal_Unicode widthfolding::decompose_ja_voiced_sound_marksChar2Char (sal_Unicode
/**
* Decompose Japanese specific voiced and semi-voiced sound marks.
*/
-OUString widthfolding::decompose_ja_voiced_sound_marks (const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset, sal_Bool useOffset )
+OUString widthfolding::decompose_ja_voiced_sound_marks (const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset, bool useOffset )
{
// Create a string buffer which can hold nCount * 2 + 1 characters.
// Its size may become double of nCount.
@@ -103,7 +103,7 @@ oneToOneMapping& widthfolding::getfull2halfTable(void)
/**
* Compose Japanese specific voiced and semi-voiced sound marks.
*/
-OUString widthfolding::compose_ja_voiced_sound_marks (const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset, sal_Bool useOffset, sal_Int32 nFlags )
+OUString widthfolding::compose_ja_voiced_sound_marks (const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset, bool useOffset, sal_Int32 nFlags )
{
// Create a string buffer which can hold nCount + 1 characters.
// Its size may become equal to nCount or smaller.
@@ -157,14 +157,14 @@ OUString widthfolding::compose_ja_voiced_sound_marks (const OUString& inStr, sal
// 0 addresses a code point regarding 0x3099 or 0x309b (voiced sound mark),
// 1 is 0x309a or 0x309c (semi-voiced sound mark)
int i = int(previousChar - 0x3040); // i acts as an index of array
- sal_Bool bCompose = sal_False;
+ bool bCompose = false;
if (0 <= i && i <= (0x30ff - 0x3040) && composition_table[i][j])
- bCompose = sal_True;
+ bCompose = true;
// not to use combined KATAKANA LETTER VU
if ( previousChar == 0x30a6 && (nFlags & WIDTHFOLDNIG_DONT_USE_COMBINED_VU) )
- bCompose = sal_False;
+ bCompose = false;
if( bCompose ){
if (useOffset) {
diff --git a/include/i18nutil/unicode.hxx b/include/i18nutil/unicode.hxx
index e321039..64aa2a9 100644
--- a/include/i18nutil/unicode.hxx
+++ b/include/i18nutil/unicode.hxx
@@ -41,15 +41,15 @@ public:
static sal_Unicode SAL_CALL getUnicodeScriptStart(com::sun::star::i18n::UnicodeScript type);
static sal_Unicode SAL_CALL getUnicodeScriptEnd(com::sun::star::i18n::UnicodeScript type);
static sal_uInt8 SAL_CALL getUnicodeDirection( const sal_Unicode ch );
- static sal_Bool SAL_CALL isUpper( const sal_Unicode ch);
- static sal_Bool SAL_CALL isLower( const sal_Unicode ch);
- static sal_Bool SAL_CALL isDigit( const sal_Unicode ch);
- static sal_Bool SAL_CALL isControl( const sal_Unicode ch);
- static sal_Bool SAL_CALL isPrint( const sal_Unicode ch);
- static sal_Bool SAL_CALL isAlpha( const sal_Unicode ch);
- static sal_Bool SAL_CALL isSpace( const sal_Unicode ch);
- static sal_Bool SAL_CALL isWhiteSpace( const sal_Unicode ch);
- static sal_Bool SAL_CALL isAlphaDigit( const sal_Unicode ch);
+ static bool SAL_CALL isUpper( const sal_Unicode ch);
+ static bool SAL_CALL isLower( const sal_Unicode ch);
+ static bool SAL_CALL isDigit( const sal_Unicode ch);
+ static bool SAL_CALL isControl( const sal_Unicode ch);
+ static bool SAL_CALL isPrint( const sal_Unicode ch);
+ static bool SAL_CALL isAlpha( const sal_Unicode ch);
+ static bool SAL_CALL isSpace( const sal_Unicode ch);
+ static bool SAL_CALL isWhiteSpace( const sal_Unicode ch);
+ static bool SAL_CALL isAlphaDigit( const sal_Unicode ch);
//Map an ISO 15924 script code to Latin/Asian/Complex/Weak
static sal_Int16 SAL_CALL getScriptClassFromUScriptCode(UScriptCode eScript);
diff --git a/include/i18nutil/widthfolding.hxx b/include/i18nutil/widthfolding.hxx
index ccd1a1b..4987ffd 100644
--- a/include/i18nutil/widthfolding.hxx
+++ b/include/i18nutil/widthfolding.hxx
@@ -40,9 +40,9 @@ public:
static oneToOneMapping& getfullKana2halfKanaTable();
static oneToOneMapping& gethalfKana2fullKanaTable();
- static OUString decompose_ja_voiced_sound_marks(const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset, sal_Bool useOffset);
+ static OUString decompose_ja_voiced_sound_marks(const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset, bool useOffset);
static sal_Unicode decompose_ja_voiced_sound_marksChar2Char (sal_Unicode inChar);
- static OUString compose_ja_voiced_sound_marks(const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset, sal_Bool useOffset, sal_Int32 nFlags = 0 );
+ static OUString compose_ja_voiced_sound_marks(const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset, bool useOffset, sal_Int32 nFlags = 0 );
static sal_Unicode getCompositionChar(sal_Unicode c1, sal_Unicode c2);
};
commit 8bcb8b187e157ddcf69943a070f29ad070f22f9a
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Feb 17 23:15:43 2014 +0100
UnoControls: sal_Bool -> bool
Change-Id: Ic548cf07fe115c101771999a0dc8d370e57cd3ab
diff --git a/UnoControls/inc/basecontrol.hxx b/UnoControls/inc/basecontrol.hxx
index 0bc7e0a..be90e9d 100644
--- a/UnoControls/inc/basecontrol.hxx
+++ b/UnoControls/inc/basecontrol.hxx
@@ -1233,9 +1233,9 @@ private:
sal_Int32 m_nY ;
sal_Int32 m_nWidth ; // ... and size of window
sal_Int32 m_nHeight ;
- sal_Bool m_bVisible ; // Some state flags
- sal_Bool m_bInDesignMode ;
- sal_Bool m_bEnable ;
+ bool m_bVisible ; // Some state flags
+ bool m_bInDesignMode ;
+ bool m_bEnable ;
}; // class BaseControl
diff --git a/UnoControls/source/base/basecontrol.cxx b/UnoControls/source/base/basecontrol.cxx
index 08f4f66..4659495 100644
--- a/UnoControls/source/base/basecontrol.cxx
+++ b/UnoControls/source/base/basecontrol.cxx
@@ -47,9 +47,9 @@ namespace unocontrols{
#define DEFAULT_Y 0
#define DEFAULT_WIDTH 100
#define DEFAULT_HEIGHT 100
-#define DEFAULT_VISIBLE sal_False
-#define DEFAULT_INDESIGNMODE sal_False
-#define DEFAULT_ENABLE sal_True
+#define DEFAULT_VISIBLE false
+#define DEFAULT_INDESIGNMODE false
+#define DEFAULT_ENABLE true
//____________________________________________________________________________________________________________
// construct/destruct
@@ -326,7 +326,7 @@ void SAL_CALL BaseControl::createPeer( const Reference< XToolkit >& xToo
// use method "BaseControl::getWindowDescriptor()" fot change window attributes !!!
WindowDescriptor* pDescriptor = impl_getWindowDescriptor( xParentPeer );
- if ( m_bVisible == sal_True )
+ if ( m_bVisible )
{
pDescriptor->WindowAttributes |= WindowAttribute::SHOW ;
}
@@ -689,14 +689,14 @@ sal_Bool SAL_CALL BaseControl::setGraphics( const Reference< XGraphics >& xDevic
// - set the graphics for an view
// - in this class exist 2 graphics-member ... one for peer[_xGraphicsPeer] and one for view[_xGraphicsView]
// - they are used by "windowPaint() and draw()", forwarded to "paint ()"
- sal_Bool bReturn = sal_False ;
+ bool bReturn = false ;
if ( xDevice.is() )
{
// Ready for multithreading
MutexGuard aGuard( m_aMutex );
m_xGraphicsView = xDevice ;
- bReturn = sal_True ;
+ bReturn = true ;
}
return bReturn ;
diff --git a/UnoControls/source/controls/OConnectionPointHelper.cxx b/UnoControls/source/controls/OConnectionPointHelper.cxx
index af4410a..9759347 100644
--- a/UnoControls/source/controls/OConnectionPointHelper.cxx
+++ b/UnoControls/source/controls/OConnectionPointHelper.cxx
@@ -113,7 +113,7 @@ Type SAL_CALL OConnectionPointHelper::getConnectionType() throw( RuntimeExceptio
MutexGuard aGuard( m_aSharedMutex );
// Set default return value, if method failed.
- if ( impl_LockContainer() == sal_False )
+ if ( !impl_LockContainer() )
{
// Container not exist! Its an runtime error.
throw RuntimeException();
@@ -163,7 +163,7 @@ void SAL_CALL OConnectionPointHelper::advise( const Reference< XInterface >& xLi
// You can add a listener more then one time at XConnectionPointContainer, but here only one ...
// Operation is permitted only, if reference to container is valid!
- if ( impl_LockContainer() == sal_False )
+ if ( !impl_LockContainer() )
{
// Container not exist! Its an runtime error.
throw RuntimeException();
@@ -183,7 +183,7 @@ void SAL_CALL OConnectionPointHelper::unadvise( const Reference< XInterface >& x
// Ready for multithreading
MutexGuard aGuard( m_aSharedMutex );
// Operation is permitted only, if reference to container is valid!
- if ( impl_LockContainer() == sal_False )
+ if ( !impl_LockContainer() )
{
// Container not exist! Its an runtime error.
throw RuntimeException();
@@ -204,7 +204,7 @@ Sequence< Reference< XInterface > > SAL_CALL OConnectionPointHelper::getConnecti
// Ready for multithreading
MutexGuard aGuard( m_aSharedMutex );
// Operation is permitted only, if reference to container is valid!
- if ( impl_LockContainer() == sal_False )
+ if ( !impl_LockContainer() )
{
// Container not exist! Its an runtime error.
throw RuntimeException();
@@ -230,7 +230,7 @@ Sequence< Reference< XInterface > > SAL_CALL OConnectionPointHelper::getConnecti
// private method
//______________________________________________________________________________________________________________
-sal_Bool OConnectionPointHelper::impl_LockContainer()
+bool OConnectionPointHelper::impl_LockContainer()
{
// Convert weakreference to hard uno3-reference and return state.
// If this reference different from NULL, there exist a hard reference to container. Container-instance can't be destroyed.
diff --git a/UnoControls/source/controls/framecontrol.cxx b/UnoControls/source/controls/framecontrol.cxx
index 8c9601b..fb12538 100644
--- a/UnoControls/source/controls/framecontrol.cxx
+++ b/UnoControls/source/controls/framecontrol.cxx
@@ -314,21 +314,21 @@ sal_Bool FrameControl::convertFastPropertyValue( Any& rConvertedVa
sal_Int32 nHandle ,
const Any& rValue ) throw( IllegalArgumentException )
{
- sal_Bool bReturn = sal_False ;
+ bool bReturn = false ;
switch (nHandle)
{
case PROPERTYHANDLE_COMPONENTURL : rConvertedValue = rValue ;
rOldValue <<= m_sComponentURL ;
- bReturn = sal_True ;
+ bReturn = true ;
break ;
case PROPERTYHANDLE_LOADERARGUMENTS : rConvertedValue = rValue ;
rOldValue <<= m_seqLoaderArguments ;
- bReturn = sal_True ;
+ bReturn = true ;
break ;
}
- if ( bReturn == sal_False )
+ if ( !bReturn )
{
throw IllegalArgumentException();
}
diff --git a/UnoControls/source/controls/progressbar.cxx b/UnoControls/source/controls/progressbar.cxx
index 8df5d9a..1fc1aad 100644
--- a/UnoControls/source/controls/progressbar.cxx
+++ b/UnoControls/source/controls/progressbar.cxx
@@ -442,14 +442,14 @@ void ProgressBar::impl_recalcRange ()
if( nWindowWidth > nWindowHeight )
{
- m_bHorizontal = sal_True ;
+ m_bHorizontal = true ;
fBlockHeight = (nWindowHeight-(2*PROGRESSBAR_FREESPACE)) ;
fBlockWidth = fBlockHeight ;
fMaxBlocks = nWindowWidth/(fBlockWidth+PROGRESSBAR_FREESPACE);
}
else
{
- m_bHorizontal = sal_False ;
+ m_bHorizontal = false ;
fBlockWidth = (nWindowWidth-(2*PROGRESSBAR_FREESPACE)) ;
fBlockHeight = fBlockWidth ;
fMaxBlocks = nWindowHeight/(fBlockHeight+PROGRESSBAR_FREESPACE);
diff --git a/UnoControls/source/controls/progressmonitor.cxx b/UnoControls/source/controls/progressmonitor.cxx
index c288632..68738ac 100644
--- a/UnoControls/source/controls/progressmonitor.cxx
+++ b/UnoControls/source/controls/progressmonitor.cxx
@@ -836,7 +836,7 @@ void ProgressMonitor::impl_cleanMemory ()
}
// private method
-IMPL_TextlistItem* ProgressMonitor::impl_searchTopic ( const OUString& rTopic, sal_Bool bbeforeProgress )
+IMPL_TextlistItem* ProgressMonitor::impl_searchTopic ( const OUString& rTopic, bool bbeforeProgress )
{
// Get right textlist for following operations.
::std::vector< IMPL_TextlistItem* >* pTextList ;
@@ -844,7 +844,7 @@ IMPL_TextlistItem* ProgressMonitor::impl_searchTopic ( const OUString& rTopic, s
// Ready for multithreading
ClearableMutexGuard aGuard ( m_aMutex ) ;
- if ( bbeforeProgress == sal_True )
+ if ( bbeforeProgress )
{
pTextList = &maTextlist_Top ;
}
@@ -879,36 +879,36 @@ IMPL_TextlistItem* ProgressMonitor::impl_searchTopic ( const OUString& rTopic, s
#ifdef DBG_UTIL
// addText, updateText
-sal_Bool ProgressMonitor::impl_debug_checkParameter (
+bool ProgressMonitor::impl_debug_checkParameter (
const OUString& rTopic,
const OUString& rText,
- sal_Bool /*bbeforeProgress*/
+ bool /*bbeforeProgress*/
) {
// Check "rTopic"
- if ( &rTopic == NULL ) return sal_False ; // NULL-pointer for reference ???!!!
- if ( rTopic.isEmpty() ) return sal_False ; // ""
+ if ( &rTopic == NULL ) return false ; // NULL-pointer for reference ???!!!
+ if ( rTopic.isEmpty() ) return false ; // ""
// Check "rText"
- if ( &rText == NULL ) return sal_False ; // NULL-pointer for reference ???!!!
- if ( rText.isEmpty() ) return sal_False ; // ""
+ if ( &rText == NULL ) return false ; // NULL-pointer for reference ???!!!
+ if ( rText.isEmpty() ) return false ; // ""
// "bbeforeProgress" is valid in everyway!
// Parameter OK ... return sal_True.
- return sal_True ;
+ return true ;
}
// removeText
-sal_Bool ProgressMonitor::impl_debug_checkParameter ( const OUString& rTopic, sal_Bool /*bbeforeProgress*/ )
+bool ProgressMonitor::impl_debug_checkParameter ( const OUString& rTopic, bool /*bbeforeProgress*/ )
{
// Check "rTopic"
- if ( &rTopic == NULL ) return sal_False ; // NULL-pointer for reference ???!!!
- if ( rTopic.isEmpty() ) return sal_False ; // ""
+ if ( &rTopic == NULL ) return false ; // NULL-pointer for reference ???!!!
+ if ( rTopic.isEmpty() ) return false ; // ""
// "bbeforeProgress" is valid in everyway!
// Parameter OK ... return sal_True.
- return sal_True ;
+ return true ;
}
#endif // #ifdef DBG_UTIL
diff --git a/UnoControls/source/inc/OConnectionPointHelper.hxx b/UnoControls/source/inc/OConnectionPointHelper.hxx
index 2307e1e..2d10bd8 100644
--- a/UnoControls/source/inc/OConnectionPointHelper.hxx
+++ b/UnoControls/source/inc/OConnectionPointHelper.hxx
@@ -243,7 +243,7 @@ private:
@onerror
*/
- sal_Bool impl_LockContainer();
+ bool impl_LockContainer();
/**_________________________________________________________________________________________________________
@short
diff --git a/UnoControls/source/inc/progressbar.hxx b/UnoControls/source/inc/progressbar.hxx
index f67e5b3..c901429 100644
--- a/UnoControls/source/inc/progressbar.hxx
+++ b/UnoControls/source/inc/progressbar.hxx
@@ -32,7 +32,7 @@
namespace unocontrols{
#define PROGRESSBAR_FREESPACE 4
-#define PROGRESSBAR_DEFAULT_HORIZONTAL sal_True
+#define PROGRESSBAR_DEFAULT_HORIZONTAL true
#define PROGRESSBAR_DEFAULT_BLOCKDIMENSION Size(1,1)
#define PROGRESSBAR_DEFAULT_BACKGROUNDCOLOR TRGB_COLORDATA( 0x00, 0xC0, 0xC0, 0xC0 ) // lightgray
#define PROGRESSBAR_DEFAULT_FOREGROUNDCOLOR TRGB_COLORDATA( 0x00, 0x00, 0x00, 0x80 ) // blue
@@ -406,7 +406,7 @@ protected:
private:
- sal_Bool m_bHorizontal ; // orientation for steps [true=horizontal/false=vertikal]
+ bool m_bHorizontal ; // orientation for steps [true=horizontal/false=vertikal]
::com::sun::star::awt::Size m_aBlockSize ; // width and height of a block [>=0,0]
sal_Int32 m_nForegroundColor ; // (alpha,r,g,b)
sal_Int32 m_nBackgroundColor ; // (alpha,r,g,b)
diff --git a/UnoControls/source/inc/progressmonitor.hxx b/UnoControls/source/inc/progressmonitor.hxx
index 3779fe6..85a16fd 100644
--- a/UnoControls/source/inc/progressmonitor.hxx
+++ b/UnoControls/source/inc/progressmonitor.hxx
@@ -719,7 +719,7 @@ private:
@onerror -
*/
- IMPL_TextlistItem* impl_searchTopic( const OUString& sTopic , sal_Bool bbeforeProgress );
+ IMPL_TextlistItem* impl_searchTopic( const OUString& sTopic , bool bbeforeProgress );
//____________________________________________________________________________________________________________
// debug methods
@@ -742,8 +742,8 @@ private:
#ifdef DBG_UTIL
- sal_Bool impl_debug_checkParameter( const OUString& sTopic, const OUString& sText, sal_Bool bbeforeProgress ); // addText, updateText
- sal_Bool impl_debug_checkParameter( const OUString& rTopic, sal_Bool bbeforeProgress ); // removeText
+ bool impl_debug_checkParameter( const OUString& sTopic, const OUString& sText, bool bbeforeProgress ); // addText, updateText
+ bool impl_debug_checkParameter( const OUString& rTopic, bool bbeforeProgress ); // removeText
#endif
//____________________________________________________________________________________________________________
commit 95401d5898412bc74892f0c5325fb614044d4bf1
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Feb 17 23:09:11 2014 +0100
tools: sal_Bool -> bool
Change-Id: I3aad235d92b3972b44199294c0f3de65ad57f450
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 6d17397..3c884cd 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -811,9 +811,9 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi
if ( pRet )
{
sal_Bool bDeleteSource = aTextObj.GetOEPlaceHolderAtom() != 0;
- if ( bDeleteSource && ( pRet->ISA( SdrGrafObj ) == sal_False ) // we are not allowed to get
- && ( pRet->ISA( SdrObjGroup ) == sal_False ) // grouped placeholder objects
- && ( pRet->ISA( SdrOle2Obj ) == sal_False ) )
+ if ( bDeleteSource && !pRet->ISA( SdrGrafObj ) // we are not allowed to get
+ && !pRet->ISA( SdrObjGroup ) // grouped placeholder objects
+ && !pRet->ISA( SdrOle2Obj ) )
SdrObject::Free( pRet );
}
sal_uInt32 nTextFlags = aTextObj.GetTextFlags();
diff --git a/include/tools/bigint.hxx b/include/tools/bigint.hxx
index f563803..3b8a982 100644
--- a/include/tools/bigint.hxx
+++ b/include/tools/bigint.hxx
@@ -41,7 +41,7 @@ private:
long nVal;
unsigned short nNum[MAX_DIGITS];
sal_uInt8 nLen : 5; // current length
- sal_Bool bIsNeg : 1, // Is Sign negative?
+ bool bIsNeg : 1, // Is Sign negative?
bIsBig : 1, // sal_True == BigInt
bIsSet : 1; // Not "Null" (not "not 0")
@@ -123,36 +123,36 @@ public:
inline BigInt::BigInt()
{
- bIsSet = sal_False;
- bIsBig = sal_False;
+ bIsSet = false;
+ bIsBig = false;
nVal = 0;
}
inline BigInt::BigInt( short nValue )
{
- bIsSet = sal_True;
- bIsBig = sal_False;
+ bIsSet = true;
+ bIsBig = false;
nVal = nValue;
}
inline BigInt::BigInt( long nValue )
{
- bIsSet = sal_True;
- bIsBig = sal_False;
+ bIsSet = true;
+ bIsBig = false;
nVal = nValue;
}
inline BigInt::BigInt( int nValue )
{
- bIsSet = sal_True;
- bIsBig = sal_False;
+ bIsSet = true;
+ bIsBig = false;
nVal = nValue;
}
inline BigInt::BigInt( sal_uInt16 nValue )
{
- bIsSet = sal_True;
- bIsBig = sal_False;
+ bIsSet = true;
+ bIsBig = false;
nVal = nValue;
}
@@ -190,8 +190,8 @@ inline BigInt::operator sal_uInt16() const
inline BigInt& BigInt::operator =( const short nValue )
{
- bIsSet = sal_True;
- bIsBig = sal_False;
+ bIsSet = true;
+ bIsBig = false;
nVal = nValue;
return *this;
@@ -199,8 +199,8 @@ inline BigInt& BigInt::operator =( const short nValue )
inline BigInt& BigInt::operator =( const long nValue )
{
- bIsSet = sal_True;
- bIsBig = sal_False;
+ bIsSet = true;
+ bIsBig = false;
nVal = nValue;
return *this;
@@ -208,8 +208,8 @@ inline BigInt& BigInt::operator =( const long nValue )
inline BigInt& BigInt::operator =( const int nValue )
{
- bIsSet = sal_True;
- bIsBig = sal_False;
+ bIsSet = true;
+ bIsBig = false;
nVal = nValue;
return *this;
@@ -217,8 +217,8 @@ inline BigInt& BigInt::operator =( const int nValue )
inline BigInt& BigInt::operator =( const sal_uInt16 nValue )
{
- bIsSet = sal_True;
- bIsBig = sal_False;
+ bIsSet = true;
+ bIsBig = false;
nVal = nValue;
return *this;
@@ -251,7 +251,7 @@ inline bool BigInt::IsOne() const
inline void BigInt::Abs()
{
if ( bIsBig )
- bIsNeg = sal_False;
+ bIsNeg = false;
else if ( nVal < 0 )
nVal = -nVal;
}
diff --git a/include/tools/ref.hxx b/include/tools/ref.hxx
index 254b1eb..bdc055b 100644
--- a/include/tools/ref.hxx
+++ b/include/tools/ref.hxx
@@ -61,7 +61,7 @@ public: \
inline ~ClassName##Ref(); \
inline ClassName##Ref & operator = ( const ClassName##Ref & rObj ); \
inline ClassName##Ref & operator = ( ClassName * pObj ); \
- inline sal_Bool Is() const { return pObj != NULL; } \
+ inline bool Is() const { return pObj != NULL; } \
inline ClassName * operator & () const { return pObj; } \
inline ClassName * operator -> () const { return pObj; } \
inline ClassName & operator * () const { return *pObj; } \
@@ -234,7 +234,7 @@ public: \
inline void Clear() { _xHdl.Clear(); } \
inline ClassName##Weak& operator = ( ClassName * pObj ) { \
_xHdl = pObj ? pObj->GetHdl() : 0; return *this; } \
- inline sal_Bool Is() const { \
+ inline bool Is() const { \
return _xHdl.Is() && _xHdl->GetObj(); } \
inline ClassName * operator & () const { \
return (ClassName*) ( _xHdl.Is() ? _xHdl->GetObj() : 0 ); } \
diff --git a/include/tools/rtti.hxx b/include/tools/rtti.hxx
index 81cabe5..3e2676b 100644
--- a/include/tools/rtti.hxx
+++ b/include/tools/rtti.hxx
@@ -28,36 +28,36 @@ typedef void* (*TypeId)();
#define TYPEINFO() \
static void* CreateType(); \
static TypeId StaticType(); \
- static sal_Bool IsOf( TypeId aSameOrSuperType ); \
+ static bool IsOf( TypeId aSameOrSuperType ); \
virtual TypeId Type() const; \
- virtual sal_Bool IsA( TypeId aSameOrSuperType ) const
+ virtual bool IsA( TypeId aSameOrSuperType ) const
#define TYPEINFO_VISIBILITY(visibility) \
visibility static void* CreateType(); \
visibility static TypeId StaticType(); \
- visibility static sal_Bool IsOf( TypeId aSameOrSuperType ); \
+ visibility static bool IsOf( TypeId aSameOrSuperType ); \
visibility virtual TypeId Type() const; \
- visibility virtual sal_Bool IsA( TypeId aSameOrSuperType ) const
+ visibility virtual bool IsA( TypeId aSameOrSuperType ) const
#define TYPEINIT_FACTORY(sType, Factory ) \
void* sType::CreateType() { return Factory; } \
TypeId sType::StaticType() { return &CreateType; } \
TypeId sType::Type() const { return &CreateType; } \
- sal_Bool sType::IsOf( TypeId aSameOrSuperType ) \
+ bool sType::IsOf( TypeId aSameOrSuperType ) \
{ \
if ( aSameOrSuperType == StaticType() ) \
- return sal_True
+ return true
#define STATICTYPE(sType) (sType::StaticType())
#define SUPERTYPE(sSuper) \
if ( sSuper::IsOf(aSameOrSuperType ) ) \
- return sal_True
+ return true
#define TYPEINIT_END(sType) \
- return sal_False; \
+ return false; \
} \
- sal_Bool sType::IsA( TypeId aSameOrSuperType ) const \
+ bool sType::IsA( TypeId aSameOrSuperType ) const \
{ return IsOf( aSameOrSuperType ); }
#define TYPEINIT0_FACTORY(sType, Factory) \
diff --git a/include/tools/stream.hxx b/include/tools/stream.hxx
index 546cf99..16472b7 100644
--- a/include/tools/stream.hxx
+++ b/include/tools/stream.hxx
@@ -326,7 +326,7 @@ public:
SvStream& WriteStream( SvStream& rStream );
SvStream& WriteBool( bool b )
- { return WriteUChar(static_cast< sal_Bool >(b)); }
+ { return WriteUChar(static_cast<unsigned char>(b)); }
SvStream& WriteSChar( signed char nChar );
SvStream& WriteChar( char nChar );
SvStream& WriteUChar( unsigned char nChar );
diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx
index 3163deb..e203472 100644
--- a/sfx2/source/appl/lnkbase2.cxx
+++ b/sfx2/source/appl/lnkbase2.cxx
@@ -443,7 +443,7 @@ void SvBaseLink::Edit( Window* pParent, const Link& rEndEditHdl )
{
pImpl->m_pParentWin = pParent;
pImpl->m_aEndEditLink = rEndEditHdl;
- pImpl->m_bIsConnect = ( xObj.Is() != sal_False );
+ pImpl->m_bIsConnect = xObj.Is();
if( !pImpl->m_bIsConnect )
_GetRealObject( xObj.Is() );
diff --git a/sw/source/core/docnode/swbaslnk.cxx b/sw/source/core/docnode/swbaslnk.cxx
index b2cf46b..0bc7636 100644
--- a/sw/source/core/docnode/swbaslnk.cxx
+++ b/sw/source/core/docnode/swbaslnk.cxx
@@ -72,7 +72,7 @@ static void lcl_CallModify( SwGrfNode& rGrfNd, SfxPoolItem& rItem )
if( pLast ) // Were we able to jump to the beginning?
{
do {
- if( (0 == n) != ( 0 != pLast->ISA( SwCntntFrm )) )
+ if( (0 == n) != pLast->ISA( SwCntntFrm ) )
pLast->ModifyNotification( &rItem, &rItem );
} while( 0 != ( pLast = ++aIter ));
}
diff --git a/tools/source/generic/bigint.cxx b/tools/source/generic/bigint.cxx
index 0c95ae6..6576cfb 100644
--- a/tools/source/generic/bigint.cxx
+++ b/tools/source/generic/bigint.cxx
@@ -53,14 +53,14 @@ void BigInt::MakeBigInt( const BigInt& rVal )
long nTmp = rVal.nVal;
nVal = rVal.nVal;
- bIsBig = sal_True;
+ bIsBig = true;
if ( nTmp < 0 )
{
- bIsNeg = sal_True;
+ bIsNeg = true;
nTmp = -nTmp;
}
else
- bIsNeg = sal_False;
+ bIsNeg = false;
nNum[0] = (sal_uInt16)(nTmp & 0xffffL);
nNum[1] = (sal_uInt16)(nTmp >> 16);
@@ -87,7 +87,7 @@ void BigInt::Normalize()
else
nVal = ((long)nNum[1] << 16) + nNum[0];
- bIsBig = sal_False;
+ bIsBig = false;
if ( bIsNeg )
nVal = -nVal;
@@ -119,7 +119,7 @@ void BigInt::Mult( const BigInt &rVal, sal_uInt16 nMul )
else
nLen = rVal.nLen;
- bIsBig = sal_True;
+ bIsBig = true;
bIsNeg = rVal.bIsNeg;
}
@@ -194,20 +194,20 @@ void BigInt::AddLong( BigInt& rB, BigInt& rErg )
// Set length and sign
rErg.nLen = len;
rErg.bIsNeg = bIsNeg && rB.bIsNeg;
- rErg.bIsBig = sal_True;
+ rErg.bIsBig = true;
}
// If one of the values is negative, perform substraction instead
else if (bIsNeg)
{
- bIsNeg = sal_False;
+ bIsNeg = false;
rB.SubLong(*this, rErg);
- bIsNeg = sal_True;
+ bIsNeg = true;
}
else
{
- rB.bIsNeg = sal_False;
+ rB.bIsNeg = false;
SubLong(rB, rErg);
- rB.bIsNeg = sal_True;
+ rB.bIsNeg = true;
}
}
@@ -262,22 +262,22 @@ void BigInt::SubLong( BigInt& rB, BigInt& rErg )
rErg.bIsNeg = !bIsNeg;
}
rErg.nLen = len;
- rErg.bIsBig = sal_True;
+ rErg.bIsBig = true;
}
// If one of the values is negative, perform addition instead
else if (bIsNeg)
{
- bIsNeg = sal_False;
+ bIsNeg = false;
AddLong(rB, rErg);
- bIsNeg = sal_True;
- rErg.bIsNeg = sal_True;
+ bIsNeg = true;
+ rErg.bIsNeg = true;
}
else
{
- rB.bIsNeg = sal_False;
+ rB.bIsNeg = false;
AddLong(rB, rErg);
- rB.bIsNeg = sal_True;
- rErg.bIsNeg = sal_False;
+ rB.bIsNeg = true;
+ rErg.bIsNeg = false;
}
}
@@ -287,7 +287,7 @@ void BigInt::MultLong( const BigInt& rB, BigInt& rErg ) const
sal_uInt32 nZ, k;
rErg.bIsNeg = bIsNeg != rB.bIsNeg;
- rErg.bIsBig = sal_True;
+ rErg.bIsBig = true;
rErg.nLen = nLen + rB.nLen;
for (i = 0; i < rErg.nLen; i++)
@@ -371,7 +371,7 @@ void BigInt::DivLong( const BigInt& rB, BigInt& rErg ) const
}
rErg.bIsNeg = bIsNeg != rB.bIsNeg;
- rErg.bIsBig = sal_True;
+ rErg.bIsBig = true;
rErg.nLen = nLen - rB.nLen + 1;
}
@@ -479,16 +479,16 @@ BigInt::BigInt( const BigInt& rBigInt )
else
{
bIsSet = rBigInt.bIsSet;
- bIsBig = sal_False;
+ bIsBig = false;
nVal = rBigInt.nVal;
}
}
BigInt::BigInt( const OUString& rString )
{
- bIsSet = sal_True;
- bIsNeg = sal_False;
- bIsBig = sal_False;
+ bIsSet = true;
+ bIsNeg = false;
+ bIsBig = false;
nVal = 0;
bool bNeg = false;
@@ -512,26 +512,26 @@ BigInt::BigInt( const OUString& rString )
BigInt::BigInt( double nValue )
{
- bIsSet = sal_True;
+ bIsSet = true;
if ( nValue < 0 )
{
nValue *= -1;
- bIsNeg = sal_True;
+ bIsNeg = true;
}
else
{
- bIsNeg = sal_False;
+ bIsNeg = false;
}
if ( nValue < 1 )
{
- bIsBig = sal_False;
+ bIsBig = false;
nVal = 0;
}
else
{
- bIsBig = sal_True;
+ bIsBig = true;
int i=0;
@@ -554,18 +554,18 @@ BigInt::BigInt( double nValue )
BigInt::BigInt( sal_uInt32 nValue )
{
- bIsSet = sal_True;
+ bIsSet = true;
if ( nValue & 0x80000000UL )
{
- bIsBig = sal_True;
- bIsNeg = sal_False;
+ bIsBig = true;
+ bIsNeg = false;
nNum[0] = (sal_uInt16)(nValue & 0xffffUL);
nNum[1] = (sal_uInt16)(nValue >> 16);
nLen = 2;
}
else
{
- bIsBig = sal_False;
+ bIsBig = false;
nVal = nValue;
}
}
@@ -657,7 +657,7 @@ BigInt& BigInt::operator=( const BigInt& rBigInt )
else
{
bIsSet = rBigInt.bIsSet;
- bIsBig = sal_False;
+ bIsBig = false;
nVal = rBigInt.nVal;
}
return *this;
More information about the Libreoffice-commits
mailing list