Skip to content

C
core
Kaydet (Commit) de6ccf06 authored tarafından Noel Grandin's avatar Noel Grandin
Dosyalara gözat
Seçenekler

Revert "unused SID command in sd" 

This reverts commit 46db544b.

Change-Id: I8eed13269000a7fc4c52c1695e36df8607b470ac
Reviewed-on: https://gerrit.libreoffice.org/46965Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 26be5f21
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 228 additions and 11 deletions
sd/inc/app.hrc
Dosyayı görüntüle @ de6ccf06
......@@ -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)
......
sd/sdi/ViewShellBase.sdi
Dosyayı görüntüle @ de6ccf06
......@@ -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;
......
sd/sdi/_drvwsh.sdi
Dosyayı görüntüle @ de6ccf06
......@@ -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 ;
......@@ -1798,12 +1813,120 @@ 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 ;
......
sd/sdi/drviewsh.sdi
Dosyayı görüntüle @ de6ccf06
......@@ -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 ;
......
sd/sdi/sdraw.sdi
Dosyayı görüntüle @ de6ccf06
This diff is collapsed.
sd/source/ui/view/GraphicViewShellBase.cxx
Dosyayı görüntüle @ de6ccf06
......@@ -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:
......
sd/source/ui/view/ViewShellBase.cxx
Dosyayı görüntüle @ de6ccf06
......@@ -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,
......
sd/source/ui/view/drviews2.cxx
Dosyayı görüntüle @ de6ccf06
......@@ -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 ();
......
sd/source/ui/view/drviews6.cxx
Dosyayı görüntüle @ de6ccf06
......@@ -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 );
}
}
......
sd/source/ui/view/drviews9.cxx
Dosyayı görüntüle @ de6ccf06
This diff is collapsed.
sd/source/ui/view/drviewsa.cxx
Dosyayı görüntüle @ de6ccf06
......@@ -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,
......
sd/source/ui/view/drviewse.cxx
Dosyayı görüntüle @ de6ccf06
......@@ -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:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment