summaryrefslogtreecommitdiff
path: root/stoc/source/registry_tdprovider
diff options
context:
space:
mode:
Diffstat (limited to 'stoc/source/registry_tdprovider')
-rw-r--r--stoc/source/registry_tdprovider/base.hxx12
-rw-r--r--stoc/source/registry_tdprovider/functiondescription.cxx3
-rw-r--r--stoc/source/registry_tdprovider/functiondescription.hxx3
-rw-r--r--stoc/source/registry_tdprovider/methoddescription.cxx3
-rw-r--r--stoc/source/registry_tdprovider/methoddescription.hxx3
-rw-r--r--stoc/source/registry_tdprovider/rdbtdp_tdenumeration.cxx43
-rw-r--r--stoc/source/registry_tdprovider/rdbtdp_tdenumeration.hxx2
-rw-r--r--stoc/source/registry_tdprovider/structtypedescription.cxx3
-rw-r--r--stoc/source/registry_tdprovider/structtypedescription.hxx3
-rw-r--r--stoc/source/registry_tdprovider/td.cxx2
-rw-r--r--stoc/source/registry_tdprovider/tdcomp.cxx2
-rw-r--r--stoc/source/registry_tdprovider/tdconsts.cxx3
-rw-r--r--stoc/source/registry_tdprovider/tdef.cxx2
-rw-r--r--stoc/source/registry_tdprovider/tdenum.cxx2
-rw-r--r--stoc/source/registry_tdprovider/tdiface.cxx3
-rw-r--r--stoc/source/registry_tdprovider/tdmodule.cxx6
-rw-r--r--stoc/source/registry_tdprovider/tdprop.cxx3
-rw-r--r--stoc/source/registry_tdprovider/tdprovider.cxx37
-rw-r--r--stoc/source/registry_tdprovider/tdservice.cxx6
-rw-r--r--stoc/source/registry_tdprovider/tdsingleton.cxx3
20 files changed, 83 insertions, 61 deletions
diff --git a/stoc/source/registry_tdprovider/base.hxx b/stoc/source/registry_tdprovider/base.hxx
index eea026718..a2669ccfc 100644
--- a/stoc/source/registry_tdprovider/base.hxx
+++ b/stoc/source/registry_tdprovider/base.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,9 +34,7 @@
#include <cppuhelper/weak.hxx>
#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/implbase2.hxx>
-#ifndef _CPPUHELPER_IMPLEMENTATIONENTRY_HXX_
#include <cppuhelper/implementationentry.hxx>
-#endif
#include "registry/refltype.hxx"
@@ -63,7 +62,6 @@
#include <com/sun/star/registry/XRegistryKey.hpp>
using namespace std;
-using namespace rtl;
using namespace osl;
using namespace cppu;
using namespace com::sun::star::uno;
@@ -71,6 +69,8 @@ using namespace com::sun::star::lang;
using namespace com::sun::star::container;
using namespace com::sun::star::reflection;
+using ::rtl::OUString;
+
//--------------------------------------------------------------------------------------------------
extern rtl_StandardModuleCount g_moduleCount;
@@ -135,7 +135,7 @@ inline sal_Int32 getRTValueAsInt32( const RTConstValue & rVal )
case RT_TYPE_UINT32:
return rVal.m_value.aULong;
default:
- OSL_ENSURE( sal_False, "### unexpected value type!" );
+ OSL_FAIL( "### unexpected value type!" );
return 0;
}
}
@@ -170,7 +170,7 @@ inline Any getRTValue( const RTConstValue & rVal )
return Any( &aStr, ::getCppuType( (const OUString *)0 ) );
}
default:
- OSL_ENSURE( sal_False, "### unexpected RTValue!" );
+ OSL_FAIL( "### unexpected RTValue!" );
return Any();
}
}
@@ -645,3 +645,5 @@ public:
}
#endif /* _STOC_RDBTDP_BASE_HXX */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/registry_tdprovider/functiondescription.cxx b/stoc/source/registry_tdprovider/functiondescription.cxx
index e1af7e51f..99a070f77 100644
--- a/stoc/source/registry_tdprovider/functiondescription.cxx
+++ b/stoc/source/registry_tdprovider/functiondescription.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -113,3 +114,5 @@ typereg::Reader FunctionDescription::getReader() const {
return typereg::Reader(
m_bytes.getConstArray(), m_bytes.getLength(), false, TYPEREG_VERSION_1);
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/registry_tdprovider/functiondescription.hxx b/stoc/source/registry_tdprovider/functiondescription.hxx
index 7b4c4d434..6b7d890af 100644
--- a/stoc/source/registry_tdprovider/functiondescription.hxx
+++ b/stoc/source/registry_tdprovider/functiondescription.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -84,3 +85,5 @@ private:
} }
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/registry_tdprovider/methoddescription.cxx b/stoc/source/registry_tdprovider/methoddescription.cxx
index 59c1684f2..9852d86d7 100644
--- a/stoc/source/registry_tdprovider/methoddescription.cxx
+++ b/stoc/source/registry_tdprovider/methoddescription.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -142,3 +143,5 @@ MethodDescription::getParameters() const {
}
return m_parameters;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/registry_tdprovider/methoddescription.hxx b/stoc/source/registry_tdprovider/methoddescription.hxx
index 90076865d..f8f7c9d50 100644
--- a/stoc/source/registry_tdprovider/methoddescription.hxx
+++ b/stoc/source/registry_tdprovider/methoddescription.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -80,3 +81,5 @@ private:
} }
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/registry_tdprovider/rdbtdp_tdenumeration.cxx b/stoc/source/registry_tdprovider/rdbtdp_tdenumeration.cxx
index 8dc2e948e..da20d04e2 100644
--- a/stoc/source/registry_tdprovider/rdbtdp_tdenumeration.cxx
+++ b/stoc/source/registry_tdprovider/rdbtdp_tdenumeration.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -152,8 +153,7 @@ TypeDescriptionEnumerationImpl::createInstance(
}
else
{
- OSL_ENSURE(
- sal_False,
+ OSL_FAIL(
"TypeDescriptionEnumerationImpl::createInstance "
"- Invalid registry key!" );
}
@@ -163,12 +163,11 @@ TypeDescriptionEnumerationImpl::createInstance(
{
// openKey, getValueType, getBinaryValue
- OSL_ENSURE( sal_False,
- "TypeDescriptionEnumerationImpl::createInstance "
+ OSL_FAIL( "TypeDescriptionEnumerationImpl::createInstance "
"- Caught InvalidRegistryException!" );
}
- it++;
+ ++it;
}
if ( !bOpenKeySucceeded )
@@ -217,8 +216,7 @@ TypeDescriptionEnumerationImpl::~TypeDescriptionEnumerationImpl()
catch (...)
{
// No exceptions from dtors, please!
- OSL_ENSURE( sal_False,
- "TypeDescriptionEnumerationImpl::~TypeDescriptionEnumerationImpl "
+ OSL_FAIL( "TypeDescriptionEnumerationImpl::~TypeDescriptionEnumerationImpl "
"- Caught exception!" );
}
@@ -237,12 +235,11 @@ TypeDescriptionEnumerationImpl::~TypeDescriptionEnumerationImpl()
catch (Exception &)
{
// No exceptions from dtors, please!
- OSL_ENSURE( sal_False,
- "TypeDescriptionEnumerationImpl::~TypeDescriptionEnumerationImpl "
+ OSL_FAIL( "TypeDescriptionEnumerationImpl::~TypeDescriptionEnumerationImpl "
"- Caught exception!" );
}
- it++;
+ ++it;
}
g_moduleCount.modCnt.release( &g_moduleCount.modCnt );
@@ -289,8 +286,8 @@ TypeDescriptionEnumerationImpl::nextTypeDescription()
return xTD;
throw container::NoSuchElementException(
- rtl::OUString::createFromAscii(
- "No further elements in enumeration!" ),
+ rtl::OUString(
+ RTL_CONSTASCII_USTRINGPARAM("No further elements in enumeration!") ),
static_cast< cppu::OWeakObject * >( this ) );
}
@@ -434,8 +431,7 @@ bool TypeDescriptionEnumerationImpl::queryMore()
}
else
{
- OSL_ENSURE( sal_False,
- "TypeDescriptionEnumerationImpl::queryMore "
+ OSL_FAIL( "TypeDescriptionEnumerationImpl::queryMore "
"- Invalid registry key!" );
}
@@ -444,8 +440,7 @@ bool TypeDescriptionEnumerationImpl::queryMore()
{
// getValueType, getBinaryValue
- OSL_ENSURE( sal_False,
- "TypeDescriptionEnumerationImpl::queryMore "
+ OSL_FAIL( "TypeDescriptionEnumerationImpl::queryMore "
"- Caught InvalidRegistryException!" );
// Don't stop iterating!
@@ -464,8 +459,7 @@ bool TypeDescriptionEnumerationImpl::queryMore()
}
catch ( registry::InvalidRegistryException const & )
{
- OSL_ENSURE( sal_False,
- "TypeDescriptionEnumerationImpl::queryMore "
+ OSL_FAIL( "TypeDescriptionEnumerationImpl::queryMore "
"- Caught InvalidRegistryException!" );
}
}
@@ -531,8 +525,7 @@ bool TypeDescriptionEnumerationImpl::queryMore()
{
// getBinaryValue
- OSL_ENSURE( sal_False,
- "TypeDescriptionEnumerationImpl::queryMore "
+ OSL_FAIL( "TypeDescriptionEnumerationImpl::queryMore "
"- Caught InvalidRegistryException!" );
}
}
@@ -550,8 +543,7 @@ bool TypeDescriptionEnumerationImpl::queryMore()
}
catch ( registry::InvalidRegistryException const & )
{
- OSL_ENSURE( sal_False,
- "TypeDescriptionEnumerationImpl::queryMore "
+ OSL_FAIL( "TypeDescriptionEnumerationImpl::queryMore "
"- Caught InvalidRegistryException!" );
}
*/
@@ -613,8 +605,7 @@ TypeDescriptionEnumerationImpl::queryNext()
}
else
{
- OSL_ENSURE( sal_False,
- "TypeDescriptionEnumerationImpl::queryNext "
+ OSL_FAIL( "TypeDescriptionEnumerationImpl::queryNext "
"- Invalid registry key!" );
}
}
@@ -623,8 +614,7 @@ TypeDescriptionEnumerationImpl::queryNext()
{
// getValueType, getBinaryValue
- OSL_ENSURE( sal_False,
- "TypeDescriptionEnumerationImpl::queryNext "
+ OSL_FAIL( "TypeDescriptionEnumerationImpl::queryNext "
"- Caught InvalidRegistryException!" );
}
@@ -641,3 +631,4 @@ TypeDescriptionEnumerationImpl::queryNext()
} // namespace stoc_rdbtdp
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/registry_tdprovider/rdbtdp_tdenumeration.hxx b/stoc/source/registry_tdprovider/rdbtdp_tdenumeration.hxx
index 5c522eed0..1d489ba7e 100644
--- a/stoc/source/registry_tdprovider/rdbtdp_tdenumeration.hxx
+++ b/stoc/source/registry_tdprovider/rdbtdp_tdenumeration.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -114,3 +115,4 @@ private:
#endif /* _STOC_RDBTDP_TDENUMERATION_HXX */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/registry_tdprovider/structtypedescription.cxx b/stoc/source/registry_tdprovider/structtypedescription.cxx
index 74d228f00..b553ca472 100644
--- a/stoc/source/registry_tdprovider/structtypedescription.cxx
+++ b/stoc/source/registry_tdprovider/structtypedescription.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -137,3 +138,5 @@ sal_Bool StructTypeDescription::isPublished() throw (css::uno::RuntimeException)
{
return m_base->isPublished();
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/registry_tdprovider/structtypedescription.hxx b/stoc/source/registry_tdprovider/structtypedescription.hxx
index 92a5015ca..a0c91bd81 100644
--- a/stoc/source/registry_tdprovider/structtypedescription.hxx
+++ b/stoc/source/registry_tdprovider/structtypedescription.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -103,3 +104,5 @@ private:
} }
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/registry_tdprovider/td.cxx b/stoc/source/registry_tdprovider/td.cxx
index e03c05377..1adb6d6d7 100644
--- a/stoc/source/registry_tdprovider/td.cxx
+++ b/stoc/source/registry_tdprovider/td.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -78,3 +79,4 @@ OUString TypeDescriptionImpl::getName()
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/registry_tdprovider/tdcomp.cxx b/stoc/source/registry_tdprovider/tdcomp.cxx
index 77aae3764..f0b8cec96 100644
--- a/stoc/source/registry_tdprovider/tdcomp.cxx
+++ b/stoc/source/registry_tdprovider/tdcomp.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -185,3 +186,4 @@ Sequence< OUString > CompoundTypeDescriptionImpl::getMemberNames()
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/registry_tdprovider/tdconsts.cxx b/stoc/source/registry_tdprovider/tdconsts.cxx
index 16aaf0c72..55eb066c6 100644
--- a/stoc/source/registry_tdprovider/tdconsts.cxx
+++ b/stoc/source/registry_tdprovider/tdconsts.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -108,3 +109,5 @@ ConstantsTypeDescriptionImpl::getConstants()
}
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/registry_tdprovider/tdef.cxx b/stoc/source/registry_tdprovider/tdef.cxx
index af2e1822a..3b537e547 100644
--- a/stoc/source/registry_tdprovider/tdef.cxx
+++ b/stoc/source/registry_tdprovider/tdef.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -80,3 +81,4 @@ Reference< XTypeDescription > TypedefTypeDescriptionImpl::getReferencedType()
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/registry_tdprovider/tdenum.cxx b/stoc/source/registry_tdprovider/tdenum.cxx
index 6c2f101d3..87500fee3 100644
--- a/stoc/source/registry_tdprovider/tdenum.cxx
+++ b/stoc/source/registry_tdprovider/tdenum.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -133,3 +134,4 @@ Sequence< sal_Int32 > EnumTypeDescriptionImpl::getEnumValues()
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/registry_tdprovider/tdiface.cxx b/stoc/source/registry_tdprovider/tdiface.cxx
index cb2b8256c..3a9d89173 100644
--- a/stoc/source/registry_tdprovider/tdiface.cxx
+++ b/stoc/source/registry_tdprovider/tdiface.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -583,3 +584,5 @@ InterfaceTypeDescriptionImpl::getOptionalBaseTypes() throw (RuntimeException) {
}
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/registry_tdprovider/tdmodule.cxx b/stoc/source/registry_tdprovider/tdmodule.cxx
index 674279db9..434c07783 100644
--- a/stoc/source/registry_tdprovider/tdmodule.cxx
+++ b/stoc/source/registry_tdprovider/tdmodule.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -98,8 +99,7 @@ ModuleTypeDescriptionImpl::getMembers()
}
catch ( NoSuchElementException const & )
{
- OSL_ENSURE( sal_False,
- "ModuleTypeDescriptionImpl::getMembers - "
+ OSL_FAIL( "ModuleTypeDescriptionImpl::getMembers - "
" Caught NoSuchElementException!" );
}
}
@@ -124,3 +124,5 @@ ModuleTypeDescriptionImpl::getMembers()
}
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/registry_tdprovider/tdprop.cxx b/stoc/source/registry_tdprovider/tdprop.cxx
index 53a502a1b..c5bea55c1 100644
--- a/stoc/source/registry_tdprovider/tdprop.cxx
+++ b/stoc/source/registry_tdprovider/tdprop.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -66,3 +67,5 @@ Any SAL_CALL ConstantTypeDescriptionImpl::getConstantValue()
}
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/registry_tdprovider/tdprovider.cxx b/stoc/source/registry_tdprovider/tdprovider.cxx
index 0a3e16753..6c0ef2cc0 100644
--- a/stoc/source/registry_tdprovider/tdprovider.cxx
+++ b/stoc/source/registry_tdprovider/tdprovider.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -67,33 +68,14 @@ namespace stoc_bootstrap
{
uno::Sequence< OUString > rdbtdp_getSupportedServiceNames()
{
- static Sequence < OUString > *pNames = 0;
- if( ! pNames )
- {
- MutexGuard guard( Mutex::getGlobalMutex() );
- if( !pNames )
- {
- static Sequence< OUString > seqNames(1);
- seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME));
- pNames = &seqNames;
- }
- }
- return *pNames;
+ Sequence< OUString > seqNames(1);
+ seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME));
+ return seqNames;
}
OUString rdbtdp_getImplementationName()
{
- static OUString *pImplName = 0;
- if( ! pImplName )
- {
- MutexGuard guard( Mutex::getGlobalMutex() );
- if( ! pImplName )
- {
- static OUString implName( RTL_CONSTASCII_USTRINGPARAM( IMPLNAME ) );
- pImplName = &implName;
- }
- }
- return *pImplName;
+ return OUString(RTL_CONSTASCII_USTRINGPARAM(IMPLNAME));
}
}
@@ -418,8 +400,7 @@ Any ProviderImpl::getByHierarchicalNameImpl( const OUString & rName )
}
catch ( InvalidRegistryException const & )
{
- OSL_ENSURE( sal_False,
- "ProviderImpl::getByHierarchicalName "
+ OSL_FAIL( "ProviderImpl::getByHierarchicalName "
"- Caught InvalidRegistryException!" );
// openKey, closeKey, getValueType, getBinaryValue, isValid
@@ -598,11 +579,11 @@ com::sun::star::uno::Reference< XTypeDescription > createTypeDescription(
case RT_TYPE_INVALID:
case RT_TYPE_OBJECT: // deprecated and not used
case RT_TYPE_UNION: // deprecated and not used
- OSL_ENSURE( sal_False, "createTypeDescription - Unsupported Type!" );
+ OSL_FAIL( "createTypeDescription - Unsupported Type!" );
break;
default:
- OSL_ENSURE( sal_False, "createTypeDescription - Unknown Type!" );
+ OSL_FAIL( "createTypeDescription - Unknown Type!" );
break;
}
@@ -627,3 +608,5 @@ com::sun::star::uno::Reference< XInterface > SAL_CALL ProviderImpl_create(
return com::sun::star::uno::Reference< XInterface >( *new stoc_rdbtdp::ProviderImpl( xContext ) );
}
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/registry_tdprovider/tdservice.cxx b/stoc/source/registry_tdprovider/tdservice.cxx
index a455589b5..031f1a2cf 100644
--- a/stoc/source/registry_tdprovider/tdservice.cxx
+++ b/stoc/source/registry_tdprovider/tdservice.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -40,6 +41,7 @@
#include <memory>
using namespace com::sun::star;
+using ::rtl::OUStringBuffer;
namespace {
@@ -541,7 +543,7 @@ void ServiceTypeDescriptionImpl::getReferences()
case RT_REF_NEEDS:
break;
default:
- OSL_ENSURE( sal_False, "### unsupported reference type!" );
+ OSL_FAIL( "### unsupported reference type!" );
break;
}
}
@@ -563,3 +565,5 @@ void ServiceTypeDescriptionImpl::getReferences()
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/registry_tdprovider/tdsingleton.cxx b/stoc/source/registry_tdprovider/tdsingleton.cxx
index 40044e972..3e70d06b7 100644
--- a/stoc/source/registry_tdprovider/tdsingleton.cxx
+++ b/stoc/source/registry_tdprovider/tdsingleton.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -130,3 +131,5 @@ SingletonTypeDescriptionImpl::getInterface()
}
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */