diff options
author | RĂ¼diger Timm <rt@openoffice.org> | 2009-01-06 08:40:41 +0000 |
---|---|---|
committer | RĂ¼diger Timm <rt@openoffice.org> | 2009-01-06 08:40:41 +0000 |
commit | 5d06990ec5f71b3c6c462ca55f46ec0a4d2ccd96 (patch) | |
tree | ff4ef820dd70bca6de20f2dc2e6b28538a0136f1 /sd | |
parent | 4774bcff020f1b9bf79141f6d7fb630fa2b724cd (diff) |
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)
Diffstat (limited to 'sd')
-rw-r--r-- | sd/inc/CustomAnimationPreset.hxx | 4 | ||||
-rw-r--r-- | sd/inc/helpids.h | 49 | ||||
-rw-r--r-- | sd/source/core/CustomAnimationEffect.cxx | 11 | ||||
-rw-r--r-- | sd/source/core/CustomAnimationPreset.cxx | 5 | ||||
-rw-r--r-- | sd/source/ui/animations/CustomAnimation.hrc | 11 | ||||
-rw-r--r-- | sd/source/ui/animations/CustomAnimationCreateDialog.cxx | 8 | ||||
-rw-r--r-- | sd/source/ui/animations/CustomAnimationCreateDialog.hxx | 4 | ||||
-rw-r--r-- | sd/source/ui/animations/CustomAnimationCreateDialog.src | 8 | ||||
-rw-r--r-- | sd/source/ui/func/fupoor.cxx | 7 | ||||
-rw-r--r-- | sd/source/ui/func/fusel.cxx | 43 | ||||
-rw-r--r-- | sd/xml/effects.xml | 21 |
11 files changed, 113 insertions, 58 deletions
diff --git a/sd/inc/CustomAnimationPreset.hxx b/sd/inc/CustomAnimationPreset.hxx index eba302409098..77b7352056b0 100644 --- a/sd/inc/CustomAnimationPreset.hxx +++ b/sd/inc/CustomAnimationPreset.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: CustomAnimationPreset.hxx,v $ - * $Revision: 1.6 $ + * $Revision: 1.6.72.1 $ * * This file is part of OpenOffice.org. * @@ -123,6 +123,7 @@ public: const PresetCategoryList& getEmphasisPresets() const { return maEmphasisPresets; } const PresetCategoryList& getExitPresets() const { return maExitPresets; } const PresetCategoryList& getMotionPathsPresets() const { return maMotionPathsPresets; } + const PresetCategoryList& getMiscPresets() const { return maMiscPresets; } void changePresetSubType( CustomAnimationEffectPtr pEffect, const rtl::OUString& rPresetSubType ) const; @@ -144,6 +145,7 @@ private: PresetCategoryList maEmphasisPresets; PresetCategoryList maExitPresets; PresetCategoryList maMotionPathsPresets; + PresetCategoryList maMiscPresets; static CustomAnimationPresets* mpCustomAnimationPresets; }; diff --git a/sd/inc/helpids.h b/sd/inc/helpids.h index c0a3e1e4b2f1..69a3c6fe901d 100644 --- a/sd/inc/helpids.h +++ b/sd/inc/helpids.h @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: helpids.h,v $ - * $Revision: 1.20 $ + * $Revision: 1.20.74.1 $ * * This file is part of OpenOffice.org. * @@ -256,26 +256,27 @@ #define HID_SD_CUSTOMANIMATIONDIALOG_EMPHASIS (HID_SD_START + 179) #define HID_SD_CUSTOMANIMATIONDIALOG_EXIT (HID_SD_START + 180) #define HID_SD_CUSTOMANIMATIONDIALOG_MOTIONPATH (HID_SD_START + 181) - -#define HID_SD_CUSTOMANIMATIONPANE_PRESETPROPERTYBOX (HID_SD_START + 182) -#define HID_SD_CUSTOMANIMATIONPANE_COLORPROPERTYBOX (HID_SD_START + 183) -#define HID_SD_CUSTOMANIMATIONPANE_FONTPROPERTYBOX (HID_SD_START + 184) -#define HID_SD_CUSTOMANIMATIONPANE_CHARHEIGHTPROPERTYBOX (HID_SD_START + 185) -#define HID_SD_CUSTOMANIMATIONPANE_ROTATIONPROPERTYBOX (HID_SD_START + 186) -#define HID_SD_CUSTOMANIMATIONPANE_TRANSPARENCYPROPERTYBOX (HID_SD_START + 187) -#define HID_SD_CUSTOMANIMATIONPANE_SCALEPROPERTYBOX (HID_SD_START + 188) -#define HID_SD_CUSTOMANIMATIONPANE_FONTSTYLEPROPERTYBOX (HID_SD_START + 189) - -#define HID_SD_SLIDESHOW_DISPLAY (HID_SD_START + 190) - -#define HID_SD_RULER_HORIZONTAL (HID_SD_START + 191) -#define HID_SD_RULER_VERTICAL (HID_SD_START + 192) - -#define HID_SD_CELL_STYLE_DEFAULT (HID_SD_START + 193) -#define HID_SD_CELL_STYLE_BANDED (HID_SD_START + 194) -#define HID_SD_CELL_STYLE_HEADER (HID_SD_START + 195) -#define HID_SD_CELL_STYLE_TOTAL (HID_SD_START + 196) -#define HID_SD_CELL_STYLE_FIRST_COLUMN (HID_SD_START + 197) -#define HID_SD_CELL_STYLE_LAST_COLUMN (HID_SD_START + 198) - -#define HID_SD_TABLE_DESIGN (HID_SD_START + 199) +#define HID_SD_CUSTOMANIMATIONDIALOG_MISCEFFECTS (HID_SD_START + 182) + +#define HID_SD_CUSTOMANIMATIONPANE_PRESETPROPERTYBOX (HID_SD_START + 183) +#define HID_SD_CUSTOMANIMATIONPANE_COLORPROPERTYBOX (HID_SD_START + 184) +#define HID_SD_CUSTOMANIMATIONPANE_FONTPROPERTYBOX (HID_SD_START + 185) +#define HID_SD_CUSTOMANIMATIONPANE_CHARHEIGHTPROPERTYBOX (HID_SD_START + 186) +#define HID_SD_CUSTOMANIMATIONPANE_ROTATIONPROPERTYBOX (HID_SD_START + 187) +#define HID_SD_CUSTOMANIMATIONPANE_TRANSPARENCYPROPERTYBOX (HID_SD_START + 188) +#define HID_SD_CUSTOMANIMATIONPANE_SCALEPROPERTYBOX (HID_SD_START + 189) +#define HID_SD_CUSTOMANIMATIONPANE_FONTSTYLEPROPERTYBOX (HID_SD_START + 190) + +#define HID_SD_SLIDESHOW_DISPLAY (HID_SD_START + 191) + +#define HID_SD_RULER_HORIZONTAL (HID_SD_START + 192) +#define HID_SD_RULER_VERTICAL (HID_SD_START + 193) + +#define HID_SD_CELL_STYLE_DEFAULT (HID_SD_START + 194) +#define HID_SD_CELL_STYLE_BANDED (HID_SD_START + 195) +#define HID_SD_CELL_STYLE_HEADER (HID_SD_START + 196) +#define HID_SD_CELL_STYLE_TOTAL (HID_SD_START + 197) +#define HID_SD_CELL_STYLE_FIRST_COLUMN (HID_SD_START + 198) +#define HID_SD_CELL_STYLE_LAST_COLUMN (HID_SD_START + 199) + +#define HID_SD_TABLE_DESIGN (HID_SD_START + 200) diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx index 0b09b346aaeb..23a04bf9d5ee 100644 --- a/sd/source/core/CustomAnimationEffect.cxx +++ b/sd/source/core/CustomAnimationEffect.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: CustomAnimationEffect.cxx,v $ - * $Revision: 1.17 $ + * $Revision: 1.17.74.1 $ * * This file is part of OpenOffice.org. * @@ -691,9 +691,16 @@ void CustomAnimationEffect::setTarget( const ::com::sun::star::uno::Any& rTarget { while( xEnumeration->hasMoreElements() ) { - Reference< XAnimate > xAnimate( xEnumeration->nextElement(), UNO_QUERY ); + const Any aElem( xEnumeration->nextElement() ); + Reference< XAnimate > xAnimate( aElem, UNO_QUERY ); if( xAnimate.is() ) xAnimate->setTarget( rTarget ); + else + { + Reference< XCommand > xCommand( aElem, UNO_QUERY ); + if( xCommand.is() ) + xCommand->setTarget( rTarget ); + } } } } diff --git a/sd/source/core/CustomAnimationPreset.cxx b/sd/source/core/CustomAnimationPreset.cxx index 10f6e981165a..cf5d94c420ce 100644 --- a/sd/source/core/CustomAnimationPreset.cxx +++ b/sd/source/core/CustomAnimationPreset.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: CustomAnimationPreset.cxx,v $ - * $Revision: 1.7 $ + * $Revision: 1.7.74.1 $ * * This file is part of OpenOffice.org. * @@ -469,6 +469,9 @@ void CustomAnimationPresets::importResources() const OUString aMotionPathsPath( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.UI.Effects/Presets/MotionPaths" ) ); importPresets( xConfigProvider, aMotionPathsPath, maMotionPathsPresets ); + + const OUString aMiscPath( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.UI.Effects/Presets/Misc" ) ); + importPresets( xConfigProvider, aMiscPath, maMiscPresets ); } catch( lang::WrappedTargetException& e ) { 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); + } } } } diff --git a/sd/xml/effects.xml b/sd/xml/effects.xml index c6e5e9a83174..be341ef5e229 100644 --- a/sd/xml/effects.xml +++ b/sd/xml/effects.xml @@ -2606,4 +2606,25 @@ </anim:par> </anim:par> </anim:par> + <anim:par smil:begin="indefinite" smil:fill="hold"> + <anim:par smil:begin="0" smil:fill="hold"> + <anim:par smil:begin="0" smil:fill="hold" pres:node-type="on-click" pres:preset-class="entrance" pres:preset-id="ooo-media-start"> + <anim:command smil:begin="0" smil:dur="0.001" smil:fill="hold" anim:command="play"/> + </anim:par> + </anim:par> + </anim:par> + <anim:par smil:begin="indefinite" smil:fill="hold"> + <anim:par smil:begin="0" smil:fill="hold"> + <anim:par smil:begin="0" smil:fill="hold" pres:node-type="on-click" pres:preset-class="entrance" pres:preset-id="ooo-media-stop"> + <anim:command smil:begin="0" smil:dur="0.001" smil:fill="hold" anim:command="stop"/> + </anim:par> + </anim:par> + </anim:par> + <anim:par smil:begin="indefinite" smil:fill="hold"> + <anim:par smil:begin="0" smil:fill="hold"> + <anim:par smil:begin="0" smil:fill="hold" pres:node-type="on-click" pres:preset-class="entrance" pres:preset-id="ooo-media-toggle-pause"> + <anim:command smil:begin="0" smil:dur="0.001" smil:fill="hold" anim:command="toggle-pause"/> + </anim:par> + </anim:par> + </anim:par> </anim:seq> |