svn commit: r1418075 - /openoffice/trunk/main/framework/source/uielement/statusbarmerger.cxx

[alg]

Author: alg
Date: Thu Dec  6 21:02:08 2012
New Revision: 1418075

URL: http://svn.apache.org/viewvc?rev=1418075&view=rev
Log:
corrected missing precompiled header and 16/32 bit mismatch

Modified:
    openoffice/trunk/main/framework/source/uielement/statusbarmerger.cxx

Modified: openoffice/trunk/main/framework/source/uielement/statusbarmerger.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/framework/source/uielement/statusbarmerger.cxx?rev=1418075&r1=1418074&r2=1418075&view=diff
==============================================================================
--- openoffice/trunk/main/framework/source/uielement/statusbarmerger.cxx 
(original)
+++ openoffice/trunk/main/framework/source/uielement/statusbarmerger.cxx Thu 
Dec  6 21:02:08 2012
@@ -19,6 +19,9 @@
  *
  *************************************************************/
 
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_framework.hxx"
+
 #include <uielement/statusbarmerger.hxx>
 
 using rtl::OUString;
@@ -128,7 +131,8 @@ static bool lcl_MergeItems( StatusBar* p
                             const ::rtl::OUString& rModuleIdentifier,
                             const AddonStatusbarItemContainer& rAddonItems )
 {
-    const sal_uInt16 nSize( rAddonItems.size() );
+    OSL_ENSURE(rAddonItems.size() <= 0xffff, "Caution: Not all items get 
handled (!)");
+    const sal_uInt16 nSize( static_cast< sal_uInt16 >(rAddonItems.size()) );
     for ( sal_Int32 i = 0; i < nSize; i++ )
     {
         const AddonStatusbarItem& rItem = rAddonItems[i];