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 /sw | |
| 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 'sw')
| -rw-r--r-- | sw/source/uibase/app/swmodule.cxx | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/sw/source/uibase/app/swmodule.cxx b/sw/source/uibase/app/swmodule.cxx index 72af465176a9..47567ec52256 100644 --- a/sw/source/uibase/app/swmodule.cxx +++ b/sw/source/uibase/app/swmodule.cxx @@ -305,7 +305,6 @@ void SwDLL::RegisterControls() PageOrientationPopup::RegisterControl(SID_ATTR_PAGE_ORIENTATION, pMod); PageColumnPopup::RegisterControl(SID_ATTR_PAGE_COLUMN, pMod); PageSizePopup::RegisterControl(SID_ATTR_PAGE_SIZE, pMod); - SvxColorToolBoxControl::RegisterControl( SID_EXTRUSION_3D_COLOR, pMod ); SvxClipBoardControl::RegisterControl(SID_PASTE, pMod ); SvxUndoRedoControl::RegisterControl(SID_UNDO, pMod ); @@ -315,16 +314,8 @@ void SwDLL::RegisterControls() SvxFillToolBoxControl::RegisterControl(SID_ATTR_FILL_STYLE, pMod ); SvxLineStyleToolBoxControl::RegisterControl(SID_ATTR_LINE_STYLE, pMod ); SvxLineWidthToolBoxControl::RegisterControl(SID_ATTR_LINE_WIDTH, pMod ); - SvxColorToolBoxControl::RegisterControl(SID_ATTR_LINE_COLOR, pMod ); - SvxColorToolBoxControl::RegisterControl(SID_ATTR_FILL_COLOR, pMod); - SvxColorToolBoxControl::RegisterControl(SID_ATTR_CHAR_BACK_COLOR, pMod); - SvxColorToolBoxControl::RegisterControl(SID_ATTR_CHAR_COLOR, pMod ); - SvxColorToolBoxControl::RegisterControl(SID_ATTR_CHAR_COLOR2, pMod ); - SvxColorToolBoxControl::RegisterControl(SID_ATTR_CHAR_COLOR_BACKGROUND, pMod ); SvxStyleToolBoxControl::RegisterControl(SID_STYLE_APPLY, pMod ); - SvxColorToolBoxControl::RegisterControl( SID_BACKGROUND_COLOR, pMod ); - SvxColorToolBoxControl::RegisterControl(SID_FRAME_LINECOLOR, pMod ); SvxColumnsToolBoxControl::RegisterControl(FN_INSERT_FRAME_INTERACT, pMod ); SvxColumnsToolBoxControl::RegisterControl(FN_INSERT_FRAME, pMod ); |