sfx2/source/doc/new.cxx | 12 ------------ sw/qa/extras/rtftok/data/n695479.rtf | 1 + sw/qa/extras/rtftok/rtftok.cxx | 11 +++++++++++ 3 files changed, 12 insertions(+), 12 deletions(-)
New commits: commit d453788ac0476cc02b929b0907718ca771d6d956 Author: Miklos Vajna <vmik...@suse.cz> Date: Wed Feb 22 15:49:36 2012 +0100 SfxNewFileDialog_Impl: drop unneeded includes diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx index da13a06..3be70a3 100644 --- a/sfx2/source/doc/new.cxx +++ b/sfx2/source/doc/new.cxx @@ -28,7 +28,6 @@ #include <comphelper/string.hxx> #include <sfx2/new.hxx> -#include <vcl/gdimtf.hxx> #include <vcl/msgbox.hxx> #include <vcl/morebtn.hxx> #include <svtools/svmedit.hxx> @@ -41,24 +40,13 @@ #include "new.hrc" #include "doc.hrc" -#include <sfx2/sfx.hrc> -#include "helpid.hrc" -#include "sfxtypes.hxx" #include <sfx2/app.hxx> -#include <sfx2/viewfrm.hxx> -#include <sfx2/docfac.hxx> #include <sfx2/objsh.hxx> -#include "fltfnc.hxx" -#include <sfx2/viewsh.hxx> -#include "sfx2/viewfac.hxx" #include "sfx2/sfxresid.hxx" #include <sfx2/docfile.hxx> #include "preview.hxx" #include <sfx2/printer.hxx> #include <vcl/waitobj.hxx> -#include <vcl/virdev.hxx> -#include <vcl/jobset.hxx> -#include <svtools/accessibilityoptions.hxx> // Draw modes #define OUTPUT_DRAWMODE_COLOR (DRAWMODE_DEFAULT) commit 9fec1e59fa7e92cf91eaf8376f30160edcb86242 Author: Miklos Vajna <vmik...@suse.cz> Date: Wed Feb 22 13:05:37 2012 +0100 testcase for non-box paragraph borders diff --git a/sw/qa/extras/rtftok/data/n695479.rtf b/sw/qa/extras/rtftok/data/n695479.rtf index 213f868..5fe7e45 100644 --- a/sw/qa/extras/rtftok/data/n695479.rtf +++ b/sw/qa/extras/rtftok/data/n695479.rtf @@ -1,6 +1,7 @@ {\rtf1 \paperw12240\paperh15840\margl360\margr360\margt360\margb302\gutter0\ltrsect \pard\plain \ltrpar\ql \li0\ri0\nowidctlpar\pvpg\posx116\posy2167\absh-300\absw5134\overlay\faauto\rin0\lin0\itap0 +\brdrb\brdrdb\brdrw15\brsp20 \rtlch\fcs1 \af0\afs19\alang1025 \ltrch\fcs0 \fs19\lang1033\langfe1038\loch\af0\hich\af0\dbch\af31505\cgrid\langnp1033\langfenp1038 {\rtlch\fcs1 \af0\afs18 \ltrch\fcs0 \fs18\cf1\lang1038\langfe1038\langnp1038\insrsid10974703 \hich\af0\dbch\af31505\loch\f0 first diff --git a/sw/qa/extras/rtftok/rtftok.cxx b/sw/qa/extras/rtftok/rtftok.cxx index a1f6521..eb64e0a 100644 --- a/sw/qa/extras/rtftok/rtftok.cxx +++ b/sw/qa/extras/rtftok/rtftok.cxx @@ -28,6 +28,8 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/drawing/XDrawPageSupplier.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> +#include <com/sun/star/table/BorderLine2.hpp> +#include <com/sun/star/table/BorderLineStyle.hpp> #include <com/sun/star/text/RelOrientation.hpp> #include <com/sun/star/text/SizeType.hpp> #include <com/sun/star/text/XTextDocument.hpp> @@ -198,6 +200,15 @@ void RtfModelTest::testN695479() uno::Reference<text::XTextRange> xRange(xTextContent->getAnchor(), uno::UNO_QUERY); uno::Reference<text::XText> xText(xRange->getText(), uno::UNO_QUERY); CPPUNIT_ASSERT_EQUAL(OUString(RTL_CONSTASCII_USTRINGPARAM("plain")), xText->getString()); + + if (i == 0) + { + // Additonally, the frist frame should have double border at the bottom. + aValue = xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BottomBorder"))); + table::BorderLine2 aBorder; + aValue >>= aBorder; + CPPUNIT_ASSERT_EQUAL(table::BorderLineStyle::DOUBLE, aBorder.LineStyle); + } } else if (xServiceInfo->supportsService(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.LineShape")))) { _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits