Resolves: #i121420# merge sidebar feature

(cherry picked from commit 0a0a9b32aa5bf1ce2554ad37cbba3c7a105db2b5)

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 e952d1401c1adc41934118ba7f542611ef9da11b)

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

92 files changed, 0 insertions, 0 deletions

diff --git a/icon-themes/hicontrast/sc/res/sidebar/CellBorderLineStyle_005.png b/icon-themes/hicontrast/sc/res/sidebar/CellBorderLineStyle_005.png
new file mode 100755
index 000000000000..444d51484993
--- /dev/null
+++ b/icon-themes/hicontrast/sc/res/sidebar/CellBorderLineStyle_005.png
diff --git a/icon-themes/hicontrast/sc/res/sidebar/CellBorderLineStyle_110.png b/icon-themes/hicontrast/sc/res/sidebar/CellBorderLineStyle_110.png
new file mode 100755
index 000000000000..1144a495ef0d
--- /dev/null
+++ b/icon-themes/hicontrast/sc/res/sidebar/CellBorderLineStyle_110.png
diff --git a/icon-themes/hicontrast/sc/res/sidebar/CellBorderLineStyle_250.png b/icon-themes/hicontrast/sc/res/sidebar/CellBorderLineStyle_250.png
new file mode 100755
index 000000000000..8a6cc3ce6d7c
--- /dev/null
+++ b/icon-themes/hicontrast/sc/res/sidebar/CellBorderLineStyle_250.png
diff --git a/icon-themes/hicontrast/sc/res/sidebar/CellBorderLineStyle_260.png b/icon-themes/hicontrast/sc/res/sidebar/CellBorderLineStyle_260.png
new file mode 100755
index 000000000000..769a03cb8902
--- /dev/null
+++ b/icon-themes/hicontrast/sc/res/sidebar/CellBorderLineStyle_260.png
diff --git a/icon-themes/hicontrast/sc/res/sidebar/CellBorderLineStyle_400.png b/icon-themes/hicontrast/sc/res/sidebar/CellBorderLineStyle_400.png
new file mode 100755
index 000000000000..cd8503a6de83
--- /dev/null
+++ b/icon-themes/hicontrast/sc/res/sidebar/CellBorderLineStyle_400.png
diff --git a/icon-themes/hicontrast/sc/res/sidebar/CellBorderLineStyle_450.png b/icon-themes/hicontrast/sc/res/sidebar/CellBorderLineStyle_450.png
new file mode 100755
index 000000000000..17fa6fc02932
--- /dev/null
+++ b/icon-themes/hicontrast/sc/res/sidebar/CellBorderLineStyle_450.png
diff --git a/icon-themes/hicontrast/sc/res/sidebar/CellBorderLineStyle_500.png b/icon-themes/hicontrast/sc/res/sidebar/CellBorderLineStyle_500.png
new file mode 100755
index 000000000000..90d8d6937eaa
--- /dev/null
+++ b/icon-themes/hicontrast/sc/res/sidebar/CellBorderLineStyle_500.png
diff --git a/icon-themes/hicontrast/sc/res/sidebar/CellBorderLineStyle_505.png b/icon-themes/hicontrast/sc/res/sidebar/CellBorderLineStyle_505.png
new file mode 100755
index 000000000000..94846c3e8779
--- /dev/null
+++ b/icon-themes/hicontrast/sc/res/sidebar/CellBorderLineStyle_505.png
diff --git a/icon-themes/hicontrast/sc/res/sidebar/CellBorderLineStyle_750.png b/icon-themes/hicontrast/sc/res/sidebar/CellBorderLineStyle_750.png
new file mode 100755
index 000000000000..40bafef208b2
--- /dev/null
+++ b/icon-themes/hicontrast/sc/res/sidebar/CellBorderLineStyle_750.png
diff --git a/icon-themes/hicontrast/sc/res/sidebar/CellBorder_All_18x18.png b/icon-themes/hicontrast/sc/res/sidebar/CellBorder_All_18x18.png
new file mode 100755
index 000000000000..2f7909dda654
--- /dev/null
+++ b/icon-themes/hicontrast/sc/res/sidebar/CellBorder_All_18x18.png
diff --git a/icon-themes/hicontrast/sc/res/sidebar/CellBorder_Bottom_18x18.png b/icon-themes/hicontrast/sc/res/sidebar/CellBorder_Bottom_18x18.png
new file mode 100755
index 000000000000..7e3ba683d107
--- /dev/null
+++ b/icon-themes/hicontrast/sc/res/sidebar/CellBorder_Bottom_18x18.png
diff --git a/icon-themes/hicontrast/sc/res/sidebar/CellBorder_Bottom_Double_18x18.png b/icon-themes/hicontrast/sc/res/sidebar/CellBorder_Bottom_Double_18x18.png
new file mode 100755
index 000000000000..6093c976e5db
--- /dev/null
+++ b/icon-themes/hicontrast/sc/res/sidebar/CellBorder_Bottom_Double_18x18.png
diff --git a/icon-themes/hicontrast/sc/res/sidebar/CellBorder_Bottom_Thick_18x18.png b/icon-themes/hicontrast/sc/res/sidebar/CellBorder_Bottom_Thick_18x18.png
new file mode 100755
index 000000000000..a824ac0b3814
--- /dev/null
+++ b/icon-themes/hicontrast/sc/res/sidebar/CellBorder_Bottom_Thick_18x18.png
diff --git a/icon-themes/hicontrast/sc/res/sidebar/CellBorder_Empty_18x18.png b/icon-themes/hicontrast/sc/res/sidebar/CellBorder_Empty_18x18.png
new file mode 100755
index 000000000000..f62769b4dae6
--- /dev/null
+++ b/icon-themes/hicontrast/sc/res/sidebar/CellBorder_Empty_18x18.png
diff --git a/icon-themes/hicontrast/sc/res/sidebar/CellBorder_FourBorders_18x18.png b/icon-themes/hicontrast/sc/res/sidebar/CellBorder_FourBorders_18x18.png
new file mode 100755
index 000000000000..7b351935c0cc
--- /dev/null
+++ b/icon-themes/hicontrast/sc/res/sidebar/CellBorder_FourBorders_18x18.png
diff --git a/icon-themes/hicontrast/sc/res/sidebar/CellBorder_FourBorders_Thick_18x18.png b/icon-themes/hicontrast/sc/res/sidebar/CellBorder_FourBorders_Thick_18x18.png
new file mode 100755
index 000000000000..a62c20175522
--- /dev/null
+++ b/icon-themes/hicontrast/sc/res/sidebar/CellBorder_FourBorders_Thick_18x18.png
diff --git a/icon-themes/hicontrast/sc/res/sidebar/CellBorder_LeftAndRight_18x18.png b/icon-themes/hicontrast/sc/res/sidebar/CellBorder_LeftAndRight_18x18.png
new file mode 100755
index 000000000000..62ffc82330f2
--- /dev/null
+++ b/icon-themes/hicontrast/sc/res/sidebar/CellBorder_LeftAndRight_18x18.png
diff --git a/icon-themes/hicontrast/sc/res/sidebar/CellBorder_LeftDiagonal_18x18.png b/icon-themes/hicontrast/sc/res/sidebar/CellBorder_LeftDiagonal_18x18.png
new file mode 100755
index 000000000000..64081573bb4a
--- /dev/null
+++ b/icon-themes/hicontrast/sc/res/sidebar/CellBorder_LeftDiagonal_18x18.png
diff --git a/icon-themes/hicontrast/sc/res/sidebar/CellBorder_Left_18x18.png b/icon-themes/hicontrast/sc/res/sidebar/CellBorder_Left_18x18.png
new file mode 100755
index 000000000000..7349f5b3f759
--- /dev/null
+++ b/icon-themes/hicontrast/sc/res/sidebar/CellBorder_Left_18x18.png
diff --git a/icon-themes/hicontrast/sc/res/sidebar/CellBorder_RightDiagonal_18x18.png b/icon-themes/hicontrast/sc/res/sidebar/CellBorder_RightDiagonal_18x18.png
new file mode 100755
index 000000000000..ccebd4b4c8d1
--- /dev/null
+++ b/icon-themes/hicontrast/sc/res/sidebar/CellBorder_RightDiagonal_18x18.png
diff --git a/icon-themes/hicontrast/sc/res/sidebar/CellBorder_Right_18x18.png b/icon-themes/hicontrast/sc/res/sidebar/CellBorder_Right_18x18.png
new file mode 100755
index 000000000000..d84d917b3b64
--- /dev/null
+++ b/icon-themes/hicontrast/sc/res/sidebar/CellBorder_Right_18x18.png
diff --git a/icon-themes/hicontrast/sc/res/sidebar/CellBorder_TopAndBottom_18x18.png b/icon-themes/hicontrast/sc/res/sidebar/CellBorder_TopAndBottom_18x18.png
new file mode 100755
index 000000000000..3bd0b73552ab
--- /dev/null
+++ b/icon-themes/hicontrast/sc/res/sidebar/CellBorder_TopAndBottom_18x18.png
diff --git a/icon-themes/hicontrast/sc/res/sidebar/CellBorder_TopSingle_BottomDouble_18x18.png b/icon-themes/hicontrast/sc/res/sidebar/CellBorder_TopSingle_BottomDouble_18x18.png
new file mode 100755
index 000000000000..bdc624188b0a
--- /dev/null
+++ b/icon-themes/hicontrast/sc/res/sidebar/CellBorder_TopSingle_BottomDouble_18x18.png
diff --git a/icon-themes/hicontrast/sc/res/sidebar/CellBorder_TopThin_BottomThick_18x18.png b/icon-themes/hicontrast/sc/res/sidebar/CellBorder_TopThin_BottomThick_18x18.png
new file mode 100755
index 000000000000..758af77617ba
--- /dev/null
+++ b/icon-themes/hicontrast/sc/res/sidebar/CellBorder_TopThin_BottomThick_18x18.png
diff --git a/icon-themes/hicontrast/sc/res/sidebar/CellBorder_Top_18x18.png b/icon-themes/hicontrast/sc/res/sidebar/CellBorder_Top_18x18.png
new file mode 100755
index 000000000000..dfa9c53c73d2
--- /dev/null
+++ b/icon-themes/hicontrast/sc/res/sidebar/CellBorder_Top_18x18.png
diff --git a/icon-themes/hicontrast/sc/res/sidebar/fill_color.png b/icon-themes/hicontrast/sc/res/sidebar/fill_color.png
new file mode 100755
index 000000000000..47e7ea15bfaa
--- /dev/null
+++ b/icon-themes/hicontrast/sc/res/sidebar/fill_color.png
diff --git a/icon-themes/hicontrast/sfx2/res/grip.png b/icon-themes/hicontrast/sfx2/res/grip.png
new file mode 100644
index 000000000000..04e370d48bdf
--- /dev/null
+++ b/icon-themes/hicontrast/sfx2/res/grip.png
diff --git a/icon-themes/hicontrast/sfx2/res/menu.png b/icon-themes/hicontrast/sfx2/res/menu.png
new file mode 100644
index 000000000000..bebd1d622707
--- /dev/null
+++ b/icon-themes/hicontrast/sfx2/res/menu.png
diff --git a/icon-themes/hicontrast/sfx2/res/symphony/morebutton.png b/icon-themes/hicontrast/sfx2/res/symphony/morebutton.png
new file mode 100644
index 000000000000..5cffa97ca41c
--- /dev/null
+++ b/icon-themes/hicontrast/sfx2/res/symphony/morebutton.png
diff --git a/icon-themes/hicontrast/sfx2/res/symphony/sidebar-3d-large.png b/icon-themes/hicontrast/sfx2/res/symphony/sidebar-3d-large.png
new file mode 100644
index 000000000000..7bc11604f897
--- /dev/null
+++ b/icon-themes/hicontrast/sfx2/res/symphony/sidebar-3d-large.png
diff --git a/icon-themes/hicontrast/sfx2/res/symphony/sidebar-3d-small.png b/icon-themes/hicontrast/sfx2/res/symphony/sidebar-3d-small.png
new file mode 100644
index 000000000000..a4cdda9ad5bc
--- /dev/null
+++ b/icon-themes/hicontrast/sfx2/res/symphony/sidebar-3d-small.png
diff --git a/icon-themes/hicontrast/sfx2/res/symphony/sidebar-animation-large.png b/icon-themes/hicontrast/sfx2/res/symphony/sidebar-animation-large.png
new file mode 100644
index 000000000000..0be7962635fd
--- /dev/null
+++ b/icon-themes/hicontrast/sfx2/res/symphony/sidebar-animation-large.png
diff --git a/icon-themes/hicontrast/sfx2/res/symphony/sidebar-animation-small.png b/icon-themes/hicontrast/sfx2/res/symphony/sidebar-animation-small.png
new file mode 100644
index 000000000000..c494dfa6e170
--- /dev/null
+++ b/icon-themes/hicontrast/sfx2/res/symphony/sidebar-animation-small.png
diff --git a/icon-themes/hicontrast/sfx2/res/symphony/sidebar-colors-large.png b/icon-themes/hicontrast/sfx2/res/symphony/sidebar-colors-large.png
new file mode 100644
index 000000000000..39ecdc12d1bf
--- /dev/null
+++ b/icon-themes/hicontrast/sfx2/res/symphony/sidebar-colors-large.png
diff --git a/icon-themes/hicontrast/sfx2/res/symphony/sidebar-colors-small.png b/icon-themes/hicontrast/sfx2/res/symphony/sidebar-colors-small.png
new file mode 100644
index 000000000000..049514bec7df
--- /dev/null
+++ b/icon-themes/hicontrast/sfx2/res/symphony/sidebar-colors-small.png
diff --git a/icon-themes/hicontrast/sfx2/res/symphony/sidebar-eyedropper-large.png b/icon-themes/hicontrast/sfx2/res/symphony/sidebar-eyedropper-large.png
new file mode 100644
index 000000000000..be99b1fbc2a4
--- /dev/null
+++ b/icon-themes/hicontrast/sfx2/res/symphony/sidebar-eyedropper-large.png
diff --git a/icon-themes/hicontrast/sfx2/res/symphony/sidebar-eyedropper-small.png b/icon-themes/hicontrast/sfx2/res/symphony/sidebar-eyedropper-small.png
new file mode 100644
index 000000000000..55e182a7cfd8
--- /dev/null
+++ b/icon-themes/hicontrast/sfx2/res/symphony/sidebar-eyedropper-small.png
diff --git a/icon-themes/hicontrast/sfx2/res/symphony/sidebar-functions-large.png b/icon-themes/hicontrast/sfx2/res/symphony/sidebar-functions-large.png
new file mode 100644
index 000000000000..1991850ae7db
--- /dev/null
+++ b/icon-themes/hicontrast/sfx2/res/symphony/sidebar-functions-large.png
diff --git a/icon-themes/hicontrast/sfx2/res/symphony/sidebar-functions-small.png b/icon-themes/hicontrast/sfx2/res/symphony/sidebar-functions-small.png
new file mode 100644
index 000000000000..615bd0b8788d
--- /dev/null
+++ b/icon-themes/hicontrast/sfx2/res/symphony/sidebar-functions-small.png
diff --git a/icon-themes/hicontrast/sfx2/res/symphony/sidebar-gallery-large.png b/icon-themes/hicontrast/sfx2/res/symphony/sidebar-gallery-large.png
new file mode 100644
index 000000000000..9effe086a135
--- /dev/null
+++ b/icon-themes/hicontrast/sfx2/res/symphony/sidebar-gallery-large.png
diff --git a/icon-themes/hicontrast/sfx2/res/symphony/sidebar-gallery-small.png b/icon-themes/hicontrast/sfx2/res/symphony/sidebar-gallery-small.png
new file mode 100644
index 000000000000..29b3c2545978
--- /dev/null
+++ b/icon-themes/hicontrast/sfx2/res/symphony/sidebar-gallery-small.png
diff --git a/icon-themes/hicontrast/sfx2/res/symphony/sidebar-imganim-large.png b/icon-themes/hicontrast/sfx2/res/symphony/sidebar-imganim-large.png
new file mode 100644
index 000000000000..778e49979e55
--- /dev/null
+++ b/icon-themes/hicontrast/sfx2/res/symphony/sidebar-imganim-large.png
diff --git a/icon-themes/hicontrast/sfx2/res/symphony/sidebar-imganim-small.png b/icon-themes/hicontrast/sfx2/res/symphony/sidebar-imganim-small.png
new file mode 100644
index 000000000000..50a065ac299b
--- /dev/null
+++ b/icon-themes/hicontrast/sfx2/res/symphony/sidebar-imganim-small.png
diff --git a/icon-themes/hicontrast/sfx2/res/symphony/sidebar-navigator-large.png b/icon-themes/hicontrast/sfx2/res/symphony/sidebar-navigator-large.png
new file mode 100644
index 000000000000..a078b0a54194
--- /dev/null
+++ b/icon-themes/hicontrast/sfx2/res/symphony/sidebar-navigator-large.png
diff --git a/icon-themes/hicontrast/sfx2/res/symphony/sidebar-navigator-small.png b/icon-themes/hicontrast/sfx2/res/symphony/sidebar-navigator-small.png
new file mode 100644
index 000000000000..00bd1cabf200
--- /dev/null
+++ b/icon-themes/hicontrast/sfx2/res/symphony/sidebar-navigator-small.png
diff --git a/icon-themes/hicontrast/sfx2/res/symphony/sidebar-property-large.png b/icon-themes/hicontrast/sfx2/res/symphony/sidebar-property-large.png
new file mode 100644
index 000000000000..fb0c1595ff68
--- /dev/null
+++ b/icon-themes/hicontrast/sfx2/res/symphony/sidebar-property-large.png
diff --git a/icon-themes/hicontrast/sfx2/res/symphony/sidebar-property-small.png b/icon-themes/hicontrast/sfx2/res/symphony/sidebar-property-small.png
new file mode 100644
index 000000000000..4147aa14cc0b
--- /dev/null
+++ b/icon-themes/hicontrast/sfx2/res/symphony/sidebar-property-small.png
diff --git a/icon-themes/hicontrast/sfx2/res/symphony/sidebar-style-large.png b/icon-themes/hicontrast/sfx2/res/symphony/sidebar-style-large.png
new file mode 100644
index 000000000000..0d59a2df0cba
--- /dev/null
+++ b/icon-themes/hicontrast/sfx2/res/symphony/sidebar-style-large.png
diff --git a/icon-themes/hicontrast/sfx2/res/symphony/sidebar-style-small.png b/icon-themes/hicontrast/sfx2/res/symphony/sidebar-style-small.png
new file mode 100644
index 000000000000..d570ffa0f8de
--- /dev/null
+++ b/icon-themes/hicontrast/sfx2/res/symphony/sidebar-style-small.png
diff --git a/icon-themes/hicontrast/sfx2/res/symphony/sidebar-template-large.png b/icon-themes/hicontrast/sfx2/res/symphony/sidebar-template-large.png
new file mode 100644
index 000000000000..f4beddc5426d
--- /dev/null
+++ b/icon-themes/hicontrast/sfx2/res/symphony/sidebar-template-large.png
diff --git a/icon-themes/hicontrast/sfx2/res/symphony/sidebar-template-small.png b/icon-themes/hicontrast/sfx2/res/symphony/sidebar-template-small.png
new file mode 100644
index 000000000000..65bff0c226e8
--- /dev/null
+++ b/icon-themes/hicontrast/sfx2/res/symphony/sidebar-template-small.png
diff --git a/icon-themes/hicontrast/sfx2/res/symphony/sidebar-transition-large.png b/icon-themes/hicontrast/sfx2/res/symphony/sidebar-transition-large.png
new file mode 100644
index 000000000000..f0c319878bb7
--- /dev/null
+++ b/icon-themes/hicontrast/sfx2/res/symphony/sidebar-transition-large.png
diff --git a/icon-themes/hicontrast/sfx2/res/symphony/sidebar-transition-small.png b/icon-themes/hicontrast/sfx2/res/symphony/sidebar-transition-small.png
new file mode 100644
index 000000000000..6cdc89a5e614
--- /dev/null
+++ b/icon-themes/hicontrast/sfx2/res/symphony/sidebar-transition-small.png
diff --git a/icon-themes/hicontrast/svx/res/rotation.png b/icon-themes/hicontrast/svx/res/rotation.png
new file mode 100644
index 000000000000..e8adbfc6e92c
--- /dev/null
+++ b/icon-themes/hicontrast/svx/res/rotation.png
diff --git a/icon-themes/hicontrast/svx/res/symphony/Quadratic.png b/icon-themes/hicontrast/svx/res/symphony/Quadratic.png
new file mode 100644
index 000000000000..12d644800e9a
--- /dev/null
+++ b/icon-themes/hicontrast/svx/res/symphony/Quadratic.png
diff --git a/icon-themes/hicontrast/svx/res/symphony/Square.png b/icon-themes/hicontrast/svx/res/symphony/Square.png
new file mode 100644
index 000000000000..8d0ccea3e0f4
--- /dev/null
+++ b/icon-themes/hicontrast/svx/res/symphony/Square.png
diff --git a/icon-themes/hicontrast/svx/res/symphony/__morebutton.bmp b/icon-themes/hicontrast/svx/res/symphony/__morebutton.bmp
new file mode 100644
index 000000000000..c665b3e866a8
--- /dev/null
+++ b/icon-themes/hicontrast/svx/res/symphony/__morebutton.bmp
diff --git a/icon-themes/hicontrast/svx/res/symphony/axial.png b/icon-themes/hicontrast/svx/res/symphony/axial.png
new file mode 100644
index 000000000000..5771323542d0
--- /dev/null
+++ b/icon-themes/hicontrast/svx/res/symphony/axial.png
diff --git a/icon-themes/hicontrast/svx/res/symphony/ellipsoid.png b/icon-themes/hicontrast/svx/res/symphony/ellipsoid.png
new file mode 100644
index 000000000000..2a38b320398b
--- /dev/null
+++ b/icon-themes/hicontrast/svx/res/symphony/ellipsoid.png
diff --git a/icon-themes/hicontrast/svx/res/symphony/fill_color.png b/icon-themes/hicontrast/svx/res/symphony/fill_color.png
new file mode 100644
index 000000000000..7cbafa57eb99
--- /dev/null
+++ b/icon-themes/hicontrast/svx/res/symphony/fill_color.png
diff --git a/icon-themes/hicontrast/svx/res/symphony/line1.png b/icon-themes/hicontrast/svx/res/symphony/line1.png
new file mode 100644
index 000000000000..8e5dd3a985a9
--- /dev/null
+++ b/icon-themes/hicontrast/svx/res/symphony/line1.png
diff --git a/icon-themes/hicontrast/svx/res/symphony/line10.png b/icon-themes/hicontrast/svx/res/symphony/line10.png
new file mode 100644
index 000000000000..6c81727ca103
--- /dev/null
+++ b/icon-themes/hicontrast/svx/res/symphony/line10.png
diff --git a/icon-themes/hicontrast/svx/res/symphony/line2.png b/icon-themes/hicontrast/svx/res/symphony/line2.png
new file mode 100644
index 000000000000..ad3c78bb36ed
--- /dev/null
+++ b/icon-themes/hicontrast/svx/res/symphony/line2.png
diff --git a/icon-themes/hicontrast/svx/res/symphony/line3.png b/icon-themes/hicontrast/svx/res/symphony/line3.png
new file mode 100644
index 000000000000..2d91489a07d7
--- /dev/null
+++ b/icon-themes/hicontrast/svx/res/symphony/line3.png
diff --git a/icon-themes/hicontrast/svx/res/symphony/line4.png b/icon-themes/hicontrast/svx/res/symphony/line4.png
new file mode 100644
index 000000000000..f62c84d524cf
--- /dev/null
+++ b/icon-themes/hicontrast/svx/res/symphony/line4.png
diff --git a/icon-themes/hicontrast/svx/res/symphony/line5.png b/icon-themes/hicontrast/svx/res/symphony/line5.png
new file mode 100644
index 000000000000..74d7fad3a05c
--- /dev/null
+++ b/icon-themes/hicontrast/svx/res/symphony/line5.png
diff --git a/icon-themes/hicontrast/svx/res/symphony/line6.png b/icon-themes/hicontrast/svx/res/symphony/line6.png
new file mode 100644
index 000000000000..52d4a9a793df
--- /dev/null
+++ b/icon-themes/hicontrast/svx/res/symphony/line6.png
diff --git a/icon-themes/hicontrast/svx/res/symphony/line7.png b/icon-themes/hicontrast/svx/res/symphony/line7.png
new file mode 100644
index 000000000000..7592f0265cff
--- /dev/null
+++ b/icon-themes/hicontrast/svx/res/symphony/line7.png
diff --git a/icon-themes/hicontrast/svx/res/symphony/line8.png b/icon-themes/hicontrast/svx/res/symphony/line8.png
new file mode 100644
index 000000000000..57b3e4952fb0
--- /dev/null
+++ b/icon-themes/hicontrast/svx/res/symphony/line8.png
diff --git a/icon-themes/hicontrast/svx/res/symphony/line9.png b/icon-themes/hicontrast/svx/res/symphony/line9.png
new file mode 100644
index 000000000000..700a2b02ef79
--- /dev/null
+++ b/icon-themes/hicontrast/svx/res/symphony/line9.png
diff --git a/icon-themes/hicontrast/svx/res/symphony/linear.png b/icon-themes/hicontrast/svx/res/symphony/linear.png
new file mode 100644
index 000000000000..23b7a181717b
--- /dev/null
+++ b/icon-themes/hicontrast/svx/res/symphony/linear.png
diff --git a/icon-themes/hicontrast/svx/res/symphony/radial.png b/icon-themes/hicontrast/svx/res/symphony/radial.png
new file mode 100644
index 000000000000..1971f585b0de
--- /dev/null
+++ b/icon-themes/hicontrast/svx/res/symphony/radial.png
diff --git a/icon-themes/hicontrast/svx/res/symphony/rotation.png b/icon-themes/hicontrast/svx/res/symphony/rotation.png
new file mode 100644
index 000000000000..874fb82bdcb9
--- /dev/null
+++ b/icon-themes/hicontrast/svx/res/symphony/rotation.png
diff --git a/icon-themes/hicontrast/svx/res/symphony/style_line1.png b/icon-themes/hicontrast/svx/res/symphony/style_line1.png
new file mode 100644
index 000000000000..eadd40e3427a
--- /dev/null
+++ b/icon-themes/hicontrast/svx/res/symphony/style_line1.png
diff --git a/icon-themes/hicontrast/svx/res/symphony/style_line10.png b/icon-themes/hicontrast/svx/res/symphony/style_line10.png
new file mode 100644
index 000000000000..d5925aafea8a
--- /dev/null
+++ b/icon-themes/hicontrast/svx/res/symphony/style_line10.png
diff --git a/icon-themes/hicontrast/svx/res/symphony/style_line11.png b/icon-themes/hicontrast/svx/res/symphony/style_line11.png
new file mode 100644
index 000000000000..1e6be193527f
--- /dev/null
+++ b/icon-themes/hicontrast/svx/res/symphony/style_line11.png
diff --git a/icon-themes/hicontrast/svx/res/symphony/style_line2.png b/icon-themes/hicontrast/svx/res/symphony/style_line2.png
new file mode 100644
index 000000000000..3658e182c94c
--- /dev/null
+++ b/icon-themes/hicontrast/svx/res/symphony/style_line2.png
diff --git a/icon-themes/hicontrast/svx/res/symphony/style_line3.png b/icon-themes/hicontrast/svx/res/symphony/style_line3.png
new file mode 100644
index 000000000000..1636e050426f
--- /dev/null
+++ b/icon-themes/hicontrast/svx/res/symphony/style_line3.png
diff --git a/icon-themes/hicontrast/svx/res/symphony/style_line4.png b/icon-themes/hicontrast/svx/res/symphony/style_line4.png
new file mode 100644
index 000000000000..35741407ac25
--- /dev/null
+++ b/icon-themes/hicontrast/svx/res/symphony/style_line4.png
diff --git a/icon-themes/hicontrast/svx/res/symphony/style_line5.png b/icon-themes/hicontrast/svx/res/symphony/style_line5.png
new file mode 100644
index 000000000000..5d387d4b33fb
--- /dev/null
+++ b/icon-themes/hicontrast/svx/res/symphony/style_line5.png
diff --git a/icon-themes/hicontrast/svx/res/symphony/style_line6.png b/icon-themes/hicontrast/svx/res/symphony/style_line6.png
new file mode 100644
index 000000000000..4a34861b54a5
--- /dev/null
+++ b/icon-themes/hicontrast/svx/res/symphony/style_line6.png
diff --git a/icon-themes/hicontrast/svx/res/symphony/style_line7.png b/icon-themes/hicontrast/svx/res/symphony/style_line7.png
new file mode 100644
index 000000000000..8718ef0332e7
--- /dev/null
+++ b/icon-themes/hicontrast/svx/res/symphony/style_line7.png
diff --git a/icon-themes/hicontrast/svx/res/symphony/style_line8.png b/icon-themes/hicontrast/svx/res/symphony/style_line8.png
new file mode 100644
index 000000000000..db769a43ce78
--- /dev/null
+++ b/icon-themes/hicontrast/svx/res/symphony/style_line8.png
diff --git a/icon-themes/hicontrast/svx/res/symphony/style_line9.png b/icon-themes/hicontrast/svx/res/symphony/style_line9.png
new file mode 100644
index 000000000000..91062daaf673
--- /dev/null
+++ b/icon-themes/hicontrast/svx/res/symphony/style_line9.png
diff --git a/icon-themes/hicontrast/svx/res/symphony/width1.png b/icon-themes/hicontrast/svx/res/symphony/width1.png
new file mode 100644
index 000000000000..1f14d896ca26
--- /dev/null
+++ b/icon-themes/hicontrast/svx/res/symphony/width1.png
diff --git a/icon-themes/hicontrast/svx/res/symphony/width2.png b/icon-themes/hicontrast/svx/res/symphony/width2.png
new file mode 100644
index 000000000000..9a30e3fe2173
--- /dev/null
+++ b/icon-themes/hicontrast/svx/res/symphony/width2.png
diff --git a/icon-themes/hicontrast/svx/res/symphony/width3.png b/icon-themes/hicontrast/svx/res/symphony/width3.png
new file mode 100644
index 000000000000..80e2e22992be
--- /dev/null
+++ b/icon-themes/hicontrast/svx/res/symphony/width3.png
diff --git a/icon-themes/hicontrast/svx/res/symphony/width4.png b/icon-themes/hicontrast/svx/res/symphony/width4.png
new file mode 100644
index 000000000000..142768ea34ff
--- /dev/null
+++ b/icon-themes/hicontrast/svx/res/symphony/width4.png
diff --git a/icon-themes/hicontrast/svx/res/symphony/width5.png b/icon-themes/hicontrast/svx/res/symphony/width5.png
new file mode 100644
index 000000000000..93100fae2cf9
--- /dev/null
+++ b/icon-themes/hicontrast/svx/res/symphony/width5.png
diff --git a/icon-themes/hicontrast/svx/res/symphony/width6.png b/icon-themes/hicontrast/svx/res/symphony/width6.png
new file mode 100644
index 000000000000..30a9e326931c
--- /dev/null
+++ b/icon-themes/hicontrast/svx/res/symphony/width6.png
diff --git a/icon-themes/hicontrast/svx/res/symphony/width7.png b/icon-themes/hicontrast/svx/res/symphony/width7.png
new file mode 100644
index 000000000000..6a51fda02d29
--- /dev/null
+++ b/icon-themes/hicontrast/svx/res/symphony/width7.png
diff --git a/icon-themes/hicontrast/svx/res/symphony/width8.png b/icon-themes/hicontrast/svx/res/symphony/width8.png
new file mode 100644
index 000000000000..60219680af26
--- /dev/null
+++ b/icon-themes/hicontrast/svx/res/symphony/width8.png