diff options
Diffstat (limited to 'sd/source')
-rw-r--r-- | sd/source/ui/dlg/tpaction.cxx | 130 | ||||
-rw-r--r-- | sd/source/ui/dlg/tpaction.src | 61 | ||||
-rw-r--r-- | sd/source/ui/func/fuoaprms.cxx | 38 | ||||
-rw-r--r-- | sd/source/ui/func/unoaprms.cxx | 7 | ||||
-rw-r--r-- | sd/source/ui/inc/tpaction.hrc | 6 | ||||
-rw-r--r-- | sd/source/ui/inc/tpaction.hxx | 7 | ||||
-rw-r--r-- | sd/source/ui/view/drviewsi.cxx | 39 | ||||
-rw-r--r-- | sd/source/ui/view/sdview2.cxx | 5 |
8 files changed, 25 insertions, 268 deletions
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx index d4200ef419d1..08712d90f1b0 100644 --- a/sd/source/ui/dlg/tpaction.cxx +++ b/sd/source/ui/dlg/tpaction.cxx @@ -2,9 +2,9 @@ * * $RCSfile: tpaction.cxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: ka $ $Date: 2001-10-22 13:36:42 $ + * last change: $Author: ka $ $Date: 2001-10-23 11:54:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -222,8 +222,6 @@ SdTPAction::SdTPAction( Window* pWindow, const SfxItemSet& rInAttrs ) : aRbtSlow ( this, SdResId( RBT_SLOW ) ), aRbtMedium ( this, SdResId( RBT_MEDIUM ) ), aRbtFast ( this, SdResId( RBT_FAST ) ), - aFtTranspColor ( this, SdResId( FT_TRANSPCOLOR ) ), - aLbTranspColor ( this, SdResId( LB_TRANSPCOLOR ) ), aTsbSound ( this, SdResId( TSB_SOUND ) ), aEdtSound ( this, SdResId( EDT_SOUND ) ), aBtnSearch ( this, SdResId( BTN_SEARCH ) ), @@ -291,65 +289,6 @@ void SdTPAction::SetView( const SdView* pSdView ) SvxColorTableItem aItem( *(const SvxColorTableItem*)( pDocSh->GetItem( SID_COLOR_TABLE ) ) ); pColTab = aItem.GetColorTable(); DBG_ASSERT( pColTab, "Keine Farbtabelle vorhanden!" ); - FillColorLB(); -} - -//------------------------------------------------------------------------ - -void SdTPAction::FillColorLB() -{ - Color aColorArray[16]; - BOOL aBoolArray[16]; - long aEntryArray[16]; - - for( int i = 0; i < 16; i++ ) - aBoolArray[ i ] = FALSE; - - aColorArray[ 0 ] = Color( COL_BLACK ); - aColorArray[ 1 ] = Color( COL_BLUE ); - aColorArray[ 2 ] = Color( COL_GREEN ); - aColorArray[ 3 ] = Color( COL_CYAN ); - aColorArray[ 4 ] = Color( COL_RED ); - aColorArray[ 5 ] = Color( COL_MAGENTA ); - aColorArray[ 6 ] = Color( COL_BROWN ); - aColorArray[ 7 ] = Color( COL_GRAY ); - aColorArray[ 8 ] = Color( COL_LIGHTGRAY ); - aColorArray[ 9 ] = Color( COL_LIGHTBLUE ); - aColorArray[ 10 ] = Color( COL_LIGHTGREEN ); - aColorArray[ 11 ] = Color( COL_LIGHTCYAN ); - aColorArray[ 12 ] = Color( COL_LIGHTRED ); - aColorArray[ 13 ] = Color( COL_LIGHTMAGENTA ); - aColorArray[ 14 ] = Color( COL_YELLOW ); - aColorArray[ 15 ] = Color( COL_WHITE ); - - for( long j = 0, nCount = pColTab->Count(); j < nCount; j++ ) - { - XColorEntry* pEntry = pColTab->Get( j ); - Color& rColor = pEntry->GetColor(); - for( int k = 0; k <= 15; k++ ) - { - if( !aBoolArray[ k ] ) - { - if( rColor.IsRGBEqual( aColorArray[ k ] ) ) - { - aBoolArray[ k ] = TRUE; - aEntryArray[ k ] = j; - } - } - } - // Abbruch, wenn alle Bools TRUE sind - } - - for( i = 0; i < 16; i++ ) - { - if( aBoolArray[ i ] ) - { - XColorEntry* pEntry = pColTab->Get( aEntryArray[ i ] ); - aLbTranspColor.InsertEntry( pEntry->GetColor(), pEntry->GetName() ); - } - else - aLbTranspColor.InsertEntry( aColorArray[ i ], String() ); - } } // ----------------------------------------------------------------------- @@ -626,16 +565,6 @@ BOOL SdTPAction::FillItemSet( SfxItemSet& rAttrs ) bModified = TRUE; } } - - // Transparenzfarbe - if( aLbTranspColor.GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND && - aLbTranspColor.GetSavedValue() != aLbTranspColor.GetSelectEntryPos() ) - { - SvxColorItem aColorItem( aLbTranspColor.GetSelectEntryColor(), - ATTR_ANIMATION_TRANSPCOLOR ); - rAttrs.Put( aColorItem ); - } - } return( bModified ); @@ -724,14 +653,6 @@ void SdTPAction::Reset( const SfxItemSet& rAttrs ) else aTsbPlayFull.SetState( STATE_DONTKNOW ); - // Transparenzfarbe - const SfxPoolItem* pPoolItem; - if( SFX_ITEM_DONTCARE != rAttrs.GetItemState( ATTR_ANIMATION_TRANSPCOLOR, FALSE, &pPoolItem ) ) - { - Color aColor = ( ( const SvxColorItem* ) pPoolItem )->GetValue(); - aLbTranspColor.SelectEntry( aColor ); - } - switch( eCA ) { case presentation::ClickAction_VANISH: @@ -765,7 +686,6 @@ void SdTPAction::Reset( const SfxItemSet& rAttrs ) aRbtMedium.SaveValue(); aRbtFast.SaveValue(); aEdtSound.SaveValue(); - aLbTranspColor.SaveValue(); aTsbSound.SaveValue(); aTsbPlayFull.SaveValue(); } @@ -774,27 +694,12 @@ void SdTPAction::Reset( const SfxItemSet& rAttrs ) void SdTPAction::ActivatePage( const SfxItemSet& rSet ) { - const SvxColorItem* pColorItem; - if( SFX_ITEM_SET == rSet.GetItemState( ATTR_ANIMATION_TRANSPCOLOR, FALSE, - (const SfxPoolItem**) &pColorItem ) ) - { - Color aColor = pColorItem->GetValue(); - aLbTranspColor.SelectEntry( aColor ); - } } // ----------------------------------------------------------------------- int SdTPAction::DeactivatePage( SfxItemSet* pSet ) { - if( pSet && - GetActualClickAction() == presentation::ClickAction_VANISH ) - { - SvxColorItem aColorItem( aLbTranspColor.GetSelectEntryColor(), - ATTR_ANIMATION_TRANSPCOLOR ); - pSet->Put( aColorItem ); - } - if( pSet ) FillItemSet( *pSet ); @@ -969,25 +874,6 @@ IMPL_LINK( SdTPAction, ChangeEffectHdl, void *, EMPTYARG ) } } - // Interaktions-TP - if( nPos == presentation::AnimationEffect_MOVE_TO_LEFT || - nPos == presentation::AnimationEffect_MOVE_TO_UPPERLEFT || - nPos == presentation::AnimationEffect_MOVE_TO_TOP || - nPos == presentation::AnimationEffect_MOVE_TO_UPPERRIGHT || - nPos == presentation::AnimationEffect_MOVE_TO_RIGHT || - nPos == presentation::AnimationEffect_MOVE_TO_LOWERRIGHT || - nPos == presentation::AnimationEffect_MOVE_TO_BOTTOM || - nPos == presentation::AnimationEffect_MOVE_TO_LOWERLEFT ) - { - aFtTranspColor.Enable(); - aLbTranspColor.Enable(); - } - else - { - aFtTranspColor.Disable(); - aLbTranspColor.Disable(); - } - return( 0L ); } @@ -1048,8 +934,6 @@ IMPL_LINK( SdTPAction, ClickActionHdl, void *, EMPTYARG ) aRbtSlow.Hide(); aRbtMedium.Hide(); aRbtFast.Hide(); - aFtTranspColor.Hide(); - aLbTranspColor.Hide(); aTsbPlayFull.Hide(); aTsbSound.Hide(); @@ -1078,8 +962,6 @@ IMPL_LINK( SdTPAction, ClickActionHdl, void *, EMPTYARG ) aRbtSlow.Hide(); aRbtMedium.Hide(); aRbtFast.Hide(); - aFtTranspColor.Hide(); - aLbTranspColor.Hide(); aTsbPlayFull.Hide(); aTsbSound.Hide(); @@ -1116,8 +998,6 @@ IMPL_LINK( SdTPAction, ClickActionHdl, void *, EMPTYARG ) aRbtSlow.Hide(); aRbtMedium.Hide(); aRbtFast.Hide(); - aFtTranspColor.Hide(); - aLbTranspColor.Hide(); aTsbPlayFull.Hide(); aEdtSound.Hide(); aTsbSound.Hide(); @@ -1139,8 +1019,6 @@ IMPL_LINK( SdTPAction, ClickActionHdl, void *, EMPTYARG ) aRbtSlow.Hide(); aRbtMedium.Hide(); aRbtFast.Hide(); - aFtTranspColor.Hide(); - aLbTranspColor.Hide(); aTsbPlayFull.Hide(); aEdtSound.Hide(); aTsbSound.Hide(); @@ -1165,8 +1043,6 @@ IMPL_LINK( SdTPAction, ClickActionHdl, void *, EMPTYARG ) aRbtSlow.Hide(); aRbtMedium.Hide(); aRbtFast.Hide(); - aFtTranspColor.Hide(); - aLbTranspColor.Hide(); aTsbPlayFull.Hide(); aEdtSound.Hide(); aTsbSound.Hide(); @@ -1275,8 +1151,6 @@ IMPL_LINK( SdTPAction, ClickActionHdl, void *, EMPTYARG ) aRbtSlow.Show(); aRbtMedium.Show(); aRbtFast.Show(); - aFtTranspColor.Show(); - aLbTranspColor.Show(); aTsbPlayFull.Show(); aEdtSound.Show(); aTsbSound.Show(); diff --git a/sd/source/ui/dlg/tpaction.src b/sd/source/ui/dlg/tpaction.src index e5abfca50caa..f569c95a6079 100644 --- a/sd/source/ui/dlg/tpaction.src +++ b/sd/source/ui/dlg/tpaction.src @@ -2,9 +2,9 @@ * * $RCSfile: tpaction.src,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: kz $ $Date: 2001-07-14 20:28:21 $ + * last change: $Author: ka $ $Date: 2001-10-23 11:54:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -308,48 +308,9 @@ TabPage TP_ANIMATION Text[ catalan ] = "~Rpida"; }; #define MA_Y3 (MA_Y2 + 3*(RSC_CD_RADIOBUTTON_HEIGHT + RSC_SP_CTRL_GROUP_Y)) - FixedText FT_TRANSPCOLOR - { - Pos = MAP_APPFONT ( RSC_SP_DLG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT , MA_Y3 + 1) ; - Size = MAP_APPFONT ( 86 , 10 ) ; - Text = "Unsichtbare ~Farbe" ; - Text [ ENGLISH ] = "Invisible ~color" ; - Hide = TRUE ; - Text [ dutch ] = "~Onzichtbare kleur" ; - Text [ english_us ] = "Invisible Color" ; - Text [ italian ] = "Colore invisibile" ; - Text [ spanish ] = "~Color transparente" ; - Text [ french ] = "Couleur invisible" ; - Text [ swedish ] = "Osynlig ~frg" ; - Text [ danish ] = "Usynlig farve" ; - Text [ portuguese ] = "~Cor invisvel" ; - Text [ portuguese_brazilian ] = "Unsichtbare ~Farbe" ; - Text[ chinese_simplified ] = "ɫ"; - Text[ russian ] = ""; - Text[ polish ] = "Niewidoczny kolor"; - Text[ japanese ] = "F"; - Text[ chinese_traditional ] = "z"; - Text[ arabic ] = " "; - Text[ greek ] = " "; - Text[ korean ] = " ʴ "; - Text[ turkish ] = "Grnmez renk"; - Text[ language_user1 ] = " "; - Text[ catalan ] = "~Color transparente"; - Text[ finnish ] = "Lpinkyv"; - }; - ListBox LB_TRANSPCOLOR - { - Border = TRUE ; - Pos = MAP_APPFONT ( MA_ACTIONLB_LEFT , MA_Y3 ) ; - Size = MAP_APPFONT ( 82 , 63 ) ; - TabStop = TRUE ; - DropDown = TRUE ; - Hide = TRUE ; - }; -#define MA_Y4 (MA_Y3 + RSC_CD_DROPDOWN_HEIGHT + RSC_SP_CTRL_GROUP_Y) TriStateBox TSB_SOUND { - Pos = MAP_APPFONT ( RSC_SP_DLG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT , MA_Y4 ) ; + Pos = MAP_APPFONT ( RSC_SP_DLG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT , MA_Y3 ) ; Size = MAP_APPFONT ( 247 - 65 - (RSC_SP_DLG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT + RSC_SP_CHK_TEXTINDENT) , 10 ) ; TabStop = TRUE ; Hide = TRUE ; @@ -379,7 +340,7 @@ TabPage TP_ANIMATION Edit EDT_SOUND { Border = TRUE ; - Pos = MAP_APPFONT ( RSC_SP_DLG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT + RSC_SP_CHK_TEXTINDENT , MA_Y4 + RSC_CD_CHECKBOX_HEIGHT + 1 ) ; + Pos = MAP_APPFONT ( RSC_SP_DLG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT + RSC_SP_CHK_TEXTINDENT , MA_Y3 + RSC_CD_CHECKBOX_HEIGHT + 1 ) ; Size = MAP_APPFONT ( 247 - 65 - 10 - (RSC_SP_DLG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT + RSC_SP_CHK_TEXTINDENT) , 12 ) ; TabStop = TRUE ; Hide = TRUE ; @@ -388,7 +349,7 @@ TabPage TP_ANIMATION // schiedlich heissen, da sie eben auch eine unterschiedliche Bedeutung haben PushButton BTN_SEARCH { - Pos = MAP_APPFONT ( 247 - 65, MA_Y4 + RSC_CD_CHECKBOX_HEIGHT ) ; + Pos = MAP_APPFONT ( 247 - 65, MA_Y3 + RSC_CD_CHECKBOX_HEIGHT ) ; Size = MAP_APPFONT ( 65 , 14 ) ; TabStop = TRUE ; Hide = TRUE ; @@ -418,7 +379,7 @@ TabPage TP_ANIMATION }; TriStateBox TSB_PLAY_FULL { - Pos = MAP_APPFONT ( RSC_SP_DLG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT , MA_Y4 + RSC_CD_CHECKBOX_HEIGHT + RSC_CD_PUSHBUTTON_HEIGHT + RSC_SP_CTRL_GROUP_Y ) ; + Pos = MAP_APPFONT ( RSC_SP_DLG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT , MA_Y3 + RSC_CD_CHECKBOX_HEIGHT + RSC_CD_PUSHBUTTON_HEIGHT + RSC_SP_CTRL_GROUP_Y ) ; Size = MAP_APPFONT ( 219 , 10 ) ; Text = "Klang ~vollstndig abspielen" ; Text [ ENGLISH ] = "Play sound full" ; @@ -490,7 +451,7 @@ TabPage TP_ANIMATION Edit EDT_BOOKMARK { Border = TRUE ; - Pos = MAP_APPFONT ( RSC_SP_DLG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT , MA_Y4 + RSC_CD_CHECKBOX_HEIGHT + 1 ) ; + Pos = MAP_APPFONT ( RSC_SP_DLG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT , MA_Y3 + RSC_CD_CHECKBOX_HEIGHT + 1 ) ; Size = MAP_APPFONT ( 247 - 65 - 10 - (RSC_SP_DLG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT) , 12 ) ; TabStop = TRUE ; Hide = TRUE ; @@ -498,7 +459,7 @@ TabPage TP_ANIMATION Edit EDT_DOCUMENT { Border = TRUE ; - Pos = MAP_APPFONT ( RSC_SP_DLG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT , MA_Y4 + RSC_CD_CHECKBOX_HEIGHT + 1 ) ; + Pos = MAP_APPFONT ( RSC_SP_DLG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT , MA_Y3 + RSC_CD_CHECKBOX_HEIGHT + 1 ) ; Size = MAP_APPFONT ( 247 - 65 - 10 - (RSC_SP_DLG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT) , 12 ) ; TabStop = TRUE ; Hide = TRUE ; @@ -506,7 +467,7 @@ TabPage TP_ANIMATION Edit EDT_PROGRAM { Border = TRUE ; - Pos = MAP_APPFONT ( RSC_SP_DLG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT , MA_Y4 + RSC_CD_CHECKBOX_HEIGHT + 1 ) ; + Pos = MAP_APPFONT ( RSC_SP_DLG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT , MA_Y3 + RSC_CD_CHECKBOX_HEIGHT + 1 ) ; Size = MAP_APPFONT ( 247 - 65 - 10 - (RSC_SP_DLG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT) , 12 ) ; TabStop = TRUE ; Hide = TRUE ; @@ -514,14 +475,14 @@ TabPage TP_ANIMATION Edit EDT_MACRO { Border = TRUE ; - Pos = MAP_APPFONT ( RSC_SP_DLG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT , MA_Y4 + RSC_CD_CHECKBOX_HEIGHT + 1 ) ; + Pos = MAP_APPFONT ( RSC_SP_DLG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT , MA_Y3 + RSC_CD_CHECKBOX_HEIGHT + 1 ) ; Size = MAP_APPFONT ( 247 - 65 - 10 - (RSC_SP_DLG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT) , 12 ) ; TabStop = TRUE ; Hide = TRUE ; }; PushButton BTN_SEEK { - Pos = MAP_APPFONT ( 247 - 65, MA_Y4 + RSC_CD_CHECKBOX_HEIGHT ) ; + Pos = MAP_APPFONT ( 247 - 65, MA_Y3 + RSC_CD_CHECKBOX_HEIGHT ) ; Size = MAP_APPFONT ( 65 , 14 ) ; TabStop = TRUE ; Hide = TRUE ; diff --git a/sd/source/ui/func/fuoaprms.cxx b/sd/source/ui/func/fuoaprms.cxx index 7b3edc9f06ac..9335fc222fe6 100644 --- a/sd/source/ui/func/fuoaprms.cxx +++ b/sd/source/ui/func/fuoaprms.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fuoaprms.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: thb $ $Date: 2001-06-20 17:16:55 $ + * last change: $Author: ka $ $Date: 2001-10-23 11:54:24 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -148,7 +148,6 @@ FuObjectAnimationParameters::FuObjectAnimationParameters short nInvisibleSet = ATTR_MISSING; short nSoundOnSet = ATTR_MISSING; short nSoundFileSet = ATTR_MISSING; - short nBlueScreenSet = ATTR_MISSING; short nPlayFullSet = ATTR_MISSING; short nClickActionSet = ATTR_MISSING; short nBookmarkSet = ATTR_MISSING; @@ -170,7 +169,6 @@ FuObjectAnimationParameters::FuObjectAnimationParameters BOOL bFadeOut = FALSE; Color aFadeColor = COL_LIGHTGRAY; BOOL bInvisible = FALSE; - Color aBlueScreen = COL_LIGHTMAGENTA; BOOL bSoundOn = FALSE; String aSound; BOOL bPlayFull = FALSE; @@ -219,9 +217,6 @@ FuObjectAnimationParameters::FuObjectAnimationParameters aSound = pInfo->aSoundFile; nSoundFileSet = ATTR_SET; - aBlueScreen = pInfo->aBlueScreen; - nBlueScreenSet = ATTR_SET; - bPlayFull = pInfo->bPlayFull; nPlayFullSet = ATTR_SET; @@ -279,9 +274,6 @@ FuObjectAnimationParameters::FuObjectAnimationParameters if( aSound != pInfo->aSoundFile ) nSoundFileSet = ATTR_MIXED; - if( aBlueScreen != pInfo->aBlueScreen ) - nBlueScreenSet = ATTR_MIXED; - if( bPlayFull != pInfo->bPlayFull ) nPlayFullSet = ATTR_MIXED; @@ -332,9 +324,6 @@ FuObjectAnimationParameters::FuObjectAnimationParameters if (nSoundFileSet == ATTR_SET) nSoundFileSet = ATTR_MIXED; - if (nBlueScreenSet == ATTR_SET) - nBlueScreenSet = ATTR_MIXED; - if (nPlayFullSet == ATTR_SET && bPlayFull == TRUE) nPlayFullSet = ATTR_MIXED; @@ -399,7 +388,6 @@ FuObjectAnimationParameters::FuObjectAnimationParameters bInvisible = pInfo->bDimHide; nInvisibleSet = ATTR_SET; bSoundOn = pInfo->bSoundOn; nSoundOnSet = ATTR_SET; aSound = pInfo->aSoundFile; nSoundFileSet = ATTR_SET; - aBlueScreen = pInfo->aBlueScreen; nBlueScreenSet = ATTR_SET; bPlayFull = pInfo->bPlayFull; nPlayFullSet = ATTR_SET; eClickAction = pInfo->eClickAction; nClickActionSet = ATTR_SET; aBookmark = pInfo->aBookmark; nBookmarkSet = ATTR_SET; @@ -477,14 +465,6 @@ FuObjectAnimationParameters::FuObjectAnimationParameters else aSet.InvalidateItem(ATTR_ANIMATION_SOUNDFILE); - if (nBlueScreenSet == ATTR_SET) - aSet.Put(SvxColorItem(aBlueScreen, ATTR_ANIMATION_TRANSPCOLOR)); - else if (nBlueScreenSet == ATTR_MIXED) - aSet.InvalidateItem(ATTR_ANIMATION_TRANSPCOLOR); - else - aSet.Put(SvxColorItem(RGB_Color(COL_LIGHTMAGENTA), ATTR_ANIMATION_TRANSPCOLOR)); - - if (nPlayFullSet == ATTR_SET) aSet.Put(SfxBoolItem(ATTR_ANIMATION_PLAYFULL, bPlayFull)); else if (nPlayFullSet == ATTR_MIXED) @@ -628,14 +608,6 @@ FuObjectAnimationParameters::FuObjectAnimationParameters else nFadeColorSet = ATTR_MISSING; - if (pArgs->GetItemState(ATTR_ANIMATION_TRANSPCOLOR) == SFX_ITEM_SET) - { - aBlueScreen = ((SvxColorItem&)pArgs->Get(ATTR_ANIMATION_TRANSPCOLOR)).GetValue(); - nBlueScreenSet = ATTR_SET; - } - else - nBlueScreenSet = ATTR_MISSING; - if (pArgs->GetItemState(ATTR_ANIMATION_PLAYFULL) == SFX_ITEM_SET) { bPlayFull = ((SfxBoolItem&)pArgs->Get(ATTR_ANIMATION_PLAYFULL)).GetValue(); @@ -706,7 +678,6 @@ FuObjectAnimationParameters::FuObjectAnimationParameters nInvisibleSet == ATTR_SET || nSoundOnSet == ATTR_SET || nSoundFileSet == ATTR_SET || - nBlueScreenSet == ATTR_SET || nPlayFullSet == ATTR_SET || nClickActionSet == ATTR_SET || nBookmarkSet == ATTR_SET || @@ -804,7 +775,6 @@ FuObjectAnimationParameters::FuObjectAnimationParameters pAction->SetDimHide(pInfo->bDimHide, pInfo->bDimHide); pAction->SetSoundOn(pInfo->bSoundOn, pInfo->bSoundOn); pAction->SetSound(pInfo->aSoundFile, pInfo->aSoundFile); - pAction->SetBlueScreen(pInfo->aBlueScreen, pInfo->aBlueScreen); pAction->SetPlayFull(pInfo->bPlayFull, pInfo->bPlayFull); pAction->SetPathObj(pInfo->pPathObj, pInfo->pPathObj); pAction->SetClickAction(pInfo->eClickAction, pInfo->eClickAction); @@ -834,7 +804,6 @@ FuObjectAnimationParameters::FuObjectAnimationParameters pAction->SetDimHide(pInfo->bDimHide, bInvisible); pAction->SetSoundOn(pInfo->bSoundOn, bSoundOn); pAction->SetSound(pInfo->aSoundFile, aSound); - pAction->SetBlueScreen(pInfo->aBlueScreen, aBlueScreen); pAction->SetPlayFull(pInfo->bPlayFull, bPlayFull); pAction->SetPathObj(pInfo->pPathObj, pPath); pAction->SetClickAction(pInfo->eClickAction, eClickAction); @@ -876,9 +845,6 @@ FuObjectAnimationParameters::FuObjectAnimationParameters if (nSoundFileSet == ATTR_SET) pInfo->aSoundFile = aSound; - if (nBlueScreenSet == ATTR_SET) - pInfo->aBlueScreen = aBlueScreen; - if (nPlayFullSet == ATTR_SET) pInfo->bPlayFull = bPlayFull; diff --git a/sd/source/ui/func/unoaprms.cxx b/sd/source/ui/func/unoaprms.cxx index f1d828d98223..00a170095582 100644 --- a/sd/source/ui/func/unoaprms.cxx +++ b/sd/source/ui/func/unoaprms.cxx @@ -2,9 +2,9 @@ * * $RCSfile: unoaprms.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: ka $ $Date: 2001-10-22 13:36:53 $ + * last change: $Author: ka $ $Date: 2001-10-23 11:54:24 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -98,7 +98,6 @@ SdAnimationPrmsUndoAction::SdAnimationPrmsUndoAction( bNewDimHide = bOldDimHide = pInfo->bDimHide; bNewSoundOn = bOldSoundOn = pInfo->bSoundOn; aNewSoundFile = aOldSoundFile = pInfo->aSoundFile; - aNewBlueScreen = aOldBlueScreen = pInfo->aBlueScreen; bNewPlayFull = bOldPlayFull = pInfo->bPlayFull; pNewPathObj = pOldPathObj = pInfo->pPathObj; @@ -142,7 +141,6 @@ void SdAnimationPrmsUndoAction::Undo() pInfo->bDimHide = bOldDimHide; pInfo->bSoundOn = bOldSoundOn; pInfo->aSoundFile = aOldSoundFile; - pInfo->aBlueScreen = aOldBlueScreen; pInfo->bPlayFull = bOldPlayFull; pInfo->SetPath(pOldPathObj); pInfo->eClickAction = eOldClickAction; @@ -198,7 +196,6 @@ void SdAnimationPrmsUndoAction::Redo() pInfo->bDimHide = bNewDimHide; pInfo->bSoundOn = bNewSoundOn; pInfo->aSoundFile = aNewSoundFile; - pInfo->aBlueScreen = aNewBlueScreen; pInfo->bPlayFull = bNewPlayFull; pInfo->SetPath(pNewPathObj); pInfo->eClickAction = eNewClickAction; diff --git a/sd/source/ui/inc/tpaction.hrc b/sd/source/ui/inc/tpaction.hrc index 9d5bf9b5c0d1..4a3bc97632b8 100644 --- a/sd/source/ui/inc/tpaction.hrc +++ b/sd/source/ui/inc/tpaction.hrc @@ -2,9 +2,9 @@ * * $RCSfile: tpaction.hrc,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: thb $ $Date: 2001-06-20 17:16:55 $ + * last change: $Author: ka $ $Date: 2001-10-23 11:54:26 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,7 +59,6 @@ * ************************************************************************/ #define LB_EFFECT 1 -#define LB_TRANSPCOLOR 2 #define LB_ACTION 3 #define LB_OLE_ACTION 4 #define LB_TREE 5 @@ -78,7 +77,6 @@ #define EDT_DOCUMENT 3 #define EDT_PROGRAM 4 #define EDT_MACRO 5 -#define FT_TRANSPCOLOR 1 #define FT_ACTION 2 #define FT_ANIMATION 3 #define FT_SPEED 4 diff --git a/sd/source/ui/inc/tpaction.hxx b/sd/source/ui/inc/tpaction.hxx index c109d045d63d..201794748731 100644 --- a/sd/source/ui/inc/tpaction.hxx +++ b/sd/source/ui/inc/tpaction.hxx @@ -2,9 +2,9 @@ * * $RCSfile: tpaction.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: thb $ $Date: 2001-06-20 17:16:55 $ + * last change: $Author: ka $ $Date: 2001-10-23 11:54:26 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -138,8 +138,6 @@ private: RadioButton aRbtSlow; RadioButton aRbtMedium; RadioButton aRbtFast; - FixedText aFtTranspColor; - ColorLB aLbTranspColor; FixedText aFtTree; // jump destination controls SdPageObjsTLB aLbTree; @@ -178,7 +176,6 @@ private: virtual ::com::sun::star::presentation::AnimationEffect GetActualAnimationEffect(); - void FillColorLB(); void UpdateTree(); virtual void OpenFileDialog(); ::com::sun::star::presentation::ClickAction GetActualClickAction(); diff --git a/sd/source/ui/view/drviewsi.cxx b/sd/source/ui/view/drviewsi.cxx index 3da9e70b6220..87a10e6158c1 100644 --- a/sd/source/ui/view/drviewsi.cxx +++ b/sd/source/ui/view/drviewsi.cxx @@ -2,9 +2,9 @@ * * $RCSfile: drviewsi.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: ka $ $Date: 2001-09-06 15:55:02 $ + * last change: $Author: ka $ $Date: 2001-10-23 11:54:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -292,7 +292,6 @@ void SdDrawViewShell::UpdateEffectWindow() short nInvisibleSet = ATTR_MISSING; short nSoundOnSet = ATTR_MISSING; short nSoundFileSet = ATTR_MISSING; - short nBlueScreenSet = ATTR_MISSING; short nPlayFullSet = ATTR_MISSING; short nClickActionSet = ATTR_MISSING; short nBookmarkSet = ATTR_MISSING; @@ -314,7 +313,6 @@ void SdDrawViewShell::UpdateEffectWindow() BOOL bFadeOut = FALSE; Color aFadeColor = COL_LIGHTGRAY; BOOL bInvisible = FALSE; - Color aBlueScreen = COL_LIGHTMAGENTA; BOOL bSoundOn = FALSE; String aSound; BOOL bPlayFull = FALSE; @@ -369,9 +367,6 @@ void SdDrawViewShell::UpdateEffectWindow() aSound = pInfo->aSoundFile; nSoundFileSet = ATTR_SET; - aBlueScreen = pInfo->aBlueScreen; - nBlueScreenSet = ATTR_SET; - bPlayFull = pInfo->bPlayFull; nPlayFullSet = ATTR_SET; @@ -433,9 +428,6 @@ void SdDrawViewShell::UpdateEffectWindow() if( aSound != pInfo->aSoundFile ) nSoundFileSet = ATTR_MIXED; - if( aBlueScreen != pInfo->aBlueScreen ) - nBlueScreenSet = ATTR_MIXED; - if( bPlayFull != pInfo->bPlayFull ) nPlayFullSet = ATTR_MIXED; @@ -486,9 +478,6 @@ void SdDrawViewShell::UpdateEffectWindow() if (nSoundFileSet == ATTR_SET) nSoundFileSet = ATTR_MIXED; - if (nBlueScreenSet == ATTR_SET) - nBlueScreenSet = ATTR_MIXED; - if (nPlayFullSet == ATTR_SET && bPlayFull == TRUE) nPlayFullSet = ATTR_MIXED; @@ -553,7 +542,6 @@ void SdDrawViewShell::UpdateEffectWindow() bInvisible = pInfo->bDimHide; nInvisibleSet = ATTR_SET; bSoundOn = pInfo->bSoundOn; nSoundOnSet = ATTR_SET; aSound = pInfo->aSoundFile; nSoundFileSet = ATTR_SET; - aBlueScreen = pInfo->aBlueScreen; nBlueScreenSet = ATTR_SET; bPlayFull = pInfo->bPlayFull; nPlayFullSet = ATTR_SET; eClickAction = pInfo->eClickAction; nClickActionSet = ATTR_SET; aBookmark = pInfo->aBookmark; nBookmarkSet = ATTR_SET; @@ -632,13 +620,6 @@ void SdDrawViewShell::UpdateEffectWindow() else aSet.InvalidateItem(ATTR_ANIMATION_SOUNDFILE); - if (nBlueScreenSet == ATTR_SET) - aSet.Put(SvxColorItem(aBlueScreen, ATTR_ANIMATION_TRANSPCOLOR)); - else if (nBlueScreenSet == ATTR_MIXED) - aSet.InvalidateItem(ATTR_ANIMATION_TRANSPCOLOR); - else - aSet.Put(SvxColorItem(RGB_Color( COL_LIGHTMAGENTA ), ATTR_ANIMATION_TRANSPCOLOR)); - if (nPlayFullSet == ATTR_SET) aSet.Put(SfxBoolItem(ATTR_ANIMATION_PLAYFULL, bPlayFull)); else if (nPlayFullSet == ATTR_MIXED) @@ -735,7 +716,6 @@ void SdDrawViewShell::AssignFromEffectWindow() short nInvisibleSet = ATTR_MISSING; short nSoundOnSet = ATTR_MISSING; short nSoundFileSet = ATTR_MISSING; - short nBlueScreenSet = ATTR_MISSING; short nPlayFullSet = ATTR_MISSING; short nClickActionSet = ATTR_MISSING; short nBookmarkSet = ATTR_MISSING; @@ -753,7 +733,6 @@ void SdDrawViewShell::AssignFromEffectWindow() BOOL bFadeOut = FALSE; Color aFadeColor = COL_LIGHTGRAY; BOOL bInvisible = FALSE; - Color aBlueScreen = COL_LIGHTMAGENTA; BOOL bSoundOn = FALSE; String aSound; BOOL bPlayFull = FALSE; @@ -847,14 +826,6 @@ void SdDrawViewShell::AssignFromEffectWindow() else nFadeColorSet = ATTR_MISSING; - if (aSet.GetItemState(ATTR_ANIMATION_TRANSPCOLOR) == SFX_ITEM_SET) - { - aBlueScreen = ((SvxColorItem&)aSet.Get(ATTR_ANIMATION_TRANSPCOLOR)).GetValue(); - nBlueScreenSet = ATTR_SET; - } - else - nBlueScreenSet = ATTR_MISSING; - if (aSet.GetItemState(ATTR_ANIMATION_PLAYFULL) == SFX_ITEM_SET) { bPlayFull = ((SfxBoolItem&)aSet.Get(ATTR_ANIMATION_PLAYFULL)).GetValue(); @@ -925,7 +896,6 @@ void SdDrawViewShell::AssignFromEffectWindow() nInvisibleSet == ATTR_SET || nSoundOnSet == ATTR_SET || nSoundFileSet == ATTR_SET || - nBlueScreenSet == ATTR_SET || nPlayFullSet == ATTR_SET || nClickActionSet == ATTR_SET || nBookmarkSet == ATTR_SET || @@ -1032,7 +1002,6 @@ void SdDrawViewShell::AssignFromEffectWindow() pAction->SetDimHide(pInfo->bDimHide, pInfo->bDimHide); pAction->SetSoundOn(pInfo->bSoundOn, pInfo->bSoundOn); pAction->SetSound(pInfo->aSoundFile, pInfo->aSoundFile); - pAction->SetBlueScreen(pInfo->aBlueScreen, pInfo->aBlueScreen); pAction->SetPlayFull(pInfo->bPlayFull, pInfo->bPlayFull); pAction->SetPathObj(pInfo->pPathObj, pInfo->pPathObj); pAction->SetClickAction(pInfo->eClickAction, pInfo->eClickAction); @@ -1063,7 +1032,6 @@ void SdDrawViewShell::AssignFromEffectWindow() pAction->SetDimHide(pInfo->bDimHide, bInvisible); pAction->SetSoundOn(pInfo->bSoundOn, bSoundOn); pAction->SetSound(pInfo->aSoundFile, aSound); - pAction->SetBlueScreen(pInfo->aBlueScreen, aBlueScreen); pAction->SetPlayFull(pInfo->bPlayFull, bPlayFull); pAction->SetPathObj(pInfo->pPathObj, pPath); pAction->SetClickAction(pInfo->eClickAction, eClickAction); @@ -1106,9 +1074,6 @@ void SdDrawViewShell::AssignFromEffectWindow() if (nSoundFileSet == ATTR_SET) pInfo->aSoundFile = aSound; - if (nBlueScreenSet == ATTR_SET) - pInfo->aBlueScreen = aBlueScreen; - if (nPlayFullSet == ATTR_SET) pInfo->bPlayFull = bPlayFull; diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx index 88989f263b97..c426cc153d46 100644 --- a/sd/source/ui/view/sdview2.cxx +++ b/sd/source/ui/view/sdview2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sdview2.cxx,v $ * - * $Revision: 1.25 $ + * $Revision: 1.26 $ * - * last change: $Author: ka $ $Date: 2001-10-22 13:36:57 $ + * last change: $Author: ka $ $Date: 2001-10-23 11:54:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -821,7 +821,6 @@ sal_Int8 SdView::ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rT pAction->SetDimHide(pInfo->bDimHide, pInfo->bDimHide); pAction->SetSoundOn(pInfo->bSoundOn, pInfo->bSoundOn); pAction->SetSound(pInfo->aSoundFile, pInfo->aSoundFile); - pAction->SetBlueScreen(pInfo->aBlueScreen, pInfo->aBlueScreen); pAction->SetPlayFull(pInfo->bPlayFull, pInfo->bPlayFull); pAction->SetPathObj(pInfo->pPathObj, pInfo->pPathObj); pAction->SetClickAction(pInfo->eClickAction, eClickAction); |