[Libreoffice-commits] core.git: Changes to 'refs/changes/51/9751/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/24/9424/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/24/9424/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/9765/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/32/10532/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/32/10532/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/64/9564/1'
___ 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/core/data/ooxml/pass/fdo80580.docx |binary writerfilter/source/dmapper/DomainMapper_Impl.cxx |5 +++-- 2 files changed, 3 insertions(+), 2 deletions(-) New commits: commit 26b33fc2f2164481f5c423463f653012e4f4995d Author: Yogesh Bharate yogesh.bhar...@synerzip.com Date: Fri Jul 25 15:54:44 2014 +0530 fdo#80580: LO crashes while opening the document on ubuntu build Problem Description: This issue is reproducible. Step to reproduce : 1. Create .docx contains page break on first page. 2. Second page contains ''(ampersand) with some character like 'x','z','#' etc. 3. Changes the size or font of 'character' which is on second page. 4. Precaution will be take all this i.e page break and 'character' contains in single paragraph'. Solution: Added a check for Context Type which must be CONTEXT_CHARACTER for deferring character. Change-Id: I27989d2ca8d62fbd9efafe5ba7f4a65d56467c1e Reviewed-on: https://gerrit.libreoffice.org/10532 Reviewed-by: LuboÅ¡ LuÅák l.lu...@collabora.com Tested-by: LuboÅ¡ LuÅák l.lu...@collabora.com diff --git a/sw/qa/core/data/ooxml/pass/fdo80580.docx b/sw/qa/core/data/ooxml/pass/fdo80580.docx new file mode 100644 index 000..90793fe Binary files /dev/null and b/sw/qa/core/data/ooxml/pass/fdo80580.docx differ diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 17cbe64..dad72fa 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -1190,8 +1190,9 @@ void DomainMapper_Impl::appendTextPortion( const OUString rString, PropertyMapP if (m_aTextAppendStack.empty()) return; - -if( pPropertyMap == m_pTopContext !deferredCharacterProperties.empty()) +// Before placing call to processDeferredCharacterProperties(), TopContextType should be CONTEXT_CHARACTER +// processDeferredCharacterProperties() invokes only if character inserted +if( pPropertyMap == m_pTopContext !deferredCharacterProperties.empty() (GetTopContextType() == CONTEXT_CHARACTER) ) processDeferredCharacterProperties(); uno::Reference text::XTextAppend xTextAppend = m_aTextAppendStack.top().xTextAppend; if(xTextAppend.is() ! getTableManager( ).isIgnore()) ___ 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/fdo79968.docx |binary
sw/qa/extras/ooxmlexport/data/fdo79969_xlsb.docx |binary
sw/qa/extras/ooxmlexport/data/fdo79969_xlsm.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 42 +++
sw/source/filter/ww8/docxattributeoutput.cxx | 18 +
5 files changed, 60 insertions(+)
New commits:
commit 9f8785074512d6442fd97d67860fd625ac4d6bb1
Author: Yogesh Bharate yogesh.bhar...@synerzip.com
Date: Fri Jun 13 16:15:16 2014 +0530
fdo#79968: fdo#79969: Fix for embedded powerpoint excel sheet in docx.
Problem Description:
fdo#79968:
1. Document contains embedded powerpoint in docx.
2. After RT, embedded powerpoint object is not preserved.
3. In this case, .sldx is get converted to .bin due to this powerpoint
slides
is getting converted to picture.
fdo#79969:
1. Document contains embedded excel work sheet.
2. After RT, embedded excel sheet is not preserved.
3. In this case, .xlsm is get converted to .xls.
4. Similar case happened with binary excel work sheet.
Implementation:
Added sMediaType, sRelationType sFileExtension for embedded excel sheet,
binary excel sheet powerpoint slide.
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Reviewed on:
https://gerrit.libreoffice.org/9765
Change-Id: I8f94e3f9293f2ac98b61f919d60ca556695b26c2
diff --git a/sw/qa/extras/ooxmlexport/data/fdo79968.docx
b/sw/qa/extras/ooxmlexport/data/fdo79968.docx
new file mode 100644
index 000..2da7ddc
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo79968.docx differ
diff --git a/sw/qa/extras/ooxmlexport/data/fdo79969_xlsb.docx
b/sw/qa/extras/ooxmlexport/data/fdo79969_xlsb.docx
new file mode 100644
index 000..0e41399
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo79969_xlsb.docx
differ
diff --git a/sw/qa/extras/ooxmlexport/data/fdo79969_xlsm.docx
b/sw/qa/extras/ooxmlexport/data/fdo79969_xlsm.docx
new file mode 100644
index 000..6fd11f3
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo79969_xlsm.docx
differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 5b0244e..7368b46 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3648,6 +3648,48 @@ DECLARE_OOXMLEXPORT_TEST(testFDO78590, FDO78590.docx)
assertXPath ( pXmlDoc, /w:document/w:body/w:p[1]/w:pPr/w:framePr, h,
1669 );
}
+DECLARE_OOXMLEXPORT_TEST(testfdo79968_sldx, fdo79968.docx)
+{
+// This UT for DOCX embedded with powerpoint slide
+xmlDocPtr pXmlDoc = parseExport([Content_Types].xml);
+
+if (!pXmlDoc)
+ return;
+
+assertXPath(pXmlDoc,
+
/ContentType:Types/ContentType:Override[@ContentType='application/vnd.openxmlformats-officedocument.presentationml.slide'],
+PartName,
+/word/embeddings/oleObject1.sldx);
+}
+
+DECLARE_OOXMLEXPORT_TEST(testfdo79969_xlsb, fdo79969_xlsb.docx)
+{
+// This UT for DOCX embedded with binary excel work sheet.
+xmlDocPtr pXmlDoc = parseExport([Content_Types].xml);
+
+if (!pXmlDoc)
+ return;
+
+assertXPath(pXmlDoc,
+
/ContentType:Types/ContentType:Override[@ContentType='application/vnd.ms-excel.sheet.binary.macroEnabled.12'],
+PartName,
+/word/embeddings/oleObject1.xlsb);
+}
+
+DECLARE_OOXMLEXPORT_TEST(testfdo79969_xlsm, fdo79969_xlsm.docx)
+{
+// This UT for DOCX embedded with excel work sheet.
+xmlDocPtr pXmlDoc = parseExport([Content_Types].xml);
+
+if (!pXmlDoc)
+ return;
+
+assertXPath(pXmlDoc,
+
/ContentType:Types/ContentType:Override[@ContentType='application/vnd.ms-excel.sheet.macroEnabled.12'],
+PartName,
+/word/embeddings/oleObject1.xlsm);
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index ebaaecb..06230f4 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -4328,6 +4328,18 @@ void DocxAttributeOutput::WriteOLE( SwOLENode rNode,
const Size rSize, const S
sRelationType =
http://schemas.openxmlformats.org/officeDocument/2006/relationships/package;;
sFileExtension = xlsx;
}
+else if(sProgID.startsWith(Excel.SheetBinaryMacroEnabled.12) )
+{
+sMediaType = application/vnd.ms-excel.sheet.binary.macroEnabled.12;
+sRelationType =
http://schemas.openxmlformats.org/officeDocument/2006/relationships/package;;
+sFileExtension = xlsb;
+}
+else if( sProgID.startsWith(Excel.SheetMacroEnabled.12) )
+{
+sMediaType = application/vnd.ms-excel.sheet.macroEnabled.12;
+sRelationType =
http://schemas.openxmlformats.org/officeDocument/2006/relationships
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/data/fdo78957.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx| 15 +
sw/source/filter/ww8/docxsdrexport.cxx | 71 ++--
3 files changed, 73 insertions(+), 13 deletions(-)
New commits:
commit f7bcaa98827b086f9e9a541b75654a14cf69e343
Author: Yogesh Bharate yogesh.bhar...@synerzip.com
Date: Wed May 21 19:12:48 2014 +0530
fdo#78957 Corruption - wp:extent cy height exceed the limit in
header.xml
Problem Description:
1. On 19th May windows daily build
[Build ID: dd0f844728a53a337233a3c687b792e725803da5, TinderBox: Win-x86@42,
Branch:master],
if we RT document, RT get corrupted due to the exceeding the limit of
extend height width.
2. As per ECMA standard, extend height width is of type long, but MSO only
support int32.Hence added code changes to check the same.
3. On 20th May windows daily build
[Build ID: f3a46244a07b76d633ccc7f83da3fa502612e978, TinderBox: Win-x86@42,
Branch:master],
if we RT document, it get corrupted due to exceeding value of posOffset.
4. Added code changes to make sure posOffset value is within the allowed
range.
Reviewed on:
https://gerrit.libreoffice.org/9424
Change-Id: Ib0b55314f54c51f39a492485992356f71eb062e3
diff --git a/sw/qa/extras/ooxmlexport/data/fdo78957.docx
b/sw/qa/extras/ooxmlexport/data/fdo78957.docx
new file mode 100644
index 000..38a18a3
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo78957.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 8d5323c..b4a002c 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3498,6 +3498,21 @@ DECLARE_OOXMLEXPORT_TEST(testFdo78910, fdo78910.docx)
assertXPath ( pXmlDoc, //w:hyperlink[2]/w:r[5]/w:fldChar, fldCharType,
end );
}
+DECLARE_OOXMLEXPORT_TEST(testFdo78957, fdo78957.docx)
+{
+xmlDocPtr pXmlHeader = parseExport(word/header2.xml);
+
+if(!pXmlHeader)
+return;
+
+const sal_Int64 IntMax = 2147483647;
+sal_Int64 cx = 0, cy = 0;
+cx =
getXPath(pXmlHeader,/w:hdr[1]/w:p[1]/w:r[1]/mc:AlternateContent[1]/mc:Choice[1]/w:drawing[1]/wp:anchor[1]/wp:extent[1],cx).toInt64();
+cy =
getXPath(pXmlHeader,/w:hdr[1]/w:p[1]/w:r[1]/mc:AlternateContent[1]/mc:Choice[1]/w:drawing[1]/wp:anchor[1]/wp:extent[1],cy).toInt64();
+// Here we check the values of extent width height
+CPPUNIT_ASSERT(cx = IntMax );
+CPPUNIT_ASSERT(cy = 0 );
+}
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx
b/sw/source/filter/ww8/docxsdrexport.cxx
index 29c1195..c2481c5 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -44,7 +44,6 @@
#include writerhelper.hxx
#include comphelper/seqstream.hxx
-#include climits
using namespace com::sun::star;
using namespace oox;
@@ -426,6 +425,13 @@ void DocxSdrExport::startDMLAnchorInline(const SwFrmFmt*
pFrmFmt, const Size rS
break;
}
m_pImpl-m_pSerializer-startElementNS(XML_wp, XML_positionH,
XML_relativeFrom, relativeFromH, FSEND);
+/**
+* Sizes of integral types
+* climits header defines constants with the limits of integral types
for the specific system and compiler implemetation used.
+* Use of this might cause platform dependent problem like posOffset
exceed the limit.
+**/
+const sal_Int64 MAX_INTEGER_VALUE = 2147483647;
+const sal_Int64 MIN_INTEGER_VALUE = -2147483648;
if (alignH != NULL)
{
m_pImpl-m_pSerializer-startElementNS(XML_wp, XML_align, FSEND);
@@ -447,13 +453,14 @@ void DocxSdrExport::startDMLAnchorInline(const SwFrmFmt*
pFrmFmt, const Size rS
*
* Please refer :
http://www.schemacentral.com/sc/xsd/t-xsd_int.html
*/
-if (nTwipstoEMU INT_MAX)
+
+if (nTwipstoEMU MAX_INTEGER_VALUE)
{
-nTwipstoEMU = INT_MAX;
+nTwipstoEMU = MAX_INTEGER_VALUE;
}
-else if (nTwipstoEMU INT_MIN)
+else if (nTwipstoEMU MIN_INTEGER_VALUE)
{
-nTwipstoEMU = INT_MIN;
+nTwipstoEMU = MIN_INTEGER_VALUE;
}
m_pImpl-m_pSerializer-write(nTwipstoEMU);
m_pImpl-m_pSerializer-endElementNS(XML_wp, XML_posOffset);
@@ -470,13 +477,13 @@ void DocxSdrExport::startDMLAnchorInline(const SwFrmFmt*
pFrmFmt, const Size rS
{
m_pImpl-m_pSerializer-startElementNS(XML_wp, XML_posOffset,
FSEND);
sal_Int64 nTwipstoEMU = TwipsToEMU(aPos.Y);
-if (nTwipstoEMU INT_MAX)
+if (nTwipstoEMU MAX_INTEGER_VALUE)
{
-nTwipstoEMU = INT_MAX;
+nTwipstoEMU = MAX_INTEGER_VALUE
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+. For reference read : https://wiki.documentfoundation.org/Development/Developers#Companies -- 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
