[Libreoffice-commits] .: 16 commits - accessibility/inc accessibility/source automation/inc automation/source automation/util basctl/source cui/inc cui/source cui/util extensions/inc extensions/source extensions/test extensions/workben forms/inc forms/source forms/util lingucomponent/source package/inc package/source UnoControls/source xmlsecurity/workben
Norbert Thiebaud
nthiebaud at kemper.freedesktop.org
Mon Oct 25 19:26:48 PDT 2010
UnoControls/source/base/makefile.mk | 1
accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx | 13 -
accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx | 13 -
accessibility/source/extended/AccessibleBrowseBox.cxx | 8
accessibility/source/extended/AccessibleBrowseBoxBase.cxx | 14 -
accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx | 32 +-
accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx | 4
accessibility/source/extended/AccessibleBrowseBoxTable.cxx | 22 -
accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx | 16 -
accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx | 36 +--
accessibility/source/extended/AccessibleGridControl.cxx | 8
accessibility/source/extended/AccessibleGridControlBase.cxx | 12 -
accessibility/source/extended/AccessibleGridControlHeader.cxx | 8
accessibility/source/extended/AccessibleGridControlHeaderCell.cxx | 2
accessibility/source/extended/AccessibleGridControlTable.cxx | 32 +-
accessibility/source/extended/AccessibleGridControlTableBase.cxx | 16 -
accessibility/source/extended/AccessibleGridControlTableCell.cxx | 38 +--
accessibility/source/extended/AccessibleToolPanelDeck.cxx | 11
accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx | 11
accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx | 11
accessibility/source/extended/accessibleiconchoicectrlentry.cxx | 57 ++---
accessibility/source/extended/accessiblelistboxentry.cxx | 80 +++----
accessibility/source/extended/accessibletablistbox.cxx | 11
accessibility/source/extended/accessibletablistboxtable.cxx | 23 --
accessibility/source/standard/vclxaccessiblebox.cxx | 6
accessibility/source/standard/vclxaccessiblelist.cxx | 30 +-
accessibility/source/standard/vclxaccessiblelistitem.cxx | 44 +--
automation/inc/automation/communi.hxx | 8
automation/source/communi/communi.cxx | 30 +-
automation/source/mozillaserver/makefile.mk | 2
automation/source/server/server.hxx | 11
automation/source/simplecm/tcpio.cxx | 8
automation/source/simplecm/tcpio.hxx | 6
automation/util/makefile.mk | 11
basctl/source/basicide/doceventnotifier.cxx | 6
basctl/source/basicide/scriptdocument.cxx | 2
basctl/source/basicide/unomodel.cxx | 9
basctl/source/dlged/dlgedclip.cxx | 10
cui/inc/pch/precompiled_cui.hxx | 6
cui/source/dialogs/cuifmsearch.cxx | 2
cui/source/dialogs/cuigaldlg.cxx | 12 -
cui/source/dialogs/scriptdlg.cxx | 4
cui/util/makefile.mk | 1
extensions/inc/pch/precompiled_extensions.hxx | 15 -
extensions/source/bibliography/bibload.cxx | 4
extensions/source/bibliography/framectr.cxx | 6
extensions/source/bibliography/loadlisteneradapter.cxx | 4
extensions/source/bibliography/toolbar.cxx | 10
extensions/source/ole/makefile.mk | 2
extensions/source/ole/servprov.hxx | 1
extensions/source/ole/unoobjw.cxx | 3
extensions/source/ole/unoobjw.hxx | 3
extensions/source/oooimprovecore/core.cxx | 4
extensions/source/plugin/aqua/makefile.mk | 1
extensions/source/plugin/base/xplugin.cxx | 18 -
extensions/source/plugin/inc/plugin/unx/mediator.hxx | 14 -
extensions/source/plugin/inc/plugin/unx/plugcon.hxx | 2
extensions/source/plugin/unx/makefile.mk | 7
extensions/source/plugin/unx/mediator.cxx | 12 -
extensions/source/plugin/unx/nppapi.cxx | 6
extensions/source/plugin/unx/plugcon.cxx | 2
extensions/source/plugin/util/makefile.mk | 4
extensions/source/propctrlr/browserlistbox.cxx | 10
extensions/source/propctrlr/propcontroller.cxx | 10
extensions/source/resource/resource.cxx | 15 -
extensions/source/scanner/makefile.mk | 1
extensions/source/scanner/sane.hxx | 20 -
extensions/source/scanner/scanner.hxx | 4
extensions/source/scanner/scanunx.cxx | 26 +-
extensions/source/scanner/scanwin.cxx | 18 -
extensions/source/scanner/twain.cxx | 4
extensions/source/scanner/twain.hxx | 4
extensions/source/update/tools/makefile.mk | 4
extensions/source/update/ui/updatecheckui.cxx | 34 +--
extensions/test/ole/cpnt/makefile.mk | 1
extensions/test/sax/makefile.mk | 3
extensions/test/sax/testsax.cxx | 3
extensions/test/sax/testwriter.cxx | 1
extensions/test/stm/datatest.cxx | 5
extensions/test/stm/makefile.mk | 3
extensions/test/stm/marktest.cxx | 5
extensions/test/stm/pipetest.cxx | 5
extensions/test/stm/testfactreg.cxx | 1
extensions/workben/makefile.mk | 10
extensions/workben/pythonautotest.cxx | 6
extensions/workben/pythontest.cxx | 6
extensions/workben/testcomponent.cxx | 4
extensions/workben/testframecontrol.cxx | 33 +-
extensions/workben/testpgp.cxx | 7
extensions/workben/testresource.cxx | 6
forms/inc/pch/precompiled_forms.hxx | 2
forms/source/component/Button.cxx | 4
forms/source/component/DatabaseForm.cxx | 10
forms/source/component/FormattedField.cxx | 4
forms/source/component/ImageButton.cxx | 4
forms/source/component/ImageControl.cxx | 2
forms/source/component/clickableimage.cxx | 6
forms/source/richtext/richtextcontrol.cxx | 6
forms/source/richtext/richtextengine.cxx | 4
forms/source/richtext/richtextmodel.cxx | 2
forms/source/runtime/formoperations.cxx | 6
forms/source/solar/component/navbarcontrol.cxx | 6
forms/util/makefile.mk | 1
lingucomponent/source/spellcheck/macosxspell/makefile.mk | 1
package/inc/HashMaps.hxx | 4
package/inc/ZipFile.hxx | 60 ++---
package/inc/ZipOutputStream.hxx | 6
package/source/manifest/ManifestReader.cxx | 4
package/source/manifest/UnoRegister.cxx | 3
package/source/zipapi/EntryInputStream.cxx | 2
package/source/zipapi/EntryInputStream.hxx | 6
package/source/zipapi/XFileStream.cxx | 28 +-
package/source/zipapi/XFileStream.hxx | 24 +-
package/source/zipapi/XUnbufferedStream.cxx | 54 ++--
package/source/zipapi/XUnbufferedStream.hxx | 26 +-
package/source/zipapi/ZipFile.cxx | 111 ++++------
package/source/zipapi/ZipOutputStream.cxx | 7
package/source/zippackage/ZipPackage.cxx | 6
package/source/zippackage/ZipPackageEntry.cxx | 3
package/source/zippackage/ZipPackageFolder.cxx | 6
package/source/zippackage/ZipPackageStream.cxx | 91 ++++----
package/source/zippackage/ZipPackageStream.hxx | 12 -
xmlsecurity/workben/makefile.mk | 1
123 files changed, 718 insertions(+), 848 deletions(-)
New commits:
commit 0a253250f92a6b91c15d5478cdebc1a00f492d0e
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 0c84d2e38f652578daa0b08671b09e45b2559b49
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" );
commit 1204c62140fbb37ebadbbf1dafe3135387544f0a
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Wed Oct 20 06:26:32 2010 -0500
rename osl::SolarMutexGuard -> SolarGuard to avoid namespace ambiguity
diff --git a/forms/source/richtext/richtextcontrol.cxx b/forms/source/richtext/richtextcontrol.cxx
index 676cb30..f277eac 100644
--- a/forms/source/richtext/richtextcontrol.cxx
+++ b/forms/source/richtext/richtextcontrol.cxx
@@ -375,7 +375,7 @@ namespace frm
void ORichTextPeer::dispose( ) throw(RuntimeException)
{
{
- ::osl::SolarMutexGuard aGuard( GetMutex() );
+ ::osl::SolarGuard aGuard( GetMutex() );
RichTextControl* pRichTextControl = static_cast< RichTextControl* >( GetWindow() );
if ( pRichTextControl )
commit 781d467f3b32b2cba007ff34325a87c0c75eccf5
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat Oct 16 04:30:41 2010 -0500
migrate vos::OModule to osl:Module
diff --git a/basctl/source/basicide/unomodel.cxx b/basctl/source/basicide/unomodel.cxx
index 7285e61..a37331c 100644
--- a/basctl/source/basicide/unomodel.cxx
+++ b/basctl/source/basicide/unomodel.cxx
@@ -39,7 +39,6 @@
#include <iderdll.hxx>
#include <basdoc.hxx>
-using namespace ::vos;
using ::rtl::OUString;
using namespace ::cppu;
using namespace ::std;
diff --git a/extensions/inc/pch/precompiled_extensions.hxx b/extensions/inc/pch/precompiled_extensions.hxx
index da85349..581b87f 100644
--- a/extensions/inc/pch/precompiled_extensions.hxx
+++ b/extensions/inc/pch/precompiled_extensions.hxx
@@ -540,7 +540,7 @@
#include "vcl/fldunit.hxx"
#include "vos/macros.hxx"
-#include "vos/module.hxx"
+#include "osl/module.hxx"
#include "osl/mutex.hxx"
#include "xmloff/nmspmap.hxx"
diff --git a/extensions/source/scanner/scanwin.cxx b/extensions/source/scanner/scanwin.cxx
index c469f3b..a23181a 100644
--- a/extensions/source/scanner/scanwin.cxx
+++ b/extensions/source/scanner/scanwin.cxx
@@ -43,7 +43,7 @@
#include <tools/svwin.h>
#include <tools/stream.hxx>
#include <osl/mutex.hxx>
-#include <vos/module.hxx>
+#include <osl/module.hxx>
#include <vcl/svapp.hxx>
#include <vcl/wrkwin.hxx>
#include <vcl/sysdata.hxx>
@@ -110,7 +110,7 @@ class ImpTwain : public ::cppu::WeakImplHelper1< util::XCloseListener >
TW_IDENTITY aSrcIdent;
Link aNotifyLink;
DSMENTRYPROC pDSM;
- NAMESPACE_VOS(OModule )* pMod;
+ osl::Module* pMod;
ULONG nCurState;
HWND hTwainWnd;
HHOOK hTwainHook;
@@ -293,7 +293,7 @@ void ImpTwain::ImplOpenSourceManager()
{
if( 1 == nCurState )
{
- pMod = new ::vos::OModule( ::rtl::OUString() );
+ pMod = new ::osl::Module( ::rtl::OUString() );
if( pMod->load( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( TWAIN_LIBNAME ) ) ) )
{
diff --git a/extensions/source/scanner/twain.cxx b/extensions/source/scanner/twain.cxx
index c89ab41..d2a6684 100644
--- a/extensions/source/scanner/twain.cxx
+++ b/extensions/source/scanner/twain.cxx
@@ -38,7 +38,7 @@
#ifdef OS2
#include <svpm.h>
#endif // OS2
-#include <vos/module.hxx>
+#include <osl/module.hxx>
#include <tools/stream.hxx>
#include <vcl/svapp.hxx>
#include <vcl/wrkwin.hxx>
@@ -243,7 +243,7 @@ void ImpTwain::ImplOpenSourceManager()
{
if( 1 == nCurState )
{
- pMod = new NAMESPACE_VOS( OModule )();
+ pMod = new osl::Module();
if( pMod->load( TWAIN_LIBNAME ) )
{
diff --git a/extensions/source/scanner/twain.hxx b/extensions/source/scanner/twain.hxx
index faa3bcc..953469a 100644
--- a/extensions/source/scanner/twain.hxx
+++ b/extensions/source/scanner/twain.hxx
@@ -28,7 +28,7 @@
#ifndef _TWAIN_HXX
#define _TWAIN_HXX
-#include <vos/module.hxx>
+#include <osl/module.hxx>
#include <vcl/bitmap.hxx>
#include "twain/twain.h"
@@ -57,7 +57,7 @@ class ImpTwain
Link aNotifyLink;
Bitmap aBitmap;
DSMENTRYPROC pDSM;
- NAMESPACE_VOS( OModule )* pMod;
+ osl::Module pMod;
ULONG nCurState;
void ImplCreate();
commit e3a51b3aa40ae14430395927b6727855b792e07f
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat Oct 16 03:15:49 2010 -0500
merge vosremoval-mutex.diff
In practice the changeset is 'inspired' by vosremoval-mutex.diff
but was essentially redone manually
diff --git a/accessibility/source/extended/AccessibleToolPanelDeck.cxx b/accessibility/source/extended/AccessibleToolPanelDeck.cxx
index a21cd33..9dcb47c 100644
--- a/accessibility/source/extended/AccessibleToolPanelDeck.cxx
+++ b/accessibility/source/extended/AccessibleToolPanelDeck.cxx
@@ -40,7 +40,7 @@
#include <toolkit/awt/vclxwindow.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <unotools/accessiblestatesethelper.hxx>
#include <tools/diagnose_ex.h>
diff --git a/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx b/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx
index 2311100..386a60d 100644
--- a/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx
+++ b/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx
@@ -46,7 +46,7 @@
#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/svapp.hxx>
#include <vcl/button.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <tools/diagnose_ex.h>
#include <vector>
diff --git a/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx b/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx
index 46fba03..5344a51 100644
--- a/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx
+++ b/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx
@@ -42,7 +42,7 @@
#include <unotools/accessiblerelationsethelper.hxx>
#include <tools/diagnose_ex.h>
#include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
//......................................................................................................................
namespace accessibility
diff --git a/automation/inc/automation/communi.hxx b/automation/inc/automation/communi.hxx
index 8fcbe47..ef91cfa 100644
--- a/automation/inc/automation/communi.hxx
+++ b/automation/inc/automation/communi.hxx
@@ -30,7 +30,7 @@
#include <svl/svarray.hxx>
#include <osl/thread.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/timer.hxx>
#include <automation/simplecm.hxx>
@@ -101,8 +101,8 @@ protected:
virtual BOOL ShutdownCommunication();
ULONG nConnectionClosedEventId;
ULONG nDataReceivedEventId;
- NAMESPACE_VOS(OMutex) aMConnectionClosed; // Notwendig, da Event verarbeitet werden kann bevor Variable gesetzt ist
- NAMESPACE_VOS(OMutex) aMDataReceived; // Notwendig, da Event verarbeitet werden kann bevor Variable gesetzt ist
+ osl::Mutex aMConnectionClosed; // Notwendig, da Event verarbeitet werden kann bevor Variable gesetzt ist
+ osl::Mutex aMDataReceived; // Notwendig, da Event verarbeitet werden kann bevor Variable gesetzt ist
virtual void WaitForShutdown();
DECL_LINK( ShutdownLink, void* );
@@ -149,7 +149,7 @@ private:
ULONG nPortToListen;
USHORT nMaxConnections;
ULONG nAddConnectionEventId;
- NAMESPACE_VOS(OMutex) aMAddConnection; // Notwendig, da Event verarbeitet werden kann bevor Variable gesetzt ist
+ osl::Mutex aMAddConnection; // Notwendig, da Event verarbeitet werden kann bevor Variable gesetzt ist
void CallInfoMsg( InfoString aMsg ){ pMyServer->CallInfoMsg( aMsg ); }
CM_InfoType GetInfoType(){ return pMyServer->GetInfoType(); }
diff --git a/automation/source/communi/communi.cxx b/automation/source/communi/communi.cxx
index 7b09eb3..ede17dd 100644
--- a/automation/source/communi/communi.cxx
+++ b/automation/source/communi/communi.cxx
@@ -67,7 +67,7 @@ _SV_SEEK_PTR( nm, AE )
SV_IMPL_PTRARR_SORT( CommunicationLinkList, CommunicationLink* );
-NAMESPACE_VOS(OMutex) *pMPostUserEvent=NULL; // Notwendig, da nicht threadfest
+osl::Mutex *pMPostUserEvent=NULL; // Notwendig, da nicht threadfest
CommunicationLinkViaSocket::CommunicationLinkViaSocket( CommunicationManager *pMan, osl::StreamSocket* pSocket )
: SimpleCommunicationLinkViaSocket( pMan, pSocket )
@@ -78,7 +78,7 @@ CommunicationLinkViaSocket::CommunicationLinkViaSocket( CommunicationManager *pM
{
SetPutDataReceivedHdl(LINK( this, CommunicationLinkViaSocket, PutDataReceivedHdl ));
if ( !pMPostUserEvent )
- pMPostUserEvent = new NAMESPACE_VOS(OMutex);
+ pMPostUserEvent = new osl::Mutex;
// this is necassary to prevent the running thread from sending the close event
// before the open event has been sent.
StartCallback();
@@ -93,7 +93,7 @@ CommunicationLinkViaSocket::~CommunicationLinkViaSocket()
while ( nConnectionClosedEventId || nDataReceivedEventId )
GetpApp()->Yield();
{
- NAMESPACE_VOS(OGuard) aGuard( aMConnectionClosed );
+ osl::MutexGuard aGuard( aMConnectionClosed );
if ( nConnectionClosedEventId )
{
GetpApp()->RemoveUserEvent( nConnectionClosedEventId );
@@ -104,7 +104,7 @@ CommunicationLinkViaSocket::~CommunicationLinkViaSocket()
}
}
{
- NAMESPACE_VOS(OGuard) aGuard( aMDataReceived );
+ osl::MutexGuard aGuard( aMDataReceived );
if ( nDataReceivedEventId )
{
GetpApp()->RemoveUserEvent( nDataReceivedEventId );
@@ -210,8 +210,8 @@ void CommunicationLinkViaSocket::run()
SetNewPacketAsCurrent();
StartCallback();
{
- NAMESPACE_VOS(OGuard) aGuard( aMDataReceived );
- NAMESPACE_VOS(OGuard) aGuard2( *pMPostUserEvent );
+ osl::MutexGuard aGuard( aMDataReceived );
+ osl::MutexGuard aGuard2( *pMPostUserEvent );
mlPutDataReceived.Call(this);
}
}
@@ -221,8 +221,8 @@ void CommunicationLinkViaSocket::run()
StartCallback();
{
- NAMESPACE_VOS(OGuard) aGuard( aMConnectionClosed );
- NAMESPACE_VOS(OGuard) aGuard2( *pMPostUserEvent );
+ osl::MutexGuard aGuard( aMConnectionClosed );
+ osl::MutexGuard aGuard2( *pMPostUserEvent );
nConnectionClosedEventId = GetpApp()->PostUserEvent( LINK( this, CommunicationLinkViaSocket, ConnectionClosed ) );
}
}
@@ -239,7 +239,7 @@ BOOL CommunicationLinkViaSocket::DoTransferDataStream( SvStream *pDataStream, CM
long CommunicationLinkViaSocket::ConnectionClosed( void* EMPTYARG )
{
{
- NAMESPACE_VOS(OGuard) aGuard( aMConnectionClosed );
+ osl::MutexGuard aGuard( aMConnectionClosed );
nConnectionClosedEventId = 0; // Achtung!! alles andere muß oben gemacht werden.
}
ShutdownCommunication();
@@ -250,7 +250,7 @@ long CommunicationLinkViaSocket::ConnectionClosed( void* EMPTYARG )
long CommunicationLinkViaSocket::DataReceived( void* EMPTYARG )
{
{
- NAMESPACE_VOS(OGuard) aGuard( aMDataReceived );
+ osl::MutexGuard aGuard( aMDataReceived );
nDataReceivedEventId = 0; // Achtung!! alles andere muß oben gemacht werden.
}
return CommunicationLink::DataReceived( );
@@ -454,7 +454,7 @@ CommunicationManagerServerAcceptThread::CommunicationManagerServerAcceptThread(
, xmNewConnection( NULL )
{
if ( !pMPostUserEvent )
- pMPostUserEvent = new NAMESPACE_VOS(OMutex);
+ pMPostUserEvent = new osl::Mutex;
create();
}
@@ -481,7 +481,7 @@ CommunicationManagerServerAcceptThread::~CommunicationManagerServerAcceptThread(
DEBUGPRINTF ("Destructor CommunicationManagerServerAcceptThread Übersprungen!!!! (wegen Solaris BUG)\n");
#endif
{
- NAMESPACE_VOS(OGuard) aGuard( aMAddConnection );
+ osl::MutexGuard aGuard( aMAddConnection );
if ( nAddConnectionEventId )
{
GetpApp()->RemoveUserEvent( nAddConnectionEventId );
@@ -532,8 +532,8 @@ void CommunicationManagerServerAcceptThread::run()
xmNewConnection = new CommunicationLinkViaSocket( pMyServer, pStreamSocket );
xmNewConnection->StartCallback();
{
- NAMESPACE_VOS(OGuard) aGuard( aMAddConnection );
- NAMESPACE_VOS(OGuard) aGuard2( *pMPostUserEvent );
+ osl::MutexGuard aGuard( aMAddConnection );
+ osl::MutexGuard aGuard2( *pMPostUserEvent );
nAddConnectionEventId = GetpApp()->PostUserEvent( LINK( this, CommunicationManagerServerAcceptThread, AddConnection ) );
}
}
@@ -559,7 +559,7 @@ void CommunicationManagerServerAcceptThread::run()
IMPL_LINK( CommunicationManagerServerAcceptThread, AddConnection, void*, EMPTYARG )
{
{
- NAMESPACE_VOS(OGuard) aGuard( aMAddConnection );
+ osl::MutexGuard aGuard( aMAddConnection );
nAddConnectionEventId = 0;
}
pMyServer->AddConnection( xmNewConnection );
diff --git a/automation/source/simplecm/tcpio.cxx b/automation/source/simplecm/tcpio.cxx
index 2906c04..e71afb3 100644
--- a/automation/source/simplecm/tcpio.cxx
+++ b/automation/source/simplecm/tcpio.cxx
@@ -34,7 +34,7 @@
/// implement ITransmiter
comm_USHORT TCPIO::TransferBytes( const void* pBuffer, comm_UINT32 nLen )
{
- vos::OGuard aGuard( aMSocketWriteAccess );
+ osl::MutexGuard aGuard( aMSocketWriteAccess );
if ( !pStreamSocket )
{
nLastSent = 0;
@@ -50,7 +50,7 @@ comm_USHORT TCPIO::TransferBytes( const void* pBuffer, comm_UINT32 nLen )
/// implement IReceiver
comm_USHORT TCPIO::ReceiveBytes( void* pBuffer, comm_UINT32 nLen )
{
- vos::OGuard aGuard( aMSocketReadAccess );
+ osl::MutexGuard aGuard( aMSocketReadAccess );
if ( !pStreamSocket )
{
nLastReceived = 0;
@@ -66,8 +66,8 @@ comm_USHORT TCPIO::ReceiveBytes( void* pBuffer, comm_UINT32 nLen )
// helper
void TCPIO::SetStreamSocket( osl::StreamSocket* pSocket )
{
- vos::OGuard aRGuard( aMSocketReadAccess );
- vos::OGuard aWGuard( aMSocketWriteAccess );
+ osl::MutexGuard aRGuard( aMSocketReadAccess );
+ osl::MutexGuard aWGuard( aMSocketWriteAccess );
pStreamSocket = pSocket;
}
diff --git a/automation/source/simplecm/tcpio.hxx b/automation/source/simplecm/tcpio.hxx
index c5a3e5c..1aa49bc 100644
--- a/automation/source/simplecm/tcpio.hxx
+++ b/automation/source/simplecm/tcpio.hxx
@@ -29,7 +29,7 @@
#define TCPIO_HXX
#include <osl/socket.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include "communiio.hxx"
@@ -37,8 +37,8 @@ class TCPIO : public ITransmiter, public IReceiver
{
private:
osl::StreamSocket* pStreamSocket;
- vos::OMutex aMSocketReadAccess;
- vos::OMutex aMSocketWriteAccess;
+ osl::Mutex aMSocketReadAccess;
+ osl::Mutex aMSocketWriteAccess;
public:
diff --git a/basctl/source/basicide/doceventnotifier.cxx b/basctl/source/basicide/doceventnotifier.cxx
index 20ed5bf..64b41dc 100644
--- a/basctl/source/basicide/doceventnotifier.cxx
+++ b/basctl/source/basicide/doceventnotifier.cxx
@@ -43,7 +43,7 @@
#include <comphelper/componentcontext.hxx>
#include <comphelper/processfactory.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <sal/macros.h>
#include <cppuhelper/compbase1.hxx>
diff --git a/basctl/source/basicide/scriptdocument.cxx b/basctl/source/basicide/scriptdocument.cxx
index ab74f70..f6c89a3 100644
--- a/basctl/source/basicide/scriptdocument.cxx
+++ b/basctl/source/basicide/scriptdocument.cxx
@@ -81,7 +81,7 @@
#include <comphelper/documentinfo.hxx>
#include <comphelper/componentcontext.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <cppuhelper/implbase1.hxx>
diff --git a/basctl/source/basicide/unomodel.cxx b/basctl/source/basicide/unomodel.cxx
index 498344c..7285e61 100644
--- a/basctl/source/basicide/unomodel.cxx
+++ b/basctl/source/basicide/unomodel.cxx
@@ -30,7 +30,7 @@
#include "precompiled_basctl.hxx"
#include "unomodel.hxx"
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <sfx2/docfac.hxx>
diff --git a/basctl/source/dlged/dlgedclip.cxx b/basctl/source/dlged/dlgedclip.cxx
index 1a6da9c..06285b1 100644
--- a/basctl/source/dlged/dlgedclip.cxx
+++ b/basctl/source/dlged/dlgedclip.cxx
@@ -29,7 +29,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_basctl.hxx"
#include "dlgedclip.hxx"
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <comphelper/processfactory.hxx>
#include <com/sun/star/datatransfer/XMimeContentType.hpp>
diff --git a/cui/inc/pch/precompiled_cui.hxx b/cui/inc/pch/precompiled_cui.hxx
index 2be4137..02df955 100644
--- a/cui/inc/pch/precompiled_cui.hxx
+++ b/cui/inc/pch/precompiled_cui.hxx
@@ -942,7 +942,7 @@
#include "vcl/unohelp2.hxx"
#include "vcl/wall.hxx"
#include "vcl/wintypes.hxx"
-#include "vos/mutex.hxx"
+#include "osl/mutex.hxx"
#include "vos/thread.hxx"
#include "vos/xception.hxx"
#include "xmloff/DashStyle.hxx"
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index 01b3900..d1ff451 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -31,7 +31,7 @@
#include <algorithm>
#include <ucbhelper/content.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <vcl/msgbox.hxx>
#include <avmedia/mediawindow.hxx>
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index c049d35..c9996a4 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -34,7 +34,7 @@
#include <sfx2/objsh.hxx>
#include <vcl/svapp.hxx>
#include <vcl/msgbox.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <cuires.hrc>
#include "scriptdlg.hrc"
diff --git a/extensions/inc/pch/precompiled_extensions.hxx b/extensions/inc/pch/precompiled_extensions.hxx
index abe058b..da85349 100644
--- a/extensions/inc/pch/precompiled_extensions.hxx
+++ b/extensions/inc/pch/precompiled_extensions.hxx
@@ -541,7 +541,7 @@
#include "vos/macros.hxx"
#include "vos/module.hxx"
-#include "vos/mutex.hxx"
+#include "osl/mutex.hxx"
#include "xmloff/nmspmap.hxx"
//---MARKER---
diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx
index cd0bace..4953622 100644
--- a/extensions/source/bibliography/framectr.cxx
+++ b/extensions/source/bibliography/framectr.cxx
@@ -60,7 +60,7 @@
#include <sot/exchange.hxx>
#include <sot/formats.hxx>
#include <vcl/edit.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <hash_map>
@@ -186,7 +186,7 @@ void BibFrameCtrl_Impl::frameAction(const FrameActionEvent& aEvent) throw( uno::
void BibFrameCtrl_Impl::disposing( const lang::EventObject& /*Source*/ )
throw (::com::sun::star::uno::RuntimeException)
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
if ( pController )
pController->getFrame()->removeFrameActionListener( this );
}
@@ -441,7 +441,7 @@ void BibFrameController_Impl::dispatch(const util::URL& _rURL, const uno::Sequen
{
if ( !bDisposing )
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
Window* pParent = VCLUnoHelper::GetWindow( xWindow );
WaitObject aWaitObject( pParent );
diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx
index 32c8ded..dc801d2 100644
--- a/extensions/source/bibliography/toolbar.cxx
+++ b/extensions/source/bibliography/toolbar.cxx
@@ -47,7 +47,7 @@
#include "bibresid.hxx"
#include "bibtools.hxx"
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
using namespace ::rtl;
using namespace ::com::sun::star;
diff --git a/extensions/source/oooimprovecore/core.cxx b/extensions/source/oooimprovecore/core.cxx
index 733769d..d1e2c4f 100644
--- a/extensions/source/oooimprovecore/core.cxx
+++ b/extensions/source/oooimprovecore/core.cxx
@@ -43,7 +43,7 @@
#include <cppuhelper/implbase3.hxx>
#include <svx/svxdlg.hxx>
#include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <svl/itemset.hxx>
#include <svl/stritem.hxx>
#include <sfx2/app.hxx>
diff --git a/extensions/source/plugin/inc/plugin/unx/mediator.hxx b/extensions/source/plugin/inc/plugin/unx/mediator.hxx
index 1548cf6..13e7d4e 100644
--- a/extensions/source/plugin/inc/plugin/unx/mediator.hxx
+++ b/extensions/source/plugin/inc/plugin/unx/mediator.hxx
@@ -32,7 +32,7 @@
#include <tools/string.hxx>
#include <tools/link.hxx>
#include <osl/pipe.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <osl/conditn.hxx>
#include <osl/thread.hxx>
#if OSL_DEBUG_LEVEL > 1
@@ -90,8 +90,8 @@ protected:
int m_nSocket;
std::vector<MediatorMessage*> m_aMessageQueue;
- NAMESPACE_VOS(OMutex) m_aQueueMutex;
- NAMESPACE_VOS(OMutex) m_aSendMutex;
+ osl::Mutex m_aQueueMutex;
+ osl::Mutex m_aSendMutex;
// only one thread can send a message at any given time
osl::Condition m_aNewMessageCdtn;
MediatorListener* m_pListener;
@@ -155,7 +155,7 @@ class MediatorListener : public osl::Thread
friend class Mediator;
private:
Mediator* m_pMediator;
- ::vos::OMutex m_aMutex;
+ ::osl::Mutex m_aMutex;
MediatorListener( Mediator* );
~MediatorListener();
diff --git a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
index 3438dba..a224d26 100644
--- a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
+++ b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
@@ -166,7 +166,7 @@ public:
class PluginConnector : public Mediator
{
protected:
- NAMESPACE_VOS(OMutex) m_aUserEventMutex;
+ osl::Mutex m_aUserEventMutex;
static std::vector<PluginConnector*> allConnectors;
diff --git a/extensions/source/plugin/unx/mediator.cxx b/extensions/source/plugin/unx/mediator.cxx
index c126d1a..afd42fa 100644
--- a/extensions/source/plugin/unx/mediator.cxx
+++ b/extensions/source/plugin/unx/mediator.cxx
@@ -51,7 +51,7 @@ Mediator::~Mediator()
if( m_pListener )
{
{
- ::vos::OGuard aGuard( m_pListener->m_aMutex );
+ ::osl::MutexGuard aGuard( m_pListener->m_aMutex );
m_pListener->m_pMediator = NULL;
}
m_pListener = NULL;
@@ -81,7 +81,7 @@ ULONG Mediator::SendMessage( ULONG nBytes, const char* pBytes, ULONG nMessageID
if( ! m_pListener )
return 0;
- NAMESPACE_VOS(OGuard) aGuard( m_aSendMutex );
+ osl::MutexGuard aGuard( m_aSendMutex );
if( ! nMessageID )
nMessageID = m_nCurrentID;
@@ -133,7 +133,7 @@ MediatorMessage* Mediator::WaitForAnswer( ULONG nMessageID )
while( m_pListener )
{
{
- NAMESPACE_VOS(OGuard) aGuard( m_aQueueMutex );
+ osl::MutexGuard aGuard( m_aQueueMutex );
for( size_t i = 0; i < m_aMessageQueue.size(); i++ )
{
MediatorMessage* pMessage = m_aMessageQueue[ i ];
@@ -158,7 +158,7 @@ MediatorMessage* Mediator::GetNextMessage( BOOL bWait )
{
// guard must be after WaitForMessage, else the listener
// cannot insert a new one -> deadlock
- NAMESPACE_VOS(OGuard) aGuard( m_aQueueMutex );
+ osl::MutexGuard aGuard( m_aQueueMutex );
for( size_t i = 0; i < m_aMessageQueue.size(); i++ )
{
MediatorMessage* pMessage = m_aMessageQueue[ i ];
@@ -206,9 +206,9 @@ void MediatorListener::run()
char* pBuffer = new char[ nHeader[ 1 ] ];
if( m_pMediator && (ULONG)read( m_pMediator->m_nSocket, pBuffer, nHeader[ 1 ] ) == nHeader[ 1 ] )
{
- ::vos::OGuard aMyGuard( m_aMutex );
+ ::osl::MutexGuard aMyGuard( m_aMutex );
{
- NAMESPACE_VOS(OGuard)
+ osl::MutexGuard
aGuard( m_pMediator->m_aQueueMutex );
MediatorMessage* pMessage =
new MediatorMessage( nHeader[ 0 ], nHeader[ 1 ], pBuffer );
diff --git a/extensions/source/plugin/unx/nppapi.cxx b/extensions/source/plugin/unx/nppapi.cxx
index f263238..c6dd6a5 100644
--- a/extensions/source/plugin/unx/nppapi.cxx
+++ b/extensions/source/plugin/unx/nppapi.cxx
@@ -53,7 +53,7 @@ PluginConnector::PluginConnector( int nSocket ) :
PluginConnector::~PluginConnector()
{
- NAMESPACE_VOS(OGuard) aGuard( m_aUserEventMutex );
+ osl::MutexGuard aGuard( m_aUserEventMutex );
for( std::vector< PluginConnector* >::iterator it = allConnectors.begin();
it != allConnectors.end(); ++it )
{
@@ -67,7 +67,7 @@ PluginConnector::~PluginConnector()
IMPL_LINK( PluginConnector, NewMessageHdl, Mediator*, /*pMediator*/ )
{
- NAMESPACE_VOS(OGuard) aGuard( m_aUserEventMutex );
+ osl::MutexGuard aGuard( m_aUserEventMutex );
bool bFound = false;
for( std::vector< PluginConnector* >::iterator it = allConnectors.begin();
it != allConnectors.end() && bFound == false; ++it )
@@ -94,7 +94,7 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
return 0;
/*
{
- NAMESPACE_VOS(OGuard) aGuard( m_aUserEventMutex );
+ osl::MutexGuard aGuard( m_aUserEventMutex );
m_aUserEventIDs.pop_front();
}
*/
diff --git a/extensions/source/plugin/unx/plugcon.cxx b/extensions/source/plugin/unx/plugcon.cxx
index 512a7db..52be98f 100644
--- a/extensions/source/plugin/unx/plugcon.cxx
+++ b/extensions/source/plugin/unx/plugcon.cxx
@@ -180,7 +180,7 @@ MediatorMessage* PluginConnector::WaitForAnswer( ULONG nMessageID )
while( m_pListener )
{
{
- NAMESPACE_VOS(OGuard) aGuard( m_aQueueMutex );
+ osl::MutexGuard aGuard( m_aQueueMutex );
for( size_t i = 0; i < m_aMessageQueue.size(); i++ )
{
MediatorMessage* pMessage = m_aMessageQueue[ i ];
diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx
index 6862765..a70d7cc 100644
--- a/extensions/source/propctrlr/browserlistbox.cxx
+++ b/extensions/source/propctrlr/browserlistbox.cxx
@@ -45,7 +45,7 @@
#include <comphelper/asyncnotification.hxx>
#include <cppuhelper/implbase1.hxx>
#include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
//............................................................................
namespace pcr
diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx
index ba9b88e..8fd253a 100644
--- a/extensions/source/propctrlr/propcontroller.cxx
+++ b/extensions/source/propctrlr/propcontroller.cxx
@@ -56,7 +56,7 @@
#include <comphelper/property.hxx>
#include <vcl/msgbox.hxx>
#include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <cppuhelper/component_context.hxx>
#include <cppuhelper/exc_hlp.hxx>
diff --git a/extensions/source/resource/resource.cxx b/extensions/source/resource/resource.cxx
index 3f6474e..8ebd503 100644
--- a/extensions/source/resource/resource.cxx
+++ b/extensions/source/resource/resource.cxx
@@ -30,7 +30,7 @@
#include "precompiled_extensions.hxx"
#include "res_services.hxx"
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <uno/lbnames.h> // CPPU_CURRENT_LANGUAGE_BINDING_NAME macro, which specify the environment type
#include <cppuhelper/factory.hxx> // helper for factories
#include <cppuhelper/implbase3.hxx> // helper for implementations
@@ -51,7 +51,6 @@
#include <rtl/ustring.hxx>
#include <rtl/strbuf.hxx>
-using namespace vos;
using namespace rtl;
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
diff --git a/extensions/source/scanner/sane.hxx b/extensions/source/scanner/sane.hxx
index 2ffe2c4..ce2b84a 100644
--- a/extensions/source/scanner/sane.hxx
+++ b/extensions/source/scanner/sane.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
@@ -41,15 +41,15 @@
class BitmapTransporter : public OWeakObject, AWT::XBitmap
{
SvMemoryStream m_aStream;
- vos::OMutex m_aProtector;
-
-public:
-
+ osl::Mutex m_aProtector;
+
+public:
+
BitmapTransporter();
virtual ~BitmapTransporter();
-
-
- // XInterface
+
+
+ // XInterface
virtual ANY SAL_CALL queryInterface( const Type & rType ) throw( RuntimeException );
virtual void SAL_CALL acquire() throw() { OWeakObject::acquire(); }
virtual void SAL_CALL release() throw() { OWeakObject::release(); }
@@ -73,7 +73,7 @@ class Sane
private:
static int nRefCount;
static oslModule pSaneLib;
-
+
static SANE_Status (*p_init)( SANE_Int*,
SANE_Auth_Callback );
static void (*p_exit)();
@@ -168,7 +168,7 @@ public:
int CountOptions() { return mnOptions; }
int GetDeviceNumber() { return mnDevice; }
-
+
BOOL Open( const char* );
BOOL Open( int );
void Close();
diff --git a/extensions/source/scanner/scanner.hxx b/extensions/source/scanner/scanner.hxx
index 84ac250..c01748d 100644
--- a/extensions/source/scanner/scanner.hxx
+++ b/extensions/source/scanner/scanner.hxx
@@ -29,7 +29,7 @@
#define _EXT_SCANNER_HXX
#include <tools/stream.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <rtl/ustring.hxx>
#include <cppuhelper/weak.hxx>
#include <cppuhelper/weak.hxx>
@@ -64,7 +64,7 @@ class ScannerManager : public OWeakObject, XScannerManager, AWT::XBitmap
{
protected:
- vos::OMutex maProtector;
+ osl::Mutex maProtector;
void* mpData;
void AcquireData();
diff --git a/extensions/source/scanner/scanunx.cxx b/extensions/source/scanner/scanunx.cxx
index 412de72..0dcf457 100644
--- a/extensions/source/scanner/scanunx.cxx
+++ b/extensions/source/scanner/scanunx.cxx
@@ -65,7 +65,7 @@ ANY SAL_CALL BitmapTransporter::queryInterface( const Type& rType ) throw( Runti
AWT::Size BitmapTransporter::getSize() throw()
{
- vos::OGuard aGuard( m_aProtector );
+ osl::MutexGuard aGuard( m_aProtector );
int nPreviousPos = m_aStream.Tell();
AWT::Size aRet;
@@ -89,7 +89,7 @@ AWT::Size BitmapTransporter::getSize() throw()
SEQ( sal_Int8 ) BitmapTransporter::getDIB() throw()
{
- vos::OGuard aGuard( m_aProtector );
+ osl::MutexGuard aGuard( m_aProtector );
int nPreviousPos = m_aStream.Tell();
// create return value
@@ -112,7 +112,7 @@ struct SaneHolder
{
Sane m_aSane;
REF( AWT::XBitmap ) m_xBitmap;
- vos::OMutex m_aProtector;
+ osl::Mutex m_aProtector;
ScanError m_nError;
bool m_bBusy;
@@ -147,7 +147,7 @@ namespace
m_aSanes.clear();
}
- struct theSaneProtector : public rtl::Static<vos::OMutex, theSaneProtector> {};
+ struct theSaneProtector : public rtl::Static<osl::Mutex, theSaneProtector> {};
struct theSanes : public rtl::Static<allSanes, theSanes> {};
}
@@ -193,7 +193,7 @@ ScannerThread::~ScannerThread()
void ScannerThread::run()
{
- vos::OGuard aGuard( m_pHolder->m_aProtector );
+ osl::MutexGuard aGuard( m_pHolder->m_aProtector );
BitmapTransporter* pTransporter = new BitmapTransporter;
REF( XInterface ) aIf( static_cast< OWeakObject* >( pTransporter ) );
@@ -225,13 +225,13 @@ void ScannerThread::run()
void ScannerManager::AcquireData()
{
- vos::OGuard aGuard( theSaneProtector::get() );
+ osl::MutexGuard aGuard( theSaneProtector::get() );
theSanes::get().acquire();
}
void ScannerManager::ReleaseData()
{
- vos::OGuard aGuard( theSaneProtector::get() );
+ osl::MutexGuard aGuard( theSaneProtector::get() );
theSanes::get().release();
}
@@ -255,7 +255,7 @@ SEQ( sal_Int8 ) ScannerManager::getDIB() throw()
SEQ( ScannerContext ) ScannerManager::getAvailableScanners() throw()
{
- vos::OGuard aGuard( theSaneProtector::get() );
+ osl::MutexGuard aGuard( theSaneProtector::get() );
sanevec &rSanes = theSanes::get().m_aSanes;
if( rSanes.empty() )
@@ -280,7 +280,7 @@ SEQ( ScannerContext ) ScannerManager::getAvailableScanners() throw()
BOOL ScannerManager::configureScanner( ScannerContext& scanner_context ) throw( ScannerException )
{
- vos::OGuard aGuard( theSaneProtector::get() );
+ osl::MutexGuard aGuard( theSaneProtector::get() );
sanevec &rSanes = theSanes::get().m_aSanes;
#if OSL_DEBUG_LEVEL > 1
@@ -315,7 +315,7 @@ BOOL ScannerManager::configureScanner( ScannerContext& scanner_context ) throw(
void ScannerManager::startScan( const ScannerContext& scanner_context,
const REF( com::sun::star::lang::XEventListener )& listener ) throw( ScannerException )
{
- vos::OGuard aGuard( theSaneProtector::get() );
+ osl::MutexGuard aGuard( theSaneProtector::get() );
sanevec &rSanes = theSanes::get().m_aSanes;
#if OSL_DEBUG_LEVEL > 1
@@ -345,7 +345,7 @@ void ScannerManager::startScan( const ScannerContext& scanner_context,
ScanError ScannerManager::getError( const ScannerContext& scanner_context ) throw( ScannerException )
{
- vos::OGuard aGuard( theSaneProtector::get() );
+ osl::MutexGuard aGuard( theSaneProtector::get() );
sanevec &rSanes = theSanes::get().m_aSanes;
if( scanner_context.InternalData < 0 || (ULONG)scanner_context.InternalData >= rSanes.size() )
@@ -364,7 +364,7 @@ ScanError ScannerManager::getError( const ScannerContext& scanner_context ) thro
REF( AWT::XBitmap ) ScannerManager::getBitmap( const ScannerContext& scanner_context ) throw( ScannerException )
{
- vos::OGuard aGuard( theSaneProtector::get() );
+ osl::MutexGuard aGuard( theSaneProtector::get() );
sanevec &rSanes = theSanes::get().m_aSanes;
if( scanner_context.InternalData < 0 || (ULONG)scanner_context.InternalData >= rSanes.size() )
@@ -375,7 +375,7 @@ REF( AWT::XBitmap ) ScannerManager::getBitmap( const ScannerContext& scanner_con
);
boost::shared_ptr<SaneHolder> pHolder = rSanes[scanner_context.InternalData];
- vos::OGuard aProtGuard( pHolder->m_aProtector );
+ osl::MutexGuard aProtGuard( pHolder->m_aProtector );
REF( AWT::XBitmap ) xRet( pHolder->m_xBitmap );
pHolder->m_xBitmap = REF( AWT::XBitmap )();
diff --git a/extensions/source/scanner/scanwin.cxx b/extensions/source/scanner/scanwin.cxx
index c1baf98..c469f3b 100644
--- a/extensions/source/scanner/scanwin.cxx
+++ b/extensions/source/scanner/scanwin.cxx
@@ -42,7 +42,7 @@
#include <math.h>
#include <tools/svwin.h>
#include <tools/stream.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vos/module.hxx>
#include <vcl/svapp.hxx>
#include <vcl/wrkwin.hxx>
@@ -110,7 +110,7 @@ class ImpTwain : public ::cppu::WeakImplHelper1< util::XCloseListener >
TW_IDENTITY aSrcIdent;
Link aNotifyLink;
DSMENTRYPROC pDSM;
- NAMESPACE_VOS( OModule )* pMod;
+ NAMESPACE_VOS(OModule )* pMod;
ULONG nCurState;
HWND hTwainWnd;
HHOOK hTwainHook;
@@ -994,7 +994,7 @@ SEQ( sal_Int8 ) ScannerManager::getDIB() throw()
SEQ( ScannerContext ) SAL_CALL ScannerManager::getAvailableScanners() throw()
{
- vos::OGuard aGuard( maProtector );
+ osl::MutexGuard aGuard( maProtector );
SEQ( ScannerContext ) aRet( 1 );
aRet.getArray()[0].ScannerName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TWAIN" ) );
@@ -1008,7 +1008,7 @@ SEQ( ScannerContext ) SAL_CALL ScannerManager::getAvailableScanners() throw()
BOOL SAL_CALL ScannerManager::configureScanner( ScannerContext& rContext )
throw( ScannerException )
{
- vos::OGuard aGuard( maProtector );
+ osl::MutexGuard aGuard( maProtector );
uno::Reference< XScannerManager > xThis( this );
if( rContext.InternalData != 0 || rContext.ScannerName != ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TWAIN" ) ) )
@@ -1024,7 +1024,7 @@ BOOL SAL_CALL ScannerManager::configureScanner( ScannerContext& rContext )
void SAL_CALL ScannerManager::startScan( const ScannerContext& rContext, const uno::Reference< lang::XEventListener >& rxListener )
throw( ScannerException )
{
- vos::OGuard aGuard( maProtector );
+ osl::MutexGuard aGuard( maProtector );
uno::Reference< XScannerManager > xThis( this );
if( rContext.InternalData != 0 || rContext.ScannerName != ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TWAIN" ) ) )
@@ -1039,7 +1039,7 @@ void SAL_CALL ScannerManager::startScan( const ScannerContext& rContext, const u
ScanError SAL_CALL ScannerManager::getError( const ScannerContext& rContext )
throw( ScannerException )
{
- vos::OGuard aGuard( maProtector );
+ osl::MutexGuard aGuard( maProtector );
uno::Reference< XScannerManager > xThis( this );
if( rContext.InternalData != 0 || rContext.ScannerName != ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TWAIN" ) ) )
@@ -1053,7 +1053,7 @@ ScanError SAL_CALL ScannerManager::getError( const ScannerContext& rContext )
uno::Reference< awt::XBitmap > SAL_CALL ScannerManager::getBitmap( const ScannerContext& /*rContext*/ )
throw( ScannerException )
{
- vos::OGuard aGuard( maProtector );
+ osl::MutexGuard aGuard( maProtector );
return uno::Reference< awt::XBitmap >( this );
}
diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx
index ff683df..fe784a7 100644
--- a/extensions/source/update/ui/updatecheckui.cxx
+++ b/extensions/source/update/ui/updatecheckui.cxx
@@ -43,7 +43,7 @@
#include <comphelper/processfactory.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <osl/mutex.hxx>
#include <vcl/window.hxx>
diff --git a/extensions/test/stm/datatest.cxx b/extensions/test/stm/datatest.cxx
index d92fe73..b180a58 100644
--- a/extensions/test/stm/datatest.cxx
+++ b/extensions/test/stm/datatest.cxx
@@ -47,7 +47,7 @@
#include <usr/weak.hxx> // OWeakObject
#include <osl/conditn.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <osl/thread.hxx>
#include <string.h>
diff --git a/extensions/test/stm/marktest.cxx b/extensions/test/stm/marktest.cxx
index c2dccac..4ebe73f 100644
--- a/extensions/test/stm/marktest.cxx
+++ b/extensions/test/stm/marktest.cxx
@@ -43,7 +43,7 @@
#include <usr/weak.hxx> // OWeakObject
#include <osl/conditn.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <osl/thread.hxx>
#include <string.h>
diff --git a/extensions/test/stm/pipetest.cxx b/extensions/test/stm/pipetest.cxx
index 61e3e8a..52ed4b8 100644
--- a/extensions/test/stm/pipetest.cxx
+++ b/extensions/test/stm/pipetest.cxx
@@ -40,7 +40,7 @@
#include <usr/weak.hxx> // OWeakObject
#include <osl/conditn.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <osl/thread.hxx>
#include <string.h>
diff --git a/forms/inc/pch/precompiled_forms.hxx b/forms/inc/pch/precompiled_forms.hxx
index f3a99d2..751267b 100644
--- a/forms/inc/pch/precompiled_forms.hxx
+++ b/forms/inc/pch/precompiled_forms.hxx
@@ -394,7 +394,7 @@
#include "vcl/timer.hxx"
#include "vcl/wintypes.hxx"
-#include "vos/mutex.hxx"
+#include "osl/mutex.hxx"
#include "osl/thread.hxx"
//---MARKER---
#endif
diff --git a/forms/source/component/Button.cxx b/forms/source/component/Button.cxx
index 8ecb441..8d9b8c8 100644
--- a/forms/source/component/Button.cxx
+++ b/forms/source/component/Button.cxx
@@ -39,7 +39,7 @@
#include <tools/debug.hxx>
#include <tools/urlobj.hxx>
#include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
//.........................................................................
namespace frm
diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx
index 0e62fe7..cb42736 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -90,7 +90,7 @@
#include <unotools/ucbstreamhelper.hxx>
#include <vcl/svapp.hxx>
#include <vcl/timer.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <ctype.h>
#include <hash_map>
diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx
index c8294c6..5958726 100644
--- a/forms/source/component/FormattedField.cxx
+++ b/forms/source/component/FormattedField.cxx
@@ -60,7 +60,7 @@
#include <com/sun/star/util/XNumberFormatTypes.hpp>
#include <com/sun/star/form/XForm.hpp>
#include <com/sun/star/container/XIndexAccess.hpp>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
// needed as long as we use the SolarMutex
#include <comphelper/streamsection.hxx>
#include <cppuhelper/weakref.hxx>
diff --git a/forms/source/component/ImageButton.cxx b/forms/source/component/ImageButton.cxx
index 9810641..2b6165f 100644
--- a/forms/source/component/ImageButton.cxx
+++ b/forms/source/component/ImageButton.cxx
@@ -32,7 +32,7 @@
#include <tools/debug.hxx>
#include <tools/urlobj.hxx>
#include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <comphelper/basicio.hxx>
#include <com/sun/star/awt/MouseButton.hpp>
diff --git a/forms/source/component/clickableimage.cxx b/forms/source/component/clickableimage.cxx
index 67350e4..b08d919 100644
--- a/forms/source/component/clickableimage.cxx
+++ b/forms/source/component/clickableimage.cxx
@@ -47,7 +47,7 @@
#include <vcl/svapp.hxx>
#include <sfx2/docfile.hxx>
#include <sfx2/objsh.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include "services.hxx"
#include <comphelper/container.hxx>
#include <comphelper/listenernotification.hxx>
diff --git a/forms/source/richtext/richtextcontrol.cxx b/forms/source/richtext/richtextcontrol.cxx
index 75adc5e..676cb30 100644
--- a/forms/source/richtext/richtextcontrol.cxx
+++ b/forms/source/richtext/richtextcontrol.cxx
@@ -375,7 +375,7 @@ namespace frm
void ORichTextPeer::dispose( ) throw(RuntimeException)
{
{
- ::vos::OGuard aGuard( GetMutex() );
+ ::osl::SolarMutexGuard aGuard( GetMutex() );
RichTextControl* pRichTextControl = static_cast< RichTextControl* >( GetWindow() );
if ( pRichTextControl )
diff --git a/forms/source/richtext/richtextengine.cxx b/forms/source/richtext/richtextengine.cxx
index f55189d..13a371b 100644
--- a/forms/source/richtext/richtextengine.cxx
+++ b/forms/source/richtext/richtextengine.cxx
@@ -44,7 +44,7 @@
#include <vcl/outdev.hxx>
#include <unotools/lingucfg.hxx>
#include <svl/undo.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <algorithm>
#include <functional>
diff --git a/forms/source/runtime/formoperations.cxx b/forms/source/runtime/formoperations.cxx
index f818ddf..e857787 100644
--- a/forms/source/runtime/formoperations.cxx
+++ b/forms/source/runtime/formoperations.cxx
@@ -68,7 +68,7 @@
#include <comphelper/property.hxx>
#include <comphelper/namedvaluecollection.hxx>
#include <cppuhelper/exc_hlp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <sal/macros.h>
//--------------------------------------------------------------------------
commit d6181f976b230ce1cdc5f794e8d389518edfa02c
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Fri Oct 15 12:18:51 2010 -0500
merge vosremoval-reference.diff
diff --git a/cui/inc/pch/precompiled_cui.hxx b/cui/inc/pch/precompiled_cui.hxx
index 403e6bc..2be4137 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 "vos/mutex.hxx"
-#include "vos/ref.hxx"
-#include "vos/refernce.hxx"
#include "vos/thread.hxx"
#include "vos/xception.hxx"
#include "xmloff/DashStyle.hxx"
diff --git a/extensions/inc/pch/precompiled_extensions.hxx b/extensions/inc/pch/precompiled_extensions.hxx
index fd4276f..abe058b 100644
--- a/extensions/inc/pch/precompiled_extensions.hxx
+++ b/extensions/inc/pch/precompiled_extensions.hxx
@@ -489,6 +489,7 @@
#include "rtl/math.hxx"
#include "rtl/memory.h"
#include "rtl/process.h"
+#include "rtl/ref.hxx"
#include "rtl/strbuf.hxx"
#include "rtl/string.h"
#include "rtl/string.hxx"
@@ -541,8 +542,6 @@
#include "vos/macros.hxx"
#include "vos/module.hxx"
#include "vos/mutex.hxx"
-#include "vos/ref.hxx"
-#include "vos/refernce.hxx"
#include "xmloff/nmspmap.hxx"
//---MARKER---
diff --git a/extensions/source/bibliography/loadlisteneradapter.cxx b/extensions/source/bibliography/loadlisteneradapter.cxx
index 7eb2cc6..928fb02 100644
--- a/extensions/source/bibliography/loadlisteneradapter.cxx
+++ b/extensions/source/bibliography/loadlisteneradapter.cxx
@@ -30,7 +30,7 @@
#include "precompiled_extensions.hxx"
#include "loadlisteneradapter.hxx"
#include <osl/diagnose.h>
-#include <vos/ref.hxx>
+#include <rtl/ref.hxx>
//.........................................................................
namespace bib
@@ -118,7 +118,7 @@ namespace bib
{
if ( m_bListening )
{
- ::vos::ORef< OComponentAdapterBase > xPreventDelete(this);
+ ::rtl::Reference< OComponentAdapterBase > xPreventDelete(this);
disposing();
diff --git a/extensions/source/ole/servprov.hxx b/extensions/source/ole/servprov.hxx
index 6ed2932..6f57b58 100644
--- a/extensions/source/ole/servprov.hxx
+++ b/extensions/source/ole/servprov.hxx
@@ -147,7 +147,6 @@ public:
protected:
- //ORefCount m_refCount;
oslInterlockedCount m_refCount;
Reference<XInterface> m_xInst;
GUID m_guid;
diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx
index 9dd9745..dc96ed0 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -41,7 +41,7 @@
#include <osl/diagnose.h>
-#include <vos/refernce.hxx>
+#include <salhelper/simplereferenceobject.hxx>
#include <tools/debug.hxx>
#include <rtl/ustring.hxx>
#include <com/sun/star/beans/MethodConcept.hpp>
diff --git a/extensions/source/ole/unoobjw.hxx b/extensions/source/ole/unoobjw.hxx
index ca67df2..c8bd49c 100644
--- a/extensions/source/ole/unoobjw.hxx
+++ b/extensions/source/ole/unoobjw.hxx
@@ -32,7 +32,7 @@
#include <com/sun/star/beans/XExactName.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/script/InvocationInfo.hpp>
-#include <vos/refernce.hxx>
+#include <salhelper/simplereferenceobject.hxx>
#include <tools/presys.h>
#include "comifaces.hxx"
@@ -220,7 +220,6 @@ protected:
sal_Bool getInvocationInfoForCall(DISPID id, InvocationInfo& info);
-// vos::ORefCount m_refCount;
Reference<XInvocation> m_xInvocation;
Reference<XExactName> m_xExactName;
Reference<XInterface> m_xOrigin;
diff --git a/package/inc/HashMaps.hxx b/package/inc/HashMaps.hxx
index 24e86bc..5845e4a 100644
--- a/package/inc/HashMaps.hxx
+++ b/package/inc/HashMaps.hxx
@@ -28,7 +28,7 @@
#define _HASHMAPS_HXX
#include <ZipEntry.hxx>
-#include <vos/ref.hxx>
+#include <rtl/ref.hxx>
#include <hash_map>
struct eqFunc
@@ -51,7 +51,7 @@ typedef std::hash_map < rtl::OUString,
eqFunc > FolderHash;
typedef std::hash_map < rtl::OUString,
- vos::ORef < com::sun::star::packages::ContentInfo >,
+ rtl::Reference < com::sun::star::packages::ContentInfo >,
::rtl::OUStringHash,
eqFunc > ContentHash;
diff --git a/package/inc/ZipFile.hxx b/package/inc/ZipFile.hxx
index eba878e..f5892dd 100644
--- a/package/inc/ZipFile.hxx
+++ b/package/inc/ZipFile.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
@@ -41,13 +41,13 @@ namespace com { namespace sun { namespace star {
namespace lang { class XMultiServiceFactory; }
namespace ucb { class XProgressHandler; }
} } }
-namespace vos
+namespace rtl
{
- template < class T > class ORef;
+ template < class T > class Reference;
}
-/*
+/*
* We impose arbitrary but reasonable limit on ZIP files.
- */
+ */
#define ZIP_MAXNAMELEN 512
#define ZIP_MAXEXTRA 256
@@ -73,15 +73,15 @@ protected:
sal_Bool bRecoveryMode;
- com::sun::star::uno::Reference < com::sun::star::io::XInputStream > createMemoryStream(
+ com::sun::star::uno::Reference < com::sun::star::io::XInputStream > createMemoryStream(
ZipEntry & rEntry,
- const vos::ORef < EncryptionData > &rData,
+ const rtl::Reference < EncryptionData > &rData,
sal_Bool bRawStream,
sal_Bool bDecrypt );
com::sun::star::uno::Reference < com::sun::star::io::XInputStream > createFileStream(
ZipEntry & rEntry,
- const vos::ORef < EncryptionData > &rData,
+ const rtl::Reference < EncryptionData > &rData,
sal_Bool bRawStream,
sal_Bool bDecrypt );
@@ -89,12 +89,12 @@ protected:
com::sun::star::uno::Reference < com::sun::star::io::XInputStream > createUnbufferedStream(
SotMutexHolderRef aMutexHolder,
ZipEntry & rEntry,
- const vos::ORef < EncryptionData > &rData,
+ const rtl::Reference < EncryptionData > &rData,
sal_Int8 nStreamMode,
sal_Bool bDecrypt,
::rtl::OUString aMediaType = ::rtl::OUString() );
- sal_Bool hasValidPassword ( ZipEntry & rEntry, const vos::ORef < EncryptionData > &rData );
+ sal_Bool hasValidPassword ( ZipEntry & rEntry, const rtl::Reference < EncryptionData > &rData );
sal_Bool checkSizeAndCRC( const ZipEntry& aEntry );
@@ -104,14 +104,14 @@ protected:
public:
- ZipFile( com::sun::star::uno::Reference < com::sun::star::io::XInputStream > &xInput,
- const com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory > &xNewFactory,
+ ZipFile( com::sun::star::uno::Reference < com::sun::star::io::XInputStream > &xInput,
+ const com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory > &xNewFactory,
sal_Bool bInitialise
)
throw(::com::sun::star::io::IOException, com::sun::star::packages::zip::ZipException, com::sun::star::uno::RuntimeException);
- ZipFile( com::sun::star::uno::Reference < com::sun::star::io::XInputStream > &xInput,
- const com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory > &xNewFactory,
+ ZipFile( com::sun::star::uno::Reference < com::sun::star::io::XInputStream > &xInput,
+ const com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory > &xNewFactory,
sal_Bool bInitialise,
sal_Bool bForceRecover,
::com::sun::star::uno::Reference < ::com::sun::star::ucb::XProgressHandler > xProgress
@@ -123,46 +123,46 @@ public:
EntryHash& GetEntryHash() { return aEntries; }
void setInputStream ( com::sun::star::uno::Reference < com::sun::star::io::XInputStream > xNewStream );
- ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getRawData(
+ ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getRawData(
ZipEntry& rEntry,
- const vos::ORef < EncryptionData > &rData,
+ const rtl::Reference < EncryptionData > &rData,
sal_Bool bDecrypt,
SotMutexHolderRef aMutexHolder )
throw(::com::sun::star::io::IOException, ::com::sun::star::packages::zip::ZipException, ::com::sun::star::uno::RuntimeException);
-
- static sal_Bool StaticGetCipher ( const vos::ORef < EncryptionData > & xEncryptionData, rtlCipher &rCipher, sal_Bool bDecode );
- static void StaticFillHeader ( const vos::ORef < EncryptionData > & rData,
+ static sal_Bool StaticGetCipher ( const rtl::Reference < EncryptionData > & xEncryptionData, rtlCipher &rCipher, sal_Bool bDecode );
+
+ static void StaticFillHeader ( const rtl::Reference < EncryptionData > & rData,
sal_Int32 nSize,
const ::rtl::OUString& aMediaType,
sal_Int8 * & pHeader );
- static sal_Bool StaticFillData ( vos::ORef < EncryptionData > & rData,
+ static sal_Bool StaticFillData ( rtl::Reference < EncryptionData > & rData,
sal_Int32 &rSize,
::rtl::OUString& aMediaType,
::com::sun::star::uno::Reference < com::sun::star::io::XInputStream > &rStream );
static ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > StaticGetDataFromRawStream(
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xStream,
- const vos::ORef < EncryptionData > &rData )
+ const rtl::Reference < EncryptionData > &rData )
throw ( ::com::sun::star::packages::WrongPasswordException,
::com::sun::star::packages::zip::ZipIOException,
::com::sun::star::uno::RuntimeException );
-
+
static sal_Bool StaticHasValidPassword ( const ::com::sun::star::uno::Sequence< sal_Int8 > &aReadBuffer,
- const vos::ORef < EncryptionData > &rData );
-
+ const rtl::Reference < EncryptionData > &rData );
+
- ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getInputStream(
+ ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getInputStream(
ZipEntry& rEntry,
- const vos::ORef < EncryptionData > &rData,
+ const rtl::Reference < EncryptionData > &rData,
sal_Bool bDecrypt,
SotMutexHolderRef aMutexHolder )
throw(::com::sun::star::io::IOException, ::com::sun::star::packages::zip::ZipException, ::com::sun::star::uno::RuntimeException);
- ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getDataStream(
+ ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getDataStream(
ZipEntry& rEntry,
- const vos::ORef < EncryptionData > &rData,
+ const rtl::Reference < EncryptionData > &rData,
sal_Bool bDecrypt,
SotMutexHolderRef aMutexHolder )
throw ( ::com::sun::star::packages::WrongPasswordException,
@@ -170,9 +170,9 @@ public:
::com::sun::star::packages::zip::ZipException,
::com::sun::star::uno::RuntimeException );
- ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getWrappedRawStream(
+ ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getWrappedRawStream(
ZipEntry& rEntry,
- const vos::ORef < EncryptionData > &rData,
+ const rtl::Reference < EncryptionData > &rData,
const ::rtl::OUString& aMediaType,
SotMutexHolderRef aMutexHolder )
throw ( ::com::sun::star::packages::NoEncryptionException,
diff --git a/package/inc/ZipOutputStream.hxx b/package/inc/ZipOutputStream.hxx
index ae41285..de3e3b4 100644
--- a/package/inc/ZipOutputStream.hxx
+++ b/package/inc/ZipOutputStream.hxx
@@ -37,9 +37,9 @@
struct ZipEntry;
class EncryptionData;
-namespace vos
+namespace rtl
{
- template < class T > class ORef;
+ template < class T > class Reference;
}
class ZipOutputStream
{
@@ -74,7 +74,7 @@ public:
void SAL_CALL setLevel( sal_Int32 nNewLevel )
throw(::com::sun::star::uno::RuntimeException);
void SAL_CALL putNextEntry( ZipEntry& rEntry,
- vos::ORef < EncryptionData > &rData,
+ rtl::Reference < EncryptionData > &rData,
sal_Bool bEncrypt = sal_False )
throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
void SAL_CALL closeEntry( )
diff --git a/package/source/manifest/ManifestReader.cxx b/package/source/manifest/ManifestReader.cxx
index e9020ce..34fe9e2 100644
--- a/package/source/manifest/ManifestReader.cxx
+++ b/package/source/manifest/ManifestReader.cxx
@@ -36,9 +36,8 @@
#include <com/sun/star/xml/sax/XParser.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#include <vector>
+#include <vector>
-using namespace ::rtl;
using namespace ::std;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
@@ -48,6 +47,7 @@ using namespace ::com::sun::star::registry;
using namespace ::com::sun::star::packages;
using namespace ::com::sun::star::xml::sax;
using namespace ::com::sun::star::packages::manifest;
+using ::rtl::OUString;
ManifestReader::ManifestReader( const Reference < XMultiServiceFactory > & xNewFactory )
: xFactory ( xNewFactory )
diff --git a/package/source/manifest/UnoRegister.cxx b/package/source/manifest/UnoRegister.cxx
index 9a3883c..8a234a7 100644
--- a/package/source/manifest/UnoRegister.cxx
+++ b/package/source/manifest/UnoRegister.cxx
@@ -37,7 +37,6 @@
#include <zipfileaccess.hxx>
-using namespace ::rtl;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::lang;
@@ -45,6 +44,8 @@ using namespace ::com::sun::star::registry;
using namespace ::com::sun::star::packages;
using namespace ::com::sun::star::packages::manifest;
+using rtl::OUString;
+
static sal_Bool writeInfo( void * pRegistryKey,
const OUString & rImplementationName,
Sequence< OUString > const & rServiceNames )
diff --git a/package/source/zipapi/EntryInputStream.cxx b/package/source/zipapi/EntryInputStream.cxx
index 677ef9f..eb89646 100644
--- a/package/source/zipapi/EntryInputStream.cxx
+++ b/package/source/zipapi/EntryInputStream.cxx
@@ -53,7 +53,7 @@ using namespace com::sun::star::packages::zip::ZipConstants;
EntryInputStream::EntryInputStream( Reference < io::XInputStream > xNewInput,
const ZipEntry & rNewEntry,
- const vos::ORef < EncryptionData > &xEncryptData,
+ const rtl::Reference < EncryptionData > &xEncryptData,
sal_Bool bGetRawStream)
: xStream( xNewInput )
, xSeek( xNewInput, UNO_QUERY )
diff --git a/package/source/zipapi/EntryInputStream.hxx b/package/source/zipapi/EntryInputStream.hxx
index 4696d5e..9d9c45d 100644
--- a/package/source/zipapi/EntryInputStream.hxx
+++ b/package/source/zipapi/EntryInputStream.hxx
@@ -32,7 +32,7 @@
#include <com/sun/star/io/XSeekable.hpp>
#include <Inflater.hxx>
#include <com/sun/star/packages/zip/ZipEntry.hpp>
-#include <vos/ref.hxx>
+#include <rtl/ref.hxx>
#include <EncryptionData.hxx>
class EntryInputStream : public cppu::WeakImplHelper2< com::sun::star::io::XInputStream,
com::sun::star::io::XSeekable >
@@ -43,7 +43,7 @@ protected:
sal_Int64 nEnd, nCurrent, nUncompressedSize;
sal_Bool bRawStream, bHaveInMemory, bEncrypted;
com::sun::star::uno::Sequence < sal_Int8 > aBuffer;
- const vos::ORef < EncryptionData > xEncryptionData;
+ const rtl::Reference < EncryptionData > xEncryptionData;
const com::sun::star::packages::zip::ZipEntry aEntry;
Inflater aInflater;
void readIntoMemory()
@@ -51,7 +51,7 @@ protected:
public:
EntryInputStream( com::sun::star::uno::Reference < com::sun::star::io::XInputStream > xInput,
const com::sun::star::packages::zip::ZipEntry &rNewEntry,
- const vos::ORef < EncryptionData > &xEncryptData,
+ const rtl::Reference < EncryptionData > &xEncryptData,
sal_Bool bGetRawStream = sal_False);
virtual ~EntryInputStream();
diff --git a/package/source/zipapi/XFileStream.cxx b/package/source/zipapi/XFileStream.cxx
index b1ab102..6afe807 100644
--- a/package/source/zipapi/XFileStream.cxx
+++ b/package/source/zipapi/XFileStream.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
@@ -46,7 +46,7 @@ using ::rtl::OUString;
XFileStream::XFileStream( ZipEntry & rEntry,
com::sun::star::uno::Reference < com::sun::star::io::XInputStream > xNewZipStream,
com::sun::star::uno::Reference < com::sun::star::io::XInputStream > xNewTempStream,
- const vos::ORef < EncryptionData > &rData,
+ const rtl::Reference < EncryptionData > &rData,
sal_Bool bNewRawStream,
sal_Bool bIsEncrypted )
: maEntry ( rEntry )
@@ -86,8 +86,8 @@ XFileStream::XFileStream( ZipEntry & rEntry,
else
{
// Put in the EncryptedDataHeader
- Sequence < sal_Int8 > aEncryptedDataHeader ( n_ConstHeaderSize +
- rData->aInitVector.getLength() +
+ Sequence < sal_Int8 > aEncryptedDataHeader ( n_ConstHeaderSize +
+ rData->aInitVector.getLength() +
rData->aSalt.getLength() +
rData->aDigest.getLength() );
sal_Int8 * pHeader = aEncryptedDataHeader.getArray();
@@ -100,7 +100,7 @@ XFileStream::XFileStream( ZipEntry & rEntry,
}
}
-XFileStream::~XFileStream()
+XFileStream::~XFileStream()
{
if ( maCipher )
rtl_cipher_destroy ( maCipher );
@@ -124,7 +124,7 @@ void XFileStream::fill( sal_Int64 nUntil)
// some error handling ?
return;
}
-
+
sal_Int64 nDiff = mnZipEnd - mnZipCurrent;
if ( nDiff > 0 )
{
@@ -167,7 +167,7 @@ void XFileStream::fill( sal_Int64 nUntil)
mxTempSeek->seek ( nPosition );
}
-sal_Int32 SAL_CALL XFileStream::readBytes( Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead )
+sal_Int32 SAL_CALL XFileStream::readBytes( Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead )
throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException)
{
sal_Int64 nPosition = mxTempSeek->getPosition();
@@ -183,28 +183,28 @@ sal_Int32 SAL_CALL XFileStream::readBytes( Sequence< sal_Int8 >& aData, sal_Int3
return nRead;
}
-sal_Int32 SAL_CALL XFileStream::readSomeBytes( Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead )
+sal_Int32 SAL_CALL XFileStream::readSomeBytes( Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead )
throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException)
{
return readBytes ( aData, nMaxBytesToRead );
}
-void SAL_CALL XFileStream::skipBytes( sal_Int32 nBytesToSkip )
+void SAL_CALL XFileStream::skipBytes( sal_Int32 nBytesToSkip )
throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException)
{
seek ( mxTempSeek->getPosition() + nBytesToSkip );
}
-sal_Int32 SAL_CALL XFileStream::available( )
+sal_Int32 SAL_CALL XFileStream::available( )
throw( NotConnectedException, IOException, RuntimeException)
{
return static_cast < sal_Int32 > ( mnZipSize - mxTempSeek->getPosition() );
}
-void SAL_CALL XFileStream::closeInput( )
+void SAL_CALL XFileStream::closeInput( )
throw( NotConnectedException, IOException, RuntimeException)
{
}
-void SAL_CALL XFileStream::seek( sal_Int64 location )
+void SAL_CALL XFileStream::seek( sal_Int64 location )
throw( IllegalArgumentException, IOException, RuntimeException)
{
if ( location > mnZipSize || location < 0 )
@@ -216,12 +216,12 @@ void SAL_CALL XFileStream::seek( sal_Int64 location )
}
mxTempSeek->seek ( location );
}
-sal_Int64 SAL_CALL XFileStream::getPosition( )
+sal_Int64 SAL_CALL XFileStream::getPosition( )
throw(IOException, RuntimeException)
{
return mxTempSeek->getPosition();
}
-sal_Int64 SAL_CALL XFileStream::getLength( )
+sal_Int64 SAL_CALL XFileStream::getLength( )
throw(IOException, RuntimeException)
{
return mnZipSize;
diff --git a/package/source/zipapi/XFileStream.hxx b/package/source/zipapi/XFileStream.hxx
index 9c14758..4fc279f 100644
--- a/package/source/zipapi/XFileStream.hxx
+++ b/package/source/zipapi/XFileStream.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
@@ -31,7 +31,7 @@
#include <com/sun/star/io/XSeekable.hpp>
#include <com/sun/star/io/XInputStream.hpp>
#include <cppuhelper/implbase2.hxx>
-#include <vos/ref.hxx>
+#include <rtl/ref.hxx>
#include <Inflater.hxx>
#include <ZipEntry.hxx>
@@ -54,7 +54,7 @@ protected:
com::sun::star::uno::Reference < com::sun::star::io::XOutputStream > mxTempOut;
com::sun::star::uno::Sequence < sal_Int8 > maBuffer, maCompBuffer;
ZipEntry maEntry;
- vos::ORef < EncryptionData > mxData;
+ rtl::Reference < EncryptionData > mxData;
rtlCipher maCipher;
Inflater maInflater;
sal_Bool mbRawStream, mbFinished;
@@ -65,28 +65,28 @@ public:
XFileStream( ZipEntry & rEntry,
com::sun::star::uno::Reference < com::sun::star::io::XInputStream > xNewZipStream,
com::sun::star::uno::Reference < com::sun::star::io::XInputStream > xNewTempStream,
- const vos::ORef < EncryptionData > &rData,
+ const rtl::Reference < EncryptionData > &rData,
sal_Bool bRawStream,
sal_Bool bIsEncrypted );
virtual ~XFileStream();
// XInputStream
- virtual sal_Int32 SAL_CALL readBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead )
+ virtual sal_Int32 SAL_CALL readBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead )
throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
- virtual sal_Int32 SAL_CALL readSomeBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead )
+ virtual sal_Int32 SAL_CALL readSomeBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead )
throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip )
+ virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip )
throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
- virtual sal_Int32 SAL_CALL available( )
+ virtual sal_Int32 SAL_CALL available( )
throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL closeInput( )
+ virtual void SAL_CALL closeInput( )
throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
// XSeekable
- virtual void SAL_CALL seek( sal_Int64 location )
+ virtual void SAL_CALL seek( sal_Int64 location )
throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
- virtual sal_Int64 SAL_CALL getPosition( )
+ virtual sal_Int64 SAL_CALL getPosition( )
throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
- virtual sal_Int64 SAL_CALL getLength( )
+ virtual sal_Int64 SAL_CALL getLength( )
throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
};
#endif
diff --git a/package/source/zipapi/XUnbufferedStream.cxx b/package/source/zipapi/XUnbufferedStream.cxx
index 0e33d70..de2a69f 100644
--- a/package/source/zipapi/XUnbufferedStream.cxx
+++ b/package/source/zipapi/XUnbufferedStream.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
@@ -58,7 +58,7 @@ using ::rtl::OUString;
XUnbufferedStream::XUnbufferedStream( SotMutexHolderRef aMutexHolder,
ZipEntry & rEntry,
Reference < XInputStream > xNewZipStream,
- const vos::ORef < EncryptionData > &rData,
+ const rtl::Reference < EncryptionData > &rData,
sal_Int8 nStreamMode,
sal_Bool bIsEncrypted,
const ::rtl::OUString& aMediaType,
@@ -91,9 +91,9 @@ XUnbufferedStream::XUnbufferedStream( SotMutexHolderRef aMutexHolder,
mnZipSize = maEntry.nSize;
mnZipEnd = maEntry.nMethod == DEFLATED ? maEntry.nOffset + maEntry.nCompressedSize : maEntry.nOffset + maEntry.nSize;
}
- sal_Bool bHaveEncryptData = ( !rData.isEmpty() && rData->aSalt.getLength() && rData->aInitVector.getLength() && rData->nIterationCount != 0 ) ? sal_True : sal_False;
+ sal_Bool bHaveEncryptData = ( rData.is() && rData->aSalt.getLength() && rData->aInitVector.getLength() && rData->nIterationCount != 0 ) ? sal_True : sal_False;
sal_Bool bMustDecrypt = ( nStreamMode == UNBUFF_STREAM_DATA && bHaveEncryptData && bIsEncrypted ) ? sal_True : sal_False;
-
+
if ( bMustDecrypt )
ZipFile::StaticGetCipher ( rData, maCipher, sal_True );
if ( bHaveEncryptData && mbWrappedRaw && bIsEncrypted )
@@ -104,8 +104,8 @@ XUnbufferedStream::XUnbufferedStream( SotMutexHolderRef aMutexHolder,
// Make a buffer big enough to hold both the header and the data itself
maHeader.realloc ( n_ConstHeaderSize +
- rData->aInitVector.getLength() +
- rData->aSalt.getLength() +
+ rData->aInitVector.getLength() +
+ rData->aSalt.getLength() +
rData->aDigest.getLength() +
aMediaType.getLength() * sizeof( sal_Unicode ) );
sal_Int8 * pHeader = maHeader.getArray();
@@ -116,7 +116,7 @@ XUnbufferedStream::XUnbufferedStream( SotMutexHolderRef aMutexHolder,
// allows to read package raw stream
XUnbufferedStream::XUnbufferedStream( const Reference < XInputStream >& xRawStream,
- const vos::ORef < EncryptionData > &rData )
+ const rtl::Reference < EncryptionData > &rData )
: maMutexHolder( new SotMutexHolder )
, mxZipStream ( xRawStream )
, mxZipSeek ( xRawStream, UNO_QUERY )
@@ -137,7 +137,7 @@ XUnbufferedStream::XUnbufferedStream( const Reference < XInputStream >& xRawStre
OSL_ENSURE( mxZipSeek.is(), "The stream must be seekable!\n" );
// skip raw header, it must be already parsed to rData
- mnZipCurrent = n_ConstHeaderSize + rData->aInitVector.getLength() +
+ mnZipCurrent = n_ConstHeaderSize + rData->aInitVector.getLength() +
rData->aSalt.getLength() + rData->aDigest.getLength();
try {
@@ -147,19 +147,19 @@ XUnbufferedStream::XUnbufferedStream( const Reference < XInputStream >& xRawStre
{
// in case of problem the size will stay set to 0
}
-
+
mnZipEnd = mnZipCurrent + mnZipSize;
ZipFile::StaticGetCipher ( rData, maCipher, sal_True );
}
-XUnbufferedStream::~XUnbufferedStream()
+XUnbufferedStream::~XUnbufferedStream()
{
if ( maCipher )
rtl_cipher_destroy ( maCipher );
}
-sal_Int32 SAL_CALL XUnbufferedStream::readBytes( Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead )
+sal_Int32 SAL_CALL XUnbufferedStream::readBytes( Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead )
throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException)
{
::osl::MutexGuard aGuard( maMutexHolder->GetMutex() );
@@ -171,7 +171,7 @@ sal_Int32 SAL_CALL XUnbufferedStream::readBytes( Sequence< sal_Int8 >& aData, sa
sal_Int32 nRead = 0, nLastRead = 0, nTotal = 0;
aData.realloc ( nRequestedBytes );
- if ( nRequestedBytes )
+ if ( nRequestedBytes )
{
if ( mbRawStream )
{
@@ -212,8 +212,8 @@ sal_Int32 SAL_CALL XUnbufferedStream::readBytes( Sequence< sal_Int8 >& aData, sa
{
mxZipSeek->seek ( mnZipCurrent );
- nRead = mxZipStream->readBytes (
- aData,
+ nRead = mxZipStream->readBytes (
+ aData,
static_cast < sal_Int32 > ( nDiff < nRequestedBytes ? nDiff : nRequestedBytes ) );
mnZipCurrent += nRead;
@@ -225,16 +225,16 @@ sal_Int32 SAL_CALL XUnbufferedStream::readBytes( Sequence< sal_Int8 >& aData, sa
}
else
{
- while ( 0 == ( nLastRead = maInflater.doInflateSegment( aData, nRead, aData.getLength() - nRead ) ) ||
+ while ( 0 == ( nLastRead = maInflater.doInflateSegment( aData, nRead, aData.getLength() - nRead ) ) ||
( nRead + nLastRead != nRequestedBytes && mnZipCurrent < mnZipEnd ) )
{
nRead += nLastRead;
if ( nRead > nRequestedBytes )
- throw RuntimeException(
+ throw RuntimeException(
OUString( RTL_CONSTASCII_USTRINGPARAM( "Should not be possible to read more then requested!" ) ),
Reference< XInterface >() );
-
+
if ( maInflater.finished() || maInflater.getLastInflateError() )
throw ZipIOException( OUString( RTL_CONSTASCII_USTRINGPARAM( "The stream seems to be broken!" ) ),
Reference< XInterface >() );
@@ -262,7 +262,7 @@ sal_Int32 SAL_CALL XUnbufferedStream::readBytes( Sequence< sal_Int8 >& aData, sa
maCRC.update( maCompBuffer );
Sequence < sal_Int8 > aCryptBuffer ( nZipRead );
- rtlCipherError aResult =
+ rtlCipherError aResult =
rtl_cipher_decode ( maCipher,
maCompBuffer.getConstArray(),
nZipRead,
@@ -308,22 +308,22 @@ sal_Int32 SAL_CALL XUnbufferedStream::readBytes( Sequence< sal_Int8 >& aData, sa
}
}
#endif
-
+
if ( mnZipSize + maHeader.getLength() == mnMyCurrent && maCRC.getValue() != maEntry.nCrc )
throw ZipIOException( OUString( RTL_CONSTASCII_USTRINGPARAM( "The stream seems to be broken!" ) ),
Reference< XInterface >() );
}
}
-
+
return nTotal;
}
-sal_Int32 SAL_CALL XUnbufferedStream::readSomeBytes( Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead )
+sal_Int32 SAL_CALL XUnbufferedStream::readSomeBytes( Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead )
throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException)
{
return readBytes ( aData, nMaxBytesToRead );
}
-void SAL_CALL XUnbufferedStream::skipBytes( sal_Int32 nBytesToSkip )
+void SAL_CALL XUnbufferedStream::skipBytes( sal_Int32 nBytesToSkip )
throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException)
{
if ( nBytesToSkip )
@@ -333,27 +333,27 @@ void SAL_CALL XUnbufferedStream::skipBytes( sal_Int32 nBytesToSkip )
}
}
-sal_Int32 SAL_CALL XUnbufferedStream::available( )
+sal_Int32 SAL_CALL XUnbufferedStream::available( )
throw( NotConnectedException, IOException, RuntimeException)
{
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list