Kaydet (Commit) ddc642dd authored tarafından Stephan Bergmann's avatar Stephan Bergmann

-Werror,-Wunused-private-field

Change-Id: Ia1eb84b72cc9aa61639c3efbd55685d781196401
üst 22fd35f5
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
#define RID_STR_WARNING_INSTALL_EXTENSION (RID_DEPLOYMENT_GUI_START + 9) #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_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_NONE (RID_DEPLOYMENT_GUI_START + 13)
#define RID_DLG_UPDATE_NOINSTALLABLE (RID_DEPLOYMENT_GUI_START + 14) #define RID_DLG_UPDATE_NOINSTALLABLE (RID_DEPLOYMENT_GUI_START + 14)
#define RID_DLG_UPDATE_FAILURE (RID_DEPLOYMENT_GUI_START + 15) #define RID_DLG_UPDATE_FAILURE (RID_DEPLOYMENT_GUI_START + 15)
......
...@@ -1184,7 +1184,6 @@ bool ExtMgrDialog::Close() ...@@ -1184,7 +1184,6 @@ bool ExtMgrDialog::Close()
UpdateRequiredDialog::UpdateRequiredDialog(vcl::Window *pParent, TheExtensionManager *pManager) UpdateRequiredDialog::UpdateRequiredDialog(vcl::Window *pParent, TheExtensionManager *pManager)
: ModalDialog(pParent, "UpdateRequiredDialog", "desktop/ui/updaterequireddialog.ui") : ModalDialog(pParent, "UpdateRequiredDialog", "desktop/ui/updaterequireddialog.ui")
, DialogHelper(pManager->getContext(), static_cast<Dialog*>(this)) , DialogHelper(pManager->getContext(), static_cast<Dialog*>(this))
, m_sAddPackages(getResourceString(RID_STR_ADD_PACKAGES))
, m_sCloseText(getResourceString(RID_STR_CLOSE_BTN)) , m_sCloseText(getResourceString(RID_STR_CLOSE_BTN))
, m_bHasProgress(false) , m_bHasProgress(false)
, m_bProgressChanged(false) , m_bProgressChanged(false)
......
...@@ -183,7 +183,6 @@ class UpdateRequiredDialog : public ModalDialog, ...@@ -183,7 +183,6 @@ class UpdateRequiredDialog : public ModalDialog,
VclPtr<CancelButton> m_pCancelBtn; VclPtr<CancelButton> m_pCancelBtn;
VclPtr<FixedText> m_pProgressText; VclPtr<FixedText> m_pProgressText;
VclPtr<ProgressBar> m_pProgressBar; VclPtr<ProgressBar> m_pProgressBar;
const OUString m_sAddPackages;
const OUString m_sCloseText; const OUString m_sCloseText;
OUString m_sProgressText; OUString m_sProgressText;
::osl::Mutex m_aMutex; ::osl::Mutex m_aMutex;
......
...@@ -492,7 +492,6 @@ UpdateDialog::UpdateDialog( ...@@ -492,7 +492,6 @@ UpdateDialog::UpdateDialog(
std::vector< dp_gui::UpdateData > * updateData): std::vector< dp_gui::UpdateData > * updateData):
ModalDialog(parent, "UpdateDialog", "desktop/ui/updatedialog.ui"), ModalDialog(parent, "UpdateDialog", "desktop/ui/updatedialog.ui"),
m_context(context), m_context(context),
m_error(DPGUI_RESSTR(RID_DLG_UPDATE_ERROR)),
m_none(DPGUI_RESSTR(RID_DLG_UPDATE_NONE)), m_none(DPGUI_RESSTR(RID_DLG_UPDATE_NONE)),
m_noInstallable(DPGUI_RESSTR(RID_DLG_UPDATE_NOINSTALLABLE)), m_noInstallable(DPGUI_RESSTR(RID_DLG_UPDATE_NOINSTALLABLE)),
m_failure(DPGUI_RESSTR(RID_DLG_UPDATE_FAILURE)), m_failure(DPGUI_RESSTR(RID_DLG_UPDATE_FAILURE)),
......
...@@ -182,7 +182,6 @@ private: ...@@ -182,7 +182,6 @@ private:
VclPtr<HelpButton> m_pHelp; VclPtr<HelpButton> m_pHelp;
VclPtr<PushButton> m_pOk; VclPtr<PushButton> m_pOk;
VclPtr<PushButton> m_pClose; VclPtr<PushButton> m_pClose;
OUString m_error;
OUString m_none; OUString m_none;
OUString m_noInstallable; OUString m_noInstallable;
OUString m_failure; OUString m_failure;
...@@ -203,8 +202,6 @@ private: ...@@ -203,8 +202,6 @@ private:
rtl::Reference< UpdateDialog::Thread > m_thread; rtl::Reference< UpdateDialog::Thread > m_thread;
::com::sun::star::uno::Reference< ::com::sun::star::deployment::XExtensionManager > m_xExtensionManager; ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XExtensionManager > m_xExtensionManager;
Point m_aFirstLinePos;
Size m_aFirstLineSize;
sal_uInt16 m_nLastID; sal_uInt16 m_nLastID;
bool m_bModified; bool m_bModified;
}; };
......
...@@ -27,10 +27,6 @@ Image RID_DLG_UPDATE_NORMALALERT { ...@@ -27,10 +27,6 @@ Image RID_DLG_UPDATE_NORMALALERT {
}; };
}; };
String RID_DLG_UPDATE_ERROR {
Text[en-US] = "Error";
};
String RID_DLG_UPDATE_NONE { String RID_DLG_UPDATE_NONE {
Text[en-US] = "No new updates are available."; Text[en-US] = "No new updates are available.";
}; };
......
...@@ -194,7 +194,6 @@ private: ...@@ -194,7 +194,6 @@ private:
install_info m_aInfo; // info about the version being migrated install_info m_aInfo; // info about the version being migrated
strings_vr m_vrFileList; // final list of files to be copied strings_vr m_vrFileList; // final list of files to be copied
MigrationHashMap m_aOldVersionItemsHashMap; MigrationHashMap m_aOldVersionItemsHashMap;
OUString m_sModuleIdentifier;
// functions to control the migration process // functions to control the migration process
static bool readAvailableMigrations(migrations_available&); static bool readAvailableMigrations(migrations_available&);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment