summaryrefslogtreecommitdiff
path: root/extensions
diff options
context:
space:
mode:
Diffstat (limited to 'extensions')
-rw-r--r--extensions/source/inc/componentmodule.cxx31
-rw-r--r--extensions/source/propctrlr/modulepcr.cxx31
-rw-r--r--extensions/source/resource/resource.cxx6
-rw-r--r--extensions/source/scanner/scnserv.cxx6
-rw-r--r--extensions/source/svg/svguno.cxx6
-rw-r--r--extensions/source/xmlextract/xmxuno.cxx6
6 files changed, 46 insertions, 40 deletions
diff --git a/extensions/source/inc/componentmodule.cxx b/extensions/source/inc/componentmodule.cxx
index b9e56f252543..e6944396d325 100644
--- a/extensions/source/inc/componentmodule.cxx
+++ b/extensions/source/inc/componentmodule.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: componentmodule.cxx,v $
*
- * $Revision: 1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: fs $ $Date: 2001-02-12 07:06:08 $
+ * last change: $Author: jl $ $Date: 2001-03-23 11:50:19 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -214,17 +214,17 @@ namespace COMPMOD_NAMESPACE
{
if (!s_pImplementationNames)
{
- OSL_ENSHURE(!s_pSupportedServices && !s_pCreationFunctionPointers && !s_pFactoryFunctionPointers,
+ OSL_ENSURE(!s_pSupportedServices && !s_pCreationFunctionPointers && !s_pFactoryFunctionPointers,
"OModule::registerComponent : inconsistent state (the pointers (1)) !");
s_pImplementationNames = new Sequence< ::rtl::OUString >;
s_pSupportedServices = new Sequence< Sequence< ::rtl::OUString > >;
s_pCreationFunctionPointers = new Sequence< sal_Int64 >;
s_pFactoryFunctionPointers = new Sequence< sal_Int64 >;
}
- OSL_ENSHURE(s_pImplementationNames && s_pSupportedServices && s_pCreationFunctionPointers && s_pFactoryFunctionPointers,
+ OSL_ENSURE(s_pImplementationNames && s_pSupportedServices && s_pCreationFunctionPointers && s_pFactoryFunctionPointers,
"OModule::registerComponent : inconsistent state (the pointers (2)) !");
- OSL_ENSHURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength())
+ OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength())
&& (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength())
&& (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()),
"OModule::registerComponent : inconsistent state !");
@@ -249,9 +249,9 @@ namespace COMPMOD_NAMESPACE
OSL_ASSERT("OModule::revokeComponent : have no class infos ! Are you sure called this method at the right time ?");
return;
}
- OSL_ENSHURE(s_pImplementationNames && s_pSupportedServices && s_pCreationFunctionPointers && s_pFactoryFunctionPointers,
+ OSL_ENSURE(s_pImplementationNames && s_pSupportedServices && s_pCreationFunctionPointers && s_pFactoryFunctionPointers,
"OModule::revokeComponent : inconsistent state (the pointers) !");
- OSL_ENSHURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength())
+ OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength())
&& (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength())
&& (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()),
"OModule::revokeComponent : inconsistent state !");
@@ -284,16 +284,16 @@ namespace COMPMOD_NAMESPACE
const Reference< XMultiServiceFactory >& /*_rxServiceManager*/,
const Reference< XRegistryKey >& _rxRootKey)
{
- OSL_ENSHURE(_rxRootKey.is(), "OModule::writeComponentInfos : invalid argument !");
+ OSL_ENSURE(_rxRootKey.is(), "OModule::writeComponentInfos : invalid argument !");
if (!s_pImplementationNames)
{
OSL_ASSERT("OModule::writeComponentInfos : have no class infos ! Are you sure called this method at the right time ?");
return sal_True;
}
- OSL_ENSHURE(s_pImplementationNames && s_pSupportedServices && s_pCreationFunctionPointers && s_pFactoryFunctionPointers,
+ OSL_ENSURE(s_pImplementationNames && s_pSupportedServices && s_pCreationFunctionPointers && s_pFactoryFunctionPointers,
"OModule::writeComponentInfos : inconsistent state (the pointers) !");
- OSL_ENSHURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength())
+ OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength())
&& (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength())
&& (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()),
"OModule::writeComponentInfos : inconsistent state !");
@@ -332,17 +332,17 @@ namespace COMPMOD_NAMESPACE
const ::rtl::OUString& _rImplementationName,
const Reference< XMultiServiceFactory >& _rxServiceManager)
{
- OSL_ENSHURE(_rxServiceManager.is(), "OModule::getComponentFactory : invalid argument (service manager) !");
- OSL_ENSHURE(_rImplementationName.getLength(), "OModule::getComponentFactory : invalid argument (implementation name) !");
+ OSL_ENSURE(_rxServiceManager.is(), "OModule::getComponentFactory : invalid argument (service manager) !");
+ OSL_ENSURE(_rImplementationName.getLength(), "OModule::getComponentFactory : invalid argument (implementation name) !");
if (!s_pImplementationNames)
{
OSL_ASSERT("OModule::getComponentFactory : have no class infos ! Are you sure called this method at the right time ?");
return NULL;
}
- OSL_ENSHURE(s_pImplementationNames && s_pSupportedServices && s_pCreationFunctionPointers && s_pFactoryFunctionPointers,
+ OSL_ENSURE(s_pImplementationNames && s_pSupportedServices && s_pCreationFunctionPointers && s_pFactoryFunctionPointers,
"OModule::getComponentFactory : inconsistent state (the pointers) !");
- OSL_ENSHURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength())
+ OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength())
&& (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength())
&& (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()),
"OModule::getComponentFactory : inconsistent state !");
@@ -384,6 +384,9 @@ namespace COMPMOD_NAMESPACE
/*************************************************************************
* history:
* $Log: not supported by cvs2svn $
+ * Revision 1.1 2001/02/12 07:06:08 fs
+ * initial checkin - helper class for implementing module-functionality in SFX-less components
+ *
*
* Revision 1.0 30.01.01 15:18:48 fs
************************************************************************/
diff --git a/extensions/source/propctrlr/modulepcr.cxx b/extensions/source/propctrlr/modulepcr.cxx
index 78836d09e211..f94fa9f6b54e 100644
--- a/extensions/source/propctrlr/modulepcr.cxx
+++ b/extensions/source/propctrlr/modulepcr.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: modulepcr.cxx,v $
*
- * $Revision: 1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: fs $ $Date: 2001-01-12 11:29:40 $
+ * last change: $Author: jl $ $Date: 2001-03-23 11:54:38 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -191,17 +191,17 @@ namespace pcr
{
if (!s_pImplementationNames)
{
- OSL_ENSHURE(!s_pSupportedServices && !s_pCreationFunctionPointers && !s_pFactoryFunctionPointers,
+ OSL_ENSURE(!s_pSupportedServices && !s_pCreationFunctionPointers && !s_pFactoryFunctionPointers,
"OModule::registerComponent : inconsistent state (the pointers (1)) !");
s_pImplementationNames = new Sequence< ::rtl::OUString >;
s_pSupportedServices = new Sequence< Sequence< ::rtl::OUString > >;
s_pCreationFunctionPointers = new Sequence< sal_Int64 >;
s_pFactoryFunctionPointers = new Sequence< sal_Int64 >;
}
- OSL_ENSHURE(s_pImplementationNames && s_pSupportedServices && s_pCreationFunctionPointers && s_pFactoryFunctionPointers,
+ OSL_ENSURE(s_pImplementationNames && s_pSupportedServices && s_pCreationFunctionPointers && s_pFactoryFunctionPointers,
"OModule::registerComponent : inconsistent state (the pointers (2)) !");
- OSL_ENSHURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength())
+ OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength())
&& (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength())
&& (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()),
"OModule::registerComponent : inconsistent state !");
@@ -226,9 +226,9 @@ namespace pcr
OSL_ASSERT("OModule::revokeComponent : have no class infos ! Are you sure called this method at the right time ?");
return;
}
- OSL_ENSHURE(s_pImplementationNames && s_pSupportedServices && s_pCreationFunctionPointers && s_pFactoryFunctionPointers,
+ OSL_ENSURE(s_pImplementationNames && s_pSupportedServices && s_pCreationFunctionPointers && s_pFactoryFunctionPointers,
"OModule::revokeComponent : inconsistent state (the pointers) !");
- OSL_ENSHURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength())
+ OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength())
&& (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength())
&& (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()),
"OModule::revokeComponent : inconsistent state !");
@@ -261,16 +261,16 @@ namespace pcr
const Reference< XMultiServiceFactory >& /*_rxServiceManager*/,
const Reference< XRegistryKey >& _rxRootKey)
{
- OSL_ENSHURE(_rxRootKey.is(), "OModule::writeComponentInfos : invalid argument !");
+ OSL_ENSURE(_rxRootKey.is(), "OModule::writeComponentInfos : invalid argument !");
if (!s_pImplementationNames)
{
OSL_ASSERT("OModule::writeComponentInfos : have no class infos ! Are you sure called this method at the right time ?");
return sal_True;
}
- OSL_ENSHURE(s_pImplementationNames && s_pSupportedServices && s_pCreationFunctionPointers && s_pFactoryFunctionPointers,
+ OSL_ENSURE(s_pImplementationNames && s_pSupportedServices && s_pCreationFunctionPointers && s_pFactoryFunctionPointers,
"OModule::writeComponentInfos : inconsistent state (the pointers) !");
- OSL_ENSHURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength())
+ OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength())
&& (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength())
&& (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()),
"OModule::writeComponentInfos : inconsistent state !");
@@ -309,17 +309,17 @@ namespace pcr
const ::rtl::OUString& _rImplementationName,
const Reference< XMultiServiceFactory >& _rxServiceManager)
{
- OSL_ENSHURE(_rxServiceManager.is(), "OModule::getComponentFactory : invalid argument (service manager) !");
- OSL_ENSHURE(_rImplementationName.getLength(), "OModule::getComponentFactory : invalid argument (implementation name) !");
+ OSL_ENSURE(_rxServiceManager.is(), "OModule::getComponentFactory : invalid argument (service manager) !");
+ OSL_ENSURE(_rImplementationName.getLength(), "OModule::getComponentFactory : invalid argument (implementation name) !");
if (!s_pImplementationNames)
{
OSL_ASSERT("OModule::getComponentFactory : have no class infos ! Are you sure called this method at the right time ?");
return NULL;
}
- OSL_ENSHURE(s_pImplementationNames && s_pSupportedServices && s_pCreationFunctionPointers && s_pFactoryFunctionPointers,
+ OSL_ENSURE(s_pImplementationNames && s_pSupportedServices && s_pCreationFunctionPointers && s_pFactoryFunctionPointers,
"OModule::getComponentFactory : inconsistent state (the pointers) !");
- OSL_ENSHURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength())
+ OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength())
&& (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength())
&& (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()),
"OModule::getComponentFactory : inconsistent state !");
@@ -361,6 +361,9 @@ namespace pcr
/*************************************************************************
* history:
* $Log: not supported by cvs2svn $
+ * Revision 1.1 2001/01/12 11:29:40 fs
+ * initial checkin - outsourced the form property browser
+ *
*
* Revision 1.0 08.01.01 12:54:13 fs
************************************************************************/
diff --git a/extensions/source/resource/resource.cxx b/extensions/source/resource/resource.cxx
index 1c4eb79452e5..0ee8da292ac3 100644
--- a/extensions/source/resource/resource.cxx
+++ b/extensions/source/resource/resource.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: resource.cxx,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: hr $ $Date: 2000-09-18 16:16:52 $
+ * last change: $Author: jl $ $Date: 2001-03-23 11:55:07 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -527,7 +527,7 @@ sal_Bool SAL_CALL component_writeInfo( void * /*pServiceManager*/, XRegistryKey
catch (Exception &)
{
// not allowed to throw an exception over the c function.
- //OSL_ENSHURE( sal_False, "Exception cannot register component!" );
+ //OSL_ENSURE( sal_False, "Exception cannot register component!" );
return sal_False;
}
/**** END NEW ****/
diff --git a/extensions/source/scanner/scnserv.cxx b/extensions/source/scanner/scnserv.cxx
index aab55a7bdd43..c8bc585dcc77 100644
--- a/extensions/source/scanner/scnserv.cxx
+++ b/extensions/source/scanner/scnserv.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: scnserv.cxx,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: hr $ $Date: 2000-09-18 16:16:52 $
+ * last change: $Author: jl $ $Date: 2001-03-23 11:55:38 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -103,7 +103,7 @@ extern "C" sal_Bool SAL_CALL component_writeInfo( void* pServiceManager, void* p
}
catch( InvalidRegistryException& )
{
- OSL_ENSHURE( sal_False, "### InvalidRegistryException!" );
+ OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
}
}
diff --git a/extensions/source/svg/svguno.cxx b/extensions/source/svg/svguno.cxx
index b3875a4d0b67..cfd0ddb560b1 100644
--- a/extensions/source/svg/svguno.cxx
+++ b/extensions/source/svg/svguno.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: svguno.cxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: ka $ $Date: 2001-03-22 17:49:17 $
+ * last change: $Author: jl $ $Date: 2001-03-23 11:56:14 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -114,7 +114,7 @@ extern "C" sal_Bool SAL_CALL component_writeInfo( void* pServiceManager, void* p
}
catch( NMSP_REGISTRY::InvalidRegistryException& )
{
- OSL_ENSHURE( sal_False, "### InvalidRegistryException!" );
+ OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
}
}
diff --git a/extensions/source/xmlextract/xmxuno.cxx b/extensions/source/xmlextract/xmxuno.cxx
index fb9bff62b97e..c33b0e811414 100644
--- a/extensions/source/xmlextract/xmxuno.cxx
+++ b/extensions/source/xmlextract/xmxuno.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: xmxuno.cxx,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: hr $ $Date: 2000-09-18 16:16:54 $
+ * last change: $Author: jl $ $Date: 2001-03-23 11:57:37 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -98,7 +98,7 @@ sal_Bool SAL_CALL component_writeInfo(
}
catch (NMSP_REGISTRY::InvalidRegistryException &)
{
- OSL_ENSHURE( sal_False, "### InvalidRegistryException!" );
+ OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
}
}
return sal_False;