[Libreoffice-commits] .: 2 commits - automation/inc automation/source extensions/inc extensions/source extensions/test extensions/workben forms/inc forms/source package/source UnoControls/source
Norbert Thiebaud
nthiebaud at kemper.freedesktop.org
Sun Oct 10 19:40:45 PDT 2010
UnoControls/source/base/multiplexer.cxx | 22 ++--------------
UnoControls/source/controls/framecontrol.cxx | 6 ++--
automation/inc/automation/communi.hxx | 6 ++--
automation/source/communi/communi.cxx | 6 ++--
automation/source/server/server.hxx | 2 -
automation/source/testtool/tcommuni.hxx | 2 -
extensions/inc/pch/precompiled_extensions.hxx | 3 --
extensions/source/ole/olethread.cxx | 2 -
extensions/source/ole/unoobjw.cxx | 2 -
extensions/source/plugin/base/multiplx.cxx | 6 ++--
extensions/source/plugin/inc/plugin/unx/mediator.hxx | 4 +-
extensions/source/scanner/scanunx.cxx | 4 +-
extensions/test/stm/datatest.cxx | 2 -
extensions/test/stm/marktest.cxx | 2 -
extensions/test/stm/pipetest.cxx | 6 ++--
extensions/workben/pythonautotest.cxx | 2 -
extensions/workben/pythontest.cxx | 2 -
extensions/workben/testcomponent.cxx | 2 -
extensions/workben/testresource.cxx | 8 ++---
forms/inc/pch/precompiled_forms.hxx | 2 -
forms/source/component/EventThread.cxx | 3 +-
forms/source/component/EventThread.hxx | 8 ++---
package/source/manifest/UnoRegister.cxx | 18 ++++++-------
package/source/zipapi/ZipOutputStream.cxx | 1
package/source/zippackage/ZipPackage.cxx | 4 +-
package/source/zippackage/ZipPackageFolder.cxx | 26 +++++++++----------
package/source/zippackage/ZipPackageStream.cxx | 10 +++----
27 files changed, 73 insertions(+), 88 deletions(-)
New commits:
commit 1964b24bf2e3c4a1cd9e0b12993bfbeab263ba3d
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sun Oct 10 21:29:02 2010 -0500
merge vosremoval-thread patch
diff --git a/automation/inc/automation/communi.hxx b/automation/inc/automation/communi.hxx
index e726530..cfbacf9 100644
--- a/automation/inc/automation/communi.hxx
+++ b/automation/inc/automation/communi.hxx
@@ -29,7 +29,7 @@
#define _COMMUNI_HXX
#include <svl/svarray.hxx>
-#include <vos/thread.hxx>
+#include <osl/thread.hxx>
#include <vos/mutex.hxx>
#include <vcl/timer.hxx>
#include <automation/simplecm.hxx>
@@ -76,7 +76,7 @@ public:
CommunicationManagerClient( BOOL bUseMultiChannel = FALSE );
};
-class CommunicationLinkViaSocket : public SimpleCommunicationLinkViaSocket, public NAMESPACE_VOS(OThread)
+class CommunicationLinkViaSocket : public SimpleCommunicationLinkViaSocket, public osl::Thread
{
public:
CommunicationLinkViaSocket( CommunicationManager *pMan, NAMESPACE_VOS(OStreamSocket) *pSocket );
@@ -133,7 +133,7 @@ private:
void AddConnection( CommunicationLink *pNewConnection );
};
-class CommunicationManagerServerAcceptThread: public NAMESPACE_VOS(OThread)
+class CommunicationManagerServerAcceptThread: public osl::Thread
{
public:
CommunicationManagerServerAcceptThread( CommunicationManagerServerViaSocket* pServer, ULONG nPort, USHORT nMaxCon = CM_UNLIMITED_CONNECTIONS );
diff --git a/automation/source/communi/communi.cxx b/automation/source/communi/communi.cxx
index 42402d7..1d1dd10 100644
--- a/automation/source/communi/communi.cxx
+++ b/automation/source/communi/communi.cxx
@@ -205,7 +205,7 @@ void CommunicationLinkViaSocket::run()
TimeValue sNochEins = {0, 1000000};
while ( schedule() && bIsInsideCallback ) // solange der letzte Callback nicht beendet ist
- sleep( sNochEins );
+ wait( sNochEins );
SetNewPacketAsCurrent();
StartCallback();
{
@@ -216,7 +216,7 @@ void CommunicationLinkViaSocket::run()
}
TimeValue sNochEins = {0, 1000000};
while ( schedule() && bIsInsideCallback ) // solange der letzte Callback nicht beendet ist
- sleep( sNochEins );
+ wait( sNochEins );
StartCallback();
{
@@ -527,7 +527,7 @@ void CommunicationManagerServerAcceptThread::run()
TimeValue sNochEins = {0, 100};
while ( schedule() && xmNewConnection.Is() ) // Solange die letzte Connection nicht abgeholt wurde warten wir
- sleep( sNochEins );
+ wait( sNochEins );
xmNewConnection = new CommunicationLinkViaSocket( pMyServer, pStreamSocket );
xmNewConnection->StartCallback();
{
diff --git a/automation/source/server/server.hxx b/automation/source/server/server.hxx
index 544a267..841522a 100644
--- a/automation/source/server/server.hxx
+++ b/automation/source/server/server.hxx
@@ -27,7 +27,7 @@
#ifndef _SERVER_HXX
#define _SERVER_HXX
-/*#include <vos/thread.hxx>
+/*#include <osl/thread.hxx>
#ifndef _STD_NO_NAMESPACE
namespace vos
{
diff --git a/automation/source/testtool/tcommuni.hxx b/automation/source/testtool/tcommuni.hxx
index b047e33..59274cc 100644
--- a/automation/source/testtool/tcommuni.hxx
+++ b/automation/source/testtool/tcommuni.hxx
@@ -29,7 +29,7 @@
#include <tools/link.hxx>
#include <svl/svarray.hxx>
-#include <vos/thread.hxx>
+#include <osl/thread.hxx>
#ifndef _STRING_LIST
DECLARE_LIST( StringList, String * )
diff --git a/extensions/inc/pch/precompiled_extensions.hxx b/extensions/inc/pch/precompiled_extensions.hxx
index 6cf56ed..f7a05e9 100644
--- a/extensions/inc/pch/precompiled_extensions.hxx
+++ b/extensions/inc/pch/precompiled_extensions.hxx
@@ -543,7 +543,6 @@
#include "vos/pipe.hxx"
#include "vos/ref.hxx"
#include "vos/refernce.hxx"
-#include "vos/thread.hxx"
#include "vos/timer.hxx"
#include "xmloff/nmspmap.hxx"
diff --git a/extensions/source/ole/olethread.cxx b/extensions/source/ole/olethread.cxx
index 4a638df..b512ecc 100644
--- a/extensions/source/ole/olethread.cxx
+++ b/extensions/source/ole/olethread.cxx
@@ -36,7 +36,7 @@
#include <tools/presys.h>
#include <tools/postsys.h>
-#include <vos/thread.hxx>
+#include <osl/thread.hxx>
using namespace vos;
using namespace std;
diff --git a/extensions/source/plugin/inc/plugin/unx/mediator.hxx b/extensions/source/plugin/inc/plugin/unx/mediator.hxx
index 800e06a..bc73a28 100644
--- a/extensions/source/plugin/inc/plugin/unx/mediator.hxx
+++ b/extensions/source/plugin/inc/plugin/unx/mediator.hxx
@@ -34,7 +34,7 @@
#include <vos/pipe.hxx>
#include <vos/mutex.hxx>
#include <vos/conditn.hxx>
-#include <vos/thread.hxx>
+#include <osl/thread.hxx>
#if OSL_DEBUG_LEVEL > 1
#include <stdio.h>
#endif
@@ -150,7 +150,7 @@ public:
}
};
-class MediatorListener : public NAMESPACE_VOS( OThread )
+class MediatorListener : public osl::Thread
{
friend class Mediator;
private:
diff --git a/extensions/source/scanner/scanunx.cxx b/extensions/source/scanner/scanunx.cxx
index 45e6e31..c7f5056 100644
--- a/extensions/source/scanner/scanunx.cxx
+++ b/extensions/source/scanner/scanunx.cxx
@@ -29,7 +29,7 @@
#include "precompiled_extensions.hxx"
#include <scanner.hxx>
#include <sanedlg.hxx>
-#include <vos/thread.hxx>
+#include <osl/thread.hxx>
#include <tools/list.hxx>
#include <boost/shared_ptr.hpp>
@@ -154,7 +154,7 @@ namespace
// - ScannerThread -
// -----------------
-class ScannerThread : public vos::OThread
+class ScannerThread : public osl::Thread
{
boost::shared_ptr<SaneHolder> m_pHolder;
REF( com::sun::star::lang::XEventListener ) m_xListener;
diff --git a/extensions/test/stm/datatest.cxx b/extensions/test/stm/datatest.cxx
index 7d4e33c..ccb8f40 100644
--- a/extensions/test/stm/datatest.cxx
+++ b/extensions/test/stm/datatest.cxx
@@ -47,7 +47,7 @@
#include <vos/conditn.hxx>
#include <vos/mutex.hxx>
-#include <vos/thread.hxx>
+#include <osl/thread.hxx>
#include <string.h>
diff --git a/extensions/test/stm/marktest.cxx b/extensions/test/stm/marktest.cxx
index 96eb7c4..2e53b1f 100644
--- a/extensions/test/stm/marktest.cxx
+++ b/extensions/test/stm/marktest.cxx
@@ -43,7 +43,7 @@
#include <vos/conditn.hxx>
#include <vos/mutex.hxx>
-#include <vos/thread.hxx>
+#include <osl/thread.hxx>
#include <string.h>
diff --git a/extensions/test/stm/pipetest.cxx b/extensions/test/stm/pipetest.cxx
index b72f0a0..e88122b 100644
--- a/extensions/test/stm/pipetest.cxx
+++ b/extensions/test/stm/pipetest.cxx
@@ -40,7 +40,7 @@
#include <vos/conditn.hxx>
#include <vos/mutex.hxx>
-#include <vos/thread.hxx>
+#include <osl/thread.hxx>
#include <string.h>
@@ -54,7 +54,7 @@ using namespace usr;
#endif
class WriteToStreamThread :
- public OThread
+ public osl::Thread
{
public:
@@ -369,7 +369,7 @@ void OPipeTest::testMultithreading( const XInterfaceRef &r )
Sequence<BYTE> seqRead;
// deletes itself
- OThread *p = new WriteToStreamThread( output, iMax );
+ osl::Thread *p = new WriteToStreamThread( output, iMax );
ERROR_ASSERT( p , "couldn't create thread for testing !\n" );
diff --git a/forms/inc/pch/precompiled_forms.hxx b/forms/inc/pch/precompiled_forms.hxx
index 4e31cc6..f3a99d2 100644
--- a/forms/inc/pch/precompiled_forms.hxx
+++ b/forms/inc/pch/precompiled_forms.hxx
@@ -395,6 +395,6 @@
#include "vcl/wintypes.hxx"
#include "vos/mutex.hxx"
-#include "vos/thread.hxx"
+#include "osl/thread.hxx"
//---MARKER---
#endif
diff --git a/forms/source/component/EventThread.cxx b/forms/source/component/EventThread.cxx
index e3544cd..97b3c7f 100644
--- a/forms/source/component/EventThread.cxx
+++ b/forms/source/component/EventThread.cxx
@@ -167,7 +167,8 @@ void OComponentEventThread::implTerminated( )
void SAL_CALL OComponentEventThread::kill()
{
- OComponentEventThread_TBASE::kill();
+ OComponentEventThread_TBASE::terminate();
+ OComponentEventThread_TBASE::join();
implTerminated( );
}
diff --git a/forms/source/component/EventThread.hxx b/forms/source/component/EventThread.hxx
index 251ff98..d56e3ce 100644
--- a/forms/source/component/EventThread.hxx
+++ b/forms/source/component/EventThread.hxx
@@ -32,7 +32,7 @@
#include <com/sun/star/lang/EventObject.hpp>
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/awt/XControl.hpp>
-#include <vos/thread.hxx>
+#include <osl/thread.hxx>
#include <osl/conditn.hxx>
@@ -49,7 +49,7 @@ namespace frm
// ***************************************************************************************************
// ***************************************************************************************************
-typedef ::vos::OThread OComponentEventThread_TBASE;
+typedef ::osl::Thread OComponentEventThread_TBASE;
class OComponentEventThread
:public OComponentEventThread_TBASE
,public ::com::sun::star::lang::XEventListener
@@ -108,8 +108,8 @@ public:
virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& _rSource ) throw (::com::sun::star::uno::RuntimeException);
/* resolve ambiguity : both OWeakObject and OObject have these memory operators */
- void * SAL_CALL operator new( size_t size ) throw() { return OThread::operator new(size); }
- void SAL_CALL operator delete( void * p ) throw() { OThread::operator delete(p); }
+ void * SAL_CALL operator new( size_t size ) throw() { return osl::Thread::operator new(size); }
+ void SAL_CALL operator delete( void * p ) throw() { osl::Thread::operator delete(p); }
private:
void implStarted( );
commit 3dd131d0a971fb04916ecbffcc031e58d5a29529
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sun Oct 10 19:46:46 2010 -0500
merge vosremoval-diagnoses patch
diff --git a/UnoControls/source/base/multiplexer.cxx b/UnoControls/source/base/multiplexer.cxx
index 147d42c..23e6c77 100644
--- a/UnoControls/source/base/multiplexer.cxx
+++ b/UnoControls/source/base/multiplexer.cxx
@@ -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
@@ -24,24 +24,10 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-//____________________________________________________________________________________________________________
-// my own include
-//____________________________________________________________________________________________________________
#include "multiplexer.hxx"
-//____________________________________________________________________________________________________________
-// includes of other projects
-//____________________________________________________________________________________________________________
-#include <vos/diagnose.hxx>
-
-//____________________________________________________________________________________________________________
-// includes of my own project
-//____________________________________________________________________________________________________________
-
-//____________________________________________________________________________________________________________
-// namespaces
-//____________________________________________________________________________________________________________
+#include <osl/diagnose.h>
using namespace ::cppu ;
using namespace ::osl ;
@@ -538,7 +524,7 @@ void OMRCListenerMultiplexerHelper::impl_adviseToPeer( const Reference< XWindow
}
else
{
- VOS_ENSHURE( sal_False, "unknown listener" );
+ OSL_ENSURE( sal_False, "unknown listener" );
}
}
@@ -570,7 +556,7 @@ void OMRCListenerMultiplexerHelper::impl_unadviseFromPeer( const Reference< XWin
}
else
{
- VOS_ENSHURE( sal_False, "unknown listener" );
+ OSL_ENSURE( sal_False, "unknown listener" );
}
}
diff --git a/UnoControls/source/controls/framecontrol.cxx b/UnoControls/source/controls/framecontrol.cxx
index af9d011..7f7201f 100644
--- a/UnoControls/source/controls/framecontrol.cxx
+++ b/UnoControls/source/controls/framecontrol.cxx
@@ -42,7 +42,7 @@
#include <com/sun/star/frame/FrameSearchFlag.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <cppuhelper/typeprovider.hxx>
-#include <vos/diagnose.hxx>
+#include <osl/diagnose.h>
//______________________________________________________________________________________________________________
// include of my own project
@@ -376,7 +376,7 @@ void FrameControl::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle ,
case PROPERTYHANDLE_LOADERARGUMENTS : rValue >>= m_seqLoaderArguments ;
break ;
- default : VOS_ENSHURE ( nHandle == -1, ERRORTEXT_VOSENSHURE ) ;
+ default : OSL_ENSURE ( nHandle == -1, ERRORTEXT_VOSENSHURE ) ;
}
}
@@ -400,7 +400,7 @@ void FrameControl::getFastPropertyValue( Any& rRet ,
case PROPERTYHANDLE_FRAME : rRet <<= m_xFrame ;
break ;
- default : VOS_ENSHURE ( nHandle == -1, ERRORTEXT_VOSENSHURE ) ;
+ default : OSL_ENSURE ( nHandle == -1, ERRORTEXT_VOSENSHURE ) ;
}
}
diff --git a/extensions/inc/pch/precompiled_extensions.hxx b/extensions/inc/pch/precompiled_extensions.hxx
index 76724e1..6cf56ed 100644
--- a/extensions/inc/pch/precompiled_extensions.hxx
+++ b/extensions/inc/pch/precompiled_extensions.hxx
@@ -536,7 +536,7 @@
#include "vcl/fldunit.hxx"
#include "vos/conditn.hxx"
-#include "vos/diagnose.hxx"
+#include "osl/diagnose.h"
#include "vos/macros.hxx"
#include "vos/module.hxx"
#include "vos/mutex.hxx"
diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx
index e5f29f1..7c8a828 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -39,7 +39,7 @@
#include <tools/postsys.h>
-#include <vos/diagnose.hxx>
+#include <osl/diagnose.h>
#include <vos/refernce.hxx>
#include <tools/debug.hxx>
#include <rtl/ustring.hxx>
diff --git a/extensions/source/plugin/base/multiplx.cxx b/extensions/source/plugin/base/multiplx.cxx
index 17fc499..f49dcd2 100644
--- a/extensions/source/plugin/base/multiplx.cxx
+++ b/extensions/source/plugin/base/multiplx.cxx
@@ -27,7 +27,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_extensions.hxx"
-#include <vos/diagnose.hxx>
+#include <osl/diagnose.h>
#include <plugin/multiplx.hxx>
// ---------------------------------------------------------------------
@@ -106,7 +106,7 @@ void MRCListenerMultiplexerHelper::adviseToPeer( const Reference< ::com::sun::st
}
else
{
- VOS_ENSHURE( sal_False, "unknown listener" );
+ OSL_ENSURE( sal_False, "unknown listener" );
}
}
@@ -134,7 +134,7 @@ void MRCListenerMultiplexerHelper::unadviseFromPeer( const Reference< ::com::sun
}
else
{
- VOS_ENSHURE( sal_False, "unknown listener" );
+ OSL_ENSURE( sal_False, "unknown listener" );
}
}
diff --git a/extensions/workben/pythonautotest.cxx b/extensions/workben/pythonautotest.cxx
index 553f936..ce4df8b 100644
--- a/extensions/workben/pythonautotest.cxx
+++ b/extensions/workben/pythonautotest.cxx
@@ -34,7 +34,7 @@
#include <rtl/ustring.hxx>
#include <vos/dynload.hxx>
-#include <vos/diagnose.hxx>
+#include <osl/diagnose.h>
#include <usr/services.hxx>
#include <vcl/svapp.hxx>
#include <usr/ustring.hxx>
diff --git a/extensions/workben/pythontest.cxx b/extensions/workben/pythontest.cxx
index 7cf733a..129c147 100644
--- a/extensions/workben/pythontest.cxx
+++ b/extensions/workben/pythontest.cxx
@@ -35,7 +35,7 @@
#include <rtl/ustring.hxx>
#include <vos/dynload.hxx>
-#include <vos/diagnose.hxx>
+#include <osl/diagnose.h>
#include <usr/services.hxx>
#include <vcl/svapp.hxx>
#include <usr/ustring.hxx>
diff --git a/extensions/workben/testcomponent.cxx b/extensions/workben/testcomponent.cxx
index fdf6519..aee077c 100644
--- a/extensions/workben/testcomponent.cxx
+++ b/extensions/workben/testcomponent.cxx
@@ -41,7 +41,7 @@
#include <smart/com/sun/star/lang/XComponent.hxx>
#include <vos/dynload.hxx>
-#include <vos/diagnose.hxx>
+#include <osl/diagnose.h>
#include <usr/services.hxx>
#include <vcl/svapp.hxx>
#include <usr/ustring.hxx>
diff --git a/extensions/workben/testresource.cxx b/extensions/workben/testresource.cxx
index b0b13b3..10dfc17 100644
--- a/extensions/workben/testresource.cxx
+++ b/extensions/workben/testresource.cxx
@@ -33,7 +33,7 @@
#include <rtl/ustring.hxx>
#include <vos/dynload.hxx>
-#include <vos/diagnose.hxx>
+#include <osl/diagnose.h>
#include <usr/services.hxx>
#include <vcl/svapp.hxx>
@@ -78,14 +78,14 @@ void MyApp::Main()
Args.getArray()[0].setINT32( 1000 );
BOOL b = xResLoader->invoke( L"hasString", Args, OutPos, OutArgs ).getBOOL();
- VOS_ENSHURE( b, "hasString" );
+ OSL_ENSURE( b, "hasString" );
UString aStr = xResLoader->invoke( L"getString", Args, OutPos, OutArgs ).getString();
- VOS_ENSHURE( aStr == L"Hello", "getString" );
+ OSL_ENSURE( aStr == L"Hello", "getString" );
Args.getArray()[0].setINT32( 1001 );
b = xResLoader->invoke( L"hasString", Args, OutPos, OutArgs ).getBOOL();
- VOS_ENSHURE( !b, "!hasString" );
+ OSL_ENSURE( !b, "!hasString" );
xReg->revokeImplementation( aDllName, XSimpleRegistryRef() );
}
diff --git a/package/source/manifest/UnoRegister.cxx b/package/source/manifest/UnoRegister.cxx
index b9ceb0b..1833ed9 100644
--- a/package/source/manifest/UnoRegister.cxx
+++ b/package/source/manifest/UnoRegister.cxx
@@ -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 <ManifestWriter.hxx>
#include <cppuhelper/factory.hxx>
#include <com/sun/star/registry/XRegistryKey.hpp>
-#include <vos/diagnose.hxx>
+#include <osl/diagnose.h>
#include <ZipPackage.hxx>
#include <zipfileaccess.hxx>
@@ -88,7 +88,7 @@ extern "C" void SAL_CALL component_getImplementationEnvironment(
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
-
+
/**
* This function creates an implementation section in the registry and another subkey
* for each supported service.
@@ -98,21 +98,21 @@ extern "C" void SAL_CALL component_getImplementationEnvironment(
extern "C" sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistryKey )
{
return pRegistryKey &&
- writeInfo (pRegistryKey,
+ writeInfo (pRegistryKey,
ManifestReader::static_getImplementationName(),
ManifestReader::static_getSupportedServiceNames() ) &&
- writeInfo (pRegistryKey,
+ writeInfo (pRegistryKey,
ManifestWriter::static_getImplementationName(),
ManifestWriter::static_getSupportedServiceNames() ) &&
- writeInfo (pRegistryKey,
+ writeInfo (pRegistryKey,
ZipPackage::static_getImplementationName(),
ZipPackage::static_getSupportedServiceNames() ) &&
- writeInfo (pRegistryKey,
+ writeInfo (pRegistryKey,
OZipFileAccess::impl_staticGetImplementationName(),
- OZipFileAccess::impl_staticGetSupportedServiceNames() );
+ OZipFileAccess::impl_staticGetSupportedServiceNames() );
-}
+}
/**
diff --git a/package/source/zipapi/ZipOutputStream.cxx b/package/source/zipapi/ZipOutputStream.cxx
index fb9777f..7ab4d76 100644
--- a/package/source/zipapi/ZipOutputStream.cxx
+++ b/package/source/zipapi/ZipOutputStream.cxx
@@ -133,7 +133,6 @@ void SAL_CALL ZipOutputStream::closeEntry( )
}
if (pEntry->nCompressedSize != aDeflater.getTotalOut())
{
- //VOS_DEBUG_ONLY("Invalid entry compressed size");
// Different compression strategies make the merit of this
// test somewhat dubious
pEntry->nCompressedSize = aDeflater.getTotalOut();
diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx
index cb2224b..9ea20b0 100644
--- a/package/source/zippackage/ZipPackage.cxx
+++ b/package/source/zippackage/ZipPackage.cxx
@@ -985,7 +985,7 @@ void ZipPackage::WriteMimetypeMagicFile( ZipOutputStream& aZipOut )
}
catch ( ::com::sun::star::io::IOException & r )
{
- VOS_ENSURE( 0, "Error adding mimetype to the ZipOutputStream" );
+ OSL_ENSURE( 0, "Error adding mimetype to the ZipOutputStream" );
throw WrappedTargetException(
OUString( RTL_CONSTASCII_USTRINGPARAM ( OSL_LOG_PREFIX "Error adding mimetype to the ZipOutputStream!" ) ),
static_cast < OWeakObject * > ( this ),
@@ -1030,7 +1030,7 @@ void ZipPackage::WriteManifest( ZipOutputStream& aZipOut, const vector< Sequence
}
else
{
- VOS_ENSURE ( 0, "Couldn't get a ManifestWriter!" );
+ OSL_ENSURE ( 0, "Couldn't get a ManifestWriter!" );
IOException aException;
throw WrappedTargetException(
OUString( RTL_CONSTASCII_USTRINGPARAM ( OSL_LOG_PREFIX "Couldn't get a ManifestWriter!" ) ),
diff --git a/package/source/zippackage/ZipPackageFolder.cxx b/package/source/zippackage/ZipPackageFolder.cxx
index b353504..e4668d1 100644
--- a/package/source/zippackage/ZipPackageFolder.cxx
+++ b/package/source/zippackage/ZipPackageFolder.cxx
@@ -35,7 +35,7 @@
#include <ZipPackageFolderEnumeration.hxx>
#include <com/sun/star/packages/zip/ZipConstants.hpp>
#include <com/sun/star/embed/StorageFormats.hpp>
-#include <vos/diagnose.hxx>
+#include <osl/diagnose.h>
#include <osl/time.h>
#include <rtl/digest.h>
#include <ContentInfo.hxx>
@@ -335,12 +335,12 @@ void ZipPackageFolder::saveContents(OUString &rPath, std::vector < Sequence < Pr
}
catch ( ZipException& )
{
- VOS_ENSURE( 0, "Error writing ZipOutputStream" );
+ OSL_ENSURE( 0, "Error writing ZipOutputStream" );
bWritingFailed = sal_True;
}
catch ( IOException& )
{
- VOS_ENSURE( 0, "Error writing ZipOutputStream" );
+ OSL_ENSURE( 0, "Error writing ZipOutputStream" );
bWritingFailed = sal_True;
}
}
@@ -431,7 +431,7 @@ void ZipPackageFolder::saveContents(OUString &rPath, std::vector < Sequence < Pr
if ( !xStream.is() )
{
- VOS_ENSURE( 0, "ZipPackageStream didn't have a stream associated with it, skipping!" );
+ OSL_ENSURE( 0, "ZipPackageStream didn't have a stream associated with it, skipping!" );
bWritingFailed = sal_True;
continue;
}
@@ -484,14 +484,14 @@ void ZipPackageFolder::saveContents(OUString &rPath, std::vector < Sequence < Pr
}
else
{
- VOS_ENSURE( 0, "The package component requires that every stream either be FROM a package or it must support XSeekable!" );
+ OSL_ENSURE( 0, "The package component requires that every stream either be FROM a package or it must support XSeekable!" );
continue;
}
}
}
catch ( Exception& )
{
- VOS_ENSURE( 0, "The stream provided to the package component has problems!" );
+ OSL_ENSURE( 0, "The stream provided to the package component has problems!" );
bWritingFailed = sal_True;
continue;
}
@@ -554,7 +554,7 @@ void ZipPackageFolder::saveContents(OUString &rPath, std::vector < Sequence < Pr
if ( !xStream.is() )
{
// Make sure that we actually _got_ a new one !
- VOS_ENSURE( 0, "ZipPackageStream didn't have a stream associated with it, skipping!" );
+ OSL_ENSURE( 0, "ZipPackageStream didn't have a stream associated with it, skipping!" );
continue;
}
}
@@ -582,12 +582,12 @@ void ZipPackageFolder::saveContents(OUString &rPath, std::vector < Sequence < Pr
}
catch ( ZipException& )
{
- VOS_ENSURE( 0, "Error writing ZipOutputStream" );
+ OSL_ENSURE( 0, "Error writing ZipOutputStream" );
bWritingFailed = sal_True;
}
catch ( IOException& )
{
- VOS_ENSURE( 0, "Error writing ZipOutputStream" );
+ OSL_ENSURE( 0, "Error writing ZipOutputStream" );
bWritingFailed = sal_True;
}
}
@@ -609,7 +609,7 @@ void ZipPackageFolder::saveContents(OUString &rPath, std::vector < Sequence < Pr
if ( !xStream.is() )
{
// Make sure that we actually _got_ a new one !
- VOS_ENSURE( 0, "ZipPackageStream didn't have a stream associated with it, skipping!" );
+ OSL_ENSURE( 0, "ZipPackageStream didn't have a stream associated with it, skipping!" );
continue;
}
}
@@ -639,12 +639,12 @@ void ZipPackageFolder::saveContents(OUString &rPath, std::vector < Sequence < Pr
}
catch ( ZipException& )
{
- VOS_ENSURE( 0, "Error writing ZipOutputStream" );
+ OSL_ENSURE( 0, "Error writing ZipOutputStream" );
bWritingFailed = sal_True;
}
catch ( IOException& )
{
- VOS_ENSURE( 0, "Error writing ZipOutputStream" );
+ OSL_ENSURE( 0, "Error writing ZipOutputStream" );
bWritingFailed = sal_True;
}
@@ -723,7 +723,7 @@ void ZipPackageFolder::releaseUpwardRef( void )
}
clearParent();
- VOS_ENSURE ( m_refCount == 1, "Ref-count is not 1!" );
+ OSL_ENSURE ( m_refCount == 1, "Ref-count is not 1!" );
#endif
}
diff --git a/package/source/zippackage/ZipPackageStream.cxx b/package/source/zippackage/ZipPackageStream.cxx
index ce97ba5..a774847 100644
--- a/package/source/zippackage/ZipPackageStream.cxx
+++ b/package/source/zippackage/ZipPackageStream.cxx
@@ -40,7 +40,7 @@
#include <ZipPackage.hxx>
#include <ZipFile.hxx>
#include <EncryptedDataHeader.hxx>
-#include <vos/diagnose.hxx>
+#include <osl/diagnose.h>
#include "wrapstreamforshare.hxx"
#include <comphelper/seekableinput.hxx>
@@ -410,12 +410,12 @@ Reference< io::XInputStream > SAL_CALL ZipPackageStream::getRawData()
}
catch (ZipException &)//rException)
{
- VOS_ENSURE( 0, "ZipException thrown");//rException.Message);
+ OSL_ENSURE( 0, "ZipException thrown");//rException.Message);
return Reference < io::XInputStream > ();
}
catch (Exception &)
{
- VOS_ENSURE( 0, "Exception is thrown during stream wrapping!\n");
+ OSL_ENSURE( 0, "Exception is thrown during stream wrapping!\n");
return Reference < io::XInputStream > ();
}
}
@@ -441,12 +441,12 @@ Reference< io::XInputStream > SAL_CALL ZipPackageStream::getInputStream( )
}
catch (ZipException &)//rException)
{
- VOS_ENSURE( 0,"ZipException thrown");//rException.Message);
+ OSL_ENSURE( 0,"ZipException thrown");//rException.Message);
return Reference < io::XInputStream > ();
}
catch (Exception &)
{
- VOS_ENSURE( 0, "Exception is thrown during stream wrapping!\n");
+ OSL_ENSURE( 0, "Exception is thrown during stream wrapping!\n");
return Reference < io::XInputStream > ();
}
}
More information about the Libreoffice-commits
mailing list