[Libreoffice-commits] .: Branch 'feature/vos-removal' - 2 commits - starmath/inc starmath/source sw/util

[Norbert Thiebaud]

 starmath/inc/symbol.hxx      |    1 -
 starmath/source/math_pch.cxx |    5 -----
 starmath/source/unomodel.cxx |    1 -
 sw/util/makefile.mk          |    2 +-
 4 files changed, 1 insertion(+), 8 deletions(-)

New commits:
commit a095d8c87a47fa72affd99565dc34c35139feb37
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Thu Oct 21 15:48:07 2010 -0500

    finally, gut the vos module out of the build

diff --git a/sw/util/makefile.mk b/sw/util/makefile.mk
index 39fa183..79fa529 100644
--- a/sw/util/makefile.mk
+++ b/sw/util/makefile.mk
@@ -114,7 +114,7 @@ SHL1STDLIBS+= \
     $(UCBHELPERLIB) \
     $(CPPUHELPERLIB) \
     $(CPPULIB) \
-    $(VOSLIB) \
+     \
     $(SALLIB) \
     $(SALHELPERLIB) \
     $(ICUUCLIB) \
commit 6a2ad23036cf8fcf5db40db276fb2bea8b4c1a80
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Thu Oct 21 15:31:31 2010 -0500

    remvove vos/macros.h usage

diff --git a/starmath/inc/symbol.hxx b/starmath/inc/symbol.hxx
index 83bd37f..22714c5 100644
--- a/starmath/inc/symbol.hxx
+++ b/starmath/inc/symbol.hxx
@@ -28,7 +28,6 @@
 #ifndef SYMBOL_HXX
 #define SYMBOL_HXX
 
-#include <vos/refernce.hxx>
 #include <vcl/font.hxx>
 #include <tools/list.hxx>
 #include <tools/debug.hxx>
diff --git a/starmath/source/math_pch.cxx b/starmath/source/math_pch.cxx
index 2e8d557..0aec1ea 100644
--- a/starmath/source/math_pch.cxx
+++ b/starmath/source/math_pch.cxx
@@ -111,7 +111,6 @@
 #include <usr/sequ.hxx>
 #include <uno/types.h>
 #include <uno/macros.h>
-#include <vos/xception.hxx>
 #include <osl/mutex.h>
 #include <tools/shl.hxx>
 #include <sfx2/module.hxx>
@@ -120,11 +119,8 @@
 #include <usr/xiface.hxx>
 #include <usr/ustring.hxx>
 #include <salhelper/simplereferenceobject.hxx>
-#include <vos/types.hxx>
 #include <osl/types.h>
 #include <osl/interlck.h>
-#include <vos/object.hxx>
-#include <vos/macros.hxx>
 #include <smdll.hxx>
 #include <sfx2/sfxsids.hrc>
 #include <chaos/cntids.hrc>
@@ -146,7 +142,6 @@
 #include <smmod.hxx>
 #include <osl/thread.hxx>
 #include <osl/thread.h>
-#include <vos/runnable.hxx>
 #include <vcl/apptypes.hxx>
 #include <tools/dynary.hxx>
 #include <vcl/metric.hxx>
diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx
index 4366dd5..b3610ac 100644
--- a/starmath/source/unomodel.cxx
+++ b/starmath/source/unomodel.cxx
@@ -60,7 +60,6 @@
 #include <config.hxx>
 #include <smdll.hxx>
 
-using namespace ::vos;
 using namespace ::cppu;
 using namespace ::std;
 using namespace ::comphelper;