diff options
| author | os <os@openoffice.org> | 2011-02-15 16:01:31 +0100 |
|---|---|---|
| committer | os <os@openoffice.org> | 2011-02-15 16:01:31 +0100 |
| commit | 49cee70700df0b4cddfe3632b34749a0093be336 (patch) | |
| tree | a1c3a0228c17048a4cfafbacfc5e869e1bb2a968 /sw/source/ui/inc/envlop.hxx | |
| parent | b3b18b10a748601d1dd2573fb5005c02a2470f22 (diff) | |
| parent | 2fa791c5295f16bbc25ab33a58b9dbb1652108f7 (diff) | |
m100 merged
Diffstat (limited to 'sw/source/ui/inc/envlop.hxx')
| -rw-r--r-- | sw/source/ui/inc/envlop.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/ui/inc/envlop.hxx b/sw/source/ui/inc/envlop.hxx index 6fddc3819d..2d4ccf0a16 100644 --- a/sw/source/ui/inc/envlop.hxx +++ b/sw/source/ui/inc/envlop.hxx @@ -90,11 +90,11 @@ friend class SwEnvPreview; SfxItemSet *pAddresseeSet; SfxItemSet *pSenderSet; - virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ); virtual short Ok(); public: - SwEnvDlg(Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, BOOL bInsert); + SwEnvDlg(Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, sal_Bool bInsert); ~SwEnvDlg(); }; @@ -140,7 +140,7 @@ public: virtual void ActivatePage(const SfxItemSet& rSet); virtual int DeactivatePage(SfxItemSet* pSet = 0); void FillItem(SwEnvItem& rItem); - virtual BOOL FillItemSet(SfxItemSet& rSet); + virtual sal_Bool FillItemSet(SfxItemSet& rSet); virtual void Reset(const SfxItemSet& rSet); }; |