[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - sw/source

Noel Grandin (via logerrit) logerrit at kemper.freedesktop.org
Fri Jul 26 16:38:02 UTC 2019


 sw/source/filter/ww8/docxattributeoutput.cxx |    4 +---
 sw/source/filter/ww8/docxattributeoutput.hxx |    3 ---
 2 files changed, 1 insertion(+), 6 deletions(-)

New commits:
commit c1fde0fb9ad90aca779dc3a58b5225ca2b66a1f8
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Fri Mar 8 16:21:53 2019 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Fri Jul 26 18:37:13 2019 +0200

    loplugin:singlevalfields
    
    (cherry picked from commit bd4d702054d65b8e907c54835c579f14278e5899)
    
    Change-Id: I7f9ff0fc58adf51eae7fef5ce925b91b8d1f4922
    Reviewed-on: https://gerrit.libreoffice.org/76383
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 5254c445d7f1..ea3bb3800e69 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -3696,7 +3696,6 @@ void DocxAttributeOutput::EndTableCell(sal_uInt32 nCell)
 
     m_pSerializer->endElementNS( XML_w, XML_tc );
 
-    m_bBtLr = false;
     m_tableReference->m_bTableCellOpen = false;
     m_tableReference->m_bTableCellParaSdtOpen = false;
 }
@@ -7302,7 +7301,7 @@ void DocxAttributeOutput::CharIdctHint( const SfxPoolItem& )
 void DocxAttributeOutput::CharRotate( const SvxCharRotateItem& rRotate)
 {
     // Not rotated or we the rotation already handled?
-    if ( !rRotate.GetValue() || m_bBtLr || m_rExport.SdrExporter().getFrameBtLr())
+    if ( !rRotate.GetValue() || m_rExport.SdrExporter().getFrameBtLr())
         return;
 
     AddToAttrList( m_pEastAsianLayoutAttrList, FSNS( XML_w, XML_vert ), "true" );
@@ -9336,7 +9335,6 @@ DocxAttributeOutput::DocxAttributeOutput( DocxExport &rExport, const FSHelperPtr
       m_nextFontId( 1 ),
       m_tableReference(new TableReference()),
       m_bIgnoreNextFill(false),
-      m_bBtLr(false),
       m_pTableStyleExport(new DocxTableStyleExport(rExport.m_pDoc, pSerializer)),
       m_bParaBeforeAutoSpacing(false),
       m_bParaAfterAutoSpacing(false),
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx
index 201d0f1a31d6..7bbb2554a96d 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -911,9 +911,6 @@ private:
     /// If FormatBox() already handled fill style / gradient.
     bool m_bIgnoreNextFill;
 
-    /// Is fake rotation detected, so rotation with 90 degrees should be ignored in this cell?
-    bool m_bBtLr;
-
     editeng::WordPageMargins m_pageMargins;
 
     std::shared_ptr<DocxTableStyleExport> m_pTableStyleExport;


More information about the Libreoffice-commits mailing list