summaryrefslogtreecommitdiff
path: root/configmgr/source
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2006-06-19 22:36:01 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2006-06-19 22:36:01 +0000
commit070712251c3f0599e2ed8e84b8a1b201ab9785c2 (patch)
treeb34cf41c12cf18596465db93692548a076ae17b2 /configmgr/source
parentfa2e595a2d964243c9e7a1b015287b6168fcaeab (diff)
INTEGRATION: CWS warnings01 (1.11.4); FILE MERGED
2006/05/23 23:00:14 sb 1.11.4.3: RESYNC: (1.11-1.12); FILE MERGED 2006/02/14 10:17:45 cd 1.11.4.2: #i55991# Fix warnings for ms c++ compiler 2005/11/01 12:47:45 cd 1.11.4.1: #i53898# Warning free code for sun solaris compiler
Diffstat (limited to 'configmgr/source')
-rw-r--r--configmgr/source/xml/elementparser.cxx7
1 files changed, 4 insertions, 3 deletions
diff --git a/configmgr/source/xml/elementparser.cxx b/configmgr/source/xml/elementparser.cxx
index 3210009376d6..4d35509817f5 100644
--- a/configmgr/source/xml/elementparser.cxx
+++ b/configmgr/source/xml/elementparser.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: elementparser.cxx,v $
*
- * $Revision: 1.12 $
+ * $Revision: 1.13 $
*
- * last change: $Author: hr $ $Date: 2006-04-19 14:01:18 $
+ * last change: $Author: hr $ $Date: 2006-06-19 23:36:01 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -110,6 +110,7 @@ ElementInfo ElementParser::parseElementInfo(OUString const& _sTag, SaxAttributeL
ElementType::Enum ElementParser::getNodeType(OUString const& _sElementName, SaxAttributeList const& _xAttribs) const
{
+ { (void)_xAttribs; }
OSL_PRECOND( _xAttribs.is(), "ERROR: NULL Attribute list");
// todo: make this use a table, if necessary
@@ -491,7 +492,7 @@ uno::Type ElementParser::getPropertyValueType(SaxAttributeList const& xAttribs)
}
else
{
- OUString sPrefix = matchNsPrefix(sTypeName,NS_PREFIX_OOR) ? NS_PREFIX_OOR : NS_PREFIX_XS;
+ OUString sPrefix = matchNsPrefix(sTypeName,NS_PREFIX_OOR) ? OUString( NS_PREFIX_OOR ) : OUString( NS_PREFIX_XS );
OUString sBasicName = stripTypeName( mLogger, sTypeName, sPrefix );