Kaydet (Commit) 0f28c861 authored tarafından Noel Grandin's avatar Noel Grandin

loplugin:unused-returns in basegfx..cppcanvas

Change-Id: I32dc8c92871c8349651d2f4204a332d387e6e1b2
Reviewed-on: https://gerrit.libreoffice.org/48428Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 8fd13c35
...@@ -85,7 +85,7 @@ namespace basegfx ...@@ -85,7 +85,7 @@ namespace basegfx
*mpImpl = Impl3DHomMatrix(); *mpImpl = Impl3DHomMatrix();
} }
bool B3DHomMatrix::invert() void B3DHomMatrix::invert()
{ {
Impl3DHomMatrix aWork(*mpImpl); Impl3DHomMatrix aWork(*mpImpl);
std::unique_ptr<sal_uInt16[]> pIndex( new sal_uInt16[Impl3DHomMatrix_Base::getEdgeLength()] ); std::unique_ptr<sal_uInt16[]> pIndex( new sal_uInt16[Impl3DHomMatrix_Base::getEdgeLength()] );
...@@ -94,10 +94,7 @@ namespace basegfx ...@@ -94,10 +94,7 @@ namespace basegfx
if(aWork.ludcmp(pIndex.get(), nParity)) if(aWork.ludcmp(pIndex.get(), nParity))
{ {
mpImpl->doInvert(aWork, pIndex.get()); mpImpl->doInvert(aWork, pIndex.get());
return true;
} }
return false;
} }
double B3DHomMatrix::determinant() const double B3DHomMatrix::determinant() const
...@@ -376,15 +373,15 @@ namespace basegfx ...@@ -376,15 +373,15 @@ namespace basegfx
mpImpl->doMulMatrix(aOrientationMat); 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 // when perspective is used, decompose is not made here
if(!mpImpl->isLastLineDefault()) if(!mpImpl->isLastLineDefault())
return false; return;
// If determinant is zero, decomposition is not possible // If determinant is zero, decomposition is not possible
if(determinant() == 0.0) if(determinant() == 0.0)
return false; return;
// isolate translation // isolate translation
rTranslate.setX(mpImpl->get(0, 3)); rTranslate.setX(mpImpl->get(0, 3));
...@@ -536,8 +533,6 @@ namespace basegfx ...@@ -536,8 +533,6 @@ namespace basegfx
// correct rotate values // correct rotate values
rRotate.correctValues(); rRotate.correctValues();
} }
return true;
} }
} // end of namespace basegfx } // end of namespace basegfx
......
...@@ -292,10 +292,8 @@ namespace cairocanvas ...@@ -292,10 +292,8 @@ namespace cairocanvas
* *
* Note: some text effects are not rendered due to lacking generic canvas or cairo canvas * Note: some text effects are not rendered due to lacking generic canvas or cairo canvas
* implementation. See issues 92657, 92658, 92659, 92660, 97529 * 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, OutputDevice& rOutDev,
const Point& rOutpos, const Point& rOutpos,
const rendering::ViewState& viewState, const rendering::ViewState& viewState,
...@@ -360,19 +358,19 @@ namespace cairocanvas ...@@ -360,19 +358,19 @@ namespace cairocanvas
rOutDev.DrawTextArray( rOutpos, maText.Text, aOffsets.get(), rOutDev.DrawTextArray( rOutpos, maText.Text, aOffsets.get(),
::canvas::tools::numeric_cast<sal_uInt16>(maText.StartPosition), ::canvas::tools::numeric_cast<sal_uInt16>(maText.StartPosition),
::canvas::tools::numeric_cast<sal_uInt16>(maText.Length) ); ::canvas::tools::numeric_cast<sal_uInt16>(maText.Length) );
return true; return;
} }
else // VCL FALLBACK - without advances else // VCL FALLBACK - without advances
{ {
rOutDev.DrawText( rOutpos, maText.Text, rOutDev.DrawText( rOutpos, maText.Text,
::canvas::tools::numeric_cast<sal_uInt16>(maText.StartPosition), ::canvas::tools::numeric_cast<sal_uInt16>(maText.StartPosition),
::canvas::tools::numeric_cast<sal_uInt16>(maText.Length) ); ::canvas::tools::numeric_cast<sal_uInt16>(maText.Length) );
return true; return;
} }
} }
if (aSysLayoutData.rGlyphData.empty()) if (aSysLayoutData.rGlyphData.empty())
return false; //??? false? return; //??? false?
/** /**
* Setup platform independent glyph vector into cairo-based glyphs vector. * Setup platform independent glyph vector into cairo-based glyphs vector.
...@@ -503,7 +501,6 @@ namespace cairocanvas ...@@ -503,7 +501,6 @@ namespace cairocanvas
cairo_font_face_destroy(font_face); cairo_font_face_destroy(font_face);
cairo_font_options_destroy(options); cairo_font_options_destroy(options);
} }
return true;
} }
namespace namespace
......
...@@ -82,7 +82,7 @@ namespace cairocanvas ...@@ -82,7 +82,7 @@ namespace cairocanvas
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
bool draw( ::cairo::CairoSharedPtr const & pSCairo, void draw( ::cairo::CairoSharedPtr const & pSCairo,
OutputDevice& rOutDev, OutputDevice& rOutDev,
const Point& rOutpos, const Point& rOutpos,
const css::rendering::ViewState& viewState, const css::rendering::ViewState& viewState,
......
...@@ -22,10 +22,10 @@ namespace oglcanvas ...@@ -22,10 +22,10 @@ namespace oglcanvas
virtual ~IBufferContext() {} virtual ~IBufferContext() {}
/// start render to buffer. changes current framebuffer /// start render to buffer. changes current framebuffer
virtual bool startBufferRendering() = 0; virtual void startBufferRendering() = 0;
/// end render to buffer. switches to default framebuffer /// end render to buffer. switches to default framebuffer
virtual bool endBufferRendering() = 0; virtual void endBufferRendering() = 0;
virtual GLuint getTextureId() = 0; virtual GLuint getTextureId() = 0;
}; };
......
...@@ -154,9 +154,9 @@ namespace oglcanvas ...@@ -154,9 +154,9 @@ namespace oglcanvas
maDeviceHelper.hide(xSprite); maDeviceHelper.hide(xSprite);
} }
bool SpriteCanvas::renderRecordedActions() const void SpriteCanvas::renderRecordedActions() const
{ {
return maCanvasHelper.renderRecordedActions(); maCanvasHelper.renderRecordedActions();
} }
static uno::Reference<uno::XInterface> initCanvas( SpriteCanvas* pCanvas ) static uno::Reference<uno::XInterface> initCanvas( SpriteCanvas* pCanvas )
......
...@@ -103,7 +103,7 @@ namespace oglcanvas ...@@ -103,7 +103,7 @@ namespace oglcanvas
/** Write out recorded actions /** Write out recorded actions
*/ */
bool renderRecordedActions() const; void renderRecordedActions() const;
private: private:
css::uno::Sequence< css::uno::Any > maArguments; css::uno::Sequence< css::uno::Any > maArguments;
......
...@@ -520,16 +520,14 @@ namespace oglcanvas ...@@ -520,16 +520,14 @@ namespace oglcanvas
GLuint mnDepthId; GLuint mnDepthId;
GLuint mnTextureId; GLuint mnTextureId;
virtual bool startBufferRendering() override virtual void startBufferRendering() override
{ {
glBindFramebuffer(GL_FRAMEBUFFER, mnFrambufferId); glBindFramebuffer(GL_FRAMEBUFFER, mnFrambufferId);
return true;
} }
virtual bool endBufferRendering() override virtual void endBufferRendering() override
{ {
glBindFramebuffer(GL_FRAMEBUFFER, 0); glBindFramebuffer(GL_FRAMEBUFFER, 0);
return true;
} }
virtual GLuint getTextureId() override virtual GLuint getTextureId() override
......
...@@ -176,13 +176,11 @@ namespace oglcanvas ...@@ -176,13 +176,11 @@ namespace oglcanvas
return maText; return maText;
} }
bool TextLayout::draw( const rendering::ViewState& /*rViewState*/, void TextLayout::draw( const rendering::ViewState& /*rViewState*/,
const rendering::RenderState& /*rRenderState*/, const rendering::RenderState& /*rRenderState*/,
const uno::Reference< rendering::XGraphicDevice >& /*xGraphicDevice*/ ) const const uno::Reference< rendering::XGraphicDevice >& /*xGraphicDevice*/ ) const
{ {
// TODO // TODO
return true;
} }
} }
......
...@@ -61,7 +61,7 @@ namespace oglcanvas ...@@ -61,7 +61,7 @@ namespace oglcanvas
virtual css::uno::Reference< css::rendering::XCanvasFont > SAL_CALL getFont( ) override; virtual css::uno::Reference< css::rendering::XCanvasFont > SAL_CALL getFont( ) override;
virtual css::rendering::StringContext SAL_CALL getText( ) 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::rendering::RenderState& rRenderState,
const css::uno::Reference< const css::uno::Reference<
css::rendering::XGraphicDevice >& xGraphicDevice ) const; css::rendering::XGraphicDevice >& xGraphicDevice ) const;
......
...@@ -134,7 +134,7 @@ namespace canvas ...@@ -134,7 +134,7 @@ namespace canvas
bool mbIsDirty; bool mbIsDirty;
private: private:
bool refresh( canvas::IColorBuffer& rBuffer ) const; void refresh( canvas::IColorBuffer& rBuffer ) const;
void prepareRendering(); void prepareRendering();
basegfx::B2DRectangle getUVCoords() const; basegfx::B2DRectangle getUVCoords() const;
......
...@@ -833,7 +833,7 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::CopyAndGetEmb ...@@ -833,7 +833,7 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::CopyAndGetEmb
return xResult; 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 // get the object name before(!) it is assigned to a new storage
uno::Reference < embed::XEmbedPersist > xPersist( xObj, uno::UNO_QUERY ); uno::Reference < embed::XEmbedPersist > xPersist( xObj, uno::UNO_QUERY );
...@@ -891,18 +891,14 @@ bool EmbeddedObjectContainer::MoveEmbeddedObject( EmbeddedObjectContainer& rSrc, ...@@ -891,18 +891,14 @@ bool EmbeddedObjectContainer::MoveEmbeddedObject( EmbeddedObjectContainer& rSrc,
// rSrc.RemoveGraphicStream( aName ); // rSrc.RemoveGraphicStream( aName );
} }
return bRet;
} }
// #i119941, bKeepToTempStorage: use to specify whether store the removed object to temporary storage+ // #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 ); uno::Reference < embed::XEmbeddedObject > xObj = GetEmbeddedObject( rName );
if ( xObj.is() ) if ( xObj.is() )
return RemoveEmbeddedObject( xObj, bKeepToTempStorage ); RemoveEmbeddedObject( xObj, bKeepToTempStorage );
else
return false;
} }
bool EmbeddedObjectContainer::MoveEmbeddedObject( const OUString& rName, EmbeddedObjectContainer& rCnt ) bool EmbeddedObjectContainer::MoveEmbeddedObject( const OUString& rName, EmbeddedObjectContainer& rCnt )
...@@ -1066,7 +1062,7 @@ bool EmbeddedObjectContainer::RemoveEmbeddedObject( const uno::Reference < embed ...@@ -1066,7 +1062,7 @@ bool EmbeddedObjectContainer::RemoveEmbeddedObject( const uno::Reference < embed
return true; 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 // disconnect the object from the container and close it if possible
...@@ -1097,8 +1093,6 @@ bool EmbeddedObjectContainer::CloseEmbeddedObject( const uno::Reference < embed: ...@@ -1097,8 +1093,6 @@ bool EmbeddedObjectContainer::CloseEmbeddedObject( const uno::Reference < embed:
// TODO/LATER: what if the object can not be closed? // TODO/LATER: what if the object can not be closed?
} }
} }
return bFound;
} }
uno::Reference < io::XInputStream > EmbeddedObjectContainer::GetGraphicStream( const OUString& aName, OUString* pMediaType ) uno::Reference < io::XInputStream > EmbeddedObjectContainer::GetGraphicStream( const OUString& aName, OUString* pMediaType )
...@@ -1200,7 +1194,7 @@ bool EmbeddedObjectContainer::InsertGraphicStreamDirectly( const css::uno::Refer ...@@ -1200,7 +1194,7 @@ bool EmbeddedObjectContainer::InsertGraphicStreamDirectly( const css::uno::Refer
} }
bool EmbeddedObjectContainer::RemoveGraphicStream( const OUString& rObjectName ) void EmbeddedObjectContainer::RemoveGraphicStream( const OUString& rObjectName )
{ {
try try
{ {
...@@ -1209,10 +1203,7 @@ bool EmbeddedObjectContainer::RemoveGraphicStream( const OUString& rObjectName ) ...@@ -1209,10 +1203,7 @@ bool EmbeddedObjectContainer::RemoveGraphicStream( const OUString& rObjectName )
} }
catch (const uno::Exception&) catch (const uno::Exception&)
{ {
return false;
} }
return true;
} }
namespace { namespace {
void InsertStreamIntoPicturesStorage_Impl( const uno::Reference< embed::XStorage >& xDocStor, void InsertStreamIntoPicturesStorage_Impl( const uno::Reference< embed::XStorage >& xDocStor,
......
...@@ -1834,10 +1834,8 @@ namespace comphelper ...@@ -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 // no push when SafeModeDir exists, it may be Office's exit after SafeMode
// where SafeMode flag is already deleted, but SafeModeDir cleanup is not // where SafeMode flag is already deleted, but SafeModeDir cleanup is not
// done yet (is done at next startup) // done yet (is done at next startup)
...@@ -1851,21 +1849,17 @@ namespace comphelper ...@@ -1851,21 +1849,17 @@ namespace comphelper
// process all files in question recursively // process all files in question recursively
if (!maDirs.empty() || !maFiles.empty()) if (!maDirs.empty() || !maFiles.empty())
{ {
bDidPush = tryPush_Files( tryPush_Files(
maDirs, maDirs,
maFiles, maFiles,
maUserConfigWorkURL, maUserConfigWorkURL,
aPackURL); 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 // no push when SafeModeDir exists, it may be Office's exit after SafeMode
// where SafeMode flag is already deleted, but SafeModeDir cleanup is not // where SafeMode flag is already deleted, but SafeModeDir cleanup is not
// done yet (is done at next startup) // done yet (is done at next startup)
...@@ -1873,10 +1867,8 @@ namespace comphelper ...@@ -1873,10 +1867,8 @@ namespace comphelper
{ {
const OUString aPackURL(getPackURL()); const OUString aPackURL(getPackURL());
bDidPush = tryPush_extensionInfo(aPackURL); tryPush_extensionInfo(aPackURL);
} }
return bDidPush;
} }
bool BackupFileHelper::isPopPossible() bool BackupFileHelper::isPopPossible()
...@@ -1904,7 +1896,7 @@ namespace comphelper ...@@ -1904,7 +1896,7 @@ namespace comphelper
return bPopPossible; return bPopPossible;
} }
bool BackupFileHelper::tryPop() void BackupFileHelper::tryPop()
{ {
bool bDidPop(false); bool bDidPop(false);
...@@ -1931,8 +1923,6 @@ namespace comphelper ...@@ -1931,8 +1923,6 @@ namespace comphelper
osl::Directory::remove(aPackURL); osl::Directory::remove(aPackURL);
} }
} }
return bDidPop;
} }
bool BackupFileHelper::isPopPossibleExtensionInfo() const bool BackupFileHelper::isPopPossibleExtensionInfo() const
...@@ -1949,7 +1939,7 @@ namespace comphelper ...@@ -1949,7 +1939,7 @@ namespace comphelper
return bPopPossible; return bPopPossible;
} }
bool BackupFileHelper::tryPopExtensionInfo() void BackupFileHelper::tryPopExtensionInfo()
{ {
bool bDidPop(false); bool bDidPop(false);
...@@ -1965,8 +1955,6 @@ namespace comphelper ...@@ -1965,8 +1955,6 @@ namespace comphelper
osl::Directory::remove(aPackURL); osl::Directory::remove(aPackURL);
} }
} }
return bDidPop;
} }
bool BackupFileHelper::isTryDisableAllExtensionsPossible() bool BackupFileHelper::isTryDisableAllExtensionsPossible()
......
...@@ -357,7 +357,7 @@ bool OPropertyContainerHelper::convertFastPropertyValue( ...@@ -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 // get the property somebody is asking for
PropertiesIterator aPos = searchHandle(_nHandle); PropertiesIterator aPos = searchHandle(_nHandle);
...@@ -366,7 +366,7 @@ bool OPropertyContainerHelper::setFastPropertyValue(sal_Int32 _nHandle, const An ...@@ -366,7 +366,7 @@ bool OPropertyContainerHelper::setFastPropertyValue(sal_Int32 _nHandle, const An
OSL_FAIL( "OPropertyContainerHelper::setFastPropertyValue: unknown handle!" ); 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 // should not happen if the derived class has built a correct property set info helper to be used by
// our base class OPropertySetHelper // our base class OPropertySetHelper
return false; return;
} }
bool bSuccess = true; bool bSuccess = true;
...@@ -395,8 +395,6 @@ bool OPropertyContainerHelper::setFastPropertyValue(sal_Int32 _nHandle, const An ...@@ -395,8 +395,6 @@ bool OPropertyContainerHelper::setFastPropertyValue(sal_Int32 _nHandle, const An
break; break;
} }
return bSuccess;
} }
void OPropertyContainerHelper::getFastPropertyValue(Any& _rValue, sal_Int32 _nHandle) const void OPropertyContainerHelper::getFastPropertyValue(Any& _rValue, sal_Int32 _nHandle) const
......
...@@ -770,11 +770,11 @@ namespace dbtools ...@@ -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!" ); OSL_PRECOND( isAlive(), "ParameterManager::getConnection: not initialized, or already disposed!" );
if ( !isAlive() ) if ( !isAlive() )
return false; return;
_rxConnection.clear(); _rxConnection.clear();
try try
...@@ -788,7 +788,6 @@ namespace dbtools ...@@ -788,7 +788,6 @@ namespace dbtools
{ {
SAL_WARN( "connectivity.commontools", "ParameterManager::getConnection: could not retrieve the connection of the !" ); SAL_WARN( "connectivity.commontools", "ParameterManager::getConnection: could not retrieve the connection of the !" );
} }
return _rxConnection.is();
} }
......
...@@ -134,7 +134,7 @@ ONDXPagePtr const & ODbaseIndex::getRoot() ...@@ -134,7 +134,7 @@ ONDXPagePtr const & ODbaseIndex::getRoot()
return m_aRoot; return m_aRoot;
} }
bool ODbaseIndex::openIndexFile() void ODbaseIndex::openIndexFile()
{ {
if(!m_pFileStream) if(!m_pFileStream)
{ {
...@@ -160,8 +160,6 @@ bool ODbaseIndex::openIndexFile() ...@@ -160,8 +160,6 @@ bool ODbaseIndex::openIndexFile()
::dbtools::throwGenericSQLException( sError, *this ); ::dbtools::throwGenericSQLException( sError, *this );
} }
} }
return m_pFileStream != nullptr;
} }
OIndexIterator* ODbaseIndex::createIterator() OIndexIterator* ODbaseIndex::createIterator()
......
...@@ -442,13 +442,12 @@ public: ...@@ -442,13 +442,12 @@ public:
m_pContacts = nullptr; m_pContacts = nullptr;
} }
virtual bool executeQuery (EBook* pBook, EBookQuery* pQuery, OString &/*rPassword*/) override virtual void executeQuery (EBook* pBook, EBookQuery* pQuery, OString &/*rPassword*/) override
{ {
freeContacts(); freeContacts();
char *sexp = e_book_query_to_string( pQuery ); 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); g_free (sexp);
return bSuccess;
} }
virtual EContact *getContact(sal_Int32 nIndex) override virtual EContact *getContact(sal_Int32 nIndex) override
...@@ -568,12 +567,11 @@ public: ...@@ -568,12 +567,11 @@ public:
m_pContacts = nullptr; m_pContacts = nullptr;
} }
virtual bool executeQuery (EBook* pBook, EBookQuery* pQuery, OString &rPassword) override virtual void executeQuery (EBook* pBook, EBookQuery* pQuery, OString &rPassword) override
{ {
freeContacts(); freeContacts();
ESource *pSource = e_book_get_source( pBook ); ESource *pSource = e_book_get_source( pBook );
bool bSuccess = false;
bool bAuthSuccess = true; bool bAuthSuccess = true;
if( isAuthRequired( pBook ) ) if( isAuthRequired( pBook ) )
...@@ -584,9 +582,7 @@ public: ...@@ -584,9 +582,7 @@ public:
} }
if (bAuthSuccess) if (bAuthSuccess)
bSuccess = e_book_get_contacts( pBook, pQuery, &m_pContacts, nullptr ); e_book_get_contacts( pBook, pQuery, &m_pContacts, nullptr );
return bSuccess;
} }
virtual EContact *getContact(sal_Int32 nIndex) override virtual EContact *getContact(sal_Int32 nIndex) override
......
...@@ -53,7 +53,7 @@ namespace connectivity ...@@ -53,7 +53,7 @@ namespace connectivity
{ {
public: public:
virtual EBook* openBook(const char *abname) = 0; 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 void freeContacts() = 0;
virtual bool isLDAP( EBook *pBook ) = 0; virtual bool isLDAP( EBook *pBook ) = 0;
virtual bool isLocal( EBook *pBook ) = 0; virtual bool isLocal( EBook *pBook ) = 0;
......
...@@ -1166,7 +1166,7 @@ void OResultSet::sortRows() ...@@ -1166,7 +1166,7 @@ void OResultSet::sortRows()
} }
bool OResultSet::OpenImpl() void OResultSet::OpenImpl()
{ {
OSL_ENSURE(m_pSQLAnalyzer,"No analyzer set with setSqlAnalyzer!"); OSL_ENSURE(m_pSQLAnalyzer,"No analyzer set with setSqlAnalyzer!");
if(!m_pTable.is()) if(!m_pTable.is())
...@@ -1383,7 +1383,7 @@ bool OResultSet::OpenImpl() ...@@ -1383,7 +1383,7 @@ bool OResultSet::OpenImpl()
if(!m_pTable->InsertRow(*m_aAssignValues, m_xColsIdx)) if(!m_pTable->InsertRow(*m_aAssignValues, m_xColsIdx))