diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 22:35:47 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 22:35:47 +0000 |
| commit | 2e8be024748b8d3c64d141c016a2d3f83508cce4 (patch) | |
| tree | 475d13f40661254f9ea53c97f7d92d373d7354c0 /configmgr | |
| parent | 4d8496dc4e89b807446babf54fdff2d9613d3359 (diff) | |
INTEGRATION: CWS warnings01 (1.12.4); FILE MERGED
2006/05/23 22:59:25 sb 1.12.4.3: RESYNC: (1.12-1.13); FILE MERGED
2006/02/14 10:17:44 cd 1.12.4.2: #i55991# Fix warnings for ms c++ compiler
2005/11/01 12:47:44 cd 1.12.4.1: #i53898# Warning free code for sun solaris compiler
Diffstat (limited to 'configmgr')
| -rw-r--r-- | configmgr/source/xml/elementformatter.cxx | 39 |
1 files changed, 20 insertions, 19 deletions
diff --git a/configmgr/source/xml/elementformatter.cxx b/configmgr/source/xml/elementformatter.cxx index 7af23871a6..10599d29f4 100644 --- a/configmgr/source/xml/elementformatter.cxx +++ b/configmgr/source/xml/elementformatter.cxx @@ -4,9 +4,9 @@ * * $RCSfile: elementformatter.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: hr $ $Date: 2006-04-19 14:00:52 $ + * last change: $Author: hr $ $Date: 2006-06-19 23:35:47 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -219,7 +219,7 @@ void ElementFormatter::addOperation(Operation::Enum _eOp) } // ----------------------------------------------------------------------------- -void ElementFormatter::addInstanceType(OUString const & _aElementType, OUString const & _aElementTypeModule) +void ElementFormatter::addInstanceType(OUString const & /*_aElementType*/, OUString const & /*_aElementTypeModule*/) { } // ----------------------------------------------------------------------------- @@ -254,7 +254,8 @@ void ElementFormatter::addPropertyValueType(uno::Type const& _aType) uno::TypeClass aSimpleTypeClass = aSimpleType.getTypeClass(); OUString aSimpleTypeName = toXmlTypeName(aSimpleTypeClass); - OUString sNsPrefix = (bList || aSimpleTypeClass == uno::TypeClass_ANY) ? NS_PREFIX_OOR : NS_PREFIX_XS; + OUString sNsPrefix = (bList || aSimpleTypeClass == uno::TypeClass_ANY) ? + OUString( NS_PREFIX_OOR ) : OUString( NS_PREFIX_XS ); rtl::OUStringBuffer aTypeNameBuf(sNsPrefix); @@ -293,22 +294,22 @@ OUString ElementFormatter::getElementTag() const { switch (m_aElementType) { - case ElementType::schema: return TAG_SCHEMA; - case ElementType::layer: return TAG_LAYER; + case ElementType::schema: return OUString( TAG_SCHEMA ); + case ElementType::layer: return OUString( TAG_LAYER ); - case ElementType::component: return TAG_COMPONENT; - case ElementType::templates: return TAG_TEMPLATES; - - case ElementType::property: return TAG_PROP; - case ElementType::node: return TAG_NODE; - case ElementType::group: return TAG_GROUP; - case ElementType::set: return TAG_SET; - - case ElementType::import: return TAG_IMPORT; - case ElementType::instance: return TAG_INSTANCE; - case ElementType::item_type: return TAG_ITEMTYPE; - case ElementType::value: return TAG_VALUE; - case ElementType::uses: return TAG_USES; + case ElementType::component: return OUString( TAG_COMPONENT ); + case ElementType::templates: return OUString( TAG_TEMPLATES ); + + case ElementType::property: return OUString( TAG_PROP ); + case ElementType::node: return OUString( TAG_NODE ); + case ElementType::group: return OUString( TAG_GROUP ); + case ElementType::set: return OUString( TAG_SET ); + + case ElementType::import: return OUString( TAG_IMPORT ); + case ElementType::instance: return OUString( TAG_INSTANCE ); + case ElementType::item_type: return OUString( TAG_ITEMTYPE ); + case ElementType::value: return OUString( TAG_VALUE ); + case ElementType::uses: return OUString( TAG_USES ); case ElementType::unknown: OSL_ENSURE(false, "ElementFormatter: Trying to get Tag for 'unknown' element type"); |