summaryrefslogtreecommitdiff
path: root/configmgr
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2008-06-16 13:11:40 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2008-06-16 13:11:40 +0000
commit52445264b77607a591a66a73b798b143b89bade6 (patch)
tree6ae9fbae0875a9d0f900f417027a4e32c2e0bb4c /configmgr
parent69a46fc8d69941d360e00a8bf8046d96f85ba074 (diff)
INTEGRATION: CWS sb88 (1.24.10); FILE MERGED
2008/06/03 15:29:55 sb 1.24.10.1: #i89553 applied patch by cmc
Diffstat (limited to 'configmgr')
-rw-r--r--configmgr/source/xml/typeconverter.cxx38
1 files changed, 1 insertions, 37 deletions
diff --git a/configmgr/source/xml/typeconverter.cxx b/configmgr/source/xml/typeconverter.cxx
index b47acb6a0b..7a17a7800d 100644
--- a/configmgr/source/xml/typeconverter.cxx
+++ b/configmgr/source/xml/typeconverter.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: typeconverter.cxx,v $
- * $Revision: 1.24 $
+ * $Revision: 1.25 $
*
* This file is part of OpenOffice.org.
*
@@ -188,29 +188,6 @@ namespace configmgr
return aRet;
}
- uno::TypeClass toTypeClass(const ::rtl::OUString& _rType)
- {
- uno::TypeClass aRet = uno::TypeClass_VOID;
-
- if (_rType.equalsIgnoreAsciiCase(TYPE_BOOLEAN)) aRet = uno::TypeClass_BOOLEAN;
- else if(_rType.equalsIgnoreAsciiCase(TYPE_SHORT)) aRet = uno::TypeClass_SHORT;
- else if(_rType.equalsIgnoreAsciiCase(TYPE_INT)) aRet = uno::TypeClass_LONG;
- else if(_rType.equalsIgnoreAsciiCase(::rtl::OUString::createFromAscii("integer"))) aRet = uno::TypeClass_LONG;
- else if(_rType.equalsIgnoreAsciiCase(TYPE_LONG)) aRet = uno::TypeClass_HYPER;
- else if(_rType.equalsIgnoreAsciiCase(TYPE_DOUBLE)) aRet = uno::TypeClass_DOUBLE;
- else if(_rType.equalsIgnoreAsciiCase(TYPE_STRING)) aRet = uno::TypeClass_STRING;
- else if(_rType.equalsIgnoreAsciiCase(TYPE_BINARY)) aRet = uno::TypeClass_SEQUENCE;
- else if(_rType.equalsIgnoreAsciiCase(TYPE_ANY)) aRet = uno::TypeClass_ANY;
- else
- {
- ::rtl::OString aStr("Wrong typeclass! ");
- aStr += rtl::OUStringToOString(_rType,RTL_TEXTENCODING_ASCII_US);
- OSL_ENSURE(0,aStr.getStr());
- }
-
- return aRet;
- }
-
// *************************************************************************
uno::Type toType(const ::rtl::OUString& _rType)
{
@@ -339,19 +316,6 @@ namespace configmgr
return aRet;
}
- bool parseTemplateName(::rtl::OUString const& sTypeName, uno::TypeClass& _rType, bool& bList)
- {
- ::rtl::OUString sBasicTypeName;
-
- if (parseTemplateName(sTypeName, sBasicTypeName,bList))
- _rType = toTypeClass(sBasicTypeName);
-
- else
- _rType = uno::TypeClass_VOID;
-
- return _rType != uno::TypeClass_VOID;
- }
-
// *************************************************************************
::rtl::OUString toTemplateName(const ::rtl::OUString& _rBasicTypeName, bool bList)
{