diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-07-28 18:14:16 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-07-29 12:36:38 +0000 |
| commit | 4ccebccbe57f7dbc668e985f0db216d45d51061f (patch) | |
| tree | 28cdb6460b40b3878a4ca1b21df3724f251d968b | |
| parent | 5dcf8fd9634c4d446bec3471b1fe0b43b61ed061 (diff) | |
(related: fdo#81033) writerfilter: default tab fill character is space
This avoids an ugly "Character" box in the dialog with a null byte in it.
Change-Id: Iee35a8e1bd6b57fb4eb8ae06722bd79ee1d5d8de
(cherry picked from commit c0b6aadedc9429eee4f4df85957e00e29ccb0c8f)
Reviewed-on: https://gerrit.libreoffice.org/10597
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
| -rw-r--r-- | sw/qa/extras/rtfimport/rtfimport.cxx | 2 | ||||
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.hxx | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx index 5a47fb7537bf..cfa347beacc0 100644 --- a/sw/qa/extras/rtfimport/rtfimport.cxx +++ b/sw/qa/extras/rtfimport/rtfimport.cxx @@ -1333,7 +1333,7 @@ DECLARE_RTFIMPORT_TEST(testFdo81033, "fdo81033.rtf") CPPUNIT_ASSERT_EQUAL(sal_Int32(2), tabs.getLength()); CPPUNIT_ASSERT_EQUAL(sal_Int32(5808), tabs[0].Position); CPPUNIT_ASSERT_EQUAL(style::TabAlign_LEFT, tabs[0].Alignment); - CPPUNIT_ASSERT_EQUAL(sal_Unicode(0), tabs[0].FillChar); + CPPUNIT_ASSERT_EQUAL(sal_Unicode(' '), tabs[0].FillChar); CPPUNIT_ASSERT_EQUAL(sal_Int32(16002), tabs[1].Position); CPPUNIT_ASSERT_EQUAL(style::TabAlign_LEFT, tabs[1].Alignment); CPPUNIT_ASSERT_EQUAL(sal_Unicode('_'), tabs[1].FillChar); diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx index 049304dc98af..3f6212978313 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx @@ -209,8 +209,13 @@ typedef std::stack< AnchoredContext > TextContentStack; struct DeletableTabStop : public ::com::sun::star::style::TabStop { bool bDeleted; - DeletableTabStop() : - bDeleted( false ){} + DeletableTabStop() + : bDeleted(false) + { + // same defaults as SvxXMLTabStopContext_Impl + FillChar = ' '; + DecimalChar = ','; + } DeletableTabStop( const ::com::sun::star::style::TabStop& rTabStop ) : TabStop( rTabStop ), bDeleted( false ){} |