diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-03-12 20:06:58 +0100 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-03-12 20:06:58 +0100 |
commit | c61cd1a5a26de1d1f62389988b00229c04e36693 (patch) | |
tree | 9d6de00f4d149cba080fe88f1eff71a67786b5f0 /sd/source/ui/inc/ViewShellBase.hxx | |
parent | 064f1e4ed53cb16d174534e20a7d02b8c93a4948 (diff) | |
parent | f2aeec8f22f37146c2f9120e8d0ead383049c1fa (diff) |
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
Diffstat (limited to 'sd/source/ui/inc/ViewShellBase.hxx')
-rw-r--r-- | sd/source/ui/inc/ViewShellBase.hxx | 30 |
1 files changed, 8 insertions, 22 deletions
diff --git a/sd/source/ui/inc/ViewShellBase.hxx b/sd/source/ui/inc/ViewShellBase.hxx index 18f6a14c2a1f..26355e41baeb 100644 --- a/sd/source/ui/inc/ViewShellBase.hxx +++ b/sd/source/ui/inc/ViewShellBase.hxx @@ -137,32 +137,18 @@ public: virtual com::sun::star::uno::Reference<com::sun::star::view::XRenderable> GetRenderable (void); /// Forwarded to the print manager. - virtual SfxPrinter* GetPrinter (BOOL bCreate = FALSE); + virtual SfxPrinter* GetPrinter (sal_Bool bCreate = sal_False); /// Forwarded to the print manager. - virtual USHORT SetPrinter ( + virtual sal_uInt16 SetPrinter ( SfxPrinter* pNewPrinter, - USHORT nDiffFlags = SFX_PRINTER_ALL, bool bIsApi=false); - - /// Forwarded to the print manager. - virtual PrintDialog* CreatePrintDialog (::Window *pParent); + sal_uInt16 nDiffFlags = SFX_PRINTER_ALL, bool bIsApi=false); /// Forwarded to the print manager. virtual SfxTabPage* CreatePrintOptionsPage ( ::Window *pParent, const SfxItemSet &rOptions); - /// Forwarded to the print manager. - virtual USHORT Print (SfxProgress& rProgress, BOOL bIsAPI, PrintDialog* pDialog); - - /// Forwarded to the print manager. - virtual ErrCode DoPrint ( - SfxPrinter *pPrinter, - PrintDialog *pPrintDialog, - BOOL bSilent, BOOL bIsAPI ); - - virtual void PreparePrint (PrintDialog* pPrintDialog); - /// Forward methods to main sub shell. virtual void WriteUserDataSequence ( ::com::sun::star::uno::Sequence < @@ -180,14 +166,14 @@ public: virtual void UIActivating( SfxInPlaceClient* ); virtual void UIDeactivated( SfxInPlaceClient* ); - virtual void Activate (BOOL IsMDIActivate); - virtual void Deactivate (BOOL IsMDIActivate); + virtual void Activate (sal_Bool IsMDIActivate); + virtual void Deactivate (sal_Bool IsMDIActivate); virtual void SetZoomFactor ( const Fraction &rZoomX, const Fraction &rZoomY); - virtual USHORT PrepareClose (BOOL bUI = TRUE, BOOL bForBrowsing = FALSE); - virtual void WriteUserData (String&, BOOL bBrowse = FALSE); - virtual void ReadUserData (const String&, BOOL bBrowse = FALSE); + virtual sal_uInt16 PrepareClose (sal_Bool bUI = sal_True, sal_Bool bForBrowsing = sal_False); + virtual void WriteUserData (String&, sal_Bool bBrowse = sal_False); + virtual void ReadUserData (const String&, sal_Bool bBrowse = sal_False); virtual SdrView* GetDrawView (void) const; virtual void AdjustPosSizePixel (const Point &rOfs, const Size &rSize); |