diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2017-03-25 22:53:28 +0300 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2017-03-26 15:09:45 +0000 |
| commit | 12c6caa84a61f23df996a0396432fa4b8d5c4785 (patch) | |
| tree | 9cf31b38751281d60cd79635c2cc128a7d6053c2 /sc | |
| parent | 3bae306bcf23c4baae65b2b8a3617f0b697dfc6a (diff) | |
Kill remaining PseudoSlots usage
Change-Id: I14a820b7c0baba8d8b17d07715bf17c42c73c8fb
TODO: Remove support code from idl and sfx2 modules
Reviewed-on: https://gerrit.libreoffice.org/35718
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/sdi/drawsh.sdi | 11 | ||||
| -rw-r--r-- | sc/source/ui/app/typemap.cxx | 1 | ||||
| -rw-r--r-- | sc/source/ui/drawfunc/drawsh5.cxx | 7 |
3 files changed, 1 insertions, 18 deletions
diff --git a/sc/sdi/drawsh.sdi b/sc/sdi/drawsh.sdi index 91af5543da25..3282485b1b3d 100644 --- a/sc/sdi/drawsh.sdi +++ b/sc/sdi/drawsh.sdi @@ -116,16 +116,7 @@ interface TableDraw SID_ATTR_TRANSFORM_AUTOHEIGHT [ StateMethod = GetDrawAttrStateForIFBX; Export = FALSE; ] // ---- Ausrichtungs - Funktionen: - //! PseudoSlots gibt Aerger mit Referenz-Dialogen ??? - SID_OBJECT_ALIGN - [ - PseudoSlots = FALSE ; - Export = FALSE ; - ExecMethod = ExecDrawFunc ; - StateMethod = GetDrawFuncState ; - GroupId = GID_FORMAT ; - ToolBoxConfig ; - ] + SID_OBJECT_ALIGN [ StateMethod = GetDrawFuncState; Export = FALSE; ] SID_OBJECT_ALIGN_LEFT [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] SID_OBJECT_ALIGN_CENTER [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] SID_OBJECT_ALIGN_RIGHT [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] diff --git a/sc/source/ui/app/typemap.cxx b/sc/source/ui/app/typemap.cxx index 18660b9c87f2..684f4cc622b0 100644 --- a/sc/source/ui/app/typemap.cxx +++ b/sc/source/ui/app/typemap.cxx @@ -100,7 +100,6 @@ #include <svx/sdprcitm.hxx> #include <svx/sdmetitm.hxx> -#define SvxDrawAlignItem SfxAllEnumItem #define avmedia_MediaItem ::avmedia::MediaItem #ifdef DISABLE_DYNLOADING diff --git a/sc/source/ui/drawfunc/drawsh5.cxx b/sc/source/ui/drawfunc/drawsh5.cxx index 062a58a075ec..f862452dcb0a 100644 --- a/sc/source/ui/drawfunc/drawsh5.cxx +++ b/sc/source/ui/drawfunc/drawsh5.cxx @@ -241,15 +241,8 @@ void ScDrawShell::ExecDrawFunc( SfxRequest& rReq ) SfxBindings& rBindings = pViewData->GetBindings(); ScTabView* pTabView = pViewData->GetView(); ScDrawView* pView = pTabView->GetScDrawView(); - const SfxItemSet *pArgs = rReq.GetArgs(); sal_uInt16 nSlotId = rReq.GetSlot(); - //!!! - // wer weiss, wie lange das funktioniert? (->vom Abreisscontrol funktioniert es) - - if (nSlotId == SID_OBJECT_ALIGN && pArgs) - nSlotId = SID_OBJECT_ALIGN + static_cast<const SfxEnumItemInterface&>(pArgs->Get(SID_OBJECT_ALIGN)).GetEnumValue() + 1; - switch (nSlotId) { case SID_OBJECT_HEAVEN: |