(cherry picked from commit 107eb083)

Change-Id: Icc57d8910a390e9b608b5aa4a0fa6d8c8659208d

to prevent problems with older compilers

(cherry picked from commit 8f3625e6)

Conflicts:
	sfx2/inc/sfx2/sidebar/IContextChangeReceiver.hxx
	sfx2/inc/sfx2/sidebar/ILayoutableWindow.hxx
	sfx2/inc/sfx2/sidebar/SidebarPanelBase.hxx

Change-Id: I2bf548fd7ff16db58938273bc4b60ad83325b376

Change-Id: I9bfa7274befb34b67ac3c322eda805e78b3d0b8d

panel for disabled document parts

(cherry picked from commit ffcc8c32)

Conflicts:
	sfx2/inc/sfx2/sidebar/ControllerItem.hxx
	svx/source/sidebar/text/TextPropertyPanel.cxx

Change-Id: I9f38c71c6415f3d255b5607a67a110bca47358b0

Related: #i122082# Remove temporary change

(cherry picked from commit f213ea43)

Change-Id: I157542fd5dbbda17b63900be9a41782ee581309c

after switching sidebar decks

(cherry picked from commit f44ca372)

Change-Id: I2162b2eafb8bd1fc8c803a398b475cdf71b6c34d

(cherry picked from commit 4a84ca3c)

Change-Id: I24bac356682aff5905010485eac833037f585764

from sidebar tab bar to Calc

(cherry picked from commit 2abab958)

Change-Id: Ie47d086699986b64cbdc15df649adea705351307

(non persistent)

(cherry picked from commit f6f8c047)

Change-Id: I917050dd57b3fa952200dd536b371f902661e88f

(cherry picked from commit db9602cb)

Change-Id: I272763eb24e58443d8c8a980eca9b0f654a9e899

(cherry picked from commit 2b1bd27c)

Change-Id: Id54bb7367d736629a43869c58d6d840fc8fd7da8

(cherry picked from commit bab3ddce)

Conflicts:
	sfx2/source/sidebar/FocusManager.cxx

Change-Id: I8853a92da3c4fe41a0110c630cc6af556ffc2ce4

(cherry picked from commit 1f317e05)

Change-Id: I348ea9c84db10268d964e788ed5622123a9fa405

(cherry picked from commit 4fba97b3)

Change-Id: I470036762114017a971a35aba2c7f0f41f482fa8

for inserting shapes into Draw documents

(cherry picked from commit 5e09229d)

Conflicts:
	sd/source/ui/view/drviewsa.cxx
	sfx2/Package_inc.mk
	svx/inc/svx/dialogs.hrc

Related: #i122218# Added missing files to sfx2/inc/sfx2/sidebar

(cherry picked from commit 99572ff1)

Conflicts:
	sfx2/inc/sfx2/sidebar/ResourceDefinitions.hrc

Related: #i122218# Added more missing files

(cherry picked from commit cdc8cb70)

fix up to build

Change-Id: I098976d787e6a91d36aac98a5917f48b50872087
9c6f4d957924e177922e26606173d1b238b8006e
ceb9b720c08fb1db5b418c618e280b9b68eda2cf
01712631eacbd3e58e2cd04d1903bbcb0ecb9301

drop-down-list in text property panel

(cherry picked from commit 3c404572)

Change-Id: Ieffbd19318742dd133fce1b96d7cad2d7c457975

Change-Id: If13f6a2dec9722dac40323e3ee68e1276c4e0e58

default is 12

(cherry picked from commit dc9abefa)

Conflicts:
	officecfg/registry/schema/org/openoffice/Office/Common.xcs
	svtools/inc/svtools/accessibilityoptions.hxx
	svtools/source/inc/configitems/accessibilityoptions_const.hxx

Change-Id: Ic035b34bbcde426fa8fb76df16f84786908e18fa

for the cell alignment sidebar panel

(cherry picked from commit 3b31f1c7)

Change-Id: I3b1ee724ca14e9938302759ef6249a0f3ddd5fa7

correct application of chosen underline style in Calc cells and Drawing objects
in Writer

(cherry picked from commit fd23db16)

Change-Id: Id77299c173eef99ea2eea0c0896e9bfd0bd9d1eb

- add missing <break> in handling click to character attribute controls
- remove superfluous code and comments
- adapt code formatting
(cherry picked from commit a1111d73)

Conflicts:
	svx/source/sidebar/text/TextUnderlineControl.cxx

Change-Id: I1aea184523f74dda78218a631a64ea192765e9d5

(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