summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@collabora.com>2019-11-06 17:25:39 +0100
committerJan Holesovsky <kendy@collabora.com>2019-11-07 08:21:10 +0100
commitc503fc6e478510f0fec72cd88b776ca683a00021 (patch)
tree6c91f1ed7b2e0752ab3724c658972ee214b86095
parent59a8deae5c4c8692031c24e0d176ed29f84bc8ee (diff)
android: ODR fix of RID_PAGEFORMATPANEL_MARGINS_CM.
Without this, we get a linking error that RID_PAGEFORMATPANEL_MARGINS_CM is defined twice. Change-Id: Ib9c07adcb0a8def991d1e39429c1bb4947cd7d32 Reviewed-on: https://gerrit.libreoffice.org/82159 Tested-by: Jenkins Reviewed-by: Jan Holesovsky <kendy@collabora.com>
-rw-r--r--sd/inc/pageformatpanel.hrc5
-rw-r--r--sw/inc/pageformatpanel.hrc5
2 files changed, 10 insertions, 0 deletions
diff --git a/sd/inc/pageformatpanel.hrc b/sd/inc/pageformatpanel.hrc
index 23325e26ac2f..b7309ee69748 100644
--- a/sd/inc/pageformatpanel.hrc
+++ b/sd/inc/pageformatpanel.hrc
@@ -12,6 +12,9 @@
#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
+namespace sd
+{
+
// To translators: this is a listbox labelled by "Margins:", inch units
const char* RID_PAGEFORMATPANEL_MARGINS_INCH[] =
{
@@ -36,6 +39,8 @@ const char* RID_PAGEFORMATPANEL_MARGINS_CM[] =
NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "Wide"),
};
+}
+
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/sw/inc/pageformatpanel.hrc b/sw/inc/pageformatpanel.hrc
index ecad14cf51a2..048ff93a8776 100644
--- a/sw/inc/pageformatpanel.hrc
+++ b/sw/inc/pageformatpanel.hrc
@@ -12,6 +12,9 @@
#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
+namespace sw
+{
+
// To translators: this is a listbox labelled by "Margins:", inch units
const char* RID_PAGEFORMATPANEL_MARGINS_INCH[] =
{
@@ -38,6 +41,8 @@ const char* RID_PAGEFORMATPANEL_MARGINS_CM[] =
NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "Mirrored")
};
+}
+
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */