From 5abc669599001bf888b97c4d3c2715e1fb7523b9 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 20 Apr 2016 10:34:01 +0200 Subject: new plugin stylepolice check for local variables which follow our member field naming convention, which is highly confusing Change-Id: Idacedf7145d09843e96a584237b385f7662eea10 --- xmloff/source/xforms/xformsapi.cxx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'xmloff/source/xforms') diff --git a/xmloff/source/xforms/xformsapi.cxx b/xmloff/source/xforms/xformsapi.cxx index 5916051b3a07..17383a4908b9 100644 --- a/xmloff/source/xforms/xformsapi.cxx +++ b/xmloff/source/xforms/xformsapi.cxx @@ -197,14 +197,14 @@ sal_uInt16 xforms_getTypeClass( OUString sLocalName; sal_uInt16 nPrefix = rNamespaceMap.GetKeyByAttrName(rXMLName, &sLocalName); SvXMLTokenMap aMap( aTypes ); - sal_uInt16 mnToken = aMap.Get( nPrefix, sLocalName ); + sal_uInt16 nToken = aMap.Get( nPrefix, sLocalName ); sal_uInt16 nTypeClass = css::xsd::DataTypeClass::STRING; - if( mnToken != XML_TOK_UNKNOWN ) + if( nToken != XML_TOK_UNKNOWN ) { // we found an XSD name: then get the proper API name for it DBG_ASSERT( xRepository.is(), "can't find type without repository"); - switch( mnToken ) + switch( nToken ) { case XML_STRING: nTypeClass = css::xsd::DataTypeClass::STRING; @@ -267,8 +267,8 @@ OUString xforms_getTypeName( OUString sLocalName; sal_uInt16 nPrefix = rNamespaceMap.GetKeyByAttrName(rXMLName, &sLocalName); SvXMLTokenMap aMap( aTypes ); - sal_uInt16 mnToken = aMap.Get( nPrefix, sLocalName ); - return ( mnToken == XML_TOK_UNKNOWN ) + sal_uInt16 nToken = aMap.Get( nPrefix, sLocalName ); + return ( nToken == XML_TOK_UNKNOWN ) ? rXMLName : xforms_getBasicTypeName( xRepository, rNamespaceMap, rXMLName ); } -- cgit