diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-10-15 15:58:56 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-10-15 15:58:56 +0200 |
commit | ad9498f8b888f7851a8612b8d654a2bc89005925 (patch) | |
tree | ff7e98ce301121fdddf44f2fc8cb42bd2b1fac4f /xmloff | |
parent | eea16cb3e65a4308caddb7618d31a76ca259dbb1 (diff) |
More -Werror,-Wunused-private-field
...detected with a modified trunk Clang with
> Index: lib/Sema/SemaDeclCXX.cpp
> ===================================================================
> --- lib/Sema/SemaDeclCXX.cpp (revision 219190)
> +++ lib/Sema/SemaDeclCXX.cpp (working copy)
> @@ -1917,9 +1917,10 @@
> const Type *T = FD.getType()->getBaseElementTypeUnsafe();
> // FIXME: Destruction of ObjC lifetime types has side-effects.
> if (const CXXRecordDecl *RD = T->getAsCXXRecordDecl())
> - return !RD->isCompleteDefinition() ||
> - !RD->hasTrivialDefaultConstructor() ||
> - !RD->hasTrivialDestructor();
> + return !RD->hasAttr<WarnUnusedAttr>() &&
> + (!RD->isCompleteDefinition() ||
> + !RD->hasTrivialDefaultConstructor() ||
> + !RD->hasTrivialDestructor());
> return false;
> }
>
> @@ -3517,9 +3518,11 @@
> bool addFieldInitializer(CXXCtorInitializer *Init) {
> AllToInit.push_back(Init);
>
> +#if 0
> // Check whether this initializer makes the field "used".
> if (Init->getInit()->HasSideEffects(S.Context))
> S.UnusedPrivateFields.remove(Init->getAnyMember());
> +#endif
>
> return false;
> }
to warn about members of SAL_WARN_UNUSED-annotated class types, and warn about
initializations with side effects (cf.
<http://lists.cs.uiuc.edu/pipermail/cfe-dev/2014-October/039602.html>
"-Wunused-private-field distracted by side effects").
Change-Id: I3f3181c4eb8180ca28e1fa3dffc9dbe1002c6628
Diffstat (limited to 'xmloff')
28 files changed, 3 insertions, 83 deletions
diff --git a/xmloff/inc/XMLTextColumnsContext.hxx b/xmloff/inc/XMLTextColumnsContext.hxx index 1677eea960d8..9a10ac67a00e 100644 --- a/xmloff/inc/XMLTextColumnsContext.hxx +++ b/xmloff/inc/XMLTextColumnsContext.hxx @@ -35,7 +35,6 @@ class XMLTextColumnsContext :public XMLElementPropertyContext const OUString sSeparatorLineColor; const OUString sSeparatorLineRelativeHeight; const OUString sSeparatorLineVerticalAlignment; - const OUString sIsAutomatic; const OUString sAutomaticDistance; const OUString sSeparatorLineStyle; diff --git a/xmloff/inc/txtflde.hxx b/xmloff/inc/txtflde.hxx index 7dc0a1b8dde0..50614776caa6 100644 --- a/xmloff/inc/txtflde.hxx +++ b/xmloff/inc/txtflde.hxx @@ -462,7 +462,6 @@ private: const OUString sPropertyDataColumnName; const OUString sPropertyDataCommandType; const OUString sPropertyDataTableName; - const OUString sPropertyDate; const OUString sPropertyDateTime; const OUString sPropertyDateTimeValue; const OUString sPropertyDDECommandElement; @@ -490,7 +489,6 @@ private: const OUString sPropertyIsVisible; const OUString sPropertyItems; const OUString sPropertyLevel; - const OUString sPropertyMacro; const OUString sPropertyMeasureKind; const OUString sPropertyName; const OUString sPropertyNumberFormat; @@ -498,12 +496,9 @@ private: const OUString sPropertyNumberingType; const OUString sPropertyOffset; const OUString sPropertyOn; - const OUString sPropertyPlaceholder; const OUString sPropertyPlaceholderType; const OUString sPropertyReferenceFieldPart; const OUString sPropertyReferenceFieldSource; - const OUString sPropertyReferenceFieldType; - const OUString sPropertyRevision; const OUString sPropertyScriptType; const OUString sPropertySelectedItem; const OUString sPropertySequenceNumber; @@ -518,7 +513,6 @@ private: const OUString sPropertyUserText; const OUString sPropertyValue; const OUString sPropertyVariableName; - const OUString sPropertyVariableSubType; const OUString sPropertyHelp; const OUString sPropertyTooltip; const OUString sPropertyTextRange; diff --git a/xmloff/inc/txtfldi.hxx b/xmloff/inc/txtfldi.hxx index 66c2a1d25344..4023aacf2c93 100644 --- a/xmloff/inc/txtfldi.hxx +++ b/xmloff/inc/txtfldi.hxx @@ -110,8 +110,6 @@ enum XMLTextFieldAttrTokens /// abstract class for text field import class XMLTextFieldImportContext : public SvXMLImportContext { - const OUString sIsFixed; - // data members OUStringBuffer sContentBuffer; /// collect character data OUString sContent; /// character data after collection @@ -191,7 +189,6 @@ class XMLSenderFieldImportContext : public XMLTextFieldImportContext sal_Int16 nSubType; /// API subtype for ExtUser field - const OUString sEmpty; /// empty string const OUString sPropertyFixed; const OUString sPropertyFieldSubType; const OUString sPropertyContent; @@ -260,8 +257,6 @@ protected: class XMLPlaceholderFieldImportContext : public XMLTextFieldImportContext { - const OUString sEmpty; /// empty string - const OUString sServiceJumpEdit; const OUString sPropertyPlaceholderType; const OUString sPropertyPlaceholder; const OUString sPropertyHint; @@ -966,7 +961,6 @@ class XMLMacroFieldImportContext : public XMLTextFieldImportContext const OUString sPropertyHint; const OUString sPropertyMacroName; const OUString sPropertyScriptURL; - const OUString sPropertyLibraryName; OUString sDescription; SvXMLImportContextRef xEventContext; diff --git a/xmloff/inc/txtvfldi.hxx b/xmloff/inc/txtvfldi.hxx index c3bf5d14eb2f..c58f5f49846c 100644 --- a/xmloff/inc/txtvfldi.hxx +++ b/xmloff/inc/txtvfldi.hxx @@ -48,7 +48,6 @@ class XMLValueImportHelper const OUString sPropertyContent; const OUString sPropertyValue; - const OUString sPropertyFormula; const OUString sPropertyNumberFormat; const OUString sPropertyIsFixedLanguage; @@ -217,8 +216,6 @@ protected: /** import variable get fields (<text:variable-get>) */ class XMLVariableGetFieldImportContext : public XMLVarFieldImportContext { - const OUString sPropertySubType; - public: TYPEINFO_OVERRIDE(); @@ -423,10 +420,8 @@ public: /** sequence fields (<text:sequence>) */ class XMLSequenceFieldImportContext : public XMLSetVarFieldImportContext { - const OUString sPropertyFormula; const OUString sPropertyNumberFormat; const OUString sPropertySequenceValue; - OUString sFormula; OUString sNumFormat; OUString sNumFormatSync; OUString sRefName; @@ -493,7 +488,6 @@ public: */ class XMLVariableDeclImportContext : public SvXMLImportContext { - const OUString sPropertyName; const OUString sPropertySubType; const OUString sPropertyNumberingLevel; const OUString sPropertyNumberingSeparator; @@ -531,15 +525,11 @@ public: /** import table formula fields (deprecated; for Writer 2.0 compatibility) */ class XMLTableFormulaImportContext : public XMLTextFieldImportContext { - const OUString sPropertyNumberFormat; - const OUString sPropertyContent; const OUString sPropertyIsShowFormula; const OUString sPropertyCurrentPresentation; XMLValueImportHelper aValueHelper; - OUString sFormula; - bool bIsShowFormula; public: diff --git a/xmloff/source/chart/SchXMLChartContext.hxx b/xmloff/source/chart/SchXMLChartContext.hxx index 3a4b075d9677..a68e49a636a7 100644 --- a/xmloff/source/chart/SchXMLChartContext.hxx +++ b/xmloff/source/chart/SchXMLChartContext.hxx @@ -105,7 +105,6 @@ private: ::com::sun::star::chart::ChartDataRowSource meDataRowSource; bool mbIsStockChart; - com::sun::star::uno::Sequence< com::sun::star::chart::ChartSeriesAddress > maSeriesAddresses; OUString msCategoriesAddress; OUString msChartAddress; diff --git a/xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx b/xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx index 3cdafbb52ff0..598d89b89b63 100644 --- a/xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx +++ b/xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx @@ -43,7 +43,6 @@ SchXMLRegressionCurveObjectContext::SchXMLRegressionCurveObjectContext( SvXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName, - const OUString &rSeriesStyleName, std::list< RegressionStyle >& rRegressionStyleList, const css::uno::Reference< css::chart2::XDataSeries >& xSeries, @@ -52,7 +51,6 @@ SchXMLRegressionCurveObjectContext::SchXMLRegressionCurveObjectContext( mrImportHelper( rImpHelper ), mxSeries( xSeries ), maChartSize( rChartSize ), - maSeriesStyleName( rSeriesStyleName), mrRegressionStyleList( rRegressionStyleList ) { } diff --git a/xmloff/source/chart/SchXMLRegressionCurveObjectContext.hxx b/xmloff/source/chart/SchXMLRegressionCurveObjectContext.hxx index f0b3625edd4a..0905b65e33f8 100644 --- a/xmloff/source/chart/SchXMLRegressionCurveObjectContext.hxx +++ b/xmloff/source/chart/SchXMLRegressionCurveObjectContext.hxx @@ -35,7 +35,6 @@ public: SvXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName, - const OUString &rSeriesStyleName, std::list< RegressionStyle >& rRegressionStyleList, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& xSeries, @@ -54,7 +53,6 @@ private: SchXMLImportHelper& mrImportHelper; com::sun::star::uno::Reference<com::sun::star::chart2::XDataSeries > mxSeries; com::sun::star::awt::Size maChartSize; - OUString maSeriesStyleName; std::list< RegressionStyle >& mrRegressionStyleList; }; diff --git a/xmloff/source/chart/SchXMLSeries2Context.cxx b/xmloff/source/chart/SchXMLSeries2Context.cxx index c86ea58a24bc..2c13b80983f2 100644 --- a/xmloff/source/chart/SchXMLSeries2Context.cxx +++ b/xmloff/source/chart/SchXMLSeries2Context.cxx @@ -665,7 +665,7 @@ SvXMLImportContext* SchXMLSeries2Context::CreateChildContext( case XML_TOK_SERIES_REGRESSION_CURVE: pContext = new SchXMLRegressionCurveObjectContext( mrImportHelper, GetImport(), - nPrefix, rLocalName, msAutoStyleName, mrRegressionStyleList, + nPrefix, rLocalName, mrRegressionStyleList, m_xSeries, maChartSize ); break; case XML_TOK_SERIES_ERROR_INDICATOR: diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx index 6df582717ba4..27b2de078f69 100644 --- a/xmloff/source/draw/sdpropls.cxx +++ b/xmloff/source/draw/sdpropls.cxx @@ -1177,9 +1177,6 @@ XMLShapeExportPropertyMapper::XMLShapeExportPropertyMapper( const rtl::Reference : SvXMLExportPropertyMapper( rMapper ) , maNumRuleExp( rExport ) , mbIsInAutoStyles( true ) -, msCDATA( GetXMLToken(XML_CDATA)) -, msTrue( GetXMLToken(XML_TRUE)) -, msFalse( GetXMLToken(XML_FALSE)) { } @@ -1560,8 +1557,7 @@ void XMLShapeExportPropertyMapper::handleElementItem( XMLPageExportPropertyMapper::XMLPageExportPropertyMapper( const rtl::Reference< XMLPropertySetMapper >& rMapper, SvXMLExport& rExport ) : SvXMLExportPropertyMapper( rMapper ), - mrExport( rExport ), - msCDATA( GetXMLToken(XML_CDATA)) + mrExport( rExport ) { } diff --git a/xmloff/source/draw/sdpropls.hxx b/xmloff/source/draw/sdpropls.hxx index 0293eec88952..a60651504d0b 100644 --- a/xmloff/source/draw/sdpropls.hxx +++ b/xmloff/source/draw/sdpropls.hxx @@ -79,10 +79,6 @@ private: SvxXMLNumRuleExport maNumRuleExp; bool mbIsInAutoStyles; - const OUString msCDATA; - const OUString msTrue; - const OUString msFalse; - protected: virtual void ContextFilter( bool bEnableFoFontFamily, @@ -117,10 +113,6 @@ class XMLPageExportPropertyMapper : public SvXMLExportPropertyMapper private: SvXMLExport& mrExport; - const OUString msCDATA; - const OUString msTrue; - const OUString msFalse; - protected: virtual void ContextFilter( bool bEnableFoFontFamily, diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx index 7ae70dcb6cc4..16a7c790131e 100644 --- a/xmloff/source/style/xmlnumi.cxx +++ b/xmloff/source/style/xmlnumi.cxx @@ -1029,7 +1029,6 @@ SvxXMLListStyleContext::SvxXMLListStyleContext( SvXMLImport& rImport, : SvXMLStyleContext( rImport, nPrfx, rLName, xAttrList, bOutl ? XML_STYLE_FAMILY_TEXT_OUTLINE : XML_STYLE_FAMILY_TEXT_LIST ) , sIsPhysical( "IsPhysical" ) , sNumberingRules( "NumberingRules" ) -, sName( "Name" ) , sIsContinuousNumbering( "IsContinuousNumbering" ) , pLevelStyles( 0 ) , nLevels( 0 ) diff --git a/xmloff/source/text/XMLAutoTextEventExport.cxx b/xmloff/source/text/XMLAutoTextEventExport.cxx index fd04f3eab92e..19ee4a6642d6 100644 --- a/xmloff/source/text/XMLAutoTextEventExport.cxx +++ b/xmloff/source/text/XMLAutoTextEventExport.cxx @@ -64,9 +64,6 @@ XMLAutoTextEventExport::XMLAutoTextEventExport( OUString const & implementationName, sal_uInt16 nFlags ) : SvXMLExport(util::MeasureUnit::INCH, xContext, implementationName, XML_AUTO_TEXT, nFlags) -, - sEventType("EventType"), - sNone("None") { } diff --git a/xmloff/source/text/XMLAutoTextEventExport.hxx b/xmloff/source/text/XMLAutoTextEventExport.hxx index ec8eadfdfb09..39cc9a103133 100644 --- a/xmloff/source/text/XMLAutoTextEventExport.hxx +++ b/xmloff/source/text/XMLAutoTextEventExport.hxx @@ -49,10 +49,6 @@ class XMLAutoTextEventExport : public SvXMLExport ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> xEvents; - const OUString sEventType; - const OUString sNone; - - public: XMLAutoTextEventExport( diff --git a/xmloff/source/text/XMLChangedRegionImportContext.hxx b/xmloff/source/text/XMLChangedRegionImportContext.hxx index 772720375c79..96d61eced7ac 100644 --- a/xmloff/source/text/XMLChangedRegionImportContext.hxx +++ b/xmloff/source/text/XMLChangedRegionImportContext.hxx @@ -40,8 +40,6 @@ namespace com { namespace sun { namespace star { */ class XMLChangedRegionImportContext : public SvXMLImportContext { - const OUString sEmpty; - /// if we replace the current XTextCursor/XText by the ones for /// the redline, we remember the old cursor here. ::com::sun::star::uno::Reference< diff --git a/xmloff/source/text/XMLIndexTOCContext.cxx b/xmloff/source/text/XMLIndexTOCContext.cxx index e674dacaec41..a25b23f4ef89 100644 --- a/xmloff/source/text/XMLIndexTOCContext.cxx +++ b/xmloff/source/text/XMLIndexTOCContext.cxx @@ -97,7 +97,6 @@ SvXMLEnumMapEntry const aIndexTypeMap[] = XMLIndexTOCContext::XMLIndexTOCContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName) : SvXMLImportContext(rImport, nPrfx, rLocalName) - , sTitle("Title") , sIsProtected("IsProtected") , sName("Name") , eIndexType(TEXT_INDEX_UNKNOWN) diff --git a/xmloff/source/text/XMLIndexTOCContext.hxx b/xmloff/source/text/XMLIndexTOCContext.hxx index ad84618654dd..509d87536461 100644 --- a/xmloff/source/text/XMLIndexTOCContext.hxx +++ b/xmloff/source/text/XMLIndexTOCContext.hxx @@ -54,7 +54,6 @@ enum IndexTypeEnum */ class XMLIndexTOCContext : public SvXMLImportContext { - const OUString sTitle; const OUString sIsProtected; const OUString sName; diff --git a/xmloff/source/text/XMLIndexTOCSourceContext.hxx b/xmloff/source/text/XMLIndexTOCSourceContext.hxx index ab442f6025f0..e6a79b6d4f03 100644 --- a/xmloff/source/text/XMLIndexTOCSourceContext.hxx +++ b/xmloff/source/text/XMLIndexTOCSourceContext.hxx @@ -37,7 +37,6 @@ class XMLIndexTOCSourceContext : public XMLIndexSourceBaseContext { const OUString sCreateFromMarks; const OUString sLevel; - const OUString sCreateFromChapter; const OUString sCreateFromOutline; const OUString sCreateFromLevelParagraphStyles; diff --git a/xmloff/source/text/XMLRedlineExport.cxx b/xmloff/source/text/XMLRedlineExport.cxx index b220edfdcd47..5aabd59fb25b 100644 --- a/xmloff/source/text/XMLRedlineExport.cxx +++ b/xmloff/source/text/XMLRedlineExport.cxx @@ -73,14 +73,11 @@ XMLRedlineExport::XMLRedlineExport(SvXMLExport& rExp) , sRedlineSuccessorData("RedlineSuccessorData") , sRedlineText("RedlineText") , sRedlineType("RedlineType") -, sStyle("Style") -, sTextTable("TextTable") , sUnknownChange("UnknownChange") , sStartRedline("StartRedline") , sEndRedline("EndRedline") , sRedlineIdentifier("RedlineIdentifier") , sIsInHeaderFooter("IsInHeaderFooter") -, sRedlineProtectionKey("RedlineProtectionKey") , sRecordChanges("RecordChanges") , sMergeLastPara("MergeLastPara") , sChangePrefix("ct") diff --git a/xmloff/source/text/XMLRedlineExport.hxx b/xmloff/source/text/XMLRedlineExport.hxx index c62098a10b45..f0a43958fe65 100644 --- a/xmloff/source/text/XMLRedlineExport.hxx +++ b/xmloff/source/text/XMLRedlineExport.hxx @@ -67,14 +67,11 @@ class XMLRedlineExport const OUString sRedlineSuccessorData; const OUString sRedlineText; const OUString sRedlineType; - const OUString sStyle; - const OUString sTextTable; const OUString sUnknownChange; const OUString sStartRedline; const OUString sEndRedline; const OUString sRedlineIdentifier; const OUString sIsInHeaderFooter; - const OUString sRedlineProtectionKey; const OUString sRecordChanges; const OUString sMergeLastPara; diff --git a/xmloff/source/text/XMLSectionExport.cxx b/xmloff/source/text/XMLSectionExport.cxx index fb5ee6f9003d..67f5308ec10b 100644 --- a/xmloff/source/text/XMLSectionExport.cxx +++ b/xmloff/source/text/XMLSectionExport.cxx @@ -88,7 +88,6 @@ XMLSectionExport::XMLSectionExport( , sCreateFromStarCalc("CreateFromStarCalc") , sCreateFromStarChart("CreateFromStarChart") , sCreateFromStarDraw("CreateFromStarDraw") -, sCreateFromStarImage("CreateFromStarImage") , sCreateFromStarMath("CreateFromStarMath") , sCreateFromTables("CreateFromTables") , sCreateFromTextFrames("CreateFromTextFrames") @@ -107,7 +106,6 @@ XMLSectionExport::XMLSectionExport( , sLinkRegion("LinkRegion") , sMainEntryCharacterStyleName("MainEntryCharacterStyleName") , sParaStyleHeading("ParaStyleHeading") -, sParaStyleLevel("ParaStyleLevel") , sTitle("Title") , sName("Name") , sUseAlphabeticalSeparators("UseAlphabeticalSeparators") diff --git a/xmloff/source/text/XMLSectionExport.hxx b/xmloff/source/text/XMLSectionExport.hxx index 9b4a765b139e..26a0868a71fe 100644 --- a/xmloff/source/text/XMLSectionExport.hxx +++ b/xmloff/source/text/XMLSectionExport.hxx @@ -85,7 +85,6 @@ class XMLSectionExport const OUString sCreateFromStarCalc; const OUString sCreateFromStarChart; const OUString sCreateFromStarDraw; - const OUString sCreateFromStarImage; const OUString sCreateFromStarMath; const OUString sCreateFromTables; const OUString sCreateFromTextFrames; @@ -104,7 +103,6 @@ class XMLSectionExport const OUString sLinkRegion; const OUString sMainEntryCharacterStyleName; const OUString sParaStyleHeading; - const OUString sParaStyleLevel; const OUString sTitle; const OUString sName; const OUString sUseAlphabeticalSeparators; diff --git a/xmloff/source/text/XMLTextColumnsContext.cxx b/xmloff/source/text/XMLTextColumnsContext.cxx index 986b84f71119..a000fc663cc9 100644 --- a/xmloff/source/text/XMLTextColumnsContext.cxx +++ b/xmloff/source/text/XMLTextColumnsContext.cxx @@ -278,7 +278,6 @@ XMLTextColumnsContext::XMLTextColumnsContext( , sSeparatorLineColor("SeparatorLineColor") , sSeparatorLineRelativeHeight("SeparatorLineRelativeHeight") , sSeparatorLineVerticalAlignment("SeparatorLineVerticalAlignment") -, sIsAutomatic("IsAutomatic") , sAutomaticDistance("AutomaticDistance") , sSeparatorLineStyle("SeparatorLineStyle") , pColumns( 0 ) diff --git a/xmloff/source/text/XMLTextFrameContext.cxx b/xmloff/source/text/XMLTextFrameContext.cxx index 166813287f0c..f7ccbea71178 100644 --- a/xmloff/source/text/XMLTextFrameContext.cxx +++ b/xmloff/source/text/XMLTextFrameContext.cxx @@ -375,7 +375,6 @@ class XMLTextFrameContext_Impl : public SvXMLImportContext const OUString sHoriOrientPosition; const OUString sVertOrient; const OUString sVertOrientPosition; - const OUString sChainNextName; const OUString sAnchorType; const OUString sAnchorPageNo; const OUString sGraphicURL; @@ -863,7 +862,6 @@ XMLTextFrameContext_Impl::XMLTextFrameContext_Impl( , sHoriOrientPosition("HoriOrientPosition") , sVertOrient("VertOrient") , sVertOrientPosition("VertOrientPosition") -, sChainNextName("ChainNextName") , sAnchorType("AnchorType") , sAnchorPageNo("AnchorPageNo") , sGraphicURL("GraphicURL") diff --git a/xmloff/source/text/XMLTextMasterPageContext.cxx b/xmloff/source/text/XMLTextMasterPageContext.cxx index 28d0faf2b14f..83fd57d82342 100644 --- a/xmloff/source/text/XMLTextMasterPageContext.cxx +++ b/xmloff/source/text/XMLTextMasterPageContext.cxx @@ -65,7 +65,6 @@ XMLTextMasterPageContext::XMLTextMasterPageContext( SvXMLImport& rImport, bool bOverwrite ) : SvXMLStyleContext( rImport, nPrfx, rLName, xAttrList, XML_STYLE_FAMILY_MASTER_PAGE ) , sIsPhysical( "IsPhysical" ) -, sPageStyleLayout( "PageStyleLayout" ) , sFollowStyle( "FollowStyle" ) , bInsertHeader( false ) , bInsertFooter( false ) diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx index 36341bd01bc5..13072a5bf9e9 100644 --- a/xmloff/source/text/txtflde.cxx +++ b/xmloff/source/text/txtflde.cxx @@ -291,7 +291,6 @@ XMLTextFieldExport::XMLTextFieldExport( SvXMLExport& rExp, sPropertyDataColumnName("DataColumnName"), sPropertyDataCommandType("DataCommandType"), sPropertyDataTableName("DataTableName"), - sPropertyDate("Date"), sPropertyDateTime("DateTime"), sPropertyDateTimeValue("DateTimeValue"), sPropertyDDECommandElement("DDECommandElement"), @@ -319,7 +318,6 @@ XMLTextFieldExport::XMLTextFieldExport( SvXMLExport& rExp, sPropertyIsVisible("IsVisible"), sPropertyItems("Items"), sPropertyLevel("Level"), - sPropertyMacro("Macro"), sPropertyMeasureKind("Kind"), sPropertyName("Name"), sPropertyNumberFormat("NumberFormat"), @@ -327,12 +325,9 @@ XMLTextFieldExport::XMLTextFieldExport( SvXMLExport& rExp, sPropertyNumberingType("NumberingType"), sPropertyOffset("Offset"), sPropertyOn("On"), - sPropertyPlaceholder("PlaceHolder"), sPropertyPlaceholderType("PlaceHolderType"), sPropertyReferenceFieldPart("ReferenceFieldPart"), sPropertyReferenceFieldSource("ReferenceFieldSource"), - sPropertyReferenceFieldType("ReferenceFieldType"), - sPropertyRevision("Revision"), sPropertyScriptType("ScriptType"), sPropertySelectedItem("SelectedItem"), sPropertySequenceNumber("SequenceNumber"), @@ -347,7 +342,6 @@ XMLTextFieldExport::XMLTextFieldExport( SvXMLExport& rExp, sPropertyUserText("UserText"), sPropertyValue("Value"), sPropertyVariableName("VariableName"), - sPropertyVariableSubType("VariableSubtype"), sPropertyHelp("Help"), sPropertyTooltip("Tooltip"), sPropertyTextRange("TextRange"), diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx index 913613591016..fd40768c751a 100644 --- a/xmloff/source/text/txtfldi.cxx +++ b/xmloff/source/text/txtfldi.cxx @@ -198,7 +198,6 @@ XMLTextFieldImportContext::XMLTextFieldImportContext( const sal_Char* pService, sal_uInt16 nPrefix, const OUString& rElementName) : SvXMLImportContext( rImport, nPrefix, rElementName ) -, sIsFixed(sAPI_is_fixed) , rTextImportHelper(rHlp) , sServicePrefix(sAPI_textfield_prefix) , bValid(false) diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx index 3aefc7827e68..36fb946ab91d 100644 --- a/xmloff/source/text/txtparai.cxx +++ b/xmloff/source/text/txtparai.cxx @@ -270,8 +270,6 @@ XMLEndReferenceContext_Impl::XMLEndReferenceContext_Impl( class XMLImpSpanContext_Impl : public SvXMLImportContext { - const OUString sTextFrame; - XMLHints_Impl& rHints; XMLStyleHint_Impl *pHint; @@ -1519,7 +1517,6 @@ XMLImpSpanContext_Impl::XMLImpSpanContext_Impl( sal_uInt8 nSFConvFlags ) : SvXMLImportContext( rImport, nPrfx, rLName ) -, sTextFrame("TextFrame") , rHints( rHnts ) , pHint( 0 ) , rIgnoreLeadingSpace( rIgnLeadSpace ) diff --git a/xmloff/source/text/txtvfldi.cxx b/xmloff/source/text/txtvfldi.cxx index 146a4125c313..de425ff9a7ae 100644 --- a/xmloff/source/text/txtvfldi.cxx +++ b/xmloff/source/text/txtvfldi.cxx @@ -596,8 +596,7 @@ XMLVariableGetFieldImportContext::XMLVariableGetFieldImportContext( false, false, false, false, true, true, true, false, - true), - sPropertySubType(sAPI_sub_type) + true) { } @@ -702,7 +701,6 @@ XMLTableFormulaImportContext::XMLTableFormulaImportContext( sPropertyCurrentPresentation( "CurrentPresentation"), aValueHelper(rImport, rHlp, false, true, false, true), - sFormula(), bIsShowFormula(false) { } @@ -835,7 +833,6 @@ XMLVariableDeclImportContext::XMLVariableDeclImportContext( enum VarType eVarType) : SvXMLImportContext(rImport, nPrfx, rLocalName), // bug?? which properties for userfield/userfieldmaster - sPropertyName(sAPI_name), sPropertySubType(sAPI_sub_type), sPropertyNumberingLevel(sAPI_chapter_numbering_level), sPropertyNumberingSeparator(sAPI_numbering_separator), |