ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

android: ODR fix of RID_PAGEFORMATPANEL_MARGINS_CM.

Browse Source 
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>
This commit is contained in:
Jan Holesovsky
2019-11-07 08:21:10 +01:00
parent 59a8deae5c
commit c503fc6e47
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sd/inc/pageformatpanel.hrc
+5
View File
@@ -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: */
sw/inc/pageformatpanel.hrc
+5
View File
@@ -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: */