diff options
author | Tor Lillqvist <tml@iki.fi> | 2013-04-27 21:12:52 +0300 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2013-04-28 14:28:29 +0000 |
commit | c72bb2da7bc8a7616539d57890139ee8b5360443 (patch) | |
tree | 773c68072b56e4b51bd301cdd8a0e781ee9d257d /sd/source/ui/view/drviews6.cxx | |
parent | 1fd3167695aaebb050df53acd91f2e1625e8305a (diff) |
Bin CLOOK comments and un-split one large switch statement
CLOOK = "Compiler Limit: Out Of Keys", an error reported by Microsoft's
compiler a long time ago. No such problem in those versions we support. No
need to mention CLOOK in comments any more.
While at it, re-combine one large switch statement that was split to avoid
CLOOK.
Change-Id: Id93d973a5fb3c81b6c754eef0ba3b0bd55a649d2
Reviewed-on: https://gerrit.libreoffice.org/3640
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'sd/source/ui/view/drviews6.cxx')
-rw-r--r-- | sd/source/ui/view/drviews6.cxx | 315 |
1 files changed, 0 insertions, 315 deletions
diff --git a/sd/source/ui/view/drviews6.cxx b/sd/source/ui/view/drviews6.cxx index 760e411a0c76..8ccc1bd51777 100644 --- a/sd/source/ui/view/drviews6.cxx +++ b/sd/source/ui/view/drviews6.cxx @@ -40,7 +40,6 @@ #include "app.hrc" #include "strings.hrc" -#include "glob.hrc" #include "sdmod.hxx" #include "animobjs.hxx" @@ -48,12 +47,7 @@ #include "NavigatorChildWindow.hxx" #include "LayerDialogChildWindow.hxx" #include "sdresid.hxx" -#include "fupoor.hxx" -#include "fusldlg.hxx" #include "drawdoc.hxx" -#include "fuexpand.hxx" -#include "fusumry.hxx" -#include "fucushow.hxx" #include "drawview.hxx" #include "FrameView.hxx" #include "Window.hxx" @@ -403,315 +397,6 @@ void DrawViewShell::GetBmpMaskState( SfxItemSet& rSet ) rSet.Put( SfxBoolItem( SID_BMPMASK_EXEC, bEnable ) ); } -/** - * SfxRequests for temporary functions - */ -void DrawViewShell::FuTemp04(SfxRequest& rReq) -{ - sal_uInt16 nSId = rReq.GetSlot(); - switch( nSId ) - { - case SID_FONTWORK: - { - if ( rReq.GetArgs() ) - { - GetViewFrame()->SetChildWindow(SvxFontWorkChildWindow::GetChildWindowId(), - ((const SfxBoolItem&) (rReq.GetArgs()-> - Get(SID_FONTWORK))).GetValue()); - } - else - { - GetViewFrame()->ToggleChildWindow( SvxFontWorkChildWindow::GetChildWindowId() ); - } - - GetViewFrame()->GetBindings().Invalidate(SID_FONTWORK); - Cancel(); - rReq.Ignore (); - } - break; - - case SID_COLOR_CONTROL: - { - if ( rReq.GetArgs() ) - GetViewFrame()->SetChildWindow(SvxColorChildWindow::GetChildWindowId(), - ((const SfxBoolItem&) (rReq.GetArgs()-> - Get(SID_COLOR_CONTROL))).GetValue()); - else - GetViewFrame()->ToggleChildWindow(SvxColorChildWindow::GetChildWindowId() ); - - GetViewFrame()->GetBindings().Invalidate(SID_COLOR_CONTROL); - Cancel(); - rReq.Ignore (); - } - break; - - case SID_EXTRUSION_TOOGLE: - case SID_EXTRUSION_TILT_DOWN: - case SID_EXTRUSION_TILT_UP: - case SID_EXTRUSION_TILT_LEFT: - case SID_EXTRUSION_TILT_RIGHT: - case SID_EXTRUSION_3D_COLOR: - case SID_EXTRUSION_DEPTH: - case SID_EXTRUSION_DIRECTION: - case SID_EXTRUSION_PROJECTION: - case SID_EXTRUSION_LIGHTING_DIRECTION: - case SID_EXTRUSION_LIGHTING_INTENSITY: - case SID_EXTRUSION_SURFACE: - case SID_EXTRUSION_DEPTH_FLOATER: - case SID_EXTRUSION_DIRECTION_FLOATER: - case SID_EXTRUSION_LIGHTING_FLOATER: - case SID_EXTRUSION_SURFACE_FLOATER: - case SID_EXTRUSION_DEPTH_DIALOG: - svx::ExtrusionBar::execute( mpDrawView, rReq, GetViewFrame()->GetBindings() ); - Cancel(); - rReq.Ignore (); - break; - - case SID_FONTWORK_SHAPE: - case SID_FONTWORK_SHAPE_TYPE: - 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_CHARACTER_SPACING_FLOATER: - case SID_FONTWORK_ALIGNMENT_FLOATER: - case SID_FONTWORK_CHARACTER_SPACING_DIALOG: - svx::FontworkBar::execute( mpDrawView, rReq, GetViewFrame()->GetBindings() ); - Cancel(); - rReq.Ignore (); - break; - - case SID_BMPMASK: - { - GetViewFrame()->ToggleChildWindow( SvxBmpMaskChildWindow::GetChildWindowId() ); - GetViewFrame()->GetBindings().Invalidate( SID_BMPMASK ); - - Cancel(); - rReq.Ignore (); - } - break; - - case SID_GALLERY: - { - GetViewFrame()->ToggleChildWindow( GalleryChildWindow::GetChildWindowId() ); - GetViewFrame()->GetBindings().Invalidate( SID_GALLERY ); - - Cancel(); - rReq.Ignore (); - } - break; - - case SID_NAVIGATOR: - { - if ( rReq.GetArgs() ) - GetViewFrame()->SetChildWindow(SID_NAVIGATOR, - ((const SfxBoolItem&) (rReq.GetArgs()-> - Get(SID_NAVIGATOR))).GetValue()); - else - GetViewFrame()->ToggleChildWindow( SID_NAVIGATOR ); - - GetViewFrame()->GetBindings().Invalidate(SID_NAVIGATOR); - Cancel(); - rReq.Ignore (); - } - break; - - case SID_ANIMATION_OBJECTS: - { - if ( rReq.GetArgs() ) - GetViewFrame()->SetChildWindow( - AnimationChildWindow::GetChildWindowId(), - ((const SfxBoolItem&) (rReq.GetArgs()-> - Get(SID_ANIMATION_OBJECTS))).GetValue()); - else - GetViewFrame()->ToggleChildWindow( - AnimationChildWindow::GetChildWindowId() ); - - GetViewFrame()->GetBindings().Invalidate(SID_ANIMATION_OBJECTS); - Cancel(); - rReq.Ignore (); - } - break; - - case SID_CUSTOM_ANIMATION_PANEL: - { - // Make the slide transition panel visible (expand it) in the - // tool pane. - framework::FrameworkHelper::Instance(GetViewShellBase())->RequestTaskPanel( - framework::FrameworkHelper::msCustomAnimationTaskPanelURL); - - Cancel(); - rReq.Done (); - } - break; - - case SID_SLIDE_TRANSITIONS_PANEL: - { - // Make the slide transition panel visible (expand it) in the - // tool pane. - framework::FrameworkHelper::Instance(GetViewShellBase())->RequestTaskPanel( - framework::FrameworkHelper::msSlideTransitionTaskPanelURL); - - Cancel(); - rReq.Done (); - } - break; - - case SID_3D_WIN: - { - if ( rReq.GetArgs() ) - GetViewFrame()->SetChildWindow( Svx3DChildWindow::GetChildWindowId(), - ((const SfxBoolItem&) (rReq.GetArgs()-> - Get( SID_3D_WIN ))).GetValue()); - else - GetViewFrame()->ToggleChildWindow( Svx3DChildWindow::GetChildWindowId() ); - - GetViewFrame()->GetBindings().Invalidate( SID_3D_WIN ); - Cancel(); - rReq.Ignore (); - } - break; - - case SID_CONVERT_TO_3D_LATHE_FAST: - { - /* The call is enough. The initialization via Start3DCreation and - CreateMirrorPolygons is no longer needed if the parameter - sal_True is provided. Then a tilted rotary body with an axis left - besides the bounding rectangle of the selected objects is drawn - immediately and without user interaction. */ - mpDrawView->SdrEndTextEdit(); - if(GetActiveWindow()) - GetActiveWindow()->EnterWait(); - mpDrawView->End3DCreation(true); - Cancel(); - rReq.Ignore(); - if(GetActiveWindow()) - GetActiveWindow()->LeaveWait(); - } - break; - - case SID_PRESENTATION_DLG: - { - SetCurrentFunction( FuSlideShowDlg::Create( this, GetActiveWindow(), mpDrawView, GetDoc(), rReq ) ); - Cancel(); - } - break; - - case SID_REMOTE_DLG: - { -#ifdef ENABLE_SDREMOTE - SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create(); - VclAbstractDialog* pDlg = pFact ? pFact->CreateRemoteDialog(GetActiveWindow()) : 0; - if (pDlg) - pDlg->Execute(); -#endif - } - break; - - case SID_CUSTOMSHOW_DLG: - { - SetCurrentFunction( FuCustomShowDlg::Create( this, GetActiveWindow(), mpDrawView, GetDoc(), rReq ) ); - Cancel(); - } - break; - - case SID_EXPAND_PAGE: - { - SetCurrentFunction( FuExpandPage::Create( this, GetActiveWindow(), mpDrawView, GetDoc(), rReq ) ); - Cancel(); - } - break; - - case SID_SUMMARY_PAGE: - { - mpDrawView->SdrEndTextEdit(); - SetCurrentFunction( FuSummaryPage::Create( this, GetActiveWindow(), mpDrawView, GetDoc(), rReq ) ); - Cancel(); - } - break; - - case SID_AVMEDIA_PLAYER: - { - GetViewFrame()->ToggleChildWindow( ::avmedia::MediaPlayer::GetChildWindowId() ); - GetViewFrame()->GetBindings().Invalidate( SID_AVMEDIA_PLAYER ); - Cancel(); - rReq.Ignore (); - } - break; - - case SID_LAYER_DIALOG_WIN: - { - if ( rReq.GetArgs() ) - { - GetViewFrame()->SetChildWindow( - LayerDialogChildWindow::GetChildWindowId(), - ((const SfxBoolItem&) (rReq.GetArgs()-> - Get(SID_LAYER_DIALOG_WIN))).GetValue()); - } - else - { - GetViewFrame()->ToggleChildWindow( - LayerDialogChildWindow::GetChildWindowId()); - } - - GetViewFrame()->GetBindings().Invalidate(SID_LAYER_DIALOG_WIN); - Cancel(); - rReq.Ignore (); - } - break; - - case SID_DISPLAY_MASTER_BACKGROUND: - case SID_DISPLAY_MASTER_OBJECTS: - { - // Determine current page and toggle visibility of layers - // associated with master page background or master page shapes. - SdPage* pPage = GetActualPage(); - if (pPage != NULL - && GetDoc() != NULL) - { - SetOfByte aVisibleLayers = pPage->TRG_GetMasterPageVisibleLayers(); - SdrLayerAdmin& rLayerAdmin = GetDoc()->GetLayerAdmin(); - sal_uInt8 aLayerId; - if (nSId == SID_DISPLAY_MASTER_BACKGROUND) - aLayerId = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRND)), sal_False); - else - aLayerId = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), sal_False); - aVisibleLayers.Set(aLayerId, !aVisibleLayers.IsSet(aLayerId)); - pPage->TRG_SetMasterPageVisibleLayers(aVisibleLayers); - } - Cancel(); - rReq.Ignore (); - } - break; - - case SID_PHOTOALBUM: - { - SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create(); - VclAbstractDialog* pDlg = pFact ? pFact->CreateSdPhotoAlbumDialog( - GetActiveWindow(), - GetDoc()) : 0; - - if (pDlg) - { - pDlg->Execute(); - delete pDlg; - } - Cancel(); - rReq.Ignore (); - } - break; - - default: - { - DBG_ASSERT( 0, "Slot without function" ); - Cancel(); - rReq.Ignore (); - } - break; - } -} - } // end of namespace sd /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |