Skip to content

C
core
Kaydet (Commit) ab1e64bb authored tarafından Jens-Heiner Rechtien's avatar Jens-Heiner Rechtien
Dosyalara gözat
Seçenekler

INTEGRATION: CWS warnings01 (1.64.34); FILE MERGED 

2006/05/17 12:01:14 sb 1.64.34.3: #i65438# Fixed previous changes.
2005/11/17 15:19:28 pl 1.64.34.2: #i55991# removed warnings
2005/11/03 17:47:12 cl 1.64.34.1: warning free code changes for unxlngi6
üst 4bb597cf
Show whitespace changes
Inline Side-by-side
Showing with 69 additions and 82 deletions
xmloff/source/text/txtflde.cxx
Dosyayı görüntüle @ ab1e64bb
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
* *
* $RCSfile: txtflde.cxx,v $ * $RCSfile: txtflde.cxx,v $
* *
* $Revision: 1.64 $ * $Revision: 1.65 $
* *
* last change: $Author: rt $ $Date: 2005-09-09 15:29:31 $ * last change: $Author: hr $ $Date: 2006-06-19 18:49:20 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
...@@ -392,89 +392,79 @@ XMLTextFieldExport::XMLTextFieldExport( SvXMLExport& rExp, ...@@ -392,89 +392,79 @@ XMLTextFieldExport::XMLTextFieldExport( SvXMLExport& rExp,
XMLPropertyState* pCombinedCharState) XMLPropertyState* pCombinedCharState)
: rExport(rExp), : rExport(rExp),
pUsedMasters(NULL), pUsedMasters(NULL),
sServicePrefix( sServicePrefix(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextField.")),
RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextField.")), sFieldMasterPrefix(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.FieldMaster.")),
sFieldMasterPrefix( sPresentationServicePrefix(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.TextField.")),
RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.FieldMaster.")),
sPresentationServicePrefix( sPropertyAdjust(RTL_CONSTASCII_USTRINGPARAM("Adjust")),
RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.TextField.")), sPropertyAuthor(RTL_CONSTASCII_USTRINGPARAM("Author")),
sPropertyChapterFormat(RTL_CONSTASCII_USTRINGPARAM("ChapterFormat")),
sPropertyChapterNumberingLevel(RTL_CONSTASCII_USTRINGPARAM("ChapterNumberingLevel")),
sPropertyCharStyleNames(RTL_CONSTASCII_USTRINGPARAM("CharStyleNames")),
sPropertyCondition(RTL_CONSTASCII_USTRINGPARAM("Condition")),
sPropertyContent(RTL_CONSTASCII_USTRINGPARAM("Content")), sPropertyContent(RTL_CONSTASCII_USTRINGPARAM("Content")),
sPropertyIsFixed(RTL_CONSTASCII_USTRINGPARAM("IsFixed")),
sPropertyFullName(RTL_CONSTASCII_USTRINGPARAM("FullName")),
sPropertyFieldSubType(RTL_CONSTASCII_USTRINGPARAM("UserDataType")),
sPropertyHint(RTL_CONSTASCII_USTRINGPARAM("Hint")),
sPropertyPlaceholder(RTL_CONSTASCII_USTRINGPARAM("PlaceHolder")),
sPropertyPlaceholderType(RTL_CONSTASCII_USTRINGPARAM("PlaceHolderType")),
sPropertyIsVisible(RTL_CONSTASCII_USTRINGPARAM("IsVisible")),
sPropertyIsShowFormula(RTL_CONSTASCII_USTRINGPARAM("IsShowFormula")),
sPropertyIsInput(RTL_CONSTASCII_USTRINGPARAM("Input")),
sPropertyIsExpression(RTL_CONSTASCII_USTRINGPARAM("IsExpression")),
sPropertyNumberFormat(RTL_CONSTASCII_USTRINGPARAM("NumberFormat")),
sPropertyVariableName(RTL_CONSTASCII_USTRINGPARAM("VariableName")),
sPropertySubType(RTL_CONSTASCII_USTRINGPARAM("SubType")),
sPropertyName(RTL_CONSTASCII_USTRINGPARAM("Name")),
sPropertyVariableSubType(RTL_CONSTASCII_USTRINGPARAM("VariableSubtype")),
sPropertyValue(RTL_CONSTASCII_USTRINGPARAM("Value")),
sPropertyChapterNumberingLevel(
RTL_CONSTASCII_USTRINGPARAM("ChapterNumberingLevel")),
sPropertyNumberingSeparator(
RTL_CONSTASCII_USTRINGPARAM("NumberingSeparator")),
sPropertyNumberingType(
RTL_CONSTASCII_USTRINGPARAM("NumberingType")),
sPropertyDateTimeValue(RTL_CONSTASCII_USTRINGPARAM("DateTimeValue")),
sPropertyUserText(RTL_CONSTASCII_USTRINGPARAM("UserText")),
sPropertyOffset(RTL_CONSTASCII_USTRINGPARAM("Offset")),
sPropertyDataBaseName(RTL_CONSTASCII_USTRINGPARAM("DataBaseName")), sPropertyDataBaseName(RTL_CONSTASCII_USTRINGPARAM("DataBaseName")),
sPropertyDataBaseURL(RTL_CONSTASCII_USTRINGPARAM("DataBaseURL")), sPropertyDataBaseURL(RTL_CONSTASCII_USTRINGPARAM("DataBaseURL")),
sPropertyDataTableName(RTL_CONSTASCII_USTRINGPARAM("DataTableName")),
sPropertyCondition(RTL_CONSTASCII_USTRINGPARAM("Condition")),
sPropertySetNumber(RTL_CONSTASCII_USTRINGPARAM("SetNumber")),
sPropertyIsDataBaseFormat(RTL_CONSTASCII_USTRINGPARAM("DataBaseFormat")),
sPropertyDataColumnName(RTL_CONSTASCII_USTRINGPARAM("DataColumnName")), sPropertyDataColumnName(RTL_CONSTASCII_USTRINGPARAM("DataColumnName")),
sPropertyDataCommandType(RTL_CONSTASCII_USTRINGPARAM("DataCommandType")),
sPropertyDataTableName(RTL_CONSTASCII_USTRINGPARAM("DataTableName")),
sPropertyDate(RTL_CONSTASCII_USTRINGPARAM("Date")),
sPropertyDateTime(RTL_CONSTASCII_USTRINGPARAM("DateTime")), sPropertyDateTime(RTL_CONSTASCII_USTRINGPARAM("DateTime")),
sPropertyTrueContent(RTL_CONSTASCII_USTRINGPARAM("TrueContent")), sPropertyDateTimeValue(RTL_CONSTASCII_USTRINGPARAM("DateTimeValue")),
sPropertyDDECommandElement(RTL_CONSTASCII_USTRINGPARAM("DDECommandElement")),
sPropertyDDECommandFile(RTL_CONSTASCII_USTRINGPARAM("DDECommandFile")),
sPropertyDDECommandType(RTL_CONSTASCII_USTRINGPARAM("DDECommandType")),
sPropertyDependentTextFields(RTL_CONSTASCII_USTRINGPARAM("DependentTextFields")),
sPropertyFalseContent(RTL_CONSTASCII_USTRINGPARAM("FalseContent")), sPropertyFalseContent(RTL_CONSTASCII_USTRINGPARAM("FalseContent")),
sPropertyRevision(RTL_CONSTASCII_USTRINGPARAM("Revision")), sPropertyFields(RTL_CONSTASCII_USTRINGPARAM("Fields")),
sPropertyFieldSubType(RTL_CONSTASCII_USTRINGPARAM("UserDataType")),
sPropertyFileFormat(RTL_CONSTASCII_USTRINGPARAM("FileFormat")), sPropertyFileFormat(RTL_CONSTASCII_USTRINGPARAM("FileFormat")),
sPropertyChapterFormat(RTL_CONSTASCII_USTRINGPARAM("ChapterFormat")), sPropertyFullName(RTL_CONSTASCII_USTRINGPARAM("FullName")),
sPropertyLevel(RTL_CONSTASCII_USTRINGPARAM("Level")), sPropertyHint(RTL_CONSTASCII_USTRINGPARAM("Hint")),
sPropertyInstanceName(RTL_CONSTASCII_USTRINGPARAM("InstanceName")),
sPropertyIsAutomaticUpdate(RTL_CONSTASCII_USTRINGPARAM("IsAutomaticUpdate")),
sPropertyIsConditionTrue(RTL_CONSTASCII_USTRINGPARAM("IsConditionTrue")),
sPropertyIsDataBaseFormat(RTL_CONSTASCII_USTRINGPARAM("DataBaseFormat")),
sPropertyIsDate(RTL_CONSTASCII_USTRINGPARAM("IsDate")), sPropertyIsDate(RTL_CONSTASCII_USTRINGPARAM("IsDate")),
sPropertyAdjust(RTL_CONSTASCII_USTRINGPARAM("Adjust")), sPropertyIsExpression(RTL_CONSTASCII_USTRINGPARAM("IsExpression")),
sPropertyOn(RTL_CONSTASCII_USTRINGPARAM("On")), sPropertyIsFixed(RTL_CONSTASCII_USTRINGPARAM("IsFixed")),
sPropertyIsFixedLanguage(RTL_CONSTASCII_USTRINGPARAM("IsFixedLanguage")),
sPropertyIsHidden(RTL_CONSTASCII_USTRINGPARAM("IsHidden")),
sPropertyIsInput(RTL_CONSTASCII_USTRINGPARAM("Input")),
sPropertyIsShowFormula(RTL_CONSTASCII_USTRINGPARAM("IsShowFormula")),
sPropertyIsVisible(RTL_CONSTASCII_USTRINGPARAM("IsVisible")),
sPropertyItems(RTL_CONSTASCII_USTRINGPARAM("Items")),
sPropertyLevel(RTL_CONSTASCII_USTRINGPARAM("Level")),
sPropertyMacro(RTL_CONSTASCII_USTRINGPARAM("Macro")), sPropertyMacro(RTL_CONSTASCII_USTRINGPARAM("Macro")),
sPropertyReferenceFieldPart( sPropertyMeasureKind(RTL_CONSTASCII_USTRINGPARAM("Kind")),
RTL_CONSTASCII_USTRINGPARAM("ReferenceFieldPart")), sPropertyName(RTL_CONSTASCII_USTRINGPARAM("Name")),
sPropertyReferenceFieldType( sPropertyNumberFormat(RTL_CONSTASCII_USTRINGPARAM("NumberFormat")),
RTL_CONSTASCII_USTRINGPARAM("ReferenceFieldType")), sPropertyNumberingSeparator(RTL_CONSTASCII_USTRINGPARAM("NumberingSeparator")),
sPropertyReferenceFieldSource( sPropertyNumberingType(RTL_CONSTASCII_USTRINGPARAM("NumberingType")),
RTL_CONSTASCII_USTRINGPARAM("ReferenceFieldSource")), sPropertyOffset(RTL_CONSTASCII_USTRINGPARAM("Offset")),
sPropertyOn(RTL_CONSTASCII_USTRINGPARAM("On")),
sPropertyPlaceholder(RTL_CONSTASCII_USTRINGPARAM("PlaceHolder")),
sPropertyPlaceholderType(RTL_CONSTASCII_USTRINGPARAM("PlaceHolderType")),
sPropertyReferenceFieldPart(RTL_CONSTASCII_USTRINGPARAM("ReferenceFieldPart")),
sPropertyReferenceFieldSource(RTL_CONSTASCII_USTRINGPARAM("ReferenceFieldSource")),
sPropertyReferenceFieldType(RTL_CONSTASCII_USTRINGPARAM("ReferenceFieldType")),
sPropertyRevision(RTL_CONSTASCII_USTRINGPARAM("Revision")),
sPropertyScriptType(RTL_CONSTASCII_USTRINGPARAM("ScriptType")),
sPropertySelectedItem(RTL_CONSTASCII_USTRINGPARAM("SelectedItem")),
sPropertySequenceNumber(RTL_CONSTASCII_USTRINGPARAM("SequenceNumber")), sPropertySequenceNumber(RTL_CONSTASCII_USTRINGPARAM("SequenceNumber")),
sPropertySequenceValue(RTL_CONSTASCII_USTRINGPARAM("SequenceValue")), sPropertySequenceValue(RTL_CONSTASCII_USTRINGPARAM("SequenceValue")),
sPropertySetNumber(RTL_CONSTASCII_USTRINGPARAM("SetNumber")),
sPropertySourceName(RTL_CONSTASCII_USTRINGPARAM("SourceName")), sPropertySourceName(RTL_CONSTASCII_USTRINGPARAM("SourceName")),
sPropertyDDECommandType(RTL_CONSTASCII_USTRINGPARAM("DDECommandType")), sPropertySubType(RTL_CONSTASCII_USTRINGPARAM("SubType")),
sPropertyDDECommandFile(RTL_CONSTASCII_USTRINGPARAM("DDECommandFile")),
sPropertyDDECommandElement(
RTL_CONSTASCII_USTRINGPARAM("DDECommandElement")),
sPropertyIsAutomaticUpdate(
RTL_CONSTASCII_USTRINGPARAM("IsAutomaticUpdate")),
sPropertyDependentTextFields(
RTL_CONSTASCII_USTRINGPARAM("DependentTextFields")),
sPropertyURL(RTL_CONSTASCII_USTRINGPARAM("URL")),
sPropertyTargetFrame(RTL_CONSTASCII_USTRINGPARAM("TargetFrame")), sPropertyTargetFrame(RTL_CONSTASCII_USTRINGPARAM("TargetFrame")),
sPropertyFields(RTL_CONSTASCII_USTRINGPARAM("Fields")), sPropertyTrueContent(RTL_CONSTASCII_USTRINGPARAM("TrueContent")),
sPropertyScriptType(RTL_CONSTASCII_USTRINGPARAM("ScriptType")), sPropertyURL(RTL_CONSTASCII_USTRINGPARAM("URL")),
sPropertyURLContent(RTL_CONSTASCII_USTRINGPARAM("URLContent")), sPropertyURLContent(RTL_CONSTASCII_USTRINGPARAM("URLContent")),
sPropertyAuthor(RTL_CONSTASCII_USTRINGPARAM("Author")), sPropertyUserText(RTL_CONSTASCII_USTRINGPARAM("UserText")),
sPropertyDate(RTL_CONSTASCII_USTRINGPARAM("Date")), sPropertyValue(RTL_CONSTASCII_USTRINGPARAM("Value")),
sPropertyMeasureKind(RTL_CONSTASCII_USTRINGPARAM("Kind")), sPropertyVariableName(RTL_CONSTASCII_USTRINGPARAM("VariableName")),
sPropertyInstanceName(RTL_CONSTASCII_USTRINGPARAM("InstanceName")), sPropertyVariableSubType(RTL_CONSTASCII_USTRINGPARAM("VariableSubtype")),
sPropertyIsHidden(RTL_CONSTASCII_USTRINGPARAM("IsHidden")),
sPropertyIsConditionTrue(RTL_CONSTASCII_USTRINGPARAM("IsConditionTrue")),
sPropertyDataCommandType(RTL_CONSTASCII_USTRINGPARAM("DataCommandType")),
sPropertyIsFixedLanguage(RTL_CONSTASCII_USTRINGPARAM("IsFixedLanguage")),
sPropertyCharStyleNames(RTL_CONSTASCII_USTRINGPARAM("CharStyleNames")),
sPropertyItems(RTL_CONSTASCII_USTRINGPARAM("Items")),
sPropertySelectedItem(RTL_CONSTASCII_USTRINGPARAM("SelectedItem")),
pCombinedCharactersPropertyState(pCombinedCharState) pCombinedCharactersPropertyState(pCombinedCharState)
{ {
SetExportOnlyUsedFieldDeclarations(); SetExportOnlyUsedFieldDeclarations();
...@@ -515,19 +505,19 @@ enum FieldIdEnum XMLTextFieldExport::GetFieldID( ...@@ -515,19 +505,19 @@ enum FieldIdEnum XMLTextFieldExport::GetFieldID(
// if this is not a normal text field, check if its a presentation text field // if this is not a normal text field, check if its a presentation text field
if( sFieldName.getLength() == 0 ) if( sFieldName.getLength() == 0 )
{ {
const OUString* pNames = aServices.getConstArray(); const OUString* pNames2 = aServices.getConstArray();
sal_Int32 nCount = aServices.getLength(); sal_Int32 nCount2 = aServices.getLength();
// search for TextField service name // search for TextField service name
while( nCount-- ) while( nCount2-- )
{ {
if( 0 == pNames->compareTo(sPresentationServicePrefix, sPresentationServicePrefix.getLength())) if( 0 == pNames2->compareTo(sPresentationServicePrefix, sPresentationServicePrefix.getLength()))
{ {
// TextField found => postfix is field type! // TextField found => postfix is field type!
sFieldName = pNames->copy(sPresentationServicePrefix.getLength()); sFieldName = pNames2->copy(sPresentationServicePrefix.getLength());
break; break;
} }
++pNames; ++pNames2;
} }
if( sFieldName.getLength() != 0 ) if( sFieldName.getLength() != 0 )
...@@ -788,13 +778,11 @@ sal_Bool XMLTextFieldExport::IsStringField( ...@@ -788,13 +778,11 @@ sal_Bool XMLTextFieldExport::IsStringField(
// TODO: depends on... ??? // TODO: depends on... ???
// workaround #no-bug#: no data type // workaround #no-bug#: no data type
return 5100 == GetIntProperty(sPropertyNumberFormat, xPropSet); return 5100 == GetIntProperty(sPropertyNumberFormat, xPropSet);
break;
case FIELD_ID_TABLE_FORMULA: case FIELD_ID_TABLE_FORMULA:
// legacy field: always a number field (because it always has // legacy field: always a number field (because it always has
// a number format) // a number format)
return sal_False; return sal_False;
break;
case FIELD_ID_COUNT_PAGES: case FIELD_ID_COUNT_PAGES:
case FIELD_ID_COUNT_PARAGRAPHS: case FIELD_ID_COUNT_PARAGRAPHS:
...@@ -1179,7 +1167,7 @@ void XMLTextFieldExport::ExportField(const Reference<XTextField> & rTextField ) ...@@ -1179,7 +1167,7 @@ void XMLTextFieldExport::ExportField(const Reference<XTextField> & rTextField )
void XMLTextFieldExport::ExportFieldHelper( void XMLTextFieldExport::ExportFieldHelper(
const Reference<XTextField> & rTextField, const Reference<XTextField> & rTextField,
const Reference<XPropertySet> & rPropSet, const Reference<XPropertySet> & rPropSet,
const Reference<XPropertySet> & rRangePropSet, const Reference<XPropertySet> &,
enum FieldIdEnum nToken) enum FieldIdEnum nToken)
{ {
// get property set info (because some attributes are not support // get property set info (because some attributes are not support
...@@ -2412,8 +2400,7 @@ void XMLTextFieldExport::ProcessValueAndType( ...@@ -2412,8 +2400,7 @@ void XMLTextFieldExport::ProcessValueAndType(
// number: value-type=..., value...=..., data-style-name=... // number: value-type=..., value...=..., data-style-name=...
DBG_ASSERT(bExportValueType || ~bExportValue, DBG_ASSERT(bExportValueType || !bExportValue, "value w/o value type not supported!");
"value w/o value type not supported!");
// take care of illegal formats // take care of illegal formats
// (shouldn't happen, but does if document is corrupted) // (shouldn't happen, but does if document is corrupted)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment