[Libreoffice-commits] core.git: 2 commits - sw/qa sw/source

Takeshi Abe tabe at fixedpoint.jp
Tue Sep 27 06:59:33 UTC 2016 

 sw/qa/extras/rtfimport/data/tdf90697.rtf |   73 +++++++++++++++++++++++++++++++
 sw/qa/extras/rtfimport/rtfimport.cxx     |    7 ++
 sw/source/core/inc/node2lay.hxx          |    1 
 sw/source/core/inc/rolbck.hxx            |    1 
 sw/source/core/inc/tblrwcl.hxx           |    2 
 sw/source/core/inc/threadmanager.hxx     |    1 
 sw/source/core/inc/txtfly.hxx            |    2 
 sw/source/core/inc/txtfrm.hxx            |    2 
 sw/source/core/inc/unoevent.hxx          |    2 
 sw/source/core/inc/unofield.hxx          |    2 
 sw/source/core/inc/unofootnote.hxx       |    1 
 sw/source/core/inc/unoparaframeenum.hxx  |    1 
 sw/source/core/inc/unoport.hxx           |    1 
 sw/source/core/inc/unorefmark.hxx        |    1 
 sw/source/core/inc/unosection.hxx        |    2 
 sw/source/core/inc/unotextmarkup.hxx     |    1 
 16 files changed, 80 insertions(+), 20 deletions(-)

New commits:
commit 7664d30a9ab9b941e05a33cb1ddae3c92ddff288
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date:   Tue Sep 27 00:15:49 2016 +0900

    sw: Drop unused forward declarations
    
    Change-Id: I2913466f8fa87b3c377a1abf65b8ccc477b73f40
    Reviewed-on: https://gerrit.libreoffice.org/29311
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/sw/source/core/inc/node2lay.hxx b/sw/source/core/inc/node2lay.hxx
index 3cec60f..5531079 100644
--- a/sw/source/core/inc/node2lay.hxx
+++ b/sw/source/core/inc/node2lay.hxx
@@ -50,7 +50,6 @@ class SwLayoutFrame;
 class SwNode;
 class SwNodes;
 class Point;
-struct SwPosition;
 
 class SwNode2Layout
 {
diff --git a/sw/source/core/inc/rolbck.hxx b/sw/source/core/inc/rolbck.hxx
index e8785dc..5476cb7 100644
--- a/sw/source/core/inc/rolbck.hxx
+++ b/sw/source/core/inc/rolbck.hxx
@@ -32,7 +32,6 @@ namespace sfx2 {
 
 class SwDoc;
 class SwFormatColl;
-class SwHistoryHint;
 class SwTextAttr;
 class SfxPoolItem;
 class SwUndoSaveSection;
diff --git a/sw/source/core/inc/tblrwcl.hxx b/sw/source/core/inc/tblrwcl.hxx
index 5d85859..8646600 100644
--- a/sw/source/core/inc/tblrwcl.hxx
+++ b/sw/source/core/inc/tblrwcl.hxx
@@ -39,8 +39,6 @@ class SwContentNode;
 class SfxPoolItem;
 class SwShareBoxFormats;
 class SwFormatFrameSize;
-struct CpyPara;
-struct InsULPara;
 
 void sw_LineSetHeadCondColl( const SwTableLine* pLine );
 
diff --git a/sw/source/core/inc/threadmanager.hxx b/sw/source/core/inc/threadmanager.hxx
index d5b9ee6..4a88827 100644
--- a/sw/source/core/inc/threadmanager.hxx
+++ b/sw/source/core/inc/threadmanager.hxx
@@ -26,7 +26,6 @@
 #include <rtl/ref.hxx>
 
 #include <deque>
-#include <list>
 #include <cppuhelper/weak.hxx>
 #include <com/sun/star/util/XJobManager.hpp>
 #include <observablethread.hxx>
diff --git a/sw/source/core/inc/txtfly.hxx b/sw/source/core/inc/txtfly.hxx
index c6a967e..5c22fef 100644
--- a/sw/source/core/inc/txtfly.hxx
+++ b/sw/source/core/inc/txtfly.hxx
@@ -27,9 +27,7 @@
 class OutputDevice;
 class SwContentFrame;
 class SwPageFrame;
-class SwTextFly;
 class SdrObject;
-class SwTextPaintInfo;
 class SwFormat;
 class TextRanger;
 class SwAnchoredObject;
diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx
index de06443..43f6210 100644
--- a/sw/source/core/inc/txtfrm.hxx
+++ b/sw/source/core/inc/txtfrm.hxx
@@ -42,8 +42,6 @@ struct SwCursorMoveState;
 struct SwFillData;
 class SwPortionHandler;
 class SwScriptInfo;
-class SwViewOption;
-class SwWrongList;
 
 #define NON_PRINTING_CHARACTER_COLOR RGB_COLORDATA(0x26, 0x8b, 0xd2)
 
diff --git a/sw/source/core/inc/unoevent.hxx b/sw/source/core/inc/unoevent.hxx
index 2224db7..452ff9d 100644
--- a/sw/source/core/inc/unoevent.hxx
+++ b/sw/source/core/inc/unoevent.hxx
@@ -24,12 +24,10 @@
 #include <svl/macitem.hxx>
 
 class SvxMacroItem;
-class SvxMacro;
 class SwXFrame;
 class SwXTextFrame;
 class SwXTextGraphicObject;
 class SwXTextEmbeddedObject;
-class SwXFrameStyle;
 class SwFormatINetFormat;
 
 class SwHyperlinkEventDescriptor : public SvDetachedEventDescriptor
diff --git a/sw/source/core/inc/unofield.hxx b/sw/source/core/inc/unofield.hxx
index 9b9e888..5762e93 100644
--- a/sw/source/core/inc/unofield.hxx
+++ b/sw/source/core/inc/unofield.hxx
@@ -34,9 +34,7 @@
 class SwFieldType;
 class SwDoc;
 class SwFormatField;
-class SwField;
 class SwSetExpField;
-class SwTextAPIObject;
 
 typedef ::cppu::WeakImplHelper
 <   css::beans::XPropertySet
diff --git a/sw/source/core/inc/unofootnote.hxx b/sw/source/core/inc/unofootnote.hxx
index 705c03c..f199086 100644
--- a/sw/source/core/inc/unofootnote.hxx
+++ b/sw/source/core/inc/unofootnote.hxx
@@ -32,7 +32,6 @@
 #include <unotext.hxx>
 
 class SwDoc;
-class SwModify;
 class SwFormatFootnote;
 
 typedef ::cppu::WeakImplHelper
diff --git a/sw/source/core/inc/unoparaframeenum.hxx b/sw/source/core/inc/unoparaframeenum.hxx
index 9584ab9..dfdcebc 100644
--- a/sw/source/core/inc/unoparaframeenum.hxx
+++ b/sw/source/core/inc/unoparaframeenum.hxx
@@ -32,7 +32,6 @@
 #include <unobaseclass.hxx>
 
 
-class SwDepend;
 class SwNodeIndex;
 class SwPaM;
 class SwFrameFormat;
diff --git a/sw/source/core/inc/unoport.hxx b/sw/source/core/inc/unoport.hxx
index 761f300..6c9e24a 100644
--- a/sw/source/core/inc/unoport.hxx
+++ b/sw/source/core/inc/unoport.hxx
@@ -44,7 +44,6 @@
 #include <unobaseclass.hxx>
 #include <IDocumentRedlineAccess.hxx>
 
-class SwFormatField;
 class SwFrameFormat;
 class SwRangeRedline;
 class SwTextRuby;
diff --git a/sw/source/core/inc/unorefmark.hxx b/sw/source/core/inc/unorefmark.hxx
index ff17eec..b34b232 100644
--- a/sw/source/core/inc/unorefmark.hxx
+++ b/sw/source/core/inc/unorefmark.hxx
@@ -31,7 +31,6 @@
 #include <unobaseclass.hxx>
 
 class SwDoc;
-class SwModify;
 class SwFormatRefMark;
 
 typedef ::cppu::WeakImplHelper
diff --git a/sw/source/core/inc/unosection.hxx b/sw/source/core/inc/unosection.hxx
index 8d40933..2e09264 100644
--- a/sw/source/core/inc/unosection.hxx
+++ b/sw/source/core/inc/unosection.hxx
@@ -37,8 +37,6 @@
 
 class SwSectionFormat;
 
-struct SwTextSectionProperties_Impl;
-
 typedef ::cppu::ImplInheritanceHelper
 <   ::sfx2::MetadatableMixin
 ,   css::lang::XUnoTunnel
diff --git a/sw/source/core/inc/unotextmarkup.hxx b/sw/source/core/inc/unotextmarkup.hxx
index 249936d..20844ea 100644
--- a/sw/source/core/inc/unotextmarkup.hxx
+++ b/sw/source/core/inc/unotextmarkup.hxx
@@ -39,7 +39,6 @@ namespace com { namespace sun { namespace star { namespace text {
 
 class SwTextNode;
 class ModelToViewHelper;
-class SfxPoolItem;
 
 /** Implementation of the css::text::XTextMarkup interface
  */
commit 298571e2e10f5a925abc3cb75940dbef5701b583
Author: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Date:   Mon Sep 26 15:32:46 2016 +0200

    tdf#90697 unit test for rtf import
    
    When importing this rtf file, sections were interpreted as page breaks.
    They shouldn't, instead all content should be on the same page.
    
    Change-Id: I445ce507d14d21ef568734ab7020eed9cbfe57ac
    Reviewed-on: https://gerrit.libreoffice.org/29298
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>

diff --git a/sw/qa/extras/rtfimport/data/tdf90697.rtf b/sw/qa/extras/rtfimport/data/tdf90697.rtf
new file mode 100644
index 0000000..2e49379
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/tdf90697.rtf
@@ -0,0 +1,73 @@
+{\rtf1\ansi\ansicpg1252\uc1\deff0\deflang1031\deflangfe1031
+{\fonttbl
+{\f1\froman\fprq2 Times;}
+{\f2\fmodern\fprq1 Courier;}
+{\f3\froman\fprq2{\*\panose 02000506060000020003}Liberation Serif;}
+{\f4\froman\fprq2{\*\panose 02000903070000020003}Liberation Sans;}
+}
+{\colortbl;
+\red0\green0\blue0;
+\red0\green0\blue255;
+\red0\green255\blue255;
+\red0\green255\blue0;
+\red255\green0\blue255;
+\red255\green0\blue0;
+\red255\green255\blue0;
+\red255\green255\blue255;
+\red0\green0\blue128;
+\red0\green128\blue128;
+\red0\green128\blue0;
+\red128\green0\blue128;
+\red128\green0\blue0;
+\red128\green128\blue0;
+\red128\green128\blue128;
+\red192\green192\blue192;
+\red224\green224\blue224;
+\red208\green239\blue151;
+}
+{\stylesheet{\widctlpar\adjustright\fs20\cgrid\snext0 Normal;}
+{\*\cs10\additive Default Paragraph Font;}}
+{\info{\title V9.4 SAS System Output}{\author SAS Version 9.4}{\operator sastrust}{\version1}}
+\widowctrl\ftnbj\aenddoc\formshade\viewkind1\viewscale100\pgbrdrhead\pgbrdrfoot\fet0
+\paperw11904\paperh16837\margl1077\margr850\margt567\margb567
+\sectd\linex0\endnhere\pgwsxn11904\pghsxn16837\pgnrestart\pgnstarts1\sbknone
+
+\headery567\footery567\marglsxn1077\margrsxn850\margtsxn567\margbsxn567
+{\*\bkmkstart IDX}{\*\bkmkend IDX}
+
+
+\pard\plain\fs20\cf1\ql\f1{{\fs22\f3}}
+{\par}
+
+
+\pard\par\pard\sect\sectd\linex0\endnhere\pgwsxn11904\pghsxn16837\sbknone
+
+\headery567\footery567\marglsxn1077\margrsxn850\margtsxn567\margbsxn567
+{\*\bkmkstart IDX1}{\*\bkmkend IDX1}
+{\header\pard\plain\qr\pvmrg\phmrg\posxr\posy0{
+}}
+
+\trowd\trkeep\trql\trgaph0
+\pard\plain\intbl\sb0\sa0\sl-21\fs2\cf1\ql\f2{\cell}
+\cltxlrtb\clvertalt\cellx10
+{\row}
+
+\pard\plain\fs20\cf1\ql\f1{{\fs24\f3 {\line}{\line}{\line}{\line}}}
+{\par}
+\pard\par\pard\sect\sectd\linex0\endnhere\pgwsxn11904\pghsxn16837\sbknone
+
+\headery567\footery567\marglsxn1077\margrsxn850\margtsxn567\margbsxn567
+{\*\bkmkstart IDX2}{\*\bkmkend IDX2}
+{\header\pard\plain\qr\pvmrg\phmrg\posxr\posy0{
+}}
+
+\trowd\trkeep\trql\trgaph0
+\pard\plain\intbl\sb0\sa0\sl-21\fs2\cf1\ql\f2{\cell}
+\cltxlrtb\clvertalt\cellx10
+{\row}
+
+
+
+\pard\plain\fs20\cf1\ql\f1{{\fs24\f3 {\line}{\line}{\line}{\line}{\line}{\line}{\line}}}
+{\par}
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx
index f66c2f0..0b307d7 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -2706,6 +2706,13 @@ DECLARE_RTFIMPORT_TEST(testTdf44986, "tdf44986.rtf")
     CPPUNIT_ASSERT_EQUAL(sal_Int32(1), getProperty< uno::Sequence<text::TableColumnSeparator> >(xTableRows->getByIndex(0), "TableColumnSeparators").getLength());
 }
 
+DECLARE_RTFIMPORT_TEST(testTdf90697, "tdf90697.rtf")
+{
+    // We want section breaks to be seen as section breaks, not as page breaks,
+    // so this document should have only one page, not three.
+    CPPUNIT_ASSERT_EQUAL(1, getPages());
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

More information about the Libreoffice-commits mailing list