diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-10-12 12:12:45 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-10-12 12:12:45 +0000 |
| commit | 37e256ee917f1de93c4d7b605473065a9641bcf8 (patch) | |
| tree | b7a6dd733ac4737d74519a7f9823360a72e77c62 /sd/source/ui/view | |
| parent | 71e5c7feead9c7b0d2de68eddf5da3d5b985e260 (diff) | |
INTEGRATION: CWS sj09 (1.8.6); FILE MERGED
2004/10/11 17:03:41 sj 1.8.6.8: RESYNC: (1.13-1.14); FILE MERGED
2004/08/25 12:41:54 sj 1.8.6.7: RESYNC: (1.8-1.13); FILE MERGED
2004/07/30 17:46:25 sj 1.8.6.6: added fontwork character spacing dialog
2004/07/30 13:42:13 sj 1.8.6.5: added fontwork character spacing dialog
2004/07/27 19:37:39 sj 1.8.6.4: added fontwork floater
2004/07/19 18:39:45 sj 1.8.6.3: moved some slots from FuTemporary into FuPermanent
2004/07/09 13:27:27 sj 1.8.6.2: added fontwork bar
2004/05/12 09:03:27 sj 1.8.6.1: initial implementation for CustomShape UI
Diffstat (limited to 'sd/source/ui/view')
| -rw-r--r-- | sd/source/ui/view/drviews6.cxx | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/sd/source/ui/view/drviews6.cxx b/sd/source/ui/view/drviews6.cxx index 4a0e69dd01ef..c44fbbed91fb 100644 --- a/sd/source/ui/view/drviews6.cxx +++ b/sd/source/ui/view/drviews6.cxx @@ -2,9 +2,9 @@ * * $RCSfile: drviews6.cxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: rt $ $Date: 2004-09-17 13:49:20 $ + * last change: $Author: hr $ $Date: 2004-10-12 13:12:45 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -113,6 +113,9 @@ #ifndef _SVX_FONTWORK_BAR_HXX #include <svx/fontworkbar.hxx> #endif +#ifndef _SVX_TBXCUSTOMSHAPES_HXX +#include <svx/tbxcustomshapes.hxx> +#endif #ifndef _AVMEDIA_MEDIAPLAYER_HXX #include <avmedia/mediaplayer.hxx> #endif @@ -688,14 +691,17 @@ void DrawViewShell::FuTemp04(SfxRequest& rReq) break; case SID_FONTWORK_SHAPE: + case SID_FONTWORK_SHAPE_TYPE: + case SID_FONTWORK_SHAPE_TYPES: case SID_FONTWORK_ALIGNMENT: + case SID_FONTWORK_SAME_LETTER_HEIGHTS: case SID_FONTWORK_CHARACTER_SPACING: case SID_FONTWORK_KERN_CHARACTER_PAIRS: case SID_FONTWORK_GALLERY_FLOATER: - case SID_FONTWORK_SHAPE_FLOATER: case SID_FONTWORK_CHARACTER_SPACING_FLOATER: case SID_FONTWORK_ALIGNMENT_FLOATER: - svx::FontworkBar::execute( pDrView, rReq ); + case SID_FONTWORK_CHARACTER_SPACING_DIALOG: + svx::FontworkBar::execute( pDrView, rReq, GetViewFrame()->GetBindings() ); Cancel(); rReq.Ignore (); break; |