diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2017-09-17 23:35:55 +0300 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2017-09-24 15:37:28 +0300 |
| commit | e867b197540cfc8b75bb1108c8bcd7a0ff65d347 (patch) | |
| tree | 8dbcdc2d2db4b9f3fb0e302b5d8031386a75c346 /sc | |
| parent | 8bd418a6b8253a9d725981743a0375e2c8bb911e (diff) | |
tdf#106762 Base SvxColorToolBoxControl on svt::PopupWindowController
This allows us to support tearoff without breaking gtk3/wayland.
SvxColorWindow no longer inherits from FloatingWindow, so several
call sites need also to be changed to use DockingManager.
Change-Id: I5d0bc611bbd2a8b9bfd4335212d0ae7e8fc10593
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/app/scdll.cxx | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx index f857c6593888..6d557f7a2d0b 100644 --- a/sc/source/ui/app/scdll.cxx +++ b/sc/source/ui/app/scdll.cxx @@ -157,13 +157,7 @@ void ScDLL::Init() SvxFillToolBoxControl ::RegisterControl(0, pMod); SvxLineStyleToolBoxControl ::RegisterControl(0, pMod); SvxLineWidthToolBoxControl ::RegisterControl(0, pMod); - SvxColorToolBoxControl ::RegisterControl(SID_ATTR_LINE_COLOR, pMod); - SvxColorToolBoxControl ::RegisterControl(SID_ATTR_FILL_COLOR, pMod); SvxStyleToolBoxControl ::RegisterControl(SID_STYLE_APPLY, pMod); - SvxColorToolBoxControl ::RegisterControl(SID_ATTR_CHAR_COLOR, pMod); - SvxColorToolBoxControl ::RegisterControl(SID_BACKGROUND_COLOR, pMod); - SvxColorToolBoxControl ::RegisterControl(SID_ATTR_CHAR_BACK_COLOR, pMod); - SvxColorToolBoxControl ::RegisterControl(SID_FRAME_LINECOLOR, pMod); SvxClipBoardControl ::RegisterControl(SID_PASTE, pMod ); SvxUndoRedoControl ::RegisterControl(SID_UNDO, pMod ); SvxUndoRedoControl ::RegisterControl(SID_REDO, pMod ); @@ -208,9 +202,6 @@ void ScDLL::Init() SvxPosSizeStatusBarControl ::RegisterControl(SID_ATTR_SIZE, pMod); - // CustomShape extrusion controller - SvxColorToolBoxControl::RegisterControl( SID_EXTRUSION_3D_COLOR, pMod ); - // Child Windows ScInputWindowWrapper ::RegisterChildWindow(true, pMod, SfxChildWindowFlags::TASK|SfxChildWindowFlags::FORCEDOCK); |