summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZolnai Tamás <tamas.zolnai@collabora.com>2014-07-12 10:05:52 +0200
committerAndras Timar <andras.timar@collabora.com>2014-07-13 09:11:21 +0200
commit8e08ec34ac5ad552709782b10fd309b78ed080f8 (patch)
tree75f88f9b423c0c4b55462eba183a50aed0be08b1
parentcada4e8b903de7dc02d10608c749214a8a07b5e8 (diff)
fdo#80333: .doc has large black rectangles between paragraphs
These black rectangles are character shadows, because checking whether there is a border at all was missing. In Word there is no shadow without a border. (cherry picked from commit c2e708d61746a259888c0e5fb1d3e9a43e3ca696) Signed-off-by: Andras Timar <andras.timar@collabora.com> Conflicts: sw/qa/extras/ww8import/ww8import.cxx Change-Id: Ib3cb4e904fdd33f215c81d7c02762a196f484b1b
-rw-r--r--sw/qa/extras/ww8import/data/fdo80333.docbin0 -> 24064 bytes
-rw-r--r--sw/qa/extras/ww8import/ww8import.cxx9
-rw-r--r--sw/source/filter/ww8/ww8par6.cxx24
3 files changed, 23 insertions, 10 deletions
diff --git a/sw/qa/extras/ww8import/data/fdo80333.doc b/sw/qa/extras/ww8import/data/fdo80333.doc
new file mode 100644
index 000000000000..773a922bad08
--- /dev/null
+++ b/sw/qa/extras/ww8import/data/fdo80333.doc
Binary files differ
diff --git a/sw/qa/extras/ww8import/ww8import.cxx b/sw/qa/extras/ww8import/ww8import.cxx
index 147fb882f19e..7cd6153f42e3 100644
--- a/sw/qa/extras/ww8import/ww8import.cxx
+++ b/sw/qa/extras/ww8import/ww8import.cxx
@@ -18,6 +18,7 @@
#include <com/sun/star/text/XDependentTextField.hpp>
#include <com/sun/star/text/XTextFramesSupplier.hpp>
#include <com/sun/star/text/XTextTablesSupplier.hpp>
+#include <com/sun/star/table/ShadowFormat.hpp>
#include <vcl/svapp.hxx>
@@ -462,6 +463,14 @@ DECLARE_WW8IMPORT_TEST(testFdo77844, "fdo77844.doc")
#endif
}
+DECLARE_WW8IMPORT_TEST(testFdp80333, "fdo80333.doc")
+{
+ // Despite there is no character border, border shadow was imported
+ uno::Reference<beans::XPropertySet> xRun(getRun(getParagraph(1),1), uno::UNO_QUERY);
+ const table::ShadowFormat aShadow = getProperty<table::ShadowFormat>(xRun, "CharShadowFormat");
+ CPPUNIT_ASSERT_EQUAL(table::ShadowLocation_NONE, aShadow.Location);
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 1ab57d53d25e..e0100ae819b4 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -4761,16 +4761,20 @@ void SwWW8ImplReader::Read_CharBorder(sal_uInt16 nId, const sal_uInt8* pData, sh
_SetWW8_BRC(nBrcVer, aBrc, pData);
- Set1Border(aBoxItem, aBrc, BOX_LINE_TOP, 0, 0, true);
- Set1Border(aBoxItem, aBrc, BOX_LINE_BOTTOM, 0, 0, true);
- Set1Border(aBoxItem, aBrc, BOX_LINE_LEFT, 0, 0, true);
- Set1Border(aBoxItem, aBrc, BOX_LINE_RIGHT, 0, 0, true);
- NewAttr( aBoxItem );
-
- short aSizeArray[WW8_RIGHT+1]={0}; aSizeArray[WW8_RIGHT] = 1;
- SvxShadowItem aShadowItem(RES_CHRATR_SHADOW);
- if( SetShadow( aShadowItem, &aSizeArray[0], aBrc ) )
- NewAttr( aShadowItem );
+ // Border style is none -> no border, no shadow
+ if( editeng::ConvertBorderStyleFromWord(aBrc.brcType()) != table::BorderLineStyle::NONE )
+ {
+ Set1Border(aBoxItem, aBrc, BOX_LINE_TOP, 0, 0, true);
+ Set1Border(aBoxItem, aBrc, BOX_LINE_BOTTOM, 0, 0, true);
+ Set1Border(aBoxItem, aBrc, BOX_LINE_LEFT, 0, 0, true);
+ Set1Border(aBoxItem, aBrc, BOX_LINE_RIGHT, 0, 0, true);
+ NewAttr( aBoxItem );
+
+ short aSizeArray[WW8_RIGHT+1]={0}; aSizeArray[WW8_RIGHT] = 1;
+ SvxShadowItem aShadowItem(RES_CHRATR_SHADOW);
+ if( SetShadow( aShadowItem, &aSizeArray[0], aBrc ) )
+ NewAttr( aShadowItem );
+ }
}
}