svn commit: r1542248 - in /openoffice/trunk/main/sw/source/core/access: accfield.hxx accpara.cxx

[hdu]

Author: hdu
Date: Fri Nov 15 12:37:08 2013
New Revision: 1542248

URL: http://svn.apache.org/r1542248
Log:
#i107914# IA2 build fixes in SW-module for 64bit platforms

Modified:
    openoffice/trunk/main/sw/source/core/access/accfield.hxx
    openoffice/trunk/main/sw/source/core/access/accpara.cxx

Modified: openoffice/trunk/main/sw/source/core/access/accfield.hxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/access/accfield.hxx?rev=1542248&r1=1542247&r2=1542248&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/access/accfield.hxx (original)
+++ openoffice/trunk/main/sw/source/core/access/accfield.hxx Fri Nov 15 
12:37:08 2013
@@ -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.

Modified: openoffice/trunk/main/sw/source/core/access/accpara.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/access/accpara.cxx?rev=1542248&r1=1542247&r2=1542248&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/access/accpara.cxx (original)
+++ openoffice/trunk/main/sw/source/core/access/accpara.cxx Fri Nov 15 12:37:08 
2013
@@ -2533,7 +2533,7 @@ void SwAccessibleParagraph::_correctValu
                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::_correctValu
                        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::_correctValu
                        }
 
                        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);