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/drawview.hxx | |
| parent | 064f1e4ed53cb16d174534e20a7d02b8c93a4948 (diff) | |
| parent | f2aeec8f22f37146c2f9120e8d0ead383049c1fa (diff) | |
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
Diffstat (limited to 'sd/source/ui/inc/drawview.hxx')
| -rwxr-xr-x[-rw-r--r--] | sd/source/ui/inc/drawview.hxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sd/source/ui/inc/drawview.hxx b/sd/source/ui/inc/drawview.hxx index 57eed72e3c32..4d4819f5b4c2 100644..100755 --- a/sd/source/ui/inc/drawview.hxx +++ b/sd/source/ui/inc/drawview.hxx @@ -61,14 +61,14 @@ public: virtual void MarkListHasChanged(); void CompleteRedraw(OutputDevice* pOutDev, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0L); - virtual BOOL SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll = FALSE); + virtual sal_Bool SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll = sal_False); virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint); - void BlockPageOrderChangedHint(BOOL bBlock); + void BlockPageOrderChangedHint(sal_Bool bBlock); - BOOL SetStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr = FALSE); - virtual BOOL IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const; + sal_Bool SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr = sal_False); + virtual sal_Bool IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const; virtual void MakeVisible(const Rectangle& rRect, ::Window& rWin); virtual void HideSdrPage(); // SdrPageView* pPV); @@ -86,7 +86,7 @@ private: DrawViewShell* mpDrawViewShell; VirtualDevice* mpVDev; - USHORT mnPOCHSmph; // zum blockieren des PageOrderChangedHint + sal_uInt16 mnPOCHSmph; // zum blockieren des PageOrderChangedHint }; } // end of namespace sd |