INTEGRATION: CWS sb88 (1.5.10); FILE MERGED
2008/06/03 15:29:48 sb 1.5.10.1: #i89553 applied patch by cmc
This commit is contained in:
@@ -7,7 +7,7 @@
|
|||||||
* OpenOffice.org - a multi-platform office productivity suite
|
* OpenOffice.org - a multi-platform office productivity suite
|
||||||
*
|
*
|
||||||
* $RCSfile: configexcept.hxx,v $
|
* $RCSfile: configexcept.hxx,v $
|
||||||
* $Revision: 1.5 $
|
* $Revision: 1.6 $
|
||||||
*
|
*
|
||||||
* This file is part of OpenOffice.org.
|
* This file is part of OpenOffice.org.
|
||||||
*
|
*
|
||||||
@@ -51,7 +51,6 @@ namespace configmgr
|
|||||||
{
|
{
|
||||||
rtl::OString m_sAsciiMessage;
|
rtl::OString m_sAsciiMessage;
|
||||||
public:
|
public:
|
||||||
Exception();
|
|
||||||
Exception(char const* sAsciiMessage);
|
Exception(char const* sAsciiMessage);
|
||||||
Exception(rtl::OString const& sAsciiMessage);
|
Exception(rtl::OString const& sAsciiMessage);
|
||||||
virtual ~Exception() {}
|
virtual ~Exception() {}
|
||||||
@@ -65,7 +64,6 @@ namespace configmgr
|
|||||||
{
|
{
|
||||||
rtl::OUString m_sName;
|
rtl::OUString m_sName;
|
||||||
public:
|
public:
|
||||||
InvalidName(OUString const& sName);
|
|
||||||
InvalidName(OUString const& sName, char const* sAsciiDescription);
|
InvalidName(OUString const& sName, char const* sAsciiDescription);
|
||||||
|
|
||||||
virtual OUString message() const;
|
virtual OUString message() const;
|
||||||
@@ -76,7 +74,6 @@ namespace configmgr
|
|||||||
: public Exception
|
: public Exception
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
ConstraintViolation();
|
|
||||||
ConstraintViolation(char const* sConstraint);
|
ConstraintViolation(char const* sConstraint);
|
||||||
};
|
};
|
||||||
//-------------------------------------------------------------------------
|
//-------------------------------------------------------------------------
|
||||||
@@ -86,8 +83,6 @@ namespace configmgr
|
|||||||
OUString m_sTypes;
|
OUString m_sTypes;
|
||||||
static OUString describe(OUString const& sFoundType, OUString const& sExpectedType);
|
static OUString describe(OUString const& sFoundType, OUString const& sExpectedType);
|
||||||
public:
|
public:
|
||||||
TypeMismatch();
|
|
||||||
TypeMismatch(OUString const& sFoundType);
|
|
||||||
TypeMismatch(OUString const& sFoundType, OUString const& sExpectedType);
|
TypeMismatch(OUString const& sFoundType, OUString const& sExpectedType);
|
||||||
TypeMismatch(OUString const& sFoundType, OUString const& sExpectedType, char const* sAsciiDescription);
|
TypeMismatch(OUString const& sFoundType, OUString const& sExpectedType, char const* sAsciiDescription);
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user