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

[Justin Luth]

 writerfilter/source/dmapper/StyleSheetTable.cxx |    2 --
 writerfilter/source/dmapper/StyleSheetTable.hxx |    1 -
 2 files changed, 3 deletions(-)

New commits:
commit ee2750f3a5324166e844f9c6afa399742ea96743
Author: Justin Luth <justin_luth at sil.org>
Date:   Wed Jan 17 12:22:24 2018 +0300

    writerfilter: remove unused sStyleName1
    
    Both sStyleName and sStyleName1 were part of the original
    fork from the OOo project. I'm
    not sure if/how it was ever used, but sStyleName1 is unused now.
    
    Change-Id: I71b54645aa0615101529aa4d5008973f740da1f0
    Reviewed-on: https://gerrit.libreoffice.org/48036
    Reviewed-by: Justin Luth <justin_luth at sil.org>
    Tested-by: Justin Luth <justin_luth at sil.org>

diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx
index eec228747398..7c52ef505aef 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -81,7 +81,6 @@ TableStyleSheetEntry::TableStyleSheetEntry( StyleSheetEntry const & rEntry ):
     sBaseStyleIdentifier = rEntry.sBaseStyleIdentifier;
     sNextStyleIdentifier = rEntry.sNextStyleIdentifier;
     sStyleName = rEntry.sStyleName;
-    sStyleName1 = rEntry.sStyleName1;
     sStyleIdentifierD = rEntry.sStyleIdentifierD;
 }
 
@@ -530,7 +529,6 @@ void StyleSheetTable::lcl_sprm(Sprm & rSprm)
         case NS_ooxml::LN_CT_Style_name:
             //this is only a UI name!
             m_pImpl->m_pCurrentEntry->sStyleName = sStringValue;
-            m_pImpl->m_pCurrentEntry->sStyleName1 = sStringValue;
             if(m_pImpl->m_pCurrentEntry->nStyleTypeCode == STYLE_TYPE_TABLE)
             {
                 TableStyleSheetEntry* pTableEntry = static_cast<TableStyleSheetEntry *>(m_pImpl->m_pCurrentEntry.get());
diff --git a/writerfilter/source/dmapper/StyleSheetTable.hxx b/writerfilter/source/dmapper/StyleSheetTable.hxx
index fa8b40cb0434..933a6e20fd85 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.hxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.hxx
@@ -62,7 +62,6 @@ public:
     OUString sBaseStyleIdentifier;
     OUString sNextStyleIdentifier;
     OUString sStyleName;
-    OUString sStyleName1;
     PropertyMapPtr  pProperties;
     OUString sConvertedStyleName;
     std::vector<css::beans::PropertyValue> aLatentStyles; ///< Attributes of latentStyles