summaryrefslogtreecommitdiff
path: root/configmgr
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2008-06-16 13:05:56 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2008-06-16 13:05:56 +0000
commit9dd8216b0d1ba32887796d9c782c441b0406e620 (patch)
tree61cb89d779b6b308b0b68a73d7514bdc45dcaa39 /configmgr
parentccec939c48e262a3df87acb24befa2e64c4e77b3 (diff)
INTEGRATION: CWS sb88 (1.6.10); FILE MERGED
2008/06/03 15:29:53 sb 1.6.10.1: #i89553 applied patch by cmc
Diffstat (limited to 'configmgr')
-rw-r--r--configmgr/source/treemgr/configexcept.cxx27
1 files changed, 1 insertions, 26 deletions
diff --git a/configmgr/source/treemgr/configexcept.cxx b/configmgr/source/treemgr/configexcept.cxx
index 4d296c6f97..38f7030829 100644
--- a/configmgr/source/treemgr/configexcept.cxx
+++ b/configmgr/source/treemgr/configexcept.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: configexcept.cxx,v $
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
* This file is part of OpenOffice.org.
*
@@ -40,10 +40,6 @@ namespace configmgr
{
//-----------------------------------------------------------------------------
- Exception::Exception()
- : m_sAsciiMessage()
- {
- }
//---------------------------------------------------------------------
Exception::Exception(char const* sAsciiMessage)
: m_sAsciiMessage(sAsciiMessage)
@@ -72,11 +68,6 @@ namespace configmgr
static const char c_sInvalidName[] = "CONFIGURATION: <Invalid Path or Name>";
//-----------------------------------------------------------------------------
- InvalidName::InvalidName(OUString const& sName)
- : Exception( rtl::OString(RTL_CONSTASCII_STRINGPARAM(c_sInvalidName)) )
- , m_sName(sName)
- {
- }
//---------------------------------------------------------------------
InvalidName::InvalidName(OUString const& sName, char const* sAsciiDescription)
@@ -93,11 +84,6 @@ namespace configmgr
//-----------------------------------------------------------------------------
static const char c_sViolation[] = "CONFIGURATION: Update Violates Constraint: ";
- //---------------------------------------------------------------------
- ConstraintViolation::ConstraintViolation()
- : Exception( rtl::OString(RTL_CONSTASCII_STRINGPARAM(c_sViolation)) )
- {
- }
//---------------------------------------------------------------------
ConstraintViolation::ConstraintViolation(char const* sConstraint)
@@ -127,10 +113,6 @@ namespace configmgr
}
//---------------------------------------------------------------------
- TypeMismatch::TypeMismatch()
- : Exception( rtl::OString(RTL_CONSTASCII_STRINGPARAM(c_sTypeMismatch)) )
- {
- }
//---------------------------------------------------------------------
TypeMismatch::TypeMismatch(OUString const& sType1, OUString const& sType2)
@@ -139,13 +121,6 @@ namespace configmgr
{
}
//---------------------------------------------------------------------
-
- TypeMismatch::TypeMismatch(OUString const& sType1)
- : Exception( rtl::OString(RTL_CONSTASCII_STRINGPARAM(c_sTypeMismatch)) )
- , m_sTypes( describe(sType1,OUString()) )
- {
- }
- //---------------------------------------------------------------------
TypeMismatch::TypeMismatch(OUString const& sType1, OUString const& sType2, char const* sAsciiDescription)
: Exception( rtl::OString(RTL_CONSTASCII_STRINGPARAM(c_sTypeMismatch)) += sAsciiDescription)
, m_sTypes( describe(sType1,sType2).concat(OUString::createFromAscii(sAsciiDescription)) )