From dcd8e4664d9a284c24ceb0360cab0606b22cf86d Mon Sep 17 00:00:00 2001
From: Mikhail Voytenko <mav@openoffice.org>
Date: Fri, 7 Jan 2011 17:14:47 +0100
Subject: removetooltypes: #i112600# remove tooltypes

---
 sfx2/source/inc/sfxtypes.hxx | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'sfx2/source/inc/sfxtypes.hxx')

diff --git a/sfx2/source/inc/sfxtypes.hxx b/sfx2/source/inc/sfxtypes.hxx
index 73014121541e..937c2622cc13 100644
--- a/sfx2/source/inc/sfxtypes.hxx
+++ b/sfx2/source/inc/sfxtypes.hxx
@@ -161,29 +161,29 @@ struct StringList_Impl : private Resource
 
     ResId aResId;
 
-    StringList_Impl( const ResId& rErrIdP,  USHORT nId)
+    StringList_Impl( const ResId& rErrIdP,  sal_uInt16 nId)
         : Resource( rErrIdP ),aResId(nId, *rErrIdP.GetResMgr()){}
     ~StringList_Impl() { FreeResource(); }
 
     String GetString(){ return String( aResId ); }
-    operator BOOL(){return IsAvailableRes(aResId.SetRT(RSC_STRING));}
+    operator sal_Bool(){return IsAvailableRes(aResId.SetRT(RSC_STRING));}
 
 };
 
 #define SFX_DEL_PTRARR(pArr)                                    \
             {                                                   \
-                for ( USHORT n = (pArr)->Count(); n--; )        \
+                for ( sal_uInt16 n = (pArr)->Count(); n--; )        \
                     delete (pArr)->GetObject(n);                \
                 DELETEX(pArr);                                  \
             }
 
 class SfxBoolResetter
 {
-    BOOL&               _rVar;
-    BOOL                _bOld;
+    sal_Bool&               _rVar;
+    sal_Bool                _bOld;
 
 public:
-                        SfxBoolResetter( BOOL &rVar )
+                        SfxBoolResetter( sal_Bool &rVar )
                         :   _rVar( rVar ),
                             _bOld( rVar )
                         {}
-- 
cgit 


From 545e9efdd367d49763b9d341fb9168530d7ada48 Mon Sep 17 00:00:00 2001
From: Mathias Bauer <mba@openoffice.org>
Date: Thu, 20 Jan 2011 19:39:48 +0100
Subject: CWS gnumake3: -D_DLL is needed on Windows; removed superficial _DLL_
 usage all over the place

---
 sfx2/source/inc/sfxtypes.hxx | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'sfx2/source/inc/sfxtypes.hxx')

diff --git a/sfx2/source/inc/sfxtypes.hxx b/sfx2/source/inc/sfxtypes.hxx
index 73014121541e..5454da573cb5 100644
--- a/sfx2/source/inc/sfxtypes.hxx
+++ b/sfx2/source/inc/sfxtypes.hxx
@@ -62,12 +62,6 @@
 class SfxShell;
 class Timer;
 
-#if !defined(_SFX_APPCTOR_CXX) && defined(WNT)
-#ifndef _DLL_
-#error _DLL_ mal wieder nicht defined => GetpApp() == 0
-#endif
-#endif
-
 //------------------------------------------------------------------------
 
 // Macro fuer den Call-Profiler unter WinNT
-- 
cgit