Merge remote-tracking branch 'origin/integration/dev300_m101'

Conflicts:
comphelper/source/misc/servicedecl.cxx
i18npool/source/breakiterator/breakiteratorImpl.cxx
l10ntools/scripts/localize.pl
svl/source/items/itemset.cxx
svl/source/memtools/svarray.cxx
svl/source/numbers/zformat.cxx
svtools/source/brwbox/brwbox1.cxx
tools/source/stream/strmwnt.cxx
vcl/inc/vcl/graphite_adaptors.hxx
vcl/inc/vcl/graphite_layout.hxx
vcl/inc/vcl/graphite_serverfont.hxx
vcl/source/control/imgctrl.cxx
vcl/source/gdi/outdev.cxx
vcl/source/gdi/outdev3.cxx
vcl/source/glyphs/gcach_ftyp.cxx
vcl/source/glyphs/graphite_adaptors.cxx
vcl/source/glyphs/graphite_layout.cxx
vcl/source/window/winproc.cxx
vcl/unx/source/fontmanager/fontconfig.cxx

1 files changed, 22 insertions, 22 deletions

diff --git a/vcl/win/inc/salprn.h b/vcl/win/inc/salprn.h
index 55b421a9cba9..123af2f79a90 100644
--- a/vcl/win/inc/salprn.h
+++ b/vcl/win/inc/salprn.h
@@ -37,7 +37,7 @@
 // -----------------
 
 // WNT3
-#define SAL_DRIVERDATA_SYSSIGN              ((ULONG)0x574E5433)
+#define SAL_DRIVERDATA_SYSSIGN              ((sal_uIntPtr)0x574E5433)
 #define SAL_DRIVERDATA_VERSION_A            1
 #define SAL_DRIVERDATA_VERSION_W            2
 
@@ -45,9 +45,9 @@
 
 struct SalDriverData
 {
-    ULONG                   mnSysSignature;
-    USHORT                  mnVersion;
-    USHORT                  mnDriverOffset;
+    sal_uIntPtr                 mnSysSignature;
+    sal_uInt16                  mnVersion;
+    sal_uInt16                  mnDriverOffset;
     BYTE                    maDriverData[1];
 };
 
@@ -67,23 +67,23 @@ public:
     XubString               maDeviceName;           // printer device name
     XubString               maPortName;             // printer port name
     HDC                     mhDC;                   // printer hdc
-    BOOL                    mbGraphics;             // is Graphics used
+    sal_Bool                    mbGraphics;             // is Graphics used
 public:
     WinSalInfoPrinter();
     virtual ~WinSalInfoPrinter();
 
     virtual SalGraphics*            GetGraphics();
     virtual void                    ReleaseGraphics( SalGraphics* pGraphics );
-    virtual BOOL                    Setup( SalFrame* pFrame, ImplJobSetup* pSetupData );
-    virtual BOOL                    SetPrinterData( ImplJobSetup* pSetupData );
-    virtual BOOL                    SetData( ULONG nFlags, ImplJobSetup* pSetupData );
+    virtual sal_Bool                    Setup( SalFrame* pFrame, ImplJobSetup* pSetupData );
+    virtual sal_Bool                    SetPrinterData( ImplJobSetup* pSetupData );
+    virtual sal_Bool                    SetData( sal_uIntPtr nFlags, ImplJobSetup* pSetupData );
     virtual void                    GetPageInfo( const ImplJobSetup* pSetupData,
                                                  long& rOutWidth, long& rOutHeight,
                                                  long& rPageOffX, long& rPageOffY,
                                                  long& rPageWidth, long& rPageHeight );
-    virtual ULONG                   GetCapabilities( const ImplJobSetup* pSetupData, USHORT nType );
-    virtual ULONG                   GetPaperBinCount( const ImplJobSetup* pSetupData );
-    virtual String                  GetPaperBinName( const ImplJobSetup* pSetupData, ULONG nPaperBin );
+    virtual sal_uIntPtr                 GetCapabilities( const ImplJobSetup* pSetupData, sal_uInt16 nType );
+    virtual sal_uIntPtr                 GetPaperBinCount( const ImplJobSetup* pSetupData );
+    virtual String                  GetPaperBinName( const ImplJobSetup* pSetupData, sal_uIntPtr nPaperBin );
     virtual void                    InitPaperFormats( const ImplJobSetup* pSetupData );
     virtual int                 GetLandscapeAngle( const ImplJobSetup* pSetupData );
 };
@@ -99,10 +99,10 @@ public:
     WinSalInfoPrinter*      mpInfoPrinter;          // pointer to the compatible InfoPrinter
     WinSalPrinter*          mpNextPrinter;          // next printing printer
     HDC                     mhDC;                   // printer hdc
-    ULONG                   mnError;                // Error Code
-    ULONG                   mnCopies;               // Kopien
-    BOOL                    mbCollate;              // Sortierte Kopien
-    BOOL                    mbAbort;                // Job Aborted
+    sal_uIntPtr                 mnError;                // Error Code
+    sal_uIntPtr                 mnCopies;               // Kopien
+    sal_Bool                    mbCollate;              // Sortierte Kopien
+    sal_Bool                    mbAbort;                // Job Aborted
 
     bool                    mbValid;
 
@@ -111,18 +111,18 @@ public:
     virtual ~WinSalPrinter();
 
     using SalPrinter::StartJob;
-    virtual BOOL                    StartJob( const XubString* pFileName,
+    virtual sal_Bool                    StartJob( const XubString* pFileName,
                                               const XubString& rJobName,
                                               const XubString& rAppName,
-                                              ULONG nCopies,
+                                              sal_uIntPtr nCopies,
                                               bool bCollate,
                                               bool bDirect,
                                               ImplJobSetup* pSetupData );
-    virtual BOOL                    EndJob();
-    virtual BOOL                    AbortJob();
-    virtual SalGraphics*            StartPage( ImplJobSetup* pSetupData, BOOL bNewJobData );
-    virtual BOOL                    EndPage();
-    virtual ULONG                   GetErrorCode();
+    virtual sal_Bool                    EndJob();
+    virtual sal_Bool                    AbortJob();
+    virtual SalGraphics*            StartPage( ImplJobSetup* pSetupData, sal_Bool bNewJobData );
+    virtual sal_Bool                    EndPage();
+    virtual sal_uIntPtr                 GetErrorCode();
 
     void markInvalid();
     bool isValid() const { return mbValid; }