[Libreoffice-commits] core.git: Changes to 'refs/changes/46/9146/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/67/7767/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/00/7000/7'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/00/7000/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/67/7767/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/00/7000/5'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/00/7000/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/00/7000/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/39/8539/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/92/9392/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/39/8539/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/74/7074/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/74/7074/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/67/7767/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/92/9392/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/92/9392/4'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/77/8677/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/31/10531/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/77/8677/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/39/7839/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/77/8677/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/14/9914/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/14/9914/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/14/9914/5'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/39/7839/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/48/8848/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/48/8848/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/48/8848/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/data/testWordArtWithinDraingtool.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 19
sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx|2
sw/source/filter/ww8/docxattributeoutput.cxx | 41
++
sw/source/filter/ww8/docxattributeoutput.hxx |3
sw/source/filter/ww8/docxsdrexport.cxx | 10 --
6 files changed, 67 insertions(+), 8 deletions(-)
New commits:
commit b349d2483e1fe64316d87b55d0b3b4c8f2293e2e
Author: Rajashri rajashri.udh...@synerzip.com
Date: Sat May 17 18:53:52 2014 +0530
fdo#78663 : Corrupt: 2007 WordArt whithin a Drawing tool
A file contains a 2007 word art within a drawing tool.
In Original file, the xml structure is as below:
sample xml:
p r ac drawing txbx txbxContent .. pict /pict
/txbxContent/txbx /drawing /ac /r /p
LO was preserving this as :
p r ac drawing txbx txbxContent .. drawing txbx
txbxContent ..
/txbxContent/txbx /drawing .. /txbxContent/txbx /drawing
/ac /r /p
Now after this fix, If there is a custom shape within a text box, then
we should postpone it and write it in
a separate run.
This approach is followed on the fact that LO writes nested TextBoxes
in separate run.
NOTE1 :Due to this fix, xpath related to the below UT needs to be
updated.
testFdo76249 in ooxmlsdrexport.cxx
NOTE2: In docxsdrexport.cxx : 'm_bIsInDMLTextFrame' is no more required.
For adding LockedCanvas, we only need to check if the property exists
in the property set.
Therefoew removing the above bool variable.
Reviewed on:
https://gerrit.libreoffice.org/9392
Change-Id: I00e94712e912ad1977fcb65a945fefb927795d77
diff --git a/sw/qa/extras/ooxmlexport/data/testWordArtWithinDraingtool.docx
b/sw/qa/extras/ooxmlexport/data/testWordArtWithinDraingtool.docx
new file mode 100644
index 000..c860828
Binary files /dev/null and
b/sw/qa/extras/ooxmlexport/data/testWordArtWithinDraingtool.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 22b144e..7a69e67 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3437,6 +3437,25 @@ DECLARE_OOXMLEXPORT_TEST(testFdo78651, fdo78651.docx)
// ensure that there are only two tables
assertXPath(pXmlDoc, //w:tbl, 2);
}
+DECLARE_OOXMLEXPORT_TEST(testWordArtWithinDraingtool,
testWordArtWithinDraingtool.docx)
+{
+/* * Within a file, there is a 2007 wordArt enclosed in a drawing tool
+ * LO was exporting it as below:
+ * Sample XML as in Original file:
+ * p r ac drawing txbx txbxContent .. pict /pict
/txbxContent/txbx /drawing /ac /r /p
+ * After RT :
+ * p r ac drawing txbx txbxContent .. drawing txbx
txbxContent .. /txbxContent/txbx /drawing .. /txbxContent/txbx
/drawing /ac /r /p
+ * Expected : As there is nesting of a 2007 Word Art within a draing
tool, then can be separated in two different runs.
+ * */
+
+xmlDocPtr pXmlDoc = parseExport(word/document.xml);
+if (!pXmlDoc)
+ return;
+
assertXPath(pXmlDoc,/w:document[1]/w:body[1]/w:p[1]/w:r[2]/mc:AlternateContent[1]/mc:Choice[1]/w:drawing[1]/wp:anchor[1]/a:graphic[1]/a:graphicData[1]/wps:wsp[1]/wps:txbx[1]/w:txbxContent[1],1);
+
assertXPath(pXmlDoc,/w:document[1]/w:body[1]/w:p[1]/w:r[2]/mc:AlternateContent[1]/mc:Fallback[1]/w:pict[1]/v:rect[1]/v:textbox[1]/w:txbxContent[1]/w:p[1]/w:r[1]/mc:AlternateContent[1]/mc:Choice[1]/w:drawing[1]/wp:inline[1]/a:graphic[1]/a:graphicData[1]/wps:wsp[1]/wps:txbx[1]/w:txbxContent[1],1);
+
assertXPath(pXmlDoc,/w:document[1]/w:body[1]/w:p[1]/w:r[3]/mc:AlternateContent[1]/mc:Choice[1]/w:drawing[1]/wp:anchor[1]/a:graphic[1]/a:graphicData[1]/wps:wsp[1]/wps:txbx[1],1);
+
assertXPath(pXmlDoc,/w:document[1]/w:body[1]/w:p[1]/w:r[4]/mc:AlternateContent[1]/mc:Choice[1]/w:drawing[1]/wp:inline[1]/a:graphic[1]/a:graphicData[1]/wps:wsp[1]/wps:txbx[1]/w:txbxContent[1],1);
+}
#endif
diff --git a/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
index 21eff8e..fc5c8d7 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
@@ -1017,7 +1017,7 @@ DECLARE_OOXMLEXPORT_TEST(testFdo76249, fdo76249.docx)
xmlDocPtr pXmlDoc = parseExport(word/document.xml);
if (!pXmlDoc)
return;
-assertXPath(pXmlDoc,
//mc:Choice/w:drawing//w:txbxContent//w:drawing//lc:lockedCanvas, 1);
+assertXPath(pXmlDoc,
//mc:Choice[2]/w:drawing[1]/wp:inline[1]/a:graphic[1]/a:graphicData[1]/lc:lockedCanvas[1],1);
}
DECLARE_OOXMLEXPORT_TEST(testFdo76979, fdo76979.docx)
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 9e3bcd7..96602c3 100644
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/data/SdtContent.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx |8
sw/source/filter/ww8/docxattributeoutput.cxx |6 +++---
3 files changed, 11 insertions(+), 3 deletions(-)
New commits:
commit d9de57dd2acc4719f846e908284ed81f09856098
Author: Rajashri rajashri.udh...@synerzip.com
Date: Thu Apr 24 14:44:33 2014 +0530
fdo#77713 : File Corruption - Header.xml
Document containing track changes within a SDT content
is getting corrupted.
Reason for corruption: In export side,parent tag [SDT] is
getting closed before child tag ['del' tag].
The corruption is resolved now.
Change-Id: I42451495f80e30ddfebab8b81bcf1e309b0c2ca2
Reviewed-on: https://gerrit.libreoffice.org/9146
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/sw/qa/extras/ooxmlexport/data/SdtContent.docx
b/sw/qa/extras/ooxmlexport/data/SdtContent.docx
new file mode 100644
index 000..91e0ef0
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/SdtContent.docx
differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index f33771f..5dc3bcf 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2947,6 +2947,14 @@ DECLARE_OOXMLEXPORT_TEST(testlvlPicBulletId,
lvlPicBulletId.docx)
assertXPath(pXmlDoc,
/w:numbering[1]/w:abstractNum[1]/w:lvl[1]/w:lvlPicBulletId[1], 0);
}
+DECLARE_OOXMLEXPORT_TEST(testSdtContent, SdtContent.docx)
+{
+xmlDocPtr pXmlDoc = parseExport(word/header1.xml);
+if (!pXmlDoc)
+ return;
+assertXPath(pXmlDoc, /w:hdr[1]/w:p[1]/w:sdt[1]/w:sdtContent[1]/w:del[1]);
+}
+
DECLARE_OOXMLEXPORT_TEST(testCitation,FDO74775.docx)
{
xmlDocPtr pXmlDoc = parseExport();
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 27835b3..3321999 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -836,6 +836,9 @@ void DocxAttributeOutput::EndRun()
// append the actual run end
m_pSerializer-endElementNS( XML_w, XML_r );
+// if there is some redlining in the document, output it
+EndRedline( m_pRedlineData );
+
// enclose in a sdt block, if necessary
WriteSdtBlock( m_nRunSdtPrToken, m_pRunSdtPrTokenChildren,
m_pRunSdtPrDataBindingAttrs );
m_pSerializer-mergeTopMarks();
@@ -848,9 +851,6 @@ void DocxAttributeOutput::EndRun()
WritePendingPlaceholder();
-// if there is some redlining in the document, output it
-EndRedline( m_pRedlineData );
-
m_pRedlineData = NULL;
if ( m_closeHyperlinkInThisRun )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/data/NumberedList.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx| 15 +++
sw/source/filter/ww8/docxattributeoutput.cxx|2 +-
3 files changed, 16 insertions(+), 1 deletion(-)
New commits:
commit a7f68538f5f27093b8165e2e8fce3f7fade3aaf9
Author: Rajashri rajashri.udh...@synerzip.com
Date: Fri Jan 31 15:08:11 2014 +0530
fdo#74150:Numbered list getting display after RT -table-within-table-1.docx
Description:
For pStyle = 'NumberedList1', iLvl and numId was not preserved.
These tags needs to be preserved under numPr in document.xml
These tags are preserved now.
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Change-Id: Ib6734c9ae55bd72d4fbc0f6d6cae85764ac1a244
Reviewed-on: https://gerrit.libreoffice.org/7767
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/sw/qa/extras/ooxmlexport/data/NumberedList.docx
b/sw/qa/extras/ooxmlexport/data/NumberedList.docx
new file mode 100644
index 000..53f4490
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/NumberedList.docx
differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index e7f57e6..a7ad9b7 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3129,6 +3129,21 @@ DECLARE_OOXMLEXPORT_TEST(test77219, test77219.docx)
assertXPath(pXmlDoc,
/w:document[1]/w:body[1]/w:p[6]/w:r[1]/mc:AlternateContent[1]/mc:Choice[1]/w:drawing[1]/wp:anchor[1],
behindDoc, 1);
}
+DECLARE_OOXMLEXPORT_TEST(testNumberedList,NumberedList.docx)
+{
+//fdo74150:In document.xml, for pStyle = NumberedList1, iLvl and numId
was not preserved
+xmlDocPtr pXmlDoc = parseExport(word/document.xml);
+if (!pXmlDoc)
+return;
+assertXPath(pXmlDoc,
/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:p[1]/w:pPr[1]/w:pStyle, val,
NumberedList1);
+assertXPath(pXmlDoc,
/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:p[1]/w:pPr[1]/w:numPr/w:ilvl,val,
0);
+assertXPath(pXmlDoc,
/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:p[1]/w:pPr[1]/w:numPr/w:numId,val,
0);
+
+assertXPath(pXmlDoc,
/w:document/w:body/w:tbl[1]/w:tr[1]/w:tc[1]/w:p[3]/w:pPr[1]/w:pStyle,val,
NumberedList1);
+assertXPath(pXmlDoc,
/w:document/w:body/w:tbl[1]/w:tr[1]/w:tc[1]/w:p[3]/w:pPr[1]/w:numPr/w:ilvl,val,
0);
+assertXPath(pXmlDoc,
/w:document/w:body/w:tbl[1]/w:tr[1]/w:tc[1]/w:p[3]/w:pPr[1]/w:numPr/w:numId,val,
0);
+}
+
DECLARE_OOXMLEXPORT_TEST(testFDO76597, fdo76597.docx)
{
// check XML
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 3de5f8b..a4679f7 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -6106,7 +6106,7 @@ void DocxAttributeOutput::ParaHyphenZone( const
SvxHyphenZoneItem rHyphenZone )
void DocxAttributeOutput::ParaNumRule_Impl( const SwTxtNode* /*pTxtNd*/,
sal_Int32 nLvl, sal_Int32 nNumId )
{
-if ( USHRT_MAX != nNumId 0 != nNumId )
+if ( USHRT_MAX != nNumId )
{
m_pSerializer-startElementNS( XML_w, XML_numPr, FSEND );
m_pSerializer-singleElementNS( XML_w, XML_ilvl, FSNS( XML_w, XML_val
), OString::number( nLvl).getStr(), FSEND );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/testTcBorders.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 19 +++
writerfilter/source/dmapper/DomainMapperTableHandler.cxx | 14 +++
3 files changed, 28 insertions(+), 5 deletions(-)
New commits:
commit 07f90c89ef78484a422ca4536ba587217147e80a
Author: Rajashri rajashri.udh...@synerzip.com
Date: Fri Apr 4 09:00:27 2014 +0530
fdo#76635 : Table borders not preserved after RT
The document containing a custom table is getting crashed.
In the document the user has created his own costume table styles and
in the created custom table style the user has set repeat first row as
header property.
The corresponding tag for this property is 'tblHeader'
LO was adding this property as a part of cellProperties in
DomainMapperTableHandler.cxx.
But it is a part of a Row Property. That is why there was a crash @ open.
In DomainMapperTableHandler.cxx : 'endTableGetCellProperties' tblHeader
property is removed from
style as it is not allowed for a cell.
Change-Id: I83cd369aa4497ec3f4b567174f23ddee9be2864e
Reviewed-on: https://gerrit.libreoffice.org/8848
Tested-by: David Tardon dtar...@redhat.com
Reviewed-by: David Tardon dtar...@redhat.com
diff --git a/sw/qa/extras/ooxmlexport/data/testTcBorders.docx
b/sw/qa/extras/ooxmlexport/data/testTcBorders.docx
new file mode 100644
index 000..b7fb81a
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/testTcBorders.docx
differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index cafd9ea..d13bb70 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -1344,6 +1344,21 @@ DECLARE_OOXMLEXPORT_TEST(testCalendar2, calendar2.docx)
assertXPath(pXmlStyles,
/w:styles/w:style[@w:styleId='Calendar2']/w:tblPr/w:tblBorders/w:insideV,
themeTint, 99);
}
+DECLARE_OOXMLEXPORT_TEST(testTcBorders, testTcBorders.docx)
+{
+//fdo#76635 : Table borders are not getting preserved.
+
+xmlDocPtr pXmlDocument = parseExport(word/document.xml);
+if (!pXmlDocument)
+return;
+
+ assertXPath(pXmlDocument,
/w:document[1]/w:body[1]/w:tbl[1]/w:tr[1]/w:tc[1]/w:tcPr[1]/w:tcBorders[1]/w:bottom[1][@w:val
= 'single'],1);
+ assertXPath(pXmlDocument,
/w:document[1]/w:body[1]/w:tbl[1]/w:tr[1]/w:tc[1]/w:tcPr[1]/w:tcBorders[1]/w:bottom[1][@w:sz
= 4], 1);
+ assertXPath(pXmlDocument,
/w:document[1]/w:body[1]/w:tbl[1]/w:tr[1]/w:tc[1]/w:tcPr[1]/w:tcBorders[1]/w:bottom[1][@w:space
= 0], 1);
+ assertXPath(pXmlDocument,
/w:document[1]/w:body[1]/w:tbl[1]/w:tr[1]/w:tc[1]/w:tcPr[1]/w:tcBorders[1]/w:bottom[1][@w:color
= 808080], 1);
+
+}
+
DECLARE_OOXMLEXPORT_TEST(testQuicktables, quicktables.docx)
{
xmlDocPtr pXmlStyles = parseExport(word/styles.xml);
@@ -1384,6 +1399,10 @@ DECLARE_OOXMLEXPORT_TEST(testFdo71302, fdo71302.docx)
assertXPath(pXmlStyles, /w:styles/w:style[@w:styleId='Strong'], 1);
}
+
+
+
+
DECLARE_OOXMLEXPORT_TEST(testSmartart, smartart.docx)
{
uno::Referencetext::XTextDocument xTextDocument(mxComponent,
uno::UNO_QUERY);
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index 08d1919..336514b 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -545,7 +545,6 @@ TableStyleSheetEntry *
DomainMapperTableHandler::endTableGetTableStyle(TableInfo
sal_Int32 nHoriOrient = text::HoriOrientation::LEFT_AND_WIDTH;
m_aTableProperties-getValue( TablePropertyMap::HORI_ORIENT,
nHoriOrient ) ;
m_aTableProperties-Insert( PROP_HORI_ORIENT, uno::makeAny(
sal_Int16(nHoriOrient) ) );
-
//fill default value - if not available
const PropertyMap::const_iterator aRepeatIter =
m_aTableProperties-find(PROP_HEADER_ROW_COUNT);
@@ -695,12 +694,17 @@ CellPropertyValuesSeq_t
DomainMapperTableHandler::endTableGetCellProperties(Tabl
}
// Remove properties from style/row that aren't allowed in
cells
-const PropertyMap::iterator aDefaultRepeatIt =
pAllCellProps-find(PROP_HEADER_ROW_COUNT);
+PropertyMap::iterator aDefaultRepeatIt =
pAllCellProps-find(PROP_HEADER_ROW_COUNT);
+if ( aDefaultRepeatIt != pAllCellProps-end( ) )
+pAllCellProps-erase( aDefaultRepeatIt );
+
+aDefaultRepeatIt = pAllCellProps-find(PROP_PARA_LINE_SPACING);
if ( aDefaultRepeatIt != pAllCellProps-end( ) )
pAllCellProps-erase( aDefaultRepeatIt );
-const PropertyMap::iterator aDefaultRepeatIt2 =
pAllCellProps-find(PROP_PARA_LINE_SPACING);
-if ( aDefaultRepeatIt2 != pAllCellProps-end( ) )
-pAllCellProps-erase
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/data/TCTagMisMatch.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 12
sw/source/filter/ww8/docxattributeoutput.cxx | 13 +
3 files changed, 21 insertions(+), 4 deletions(-)
New commits:
commit 5ff0e274bb146bbaede31e9e349cba301137d4f2
Author: Rajashri rajashri.udh...@synerzip.com
Date: Thu Mar 20 13:27:17 2014 +0530
fdo#76361 : LO crash: LO crashes while saving the document to docx
The document contains an empty table with borders.
LO was treating this table as a nested table, which lead to
a TC tag mismatch.
In docxattributeoutput.cxx, inside 'switchHeaderFooter'
added a check against 'm_oldTableReference-m_pOldTablepInner'
For some documents, even if the above value was null, still
it was getting assigned to 'm_tableReference' . Thus in such situations
it leads to a crash.
Change-Id: I883267585cb804f961989797de57c4b843b96821
Reviewed-on: https://gerrit.libreoffice.org/8677
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/sw/qa/extras/ooxmlexport/data/TCTagMisMatch.docx
b/sw/qa/extras/ooxmlexport/data/TCTagMisMatch.docx
new file mode 100644
index 000..6d890ac
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/TCTagMisMatch.docx
differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index a1542d9..966e52c 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2887,6 +2887,18 @@ DECLARE_OOXMLEXPORT_TEST(test76108, test76108.docx)
assertXPath(pXmlDoc,
/w:document[1]/w:body[1]/w:p[1]/w:r[1]/w:fldChar[1], fldCharType, begin);
}
+DECLARE_OOXMLEXPORT_TEST(testTCTagMisMatch, TCTagMisMatch.docx)
+{
+ // TCTagMisMatch.docx : This document contains a empty table with borders.
+ // there was a TC tag mismatch which resulted into a crash.
+
+ xmlDocPtr pXmlDoc = parseExport(word/document.xml);
+ if(!pXmlDoc)
+ return;
+
assertXPath(pXmlDoc,/w:document[1]/w:body[1]/w:tbl[1]/w:tr[1]/w:tc[1]/w:tbl[1]/w:tr[1]/w:tc[1],0);
+ assertXPath(pXmlDoc,/w:document[1]/w:body[1]/w:tbl[1]/w:tr[1]/w:tc[1], 1);
+}
+
DECLARE_OOXMLEXPORT_TEST(testHyperLinkTagEnded, fdo76316.docx)
{
/* XML tag w:hyperlink was not getting closed when its inside another
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index a088367..e287f71 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -2489,10 +2489,15 @@ void DocxAttributeOutput::switchHeaderFooter(bool
isHeaderFooter, sal_Int32 inde
}
else if( index == -1)
{
-*m_tableReference = *m_oldTableReference;
-//Reset the oldReference, after copying it back to the original.
-m_oldTableReference-m_bTableCellOpen = false ;
-m_oldTableReference-m_nTableDepth = 0;
+ if (m_oldTableReference-m_pOldTablepInner)
+ {
+ *m_tableReference = *m_oldTableReference;
+
+//Reset the oldReference, after copying it back to the original.
+m_oldTableReference-m_bTableCellOpen = false ;
+m_oldTableReference-m_nTableDepth = 0;
+ }
+
}
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/data/lvlPicBulletId.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx |9 +
sw/source/filter/ww8/wrtww8.cxx |4 +++-
3 files changed, 12 insertions(+), 1 deletion(-)
New commits:
commit 3075b062261435d568d0680c3405ca61a7a40f39
Author: Rajashri rajashri.udh...@synerzip.com
Date: Wed Mar 12 10:44:57 2014 +0530
fdo#74772 : File Corruption - Issue related to List Bullet Numbering
- A File containing a graphic shape bullet is captured as a numPictBullet in
MS office[in numbering.xml].
- Currently LO has support for graphic bullet as Image. Graphic bullet as
Shape
needs to be preserved in LO.
- Since the numPictBullet is not exported in LO, but in abstractNum
lvlPicBulletId was exported which lead to corruption.
- Fixed the corruption caused due to lvlPicBulletId.
- However the shape is not getting retained. Need to add implementation
for gprahic bullet as a shape.
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Change-Id: I2fc2b1ab4b75e8a050e66837a64578b235059473
diff --git a/sw/qa/extras/ooxmlexport/data/lvlPicBulletId.docx
b/sw/qa/extras/ooxmlexport/data/lvlPicBulletId.docx
new file mode 100644
index 000..28e656b
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/lvlPicBulletId.docx
differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index b7fdef7..045d41e 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2744,6 +2744,15 @@ DECLARE_OOXMLEXPORT_TEST(testOLEObjectinHeader,
2129393649.docx)
assertXPath(pXmlDoc,/rels:Relationships/rels:Relationship[1],Id,rId1);
}
+DECLARE_OOXMLEXPORT_TEST(testlvlPicBulletId, lvlPicBulletId.docx)
+{
+xmlDocPtr pXmlDoc = parseExport(word/numbering.xml);
+if (!pXmlDoc)
+ return;
+assertXPath(pXmlDoc,
/w:numbering[1]/w:abstractNum[1]/w:lvl[1]/w:lvlPicBulletId[1], 0);
+
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 82b0fbd..9832e18 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -1423,7 +1423,9 @@ int MSWordExportBase::CollectGrfsOfBullets()
}
if (!bHas)
{
-m_vecBulletPic.push_back(pGraf);
+Size aSize(pGraf-GetPrefSize());
+if (0 != aSize.Height() 0 != aSize.Width())
+ m_vecBulletPic.push_back(pGraf);
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/data/EquationAsScientificNumbering.docx|binary
sw/qa/extras/ooxmlexport/data/EquationWithAboveAndBelowCaption.docx |binary
sw/qa/extras/ooxmlexport/data/FigureAsLabelPicture.docx |binary
sw/qa/extras/ooxmlexport/data/TableWithAboveCaptions.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx| 56
++
sw/source/filter/ww8/docxattributeoutput.cxx|2
sw/source/filter/ww8/ww8atr.cxx | 12 +-
7 files changed, 63 insertions(+), 7 deletions(-)
New commits:
commit d738b063134e97c780205f8baf138f291016ded4
Author: Rajashri rajashri.udh...@synerzip.com
Date: Mon Feb 3 19:29:16 2014 +0530
fdo#74431 : Captions' are preserved but remove a space
For the below captions :
ALPHABETIC
alphabetic
ROMAN
roman
ARABIC
in document.xml, captions were added as
w:instrText xml:space=preserve SEQ scientific *ROMAN /w:instrText
-no space after *
-Double quotes added for scientific
-For Caption ARABIC, it was comming as
w:instrText xml:space=preserve SEQ scientific *Arabic /w:instrText
it should be
w:instrText xml:space=preserve SEQ scientific * ARABIC /w:instrText
- After adding the above code, anchor value for a hyperlink tag was getting
corrupted. So aaded a fix for that.
UT which was failing due to above code changes :testBnc834035
equality assertion failed
- Expected: _Toc363553908
- Actual : Figure!1|sequence
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Reviewed on:
https://gerrit.libreoffice.org/7839
Change-Id: I9124eefa0ae63baf7ee3eaa2148f3c739d6fa699
diff --git a/sw/qa/extras/ooxmlexport/data/EquationAsScientificNumbering.docx
b/sw/qa/extras/ooxmlexport/data/EquationAsScientificNumbering.docx
new file mode 100644
index 000..e6d6bdf
Binary files /dev/null and
b/sw/qa/extras/ooxmlexport/data/EquationAsScientificNumbering.docx differ
diff --git
a/sw/qa/extras/ooxmlexport/data/EquationWithAboveAndBelowCaption.docx
b/sw/qa/extras/ooxmlexport/data/EquationWithAboveAndBelowCaption.docx
new file mode 100644
index 000..7657d05
Binary files /dev/null and
b/sw/qa/extras/ooxmlexport/data/EquationWithAboveAndBelowCaption.docx differ
diff --git a/sw/qa/extras/ooxmlexport/data/FigureAsLabelPicture.docx
b/sw/qa/extras/ooxmlexport/data/FigureAsLabelPicture.docx
new file mode 100644
index 000..50415bc
Binary files /dev/null and
b/sw/qa/extras/ooxmlexport/data/FigureAsLabelPicture.docx differ
diff --git a/sw/qa/extras/ooxmlexport/data/TableWithAboveCaptions.docx
b/sw/qa/extras/ooxmlexport/data/TableWithAboveCaptions.docx
new file mode 100644
index 000..f445ab6
Binary files /dev/null and
b/sw/qa/extras/ooxmlexport/data/TableWithAboveCaptions.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 79e0bac..5a0b817 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3126,6 +3126,62 @@ DECLARE_OOXMLEXPORT_TEST(testIndentation,
test_indentation.docx)
assertXPath(pXmlDoc, /w:document/w:body/w:p/w:pPr/w:ind, end, );
}
+DECLARE_OOXMLEXPORT_TEST(testCaption1, EquationAsScientificNumbering.docx)
+{
+// fdo#74431 : This test case is to verify the Captions are comming
properly
+//earlier it was comming as SEQ scientific\*ROMAN now it is SEQ
scientific\* ROMAN
+
+xmlDocPtr pXmlDoc = parseExport();
+if (!pXmlDoc)
+return;
+xmlNodeSetPtr pXmlNodes =
getXPathNode(pXmlDoc,/w:document/w:body/w:p/w:r[3]/w:instrText);
+xmlNodePtr pXmlNode = pXmlNodes-nodeTab[0];
+OUString contents = OUString::createFromAscii((const
char*)((pXmlNode-children[0]).content));
+CPPUNIT_ASSERT(contents.match( SEQ scientific \\* ROMAN));
+}
+
+
+
+DECLARE_OOXMLEXPORT_TEST(testCaption2, EquationWithAboveAndBelowCaption.docx)
+{
+// fdo#72563 : There was a problem that in case of TOC,PAGEREF field tag
was not preserved during Roundtrip
+// This test case is to verify that PAGEREF tag is coming with proper
values inside hyperlink tag.
+xmlDocPtr pXmlDoc = parseExport();
+if (!pXmlDoc)
+return;
+xmlNodeSetPtr pXmlNodes =
getXPathNode(pXmlDoc,/w:document/w:body/w:p[5]/w:r[3]/w:instrText);
+xmlNodePtr pXmlNode = pXmlNodes-nodeTab[0];
+OUString contents = OUString::createFromAscii((const
char*)((pXmlNode-children[0]).content));
+CPPUNIT_ASSERT(contents.match( SEQ Equation \\* ARABIC));
+}
+
+
+DECLARE_OOXMLEXPORT_TEST(testCaption3, FigureAsLabelPicture.docx)
+{
+// fdo#72563 : There was a problem that in case of TOC,PAGEREF field tag
was not preserved during Roundtrip
+// This test case is to verify that PAGEREF tag is coming with proper
values inside hyperlink tag.
+xmlDocPtr pXmlDoc = parseExport();
+if (!pXmlDoc)
+return
[Libreoffice-commits] core.git: chart2/qa oox/source
chart2/qa/extras/chart2export.cxx | 12 +++
chart2/qa/extras/data/docx/testAreaChartLoad.docx |binary
oox/source/export/chartexport.cxx | 73 +++---
3 files changed, 63 insertions(+), 22 deletions(-)
New commits:
commit c7cfe0876d7ca3d861cc6d8c1f84970f9f71def9
Author: Rajashri rajashri.udh...@synerzip.com
Date: Fri Dec 6 16:20:54 2013 +0530
fdo#72217 : Fix for corruption area chart with data labels after Round Trip.
For labels under one series, there were child tags created for every
data label individually.
for example, if under one series there are five labels, then under
dLbls there were 5 dLbl tags created separately.
This issue is resolved now.
Conflicts:
chart2/qa/extras/chart2export.cxx
Change-Id: I7ae214f413bc27728df8a3d4cb8f4d703cba2f77
diff --git a/chart2/qa/extras/chart2export.cxx
b/chart2/qa/extras/chart2export.cxx
index 6cef73b..7b1629a 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -39,6 +39,7 @@ public:
void testChartDataTable();
void testChartExternalData();
void testEmbeddingsGrabBag();
+void testAreaChartLoad();
CPPUNIT_TEST_SUITE(Chart2ExportTest);
CPPUNIT_TEST(test);
@@ -50,6 +51,7 @@ public:
CPPUNIT_TEST(testChartDataTable);
CPPUNIT_TEST(testChartExternalData);
CPPUNIT_TEST(testEmbeddingsGrabBag);
+CPPUNIT_TEST(testAreaChartLoad);
CPPUNIT_TEST_SUITE_END();
protected:
@@ -440,6 +442,7 @@ void Chart2ExportTest::testCrosses()
assertXPath(pXmlDoc, /c:chartSpace/c:chart/c:plotArea/c:catAx/c:crosses,
val, autoZero);
}
+
void Chart2ExportTest::testChartDataTable()
{
load(/chart2/qa/extras/data/docx/, testChartDataTable.docx);
@@ -500,6 +503,15 @@ void Chart2ExportTest::testEmbeddingsGrabBag()
CPPUNIT_ASSERT(bEmbeddings); // Grab Bag has all the expected elements
}
+void Chart2ExportTest::testAreaChartLoad()
+{
+load (/chart2/qa/extras/data/docx/, testAreaChartLoad.docx);
+xmlDocPtr pXmlDoc = parseExport(word/charts/chart,Office Open XML
Text);
+CPPUNIT_ASSERT(pXmlDoc);
+assertXPath(pXmlDoc,
/c:chartSpace/c:chart/c:plotArea/c:areaChart/c:ser/c:dLbls/c:showVal, val,
1);
+assertXPath(pXmlDoc,
/c:chartSpace/c:chart/c:plotArea/c:areaChart/c:ser/c:dLbls/c:dLbl, 0);
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Chart2ExportTest);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/chart2/qa/extras/data/docx/testAreaChartLoad.docx
b/chart2/qa/extras/data/docx/testAreaChartLoad.docx
new file mode 100644
index 000..9383f75
Binary files /dev/null and b/chart2/qa/extras/data/docx/testAreaChartLoad.docx
differ
diff --git a/oox/source/export/chartexport.cxx
b/oox/source/export/chartexport.cxx
index 8bbf222..a795aac 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -2410,15 +2410,38 @@ void ChartExport::exportDataLabels(
bool showCategoryName = false;
bool showNumberInPercent = false;
-sal_Int32 nElem;
-for( nElem = 0; nElem nSeriesLength; ++nElem)
+sal_Int32 nElem = 0;
+
+
+uno::Reference beans::XPropertySet xPropSet;
+if(nSeriesLength != 0)
{
-uno::Reference beans::XPropertySet xPropSet;
+ try
+ {
+ xPropSet = SchXMLSeriesHelper::createOldAPIDataPointPropertySet(
+ xSeries, nElem, getModel() );
+ }
+ catch( const uno::Exception rEx )
+ {
+SAL_WARN(oox, Exception caught during Export of data label:
rEx.Message );
+ }
+}
+namespace cssc2 = ::com::sun::star::chart2;
+cssc2::DataPointLabel aTempLabel;
+if( xPropSet.is() )
+{
+if (GetProperty( xPropSet, Label))
+ mAny = aTempLabel;
+
+
+
+for( nElem = 1; nElem nSeriesLength; ++nElem)
+{
try
{
xPropSet =
SchXMLSeriesHelper::createOldAPIDataPointPropertySet(
-xSeries, nElem, getModel() );
+ xSeries, nElem, getModel() );
}
catch( const uno::Exception rEx )
{
@@ -2454,39 +2477,45 @@ void ChartExport::exportDataLabels(
case csscd::AVOID_OVERLAP: aPlacement = bestFit;
break;
}
- if(aLabel.ShowLegendSymbol || aLabel.ShowNumber ||
aLabel.ShowCategoryName || aLabel.ShowNumberInPercent)
- {
+ if (aLabel.ShowLegendSymbol)
+ showLegendSymbol = true;
+ if(aLabel.ShowNumber)
+ showNumber = true;
+ if(aLabel.ShowCategoryName)
+ showCategoryName = true;
+ if(aLabel.ShowNumberInPercent)
+ showNumberInPercent = true
