[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/data/fdo78420.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 15 +++
sw/source/filter/ww8/docxattributeoutput.cxx |5 +
sw/source/filter/ww8/docxattributeoutput.hxx |1 +
sw/source/filter/ww8/docxexport.cxx |4
5 files changed, 25 insertions(+)
New commits:
commit c00690d2e579607bb0d8a3582580bd875225bffb
Author: Ravindra Vidhate
Date: Thu May 8 20:32:56 2014 +0530
fdo#78420 File is getting corrupted after exported from LO.
It is not creating .rels file for Header3.xml. While the Header3.xml
contains the images.
Change-Id: I3d1eb187eaf23fc05783fbfd3576d9a585de791f
Reviewed-on: https://gerrit.libreoffice.org/9286
Reviewed-by: Miklos Vajna
Tested-by: Miklos Vajna
diff --git a/sw/qa/extras/ooxmlexport/data/fdo78420.docx
b/sw/qa/extras/ooxmlexport/data/fdo78420.docx
new file mode 100644
index 000..6b253b1
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo78420.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index e2c7e58..4919d01 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3283,6 +3283,21 @@ DECLARE_OOXMLEXPORT_TEST(testContentTypeOLE,
"fdo77759.docx")
"/word/embeddings/oleObject1.xlsx");
}
+DECLARE_OOXMLEXPORT_TEST(testfdo78420, "fdo78420.docx")
+{
+xmlDocPtr pXmlHeader = parseExport("word/header3.xml");
+
+if (!pXmlHeader)
+ return;
+
+xmlDocPtr pXmlHeaderRels = parseExport("word/_rels/header3.xml.rels");
+if(!pXmlHeaderRels)
+ return;
+
+
assertXPath(pXmlHeaderRels,"/rels:Relationships/rels:Relationship[1]","Id","rId1");
+}
+
+
DECLARE_OOXMLEXPORT_TEST(testPageBreakInFirstPara,"fdo77727.docx")
{
/* Break to next page was not exported if it is in first paragraph of the
section.
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index e969c0c..c84d2e6 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -3567,6 +3567,11 @@ void DocxAttributeOutput::WriteSrcRect(const SdrObject*
pSdrObj )
}
}
+void DocxAttributeOutput::ClearGraphicCache()
+{
+m_aRelIdCache.clear();
+}
+
void DocxAttributeOutput::FlyFrameGraphic( const SwGrfNode* pGrfNode, const
Size& rSize, const SwFlyFrmFmt* pOLEFrmFmt, SwOLENode* pOLENode, const
SdrObject* pSdrObj )
{
OSL_TRACE( "TODO DocxAttributeOutput::FlyFrameGraphic( const SwGrfNode*
pGrfNode, const Size& rSize, const SwFlyFrmFmt* pOLEFrmFmt, SwOLENode*
pOLENode, const SdrObject* pSdrObj ) - some stuff still missing" );
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx
b/sw/source/filter/ww8/docxattributeoutput.hxx
index ba26fba..81305ba 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -358,6 +358,7 @@ public:
void WriteBookmarks_Impl( std::vector< OUString >& rStarts, std::vector<
OUString >& rEnds );
void WriteAnnotationMarks_Impl( std::vector< OUString >& rStarts,
std::vector< OUString >& rEnds );
+void ClearGraphicCache();
private:
/// Initialize the structures where we are going to collect some of the
paragraph properties.
diff --git a/sw/source/filter/ww8/docxexport.cxx
b/sw/source/filter/ww8/docxexport.cxx
index c3a6ddf..f8500e4 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -711,6 +711,10 @@ void DocxExport::WriteHeaderFooter( const SwFmt& rFmt,
bool bHeader, const char*
// do the work
WriteHeaderFooterText( rFmt, bHeader );
+//When the stream changes the cache which is maintained for the graphics
in case of alternate content is not cleared.
+//So clearing the alternate content graphic cache.
+m_pAttrOutput->ClearGraphicCache();
+
// switch the serializer back
m_pAttrOutput->SetSerializer( m_pDocumentFS );
m_pVMLExport->SetFS( m_pDocumentFS );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - svl/source sw/qa sw/source
svl/source/numbers/zforfind.cxx | 20 +---
sw/qa/extras/ooxmlexport/data/fdo78659.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx |9 +
sw/source/filter/ww8/docxattributeoutput.cxx |2 +-
4 files changed, 27 insertions(+), 4 deletions(-)
New commits:
commit 1870ed0e4f63e9c58476e7dcd160e04eb866e0f5
Author: Ravindra Vidhate
Date: Thu May 15 16:12:23 2014 +0530
fdo#78659:FIle geting corrupted after Roundtrip due to fieldchar.
In a hyperlink, the field with fieldchartype="end" is getting addeded
eventhough there is no begin for that field.
Change-Id: I50df6efc63fc9a66b146d4a861ae4bd654b4a3c6
Reviewed-on: https://gerrit.libreoffice.org/9368
Tested-by: Miklos Vajna
Reviewed-by: Miklos Vajna
diff --git a/sw/qa/extras/ooxmlexport/data/fdo78659.docx
b/sw/qa/extras/ooxmlexport/data/fdo78659.docx
new file mode 100644
index 000..55d6d08
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo78659.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 7f3a5b7..f70f58d 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3362,6 +3362,15 @@ DECLARE_OOXMLEXPORT_TEST(testFDO78284, "fdo78284.docx")
"image/png");
}
+DECLARE_OOXMLEXPORT_TEST(testFDO78659, "fdo78659.docx")
+{
+xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+if (!pXmlDoc)
+return;
+
+assertXPath(pXmlDoc,
"/w:document[1]/w:body[1]/w:tbl[8]/w:tr[6]/w:tc[1]/w:p[1]/w:hyperlink[1]/w:r[3]/w:fldChar[1]",
0);
+}
+
DECLARE_OOXMLEXPORT_TEST(testFDO78384,"fdo78384.docx")
{
xmlDocPtr pXmlDoc = parseExport("word/document.xml");
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 19807f4..6608149 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1866,7 +1866,7 @@ bool DocxAttributeOutput::StartURL( const OUString& rUrl,
const OUString& rTarge
bool DocxAttributeOutput::EndURL()
{
m_closeHyperlinkInThisRun = true;
-if(m_hyperLinkAnchor != "" && m_hyperLinkAnchor.startsWith("_Toc"))
+if(m_startedHyperlink && m_hyperLinkAnchor != "" &&
m_hyperLinkAnchor.startsWith("_Toc"))
{
m_endPageRef = true;
}
commit 76531b80ea49e9665c628a2e5f8b82280ef80704
Author: Eike Rathke
Date: Tue May 20 10:49:02 2014 +0200
take a shortcut on common separating ASCII characters
Change-Id: I991801b9a0b7be6024612c8f29262f2ebd8e6a64
diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx
index fef69c5..0385970 100644
--- a/svl/source/numbers/zforfind.cxx
+++ b/svl/source/numbers/zforfind.cxx
@@ -459,14 +459,28 @@ bool ImpSvNumberInputScan::StringContainsWord( const
OUString& rWhat,
* form? */
// Check simple ASCII first before invoking i18n or anything else.
-if (rtl::isAsciiAlphanumeric( rString[nPos] ))
+const sal_Unicode c = rString[nPos];
+
+// Common separating ASCII characters in date context.
+switch (c)
+{
+case ' ':
+case '-':
+case '.':
+case '/':
+return true;
+default:
+; // nothing
+}
+
+if (rtl::isAsciiAlphanumeric( c ))
return false; // Alpha or numeric is not word gap.
sal_Int32 nIndex = nPos;
-const sal_uInt32 c = rString.iterateCodePoints( &nIndex);
+const sal_uInt32 uc = rString.iterateCodePoints( &nIndex);
if (nPos+1 < nIndex)
return true;// Surrogate, assume these to be new words.
-(void)c;
+(void)uc;
const sal_Int32 nType = pFormatter->GetCharClass()->getCharacterType(
rString, nPos);
using namespace ::com::sun::star::i18n;
___
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/fdo78887.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 11 +++
sw/source/filter/ww8/docxattributeoutput.cxx | 11 ++-
3 files changed, 21 insertions(+), 1 deletion(-)
New commits:
commit 8555c24e069dc00071eaad23c711f1d1375e5afc
Author: Ravindra Vidhate
Date: Wed May 21 14:54:35 2014 +0530
fdo#78887 tag is not being preserved after export.
When we have tag continuous like in the following cases...
"Title: Superstition\v\vComposer: Stevie Wonder\v\v"
or "\vLyrics: \v"
where "\n" is internally replaced by "\v" LO.
Before text "\v" or after text multiple "\v" is not preserved.
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Reviewed on:
https://gerrit.libreoffice.org/9420
Change-Id: I2a6d0a7d2382dfbc2f0ab04f150653c9b17bbfd1
diff --git a/sw/qa/extras/ooxmlexport/data/fdo78887.docx
b/sw/qa/extras/ooxmlexport/data/fdo78887.docx
new file mode 100644
index 000..db92fe4
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo78887.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index a039e0b..a82f810 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3446,6 +3446,17 @@ DECLARE_OOXMLEXPORT_TEST(testfdo78886, "fdo78886.docx")
assertXPath(pXmlDoc,
"/w:document[1]/w:body[1]/w:tbl[2]/w:tr[1]/w:tc[1]/w:p[1]/w:hyperlink[1]/w:r[2]/w:fldChar[1]",
0);
}
+DECLARE_OOXMLEXPORT_TEST(testFDO78887, "fdo78887.docx")
+{
+xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+if (!pXmlDoc)
+return;
+
+assertXPath(pXmlDoc, "/w:document[1]/w:body[1]/w:p[1]/w:r[1]/w:br[1]", 1);
+assertXPathContent(pXmlDoc,
"/w:document[1]/w:body[1]/w:p[1]/w:r[1]/w:t[1]", "Lyrics: ");
+assertXPath(pXmlDoc, "/w:document[1]/w:body[1]/w:p[1]/w:r[1]/w:br[2]", 1);
+}
+
DECLARE_OOXMLEXPORT_TEST(testFdo78651, "fdo78651.docx")
{
xmlDocPtr pXmlDoc = parseExport("word/document.xml");
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index aafb31c..91562d7 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1726,6 +1726,8 @@ void DocxAttributeOutput::RunText( const OUString& rText,
rtl_TextEncoding /*eCh
if ( m_pRedlineData && m_pRedlineData->GetType() ==
nsRedlineType_t::REDLINE_DELETE )
nTextToken = XML_delText;
+sal_Unicode prevUnicode = *pBegin;
+
for ( const sal_Unicode *pIt = pBegin; pIt < pEnd; ++pIt )
{
switch ( *pIt )
@@ -1733,20 +1735,26 @@ void DocxAttributeOutput::RunText( const OUString&
rText, rtl_TextEncoding /*eCh
case 0x09: // tab
impl_WriteRunText( m_pSerializer, nTextToken, pBegin, pIt );
m_pSerializer->singleElementNS( XML_w, XML_tab, FSEND );
+prevUnicode = *pIt;
break;
case 0x0b: // line break
{
-if (impl_WriteRunText( m_pSerializer, nTextToken, pBegin,
pIt ))
+if (impl_WriteRunText( m_pSerializer, nTextToken, pBegin,
pIt ) || (prevUnicode == *pIt))
+{
m_pSerializer->singleElementNS( XML_w, XML_br, FSEND );
+prevUnicode = *pIt;
+}
}
break;
case 0x1E: //non-breaking hyphen
impl_WriteRunText( m_pSerializer, nTextToken, pBegin, pIt );
m_pSerializer->singleElementNS( XML_w, XML_noBreakHyphen,
FSEND );
+prevUnicode = *pIt;
break;
case 0x1F: //soft (on demand) hyphen
impl_WriteRunText( m_pSerializer, nTextToken, pBegin, pIt );
m_pSerializer->singleElementNS( XML_w, XML_softHyphen, FSEND );
+prevUnicode = *pIt;
break;
default:
if ( *pIt < 0x0020 ) // filter out the control codes
@@ -1754,6 +1762,7 @@ void DocxAttributeOutput::RunText( const OUString& rText,
rtl_TextEncoding /*eCh
impl_WriteRunText( m_pSerializer, nTextToken, pBegin, pIt
);
OSL_TRACE( "Ignored control code %x in a text run.", *pIt
);
}
+prevUnicode = *pIt;
break;
}
}
___
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/fdo79062.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 13 +
sw/source/filter/ww8/docxattributeoutput.cxx |5 +
sw/source/filter/ww8/docxexport.hxx |6 +++---
4 files changed, 17 insertions(+), 7 deletions(-)
New commits:
commit 4002fae08754aec38873bc453f991773ec6536f0
Author: Ravindra Vidhate
Date: Thu May 22 15:39:25 2014 +0530
fdo#79062 File having Footnote with Text Effect got corrupted after RT
When we do the export of the file, In the footnotes.xml,
the w14 namespaces were not being added.
This issue exists for EndNotes as well.
Change-Id: I6494bbf1beaa0666743d9c1bb85a64f8bda20398
Reviewed-on: https://gerrit.libreoffice.org/9439
Reviewed-by: Miklos Vajna
Tested-by: Miklos Vajna
diff --git a/sw/qa/extras/ooxmlexport/data/fdo79062.docx
b/sw/qa/extras/ooxmlexport/data/fdo79062.docx
new file mode 100644
index 000..181ea72
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo79062.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 1d8d890..728af1c 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3512,6 +3512,19 @@ DECLARE_OOXMLEXPORT_TEST(testFdo78910, "fdo78910.docx")
assertXPath ( pXmlDoc, "//w:hyperlink[2]/w:r[5]/w:fldChar", "fldCharType",
"end" );
}
+DECLARE_OOXMLEXPORT_TEST(testFDO79062, "fdo79062.docx")
+{
+xmlDocPtr pXmlFootNotes = parseExport("word/footnotes.xml");
+if (!pXmlFootNotes)
+return;
+assertXPath(pXmlFootNotes, "/w:footnotes", "Ignorable", "w14 wp14");
+
+xmlDocPtr pXmlEndNotes = parseExport("word/endnotes.xml");
+if (!pXmlEndNotes)
+return;
+assertXPath(pXmlEndNotes, "/w:endnotes", "Ignorable", "w14 wp14");
+}
+
DECLARE_OOXMLEXPORT_TEST(testFdo78957, "fdo78957.docx")
{
xmlDocPtr pXmlHeader = parseExport("word/header2.xml");
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 7539c9b..2e2cb9d 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -6040,10 +6040,7 @@ void DocxAttributeOutput::FootnotesEndnotes( bool
bFootnotes )
sal_Int32 nBody = bFootnotes? XML_footnotes: XML_endnotes;
sal_Int32 nItem = bFootnotes? XML_footnote: XML_endnote;
-m_pSerializer->startElementNS( XML_w, nBody,
-FSNS( XML_xmlns, XML_w ),
"http://schemas.openxmlformats.org/wordprocessingml/2006/main";,
-FSNS( XML_xmlns, XML_r ),
"http://schemas.openxmlformats.org/officeDocument/2006/relationships";,
-FSEND );
+m_pSerializer->startElementNS( XML_w, nBody,
m_rExport.MainXmlNamespaces(m_pSerializer) );
sal_Int32 nIndex = 0;
diff --git a/sw/source/filter/ww8/docxexport.hxx
b/sw/source/filter/ww8/docxexport.hxx
index cd5450e..950db24 100644
--- a/sw/source/filter/ww8/docxexport.hxx
+++ b/sw/source/filter/ww8/docxexport.hxx
@@ -246,9 +246,6 @@ private:
/// Write word/embeddings/Worksheet[n].xlsx
void WriteEmbeddings();
-/// All xml namespaces to be used at the top of any text .xml file (main
doc, headers, footers,...)
-sax_fastparser::XFastAttributeListRef MainXmlNamespaces(
sax_fastparser::FSHelperPtr serializer );
-
/// Get background color of the document, if there is one.
boost::optional getBackground();
@@ -256,6 +253,9 @@ private:
bool isMirroredMargin();
public:
+/// All xml namespaces to be used at the top of any text .xml file (main
doc, headers, footers,...)
+sax_fastparser::XFastAttributeListRef MainXmlNamespaces(
sax_fastparser::FSHelperPtr serializer );
+
/// FIXME this is temporary, remotely reminding the method of the same
/// name in WW8Export.
void WriteMainText();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sw/qa sw/source
sw/qa/extras/ooxmlexport/data/fdo78887.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 11 +++
sw/source/filter/ww8/docxattributeoutput.cxx | 11 ++-
3 files changed, 21 insertions(+), 1 deletion(-)
New commits:
commit 637a96d1e7875043c28a93c9a543f33a862497cb
Author: Ravindra Vidhate
Date: Wed May 21 14:54:35 2014 +0530
fdo#78887 tag is not being preserved after export.
When we have tag continuous like in the following cases...
"Title: Superstition\v\vComposer: Stevie Wonder\v\v"
or "\vLyrics: \v"
where "\n" is internally replaced by "\v" LO.
Before text "\v" or after text multiple "\v" is not preserved.
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Reviewed on:
https://gerrit.libreoffice.org/9420
(cherry picked from commit 8555c24e069dc00071eaad23c711f1d1375e5afc)
Signed-off-by: Michael Stahl
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Change-Id: I2a6d0a7d2382dfbc2f0ab04f150653c9b17bbfd1
diff --git a/sw/qa/extras/ooxmlexport/data/fdo78887.docx
b/sw/qa/extras/ooxmlexport/data/fdo78887.docx
new file mode 100644
index 000..db92fe4
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo78887.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index a87ddef..668caa3 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3180,6 +3180,17 @@ DECLARE_OOXMLEXPORT_TEST(testFDO77890 , "fdo77890.docx")
assertXPath(pXmlDoc, "/w:document/w:body/w:p[2]/w:r[2]/w:br", "type",
"page");
}
+DECLARE_OOXMLEXPORT_TEST(testFDO78887, "fdo78887.docx")
+{
+xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+if (!pXmlDoc)
+return;
+
+assertXPath(pXmlDoc, "/w:document[1]/w:body[1]/w:p[1]/w:r[1]/w:br[1]", 1);
+assertXPathContent(pXmlDoc,
"/w:document[1]/w:body[1]/w:p[1]/w:r[1]/w:t[1]", "Lyrics: ");
+assertXPath(pXmlDoc, "/w:document[1]/w:body[1]/w:p[1]/w:r[1]/w:br[2]", 1);
+}
+
DECLARE_OOXMLEXPORT_TEST(testNumberedList,"NumberedList.docx")
{
//fdo74150:In document.xml, for pStyle = "NumberedList1", iLvl and numId
was not preserved
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index f16fdf6..3eba470 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1680,6 +1680,8 @@ void DocxAttributeOutput::RunText( const OUString& rText,
rtl_TextEncoding /*eCh
if ( m_pRedlineData && m_pRedlineData->GetType() ==
nsRedlineType_t::REDLINE_DELETE )
nTextToken = XML_delText;
+sal_Unicode prevUnicode = *pBegin;
+
for ( const sal_Unicode *pIt = pBegin; pIt < pEnd; ++pIt )
{
switch ( *pIt )
@@ -1687,20 +1689,26 @@ void DocxAttributeOutput::RunText( const OUString&
rText, rtl_TextEncoding /*eCh
case 0x09: // tab
impl_WriteRunText( m_pSerializer, nTextToken, pBegin, pIt );
m_pSerializer->singleElementNS( XML_w, XML_tab, FSEND );
+prevUnicode = *pIt;
break;
case 0x0b: // line break
{
-if (impl_WriteRunText( m_pSerializer, nTextToken, pBegin,
pIt ))
+if (impl_WriteRunText( m_pSerializer, nTextToken, pBegin,
pIt ) || (prevUnicode == *pIt))
+{
m_pSerializer->singleElementNS( XML_w, XML_br, FSEND );
+prevUnicode = *pIt;
+}
}
break;
case 0x1E: //non-breaking hyphen
impl_WriteRunText( m_pSerializer, nTextToken, pBegin, pIt );
m_pSerializer->singleElementNS( XML_w, XML_noBreakHyphen,
FSEND );
+prevUnicode = *pIt;
break;
case 0x1F: //soft (on demand) hyphen
impl_WriteRunText( m_pSerializer, nTextToken, pBegin, pIt );
m_pSerializer->singleElementNS( XML_w, XML_softHyphen, FSEND );
+prevUnicode = *pIt;
break;
default:
if ( *pIt < 0x0020 ) // filter out the control codes
@@ -1708,6 +1716,7 @@ void DocxAttributeOutput::RunText( const OUString& rText,
rtl_TextEncoding /*eCh
impl_WriteRunText( m_pSerializer, nTextToken, pBegin, pIt
);
OSL_TRACE( "Ignored control code %x in a text run.", *pIt
);
}
+prevUnicode = *pIt;
break;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sw/qa sw/source
sw/qa/extras/ooxmlexport/data/fdo79062.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 13 +
sw/source/filter/ww8/docxattributeoutput.cxx |5 +
sw/source/filter/ww8/docxexport.hxx |6 +++---
4 files changed, 17 insertions(+), 7 deletions(-)
New commits:
commit 37f93938ad4520cebf1e9cca7859cbf77ab5f766
Author: Ravindra Vidhate
Date: Thu May 22 15:39:25 2014 +0530
fdo#79062 File having Footnote with Text Effect got corrupted after RT
When we do the export of the file, In the footnotes.xml,
the w14 namespaces were not being added.
This issue exists for EndNotes as well.
Reviewed-on: https://gerrit.libreoffice.org/9439
Reviewed-by: Miklos Vajna
Tested-by: Miklos Vajna
(cherry picked from commit 4002fae08754aec38873bc453f991773ec6536f0)
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Change-Id: I6494bbf1beaa0666743d9c1bb85a64f8bda20398
diff --git a/sw/qa/extras/ooxmlexport/data/fdo79062.docx
b/sw/qa/extras/ooxmlexport/data/fdo79062.docx
new file mode 100644
index 000..181ea72
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo79062.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 9a19485..4d02d31 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -1670,6 +1670,19 @@ DECLARE_OOXMLEXPORT_TEST(testFdo70812, "fdo70812.docx")
getParagraph(1, "Sample pages document.");
}
+DECLARE_OOXMLEXPORT_TEST(testFDO79062, "fdo79062.docx")
+{
+xmlDocPtr pXmlFootNotes = parseExport("word/footnotes.xml");
+if (!pXmlFootNotes)
+return;
+assertXPath(pXmlFootNotes, "/w:footnotes", "Ignorable", "w14 wp14");
+
+xmlDocPtr pXmlEndNotes = parseExport("word/endnotes.xml");
+if (!pXmlEndNotes)
+return;
+assertXPath(pXmlEndNotes, "/w:endnotes", "Ignorable", "w14 wp14");
+}
+
DECLARE_OOXMLEXPORT_TEST(testPgMargin, "testPgMargin.docx")
{
xmlDocPtr pXmlDoc = parseExport();
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 5cfda6e..a8b5fcd 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -5970,10 +5970,7 @@ void DocxAttributeOutput::FootnotesEndnotes( bool
bFootnotes )
sal_Int32 nBody = bFootnotes? XML_footnotes: XML_endnotes;
sal_Int32 nItem = bFootnotes? XML_footnote: XML_endnote;
-m_pSerializer->startElementNS( XML_w, nBody,
-FSNS( XML_xmlns, XML_w ),
"http://schemas.openxmlformats.org/wordprocessingml/2006/main";,
-FSNS( XML_xmlns, XML_r ),
"http://schemas.openxmlformats.org/officeDocument/2006/relationships";,
-FSEND );
+m_pSerializer->startElementNS( XML_w, nBody,
m_rExport.MainXmlNamespaces(m_pSerializer) );
sal_Int32 nIndex = 0;
diff --git a/sw/source/filter/ww8/docxexport.hxx
b/sw/source/filter/ww8/docxexport.hxx
index cd5450e..950db24 100644
--- a/sw/source/filter/ww8/docxexport.hxx
+++ b/sw/source/filter/ww8/docxexport.hxx
@@ -246,9 +246,6 @@ private:
/// Write word/embeddings/Worksheet[n].xlsx
void WriteEmbeddings();
-/// All xml namespaces to be used at the top of any text .xml file (main
doc, headers, footers,...)
-sax_fastparser::XFastAttributeListRef MainXmlNamespaces(
sax_fastparser::FSHelperPtr serializer );
-
/// Get background color of the document, if there is one.
boost::optional getBackground();
@@ -256,6 +253,9 @@ private:
bool isMirroredMargin();
public:
+/// All xml namespaces to be used at the top of any text .xml file (main
doc, headers, footers,...)
+sax_fastparser::XFastAttributeListRef MainXmlNamespaces(
sax_fastparser::FSHelperPtr serializer );
+
/// FIXME this is temporary, remotely reminding the method of the same
/// name in WW8Export.
void WriteMainText();
___
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/fdo79915.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx|9 +
sw/source/filter/ww8/wrtw8nds.cxx |7 +++
3 files changed, 16 insertions(+)
New commits:
commit fe5b3c3357d9e613a0be53ec1e5546a59e21cea0
Author: Ravindra Vidhate
Date: Wed Jun 11 16:38:17 2014 +0530
fdo#79915:Text Data Lost after exporting through LO
In the OutputTextNode, the text data is postponed when the in case of
NOT_PROCESSED state of fly frame. This text data is never been processed
later.
When the text data is postponed we should write this before processing
the next text node.
Change-Id: Ib8d5fdcf8dcfb9ff394d32103502150e08bbd521
Reviewed-on: https://gerrit.libreoffice.org/9737
Reviewed-by: Miklos Vajna
Tested-by: Miklos Vajna
diff --git a/sw/qa/extras/ooxmlexport/data/fdo79915.docx
b/sw/qa/extras/ooxmlexport/data/fdo79915.docx
new file mode 100644
index 000..351674d
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo79915.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 27752df..d97be6f 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3617,6 +3617,15 @@ DECLARE_OOXMLEXPORT_TEST(testfdo79822, "fdo79822.docx")
return;
}
+DECLARE_OOXMLEXPORT_TEST(testFDO79915, "fdo79915.docx")
+{
+xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+if (!pXmlDoc)
+return;
+
+assertXPathContent(pXmlDoc, "/w:document/w:body/w:p[2]/w:r[8]/w:t", "How
much buoyancy does the water provide?");
+}
+
DECLARE_OOXMLEXPORT_TEST(testfdo79817,"fdo79817.docx")
{
xmlDocPtr pXmlDoc = parseExport("word/document.xml");
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx
b/sw/source/filter/ww8/wrtw8nds.cxx
index 1bc795e..d885948 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -2320,6 +2320,13 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode&
rNode )
AttrOutput().RunText( aSavedSnippet, eChrSet );
AttrOutput().EndRun();
}
+else if( bPostponeWritingText && FLY_NOT_PROCESSED == nStateOfFlyFrame
)
+{
+//write the postponed text run
+bPostponeWritingText = false ;
+AttrOutput().RunText( aSavedSnippet, eChrSet );
+AttrOutput().EndRun();
+}
else
AttrOutput().EndRun();
___
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/fdo80097.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 51 +++
sw/source/filter/ww8/docxattributeoutput.cxx |5 ++
3 files changed, 56 insertions(+)
New commits:
commit 6bd609d8451c08504c47c86196c508a7022dd4b7
Author: Ravindra Vidhate
Date: Tue Jun 24 17:54:59 2014 +0530
fdo#80097 : tblBorders and tcBorders are not preserved for the table.
When we have multiple tables inside a table, the tblBorders and
tcBorders of the inside tables are not getting preserved.
The issue is m_aTableStyleConf is not clear when the LO starts
writing the properties of the inside table.
Change-Id: I30081b8a5a59614430a2279550ae7eb589cb71ec
Reviewed-on: https://gerrit.libreoffice.org/9893
Reviewed-by: Miklos Vajna
Tested-by: Miklos Vajna
diff --git a/sw/qa/extras/ooxmlexport/data/fdo80097.docx
b/sw/qa/extras/ooxmlexport/data/fdo80097.docx
new file mode 100644
index 000..3f8ba9f
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo80097.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 35986b3..8683d56 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3615,6 +3615,57 @@ DECLARE_OOXMLEXPORT_TEST(testfdo79969_xlsb,
"fdo79969_xlsb.docx")
"/word/embeddings/oleObject1.xlsb");
}
+DECLARE_OOXMLEXPORT_TEST(testfdo80097, "fdo80097.docx")
+{
+//fdo#76635 : Table borders are not getting preserved.
+
+xmlDocPtr pXmlDocument = parseExport("word/document.xml");
+if (!pXmlDocument)
+return;
+
+//Table Borders
+assertXPath(pXmlDocument,
"/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tblPr/w:tblBorders/w:top[@w:val
= 'single']",1);
+assertXPath(pXmlDocument,
"/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tblPr/w:tblBorders/w:top[@w:sz
= 4]", 1);
+assertXPath(pXmlDocument,
"/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tblPr/w:tblBorders/w:top[@w:space
= 0]", 1);
+assertXPath(pXmlDocument,
"/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tblPr/w:tblBorders/w:top[@w:color
= '0A']", 1);
+
+assertXPath(pXmlDocument,
"/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tblPr/w:tblBorders/w:bottom[@w:val
= 'single']",1);
+assertXPath(pXmlDocument,
"/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tblPr/w:tblBorders/w:bottom[@w:sz
= 4]", 1);
+assertXPath(pXmlDocument,
"/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tblPr/w:tblBorders/w:bottom[@w:space
= 0]", 1);
+assertXPath(pXmlDocument,
"/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tblPr/w:tblBorders/w:bottom[@w:color
= '0A']", 1);
+
+assertXPath(pXmlDocument,
"/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tblPr/w:tblBorders/w:insideH[@w:val
= 'single']",1);
+assertXPath(pXmlDocument,
"/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tblPr/w:tblBorders/w:insideH[@w:sz
= 4]", 1);
+assertXPath(pXmlDocument,
"/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tblPr/w:tblBorders/w:insideH[@w:space
= 0]", 1);
+assertXPath(pXmlDocument,
"/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tblPr/w:tblBorders/w:insideH[@w:color
= '0A']", 1);
+
+assertXPath(pXmlDocument,
"/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tblPr/w:tblBorders/w:insideV[@w:val
= 'single']",1);
+assertXPath(pXmlDocument,
"/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tblPr/w:tblBorders/w:insideV[@w:sz
= 4]", 1);
+assertXPath(pXmlDocument,
"/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tblPr/w:tblBorders/w:insideV[@w:space
= 0]", 1);
+assertXPath(pXmlDocument,
"/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tblPr/w:tblBorders/w:insideV[@w:color
= '0A']", 1);
+
+//Table Cell Borders
+assertXPath(pXmlDocument,
"/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tr[1]/w:tc[1]/w:tcPr/w:tcBorders/w:top[@w:val
= 'single']",1);
+assertXPath(pXmlDocument,
"/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tr[1]/w:tc[1]/w:tcPr/w:tcBorders/w:top[@w:sz
= 4]", 1);
+assertXPath(pXmlDocument,
"/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tr[1]/w:tc[1]/w:tcPr/w:tcBorders/w:top[@w:space
= 0]", 1);
+assertXPath(pXmlDocument,
"/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tr[1]/w:tc[1]/w:tcPr/w:tcBorders/w:top[@w:color
= '0A']", 1);
+
+assertXPath(pXmlDocument,
"/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tr[1]/w:tc[1]/w:tcPr/w:tcBorders/w:bottom[@w:val
= 'single']",1);
+assertXPath(pXmlDocument,
"/w:
License statement : Synerzip
Hi All, For the record, All contributions past and present made to LibreOffice from Synerzip are available under the terms the MPL / LGPLv3+. Until further notice, future contributions made to LibreOffice from Synerzip are available under the terms the MPL / LGPLv3+. Regards, Ravindra Vidhate Synerzip, Pune. -- This e-mail, including any attached files, may contain confidential and privileged information for the sole use of the intended recipient. Any review, use, distribution, or disclosure by others is strictly prohibited. If you are not the intended recipient (or authorized to receive information for the intended recipient), please contact the sender by reply e-mail and delete all copies of this message. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: oox/source sw/qa
oox/source/export/drawingml.cxx |4 ++--
sw/qa/extras/ooxmlexport/data/fdo77476.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx| 11 +++
3 files changed, 13 insertions(+), 2 deletions(-)
New commits:
commit ccfc02f7691848284403d339ee17054169fbff1d
Author: Ravindra Vidhate
Date: Tue Apr 15 15:24:40 2014 +0530
fdo#77476:FILE_SAVE : 'TIF' is changed to 'TIFF' in RT
1. Open the attached file in LO which has images [.TIF] format
2. Save the document as DOCX
3. Open the saved document in MS-Office or extract the content of the saved
docx file.
In [Content_Types].xml , .tif extension is changed to .tiff.
Change-Id: I73baea9ad6cd991b04d47e23865b77432127a510
Reviewed-on: https://gerrit.libreoffice.org/9010
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index f3aceee..fd60107 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -749,8 +749,8 @@ OUString DrawingML::WriteImage( const Graphic& rGraphic ,
bool bRelPathToMedia )
pExtension = ".png";
break;
case GFX_LINK_TYPE_NATIVE_TIF:
-sMediaType = "image/tiff";
-pExtension = ".tiff";
+sMediaType = "image/tif";
+pExtension = ".tif";
break;
case GFX_LINK_TYPE_NATIVE_WMF:
sMediaType = "image/x-wmf";
diff --git a/sw/qa/extras/ooxmlexport/data/fdo77476.docx
b/sw/qa/extras/ooxmlexport/data/fdo77476.docx
new file mode 100644
index 000..08c38b0
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo77476.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index a3853cf..1e4067e 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3130,6 +3130,17 @@ DECLARE_OOXMLEXPORT_TEST(testFDO76597, "fdo76597.docx")
assertXPath(pXmlDoc, "/w:document/w:body/w:p[4]/w:pPr/w:spacing",
"before", "96");
assertXPath(pXmlDoc, "/w:document/w:body/w:p[4]/w:pPr/w:spacing", "after",
"120");
}
+
+DECLARE_OOXMLEXPORT_TEST(testContentTypeTIF, "fdo77476.docx")
+{
+xmlDocPtr pXmlDoc = parseExport("[Content_Types].xml");
+
+if (!pXmlDoc)
+ return;
+
+assertXPath(pXmlDoc,
"/ContentType:Types/ContentType:Override[@ContentType='image/tif']",
"PartName", "/word/media/image1.tif");
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: oox/source sw/qa writerfilter/source
oox/source/vml/vmlshape.cxx | 14 +
sw/qa/extras/ooxmlexport/data/test77219.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx |8 +
sw/qa/extras/ooxmlimport/ooxmlimport.cxx |2 -
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 31 +-
5 files changed, 48 insertions(+), 7 deletions(-)
New commits:
commit 2496eaa5c4535b88b44e4ac034aae6af0c08de0e
Author: Ravindra Vidhate
Date: Wed Apr 16 15:32:43 2014 +0530
fdo#77219 Image property Z-index [behindDoc] not preserved after RT
Problem description:
For the images who has the "Text wrapping" property set as Behind Text
is not preserved after saving the file in DOCX format using LO.
Reviewed on:
https://gerrit.libreoffice.org/9065
Change-Id: Ic8555103909c0f1ed1cb58fba4dc2ef2f84cc9dd
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index d4bdbcf..6167a19 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -336,6 +336,20 @@ Reference< XShape > ShapeBase::convertAndInsert( const
Reference< XShapes >& rxS
aGrabBag[length].Value = uno::makeAny(
maTypeModel.maZIndex.toInt32() );
propertySet->setPropertyValue( "FrameInteropGrabBag",
uno::makeAny(aGrabBag) );
}
+else
+{
+if( maTypeModel.maZIndex.toInt32() )
+{
+uno::Sequence aGrabBag;
+uno::Reference propertySet
(xShape, uno::UNO_QUERY);
+propertySet->getPropertyValue("InteropGrabBag") >>=
aGrabBag;
+sal_Int32 length = aGrabBag.getLength();
+aGrabBag.realloc( length+1 );
+aGrabBag[length].Name = "VML-Z-ORDER";
+aGrabBag[length].Value = uno::makeAny(
maTypeModel.maZIndex.toInt32() );
+propertySet->setPropertyValue( "InteropGrabBag",
uno::makeAny(aGrabBag) );
+}
+}
Reference< XControlShape > xControlShape( xShape,
uno::UNO_QUERY );
if ( xControlShape.is() && !getTypeModel().mbVisible )
{
diff --git a/sw/qa/extras/ooxmlexport/data/test77219.docx
b/sw/qa/extras/ooxmlexport/data/test77219.docx
new file mode 100644
index 000..29aca1b
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/test77219.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 1e4067e..e7f57e6 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3121,6 +3121,14 @@ DECLARE_OOXMLEXPORT_TEST(test76734_2K7,
"test76734_2K7.docx")
assertXPath(pXmlDoc,
"/w:document[1]/w:body[1]/w:p[1]/w:r[3]/mc:AlternateContent[1]/mc:Choice[1]",
"Requires", "wps");
}
+DECLARE_OOXMLEXPORT_TEST(test77219, "test77219.docx")
+{
+xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+if (!pXmlDoc)
+return;
+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(testFDO76597, "fdo76597.docx")
{
// check XML
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 6e3388b..f727d6f 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -743,7 +743,7 @@ DECLARE_OOXMLIMPORT_TEST(testN779627, "n779627.docx")
* Another problem tested with this document is that the roundrect is
* centered vertically and horizontally.
*/
-uno::Reference xShapeProperties( getShape(4),
uno::UNO_QUERY );
+uno::Reference xShapeProperties( getShape(1),
uno::UNO_QUERY );
uno::Reference
xShapeDescriptor(xShapeProperties, uno::UNO_QUERY);
// If this goes wrong, probably the index of the shape is changed and the
test should be adjusted.
CPPUNIT_ASSERT_EQUAL(OUString("com.sun.star.drawing.RectangleShape"),
xShapeDescriptor->getShapeType());
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 51810b3..3a6dfef 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1742,11 +1742,7 @@ void DomainMapper_Impl::PushShapeContext( const
uno::Reference< drawing::XShape
#endif
text::TextContentAnchorType
nAnchorType(text::TextContentAnchorType_AT_PARAGRAPH);
xProps->getPropertyValue(rPropNameSupplier.GetName(
PROP_ANCHOR
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/data/fdo77759.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 13 +
sw/source/filter/ww8/docxattributeoutput.cxx |7 +--
sw/source/filter/ww8/docxexport.cxx |4 ++--
sw/source/filter/ww8/docxexport.hxx |2 +-
5 files changed, 21 insertions(+), 5 deletions(-)
New commits:
commit a3c00ee3c7b3b0fbcde32baeb7023c7e8526b908
Author: Ravindra Vidhate
Date: Tue Apr 22 15:28:46 2014 +0530
fdo#77759 : Embedded excel getting renamed to binary object.
The embedded excel (xlsx) when inserted on its own (unlike with chart) is
getting converted to ".bin".
Note that only extension differs otherwise its an excel file only.
There is no loss of user experience in editing the file in MS Word.
The similar case is also exists when power point is inserted on it's own.
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Reviewed on:
https://gerrit.libreoffice.org/9126
Change-Id: Ie13c098a794179c3b27100a7b9e30884fb47f656
diff --git a/sw/qa/extras/ooxmlexport/data/fdo77759.docx
b/sw/qa/extras/ooxmlexport/data/fdo77759.docx
new file mode 100644
index 000..6558690
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo77759.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 31fd36b..18f91a8 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3225,6 +3225,19 @@ DECLARE_OOXMLEXPORT_TEST(testFDO75431, "fdo75431.docx")
assertXPath(pXmlDoc, "//w:p/w:pPr/w:sectPr/w:type", "val", "nextPage");
}
+DECLARE_OOXMLEXPORT_TEST(testContentTypeOLE, "fdo77759.docx")
+{
+xmlDocPtr pXmlDoc = parseExport("[Content_Types].xml");
+
+if (!pXmlDoc)
+ return;
+
+assertXPath(pXmlDoc,
+
"/ContentType:Types/ContentType:Override[@ContentType='application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']",
+"PartName",
+"/word/embeddings/oleObject1.xlsx");
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index a4679f7..27835b3 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -4011,7 +4011,7 @@ void DocxAttributeOutput::WriteOLE( SwOLENode& rNode,
const Size& rSize, const S
OUString sObjectName = aContainer->GetEmbeddedObjectName( xObj );
// set some attributes according to the type of the embedded object
-OUString sProgID, sMediaType, sRelationType;
+OUString sProgID, sMediaType, sRelationType, sFileExtension;
for( sal_Int32 i=0; i < aObjectsInteropList.getLength(); ++i )
if ( aObjectsInteropList[i].Name == sObjectName )
{
@@ -4022,20 +4022,23 @@ void DocxAttributeOutput::WriteOLE( SwOLENode& rNode,
const Size& rSize, const S
{
sMediaType =
"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
sRelationType =
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/package";;
+sFileExtension = "xlsx";
}
else if( sProgID.startsWith("PowerPoint.Show") )
{
sMediaType =
"application/vnd.openxmlformats-officedocument.presentationml.presentation";
sRelationType =
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/package";;
+sFileExtension = "pptx";
}
else
{
sMediaType = "application/vnd.openxmlformats-officedocument.oleObject";
sRelationType =
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/oleObject";;
+sFileExtension = "bin";
}
// write embedded file
-OString sId = m_rExport.WriteOLEObject( aObject, sMediaType, sRelationType
);
+OString sId = m_rExport.WriteOLEObject( aObject, sMediaType,
sRelationType, sFileExtension );
if( sId.isEmpty() )
{
diff --git a/sw/source/filter/ww8/docxexport.cxx
b/sw/source/filter/ww8/docxexport.cxx
index ff74f3a..c3a6ddf 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -358,13 +358,13 @@ OString DocxExport::OutputChart( uno::Reference<
frame::XModel >& xModel, sal_In
return OUStringToOString( sId, RTL_TEXTENCODING_UTF8 );
}
-OString DocxExport::WriteOLEObject( SwOLEObj& rObject, const OUString&
sMediaType, const OUString& sRelationType )
+OString DocxExport::WriteOLEObject( SwOLEObj& rObject, const OUString&
sMediaType, const OUString& sRelationType, const OUString& sFileExtension )
{
uno::Reference xObj( rObje
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/data/fdo77725.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 12
sw/source/filter/ww8/docxattributeoutput.cxx | 12
3 files changed, 20 insertions(+), 4 deletions(-)
New commits:
commit 74126c42c309d3166235748980ee5e1e4a5fecb0
Author: Ravindra Vidhate
Date: Mon Apr 21 16:32:58 2014 +0530
fdo#77725 LO not able to open/save file when exported multiple times.
Problem description:
The LO is not able to save the file if exported multiple times and the
exported file is used as input.
The main root cause is Extra Line breaks getting added even though there is
no text available.
Change-Id: I0afb52380912cae140d7ded694cb7cae9a8362a9
Reviewed-on: https://gerrit.libreoffice.org/9112
Reviewed-by: Miklos Vajna
Tested-by: Miklos Vajna
diff --git a/sw/qa/extras/ooxmlexport/data/fdo77725.docx
b/sw/qa/extras/ooxmlexport/data/fdo77725.docx
new file mode 100644
index 000..7813459
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo77725.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index b1bc8c2..2edbd28 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3185,6 +3185,18 @@ DECLARE_OOXMLEXPORT_TEST(testFDO75431, "fdo75431.docx")
assertXPath(pXmlDoc, "//w:p/w:pPr/w:sectPr/w:type", "val", "nextPage");
}
+DECLARE_OOXMLEXPORT_TEST(testFDO77725, "fdo77725.docx")
+{
+xmlDocPtr pXmlFootnotes = parseExport("word/footnotes.xml");
+if (!pXmlFootnotes)
+return;
+
+assertXPath(pXmlFootnotes,
"//w:footnotes[1]/w:footnote[3]/w:p[3]/w:r[1]/w:br[1]", 0);
+assertXPath(pXmlFootnotes,
"//w:footnotes[1]/w:footnote[3]/w:p[3]/w:r[1]/w:br[2]", 0);
+assertXPath(pXmlFootnotes,
"//w:footnotes[1]/w:footnote[3]/w:p[3]/w:r[1]/w:br[3]", 0);
+
+}
+
DECLARE_OOXMLEXPORT_TEST(testContentTypeOLE, "fdo77759.docx")
{
xmlDocPtr pXmlDoc = parseExport("[Content_Types].xml");
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 1bc6305..7fd9a37 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1610,7 +1610,7 @@ void DocxAttributeOutput::FootnoteEndnoteRefTag()
1, meaning that it skips one character after the text. This is to make
the switch in DocxAttributeOutput::RunText() nicer ;-)
*/
-static void impl_WriteRunText( FSHelperPtr pSerializer, sal_Int32 nTextToken,
+static bool impl_WriteRunText( FSHelperPtr pSerializer, sal_Int32 nTextToken,
const sal_Unicode* &rBegin, const sal_Unicode* pEnd, bool bMove = true
)
{
const sal_Unicode *pBegin = rBegin;
@@ -1620,7 +1620,7 @@ static void impl_WriteRunText( FSHelperPtr pSerializer,
sal_Int32 nTextToken,
rBegin = pEnd + 1;
if ( pBegin >= pEnd )
-return; // we want to write at least one character
+return false; // we want to write at least one character
// we have to add 'preserve' when starting/ending with space
if ( *pBegin == ' ' || *( pEnd - 1 ) == ' ' )
@@ -1633,6 +1633,8 @@ static void impl_WriteRunText( FSHelperPtr pSerializer,
sal_Int32 nTextToken,
pSerializer->writeEscaped( OUString( pBegin, pEnd - pBegin ) );
pSerializer->endElementNS( XML_w, nTextToken );
+
+return true;
}
void DocxAttributeOutput::RunText( const OUString& rText, rtl_TextEncoding
/*eCharSet*/ )
@@ -1660,8 +1662,10 @@ void DocxAttributeOutput::RunText( const OUString&
rText, rtl_TextEncoding /*eCh
m_pSerializer->singleElementNS( XML_w, XML_tab, FSEND );
break;
case 0x0b: // line break
-impl_WriteRunText( m_pSerializer, nTextToken, pBegin, pIt );
-m_pSerializer->singleElementNS( XML_w, XML_br, FSEND );
+{
+if (impl_WriteRunText( m_pSerializer, nTextToken, pBegin,
pIt ))
+m_pSerializer->singleElementNS( XML_w, XML_br, FSEND );
+}
break;
case 0x1E: //non-breaking hyphen
impl_WriteRunText( m_pSerializer, nTextToken, pBegin, pIt );
___
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 writerfilter/source
sw/qa/extras/ooxmlexport/data/fdo77887.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 17 +++
sw/source/filter/ww8/docxattributeoutput.cxx | 57 +
writerfilter/source/dmapper/DomainMapperTableHandler.cxx | 65 ---
writerfilter/source/dmapper/DomainMapperTableManager.cxx |8 +
writerfilter/source/dmapper/DomainMapperTableManager.hxx |1
writerfilter/source/dmapper/TablePositionHandler.hxx | 42 +
7 files changed, 179 insertions(+), 11 deletions(-)
New commits:
commit cbcc6189e300b6aa5e9e8e6883598a4d28b770c0
Author: Ravindra Vidhate
Date: Mon Apr 28 15:05:54 2014 +0530
fdo#77887 : Floating Table positions are not preserved when doing Export
The margin of the floating table from top of the page is not being
preserved correctly and it also get increased.
The w:tblpPr tag is also not preserved.
Reviewed on:
https://gerrit.libreoffice.org/9185
Change-Id: I8a27a4bab94a1afd27a7ba49ca55ff014918fffc
diff --git a/sw/qa/extras/ooxmlexport/data/fdo77887.docx
b/sw/qa/extras/ooxmlexport/data/fdo77887.docx
new file mode 100644
index 000..cb3f453
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo77887.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 44b9aa7..55b08e7 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3174,6 +3174,23 @@ DECLARE_OOXMLEXPORT_TEST(testFDO77117, "fdo77117.docx")
CPPUNIT_ASSERT_EQUAL(11.f, getProperty(xShape, "CharHeight"));
}
+DECLARE_OOXMLEXPORT_TEST(testFloatingTable, "fdo77887.docx")
+{
+xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+
+if (!pXmlDoc)
+ return;
+
+assertXPath(pXmlDoc,
"/w:document[1]/w:body[1]/w:tbl[1]/w:tblPr[1]/w:tblpPr[1]", "horzAnchor",
"margin");
+assertXPath(pXmlDoc,
"/w:document[1]/w:body[1]/w:tbl[1]/w:tblPr[1]/w:tblpPr[1]", "leftFromText",
"141");
+assertXPath(pXmlDoc,
"/w:document[1]/w:body[1]/w:tbl[1]/w:tblPr[1]/w:tblpPr[1]", "rightFromText",
"141");
+assertXPath(pXmlDoc,
"/w:document[1]/w:body[1]/w:tbl[1]/w:tblPr[1]/w:tblpPr[1]", "tblpXSpec",
"center");
+assertXPath(pXmlDoc,
"/w:document[1]/w:body[1]/w:tbl[1]/w:tblPr[1]/w:tblpPr[1]", "tblpY", "2266");
+assertXPath(pXmlDoc,
"/w:document[1]/w:body[1]/w:tbl[1]/w:tblPr[1]/w:tblpPr[1]", "vertAnchor",
"page");
+
+}
+
+
DECLARE_OOXMLEXPORT_TEST(testFDO75431, "fdo75431.docx")
{
xmlDocPtr pXmlDoc = parseExport("word/document.xml");
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 7fd9a37..66b1b26 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -2728,6 +2728,63 @@ void DocxAttributeOutput::TableDefinition(
ww8::WW8TableNodeInfoInner::Pointer_t
m_aTableStyleConf[ BOX_LINE_LEFT ] =
aGrabBagElement->second.get();
else if( aGrabBagElement->first == "TableStyleRightBorder" )
m_aTableStyleConf[ BOX_LINE_RIGHT ] =
aGrabBagElement->second.get();
+else if (aGrabBagElement->first == "TablePosition" )
+{
+FastAttributeList *attrListTablePos =
m_pSerializer->createAttrList( );
+uno::Sequence aTablePosition =
aGrabBagElement->second.get >();
+for (sal_Int32 i = 0; i < aTablePosition.getLength(); ++i)
+{
+if (aTablePosition[i].Name == "vertAnchor")
+{
+OString strTemp =
OUStringToOString(aTablePosition[i].Value.get(),
RTL_TEXTENCODING_UTF8);
+attrListTablePos->add( FSNS( XML_w, XML_vertAnchor ),
strTemp.getStr() );
+}
+else if (aTablePosition[i].Name == "tblpYSpec")
+{
+OString strTemp =
OUStringToOString(aTablePosition[i].Value.get(),
RTL_TEXTENCODING_UTF8);
+attrListTablePos->add( FSNS( XML_w, XML_tblpYSpec ),
strTemp.getStr() );
+}
+else if (aTablePosition[i].Name == "horzAnchor")
+{
+OString strTemp =
OUStringToOString(aTablePosition[i].Value.get(),
RTL_TEXTENCODING_UTF8);
+attrListTablePos->add( FSNS( XML_w, XML_horzAnchor ),
strTemp.getStr() );
+}
+else if (aTablePosition[i].Name == "tblpXSpec")
+{
+OString strTemp =
OUStringToOString(aTablePosition[i].Value.get(),
RTL_TEXTENCODING_U
[Libreoffice-commits] core.git: Changes to 'refs/changes/10/9010/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/10/9010/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/30/8530/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/10/9010/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/57/8457/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/30/8530/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/57/8457/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/12/9112/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/12/9112/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/20/9420/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/57/8457/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/60/8660/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/39/9439/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/39/9439/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/20/9420/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/72/8572/2'
___ 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/inc/swmodeltestbase.hxx|1 +
sw/qa/extras/ooxmlexport/data/fdo76098.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx| 12
sw/source/filter/ww8/docxexport.cxx |7 ++-
4 files changed, 19 insertions(+), 1 deletion(-)
New commits:
commit e1b5e32a704a93ceb99b20647ae0bc452866
Author: Ravindra Vidhate
Date: Thu Mar 13 15:13:32 2014 +0530
fdo#76098 ContentType for .xlsm external data file is wrong
1. Open a File which has Pie Chart in LO.
2. The content type of Pie Chart should Macro Enabled.
3. using LO, SAVE this file.
4. Opened the Save file in MS-Office.
5. The file gets corrupted due to the ContentType gets changed.
Conflicts:
sw/qa/extras/inc/swmodeltestbase.hxx
Reviewed on:
https://gerrit.libreoffice.org/8572
Change-Id: I20f92f52cc79df4fc5e10c4e4867e2e704ba3c86
diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx
b/sw/qa/extras/inc/swmodeltestbase.hxx
index d2f3b29..dde4a45 100644
--- a/sw/qa/extras/inc/swmodeltestbase.hxx
+++ b/sw/qa/extras/inc/swmodeltestbase.hxx
@@ -552,6 +552,7 @@ protected:
xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST("rels"),
BAD_CAST("http://schemas.openxmlformats.org/package/2006/relationships";));
xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST("w14"),
BAD_CAST("http://schemas.microsoft.com/office/word/2010/wordml";));
xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST("m"),
BAD_CAST("http://schemas.openxmlformats.org/officeDocument/2006/math";));
+xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST("ContentType"),
BAD_CAST("http://schemas.openxmlformats.org/package/2006/content-types";));
xmlXPathObjectPtr pXmlXpathObj =
xmlXPathEvalExpression(BAD_CAST(rXPath.getStr()), pXmlXpathCtx);
return pXmlXpathObj->nodesetval;
}
diff --git a/sw/qa/extras/ooxmlexport/data/fdo76098.docx
b/sw/qa/extras/ooxmlexport/data/fdo76098.docx
new file mode 100644
index 000..8a616e9
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo76098.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 772156e..e31bef9 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2813,6 +2813,18 @@ DECLARE_OOXMLEXPORT_TEST(testNestedAlternateContent,
"nestedAlternateContent.doc
assertXPath(pXmlDoc,"/w:document[1]/w:body[1]/w:p[1]/w:r[1]/mc:AlternateContent[1]/mc:Choice[1]/w:drawing[1]/wp:anchor[1]/a:graphic[1]/a:graphicData[1]/wpg:wgp[1]/wps:wsp[2]/wps:txbx[1]/w:txbxContent[1]/w:p[1]/w:r[2]/mc:AlternateContent[1]",0);
}
+DECLARE_OOXMLEXPORT_TEST(testContentTypeXLSM, "fdo76098.docx")
+{
+xmlDocPtr pXmlDoc = parseExport("[Content_Types].xml");
+
+if (!pXmlDoc)
+ return;
+
+assertXPath(pXmlDoc, "/ContentType:Types/ContentType:Override[2]",
"ContentType", "application/vnd.ms-excel.sheet.macroEnabled.12");
+
+}
+
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/docxexport.cxx
b/sw/source/filter/ww8/docxexport.cxx
index a595f7f..50eb592 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -1213,10 +1213,15 @@ void DocxExport::WriteEmbeddings()
OUString embeddingPath = embeddingsList[j].Name;
uno::Reference embeddingsStream;
embeddingsList[j].Value >>= embeddingsStream;
+
+OUString contentType =
"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
+if (embeddingPath.endsWith(OUString(".xlsm")))
+contentType = "application/vnd.ms-excel.sheet.macroEnabled.12";
+
if ( embeddingsStream.is() )
{
uno::Reference< io::XOutputStream > xOutStream =
GetFilter().openFragmentStream(embeddingPath,
-
"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+contentType);
try
{
sal_Int32 nBufferSize = 512;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/oox oox/source sw/qa sw/source
include/oox/export/vmlexport.hxx|2
oox/source/export/vmlexport.cxx | 27 -
sw/qa/extras/ooxmlexport/data/pictureWatermark.docx |binary
sw/qa/extras/ooxmlexport/data/textWatermark.docx|binary
sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx | 26
sw/source/filter/ww8/wrtw8nds.cxx | 58 +++-
sw/source/filter/ww8/wrtww8.hxx |2
7 files changed, 111 insertions(+), 4 deletions(-)
New commits:
commit ff2f55d6f0a515c8c6e4186e124db28cc4056f5b
Author: Ravindra Vidhate
Date: Wed Mar 5 11:38:22 2014 +0530
fdo#35324: Text and picture water are not imported and not preserved in RT.
Problem : Open docx file which has Text/Picture as water mark.
1. The text is not imported properly also picture water mark is also
considered as shape.
2. It writes the watermarks in Document.xml, while it should write in only
Header.xml.
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Reviewed on:
https://gerrit.libreoffice.org/8457
Change-Id: Ic988858da25a4cba3ae16e614d920e2e16053a5f
diff --git a/include/oox/export/vmlexport.hxx b/include/oox/export/vmlexport.hxx
index 2b414c0..744dbbd 100644
--- a/include/oox/export/vmlexport.hxx
+++ b/include/oox/export/vmlexport.hxx
@@ -90,7 +90,7 @@ public:
sal_Int16 eVOri = -1, sal_Int16 eHRel = -1,
sal_Int16 eVRel = -1, const Point* pNdTopLeft = 0, const sal_Bool
bOOxmlExport = false );
virtual void AddSdrObjectVMLObject( const SdrObject& rObj);
-
+static bool IsWaterMarkShape(const OUString& rStr);
protected:
/// Add an attribute to the generated element.
///
diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx
index 35eeae7..fe82ea0 100644
--- a/oox/source/export/vmlexport.cxx
+++ b/oox/source/export/vmlexport.cxx
@@ -175,7 +175,28 @@ void VMLExport::AddShape( sal_uInt32 nShapeType,
sal_uInt32 nShapeFlags, sal_uIn
{
m_nShapeType = nShapeType;
m_nShapeFlags = nShapeFlags;
-m_pShapeAttrList->add( XML_id, ShapeIdString( nShapeId ) );
+// If shape is a watermark object - should keep the original shape's name
+// because Microsoft detects if it is a watermark by the actual name
+if (!IsWaterMarkShape(m_pSdrObject->GetName()))
+{
+// Not a watermark object
+m_pShapeAttrList->add( XML_id, ShapeIdString( nShapeId ) );
+}
+else
+{
+// A watermark object - store the optional shape ID also ('o:spid')
+m_pShapeAttrList->add( XML_id,
OUStringToOString(m_pSdrObject->GetName(), RTL_TEXTENCODING_UTF8) );
+}
+}
+
+bool VMLExport::IsWaterMarkShape(const OUString& rStr)
+{
+ if (rStr.isEmpty() ) return false;
+
+ if (rStr.match(OUString("PowerPlusWaterMarkObject")) ||
rStr.match(OUString("WordPictureWatermark")))
+return true;
+ else
+return false;
}
static void impl_AddArrowHead( sax_fastparser::FastAttributeList *pAttrList,
sal_Int32 nElement, sal_uInt32 nValue )
@@ -787,7 +808,9 @@ void VMLExport::Commit( EscherPropertyContainer& rProps,
const Rectangle& rRect
aStream.Seek(0);
OUString idStr =
SvxMSDffManager::MSDFFReadZString(aStream, it->nPropSize, true);
aStream.Seek(0);
-m_pShapeAttrList->add(XML_ID, OUStringToOString(idStr,
RTL_TEXTENCODING_UTF8));
+if (!IsWaterMarkShape(m_pSdrObject->GetName()))
+ m_pShapeAttrList->add(XML_ID,
OUStringToOString(idStr, RTL_TEXTENCODING_UTF8));
+
bAlreadyWritten[ESCHER_Prop_wzName] = true;
}
break;
diff --git a/sw/qa/extras/ooxmlexport/data/pictureWatermark.docx
b/sw/qa/extras/ooxmlexport/data/pictureWatermark.docx
new file mode 100644
index 000..b526ecf
Binary files /dev/null and
b/sw/qa/extras/ooxmlexport/data/pictureWatermark.docx differ
diff --git a/sw/qa/extras/ooxmlexport/data/textWatermark.docx
b/sw/qa/extras/ooxmlexport/data/textWatermark.docx
new file mode 100644
index 000..c8bff75
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/textWatermark.docx
differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
index 8842cdd..d46f583 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
@@ -911,6 +911,32 @@ DECLARE_OOXMLEXPORT_TEST(testDkVert, "dkvert.docx")
CPPUNIT_ASSERT_EQUAL(sal_Int32(25), getProperty(xShape,
"FillHatch").Distance);
}
+DECLARE_OOXMLEXPORT_TEST(testTextWatermark, "textWatermark.docx")
+{
+//The problem was that the watermark ID was not preserved,
+//and Word uses the object ID to identify if it is a watermark.
+//I
[Libreoffice-commits] core.git: chart2/qa oox/source
chart2/qa/extras/chart2export.cxx|9 +
chart2/qa/extras/data/docx/FDO75975.docx |binary
oox/source/export/chartexport.cxx|2 +-
3 files changed, 10 insertions(+), 1 deletion(-)
New commits:
commit ede99e0daa0701e2d8568d7ed00e2221a4f6a9f6
Author: Ravindra Vidhate
Date: Mon Mar 10 17:36:05 2014 +0530
fdo#75975 crash while saving the DOCX file containing charts
1. Open DOCX file containing Charts
2. Save this file into DOCX format.
3. LO crashed while saving/exporting to DOCX format.
Conflicts:
chart2/qa/extras/chart2export.cxx
Change-Id: I14d4f2c214ce3513b4bd14831771d72498e4486d
diff --git a/chart2/qa/extras/chart2export.cxx
b/chart2/qa/extras/chart2export.cxx
index 0dd8d63..e328f90 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -50,6 +50,7 @@ public:
void testPieChartDataLabels();
void testSeriesIdxOrder();
void testErrorBarDataRangeODS();
+void testChartCrash();
CPPUNIT_TEST_SUITE(Chart2ExportTest);
CPPUNIT_TEST(test);
@@ -72,6 +73,7 @@ public:
CPPUNIT_TEST(testPieChartDataLabels);
CPPUNIT_TEST(testSeriesIdxOrder);
CPPUNIT_TEST(testErrorBarDataRangeODS);
+CPPUNIT_TEST(testChartCrash);
CPPUNIT_TEST_SUITE_END();
protected:
@@ -653,6 +655,13 @@ void Chart2ExportTest::testErrorBarDataRangeODS()
CPPUNIT_ASSERT_EQUAL(OUString("$Sheet1.$C$1:$C$3"), aNegRange);
}
+void Chart2ExportTest::testChartCrash()
+{
+load("/chart2/qa/extras/data/docx/", "FDO75975.docx");
+xmlDocPtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML
Text");
+CPPUNIT_ASSERT(pXmlDoc);
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Chart2ExportTest);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/chart2/qa/extras/data/docx/FDO75975.docx
b/chart2/qa/extras/data/docx/FDO75975.docx
new file mode 100644
index 000..30f2510
Binary files /dev/null and b/chart2/qa/extras/data/docx/FDO75975.docx differ
diff --git a/oox/source/export/chartexport.cxx
b/oox/source/export/chartexport.cxx
index b912bcf..201d988 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -2307,7 +2307,7 @@ void ChartExport::_exportAxis(
{
pFS->startElement( FSNS( XML_c, XML_minorGridlines ),
FSEND );
-exportShapeProps( xMajorGrid );
+exportShapeProps( xMinorGrid );
pFS->endElement( FSNS( XML_c, XML_minorGridlines ) );
}
___
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/FDO74215.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx|8
sw/source/filter/ww8/wrtww8.cxx |4 +++-
3 files changed, 11 insertions(+), 1 deletion(-)
New commits:
commit cc1c838942d4b2ae395ae7429271e48335fdee80
Author: Ravindra Vidhate
Date: Thu Jan 30 17:19:14 2014 +0530
fdo#74215:Fix for empty imagedata in Number Pic bullet
1. While exporting through LO, it writes numPicBullet with imagedata of
size 0,0.
2. Because of this image file of 0KB is added in media folder
3. While opening the document in MS-Office, it shows the image missing at
the top
which is of 0 KB size.
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Reviewed on:
https://gerrit.libreoffice.org/7744
Change-Id: I5f8f187fc4fe678dceb3f2b594de74a6b52cbe74
diff --git a/sw/qa/extras/ooxmlexport/data/FDO74215.docx
b/sw/qa/extras/ooxmlexport/data/FDO74215.docx
new file mode 100644
index 000..fd2cc55
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/FDO74215.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 5ea7e83..5f55f19 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3003,6 +3003,14 @@ DECLARE_OOXMLEXPORT_TEST(testFDO74106, "FDO74106.docx")
assertXPath(pXmlDoc, "/w:numbering/w:abstractNum[1]/w:lvl[1]/w:numFmt",
"val","hebrew1");
}
+DECLARE_OOXMLEXPORT_TEST(testFDO74215, "FDO74215.docx")
+{
+xmlDocPtr pXmlDoc = parseExport("word/numbering.xml");
+if (!pXmlDoc)
+return;
+assertXPath(pXmlDoc, "/w:numbering/w:numPicBullet[2]/w:pict/v:shape",
"style", "width:6.4pt;height:6.4pt");
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 9fd02e1..eb3c2fa 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -1460,7 +1460,9 @@ void MSWordExportBase::BulletDefinitions()
aSize = Application::GetDefaultDevice()->PixelToLogic(aSize,
aMapMode);
else
aSize =
OutputDevice::LogicToLogic(aSize,rGraphic.GetPrefMapMode(), aMapMode);
-AttrOutput().BulletDefinition(i, rGraphic, aSize);
+
+if (0 != aSize.Height() && 0 != aSize.Width())
+AttrOutput().BulletDefinition(i, rGraphic, aSize);
}
}
___
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/12/9112/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/72/8572/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/72/8572/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/86/9286/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/86/9286/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/37/9737/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/37/9737/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/85/9185/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/65/9065/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/68/9368/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/85/9185/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/93/9893/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/26/9126/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/85/9185/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/44/7744/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/44/7744/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/93/9893/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/68/9368/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/65/9065/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/26/9126/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
