[Libreoffice-commits] core.git: xmloff/source

[Stephan Bergmann]

 xmloff/source/transform/StyleOASISTContext.cxx |   15 +++++----------
 xmloff/source/transform/StyleOASISTContext.hxx |    1 -
 2 files changed, 5 insertions(+), 11 deletions(-)

New commits:
commit 91cafef7d30d3b6c8d7a2905e6ea3eb13bbbdaca
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Feb 8 10:36:42 2017 +0100

    -Werror,-Wunused-private-field
    
    Change-Id: Ibba8f9d1823471cc548220d4de62041151898f12

diff --git a/xmloff/source/transform/StyleOASISTContext.cxx b/xmloff/source/transform/StyleOASISTContext.cxx
index b3a5427..771d55e 100644
--- a/xmloff/source/transform/StyleOASISTContext.cxx
+++ b/xmloff/source/transform/StyleOASISTContext.cxx
@@ -66,7 +66,6 @@ class XMLPropertiesTContext_Impl : public XMLPersElemContentTContext
 
     XMLPropType m_ePropType;
     bool        m_bControlStyle;
-    OUString m_aStyleFamily;
 
 public:
 
@@ -80,7 +79,6 @@ public:
     XMLPropertiesTContext_Impl( XMLTransformerBase& rTransformer,
                            const OUString& rQName,
                            XMLPropType eP,
-                           const OUString& rStyleFamily,
                            bool _bControlStyle );
 
     virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
@@ -98,12 +96,11 @@ public:
 
 XMLPropertiesTContext_Impl::XMLPropertiesTContext_Impl(
     XMLTransformerBase& rImp, const OUString& rQName, XMLPropType eP,
-        const OUString& rStyleFamily, bool _bControlStyle ) :
+    bool _bControlStyle ) :
     XMLPersElemContentTContext( rImp, rQName, XML_NAMESPACE_STYLE,
                                 XML_PROPERTIES),
     m_ePropType( eP ),
-    m_bControlStyle( _bControlStyle ),
-    m_aStyleFamily( rStyleFamily )
+    m_bControlStyle( _bControlStyle )
 {
 }
 
@@ -758,7 +755,7 @@ rtl::Reference<XMLTransformerContext> XMLStyleOASISTContext::CreateChildContext(
             // if no properties context exist start a new one.
             if( !m_xPropContext.is() )
                 m_xPropContext = new XMLPropertiesTContext_Impl(
-                    GetTransformer(), rQName, ePropType, m_aStyleFamily, m_bControlStyle );
+                    GetTransformer(), rQName, ePropType, m_bControlStyle );
             else
                 m_xPropContext->SetQNameAndPropType( rQName, ePropType );
             pContext.set(m_xPropContext.get());
@@ -820,13 +817,11 @@ void XMLStyleOASISTContext::StartElement(
             case XML_ATACTION_STYLE_FAMILY:
                 if( IsXMLToken( rAttrValue, XML_GRAPHIC ) )
                 {
-                    m_aStyleFamily = GetXMLToken( XML_GRAPHICS ) ;
-                    pMutableAttrList->SetValueByIndex( i, m_aStyleFamily );
+                    pMutableAttrList->SetValueByIndex(
+                        i, GetXMLToken(XML_GRAPHICS) );
                 }
                 else
                 {
-                    m_aStyleFamily = rAttrValue;
-
                     if( IsXMLToken( rAttrValue, XML_PARAGRAPH ) )
                         nFamilyAttr = i;
                 }
diff --git a/xmloff/source/transform/StyleOASISTContext.hxx b/xmloff/source/transform/StyleOASISTContext.hxx
index 1671cf0..081bace 100644
--- a/xmloff/source/transform/StyleOASISTContext.hxx
+++ b/xmloff/source/transform/StyleOASISTContext.hxx
@@ -33,7 +33,6 @@ class XMLStyleOASISTContext : public XMLPersElemContentTContext
     bool m_bPersistent;
     bool m_bControlStyle;
 
-    OUString m_aStyleFamily;
 public:
     XMLStyleOASISTContext( XMLTransformerBase& rTransformer,
                            const OUString& rQName,