diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-07-28 18:14:16 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-07-28 18:26:10 +0200 |
| commit | c0b6aadedc9429eee4f4df85957e00e29ccb0c8f (patch) | |
| tree | f0c9204f359add53f02894b1e30c0ae2c841f1cc | |
| parent | 7f6e26917d4aa682ed9c422c83b1df20d78177d2 (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
| -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 f72c331f339c..bb9cbb40981a 100644 --- a/sw/qa/extras/rtfimport/rtfimport.cxx +++ b/sw/qa/extras/rtfimport/rtfimport.cxx @@ -1388,7 +1388,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 ebf7426ab3c8..21c66afd0f63 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx @@ -215,8 +215,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 ){} |