[arch-commits] Commit in libreoffice-fresh/trunk (PKGBUILD emfio.patch)

Andreas Radke andyrtr at archlinux.org
Sun Aug 12 13:32:00 UTC 2018


    Date: Sunday, August 12, 2018 @ 13:32:00
  Author: andyrtr
Revision: 331396

upgpkg: libreoffice-fresh 6.1.0-1

upstream update 6.1.0

Modified:
  libreoffice-fresh/trunk/PKGBUILD
Deleted:
  libreoffice-fresh/trunk/emfio.patch

-------------+
 PKGBUILD    |   64 +++++-------
 emfio.patch |  292 ----------------------------------------------------------
 2 files changed, 28 insertions(+), 328 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-08-12 13:01:14 UTC (rev 331395)
+++ PKGBUILD	2018-08-12 13:32:00 UTC (rev 331396)
@@ -11,9 +11,9 @@
 
 pkgbase=libreoffice-fresh
 pkgname=('libreoffice-fresh-sdk' 'libreoffice-fresh')
-_LOver=6.0.6.2
-pkgver=6.0.6
-pkgrel=2
+_LOver=6.1.0.3
+pkgver=6.1.0
+pkgrel=1
 arch=('x86_64')
 license=('LGPL3')
 url="http://www.libreoffice.org/"
@@ -24,7 +24,7 @@
 	'libmspub' 'harfbuzz-icu' 'glew' 'nss' 'hicolor-icon-theme'
 	'desktop-file-utils' 'shared-mime-info' 'gtk2' 'gst-plugins-base-libs'
 	'glu' 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'apache-ant'
-	'gperf' 'kdelibs' 'gtk3' 'cppunit' 'beanshell' 'clucene' 
+	'gperf' 'gtk3' 'qt5-base' 'plasma-framework' 'cppunit' 'beanshell' 'clucene'  # 'kdelibs'
 	'junit' 'libmythes' 'libwpg'  'java-environment' 'postgresql-libs' 'libgl'
 	'bluez-libs' 'gdb' 'doxygen'  'libatomic_ops' 'mdds' 'glew'
 	'apr' 'serf' 'ttf-liberation' 'ttf-dejavu' 'libxinerama' 'libpagemaker' # 'glm'
@@ -31,7 +31,7 @@
 	'libabw' 'libmwaw' 'libe-book' 'coin-or-mp' 'liblangtag' 'liborcus' 
 	'libexttextcat' 'libcmis' 'gobject-introspection' #'libfbclient'
 	'libtommath' 'libzmf' 'gpgme' 'xmlsec' 'rxvt-unicode' 
-	'libepubgen' 'libfreehand' 'libqxp' 'libstaroffice'
+	'libepubgen' 'libfreehand' 'libqxp' 'libstaroffice' 'boost' 'libnumbertext'
 )
 
 _mirror="https://download.documentfoundation.org/libreoffice/src/${pkgver}"
@@ -39,64 +39,64 @@
 _additional_source_url="http://dev-www.libreoffice.org/src"
 _additional_source_url2="http://dev-www.libreoffice.org/extern"
 source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc}
-	${_additional_source_url}/boost_1_65_1.tar.bz2
+	#${_additional_source_url}/boost_1_66_0.tar.bz2
 	${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
 	${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip # keep old bundled version, new system version ftbs
 	${_additional_source_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
 	${_additional_source_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
-	${_additional_source_url}/language-subtag-registry-2017-08-15.tar.bz2
+	${_additional_source_url}/language-subtag-registry-2018-04-23.tar.bz2
 	${_additional_source_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
 	${_additional_source_url}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
 	${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
 	${_additional_source_url}/Firebird-3.0.0.32483-0.tar.bz2
-	${_additional_source_url}/pdfium-3235.tar.bz2
-        ${_additional_source_url}/bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip
+	${_additional_source_url}/pdfium-3426.tar.bz2
+	${_additional_source_url}/bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip
+	${_additional_source_url}/lxml-4.1.1.tgz
 	${_additional_source_url2}/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar  # for test suite
 	${_additional_source_url2}/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-475.jar # for test suite
 	${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
 	make-pyuno-work-with-system-wide-module-install.diff
-	emfio.patch
 	libreoffice-fresh.sh libreoffice-fresh.csh)
-noextract=(boost_1_65_1.tar.bz2
+noextract=(#boost_1_66_0.tar.bz2
            35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
            798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
            a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
            0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
-           language-subtag-registry-2017-08-15.tar.bz2
+           language-subtag-registry-2018-04-23.tar.bz2
            17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
            d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
            ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
            Firebird-3.0.0.32483-0.tar.bz2
-           pdfium-3235.tar.bz2
+           pdfium-3426.tar.bz2
            bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip
+           lxml-4.1.1.tgz
            8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar  # for test suite
            odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-475.jar  # for test suite
            185d60944ea767075d27247c3162b3bc-unowinreg.dll
 )
 validpgpkeys=('C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3') # LibreOffice Build Team (CODE SIGNING KEY) <build at documentfoundation.org>
-sha256sums=('f1666430abf616a3813e4c886b51f157366f592102ae0e874abc17f3d58c6a8e'
+sha256sums=('54eccd268f75d62fa6ab78d25685719c109257e1c0f4d628eae92ec09632ebd8'
             'SKIP'
-            '7e49f0dc0e7fd8e2628939833063d60e6c92bdec019226037446595c87eee85e'
+            'bbc5ccdba93ab8a2e792311a6b5e84f160882ef4048eff46ecdfc31d0bd5da2b'
             'SKIP'
-            'ab55fcc7e6103e541288a369236c5fe2c7b6c3f7d86b2b62b198f7977ca92742'
+            'a7625274535154e393e22ac1a1795859d4f7ead1c78e25b63554446f0d061190'
             'SKIP'
-            '9807a5d16566c57fd74fb522764e0b134a8bbe6b6e8967b83afefd30dcd3be81'
             '64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1'
             '1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753'
             '75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870'
             '983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776'
-            'd6a97fc8da5ae54d867e7f1b65ffb51e816cadd11714e45fc23ee0abf81a51ab'
+            '14c21f4533ca74e3af9e09184d6756a750d0cd46099015ba8c595e48499aa878'
             'd30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370'
             '1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133'
             '233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd'
             '6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860'
-            '7dc0d33fc24b1612865f5e173d48800ba3f2db891c57e3f92b9d2ce56ffeb72f'
+            '80331b48166501a192d65476932f17044eeb5f10faa6ea50f4f175169475c957'
             'd0312c360efe04dd048b3311fe375ff36f1993b4c2e3cb58c81062990532904a'
+            '940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e'
             'f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770'
             '702413413a5d8076c17fe79c0808dfba145a7260020f6c8627ea529a0cf83769'
             'eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6'
             'c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563'
-            '8b4815788be087940750b775690b5890c4cf9e121f11006a72ccab834f212abb'
             '76f62957d0058092b11316357d9d716a62b48a53e5277426ffa87429ab5510e4'
             'd24cfcb556ae1db02087c49012bbc4621f9ef7e3465ca832e1410326d260f283')
 
@@ -112,17 +112,8 @@
 	popd
 	
 	# don't run broken tests
-	sed -i "/CppunitTest_sw_ooxmlexport9/d" sw/Module_sw.mk
-	sed -i "/CppunitTest_sw_uiwriter/d" sw/Module_sw.mk
+	sed -i "/CppunitTest_sd_export_ooxml2/d" sd/Module_sd.mk
 	sed -i "/CppunitTest_sw_ww8export2/d" sw/Module_sw.mk 
-	sed -i "/CppunitTest_xmlsecurity_signing/d" xmlsecurity/Module_xmlsecurity.mk
-	sed -i "/CppunitTest_sc_subsequent_filters_test/d" sc/Module_sc.mk 
-	sed -i "/CppunitTest_sc_subsequent_export_test/d" sc/Module_sc.mk
-	sed -i "/CppunitTest_chart2_export/d" chart2/Module_chart2.mk
-	sed -i "/CppunitTest_dbaccess_RowSetClones/d" dbaccess/Module_dbaccess.mk
-	sed -i "/CppunitTest_dbaccess_hsqldb/d" dbaccess/Module_dbaccess.mk
-	# apply upstream fix for broken cppunit test
-	patch -Np1 -i ../emfio.patch
 	sed -i "/CppunitTest_emfio_emf_test/d" emfio/Module_emfio.mk
 
 	# unowinreg.dll must be a file not a symlink or the result will become a broken symlink
@@ -166,7 +157,7 @@
 		--enable-dbus \
 		--enable-evolution2\
 		--enable-gio\
-		--enable-kde4\
+		--enable-gtk3-kde5 \
 		--enable-gtk3 \
 		--enable-introspection \
 		--disable-gstreamer-0-10 \
@@ -208,6 +199,7 @@
 		--with-system-cppunit\
 		--with-system-graphite\
 		--without-system-glm \
+		--with-system-libnumbertext \
 		--with-system-libwpg \
 		--with-system-libwps \
 		--with-system-redland\
@@ -217,7 +209,7 @@
 		--with-system-serf \
 		--with-jdk-home="/usr/lib/jvm/default" \
 		--with-ant-home="/usr/share/apache-ant"\
-		--without-system-boost\
+		--with-system-boost\
 		--with-system-icu \
 		--with-system-cairo \
 		--with-system-libs \
@@ -231,7 +223,7 @@
 		--disable-dependency-tracking
 
 	touch src.downloaded
-	 make build
+	make build
 
 	mkdir ${srcdir}/fakeinstall
 	make DESTDIR=${srcdir}/fakeinstall distro-pack-install
@@ -280,7 +272,7 @@
 		'desktop-file-utils' 'shared-mime-info' 'glu' 'libpagemaker'
 		'libxinerama' 'libabw' 'libmwaw' 'libe-book' 'libcups'
 		'liblangtag' 'libexttextcat' 'libcmis' 'liborcus' # 'libfbclient'
-		'libtommath' 'libzmf' 'libatomic_ops' 'xmlsec'
+		'libtommath' 'libzmf' 'libatomic_ops' 'xmlsec' 'libnumbertext'
 		'libfreehand' 'libstaroffice' 'libepubgen' 'libqxp' 'libepoxy')
 	optdepends=('java-runtime:     adds java support'
 		'java-environment: required by extension-wiki-publisher and extension-nlpsolver'
@@ -296,7 +288,7 @@
 		'coin-or-mp:	   required by the Calc solver'
 		'gtk2:             for GTK2 integration'
 		'gtk3:             for GTK3 integration'
-		'kdelibs:          for KDE desktop integration')
+		'kf5:              for KF5 KDE desktop integration')
 	backup=(etc/libreoffice/sofficerc
 		etc/libreoffice/bootstraprc
 		etc/libreoffice/psprint.conf
@@ -322,7 +314,7 @@
 
 	# allow to preset desired VLC
 	install -dm755 ${pkgdir}/etc/profile.d
-	install -m755 ${srcdir}/libreoffice-fresh.{sh,csh} ${pkgdir}/etc/profile.d/
+	install -m644 ${srcdir}/libreoffice-fresh.{sh,csh} ${pkgdir}/etc/profile.d/
 
 	# make pyuno find its modules
 	install -dm755 ${pkgdir}/usr/lib/python3.7/site-packages

Deleted: emfio.patch
===================================================================
--- emfio.patch	2018-08-12 13:01:14 UTC (rev 331395)
+++ emfio.patch	2018-08-12 13:32:00 UTC (rev 331396)
@@ -1,292 +0,0 @@
-From 126f10840b0e5930be57cb55262789e85bff9b21 Mon Sep 17 00:00:00 2001
-From: Stephan Bergmann <sbergman at redhat.com>
-Date: Fri, 12 Jan 2018 20:24:43 +0100
-Subject: More loplugin:cstylecast: emfio
-
-auto-rewrite with <https://gerrit.libreoffice.org/#/c/47798/> "Enable
-loplugin:cstylecast for some more cases" plus
-solenv/clang-format/reformat-formatted-files
-
-Change-Id: Idffd3ef04b007f04b7022e54881254da9b2aa4a0
----
- emfio/qa/cppunit/emf/EmfImportTest.cxx |  6 +++---
- emfio/source/reader/emfreader.cxx      |  8 ++++----
- emfio/source/reader/mtftools.cxx       | 26 +++++++++++++-------------
- emfio/source/reader/wmfreader.cxx      | 12 ++++++------
- 4 files changed, 26 insertions(+), 26 deletions(-)
-
-diff --git a/emfio/qa/cppunit/emf/EmfImportTest.cxx b/emfio/qa/cppunit/emf/EmfImportTest.cxx
-index bc14c4b..9611db6 100644
---- a/emfio/qa/cppunit/emf/EmfImportTest.cxx
-+++ b/emfio/qa/cppunit/emf/EmfImportTest.cxx
-@@ -88,7 +88,7 @@ void Test::checkRectPrimitive(Primitive2DSequence const & rPrimitive)
- void Test::testWorking()
- {
-     Primitive2DSequence aSequenceRect = parseEmf("/emfio/qa/cppunit/emf/data/fdo79679-2.emf");
--    CPPUNIT_ASSERT_EQUAL(1, (int) aSequenceRect.getLength());
-+    CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(aSequenceRect.getLength()));
-     checkRectPrimitive(aSequenceRect);
- }
- 
-@@ -99,7 +99,7 @@ void Test::TestDrawString()
- 
-     // first, get the sequence of primitives and dump it
-     Primitive2DSequence aSequence = parseEmf("/emfio/qa/cppunit/emf/data/TestDrawString.emf");
--    CPPUNIT_ASSERT_EQUAL(1, (int) aSequence.getLength());
-+    CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(aSequence.getLength()));
-     Primitive2dXmlDump dumper;
-     xmlDocPtr pDocument = dumper.dumpAndParse(comphelper::sequenceToContainer<Primitive2DContainer>(aSequence));
-     CPPUNIT_ASSERT (pDocument);
-@@ -120,7 +120,7 @@ void Test::TestDrawLine()
- 
-     // first, get the sequence of primitives and dump it
-     Primitive2DSequence aSequence = parseEmf("/emfio/qa/cppunit/emf/data/TestDrawLine.emf");
--    CPPUNIT_ASSERT_EQUAL(1, (int) aSequence.getLength());
-+    CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(aSequence.getLength()));
-     Primitive2dXmlDump dumper;
-     xmlDocPtr pDocument = dumper.dumpAndParse(comphelper::sequenceToContainer<Primitive2DContainer>(aSequence));
-     CPPUNIT_ASSERT (pDocument);
-diff --git a/emfio/source/reader/emfreader.cxx b/emfio/source/reader/emfreader.cxx
-index 52e8661..ea557ea 100644
---- a/emfio/source/reader/emfreader.cxx
-+++ b/emfio/source/reader/emfreader.cxx
-@@ -590,7 +590,7 @@ namespace emfio
-         {
-             sal_uInt32 nPoints(0);
-             mpInputStream->ReadUInt32( nPoints );
--            aPoints[i] = (sal_uInt16)nPoints;
-+            aPoints[i] = static_cast<sal_uInt16>(nPoints);
-         }
-         if ( mpInputStream->good() && ( nGesPoints * (sizeof(T)+sizeof(T)) ) <= ( nEndPos - mpInputStream->Tell() ) )
-         {
-@@ -681,7 +681,7 @@ namespace emfio
- 
-                     mpInputStream->ReadUInt32( nCommentId );
- 
--                    SAL_INFO ("emfio", "\t\tbegin " << (char)(nCommentId & 0xff) << (char)((nCommentId & 0xff00) >> 8) << (char)((nCommentId & 0xff0000) >> 16) << (char)((nCommentId & 0xff000000) >> 24) << " id: 0x" << std::hex << nCommentId << std::dec);
-+                    SAL_INFO ("emfio", "\t\tbegin " << static_cast<char>(nCommentId & 0xff) << static_cast<char>((nCommentId & 0xff00) >> 8) << static_cast<char>((nCommentId & 0xff0000) >> 16) << static_cast<char>((nCommentId & 0xff000000) >> 24) << " id: 0x" << std::hex << nCommentId << std::dec);
- 
-                     if( nCommentId == EMR_COMMENT_EMFPLUS && nRecSize >= 12 )
-                     {
-@@ -761,7 +761,7 @@ namespace emfio
-                     {
-                         mpInputStream->ReadUInt32( nNom1 ).ReadUInt32( nDen1 ).ReadUInt32( nNom2 ).ReadUInt32( nDen2 );
-                         if (nDen1 != 0 && nDen2 != 0)
--                            ScaleWinExt( (double)nNom1 / nDen1, (double)nNom2 / nDen2 );
-+                            ScaleWinExt( static_cast<double>(nNom1) / nDen1, static_cast<double>(nNom2) / nDen2 );
-                         else
-                             SAL_WARN("vcl.emf", "ignoring bogus divide by zero");
-                     }
-@@ -778,7 +778,7 @@ namespace emfio
-                     {
-                         mpInputStream->ReadUInt32( nNom1 ).ReadUInt32( nDen1 ).ReadUInt32( nNom2 ).ReadUInt32( nDen2 );
-                         if (nDen1 != 0 && nDen2 != 0)
--                            ScaleDevExt( (double)nNom1 / nDen1, (double)nNom2 / nDen2 );
-+                            ScaleDevExt( static_cast<double>(nNom1) / nDen1, static_cast<double>(nNom2) / nDen2 );
-                         else
-                             SAL_WARN("vcl.emf", "ignoring bogus divide by zero");
-                     }
-diff --git a/emfio/source/reader/mtftools.cxx b/emfio/source/reader/mtftools.cxx
-index 55fd4dd..e3bbb5f 100644
---- a/emfio/source/reader/mtftools.cxx
-+++ b/emfio/source/reader/mtftools.cxx
-@@ -272,7 +272,7 @@ namespace emfio
-         if( rFont.lfStrikeOut )
-             aFont.SetStrikeout( STRIKEOUT_SINGLE );
- 
--        aFont.SetOrientation( (short)rFont.lfEscapement );
-+        aFont.SetOrientation( static_cast<short>(rFont.lfEscapement) );
- 
-         Size aFontSize( Size( rFont.lfWidth, rFont.lfHeight ) );
-         if ( rFont.lfHeight > 0 )
-@@ -287,8 +287,8 @@ namespace emfio
-             long nHeight = aMetric.GetAscent() + aMetric.GetDescent();
-             if (nHeight)
-             {
--                double fHeight = ((double)aFontSize.Height() * rFont.lfHeight ) / nHeight;
--                aFontSize.Height() = (sal_Int32)( fHeight + 0.5 );
-+                double fHeight = (static_cast<double>(aFontSize.Height()) * rFont.lfHeight ) / nHeight;
-+                aFontSize.Height() = static_cast<sal_Int32>( fHeight + 0.5 );
-             }
-         }
- 
-@@ -303,7 +303,7 @@ namespace emfio
-         sal_uInt32 nColor;
- 
-         mpInputStream->ReadUInt32( nColor );
--        return Color( (sal_uInt8)nColor, (sal_uInt8)( nColor >> 8 ), (sal_uInt8)( nColor >> 16 ) );
-+        return Color( static_cast<sal_uInt8>(nColor), static_cast<sal_uInt8>( nColor >> 8 ), static_cast<sal_uInt8>( nColor >> 16 ) );
-     };
- 
-     Point MtfTools::ImplScale(const Point& rPoint) // Hack to set varying defaults for incompletely defined files.
-@@ -394,8 +394,8 @@ namespace emfio
-                             fY2 *= mnDevHeight;
-                             fX2 += mnDevOrgX;
-                             fY2 += mnDevOrgY;   // fX2, fY2 now in device units
--                            fX2 *= (double)mnMillX * 100.0 / (double)mnPixX;
--                            fY2 *= (double)mnMillY * 100.0 / (double)mnPixY;
-+                            fX2 *= static_cast<double>(mnMillX) * 100.0 / static_cast<double>(mnPixX);
-+                            fY2 *= static_cast<double>(mnMillY) * 100.0 / static_cast<double>(mnPixY);
-                         }
-                     }
-                     break;
-@@ -482,8 +482,8 @@ namespace emfio
-                             fHeight /= mnWinExtY;
-                             fWidth *= mnDevWidth;
-                             fHeight *= mnDevHeight;
--                            fWidth *= (double)mnMillX * 100.0 / (double)mnPixX;
--                            fHeight *= (double)mnMillY * 100.0 / (double)mnPixY;
-+                            fWidth *= static_cast<double>(mnMillX) * 100.0 / static_cast<double>(mnPixX);
-+                            fHeight *= static_cast<double>(mnMillY) * 100.0 / static_cast<double>(mnPixY);
-                         }
-                     }
-                     break;
-@@ -558,7 +558,7 @@ namespace emfio
-     {
-         if ( nIndex & ENHMETA_STOCK_OBJECT )
-         {
--            sal_uInt16 nStockId = (sal_uInt8)nIndex;
-+            sal_uInt16 nStockId = static_cast<sal_uInt8>(nIndex);
-             switch( nStockId )
-             {
-                 case WHITE_BRUSH :
-@@ -617,7 +617,7 @@ namespace emfio
- 
-             GDIObj *pGDIObj = nullptr;
- 
--            if ( (sal_uInt32)nIndex < mvGDIObj.size() )
-+            if ( static_cast<sal_uInt32>(nIndex) < mvGDIObj.size() )
-                 pGDIObj = mvGDIObj[ nIndex ].get();
- 
-             if ( pGDIObj )
-@@ -760,7 +760,7 @@ namespace emfio
-                     }
-                 }
-             }
--            if ( (sal_uInt32)nIndex >= mvGDIObj.size() )
-+            if ( static_cast<sal_uInt32>(nIndex) >= mvGDIObj.size() )
-                 ImplResizeObjectArry( nIndex + 16 );
- 
-             mvGDIObj[ nIndex ] = std::move(pObject);
-@@ -776,7 +776,7 @@ namespace emfio
-     {
-         if ( ( nIndex & ENHMETA_STOCK_OBJECT ) == 0 )
-         {
--            if ( (sal_uInt32)nIndex < mvGDIObj.size() )
-+            if ( static_cast<sal_uInt32>(nIndex) < mvGDIObj.size() )
-             {
-                 mvGDIObj[ nIndex ].reset();
-             }
-@@ -1738,7 +1738,7 @@ namespace emfio
-                 pSave = rSaveList[i].get();
- 
-                 sal_uInt32  nWinRop = pSave->nWinRop;
--                sal_uInt8   nRasterOperation = (sal_uInt8)( nWinRop >> 16 );
-+                sal_uInt8   nRasterOperation = static_cast<sal_uInt8>( nWinRop >> 16 );
- 
-                 sal_uInt32  nUsed =  0;
-                 if ( ( nRasterOperation & 0xf )  != ( nRasterOperation >> 4 ) )
-diff --git a/emfio/source/reader/wmfreader.cxx b/emfio/source/reader/wmfreader.cxx
-index 7a925e7..e20576c 100644
---- a/emfio/source/reader/wmfreader.cxx
-+++ b/emfio/source/reader/wmfreader.cxx
-@@ -244,7 +244,7 @@ namespace emfio
-                     mpInputStream->SetError( SVSTREAM_FILEFORMAT_ERROR );
-                     break;
-                 }
--                ScaleWinExt( (double)nXNum / nXDenom, (double)nYNum / nYDenom );
-+                ScaleWinExt( static_cast<double>(nXNum) / nXDenom, static_cast<double>(nYNum) / nYDenom );
-             }
-             break;
- 
-@@ -269,7 +269,7 @@ namespace emfio
-                     mpInputStream->SetError( SVSTREAM_FILEFORMAT_ERROR );
-                     break;
-                 }
--                ScaleDevExt( (double)nXNum / nXDenom, (double)nYNum / nYDenom );
-+                ScaleDevExt( static_cast<double>(nXNum) / nXDenom, static_cast<double>(nYNum) / nYDenom );
-             }
-             break;
- 
-@@ -796,7 +796,7 @@ namespace emfio
-                         nCount++;
-                     pBmp.reset();
-                 }
--                Color aColor( (sal_uInt8)( nRed / nCount ), (sal_uInt8)( nGreen / nCount ), (sal_uInt8)( nBlue / nCount ) );
-+                Color aColor( static_cast<sal_uInt8>( nRed / nCount ), static_cast<sal_uInt8>( nGreen / nCount ), static_cast<sal_uInt8>( nBlue / nCount ) );
-                 CreateObject(o3tl::make_unique<WinMtfFillStyle>( aColor, false ));
-             }
-             break;
-@@ -1107,7 +1107,7 @@ namespace emfio
-                                 }
-                             }
-                         }
--                        else if ( (nNewMagic == static_cast< sal_uInt32 >(0x43464D57)) && (nLen >= 34) && ( (sal_Int32)(nLen + 10) <= (sal_Int32)(mnRecSize * 2) ))
-+                        else if ( (nNewMagic == static_cast< sal_uInt32 >(0x43464D57)) && (nLen >= 34) && ( static_cast<sal_Int32>(nLen + 10) <= static_cast<sal_Int32>(mnRecSize * 2) ))
-                         {
-                             sal_uInt32 nComType = 0, nVersion = 0, nFlags = 0, nComRecCount = 0,
-                                        nCurRecSize = 0, nRemainingSize = 0, nEMFTotalSize = 0;
-@@ -1252,8 +1252,8 @@ namespace emfio
-             {
-                 // #n417818#: If we have an external header then overwrite the bounds!
-                 tools::Rectangle aExtRect(0, 0,
--                    (double)mpExternalHeader->xExt * 567 * mnUnitsPerInch / 1440000,
--                    (double)mpExternalHeader->yExt * 567 * mnUnitsPerInch / 1440000);
-+                    static_cast<double>(mpExternalHeader->xExt) * 567 * mnUnitsPerInch / 1440000,
-+                    static_cast<double>(mpExternalHeader->yExt) * 567 * mnUnitsPerInch / 1440000);
-                 aPlaceableBound = aExtRect;
- 
-                 SAL_INFO("vcl.wmf", "External header size "
--- 
-cgit v1.1
-
-From 769ad348b0008d2879333a29a5570e185a9b5937 Mon Sep 17 00:00:00 2001
-From: Stephan Bergmann <sbergman at redhat.com>
-Date: Mon, 15 Jan 2018 09:05:51 +0100
-Subject: More loplugin:cstylecast: emfio
-
-Change-Id: I52e540bdd8ba0090dec752deb7b1fa5c67ae3c85
----
- emfio/source/reader/emfreader.cxx | 2 +-
- emfio/source/reader/wmfreader.cxx | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/emfio/source/reader/emfreader.cxx b/emfio/source/reader/emfreader.cxx
-index 8e9b6b5..d1873c7 100644
---- a/emfio/source/reader/emfreader.cxx
-+++ b/emfio/source/reader/emfreader.cxx
-@@ -823,7 +823,7 @@ namespace emfio
-                     case EMR_SETROP2 :
-                     {
-                         mpInputStream->ReadUInt32( nDat32 );
--                        SetRasterOp( (WMFRasterOp)nDat32 );
-+                        SetRasterOp( static_cast<WMFRasterOp>(nDat32) );
-                     }
-                     break;
- 
-diff --git a/emfio/source/reader/wmfreader.cxx b/emfio/source/reader/wmfreader.cxx
-index 21f0bd2..5b4353f 100644
---- a/emfio/source/reader/wmfreader.cxx
-+++ b/emfio/source/reader/wmfreader.cxx
-@@ -203,7 +203,7 @@ namespace emfio
-             {
-                 sal_uInt16 nROP2 = 0;
-                 mpInputStream->ReadUInt16( nROP2 );
--                SetRasterOp( (WMFRasterOp)nROP2 );
-+                SetRasterOp( static_cast<WMFRasterOp>(nROP2) );
-             }
-             break;
- 
-@@ -986,7 +986,7 @@ namespace emfio
-                 WMFRasterOp nOldROP = WMFRasterOp::NONE;
-                 mpInputStream->ReadUInt32( nROP );
-                 Size aSize = ReadYXExt();
--                nOldROP = SetRasterOp( (WMFRasterOp)nROP );
-+                nOldROP = SetRasterOp( static_cast<WMFRasterOp>(nROP) );
-                 DrawRect( tools::Rectangle( ReadYX(), aSize ), false );
-                 SetRasterOp( nOldROP );
-             }
--- 
-cgit v1.1
-
-



More information about the arch-commits mailing list