odk/settings/std.mk | 2 python3/ExternalProject_python3.mk | 6 - python3/python-3.3.0-aix.patch.1 | 9 - sfx2/source/doc/zoomitem.cxx | 125 +++++++++++++++++--------- writerfilter/source/dmapper/GraphicImport.cxx | 8 - 5 files changed, 93 insertions(+), 57 deletions(-)
New commits: commit d96252e43c5de7d7d91eaed1301df8269fa60130 Author: Noel Power <noel.po...@suse.com> Date: Mon Apr 22 10:29:02 2013 +0100 fdo#63659 <sigh> fix brain lapse, missing break Change-Id: I02ab972cfad577423585d25587b925b5b1153506 (cherry picked from commit ad57664323e3ddf04ae99dba14ddaa22da2aacba) Reviewed-on: https://gerrit.libreoffice.org/3551 Reviewed-by: Fridrich Strba <fridr...@documentfoundation.org> Tested-by: Fridrich Strba <fridr...@documentfoundation.org> diff --git a/sfx2/source/doc/zoomitem.cxx b/sfx2/source/doc/zoomitem.cxx index 09b2ae7..7849e59 100644 --- a/sfx2/source/doc/zoomitem.cxx +++ b/sfx2/source/doc/zoomitem.cxx @@ -120,6 +120,7 @@ bool SvxZoomItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberI aSeq[2].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( ZOOM_PARAM_TYPE )); aSeq[2].Value <<= sal_Int16( eType ); rVal <<= aSeq; + break; } case MID_VALUE: rVal <<= (sal_Int32) GetValue(); break; commit 85a198815d47a2009ee135c5da665558b9a1f988 Author: Miklos Vajna <vmik...@suse.cz> Date: Fri Apr 19 17:14:05 2013 +0200 fdo#63685 wp:inline's distT/B/L/R is in EMU's, not twips Regression from 3d7e168a2a43c2414b0633379102ddb29437e75b. (cherry picked from commit a88ac708403c03d0f950f09ec29c0d5a1e5a85b4) Change-Id: I9ab3f9f41316a01d5a74f3e500bad7a83c8d2dca Reviewed-on: https://gerrit.libreoffice.org/3485 Reviewed-by: LuboÅ¡ LuÅák <l.lu...@suse.cz> Tested-by: LuboÅ¡ LuÅák <l.lu...@suse.cz> diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx index 10a17e6..1dd4f14 100644 --- a/writerfilter/source/dmapper/GraphicImport.cxx +++ b/writerfilter/source/dmapper/GraphicImport.cxx @@ -978,16 +978,16 @@ void GraphicImport::lcl_attribute(Id nName, Value & val) } break; case NS_ooxml::LN_CT_Inline_distT: - m_pImpl->nTopMargin = ConversionHelper::convertTwipToMM100(nIntValue); + m_pImpl->nTopMargin = ConversionHelper::convertEMUToMM100(nIntValue); break; case NS_ooxml::LN_CT_Inline_distB: - m_pImpl->nBottomMargin = ConversionHelper::convertTwipToMM100(nIntValue); + m_pImpl->nBottomMargin = ConversionHelper::convertEMUToMM100(nIntValue); break; case NS_ooxml::LN_CT_Inline_distL: - m_pImpl->nLeftMargin = ConversionHelper::convertTwipToMM100(nIntValue); + m_pImpl->nLeftMargin = ConversionHelper::convertEMUToMM100(nIntValue); break; case NS_ooxml::LN_CT_Inline_distR: - m_pImpl->nRightMargin = ConversionHelper::convertTwipToMM100(nIntValue); + m_pImpl->nRightMargin = ConversionHelper::convertEMUToMM100(nIntValue); break; case NS_ooxml::LN_CT_GraphicalObjectData_uri: val.getString(); commit 9b4ee3cc2663d95cb5d29ebc96a2226235d4dbaf Author: Stephan Bergmann <sberg...@redhat.com> Date: Fri Apr 19 09:26:53 2013 +0200 fdo#63693 Do not force java -d32 for a 64-bit SDK The test to determine JAVA_OPTIONS was already cheesy (e.g., it does not catch java-1.7.0-openjdk-1.7.0.9-2.3.8.0.fc18.x86_64, as there "java -version" outputs "OpenJDK 64-Bit Server VM (build 23.7-b01, mixed mode)" with "64-Bit" in the second instead of the third field), so make it a bit more cheesy still (i.e., just cover the case to not set -d32 for x86_64). Change-Id: Ib10a16fb3f8104875bfda7de0e8bce59b9c3b06a (cherry picked from commit 391477d40ea718c46089e16484726dba085a6ad8) Reviewed-on: https://gerrit.libreoffice.org/3480 Reviewed-by: Fridrich Strba <fridr...@documentfoundation.org> Tested-by: Fridrich Strba <fridr...@documentfoundation.org> diff --git a/odk/settings/std.mk b/odk/settings/std.mk index 31c95217..2227fbc 100644 --- a/odk/settings/std.mk +++ b/odk/settings/std.mk @@ -54,9 +54,11 @@ JAVA_OPTIONS= ifneq "$(OO_SDK_JAVA_HOME)" "" JAVA_BITS := $(shell $(OO_SDK_JAVA_HOME)/$(JAVABIN)/java -version 2>&1 | tail -1 | cut -d " " -f3) ifeq "$(JAVA_BITS)" "64-Bit" +ifneq "$(PROCTYPE)" "x86_64" JAVA_OPTIONS=-d32 endif endif +endif DEPLOYTOOL="$(OFFICE_PROGRAM_PATH)$(PS)unopkg" add -f SDK_JAVA="$(OO_SDK_JAVA_HOME)/$(JAVABIN)/java" $(JAVA_OPTIONS) commit 378973375d8abf93fa09c728966c2669b082bbc6 Author: Noel Power <noel.po...@suse.com> Date: Thu Apr 18 11:54:42 2013 +0100 fix fdo#63659 restore handling of ZOOM MID, MID_VALUESET & MID_TYPE sub parmas Change-Id: I01eff3bb8b194e1437a263e527cb8e6d2defa4de Reviewed-on: https://gerrit.libreoffice.org/3458 Reviewed-by: Fridrich Strba <fridr...@documentfoundation.org> Tested-by: Fridrich Strba <fridr...@documentfoundation.org> diff --git a/sfx2/source/doc/zoomitem.cxx b/sfx2/source/doc/zoomitem.cxx index 888272a..09b2ae7 100644 --- a/sfx2/source/doc/zoomitem.cxx +++ b/sfx2/source/doc/zoomitem.cxx @@ -23,7 +23,7 @@ #include <sfx2/zoomitem.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/beans/PropertyValue.hpp> - +#include "sfx.hrc" // ----------------------------------------------------------------------- TYPEINIT1_FACTORY(SvxZoomItem,SfxUInt16Item, new SvxZoomItem); @@ -107,19 +107,28 @@ int SvxZoomItem::operator==( const SfxPoolItem& rAttr ) const bool SvxZoomItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const { -// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; + switch( nMemberId ) + { + case 0: + { + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aSeq( ZOOM_PARAMS ); + aSeq[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( ZOOM_PARAM_VALUE )); + aSeq[0].Value <<= sal_Int32( GetValue() ); + aSeq[1].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( ZOOM_PARAM_VALUESET )); + aSeq[1].Value <<= sal_Int16( nValueSet ); + aSeq[2].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( ZOOM_PARAM_TYPE )); + aSeq[2].Value <<= sal_Int16( eType ); + rVal <<= aSeq; + } - assert(nMemberId == 0); - - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aSeq( ZOOM_PARAMS ); - aSeq[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ZOOM_PARAM_VALUE )); - aSeq[0].Value <<= sal_Int32( GetValue() ); - aSeq[1].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ZOOM_PARAM_VALUESET )); - aSeq[1].Value <<= sal_Int16( nValueSet ); - aSeq[2].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ZOOM_PARAM_TYPE )); - aSeq[2].Value <<= sal_Int16( eType ); - rVal <<= aSeq; + case MID_VALUE: rVal <<= (sal_Int32) GetValue(); break; + case MID_VALUESET: rVal <<= (sal_Int16) nValueSet; break; + case MID_TYPE: rVal <<= (sal_Int16) eType; break; + default: + OSL_FAIL("sfx2::SvxZoomItem::QueryValue(), Wrong MemberId!"); + return false; + } return true; } @@ -127,45 +136,80 @@ bool SvxZoomItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberI bool SvxZoomItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) { nMemberId &= ~CONVERT_TWIPS; - assert(nMemberId == 0); - - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aSeq; - if (( rVal >>= aSeq ) && ( aSeq.getLength() == ZOOM_PARAMS )) + switch( nMemberId ) { - sal_Int32 nValueTmp( 0 ); - sal_Int16 nValueSetTmp( 0 ); - sal_Int16 nTypeTmp( 0 ); - sal_Bool bAllConverted( sal_True ); - sal_Int16 nConvertedCount( 0 ); - for ( sal_Int32 i = 0; i < aSeq.getLength(); i++ ) + case 0: { - if ( aSeq[i].Name.equalsAscii( ZOOM_PARAM_VALUE )) - { - bAllConverted &= ( aSeq[i].Value >>= nValueTmp ); - ++nConvertedCount; - } - else if ( aSeq[i].Name.equalsAscii( ZOOM_PARAM_VALUESET )) + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aSeq; + if (( rVal >>= aSeq ) && ( aSeq.getLength() == ZOOM_PARAMS )) { - bAllConverted &= ( aSeq[i].Value >>= nValueSetTmp ); - ++nConvertedCount; + sal_Int32 nValueTmp( 0 ); + sal_Int16 nValueSetTmp( 0 ); + sal_Int16 nTypeTmp( 0 ); + sal_Bool bAllConverted( sal_True ); + sal_Int16 nConvertedCount( 0 ); + for ( sal_Int32 i = 0; i < aSeq.getLength(); i++ ) + { + if ( aSeq[i].Name.equalsAscii( ZOOM_PARAM_VALUE )) + { + bAllConverted &= ( aSeq[i].Value >>= nValueTmp ); + ++nConvertedCount; + } + else if ( aSeq[i].Name.equalsAscii( ZOOM_PARAM_VALUESET )) + { + bAllConverted &= ( aSeq[i].Value >>= nValueSetTmp ); + ++nConvertedCount; + } + else if ( aSeq[i].Name.equalsAscii( ZOOM_PARAM_TYPE )) + { + bAllConverted &= ( aSeq[i].Value >>= nTypeTmp ); + ++nConvertedCount; + } + } + + if ( bAllConverted && nConvertedCount == ZOOM_PARAMS ) + { + SetValue( (sal_uInt16)nValueTmp ); + nValueSet = nValueSetTmp; + eType = SvxZoomType( nTypeTmp ); + return true; + } } - else if ( aSeq[i].Name.equalsAscii( ZOOM_PARAM_TYPE )) + return false; + } + case MID_VALUE: + { + sal_Int32 nVal = 0; + if ( rVal >>= nVal ) { - bAllConverted &= ( aSeq[i].Value >>= nTypeTmp ); - ++nConvertedCount; + SetValue( (sal_uInt16)nVal ); + return true; } + else + return false; } - if ( bAllConverted && nConvertedCount == ZOOM_PARAMS ) + case MID_VALUESET: + case MID_TYPE: { - SetValue( (sal_uInt16)nValueTmp ); - nValueSet = nValueSetTmp; - eType = SvxZoomType( nTypeTmp ); - return true; + sal_Int16 nVal = sal_Int16(); + if ( rVal >>= nVal ) + { + if ( nMemberId == MID_VALUESET ) + nValueSet = (sal_Int16) nVal; + else if ( nMemberId == MID_TYPE ) + eType = SvxZoomType( (sal_Int16) nVal ); + return true; + } + else + return false; } - } - return false; + default: + OSL_FAIL("sfx2::SvxZoomItem::PutValue(), Wrong MemberId!"); + return false; + } + return true; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ commit 782dc37ba61a65a3745ca8cabf2ebb86f2fc9a11 Author: Michael Stahl <mst...@redhat.com> Date: Thu Apr 18 22:24:53 2013 +0200 python3: re-enable both debug symbols and optimization These were apparently accidentally disabled on all non-WNT platforms. Set the OPT variable from the outside on the platform that needs it. (regression from ab41efc81ec26fcbd4cdeb9c36fbe8cc274523f) Change-Id: Ifbf7ec8e0f863cb6368758571496c8b615e3e814 (cherry picked from commit 38232ea1988c8170b60aced89662260e82b86b32) Reviewed-on: https://gerrit.libreoffice.org/3472 Reviewed-by: Fridrich Strba <fridr...@documentfoundation.org> Tested-by: Fridrich Strba <fridr...@documentfoundation.org> diff --git a/python3/ExternalProject_python3.mk b/python3/ExternalProject_python3.mk index 2bde4cf..49fa0b4 100644 --- a/python3/ExternalProject_python3.mk +++ b/python3/ExternalProject_python3.mk @@ -57,9 +57,6 @@ python3_cflags = ifeq ($(ENABLE_VALGRIND),TRUE) python3_cflags += $(VALGRIND_CFLAGS) endif -ifeq ($(OS),AIX) - python3_cflags += -g0 -endif $(call gb_ExternalProject_get_state_target,python3,build) : cd $(EXTERNAL_WORKDIR) \ @@ -68,7 +65,8 @@ $(call gb_ExternalProject_get_state_target,python3,build) : --with-system-expat \ $(if $(filter TRUE,$(ENABLE_VALGRIND)),--with-valgrind) \ --prefix=/python-inst \ - $(if $(filter AIX,$(OS)),--disable-ipv6 --with-threads) \ + $(if $(filter AIX,$(OS)),--disable-ipv6 --with-threads \ + OPT="-g0 -fwrapv -O3 -Wall") \ $(if $(filter WNT-GCC,$(OS)-$(COM)),--with-threads ac_cv_printf_zd_format=no) \ $(if $(filter MACOSX,$(OS)), \ --enable-universalsdk=$(MACOSX_SDK_PATH) --with-universal-archs=32-bit --enable-framework=/@__________________________________________________OOO --with-framework-name=LibreOfficePython, \ diff --git a/python3/python-3.3.0-aix.patch.1 b/python3/python-3.3.0-aix.patch.1 index 1a24531..33f0426 100644 --- a/python3/python-3.3.0-aix.patch.1 +++ b/python3/python-3.3.0-aix.patch.1 @@ -33,15 +33,6 @@ build with GCC on AIX INSTSONAME="$LDLIBRARY".$SOVERSION if test "$with_pydebug" != yes then -@@ -6169,7 +6175,7 @@ - # debug builds. - OPT="-g -O0 -Wall $STRICT_PROTO" - else -- OPT="-g $WRAP -O3 -Wall $STRICT_PROTO" -+ OPT="$WRAP -O0 -Wall $STRICT_PROTO" - fi - ;; - *) @@ -8301,8 +8307,13 @@ then case $ac_sys_system/$ac_sys_release in
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits