3 files changed, 54 insertions, 2 deletions
diff --git a/basic/inc/sbxbase.hxx b/basic/inc/sbxbase.hxx
new file mode 100644
index 000000000000..597f2927eab1
--- /dev/null
+++ b/basic/inc/sbxbase.hxx
@@ -0,0 +1,52 @@
+/* -*- 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/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_BASIC_INC_SBXBASE_HXX
+#define INCLUDED_BASIC_INC_SBXBASE_HXX
+
+#include <i18nlangtag/lang.h>
+#include <basic/sbxdef.hxx>
+#include <basic/basicdllapi.h>
+#include <boost/ptr_container/ptr_vector.hpp>
+
+class SbxFactory;
+class SbxVariable;
+class SbxBasicFormater;
+
+typedef boost::ptr_vector<SbxFactory> SbxFacs;
+
+// AppData structure for SBX:
+struct SbxAppData
+{
+    SbxError            eSbxError;  // Error code
+    SbxFacs             aFacs;      // Factories
+    SbxBasicFormater    *pBasicFormater;    // Pointer to Format()-Command helper class
+
+    LanguageType        eBasicFormaterLangType;
+    // It might be useful to store this class 'global' because some string reosurces are saved here
+
+    SbxAppData() : eSbxError( SbxERR_OK ), aFacs(), pBasicFormater( NULL ) {}
+    ~SbxAppData();
+};
+
+BASIC_DLLPUBLIC SbxAppData& GetSbxData_Impl();
+
+#endif // INCLUDED_BASIC_INC_SBXBASE_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/sbx/sbxbase.cxx b/basic/source/sbx/sbxbase.cxx
index 07b94b398ec0..cc95d5b29fa8 100644
--- a/basic/source/sbx/sbxbase.cxx
+++ b/basic/source/sbx/sbxbase.cxx
@@ -22,7 +22,7 @@
 
 #include <basic/sbx.hxx>
 #include <basic/sbxfac.hxx>
-#include <basic/sbxbase.hxx>
+#include "sbxbase.hxx"
 
 #include <rtl/instance.hxx>
 #include <rtl/ustring.hxx>
diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx
index d16ffcb7b984..15c507487076 100644
--- a/basic/source/sbx/sbxscan.cxx
+++ b/basic/source/sbx/sbxscan.cxx
@@ -31,7 +31,7 @@
 #include <ctype.h>
 
 #include "sbxres.hxx"
-#include <basic/sbxbase.hxx>
+#include "sbxbase.hxx"
 #include <basic/sbxfac.hxx>
 #include <basic/sbxform.hxx>
 #include <svtools/svtools.hrc>