summaryrefslogtreecommitdiff
path: root/desktop/source
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-07-24 11:07:46 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-07-24 11:08:14 +0200
commitddc642dd270c3cdae01f387049fcf5c2ab23519b (patch)
tree2fd2dc3ffc8e7b7a1d53311b1dbedc0317649d3e /desktop/source
parent22fd35f5987e3fed40d5b2ad0df35f7d89f842f8 (diff)
-Werror,-Wunused-private-field
Change-Id: Ia1eb84b72cc9aa61639c3efbd55685d781196401
Diffstat (limited to 'desktop/source')
-rw-r--r--desktop/source/deployment/gui/dp_gui.hrc1
-rw-r--r--desktop/source/deployment/gui/dp_gui_dialog2.cxx1
-rw-r--r--desktop/source/deployment/gui/dp_gui_dialog2.hxx1
-rw-r--r--desktop/source/deployment/gui/dp_gui_updatedialog.cxx1
-rw-r--r--desktop/source/deployment/gui/dp_gui_updatedialog.hxx3
-rw-r--r--desktop/source/deployment/gui/dp_gui_updatedialog.src4
-rw-r--r--desktop/source/migration/migration_impl.hxx1
7 files changed, 0 insertions, 12 deletions
diff --git a/desktop/source/deployment/gui/dp_gui.hrc b/desktop/source/deployment/gui/dp_gui.hrc
index 7ccd459ad380..ddee13a74ba6 100644
--- a/desktop/source/deployment/gui/dp_gui.hrc
+++ b/desktop/source/deployment/gui/dp_gui.hrc
@@ -32,7 +32,6 @@
#define RID_STR_WARNING_INSTALL_EXTENSION (RID_DEPLOYMENT_GUI_START + 9)
#define RID_DLG_UPDATE_NORMALALERT (RID_DEPLOYMENT_GUI_START + 11)
-#define RID_DLG_UPDATE_ERROR (RID_DEPLOYMENT_GUI_START + 12)
#define RID_DLG_UPDATE_NONE (RID_DEPLOYMENT_GUI_START + 13)
#define RID_DLG_UPDATE_NOINSTALLABLE (RID_DEPLOYMENT_GUI_START + 14)
#define RID_DLG_UPDATE_FAILURE (RID_DEPLOYMENT_GUI_START + 15)
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index 3ff60b12e301..96c1097bf0a0 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -1184,7 +1184,6 @@ bool ExtMgrDialog::Close()
UpdateRequiredDialog::UpdateRequiredDialog(vcl::Window *pParent, TheExtensionManager *pManager)
: ModalDialog(pParent, "UpdateRequiredDialog", "desktop/ui/updaterequireddialog.ui")
, DialogHelper(pManager->getContext(), static_cast<Dialog*>(this))
- , m_sAddPackages(getResourceString(RID_STR_ADD_PACKAGES))
, m_sCloseText(getResourceString(RID_STR_CLOSE_BTN))
, m_bHasProgress(false)
, m_bProgressChanged(false)
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
index e0a4f1a45453..234435116364 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
@@ -183,7 +183,6 @@ class UpdateRequiredDialog : public ModalDialog,
VclPtr<CancelButton> m_pCancelBtn;
VclPtr<FixedText> m_pProgressText;
VclPtr<ProgressBar> m_pProgressBar;
- const OUString m_sAddPackages;
const OUString m_sCloseText;
OUString m_sProgressText;
::osl::Mutex m_aMutex;
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
index 7227adc048b0..8178fc0ab9b4 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
@@ -492,7 +492,6 @@ UpdateDialog::UpdateDialog(
std::vector< dp_gui::UpdateData > * updateData):
ModalDialog(parent, "UpdateDialog", "desktop/ui/updatedialog.ui"),
m_context(context),
- m_error(DPGUI_RESSTR(RID_DLG_UPDATE_ERROR)),
m_none(DPGUI_RESSTR(RID_DLG_UPDATE_NONE)),
m_noInstallable(DPGUI_RESSTR(RID_DLG_UPDATE_NOINSTALLABLE)),
m_failure(DPGUI_RESSTR(RID_DLG_UPDATE_FAILURE)),
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
index 806fd9887bf7..c3e7acf41b54 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
@@ -182,7 +182,6 @@ private:
VclPtr<HelpButton> m_pHelp;
VclPtr<PushButton> m_pOk;
VclPtr<PushButton> m_pClose;
- OUString m_error;
OUString m_none;
OUString m_noInstallable;
OUString m_failure;
@@ -203,8 +202,6 @@ private:
rtl::Reference< UpdateDialog::Thread > m_thread;
::com::sun::star::uno::Reference< ::com::sun::star::deployment::XExtensionManager > m_xExtensionManager;
- Point m_aFirstLinePos;
- Size m_aFirstLineSize;
sal_uInt16 m_nLastID;
bool m_bModified;
};
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.src b/desktop/source/deployment/gui/dp_gui_updatedialog.src
index 6cead510c54b..4f0f5def3a70 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.src
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.src
@@ -27,10 +27,6 @@ Image RID_DLG_UPDATE_NORMALALERT {
};
};
-String RID_DLG_UPDATE_ERROR {
- Text[en-US] = "Error";
-};
-
String RID_DLG_UPDATE_NONE {
Text[en-US] = "No new updates are available.";
};
diff --git a/desktop/source/migration/migration_impl.hxx b/desktop/source/migration/migration_impl.hxx
index f55c543a82dc..ee8d2cde4bb4 100644
--- a/desktop/source/migration/migration_impl.hxx
+++ b/desktop/source/migration/migration_impl.hxx
@@ -194,7 +194,6 @@ private:
install_info m_aInfo; // info about the version being migrated
strings_vr m_vrFileList; // final list of files to be copied
MigrationHashMap m_aOldVersionItemsHashMap;
- OUString m_sModuleIdentifier;
// functions to control the migration process
static bool readAvailableMigrations(migrations_available&);