i18nutil/source/utility/paper.cxx | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit 992bc9dfe1687087918f5fe83d6166791533433b
Author: Tor Lillqvist <t...@collabora.com>
Date: Fri Nov 10 11:41:26 2017 +0200
There is no "paperconf" command on macOS
Change-Id: I01c4cf877eca81880381060e1b3ebedf2979bcb8
diff --git a/i18nutil/source/utility/paper.cxx
b/i18nutil/source/utility/paper.cxx
index a1b8064a1fc5..1d252c43d3a7 100644
--- a/i18nutil/source/utility/paper.cxx
+++ b/i18nutil/source/utility/paper.cxx
@@ -222,6 +222,7 @@ PaperInfo PaperInfo::getSystemDefaultPaper()
if (bInitialized)
return aInstance;
+#ifndef MACOSX
// try libpaper
// #i78617# workaround missing paperconf command
FILE* pPipe = popen( "paperconf 2>/dev/null", "r" );
@@ -284,6 +285,7 @@ PaperInfo PaperInfo::getSystemDefaultPaper()
}
}
}
+#endif
#if defined(LC_PAPER) && defined(_GNU_SOURCE)
// try LC_PAPER
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
