download.lst | 6 external/libmwaw/0001-fix-build-with-MSVC.patch.1 | 113 +---------- external/libmwaw/Library_mwaw.mk | 1 filter/source/config/fragments/filters/PowerPoint3.xcu | 2 filter/source/config/fragments/types/impress_PowerPoint3.xcu | 2 5 files changed, 22 insertions(+), 102 deletions(-)
New commits: commit bc4097ed5619ee7457aef250dc25eee934f79e75 Author: David Tardon <dtar...@redhat.com> Date: Tue Jan 31 10:52:25 2017 +0100 upload libmwaw 0.3.10 Change-Id: I1355f60bdaf66aecef22f1093f57369b9fd91972 Reviewed-on: https://gerrit.libreoffice.org/33745 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: David Tardon <dtar...@redhat.com> diff --git a/download.lst b/download.lst index dd2a24d..4717e22 100644 --- a/download.lst +++ b/download.lst @@ -105,9 +105,9 @@ export MDNSRESPONDER_MD5SUM := 940057ac8b513b00e8e9ca12ef796762 export MDNSRESPONDER_TARBALL := mDNSResponder-576.30.4.tar.gz export MSPUB_MD5SUM := ff9d0f9dd8fbc523408ea1953d5bde41 export MSPUB_TARBALL := libmspub-0.1.2.tar.bz2 -export MWAW_MD5SUM := d8532ad5630d3f3b2189a7ec5639151b -export MWAW_VERSION_MICRO := 9 -export MWAW_TARBALL := libmwaw-0.3.$(MWAW_VERSION_MICRO).tar.bz2 +export MWAW_MD5SUM := 2a84cd13bca3563f5b55fef25412cb9b +export MWAW_VERSION_MICRO := 10 +export MWAW_TARBALL := libmwaw-0.3.$(MWAW_VERSION_MICRO).tar.xz export MYSQLCPPCONN_TARBALL := 7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz export MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz export NEON_TARBALL := 231adebe5c2f78fded3e3df6e958878e-neon-0.30.1.tar.gz diff --git a/external/libmwaw/0001-fix-build-with-MSVC.patch.1 b/external/libmwaw/0001-fix-build-with-MSVC.patch.1 index ab60358..881fb92 100644 --- a/external/libmwaw/0001-fix-build-with-MSVC.patch.1 +++ b/external/libmwaw/0001-fix-build-with-MSVC.patch.1 @@ -1,106 +1,25 @@ -From ae8f006018f6cfc79b86f327116f6ceed71692f9 Mon Sep 17 00:00:00 2001 +From 3d7479236e565c974a1f6e04d6cd1139bca5cb58 Mon Sep 17 00:00:00 2001 From: David Tardon <dtar...@redhat.com> -Date: Wed, 23 Nov 2016 09:06:35 +0100 +Date: Tue, 31 Jan 2017 14:49:05 +0100 Subject: [PATCH] fix build with MSVC --- - src/lib/PowerPoint3Parser.cxx | 30 +++++++++++++++--------------- - 1 file changed, 15 insertions(+), 15 deletions(-) + src/lib/PowerPoint1Parser.cxx | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/src/lib/PowerPoint3Parser.cxx b/src/lib/PowerPoint3Parser.cxx -index 9ecbe1b..51348d6 100644 ---- a/src/lib/PowerPoint3Parser.cxx -+++ b/src/lib/PowerPoint3Parser.cxx -@@ -1076,15 +1076,15 @@ bool PowerPoint3Parser::readDocInfo(MWAWEntry const &entry) - f << "],"; - for (int i=0; i<4; ++i) dim[i]=int(input->readLong(2)); - if (!m_state->m_isMacFile) { -- std::swap<int>(dim[0],dim[1]); -- std::swap<int>(dim[2],dim[3]); -+ std::swap(dim[0],dim[1]); -+ std::swap(dim[2],dim[3]); - } - MWAWBox2i pageBox(MWAWVec2i(dim[1],dim[0]),MWAWVec2i(dim[3],dim[2])); - f << "dim[page]=" << pageBox << ","; - for (int i=0; i<4; ++i) dim[i]=int(input->readLong(2)); - if (!m_state->m_isMacFile) { -- std::swap<int>(dim[0],dim[1]); -- std::swap<int>(dim[2],dim[3]); -+ std::swap(dim[0],dim[1]); -+ std::swap(dim[2],dim[3]); - } - MWAWBox2i paperBox=MWAWBox2i(MWAWVec2i(dim[0],dim[1]),MWAWVec2i(dim[2],dim[3])); - f << "dim[paper]=" << paperBox << ","; -@@ -1673,16 +1673,16 @@ bool PowerPoint3Parser::readSlideFormats(MWAWEntry const &entry, std::vector<Pow - if (val) f << "id=" << std::hex << val << std::dec << ","; - int dim[2]; - for (int j=0; j<2; ++j) dim[j]=int(input->readLong(2)); -- if (!isMacFile) std::swap<int>(dim[0],dim[1]); -+ if (!isMacFile) std::swap(dim[0],dim[1]); - f << "dim0=" << MWAWVec2i(dim[1], dim[0]) << ","; - format.m_gradientOffset=int(input->readLong(2)); - if (format.m_gradientOffset) f << "grad[col,offset]=" << format.m_gradientOffset << ","; - for (int j=0; j<2; ++j) dim[j]=int(input->readLong(2)); -- if (!isMacFile) std::swap<int>(dim[0],dim[1]); -+ if (!isMacFile) std::swap(dim[0],dim[1]); - format.m_margins=MWAWVec2i(dim[1], dim[0]); - f << "box[margins]=" << format.m_margins << ","; - for (int j=0; j<2; ++j) dim[j]=int(input->readLong(2)); -- if (!isMacFile) std::swap<int>(dim[0],dim[1]); -+ if (!isMacFile) std::swap(dim[0],dim[1]); - format.m_shadowOffset=MWAWVec2i(dim[1], dim[0]); - if (format.m_shadowOffset!=MWAWVec2i(0,0)) - f << "shadow[offset]=" << format.m_shadowOffset << ","; -@@ -1727,15 +1727,15 @@ bool PowerPoint3Parser::readSlidePolygons(MWAWEntry const &entry, std::vector<Po - int dim[4]; - for (int i=0; i<4; ++i) dim[i]=int(input->readLong(2)); - if (!isMacFile) { -- std::swap<int>(dim[0],dim[1]); -- std::swap<int>(dim[2],dim[3]); -+ std::swap(dim[0],dim[1]); -+ std::swap(dim[2],dim[3]); +diff --git a/src/lib/PowerPoint1Parser.cxx b/src/lib/PowerPoint1Parser.cxx +index 2f735dc..e57eb65 100644 +--- a/src/lib/PowerPoint1Parser.cxx ++++ b/src/lib/PowerPoint1Parser.cxx +@@ -807,7 +807,7 @@ bool PowerPoint1Parser::readFramesList(MWAWEntry const &entry, std::vector<Power + if (schemeId>=0 && !getColor(col, schemeId, colors[i])) f << "##col,"; + if (col!=expected[i]) f << "col" << i << "=" << col << ","; + } +- if (!isMacFile) std::swap<MWAWColor>(colors[1],colors[3]); ++ if (!isMacFile) std::swap(colors[1],colors[3]); } - poly.m_box=MWAWBox2i(MWAWVec2i(dim[1],dim[0]), MWAWVec2i(dim[3],dim[2])); - f << "box=" << poly.m_box << ","; - f << "pts=["; - for (int pt=0; pt<N; ++pt) { - for (int i=0; i<2; ++i) dim[i]=int(input->readLong(2)); -- if (!isMacFile) std::swap<int>(dim[0],dim[1]); -+ if (!isMacFile) std::swap(dim[0],dim[1]); - poly.m_vertices.push_back(MWAWVec2f(float(dim[1])/8.f, float(dim[0])/8.f)); - f << poly.m_vertices.back() << ","; - } -@@ -1918,8 +1918,8 @@ bool PowerPoint3Parser::readFramesList(MWAWEntry const &entry, PowerPoint3Parser - int dim[4]; - for (int d=0; d<4; ++d) dim[d]=int(input->readLong(2)); - if (!isMacFile) { -- std::swap<int>(dim[0],dim[1]); -- std::swap<int>(dim[2],dim[3]); -+ std::swap(dim[0],dim[1]); -+ std::swap(dim[2],dim[3]); - } - frame.m_dimension=MWAWBox2i(MWAWVec2i(dim[1],dim[0]), MWAWVec2i(dim[3],dim[2])); - f << "dim=" << frame.m_dimension << ","; -@@ -2233,8 +2233,8 @@ bool PowerPoint3Parser::readTextZone(MWAWEntry const &entry, PowerPoint3ParserIn - int dim[4]; - for (int i=0; i<4; ++i) dim[i]=int(input->readLong(2)); - if (!isMacFile) { -- std::swap<int>(dim[0],dim[1]); -- std::swap<int>(dim[2],dim[3]); -+ std::swap(dim[0],dim[1]); -+ std::swap(dim[2],dim[3]); - } - tZone.m_box=MWAWBox2i(MWAWVec2i(dim[1],dim[0]),MWAWVec2i(dim[3],dim[2])); - f << "dim=" << tZone.m_box << ","; -@@ -3544,7 +3544,7 @@ bool PowerPoint3Parser::sendFrame(PowerPoint3ParserInternal::Frame const &frame, - case 3: { - float angle[2] = { frame.m_angles[0], frame.m_angles[0]+frame.m_angles[1] }; - if (angle[1]<angle[0]) -- std::swap<float>(angle[0],angle[1]); -+ std::swap(angle[0],angle[1]); - if (angle[1]>360) { - int numLoop=int(angle[1]/360)-1; - angle[0]-=float(numLoop*360); + MWAWGraphicStyle &style=frame.m_style; + val=int(input->readULong(1)); -- 2.9.3 diff --git a/external/libmwaw/Library_mwaw.mk b/external/libmwaw/Library_mwaw.mk index f003626..f9cdf7c 100644 --- a/external/libmwaw/Library_mwaw.mk +++ b/external/libmwaw/Library_mwaw.mk @@ -162,6 +162,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,mwaw,\ UnpackedTarball/libmwaw/src/lib/NisusWrtText \ UnpackedTarball/libmwaw/src/lib/PixelPaintParser \ UnpackedTarball/libmwaw/src/lib/PowerPoint1Parser \ + UnpackedTarball/libmwaw/src/lib/PowerPoint3OLE \ UnpackedTarball/libmwaw/src/lib/PowerPoint3Parser \ UnpackedTarball/libmwaw/src/lib/RagTime5Chart \ UnpackedTarball/libmwaw/src/lib/RagTime5ClusterManager \ diff --git a/filter/source/config/fragments/filters/PowerPoint3.xcu b/filter/source/config/fragments/filters/PowerPoint3.xcu index c3675af..d61a360 100644 --- a/filter/source/config/fragments/filters/PowerPoint3.xcu +++ b/filter/source/config/fragments/filters/PowerPoint3.xcu @@ -14,7 +14,7 @@ <value>com.sun.star.comp.Impress.MWAWPresentationImportFilter</value> </prop> <prop oor:name="UIName"> - <value xml:lang="en-US">Microsoft PowerPoint 3</value> + <value xml:lang="en-US">Microsoft PowerPoint 1-4</value> </prop> <prop oor:name="FileFormatVersion"> <value>0</value> diff --git a/filter/source/config/fragments/types/impress_PowerPoint3.xcu b/filter/source/config/fragments/types/impress_PowerPoint3.xcu index 5932b3a..45cbb28 100644 --- a/filter/source/config/fragments/types/impress_PowerPoint3.xcu +++ b/filter/source/config/fragments/types/impress_PowerPoint3.xcu @@ -17,6 +17,6 @@ <value>PowerPoint 3</value> </prop> <prop oor:name="UIName"> - <value>Microsoft PowerPoint 3</value> + <value>Microsoft PowerPoint 1-4</value> </prop> </node> _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits