summaryrefslogtreecommitdiff
path: root/sc/source/ui/inc/drawsh.hxx
diff options
context:
space:
mode:
authorKohei Yoshida <kyoshida@novell.com>2011-03-10 16:55:21 -0500
committerKohei Yoshida <kyoshida@novell.com>2011-03-10 20:21:13 -0500
commit12343c15568dcc2c9209d8ca41fda2263122448f (patch)
tree3212a89c6cd8ea2e0aee7103aa9669bbb8a6f307 /sc/source/ui/inc/drawsh.hxx
parent99745dbcbb25b61437914c9782475d0b67a4b0bd (diff)
parentce6308e4fad2281241bf4ca78280eba29f744d43 (diff)
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
Diffstat (limited to 'sc/source/ui/inc/drawsh.hxx')
-rw-r--r--sc/source/ui/inc/drawsh.hxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/sc/source/ui/inc/drawsh.hxx b/sc/source/ui/inc/drawsh.hxx
index e0a9ee9674eb..17296dcbce10 100644
--- a/sc/source/ui/inc/drawsh.hxx
+++ b/sc/source/ui/inc/drawsh.hxx
@@ -77,13 +77,13 @@ public:
void StateFormatPaintbrush(SfxItemSet& rSet);
void ExecuteMacroAssign( SdrObject* pObj, Window* pWin );
- void ExecuteLineDlg( SfxRequest& rReq, USHORT nTabPage = 0xffff );
- void ExecuteAreaDlg( SfxRequest& rReq, USHORT nTabPage = 0xffff );
- void ExecuteTextAttrDlg( SfxRequest& rReq, USHORT nTabPage = 0xffff );
+ void ExecuteLineDlg( SfxRequest& rReq, sal_uInt16 nTabPage = 0xffff );
+ void ExecuteAreaDlg( SfxRequest& rReq, sal_uInt16 nTabPage = 0xffff );
+ void ExecuteTextAttrDlg( SfxRequest& rReq, sal_uInt16 nTabPage = 0xffff );
ScDrawView* GetDrawView();
- BOOL AreAllObjectsOnLayer(USHORT nLayerNo,const SdrMarkList& rMark);
+ sal_Bool AreAllObjectsOnLayer(sal_uInt16 nLayerNo,const SdrMarkList& rMark);
};