From 7799914b16ac11d59524a9e5aa1d2a2c06645185 Mon Sep 17 00:00:00 2001
From: Xiaofei Zhang <Zhangxiaofei@openoffice.org>
Date: Fri, 5 Nov 2010 10:31:15 +0800
Subject: removetooltypes01: #i112600# remove tooltypes from toolkit, svtools
and framework
---
framework/source/uielement/headermenucontroller.cxx | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
(limited to 'framework/source/uielement/headermenucontroller.cxx')
diff --git a/framework/source/uielement/headermenucontroller.cxx b/framework/source/uielement/headermenucontroller.cxx
index c0d7b48a401b..7b3299a344fb 100644
--- a/framework/source/uielement/headermenucontroller.cxx
+++ b/framework/source/uielement/headermenucontroller.cxx
@@ -83,7 +83,7 @@ using namespace com::sun::star::container;
//#define RID_SW_SHELLRES (RID_SW_START + 1250 + 1)
//#define STR_ALLPAGE_HEADFOOT 14
-const USHORT ALL_MENUITEM_ID = 1;
+const sal_uInt16 ALL_MENUITEM_ID = 1;
namespace framework
{
@@ -140,8 +140,8 @@ void HeaderMenuController::fillPopupMenu( const Reference< ::com::sun::star::fra
{
Sequence< rtl::OUString > aSeqNames = xNameContainer->getElementNames();
- USHORT nId = 2;
- USHORT nCount = 0;
+ sal_uInt16 nId = 2;
+ sal_uInt16 nCount = 0;
sal_Bool bAllOneState( sal_True );
sal_Bool bLastCheck( sal_True );
sal_Bool bFirstChecked( sal_False );
@@ -184,7 +184,7 @@ void HeaderMenuController::fillPopupMenu( const Reference< ::com::sun::star::fra
// Check if all entries have the same state
if( bAllOneState && n && bHeaderIsOn != bLastCheck )
- bAllOneState = FALSE;
+ bAllOneState = sal_False;
bLastCheck = bHeaderIsOn;
++nCount;
}
--
cgit