(cherry picked from commit d465ec90)

Change-Id: Icb5389074faf5cf7d1b03f1203f0036f2eccb73a

context handling.

(cherry picked from commit 542f0ff0)

Conflicts:
	sfx2/inc/sfx2/sidebar/EnumContext.hxx

Change-Id: Ib88f75d3dfdba5c14c2d3c747e90eecd00e6f249

and fixed overlapping icons and metric fields.

(cherry picked from commit 83589233)

Change-Id: I21a78328bf11f7368ba97fc47b72f247e7316706

regarding the text edit mode for Drawing objects - take two

(cherry picked from commit 3dd1e0f8)

Conflicts:
	sc/source/ui/inc/drawview.hxx
	sc/source/ui/view/drawview.cxx

Change-Id: Icfe16b76fc4fcc838133d8410736877703e5c23b

(cherry picked from commit bbd95678)

Change-Id: Iea83e8778b293fc78e3aa7a0bd34e940e54755d7

to make font selection box wider.

(cherry picked from commit 4484a62e)

Change-Id: I4a189c106b497da36e3ad0d13a8e6087b95e73c2

(cherry picked from commit aae247a3)

Conflicts:
	sfx2/inc/sfx2/sidebar/SidebarChildWindow.hxx
	sfx2/inc/sfx2/sidebar/Theme.hxx
	sfx2/source/sidebar/SidebarChildWindow.cxx
	sfx2/source/sidebar/SidebarController.cxx
	sfx2/source/sidebar/SidebarDockingWindow.cxx

Change-Id: Ib59132d6d5e177d5a02ee24973b0fb07114db60a

regarding the text edit mode for Drawing objects

(cherry picked from commit a0e76afb)

Change-Id: I8b4e5cbd865455ef3d7046f9d65c5dd68a53d8ce

ParaPropertyPanel

(cherry picked from commit 8808ad84)

Conflicts:
	icon-themes/galaxy/svx/res/symphony/AlignTextCenter_16x16.png
	icon-themes/galaxy/svx/res/symphony/AlignTextJustified_16x16.png
	icon-themes/galaxy/svx/res/symphony/AlignTextLeft_16x16.png
	icon-themes/galaxy/svx/res/symphony/AlignTextRight_16x16.png
	icon-themes/galaxy/svx/res/symphony/Indent_16x16.png
	icon-themes/galaxy/svx/res/symphony/Outdent_16x16.png
	icon-themes/galaxy/svx/res/symphony/para_vert01.png
	icon-themes/galaxy/svx/res/symphony/para_vert02.png
	icon-themes/galaxy/svx/res/symphony/para_vert03.png
	icon-themes/galaxy/svx/res/symphony/para_verth01.png
	icon-themes/galaxy/svx/res/symphony/para_verth02.png
	icon-themes/galaxy/svx/res/symphony/para_verth03.png
	icon-themes/galaxy/svx/res/symphony/rte_Indent_16x16.png
	icon-themes/galaxy/svx/res/symphony/rte_Outdent_16x16.png

Change-Id: Idedcbb16b99a0fa7126d4e095e13e4f3a1f3f013

Fix build breaker: declare missing member variable

(cherry picked from commit eb15aa36)

Change-Id: Ie53ff7cea8874048fe575003a0ae4ded25b6535b

Fix build breaker: remove missing images

(cherry picked from commit 2f116e91)

Change-Id: I6130c7b55b03b3962ec72f49d48084324dfdc3df

(cherry picked from commit 7a309ee2)

Conflicts:
	icon-themes/galaxy/sc/res/sidebar/123.png
	icon-themes/galaxy/sc/res/sidebar/ABC.png
	icon-themes/galaxy/sc/res/sidebar/canlendar.png
	icon-themes/galaxy/sc/res/sidebar/money.png
	icon-themes/galaxy/sc/res/sidebar/percent.png

Change-Id: I69c6c9b6f6cf887332186b68ca4b9e8775575855

(cherry picked from commit ae86d303)

Change-Id: I4879d515f45f74b25e0319d3244c5722a449c7ed

inside sidebar for consistency

(cherry picked from commit 6818706a)

Conflicts:
	svx/source/sidebar/paragraph/ParaPropertyPanel.cxx

Change-Id: Ida87df66cd35066415a83e369008a4b1e20ab171

for opening Character Font dialog for Text property panel in Calc

(cherry picked from commit 2ec379f0)

Change-Id: I07e7affe744efe151c8701e096fde01a52c2d7e0

according given panel configurations

(cherry picked from commit c4a3b967)

Change-Id: Ib2b3161c70112032659e712556641a46f43edcd0

correct enable/disable of indentation increase/decrease controls

(cherry picked from commit cc9eaeaa)

Change-Id: Ia7c676435859027f0526d6253db771e2359bb7cc

(cherry picked from commit 81e9ede3)

Conflicts:
	sd/source/ui/view/drviews2.cxx

Change-Id: I5ce51fce89e8f29d2f469bf11c5ba6f075f690f2

(cherry picked from commit 81203126)

Conflicts:
	sc/source/ui/drawfunc/drawsh2.cxx

Change-Id: I19b1b7e83f16b618ecac95f000c15a60288ce5ae

adapted control positioning in PosSizePanel

(cherry picked from commit 76e55d0f)

Conflicts:
	svx/source/sidebar/area/AreaPropertyPanel.cxx
	svx/source/sidebar/area/AreaPropertyPanel.hxx

Change-Id: I5762c5208259ca071decebcc937bfaab8e0464b2

i.e. the paragraph property panel's bullet and numbering popup control

(cherry picked from commit 167f0536)

Conflicts:
	svx/source/sidebar/paragraph/ParaBulletsControl.cxx
	svx/source/sidebar/paragraph/ParaNumberingControl.cxx
	svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
	svx/source/sidebar/paragraph/ParaPropertyPanel.hrc

Change-Id: Iacea3f063d1050f873cff443fb3e1df4b8983279

(cherry picked from commit 573490c7)

Conflicts:
	sd/source/ui/sidebar/LayoutMenu.cxx

Change-Id: Ie5c0a1e15ea8db2d2b033efb1234492bd438658d

Related: #i122093# WaE in DrawController::BroadcastContextChenge()

(cherry picked from commit 26e4fcdb)

Change-Id: I416215077643f3eb4d43eb761e457d0893bcc429

(cherry picked from commit 80b53edb)

Change-Id: Ic9aafce182b96aa44956d9ddbf165f4cc736e41b

- show correct state in popups
- aggregate multiple attribute changes into one undo action

(cherry picked from commit 306b1c56)

Conflicts:
	sw/source/ui/sidebar/PagePropertyPanel.cxx
	sw/source/ui/uiview/viewtab.cxx

Change-Id: I4764be46535fe7a00cbb296c06094e3f8ea461df

(cherry picked from commit 0ba322a2)

Change-Id: I208297d67bdb9e0277b39c0dc78b777f5eb2a7fa

to use pState with more care

(cherry picked from commit 12df8f6d)

Conflicts:
	svx/source/sidebar/line/LinePropertyPanel.cxx

Change-Id: I380a4f9f8e43340ee03a1cd10546367b6818f74e

(cherry picked from commit 4b7c52c4)

Change-Id: I5e8ad1db7a962f002beb1b976d85a29bfcb5403f

look like the subscript button.

(cherry picked from commit eac056c4)

Change-Id: I1ba1a609954cd88aa38f76c8e329f35152951ae5

(cherry picked from commit dc36f823)

Conflicts:
	sfx2/inc/sfx2/sidebar/EnumContext.hxx

Change-Id: I230b6dd3a68d2a17d0433f7919e74f1fcfae8d01

(cherry picked from commit 52450684)

Conflicts:
	icon-themes/galaxy/svx/res/symphony/FlipHorizontally_16x16.png
	icon-themes/galaxy/svx/res/symphony/FlipVertically_16x16.png

Change-Id: I99e3d3b9e7046ee0de60075f49dc47f086e17dcc

better defaults and better preview visualizations

(cherry picked from commit 35c9acfc)

Conflicts:
	officecfg/registry/schema/org/openoffice/Office/Common.xcs
	svtools/inc/svtools/accessibilityoptions.hxx
	svtools/inc/svtools/valueset.hxx
	svtools/source/config/accessibilityoptions.cxx
	svtools/source/control/ctrlbox.cxx
	svtools/source/control/valueset.cxx
	svtools/source/inc/configitems/accessibilityoptions_const.hxx
	svx/inc/svx/dlgctrl.hxx
	svx/inc/svx/xtable.hxx
	svx/source/dialog/dlgctrl.cxx
	svx/source/tbxctrls/SvxColorValueSet.cxx
	svx/source/xoutdev/xtabdash.cxx
	svx/source/xoutdev/xtable.cxx
	vcl/inc/ilstbox.hxx
	vcl/inc/vcl/combobox.hxx
	vcl/inc/vcl/lstbox.hxx
	vcl/inc/vcl/settings.hxx
	vcl/source/app/settings.cxx
	vcl/source/control/combobox.cxx
	vcl/source/control/ilstbox.cxx
	vcl/source/control/lstbox.cxx

Change-Id: I905b6814cb796a35aa23fedb9ce716f77e2bfda0

In order to avoid problems in SFX2

(cherry picked from commit 61ed9eac)

Change-Id: I375603a28e788ce9257be308dc09a589240d0e58

(cherry picked from commit e271ee33)

Change-Id: I2079c019575c32bca0323515e51ec166c36ef94e

(cherry picked from commit 8d956f9e)

Change-Id: If87b0dd13d1d333212d41f0a1e1122e4ef6c5ab2

Converted TextPropertyPanel to use this new functionality.

(cherry picked from commit 5e32abe4)

Conflicts:
	officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
	sfx2/inc/sfx2/sidebar/ControllerItem.hxx
	sfx2/source/sidebar/ControllerItem.cxx
	sfx2/source/sidebar/FocusManager.cxx
	sfx2/source/sidebar/SidebarChildWindow.cxx
	svx/Library_svx.mk
	svx/source/sidebar/text/TextPropertyPanel.cxx
	svx/source/sidebar/text/TextPropertyPanel.hrc
	svx/source/sidebar/text/TextPropertyPanel.hxx
	svx/source/sidebar/text/TextPropertyPanel.src
	svx/source/sidebar/text/TextUnderlineControl.hxx

Change-Id: I3a25bb0a02e6165ceeb6dbd9e6ecd3e94051f594

correct uno:FlipHorizontal and uno:FlipVertical

(cherry picked from commit 1ea8067f)

Conflicts:
	default_images/res/commandimagelist/lc_fliphorizontal.png
	default_images/res/commandimagelist/lc_flipvertical.png
	default_images/res/commandimagelist/lch_fliphorizontal.png
	default_images/res/commandimagelist/lch_flipvertical.png
	default_images/res/commandimagelist/sc_fliphorizontal.png
	default_images/res/commandimagelist/sc_flipvertical.png
	officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
	officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
	officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
	svx/sdi/svx.sdi
	sw/inc/cmdid.h
	sw/source/ui/shells/drawsh.cxx
	sw/uiconfig/sglobal/toolbar/graphicobjectbar.xml
	sw/uiconfig/swform/toolbar/graphicobjectbar.xml
	sw/uiconfig/swreport/toolbar/graphicobjectbar.xml
	sw/uiconfig/swriter/toolbar/graphicobjectbar.xml
	sw/uiconfig/swxform/toolbar/graphicobjectbar.xml

Change-Id: I2c646586d592eb1d703c6db07e4c913d858fdc47

...to the correct GetState method GetDrawAttrState

(cherry picked from commit 6c248d4f)

Change-Id: I08636bf35dbcacf2b34fca94be3f8867e2092981

...to the correct GetState method GetDrawAttrState

(cherry picked from commit e9b32f69)

Change-Id: Ibb94a6297536d65e6f50e692306b38f7d6feb74b

and HilightColor. Added 'No Color' to ParagraphPropertyPanel and
BackgroundColor

(cherry picked from commit 6b722f7d)

Conflicts:
	svx/inc/svx/dialogs.hrc

Change-Id: If75bdb87a1fc43e753c8c8ab15370808235926fd

apply labels and disable their UI customization

(cherry picked from commit 339494cf)

Conflicts:
	officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
	officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
	officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
	svx/inc/svx/svxids.hrc
	svx/sdi/svx.sdi
	sw/sdi/swriter.sdi

Change-Id: Ie95fb2fde14afe67c80e0037f4252e788f5ec1fb

Related: #i122025# followup - remove usage of removed Slot

(cherry picked from commit 0bef7cb6)

Change-Id: I0cf4d8c4c93d5754e4e46d4d1edc43529849b3bf

(cherry picked from commit 947c734d)

Conflicts:
	svx/source/sidebar/paragraph/ParaPropertyPanel.src

Change-Id: I3e5a5650264d280206f57c8b8ff146c696b2a88d

(cherry picked from commit 07c075ac)

Change-Id: Ide6bdd5177298a345bed90af68a24e0edcda1cd1