[Libreoffice-commits] core.git: 3 commits - avmedia/source connectivity/source embeddedobj/source embedserv/source extensions/source framework/inc framework/source include/cppuhelper include/toolkit include/ucbhelper pyuno/source sfx2/source stoc/source svl/source svtools/source svx/source toolkit/source ucbhelper/source ucb/source UnoControls/source
Stephan Bergmann
sbergman at redhat.com
Wed Jan 29 02:08:55 PST 2014
UnoControls/source/base/basecontrol.cxx | 2 -
avmedia/source/framework/soundhandler.cxx | 2 -
connectivity/source/drivers/odbc/OTools.cxx | 2 -
connectivity/source/drivers/postgresql/pq_baseresultset.cxx | 2 -
connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.cxx | 2 -
connectivity/source/drivers/postgresql/pq_preparedstatement.cxx | 2 -
connectivity/source/drivers/postgresql/pq_statement.cxx | 2 -
connectivity/source/drivers/postgresql/pq_updateableresultset.cxx | 2 -
connectivity/source/drivers/postgresql/pq_xbase.cxx | 2 -
connectivity/source/inc/odbc/OResultSet.hxx | 8 ++---
embeddedobj/source/commonembedding/miscobj.cxx | 2 -
embedserv/source/embed/servprov.cxx | 2 -
extensions/source/ole/servprov.cxx | 2 -
framework/inc/macros/xtypeprovider.hxx | 2 -
framework/source/fwe/classes/actiontriggercontainer.cxx | 2 -
framework/source/fwe/classes/actiontriggerpropertyset.cxx | 2 -
framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx | 2 -
framework/source/fwe/classes/rootactiontriggercontainer.cxx | 2 -
framework/source/services/frame.cxx | 2 -
include/cppuhelper/interfacecontainer.h | 6 +--
include/cppuhelper/typeprovider.hxx | 2 -
include/cppuhelper/weakref.hxx | 2 -
include/toolkit/helper/macros.hxx | 2 -
include/ucbhelper/macros.hxx | 2 -
pyuno/source/module/pyuno_adapter.cxx | 2 -
sfx2/source/dialog/backingcomp.cxx | 2 -
sfx2/source/doc/sfxbasemodel.cxx | 2 -
stoc/source/invocation/invocation.cxx | 2 -
svl/source/fsstor/fsstorage.cxx | 2 -
svl/source/fsstor/ostreamcontainer.cxx | 2 -
svtools/source/hatchwindow/hatchwindow.cxx | 2 -
svx/source/unodraw/unoshape.cxx | 4 +-
toolkit/source/awt/vclxmenu.cxx | 4 +-
toolkit/source/awt/vclxtopwindow.cxx | 4 +-
ucb/source/ucp/file/filid.cxx | 2 -
ucb/source/ucp/ftp/ftpcontentidentifier.cxx | 2 -
ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx | 2 -
ucbhelper/source/provider/contentidentifier.cxx | 2 -
ucbhelper/source/provider/interactionrequest.cxx | 16 +++++-----
39 files changed, 54 insertions(+), 54 deletions(-)
New commits:
commit 9038a3ef7c10aff868636715924cb9f97d648d80
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Jan 29 11:05:15 2014 +0100
cppuhelper: Let C++ inline functions return bool instead of sal_Bool
...to improve diagnosing misuses of boolean expressions in client code (cf.
compilerplugins/clang/implicitboolconversion.cxx). This change should be
transparent to client code.
Change-Id: Ibed63566266328f84432ad2019e58265d9d30fc3
diff --git a/include/cppuhelper/interfacecontainer.h b/include/cppuhelper/interfacecontainer.h
index 860529d..dd3f6a9 100644
--- a/include/cppuhelper/interfacecontainer.h
+++ b/include/cppuhelper/interfacecontainer.h
@@ -79,11 +79,11 @@ public:
*/
~OInterfaceIteratorHelper() SAL_THROW(());
- /** Return sal_True, if there are more elements in the iterator. */
- sal_Bool SAL_CALL hasMoreElements() const SAL_THROW(())
+ /** Return true, if there are more elements in the iterator. */
+ bool SAL_CALL hasMoreElements() const SAL_THROW(())
{ return nRemain != 0; }
/** Return the next element of the iterator. Calling this method if
- hasMoreElements() has returned sal_False, is an error. Cast the
+ hasMoreElements() has returned false, is an error. Cast the
returned pointer to the
*/
::com::sun::star::uno::XInterface * SAL_CALL next() SAL_THROW(());
diff --git a/include/cppuhelper/typeprovider.hxx b/include/cppuhelper/typeprovider.hxx
index c9f864d..b617483 100644
--- a/include/cppuhelper/typeprovider.hxx
+++ b/include/cppuhelper/typeprovider.hxx
@@ -204,7 +204,7 @@ public:
@param bUseEthernetAddress whether an ethernet mac address should be taken into account
*/
- inline OImplementationId( sal_Bool bUseEthernetAddress = sal_True ) SAL_THROW(())
+ inline OImplementationId( bool bUseEthernetAddress = true ) SAL_THROW(())
: _pSeq( 0 )
, _bUseEthernetAddress( bUseEthernetAddress )
{}
diff --git a/include/cppuhelper/weakref.hxx b/include/cppuhelper/weakref.hxx
index d9a7728..849196a 100644
--- a/include/cppuhelper/weakref.hxx
+++ b/include/cppuhelper/weakref.hxx
@@ -83,7 +83,7 @@ public:
@param rObj another weak ref
@return true, if both weak refs reference to the same object.
*/
- inline sal_Bool SAL_CALL operator == ( const WeakReferenceHelper & rObj ) const SAL_THROW(())
+ inline bool SAL_CALL operator == ( const WeakReferenceHelper & rObj ) const SAL_THROW(())
{ return (get() == rObj.get()); }
/** Gets a hard reference to the object.
commit 612dac063a144506b44f4ab2afa2c5cdf9d882b4
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Jan 29 11:04:49 2014 +0100
bool improvements
Change-Id: I0dc09b7a6ee2849bd0c2ffc31be45f81cd2c15ee
diff --git a/UnoControls/source/base/basecontrol.cxx b/UnoControls/source/base/basecontrol.cxx
index 9d07d28..08f4f66 100644
--- a/UnoControls/source/base/basecontrol.cxx
+++ b/UnoControls/source/base/basecontrol.cxx
@@ -182,7 +182,7 @@ Sequence< sal_Int8 > SAL_CALL BaseControl::getImplementationId() throw( RuntimeE
if ( pID == NULL )
{
// Create a new static ID ...
- static OImplementationId aID( sal_False );
+ static OImplementationId aID( false );
// ... and set his address to static pointer!
pID = &aID ;
}
diff --git a/avmedia/source/framework/soundhandler.cxx b/avmedia/source/framework/soundhandler.cxx
index f81df49..a1b0a83 100644
--- a/avmedia/source/framework/soundhandler.cxx
+++ b/avmedia/source/framework/soundhandler.cxx
@@ -85,7 +85,7 @@ css::uno::Sequence< sal_Int8 > SAL_CALL SoundHandler::getImplementationId() thro
if ( pID == NULL )
{
/* Create a new static ID ... */
- static ::cppu::OImplementationId aID( sal_False );
+ static ::cppu::OImplementationId aID( false );
/* ... and set his address to static pointer! */
pID = &aID ;
}
diff --git a/connectivity/source/drivers/postgresql/pq_baseresultset.cxx b/connectivity/source/drivers/postgresql/pq_baseresultset.cxx
index 1747909..594fe15 100644
--- a/connectivity/source/drivers/postgresql/pq_baseresultset.cxx
+++ b/connectivity/source/drivers/postgresql/pq_baseresultset.cxx
@@ -224,7 +224,7 @@ Sequence< sal_Int8> BaseResultSet::getImplementationId() throw( RuntimeException
MutexGuard guard( osl::Mutex::getGlobalMutex() );
if( ! pId )
{
- static cppu::OImplementationId id(sal_False);
+ static cppu::OImplementationId id(false);
pId = &id;
}
}
diff --git a/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.cxx b/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.cxx
index bc6a227..121aa7b 100644
--- a/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.cxx
+++ b/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.cxx
@@ -115,7 +115,7 @@ com::sun::star::uno::Sequence< sal_Int8> FakedUpdateableResultSet::getImplementa
MutexGuard guard( osl::Mutex::getGlobalMutex() );
if( ! pId )
{
- static cppu::OImplementationId id(sal_False);
+ static cppu::OImplementationId id(false);
pId = &id;
}
}
diff --git a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
index 23ef836..af99b4b 100644
--- a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
+++ b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
@@ -291,7 +291,7 @@ Sequence< sal_Int8> PreparedStatement::getImplementationId() throw ( RuntimeExce
MutexGuard guard( osl::Mutex::getGlobalMutex() );
if( ! pId )
{
- static cppu::OImplementationId id(sal_False);
+ static cppu::OImplementationId id(false);
pId = &id;
}
}
diff --git a/connectivity/source/drivers/postgresql/pq_statement.cxx b/connectivity/source/drivers/postgresql/pq_statement.cxx
index 9127204..466fa61 100644
--- a/connectivity/source/drivers/postgresql/pq_statement.cxx
+++ b/connectivity/source/drivers/postgresql/pq_statement.cxx
@@ -236,7 +236,7 @@ Sequence< sal_Int8> Statement::getImplementationId() throw ( RuntimeException )
MutexGuard guard( osl::Mutex::getGlobalMutex() );
if( ! pId )
{
- static cppu::OImplementationId id(sal_False);
+ static cppu::OImplementationId id(false);
pId = &id;
}
}
diff --git a/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx b/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx
index f105d5c..ef55d0f 100644
--- a/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx
+++ b/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx
@@ -176,7 +176,7 @@ com::sun::star::uno::Sequence< sal_Int8> UpdateableResultSet::getImplementationI
MutexGuard guard( osl::Mutex::getGlobalMutex() );
if( ! pId )
{
- static cppu::OImplementationId id(sal_False);
+ static cppu::OImplementationId id(false);
pId = &id;
}
}
diff --git a/connectivity/source/drivers/postgresql/pq_xbase.cxx b/connectivity/source/drivers/postgresql/pq_xbase.cxx
index a0b67a1..f4f8b98 100644
--- a/connectivity/source/drivers/postgresql/pq_xbase.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xbase.cxx
@@ -202,7 +202,7 @@ Sequence< sal_Int8> ReflectionBase::getImplementationId() throw( RuntimeExceptio
MutexGuard guard( osl::Mutex::getGlobalMutex() );
if( ! pId )
{
- static cppu::OImplementationId id(sal_False);
+ static cppu::OImplementationId id(false);
pId = &id;
}
}
diff --git a/embeddedobj/source/commonembedding/miscobj.cxx b/embeddedobj/source/commonembedding/miscobj.cxx
index 70b8696..e21b386 100644
--- a/embeddedobj/source/commonembedding/miscobj.cxx
+++ b/embeddedobj/source/commonembedding/miscobj.cxx
@@ -453,7 +453,7 @@ uno::Sequence< sal_Int8 > SAL_CALL OCommonEmbeddedObject::getImplementationId()
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ) ;
if ( !pID )
{
- static ::cppu::OImplementationId aID( sal_False ) ;
+ static ::cppu::OImplementationId aID( false ) ;
pID = &aID ;
}
}
diff --git a/embedserv/source/embed/servprov.cxx b/embedserv/source/embed/servprov.cxx
index 93995d4..29d85d9 100644
--- a/embedserv/source/embed/servprov.cxx
+++ b/embedserv/source/embed/servprov.cxx
@@ -180,7 +180,7 @@ uno::Sequence< sal_Int8 > SAL_CALL EmbedServer_Impl::getImplementationId() throw
::osl::MutexGuard guard( ::osl::Mutex::getGlobalMutex() );
if( ! pId )
{
- static ::cppu::OImplementationId id( sal_False );
+ static ::cppu::OImplementationId id( false );
pId = &id;
}
}
diff --git a/extensions/source/ole/servprov.cxx b/extensions/source/ole/servprov.cxx
index cbf4645..6c9ba8c 100644
--- a/extensions/source/ole/servprov.cxx
+++ b/extensions/source/ole/servprov.cxx
@@ -659,7 +659,7 @@ Sequence< sal_Int8 > SAL_CALL OleServer_Impl::getImplementationId() throw(Runtim
MutexGuard guard( Mutex::getGlobalMutex() );
if( ! pId )
{
- static OImplementationId id( sal_False );
+ static OImplementationId id( false );
pId = &id;
}
}
diff --git a/framework/inc/macros/xtypeprovider.hxx b/framework/inc/macros/xtypeprovider.hxx
index 30d30d3..1880cc9 100644
--- a/framework/inc/macros/xtypeprovider.hxx
+++ b/framework/inc/macros/xtypeprovider.hxx
@@ -70,7 +70,7 @@ ________________________________________________________________________________
if ( pID == NULL ) \
{ \
/* Create a new static ID ... */ \
- static ::cppu::OImplementationId aID( sal_False ); \
+ static ::cppu::OImplementationId aID( false ); \
/* ... and set his address to static pointer! */ \
pID = &aID ; \
} \
diff --git a/framework/source/fwe/classes/actiontriggercontainer.cxx b/framework/source/fwe/classes/actiontriggercontainer.cxx
index a4f58f7..1d48135 100644
--- a/framework/source/fwe/classes/actiontriggercontainer.cxx
+++ b/framework/source/fwe/classes/actiontriggercontainer.cxx
@@ -179,7 +179,7 @@ Sequence< sal_Int8 > SAL_CALL ActionTriggerContainer::getImplementationId() thro
if ( pID == NULL )
{
// Create a new static ID ...
- static ::cppu::OImplementationId aID( sal_False ) ;
+ static ::cppu::OImplementationId aID( false ) ;
// ... and set his address to static pointer!
pID = &aID ;
}
diff --git a/framework/source/fwe/classes/actiontriggerpropertyset.cxx b/framework/source/fwe/classes/actiontriggerpropertyset.cxx
index a10f90a..8bbf7f3 100644
--- a/framework/source/fwe/classes/actiontriggerpropertyset.cxx
+++ b/framework/source/fwe/classes/actiontriggerpropertyset.cxx
@@ -173,7 +173,7 @@ Sequence< sal_Int8 > SAL_CALL ActionTriggerPropertySet::getImplementationId() th
if ( pID == NULL )
{
// Create a new static ID ...
- static ::cppu::OImplementationId aID( sal_False ) ;
+ static ::cppu::OImplementationId aID( false ) ;
// ... and set his address to static pointer!
pID = &aID ;
}
diff --git a/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx b/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx
index 75afc5a..9307dc6 100644
--- a/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx
+++ b/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx
@@ -165,7 +165,7 @@ Sequence< sal_Int8 > SAL_CALL ActionTriggerSeparatorPropertySet::getImplementati
if ( pID == NULL )
{
// Create a new static ID ...
- static ::cppu::OImplementationId aID( sal_False ) ;
+ static ::cppu::OImplementationId aID( false ) ;
// ... and set his address to static pointer!
pID = &aID ;
}
diff --git a/framework/source/fwe/classes/rootactiontriggercontainer.cxx b/framework/source/fwe/classes/rootactiontriggercontainer.cxx
index 96869c6..b64d2ea 100644
--- a/framework/source/fwe/classes/rootactiontriggercontainer.cxx
+++ b/framework/source/fwe/classes/rootactiontriggercontainer.cxx
@@ -307,7 +307,7 @@ Sequence< sal_Int8 > SAL_CALL RootActionTriggerContainer::getImplementationId()
if ( pID == NULL )
{
// Create a new static ID ...
- static ::cppu::OImplementationId aID( sal_False ) ;
+ static ::cppu::OImplementationId aID( false ) ;
// ... and set his address to static pointer!
pID = &aID ;
}
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index 0d04ba6..961776f 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -3113,7 +3113,7 @@ void Frame::implts_sendFrameActionEvent( const css::frame::FrameAction& aAction
// Get iterator for access to listener.
::cppu::OInterfaceIteratorHelper aIterator( *pContainer );
// Send message to all listener.
- while( aIterator.hasMoreElements() == sal_True )
+ while( aIterator.hasMoreElements() )
{
try
{
diff --git a/include/toolkit/helper/macros.hxx b/include/toolkit/helper/macros.hxx
index 984e080..35ab259 100644
--- a/include/toolkit/helper/macros.hxx
+++ b/include/toolkit/helper/macros.hxx
@@ -84,7 +84,7 @@ ClassName* ClassName::GetImplementation( const ::com::sun::star::uno::Reference<
::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() ); \
if( ! pId ) \
{ \
- static ::cppu::OImplementationId id( sal_False ); \
+ static ::cppu::OImplementationId id( false ); \
pId = &id; \
} \
} \
diff --git a/include/ucbhelper/macros.hxx b/include/ucbhelper/macros.hxx
index 846f31b..760b0d8 100644
--- a/include/ucbhelper/macros.hxx
+++ b/include/ucbhelper/macros.hxx
@@ -329,7 +329,7 @@ Class::getImplementationId() \
osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() ); \
if ( !pId ) \
{ \
- static cppu::OImplementationId id( sal_False ); \
+ static cppu::OImplementationId id( false ); \
pId = &id; \
} \
} \
diff --git a/pyuno/source/module/pyuno_adapter.cxx b/pyuno/source/module/pyuno_adapter.cxx
index 9b79492..070a9ff 100644
--- a/pyuno/source/module/pyuno_adapter.cxx
+++ b/pyuno/source/module/pyuno_adapter.cxx
@@ -63,7 +63,7 @@ Adapter::~Adapter()
mWrappedObject.scratch();
}
-static cppu::OImplementationId g_id( sal_False );
+static cppu::OImplementationId g_id( false );
Sequence<sal_Int8> Adapter::getUnoTunnelImplementationId()
{
diff --git a/sfx2/source/dialog/backingcomp.cxx b/sfx2/source/dialog/backingcomp.cxx
index 7d51151..e79c35a 100644
--- a/sfx2/source/dialog/backingcomp.cxx
+++ b/sfx2/source/dialog/backingcomp.cxx
@@ -307,7 +307,7 @@ css::uno::Sequence< sal_Int8 > SAL_CALL BackingComp::getImplementationId()
// Control these pointer again ... it can be, that another instance will be faster then this one!
if (!pID)
{
- static ::cppu::OImplementationId aID(sal_False);
+ static ::cppu::OImplementationId aID(false);
pID = &aID;
}
/* } GLOBAL SAFE */
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index c65dfb3..933fe5d 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -634,7 +634,7 @@ Sequence< sal_Int8 > SAL_CALL SfxBaseModel::getImplementationId() throw( Runtime
if ( pID == NULL )
{
// Create a new static ID ...
- static ::cppu::OImplementationId aID( sal_False ) ;
+ static ::cppu::OImplementationId aID( false ) ;
// ... and set his address to static pointer!
pID = &aID ;
}
diff --git a/stoc/source/invocation/invocation.cxx b/stoc/source/invocation/invocation.cxx
index 1d8df1e..98ef723 100644
--- a/stoc/source/invocation/invocation.cxx
+++ b/stoc/source/invocation/invocation.cxx
@@ -1056,7 +1056,7 @@ Sequence< sal_Int8 > SAL_CALL Invocation_Impl::getImplementationId( ) throw( Ru
MutexGuard guard( Mutex::getGlobalMutex() );
if( ! pId )
{
- static OImplementationId id( sal_False );
+ static OImplementationId id( false );
pId = &id;
}
}
diff --git a/svl/source/fsstor/fsstorage.cxx b/svl/source/fsstor/fsstorage.cxx
index 22e6d79..6a43a0c 100644
--- a/svl/source/fsstor/fsstorage.cxx
+++ b/svl/source/fsstor/fsstorage.cxx
@@ -350,7 +350,7 @@ uno::Sequence< sal_Int8 > SAL_CALL FSStorage::getImplementationId()
if ( pID == NULL )
{
- static ::cppu::OImplementationId aID( sal_False ) ;
+ static ::cppu::OImplementationId aID( false ) ;
pID = &aID ;
}
}
diff --git a/svl/source/fsstor/ostreamcontainer.cxx b/svl/source/fsstor/ostreamcontainer.cxx
index ce02f52..e789252 100644
--- a/svl/source/fsstor/ostreamcontainer.cxx
+++ b/svl/source/fsstor/ostreamcontainer.cxx
@@ -193,7 +193,7 @@ uno::Sequence< sal_Int8 > SAL_CALL OFSStreamContainer::getImplementationId()
if ( pID == NULL )
{
- static ::cppu::OImplementationId aID( sal_False ) ;
+ static ::cppu::OImplementationId aID( false ) ;
pID = &aID ;
}
}
diff --git a/svtools/source/hatchwindow/hatchwindow.cxx b/svtools/source/hatchwindow/hatchwindow.cxx
index a2f6413..9efb096 100644
--- a/svtools/source/hatchwindow/hatchwindow.cxx
+++ b/svtools/source/hatchwindow/hatchwindow.cxx
@@ -169,7 +169,7 @@ uno::Sequence< sal_Int8 > SAL_CALL VCLXHatchWindow::getImplementationId()
if ( pID == NULL )
{
- static ::cppu::OImplementationId aID( sal_False ) ;
+ static ::cppu::OImplementationId aID( false ) ;
pID = &aID ;
}
}
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 526bfec..f31748b 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -1040,7 +1040,7 @@ uno::Sequence< sal_Int8 > SAL_CALL SvxShape::getImplementationId()
if ( pID == NULL )
{
// Create a new static ID ...
- static ::cppu::OImplementationId aID( sal_False ) ;
+ static ::cppu::OImplementationId aID( false ) ;
// ... and set his address to static pointer!
pID = &aID ;
}
@@ -4102,7 +4102,7 @@ uno::Sequence< sal_Int8 > SAL_CALL SvxShapeText::getImplementationId()
if ( pID == NULL )
{
// Create a new static ID ...
- static ::cppu::OImplementationId aID( sal_False ) ;
+ static ::cppu::OImplementationId aID( false ) ;
// ... and set his address to static pointer!
pID = &aID ;
}
diff --git a/toolkit/source/awt/vclxmenu.cxx b/toolkit/source/awt/vclxmenu.cxx
index 400b10b..3858625 100644
--- a/toolkit/source/awt/vclxmenu.cxx
+++ b/toolkit/source/awt/vclxmenu.cxx
@@ -302,7 +302,7 @@ throw(css::uno::RuntimeException)
::osl::Guard< ::osl::Mutex > aGlobalGuard( ::osl::Mutex::getGlobalMutex() );
if( !pIdPopupMenu )
{
- static ::cppu::OImplementationId idPopupMenu( sal_False );
+ static ::cppu::OImplementationId idPopupMenu( false );
pIdPopupMenu = &idPopupMenu;
}
}
@@ -316,7 +316,7 @@ throw(css::uno::RuntimeException)
::osl::Guard< ::osl::Mutex > aGlobalGuard( ::osl::Mutex::getGlobalMutex() );
if( !pIdMenuBar )
{
- static ::cppu::OImplementationId idMenuBar( sal_False );
+ static ::cppu::OImplementationId idMenuBar( false );
pIdMenuBar = &idMenuBar;
}
}
diff --git a/toolkit/source/awt/vclxtopwindow.cxx b/toolkit/source/awt/vclxtopwindow.cxx
index d382d3f..e2697aee 100644
--- a/toolkit/source/awt/vclxtopwindow.cxx
+++ b/toolkit/source/awt/vclxtopwindow.cxx
@@ -286,7 +286,7 @@ Window* VCLXTopWindow::GetWindowImpl()
::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() );
if( !pIdWithHandle )
{
- static ::cppu::OImplementationId idWithHandle( sal_False );
+ static ::cppu::OImplementationId idWithHandle( false );
pIdWithHandle = &idWithHandle;
}
}
@@ -300,7 +300,7 @@ Window* VCLXTopWindow::GetWindowImpl()
::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() );
if( !pId )
{
- static ::cppu::OImplementationId id( sal_False );
+ static ::cppu::OImplementationId id( false );
pId = &id;
}
}
diff --git a/ucb/source/ucp/file/filid.cxx b/ucb/source/ucp/file/filid.cxx
index 0fc415b..75c9f3c 100644
--- a/ucb/source/ucp/file/filid.cxx
+++ b/ucb/source/ucp/file/filid.cxx
@@ -90,7 +90,7 @@ FileContentIdentifier::getImplementationId()
osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() );
if ( !pId )
{
- static cppu::OImplementationId id( sal_False );
+ static cppu::OImplementationId id( false );
pId = &id;
}
}
diff --git a/ucb/source/ucp/ftp/ftpcontentidentifier.cxx b/ucb/source/ucp/ftp/ftpcontentidentifier.cxx
index 4da4819..402372c 100644
--- a/ucb/source/ucp/ftp/ftpcontentidentifier.cxx
+++ b/ucb/source/ucp/ftp/ftpcontentidentifier.cxx
@@ -82,7 +82,7 @@ FTPContentIdentifier::getImplementationId()
osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() );
if ( !pId )
{
- static cppu::OImplementationId id( sal_False );
+ static cppu::OImplementationId id( false );
pId = &id;
}
}
diff --git a/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx b/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx
index 6c7e4a6..62c68f0 100644
--- a/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx
@@ -133,7 +133,7 @@ InteractionSupplyPassword::getImplementationId()
osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() );
if ( !pId )
{
- static cppu::OImplementationId id( sal_False );
+ static cppu::OImplementationId id( false );
pId = &id;
}
}
diff --git a/ucbhelper/source/provider/contentidentifier.cxx b/ucbhelper/source/provider/contentidentifier.cxx
index c700e74..ece3f0a 100644
--- a/ucbhelper/source/provider/contentidentifier.cxx
+++ b/ucbhelper/source/provider/contentidentifier.cxx
@@ -142,7 +142,7 @@ ContentIdentifier::getImplementationId()
osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() );
if ( !pId )
{
- static cppu::OImplementationId id( sal_False );
+ static cppu::OImplementationId id( false );
pId = &id;
}
}
diff --git a/ucbhelper/source/provider/interactionrequest.cxx b/ucbhelper/source/provider/interactionrequest.cxx
index 96f8577..4e06dfe 100644
--- a/ucbhelper/source/provider/interactionrequest.cxx
+++ b/ucbhelper/source/provider/interactionrequest.cxx
@@ -153,7 +153,7 @@ uno::Sequence< sal_Int8 > SAL_CALL InteractionRequest::getImplementationId()
osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() );
if ( !pId )
{
- static cppu::OImplementationId id( sal_False );
+ static cppu::OImplementationId id( false );
pId = &id;
}
}
@@ -305,7 +305,7 @@ uno::Sequence< sal_Int8 > SAL_CALL InteractionAbort::getImplementationId()
osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() );
if ( !pId )
{
- static cppu::OImplementationId id( sal_False );
+ static cppu::OImplementationId id( false );
pId = &id;
}
}
@@ -407,7 +407,7 @@ uno::Sequence< sal_Int8 > SAL_CALL InteractionRetry::getImplementationId()
osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() );
if ( !pId )
{
- static cppu::OImplementationId id( sal_False );
+ static cppu::OImplementationId id( false );
pId = &id;
}
}
@@ -509,7 +509,7 @@ uno::Sequence< sal_Int8 > SAL_CALL InteractionApprove::getImplementationId()
osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() );
if ( !pId )
{
- static cppu::OImplementationId id( sal_False );
+ static cppu::OImplementationId id( false );
pId = &id;
}
}
@@ -611,7 +611,7 @@ uno::Sequence< sal_Int8 > SAL_CALL InteractionDisapprove::getImplementationId()
osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() );
if ( !pId )
{
- static cppu::OImplementationId id( sal_False );
+ static cppu::OImplementationId id( false );
pId = &id;
}
}
@@ -715,7 +715,7 @@ InteractionSupplyAuthentication::getImplementationId()
osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() );
if ( !pId )
{
- static cppu::OImplementationId id( sal_False );
+ static cppu::OImplementationId id( false );
pId = &id;
}
}
@@ -979,7 +979,7 @@ uno::Sequence< sal_Int8 > SAL_CALL InteractionSupplyName::getImplementationId()
osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() );
if ( !pId )
{
- static cppu::OImplementationId id( sal_False );
+ static cppu::OImplementationId id( false );
pId = &id;
}
}
@@ -1096,7 +1096,7 @@ InteractionReplaceExistingData::getImplementationId()
osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() );
if ( !pId )
{
- static cppu::OImplementationId id( sal_False );
+ static cppu::OImplementationId id( false );
pId = &id;
}
}
commit 8a8ea11e5ea386af8b91b2ff36e5906afc571c2b
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Jan 29 11:00:45 2014 +0100
bool improvements
Change-Id: I4e428e5d7093dbc8a1e7fd47ec49998ce143e5ac
diff --git a/connectivity/source/drivers/odbc/OTools.cxx b/connectivity/source/drivers/odbc/OTools.cxx
index 8e442f2..4c7ad02 100644
--- a/connectivity/source/drivers/odbc/OTools.cxx
+++ b/connectivity/source/drivers/odbc/OTools.cxx
@@ -654,7 +654,7 @@ sal_Int32 OTools::MapOdbcType2Jdbc(SQLSMALLINT _nType)
nValue = DataType::LONGVARBINARY;
break;
default:
- OSL_ASSERT(!"Invalid type");
+ OSL_FAIL("Invalid type");
}
return nValue;
}
diff --git a/connectivity/source/inc/odbc/OResultSet.hxx b/connectivity/source/inc/odbc/OResultSet.hxx
index 35959a5..84be364 100644
--- a/connectivity/source/inc/odbc/OResultSet.hxx
+++ b/connectivity/source/inc/odbc/OResultSet.hxx
@@ -84,14 +84,14 @@ namespace connectivity
for(i=0;i < nCount;++i,--pLHBack,--pRHBack)
{
if(!(*pLHBack) && *pRHBack)
- return sal_True;
+ return true;
else if(*pLHBack && !(*pRHBack))
- return sal_False;
+ return false;
}
for(i=0,++pLHBack,++pRHBack;i < nCount;++pLHBack,++pRHBack,++i)
if(*pLHBack < *pRHBack)
- return sal_True;
- return sal_False;
+ return true;
+ return false;
}
else
return *reinterpret_cast<const sal_Int32*>(_rLH.getConstArray()) < *reinterpret_cast<const sal_Int32*>(_rRH.getConstArray());
More information about the Libreoffice-commits
mailing list