From e867b197540cfc8b75bb1108c8bcd7a0ff65d347 Mon Sep 17 00:00:00 2001 From: Maxim Monastirsky Date: Sun, 17 Sep 2017 23:35:55 +0300 Subject: 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 --- sc/source/ui/app/scdll.cxx | 9 --------- 1 file changed, 9 deletions(-) (limited to 'sc/source/ui/app/scdll.cxx') 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); -- cgit