tools: reimplement SVLIBRARY macro & remove it from solar.h

Change-Id: I03f8f5fd656d62410821f2f2851f1c584c97d1f4
2017-12-13 21:50:15 +01:00
parent 29baa05bb9
commit 68eb27e3bd
15 changed files with 29 additions and 11 deletions
--- 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>
--- 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: */
--- a/include/tools/svlibrary.h
+++ 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: */
--- 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)();
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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
--- 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>

--- 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>

--- 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>
--- 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>

--- 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>