loplugin:unusedfields in dbaccess..drawinglayer

Change-Id: I069badbce9b899d176fd3db91243139579dec6b1
Reviewed-on: https://gerrit.libreoffice.org/54456Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

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))

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;
 

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);
 }
 

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;
 

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();
 

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;

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) );
 

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 );

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;

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 );

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;

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");
 

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());
 

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

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 & ) {
     }

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()

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;