[Libreoffice-commits] .: Branch 'feature/vos-removal' - 2 commits - automation/source automation/util cui/inc cui/util extensions/inc extensions/source extensions/test extensions/workben forms/util lingucomponent/source UnoControls/source xmlsecurity/workben
Norbert Thiebaud
nthiebaud at kemper.freedesktop.org
Thu Oct 21 15:42:33 PDT 2010
UnoControls/source/base/makefile.mk | 1
automation/source/mozillaserver/makefile.mk | 2
automation/source/server/server.hxx | 11 -----
automation/util/makefile.mk | 11 +----
cui/inc/pch/precompiled_cui.hxx | 2
cui/util/makefile.mk | 1
extensions/inc/pch/precompiled_extensions.hxx | 1
extensions/source/ole/makefile.mk | 2
extensions/source/ole/unoobjw.cxx | 1
extensions/source/plugin/aqua/makefile.mk | 1
extensions/source/plugin/unx/makefile.mk | 7 +--
extensions/source/plugin/util/makefile.mk | 1
extensions/source/scanner/makefile.mk | 1
extensions/source/update/tools/makefile.mk | 4 -
extensions/test/ole/cpnt/makefile.mk | 1
extensions/test/sax/makefile.mk | 3 -
extensions/test/sax/testsax.cxx | 1
extensions/test/sax/testwriter.cxx | 1
extensions/test/stm/datatest.cxx | 1
extensions/test/stm/makefile.mk | 3 -
extensions/test/stm/marktest.cxx | 1
extensions/test/stm/pipetest.cxx | 1
extensions/test/stm/testfactreg.cxx | 1
extensions/workben/makefile.mk | 10 +---
extensions/workben/pythonautotest.cxx | 2
extensions/workben/pythontest.cxx | 2
extensions/workben/testcomponent.cxx | 2
extensions/workben/testframecontrol.cxx | 33 ++++++---------
extensions/workben/testpgp.cxx | 7 +--
extensions/workben/testresource.cxx | 6 --
forms/util/makefile.mk | 1
lingucomponent/source/spellcheck/macosxspell/makefile.mk | 1
xmlsecurity/workben/makefile.mk | 1
33 files changed, 34 insertions(+), 90 deletions(-)
New commits:
commit d4201e9f0e75f1a1695f7472c7de7d5539168cd8
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Thu Oct 21 16:23:57 2010 -0500
Finally, gut the vos module out of the build
diff --git a/UnoControls/source/base/makefile.mk b/UnoControls/source/base/makefile.mk
index 74c6d4d..be1fcbf 100644
--- a/UnoControls/source/base/makefile.mk
+++ b/UnoControls/source/base/makefile.mk
@@ -52,7 +52,6 @@ SLOFILES= $(SLO)$/multiplexer.obj \
# $(ONELIB) \
# $(USRLIB) \
# $(UNOLIB) \
-# $(VOSLIB) \
# $(OSLLIB) \
# $(TOOLSLIB) \
# $(RTLLIB)
diff --git a/automation/source/mozillaserver/makefile.mk b/automation/source/mozillaserver/makefile.mk
index fee12e3..064f428 100644
--- a/automation/source/mozillaserver/makefile.mk
+++ b/automation/source/mozillaserver/makefile.mk
@@ -109,7 +109,7 @@ UNOTYPES= \
#SHL1TARGET=iserverproxy
#SHL1STDLIBS= \
-# $(VOSLIB) $(OSLLIB) $(RTLLIB) $(TOOLSLIB) \
+# $(OSLLIB) $(RTLLIB) $(TOOLSLIB) \
# $(CPPULIB) \
# $(CPPUHELPERLIB) \
# $(UNOLIB) \
diff --git a/automation/util/makefile.mk b/automation/util/makefile.mk
index 756a3d6..8747ff4 100644
--- a/automation/util/makefile.mk
+++ b/automation/util/makefile.mk
@@ -55,7 +55,6 @@ SHL1STDLIBS= \
$(SVLLIB) \
$(VCLLIB) \
$(BASICLIB) \
- $(VOSLIB) \
$(SALLIB) \
$(CPPUHELPERLIB) \
$(CPPULIB) \
@@ -86,7 +85,6 @@ SHL2IMPLIB= isimplecm
SHL2STDLIBS= \
$(TOOLSLIB) \
- $(VOSLIB) \
$(SALLIB)
@@ -109,9 +107,7 @@ SHL3STDLIBS= \
$(TOOLSLIB) \
$(SVLLIB) \
$(VCLLIB) \
- $(VOSLIB) \
$(SALLIB) \
- $(VOSLIB) \
$(SIMPLECMLIB)
@@ -153,7 +149,6 @@ APP1STDLIBS+= \
$(SVLLIB) \
$(VCLLIB) \
$(SALLIB) \
- $(VOSLIB) \
$(UCBHELPERLIB) \
$(COMPHELPERLIB) \
$(BASICLIB) \
@@ -162,7 +157,7 @@ APP1STDLIBS+= \
.IF "$(GUI)"=="UNX"
APP1STDLIBS+= \
- $(VOSLIB) $(SALLIB) $(BASICLIB)
+ $(SALLIB) $(BASICLIB)
APP1STDLIBS+=$(CPPULIB)
.ENDIF
.IF "$(GUI)"=="WNT" || "$(COM)"=="GCC"
@@ -221,10 +216,10 @@ APP3STDLIBS= \
.IF "$(GUI)"=="UNX"
.IF "$(OS)"=="MACOSX"
APP3STDLIBS+= \
- $(VOSLIB) $(SALLIB) $(LIBSTLPORT)
+ $(SALLIB) $(LIBSTLPORT)
.ELSE
APP3STDLIBS+= \
- $(VOSLIB) $(SALLIB)
+ $(SALLIB)
.ENDIF
.ENDIF
# $(AUTOMATIONLIB) is build in SHL1TARGET
diff --git a/cui/util/makefile.mk b/cui/util/makefile.mk
index a5a2fc2..5059b9b 100644
--- a/cui/util/makefile.mk
+++ b/cui/util/makefile.mk
@@ -75,7 +75,6 @@ SHL1STDLIBS= \
$(UCBHELPERLIB) \
$(CPPUHELPERLIB) \
$(CPPULIB) \
- $(VOSLIB) \
$(SALLIB) \
$(JVMFWKLIB) \
$(ICUUCLIB)
diff --git a/extensions/source/ole/makefile.mk b/extensions/source/ole/makefile.mk
index ad4ecee..e20e83e 100644
--- a/extensions/source/ole/makefile.mk
+++ b/extensions/source/ole/makefile.mk
@@ -71,7 +71,6 @@ OWNGUIDCDEFS+= -DOWNGUID
SHL1TARGET=$(TARGET)
SHL1STDLIBS=\
$(SALLIB) \
- $(VOSLIB) \
$(CPPULIB) \
$(CPPUHELPERLIB) \
$(OLE32LIB) \
@@ -99,7 +98,6 @@ DEF1EXPORTFILE=$(SHL1TARGET).dxp
SHL2TARGET=$(TARGET2)
SHL2STDLIBS=\
$(SALLIB) \
- $(VOSLIB) \
$(CPPULIB) \
$(CPPUHELPERLIB) \
$(OLE32LIB) \
diff --git a/extensions/source/plugin/aqua/makefile.mk b/extensions/source/plugin/aqua/makefile.mk
index e29418a..c0d3a2e 100644
--- a/extensions/source/plugin/aqua/makefile.mk
+++ b/extensions/source/plugin/aqua/makefile.mk
@@ -62,7 +62,6 @@ SLOFILES=\
#APP1OBJS=$(OBJFILES)
#APP1STDLIBS=\
# $(TOOLSLIB) \
-# $(VOSLIB) \
# $(SALLIB)
#APP1DEF= $(MISC)$/$(TARGET).def
diff --git a/extensions/source/plugin/unx/makefile.mk b/extensions/source/plugin/unx/makefile.mk
index b88acc9..f3b7b48 100644
--- a/extensions/source/plugin/unx/makefile.mk
+++ b/extensions/source/plugin/unx/makefile.mk
@@ -69,9 +69,8 @@ OBJFILES=\
APP1TARGET=pluginapp.bin
APP1OBJS=$(OBJFILES)
-APP1STDLIBS=\
- $(VOSLIB) \
- $(SALLIB)
+APP1STDLIBS= $(SALLIB)
+
.IF "$(OS)"=="SOLARIS" || "$(OS)"=="SCO" || "$(OS)"=="HPUX"
APP1STDLIBS+=-lXm -lXt $(X11LINK_DYNAMIC) -ldl
.ELSE
@@ -98,7 +97,7 @@ DIRECT :=-z nodefs $(DIRECT)
.ENDIF
.ENDIF # "$(PKGCONFIG_ROOT)"!=""
.ENDIF
-
+
APP1DEF= $(MISC)$/$(TARGET).def
diff --git a/extensions/source/plugin/util/makefile.mk b/extensions/source/plugin/util/makefile.mk
index 60655f1..75baea8 100644
--- a/extensions/source/plugin/util/makefile.mk
+++ b/extensions/source/plugin/util/makefile.mk
@@ -87,7 +87,6 @@ SHL1STDLIBS+= \
$(SVLLIB) \
$(UNOTOOLSLIB) \
$(TOOLSLIB) \
- $(VOSLIB) \
$(UCBHELPERLIB) \
$(CPPUHELPERLIB) \
$(CPPULIB) \
diff --git a/extensions/source/scanner/makefile.mk b/extensions/source/scanner/makefile.mk
index ff42864..26ed6e7 100644
--- a/extensions/source/scanner/makefile.mk
+++ b/extensions/source/scanner/makefile.mk
@@ -70,7 +70,6 @@ SHL1STDLIBS=\
$(CPPULIB) \
$(CPPUHELPERLIB) \
$(COMPHELPERLIB) \
- $(VOSLIB) \
$(SALLIB) \
$(ONELIB) \
$(TOOLSLIB) \
diff --git a/extensions/source/update/tools/makefile.mk b/extensions/source/update/tools/makefile.mk
index c8c4153..d6baac9 100644
--- a/extensions/source/update/tools/makefile.mk
+++ b/extensions/source/update/tools/makefile.mk
@@ -52,9 +52,9 @@ APP1STDLIBS = $(TOOLSLIB)
#APP2TARGET = urltest
#APP2OBJS = $(OBJ)$/urltest.obj
#.IF "$(GUI)" == "UNX"
-#APP2STDLIBS = $(TOOLSLIB) $(VOSLIB) $(SALLIB) $(CPPULIB) $(CPPUHELPERLIB)
+#APP2STDLIBS = $(TOOLSLIB) $(SALLIB) $(CPPULIB) $(CPPUHELPERLIB)
#.ELSE
-#APP2STDLIBS = $(LB)$/itools.lib ivos.lib isal.lib icppu.lib icppuhelper.lib
+#APP2STDLIBS = $(LB)$/itools.lib isal.lib icppu.lib icppuhelper.lib
#.ENDIF
# APP3TARGET = tldem
diff --git a/extensions/test/ole/cpnt/makefile.mk b/extensions/test/ole/cpnt/makefile.mk
index 5668d84..53d3cc3 100644
--- a/extensions/test/ole/cpnt/makefile.mk
+++ b/extensions/test/ole/cpnt/makefile.mk
@@ -59,7 +59,6 @@ SHL1TARGET= $(TARGET)
SHL1STDLIBS= \
$(SALLIB) \
- $(VOSLIB) \
$(CPPULIB) \
$(CPPUHELPERLIB)
diff --git a/extensions/test/sax/makefile.mk b/extensions/test/sax/makefile.mk
index 4e72ec9..62e2706 100644
--- a/extensions/test/sax/makefile.mk
+++ b/extensions/test/sax/makefile.mk
@@ -46,9 +46,8 @@ LIB1OBJFILES= $(OBJFILES)
SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
SHL1STDLIBS= \
- $(VOSLIB) \
$(SALLIB) \
- $(TOOLSLIB)
+ $(TOOLSLIB)
SHL1LIBS= $(LIB1TARGET)
SHL1IMPLIB= i$(TARGET)
diff --git a/extensions/test/stm/makefile.mk b/extensions/test/stm/makefile.mk
index aa506fc..ac31f76 100644
--- a/extensions/test/stm/makefile.mk
+++ b/extensions/test/stm/makefile.mk
@@ -42,9 +42,8 @@ SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
LIB1TARGET= $(SLB)$/$(TARGET).lib
SHL1STDLIBS= \
- $(VOSLIB) \
$(SALLIB) \
- $(TOOLSLIB)
+ $(TOOLSLIB)
LIB1OBJFILES= $(OBJFILES)
SHL1LIBS= $(LIB1TARGET)
diff --git a/extensions/workben/makefile.mk b/extensions/workben/makefile.mk
index 759ee81..ca25cfa 100644
--- a/extensions/workben/makefile.mk
+++ b/extensions/workben/makefile.mk
@@ -83,7 +83,6 @@ APP1OBJS= $(OBJFILES)
APP1STDLIBS= \
$(CPPUHELPERLIB)\
$(CPPULIB) \
- $(VOSLIB) \
$(SALLIB)
.ENDIF # testpgp
@@ -98,7 +97,6 @@ OBJFILES= $(OBJ)$/testcomponent.obj
APP2TARGET = testcomponent
APP2OBJS = $(OBJ)$/testcomponent.obj
APP2STDLIBS = \
- $(VOSLIB) \
$(TOOLSLIB) \
$(SALLIB)
@@ -113,8 +111,8 @@ OBJFILES= $(OBJ)$/pythontest.obj
#APP4TARGET= pythontest
#APP4OBJS= $(OBJ)$/pythontest.obj
-#APP4STDLIBS=$(TOOLSLIB) \
-# $(VOSLIB)
+#APP4STDLIBS=$(TOOLSLIB)
+#
.ENDIF # phytontest
@@ -127,8 +125,7 @@ OBJFILES= $(OBJ)$/pythonautotest.obj
#APP5TARGET= pythonautotest
#APP5OBJS = $(OBJ)$/pythonautotest.obj
-#APP5STDLIBS=$(TOOLSLIB) \
-# $(VOSLIB)
+#APP5STDLIBS=$(TOOLSLIB)
.ENDIF # phytonautotest
@@ -162,7 +159,6 @@ OBJFILES= $(OBJ)$/testframecontrol.obj
APP3TARGET= testframecontrol
APP3OBJS= $(OBJ)$/testframecontrol.obj
APP3STDLIBS=$(TOOLSLIB) \
- $(VOSLIB) \
$(SVTOOLLIB) \
$(VCLLIB)
diff --git a/forms/util/makefile.mk b/forms/util/makefile.mk
index 00d7a81..79869f0 100644
--- a/forms/util/makefile.mk
+++ b/forms/util/makefile.mk
@@ -65,7 +65,6 @@ SHL1STDLIBS= \
$(SVLLIB) \
$(TKLIB) \
$(SFX2LIB) \
- $(VOSLIB) \
$(UNOTOOLSLIB) \
$(COMPHELPERLIB) \
$(DBTOOLSLIB) \
diff --git a/lingucomponent/source/spellcheck/macosxspell/makefile.mk b/lingucomponent/source/spellcheck/macosxspell/makefile.mk
index 6414560..8bad659 100644
--- a/lingucomponent/source/spellcheck/macosxspell/makefile.mk
+++ b/lingucomponent/source/spellcheck/macosxspell/makefile.mk
@@ -65,7 +65,6 @@ SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
SHL1STDLIBS= \
$(CPPULIB) \
$(CPPUHELPERLIB) \
- $(VOSLIB) \
$(TOOLSLIB) \
$(SVLLIB) \
$(SALLIB) \
diff --git a/xmlsecurity/workben/makefile.mk b/xmlsecurity/workben/makefile.mk
index 2430a36..e538f09 100644
--- a/xmlsecurity/workben/makefile.mk
+++ b/xmlsecurity/workben/makefile.mk
@@ -56,7 +56,6 @@ APP1STDLIBS= $(CPPULIB) \
$(TOOLSLIB) \
$(SVTOOLLIB) \
$(SALLIB) \
- $(VOSLIB) \
$(SOTLIB) \
$(VCLLIB) \
$(SFXLIB) \
commit 4c0a2d04768aa3a7b41d769f618f07892aa939c6
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Thu Oct 21 15:37:44 2010 -0500
remvove vos/macros.h usage
diff --git a/automation/source/server/server.hxx b/automation/source/server/server.hxx
index 841522a..4b12e74 100644
--- a/automation/source/server/server.hxx
+++ b/automation/source/server/server.hxx
@@ -27,17 +27,6 @@
#ifndef _SERVER_HXX
#define _SERVER_HXX
-/*#include <osl/thread.hxx>
-#ifndef _STD_NO_NAMESPACE
-namespace vos
-{
-#endif
- class OAcceptorSocket;
-#ifndef _STD_NO_NAMESPACE
-}
-#endif
-*/
-
#include "editwin.hxx"
#include <automation/communi.hxx>
diff --git a/cui/inc/pch/precompiled_cui.hxx b/cui/inc/pch/precompiled_cui.hxx
index 02df955..d953aa9 100644
--- a/cui/inc/pch/precompiled_cui.hxx
+++ b/cui/inc/pch/precompiled_cui.hxx
@@ -943,8 +943,6 @@
#include "vcl/wall.hxx"
#include "vcl/wintypes.hxx"
#include "osl/mutex.hxx"
-#include "vos/thread.hxx"
-#include "vos/xception.hxx"
#include "xmloff/DashStyle.hxx"
#include "xmloff/GradientStyle.hxx"
#include "xmloff/HatchStyle.hxx"
diff --git a/extensions/inc/pch/precompiled_extensions.hxx b/extensions/inc/pch/precompiled_extensions.hxx
index 581b87f..e4eb003 100644
--- a/extensions/inc/pch/precompiled_extensions.hxx
+++ b/extensions/inc/pch/precompiled_extensions.hxx
@@ -539,7 +539,6 @@
#include "vcl/fldunit.hxx"
-#include "vos/macros.hxx"
#include "osl/module.hxx"
#include "osl/mutex.hxx"
diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx
index dc96ed0..9cd1314 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -66,7 +66,6 @@
#include "unoobjw.hxx"
#include "servprov.hxx"
-using namespace vos;
using namespace std;
using namespace rtl;
using namespace osl;
diff --git a/extensions/test/sax/testsax.cxx b/extensions/test/sax/testsax.cxx
index c6a2cf2..74a947d 100644
--- a/extensions/test/sax/testsax.cxx
+++ b/extensions/test/sax/testsax.cxx
@@ -52,7 +52,6 @@
#include "factory.hxx"
using namespace rtl;
-using namespace vos;
using namespace usr;
diff --git a/extensions/test/sax/testwriter.cxx b/extensions/test/sax/testwriter.cxx
index 8ab3add..f4930df 100644
--- a/extensions/test/sax/testwriter.cxx
+++ b/extensions/test/sax/testwriter.cxx
@@ -52,7 +52,6 @@
using namespace std;
using namespace rtl;
-using namespace vos;
using namespace usr;
#define BUILD_ERROR(expr, Message)\
diff --git a/extensions/test/stm/datatest.cxx b/extensions/test/stm/datatest.cxx
index b180a58..7fb7bde 100644
--- a/extensions/test/stm/datatest.cxx
+++ b/extensions/test/stm/datatest.cxx
@@ -55,7 +55,6 @@
#include "testfactreg.hxx"
#ifndef _VOS_NO_NAMESPACE
-using namespace vos;
using namespace usr;
#endif
diff --git a/extensions/test/stm/marktest.cxx b/extensions/test/stm/marktest.cxx
index 4ebe73f..1c3c5a0 100644
--- a/extensions/test/stm/marktest.cxx
+++ b/extensions/test/stm/marktest.cxx
@@ -52,7 +52,6 @@
#ifndef _VOS_NO_NAMESPACE
-using namespace vos;
using namespace usr;
#endif
diff --git a/extensions/test/stm/pipetest.cxx b/extensions/test/stm/pipetest.cxx
index 52ed4b8..d3de76b 100644
--- a/extensions/test/stm/pipetest.cxx
+++ b/extensions/test/stm/pipetest.cxx
@@ -50,7 +50,6 @@
#define SERVICE_NAME L"test.com.sun.star.io.Pipe"
#ifndef _VOS_NO_NAMESPACE
-using namespace vos;
using namespace usr;
#endif
diff --git a/extensions/test/stm/testfactreg.cxx b/extensions/test/stm/testfactreg.cxx
index f16e1f1..0ebfa87 100644
--- a/extensions/test/stm/testfactreg.cxx
+++ b/extensions/test/stm/testfactreg.cxx
@@ -37,7 +37,6 @@
#ifndef _VOS_NO_NAMESPACE
-using namespace vos;
using namespace usr;
#endif
diff --git a/extensions/workben/pythonautotest.cxx b/extensions/workben/pythonautotest.cxx
index 5bd309e..1b44b17 100644
--- a/extensions/workben/pythonautotest.cxx
+++ b/extensions/workben/pythonautotest.cxx
@@ -34,7 +34,6 @@
#include <stardiv/uno/beans/exactname.hxx>
#include <rtl/ustring.hxx>
-#include <vos/dynload.hxx>
#include <osl/diagnose.h>
#include <usr/services.hxx>
#include <vcl/svapp.hxx>
@@ -44,7 +43,6 @@
#include <osl/conditn.hxx>
using namespace rtl;
-using namespace vos;
using namespace usr;
#define PCHAR_TO_USTRING(x) StringToOUString(String(x),CHARSET_SYSTEM)
diff --git a/extensions/workben/pythontest.cxx b/extensions/workben/pythontest.cxx
index bb0908d..85a9953 100644
--- a/extensions/workben/pythontest.cxx
+++ b/extensions/workben/pythontest.cxx
@@ -35,7 +35,6 @@
#include <stardiv/uno/beans/exactname.hxx>
#include <rtl/ustring.hxx>
-#include <vos/dynload.hxx>
#include <osl/diagnose.h>
#include <usr/services.hxx>
#include <vcl/svapp.hxx>
@@ -45,7 +44,6 @@
#include <osl/conditn.hxx>
using namespace rtl;
-using namespace vos;
using namespace usr;
#define PCHAR_TO_USTRING(x) StringToOUString(String(x),CHARSET_SYSTEM)
diff --git a/extensions/workben/testcomponent.cxx b/extensions/workben/testcomponent.cxx
index 7461718..e32a537 100644
--- a/extensions/workben/testcomponent.cxx
+++ b/extensions/workben/testcomponent.cxx
@@ -41,7 +41,6 @@
#include <smart/com/sun/star/registry/XImplementationRegistration.hxx>
#include <smart/com/sun/star/lang/XComponent.hxx>
-#include <vos/dynload.hxx>
#include <osl/diagnose.h>
#include <usr/services.hxx>
#include <vcl/svapp.hxx>
@@ -52,7 +51,6 @@
#include <smart/com/sun/star/test/XSimpleTest.hxx>
using namespace rtl;
-using namespace vos;
using namespace usr;
diff --git a/extensions/workben/testframecontrol.cxx b/extensions/workben/testframecontrol.cxx
index db2610d..ba5d53d 100644
--- a/extensions/workben/testframecontrol.cxx
+++ b/extensions/workben/testframecontrol.cxx
@@ -2,7 +2,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
@@ -29,8 +29,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_extensions.hxx"
-#include <vos/dynload.hxx>
-
#include <vcl/wrkwin.hxx>
#include <vcl/svapp.hxx>
@@ -45,7 +43,6 @@
#include <svtools/unoiface.hxx>
-using namespace vos;
using namespace usr;
//==================================================================================================
@@ -89,7 +86,7 @@ public:
// XPaintListener
virtual void windowPaint( const PaintEvent& evt );
-
+
// XEventListener
virtual void disposing( const EventObject& evt );
@@ -102,7 +99,7 @@ public:
void Listener_Impl::addAllListeners( const XControlRef& xControl )
{
XWindowRef xWindow( xControl, USR_QUERY );
-
+
xWindow->addMouseListener( (XMouseListener*)this );
xWindow->addMouseMotionListener( (XMouseMotionListener*)this );
xWindow->addKeyListener( (XKeyListener*)this );
@@ -117,7 +114,7 @@ void Listener_Impl::addAllListeners( const XControlRef& xControl )
void Listener_Impl::removeAllListeners( const XControlRef& xControl )
{
XWindowRef xWindow( xControl, USR_QUERY );
-
+
xWindow->removeMouseListener( (XMouseListener*)this );
xWindow->removeMouseMotionListener( (XMouseMotionListener*)this );
xWindow->removeKeyListener( (XKeyListener*)this );
@@ -209,7 +206,7 @@ public:
public:
FrameControlApplication() {}
-
+
private:
void init();
void deinit();
@@ -217,7 +214,7 @@ private:
private:
Listener_Impl* _pListener;
XControlRef _xControl;
-
+
WorkWindow* _pWorkWin;
};
@@ -236,9 +233,9 @@ void FrameControlApplication::init()
setProcessServiceManager( xMgr );
InitExtVclToolkit();
Application::RegisterUnoServices();
-
+
XServiceRegistryRef xRegMgr(xMgr, USR_QUERY);
-
+
XImplementationRegistrationRef xIR( xMgr->createInstance(L"stardiv.uno.repos.ImplementationRegistration"), USR_QUERY );
try
{
@@ -255,21 +252,21 @@ void FrameControlApplication::init()
// ...
-
+
XInterfaceRef xInst = xMgr->createInstance( L"stardiv.one.frame.FrameControl" );
if (xInst->queryInterface( XControl::getSmartUik(), _xControl ))
{
_pWorkWin = new WorkWindow( NULL, WB_APP | WB_STDWORK );
_pWorkWin->Show();
XWindowPeerRef xParent( _pWorkWin->GetComponentInterface() );
-
+
XToolkitRef xToolkit( xMgr->createInstance( L"stardiv.vcl.VclToolkit" ), USR_QUERY );
//xToolkit = XToolkitRef( xMgr->createInstance( L"stardiv.uno.awt.Toolkit" ), USR_QUERY );
_xControl->createPeer( xToolkit, xParent );
XWindowRef xWin( _xControl, USR_QUERY );
xWin->setPosSize( 50, 50, 400, 400, PosSize_POSSIZE );
xWin->setVisible( TRUE );
-
+
_pListener = new Listener_Impl();
_pListener->acquire();
_pListener->addAllListeners( _xControl );
@@ -282,12 +279,12 @@ void FrameControlApplication::deinit()
{
if (_pListener)
{
-
+
_pListener->removeAllListeners( _xControl );
_xControl->dispose(); // disposing event should occur
_pListener->release();
_pListener = NULL;
-
+
_xControl = XControlRef();
}
@@ -301,13 +298,13 @@ void FrameControlApplication::Main()
{
// void TestErrcodes();
// TestErrcodes();
-
+
EnterMultiThread();
SetAppName( "RadioActiveControl-Demo" );
EnableSVLook();
init();
-
+
Execute();
deinit();
diff --git a/extensions/workben/testpgp.cxx b/extensions/workben/testpgp.cxx
index 183016f..1a7902c 100644
--- a/extensions/workben/testpgp.cxx
+++ b/extensions/workben/testpgp.cxx
@@ -33,7 +33,6 @@
#ifndef _RTL_WSTRING_
#include <rtl/wstring>
#endif
-#include <vos/macros.hxx>
#include <usr/smartservices.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -282,7 +281,7 @@ sal_Int32 SAL_CALL DataSource_Impl::readBytes (
throw IOException();
sal_Int32 k = m_buffer.getLength() - m_position;
- k = VOS_BOUND(k, 0, nBytesToRead);
+ k = SAL_BOUND(k, 0, nBytesToRead);
if (k > 0)
{
rData.realloc(k);
@@ -554,7 +553,7 @@ BOOL install (
String aModule ("module://");
char pBuffer[1024];
- NAMESPACE_VOS(ORealDynamicLoader)::computeModuleName (
+ vos:ORealDynamicLoader::computeModuleName (
prefix, pBuffer, sizeof(pBuffer));
aModule += pBuffer;
@@ -572,7 +571,7 @@ BOOL uninstall (
String aModule ("module://");
char pBuffer[1024];
- NAMESPACE_VOS(ORealDynamicLoader)::computeModuleName (
+ vos::ORealDynamicLoader::computeModuleName (
prefix, pBuffer, sizeof(pBuffer));
aModule += pBuffer;
diff --git a/extensions/workben/testresource.cxx b/extensions/workben/testresource.cxx
index 2101c19..73852cf 100644
--- a/extensions/workben/testresource.cxx
+++ b/extensions/workben/testresource.cxx
@@ -2,7 +2,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
@@ -33,13 +33,11 @@
#include <smart/com/sun/star/script/XInvocation.hxx>
#include <rtl/ustring.hxx>
-#include <vos/dynload.hxx>
#include <osl/diagnose.h>
#include <usr/services.hxx>
#include <vcl/svapp.hxx>
using namespace rtl;
-using namespace vos;
using namespace usr;
class MyApp : public Application
@@ -83,7 +81,7 @@ void MyApp::Main()
UString aStr = xResLoader->invoke( L"getString", Args, OutPos, OutArgs ).getString();
OSL_ENSURE( aStr == L"Hello", "getString" );
-
+
Args.getArray()[0].setINT32( 1001 );
b = xResLoader->invoke( L"hasString", Args, OutPos, OutArgs ).getBOOL();
OSL_ENSURE( !b, "!hasString" );
More information about the Libreoffice-commits
mailing list