New branch 'private/s.mehrbrodt/colorpicker-backport' available with the
following commits:
commit 4b5d7b638dbbef50da258ef6f00c06596fba5f91
Author: Caolán McNamara <[email protected]>
Date: Fri Oct 28 13:37:33 2016 +0100
unify color selectors
Note: this removes the use of auto-color from writer's asian text grid,
because
its always invisible as far as I can see in practice.
(cherry picked from commit 43bc3031483d172eccd72c3804e2d4fc2ef37de4)
Conflicts:
chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx
chart2/source/controller/inc/dlg_View3D.hxx
cui/source/inc/border.hxx
cui/source/inc/chardlg.hxx
cui/source/inc/cuitabarea.hxx
cui/source/inc/cuitabline.hxx
cui/source/inc/numpages.hxx
cui/source/options/optcolor.cxx
cui/source/tabpages/border.cxx
cui/source/tabpages/borderconn.cxx
cui/source/tabpages/chardlg.cxx
cui/source/tabpages/numpages.cxx
cui/source/tabpages/tpgradnt.cxx
cui/source/tabpages/tphatch.cxx
cui/source/tabpages/tpline.cxx
cui/source/tabpages/tppattern.cxx
cui/source/tabpages/tpshadow.cxx
cui/uiconfig/ui/gradientpage.ui
cui/uiconfig/ui/hatchpage.ui
cui/uiconfig/ui/patterntabpage.ui
include/sfx2/controlwrapper.hxx
include/svx/PaletteManager.hxx
include/svx/colorwindow.hxx
include/svx/float3d.hxx
include/svx/fontwork.hxx
include/svx/sidebar/AreaPropertyPanelBase.hxx
include/svx/svxids.hrc
include/svx/tbcontrl.hxx
sc/source/ui/condformat/colorformat.cxx
sc/source/ui/condformat/condformatdlgentry.cxx
sc/source/ui/dbgui/scendlg.cxx
sc/source/ui/inc/scendlg.hxx
sc/source/ui/optdlg/opredlin.cxx
sc/source/ui/optdlg/tpview.cxx
sc/uiconfig/scalc/ui/conditionalentry.ui
sd/inc/sdabstdlg.hxx
sd/qa/unit/dialogs-test.cxx
sd/source/ui/animations/CustomAnimationDialog.cxx
sd/source/ui/dlg/copydlg.cxx
sd/source/ui/dlg/sddlgfact.cxx
sd/source/ui/dlg/sddlgfact.hxx
sd/source/ui/func/fucopy.cxx
sd/source/ui/inc/copydlg.hxx
sd/source/ui/sidebar/SlideBackground.cxx
sd/source/ui/sidebar/SlideBackground.hxx
sd/uiconfig/simpress/ui/sidebarslidebackground.ui
svtools/source/control/ctrlbox.cxx
svx/source/dialog/bmpmask.hrc
svx/source/dialog/bmpmask.src
svx/source/dialog/fontwork.cxx
svx/source/engine3d/float3d.cxx
svx/source/sidebar/area/AreaPropertyPanelBase.cxx
svx/source/sidebar/shadow/ShadowPropertyPanel.cxx
svx/source/sidebar/shadow/ShadowPropertyPanel.hxx
svx/source/tbxctrls/PaletteManager.cxx
svx/source/tbxctrls/tbcontrl.cxx
svx/uiconfig/ui/sidebararea.ui
sw/source/ui/config/optpage.cxx
sw/source/ui/frmdlg/column.cxx
sw/source/ui/misc/pgfnote.cxx
sw/source/ui/misc/pggrid.cxx
sw/source/uibase/inc/column.hxx
sw/source/uibase/inc/optpage.hxx
sw/source/uibase/inc/pgfnote.hxx
sw/source/uibase/inc/pggrid.hxx
sw/source/uibase/sidebar/PageStylesPanel.cxx
sw/source/uibase/sidebar/PageStylesPanel.hxx
sw/uiconfig/swriter/ui/optredlinepage.ui
sw/uiconfig/swriter/ui/pagestylespanel.ui
Change-Id: Ie850790d740a4d56c43015e493e093678cef3b4e
commit 41baac3bb550e78fed9cb0014d957a4477146a46
Author: Samuel Mehrbrodt <[email protected]>
Date: Mon Jun 25 12:24:00 2018 +0200
let menu button launch arbitrary floating windows
and not just menus, this is like how the gtk equivalent can launch popovers
(cherry picked from commit 4b7435e31ac821d1738eda23a6688461efcbd311)
Change-Id: I53ae96aab0c51d75405dba15ab8080d7315471e3
commit aa09d3e5b7843d5f0d05ff8f048275f65e690dda
Author: Samuel Mehrbrodt <[email protected]>
Date: Mon Jun 25 07:50:01 2018 +0200
rename SvxColorWindow_Impl to SvxColorWindow
(cherry picked from commit 4778444d20e5396d012164603018fa968331e012)
Change-Id: I84941f4566792e11a9070f8623857a3fac44591d
commit cdef92ae11cb2f35572c942ef3ff0742fdd21dc0
Author: Samuel Mehrbrodt <[email protected]>
Date: Wed Jun 20 11:39:02 2018 +0200
Split some stuff from ToolbarMenu to a base class
i.e. implement "todo: move to new base class that will replace
SfxPopupWindow"
Change-Id: I1b300e1e0c6423bf27d9dae7d75703b988afb154
_______________________________________________
Libreoffice-commits mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
