accessibility/source/standard/vclxaccessiblelist.cxx | 2 curl/curl-7.19.7_win.patch | 38 ++++++------ editeng/source/accessibility/AccessibleEditableTextPara.cxx | 4 - sw/source/core/access/accfield.hxx | 2 sw/source/core/access/accpara.cxx | 6 - winaccessibility/source/UAccCOM/makefile.mk | 9 -- 6 files changed, 27 insertions(+), 34 deletions(-)
New commits: commit 11dde52476f5723d874699e0f0fc58092e7e96ad Author: Oliver-Rainer Wittmann <o...@apache.org> Date: Fri Nov 15 13:40:56 2013 +0000 fix build breaker in new module winaccessibility introduced with ia2 build breaks under Windows on non-pro build when building without stlport Patch by: hdu diff --git a/winaccessibility/source/UAccCOM/makefile.mk b/winaccessibility/source/UAccCOM/makefile.mk index e190f25..9222140 100644 --- a/winaccessibility/source/UAccCOM/makefile.mk +++ b/winaccessibility/source/UAccCOM/makefile.mk @@ -46,9 +46,6 @@ CFLAGS+=-D_UNICODE -DUNICODE .IF "$(PRODUCT)"!="" RC+=-DPRODUCT .ENDIF -.IF "$(USE_STLP_DEBUG)"!="" -CDEFS+=-D_DEBUG -.ENDIF # "$(USE_STLP_DEBUG)"!="" RCFILES=\ $(TARGET).rc @@ -113,12 +110,8 @@ SHL1STDLIBS=\ .IF "$(COM)"!="GCC" .IF "$(CCNUMVER)" > "001300000000" -.IF "$(USE_STLP_DEBUG)" != "" - SHL1STDLIBS+= $(ATL_LIB)$/atlsd.lib -.ELSE SHL1STDLIBS+= $(ATL_LIB)$/atls.lib .ENDIF -.ENDIF .ENDIF SHL1OBJS=$(SLOFILES) @@ -139,4 +132,4 @@ ALLTAR : \ $(MISC)/$(TARGET).manifest: $(BIN)$/$(TARGET)$(DLLPOST) cat *.rgs > $(MISC)$/$(TARGET).rgs mt.exe -rgs:$(MISC)$/$(TARGET).rgs -tlb:$(MISC)$/$(TARGET).tlb -dll:$(TARGET).dll -out:$(MISC)$/$(TARGET).manifest - mt.exe -manifest $(MISC)$/$(TARGET).manifest -outputresource:$(BIN)$/$(TARGET)$(DLLPOST)\;\#97 \ No newline at end of file + mt.exe -manifest $(MISC)$/$(TARGET).manifest -outputresource:$(BIN)$/$(TARGET)$(DLLPOST)\;\#97 commit e9ca732f8aeba1a9bb2e1d9f4e95047675490d79 Author: Oliver-Rainer Wittmann <o...@apache.org> Date: Fri Nov 15 12:51:21 2013 +0000 part 2 of revert unnecessary change to curl patch file diff --git a/curl/curl-7.19.7_win.patch b/curl/curl-7.19.7_win.patch index bc59433..3f08fd2 100644 --- a/curl/curl-7.19.7_win.patch +++ b/curl/curl-7.19.7_win.patch @@ -1,19 +1,19 @@ ---- misc/curl-7.19.7/lib/Makefile.vc9 2009-11-04 13:35:39.000000000 +0100 -+++ misc/build/curl-7.19.7/lib/Makefile.vc9 2009-11-18 12:32:57.234375000 +0100 -@@ -46,13 +46,13 @@ - # Stem for static libs and DLLs - # - LIB_NAME = libcurl --LIB_NAME_DEBUG = libcurld -+LIB_NAME_DEBUG = libcurl - - # - # Stem for DLL import libs - # --IMPLIB_NAME = libcurl_imp --IMPLIB_NAME_DEBUG = libcurld_imp -+IMPLIB_NAME = libcurl -+IMPLIB_NAME_DEBUG = libcurl - - !IFNDEF OPENSSL_PATH - OPENSSL_PATH = ../../openssl-0.9.8g +--- misc/curl-7.19.7/lib/Makefile.vc9 2009-11-04 13:35:39.000000000 +0100 ++++ misc/build/curl-7.19.7/lib/Makefile.vc9 2009-11-18 12:32:57.234375000 +0100 +@@ -46,13 +46,13 @@ + # Stem for static libs and DLLs + # + LIB_NAME = libcurl +-LIB_NAME_DEBUG = libcurld ++LIB_NAME_DEBUG = libcurl + + # + # Stem for DLL import libs + # +-IMPLIB_NAME = libcurl_imp +-IMPLIB_NAME_DEBUG = libcurld_imp ++IMPLIB_NAME = libcurl ++IMPLIB_NAME_DEBUG = libcurl + + !IFNDEF OPENSSL_PATH + OPENSSL_PATH = ../../openssl-0.9.8g commit 807186202af80d8320e5c7459e94c0bdd02f765b Author: Herbert Dürr <h...@apache.org> Date: Fri Nov 15 12:37:08 2013 +0000 #i107914# IA2 build fixes in SW-module for 64bit platforms diff --git a/sw/source/core/access/accfield.hxx b/sw/source/core/access/accfield.hxx index 18db16c..e99a3c3 100644 --- a/sw/source/core/access/accfield.hxx +++ b/sw/source/core/access/accfield.hxx @@ -125,7 +125,7 @@ public: //===== XAccessibleContext ============================================== /// Return the number of currently visible children. - virtual long SAL_CALL getAccessibleChildCount (void) + virtual sal_Int32 SAL_CALL getAccessibleChildCount (void) throw (::com::sun::star::uno::RuntimeException); /// Return the specified child or NULL if index is invalid. diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx index 31e41f7..84e4a6e 100644 --- a/sw/source/core/access/accpara.cxx +++ b/sw/source/core/access/accpara.cxx @@ -2533,7 +2533,7 @@ void SwAccessibleParagraph::_correctValues( const sal_Int32 nIndex, if (rValue.Name.compareTo(::rtl::OUString::createFromAscii( GetPropName( UNO_NAME_CHAR_BACK_COLOR ).pName ) )==0) { uno::Any &anyChar = rValue.Value; - sal_uInt32 crBack = (sal_uInt32)(anyChar.pReserved); + sal_uInt32 crBack = static_cast<sal_uInt32>( reinterpret_cast<sal_uIntPtr>(anyChar.pReserved)); if (COL_AUTO == crBack) { uno::Reference<XAccessibleComponent> xComponent(this); @@ -2552,7 +2552,7 @@ void SwAccessibleParagraph::_correctValues( const sal_Int32 nIndex, if( GetPortionData().IsInGrayPortion( nIndex ) ) rValue.Value <<= SwViewOption::GetFieldShadingsColor().GetColor(); uno::Any &anyChar = rValue.Value; - sal_uInt32 crChar = (sal_uInt32)(anyChar.pReserved); + sal_uInt32 crChar = static_cast<sal_uInt32>( reinterpret_cast<sal_uIntPtr>(anyChar.pReserved)); if( COL_AUTO == crChar ) { @@ -2609,7 +2609,7 @@ void SwAccessibleParagraph::_correctValues( const sal_Int32 nIndex, } uno::Any &anyChar = rValue.Value; - sal_uInt32 crUnderline = (sal_uInt32)(anyChar.pReserved); + sal_uInt32 crUnderline = static_cast<sal_uInt32>( reinterpret_cast<sal_uIntPtr>(anyChar.pReserved)); if ( COL_AUTO == crUnderline ) { uno::Reference<XAccessibleComponent> xComponent(this); commit 46c77dca958b8fbc1a78677ec235e058c8005395 Author: Herbert Dürr <h...@apache.org> Date: Fri Nov 15 12:17:34 2013 +0000 #i107914# fix another build breaker on 64bit platforms diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx b/accessibility/source/standard/vclxaccessiblelist.cxx index 6453c72..624923f 100644 --- a/accessibility/source/standard/vclxaccessiblelist.cxx +++ b/accessibility/source/standard/vclxaccessiblelist.cxx @@ -673,7 +673,7 @@ Reference<XAccessible> SAL_CALL VCLXAccessibleList::getAccessibleChild (sal_Int3 Reference< XAccessible > xChild; // search for the child - if ( static_cast<sal_uInt16>(i) >= m_aAccessibleChildren.size() ) + if ( i >= static_cast<sal_Int32>(m_aAccessibleChildren.size()) ) xChild = CreateChild (i); else { diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx index 47e09c3..78d0bb1 100644 --- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx +++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx @@ -1795,7 +1795,7 @@ namespace accessibility if (rRes.Name.compareTo(::rtl::OUString::createFromAscii("CharColor"))==0) { uno::Any &anyChar = rRes.Value; - sal_uInt32 crChar = (sal_uInt32)(anyChar.pReserved); + sal_uInt32 crChar = static_cast<sal_uInt32>( reinterpret_cast<sal_uIntPtr>(anyChar.pReserved)); if (COL_AUTO == crChar ) { uno::Reference< ::com::sun::star::accessibility::XAccessibleComponent > xComponent; @@ -1854,7 +1854,7 @@ namespace accessibility if(rRes.Name.compareTo(::rtl::OUString::createFromAscii("CharUnderlineColor"))==0) { uno::Any &anyCharUnderLine = rRes.Value; - sal_uInt32 crCharUnderLine = (sal_uInt32)(anyCharUnderLine.pReserved); + sal_uInt32 crCharUnderLine = static_cast<sal_uInt32>( reinterpret_cast<sal_uIntPtr>( anyCharUnderLine.pReserved)); if (COL_AUTO == crCharUnderLine ) { uno::Reference< ::com::sun::star::accessibility::XAccessibleComponent > xComponent;
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits