summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-06-21 16:39:30 +0200
committerStephan Bergmann <sbergman@redhat.com>2017-06-21 16:39:30 +0200
commit2534ec3639c39384f0879488c235911ab2bef9b9 (patch)
tree7a2458fce474e213b794f90471ea1faf698b7012 /sw
parenteeb65fabd4c94e1ce69996890a4fb9badc11e778 (diff)
-Werror,-Wunused-private-field
Change-Id: I0f16c434f735ced976580e921394778559b57410
Diffstat (limited to 'sw')
-rw-r--r--sw/source/ui/envelp/labfmt.cxx2
-rw-r--r--sw/source/ui/envelp/labfmt.hrc4
-rw-r--r--sw/source/ui/envelp/labfmt.hxx2
-rw-r--r--sw/source/ui/envelp/labfmt.src8
4 files changed, 1 insertions, 15 deletions
diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx
index 056c8531f0aa..aac47888dacd 100644
--- a/sw/source/ui/envelp/labfmt.cxx
+++ b/sw/source/ui/envelp/labfmt.cxx
@@ -109,8 +109,6 @@ SwLabPreview::SwLabPreview(vcl::Window* pParent)
, m_aUpperStr(SwResId(STR_UPPER))
, m_aColsStr(SwResId(STR_COLS))
, m_aRowsStr(SwResId(STR_ROWS))
- , m_aPWidthStr(SwResId(STR_PWIDTH))
- , m_aPHeightStr(SwResId(STR_PHEIGHT))
{
SetMapMode(MapUnit::MapPixel);
diff --git a/sw/source/ui/envelp/labfmt.hrc b/sw/source/ui/envelp/labfmt.hrc
index 128c179e4d32..2aa9340b41a0 100644
--- a/sw/source/ui/envelp/labfmt.hrc
+++ b/sw/source/ui/envelp/labfmt.hrc
@@ -32,12 +32,10 @@
#define STR_UPPER (RC_LABFMT_BEGIN + 6)
#define STR_COLS (RC_LABFMT_BEGIN + 7)
#define STR_ROWS (RC_LABFMT_BEGIN + 8)
-#define STR_PWIDTH (RC_LABFMT_BEGIN + 9)
-#define STR_PHEIGHT (RC_LABFMT_BEGIN + 10)
// overflow check ********************************************************
-#define LABFMT_ACT_END STR_PHEIGHT
+#define LABFMT_ACT_END STR_ROWS
#if LABFMT_ACT_END > RC_LABFMT_END
#error Resource overflow in #file, #line
diff --git a/sw/source/ui/envelp/labfmt.hxx b/sw/source/ui/envelp/labfmt.hxx
index 37902090f96e..a54321d61640 100644
--- a/sw/source/ui/envelp/labfmt.hxx
+++ b/sw/source/ui/envelp/labfmt.hxx
@@ -37,8 +37,6 @@ class SwLabPreview : public vcl::Window
OUString m_aUpperStr;
OUString m_aColsStr;
OUString m_aRowsStr;
- OUString m_aPWidthStr;
- OUString m_aPHeightStr;
long m_lHDistWidth;
long m_lVDistWidth;
diff --git a/sw/source/ui/envelp/labfmt.src b/sw/source/ui/envelp/labfmt.src
index 701248e0822a..d72efc34ab7c 100644
--- a/sw/source/ui/envelp/labfmt.src
+++ b/sw/source/ui/envelp/labfmt.src
@@ -52,12 +52,4 @@ String STR_ROWS
{
Text [ en-US ] = "Rows" ;
};
-String STR_PWIDTH
-{
- Text [ en-US ] = "Page Width" ;
-};
-String STR_PHEIGHT
-{
- Text [ en-US ] = "Page Height" ;
-};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */