diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-12-01 10:51:35 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-12-02 06:34:36 +0000 |
commit | 06eb947c1651cb623cd60d81b08281de4cc6a86b (patch) | |
tree | ac4583be05d0967149cc06f561b04b9abf587970 /xmloff/inc | |
parent | 9e9f52ad17a73f353b372bcdc9971443b961d39a (diff) |
inline some constant strings in xmloff (part1)
Change-Id: I7971f210ffb30bdd80a1adde2c286b4d092bd053
Reviewed-on: https://gerrit.libreoffice.org/31433
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'xmloff/inc')
-rw-r--r-- | xmloff/inc/txtfldi.hxx | 43 | ||||
-rw-r--r-- | xmloff/inc/txtvfldi.hxx | 39 |
2 files changed, 0 insertions, 82 deletions
diff --git a/xmloff/inc/txtfldi.hxx b/xmloff/inc/txtfldi.hxx index f818242b70d8..cc457c1c5942 100644 --- a/xmloff/inc/txtfldi.hxx +++ b/xmloff/inc/txtfldi.hxx @@ -851,8 +851,6 @@ protected: /** import page variable fields (<text:get-page-variable>) */ class XMLPageVarGetFieldImportContext : public XMLTextFieldImportContext { - const OUString sPropertyNumberingType; - OUString sNumberFormat; OUString sLetterSync; @@ -878,9 +876,6 @@ protected: /** import page variable fields (<text:get-page-variable>) */ class XMLPageVarSetFieldImportContext : public XMLTextFieldImportContext { - const OUString sPropertyOn; - const OUString sPropertyOffset; - sal_Int16 nAdjust; bool bActive; @@ -904,10 +899,6 @@ protected: /** import macro fields (<text:execute-macro>) */ class XMLMacroFieldImportContext : public XMLTextFieldImportContext { - const OUString sPropertyHint; - const OUString sPropertyMacroName; - const OUString sPropertyScriptURL; - OUString sDescription; SvXMLImportContextRef xEventContext; @@ -941,11 +932,6 @@ protected: /** import reference fields (<text:reference-get>) */ class XMLReferenceFieldImportContext : public XMLTextFieldImportContext { - const OUString sPropertyReferenceFieldPart; - const OUString sPropertyReferenceFieldSource; - const OUString sPropertySourceName; - const OUString sPropertyCurrentPresentation; - OUString sName; sal_uInt16 nElementToken; sal_Int16 nSource; @@ -996,12 +982,6 @@ public: /** import dde field declaration (<text:dde-connection-decl>) */ class XMLDdeFieldDeclImportContext : public SvXMLImportContext { - const OUString sPropertyIsAutomaticUpdate; - const OUString sPropertyName; - const OUString sPropertyDDECommandType; - const OUString sPropertyDDECommandFile; - const OUString sPropertyDDECommandElement; - const SvXMLTokenMap& rTokenMap; public: @@ -1086,10 +1066,6 @@ public: /** import hyperlinks as URL fields (Calc, Impress, Draw) (<office:a>) */ class XMLUrlFieldImportContext : public XMLTextFieldImportContext { - const OUString sPropertyURL; - const OUString sPropertyTargetFrame; - const OUString sPropertyRepresentation; - OUString sURL; OUString sFrame; bool bFrameOK; @@ -1114,8 +1090,6 @@ protected: /** import bibliography info fields (<text:bibliography-mark>) */ class XMLBibliographyFieldImportContext : public XMLTextFieldImportContext { - const OUString sPropertyFields; - ::std::vector< css::beans::PropertyValue> aValues; public: @@ -1144,13 +1118,6 @@ protected: /** Import an annotation field (<text:annotation>) */ class XMLAnnotationImportContext : public XMLTextFieldImportContext { - const OUString sPropertyAuthor; - const OUString sPropertyInitials; - const OUString sPropertyContent; - const OUString sPropertyDate; - const OUString sPropertyTextRange; - const OUString sPropertyName; - OUStringBuffer aAuthorBuffer; OUStringBuffer aInitialsBuffer; OUString aName; @@ -1190,10 +1157,6 @@ protected: /** Import a script field (<text:script>) */ class XMLScriptImportContext : public XMLTextFieldImportContext { - const OUString sPropertyScriptType; - const OUString sPropertyURLContent; - const OUString sPropertyContent; - OUString sContent; OUString sScriptType; @@ -1251,12 +1214,6 @@ class XMLDropDownFieldImportContext : public XMLTextFieldImportContext bool bHelpOK; bool bHintOK; - const OUString sPropertyItems; - const OUString sPropertySelectedItem; - const OUString sPropertyName; - const OUString sPropertyHelp; - const OUString sPropertyToolTip; - public: XMLDropDownFieldImportContext(SvXMLImport& rImport, diff --git a/xmloff/inc/txtvfldi.hxx b/xmloff/inc/txtvfldi.hxx index ba7f6335f59c..c7a8dcd4b1ae 100644 --- a/xmloff/inc/txtvfldi.hxx +++ b/xmloff/inc/txtvfldi.hxx @@ -33,12 +33,6 @@ /** helper class: parses value-type and associated value attributes */ class XMLValueImportHelper final { - - const OUString sPropertyContent; - const OUString sPropertyValue; - const OUString sPropertyNumberFormat; - const OUString sPropertyIsFixedLanguage; - SvXMLImport& rImport; XMLTextImportHelper& rHelper; @@ -116,15 +110,6 @@ public: */ class XMLVarFieldImportContext : public XMLTextFieldImportContext { -protected: - const OUString sPropertyContent; - const OUString sPropertyHint; - const OUString sPropertyHelp; - const OUString sPropertyTooltip; - const OUString sPropertyIsVisible; - const OUString sPropertyIsDisplayFormula; - const OUString sPropertyCurrentPresentation; - private: OUString sName; /// name attribute OUString sFormula; /// formula attribute @@ -214,11 +199,8 @@ protected: /** import expression fields (<text:expression>) */ class XMLExpressionFieldImportContext : public XMLVarFieldImportContext { - const OUString sPropertySubType; - public: - XMLExpressionFieldImportContext( SvXMLImport& rImport, /// XML Import XMLTextImportHelper& rHlp, /// Text import helper @@ -298,11 +280,8 @@ protected: /** import variable set fields (<text:variable-set>) */ class XMLVariableSetFieldImportContext : public XMLSetVarFieldImportContext { - const OUString sPropertySubType; - public: - XMLVariableSetFieldImportContext( SvXMLImport& rImport, /// XML Import XMLTextImportHelper& rHlp, /// Text import helper @@ -319,9 +298,6 @@ protected: /** variable input fields (<text:variable-input>) */ class XMLVariableInputFieldImportContext : public XMLSetVarFieldImportContext { - const OUString sPropertySubType; - const OUString sPropertyIsInput; - public: @@ -374,8 +350,6 @@ public: /** sequence fields (<text:sequence>) */ class XMLSequenceFieldImportContext : public XMLSetVarFieldImportContext { - const OUString sPropertyNumberFormat; - const OUString sPropertySequenceValue; OUString sNumFormat; OUString sNumFormatSync; OUString sRefName; @@ -434,11 +408,6 @@ public: */ class XMLVariableDeclImportContext : public SvXMLImportContext { - const OUString sPropertySubType; - const OUString sPropertyNumberingLevel; - const OUString sPropertyNumberingSeparator; - const OUString sPropertyIsExpression; - OUString sName; XMLValueImportHelper aValueHelper; sal_Int8 nNumLevel; @@ -467,9 +436,6 @@ public: /** import table formula fields (deprecated; for Writer 2.0 compatibility) */ class XMLTableFormulaImportContext : public XMLTextFieldImportContext { - const OUString sPropertyIsShowFormula; - const OUString sPropertyCurrentPresentation; - XMLValueImportHelper aValueHelper; bool bIsShowFormula; @@ -499,11 +465,6 @@ protected: /** import database display fields (<text:database-display>) */ class XMLDatabaseDisplayImportContext : public XMLDatabaseFieldImportContext { - const OUString sPropertyColumnName; - const OUString sPropertyDatabaseFormat; - const OUString sPropertyCurrentPresentation; - const OUString sPropertyIsVisible; - XMLValueImportHelper aValueHelper; OUString sColumnName; |