svn commit: r1542243 - in /openoffice/trunk/main: accessibility/source/standard/vclxaccessiblelist.cxx editeng/source/accessibility/AccessibleEditableTextPara.cxx

[hdu]

Author: hdu
Date: Fri Nov 15 12:17:34 2013
New Revision: 1542243

URL: http://svn.apache.org/r1542243
Log:
#i107914# fix another build breaker on 64bit platforms

Modified:
    openoffice/trunk/main/accessibility/source/standard/vclxaccessiblelist.cxx
    
openoffice/trunk/main/editeng/source/accessibility/AccessibleEditableTextPara.cxx

Modified: 
openoffice/trunk/main/accessibility/source/standard/vclxaccessiblelist.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/accessibility/source/standard/vclxaccessiblelist.cxx?rev=1542243&r1=1542242&r2=1542243&view=diff
==============================================================================
--- openoffice/trunk/main/accessibility/source/standard/vclxaccessiblelist.cxx 
(original)
+++ openoffice/trunk/main/accessibility/source/standard/vclxaccessiblelist.cxx 
Fri Nov 15 12:17:34 2013
@@ -673,7 +673,7 @@ Reference<XAccessible> SAL_CALL VCLXAcce
 
     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
        {

Modified: 
openoffice/trunk/main/editeng/source/accessibility/AccessibleEditableTextPara.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/editeng/source/accessibility/AccessibleEditableTextPara.cxx?rev=1542243&r1=1542242&r2=1542243&view=diff
==============================================================================
--- 
openoffice/trunk/main/editeng/source/accessibility/AccessibleEditableTextPara.cxx
 (original)
+++ 
openoffice/trunk/main/editeng/source/accessibility/AccessibleEditableTextPara.cxx
 Fri Nov 15 12:17:34 2013
@@ -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;