Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

1 files changed, 7 insertions, 7 deletions

diff --git a/sc/inc/printopt.hxx b/sc/inc/printopt.hxx
index cf9e55e50c26..5883e7ccb18c 100644
--- a/sc/inc/printopt.hxx
+++ b/sc/inc/printopt.hxx
@@ -36,18 +36,18 @@
 class SC_DLLPUBLIC ScPrintOptions
 {
 private:
-    BOOL    bSkipEmpty;
-    BOOL    bAllSheets;
+    sal_Bool    bSkipEmpty;
+    sal_Bool    bAllSheets;
 
 public:
                 ScPrintOptions();
                 ScPrintOptions( const ScPrintOptions& rCpy );
                 ~ScPrintOptions();
 
-    BOOL    GetSkipEmpty() const            { return bSkipEmpty; }
-    void    SetSkipEmpty( BOOL bVal )       { bSkipEmpty = bVal; }
-    BOOL    GetAllSheets() const            { return bAllSheets; }
-    void    SetAllSheets( BOOL bVal )       { bAllSheets = bVal; }
+    sal_Bool    GetSkipEmpty() const            { return bSkipEmpty; }
+    void    SetSkipEmpty( sal_Bool bVal )       { bSkipEmpty = bVal; }
+    sal_Bool    GetAllSheets() const            { return bAllSheets; }
+    void    SetAllSheets( sal_Bool bVal )       { bAllSheets = bVal; }
 
     void    SetDefaults();
 
@@ -64,7 +64,7 @@ class SC_DLLPUBLIC ScTpPrintItem : public SfxPoolItem
 {
 public:
                 TYPEINFO();
-                ScTpPrintItem( USHORT nWhich,
+                ScTpPrintItem( sal_uInt16 nWhich,
                                const ScPrintOptions& rOpt );
                 ScTpPrintItem( const ScTpPrintItem& rItem );
                 ~ScTpPrintItem();