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

[Norbert Thiebaud]

 sd/inc/pch/precompiled_sd.hxx            |    3 +--
 sd/source/filter/eppt/epptso.cxx         |    5 -----
 sd/source/ui/func/fusel.cxx              |    1 -
 sd/source/ui/slideshow/slideshowimpl.cxx |    1 -
 sd/util/makefile.mk                      |    1 -
 5 files changed, 1 insertion(+), 10 deletions(-)

New commits:
commit 8c780c4ce799662929a8152590665160bb8f0f35
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Thu Oct 21 16:15:01 2010 -0500

    Finally, gut the vos module out of the build

diff --git a/sd/util/makefile.mk b/sd/util/makefile.mk
index 8de0aed..7c2573d 100755
--- a/sd/util/makefile.mk
+++ b/sd/util/makefile.mk
@@ -84,7 +84,6 @@ SHL1STDLIBS+= \
     $(UCBHELPERLIB) \
     $(CPPUHELPERLIB) \
     $(CPPULIB) \
-    $(VOSLIB) \
     $(CANVASLIB) \
     $(SALLIB) \
     $(SALHELPERLIB) \
commit 7fcfc7dd3b00bf01c1421c44b73d3577d13ef2bd
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Thu Oct 21 15:35:08 2010 -0500

    convert vos/process.hxx and related API

diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx
index 73bb5a3..ae551d2 100644
--- a/sd/inc/pch/precompiled_sd.hxx
+++ b/sd/inc/pch/precompiled_sd.hxx
@@ -908,8 +908,7 @@
 #include "osl/diagnose.h"
 #include "osl/module.hxx"
 #include "osl/mutex.hxx"
-#include "vos/process.hxx"
-#include "vos/xception.hxx"
+#include "osl/process.h"
 //---MARKER---
 
 #endif
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index 22c3417..0b42564 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -91,11 +91,6 @@
 
 #include "i18npool/mslangid.hxx"
 
-#include <vos/xception.hxx>
-#ifndef _VOS_NO_NAMESPACE
-using namespace vos;
-#endif
-
 using namespace ::com::sun::star;
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx
index 9ed3758..240d963 100644
--- a/sd/source/ui/func/fusel.cxx
+++ b/sd/source/ui/func/fusel.cxx
@@ -31,7 +31,6 @@
 
 
 #include "fusel.hxx"
-#include <vos/process.hxx>
 #include <basic/sbstar.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/svdogrp.hxx>
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index e2efd71..5aae88c 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -44,7 +44,6 @@
 #include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/frame/XDispatch.hpp>
 #include <com/sun/star/frame/XLayoutManager.hpp>
-#include <vos/process.hxx>
 #include <svl/aeitem.hxx>
 #include <svl/urihelper.hxx>