diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-05-16 16:51:05 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-05-17 08:40:55 +0200 |
commit | ac13f4db592f91783e644535968a8d3202c94640 (patch) | |
tree | f5f32b3e5d28a69a7778b3d0278f44e579f79b7a | |
parent | 82afd77a00c036f106a3aa5fb3402c92e10e2aa4 (diff) |
loplugin:unusedfields in dbaccess..drawinglayer
Change-Id: I069badbce9b899d176fd3db91243139579dec6b1
Reviewed-on: https://gerrit.libreoffice.org/54456
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
-rw-r--r-- | dbaccess/source/core/api/resultset.cxx | 6 | ||||
-rw-r--r-- | dbaccess/source/core/api/resultset.hxx | 1 | ||||
-rw-r--r-- | dbaccess/source/filter/xml/xmlTable.cxx | 3 | ||||
-rw-r--r-- | dbaccess/source/filter/xml/xmlTable.hxx | 1 | ||||
-rw-r--r-- | dbaccess/source/ui/app/AppView.cxx | 9 | ||||
-rw-r--r-- | dbaccess/source/ui/app/AppView.hxx | 1 | ||||
-rw-r--r-- | dbaccess/source/ui/dlg/RelationDlg.cxx | 3 | ||||
-rw-r--r-- | dbaccess/source/ui/dlg/queryorder.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/inc/RelationDlg.hxx | 1 | ||||
-rw-r--r-- | dbaccess/source/ui/inc/WNameMatch.hxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/inc/queryorder.hxx | 1 | ||||
-rw-r--r-- | dbaccess/source/ui/misc/WNameMatch.cxx | 12 | ||||
-rw-r--r-- | dbaccess/source/ui/querydesign/querydlg.cxx | 3 | ||||
-rw-r--r-- | dbaccess/source/ui/querydesign/querydlg.hxx | 1 | ||||
-rw-r--r-- | desktop/source/deployment/gui/dp_gui_service.cxx | 8 | ||||
-rw-r--r-- | drawinglayer/source/processor3d/zbufferprocessor3d.cxx | 5 | ||||
-rw-r--r-- | include/drawinglayer/processor3d/zbufferprocessor3d.hxx | 3 |
17 files changed, 19 insertions, 43 deletions
diff --git a/dbaccess/source/core/api/resultset.cxx b/dbaccess/source/core/api/resultset.cxx index e7ed9e24daf8..4942597e9774 100644 --- a/dbaccess/source/core/api/resultset.cxx +++ b/dbaccess/source/core/api/resultset.cxx @@ -57,7 +57,6 @@ OResultSet::OResultSet(const css::uno::Reference< css::sdbc::XResultSet >& _xRes ,OPropertySetHelper(OResultSetBase::rBHelper) ,m_xDelegatorResultSet(_xResultSet) ,m_aWarnings( Reference< XWarningsSupplier >( _xResultSet, UNO_QUERY ) ) - ,m_nResultSetType(0) ,m_nResultSetConcurrency(0) ,m_bIsBookmarkable(false) { @@ -71,11 +70,12 @@ OResultSet::OResultSet(const css::uno::Reference< css::sdbc::XResultSet >& _xRes m_xDelegatorRowUpdate.set(m_xDelegatorResultSet, css::uno::UNO_QUERY); Reference< XPropertySet > xSet(m_xDelegatorResultSet, UNO_QUERY); - xSet->getPropertyValue(PROPERTY_RESULTSETTYPE) >>= m_nResultSetType; + sal_Int32 nResultSetType(0); + xSet->getPropertyValue(PROPERTY_RESULTSETTYPE) >>= nResultSetType; xSet->getPropertyValue(PROPERTY_RESULTSETCONCURRENCY) >>= m_nResultSetConcurrency; // test for Bookmarks - if (ResultSetType::FORWARD_ONLY != m_nResultSetType) + if (ResultSetType::FORWARD_ONLY != nResultSetType) { Reference <XPropertySetInfo > xInfo(xSet->getPropertySetInfo()); if (xInfo->hasPropertyByName(PROPERTY_ISBOOKMARKABLE)) diff --git a/dbaccess/source/core/api/resultset.hxx b/dbaccess/source/core/api/resultset.hxx index 574b458bf986..34f13a14d8bf 100644 --- a/dbaccess/source/core/api/resultset.hxx +++ b/dbaccess/source/core/api/resultset.hxx @@ -72,7 +72,6 @@ namespace dbaccess ::dbtools::WarningsContainer m_aWarnings; std::unique_ptr<OColumns> m_pColumns; - sal_Int32 m_nResultSetType; sal_Int32 m_nResultSetConcurrency; bool m_bIsBookmarkable : 1; diff --git a/dbaccess/source/filter/xml/xmlTable.cxx b/dbaccess/source/filter/xml/xmlTable.cxx index a951ab1302c6..94c51199d802 100644 --- a/dbaccess/source/filter/xml/xmlTable.cxx +++ b/dbaccess/source/filter/xml/xmlTable.cxx @@ -48,7 +48,6 @@ OXMLTable::OXMLTable( ODBFilter& _rImport ) :SvXMLImportContext( _rImport, nPrfx, _sLocalName ) ,m_xParentContainer(_xParentContainer) - ,m_sServiceName(_sServiceName) ,m_bApplyFilter(false) ,m_bApplyOrder(false) { @@ -93,7 +92,7 @@ OXMLTable::OXMLTable( ODBFilter& _rImport {"Parent", uno::Any(m_xParentContainer)} })); m_xTable.set( - GetOwnImport().GetComponentContext()->getServiceManager()->createInstanceWithArgumentsAndContext(m_sServiceName,aArguments, GetOwnImport().GetComponentContext()), + GetOwnImport().GetComponentContext()->getServiceManager()->createInstanceWithArgumentsAndContext(_sServiceName,aArguments, GetOwnImport().GetComponentContext()), UNO_QUERY); } diff --git a/dbaccess/source/filter/xml/xmlTable.hxx b/dbaccess/source/filter/xml/xmlTable.hxx index b9cd2e14c68f..dc053cb03eec 100644 --- a/dbaccess/source/filter/xml/xmlTable.hxx +++ b/dbaccess/source/filter/xml/xmlTable.hxx @@ -37,7 +37,6 @@ namespace dbaxml OUString m_sSchema; OUString m_sCatalog; OUString m_sStyleName; - OUString m_sServiceName; bool m_bApplyFilter; bool m_bApplyOrder; diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx index d4ebeed87eae..78931828a8dd 100644 --- a/dbaccess/source/ui/app/AppView.cxx +++ b/dbaccess/source/ui/app/AppView.cxx @@ -176,15 +176,6 @@ OApplicationView::OApplicationView( vcl::Window* pParent ,m_rAppController( _rAppController ) ,m_eChildFocus(NONE) { - - try - { - m_aLocale = SvtSysLocale().GetLanguageTag().getLocale(); - } - catch(Exception&) - { - } - m_pWin = VclPtr<OAppBorderWindow>::Create(this,_ePreviewMode); m_pWin->Show(); diff --git a/dbaccess/source/ui/app/AppView.hxx b/dbaccess/source/ui/app/AppView.hxx index 8c3ea051e191..745ab56ee8f4 100644 --- a/dbaccess/source/ui/app/AppView.hxx +++ b/dbaccess/source/ui/app/AppView.hxx @@ -78,7 +78,6 @@ namespace dbaui NONE }; private: - css::lang::Locale m_aLocale; css::uno::Reference< css::lang::XComponent > m_xObject; VclPtr<OAppBorderWindow> m_pWin; diff --git a/dbaccess/source/ui/dlg/RelationDlg.cxx b/dbaccess/source/ui/dlg/RelationDlg.cxx index 8229d53ea92e..a724f3e16482 100644 --- a/dbaccess/source/ui/dlg/RelationDlg.cxx +++ b/dbaccess/source/ui/dlg/RelationDlg.cxx @@ -50,7 +50,6 @@ ORelationDialog::ORelationDialog( OJoinTableView* pParent, bool bAllowTableSelect ) : ModalDialog(pParent, "RelationDialog", "dbaccess/ui/relationdialog.ui") - , m_pTableMap(&pParent->GetTabWinMap()) , m_pOrigConnData(pConnectionData) , m_bTriedOneUpdate(false) { @@ -71,7 +70,7 @@ ORelationDialog::ORelationDialog( OJoinTableView* pParent, m_pConnData->CopyFrom( *pConnectionData ); Init(m_pConnData); - m_xTableControl.reset( new OTableListBoxControl(this, m_pTableMap, this) ); + m_xTableControl.reset( new OTableListBoxControl(this, &pParent->GetTabWinMap(), this) ); m_pPB_OK->SetClickHdl( LINK(this, ORelationDialog, OKClickHdl) ); diff --git a/dbaccess/source/ui/dlg/queryorder.cxx b/dbaccess/source/ui/dlg/queryorder.cxx index 75068c040397..cb8af47b7f9b 100644 --- a/dbaccess/source/ui/dlg/queryorder.cxx +++ b/dbaccess/source/ui/dlg/queryorder.cxx @@ -49,7 +49,6 @@ DlgOrderCrit::DlgOrderCrit(vcl::Window * pParent, const Reference< XSingleSelectQueryComposer >& _rxComposer, const Reference< XNameAccess>& _rxCols) : ModalDialog(pParent, "SortDialog", "dbaccess/ui/sortdialog.ui") - , aSTR_NOENTRY(DBA_RES(STR_VALUE_NONE)) , m_xQueryComposer(_rxComposer) , m_xColumns(_rxCols) , m_xConnection(_rxConnection) @@ -76,6 +75,7 @@ DlgOrderCrit::DlgOrderCrit(vcl::Window * pParent, m_aValueList[1] = m_pLB_ORDERVALUE2; m_aValueList[2] = m_pLB_ORDERVALUE3; + OUString aSTR_NOENTRY(DBA_RES(STR_VALUE_NONE)); for (VclPtr<ListBox> & j : m_aColumnList) { j->InsertEntry( aSTR_NOENTRY ); diff --git a/dbaccess/source/ui/inc/RelationDlg.hxx b/dbaccess/source/ui/inc/RelationDlg.hxx index 0cd9598aa037..4bd536dd6fed 100644 --- a/dbaccess/source/ui/inc/RelationDlg.hxx +++ b/dbaccess/source/ui/inc/RelationDlg.hxx @@ -34,7 +34,6 @@ namespace dbaui ,public IRelationControlInterface { std::unique_ptr<OTableListBoxControl> m_xTableControl; - OJoinTableView::OTableWindowMap* m_pTableMap; VclPtr<RadioButton> m_pRB_NoCascUpd; VclPtr<RadioButton> m_pRB_CascUpd; diff --git a/dbaccess/source/ui/inc/WNameMatch.hxx b/dbaccess/source/ui/inc/WNameMatch.hxx index 004a659f4885..fd34b5437aeb 100644 --- a/dbaccess/source/ui/inc/WNameMatch.hxx +++ b/dbaccess/source/ui/inc/WNameMatch.hxx @@ -62,8 +62,6 @@ namespace dbaui VclPtr<PushButton> m_pNone; OUString m_sSourceText; OUString m_sDestText; - Image m_aImgUp; - Image m_aImgDown; DECL_LINK( ButtonClickHdl, Button *, void ); DECL_LINK( RightButtonClickHdl, Button *, void ); diff --git a/dbaccess/source/ui/inc/queryorder.hxx b/dbaccess/source/ui/inc/queryorder.hxx index ef4330484243..16cfa105f86b 100644 --- a/dbaccess/source/ui/inc/queryorder.hxx +++ b/dbaccess/source/ui/inc/queryorder.hxx @@ -64,7 +64,6 @@ namespace dbaui VclPtr<ListBox> m_pLB_ORDERVALUE2; VclPtr<ListBox> m_pLB_ORDERFIELD3; VclPtr<ListBox> m_pLB_ORDERVALUE3; - OUString aSTR_NOENTRY; OUString m_sOrgOrder; css::uno::Reference< css::sdb::XSingleSelectQueryComposer> m_xQueryComposer; diff --git a/dbaccess/source/ui/misc/WNameMatch.cxx b/dbaccess/source/ui/misc/WNameMatch.cxx index fa1a3b83370e..8333fe40324a 100644 --- a/dbaccess/source/ui/misc/WNameMatch.cxx +++ b/dbaccess/source/ui/misc/WNameMatch.cxx @@ -36,21 +36,21 @@ using namespace ::dbaui; // OWizColumnSelect OWizNameMatching::OWizNameMatching(vcl::Window* pParent) : OWizardPage(pParent, "NameMatching", "dbaccess/ui/namematchingpage.ui") - , m_aImgUp(BitmapEx(BMP_UP)) - , m_aImgDown(BitmapEx(BMP_DOWN)) { + Image aImgUp(BitmapEx(BMP_UP)); + Image aImgDown(BitmapEx(BMP_DOWN)); get(m_pTABLE_LEFT, "leftlabel"); get(m_pTABLE_RIGHT, "rightlabel"); get(m_pCTRL_LEFT, "left"); get(m_pCTRL_RIGHT, "right"); get(m_pColumn_up, "up"); - m_pColumn_up->SetModeImage(m_aImgUp); + m_pColumn_up->SetModeImage(aImgUp); get(m_pColumn_down, "down"); - m_pColumn_down->SetModeImage(m_aImgDown); + m_pColumn_down->SetModeImage(aImgDown); get(m_pColumn_up_right, "up_right"); - m_pColumn_up_right->SetModeImage(m_aImgUp); + m_pColumn_up_right->SetModeImage(aImgUp); get(m_pColumn_down_right, "down_right"); - m_pColumn_down_right->SetModeImage(m_aImgDown); + m_pColumn_down_right->SetModeImage(aImgDown); get(m_pAll, "all"); get(m_pNone, "none"); diff --git a/dbaccess/source/ui/querydesign/querydlg.cxx b/dbaccess/source/ui/querydesign/querydlg.cxx index a1692b5c4c9f..2bf06735b947 100644 --- a/dbaccess/source/ui/querydesign/querydlg.cxx +++ b/dbaccess/source/ui/querydesign/querydlg.cxx @@ -48,7 +48,6 @@ DlgQryJoin::DlgQryJoin( OQueryTableView * pParent, bool _bAllowTableSelect) : ModalDialog( pParent, "JoinDialog", "dbaccess/ui/joindialog.ui" ) , m_pTableControl( nullptr ) - , m_pTableMap(_pTableMap) , eJoinType(static_cast<OQueryTableConnectionData*>(_pData.get())->GetJoinType()) , m_pOrigConnData(_pData) , m_xConnection(_xConnection) @@ -68,7 +67,7 @@ DlgQryJoin::DlgQryJoin( OQueryTableView * pParent, m_pConnData.reset(_pData->NewInstance()); m_pConnData->CopyFrom(*_pData); - m_pTableControl = new OTableListBoxControl(this, m_pTableMap, this); + m_pTableControl = new OTableListBoxControl(this, _pTableMap, this); m_pCBNatural->Check(static_cast<OQueryTableConnectionData*>(m_pConnData.get())->isNatural()); diff --git a/dbaccess/source/ui/querydesign/querydlg.hxx b/dbaccess/source/ui/querydesign/querydlg.hxx index 215a9c857c5f..93a8d53e54f8 100644 --- a/dbaccess/source/ui/querydesign/querydlg.hxx +++ b/dbaccess/source/ui/querydesign/querydlg.hxx @@ -44,7 +44,6 @@ namespace dbaui VclPtr<CheckBox> m_pCBNatural; OTableListBoxControl* m_pTableControl; - OJoinTableView::OTableWindowMap* m_pTableMap; EJoinType eJoinType; TTableConnectionData::value_type m_pConnData; // contains left and right table diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx index d91cdc3e9d5a..4393029537e8 100644 --- a/desktop/source/deployment/gui/dp_gui_service.cxx +++ b/desktop/source/deployment/gui/dp_gui_service.cxx @@ -138,9 +138,6 @@ class ServiceImpl { Reference<XComponentContext> const m_xComponentContext; boost::optional< Reference<awt::XWindow> > /* const */ m_parent; - boost::optional<OUString> /* const */ m_view; - /* if true then this service is running in an unopkg process and not in an office process */ - boost::optional<sal_Bool> /* const */ m_unopkg; boost::optional<OUString> m_extensionURL; OUString m_initialTitle; bool m_bShowUpdateOnly; @@ -164,8 +161,11 @@ ServiceImpl::ServiceImpl( Sequence<Any> const& args, : m_xComponentContext(xComponentContext), m_bShowUpdateOnly( false ) { + /* if true then this service is running in an unopkg process and not in an office process */ + boost::optional<sal_Bool> unopkg; + boost::optional<OUString> view; try { - comphelper::unwrapArgs( args, m_parent, m_view, m_unopkg ); + comphelper::unwrapArgs( args, m_parent, view, unopkg ); return; } catch ( const css::lang::IllegalArgumentException & ) { } diff --git a/drawinglayer/source/processor3d/zbufferprocessor3d.cxx b/drawinglayer/source/processor3d/zbufferprocessor3d.cxx index ab25e329a8b8..4413dd30a907 100644 --- a/drawinglayer/source/processor3d/zbufferprocessor3d.cxx +++ b/drawinglayer/source/processor3d/zbufferprocessor3d.cxx @@ -526,7 +526,6 @@ namespace drawinglayer sal_uInt32 nStartLine, sal_uInt32 nStopLine) : DefaultProcessor3D(rViewInformation3D, rSdrSceneAttribute, rSdrLightingAttribute), - mrBZPixelRaster(rBZPixelRaster), maInvEyeToView(), mpZBufferRasterConverter3D(nullptr), mnAntiAlialize(nAntiAlialize), @@ -595,10 +594,10 @@ namespace drawinglayer // prepare maRasterRange maRasterRange.reset(); maRasterRange.expand(basegfx::B2DPoint(0.0, nStartLine)); - maRasterRange.expand(basegfx::B2DPoint(mrBZPixelRaster.getWidth(), nStopLine)); + maRasterRange.expand(basegfx::B2DPoint(rBZPixelRaster.getWidth(), nStopLine)); // create the raster converter - mpZBufferRasterConverter3D.reset( new ZBufferRasterConverter3D(mrBZPixelRaster, *this) ); + mpZBufferRasterConverter3D.reset( new ZBufferRasterConverter3D(rBZPixelRaster, *this) ); } ZBufferProcessor3D::~ZBufferProcessor3D() diff --git a/include/drawinglayer/processor3d/zbufferprocessor3d.hxx b/include/drawinglayer/processor3d/zbufferprocessor3d.hxx index 7d1ea3f69b9a..90db04b2a546 100644 --- a/include/drawinglayer/processor3d/zbufferprocessor3d.hxx +++ b/include/drawinglayer/processor3d/zbufferprocessor3d.hxx @@ -56,9 +56,6 @@ namespace drawinglayer class ZBufferProcessor3D : public DefaultProcessor3D { private: - /// the raster target, a Z-Buffer - basegfx::BZPixelRaster& mrBZPixelRaster; - /// inverse of EyeToView for rasterconversion with evtl. Phong shading basegfx::B3DHomMatrix maInvEyeToView; |