diff options
Diffstat (limited to 'xmloff/source/text/txtvfldi.cxx')
| -rw-r--r-- | xmloff/source/text/txtvfldi.cxx | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/xmloff/source/text/txtvfldi.cxx b/xmloff/source/text/txtvfldi.cxx index 76641e2dc3..4fa51a086d 100644 --- a/xmloff/source/text/txtvfldi.cxx +++ b/xmloff/source/text/txtvfldi.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -342,7 +343,7 @@ void XMLSetVarFieldImportContext::EndElement() { // create field/Service Reference<XPropertySet> xPropSet; - if (CreateField(xPropSet, OUString::createFromAscii(sAPI_textfield_prefix) + GetServiceName())) + if (CreateField(xPropSet, OUString(RTL_CONSTASCII_USTRINGPARAM(sAPI_textfield_prefix)) + GetServiceName())) { Reference<XDependentTextField> xDepTextField(xPropSet, UNO_QUERY); if (xDepTextField.is()) @@ -994,7 +995,7 @@ sal_Bool XMLVariableDeclImportContext::FindFieldMaster( aAny = xMaster->getPropertyValue( // sPropertySubType - OUString::createFromAscii(sAPI_sub_type) + OUString(RTL_CONSTASCII_USTRINGPARAM(sAPI_sub_type)) ); sal_Int16 nType = 0; aAny >>= nType; @@ -1071,7 +1072,7 @@ sal_Bool XMLVariableDeclImportContext::FindFieldMaster( aAny <<= sName; xMaster->setPropertyValue( // sPropertyName - OUString::createFromAscii(sAPI_name) + OUString(RTL_CONSTASCII_USTRINGPARAM(sAPI_name)) , aAny); if (eVarType != VarTypeUserField) { @@ -1082,7 +1083,7 @@ sal_Bool XMLVariableDeclImportContext::FindFieldMaster( SetVariableType::SEQUENCE); xMaster->setPropertyValue( // sPropertySubType - OUString::createFromAscii(sAPI_sub_type) + OUString(RTL_CONSTASCII_USTRINGPARAM(sAPI_sub_type)) , aAny); } // else : user field: no subtype @@ -1249,7 +1250,7 @@ enum ValueType XML_VALUE_TYPE_BOOLEAN }; -static SvXMLEnumMapEntry __READONLY_DATA aValueTypeMap[] = +static SvXMLEnumMapEntry const aValueTypeMap[] = { { XML_FLOAT, XML_VALUE_TYPE_FLOAT }, { XML_CURRENCY, XML_VALUE_TYPE_CURRENCY }, @@ -1373,7 +1374,7 @@ void XMLValueImportHelper::ProcessAttribute( case XML_TOK_TEXTFIELD_BOOL_VALUE: { - sal_Bool bTmp; + bool bTmp; sal_Bool bRet = SvXMLUnitConverter::convertBool(bTmp,sAttrValue); if (bRet) { bFloatValueOK = sal_True; @@ -1472,3 +1473,4 @@ void XMLValueImportHelper::PrepareField( } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |