summaryrefslogtreecommitdiff
path: root/sal
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2015-04-02 13:22:04 +0300
committerTor Lillqvist <tml@collabora.com>2015-04-02 13:28:12 +0300
commitcbd8587ffb4b4e01705fc7f07fc4740382b78a08 (patch)
tree0c780e9ceac1afc62791cd617facb6c00e4a7d32 /sal
parentc8cf6766fd38d45b73d49cb85dd5fe2d7e3dba50 (diff)
Move osl::LibreOfficeKit stuff to comphelper for now
Let's see where it actually will be needed. Sal is a "picky" place for new API, even inside LIBO_INTERNAL_ONLY. Change-Id: Ia0c5ee8cfc6ee526c5ad34d2f8aab0b14b5f805b
Diffstat (limited to 'sal')
-rw-r--r--sal/osl/all/utility.cxx17
-rw-r--r--sal/util/sal.map5
2 files changed, 0 insertions, 22 deletions
diff --git a/sal/osl/all/utility.cxx b/sal/osl/all/utility.cxx
index a84111ce7c36..25611ca3347f 100644
--- a/sal/osl/all/utility.cxx
+++ b/sal/osl/all/utility.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <osl/lok.hxx>
#include <osl/time.h>
/*
@@ -46,22 +45,6 @@ public:
static OGlobalTimer aGlobalTimer;
-namespace LibreOfficeKit
-{
-
-static bool bActive(false);
-
-void setActive()
-{
- bActive = true;
-}
-
-bool isActive()
-{
- return bActive;
-}
-
-} // namespace LibreOfficeKit
} // namespace osl
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/util/sal.map b/sal/util/sal.map
index c8bcdbab7699..2a87243e4813 100644
--- a/sal/util/sal.map
+++ b/sal/util/sal.map
@@ -713,11 +713,6 @@ PRIVATE_textenc.1 { # LibreOffice 3.6
_ZN3sal6detail7textenc37handleBadInputUnicodeToTextConversion*;
};
-PRIVATE_4.5 { # LibreOffice 4.5
- _ZN3osl14LibreOfficeKit8isActive*;
- _ZN3osl14LibreOfficeKit9setActive*;
-};
-
# Unique libstdc++ symbols:
GLIBCXX_3.4 {
global: