summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver-Rainer Wittmann <orw@apache.org>2013-04-10 08:20:16 +0000
committerMichael Meeks <michael.meeks@suse.com>2013-05-20 11:33:10 +0100
commitd02f75a8c36705924ddd6a5921fe3012fafce812 (patch)
tree40da9f25714a77f5e9e17ef7bee81c33a1a11b4b
parentd8d55787b81cdc955b73c8befa4ab608f46e32aa (diff)
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
-rw-r--r--chart2/source/controller/drawinglayer/DrawViewWrapper.cxx8
-rw-r--r--cui/source/tabpages/tpbitmap.cxx10
-rw-r--r--cui/source/tabpages/tpline.cxx31
-rw-r--r--cui/source/tabpages/tplnedef.cxx8
-rw-r--r--cui/source/tabpages/tplneend.cxx7
-rw-r--r--editeng/source/items/textitem.cxx10
-rw-r--r--editeng/source/outliner/outliner.cxx46
-rw-r--r--editeng/source/outliner/outlvw.cxx319
-rw-r--r--filter/source/msfilter/msdffimp.cxx6
-rw-r--r--framework/Library_fwk.mk1
-rw-r--r--framework/inc/macros/registration.hxx2
-rw-r--r--framework/inc/services/ContextChangeEventMultiplexer.hxx138
-rw-r--r--framework/inc/services/EventMultiplexer.hxx116
-rw-r--r--framework/source/register/registerservices.cxx5
-rw-r--r--framework/source/services/ContextChangeEventMultiplexer.cxx383
-rw-r--r--framework/source/services/EventMultiplexer.cxx266
-rw-r--r--framework/util/fwk.component4
-rwxr-xr-xicon-themes/galaxy/sc/res/sidebar/123.pngbin0 -> 3471 bytes
-rwxr-xr-xicon-themes/galaxy/sc/res/sidebar/ABC.pngbin0 -> 971 bytes
-rwxr-xr-xicon-themes/galaxy/sc/res/sidebar/CellBorder.pngbin0 -> 178 bytes
-rwxr-xr-xicon-themes/galaxy/sc/res/sidebar/CellBorderLineStyle_005.pngbin0 -> 2836 bytes
-rwxr-xr-xicon-themes/galaxy/sc/res/sidebar/CellBorderLineStyle_110.pngbin0 -> 2839 bytes
-rwxr-xr-xicon-themes/galaxy/sc/res/sidebar/CellBorderLineStyle_250.pngbin0 -> 2837 bytes
-rwxr-xr-xicon-themes/galaxy/sc/res/sidebar/CellBorderLineStyle_260.pngbin0 -> 2837 bytes
-rwxr-xr-xicon-themes/galaxy/sc/res/sidebar/CellBorderLineStyle_400.pngbin0 -> 2836 bytes
-rwxr-xr-xicon-themes/galaxy/sc/res/sidebar/CellBorderLineStyle_450.pngbin0 -> 2837 bytes
-rwxr-xr-xicon-themes/galaxy/sc/res/sidebar/CellBorderLineStyle_500.pngbin0 -> 2838 bytes
-rwxr-xr-xicon-themes/galaxy/sc/res/sidebar/CellBorderLineStyle_505.pngbin0 -> 2839 bytes
-rwxr-xr-xicon-themes/galaxy/sc/res/sidebar/CellBorderLineStyle_750.pngbin0 -> 2839 bytes
-rwxr-xr-xicon-themes/galaxy/sc/res/sidebar/CellBorder_All_18x18.pngbin0 -> 225 bytes
-rwxr-xr-xicon-themes/galaxy/sc/res/sidebar/CellBorder_Bottom_18x18.pngbin0 -> 247 bytes
-rwxr-xr-xicon-themes/galaxy/sc/res/sidebar/CellBorder_Bottom_Double_18x18.pngbin0 -> 241 bytes
-rwxr-xr-xicon-themes/galaxy/sc/res/sidebar/CellBorder_Bottom_Thick_18x18.pngbin0 -> 241 bytes
-rwxr-xr-xicon-themes/galaxy/sc/res/sidebar/CellBorder_Empty_18x18.pngbin0 -> 251 bytes
-rwxr-xr-xicon-themes/galaxy/sc/res/sidebar/CellBorder_FourBorders_18x18.pngbin0 -> 210 bytes
-rwxr-xr-xicon-themes/galaxy/sc/res/sidebar/CellBorder_FourBorders_Thick_18x18.pngbin0 -> 178 bytes
-rwxr-xr-xicon-themes/galaxy/sc/res/sidebar/CellBorder_LeftAndRight_18x18.pngbin0 -> 226 bytes
-rwxr-xr-xicon-themes/galaxy/sc/res/sidebar/CellBorder_LeftDiagonal_18x18.pngbin0 -> 276 bytes
-rwxr-xr-xicon-themes/galaxy/sc/res/sidebar/CellBorder_Left_18x18.pngbin0 -> 245 bytes
-rwxr-xr-xicon-themes/galaxy/sc/res/sidebar/CellBorder_RightDiagonal_18x18.pngbin0 -> 270 bytes
-rwxr-xr-xicon-themes/galaxy/sc/res/sidebar/CellBorder_Right_18x18.pngbin0 -> 247 bytes
-rwxr-xr-xicon-themes/galaxy/sc/res/sidebar/CellBorder_TopAndBottom_18x18.pngbin0 -> 247 bytes
-rwxr-xr-xicon-themes/galaxy/sc/res/sidebar/CellBorder_TopSingle_BottomDouble_18x18.pngbin0 -> 237 bytes
-rwxr-xr-xicon-themes/galaxy/sc/res/sidebar/CellBorder_TopThin_BottomThick_18x18.pngbin0 -> 231 bytes
-rwxr-xr-xicon-themes/galaxy/sc/res/sidebar/CellBorder_Top_18x18.pngbin0 -> 245 bytes
-rwxr-xr-xicon-themes/galaxy/sc/res/sidebar/Line_color.pngbin0 -> 3481 bytes
-rwxr-xr-xicon-themes/galaxy/sc/res/sidebar/canlendar.pngbin0 -> 4682 bytes
-rwxr-xr-xicon-themes/galaxy/sc/res/sidebar/fill_color.pngbin0 -> 3658 bytes
-rwxr-xr-xicon-themes/galaxy/sc/res/sidebar/money.pngbin0 -> 4246 bytes
-rwxr-xr-xicon-themes/galaxy/sc/res/sidebar/morebutton.bmpbin0 -> 5346 bytes
-rwxr-xr-xicon-themes/galaxy/sc/res/sidebar/morebutton_h.bmpbin0 -> 5346 bytes
-rwxr-xr-xicon-themes/galaxy/sc/res/sidebar/percent.pngbin0 -> 3211 bytes
-rwxr-xr-xicon-themes/galaxy/sc/res/sidebar/sc_alignbottom.pngbin0 -> 2905 bytes
-rwxr-xr-xicon-themes/galaxy/sc/res/sidebar/sc_aligncenter.pngbin0 -> 2938 bytes
-rwxr-xr-xicon-themes/galaxy/sc/res/sidebar/sc_aligncenter_v.pngbin0 -> 2906 bytes
-rwxr-xr-xicon-themes/galaxy/sc/res/sidebar/sc_alignjust.pngbin0 -> 2888 bytes
-rwxr-xr-xicon-themes/galaxy/sc/res/sidebar/sc_alignleft.pngbin0 -> 2902 bytes
-rwxr-xr-xicon-themes/galaxy/sc/res/sidebar/sc_alignright.pngbin0 -> 2878 bytes
-rwxr-xr-xicon-themes/galaxy/sc/res/sidebar/sc_aligntop.pngbin0 -> 2902 bytes
-rwxr-xr-xicon-themes/galaxy/sfx2/res/grip.pngbin0 -> 183 bytes
-rwxr-xr-xicon-themes/galaxy/sfx2/res/menu.pngbin0 -> 213 bytes
-rwxr-xr-xicon-themes/galaxy/sfx2/res/separator.pngbin0 -> 177 bytes
-rw-r--r--icon-themes/galaxy/sfx2/res/symphony/morebutton.pngbin0 -> 3023 bytes
-rw-r--r--icon-themes/galaxy/sfx2/res/symphony/open_more.pngbin0 -> 2958 bytes
-rw-r--r--icon-themes/galaxy/sfx2/res/symphony/sidebar-3d-large.pngbin0 -> 4072 bytes
-rw-r--r--icon-themes/galaxy/sfx2/res/symphony/sidebar-3d-small.pngbin0 -> 3522 bytes
-rw-r--r--icon-themes/galaxy/sfx2/res/symphony/sidebar-animation-large.pngbin0 -> 4000 bytes
-rw-r--r--icon-themes/galaxy/sfx2/res/symphony/sidebar-animation-small.pngbin0 -> 3553 bytes
-rw-r--r--icon-themes/galaxy/sfx2/res/symphony/sidebar-colors-large.pngbin0 -> 3790 bytes
-rw-r--r--icon-themes/galaxy/sfx2/res/symphony/sidebar-colors-small.pngbin0 -> 3544 bytes
-rw-r--r--icon-themes/galaxy/sfx2/res/symphony/sidebar-eyedropper-large.pngbin0 -> 3416 bytes
-rw-r--r--icon-themes/galaxy/sfx2/res/symphony/sidebar-eyedropper-small.pngbin0 -> 3534 bytes
-rw-r--r--icon-themes/galaxy/sfx2/res/symphony/sidebar-functions-large.pngbin0 -> 3834 bytes
-rw-r--r--icon-themes/galaxy/sfx2/res/symphony/sidebar-functions-small.pngbin0 -> 3395 bytes
-rw-r--r--icon-themes/galaxy/sfx2/res/symphony/sidebar-gallery-large.pngbin0 -> 1492 bytes
-rw-r--r--icon-themes/galaxy/sfx2/res/symphony/sidebar-gallery-small.pngbin0 -> 3642 bytes
-rw-r--r--icon-themes/galaxy/sfx2/res/symphony/sidebar-imganim-large.pngbin0 -> 1710 bytes
-rw-r--r--icon-themes/galaxy/sfx2/res/symphony/sidebar-imganim-small.pngbin0 -> 3640 bytes
-rw-r--r--icon-themes/galaxy/sfx2/res/symphony/sidebar-navigator-large.pngbin0 -> 4333 bytes
-rw-r--r--icon-themes/galaxy/sfx2/res/symphony/sidebar-navigator-small.pngbin0 -> 3665 bytes
-rw-r--r--icon-themes/galaxy/sfx2/res/symphony/sidebar-property-large.pngbin0 -> 3761 bytes
-rw-r--r--icon-themes/galaxy/sfx2/res/symphony/sidebar-property-small.pngbin0 -> 3515 bytes
-rw-r--r--icon-themes/galaxy/sfx2/res/symphony/sidebar-style-large.pngbin0 -> 4323 bytes
-rw-r--r--icon-themes/galaxy/sfx2/res/symphony/sidebar-style-small.pngbin0 -> 3714 bytes
-rw-r--r--icon-themes/galaxy/sfx2/res/symphony/sidebar-template-large.pngbin0 -> 3510 bytes
-rw-r--r--icon-themes/galaxy/sfx2/res/symphony/sidebar-template-small.pngbin0 -> 3221 bytes
-rw-r--r--icon-themes/galaxy/sfx2/res/symphony/sidebar-transition-large.pngbin0 -> 3728 bytes
-rw-r--r--icon-themes/galaxy/sfx2/res/symphony/sidebar-transition-small.pngbin0 -> 3475 bytes
-rw-r--r--icon-themes/galaxy/svx/res/rotation.pngbin0 -> 3650 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/ bin0 -> 4015 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/AdjustColorBlue_16x16.pngbin0 -> 563 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/AdjustColorGamma_16x16.pngbin0 -> 663 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/AdjustColorGreen_16x16.pngbin0 -> 560 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/AdjustColorRed_16x16.pngbin0 -> 560 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/AlignTextCenter_16x16.pngbin0 -> 2938 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/AlignTextJustified_16x16.pngbin0 -> 2888 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/AlignTextLeft_16x16.pngbin0 -> 2902 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/AlignTextRight_16x16.pngbin0 -> 2878 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/ColorModeBlackWhite_16x16.pngbin0 -> 444 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/ColorModeGrey_16x16.pngbin0 -> 485 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/ColorModeNormal_16x16.pngbin0 -> 1206 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/ColorModeWaterMark_16x16.pngbin0 -> 1080 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/DecreaseSpace_16x16.pngbin0 -> 3261 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/FlipHorizontally_16x16.pngbin0 -> 3071 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/FlipVertically_16x16.pngbin0 -> 3123 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/Highlight.pngbin0 -> 3280 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/IncreaseSpace_16x16.pngbin0 -> 3170 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/Indent2.pngbin0 -> 2949 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/Indent3.pngbin0 -> 2974 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/Indent4.pngbin0 -> 2950 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/Indent_16x16.pngbin0 -> 3094 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/Indent_Hanging.pngbin0 -> 3459 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/Line_color.pngbin0 -> 3481 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/Outdent_16x16.pngbin0 -> 3105 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/Quadratic.pngbin0 -> 3525 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/Square.pngbin0 -> 3035 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/__morebutton.bmpbin0 -> 5346 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/axial.pngbin0 -> 2898 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/blank.pngbin0 -> 2820 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/decrease font.pngbin0 -> 2919 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/ellipsoid.pngbin0 -> 3136 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/enlarge font.pngbin0 -> 2935 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/fill_color.pngbin0 -> 3517 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/icon_normal.pngbin0 -> 2938 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/last_custom_common.pngbin0 -> 3431 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/last_custom_common_grey.pngbin0 -> 3385 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/line1.pngbin0 -> 2827 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/line10.pngbin0 -> 2845 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/line2.pngbin0 -> 2833 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/line3.pngbin0 -> 2839 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/line4.pngbin0 -> 2835 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/line5.pngbin0 -> 2829 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/line6.pngbin0 -> 2826 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/line7.pngbin0 -> 2834 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/line8.pngbin0 -> 2857 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/line9.pngbin0 -> 2843 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/linear.pngbin0 -> 2930 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/lpselected-spacing-1.pngbin0 -> 2880 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/lpselected-spacing-1_15.pngbin0 -> 2879 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/lpselected-spacing-1_5.pngbin0 -> 2881 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/lpselected-spacing-2.pngbin0 -> 2878 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/lpsmall-spacing-1.pngbin0 -> 2898 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/lpspacing-1.pngbin0 -> 3003 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/lpspacing-1_15.pngbin0 -> 2993 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/lpspacing-1_5.pngbin0 -> 2992 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/lpspacing-2.pngbin0 -> 2994 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/no color.pngbin0 -> 3979 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/para_numbullet01.pngbin0 -> 3013 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/para_numbullet02.pngbin0 -> 3195 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/para_numbullet_rtl01.pngbin0 -> 3003 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/para_numbullet_rtl02.pngbin0 -> 3178 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/para_numbulleth01.pngbin0 -> 259 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/para_numbulleth02.pngbin0 -> 293 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/para_vert01.pngbin0 -> 2902 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/para_vert02.pngbin0 -> 2906 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/para_vert03.pngbin0 -> 2905 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/para_verth01.pngbin0 -> 312 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/para_verth02.pngbin0 -> 319 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/para_verth03.pngbin0 -> 302 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/radial.pngbin0 -> 3085 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/rotate_left.pngbin0 -> 3173 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/rotate_right.pngbin0 -> 3191 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/rotation.pngbin0 -> 4817 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/rte_Indent_16x16.pngbin0 -> 3081 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/rte_Outdent_16x16.pngbin0 -> 3101 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/sc_backgroundcolor.pngbin0 -> 3625 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/sc_bold.pngbin0 -> 468 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/sc_color.pngbin0 -> 3464 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/sc_italic.pngbin0 -> 451 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/sc_shadowed.pngbin0 -> 3323 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/sc_strikeout.pngbin0 -> 604 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/sc_subscript.pngbin0 -> 2930 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/sc_superscript.pngbin0 -> 2932 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/sc_underline.pngbin0 -> 414 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/sch_backgroundcolor.pngbin0 -> 3410 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/selected-line1.pngbin0 -> 2830 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/selected-line10.pngbin0 -> 2858 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/selected-line2.pngbin0 -> 2854 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/selected-line3.pngbin0 -> 2831 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/selected-line4.pngbin0 -> 2833 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/selected-line5.pngbin0 -> 2837 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/selected-line6.pngbin0 -> 2833 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/selected-line7.pngbin0 -> 2835 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/selected-line8.pngbin0 -> 2837 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/selected-line9.pngbin0 -> 2846 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/spacing1.pngbin0 -> 2933 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/spacing2.pngbin0 -> 2911 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/spacing3.pngbin0 -> 2965 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/spacing_loose.pngbin0 -> 2941 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/spacing_loose_s.pngbin0 -> 2915 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/spacing_normal.pngbin0 -> 2941 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/spacing_normal_s.pngbin0 -> 2912 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/spacing_tight.pngbin0 -> 2940 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/spacing_tight_s.pngbin0 -> 2912 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/spacing_very loose.pngbin0 -> 2941 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/spacing_very loose_s.pngbin0 -> 2937 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/spacing_very tight.pngbin0 -> 2930 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/spacing_very tight_s.pngbin0 -> 2906 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/style_line1.pngbin0 -> 2870 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/style_line10.pngbin0 -> 2880 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/style_line11.pngbin0 -> 2876 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/style_line2.pngbin0 -> 2865 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/style_line3.pngbin0 -> 2874 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/style_line4.pngbin0 -> 2873 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/style_line5.pngbin0 -> 2878 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/style_line6.pngbin0 -> 2871 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/style_line7.pngbin0 -> 2873 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/style_line8.pngbin0 -> 2883 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/style_line9.pngbin0 -> 2877 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/width1.pngbin0 -> 2829 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/width2.pngbin0 -> 2834 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/width3.pngbin0 -> 2834 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/width4.pngbin0 -> 2834 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/width5.pngbin0 -> 2835 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/width6.pngbin0 -> 2836 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/width7.pngbin0 -> 2834 bytes
-rwxr-xr-xicon-themes/galaxy/svx/res/symphony/width8.pngbin0 -> 2834 bytes
-rwxr-xr-xicon-themes/galaxy/sw/res/sidebar/pageproppanel/Landscapecopy_24x24.pngbin0 -> 4806 bytes
-rwxr-xr-xicon-themes/galaxy/sw/res/sidebar/pageproppanel/column1_24x24.pngbin0 -> 2978 bytes
-rwxr-xr-xicon-themes/galaxy/sw/res/sidebar/pageproppanel/column2_24x24.pngbin0 -> 3018 bytes
-rwxr-xr-xicon-themes/galaxy/sw/res/sidebar/pageproppanel/column3_24x24.pngbin0 -> 3017 bytes
-rwxr-xr-xicon-themes/galaxy/sw/res/sidebar/pageproppanel/column_L_1_24x24.pngbin0 -> 2902 bytes
-rwxr-xr-xicon-themes/galaxy/sw/res/sidebar/pageproppanel/column_L_2_24x24.pngbin0 -> 2904 bytes
-rwxr-xr-xicon-themes/galaxy/sw/res/sidebar/pageproppanel/column_L_3_24x24.pngbin0 -> 2921 bytes
-rwxr-xr-xicon-themes/galaxy/sw/res/sidebar/pageproppanel/column_L_copy_24x24.pngbin0 -> 2878 bytes
-rwxr-xr-xicon-themes/galaxy/sw/res/sidebar/pageproppanel/column_L_left_24x24.pngbin0 -> 2907 bytes
-rwxr-xr-xicon-themes/galaxy/sw/res/sidebar/pageproppanel/column_L_right_24x24.pngbin0 -> 2909 bytes
-rwxr-xr-xicon-themes/galaxy/sw/res/sidebar/pageproppanel/columncopy_24x24.pngbin0 -> 2912 bytes
-rwxr-xr-xicon-themes/galaxy/sw/res/sidebar/pageproppanel/columnleft_24x24.pngbin0 -> 3010 bytes
-rwxr-xr-xicon-themes/galaxy/sw/res/sidebar/pageproppanel/columnright_24x24.pngbin0 -> 3013 bytes
-rwxr-xr-xicon-themes/galaxy/sw/res/sidebar/pageproppanel/documentsizeA3_24x24.pngbin0 -> 1161 bytes
-rwxr-xr-xicon-themes/galaxy/sw/res/sidebar/pageproppanel/documentsizeA4_24x24.pngbin0 -> 1143 bytes
-rwxr-xr-xicon-themes/galaxy/sw/res/sidebar/pageproppanel/documentsizeA5_24x24.pngbin0 -> 1156 bytes
-rwxr-xr-xicon-themes/galaxy/sw/res/sidebar/pageproppanel/documentsizeB4_24x24.pngbin0 -> 1148 bytes
-rwxr-xr-xicon-themes/galaxy/sw/res/sidebar/pageproppanel/documentsizeB5_24x24.pngbin0 -> 1157 bytes
-rwxr-xr-xicon-themes/galaxy/sw/res/sidebar/pageproppanel/documentsizeC5_24x24.pngbin0 -> 1175 bytes
-rwxr-xr-xicon-themes/galaxy/sw/res/sidebar/pageproppanel/documentsize_L_A3_24x24.pngbin0 -> 1187 bytes
-rwxr-xr-xicon-themes/galaxy/sw/res/sidebar/pageproppanel/documentsize_L_A4_24x24.pngbin0 -> 1172 bytes
-rwxr-xr-xicon-themes/galaxy/sw/res/sidebar/pageproppanel/documentsize_L_A5_24x24.pngbin0 -> 1189 bytes
-rwxr-xr-xicon-themes/galaxy/sw/res/sidebar/pageproppanel/documentsize_L_B4_24x24.pngbin0 -> 1186 bytes
-rwxr-xr-xicon-themes/galaxy/sw/res/sidebar/pageproppanel/documentsize_L_B5_24x24.pngbin0 -> 1194 bytes
-rwxr-xr-xicon-themes/galaxy/sw/res/sidebar/pageproppanel/documentsize_L_C5_24x24.pngbin0 -> 1207 bytes
-rwxr-xr-xicon-themes/galaxy/sw/res/sidebar/pageproppanel/documentsize_L_copy_24x24.pngbin0 -> 1097 bytes
-rwxr-xr-xicon-themes/galaxy/sw/res/sidebar/pageproppanel/documentsizecopy_24x24.pngbin0 -> 1071 bytes
-rwxr-xr-xicon-themes/galaxy/sw/res/sidebar/pageproppanel/format_L_copy_24x24.pngbin0 -> 2878 bytes
-rwxr-xr-xicon-themes/galaxy/sw/res/sidebar/pageproppanel/format_L_mirror_24x24.pngbin0 -> 2906 bytes
-rwxr-xr-xicon-themes/galaxy/sw/res/sidebar/pageproppanel/format_L_narrow_24x24.pngbin0 -> 2914 bytes
-rwxr-xr-xicon-themes/galaxy/sw/res/sidebar/pageproppanel/format_L_nomal_24x24.pngbin0 -> 2913 bytes
-rwxr-xr-xicon-themes/galaxy/sw/res/sidebar/pageproppanel/format_L_wide_24x24.pngbin0 -> 2915 bytes
-rwxr-xr-xicon-themes/galaxy/sw/res/sidebar/pageproppanel/formatcopy_24x24.pngbin0 -> 2912 bytes
-rwxr-xr-xicon-themes/galaxy/sw/res/sidebar/pageproppanel/formatmirror_24x24.pngbin0 -> 2905 bytes
-rwxr-xr-xicon-themes/galaxy/sw/res/sidebar/pageproppanel/formatnarrow_24x24.pngbin0 -> 2970 bytes
-rwxr-xr-xicon-themes/galaxy/sw/res/sidebar/pageproppanel/formatnormal_24x24.pngbin0 -> 2954 bytes
-rwxr-xr-xicon-themes/galaxy/sw/res/sidebar/pageproppanel/formatwide_24x24.pngbin0 -> 2975 bytes
-rwxr-xr-xicon-themes/galaxy/sw/res/sidebar/pageproppanel/last_custom_common.pngbin0 -> 3431 bytes
-rwxr-xr-xicon-themes/galaxy/sw/res/sidebar/pageproppanel/last_custom_common_grey.pngbin0 -> 3385 bytes
-rwxr-xr-xicon-themes/galaxy/sw/res/sidebar/pageproppanel/portraitcopy_24x24.pngbin0 -> 5118 bytes
-rwxr-xr-xicon-themes/hicontrast/sc/res/sidebar/CellBorderLineStyle_005.pngbin0 -> 2835 bytes
-rwxr-xr-xicon-themes/hicontrast/sc/res/sidebar/CellBorderLineStyle_110.pngbin0 -> 2845 bytes
-rwxr-xr-xicon-themes/hicontrast/sc/res/sidebar/CellBorderLineStyle_250.pngbin0 -> 2835 bytes
-rwxr-xr-xicon-themes/hicontrast/sc/res/sidebar/CellBorderLineStyle_260.pngbin0 -> 2845 bytes
-rwxr-xr-xicon-themes/hicontrast/sc/res/sidebar/CellBorderLineStyle_400.pngbin0 -> 2836 bytes
-rwxr-xr-xicon-themes/hicontrast/sc/res/sidebar/CellBorderLineStyle_450.pngbin0 -> 2845 bytes
-rwxr-xr-xicon-themes/hicontrast/sc/res/sidebar/CellBorderLineStyle_500.pngbin0 -> 2837 bytes
-rwxr-xr-xicon-themes/hicontrast/sc/res/sidebar/CellBorderLineStyle_505.pngbin0 -> 2845 bytes
-rwxr-xr-xicon-themes/hicontrast/sc/res/sidebar/CellBorderLineStyle_750.pngbin0 -> 2846 bytes
-rwxr-xr-xicon-themes/hicontrast/sc/res/sidebar/CellBorder_All_18x18.pngbin0 -> 155 bytes
-rwxr-xr-xicon-themes/hicontrast/sc/res/sidebar/CellBorder_Bottom_18x18.pngbin0 -> 149 bytes
-rwxr-xr-xicon-themes/hicontrast/sc/res/sidebar/CellBorder_Bottom_Double_18x18.pngbin0 -> 154 bytes
-rwxr-xr-xicon-themes/hicontrast/sc/res/sidebar/CellBorder_Bottom_Thick_18x18.pngbin0 -> 149 bytes
-rwxr-xr-xicon-themes/hicontrast/sc/res/sidebar/CellBorder_Empty_18x18.pngbin0 -> 134 bytes
-rwxr-xr-xicon-themes/hicontrast/sc/res/sidebar/CellBorder_FourBorders_18x18.pngbin0 -> 154 bytes
-rwxr-xr-xicon-themes/hicontrast/sc/res/sidebar/CellBorder_FourBorders_Thick_18x18.pngbin0 -> 155 bytes
-rwxr-xr-xicon-themes/hicontrast/sc/res/sidebar/CellBorder_LeftAndRight_18x18.pngbin0 -> 169 bytes
-rwxr-xr-xicon-themes/hicontrast/sc/res/sidebar/CellBorder_LeftDiagonal_18x18.pngbin0 -> 252 bytes
-rwxr-xr-xicon-themes/hicontrast/sc/res/sidebar/CellBorder_Left_18x18.pngbin0 -> 159 bytes
-rwxr-xr-xicon-themes/hicontrast/sc/res/sidebar/CellBorder_RightDiagonal_18x18.pngbin0 -> 213 bytes
-rwxr-xr-xicon-themes/hicontrast/sc/res/sidebar/CellBorder_Right_18x18.pngbin0 -> 163 bytes
-rwxr-xr-xicon-themes/hicontrast/sc/res/sidebar/CellBorder_TopAndBottom_18x18.pngbin0 -> 150 bytes
-rwxr-xr-xicon-themes/hicontrast/sc/res/sidebar/CellBorder_TopSingle_BottomDouble_18x18.pngbin0 -> 151 bytes
-rwxr-xr-xicon-themes/hicontrast/sc/res/sidebar/CellBorder_TopThin_BottomThick_18x18.pngbin0 -> 152 bytes
-rwxr-xr-xicon-themes/hicontrast/sc/res/sidebar/CellBorder_Top_18x18.pngbin0 -> 159 bytes
-rwxr-xr-xicon-themes/hicontrast/sc/res/sidebar/fill_color.pngbin0 -> 3483 bytes
-rw-r--r--icon-themes/hicontrast/sfx2/res/grip.pngbin0 -> 188 bytes
-rw-r--r--icon-themes/hicontrast/sfx2/res/menu.pngbin0 -> 216 bytes
-rw-r--r--icon-themes/hicontrast/sfx2/res/symphony/morebutton.pngbin0 -> 3023 bytes
-rw-r--r--icon-themes/hicontrast/sfx2/res/symphony/sidebar-3d-large.pngbin0 -> 4072 bytes
-rw-r--r--icon-themes/hicontrast/sfx2/res/symphony/sidebar-3d-small.pngbin0 -> 3522 bytes
-rw-r--r--icon-themes/hicontrast/sfx2/res/symphony/sidebar-animation-large.pngbin0 -> 4000 bytes
-rw-r--r--icon-themes/hicontrast/sfx2/res/symphony/sidebar-animation-small.pngbin0 -> 3553 bytes
-rw-r--r--icon-themes/hicontrast/sfx2/res/symphony/sidebar-colors-large.pngbin0 -> 3790 bytes
-rw-r--r--icon-themes/hicontrast/sfx2/res/symphony/sidebar-colors-small.pngbin0 -> 3544 bytes
-rw-r--r--icon-themes/hicontrast/sfx2/res/symphony/sidebar-eyedropper-large.pngbin0 -> 3416 bytes
-rw-r--r--icon-themes/hicontrast/sfx2/res/symphony/sidebar-eyedropper-small.pngbin0 -> 3534 bytes
-rw-r--r--icon-themes/hicontrast/sfx2/res/symphony/sidebar-functions-large.pngbin0 -> 3834 bytes
-rw-r--r--icon-themes/hicontrast/sfx2/res/symphony/sidebar-functions-small.pngbin0 -> 3395 bytes
-rw-r--r--icon-themes/hicontrast/sfx2/res/symphony/sidebar-gallery-large.pngbin0 -> 1492 bytes
-rw-r--r--icon-themes/hicontrast/sfx2/res/symphony/sidebar-gallery-small.pngbin0 -> 3642 bytes
-rw-r--r--icon-themes/hicontrast/sfx2/res/symphony/sidebar-imganim-large.pngbin0 -> 1710 bytes
-rw-r--r--icon-themes/hicontrast/sfx2/res/symphony/sidebar-imganim-small.pngbin0 -> 3640 bytes
-rw-r--r--icon-themes/hicontrast/sfx2/res/symphony/sidebar-navigator-large.pngbin0 -> 4333 bytes
-rw-r--r--icon-themes/hicontrast/sfx2/res/symphony/sidebar-navigator-small.pngbin0 -> 3665 bytes
-rw-r--r--icon-themes/hicontrast/sfx2/res/symphony/sidebar-property-large.pngbin0 -> 3761 bytes
-rw-r--r--icon-themes/hicontrast/sfx2/res/symphony/sidebar-property-small.pngbin0 -> 3515 bytes
-rw-r--r--icon-themes/hicontrast/sfx2/res/symphony/sidebar-style-large.pngbin0 -> 4323 bytes
-rw-r--r--icon-themes/hicontrast/sfx2/res/symphony/sidebar-style-small.pngbin0 -> 3714 bytes
-rw-r--r--icon-themes/hicontrast/sfx2/res/symphony/sidebar-template-large.pngbin0 -> 3510 bytes
-rw-r--r--icon-themes/hicontrast/sfx2/res/symphony/sidebar-template-small.pngbin0 -> 3221 bytes
-rw-r--r--icon-themes/hicontrast/sfx2/res/symphony/sidebar-transition-large.pngbin0 -> 3728 bytes
-rw-r--r--icon-themes/hicontrast/sfx2/res/symphony/sidebar-transition-small.pngbin0 -> 3475 bytes
-rw-r--r--icon-themes/hicontrast/svx/res/rotation.pngbin0 -> 3848 bytes
-rw-r--r--icon-themes/hicontrast/svx/res/symphony/Quadratic.pngbin0 -> 3538 bytes
-rw-r--r--icon-themes/hicontrast/svx/res/symphony/Square.pngbin0 -> 3033 bytes
-rw-r--r--icon-themes/hicontrast/svx/res/symphony/__morebutton.bmpbin0 -> 5346 bytes
-rw-r--r--icon-themes/hicontrast/svx/res/symphony/axial.pngbin0 -> 2897 bytes
-rw-r--r--icon-themes/hicontrast/svx/res/symphony/ellipsoid.pngbin0 -> 3140 bytes
-rw-r--r--icon-themes/hicontrast/svx/res/symphony/fill_color.pngbin0 -> 3366 bytes
-rw-r--r--icon-themes/hicontrast/svx/res/symphony/line1.pngbin0 -> 2816 bytes
-rw-r--r--icon-themes/hicontrast/svx/res/symphony/line10.pngbin0 -> 2894 bytes
-rw-r--r--icon-themes/hicontrast/svx/res/symphony/line2.pngbin0 -> 2825 bytes
-rw-r--r--icon-themes/hicontrast/svx/res/symphony/line3.pngbin0 -> 2817 bytes
-rw-r--r--icon-themes/hicontrast/svx/res/symphony/line4.pngbin0 -> 2832 bytes
-rw-r--r--icon-themes/hicontrast/svx/res/symphony/line5.pngbin0 -> 2867 bytes
-rw-r--r--icon-themes/hicontrast/svx/res/symphony/line6.pngbin0 -> 2867 bytes
-rw-r--r--icon-themes/hicontrast/svx/res/symphony/line7.pngbin0 -> 2834 bytes
-rw-r--r--icon-themes/hicontrast/svx/res/symphony/line8.pngbin0 -> 2873 bytes
-rw-r--r--icon-themes/hicontrast/svx/res/symphony/line9.pngbin0 -> 2881 bytes
-rw-r--r--icon-themes/hicontrast/svx/res/symphony/linear.pngbin0 -> 2930 bytes
-rw-r--r--icon-themes/hicontrast/svx/res/symphony/radial.pngbin0 -> 3086 bytes
-rw-r--r--icon-themes/hicontrast/svx/res/symphony/rotation.pngbin0 -> 3880 bytes
-rw-r--r--icon-themes/hicontrast/svx/res/symphony/style_line1.pngbin0 -> 2886 bytes
-rw-r--r--icon-themes/hicontrast/svx/res/symphony/style_line10.pngbin0 -> 2901 bytes
-rw-r--r--icon-themes/hicontrast/svx/res/symphony/style_line11.pngbin0 -> 2897 bytes
-rw-r--r--icon-themes/hicontrast/svx/res/symphony/style_line2.pngbin0 -> 2882 bytes
-rw-r--r--icon-themes/hicontrast/svx/res/symphony/style_line3.pngbin0 -> 2891 bytes
-rw-r--r--icon-themes/hicontrast/svx/res/symphony/style_line4.pngbin0 -> 2891 bytes
-rw-r--r--icon-themes/hicontrast/svx/res/symphony/style_line5.pngbin0 -> 2894 bytes
-rw-r--r--icon-themes/hicontrast/svx/res/symphony/style_line6.pngbin0 -> 2888 bytes
-rw-r--r--icon-themes/hicontrast/svx/res/symphony/style_line7.pngbin0 -> 2887 bytes
-rw-r--r--icon-themes/hicontrast/svx/res/symphony/style_line8.pngbin0 -> 2903 bytes
-rw-r--r--icon-themes/hicontrast/svx/res/symphony/style_line9.pngbin0 -> 2897 bytes
-rw-r--r--icon-themes/hicontrast/svx/res/symphony/width1.pngbin0 -> 2827 bytes
-rw-r--r--icon-themes/hicontrast/svx/res/symphony/width2.pngbin0 -> 2834 bytes
-rw-r--r--icon-themes/hicontrast/svx/res/symphony/width3.pngbin0 -> 2834 bytes
-rw-r--r--icon-themes/hicontrast/svx/res/symphony/width4.pngbin0 -> 2834 bytes
-rw-r--r--icon-themes/hicontrast/svx/res/symphony/width5.pngbin0 -> 2835 bytes
-rw-r--r--icon-themes/hicontrast/svx/res/symphony/width6.pngbin0 -> 2836 bytes
-rw-r--r--icon-themes/hicontrast/svx/res/symphony/width7.pngbin0 -> 2835 bytes
-rw-r--r--icon-themes/hicontrast/svx/res/symphony/width8.pngbin0 -> 2835 bytes
-rw-r--r--include/editeng/outliner.hxx6
-rw-r--r--include/sfx2/navigat.hxx2
-rw-r--r--include/sfx2/sfx.hrc1
-rw-r--r--include/sfx2/sfxsids.hrc1
-rw-r--r--include/sfx2/shell.hxx2
-rw-r--r--include/sfx2/sidebar/ContextChangeBroadcaster.hxx58
-rw-r--r--include/sfx2/sidebar/ControlFactory.hxx46
-rw-r--r--include/sfx2/sidebar/ControllerItem.hxx55
-rw-r--r--include/sfx2/sidebar/EnumContext.hxx169
-rw-r--r--include/sfx2/sidebar/IContextChangeReceiver.hxx37
-rw-r--r--include/sfx2/sidebar/ILayoutableWindow.hxx44
-rw-r--r--include/sfx2/sidebar/PopupContainer.hxx37
-rw-r--r--include/sfx2/sidebar/ResourceDefinitions.hrc141
-rw-r--r--include/sfx2/sidebar/SidebarChildWindow.hxx48
-rw-r--r--include/sfx2/sidebar/SidebarPanelBase.hxx124
-rw-r--r--include/sfx2/sidebar/Theme.hxx278
-rw-r--r--include/sfx2/styfitem.hxx3
-rw-r--r--include/sfx2/templdlg.hxx26
-rw-r--r--include/svx/dialcontrol.hxx68
-rw-r--r--include/svx/dialogs.hrc107
-rw-r--r--include/svx/dlgctrl.hxx23
-rw-r--r--include/svx/dlgutil.hxx1
-rw-r--r--include/svx/galbrws.hxx6
-rw-r--r--include/svx/svdedtv.hxx1
-rw-r--r--include/svx/svdedxv.hxx3
-rw-r--r--include/svx/svdobj.hxx4
-rw-r--r--include/svx/svdogrp.hxx3
-rw-r--r--include/svx/svdstr.hrc1
-rw-r--r--include/svx/svxids.hrc34
-rw-r--r--include/svx/xenum.hxx8
-rw-r--r--include/svx/xlinjoit.hxx9
-rw-r--r--include/svx/xlncapit.hxx2
-rw-r--r--include/svx/xtable.hxx117
-rw-r--r--include/vcl/button.hxx10
-rw-r--r--include/vcl/split.hxx4
-rw-r--r--include/vcl/window.hxx8
-rw-r--r--offapi/UnoApi_offapi.mk7
-rw-r--r--offapi/com/sun/star/ui/ContextChangeEventMultiplexer.idl35
-rw-r--r--offapi/com/sun/star/ui/ContextChangeEventObject.idl47
-rw-r--r--offapi/com/sun/star/ui/LayoutSize.idl46
-rw-r--r--offapi/com/sun/star/ui/XContextChangeEventListener.idl43
-rw-r--r--offapi/com/sun/star/ui/XContextChangeEventMultiplexer.idl125
-rw-r--r--offapi/com/sun/star/ui/XContextChangeListener.idl45
-rw-r--r--offapi/com/sun/star/ui/XSidebar.idl40
-rw-r--r--offapi/com/sun/star/ui/XSidebarPanel.idl58
-rw-r--r--offapi/com/sun/star/util/EventMultiplexer.idl35
-rw-r--r--officecfg/Configuration_officecfg.mk1
-rw-r--r--officecfg/files.mk1
-rw-r--r--officecfg/registry/data/org/openoffice/Office/Impress.xcu44
-rw-r--r--officecfg/registry/data/org/openoffice/Office/UI/Factories.xcu50
-rw-r--r--officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu5
-rw-r--r--officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu55
-rw-r--r--officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu959
-rw-r--r--officecfg/registry/data/org/openoffice/Office/Views.xcu6
-rw-r--r--officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs203
-rw-r--r--postprocess/CustomTarget_registry.mk2
-rw-r--r--sc/AllLangResTarget_sc.mk3
-rw-r--r--sc/Library_sc.mk10
-rw-r--r--sc/inc/ScPanelFactory.hxx66
-rw-r--r--sc/inc/helpids.h68
-rw-r--r--sc/inc/sc.hrc20
-rw-r--r--sc/sdi/cellsh.sdi2
-rw-r--r--sc/sdi/drawsh.sdi25
-rw-r--r--sc/sdi/drtxtob.sdi15
-rw-r--r--sc/sdi/editsh.sdi2
-rw-r--r--sc/sdi/formatsh.sdi6
-rw-r--r--sc/sdi/scalc.sdi51
-rw-r--r--sc/source/core/data/docpool.cxx3
-rw-r--r--sc/source/filter/excel/xiescher.cxx2
-rw-r--r--sc/source/ui/app/inputhdl.cxx6
-rw-r--r--sc/source/ui/app/scdll.cxx2
-rw-r--r--sc/source/ui/app/scmod.cxx3
-rw-r--r--sc/source/ui/app/typemap.cxx8
-rw-r--r--sc/source/ui/docshell/docfunc.cxx5
-rw-r--r--sc/source/ui/drawfunc/chartsh.cxx7
-rw-r--r--sc/source/ui/drawfunc/drawsh.cxx28
-rw-r--r--sc/source/ui/drawfunc/drawsh2.cxx34
-rw-r--r--sc/source/ui/drawfunc/drawsh5.cxx4
-rw-r--r--sc/source/ui/drawfunc/drformsh.cxx4
-rw-r--r--sc/source/ui/drawfunc/drtxtob.cxx235
-rw-r--r--sc/source/ui/drawfunc/drtxtob1.cxx6
-rw-r--r--sc/source/ui/drawfunc/futext.cxx9
-rw-r--r--sc/source/ui/drawfunc/graphsh.cxx3
-rw-r--r--sc/source/ui/drawfunc/mediash.cxx2
-rw-r--r--sc/source/ui/drawfunc/oleobjsh.cxx8
-rw-r--r--sc/source/ui/formdlg/dwfunctr.cxx5
-rw-r--r--sc/source/ui/inc/chartsh.hxx2
-rw-r--r--sc/source/ui/inc/drawsh.hxx9
-rw-r--r--sc/source/ui/inc/drformsh.hxx3
-rw-r--r--sc/source/ui/inc/drtxtob.hxx3
-rw-r--r--sc/source/ui/inc/formatsh.hxx3
-rw-r--r--sc/source/ui/inc/navipi.hxx4
-rw-r--r--sc/source/ui/inc/oleobjsh.hxx1
-rw-r--r--sc/source/ui/navipi/navipi.cxx64
-rw-r--r--sc/source/ui/sidebar/AlignmentPropertyPanel.cxx632
-rw-r--r--sc/source/ui/sidebar/AlignmentPropertyPanel.hrc84
-rw-r--r--sc/source/ui/sidebar/AlignmentPropertyPanel.hxx126
-rw-r--r--sc/source/ui/sidebar/AlignmentPropertyPanel.src213
-rw-r--r--sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx865
-rw-r--r--sc/source/ui/sidebar/CellAppearancePropertyPanel.hrc114
-rw-r--r--sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx197
-rw-r--r--sc/source/ui/sidebar/CellAppearancePropertyPanel.src495
-rw-r--r--sc/source/ui/sidebar/CellBorderStyleControl.cxx344
-rw-r--r--sc/source/ui/sidebar/CellBorderStyleControl.hxx56
-rw-r--r--sc/source/ui/sidebar/CellBorderStylePopup.cxx37
-rw-r--r--sc/source/ui/sidebar/CellBorderStylePopup.hxx39
-rw-r--r--sc/source/ui/sidebar/CellBorderUpdater.cxx122
-rw-r--r--sc/source/ui/sidebar/CellBorderUpdater.hxx42
-rw-r--r--sc/source/ui/sidebar/CellLineStyleControl.cxx254
-rw-r--r--sc/source/ui/sidebar/CellLineStyleControl.hxx68
-rw-r--r--sc/source/ui/sidebar/CellLineStylePopup.cxx49
-rw-r--r--sc/source/ui/sidebar/CellLineStylePopup.hxx41
-rw-r--r--sc/source/ui/sidebar/CellLineStyleValueSet.cxx179
-rw-r--r--sc/source/ui/sidebar/CellLineStyleValueSet.hxx50
-rw-r--r--sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx384
-rw-r--r--sc/source/ui/sidebar/NumberFormatPropertyPanel.hrc70
-rw-r--r--sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx104
-rw-r--r--sc/source/ui/sidebar/NumberFormatPropertyPanel.src183
-rw-r--r--sc/source/ui/sidebar/ScPanelFactory.cxx168
-rw-r--r--sc/source/ui/unoobj/appluno.cxx112
-rw-r--r--sc/source/ui/view/auditsh.cxx3
-rw-r--r--sc/source/ui/view/cellsh.cxx3
-rw-r--r--sc/source/ui/view/cellsh3.cxx8
-rw-r--r--sc/source/ui/view/drawview.cxx7
-rw-r--r--sc/source/ui/view/editsh.cxx48
-rw-r--r--sc/source/ui/view/formatsh.cxx529
-rw-r--r--sc/source/ui/view/gridwin.cxx26
-rw-r--r--sc/source/ui/view/pivotsh.cxx2
-rw-r--r--sc/source/ui/view/tabview3.cxx27
-rw-r--r--sc/source/ui/view/tabvwsh.cxx2
-rw-r--r--sc/source/ui/view/tabvwsh4.cxx5
-rw-r--r--sc/source/ui/view/viewfunc.cxx5
-rw-r--r--sc/uiconfig/scalc/menubar/menubar.xml1
-rw-r--r--sc/util/sc.component3
-rw-r--r--sd/Library_sd.mk18
-rw-r--r--sd/inc/glob.hrc8
-rw-r--r--sd/inc/glob.hxx4
-rw-r--r--sd/sdi/_drvwsh.sdi247
-rw-r--r--sd/sdi/drtxtob.sdi20
-rw-r--r--sd/sdi/outlnvsh.sdi15
-rw-r--r--sd/sdi/sdslots.sdi2
-rw-r--r--sd/source/core/glob.src8
-rw-r--r--sd/source/core/typemap.cxx7
-rw-r--r--sd/source/ui/animations/CustomAnimationPane.cxx52
-rw-r--r--sd/source/ui/animations/CustomAnimationPane.hxx4
-rw-r--r--sd/source/ui/animations/SlideTransitionPane.cxx41
-rw-r--r--sd/source/ui/animations/SlideTransitionPane.hxx5
-rw-r--r--sd/source/ui/app/sddll1.cxx5
-rw-r--r--sd/source/ui/app/sddll2.cxx3
-rw-r--r--sd/source/ui/app/sdmod1.cxx2
-rw-r--r--sd/source/ui/dlg/NavigatorChildWindow.cxx28
-rw-r--r--sd/source/ui/dlg/PaneChildWindows.cxx10
-rw-r--r--sd/source/ui/dlg/PaneShells.cxx26
-rw-r--r--sd/source/ui/dlg/navigatr.cxx68
-rw-r--r--sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx13
-rw-r--r--sd/source/ui/framework/configuration/ResourceFactoryManager.cxx15
-rw-r--r--sd/source/ui/framework/factories/BasicPaneFactory.cxx16
-rw-r--r--sd/source/ui/framework/factories/BasicPaneFactory.hxx1
-rw-r--r--sd/source/ui/framework/factories/BasicViewFactory.cxx13
-rw-r--r--sd/source/ui/framework/factories/Pane.cxx10
-rw-r--r--sd/source/ui/framework/factories/TaskPanelResource.cxx129
-rw-r--r--sd/source/ui/framework/factories/ViewShellWrapper.cxx2
-rw-r--r--sd/source/ui/framework/module/ImpressModule.cxx2
-rw-r--r--sd/source/ui/framework/module/ModuleController.cxx17
-rw-r--r--sd/source/ui/framework/module/ToolPanelModule.cxx4
-rw-r--r--sd/source/ui/framework/tools/FrameworkHelper.cxx182
-rw-r--r--sd/source/ui/func/fuarea.cxx2
-rw-r--r--sd/source/ui/func/fuchar.cxx9
-rw-r--r--sd/source/ui/func/fuline.cxx15
-rw-r--r--sd/source/ui/func/fuolbull.cxx407
-rw-r--r--sd/source/ui/func/fuoltext.cxx3
-rw-r--r--sd/source/ui/func/fuparagr.cxx2
-rw-r--r--sd/source/ui/func/futext.cxx18
-rw-r--r--sd/source/ui/inc/DrawViewShell.hxx14
-rw-r--r--sd/source/ui/inc/PaneChildWindows.hxx22
-rw-r--r--sd/source/ui/inc/SidebarPanelId.hxx49
-rw-r--r--sd/source/ui/inc/SlideSorterViewShell.hxx1
-rw-r--r--sd/source/ui/inc/TextObjectBar.hxx1
-rw-r--r--sd/source/ui/inc/View.hxx3
-rw-r--r--sd/source/ui/inc/ViewShell.hxx5
-rw-r--r--sd/source/ui/inc/framework/FrameworkHelper.hxx133
-rw-r--r--sd/source/ui/inc/framework/Pane.hxx1
-rw-r--r--sd/source/ui/inc/framework/TaskPanelResource.hxx81
-rw-r--r--sd/source/ui/inc/fuolbull.hxx7
-rw-r--r--sd/source/ui/inc/navigatr.hxx22
-rw-r--r--sd/source/ui/presenter/PresenterHelper.hxx2
-rw-r--r--sd/source/ui/sidebar/AllMasterPagesSelector.cxx229
-rw-r--r--sd/source/ui/sidebar/AllMasterPagesSelector.hxx95
-rw-r--r--sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx352
-rw-r--r--sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx88
-rw-r--r--sd/source/ui/sidebar/CustomAnimationPanel.cxx74
-rw-r--r--sd/source/ui/sidebar/CustomAnimationPanel.hxx46
-rw-r--r--sd/source/ui/sidebar/DocumentHelper.cxx570
-rw-r--r--sd/source/ui/sidebar/DocumentHelper.hxx110
-rw-r--r--sd/source/ui/sidebar/IDisposable.hxx39
-rw-r--r--sd/source/ui/sidebar/ISidebarReceiver.hxx37
-rw-r--r--sd/source/ui/sidebar/LayoutMenu.cxx979
-rw-r--r--sd/source/ui/sidebar/LayoutMenu.hxx226
-rw-r--r--sd/source/ui/sidebar/MasterPageContainer.cxx1211
-rw-r--r--sd/source/ui/sidebar/MasterPageContainer.hxx208
-rw-r--r--sd/source/ui/sidebar/MasterPageContainerFiller.cxx189
-rw-r--r--sd/source/ui/sidebar/MasterPageContainerFiller.hxx92
-rw-r--r--sd/source/ui/sidebar/MasterPageContainerProviders.cxx403
-rw-r--r--sd/source/ui/sidebar/MasterPageContainerProviders.hxx192
-rw-r--r--sd/source/ui/sidebar/MasterPageContainerQueue.cxx299
-rw-r--r--sd/source/ui/sidebar/MasterPageContainerQueue.hxx134
-rw-r--r--sd/source/ui/sidebar/MasterPageDescriptor.cxx415
-rw-r--r--sd/source/ui/sidebar/MasterPageDescriptor.hxx235
-rw-r--r--sd/source/ui/sidebar/MasterPagesSelector.cxx845
-rw-r--r--sd/source/ui/sidebar/MasterPagesSelector.hxx238
-rw-r--r--sd/source/ui/sidebar/NavigatorWrapper.cxx84
-rw-r--r--sd/source/ui/sidebar/NavigatorWrapper.hxx68
-rw-r--r--sd/source/ui/sidebar/PanelBase.cxx133
-rw-r--r--sd/source/ui/sidebar/PanelBase.hxx86
-rw-r--r--sd/source/ui/sidebar/PanelFactory.cxx207
-rw-r--r--sd/source/ui/sidebar/PanelFactory.hxx84
-rw-r--r--sd/source/ui/sidebar/PreviewValueSet.cxx180
-rw-r--r--sd/source/ui/sidebar/PreviewValueSet.hxx69
-rw-r--r--sd/source/ui/sidebar/RecentMasterPagesSelector.cxx178
-rw-r--r--sd/source/ui/sidebar/RecentMasterPagesSelector.hxx77
-rw-r--r--sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx479
-rw-r--r--sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx119
-rw-r--r--sd/source/ui/sidebar/SidebarFocusManager.hxx130
-rw-r--r--sd/source/ui/sidebar/SidebarShellManager.cxx176
-rw-r--r--sd/source/ui/sidebar/SidebarShellManager.hxx116
-rw-r--r--sd/source/ui/sidebar/SlideTransitionPanel.cxx71
-rw-r--r--sd/source/ui/sidebar/SlideTransitionPanel.hxx46
-rw-r--r--sd/source/ui/sidebar/TableDesignPanel.cxx69
-rw-r--r--sd/source/ui/sidebar/TableDesignPanel.hxx45
-rw-r--r--sd/source/ui/slidesorter/controller/SlsSlotManager.cxx3
-rw-r--r--sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx53
-rw-r--r--sd/source/ui/table/TableDesignPane.cxx104
-rw-r--r--sd/source/ui/table/TableDesignPane.hxx7
-rw-r--r--sd/source/ui/table/TableDesignPane.src16
-rw-r--r--sd/source/ui/table/tablefunction.cxx2
-rw-r--r--sd/source/ui/table/tableobjectbar.cxx4
-rw-r--r--sd/source/ui/toolpanel/ToolPanelViewShell.cxx4
-rw-r--r--sd/source/ui/unoidl/facreg.cxx39
-rw-r--r--sd/source/ui/view/ToolBarManager.cxx2
-rw-r--r--sd/source/ui/view/ViewShellBase.cxx25
-rw-r--r--sd/source/ui/view/ViewShellImplementation.cxx7
-rw-r--r--sd/source/ui/view/ViewShellManager.cxx61
-rw-r--r--sd/source/ui/view/drtxtob.cxx45
-rw-r--r--sd/source/ui/view/drtxtob1.cxx83
-rw-r--r--sd/source/ui/view/drviews2.cxx311
-rw-r--r--sd/source/ui/view/drviews3.cxx93
-rw-r--r--sd/source/ui/view/drviews7.cxx7
-rw-r--r--sd/source/ui/view/drviewsa.cxx38
-rw-r--r--sd/source/ui/view/drviewsf.cxx276
-rw-r--r--sd/source/ui/view/drviewsj.cxx8
-rw-r--r--sd/source/ui/view/drvwshrg.cxx3
-rw-r--r--sd/source/ui/view/outlnvs2.cxx14
-rw-r--r--sd/source/ui/view/outlnvsh.cxx5
-rw-r--r--sd/source/ui/view/sdview.cxx190
-rw-r--r--sd/source/ui/view/viewshel.cxx101
-rw-r--r--sd/uiconfig/sdraw/menubar/menubar.xml1
-rw-r--r--sd/uiconfig/simpress/menubar/menubar.xml1
-rw-r--r--sd/util/sd.component7
-rw-r--r--sfx2/AllLangResTarget_sfx2.mk1
-rw-r--r--sfx2/Library_sfx.mk31
-rw-r--r--sfx2/sdi/frmslots.sdi5
-rw-r--r--sfx2/sdi/sfx.sdi26
-rw-r--r--sfx2/source/control/bindings.cxx2
-rw-r--r--sfx2/source/control/shell.cxx16
-rw-r--r--sfx2/source/dialog/dialog.src4
-rw-r--r--sfx2/source/dialog/dockwin.cxx8
-rw-r--r--sfx2/source/dialog/taskpane.cxx2
-rw-r--r--sfx2/source/dialog/templdlg.cxx190
-rw-r--r--sfx2/source/inc/helpid.hrc2
-rw-r--r--sfx2/source/inc/templdgi.hxx12
-rw-r--r--sfx2/source/sidebar/AsynchronousCall.cxx87
-rw-r--r--sfx2/source/sidebar/AsynchronousCall.hxx51
-rw-r--r--sfx2/source/sidebar/Context.cxx116
-rw-r--r--sfx2/source/sidebar/Context.hxx65
-rw-r--r--sfx2/source/sidebar/ContextChangeBroadcaster.cxx134
-rw-r--r--sfx2/source/sidebar/ContextList.cxx100
-rw-r--r--sfx2/source/sidebar/ContextList.hxx69
-rw-r--r--sfx2/source/sidebar/ContextMatcher.cxx136
-rw-r--r--sfx2/source/sidebar/ContextMatcher.hxx71
-rw-r--r--sfx2/source/sidebar/ControlFactory.cxx82
-rw-r--r--sfx2/source/sidebar/ControllerItem.cxx54
-rw-r--r--sfx2/source/sidebar/CustomImageRadioButton.cxx74
-rw-r--r--sfx2/source/sidebar/CustomImageRadioButton.hxx45
-rw-r--r--sfx2/source/sidebar/Deck.cxx384
-rw-r--r--sfx2/source/sidebar/Deck.hxx101
-rw-r--r--sfx2/source/sidebar/DeckConfiguration.cxx51
-rw-r--r--sfx2/source/sidebar/DeckConfiguration.hxx45
-rw-r--r--sfx2/source/sidebar/DeckDescriptor.cxx57
-rw-r--r--sfx2/source/sidebar/DeckDescriptor.hxx49
-rw-r--r--sfx2/source/sidebar/DeckLayouter.cxx511
-rw-r--r--sfx2/source/sidebar/DeckLayouter.hxx119
-rw-r--r--sfx2/source/sidebar/DeckTitleBar.cxx143
-rw-r--r--sfx2/source/sidebar/DeckTitleBar.hxx57
-rw-r--r--sfx2/source/sidebar/DrawHelper.cxx244
-rw-r--r--sfx2/source/sidebar/DrawHelper.hxx74
-rw-r--r--sfx2/source/sidebar/EnumContext.cxx326
-rw-r--r--sfx2/source/sidebar/FocusManager.cxx559
-rw-r--r--sfx2/source/sidebar/FocusManager.hxx108
-rw-r--r--sfx2/source/sidebar/MenuButton.cxx150
-rw-r--r--sfx2/source/sidebar/MenuButton.hxx52
-rw-r--r--sfx2/source/sidebar/Paint.cxx136
-rw-r--r--sfx2/source/sidebar/Paint.hxx80
-rw-r--r--sfx2/source/sidebar/Panel.cxx267
-rw-r--r--sfx2/source/sidebar/Panel.hxx86
-rw-r--r--sfx2/source/sidebar/PanelDescriptor.cxx60
-rw-r--r--sfx2/source/sidebar/PanelDescriptor.hxx49
-rw-r--r--sfx2/source/sidebar/PanelTitleBar.cxx185
-rw-r--r--sfx2/source/sidebar/PanelTitleBar.hxx62
-rw-r--r--sfx2/source/sidebar/PopupContainer.cxx50
-rw-r--r--sfx2/source/sidebar/ResourceManager.cxx621
-rw-r--r--sfx2/source/sidebar/ResourceManager.hxx121
-rw-r--r--sfx2/source/sidebar/Sidebar.cxx77
-rw-r--r--sfx2/source/sidebar/Sidebar.hrc53
-rw-r--r--sfx2/source/sidebar/Sidebar.hxx64
-rw-r--r--sfx2/source/sidebar/Sidebar.src158
-rw-r--r--sfx2/source/sidebar/SidebarChildWindow.cxx56
-rw-r--r--sfx2/source/sidebar/SidebarController.cxx927
-rw-r--r--sfx2/source/sidebar/SidebarController.hxx165
-rw-r--r--sfx2/source/sidebar/SidebarDockingWindow.cxx130
-rw-r--r--sfx2/source/sidebar/SidebarDockingWindow.hxx63
-rw-r--r--sfx2/source/sidebar/SidebarPanel.cxx171
-rw-r--r--sfx2/source/sidebar/SidebarPanel.hxx74
-rw-r--r--sfx2/source/sidebar/SidebarPanelBase.cxx251
-rw-r--r--sfx2/source/sidebar/SidebarResource.hxx35
-rw-r--r--sfx2/source/sidebar/SidebarToolBox.cxx153
-rw-r--r--sfx2/source/sidebar/SidebarToolBox.hxx52
-rw-r--r--sfx2/source/sidebar/TabBar.cxx385
-rw-r--r--sfx2/source/sidebar/TabBar.hxx120
-rw-r--r--sfx2/source/sidebar/TabItem.cxx143
-rw-r--r--sfx2/source/sidebar/TabItem.hxx54
-rw-r--r--sfx2/source/sidebar/Theme.cxx1148
-rw-r--r--sfx2/source/sidebar/TitleBar.cxx193
-rw-r--r--sfx2/source/sidebar/TitleBar.hxx72
-rw-r--r--sfx2/source/sidebar/ToolBox.hxx52
-rw-r--r--sfx2/source/sidebar/ToolBoxBackground.cxx148
-rw-r--r--sfx2/source/sidebar/ToolBoxBackground.hxx64
-rw-r--r--sfx2/source/sidebar/Tools.cxx150
-rw-r--r--sfx2/source/sidebar/Tools.hxx59
-rw-r--r--sfx2/source/view/viewfrm.cxx12
-rw-r--r--svx/AllLangResTarget_svx.mk9
-rw-r--r--svx/Library_svx.mk41
-rw-r--r--svx/Library_svxcore.mk3
-rw-r--r--svx/inc/GalleryControl.hxx75
-rw-r--r--svx/inc/galbrws2.hxx5
-rw-r--r--svx/inc/helpid.hrc122
-rw-r--r--svx/inc/sidebar/PanelFactory.hxx70
-rw-r--r--svx/inc/svx/AffineMatrixItem.hxx54
-rw-r--r--svx/inc/svx/XPropertyEntry.hxx47
-rw-r--r--svx/inc/svx/nbdtmg.hxx376
-rw-r--r--svx/inc/svx/nbdtmgfact.hxx33
-rw-r--r--svx/inc/svx/sdr/table/tablecontroller.hxx (renamed from svx/source/table/tablecontroller.hxx)7
-rw-r--r--svx/inc/svx/sidebar/ColorControl.hxx82
-rw-r--r--svx/inc/svx/sidebar/ColorPopup.hxx51
-rw-r--r--svx/inc/svx/sidebar/ContextChangeEventMultiplexer.hxx65
-rw-r--r--svx/inc/svx/sidebar/Popup.hxx103
-rw-r--r--svx/inc/svx/sidebar/PopupContainer.hxx44
-rw-r--r--svx/inc/svx/sidebar/PopupControl.hxx47
-rw-r--r--svx/inc/svx/sidebar/SelectionAnalyzer.hxx62
-rw-r--r--svx/inc/svx/sidebar/SelectionChangeHandler.hxx85
-rw-r--r--svx/inc/svx/sidebar/SidebarDialControl.hxx41
-rw-r--r--svx/inc/svx/sidebar/ValueSetWithTextControl.hxx157
-rw-r--r--svx/sdi/svx.sdi845
-rw-r--r--svx/sdi/xoitems.sdi26
-rw-r--r--svx/source/dialog/dialcontrol.cxx98
-rw-r--r--svx/source/dialog/dlgctrl.cxx194
-rw-r--r--svx/source/dialog/dlgutil.cxx5
-rw-r--r--svx/source/dialog/sdstring.src2
-rw-r--r--svx/source/dialog/svxbmpnumvalueset.src3
-rw-r--r--svx/source/gallery2/GalleryControl.cxx290
-rw-r--r--svx/source/gallery2/GallerySplitter.cxx50
-rw-r--r--svx/source/gallery2/GallerySplitter.hxx41
-rw-r--r--svx/source/gallery2/galbrws.cxx142
-rw-r--r--svx/source/gallery2/galbrws1.cxx19
-rw-r--r--svx/source/gallery2/galbrws1.hxx15
-rw-r--r--svx/source/gallery2/galbrws2.cxx14
-rw-r--r--svx/source/items/svxitems.src2
-rw-r--r--svx/source/sdr/attribute/sdrformtextattribute.cxx15
-rw-r--r--svx/source/sdr/primitive2d/sdrattributecreator.cxx45
-rw-r--r--svx/source/sidebar/ColorPanel.cxx229
-rw-r--r--svx/source/sidebar/ColorPanel.hxx60
-rw-r--r--svx/source/sidebar/ContextChangeEventMultiplexer.cxx86
-rw-r--r--svx/source/sidebar/EmptyPanel.cxx75
-rw-r--r--svx/source/sidebar/EmptyPanel.hrc (renamed from svx/source/inc/linectrl.hrc)6
-rw-r--r--svx/source/sidebar/EmptyPanel.hxx50
-rw-r--r--svx/source/sidebar/EmptyPanel.src29
-rw-r--r--svx/source/sidebar/PanelFactory.cxx205
-rw-r--r--svx/source/sidebar/SelectionAnalyzer.cxx456
-rw-r--r--svx/source/sidebar/SelectionChangeHandler.cxx115
-rw-r--r--svx/source/sidebar/area/AreaPropertyPanel.cxx1361
-rw-r--r--svx/source/sidebar/area/AreaPropertyPanel.hrc82
-rw-r--r--svx/source/sidebar/area/AreaPropertyPanel.hxx198
-rw-r--r--svx/source/sidebar/area/AreaPropertyPanel.src389
-rw-r--r--svx/source/sidebar/area/AreaTransparencyGradientControl.cxx345
-rw-r--r--svx/source/sidebar/area/AreaTransparencyGradientControl.hxx74
-rw-r--r--svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx56
-rw-r--r--svx/source/sidebar/area/AreaTransparencyGradientPopup.hxx47
-rw-r--r--svx/source/sidebar/debug/ColorPanel.cxx228
-rw-r--r--svx/source/sidebar/debug/ColorPanel.hxx57
-rw-r--r--svx/source/sidebar/debug/ContextPanel.cxx64
-rw-r--r--svx/source/sidebar/debug/ContextPanel.hxx52
-rw-r--r--svx/source/sidebar/debug/NotYetImplementedPanel.cxx44
-rw-r--r--svx/source/sidebar/debug/NotYetImplementedPanel.hxx43
-rw-r--r--svx/source/sidebar/gallery/GalleryPanel.hxx (renamed from svx/source/tbxctrls/linectrl.src)6
-rw-r--r--svx/source/sidebar/graphic/GraphicPropertyPanel.cxx455
-rw-r--r--svx/source/sidebar/graphic/GraphicPropertyPanel.hrc78
-rw-r--r--svx/source/sidebar/graphic/GraphicPropertyPanel.hxx123
-rw-r--r--svx/source/sidebar/graphic/GraphicPropertyPanel.src253
-rw-r--r--svx/source/sidebar/line/LinePropertyPanel.cxx1143
-rw-r--r--svx/source/sidebar/line/LinePropertyPanel.hrc104
-rw-r--r--svx/source/sidebar/line/LinePropertyPanel.hxx194
-rw-r--r--svx/source/sidebar/line/LinePropertyPanel.src486
-rw-r--r--svx/source/sidebar/line/LineStyleValueSet.cxx127
-rw-r--r--svx/source/sidebar/line/LineStyleValueSet.hxx47
-rw-r--r--svx/source/sidebar/line/LineWidthControl.cxx372
-rw-r--r--svx/source/sidebar/line/LineWidthControl.hxx71
-rw-r--r--svx/source/sidebar/line/LineWidthPopup.cxx83
-rw-r--r--svx/source/sidebar/line/LineWidthPopup.hxx49
-rw-r--r--svx/source/sidebar/line/LineWidthValueSet.cxx192
-rw-r--r--svx/source/sidebar/line/LineWidthValueSet.hxx53
-rw-r--r--svx/source/sidebar/nbdtmg.cxx2051
-rw-r--r--svx/source/sidebar/nbdtmgfact.cxx48
-rw-r--r--svx/source/sidebar/paragraph/ParaBulletsControl.cxx140
-rw-r--r--svx/source/sidebar/paragraph/ParaBulletsControl.hxx58
-rw-r--r--svx/source/sidebar/paragraph/ParaBulletsPopup.cxx59
-rw-r--r--svx/source/sidebar/paragraph/ParaBulletsPopup.hxx49
-rw-r--r--svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx816
-rw-r--r--svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx113
-rw-r--r--svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx78
-rw-r--r--svx/source/sidebar/paragraph/ParaLineSpacingPopup.hxx49
-rw-r--r--svx/source/sidebar/paragraph/ParaNumberingControl.cxx165
-rw-r--r--svx/source/sidebar/paragraph/ParaNumberingControl.hxx62
-rw-r--r--svx/source/sidebar/paragraph/ParaNumberingPopup.cxx60
-rw-r--r--svx/source/sidebar/paragraph/ParaNumberingPopup.hxx50
-rw-r--r--svx/source/sidebar/paragraph/ParaPropertyPanel.cxx1674
-rw-r--r--svx/source/sidebar/paragraph/ParaPropertyPanel.hrc372
-rw-r--r--svx/source/sidebar/paragraph/ParaPropertyPanel.hxx286
-rw-r--r--svx/source/sidebar/paragraph/ParaPropertyPanel.src970
-rw-r--r--svx/source/sidebar/possize/PosSizePropertyPanel.cxx1222
-rw-r--r--svx/source/sidebar/possize/PosSizePropertyPanel.hrc104
-rw-r--r--svx/source/sidebar/possize/PosSizePropertyPanel.hxx178
-rw-r--r--svx/source/sidebar/possize/PosSizePropertyPanel.src223
-rw-r--r--svx/source/sidebar/possize/SidebarDialControl.cxx82
-rw-r--r--svx/source/sidebar/possize/SidebarDialControlBmp.cxx87
-rw-r--r--svx/source/sidebar/possize/SidebarDialControlBmp.hxx43
-rw-r--r--svx/source/sidebar/text/SvxSBFontNameBox.cxx171
-rw-r--r--svx/source/sidebar/text/SvxSBFontNameBox.hxx76
-rw-r--r--svx/source/sidebar/text/TextCharacterSpacingControl.cxx463
-rw-r--r--svx/source/sidebar/text/TextCharacterSpacingControl.hxx93
-rw-r--r--svx/source/sidebar/text/TextCharacterSpacingPopup.cxx75
-rw-r--r--svx/source/sidebar/text/TextCharacterSpacingPopup.hxx44
-rw-r--r--svx/source/sidebar/text/TextPropertyPanel.cxx1572
-rw-r--r--svx/source/sidebar/text/TextPropertyPanel.hrc199
-rw-r--r--svx/source/sidebar/text/TextPropertyPanel.hxx230
-rw-r--r--svx/source/sidebar/text/TextPropertyPanel.src702
-rw-r--r--svx/source/sidebar/text/TextUnderlineControl.cxx264
-rw-r--r--svx/source/sidebar/text/TextUnderlineControl.hxx79
-rw-r--r--svx/source/sidebar/text/TextUnderlinePopup.cxx56
-rw-r--r--svx/source/sidebar/text/TextUnderlinePopup.hxx43
-rw-r--r--svx/source/sidebar/tools/ColorControl.cxx223
-rw-r--r--svx/source/sidebar/tools/ColorPopup.cxx56
-rw-r--r--svx/source/sidebar/tools/Popup.cxx144
-rw-r--r--svx/source/sidebar/tools/PopupContainer.cxx53
-rw-r--r--svx/source/sidebar/tools/PopupControl.cxx58
-rw-r--r--svx/source/sidebar/tools/ValueSetWithTextControl.cxx524
-rw-r--r--svx/source/svdraw/svdedtv1.cxx144
-rw-r--r--svx/source/svdraw/svdedxv.cxx32
-rw-r--r--svx/source/svdraw/svdfmtf.cxx10
-rw-r--r--svx/source/svdraw/svdoashp.cxx4
-rw-r--r--svx/source/svdraw/svdobj.cxx21
-rw-r--r--svx/source/svdraw/svdogrp.cxx32
-rw-r--r--svx/source/svdraw/svdopath.cxx4
-rw-r--r--svx/source/svdraw/svdotext.cxx4
-rw-r--r--svx/source/svdraw/svdstr.src6
-rw-r--r--svx/source/table/accessibletableshape.cxx2
-rw-r--r--svx/source/table/tablecontroller.cxx3
-rw-r--r--svx/source/tbxctrls/fillctrl.cxx45
-rw-r--r--svx/source/tbxctrls/itemwin.cxx4
-rw-r--r--svx/source/tbxctrls/linectrl.cxx15
-rw-r--r--svx/source/tbxctrls/tbcontrl.cxx2
-rw-r--r--svx/source/tbxctrls/tbxcolorupdate.cxx16
-rw-r--r--svx/source/unodraw/unoctabl.cxx11
-rw-r--r--svx/source/xoutdev/XPropertyEntry.cxx38
-rw-r--r--svx/source/xoutdev/xattr.cxx4
-rw-r--r--svx/source/xoutdev/xattr2.cxx172
-rw-r--r--svx/source/xoutdev/xpool.cxx7
-rw-r--r--svx/source/xoutdev/xtabbtmp.cxx9
-rw-r--r--svx/source/xoutdev/xtabcolr.cxx9
-rw-r--r--svx/source/xoutdev/xtabdash.cxx98
-rw-r--r--svx/source/xoutdev/xtabgrdt.cxx48
-rw-r--r--svx/source/xoutdev/xtabhtch.cxx43
-rw-r--r--svx/source/xoutdev/xtable.cxx176
-rw-r--r--svx/source/xoutdev/xtablend.cxx47
-rw-r--r--svx/util/svx.component3
-rw-r--r--sw/AllLangResTarget_sw.mk2
-rw-r--r--sw/CppunitTest_sw_macros_test.mk1
-rw-r--r--sw/Library_sw.mk7
-rw-r--r--sw/inc/SwPanelFactory.hxx70
-rw-r--r--sw/inc/cmdid.h14
-rw-r--r--sw/inc/docsh.hxx30
-rw-r--r--sw/inc/editsh.hxx3
-rw-r--r--sw/inc/helpid.h29
-rw-r--r--sw/inc/rcid.hrc4
-rw-r--r--sw/inc/swabstdlg.hxx9
-rw-r--r--sw/inc/swcommands.h7
-rw-r--r--sw/sdi/_annotsh.sdi25
-rw-r--r--sw/sdi/_basesh.sdi6
-rw-r--r--sw/sdi/_frmsh.sdi27
-rw-r--r--sw/sdi/_grfsh.sdi18
-rw-r--r--sw/sdi/_tabsh.sdi7
-rw-r--r--sw/sdi/_textsh.sdi39
-rw-r--r--sw/sdi/_viewsh.sdi25
-rw-r--r--sw/sdi/drawsh.sdi66
-rw-r--r--sw/sdi/drwbassh.sdi1
-rw-r--r--sw/sdi/drwtxtsh.sdi44
-rw-r--r--sw/sdi/sidebar.sdi30
-rw-r--r--sw/sdi/swriter.sdi208
-rw-r--r--sw/sdi/swslots.sdi1
-rw-r--r--sw/sdi/wdrwbase.sdi1
-rw-r--r--sw/source/core/doc/docdesc.cxx15
-rw-r--r--sw/source/core/edit/ednumber.cxx83
-rw-r--r--sw/source/core/frmedt/feshview.cxx2
-rw-r--r--sw/source/ui/app/docst.cxx28
-rw-r--r--sw/source/ui/app/mn.src12
-rw-r--r--sw/source/ui/app/swmodule.cxx4
-rw-r--r--sw/source/ui/dialog/swdlgfact.cxx8
-rw-r--r--sw/source/ui/dialog/swdlgfact.hxx2
-rw-r--r--sw/source/ui/docvw/HeaderFooterWin.cxx2
-rw-r--r--sw/source/ui/fmtui/tmpdlg.cxx12
-rw-r--r--sw/source/ui/inc/drwbassh.hxx1
-rw-r--r--sw/source/ui/inc/drwtxtsh.hxx1
-rw-r--r--sw/source/ui/inc/textsh.hxx1
-rw-r--r--sw/source/ui/inc/tmpdlg.hxx11
-rw-r--r--sw/source/ui/inc/wrap.hxx1
-rw-r--r--sw/source/ui/misc/titlepage.cxx2
-rw-r--r--sw/source/ui/shells/annotsh.cxx105
-rw-r--r--sw/source/ui/shells/basesh.cxx12
-rw-r--r--sw/source/ui/shells/beziersh.cxx3
-rw-r--r--sw/source/ui/shells/drawdlg.cxx25
-rw-r--r--sw/source/ui/shells/drawsh.cxx8
-rw-r--r--sw/source/ui/shells/drformsh.cxx2
-rw-r--r--sw/source/ui/shells/drwbassh.cxx16
-rw-r--r--sw/source/ui/shells/drwtxtex.cxx77
-rw-r--r--sw/source/ui/shells/drwtxtsh.cxx75
-rw-r--r--sw/source/ui/shells/frmsh.cxx83
-rw-r--r--sw/source/ui/shells/grfsh.cxx11
-rw-r--r--sw/source/ui/shells/mediash.cxx2
-rw-r--r--sw/source/ui/shells/olesh.cxx3
-rw-r--r--sw/source/ui/shells/slotadd.cxx5
-rw-r--r--sw/source/ui/shells/tabsh.cxx25
-rw-r--r--sw/source/ui/shells/textsh.cxx2
-rw-r--r--sw/source/ui/shells/textsh1.cxx81
-rw-r--r--sw/source/ui/shells/txtattr.cxx14
-rw-r--r--sw/source/ui/shells/txtnum.cxx209
-rw-r--r--sw/source/ui/sidebar/PageColumnControl.cxx110
-rw-r--r--sw/source/ui/sidebar/PageColumnControl.hxx63
-rw-r--r--sw/source/ui/sidebar/PageMarginControl.cxx518
-rw-r--r--sw/source/ui/sidebar/PageMarginControl.hxx120
-rw-r--r--sw/source/ui/sidebar/PageOrientationControl.cxx88
-rw-r--r--sw/source/ui/sidebar/PageOrientationControl.hxx54
-rw-r--r--sw/source/ui/sidebar/PagePropertyPanel.cxx757
-rw-r--r--sw/source/ui/sidebar/PagePropertyPanel.hrc196
-rw-r--r--sw/source/ui/sidebar/PagePropertyPanel.hxx219
-rw-r--r--sw/source/ui/sidebar/PagePropertyPanel.src695
-rw-r--r--sw/source/ui/sidebar/PageSizeControl.cxx181
-rw-r--r--sw/source/ui/sidebar/PageSizeControl.hxx69
-rw-r--r--sw/source/ui/sidebar/PropertyPanel.hrc32
-rw-r--r--sw/source/ui/sidebar/SwPanelFactory.cxx147
-rw-r--r--sw/source/ui/sidebar/WrapPropertyPanel.cxx239
-rw-r--r--sw/source/ui/sidebar/WrapPropertyPanel.hrc38
-rw-r--r--sw/source/ui/sidebar/WrapPropertyPanel.hxx84
-rw-r--r--sw/source/ui/sidebar/WrapPropertyPanel.src86
-rw-r--r--sw/source/ui/uiview/view0.cxx2
-rw-r--r--sw/source/ui/uiview/view1.cxx1
-rw-r--r--sw/source/ui/uiview/view2.cxx6
-rw-r--r--sw/source/ui/uiview/viewstat.cxx6
-rw-r--r--sw/source/ui/uiview/viewtab.cxx211
-rw-r--r--sw/source/ui/uno/unofreg.cxx9
-rw-r--r--sw/source/ui/utlui/navipi.cxx159
-rw-r--r--sw/source/ui/wrtsh/wrtsh1.cxx2
-rw-r--r--sw/source/ui/wrtsh/wrtsh3.cxx7
-rw-r--r--sw/uiconfig/swriter/menubar/menubar.xml1
-rw-r--r--sw/util/sw.component3
-rw-r--r--vcl/inc/window.h3
-rw-r--r--vcl/source/window/split.cxx58
-rw-r--r--vcl/source/window/window.cxx6
-rw-r--r--vcl/source/window/window3.cxx22
935 files changed, 66148 insertions, 1654 deletions
diff --git a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
index 88b611200308..fa8d1ebcd763 100644
--- a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
+++ b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
@@ -286,10 +286,10 @@ SdrOutliner* DrawViewWrapper::getOutliner() const
SfxItemSet DrawViewWrapper::getPositionAndSizeItemSetFromMarkedObject() const
{
SfxItemSet aFullSet( GetModel()->GetItemPool(),
- SID_ATTR_TRANSFORM_POS_X,SID_ATTR_TRANSFORM_ANGLE,
- SID_ATTR_TRANSFORM_PROTECT_POS,SID_ATTR_TRANSFORM_AUTOHEIGHT,
- SDRATTR_ECKENRADIUS,SDRATTR_ECKENRADIUS,
- SID_ATTR_METRIC,SID_ATTR_METRIC,
+ SID_ATTR_TRANSFORM_POS_X, SID_ATTR_TRANSFORM_ANGLE,
+ SID_ATTR_TRANSFORM_PROTECT_POS, SID_ATTR_TRANSFORM_AUTOHEIGHT,
+ SDRATTR_ECKENRADIUS, SDRATTR_ECKENRADIUS,
+ SID_ATTR_METRIC, SID_ATTR_METRIC,
0);
SfxItemSet aGeoSet( E3dView::GetGeoAttrFromMarked() );
aFullSet.Put( aGeoSet );
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 05c23ef2397d..4d3576d27731 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -555,8 +555,8 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickAddHdl_Impl)
if( pEntry )
{
pBitmapList->Insert( pEntry );
-
- aLbBitmaps.Append( pEntry );
+ const Size aUiSize(pBitmapList->getUiBitmapWidth(), pBitmapList->getUiBitmapHeight());
+ aLbBitmaps.Append(aUiSize, *pEntry );
aLbBitmaps.SelectEntryPos( aLbBitmaps.GetEntryCount() - 1 );
#ifdef WNT
@@ -657,7 +657,8 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickImportHdl_Impl)
XBitmapEntry* pEntry = new XBitmapEntry( aGraphic, aName );
pBitmapList->Insert( pEntry );
- aLbBitmaps.Append( pEntry );
+ const Size aUiSize(pBitmapList->getUiBitmapWidth(), pBitmapList->getUiBitmapHeight());
+ aLbBitmaps.Append(aUiSize, *pEntry );
aLbBitmaps.SelectEntryPos( aLbBitmaps.GetEntryCount() - 1 );
#ifdef WNT
@@ -705,6 +706,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickModifyHdl_Impl)
long nCount = pBitmapList->Count();
sal_Bool bDifferent = sal_False;
sal_Bool bLoop = sal_True;
+ const Size aUiSize(pBitmapList->getUiBitmapWidth(), pBitmapList->getUiBitmapHeight());
while( bLoop && pDlg->Execute() == RET_OK )
{
@@ -729,7 +731,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickModifyHdl_Impl)
pEntry->SetGraphicObject(Graphic(aBitmapEx));
- aLbBitmaps.Modify( pEntry, nPos );
+ aLbBitmaps.Modify( aUiSize, *pEntry, nPos );
aLbBitmaps.SelectEntryPos( nPos );
*pnBitmapListState |= CT_MODIFIED;
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 8f80f9132818..42d5ca8908d3 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -513,7 +513,7 @@ void SvxLineTabPage::FillListboxes()
{
// Line styles
sal_uInt16 nOldSelect = aLbLineStyle.GetSelectEntryPos();
- aLbLineStyle.FillStyles();
+ // aLbLineStyle.FillStyles();
aLbLineStyle.Fill( pDashList );
aLbLineStyle.SelectEntryPos( nOldSelect );
@@ -887,22 +887,22 @@ sal_Bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs )
{
case 0: // Rounded, default
{
- pNew = new XLineJointItem(XLINEJOINT_ROUND);
+ pNew = new XLineJointItem(com::sun::star::drawing::LineJoint_ROUND);
break;
}
case 1: // - none -
{
- pNew = new XLineJointItem(XLINEJOINT_NONE);
+ pNew = new XLineJointItem(com::sun::star::drawing::LineJoint_NONE);
break;
}
case 2: // Miter
{
- pNew = new XLineJointItem(XLINEJOINT_MITER);
+ pNew = new XLineJointItem(com::sun::star::drawing::LineJoint_MITER);
break;
}
case 3: // Bevel
{
- pNew = new XLineJointItem(XLINEJOINT_BEVEL);
+ pNew = new XLineJointItem(com::sun::star::drawing::LineJoint_BEVEL);
break;
}
}
@@ -1053,22 +1053,22 @@ sal_Bool SvxLineTabPage::FillXLSet_Impl()
{
case 0: // Rounded, default
{
- rXLSet.Put(XLineJointItem(XLINEJOINT_ROUND));
+ rXLSet.Put(XLineJointItem(com::sun::star::drawing::LineJoint_ROUND));
break;
}
case 1: // - none -
{
- rXLSet.Put(XLineJointItem(XLINEJOINT_NONE));
+ rXLSet.Put(XLineJointItem(com::sun::star::drawing::LineJoint_NONE));
break;
}
case 2: // Miter
{
- rXLSet.Put(XLineJointItem(XLINEJOINT_MITER));
+ rXLSet.Put(XLineJointItem(com::sun::star::drawing::LineJoint_MITER));
break;
}
case 3: // Bevel
{
- rXLSet.Put(XLineJointItem(XLINEJOINT_BEVEL));
+ rXLSet.Put(XLineJointItem(com::sun::star::drawing::LineJoint_BEVEL));
break;
}
}
@@ -1480,15 +1480,16 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs )
}
else if(SFX_ITEM_DONTCARE != rAttrs.GetItemState(XATTR_LINEJOINT))
{
- XLineJoint eLineJoint = ((const XLineJointItem&)(rAttrs.Get(XATTR_LINEJOINT))).GetValue();
+ const com::sun::star::drawing::LineJoint eLineJoint = ((const XLineJointItem&)(rAttrs.Get(XATTR_LINEJOINT))).GetValue();
switch(eLineJoint)
{
- case XLINEJOINT_ROUND : maLBEdgeStyle.SelectEntryPos(0); break;
- case XLINEJOINT_NONE : maLBEdgeStyle.SelectEntryPos(1); break;
- case XLINEJOINT_MITER : maLBEdgeStyle.SelectEntryPos(2); break;
- case XLINEJOINT_BEVEL : maLBEdgeStyle.SelectEntryPos(3); break;
- case XLINEJOINT_MIDDLE : break;
+ case com::sun::star::drawing::LineJoint_MAKE_FIXED_SIZE: // fallback to round, unused value
+ case com::sun::star::drawing::LineJoint_MIDDLE : // fallback to round, unused value
+ case com::sun::star::drawing::LineJoint_ROUND : maLBEdgeStyle.SelectEntryPos(0); break;
+ case com::sun::star::drawing::LineJoint_NONE : maLBEdgeStyle.SelectEntryPos(1); break;
+ case com::sun::star::drawing::LineJoint_MITER : maLBEdgeStyle.SelectEntryPos(2); break;
+ case com::sun::star::drawing::LineJoint_BEVEL : maLBEdgeStyle.SelectEntryPos(3); break;
}
}
else
diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index 7bf9ad2720fe..563fa72493f4 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -585,8 +585,8 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickAddHdl_Impl)
long nDashCount = pDashList->Count();
pDashList->Insert( pEntry, nDashCount );
- Bitmap* pBitmap = pDashList->GetBitmap( nDashCount );
- aLbLineStyles.Append( pEntry, pBitmap );
+ const Bitmap aBitmap = pDashList->GetUiBitmap( nDashCount );
+ aLbLineStyles.Append( pEntry, &aBitmap );
aLbLineStyles.SelectEntryPos( aLbLineStyles.GetEntryCount() - 1 );
@@ -664,8 +664,8 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickModifyHdl_Impl)
XDashEntry* pEntry = new XDashEntry( aDash, aName );
delete pDashList->Replace( pEntry, nPos );
- Bitmap* pBitmap = pDashList->GetBitmap( nPos );
- aLbLineStyles.Modify( pEntry, nPos, pBitmap );
+ const Bitmap aBitmap = pDashList->GetUiBitmap( nPos );
+ aLbLineStyles.Modify( pEntry, nPos, &aBitmap );
aLbLineStyles.SelectEntryPos( nPos );
diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx
index 3155b3265585..52937bf29856 100644
--- a/cui/source/tabpages/tplneend.cxx
+++ b/cui/source/tabpages/tplneend.cxx
@@ -370,7 +370,8 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickModifyHdl_Impl)
pEntry->SetName( aName );
aEdtName.SetText( aName );
- aLbLineEnds.Modify( pEntry, nPos, pLineEndList->GetBitmap( nPos ) );
+ const Bitmap aUiBitmap( pLineEndList->GetUiBitmap( nPos ) );
+ aLbLineEnds.Modify( pEntry, nPos, &aUiBitmap );
aLbLineEnds.SelectEntryPos( nPos );
*pnLineEndListState |= CT_MODIFIED;
@@ -466,10 +467,10 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickAddHdl_Impl)
long nLineEndCount = pLineEndList->Count();
pLineEndList->Insert( pEntry, nLineEndCount );
- Bitmap* pBitmap = pLineEndList->GetBitmap( nLineEndCount );
+ const Bitmap aBitmap = pLineEndList->GetUiBitmap( nLineEndCount );
// add to the ListBox
- aLbLineEnds.Append( pEntry, pBitmap );
+ aLbLineEnds.Append( pEntry, &aBitmap );
aLbLineEnds.SelectEntryPos( aLbLineEnds.GetEntryCount() - 1 );
*pnLineEndListState |= CT_MODIFIED;
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index 66f5fa3c539f..c026f1d951a0 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -3649,6 +3649,16 @@ void SvxScriptSetItem::GetSlotIds( sal_uInt16 nSlotId, sal_uInt16& rLatin,
rAsian = SID_ATTR_CHAR_CJK_LANGUAGE;
rComplex = SID_ATTR_CHAR_CTL_LANGUAGE;
break;
+ case SID_ATTR_CHAR_SHADOWED:
+ rLatin = SID_ATTR_CHAR_SHADOWED;
+ rAsian = SID_ATTR_CHAR_SHADOWED;
+ rComplex = SID_ATTR_CHAR_SHADOWED;
+ break;
+ case SID_ATTR_CHAR_STRIKEOUT:
+ rLatin = SID_ATTR_CHAR_STRIKEOUT;
+ rAsian = SID_ATTR_CHAR_STRIKEOUT;
+ rComplex = SID_ATTR_CHAR_STRIKEOUT;
+ break;
}
}
diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx
index 3782bb4f69e9..c8971da9f06a 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -334,6 +334,52 @@ void Outliner::SetParaIsNumberingRestart( sal_Int32 nPara, sal_Bool bParaIsNumbe
}
}
+sal_Int32 Outliner::GetBulletsNumberingStatus()
+{
+ sal_Bool bHasBulletsNumbering = FALSE;
+ sal_uInt32 nParaCount = (sal_uInt32)(pParaList->GetParagraphCount());
+ for (sal_uInt32 nPara = 0; nPara < nParaCount; nPara++)
+ {
+ if ((bHasBulletsNumbering = ImplHasBullet(nPara)))
+ {
+ break;
+ }
+ }
+ sal_uInt16 nBulletsCount = 0;
+ sal_uInt16 nNumberingCount = 0;
+ if (bHasBulletsNumbering)
+ {
+ // At least have one paragraph that having bullets or numbering.
+ for (sal_uInt32 nPara = 0; nPara < nParaCount; nPara++)
+ {
+ Paragraph* pPara = pParaList->GetParagraph(nPara);
+ if (!pPara)
+ {
+ continue;
+ }
+ const SvxNumberFormat* pFmt = GetNumberFormat(nPara);
+ if (!pFmt)
+ {
+ // At least, exists one paragraph that has no Bullets/Numbering.
+ break;
+ }
+ else if ((pFmt->GetNumberingType() == SVX_NUM_BITMAP) || (pFmt->GetNumberingType() == SVX_NUM_CHAR_SPECIAL))
+ {
+ // Having Bullets in this paragraph.
+ nBulletsCount++;
+ }
+ else
+ {
+ // Having Numbering in this paragraph.
+ nNumberingCount++;
+ }
+ }
+ }
+ sal_Int32 nValue = (nBulletsCount == nParaCount) ? 0 : 2;
+ nValue = (nNumberingCount == nParaCount) ? 1 : nValue;
+ return nValue;
+}
+
OutlinerParaObject* Outliner::CreateParaObject( sal_Int32 nStartPara, sal_Int32 nCount ) const
{
DBG_CHKTHIS(Outliner,0);
diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx
index 2229857dd837..38ec5e63101c 100644
--- a/editeng/source/outliner/outlvw.cxx
+++ b/editeng/source/outliner/outlvw.cxx
@@ -40,6 +40,7 @@
#include <editeng/numitem.hxx>
#include <vcl/window.hxx>
#include <svl/itemset.hxx>
+#include <svl/eitem.hxx>
#include <editeng/editstat.hxx>
using namespace ::com::sun::star;
@@ -923,6 +924,204 @@ void OutlinerView::ToggleBullets()
pOwner->UndoActionEnd( OLUNDO_DEPTH );
}
+sal_Bool OutlinerView::ToggleBullets(sal_Bool bBulletOnOff, sal_Bool bNormalBullet, sal_Bool bMasterView, SvxNumRule* pNumRule, sal_Bool bForceBulletOnOff)
+{
+ pOwner->UndoActionStart( OLUNDO_DEPTH );
+
+ ESelection aSel( pEditView->GetSelection() );
+ aSel.Adjust();
+
+ const bool bUpdate = pOwner->pEditEngine->GetUpdateMode();
+ pOwner->pEditEngine->SetUpdateMode( sal_False );
+
+ sal_Int16 nDepth = -2;
+ sal_Bool bRet = sal_False;
+
+ //Modified by xuezhiy for bullet enhancement
+ bool bBulletOn = sal_True;
+
+ if( bBulletOnOff )
+ {
+ bool bHasBullet = sal_False;
+ for ( sal_uInt16 nPara = aSel.nStartPara; nPara <= aSel.nEndPara; nPara++ )
+ {
+ bHasBullet = pOwner->ImplHasBullet(nPara);
+ if(bHasBullet)
+ break;
+ }
+
+ if( bHasBullet )
+ {
+ bBulletOn = sal_False;
+
+ for ( sal_uInt16 nPara = aSel.nStartPara; nPara <= aSel.nEndPara; nPara++ )
+ {
+ Paragraph* pPara = pOwner->pParaList->GetParagraph( nPara );
+ DBG_ASSERT(pPara, "OutlinerView::ToggleBullets(), illegal selection?");
+
+ if( pPara )
+ {
+ const SvxNumberFormat* pFmt = pOwner ->GetNumberFormat(nPara);
+
+ if( !pFmt )
+ {
+ // Has no Bullet paragraph
+ bBulletOn = sal_True;
+ break;
+ }
+ else if( ( pFmt->GetNumberingType() == SVX_NUM_BITMAP ) || ( pFmt->GetNumberingType() == SVX_NUM_CHAR_SPECIAL ) )
+ {
+ // Normal ==>> Numbering
+ if( !bNormalBullet )
+ {
+ bBulletOn = sal_True;
+ break;
+ }
+ }
+ else
+ {
+ // Numbering ==>> Normal
+ if( bNormalBullet )
+ {
+ bBulletOn = sal_True;
+ break;
+ }
+ }
+ }
+ }
+ }
+
+ }
+ if (bForceBulletOnOff) {
+ bBulletOn = bBulletOnOff;
+ }
+ for ( sal_uInt16 nPara = aSel.nStartPara; nPara <= aSel.nEndPara; nPara++ )
+ {
+ Paragraph* pPara = pOwner->pParaList->GetParagraph( nPara );
+ DBG_ASSERT(pPara, "OutlinerView::ToggleBullets(), illegal selection?");
+
+ if( pPara )
+ {
+ bRet = sal_True;
+
+ nDepth = pOwner->GetDepth(nPara);
+
+ if( bBulletOn && nDepth == -1 )
+ {
+ // Off ==>> On
+ nDepth = 0;
+ }
+ else if( !bBulletOn && nDepth == 0 )
+ {
+ // On ==>> Off
+ nDepth = -1;
+ }
+ pOwner->SetDepth( pPara, nDepth );
+
+ const SfxItemSet& rAttrs = pOwner->GetParaAttribs( nPara );
+// bool bBulletState = ((const SfxBoolItem&) rAttrs.Get( EE_PARA_BULLETSTATE ) ).GetValue();
+
+ SfxItemSet aAttrs(rAttrs);
+ aAttrs.Put( SfxBoolItem( EE_PARA_BULLETSTATE, bBulletOn ) );
+
+ // Change bullet types
+ if( bBulletOn && pNumRule)
+ {
+ bool bSetBulletType = false;
+ if( !bBulletOnOff )
+ {
+ // Not bullet on/off button
+ bSetBulletType = true;
+ }
+ else
+ {
+ const SvxNumberFormat* pFmt = pOwner ->GetNumberFormat(nPara);
+
+ if( !pFmt )
+ {
+ // Has no bullet
+ bSetBulletType = true;
+ }
+ else
+ {
+ sal_Int16 nNumType = pFmt->GetNumberingType();
+ if( bNormalBullet && nNumType != SVX_NUM_BITMAP && nNumType != SVX_NUM_CHAR_SPECIAL )
+ {
+ // Set to Normal bullet, old bullet type is Numbering bullet
+ bSetBulletType = true;
+ }
+ else if( !bNormalBullet && (nNumType == SVX_NUM_BITMAP || nNumType == SVX_NUM_CHAR_SPECIAL) )
+ {
+ // Set to Numbering bullet, old bullet type is Normal bullet
+ bSetBulletType = true;
+ }
+ }
+ }
+
+ // Get old bullet space
+ SvxNumRule aNewRule( *pNumRule );
+
+ const SfxPoolItem* pPoolItem=NULL;
+ SfxItemState eState = rAttrs.GetItemState(EE_PARA_NUMBULLET, sal_False, &pPoolItem);
+ if (eState != SFX_ITEM_SET)
+ {
+ // Use default value when has not contain bullet item
+ ESelection aSelection(nPara, 0);
+ SfxItemSet aTmpSet( pOwner->pEditEngine->GetAttribs( aSelection ) );
+ pPoolItem = aTmpSet.GetItem( EE_PARA_NUMBULLET );
+ }
+
+ const SvxNumBulletItem* pNumBulletItem = dynamic_cast< const SvxNumBulletItem* >( pPoolItem );
+ //const SvxNumBulletItem& rNumBullet = (const SvxNumBulletItem&) rAttrs.Get( EE_PARA_NUMBULLET );
+ if( pNumBulletItem )
+ {
+ sal_uInt16 nLevelCnt = pNumBulletItem->GetNumRule()->GetLevelCount();
+ nLevelCnt = std::min( nLevelCnt, pNumRule->GetLevelCount() );
+
+ for( sal_uInt16 nLevel = 0; nLevel < nLevelCnt; ++nLevel )
+ {
+ const SvxNumberFormat* pOldFmt = pNumBulletItem->GetNumRule()->Get( nLevel );
+ const SvxNumberFormat* pNewFmt = pNumRule->Get( nLevel );
+
+ if( pOldFmt && pNewFmt && (pOldFmt->GetFirstLineOffset() != pNewFmt->GetFirstLineOffset()
+ || pOldFmt->GetAbsLSpace() != pNewFmt->GetAbsLSpace() ) )
+ {
+ SvxNumberFormat* pNewFmtClone = new SvxNumberFormat( *pNewFmt );
+ pNewFmtClone->SetFirstLineOffset( pOldFmt->GetFirstLineOffset() );
+ pNewFmtClone->SetAbsLSpace( pOldFmt->GetAbsLSpace() );
+
+ aNewRule.SetLevel( nLevel, pNewFmtClone );
+ delete pNewFmtClone;
+ }
+ }
+ }
+
+ // Don't set bullet attribute to paragraph in Master view
+ // Because it will be set into style sheet
+ if( bSetBulletType && !bMasterView )
+ aAttrs.Put(SvxNumBulletItem( aNewRule ), EE_PARA_NUMBULLET);
+ }
+
+ pOwner->SetParaAttribs( nPara, aAttrs );
+
+ }
+ }
+
+ // --> OD 2009-03-10 #i100014#
+ // It is not a good idea to substract 1 from a count and cast the result
+ // to sal_uInt16 without check, if the count is 0.
+ sal_uInt16 nParaCount = (sal_uInt16) (pOwner->pParaList->GetParagraphCount());
+ // <--
+ pOwner->ImplCheckParagraphs( aSel.nStartPara, nParaCount );
+ pOwner->pEditEngine->QuickMarkInvalid( ESelection( aSel.nStartPara, 0, nParaCount, 0 ) );
+
+ pOwner->pEditEngine->SetUpdateMode( bUpdate );
+
+ pOwner->UndoActionEnd( OLUNDO_DEPTH );
+
+ return bRet;
+}
+
void OutlinerView::EnableBullets()
{
pOwner->UndoActionStart( OLUNDO_DEPTH );
@@ -955,6 +1154,126 @@ void OutlinerView::EnableBullets()
pOwner->UndoActionEnd( OLUNDO_DEPTH );
}
+sal_Bool OutlinerView::ToggleAllParagraphsBullets(sal_Bool bBulletOnOffMode, sal_Bool bNormalBullet, sal_Bool bToggleOn, sal_Bool bMasterView, SvxNumRule* pNumRule)
+{
+ if (!pOwner || !pOwner->pEditEngine || !pOwner->pParaList)
+ {
+ return sal_False;
+ }
+
+ sal_Bool bReturn = sal_False;
+ pOwner->UndoActionStart(OLUNDO_DEPTH);
+ const sal_Bool bUpdate = pOwner->pEditEngine->GetUpdateMode();
+ pOwner->pEditEngine->SetUpdateMode(sal_False);
+
+ sal_Int16 nDepth = -2;
+ sal_uInt16 nParaCount = (sal_uInt16)(pOwner->pParaList->GetParagraphCount());
+ for (sal_uInt16 nPara = 0; nPara < nParaCount; nPara++)
+ {
+ Paragraph* pPara = pOwner->pParaList->GetParagraph(nPara);
+ DBG_ASSERT(pPara, "OutlinerView::ToggleAllParagraphsBullets(), illegal selection?");
+
+ if (pPara)
+ {
+ bReturn = sal_True;
+ nDepth = pOwner->GetDepth(nPara);
+ if (bToggleOn && nDepth == -1)
+ {
+ // Off ==>> On
+ nDepth = 0;
+ }
+ else if (!bToggleOn && nDepth == 0)
+ {
+ // On ==>> Off
+ nDepth = -1;
+ }
+ pOwner->SetDepth(pPara, nDepth);
+
+ const SfxItemSet& rAttrs = pOwner->GetParaAttribs(nPara);
+ SfxItemSet aAttrs(rAttrs);
+ aAttrs.Put(SfxBoolItem(EE_PARA_BULLETSTATE, bToggleOn));
+
+ // Change bullet types.
+ if (bToggleOn && pNumRule)
+ {
+ sal_Bool bSetBulletType = sal_False;
+ if (!bBulletOnOffMode)
+ {
+ // Not bullet on/off button.
+ bSetBulletType = sal_True;
+ }
+ else
+ {
+ const SvxNumberFormat* pFmt = pOwner ->GetNumberFormat(nPara);
+ if (!pFmt)
+ {
+ // Has no bullet.
+ bSetBulletType = sal_True;
+ }
+ else
+ {
+ sal_Int16 nNumType = pFmt->GetNumberingType();
+ if (bNormalBullet && nNumType != SVX_NUM_BITMAP && nNumType != SVX_NUM_CHAR_SPECIAL)
+ {
+ // Set to Normal bullet, old bullet type is Numbering bullet.
+ bSetBulletType = sal_True;
+ }
+ else if (!bNormalBullet && (nNumType == SVX_NUM_BITMAP || nNumType == SVX_NUM_CHAR_SPECIAL))
+ {
+ // Set to Numbering bullet, old bullet type is Normal bullet.
+ bSetBulletType = sal_True;
+ }
+ }
+ }
+
+ // Get old bullet space.
+ SvxNumRule aNewRule(*pNumRule);
+ const SfxPoolItem* pPoolItem=NULL;
+ SfxItemState eState = rAttrs.GetItemState(EE_PARA_NUMBULLET, sal_False, &pPoolItem);
+ ESelection aSelection(nPara, 0);
+ SfxItemSet aTmpSet(pOwner->pEditEngine->GetAttribs(aSelection));
+ if (eState != SFX_ITEM_SET)
+ {
+ // Use default value when has not contain bullet item.
+ pPoolItem = aTmpSet.GetItem(EE_PARA_NUMBULLET);
+ }
+
+ const SvxNumBulletItem* pNumBulletItem = dynamic_cast< const SvxNumBulletItem* >(pPoolItem);
+ if (pNumBulletItem)
+ {
+ sal_uInt16 nLevelCnt = pNumBulletItem->GetNumRule()->GetLevelCount();
+ nLevelCnt = std::min(nLevelCnt, pNumRule->GetLevelCount());
+
+ for (sal_uInt16 nLevel = 0; nLevel < nLevelCnt; nLevel++)
+ {
+ const SvxNumberFormat* pOldFmt = pNumBulletItem->GetNumRule()->Get(nLevel);
+ const SvxNumberFormat* pNewFmt = pNumRule->Get(nLevel);
+ if (pOldFmt && pNewFmt && (pOldFmt->GetFirstLineOffset() != pNewFmt->GetFirstLineOffset() || pOldFmt->GetAbsLSpace() != pNewFmt->GetAbsLSpace()))
+ {
+ SvxNumberFormat* pNewFmtClone = new SvxNumberFormat(*pNewFmt);
+ pNewFmtClone->SetFirstLineOffset(pOldFmt->GetFirstLineOffset());
+ pNewFmtClone->SetAbsLSpace(pOldFmt->GetAbsLSpace());
+ aNewRule.SetLevel(nLevel, pNewFmtClone);
+ delete pNewFmtClone;
+ }
+ }
+ }
+
+ // Don't set bullet attribute to paragraph in Master view, because it will be set into style sheet.
+ if (bSetBulletType && !bMasterView)
+ aAttrs.Put(SvxNumBulletItem(aNewRule), EE_PARA_NUMBULLET);
+ }
+ pOwner->SetParaAttribs(nPara, aAttrs);
+ }
+ }
+
+ pOwner->ImplCheckParagraphs(0, nParaCount);
+ pOwner->pEditEngine->QuickMarkInvalid(ESelection(0, 0, nParaCount, 0));
+ pOwner->pEditEngine->SetUpdateMode(bUpdate);
+ pOwner->UndoActionEnd(OLUNDO_DEPTH);
+
+ return bReturn;
+}
void OutlinerView::RemoveAttribsKeepLanguages( sal_Bool bRemoveParaAttribs )
{
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index bc6f9a979198..feac1c71b79d 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -997,11 +997,11 @@ void DffPropertyReader::ApplyLineAttributes( SfxItemSet& rSet, const MSO_SPT eSh
if ( eShapeType == mso_sptMin )
eLineJointDefault = mso_lineJoinRound;
MSO_LineJoin eLineJoint = (MSO_LineJoin)GetPropertyValue( DFF_Prop_lineJoinStyle, eLineJointDefault );
- XLineJoint eXLineJoint( XLINEJOINT_MITER );
+ com::sun::star::drawing::LineJoint eXLineJoint( com::sun::star::drawing::LineJoint_MITER );
if ( eLineJoint == mso_lineJoinBevel )
- eXLineJoint = XLINEJOINT_BEVEL;
+ eXLineJoint = com::sun::star::drawing::LineJoint_BEVEL;
else if ( eLineJoint == mso_lineJoinRound )
- eXLineJoint = XLINEJOINT_ROUND;
+ eXLineJoint = com::sun::star::drawing::LineJoint_ROUND;
rSet.Put( XLineJointItem( eXLineJoint ) );
if ( nLineFlags & 0x10 )
diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk
index f534aab81979..d1818146dfd9 100644
--- a/framework/Library_fwk.mk
+++ b/framework/Library_fwk.mk
@@ -108,6 +108,7 @@ $(eval $(call gb_Library_add_exception_objects,fwk,\
framework/source/services/backingcomp \
framework/source/services/backingwindow \
framework/source/services/desktop \
+ framework/source/services/ContextChangeEventMultiplexer \
framework/source/services/frame \
framework/source/services/modulemanager \
framework/source/services/pathsettings \
diff --git a/framework/inc/macros/registration.hxx b/framework/inc/macros/registration.hxx
index bfdc18c8db13..f5c102a50770 100644
--- a/framework/inc/macros/registration.hxx
+++ b/framework/inc/macros/registration.hxx
@@ -71,7 +71,7 @@ ________________________________________________________________________________
{ \
LOG_REGISTRATION_GETFACTORY( "\t\tpImplementationName and pServiceManager are valid ...\n" ) \
/* Define variables which are used in following macros. */ \
- ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > xFactory ; \
+ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xFactory ; \
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceManager ; \
xServiceManager = reinterpret_cast< ::com::sun::star::lang::XMultiServiceFactory* >( pServiceManager ) ; \
/* These parameter will expand to */ \
diff --git a/framework/inc/services/ContextChangeEventMultiplexer.hxx b/framework/inc/services/ContextChangeEventMultiplexer.hxx
new file mode 100644
index 000000000000..3a7bd956b7fc
--- /dev/null
+++ b/framework/inc/services/ContextChangeEventMultiplexer.hxx
@@ -0,0 +1,138 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#ifndef __FRAMEWORK_SERVICES_CONTEXT_CHANGE_EVENT_MULTIPLEXER_HXX_
+#define __FRAMEWORK_SERVICES_CONTEXT_CHANGE_EVENT_MULTIPLEXER_HXX_
+
+#include <com/sun/star/ui/XContextChangeEventMultiplexer.hpp>
+
+#include <cppuhelper/compbase4.hxx>
+#include <cppuhelper/basemutex.hxx>
+
+#include "macros/xserviceinfo.hxx"
+
+#include <map>
+#include <boost/noncopyable.hpp>
+
+
+namespace
+{
+ typedef ::cppu::WeakComponentImplHelper4 <
+ css::ui::XContextChangeEventMultiplexer,
+ css::lang::XSingleComponentFactory,
+ css::lang::XServiceInfo,
+ css::lang::XEventListener
+ > ContextChangeEventMultiplexerInterfaceBase;
+}
+
+
+namespace css = ::com::sun::star;
+namespace cssu = ::com::sun::star::uno;
+namespace cssl = ::com::sun::star::lang;
+
+namespace framework {
+
+class ContextChangeEventMultiplexer
+ : private ::boost::noncopyable,
+ private ::cppu::BaseMutex,
+ public ContextChangeEventMultiplexerInterfaceBase
+{
+public:
+ ContextChangeEventMultiplexer(const cssu::Reference<css::uno::XComponentContext>& rxContext);
+ virtual ~ContextChangeEventMultiplexer (void);
+
+ virtual void SAL_CALL disposing (void);
+
+ // XContextChangeEventMultiplexer
+ virtual void SAL_CALL addContextChangeEventListener (
+ const cssu::Reference<css::ui::XContextChangeEventListener>& rxListener,
+ const cssu::Reference<cssu::XInterface>& rxEventFocus)
+ throw(cssu::RuntimeException, cssl::IllegalArgumentException);
+ virtual void SAL_CALL removeContextChangeEventListener (
+ const cssu::Reference<css::ui::XContextChangeEventListener>& rxListener,
+ const cssu::Reference<cssu::XInterface>& rxEventFocus)
+ throw(cssu::RuntimeException, cssl::IllegalArgumentException);
+ virtual void SAL_CALL removeAllContextChangeEventListeners (
+ const cssu::Reference<css::ui::XContextChangeEventListener>& rxListener)
+ throw(cssu::RuntimeException, cssl::IllegalArgumentException);
+ virtual void SAL_CALL broadcastContextChangeEvent (
+ const css::ui::ContextChangeEventObject& rContextChangeEventObject,
+ const cssu::Reference<cssu::XInterface>& rxEventFocus)
+ throw(cssu::RuntimeException);
+
+ // XSingleComponentFactory
+ virtual cssu::Reference<cssu::XInterface> SAL_CALL createInstanceWithContext (
+ const cssu::Reference<cssu::XComponentContext>& rxContext)
+ throw (cssu::Exception, cssu::RuntimeException);
+ virtual cssu::Reference<cssu::XInterface > SAL_CALL createInstanceWithArgumentsAndContext (
+ const cssu::Sequence<cssu::Any>& rArguments,
+ const cssu::Reference<cssu::XComponentContext>& rxContext)
+ throw (cssu::Exception, cssu::RuntimeException);
+
+ // XServiceInfo
+ virtual ::rtl::OUString SAL_CALL getImplementationName (void)
+ throw (cssu::RuntimeException);
+ virtual sal_Bool SAL_CALL supportsService (
+ const ::rtl::OUString& rsServiceName)
+ throw (cssu::RuntimeException);
+ virtual cssu::Sequence< ::rtl::OUString> SAL_CALL getSupportedServiceNames (void)
+ throw (cssu::RuntimeException);
+
+ // XEventListener
+ virtual void SAL_CALL disposing (
+ const css::lang::EventObject& rEvent)
+ throw (cssu::RuntimeException);
+
+ static ::rtl::OUString SAL_CALL impl_getStaticImplementationName (void);
+ static cssu::Reference<cssu::XInterface> SAL_CALL impl_createFactory (
+ const cssu::Reference<cssl::XMultiServiceFactory>& xServiceManager);
+
+private:
+ typedef ::std::vector<cssu::Reference<css::ui::XContextChangeEventListener> > ListenerContainer;
+ class FocusDescriptor
+ {
+ public:
+ ListenerContainer maListeners;
+ ::rtl::OUString msCurrentApplicationName;
+ ::rtl::OUString msCurrentContextName;
+ };
+ typedef ::std::map<cssu::Reference<cssu::XInterface>, FocusDescriptor> ListenerMap;
+ ListenerMap maListeners;
+
+ /** Notify all listeners in the container that is associated with
+ the given event focus.
+
+ Typically called twice from broadcastEvent(), once for the
+ given event focus and onece for NULL.
+ */
+ void BroadcastEventToSingleContainer (
+ const css::ui::ContextChangeEventObject& rEventObject,
+ const cssu::Reference<cssu::XInterface>& rxEventFocus);
+ FocusDescriptor* GetFocusDescriptor (
+ const cssu::Reference<cssu::XInterface>& rxEventFocus,
+ const bool bCreateWhenMissing);
+
+ static cssu::Sequence< ::rtl::OUString > SAL_CALL static_GetSupportedServiceNames (void);
+ static cssu::Reference<cssu::XInterface> SAL_CALL static_CreateInstance (
+ const cssu::Reference<cssu::XComponentContext>& rxComponentContext)
+ throw (cssu::Exception);
+};
+
+} // end of namespace framework
+
+#endif
+
diff --git a/framework/inc/services/EventMultiplexer.hxx b/framework/inc/services/EventMultiplexer.hxx
new file mode 100644
index 000000000000..6e0881c08921
--- /dev/null
+++ b/framework/inc/services/EventMultiplexer.hxx
@@ -0,0 +1,116 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#ifndef __FRAMEWORK_SERVICES_EVENT_MULTIPLEXER_HXX_
+#define __FRAMEWORK_SERVICES_EVENT_MULTIPLEXER_HXX_
+
+#include <com/sun/star/util/XEventMultiplexer.hpp>
+
+#include <cppuhelper/compbase3.hxx>
+#include <cppuhelper/basemutex.hxx>
+
+#include "macros/xserviceinfo.hxx"
+
+namespace
+{
+ typedef ::cppu::WeakComponentImplHelper3 <
+ css::util::XEventMultiplexer,
+ css::lang::XSingleComponentFactory,
+ css::lang::XServiceInfo
+ > EventMultiplexerInterfaceBase;
+}
+
+
+namespace css = ::com::sun::star;
+namespace cssu = ::com::sun::star::uno;
+namespace cssl = ::com::sun::star::lang;
+
+namespace framework {
+
+class EventMultiplexer
+ : private ::boost::noncopyable,
+ private ::cppu::BaseMutex,
+ public EventMultiplexerInterfaceBase
+{
+public:
+ EventMultiplexer(const cssu::Reference<css::uno::XComponentContext>& rxContext);
+ virtual ~EventMultiplexer (void);
+
+ // XEventMultiplexer
+ virtual void SAL_CALL addEventListener (
+ const cssu::Reference<css::util::XEventListener>& rxListener,
+ const cssu::Reference<cssu::XInterface>& rxEventFocus)
+ throw(cssu::RuntimeException, cssl::IllegalArgumentException);
+ virtual void SAL_CALL removeEventListener (
+ const cssu::Reference<css::util::XEventListener>& rxListener,
+ const cssu::Reference<cssu::XInterface>& rxEventFocus)
+ throw(cssu::RuntimeException, cssl::IllegalArgumentException);
+ virtual void SAL_CALL removeAllEventListeners (
+ const cssu::Reference<css::util::XEventListener>& rxListener)
+ throw(cssu::RuntimeException, cssl::IllegalArgumentException);
+ virtual void SAL_CALL broadcastEvent (
+ const cssl::EventObject& rEventObject,
+ const cssu::Reference<cssu::XInterface>& rxEventFocus)
+ throw(cssu::RuntimeException);
+
+ // XSingleComponentFactory
+ virtual cssu::Reference<cssu::XInterface> SAL_CALL createInstanceWithContext (
+ const cssu::Reference<cssu::XComponentContext>& rxContext)
+ throw (cssu::Exception, cssu::RuntimeException);
+ virtual cssu::Reference<cssu::XInterface > SAL_CALL createInstanceWithArgumentsAndContext (
+ const cssu::Sequence<cssu::Any>& rArguments,
+ const cssu::Reference<cssu::XComponentContext>& rxContext)
+ throw (cssu::Exception, cssu::RuntimeException);
+
+ // XServiceInfo
+ virtual ::rtl::OUString SAL_CALL getImplementationName (void)
+ throw (cssu::RuntimeException);
+ virtual sal_Bool SAL_CALL supportsService (
+ const ::rtl::OUString& rsServiceName)
+ throw (cssu::RuntimeException);
+ virtual cssu::Sequence< ::rtl::OUString> SAL_CALL getSupportedServiceNames (void)
+ throw (cssu::RuntimeException);
+
+ static ::rtl::OUString SAL_CALL impl_getStaticImplementationName (void);
+ static cssu::Reference<cssu::XInterface> SAL_CALL impl_createFactory (
+ const cssu::Reference<cssl::XMultiServiceFactory>& xServiceManager);
+
+private:
+ typedef ::std::vector<cssu::Reference<css::util::XEventListener> > ListenerContainer;
+ typedef ::std::map<cssu::Reference<cssu::XInterface>, ListenerContainer> ListenerMap;
+ ListenerMap maListeners;
+
+ /** Notify all listeners in the container that is associated with
+ the given event focus.
+
+ Typically called twice from broadcastEvent(), once for the
+ given event focus and onece for NULL.
+ */
+ void BroadcastEventToSingleContainer (
+ const cssl::EventObject& rEventObject,
+ const cssu::Reference<cssu::XInterface>& rxEventFocus);
+
+ static cssu::Sequence< ::rtl::OUString > SAL_CALL static_GetSupportedServiceNames (void);
+ static cssu::Reference<cssu::XInterface> SAL_CALL static_CreateInstance (
+ const cssu::Reference<cssu::XComponentContext>& rxComponentContext)
+ throw (cssu::Exception);
+};
+
+} // end of namespace framework
+
+#endif
+
diff --git a/framework/source/register/registerservices.cxx b/framework/source/register/registerservices.cxx
index f8fd6c2320cc..33ce118cec5e 100644
--- a/framework/source/register/registerservices.cxx
+++ b/framework/source/register/registerservices.cxx
@@ -66,12 +66,12 @@
#include <uiconfiguration/uicategorydescription.hxx>
#include <services/sessionlistener.hxx>
#include <services/taskcreatorsrv.hxx>
-
#include <uielement/langselectionstatusbarcontroller.hxx>
#include <uiconfiguration/imagemanager.hxx>
#include <uifactory/windowcontentfactorymanager.hxx>
#include <services/substitutepathvars.hxx>
#include <services/pathsettings.hxx>
+#include <services/ContextChangeEventMultiplexer.hxx>
COMPONENTGETFACTORY ( fwk,
IFFACTORY( ::framework::URLTransformer ) else
@@ -112,7 +112,8 @@ COMPONENTGETFACTORY ( fwk,
IFFACTORY( ::framework::WindowContentFactoryManager ) else
IFFACTORY( ::framework::TabWindowService ) else
IFFACTORY( ::framework::SubstitutePathVariables ) else
- IFFACTORY( ::framework::PathSettings )
+ IFFACTORY( ::framework::PathSettings ) else
+ IFFACTORY( ::framework::ContextChangeEventMultiplexer )
)
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/services/ContextChangeEventMultiplexer.cxx b/framework/source/services/ContextChangeEventMultiplexer.cxx
new file mode 100644
index 000000000000..d4f30a40973f
--- /dev/null
+++ b/framework/source/services/ContextChangeEventMultiplexer.cxx
@@ -0,0 +1,383 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#include "services/ContextChangeEventMultiplexer.hxx"
+#include "services.h"
+
+using ::rtl::OUString;
+
+#define A2S(s) ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(s))
+
+using namespace css;
+using namespace cssu;
+
+namespace framework {
+
+#define IMPLEMENTATION_NAME "org.apache.openoffice.comp.framework.ContextChangeEventMultiplexer"
+#define SERVICE_NAME "com.sun.star.ui.ContextChangeEventMultiplexer"
+#define SINGLETON_NAME "org.apache.openoffice.comp.framework.ContextChangeEventMultiplexerSigleton"
+
+
+ContextChangeEventMultiplexer::ContextChangeEventMultiplexer (
+ const cssu::Reference<cssu::XComponentContext>& rxContext)
+ : ContextChangeEventMultiplexerInterfaceBase(m_aMutex),
+ maListeners()
+{
+ (void)rxContext;
+}
+
+
+
+
+ContextChangeEventMultiplexer::~ContextChangeEventMultiplexer (void)
+{
+}
+
+
+
+
+void SAL_CALL ContextChangeEventMultiplexer::disposing (void)
+{
+ ListenerMap aListeners;
+ aListeners.swap(maListeners);
+
+ cssu::Reference<cssu::XInterface> xThis (static_cast<XWeak*>(this));
+ css::lang::EventObject aEvent (xThis);
+ for (ListenerMap::const_iterator iContainer(aListeners.begin()), iEnd(aListeners.end());
+ iContainer!=iEnd;
+ ++iContainer)
+ {
+ // Unregister from the focus object.
+ Reference<lang::XComponent> xComponent (iContainer->first, UNO_QUERY);
+ if (xComponent.is())
+ xComponent->removeEventListener(this);
+
+ // Tell all listeners that we are being disposed.
+ const FocusDescriptor& rFocusDescriptor (iContainer->second);
+ for (ListenerContainer::const_iterator
+ iListener(rFocusDescriptor.maListeners.begin()),
+ iContainerEnd(rFocusDescriptor.maListeners.end());
+ iListener!=iContainerEnd;
+ ++iListener)
+ {
+ (*iListener)->disposing(aEvent);
+ }
+ }
+}
+
+
+
+
+// XContextChangeEventMultiplexer
+
+void SAL_CALL ContextChangeEventMultiplexer::addContextChangeEventListener (
+ const cssu::Reference<css::ui::XContextChangeEventListener>& rxListener,
+ const cssu::Reference<cssu::XInterface>& rxEventFocus)
+ throw(cssu::RuntimeException,cssl::IllegalArgumentException)
+{
+ if ( ! rxListener.is())
+ throw css::lang::IllegalArgumentException(
+ A2S("can not add an empty reference"),
+ static_cast<XWeak*>(this),
+ 0);
+
+ FocusDescriptor* pFocusDescriptor = GetFocusDescriptor(rxEventFocus, true);
+ if (pFocusDescriptor != NULL)
+ {
+ ListenerContainer& rContainer (pFocusDescriptor->maListeners);
+ if (::std::find(rContainer.begin(), rContainer.end(), rxListener) == rContainer.end())
+ rContainer.push_back(rxListener);
+ else
+ {
+ // The listener was added for the same event focus
+ // previously. That is an error.
+ throw cssl::IllegalArgumentException(A2S("listener added twice"), static_cast<XWeak*>(this), 0);
+ }
+ }
+
+ // Send out an initial event that informs the new listener about
+ // the current context.
+ if (rxEventFocus.is() && pFocusDescriptor!=NULL)
+ {
+ css::ui::ContextChangeEventObject aEvent (
+ NULL,
+ pFocusDescriptor->msCurrentApplicationName,
+ pFocusDescriptor->msCurrentContextName);
+ rxListener->notifyContextChangeEvent(aEvent);
+ }
+}
+
+
+
+
+void SAL_CALL ContextChangeEventMultiplexer::removeContextChangeEventListener (
+ const cssu::Reference<css::ui::XContextChangeEventListener>& rxListener,
+ const cssu::Reference<cssu::XInterface>& rxEventFocus)
+ throw(cssu::RuntimeException,cssl::IllegalArgumentException)
+{
+ if ( ! rxListener.is())
+ throw cssl::IllegalArgumentException(
+ A2S("can not remove an empty reference"),
+ static_cast<XWeak*>(this), 0);
+
+ FocusDescriptor* pFocusDescriptor = GetFocusDescriptor(rxEventFocus, false);
+ if (pFocusDescriptor != NULL)
+ {
+ ListenerContainer& rContainer (pFocusDescriptor->maListeners);
+ const ListenerContainer::iterator iListener (
+ ::std::find(rContainer.begin(), rContainer.end(), rxListener));
+ if (iListener != rContainer.end())
+ {
+ rContainer.erase(iListener);
+
+ // We hold on to the focus descriptor even when the last listener has been removed.
+ // This allows us to keep track of the current context and send it to new listeners.
+ }
+ }
+
+}
+
+
+
+
+void SAL_CALL ContextChangeEventMultiplexer::removeAllContextChangeEventListeners (
+ const cssu::Reference<css::ui::XContextChangeEventListener>& rxListener)
+ throw(cssu::RuntimeException,cssl::IllegalArgumentException)
+{
+ if ( ! rxListener.is())
+ throw cssl::IllegalArgumentException(
+ A2S("can not remove an empty reference"),
+ static_cast<XWeak*>(this), 0);
+
+ for (ListenerMap::iterator
+ iContainer(maListeners.begin()),
+ iEnd(maListeners.end());
+ iContainer!=iEnd;
+ ++iContainer)
+ {
+ const ListenerContainer::iterator iListener (
+ ::std::find(iContainer->second.maListeners.begin(), iContainer->second.maListeners.end(), rxListener));
+ if (iListener != iContainer->second.maListeners.end())
+ {
+ iContainer->second.maListeners.erase(iListener);
+
+ // We hold on to the focus descriptor even when the last listener has been removed.
+ // This allows us to keep track of the current context and send it to new listeners.
+ }
+ }
+}
+
+
+
+
+void SAL_CALL ContextChangeEventMultiplexer::broadcastContextChangeEvent (
+ const css::ui::ContextChangeEventObject& rEventObject,
+ const cssu::Reference<cssu::XInterface>& rxEventFocus)
+ throw(cssu::RuntimeException)
+{
+ // Remember the current context.
+ if (rxEventFocus.is())
+ {
+ FocusDescriptor* pFocusDescriptor = GetFocusDescriptor(rxEventFocus, true);
+ if (pFocusDescriptor != NULL)
+ {
+ pFocusDescriptor->msCurrentApplicationName = rEventObject.ApplicationName;
+ pFocusDescriptor->msCurrentContextName = rEventObject.ContextName;
+ }
+ }
+
+ BroadcastEventToSingleContainer(rEventObject, rxEventFocus);
+ if (rxEventFocus.is())
+ BroadcastEventToSingleContainer(rEventObject, NULL);
+}
+
+
+
+
+void ContextChangeEventMultiplexer::BroadcastEventToSingleContainer (
+ const css::ui::ContextChangeEventObject& rEventObject,
+ const cssu::Reference<cssu::XInterface>& rxEventFocus)
+{
+ FocusDescriptor* pFocusDescriptor = GetFocusDescriptor(rxEventFocus, false);
+ if (pFocusDescriptor != NULL)
+ {
+ // Create a copy of the listener container to avoid problems
+ // when one of the called listeners calls add... or remove...
+ ListenerContainer aContainer (pFocusDescriptor->maListeners);
+ for (ListenerContainer::const_iterator
+ iListener(aContainer.begin()),
+ iEnd(aContainer.end());
+ iListener!=iEnd;
+ ++iListener)
+ {
+ (*iListener)->notifyContextChangeEvent(rEventObject);
+ }
+ }
+}
+
+
+
+
+ContextChangeEventMultiplexer::FocusDescriptor* ContextChangeEventMultiplexer::GetFocusDescriptor (
+ const cssu::Reference<cssu::XInterface>& rxEventFocus,
+ const bool bCreateWhenMissing)
+{
+ ListenerMap::iterator iDescriptor (maListeners.find(rxEventFocus));
+ if (iDescriptor == maListeners.end() && bCreateWhenMissing)
+ {
+ // Listen for the focus being disposed.
+ Reference<lang::XComponent> xComponent (rxEventFocus, UNO_QUERY);
+ if (xComponent.is())
+ xComponent->addEventListener(this);
+
+ // Create a new listener container for the event focus.
+ iDescriptor = maListeners.insert(
+ ListenerMap::value_type(
+ rxEventFocus,
+ FocusDescriptor())).first;
+ }
+ if (iDescriptor != maListeners.end())
+ return &iDescriptor->second;
+ else
+ return NULL;
+}
+
+
+
+
+// XSingleComponentFactory
+
+cssu::Reference<cssu::XInterface> SAL_CALL ContextChangeEventMultiplexer::createInstanceWithContext (
+ const cssu::Reference<cssu::XComponentContext>& rxContext)
+ throw (cssu::Exception, cssu::RuntimeException)
+{
+ (void)rxContext;
+ return cssu::Reference<cssu::XInterface>();
+}
+
+
+
+
+cssu::Reference<cssu::XInterface > SAL_CALL ContextChangeEventMultiplexer::createInstanceWithArgumentsAndContext (
+ const cssu::Sequence<cssu::Any>& rArguments,
+ const cssu::Reference<cssu::XComponentContext>& rxContext)
+ throw (cssu::Exception, cssu::RuntimeException)
+{
+ (void)rArguments;
+ (void)rxContext;
+ return cssu::Reference<cssu::XInterface>();
+}
+
+
+
+
+// XServiceInfo
+
+::rtl::OUString SAL_CALL ContextChangeEventMultiplexer::getImplementationName (void)
+ throw(cssu::RuntimeException)
+{
+ return impl_getStaticImplementationName();
+}
+
+
+
+
+
+sal_Bool SAL_CALL ContextChangeEventMultiplexer::supportsService (
+ const ::rtl::OUString& rsServiceName)
+ throw (cssu::RuntimeException)
+{
+ return ::comphelper::findValue(static_GetSupportedServiceNames(), rsServiceName, sal_True).getLength() != 0;
+}
+
+
+
+
+cssu::Sequence<OUString> SAL_CALL ContextChangeEventMultiplexer::getSupportedServiceNames (void)
+ throw (cssu::RuntimeException)
+{
+ return static_GetSupportedServiceNames();
+}
+
+
+
+
+void SAL_CALL ContextChangeEventMultiplexer::disposing (
+ const css::lang::EventObject& rEvent)
+ throw (cssu::RuntimeException)
+{
+ ListenerMap::iterator iDescriptor (maListeners.find(rEvent.Source));
+
+ if (iDescriptor == maListeners.end())
+ {
+ OSL_ASSERT(iDescriptor != maListeners.end());
+ return;
+ }
+
+ // Should we notify the remaining listeners?
+
+ maListeners.erase(iDescriptor);
+}
+
+
+
+
+// Local and static methods.
+
+OUString SAL_CALL ContextChangeEventMultiplexer::impl_getStaticImplementationName (void)
+{
+ return A2S(IMPLEMENTATION_NAME);
+}
+
+
+
+
+cssu::Sequence<OUString> SAL_CALL ContextChangeEventMultiplexer::static_GetSupportedServiceNames (void)
+{
+ cssu::Sequence<OUString> aServiceNames (2);
+ aServiceNames[0] = A2S(SERVICE_NAME);
+ aServiceNames[1] = A2S(SINGLETON_NAME);
+ return aServiceNames;
+}
+
+
+
+
+cssu::Reference<cssu::XInterface> ContextChangeEventMultiplexer::impl_createFactory (
+ const cssu::Reference<cssl::XMultiServiceFactory>& rxServiceManager)
+{
+ (void)rxServiceManager;
+ return cppu::createSingleComponentFactory(
+ ContextChangeEventMultiplexer::static_CreateInstance,
+ ContextChangeEventMultiplexer::impl_getStaticImplementationName(),
+ ContextChangeEventMultiplexer::static_GetSupportedServiceNames()
+ );
+}
+
+
+
+
+cssu::Reference<cssu::XInterface> SAL_CALL ContextChangeEventMultiplexer::static_CreateInstance (
+ const cssu::Reference<cssu::XComponentContext>& rxComponentContext)
+ throw (cssu::Exception)
+{
+ ContextChangeEventMultiplexer* pObject = new ContextChangeEventMultiplexer(rxComponentContext);
+ cssu::Reference<cssu::XInterface> xService (static_cast<XWeak*>(pObject), cssu::UNO_QUERY);
+ return xService;
+}
+
+} // end of namespace framework
diff --git a/framework/source/services/EventMultiplexer.cxx b/framework/source/services/EventMultiplexer.cxx
new file mode 100644
index 000000000000..952a29d66f68
--- /dev/null
+++ b/framework/source/services/EventMultiplexer.cxx
@@ -0,0 +1,266 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#include "precompiled_framework.hxx"
+
+#include "services/EventMultiplexer.hxx"
+#include "services.h"
+
+using ::rtl::OUString;
+
+#define A2S(s) ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(s))
+
+namespace framework {
+
+#define IMPLEMENTATION_NAME "org.apache.openoffice.comp.framework.EventMultiplexer"
+#define SERVICE_NAME "com.sun.star.ui.ContextChangeEventMultiplexer"
+#define SINGLETON_NAME "org.apache.openoffice.comp.framework.EventMultiplexer"
+
+
+EventMultiplexer::EventMultiplexer (const cssu::Reference<css::uno::XComponentContext>& rxContext)
+ : EventMultiplexerInterfaceBase(m_aMutex),
+ maListeners()
+{
+ (void)rxContext;
+}
+
+
+
+
+EventMultiplexer::~EventMultiplexer (void)
+{
+ maListeners.clear();
+}
+
+
+
+
+// XEventMultiplexer
+
+void SAL_CALL EventMultiplexer::addEventListener (
+ const cssu::Reference<css::util::XEventListener>& rxListener,
+ const cssu::Reference<cssu::XInterface>& rxEventFocus)
+ throw(cssu::RuntimeException,cssl::IllegalArgumentException)
+{
+ if ( ! rxListener.is())
+ throw css::lang::IllegalArgumentException(A2S("can not add an empty reference"), static_cast<XWeak*>(this), 0);
+
+ ListenerMap::iterator iListenerContainer (maListeners.find(rxEventFocus));
+ if (iListenerContainer == maListeners.end())
+ {
+ // Create a new listener container for the event focus.
+ iListenerContainer = maListeners.insert(
+ ListenerMap::value_type(
+ rxEventFocus,
+ ListenerContainer())).first;
+ }
+ if (iListenerContainer != maListeners.end())
+ {
+ ListenerContainer& rContainer (iListenerContainer->second);
+ if (::std::find(rContainer.begin(), rContainer.end(), rxListener) == rContainer.end())
+ rContainer.push_back(rxListener);
+ else
+ {
+ // The listener was added for the same event focus
+ // previously. That is an error.
+ throw cssl::IllegalArgumentException(A2S("listener added twice"), static_cast<XWeak*>(this), 0);
+ }
+ }
+}
+
+
+
+
+void SAL_CALL EventMultiplexer::removeEventListener (
+ const cssu::Reference<css::util::XEventListener>& rxListener,
+ const cssu::Reference<cssu::XInterface>& rxEventFocus)
+ throw(cssu::RuntimeException,cssl::IllegalArgumentException)
+{
+ if ( ! rxListener.is())
+ throw cssl::IllegalArgumentException(A2S("can not remove an empty reference"), static_cast<XWeak*>(this), 0);
+
+ ListenerMap::iterator iListenerContainer (maListeners.find(rxEventFocus));
+ if (iListenerContainer != maListeners.end())
+ {
+ ListenerContainer& rContainer (iListenerContainer->second);
+ const ListenerContainer::iterator iListener (::std::find(rContainer.begin(), rContainer.end(), rxListener));
+ if (iListener != rContainer.end())
+ rContainer.erase(iListener);
+ }
+
+}
+
+
+
+
+void SAL_CALL EventMultiplexer::removeAllEventListeners (
+ const cssu::Reference<css::util::XEventListener>& rxListener)
+ throw(cssu::RuntimeException,cssl::IllegalArgumentException)
+{
+ if ( ! rxListener.is())
+ throw cssl::IllegalArgumentException(A2S("can not remove an empty reference"), static_cast<XWeak*>(this), 0);
+
+ for (ListenerMap::iterator
+ iContainer(maListeners.begin()),
+ iEnd(maListeners.end());
+ iContainer!=iEnd;
+ ++iContainer)
+ {
+ const ListenerContainer::iterator iListener (::std::find(iContainer->second.begin(), iContainer->second.end(), rxListener));
+ if (iListener != iContainer->second.end())
+ iContainer->second.erase(iListener);
+ }
+}
+
+
+
+
+
+void SAL_CALL EventMultiplexer::broadcastEvent (
+ const cssl::EventObject& rEventObject,
+ const cssu::Reference<cssu::XInterface>& rxEventFocus)
+ throw(cssu::RuntimeException)
+{
+ BroadcastEventToSingleContainer(rEventObject, rxEventFocus);
+ if (rxEventFocus.is())
+ BroadcastEventToSingleContainer(rEventObject, NULL);
+}
+
+
+
+
+void EventMultiplexer::BroadcastEventToSingleContainer (
+ const cssl::EventObject& rEventObject,
+ const cssu::Reference<cssu::XInterface>& rxEventFocus)
+{
+ ListenerMap::iterator iListenerContainer (maListeners.find(rxEventFocus));
+ if (iListenerContainer != maListeners.end())
+ {
+ // Create a copy of the listener container to avoid problems
+ // when one of the called listeners calls add... or remove...
+ ListenerContainer aContainer (iListenerContainer->second);
+ for (ListenerContainer::const_iterator
+ iListener(aContainer.begin()),
+ iEnd(aContainer.end());
+ iListener!=iEnd;
+ ++iListener)
+ {
+ (*iListener)->notifyEvent(rEventObject);
+ }
+ }
+}
+
+
+
+
+// XSingleComponentFactory
+cssu::Reference<cssu::XInterface> SAL_CALL EventMultiplexer::createInstanceWithContext (
+ const cssu::Reference<cssu::XComponentContext>& rxContext)
+ throw (cssu::Exception, cssu::RuntimeException)
+{
+ return cssu::Reference<cssu::XInterface>();
+}
+
+
+
+
+cssu::Reference<cssu::XInterface > SAL_CALL EventMultiplexer::createInstanceWithArgumentsAndContext (
+ const cssu::Sequence<cssu::Any>& rArguments,
+ const cssu::Reference<cssu::XComponentContext>& rxContext)
+ throw (cssu::Exception, cssu::RuntimeException)
+{
+ return cssu::Reference<cssu::XInterface>();
+}
+
+
+
+
+// XServiceInfo
+
+::rtl::OUString SAL_CALL EventMultiplexer::getImplementationName (void)
+ throw(cssu::RuntimeException)
+{
+ return impl_getStaticImplementationName();
+}
+
+
+
+
+
+sal_Bool SAL_CALL EventMultiplexer::supportsService (
+ const ::rtl::OUString& rsServiceName)
+ throw (cssu::RuntimeException)
+{
+ return ::comphelper::findValue(static_GetSupportedServiceNames(), rsServiceName, sal_True).getLength() != 0;
+}
+
+
+
+
+cssu::Sequence<OUString> SAL_CALL EventMultiplexer::getSupportedServiceNames (void)
+ throw (cssu::RuntimeException)
+{
+ return static_GetSupportedServiceNames();
+}
+
+
+
+
+// Local and static methods.
+
+OUString SAL_CALL EventMultiplexer::impl_getStaticImplementationName (void)
+{
+ return A2S(IMPLEMENTATION_NAME);
+}
+
+
+
+
+cssu::Sequence<OUString> SAL_CALL EventMultiplexer::static_GetSupportedServiceNames (void)
+{
+ cssu::Sequence<OUString> aServiceNames (2);
+ aServiceNames[0] = A2S(SERVICE_NAME);
+ aServiceNames[1] = A2S(SINGLETON_NAME);
+ return aServiceNames;
+}
+
+
+
+
+cssu::Reference<cssu::XInterface> EventMultiplexer::impl_createFactory (
+ const cssu::Reference<cssl::XMultiServiceFactory>& rxServiceManager)
+{
+ return cppu::createSingleComponentFactory(
+ EventMultiplexer::static_CreateInstance,
+ EventMultiplexer::impl_getStaticImplementationName(),
+ EventMultiplexer::static_GetSupportedServiceNames()
+ );
+}
+
+
+
+
+cssu::Reference<cssu::XInterface> SAL_CALL EventMultiplexer::static_CreateInstance (
+ const cssu::Reference<cssu::XComponentContext>& rxComponentContext)
+ throw (cssu::Exception)
+{
+ EventMultiplexer* pObject = new EventMultiplexer(rxComponentContext);
+ cssu::Reference<cssu::XInterface> xService (static_cast<XWeak*>(pObject), cssu::UNO_QUERY);
+ return xService;
+}
+
+} // end of namespace framework
diff --git a/framework/util/fwk.component b/framework/util/fwk.component
index efb700a992e1..9d604c51db9d 100644
--- a/framework/util/fwk.component
+++ b/framework/util/fwk.component
@@ -40,6 +40,10 @@
<implementation name="com.sun.star.comp.framework.DocumentAcceleratorConfiguration">
<service name="com.sun.star.ui.DocumentAcceleratorConfiguration"/>
</implementation>
+ <implementation name="org.apache.openoffice.comp.framework.ContextChangeEventMultiplexer">
+ <service name="com.sun.star.ui.ContextChangeEventMultiplexer"/>
+ <singleton name="com.sun.star.ui.ContextChangeEventMultiplexer"/>
+ </implementation>
<implementation name="com.sun.star.comp.framework.Frame">
<service name="com.sun.star.frame.Frame"/>
</implementation>
diff --git a/icon-themes/galaxy/sc/res/sidebar/123.png b/icon-themes/galaxy/sc/res/sidebar/123.png
new file mode 100755
index 000000000000..0d0a6ef7659c
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/sidebar/123.png
Binary files differ
diff --git a/icon-themes/galaxy/sc/res/sidebar/ABC.png b/icon-themes/galaxy/sc/res/sidebar/ABC.png
new file mode 100755
index 000000000000..fb7e5c8b5585
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/sidebar/ABC.png
Binary files differ
diff --git a/icon-themes/galaxy/sc/res/sidebar/CellBorder.png b/icon-themes/galaxy/sc/res/sidebar/CellBorder.png
new file mode 100755
index 000000000000..f4e8e005c340
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/sidebar/CellBorder.png
Binary files differ
diff --git a/icon-themes/galaxy/sc/res/sidebar/CellBorderLineStyle_005.png b/icon-themes/galaxy/sc/res/sidebar/CellBorderLineStyle_005.png
new file mode 100755
index 000000000000..6116ee216ad5
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/sidebar/CellBorderLineStyle_005.png
Binary files differ
diff --git a/icon-themes/galaxy/sc/res/sidebar/CellBorderLineStyle_110.png b/icon-themes/galaxy/sc/res/sidebar/CellBorderLineStyle_110.png
new file mode 100755
index 000000000000..ddca641e4839
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/sidebar/CellBorderLineStyle_110.png
Binary files differ
diff --git a/icon-themes/galaxy/sc/res/sidebar/CellBorderLineStyle_250.png b/icon-themes/galaxy/sc/res/sidebar/CellBorderLineStyle_250.png
new file mode 100755
index 000000000000..93014bf7be88
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/sidebar/CellBorderLineStyle_250.png
Binary files differ
diff --git a/icon-themes/galaxy/sc/res/sidebar/CellBorderLineStyle_260.png b/icon-themes/galaxy/sc/res/sidebar/CellBorderLineStyle_260.png
new file mode 100755
index 000000000000..4fdc28a2690f
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/sidebar/CellBorderLineStyle_260.png
Binary files differ
diff --git a/icon-themes/galaxy/sc/res/sidebar/CellBorderLineStyle_400.png b/icon-themes/galaxy/sc/res/sidebar/CellBorderLineStyle_400.png
new file mode 100755
index 000000000000..38cda1bfd231
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/sidebar/CellBorderLineStyle_400.png
Binary files differ
diff --git a/icon-themes/galaxy/sc/res/sidebar/CellBorderLineStyle_450.png b/icon-themes/galaxy/sc/res/sidebar/CellBorderLineStyle_450.png
new file mode 100755
index 000000000000..245594f90106
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/sidebar/CellBorderLineStyle_450.png
Binary files differ
diff --git a/icon-themes/galaxy/sc/res/sidebar/CellBorderLineStyle_500.png b/icon-themes/galaxy/sc/res/sidebar/CellBorderLineStyle_500.png
new file mode 100755
index 000000000000..9a6457d03a13
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/sidebar/CellBorderLineStyle_500.png
Binary files differ
diff --git a/icon-themes/galaxy/sc/res/sidebar/CellBorderLineStyle_505.png b/icon-themes/galaxy/sc/res/sidebar/CellBorderLineStyle_505.png
new file mode 100755
index 000000000000..78865c0534fc
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/sidebar/CellBorderLineStyle_505.png
Binary files differ
diff --git a/icon-themes/galaxy/sc/res/sidebar/CellBorderLineStyle_750.png b/icon-themes/galaxy/sc/res/sidebar/CellBorderLineStyle_750.png
new file mode 100755
index 000000000000..71088c184f8c
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/sidebar/CellBorderLineStyle_750.png
Binary files differ
diff --git a/icon-themes/galaxy/sc/res/sidebar/CellBorder_All_18x18.png b/icon-themes/galaxy/sc/res/sidebar/CellBorder_All_18x18.png
new file mode 100755
index 000000000000..68f9d451675d
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/sidebar/CellBorder_All_18x18.png
Binary files differ
diff --git a/icon-themes/galaxy/sc/res/sidebar/CellBorder_Bottom_18x18.png b/icon-themes/galaxy/sc/res/sidebar/CellBorder_Bottom_18x18.png
new file mode 100755
index 000000000000..20d34e229ec7
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/sidebar/CellBorder_Bottom_18x18.png
Binary files differ
diff --git a/icon-themes/galaxy/sc/res/sidebar/CellBorder_Bottom_Double_18x18.png b/icon-themes/galaxy/sc/res/sidebar/CellBorder_Bottom_Double_18x18.png
new file mode 100755
index 000000000000..3bf6450c686c
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/sidebar/CellBorder_Bottom_Double_18x18.png
Binary files differ
diff --git a/icon-themes/galaxy/sc/res/sidebar/CellBorder_Bottom_Thick_18x18.png b/icon-themes/galaxy/sc/res/sidebar/CellBorder_Bottom_Thick_18x18.png
new file mode 100755
index 000000000000..ecf2afa713be
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/sidebar/CellBorder_Bottom_Thick_18x18.png
Binary files differ
diff --git a/icon-themes/galaxy/sc/res/sidebar/CellBorder_Empty_18x18.png b/icon-themes/galaxy/sc/res/sidebar/CellBorder_Empty_18x18.png
new file mode 100755
index 000000000000..a5f3dd45d8b3
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/sidebar/CellBorder_Empty_18x18.png
Binary files differ
diff --git a/icon-themes/galaxy/sc/res/sidebar/CellBorder_FourBorders_18x18.png b/icon-themes/galaxy/sc/res/sidebar/CellBorder_FourBorders_18x18.png
new file mode 100755
index 000000000000..54a42b57b918
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/sidebar/CellBorder_FourBorders_18x18.png
Binary files differ
diff --git a/icon-themes/galaxy/sc/res/sidebar/CellBorder_FourBorders_Thick_18x18.png b/icon-themes/galaxy/sc/res/sidebar/CellBorder_FourBorders_Thick_18x18.png
new file mode 100755
index 000000000000..a54c4f57d6b3
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/sidebar/CellBorder_FourBorders_Thick_18x18.png
Binary files differ
diff --git a/icon-themes/galaxy/sc/res/sidebar/CellBorder_LeftAndRight_18x18.png b/icon-themes/galaxy/sc/res/sidebar/CellBorder_LeftAndRight_18x18.png
new file mode 100755
index 000000000000..39e9b0ff2ff9
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/sidebar/CellBorder_LeftAndRight_18x18.png
Binary files differ
diff --git a/icon-themes/galaxy/sc/res/sidebar/CellBorder_LeftDiagonal_18x18.png b/icon-themes/galaxy/sc/res/sidebar/CellBorder_LeftDiagonal_18x18.png
new file mode 100755
index 000000000000..4e58fee70ca7
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/sidebar/CellBorder_LeftDiagonal_18x18.png
Binary files differ
diff --git a/icon-themes/galaxy/sc/res/sidebar/CellBorder_Left_18x18.png b/icon-themes/galaxy/sc/res/sidebar/CellBorder_Left_18x18.png
new file mode 100755
index 000000000000..987389173b47
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/sidebar/CellBorder_Left_18x18.png
Binary files differ
diff --git a/icon-themes/galaxy/sc/res/sidebar/CellBorder_RightDiagonal_18x18.png b/icon-themes/galaxy/sc/res/sidebar/CellBorder_RightDiagonal_18x18.png
new file mode 100755
index 000000000000..3325d03918ba
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/sidebar/CellBorder_RightDiagonal_18x18.png
Binary files differ
diff --git a/icon-themes/galaxy/sc/res/sidebar/CellBorder_Right_18x18.png b/icon-themes/galaxy/sc/res/sidebar/CellBorder_Right_18x18.png
new file mode 100755
index 000000000000..a33eca25b44d
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/sidebar/CellBorder_Right_18x18.png
Binary files differ
diff --git a/icon-themes/galaxy/sc/res/sidebar/CellBorder_TopAndBottom_18x18.png b/icon-themes/galaxy/sc/res/sidebar/CellBorder_TopAndBottom_18x18.png
new file mode 100755
index 000000000000..4249bf669d6e
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/sidebar/CellBorder_TopAndBottom_18x18.png
Binary files differ
diff --git a/icon-themes/galaxy/sc/res/sidebar/CellBorder_TopSingle_BottomDouble_18x18.png b/icon-themes/galaxy/sc/res/sidebar/CellBorder_TopSingle_BottomDouble_18x18.png
new file mode 100755
index 000000000000..793a98451a82
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/sidebar/CellBorder_TopSingle_BottomDouble_18x18.png
Binary files differ
diff --git a/icon-themes/galaxy/sc/res/sidebar/CellBorder_TopThin_BottomThick_18x18.png b/icon-themes/galaxy/sc/res/sidebar/CellBorder_TopThin_BottomThick_18x18.png
new file mode 100755
index 000000000000..e7c8d0576e53
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/sidebar/CellBorder_TopThin_BottomThick_18x18.png
Binary files differ
diff --git a/icon-themes/galaxy/sc/res/sidebar/CellBorder_Top_18x18.png b/icon-themes/galaxy/sc/res/sidebar/CellBorder_Top_18x18.png
new file mode 100755
index 000000000000..1dda1c1cdfd3
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/sidebar/CellBorder_Top_18x18.png
Binary files differ
diff --git a/icon-themes/galaxy/sc/res/sidebar/Line_color.png b/icon-themes/galaxy/sc/res/sidebar/Line_color.png
new file mode 100755
index 000000000000..a9522b9eeedd
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/sidebar/Line_color.png
Binary files differ
diff --git a/icon-themes/galaxy/sc/res/sidebar/canlendar.png b/icon-themes/galaxy/sc/res/sidebar/canlendar.png
new file mode 100755
index 000000000000..b40421e68f3e
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/sidebar/canlendar.png
Binary files differ
diff --git a/icon-themes/galaxy/sc/res/sidebar/fill_color.png b/icon-themes/galaxy/sc/res/sidebar/fill_color.png
new file mode 100755
index 000000000000..1d5d23feb84c
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/sidebar/fill_color.png
Binary files differ
diff --git a/icon-themes/galaxy/sc/res/sidebar/money.png b/icon-themes/galaxy/sc/res/sidebar/money.png
new file mode 100755
index 000000000000..15b6ff2107ee
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/sidebar/money.png
Binary files differ
diff --git a/icon-themes/galaxy/sc/res/sidebar/morebutton.bmp b/icon-themes/galaxy/sc/res/sidebar/morebutton.bmp
new file mode 100755
index 000000000000..c665b3e866a8
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/sidebar/morebutton.bmp
Binary files differ
diff --git a/icon-themes/galaxy/sc/res/sidebar/morebutton_h.bmp b/icon-themes/galaxy/sc/res/sidebar/morebutton_h.bmp
new file mode 100755
index 000000000000..c665b3e866a8
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/sidebar/morebutton_h.bmp
Binary files differ
diff --git a/icon-themes/galaxy/sc/res/sidebar/percent.png b/icon-themes/galaxy/sc/res/sidebar/percent.png
new file mode 100755
index 000000000000..83f37512545d
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/sidebar/percent.png
Binary files differ
diff --git a/icon-themes/galaxy/sc/res/sidebar/sc_alignbottom.png b/icon-themes/galaxy/sc/res/sidebar/sc_alignbottom.png
new file mode 100755
index 000000000000..de22c240efdb
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/sidebar/sc_alignbottom.png
Binary files differ
diff --git a/icon-themes/galaxy/sc/res/sidebar/sc_aligncenter.png b/icon-themes/galaxy/sc/res/sidebar/sc_aligncenter.png
new file mode 100755
index 000000000000..441e6773aab9
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/sidebar/sc_aligncenter.png
Binary files differ
diff --git a/icon-themes/galaxy/sc/res/sidebar/sc_aligncenter_v.png b/icon-themes/galaxy/sc/res/sidebar/sc_aligncenter_v.png
new file mode 100755
index 000000000000..919edab0d01b
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/sidebar/sc_aligncenter_v.png
Binary files differ
diff --git a/icon-themes/galaxy/sc/res/sidebar/sc_alignjust.png b/icon-themes/galaxy/sc/res/sidebar/sc_alignjust.png
new file mode 100755
index 000000000000..1d57b1c4b2ce
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/sidebar/sc_alignjust.png
Binary files differ
diff --git a/icon-themes/galaxy/sc/res/sidebar/sc_alignleft.png b/icon-themes/galaxy/sc/res/sidebar/sc_alignleft.png
new file mode 100755
index 000000000000..a258013a958c
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/sidebar/sc_alignleft.png
Binary files differ
diff --git a/icon-themes/galaxy/sc/res/sidebar/sc_alignright.png b/icon-themes/galaxy/sc/res/sidebar/sc_alignright.png
new file mode 100755
index 000000000000..cbf816b540ce
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/sidebar/sc_alignright.png
Binary files differ
diff --git a/icon-themes/galaxy/sc/res/sidebar/sc_aligntop.png b/icon-themes/galaxy/sc/res/sidebar/sc_aligntop.png
new file mode 100755
index 000000000000..275133c3409d
--- /dev/null
+++ b/icon-themes/galaxy/sc/res/sidebar/sc_aligntop.png
Binary files differ
diff --git a/icon-themes/galaxy/sfx2/res/grip.png b/icon-themes/galaxy/sfx2/res/grip.png
new file mode 100755
index 000000000000..696998385dbb
--- /dev/null
+++ b/icon-themes/galaxy/sfx2/res/grip.png
Binary files differ
diff --git a/icon-themes/galaxy/sfx2/res/menu.png b/icon-themes/galaxy/sfx2/res/menu.png
new file mode 100755
index 000000000000..e65517b9ca9d
--- /dev/null
+++ b/icon-themes/galaxy/sfx2/res/menu.png
Binary files differ
diff --git a/icon-themes/galaxy/sfx2/res/separator.png b/icon-themes/galaxy/sfx2/res/separator.png
new file mode 100755
index 000000000000..d518aefed706
--- /dev/null
+++ b/icon-themes/galaxy/sfx2/res/separator.png
Binary files differ
diff --git a/icon-themes/galaxy/sfx2/res/symphony/morebutton.png b/icon-themes/galaxy/sfx2/res/symphony/morebutton.png
new file mode 100644
index 000000000000..5cffa97ca41c
--- /dev/null
+++ b/icon-themes/galaxy/sfx2/res/symphony/morebutton.png
Binary files differ
diff --git a/icon-themes/galaxy/sfx2/res/symphony/open_more.png b/icon-themes/galaxy/sfx2/res/symphony/open_more.png
new file mode 100644
index 000000000000..c981abf0f3a5
--- /dev/null
+++ b/icon-themes/galaxy/sfx2/res/symphony/open_more.png
Binary files differ
diff --git a/icon-themes/galaxy/sfx2/res/symphony/sidebar-3d-large.png b/icon-themes/galaxy/sfx2/res/symphony/sidebar-3d-large.png
new file mode 100644
index 000000000000..7bc11604f897
--- /dev/null
+++ b/icon-themes/galaxy/sfx2/res/symphony/sidebar-3d-large.png
Binary files differ
diff --git a/icon-themes/galaxy/sfx2/res/symphony/sidebar-3d-small.png b/icon-themes/galaxy/sfx2/res/symphony/sidebar-3d-small.png
new file mode 100644
index 000000000000..a4cdda9ad5bc
--- /dev/null
+++ b/icon-themes/galaxy/sfx2/res/symphony/sidebar-3d-small.png
Binary files differ
diff --git a/icon-themes/galaxy/sfx2/res/symphony/sidebar-animation-large.png b/icon-themes/galaxy/sfx2/res/symphony/sidebar-animation-large.png
new file mode 100644
index 000000000000..0be7962635fd
--- /dev/null
+++ b/icon-themes/galaxy/sfx2/res/symphony/sidebar-animation-large.png
Binary files differ
diff --git a/icon-themes/galaxy/sfx2/res/symphony/sidebar-animation-small.png b/icon-themes/galaxy/sfx2/res/symphony/sidebar-animation-small.png
new file mode 100644
index 000000000000..c494dfa6e170
--- /dev/null
+++ b/icon-themes/galaxy/sfx2/res/symphony/sidebar-animation-small.png
Binary files differ
diff --git a/icon-themes/galaxy/sfx2/res/symphony/sidebar-colors-large.png b/icon-themes/galaxy/sfx2/res/symphony/sidebar-colors-large.png
new file mode 100644
index 000000000000..39ecdc12d1bf
--- /dev/null
+++ b/icon-themes/galaxy/sfx2/res/symphony/sidebar-colors-large.png
Binary files differ
diff --git a/icon-themes/galaxy/sfx2/res/symphony/sidebar-colors-small.png b/icon-themes/galaxy/sfx2/res/symphony/sidebar-colors-small.png
new file mode 100644
index 000000000000..049514bec7df
--- /dev/null
+++ b/icon-themes/galaxy/sfx2/res/symphony/sidebar-colors-small.png
Binary files differ
diff --git a/icon-themes/galaxy/sfx2/res/symphony/sidebar-eyedropper-large.png b/icon-themes/galaxy/sfx2/res/symphony/sidebar-eyedropper-large.png
new file mode 100644
index 000000000000..be99b1fbc2a4
--- /dev/null
+++ b/icon-themes/galaxy/sfx2/res/symphony/sidebar-eyedropper-large.png
Binary files differ
diff --git a/icon-themes/galaxy/sfx2/res/symphony/sidebar-eyedropper-small.png b/icon-themes/galaxy/sfx2/res/symphony/sidebar-eyedropper-small.png
new file mode 100644
index 000000000000..55e182a7cfd8
--- /dev/null
+++ b/icon-themes/galaxy/sfx2/res/symphony/sidebar-eyedropper-small.png
Binary files differ
diff --git a/icon-themes/galaxy/sfx2/res/symphony/sidebar-functions-large.png b/icon-themes/galaxy/sfx2/res/symphony/sidebar-functions-large.png
new file mode 100644
index 000000000000..1991850ae7db
--- /dev/null
+++ b/icon-themes/galaxy/sfx2/res/symphony/sidebar-functions-large.png
Binary files differ
diff --git a/icon-themes/galaxy/sfx2/res/symphony/sidebar-functions-small.png b/icon-themes/galaxy/sfx2/res/symphony/sidebar-functions-small.png
new file mode 100644
index 000000000000..615bd0b8788d
--- /dev/null
+++ b/icon-themes/galaxy/sfx2/res/symphony/sidebar-functions-small.png
Binary files differ
diff --git a/icon-themes/galaxy/sfx2/res/symphony/sidebar-gallery-large.png b/icon-themes/galaxy/sfx2/res/symphony/sidebar-gallery-large.png
new file mode 100644
index 000000000000..9effe086a135
--- /dev/null
+++ b/icon-themes/galaxy/sfx2/res/symphony/sidebar-gallery-large.png
Binary files differ
diff --git a/icon-themes/galaxy/sfx2/res/symphony/sidebar-gallery-small.png b/icon-themes/galaxy/sfx2/res/symphony/sidebar-gallery-small.png
new file mode 100644
index 000000000000..29b3c2545978
--- /dev/null
+++ b/icon-themes/galaxy/sfx2/res/symphony/sidebar-gallery-small.png
Binary files differ
diff --git a/icon-themes/galaxy/sfx2/res/symphony/sidebar-imganim-large.png b/icon-themes/galaxy/sfx2/res/symphony/sidebar-imganim-large.png
new file mode 100644
index 000000000000..778e49979e55
--- /dev/null
+++ b/icon-themes/galaxy/sfx2/res/symphony/sidebar-imganim-large.png
Binary files differ
diff --git a/icon-themes/galaxy/sfx2/res/symphony/sidebar-imganim-small.png b/icon-themes/galaxy/sfx2/res/symphony/sidebar-imganim-small.png
new file mode 100644
index 000000000000..50a065ac299b
--- /dev/null
+++ b/icon-themes/galaxy/sfx2/res/symphony/sidebar-imganim-small.png
Binary files differ
diff --git a/icon-themes/galaxy/sfx2/res/symphony/sidebar-navigator-large.png b/icon-themes/galaxy/sfx2/res/symphony/sidebar-navigator-large.png
new file mode 100644
index 000000000000..a078b0a54194
--- /dev/null
+++ b/icon-themes/galaxy/sfx2/res/symphony/sidebar-navigator-large.png
Binary files differ
diff --git a/icon-themes/galaxy/sfx2/res/symphony/sidebar-navigator-small.png b/icon-themes/galaxy/sfx2/res/symphony/sidebar-navigator-small.png
new file mode 100644
index 000000000000..00bd1cabf200
--- /dev/null
+++ b/icon-themes/galaxy/sfx2/res/symphony/sidebar-navigator-small.png
Binary files differ
diff --git a/icon-themes/galaxy/sfx2/res/symphony/sidebar-property-large.png b/icon-themes/galaxy/sfx2/res/symphony/sidebar-property-large.png
new file mode 100644
index 000000000000..fb0c1595ff68
--- /dev/null
+++ b/icon-themes/galaxy/sfx2/res/symphony/sidebar-property-large.png
Binary files differ
diff --git a/icon-themes/galaxy/sfx2/res/symphony/sidebar-property-small.png b/icon-themes/galaxy/sfx2/res/symphony/sidebar-property-small.png
new file mode 100644
index 000000000000..4147aa14cc0b
--- /dev/null
+++ b/icon-themes/galaxy/sfx2/res/symphony/sidebar-property-small.png
Binary files differ
diff --git a/icon-themes/galaxy/sfx2/res/symphony/sidebar-style-large.png b/icon-themes/galaxy/sfx2/res/symphony/sidebar-style-large.png
new file mode 100644
index 000000000000..0d59a2df0cba
--- /dev/null
+++ b/icon-themes/galaxy/sfx2/res/symphony/sidebar-style-large.png
Binary files differ
diff --git a/icon-themes/galaxy/sfx2/res/symphony/sidebar-style-small.png b/icon-themes/galaxy/sfx2/res/symphony/sidebar-style-small.png
new file mode 100644
index 000000000000..d570ffa0f8de
--- /dev/null
+++ b/icon-themes/galaxy/sfx2/res/symphony/sidebar-style-small.png
Binary files differ
diff --git a/icon-themes/galaxy/sfx2/res/symphony/sidebar-template-large.png b/icon-themes/galaxy/sfx2/res/symphony/sidebar-template-large.png
new file mode 100644
index 000000000000..f4beddc5426d
--- /dev/null
+++ b/icon-themes/galaxy/sfx2/res/symphony/sidebar-template-large.png
Binary files differ
diff --git a/icon-themes/galaxy/sfx2/res/symphony/sidebar-template-small.png b/icon-themes/galaxy/sfx2/res/symphony/sidebar-template-small.png
new file mode 100644
index 000000000000..65bff0c226e8
--- /dev/null
+++ b/icon-themes/galaxy/sfx2/res/symphony/sidebar-template-small.png
Binary files differ
diff --git a/icon-themes/galaxy/sfx2/res/symphony/sidebar-transition-large.png b/icon-themes/galaxy/sfx2/res/symphony/sidebar-transition-large.png
new file mode 100644
index 000000000000..f0c319878bb7
--- /dev/null
+++ b/icon-themes/galaxy/sfx2/res/symphony/sidebar-transition-large.png
Binary files differ
diff --git a/icon-themes/galaxy/sfx2/res/symphony/sidebar-transition-small.png b/icon-themes/galaxy/sfx2/res/symphony/sidebar-transition-small.png
new file mode 100644
index 000000000000..6cdc89a5e614
--- /dev/null
+++ b/icon-themes/galaxy/sfx2/res/symphony/sidebar-transition-small.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/rotation.png b/icon-themes/galaxy/svx/res/rotation.png
new file mode 100644
index 000000000000..57f75b98732c
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/rotation.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/ b/icon-themes/galaxy/svx/res/symphony/
new file mode 100755
index 000000000000..263af5d328bd
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/AdjustColorBlue_16x16.png b/icon-themes/galaxy/svx/res/symphony/AdjustColorBlue_16x16.png
new file mode 100755
index 000000000000..0e4e0b3d2599
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/AdjustColorBlue_16x16.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/AdjustColorGamma_16x16.png b/icon-themes/galaxy/svx/res/symphony/AdjustColorGamma_16x16.png
new file mode 100755
index 000000000000..bc593f743048
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/AdjustColorGamma_16x16.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/AdjustColorGreen_16x16.png b/icon-themes/galaxy/svx/res/symphony/AdjustColorGreen_16x16.png
new file mode 100755
index 000000000000..05f99dcd85b2
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/AdjustColorGreen_16x16.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/AdjustColorRed_16x16.png b/icon-themes/galaxy/svx/res/symphony/AdjustColorRed_16x16.png
new file mode 100755
index 000000000000..86ed800174f8
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/AdjustColorRed_16x16.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/AlignTextCenter_16x16.png b/icon-themes/galaxy/svx/res/symphony/AlignTextCenter_16x16.png
new file mode 100755
index 000000000000..441e6773aab9
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/AlignTextCenter_16x16.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/AlignTextJustified_16x16.png b/icon-themes/galaxy/svx/res/symphony/AlignTextJustified_16x16.png
new file mode 100755
index 000000000000..1d57b1c4b2ce
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/AlignTextJustified_16x16.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/AlignTextLeft_16x16.png b/icon-themes/galaxy/svx/res/symphony/AlignTextLeft_16x16.png
new file mode 100755
index 000000000000..a258013a958c
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/AlignTextLeft_16x16.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/AlignTextRight_16x16.png b/icon-themes/galaxy/svx/res/symphony/AlignTextRight_16x16.png
new file mode 100755
index 000000000000..cbf816b540ce
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/AlignTextRight_16x16.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/ColorModeBlackWhite_16x16.png b/icon-themes/galaxy/svx/res/symphony/ColorModeBlackWhite_16x16.png
new file mode 100755
index 000000000000..c6d333cb45ed
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/ColorModeBlackWhite_16x16.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/ColorModeGrey_16x16.png b/icon-themes/galaxy/svx/res/symphony/ColorModeGrey_16x16.png
new file mode 100755
index 000000000000..5bda54f81d99
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/ColorModeGrey_16x16.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/ColorModeNormal_16x16.png b/icon-themes/galaxy/svx/res/symphony/ColorModeNormal_16x16.png
new file mode 100755
index 000000000000..a618abd72851
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/ColorModeNormal_16x16.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/ColorModeWaterMark_16x16.png b/icon-themes/galaxy/svx/res/symphony/ColorModeWaterMark_16x16.png
new file mode 100755
index 000000000000..1606498d5537
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/ColorModeWaterMark_16x16.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/DecreaseSpace_16x16.png b/icon-themes/galaxy/svx/res/symphony/DecreaseSpace_16x16.png
new file mode 100755
index 000000000000..3f97e69229fe
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/DecreaseSpace_16x16.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/FlipHorizontally_16x16.png b/icon-themes/galaxy/svx/res/symphony/FlipHorizontally_16x16.png
new file mode 100755
index 000000000000..281ee466886d
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/FlipHorizontally_16x16.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/FlipVertically_16x16.png b/icon-themes/galaxy/svx/res/symphony/FlipVertically_16x16.png
new file mode 100755
index 000000000000..7c9c4c45e205
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/FlipVertically_16x16.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/Highlight.png b/icon-themes/galaxy/svx/res/symphony/Highlight.png
new file mode 100755
index 000000000000..8640d2e44be9
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/Highlight.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/IncreaseSpace_16x16.png b/icon-themes/galaxy/svx/res/symphony/IncreaseSpace_16x16.png
new file mode 100755
index 000000000000..f27f369dbe61
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/IncreaseSpace_16x16.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/Indent2.png b/icon-themes/galaxy/svx/res/symphony/Indent2.png
new file mode 100755
index 000000000000..9cb8663a9703
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/Indent2.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/Indent3.png b/icon-themes/galaxy/svx/res/symphony/Indent3.png
new file mode 100755
index 000000000000..c57f2b279c48
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/Indent3.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/Indent4.png b/icon-themes/galaxy/svx/res/symphony/Indent4.png
new file mode 100755
index 000000000000..0cba2f006ed0
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/Indent4.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/Indent_16x16.png b/icon-themes/galaxy/svx/res/symphony/Indent_16x16.png
new file mode 100755
index 000000000000..93137374094e
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/Indent_16x16.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/Indent_Hanging.png b/icon-themes/galaxy/svx/res/symphony/Indent_Hanging.png
new file mode 100755
index 000000000000..4acb5b519983
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/Indent_Hanging.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/Line_color.png b/icon-themes/galaxy/svx/res/symphony/Line_color.png
new file mode 100755
index 000000000000..a9522b9eeedd
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/Line_color.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/Outdent_16x16.png b/icon-themes/galaxy/svx/res/symphony/Outdent_16x16.png
new file mode 100755
index 000000000000..7461944a7083
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/Outdent_16x16.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/Quadratic.png b/icon-themes/galaxy/svx/res/symphony/Quadratic.png
new file mode 100755
index 000000000000..ad579c8e393d
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/Quadratic.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/Square.png b/icon-themes/galaxy/svx/res/symphony/Square.png
new file mode 100755
index 000000000000..1027f8a480f8
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/Square.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/__morebutton.bmp b/icon-themes/galaxy/svx/res/symphony/__morebutton.bmp
new file mode 100755
index 000000000000..c665b3e866a8
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/__morebutton.bmp
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/axial.png b/icon-themes/galaxy/svx/res/symphony/axial.png
new file mode 100755
index 000000000000..8b398bef1df5
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/axial.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/blank.png b/icon-themes/galaxy/svx/res/symphony/blank.png
new file mode 100755
index 000000000000..d38ff9daebf9
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/blank.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/decrease font.png b/icon-themes/galaxy/svx/res/symphony/decrease font.png
new file mode 100755
index 000000000000..183e0091f590
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/decrease font.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/ellipsoid.png b/icon-themes/galaxy/svx/res/symphony/ellipsoid.png
new file mode 100755
index 000000000000..babaf75b2da8
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/ellipsoid.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/enlarge font.png b/icon-themes/galaxy/svx/res/symphony/enlarge font.png
new file mode 100755
index 000000000000..86c6e5d49daa
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/enlarge font.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/fill_color.png b/icon-themes/galaxy/svx/res/symphony/fill_color.png
new file mode 100755
index 000000000000..1d8837545728
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/fill_color.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/icon_normal.png b/icon-themes/galaxy/svx/res/symphony/icon_normal.png
new file mode 100755
index 000000000000..f69ec0501e9e
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/icon_normal.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/last_custom_common.png b/icon-themes/galaxy/svx/res/symphony/last_custom_common.png
new file mode 100755
index 000000000000..bbbe3255d272
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/last_custom_common.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/last_custom_common_grey.png b/icon-themes/galaxy/svx/res/symphony/last_custom_common_grey.png
new file mode 100755
index 000000000000..c95062eb2897
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/last_custom_common_grey.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/line1.png b/icon-themes/galaxy/svx/res/symphony/line1.png
new file mode 100755
index 000000000000..7b667d5fdfe0
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/line1.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/line10.png b/icon-themes/galaxy/svx/res/symphony/line10.png
new file mode 100755
index 000000000000..956c4f05959e
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/line10.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/line2.png b/icon-themes/galaxy/svx/res/symphony/line2.png
new file mode 100755
index 000000000000..d7c2cae56195
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/line2.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/line3.png b/icon-themes/galaxy/svx/res/symphony/line3.png
new file mode 100755
index 000000000000..0c74e4190570
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/line3.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/line4.png b/icon-themes/galaxy/svx/res/symphony/line4.png
new file mode 100755
index 000000000000..5dc893860d32
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/line4.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/line5.png b/icon-themes/galaxy/svx/res/symphony/line5.png
new file mode 100755
index 000000000000..2f90aedc5b46
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/line5.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/line6.png b/icon-themes/galaxy/svx/res/symphony/line6.png
new file mode 100755
index 000000000000..10a7cedcfcae
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/line6.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/line7.png b/icon-themes/galaxy/svx/res/symphony/line7.png
new file mode 100755
index 000000000000..ff1df906dec3
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/line7.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/line8.png b/icon-themes/galaxy/svx/res/symphony/line8.png
new file mode 100755
index 000000000000..5355d76d7644
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/line8.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/line9.png b/icon-themes/galaxy/svx/res/symphony/line9.png
new file mode 100755
index 000000000000..ba822a7c16e3
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/line9.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/linear.png b/icon-themes/galaxy/svx/res/symphony/linear.png
new file mode 100755
index 000000000000..a9c3191b1919
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/linear.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/lpselected-spacing-1.png b/icon-themes/galaxy/svx/res/symphony/lpselected-spacing-1.png
new file mode 100755
index 000000000000..098636521709
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/lpselected-spacing-1.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/lpselected-spacing-1_15.png b/icon-themes/galaxy/svx/res/symphony/lpselected-spacing-1_15.png
new file mode 100755
index 000000000000..97337b0e77dc
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/lpselected-spacing-1_15.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/lpselected-spacing-1_5.png b/icon-themes/galaxy/svx/res/symphony/lpselected-spacing-1_5.png
new file mode 100755
index 000000000000..90b2532ca23b
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/lpselected-spacing-1_5.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/lpselected-spacing-2.png b/icon-themes/galaxy/svx/res/symphony/lpselected-spacing-2.png
new file mode 100755
index 000000000000..4549b900caf6
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/lpselected-spacing-2.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/lpsmall-spacing-1.png b/icon-themes/galaxy/svx/res/symphony/lpsmall-spacing-1.png
new file mode 100755
index 000000000000..b6afc43b3b9b
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/lpsmall-spacing-1.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/lpspacing-1.png b/icon-themes/galaxy/svx/res/symphony/lpspacing-1.png
new file mode 100755
index 000000000000..6aefacf9f8a0
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/lpspacing-1.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/lpspacing-1_15.png b/icon-themes/galaxy/svx/res/symphony/lpspacing-1_15.png
new file mode 100755
index 000000000000..01c861d88f34
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/lpspacing-1_15.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/lpspacing-1_5.png b/icon-themes/galaxy/svx/res/symphony/lpspacing-1_5.png
new file mode 100755
index 000000000000..27708ca4f070
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/lpspacing-1_5.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/lpspacing-2.png b/icon-themes/galaxy/svx/res/symphony/lpspacing-2.png
new file mode 100755
index 000000000000..12f0fcdcd9cf
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/lpspacing-2.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/no color.png b/icon-themes/galaxy/svx/res/symphony/no color.png
new file mode 100755
index 000000000000..7442b7484945
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/no color.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/para_numbullet01.png b/icon-themes/galaxy/svx/res/symphony/para_numbullet01.png
new file mode 100755
index 000000000000..8cb0cc7bd94a
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/para_numbullet01.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/para_numbullet02.png b/icon-themes/galaxy/svx/res/symphony/para_numbullet02.png
new file mode 100755
index 000000000000..f283c8af12ad
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/para_numbullet02.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/para_numbullet_rtl01.png b/icon-themes/galaxy/svx/res/symphony/para_numbullet_rtl01.png
new file mode 100755
index 000000000000..cae419362f95
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/para_numbullet_rtl01.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/para_numbullet_rtl02.png b/icon-themes/galaxy/svx/res/symphony/para_numbullet_rtl02.png
new file mode 100755
index 000000000000..c5ecb4b690f3
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/para_numbullet_rtl02.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/para_numbulleth01.png b/icon-themes/galaxy/svx/res/symphony/para_numbulleth01.png
new file mode 100755
index 000000000000..6bf74ad750ab
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/para_numbulleth01.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/para_numbulleth02.png b/icon-themes/galaxy/svx/res/symphony/para_numbulleth02.png
new file mode 100755
index 000000000000..8405c705fea8
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/para_numbulleth02.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/para_vert01.png b/icon-themes/galaxy/svx/res/symphony/para_vert01.png
new file mode 100755
index 000000000000..275133c3409d
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/para_vert01.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/para_vert02.png b/icon-themes/galaxy/svx/res/symphony/para_vert02.png
new file mode 100755
index 000000000000..919edab0d01b
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/para_vert02.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/para_vert03.png b/icon-themes/galaxy/svx/res/symphony/para_vert03.png
new file mode 100755
index 000000000000..de22c240efdb
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/para_vert03.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/para_verth01.png b/icon-themes/galaxy/svx/res/symphony/para_verth01.png
new file mode 100755
index 000000000000..9493fba1c393
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/para_verth01.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/para_verth02.png b/icon-themes/galaxy/svx/res/symphony/para_verth02.png
new file mode 100755
index 000000000000..66470c72db77
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/para_verth02.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/para_verth03.png b/icon-themes/galaxy/svx/res/symphony/para_verth03.png
new file mode 100755
index 000000000000..bf889acb3a31
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/para_verth03.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/radial.png b/icon-themes/galaxy/svx/res/symphony/radial.png
new file mode 100755
index 000000000000..bb44a0c68318
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/radial.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/rotate_left.png b/icon-themes/galaxy/svx/res/symphony/rotate_left.png
new file mode 100755
index 000000000000..b537b6b9286a
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/rotate_left.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/rotate_right.png b/icon-themes/galaxy/svx/res/symphony/rotate_right.png
new file mode 100755
index 000000000000..217cf91891b4
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/rotate_right.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/rotation.png b/icon-themes/galaxy/svx/res/symphony/rotation.png
new file mode 100755
index 000000000000..3d197def2724
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/rotation.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/rte_Indent_16x16.png b/icon-themes/galaxy/svx/res/symphony/rte_Indent_16x16.png
new file mode 100755
index 000000000000..28c90a34a62f
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/rte_Indent_16x16.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/rte_Outdent_16x16.png b/icon-themes/galaxy/svx/res/symphony/rte_Outdent_16x16.png
new file mode 100755
index 000000000000..ceae7d35d843
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/rte_Outdent_16x16.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/sc_backgroundcolor.png b/icon-themes/galaxy/svx/res/symphony/sc_backgroundcolor.png
new file mode 100755
index 000000000000..7f926b66bd71
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/sc_backgroundcolor.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/sc_bold.png b/icon-themes/galaxy/svx/res/symphony/sc_bold.png
new file mode 100755
index 000000000000..2f610b2529c8
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/sc_bold.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/sc_color.png b/icon-themes/galaxy/svx/res/symphony/sc_color.png
new file mode 100755
index 000000000000..f11f2181434e
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/sc_color.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/sc_italic.png b/icon-themes/galaxy/svx/res/symphony/sc_italic.png
new file mode 100755
index 000000000000..0ccd22e1cc39
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/sc_italic.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/sc_shadowed.png b/icon-themes/galaxy/svx/res/symphony/sc_shadowed.png
new file mode 100755
index 000000000000..7d3a6992c92a
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/sc_shadowed.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/sc_strikeout.png b/icon-themes/galaxy/svx/res/symphony/sc_strikeout.png
new file mode 100755
index 000000000000..58d2794bb41c
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/sc_strikeout.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/sc_subscript.png b/icon-themes/galaxy/svx/res/symphony/sc_subscript.png
new file mode 100755
index 000000000000..682e6f17ac21
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/sc_subscript.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/sc_superscript.png b/icon-themes/galaxy/svx/res/symphony/sc_superscript.png
new file mode 100755
index 000000000000..33fd1ecef7ae
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/sc_superscript.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/sc_underline.png b/icon-themes/galaxy/svx/res/symphony/sc_underline.png
new file mode 100755
index 000000000000..b2071c5cc423
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/sc_underline.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/sch_backgroundcolor.png b/icon-themes/galaxy/svx/res/symphony/sch_backgroundcolor.png
new file mode 100755
index 000000000000..a2e234fc3311
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/sch_backgroundcolor.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/selected-line1.png b/icon-themes/galaxy/svx/res/symphony/selected-line1.png
new file mode 100755
index 000000000000..99921b34df4e
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/selected-line1.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/selected-line10.png b/icon-themes/galaxy/svx/res/symphony/selected-line10.png
new file mode 100755
index 000000000000..cca4848e0cb5
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/selected-line10.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/selected-line2.png b/icon-themes/galaxy/svx/res/symphony/selected-line2.png
new file mode 100755
index 000000000000..4e68e6ba48c7
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/selected-line2.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/selected-line3.png b/icon-themes/galaxy/svx/res/symphony/selected-line3.png
new file mode 100755
index 000000000000..425869e629c1
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/selected-line3.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/selected-line4.png b/icon-themes/galaxy/svx/res/symphony/selected-line4.png
new file mode 100755
index 000000000000..7fa3f7eb219e
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/selected-line4.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/selected-line5.png b/icon-themes/galaxy/svx/res/symphony/selected-line5.png
new file mode 100755
index 000000000000..60e266c070ae
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/selected-line5.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/selected-line6.png b/icon-themes/galaxy/svx/res/symphony/selected-line6.png
new file mode 100755
index 000000000000..e89d1996e100
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/selected-line6.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/selected-line7.png b/icon-themes/galaxy/svx/res/symphony/selected-line7.png
new file mode 100755
index 000000000000..c53fd70e0064
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/selected-line7.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/selected-line8.png b/icon-themes/galaxy/svx/res/symphony/selected-line8.png
new file mode 100755
index 000000000000..b24ab5588343
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/selected-line8.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/selected-line9.png b/icon-themes/galaxy/svx/res/symphony/selected-line9.png
new file mode 100755
index 000000000000..c6e266ea110c
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/selected-line9.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/spacing1.png b/icon-themes/galaxy/svx/res/symphony/spacing1.png
new file mode 100755
index 000000000000..9e1f4839e25d
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/spacing1.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/spacing2.png b/icon-themes/galaxy/svx/res/symphony/spacing2.png
new file mode 100755
index 000000000000..f4ae81a37ced
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/spacing2.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/spacing3.png b/icon-themes/galaxy/svx/res/symphony/spacing3.png
new file mode 100755
index 000000000000..106e0edaed0b
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/spacing3.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/spacing_loose.png b/icon-themes/galaxy/svx/res/symphony/spacing_loose.png
new file mode 100755
index 000000000000..5ab9f3e02043
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/spacing_loose.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/spacing_loose_s.png b/icon-themes/galaxy/svx/res/symphony/spacing_loose_s.png
new file mode 100755
index 000000000000..46e2f246c558
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/spacing_loose_s.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/spacing_normal.png b/icon-themes/galaxy/svx/res/symphony/spacing_normal.png
new file mode 100755
index 000000000000..bf7d5471160a
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/spacing_normal.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/spacing_normal_s.png b/icon-themes/galaxy/svx/res/symphony/spacing_normal_s.png
new file mode 100755
index 000000000000..76097b309e89
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/spacing_normal_s.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/spacing_tight.png b/icon-themes/galaxy/svx/res/symphony/spacing_tight.png
new file mode 100755
index 000000000000..ac469dbb93ed
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/spacing_tight.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/spacing_tight_s.png b/icon-themes/galaxy/svx/res/symphony/spacing_tight_s.png
new file mode 100755
index 000000000000..dbb969cf57ae
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/spacing_tight_s.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/spacing_very loose.png b/icon-themes/galaxy/svx/res/symphony/spacing_very loose.png
new file mode 100755
index 000000000000..04f3969c6853
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/spacing_very loose.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/spacing_very loose_s.png b/icon-themes/galaxy/svx/res/symphony/spacing_very loose_s.png
new file mode 100755
index 000000000000..21f578408222
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/spacing_very loose_s.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/spacing_very tight.png b/icon-themes/galaxy/svx/res/symphony/spacing_very tight.png
new file mode 100755
index 000000000000..84845c3c9ca5
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/spacing_very tight.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/spacing_very tight_s.png b/icon-themes/galaxy/svx/res/symphony/spacing_very tight_s.png
new file mode 100755
index 000000000000..19b4856b4b0a
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/spacing_very tight_s.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/style_line1.png b/icon-themes/galaxy/svx/res/symphony/style_line1.png
new file mode 100755
index 000000000000..6403c068da07
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/style_line1.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/style_line10.png b/icon-themes/galaxy/svx/res/symphony/style_line10.png
new file mode 100755
index 000000000000..f7d1e34985a3
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/style_line10.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/style_line11.png b/icon-themes/galaxy/svx/res/symphony/style_line11.png
new file mode 100755
index 000000000000..4400dd387e7c
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/style_line11.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/style_line2.png b/icon-themes/galaxy/svx/res/symphony/style_line2.png
new file mode 100755
index 000000000000..4269c7dfadf3
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/style_line2.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/style_line3.png b/icon-themes/galaxy/svx/res/symphony/style_line3.png
new file mode 100755
index 000000000000..3e03ad01f28a
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/style_line3.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/style_line4.png b/icon-themes/galaxy/svx/res/symphony/style_line4.png
new file mode 100755
index 000000000000..21c1115429ea
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/style_line4.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/style_line5.png b/icon-themes/galaxy/svx/res/symphony/style_line5.png
new file mode 100755
index 000000000000..8648065c1951
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/style_line5.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/style_line6.png b/icon-themes/galaxy/svx/res/symphony/style_line6.png
new file mode 100755
index 000000000000..b0b8d7cf88ed
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/style_line6.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/style_line7.png b/icon-themes/galaxy/svx/res/symphony/style_line7.png
new file mode 100755
index 000000000000..e30fc03fc333
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/style_line7.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/style_line8.png b/icon-themes/galaxy/svx/res/symphony/style_line8.png
new file mode 100755
index 000000000000..5c3ed3144a6f
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/style_line8.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/style_line9.png b/icon-themes/galaxy/svx/res/symphony/style_line9.png
new file mode 100755
index 000000000000..10035bae2640
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/style_line9.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/width1.png b/icon-themes/galaxy/svx/res/symphony/width1.png
new file mode 100755
index 000000000000..8faeb437c01f
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/width1.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/width2.png b/icon-themes/galaxy/svx/res/symphony/width2.png
new file mode 100755
index 000000000000..e6574687fac0
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/width2.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/width3.png b/icon-themes/galaxy/svx/res/symphony/width3.png
new file mode 100755
index 000000000000..dfe321603ce3
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/width3.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/width4.png b/icon-themes/galaxy/svx/res/symphony/width4.png
new file mode 100755
index 000000000000..d19ac86ab222
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/width4.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/width5.png b/icon-themes/galaxy/svx/res/symphony/width5.png
new file mode 100755
index 000000000000..de6fb7f906c9
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/width5.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/width6.png b/icon-themes/galaxy/svx/res/symphony/width6.png
new file mode 100755
index 000000000000..27e3cad34eb3
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/width6.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/width7.png b/icon-themes/galaxy/svx/res/symphony/width7.png
new file mode 100755
index 000000000000..5bd3cfe35132
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/width7.png
Binary files differ
diff --git a/icon-themes/galaxy/svx/res/symphony/width8.png b/icon-themes/galaxy/svx/res/symphony/width8.png
new file mode 100755
index 000000000000..1cbb7ebda8e5
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/symphony/width8.png
Binary files differ
diff --git a/icon-themes/galaxy/sw/res/sidebar/pageproppanel/Landscapecopy_24x24.png b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/Landscapecopy_24x24.png
new file mode 100755
index 000000000000..ce1372162eff
--- /dev/null
+++ b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/Landscapecopy_24x24.png
Binary files differ
diff --git a/icon-themes/galaxy/sw/res/sidebar/pageproppanel/column1_24x24.png b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/column1_24x24.png
new file mode 100755
index 000000000000..48f4a8b1c281
--- /dev/null
+++ b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/column1_24x24.png
Binary files differ
diff --git a/icon-themes/galaxy/sw/res/sidebar/pageproppanel/column2_24x24.png b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/column2_24x24.png
new file mode 100755
index 000000000000..d8a2de473bf4
--- /dev/null
+++ b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/column2_24x24.png
Binary files differ
diff --git a/icon-themes/galaxy/sw/res/sidebar/pageproppanel/column3_24x24.png b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/column3_24x24.png
new file mode 100755
index 000000000000..5869559c36ad
--- /dev/null
+++ b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/column3_24x24.png
Binary files differ
diff --git a/icon-themes/galaxy/sw/res/sidebar/pageproppanel/column_L_1_24x24.png b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/column_L_1_24x24.png
new file mode 100755
index 000000000000..bac5e3f468bd
--- /dev/null
+++ b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/column_L_1_24x24.png
Binary files differ
diff --git a/icon-themes/galaxy/sw/res/sidebar/pageproppanel/column_L_2_24x24.png b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/column_L_2_24x24.png
new file mode 100755
index 000000000000..146b66695721
--- /dev/null
+++ b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/column_L_2_24x24.png
Binary files differ
diff --git a/icon-themes/galaxy/sw/res/sidebar/pageproppanel/column_L_3_24x24.png b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/column_L_3_24x24.png
new file mode 100755
index 000000000000..11ee37536b25
--- /dev/null
+++ b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/column_L_3_24x24.png
Binary files differ
diff --git a/icon-themes/galaxy/sw/res/sidebar/pageproppanel/column_L_copy_24x24.png b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/column_L_copy_24x24.png
new file mode 100755
index 000000000000..747ac4dd242f
--- /dev/null
+++ b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/column_L_copy_24x24.png
Binary files differ
diff --git a/icon-themes/galaxy/sw/res/sidebar/pageproppanel/column_L_left_24x24.png b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/column_L_left_24x24.png
new file mode 100755
index 000000000000..c6a9f0caa740
--- /dev/null
+++ b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/column_L_left_24x24.png
Binary files differ
diff --git a/icon-themes/galaxy/sw/res/sidebar/pageproppanel/column_L_right_24x24.png b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/column_L_right_24x24.png
new file mode 100755
index 000000000000..ccdecfe2de6f
--- /dev/null
+++ b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/column_L_right_24x24.png
Binary files differ
diff --git a/icon-themes/galaxy/sw/res/sidebar/pageproppanel/columncopy_24x24.png b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/columncopy_24x24.png
new file mode 100755
index 000000000000..983da8be35ad
--- /dev/null
+++ b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/columncopy_24x24.png
Binary files differ
diff --git a/icon-themes/galaxy/sw/res/sidebar/pageproppanel/columnleft_24x24.png b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/columnleft_24x24.png
new file mode 100755
index 000000000000..c61c76a32b57
--- /dev/null
+++ b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/columnleft_24x24.png
Binary files differ
diff --git a/icon-themes/galaxy/sw/res/sidebar/pageproppanel/columnright_24x24.png b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/columnright_24x24.png
new file mode 100755
index 000000000000..9421fabc232d
--- /dev/null
+++ b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/columnright_24x24.png
Binary files differ
diff --git a/icon-themes/galaxy/sw/res/sidebar/pageproppanel/documentsizeA3_24x24.png b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/documentsizeA3_24x24.png
new file mode 100755
index 000000000000..e9507282d308
--- /dev/null
+++ b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/documentsizeA3_24x24.png
Binary files differ
diff --git a/icon-themes/galaxy/sw/res/sidebar/pageproppanel/documentsizeA4_24x24.png b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/documentsizeA4_24x24.png
new file mode 100755
index 000000000000..3039746e09de
--- /dev/null
+++ b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/documentsizeA4_24x24.png
Binary files differ
diff --git a/icon-themes/galaxy/sw/res/sidebar/pageproppanel/documentsizeA5_24x24.png b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/documentsizeA5_24x24.png
new file mode 100755
index 000000000000..2e73f5d246dc
--- /dev/null
+++ b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/documentsizeA5_24x24.png
Binary files differ
diff --git a/icon-themes/galaxy/sw/res/sidebar/pageproppanel/documentsizeB4_24x24.png b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/documentsizeB4_24x24.png
new file mode 100755
index 000000000000..8456ef4d544f
--- /dev/null
+++ b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/documentsizeB4_24x24.png
Binary files differ
diff --git a/icon-themes/galaxy/sw/res/sidebar/pageproppanel/documentsizeB5_24x24.png b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/documentsizeB5_24x24.png
new file mode 100755
index 000000000000..21b37467d657
--- /dev/null
+++ b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/documentsizeB5_24x24.png
Binary files differ
diff --git a/icon-themes/galaxy/sw/res/sidebar/pageproppanel/documentsizeC5_24x24.png b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/documentsizeC5_24x24.png
new file mode 100755
index 000000000000..91501da5b92c
--- /dev/null
+++ b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/documentsizeC5_24x24.png
Binary files differ
diff --git a/icon-themes/galaxy/sw/res/sidebar/pageproppanel/documentsize_L_A3_24x24.png b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/documentsize_L_A3_24x24.png
new file mode 100755
index 000000000000..a32119dfa20f
--- /dev/null
+++ b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/documentsize_L_A3_24x24.png
Binary files differ
diff --git a/icon-themes/galaxy/sw/res/sidebar/pageproppanel/documentsize_L_A4_24x24.png b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/documentsize_L_A4_24x24.png
new file mode 100755
index 000000000000..5cd5f8e0fcb9
--- /dev/null
+++ b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/documentsize_L_A4_24x24.png
Binary files differ
diff --git a/icon-themes/galaxy/sw/res/sidebar/pageproppanel/documentsize_L_A5_24x24.png b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/documentsize_L_A5_24x24.png
new file mode 100755
index 000000000000..cc4d2cb627a2
--- /dev/null
+++ b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/documentsize_L_A5_24x24.png
Binary files differ
diff --git a/icon-themes/galaxy/sw/res/sidebar/pageproppanel/documentsize_L_B4_24x24.png b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/documentsize_L_B4_24x24.png
new file mode 100755
index 000000000000..e1d1bcf2c91e
--- /dev/null
+++ b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/documentsize_L_B4_24x24.png
Binary files differ
diff --git a/icon-themes/galaxy/sw/res/sidebar/pageproppanel/documentsize_L_B5_24x24.png b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/documentsize_L_B5_24x24.png
new file mode 100755
index 000000000000..0e7627201309
--- /dev/null
+++ b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/documentsize_L_B5_24x24.png
Binary files differ
diff --git a/icon-themes/galaxy/sw/res/sidebar/pageproppanel/documentsize_L_C5_24x24.png b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/documentsize_L_C5_24x24.png
new file mode 100755
index 000000000000..2c880f81b2bc
--- /dev/null
+++ b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/documentsize_L_C5_24x24.png
Binary files differ
diff --git a/icon-themes/galaxy/sw/res/sidebar/pageproppanel/documentsize_L_copy_24x24.png b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/documentsize_L_copy_24x24.png
new file mode 100755
index 000000000000..608d5a586147
--- /dev/null
+++ b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/documentsize_L_copy_24x24.png
Binary files differ
diff --git a/icon-themes/galaxy/sw/res/sidebar/pageproppanel/documentsizecopy_24x24.png b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/documentsizecopy_24x24.png
new file mode 100755
index 000000000000..ce13c36b3f69
--- /dev/null
+++ b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/documentsizecopy_24x24.png
Binary files differ
diff --git a/icon-themes/galaxy/sw/res/sidebar/pageproppanel/format_L_copy_24x24.png b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/format_L_copy_24x24.png
new file mode 100755
index 000000000000..747ac4dd242f
--- /dev/null
+++ b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/format_L_copy_24x24.png
Binary files differ
diff --git a/icon-themes/galaxy/sw/res/sidebar/pageproppanel/format_L_mirror_24x24.png b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/format_L_mirror_24x24.png
new file mode 100755
index 000000000000..aa93fbcbb09a
--- /dev/null
+++ b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/format_L_mirror_24x24.png
Binary files differ
diff --git a/icon-themes/galaxy/sw/res/sidebar/pageproppanel/format_L_narrow_24x24.png b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/format_L_narrow_24x24.png
new file mode 100755
index 000000000000..e6d2579d1525
--- /dev/null
+++ b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/format_L_narrow_24x24.png
Binary files differ
diff --git a/icon-themes/galaxy/sw/res/sidebar/pageproppanel/format_L_nomal_24x24.png b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/format_L_nomal_24x24.png
new file mode 100755
index 000000000000..840ca804a5ae
--- /dev/null
+++ b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/format_L_nomal_24x24.png
Binary files differ
diff --git a/icon-themes/galaxy/sw/res/sidebar/pageproppanel/format_L_wide_24x24.png b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/format_L_wide_24x24.png
new file mode 100755
index 000000000000..a47c1ca6cc36
--- /dev/null
+++ b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/format_L_wide_24x24.png
Binary files differ
diff --git a/icon-themes/galaxy/sw/res/sidebar/pageproppanel/formatcopy_24x24.png b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/formatcopy_24x24.png
new file mode 100755
index 000000000000..983da8be35ad
--- /dev/null
+++ b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/formatcopy_24x24.png
Binary files differ
diff --git a/icon-themes/galaxy/sw/res/sidebar/pageproppanel/formatmirror_24x24.png b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/formatmirror_24x24.png
new file mode 100755
index 000000000000..696ca1126428
--- /dev/null
+++ b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/formatmirror_24x24.png
Binary files differ
diff --git a/icon-themes/galaxy/sw/res/sidebar/pageproppanel/formatnarrow_24x24.png b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/formatnarrow_24x24.png
new file mode 100755
index 000000000000..2f4b0e4ca005
--- /dev/null
+++ b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/formatnarrow_24x24.png
Binary files differ
diff --git a/icon-themes/galaxy/sw/res/sidebar/pageproppanel/formatnormal_24x24.png b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/formatnormal_24x24.png
new file mode 100755
index 000000000000..83fea86ef080
--- /dev/null
+++ b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/formatnormal_24x24.png
Binary files differ
diff --git a/icon-themes/galaxy/sw/res/sidebar/pageproppanel/formatwide_24x24.png b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/formatwide_24x24.png
new file mode 100755
index 000000000000..b260b07b8d6e
--- /dev/null
+++ b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/formatwide_24x24.png
Binary files differ
diff --git a/icon-themes/galaxy/sw/res/sidebar/pageproppanel/last_custom_common.png b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/last_custom_common.png
new file mode 100755
index 000000000000..bbbe3255d272
--- /dev/null
+++ b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/last_custom_common.png
Binary files differ
diff --git a/icon-themes/galaxy/sw/res/sidebar/pageproppanel/last_custom_common_grey.png b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/last_custom_common_grey.png
new file mode 100755
index 000000000000..c95062eb2897
--- /dev/null
+++ b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/last_custom_common_grey.png
Binary files differ
diff --git a/icon-themes/galaxy/sw/res/sidebar/pageproppanel/portraitcopy_24x24.png b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/portraitcopy_24x24.png
new file mode 100755
index 000000000000..e39324a1d435
--- /dev/null
+++ b/icon-themes/galaxy/sw/res/sidebar/pageproppanel/portraitcopy_24x24.png
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx
index 378516911ede..9848b6af6cc1 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -25,6 +25,7 @@
#include <svl/brdcst.hxx>
#include <editeng/editdata.hxx>
+#include <editeng/numitem.hxx>
#include <i18nlangtag/lang.h>
#include <tools/color.hxx>
#include <tools/contnr.hxx>
@@ -332,7 +333,8 @@ public:
or disables numbering for the selected paragraphs if the numbering of the first paragraph is on
*/
void ToggleBullets();
-
+ sal_Bool ToggleBullets(sal_Bool bBulletOnOff, sal_Bool bNormalBullet, sal_Bool bMasterView, SvxNumRule* pNumRule = NULL, sal_Bool bForceBulletOnOff = false);
+ sal_Bool ToggleAllParagraphsBullets(sal_Bool bBulletOnOffMode, sal_Bool bNormalBullet, sal_Bool bToggleOn, sal_Bool bMasterView, SvxNumRule* pNumRule = NULL);
/** enables numbering for the selected paragraphs that are not enabled and ignore all selected
paragraphs that already have numbering enabled.
*/
@@ -986,6 +988,8 @@ public:
virtual sal_Bool IsParaIsNumberingRestart( sal_Int32 nPara );
virtual void SetParaIsNumberingRestart( sal_Int32 nPara, sal_Bool bParaIsNumberingRestart );
+
+ sal_Int32 GetBulletsNumberingStatus();
};
#endif
diff --git a/include/sfx2/navigat.hxx b/include/sfx2/navigat.hxx
index b1cada954d2b..7f0dc928818e 100644
--- a/include/sfx2/navigat.hxx
+++ b/include/sfx2/navigat.hxx
@@ -35,7 +35,7 @@ public:
SFX_DECL_CHILDWINDOW(SfxNavigatorWrapper);
};
-class SfxNavigator : public SfxDockingWindow
+class SFX2_DLLPUBLIC SfxNavigator : public SfxDockingWindow
{
SfxChildWindow* pWrapper;
diff --git a/include/sfx2/sfx.hrc b/include/sfx2/sfx.hrc
index b018a73b212d..7d1fc0a4a286 100644
--- a/include/sfx2/sfx.hrc
+++ b/include/sfx2/sfx.hrc
@@ -98,6 +98,7 @@
#define RID_SFX_SFXLOCAL_START (RID_SFX_START + 3082)
#define RID_SFX_VIEW_START (RID_SFX_START + 4096)
+#define RID_SFX_SIDEBAR_START (RID_SFX_START + 4150)
// RID_CNT_START2 (RID_SFX_START + 4500)
// RID_SFX_CHAOSDOC_START (RID_SFX_START + 5120)
// RID_SFX_TPLCOMPONENT_START (RID_SFX_START + 6800)
diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc
index cd25c9ea05b7..c838c32b6f82 100644
--- a/include/sfx2/sfxsids.hrc
+++ b/include/sfx2/sfxsids.hrc
@@ -596,6 +596,7 @@
#define SID_SEARCH_OPTIONS (SID_SVX_START + 281)
#define SID_ZOOM (SID_SVX_START + 289)
#define SID_SEARCH_ITEM (SID_SVX_START + 291)
+#define SID_SIDEBAR (SID_SVX_START + 336)
#define SID_HYPERLINK_GETLINK (SID_SVX_START + 361)
#define SID_HYPERLINK_SETLINK (SID_SVX_START + 362)
#define SID_INFOBARCONTAINER (SID_SVX_START + 365)
diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx
index cba6efaf8e36..cb5b149714df 100644
--- a/include/sfx2/shell.hxx
+++ b/include/sfx2/shell.hxx
@@ -238,6 +238,8 @@ public:
virtual SfxItemSet* CreateItemSet( sal_uInt16 nId );
virtual void ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet );
+ void SetContextName (const ::rtl::OUString& rsContextName);
+
#ifndef _SFXSH_HXX
SAL_DLLPRIVATE bool CanExecuteSlot_Impl( const SfxSlot &rSlot );
SAL_DLLPRIVATE void DoActivate_Impl( SfxViewFrame *pFrame, sal_Bool bMDI);
diff --git a/include/sfx2/sidebar/ContextChangeBroadcaster.hxx b/include/sfx2/sidebar/ContextChangeBroadcaster.hxx
new file mode 100644
index 000000000000..08696316430d
--- /dev/null
+++ b/include/sfx2/sidebar/ContextChangeBroadcaster.hxx
@@ -0,0 +1,58 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#ifndef SFX_SIDEBAR_CONTEXT_CHANGE_BROADCASTER_HXX
+#define SFX_SIDEBAR_CONTEXT_CHANGE_BROADCASTER_HXX
+
+#include <com/sun/star/frame/XFrame.hpp>
+
+namespace css = ::com::sun::star;
+namespace cssu = ::com::sun::star::uno;
+
+namespace sfx2 { namespace sidebar {
+
+
+/** This class is a helper for broadcasting context changes that are
+ tied to shells being activated or deactivated.
+*/
+class ContextChangeBroadcaster
+{
+public:
+ ContextChangeBroadcaster (void);
+ ~ContextChangeBroadcaster (void);
+
+ void Initialize (const ::rtl::OUString& rsContextName);
+
+ void Activate (const cssu::Reference<css::frame::XFrame>& rxFrame);
+ void Deactivate (const cssu::Reference<css::frame::XFrame>& rxFrame);
+
+private:
+ rtl::OUString msContextName;
+ bool mbIsContextActive;
+
+ void BroadcastContextChange (
+ const cssu::Reference<css::frame::XFrame>& rxFrame,
+ const ::rtl::OUString& rsModuleName,
+ const ::rtl::OUString& rsContextName);
+ ::rtl::OUString GetModuleName (
+ const cssu::Reference<css::frame::XFrame>& rxFrame);
+};
+
+
+} } // end of namespace ::sd::sidebar
+
+#endif
diff --git a/include/sfx2/sidebar/ControlFactory.hxx b/include/sfx2/sidebar/ControlFactory.hxx
new file mode 100644
index 000000000000..594c36c5fd91
--- /dev/null
+++ b/include/sfx2/sidebar/ControlFactory.hxx
@@ -0,0 +1,46 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#ifndef SFX_SIDEBAR_CONTROL_FACTORY_HXX
+#define SFX_SIDEBAR_CONTROL_FACTORY_HXX
+
+#include <sfx2/dllapi.h>
+#include <vcl/button.hxx>
+
+class ToolBox;
+
+namespace sfx2 { namespace sidebar {
+
+class ToolBoxBackground;
+
+
+class SFX2_DLLPUBLIC ControlFactory
+{
+public:
+ static CheckBox* CreateMenuButton (Window* pParentWindow);
+ static ImageRadioButton* CreateTabItem (Window* pParentWindow);
+ static ToolBox* CreateToolBox (Window* pParentWindow, const ResId& rResId);
+ static Window* CreateToolBoxBackground (Window* pParentWindow);
+ static ImageRadioButton* CreateCustomImageRadionButton(
+ Window* pParentWindow,
+ const ResId& rResId );
+};
+
+
+} } // end of namespace sfx2::sidebar
+
+#endif
diff --git a/include/sfx2/sidebar/ControllerItem.hxx b/include/sfx2/sidebar/ControllerItem.hxx
new file mode 100644
index 000000000000..3e7cd83fb75a
--- /dev/null
+++ b/include/sfx2/sidebar/ControllerItem.hxx
@@ -0,0 +1,55 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#ifndef SVX_SIDEBAR_CONTROLLER_ITEM_HXX
+#define SVX_SIDEBAR_CONTROLLER_ITEM_HXX
+
+#include <sfx2/ctrlitem.hxx>
+
+#include <boost/function.hpp>
+
+
+namespace sfx2 { namespace sidebar {
+
+class SFX2_DLLPUBLIC ControllerItem
+ : public SfxControllerItem
+{
+public:
+ class SFX2_DLLPUBLIC ItemUpdateReceiverInterface
+ {
+ public:
+ virtual void NotifyItemUpdate(
+ const sal_uInt16 nSId,
+ const SfxItemState eState,
+ const SfxPoolItem* pState) = 0;
+ virtual ~ItemUpdateReceiverInterface();
+ };
+ ControllerItem (
+ const sal_uInt16 nId,
+ SfxBindings &rBindings,
+ ItemUpdateReceiverInterface& rItemUpdateReceiver);
+ virtual ~ControllerItem();
+
+ virtual void StateChanged (sal_uInt16 nSId, SfxItemState eState, const SfxPoolItem* pState);
+
+private:
+ ItemUpdateReceiverInterface& mrItemUpdateReceiver;
+};
+
+} } // end of namespace sfx2::sidebar
+
+#endif
diff --git a/include/sfx2/sidebar/EnumContext.hxx b/include/sfx2/sidebar/EnumContext.hxx
new file mode 100644
index 000000000000..54b07e016783
--- /dev/null
+++ b/include/sfx2/sidebar/EnumContext.hxx
@@ -0,0 +1,169 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#ifndef SFX_SIDEBAR_ENUM_CONTEXT_HXX
+#define SFX_SIDEBAR_ENUM_CONTEXT_HXX
+
+#include "sfx2/dllapi.h"
+
+#include <rtl/ustring.hxx>
+
+#include <vector>
+
+
+namespace sfx2 { namespace sidebar {
+
+class SFX2_DLLPUBLIC EnumContext
+{
+public:
+ enum Application
+ {
+ Application_Writer,
+ Application_WriterWeb,
+ Application_Calc,
+ Application_Draw,
+ Application_Impress,
+
+ // For your convenience to avoid duplicate code in the common
+ // case that Draw and Impress use identical context configurations.
+ Application_DrawImpress,
+
+ // Also for your convenience for either Writer or WriterWeb.
+ Application_WriterAndWeb,
+
+ // Used only by deck or panel descriptors. Matches any
+ // application.
+ Application_Any,
+
+ // Use this only in special circumstances. One might be the
+ // wish to disable a deck or panel during debugging.
+ Application_None,
+
+ __LastApplicationEnum = Application_None
+ };
+ enum Context
+ {
+ Context_3DObject,
+ Context_Annotation,
+ Context_Auditing,
+ Context_Cell,
+ Context_Chart,
+ Context_Draw,
+ Context_DrawPage,
+ Context_DrawText,
+ Context_EditCell,
+ Context_Form,
+ Context_Frame,
+ Context_Graphic,
+ Context_HandoutPage,
+ Context_MasterPage,
+ Context_Media,
+ Context_MultiObject,
+ Context_NotesPage,
+ Context_OLE,
+ Context_OutlineText,
+ Context_Pivot,
+ Context_SlidesorterPage,
+ Context_Table,
+ Context_Text,
+ Context_TextObject,
+
+ // Default context of an application. Do we need this?
+ Context_Default,
+
+ // Used only by deck or panel descriptors. Matches any context.
+ Context_Any,
+
+ // Special context name that is only used when a deck would
+ // otherwise be empty.
+ Context_Empty,
+
+ Context_Unknown,
+
+ __LastContextEnum = Context_Unknown
+ };
+
+ EnumContext (void);
+ EnumContext (
+ const Application eApplication,
+ const Context eContext);
+ EnumContext (
+ const ::rtl::OUString& rsApplicationName,
+ const ::rtl::OUString& rsContextName);
+
+ /** Return a number that encodes both the application and context
+ enums.
+ Use the CombinedEnumContext macro in switch() statements and comparisons.
+ */
+ sal_Int32 GetCombinedContext(void) const;
+
+ /** This variant of the GetCombinedContext() method treats some
+ application names as identical to each other. Replacements
+ made are:
+ Draw or Impress -> DrawImpress
+ Writer or WriterWeb -> WriterAndWeb
+ Use the Application_DrawImpress or Application_WriterAndWeb values in the CombinedEnumContext macro.
+ */
+ sal_Int32 GetCombinedContext_DI(void) const;
+
+ const ::rtl::OUString& GetApplicationName (void) const;
+ const ::rtl::OUString& GetContextName (void) const;
+
+ bool operator == (const EnumContext aOther);
+ bool operator != (const EnumContext aOther);
+
+ /** When two contexts are matched against each other then
+ application or context name may have the wildcard value 'any'.
+ In order to prefer matches without wildcards over matches with
+ wildcards we introduce a integer evaluation for matches.
+ */
+ const static sal_Int32 NoMatch;
+ const static sal_Int32 OptimalMatch;
+
+ /** Return the numeric value that describes how good the match
+ between two contexts is.
+ Smaller values represent better matches.
+ */
+ sal_Int32 EvaluateMatch (const EnumContext& rOther) const;
+
+ /** Return the best match against the given list of contexts.
+ */
+ sal_Int32 EvaluateMatch (const ::std::vector<EnumContext>& rOthers) const;
+
+ static Application GetApplicationEnum (const ::rtl::OUString& rsApplicationName);
+ static const ::rtl::OUString& GetApplicationName (const Application eApplication);
+
+ static Context GetContextEnum (const ::rtl::OUString& rsContextName);
+ static const ::rtl::OUString& GetContextName (const Context eContext);
+
+private:
+ Application meApplication;
+ Context meContext;
+
+ static void ProvideApplicationContainers (void);
+ static void ProvideContextContainers (void);
+ static void AddEntry (const ::rtl::OUString& rsName, const Application eApplication);
+ static void AddEntry (const ::rtl::OUString& rsName, const Context eContext);
+};
+
+
+#define CombinedEnumContext(a,e) ((static_cast<sal_uInt16>(::sfx2::sidebar::EnumContext::a)<<16)\
+ | static_cast<sal_uInt16>(::sfx2::sidebar::EnumContext::e))
+
+} } // end of namespace sfx2::sidebar
+
+#endif
diff --git a/include/sfx2/sidebar/IContextChangeReceiver.hxx b/include/sfx2/sidebar/IContextChangeReceiver.hxx
new file mode 100644
index 000000000000..2b9d57cb1473
--- /dev/null
+++ b/include/sfx2/sidebar/IContextChangeReceiver.hxx
@@ -0,0 +1,37 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#ifndef SFX_SIDEBAR_CONTEXT_CHANGE_RECEIVER_INTERFACE_HXX
+#define SFX_SIDEBAR_CONTEXT_CHANGE_RECEIVER_INTERFACE_HXX
+
+#include "EnumContext.hxx"
+
+
+namespace sfx2 { namespace sidebar {
+
+
+class SFX2_DLLPUBLIC IContextChangeReceiver
+{
+public:
+ virtual void HandleContextChange (
+ const EnumContext aContext) = 0;
+ virtual ~IContextChangeReceiver();
+};
+
+} } // end of namespace ::sd::sidebar
+
+#endif
diff --git a/include/sfx2/sidebar/ILayoutableWindow.hxx b/include/sfx2/sidebar/ILayoutableWindow.hxx
new file mode 100644
index 000000000000..8dc67457e966
--- /dev/null
+++ b/include/sfx2/sidebar/ILayoutableWindow.hxx
@@ -0,0 +1,44 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#ifndef SFX_SIDEBAR_LAYOUTABLE_WINDOW_INTERFACE_HXX
+#define SFX_SIDEBAR_LAYOUTABLE_WINDOW_INTERFACE_HXX
+
+#include <tools/gen.hxx>
+#include <sal/types.h>
+#include <sfx2/dllapi.h>
+#include <com/sun/star/ui/LayoutSize.hpp>
+
+class Window;
+
+namespace sfx2 { namespace sidebar {
+
+
+class SFX2_DLLPUBLIC ILayoutableWindow
+{
+public:
+ /** Return the preferred height with the constraint, that the
+ window will be set to the given width.
+ */
+ virtual ::com::sun::star::ui::LayoutSize GetHeightForWidth (const sal_Int32 nWidth) = 0;
+ virtual ~ILayoutableWindow();
+};
+
+
+} } // end of namespace ::sd::sidebar
+
+#endif
diff --git a/include/sfx2/sidebar/PopupContainer.hxx b/include/sfx2/sidebar/PopupContainer.hxx
new file mode 100644
index 000000000000..f2b8cfaa048c
--- /dev/null
+++ b/include/sfx2/sidebar/PopupContainer.hxx
@@ -0,0 +1,37 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#ifndef SFX_SIDEBAR_POPUP_CONTAINER_HXX
+#define SFX_SIDEBAR_POPUP_CONTAINER_HXX
+
+#include "sfx2/dllapi.h"
+#include <vcl/floatwin.hxx>
+
+namespace sfx2 { namespace sidebar {
+
+class SFX2_DLLPUBLIC PopupContainer : public FloatingWindow
+{
+public:
+ PopupContainer (Window* pParent);
+ virtual ~PopupContainer (void);
+
+ virtual long Notify (NotifyEvent& rNEvt);
+};
+
+} } // end of namespace sfx2::sidebar
+
+#endif
diff --git a/include/sfx2/sidebar/ResourceDefinitions.hrc b/include/sfx2/sidebar/ResourceDefinitions.hrc
new file mode 100644
index 000000000000..b45e398dedf1
--- /dev/null
+++ b/include/sfx2/sidebar/ResourceDefinitions.hrc
@@ -0,0 +1,141 @@
+/**************************************************************
+*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements. See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership. The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied. See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*
+*************************************************************/
+
+#ifndef _SFX_PROPERTYPANEL_HRC
+#define _SFX_PROPERTYPANEL_HRC
+
+#include <sfx2/sfx.hrc>
+
+//section page RID
+#define RC_PROPERTYPANEL_START RID_SFX_PROPERTYPANEL_START
+#define DLG_PROPERTY_DOCKING_WINDOW ( RC_PROPERTYPANEL_START + 0 )
+#define BMP_PROPERTYPANEL_EXPAND ( RC_PROPERTYPANEL_START + 1 )
+#define BMP_PROPERTYPANEL_COLLAPSE ( RC_PROPERTYPANEL_START + 2 )
+#define BMP_PROPERTYPANEL_MOREPROPERTY ( RC_PROPERTYPANEL_START + 5 )
+#define FT_PROPERTYPANEL_NOTSUPPORT_DESC ( RC_PROPERTYPANEL_START + 7 )
+
+#define RID_PROPERTYPANEL_TEXTPAGE_TITLEBAR ( RC_PROPERTYPANEL_START + 8 )
+#define RID_PROPERTYPANEL_PARAGRAPHPAGE_TITLEBAR ( RC_PROPERTYPANEL_START + 9 )
+#define RID_PROPERTYPANEL_AREAPAGE_TITLEBAR ( RC_PROPERTYPANEL_START + 10 )
+#define RID_PROPERTYPANEL_TBLDESIGNPAGE_TITLEBAR ( RC_PROPERTYPANEL_START + 11 )
+#define RID_PROPERTYPANEL_LINEPAGE_TITLEBAR ( RC_PROPERTYPANEL_START + 12 )
+#define RID_PROPERTYPANEL_POSIZEPAGE_TITLEBAR ( RC_PROPERTYPANEL_START + 13 )
+#define RID_PROPERTYPANEL_GRAPHICPAGE_TITLEBAR ( RC_PROPERTYPANEL_START + 14 )
+#define RID_PROPERTYPANEL_CELLAPPEARPAGE_TITLEBAR ( RC_PROPERTYPANEL_START + 15 )
+#define RID_PROPERTYPANEL_SWPAGE_PAGE_TITLEBAR (RC_PROPERTYPANEL_START + 16)
+#define RID_PROPERTYPANEL_SWOBJWRAP_PAGE_TITLEBAR (RC_PROPERTYPANEL_START + 17)
+#define RID_PROPERTYPANEL_SCCELL_PAGE_TITLEBAR (RC_PROPERTYPANEL_START + 18)
+#define RID_PROPERTYPANEL_SCALIGNMENT_PAGE_TITLEBAR (RC_PROPERTYPANEL_START + 19)
+#define RID_PROPERTYPANEL_SD_PAGELAYOUT_TITLEBAR (RC_PROPERTYPANEL_START+20)
+#define RID_PROPERTYPANEL_SD_PAGEPROPERTY_TITLEBAR (RC_PROPERTYPANEL_START+21)
+#define RID_PROPERTYPANEL_SD_TABLEDESIGN_TITLEBAR (RC_PROPERTYPANEL_START+22)
+#define RID_PROPERTYPANEL_NUMFORMAT_PAGE_TITLEBAR (RC_PROPERTYPANEL_START+23)
+
+#define RID_PANELDOCK_WINDOW ( RC_PROPERTYPANEL_START + 24 )
+#define STR_TITLE_DISCRIPTION ( RC_PROPERTYPANEL_START + 25 ) //
+
+#ifndef STD_MASKCOLOR
+#define STD_MASKCOLOR Color { Red = 0xFF00; Green = 0x0000; Blue = 0xFF00; }
+#endif
+
+//unit pixel
+//panel common
+#define PROPERTYPAGE_WIDTH 109
+
+//about titlebar
+
+#define FI_EXPANSION_INDICATOR 1
+#define FT_TITLE 2
+#define STR_MOREPROPERTY_QUICKHELP 3
+
+#define TITLEBAR_WIDTH PROPERTYPAGE_WIDTH
+#define TITLEBAR_HEIGHT 13
+
+#define TITLEBAR_MARGIN_HORIZONTAL 3
+#define TITLEBAR_CONTROL_SPACING_HORIZONTAL 3
+
+#define FI_EXPANSION_INDICATOR_WIDTH 6
+#define FI_EXPANSION_INDICATOR_HEIGTH 6
+#define FI_EXPANSION_INDICATOR_X TITLEBAR_MARGIN_HORIZONTAL
+#define FI_EXPANSION_INDICATOR_Y (TITLEBAR_HEIGHT - FI_EXPANSION_INDICATOR_HEIGTH)/2
+
+#define FT_TITLE_WIDTH 85
+#define FT_TITLE_HEIGHT 10
+#define FT_TITLE_X FI_EXPANSION_INDICATOR_X + FI_EXPANSION_INDICATOR_WIDTH + TITLEBAR_CONTROL_SPACING_HORIZONTAL
+#define FT_TITLE_Y (TITLEBAR_HEIGHT - FT_TITLE_HEIGHT)/2 + 1
+
+
+//about section page
+#define SECTIONPAGE_MARGIN_VERTICAL 12
+#define SECTIONPAGE_MARGIN_VERTICAL_TOP 1
+#define SECTIONPAGE_MARGIN_VERTICAL_BOT 5
+#define SECTIONPAGE_MARGIN_HORIZONTAL 3
+#define CONTROL_SPACING_VERTICAL 5
+#define CONTROL_SPACING_HORIZONTAL 3
+#define TEXT_CONTROL_SPACING_VERTICAL 2
+
+#define TEXT_HEIGHT 8
+#define CBOX_HEIGHT 12
+#define MBOX_HEIGHT 12
+
+#define TBX_OUT_BORDER_OFFSET_X 2
+#define TBX_OUT_BORDER_OFFSET_Y 1
+
+//for 16*16 pixel bmp
+#define TOOLBOX_ITEM_HEIGHT 15
+#define TOOLBOX_ITEM_WIDTH 13
+#define TOOLBOX_ITEM_DD_WIDTH 19
+
+//for 24*16 pixel bmp
+#define TOOLBOX_24_16_ITEM_HEIGHT 15
+#define TOOLBOX_24_16_ITEM_DD_WIDTH 23
+
+//for 24*24 pixel bmp
+#define TOOLBOX_24_24_ITEM_HEIGHT 18
+#define TOOLBOX_24_24_ITEM_DD_WIDTH 24
+
+//about popup panel
+#define POPUPPANEL_MARGIN_VERTICAL 7
+#define POPUPPANEL_MARGIN_HORIZONTAL 7
+
+//for 42*42 pixel bmp
+#define TOOLBOX_42_42_ITEM_HEIGHT 30
+#define TOOLBOX_42_42_ITEM_DD_WIDTH 27
+#define TB_BORDER 2
+
+#define POPUPPANEL_SEP_VERTICAL_1 10
+#define POPUPPANEL_SEP_VERTICAL_2 6
+#define POPUPPANEL_SEP_HEIGHT 1
+
+#define POPUP_BORDER_WIDTH 2
+#define POPUP_BORDER_HEIGHT 3
+#define OFFSET_X 1
+#define OFFSET_Y 1
+
+#define POPUP_TOP_GRADIENT_HEIGHT 4
+#define POPUP_BOT_GRADIENT_HEIGHT 6
+
+#define POPUP_COLOR_PICKER_WIDTH 97
+#define POPUP_COLOR_PICKER_HEIGHT 114
+//new
+#define POPUPPANEL_MARGIN_SMALL 2
+#define POPUPPANEL_MARGIN_LARGE 5
+#endif
diff --git a/include/sfx2/sidebar/SidebarChildWindow.hxx b/include/sfx2/sidebar/SidebarChildWindow.hxx
new file mode 100644
index 000000000000..23f9194dba32
--- /dev/null
+++ b/include/sfx2/sidebar/SidebarChildWindow.hxx
@@ -0,0 +1,48 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#ifndef SFX_SIDEBAR_CHILD_WINDOW_HXX
+#define SFX_SIDEBAR_CHILD_WINDOW_HXX
+
+#include "sfx2/childwin.hxx"
+
+
+namespace sfx2 { namespace sidebar {
+
+/** Outer container of the sidbar window.
+
+ Has to be registered for every application via the
+ RegisterChildWindow() method from the RegisterControllers() method
+ of the applications DLL.
+*/
+class SFX2_DLLPUBLIC SidebarChildWindow
+ : public SfxChildWindow
+{
+public:
+ SidebarChildWindow(
+ Window* pParent,
+ sal_uInt16 nId,
+ SfxBindings* pBindings,
+ SfxChildWinInfo* pInfo);
+
+ SFX_DECL_CHILDWINDOW_WITHID(SidebarChildWindow);
+};
+
+
+} } // end of namespace sfx2::sidebar
+
+#endif
diff --git a/include/sfx2/sidebar/SidebarPanelBase.hxx b/include/sfx2/sidebar/SidebarPanelBase.hxx
new file mode 100644
index 000000000000..7117505ad710
--- /dev/null
+++ b/include/sfx2/sidebar/SidebarPanelBase.hxx
@@ -0,0 +1,124 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#ifndef SFX_SIDEBAR_PANEL_BASE_HXX
+#define SFX_SIDEBAR_PANEL_BASE_HXX
+
+#include "EnumContext.hxx"
+
+#include <cppuhelper/compbase4.hxx>
+#include <cppuhelper/basemutex.hxx>
+
+#include <com/sun/star/frame/XController.hpp>
+#include <com/sun/star/ui/XContextChangeEventListener.hpp>
+#include <com/sun/star/ui/XUIElement.hpp>
+#include <com/sun/star/ui/XToolPanel.hpp>
+#include <com/sun/star/ui/XSidebarPanel.hpp>
+
+#include <boost/noncopyable.hpp>
+#include <boost/function.hpp>
+
+
+namespace css = ::com::sun::star;
+namespace cssu = ::com::sun::star::uno;
+
+
+class Window;
+
+namespace sfx2 { namespace sidebar {
+
+namespace
+{
+ typedef ::cppu::WeakComponentImplHelper4 <
+ css::ui::XContextChangeEventListener,
+ css::ui::XUIElement,
+ css::ui::XToolPanel,
+ css::ui::XSidebarPanel
+ > SidebarPanelBaseInterfaceBase;
+}
+
+/** Base class for sidebar panels that provides some convenience
+ functionality.
+*/
+class SFX2_DLLPUBLIC SidebarPanelBase
+ : private ::boost::noncopyable,
+ private ::cppu::BaseMutex,
+ public SidebarPanelBaseInterfaceBase
+{
+public:
+ static cssu::Reference<css::ui::XUIElement> Create (
+ const ::rtl::OUString& rsResourceURL,
+ const cssu::Reference<css::frame::XFrame>& rxFrame,
+ Window* mpWindow,
+ const css::ui::LayoutSize& rLayoutSize);
+
+ // XContextChangeEventListener
+ virtual void SAL_CALL notifyContextChangeEvent (
+ const css::ui::ContextChangeEventObject& rEvent)
+ throw (cssu::RuntimeException);
+
+ // XEventListener
+ virtual void SAL_CALL disposing (
+ const css::lang::EventObject& rEvent)
+ throw (cssu::RuntimeException);
+
+ // XUIElement
+ virtual cssu::Reference<css::frame::XFrame> SAL_CALL getFrame (void)
+ throw(cssu::RuntimeException);
+ virtual ::rtl::OUString SAL_CALL getResourceURL (void)
+ throw(cssu::RuntimeException);
+ virtual sal_Int16 SAL_CALL getType (void)
+ throw(cssu::RuntimeException);
+ virtual cssu::Reference<cssu::XInterface> SAL_CALL getRealInterface (void)
+ throw(cssu::RuntimeException);
+
+ // XToolPanel
+ virtual cssu::Reference<css::accessibility::XAccessible> SAL_CALL createAccessible (
+ const cssu::Reference<css::accessibility::XAccessible>& rxParentAccessible)
+ throw(cssu::RuntimeException);
+ virtual cssu::Reference<css::awt::XWindow> SAL_CALL getWindow (void)
+ throw(cssu::RuntimeException);
+
+ // XSidebarPanel
+ virtual css::ui::LayoutSize SAL_CALL getHeightForWidth (sal_Int32 nWidth)
+ throw(cssu::RuntimeException);
+
+protected:
+ cssu::Reference<css::frame::XFrame> mxFrame;
+
+ SidebarPanelBase (
+ const ::rtl::OUString& rsResourceURL,
+ const cssu::Reference<css::frame::XFrame>& rxFrame,
+ Window* pWindow,
+ const css::ui::LayoutSize& rLayoutSize);
+ virtual ~SidebarPanelBase (void);
+
+ virtual void SAL_CALL disposing (void)
+ throw (cssu::RuntimeException);
+
+ void SetControl (::Window* pControl);
+ ::Window* GetControl (void) const;
+
+private:
+ Window* mpControl;
+ const ::rtl::OUString msResourceURL;
+ const css::ui::LayoutSize maLayoutSize;
+};
+
+} } // end of namespace sfx2::sidebar
+
+#endif
diff --git a/include/sfx2/sidebar/Theme.hxx b/include/sfx2/sidebar/Theme.hxx
new file mode 100644
index 000000000000..d34866b7b179
--- /dev/null
+++ b/include/sfx2/sidebar/Theme.hxx
@@ -0,0 +1,278 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#ifndef SFX_SIDEBAR_THEME_HXX
+#define SFX_SIDEBAR_THEME_HXX
+
+#include "sfx2/dllapi.h"
+
+#include <tools/color.hxx>
+#include <vcl/image.hxx>
+#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/basemutex.hxx>
+#include <tools/gen.hxx>
+#include <rtl/ref.hxx>
+#include <vcl/wall.hxx>
+
+#include <com/sun/star/beans/XPropertySet.hpp>
+
+#include <boost/unordered_map.hpp>
+#include <map>
+#include <boost/optional.hpp>
+
+
+class SvBorder;
+
+namespace css = ::com::sun::star;
+namespace cssu = ::com::sun::star::uno;
+
+
+namespace sfx2 { namespace sidebar {
+
+
+namespace
+{
+ typedef ::cppu::WeakComponentImplHelper2 <
+ css::beans::XPropertySet,
+ css::beans::XPropertySetInfo
+ > ThemeInterfaceBase;
+}
+
+class Paint;
+
+/** Simple collection of colors, gradients, fonts that define the
+ look of the sidebar and its controls.
+*/
+class SFX2_DLLPUBLIC Theme
+ : private ::boost::noncopyable,
+ private ::cppu::BaseMutex,
+ public ThemeInterfaceBase
+{
+public:
+ enum ThemeItem
+ {
+ __Begin,
+ __Pre_Image = __Begin,
+
+ __AnyItem = __Pre_Image,
+
+ Image_Grip,
+ Image_Expand,
+ Image_Collapse,
+ Image_TabBarMenu,
+ Image_PanelMenu,
+ Image_ToolBoxItemSeparator,
+ Image_Closer,
+
+ __Image_Color,
+
+ Color_DeckTitleFont,
+ Color_PanelTitleFont,
+ Color_TabMenuSeparator,
+ Color_TabItemBorder,
+ Color_DropDownBorder,
+ Color_Highlight,
+ Color_HighlightText,
+
+ __Color_Paint,
+
+ Paint_DeckBackground,
+ Paint_DeckTitleBarBackground,
+ Paint_PanelBackground,
+ Paint_PanelTitleBarBackground,
+ Paint_TabBarBackground,
+ Paint_TabItemBackgroundNormal,
+ Paint_TabItemBackgroundHighlight,
+ Paint_HorizontalBorder,
+ Paint_VerticalBorder,
+ Paint_ToolBoxBackground,
+ Paint_ToolBoxBorderTopLeft,
+ Paint_ToolBoxBorderCenterCorners,
+ Paint_ToolBoxBorderBottomRight,
+ Paint_DropDownBackground,
+
+ __Paint_Int,
+
+ Int_DeckTitleBarHeight,
+ Int_DeckBorderSize,
+ Int_DeckSeparatorHeight,
+ Int_PanelTitleBarHeight,
+ Int_TabMenuPadding,
+ Int_TabMenuSeparatorPadding,
+ Int_TabItemWidth,
+ Int_TabItemHeight,
+ Int_DeckLeftPadding,
+ Int_DeckTopPadding,
+ Int_DeckRightPadding,
+ Int_DeckBottomPadding,
+ Int_TabBarLeftPadding,
+ Int_TabBarTopPadding,
+ Int_TabBarRightPadding,
+ Int_TabBarBottomPadding,
+ Int_ButtonCornerRadius,
+
+ __Int_Bool,
+
+ Bool_UseSymphonyIcons,
+ Bool_UseSystemColors,
+ Bool_UseToolBoxItemSeparator,
+ Bool_IsHighContrastModeActive,
+
+ __Bool_Rect,
+
+ Rect_ToolBoxPadding,
+ Rect_ToolBoxBorder,
+
+ __Post_Rect,
+ __End=__Post_Rect
+ };
+
+ static Image GetImage (const ThemeItem eItem);
+ static Color GetColor (const ThemeItem eItem);
+ static const Paint& GetPaint (const ThemeItem eItem);
+ static const Wallpaper GetWallpaper (const ThemeItem eItem);
+ static sal_Int32 GetInteger (const ThemeItem eItem);
+ static bool GetBoolean (const ThemeItem eItem);
+ static Rectangle GetRectangle (const ThemeItem eItem);
+
+ static bool IsHighContrastMode (void);
+
+ static void HandleDataChange (void);
+
+ Theme (void);
+ virtual ~Theme (void);
+
+ virtual void SAL_CALL disposing (void);
+
+ static cssu::Reference<css::beans::XPropertySet> GetPropertySet (void);
+
+ // beans::XPropertySet
+ virtual cssu::Reference<css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo (void)
+ throw(cssu::RuntimeException);
+ virtual void SAL_CALL setPropertyValue (
+ const ::rtl::OUString& rsPropertyName,
+ const cssu::Any& rValue)
+ throw(cssu::RuntimeException);
+ virtual cssu::Any SAL_CALL getPropertyValue (
+ const ::rtl::OUString& rsPropertyName)
+ throw(css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ cssu::RuntimeException);
+ virtual void SAL_CALL addPropertyChangeListener(
+ const ::rtl::OUString& rsPropertyName,
+ const cssu::Reference<css::beans::XPropertyChangeListener>& rxListener)
+ throw(css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ cssu::RuntimeException);
+ virtual void SAL_CALL removePropertyChangeListener(
+ const ::rtl::OUString& rsPropertyName,
+ const cssu::Reference<css::beans::XPropertyChangeListener>& rxListener)
+ throw(css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ cssu::RuntimeException);
+ virtual void SAL_CALL addVetoableChangeListener(
+ const ::rtl::OUString& rsPropertyName,
+ const cssu::Reference<css::beans::XVetoableChangeListener>& rxListener)
+ throw(css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ cssu::RuntimeException);
+ virtual void SAL_CALL removeVetoableChangeListener(
+ const ::rtl::OUString& rsPropertyName,
+ const cssu::Reference<css::beans::XVetoableChangeListener>& rxListener)
+ throw(css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ cssu::RuntimeException);
+
+ // beans::XPropertySetInfo
+ virtual cssu::Sequence<css::beans::Property> SAL_CALL getProperties (void)
+ throw(cssu::RuntimeException);
+ virtual css::beans::Property SAL_CALL getPropertyByName (const ::rtl::OUString& rsName)
+ throw(css::beans::UnknownPropertyException,
+ cssu::RuntimeException);
+ virtual sal_Bool SAL_CALL hasPropertyByName (const ::rtl::OUString& rsName)
+ throw(cssu::RuntimeException);
+
+private:
+ static ::rtl::Reference<Theme> mpInstance;
+ static Theme& GetCurrentTheme (void);
+
+ ::std::vector<Image> maImages;
+ ::std::vector<Color> maColors;
+ ::std::vector<Paint> maPaints;
+ ::std::vector<sal_Int32> maIntegers;
+ ::std::vector<bool> maBooleans;
+ ::std::vector<Rectangle> maRectangles;
+ bool mbIsHighContrastMode;
+ bool mbIsHighContrastModeSetManually;
+
+ typedef ::boost::unordered_map<rtl::OUString,ThemeItem, rtl::OUStringHash> PropertyNameToIdMap;
+ PropertyNameToIdMap maPropertyNameToIdMap;
+ typedef ::std::vector<rtl::OUString> PropertyIdToNameMap;
+ PropertyIdToNameMap maPropertyIdToNameMap;
+ typedef ::std::vector<cssu::Any> RawValueContainer;
+ RawValueContainer maRawValues;
+
+ typedef ::std::vector<cssu::Reference<css::beans::XPropertyChangeListener> > ChangeListenerContainer;
+ typedef ::std::map<ThemeItem,ChangeListenerContainer> ChangeListeners;
+ ChangeListeners maChangeListeners;
+ typedef ::std::vector<cssu::Reference<css::beans::XVetoableChangeListener> > VetoableListenerContainer;
+ typedef ::std::map<ThemeItem,VetoableListenerContainer> VetoableListeners;
+ VetoableListeners maVetoableListeners;
+
+ enum PropertyType
+ {
+ PT_Image,
+ PT_Color,
+ PT_Paint,
+ PT_Integer,
+ PT_Boolean,
+ PT_Rectangle,
+ PT_Invalid
+ };
+
+ void SetupPropertyMaps (void);
+ void InitializeTheme (void);
+ void UpdateTheme (void);
+ static PropertyType GetPropertyType (const ThemeItem eItem);
+ static cssu::Type GetCppuType (const PropertyType eType);
+ static sal_Int32 GetIndex (
+ const ThemeItem eItem,
+ const PropertyType eType);
+
+ VetoableListenerContainer* GetVetoableListeners (
+ const ThemeItem eItem,
+ const bool bCreate);
+ ChangeListenerContainer* GetChangeListeners (
+ const ThemeItem eItem,
+ const bool bCreate);
+ bool DoVetoableListenersVeto (
+ const VetoableListenerContainer* pListeners,
+ const css::beans::PropertyChangeEvent& rEvent) const;
+ void BroadcastPropertyChange (
+ const ChangeListenerContainer* pListeners,
+ const css::beans::PropertyChangeEvent& rEvent) const;
+ void ProcessNewValue (
+ const cssu::Any& rValue,
+ const ThemeItem eItem,
+ const PropertyType eType);
+};
+
+
+
+} } // end of namespace sfx2::sidebar
+
+#endif
diff --git a/include/sfx2/styfitem.hxx b/include/sfx2/styfitem.hxx
index b728be448a49..b4c88340b935 100644
--- a/include/sfx2/styfitem.hxx
+++ b/include/sfx2/styfitem.hxx
@@ -68,9 +68,6 @@ class SFX2_DLLPUBLIC SfxStyleFamilies: public Resource
SfxStyleFamilyList aEntryList;
public:
- /** ctor
- <p>Will automatically call updateImages with BMP_COLOR_NORMAL.</p>
- */
SfxStyleFamilies( const ResId &);
SfxStyleFamilies( ) {};
~SfxStyleFamilies();
diff --git a/include/sfx2/templdlg.hxx b/include/sfx2/templdlg.hxx
index e9fb3a5e4c51..9c57455bc57d 100644
--- a/include/sfx2/templdlg.hxx
+++ b/include/sfx2/templdlg.hxx
@@ -21,7 +21,7 @@
#include "sal/config.h"
#include "sfx2/dllapi.h"
-
+#include <vcl/ctrl.hxx>
#include <rsc/rscsfx.hxx>
#include <sfx2/dockwin.hxx>
@@ -79,6 +79,30 @@ public:
void SetParagraphFamily();
};
+// class SfxTemplatePanelControl -----------------------------------------
+
+class SFX2_DLLPUBLIC SfxTemplatePanelControl : public DockingWindow
+{
+public:
+ SfxTemplatePanelControl (SfxBindings* pBindings, Window* pParentWindow);
+ ~SfxTemplatePanelControl (void);
+
+ virtual void Update();
+ virtual void DataChanged( const DataChangedEvent& _rDCEvt );
+ virtual void Resize();
+ virtual SfxChildAlignment CheckAlignment( SfxChildAlignment, SfxChildAlignment );
+ virtual void StateChanged( StateChangedType nStateChange );
+ virtual void FreeResource (void);
+
+ ISfxTemplateCommon* GetISfxTemplateCommon();
+ void SetParagraphFamily();
+
+private:
+ SfxTemplateDialog_Impl* pImpl;
+ SfxBindings* mpBindings;
+};
+
+
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/dialcontrol.hxx b/include/svx/dialcontrol.hxx
index fbb4d271679d..342a38452ee8 100644
--- a/include/svx/dialcontrol.hxx
+++ b/include/svx/dialcontrol.hxx
@@ -25,13 +25,43 @@
#include <sfx2/itemconnect.hxx>
#include "svx/svxdllapi.h"
+#include <boost/scoped_ptr.hpp>
+
class NumericField;
namespace svx {
// ============================================================================
-struct DialControl_Impl;
+class DialControlBmp : public VirtualDevice
+{
+public:
+ explicit DialControlBmp( Window& rParent );
+
+ void InitBitmap(const Font& rFont);
+ void SetSize(const Size& rSize);
+ void CopyBackground( const DialControlBmp& rSrc );
+ void DrawBackground( const Size& rSize, bool bEnabled );
+ virtual void DrawBackground();
+ virtual void DrawElements( const String& rText, sal_Int32 nAngle );
+
+protected:
+ Rectangle maRect;
+ bool mbEnabled;
+
+private:
+ const Color& GetBackgroundColor() const;
+ const Color& GetTextColor() const;
+ const Color& GetScaleLineColor() const;
+ const Color& GetButtonLineColor() const;
+ const Color& GetButtonFillColor( bool bMain ) const;
+
+ void Init();
+
+ Window& mrParent;
+ long mnCenterX;
+ long mnCenterY;
+};
/** This control allows to input a rotation angle, visualized by a dial.
@@ -95,20 +125,44 @@ public:
/** Compare value with the saved value */
bool IsValueModified();
-private:
+protected:
+ struct DialControl_Impl
+ {
+ ::boost::scoped_ptr<DialControlBmp> mpBmpEnabled;
+ ::boost::scoped_ptr<DialControlBmp> mpBmpDisabled;
+ ::boost::scoped_ptr<DialControlBmp> mpBmpBuffered;
+ Link maModifyHdl;
+ NumericField* mpLinkField;
+ Size maWinSize;
+ Font maWinFont;
+ sal_Int32 mnAngle;
+ sal_Int32 mnInitialAngle;
+ sal_Int32 mnOldAngle;
+ long mnCenterX;
+ long mnCenterY;
+ bool mbNoRot;
+
+ explicit DialControl_Impl( Window& rParent );
+ void Init( const Size& rWinSize, const Font& rWinFont );
+ void SetSize( const Size& rWinSize );
+ };
+ std::auto_ptr< DialControl_Impl > mpImpl;
+
+ virtual void HandleMouseEvent( const Point& rPos, bool bInitial );
+ virtual void HandleEscapeEvent();
+
+ void SetRotation( sal_Int32 nAngle, bool bBroadcast );
+
void Init( const Size& rWinSize, const Font& rWinFont );
void Init( const Size& rWinSize );
+
+private:
void InvalidateControl();
- void ImplSetRotation( sal_Int32 nAngle, bool bBroadcast );
void ImplSetFieldLink( const Link& rLink );
- void HandleMouseEvent( const Point& rPos, bool bInitial );
- void HandleEscapeEvent();
DECL_LINK( LinkedFieldModifyHdl, NumericField* );
-
- std::auto_ptr< DialControl_Impl > mpImpl;
};
// ============================================================================
diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc
index 339cba761e34..08ff470dc2f6 100644
--- a/include/svx/dialogs.hrc
+++ b/include/svx/dialogs.hrc
@@ -25,8 +25,8 @@
// Resource-Id's ------------------------------------------------------------
-// Please maintain FIRSTFREE (does not apply to strings)
-#define RID_SVX_FIRSTFREE 314
+// !!! IMPORTANT: consider and update FIRSTFREE when introducing new RIDs !!! (not for RIDs for Strings - they have there own)
+#define RID_SVX_FIRSTFREE 332
// some strings also used in CUI
#define RID_SVXERRCTX (RID_SVX_START + 351)
@@ -248,7 +248,30 @@
#define RID_SVXDLG_TEXTCONTROL_PARAATTR (RID_SVX_START + 287)
#define RID_SVXDLG_LINK_WARNING (RID_SVX_START + 313)
-// !!! please update RID_SVX_FIRSTFREE !!! see line 46
+#define RID_SIDEBAR_TEXT_PANEL (RID_SVX_START + 314)
+#define RID_POPUPPANEL_TEXTPAGE_UNDERLINE (RID_SVX_START + 315)
+#define RID_POPUPPANEL_TEXTPAGE_FONT_COLOR (RID_SVX_START + 316)
+#define RID_POPUPPANEL_TEXTPAGE_SPACING (RID_SVX_START + 317)
+
+#define RID_SIDEBAR_AREA_PANEL (RID_SVX_START + 318)
+#define RID_POPUPPANEL_AERAPAGE_COLOR (RID_SVX_START + 319)
+#define RID_POPUPPANEL_AREAPAGE_TRGR (RID_SVX_START + 320)
+
+#define RID_SIDEBAR_LINE_PANEL (RID_SVX_START + 321)
+#define RID_POPUPPANEL_LINEPAGE_COLOR (RID_SVX_START + 322)
+#define RID_POPUPPANEL_LINEPAGE_STYLE (RID_SVX_START + 323)
+#define RID_POPUPPANEL_LINEPAGE_WIDTH (RID_SVX_START + 324)
+
+#define RID_SIDEBAR_POSSIZE_PANEL (RID_SVX_START + 325)
+#define RID_SIDEBAR_GRAPHIC_PANEL (RID_SVX_START + 326)
+#define RID_SIDEBAR_EMPTY_PANEL (RID_SVX_START + 327)
+
+#define RID_SIDEBAR_PARA_PANEL (RID_SVX_START + 328)
+#define RID_POPUPPANEL_PARAPAGE_LINESPACING (RID_SVX_START + 329)
+#define RID_POPUPPANEL_PARAPAGE_BULLETS (RID_SVX_START + 330)
+#define RID_POPUPPANEL_PARAPAGE_NUMBERING (RID_SVX_START + 331)
+
+// !!! IMPORTANT: consider and update RID_SVX_FIRSTFREE when introducing new RIDs !!! (see above)
// Strings ------------------------------------------------------------------
@@ -460,7 +483,7 @@
#define RID_SVXSTR_LINECAP_ROUND (RID_SVX_START + 587 )
#define RID_SVXSTR_LINECAP_SQUARE (RID_SVX_START + 588 )
-// string resources for XLineJoint item
+// string resources for com::sun::star::drawing::LineJoint item
#define RID_SVXSTR_LINEJOINT_NONE RID_SVXSTR_NONE
#define RID_SVXSTR_LINEJOINT_MIDDLE (RID_SVX_START + 589 )
#define RID_SVXSTR_LINEJOINT_BEVEL (RID_SVX_START + 590 )
@@ -926,12 +949,72 @@
#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_5 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 5)//?
#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_6 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 6)//?
#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_7 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 7)//?
+#define RID_SVXSTR_SIDEBAR_BULLET_DESCRIPTIONS (RID_SVX_START + 1172)
+#define RID_SVXSTR_SIDEBAR_BULLET_DESCRIPTIONS_0 (RID_SVXSTR_SIDEBAR_BULLET_DESCRIPTIONS + 0)
+#define RID_SVXSTR_SIDEBAR_BULLET_DESCRIPTIONS_1 (RID_SVXSTR_SIDEBAR_BULLET_DESCRIPTIONS + 1)
+#define RID_SVXSTR_SIDEBAR_BULLET_DESCRIPTIONS_2 (RID_SVXSTR_SIDEBAR_BULLET_DESCRIPTIONS + 2)
+#define RID_SVXSTR_SIDEBAR_BULLET_DESCRIPTIONS_3 (RID_SVXSTR_SIDEBAR_BULLET_DESCRIPTIONS + 3)
+#define RID_SVXSTR_SIDEBAR_BULLET_DESCRIPTIONS_4 (RID_SVXSTR_SIDEBAR_BULLET_DESCRIPTIONS + 4)
+
+#define RID_SVXSTR_TEXTCOLOR (RID_SVX_START + 1178)
#define RID_SVXSTR_FINDBAR_FIND (RID_SVX_START + 1190)
-#define RID_SVXSTR_NEXTFREE (RID_SVX_START + 1191)
+#define RID_SVXSTR_NUMBULLET_NONE (RID_SVX_START + 1191)
+#define RID_SVXSTR_NUMBULLET_CURRENT_LIST_DESCRIPTION (RID_SVX_START + 1192)
+#define RID_SVXSTR_NUMBULLET_CUSTOM_BULLET_DESCRIPTION (RID_SVX_START + 1193)
+#define RID_SVXSTR_NUMBULLET_CUSTOM_NUMBERING_DESCRIPTION (RID_SVX_START + 1194)
+#define RID_SVXSTR_NUMBULLET_CUSTOM_MULTILEVEL_DESCRIPTION (RID_SVX_START + 1195)
+#define RID_SVXSTR_NUMBULLET_CUSTOMIZED_WATERMARK (RID_SVX_START + 1196)
+#define RID_SVXSTR_BULLET_RTL_DESCRIPTION_4 (RID_SVX_START + 1197)
+#define RID_SVXSTR_BULLET_RTL_DESCRIPTION_5 (RID_SVX_START + 1198)
+#define RID_SVXSTR_OUTLINENUM_RTL_DESCRIPTION_7 (RID_SVX_START + 1199)
+
+#define RID_SVXSTR_GRAPHICS_DESCRIPTIONS (RID_SVX_START + 1200)
+#define RID_SVXSTR_GRAPHICS_DESCRIPTION_0 (RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 0) // 1200
+#define RID_SVXSTR_GRAPHICS_DESCRIPTION_1 (RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 1) // 1201
+#define RID_SVXSTR_GRAPHICS_DESCRIPTION_2 (RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 2) // 1202
+#define RID_SVXSTR_GRAPHICS_DESCRIPTION_3 (RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 3) // 1203
+#define RID_SVXSTR_GRAPHICS_DESCRIPTION_4 (RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 4) // 1204
+#define RID_SVXSTR_GRAPHICS_DESCRIPTION_5 (RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 5) // 1205
+#define RID_SVXSTR_GRAPHICS_DESCRIPTION_6 (RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 6) // 1206
+#define RID_SVXSTR_GRAPHICS_DESCRIPTION_7 (RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 7) // 1207
+#define RID_SVXSTR_GRAPHICS_DESCRIPTION_8 (RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 8) // 1208
+#define RID_SVXSTR_GRAPHICS_DESCRIPTION_9 (RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 9) // 1209
+#define RID_SVXSTR_GRAPHICS_DESCRIPTION_10 (RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 10) // 1210
+#define RID_SVXSTR_GRAPHICS_DESCRIPTION_11 (RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 11) // 1211
+#define RID_SVXSTR_GRAPHICS_DESCRIPTION_12 (RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 12) // 1212
+#define RID_SVXSTR_GRAPHICS_DESCRIPTION_13 (RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 13) // 1213
+#define RID_SVXSTR_GRAPHICS_DESCRIPTION_14 (RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 14) // 1214
+#define RID_SVXSTR_GRAPHICS_DESCRIPTION_15 (RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 15) // 1215
+#define RID_SVXSTR_GRAPHICS_DESCRIPTION_16 (RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 16) // 1216
+#define RID_SVXSTR_GRAPHICS_DESCRIPTION_17 (RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 17) // 1217
+#define RID_SVXSTR_GRAPHICS_DESCRIPTION_18 (RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 18) // 1218
+#define RID_SVXSTR_GRAPHICS_DESCRIPTION_19 (RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 19) // 1219
+#define RID_SVXSTR_GRAPHICS_DESCRIPTION_20 (RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 20) // 1220
+#define RID_SVXSTR_GRAPHICS_DESCRIPTION_21 (RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 21) // 1221
+#define RID_SVXSTR_GRAPHICS_DESCRIPTION_22 (RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 22) // 1222
+#define RID_SVXSTR_GRAPHICS_DESCRIPTION_23 (RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 23) // 1223
+#define RID_SVXSTR_GRAPHICS_DESCRIPTION_24 (RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 24) // 1224
+#define RID_SVXSTR_GRAPHICS_DESCRIPTION_25 (RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 25) // 1225
+#define RID_SVXSTR_GRAPHICS_DESCRIPTION_26 (RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 26) // 1226
+#define RID_SVXSTR_GRAPHICS_DESCRIPTION_27 (RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 27) // 1227
+#define RID_SVXSTR_GRAPHICS_DESCRIPTION_28 (RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 28) // 1228
+#define RID_SVXSTR_GRAPHICS_DESCRIPTION_29 (RID_SVXSTR_GRAPHICS_DESCRIPTIONS + 29) // 1229
+
+// ooo-build specific resources
+
+#define SVX_OOO_BUILD_START (RID_SVX_START + 1230)
+#define RID_SVXBMP_DOC_MODIFIED_YES (SVX_OOO_BUILD_START + 1) // 1231
+#define RID_SVXBMP_DOC_MODIFIED_NO (SVX_OOO_BUILD_START + 2) // 1232
+#define RID_SVXBMP_DOC_MODIFIED_FEEDBACK (SVX_OOO_BUILD_START + 3) // 1233
+#define RID_SVXSTR_DOC_MODIFIED_YES (SVX_OOO_BUILD_START + 4) // 1234
+#define RID_SVXSTR_DOC_MODIFIED_NO (SVX_OOO_BUILD_START + 5) // 1235
+#define RID_SVXSTR_DOC_LOAD (SVX_OOO_BUILD_START + 6) // 1236
+
+// !!! IMPORTANT: consider and update RID_SVXSTR_NEXTFREE when introducing new RIDs for Strings !!!
+#define RID_SVXSTR_NEXTFREE (RID_SVX_START + 1237)
-#define RID_SVXSTR_TEXTCOLOR (RID_SVX_START + 1178)
// ----------------------------------------------------------------------------
// if we have _a_lot_ time, we should group the resource ids by type, instead
// of grouping them by semantics. The reason is that resource ids have to be
@@ -1011,18 +1094,6 @@
#define SID_SC_TP_FORMULA (RID_OFA_START + 259)
#define SID_SC_TP_COMPATIBILITY (RID_OFA_START + 260)
-// ----------------------------------------------------------------------------
-// ooo-build specific resources
-
-#define SVX_OOO_BUILD_START (RID_SVX_START + 1200)
-
-#define RID_SVXBMP_DOC_MODIFIED_YES (SVX_OOO_BUILD_START + 1)
-#define RID_SVXBMP_DOC_MODIFIED_NO (SVX_OOO_BUILD_START + 2)
-#define RID_SVXBMP_DOC_MODIFIED_FEEDBACK (SVX_OOO_BUILD_START + 3)
-#define RID_SVXSTR_DOC_MODIFIED_YES (SVX_OOO_BUILD_START + 4)
-#define RID_SVXSTR_DOC_MODIFIED_NO (SVX_OOO_BUILD_START + 5)
-#define RID_SVXSTR_DOC_LOAD (SVX_OOO_BUILD_START + 6)
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx
index 7297bd559bb5..d24c38f8f354 100644
--- a/include/svx/dlgctrl.hxx
+++ b/include/svx/dlgctrl.hxx
@@ -258,8 +258,9 @@ public:
virtual void Fill(const XBitmapListRef &pList);
virtual void UserDraw(const UserDrawEvent& rUDEvt);
- void Append(XBitmapEntry* pEntry, BitmapEx* pBmpEx = NULL);
- void Modify(XBitmapEntry* pEntry, sal_uInt16 nPos, BitmapEx* pBmpEx = NULL);
+ void Append(const Size& rSize, const XBitmapEntry& rEntry, BitmapEx* pBmpEx = 0);
+ void Modify(const Size& rSize, const XBitmapEntry& rEntry, sal_uInt16 nPos, BitmapEx* pBmpEx = 0);
+ void SelectEntryByList(const XBitmapList* pList, const String& rStr);
private:
VirtualDevice maVD;
@@ -268,7 +269,7 @@ private:
XBitmapListRef mpList;
bool mbUserDraw;
- SVX_DLLPRIVATE void SetVirtualDevice();
+ SVX_DLLPRIVATE void SetVirtualDevice(const Size& rSize);
};
/************************************************************************/
@@ -279,7 +280,7 @@ private:
VirtualDevice maVD;
BitmapEx maBitmapEx;
- void SetVirtualDevice();
+ void SetVirtualDevice(const Size& rSize);
public:
FillAttrLB( Window* pParent, WinBits aWB );
@@ -313,9 +314,8 @@ public:
virtual void Fill( const XDashListRef &pList );
- void Append( XDashEntry* pEntry, Bitmap* pBmp = NULL );
- void Modify( XDashEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp = NULL );
- void FillStyles();
+ void Append( XDashEntry* pEntry, const Bitmap* pBmp = NULL );
+ void Modify( XDashEntry* pEntry, sal_uInt16 nPos, const Bitmap* pBmp = NULL );
};
/************************************************************************/
@@ -324,14 +324,15 @@ class SVX_DLLPUBLIC LineEndLB : public ListBox
{
public:
- LineEndLB( Window* pParent, ResId Id ) : ListBox( pParent, Id ) {}
- LineEndLB( Window* pParent, WinBits aWB ) : ListBox( pParent, aWB ) {}
+ LineEndLB( Window* pParent, ResId Id );
+ LineEndLB( Window* pParent, WinBits aWB );
+ virtual ~LineEndLB (void);
virtual void Fill( const XLineEndListRef &pList, sal_Bool bStart = sal_True );
- void Append( XLineEndEntry* pEntry, Bitmap* pBmp = NULL,
+ void Append( XLineEndEntry* pEntry, const Bitmap* pBmp = NULL,
sal_Bool bStart = sal_True );
- void Modify( XLineEndEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp = NULL,
+ void Modify( XLineEndEntry* pEntry, sal_uInt16 nPos, const Bitmap* pBmp = NULL,
sal_Bool bStart = sal_True );
};
diff --git a/include/svx/dlgutil.hxx b/include/svx/dlgutil.hxx
index 238a90dd121a..859d4c764c79 100644
--- a/include/svx/dlgutil.hxx
+++ b/include/svx/dlgutil.hxx
@@ -30,6 +30,7 @@
class SfxItemSet;
SVX_DLLPUBLIC FieldUnit GetModuleFieldUnit( const SfxItemSet& );
+SVX_DLLPUBLIC FieldUnit GetModuleFieldUnit();
SVX_DLLPUBLIC bool GetApplyCharUnit( const SfxItemSet& );
static const int OUTPUT_DRAWMODE_COLOR = (DRAWMODE_DEFAULT);
diff --git a/include/svx/galbrws.hxx b/include/svx/galbrws.hxx
index 0269643c658b..3eebaf685f75 100644
--- a/include/svx/galbrws.hxx
+++ b/include/svx/galbrws.hxx
@@ -43,7 +43,7 @@ class GalleryBrowser2;
class GallerySplitter;
class Gallery;
-class GalleryBrowser : public SfxDockingWindow
+class SVX_DLLPUBLIC GalleryBrowser : public SfxDockingWindow
{
friend class GalleryBrowser1;
friend class GalleryBrowser2;
@@ -51,16 +51,16 @@ class GalleryBrowser : public SfxDockingWindow
using Window::KeyInput;
private:
-
Size maLastSize;
GallerySplitter* mpSplitter;
GalleryBrowser1* mpBrowser1;
GalleryBrowser2* mpBrowser2;
Gallery* mpGallery;
+ /// bitfield
void InitSettings();
- virtual sal_Bool Close();
+ virtual sal_Bool Close();
virtual void Resize();
virtual void GetFocus();
diff --git a/include/svx/svdedtv.hxx b/include/svx/svdedtv.hxx
index 39e75ad18738..78340c74569c 100644
--- a/include/svx/svdedtv.hxx
+++ b/include/svx/svdedtv.hxx
@@ -235,6 +235,7 @@ public:
void SetMarkedObjRect(const Rectangle& rRect, sal_Bool bCopy=sal_False);
void MoveMarkedObj(const Size& rSiz, bool bCopy=false);
void ResizeMarkedObj(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bCopy=false);
+ void ResizeMultMarkedObj(const Point& rRef, const Fraction& xFact, const Fraction& yFact, const bool bCopy, const bool bWdh, const bool bHgt);
long GetMarkedObjRotate() const;
void RotateMarkedObj(const Point& rRef, long nWink, bool bCopy=false);
void MirrorMarkedObj(const Point& rRef1, const Point& rRef2, bool bCopy=false);
diff --git a/include/svx/svdedxv.hxx b/include/svx/svdedxv.hxx
index 13cf6f05b5ef..f1ec6296b3f2 100644
--- a/include/svx/svdedxv.hxx
+++ b/include/svx/svdedxv.hxx
@@ -242,6 +242,9 @@ public:
virtual void AddWindowToPaintView(OutputDevice* pNewWin);
virtual void DeleteWindowFromPaintView(OutputDevice* pOldWin);
+ sal_uInt16 GetSelectionLevel() const;
+
+
//************************************************************************
// Object-MacroModus (z.B. Rect als Button oder sowas):
//************************************************************************
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index 5d4f76d0b804..d3047b897e2f 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -37,6 +37,7 @@
#include <svx/sdrobjectuser.hxx>
#include "svx/svxdllapi.h"
#include "svx/shapeproperty.hxx"
+#include <svl/poolitem.hxx>
#include <boost/optional.hpp>
#include <boost/ptr_container/ptr_vector.hpp>
@@ -800,6 +801,9 @@ protected:
void SetObjectItemSet(const SfxItemSet& rSet);
const SfxPoolItem& GetObjectItem(const sal_uInt16 nWhich) const;
+ // get SfxMapUnit the object is using
+ SfxMapUnit GetObjectMapUnit() const;
+
public:
// syntactical sugar for ItemSet accesses
void SetMergedItemSetAndBroadcast(const SfxItemSet& rSet, bool bClearAllItems = false);
diff --git a/include/svx/svdogrp.hxx b/include/svx/svdogrp.hxx
index 57842579b54e..d12f3809ae86 100644
--- a/include/svx/svdogrp.hxx
+++ b/include/svx/svdogrp.hxx
@@ -43,9 +43,6 @@ protected:
virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties();
SdrObjList* pSub; // Subliste (Kinder)
- long nDrehWink;
- long nShearWink;
-
Point aRefPoint; // Referenzpunkt innerhalb der Objektgruppe
bool bRefPoint; // Ist ein RefPoint gesetzt?
diff --git a/include/svx/svdstr.hrc b/include/svx/svdstr.hrc
index a78d88dfdb2d..d7b19fe56c04 100644
--- a/include/svx/svdstr.hrc
+++ b/include/svx/svdstr.hrc
@@ -714,5 +714,6 @@
#define STR_TABLE_STYLE (SIP_Begin + 274)
#define STR_TABLE_STYLE_SETTINGS (SIP_Begin + 275)
#define SIP_SA_CROP_MARKERS (SIP_Begin + 276)
+#define IMG_DIALCONTROL (SIP_Begin + 277)
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc
index 9971dcc2eb2d..0820a3e1c9c5 100644
--- a/include/svx/svxids.hrc
+++ b/include/svx/svxids.hrc
@@ -239,6 +239,8 @@
#define FN_NUM_BULLET_OFF (FN_EDIT + 37) /* Numerierung aus */
#define FN_NUM_BULLET_ON (FN_EDIT + 38) /* Numerierung mit Bullets an */
#define FN_NUM_NUMBERING_ON (FN_EDIT + 44) /* Numerierung an */
+#define FN_BUL_NUM_RULE_INDEX (FN_EDIT + 120) /* Achieving num rule index */
+#define FN_NUM_NUM_RULE_INDEX (FN_EDIT + 121)
#define FN_INSERT (SID_SW_START + 300)
#define FN_DELETE_BOOKMARK (FN_INSERT + 1)
@@ -476,6 +478,9 @@
#define SID_TWAIN_TRANSFER ( SID_SVX_START + 332 )
#define SID_CONTOUR_DLG ( SID_SVX_START + 334 )
#define SID_CONTOUR_EXEC ( SID_SVX_START + 335 )
+
+//#define SID_SIDEBAR ( SID_SVX_START + 336 ) -> sfxsids.hrc
+
#define SID_BORDER_OBJECT ( SID_SVX_START + 340 )
#define SID_SB_CONNECTIONPOOLING ( SID_SVX_START + 348 )
#define SID_SB_DBREGISTEROPTIONS ( SID_SVX_START + 349 )
@@ -922,18 +927,37 @@
#define SID_INSERT_FORM_HSCROLL (SID_SVX_START+1112)
#define SID_EXTERNAL_EDIT (SID_SVX_START+1113)
#define SID_ATTR_PAGE_SHARED_FIRST (SID_SVX_START+1114)
+#define SID_CHANGE_PICTURE (SID_SVX_START+1115)
#define SID_SAVE_GRAPHIC (SID_SVX_START+1116)
#define SID_COMPRESS_GRAPHIC (SID_SVX_START+1117)
#define SID_FRAME_UP (SID_SVX_START+1118)
#define SID_FRAME_DOWN (SID_SVX_START+1119)
#define SID_ATTR_SPECIALCHAR (SID_SVX_START+1120)
-#define SID_CHANGE_PICTURE (SID_SVX_START+1125)
-#define SID_ROTATE_GRAPHIC_LEFT (SID_SVX_START+1126)
-#define SID_ROTATE_GRAPHIC_RIGHT (SID_SVX_START+1127)
-#define SID_MENU_MANAGE_GRAPHIC (SID_SVX_START+1128)
+#define SID_ROTATE_GRAPHIC_LEFT (SID_SVX_START+1121)
+#define SID_ROTATE_GRAPHIC_RIGHT (SID_SVX_START+1122)
+#define SID_MENU_MANAGE_GRAPHIC (SID_SVX_START+1123)
+
+// new slots for panels
+#define SID_ATTR_FILL_TRANSPARENCE (SID_SVX_START+1124)
+#define SID_ATTR_FILL_FLOATTRANSPARENCE (SID_SVX_START+1125)
+#define SID_ATTR_LINE_TRANSPARENCE (SID_SVX_START+1126)
+#define SID_FLIP_HORIZONTAL (SID_SVX_START+1127)
+#define SID_FLIP_VERTICAL (SID_SVX_START+1128)
+#define SID_ATTR_LINE_JOINT (SID_SVX_START+1129)
+#define SID_ATTR_LINE_CAP (SID_SVX_START+1130)
+#define SID_ATTR_TRANSFORM_MATRIX (SID_SVX_START+1131)
+
+#define SID_CELL_FORMAT_BORDER (SID_SVX_START+1132)
+#define SID_CHAR_DLG_EFFECT (SID_SVX_START+1133)
+#define SID_ATTR_PARA_LEFT (SID_SVX_START+1134)
+#define SID_ATTR_PARA_RIGHT (SID_SVX_START+1135)
+
+#define FN_SVX_SET_NUMBER (SID_SVX_START+1136)
+#define FN_SVX_SET_BULLET (SID_SVX_START+1137)
+
// IMPORTANT NOTE: adjust SID_SVX_FIRSTFREE, when adding new slot id
-#define SID_SVX_FIRSTFREE (SID_MENU_MANAGE_GRAPHIC + 1)
+#define SID_SVX_FIRSTFREE (FN_SVX_SET_BULLET + 1)
// --------------------------------------------------------------------------
// Overflow check for slot IDs
diff --git a/include/svx/xenum.hxx b/include/svx/xenum.hxx
index df0b629d5980..38f414c03fc8 100644
--- a/include/svx/xenum.hxx
+++ b/include/svx/xenum.hxx
@@ -21,14 +21,6 @@
#define _XENUM_HXX
enum XLineStyle { XLINE_NONE, XLINE_SOLID, XLINE_DASH };
-enum XLineJoint
-{
- XLINEJOINT_NONE, // no rounding
- XLINEJOINT_MIDDLE, // calc middle value between joints
- XLINEJOINT_BEVEL, // join edges with line
- XLINEJOINT_MITER, // extend till cut
- XLINEJOINT_ROUND // create arc
-};
enum XDashStyle { XDASH_RECT, XDASH_ROUND, XDASH_RECTRELATIVE,
XDASH_ROUNDRELATIVE };
enum XFillStyle { XFILL_NONE, XFILL_SOLID, XFILL_GRADIENT, XFILL_HATCH,
diff --git a/include/svx/xlinjoit.hxx b/include/svx/xlinjoit.hxx
index 321656d9ed72..40030551e3c9 100644
--- a/include/svx/xlinjoit.hxx
+++ b/include/svx/xlinjoit.hxx
@@ -23,16 +23,17 @@
#include <svl/eitem.hxx>
#include <svx/xenum.hxx>
#include "svx/svxdllapi.h"
+#include <com/sun/star/drawing/LineJoint.hpp>
//---------------------
-// class LineStyleItem
+// class XLineJointItem
//---------------------
class SVX_DLLPUBLIC XLineJointItem : public SfxEnumItem
{
public:
TYPEINFO();
- XLineJointItem( XLineJoint eLineJoint = XLINEJOINT_ROUND );
+ XLineJointItem( com::sun::star::drawing::LineJoint eLineJoint = com::sun::star::drawing::LineJoint_ROUND );
XLineJointItem( SvStream& rIn );
virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const;
@@ -45,8 +46,8 @@ public:
SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric,
OUString &rText, const IntlWrapper * = 0 ) const;
- virtual sal_uInt16 GetValueCount() const;
- XLineJoint GetValue() const { return (XLineJoint) SfxEnumItem::GetValue(); }
+ virtual sal_uInt16 GetValueCount() const;
+ com::sun::star::drawing::LineJoint GetValue() const { return (com::sun::star::drawing::LineJoint) SfxEnumItem::GetValue(); }
};
#endif // _SVX_XLINJOIT_HXX
diff --git a/include/svx/xlncapit.hxx b/include/svx/xlncapit.hxx
index 620a7adfc4b3..16b011b53104 100644
--- a/include/svx/xlncapit.hxx
+++ b/include/svx/xlncapit.hxx
@@ -26,7 +26,7 @@
#include <com/sun/star/drawing/LineCap.hpp>
//---------------------
-// class LineStyleItem
+// class XLineCapItem
//---------------------
class SVX_DLLPUBLIC XLineCapItem : public SfxEnumItem
diff --git a/include/svx/xtable.hxx b/include/svx/xtable.hxx
index 93ad230ea75f..32c4619dd2c2 100644
--- a/include/svx/xtable.hxx
+++ b/include/svx/xtable.hxx
@@ -33,21 +33,18 @@
#include <cppuhelper/weak.hxx>
-#include "svx/svxdllapi.h"
+#include <svx/svxdllapi.h>
#include <com/sun/star/embed/XStorage.hpp>
#include <basegfx/polygon/b2dpolypolygon.hxx>
#include <com/sun/star/container/XNameContainer.hpp>
#include <svtools/grfmgr.hxx>
+#include <svx/XPropertyEntry.hxx>
class Color;
class Bitmap;
class VirtualDevice;
class XOutdevItemPool;
-// Breite und Hoehe der LB-Bitmaps
-#define BITMAP_WIDTH 32
-#define BITMAP_HEIGHT 12
-
// Standard-Vergleichsstring
extern sal_Unicode pszStandard[]; // "standard"
@@ -55,24 +52,6 @@ extern sal_Unicode pszStandard[]; // "standard"
// enum COL_NAME nicht verglichen werden kann.
SVX_DLLPUBLIC Color RGB_Color( ColorData nColorName );
-// ---------------------
-// class XPropertyEntry
-// ---------------------
-
-class XPropertyEntry
-{
-protected:
- String aName;
-
- XPropertyEntry(const String& rName) : aName(rName) {}
- XPropertyEntry(const XPropertyEntry& rOther): aName(rOther.aName) {}
-public:
-
- virtual ~XPropertyEntry() {}
- void SetName(const String& rName) { aName = rName; }
- String& GetName() { return aName; }
-};
-
// ------------------
// class XColorEntry
// ------------------
@@ -230,26 +209,25 @@ protected:
typedef ::std::vector< XPropertyEntry* > XPropertyEntryList_impl;
typedef ::std::vector< Bitmap* > BitmapList_impl;
- XPropertyListType eType;
- String aName; // not persistent
- String aPath;
- XOutdevItemPool* pXPool;
+ XPropertyListType meType;
+ String maName; // not persistent
+ String maPath;
+ XOutdevItemPool* mpXPool;
- XPropertyEntryList_impl aList;
- BitmapList_impl* pBmpList;
+ XPropertyEntryList_impl maList;
- bool bListDirty;
- bool bBitmapsDirty;
- bool bOwnPool;
- bool bEmbedInDocument;
+ bool mbListDirty;
+ bool mbEmbedInDocument;
XPropertyList( XPropertyListType t, const String& rPath,
XOutdevItemPool* pXPool = NULL );
+ virtual Bitmap CreateBitmapForUI( long nIndex ) = 0;
+
public:
virtual ~XPropertyList();
- XPropertyListType Type() const { return eType; }
+ XPropertyListType Type() const { return meType; }
long Count() const;
void Insert( XPropertyEntry* pEntry, long nIndex = CONTAINER_APPEND );
@@ -259,22 +237,21 @@ public:
// Note: Get(long) & Get( String& ) are ambiguous
XPropertyEntry* Get( long nIndex, sal_uInt16 nDummy ) const;
long Get(const String& rName);
+ Bitmap GetUiBitmap( long nIndex ) const;
- Bitmap* GetBitmap( long nIndex ) const;
-
- const String& GetName() const { return aName; }
+ const String& GetName() const { return maName; }
void SetName( const String& rString );
- const String& GetPath() const { return aPath; }
- void SetPath( const String& rString ) { aPath = rString; }
- sal_Bool IsDirty() const { return bListDirty && bBitmapsDirty; }
- void SetDirty( sal_Bool bDirty = sal_True )
- { bListDirty = bDirty; bBitmapsDirty = bDirty; }
- bool IsEmbedInDocument() const { return bEmbedInDocument; }
- void SetEmbedInDocument(bool b) { bEmbedInDocument = b; }
+ const String& GetPath() const { return maPath; }
+ void SetPath( const String& rString ) { maPath = rString; }
+ bool IsDirty() const { return mbListDirty; }
+ void SetDirty( bool bDirty = sal_True )
+ { mbListDirty = bDirty; }
+ bool IsEmbedInDocument() const { return mbEmbedInDocument; }
+ void SetEmbedInDocument(bool b) { mbEmbedInDocument = b; }
static OUString GetDefaultExt(XPropertyListType t);
static OUString GetDefaultExtFilter(XPropertyListType t);
- OUString GetDefaultExt() const { return GetDefaultExt( eType ); }
+ OUString GetDefaultExt() const { return GetDefaultExt( meType ); }
virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >
createInstance() = 0;
@@ -288,8 +265,6 @@ public:
const OUString &rURL,
OUString *pOptName );
virtual sal_Bool Create() = 0;
- virtual sal_Bool CreateBitmapsForUI() = 0;
- virtual Bitmap* CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True ) = 0;
// Factory method for sub-classes
static XPropertyListRef CreatePropertyList( XPropertyListType t,
@@ -307,6 +282,10 @@ public:
inline XBitmapListRef AsBitmapList();
inline XLineEndListRef AsLineEndList();
inline XGradientListRef AsGradientList();
+
+ sal_uInt32 getUiBitmapWidth() const;
+ sal_uInt32 getUiBitmapHeight() const;
+ sal_uInt32 getUiBitmapLineWidth() const;
};
// ------------------
@@ -315,6 +294,9 @@ public:
class SVX_DLLPUBLIC XColorList : public XPropertyList
{
+protected:
+ virtual Bitmap CreateBitmapForUI( long nIndex );
+
public:
explicit XColorList( const String& rPath,
XOutdevItemPool* pXInPool = NULL ) :
@@ -329,8 +311,6 @@ public:
XColorEntry* GetColor(long nIndex) const;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > createInstance();
virtual sal_Bool Create();
- virtual sal_Bool CreateBitmapsForUI();
- virtual Bitmap* CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True );
static XColorListRef CreateStdColorList();
static XColorListRef GetStdColorList(); // returns a singleton
@@ -349,6 +329,9 @@ private:
void impCreate();
void impDestroy();
+protected:
+ virtual Bitmap CreateBitmapForUI(long nIndex);
+
public:
explicit XLineEndList(
const String& rPath,
@@ -363,8 +346,6 @@ public:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > createInstance();
virtual sal_Bool Create();
- virtual sal_Bool CreateBitmapsForUI();
- virtual Bitmap* CreateBitmapForUI(long nIndex, sal_Bool bDelete = sal_True);
};
// -------------------
@@ -376,10 +357,17 @@ class SVX_DLLPUBLIC XDashList : public XPropertyList
{
private:
impXDashList* mpData;
+ Bitmap maBitmapSolidLine;
+ String maStringSolidLine;
+ String maStringNoLine;
void impCreate();
void impDestroy();
+protected:
+ Bitmap ImpCreateBitmapForXDash(const XDash* pDash);
+ virtual Bitmap CreateBitmapForUI(long nIndex);
+
public:
explicit XDashList(
const String& rPath,
@@ -396,8 +384,16 @@ public:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > createInstance();
virtual sal_Bool Create();
- virtual sal_Bool CreateBitmapsForUI();
- virtual Bitmap* CreateBitmapForUI(long nIndex, sal_Bool bDelete = sal_True);
+
+ // Special call to get a bitmap for the solid line representation. It
+ // creates a bitmap fitting in size and style to the ones you get by
+ // using GetUiBitmap for existing entries.
+ Bitmap GetBitmapForUISolidLine() const;
+
+ // Special calls to get the translated strings for the UI entry for no
+ // line style (XLINE_NONE) and solid line style (XLINE_SOLID) for dialogs
+ String GetStringForUiSolidLine() const;
+ String GetStringForUiNoLine() const;
};
// -------------------
@@ -413,6 +409,9 @@ private:
void impCreate();
void impDestroy();
+protected:
+ virtual Bitmap CreateBitmapForUI(long nIndex);
+
public:
explicit XHatchList( const String& rPath,
XOutdevItemPool* pXPool = 0 );
@@ -427,8 +426,6 @@ public:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > createInstance();
virtual sal_Bool Create();
- virtual sal_Bool CreateBitmapsForUI();
- virtual Bitmap* CreateBitmapForUI(long nIndex, sal_Bool bDelete = sal_True);
};
// -------------------
@@ -444,6 +441,9 @@ private:
void impCreate();
void impDestroy();
+protected:
+ virtual Bitmap CreateBitmapForUI(long nIndex);
+
public:
explicit XGradientList(
const String& rPath,
@@ -460,8 +460,6 @@ public:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > createInstance();
virtual sal_Bool Create();
- virtual sal_Bool CreateBitmapsForUI();
- virtual Bitmap* CreateBitmapForUI(long nIndex, sal_Bool bDelete = sal_True);
};
// -------------------
@@ -470,6 +468,9 @@ public:
class SVX_DLLPUBLIC XBitmapList : public XPropertyList
{
+protected:
+ virtual Bitmap CreateBitmapForUI( long nIndex );
+
public:
explicit XBitmapList( const String& rPath,
XOutdevItemPool* pXInPool = NULL )
@@ -483,8 +484,6 @@ public:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > createInstance();
virtual sal_Bool Create();
- virtual sal_Bool CreateBitmapsForUI();
- virtual Bitmap* CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True );
};
diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx
index e57ea3cbed26..3d330ba17f98 100644
--- a/include/vcl/button.hxx
+++ b/include/vcl/button.hxx
@@ -446,13 +446,11 @@ protected:
using Window::ImplInit;
SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle );
SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId );
- SAL_DLLPRIVATE virtual void FillLayoutData() const;
- SAL_DLLPRIVATE virtual const Font&
- GetCanonicalFont( const StyleSettings& _rStyle ) const;
- SAL_DLLPRIVATE virtual const Color&
- GetCanonicalTextColor( const StyleSettings& _rStyle ) const;
+ virtual void FillLayoutData() const;
+ virtual const Font& GetCanonicalFont( const StyleSettings& _rStyle ) const;
+ virtual const Color& GetCanonicalTextColor( const StyleSettings& _rStyle ) const;
- SAL_DLLPRIVATE virtual void ImplDrawCheckBoxState();
+ virtual void ImplDrawCheckBoxState();
SAL_DLLPRIVATE const Rectangle& GetStateRect() const { return maStateRect; }
SAL_DLLPRIVATE const Rectangle& GetMouseRect() const { return maMouseRect; }
diff --git a/include/vcl/split.hxx b/include/vcl/split.hxx
index 937ef7d2ab38..a279fd24181f 100644
--- a/include/vcl/split.hxx
+++ b/include/vcl/split.hxx
@@ -56,6 +56,7 @@ private:
SAL_DLLPRIVATE sal_Bool ImplSplitterActive();
SAL_DLLPRIVATE Splitter* ImplFindSibling();
SAL_DLLPRIVATE void ImplRestoreSplitter();
+ SAL_DLLPRIVATE void ImplInitHorVer(bool bNew);
// Copy assignment is forbidden and not implemented.
SAL_DLLPRIVATE Splitter (const Splitter &);
@@ -97,7 +98,8 @@ public:
virtual void SetSplitPosPixel( long nPos );
long GetSplitPosPixel() const { return mnSplitPos; }
- sal_Bool IsHorizontal() const { return mbHorzSplit; }
+ sal_Bool IsHorizontal() const { return mbHorzSplit; }
+ void SetHorizontal(bool bNew);
// set the stepsize of the splitter for cursor movement
// the default is 10% of the reference window's width/height
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index d1c783bc0e69..381b3e61fda5 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -1273,6 +1273,14 @@ public:
virtual OUString GetSurroundingText() const;
virtual Selection GetSurroundingTextSelection() const;
+
+ void EnableThemeSupport (void);
+ void DisableThemeSupport (void);
+
+ virtual ImplBorderWindow* CreateBorderWindow (
+ Window* pParent,
+ const WinBits nStyle,
+ const sal_uInt16 nTypeStyle);
};
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index a3772e08104d..6c5c6f4a7a38 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -3939,6 +3939,8 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/ucb,\
$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/ui,\
ActionTriggerSeparatorType \
ConfigurationEvent \
+ ContextChangeEventMultiplexer \
+ ContextChangeEventObject \
ContextMenuExecuteEvent \
ContextMenuInterceptorAction \
DockingArea \
@@ -3946,14 +3948,19 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/ui,\
ImageType \
ItemStyle \
ItemType \
+ LayoutSize \
UIElementType \
XAcceleratorConfiguration \
+ XContextChangeEventListener \
+ XContextChangeEventMultiplexer \
XContextMenuInterception \
XContextMenuInterceptor \
XDockingAreaAcceptor \
XImageManager \
XModuleUIConfigurationManager \
XModuleUIConfigurationManagerSupplier \
+ XSidebar \
+ XSidebarPanel \
XToolPanel \
XUIConfiguration \
XUIConfigurationListener \
diff --git a/offapi/com/sun/star/ui/ContextChangeEventMultiplexer.idl b/offapi/com/sun/star/ui/ContextChangeEventMultiplexer.idl
new file mode 100644
index 000000000000..874e7968a35b
--- /dev/null
+++ b/offapi/com/sun/star/ui/ContextChangeEventMultiplexer.idl
@@ -0,0 +1,35 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#ifndef __com_sun_star_ui_ContextChangeEventMultiplexer_idl__
+#define __com_sun_star_ui_ContextChangeEventMultiplexer_idl__
+
+#ifndef __com_sun_star_ui_XContextChangeEventMultiplexer_idl__
+#include <com/sun/star/ui/XContextChangeEventMultiplexer.idl>
+#endif
+
+module com { module sun { module star { module ui {
+
+/** Multiplex events for context changes.
+
+ A typical listener for context changes is the sidebar.
+*/
+singleton ContextChangeEventMultiplexer : com::sun::star::ui::XContextChangeEventMultiplexer;
+
+}; }; }; }; // com.sun.star.ui
+
+#endif
diff --git a/offapi/com/sun/star/ui/ContextChangeEventObject.idl b/offapi/com/sun/star/ui/ContextChangeEventObject.idl
new file mode 100644
index 000000000000..944ed224d0c7
--- /dev/null
+++ b/offapi/com/sun/star/ui/ContextChangeEventObject.idl
@@ -0,0 +1,47 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#ifndef __com_sun_star_ui_ContextChangeEventObject_idl__
+#define __com_sun_star_ui_ContextChangeEventObject_idl__
+
+#ifndef __com_sun_star_uno_XInterface_idl__
+#include <com/sun/star/uno/XInterface.idl>
+#endif
+
+#ifndef __com_sun_star_lang_EventObject_idl__
+#include <com/sun/star/lang/EventObject.idl>
+#endif
+
+
+module com { module sun { module star { module ui {
+
+struct ContextChangeEventObject : com::sun::star::lang::EventObject
+{
+ /** Return the name of the application.
+ */
+ string ApplicationName;
+
+ /** Return the application specific context name.
+ */
+ string ContextName;
+};
+
+}; }; }; };
+
+//=============================================================================
+
+#endif
diff --git a/offapi/com/sun/star/ui/LayoutSize.idl b/offapi/com/sun/star/ui/LayoutSize.idl
new file mode 100644
index 000000000000..42d76ab7898a
--- /dev/null
+++ b/offapi/com/sun/star/ui/LayoutSize.idl
@@ -0,0 +1,46 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#ifndef __com_sun_star_ui_LayoutSize_idl__
+#define __com_sun_star_ui_LayoutSize_idl__
+
+module com { module sun { module star { module ui {
+
+/** Size used for layouting windows.
+ It specifies a range of valid values and a preferred value.
+ The values must not violate the relation 0 <= Minimum <= Preferred <= Maximum.
+
+ @param Minimum
+ Zero or positive. The value itself is included in the valid
+ range.
+ @param Maximum
+ A value larger than or equal to Minimum.
+ The special value -1 means that there is no upper bound. Every value larger than or
+ equal to Minimum is valid.
+ @param Preferred
+ The preferred size inside the valid range.
+*/
+struct LayoutSize
+{
+ long Minimum;
+ long Maximum;
+ long Preferred;
+};
+
+}; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/ui/XContextChangeEventListener.idl b/offapi/com/sun/star/ui/XContextChangeEventListener.idl
new file mode 100644
index 000000000000..d969b5904f03
--- /dev/null
+++ b/offapi/com/sun/star/ui/XContextChangeEventListener.idl
@@ -0,0 +1,43 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#ifndef __com_sun_star_ui_XContextChangeEventListener_idl__
+#define __com_sun_star_ui_XContextChangeEventListener_idl__
+
+#ifndef __com_sun_star_uno_XInterface_idl__
+#include <com/sun/star/uno/XInterface.idl>
+#endif
+
+#ifndef __com_sun_star_lang_XEventListener_idl__
+#include <com/sun/star/lang/XEventListener.idl>
+#endif
+
+#ifndef __com_sun_star_ui_ContextChangeEventObject_idl__
+#include <com/sun/star/ui/ContextChangeEventObject.idl>
+#endif
+
+module com { module sun { module star { module ui {
+
+interface XContextChangeEventListener : ::com::sun::star::lang::XEventListener
+{
+ void notifyContextChangeEvent (
+ [in] com::sun::star::ui::ContextChangeEventObject event);
+} ;
+
+} ; } ; } ; } ;
+
+#endif
diff --git a/offapi/com/sun/star/ui/XContextChangeEventMultiplexer.idl b/offapi/com/sun/star/ui/XContextChangeEventMultiplexer.idl
new file mode 100644
index 000000000000..989f5f0c0708
--- /dev/null
+++ b/offapi/com/sun/star/ui/XContextChangeEventMultiplexer.idl
@@ -0,0 +1,125 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#ifndef __com_sun_star_ui_XContextChangeEventMultiplexer_idl__
+#define __com_sun_star_ui_XContextChangeEventMultiplexer_idl__
+
+#ifndef __com_sun_star_uno_XInterface_idl__
+#include <com/sun/star/uno/XInterface.idl>
+#endif
+
+#ifndef __com_sun_star_ui_XContextChangeEventListener_idl__
+#include <com/sun/star/ui/XContextChangeEventListener.idl>
+#endif
+
+#ifndef __com_sun_star_ui_ContextChangeEventObject_idl__
+#include <com/sun/star/ui/ContextChangeEventObject.idl>
+#endif
+
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
+#include <com/sun/star/lang/IllegalArgumentException.idl>
+#endif
+
+
+module com { module sun { module star { module ui {
+
+/** Provide a central access point for a group of events.
+
+ Listeners can be added with a simple restriction on the event source.
+ They are only called for events that originate at the specified source.
+
+ Event providers can broadcast an event to all interested listeners.
+
+ The XEventMultiplexer interface is typically implemented as a singleton
+*/
+interface XContextChangeEventMultiplexer : ::com::sun::star::uno::XInterface
+{
+ /** Add an event listener that is called only when events are broadcast for the specified
+ event focus.
+
+ @param xListener
+ An empty reference results in an InvalidArgumentException.
+
+ One listener may be added more than once for different
+ event foci. Adding a listener a second time for the same
+ event focus results in an InvalidArgumentException.
+
+ @param xEventFocus
+ An empty reference is a valid value. In this case the
+ registered listener will be called for every event
+ broadcast, regardless of its event focus.
+
+ The event focus may or may not be the source of the event.
+
+ A typical example for an event focus is the XController of
+ a view. Using an XController restricts events passed to
+ a listener to events that belong to one view.
+
+ @throws com::sun::star::lang::IllegalArgumentException
+
+ */
+ void addContextChangeEventListener (
+ [in] com::sun::star::ui::XContextChangeEventListener xListener,
+ [in] com::sun::star::uno::XInterface xEventFocus)
+ raises (com::sun::star::lang::IllegalArgumentException);
+
+ /** Remove an event listener for the specified event focus.
+
+ When the same listener was added for other event foci then
+ these associations remain unmodified.
+
+ @param xListener
+ An empty reference results in an InvalidArgumentException.
+
+ When the listener is not registered for the given event
+ focus then an InvalidArgumentException is thrown.
+
+ @param xEventFocus
+ The listener is only removed for this event focus.
+ An empty reference is a valid value.
+
+ @throws com::sun::star::lang::IllegalArgumentException
+ */
+ void removeContextChangeEventListener (
+ [in] com::sun::star::ui::XContextChangeEventListener xListener,
+ [in] com::sun::star::uno::XInterface xEventFocus)
+ raises (com::sun::star::lang::IllegalArgumentException);
+
+ /** Remove an event listener for all event foci.
+
+ @param xListener
+ An empty reference results in an InvalidArgumentException.
+
+ It is not an error when the listener is not registered for any event focus.
+
+ @throws com::sun::star::lang::IllegalArgumentException
+ */
+ void removeAllContextChangeEventListeners (
+ [in] com::sun::star::ui::XContextChangeEventListener xListener)
+ raises (com::sun::star::lang::IllegalArgumentException);
+
+
+ /** Call all event listeners that where added for the specified event focus.
+ */
+ void broadcastContextChangeEvent (
+ [in] com::sun::star::ui::ContextChangeEventObject aEvent,
+ [in] com::sun::star::uno::XInterface xEventFocus);
+} ;
+
+} ; } ; } ; } ;
+
+#endif
diff --git a/offapi/com/sun/star/ui/XContextChangeListener.idl b/offapi/com/sun/star/ui/XContextChangeListener.idl
new file mode 100644
index 000000000000..204a0c6a0e5d
--- /dev/null
+++ b/offapi/com/sun/star/ui/XContextChangeListener.idl
@@ -0,0 +1,45 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#ifndef __com_sun_star_util_XEventListener_idl__
+#define __com_sun_star_util_XEventListener_idl__
+
+#ifndef __com_sun_star_uno_XInterface_idl__
+#include <com/sun/star/uno/XInterface.idl>
+#endif
+
+#ifndef __com_sun_star_lang_XEventListener_idl__
+#include <com/sun/star/lang/XEventListener.idl>
+#endif
+
+#ifndef __com_sun_star_lang_EventObject_idl__
+#include <com/sun/star/lang/EventObject.idl>
+#endif
+
+module com { module sun { module star { module util {
+
+/** Generic event listener.
+*/
+interface XEventListener : ::com::sun::star::lang::XEventListener
+{
+ void notifyEvent (
+ [in] com::sun::star::lang::EventObject event);
+} ;
+
+} ; } ; } ; } ;
+
+#endif
diff --git a/offapi/com/sun/star/ui/XSidebar.idl b/offapi/com/sun/star/ui/XSidebar.idl
new file mode 100644
index 000000000000..c47a0d42c9da
--- /dev/null
+++ b/offapi/com/sun/star/ui/XSidebar.idl
@@ -0,0 +1,40 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#ifndef __com_sun_star_ui_XSidebar_idl__
+#define __com_sun_star_ui_XSidebar_idl__
+
+#ifndef __com_sun_star_uno_XInterface_idl__
+#include <com/sun/star/uno/XInterface.idl>
+#endif
+
+module com { module sun { module star { module ui {
+
+/** Interface of the sidebar that allows its elements like panels to eg request layouts.
+*/
+interface XSidebar
+{
+ /** Request layout of the sidebar.
+ Call this method when one of the panels wants to change its size due to
+ late initilization or different content after a context change.
+ */
+ void requestLayout ();
+} ;
+
+} ; } ; } ; } ;
+
+#endif
diff --git a/offapi/com/sun/star/ui/XSidebarPanel.idl b/offapi/com/sun/star/ui/XSidebarPanel.idl
new file mode 100644
index 000000000000..1852c97b1f76
--- /dev/null
+++ b/offapi/com/sun/star/ui/XSidebarPanel.idl
@@ -0,0 +1,58 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#ifndef __com_sun_star_ui_XSidebarPanel_idl__
+#define __com_sun_star_ui_XSidebarPanel_idl__
+
+#ifndef __com_sun_star_uno_XInterface_idl__
+#include <com/sun/star/uno/XInterface.idl>
+#endif
+
+#ifndef __com_sun_star_rendering_XCanvas_idl__
+#include <com/sun/star/rendering/XCanvas.idl>
+#endif
+
+#ifndef __com_sun_star_awt_Point_idl__
+#include <com/sun/star/awt/Point.idl>
+#endif
+
+#ifndef __com_sun_star_beans_XPropertySet_idl__
+#include <com/sun/star/beans/XPropertySet.idl>
+#endif
+#ifndef __com_sun_star_ui_LayoutSize_idl__
+#include <com/sun/star/ui/LayoutSize.idl>
+#endif
+
+module com { module sun { module star { module ui {
+
+/** Optional interface of sidebar panels.
+*/
+interface XSidebarPanel
+{
+ /** For a given width of the container the layouter asks every ui element for its
+ optimal height.
+
+ The height to which a ui element is set may differ from the returned value.
+
+ The height is set via the XWindow interface.
+ */
+ LayoutSize getHeightForWidth ( [in] long nWidth);
+} ;
+
+} ; } ; } ; } ;
+
+#endif
diff --git a/offapi/com/sun/star/util/EventMultiplexer.idl b/offapi/com/sun/star/util/EventMultiplexer.idl
new file mode 100644
index 000000000000..db8d128086ba
--- /dev/null
+++ b/offapi/com/sun/star/util/EventMultiplexer.idl
@@ -0,0 +1,35 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#ifndef __com_sun_star_util_EventMultiplexer_idl__
+#define __com_sun_star_util_EventMultiplexer_idl__
+
+#ifndef __com_sun_star_util_XEventMultiplexer_idl__
+#include <com/sun/star/util/XEventMultiplexer.idl>
+#endif
+
+module com { module sun { module star { module util {
+
+/** Multiplex generic events.
+*/
+service EventMultiplexer : com::sun::star::util::XEventMultiplexer
+{
+};
+
+}; }; }; }; // com.sun.star.util
+
+#endif
diff --git a/officecfg/Configuration_officecfg.mk b/officecfg/Configuration_officecfg.mk
index 3a0bae3495df..70cc15b9de46 100644
--- a/officecfg/Configuration_officecfg.mk
+++ b/officecfg/Configuration_officecfg.mk
@@ -173,6 +173,7 @@ $(eval $(call gb_Configuration_add_localized_datas,registry,officecfg/registry/d
org/openoffice/Office/UI/DrawWindowState.xcu \
org/openoffice/Office/UI/ImpressWindowState.xcu \
org/openoffice/Office/UI/MathWindowState.xcu \
+ org/openoffice/Office/UI/Sidebar.xcu \
org/openoffice/Office/UI/StartModuleWindowState.xcu \
org/openoffice/Office/UI/WriterWindowState.xcu \
org/openoffice/Office/UI/XFormsWindowState.xcu \
diff --git a/officecfg/files.mk b/officecfg/files.mk
index 7a2deb85dea9..20237c123e1d 100644
--- a/officecfg/files.mk
+++ b/officecfg/files.mk
@@ -82,6 +82,7 @@ officecfg_XCSFILES := \
Office/UI/MathCommands \
Office/UI/MathWindowState \
Office/UI/ReportCommands \
+ Office/UI/Sidebar \
Office/UI/StartModuleCommands \
Office/UI/StartModuleWindowState \
Office/UI/WindowContentFactories \
diff --git a/officecfg/registry/data/org/openoffice/Office/Impress.xcu b/officecfg/registry/data/org/openoffice/Office/Impress.xcu
index d5353593a7e8..2310cc2a6b36 100644
--- a/officecfg/registry/data/org/openoffice/Office/Impress.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Impress.xcu
@@ -82,11 +82,6 @@
<value>private:resource/pane/LeftDrawPane</value>
</prop>
</node>
- <node oor:name="R3" oor:op="replace">
- <prop oor:name="URL">
- <value>private:resource/pane/RightPane</value>
- </prop>
- </node>
</node>
</node>
<node oor:name="F1" oor:op="replace">
@@ -126,11 +121,6 @@
</node>
<node oor:name="R6" oor:op="replace">
<prop oor:name="URL">
- <value>private:resource/view/TaskPane</value>
- </prop>
- </node>
- <node oor:name="R7" oor:op="replace">
- <prop oor:name="URL">
<value>private:resource/view/PresentationView</value>
</prop>
</node>
@@ -150,43 +140,53 @@
</node>
<node oor:name="F3" oor:op="replace">
<prop oor:name="ServiceName">
- <value>com.sun.star.drawing.framework.TaskPanelFactory</value>
+ <value>com.sun.star.comp.Draw.framework.TaskPanelFactory</value>
</prop>
<node oor:name="ResourceList">
- <node oor:name="R0" oor:op="replace">
+ <node oor:name="R0a" oor:op="replace">
+ <prop oor:name="URL">
+ <value>private:resource/toolpanel/AllMasterPages</value>
+ </prop>
+ </node>
+ <node oor:name="R0b" oor:op="replace">
+ <prop oor:name="URL">
+ <value>private:resource/toolpanel/RecentMasterPages</value>
+ </prop>
+ </node>
+ <node oor:name="R0c" oor:op="replace">
<prop oor:name="URL">
- <value>private:resource/toolpanel/DrawingFramework/MasterPages</value>
+ <value>private:resource/toolpanel/UsedMasterPages</value>
</prop>
</node>
<node oor:name="R1" oor:op="replace">
<prop oor:name="URL">
- <value>private:resource/toolpanel/DrawingFramework/Layouts</value>
+ <value>private:resource/toolpanel/Layouts</value>
</prop>
</node>
<node oor:name="R2" oor:op="replace">
<prop oor:name="URL">
- <value>private:resource/toolpanel/DrawingFramework/TableDesign</value>
+ <value>private:resource/toolpanel/TableDesign</value>
</prop>
</node>
<node oor:name="R3" oor:op="replace">
<prop oor:name="URL">
- <value>private:resource/toolpanel/DrawingFramework/CustomAnimations</value>
+ <value>private:resource/toolpanel/CustomAnimations</value>
</prop>
</node>
<node oor:name="R4" oor:op="replace">
<prop oor:name="URL">
- <value>private:resource/toolpanel/DrawingFramework/SlideTransitions</value>
+ <value>private:resource/toolpanel/SlideTransitions</value>
</prop>
</node>
</node>
</node>
</node>
<node oor:name="StartupServices">
- <node oor:name="S0" oor:op="replace">
- <prop oor:name="ServiceName">
- <value>com.sun.star.drawing.framework.PresentationFactoryProvider</value>
- </prop>
- </node>
+ <node oor:name="S0" oor:op="replace">
+ <prop oor:name="ServiceName">
+ <value>com.sun.star.drawing.framework.PresentationFactoryProvider</value>
+ </prop>
+ </node>
</node>
</node>
</node>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Factories.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Factories.xcu
index 943f13a5d78e..15c0a04bc072 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Factories.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Factories.xcu
@@ -76,18 +76,60 @@
<value>com.sun.star.comp.framework.StatusBarFactory</value>
</prop>
</node>
- <node oor:name="org.openoffice.Office.Impress.ImpressToolPanelFactory" oor:op="replace">
+ <node oor:name="SvxPanelFactory" oor:op="replace">
<prop oor:name="Type">
<value>toolpanel</value>
</prop>
<prop oor:name="Name">
- <value>DrawingFramework</value>
+ <value>SvxPanelFactory</value>
</prop>
<prop oor:name="Module">
- <value>com.sun.star.presentation.PresentationDocument</value>
+ <value/>
+ </prop>
+ <prop oor:name="FactoryImplementation">
+ <value>org.apache.openoffice.comp.svx.sidebar.PanelFactory</value>
+ </prop>
+ </node>
+ <node oor:name="SdPanelFactory" oor:op="replace">
+ <prop oor:name="Type">
+ <value>toolpanel</value>
+ </prop>
+ <prop oor:name="Name">
+ <value>SdPanelFactory</value>
+ </prop>
+ <prop oor:name="Module">
+ <value></value>
+ </prop>
+ <prop oor:name="FactoryImplementation">
+ <value>org.openoffice.comp.Draw.framework.PanelFactory</value>
+ </prop>
+ </node>
+ <node oor:name="ScPanelFactory" oor:op="replace">
+ <prop oor:name="Type">
+ <value>toolpanel</value>
+ </prop>
+ <prop oor:name="Name">
+ <value>ScPanelFactory</value>
+ </prop>
+ <prop oor:name="Module">
+ <value></value>
+ </prop>
+ <prop oor:name="FactoryImplementation">
+ <value>org.apache.openoffice.comp.sc.sidebar.ScPanelFactory</value>
+ </prop>
+ </node>
+ <node oor:name="SwPanelFactory" oor:op="replace">
+ <prop oor:name="Type">
+ <value>toolpanel</value>
+ </prop>
+ <prop oor:name="Name">
+ <value>SwPanelFactory</value>
+ </prop>
+ <prop oor:name="Module">
+ <value></value>
</prop>
<prop oor:name="FactoryImplementation">
- <value>com.sun.star.drawing.DefaultToolPanelFactory</value>
+ <value>org.apache.openoffice.comp.sw.sidebar.SwPanelFactory</value>
</prop>
</node>
</node>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 8ff9b7426d72..fbe3de530be7 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -3501,6 +3501,11 @@
<value xml:lang="en-US">Task Pane</value>
</prop>
</node>
+ <node oor:name=".uno:Sidebar" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Sidebar</value>
+ </prop>
+ </node>
<node oor:name=".uno:RestoreEditingView" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Restore Editing View</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
index 5aa630a4d618..c72079b3bc0a 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
@@ -825,61 +825,6 @@
<value>true</value>
</prop>
</node>
- <node oor:name="private:resource/toolpanel/DrawingFramework/MasterPages" oor:op="replace">
- <prop oor:name="Visible" oor:type="xs:boolean">
- <value>false</value>
- </prop>
- <prop oor:name="UIName" oor:type="xs:string">
- <value xml:lang="en-US">Master Pages</value>
- </prop>
- <prop oor:name="ImageURL" oor:type="xs:string">
- <value>private:commandimage/PresentationLayout</value>
- </prop>
- </node>
- <node oor:name="private:resource/toolpanel/DrawingFramework/Layouts" oor:op="replace">
- <prop oor:name="Visible" oor:type="xs:boolean">
- <value>false</value>
- </prop>
- <prop oor:name="UIName" oor:type="xs:string">
- <value xml:lang="en-US">Layouts</value>
- </prop>
- <prop oor:name="ImageURL" oor:type="xs:string">
- <value>private:commandimage/ModifyPage</value>
- </prop>
- </node>
- <node oor:name="private:resource/toolpanel/DrawingFramework/TableDesign" oor:op="replace">
- <prop oor:name="Visible" oor:type="xs:boolean">
- <value>false</value>
- </prop>
- <prop oor:name="UIName" oor:type="xs:string">
- <value xml:lang="en-US">Table Design</value>
- </prop>
- <prop oor:name="ImageURL" oor:type="xs:string">
- <value>private:commandimage/InsertTable</value>
- </prop>
- </node>
- <node oor:name="private:resource/toolpanel/DrawingFramework/CustomAnimations" oor:op="replace">
- <prop oor:name="Visible" oor:type="xs:boolean">
- <value>false</value>
- </prop>
- <prop oor:name="UIName" oor:type="xs:string">
- <value xml:lang="en-US">Custom Animation</value>
- </prop>
- <prop oor:name="ImageURL" oor:type="xs:string">
- <value>private:commandimage/CustomAnimation</value>
- </prop>
- </node>
- <node oor:name="private:resource/toolpanel/DrawingFramework/SlideTransitions" oor:op="replace">
- <prop oor:name="Visible" oor:type="xs:boolean">
- <value>false</value>
- </prop>
- <prop oor:name="UIName" oor:type="xs:string">
- <value xml:lang="en-US">Slide Transition</value>
- </prop>
- <prop oor:name="ImageURL" oor:type="xs:string">
- <value>private:commandimage/RehearseTimings</value>
- </prop>
- </node>
<node oor:name="private:resource/toolbar/optimizetablebar" oor:op="replace">
<prop oor:name="Docked" oor:type="xs:boolean">
<value>false</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
new file mode 100644
index 000000000000..f6ba25566f1b
--- /dev/null
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
@@ -0,0 +1,959 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ -->
+<!DOCTYPE oor:component-data SYSTEM "../../../../../component-update.dtd">
+<oor:component-data oor:name="Sidebar" oor:package="org.openoffice.Office.UI" xmlns:install="http://openoffice.org/2004/installation" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <node oor:name="Content">
+ <node oor:name="DeckList">
+
+ <node oor:name="PropertyDeck" oor:op="replace">
+ <prop oor:name="Title" oor:type="xs:string">
+ <value xml:lang="en-US">Properties</value>
+ </prop>
+ <prop oor:name="Id" oor:type="xs:string">
+ <value>PropertyDeck</value>
+ </prop>
+ <prop oor:name="IconURL" oor:type="xs:string">
+ <value>private:graphicrepository/sfx2/res/symphony/sidebar-property-large.png</value>
+ </prop>
+ <prop oor:name="ContextList">
+ <value oor:separator=";">
+ any, any, visible ;
+ </value>
+ </prop>
+ <prop oor:name="OrderIndex" oor:type="xs:int">
+ <value>100</value>
+ </prop>
+ </node>
+
+ <node oor:name="GalleryDeck" oor:op="replace">
+ <prop oor:name="Title" oor:type="xs:string">
+ <value xml:lang="en-US">Gallery</value>
+ </prop>
+ <prop oor:name="Id" oor:type="xs:string">
+ <value>GalleryDeck</value>
+ </prop>
+ <prop oor:name="IconURL" oor:type="xs:string">
+ <value>private:graphicrepository/sfx2/res/symphony/sidebar-gallery-large.png</value>
+ </prop>
+ <prop oor:name="ContextList">
+ <value oor:separator=";">
+ any, any, visible ;
+ </value>
+ </prop>
+ <prop oor:name="OrderIndex" oor:type="xs:int">
+ <value>300</value>
+ </prop>
+ </node>
+
+ <node oor:name="ImpressMasterPagesDeck" oor:op="replace">
+ <prop oor:name="Title" oor:type="xs:string">
+ <value xml:lang="en-US">Master Pages</value>
+ </prop>
+ <prop oor:name="Id" oor:type="xs:string">
+ <value>MasterPagesDeck</value>
+ </prop>
+ <prop oor:name="IconURL" oor:type="xs:string">
+ <value>private:graphicrepository/sfx2/res/symphony/sidebar-template-large.png</value>
+ </prop>
+ <prop oor:name="ContextList">
+ <value oor:separator=";">
+ Impress, any, visible ;
+ </value>
+ </prop>
+ <prop oor:name="OrderIndex" oor:type="xs:int">
+ <value>120</value>
+ </prop>
+ </node>
+
+ <node oor:name="ImpressAnimationEffects" oor:op="replace">
+ <prop oor:name="Title" oor:type="xs:string">
+ <value xml:lang="en-US">Custom Animation</value>
+ </prop>
+ <prop oor:name="Id" oor:type="xs:string">
+ <value>CustomAnimationDeck</value>
+ </prop>
+ <prop oor:name="IconURL" oor:type="xs:string">
+ <value>private:graphicrepository/sfx2/res/symphony/sidebar-animation-large.png</value>
+ </prop>
+ <prop oor:name="ContextList">
+ <value oor:separator=";">
+ Impress, any, visible ;
+ </value>
+ </prop>
+ <prop oor:name="OrderIndex" oor:type="xs:int">
+ <value>140</value>
+ </prop>
+ </node>
+
+ <node oor:name="SlideTransitionDeck" oor:op="replace">
+ <prop oor:name="Title" oor:type="xs:string">
+ <value xml:lang="en-US">Slide Transition</value>
+ </prop>
+ <prop oor:name="Id" oor:type="xs:string">
+ <value>SlideTransitionDeck</value>
+ </prop>
+ <prop oor:name="IconURL" oor:type="xs:string">
+ <value>private:graphicrepository/sfx2/res/symphony/sidebar-transition-large.png</value>
+ </prop>
+ <prop oor:name="ContextList">
+ <value oor:separator=";">
+ Impress, any, visible ;
+ </value>
+ </prop>
+ <prop oor:name="OrderIndex" oor:type="xs:int">
+ <value>160</value>
+ </prop>
+ </node>
+
+ <node oor:name="NavigatorDeck" oor:op="replace">
+ <prop oor:name="Title" oor:type="xs:string">
+ <value xml:lang="en-US">Navigator</value>
+ </prop>
+ <prop oor:name="Id" oor:type="xs:string">
+ <value>NavigatorDeck</value>
+ </prop>
+ <prop oor:name="IconURL" oor:type="xs:string">
+ <value>private:graphicrepository/sfx2/res/symphony/sidebar-navigator-large.png</value>
+ </prop>
+ <prop oor:name="ContextList">
+ <value oor:separator=";">
+ any, any, visible ;
+ </value>
+ </prop>
+ <prop oor:name="OrderIndex" oor:type="xs:int">
+ <value>400</value>
+ </prop>
+ </node>
+
+ <node oor:name="StyleListDeck" oor:op="replace">
+ <prop oor:name="Title" oor:type="xs:string">
+ <value xml:lang="en-US">Styles and Formatting</value>
+ </prop>
+ <prop oor:name="Id" oor:type="xs:string">
+ <value>StyleListDeck</value>
+ </prop>
+ <prop oor:name="IconURL" oor:type="xs:string">
+ <value>private:graphicrepository/sfx2/res/symphony/sidebar-style-large.png</value>
+ </prop>
+ <prop oor:name="ContextList">
+ <value oor:separator=";">
+ any, any, visible ;
+ </value>
+ </prop>
+ <prop oor:name="OrderIndex" oor:type="xs:int">
+ <value>200</value>
+ </prop>
+ </node>
+
+ <node oor:name="FunctionsDeck" oor:op="replace">
+ <prop oor:name="Title" oor:type="xs:string">
+ <value xml:lang="en-US">Functions</value>
+ </prop>
+ <prop oor:name="Id" oor:type="xs:string">
+ <value>FunctionsDeck</value>
+ </prop>
+ <prop oor:name="IconURL" oor:type="xs:string">
+ <value>private:graphicrepository/sfx2/res/symphony/sidebar-functions-large.png</value>
+ </prop>
+ <prop oor:name="ContextList">
+ <value oor:separator=";">
+ Calc, any, visible ;
+ </value>
+ </prop>
+ <prop oor:name="OrderIndex" oor:type="xs:int">
+ <value>500</value>
+ </prop>
+ </node>
+
+ </node>
+ <node oor:name="PanelList">
+
+ <node oor:name="TextPropertyPanel" oor:op="replace">
+ <prop oor:name="Title" oor:type="xs:string">
+ <value xml:lang="en-US">Text</value>
+ </prop>
+ <prop oor:name="Id" oor:type="xs:string">
+ <value>TextPropertyPanel</value>
+ </prop>
+ <prop oor:name="DeckId" oor:type="xs:string">
+ <value>PropertyDeck</value>
+ </prop>
+ <prop oor:name="DefaultMenuCommand">
+ <value>.uno:FontDialog</value>
+ </prop>
+ <prop oor:name="ContextList">
+ <value oor:separator=";">
+ Calc, Auditing, visible, .uno:CellTextDlg ;
+ Calc, Cell, visible, .uno:CellTextDlg ;
+ Calc, default, visible, .uno:CellTextDlg ;
+ Calc, DrawText, visible ;
+ Calc, EditCell, visible ;
+ Calc, Pivot, visible, .uno:CellTextDlg ;
+ DrawImpress, 3DObject, visible ;
+ DrawImpress, Draw, hidden ;
+ DrawImpress, DrawText, visible ;
+ DrawImpress, Graphic, hidden ;
+ DrawImpress, OutlineText, visible ;
+ DrawImpress, Table, visible ;
+ DrawImpress, TextObject, visible ;
+ WriterAndWeb, Annotation, visible ;
+ WriterAndWeb, DrawText, visible ;
+ WriterAndWeb, Table, visible ;
+ WriterAndWeb, Text, visible ;
+ WriterAndWeb, default, visible ;
+ </value>
+ </prop>
+ <prop oor:name="ImplementationURL" oor:type="xs:string">
+ <value>private:resource/toolpanel/SvxPanelFactory/TextPropertyPanel</value>
+ </prop>
+ <prop oor:name="OrderIndex" oor:type="xs:int">
+ <value>100</value>
+ </prop>
+ </node>
+
+ <node oor:name="ContextPanel" oor:op="replace">
+ <prop oor:name="Title" oor:type="xs:string">
+ <value xml:lang="en-US">Current Context (only for debugging)</value>
+ </prop>
+ <prop oor:name="Id" oor:type="xs:string">
+ <value>Context</value>
+ </prop>
+ <prop oor:name="DeckId" oor:type="xs:string">
+ <value>PropertyDeck</value>
+ </prop>
+ <prop oor:name="ContextList">
+ <value oor:separator=";">
+ none, none, visible ;
+ </value>
+ </prop>
+ <prop oor:name="ImplementationURL" oor:type="xs:string">
+ <value>private:resource/toolpanel/SvxPanelFactory/Debug_ContextPanel</value>
+ </prop>
+ <prop oor:name="OrderIndex" oor:type="xs:int">
+ <value>10</value>
+ </prop>
+ </node>
+
+ <node oor:name="PagePropertyPanel" oor:op="replace">
+ <prop oor:name="Title" oor:type="xs:string">
+ <value xml:lang="en-US">Page</value>
+ </prop>
+ <prop oor:name="Id" oor:type="xs:string">
+ <value>PagePropertyPanel</value>
+ </prop>
+ <prop oor:name="DeckId" oor:type="xs:string">
+ <value>PropertyDeck</value>
+ </prop>
+ <prop oor:name="DefaultMenuCommand">
+ <value>.uno:PageDialog</value>
+ </prop>
+ <prop oor:name="ContextList">
+ <value oor:separator=";">
+ Writer, Table, hidden ;
+ Writer, Text, hidden ;
+ Writer, default, hidden ;
+ </value>
+ </prop>
+ <prop oor:name="ImplementationURL" oor:type="xs:string">
+ <value>private:resource/toolpanel/SwPanelFactory/PagePropertyPanel</value>
+ </prop>
+ <prop oor:name="OrderIndex" oor:type="xs:int">
+ <value>300</value>
+ </prop>
+ </node>
+
+ <node oor:name="ColorPanel" oor:op="replace">
+ <prop oor:name="Title" oor:type="xs:string">
+ <value xml:lang="en-US">Colors (only for debugging)</value>
+ </prop>
+ <prop oor:name="Id" oor:type="xs:string">
+ <value>ColorPanel</value>
+ </prop>
+ <prop oor:name="DeckId" oor:type="xs:string">
+ <value>PropertyDeck</value>
+ </prop>
+ <prop oor:name="ContextList">
+ <value oor:separator=";">
+ none, any, visible ;
+ </value>
+ </prop>
+ <prop oor:name="ImplementationURL" oor:type="xs:string">
+ <value>private:resource/toolpanel/SvxPanelFactory/Debug_ColorPanel</value>
+ </prop>
+ <prop oor:name="OrderIndex" oor:type="xs:int">
+ <value>110</value>
+ </prop>
+ </node>
+
+ <node oor:name="AreaPropertyPanel" oor:op="replace">
+ <prop oor:name="Title" oor:type="xs:string">
+ <value xml:lang="en-US">Area</value>
+ </prop>
+ <prop oor:name="Id" oor:type="xs:string">
+ <value>AreaPropertyPanel</value>
+ </prop>
+ <prop oor:name="DeckId" oor:type="xs:string">
+ <value>PropertyDeck</value>
+ </prop>
+ <prop oor:name="DefaultMenuCommand">
+ <value>.uno:FormatArea</value>
+ </prop>
+ <prop oor:name="ContextList">
+ <value oor:separator=";">
+ Calc, Draw, visible ;
+ DrawImpress, 3DObject, visible ;
+ DrawImpress, Draw, visible ;
+ DrawImpress, TextObject, hidden ;
+ WriterAndWeb, Draw, visible ;
+ </value>
+ </prop>
+ <prop oor:name="ImplementationURL" oor:type="xs:string">
+ <value>private:resource/toolpanel/SvxPanelFactory/AreaPropertyPanel</value>
+ </prop>
+ <prop oor:name="OrderIndex" oor:type="xs:int">
+ <value>300</value>
+ </prop>
+ </node>
+
+ <node oor:name="LinePropertyPanel" oor:op="replace">
+ <prop oor:name="Title" oor:type="xs:string">
+ <value xml:lang="en-US">Line</value>
+ </prop>
+ <prop oor:name="Id" oor:type="xs:string">
+ <value>LinePropertyPanel</value>
+ </prop>
+ <prop oor:name="DeckId" oor:type="xs:string">
+ <value>PropertyDeck</value>
+ </prop>
+ <prop oor:name="DefaultMenuCommand">
+ <value>.uno:FormatLine</value>
+ </prop>
+ <prop oor:name="ContextList">
+ <value oor:separator=";">
+ Calc, Draw, visible ;
+ Calc, Graphic, visible ;
+ DrawImpress, 3DObject, visible ;
+ DrawImpress, Draw, visible ;
+ DrawImpress, Graphic, visible ;
+ DrawImpress, TextObject, hidden ;
+ WriterAndWeb, Draw, visible ;
+ </value>
+ </prop>
+ <prop oor:name="ImplementationURL" oor:type="xs:string">
+ <value>private:resource/toolpanel/SvxPanelFactory/LinePropertyPanel</value>
+ </prop>
+ <prop oor:name="OrderIndex" oor:type="xs:int">
+ <value>400</value>
+ </prop>
+ </node>
+
+ <node oor:name="GalleryPanel" oor:op="replace">
+ <prop oor:name="Title" oor:type="xs:string">
+ <value xml:lang="en-US">Gallery</value>
+ </prop>
+ <prop oor:name="TitleBarIsOptional" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ <prop oor:name="Id" oor:type="xs:string">
+ <value>GalleryPanel</value>
+ </prop>
+ <prop oor:name="DeckId" oor:type="xs:string">
+ <value>GalleryDeck</value>
+ </prop>
+ <prop oor:name="ContextList">
+ <value oor:separator=";">
+ any, any, visible ;
+ </value>
+ </prop>
+ <prop oor:name="ImplementationURL" oor:type="xs:string">
+ <value>private:resource/toolpanel/SvxPanelFactory/GalleryPanel</value>
+ </prop>
+ <prop oor:name="OrderIndex" oor:type="xs:int">
+ <value>100</value>
+ </prop>
+ </node>
+
+ <node oor:name="PosSizePropertyPanel" oor:op="replace">
+ <prop oor:name="Title" oor:type="xs:string">
+ <value xml:lang="en-US">Position and Size</value>
+ </prop>
+ <prop oor:name="Id" oor:type="xs:string">
+ <value>PosSizePropertyPanel</value>
+ </prop>
+ <prop oor:name="DeckId" oor:type="xs:string">
+ <value>PropertyDeck</value>
+ </prop>
+ <prop oor:name="DefaultMenuCommand">
+ <value>.uno:TransformDialog</value>
+ </prop>
+ <prop oor:name="ContextList">
+ <value oor:separator=";">
+ Calc, Chart, visible ;
+ Calc, Draw, hidden ;
+ Calc, Form, visible ;
+ Calc, Graphic, hidden ;
+ Calc, Media, visible ;
+ Calc, MultiObject, visible ;
+ Calc, OLE, visible ;
+ DrawImpress, 3DObject, visible ;
+ DrawImpress, Draw, hidden ;
+ DrawImpress, Form, visible ;
+ DrawImpress, Graphic, hidden ;
+ DrawImpress, Media, visible ;
+ DrawImpress, MultiObject, visible ;
+ DrawImpress, OLE, visible ;
+ DrawImpress, TextObject, hidden ;
+ WriterAndWeb, Draw, hidden ;
+ WriterAndWeb, Form, visible ;
+ WriterAndWeb, Graphic, visible, .uno:GraphicDialog ;
+ WriterAndWeb, Media, visible ;
+ WriterAndWeb, OLE, visible, .uno:FrameDialog ;
+ </value>
+ </prop>
+ <prop oor:name="ImplementationURL" oor:type="xs:string">
+ <value>private:resource/toolpanel/SvxPanelFactory/PosSizePropertyPanel</value>
+ </prop>
+ <prop oor:name="OrderIndex" oor:type="xs:int">
+ <value>500</value>
+ </prop>
+ </node>
+
+ <node oor:name="GraphicPropertyPanel" oor:op="replace">
+ <prop oor:name="Title" oor:type="xs:string">
+ <value xml:lang="en-US">Graphic</value>
+ </prop>
+ <prop oor:name="Id" oor:type="xs:string">
+ <value>GraphicPropertyPanel</value>
+ </prop>
+ <prop oor:name="DeckId" oor:type="xs:string">
+ <value>PropertyDeck</value>
+ </prop>
+ <prop oor:name="ContextList">
+ <value oor:separator=";">
+ Calc, Graphic, visible ;
+ DrawImpress, Graphic, visible ;
+ WriterAndWeb, Graphic, visible ;
+ </value>
+ </prop>
+ <prop oor:name="ImplementationURL" oor:type="xs:string">
+ <value>private:resource/toolpanel/SvxPanelFactory/GraphicPropertyPanel</value>
+ </prop>
+ <prop oor:name="OrderIndex" oor:type="xs:int">
+ <value>300</value>
+ </prop>
+ </node>
+
+ <node oor:name="Impress1" oor:op="replace">
+ <prop oor:name="Title" oor:type="xs:string">
+ <value xml:lang="en-US">Layouts</value>
+ </prop>
+ <prop oor:name="TitleBarIsOptional" oor:type="xs:boolean">
+ <value>false</value>
+ </prop>
+ <prop oor:name="Id" oor:type="xs:string">
+ <value>ImpressLayoutsPanel</value>
+ </prop>
+ <prop oor:name="DeckId" oor:type="xs:string">
+ <value>PropertyDeck</value>
+ </prop>
+ <prop oor:name="ContextList">
+ <value oor:separator=";">
+ Impress, DrawPage, visible ;
+ Impress, default, visible ;
+ Impress, HandoutPage, visible ;
+ Impress, NotesPage, visible ;
+ Impress, SlidesorterPage, visible ;
+ </value>
+ </prop>
+ <prop oor:name="ImplementationURL" oor:type="xs:string">
+ <value>private:resource/toolpanel/SdPanelFactory/Layouts</value>
+ </prop>
+ <prop oor:name="OrderIndex" oor:type="xs:int">
+ <value>100</value>
+ </prop>
+ </node>
+
+ <node oor:name="Impress2" oor:op="replace">
+ <prop oor:name="Title" oor:type="xs:string">
+ <value xml:lang="en-US">Used in This Presentation</value>
+ </prop>
+ <prop oor:name="TitleBarIsOptional" oor:type="xs:boolean">
+ <value>false</value>
+ </prop>
+ <prop oor:name="Id" oor:type="xs:string">
+ <value>UsedMasterPagesPanel</value>
+ </prop>
+ <prop oor:name="DeckId" oor:type="xs:string">
+ <value>MasterPagesDeck</value>
+ </prop>
+ <prop oor:name="ContextList">
+ <value oor:separator=";">
+ Impress, any, visible ;
+ </value>
+ </prop>
+ <prop oor:name="ImplementationURL" oor:type="xs:string">
+ <value>private:resource/toolpanel/SdPanelFactory/UsedMasterPages</value>
+ </prop>
+ <prop oor:name="OrderIndex" oor:type="xs:int">
+ <value>100</value>
+ </prop>
+ </node>
+
+ <node oor:name="Impress3" oor:op="replace">
+ <prop oor:name="Title" oor:type="xs:string">
+ <value xml:lang="en-US">Recently Used</value>
+ </prop>
+ <prop oor:name="TitleBarIsOptional" oor:type="xs:boolean">
+ <value>false</value>
+ </prop>
+ <prop oor:name="Id" oor:type="xs:string">
+ <value>RecentMasterPagesPanel</value>
+ </prop>
+ <prop oor:name="DeckId" oor:type="xs:string">
+ <value>MasterPagesDeck</value>
+ </prop>
+ <prop oor:name="ContextList">
+ <value oor:separator=";">
+ Impress, any, visible ;
+ </value>
+ </prop>
+ <prop oor:name="ImplementationURL" oor:type="xs:string">
+ <value>private:resource/toolpanel/SdPanelFactory/RecentMasterPages</value>
+ </prop>
+ <prop oor:name="OrderIndex" oor:type="xs:int">
+ <value>200</value>
+ </prop>
+ </node>
+
+ <node oor:name="Impress4" oor:op="replace">
+ <prop oor:name="Title" oor:type="xs:string">
+ <value xml:lang="en-US">Available for Use</value>
+ </prop>
+ <prop oor:name="TitleBarIsOptional" oor:type="xs:boolean">
+ <value>false</value>
+ </prop>
+ <prop oor:name="Id" oor:type="xs:string">
+ <value>AllMasterPagesPanel</value>
+ </prop>
+ <prop oor:name="DeckId" oor:type="xs:string">
+ <value>MasterPagesDeck</value>
+ </prop>
+ <prop oor:name="ContextList">
+ <value oor:separator=";">
+ Impress, any, visible ;
+ </value>
+ </prop>
+ <prop oor:name="ImplementationURL" oor:type="xs:string">
+ <value>private:resource/toolpanel/SdPanelFactory/AllMasterPages</value>
+ </prop>
+ <prop oor:name="OrderIndex" oor:type="xs:int">
+ <value>300</value>
+ </prop>
+ </node>
+
+ <node oor:name="Impress5" oor:op="replace">
+ <prop oor:name="Title" oor:type="xs:string">
+ <value xml:lang="en-US">Custom Animation</value>
+ </prop>
+ <prop oor:name="TitleBarIsOptional" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ <prop oor:name="Id" oor:type="xs:string">
+ <value>CustomAnimationPanel</value>
+ </prop>
+ <prop oor:name="DeckId" oor:type="xs:string">
+ <value>CustomAnimationDeck</value>
+ </prop>
+ <prop oor:name="ContextList">
+ <value oor:separator=";">
+ Impress, any, visible ;
+ </value>
+ </prop>
+ <prop oor:name="ImplementationURL" oor:type="xs:string">
+ <value>private:resource/toolpanel/SdPanelFactory/CustomAnimations</value>
+ </prop>
+ <prop oor:name="OrderIndex" oor:type="xs:int">
+ <value>100</value>
+ </prop>
+ </node>
+
+ <node oor:name="Impress6" oor:op="replace">
+ <prop oor:name="Title" oor:type="xs:string">
+ <value xml:lang="en-US">Slide Transition</value>
+ </prop>
+ <prop oor:name="TitleBarIsOptional" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ <prop oor:name="Id" oor:type="xs:string">
+ <value>SlideTransitionPanel</value>
+ </prop>
+ <prop oor:name="DeckId" oor:type="xs:string">
+ <value>SlideTransitionDeck</value>
+ </prop>
+ <prop oor:name="ContextList">
+ <value oor:separator=";">
+ Impress, any, visible ;
+ </value>
+ </prop>
+ <prop oor:name="ImplementationURL" oor:type="xs:string">
+ <value>private:resource/toolpanel/SdPanelFactory/SlideTransitions</value>
+ </prop>
+ <prop oor:name="OrderIndex" oor:type="xs:int">
+ <value>100</value>
+ </prop>
+ </node>
+
+ <node oor:name="Impress7" oor:op="replace">
+ <prop oor:name="Title" oor:type="xs:string">
+ <value xml:lang="en-US">Table Design</value>
+ </prop>
+ <prop oor:name="TitleBarIsOptional" oor:type="xs:boolean">
+ <value>false</value>
+ </prop>
+ <prop oor:name="Id" oor:type="xs:string">
+ <value>ImpressTableDesignPanel</value>
+ </prop>
+ <prop oor:name="DeckId" oor:type="xs:string">
+ <value>PropertyDeck</value>
+ </prop>
+ <prop oor:name="ContextList">
+ <value oor:separator=";">
+ Impress, Table, visible ;
+ </value>
+ </prop>
+ <prop oor:name="ImplementationURL" oor:type="xs:string">
+ <value>private:resource/toolpanel/SdPanelFactory/TableDesign</value>
+ </prop>
+ <prop oor:name="OrderIndex" oor:type="xs:int">
+ <value>300</value>
+ </prop>
+ </node>
+
+ <node oor:name="EmptyPanel" oor:op="replace">
+ <prop oor:name="TitleBarIsOptional" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ <prop oor:name="Title" oor:type="xs:string">
+ <value xml:lang="en-US">Empty</value>
+ </prop>
+ <prop oor:name="Id" oor:type="xs:string">
+ <value>EmptyPanel</value>
+ </prop>
+ <prop oor:name="DeckId" oor:type="xs:string">
+ <value>PropertyDeck</value>
+ </prop>
+ <prop oor:name="ContextList">
+ <value oor:separator=";">
+ any, empty, visible ;
+ </value>
+ </prop>
+ <prop oor:name="ImplementationURL" oor:type="xs:string">
+ <value>private:resource/toolpanel/SvxPanelFactory/EmptyPanel</value>
+ </prop>
+ <prop oor:name="OrderIndex" oor:type="xs:int">
+ <value>100</value>
+ </prop>
+ </node>
+
+ <node oor:name="AlignmentPropertyPanel" oor:op="replace">
+ <prop oor:name="Title" oor:type="xs:string">
+ <value xml:lang="en-US">Alignment</value>
+ </prop>
+ <prop oor:name="Id" oor:type="xs:string">
+ <value>AlignmentPropertyPanel</value>
+ </prop>
+ <prop oor:name="DeckId" oor:type="xs:string">
+ <value>PropertyDeck</value>
+ </prop>
+ <prop oor:name="DefaultMenuCommand">
+ <value>.uno:Hyphenate</value>
+ </prop>
+ <prop oor:name="ContextList">
+ <value oor:separator=";">
+ Calc, Auditing, visible ;
+ Calc, Cell, visible ;
+ Calc, default, visible ;
+ Calc, EditCell, visible ;
+ Calc, Pivot, visible ;
+ </value>
+ </prop>
+ <prop oor:name="ImplementationURL" oor:type="xs:string">
+ <value>private:resource/toolpanel/ScPanelFactory/AlignmentPropertyPanel</value>
+ </prop>
+ <prop oor:name="OrderIndex" oor:type="xs:int">
+ <value>200</value>
+ </prop>
+ </node>
+
+ <node oor:name="CellAppearancePropertyPanel" oor:op="replace">
+ <prop oor:name="Title" oor:type="xs:string">
+ <value xml:lang="en-US">Cell Appearance</value>
+ </prop>
+ <prop oor:name="Id" oor:type="xs:string">
+ <value>CellAppearancePropertyPanel</value>
+ </prop>
+ <prop oor:name="DeckId" oor:type="xs:string">
+ <value>PropertyDeck</value>
+ </prop>
+ <prop oor:name="DefaultMenuCommand">
+ <value>.uno:FormatCellDialg</value>
+ </prop>
+ <prop oor:name="ContextList">
+ <value oor:separator=";">
+ Calc, Auditing, visible ;
+ Calc, Cell, visible ;
+ Calc, default, visible ;
+ Calc, Pivot, visible ;
+ </value>
+ </prop>
+ <prop oor:name="ImplementationURL" oor:type="xs:string">
+ <value>private:resource/toolpanel/ScPanelFactory/CellAppearancePropertyPanel</value>
+ </prop>
+ <prop oor:name="OrderIndex" oor:type="xs:int">
+ <value>300</value>
+ </prop>
+ </node>
+
+ <node oor:name="NumberFormatPropertyPanel" oor:op="replace">
+ <prop oor:name="Title" oor:type="xs:string">
+ <value xml:lang="en-US">Number Format</value>
+ </prop>
+ <prop oor:name="Id" oor:type="xs:string">
+ <value>NumberFormatPropertyPanel</value>
+ </prop>
+ <prop oor:name="DeckId" oor:type="xs:string">
+ <value>PropertyDeck</value>
+ </prop>
+ <prop oor:name="DefaultMenuCommand">
+ <value>.uno:FormatCellDialog</value>
+ </prop>
+ <prop oor:name="ContextList">
+ <value oor:separator=";">
+ Calc, Auditing, hidden ;
+ Calc, Cell, hidden ;
+ Calc, default, hidden ;
+ Calc, Pivot, hidden ;
+ </value>
+ </prop>
+ <prop oor:name="ImplementationURL" oor:type="xs:string">
+ <value>private:resource/toolpanel/ScPanelFactory/NumberFormatPropertyPanel</value>
+ </prop>
+ <prop oor:name="OrderIndex" oor:type="xs:int">
+ <value>400</value>
+ </prop>
+ </node>
+
+ <node oor:name="ParaPropertyPanel" oor:op="replace">
+ <prop oor:name="Title" oor:type="xs:string">
+ <value xml:lang="en-US">Paragraph</value>
+ </prop>
+ <prop oor:name="Id" oor:type="xs:string">
+ <value>ParaPropertyPanel</value>
+ </prop>
+ <prop oor:name="DeckId" oor:type="xs:string">
+ <value>PropertyDeck</value>
+ </prop>
+ <prop oor:name="DefaultMenuCommand">
+ <value>.uno:ParagraphDialog</value>
+ </prop>
+ <prop oor:name="ContextList">
+ <value oor:separator=";">
+ Calc, DrawText, visible ;
+ DrawImpress, 3DObject, hidden ;
+ DrawImpress, Draw, hidden ;
+ DrawImpress, DrawText, visible ;
+ DrawImpress, Graphic, hidden ;
+ DrawImpress, Table, visible ;
+ DrawImpress, TextObject, visible ;
+ WriterAndWeb, Annotation, visible ;
+ WriterAndWeb, DrawText, visible ;
+ WriterAndWeb, Table, visible ;
+ WriterAndWeb, Text, visible ;
+ WriterAndWeb, default, visible ;
+ </value>
+ </prop>
+ <prop oor:name="ImplementationURL" oor:type="xs:string">
+ <value>private:resource/toolpanel/SvxPanelFactory/ParaPropertyPanel</value>
+ </prop>
+ <prop oor:name="OrderIndex" oor:type="xs:int">
+ <value>200</value>
+ </prop>
+ </node>
+
+ <node oor:name="WrapPropertyPanel" oor:op="replace">
+ <prop oor:name="Title" oor:type="xs:string">
+ <value xml:lang="en-US">Wrap</value>
+ </prop>
+ <prop oor:name="Id" oor:type="xs:string">
+ <value>WrapPropertyPanel</value>
+ </prop>
+ <prop oor:name="DeckId" oor:type="xs:string">
+ <value>PropertyDeck</value>
+ </prop>
+ <prop oor:name="DefaultMenuCommand">
+ <value>.uno:ObjectWrapDialog</value>
+ </prop>
+ <prop oor:name="ContextList">
+ <value oor:separator=";">
+ Writer, Graphic, visible ;
+ Writer, OLE, visible ;
+ Writer, Frame, visible ;
+ </value>
+ </prop>
+ <prop oor:name="ImplementationURL" oor:type="xs:string">
+ <value>private:resource/toolpanel/SwPanelFactory/WrapPropertyPanel</value>
+ </prop>
+ <prop oor:name="OrderIndex" oor:type="xs:int">
+ <value>500</value>
+ </prop>
+ </node>
+
+ <node oor:name="SwNavigatorPanel" oor:op="replace">
+ <prop oor:name="Title" oor:type="xs:string">
+ <value xml:lang="en-US">Navigator</value>
+ </prop>
+ <prop oor:name="TitleBarIsOptional" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ <prop oor:name="Id" oor:type="xs:string">
+ <value>SwNavigatorPanel</value>
+ </prop>
+ <prop oor:name="DeckId" oor:type="xs:string">
+ <value>NavigatorDeck</value>
+ </prop>
+ <prop oor:name="ContextList">
+ <value oor:separator=";">
+ WriterAndWeb, any, visible ;
+ </value>
+ </prop>
+ <prop oor:name="ImplementationURL" oor:type="xs:string">
+ <value>private:resource/toolpanel/SwPanelFactory/NavigatorPanel</value>
+ </prop>
+ <prop oor:name="OrderIndex" oor:type="xs:int">
+ <value>100</value>
+ </prop>
+ </node>
+
+ <node oor:name="ScNavigatorPanel" oor:op="replace">
+ <prop oor:name="Title" oor:type="xs:string">
+ <value xml:lang="en-US">Navigator</value>
+ </prop>
+ <prop oor:name="TitleBarIsOptional" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ <prop oor:name="Id" oor:type="xs:string">
+ <value>ScNavigatorPanel</value>
+ </prop>
+ <prop oor:name="DeckId" oor:type="xs:string">
+ <value>NavigatorDeck</value>
+ </prop>
+ <prop oor:name="ContextList">
+ <value oor:separator=";">
+ Calc, any, visible ;
+ </value>
+ </prop>
+ <prop oor:name="ImplementationURL" oor:type="xs:string">
+ <value>private:resource/toolpanel/ScPanelFactory/NavigatorPanel</value>
+ </prop>
+ <prop oor:name="OrderIndex" oor:type="xs:int">
+ <value>100</value>
+ </prop>
+ </node>
+
+ <node oor:name="SdNavigatorPanel" oor:op="replace">
+ <prop oor:name="Title" oor:type="xs:string">
+ <value xml:lang="en-US">Navigator</value>
+ </prop>
+ <prop oor:name="TitleBarIsOptional" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ <prop oor:name="Id" oor:type="xs:string">
+ <value>SdNavigatorPanel</value>
+ </prop>
+ <prop oor:name="DeckId" oor:type="xs:string">
+ <value>NavigatorDeck</value>
+ </prop>
+ <prop oor:name="ContextList">
+ <value oor:separator=";">
+ DrawImpress, any, visible ;
+ </value>
+ </prop>
+ <prop oor:name="ImplementationURL" oor:type="xs:string">
+ <value>private:resource/toolpanel/SdPanelFactory/NavigatorPanel</value>
+ </prop>
+ <prop oor:name="OrderIndex" oor:type="xs:int">
+ <value>100</value>
+ </prop>
+ </node>
+
+ <node oor:name="StyleListPanel" oor:op="replace">
+ <prop oor:name="Title" oor:type="xs:string">
+ <value xml:lang="en-US">Styles and Formatting</value>
+ </prop>
+ <prop oor:name="TitleBarIsOptional" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ <prop oor:name="Id" oor:type="xs:string">
+ <value>StyleListPanel</value>
+ </prop>
+ <prop oor:name="DeckId" oor:type="xs:string">
+ <value>StyleListDeck</value>
+ </prop>
+ <prop oor:name="ContextList">
+ <value oor:separator=";">
+ any, any, visible ;
+ </value>
+ </prop>
+ <prop oor:name="ImplementationURL" oor:type="xs:string">
+ <value>private:resource/toolpanel/SvxPanelFactory/StyleListPanel</value>
+ </prop>
+ <prop oor:name="OrderIndex" oor:type="xs:int">
+ <value>100</value>
+ </prop>
+ </node>
+
+ <node oor:name="FunctionsPanel" oor:op="replace">
+ <prop oor:name="Title" oor:type="xs:string">
+ <value xml:lang="en-US">Functions</value>
+ </prop>
+ <prop oor:name="TitleBarIsOptional" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ <prop oor:name="Id" oor:type="xs:string">
+ <value>FunctionsPanel</value>
+ </prop>
+ <prop oor:name="DeckId" oor:type="xs:string">
+ <value>FunctionsDeck</value>
+ </prop>
+ <prop oor:name="ContextList">
+ <value oor:separator=";">
+ Calc, any, visible ;
+ </value>
+ </prop>
+ <prop oor:name="ImplementationURL" oor:type="xs:string">
+ <value>private:resource/toolpanel/ScPanelFactory/FunctionsPanel</value>
+ </prop>
+ <prop oor:name="OrderIndex" oor:type="xs:int">
+ <value>100</value>
+ </prop>
+ </node>
+
+ </node>
+ </node>
+</oor:component-data>
diff --git a/officecfg/registry/data/org/openoffice/Office/Views.xcu b/officecfg/registry/data/org/openoffice/Office/Views.xcu
index bd3a06b093c4..81f56d26c983 100644
--- a/officecfg/registry/data/org/openoffice/Office/Views.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Views.xcu
@@ -24,5 +24,11 @@
<value>false</value>
</prop>
</node>
+ <!-- show Sidebar child window by default - oor:name == SID_SIDEBAR -->
+ <node oor:name="10336" oor:op="replace">
+ <prop oor:name="Visible" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ </node>
</node>
</oor:component-data>
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs
new file mode 100644
index 000000000000..dc76c5975f89
--- /dev/null
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs
@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ -->
+<!DOCTYPE oor:component-schema SYSTEM "../../../../../component-schema.dtd">
+<oor:component-schema
+ xmlns:oor="http://openoffice.org/2001/registry"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ oor:name="Sidebar"
+ oor:package="org.openoffice.Office.UI"
+ xml:lang="en-US">
+ <info>
+ <author>Andre Fischer</author>
+ <desc>Specification of decks and content panels of the sidebar.</desc>
+ </info>
+ <templates>
+ <group oor:name="Deck">
+ <info>
+ <desc>Specification of a sidebar deck which is a container of content panels.</desc>
+ </info>
+ <prop oor:name="Title" oor:type="xs:string" oor:localized="true">
+ <info>
+ <desc>The deck title is displayed above the content panels.</desc>
+ </info>
+ <value></value>
+ </prop>
+ <prop oor:name="Id" oor:type="xs:string" oor:localized="false">
+ <info>
+ <desc>Internally used to identify the deck. Not displayed in the UI.</desc>
+ </info>
+ <value></value>
+ </prop>
+ <prop oor:name="IconURL" oor:type="xs:string">
+ <info>
+ <desc>This icon is displayed in the sidebar tab bar.
+ Any URL scheme supported by the com.sun.star.graphic.GraphicProvider service is suitable here.</desc>
+ </info>
+ <value></value>
+ </prop>
+ <prop oor:name="HighContrastIconURL" oor:type="xs:string">
+ <info>
+ <desc>This icon is displayed in the sidebar tab bar when high contrast mode is active.
+ Any URL scheme supported by the com.sun.star.graphic.GraphicProvider service is suitable here.</desc>
+ </info>
+ <value></value>
+ </prop>
+ <prop oor:name="HelpURL" oor:type="xs:string">
+ <info>
+ <desc>Help about the sidebar deck.</desc>
+ </info>
+ <value></value>
+ </prop>
+ <prop oor:name="ContextList" oor:type="oor:string-list">
+ <info><desc>
+ List of context descriptors. Each context descriptor is a string that contains four comma
+ separated values (note that values are case sensitive):
+ 1 Application name. Valid values are
+ com.sun.star.text.TextDocument
+ com.sun.star.sheet.SpreadsheetDocument
+ com.sun.star.presentation.PresentationDocument
+ com.sun.star.drawing.DrawingDocument
+
+ Recognized shortcuts:
+ Writer
+ Calc
+ Impress
+ Draw
+
+ Shortcuts for multiple applications:
+ DrawImpress
+ WriterAndWeb
+ These shortcuts exist for even more convenience and handle the frequent case of Draw
+ and Impress as well as Writer and WriterWeb having otherwise identical context descriptions.
+
+ Special values:
+ any
+ none
+
+ 2 Context name
+ Know context names are 3DObject, Annotation, Auditing, Cell, Chart, Draw, DrawPage, DrawText,
+ EditCell, Form, Frame, Graphic, HandoutPage, MasterPage, Media, Multiobj, OLE, OutlineText,
+ Pivot, SlidesorterPage, Table, Text, TextObject,
+ default
+
+ Special values:
+ any
+
+ 3 Panel state. One of
+ visible Panel is initially visible and expanded
+ hidden Panel is initially collapsed, ie only its title bar is visible
+
+ 4 (Optional, only used for panels) UNO command that overrides the DefaultMenuCommand. Use
+ the special value none to override the DefaultMenuCommand to the empty string and thereby
+ disable the showing of a) the menu button in the panel titlebar and b) the showing of a dialog.
+ </desc></info>
+ </prop>
+ <prop oor:name="OrderIndex" oor:type="xs:int">
+ <info>
+ <desc>Index used for ordering decks in the tab bar. Smaller values correspond to positions nearer to the top of the tab bar.</desc>
+ </info>
+ <value>10000</value>
+ </prop>
+ </group>
+ <group oor:name="Panel">
+ <info>
+ <desc>Specification of a sidebar content panel.</desc>
+ </info>
+ <prop oor:name="Title" oor:type="xs:string" oor:localized="true">
+ <info>
+ <desc>The panel title is displayed above the content panel.</desc>
+ </info>
+ <value></value>
+ </prop>
+ <prop oor:name="TitleBarIsOptional" oor:type="xs:boolean">
+ <info>
+ <desc>When true then the title bar can be ommitted when the panel is the only panel in a deck.</desc>
+ </info>
+ <value>false</value>
+ </prop>
+ <prop oor:name="Id" oor:type="xs:string" oor:localized="false">
+ <info>
+ <desc>Internally used to identify the panel.</desc>
+ </info>
+ <value></value>
+ </prop>
+ <prop oor:name="DeckId" oor:type="xs:string" oor:localized="false">
+ <info>
+ <desc>Id of the deck to which the panel belongs.</desc>
+ </info>
+ <value></value>
+ </prop>
+ <prop oor:name="HelpURL" oor:type="xs:string">
+ <info>
+ <desc>Help about the sidebar content panel.</desc>
+ </info>
+ <value></value>
+ </prop>
+ <prop oor:name="DefaultMenuCommand" oor:type="xs:string">
+ <info><desc>
+ The default UNO command to execute when the user clicks on the menu button in the panel title bar.
+ Can be overriden in the ContextList to provide context dependent menu dialogs.
+ When empty then the menu icon is not shown in the panel title bar.
+ </desc></info>
+ <value></value>
+ </prop>
+ <prop oor:name="ContextList" oor:type="oor:string-list">
+ <info>
+ <desc>For documentation, please see the Deck/ContextList.</desc>
+ </info>
+ </prop>
+ <prop oor:name="ImplementationURL" oor:type="xs:string">
+ <info>
+ <desc>URL by which the implementation of the panel is known by its factory.</desc>
+ </info>
+ <value></value>
+ </prop>
+ <prop oor:name="OrderIndex" oor:type="xs:int">
+ <info>
+ <desc>Index used for ordering panels inside a deck. Smaller values correspond to positions nearer to the top of the deck.</desc>
+ </info>
+ <value>10000</value>
+ </prop>
+ <prop oor:name="WantsCanvas" oor:type="xs:boolean">
+ <info>
+ <desc>Experimental: Set to true when panel wants to paint its content via a XCanvas.</desc>
+ </info>
+ <value>false</value>
+ </prop>
+ </group>
+ </templates>
+ <component>
+ <group oor:name="Content">
+ <info>
+ <desc>Description of the decks and panels that can be displayed in the content area of the sidebar.</desc>
+ </info>
+ <set oor:name="DeckList" oor:node-type="Deck">
+ <info>
+ <desc>Contains all registered sidebar decks.</desc>
+ </info>
+ </set>
+ <set oor:name="PanelList" oor:node-type="Panel">
+ <info>
+ <desc>Contains all registered sidebar content panels.</desc>
+ </info>
+ </set>
+ </group>
+ </component>
+</oor:component-schema>
diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk
index b84859bcd934..fa2b1399848c 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -194,6 +194,7 @@ postprocess_FILES_main := \
$(postprocess_XCS)/Office/UI/GenericCategories.xcs \
$(postprocess_XCS)/Office/UI/GenericCommands.xcs \
$(postprocess_XCS)/Office/UI/GlobalSettings.xcs \
+ $(postprocess_XCS)/Office/UI/Sidebar.xcs \
$(postprocess_XCS)/Office/UI/StartModuleCommands.xcs \
$(postprocess_XCS)/Office/UI/StartModuleWindowState.xcs \
$(postprocess_XCS)/Office/UI/WindowContentFactories.xcs \
@@ -257,6 +258,7 @@ postprocess_FILES_main := \
$(postprocess_XCU)/Office/UI/Factories.xcu \
$(postprocess_XCU)/Office/UI/GenericCategories.xcu \
$(postprocess_XCU)/Office/UI/GenericCommands.xcu \
+ $(postprocess_XCU)/Office/UI/Sidebar.xcu \
$(postprocess_XCU)/Office/UI/StartModuleCommands.xcu \
$(postprocess_XCU)/Office/UI/StartModuleWindowState.xcu \
$(postprocess_XCU)/Office/UI.xcu \
diff --git a/sc/AllLangResTarget_sc.mk b/sc/AllLangResTarget_sc.mk
index 8a486378b580..dbfcd2b4e555 100644
--- a/sc/AllLangResTarget_sc.mk
+++ b/sc/AllLangResTarget_sc.mk
@@ -84,6 +84,9 @@ $(eval $(call gb_SrsTarget_add_files,sc/res,\
sc/source/ui/miscdlgs/acredlin.src \
sc/source/ui/formdlg/formdlgs.src \
sc/source/ui/formdlg/dwfunctr.src \
+ sc/source/ui/sidebar/AlignmentPropertyPanel.src \
+ sc/source/ui/sidebar/CellAppearancePropertyPanel.src \
+ sc/source/ui/sidebar/NumberFormatPropertyPanel.src \
sc/source/core/src/compiler.src \
))
diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index 2903aa67525d..9383e30b721c 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -439,6 +439,16 @@ $(eval $(call gb_Library_add_exception_objects,sc,\
sc/source/ui/navipi/scenwnd \
sc/source/ui/pagedlg/areasdlg \
sc/source/ui/pagedlg/tphfedit \
+ sc/source/ui/sidebar/AlignmentPropertyPanel \
+ sc/source/ui/sidebar/CellLineStyleControl \
+ sc/source/ui/sidebar/CellLineStylePopup \
+ sc/source/ui/sidebar/CellLineStyleValueSet \
+ sc/source/ui/sidebar/CellBorderUpdater \
+ sc/source/ui/sidebar/CellAppearancePropertyPanel \
+ sc/source/ui/sidebar/CellBorderStyleControl \
+ sc/source/ui/sidebar/CellBorderStylePopup \
+ sc/source/ui/sidebar/NumberFormatPropertyPanel \
+ sc/source/ui/sidebar/ScPanelFactory \
sc/source/ui/undo/areasave \
sc/source/ui/undo/refundo \
sc/source/ui/undo/target \
diff --git a/sc/inc/ScPanelFactory.hxx b/sc/inc/ScPanelFactory.hxx
new file mode 100644
index 000000000000..bb84705f8d5b
--- /dev/null
+++ b/sc/inc/ScPanelFactory.hxx
@@ -0,0 +1,66 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#ifndef SC_SIDEBAR_PANEL_FACTORY_HXX
+#define SC_SIDEBAR_PANEL_FACTORY_HXX
+
+#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/basemutex.hxx>
+#include <com/sun/star/ui/XUIElementFactory.hpp>
+#include <boost/noncopyable.hpp>
+
+namespace css = ::com::sun::star;
+namespace cssu = ::com::sun::star::uno;
+
+namespace sc { namespace sidebar {
+
+namespace
+{
+ typedef ::cppu::WeakComponentImplHelper1 <
+ css::ui::XUIElementFactory
+ > PanelFactoryInterfaceBase;
+}
+
+
+class ScPanelFactory
+ : private ::boost::noncopyable,
+ private ::cppu::BaseMutex,
+ public PanelFactoryInterfaceBase
+{
+public:
+ static ::rtl::OUString SAL_CALL getImplementationName(void);
+ static cssu::Reference<cssu::XInterface> SAL_CALL createInstance(
+ const cssu::Reference<css::lang::XMultiServiceFactory>& rxFactory);
+ static cssu::Sequence<rtl::OUString> SAL_CALL getSupportedServiceNames(void);
+
+ ScPanelFactory(void);
+ virtual ~ScPanelFactory(void);
+
+ // XUIElementFactory
+ cssu::Reference<css::ui::XUIElement> SAL_CALL createUIElement(
+ const ::rtl::OUString& rsResourceURL,
+ const ::cssu::Sequence<css::beans::PropertyValue>& rArguments)
+ throw(
+ css::container::NoSuchElementException,
+ css::lang::IllegalArgumentException,
+ cssu::RuntimeException );
+};
+
+
+} } // end of namespace sc::sidebar
+
+#endif
diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h
index 5a3d02894615..3eff53e0dad1 100644
--- a/sc/inc/helpids.h
+++ b/sc/inc/helpids.h
@@ -313,6 +313,74 @@
#define HID_MN_FORMAT_ALGN "SC_HID_MN_FORMAT_ALGN"
#define HID_MN_FORMAT_LINESPACE "SC_HID_MN_FORMAT_LINESPACE"
+// sidebar -----------------------------------------
+// AlignmentPropertyPanel -----------------------------------------
+#define HID_PROPERTYPANEL_SC_ALIGN_SECTION "SC_HID_PROPERTYPANEL_SC_ALIGN_SECTION"
+#define HID_PROPERTY_PANEL_ALIGN_TBX_HOR "SC_HID_PROPERTY_PANEL_ALIGN_TBX_HOR"
+#define HID_PROPERTY_PANEL_ALIGN_TBI_HOR_L "SC_HID_PROPERTY_PANEL_ALIGN_TBI_HOR_L"
+#define HID_PROPERTY_PANEL_ALIGN_TBI_HOR_C "SC_HID_PROPERTY_PANEL_ALIGN_TBI_HOR_C"
+#define HID_PROPERTY_PANEL_ALIGN_TBI_HOR_R "SC_HID_PROPERTY_PANEL_ALIGN_TBI_HOR_R"
+#define HID_PROPERTY_PANEL_ALIGN_TBI_HOR_J "SC_HID_PROPERTY_PANEL_ALIGN_TBI_HOR_J"
+#define HID_PROPERTY_PANEL_ALIGN_TBX_VER "SC_HID_PROPERTY_PANEL_ALIGN_TBX_VER"
+#define HID_PROPERTY_PANEL_ALIGN_TBI_VER_T "SC_HID_PROPERTY_PANEL_ALIGN_TBI_VER_T"
+#define HID_PROPERTY_PANEL_ALIGN_TBI_VER_C "SC_HID_PROPERTY_PANEL_ALIGN_TBI_VER_C"
+#define HID_PROPERTY_PANEL_ALIGN_TBI_VER_B "SC_HID_PROPERTY_PANEL_ALIGN_TBI_VER_B"
+#define HID_PROPERTY_PANEL_ALIGN_MBX_INDENT "SC_HID_PROPERTY_PANEL_ALIGN_MBX_INDENT"
+#define HID_PROPERTY_PANEL_ALIGN_CBX_WRAP "SC_HID_PROPERTY_PANEL_ALIGN_CBX_WRAP"
+#define HID_PROPERTY_PANEL_ALIGN_CBX_MERGE "SC_HID_PROPERTY_PANEL_ALIGN_CBX_MERGE"
+#define HID_PROPERTY_PANEL_ALIGN_MBX_ANGLE "SC_HID_PROPERTY_PANEL_ALIGN_MBX_ANGLE"
+#define HID_PROPERTY_PANEL_ALIGN_DIAL_CONTROL "SC_HID_PROPERTY_PANEL_ALIGN_DIAL_CONTROL"
+#define HID_PROPERTY_PANEL_ALIGN_CBX_VERT "SC_HID_PROPERTY_PANEL_ALIGN_CBX_VERT"
+
+// CellAppearancePropertyPanel -----------------------------------------
+#define HID_PROPERTYPANEL_SC_CELL_SECTION "SC_HID_PROPERTYPANEL_SC_CELL_SECTION"
+#define HID_PROPERTYPANEL_SC_TBX_BKCOLOR "SC_HID_PROPERTYPANEL_SC_TBX_BKCOLOR"
+#define HID_PROPERTYPANEL_SC_TBI_BKCOLOR "SC_HID_PROPERTYPANEL_SC_TBI_BKCOLOR"
+#define HID_PROPERTYPANEL_SC_TBX_BORDER "SC_HID_PROPERTYPANEL_SC_TBX_BORDER"
+#define HID_PROPERTYPANEL_SC_TBI_BORDER "SC_HID_PROPERTYPANEL_SC_TBI_BORDER"
+#define HID_PROPERTYPANEL_SC_TBX_STYLE "SC_HID_PROPERTYPANEL_SC_TBX_STYLE"
+#define HID_PROPERTYPANEL_SC_TBI_STYLE "SC_HID_PROPERTYPANEL_SC_TBI_STYLE"
+#define HID_PROPERTYPANEL_SC_TBX_LINECOLOR "SC_HID_PROPERTYPANEL_SC_TBX_LINECOLOR"
+#define HID_PROPERTYPANEL_SC_TBI_LINECOLOR "SC_HID_PROPERTYPANEL_SC_TBI_LINECOLOR"
+#define HID_PROPERTYPANEL_SC_CBOX_SHOWGRID "SC_HID_PROPERTYPANEL_SC_CBOX_SHOWGRID"
+#define HID_PROPERTYPANEL_FILL_COLOR_VS "SC_HID_PROPERTYPANEL_FILL_COLOR_VS"
+#define HID_PROPERTYPANEL_LINE_COLOR_VS "SC_HID_PROPERTYPANEL_LINE_COLOR_VS"
+#define HID_PROPERTYPANEL_SC_STYLE_VS "SC_HID_PROPERTYPANEL_SC_STYLE_VS"
+#define HID_PROPERTYPANEL_SC_STYLE_PB "SC_HID_PROPERTYPANEL_SC_STYLE_PB"
+#define HID_PROPERTYPANEL_SC_BORDER1_TBX "SC_HID_PROPERTYPANEL_SC_BORDER1_TBX"
+#define HID_PROPERTYPANEL_SC_BORDER_TBI_NONE "SC_HID_PROPERTYPANEL_SC_BORDER_TBI_NONE"
+#define HID_PROPERTYPANEL_SC_BORDER_TBI_ALL "SC_HID_PROPERTYPANEL_SC_BORDER_TBI_ALL"
+#define HID_PROPERTYPANEL_SC_BORDER_TBI_OUTER "SC_HID_PROPERTYPANEL_SC_BORDER_TBI_OUTER"
+#define HID_PROPERTYPANEL_SC_BORDER_TBI_OUTERBOLD "SC_HID_PROPERTYPANEL_SC_BORDER_TBI_OUTERBOLD"
+#define HID_PROPERTYPANEL_SC_BORDER2_TBX "SC_HID_PROPERTYPANEL_SC_BORDER2_TBX"
+#define HID_PROPERTYPANEL_SC_BORDER3_TBX "SC_HID_PROPERTYPANEL_SC_BORDER3_TBX"
+#define HID_PROPERTYPANEL_SC_BORDER_TBI_S1 "SC_HID_PROPERTYPANEL_SC_BORDER_TBI_S1"
+#define HID_PROPERTYPANEL_SC_BORDER_TBI_S2 "SC_HID_PROPERTYPANEL_SC_BORDER_TBI_S2"
+#define HID_PROPERTYPANEL_SC_BORDER_TBI_S3 "SC_HID_PROPERTYPANEL_SC_BORDER_TBI_S3"
+#define HID_PROPERTYPANEL_SC_BORDER_TBI_S4 "SC_HID_PROPERTYPANEL_SC_BORDER_TBI_S4"
+#define HID_PROPERTYPANEL_SC_BORDER_TBI_LEFT "SC_HID_PROPERTYPANEL_SC_BORDER_TBI_LEFT"
+#define HID_PROPERTYPANEL_SC_BORDER_TBI_RIGHT "SC_HID_PROPERTYPANEL_SC_BORDER_TBI_RIGHT"
+#define HID_PROPERTYPANEL_SC_BORDER_TBI_TOP "SC_HID_PROPERTYPANEL_SC_BORDER_TBI_TOP"
+#define HID_PROPERTYPANEL_SC_BORDER_TBI_BOT "SC_HID_PROPERTYPANEL_SC_BORDER_TBI_BOT"
+#define HID_PROPERTYPANEL_SC_BORDER_TBI_BLTR "SC_HID_PROPERTYPANEL_SC_BORDER_TBI_BLTR"
+#define HID_PROPERTYPANEL_SC_BORDER_TBI_TLBR "SC_HID_PROPERTYPANEL_SC_BORDER_TBI_TLBR"
+#define HID_PROPERTYPANEL_SC_BORDER_TBI_TOPBOT "SC_HID_PROPERTYPANEL_SC_BORDER_TBI_TOPBOT"
+#define HID_PROPERTYPANEL_SC_BORDER_TBI_LEFTRIGHT "SC_HID_PROPERTYPANEL_SC_BORDER_TBI_LEFTRIGHT"
+
+// NumberFormatPropertyPanel -----------------------------------------
+#define HID_PROPERTYPANEL_SC_NUM_SECTION "SC_HID_PROPERTYPANEL_SC_NUM_SECTION"
+#define HID_PROPERTY_PANEL_NUMFMT_LB_CATEGORY "SC_HID_PROPERTY_PANEL_NUMFMT_LB_CATEGORY"
+#define HID_PROPERTY_PANEL_NUMFMT_TBX_CATEGORY "SC_HID_PROPERTY_PANEL_NUMFMT_TBX_CATEGORY"
+#define HID_PROPERTY_PANEL_NUMFMT_ID_NUMBER "SC_HID_PROPERTY_PANEL_NUMFMT_ID_NUMBER"
+#define HID_PROPERTY_PANEL_NUMFMT_ID_PERCENT "SC_HID_PROPERTY_PANEL_NUMFMT_ID_PERCENT"
+#define HID_PROPERTY_PANEL_NUMFMT_ID_CURRENCY "SC_HID_PROPERTY_PANEL_NUMFMT_ID_CURRENCY"
+#define HID_PROPERTY_PANEL_NUMFMT_ID_DATE "SC_HID_PROPERTY_PANEL_NUMFMT_ID_DATE"
+#define HID_PROPERTY_PANEL_NUMFMT_ID_TEXT "SC_HID_PROPERTY_PANEL_NUMFMT_ID_TEXT"
+#define HID_PROPERTY_PANEL_NUMFMT_ED_DECIMALS "SC_HID_PROPERTY_PANEL_NUMFMT_ED_DECIMALS"
+#define HID_PROPERTY_PANEL_NUMFMT_ED_LEADZEROES "SC_HID_PROPERTY_PANEL_NUMFMT_ED_LEADZEROES"
+#define HID_PROPERTY_PANEL_NUMFMT_BTN_NEGRED "SC_HID_PROPERTY_PANEL_NUMFMT_BTN_NEGRED"
+#define HID_PROPERTY_PANEL_NUMFMT_BTN_THOUSAND "SC_HID_PROPERTY_PANEL_NUMFMT_BTN_THOUSAND"
+
// Ende Hilfe IDs ------------------------------------------------------------
#define HID_FUNC_DBANZAHL "SC_HID_FUNC_DBANZAHL"
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 23a5088df562..c18cbcdc1d5e 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -41,6 +41,8 @@
// SC_FUNCTION_END (SID_SC_START + 299)
#define SC_PARAM_START (SID_SC_START + 300)
// SC_PARAM_END (SID_SC_START + 399)
+#define SC_SIDEBAR_PROPERTY_BEGIN (SID_SC_START + 400)
+// SC_SIDEBAR_PROPERTY_END (SID_SC_START + 499)
// stay compatible to the past
#define SC_RESOURCE_START (RID_APP_START+5000)
@@ -654,6 +656,11 @@
#define SID_SORT_USERDEF (SC_PARAM_START+4)
#define SID_SORT_NATURALSORT (SC_PARAM_START+5)
+// Sidebar -------------------------------------------------------------
+
+#define SID_SCGRIDSHOW (SC_SIDEBAR_PROPERTY_BEGIN+1)
+#define SID_NUMBER_TYPE_FORMAT (SC_SIDEBAR_PROPERTY_BEGIN+2)
+
// resources
#define RID_OBJECTBAR_APP (SC_RESOURCE_START)
@@ -1089,7 +1096,18 @@
#define RID_SCDLG_COND_FORMAT_MANAGER (SC_DIALOGS_START + 159)
#define RID_SCDLG_XML_SOURCE (SC_DIALOGS_START + 160)
-#define SC_DIALOGS_END (SC_DIALOGS_START + 161)
+// defines for AlignmentPropertyPanel
+#define RID_PROPERTYPANEL_SC_ALIGNMENT (SC_DIALOGS_START + 161)
+
+// defines for CellAppearancePropertyPanel
+#define RID_PROPERTYPANEL_SC_APPEAR (SC_DIALOGS_START + 162)
+#define RID_POPUPPANEL_CELLAPPEARANCE_FILLCOLOR (SC_DIALOGS_START + 163)
+#define RID_POPUPPANEL_CELLAPPEARANCE_LINECOLOR (SC_DIALOGS_START + 164)
+#define RID_POPUPPANEL_APPEARANCE_CELL_LINESTYLE (SC_DIALOGS_START + 165)
+#define RID_POPUPPANEL_APPEARANCE_CELL_BORDERSTYLE (SC_DIALOGS_START + 166)
+#define RID_PROPERTYPANEL_SC_NUMBERFORMAT (SC_DIALOGS_START + 167)
+
+#define SC_DIALOGS_END (RID_PROPERTYPANEL_SC_NUMBERFORMAT+1)
#ifndef STD_MASKCOLOR
#define STD_MASKCOLOR Color { Red = 0xFF00; Green = 0x0000; Blue = 0xFF00; }
diff --git a/sc/sdi/cellsh.sdi b/sc/sdi/cellsh.sdi
index 7d8bfb14b8ab..4f9fe32f9f60 100644
--- a/sc/sdi/cellsh.sdi
+++ b/sc/sdi/cellsh.sdi
@@ -87,6 +87,8 @@ interface CellSelection
SID_SELECT_SCENARIO [ ExecMethod = ExecuteEdit; StateMethod = GetState; ]
FID_CELL_FORMAT [ ExecMethod = Execute; StateMethod = GetBlockState; ]
SID_ENABLE_HYPHENATION [ ExecMethod = Execute; StateMethod = GetBlockState; ]
+ SID_CELL_FORMAT_BORDER [ ExecMethod = Execute; ]
+ SID_CHAR_DLG_EFFECT [ ExecMethod = Execute; ]
FID_ROW_HEIGHT [ ExecMethod = Execute; StateMethod = GetState; ]
FID_ROW_OPT_HEIGHT [ ExecMethod = Execute; StateMethod = GetState; ]
FID_ROW_HIDE [ ExecMethod = Execute; StateMethod = GetState; ]
diff --git a/sc/sdi/drawsh.sdi b/sc/sdi/drawsh.sdi
index ff8cd359d722..444e2d0cac97 100644
--- a/sc/sdi/drawsh.sdi
+++ b/sc/sdi/drawsh.sdi
@@ -61,6 +61,7 @@ interface TableDraw
SID_BITMAP_LIST [ StateMethod = GetDrawAttrState; Export = FALSE; ]
SID_DASH_LIST [ StateMethod = GetDrawAttrState; Export = FALSE; ]
SID_LINEEND_LIST [ StateMethod = GetDrawAttrState; Export = FALSE; ]
+
// Flaechen-Attribute
SID_ATTR_FILL_STYLE [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; Export = FALSE; ]
@@ -76,15 +77,37 @@ interface TableDraw
SID_ATTR_FILL_GRADIENT [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; Export = FALSE; ]
SID_ATTR_FILL_HATCH [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; Export = FALSE; ]
SID_ATTR_FILL_BITMAP [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; Export = FALSE; ]
+ SID_ATTR_FILL_TRANSPARENCE [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; Export = FALSE; ]
+ SID_ATTR_FILL_FLOATTRANSPARENCE [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; Export = FALSE; ]
+
// ---- Linien-Attribute:
SID_ATTR_LINE_STYLE [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; Export = FALSE; ]
SID_ATTR_LINEEND_STYLE [ ExecMethod = ExecDrawAttr; StateMethod = GetAttrFuncState; Export = FALSE; ]
+ SID_ATTR_LINE_START [ ExecMethod = ExecDrawAttr; StateMethod = GetAttrFuncState; Export = FALSE; ]
+ SID_ATTR_LINE_END [ ExecMethod = ExecDrawAttr; StateMethod = GetAttrFuncState; Export = FALSE; ]
SID_ATTR_LINE_DASH [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; Export = FALSE; ]
SID_ATTR_LINE_WIDTH [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; Export = FALSE; ]
SID_ATTR_LINE_COLOR [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; Export = FALSE; ]
+ SID_ATTR_LINE_TRANSPARENCE [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; Export = FALSE; ]
+ SID_ATTR_LINE_JOINT [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; Export = FALSE; ]
+ SID_ATTR_LINE_CAP [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; Export = FALSE; ]
SID_ATTRIBUTES_AREA [ ExecMethod = ExecDrawAttr; StateMethod = GetAttrFuncState; Export = FALSE; ]
SID_ATTRIBUTES_LINE [ ExecMethod = ExecDrawAttr; StateMethod = GetAttrFuncState; Export = FALSE; ]
SID_ATTR_TRANSFORM [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawFuncState; Export = FALSE; ]
+
+ // For the sidebar
+ SID_ATTR_TRANSFORM_WIDTH [ StateMethod = GetDrawAttrStateForIFBX; Export = FALSE; ]
+ SID_ATTR_TRANSFORM_HEIGHT [ StateMethod = GetDrawAttrStateForIFBX; Export = FALSE; ]
+ SID_ATTR_TRANSFORM_POS_X [ StateMethod = GetDrawAttrStateForIFBX; Export = FALSE; ]
+ SID_ATTR_TRANSFORM_POS_Y [ StateMethod = GetDrawAttrStateForIFBX; Export = FALSE; ]
+ SID_ATTR_TRANSFORM_ANGLE [ StateMethod = GetDrawAttrStateForIFBX; Export = FALSE; ]
+ SID_ATTR_TRANSFORM_ROT_X [ StateMethod = GetDrawAttrStateForIFBX; Export = FALSE; ]
+ SID_ATTR_TRANSFORM_ROT_Y [ StateMethod = GetDrawAttrStateForIFBX; Export = FALSE; ]
+ SID_ATTR_TRANSFORM_PROTECT_POS [ StateMethod = GetDrawAttrStateForIFBX; Export = FALSE; ]
+ SID_ATTR_TRANSFORM_PROTECT_SIZE [ StateMethod = GetDrawAttrStateForIFBX; Export = FALSE; ]
+ SID_ATTR_TRANSFORM_AUTOWIDTH [ StateMethod = GetDrawAttrStateForIFBX; Export = FALSE; ]
+ SID_ATTR_TRANSFORM_AUTOHEIGHT [ StateMethod = GetDrawAttrStateForIFBX; Export = FALSE; ]
+
// ---- Ausrichtungs - Funktionen:
//! PseudoSlots gibt Aerger mit Referenz-Dialogen ???
SID_OBJECT_ALIGN
@@ -159,6 +182,8 @@ interface TableDraw
]
*/
SID_MIRROR_VERTICAL [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ]
+ SID_FLIP_HORIZONTAL [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ]
+ SID_FLIP_VERTICAL [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ]
SID_ANCHOR_PAGE [ ExecMethod = ExecDrawFunc; StateMethod = GetState; Export = FALSE; ]
SID_ANCHOR_TOGGLE [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ]
SID_ANCHOR_CELL [ ExecMethod = ExecDrawFunc; StateMethod = GetState; Export = FALSE; ]
diff --git a/sc/sdi/drtxtob.sdi b/sc/sdi/drtxtob.sdi
index ebc091264133..41854b947052 100644
--- a/sc/sdi/drtxtob.sdi
+++ b/sc/sdi/drtxtob.sdi
@@ -80,12 +80,23 @@ interface TableDrawText
SID_ALIGNCENTERHOR [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]
SID_ALIGNRIGHT [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]
SID_ALIGNBLOCK [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]
+
+ SID_ATTR_PARA_ADJUST_LEFT [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]
+ SID_ATTR_PARA_ADJUST_CENTER [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]
+ SID_ATTR_PARA_ADJUST_RIGHT [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]
+ SID_ATTR_PARA_ADJUST_BLOCK [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]
+ SID_ATTR_PARA_LRSPACE [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]
+ SID_ATTR_PARA_LINESPACE [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]
+ SID_ATTR_PARA_ULSPACE [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]
+
SID_ATTR_PARA_LINESPACE_10 [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]
SID_ATTR_PARA_LINESPACE_15 [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]
SID_ATTR_PARA_LINESPACE_20 [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]
SID_SET_SUPER_SCRIPT [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]
SID_SET_SUB_SCRIPT [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]
+ SID_ATTR_CHAR_KERNING [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]
SID_CHAR_DLG [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]
+ SID_CHAR_DLG_EFFECT [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]
SID_PARA_DLG [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]
// ---- FontWork:
SID_FONTWORK [ ExecMethod = ExecuteExtra; StateMethod = GetState; Export = FALSE; ]
@@ -130,6 +141,10 @@ interface TableDrawText
SID_TRANSLITERATE_FULLWIDTH [ ExecMethod = ExecuteTrans; StateMethod = GetState; Export = FALSE; ]
SID_TRANSLITERATE_HIRAGANA [ ExecMethod = ExecuteTrans; StateMethod = GetState; Export = FALSE; ]
SID_TRANSLITERATE_KATAGANA [ ExecMethod = ExecuteTrans; StateMethod = GetState; Export = FALSE; ]
+
+ SID_TABLE_VERT_NONE [ExecMethod = ExecuteAttr ;StateMethod = GetStatePropPanelAttr ;]
+ SID_TABLE_VERT_CENTER [ExecMethod = ExecuteAttr ;StateMethod = GetStatePropPanelAttr ;]
+ SID_TABLE_VERT_BOTTOM [ExecMethod = ExecuteAttr ;StateMethod = GetStatePropPanelAttr ;]
}
diff --git a/sc/sdi/editsh.sdi b/sc/sdi/editsh.sdi
index adfb8f7240b3..33e297ae1dfe 100644
--- a/sc/sdi/editsh.sdi
+++ b/sc/sdi/editsh.sdi
@@ -64,8 +64,10 @@ interface TableText
SID_ATTR_CHAR_CONTOUR [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]
SID_SET_SUPER_SCRIPT [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]
SID_SET_SUB_SCRIPT [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]
+ SID_ATTR_CHAR_KERNING [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]
SID_CELL_FORMAT_RESET [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ]
SID_CHAR_DLG [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ]
+ SID_CHAR_DLG_EFFECT [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ]
SID_TOGGLE_REL [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ]
SID_HYPERLINK_SETLINK [ ExecMethod = Execute; Export = FALSE; ]
diff --git a/sc/sdi/formatsh.sdi b/sc/sdi/formatsh.sdi
index abdd5e79d2e8..bbdf09942170 100644
--- a/sc/sdi/formatsh.sdi
+++ b/sc/sdi/formatsh.sdi
@@ -69,6 +69,7 @@ interface FormatForSelection
SID_ATTR_ALIGN_INDENT [ ExecMethod = ExecuteAlignment; StateMethod = GetAttrState; ]
SID_ATTR_ALIGN_HYPHENATION [ ExecMethod = ExecuteAlignment; StateMethod = GetAttrState; ]
SID_ATTR_ALIGN_DEGREES [ ExecMethod = ExecuteAlignment; StateMethod = GetAttrState; ]
+ SID_ATTR_ALIGN_STACKED [ ExecMethod = ExecuteAlignment; StateMethod = GetAttrState; ]
SID_ATTR_ALIGN_LOCKPOS [ ExecMethod = ExecuteAlignment; StateMethod = GetAttrState; ]
SID_ATTR_ALIGN_MARGIN [ ExecMethod = ExecuteAlignment; StateMethod = GetAttrState; ]
@@ -98,6 +99,7 @@ interface FormatForSelection
SID_ALIGNCENTERVER [ ExecMethod = ExecuteTextAttr; StateMethod = GetTextAttrState; ]
SID_ALIGNBLOCK [ ExecMethod = ExecuteTextAttr; StateMethod = GetTextAttrState; ]
SID_ALIGNCENTERHOR [ ExecMethod = ExecuteTextAttr; StateMethod = GetTextAttrState; ]
+ SID_SCGRIDSHOW [ ExecMethod = ExecViewOptions; StateMethod = GetViewOptions; ]
SID_V_ALIGNCELL [ ExecMethod = ExecuteAlignment; StateMethod = GetAlignState; ]
SID_H_ALIGNCELL [ ExecMethod = ExecuteAlignment; StateMethod = GetAlignState; ]
@@ -121,6 +123,8 @@ interface FormatForSelection
SID_NUMBER_INCDEC [ ExecMethod = ExecuteNumFormat;]
SID_NUMBER_DECDEC [ ExecMethod = ExecuteNumFormat;]
+ SID_NUMBER_TYPE_FORMAT [ ExecMethod = ExecuteNumFormat;StateMethod = GetNumFormatState; ]
+
SID_ATTR_BORDER [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; ] //XXX
SID_ATTR_BORDER_INNER [ StateMethod = GetBorderState; ] // status()
SID_ATTR_BORDER_OUTER [ ExecMethod = ExecuteAttr; StateMethod = GetBorderState; ]
@@ -128,6 +132,8 @@ interface FormatForSelection
SID_ATTR_ALIGN_LINEBREAK [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; ]
SID_FRAME_LINESTYLE [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; ]
SID_FRAME_LINECOLOR [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; ]
+ SID_ATTR_BORDER_DIAG_TLBR [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; ]
+ SID_ATTR_BORDER_DIAG_BLTR [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; ]
SID_FORMATPAINTBRUSH [ ExecMethod = ExecFormatPaintbrush; StateMethod = StateFormatPaintbrush; ]
}
diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi
index 27803019b573..7328e86f07c3 100644
--- a/sc/sdi/scalc.sdi
+++ b/sc/sdi/scalc.sdi
@@ -8487,3 +8487,54 @@ SfxVoidItem ExportAsGraphic SID_EXPORT_AS_GRAPHIC
ToolBoxConfig = TRUE,
GroupId = GID_CHART;
]
+
+//--------------------------------------------------------------------------
+SfxBoolItem ViewOption SID_SCGRIDSHOW
+[
+ AutoUpdate = TRUE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = FALSE, //TRUE
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
+ RecordPerSet;
+ Synchron;
+
+ Readonly = FALSE,
+
+ /* config */
+ AccelConfig = FALSE, //TRUE
+ MenuConfig = FALSE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE, //FALSE
+ GroupId = GID_DATA;
+]
+
+//--------------------------------------------------------------------------
+SfxUInt16Item NumberType SID_NUMBER_TYPE_FORMAT
+[
+ /* flags: */
+ AutoUpdate = FALSE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = TRUE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
+ RecordPerSet;
+ Synchron;
+
+ Readonly = FALSE,
+
+ /* config: */
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE,
+ GroupId = GID_VIEW;
+]
diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx
index 00ce7349d062..4954ac0e4412 100644
--- a/sc/source/core/data/docpool.cxx
+++ b/sc/source/core/data/docpool.cxx
@@ -179,7 +179,8 @@ static SfxItemInfo const aItemInfos[] =
{ SID_ATTR_PAGE_FOOTERSET, SFX_ITEM_POOLABLE }, // ATTR_PAGE_FOOTERSET
{ SID_SCATTR_PAGE_FORMULAS, SFX_ITEM_POOLABLE }, // ATTR_PAGE_FORMULAS
{ SID_SCATTR_PAGE_NULLVALS, SFX_ITEM_POOLABLE }, // ATTR_PAGE_NULLVALS
- { SID_SCATTR_PAGE_SCALETO, SFX_ITEM_POOLABLE } // ATTR_PAGE_SCALETO
+ { SID_SCATTR_PAGE_SCALETO, SFX_ITEM_POOLABLE }, // ATTR_PAGE_SCALETO
+ { SID_SCGRIDSHOW, SFX_ITEM_POOLABLE }
};
// -----------------------------------------------------------------------
diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx
index bfdd175f62ce..7acd77e754e4 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -569,7 +569,7 @@ void XclImpDrawObjBase::ConvertLineStyle( SdrObject& rSdrObj, const XclObjLineDa
long nLineWidth = 35 * ::std::min( rLineData.mnWidth, EXC_OBJ_LINE_THICK );
rSdrObj.SetMergedItem( XLineWidthItem( nLineWidth ) );
rSdrObj.SetMergedItem( XLineColorItem( EMPTY_STRING, GetPalette().GetColor( rLineData.mnColorIdx ) ) );
- rSdrObj.SetMergedItem( XLineJointItem( XLINEJOINT_MITER ) );
+ rSdrObj.SetMergedItem( XLineJointItem( com::sun::star::drawing::LineJoint_MITER ) );
sal_uLong nDotLen = ::std::max< sal_uLong >( 70 * rLineData.mnWidth, 35 );
sal_uLong nDashLen = 3 * nDotLen;
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 9baa6cc36eda..0f6ce7228342 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -2367,6 +2367,12 @@ void ScInputHandler::InvalidateAttribs()
rBindings.Invalidate( SID_ULINE_VAL_DOTTED );
rBindings.Invalidate( SID_HYPERLINK_GETLINK );
+
+ rBindings.Invalidate( SID_ATTR_CHAR_KERNING );
+ rBindings.Invalidate( SID_SET_SUPER_SCRIPT );
+ rBindings.Invalidate( SID_SET_SUB_SCRIPT );
+ rBindings.Invalidate( SID_ATTR_CHAR_STRIKEOUT );
+ rBindings.Invalidate( SID_ATTR_CHAR_SHADOWED );
}
}
diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx
index 9ed0e3ac069b..897a59f2e077 100644
--- a/sc/source/ui/app/scdll.cxx
+++ b/sc/source/ui/app/scdll.cxx
@@ -26,6 +26,7 @@
#include <comphelper/classids.hxx>
#include <sfx2/taskpane.hxx>
+#include <sfx2/sidebar/SidebarChildWindow.hxx>
#include <sfx2/docfilt.hxx>
#include <sfx2/fcontnr.hxx>
#include <sfx2/docfile.hxx>
@@ -228,6 +229,7 @@ void ScDLL::Init()
// common SFX controller
::sfx2::TaskPaneWrapper::RegisterChildWindow( false, pMod );
+ ::sfx2::sidebar::SidebarChildWindow::RegisterChildWindow(false, pMod);
// Svx-StatusBar-Controller
SvxInsertStatusBarControl ::RegisterControl(SID_ATTR_INSERT, pMod);
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index ac3daadc55fa..5a5747965646 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -1108,7 +1108,10 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet )
}
SetViewOptions( rNewOpt );
if (pBindings)
+ {
pBindings->Invalidate(SID_HELPLINES_MOVE);
+ pBindings->Invalidate(SID_SCGRIDSHOW);
+ }
}
//============================================
diff --git a/sc/source/ui/app/typemap.cxx b/sc/source/ui/app/typemap.cxx
index 01f0ba78bf8e..12e20053b23a 100644
--- a/sc/source/ui/app/typemap.cxx
+++ b/sc/source/ui/app/typemap.cxx
@@ -75,12 +75,20 @@
#include <editeng/crossedoutitem.hxx>
#include <editeng/formatbreakitem.hxx>
#include <editeng/charreliefitem.hxx>
+#include <editeng/lrspitem.hxx>
+#include <editeng/lspcitem.hxx>
+#include <editeng/ulspitem.hxx>
+#include <editeng/kernitem.hxx>
#include <svx/rotmodit.hxx>
#include <svx/drawitem.hxx>
#include <svl/ilstitem.hxx>
#include <svl/globalnameitem.hxx>
#include <svx/chrtitem.hxx>
#include <svx/zoomslideritem.hxx>
+#include <svx/xflftrit.hxx>
+#include <svx/xlncapit.hxx>
+#include <svx/xlinjoit.hxx>
+#include <svx/AffineMatrixItem.hxx>
// #i25616#
#include <svx/sdshitm.hxx>
diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx
index 815dd1563fde..6e8cd1c81173 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -3898,6 +3898,11 @@ sal_Bool ScDocFunc::ChangeIndent( const ScMarkData& rMark, sal_Bool bIncrement,
pBindings->Invalidate( SID_ALIGNRIGHT );
pBindings->Invalidate( SID_ALIGNBLOCK );
pBindings->Invalidate( SID_ALIGNCENTERHOR );
+ pBindings->Invalidate( SID_ATTR_LRSPACE );
+ pBindings->Invalidate( SID_ATTR_PARA_ADJUST_LEFT );
+ pBindings->Invalidate( SID_ATTR_PARA_ADJUST_RIGHT );
+ pBindings->Invalidate( SID_ATTR_PARA_ADJUST_BLOCK );
+ pBindings->Invalidate( SID_ATTR_PARA_ADJUST_CENTER);
// pseudo slots for Format menu
pBindings->Invalidate( SID_ALIGN_ANY_HDEFAULT );
pBindings->Invalidate( SID_ALIGN_ANY_LEFT );
diff --git a/sc/source/ui/drawfunc/chartsh.cxx b/sc/source/ui/drawfunc/chartsh.cxx
index c20f0ad0acd7..e84b1be9fd40 100644
--- a/sc/source/ui/drawfunc/chartsh.cxx
+++ b/sc/source/ui/drawfunc/chartsh.cxx
@@ -25,6 +25,7 @@
#include <sfx2/app.hxx>
#include <sfx2/objface.hxx>
#include <sfx2/request.hxx>
+#include <sfx2/sidebar/EnumContext.hxx>
#include <svl/whiter.hxx>
#include <vcl/msgbox.hxx>
@@ -58,6 +59,7 @@ ScChartShell::ScChartShell(ScViewData* pData) :
{
SetHelpId( HID_SCSHELL_CHARTSH );
SetName( OUString("ChartObject") );
+ SfxShell::SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_Chart));
}
ScChartShell::~ScChartShell()
@@ -100,5 +102,10 @@ void ScChartShell::ExecuteExportAsGraphic( SfxRequest& )
Invalidate();
}
+void ScChartShell::HandleSelectionChange (void)
+{
+ // Do not call the implementation in the base class. Let
+ // Activate()/Deactivate() handle context switches.
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx
index 3e8605c70827..5a675be518f6 100644
--- a/sc/source/ui/drawfunc/drawsh.cxx
+++ b/sc/source/ui/drawfunc/drawsh.cxx
@@ -46,6 +46,8 @@
#include <svx/svdobj.hxx>
#include <svx/drawitem.hxx>
#include <svx/xtable.hxx>
+#include "tabvwsh.hxx"
+#include <sfx2/bindings.hxx>
#define ScDrawShell
#include "scslots.hxx"
@@ -125,14 +127,21 @@ void ScDrawShell::ExecDrawAttr( SfxRequest& rReq )
case SID_ATTR_LINE_STYLE:
case SID_ATTR_LINEEND_STYLE:
+ case SID_ATTR_LINE_START:
+ case SID_ATTR_LINE_END:
case SID_ATTR_LINE_DASH:
case SID_ATTR_LINE_WIDTH:
case SID_ATTR_LINE_COLOR:
+ case SID_ATTR_LINE_TRANSPARENCE:
+ case SID_ATTR_LINE_JOINT:
+ case SID_ATTR_LINE_CAP:
case SID_ATTR_FILL_STYLE:
case SID_ATTR_FILL_COLOR:
case SID_ATTR_FILL_GRADIENT:
case SID_ATTR_FILL_HATCH:
case SID_ATTR_FILL_BITMAP:
+ case SID_ATTR_FILL_TRANSPARENCE:
+ case SID_ATTR_FILL_FLOATTRANSPARENCE:
// #i25616#
case SID_ATTR_FILL_SHADOW:
@@ -146,6 +155,9 @@ void ScDrawShell::ExecDrawAttr( SfxRequest& rReq )
case SID_ATTR_LINE_DASH:
case SID_ATTR_LINE_WIDTH:
case SID_ATTR_LINE_COLOR:
+ case SID_ATTR_LINE_TRANSPARENCE:
+ case SID_ATTR_LINE_JOINT:
+ case SID_ATTR_LINE_CAP:
ExecuteLineDlg( rReq );
break;
@@ -154,6 +166,8 @@ void ScDrawShell::ExecDrawAttr( SfxRequest& rReq )
case SID_ATTR_FILL_GRADIENT:
case SID_ATTR_FILL_HATCH:
case SID_ATTR_FILL_BITMAP:
+ case SID_ATTR_FILL_TRANSPARENCE:
+ case SID_ATTR_FILL_FLOATTRANSPARENCE:
// #i25616#
case SID_ATTR_FILL_SHADOW:
@@ -219,6 +233,7 @@ void ScDrawShell::ExecDrawAttr( SfxRequest& rReq )
break;
case SID_ATTR_TRANSFORM:
+ {
{
if ( pView->AreObjectsMarked() )
{
@@ -282,7 +297,20 @@ void ScDrawShell::ExecDrawAttr( SfxRequest& rReq )
pView->SetGeoAttrToMarked( *pArgs );
}
}
+
+ ScTabViewShell* pViewShell = pViewData->GetViewShell();
+ SfxBindings& rBindings=pViewShell->GetViewFrame()->GetBindings();
+ rBindings.Invalidate(SID_ATTR_TRANSFORM_WIDTH);
+ rBindings.Invalidate(SID_ATTR_TRANSFORM_HEIGHT);
+ rBindings.Invalidate(SID_ATTR_TRANSFORM_POS_X);
+ rBindings.Invalidate(SID_ATTR_TRANSFORM_POS_Y);
+ rBindings.Invalidate(SID_ATTR_TRANSFORM_ANGLE);
+ rBindings.Invalidate(SID_ATTR_TRANSFORM_ROT_X);
+ rBindings.Invalidate(SID_ATTR_TRANSFORM_ROT_Y);
+ rBindings.Invalidate(SID_ATTR_TRANSFORM_AUTOWIDTH);
+ rBindings.Invalidate(SID_ATTR_TRANSFORM_AUTOHEIGHT);
break;
+ }
default:
break;
diff --git a/sc/source/ui/drawfunc/drawsh2.cxx b/sc/source/ui/drawfunc/drawsh2.cxx
index b161aeafa9d4..b63732ad792e 100644
--- a/sc/source/ui/drawfunc/drawsh2.cxx
+++ b/sc/source/ui/drawfunc/drawsh2.cxx
@@ -33,6 +33,8 @@
#include <svx/svdouno.hxx>
#include <svx/extrusionbar.hxx>
#include <svx/fontworkbar.hxx>
+#include <svx/sidebar/SelectionChangeHandler.hxx>
+#include <svx/sidebar/SelectionAnalyzer.hxx>
#include "drawsh.hxx"
#include "drawview.hxx"
@@ -45,15 +47,23 @@
#include <svx/svdoole2.hxx>
#include <svx/svdocapt.hxx>
+#include <boost/bind.hpp>
+
+
sal_uInt16 ScGetFontWorkId(); // in drtxtob
using namespace com::sun::star;
+
//------------------------------------------------------------------
ScDrawShell::ScDrawShell( ScViewData* pData ) :
SfxShell(pData->GetViewShell()),
- pViewData( pData )
+ pViewData( pData ),
+ mpSelectionChangeHandler(new svx::sidebar::SelectionChangeHandler(
+ ::boost::bind(&ScDrawShell::GetContextForSelection, this),
+ GetFrame()->GetFrame().GetController(),
+ sfx2::sidebar::EnumContext::Context_Cell))
{
SetPool( &pViewData->GetScDrawView()->GetModel()->GetItemPool() );
::svl::IUndoManager* pMgr = pViewData->GetSfxDocShell()->GetUndoManager();
@@ -64,10 +74,13 @@ ScDrawShell::ScDrawShell( ScViewData* pData ) :
}
SetHelpId( HID_SCSHELL_DRAWSH );
SetName(OUString("Drawing"));
+
+ mpSelectionChangeHandler->Connect();
}
ScDrawShell::~ScDrawShell()
{
+ mpSelectionChangeHandler->Disconnect();
}
void ScDrawShell::GetState( SfxItemSet& rSet ) // Zustaende / Toggles
@@ -130,6 +143,8 @@ void ScDrawShell::GetDrawFuncState( SfxItemSet& rSet ) // Funktionen disabl
{
rSet.DisableItem( SID_MIRROR_HORIZONTAL );
rSet.DisableItem( SID_MIRROR_VERTICAL );
+ rSet.DisableItem( SID_FLIP_HORIZONTAL );
+ rSet.DisableItem( SID_FLIP_VERTICAL );
}
const SdrMarkList& rMarkList = pView->GetMarkedObjectList();
@@ -380,5 +395,22 @@ sal_Bool ScDrawShell::AreAllObjectsOnLayer(sal_uInt16 nLayerNo,const SdrMarkList
return bResult;
}
+void ScDrawShell::GetDrawAttrStateForIFBX( SfxItemSet& rSet )
+{
+ ScDrawView* pView = pViewData->GetScDrawView();
+ const SdrMarkList& rMarkList = pView->GetMarkedObjectList();
+
+ if( rMarkList.GetMark(0) != 0 )
+ {
+ SfxItemSet aNewAttr(pView->GetGeoAttrFromMarked());
+ rSet.Put(aNewAttr, sal_False);
+ }
+}
+
+sfx2::sidebar::EnumContext::Context ScDrawShell::GetContextForSelection (void)
+{
+ return ::svx::sidebar::SelectionAnalyzer::GetContextForSelection_SC(
+ GetDrawView()->GetMarkedObjectList());
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/drawfunc/drawsh5.cxx b/sc/source/ui/drawfunc/drawsh5.cxx
index 8a82fda696fc..61cc2358ad26 100644
--- a/sc/source/ui/drawfunc/drawsh5.cxx
+++ b/sc/source/ui/drawfunc/drawsh5.cxx
@@ -305,10 +305,14 @@ void ScDrawShell::ExecDrawFunc( SfxRequest& rReq )
break;
case SID_MIRROR_HORIZONTAL:
+ case SID_FLIP_HORIZONTAL:
pView->MirrorAllMarkedHorizontal();
+ rBindings.Invalidate( SID_ATTR_TRANSFORM_ANGLE );
break;
case SID_MIRROR_VERTICAL:
+ case SID_FLIP_VERTICAL:
pView->MirrorAllMarkedVertical();
+ rBindings.Invalidate( SID_ATTR_TRANSFORM_ANGLE );
break;
case SID_OBJECT_ALIGN_LEFT:
diff --git a/sc/source/ui/drawfunc/drformsh.cxx b/sc/source/ui/drawfunc/drformsh.cxx
index 6355ef5e8d9d..02cf369c3498 100644
--- a/sc/source/ui/drawfunc/drformsh.cxx
+++ b/sc/source/ui/drawfunc/drformsh.cxx
@@ -35,6 +35,7 @@
#include "drawview.hxx"
#include "scresid.hxx"
#include <svx/svdobj.hxx>
+#include <sfx2/sidebar/EnumContext.hxx>
#define ScDrawFormShell
#include "scslots.hxx"
@@ -54,12 +55,11 @@ ScDrawFormShell::ScDrawFormShell(ScViewData* pData) :
{
SetHelpId(HID_SCSHELL_DRAWFORMSH);
SetName(OUString("DrawForm"));
+ SfxShell::SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_Form));
}
ScDrawFormShell::~ScDrawFormShell()
{
}
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx
index 9e0891e540a4..8e97dd2bc6e6 100644
--- a/sc/source/ui/drawfunc/drtxtob.cxx
+++ b/sc/source/ui/drawfunc/drtxtob.cxx
@@ -31,6 +31,9 @@
#include <editeng/flditem.hxx>
#include <editeng/fontitem.hxx>
#include <editeng/frmdiritem.hxx>
+#include <editeng/lrspitem.hxx>
+#include <editeng/lspcitem.hxx>
+#include <editeng/ulspitem.hxx>
#include <svx/hlnkitem.hxx>
#include <editeng/lspcitem.hxx>
#include <svx/svdoutl.hxx>
@@ -57,6 +60,7 @@
#include <svx/svxdlg.hxx>
#include <svx/dialogs.hrc>
+#include <sfx2/sidebar/EnumContext.hxx>
#include "sc.hrc"
#include "globstr.hrc"
@@ -121,6 +125,7 @@ ScDrawTextObjectBar::ScDrawTextObjectBar(ScViewData* pData) :
SetHelpId( HID_SCSHELL_DRTXTOB );
SetName(OUString("DrawText"));
+ SfxShell::SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_DrawText));
}
ScDrawTextObjectBar::~ScDrawTextObjectBar()
@@ -698,10 +703,11 @@ void ScDrawTextObjectBar::ExecuteAttr( SfxRequest &rReq )
}
break;
+ case SID_CHAR_DLG_EFFECT:
case SID_CHAR_DLG: // Dialog-Button
case SID_ATTR_CHAR_FONT: // Controller nicht angezeigt
case SID_ATTR_CHAR_FONTHEIGHT:
- bDone = ExecuteCharDlg( aEditAttr, aNewAttr );
+ bDone = ExecuteCharDlg( aEditAttr, aNewAttr , nSlot);
break;
case SID_PARA_DLG:
@@ -818,6 +824,11 @@ void ScDrawTextObjectBar::ExecuteAttr( SfxRequest &rReq )
aNewAttr.Put( *pDlg->GetOutputItemSet() );
delete pDlg;
+
+ SfxBindings& rBindings = pViewData->GetBindings();
+ rBindings.Invalidate( SID_TABLE_VERT_NONE );
+ rBindings.Invalidate( SID_TABLE_VERT_CENTER );
+ rBindings.Invalidate( SID_TABLE_VERT_BOTTOM );
}
break;
}
@@ -849,6 +860,120 @@ void ScDrawTextObjectBar::ExecuteAttr( SfxRequest &rReq )
pView->SetAttributes( aSetItem.GetItemSet() );
}
+ else if( nSlot == SID_ATTR_PARA_LRSPACE )
+ {
+ sal_uInt16 nId = SID_ATTR_PARA_LRSPACE;
+ const SvxLRSpaceItem& rItem = (const SvxLRSpaceItem&)
+ pArgs->Get( nId );
+ SfxItemSet aEditAttr( GetPool(), EE_PARA_LRSPACE, EE_PARA_LRSPACE );
+ nId = EE_PARA_LRSPACE;
+ SvxLRSpaceItem aLRSpaceItem( rItem.GetLeft(),
+ rItem.GetRight(), rItem.GetTxtLeft(),
+ rItem.GetTxtFirstLineOfst(), nId );
+ aEditAttr.Put( aLRSpaceItem );
+// rReq.Done( aEditAttr );
+// pArgs = rReq.GetArgs();
+// pView->SetAttributes( *pArgs );
+ pView->SetAttributes( aEditAttr );
+// Invalidate(SID_ATTR_PARA_LRSPACE);
+ }
+ else if( nSlot == SID_ATTR_PARA_LINESPACE )
+ {
+ SvxLineSpacingItem aLineSpaceItem = (const SvxLineSpacingItem&)pArgs->Get(
+ GetPool().GetWhich(nSlot));
+ SfxItemSet aEditAttr( GetPool(), EE_PARA_SBL, EE_PARA_SBL );
+ aEditAttr.Put( aLineSpaceItem );
+// rReq.Done( aEditAttr );
+// pArgs = rReq.GetArgs();
+// pView->SetAttributes( *pArgs );
+ pView->SetAttributes( aEditAttr );
+// Invalidate(SID_ATTR_PARA_LINESPACE);
+ }
+ else if( nSlot == SID_ATTR_PARA_ULSPACE )
+ {
+ SvxULSpaceItem aULSpaceItem = (const SvxULSpaceItem&)pArgs->Get(
+ GetPool().GetWhich(nSlot));
+ SfxItemSet aEditAttr( GetPool(), EE_PARA_ULSPACE, EE_PARA_ULSPACE );
+ aULSpaceItem.SetWhich(EE_PARA_ULSPACE);
+ aEditAttr.Put( aULSpaceItem );
+// rReq.Done( aEditAttr );
+// pArgs = rReq.GetArgs();
+// pView->SetAttributes( *pArgs );
+ pView->SetAttributes( aEditAttr );
+// Invalidate(SID_ATTR_PARA_ULSPACE);
+ }
+ else if(nSlot == SID_SET_SUPER_SCRIPT )
+ {
+ SfxItemSet aEditAttr(pView->GetModel()->GetItemPool());
+ pView->GetAttributes(aEditAttr);
+ SfxItemSet aNewAttr( *aEditAttr.GetPool(), aEditAttr.GetRanges() );
+
+ SvxEscapementItem aItem(EE_CHAR_ESCAPEMENT);
+ SvxEscapement eEsc = (SvxEscapement) ( (const SvxEscapementItem&)
+ aEditAttr.Get( EE_CHAR_ESCAPEMENT ) ).GetEnumValue();
+
+ if( eEsc == SVX_ESCAPEMENT_SUPERSCRIPT )
+ aItem.SetEscapement( SVX_ESCAPEMENT_OFF );
+ else
+ aItem.SetEscapement( SVX_ESCAPEMENT_SUPERSCRIPT );
+ aNewAttr.Put( aItem );
+ pView->SetAttributes( aNewAttr );
+ }
+ else if( nSlot == SID_SET_SUB_SCRIPT )
+ {
+ SfxItemSet aEditAttr(pView->GetModel()->GetItemPool());
+ pView->GetAttributes(aEditAttr);
+ SfxItemSet aNewAttr( *aEditAttr.GetPool(), aEditAttr.GetRanges() );
+
+ SvxEscapementItem aItem(EE_CHAR_ESCAPEMENT);
+ SvxEscapement eEsc = (SvxEscapement) ( (const SvxEscapementItem&)
+ aEditAttr.Get( EE_CHAR_ESCAPEMENT ) ).GetEnumValue();
+
+ if( eEsc == SVX_ESCAPEMENT_SUBSCRIPT )
+ aItem.SetEscapement( SVX_ESCAPEMENT_OFF );
+ else
+ aItem.SetEscapement( SVX_ESCAPEMENT_SUBSCRIPT );
+ aNewAttr.Put( aItem );
+ pView->SetAttributes( aNewAttr );
+ }
+
+ else if (bArgsInReq &&
+ ( nSlot == SID_TABLE_VERT_NONE || nSlot == SID_TABLE_VERT_CENTER ||
+ nSlot == SID_TABLE_VERT_BOTTOM ) )
+ {
+ SdrTextVertAdjust eTVA = SDRTEXTVERTADJUST_TOP;
+ if (nSlot == SID_TABLE_VERT_CENTER)
+ eTVA = SDRTEXTVERTADJUST_CENTER;
+ else if (nSlot == SID_TABLE_VERT_BOTTOM)
+ eTVA = SDRTEXTVERTADJUST_BOTTOM;
+
+ SfxItemSet aEditAttr(pView->GetModel()->GetItemPool());
+ SfxItemSet aNewAttr( *aEditAttr.GetPool(), aEditAttr.GetRanges() );
+ aNewAttr.Put(SdrTextVertAdjustItem(eTVA));
+ pView->SetAttributes(aNewAttr);
+ }
+ else if (bArgsInReq &&
+ (nSlot == SID_ATTR_PARA_ADJUST_LEFT || nSlot == SID_ATTR_PARA_ADJUST_CENTER || nSlot == SID_ATTR_PARA_ADJUST_RIGHT || nSlot == SID_ATTR_PARA_ADJUST_BLOCK ))
+ {
+ SfxItemSet aEditAttr(pView->GetModel()->GetItemPool());
+ SfxItemSet aNewAttr( *aEditAttr.GetPool(), aEditAttr.GetRanges() );
+ switch ( nSlot )
+ {
+ case SID_ATTR_PARA_ADJUST_LEFT:
+ aNewAttr.Put( SvxAdjustItem( SVX_ADJUST_LEFT, EE_PARA_JUST ) );
+ break;
+ case SID_ATTR_PARA_ADJUST_CENTER:
+ aNewAttr.Put( SvxAdjustItem( SVX_ADJUST_CENTER, EE_PARA_JUST ) );
+ break;
+ case SID_ATTR_PARA_ADJUST_RIGHT:
+ aNewAttr.Put( SvxAdjustItem( SVX_ADJUST_RIGHT, EE_PARA_JUST ) );
+ break;
+ case SID_ATTR_PARA_ADJUST_BLOCK:
+ aNewAttr.Put( SvxAdjustItem( SVX_ADJUST_BLOCK, EE_PARA_JUST ) );
+ break;
+ }
+ pView->SetAttributes(aNewAttr);
+ }
else
{
// use args directly
@@ -901,24 +1026,35 @@ void ScDrawTextObjectBar::GetAttrState( SfxItemSet& rDestSet )
ScViewUtil::PutItemScript( rDestSet, aAttrSet, EE_CHAR_WEIGHT, nScript );
if ( rDestSet.GetItemState( EE_CHAR_ITALIC ) != SFX_ITEM_UNKNOWN )
ScViewUtil::PutItemScript( rDestSet, aAttrSet, EE_CHAR_ITALIC, nScript );
-
// Ausrichtung
SvxAdjust eAdj = ((const SvxAdjustItem&)aAttrSet.Get(EE_PARA_JUST)).GetAdjust();
switch( eAdj )
{
- case SVX_ADJUST_LEFT:
+ case SVX_ADJUST_LEFT:
+ {
rDestSet.Put( SfxBoolItem( SID_ALIGNLEFT, sal_True ) );
- break;
- case SVX_ADJUST_CENTER:
+ rDestSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_LEFT, sal_True ) );
+ }
+ break;
+ case SVX_ADJUST_CENTER:
+ {
rDestSet.Put( SfxBoolItem( SID_ALIGNCENTERHOR, sal_True ) );
- break;
- case SVX_ADJUST_RIGHT:
+ rDestSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_CENTER, sal_True ) );
+ }
+ break;
+ case SVX_ADJUST_RIGHT:
+ {
rDestSet.Put( SfxBoolItem( SID_ALIGNRIGHT, sal_True ) );
- break;
- case SVX_ADJUST_BLOCK:
+ rDestSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_RIGHT, sal_True ) );
+ }
+ break;
+ case SVX_ADJUST_BLOCK:
+ {
rDestSet.Put( SfxBoolItem( SID_ALIGNBLOCK, sal_True ) );
- break;
+ rDestSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_BLOCK, sal_True ) );
+ }
+ break;
default:
{
// added to avoid warnings
@@ -930,6 +1066,32 @@ void ScDrawTextObjectBar::GetAttrState( SfxItemSet& rDestSet )
rDestSet.Put( SfxBoolItem( SID_ALIGN_ANY_RIGHT, eAdj == SVX_ADJUST_RIGHT ) );
rDestSet.Put( SfxBoolItem( SID_ALIGN_ANY_JUSTIFIED, eAdj == SVX_ADJUST_BLOCK ) );
+ SvxLRSpaceItem aLR = ((const SvxLRSpaceItem&)aAttrSet.Get( EE_PARA_LRSPACE ));
+ aLR.SetWhich(SID_ATTR_PARA_LRSPACE);
+ rDestSet.Put(aLR);
+ Invalidate( SID_ATTR_PARA_LRSPACE );
+ SfxItemState eState = aAttrSet.GetItemState( EE_PARA_LRSPACE );
+ if ( eState == SFX_ITEM_DONTCARE )
+ rDestSet.InvalidateItem(SID_ATTR_PARA_LRSPACE);
+ //xuxu for Line Space
+ SvxLineSpacingItem aLineSP = ((const SvxLineSpacingItem&)aAttrSet.
+ Get( EE_PARA_SBL ));
+ aLineSP.SetWhich(SID_ATTR_PARA_LINESPACE);
+ rDestSet.Put(aLineSP);
+ Invalidate(SID_ATTR_PARA_LINESPACE);
+ eState = aAttrSet.GetItemState( EE_PARA_SBL );
+ if ( eState == SFX_ITEM_DONTCARE )
+ rDestSet.InvalidateItem(SID_ATTR_PARA_LINESPACE);
+ //xuxu for UL Space
+ SvxULSpaceItem aULSP = ((const SvxULSpaceItem&)aAttrSet.
+ Get( EE_PARA_ULSPACE ));
+ aULSP.SetWhich(SID_ATTR_PARA_ULSPACE);
+ rDestSet.Put(aULSP);
+ Invalidate(SID_ATTR_PARA_ULSPACE);
+ eState = aAttrSet.GetItemState( EE_PARA_ULSPACE );
+ if ( eState == SFX_ITEM_DONTCARE )
+ rDestSet.InvalidateItem(SID_ATTR_PARA_ULSPACE);
+
// Zeilenabstand
sal_uInt16 nLineSpace = (sal_uInt16)
@@ -959,7 +1121,7 @@ void ScDrawTextObjectBar::GetAttrState( SfxItemSet& rDestSet )
// Unterstreichung
- SfxItemState eState = aAttrSet.GetItemState( EE_CHAR_UNDERLINE, sal_True );
+ eState = aAttrSet.GetItemState( EE_CHAR_UNDERLINE, sal_True );
if ( eState == SFX_ITEM_DONTCARE )
{
rDestSet.InvalidateItem( SID_ULINE_VAL_NONE );
@@ -1056,4 +1218,55 @@ void ScDrawTextObjectBar::ExecuteTrans( SfxRequest& rReq )
}
}
+void ScDrawTextObjectBar::GetStatePropPanelAttr(SfxItemSet &rSet)
+{
+ SfxWhichIter aIter( rSet );
+ sal_uInt16 nWhich = aIter.FirstWhich();
+
+ SdrView* pView = pViewData->GetScDrawView();
+
+ SfxItemSet aEditAttr(pView->GetModel()->GetItemPool());
+ pView->GetAttributes(aEditAttr);
+ //SfxItemSet aAttrs( *aEditAttr.GetPool(), aEditAttr.GetRanges() );
+
+ while ( nWhich )
+ {
+ sal_uInt16 nSlotId = SfxItemPool::IsWhich(nWhich)
+ ? GetPool().GetSlotId(nWhich)
+ : nWhich;
+ switch ( nSlotId )
+ {
+ case SID_TABLE_VERT_NONE:
+ case SID_TABLE_VERT_CENTER:
+ case SID_TABLE_VERT_BOTTOM:
+ sal_Bool bContour = sal_False;
+ SfxItemState eConState = aEditAttr.GetItemState( SDRATTR_TEXT_CONTOURFRAME );
+ if( eConState != SFX_ITEM_DONTCARE )
+ {
+ bContour = ( ( const SdrTextContourFrameItem& )aEditAttr.Get( SDRATTR_TEXT_CONTOURFRAME ) ).GetValue();
+ }
+ if (bContour) break;
+
+ SfxItemState eVState = aEditAttr.GetItemState( SDRATTR_TEXT_VERTADJUST );
+ //SfxItemState eHState = aAttrs.GetItemState( SDRATTR_TEXT_HORZADJUST );
+
+ //if(SFX_ITEM_DONTCARE != eVState && SFX_ITEM_DONTCARE != eHState)
+ if(SFX_ITEM_DONTCARE != eVState)
+ {
+ SdrTextVertAdjust eTVA = (SdrTextVertAdjust)((const SdrTextVertAdjustItem&)aEditAttr.Get(SDRATTR_TEXT_VERTADJUST)).GetValue();
+ sal_Bool bSet = nSlotId == (SID_TABLE_VERT_NONE && eTVA == SDRTEXTVERTADJUST_TOP) ||
+ (nSlotId == SID_TABLE_VERT_CENTER && eTVA == SDRTEXTVERTADJUST_CENTER) ||
+ (nSlotId == SID_TABLE_VERT_BOTTOM && eTVA == SDRTEXTVERTADJUST_BOTTOM);
+ rSet.Put(SfxBoolItem(nSlotId, bSet));
+ }
+ else
+ {
+ rSet.Put(SfxBoolItem(nSlotId, sal_False));
+ }
+ break;
+ }
+ nWhich = aIter.NextWhich();
+ }
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/drawfunc/drtxtob1.cxx b/sc/source/ui/drawfunc/drtxtob1.cxx
index 37c9a2512329..a3f5445d5f49 100644
--- a/sc/source/ui/drawfunc/drtxtob1.cxx
+++ b/sc/source/ui/drawfunc/drtxtob1.cxx
@@ -41,7 +41,7 @@
//------------------------------------------------------------------------
sal_Bool ScDrawTextObjectBar::ExecuteCharDlg( const SfxItemSet& rArgs,
- SfxItemSet& rOutSet )
+ SfxItemSet& rOutSet , sal_uInt16 nSlot)
{
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "ScAbstractFactory create fail!");
@@ -49,6 +49,10 @@ sal_Bool ScDrawTextObjectBar::ExecuteCharDlg( const SfxItemSet& rArgs,
SfxAbstractTabDialog* pDlg = pFact->CreateScCharDlg( pViewData->GetDialogParent(), &rArgs,
pViewData->GetSfxDocShell(),RID_SCDLG_CHAR );
OSL_ENSURE(pDlg, "Dialog create fail!");
+ if (nSlot == SID_CHAR_DLG_EFFECT)
+ {
+ pDlg->SetCurPageId(RID_SVXPAGE_CHAR_EFFECTS);
+ }
sal_Bool bRet = ( pDlg->Execute() == RET_OK );
if ( bRet )
diff --git a/sc/source/ui/drawfunc/futext.cxx b/sc/source/ui/drawfunc/futext.cxx
index 5b6e0b124b7c..8ea5fc2d90b3 100644
--- a/sc/source/ui/drawfunc/futext.cxx
+++ b/sc/source/ui/drawfunc/futext.cxx
@@ -61,6 +61,10 @@ static void lcl_InvalidateAttribs( SfxBindings& rBindings )
rBindings.Invalidate( SID_ATTR_CHAR_COLOR );
rBindings.Invalidate( SID_ATTR_CHAR_FONT );
rBindings.Invalidate( SID_ATTR_CHAR_FONTHEIGHT );
+ rBindings.Invalidate( SID_ATTR_PARA_ADJUST_LEFT );
+ rBindings.Invalidate( SID_ATTR_PARA_ADJUST_RIGHT );
+ rBindings.Invalidate( SID_ATTR_PARA_ADJUST_BLOCK );
+ rBindings.Invalidate( SID_ATTR_PARA_ADJUST_CENTER);
rBindings.Invalidate( SID_ALIGNLEFT );
rBindings.Invalidate( SID_ALIGNCENTERHOR );
rBindings.Invalidate( SID_ALIGNRIGHT );
@@ -80,6 +84,11 @@ static void lcl_InvalidateAttribs( SfxBindings& rBindings )
rBindings.Invalidate( SID_ALIGN_ANY_HCENTER );
rBindings.Invalidate( SID_ALIGN_ANY_RIGHT );
rBindings.Invalidate( SID_ALIGN_ANY_JUSTIFIED );
+ rBindings.Invalidate( SID_ATTR_CHAR_KERNING );
+ rBindings.Invalidate( SID_SET_SUPER_SCRIPT );
+ rBindings.Invalidate( SID_SET_SUB_SCRIPT );
+ rBindings.Invalidate( SID_ATTR_CHAR_STRIKEOUT );
+ rBindings.Invalidate( SID_ATTR_CHAR_SHADOWED );
}
static void lcl_UpdateHyphenator( Outliner& rOutliner, SdrObject* pObj )
diff --git a/sc/source/ui/drawfunc/graphsh.cxx b/sc/source/ui/drawfunc/graphsh.cxx
index 45666e6f6999..6276575cd712 100644
--- a/sc/source/ui/drawfunc/graphsh.cxx
+++ b/sc/source/ui/drawfunc/graphsh.cxx
@@ -20,6 +20,7 @@
#include <sfx2/app.hxx>
#include <sfx2/objface.hxx>
#include <sfx2/request.hxx>
+#include <sfx2/sidebar/EnumContext.hxx>
#include <svl/whiter.hxx>
#include <svx/svdograf.hxx>
#include <svx/grfflt.hxx>
@@ -79,6 +80,7 @@ ScGraphicShell::ScGraphicShell(ScViewData* pData) :
{
SetHelpId(HID_SCSHELL_GRAPHIC);
SetName(OUString("GraphicObject"));
+ SfxShell::SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_Graphic));
}
ScGraphicShell::~ScGraphicShell()
@@ -241,4 +243,5 @@ void ScGraphicShell::ExecuteCompressGraphic( SfxRequest& )
Invalidate();
}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/drawfunc/mediash.cxx b/sc/source/ui/drawfunc/mediash.cxx
index 79185a965e31..9537f376876d 100644
--- a/sc/source/ui/drawfunc/mediash.cxx
+++ b/sc/source/ui/drawfunc/mediash.cxx
@@ -25,6 +25,7 @@
#include <svl/whiter.hxx>
#include <svx/svdomedia.hxx>
#include <svx/sdr/contact/viewcontactofsdrmediaobj.hxx>
+#include <sfx2/sidebar/EnumContext.hxx>
#include "mediash.hxx"
#include "sc.hrc"
@@ -48,6 +49,7 @@ ScMediaShell::ScMediaShell(ScViewData* pData) :
{
SetHelpId(HID_SCSHELL_MEDIA);
SetName( String( ScResId( SCSTR_MEDIASHELL ) ) );
+ SfxShell::SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_Media));
}
ScMediaShell::~ScMediaShell()
diff --git a/sc/source/ui/drawfunc/oleobjsh.cxx b/sc/source/ui/drawfunc/oleobjsh.cxx
index 6cb1db567ce5..9add3117d3df 100644
--- a/sc/source/ui/drawfunc/oleobjsh.cxx
+++ b/sc/source/ui/drawfunc/oleobjsh.cxx
@@ -35,6 +35,7 @@
#include "drawview.hxx"
#include "scresid.hxx"
#include <svx/svdobj.hxx>
+#include <sfx2/sidebar/EnumContext.hxx>
#define ScOleObjectShell
#include "scslots.hxx"
@@ -54,12 +55,17 @@ ScOleObjectShell::ScOleObjectShell(ScViewData* pData) :
{
SetHelpId(HID_SCSHELL_OLEOBEJCTSH);
SetName(OUString("OleObject"));
+ SfxShell::SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_OLE));
}
ScOleObjectShell::~ScOleObjectShell()
{
}
-
+void ScOleObjectShell::HandleSelectionChange (void)
+{
+ // Do not call the implementation in the base class. Let
+ // Activate()/Deactivate() handle context switches.
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx
index 58ac2464246d..bb5cb9a77ef0 100644
--- a/