[Libreoffice-commits] .: Branch 'feature/vos-removal' - 3 commits - binfilter/bf_basic binfilter/bf_forms binfilter/bf_sc binfilter/bf_sch binfilter/bf_sd binfilter/bf_sfx2 binfilter/bf_so3 binfilter/bf_svtools binfilter/bf_svx binfilter/bf_xmloff binfilter/inc filter/source oox/prj
Norbert Thiebaud
nthiebaud at kemper.freedesktop.org
Thu Oct 21 15:42:39 PDT 2010
binfilter/bf_basic/source/classes/sbxmod.cxx | 1 -
binfilter/bf_forms/util/makefile.mk | 1 -
binfilter/bf_sc/source/core/tool/sc_addincol.cxx | 3 +--
binfilter/bf_sc/util/makefile.mk | 1 -
binfilter/bf_sch/source/core/sch_chtmodel.cxx | 1 -
binfilter/bf_sd/source/core/sd_drawdoc.cxx | 1 -
binfilter/bf_sfx2/source/appl/sfx2_appmain.cxx | 1 -
binfilter/bf_sfx2/source/appl/sfx2_appmisc.cxx | 2 --
binfilter/bf_sfx2/source/bastyp/sfx2_fltfnc.cxx | 1 -
binfilter/bf_so3/util/makefile.mk | 3 +--
binfilter/bf_svtools/source/config/svt_defaultoptions.cxx | 1 -
binfilter/bf_svtools/source/config/svt_pathoptions.cxx | 1 -
binfilter/bf_svtools/source/misc1/svt_svtdata.cxx | 1 -
binfilter/bf_svtools/util/makefile.mk | 3 +--
binfilter/bf_svx/util/makefile.mk | 1 -
binfilter/bf_xmloff/util/makefile.mk | 1 -
binfilter/inc/bf_goodies/base3d.hxx | 2 +-
binfilter/inc/bf_sd/sdfilter.hxx | 5 ++---
filter/source/msfilter/escherex.cxx | 4 ----
filter/source/msfilter/msdffimp.cxx | 5 +----
oox/prj/build.lst | 2 +-
21 files changed, 8 insertions(+), 33 deletions(-)
New commits:
commit 5acc85558b10f4491a96d594ee97e6ff381e17c8
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Thu Oct 21 16:17:14 2010 -0500
Finally, gut the vos module out of the build
diff --git a/binfilter/bf_forms/util/makefile.mk b/binfilter/bf_forms/util/makefile.mk
index e67b9e1..06e1530 100644
--- a/binfilter/bf_forms/util/makefile.mk
+++ b/binfilter/bf_forms/util/makefile.mk
@@ -64,7 +64,6 @@ SHL1STDLIBS= \
$(VCLLIB) \
$(BFSVTOOLLIB) \
$(BFSVXLIB) \
- $(VOSLIB) \
$(UNOTOOLSLIB) \
$(COMPHELPERLIB) \
$(DBTOOLSLIB) \
diff --git a/binfilter/bf_sc/util/makefile.mk b/binfilter/bf_sc/util/makefile.mk
index 5834dac..ef96a28 100644
--- a/binfilter/bf_sc/util/makefile.mk
+++ b/binfilter/bf_sc/util/makefile.mk
@@ -75,7 +75,6 @@ SHL1STDLIBS+= \
$(CPPUHELPERLIB) \
$(COMPHELPERLIB) \
$(UCBHELPERLIB) \
- $(VOSLIB) \
$(SALLIB) \
$(SALHELPERLIB) \
$(TOOLSLIB) \
diff --git a/binfilter/bf_so3/util/makefile.mk b/binfilter/bf_so3/util/makefile.mk
index dba7b03..6b92173 100644
--- a/binfilter/bf_so3/util/makefile.mk
+++ b/binfilter/bf_so3/util/makefile.mk
@@ -72,7 +72,6 @@ SHL1STDLIBS=\
$(UNOTOOLSLIB) \
$(TOOLSLIB) \
$(BFSVTOOLLIB) \
- $(VOSLIB) \
$(COMPHELPERLIB) \
$(CPPUHELPERLIB) \
$(CPPULIB) \
@@ -89,7 +88,7 @@ SHL1STDLIBS+= \
.ENDIF
.IF "$(GUI)"=="WIN"
-SHL1STDLIBS=$(VOSLIB) \
+SHL1STDLIBS= \
ole2.lib compobj.lib storage.lib shell.lib \
ole2disp.lib typelib.lib
.ENDIF
diff --git a/binfilter/bf_svtools/util/makefile.mk b/binfilter/bf_svtools/util/makefile.mk
index 442bcbe..c486509 100644
--- a/binfilter/bf_svtools/util/makefile.mk
+++ b/binfilter/bf_svtools/util/makefile.mk
@@ -91,9 +91,8 @@ SHL1STDLIBS+= \
$(COMPHELPERLIB) \
$(CPPUHELPERLIB) \
$(CPPULIB) \
- $(VOSLIB) \
$(SALLIB)
-
+
.IF "$(OS)"=="MACOSX"
# static libraries go at end
SHL1STDLIBS+= $(JPEG3RDLIB)
diff --git a/binfilter/bf_svx/util/makefile.mk b/binfilter/bf_svx/util/makefile.mk
index 582c6cd..26bca9c 100644
--- a/binfilter/bf_svx/util/makefile.mk
+++ b/binfilter/bf_svx/util/makefile.mk
@@ -63,7 +63,6 @@ SHL1STDLIBS= \
$(UCBHELPERLIB) \
$(CPPUHELPERLIB) \
$(CPPULIB) \
- $(VOSLIB) \
$(SALLIB) \
$(SALHELPERLIB) \
$(ICUUCLIB)\
diff --git a/binfilter/bf_xmloff/util/makefile.mk b/binfilter/bf_xmloff/util/makefile.mk
index d6bff91..0a10793 100644
--- a/binfilter/bf_xmloff/util/makefile.mk
+++ b/binfilter/bf_xmloff/util/makefile.mk
@@ -73,7 +73,6 @@ SHL1STDLIBS= \
$(BFSVTOOLLIB) \
$(TOOLSLIB) \
$(I18NISOLANGLIB) \
- $(VOSLIB) \
$(CPPULIB) \
$(CPPUHELPERLIB)\
$(COMPHELPERLIB)\
diff --git a/oox/prj/build.lst b/oox/prj/build.lst
index 1650e02..57fde11 100644
--- a/oox/prj/build.lst
+++ b/oox/prj/build.lst
@@ -1,4 +1,4 @@
-oox oox : vos cppu cppuhelper comphelper filter sal offapi sax basegfx svx xmlscript tools vcl BOOST:boost OPENSSL:openssl NULL
+oox oox : cppu cppuhelper comphelper filter sal offapi sax basegfx svx xmlscript tools vcl BOOST:boost OPENSSL:openssl NULL
oox oox usr1 - all oox_mkout NULL
oox oox\prj get - all oox_prj NULL
oox oox\source\token nmake - all oox_token NULL
commit 735323d134dd8446129f45d14f7af07033721d30
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Thu Oct 21 15:36:32 2010 -0500
convert vos/process.hxx and related API
diff --git a/binfilter/bf_sc/source/core/tool/sc_addincol.cxx b/binfilter/bf_sc/source/core/tool/sc_addincol.cxx
index aa2d11e..e1fced7 100644
--- a/binfilter/bf_sc/source/core/tool/sc_addincol.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_addincol.cxx
@@ -30,7 +30,6 @@
#include <tools/debug.hxx>
#include <i18npool/mslangid.hxx>
#include <vcl/svapp.hxx>
-#include <vos/xception.hxx>
#include <bf_sfx2/objsh.hxx>
#include <unotools/charclass.hxx>
@@ -53,7 +52,7 @@
#include "scmatrix.hxx"
#include "addinlis.hxx"
#include "scfuncs.hrc"
-#include <legacysmgr/legacy_binfilters_smgr.hxx> //STRIP002
+#include <legacysmgr/legacy_binfilters_smgr.hxx>
namespace binfilter {
using namespace ::com::sun::star;
diff --git a/binfilter/bf_sch/source/core/sch_chtmodel.cxx b/binfilter/bf_sch/source/core/sch_chtmodel.cxx
index 28e68a7..1af1da6 100644
--- a/binfilter/bf_sch/source/core/sch_chtmodel.cxx
+++ b/binfilter/bf_sch/source/core/sch_chtmodel.cxx
@@ -115,7 +115,6 @@ class SbxArray;
#include <com/sun/star/linguistic2/XLinguServiceManager.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <bf_svx/langitem.hxx>
-#include <vos/xception.hxx>
#include <bf_svtools/undo.hxx>
#include <legacysmgr/legacy_binfilters_smgr.hxx> //STRIP002
diff --git a/binfilter/bf_sd/source/core/sd_drawdoc.cxx b/binfilter/bf_sd/source/core/sd_drawdoc.cxx
index 5ad3963..5ad456b 100644
--- a/binfilter/bf_sd/source/core/sd_drawdoc.cxx
+++ b/binfilter/bf_sd/source/core/sd_drawdoc.cxx
@@ -64,7 +64,6 @@
#include <bf_svx/outlobj.hxx>
#include <bf_svtools/saveopt.hxx>
#include <comphelper/extract.hxx>
-#include <vos/xception.hxx>
#include <i18npool/mslangid.hxx>
#include <unotools/charclass.hxx>
#include <comphelper/processfactory.hxx>
diff --git a/binfilter/bf_sfx2/source/appl/sfx2_appmain.cxx b/binfilter/bf_sfx2/source/appl/sfx2_appmain.cxx
index 5b26df8..8eb0837 100644
--- a/binfilter/bf_sfx2/source/appl/sfx2_appmain.cxx
+++ b/binfilter/bf_sfx2/source/appl/sfx2_appmain.cxx
@@ -42,7 +42,6 @@
#include <bf_svtools/itempool.hxx>
#include <bf_svtools/urihelper.hxx>
#include <bf_svtools/helpopt.hxx>
-#include <vos/process.hxx>
#include "appimp.hxx"
#include "sfxtypes.hxx"
diff --git a/binfilter/bf_sfx2/source/appl/sfx2_appmisc.cxx b/binfilter/bf_sfx2/source/appl/sfx2_appmisc.cxx
index c55e211..380b792 100644
--- a/binfilter/bf_sfx2/source/appl/sfx2_appmisc.cxx
+++ b/binfilter/bf_sfx2/source/appl/sfx2_appmisc.cxx
@@ -28,8 +28,6 @@
#include <vcl/status.hxx>
#include <vcl/msgbox.hxx>
-#include <vos/process.hxx>
-#include <vos/xception.hxx>
#include <bf_svtools/whiter.hxx>
#include <bf_svtools/stritem.hxx>
#include <bf_svtools/intitem.hxx>
diff --git a/binfilter/bf_sfx2/source/bastyp/sfx2_fltfnc.cxx b/binfilter/bf_sfx2/source/bastyp/sfx2_fltfnc.cxx
index d5670d2..07fb77e 100644
--- a/binfilter/bf_sfx2/source/bastyp/sfx2_fltfnc.cxx
+++ b/binfilter/bf_sfx2/source/bastyp/sfx2_fltfnc.cxx
@@ -36,7 +36,6 @@
#include <sal/types.h>
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/ucb/XContent.hpp>
-#include <vos/process.hxx>
#include <rtl/logfile.hxx>
diff --git a/binfilter/bf_svtools/source/config/svt_defaultoptions.cxx b/binfilter/bf_svtools/source/config/svt_defaultoptions.cxx
index 0604001..8103e73 100644
--- a/binfilter/bf_svtools/source/config/svt_defaultoptions.cxx
+++ b/binfilter/bf_svtools/source/config/svt_defaultoptions.cxx
@@ -41,7 +41,6 @@
#include <com/sun/star/uno/Sequence.hxx>
#include <osl/mutex.hxx>
-#include <vos/process.hxx>
#include <unotools/localfilehelper.hxx>
#include <rtl/instance.hxx>
diff --git a/binfilter/bf_svtools/source/config/svt_pathoptions.cxx b/binfilter/bf_svtools/source/config/svt_pathoptions.cxx
index 2804c7f..3c6d16f 100644
--- a/binfilter/bf_svtools/source/config/svt_pathoptions.cxx
+++ b/binfilter/bf_svtools/source/config/svt_pathoptions.cxx
@@ -48,7 +48,6 @@
#include <unotools/bootstrap.hxx>
#include <unotools/ucbhelper.hxx>
-#include <vos/process.hxx>
#include <comphelper/processfactory.hxx>
#include <com/sun/star/beans/XFastPropertySet.hpp>
diff --git a/binfilter/bf_svtools/source/misc1/svt_svtdata.cxx b/binfilter/bf_svtools/source/misc1/svt_svtdata.cxx
index 21e0cb3..752fc09 100644
--- a/binfilter/bf_svtools/source/misc1/svt_svtdata.cxx
+++ b/binfilter/bf_svtools/source/misc1/svt_svtdata.cxx
@@ -33,7 +33,6 @@
#include <tools/resmgr.hxx>
#include <tools/shl.hxx>
-#include <vos/process.hxx>
#include <bf_svtools/svtdata.hxx>
diff --git a/binfilter/inc/bf_goodies/base3d.hxx b/binfilter/inc/bf_goodies/base3d.hxx
index aad9f57..eb72fec 100644
--- a/binfilter/inc/bf_goodies/base3d.hxx
+++ b/binfilter/inc/bf_goodies/base3d.hxx
@@ -68,7 +68,7 @@ namespace binfilter {
// // Texturverwaltung
// Container maTextureStore;
// AutoTimer maTimer;
-// vos::OMutex maMutex;
+// osl::Mutex maMutex;
//
// // link for timer
// DECL_LINK(TimerHdl, AutoTimer*);
diff --git a/binfilter/inc/bf_sd/sdfilter.hxx b/binfilter/inc/bf_sd/sdfilter.hxx
index 4d9a19a..aedcb66 100644
--- a/binfilter/inc/bf_sd/sdfilter.hxx
+++ b/binfilter/inc/bf_sd/sdfilter.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -32,7 +32,6 @@
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/task/XStatusIndicatorSupplier.hpp>
-namespace vos { class OModule; }
namespace binfilter {
// ------------
@@ -64,7 +63,7 @@ protected:
void CreateProgress();
public:
-
+
SdFilter( SfxMedium& rMedium, SdDrawDocShell& rDocShell, sal_Bool bShowProgress );
~SdFilter();
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index 96a4da6..cc561b8 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -94,10 +94,6 @@
#include <toolkit/unohlp.hxx>
#include <vcl/virdev.hxx>
#include <rtl/crc.h>
-#include <vos/xception.hxx>
-#ifndef _VOS_NO_NAMESPACE
-using namespace vos;
-#endif
using namespace ::rtl;
using namespace ::com::sun::star;
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 0446414..44a0a7e 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -128,10 +128,7 @@
#include <svx/sdasaitm.hxx>
#include <ucbhelper/content.hxx>
#include <ucbhelper/contentbroker.hxx>
-#include <vos/xception.hxx>
-#ifndef _VOS_NO_NAMESPACE
-using namespace vos;
-#endif
+
#include "svx/EnhancedCustomShapeTypeNames.hxx"
#include "svx/EnhancedCustomShapeGeometry.hxx"
#include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp>
commit d320a23d617e7281215a6efaf37bc181fec42e37
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Wed Oct 20 19:21:48 2010 -0500
remvove vos/macros.h usage
diff --git a/binfilter/bf_basic/source/classes/sbxmod.cxx b/binfilter/bf_basic/source/classes/sbxmod.cxx
index 1879ce5..4f954d2 100644
--- a/binfilter/bf_basic/source/classes/sbxmod.cxx
+++ b/binfilter/bf_basic/source/classes/sbxmod.cxx
@@ -28,7 +28,6 @@
#include <list>
-#include <vos/macros.hxx>
#include <vcl/svapp.hxx>
#include <tools/stream.hxx>
More information about the Libreoffice-commits
mailing list