summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--UnoControls/source/base/multiplexer.cxx20
-rw-r--r--UnoControls/source/controls/framecontrol.cxx6
-rw-r--r--extensions/inc/pch/precompiled_extensions.hxx2
-rw-r--r--extensions/source/ole/unoobjw.cxx2
-rw-r--r--extensions/source/plugin/base/multiplx.cxx6
-rw-r--r--extensions/workben/pythonautotest.cxx2
-rw-r--r--extensions/workben/pythontest.cxx2
-rw-r--r--extensions/workben/testcomponent.cxx2
-rw-r--r--extensions/workben/testresource.cxx8
-rw-r--r--package/source/manifest/UnoRegister.cxx2
-rw-r--r--package/source/zipapi/ZipOutputStream.cxx1
-rw-r--r--package/source/zippackage/ZipPackage.cxx4
-rw-r--r--package/source/zippackage/ZipPackageFolder.cxx26
-rw-r--r--package/source/zippackage/ZipPackageStream.cxx10
14 files changed, 39 insertions, 54 deletions
diff --git a/UnoControls/source/base/multiplexer.cxx b/UnoControls/source/base/multiplexer.cxx
index 0c1ded49694e..f93eb8b67bc2 100644
--- a/UnoControls/source/base/multiplexer.cxx
+++ b/UnoControls/source/base/multiplexer.cxx
@@ -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< XWind
}
else
{
- VOS_ENSHURE( sal_False, "unknown listener" );
+ OSL_ENSURE( sal_False, "unknown listener" );
}
}
@@ -570,7 +556,7 @@ void OMRCListenerMultiplexerHelper::impl_unadviseFromPeer( const Reference< X
}
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 2ae0e27dc56c..1c0c83848453 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 nHan
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 676418c6729f..b2316046daa7 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 5452a95129ff..873ae55bf96a 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 1957a9c19115..50c47e6797b9 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 eb5a52470bcc..b355c70239f2 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 34a86ef00194..14806e90a57b 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 1d1bc1579e5b..d77926c212df 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 d073d30ad590..16ab7d558ea4 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 71f106236c23..1833ed97a3c7 100644
--- a/package/source/manifest/UnoRegister.cxx
+++ b/package/source/manifest/UnoRegister.cxx
@@ -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>
diff --git a/package/source/zipapi/ZipOutputStream.cxx b/package/source/zipapi/ZipOutputStream.cxx
index 16457ec12493..5ba637e58896 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 9ba26e0100c5..2bab50217fd9 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 f0c4a11d22f4..147c4d0a2903 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 6343607c8711..d824c5ca3484 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 > ();
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-23 14:12:59 +0000