diff options
| author | Gulsah Kose <gulsah.1004@gmail.com> | 2015-12-09 23:22:25 +0200 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2015-12-30 22:58:10 +0200 |
| commit | 5fe01e8b69e40b1acc60b6068aa39cdf625e3ce4 (patch) | |
| tree | 2ea0bc179b5b2b5d2aab48a71a36c8d0b1e2a529 /sd/source | |
| parent | 6c2a9102eeb4d3de6a64780eb2b97415b15ce4a9 (diff) | |
tdf#89540 Completed show draw functions button for impress and draw.
v2: failed commit.
v3: Solved slot defination and dimmed button problem.
v4: Tried to find slot execution method.
v5: Added a control for draw toolbar name in impress and draw
v6: Toolbar name control is changed for checking request only impress and draw.
v7: Overrided initialize method of base class.
v8: Control provided with module name.
v9: Cleaned unnecessary included headers
v10: Removed m_sModuleName defination and reused base class' m_sModuleName variable.
Added white space before header files. Moved control into the initialize method.
Control is changed as only controls impress or draw.
Change-Id: I781783a72954af1f16212b981356db472ed48739
Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com>
Diffstat (limited to 'sd/source')
| -rw-r--r-- | sd/source/core/typemap.cxx | 3 | ||||
| -rw-r--r-- | sd/source/ui/app/sddll.cxx | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/sd/source/core/typemap.cxx b/sd/source/core/typemap.cxx index 65f7cf0ca540..65898a212d79 100644 --- a/sd/source/core/typemap.cxx +++ b/sd/source/core/typemap.cxx @@ -84,6 +84,7 @@ #include <svx/xftshxy.hxx> #include <avmedia/mediaitem.hxx> #include <svx/drawitem.hxx> +#include <svl/aeitem.hxx> // #UndoRedo# #include <svl/slstitm.hxx> @@ -103,6 +104,8 @@ #include <svx/galleryitem.hxx> #define SFX_TYPEMAP +#define SvxDrawToolItem SfxAllEnumItem #include "sdslots.hxx" + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/app/sddll.cxx b/sd/source/ui/app/sddll.cxx index 9fe114879a28..8291d1a44406 100644 --- a/sd/source/ui/app/sddll.cxx +++ b/sd/source/ui/app/sddll.cxx @@ -87,6 +87,7 @@ #include <svx/xmlsecctrl.hxx> #include <svx/zoomctrl.hxx> #include <svx/zoomsliderctrl.hxx> +#include <svx/tbxctl.hxx> #include <sfx2/docfilt.hxx> #include <sfx2/docfile.hxx> #include <sfx2/fcontnr.hxx> @@ -244,6 +245,7 @@ void SdDLL::RegisterControllers() SvxFrameLineStyleToolBoxControl::RegisterControl(SID_FRAME_LINESTYLE, pMod ); SvxColorToolBoxControl::RegisterControl(SID_FRAME_LINECOLOR, pMod ); SvxFrameToolBoxControl::RegisterControl(SID_ATTR_BORDER, pMod ); + SvxTbxCtlDraw::RegisterControl(SID_INSERT_DRAW, pMod ); } void SdDLL::Init() |