From 68eb27e3bd5d536e7b00b7dc145ae4943b95bec9 Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
Date: Wed, 13 Dec 2017 21:50:15 +0100
Subject: [PATCH] tools: reimplement SVLIBRARY macro & remove it from solar.h

Change-Id: I03f8f5fd656d62410821f2f2851f1c584c97d1f4
---
 chart2/source/view/main/AbstractShapeFactory.cxx |  1 +
 include/tools/solar.h                            | 10 ----------
 include/tools/svlibrary.h                        | 15 +++++++++++++++
 sc/source/ui/attrdlg/scabstdlg.cxx               |  1 +
 sc/source/ui/docshell/impex.cxx                  |  1 +
 sd/source/filter/sdfilter.cxx                    |  1 +
 sfx2/source/appl/app.cxx                         |  1 +
 sfx2/source/appl/appinit.cxx                     |  1 +
 sfx2/source/appl/appserv.cxx                     |  1 +
 svtools/source/misc/svtaccessiblefactory.cxx     |  2 ++
 sw/qa/unit/sw-dialogs-test.cxx                   |  1 +
 sw/qa/unit/sw-dialogs-test_2.cxx                 |  1 +
 sw/source/filter/basflt/fltini.cxx               |  1 +
 toolkit/source/helper/accessibilityclient.cxx    |  2 +-
 vcl/source/filter/FilterConfigCache.cxx          |  1 +
 15 files changed, 29 insertions(+), 11 deletions(-)
 create mode 100644 include/tools/svlibrary.h

diff --git a/chart2/source/view/main/AbstractShapeFactory.cxx b/chart2/source/view/main/AbstractShapeFactory.cxx
index b340869bddc6..87a09efa1810 100644
--- a/chart2/source/view/main/AbstractShapeFactory.cxx
+++ b/chart2/source/view/main/AbstractShapeFactory.cxx
@@ -30,6 +30,7 @@
 
 #include <editeng/unoprnms.hxx>
 #include <rtl/math.hxx>
+#include <tools/svlibrary.h>
 #include <svx/svdocirc.hxx>
 #include <svx/svdopath.hxx>
 #include <vcl/svapp.hxx>
diff --git a/include/tools/solar.h b/include/tools/solar.h
index d53b20f0e58a..a1b10d6e9f01 100644
--- a/include/tools/solar.h
+++ b/include/tools/solar.h
@@ -105,16 +105,6 @@ inline void     DoubleToSVBT64( double n, SVBT64 p ) { p[0] = reinterpret_cast<s
 #endif
 #endif
 
-#if defined(_WIN32)
-#define SVLIBRARY( Base ) Base "lo.dll"
-#elif defined MACOSX
-#define SVLIBRARY( Base ) "lib" Base "lo.dylib"
-#elif defined UNX
-#define SVLIBRARY( Base ) "lib" Base "lo.so"
-#else
-  #error unknown platform
-#endif
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/tools/svlibrary.h b/include/tools/svlibrary.h
new file mode 100644
index 000000000000..2a46d8c88412
--- /dev/null
+++ b/include/tools/svlibrary.h
@@ -0,0 +1,15 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef SVLIBRARY
+#define SVLIBRARY( Base ) SAL_MODULENAME( Base "lo" )
+#include <osl/module.h>
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/attrdlg/scabstdlg.cxx b/sc/source/ui/attrdlg/scabstdlg.cxx
index 1f268b1af5c4..2829cbf5a833 100644
--- a/sc/source/ui/attrdlg/scabstdlg.cxx
+++ b/sc/source/ui/attrdlg/scabstdlg.cxx
@@ -22,6 +22,7 @@
 #include <scabstdlg.hxx>
 
 #include <osl/module.hxx>
+#include <tools/svlibrary.h>
 #include <rtl/ustrbuf.hxx>
 
 typedef ScAbstractDialogFactory* (*ScFuncPtrCreateDialogFactory)();
diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index d2e2899454b7..26208259099d 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -54,6 +54,7 @@
 
 #include <globstr.hrc>
 #include <o3tl/safeint.hxx>
+#include <tools/svlibrary.h>
 #include <vcl/svapp.hxx>
 
 #include <memory>
diff --git a/sd/source/filter/sdfilter.cxx b/sd/source/filter/sdfilter.cxx
index aeb1aec40853..fbcc65e1d6e9 100644
--- a/sd/source/filter/sdfilter.cxx
+++ b/sd/source/filter/sdfilter.cxx
@@ -22,6 +22,7 @@
 #include <memory>
 
 #include <osl/module.hxx>
+#include <tools/svlibrary.h>
 #include <sfx2/docfile.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/progress.hxx>
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index d227a942b3ca..82e1d6394f7b 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -24,6 +24,7 @@
 #include <basic/basrdll.hxx>
 #include <basic/sbmeth.hxx>
 #include <basic/sbmod.hxx>
+#include <tools/svlibrary.h>
 #include <svtools/asynclink.hxx>
 #include <svl/stritem.hxx>
 #include <svl/eitem.hxx>
diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index 89c5570a42b8..e190d594d897 100644
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -27,6 +27,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
 #include <basic/sbdef.hxx>
+#include <tools/svlibrary.h>
 #include <svtools/soerr.hxx>
 #include <svtools/strings.hrc>
 #include <unotools/resmgr.hxx>
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index abb52252ce8b..78f39b318b6b 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -57,6 +57,7 @@
 #include <unotools/intlwrapper.hxx>
 
 #include <unotools/configmgr.hxx>
+#include <tools/svlibrary.h>
 #include <tools/diagnose_ex.h>
 #include <vcl/layout.hxx>
 #include <svl/intitem.hxx>
diff --git a/svtools/source/misc/svtaccessiblefactory.cxx b/svtools/source/misc/svtaccessiblefactory.cxx
index a20177785d66..b97384d29866 100644
--- a/svtools/source/misc/svtaccessiblefactory.cxx
+++ b/svtools/source/misc/svtaccessiblefactory.cxx
@@ -21,6 +21,8 @@
 
 #include <svtaccessiblefactory.hxx>
 
+#include <tools/svlibrary.h>
+
 #include <osl/module.h>
 
 namespace svt
diff --git a/sw/qa/unit/sw-dialogs-test.cxx b/sw/qa/unit/sw-dialogs-test.cxx
index 22c7f4f740d8..f5968d36b7e7 100644
--- a/sw/qa/unit/sw-dialogs-test.cxx
+++ b/sw/qa/unit/sw-dialogs-test.cxx
@@ -12,6 +12,7 @@
 #include <rtl/bootstrap.hxx>
 #include <rtl/strbuf.hxx>
 #include <osl/file.hxx>
+#include <tools/svlibrary.h>
 #include <sfx2/app.hxx>
 #include <vcl/abstdlg.hxx>
 
diff --git a/sw/qa/unit/sw-dialogs-test_2.cxx b/sw/qa/unit/sw-dialogs-test_2.cxx
index 261735c9405c..fe59616aace7 100644
--- a/sw/qa/unit/sw-dialogs-test_2.cxx
+++ b/sw/qa/unit/sw-dialogs-test_2.cxx
@@ -12,6 +12,7 @@
 #include <rtl/bootstrap.hxx>
 #include <rtl/strbuf.hxx>
 #include <osl/file.hxx>
+#include <tools/svlibrary.h>
 #include <sfx2/app.hxx>
 #include <vcl/abstdlg.hxx>
 
diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx
index e99b643480d4..c0c3d992eff0 100644
--- a/sw/source/filter/basflt/fltini.cxx
+++ b/sw/source/filter/basflt/fltini.cxx
@@ -22,6 +22,7 @@
 #include <i18nlangtag/lang.h>
 #include <i18nlangtag/languagetag.hxx>
 #include <o3tl/any.hxx>
+#include <tools/svlibrary.h>
 #include <vcl/msgbox.hxx>
 #include <svtools/parhtml.hxx>
 #include <sot/storage.hxx>
diff --git a/toolkit/source/helper/accessibilityclient.cxx b/toolkit/source/helper/accessibilityclient.cxx
index 59044160eac0..ec866fbc6a93 100644
--- a/toolkit/source/helper/accessibilityclient.cxx
+++ b/toolkit/source/helper/accessibilityclient.cxx
@@ -25,7 +25,7 @@
 #include <osl/module.h>
 #include <osl/diagnose.h>
 #include <osl/mutex.hxx>
-#include <tools/solar.h>
+#include <tools/svlibrary.h>
 
 #include <helper/accessibilityclient.hxx>
 
diff --git a/vcl/source/filter/FilterConfigCache.cxx b/vcl/source/filter/FilterConfigCache.cxx
index d652093285e5..3f1914cd4a57 100644
--- a/vcl/source/filter/FilterConfigCache.cxx
+++ b/vcl/source/filter/FilterConfigCache.cxx
@@ -21,6 +21,7 @@
 
 #include <vcl/graphicfilter.hxx>
 #include <unotools/configmgr.hxx>
+#include <tools/svlibrary.h>
 #include <com/sun/star/uno/Any.h>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/uno/Exception.hpp>