summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-01-11 08:40:36 +0200
committerNoel Grandin <noel@peralex.com>2016-01-11 10:49:24 +0200
commitf7c23897a354d9856ecaa5f7252520a350229bfa (patch)
tree1e8a006460cdd49683d410eb6352211d38b6f9f7
parent889fc93087ae1b57348803014c0a6090fd48c06f (diff)
loplugin:unusedmethods unused return value in dbaccess
Change-Id: Ia7ec0209a635f8482b6ccbaa7ba48a8c6da79090
-rw-r--r--dbaccess/source/core/api/RowSet.cxx6
-rw-r--r--dbaccess/source/core/api/RowSet.hxx9
-rw-r--r--dbaccess/source/core/api/RowSetCache.cxx8
-rw-r--r--dbaccess/source/core/api/RowSetCache.hxx2
-rw-r--r--dbaccess/source/core/api/RowSetCacheIterator.cxx32
-rw-r--r--dbaccess/source/core/api/RowSetCacheIterator.hxx4
-rw-r--r--dbaccess/source/core/api/RowSetRow.hxx23
-rw-r--r--dbaccess/source/core/dataaccess/commanddefinition.hxx1
-rw-r--r--dbaccess/source/core/dataaccess/documentdefinition.cxx12
-rw-r--r--dbaccess/source/core/dataaccess/documentdefinition.hxx2
-rw-r--r--dbaccess/source/ext/macromigration/macromigrationpages.cxx5
-rw-r--r--dbaccess/source/ext/macromigration/macromigrationpages.hxx3
-rw-r--r--dbaccess/source/ext/macromigration/migrationengine.cxx14
-rw-r--r--dbaccess/source/inc/dsntypes.hxx4
-rw-r--r--dbaccess/source/ui/browser/sbagrid.cxx5
-rw-r--r--dbaccess/source/ui/control/RelationControl.cxx4
-rw-r--r--dbaccess/source/ui/dlg/UserAdminDlg.cxx4
-rw-r--r--dbaccess/source/ui/dlg/adminpages.hxx12
-rw-r--r--dbaccess/source/ui/dlg/advancedsettings.cxx4
-rw-r--r--dbaccess/source/ui/dlg/dbadmin.cxx4
-rw-r--r--dbaccess/source/ui/dlg/dbwiz.cxx3
-rw-r--r--dbaccess/source/ui/dlg/dbwizsetup.cxx3
-rw-r--r--dbaccess/source/ui/inc/ConnectionLineData.hxx2
-rw-r--r--dbaccess/source/ui/inc/IItemSetHelper.hxx2
-rw-r--r--dbaccess/source/ui/inc/JoinTableView.hxx3
-rw-r--r--dbaccess/source/ui/inc/RelationControl.hxx2
-rw-r--r--dbaccess/source/ui/inc/TableConnection.hxx4
-rw-r--r--dbaccess/source/ui/inc/TableConnectionData.hxx2
-rw-r--r--dbaccess/source/ui/inc/TableFieldDescription.hxx1
-rw-r--r--dbaccess/source/ui/inc/TypeInfo.hxx2
-rw-r--r--dbaccess/source/ui/inc/UserAdminDlg.hxx2
-rw-r--r--dbaccess/source/ui/inc/advancedsettingsdlg.hxx2
-rw-r--r--dbaccess/source/ui/inc/charsets.hxx4
-rw-r--r--dbaccess/source/ui/inc/dbadmin.hxx2
-rw-r--r--dbaccess/source/ui/inc/dbwiz.hxx2
-rw-r--r--dbaccess/source/ui/inc/dbwizsetup.hxx2
-rw-r--r--dbaccess/source/ui/inc/querycontainerwindow.hxx2
-rw-r--r--dbaccess/source/ui/inc/querycontroller.hxx2
-rw-r--r--dbaccess/source/ui/inc/sbagrid.hxx2
-rw-r--r--dbaccess/source/ui/querydesign/ConnectionLineData.cxx3
-rw-r--r--dbaccess/source/ui/querydesign/JoinTableView.cxx6
-rw-r--r--dbaccess/source/ui/querydesign/TableConnection.cxx7
-rw-r--r--dbaccess/source/ui/querydesign/TableConnectionData.cxx11
-rw-r--r--dbaccess/source/ui/querydesign/TableFieldDescription.cxx15
-rw-r--r--dbaccess/source/ui/querydesign/querycontroller.cxx3
-rw-r--r--dbaccess/source/ui/tabledesign/TEditControl.cxx12
-rw-r--r--dbaccess/source/ui/tabledesign/TEditControl.hxx4
47 files changed, 71 insertions, 192 deletions
diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx
index 9487dfe36b7c..58e450859e7b 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -2269,12 +2269,12 @@ void ORowSet::impl_resetTables_nothrow()
DELETEZ( m_pTables );
}
-bool ORowSet::impl_initComposer_throw( OUString& _out_rCommandToExecute )
+void ORowSet::impl_initComposer_throw( OUString& _out_rCommandToExecute )
{
bool bUseEscapeProcessing = impl_buildActiveCommand_throw( );
_out_rCommandToExecute = m_aActiveCommand;
if ( !bUseEscapeProcessing )
- return bUseEscapeProcessing;
+ return;
if (m_bCommandFacetsDirty)
m_xComposer = nullptr;
@@ -2319,8 +2319,6 @@ bool ORowSet::impl_initComposer_throw( OUString& _out_rCommandToExecute )
_out_rCommandToExecute = m_xComposer->getQueryWithSubstitution();
m_bCommandFacetsDirty = false;
-
- return bUseEscapeProcessing;
}
bool ORowSet::impl_buildActiveCommand_throw()
diff --git a/dbaccess/source/core/api/RowSet.hxx b/dbaccess/source/core/api/RowSet.hxx
index f8d52df8e839..75822a4b0732 100644
--- a/dbaccess/source/core/api/RowSet.hxx
+++ b/dbaccess/source/core/api/RowSet.hxx
@@ -156,13 +156,6 @@ namespace dbaccess
The command which is to be executed, according to the current settings -
it is built from our active command plus our current filter/order criterions.
- @return
- whether we should use escape processing before executing the actual command. This is determined
- from our own EscapeProcessing property, and possibly overruled by the respective property
- of a query we're based on.
- Effectively, this value determines whether or not we actually have an composer (m_xComposer)
- and dependent information (such as the parameters container).
-
@precond
m_xActiveConnection points to a valid SDB-level connection
@@ -172,7 +165,7 @@ namespace dbaccess
@throws css::uno::RuntimeException
if any of the components involved throws a css::uno::RuntimeException
*/
- bool impl_initComposer_throw( OUString& _out_rCommandToExecute );
+ void impl_initComposer_throw( OUString& _out_rCommandToExecute );
/** returns the table container of our active connection
diff --git a/dbaccess/source/core/api/RowSetCache.cxx b/dbaccess/source/core/api/RowSetCache.cxx
index 1ba973ce8b6c..f1b81a11b577 100644
--- a/dbaccess/source/core/api/RowSetCache.cxx
+++ b/dbaccess/source/core/api/RowSetCache.cxx
@@ -834,7 +834,7 @@ bool ORowSetCache::fillMatrix(sal_Int32& _nNewStartPos, sal_Int32 &_nNewEndPos)
// If m_nPosition is out of the current window,
// move it and update m_nStartPos and m_nEndPos
// Caller is responsible for updating m_aMatrixIter
-bool ORowSetCache::moveWindow()
+void ORowSetCache::moveWindow()
{
OSL_ENSURE(m_nStartPos >= 0,"ORowSetCache::moveWindow: m_nStartPos is less than 0!");
OSL_ENSURE(m_nEndPos >= m_nStartPos,"ORowSetCache::moveWindow: m_nStartPos not smaller than m_nEndPos");
@@ -870,7 +870,7 @@ bool ORowSetCache::moveWindow()
m_bRowCountFinal = true;
}
}
- return true;
+ return;
}
bool bRet = true;
@@ -958,7 +958,7 @@ bool ORowSetCache::moveWindow()
else
{ // normally this should never happen
OSL_FAIL("What the hell is happen here!");
- return false;
+ return;
}
}
else
@@ -1084,8 +1084,6 @@ bool ORowSetCache::moveWindow()
OSL_ENSURE(m_nStartPos >= 0,"ORowSetCache::moveWindow: m_nStartPos is less than 0!");
OSL_ENSURE(m_nEndPos > m_nStartPos,"ORowSetCache::moveWindow: m_nStartPos not smaller than m_nEndPos");
OSL_ENSURE(m_nEndPos-m_nStartPos <= m_nFetchSize,"ORowSetCache::moveWindow: m_nStartPos and m_nEndPos too far apart");
-
- return bRet;
}
bool ORowSetCache::first( )
diff --git a/dbaccess/source/core/api/RowSetCache.hxx b/dbaccess/source/core/api/RowSetCache.hxx
index a8eeaa009617..a41aaf7d0f1b 100644
--- a/dbaccess/source/core/api/RowSetCache.hxx
+++ b/dbaccess/source/core/api/RowSetCache.hxx
@@ -97,7 +97,7 @@ namespace dbaccess
bool fill(ORowSetMatrix::iterator& _aIter, const ORowSetMatrix::const_iterator& _aEnd, sal_Int32& _nPos, bool _bCheck);
bool reFillMatrix(sal_Int32 _nNewStartPos,sal_Int32 nNewEndPos);
bool fillMatrix(sal_Int32 &_nNewStartPos,sal_Int32 &_nNewEndPos);
- bool moveWindow();
+ void moveWindow();
void rotateCacheIterator(ORowSetMatrix::difference_type _nDist);
void updateValue(sal_Int32 columnIndex
diff --git a/dbaccess/source/core/api/RowSetCacheIterator.cxx b/dbaccess/source/core/api/RowSetCacheIterator.cxx
index dc4bf72ee10d..bc1c9155eb52 100644
--- a/dbaccess/source/core/api/RowSetCacheIterator.cxx
+++ b/dbaccess/source/core/api/RowSetCacheIterator.cxx
@@ -57,38 +57,11 @@ ORowSetRow& ORowSetCacheIterator::operator *()
return *m_aIter->second.aIterator;
}
-const ORowSetRow& ORowSetCacheIterator::operator *() const
-{
- if ( !m_pRowSet->isInsertRow() && m_aIter->second.aIterator == m_pCache->m_pMatrix->end() )
- {
- OSL_ENSURE(m_aIter->second.aBookmark.hasValue(),"bookmark has no value!");
- OSL_VERIFY(m_pCache->moveToBookmark(m_aIter->second.aBookmark));
- m_aIter->second.aIterator = m_pCache->m_aMatrixIter;
- }
- return *m_aIter->second.aIterator;
-}
-
ORowSetMatrix::iterator& ORowSetCacheIterator::operator ->()
{
return m_aIter->second.aIterator;
}
-const ORowSetMatrix::iterator& ORowSetCacheIterator::operator ->() const
-{
- if ( !m_pRowSet->isInsertRow() && m_aIter->second.aIterator == m_pCache->m_pMatrix->end() )
- {
- OSL_ENSURE(m_aIter->second.aBookmark.hasValue(),"bookmark has no value!");
- OSL_VERIFY(m_pCache->moveToBookmark(m_aIter->second.aBookmark));
- m_aIter->second.aIterator = m_pCache->m_aMatrixIter;
- }
- return m_aIter->second.aIterator;
-}
-
-bool ORowSetCacheIterator::operator <=(const ORowSetMatrix::iterator& _rRH) const
-{
- return m_aIter->second.aIterator <= _rRH;
-}
-
bool ORowSetCacheIterator::operator <(const ORowSetMatrix::iterator& _rRH) const
{
return m_aIter->second.aIterator < _rRH;
@@ -99,11 +72,6 @@ bool ORowSetCacheIterator::operator !=(const ORowSetMatrix::iterator& _rRH) cons
return m_aIter->second.aIterator != _rRH;
}
-bool ORowSetCacheIterator::operator ==(const ORowSetMatrix::iterator& _rRH) const
-{
- return m_aIter->second.aIterator == _rRH;
-}
-
void ORowSetCacheIterator::setBookmark(const css::uno::Any& _rBookmark)
{
m_aIter->second.aBookmark = _rBookmark;
diff --git a/dbaccess/source/core/api/RowSetCacheIterator.hxx b/dbaccess/source/core/api/RowSetCacheIterator.hxx
index 2f386cdfd4f0..43bc253e0aa9 100644
--- a/dbaccess/source/core/api/RowSetCacheIterator.hxx
+++ b/dbaccess/source/core/api/RowSetCacheIterator.hxx
@@ -61,15 +61,11 @@ namespace dbaccess
operator ORowSetMatrix::iterator();
ORowSetRow& operator *();
- const ORowSetRow& operator *() const;
ORowSetMatrix::iterator& operator ->();
- const ORowSetMatrix::iterator& operator ->() const;
- bool operator <=(const ORowSetMatrix::iterator& _rRH) const;
bool operator <(const ORowSetMatrix::iterator& _rRH) const;
bool operator !=(const ORowSetMatrix::iterator& _rRH) const;
- bool operator ==(const ORowSetMatrix::iterator& _rRH) const;
void setBookmark(const css::uno::Any& _rBookmark);
diff --git a/dbaccess/source/core/api/RowSetRow.hxx b/dbaccess/source/core/api/RowSetRow.hxx
index 2f23b03f91ad..604c1dfc65c8 100644
--- a/dbaccess/source/core/api/RowSetRow.hxx
+++ b/dbaccess/source/core/api/RowSetRow.hxx
@@ -50,29 +50,6 @@ namespace dbaccess
typedef ::rtl::Reference< ORowSetOldRowHelper > TORowSetOldRowHelperRef;
- class ORowSetValueCompare
- {
- const css::uno::Any& m_rAny;
- public:
- explicit ORowSetValueCompare(const css::uno::Any& _rAny) : m_rAny(_rAny){}
-
- bool operator ()(const ORowSetRow& _rRH)
- {
- switch((_rRH->get())[0].getTypeKind())
- {
- case css::sdbc::DataType::TINYINT:
- case css::sdbc::DataType::SMALLINT:
- case css::sdbc::DataType::INTEGER:
- return comphelper::getINT32(m_rAny) == (sal_Int32)(_rRH->get())[0];
- default:
- {
- css::uno::Sequence<sal_Int8> aSeq;
- m_rAny >>= aSeq;
- return aSeq == (_rRH->get())[0];
- }
- }
- }
- };
}
#endif // INCLUDED_DBACCESS_SOURCE_CORE_API_ROWSETROW_HXX
diff --git a/dbaccess/source/core/dataaccess/commanddefinition.hxx b/dbaccess/source/core/dataaccess/commanddefinition.hxx
index d885b270b7af..60a856337036 100644
--- a/dbaccess/source/core/dataaccess/commanddefinition.hxx
+++ b/dbaccess/source/core/dataaccess/commanddefinition.hxx
@@ -58,7 +58,6 @@ class OCommandDefinition : public OComponentDefinition
protected:
virtual ~OCommandDefinition();
- inline const OCommandDefinition_Impl& getCommandDefinition() const { return dynamic_cast< const OCommandDefinition_Impl& >( *m_pImpl.get() ); }
inline OCommandDefinition_Impl& getCommandDefinition() { return dynamic_cast< OCommandDefinition_Impl& >( *m_pImpl.get() ); }
public:
diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx
index c2c496d62524..9a1732f58abc 100644
--- a/dbaccess/source/core/dataaccess/documentdefinition.cxx
+++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx
@@ -1299,18 +1299,19 @@ bool ODocumentDefinition::save(bool _bApprove)
return true;
}
-bool ODocumentDefinition::saveAs()
+void ODocumentDefinition::saveAs()
{
// default handling: instantiate an interaction handler and let it handle the parameter request
if ( !m_bOpenInDesign )
- return false;
+ return;
{
osl::ClearableGuard< osl::Mutex > aGuard( m_aMutex );
if ( m_pImpl->m_aProps.aTitle.isEmpty() )
{
aGuard.clear();
- return save(false); // (sal_False) : we don't want an approve dialog
+ save(false); // (sal_False) : we don't want an approve dialog
+ return;
}
}
try
@@ -1340,9 +1341,9 @@ bool ODocumentDefinition::saveAs()
xHandler->handle(xRequest);
if ( pAbort->wasSelected() )
- return false;
+ return;
if ( pDisApprove->wasSelected() )
- return true;
+ return;
if ( pDocuSave->wasSelected() )
{
::osl::MutexGuard aGuard(m_aMutex);
@@ -1403,7 +1404,6 @@ bool ODocumentDefinition::saveAs()
{
OSL_FAIL("ODocumentDefinition::save: caught an Exception (tried to let the InteractionHandler handle it)!");
}
- return true;
}
namespace
diff --git a/dbaccess/source/core/dataaccess/documentdefinition.hxx b/dbaccess/source/core/dataaccess/documentdefinition.hxx
index 33a8fd973760..68d19a42de12 100644
--- a/dbaccess/source/core/dataaccess/documentdefinition.hxx
+++ b/dbaccess/source/core/dataaccess/documentdefinition.hxx
@@ -142,7 +142,7 @@ public:
getContainerStorage() const;
bool save(bool _bApprove);
- bool saveAs();
+ void saveAs();
void closeObject();
bool isModified();
inline bool isNewReport() const { return !m_bForm && !m_pImpl->m_aProps.bAsTemplate; }
diff --git a/dbaccess/source/ext/macromigration/macromigrationpages.cxx b/dbaccess/source/ext/macromigration/macromigrationpages.cxx
index 798c5b22bc76..8577d1c8cbc0 100644
--- a/dbaccess/source/ext/macromigration/macromigrationpages.cxx
+++ b/dbaccess/source/ext/macromigration/macromigrationpages.cxx
@@ -50,11 +50,6 @@ namespace dbmm
{
}
- const MacroMigrationDialog& MacroMigrationPage::getDialog() const
- {
- return *dynamic_cast< const MacroMigrationDialog* >( GetParentDialog() );
- }
-
MacroMigrationDialog& MacroMigrationPage::getDialog()
{
return *dynamic_cast< MacroMigrationDialog* >( GetParentDialog() );
diff --git a/dbaccess/source/ext/macromigration/macromigrationpages.hxx b/dbaccess/source/ext/macromigration/macromigrationpages.hxx
index a48be477795a..1eb0b399da4f 100644
--- a/dbaccess/source/ext/macromigration/macromigrationpages.hxx
+++ b/dbaccess/source/ext/macromigration/macromigrationpages.hxx
@@ -48,8 +48,7 @@ namespace dbmm
MacroMigrationPage(vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription);
protected:
- const MacroMigrationDialog& getDialog() const;
- MacroMigrationDialog& getDialog();
+ MacroMigrationDialog& getDialog();
};
// PreparationPage
diff --git a/dbaccess/source/ext/macromigration/migrationengine.cxx b/dbaccess/source/ext/macromigration/migrationengine.cxx
index 219fef7a1e94..2aa941cc7e4c 100644
--- a/dbaccess/source/ext/macromigration/migrationengine.cxx
+++ b/dbaccess/source/ext/macromigration/migrationengine.cxx
@@ -872,13 +872,13 @@ namespace dbmm
/** adjust the document-events which refer to macros/scripts in the document, taking into
account the new names of the moved libraries
*/
- bool impl_adjustDocumentEvents_nothrow(
+ void impl_adjustDocumentEvents_nothrow(
const SubDocument& _rDocument
) const;
/** adjusts the script references bound to form component events
*/
- bool impl_adjustFormComponentEvents_nothrow(
+ void impl_adjustFormComponentEvents_nothrow(
const SubDocument& _rDocument
) const;
@@ -1650,14 +1650,14 @@ namespace dbmm
return true;
}
- bool MigrationEngine_Impl::impl_adjustDocumentEvents_nothrow( const SubDocument& _rDocument ) const
+ void MigrationEngine_Impl::impl_adjustDocumentEvents_nothrow( const SubDocument& _rDocument ) const
{
try
{
Reference< XEventsSupplier > xSuppEvents( _rDocument.xDocument, UNO_QUERY );
if ( !xSuppEvents.is() )
// this is allowed. E.g. new-style reports currently do not support this
- return true;
+ return;
Reference< XNameReplace > xEvents( xSuppEvents->getEvents(), UNO_SET_THROW );
Sequence< OUString > aEventNames = xEvents->getElementNames();
@@ -1687,9 +1687,7 @@ namespace dbmm
lcl_getSubDocumentDescription( _rDocument ),
::cppu::getCaughtException()
) );
- return false;
}
- return true;
}
void MigrationEngine_Impl::impl_adjustDialogElementEvents_throw( const Reference< XInterface >& _rxElement ) const
@@ -1786,7 +1784,7 @@ namespace dbmm
}
}
- bool MigrationEngine_Impl::impl_adjustFormComponentEvents_nothrow( const SubDocument& _rDocument ) const
+ void MigrationEngine_Impl::impl_adjustFormComponentEvents_nothrow( const SubDocument& _rDocument ) const
{
try
{
@@ -1805,9 +1803,7 @@ namespace dbmm
lcl_getSubDocumentDescription( _rDocument ),
::cppu::getCaughtException()
) );
- return false;
}
- return true;
}
bool MigrationEngine_Impl::impl_unprotectPasswordLibrary_throw( const Reference< XLibraryContainerPassword >& _rxPasswordManager,
diff --git a/dbaccess/source/inc/dsntypes.hxx b/dbaccess/source/inc/dsntypes.hxx
index d16d532f834e..9ce1f7c7ac7a 100644
--- a/dbaccess/source/inc/dsntypes.hxx
+++ b/dbaccess/source/inc/dsntypes.hxx
@@ -206,13 +206,9 @@ public:
/// prefix increment
const TypeIterator& operator++();
- /// postfix increment
- const TypeIterator operator++(int) { TypeIterator hold(*this); ++*this; return hold; }
/// prefix decrement
const TypeIterator& operator--();
- /// postfix decrement
- const TypeIterator operator--(int) { TypeIterator hold(*this); --*this; return hold; }
protected:
TypeIterator(const ODsnTypeCollection* _pContainer, sal_Int32 _nInitialPos = 0);
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx
index 4505431b1396..47be954f1f20 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -583,7 +583,7 @@ void SbaGridHeader::MouseButtonDown( const MouseEvent& _rMEvt )
FmGridHeader::MouseButtonDown(_rMEvt);
}
-bool SbaGridHeader::ImplStartColumnDrag(sal_Int8 _nAction, const Point& _rMousePos)
+void SbaGridHeader::ImplStartColumnDrag(sal_Int8 _nAction, const Point& _rMousePos)
{
sal_uInt16 nId = GetItemId(_rMousePos);
bool bResizingCol = false;
@@ -610,10 +610,7 @@ bool SbaGridHeader::ImplStartColumnDrag(sal_Int8 _nAction, const Point& _rMouseP
_rMousePos.Y() - GetSizePixel().Height()
)
);
- return true;
}
-
- return false;
}
void SbaGridHeader::PreExecuteColumnContextMenu(sal_uInt16 nColId, PopupMenu& rMenu)
diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx
index 57bfb8a8139d..a6d5c274b2b6 100644
--- a/dbaccess/source/ui/control/RelationControl.cxx
+++ b/dbaccess/source/ui/control/RelationControl.cxx
@@ -678,9 +678,9 @@ namespace dbaui
m_pRC_Tables->Invalidate();
}
- bool OTableListBoxControl::SaveModified()
+ void OTableListBoxControl::SaveModified()
{
- return m_pRC_Tables->SaveModified();
+ m_pRC_Tables->SaveModified();
}
TTableWindowData::value_type OTableListBoxControl::getReferencingTable() const
diff --git a/dbaccess/source/ui/dlg/UserAdminDlg.cxx b/dbaccess/source/ui/dlg/UserAdminDlg.cxx
index fc2241f15043..ec3421f59b1f 100644
--- a/dbaccess/source/ui/dlg/UserAdminDlg.cxx
+++ b/dbaccess/source/ui/dlg/UserAdminDlg.cxx
@@ -172,9 +172,9 @@ namespace dbaui
{
(void)_bEnable;
}
- bool OUserAdminDlg::saveDatasource()
+ void OUserAdminDlg::saveDatasource()
{
- return PrepareLeaveCurrentPage();
+ PrepareLeaveCurrentPage();
}
} // namespace dbaui
diff --git a/dbaccess/source/ui/dlg/adminpages.hxx b/dbaccess/source/ui/dlg/adminpages.hxx
index 17d66a91684f..a3f0232d5870 100644
--- a/dbaccess/source/ui/dlg/adminpages.hxx
+++ b/dbaccess/source/ui/dlg/adminpages.hxx
@@ -36,8 +36,8 @@ namespace dbaui
{
public:
virtual ~ISaveValueWrapper() = 0;
- virtual bool SaveValue() = 0;
- virtual bool Disable() = 0;
+ virtual void SaveValue() = 0;
+ virtual void Disable() = 0;
};
template < class T > class OSaveValueWrapper : public ISaveValueWrapper
@@ -47,8 +47,8 @@ namespace dbaui
explicit OSaveValueWrapper(T* _pSaveValue) : m_pSaveValue(_pSaveValue)
{ OSL_ENSURE(m_pSaveValue,"Illegal argument!"); }
- virtual bool SaveValue() override { m_pSaveValue->SaveValue(); return true;} // bool return value only for stl
- virtual bool Disable() override { m_pSaveValue->Disable(); return true;} // bool return value only for stl
+ virtual void SaveValue() override { m_pSaveValue->SaveValue(); }
+ virtual void Disable() override { m_pSaveValue->Disable(); }
};
template < class T > class ODisableWrapper : public ISaveValueWrapper
@@ -58,8 +58,8 @@ namespace dbaui
explicit ODisableWrapper(T* _pSaveValue) : m_pSaveValue(_pSaveValue)
{ OSL_ENSURE(m_pSaveValue,"Illegal argument!"); }
- virtual bool SaveValue() override { return true;} // bool return value only for stl
- virtual bool Disable() override { m_pSaveValue->Disable(); return true;} // bool return value only for stl
+ virtual void SaveValue() override {}
+ virtual void Disable() override { m_pSaveValue->Disable(); }
};
// OGenericAdministrationPage
diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx b/dbaccess/source/ui/dlg/advancedsettings.cxx
index d7a0fd7cd1a0..8cb4310c8b83 100644
--- a/dbaccess/source/ui/dlg/advancedsettings.cxx
+++ b/dbaccess/source/ui/dlg/advancedsettings.cxx
@@ -540,9 +540,9 @@ namespace dbaui
(void)_bEnable;
}
- bool AdvancedSettingsDialog::saveDatasource()
+ void AdvancedSettingsDialog::saveDatasource()
{
- return PrepareLeaveCurrentPage();
+ PrepareLeaveCurrentPage();
}
} // namespace dbaui
diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx b/dbaccess/source/ui/dlg/dbadmin.cxx
index 26a0879ae7e8..ecf86d5d3539 100644
--- a/dbaccess/source/ui/dlg/dbadmin.cxx
+++ b/dbaccess/source/ui/dlg/dbadmin.cxx
@@ -229,9 +229,9 @@ void ODbAdminDialog::enableConfirmSettings( bool _bEnable )
(void)_bEnable;
}
-bool ODbAdminDialog::saveDatasource()
+void ODbAdminDialog::saveDatasource()
{
- return PrepareLeaveCurrentPage();
+ PrepareLeaveCurrentPage();
}
ODbAdminDialog::ApplyResult ODbAdminDialog::implApplyChanges()
diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx
index 85cf0b4a9a53..f494471ece74 100644
--- a/dbaccess/source/ui/dlg/dbwiz.cxx
+++ b/dbaccess/source/ui/dlg/dbwiz.cxx
@@ -320,7 +320,7 @@ void ODbTypeWizDialog::enableConfirmSettings( bool _bEnable )
// anormal tab dialog.
}
-bool ODbTypeWizDialog::saveDatasource()
+void ODbTypeWizDialog::saveDatasource()
{
SfxTabPage* pPage = static_cast<SfxTabPage*>(WizardDialog::GetPage(getCurrentState()));
if ( pPage )
@@ -330,7 +330,6 @@ bool ODbTypeWizDialog::saveDatasource()
if ( m_pImpl->getCurrentDataSource().is() )
m_pImpl->getCurrentDataSource()->getPropertyValue(PROPERTY_URL) >>= sOldURL;
DataSourceInfoConverter::convert( getORB(), m_pCollection,sOldURL,m_eType,m_pImpl->getCurrentDataSource());
- return true;
}
IWizardPageController* ODbTypeWizDialog::getPageController( TabPage* _pCurrentPage ) const
diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index e8bda3d711d0..776fc9505a36 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -635,12 +635,11 @@ void ODbTypeWizDialogSetup::enterState(WizardState _nState)
}
}
-bool ODbTypeWizDialogSetup::saveDatasource()
+void ODbTypeWizDialogSetup::saveDatasource()
{
SfxTabPage* pPage = static_cast<SfxTabPage*>(WizardDialog::GetPage(getCurrentState()));
if ( pPage )
pPage->FillItemSet(m_pOutSet);
- return true;
}
bool ODbTypeWizDialogSetup::leaveState(WizardState _nState)
diff --git a/dbaccess/source/ui/inc/ConnectionLineData.hxx b/dbaccess/source/ui/inc/ConnectionLineData.hxx
index 097999169adc..520797e18c74 100644
--- a/dbaccess/source/ui/inc/ConnectionLineData.hxx
+++ b/dbaccess/source/ui/inc/ConnectionLineData.hxx
@@ -70,7 +70,7 @@ namespace dbaui
OUString GetSourceFieldName() const { return GetFieldName(JTCS_FROM); }
OUString GetDestFieldName() const { return GetFieldName(JTCS_TO); }
- bool Reset();
+ void Reset();
OConnectionLineData& operator=( const OConnectionLineData& rConnLineData );
};
diff --git a/dbaccess/source/ui/inc/IItemSetHelper.hxx b/dbaccess/source/ui/inc/IItemSetHelper.hxx
index 17c90f2e5e7d..9cc898b1f8e5 100644
--- a/dbaccess/source/ui/inc/IItemSetHelper.hxx
+++ b/dbaccess/source/ui/inc/IItemSetHelper.hxx
@@ -55,7 +55,7 @@ namespace dbaui
virtual css::uno::Reference< css::sdbc::XDriver > getDriver() = 0;
virtual OUString getDatasourceType(const SfxItemSet& _rSet) const = 0;
virtual void clearPassword() = 0;
- virtual bool saveDatasource() = 0;
+ virtual void saveDatasource() = 0;
virtual void setTitle(const OUString& _sTitle) = 0;
/** enables or disables the user's possibility to confirm the settings
diff --git a/dbaccess/source/ui/inc/JoinTableView.hxx b/dbaccess/source/ui/inc/JoinTableView.hxx
index d59bd583c5e9..c5034724df7e 100644
--- a/dbaccess/source/ui/inc/JoinTableView.hxx
+++ b/dbaccess/source/ui/inc/JoinTableView.hxx
@@ -178,7 +178,6 @@ namespace dbaui
void SelectConn(OTableConnection* pConn);
OTableWindowMap& GetTabWinMap() { return m_aTableMap; }
- const OTableWindowMap& GetTabWinMap() const { return m_aTableMap; }
/** gives a read only access to the connection vector
*/
@@ -307,7 +306,7 @@ namespace dbaui
private:
void InitColors();
- bool ScrollWhileDragging();
+ void ScrollWhileDragging();
/** opens the context menu to delete a connection
@param _aPos the position where the popup menu should appear
diff --git a/dbaccess/source/ui/inc/RelationControl.hxx b/dbaccess/source/ui/inc/RelationControl.hxx
index fc23f23ab900..fe2191bdbee3 100644
--- a/dbaccess/source/ui/inc/RelationControl.hxx
+++ b/dbaccess/source/ui/inc/RelationControl.hxx
@@ -79,7 +79,7 @@ namespace dbaui
void Disable();
void Invalidate();
- bool SaveModified();
+ void SaveModified();
TTableWindowData::value_type getReferencingTable() const;
diff --git a/dbaccess/source/ui/inc/TableConnection.hxx b/dbaccess/source/ui/inc/TableConnection.hxx
index 130cdd7ce40f..20ee39555754 100644
--- a/dbaccess/source/ui/inc/TableConnection.hxx
+++ b/dbaccess/source/ui/inc/TableConnection.hxx
@@ -72,13 +72,13 @@ namespace dbaui
void Deselect();
bool IsSelected() const { return m_bSelected; }
bool CheckHit( const Point& rMousePos ) const;
- bool InvalidateConnection();
+ void InvalidateConnection();
void UpdateLineList();
OTableWindow* GetSourceWin() const;
OTableWindow* GetDestWin() const;
- bool RecalcLines();
+ void RecalcLines();
/** isTableConnection
@param _pTable the table where we should check if we belongs to it
diff --git a/dbaccess/source/ui/inc/TableConnectionData.hxx b/dbaccess/source/ui/inc/TableConnectionData.hxx
index 799ab8f12994..1e93fb5be00e 100644
--- a/dbaccess/source/ui/inc/TableConnectionData.hxx
+++ b/dbaccess/source/ui/inc/TableConnectionData.hxx
@@ -67,7 +67,7 @@ namespace dbaui
*/
virtual OTableConnectionData* NewInstance() const;
- bool SetConnLine( sal_uInt16 nIndex, const OUString& rSourceFieldName, const OUString& rDestFieldName );
+ void SetConnLine( sal_uInt16 nIndex, const OUString& rSourceFieldName, const OUString& rDestFieldName );
bool AppendConnLine( const OUString& rSourceFieldName, const OUString& rDestFieldName );
/** Deletes list of ConnLines
*/
diff --git a/dbaccess/source/ui/inc/TableFieldDescription.hxx b/dbaccess/source/ui/inc/TableFieldDescription.hxx
index 9ab6078fab08..3f60df883e97 100644
--- a/dbaccess/source/ui/inc/TableFieldDescription.hxx
+++ b/dbaccess/source/ui/inc/TableFieldDescription.hxx
@@ -73,7 +73,6 @@ namespace dbaui
inline bool IsEmpty() const;
OTableFieldDesc& operator=( const OTableFieldDesc& _aField );
- bool operator==( const OTableFieldDesc& rDesc );
bool IsVisible() const { return m_bVisible;}
bool IsGroupBy() const { return m_bGroupBy;}
diff --git a/dbaccess/source/ui/inc/TypeInfo.hxx b/dbaccess/source/ui/inc/TypeInfo.hxx
index 9d36403269ad..951964bf6f62 100644
--- a/dbaccess/source/ui/inc/TypeInfo.hxx
+++ b/dbaccess/source/ui/inc/TypeInfo.hxx
@@ -100,8 +100,6 @@ const sal_uInt16 TYPE_BIT = 31;
,bCaseSensitive(false)
,bUnsigned(false)
{}
- bool operator == (const OTypeInfo& lh) const { return lh.nType == nType; }
- bool operator != (const OTypeInfo& lh) const { return lh.nType != nType; }
inline OUString getDBName() const { return aTypeName; }
};
diff --git a/dbaccess/source/ui/inc/UserAdminDlg.hxx b/dbaccess/source/ui/inc/UserAdminDlg.hxx
index 9e654552e69e..e6e5949264b6 100644
--- a/dbaccess/source/ui/inc/UserAdminDlg.hxx
+++ b/dbaccess/source/ui/inc/UserAdminDlg.hxx
@@ -73,7 +73,7 @@ namespace dbaui
virtual css::uno::Reference< css::sdbc::XDriver > getDriver() override;
virtual OUString getDatasourceType(const SfxItemSet& _rSet) const override;
virtual void clearPassword() override;
- virtual bool saveDatasource() override;
+ virtual void saveDatasource() override;
virtual void setTitle(const OUString& _sTitle) override;
virtual void enableConfirmSettings( bool _bEnable ) override;
};
diff --git a/dbaccess/source/ui/inc/advancedsettingsdlg.hxx b/dbaccess/source/ui/inc/advancedsettingsdlg.hxx
index 1b1c46acbb67..6043660aa660 100644
--- a/dbaccess/source/ui/inc/advancedsettingsdlg.hxx
+++ b/dbaccess/source/ui/inc/advancedsettingsdlg.hxx
@@ -67,7 +67,7 @@ namespace dbaui
virtual css::uno::Reference< css::sdbc::XDriver > getDriver() override;
virtual OUString getDatasourceType(const SfxItemSet& _rSet) const override;
virtual void clearPassword() override;
- virtual bool saveDatasource() override;
+ virtual void saveDatasource() override;
virtual void setTitle(const OUString& _sTitle) override;
virtual void enableConfirmSettings( bool _bEnable ) override;
};
diff --git a/dbaccess/source/ui/inc/charsets.hxx b/dbaccess/source/ui/inc/charsets.hxx
index 6354d6ab041a..763e6618b8f7 100644
--- a/dbaccess/source/ui/inc/charsets.hxx
+++ b/dbaccess/source/ui/inc/charsets.hxx
@@ -102,13 +102,9 @@ namespace dbaui
/// prefix increment
const ExtendedCharsetIterator& operator++();
- /// postfix increment
- const ExtendedCharsetIterator operator++(int) { ExtendedCharsetIterator hold(*this); ++*this; return hold; }
/// prefix decrement
const ExtendedCharsetIterator& operator--();
- /// postfix decrement
- const ExtendedCharsetIterator operator--(int) { ExtendedCharsetIterator hold(*this); --*this; return hold; }
protected:
ExtendedCharsetIterator( const OCharsetDisplay* _pContainer, const base_iterator& _rPosition );
diff --git a/dbaccess/source/ui/inc/dbadmin.hxx b/dbaccess/source/ui/inc/dbadmin.hxx
index ec6fb37fe932..69db88cb92fa 100644
--- a/dbaccess/source/ui/inc/dbadmin.hxx
+++ b/dbaccess/source/ui/inc/dbadmin.hxx
@@ -92,7 +92,7 @@ public:
virtual css::uno::Reference< css::sdbc::XDriver > getDriver() override;
virtual OUString getDatasourceType(const SfxItemSet& _rSet) const override;
virtual void clearPassword() override;
- virtual bool saveDatasource() override;
+ virtual void saveDatasource() override;
virtual void setTitle(const OUString& _sTitle) override;
virtual void enableConfirmSettings( bool _bEnable ) override;
diff --git a/dbaccess/source/ui/inc/dbwiz.hxx b/dbaccess/source/ui/inc/dbwiz.hxx
index 596450f2a065..93046dd5b02a 100644
--- a/dbaccess/source/ui/inc/dbwiz.hxx
+++ b/dbaccess/source/ui/inc/dbwiz.hxx
@@ -83,7 +83,7 @@ public:
virtual css::uno::Reference< css::sdbc::XDriver > getDriver() override;
virtual OUString getDatasourceType(const SfxItemSet& _rSet) const override;
virtual void clearPassword() override;
- virtual bool saveDatasource() override;
+ virtual void saveDatasource() override;
virtual void setTitle(const OUString& _sTitle) override;
virtual void enableConfirmSettings( bool _bEnable ) override;
diff --git a/dbaccess/source/ui/inc/dbwizsetup.hxx b/dbaccess/source/ui/inc/dbwizsetup.hxx
index b536279c0319..cf007adf94e5 100644
--- a/dbaccess/source/ui/inc/dbwizsetup.hxx
+++ b/dbaccess/source/ui/inc/dbwizsetup.hxx
@@ -112,7 +112,7 @@ public:
virtual void clearPassword() override;
virtual void setTitle(const OUString& _sTitle) override;
virtual void enableConfirmSettings( bool _bEnable ) override;
- virtual bool saveDatasource() override;
+ virtual void saveDatasource() override;
virtual OUString getStateDisplayName( WizardState _nState ) const override;
/** returns <TRUE/> if the database should be opened, otherwise <FALSE/>.
diff --git a/dbaccess/source/ui/inc/querycontainerwindow.hxx b/dbaccess/source/ui/inc/querycontainerwindow.hxx
index e28ba481fa10..89f5310189cb 100644
--- a/dbaccess/source/ui/inc/querycontainerwindow.hxx
+++ b/dbaccess/source/ui/inc/querycontainerwindow.hxx
@@ -84,7 +84,7 @@ namespace dbaui
void initialize() override { m_pViewSwitch->initialize(); }
void SaveUIConfig() { m_pViewSwitch->SaveUIConfig(); }
- bool reset( ::dbtools::SQLExceptionInfo* _pErrorInfo ) { return m_pViewSwitch->reset( _pErrorInfo ); }
+ void reset( ::dbtools::SQLExceptionInfo* _pErrorInfo ) { m_pViewSwitch->reset( _pErrorInfo ); }
bool switchView( ::dbtools::SQLExceptionInfo* _pErrorInfo );
void forceInitialView();
diff --git a/dbaccess/source/ui/inc/querycontroller.hxx b/dbaccess/source/ui/inc/querycontroller.hxx
index fd18022a3878..a16c53b4fc31 100644
--- a/dbaccess/source/ui/inc/querycontroller.hxx
+++ b/dbaccess/source/ui/inc/querycontroller.hxx
@@ -219,7 +219,7 @@ namespace dbaui
/** switches to the graphical or SQL view mode, as determined by m_bGraphicalDesign
*/
- bool impl_setViewMode( ::dbtools::SQLExceptionInfo* _pErrorInfo );
+ void impl_setViewMode( ::dbtools::SQLExceptionInfo* _pErrorInfo );
/// sets m_sStatement, and notifies our respective property change listeners
void setStatement_fireEvent( const OUString& _rNewStatement, bool _bFireStatementChange = true );
diff --git a/dbaccess/source/ui/inc/sbagrid.hxx b/dbaccess/source/ui/inc/sbagrid.hxx
index 8a8af6739d92..5565311196aa 100644
--- a/dbaccess/source/ui/inc/sbagrid.hxx
+++ b/dbaccess/source/ui/inc/sbagrid.hxx
@@ -184,7 +184,7 @@ namespace dbaui
// Window overridables
virtual void MouseButtonDown( const MouseEvent& rMEvt ) override;
- bool ImplStartColumnDrag(sal_Int8 _nAction, const Point& _rMousePos);
+ void ImplStartColumnDrag(sal_Int8 _nAction, const Point& _rMousePos);
private:
using FmGridHeader::StartDrag;
diff --git a/dbaccess/source/ui/querydesign/ConnectionLineData.cxx b/dbaccess/source/ui/querydesign/ConnectionLineData.cxx
index 518ffea03243..df490a8c2655 100644
--- a/dbaccess/source/ui/querydesign/ConnectionLineData.cxx
+++ b/dbaccess/source/ui/querydesign/ConnectionLineData.cxx
@@ -59,11 +59,10 @@ OConnectionLineData& OConnectionLineData::operator=( const OConnectionLineData&
return *this;
}
-bool OConnectionLineData::Reset()
+void OConnectionLineData::Reset()
{
m_aDestFieldName.clear();
m_aSourceFieldName.clear();
- return true;
}
namespace dbaui
diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx
index bfff9a8874a0..cd7520c211d4 100644
--- a/dbaccess/source/ui/querydesign/JoinTableView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx
@@ -1001,7 +1001,7 @@ void OJoinTableView::ClearAll()
Invalidate();
}
-bool OJoinTableView::ScrollWhileDragging()
+void OJoinTableView::ScrollWhileDragging()
{
OSL_ENSURE(m_pDragWin != nullptr, "OJoinTableView::ScrollWhileDragging must not be called when a window is being dragged !");
@@ -1014,7 +1014,7 @@ bool OJoinTableView::ScrollWhileDragging()
Point aLowerRight(aDragWinPos.X() + aDragWinSize.Width(), aDragWinPos.Y() + aDragWinSize.Height());
if (!m_bTrackingInitiallyMoved && (aDragWinPos == m_pDragWin->GetPosPixel()))
- return true;
+ return;
// avoid illustration errors (when scrolling with active TrackingRect)
HideTracking();
@@ -1073,8 +1073,6 @@ bool OJoinTableView::ScrollWhileDragging()
m_aDragRect = Rectangle(m_ptPrevDraggingPos - m_aDragOffset, m_pDragWin->GetSizePixel());
Update();
ShowTracking( m_aDragRect, SHOWTRACK_SMALL | SHOWTRACK_WINDOW );
-
- return bScrolling;
}
IMPL_LINK_NOARG_TYPED(OJoinTableView, OnDragScrollTimer, Idle *, void)
diff --git a/dbaccess/source/ui/querydesign/TableConnection.cxx b/dbaccess/source/ui/querydesign/TableConnection.cxx
index 2d43b018a594..062158ee232b 100644
--- a/dbaccess/source/ui/querydesign/TableConnection.cxx
+++ b/dbaccess/source/ui/querydesign/TableConnection.cxx
@@ -108,12 +108,11 @@ namespace dbaui
return *this;
}
- bool OTableConnection::RecalcLines()
+ void OTableConnection::RecalcLines()
{
// call RecalcLines on each line
for( const auto& pLine : m_vConnLine )
pLine->RecalcLine();
- return true;
}
OTableWindow* OTableConnection::GetSourceWin() const
{
@@ -158,7 +157,7 @@ namespace dbaui
{ return pLine->CheckHit( rMousePos ); } );
}
- bool OTableConnection::InvalidateConnection()
+ void OTableConnection::InvalidateConnection()
{
Rectangle rcBounding = GetBoundingRect();
rcBounding.Bottom() += 1;
@@ -168,8 +167,6 @@ namespace dbaui
// Invalidate records obviously one pixel line less as Draw.
// Or everything works differently ..... in any case it works ....
m_pParent->Invalidate( rcBounding, InvalidateFlags::NoChildren );
-
- return true;
}
Rectangle OTableConnection::GetBoundingRect() const
diff --git a/dbaccess/source/ui/querydesign/TableConnectionData.cxx b/dbaccess/source/ui/querydesign/TableConnectionData.cxx
index cd425478d37e..397680986733 100644
--- a/dbaccess/source/ui/querydesign/TableConnectionData.cxx
+++ b/dbaccess/source/ui/querydesign/TableConnectionData.cxx
@@ -87,23 +87,24 @@ OTableConnectionData& OTableConnectionData::operator=( const OTableConnectionDat
return *this;
}
-bool OTableConnectionData::SetConnLine( sal_uInt16 nIndex, const OUString& rSourceFieldName, const OUString& rDestFieldName )
+void OTableConnectionData::SetConnLine( sal_uInt16 nIndex, const OUString& rSourceFieldName, const OUString& rDestFieldName )
{
if (sal_uInt16(m_vConnLineData.size()) < nIndex)
- return false;
+ return;
// == still allowed, this corresponds to an Append
if (m_vConnLineData.size() == nIndex)
- return AppendConnLine(rSourceFieldName, rDestFieldName);
+ {
+ AppendConnLine(rSourceFieldName, rDestFieldName);
+ return;
+ }
OConnectionLineDataRef pConnLineData = m_vConnLineData[nIndex];
OSL_ENSURE(pConnLineData != nullptr, "OTableConnectionData::SetConnLine : habe ungueltiges LineData-Objekt");
pConnLineData->SetSourceFieldName( rSourceFieldName );
pConnLineData->SetDestFieldName( rDestFieldName );
-
- return true;
}
bool OTableConnectionData::AppendConnLine( const OUString& rSourceFieldName, const OUString& rDestFieldName )
diff --git a/dbaccess/source/ui/querydesign/TableFieldDescription.cxx b/dbaccess/source/ui/querydesign/TableFieldDescription.cxx
index 052d5bd24c15..c9d755d8b26f 100644
--- a/dbaccess/source/ui/querydesign/TableFieldDescription.cxx
+++ b/dbaccess/source/ui/querydesign/TableFieldDescription.cxx
@@ -98,21 +98,6 @@ OTableFieldDesc& OTableFieldDesc::operator=( const OTableFieldDesc& rRS )
return *this;
}
-bool OTableFieldDesc::operator==( const OTableFieldDesc& rDesc )
-{
-
- return ( m_eOrderDir != rDesc.GetOrderDir() ||
- m_eDataType != rDesc.GetDataType() ||
- m_aAliasName != rDesc.GetAlias() ||
- m_aFunctionName != rDesc.GetFunction() ||
- m_aFieldName != rDesc.GetField() ||
- m_aTableName != rDesc.GetTable() ||
- m_bGroupBy != rDesc.IsGroupBy() ||
- m_aCriteria != rDesc.GetCriteria() ||
- m_bVisible != rDesc.IsVisible() );
-
-}
-
void OTableFieldDesc::SetCriteria( sal_uInt16 nIdx, const OUString& rCrit)
{
if (nIdx < m_aCriteria.size())
diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx
index cc9b7d8b4c39..2958e21b1aae 100644
--- a/dbaccess/source/ui/querydesign/querycontroller.cxx
+++ b/dbaccess/source/ui/querydesign/querycontroller.cxx
@@ -817,7 +817,7 @@ void OQueryController::impl_showAutoSQLViewError( const css::uno::Any& _rErrorDe
showError( aErrorContext );
}
-bool OQueryController::impl_setViewMode( ::dbtools::SQLExceptionInfo* _pErrorInfo )
+void OQueryController::impl_setViewMode( ::dbtools::SQLExceptionInfo* _pErrorInfo )
{
OSL_PRECOND( getContainer(), "OQueryController::impl_setViewMode: illegal call!" );
@@ -843,7 +843,6 @@ bool OQueryController::impl_setViewMode( ::dbtools::SQLExceptionInfo* _pErrorInf
}
setModified( wasModified );
- return bSuccess;
}
void OQueryController::impl_initialize()
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx
index acf5bbd4f584..a6e0effa2cd6 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx
@@ -424,17 +424,16 @@ EditBrowseBox::RowStatus OTableEditorCtrl::GetRowStatus(long nRow) const
}
}
-bool OTableEditorCtrl::SaveCurRow()
+void OTableEditorCtrl::SaveCurRow()
{
if (GetFieldDescr(GetCurRow()) == nullptr)
// there is no data in the current row
- return true;
+ return;
if (!SaveModified())
- return false;
+ return;
SetDataPtr(GetCurRow());
pDescrWin->SaveData( pActRow->GetActFieldDescr() );
- return true;
}
void OTableEditorCtrl::DisplayData(long nRow, bool bGrabFocus)
@@ -500,7 +499,7 @@ sal_Int32 OTableEditorCtrl::HasFieldName( const OUString& rFieldName )
return nCount;
}
-bool OTableEditorCtrl::SaveData(long nRow, sal_uInt16 nColId)
+void OTableEditorCtrl::SaveData(long nRow, sal_uInt16 nColId)
{
// Store the cell content
SetDataPtr( nRow == -1 ? GetCurRow() : nRow);
@@ -524,7 +523,7 @@ bool OTableEditorCtrl::SaveData(long nRow, sal_uInt16 nColId)
pActFieldDescr = pActRow->GetActFieldDescr();
}
else
- return true;
+ return;
}
if(pActFieldDescr)
pActFieldDescr->SetName( aName );
@@ -584,7 +583,6 @@ bool OTableEditorCtrl::SaveData(long nRow, sal_uInt16 nColId)
}
break;
}
- return true;
}
bool OTableEditorCtrl::SaveModified()
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.hxx b/dbaccess/source/ui/tabledesign/TEditControl.hxx
index 7ad84ea42d24..729cbff95f9b 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.hxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.hxx
@@ -130,7 +130,7 @@ namespace dbaui
if (pDescrWin && pActRow)
pDescrWin->DisplayData(pActRow->GetActFieldDescr());
}
- bool SaveCurRow();
+ void SaveCurRow();
void SwitchType( const TOTypeInfoSP& _pType );
/// force displaying of the given row
@@ -182,7 +182,7 @@ namespace dbaui
OUString GenerateName( const OUString& rName );
bool SetDataPtr( long nRow );
- bool SaveData(long nRow, sal_uInt16 nColumnId);
+ void SaveData(long nRow, sal_uInt16 nColumnId);
/** AdjustFieldDescription set the needed values for the description
@param _pFieldDesc the field description where to set the values
@param _rMultiSel contains the positions which changed for undo/redo