[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - sd/inc sw/inc

[Jan Holesovsky (via logerrit)]

 sd/inc/pageformatpanel.hrc |    5 +++++
 sw/inc/pageformatpanel.hrc |    5 +++++
 2 files changed, 10 insertions(+)

New commits:
commit 0d52af6278c1ebcd2d6316dccb69c07a7473535d
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Wed Nov 6 17:25:39 2019 +0100
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Wed Nov 6 18:13:02 2019 +0100

    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/82158
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>

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: */