summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-12-22 16:02:46 +0200
committerNoel Grandin <noel@peralex.com>2015-12-23 08:13:54 +0200
commit004803c0d8ac227e80afe4fba9ab8d0ea085f05d (patch)
tree89b40fd647e7e2a059e5026a32180e0b0c0cc7be
parentfb93ed9f6f84ed393e4619eb653a70e1799dc261 (diff)
loplugin:unusedfields in desktop
Change-Id: Ic816a7faf4d357d16c13f67533b3b409a531d14c
-rw-r--r--desktop/source/deployment/gui/dp_gui.h16
-rw-r--r--desktop/source/deployment/gui/dp_gui_dialog2.cxx2
-rw-r--r--desktop/source/deployment/gui/dp_gui_dialog2.hxx1
-rw-r--r--desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx3
-rw-r--r--desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx1
-rw-r--r--desktop/source/deployment/gui/license_dialog.cxx11
-rw-r--r--desktop/source/deployment/manager/dp_commandenvironments.hxx1
-rw-r--r--desktop/source/migration/services/oo3extensionmigration.hxx2
-rw-r--r--desktop/source/splash/unxsplash.cxx9
-rw-r--r--desktop/source/splash/unxsplash.hxx3
-rw-r--r--embeddedobj/source/inc/docholder.hxx2
11 files changed, 7 insertions, 44 deletions
diff --git a/desktop/source/deployment/gui/dp_gui.h b/desktop/source/deployment/gui/dp_gui.h
index 787eb7e42634..6d536923fd23 100644
--- a/desktop/source/deployment/gui/dp_gui.h
+++ b/desktop/source/deployment/gui/dp_gui.h
@@ -65,22 +65,6 @@ enum PackageState { REGISTERED, NOT_REGISTERED, AMBIGUOUS, NOT_AVAILABLE };
-class SelectedPackage: public salhelper::SimpleReferenceObject {
-public:
- SelectedPackage() {}
- explicit SelectedPackage( const css::uno::Reference< css::deployment::XPackage> &xPackage)
- : m_xPackage( xPackage )
- {}
-
- virtual ~SelectedPackage();
-
-private:
- SelectedPackage(SelectedPackage &) = delete;
- void operator =(SelectedPackage &) = delete;
-
- css::uno::Reference< css::deployment::XPackage> m_xPackage;
-};
-
} // namespace dp_gui
#endif
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index 5c2e7f323c65..70c8eed7b26d 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -1620,8 +1620,6 @@ sal_Int16 UpdateRequiredDialogService::execute() throw ( uno::RuntimeException,
}
-SelectedPackage::~SelectedPackage() {}
-
} //namespace dp_gui
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
index e095a34845c3..55d0eceedc58 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
@@ -246,7 +246,6 @@ public:
class UpdateRequiredDialogService : public ::cppu::WeakImplHelper< css::ui::dialogs::XExecutableDialog >
{
css::uno::Reference< css::uno::XComponentContext > const m_xComponentContext;
- css::uno::Reference< css::awt::XWindow > m_xParent;
public:
UpdateRequiredDialogService( css::uno::Sequence< css::uno::Any > const & args,
css::uno::Reference< css::uno::XComponentContext> const & xComponentContext );
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
index 5b97ad98f1f9..dcc017710cc5 100644
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
@@ -96,8 +96,6 @@ private:
void removeTempDownloads();
UpdateInstallDialog & m_dialog;
- cssu::Reference< css::deployment::XUpdateInformationProvider >
- m_updateInformation;
// guarded by Application::GetSolarMutex():
cssu::Reference< css::task::XAbortChannel > m_abort;
@@ -208,7 +206,6 @@ UpdateInstallDialog::UpdateInstallDialog(
"UpdateInstallDialog","desktop/ui/updateinstalldialog.ui"),
m_thread(new Thread(xCtx, *this, aVecUpdateData)),
- m_xComponentContext(xCtx),
m_bError(false),
m_bNoEntry(true),
m_sInstalling(DPGUI_RESSTR(RID_DLG_UPDATE_INSTALL_INSTALLING)),
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx
index 65fc9c592336..026693eb2c9c 100644
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx
@@ -90,7 +90,6 @@ private:
{ return m_xExtensionManager; }
rtl::Reference< Thread > m_thread;
- css::uno::Reference< css::uno::XComponentContext > m_xComponentContext;
css::uno::Reference< css::deployment::XExtensionManager > m_xExtensionManager;
//Signals that an error occurred during download and installation
bool m_bError;
diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx
index 9455da23fead..cc7d3bd4de3f 100644
--- a/desktop/source/deployment/gui/license_dialog.cxx
+++ b/desktop/source/deployment/gui/license_dialog.cxx
@@ -75,7 +75,6 @@ protected:
struct LicenseDialogImpl : public ModalDialog
{
- cssu::Reference<cssu::XComponentContext> m_xComponentContext;
VclPtr<FixedText> m_pFtHead;
VclPtr<FixedImage> m_pArrow1;
VclPtr<FixedImage> m_pArrow2;
@@ -95,7 +94,6 @@ struct LicenseDialogImpl : public ModalDialog
LicenseDialogImpl(
vcl::Window * pParent,
- css::uno::Reference< css::uno::XComponentContext > const & xContext,
const OUString & sExtensionName,
const OUString & sLicenseText);
virtual ~LicenseDialogImpl() { disposeOnce(); }
@@ -204,11 +202,9 @@ void LicenseView::Notify( SfxBroadcaster&, const SfxHint& rHint )
LicenseDialogImpl::LicenseDialogImpl(
vcl::Window * pParent,
- cssu::Reference< cssu::XComponentContext > const & xContext,
const OUString & sExtensionName,
const OUString & sLicenseText)
: ModalDialog(pParent, "LicenseDialog", "desktop/ui/licensedialog.ui")
- , m_xComponentContext(xContext)
, m_bLicenseRead(false)
{
get(m_pFtHead, "head");
@@ -321,11 +317,8 @@ sal_Int16 LicenseDialog::execute() throw (RuntimeException, std::exception)
sal_Int16 LicenseDialog::solar_execute()
{
- VclPtr<LicenseDialogImpl> dlg(
- VclPtr<LicenseDialogImpl>::Create(
-
- VCLUnoHelper::GetWindow(m_parent),
- m_xComponentContext, m_sExtensionName, m_sLicenseText));
+ ScopedVclPtrInstance<LicenseDialogImpl> dlg(
+ VCLUnoHelper::GetWindow(m_parent), m_sExtensionName, m_sLicenseText);
return dlg->Execute();
}
diff --git a/desktop/source/deployment/manager/dp_commandenvironments.hxx b/desktop/source/deployment/manager/dp_commandenvironments.hxx
index ebc3cb52e6fb..de58573333e5 100644
--- a/desktop/source/deployment/manager/dp_commandenvironments.hxx
+++ b/desktop/source/deployment/manager/dp_commandenvironments.hxx
@@ -36,7 +36,6 @@ class BaseCommandEnv
css::ucb::XProgressHandler >
{
protected:
- css::uno::Reference< css::uno::XComponentContext > m_xContext;
css::uno::Reference< css::task::XInteractionHandler> m_forwardHandler;
void handle_(bool approve, bool abort,
diff --git a/desktop/source/migration/services/oo3extensionmigration.hxx b/desktop/source/migration/services/oo3extensionmigration.hxx
index 7568201e74fa..79aebdd94a3d 100644
--- a/desktop/source/migration/services/oo3extensionmigration.hxx
+++ b/desktop/source/migration/services/oo3extensionmigration.hxx
@@ -114,8 +114,6 @@ namespace migration
css::task::XInteractionHandler,
css::ucb::XProgressHandler >
{
- css::uno::Reference< css::uno::XComponentContext > m_xContext;
- css::uno::Reference< css::task::XInteractionHandler> m_forwardHandler;
public:
virtual ~TmpRepositoryCommandEnv();
TmpRepositoryCommandEnv();
diff --git a/desktop/source/splash/unxsplash.cxx b/desktop/source/splash/unxsplash.cxx
index dbf9e7523614..c396fc5f6b18 100644
--- a/desktop/source/splash/unxsplash.cxx
+++ b/desktop/source/splash/unxsplash.cxx
@@ -29,9 +29,8 @@ using namespace com::sun::star;
namespace desktop
{
- UnxSplashScreen::UnxSplashScreen( const uno::Reference< uno::XComponentContext >& xCtx )
- : m_xCtx( xCtx ),
- m_pOutFd( nullptr )
+ UnxSplashScreen::UnxSplashScreen()
+ : m_pOutFd( nullptr )
{
}
@@ -143,14 +142,14 @@ using namespace desktop;
// get service instance...
static uno::Reference< uno::XInterface > m_xINSTANCE;
-uno::Reference< uno::XInterface > UnxSplash_createInstance(const uno::Reference< uno::XComponentContext > & xCtx ) throw( uno::Exception )
+uno::Reference< uno::XInterface > UnxSplash_createInstance(const uno::Reference< uno::XComponentContext > & ) throw( uno::Exception )
{
static osl::Mutex m_aMutex;
if ( !m_xINSTANCE.is() )
{
osl::MutexGuard guard( m_aMutex );
if ( !m_xINSTANCE.is() )
- m_xINSTANCE = static_cast<cppu::OWeakObject*>(new UnxSplashScreen( xCtx ));
+ m_xINSTANCE = static_cast<cppu::OWeakObject*>(new UnxSplashScreen);
}
return m_xINSTANCE;
diff --git a/desktop/source/splash/unxsplash.hxx b/desktop/source/splash/unxsplash.hxx
index 38e804aaef48..4935777eaf2d 100644
--- a/desktop/source/splash/unxsplash.hxx
+++ b/desktop/source/splash/unxsplash.hxx
@@ -39,12 +39,11 @@ private:
static UnxSplashScreen *m_pINSTANCE;
static osl::Mutex m_aMutex;
- css::uno::Reference< css::uno::XComponentContext > m_xCtx;
FILE *m_pOutFd;
public:
- explicit UnxSplashScreen( const css::uno::Reference< css::uno::XComponentContext >& xCtx );
+ explicit UnxSplashScreen();
// XStatusIndicator
virtual void SAL_CALL start( const OUString& aText, sal_Int32 nRange ) throw ( css::uno::RuntimeException, std::exception ) override;
diff --git a/embeddedobj/source/inc/docholder.hxx b/embeddedobj/source/inc/docholder.hxx
index ad3233493a8d..e47e95872c1a 100644
--- a/embeddedobj/source/inc/docholder.hxx
+++ b/embeddedobj/source/inc/docholder.hxx
@@ -79,8 +79,6 @@ private:
sal_Int32 m_nNoBorderResizeReact;
sal_Int32 m_nNoResizeReact;
- css::uno::Reference< css::ui::XDockingAreaAcceptor > m_xCachedDocAreaAcc;
-
css::uno::Sequence< css::uno::Any > m_aOutplaceFrameProps;