sc/inc/strings.hrc | 1 -
sc/source/ui/inc/conflictsdlg.hxx | 1 -
sc/source/ui/miscdlgs/conflictsdlg.cxx | 1 -
3 files changed, 3 deletions(-)
New commits:
commit 0d5ae0b0e88e30b7c196613bd0b8f3d3eb18674a
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Mon Apr 29 12:33:35 2019 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Mon Apr 29 14:03:33 2019 +0200
-Werror,-Wunused-private-field
Change-Id: Ie6aeff552b13d2b9abe38c178a4f467d47fc0ca5
Reviewed-on: https://gerrit.libreoffice.org/71520
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/sc/inc/strings.hrc b/sc/inc/strings.hrc
index dcceddab3190..3a5e2710aed0 100644
--- a/sc/inc/strings.hrc
+++ b/sc/inc/strings.hrc
@@ -182,7 +182,6 @@
#define SCSTR_QHELP_EXPAND_FORMULA
NC_("SCSTR_QHELP_EXPAND_FORMULA", "Expand Formula Bar")
#define SCSTR_QHELP_COLLAPSE_FORMULA
NC_("SCSTR_QHELP_COLLAPSE_FORMULA", "Collapse Formula Bar")
-#define STR_TITLE_CONFLICT NC_("STR_TITLE_CONFLICT",
"Conflict")
#define STR_TITLE_AUTHOR NC_("STR_TITLE_AUTHOR",
"Author")
#define STR_TITLE_DATE NC_("STR_TITLE_DATE",
"Date")
#define STR_UNKNOWN_USER_CONFLICT
NC_("STR_UNKNOWN_USER_CONFLICT", "Unknown User")
diff --git a/sc/source/ui/inc/conflictsdlg.hxx
b/sc/source/ui/inc/conflictsdlg.hxx
index 433d4584b140..4f32a398d0de 100644
--- a/sc/source/ui/inc/conflictsdlg.hxx
+++ b/sc/source/ui/inc/conflictsdlg.hxx
@@ -114,7 +114,6 @@ public:
class ScConflictsDlg : public weld::GenericDialogController
{
private:
- OUString const maStrTitleConflict;
OUString const maStrUnknownUser;
ScViewData* const mpViewData;
diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx
b/sc/source/ui/miscdlgs/conflictsdlg.cxx
index 95e2a285c381..28d69d0421ba 100644
--- a/sc/source/ui/miscdlgs/conflictsdlg.cxx
+++ b/sc/source/ui/miscdlgs/conflictsdlg.cxx
@@ -331,7 +331,6 @@ void ScConflictsResolver::HandleAction( ScChangeAction*
pAction, bool bIsSharedA
ScConflictsDlg::ScConflictsDlg(weld::Window* pParent, ScViewData* pViewData,
ScDocument* pSharedDoc, ScConflictsList& rConflictsList)
: GenericDialogController(pParent, "modules/scalc/ui/conflictsdialog.ui",
"ConflictsDialog")
- , maStrTitleConflict ( ScResId( STR_TITLE_CONFLICT ) )
, maStrUnknownUser ( ScResId( STR_UNKNOWN_USER_CONFLICT ) )
, mpViewData ( pViewData )
, mpOwnDoc ( nullptr )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
