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/BreakDlg.hxx | |
| parent | 064f1e4ed53cb16d174534e20a7d02b8c93a4948 (diff) | |
| parent | f2aeec8f22f37146c2f9120e8d0ead383049c1fa (diff) | |
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
Diffstat (limited to 'sd/source/ui/inc/BreakDlg.hxx')
| -rwxr-xr-x[-rw-r--r--] | sd/source/ui/inc/BreakDlg.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sd/source/ui/inc/BreakDlg.hxx b/sd/source/ui/inc/BreakDlg.hxx index 87c9a0f7c718..dd43694aa436 100644..100755 --- a/sd/source/ui/inc/BreakDlg.hxx +++ b/sd/source/ui/inc/BreakDlg.hxx @@ -60,8 +60,8 @@ public: ::Window* pWindow, DrawView* pDrView, DrawDocShell* pShell, - ULONG nSumActionCount, - ULONG nObjCount); + sal_uLong nSumActionCount, + sal_uLong nObjCount); virtual ~BreakDlg(); short Execute(); @@ -78,7 +78,7 @@ private: CancelButton aBtnCancel; DrawView* pDrView; - BOOL bCancel; + sal_Bool bCancel; Timer aTimer; SvdProgressInfo *pProgrInfo; |