From 5d06990ec5f71b3c6c462ca55f46ec0a4d2ccd96 Mon Sep 17 00:00:00 2001 From: Rüdiger Timm Date: Tue, 6 Jan 2009 08:40:41 +0000 Subject: CWS-TOOLING: integrate CWS impress147 2008-12-16 15:51:15 +0100 wg r265553 : i96805 2008-12-03 12:32:33 +0100 wg r264766 : 96805 2008-12-03 11:40:11 +0100 wg r264761 : 96805 2008-11-20 15:39:56 +0100 cl r264062 : migrated cws from cvs to svn 2008-11-19 14:16:40 +0100 cl r263992 : CWS-TOOLING: rebase CWS impress147 to trunk@263288 (milestone: DEV300:m35) --- sd/source/ui/animations/CustomAnimation.hrc | 11 +++--- .../ui/animations/CustomAnimationCreateDialog.cxx | 8 +++- .../ui/animations/CustomAnimationCreateDialog.hxx | 4 +- .../ui/animations/CustomAnimationCreateDialog.src | 8 +++- sd/source/ui/func/fupoor.cxx | 7 +++- sd/source/ui/func/fusel.cxx | 43 ++++++++++++---------- 6 files changed, 51 insertions(+), 30 deletions(-) (limited to 'sd/source/ui') diff --git a/sd/source/ui/animations/CustomAnimation.hrc b/sd/source/ui/animations/CustomAnimation.hrc index 3e3381ac1c30..f2858501aea1 100644 --- a/sd/source/ui/animations/CustomAnimation.hrc +++ b/sd/source/ui/animations/CustomAnimation.hrc @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: CustomAnimation.hrc,v $ - * $Revision: 1.5 $ + * $Revision: 1.5.74.1 $ * * This file is part of OpenOffice.org. * @@ -52,10 +52,11 @@ #define RID_TP_CUSTOMANIMATION_EMPHASIS RID_CUSTOMANIMATION_START+5 #define RID_TP_CUSTOMANIMATION_EXIT RID_CUSTOMANIMATION_START+6 #define RID_TP_CUSTOMANIMATION_MOTIONPATH RID_CUSTOMANIMATION_START+7 -#define RID_CUSTOMANIMATION_ROTATION_POPUP RID_CUSTOMANIMATION_START+8 -#define RID_CUSTOMANIMATION_FONTSIZE_POPUP RID_CUSTOMANIMATION_START+9 -#define RID_CUSTOMANIMATION_SCALE_POPUP RID_CUSTOMANIMATION_START+10 -#define RID_CUSTOMANIMATION_FONTSTYLE_POPUP RID_CUSTOMANIMATION_START+11 +#define RID_TP_CUSTOMANIMATION_MISCEFFECTS RID_CUSTOMANIMATION_START+8 +#define RID_CUSTOMANIMATION_ROTATION_POPUP RID_CUSTOMANIMATION_START+9 +#define RID_CUSTOMANIMATION_FONTSIZE_POPUP RID_CUSTOMANIMATION_START+10 +#define RID_CUSTOMANIMATION_SCALE_POPUP RID_CUSTOMANIMATION_START+11 +#define RID_CUSTOMANIMATION_FONTSTYLE_POPUP RID_CUSTOMANIMATION_START+12 #define IMG_CUSTOMANIMATION_ON_CLICK RID_CUSTOMANIMATION_START+0 #define IMG_CUSTOMANIMATION_ON_CLICK_H RID_CUSTOMANIMATION_START+1 diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx index 24b0bf7d2fcb..cdb894984edd 100644 --- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: CustomAnimationCreateDialog.cxx,v $ - * $Revision: 1.14 $ + * $Revision: 1.14.74.1 $ * * This file is part of OpenOffice.org. * @@ -86,6 +86,7 @@ const int ENTRANCE = 0; const int EMPHASIS = 1; const int EXIT = 2; const int MOTIONPATH = 3; +const int MISCEFFECTS = 4; extern void fillDurationComboBox( ComboBox* pBox ); @@ -555,6 +556,9 @@ CustomAnimationCreateDialog::CustomAnimationCreateDialog( Window* pParent, Custo mpTabPages[MOTIONPATH] = new CustomAnimationCreateTabPage( mpTabControl, this, MOTIONPATH, rPresets.getMotionPathsPresets(), bHasText ); mpTabPages[MOTIONPATH]->SetHelpId( HID_SD_CUSTOMANIMATIONDIALOG_MOTIONPATH ); mpTabControl->SetTabPage( RID_TP_CUSTOMANIMATION_MOTIONPATH, mpTabPages[MOTIONPATH] ); + mpTabPages[MISCEFFECTS] = new CustomAnimationCreateTabPage( mpTabControl, this, MISCEFFECTS, rPresets.getMiscPresets(), bHasText ); + mpTabPages[MISCEFFECTS]->SetHelpId( HID_SD_CUSTOMANIMATIONDIALOG_MISCEFFECTS ); + mpTabControl->SetTabPage( RID_TP_CUSTOMANIMATION_MISCEFFECTS, mpTabPages[MISCEFFECTS] ); getCurrentPage()->setDuration( mfDuration ); getCurrentPage()->setIsPreview( mbIsPreview ); @@ -589,6 +593,7 @@ CustomAnimationCreateDialog::~CustomAnimationCreateDialog() delete mpTabPages[EMPHASIS]; delete mpTabPages[EXIT]; delete mpTabPages[MOTIONPATH]; + delete mpTabPages[MISCEFFECTS]; delete mpTabControl; delete mpOKButton; @@ -603,6 +608,7 @@ CustomAnimationCreateTabPage* CustomAnimationCreateDialog::getCurrentPage() cons case RID_TP_CUSTOMANIMATION_ENTRANCE: return mpTabPages[ENTRANCE]; case RID_TP_CUSTOMANIMATION_EMPHASIS: return mpTabPages[EMPHASIS]; case RID_TP_CUSTOMANIMATION_EXIT: return mpTabPages[EXIT]; + case RID_TP_CUSTOMANIMATION_MISCEFFECTS:return mpTabPages[MISCEFFECTS]; //case RID_TP_CUSTOMANIMATION_MOTIONPATH: default: return mpTabPages[MOTIONPATH]; diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.hxx b/sd/source/ui/animations/CustomAnimationCreateDialog.hxx index 0cd7dd8b380b..9fcb4107a0fe 100644 --- a/sd/source/ui/animations/CustomAnimationCreateDialog.hxx +++ b/sd/source/ui/animations/CustomAnimationCreateDialog.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: CustomAnimationCreateDialog.hxx,v $ - * $Revision: 1.9 $ + * $Revision: 1.9.74.1 $ * * This file is part of OpenOffice.org. * @@ -80,7 +80,7 @@ private: CancelButton* mpCancelButton; HelpButton* mpHelpButton; - CustomAnimationCreateTabPage* mpTabPages[4]; + CustomAnimationCreateTabPage* mpTabPages[5]; }; } diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.src b/sd/source/ui/animations/CustomAnimationCreateDialog.src index 48347ffff36c..294466189fc7 100644 --- a/sd/source/ui/animations/CustomAnimationCreateDialog.src +++ b/sd/source/ui/animations/CustomAnimationCreateDialog.src @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: CustomAnimationCreateDialog.src,v $ - * $Revision: 1.8 $ + * $Revision: 1.8.74.1 $ * * This file is part of OpenOffice.org. * @@ -71,6 +71,12 @@ TabDialog DLG_CUSTOMANIMATION_CREATE Identifier = RID_TP_CUSTOMANIMATION_MOTIONPATH; Text [ en-US ] = "Motion Paths"; }; + + PageItem + { + Identifier = RID_TP_CUSTOMANIMATION_MISCEFFECTS; + Text [ en-US ] = "Misc Effects"; + }; }; }; OKButton 1 diff --git a/sd/source/ui/func/fupoor.cxx b/sd/source/ui/func/fupoor.cxx index cfbcfd628eb3..3a9cb6c0714e 100644 --- a/sd/source/ui/func/fupoor.cxx +++ b/sd/source/ui/func/fupoor.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: fupoor.cxx,v $ - * $Revision: 1.50 $ + * $Revision: 1.50.74.1 $ * * This file is part of OpenOffice.org. * @@ -753,6 +753,11 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) nX *= aLogicSizeOnePixel.Width(); nY *= aLogicSizeOnePixel.Height(); } + else if(rKEvt.GetKeyCode().IsShift()) + { + nX *= 1000; + nY *= 1000; + } else { // old, fixed move distance diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx index 3f3817567ec4..cab26dee337e 100644 --- a/sd/source/ui/func/fusel.cxx +++ b/sd/source/ui/func/fusel.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: fusel.cxx,v $ - * $Revision: 1.55 $ + * $Revision: 1.55.74.1 $ * * This file is part of OpenOffice.org. * @@ -413,26 +413,29 @@ BOOL FuSelection::MouseButtonDown(const MouseEvent& rMEvt) } } - if ( !bReadOnly && - bMarked && - (!rMEvt.IsShift() || mpView->IsMarkedHit(aMDPos, nHitLog))) + if( !bDeactivateOLE ) { - /********************************************************** - * Objekt verschieben - **********************************************************/ - aDragTimer.Start(); - - pHdl=mpView->PickHandle(aMDPos); - if ( ! rMEvt.IsRight()) - mpView->BegDragObj(aMDPos, (OutputDevice*) NULL, pHdl, nDrgLog); - } - else - { - /********************************************************** - * Objekt selektieren - **********************************************************/ - if ( ! rMEvt.IsRight()) - mpView->BegMarkObj(aMDPos); + if ( !bReadOnly && + bMarked && + (!rMEvt.IsShift() || mpView->IsMarkedHit(aMDPos, nHitLog))) + { + /********************************************************** + * Objekt verschieben + **********************************************************/ + aDragTimer.Start(); + + pHdl=mpView->PickHandle(aMDPos); + if ( ! rMEvt.IsRight()) + mpView->BegDragObj(aMDPos, (OutputDevice*) NULL, pHdl, nDrgLog); + } + else + { + /********************************************************** + * Objekt selektieren + **********************************************************/ + if ( ! rMEvt.IsRight()) + mpView->BegMarkObj(aMDPos); + } } } } -- cgit v1.2.3