From 385808a2dff7300ec0120fdd5e8acfad8f86e50d Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sun, 21 Feb 2021 12:46:27 +0200 Subject: Typo fix: supress -> suppress Change-Id: I72aeaff1bc8ac67253265ea99de91b9b9906e5d2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111275 Tested-by: Jenkins Reviewed-by: Tor Lillqvist --- dbaccess/source/ui/inc/JoinTableView.hxx | 4 ++-- dbaccess/source/ui/inc/QueryTableView.hxx | 2 +- dbaccess/source/ui/querydesign/JoinTableView.cxx | 8 ++++---- dbaccess/source/ui/querydesign/QueryTableView.cxx | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'dbaccess') diff --git a/dbaccess/source/ui/inc/JoinTableView.hxx b/dbaccess/source/ui/inc/JoinTableView.hxx index 5c7c6e91fcf1..ec2c6e420080 100644 --- a/dbaccess/source/ui/inc/JoinTableView.hxx +++ b/dbaccess/source/ui/inc/JoinTableView.hxx @@ -196,7 +196,7 @@ namespace dbaui */ sal_Int32 getConnectionCount(const OTableWindow* _pFromWin) const; - OTableConnection* GetTabConn(const OTableWindow* pLhs,const OTableWindow* pRhs,bool _bSupressCrossOrNaturalJoin = false) const; + OTableConnection* GetTabConn(const OTableWindow* pLhs,const OTableWindow* pRhs,bool _bSuppressCrossOrNaturalJoin = false) const; /** clear the window map and connection vector without destroying it @@ -299,7 +299,7 @@ namespace dbaui Expected to throw. */ virtual void onNoColumns_throw(); - virtual bool supressCrossNaturalJoin(const TTableConnectionData::value_type& _pData) const; + virtual bool suppressCrossNaturalJoin(const TTableConnectionData::value_type& _pData) const; private: void InitColors(); diff --git a/dbaccess/source/ui/inc/QueryTableView.hxx b/dbaccess/source/ui/inc/QueryTableView.hxx index c192c5fac664..26133d2cca42 100644 --- a/dbaccess/source/ui/inc/QueryTableView.hxx +++ b/dbaccess/source/ui/inc/QueryTableView.hxx @@ -40,7 +40,7 @@ namespace dbaui Expected to throw. */ virtual void onNoColumns_throw() override; - virtual bool supressCrossNaturalJoin(const TTableConnectionData::value_type& _pData) const override; + virtual bool suppressCrossNaturalJoin(const TTableConnectionData::value_type& _pData) const override; public: OQueryTableView(vcl::Window* pParent,OQueryDesignView* pView); diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx index 0190b36c7c77..84a4f1549e34 100644 --- a/dbaccess/source/ui/querydesign/JoinTableView.cxx +++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx @@ -1179,7 +1179,7 @@ void OJoinTableView::Command(const CommandEvent& rEvt) Window::Command(rEvt); } -OTableConnection* OJoinTableView::GetTabConn(const OTableWindow* pLhs,const OTableWindow* pRhs,bool _bSupressCrossOrNaturalJoin) const +OTableConnection* OJoinTableView::GetTabConn(const OTableWindow* pLhs,const OTableWindow* pRhs,bool _bSuppressCrossOrNaturalJoin) const { OTableConnection* pConn = nullptr; OSL_ENSURE(pRhs || pLhs, "OJoinTableView::GetTabConn : invalid args !"); @@ -1201,9 +1201,9 @@ OTableConnection* OJoinTableView::GetTabConn(const OTableWindow* pLhs,const OTab ) ) { - if ( _bSupressCrossOrNaturalJoin ) + if ( _bSuppressCrossOrNaturalJoin ) { - if ( supressCrossNaturalJoin(pData->GetData()) ) + if ( suppressCrossNaturalJoin(pData->GetData()) ) continue; } pConn = pData; @@ -1560,7 +1560,7 @@ void OJoinTableView::onNoColumns_throw() throw SQLException(); } -bool OJoinTableView::supressCrossNaturalJoin(const TTableConnectionData::value_type& ) const +bool OJoinTableView::suppressCrossNaturalJoin(const TTableConnectionData::value_type& ) const { return false; } diff --git a/dbaccess/source/ui/querydesign/QueryTableView.cxx b/dbaccess/source/ui/querydesign/QueryTableView.cxx index 77ca793e5077..9b252dbf8b1e 100644 --- a/dbaccess/source/ui/querydesign/QueryTableView.cxx +++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx @@ -880,7 +880,7 @@ void OQueryTableView::onNoColumns_throw() ::dbtools::throwSQLException( sError, ::dbtools::StandardSQLState::GENERAL_ERROR, nullptr ); } -bool OQueryTableView::supressCrossNaturalJoin(const TTableConnectionData::value_type& _pData) const +bool OQueryTableView::suppressCrossNaturalJoin(const TTableConnectionData::value_type& _pData) const { OQueryTableConnectionData* pQueryData = static_cast(_pData.get()); return pQueryData && (pQueryData->GetJoinType() == CROSS_JOIN); -- cgit v1.2.3