(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

(cherry picked from commit 246d5710)

Conflicts:
	cui/source/tabpages/tplnedef.cxx

Change-Id: I6fde45b3e5a5d0a25a549ea03ec50302c8541195

(cherry picked from commit 33242bbc)

Conflicts:
	svx/inc/svx/dlgctrl.hxx
	svx/source/dialog/dlgctrl.cxx

Change-Id: I4391164c0dbdd99c64fe7eca1bdd10cd92e32128

(cherry picked from commit df8441aa)

Conflicts:
	officecfg/registry/schema/org/openoffice/Office/Common.xcs

Change-Id: Ia107a029b431d54739fc5524c6978bb53b53a785

Change-Id: Ie6b86a2a48e6697f816e9975b6e34491ab0ad17e

(cherry picked from commit 68e707bb)

Conflicts:
	cui/source/inc/backgrnd.hxx
	cui/source/inc/cuitabarea.hxx
	cui/source/tabpages/backgrnd.cxx
	cui/source/tabpages/tpcolor.cxx
	sd/source/ui/view/drviews6.cxx
	svx/Package_inc.mk
	svx/inc/svx/colrctrl.hxx
	svx/source/sidebar/tools/ColorControl.cxx
	svx/source/tbxctrls/colorwindow.hxx
	svx/source/tbxctrls/colrctrl.cxx
	svx/source/tbxctrls/tbcontrl.cxx

Change-Id: Ie06fe355846b737ec8aae9aade4d408232c83193

Related: #i122041# Add a11y values for defining behaviour of ColorValueSets

(cherry picked from commit 401e8f2d)

Conflicts:
	cui/source/tabpages/backgrnd.cxx
	officecfg/registry/schema/org/openoffice/Office/Common.xcs
	sc/source/ui/miscdlgs/tabbgcolordlg.cxx
	svtools/inc/svtools/accessibilityoptions.hxx
	svtools/source/inc/configitems/accessibilityoptions_const.hxx
	vcl/inc/vcl/bitmap.hxx
	vcl/source/gdi/bitmap4.cxx

Change-Id: If9d0db5f22974cad1ac886eca3719ca92ca7f240

(cherry picked from commit f8f9cb11)

Conflicts:
	svx/inc/svx/xtable.hxx
	svx/source/sidebar/line/LinePropertyPanel.cxx
	svx/source/sidebar/line/LinePropertyPanel.hrc
	svx/source/sidebar/line/LinePropertyPanel.src

Change-Id: Ie49b28503e092c6685fb02c00820d4a3eaa3abb6

(cherry picked from commit f4533526)

Change-Id: I7d50a9bc5a17bce792cfd73ab830fd2ef0a17fe9

(cherry picked from commit ef75cc7b)

Conflicts:
	icon-themes/galaxy/svx/res/symphony/style_line1.png
	icon-themes/galaxy/svx/res/symphony/style_line10.png
	icon-themes/galaxy/svx/res/symphony/style_line11.png
	icon-themes/galaxy/svx/res/symphony/style_line2.png
	icon-themes/galaxy/svx/res/symphony/style_line3.png
	icon-themes/galaxy/svx/res/symphony/style_line4.png
	icon-themes/galaxy/svx/res/symphony/style_line5.png
	icon-themes/galaxy/svx/res/symphony/style_line6.png
	icon-themes/galaxy/svx/res/symphony/style_line7.png
	icon-themes/galaxy/svx/res/symphony/style_line8.png
	icon-themes/galaxy/svx/res/symphony/style_line9.png
	icon-themes/hicontrast/svx/res/symphony/style_line1.png
	icon-themes/hicontrast/svx/res/symphony/style_line10.png
	icon-themes/hicontrast/svx/res/symphony/style_line11.png
	icon-themes/hicontrast/svx/res/symphony/style_line2.png
	icon-themes/hicontrast/svx/res/symphony/style_line3.png
	icon-themes/hicontrast/svx/res/symphony/style_line4.png
	icon-themes/hicontrast/svx/res/symphony/style_line5.png
	icon-themes/hicontrast/svx/res/symphony/style_line6.png
	icon-themes/hicontrast/svx/res/symphony/style_line7.png
	icon-themes/hicontrast/svx/res/symphony/style_line8.png
	icon-themes/hicontrast/svx/res/symphony/style_line9.png

Change-Id: Iccb0c2b6b1870806d05ee02569b7fdf1f96405c2

Reported by:  Ariel Constenla-Haile
Patch by:  Ariel Constenla-Haile
Review by: Andre Fischer
(cherry picked from commit 6a56f5db)

Change-Id: Idbcb46b617fc2d2e2d587cdd74226380a2019303

Reported by:  Ariel Constenla-Haile
Patch by:  Ariel Constenla-Haile
Review by: Andre Fischer
(cherry picked from commit 717671a6)

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

Change-Id: I127db2160c16789f672b5520a77e27d1f6dac719

Found and patched by: Ariel Constenla-Haile
Review by: Andre Fischer
(cherry picked from commit 2784b226)

Change-Id: I5fafe38f007a9a98b34e3fc99950bdb8e4c79278

(cherry picked from commit d179a612)

Conflicts:
	sfx2/source/sidebar/SidebarController.cxx

Change-Id: I755d55ac0f5a97fdd11476ce11631afb362e83d8

(cherry picked from commit 0a0a9b32)

Conflicts:
	chart2/source/controller/dialogs/dlg_View3D.cxx
	chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
	chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx
	chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
	chart2/source/controller/inc/ViewElementListProvider.hxx
	chart2/source/controller/inc/dlg_View3D.hxx
	chart2/source/controller/main/ShapeController.cxx
	chart2/source/inc/chartview/DrawModelWrapper.hxx
	chart2/source/view/main/DrawModelWrapper.cxx
	cui/source/inc/border.hxx
	cui/source/inc/cuitabarea.hxx
	cui/source/inc/cuitabline.hxx
	cui/source/inc/sdrcelldlg.hxx
	cui/source/inc/treeopt.hxx
	cui/source/options/optchart.cxx
	cui/source/options/optchart.hxx
	cui/source/options/optcolor.cxx
	cui/source/options/treeopt.cxx
	cui/source/tabpages/backgrnd.cxx
	cui/source/tabpages/border.cxx
	cui/source/tabpages/chardlg.cxx
	cui/source/tabpages/numpages.cxx
	cui/source/tabpages/tpcolor.cxx
	cui/source/tabpages/tplneend.cxx
	editeng/inc/editeng/outliner.hxx
	extensions/source/propctrlr/standardcontrol.cxx
	framework/source/register/registerservices.cxx
	offapi/com/sun/star/ui/makefile.mk
	officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
	officecfg/registry/data/org/openoffice/Office/UI/makefile.mk
	officecfg/registry/schema/org/openoffice/Office/UI/makefile.mk
	postprocess/packregistry/makefile.mk
	reportdesign/source/ui/dlg/Condition.cxx
	reportdesign/source/ui/misc/UITools.cxx
	sc/inc/document.hxx
	sc/inc/helpids.h
	sc/inc/sc.hrc
	sc/prj/build.lst
	sc/sdi/scalc.sdi
	sc/source/core/data/documen9.cxx
	sc/source/core/data/drwlayer.cxx
	sc/source/ui/app/scdll.cxx
	sc/source/ui/app/typemap.cxx
	sc/source/ui/dbgui/scendlg.cxx
	sc/source/ui/docshell/docsh2.cxx
	sc/source/ui/docshell/docsh4.cxx
	sc/source/ui/drawfunc/chartsh.cxx
	sc/source/ui/drawfunc/drawsh.cxx
	sc/source/ui/drawfunc/drawsh2.cxx
	sc/source/ui/drawfunc/drawsh4.cxx
	sc/source/ui/drawfunc/drformsh.cxx
	sc/source/ui/drawfunc/drtxtob.cxx
	sc/source/ui/drawfunc/drtxtob1.cxx
	sc/source/ui/drawfunc/drtxtob2.cxx
	sc/source/ui/drawfunc/graphsh.cxx
	sc/source/ui/drawfunc/oleobjsh.cxx
	sc/source/ui/inc/chartsh.hxx
	sc/source/ui/inc/formatsh.hxx
	sc/source/ui/miscdlgs/tabbgcolordlg.cxx
	sc/source/ui/navipi/navipi.cxx
	sc/source/ui/optdlg/opredlin.cxx
	sc/source/ui/optdlg/tpview.cxx
	sc/source/ui/sidebar/makefile.mk
	sc/source/ui/view/auditsh.cxx
	sc/source/ui/view/cellsh.cxx
	sc/source/ui/view/editsh.cxx
	sc/source/ui/view/formatsh.cxx
	sc/source/ui/view/pivotsh.cxx
	sc/source/ui/view/tabvwsh.cxx
	sc/util/makefile.mk
	sd/inc/sdabstdlg.hxx
	sd/prj/build.lst
	sd/sdi/ToolPanelViewShell.sdi
	sd/sdi/makefile.mk
	sd/source/ui/accessibility/makefile.mk
	sd/source/ui/animations/CustomAnimationDialog.cxx
	sd/source/ui/dlg/PaneChildWindows.cxx
	sd/source/ui/dlg/PaneShells.cxx
	sd/source/ui/dlg/copydlg.cxx
	sd/source/ui/dlg/navigatr.cxx
	sd/source/ui/dlg/sddlgfact.cxx
	sd/source/ui/dlg/sddlgfact.hxx
	sd/source/ui/docshell/docshel3.cxx
	sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx
	sd/source/ui/framework/factories/TaskPanelFactory.cxx
	sd/source/ui/framework/factories/TaskPanelFactory.hxx
	sd/source/ui/framework/factories/ViewShellWrapper.cxx
	sd/source/ui/framework/factories/makefile.mk
	sd/source/ui/framework/module/ImpressModule.cxx
	sd/source/ui/framework/module/ToolPanelModule.cxx
	sd/source/ui/framework/tools/FrameworkHelper.cxx
	sd/source/ui/func/fuolbull.cxx
	sd/source/ui/inc/DrawViewShell.hxx
	sd/source/ui/inc/PaneChildWindows.hxx
	sd/source/ui/inc/celltempl.hxx
	sd/source/ui/inc/copydlg.hxx
	sd/source/ui/inc/dlgpage.hxx
	sd/source/ui/inc/framework/FrameworkHelper.hxx
	sd/source/ui/inc/prltempl.hxx
	sd/source/ui/inc/tabtempl.hxx
	sd/source/ui/inc/taskpane/ILayoutableWindow.hxx
	sd/source/ui/inc/taskpane/PanelId.hxx
	sd/source/ui/inc/tpaction.hxx
	sd/source/ui/sidebar/AllMasterPagesSelector.cxx
	sd/source/ui/sidebar/AllMasterPagesSelector.hxx
	sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
	sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx
	sd/source/ui/sidebar/DocumentHelper.cxx
	sd/source/ui/sidebar/DocumentHelper.hxx
	sd/source/ui/sidebar/LayoutMenu.cxx
	sd/source/ui/sidebar/LayoutMenu.hxx
	sd/source/ui/sidebar/MasterPageContainer.cxx
	sd/source/ui/sidebar/MasterPageContainer.hxx
	sd/source/ui/sidebar/MasterPageContainerFiller.cxx
	sd/source/ui/sidebar/MasterPageContainerFiller.hxx
	sd/source/ui/sidebar/MasterPageContainerProviders.cxx
	sd/source/ui/sidebar/MasterPageContainerProviders.hxx
	sd/source/ui/sidebar/MasterPageContainerQueue.cxx
	sd/source/ui/sidebar/MasterPageContainerQueue.hxx
	sd/source/ui/sidebar/MasterPageDescriptor.cxx
	sd/source/ui/sidebar/MasterPageDescriptor.hxx
	sd/source/ui/sidebar/MasterPageObserver.cxx
	sd/source/ui/sidebar/MasterPagesSelector.cxx
	sd/source/ui/sidebar/MasterPagesSelector.hxx
	sd/source/ui/sidebar/PreviewValueSet.cxx
	sd/source/ui/sidebar/PreviewValueSet.hxx
	sd/source/ui/sidebar/RecentMasterPagesSelector.cxx
	sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
	sd/source/ui/sidebar/SidebarShellManager.cxx
	sd/source/ui/sidebar/SlideTransitionPanel.hxx
	sd/source/ui/sidebar/makefile.mk
	sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
	sd/source/ui/table/TableDesignPane.hxx
	sd/source/ui/toolpanel/ControlContainer.cxx
	sd/source/ui/toolpanel/ControlContainerDescriptor.hxx
	sd/source/ui/toolpanel/MethodGuard.hxx
	sd/source/ui/toolpanel/ScrollPanel.cxx
	sd/source/ui/toolpanel/SlideSorterCacheDisplay.cxx
	sd/source/ui/toolpanel/SubToolPanel.cxx
	sd/source/ui/toolpanel/TaskPaneFocusManager.cxx
	sd/source/ui/toolpanel/TaskPaneTreeNode.cxx
	sd/source/ui/toolpanel/TitleBar.cxx
	sd/source/ui/toolpanel/TitledControl.cxx
	sd/source/ui/toolpanel/ToolPanel.cxx
	sd/source/ui/toolpanel/ToolPanel.hxx
	sd/source/ui/toolpanel/ToolPanelFactory.cxx
	sd/source/ui/toolpanel/ToolPanelUIElement.cxx
	sd/source/ui/toolpanel/ToolPanelUIElement.hxx
	sd/source/ui/toolpanel/ToolPanelViewShell.cxx
	sd/source/ui/toolpanel/controls/CustomAnimationPanel.cxx
	sd/source/ui/toolpanel/controls/CustomAnimationPanel.hxx
	sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx
	sd/source/ui/toolpanel/controls/MasterPagesPanel.hxx
	sd/source/ui/toolpanel/controls/SlideTransitionPanel.cxx
	sd/source/ui/toolpanel/controls/SlideTransitionPanel.hxx
	sd/source/ui/toolpanel/controls/TableDesignPanel.cxx
	sd/source/ui/toolpanel/controls/TableDesignPanel.hxx
	sd/source/ui/unoidl/UnoDocumentSettings.cxx
	sd/source/ui/view/ViewShellBase.cxx
	sd/source/ui/view/drtxtob.cxx
	sd/source/ui/view/drviews3.cxx
	sd/source/ui/view/drviews7.cxx
	sd/source/ui/view/drviewsa.cxx
	sd/source/ui/view/drviewsf.cxx
	sd/source/ui/view/outlnvsh.cxx
	sd/source/ui/view/sdview.cxx
	sd/source/ui/view/viewshel.cxx
	sd/uiconfig/sdraw/menubar/menubar.xml
	sd/util/makefile.mk
	sfx2/Package_inc.mk
	sfx2/inc/sfx2/sfx.hrc
	sfx2/inc/sfx2/sfxsids.hrc
	sfx2/source/control/bindings.cxx
	sfx2/source/dialog/templdlg.cxx
	sfx2/source/inc/templdgi.hxx
	svx/AllLangResTarget_svx.mk
	svx/Package_inc.mk
	svx/inc/svx/XPropertyTable.hxx
	svx/inc/svx/bmpmask.hxx
	svx/inc/svx/colrctrl.hxx
	svx/inc/svx/dialogs.hrc
	svx/inc/svx/dlgctrl.hxx
	svx/inc/svx/dlgutil.hxx
	svx/inc/svx/drawitem.hxx
	svx/inc/svx/fontwork.hxx
	svx/inc/svx/galbrws.hxx
	svx/inc/svx/sdr/table/tablecontroller.hxx
	svx/inc/svx/svdmodel.hxx
	svx/inc/svx/svdstr.hrc
	svx/inc/svx/svxids.hrc
	svx/inc/svx/svxitems.hrc
	svx/inc/svx/xattr.hxx
	svx/inc/svx/xflgrit.hxx
	svx/inc/svx/xflhtit.hxx
	svx/inc/svx/xit.hxx
	svx/inc/svx/xlineit.hxx
	svx/inc/svx/xlndsit.hxx
	svx/inc/svx/xlnedit.hxx
	svx/inc/svx/xlnstit.hxx
	svx/inc/svx/xtable.hxx
	svx/sdi/svx.sdi
	svx/source/dialog/_bmpmask.cxx
	svx/source/dialog/dialcontrol.cxx
	svx/source/dialog/dlgctrl.cxx
	svx/source/dialog/dlgutil.cxx
	svx/source/dialog/fontwork.cxx
	svx/source/gallery2/galbrws.cxx
	svx/source/gallery2/galbrws1.cxx
	svx/source/gallery2/gallery1.cxx
	svx/source/items/drawitem.cxx
	svx/source/items/svxitems.src
	svx/source/sdr/attribute/sdrformtextattribute.cxx
	svx/source/sidebar/ColorPanel.hxx
	svx/source/sidebar/EmptyPanel.hrc
	svx/source/sidebar/EmptyPanel.hxx
	svx/source/sidebar/gallery/GalleryPanel.hxx
	svx/source/svdraw/svdedtv1.cxx
	svx/source/svdraw/svdmodel.cxx
	svx/source/svdraw/svdogrp.cxx
	svx/source/svdraw/svdstr.src
	svx/source/tbxctrls/tbcontrl.cxx
	svx/source/unodraw/XPropertyTable.cxx
	svx/source/unodraw/unoctabl.cxx
	svx/source/xoutdev/XPropertyEntry.cxx
	svx/source/xoutdev/xattr.cxx
	svx/source/xoutdev/xattr2.cxx
	svx/source/xoutdev/xtabbtmp.cxx
	svx/source/xoutdev/xtabcolr.cxx
	svx/source/xoutdev/xtabdash.cxx
	svx/source/xoutdev/xtabgrdt.cxx
	svx/source/xoutdev/xtabhtch.cxx
	svx/source/xoutdev/xtable.cxx
	svx/source/xoutdev/xtablend.cxx
	svx/util/svx.component
	sw/inc/cmdid.h
	sw/inc/docsh.hxx
	sw/inc/editsh.hxx
	sw/inc/helpid.h
	sw/inc/rcid.hrc
	sw/inc/swabstdlg.hxx
	sw/inc/swcommands.h
	sw/sdi/swriter.sdi
	sw/source/core/doc/docdesc.cxx
	sw/source/core/draw/drawdoc.cxx
	sw/source/ui/app/docsh2.cxx
	sw/source/ui/app/docshdrw.cxx
	sw/source/ui/app/docshini.cxx
	sw/source/ui/app/docst.cxx
	sw/source/ui/config/optpage.cxx
	sw/source/ui/dialog/swdlgfact.cxx
	sw/source/ui/dialog/swdlgfact.hxx
	sw/source/ui/fmtui/tmpdlg.cxx
	sw/source/ui/inc/tmpdlg.hxx
	sw/source/ui/misc/pggrid.cxx
	sw/source/ui/shells/annotsh.cxx
	sw/source/ui/shells/basesh.cxx
	sw/source/ui/shells/beziersh.cxx
	sw/source/ui/shells/drawdlg.cxx
	sw/source/ui/shells/drawsh.cxx
	sw/source/ui/shells/drformsh.cxx
	sw/source/ui/shells/drwbassh.cxx
	sw/source/ui/shells/drwtxtex.cxx
	sw/source/ui/shells/drwtxtsh.cxx
	sw/source/ui/shells/frmsh.cxx
	sw/source/ui/shells/grfsh.cxx
	sw/source/ui/shells/olesh.cxx
	sw/source/ui/shells/tabsh.cxx
	sw/source/ui/shells/textsh.cxx
	sw/source/ui/shells/textsh1.cxx
	sw/source/ui/shells/txtnum.cxx
	sw/source/ui/uiview/viewtab.cxx
	sw/source/ui/uno/unofreg.cxx
	sw/source/ui/utlui/navipi.cxx
	sw/util/sw.component
	vcl/inc/vcl/split.hxx
	vcl/inc/vcl/window.hxx
	vcl/inc/window.h
	vcl/source/window/split.cxx
	vcl/source/window/window.cxx
	vcl/source/window/window4.cxx

Change-Id: Idebaff59f9d60e4e93290cefefdda4c5a1e9215e

Resolves: #i122194# Adapted license text in propertypanel.hrc

then renamed it to ResourceDefinitions.hrc

(cherry picked from commit e952d140)

Conflicts:
	sfx2/Package_inc.mk
	sfx2/source/sidebar/SidebarChildWindow.cxx
	svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
	svx/source/sidebar/line/LinePropertyPanel.cxx
	svx/source/sidebar/possize/PosSizePropertyPanel.cxx
	sw/source/ui/sidebar/PagePropertyPanel.src
	sw/source/ui/sidebar/WrapPropertyPanel.src

Change-Id: Ie009056a78ab108556717a501399c83b477b3548

Resolves: #i122194# finally I got the correct file name

Change-Id: If7a075af8c9a829f6f0a69f883c5c6d4ac97ba2a

More merge changes for optional sidebar:
     revert toolpanel removal, restore and re-enable task pane
     remove apparently un-used SidebarFactory module
     add extra visibility annotation to ItemReceiverUpdate

Change-Id: Ibb9d23780600437f607d866ff3d396b96879245d
Reviewed-on: https://gerrit.libreoffice.org/3960Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>

Change-Id: I1e6c2c1b64d8566b29c1a1510040aadbca2d977e

We now need a mechanism to instruct the print dialog that we want to force
printing to use the printer settings configured paper. Particularly
useful for nup printing and brochures

scenario 3: forcing printing to use the printer settings paper

a file->printer settings->properties->paper
  set a paper size, ideally something not used in the test doc, e.g. Executive
b file->print->page layout and set pages per sheet to 4
  the auto selection for paper will be the first paper size in use, i.e.
  legal
c flip to options and toggle "use only paper size from printer preferences"
  preview should reconfigure as "Executive"

Change-Id: Ie224c252c2cb6c9ee21be5c54e470bca1c7eb0bb