basegfx/source/matrix/b3dhommatrix.cxx | 13 ++------ canvas/source/cairo/cairo_textlayout.cxx | 11 ++----- canvas/source/cairo/cairo_textlayout.hxx | 2 - canvas/source/opengl/ogl_buffercontext.hxx | 4 +- canvas/source/opengl/ogl_spritecanvas.cxx | 4 +- canvas/source/opengl/ogl_spritecanvas.hxx | 2 - canvas/source/opengl/ogl_spritedevicehelper.cxx | 6 +--- canvas/source/opengl/ogl_textlayout.cxx | 4 -- canvas/source/opengl/ogl_textlayout.hxx | 2 - canvas/source/tools/surface.hxx | 2 - comphelper/source/container/embeddedobjectcontainer.cxx | 19 +++--------- comphelper/source/misc/backupfilehelper.cxx | 24 ++++------------ comphelper/source/property/propertycontainerhelper.cxx | 6 +--- connectivity/source/commontools/parameters.cxx | 5 +-- connectivity/source/drivers/dbase/DIndex.cxx | 4 -- connectivity/source/drivers/evoab2/NResultSet.cxx | 12 ++------ connectivity/source/drivers/evoab2/NResultSet.hxx | 2 - connectivity/source/drivers/file/FResultSet.cxx | 6 +--- connectivity/source/drivers/mork/MResultSet.cxx | 4 +- connectivity/source/drivers/mork/MResultSet.hxx | 2 - connectivity/source/inc/dbase/DIndex.hxx | 2 - connectivity/source/inc/file/FResultSet.hxx | 2 - cppcanvas/source/wrapper/implbitmap.cxx | 6 +--- cppcanvas/source/wrapper/implbitmap.hxx | 2 - include/basegfx/matrix/b3dhommatrix.hxx | 4 +- include/comphelper/backupfilehelper.hxx | 14 ++------- include/comphelper/embeddedobjectcontainer.hxx | 8 ++--- include/comphelper/listenernotification.hxx | 7 ++-- include/comphelper/namedvaluecollection.hxx | 4 +- include/comphelper/propertycontainerhelper.hxx | 2 - include/connectivity/parameters.hxx | 2 - include/cppcanvas/bitmap.hxx | 4 -- 32 files changed, 68 insertions(+), 123 deletions(-)
New commits: commit 0f28c8612f4269cec95688b53d182c7c0169236d Author: Noel Grandin <noel.gran...@collabora.co.uk> Date: Tue Jan 23 16:45:23 2018 +0200 loplugin:unused-returns in basegfx..cppcanvas Change-Id: I32dc8c92871c8349651d2f4204a332d387e6e1b2 Reviewed-on: https://gerrit.libreoffice.org/48428 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/basegfx/source/matrix/b3dhommatrix.cxx b/basegfx/source/matrix/b3dhommatrix.cxx index e6a2bd3b4f88..6cfd054992ec 100644 --- a/basegfx/source/matrix/b3dhommatrix.cxx +++ b/basegfx/source/matrix/b3dhommatrix.cxx @@ -85,7 +85,7 @@ namespace basegfx *mpImpl = Impl3DHomMatrix(); } - bool B3DHomMatrix::invert() + void B3DHomMatrix::invert() { Impl3DHomMatrix aWork(*mpImpl); std::unique_ptr<sal_uInt16[]> pIndex( new sal_uInt16[Impl3DHomMatrix_Base::getEdgeLength()] ); @@ -94,10 +94,7 @@ namespace basegfx if(aWork.ludcmp(pIndex.get(), nParity)) { mpImpl->doInvert(aWork, pIndex.get()); - return true; } - - return false; } double B3DHomMatrix::determinant() const @@ -376,15 +373,15 @@ namespace basegfx mpImpl->doMulMatrix(aOrientationMat); } - bool B3DHomMatrix::decompose(B3DTuple& rScale, B3DTuple& rTranslate, B3DTuple& rRotate, B3DTuple& rShear) const + void B3DHomMatrix::decompose(B3DTuple& rScale, B3DTuple& rTranslate, B3DTuple& rRotate, B3DTuple& rShear) const { // when perspective is used, decompose is not made here if(!mpImpl->isLastLineDefault()) - return false; + return; // If determinant is zero, decomposition is not possible if(determinant() == 0.0) - return false; + return; // isolate translation rTranslate.setX(mpImpl->get(0, 3)); @@ -536,8 +533,6 @@ namespace basegfx // correct rotate values rRotate.correctValues(); } - - return true; } } // end of namespace basegfx diff --git a/canvas/source/cairo/cairo_textlayout.cxx b/canvas/source/cairo/cairo_textlayout.cxx index 5fb4db08dd2e..2e4e08cfd8c1 100644 --- a/canvas/source/cairo/cairo_textlayout.cxx +++ b/canvas/source/cairo/cairo_textlayout.cxx @@ -292,10 +292,8 @@ namespace cairocanvas * * Note: some text effects are not rendered due to lacking generic canvas or cairo canvas * implementation. See issues 92657, 92658, 92659, 92660, 97529 - * - * @return true, if successful **/ - bool TextLayout::draw( CairoSharedPtr const & pSCairo, + void TextLayout::draw( CairoSharedPtr const & pSCairo, OutputDevice& rOutDev, const Point& rOutpos, const rendering::ViewState& viewState, @@ -360,19 +358,19 @@ namespace cairocanvas rOutDev.DrawTextArray( rOutpos, maText.Text, aOffsets.get(), ::canvas::tools::numeric_cast<sal_uInt16>(maText.StartPosition), ::canvas::tools::numeric_cast<sal_uInt16>(maText.Length) ); - return true; + return; } else // VCL FALLBACK - without advances { rOutDev.DrawText( rOutpos, maText.Text, ::canvas::tools::numeric_cast<sal_uInt16>(maText.StartPosition), ::canvas::tools::numeric_cast<sal_uInt16>(maText.Length) ); - return true; + return; } } if (aSysLayoutData.rGlyphData.empty()) - return false; //??? false? + return; //??? false? /** * Setup platform independent glyph vector into cairo-based glyphs vector. @@ -503,7 +501,6 @@ namespace cairocanvas cairo_font_face_destroy(font_face); cairo_font_options_destroy(options); } - return true; } namespace diff --git a/canvas/source/cairo/cairo_textlayout.hxx b/canvas/source/cairo/cairo_textlayout.hxx index aa02296d6f44..13d31a7077a1 100644 --- a/canvas/source/cairo/cairo_textlayout.hxx +++ b/canvas/source/cairo/cairo_textlayout.hxx @@ -82,7 +82,7 @@ namespace cairocanvas virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; - bool draw( ::cairo::CairoSharedPtr const & pSCairo, + void draw( ::cairo::CairoSharedPtr const & pSCairo, OutputDevice& rOutDev, const Point& rOutpos, const css::rendering::ViewState& viewState, diff --git a/canvas/source/opengl/ogl_buffercontext.hxx b/canvas/source/opengl/ogl_buffercontext.hxx index 7f2066a0e075..717adb1d6f56 100644 --- a/canvas/source/opengl/ogl_buffercontext.hxx +++ b/canvas/source/opengl/ogl_buffercontext.hxx @@ -22,10 +22,10 @@ namespace oglcanvas virtual ~IBufferContext() {} /// start render to buffer. changes current framebuffer - virtual bool startBufferRendering() = 0; + virtual void startBufferRendering() = 0; /// end render to buffer. switches to default framebuffer - virtual bool endBufferRendering() = 0; + virtual void endBufferRendering() = 0; virtual GLuint getTextureId() = 0; }; diff --git a/canvas/source/opengl/ogl_spritecanvas.cxx b/canvas/source/opengl/ogl_spritecanvas.cxx index 3f913fd64ab4..dfa6134a4dbe 100644 --- a/canvas/source/opengl/ogl_spritecanvas.cxx +++ b/canvas/source/opengl/ogl_spritecanvas.cxx @@ -154,9 +154,9 @@ namespace oglcanvas maDeviceHelper.hide(xSprite); } - bool SpriteCanvas::renderRecordedActions() const + void SpriteCanvas::renderRecordedActions() const { - return maCanvasHelper.renderRecordedActions(); + maCanvasHelper.renderRecordedActions(); } static uno::Reference<uno::XInterface> initCanvas( SpriteCanvas* pCanvas ) diff --git a/canvas/source/opengl/ogl_spritecanvas.hxx b/canvas/source/opengl/ogl_spritecanvas.hxx index 66c3383bc1da..2ab985143dc8 100644 --- a/canvas/source/opengl/ogl_spritecanvas.hxx +++ b/canvas/source/opengl/ogl_spritecanvas.hxx @@ -103,7 +103,7 @@ namespace oglcanvas /** Write out recorded actions */ - bool renderRecordedActions() const; + void renderRecordedActions() const; private: css::uno::Sequence< css::uno::Any > maArguments; diff --git a/canvas/source/opengl/ogl_spritedevicehelper.cxx b/canvas/source/opengl/ogl_spritedevicehelper.cxx index 3043deeaec3f..bab170e37d24 100644 --- a/canvas/source/opengl/ogl_spritedevicehelper.cxx +++ b/canvas/source/opengl/ogl_spritedevicehelper.cxx @@ -520,16 +520,14 @@ namespace oglcanvas GLuint mnDepthId; GLuint mnTextureId; - virtual bool startBufferRendering() override + virtual void startBufferRendering() override { glBindFramebuffer(GL_FRAMEBUFFER, mnFrambufferId); - return true; } - virtual bool endBufferRendering() override + virtual void endBufferRendering() override { glBindFramebuffer(GL_FRAMEBUFFER, 0); - return true; } virtual GLuint getTextureId() override diff --git a/canvas/source/opengl/ogl_textlayout.cxx b/canvas/source/opengl/ogl_textlayout.cxx index 5857367938e5..1f966d16a9cf 100644 --- a/canvas/source/opengl/ogl_textlayout.cxx +++ b/canvas/source/opengl/ogl_textlayout.cxx @@ -176,13 +176,11 @@ namespace oglcanvas return maText; } - bool TextLayout::draw( const rendering::ViewState& /*rViewState*/, + void TextLayout::draw( const rendering::ViewState& /*rViewState*/, const rendering::RenderState& /*rRenderState*/, const uno::Reference< rendering::XGraphicDevice >& /*xGraphicDevice*/ ) const { // TODO - - return true; } } diff --git a/canvas/source/opengl/ogl_textlayout.hxx b/canvas/source/opengl/ogl_textlayout.hxx index c98cdcf5d465..e9c04e1635ea 100644 --- a/canvas/source/opengl/ogl_textlayout.hxx +++ b/canvas/source/opengl/ogl_textlayout.hxx @@ -61,7 +61,7 @@ namespace oglcanvas virtual css::uno::Reference< css::rendering::XCanvasFont > SAL_CALL getFont( ) override; virtual css::rendering::StringContext SAL_CALL getText( ) override; - bool draw( const css::rendering::ViewState& rViewState, + void draw( const css::rendering::ViewState& rViewState, const css::rendering::RenderState& rRenderState, const css::uno::Reference< css::rendering::XGraphicDevice >& xGraphicDevice ) const; diff --git a/canvas/source/tools/surface.hxx b/canvas/source/tools/surface.hxx index 1b7a463fc588..436e96648d78 100644 --- a/canvas/source/tools/surface.hxx +++ b/canvas/source/tools/surface.hxx @@ -134,7 +134,7 @@ namespace canvas bool mbIsDirty; private: - bool refresh( canvas::IColorBuffer& rBuffer ) const; + void refresh( canvas::IColorBuffer& rBuffer ) const; void prepareRendering(); basegfx::B2DRectangle getUVCoords() const; diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx b/comphelper/source/container/embeddedobjectcontainer.cxx index 49d033b54007..539a8c3795c0 100644 --- a/comphelper/source/container/embeddedobjectcontainer.cxx +++ b/comphelper/source/container/embeddedobjectcontainer.cxx @@ -833,7 +833,7 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::CopyAndGetEmb return xResult; } -bool EmbeddedObjectContainer::MoveEmbeddedObject( EmbeddedObjectContainer& rSrc, const uno::Reference < embed::XEmbeddedObject >& xObj, OUString& rName ) +void EmbeddedObjectContainer::MoveEmbeddedObject( EmbeddedObjectContainer& rSrc, const uno::Reference < embed::XEmbeddedObject >& xObj, OUString& rName ) { // get the object name before(!) it is assigned to a new storage uno::Reference < embed::XEmbedPersist > xPersist( xObj, uno::UNO_QUERY ); @@ -891,18 +891,14 @@ bool EmbeddedObjectContainer::MoveEmbeddedObject( EmbeddedObjectContainer& rSrc, // rSrc.RemoveGraphicStream( aName ); } - - return bRet; } // #i119941, bKeepToTempStorage: use to specify whether store the removed object to temporary storage+ -bool EmbeddedObjectContainer::RemoveEmbeddedObject( const OUString& rName, bool bKeepToTempStorage ) +void EmbeddedObjectContainer::RemoveEmbeddedObject( const OUString& rName, bool bKeepToTempStorage ) { uno::Reference < embed::XEmbeddedObject > xObj = GetEmbeddedObject( rName ); if ( xObj.is() ) - return RemoveEmbeddedObject( xObj, bKeepToTempStorage ); - else - return false; + RemoveEmbeddedObject( xObj, bKeepToTempStorage ); } bool EmbeddedObjectContainer::MoveEmbeddedObject( const OUString& rName, EmbeddedObjectContainer& rCnt ) @@ -1066,7 +1062,7 @@ bool EmbeddedObjectContainer::RemoveEmbeddedObject( const uno::Reference < embed return true; } -bool EmbeddedObjectContainer::CloseEmbeddedObject( const uno::Reference < embed::XEmbeddedObject >& xObj ) +void EmbeddedObjectContainer::CloseEmbeddedObject( const uno::Reference < embed::XEmbeddedObject >& xObj ) { // disconnect the object from the container and close it if possible @@ -1097,8 +1093,6 @@ bool EmbeddedObjectContainer::CloseEmbeddedObject( const uno::Reference < embed: // TODO/LATER: what if the object can not be closed? } } - - return bFound; } uno::Reference < io::XInputStream > EmbeddedObjectContainer::GetGraphicStream( const OUString& aName, OUString* pMediaType ) @@ -1200,7 +1194,7 @@ bool EmbeddedObjectContainer::InsertGraphicStreamDirectly( const css::uno::Refer } -bool EmbeddedObjectContainer::RemoveGraphicStream( const OUString& rObjectName ) +void EmbeddedObjectContainer::RemoveGraphicStream( const OUString& rObjectName ) { try { @@ -1209,10 +1203,7 @@ bool EmbeddedObjectContainer::RemoveGraphicStream( const OUString& rObjectName ) } catch (const uno::Exception&) { - return false; } - - return true; } namespace { void InsertStreamIntoPicturesStorage_Impl( const uno::Reference< embed::XStorage >& xDocStor, diff --git a/comphelper/source/misc/backupfilehelper.cxx b/comphelper/source/misc/backupfilehelper.cxx index 64a8cea73929..9b8003edf161 100644 --- a/comphelper/source/misc/backupfilehelper.cxx +++ b/comphelper/source/misc/backupfilehelper.cxx @@ -1834,10 +1834,8 @@ namespace comphelper } } - bool BackupFileHelper::tryPush() + void BackupFileHelper::tryPush() { - bool bDidPush(false); - // no push when SafeModeDir exists, it may be Office's exit after SafeMode // where SafeMode flag is already deleted, but SafeModeDir cleanup is not // done yet (is done at next startup) @@ -1851,21 +1849,17 @@ namespace comphelper // process all files in question recursively if (!maDirs.empty() || !maFiles.empty()) { - bDidPush = tryPush_Files( + tryPush_Files( maDirs, maFiles, maUserConfigWorkURL, aPackURL); } } - - return bDidPush; } - bool BackupFileHelper::tryPushExtensionInfo() + void BackupFileHelper::tryPushExtensionInfo() { - bool bDidPush(false); - // no push when SafeModeDir exists, it may be Office's exit after SafeMode // where SafeMode flag is already deleted, but SafeModeDir cleanup is not // done yet (is done at next startup) @@ -1873,10 +1867,8 @@ namespace comphelper { const OUString aPackURL(getPackURL()); - bDidPush = tryPush_extensionInfo(aPackURL); + tryPush_extensionInfo(aPackURL); } - - return bDidPush; } bool BackupFileHelper::isPopPossible() @@ -1904,7 +1896,7 @@ namespace comphelper return bPopPossible; } - bool BackupFileHelper::tryPop() + void BackupFileHelper::tryPop() { bool bDidPop(false); @@ -1931,8 +1923,6 @@ namespace comphelper osl::Directory::remove(aPackURL); } } - - return bDidPop; } bool BackupFileHelper::isPopPossibleExtensionInfo() const @@ -1949,7 +1939,7 @@ namespace comphelper return bPopPossible; } - bool BackupFileHelper::tryPopExtensionInfo() + void BackupFileHelper::tryPopExtensionInfo() { bool bDidPop(false); @@ -1965,8 +1955,6 @@ namespace comphelper osl::Directory::remove(aPackURL); } } - - return bDidPop; } bool BackupFileHelper::isTryDisableAllExtensionsPossible() diff --git a/comphelper/source/property/propertycontainerhelper.cxx b/comphelper/source/property/propertycontainerhelper.cxx index d70853b849f0..c906c0d22b39 100644 --- a/comphelper/source/property/propertycontainerhelper.cxx +++ b/comphelper/source/property/propertycontainerhelper.cxx @@ -357,7 +357,7 @@ bool OPropertyContainerHelper::convertFastPropertyValue( } -bool OPropertyContainerHelper::setFastPropertyValue(sal_Int32 _nHandle, const Any& _rValue) +void OPropertyContainerHelper::setFastPropertyValue(sal_Int32 _nHandle, const Any& _rValue) { // get the property somebody is asking for PropertiesIterator aPos = searchHandle(_nHandle); @@ -366,7 +366,7 @@ bool OPropertyContainerHelper::setFastPropertyValue(sal_Int32 _nHandle, const An OSL_FAIL( "OPropertyContainerHelper::setFastPropertyValue: unknown handle!" ); // should not happen if the derived class has built a correct property set info helper to be used by // our base class OPropertySetHelper - return false; + return; } bool bSuccess = true; @@ -395,8 +395,6 @@ bool OPropertyContainerHelper::setFastPropertyValue(sal_Int32 _nHandle, const An break; } - - return bSuccess; } void OPropertyContainerHelper::getFastPropertyValue(Any& _rValue, sal_Int32 _nHandle) const diff --git a/connectivity/source/commontools/parameters.cxx b/connectivity/source/commontools/parameters.cxx index cd77c028157e..10d445d0e8c5 100644 --- a/connectivity/source/commontools/parameters.cxx +++ b/connectivity/source/commontools/parameters.cxx @@ -770,11 +770,11 @@ namespace dbtools } - bool ParameterManager::getConnection( Reference< XConnection >& /* [out] */ _rxConnection ) + void ParameterManager::getConnection( Reference< XConnection >& /* [out] */ _rxConnection ) { OSL_PRECOND( isAlive(), "ParameterManager::getConnection: not initialized, or already disposed!" ); if ( !isAlive() ) - return false; + return; _rxConnection.clear(); try @@ -788,7 +788,6 @@ namespace dbtools { SAL_WARN( "connectivity.commontools", "ParameterManager::getConnection: could not retrieve the connection of the !" ); } - return _rxConnection.is(); } diff --git a/connectivity/source/drivers/dbase/DIndex.cxx b/connectivity/source/drivers/dbase/DIndex.cxx index 4d333438538e..4dec39d2b1ca 100644 --- a/connectivity/source/drivers/dbase/DIndex.cxx +++ b/connectivity/source/drivers/dbase/DIndex.cxx @@ -134,7 +134,7 @@ ONDXPagePtr const & ODbaseIndex::getRoot() return m_aRoot; } -bool ODbaseIndex::openIndexFile() +void ODbaseIndex::openIndexFile() { if(!m_pFileStream) { @@ -160,8 +160,6 @@ bool ODbaseIndex::openIndexFile() ::dbtools::throwGenericSQLException( sError, *this ); } } - - return m_pFileStream != nullptr; } OIndexIterator* ODbaseIndex::createIterator() diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx b/connectivity/source/drivers/evoab2/NResultSet.cxx index 517e7b1a7f8e..d838d07e9033 100644 --- a/connectivity/source/drivers/evoab2/NResultSet.cxx +++ b/connectivity/source/drivers/evoab2/NResultSet.cxx @@ -442,13 +442,12 @@ public: m_pContacts = nullptr; } - virtual bool executeQuery (EBook* pBook, EBookQuery* pQuery, OString &/*rPassword*/) override + virtual void executeQuery (EBook* pBook, EBookQuery* pQuery, OString &/*rPassword*/) override { freeContacts(); char *sexp = e_book_query_to_string( pQuery ); - bool bSuccess = e_book_client_get_contacts_sync( pBook, sexp, &m_pContacts, nullptr, nullptr ); + e_book_client_get_contacts_sync( pBook, sexp, &m_pContacts, nullptr, nullptr ); g_free (sexp); - return bSuccess; } virtual EContact *getContact(sal_Int32 nIndex) override @@ -568,12 +567,11 @@ public: m_pContacts = nullptr; } - virtual bool executeQuery (EBook* pBook, EBookQuery* pQuery, OString &rPassword) override + virtual void executeQuery (EBook* pBook, EBookQuery* pQuery, OString &rPassword) override { freeContacts(); ESource *pSource = e_book_get_source( pBook ); - bool bSuccess = false; bool bAuthSuccess = true; if( isAuthRequired( pBook ) ) @@ -584,9 +582,7 @@ public: } if (bAuthSuccess) - bSuccess = e_book_get_contacts( pBook, pQuery, &m_pContacts, nullptr ); - - return bSuccess; + e_book_get_contacts( pBook, pQuery, &m_pContacts, nullptr ); } virtual EContact *getContact(sal_Int32 nIndex) override diff --git a/connectivity/source/drivers/evoab2/NResultSet.hxx b/connectivity/source/drivers/evoab2/NResultSet.hxx index 4dc2d6d422ed..f1128a77bd7b 100644 --- a/connectivity/source/drivers/evoab2/NResultSet.hxx +++ b/connectivity/source/drivers/evoab2/NResultSet.hxx @@ -53,7 +53,7 @@ namespace connectivity { public: virtual EBook* openBook(const char *abname) = 0; - virtual bool executeQuery (EBook* pBook, EBookQuery* pQuery, OString &rPassword) = 0; + virtual void executeQuery (EBook* pBook, EBookQuery* pQuery, OString &rPassword) = 0; virtual void freeContacts() = 0; virtual bool isLDAP( EBook *pBook ) = 0; virtual bool isLocal( EBook *pBook ) = 0; diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx index 50bb8f9f1c5f..079295402cee 100644 --- a/connectivity/source/drivers/file/FResultSet.cxx +++ b/connectivity/source/drivers/file/FResultSet.cxx @@ -1166,7 +1166,7 @@ void OResultSet::sortRows() } -bool OResultSet::OpenImpl() +void OResultSet::OpenImpl() { OSL_ENSURE(m_pSQLAnalyzer,"No analyzer set with setSqlAnalyzer!"); if(!m_pTable.is()) @@ -1383,7 +1383,7 @@ bool OResultSet::OpenImpl() if(!m_pTable->InsertRow(*m_aAssignValues, m_xColsIdx)) { m_nFilePos = 0; - return false; + return; } m_nRowCountResult = 1; @@ -1395,8 +1395,6 @@ bool OResultSet::OpenImpl() // reset FilePos m_nFilePos = 0; - - return true; } Sequence< sal_Int8 > OResultSet::getUnoTunnelImplementationId() diff --git a/connectivity/source/drivers/mork/MResultSet.cxx b/connectivity/source/drivers/mork/MResultSet.cxx index e69022912e04..dd3b25ecb263 100644 --- a/connectivity/source/drivers/mork/MResultSet.cxx +++ b/connectivity/source/drivers/mork/MResultSet.cxx @@ -1332,7 +1332,8 @@ bool OResultSet::validRow( sal_uInt32 nRow) return true; } -bool OResultSet::fillKeySet(sal_Int32 nMaxCardNumber) + +void OResultSet::fillKeySet(sal_Int32 nMaxCardNumber) { impl_ensureKeySet(); if (m_CurrentRowCount < nMaxCardNumber) @@ -1345,7 +1346,6 @@ bool OResultSet::fillKeySet(sal_Int32 nMaxCardNumber) m_pKeySet->get().push_back( nKeyValue ); m_CurrentRowCount = nMaxCardNumber; } - return true; } sal_Int32 OResultSet::deletedCount() diff --git a/connectivity/source/drivers/mork/MResultSet.hxx b/connectivity/source/drivers/mork/MResultSet.hxx index 88f93354de5a..7f89d5f06623 100644 --- a/connectivity/source/drivers/mork/MResultSet.hxx +++ b/connectivity/source/drivers/mork/MResultSet.hxx @@ -260,7 +260,7 @@ protected: bool validRow( sal_uInt32 nRow ); bool seekRow( eRowPosition pos, sal_Int32 nOffset = 0 ); sal_Int32 deletedCount(); - bool fillKeySet(sal_Int32 nMaxCardNumber); //When we get new rows, fill the m_pKeySet items for them + void fillKeySet(sal_Int32 nMaxCardNumber); //When we get new rows, fill the m_pKeySet items for them sal_Int32 getRowForCardNumber(sal_Int32 nCardNum); /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException diff --git a/connectivity/source/inc/dbase/DIndex.hxx b/connectivity/source/inc/dbase/DIndex.hxx index da0a1d657651..6e4356c4c3ee 100644 --- a/connectivity/source/inc/dbase/DIndex.hxx +++ b/connectivity/source/inc/dbase/DIndex.hxx @@ -92,7 +92,7 @@ namespace connectivity ODbaseIndex(ODbaseTable* _pTable); ODbaseIndex(ODbaseTable* _pTable,const NDXHeader& _aHeader,const OUString& Name); - bool openIndexFile(); + void openIndexFile(); virtual void refreshColumns() override; // css::lang::XUnoTunnel diff --git a/connectivity/source/inc/file/FResultSet.hxx b/connectivity/source/inc/file/FResultSet.hxx index 6c0d06fe8af4..5ccbbd369101 100644 --- a/connectivity/source/inc/file/FResultSet.hxx +++ b/connectivity/source/inc/file/FResultSet.hxx @@ -258,7 +258,7 @@ namespace connectivity // special methods inline sal_Int32 mapColumn(sal_Int32 column); - bool OpenImpl(); + void OpenImpl(); void doTableSpecials(const OSQLTable& _xTable); sal_Int32 getRowCountResult() const { return m_nRowCountResult; } diff --git a/cppcanvas/source/wrapper/implbitmap.cxx b/cppcanvas/source/wrapper/implbitmap.cxx index 281a76bdc998..adab03b81c1a 100644 --- a/cppcanvas/source/wrapper/implbitmap.cxx +++ b/cppcanvas/source/wrapper/implbitmap.cxx @@ -75,7 +75,7 @@ namespace cppcanvas return true; } - bool ImplBitmap::drawAlphaModulated( double nAlphaModulation ) const + void ImplBitmap::drawAlphaModulated( double nAlphaModulation ) const { CanvasSharedPtr pCanvas( getCanvas() ); @@ -86,7 +86,7 @@ namespace cppcanvas if( pCanvas.get() == nullptr || !pCanvas->getUNOCanvas().is() ) { - return false; + return; } rendering::RenderState aLocalState( getRenderState() ); @@ -99,8 +99,6 @@ namespace cppcanvas pCanvas->getUNOCanvas()->drawBitmapModulated( mxBitmap, pCanvas->getViewState(), aLocalState ); - - return true; } BitmapCanvasSharedPtr ImplBitmap::getBitmapCanvas() const diff --git a/cppcanvas/source/wrapper/implbitmap.hxx b/cppcanvas/source/wrapper/implbitmap.hxx index aabfd331a4dc..349e13a8188d 100644 --- a/cppcanvas/source/wrapper/implbitmap.hxx +++ b/cppcanvas/source/wrapper/implbitmap.hxx @@ -47,7 +47,7 @@ namespace cppcanvas // CanvasGraphic implementation (that was not already implemented by CanvasGraphicHelper) virtual bool draw() const override; - virtual bool drawAlphaModulated( double nAlphaModulation ) const override; + virtual void drawAlphaModulated( double nAlphaModulation ) const override; virtual BitmapCanvasSharedPtr getBitmapCanvas() const override; diff --git a/include/basegfx/matrix/b3dhommatrix.hxx b/include/basegfx/matrix/b3dhommatrix.hxx index 20f02f00c295..09d700547363 100644 --- a/include/basegfx/matrix/b3dhommatrix.hxx +++ b/include/basegfx/matrix/b3dhommatrix.hxx @@ -57,7 +57,7 @@ namespace basegfx void identity(); /// Invert the matrix (if possible) - bool invert(); + void invert(); /// Calc the matrix determinant double determinant() const; @@ -111,7 +111,7 @@ namespace basegfx B3DHomMatrix& operator=(B3DHomMatrix&& rMat); // decomposition - bool decompose(B3DTuple& rScale, B3DTuple& rTranslate, B3DTuple& rRotate, B3DTuple& rShear) const; + void decompose(B3DTuple& rScale, B3DTuple& rTranslate, B3DTuple& rRotate, B3DTuple& rShear) const; }; inline B3DHomMatrix operator*(const B3DHomMatrix& rMatA, const B3DHomMatrix& rMatB) diff --git a/include/comphelper/backupfilehelper.hxx b/include/comphelper/backupfilehelper.hxx index 6f3445870625..4ff60102ad17 100644 --- a/include/comphelper/backupfilehelper.hxx +++ b/include/comphelper/backupfilehelper.hxx @@ -121,13 +121,10 @@ namespace comphelper * Also may cleanup older backups when NumBackups given in the * constructor has changed. * - * @return bool - * returns true if a new backup was actually created - * * tryPushExtensionInfo is the specialized version for ExtensionInfo */ - bool tryPush(); - bool tryPushExtensionInfo(); + void tryPush(); + void tryPushExtensionInfo(); /** finds out if a restore is possible * @@ -144,13 +141,10 @@ namespace comphelper * Also may cleanup older backups when NumBackups given in the * constructor has changed. * - * @return bool - * returns true if a restore was actually created - * * tryPopExtensionInfo is the specialized version for ExtensionInfo */ - bool tryPop(); - bool tryPopExtensionInfo(); + void tryPop(); + void tryPopExtensionInfo(); /** tries to iterate the extensions and to disable all of them */ diff --git a/include/comphelper/embeddedobjectcontainer.hxx b/include/comphelper/embeddedobjectcontainer.hxx index d838af94a3c1..8abea504d7bd 100644 --- a/include/comphelper/embeddedobjectcontainer.hxx +++ b/include/comphelper/embeddedobjectcontainer.hxx @@ -130,15 +130,15 @@ public: const OUString& rSrcShellID, const OUString& rDestShellID ); // move an embedded object from one container to another one - bool MoveEmbeddedObject( EmbeddedObjectContainer& rSrc, const css::uno::Reference < css::embed::XEmbeddedObject >&, OUString& ); + void MoveEmbeddedObject( EmbeddedObjectContainer& rSrc, const css::uno::Reference < css::embed::XEmbeddedObject >&, OUString& ); // remove an embedded object from the container and from the storage; if object can't be closed // #i119941, bKeepToTempStorage: use to specify whether store the removed object to temporary storage+ - bool RemoveEmbeddedObject( const OUString& rName, bool bKeepToTempStorage = true); + void RemoveEmbeddedObject( const OUString& rName, bool bKeepToTempStorage = true); bool RemoveEmbeddedObject( const css::uno::Reference < css::embed::XEmbeddedObject >&, bool bKeepToTempStorage = true); // close and remove an embedded object from the container without removing it from the storage - bool CloseEmbeddedObject( const css::uno::Reference < css::embed::XEmbeddedObject >& ); + void CloseEmbeddedObject( const css::uno::Reference < css::embed::XEmbeddedObject >& ); // move an embedded object to another container (keep the persistent name) bool MoveEmbeddedObject( const OUString& rName, EmbeddedObjectContainer& ); @@ -156,7 +156,7 @@ public: bool InsertGraphicStreamDirectly( const css::uno::Reference < css::io::XInputStream >& rStream, const OUString& rObjectName, const OUString& rMediaType ); // remove a graphical representation for an object - bool RemoveGraphicStream( const OUString& rObjectName ); + void RemoveGraphicStream( const OUString& rObjectName ); // copy the graphical representation from different container bool TryToCopyGraphReplacement( EmbeddedObjectContainer& rSrc, diff --git a/include/comphelper/listenernotification.hxx b/include/comphelper/listenernotification.hxx index c61237adad1e..610ac31cb6ce 100644 --- a/include/comphelper/listenernotification.hxx +++ b/include/comphelper/listenernotification.hxx @@ -186,7 +186,7 @@ namespace comphelper using OListenerContainer::createIterator; /// typed notification - inline bool notify( const EventClass& _rEvent, NotificationMethod _pNotify ); + inline void notify( const EventClass& _rEvent, NotificationMethod _pNotify ); protected: virtual bool implNotify( @@ -203,12 +203,11 @@ namespace comphelper template< class LISTENER, class EVENT > - inline bool OSimpleListenerContainer< LISTENER, EVENT >::notify( const EventClass& _rEvent, NotificationMethod _pNotify ) + inline void OSimpleListenerContainer< LISTENER, EVENT >::notify( const EventClass& _rEvent, NotificationMethod _pNotify ) { m_pNotificationMethod = _pNotify; - bool bRet = OListenerContainer::impl_notify( _rEvent ); + OListenerContainer::impl_notify( _rEvent ); m_pNotificationMethod = nullptr; - return bRet; } //= OListenerContainerBase diff --git a/include/comphelper/namedvaluecollection.hxx b/include/comphelper/namedvaluecollection.hxx index 9b19bf2e3dda..7ae79b448914 100644 --- a/include/comphelper/namedvaluecollection.hxx +++ b/include/comphelper/namedvaluecollection.hxx @@ -152,9 +152,9 @@ namespace comphelper } template < typename VALUE_TYPE > - bool get_ensureType( const OUString& _rValueName, VALUE_TYPE& _out_rValue ) const + void get_ensureType( const OUString& _rValueName, VALUE_TYPE& _out_rValue ) const { - return get_ensureType( _rValueName, &_out_rValue, ::cppu::UnoType< VALUE_TYPE >::get() ); + get_ensureType( _rValueName, &_out_rValue, ::cppu::UnoType< VALUE_TYPE >::get() ); } /** retrieves a value with a given name, or defaults it to a given value, if it's not present diff --git a/include/comphelper/propertycontainerhelper.hxx b/include/comphelper/propertycontainerhelper.hxx index 2e60c97c4ea9..4f37a1018e66 100644 --- a/include/comphelper/propertycontainerhelper.hxx +++ b/include/comphelper/propertycontainerhelper.hxx @@ -149,7 +149,7 @@ protected: const css::uno::Any& rValue ); - bool setFastPropertyValue( + void setFastPropertyValue( sal_Int32 nHandle, const css::uno::Any& rValue ); diff --git a/include/connectivity/parameters.hxx b/include/connectivity/parameters.hxx index 3f0491963dc0..80efce8689e7 100644 --- a/include/connectivity/parameters.hxx +++ b/include/connectivity/parameters.hxx @@ -387,7 +387,7 @@ namespace dbtools /** retrieves the active connection of the database component */ - bool getConnection( + void getConnection( css::uno::Reference< css::sdbc::XConnection >& /* [out] */ _rxConnection ); diff --git a/include/cppcanvas/bitmap.hxx b/include/cppcanvas/bitmap.hxx index 1e257d4dfb27..0dd3f69f3a84 100644 --- a/include/cppcanvas/bitmap.hxx +++ b/include/cppcanvas/bitmap.hxx @@ -54,10 +54,8 @@ namespace cppcanvas multiplied. For a normal, opaque bitmap, this will make the bitmap appear transparent with the given alpha value (value must be in the range [0,1]). - - @return whether the rendering finished successfully. */ - virtual bool drawAlphaModulated( double nAlphaModulation ) const = 0; + virtual void drawAlphaModulated( double nAlphaModulation ) const = 0; virtual BitmapCanvasSharedPtr getBitmapCanvas() const = 0; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits