summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-09-13 13:57:12 +0200
committerStephan Bergmann <sbergman@redhat.com>2017-09-13 13:57:45 +0200
commit781267bc8de0ac59623666663e22ac368190b98d (patch)
treedd11bdc57f3c8f08b4b6bb0efeb6ac5dd8455029
parentf4be69b407f33d541623ade19fccacfc20f1d139 (diff)
Blind macOS -Werror,-Wunreachable-code fix
Change-Id: Ice41b6394bc4fc8e4b1d7b9c5689019361883b59
-rw-r--r--vcl/osx/printaccessoryview.mm10
1 files changed, 3 insertions, 7 deletions
diff --git a/vcl/osx/printaccessoryview.mm b/vcl/osx/printaccessoryview.mm
index c0f882f4abc5..ad4ea5af9de7 100644
--- a/vcl/osx/printaccessoryview.mm
+++ b/vcl/osx/printaccessoryview.mm
@@ -163,21 +163,17 @@ public:
, mnLastPageCount( [i_pAccessoryController printerController]->getFilteredPageCount() )
, mpAccessoryController( i_pAccessoryController )
{
- assert( SAL_N_ELEMENTS(SV_PRINT_NATIVE_STRINGS) >= 5 && "resources not found" );
+ static_assert( SAL_N_ELEMENTS(SV_PRINT_NATIVE_STRINGS) == 5, "resources not found" );
}
static rtl::OUString getMoreString()
{
- return SAL_N_ELEMENTS(SV_PRINT_NATIVE_STRINGS) >= 4
- ? VclResId(SV_PRINT_NATIVE_STRINGS[3])
- : OUString("More");
+ return VclResId(SV_PRINT_NATIVE_STRINGS[3]);
}
static rtl::OUString getPrintSelectionString()
{
- return SAL_N_ELEMENTS(SV_PRINT_NATIVE_STRINGS) >= 5
- ? VclResId(SV_PRINT_NATIVE_STRINGS[4])
- : OUString("Print selection only");
+ return VclResId(SV_PRINT_NATIVE_STRINGS[4]);
}
int addNameTag( const rtl::OUString& i_rPropertyName )