summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--basic/inc/global.hxx (renamed from include/basic/global.hxx)6
-rw-r--r--basic/source/basmgr/basmgr.cxx2
-rw-r--r--basic/source/classes/global.cxx3
3 files changed, 6 insertions, 5 deletions
diff --git a/include/basic/global.hxx b/basic/inc/global.hxx
index 9d63c14afe7a..640759ef8c17 100644
--- a/include/basic/global.hxx
+++ b/basic/inc/global.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_BASIC_GLOBAL_HXX
-#define INCLUDED_BASIC_GLOBAL_HXX
+#ifndef INCLUDED_BASIC_INC_GLOBAL_HXX
+#define INCLUDED_BASIC_INC_GLOBAL_HXX
namespace utl {
class TransliterationWrapper;
@@ -20,6 +20,6 @@ public:
static utl::TransliterationWrapper& GetTransliteration();
};
-#endif
+#endif // INCLUDED_BASIC_INC_GLOBAL_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index 96dc43417177..785dda6c0429 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -37,7 +37,7 @@
#include <basic/sbuno.hxx>
#include <basic/basmgr.hxx>
-#include <basic/global.hxx>
+#include "global.hxx"
#include <sbunoobj.hxx>
#include "basrid.hxx"
#include "sbintern.hxx"
diff --git a/basic/source/classes/global.cxx b/basic/source/classes/global.cxx
index c486647fb0a0..2efb9da1201d 100644
--- a/basic/source/classes/global.cxx
+++ b/basic/source/classes/global.cxx
@@ -7,13 +7,14 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include <basic/global.hxx>
#include <comphelper/processfactory.hxx>
#include <i18nlangtag/lang.h>
#include <rtl/instance.hxx>
#include <unotools/transliterationwrapper.hxx>
#include <vcl/svapp.hxx>
+#include "global.hxx"
+
namespace
{
class lclTransliterationWrapper