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/func/fuline.cxx | |
| parent | 064f1e4ed53cb16d174534e20a7d02b8c93a4948 (diff) | |
| parent | f2aeec8f22f37146c2f9120e8d0ead383049c1fa (diff) | |
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
Diffstat (limited to 'sd/source/ui/func/fuline.cxx')
| -rwxr-xr-x[-rw-r--r--] | sd/source/ui/func/fuline.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sd/source/ui/func/fuline.cxx b/sd/source/ui/func/fuline.cxx index e8191a9ee5d3..ea611035074d 100644..100755 --- a/sd/source/ui/func/fuline.cxx +++ b/sd/source/ui/func/fuline.cxx @@ -79,7 +79,7 @@ FunctionReference FuLine::Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd:: void FuLine::DoExecute( SfxRequest& rReq ) { - BOOL bHasMarked = mpView->AreObjectsMarked(); + sal_Bool bHasMarked = mpView->AreObjectsMarked(); const SfxItemSet* pArgs = rReq.GetArgs(); @@ -101,7 +101,7 @@ void FuLine::DoExecute( SfxRequest& rReq ) } // Attribute wurden geaendert, Listboxes in Objectbars muessen aktualisiert werden - static USHORT SidArray[] = { + static sal_uInt16 SidArray[] = { SID_ATTR_LINE_STYLE, SID_ATTR_LINE_DASH, SID_ATTR_LINE_WIDTH, |