diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-12-22 13:20:22 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-12-22 17:17:18 +0100 |
commit | de6ccf060cc85a6ea154989bcc254e37854aa07b (patch) | |
tree | 25e3e88706f1012f777bdde58604d7e54c149a9d /sd | |
parent | 26be5f21cebfe9acad088a1086f97eebdb437b7c (diff) |
Revert "unused SID command in sd"
This reverts commit 46db544b41fd30f61dd7b7b4fa2b97ab22ceb079.
Change-Id: I8eed13269000a7fc4c52c1695e36df8607b470ac
Reviewed-on: https://gerrit.libreoffice.org/46965
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd')
-rw-r--r-- | sd/inc/app.hrc | 42 | ||||
-rw-r--r-- | sd/sdi/ViewShellBase.sdi | 9 | ||||
-rw-r--r-- | sd/sdi/_drvwsh.sdi | 123 | ||||
-rw-r--r-- | sd/sdi/drviewsh.sdi | 10 | ||||
-rw-r--r-- | sd/sdi/sdraw.sdi | 554 | ||||
-rw-r--r-- | sd/source/ui/view/GraphicViewShellBase.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/view/ViewShellBase.cxx | 13 | ||||
-rw-r--r-- | sd/source/ui/view/drviews2.cxx | 24 | ||||
-rw-r--r-- | sd/source/ui/view/drviews6.cxx | 3 | ||||
-rw-r--r-- | sd/source/ui/view/drviews9.cxx | 603 | ||||
-rw-r--r-- | sd/source/ui/view/drviewsa.cxx | 6 | ||||
-rw-r--r-- | sd/source/ui/view/drviewse.cxx | 7 |
12 files changed, 1384 insertions, 12 deletions
diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc index 2624480081da..f6c6752e8c66 100644 --- a/sd/inc/app.hrc +++ b/sd/inc/app.hrc @@ -166,7 +166,7 @@ // In svxids.hrc: SID_ATTR_SYMBOLTYPE (SID_SD_START+115) // In svxids.hrc: SID_ATTR_SYMBOLSIZE (SID_SD_START+116) #define SID_REVERSE_ORDER (SID_SD_START+117) - // FREE +#define SID_CLEAR_UNDO_STACK (SID_SD_START+118) #define SID_CONNECTOR_ARROW_START (SID_SD_START+119) #define SID_CONNECTOR_ARROW_END (SID_SD_START+120) #define SID_CONNECTOR_ARROWS (SID_SD_START+121) @@ -269,17 +269,36 @@ #define ID_VAL_WIDTH (SID_SD_START+247) #define SID_GRID_FRONT (SID_SD_START+248) #define ID_VAL_ISVISIBLE (SID_SD_START+249) - // FREE +#define SID_MOVETO (SID_SD_START+250) +#define SID_LINETO (SID_SD_START+251) // In svxids.hrc: SID_BEZIERTO (SID_SD_START+252) - // FREE +#define SID_PAGESIZE (SID_SD_START+253) #define SID_PAGEMARGIN (SID_SD_START+254) // FREE #define SID_COLORVIEW (SID_SD_START+257) // FREE +#define SID_GETRED (SID_SD_START+259) +#define SID_GETBLUE (SID_SD_START+260) +#define SID_GETGREEN (SID_SD_START+261) +#define SID_SETFILLSTYLE (SID_SD_START+262) +#define SID_SETFILLCOLOR (SID_SD_START+263) +#define SID_GRADIENT (SID_SD_START+264) +#define SID_SETLINESTYLE (SID_SD_START+265) +#define SID_SETLINEWIDTH (SID_SD_START+266) // In svxids.hrc: SID_DASH (SID_SD_START+267) #define SID_RENAMEPAGE (SID_SD_START+268) #define SID_RENAMELAYER (SID_SD_START+269) - // FREE +#define SID_HATCH (SID_SD_START+270) +#define SID_GETFILLSTYLE (SID_SD_START+271) +#define SID_GETLINESTYLE (SID_SD_START+272) +#define SID_GETLINEWIDTH (SID_SD_START+273) +#define SID_SETLINECOLOR (SID_SD_START+274) +#define SID_SETHATCHCOLOR (SID_SD_START+275) +#define SID_SETGRADSTARTCOLOR (SID_SD_START+276) +#define SID_SETGRADENDCOLOR (SID_SD_START+277) +#define SID_SELECTGRADIENT (SID_SD_START+278) +#define SID_SELECTHATCH (SID_SD_START+279) +#define SID_UNSELECT (SID_SD_START+280) #define SID_TEXTATTR_DLG (SID_SD_START+281) #define SID_ORIGINAL_SIZE (SID_SD_START+282) #define SID_PAGES_PER_ROW (SID_SD_START+284) @@ -291,7 +310,7 @@ // FREE #define SID_NAVIGATOR_PAGE (SID_SD_START+292) #define SID_NAVIGATOR_OBJECT (SID_SD_START+293) - // FREE +#define SID_ANIMATOR_INIT (SID_SD_START+294) #define SID_DRAWTBX_3D_OBJECTS (SID_SD_START+295) #define SID_3D_CUBE (SID_SD_START+296) #define SID_3D_SPHERE (SID_SD_START+297) @@ -382,7 +401,7 @@ #define SID_PREVIEW_QUALITY_CONTRAST (SID_SD_START+401) // FREE #define SID_RENAMEPAGE_QUICK (SID_SD_START+405) - // FREE +#define SID_SWITCH_SHELL (SID_SD_START+406) #define SID_HEADER_AND_FOOTER (SID_SD_START+407) #define SID_MASTER_LAYOUTS (SID_SD_START+408) // FREE @@ -396,12 +415,21 @@ #define SID_LEFT_PANE_IMPRESS (SID_SD_START+414) #define SID_LEFT_PANE_DRAW (SID_SD_START+415) // FREE +#define SID_NOTES_WINDOW (SID_SD_START+417) + // FREE #define SID_NORMAL_MULTI_PANE_GUI (SID_SD_START+420) #define SID_SLIDE_SORTER_MULTI_PANE_GUI (SID_SD_START+421) #define SID_SELECT_BACKGROUND (SID_SD_START+422) #define SID_SAVE_BACKGROUND (SID_SD_START+423) // FREE +// Slots for the tool pane popup +#define SID_TP_APPLY_TO_ALL_SLIDES (SID_SD_START+425) +#define SID_TP_APPLY_TO_SELECTED_SLIDES (SID_SD_START+426) +#define SID_TP_USE_FOR_NEW_PRESENTATIONS (SID_SD_START+427) +#define SID_TP_SHOW_LARGE_PREVIEW (SID_SD_START+428) +#define SID_TP_SHOW_SMALL_PREVIEW (SID_SD_START+429) + // FREE #define SID_INSERT_MASTER_PAGE (SID_SD_START+431) #define SID_DELETE_MASTER_PAGE (SID_SD_START+432) #define SID_RENAME_MASTER_PAGE (SID_SD_START+433) @@ -410,7 +438,7 @@ #define SID_DISPLAY_MASTER_BACKGROUND (SID_SD_START+436) #define SID_DISPLAY_MASTER_OBJECTS (SID_SD_START+437) #define SID_INSERTPAGE_LAYOUT_MENU (SID_SD_START+438) - // FREE +#define SID_TP_EDIT_MASTER (SID_SD_START+439) #define SID_OUTLINE_TEXT_AUTOFIT (SID_SD_START+440) // Add companion for the SID_HIDE_SLIDE (that is defined in svx) diff --git a/sd/sdi/ViewShellBase.sdi b/sd/sdi/ViewShellBase.sdi index 21eba48bb46a..cc60732b7178 100644 --- a/sd/sdi/ViewShellBase.sdi +++ b/sd/sdi/ViewShellBase.sdi @@ -18,6 +18,10 @@ interface ViewShellBaseView { + SID_SWITCH_SHELL + [ + ExecMethod = Execute; + ] SID_LEFT_PANE_IMPRESS [ ExecMethod = Execute; @@ -28,6 +32,11 @@ interface ViewShellBaseView ExecMethod = Execute; StateMethod = GetState; ] + SID_NOTES_WINDOW + [ + ExecMethod = Execute; + StateMethod = GetState; + ] SID_NORMAL_MULTI_PANE_GUI [ ExecMethod = Execute; diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi index 9cdb63eb9321..a18924f36a13 100644 --- a/sd/sdi/_drvwsh.sdi +++ b/sd/sdi/_drvwsh.sdi @@ -422,6 +422,11 @@ interface DrawView ExecMethod = FuTemporary ; StateMethod = GetMenuState ; ] + SID_PAGESIZE // ole : no, status : rec play + [ + ExecMethod = FuTemporary ; + StateMethod = GetMenuState ; + ] SID_PAGEMARGIN // ole : no, status : rec play [ ExecMethod = FuTemporary ; @@ -1122,6 +1127,16 @@ interface DrawView ExecMethod = FuPermanent ; StateMethod = GetMenuState ; ] + SID_MOVETO // ole : no, status : play rec + [ + ExecMethod = FuPermanent ; + StateMethod = GetMenuState ; + ] + SID_LINETO // ole : no, status : play rec + [ + ExecMethod = FuPermanent ; + StateMethod = GetMenuState ; + ] SID_BEZIERTO // ole : no, status : play rec [ ExecMethod = FuPermanent ; @@ -1799,11 +1814,119 @@ interface DrawView ExecMethod = FuSupport ; StateMethod = GetMenuState ; ] + // problem with SID_ATTR_FILL_STYLE: + // former XFillStyle, now property FillStyle (Get/Set) + // therefore Export = FALSE ! + SID_SETFILLSTYLE // ole : no, status : play rec + [ + ExecMethod = AttrExec ; + StateMethod = AttrState ; + Export = FALSE ; + ] + SID_GETFILLSTYLE // ole : no, status : play rec + [ + ExecMethod = AttrExec ; + StateMethod = AttrState ; + ] + SID_SETLINESTYLE // ole : no, status : play rec + [ + ExecMethod = AttrExec ; + StateMethod = AttrState ; + ] + SID_GETLINESTYLE // ole : no, status : play rec + [ + ExecMethod = AttrExec ; + StateMethod = AttrState ; + ] + // problem with SID_ATTR_LINE_WIDTH: + // former XLineWidth, now property LineWidth (Get/Set) + // therefore Export = FALSE ! + SID_SETLINEWIDTH // ole : no, status : play rec + [ + ExecMethod = AttrExec ; + StateMethod = AttrState ; + Export = FALSE ; + ] + SID_GETLINEWIDTH // ole : no, status : play rec + [ + ExecMethod = AttrExec ; + StateMethod = AttrState ; + ] + //DB: FillColor -> SetFillColor + // problem with SID_ATTR_FILL_COLOR: + // former XFillColor, now property FillColor (Get/Set) + // therefore Export = FALSE ! + SID_SETFILLCOLOR // ole : no, status : play rec + [ + ExecMethod = AttrExec ; + StateMethod = AttrState ; + Export = FALSE ; + ] + SID_SETLINECOLOR // ole : no, status : play rec + [ + ExecMethod = AttrExec ; + StateMethod = AttrState ; + ] + SID_SETHATCHCOLOR // ole : no, status : play rec + [ + ExecMethod = AttrExec ; + StateMethod = AttrState ; + ] + SID_SETGRADSTARTCOLOR // ole : no, status : play rec + [ + ExecMethod = AttrExec ; + StateMethod = AttrState ; + ] + SID_SETGRADENDCOLOR // ole : no, status : play rec + [ + ExecMethod = AttrExec ; + StateMethod = AttrState ; + ] + SID_GETRED // ole : no, status : play rec + [ + ExecMethod = AttrExec ; + StateMethod = AttrState ; + ] + SID_GETBLUE // ole : no, status : play rec + [ + ExecMethod = AttrExec ; + StateMethod = AttrState ; + ] + SID_GETGREEN // ole : no, status : play rec + [ + ExecMethod = AttrExec ; + StateMethod = AttrState ; + ] SID_DASH // ole : no, status : play rec [ ExecMethod = AttrExec ; StateMethod = AttrState ; ] + SID_HATCH // ole : no, status : play rec + [ + ExecMethod = AttrExec ; + StateMethod = AttrState ; + ] + SID_GRADIENT // ole : no, status : play rec + [ + ExecMethod = AttrExec ; + StateMethod = AttrState ; + ] + SID_SELECTGRADIENT // ole : no, status : play rec + [ + ExecMethod = AttrExec ; + StateMethod = AttrState ; + ] + SID_SELECTHATCH // ole : no, status : play rec + [ + ExecMethod = AttrExec ; + StateMethod = AttrState ; + ] + SID_UNSELECT // ole : no, status : play rec + [ + ExecMethod = AttrExec ; + StateMethod = AttrState ; + ] SID_TEXTATTR_DLG // ole : no, status : play rec [ ExecMethod = FuTemporary ; diff --git a/sd/sdi/drviewsh.sdi b/sd/sdi/drviewsh.sdi index 616bbd15580e..931a54ee983d 100644 --- a/sd/sdi/drviewsh.sdi +++ b/sd/sdi/drviewsh.sdi @@ -72,12 +72,22 @@ interface ImpressEditView : DrawView ExecMethod = FuSupport ; StateMethod = GetMenuState ; ] + SID_CLEAR_UNDO_STACK // ole : no, status : ? + [ + ExecMethod = FuSupport ; + StateMethod = GetMenuState ; + ] SID_STYLE_FAMILY5 // ole : no, status : ? [ ExecMethod = FuTemporary ; StateMethod = GetAttrState ; Export = FALSE ; ] + SID_ANIMATOR_INIT // ole : no, status : ? + [ + ExecMethod = ExecAnimationWin ; + StateMethod = GetAnimationWinState ; + ] SID_ANIMATOR_ADD // ole : no, status : ? [ ExecMethod = ExecAnimationWin ; diff --git a/sd/sdi/sdraw.sdi b/sd/sdi/sdraw.sdi index 937315af1b57..0d39885e1584 100644 --- a/sd/sdi/sdraw.sdi +++ b/sd/sdi/sdraw.sdi @@ -105,6 +105,24 @@ SfxBoolItem AnimatorCreateObject SID_ANIMATOR_CREATE GroupId = SfxGroupId::Options; ] +SfxBoolItem AnimatorInit SID_ANIMATOR_INIT + +[ + AutoUpdate = FALSE, + FastCall = FALSE, + ReadOnlyDoc = FALSE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + + + AccelConfig = FALSE, + MenuConfig = FALSE, + ToolBoxConfig = FALSE, + GroupId = SfxGroupId::Options; +] + SfxUInt16Item AnimatorState SID_ANIMATOR_STATE [ @@ -1180,6 +1198,23 @@ SfxStringItem DeleteSnapItem SID_DELETE_SNAPITEM GroupId = SfxGroupId::Edit; ] +SfxVoidItem DeSelect SID_UNSELECT +() +[ + AutoUpdate = FALSE, + FastCall = FALSE, + ReadOnlyDoc = TRUE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + + AccelConfig = FALSE, + MenuConfig = FALSE, + ToolBoxConfig = FALSE, + GroupId = SfxGroupId::Edit; +] + SfxBoolItem DiaMode SID_SLIDE_SORTER_MODE [ AutoUpdate = FALSE, @@ -1354,6 +1389,23 @@ SfxVoidItem ExpandPage SID_EXPAND_PAGE GroupId = SfxGroupId::Edit; ] +SfxVoidItem SetFillColor SID_SETFILLCOLOR +(SfxUInt32Item Red ID_VAL_RED,SfxUInt32Item Green ID_VAL_GREEN,SfxUInt32Item Blue ID_VAL_BLUE) +[ + AutoUpdate = FALSE, + FastCall = FALSE, + ReadOnlyDoc = FALSE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + + AccelConfig = FALSE, + MenuConfig = FALSE, + ToolBoxConfig = FALSE, + GroupId = SfxGroupId::Format; +] + SfxVoidItem Forward SID_MOREFRONT () [ @@ -1371,6 +1423,111 @@ SfxVoidItem Forward SID_MOREFRONT GroupId = SfxGroupId::Modify; ] +SfxVoidItem GetBlue SID_GETBLUE +(SfxUInt32Item WhatKind ID_VAL_WHATKIND) +[ + AutoUpdate = FALSE, + FastCall = FALSE, + ReadOnlyDoc = TRUE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + + AccelConfig = FALSE, + MenuConfig = FALSE, + ToolBoxConfig = FALSE, + GroupId = SfxGroupId::Drawing; +] + +SfxUInt32Item GetFillStyle SID_GETFILLSTYLE + +[ + AutoUpdate = FALSE, + FastCall = FALSE, + ReadOnlyDoc = TRUE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + + + AccelConfig = FALSE, + MenuConfig = FALSE, + ToolBoxConfig = FALSE, + GroupId = SfxGroupId::Drawing; +] + +SfxVoidItem GetGreen SID_GETGREEN +(SfxUInt32Item WhatKind ID_VAL_WHATKIND) +[ + AutoUpdate = FALSE, + FastCall = FALSE, + ReadOnlyDoc = TRUE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + + AccelConfig = FALSE, + MenuConfig = FALSE, + ToolBoxConfig = FALSE, + GroupId = SfxGroupId::Drawing; +] + +SfxUInt32Item GetLineStyle SID_GETLINESTYLE + +[ + AutoUpdate = FALSE, + FastCall = FALSE, + ReadOnlyDoc = TRUE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + + + AccelConfig = FALSE, + MenuConfig = FALSE, + ToolBoxConfig = FALSE, + GroupId = SfxGroupId::Drawing; +] + +SfxUInt32Item GetLineWidth SID_GETLINEWIDTH + +[ + AutoUpdate = FALSE, + FastCall = FALSE, + ReadOnlyDoc = TRUE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + + + AccelConfig = FALSE, + MenuConfig = FALSE, + ToolBoxConfig = FALSE, + GroupId = SfxGroupId::Drawing; +] + +SfxVoidItem GetRed SID_GETRED +(SfxUInt32Item WhatKind ID_VAL_WHATKIND) +[ + AutoUpdate = FALSE, + FastCall = FALSE, + ReadOnlyDoc = TRUE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + + AccelConfig = FALSE, + MenuConfig = FALSE, + ToolBoxConfig = FALSE, + GroupId = SfxGroupId::Drawing; +] + SfxBoolItem GlueEditMode SID_GLUE_EDITMODE [ @@ -1623,6 +1780,57 @@ SfxBoolItem GlueVertAlignTop SID_GLUE_VERTALIGN_TOP GroupId = SfxGroupId::Drawing; ] +SfxVoidItem Gradient SID_GRADIENT +(SfxStringItem Name ID_VAL_INDEX,SfxUInt32Item Style ID_VAL_STYLE,SfxUInt32Item Angle ID_VAL_ANGLE,SfxUInt32Item Border ID_VAL_BORDER,SfxUInt32Item XOffset ID_VAL_CENTER_X,SfxUInt32Item YOffset ID_VAL_CENTER_Y,SfxUInt32Item StartIntens ID_VAL_STARTINTENS,SfxUInt32Item EndIntens ID_VAL_ENDINTENS) +[ + AutoUpdate = FALSE, + FastCall = FALSE, + ReadOnlyDoc = FALSE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + + AccelConfig = FALSE, + MenuConfig = FALSE, + ToolBoxConfig = FALSE, + GroupId = SfxGroupId::Drawing; +] + +SfxVoidItem GradientEndColor SID_SETGRADENDCOLOR +(SfxStringItem Name ID_VAL_INDEX,SfxUInt32Item Red ID_VAL_RED,SfxUInt32Item Green ID_VAL_GREEN,SfxUInt32Item Blue ID_VAL_BLUE) +[ + AutoUpdate = FALSE, + FastCall = FALSE, + ReadOnlyDoc = FALSE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + + AccelConfig = FALSE, + MenuConfig = FALSE, + ToolBoxConfig = FALSE, + GroupId = SfxGroupId::Format; +] + +SfxVoidItem GradientStartColor SID_SETGRADSTARTCOLOR +(SfxStringItem Name ID_VAL_INDEX,SfxUInt32Item Red ID_VAL_RED,SfxUInt32Item Green ID_VAL_GREEN,SfxUInt32Item Blue ID_VAL_BLUE) +[ + AutoUpdate = FALSE, + FastCall = FALSE, + ReadOnlyDoc = FALSE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + + AccelConfig = FALSE, + MenuConfig = FALSE, + ToolBoxConfig = FALSE, + GroupId = SfxGroupId::Format; +] + SfxBoolItem GridFront SID_GRID_FRONT [ @@ -1676,6 +1884,40 @@ SfxBoolItem HandoutMode SID_HANDOUT_MASTER_MODE GroupId = SfxGroupId::Document; ] +SfxVoidItem Hatch SID_HATCH +(SfxStringItem Name ID_VAL_INDEX,SfxUInt32Item Style ID_VAL_STYLE,SfxUInt32Item Distance ID_VAL_DISTANCE,SfxUInt32Item Angle ID_VAL_ANGLE) +[ + AutoUpdate = FALSE, + FastCall = FALSE, + ReadOnlyDoc = FALSE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + + AccelConfig = FALSE, + MenuConfig = FALSE, + ToolBoxConfig = FALSE, + GroupId = SfxGroupId::Drawing; +] + +SfxVoidItem HatchColor SID_SETHATCHCOLOR +(SfxStringItem Name ID_VAL_INDEX,SfxUInt32Item Red ID_VAL_RED,SfxUInt32Item Green ID_VAL_GREEN,SfxUInt32Item Blue ID_VAL_BLUE) +[ + AutoUpdate = FALSE, + FastCall = FALSE, + ReadOnlyDoc = FALSE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + + AccelConfig = FALSE, + MenuConfig = FALSE, + ToolBoxConfig = FALSE, + GroupId = SfxGroupId::Format; +] + SfxBoolItem HelplinesFront SID_HELPLINES_FRONT [ @@ -2108,6 +2350,23 @@ SfxBoolItem LeaveAllGroups SID_LEAVE_ALL_GROUPS GroupId = SfxGroupId::Modify; ] +SfxVoidItem LineColor SID_SETLINECOLOR +(SfxUInt32Item Red ID_VAL_RED,SfxUInt32Item Green ID_VAL_GREEN,SfxUInt32Item Blue ID_VAL_BLUE) +[ + AutoUpdate = FALSE, + FastCall = FALSE, + ReadOnlyDoc = FALSE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + + AccelConfig = FALSE, + MenuConfig = FALSE, + ToolBoxConfig = FALSE, + GroupId = SfxGroupId::Format; +] + SfxVoidItem LineEndPolygon SID_LINEEND_POLYGON () [ @@ -2125,6 +2384,23 @@ SfxVoidItem LineEndPolygon SID_LINEEND_POLYGON GroupId = SfxGroupId::Drawing; ] +SfxVoidItem LineTo SID_LINETO +(SfxUInt32Item MouseEndX ID_VAL_MOUSEEND_X,SfxUInt32Item MouseEndY ID_VAL_MOUSEEND_Y) +[ + AutoUpdate = FALSE, + FastCall = FALSE, + ReadOnlyDoc = FALSE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + + AccelConfig = FALSE, + MenuConfig = FALSE, + ToolBoxConfig = FALSE, + GroupId = SfxGroupId::Drawing; +] + SfxVoidItem ManageLinks SID_MANAGE_LINKS () [ @@ -2348,6 +2624,23 @@ SfxVoidItem Morphing SID_POLYGON_MORPHING GroupId = SfxGroupId::Modify; ] +SfxVoidItem MoveTo SID_MOVETO +(SfxUInt32Item MouseStartX ID_VAL_MOUSESTART_X,SfxUInt32Item MouseStartY ID_VAL_MOUSESTART_Y) +[ + AutoUpdate = FALSE, + FastCall = FALSE, + ReadOnlyDoc = FALSE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + + AccelConfig = FALSE, + MenuConfig = FALSE, + ToolBoxConfig = FALSE, + GroupId = SfxGroupId::Drawing; +] + SfxVoidItem NameGroup SID_NAME_GROUP () [ @@ -2724,6 +3017,23 @@ SfxVoidItem PageSetup SID_PAGESETUP GroupId = SfxGroupId::Options; ] +SfxVoidItem PageSize SID_PAGESIZE +(SfxUInt32Item PageWidth ID_VAL_PAGEWIDTH,SfxUInt32Item PageHeight ID_VAL_PAGEHEIGHT,SfxBoolItem ScaleObjects ID_VAL_SCALEOBJECTS) +[ + AutoUpdate = FALSE, + FastCall = FALSE, + ReadOnlyDoc = FALSE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + + AccelConfig = FALSE, + MenuConfig = FALSE, + ToolBoxConfig = FALSE, + GroupId = SfxGroupId::Application; +] + SfxUInt16Item PagesPerRow SID_PAGES_PER_ROW [ @@ -2866,6 +3176,23 @@ SfxVoidItem PresentationEnd SID_PRESENTATION_END GroupId = SfxGroupId::View; ] +SfxVoidItem ClearUndoStack SID_CLEAR_UNDO_STACK +() +[ + AutoUpdate = FALSE, + FastCall = FALSE, + ReadOnlyDoc = FALSE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + + AccelConfig = FALSE, + MenuConfig = FALSE, + ToolBoxConfig = FALSE, + GroupId = SfxGroupId::View; +] + SfxVoidItem PresentationLayout SID_PRESENTATION_LAYOUT () [ @@ -3040,6 +3367,91 @@ SvxObjectItem RulerObject SID_RULER_OBJECT GroupId = ; ] +SfxVoidItem SelectGradient SID_SELECTGRADIENT +(SfxStringItem Name ID_VAL_INDEX) +[ + AutoUpdate = FALSE, + FastCall = FALSE, + ReadOnlyDoc = TRUE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + + AccelConfig = FALSE, + MenuConfig = FALSE, + ToolBoxConfig = FALSE, + GroupId = SfxGroupId::Edit; +] + +SfxVoidItem SelectHatch SID_SELECTHATCH +(SfxStringItem Name ID_VAL_INDEX) +[ + AutoUpdate = FALSE, + FastCall = FALSE, + ReadOnlyDoc = TRUE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + + AccelConfig = FALSE, + MenuConfig = FALSE, + ToolBoxConfig = FALSE, + GroupId = SfxGroupId::Edit; +] + +SfxVoidItem SetFillStyle SID_SETFILLSTYLE +(SfxUInt32Item Style ID_VAL_STYLE) +[ + AutoUpdate = FALSE, + FastCall = FALSE, + ReadOnlyDoc = FALSE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + + AccelConfig = FALSE, + MenuConfig = FALSE, + ToolBoxConfig = FALSE, + GroupId = SfxGroupId::Format; +] + +SfxVoidItem SetLineStyle SID_SETLINESTYLE +(SfxUInt32Item Style ID_VAL_STYLE) +[ + AutoUpdate = FALSE, + FastCall = FALSE, + ReadOnlyDoc = FALSE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + + AccelConfig = FALSE, + MenuConfig = FALSE, + ToolBoxConfig = FALSE, + GroupId = SfxGroupId::Format; +] + +SfxVoidItem SetLineWidth SID_SETLINEWIDTH +(SfxUInt32Item Width ID_VAL_WIDTH) +[ + AutoUpdate = FALSE, + FastCall = FALSE, + ReadOnlyDoc = FALSE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + + AccelConfig = FALSE, + MenuConfig = FALSE, + ToolBoxConfig = FALSE, + GroupId = SfxGroupId::Format; +] + SfxStringItem SetSnapItem SID_SET_SNAPITEM [ @@ -3712,6 +4124,108 @@ SfxVoidItem DistributeRows SID_TABLE_DISTRIBUTE_ROWS GroupId = SfxGroupId::Table; ] +SfxVoidItem TaskPaneApplyToAllSlides SID_TP_APPLY_TO_ALL_SLIDES +[ + AutoUpdate = TRUE, + FastCall = FALSE, + ReadOnlyDoc = FALSE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + + + AccelConfig = FALSE, + MenuConfig = FALSE, + ToolBoxConfig = FALSE, + GroupId = SfxGroupId::View; +] + +SfxVoidItem TaskPaneApplyToSelectedSlides SID_TP_APPLY_TO_SELECTED_SLIDES +[ + AutoUpdate = TRUE, + FastCall = FALSE, + ReadOnlyDoc = FALSE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + + + AccelConfig = FALSE, + MenuConfig = FALSE, + ToolBoxConfig = FALSE, + GroupId = SfxGroupId::View; +] + +SfxVoidItem TaskPaneUseForNewPresentations SID_TP_USE_FOR_NEW_PRESENTATIONS +[ + AutoUpdate = TRUE, + FastCall = FALSE, + ReadOnlyDoc = FALSE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + + + AccelConfig = FALSE, + MenuConfig = FALSE, + ToolBoxConfig = FALSE, + GroupId = SfxGroupId::View; +] + +SfxVoidItem TaskPaneShowSmallPreview SID_TP_SHOW_SMALL_PREVIEW +[ + AutoUpdate = TRUE, + FastCall = FALSE, + ReadOnlyDoc = FALSE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + + + AccelConfig = FALSE, + MenuConfig = FALSE, + ToolBoxConfig = FALSE, + GroupId = SfxGroupId::View; +] + +SfxVoidItem TaskPaneShowLargePreview SID_TP_SHOW_LARGE_PREVIEW +[ + AutoUpdate = TRUE, + FastCall = FALSE, + ReadOnlyDoc = FALSE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + + + AccelConfig = FALSE, + MenuConfig = FALSE, + ToolBoxConfig = FALSE, + GroupId = SfxGroupId::View; +] + +SfxVoidItem TaskPaneEditMaster SID_TP_EDIT_MASTER +[ + AutoUpdate = TRUE, + FastCall = FALSE, + ReadOnlyDoc = FALSE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + + + AccelConfig = FALSE, + MenuConfig = FALSE, + ToolBoxConfig = FALSE, + GroupId = SfxGroupId::View; +] + SfxVoidItem TaskPaneInsertPage SID_INSERTPAGE_LAYOUT_MENU [ AutoUpdate = FALSE, @@ -3729,6 +4243,27 @@ SfxVoidItem TaskPaneInsertPage SID_INSERTPAGE_LAYOUT_MENU GroupId = SfxGroupId::Insert; ] +/** This item holds the requested type of view shell when calling the + SID_SWITCH_SHELL slot. +*/ +SfxInt32Item SwitchViewShell SID_SWITCH_SHELL +[ + AutoUpdate = FALSE, + FastCall = FALSE, + ReadOnlyDoc = TRUE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + Asynchron; + + + AccelConfig = FALSE, + MenuConfig = FALSE, + ToolBoxConfig = FALSE, + GroupId = SfxGroupId::View; +] + SfxBoolItem LeftPaneImpress SID_LEFT_PANE_IMPRESS [ @@ -3767,6 +4302,25 @@ SfxBoolItem LeftPaneDraw SID_LEFT_PANE_DRAW GroupId = SfxGroupId::Modify; ] +SfxVoidItem NotesChildWindow SID_NOTES_WINDOW + +[ + AutoUpdate = TRUE, + FastCall = FALSE, + ReadOnlyDoc = FALSE, + Toggle = FALSE, + Container = TRUE, + RecordAbsolute = FALSE, + RecordPerSet; + Asynchron; + + + AccelConfig = FALSE, + MenuConfig = FALSE, + ToolBoxConfig = FALSE, + GroupId = SfxGroupId::View; +] + SfxBoolItem NormalMultiPaneGUI SID_NORMAL_MULTI_PANE_GUI [ diff --git a/sd/source/ui/view/GraphicViewShellBase.cxx b/sd/source/ui/view/GraphicViewShellBase.cxx index a9522e43de4f..300b0bdbf669 100644 --- a/sd/source/ui/view/GraphicViewShellBase.cxx +++ b/sd/source/ui/view/GraphicViewShellBase.cxx @@ -70,6 +70,7 @@ void GraphicViewShellBase::Execute (SfxRequest& rRequest) switch (nSlotId) { + case SID_NOTES_WINDOW: case SID_SLIDE_SORTER_MULTI_PANE_GUI: case SID_SLIDE_SORTER_MODE: case SID_SLIDE_MASTER_MODE: @@ -81,6 +82,7 @@ void GraphicViewShellBase::Execute (SfxRequest& rRequest) rRequest.Cancel(); break; + case SID_SWITCH_SHELL: case SID_LEFT_PANE_DRAW: case SID_LEFT_PANE_IMPRESS: default: diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index 3eae7a0bd194..99dca2efed88 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -614,6 +614,19 @@ void ViewShellBase::Execute (SfxRequest& rRequest) switch (nSlotId) { + case SID_SWITCH_SHELL: + { + Reference<XControllerManager> xControllerManager (GetController(), UNO_QUERY); + if (xControllerManager.is()) + { + Reference<XConfigurationController> xConfigurationController ( + xControllerManager->getConfigurationController()); + if (xConfigurationController.is()) + xConfigurationController->update(); + } + } + break; + case SID_LEFT_PANE_DRAW: mpImpl->SetPaneVisibility( rRequest, diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index fc29346f09df..4fd1a539607f 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -827,6 +827,30 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) } break; + case SID_PAGESIZE : // either this (no menu entries or something else!) + { + const SfxItemSet *pArgs = rReq.GetArgs (); + + if (pArgs) + if (pArgs->Count () == 3) + { + const SfxUInt32Item* pWidth = rReq.GetArg<SfxUInt32Item>(ID_VAL_PAGEWIDTH); + const SfxUInt32Item* pHeight = rReq.GetArg<SfxUInt32Item>(ID_VAL_PAGEHEIGHT); + const SfxBoolItem* pScaleAll = rReq.GetArg<SfxBoolItem>(ID_VAL_SCALEOBJECTS); + + Size aSize (pWidth->GetValue (), pHeight->GetValue ()); + + SetupPage (aSize, 0, 0, 0, 0, true, false, pScaleAll->GetValue ()); + rReq.Ignore (); + break; + } +#if HAVE_FEATURE_SCRIPTING + StarBASIC::FatalError (ERRCODE_BASIC_WRONG_ARGS); +#endif + rReq.Ignore (); + break; + } + case SID_PAGEMARGIN : // or this (no menu entries or something else!) { const SfxItemSet *pArgs = rReq.GetArgs (); diff --git a/sd/source/ui/view/drviews6.cxx b/sd/source/ui/view/drviews6.cxx index 3591a6280eb1..d332935e4799 100644 --- a/sd/source/ui/view/drviews6.cxx +++ b/sd/source/ui/view/drviews6.cxx @@ -136,6 +136,7 @@ void DrawViewShell::ExecAnimationWin( SfxRequest& rReq ) switch( nSId ) { + case SID_ANIMATOR_INIT: case SID_ANIMATOR_ADD: case SID_ANIMATOR_CREATE: { @@ -150,7 +151,7 @@ void DrawViewShell::ExecAnimationWin( SfxRequest& rReq ) { if( nSId == SID_ANIMATOR_ADD ) pAnimWin->AddObj( *mpDrawView ); - else // SID_ANIMATOR_CREATE + else if( nSId == SID_ANIMATOR_CREATE ) pAnimWin->CreateAnimObj( *mpDrawView ); } } diff --git a/sd/source/ui/view/drviews9.cxx b/sd/source/ui/view/drviews9.cxx index 1c037979e581..c3a55f55f031 100644 --- a/sd/source/ui/view/drviews9.cxx +++ b/sd/source/ui/view/drviews9.cxx @@ -211,6 +211,257 @@ void DrawViewShell::AttrExec (SfxRequest &rReq) switch (rReq.GetSlot ()) { + // set new fill-style + case SID_SETFILLSTYLE : + if (pArgs) + if (pArgs->Count () == 1) + { + const SfxUInt32Item* pFillStyle = rReq.GetArg<SfxUInt32Item>(ID_VAL_STYLE); + if (CHECK_RANGE (drawing::FillStyle_NONE, (drawing::FillStyle)pFillStyle->GetValue (), drawing::FillStyle_BITMAP)) + { + pAttr->ClearItem (XATTR_FILLSTYLE); + XFillStyleItem aStyleItem((drawing::FillStyle) pFillStyle->GetValue ()); + aStyleItem.SetWhich(XATTR_FILLSTYLE); + pAttr->Put (aStyleItem); + rBindings.Invalidate (SID_ATTR_FILL_STYLE); + rBindings.Invalidate (SID_ATTR_PAGE_FILLSTYLE); + } +#if HAVE_FEATURE_SCRIPTING + else StarBASIC::FatalError (ERRCODE_BASIC_BAD_PROP_VALUE); +#endif + break; + } +#if HAVE_FEATURE_SCRIPTING + StarBASIC::FatalError (ERRCODE_BASIC_WRONG_ARGS); +#endif + break; + + // determine new line style + case SID_SETLINESTYLE : + if (pArgs) + if (pArgs->Count () == 1) + { + const SfxUInt32Item* pLineStyle = rReq.GetArg<SfxUInt32Item>(ID_VAL_STYLE); + if (CHECK_RANGE ((sal_Int32)drawing::LineStyle_NONE, (sal_Int32)pLineStyle->GetValue(), (sal_Int32)drawing::LineStyle_DASH)) + { + pAttr->ClearItem (XATTR_LINESTYLE); + XLineStyleItem aStyleItem((drawing::LineStyle) pLineStyle->GetValue()); + aStyleItem.SetWhich(XATTR_LINESTYLE); + pAttr->Put(aStyleItem); + rBindings.Invalidate (SID_ATTR_LINE_STYLE); + } +#if HAVE_FEATURE_SCRIPTING + else StarBASIC::FatalError (ERRCODE_BASIC_BAD_PROP_VALUE); +#endif + break; + } +#if HAVE_FEATURE_SCRIPTING + StarBASIC::FatalError (ERRCODE_BASIC_WRONG_ARGS); +#endif + break; + + // set line width + case SID_SETLINEWIDTH : + if (pArgs) + if (pArgs->Count () == 1) + { + const SfxUInt32Item* pLineWidth = rReq.GetArg<SfxUInt32Item>(ID_VAL_WIDTH); + pAttr->ClearItem (XATTR_LINEWIDTH); + XLineWidthItem aWidthItem(pLineWidth->GetValue()); + aWidthItem.SetWhich(XATTR_LINEWIDTH); + pAttr->Put(aWidthItem); + rBindings.Invalidate (SID_ATTR_LINE_WIDTH); + break; + } +#if HAVE_FEATURE_SCRIPTING + StarBASIC::FatalError (ERRCODE_BASIC_WRONG_ARGS); +#endif + break; + + case SID_SETFILLCOLOR : + if (pArgs) + if (pArgs->Count () == 3) + { + const SfxUInt32Item* pRed = rReq.GetArg<SfxUInt32Item>(ID_VAL_RED); + const SfxUInt32Item* pGreen = rReq.GetArg<SfxUInt32Item>(ID_VAL_GREEN); + const SfxUInt32Item* pBlue = rReq.GetArg<SfxUInt32Item>(ID_VAL_BLUE); + + pAttr->ClearItem (XATTR_FILLCOLOR); + pAttr->ClearItem (XATTR_FILLSTYLE); + XFillColorItem aColorItem(-1, Color ((sal_uInt8) pRed->GetValue (), + (sal_uInt8) pGreen->GetValue (), + (sal_uInt8) pBlue->GetValue ())); + aColorItem.SetWhich(XATTR_FILLCOLOR); + pAttr->Put(aColorItem); + rBindings.Invalidate (SID_ATTR_FILL_COLOR); + rBindings.Invalidate (SID_ATTR_PAGE_COLOR); + rBindings.Invalidate (SID_ATTR_FILL_STYLE); + rBindings.Invalidate (SID_ATTR_PAGE_FILLSTYLE); + break; + } +#if HAVE_FEATURE_SCRIPTING + StarBASIC::FatalError (ERRCODE_BASIC_WRONG_ARGS); +#endif + break; + + case SID_SETLINECOLOR : + if (pArgs) + if (pArgs->Count () == 3) + { + const SfxUInt32Item* pRed = rReq.GetArg<SfxUInt32Item>(ID_VAL_RED); + const SfxUInt32Item* pGreen = rReq.GetArg<SfxUInt32Item>(ID_VAL_GREEN); + const SfxUInt32Item* pBlue = rReq.GetArg<SfxUInt32Item>(ID_VAL_BLUE); + + pAttr->ClearItem (XATTR_LINECOLOR); + XLineColorItem aColorItem(-1, Color((sal_uInt8) pRed->GetValue(), + (sal_uInt8) pGreen->GetValue(), + (sal_uInt8) pBlue->GetValue())); + aColorItem.SetWhich(XATTR_LINECOLOR); + pAttr->Put(aColorItem); + rBindings.Invalidate (SID_ATTR_LINE_COLOR); + break; + } +#if HAVE_FEATURE_SCRIPTING + StarBASIC::FatalError (ERRCODE_BASIC_WRONG_ARGS); +#endif + break; + + case SID_SETGRADSTARTCOLOR : + case SID_SETGRADENDCOLOR : + if (pArgs) + if (pArgs->Count () == 4) + { + const SfxStringItem* pName = rReq.GetArg<SfxStringItem>(ID_VAL_INDEX); + const SfxUInt32Item* pRed = rReq.GetArg<SfxUInt32Item>(ID_VAL_RED); + const SfxUInt32Item* pGreen = rReq.GetArg<SfxUInt32Item>(ID_VAL_GREEN); + const SfxUInt32Item* pBlue = rReq.GetArg<SfxUInt32Item>(ID_VAL_BLUE); + + XGradientListRef pGradientList = GetDoc()->GetGradientList (); + long nCounts = pGradientList->Count (); + Color aColor ((sal_uInt8) pRed->GetValue (), + (sal_uInt8) pGreen->GetValue (), + (sal_uInt8) pBlue->GetValue ()); + long i; + + pAttr->ClearItem (XATTR_FILLGRADIENT); + pAttr->ClearItem (XATTR_FILLSTYLE); + + for ( i = 0; i < nCounts; i ++) + { + const XGradientEntry* pEntry = pGradientList->GetGradient(i); + + if (pEntry->GetName () == pName->GetValue ()) + { + XGradient aGradient(pEntry->GetGradient()); + + if (rReq.GetSlot () == SID_SETGRADSTARTCOLOR) aGradient.SetStartColor (aColor); + else aGradient.SetEndColor (aColor); + + XFillStyleItem aStyleItem(drawing::FillStyle_GRADIENT); + aStyleItem.SetWhich(XATTR_FILLSTYLE); + pAttr->Put(aStyleItem); + XFillGradientItem aGradientItem(pName->GetValue (), aGradient); + aGradientItem.SetWhich(XATTR_FILLGRADIENT); + pAttr->Put(aGradientItem); + break; + } + } + + if (i >= nCounts) + { + Color aBlack (0, 0, 0); + XGradient aGradient ((rReq.GetSlot () == SID_SETGRADSTARTCOLOR) + ? aColor + : aBlack, + (rReq.GetSlot () == SID_SETGRADENDCOLOR) + ? aColor + : aBlack); + + GetDoc()->GetGradientList()->Insert(o3tl::make_unique<XGradientEntry>(aGradient, pName->GetValue())); + + XFillStyleItem aStyleItem(drawing::FillStyle_GRADIENT); + aStyleItem.SetWhich(XATTR_FILLSTYLE); + pAttr->Put(aStyleItem); + XFillGradientItem aGradientItem(pName->GetValue(), aGradient); + aGradientItem.SetWhich(XATTR_FILLGRADIENT); + pAttr->Put(aGradientItem); + } + + rBindings.Invalidate (SID_ATTR_FILL_STYLE); + rBindings.Invalidate (SID_ATTR_PAGE_FILLSTYLE); + rBindings.Invalidate (SID_ATTR_FILL_GRADIENT); + rBindings.Invalidate (SID_ATTR_PAGE_GRADIENT); + break; + } +#if HAVE_FEATURE_SCRIPTING + StarBASIC::FatalError (ERRCODE_BASIC_WRONG_ARGS); +#endif + break; + + case SID_SETHATCHCOLOR : + if (pArgs) + if (pArgs->Count () == 4) + { + const SfxStringItem* pName = rReq.GetArg<SfxStringItem>(ID_VAL_INDEX); + const SfxUInt32Item* pRed = rReq.GetArg<SfxUInt32Item>(ID_VAL_RED); + const SfxUInt32Item* pGreen = rReq.GetArg<SfxUInt32Item>(ID_VAL_GREEN); + const SfxUInt32Item* pBlue = rReq.GetArg<SfxUInt32Item>(ID_VAL_BLUE); + + XHatchListRef pHatchList = GetDoc()->GetHatchList (); + long nCounts = pHatchList->Count (); + Color aColor ((sal_uInt8) pRed->GetValue (), + (sal_uInt8) pGreen->GetValue (), + (sal_uInt8) pBlue->GetValue ()); + long i; + + pAttr->ClearItem (XATTR_FILLHATCH); + pAttr->ClearItem (XATTR_FILLSTYLE); + + for ( i = 0; i < nCounts; i ++) + { + const XHatchEntry* pEntry = pHatchList->GetHatch(i); + + if (pEntry->GetName () == pName->GetValue ()) + { + XHatch aHatch(pEntry->GetHatch()); + + aHatch.SetColor (aColor); + + XFillStyleItem aStyleItem(drawing::FillStyle_HATCH); + aStyleItem.SetWhich(XATTR_FILLSTYLE); + pAttr->Put(aStyleItem); + XFillHatchItem aHatchItem(pName->GetValue(), aHatch); + aHatchItem.SetWhich(XATTR_FILLHATCH); + pAttr->Put(aHatchItem); + break; + } + } + + if (i >= nCounts) + { + XHatch aHatch (aColor); + + GetDoc()->GetHatchList()->Insert(o3tl::make_unique<XHatchEntry>(aHatch, pName->GetValue())); + + XFillStyleItem aStyleItem(drawing::FillStyle_HATCH); + aStyleItem.SetWhich(XATTR_FILLSTYLE); + pAttr->Put(aStyleItem); + XFillHatchItem aHatchItem(pName->GetValue (), aHatch); + aHatchItem.SetWhich(XATTR_FILLHATCH); + pAttr->Put(aHatchItem); + } + + rBindings.Invalidate (SID_ATTR_FILL_HATCH); + rBindings.Invalidate (SID_ATTR_PAGE_HATCH); + rBindings.Invalidate (SID_ATTR_FILL_STYLE); + rBindings.Invalidate (SID_ATTR_PAGE_FILLSTYLE); + break; + } +#if HAVE_FEATURE_SCRIPTING + StarBASIC::FatalError (ERRCODE_BASIC_WRONG_ARGS); +#endif + break; + // configuration for line-dash case SID_DASH : if (pArgs) @@ -265,6 +516,259 @@ void DrawViewShell::AttrExec (SfxRequest &rReq) #endif break; + // configuration for gradients + case SID_GRADIENT : + if (pArgs) + if (pArgs->Count () == 8) + { + const SfxStringItem* pName = rReq.GetArg<SfxStringItem>(ID_VAL_INDEX); + const SfxUInt32Item* pStyle = rReq.GetArg<SfxUInt32Item>(ID_VAL_STYLE); + const SfxUInt32Item* pAngle = rReq.GetArg<SfxUInt32Item>(ID_VAL_ANGLE); + const SfxUInt32Item* pBorder = rReq.GetArg<SfxUInt32Item>(ID_VAL_BORDER); + const SfxUInt32Item* pCenterX = rReq.GetArg<SfxUInt32Item>(ID_VAL_CENTER_X); + const SfxUInt32Item* pCenterY = rReq.GetArg<SfxUInt32Item>(ID_VAL_CENTER_Y); + const SfxUInt32Item* pStart = rReq.GetArg<SfxUInt32Item>(ID_VAL_STARTINTENS); + const SfxUInt32Item* pEnd = rReq.GetArg<SfxUInt32Item>(ID_VAL_ENDINTENS); + + if (CHECK_RANGE ((sal_Int32)css::awt::GradientStyle_LINEAR, (sal_Int32)pStyle->GetValue(), (sal_Int32)css::awt::GradientStyle_RECT) && + CHECK_RANGE (0, (sal_Int32)pAngle->GetValue (), 360) && + CHECK_RANGE (0, (sal_Int32)pBorder->GetValue (), 100) && + CHECK_RANGE (0, (sal_Int32)pCenterX->GetValue (), 100) && + CHECK_RANGE (0, (sal_Int32)pCenterY->GetValue (), 100) && + CHECK_RANGE (0, (sal_Int32)pStart->GetValue (), 100) && + CHECK_RANGE (0, (sal_Int32)pEnd->GetValue (), 100)) + { + pAttr->ClearItem (XATTR_FILLGRADIENT); + pAttr->ClearItem (XATTR_FILLSTYLE); + + XGradientListRef pGradientList = GetDoc()->GetGradientList (); + long nCounts = pGradientList->Count (); + long i; + + for ( i = 0; i < nCounts; i++ ) + { + const XGradientEntry* pEntry = pGradientList->GetGradient(i); + + if (pEntry->GetName () == pName->GetValue ()) + { + XGradient aGradient(pEntry->GetGradient()); + + aGradient.SetGradientStyle ((css::awt::GradientStyle) pStyle->GetValue ()); + aGradient.SetAngle (pAngle->GetValue () * 10); + aGradient.SetBorder ((short) pBorder->GetValue ()); + aGradient.SetXOffset ((short) pCenterX->GetValue ()); + aGradient.SetYOffset ((short) pCenterY->GetValue ()); + aGradient.SetStartIntens ((short) pStart->GetValue ()); + aGradient.SetEndIntens ((short) pEnd->GetValue ()); + + XFillStyleItem aStyleItem(drawing::FillStyle_GRADIENT); + aStyleItem.SetWhich(XATTR_FILLSTYLE); + pAttr->Put(aStyleItem); + XFillGradientItem aGradientItem(pName->GetValue (), aGradient); + aGradientItem.SetWhich(XATTR_FILLGRADIENT); + pAttr->Put(aGradientItem); + break; + } + } + + if (i >= nCounts) + { + Color aBlack (0, 0, 0); + XGradient aGradient (aBlack, aBlack, (css::awt::GradientStyle) pStyle->GetValue (), + pAngle->GetValue () * 10, (short) pCenterX->GetValue (), + (short) pCenterY->GetValue (), (short) pBorder->GetValue (), + (short) pStart->GetValue (), (short) pEnd->GetValue ()); + + pGradientList->Insert(o3tl::make_unique<XGradientEntry>(aGradient, pName->GetValue())); + XFillStyleItem aStyleItem(drawing::FillStyle_GRADIENT); + aStyleItem.SetWhich(XATTR_FILLSTYLE); + pAttr->Put(aStyleItem); + XFillGradientItem aGradientItem(pName->GetValue (), aGradient); + aGradientItem.SetWhich(XATTR_FILLGRADIENT); + pAttr->Put(aGradientItem); + } + + rBindings.Invalidate (SID_ATTR_FILL_GRADIENT); + rBindings.Invalidate (SID_ATTR_PAGE_GRADIENT); + rBindings.Invalidate (SID_ATTR_FILL_STYLE); + rBindings.Invalidate (SID_ATTR_PAGE_FILLSTYLE); + } +#if HAVE_FEATURE_SCRIPTING + else StarBASIC::FatalError (ERRCODE_BASIC_BAD_PROP_VALUE); +#endif + break; + } +#if HAVE_FEATURE_SCRIPTING + StarBASIC::FatalError (ERRCODE_BASIC_WRONG_ARGS); +#endif + break; + + // configuration for hatch + case SID_HATCH : + if (pArgs) + if (pArgs->Count () == 4) + { + const SfxStringItem* pName = rReq.GetArg<SfxStringItem>(ID_VAL_INDEX); + const SfxUInt32Item* pStyle = rReq.GetArg<SfxUInt32Item>(ID_VAL_STYLE); + const SfxUInt32Item* pDistance = rReq.GetArg<SfxUInt32Item>(ID_VAL_DISTANCE); + const SfxUInt32Item* pAngle = rReq.GetArg<SfxUInt32Item>(ID_VAL_ANGLE); + + if (CHECK_RANGE ((sal_Int32)css::drawing::HatchStyle_SINGLE, (sal_Int32)pStyle->GetValue(), (sal_Int32)css::drawing::HatchStyle_TRIPLE) && + CHECK_RANGE (0, (sal_Int32)pAngle->GetValue (), 360)) + { + pAttr->ClearItem (XATTR_FILLHATCH); + pAttr->ClearItem (XATTR_FILLSTYLE); + + XHatchListRef pHatchList = GetDoc()->GetHatchList (); + long nCounts = pHatchList->Count (); + long i; + + for ( i = 0; i < nCounts; i++ ) + { + const XHatchEntry* pEntry = pHatchList->GetHatch(i); + + if (pEntry->GetName () == pName->GetValue ()) + { + XHatch aHatch(pEntry->GetHatch()); + + aHatch.SetHatchStyle ((css::drawing::HatchStyle) pStyle->GetValue ()); + aHatch.SetDistance (pDistance->GetValue ()); + aHatch.SetAngle (pAngle->GetValue () * 10); + + XFillStyleItem aStyleItem(drawing::FillStyle_HATCH); + aStyleItem.SetWhich(XATTR_FILLSTYLE); + pAttr->Put(aStyleItem); + XFillHatchItem aHatchItem(pName->GetValue (), aHatch); + aHatchItem.SetWhich(XATTR_FILLHATCH); + pAttr->Put(aHatchItem); + break; + } + } + + if (i >= nCounts) + { + Color aBlack (0, 0, 0); + XHatch aHatch (aBlack, (css::drawing::HatchStyle) pStyle->GetValue (), pDistance->GetValue (), + pAngle->GetValue () * 10); + + pHatchList->Insert(o3tl::make_unique<XHatchEntry>(aHatch, pName->GetValue())); + XFillStyleItem aStyleItem(drawing::FillStyle_HATCH); + aStyleItem.SetWhich(XATTR_FILLSTYLE); + pAttr->Put(aStyleItem); + XFillHatchItem aHatchItem(pName->GetValue (), aHatch); + aHatchItem.SetWhich(XATTR_FILLHATCH); + pAttr->Put(aHatchItem); + } + + rBindings.Invalidate (SID_ATTR_FILL_HATCH); + rBindings.Invalidate (SID_ATTR_FILL_STYLE); + } +#if HAVE_FEATURE_SCRIPTING + else StarBASIC::FatalError (ERRCODE_BASIC_BAD_PROP_VALUE); +#endif + break; + } +#if HAVE_FEATURE_SCRIPTING + StarBASIC::FatalError (ERRCODE_BASIC_WRONG_ARGS); +#endif + break; + + case SID_SELECTGRADIENT : + if (pArgs) + if (pArgs->Count () == 1) + { + const SfxStringItem* pName = rReq.GetArg<SfxStringItem>(ID_VAL_INDEX); + + XGradientListRef pGradientList = GetDoc()->GetGradientList (); + long nCounts = pGradientList->Count (); + + for (long i = 0; + i < nCounts; + i ++) + { + const XGradientEntry* pEntry = pGradientList->GetGradient(i); + + if (pEntry->GetName () == pName->GetValue ()) + { + pAttr->ClearItem (XATTR_FILLGRADIENT); + pAttr->ClearItem (XATTR_FILLSTYLE); + XFillStyleItem aStyleItem(drawing::FillStyle_GRADIENT); + aStyleItem.SetWhich(XATTR_FILLSTYLE); + pAttr->Put(aStyleItem); + XFillGradientItem aGradientItem(pName->GetValue (), pEntry->GetGradient ()); + aGradientItem.SetWhich(XATTR_FILLGRADIENT); + pAttr->Put(aGradientItem); + rBindings.Invalidate (SID_ATTR_FILL_GRADIENT); + rBindings.Invalidate (SID_ATTR_PAGE_GRADIENT); + rBindings.Invalidate (SID_ATTR_FILL_STYLE); + rBindings.Invalidate (SID_ATTR_PAGE_FILLSTYLE); + break; + } + } + + break; + } +#if HAVE_FEATURE_SCRIPTING + StarBASIC::FatalError (ERRCODE_BASIC_WRONG_ARGS); +#endif + break; + + case SID_SELECTHATCH : + if (pArgs) + if (pArgs->Count () == 1) + { + const SfxStringItem* pName = rReq.GetArg<SfxStringItem>(ID_VAL_INDEX); + + XHatchListRef pHatchList = GetDoc()->GetHatchList (); + long nCounts = pHatchList->Count (); + + for (long i = 0; + i < nCounts; + i ++) + { + const XHatchEntry* pEntry = pHatchList->GetHatch(i); + + if (pEntry->GetName () == pName->GetValue ()) + { + pAttr->ClearItem (XATTR_FILLHATCH); + pAttr->ClearItem (XATTR_FILLSTYLE); + XFillStyleItem aStyleItem(drawing::FillStyle_HATCH); + aStyleItem.SetWhich(XATTR_FILLSTYLE); + pAttr->Put(aStyleItem); + XFillHatchItem aHatchItem(pName->GetValue (), pEntry->GetHatch ()); + aHatchItem.SetWhich(XATTR_FILLHATCH); + pAttr->Put(aHatchItem); + + rBindings.Invalidate (SID_ATTR_FILL_HATCH); + rBindings.Invalidate (SID_ATTR_PAGE_HATCH); + rBindings.Invalidate (SID_ATTR_FILL_STYLE); + rBindings.Invalidate (SID_ATTR_PAGE_FILLSTYLE); + break; + } + } + + break; + } +#if HAVE_FEATURE_SCRIPTING + StarBASIC::FatalError (ERRCODE_BASIC_WRONG_ARGS); +#endif + break; + + case SID_UNSELECT : + mpDrawView->UnmarkAll (); + break; + + case SID_GETRED : + if (pArgs) + if (pArgs->Count () == 1) + { + break; + } +#if HAVE_FEATURE_SCRIPTING + StarBASIC::FatalError (ERRCODE_BASIC_WRONG_ARGS); +#endif + break; + /* case SID_SETFONTFAMILYNAME : case SID_SETFONTSTYLENAME : case SID_SETFONTFAMILY : @@ -295,8 +799,105 @@ void DrawViewShell::AttrExec (SfxRequest &rReq) /** * Edit macros for attribute configuration */ -void DrawViewShell::AttrState (SfxItemSet& /*rSet*/) +void DrawViewShell::AttrState (SfxItemSet& rSet) { + SfxWhichIter aIter (rSet); + sal_uInt16 nWhich = aIter.FirstWhich (); + SfxItemSet aAttr( GetDoc()->GetPool() ); + mpDrawView->GetAttributes( aAttr ); + + while (nWhich) + { + switch (nWhich) + { + case SID_GETFILLSTYLE : + { + const XFillStyleItem &rFillStyleItem = aAttr.Get (XATTR_FILLSTYLE); + + rSet.Put (SfxUInt32Item (nWhich, (long) rFillStyleItem.GetValue ())); + break; + } + + case SID_GETLINESTYLE : + { + const XLineStyleItem &rLineStyleItem = aAttr.Get (XATTR_LINESTYLE); + + rSet.Put (SfxUInt32Item (nWhich, (long) rLineStyleItem.GetValue ())); + break; + } + + case SID_GETLINEWIDTH : + { + const XLineWidthItem &rLineWidthItem = aAttr.Get (XATTR_LINEWIDTH); + + rSet.Put (SfxUInt32Item (nWhich, (long) rLineWidthItem.GetValue ())); + break; + } + + case SID_GETGREEN : + case SID_GETRED : + case SID_GETBLUE : + { + const SfxUInt32Item &rWhatKind = static_cast<const SfxUInt32Item &>( rSet.Get (ID_VAL_WHATKIND) ); + Color aColor; + + switch (rWhatKind.GetValue ()) + { + case 1 : + { + const XLineColorItem &rLineColorItem = aAttr.Get (XATTR_LINECOLOR); + + aColor = rLineColorItem.GetColorValue (); + break; + } + + case 2 : + { + const XFillColorItem &rFillColorItem = aAttr.Get (XATTR_FILLCOLOR); + + aColor = rFillColorItem.GetColorValue (); + break; + } + + case 3 : + case 4 : + { + const XFillGradientItem &rFillGradientItem = aAttr.Get (XATTR_FILLGRADIENT); + const XGradient &rGradient = rFillGradientItem.GetGradientValue (); + + aColor = (rWhatKind.GetValue () == 3) + ? rGradient.GetStartColor () + : rGradient.GetEndColor (); + break; + } + + case 5: + { + const XFillHatchItem &rFillHatchItem = aAttr.Get (XATTR_FILLHATCH); + const XHatch &rHatch = rFillHatchItem.GetHatchValue (); + + aColor = rHatch.GetColor (); + break; + } + + default : + ; + } + + rSet.Put (SfxUInt32Item (nWhich, (long) ((nWhich == SID_GETRED) + ? aColor.GetRed () + : (nWhich == SID_GETGREEN) + ? aColor.GetGreen () + : aColor.GetBlue ()))); + break; + } + + default : + ; + } + + nWhich = aIter.NextWhich (); + } } } // end of namespace sd diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx index 9a1cffc7a4fd..8032e66608cc 100644 --- a/sd/source/ui/view/drviewsa.cxx +++ b/sd/source/ui/view/drviewsa.cxx @@ -398,9 +398,9 @@ void DrawViewShell::CheckLineTo(SfxRequest& rReq) #ifdef DBG_UTIL if(rReq.IsAPI()) { - if(SID_BEZIERTO == rReq.GetSlot() ) + if(SID_LINETO == rReq.GetSlot() || SID_BEZIERTO == rReq.GetSlot() || SID_MOVETO == rReq.GetSlot() ) { - OSL_FAIL("DrawViewShell::CheckLineTo: slots SID_BEZIERTO no longer supported."); + OSL_FAIL("DrawViewShell::CheckLineTo: slots SID_LINETO, SID_BEZIERTO, SID_MOVETO no longer supported."); } } #endif @@ -409,7 +409,7 @@ void DrawViewShell::CheckLineTo(SfxRequest& rReq) } /** - * Change page parameter if SID_PAGEMARGIN + * Change page parameter if SID_PAGESIZE or SID_PAGEMARGIN */ void DrawViewShell::SetupPage (Size const &rSize, long nLeft, diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx index 5f0aa45bc91e..517417adda4c 100644 --- a/sd/source/ui/view/drviewse.cxx +++ b/sd/source/ui/view/drviewse.cxx @@ -710,6 +710,13 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) switch ( nSId ) { + case SID_CLEAR_UNDO_STACK: + { + GetDocSh()->ClearUndoBuffer(); + rReq.Ignore (); + } + break; + case SID_PRESENTATION: case SID_PRESENTATION_CURRENT_SLIDE: case SID_REHEARSE_TIMINGS: |