summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--chart2/source/controller/dialogs/dlg_View3D.cxx2
-rw-r--r--chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx2
-rw-r--r--chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx2
-rw-r--r--chart2/source/controller/drawinglayer/DrawViewWrapper.cxx8
-rw-r--r--chart2/source/controller/drawinglayer/ViewElementListProvider.cxx2
-rw-r--r--chart2/source/controller/inc/ViewElementListProvider.hxx2
-rw-r--r--chart2/source/controller/inc/dlg_View3D.hxx4
-rw-r--r--chart2/source/controller/main/ShapeController.cxx2
-rw-r--r--chart2/source/inc/chartview/DrawModelWrapper.hxx2
-rw-r--r--chart2/source/view/main/DrawModelWrapper.cxx2
-rw-r--r--cui/source/inc/border.hxx1
-rw-r--r--cui/source/inc/cuitabarea.hxx34
-rw-r--r--cui/source/inc/cuitabline.hxx14
-rw-r--r--cui/source/inc/sdrcelldlg.hxx4
-rw-r--r--cui/source/inc/treeopt.hxx6
-rw-r--r--cui/source/options/optchart.cxx4
-rw-r--r--cui/source/options/optchart.hxx4
-rw-r--r--cui/source/options/optcolor.cxx2
-rw-r--r--cui/source/options/treeopt.cxx4
-rw-r--r--cui/source/tabpages/backgrnd.cxx4
-rw-r--r--cui/source/tabpages/border.cxx6
-rw-r--r--cui/source/tabpages/chardlg.cxx10
-rw-r--r--cui/source/tabpages/numpages.cxx4
-rw-r--r--cui/source/tabpages/tpbitmap.cxx10
-rw-r--r--cui/source/tabpages/tpcolor.cxx10
-rw-r--r--cui/source/tabpages/tpline.cxx30
-rw-r--r--cui/source/tabpages/tplnedef.cxx8
-rw-r--r--cui/source/tabpages/tplneend.cxx7
-rw-r--r--default_images/res/soliline.pngbin153 -> 0 bytes
-rwxr-xr-xdefault_images/sc/res/sidebar/123.pngbin0 -> 3471 bytes
-rwxr-xr-xdefault_images/sc/res/sidebar/ABC.pngbin0 -> 971 bytes
-rwxr-xr-xdefault_images/sc/res/sidebar/CellBorder.pngbin0 -> 178 bytes
-rwxr-xr-xdefault_images/sc/res/sidebar/CellBorderLineStyle_005.pngbin0 -> 2836 bytes
-rwxr-xr-xdefault_images/sc/res/sidebar/CellBorderLineStyle_005_h.pngbin0 -> 2835 bytes
-rwxr-xr-xdefault_images/sc/res/sidebar/CellBorderLineStyle_110.pngbin0 -> 2839 bytes
-rwxr-xr-xdefault_images/sc/res/sidebar/CellBorderLineStyle_110_h.pngbin0 -> 2845 bytes
-rwxr-xr-xdefault_images/sc/res/sidebar/CellBorderLineStyle_250.pngbin0 -> 2837 bytes
-rwxr-xr-xdefault_images/sc/res/sidebar/CellBorderLineStyle_250_h.pngbin0 -> 2835 bytes
-rwxr-xr-xdefault_images/sc/res/sidebar/CellBorderLineStyle_260.pngbin0 -> 2837 bytes
-rwxr-xr-xdefault_images/sc/res/sidebar/CellBorderLineStyle_260_h.pngbin0 -> 2845 bytes
-rwxr-xr-xdefault_images/sc/res/sidebar/CellBorderLineStyle_400.pngbin0 -> 2836 bytes
-rwxr-xr-xdefault_images/sc/res/sidebar/CellBorderLineStyle_400_h.pngbin0 -> 2836 bytes
-rwxr-xr-xdefault_images/sc/res/sidebar/CellBorderLineStyle_450.pngbin0 -> 2837 bytes
-rwxr-xr-xdefault_images/sc/res/sidebar/CellBorderLineStyle_450_h.pngbin0 -> 2845 bytes
-rwxr-xr-xdefault_images/sc/res/sidebar/CellBorderLineStyle_500.pngbin0 -> 2838 bytes
-rwxr-xr-xdefault_images/sc/res/sidebar/CellBorderLineStyle_500_h.pngbin0 -> 2837 bytes
-rwxr-xr-xdefault_images/sc/res/sidebar/CellBorderLineStyle_505.pngbin0 -> 2839 bytes
-rwxr-xr-xdefault_images/sc/res/sidebar/CellBorderLineStyle_505_h.pngbin0 -> 2845 bytes
-rwxr-xr-xdefault_images/sc/res/sidebar/CellBorderLineStyle_750.pngbin0 -> 2839 bytes
-rwxr-xr-xdefault_images/sc/res/sidebar/CellBorderLineStyle_750_h.pngbin0 -> 2846 bytes
-rwxr-xr-xdefault_images/sc/res/sidebar/CellBorder_All_18x18.pngbin0 -> 225 bytes
-rwxr-xr-xdefault_images/sc/res/sidebar/CellBorder_All_18x18_h.pngbin0 -> 155 bytes
-rwxr-xr-xdefault_images/sc/res/sidebar/CellBorder_Bottom_18x18.pngbin0 -> 247 bytes
-rwxr-xr-xdefault_images/sc/res/sidebar/CellBorder_Bottom_18x18_h.pngbin0 -> 149 bytes
-rwxr-xr-xdefault_images/sc/res/sidebar/CellBorder_Bottom_Double_18x18.pngbin0 -> 241 bytes
-rwxr-xr-xdefault_images/sc/res/sidebar/CellBorder_Bottom_Double_18x18_h.pngbin0 -> 154 bytes
-rwxr-xr-xdefault_images/sc/res/sidebar/CellBorder_Bottom_Thick_18x18.pngbin0 -> 241 bytes
-rwxr-xr-xdefault_images/sc/res/sidebar/CellBorder_Bottom_Thick_18x18_h.pngbin0 -> 149 bytes
-rwxr-xr-xdefault_images/sc/res/sidebar/CellBorder_Empty_18x18.pngbin0 -> 251 bytes
-rwxr-xr-xdefault_images/sc/res/sidebar/CellBorder_Empty_18x18_h.pngbin0 -> 134 bytes
-rwxr-xr-xdefault_images/sc/res/sidebar/CellBorder_FourBorders_18x18.pngbin0 -> 210 bytes
-rwxr-xr-xdefault_images/sc/res/sidebar/CellBorder_FourBorders_18x18_h.pngbin0 -> 154 bytes
-rwxr-xr-xdefault_images/sc/res/sidebar/CellBorder_FourBorders_Thick_18x18.pngbin0 -> 178 bytes
-rwxr-xr-xdefault_images/sc/res/sidebar/CellBorder_FourBorders_Thick_18x18_h.pngbin0 -> 155 bytes
-rwxr-xr-xdefault_images/sc/res/sidebar/CellBorder_LeftAndRight_18x18.pngbin0 -> 226 bytes
-rwxr-xr-xdefault_images/sc/res/sidebar/CellBorder_LeftAndRight_18x18_h.pngbin0 -> 169 bytes
-rwxr-xr-xdefault_images/sc/res/sidebar/CellBorder_LeftDiagonal_18x18.pngbin0 -> 276 bytes
-rwxr-xr-xdefault_images/sc/res/sidebar/CellBorder_LeftDiagonal_18x18_h.pngbin0 -> 252 bytes
-rwxr-xr-xdefault_images/sc/res/sidebar/CellBorder_Left_18x18.pngbin0 -> 245 bytes
-rwxr-xr-xdefault_images/sc/res/sidebar/CellBorder_Left_18x18_h.pngbin0 -> 159 bytes
-rwxr-xr-xdefault_images/sc/res/sidebar/CellBorder_RightDiagonal_18x18.pngbin0 -> 270 bytes
-rwxr-xr-xdefault_images/sc/res/sidebar/CellBorder_RightDiagonal_18x18_h.pngbin0 -> 213 bytes
-rwxr-xr-xdefault_images/sc/res/sidebar/CellBorder_Right_18x18.pngbin0 -> 247 bytes
-rwxr-xr-xdefault_images/sc/res/sidebar/CellBorder_Right_18x18_h.pngbin0 -> 163 bytes
-rwxr-xr-xdefault_images/sc/res/sidebar/CellBorder_TopAndBottom_18x18.pngbin0 -> 247 bytes
-rwxr-xr-xdefault_images/sc/res/sidebar/CellBorder_TopAndBottom_18x18_h.pngbin0 -> 150 bytes
-rwxr-xr-xdefault_images/sc/res/sidebar/CellBorder_TopSingle_BottomDouble_18x18.pngbin0 -> 237 bytes
-rwxr-xr-xdefault_images/sc/res/sidebar/CellBorder_TopSingle_BottomDouble_18x18_h.pngbin0 -> 151 bytes
-rwxr-xr-xdefault_images/sc/res/sidebar/CellBorder_TopThin_BottomThick_18x18.pngbin0 -> 231 bytes
-rwxr-xr-xdefault_images/sc/res/sidebar/CellBorder_TopThin_BottomThick_18x18_h.pngbin0 -> 152 bytes
-rwxr-xr-xdefault_images/sc/res/sidebar/CellBorder_Top_18x18.pngbin0 -> 245 bytes
-rwxr-xr-xdefault_images/sc/res/sidebar/CellBorder_Top_18x18_h.pngbin0 -> 159 bytes
-rwxr-xr-xdefault_images/sc/res/sidebar/Line_color.pngbin0 -> 3481 bytes
-rwxr-xr-xdefault_images/sc/res/sidebar/canlendar.pngbin0 -> 4682 bytes
-rwxr-xr-xdefault_images/sc/res/sidebar/fill_color.pngbin0 -> 3658 bytes
-rwxr-xr-xdefault_images/sc/res/sidebar/fill_color_h.pngbin0 -> 3483 bytes
-rwxr-xr-xdefault_images/sc/res/sidebar/money.pngbin0 -> 4246 bytes
-rwxr-xr-xdefault_images/sc/res/sidebar/morebutton.bmpbin0 -> 5346 bytes
-rwxr-xr-xdefault_images/sc/res/sidebar/morebutton_h.bmpbin0 -> 5346 bytes
-rwxr-xr-xdefault_images/sc/res/sidebar/percent.pngbin0 -> 3211 bytes
-rwxr-xr-xdefault_images/sc/res/sidebar/sc_alignbottom.pngbin0 -> 2905 bytes
-rwxr-xr-xdefault_images/sc/res/sidebar/sc_aligncenter.pngbin0 -> 2938 bytes
-rwxr-xr-xdefault_images/sc/res/sidebar/sc_aligncenter_v.pngbin0 -> 2906 bytes
-rwxr-xr-xdefault_images/sc/res/sidebar/sc_alignjust.pngbin0 -> 2888 bytes
-rwxr-xr-xdefault_images/sc/res/sidebar/sc_alignleft.pngbin0 -> 2902 bytes
-rwxr-xr-xdefault_images/sc/res/sidebar/sc_alignright.pngbin0 -> 2878 bytes
-rwxr-xr-xdefault_images/sc/res/sidebar/sc_aligntop.pngbin0 -> 2902 bytes
-rwxr-xr-xdefault_images/sfx2/res/grip.pngbin0 -> 183 bytes
-rwxr-xr-xdefault_images/sfx2/res/grip_hc.pngbin0 -> 188 bytes
-rwxr-xr-xdefault_images/sfx2/res/menu.pngbin0 -> 213 bytes
-rwxr-xr-xdefault_images/sfx2/res/menu_hc.pngbin0 -> 216 bytes
-rw-r--r--default_images/sfx2/res/minus_hc.pngbin0 -> 220 bytes
-rw-r--r--default_images/sfx2/res/plus_hc.pngbin0 -> 228 bytes
-rwxr-xr-xdefault_images/sfx2/res/separator.pngbin0 -> 177 bytes
-rwxr-xr-xdefault_images/sfx2/res/symphony/morebutton.pngbin0 -> 3023 bytes
-rwxr-xr-xdefault_images/sfx2/res/symphony/morebutton_h.pngbin0 -> 3023 bytes
-rwxr-xr-xdefault_images/sfx2/res/symphony/open_more.pngbin0 -> 2958 bytes
-rwxr-xr-xdefault_images/sfx2/res/symphony/sidebar-3d-large-hc.pngbin0 -> 4072 bytes
-rwxr-xr-xdefault_images/sfx2/res/symphony/sidebar-3d-large.pngbin0 -> 4072 bytes
-rwxr-xr-xdefault_images/sfx2/res/symphony/sidebar-3d-small-hc.pngbin0 -> 3522 bytes
-rwxr-xr-xdefault_images/sfx2/res/symphony/sidebar-3d-small.pngbin0 -> 3522 bytes
-rwxr-xr-xdefault_images/sfx2/res/symphony/sidebar-animation-large-hc.pngbin0 -> 4000 bytes
-rwxr-xr-xdefault_images/sfx2/res/symphony/sidebar-animation-large.pngbin0 -> 4000 bytes
-rwxr-xr-xdefault_images/sfx2/res/symphony/sidebar-animation-small-hc.pngbin0 -> 3553 bytes
-rwxr-xr-xdefault_images/sfx2/res/symphony/sidebar-animation-small.pngbin0 -> 3553 bytes
-rwxr-xr-xdefault_images/sfx2/res/symphony/sidebar-colors-large-hc.pngbin0 -> 3790 bytes
-rwxr-xr-xdefault_images/sfx2/res/symphony/sidebar-colors-large.pngbin0 -> 3790 bytes
-rwxr-xr-xdefault_images/sfx2/res/symphony/sidebar-colors-small-hc.pngbin0 -> 3544 bytes
-rwxr-xr-xdefault_images/sfx2/res/symphony/sidebar-colors-small.pngbin0 -> 3544 bytes
-rwxr-xr-xdefault_images/sfx2/res/symphony/sidebar-eyedropper-large-hc.pngbin0 -> 3416 bytes
-rwxr-xr-xdefault_images/sfx2/res/symphony/sidebar-eyedropper-large.pngbin0 -> 3416 bytes
-rwxr-xr-xdefault_images/sfx2/res/symphony/sidebar-eyedropper-small-hc.pngbin0 -> 3534 bytes
-rwxr-xr-xdefault_images/sfx2/res/symphony/sidebar-eyedropper-small.pngbin0 -> 3534 bytes
-rw-r--r--default_images/sfx2/res/symphony/sidebar-functions-large-hc.pngbin0 -> 3834 bytes
-rw-r--r--default_images/sfx2/res/symphony/sidebar-functions-large.pngbin0 -> 3834 bytes
-rw-r--r--default_images/sfx2/res/symphony/sidebar-functions-small-hc.pngbin0 -> 3395 bytes
-rw-r--r--default_images/sfx2/res/symphony/sidebar-functions-small.pngbin0 -> 3395 bytes
-rwxr-xr-xdefault_images/sfx2/res/symphony/sidebar-gallery-large-hc.pngbin0 -> 1492 bytes
-rwxr-xr-xdefault_images/sfx2/res/symphony/sidebar-gallery-large.pngbin0 -> 1492 bytes
-rwxr-xr-xdefault_images/sfx2/res/symphony/sidebar-gallery-small-hc.pngbin0 -> 3642 bytes
-rwxr-xr-xdefault_images/sfx2/res/symphony/sidebar-gallery-small.pngbin0 -> 3642 bytes
-rwxr-xr-xdefault_images/sfx2/res/symphony/sidebar-imganim-large-hc.pngbin0 -> 1710 bytes
-rwxr-xr-xdefault_images/sfx2/res/symphony/sidebar-imganim-large.pngbin0 -> 1710 bytes
-rwxr-xr-xdefault_images/sfx2/res/symphony/sidebar-imganim-small-hc.pngbin0 -> 3640 bytes
-rwxr-xr-xdefault_images/sfx2/res/symphony/sidebar-imganim-small.pngbin0 -> 3640 bytes
-rwxr-xr-xdefault_images/sfx2/res/symphony/sidebar-navigator-large-hc.pngbin0 -> 4333 bytes
-rwxr-xr-xdefault_images/sfx2/res/symphony/sidebar-navigator-large.pngbin0 -> 4333 bytes
-rwxr-xr-xdefault_images/sfx2/res/symphony/sidebar-navigator-small-hc.pngbin0 -> 3665 bytes
-rwxr-xr-xdefault_images/sfx2/res/symphony/sidebar-navigator-small.pngbin0 -> 3665 bytes
-rwxr-xr-xdefault_images/sfx2/res/symphony/sidebar-property-large-hc.pngbin0 -> 3761 bytes
-rwxr-xr-xdefault_images/sfx2/res/symphony/sidebar-property-large.pngbin0 -> 3761 bytes
-rwxr-xr-xdefault_images/sfx2/res/symphony/sidebar-property-small-hc.pngbin0 -> 3515 bytes
-rwxr-xr-xdefault_images/sfx2/res/symphony/sidebar-property-small.pngbin0 -> 3515 bytes
-rwxr-xr-xdefault_images/sfx2/res/symphony/sidebar-style-large-hc.pngbin0 -> 4323 bytes
-rwxr-xr-xdefault_images/sfx2/res/symphony/sidebar-style-large.pngbin0 -> 4323 bytes
-rwxr-xr-xdefault_images/sfx2/res/symphony/sidebar-style-small-hc.pngbin0 -> 3714 bytes
-rwxr-xr-xdefault_images/sfx2/res/symphony/sidebar-style-small.pngbin0 -> 3714 bytes
-rwxr-xr-xdefault_images/sfx2/res/symphony/sidebar-template-large-hc.pngbin0 -> 3510 bytes
-rwxr-xr-xdefault_images/sfx2/res/symphony/sidebar-template-large.pngbin0 -> 3510 bytes
-rwxr-xr-xdefault_images/sfx2/res/symphony/sidebar-template-small-hc.pngbin0 -> 3221 bytes
-rwxr-xr-xdefault_images/sfx2/res/symphony/sidebar-template-small.pngbin0 -> 3221 bytes
-rwxr-xr-xdefault_images/sfx2/res/symphony/sidebar-transition-large-hc.pngbin0 -> 3728 bytes
-rwxr-xr-xdefault_images/sfx2/res/symphony/sidebar-transition-large.pngbin0 -> 3728 bytes
-rwxr-xr-xdefault_images/sfx2/res/symphony/sidebar-transition-small-hc.pngbin0 -> 3475 bytes
-rwxr-xr-xdefault_images/sfx2/res/symphony/sidebar-transition-small.pngbin0 -> 3475 bytes
-rwxr-xr-xdefault_images/svx/res/rotation.pngbin0 -> 3650 bytes
-rwxr-xr-xdefault_images/svx/res/rotation_h.pngbin0 -> 3848 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/ bin0 -> 4015 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/AdjustColorBlue_16x16.pngbin0 -> 563 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/AdjustColorGamma_16x16.pngbin0 -> 663 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/AdjustColorGreen_16x16.pngbin0 -> 560 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/AdjustColorRed_16x16.pngbin0 -> 560 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/AlignTextCenter_16x16.pngbin0 -> 2938 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/AlignTextJustified_16x16.pngbin0 -> 2888 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/AlignTextLeft_16x16.pngbin0 -> 2902 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/AlignTextRight_16x16.pngbin0 -> 2878 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/ColorModeBlackWhite_16x16.pngbin0 -> 444 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/ColorModeGrey_16x16.pngbin0 -> 485 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/ColorModeNormal_16x16.pngbin0 -> 1206 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/ColorModeWaterMark_16x16.pngbin0 -> 1080 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/DecreaseSpace_16x16.pngbin0 -> 3261 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/FlipHorizontally_16x16.pngbin0 -> 3071 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/FlipVertically_16x16.pngbin0 -> 3123 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/Highlight.pngbin0 -> 3280 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/IncreaseSpace_16x16.pngbin0 -> 3170 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/Indent2.pngbin0 -> 2949 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/Indent3.pngbin0 -> 2974 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/Indent4.pngbin0 -> 2950 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/Indent_16x16.pngbin0 -> 3094 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/Indent_Hanging.pngbin0 -> 3459 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/Line_color.pngbin0 -> 3481 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/Outdent_16x16.pngbin0 -> 3105 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/Quadratic.pngbin0 -> 3525 bytes
-rw-r--r--default_images/svx/res/symphony/Quadratic_h.pngbin0 -> 3538 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/Square.pngbin0 -> 3035 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/Square_h.pngbin0 -> 3033 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/__morebutton.bmpbin0 -> 5346 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/__morebutton_h.bmpbin0 -> 5346 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/axial.pngbin0 -> 2898 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/axial_h.pngbin0 -> 2897 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/blank.pngbin0 -> 2820 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/decrease font.pngbin0 -> 2919 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/ellipsoid.pngbin0 -> 3136 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/ellipsoid_h.pngbin0 -> 3140 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/enlarge font.pngbin0 -> 2935 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/fill_color.pngbin0 -> 3517 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/fill_color_h.pngbin0 -> 3366 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/icon_normal.pngbin0 -> 2938 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/last_custom_common.pngbin0 -> 3431 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/last_custom_common_grey.pngbin0 -> 3385 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/line1.pngbin0 -> 2827 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/line10.pngbin0 -> 2845 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/line10_h.pngbin0 -> 2894 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/line1_h.pngbin0 -> 2816 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/line2.pngbin0 -> 2833 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/line2_h.pngbin0 -> 2825 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/line3.pngbin0 -> 2839 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/line3_h.pngbin0 -> 2817 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/line4.pngbin0 -> 2835 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/line4_h.pngbin0 -> 2832 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/line5.pngbin0 -> 2829 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/line5_h.pngbin0 -> 2867 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/line6.pngbin0 -> 2826 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/line6_h.pngbin0 -> 2867 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/line7.pngbin0 -> 2834 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/line7_h.pngbin0 -> 2834 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/line8.pngbin0 -> 2857 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/line8_h.pngbin0 -> 2873 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/line9.pngbin0 -> 2843 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/line9_h.pngbin0 -> 2881 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/linear.pngbin0 -> 2930 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/linear_h.pngbin0 -> 2930 bytes
-rw-r--r--default_images/svx/res/symphony/list.txt70
-rwxr-xr-xdefault_images/svx/res/symphony/lpselected-spacing-1.pngbin0 -> 2880 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/lpselected-spacing-1_15.pngbin0 -> 2879 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/lpselected-spacing-1_5.pngbin0 -> 2881 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/lpselected-spacing-2.pngbin0 -> 2878 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/lpsmall-spacing-1.pngbin0 -> 2898 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/lpspacing-1.pngbin0 -> 3003 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/lpspacing-1_15.pngbin0 -> 2993 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/lpspacing-1_5.pngbin0 -> 2992 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/lpspacing-2.pngbin0 -> 2994 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/no color.pngbin0 -> 3979 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/para_numbullet01.pngbin0 -> 3013 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/para_numbullet02.pngbin0 -> 3195 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/para_numbullet_rtl01.pngbin0 -> 3003 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/para_numbullet_rtl02.pngbin0 -> 3178 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/para_numbulleth01.pngbin0 -> 259 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/para_numbulleth02.pngbin0 -> 293 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/para_vert01.pngbin0 -> 2902 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/para_vert02.pngbin0 -> 2906 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/para_vert03.pngbin0 -> 2905 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/para_verth01.pngbin0 -> 312 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/para_verth02.pngbin0 -> 319 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/para_verth03.pngbin0 -> 302 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/radial.pngbin0 -> 3085 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/radial_h.pngbin0 -> 3086 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/rotate_left.pngbin0 -> 3173 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/rotate_right.pngbin0 -> 3191 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/rotation.pngbin0 -> 4817 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/rotation_h.pngbin0 -> 3880 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/rte_Indent_16x16.pngbin0 -> 3081 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/rte_Outdent_16x16.pngbin0 -> 3101 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/sc_backgroundcolor.pngbin0 -> 3625 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/sc_bold.pngbin0 -> 468 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/sc_color.pngbin0 -> 3464 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/sc_italic.pngbin0 -> 451 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/sc_shadowed.pngbin0 -> 3323 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/sc_strikeout.pngbin0 -> 604 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/sc_subscript.pngbin0 -> 2930 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/sc_superscript.pngbin0 -> 2932 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/sc_underline.pngbin0 -> 414 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/sch_backgroundcolor.pngbin0 -> 3410 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/selected-line1.pngbin0 -> 2830 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/selected-line10.pngbin0 -> 2858 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/selected-line2.pngbin0 -> 2854 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/selected-line3.pngbin0 -> 2831 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/selected-line4.pngbin0 -> 2833 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/selected-line5.pngbin0 -> 2837 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/selected-line6.pngbin0 -> 2833 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/selected-line7.pngbin0 -> 2835 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/selected-line8.pngbin0 -> 2837 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/selected-line9.pngbin0 -> 2846 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/spacing1.pngbin0 -> 2933 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/spacing2.pngbin0 -> 2911 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/spacing3.pngbin0 -> 2965 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/spacing_loose.pngbin0 -> 2941 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/spacing_loose_s.pngbin0 -> 2915 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/spacing_normal.pngbin0 -> 2941 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/spacing_normal_s.pngbin0 -> 2912 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/spacing_tight.pngbin0 -> 2940 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/spacing_tight_s.pngbin0 -> 2912 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/spacing_very loose.pngbin0 -> 2941 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/spacing_very loose_s.pngbin0 -> 2937 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/spacing_very tight.pngbin0 -> 2930 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/spacing_very tight_s.pngbin0 -> 2906 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/style_line1.pngbin0 -> 2870 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/style_line10.pngbin0 -> 2880 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/style_line10_h.pngbin0 -> 2901 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/style_line10_hh.pngbin0 -> 2887 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/style_line11.pngbin0 -> 2876 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/style_line11_h.pngbin0 -> 2897 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/style_line11_hh.pngbin0 -> 2882 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/style_line1_h.pngbin0 -> 2886 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/style_line1_hh.pngbin0 -> 2867 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/style_line2.pngbin0 -> 2865 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/style_line2_h.pngbin0 -> 2882 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/style_line2_hh.pngbin0 -> 2869 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/style_line3.pngbin0 -> 2874 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/style_line3_h.pngbin0 -> 2891 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/style_line3_hh.pngbin0 -> 2881 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/style_line4.pngbin0 -> 2873 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/style_line4_h.pngbin0 -> 2891 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/style_line4_hh.pngbin0 -> 2879 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/style_line5.pngbin0 -> 2878 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/style_line5_h.pngbin0 -> 2894 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/style_line5_hh.pngbin0 -> 2880 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/style_line6.pngbin0 -> 2871 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/style_line6_h.pngbin0 -> 2888 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/style_line6_hh.pngbin0 -> 2883 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/style_line7.pngbin0 -> 2873 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/style_line7_h.pngbin0 -> 2887 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/style_line7_hh.pngbin0 -> 2867 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/style_line8.pngbin0 -> 2883 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/style_line8_h.pngbin0 -> 2903 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/style_line8_hh.pngbin0 -> 2889 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/style_line9.pngbin0 -> 2877 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/style_line9_h.pngbin0 -> 2897 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/style_line9_hh.pngbin0 -> 2885 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/width1.pngbin0 -> 2829 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/width1_h.pngbin0 -> 2827 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/width2.pngbin0 -> 2834 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/width2_h.pngbin0 -> 2834 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/width3.pngbin0 -> 2834 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/width3_h.pngbin0 -> 2834 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/width4.pngbin0 -> 2834 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/width4_h.pngbin0 -> 2834 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/width5.pngbin0 -> 2835 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/width5_h.pngbin0 -> 2835 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/width6.pngbin0 -> 2836 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/width6_h.pngbin0 -> 2836 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/width7.pngbin0 -> 2834 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/width7_h.pngbin0 -> 2835 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/width8.pngbin0 -> 2834 bytes
-rwxr-xr-xdefault_images/svx/res/symphony/width8_h.pngbin0 -> 2835 bytes
-rwxr-xr-xdefault_images/sw/res/sidebar/pageproppanel/Landscapecopy_24x24.pngbin0 -> 4806 bytes
-rwxr-xr-xdefault_images/sw/res/sidebar/pageproppanel/column1_24x24.pngbin0 -> 2978 bytes
-rwxr-xr-xdefault_images/sw/res/sidebar/pageproppanel/column2_24x24.pngbin0 -> 3018 bytes
-rwxr-xr-xdefault_images/sw/res/sidebar/pageproppanel/column3_24x24.pngbin0 -> 3017 bytes
-rwxr-xr-xdefault_images/sw/res/sidebar/pageproppanel/column_L_1_24x24.pngbin0 -> 2902 bytes
-rwxr-xr-xdefault_images/sw/res/sidebar/pageproppanel/column_L_2_24x24.pngbin0 -> 2904 bytes
-rwxr-xr-xdefault_images/sw/res/sidebar/pageproppanel/column_L_3_24x24.pngbin0 -> 2921 bytes
-rwxr-xr-xdefault_images/sw/res/sidebar/pageproppanel/column_L_copy_24x24.pngbin0 -> 2878 bytes
-rwxr-xr-xdefault_images/sw/res/sidebar/pageproppanel/column_L_left_24x24.pngbin0 -> 2907 bytes
-rwxr-xr-xdefault_images/sw/res/sidebar/pageproppanel/column_L_right_24x24.pngbin0 -> 2909 bytes
-rwxr-xr-xdefault_images/sw/res/sidebar/pageproppanel/columncopy_24x24.pngbin0 -> 2912 bytes
-rwxr-xr-xdefault_images/sw/res/sidebar/pageproppanel/columnleft_24x24.pngbin0 -> 3010 bytes
-rwxr-xr-xdefault_images/sw/res/sidebar/pageproppanel/columnright_24x24.pngbin0 -> 3013 bytes
-rwxr-xr-xdefault_images/sw/res/sidebar/pageproppanel/documentsizeA3_24x24.pngbin0 -> 1161 bytes
-rwxr-xr-xdefault_images/sw/res/sidebar/pageproppanel/documentsizeA4_24x24.pngbin0 -> 1143 bytes
-rwxr-xr-xdefault_images/sw/res/sidebar/pageproppanel/documentsizeA5_24x24.pngbin0 -> 1156 bytes
-rwxr-xr-xdefault_images/sw/res/sidebar/pageproppanel/documentsizeB4_24x24.pngbin0 -> 1148 bytes
-rwxr-xr-xdefault_images/sw/res/sidebar/pageproppanel/documentsizeB5_24x24.pngbin0 -> 1157 bytes
-rwxr-xr-xdefault_images/sw/res/sidebar/pageproppanel/documentsizeC5_24x24.pngbin0 -> 1175 bytes
-rwxr-xr-xdefault_images/sw/res/sidebar/pageproppanel/documentsize_L_A3_24x24.pngbin0 -> 1187 bytes
-rwxr-xr-xdefault_images/sw/res/sidebar/pageproppanel/documentsize_L_A4_24x24.pngbin0 -> 1172 bytes
-rwxr-xr-xdefault_images/sw/res/sidebar/pageproppanel/documentsize_L_A5_24x24.pngbin0 -> 1189 bytes
-rwxr-xr-xdefault_images/sw/res/sidebar/pageproppanel/documentsize_L_B4_24x24.pngbin0 -> 1186 bytes
-rwxr-xr-xdefault_images/sw/res/sidebar/pageproppanel/documentsize_L_B5_24x24.pngbin0 -> 1194 bytes
-rwxr-xr-xdefault_images/sw/res/sidebar/pageproppanel/documentsize_L_C5_24x24.pngbin0 -> 1207 bytes
-rwxr-xr-xdefault_images/sw/res/sidebar/pageproppanel/documentsize_L_copy_24x24.pngbin0 -> 1097 bytes
-rwxr-xr-xdefault_images/sw/res/sidebar/pageproppanel/documentsizecopy_24x24.pngbin0 -> 1071 bytes
-rwxr-xr-xdefault_images/sw/res/sidebar/pageproppanel/format_L_copy_24x24.pngbin0 -> 2878 bytes
-rwxr-xr-xdefault_images/sw/res/sidebar/pageproppanel/format_L_mirror_24x24.pngbin0 -> 2906 bytes
-rwxr-xr-xdefault_images/sw/res/sidebar/pageproppanel/format_L_narrow_24x24.pngbin0 -> 2914 bytes
-rwxr-xr-xdefault_images/sw/res/sidebar/pageproppanel/format_L_nomal_24x24.pngbin0 -> 2913 bytes
-rwxr-xr-xdefault_images/sw/res/sidebar/pageproppanel/format_L_wide_24x24.pngbin0 -> 2915 bytes
-rwxr-xr-xdefault_images/sw/res/sidebar/pageproppanel/formatcopy_24x24.pngbin0 -> 2912 bytes
-rwxr-xr-xdefault_images/sw/res/sidebar/pageproppanel/formatmirror_24x24.pngbin0 -> 2905 bytes
-rwxr-xr-xdefault_images/sw/res/sidebar/pageproppanel/formatnarrow_24x24.pngbin0 -> 2970 bytes
-rwxr-xr-xdefault_images/sw/res/sidebar/pageproppanel/formatnormal_24x24.pngbin0 -> 2954 bytes
-rwxr-xr-xdefault_images/sw/res/sidebar/pageproppanel/formatwide_24x24.pngbin0 -> 2975 bytes
-rwxr-xr-xdefault_images/sw/res/sidebar/pageproppanel/last_custom_common.pngbin0 -> 3431 bytes
-rwxr-xr-xdefault_images/sw/res/sidebar/pageproppanel/last_custom_common_grey.pngbin0 -> 3385 bytes
-rwxr-xr-xdefault_images/sw/res/sidebar/pageproppanel/portraitcopy_24x24.pngbin0 -> 5118 bytes
-rw-r--r--editeng/inc/editeng/itemtype.hxx1
-rw-r--r--editeng/inc/editeng/outliner.hxx7
-rw-r--r--editeng/source/items/textitem.cxx10
-rw-r--r--editeng/source/outliner/outliner.cxx47
-rw-r--r--editeng/source/outliner/outlvw.cxx320
-rw-r--r--extensions/source/propctrlr/standardcontrol.cxx4
-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.hxx144
-rw-r--r--framework/inc/services/EventMultiplexer.hxx122
-rw-r--r--framework/source/register/registerservices.cxx38
-rw-r--r--framework/source/services/ContextChangeEventMultiplexer.cxx389
-rw-r--r--framework/source/services/EventMultiplexer.cxx270
-rw-r--r--framework/util/fwk.component4
-rw-r--r--offapi/com/sun/star/ui/ContextChangeEventMultiplexer.idl40
-rw-r--r--offapi/com/sun/star/ui/ContextChangeEventObject.idl53
-rw-r--r--offapi/com/sun/star/ui/LayoutSize.idl50
-rw-r--r--offapi/com/sun/star/ui/XContextChangeEventListener.idl47
-rw-r--r--offapi/com/sun/star/ui/XContextChangeEventMultiplexer.idl131
-rw-r--r--offapi/com/sun/star/ui/XContextChangeListener.idl51
-rw-r--r--offapi/com/sun/star/ui/XSidebar.idl46
-rw-r--r--offapi/com/sun/star/ui/XSidebarPanel.idl64
-rw-r--r--offapi/com/sun/star/ui/makefile.mk7
-rw-r--r--offapi/com/sun/star/util/EventMultiplexer.idl40
-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.xcu987
-rw-r--r--officecfg/registry/data/org/openoffice/Office/UI/makefile.mk1
-rw-r--r--officecfg/registry/data/org/openoffice/Office/Views.xcu8
-rw-r--r--officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs208
-rw-r--r--officecfg/registry/schema/org/openoffice/Office/UI/makefile.mk3
-rw-r--r--postprocess/packregistry/makefile.mk2
-rw-r--r--reportdesign/source/ui/dlg/Condition.cxx2
-rw-r--r--reportdesign/source/ui/misc/UITools.cxx6
-rwxr-xr-xsc/inc/ScPanelFactory.hxx70
-rw-r--r--sc/inc/document.hxx6
-rw-r--r--sc/inc/helpids.h67
-rw-r--r--sc/inc/sc.hrc20
-rw-r--r--sc/prj/build.lst3
-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.sdi50
-rw-r--r--sc/source/core/data/docpool.cxx3
-rw-r--r--sc/source/core/data/documen9.cxx4
-rw-r--r--sc/source/core/data/drwlayer.cxx4
-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.cxx9
-rw-r--r--sc/source/ui/dbgui/scendlg.cxx2
-rw-r--r--sc/source/ui/docshell/docfunc.cxx5
-rw-r--r--sc/source/ui/docshell/docsh2.cxx2
-rw-r--r--sc/source/ui/docshell/docsh4.cxx2
-rw-r--r--sc/source/ui/drawfunc/chartsh.cxx8
-rw-r--r--sc/source/ui/drawfunc/drawsh.cxx30
-rw-r--r--sc/source/ui/drawfunc/drawsh2.cxx33
-rw-r--r--sc/source/ui/drawfunc/drawsh4.cxx2
-rw-r--r--sc/source/ui/drawfunc/drawsh5.cxx4
-rw-r--r--sc/source/ui/drawfunc/drformsh.cxx5
-rw-r--r--sc/source/ui/drawfunc/drtxtob.cxx239
-rw-r--r--sc/source/ui/drawfunc/drtxtob1.cxx6
-rw-r--r--sc/source/ui/drawfunc/drtxtob2.cxx2
-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/miscdlgs/tabbgcolordlg.cxx6
-rw-r--r--sc/source/ui/navipi/navipi.cxx64
-rw-r--r--sc/source/ui/optdlg/opredlin.cxx2
-rw-r--r--sc/source/ui/optdlg/tpview.cxx4
-rwxr-xr-xsc/source/ui/sidebar/AlignmentPropertyPanel.cxx636
-rwxr-xr-xsc/source/ui/sidebar/AlignmentPropertyPanel.hrc88
-rwxr-xr-xsc/source/ui/sidebar/AlignmentPropertyPanel.hxx130
-rwxr-xr-xsc/source/ui/sidebar/AlignmentPropertyPanel.src217
-rwxr-xr-xsc/source/ui/sidebar/CellAppearancePropertyPanel.cxx879
-rwxr-xr-xsc/source/ui/sidebar/CellAppearancePropertyPanel.hrc149
-rwxr-xr-xsc/source/ui/sidebar/CellAppearancePropertyPanel.hxx214
-rwxr-xr-xsc/source/ui/sidebar/CellAppearancePropertyPanel.src612
-rwxr-xr-xsc/source/ui/sidebar/CellBorderStyleControl.cxx364
-rwxr-xr-xsc/source/ui/sidebar/CellBorderStyleControl.hxx61
-rwxr-xr-xsc/source/ui/sidebar/CellBorderStylePopup.cxx42
-rwxr-xr-xsc/source/ui/sidebar/CellBorderStylePopup.hxx43
-rwxr-xr-xsc/source/ui/sidebar/CellBorderUpdater.cxx127
-rwxr-xr-xsc/source/ui/sidebar/CellBorderUpdater.hxx46
-rwxr-xr-xsc/source/ui/sidebar/CellLineStyleControl.cxx246
-rwxr-xr-xsc/source/ui/sidebar/CellLineStyleControl.hxx72
-rwxr-xr-xsc/source/ui/sidebar/CellLineStylePopup.cxx54
-rwxr-xr-xsc/source/ui/sidebar/CellLineStylePopup.hxx45
-rwxr-xr-xsc/source/ui/sidebar/CellLineStyleValueSet.cxx184
-rwxr-xr-xsc/source/ui/sidebar/CellLineStyleValueSet.hxx54
-rwxr-xr-xsc/source/ui/sidebar/NumberFormatPropertyPanel.cxx389
-rwxr-xr-xsc/source/ui/sidebar/NumberFormatPropertyPanel.hrc74
-rwxr-xr-xsc/source/ui/sidebar/NumberFormatPropertyPanel.hxx108
-rwxr-xr-xsc/source/ui/sidebar/NumberFormatPropertyPanel.src187
-rwxr-xr-xsc/source/ui/sidebar/ScPanelFactory.cxx173
-rwxr-xr-x[-rw-r--r--]sc/source/ui/sidebar/makefile.mk (renamed from sd/source/ui/toolpanel/makefile.mk)48
-rw-r--r--sc/source/ui/unoobj/appluno.cxx112
-rw-r--r--sc/source/ui/view/auditsh.cxx4
-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.cxx49
-rw-r--r--sc/source/ui/view/formatsh.cxx539
-rw-r--r--sc/source/ui/view/gridwin.cxx26
-rw-r--r--sc/source/ui/view/pivotsh.cxx3
-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/makefile.mk2
-rw-r--r--sc/util/sc.component3
-rw-r--r--sd/inc/glob.hrc5
-rw-r--r--sd/inc/glob.hxx2
-rw-r--r--sd/inc/sdabstdlg.hxx4
-rw-r--r--sd/prj/build.lst5
-rw-r--r--sd/sdi/ToolPanelViewShell.sdi127
-rw-r--r--sd/sdi/_drvwsh.sdi247
-rw-r--r--sd/sdi/drtxtob.sdi20
-rw-r--r--sd/sdi/makefile.mk2
-rw-r--r--sd/sdi/outlnvsh.sdi15
-rw-r--r--sd/sdi/sdslots.sdi3
-rw-r--r--sd/source/core/typemap.cxx7
-rw-r--r--sd/source/ui/accessibility/makefile.mk5
-rw-r--r--sd/source/ui/animations/CustomAnimationDialog.cxx8
-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.cxx87
-rw-r--r--sd/source/ui/dlg/PaneShells.cxx29
-rw-r--r--sd/source/ui/dlg/copydlg.cxx2
-rw-r--r--sd/source/ui/dlg/navigatr.cxx70
-rw-r--r--sd/source/ui/dlg/sddlgfact.cxx2
-rw-r--r--sd/source/ui/dlg/sddlgfact.hxx2
-rw-r--r--sd/source/ui/docshell/docshel3.cxx2
-rw-r--r--sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx15
-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/TaskPanelFactory.cxx319
-rw-r--r--sd/source/ui/framework/factories/TaskPanelFactory.hxx92
-rw-r--r--sd/source/ui/framework/factories/TaskPanelResource.cxx133
-rw-r--r--sd/source/ui/framework/factories/ViewShellWrapper.cxx2
-rw-r--r--sd/source/ui/framework/factories/makefile.mk1
-rw-r--r--sd/source/ui/framework/module/ImpressModule.cxx2
-rw-r--r--sd/source/ui/framework/module/ModuleController.cxx15
-rw-r--r--sd/source/ui/framework/module/ToolPanelModule.cxx4
-rw-r--r--sd/source/ui/framework/tools/FrameworkHelper.cxx175
-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.cxx402
-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.hxx53
-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.hxx6
-rw-r--r--sd/source/ui/inc/celltempl.hxx4
-rw-r--r--sd/source/ui/inc/copydlg.hxx6
-rw-r--r--sd/source/ui/inc/dlgpage.hxx4
-rw-r--r--sd/source/ui/inc/framework/FrameworkHelper.hxx132
-rw-r--r--sd/source/ui/inc/framework/Pane.hxx1
-rw-r--r--sd/source/ui/inc/framework/TaskPanelResource.hxx85
-rw-r--r--sd/source/ui/inc/fuolbull.hxx7
-rw-r--r--sd/source/ui/inc/navigatr.hxx22
-rw-r--r--sd/source/ui/inc/prltempl.hxx4
-rw-r--r--sd/source/ui/inc/tabtempl.hxx4
-rw-r--r--sd/source/ui/inc/taskpane/ILayoutableWindow.hxx98
-rw-r--r--sd/source/ui/inc/taskpane/PanelId.hxx59
-rw-r--r--sd/source/ui/inc/tpaction.hxx2
-rw-r--r--sd/source/ui/presenter/PresenterHelper.hxx2
-rw-r--r--sd/source/ui/sidebar/AllMasterPagesSelector.cxx (renamed from sd/source/ui/toolpanel/controls/AllMasterPagesSelector.cxx)59
-rw-r--r--sd/source/ui/sidebar/AllMasterPagesSelector.hxx (renamed from sd/source/ui/toolpanel/controls/AllMasterPagesSelector.hxx)33
-rw-r--r--sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx (renamed from sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx)100
-rw-r--r--sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx (renamed from sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.hxx)47
-rw-r--r--sd/source/ui/sidebar/CustomAnimationPanel.cxx79
-rw-r--r--sd/source/ui/sidebar/CustomAnimationPanel.hxx50
-rw-r--r--sd/source/ui/sidebar/DocumentHelper.cxx (renamed from sd/source/ui/toolpanel/controls/DocumentHelper.cxx)9
-rw-r--r--sd/source/ui/sidebar/DocumentHelper.hxx (renamed from sd/source/ui/toolpanel/controls/DocumentHelper.hxx)10
-rw-r--r--sd/source/ui/sidebar/IDisposable.hxx44
-rw-r--r--sd/source/ui/sidebar/ISidebarReceiver.hxx40
-rw-r--r--sd/source/ui/sidebar/LayoutMenu.cxx (renamed from sd/source/ui/toolpanel/LayoutMenu.cxx)354
-rw-r--r--sd/source/ui/sidebar/LayoutMenu.hxx (renamed from sd/source/ui/toolpanel/LayoutMenu.hxx)68
-rw-r--r--sd/source/ui/sidebar/MasterPageContainer.cxx (renamed from sd/source/ui/toolpanel/controls/MasterPageContainer.cxx)10
-rw-r--r--sd/source/ui/sidebar/MasterPageContainer.hxx (renamed from sd/source/ui/toolpanel/controls/MasterPageContainer.hxx)10
-rw-r--r--sd/source/ui/sidebar/MasterPageContainerFiller.cxx (renamed from sd/source/ui/toolpanel/controls/MasterPageContainerFiller.cxx)8
-rw-r--r--sd/source/ui/sidebar/MasterPageContainerFiller.hxx (renamed from sd/source/ui/toolpanel/controls/MasterPageContainerFiller.hxx)10
-rw-r--r--sd/source/ui/sidebar/MasterPageContainerProviders.cxx (renamed from sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx)9
-rw-r--r--sd/source/ui/sidebar/MasterPageContainerProviders.hxx (renamed from sd/source/ui/toolpanel/controls/MasterPageContainerProviders.hxx)12
-rw-r--r--sd/source/ui/sidebar/MasterPageContainerQueue.cxx (renamed from sd/source/ui/toolpanel/controls/MasterPageContainerQueue.cxx)7
-rw-r--r--sd/source/ui/sidebar/MasterPageContainerQueue.hxx (renamed from sd/source/ui/toolpanel/controls/MasterPageContainerQueue.hxx)10
-rw-r--r--sd/source/ui/sidebar/MasterPageDescriptor.cxx (renamed from sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx)7
-rw-r--r--sd/source/ui/sidebar/MasterPageDescriptor.hxx (renamed from sd/source/ui/toolpanel/controls/MasterPageDescriptor.hxx)10
-rw-r--r--sd/source/ui/sidebar/MasterPageObserver.cxx (renamed from sd/source/ui/toolpanel/controls/MasterPageObserver.cxx)3
-rw-r--r--sd/source/ui/sidebar/MasterPagesSelector.cxx (renamed from sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx)377
-rw-r--r--sd/source/ui/sidebar/MasterPagesSelector.hxx (renamed from sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx)48
-rw-r--r--sd/source/ui/sidebar/NavigatorWrapper.cxx89
-rw-r--r--sd/source/ui/sidebar/NavigatorWrapper.hxx72
-rw-r--r--sd/source/ui/sidebar/PanelBase.cxx130
-rw-r--r--sd/source/ui/sidebar/PanelBase.hxx90
-rw-r--r--sd/source/ui/sidebar/PanelFactory.cxx212
-rw-r--r--sd/source/ui/sidebar/PanelFactory.hxx88
-rw-r--r--sd/source/ui/sidebar/PreviewValueSet.cxx (renamed from sd/source/ui/toolpanel/controls/PreviewValueSet.cxx)61
-rw-r--r--sd/source/ui/sidebar/PreviewValueSet.hxx (renamed from sd/source/ui/toolpanel/controls/PreviewValueSet.hxx)33
-rw-r--r--sd/source/ui/sidebar/RecentMasterPagesSelector.cxx (renamed from sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.cxx)64
-rw-r--r--sd/source/ui/sidebar/RecentMasterPagesSelector.hxx (renamed from sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.hxx)37
-rw-r--r--sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx (renamed from sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.cxx)17
-rw-r--r--sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx (renamed from sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.hxx)8
-rw-r--r--sd/source/ui/sidebar/SidebarFactory.cxx240
-rw-r--r--sd/source/ui/sidebar/SidebarFactory.hxx120
-rw-r--r--sd/source/ui/sidebar/SidebarFocusManager.hxx (renamed from sd/source/ui/toolpanel/TaskPaneFocusManager.hxx)0
-rw-r--r--sd/source/ui/sidebar/SidebarShellManager.cxx (renamed from sd/source/ui/toolpanel/TaskPaneShellManager.cxx)33
-rw-r--r--sd/source/ui/sidebar/SidebarShellManager.hxx (renamed from sd/source/ui/toolpanel/TaskPaneShellManager.hxx)14
-rw-r--r--sd/source/ui/sidebar/SlideTransitionPanel.cxx76
-rw-r--r--sd/source/ui/sidebar/SlideTransitionPanel.hxx (renamed from sd/source/ui/toolpanel/ControlList.hxx)42
-rw-r--r--sd/source/ui/sidebar/TableDesignPanel.cxx73
-rw-r--r--sd/source/ui/sidebar/TableDesignPanel.hxx49
-rw-r--r--sd/source/ui/sidebar/makefile.mk (renamed from sd/source/ui/toolpanel/controls/makefile.mk)20
-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/ConstrainedIterator.cxx263
-rw-r--r--sd/source/ui/toolpanel/ConstrainedIterator.hxx100
-rw-r--r--sd/source/ui/toolpanel/ControlContainer.cxx441
-rw-r--r--sd/source/ui/toolpanel/ControlContainerDescriptor.hxx135
-rw-r--r--sd/source/ui/toolpanel/MethodGuard.hxx64
-rw-r--r--sd/source/ui/toolpanel/ScrollPanel.cxx811
-rw-r--r--sd/source/ui/toolpanel/SlideSorterCacheDisplay.cxx368
-rw-r--r--sd/source/ui/toolpanel/SubToolPanel.cxx386
-rw-r--r--sd/source/ui/toolpanel/TaskPaneFocusManager.cxx328
-rw-r--r--sd/source/ui/toolpanel/TaskPaneTreeNode.cxx288
-rw-r--r--sd/source/ui/toolpanel/TestMenu.cxx314
-rw-r--r--sd/source/ui/toolpanel/TestPanel.cxx170
-rw-r--r--sd/source/ui/toolpanel/TitleBar.cxx581
-rw-r--r--sd/source/ui/toolpanel/TitledControl.cxx428
-rw-r--r--sd/source/ui/toolpanel/ToolPanel.cxx110
-rw-r--r--sd/source/ui/toolpanel/ToolPanel.hxx77
-rw-r--r--sd/source/ui/toolpanel/ToolPanelDescriptor.hxx85
-rw-r--r--sd/source/ui/toolpanel/ToolPanelFactory.cxx252
-rw-r--r--sd/source/ui/toolpanel/ToolPanelUIElement.cxx131
-rw-r--r--sd/source/ui/toolpanel/ToolPanelUIElement.hxx84
-rw-r--r--sd/source/ui/toolpanel/ToolPanelViewShell.cxx900
-rw-r--r--sd/source/ui/toolpanel/controls/AnimationSchemesPanel.cxx135
-rw-r--r--sd/source/ui/toolpanel/controls/AnimationSchemesPanel.hxx104
-rw-r--r--sd/source/ui/toolpanel/controls/CustomAnimationPanel.cxx109
-rw-r--r--sd/source/ui/toolpanel/controls/CustomAnimationPanel.hxx77
-rw-r--r--sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx154
-rw-r--r--sd/source/ui/toolpanel/controls/MasterPagesPanel.hxx68
-rw-r--r--sd/source/ui/toolpanel/controls/SlideTransitionPanel.cxx112
-rw-r--r--sd/source/ui/toolpanel/controls/SlideTransitionPanel.hxx77
-rw-r--r--sd/source/ui/toolpanel/controls/TableDesignPanel.cxx106
-rw-r--r--sd/source/ui/toolpanel/controls/TableDesignPanel.hxx77
-rw-r--r--sd/source/ui/unoidl/UnoDocumentSettings.cxx2
-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.cxx44
-rw-r--r--sd/source/ui/view/drtxtob1.cxx83
-rw-r--r--sd/source/ui/view/drviews2.cxx284
-rw-r--r--sd/source/ui/view/drviews3.cxx97
-rw-r--r--sd/source/ui/view/drviews6.cxx4
-rw-r--r--sd/source/ui/view/drviews7.cxx16
-rw-r--r--sd/source/ui/view/drviews8.cxx17
-rw-r--r--sd/source/ui/view/drviewsa.cxx31
-rw-r--r--sd/source/ui/view/drviewsc.cxx2
-rw-r--r--sd/source/ui/view/drviewsf.cxx292
-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.cxx13
-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/makefile.mk13
-rw-r--r--sd/util/sd.component7
-rw-r--r--sfx2/AllLangResTarget_sfx2.mk1
-rwxr-xr-xsfx2/Library_sfx.mk31
-rw-r--r--sfx2/Package_inc.mk10
-rw-r--r--sfx2/inc/sfx2/navigat.hxx2
-rw-r--r--sfx2/inc/sfx2/sfx.hrc1
-rw-r--r--sfx2/inc/sfx2/sfxsids.hrc1
-rw-r--r--sfx2/inc/sfx2/shell.hxx2
-rw-r--r--sfx2/inc/sfx2/sidebar/ContextChangeBroadcaster.hxx62
-rw-r--r--sfx2/inc/sfx2/sidebar/ControlFactory.hxx50
-rw-r--r--sfx2/inc/sfx2/sidebar/ControllerItem.hxx58
-rw-r--r--sfx2/inc/sfx2/sidebar/EnumContext.hxx173
-rw-r--r--sfx2/inc/sfx2/sidebar/IContextChangeReceiver.hxx40
-rw-r--r--sfx2/inc/sfx2/sidebar/ILayoutableWindow.hxx47
-rwxr-xr-xsfx2/inc/sfx2/sidebar/PopupContainer.hxx41
-rw-r--r--sfx2/inc/sfx2/sidebar/SidebarChildWindow.hxx52
-rw-r--r--sfx2/inc/sfx2/sidebar/SidebarPanelBase.hxx128
-rw-r--r--sfx2/inc/sfx2/sidebar/Theme.hxx282
-rw-r--r--sfx2/inc/sfx2/sidebar/propertypanel.hrc132
-rw-r--r--sfx2/inc/sfx2/templdlg.hxx26
-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.cxx202
-rwxr-xr-xsfx2/source/inc/helpid.hrc2
-rw-r--r--sfx2/source/inc/templdgi.hxx14
-rwxr-xr-xsfx2/source/sidebar/AsynchronousCall.cxx93
-rwxr-xr-xsfx2/source/sidebar/AsynchronousCall.hxx55
-rw-r--r--sfx2/source/sidebar/Context.cxx122
-rw-r--r--sfx2/source/sidebar/Context.hxx69
-rw-r--r--sfx2/source/sidebar/ContextChangeBroadcaster.cxx140
-rw-r--r--sfx2/source/sidebar/ContextList.cxx111
-rw-r--r--sfx2/source/sidebar/ContextList.hxx73
-rw-r--r--sfx2/source/sidebar/ContextMatcher.cxx140
-rw-r--r--sfx2/source/sidebar/ContextMatcher.hxx75
-rw-r--r--sfx2/source/sidebar/ControlFactory.cxx88
-rw-r--r--sfx2/source/sidebar/ControllerItem.cxx58
-rw-r--r--sfx2/source/sidebar/CustomImageRadioButton.cxx82
-rw-r--r--sfx2/source/sidebar/CustomImageRadioButton.hxx49
-rw-r--r--sfx2/source/sidebar/Deck.cxx389
-rw-r--r--sfx2/source/sidebar/Deck.hxx105
-rw-r--r--sfx2/source/sidebar/DeckConfiguration.cxx55
-rw-r--r--sfx2/source/sidebar/DeckConfiguration.hxx49
-rw-r--r--sfx2/source/sidebar/DeckDescriptor.cxx62
-rw-r--r--sfx2/source/sidebar/DeckDescriptor.hxx53
-rw-r--r--sfx2/source/sidebar/DeckLayouter.cxx524
-rw-r--r--sfx2/source/sidebar/DeckLayouter.hxx123
-rw-r--r--sfx2/source/sidebar/DeckTitleBar.cxx148
-rw-r--r--sfx2/source/sidebar/DeckTitleBar.hxx61
-rw-r--r--sfx2/source/sidebar/DrawHelper.cxx249
-rw-r--r--sfx2/source/sidebar/DrawHelper.hxx78
-rw-r--r--sfx2/source/sidebar/EnumContext.cxx332
-rw-r--r--sfx2/source/sidebar/FocusManager.cxx565
-rw-r--r--sfx2/source/sidebar/FocusManager.hxx112
-rw-r--r--sfx2/source/sidebar/MenuButton.cxx157
-rw-r--r--sfx2/source/sidebar/MenuButton.hxx56
-rw-r--r--sfx2/source/sidebar/Paint.cxx142
-rw-r--r--sfx2/source/sidebar/Paint.hxx84
-rw-r--r--sfx2/source/sidebar/Panel.cxx272
-rw-r--r--sfx2/source/sidebar/Panel.hxx90
-rw-r--r--sfx2/source/sidebar/PanelDescriptor.cxx65
-rw-r--r--sfx2/source/sidebar/PanelDescriptor.hxx53
-rw-r--r--sfx2/source/sidebar/PanelTitleBar.cxx190
-rw-r--r--sfx2/source/sidebar/PanelTitleBar.hxx66
-rwxr-xr-xsfx2/source/sidebar/PopupContainer.cxx54
-rw-r--r--sfx2/source/sidebar/ResourceManager.cxx631
-rw-r--r--sfx2/source/sidebar/ResourceManager.hxx125
-rw-r--r--sfx2/source/sidebar/Sidebar.cxx81
-rw-r--r--sfx2/source/sidebar/Sidebar.hrc87
-rw-r--r--sfx2/source/sidebar/Sidebar.hxx68
-rw-r--r--sfx2/source/sidebar/Sidebar.src295
-rw-r--r--sfx2/source/sidebar/SidebarChildWindow.cxx61
-rw-r--r--sfx2/source/sidebar/SidebarController.cxx934
-rw-r--r--sfx2/source/sidebar/SidebarController.hxx169
-rw-r--r--sfx2/source/sidebar/SidebarDockingWindow.cxx136
-rw-r--r--sfx2/source/sidebar/SidebarDockingWindow.hxx67
-rw-r--r--sfx2/source/sidebar/SidebarPanel.cxx175
-rw-r--r--sfx2/source/sidebar/SidebarPanel.hxx78
-rw-r--r--sfx2/source/sidebar/SidebarPanelBase.cxx252
-rw-r--r--sfx2/source/sidebar/SidebarResource.hxx39
-rw-r--r--sfx2/source/sidebar/SidebarToolBox.cxx159
-rw-r--r--sfx2/source/sidebar/SidebarToolBox.hxx56
-rw-r--r--sfx2/source/sidebar/TabBar.cxx401
-rw-r--r--sfx2/source/sidebar/TabBar.hxx124
-rw-r--r--sfx2/source/sidebar/TabItem.cxx150
-rw-r--r--sfx2/source/sidebar/TabItem.hxx58
-rw-r--r--sfx2/source/sidebar/Theme.cxx1174
-rw-r--r--sfx2/source/sidebar/TitleBar.cxx198
-rw-r--r--sfx2/source/sidebar/TitleBar.hxx76
-rwxr-xr-xsfx2/source/sidebar/ToolBox.hxx56
-rwxr-xr-xsfx2/source/sidebar/ToolBoxBackground.cxx154
-rwxr-xr-xsfx2/source/sidebar/ToolBoxBackground.hxx68
-rw-r--r--sfx2/source/sidebar/Tools.cxx156
-rw-r--r--sfx2/source/sidebar/Tools.hxx63
-rw-r--r--sfx2/source/view/viewfrm.cxx12
-rw-r--r--svx/AllLangResTarget_svx.mk8
-rw-r--r--svx/Library_svx.mk41
-rw-r--r--svx/Library_svxcore.mk3
-rw-r--r--svx/Package_inc.mk16
-rw-r--r--svx/inc/GalleryControl.hxx80
-rw-r--r--svx/inc/galbrws2.hxx5
-rw-r--r--svx/inc/helpid.hrc122
-rw-r--r--svx/inc/sidebar/PanelFactory.hxx74
-rwxr-xr-xsvx/inc/svx/AffineMatrixItem.hxx58
-rwxr-xr-xsvx/inc/svx/XPropertyEntry.hxx51
-rw-r--r--svx/inc/svx/XPropertyTable.hxx2
-rw-r--r--svx/inc/svx/bmpmask.hxx4
-rw-r--r--svx/inc/svx/colrctrl.hxx4
-rw-r--r--svx/inc/svx/dialcontrol.hxx65
-rw-r--r--svx/inc/svx/dialogs.hrc96
-rw-r--r--svx/inc/svx/dlgctrl.hxx29
-rw-r--r--svx/inc/svx/dlgutil.hxx3
-rw-r--r--svx/inc/svx/drawitem.hxx10
-rw-r--r--svx/inc/svx/fontwork.hxx4
-rw-r--r--svx/inc/svx/galbrws.hxx11
-rwxr-xr-xsvx/inc/svx/nbdtmg.hxx390
-rwxr-xr-xsvx/inc/svx/nbdtmgfact.hxx37
-rwxr-xr-x[-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.hxx86
-rw-r--r--svx/inc/svx/sidebar/ColorPopup.hxx55
-rw-r--r--svx/inc/svx/sidebar/ContextChangeEventMultiplexer.hxx69
-rw-r--r--svx/inc/svx/sidebar/Popup.hxx107
-rw-r--r--svx/inc/svx/sidebar/PopupContainer.hxx48
-rw-r--r--svx/inc/svx/sidebar/PopupControl.hxx51
-rw-r--r--svx/inc/svx/sidebar/SelectionAnalyzer.hxx66
-rw-r--r--svx/inc/svx/sidebar/SelectionChangeHandler.hxx89
-rw-r--r--svx/inc/svx/sidebar/SidebarDialControl.hxx45
-rw-r--r--svx/inc/svx/sidebar/ValueSetWithTextControl.hxx161
-rw-r--r--svx/inc/svx/svdedtv.hxx1
-rw-r--r--svx/inc/svx/svdedxv.hxx3
-rw-r--r--svx/inc/svx/svdmodel.hxx13
-rw-r--r--svx/inc/svx/svdobj.hxx4
-rw-r--r--svx/inc/svx/svdogrp.hxx3
-rw-r--r--svx/inc/svx/svdstr.hrc5
-rwxr-xr-xsvx/inc/svx/svxids.hrc27
-rw-r--r--svx/inc/svx/svxitems.hrc3
-rw-r--r--svx/inc/svx/xattr.hxx26
-rw-r--r--svx/inc/svx/xcolit.hxx4
-rw-r--r--svx/inc/svx/xenum.hxx8
-rw-r--r--svx/inc/svx/xflgrit.hxx2
-rw-r--r--svx/inc/svx/xflhtit.hxx2
-rw-r--r--svx/inc/svx/xit.hxx12
-rw-r--r--svx/inc/svx/xlineit.hxx2
-rw-r--r--svx/inc/svx/xlinjoit.hxx9
-rw-r--r--svx/inc/svx/xlncapit.hxx2
-rw-r--r--svx/inc/svx/xlndsit.hxx2
-rw-r--r--svx/inc/svx/xlnedit.hxx2
-rw-r--r--svx/inc/svx/xlnstit.hxx2
-rw-r--r--svx/inc/svx/xtable.hxx348
-rw-r--r--svx/sdi/svx.sdi873
-rw-r--r--svx/sdi/xoitems.sdi26
-rw-r--r--svx/source/dialog/_bmpmask.cxx2
-rw-r--r--svx/source/dialog/dialcontrol.cxx87
-rw-r--r--svx/source/dialog/dlgctrl.cxx200
-rw-r--r--svx/source/dialog/dlgutil.cxx9
-rw-r--r--svx/source/dialog/fontwork.cxx2
-rw-r--r--svx/source/dialog/sdstring.src2
-rw-r--r--svx/source/dialog/svxbmpnumvalueset.src3
-rw-r--r--svx/source/gallery2/GalleryControl.cxx302
-rw-r--r--svx/source/gallery2/GallerySplitter.cxx55
-rw-r--r--svx/source/gallery2/GallerySplitter.hxx45
-rw-r--r--svx/source/gallery2/galbrws.cxx149
-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/gallery2/gallery1.cxx7
-rw-r--r--svx/source/items/drawitem.cxx4
-rw-r--r--svx/source/items/svxitems.src7
-rw-r--r--svx/source/sdr/attribute/sdrformtextattribute.cxx14
-rw-r--r--svx/source/sdr/primitive2d/sdrattributecreator.cxx45
-rw-r--r--svx/source/sidebar/ColorPanel.cxx233
-rw-r--r--svx/source/sidebar/ColorPanel.hxx (renamed from sd/source/ui/toolpanel/TestMenu.hxx)43
-rw-r--r--svx/source/sidebar/ContextChangeEventMultiplexer.cxx91
-rw-r--r--svx/source/sidebar/EmptyPanel.cxx80
-rw-r--r--svx/source/sidebar/EmptyPanel.hrc (renamed from svx/source/inc/linectrl.hrc)4
-rw-r--r--svx/source/sidebar/EmptyPanel.hxx (renamed from sd/source/ui/toolpanel/TestPanel.hxx)36
-rw-r--r--svx/source/sidebar/EmptyPanel.src33
-rw-r--r--svx/source/sidebar/PanelFactory.cxx209
-rw-r--r--svx/source/sidebar/SelectionAnalyzer.cxx461
-rw-r--r--svx/source/sidebar/SelectionChangeHandler.cxx119
-rw-r--r--svx/source/sidebar/area/AreaPropertyPanel.cxx1373
-rw-r--r--svx/source/sidebar/area/AreaPropertyPanel.hrc96
-rw-r--r--svx/source/sidebar/area/AreaPropertyPanel.hxx211
-rw-r--r--svx/source/sidebar/area/AreaPropertyPanel.src423
-rw-r--r--svx/source/sidebar/area/AreaTransparencyGradientControl.cxx349
-rw-r--r--svx/source/sidebar/area/AreaTransparencyGradientControl.hxx78
-rw-r--r--svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx60
-rw-r--r--svx/source/sidebar/area/AreaTransparencyGradientPopup.hxx51
-rw-r--r--svx/source/sidebar/debug/ColorPanel.cxx233
-rw-r--r--svx/source/sidebar/debug/ColorPanel.hxx61
-rw-r--r--svx/source/sidebar/debug/ContextPanel.cxx69
-rw-r--r--svx/source/sidebar/debug/ContextPanel.hxx56
-rw-r--r--svx/source/sidebar/debug/NotYetImplementedPanel.cxx49
-rw-r--r--svx/source/sidebar/debug/NotYetImplementedPanel.hxx47
-rw-r--r--svx/source/sidebar/gallery/GalleryPanel.hxx (renamed from svx/source/tbxctrls/linectrl.src)10
-rw-r--r--svx/source/sidebar/graphic/GraphicPropertyPanel.cxx459
-rw-r--r--svx/source/sidebar/graphic/GraphicPropertyPanel.hrc82
-rw-r--r--svx/source/sidebar/graphic/GraphicPropertyPanel.hxx127
-rw-r--r--svx/source/sidebar/graphic/GraphicPropertyPanel.src257
-rw-r--r--svx/source/sidebar/line/LinePropertyPanel.cxx1161
-rw-r--r--svx/source/sidebar/line/LinePropertyPanel.hrc140
-rw-r--r--svx/source/sidebar/line/LinePropertyPanel.hxx198
-rw-r--r--svx/source/sidebar/line/LinePropertyPanel.src614
-rw-r--r--svx/source/sidebar/line/LineStyleValueSet.cxx134
-rw-r--r--svx/source/sidebar/line/LineStyleValueSet.hxx51
-rw-r--r--svx/source/sidebar/line/LineWidthControl.cxx376
-rw-r--r--svx/source/sidebar/line/LineWidthControl.hxx75
-rw-r--r--svx/source/sidebar/line/LineWidthPopup.cxx88
-rw-r--r--svx/source/sidebar/line/LineWidthPopup.hxx53
-rw-r--r--svx/source/sidebar/line/LineWidthValueSet.cxx196
-rw-r--r--svx/source/sidebar/line/LineWidthValueSet.hxx57
-rwxr-xr-xsvx/source/sidebar/nbdtmg.cxx2101
-rwxr-xr-xsvx/source/sidebar/nbdtmgfact.cxx51
-rwxr-xr-xsvx/source/sidebar/paragraph/ParaBulletsControl.cxx145
-rwxr-xr-xsvx/source/sidebar/paragraph/ParaBulletsControl.hxx61
-rwxr-xr-xsvx/source/sidebar/paragraph/ParaBulletsPopup.cxx63
-rwxr-xr-xsvx/source/sidebar/paragraph/ParaBulletsPopup.hxx53
-rwxr-xr-xsvx/source/sidebar/paragraph/ParaLineSpacingControl.cxx819
-rwxr-xr-xsvx/source/sidebar/paragraph/ParaLineSpacingControl.hxx116
-rwxr-xr-xsvx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx82
-rwxr-xr-xsvx/source/sidebar/paragraph/ParaLineSpacingPopup.hxx53
-rwxr-xr-xsvx/source/sidebar/paragraph/ParaNumberingControl.cxx171
-rwxr-xr-xsvx/source/sidebar/paragraph/ParaNumberingControl.hxx65
-rwxr-xr-xsvx/source/sidebar/paragraph/ParaNumberingPopup.cxx64
-rwxr-xr-xsvx/source/sidebar/paragraph/ParaNumberingPopup.hxx54
-rwxr-xr-xsvx/source/sidebar/paragraph/ParaPropertyPanel.cxx1686
-rwxr-xr-xsvx/source/sidebar/paragraph/ParaPropertyPanel.hrc378
-rwxr-xr-xsvx/source/sidebar/paragraph/ParaPropertyPanel.hxx290
-rwxr-xr-xsvx/source/sidebar/paragraph/ParaPropertyPanel.src982
-rw-r--r--svx/source/sidebar/possize/PosSizePropertyPanel.cxx1229
-rw-r--r--svx/source/sidebar/possize/PosSizePropertyPanel.hrc108
-rw-r--r--svx/source/sidebar/possize/PosSizePropertyPanel.hxx182
-rw-r--r--svx/source/sidebar/possize/PosSizePropertyPanel.src227
-rw-r--r--svx/source/sidebar/possize/SidebarDialControl.cxx86
-rw-r--r--svx/source/sidebar/possize/SidebarDialControlBmp.cxx94
-rw-r--r--svx/source/sidebar/possize/SidebarDialControlBmp.hxx47
-rw-r--r--svx/source/sidebar/text/SvxSBFontNameBox.cxx178
-rw-r--r--svx/source/sidebar/text/SvxSBFontNameBox.hxx80
-rw-r--r--svx/source/sidebar/text/TextCharacterSpacingControl.cxx468
-rw-r--r--svx/source/sidebar/text/TextCharacterSpacingControl.hxx96
-rw-r--r--svx/source/sidebar/text/TextCharacterSpacingPopup.cxx79
-rw-r--r--svx/source/sidebar/text/TextCharacterSpacingPopup.hxx48
-rw-r--r--svx/source/sidebar/text/TextPropertyPanel.cxx1591
-rw-r--r--svx/source/sidebar/text/TextPropertyPanel.hrc227
-rw-r--r--svx/source/sidebar/text/TextPropertyPanel.hxx246
-rw-r--r--svx/source/sidebar/text/TextPropertyPanel.src801
-rw-r--r--svx/source/sidebar/text/TextUnderlineControl.cxx281
-rw-r--r--svx/source/sidebar/text/TextUnderlineControl.hxx94
-rw-r--r--svx/source/sidebar/text/TextUnderlinePopup.cxx60
-rw-r--r--svx/source/sidebar/text/TextUnderlinePopup.hxx47
-rw-r--r--svx/source/sidebar/tools/ColorControl.cxx228
-rw-r--r--svx/source/sidebar/tools/ColorPopup.cxx60
-rw-r--r--svx/source/sidebar/tools/Popup.cxx148
-rw-r--r--svx/source/sidebar/tools/PopupContainer.cxx57
-rw-r--r--svx/source/sidebar/tools/PopupControl.cxx62
-rw-r--r--svx/source/sidebar/tools/ValueSetWithTextControl.cxx529
-rw-r--r--svx/source/svdraw/svdedtv1.cxx141
-rw-r--r--svx/source/svdraw/svdedxv.cxx32
-rw-r--r--svx/source/svdraw/svdfmtf.cxx10
-rw-r--r--svx/source/svdraw/svdmodel.cxx4
-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.src10
-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.cxx6
-rw-r--r--svx/source/tbxctrls/tbxcolorupdate.cxx16
-rw-r--r--svx/source/unodraw/XPropertyTable.cxx27
-rw-r--r--svx/source/unodraw/unoctabl.cxx33
-rwxr-xr-x[-rw-r--r--]svx/source/xoutdev/XPropertyEntry.cxx (renamed from sd/source/ui/toolpanel/TaskPaneControlFactory.cxx)31
-rw-r--r--svx/source/xoutdev/xattr.cxx24
-rw-r--r--svx/source/xoutdev/xattr2.cxx171
-rw-r--r--svx/source/xoutdev/xpool.cxx7
-rw-r--r--svx/source/xoutdev/xtabbtmp.cxx120
-rw-r--r--svx/source/xoutdev/xtabcolr.cxx330
-rw-r--r--svx/source/xoutdev/xtabdash.cxx185
-rw-r--r--svx/source/xoutdev/xtabgrdt.cxx136
-rw-r--r--svx/source/xoutdev/xtabhtch.cxx134
-rw-r--r--svx/source/xoutdev/xtable.cxx387
-rw-r--r--svx/source/xoutdev/xtablend.cxx149
-rw-r--r--svx/util/svx.component3
-rw-r--r--sw/AllLangResTarget_sw.mk2
-rw-r--r--sw/Library_sw.mk7
-rw-r--r--sw/inc/SwPanelFactory.hxx74
-rw-r--r--sw/inc/cmdid.h17
-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.hxx5
-rw-r--r--sw/inc/swcommands.h6
-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.sdi35
-rw-r--r--sw/sdi/swriter.sdi209
-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/draw/drawdoc.cxx6
-rw-r--r--sw/source/core/edit/ednumber.cxx81
-rw-r--r--sw/source/core/frmedt/feshview.cxx2
-rw-r--r--sw/source/ui/app/docsh2.cxx2
-rw-r--r--sw/source/ui/app/docshdrw.cxx2
-rw-r--r--sw/source/ui/app/docshini.cxx4
-rw-r--r--sw/source/ui/app/docst.cxx27
-rw-r--r--sw/source/ui/app/mn.src12
-rw-r--r--sw/source/ui/app/swmodule.cxx4
-rw-r--r--sw/source/ui/config/optpage.cxx2
-rw-r--r--sw/source/ui/dialog/swdlgfact.cxx4
-rw-r--r--sw/source/ui/dialog/swdlgfact.hxx2
-rw-r--r--sw/source/ui/fmtui/tmpdlg.cxx19
-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/misc/pggrid.cxx2
-rw-r--r--sw/source/ui/shells/annotsh.cxx103
-rw-r--r--sw/source/ui/shells/basesh.cxx10
-rw-r--r--sw/source/ui/shells/beziersh.cxx6
-rw-r--r--sw/source/ui/shells/drawdlg.cxx27
-rw-r--r--sw/source/ui/shells/drawsh.cxx13
-rw-r--r--sw/source/ui/shells/drformsh.cxx5
-rw-r--r--sw/source/ui/shells/drwbassh.cxx24
-rw-r--r--sw/source/ui/shells/drwtxtex.cxx77
-rw-r--r--sw/source/ui/shells/drwtxtsh.cxx74
-rw-r--r--sw/source/ui/shells/frmsh.cxx90
-rw-r--r--sw/source/ui/shells/grfsh.cxx14
-rw-r--r--sw/source/ui/shells/mediash.cxx2
-rw-r--r--sw/source/ui/shells/olesh.cxx4
-rw-r--r--sw/source/ui/shells/slotadd.cxx5
-rw-r--r--sw/source/ui/shells/tabsh.cxx27
-rw-r--r--sw/source/ui/shells/textsh.cxx4
-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.cxx115
-rw-r--r--sw/source/ui/sidebar/PageColumnControl.hxx67
-rw-r--r--sw/source/ui/sidebar/PageMarginControl.cxx523
-rw-r--r--sw/source/ui/sidebar/PageMarginControl.hxx124
-rw-r--r--sw/source/ui/sidebar/PageOrientationControl.cxx93
-rw-r--r--sw/source/ui/sidebar/PageOrientationControl.hxx58
-rw-r--r--sw/source/ui/sidebar/PagePropertyPanel.cxx766
-rw-r--r--sw/source/ui/sidebar/PagePropertyPanel.hrc200
-rw-r--r--sw/source/ui/sidebar/PagePropertyPanel.hxx223
-rw-r--r--sw/source/ui/sidebar/PagePropertyPanel.src698
-rw-r--r--sw/source/ui/sidebar/PageSizeControl.cxx186
-rw-r--r--sw/source/ui/sidebar/PageSizeControl.hxx73
-rw-r--r--sw/source/ui/sidebar/PropertyPanel.hrc42
-rw-r--r--sw/source/ui/sidebar/SwPanelFactory.cxx152
-rw-r--r--sw/source/ui/sidebar/WrapPropertyPanel.cxx266
-rw-r--r--sw/source/ui/sidebar/WrapPropertyPanel.hrc42
-rw-r--r--sw/source/ui/sidebar/WrapPropertyPanel.hxx89
-rw-r--r--sw/source/ui/sidebar/WrapPropertyPanel.src90
-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.cxx2534
-rw-r--r--sw/source/ui/uno/unofreg.cxx13
-rw-r--r--sw/source/ui/utlui/navipi.cxx158
-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/vcl/button.hxx10
-rw-r--r--vcl/inc/vcl/split.hxx6
-rw-r--r--vcl/inc/vcl/window.hxx8
-rw-r--r--vcl/inc/window.h3
-rw-r--r--vcl/source/window/split.cxx59
-rw-r--r--vcl/source/window/window.cxx9
-rw-r--r--vcl/source/window/window4.cxx27
1071 files changed, 62120 insertions, 13259 deletions
diff --git a/chart2/source/controller/dialogs/dlg_View3D.cxx b/chart2/source/controller/dialogs/dlg_View3D.cxx
index 2da22870b8bb..5f818a6573c7 100644
--- a/chart2/source/controller/dialogs/dlg_View3D.cxx
+++ b/chart2/source/controller/dialogs/dlg_View3D.cxx
@@ -55,7 +55,7 @@ using namespace ::com::sun::star::chart2;
sal_uInt16 View3DDialog::m_nLastPageId = 0;
-View3DDialog::View3DDialog(Window* pParent, const uno::Reference< frame::XModel > & xChartModel, XColorTable* pColorTable )
+View3DDialog::View3DDialog(Window* pParent, const uno::Reference< frame::XModel > & xChartModel, XColorList* pColorTable )
: TabDialog(pParent,SchResId(DLG_3D_VIEW))
, m_aTabControl(this,SchResId(TABCTRL))
, m_aBtnOK(this,SchResId(BTN_OK))
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
index 74674970187f..00f9f5a64987 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
@@ -284,7 +284,7 @@ namespace
ThreeD_SceneIllumination_TabPage::ThreeD_SceneIllumination_TabPage( Window* pWindow
, const uno::Reference< beans::XPropertySet > & xSceneProperties
, const uno::Reference< frame::XModel >& xChartModel
- , XColorTable* pColorTable )
+ , XColorList* pColorTable )
: TabPage ( pWindow, SchResId( TP_3D_SCENEILLUMINATION ) )
, m_aFT_LightSource( this, SchResId( FT_LIGHTSOURCE ) )
, m_aBtn_Light1( this, SchResId( BTN_LIGHT_1 ), 1 )
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx
index dc041e80d0e1..3be197824985 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx
@@ -79,7 +79,7 @@ public:
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > & xSceneProperties,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel,
- XColorTable* pColorTable=0 );
+ XColorList* pColorTable=0 );
virtual ~ThreeD_SceneIllumination_TabPage();
// has to be called in case the dialog was closed with OK
diff --git a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
index ced98b5cf617..eb9f509c54ab 100644
--- a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
+++ b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
@@ -340,10 +340,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/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx b/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
index e04b5ea7fa47..39e0f22266da 100644
--- a/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
+++ b/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
@@ -89,7 +89,7 @@ ViewElementListProvider::~ViewElementListProvider()
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-XColorTable* ViewElementListProvider::GetColorTable() const
+XColorList* ViewElementListProvider::GetColorTable() const
{
if(m_pDrawModelWrapper)
return m_pDrawModelWrapper->GetColorTable();
diff --git a/chart2/source/controller/inc/ViewElementListProvider.hxx b/chart2/source/controller/inc/ViewElementListProvider.hxx
index ee8b0b2e4b44..6f9f08df0cd7 100644
--- a/chart2/source/controller/inc/ViewElementListProvider.hxx
+++ b/chart2/source/controller/inc/ViewElementListProvider.hxx
@@ -41,7 +41,7 @@ public:
ViewElementListProvider( DrawModelWrapper* pDrawModelWrapper );
virtual ~ViewElementListProvider();
- XColorTable* GetColorTable() const;
+ XColorList* GetColorTable() const;
XDashList* GetDashList() const;
XLineEndList* GetLineEndList() const;
XGradientList* GetGradientList() const;
diff --git a/chart2/source/controller/inc/dlg_View3D.hxx b/chart2/source/controller/inc/dlg_View3D.hxx
index 7649bfd962c6..1414366d707e 100644
--- a/chart2/source/controller/inc/dlg_View3D.hxx
+++ b/chart2/source/controller/inc/dlg_View3D.hxx
@@ -34,7 +34,7 @@
#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
#endif
-// header for class XColorTable
+// header for class XColorList
#include <svx/xtable.hxx>
#include "ControllerLockGuard.hxx"
@@ -52,7 +52,7 @@ class View3DDialog : public TabDialog
public:
View3DDialog( Window* pWindow,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & xChartModel,
- XColorTable* pColorTable=0 );
+ XColorList* pColorTable=0 );
~View3DDialog();
// from Dialog (base of TabDialog)
diff --git a/chart2/source/controller/main/ShapeController.cxx b/chart2/source/controller/main/ShapeController.cxx
index 6b7b49c3d2b1..b9463e1860d0 100644
--- a/chart2/source/controller/main/ShapeController.cxx
+++ b/chart2/source/controller/main/ShapeController.cxx
@@ -323,7 +323,7 @@ void ShapeController::executeDispatch_FormatArea()
SfxItemPool& rItemPool = pDrawViewWrapper->GetModel()->GetItemPool();
SfxItemSet aSet( rItemPool, rItemPool.GetFirstWhich(), rItemPool.GetLastWhich() );
const SvxColorTableItem* pColorItem = static_cast< const SvxColorTableItem* >( aSet.GetItem( SID_COLOR_TABLE ) );
- if ( pColorItem && pColorItem->GetColorTable() == XColorTable::GetStdColorTable() )
+ if ( pColorItem && pColorItem->GetColorTable() == XColorList::GetStdColorList() )
{
pDlg->DontDeleteColorTable();
}
diff --git a/chart2/source/inc/chartview/DrawModelWrapper.hxx b/chart2/source/inc/chartview/DrawModelWrapper.hxx
index 017ca5dde449..a2ad838618d2 100644
--- a/chart2/source/inc/chartview/DrawModelWrapper.hxx
+++ b/chart2/source/inc/chartview/DrawModelWrapper.hxx
@@ -91,7 +91,7 @@ public:
getUnoModel();
SdrModel& getSdrModel();
- XColorTable* GetColorTable() const;
+ XColorList* GetColorTable() const;
XDashList* GetDashList() const;
XLineEndList* GetLineEndList() const;
XGradientList* GetGradientList() const;
diff --git a/chart2/source/view/main/DrawModelWrapper.cxx b/chart2/source/view/main/DrawModelWrapper.cxx
index 99b8966f87ee..5814ad6e5bad 100644
--- a/chart2/source/view/main/DrawModelWrapper.cxx
+++ b/chart2/source/view/main/DrawModelWrapper.cxx
@@ -334,7 +334,7 @@ const SfxItemPool& DrawModelWrapper::GetItemPool() const
{
return this->SdrModel::GetItemPool();
}
-XColorTable* DrawModelWrapper::GetColorTable() const
+XColorList* DrawModelWrapper::GetColorTable() const
{
return this->SdrModel::GetColorTable();
}
diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx
index a9e634a1e22c..f0c6a0dd888a 100644
--- a/cui/source/inc/border.hxx
+++ b/cui/source/inc/border.hxx
@@ -37,7 +37,6 @@
// forward ---------------------------------------------------------------
class SvxBorderLine;
-class XColorTable;
#include <svx/flagsdef.hxx>
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index e9d66bb36f7b..224b667f2d09 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -39,8 +39,8 @@ private:
SdrModel* mpDrawModel;
// const SdrView* mpView;
- XColorTable* mpColorTab;
- XColorTable* mpNewColorTab;
+ XColorList* mpColorTab;
+ XColorList* mpNewColorTab;
XGradientList* mpGradientList;
XGradientList* mpNewGradientList;
XHatchList* mpHatchingList;
@@ -76,10 +76,10 @@ public:
const SdrView* pSdrView = NULL );
~SvxAreaTabDialog();
- void SetNewColorTable( XColorTable* pColTab )
+ void SetNewColorTable( XColorList* pColTab )
{ mpNewColorTab = pColTab; }
- XColorTable* GetNewColorTable() const { return mpNewColorTab; }
- const XColorTable* GetColorTable() const { return mpColorTab; }
+ XColorList* GetNewColorTable() const { return mpNewColorTab; }
+ const XColorList* GetColorTable() const { return mpColorTab; }
void SetNewGradientList( XGradientList* pGrdLst)
{ mpNewGradientList = pGrdLst; }
@@ -243,7 +243,7 @@ private:
const SfxItemSet& rOutAttrs;
RECT_POINT eRP;
- XColorTable* pColorTab;
+ XColorList* pColorTab;
XGradientList* pGradientList;
XHatchList* pHatchingList;
XBitmapList* pBitmapList;
@@ -302,7 +302,7 @@ public:
virtual int DeactivatePage( SfxItemSet* pSet );
virtual void PointChanged( Window* pWindow, RECT_POINT eRP );
- void SetColorTable( XColorTable* pColTab ) { pColorTab = pColTab; }
+ void SetColorTable( XColorList* pColTab ) { pColorTab = pColTab; }
void SetGradientList( XGradientList* pGrdLst)
{ pGradientList = pGrdLst; }
void SetHatchingList( XHatchList* pHtchLst)
@@ -350,7 +350,7 @@ private:
const SfxItemSet& rOutAttrs;
RECT_POINT eRP;
- XColorTable* pColorTab;
+ XColorList* pColorTab;
ChangeType* pnColorTableState;
sal_uInt16 nPageType; //add CHINA001
sal_uInt16 nDlgType; //add CHINA001
@@ -382,7 +382,7 @@ public:
virtual int DeactivatePage( SfxItemSet* pSet );
virtual void PointChanged( Window* pWindow, RECT_POINT eRP );
- void SetColorTable( XColorTable* pColTab ) { pColorTab = pColTab; }
+ void SetColorTable( XColorList* pColTab ) { pColorTab = pColTab; }
//CHINA001 void SetPageType( sal_uInt16* pInType ) { pPageType = pInType; }
//CHINA001 void SetDlgType( sal_uInt16* pInType ) { pDlgType = pInType; }
void SetPageType( sal_uInt16 nInType ) { nPageType = nInType; } //add CHINA001
@@ -432,7 +432,7 @@ private:
const SfxItemSet& rOutAttrs;
- XColorTable* pColorTab;
+ XColorList* pColorTab;
XGradientList* pGradientList;
ChangeType* pnGradientListState;
@@ -473,7 +473,7 @@ public:
virtual void ActivatePage( const SfxItemSet& rSet );
virtual int DeactivatePage( SfxItemSet* pSet );
- void SetColorTable( XColorTable* pColTab ) { pColorTab = pColTab; }
+ void SetColorTable( XColorList* pColTab ) { pColorTab = pColTab; }
void SetGradientList( XGradientList* pGrdLst)
{ pGradientList = pGrdLst; }
@@ -519,7 +519,7 @@ private:
const SfxItemSet& rOutAttrs;
RECT_POINT eRP;
- XColorTable* pColorTab;
+ XColorList* pColorTab;
XHatchList* pHatchingList;
ChangeType* pnHatchingListState;
@@ -563,7 +563,7 @@ public:
virtual void PointChanged( Window* pWindow, RECT_POINT eRP );
- void SetColorTable( XColorTable* pColTab ) { pColorTab = pColTab; }
+ void SetColorTable( XColorList* pColTab ) { pColorTab = pColTab; }
void SetHatchingList( XHatchList* pHtchLst)
{ pHatchingList = pHtchLst; }
@@ -611,7 +611,7 @@ private:
const SfxItemSet& rOutAttrs;
- XColorTable* pColorTab;
+ XColorList* pColorTab;
XBitmapList* pBitmapList;
ChangeType* pnBitmapListState;
@@ -657,7 +657,7 @@ public:
virtual void PointChanged( Window* pWindow, RECT_POINT eRP );
- void SetColorTable( XColorTable* pColTab ) { pColorTab = pColTab; }
+ void SetColorTable( XColorList* pColTab ) { pColorTab = pColTab; }
void SetBitmapList( XBitmapList* pBmpLst) { pBitmapList = pBmpLst; }
void SetPageType( sal_uInt16* pInType ) { pPageType = pInType; }
@@ -723,7 +723,7 @@ private:
const SfxItemSet& rOutAttrs;
- XColorTable* pColorTab;
+ XColorList* pColorTab;
ChangeType* pnColorTableState;
sal_uInt16* pPageType;
@@ -779,7 +779,7 @@ public:
virtual void ActivatePage( const SfxItemSet& rSet );
virtual int DeactivatePage( SfxItemSet* pSet );
- void SetColorTable( XColorTable* pColTab ) { pColorTab = pColTab; }
+ void SetColorTable( XColorList* pColTab ) { pColorTab = pColTab; }
void SetPageType( sal_uInt16* pInType ) { pPageType = pInType; }
void SetDlgType( sal_uInt16* pInType ) { pDlgType = pInType; }
diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx
index 828dd7527196..163418cc3cec 100644
--- a/cui/source/inc/cuitabline.hxx
+++ b/cui/source/inc/cuitabline.hxx
@@ -39,8 +39,8 @@ private:
const SfxItemSet& rOutAttrs;
- XColorTable* pColorTab;
- XColorTable* mpNewColorTab;
+ XColorList* pColorTab;
+ XColorList* mpNewColorTab;
XDashList* pDashList;
XDashList* pNewDashList;
XLineEndList* pLineEndList;
@@ -84,9 +84,9 @@ public:
XLineEndList* GetNewLineEndList() const { return pNewLineEndList; }
const XLineEndList* GetLineEndList() const { return pLineEndList; }
- void SetNewColorTable( XColorTable* pColTab ) { mpNewColorTab = pColTab; }
- XColorTable* GetNewColorTable() const { return mpNewColorTab; }
- const XColorTable* GetColorTable() const { return pColorTab; }
+ void SetNewColorTable( XColorList* pColTab ) { mpNewColorTab = pColTab; }
+ XColorList* GetNewColorTable() const { return mpNewColorTab; }
+ const XColorList* GetColorTable() const { return pColorTab; }
};
/*************************************************************************
@@ -166,7 +166,7 @@ private:
XLineAttrSetItem aXLineAttr;
SfxItemSet& rXLSet;
- XColorTable* pColorTab;
+ XColorList* pColorTab;
XDashList* pDashList;
XLineEndList* pLineEndList;
@@ -231,7 +231,7 @@ public:
virtual void FillUserData();
- void SetColorTable( XColorTable* pColTab ) { pColorTab = pColTab; }
+ void SetColorTable( XColorList* pColTab ) { pColorTab = pColTab; }
void SetDashList( XDashList* pDshLst ) { pDashList = pDshLst; }
void SetLineEndList( XLineEndList* pLneEndLst) { pLineEndList = pLneEndLst; }
void SetObjSelected( sal_Bool bHasObj ) { bObjSelected = bHasObj; }
diff --git a/cui/source/inc/sdrcelldlg.hxx b/cui/source/inc/sdrcelldlg.hxx
index 2c740da184ba..fd17127ab3d4 100644
--- a/cui/source/inc/sdrcelldlg.hxx
+++ b/cui/source/inc/sdrcelldlg.hxx
@@ -27,7 +27,7 @@
#include <sfx2/tabdlg.hxx>
-class XColorTable;
+class XColorList;
class XGradientList;
class XHatchList;
class XBitmapList;
@@ -38,7 +38,7 @@ class SvxFormatCellsDialog : public SfxTabDialog
private:
const SfxItemSet& mrOutAttrs;
- XColorTable* mpColorTab;
+ XColorList* mpColorTab;
XGradientList* mpGradientList;
XHatchList* mpHatchingList;
XBitmapList* mpBitmapList;
diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx
index 6274fe2b70c5..ae85d9456204 100644
--- a/cui/source/inc/treeopt.hxx
+++ b/cui/source/inc/treeopt.hxx
@@ -43,7 +43,7 @@ CreateTabPage GetSSOCreator( void );
class SfxModule;
class SfxShell;
class SfxItemSet;
-class XColorTable;
+class XColorList;
class OfaOptionsTreeListBox : public SvTreeListBox
{
using SvListView::Collapse;
@@ -197,7 +197,7 @@ private:
// for the ColorTabPage
SfxItemSet* pColorPageItemSet;
- XColorTable* pColorTab;
+ XColorList* pColorTab;
sal_uInt16 nChangeType;
sal_uInt16 nUnknownType;
sal_uInt16 nUnknownPos;
@@ -269,7 +269,7 @@ public:
void ApplyItemSets();
sal_uInt16 GetColorChanged() const { return nChangeType; }
- XColorTable* GetColorTable() { return pColorTab; }
+ XColorList* GetColorTable() { return pColorTab; }
// helper functions to call the language settings TabPage from the SpellDialog
static void ApplyLanguageOptions(const SfxItemSet& rSet);
diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx
index 1d29a272a08c..d920d5267d61 100644
--- a/cui/source/options/optchart.cxx
+++ b/cui/source/options/optchart.cxx
@@ -73,7 +73,7 @@ SvxDefaultColorOptPage::SvxDefaultColorOptPage( Window* pParent, const SfxItemSe
aValSetColorBox.Show();
pChartOptions = new SvxChartOptions;
- pColorTab = new XColorTable( SvtPathOptions().GetPalettePath() );
+ pColorTab = new XColorList( SvtPathOptions().GetPalettePath() );
const SfxPoolItem* pItem = NULL;
if ( rInAttrs.GetItemState( SID_SCH_EDITOPTIONS, sal_False, &pItem ) == SFX_ITEM_SET )
@@ -159,7 +159,7 @@ long SvxDefaultColorOptPage::GetColorIndex( const Color& rCol )
{
pColorEntry = pColorTab->GetColor( i );
if( pColorEntry && pColorEntry->GetColor() == rCol )
- return SAL_STATIC_CAST( XPropertyTable*, pColorTab )->Get( pColorEntry->GetName() );
+ return SAL_STATIC_CAST( XPropertyList*, pColorTab )->Get( pColorEntry->GetName() );
}
}
return -1L;
diff --git a/cui/source/options/optchart.hxx b/cui/source/options/optchart.hxx
index 300ad6c93294..54b01d0f218a 100644
--- a/cui/source/options/optchart.hxx
+++ b/cui/source/options/optchart.hxx
@@ -35,7 +35,7 @@
#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
#endif
-// header for XColorTable
+// header for XColorList
#include <svx/xtable.hxx>
#include "cfgchart.hxx"
@@ -61,7 +61,7 @@ private:
SvxChartOptions* pChartOptions;
SvxChartColorTableItem* pColorConfig;
- XColorTable* pColorTab;
+ XColorList* pColorTab;
DECL_LINK( ResetToDefaults, void * );
DECL_LINK( ListClickedHdl, ChartColorLB * );
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index c84c2f7e1ab2..733322821399 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -945,7 +945,7 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rRe
}
}
- XColorTable aColorTable( SvtPathOptions().GetPalettePath() );
+ XColorList aColorTable( SvtPathOptions().GetPalettePath() );
aColorBoxes[0]->InsertAutomaticEntry();
for( sal_Int32 i = 0; i < aColorTable.Count(); i++ )
{
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 074e5d5f6c2e..ab0ad2fbc810 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -1205,7 +1205,7 @@ IMPL_LINK( OfaTreeOptionsDialog, SelectHdl_Impl, Timer*, EMPTYARG )
if ( SfxViewFrame::Current() && SfxViewFrame::Current()->GetDispatcher() )
pPtr = (const OfaPtrItem*)SfxViewFrame::Current()->
GetDispatcher()->Execute( SID_GET_COLORTABLE, SFX_CALLMODE_SYNCHRON );
- pColorTab = pPtr ? (XColorTable*)pPtr->GetValue() : XColorTable::GetStdColorTable();
+ pColorTab = pPtr ? (XColorList*)pPtr->GetValue() : XColorList::GetStdColorList();
rColPage.SetColorTable( pColorTab );
rColPage.SetPageType( &nUnknownType );
@@ -2640,7 +2640,7 @@ short OfaTreeOptionsDialog::Execute()
const OfaPtrItem* pPtr = (const OfaPtrItem*)SfxViewFrame::Current()->GetDispatcher()->Execute( SID_GET_COLORTABLE, SFX_CALLMODE_SYNCHRON );
if( pPtr )
{
- XColorTable* _pColorTab = (XColorTable*)pPtr->GetValue();
+ XColorList* _pColorTab = (XColorList*)pPtr->GetValue();
if( _pColorTab &&
_pColorTab->GetPath() == GetColorTable()->GetPath() &&
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 938ae0868580..f84bc459ea6c 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -1194,7 +1194,7 @@ void SvxBackgroundTabPage::FillColorValueSets_Impl()
{
SfxObjectShell* pDocSh = SfxObjectShell::Current();
const SfxPoolItem* pItem = NULL;
- XColorTable* pColorTable = NULL;
+ XColorList* pColorTable = NULL;
const Size aSize15x15 = Size( 15, 15 );
FASTBOOL bOwn = sal_False;
@@ -1204,7 +1204,7 @@ void SvxBackgroundTabPage::FillColorValueSets_Impl()
if ( !pColorTable )
{
bOwn = sal_True;
- pColorTable = new XColorTable( SvtPathOptions().GetPalettePath() );
+ pColorTable = new XColorList( SvtPathOptions().GetPalettePath() );
}
if ( pColorTable )
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index 578f29deac8f..cac29eddbe52 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -38,7 +38,7 @@
#define LINESTYLE_HTML_MAX 5
-#include <svx/xtable.hxx> // XColorTable
+#include <svx/xtable.hxx> // XColorList
#include <svx/drawitem.hxx>
#include <editeng/boxitem.hxx>
#include <editeng/shaditem.hxx>
@@ -335,10 +335,10 @@ SvxBorderTabPage::SvxBorderTabPage( Window* pParent,
FillValueSets();
FillLineListBox_Impl();
- // ColorBox aus der XColorTable fuellen.
+ // ColorBox aus der XColorList fuellen.
SfxObjectShell* pDocSh = SfxObjectShell::Current();
const SfxPoolItem* pItem = NULL;
- XColorTable* pColorTable = NULL;
+ XColorList* pColorTable = NULL;
DBG_ASSERT( pDocSh, "DocShell not found!" );
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 50ce94bd633d..18bc03872773 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -46,7 +46,7 @@
#include <cuires.hrc>
#include "chardlg.hrc"
-#include <svx/xtable.hxx> // XColorTable
+#include <svx/xtable.hxx> // XColorList
#include "chardlg.hxx"
#include "editeng/fontitem.hxx"
#include <editeng/postitem.hxx>
@@ -715,7 +715,7 @@ void SvxCharNamePage::Initialize()
// fill the color box
SfxObjectShell* pDocSh = SfxObjectShell::Current();
//DBG_ASSERT( pDocSh, "DocShell not found!" );
- XColorTable* pColorTable = NULL;
+ XColorList* pColorTable = NULL;
FASTBOOL bKillTable = sal_False;
const SfxPoolItem* pItem = NULL;
@@ -728,7 +728,7 @@ void SvxCharNamePage::Initialize()
if ( !pColorTable )
{
- pColorTable = new XColorTable( SvtPathOptions().GetPalettePath() );
+ pColorTable = new XColorList( SvtPathOptions().GetPalettePath() );
bKillTable = sal_True;
}
@@ -1787,7 +1787,7 @@ void SvxCharEffectsPage::Initialize()
// fill the color box
SfxObjectShell* pDocSh = SfxObjectShell::Current();
DBG_ASSERT( pDocSh, "DocShell not found!" );
- XColorTable* pColorTable = NULL;
+ XColorList* pColorTable = NULL;
FASTBOOL bKillTable = sal_False;
if ( pDocSh )
@@ -1799,7 +1799,7 @@ void SvxCharEffectsPage::Initialize()
if ( !pColorTable )
{
- pColorTable = new XColorTable( SvtPathOptions().GetPalettePath() );
+ pColorTable = new XColorList( SvtPathOptions().GetPalettePath() );
bKillTable = sal_True;
}
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 9e9219c24acd..f6d63fe6a17a 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -1609,7 +1609,7 @@ void SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet )
{
SfxObjectShell* pDocSh = SfxObjectShell::Current();
DBG_ASSERT( pDocSh, "DocShell not found!" );
- XColorTable* pColorTable = NULL;
+ XColorList* pColorTable = NULL;
FASTBOOL bKillTable = sal_False;
if ( pDocSh )
{
@@ -1620,7 +1620,7 @@ void SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet )
if ( !pColorTable )
{
- pColorTable = new XColorTable( SvtPathOptions().GetPalettePath() );
+ pColorTable = new XColorList( SvtPathOptions().GetPalettePath() );
bKillTable = sal_True;
}
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index d67c513c97e6..65a7c9ae8132 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -593,8 +593,8 @@ IMPL_LINK( SvxBitmapTabPage, ClickAddHdl_Impl, void *, EMPTYARG )
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
@@ -701,7 +701,8 @@ IMPL_LINK( SvxBitmapTabPage, ClickImportHdl_Impl, void *, EMPTYARG )
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
@@ -756,6 +757,7 @@ IMPL_LINK( SvxBitmapTabPage, ClickModifyHdl_Impl, void *, EMPTYARG )
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 )
{
@@ -780,7 +782,7 @@ IMPL_LINK( SvxBitmapTabPage, ClickModifyHdl_Impl, void *, EMPTYARG )
pEntry->SetGraphicObject(Graphic(aBitmapEx));
- aLbBitmaps.Modify( pEntry, nPos );
+ aLbBitmaps.Modify( aUiSize, *pEntry, nPos );
aLbBitmaps.SelectEntryPos( nPos );
// Flag fuer modifiziert setzen
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index 326ec9b6e5be..1928e2333b2b 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -524,7 +524,7 @@ IMPL_LINK( SvxColorTabPage, ClickAddHdl_Impl, void *, EMPTYARG )
ConvertColorValues (aAktuellColor, CM_RGB);
pEntry = new XColorEntry( aAktuellColor, aName );
- pColorTab->Insert( pColorTab->Count(), pEntry );
+ pColorTab->Insert( pEntry, pColorTab->Count() );
aLbColor.Append( pEntry );
aValSetColorTable.InsertItem( aValSetColorTable.GetItemCount() + 1,
@@ -643,7 +643,7 @@ IMPL_LINK( SvxColorTabPage, ClickWorkOnHdl_Impl, void *, EMPTYARG )
ConvertColorValues (aTmpColor, CM_RGB);
pColorDlg->SetColor (aTmpColor);
- pColorDlg->SetMode( svtools::ColorPickerMode_MODIFY );
+ pColorDlg->SetMode( svtools::ColorPickerMode_MODIFY );
if( pColorDlg->Execute() == RET_OK )
{
@@ -698,7 +698,7 @@ IMPL_LINK( SvxColorTabPage, ClickDeleteHdl_Impl, void *, EMPTYARG )
{
pEntry = pColorTab->Remove( i + 1 );
DBG_ASSERT( pEntry, "ColorEntry nicht vorhanden (2) !" );
- pColorTab->Insert( i, pEntry );
+ pColorTab->Insert( pEntry, i );
}
// Listbox und ValueSet aktualisieren
@@ -765,14 +765,14 @@ IMPL_LINK( SvxColorTabPage, ClickLoadHdl_Impl, void *, EMPTYARG )
aPathURL.removeFinalSlash();
// Tabelle speichern
- XColorTable* pColTab = new XColorTable( aPathURL.GetMainURL( INetURLObject::NO_DECODE ), pXPool );
+ XColorList* pColTab = new XColorList( aPathURL.GetMainURL( INetURLObject::NO_DECODE ), pXPool );
pColTab->SetName( aURL.getName() ); // XXX
if( pColTab->Load() )
{
if( pColTab )
{
// Pruefen, ob Tabelle geloescht werden darf:
- const XColorTable *pTempTable = 0;
+ const XColorList *pTempTable = 0;
SvxAreaTabDialog* pArea = dynamic_cast< SvxAreaTabDialog* >( DLGWIN );
SvxLineTabDialog* pLine = dynamic_cast< SvxLineTabDialog* >( DLGWIN );
if( pArea )
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index a78837113a1d..b6efd27812c1 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -301,7 +301,7 @@ void SvxLineTabPage::FillListboxes()
{
// Linienstile
sal_uInt16 nOldSelect = aLbLineStyle.GetSelectEntryPos();
- aLbLineStyle.FillStyles();
+ // aLbLineStyle.FillStyles();
aLbLineStyle.Fill( pDashList );
aLbLineStyle.SelectEntryPos( nOldSelect );
@@ -728,22 +728,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;
}
}
@@ -895,22 +895,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;
}
}
@@ -1344,15 +1344,15 @@ 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_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 a9116e88e3f3..4a5adb6e2bea 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -626,8 +626,8 @@ IMPL_LINK( SvxLineDefTabPage, ClickAddHdl_Impl, void *, EMPTYARG )
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 );
@@ -707,8 +707,8 @@ IMPL_LINK( SvxLineDefTabPage, ClickModifyHdl_Impl, void *, EMPTYARG )
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 942e3f93f6e1..210f3d4c7dd9 100644
--- a/cui/source/tabpages/tplneend.cxx
+++ b/cui/source/tabpages/tplneend.cxx
@@ -407,7 +407,8 @@ IMPL_LINK( SvxLineEndDefTabPage, ClickModifyHdl_Impl, void *, EMPTYARG )
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 );
// Flag fuer modifiziert setzen
@@ -505,10 +506,10 @@ IMPL_LINK( SvxLineEndDefTabPage, ClickAddHdl_Impl, void *, EMPTYARG )
long nLineEndCount = pLineEndList->Count();
pLineEndList->Insert( pEntry, nLineEndCount );
- Bitmap* pBitmap = pLineEndList->GetBitmap( nLineEndCount );
+ const Bitmap aBitmap = pLineEndList->GetUiBitmap( nLineEndCount );
// Zur ListBox hinzufuegen
- aLbLineEnds.Append( pEntry, pBitmap );
+ aLbLineEnds.Append( pEntry, &aBitmap );
aLbLineEnds.SelectEntryPos( aLbLineEnds.GetEntryCount() - 1 );
// Flag fuer modifiziert setzen
diff --git a/default_images/res/soliline.png b/default_images/res/soliline.png
deleted file mode 100644
index 9ac96cd9f601..000000000000
--- a/default_images/res/soliline.png
+++ /dev/null
Binary files differ
diff --git a/default_images/sc/res/sidebar/123.png b/default_images/sc/res/sidebar/123.png
new file mode 100755
index 000000000000..0d0a6ef7659c
--- /dev/null
+++ b/default_images/sc/res/sidebar/123.png
Binary files differ
diff --git a/default_images/sc/res/sidebar/ABC.png b/default_images/sc/res/sidebar/ABC.png
new file mode 100755
index 000000000000..fb7e5c8b5585
--- /dev/null
+++ b/default_images/sc/res/sidebar/ABC.png
Binary files differ
diff --git a/default_images/sc/res/sidebar/CellBorder.png b/default_images/sc/res/sidebar/CellBorder.png
new file mode 100755
index 000000000000..f4e8e005c340
--- /dev/null
+++ b/default_images/sc/res/sidebar/CellBorder.png
Binary files differ
diff --git a/default_images/sc/res/sidebar/CellBorderLineStyle_005.png b/default_images/sc/res/sidebar/CellBorderLineStyle_005.png
new file mode 100755
index 000000000000..6116ee216ad5
--- /dev/null
+++ b/default_images/sc/res/sidebar/CellBorderLineStyle_005.png
Binary files differ
diff --git a/default_images/sc/res/sidebar/CellBorderLineStyle_005_h.png b/default_images/sc/res/sidebar/CellBorderLineStyle_005_h.png
new file mode 100755
index 000000000000..444d51484993
--- /dev/null
+++ b/default_images/sc/res/sidebar/CellBorderLineStyle_005_h.png
Binary files differ
diff --git a/default_images/sc/res/sidebar/CellBorderLineStyle_110.png b/default_images/sc/res/sidebar/CellBorderLineStyle_110.png
new file mode 100755
index 000000000000..ddca641e4839
--- /dev/null
+++ b/default_images/sc/res/sidebar/CellBorderLineStyle_110.png
Binary files differ
diff --git a/default_images/sc/res/sidebar/CellBorderLineStyle_110_h.png b/default_images/sc/res/sidebar/CellBorderLineStyle_110_h.png
new file mode 100755
index 000000000000..1144a495ef0d
--- /dev/null
+++ b/default_images/sc/res/sidebar/CellBorderLineStyle_110_h.png
Binary files differ
diff --git a/default_images/sc/res/sidebar/CellBorderLineStyle_250.png b/default_images/sc/res/sidebar/CellBorderLineStyle_250.png
new file mode 100755
index 000000000000..93014bf7be88
--- /dev/null
+++ b/default_images/sc/res/sidebar/CellBorderLineStyle_250.png
Binary files differ
diff --git a/default_images/sc/res/sidebar/CellBorderLineStyle_250_h.png b/default_images/sc/res/sidebar/CellBorderLineStyle_250_h.png
new file mode 100755
index 000000000000..8a6cc3ce6d7c
--- /dev/null
+++ b/default_images/sc/res/sidebar/CellBorderLineStyle_250_h.png
Binary files differ
diff --git a/default_images/sc/res/sidebar/CellBorderLineStyle_260.png b/default_images/sc/res/sidebar/CellBorderLineStyle_260.png
new file mode 100755
index 000000000000..4fdc28a2690f
--- /dev/null
+++ b/default_images/sc/res/sidebar/CellBorderLineStyle_260.png
Binary files differ
diff --git a/default_images/sc/res/sidebar/CellBorderLineStyle_260_h.png b/default_images/sc/res/sidebar/CellBorderLineStyle_260_h.png
new file mode 100755
index 000000000000..769a03cb8902
--- /dev/null
+++ b/default_images/sc/res/sidebar/CellBorderLineStyle_260_h.png
Binary files differ
diff --git a/default_images/sc/res/sidebar/CellBorderLineStyle_400.png b/default_images/sc/res/sidebar/CellBorderLineStyle_400.png
new file mode 100755
index 000000000000..38cda1bfd231
--- /dev/null
+++ b/default_images/sc/res/sidebar/CellBorderLineStyle_400.png
Binary files differ
diff --git a/default_images/sc/res/sidebar/CellBorderLineStyle_400_h.png b/default_images/sc/res/sidebar/CellBorderLineStyle_400_h.png
new file mode 100755
index 000000000000..cd8503a6de83
--- /dev/null
+++ b/default_images/sc/res/sidebar/CellBorderLineStyle_400_h.png
Binary files differ
diff --git a/default_images/sc/res/sidebar/CellBorderLineStyle_450.png b/default_images/sc/res/sidebar/CellBorderLineStyle_450.png
new file mode 100755
index 000000000000..245594f90106
--- /dev/null
+++ b/default_images/sc/res/sidebar/CellBorderLineStyle_450.png
Binary files differ
diff --git a/default_images/sc/res/sidebar/CellBorderLineStyle_450_h.png b/default_images/sc/res/sidebar/CellBorderLineStyle_450_h.png
new file mode 100755
index 000000000000..17fa6fc02932
--- /dev/null
+++ b/default_images/sc/res/sidebar/CellBorderLineStyle_450_h.png
Binary files differ
diff --git a/default_images/sc/res/sidebar/CellBorderLineStyle_500.png b/default_images/sc/res/sidebar/CellBorderLineStyle_500.png
new file mode 100755
index 000000000000..9a6457d03a13
--- /dev/null
+++ b/default_images/sc/res/sidebar/CellBorderLineStyle_500.png
Binary files differ
diff --git a/default_images/sc/res/sidebar/CellBorderLineStyle_500_h.png b/default_images/sc/res/sidebar/CellBorderLineStyle_500_h.png
new file mode 100755
index 000000000000..90d8d6937eaa
--- /dev/null
+++ b/default_images/sc/res/sidebar/CellBorderLineStyle_500_h.png
Binary files differ
diff --git a/default_images/sc/res/sidebar/CellBorderLineStyle_505.png b/default_images/sc/res/sidebar/CellBorderLineStyle_505.png
new file mode 100755
index 000000000000..78865c0534fc
--- /dev/null
+++ b/default_images/sc/res/sidebar/CellBorderLineStyle_505.png
Binary files differ
diff --git a/default_images/sc/res/sidebar/CellBorderLineStyle_505_h.png b/default_images/sc/res/sidebar/CellBorderLineStyle_505_h.png
new file mode 100755
index 000000000000..94846c3e8779
--- /dev/null
+++ b/default_images/sc/res/sidebar/CellBorderLineStyle_505_h.png
Binary files differ
diff --git a/default_images/sc/res/sidebar/CellBorderLineStyle_750.png b/default_images/sc/res/sidebar/CellBorderLineStyle_750.png
new file mode 100755
index 000000000000..71088c184f8c
--- /dev/null
+++ b/default_images/sc/res/sidebar/CellBorderLineStyle_750.png
Binary files differ
diff --git a/default_images/sc/res/sidebar/CellBorderLineStyle_750_h.png b/default_images/sc/res/sidebar/CellBorderLineStyle_750_h.png
new file mode 100755
index 000000000000..40bafef208b2
--- /dev/null
+++ b/default_images/sc/res/sidebar/CellBorderLineStyle_750_h.png
Binary files differ
diff --git a/default_images/sc/res/sidebar/CellBorder_All_18x18.png b/default_images/sc/res/sidebar/CellBorder_All_18x18.png
new file mode 100755
index 000000000000..68f9d451675d
--- /dev/null
+++ b/default_images/sc/res/sidebar/CellBorder_All_18x18.png
Binary files differ
diff --git a/default_images/sc/res/sidebar/CellBorder_All_18x18_h.png b/default_images/sc/res/sidebar/CellBorder_All_18x18_h.png
new file mode 100755
index 000000000000..2f7909dda654
--- /dev/null
+++ b/default_images/sc/res/sidebar/CellBorder_All_18x18_h.png
Binary files differ
diff --git a/default_images/sc/res/sidebar/CellBorder_Bottom_18x18.png b/default_images/sc/res/sidebar/CellBorder_Bottom_18x18.png
new file mode 100755
index 000000000000..20d34e229ec7
--- /dev/null
+++ b/default_images/sc/res/sidebar/CellBorder_Bottom_18x18.png
Binary files differ
diff --git a/default_images/sc/res/sidebar/CellBorder_Bottom_18x18_h.png b/default_images/sc/res/sidebar/CellBorder_Bottom_18x18_h.png
new file mode 100755
index 000000000000..7e3ba683d107
--- /dev/null
+++ b/default_images/sc/res/sidebar/CellBorder_Bottom_18x18_h.png
Binary files differ
diff --git a/default_images/sc/res/sidebar/CellBorder_Bottom_Double_18x18.png b/default_images/sc/res/sidebar/CellBorder_Bottom_Double_18x18.png
new file mode 100755
index 000000000000..3bf6450c686c
--- /dev/null
+++ b/default_images/sc/res/sidebar/CellBorder_Bottom_Double_18x18.png
Binary files differ
diff --git a/default_images/sc/res/sidebar/CellBorder_Bottom_Double_18x18_h.png b/default_images/sc/res/sidebar/CellBorder_Bottom_Double_18x18_h.png
new file mode 100755
index 000000000000..6093c976e5db
--- /dev/null
+++ b/default_images/sc/res/sidebar/CellBorder_Bottom_Double_18x18_h.png
Binary files differ
diff --git a/default_images/sc/res/sidebar/CellBorder_Bottom_Thick_18x18.png b/default_images/sc/res/sidebar/CellBorder_Bottom_Thick_18x18.png
new file mode 100755
index 000000000000..ecf2afa713be
--- /dev/null
+++ b/default_images/sc/res/sidebar/CellBorder_Bottom_Thick_18x18.png
Binary files differ
diff --git a/default_images/sc/res/sidebar/CellBorder_Bottom_Thick_18x18_h.png b/default_images/sc/res/sidebar/CellBorder_Bottom_Thick_18x18_h.png
new file mode 100755
index 000000000000..a824ac0b3814
--- /dev/null
+++ b/default_images/sc/res/sidebar/CellBorder_Bottom_Thick_18x18_h.png
Binary files differ
diff --git a/default_images/sc/res/sidebar/CellBorder_Empty_18x18.png b/default_images/sc/res/sidebar/CellBorder_Empty_18x18.png
new file mode 100755
index 000000000000..a5f3dd45d8b3
--- /dev/null
+++ b/default_images/sc/res/sidebar/CellBorder_Empty_18x18.png
Binary files differ
diff --git a/default_images/sc/res/sidebar/CellBorder_Empty_18x18_h.png b/default_images/sc/res/sidebar/CellBorder_Empty_18x18_h.png
new file mode 100755
index 000000000000..f62769b4dae6
--- /dev/null
+++ b/default_images/sc/res/sidebar/CellBorder_Empty_18x18_h.png
Binary files differ
diff --git a/default_images/sc/res/sidebar/CellBorder_FourBorders_18x18.png b/default_images/sc/res/sidebar/CellBorder_FourBorders_18x18.png
new file mode 100755
index 000000000000..54a42b57b918
--- /dev/null
+++ b/default_images/sc/res/sidebar/CellBorder_FourBorders_18x18.png
Binary files differ
diff --git a/default_images/sc/res/sidebar/CellBorder_FourBorders_18x18_h.png b/default_images/sc/res/sidebar/CellBorder_FourBorders_18x18_h.png
new file mode 100755
index 000000000000..7b351935c0cc
--- /dev/null
+++ b/default_images/sc/res/sidebar/CellBorder_FourBorders_18x18_h.png
Binary files differ
diff --git a/default_images/sc/res/sidebar/CellBorder_FourBorders_Thick_18x18.png b/default_images/sc/res/sidebar/CellBorder_FourBorders_Thick_18x18.png
new file mode 100755
index 000000000000..a54c4f57d6b3
--- /dev/null
+++ b/default_images/sc/res/sidebar/CellBorder_FourBorders_Thick_18x18.png
Binary files differ
diff --git a/default_images/sc/res/sidebar/CellBorder_FourBorders_Thick_18x18_h.png b/default_images/sc/res/sidebar/CellBorder_FourBorders_Thick_18x18_h.png
new file mode 100755
index 000000000000..a62c20175522
--- /dev/null
+++ b/default_images/sc/res/sidebar/CellBorder_FourBorders_Thick_18x18_h.png
Binary files differ
diff --git a/default_images/sc/res/sidebar/CellBorder_LeftAndRight_18x18.png b/default_images/sc/res/sidebar/CellBorder_LeftAndRight_18x18.png
new file mode 100755
index 000000000000..39e9b0ff2ff9
--- /dev/null
+++ b/default_images/sc/res/sidebar/CellBorder_LeftAndRight_18x18.png
Binary files differ
diff --git a/default_images/sc/res/sidebar/CellBorder_LeftAndRight_18x18_h.png b/default_images/sc/res/sidebar/CellBorder_LeftAndRight_18x18_h.png
new file mode 100755
index 000000000000..62ffc82330f2
--- /dev/null
+++ b/default_images/sc/res/sidebar/CellBorder_LeftAndRight_18x18_h.png
Binary files differ
diff --git a/default_images/sc/res/sidebar/CellBorder_LeftDiagonal_18x18.png b/default_images/sc/res/sidebar/CellBorder_LeftDiagonal_18x18.png
new file mode 100755
index 000000000000..4e58fee70ca7
--- /dev/null
+++ b/default_images/sc/res/sidebar/CellBorder_LeftDiagonal_18x18.png
Binary files differ
diff --git a/default_images/sc/res/sidebar/CellBorder_LeftDiagonal_18x18_h.png b/default_images/sc/res/sidebar/CellBorder_LeftDiagonal_18x18_h.png
new file mode 100755
index 000000000000..64081573bb4a
--- /dev/null
+++ b/default_images/sc/res/sidebar/CellBorder_LeftDiagonal_18x18_h.png
Binary files differ
diff --git a/default_images/sc/res/sidebar/CellBorder_Left_18x18.png b/default_images/sc/res/sidebar/CellBorder_Left_18x18.png
new file mode 100755
index 000000000000..987389173b47
--- /dev/null
+++ b/default_images/sc/res/sidebar/CellBorder_Left_18x18.png
Binary files differ
diff --git a/default_images/sc/res/sidebar/CellBorder_Left_18x18_h.png b/default_images/sc/res/sidebar/CellBorder_Left_18x18_h.png
new file mode 100755
index 000000000000..7349f5b3f759
--- /dev/null
+++ b/default_images/sc/res/sidebar/CellBorder_Left_18x18_h.png
Binary files differ
diff --git a/default_images/sc/res/sidebar/CellBorder_RightDiagonal_18x18.png b/default_images/sc/res/sidebar/CellBorder_RightDiagonal_18x18.png
new file mode 100755
index 000000000000..3325d03918ba
--- /dev/null
+++ b/default_images/sc/res/sidebar/CellBorder_RightDiagonal_18x18.png
Binary files differ
diff --git a/default_images/sc/res/sidebar/CellBorder_RightDiagonal_18x18_h.png b/default_images/sc/res/sidebar/CellBorder_RightDiagonal_18x18_h.png
new file mode 100755
index 000000000000..ccebd4b4c8d1
--- /dev/null
+++ b/default_images/sc/res/sidebar/CellBorder_RightDiagonal_18x18_h.png
Binary files differ
diff --git a/default_images/sc/res/sidebar/CellBorder_Right_18x18.png b/default_images/sc/res/sidebar/CellBorder_Right_18x18.png
new file mode 100755
index 000000000000..a33eca25b44d
--- /dev/null
+++ b/default_images/sc/res/sidebar/CellBorder_Right_18x18.png
Binary files differ
diff --git a/default_images/sc/res/sidebar/CellBorder_Right_18x18_h.png b/default_images/sc/res/sidebar/CellBorder_Right_18x18_h.png
new file mode 100755
index 000000000000..d84d917b3b64
--- /dev/null
+++ b/default_images/sc/res/sidebar/CellBorder_Right_18x18_h.png
Binary files differ
diff --git a/default_images/sc/res/sidebar/CellBorder_TopAndBottom_18x18.png b/default_images/sc/res/sidebar/CellBorder_TopAndBottom_18x18.png
new file mode 100755
index 000000000000..4249bf669d6e
--- /dev/null
+++ b/default_images/sc/res/sidebar/CellBorder_TopAndBottom_18x18.png
Binary files differ
diff --git a/default_images/sc/res/sidebar/CellBorder_TopAndBottom_18x18_h.png b/default_images/sc/res/sidebar/CellBorder_TopAndBottom_18x18_h.png
new file mode 100755
index 000000000000..3bd0b73552ab
--- /dev/null
+++ b/default_images/sc/res/sidebar/CellBorder_TopAndBottom_18x18_h.png
Binary files differ
diff --git a/default_images/sc/res/sidebar/CellBorder_TopSingle_BottomDouble_18x18.png b/default_images/sc/res/sidebar/CellBorder_TopSingle_BottomDouble_18x18.png
new file mode 100755
index 000000000000..793a98451a82
--- /dev/null
+++ b/default_images/sc/res/sidebar/CellBorder_TopSingle_BottomDouble_18x18.png
Binary files differ
diff --git a/default_images/sc/res/sidebar/CellBorder_TopSingle_BottomDouble_18x18_h.png b/default_images/sc/res/sidebar/CellBorder_TopSingle_BottomDouble_18x18_h.png
new file mode 100755
index 000000000000..bdc624188b0a
--- /dev/null
+++ b/default_images/sc/res/sidebar/CellBorder_TopSingle_BottomDouble_18x18_h.png
Binary files differ
diff --git a/default_images/sc/res/sidebar/CellBorder_TopThin_BottomThick_18x18.png b/default_images/sc/res/sidebar/CellBorder_TopThin_BottomThick_18x18.png
new file mode 100755
index 000000000000..e7c8d0576e53
--- /dev/null
+++ b/default_images/sc/res/sidebar/CellBorder_TopThin_BottomThick_18x18.png
Binary files differ
diff --git a/default_images/sc/res/sidebar/CellBorder_TopThin_BottomThick_18x18_h.png b/default_images/sc/res/sidebar/CellBorder_TopThin_BottomThick_18x18_h.png
new file mode 100755
index 000000000000..758af77617ba
--- /dev/null
+++ b/default_images/sc/res/sidebar/CellBorder_TopThin_BottomThick_18x18_h.png
Binary files differ
diff --git a/default_images/sc/res/sidebar/CellBorder_Top_18x18.png b/default_images/sc/res/sidebar/CellBorder_Top_18x18.png
new file mode 100755
index 000000000000..1dda1c1cdfd3
--- /dev/null
+++ b/default_images/sc/res/sidebar/CellBorder_Top_18x18.png
Binary files differ
diff --git a/default_images/sc/res/sidebar/CellBorder_Top_18x18_h.png b/default_images/sc/res/sidebar/CellBorder_Top_18x18_h.png
new file mode 100755
index 000000000000..dfa9c53c73d2
--- /dev/null
+++ b/default_images/sc/res/sidebar/CellBorder_Top_18x18_h.png
Binary files differ
diff --git a/default_images/sc/res/sidebar/Line_color.png b/default_images/sc/res/sidebar/Line_color.png
new file mode 100755
index 000000000000..a9522b9eeedd
--- /dev/null
+++ b/default_images/sc/res/sidebar/Line_color.png
Binary files differ
diff --git a/default_images/sc/res/sidebar/canlendar.png b/default_images/sc/res/sidebar/canlendar.png
new file mode 100755
index 000000000000..b40421e68f3e
--- /dev/null
+++ b/default_images/sc/res/sidebar/canlendar.png
Binary files differ
diff --git a/default_images/sc/res/sidebar/fill_color.png b/default_images/sc/res/sidebar/fill_color.png
new file mode 100755
index 000000000000..1d5d23feb84c
--- /dev/null
+++ b/default_images/sc/res/sidebar/fill_color.png
Binary files differ
diff --git a/default_images/sc/res/sidebar/fill_color_h.png b/default_images/sc/res/sidebar/fill_color_h.png
new file mode 100755
index 000000000000..47e7ea15bfaa
--- /dev/null
+++ b/default_images/sc/res/sidebar/fill_color_h.png
Binary files differ
diff --git a/default_images/sc/res/sidebar/money.png b/default_images/sc/res/sidebar/money.png
new file mode 100755
index 000000000000..15b6ff2107ee
--- /dev/null
+++ b/default_images/sc/res/sidebar/money.png
Binary files differ
diff --git a/default_images/sc/res/sidebar/morebutton.bmp b/default_images/sc/res/sidebar/morebutton.bmp
new file mode 100755
index 000000000000..c665b3e866a8
--- /dev/null
+++ b/default_images/sc/res/sidebar/morebutton.bmp
Binary files differ
diff --git a/default_images/sc/res/sidebar/morebutton_h.bmp b/default_images/sc/res/sidebar/morebutton_h.bmp
new file mode 100755
index 000000000000..c665b3e866a8
--- /dev/null
+++ b/default_images/sc/res/sidebar/morebutton_h.bmp
Binary files differ
diff --git a/default_images/sc/res/sidebar/percent.png b/default_images/sc/res/sidebar/percent.png
new file mode 100755
index 000000000000..83f37512545d
--- /dev/null
+++ b/default_images/sc/res/sidebar/percent.png
Binary files differ
diff --git a/default_images/sc/res/sidebar/sc_alignbottom.png b/default_images/sc/res/sidebar/sc_alignbottom.png
new file mode 100755
index 000000000000..de22c240efdb
--- /dev/null
+++ b/default_images/sc/res/sidebar/sc_alignbottom.png
Binary files differ
diff --git a/default_images/sc/res/sidebar/sc_aligncenter.png b/default_images/sc/res/sidebar/sc_aligncenter.png
new file mode 100755
index 000000000000..441e6773aab9
--- /dev/null
+++ b/default_images/sc/res/sidebar/sc_aligncenter.png
Binary files differ
diff --git a/default_images/sc/res/sidebar/sc_aligncenter_v.png b/default_images/sc/res/sidebar/sc_aligncenter_v.png
new file mode 100755
index 000000000000..919edab0d01b
--- /dev/null
+++ b/default_images/sc/res/sidebar/sc_aligncenter_v.png
Binary files differ
diff --git a/default_images/sc/res/sidebar/sc_alignjust.png b/default_images/sc/res/sidebar/sc_alignjust.png
new file mode 100755
index 000000000000..1d57b1c4b2ce
--- /dev/null
+++ b/default_images/sc/res/sidebar/sc_alignjust.png
Binary files differ
diff --git a/default_images/sc/res/sidebar/sc_alignleft.png b/default_images/sc/res/sidebar/sc_alignleft.png
new file mode 100755
index 000000000000..a258013a958c
--- /dev/null
+++ b/default_images/sc/res/sidebar/sc_alignleft.png
Binary files differ
diff --git a/default_images/sc/res/sidebar/sc_alignright.png b/default_images/sc/res/sidebar/sc_alignright.png
new file mode 100755
index 000000000000..cbf816b540ce
--- /dev/null
+++ b/default_images/sc/res/sidebar/sc_alignright.png
Binary files differ
diff --git a/default_images/sc/res/sidebar/sc_aligntop.png b/default_images/sc/res/sidebar/sc_aligntop.png
new file mode 100755
index 000000000000..275133c3409d
--- /dev/null
+++ b/default_images/sc/res/sidebar/sc_aligntop.png
Binary files differ
diff --git a/default_images/sfx2/res/grip.png b/default_images/sfx2/res/grip.png
new file mode 100755
index 000000000000..696998385dbb
--- /dev/null
+++ b/default_images/sfx2/res/grip.png
Binary files differ
diff --git a/default_images/sfx2/res/grip_hc.png b/default_images/sfx2/res/grip_hc.png
new file mode 100755
index 000000000000..04e370d48bdf
--- /dev/null
+++ b/default_images/sfx2/res/grip_hc.png
Binary files differ
diff --git a/default_images/sfx2/res/menu.png b/default_images/sfx2/res/menu.png
new file mode 100755
index 000000000000..e65517b9ca9d
--- /dev/null
+++ b/default_images/sfx2/res/menu.png
Binary files differ
diff --git a/default_images/sfx2/res/menu_hc.png b/default_images/sfx2/res/menu_hc.png
new file mode 100755
index 000000000000..bebd1d622707
--- /dev/null
+++ b/default_images/sfx2/res/menu_hc.png
Binary files differ
diff --git a/default_images/sfx2/res/minus_hc.png b/default_images/sfx2/res/minus_hc.png
new file mode 100644
index 000000000000..9ee2e438df85
--- /dev/null
+++ b/default_images/sfx2/res/minus_hc.png
Binary files differ
diff --git a/default_images/sfx2/res/plus_hc.png b/default_images/sfx2/res/plus_hc.png
new file mode 100644
index 000000000000..a0b80adf6d93
--- /dev/null
+++ b/default_images/sfx2/res/plus_hc.png
Binary files differ
diff --git a/default_images/sfx2/res/separator.png b/default_images/sfx2/res/separator.png
new file mode 100755
index 000000000000..d518aefed706
--- /dev/null
+++ b/default_images/sfx2/res/separator.png
Binary files differ
diff --git a/default_images/sfx2/res/symphony/morebutton.png b/default_images/sfx2/res/symphony/morebutton.png
new file mode 100755
index 000000000000..5cffa97ca41c
--- /dev/null
+++ b/default_images/sfx2/res/symphony/morebutton.png
Binary files differ
diff --git a/default_images/sfx2/res/symphony/morebutton_h.png b/default_images/sfx2/res/symphony/morebutton_h.png
new file mode 100755
index 000000000000..5cffa97ca41c
--- /dev/null
+++ b/default_images/sfx2/res/symphony/morebutton_h.png
Binary files differ
diff --git a/default_images/sfx2/res/symphony/open_more.png b/default_images/sfx2/res/symphony/open_more.png
new file mode 100755
index 000000000000..c981abf0f3a5
--- /dev/null
+++ b/default_images/sfx2/res/symphony/open_more.png
Binary files differ
diff --git a/default_images/sfx2/res/symphony/sidebar-3d-large-hc.png b/default_images/sfx2/res/symphony/sidebar-3d-large-hc.png
new file mode 100755
index 000000000000..7bc11604f897
--- /dev/null
+++ b/default_images/sfx2/res/symphony/sidebar-3d-large-hc.png
Binary files differ
diff --git a/default_images/sfx2/res/symphony/sidebar-3d-large.png b/default_images/sfx2/res/symphony/sidebar-3d-large.png
new file mode 100755
index 000000000000..7bc11604f897
--- /dev/null
+++ b/default_images/sfx2/res/symphony/sidebar-3d-large.png
Binary files differ
diff --git a/default_images/sfx2/res/symphony/sidebar-3d-small-hc.png b/default_images/sfx2/res/symphony/sidebar-3d-small-hc.png
new file mode 100755
index 000000000000..a4cdda9ad5bc
--- /dev/null
+++ b/default_images/sfx2/res/symphony/sidebar-3d-small-hc.png
Binary files differ
diff --git a/default_images/sfx2/res/symphony/sidebar-3d-small.png b/default_images/sfx2/res/symphony/sidebar-3d-small.png
new file mode 100755
index 000000000000..a4cdda9ad5bc
--- /dev/null
+++ b/default_images/sfx2/res/symphony/sidebar-3d-small.png
Binary files differ
diff --git a/default_images/sfx2/res/symphony/sidebar-animation-large-hc.png b/default_images/sfx2/res/symphony/sidebar-animation-large-hc.png
new file mode 100755
index 000000000000..0be7962635fd
--- /dev/null
+++ b/default_images/sfx2/res/symphony/sidebar-animation-large-hc.png
Binary files differ
diff --git a/default_images/sfx2/res/symphony/sidebar-animation-large.png b/default_images/sfx2/res/symphony/sidebar-animation-large.png
new file mode 100755
index 000000000000..0be7962635fd
--- /dev/null
+++ b/default_images/sfx2/res/symphony/sidebar-animation-large.png
Binary files differ
diff --git a/default_images/sfx2/res/symphony/sidebar-animation-small-hc.png b/default_images/sfx2/res/symphony/sidebar-animation-small-hc.png
new file mode 100755
index 000000000000..c494dfa6e170
--- /dev/null
+++ b/default_images/sfx2/res/symphony/sidebar-animation-small-hc.png
Binary files differ
diff --git a/default_images/sfx2/res/symphony/sidebar-animation-small.png b/default_images/sfx2/res/symphony/sidebar-animation-small.png
new file mode 100755
index 000000000000..c494dfa6e170
--- /dev/null
+++ b/default_images/sfx2/res/symphony/sidebar-animation-small.png
Binary files differ
diff --git a/default_images/sfx2/res/symphony/sidebar-colors-large-hc.png b/default_images/sfx2/res/symphony/sidebar-colors-large-hc.png
new file mode 100755
index 000000000000..39ecdc12d1bf
--- /dev/null
+++ b/default_images/sfx2/res/symphony/sidebar-colors-large-hc.png
Binary files differ
diff --git a/default_images/sfx2/res/symphony/sidebar-colors-large.png b/default_images/sfx2/res/symphony/sidebar-colors-large.png
new file mode 100755
index 000000000000..39ecdc12d1bf
--- /dev/null
+++ b/default_images/sfx2/res/symphony/sidebar-colors-large.png
Binary files differ
diff --git a/default_images/sfx2/res/symphony/sidebar-colors-small-hc.png b/default_images/sfx2/res/symphony/sidebar-colors-small-hc.png
new file mode 100755
index 000000000000..049514bec7df
--- /dev/null
+++ b/default_images/sfx2/res/symphony/sidebar-colors-small-hc.png
Binary files differ
diff --git a/default_images/sfx2/res/symphony/sidebar-colors-small.png b/default_images/sfx2/res/symphony/sidebar-colors-small.png
new file mode 100755
index 000000000000..049514bec7df
--- /dev/null
+++ b/default_images/sfx2/res/symphony/sidebar-colors-small.png
Binary files differ
diff --git a/default_images/sfx2/res/symphony/sidebar-eyedropper-large-hc.png b/default_images/sfx2/res/symphony/sidebar-eyedropper-large-hc.png
new file mode 100755
index 000000000000..be99b1fbc2a4
--- /dev/null
+++ b/default_images/sfx2/res/symphony/sidebar-eyedropper-large-hc.png
Binary files differ
diff --git a/default_images/sfx2/res/symphony/sidebar-eyedropper-large.png b/default_images/sfx2/res/symphony/sidebar-eyedropper-large.png
new file mode 100755
index 000000000000..be99b1fbc2a4
--- /dev/null
+++ b/default_images/sfx2/res/symphony/sidebar-eyedropper-large.png
Binary files differ
diff --git a/default_images/sfx2/res/symphony/sidebar-eyedropper-small-hc.png b/default_images/sfx2/res/symphony/sidebar-eyedropper-small-hc.png
new file mode 100755
index 000000000000..55e182a7cfd8
--- /dev/null
+++ b/default_images/sfx2/res/symphony/sidebar-eyedropper-small-hc.png
Binary files differ
diff --git a/default_images/sfx2/res/symphony/sidebar-eyedropper-small.png b/default_images/sfx2/res/symphony/sidebar-eyedropper-small.png
new file mode 100755
index 000000000000..55e182a7cfd8
--- /dev/null
+++ b/default_images/sfx2/res/symphony/sidebar-eyedropper-small.png
Binary files differ
diff --git a/default_images/sfx2/res/symphony/sidebar-functions-large-hc.png b/default_images/sfx2/res/symphony/sidebar-functions-large-hc.png
new file mode 100644
index 000000000000..1991850ae7db
--- /dev/null
+++ b/default_images/sfx2/res/symphony/sidebar-functions-large-hc.png
Binary files differ
diff --git a/default_images/sfx2/res/symphony/sidebar-functions-large.png b/default_images/sfx2/res/symphony/sidebar-functions-large.png
new file mode 100644
index 000000000000..1991850ae7db
--- /dev/null
+++ b/default_images/sfx2/res/symphony/sidebar-functions-large.png
Binary files differ
diff --git a/default_images/sfx2/res/symphony/sidebar-functions-small-hc.png b/default_images/sfx2/res/symphony/sidebar-functions-small-hc.png
new file mode 100644
index 000000000000..615bd0b8788d
--- /dev/null
+++ b/default_images/sfx2/res/symphony/sidebar-functions-small-hc.png
Binary files differ
diff --git a/default_images/sfx2/res/symphony/sidebar-functions-small.png b/default_images/sfx2/res/symphony/sidebar-functions-small.png
new file mode 100644
index 000000000000..615bd0b8788d
--- /dev/null
+++ b/default_images/sfx2/res/symphony/sidebar-functions-small.png
Binary files differ
diff --git a/default_images/sfx2/res/symphony/sidebar-gallery-large-hc.png b/default_images/sfx2/res/symphony/sidebar-gallery-large-hc.png
new file mode 100755
index 000000000000..9effe086a135
--- /dev/null
+++ b/default_images/sfx2/res/symphony/sidebar-gallery-large-hc.png
Binary files differ
diff --git a/default_images/sfx2/res/symphony/sidebar-gallery-large.png b/default_images/sfx2/res/symphony/sidebar-gallery-large.png
new file mode 100755
index 000000000000..9effe086a135
--- /dev/null
+++ b/default_images/sfx2/res/symphony/sidebar-gallery-large.png
Binary files differ
diff --git a/default_images/sfx2/res/symphony/sidebar-gallery-small-hc.png b/default_images/sfx2/res/symphony/sidebar-gallery-small-hc.png
new file mode 100755
index 000000000000..29b3c2545978
--- /dev/null
+++ b/default_images/sfx2/res/symphony/sidebar-gallery-small-hc.png
Binary files differ
diff --git a/default_images/sfx2/res/symphony/sidebar-gallery-small.png b/default_images/sfx2/res/symphony/sidebar-gallery-small.png
new file mode 100755
index 000000000000..29b3c2545978
--- /dev/null
+++ b/default_images/sfx2/res/symphony/sidebar-gallery-small.png
Binary files differ
diff --git a/default_images/sfx2/res/symphony/sidebar-imganim-large-hc.png b/default_images/sfx2/res/symphony/sidebar-imganim-large-hc.png
new file mode 100755
index 000000000000..778e49979e55
--- /dev/null
+++ b/default_images/sfx2/res/symphony/sidebar-imganim-large-hc.png
Binary files differ
diff --git a/default_images/sfx2/res/symphony/sidebar-imganim-large.png b/default_images/sfx2/res/symphony/sidebar-imganim-large.png
new file mode 100755
index 000000000000..778e49979e55
--- /dev/null
+++ b/default_images/sfx2/res/symphony/sidebar-imganim-large.png
Binary files differ
diff --git a/default_images/sfx2/res/symphony/sidebar-imganim-small-hc.png b/default_images/sfx2/res/symphony/sidebar-imganim-small-hc.png
new file mode 100755
index 000000000000..50a065ac299b
--- /dev/null
+++ b/default_images/sfx2/res/symphony/sidebar-imganim-small-hc.png
Binary files differ
diff --git a/default_images/sfx2/res/symphony/sidebar-imganim-small.png b/default_images/sfx2/res/symphony/sidebar-imganim-small.png
new file mode 100755
index 000000000000..50a065ac299b
--- /dev/null
+++ b/default_images/sfx2/res/symphony/sidebar-imganim-small.png
Binary files differ
diff --git a/default_images/sfx2/res/symphony/sidebar-navigator-large-hc.png b/default_images/sfx2/res/symphony/sidebar-navigator-large-hc.png
new file mode 100755
index 000000000000..a078b0a54194
--- /dev/null
+++ b/default_images/sfx2/res/symphony/sidebar-navigator-large-hc.png
Binary files differ
diff --git a/default_images/sfx2/res/symphony/sidebar-navigator-large.png b/default_images/sfx2/res/symphony/sidebar-navigator-large.png
new file mode 100755
index 000000000000..a078b0a54194
--- /dev/null
+++ b/default_images/sfx2/res/symphony/sidebar-navigator-large.png
Binary files differ
diff --git a/default_images/sfx2/res/symphony/sidebar-navigator-small-hc.png b/default_images/sfx2/res/symphony/sidebar-navigator-small-hc.png
new file mode 100755
index 000000000000..00bd1cabf200
--- /dev/null
+++ b/default_images/sfx2/res/symphony/sidebar-navigator-small-hc.png
Binary files differ
diff --git a/default_images/sfx2/res/symphony/sidebar-navigator-small.png b/default_images/sfx2/res/symphony/sidebar-navigator-small.png
new file mode 100755
index 000000000000..00bd1cabf200
--- /dev/null
+++ b/default_images/sfx2/res/symphony/sidebar-navigator-small.png
Binary files differ
diff --git a/default_images/sfx2/res/symphony/sidebar-property-large-hc.png b/default_images/sfx2/res/symphony/sidebar-property-large-hc.png
new file mode 100755
index 000000000000..fb0c1595ff68
--- /dev/null
+++ b/default_images/sfx2/res/symphony/sidebar-property-large-hc.png
Binary files differ
diff --git a/default_images/sfx2/res/symphony/sidebar-property-large.png b/default_images/sfx2/res/symphony/sidebar-property-large.png
new file mode 100755
index 000000000000..fb0c1595ff68
--- /dev/null
+++ b/default_images/sfx2/res/symphony/sidebar-property-large.png
Binary files differ
diff --git a/default_images/sfx2/res/symphony/sidebar-property-small-hc.png b/default_images/sfx2/res/symphony/sidebar-property-small-hc.png
new file mode 100755
index 000000000000..4147aa14cc0b
--- /dev/null
+++ b/default_images/sfx2/res/symphony/sidebar-property-small-hc.png
Binary files differ
diff --git a/default_images/sfx2/res/symphony/sidebar-property-small.png b/default_images/sfx2/res/symphony/sidebar-property-small.png
new file mode 100755
index 000000000000..4147aa14cc0b
--- /dev/null
+++ b/default_images/sfx2/res/symphony/sidebar-property-small.png
Binary files differ
diff --git a/default_images/sfx2/res/symphony/sidebar-style-large-hc.png b/default_images/sfx2/res/symphony/sidebar-style-large-hc.png
new file mode 100755
index 000000000000..0d59a2df0cba
--- /dev/null
+++ b/default_images/sfx2/res/symphony/sidebar-style-large-hc.png
Binary files differ
diff --git a/default_images/sfx2/res/symphony/sidebar-style-large.png b/default_images/sfx2/res/symphony/sidebar-style-large.png
new file mode 100755
index 000000000000..0d59a2df0cba
--- /dev/null
+++ b/default_images/sfx2/res/symphony/sidebar-style-large.png
Binary files differ
diff --git a/default_images/sfx2/res/symphony/sidebar-style-small-hc.png b/default_images/sfx2/res/symphony/sidebar-style-small-hc.png
new file mode 100755
index 000000000000..d570ffa0f8de
--- /dev/null
+++ b/default_images/sfx2/res/symphony/sidebar-style-small-hc.png
Binary files differ
diff --git a/default_images/sfx2/res/symphony/sidebar-style-small.png b/default_images/sfx2/res/symphony/sidebar-style-small.png
new file mode 100755
index 000000000000..d570ffa0f8de
--- /dev/null
+++ b/default_images/sfx2/res/symphony/sidebar-style-small.png
Binary files differ
diff --git a/default_images/sfx2/res/symphony/sidebar-template-large-hc.png b/default_images/sfx2/res/symphony/sidebar-template-large-hc.png
new file mode 100755
index 000000000000..f4beddc5426d
--- /dev/null
+++ b/default_images/sfx2/res/symphony/sidebar-template-large-hc.png
Binary files differ
diff --git a/default_images/sfx2/res/symphony/sidebar-template-large.png b/default_images/sfx2/res/symphony/sidebar-template-large.png
new file mode 100755
index 000000000000..f4beddc5426d
--- /dev/null
+++ b/default_images/sfx2/res/symphony/sidebar-template-large.png
Binary files differ
diff --git a/default_images/sfx2/res/symphony/sidebar-template-small-hc.png b/default_images/sfx2/res/symphony/sidebar-template-small-hc.png
new file mode 100755
index 000000000000..65bff0c226e8
--- /dev/null
+++ b/default_images/sfx2/res/symphony/sidebar-template-small-hc.png
Binary files differ
diff --git a/default_images/sfx2/res/symphony/sidebar-template-small.png b/default_images/sfx2/res/symphony/sidebar-template-small.png
new file mode 100755
index 000000000000..65bff0c226e8
--- /dev/null
+++ b/default_images/sfx2/res/symphony/sidebar-template-small.png
Binary files differ
diff --git a/default_images/sfx2/res/symphony/sidebar-transition-large-hc.png b/default_images/sfx2/res/symphony/sidebar-transition-large-hc.png
new file mode 100755
index 000000000000..f0c319878bb7
--- /dev/null
+++ b/default_images/sfx2/res/symphony/sidebar-transition-large-hc.png
Binary files differ
diff --git a/default_images/sfx2/res/symphony/sidebar-transition-large.png b/default_images/sfx2/res/symphony/sidebar-transition-large.png
new file mode 100755
index 000000000000..f0c319878bb7
--- /dev/null
+++ b/default_images/sfx2/res/symphony/sidebar-transition-large.png
Binary files differ
diff --git a/default_images/sfx2/res/symphony/sidebar-transition-small-hc.png b/default_images/sfx2/res/symphony/sidebar-transition-small-hc.png
new file mode 100755
index 000000000000..6cdc89a5e614
--- /dev/null
+++ b/default_images/sfx2/res/symphony/sidebar-transition-small-hc.png
Binary files differ
diff --git a/default_images/sfx2/res/symphony/sidebar-transition-small.png b/default_images/sfx2/res/symphony/sidebar-transition-small.png
new file mode 100755
index 000000000000..6cdc89a5e614
--- /dev/null
+++ b/default_images/sfx2/res/symphony/sidebar-transition-small.png
Binary files differ
diff --git a/default_images/svx/res/rotation.png b/default_images/svx/res/rotation.png
new file mode 100755
index 000000000000..57f75b98732c
--- /dev/null
+++ b/default_images/svx/res/rotation.png
Binary files differ
diff --git a/default_images/svx/res/rotation_h.png b/default_images/svx/res/rotation_h.png
new file mode 100755
index 000000000000..e8adbfc6e92c
--- /dev/null
+++ b/default_images/svx/res/rotation_h.png
Binary files differ
diff --git a/default_images/svx/res/symphony/ b/default_images/svx/res/symphony/
new file mode 100755
index 000000000000..263af5d328bd
--- /dev/null
+++ b/default_images/svx/res/symphony/
Binary files differ
diff --git a/default_images/svx/res/symphony/AdjustColorBlue_16x16.png b/default_images/svx/res/symphony/AdjustColorBlue_16x16.png
new file mode 100755
index 000000000000..0e4e0b3d2599
--- /dev/null
+++ b/default_images/svx/res/symphony/AdjustColorBlue_16x16.png
Binary files differ
diff --git a/default_images/svx/res/symphony/AdjustColorGamma_16x16.png b/default_images/svx/res/symphony/AdjustColorGamma_16x16.png
new file mode 100755
index 000000000000..bc593f743048
--- /dev/null
+++ b/default_images/svx/res/symphony/AdjustColorGamma_16x16.png
Binary files differ
diff --git a/default_images/svx/res/symphony/AdjustColorGreen_16x16.png b/default_images/svx/res/symphony/AdjustColorGreen_16x16.png
new file mode 100755
index 000000000000..05f99dcd85b2
--- /dev/null
+++ b/default_images/svx/res/symphony/AdjustColorGreen_16x16.png
Binary files differ
diff --git a/default_images/svx/res/symphony/AdjustColorRed_16x16.png b/default_images/svx/res/symphony/AdjustColorRed_16x16.png
new file mode 100755
index 000000000000..86ed800174f8
--- /dev/null
+++ b/default_images/svx/res/symphony/AdjustColorRed_16x16.png
Binary files differ
diff --git a/default_images/svx/res/symphony/AlignTextCenter_16x16.png b/default_images/svx/res/symphony/AlignTextCenter_16x16.png
new file mode 100755
index 000000000000..441e6773aab9
--- /dev/null
+++ b/default_images/svx/res/symphony/AlignTextCenter_16x16.png
Binary files differ
diff --git a/default_images/svx/res/symphony/AlignTextJustified_16x16.png b/default_images/svx/res/symphony/AlignTextJustified_16x16.png
new file mode 100755
index 000000000000..1d57b1c4b2ce
--- /dev/null
+++ b/default_images/svx/res/symphony/AlignTextJustified_16x16.png
Binary files differ
diff --git a/default_images/svx/res/symphony/AlignTextLeft_16x16.png b/default_images/svx/res/symphony/AlignTextLeft_16x16.png
new file mode 100755
index 000000000000..a258013a958c
--- /dev/null
+++ b/default_images/svx/res/symphony/AlignTextLeft_16x16.png
Binary files differ
diff --git a/default_images/svx/res/symphony/AlignTextRight_16x16.png b/default_images/svx/res/symphony/AlignTextRight_16x16.png
new file mode 100755
index 000000000000..cbf816b540ce
--- /dev/null
+++ b/default_images/svx/res/symphony/AlignTextRight_16x16.png
Binary files differ
diff --git a/default_images/svx/res/symphony/ColorModeBlackWhite_16x16.png b/default_images/svx/res/symphony/ColorModeBlackWhite_16x16.png
new file mode 100755
index 000000000000..c6d333cb45ed
--- /dev/null
+++ b/default_images/svx/res/symphony/ColorModeBlackWhite_16x16.png
Binary files differ
diff --git a/default_images/svx/res/symphony/ColorModeGrey_16x16.png b/default_images/svx/res/symphony/ColorModeGrey_16x16.png
new file mode 100755
index 000000000000..5bda54f81d99
--- /dev/null
+++ b/default_images/svx/res/symphony/ColorModeGrey_16x16.png
Binary files differ
diff --git a/default_images/svx/res/symphony/ColorModeNormal_16x16.png b/default_images/svx/res/symphony/ColorModeNormal_16x16.png
new file mode 100755
index 000000000000..a618abd72851
--- /dev/null
+++ b/default_images/svx/res/symphony/ColorModeNormal_16x16.png
Binary files differ
diff --git a/default_images/svx/res/symphony/ColorModeWaterMark_16x16.png b/default_images/svx/res/symphony/ColorModeWaterMark_16x16.png
new file mode 100755
index 000000000000..1606498d5537
--- /dev/null
+++ b/default_images/svx/res/symphony/ColorModeWaterMark_16x16.png
Binary files differ
diff --git a/default_images/svx/res/symphony/DecreaseSpace_16x16.png b/default_images/svx/res/symphony/DecreaseSpace_16x16.png
new file mode 100755
index 000000000000..3f97e69229fe
--- /dev/null
+++ b/default_images/svx/res/symphony/DecreaseSpace_16x16.png
Binary files differ
diff --git a/default_images/svx/res/symphony/FlipHorizontally_16x16.png b/default_images/svx/res/symphony/FlipHorizontally_16x16.png
new file mode 100755
index 000000000000..281ee466886d
--- /dev/null
+++ b/default_images/svx/res/symphony/FlipHorizontally_16x16.png
Binary files differ
diff --git a/default_images/svx/res/symphony/FlipVertically_16x16.png b/default_images/svx/res/symphony/FlipVertically_16x16.png
new file mode 100755
index 000000000000..7c9c4c45e205
--- /dev/null
+++ b/default_images/svx/res/symphony/FlipVertically_16x16.png
Binary files differ
diff --git a/default_images/svx/res/symphony/Highlight.png b/default_images/svx/res/symphony/Highlight.png
new file mode 100755
index 000000000000..8640d2e44be9
--- /dev/null
+++ b/default_images/svx/res/symphony/Highlight.png
Binary files differ
diff --git a/default_images/svx/res/symphony/IncreaseSpace_16x16.png b/default_images/svx/res/symphony/IncreaseSpace_16x16.png
new file mode 100755
index 000000000000..f27f369dbe61
--- /dev/null
+++ b/default_images/svx/res/symphony/IncreaseSpace_16x16.png
Binary files differ
diff --git a/default_images/svx/res/symphony/Indent2.png b/default_images/svx/res/symphony/Indent2.png
new file mode 100755
index 000000000000..9cb8663a9703
--- /dev/null
+++ b/default_images/svx/res/symphony/Indent2.png
Binary files differ
diff --git a/default_images/svx/res/symphony/Indent3.png b/default_images/svx/res/symphony/Indent3.png
new file mode 100755
index 000000000000..c57f2b279c48
--- /dev/null
+++ b/default_images/svx/res/symphony/Indent3.png
Binary files differ
diff --git a/default_images/svx/res/symphony/Indent4.png b/default_images/svx/res/symphony/Indent4.png
new file mode 100755
index 000000000000..0cba2f006ed0
--- /dev/null
+++ b/default_images/svx/res/symphony/Indent4.png
Binary files differ
diff --git a/default_images/svx/res/symphony/Indent_16x16.png b/default_images/svx/res/symphony/Indent_16x16.png
new file mode 100755
index 000000000000..93137374094e
--- /dev/null
+++ b/default_images/svx/res/symphony/Indent_16x16.png
Binary files differ
diff --git a/default_images/svx/res/symphony/Indent_Hanging.png b/default_images/svx/res/symphony/Indent_Hanging.png
new file mode 100755
index 000000000000..4acb5b519983
--- /dev/null
+++ b/default_images/svx/res/symphony/Indent_Hanging.png
Binary files differ
diff --git a/default_images/svx/res/symphony/Line_color.png b/default_images/svx/res/symphony/Line_color.png
new file mode 100755
index 000000000000..a9522b9eeedd
--- /dev/null
+++ b/default_images/svx/res/symphony/Line_color.png
Binary files differ
diff --git a/default_images/svx/res/symphony/Outdent_16x16.png b/default_images/svx/res/symphony/Outdent_16x16.png
new file mode 100755
index 000000000000..7461944a7083
--- /dev/null
+++ b/default_images/svx/res/symphony/Outdent_16x16.png
Binary files differ
diff --git a/default_images/svx/res/symphony/Quadratic.png b/default_images/svx/res/symphony/Quadratic.png
new file mode 100755
index 000000000000..ad579c8e393d
--- /dev/null
+++ b/default_images/svx/res/symphony/Quadratic.png
Binary files differ
diff --git a/default_images/svx/res/symphony/Quadratic_h.png b/default_images/svx/res/symphony/Quadratic_h.png
new file mode 100644
index 000000000000..12d644800e9a
--- /dev/null
+++ b/default_images/svx/res/symphony/Quadratic_h.png
Binary files differ
diff --git a/default_images/svx/res/symphony/Square.png b/default_images/svx/res/symphony/Square.png
new file mode 100755
index 000000000000..1027f8a480f8
--- /dev/null
+++ b/default_images/svx/res/symphony/Square.png
Binary files differ
diff --git a/default_images/svx/res/symphony/Square_h.png b/default_images/svx/res/symphony/Square_h.png
new file mode 100755
index 000000000000..8d0ccea3e0f4
--- /dev/null
+++ b/default_images/svx/res/symphony/Square_h.png
Binary files differ
diff --git a/default_images/svx/res/symphony/__morebutton.bmp b/default_images/svx/res/symphony/__morebutton.bmp
new file mode 100755
index 000000000000..c665b3e866a8
--- /dev/null
+++ b/default_images/svx/res/symphony/__morebutton.bmp
Binary files differ
diff --git a/default_images/svx/res/symphony/__morebutton_h.bmp b/default_images/svx/res/symphony/__morebutton_h.bmp
new file mode 100755
index 000000000000..c665b3e866a8
--- /dev/null
+++ b/default_images/svx/res/symphony/__morebutton_h.bmp
Binary files differ
diff --git a/default_images/svx/res/symphony/axial.png b/default_images/svx/res/symphony/axial.png
new file mode 100755
index 000000000000..8b398bef1df5
--- /dev/null
+++ b/default_images/svx/res/symphony/axial.png
Binary files differ
diff --git a/default_images/svx/res/symphony/axial_h.png b/default_images/svx/res/symphony/axial_h.png
new file mode 100755
index 000000000000..5771323542d0
--- /dev/null
+++ b/default_images/svx/res/symphony/axial_h.png
Binary files differ
diff --git a/default_images/svx/res/symphony/blank.png b/default_images/svx/res/symphony/blank.png
new file mode 100755
index 000000000000..d38ff9daebf9
--- /dev/null
+++ b/default_images/svx/res/symphony/blank.png
Binary files differ
diff --git a/default_images/svx/res/symphony/decrease font.png b/default_images/svx/res/symphony/decrease font.png
new file mode 100755
index 000000000000..183e0091f590
--- /dev/null
+++ b/default_images/svx/res/symphony/decrease font.png
Binary files differ
diff --git a/default_images/svx/res/symphony/ellipsoid.png b/default_images/svx/res/symphony/ellipsoid.png
new file mode 100755
index 000000000000..babaf75b2da8
--- /dev/null
+++ b/default_images/svx/res/symphony/ellipsoid.png
Binary files differ
diff --git a/default_images/svx/res/symphony/ellipsoid_h.png b/default_images/svx/res/symphony/ellipsoid_h.png
new file mode 100755
index 000000000000..2a38b320398b
--- /dev/null
+++ b/default_images/svx/res/symphony/ellipsoid_h.png
Binary files differ
diff --git a/default_images/svx/res/symphony/enlarge font.png b/default_images/svx/res/symphony/enlarge font.png
new file mode 100755
index 000000000000..86c6e5d49daa
--- /dev/null
+++ b/default_images/svx/res/symphony/enlarge font.png
Binary files differ
diff --git a/default_images/svx/res/symphony/fill_color.png b/default_images/svx/res/symphony/fill_color.png
new file mode 100755
index 000000000000..1d8837545728
--- /dev/null
+++ b/default_images/svx/res/symphony/fill_color.png
Binary files differ
diff --git a/default_images/svx/res/symphony/fill_color_h.png b/default_images/svx/res/symphony/fill_color_h.png
new file mode 100755
index 000000000000..7cbafa57eb99
--- /dev/null
+++ b/default_images/svx/res/symphony/fill_color_h.png
Binary files differ
diff --git a/default_images/svx/res/symphony/icon_normal.png b/default_images/svx/res/symphony/icon_normal.png
new file mode 100755
index 000000000000..f69ec0501e9e
--- /dev/null
+++ b/default_images/svx/res/symphony/icon_normal.png
Binary files differ
diff --git a/default_images/svx/res/symphony/last_custom_common.png b/default_images/svx/res/symphony/last_custom_common.png
new file mode 100755
index 000000000000..bbbe3255d272
--- /dev/null
+++ b/default_images/svx/res/symphony/last_custom_common.png
Binary files differ
diff --git a/default_images/svx/res/symphony/last_custom_common_grey.png b/default_images/svx/res/symphony/last_custom_common_grey.png
new file mode 100755
index 000000000000..c95062eb2897
--- /dev/null
+++ b/default_images/svx/res/symphony/last_custom_common_grey.png
Binary files differ
diff --git a/default_images/svx/res/symphony/line1.png b/default_images/svx/res/symphony/line1.png
new file mode 100755
index 000000000000..7b667d5fdfe0
--- /dev/null
+++ b/default_images/svx/res/symphony/line1.png
Binary files differ
diff --git a/default_images/svx/res/symphony/line10.png b/default_images/svx/res/symphony/line10.png
new file mode 100755
index 000000000000..956c4f05959e
--- /dev/null
+++ b/default_images/svx/res/symphony/line10.png
Binary files differ
diff --git a/default_images/svx/res/symphony/line10_h.png b/default_images/svx/res/symphony/line10_h.png
new file mode 100755
index 000000000000..6c81727ca103
--- /dev/null
+++ b/default_images/svx/res/symphony/line10_h.png
Binary files differ
diff --git a/default_images/svx/res/symphony/line1_h.png b/default_images/svx/res/symphony/line1_h.png
new file mode 100755
index 000000000000..8e5dd3a985a9
--- /dev/null
+++ b/default_images/svx/res/symphony/line1_h.png
Binary files differ
diff --git a/default_images/svx/res/symphony/line2.png b/default_images/svx/res/symphony/line2.png
new file mode 100755
index 000000000000..d7c2cae56195
--- /dev/null
+++ b/default_images/svx/res/symphony/line2.png
Binary files differ
diff --git a/default_images/svx/res/symphony/line2_h.png b/default_images/svx/res/symphony/line2_h.png
new file mode 100755
index 000000000000..ad3c78bb36ed
--- /dev/null
+++ b/default_images/svx/res/symphony/line2_h.png
Binary files differ
diff --git a/default_images/svx/res/symphony/line3.png b/default_images/svx/res/symphony/line3.png
new file mode 100755
index 000000000000..0c74e4190570
--- /dev/null
+++ b/default_images/svx/res/symphony/line3.png
Binary files differ
diff --git a/default_images/svx/res/symphony/line3_h.png b/default_images/svx/res/symphony/line3_h.png
new file mode 100755
index 000000000000..2d91489a07d7
--- /dev/null
+++ b/default_images/svx/res/symphony/line3_h.png
Binary files differ
diff --git a/default_images/svx/res/symphony/line4.png b/default_images/svx/res/symphony/line4.png
new file mode 100755
index 000000000000..5dc893860d32
--- /dev/null
+++ b/default_images/svx/res/symphony/line4.png
Binary files differ
diff --git a/default_images/svx/res/symphony/line4_h.png b/default_images/svx/res/symphony/line4_h.png
new file mode 100755
index 000000000000..f62c84d524cf
--- /dev/null
+++ b/default_images/svx/res/symphony/line4_h.png
Binary files differ
diff --git a/default_images/svx/res/symphony/line5.png b/default_images/svx/res/symphony/line5.png
new file mode 100755
index 000000000000..2f90aedc5b46
--- /dev/null
+++ b/default_images/svx/res/symphony/line5.png
Binary files differ
diff --git a/default_images/svx/res/symphony/line5_h.png b/default_images/svx/res/symphony/line5_h.png
new file mode 100755
index 000000000000..74d7fad3a05c
--- /dev/null
+++ b/default_images/svx/res/symphony/line5_h.png
Binary files differ
diff --git a/default_images/svx/res/symphony/line6.png b/default_images/svx/res/symphony/line6.png
new file mode 100755
index 000000000000..10a7cedcfcae
--- /dev/null
+++ b/default_images/svx/res/symphony/line6.png
Binary files differ
diff --git a/default_images/svx/res/symphony/line6_h.png b/default_images/svx/res/symphony/line6_h.png
new file mode 100755
index 000000000000..52d4a9a793df
--- /dev/null
+++ b/default_images/svx/res/symphony/line6_h.png
Binary files differ
diff --git a/default_images/svx/res/symphony/line7.png b/default_images/svx/res/symphony/line7.png
new file mode 100755
index 000000000000..ff1df906dec3
--- /dev/null
+++ b/default_images/svx/res/symphony/line7.png
Binary files differ
diff --git a/default_images/svx/res/symphony/line7_h.png b/default_images/svx/res/symphony/line7_h.png
new file mode 100755
index 000000000000..7592f0265cff
--- /dev/null
+++ b/default_images/svx/res/symphony/line7_h.png
Binary files differ
diff --git a/default_images/svx/res/symphony/line8.png b/default_images/svx/res/symphony/line8.png
new file mode 100755
index 000000000000..5355d76d7644
--- /dev/null
+++ b/default_images/svx/res/symphony/line8.png
Binary files differ
diff --git a/default_images/svx/res/symphony/line8_h.png b/default_images/svx/res/symphony/line8_h.png
new file mode 100755
index 000000000000..57b3e4952fb0
--- /dev/null
+++ b/default_images/svx/res/symphony/line8_h.png
Binary files differ
diff --git a/default_images/svx/res/symphony/line9.png b/default_images/svx/res/symphony/line9.png
new file mode 100755
index 000000000000..ba822a7c16e3
--- /dev/null
+++ b/default_images/svx/res/symphony/line9.png
Binary files differ
diff --git a/default_images/svx/res/symphony/line9_h.png b/default_images/svx/res/symphony/line9_h.png
new file mode 100755
index 000000000000..700a2b02ef79
--- /dev/null
+++ b/default_images/svx/res/symphony/line9_h.png
Binary files differ
diff --git a/default_images/svx/res/symphony/linear.png b/default_images/svx/res/symphony/linear.png
new file mode 100755
index 000000000000..a9c3191b1919
--- /dev/null
+++ b/default_images/svx/res/symphony/linear.png
Binary files differ
diff --git a/default_images/svx/res/symphony/linear_h.png b/default_images/svx/res/symphony/linear_h.png
new file mode 100755
index 000000000000..23b7a181717b
--- /dev/null
+++ b/default_images/svx/res/symphony/linear_h.png
Binary files differ
diff --git a/default_images/svx/res/symphony/list.txt b/default_images/svx/res/symphony/list.txt
new file mode 100644
index 000000000000..afcef809536e
--- /dev/null
+++ b/default_images/svx/res/symphony/list.txt
@@ -0,0 +1,70 @@
+mv bla/"axial.png" .
+mv bla/"axial_h.png" .
+mv bla/"decrease font.png" .
+mv bla/"ellipsoid.png" .
+mv bla/"ellipsoid_h.png" .
+mv bla/"enlarge font.png" .
+mv bla/"fill_color.png" .
+mv bla/"fill_color_h.png" .
+mv bla/"Highlight.png" .
+mv bla/"icon_normal.png" .
+mv bla/"last_custom_common.png" .
+mv bla/"last_custom_common_grey.png" .
+mv bla/"line1.png" .
+mv bla/"line1_h.png" .
+mv bla/"line10.png" .
+mv bla/"line10_h.png" .
+mv bla/"line2.png" .
+mv bla/"line2_h.png" .
+mv bla/"line3.png" .
+mv bla/"line3_h.png" .
+mv bla/"line4.png" .
+mv bla/"line4_h.png" .
+mv bla/"line5.png" .
+mv bla/"line5_h.png" .
+mv bla/"line6.png" .
+mv bla/"line6_h.png" .
+mv bla/"line7.png" .
+mv bla/"line7_h.png" .
+mv bla/"line8.png" .
+mv bla/"line8_h.png" .
+mv bla/"line9.png" .
+mv bla/"line9_h.png" .
+mv bla/"linear.png" .
+mv bla/"linear_h.png" .
+mv bla/"Quadratic.png" .
+mv bla/"Quadratic_h.png" .
+mv bla/"radial.png" .
+mv bla/"radial_h.png" .
+mv bla/"rotate_left.png" .
+mv bla/"rotate_right.png" .
+mv bla/"sc_bold.png" .
+mv bla/"sc_color.png" .
+mv bla/"sc_italic.png" .
+mv bla/"sc_shadowed.png" .
+mv bla/"sc_strikeout.png" .
+mv bla/"sc_subscript.png" .
+mv bla/"sc_superscript.png" .
+mv bla/"sc_underline.png" .
+mv bla/"selected-line1.png" .
+mv bla/"selected-line10.png" .
+mv bla/"selected-line2.png" .
+mv bla/"selected-line3.png" .
+mv bla/"selected-line4.png" .
+mv bla/"selected-line5.png" .
+mv bla/"selected-line6.png" .
+mv bla/"selected-line7.png" .
+mv bla/"selected-line8.png" .
+mv bla/"selected-line9.png" .
+mv bla/"spacing_loose.png" .
+mv bla/"spacing_loose_s.png" .
+mv bla/"spacing_normal.png" .
+mv bla/"spacing_normal_s.png" .
+mv bla/"spacing_tight.png" .
+mv bla/"spacing_tight_s.png" .
+mv bla/"spacing_very loose.png" .
+mv bla/"spacing_very loose_s.png" .
+mv bla/"spacing_very tight.png" .
+mv bla/"spacing_very tight_s.png" .
+mv bla/"Square.png" .
+mv bla/"Square_h.png" .
diff --git a/default_images/svx/res/symphony/lpselected-spacing-1.png b/default_images/svx/res/symphony/lpselected-spacing-1.png
new file mode 100755
index 000000000000..098636521709
--- /dev/null
+++ b/default_images/svx/res/symphony/lpselected-spacing-1.png
Binary files differ
diff --git a/default_images/svx/res/symphony/lpselected-spacing-1_15.png b/default_images/svx/res/symphony/lpselected-spacing-1_15.png
new file mode 100755
index 000000000000..97337b0e77dc
--- /dev/null
+++ b/default_images/svx/res/symphony/lpselected-spacing-1_15.png
Binary files differ
diff --git a/default_images/svx/res/symphony/lpselected-spacing-1_5.png b/default_images/svx/res/symphony/lpselected-spacing-1_5.png
new file mode 100755
index 000000000000..90b2532ca23b
--- /dev/null
+++ b/default_images/svx/res/symphony/lpselected-spacing-1_5.png
Binary files differ
diff --git a/default_images/svx/res/symphony/lpselected-spacing-2.png b/default_images/svx/res/symphony/lpselected-spacing-2.png
new file mode 100755
index 000000000000..4549b900caf6
--- /dev/null
+++ b/default_images/svx/res/symphony/lpselected-spacing-2.png
Binary files differ
diff --git a/default_images/svx/res/symphony/lpsmall-spacing-1.png b/default_images/svx/res/symphony/lpsmall-spacing-1.png
new file mode 100755
index 000000000000..b6afc43b3b9b
--- /dev/null
+++ b/default_images/svx/res/symphony/lpsmall-spacing-1.png
Binary files differ
diff --git a/default_images/svx/res/symphony/lpspacing-1.png b/default_images/svx/res/symphony/lpspacing-1.png
new file mode 100755
index 000000000000..6aefacf9f8a0
--- /dev/null
+++ b/default_images/svx/res/symphony/lpspacing-1.png
Binary files differ
diff --git a/default_images/svx/res/symphony/lpspacing-1_15.png b/default_images/svx/res/symphony/lpspacing-1_15.png
new file mode 100755
index 000000000000..01c861d88f34
--- /dev/null
+++ b/default_images/svx/res/symphony/lpspacing-1_15.png
Binary files differ
diff --git a/default_images/svx/res/symphony/lpspacing-1_5.png b/default_images/svx/res/symphony/lpspacing-1_5.png
new file mode 100755
index 000000000000..27708ca4f070
--- /dev/null
+++ b/default_images/svx/res/symphony/lpspacing-1_5.png
Binary files differ
diff --git a/default_images/svx/res/symphony/lpspacing-2.png b/default_images/svx/res/symphony/lpspacing-2.png
new file mode 100755
index 000000000000..12f0fcdcd9cf
--- /dev/null
+++ b/default_images/svx/res/symphony/lpspacing-2.png
Binary files differ
diff --git a/default_images/svx/res/symphony/no color.png b/default_images/svx/res/symphony/no color.png
new file mode 100755
index 000000000000..7442b7484945
--- /dev/null
+++ b/default_images/svx/res/symphony/no color.png
Binary files differ
diff --git a/default_images/svx/res/symphony/para_numbullet01.png b/default_images/svx/res/symphony/para_numbullet01.png
new file mode 100755
index 000000000000..8cb0cc7bd94a
--- /dev/null
+++ b/default_images/svx/res/symphony/para_numbullet01.png
Binary files differ
diff --git a/default_images/svx/res/symphony/para_numbullet02.png b/default_images/svx/res/symphony/para_numbullet02.png
new file mode 100755
index 000000000000..f283c8af12ad
--- /dev/null
+++ b/default_images/svx/res/symphony/para_numbullet02.png
Binary files differ
diff --git a/default_images/svx/res/symphony/para_numbullet_rtl01.png b/default_images/svx/res/symphony/para_numbullet_rtl01.png
new file mode 100755
index 000000000000..cae419362f95
--- /dev/null
+++ b/default_images/svx/res/symphony/para_numbullet_rtl01.png
Binary files differ
diff --git a/default_images/svx/res/symphony/para_numbullet_rtl02.png b/default_images/svx/res/symphony/para_numbullet_rtl02.png
new file mode 100755
index 000000000000..c5ecb4b690f3
--- /dev/null
+++ b/default_images/svx/res/symphony/para_numbullet_rtl02.png
Binary files differ
diff --git a/default_images/svx/res/symphony/para_numbulleth01.png b/default_images/svx/res/symphony/para_numbulleth01.png
new file mode 100755
index 000000000000..6bf74ad750ab
--- /dev/null
+++ b/default_images/svx/res/symphony/para_numbulleth01.png
Binary files differ
diff --git a/default_images/svx/res/symphony/para_numbulleth02.png b/default_images/svx/res/symphony/para_numbulleth02.png
new file mode 100755
index 000000000000..8405c705fea8
--- /dev/null
+++ b/default_images/svx/res/symphony/para_numbulleth02.png
Binary files differ
diff --git a/default_images/svx/res/symphony/para_vert01.png b/default_images/svx/res/symphony/para_vert01.png
new file mode 100755
index 000000000000..275133c3409d
--- /dev/null
+++ b/default_images/svx/res/symphony/para_vert01.png
Binary files differ
diff --git a/default_images/svx/res/symphony/para_vert02.png b/default_images/svx/res/symphony/para_vert02.png
new file mode 100755
index 000000000000..919edab0d01b
--- /dev/null
+++ b/default_images/svx/res/symphony/para_vert02.png
Binary files differ
diff --git a/default_images/svx/res/symphony/para_vert03.png b/default_images/svx/res/symphony/para_vert03.png
new file mode 100755
index 000000000000..de22c240efdb
--- /dev/null
+++ b/default_images/svx/res/symphony/para_vert03.png
Binary files differ
diff --git a/default_images/svx/res/symphony/para_verth01.png b/default_images/svx/res/symphony/para_verth01.png
new file mode 100755
index 000000000000..9493fba1c393
--- /dev/null
+++ b/default_images/svx/res/symphony/para_verth01.png
Binary files differ
diff --git a/default_images/svx/res/symphony/para_verth02.png b/default_images/svx/res/symphony/para_verth02.png
new file mode 100755
index 000000000000..66470c72db77
--- /dev/null
+++ b/default_images/svx/res/symphony/para_verth02.png
Binary files differ
diff --git a/default_images/svx/res/symphony/para_verth03.png b/default_images/svx/res/symphony/para_verth03.png
new file mode 100755
index 000000000000..bf889acb3a31
--- /dev/null
+++ b/default_images/svx/res/symphony/para_verth03.png
Binary files differ
diff --git a/default_images/svx/res/symphony/radial.png b/default_images/svx/res/symphony/radial.png
new file mode 100755
index 000000000000..bb44a0c68318
--- /dev/null
+++ b/default_images/svx/res/symphony/radial.png
Binary files differ
diff --git a/default_images/svx/res/symphony/radial_h.png b/default_images/svx/res/symphony/radial_h.png
new file mode 100755
index 000000000000..1971f585b0de
--- /dev/null
+++ b/default_images/svx/res/symphony/radial_h.png
Binary files differ
diff --git a/default_images/svx/res/symphony/rotate_left.png b/default_images/svx/res/symphony/rotate_left.png
new file mode 100755
index 000000000000..b537b6b9286a
--- /dev/null
+++ b/default_images/svx/res/symphony/rotate_left.png
Binary files differ
diff --git a/default_images/svx/res/symphony/rotate_right.png b/default_images/svx/res/symphony/rotate_right.png
new file mode 100755
index 000000000000..217cf91891b4
--- /dev/null
+++ b/default_images/svx/res/symphony/rotate_right.png
Binary files differ
diff --git a/default_images/svx/res/symphony/rotation.png b/default_images/svx/res/symphony/rotation.png
new file mode 100755
index 000000000000..3d197def2724
--- /dev/null
+++ b/default_images/svx/res/symphony/rotation.png
Binary files differ
diff --git a/default_images/svx/res/symphony/rotation_h.png b/default_images/svx/res/symphony/rotation_h.png
new file mode 100755
index 000000000000..874fb82bdcb9
--- /dev/null
+++ b/default_images/svx/res/symphony/rotation_h.png
Binary files differ
diff --git a/default_images/svx/res/symphony/rte_Indent_16x16.png b/default_images/svx/res/symphony/rte_Indent_16x16.png
new file mode 100755
index 000000000000..28c90a34a62f
--- /dev/null
+++ b/default_images/svx/res/symphony/rte_Indent_16x16.png
Binary files differ
diff --git a/default_images/svx/res/symphony/rte_Outdent_16x16.png b/default_images/svx/res/symphony/rte_Outdent_16x16.png
new file mode 100755
index 000000000000..ceae7d35d843
--- /dev/null
+++ b/default_images/svx/res/symphony/rte_Outdent_16x16.png
Binary files differ
diff --git a/default_images/svx/res/symphony/sc_backgroundcolor.png b/default_images/svx/res/symphony/sc_backgroundcolor.png
new file mode 100755
index 000000000000..7f926b66bd71
--- /dev/null
+++ b/default_images/svx/res/symphony/sc_backgroundcolor.png
Binary files differ
diff --git a/default_images/svx/res/symphony/sc_bold.png b/default_images/svx/res/symphony/sc_bold.png
new file mode 100755
index 000000000000..2f610b2529c8
--- /dev/null
+++ b/default_images/svx/res/symphony/sc_bold.png
Binary files differ
diff --git a/default_images/svx/res/symphony/sc_color.png b/default_images/svx/res/symphony/sc_color.png
new file mode 100755
index 000000000000..f11f2181434e
--- /dev/null
+++ b/default_images/svx/res/symphony/sc_color.png
Binary files differ
diff --git a/default_images/svx/res/symphony/sc_italic.png b/default_images/svx/res/symphony/sc_italic.png
new file mode 100755
index 000000000000..0ccd22e1cc39
--- /dev/null
+++ b/default_images/svx/res/symphony/sc_italic.png
Binary files differ
diff --git a/default_images/svx/res/symphony/sc_shadowed.png b/default_images/svx/res/symphony/sc_shadowed.png
new file mode 100755
index 000000000000..7d3a6992c92a
--- /dev/null
+++ b/default_images/svx/res/symphony/sc_shadowed.png
Binary files differ
diff --git a/default_images/svx/res/symphony/sc_strikeout.png b/default_images/svx/res/symphony/sc_strikeout.png
new file mode 100755
index 000000000000..58d2794bb41c
--- /dev/null
+++ b/default_images/svx/res/symphony/sc_strikeout.png
Binary files differ
diff --git a/default_images/svx/res/symphony/sc_subscript.png b/default_images/svx/res/symphony/sc_subscript.png
new file mode 100755
index 000000000000..682e6f17ac21
--- /dev/null
+++ b/default_images/svx/res/symphony/sc_subscript.png
Binary files differ
diff --git a/default_images/svx/res/symphony/sc_superscript.png b/default_images/svx/res/symphony/sc_superscript.png
new file mode 100755
index 000000000000..33fd1ecef7ae
--- /dev/null
+++ b/default_images/svx/res/symphony/sc_superscript.png
Binary files differ
diff --git a/default_images/svx/res/symphony/sc_underline.png b/default_images/svx/res/symphony/sc_underline.png
new file mode 100755
index 000000000000..b2071c5cc423
--- /dev/null
+++ b/default_images/svx/res/symphony/sc_underline.png
Binary files differ
diff --git a/default_images/svx/res/symphony/sch_backgroundcolor.png b/default_images/svx/res/symphony/sch_backgroundcolor.png
new file mode 100755
index 000000000000..a2e234fc3311
--- /dev/null
+++ b/default_images/svx/res/symphony/sch_backgroundcolor.png
Binary files differ
diff --git a/default_images/svx/res/symphony/selected-line1.png b/default_images/svx/res/symphony/selected-line1.png
new file mode 100755
index 000000000000..99921b34df4e
--- /dev/null
+++ b/default_images/svx/res/symphony/selected-line1.png
Binary files differ
diff --git a/default_images/svx/res/symphony/selected-line10.png b/default_images/svx/res/symphony/selected-line10.png
new file mode 100755
index 000000000000..cca4848e0cb5
--- /dev/null
+++ b/default_images/svx/res/symphony/selected-line10.png
Binary files differ
diff --git a/default_images/svx/res/symphony/selected-line2.png b/default_images/svx/res/symphony/selected-line2.png
new file mode 100755
index 000000000000..4e68e6ba48c7
--- /dev/null
+++ b/default_images/svx/res/symphony/selected-line2.png
Binary files differ
diff --git a/default_images/svx/res/symphony/selected-line3.png b/default_images/svx/res/symphony/selected-line3.png
new file mode 100755
index 000000000000..425869e629c1
--- /dev/null
+++ b/default_images/svx/res/symphony/selected-line3.png
Binary files differ
diff --git a/default_images/svx/res/symphony/selected-line4.png b/default_images/svx/res/symphony/selected-line4.png
new file mode 100755
index 000000000000..7fa3f7eb219e
--- /dev/null
+++ b/default_images/svx/res/symphony/selected-line4.png
Binary files differ
diff --git a/default_images/svx/res/symphony/selected-line5.png b/default_images/svx/res/symphony/selected-line5.png
new file mode 100755
index 000000000000..60e266c070ae
--- /dev/null
+++ b/default_images/svx/res/symphony/selected-line5.png
Binary files differ
diff --git a/default_images/svx/res/symphony/selected-line6.png b/default_images/svx/res/symphony/selected-line6.png
new file mode 100755
index 000000000000..e89d1996e100
--- /dev/null
+++ b/default_images/svx/res/symphony/selected-line6.png
Binary files differ
diff --git a/default_images/svx/res/symphony/selected-line7.png b/default_images/svx/res/symphony/selected-line7.png
new file mode 100755
index 000000000000..c53fd70e0064
--- /dev/null
+++ b/default_images/svx/res/symphony/selected-line7.png
Binary files differ
diff --git a/default_images/svx/res/symphony/selected-line8.png b/default_images/svx/res/symphony/selected-line8.png
new file mode 100755
index 000000000000..b24ab5588343
--- /dev/null
+++ b/default_images/svx/res/symphony/selected-line8.png
Binary files differ
diff --git a/default_images/svx/res/symphony/selected-line9.png b/default_images/svx/res/symphony/selected-line9.png
new file mode 100755
index 000000000000..c6e266ea110c
--- /dev/null
+++ b/default_images/svx/res/symphony/selected-line9.png
Binary files differ
diff --git a/default_images/svx/res/symphony/spacing1.png b/default_images/svx/res/symphony/spacing1.png
new file mode 100755
index 000000000000..9e1f4839e25d
--- /dev/null
+++ b/default_images/svx/res/symphony/spacing1.png
Binary files differ
diff --git a/default_images/svx/res/symphony/spacing2.png b/default_images/svx/res/symphony/spacing2.png
new file mode 100755
index 000000000000..f4ae81a37ced
--- /dev/null
+++ b/default_images/svx/res/symphony/spacing2.png
Binary files differ
diff --git a/default_images/svx/res/symphony/spacing3.png b/default_images/svx/res/symphony/spacing3.png
new file mode 100755
index 000000000000..106e0edaed0b
--- /dev/null
+++ b/default_images/svx/res/symphony/spacing3.png
Binary files differ
diff --git a/default_images/svx/res/symphony/spacing_loose.png b/default_images/svx/res/symphony/spacing_loose.png
new file mode 100755
index 000000000000..5ab9f3e02043
--- /dev/null
+++ b/default_images/svx/res/symphony/spacing_loose.png
Binary files differ
diff --git a/default_images/svx/res/symphony/spacing_loose_s.png b/default_images/svx/res/symphony/spacing_loose_s.png
new file mode 100755
index 000000000000..46e2f246c558
--- /dev/null
+++ b/default_images/svx/res/symphony/spacing_loose_s.png
Binary files differ
diff --git a/default_images/svx/res/symphony/spacing_normal.png b/default_images/svx/res/symphony/spacing_normal.png
new file mode 100755
index 000000000000..bf7d5471160a
--- /dev/null
+++ b/default_images/svx/res/symphony/spacing_normal.png
Binary files differ
diff --git a/default_images/svx/res/symphony/spacing_normal_s.png b/default_images/svx/res/symphony/spacing_normal_s.png
new file mode 100755
index 000000000000..76097b309e89
--- /dev/null
+++ b/default_images/svx/res/symphony/spacing_normal_s.png
Binary files differ
diff --git a/default_images/svx/res/symphony/spacing_tight.png b/default_images/svx/res/symphony/spacing_tight.png
new file mode 100755
index 000000000000..ac469dbb93ed
--- /dev/null
+++ b/default_images/svx/res/symphony/spacing_tight.png
Binary files differ
diff --git a/default_images/svx/res/symphony/spacing_tight_s.png b/default_images/svx/res/symphony/spacing_tight_s.png
new file mode 100755
index 000000000000..dbb969cf57ae
--- /dev/null
+++ b/default_images/svx/res/symphony/spacing_tight_s.png
Binary files differ
diff --git a/default_images/svx/res/symphony/spacing_very loose.png b/default_images/svx/res/symphony/spacing_very loose.png
new file mode 100755
index 000000000000..04f3969c6853
--- /dev/null
+++ b/default_images/svx/res/symphony/spacing_very loose.png
Binary files differ
diff --git a/default_images/svx/res/symphony/spacing_very loose_s.png b/default_images/svx/res/symphony/spacing_very loose_s.png
new file mode 100755
index 000000000000..21f578408222
--- /dev/null
+++ b/default_images/svx/res/symphony/spacing_very loose_s.png
Binary files differ
diff --git a/default_images/svx/res/symphony/spacing_very tight.png b/default_images/svx/res/symphony/spacing_very tight.png
new file mode 100755
index 000000000000..84845c3c9ca5
--- /dev/null
+++ b/default_images/svx/res/symphony/spacing_very tight.png
Binary files differ
diff --git a/default_images/svx/res/symphony/spacing_very tight_s.png b/default_images/svx/res/symphony/spacing_very tight_s.png
new file mode 100755
index 000000000000..19b4856b4b0a
--- /dev/null
+++ b/default_images/svx/res/symphony/spacing_very tight_s.png
Binary files differ
diff --git a/default_images/svx/res/symphony/style_line1.png b/default_images/svx/res/symphony/style_line1.png
new file mode 100755
index 000000000000..6403c068da07
--- /dev/null
+++ b/default_images/svx/res/symphony/style_line1.png
Binary files differ
diff --git a/default_images/svx/res/symphony/style_line10.png b/default_images/svx/res/symphony/style_line10.png
new file mode 100755
index 000000000000..f7d1e34985a3
--- /dev/null
+++ b/default_images/svx/res/symphony/style_line10.png
Binary files differ
diff --git a/default_images/svx/res/symphony/style_line10_h.png b/default_images/svx/res/symphony/style_line10_h.png
new file mode 100755
index 000000000000..d5925aafea8a
--- /dev/null
+++ b/default_images/svx/res/symphony/style_line10_h.png
Binary files differ
diff --git a/default_images/svx/res/symphony/style_line10_hh.png b/default_images/svx/res/symphony/style_line10_hh.png
new file mode 100755
index 000000000000..60c1e36b0084
--- /dev/null
+++ b/default_images/svx/res/symphony/style_line10_hh.png
Binary files differ
diff --git a/default_images/svx/res/symphony/style_line11.png b/default_images/svx/res/symphony/style_line11.png
new file mode 100755
index 000000000000..4400dd387e7c
--- /dev/null
+++ b/default_images/svx/res/symphony/style_line11.png
Binary files differ
diff --git a/default_images/svx/res/symphony/style_line11_h.png b/default_images/svx/res/symphony/style_line11_h.png
new file mode 100755
index 000000000000..1e6be193527f
--- /dev/null
+++ b/default_images/svx/res/symphony/style_line11_h.png
Binary files differ
diff --git a/default_images/svx/res/symphony/style_line11_hh.png b/default_images/svx/res/symphony/style_line11_hh.png
new file mode 100755
index 000000000000..31fec10d2cd6
--- /dev/null
+++ b/default_images/svx/res/symphony/style_line11_hh.png
Binary files differ
diff --git a/default_images/svx/res/symphony/style_line1_h.png b/default_images/svx/res/symphony/style_line1_h.png
new file mode 100755
index 000000000000..eadd40e3427a
--- /dev/null
+++ b/default_images/svx/res/symphony/style_line1_h.png
Binary files differ
diff --git a/default_images/svx/res/symphony/style_line1_hh.png b/default_images/svx/res/symphony/style_line1_hh.png
new file mode 100755
index 000000000000..c91010a6762e
--- /dev/null
+++ b/default_images/svx/res/symphony/style_line1_hh.png
Binary files differ
diff --git a/default_images/svx/res/symphony/style_line2.png b/default_images/svx/res/symphony/style_line2.png
new file mode 100755
index 000000000000..4269c7dfadf3
--- /dev/null
+++ b/default_images/svx/res/symphony/style_line2.png
Binary files differ
diff --git a/default_images/svx/res/symphony/style_line2_h.png b/default_images/svx/res/symphony/style_line2_h.png
new file mode 100755
index 000000000000..3658e182c94c
--- /dev/null
+++ b/default_images/svx/res/symphony/style_line2_h.png
Binary files differ
diff --git a/default_images/svx/res/symphony/style_line2_hh.png b/default_images/svx/res/symphony/style_line2_hh.png
new file mode 100755
index 000000000000..4bae815bceaa
--- /dev/null
+++ b/default_images/svx/res/symphony/style_line2_hh.png
Binary files differ
diff --git a/default_images/svx/res/symphony/style_line3.png b/default_images/svx/res/symphony/style_line3.png
new file mode 100755
index 000000000000..3e03ad01f28a
--- /dev/null
+++ b/default_images/svx/res/symphony/style_line3.png
Binary files differ
diff --git a/default_images/svx/res/symphony/style_line3_h.png b/default_images/svx/res/symphony/style_line3_h.png
new file mode 100755
index 000000000000..1636e050426f
--- /dev/null
+++ b/default_images/svx/res/symphony/style_line3_h.png
Binary files differ
diff --git a/default_images/svx/res/symphony/style_line3_hh.png b/default_images/svx/res/symphony/style_line3_hh.png
new file mode 100755
index 000000000000..1ab133fdc0aa
--- /dev/null
+++ b/default_images/svx/res/symphony/style_line3_hh.png
Binary files differ
diff --git a/default_images/svx/res/symphony/style_line4.png b/default_images/svx/res/symphony/style_line4.png
new file mode 100755
index 000000000000..21c1115429ea
--- /dev/null
+++ b/default_images/svx/res/symphony/style_line4.png
Binary files differ
diff --git a/default_images/svx/res/symphony/style_line4_h.png b/default_images/svx/res/symphony/style_line4_h.png
new file mode 100755
index 000000000000..35741407ac25
--- /dev/null
+++ b/default_images/svx/res/symphony/style_line4_h.png
Binary files differ
diff --git a/default_images/svx/res/symphony/style_line4_hh.png b/default_images/svx/res/symphony/style_line4_hh.png
new file mode 100755
index 000000000000..d7b17f49472f
--- /dev/null
+++ b/default_images/svx/res/symphony/style_line4_hh.png
Binary files differ
diff --git a/default_images/svx/res/symphony/style_line5.png b/default_images/svx/res/symphony/style_line5.png
new file mode 100755
index 000000000000..8648065c1951
--- /dev/null
+++ b/default_images/svx/res/symphony/style_line5.png
Binary files differ
diff --git a/default_images/svx/res/symphony/style_line5_h.png b/default_images/svx/res/symphony/style_line5_h.png
new file mode 100755
index 000000000000..5d387d4b33fb
--- /dev/null
+++ b/default_images/svx/res/symphony/style_line5_h.png
Binary files differ
diff --git a/default_images/svx/res/symphony/style_line5_hh.png b/default_images/svx/res/symphony/style_line5_hh.png
new file mode 100755
index 000000000000..c6436ace4d9e
--- /dev/null
+++ b/default_images/svx/res/symphony/style_line5_hh.png
Binary files differ
diff --git a/default_images/svx/res/symphony/style_line6.png b/default_images/svx/res/symphony/style_line6.png
new file mode 100755
index 000000000000..b0b8d7cf88ed
--- /dev/null
+++ b/default_images/svx/res/symphony/style_line6.png
Binary files differ
diff --git a/default_images/svx/res/symphony/style_line6_h.png b/default_images/svx/res/symphony/style_line6_h.png
new file mode 100755
index 000000000000..4a34861b54a5
--- /dev/null
+++ b/default_images/svx/res/symphony/style_line6_h.png
Binary files differ
diff --git a/default_images/svx/res/symphony/style_line6_hh.png b/default_images/svx/res/symphony/style_line6_hh.png
new file mode 100755
index 000000000000..88680768447c
--- /dev/null
+++ b/default_images/svx/res/symphony/style_line6_hh.png
Binary files differ
diff --git a/default_images/svx/res/symphony/style_line7.png b/default_images/svx/res/symphony/style_line7.png
new file mode 100755
index 000000000000..e30fc03fc333
--- /dev/null
+++ b/default_images/svx/res/symphony/style_line7.png
Binary files differ
diff --git a/default_images/svx/res/symphony/style_line7_h.png b/default_images/svx/res/symphony/style_line7_h.png
new file mode 100755
index 000000000000..8718ef0332e7
--- /dev/null
+++ b/default_images/svx/res/symphony/style_line7_h.png
Binary files differ
diff --git a/default_images/svx/res/symphony/style_line7_hh.png b/default_images/svx/res/symphony/style_line7_hh.png
new file mode 100755
index 000000000000..76d0afaff7c1
--- /dev/null
+++ b/default_images/svx/res/symphony/style_line7_hh.png
Binary files differ
diff --git a/default_images/svx/res/symphony/style_line8.png b/default_images/svx/res/symphony/style_line8.png
new file mode 100755
index 000000000000..5c3ed3144a6f
--- /dev/null
+++ b/default_images/svx/res/symphony/style_line8.png
Binary files differ
diff --git a/default_images/svx/res/symphony/style_line8_h.png b/default_images/svx/res/symphony/style_line8_h.png
new file mode 100755
index 000000000000..db769a43ce78
--- /dev/null
+++ b/default_images/svx/res/symphony/style_line8_h.png
Binary files differ
diff --git a/default_images/svx/res/symphony/style_line8_hh.png b/default_images/svx/res/symphony/style_line8_hh.png
new file mode 100755
index 000000000000..a1ca0e8caa9c
--- /dev/null
+++ b/default_images/svx/res/symphony/style_line8_hh.png
Binary files differ
diff --git a/default_images/svx/res/symphony/style_line9.png b/default_images/svx/res/symphony/style_line9.png
new file mode 100755
index 000000000000..10035bae2640
--- /dev/null
+++ b/default_images/svx/res/symphony/style_line9.png
Binary files differ
diff --git a/default_images/svx/res/symphony/style_line9_h.png b/default_images/svx/res/symphony/style_line9_h.png
new file mode 100755
index 000000000000..91062daaf673
--- /dev/null
+++ b/default_images/svx/res/symphony/style_line9_h.png
Binary files differ
diff --git a/default_images/svx/res/symphony/style_line9_hh.png b/default_images/svx/res/symphony/style_line9_hh.png
new file mode 100755
index 000000000000..4726c7c8a18a
--- /dev/null
+++ b/default_images/svx/res/symphony/style_line9_hh.png
Binary files differ
diff --git a/default_images/svx/res/symphony/width1.png b/default_images/svx/res/symphony/width1.png
new file mode 100755
index 000000000000..8faeb437c01f
--- /dev/null
+++ b/default_images/svx/res/symphony/width1.png
Binary files differ
diff --git a/default_images/svx/res/symphony/width1_h.png b/default_images/svx/res/symphony/width1_h.png
new file mode 100755
index 000000000000..1f14d896ca26
--- /dev/null
+++ b/default_images/svx/res/symphony/width1_h.png
Binary files differ
diff --git a/default_images/svx/res/symphony/width2.png b/default_images/svx/res/symphony/width2.png
new file mode 100755
index 000000000000..e6574687fac0
--- /dev/null
+++ b/default_images/svx/res/symphony/width2.png
Binary files differ
diff --git a/default_images/svx/res/symphony/width2_h.png b/default_images/svx/res/symphony/width2_h.png
new file mode 100755
index 000000000000..9a30e3fe2173
--- /dev/null
+++ b/default_images/svx/res/symphony/width2_h.png
Binary files differ
diff --git a/default_images/svx/res/symphony/width3.png b/default_images/svx/res/symphony/width3.png
new file mode 100755
index 000000000000..dfe321603ce3
--- /dev/null
+++ b/default_images/svx/res/symphony/width3.png
Binary files differ
diff --git a/default_images/svx/res/symphony/width3_h.png b/default_images/svx/res/symphony/width3_h.png
new file mode 100755
index 000000000000..80e2e22992be
--- /dev/null
+++ b/default_images/svx/res/symphony/width3_h.png
Binary files differ
diff --git a/default_images/svx/res/symphony/width4.png b/default_images/svx/res/symphony/width4.png
new file mode 100755
index 000000000000..d19ac86ab222
--- /dev/null
+++ b/default_images/svx/res/symphony/width4.png
Binary files differ
diff --git a/default_images/svx/res/symphony/width4_h.png b/default_images/svx/res/symphony/width4_h.png
new file mode 100755
index 000000000000..142768ea34ff
--- /dev/null
+++ b/default_images/svx/res/symphony/width4_h.png
Binary files differ
diff --git a/default_images/svx/res/symphony/width5.png b/default_images/svx/res/symphony/width5.png
new file mode 100755
index 000000000000..de6fb7f906c9
--- /dev/null
+++ b/default_images/svx/res/symphony/width5.png
Binary files differ
diff --git a/default_images/svx/res/symphony/width5_h.png b/default_images/svx/res/symphony/width5_h.png
new file mode 100755
index 000000000000..93100fae2cf9
--- /dev/null
+++ b/default_images/svx/res/symphony/width5_h.png
Binary files differ
diff --git a/default_images/svx/res/symphony/width6.png b/default_images/svx/res/symphony/width6.png
new file mode 100755
index 000000000000..27e3cad34eb3
--- /dev/null
+++ b/default_images/svx/res/symphony/width6.png
Binary files differ
diff --git a/default_images/svx/res/symphony/width6_h.png b/default_images/svx/res/symphony/width6_h.png
new file mode 100755
index 000000000000..30a9e326931c
--- /dev/null
+++ b/default_images/svx/res/symphony/width6_h.png
Binary files differ
diff --git a/default_images/svx/res/symphony/width7.png b/default_images/svx/res/symphony/width7.png
new file mode 100755
index 000000000000..5bd3cfe35132
--- /dev/null
+++ b/default_images/svx/res/symphony/width7.png
Binary files differ
diff --git a/default_images/svx/res/symphony/width7_h.png b/default_images/svx/res/symphony/width7_h.png
new file mode 100755
index 000000000000..6a51fda02d29
--- /dev/null
+++ b/default_images/svx/res/symphony/width7_h.png
Binary files differ
diff --git a/default_images/svx/res/symphony/width8.png b/default_images/svx/res/symphony/width8.png
new file mode 100755
index 000000000000..1cbb7ebda8e5
--- /dev/null
+++ b/default_images/svx/res/symphony/width8.png
Binary files differ
diff --git a/default_images/svx/res/symphony/width8_h.png b/default_images/svx/res/symphony/width8_h.png
new file mode 100755
index 000000000000..60219680af26
--- /dev/null
+++ b/default_images/svx/res/symphony/width8_h.png
Binary files differ
diff --git a/default_images/sw/res/sidebar/pageproppanel/Landscapecopy_24x24.png b/default_images/sw/res/sidebar/pageproppanel/Landscapecopy_24x24.png
new file mode 100755
index 000000000000..ce1372162eff
--- /dev/null
+++ b/default_images/sw/res/sidebar/pageproppanel/Landscapecopy_24x24.png
Binary files differ
diff --git a/default_images/sw/res/sidebar/pageproppanel/column1_24x24.png b/default_images/sw/res/sidebar/pageproppanel/column1_24x24.png
new file mode 100755
index 000000000000..48f4a8b1c281
--- /dev/null
+++ b/default_images/sw/res/sidebar/pageproppanel/column1_24x24.png
Binary files differ
diff --git a/default_images/sw/res/sidebar/pageproppanel/column2_24x24.png b/default_images/sw/res/sidebar/pageproppanel/column2_24x24.png
new file mode 100755
index 000000000000..d8a2de473bf4
--- /dev/null
+++ b/default_images/sw/res/sidebar/pageproppanel/column2_24x24.png
Binary files differ
diff --git a/default_images/sw/res/sidebar/pageproppanel/column3_24x24.png b/default_images/sw/res/sidebar/pageproppanel/column3_24x24.png
new file mode 100755
index 000000000000..5869559c36ad
--- /dev/null
+++ b/default_images/sw/res/sidebar/pageproppanel/column3_24x24.png
Binary files differ
diff --git a/default_images/sw/res/sidebar/pageproppanel/column_L_1_24x24.png b/default_images/sw/res/sidebar/pageproppanel/column_L_1_24x24.png
new file mode 100755
index 000000000000..bac5e3f468bd
--- /dev/null
+++ b/default_images/sw/res/sidebar/pageproppanel/column_L_1_24x24.png
Binary files differ
diff --git a/default_images/sw/res/sidebar/pageproppanel/column_L_2_24x24.png b/default_images/sw/res/sidebar/pageproppanel/column_L_2_24x24.png
new file mode 100755
index 000000000000..146b66695721
--- /dev/null
+++ b/default_images/sw/res/sidebar/pageproppanel/column_L_2_24x24.png
Binary files differ
diff --git a/default_images/sw/res/sidebar/pageproppanel/column_L_3_24x24.png b/default_images/sw/res/sidebar/pageproppanel/column_L_3_24x24.png
new file mode 100755
index 000000000000..11ee37536b25
--- /dev/null
+++ b/default_images/sw/res/sidebar/pageproppanel/column_L_3_24x24.png
Binary files differ
diff --git a/default_images/sw/res/sidebar/pageproppanel/column_L_copy_24x24.png b/default_images/sw/res/sidebar/pageproppanel/column_L_copy_24x24.png
new file mode 100755
index 000000000000..747ac4dd242f
--- /dev/null
+++ b/default_images/sw/res/sidebar/pageproppanel/column_L_copy_24x24.png
Binary files differ
diff --git a/default_images/sw/res/sidebar/pageproppanel/column_L_left_24x24.png b/default_images/sw/res/sidebar/pageproppanel/column_L_left_24x24.png
new file mode 100755
index 000000000000..c6a9f0caa740
--- /dev/null
+++ b/default_images/sw/res/sidebar/pageproppanel/column_L_left_24x24.png
Binary files differ
diff --git a/default_images/sw/res/sidebar/pageproppanel/column_L_right_24x24.png b/default_images/sw/res/sidebar/pageproppanel/column_L_right_24x24.png
new file mode 100755
index 000000000000..ccdecfe2de6f
--- /dev/null
+++ b/default_images/sw/res/sidebar/pageproppanel/column_L_right_24x24.png
Binary files differ
diff --git a/default_images/sw/res/sidebar/pageproppanel/columncopy_24x24.png b/default_images/sw/res/sidebar/pageproppanel/columncopy_24x24.png
new file mode 100755
index 000000000000..983da8be35ad
--- /dev/null
+++ b/default_images/sw/res/sidebar/pageproppanel/columncopy_24x24.png
Binary files differ
diff --git a/default_images/sw/res/sidebar/pageproppanel/columnleft_24x24.png b/default_images/sw/res/sidebar/pageproppanel/columnleft_24x24.png
new file mode 100755
index 000000000000..c61c76a32b57
--- /dev/null
+++ b/default_images/sw/res/sidebar/pageproppanel/columnleft_24x24.png
Binary files differ
diff --git a/default_images/sw/res/sidebar/pageproppanel/columnright_24x24.png b/default_images/sw/res/sidebar/pageproppanel/columnright_24x24.png
new file mode 100755
index 000000000000..9421fabc232d
--- /dev/null
+++ b/default_images/sw/res/sidebar/pageproppanel/columnright_24x24.png
Binary files differ
diff --git a/default_images/sw/res/sidebar/pageproppanel/documentsizeA3_24x24.png b/default_images/sw/res/sidebar/pageproppanel/documentsizeA3_24x24.png
new file mode 100755
index 000000000000..e9507282d308
--- /dev/null
+++ b/default_images/sw/res/sidebar/pageproppanel/documentsizeA3_24x24.png
Binary files differ
diff --git a/default_images/sw/res/sidebar/pageproppanel/documentsizeA4_24x24.png b/default_images/sw/res/sidebar/pageproppanel/documentsizeA4_24x24.png
new file mode 100755
index 000000000000..3039746e09de
--- /dev/null
+++ b/default_images/sw/res/sidebar/pageproppanel/documentsizeA4_24x24.png
Binary files differ
diff --git a/default_images/sw/res/sidebar/pageproppanel/documentsizeA5_24x24.png b/default_images/sw/res/sidebar/pageproppanel/documentsizeA5_24x24.png
new file mode 100755
index 000000000000..2e73f5d246dc
--- /dev/null
+++ b/default_images/sw/res/sidebar/pageproppanel/documentsizeA5_24x24.png
Binary files differ
diff --git a/default_images/sw/res/sidebar/pageproppanel/documentsizeB4_24x24.png b/default_images/sw/res/sidebar/pageproppanel/documentsizeB4_24x24.png
new file mode 100755
index 000000000000..8456ef4d544f
--- /dev/null
+++ b/default_images/sw/res/sidebar/pageproppanel/documentsizeB4_24x24.png
Binary files differ
diff --git a/default_images/sw/res/sidebar/pageproppanel/documentsizeB5_24x24.png b/default_images/sw/res/sidebar/pageproppanel/documentsizeB5_24x24.png
new file mode 100755
index 000000000000..21b37467d657
--- /dev/null
+++ b/default_images/sw/res/sidebar/pageproppanel/documentsizeB5_24x24.png
Binary files differ
diff --git a/default_images/sw/res/sidebar/pageproppanel/documentsizeC5_24x24.png b/default_images/sw/res/sidebar/pageproppanel/documentsizeC5_24x24.png
new file mode 100755
index 000000000000..91501da5b92c
--- /dev/null
+++ b/default_images/sw/res/sidebar/pageproppanel/documentsizeC5_24x24.png
Binary files differ
diff --git a/default_images/sw/res/sidebar/pageproppanel/documentsize_L_A3_24x24.png b/default_images/sw/res/sidebar/pageproppanel/documentsize_L_A3_24x24.png
new file mode 100755
index 000000000000..a32119dfa20f
--- /dev/null
+++ b/default_images/sw/res/sidebar/pageproppanel/documentsize_L_A3_24x24.png
Binary files differ
diff --git a/default_images/sw/res/sidebar/pageproppanel/documentsize_L_A4_24x24.png b/default_images/sw/res/sidebar/pageproppanel/documentsize_L_A4_24x24.png
new file mode 100755
index 000000000000..5cd5f8e0fcb9
--- /dev/null
+++ b/default_images/sw/res/sidebar/pageproppanel/documentsize_L_A4_24x24.png
Binary files differ
diff --git a/default_images/sw/res/sidebar/pageproppanel/documentsize_L_A5_24x24.png b/default_images/sw/res/sidebar/pageproppanel/documentsize_L_A5_24x24.png
new file mode 100755
index 000000000000..cc4d2cb627a2
--- /dev/null
+++ b/default_images/sw/res/sidebar/pageproppanel/documentsize_L_A5_24x24.png
Binary files differ
diff --git a/default_images/sw/res/sidebar/pageproppanel/documentsize_L_B4_24x24.png b/default_images/sw/res/sidebar/pageproppanel/documentsize_L_B4_24x24.png
new file mode 100755
index 000000000000..e1d1bcf2c91e
--- /dev/null
+++ b/default_images/sw/res/sidebar/pageproppanel/documentsize_L_B4_24x24.png
Binary files differ
diff --git a/default_images/sw/res/sidebar/pageproppanel/documentsize_L_B5_24x24.png b/default_images/sw/res/sidebar/pageproppanel/documentsize_L_B5_24x24.png
new file mode 100755
index 000000000000..0e7627201309
--- /dev/null
+++ b/default_images/sw/res/sidebar/pageproppanel/documentsize_L_B5_24x24.png
Binary files differ
diff --git a/default_images/sw/res/sidebar/pageproppanel/documentsize_L_C5_24x24.png b/default_images/sw/res/sidebar/pageproppanel/documentsize_L_C5_24x24.png
new file mode 100755
index 000000000000..2c880f81b2bc
--- /dev/null
+++ b/default_images/sw/res/sidebar/pageproppanel/documentsize_L_C5_24x24.png
Binary files differ
diff --git a/default_images/sw/res/sidebar/pageproppanel/documentsize_L_copy_24x24.png b/default_images/sw/res/sidebar/pageproppanel/documentsize_L_copy_24x24.png
new file mode 100755
index 000000000000..608d5a586147
--- /dev/null
+++ b/default_images/sw/res/sidebar/pageproppanel/documentsize_L_copy_24x24.png
Binary files differ
diff --git a/default_images/sw/res/sidebar/pageproppanel/documentsizecopy_24x24.png b/default_images/sw/res/sidebar/pageproppanel/documentsizecopy_24x24.png
new file mode 100755
index 000000000000..ce13c36b3f69
--- /dev/null
+++ b/default_images/sw/res/sidebar/pageproppanel/documentsizecopy_24x24.png
Binary files differ
diff --git a/default_images/sw/res/sidebar/pageproppanel/format_L_copy_24x24.png b/default_images/sw/res/sidebar/pageproppanel/format_L_copy_24x24.png
new file mode 100755
index 000000000000..747ac4dd242f
--- /dev/null
+++ b/default_images/sw/res/sidebar/pageproppanel/format_L_copy_24x24.png
Binary files differ
diff --git a/default_images/sw/res/sidebar/pageproppanel/format_L_mirror_24x24.png b/default_images/sw/res/sidebar/pageproppanel/format_L_mirror_24x24.png
new file mode 100755
index 000000000000..aa93fbcbb09a
--- /dev/null
+++ b/default_images/sw/res/sidebar/pageproppanel/format_L_mirror_24x24.png
Binary files differ
diff --git a/default_images/sw/res/sidebar/pageproppanel/format_L_narrow_24x24.png b/default_images/sw/res/sidebar/pageproppanel/format_L_narrow_24x24.png
new file mode 100755
index 000000000000..e6d2579d1525
--- /dev/null
+++ b/default_images/sw/res/sidebar/pageproppanel/format_L_narrow_24x24.png
Binary files differ
diff --git a/default_images/sw/res/sidebar/pageproppanel/format_L_nomal_24x24.png b/default_images/sw/res/sidebar/pageproppanel/format_L_nomal_24x24.png
new file mode 100755
index 000000000000..840ca804a5ae
--- /dev/null
+++ b/default_images/sw/res/sidebar/pageproppanel/format_L_nomal_24x24.png
Binary files differ
diff --git a/default_images/sw/res/sidebar/pageproppanel/format_L_wide_24x24.png b/default_images/sw/res/sidebar/pageproppanel/format_L_wide_24x24.png
new file mode 100755
index 000000000000..a47c1ca6cc36
--- /dev/null
+++ b/default_images/sw/res/sidebar/pageproppanel/format_L_wide_24x24.png
Binary files differ
diff --git a/default_images/sw/res/sidebar/pageproppanel/formatcopy_24x24.png b/default_images/sw/res/sidebar/pageproppanel/formatcopy_24x24.png
new file mode 100755
index 000000000000..983da8be35ad
--- /dev/null
+++ b/default_images/sw/res/sidebar/pageproppanel/formatcopy_24x24.png
Binary files differ
diff --git a/default_images/sw/res/sidebar/pageproppanel/formatmirror_24x24.png b/default_images/sw/res/sidebar/pageproppanel/formatmirror_24x24.png
new file mode 100755
index 000000000000..696ca1126428
--- /dev/null
+++ b/default_images/sw/res/sidebar/pageproppanel/formatmirror_24x24.png
Binary files differ
diff --git a/default_images/sw/res/sidebar/pageproppanel/formatnarrow_24x24.png b/default_images/sw/res/sidebar/pageproppanel/formatnarrow_24x24.png
new file mode 100755
index 000000000000..2f4b0e4ca005
--- /dev/null
+++ b/default_images/sw/res/sidebar/pageproppanel/formatnarrow_24x24.png
Binary files differ
diff --git a/default_images/sw/res/sidebar/pageproppanel/formatnormal_24x24.png b/default_images/sw/res/sidebar/pageproppanel/formatnormal_24x24.png
new file mode 100755
index 000000000000..83fea86ef080
--- /dev/null
+++ b/default_images/sw/res/sidebar/pageproppanel/formatnormal_24x24.png
Binary files differ
diff --git a/default_images/sw/res/sidebar/pageproppanel/formatwide_24x24.png b/default_images/sw/res/sidebar/pageproppanel/formatwide_24x24.png
new file mode 100755
index 000000000000..b260b07b8d6e
--- /dev/null
+++ b/default_images/sw/res/sidebar/pageproppanel/formatwide_24x24.png
Binary files differ
diff --git a/default_images/sw/res/sidebar/pageproppanel/last_custom_common.png b/default_images/sw/res/sidebar/pageproppanel/last_custom_common.png
new file mode 100755
index 000000000000..bbbe3255d272
--- /dev/null
+++ b/default_images/sw/res/sidebar/pageproppanel/last_custom_common.png
Binary files differ
diff --git a/default_images/sw/res/sidebar/pageproppanel/last_custom_common_grey.png b/default_images/sw/res/sidebar/pageproppanel/last_custom_common_grey.png
new file mode 100755
index 000000000000..c95062eb2897
--- /dev/null
+++ b/default_images/sw/res/sidebar/pageproppanel/last_custom_common_grey.png
Binary files differ
diff --git a/default_images/sw/res/sidebar/pageproppanel/portraitcopy_24x24.png b/default_images/sw/res/sidebar/pageproppanel/portraitcopy_24x24.png
new file mode 100755
index 000000000000..e39324a1d435
--- /dev/null
+++ b/default_images/sw/res/sidebar/pageproppanel/portraitcopy_24x24.png
Binary files differ
diff --git a/editeng/inc/editeng/itemtype.hxx b/editeng/inc/editeng/itemtype.hxx
index fb41b3e5df30..939537ff3ed3 100644
--- a/editeng/inc/editeng/itemtype.hxx
+++ b/editeng/inc/editeng/itemtype.hxx
@@ -37,7 +37,6 @@
#include "editeng/editengdllapi.h"
class Color;
-class XColorTable;
class IntlWrapper;
// static and prototypes -------------------------------------------------
diff --git a/editeng/inc/editeng/outliner.hxx b/editeng/inc/editeng/outliner.hxx
index 74034df0c89a..2c2d22df437d 100644
--- a/editeng/inc/editeng/outliner.hxx
+++ b/editeng/inc/editeng/outliner.hxx
@@ -37,7 +37,7 @@
#include <tools/link.hxx>
#include <rsc/rscsfx.hxx>
#include "editeng/editengdllapi.h"
-
+#include <editeng/numitem.hxx>
#include <svtools/grfmgr.hxx>
#include <tools/rtti.hxx> // wegen typedef TypeId
@@ -372,7 +372,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.
*/
@@ -1049,6 +1050,8 @@ public:
virtual sal_Bool IsParaIsNumberingRestart( sal_uInt16 nPara );
virtual void SetParaIsNumberingRestart( sal_uInt16 nPara, sal_Bool bParaIsNumberingRestart );
+
+ sal_Int16 GetBulletsNumberingStatus();
};
#endif
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index dd454a1700b8..677bca225367 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -3785,6 +3785,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 50127c68c787..e703b36408a9 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -370,6 +370,53 @@ void Outliner::SetParaIsNumberingRestart( sal_uInt16 nPara, sal_Bool bParaIsNumb
}
}
+sal_Int16 Outliner::GetBulletsNumberingStatus()
+{
+ sal_Bool bHasBulletsNumbering = FALSE;
+ sal_uInt16 nParaCount = (sal_uInt16)(pParaList->GetParagraphCount());
+ for (sal_uInt16 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_uInt16 nPara = 0; nPara < nParaCount; nPara++)
+ {
+ Paragraph* pPara = pParaList->GetParagraph(nPara);
+ const SfxItemSet& rAttrs = GetParaAttribs(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_Int16 nValue = (nBulletsCount == nParaCount) ? 0 : 2;
+ nValue = (nNumberingCount == nParaCount) ? 1 : nValue;
+ return nValue;
+}
+
OutlinerParaObject* Outliner::CreateParaObject( sal_uInt16 nStartPara, sal_uInt16 nCount ) const
{
DBG_CHKTHIS(Outliner,0);
diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx
index 3eec145746d5..a41aa3259bd3 100644
--- a/editeng/source/outliner/outlvw.cxx
+++ b/editeng/source/outliner/outlvw.cxx
@@ -50,6 +50,7 @@
#include <editeng/numitem.hxx>
#include <vcl/window.hxx>
#include <svl/itemset.hxx>
+#include <svl/eitem.hxx>
#include <editeng/editstat.hxx>
@@ -1232,6 +1233,205 @@ 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?");
+
+ const SfxItemSet& rAttrs = pOwner->GetParaAttribs( nPara );
+ 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 = 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 );
@@ -1266,6 +1466,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 = 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/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx
index 186ade97aebe..b6ff73300243 100644
--- a/extensions/source/propctrlr/standardcontrol.cxx
+++ b/extensions/source/propctrlr/standardcontrol.cxx
@@ -682,7 +682,7 @@ namespace pcr
:OColorControl_Base( PropertyControlType::ColorListBox, pParent, nWinStyle )
{
// initialize the color listbox
- XColorTable* pColorTable = NULL;
+ XColorList* pColorTable = NULL;
SfxObjectShell* pDocSh = SfxObjectShell::Current();
const SfxPoolItem* pItem = pDocSh ? pDocSh->GetItem( SID_COLOR_TABLE ) : NULL;
if ( pItem )
@@ -693,7 +693,7 @@ namespace pcr
if ( !pColorTable )
{
- pColorTable = XColorTable::GetStdColorTable();
+ pColorTable = XColorList::GetStdColorList();
}
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 23d16e935d8d..82af80750607 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -1024,11 +1024,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 c78bf67c405d..31e32d67240c 100644
--- a/framework/Library_fwk.mk
+++ b/framework/Library_fwk.mk
@@ -116,6 +116,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/modelwinservice \
framework/source/services/modulemanager \
diff --git a/framework/inc/macros/registration.hxx b/framework/inc/macros/registration.hxx
index b14ec798bbb2..2b724ca589c4 100644
--- a/framework/inc/macros/registration.hxx
+++ b/framework/inc/macros/registration.hxx
@@ -102,7 +102,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..2abe1820ba05
--- /dev/null
+++ b/framework/inc/services/ContextChangeEventMultiplexer.hxx
@@ -0,0 +1,144 @@
+/**************************************************************
+ *
+ * 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 __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..b865e7a35b3b
--- /dev/null
+++ b/framework/inc/services/EventMultiplexer.hxx
@@ -0,0 +1,122 @@
+/**************************************************************
+ *
+ * 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 __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 d8cfd95c1eff..813cf48981c6 100644
--- a/framework/source/register/registerservices.cxx
+++ b/framework/source/register/registerservices.cxx
@@ -53,26 +53,14 @@
#include <services/tabwindowservice.hxx>
#include <services/frame.hxx>
#include <services/modulemanager.hxx>
-//#include <dispatch/oxt_handler.hxx>
#include <jobs/jobexecutor.hxx>
-//#include <recording/dispatchrecordersupplier.hxx>
-//#include <recording/dispatchrecorder.hxx>
-//#include <dispatch/mailtodispatcher.hxx>
-//#include <dispatch/servicehandler.hxx>
#include <jobs/jobdispatch.hxx>
#include <services/backingcomp.hxx>
-//#include <services/dispatchhelper.hxx>
#include <services/layoutmanager.hxx>
-//#include <services/license.hxx>
#include <uifactory/uielementfactorymanager.hxx>
#include <uifactory/popupmenucontrollerfactory.hxx>
-//#include <uielement/fontmenucontroller.hxx>
-//#include <uielement/fontsizemenucontroller.hxx>
#include <uielement/objectmenucontroller.hxx>
-//#include <uielement/headermenucontroller.hxx>
-//#include <uielement/footermenucontroller.hxx>
#include <uielement/controlmenucontroller.hxx>
-//#include <uielement/macrosmenucontroller.hxx>
#include <uielement/uicommanddescription.hxx>
#include <uiconfiguration/uiconfigurationmanager.hxx>
#include <uiconfiguration/moduleuicfgsupplier.hxx>
@@ -84,7 +72,6 @@
#include <uifactory/toolboxfactory.hxx>
#include <uifactory/addonstoolboxfactory.hxx>
#include "uiconfiguration/windowstateconfiguration.hxx"
-//#include <uielement/toolbarsmenucontroller.hxx>
#include "uifactory/toolbarcontrollerfactory.hxx"
#include "uifactory/statusbarcontrollerfactory.hxx"
#include <services/autorecovery.hxx>
@@ -93,42 +80,27 @@
#include <uifactory/statusbarfactory.hxx>
#include <uiconfiguration/uicategorydescription.hxx>
#include <services/sessionlistener.hxx>
-//#include <uielement/newmenucontroller.hxx>
#include <services/taskcreatorsrv.hxx>
-//#include <services/uriabbreviation.hxx>
-
#include <uielement/langselectionstatusbarcontroller.hxx>
-//#include <uielement/langselectionmenucontroller.hxx>
#include <uiconfiguration/imagemanager.hxx>
#include <uifactory/windowcontentfactorymanager.hxx>
#include <services/substitutepathvars.hxx>
#include <services/pathsettings.hxx>
+#include <services/ContextChangeEventMultiplexer.hxx>
COMPONENTGETIMPLEMENTATIONENVIRONMENT
COMPONENTGETFACTORY ( IFFACTORY( ::framework::URLTransformer ) else
IFFACTORY( ::framework::Desktop ) else
IFFACTORY( ::framework::Frame ) else
- //IFFACTORY( ::framework::Oxt_Handler ) else
IFFACTORY( ::framework::JobExecutor ) else
- //IFFACTORY( ::framework::DispatchRecorderSupplier ) else
- //IFFACTORY( ::framework::DispatchRecorder ) else
- //IFFACTORY( ::framework::MailToDispatcher ) else
- //IFFACTORY( ::framework::ServiceHandler ) else
IFFACTORY( ::framework::JobDispatch ) else
IFFACTORY( ::framework::BackingComp ) else
- //IFFACTORY( ::framework::DispatchHelper ) else
IFFACTORY( ::framework::LayoutManager ) else
- //IFFACTORY( ::framework::License ) else
IFFACTORY( ::framework::UIElementFactoryManager ) else
IFFACTORY( ::framework::PopupMenuControllerFactory ) else
- //IFFACTORY( ::framework::FontMenuController ) else
- //IFFACTORY( ::framework::FontSizeMenuController ) else
IFFACTORY( ::framework::ObjectMenuController ) else
- //IFFACTORY( ::framework::HeaderMenuController ) else
- //IFFACTORY( ::framework::FooterMenuController ) else
IFFACTORY( ::framework::ControlMenuController ) else
- //IFFACTORY( ::framework::MacrosMenuController ) else
IFFACTORY( ::framework::UICommandDescription ) else
IFFACTORY( ::framework::ModuleManager ) else
IFFACTORY( ::framework::UIConfigurationManager ) else
@@ -142,7 +114,6 @@ COMPONENTGETFACTORY ( IFFACTORY( ::framework::URLTransformer
IFFACTORY( ::framework::AddonsToolBoxFactory ) else
IFFACTORY( ::framework::WindowStateConfiguration ) else
IFFACTORY( ::framework::ToolbarControllerFactory ) else
- //IFFACTORY( ::framework::ToolbarsMenuController ) else
IFFACTORY( ::framework::AutoRecovery ) else
IFFACTORY( ::framework::StatusIndicatorFactory ) else
IFFACTORY( ::framework::RecentFilesMenuController ) else
@@ -152,15 +123,12 @@ COMPONENTGETFACTORY ( IFFACTORY( ::framework::URLTransformer
IFFACTORY( ::framework::StatusbarControllerFactory ) else
IFFACTORY( ::framework::SessionListener ) else
IFFACTORY( ::framework::TaskCreatorService ) else
- //IFFACTORY( ::framework::NewMenuController ) else
- //IFFACTORY( ::framework::UriAbbreviation ) else
- //IFFACTORY( ::framework::PopupMenuDispatcher ) else
IFFACTORY( ::framework::ImageManager ) else
IFFACTORY( ::framework::LangSelectionStatusbarController ) else
- //IFFACTORY( ::framework::LanguageSelectionMenuController ) else
IFFACTORY( ::framework::WindowContentFactoryManager ) else
IFFACTORY( ::framework::TabWindowService ) else
IFFACTORY( ::framework::SubstitutePathVariables ) else
- IFFACTORY( ::framework::PathSettings )
+ IFFACTORY( ::framework::PathSettings ) else
+ IFFACTORY( ::framework::ContextChangeEventMultiplexer )
)
diff --git a/framework/source/services/ContextChangeEventMultiplexer.cxx b/framework/source/services/ContextChangeEventMultiplexer.cxx
new file mode 100644
index 000000000000..f3861a607d10
--- /dev/null
+++ b/framework/source/services/ContextChangeEventMultiplexer.cxx
@@ -0,0 +1,389 @@
+/**************************************************************
+ *
+ * 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.
+ *
+ *************************************************************/
+
+#include "precompiled_framework.hxx"
+
+#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..9f5b05dabe16
--- /dev/null
+++ b/framework/source/services/EventMultiplexer.cxx
@@ -0,0 +1,270 @@
+/**************************************************************
+ *
+ * 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.
+ *
+ *************************************************************/
+
+#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 606bcb905eaa..adc60714edd1 100644
--- a/framework/util/fwk.component
+++ b/framework/util/fwk.component
@@ -45,6 +45,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/offapi/com/sun/star/ui/ContextChangeEventMultiplexer.idl b/offapi/com/sun/star/ui/ContextChangeEventMultiplexer.idl
new file mode 100644
index 000000000000..e695184c391f
--- /dev/null
+++ b/offapi/com/sun/star/ui/ContextChangeEventMultiplexer.idl
@@ -0,0 +1,40 @@
+/**************************************************************
+ *
+ * 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 __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..7ab6bddd0b5e
--- /dev/null
+++ b/offapi/com/sun/star/ui/ContextChangeEventObject.idl
@@ -0,0 +1,53 @@
+/**************************************************************
+ *
+ * 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 __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..7c8fad8ac9ce
--- /dev/null
+++ b/offapi/com/sun/star/ui/LayoutSize.idl
@@ -0,0 +1,50 @@
+/**************************************************************
+ *
+ * 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 __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..000e3deec82a
--- /dev/null
+++ b/offapi/com/sun/star/ui/XContextChangeEventListener.idl
@@ -0,0 +1,47 @@
+/**************************************************************
+ *
+ * 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 __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
+{
+ [oneway] 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..e9e7238d1e7d
--- /dev/null
+++ b/offapi/com/sun/star/ui/XContextChangeEventMultiplexer.idl
@@ -0,0 +1,131 @@
+/**************************************************************
+ *
+ * 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 __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.
+ */
+ [oneway] 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..f7741133a0a3
--- /dev/null
+++ b/offapi/com/sun/star/ui/XContextChangeListener.idl
@@ -0,0 +1,51 @@
+/**************************************************************
+ *
+ * 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 __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
+{
+ [oneway] 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..e0992591687b
--- /dev/null
+++ b/offapi/com/sun/star/ui/XSidebar.idl
@@ -0,0 +1,46 @@
+/**************************************************************
+ *
+ * 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 __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..837dcf9dc73a
--- /dev/null
+++ b/offapi/com/sun/star/ui/XSidebarPanel.idl
@@ -0,0 +1,64 @@
+/**************************************************************
+ *
+ * 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 __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/ui/makefile.mk b/offapi/com/sun/star/ui/makefile.mk
index a93e6d0e6bca..5e7a5f7feb6b 100644
--- a/offapi/com/sun/star/ui/makefile.mk
+++ b/offapi/com/sun/star/ui/makefile.mk
@@ -40,6 +40,8 @@ IDLFILES=\
ActionTriggerSeparatorType.idl \
ConfigurableUIElement.idl \
ConfigurationEvent.idl \
+ ContextChangeEventMultiplexer.idl \
+ ContextChangeEventObject.idl \
ContextMenuExecuteEvent.idl \
ContextMenuInterceptorAction.idl \
DockingArea.idl \
@@ -48,6 +50,7 @@ IDLFILES=\
ItemDescriptor.idl \
ItemStyle.idl \
ItemType.idl \
+ LayoutSize.idl \
ModuleUICategoryDescription.idl \
ModuleUICommandDescription.idl \
ModuleUIConfigurationManager.idl \
@@ -66,10 +69,14 @@ IDLFILES=\
XAcceleratorConfiguration.idl \
XContextMenuInterception.idl \
XContextMenuInterceptor.idl \
+ XContextChangeEventListener.idl \
+ XContextChangeEventMultiplexer.idl \
XDockingAreaAcceptor.idl \
XImageManager.idl \
XModuleUIConfigurationManager.idl \
XModuleUIConfigurationManagerSupplier.idl \
+ XSidebar.idl \
+ XSidebarPanel.idl \
XStatusbarItem.idl \
XUIConfiguration.idl \
XUIConfigurationListener.idl \
diff --git a/offapi/com/sun/star/util/EventMultiplexer.idl b/offapi/com/sun/star/util/EventMultiplexer.idl
new file mode 100644
index 000000000000..80cf505999d0
--- /dev/null
+++ b/offapi/com/sun/star/util/EventMultiplexer.idl
@@ -0,0 +1,40 @@
+/**************************************************************
+ *
+ * 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 __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/registry/data/org/openoffice/Office/Impress.xcu b/officecfg/registry/data/org/openoffice/Office/Impress.xcu
index 85d1d5f8f6e8..e8f03d7a49d7 100644
--- a/officecfg/registry/data/org/openoffice/Office/Impress.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Impress.xcu
@@ -46,11 +46,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">
@@ -90,11 +85,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>
@@ -114,43 +104,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 be557f388ce5..9ca2ee0bdeda 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Factories.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Factories.xcu
@@ -81,18 +81,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 93e453e576ec..2ca3d11ae59f 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -5332,6 +5332,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:TestMode" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Test Mode On/Off</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
index 635e745061c0..06a220164296 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
@@ -797,61 +797,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..423ac13853aa
--- /dev/null
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
@@ -0,0 +1,987 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!--***********************************************************
+ *
+ * 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.
+ *
+ ***********************************************************-->
+
+<!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="HighContrastIconURL" oor:type="xs:string">
+ <value>private:graphicrepository/sfx2/res/symphony/sidebar-property-large-hc.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="HighContrastIconURL" oor:type="xs:string">
+ <value>private:graphicrepository/sfx2/res/symphony/sidebar-gallery-large-hc.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="HighContrastIconURL" oor:type="xs:string">
+ <value>private:graphicrepository/sfx2/res/symphony/sidebar-template-large-hc.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="HighContrastIconURL" oor:type="xs:string">
+ <value>private:graphicrepository/sfx2/res/symphony/sidebar-animation-large-hc.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="HighContrastIconURL" oor:type="xs:string">
+ <value>private:graphicrepository/sfx2/res/symphony/sidebar-transition-large-hc.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="HighContrastIconURL" oor:type="xs:string">
+ <value>private:graphicrepository/sfx2/res/symphony/sidebar-navigator-large-hc.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="HighContrastIconURL" oor:type="xs:string">
+ <value>private:graphicrepository/sfx2/res/symphony/sidebar-style-large-hc.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="HighContrastIconURL" oor:type="xs:string">
+ <value>private:graphicrepository/sfx2/res/symphony/sidebar-functions-large-hc.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/UI/makefile.mk b/officecfg/registry/data/org/openoffice/Office/UI/makefile.mk
index b32c99cc6040..f1b446db9b43 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/makefile.mk
+++ b/officecfg/registry/data/org/openoffice/Office/UI/makefile.mk
@@ -64,6 +64,7 @@ LOCALIZEDFILES= \
WriterWebWindowState.xcu \
WriterCommands.xcu\
GenericCategories.xcu\
+ Sidebar.xcu
XCUFILES= \
$(LOCALIZEDFILES) \
diff --git a/officecfg/registry/data/org/openoffice/Office/Views.xcu b/officecfg/registry/data/org/openoffice/Office/Views.xcu
index ade5cb482762..8b27bf326cb7 100644
--- a/officecfg/registry/data/org/openoffice/Office/Views.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Views.xcu
@@ -29,5 +29,13 @@
<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..ca821b78a7af
--- /dev/null
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs
@@ -0,0 +1,208 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--***********************************************************
+ *
+ * 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.
+ *
+ ***********************************************************-->
+
+
+<!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/officecfg/registry/schema/org/openoffice/Office/UI/makefile.mk b/officecfg/registry/schema/org/openoffice/Office/UI/makefile.mk
index 09ac99084fc1..00af7425f4d2 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/makefile.mk
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/makefile.mk
@@ -70,7 +70,8 @@ XCSFILES= \
Category.xcs \
GenericCategories.xcs \
GlobalSettings.xcs \
- WindowContentFactories.xcs
+ WindowContentFactories.xcs \
+ Sidebar.xcs
.INCLUDE : target.mk
diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk
index edf6164e2d32..07d41cf7a598 100644
--- a/postprocess/packregistry/makefile.mk
+++ b/postprocess/packregistry/makefile.mk
@@ -196,6 +196,7 @@ MY_FILES_main = \
$(MY_XCS)/Office/UI/GenericCategories.xcs \
$(MY_XCS)/Office/UI/GenericCommands.xcs \
$(MY_XCS)/Office/UI/GlobalSettings.xcs \
+ $(MY_XCS)/Office/UI/Sidebar.xcs \
$(MY_XCS)/Office/UI/StartModuleCommands.xcs \
$(MY_XCS)/Office/UI/StartModuleWindowState.xcs \
$(MY_XCS)/Office/UI/WindowContentFactories.xcs \
@@ -259,6 +260,7 @@ MY_FILES_main = \
$(MY_XCU)/Office/UI/Factories.xcu \
$(MY_XCU)/Office/UI/GenericCategories.xcu \
$(MY_XCU)/Office/UI/GenericCommands.xcu \
+ $(MY_XCU)/Office/UI/Sidebar.xcu \
$(MY_XCU)/Office/UI/StartModuleCommands.xcu \
$(MY_XCU)/Office/UI/StartModuleWindowState.xcu \
$(MY_XCU)/Office/UI.xcu \
diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx
index 993dddb58955..7908a77d61eb 100644
--- a/reportdesign/source/ui/dlg/Condition.cxx
+++ b/reportdesign/source/ui/dlg/Condition.cxx
@@ -146,7 +146,7 @@ OColorPopup::OColorPopup(Window* _pParent,Condition* _pCondition)
m_aColorSet.SetHelpId( HID_RPT_POPUP_COLOR_CTRL );
SetHelpId( HID_RPT_POPUP_COLOR );
const Size aSize12( 13, 13 );
- ::std::auto_ptr<XColorTable> pColorTable(new XColorTable( SvtPathOptions().GetPalettePath() ));
+ ::std::auto_ptr< XColorList > pColorTable(new XColorList( SvtPathOptions().GetPalettePath() ));
short i = 0;
long nCount = pColorTable->Count();
XColorEntry* pEntry = NULL;
diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx
index 13006a87dd39..07be44b250ed 100644
--- a/reportdesign/source/ui/misc/UITools.cxx
+++ b/reportdesign/source/ui/misc/UITools.cxx
@@ -44,7 +44,7 @@
#include <editeng/charscaleitem.hxx>
#include <svx/algitem.hxx>
#include <svx/svdpagv.hxx>
-#include <svx/xtable.hxx> // XColorTable
+#include <svx/xtable.hxx> // XColorList
#include <editeng/brshitem.hxx>
#include <editeng/fontitem.hxx>
#include <editeng/emphitem.hxx>
@@ -654,7 +654,7 @@ bool openCharDialog( const uno::Reference<report::XReportControlFormat >& _rxRep
};
Window* pParent = VCLUnoHelper::GetWindow( _rxParentWindow );
::std::auto_ptr<FontList> pFontList(new FontList( pParent ));
- ::std::auto_ptr<XColorTable> pColorTable( new XColorTable( SvtPathOptions().GetPalettePath() ));
+ ::std::auto_ptr< XColorList > pColorTable( new XColorList( SvtPathOptions().GetPalettePath() ));
SfxPoolItem* pDefaults[] =
{
new SvxFontItem(ITEMID_FONT),
@@ -774,7 +774,7 @@ bool openAreaDialog( const uno::Reference<report::XShape >& _xShape,const uno::R
// #i74099# by default, the dialog deletes the current color table if a different one is loaded
// (see SwDrawShell::ExecDrawDlg)
const SvxColorTableItem* pColorItem = static_cast<const SvxColorTableItem*>( pDescriptor->GetItem(SID_COLOR_TABLE) );
- if (pColorItem && pColorItem->GetColorTable() == XColorTable::GetStdColorTable())
+ if (pColorItem && pColorItem->GetColorTable() == XColorList::GetStdColorList())
pDialog->DontDeleteColorTable();
bSuccess = ( RET_OK == pDialog->Execute() );
if ( bSuccess )
diff --git a/sc/inc/ScPanelFactory.hxx b/sc/inc/ScPanelFactory.hxx
new file mode 100755
index 000000000000..65c3593994de
--- /dev/null
+++ b/sc/inc/ScPanelFactory.hxx
@@ -0,0 +1,70 @@
+/**************************************************************
+ *
+ * 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 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/document.hxx b/sc/inc/document.hxx
index 827e9ec2dbd1..a5ebb4fdc4aa 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -75,7 +75,7 @@ namespace sfx2 {
class SvxSearchItem;
class SvxShadowItem;
class Window;
-class XColorTable;
+class XColorList;
class List;
class ScAutoFormatData;
@@ -261,7 +261,7 @@ private:
SfxPrinter* pPrinter;
VirtualDevice* pVirtualDevice_100th_mm;
ScDrawLayer* pDrawLayer; // SdrModel
- XColorTable* pColorTable;
+ XColorList* pColorTable;
ScConditionalFormatList* pCondFormList; // bedingte Formate
ScValidationDataList* pValidationList; // Gueltigkeit
SvNumberFormatterIndexTable* pFormatExchangeList; // zum Umsetzen von Zahlenformaten
@@ -460,7 +460,7 @@ public:
void GetDocStat( ScDocStat& rDocStat );
SC_DLLPUBLIC void InitDrawLayer( SfxObjectShell* pDocShell = NULL );
- XColorTable* GetColorTable();
+ XColorList* GetColorTable();
SC_DLLPUBLIC sfx2::LinkManager* GetLinkManager() const;
diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h
index ca0a4d58d338..d9dd5f35e8ab 100644
--- a/sc/inc/helpids.h
+++ b/sc/inc/helpids.h
@@ -402,6 +402,73 @@
#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 ------------------------------------------------------------
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 0eec640c6bde..53dd8271eeef 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -51,6 +51,8 @@
#define SC_FUNCTION_END (SID_SC_START + 299)
#define SC_PARAM_START (SID_SC_START + 300)
#define SC_PARAM_END (SID_SC_START + 399)
+#define SC_SIDEBAR_PROPERTY_BEGIN (SID_SC_START + 400)
+#define SC_SIDEBAR_PROPERTY_END (SID_SC_START + 499)
// kompatibel zu frueher bleiben:
#define SC_RESOURCE_START (RID_APP_START+5000)
@@ -752,6 +754,11 @@
#define SID_SORT_ATTRIBS (SC_PARAM_START+3)
#define SID_SORT_USERDEF (SC_PARAM_START+4)
+// Sidebar -------------------------------------------------------------
+
+#define SID_SCGRIDSHOW (SC_SIDEBAR_PROPERTY_BEGIN+1)
+#define SID_NUMBER_TYPE_FORMAT (SC_SIDEBAR_PROPERTY_BEGIN+2)
+
// Resourcen -------------------------------------------------------------
#define RID_OBJECTBAR_APP (SC_RESOURCE_START)
@@ -1276,7 +1283,18 @@
#define RID_POPUP_FILTER (SC_DIALOGS_START + 153)
#define RID_SCDLG_TAB_BG_COLOR (SC_DIALOGS_START + 154)
-#define SC_DIALOGS_END (SC_DIALOGS_START + 155)
+// defines for AlignmentPropertyPanel
+#define RID_PROPERTYPANEL_SC_ALIGNMENT (SC_DIALOGS_START + 155)
+
+// defines for CellAppearancePropertyPanel
+#define RID_PROPERTYPANEL_SC_APPEAR (SC_DIALOGS_START + 156)
+#define RID_POPUPPANEL_CELLAPPEARANCE_FILLCOLOR (SC_DIALOGS_START + 157)
+#define RID_POPUPPANEL_CELLAPPEARANCE_LINECOLOR (SC_DIALOGS_START + 158)
+#define RID_POPUPPANEL_APPEARANCE_CELL_LINESTYLE (SC_DIALOGS_START + 159)
+#define RID_POPUPPANEL_APPEARANCE_CELL_BORDERSTYLE (SC_DIALOGS_START + 160)
+#define RID_PROPERTYPANEL_SC_NUMBERFORMAT (SC_DIALOGS_START + 161)
+
+#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/prj/build.lst b/sc/prj/build.lst
index f124dafb90a2..8656d1b63057 100644
--- a/sc/prj/build.lst
+++ b/sc/prj/build.lst
@@ -27,6 +27,7 @@ sc sc\source\ui\namedlg nmake - all sc_name sc_sdi sc_inc NULL
sc sc\source\ui\navipi nmake - all sc_nvipi sc_sdi sc_inc NULL
sc sc\source\ui\optdlg nmake - all sc_opt sc_sdi sc_inc NULL
sc sc\source\ui\pagedlg nmake - all sc_page sc_sdi sc_inc NULL
+sc sc\source\ui\sidebar nmake - all sc_sidebar sc_sdi sc_inc NULL
sc sc\source\ui\src nmake - all sc_uisrc sc_sdi sc_inc NULL
sc sc\source\ui\styleui nmake - all sc_style sc_sdi sc_inc NULL
sc sc\source\ui\undo nmake - all sc_undo sc_sdi sc_inc NULL
@@ -47,7 +48,7 @@ sc sc\addin nmake - all sc_add sc_sdi sc_inc NULL
sc sc\addin\datefunc nmake - all sc_addfu sc_add sc_sdi sc_inc NULL
sc sc\addin\rot13 nmake - all sc_adrot sc_add sc_sdi sc_inc NULL
sc sc\addin\util nmake - all sc_adutil sc_addfu sc_adrot sc_sdi sc_inc NULL
-sc sc\util nmake - all sc_util sc_addfu sc_adrot sc_adutil sc_app sc_attr sc_cctrl sc_cosrc sc_data sc_dbgui sc_dif sc_docsh sc_drfnc sc_excel sc_form sc_html sc_lotus sc_qpro sc_misc sc_name sc_nvipi sc_opt sc_page sc_rtf sc_scalc sc_style sc_tool sc_uisrc sc_undo sc_unobj sc_view sc_xcl97 sc_xml sc_acc sc_ftools sc_inc sc_vba NULL
+sc sc\util nmake - all sc_util sc_addfu sc_adrot sc_adutil sc_app sc_attr sc_cctrl sc_cosrc sc_data sc_dbgui sc_dif sc_docsh sc_drfnc sc_excel sc_form sc_html sc_lotus sc_qpro sc_misc sc_name sc_nvipi sc_opt sc_page sc_rtf sc_scalc sc_style sc_tool sc_uisrc sc_sidebar sc_undo sc_unobj sc_view sc_xcl97 sc_xml sc_acc sc_ftools sc_inc sc_vba NULL
# remarked due to the fact, key press is need in this test.
# sc sc\qa\complex\calcPreview nmake - all qa_calcpreview NULL
diff --git a/sc/sdi/cellsh.sdi b/sc/sdi/cellsh.sdi
index a4dad13b7a26..7c18762b9f3f 100644
--- a/sc/sdi/cellsh.sdi
+++ b/sc/sdi/cellsh.sdi
@@ -89,6 +89,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 aa92e337d679..7bb3fa496cd1 100644
--- a/sc/sdi/drawsh.sdi
+++ b/sc/sdi/drawsh.sdi
@@ -64,6 +64,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; ]
@@ -79,15 +80,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
@@ -161,6 +184,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 1cbf90760a2c..5285bd07b5e2 100644
--- a/sc/sdi/drtxtob.sdi
+++ b/sc/sdi/drtxtob.sdi
@@ -83,12 +83,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; ]
@@ -132,6 +143,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 0ddb0ef2ecf0..96160af08f8a 100644
--- a/sc/sdi/editsh.sdi
+++ b/sc/sdi/editsh.sdi
@@ -69,8 +69,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 66b6c295ec8c..e606af54c31f 100644
--- a/sc/sdi/formatsh.sdi
+++ b/sc/sdi/formatsh.sdi
@@ -70,6 +70,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; ]
@@ -99,6 +100,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; ]
@@ -122,6 +124,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; ]
@@ -129,6 +133,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 18a806d793e1..853ad6c33ac7 100644
--- a/sc/sdi/scalc.sdi
+++ b/sc/sdi/scalc.sdi
@@ -7822,3 +7822,53 @@ SfxVoidItem SetTabBgColor FID_TAB_MENU_SET_TAB_BG_COLOR
GroupId = GID_FORMAT;
]
+//--------------------------------------------------------------------------
+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 30f284ef05c7..be806260f43f 100644
--- a/sc/source/core/data/docpool.cxx
+++ b/sc/source/core/data/docpool.cxx
@@ -181,7 +181,8 @@ static SfxItemInfo __READONLY_DATA 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/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx
index 353816dbb400..9d3737ff7b02 100644
--- a/sc/source/core/data/documen9.cxx
+++ b/sc/source/core/data/documen9.cxx
@@ -89,7 +89,7 @@ void ScDocument::EndDrawUndo()
delete pDrawLayer->GetCalcUndo();
}
-XColorTable* ScDocument::GetColorTable()
+XColorList* ScDocument::GetColorTable()
{
if (pDrawLayer)
return pDrawLayer->GetColorTable();
@@ -98,7 +98,7 @@ XColorTable* ScDocument::GetColorTable()
if (!pColorTable)
{
SvtPathOptions aPathOpt;
- pColorTable = new XColorTable( aPathOpt.GetPalettePath() );
+ pColorTable = new XColorList( aPathOpt.GetPalettePath() );
}
return pColorTable;
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index 391e0cc08961..c901d87c1980 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -225,11 +225,11 @@ ScDrawLayer::ScDrawLayer( ScDocument* pDocument, const String& rName ) :
// set color table
SvxColorTableItem* pColItem = (SvxColorTableItem*) pObjSh->GetItem( SID_COLOR_TABLE );
- XColorTable* pXCol = pColItem ? pColItem->GetColorTable() : XColorTable::GetStdColorTable();
+ XColorList* pXCol = pColItem ? pColItem->GetColorTable() : XColorList::GetStdColorList();
SetColorTable( pXCol );
}
else
- SetColorTable( XColorTable::GetStdColorTable() );
+ SetColorTable( XColorList::GetStdColorList() );
SetSwapGraphics(sal_True);
// SetSwapAsynchron(sal_True); // an der View
diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx
index f58056853984..1941807272d5 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -648,7 +648,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 d8d6f8fb8d2f..75bf867dd2bd 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -2282,6 +2282,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 8752473775b1..ca35774cef28 100644
--- a/sc/source/ui/app/scdll.cxx
+++ b/sc/source/ui/app/scdll.cxx
@@ -37,6 +37,7 @@
#include <sot/clsids.hxx>
#include <sfx2/taskpane.hxx>
+#include <sfx2/sidebar/SidebarChildWindow.hxx>
#include <sfx2/docfilt.hxx>
#include <sfx2/fcontnr.hxx>
#include <sfx2/docfile.hxx>
@@ -262,6 +263,7 @@ void ScDLL::Init()
// common SFX controller
::sfx2::TaskPaneWrapper::RegisterChildWindow( sal_False, pMod );
+ ::sfx2::sidebar::SidebarChildWindow::RegisterChildWindow(NULL, 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 746de4d80838..d4b3b188bc18 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -1034,7 +1034,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 c0050ec617c0..077364ea0f2e 100644
--- a/sc/source/ui/app/typemap.cxx
+++ b/sc/source/ui/app/typemap.cxx
@@ -107,6 +107,10 @@
#include <editeng/crsditem.hxx>
#include <editeng/brkitem.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>
@@ -127,5 +131,10 @@
#define SvxChooseControlItem SfxEnumItem
#define avmedia_MediaItem ::avmedia::MediaItem
+#include <svx/xflftrit.hxx>
+#include <svx/xlncapit.hxx>
+#include <svx/xlinjoit.hxx>
+#include <svx/AffineMatrixItem.hxx>
+
#define SFX_TYPEMAP
#include "scslots.hxx"
diff --git a/sc/source/ui/dbgui/scendlg.cxx b/sc/source/ui/dbgui/scendlg.cxx
index b39f505f0400..e047188812a2 100644
--- a/sc/source/ui/dbgui/scendlg.cxx
+++ b/sc/source/ui/dbgui/scendlg.cxx
@@ -78,7 +78,7 @@ ScNewScenarioDlg::ScNewScenarioDlg( Window* pParent, const String& rName, sal_Bo
const SfxPoolItem* pItem = pDocSh->GetItem( SID_COLOR_TABLE );
if ( pItem )
{
- XColorTable* pColorTable = ((SvxColorTableItem*)pItem)->GetColorTable();
+ XColorList* pColorTable = ((SvxColorTableItem*)pItem)->GetColorTable();
if (pColorTable)
{
aLbColor.SetUpdateMode( sal_False );
diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx
index 1303c26f71c4..15d4f71ad907 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -3668,6 +3668,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/docshell/docsh2.cxx b/sc/source/ui/docshell/docsh2.cxx
index cbcf6bb3df77..1fae841765de 100644
--- a/sc/source/ui/docshell/docsh2.cxx
+++ b/sc/source/ui/docshell/docsh2.cxx
@@ -169,7 +169,7 @@ void ScDocShell::InitItems()
else
{
// always use global color table instead of local copy
- PutItem( SvxColorTableItem( XColorTable::GetStdColorTable(), SID_COLOR_TABLE ) );
+ PutItem( SvxColorTableItem( XColorList::GetStdColorList(), SID_COLOR_TABLE ) );
}
if ( !aDocument.GetForbiddenCharacters().isValid() ||
diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index e6def167913b..4093b76ebe46 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -568,7 +568,7 @@ void ScDocShell::Execute( SfxRequest& rReq )
{
// passende ColorTable ist per PutItem gesetzt worden
SvxColorTableItem* pColItem = (SvxColorTableItem*)GetItem(SID_COLOR_TABLE);
- XColorTable* pTable = pColItem->GetColorTable();
+ XColorList* pTable = pColItem->GetColorTable();
rReq.SetReturnValue(OfaPtrItem(SID_GET_COLORTABLE, pTable));
}
break;
diff --git a/sc/source/ui/drawfunc/chartsh.cxx b/sc/source/ui/drawfunc/chartsh.cxx
index e445499604ac..33e2b5023fd6 100644
--- a/sc/source/ui/drawfunc/chartsh.cxx
+++ b/sc/source/ui/drawfunc/chartsh.cxx
@@ -49,6 +49,7 @@
#include "drawview.hxx"
#include "scresid.hxx"
#include <svx/svdobj.hxx>
+#include <sfx2/sidebar/EnumContext.hxx>
#define ScChartShell
#include "scslots.hxx"
@@ -69,6 +70,7 @@ ScChartShell::ScChartShell(ScViewData* pData) :
{
SetHelpId(HID_SCSHELL_CHARTSH);
SetName(String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("ChartObject")));
+ SfxShell::SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_Chart));
}
ScChartShell::~ScChartShell()
@@ -76,4 +78,8 @@ ScChartShell::~ScChartShell()
}
-
+void ScChartShell::HandleSelectionChange (void)
+{
+ // Do not call the implementation in the base class. Let
+ // Activate()/Deactivate() handle context switches.
+}
diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx
index 1142dc4194bf..312a0e629737 100644
--- a/sc/source/ui/drawfunc/drawsh.cxx
+++ b/sc/source/ui/drawfunc/drawsh.cxx
@@ -58,6 +58,8 @@
#include <svx/dialogs.hrc>
#include <svx/drawitem.hxx>
#include <svx/xtable.hxx>
+#include "tabvwsh.hxx"
+#include <sfx2/bindings.hxx>
#define ScDrawShell
#include "scslots.hxx"
@@ -139,14 +141,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:
@@ -160,6 +169,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;
@@ -168,6 +180,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:
@@ -235,6 +249,7 @@ void ScDrawShell::ExecDrawAttr( SfxRequest& rReq )
#endif
case SID_ATTR_TRANSFORM:
+ {
{
if ( pView->AreObjectsMarked() )
{
@@ -302,7 +317,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;
@@ -438,7 +466,7 @@ void ScDrawShell::ExecuteAreaDlg( SfxRequest& rReq, sal_uInt16 nTabPage )
// (see SwDrawShell::ExecDrawDlg)
const SvxColorTableItem* pColorItem =
static_cast<const SvxColorTableItem*>( pViewData->GetSfxDocShell()->GetItem(SID_COLOR_TABLE) );
- if (pColorItem->GetColorTable() == XColorTable::GetStdColorTable())
+ if (pColorItem->GetColorTable() == XColorList::GetStdColorList())
pDlg->DontDeleteColorTable();
if ( nTabPage != 0xffff )
diff --git a/sc/source/ui/drawfunc/drawsh2.cxx b/sc/source/ui/drawfunc/drawsh2.cxx
index 6c33e2109f61..a7414af5a93e 100644
--- a/sc/source/ui/drawfunc/drawsh2.cxx
+++ b/sc/source/ui/drawfunc/drawsh2.cxx
@@ -41,6 +41,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"
@@ -53,15 +55,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();
@@ -72,10 +82,13 @@ ScDrawShell::ScDrawShell( ScViewData* pData ) :
}
SetHelpId( HID_SCSHELL_DRAWSH );
SetName(String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("Drawing")));
+
+ mpSelectionChangeHandler->Connect();
}
ScDrawShell::~ScDrawShell()
{
+ mpSelectionChangeHandler->Disconnect();
}
void ScDrawShell::GetState( SfxItemSet& rSet ) // Zustaende / Toggles
@@ -138,6 +151,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();
@@ -392,4 +407,20 @@ 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());
+}
diff --git a/sc/source/ui/drawfunc/drawsh4.cxx b/sc/source/ui/drawfunc/drawsh4.cxx
index 9035fc89601a..100ff0764f3b 100644
--- a/sc/source/ui/drawfunc/drawsh4.cxx
+++ b/sc/source/ui/drawfunc/drawsh4.cxx
@@ -93,7 +93,7 @@ void ScDrawShell::GetFormTextState(SfxItemSet& rSet)
if ( pDocSh )
{
const SfxPoolItem* pItem = pDocSh->GetItem( SID_COLOR_TABLE );
- XColorTable* pColorTable = NULL;
+ XColorList* pColorTable = NULL;
if ( pItem )
pColorTable = ((SvxColorTableItem*)pItem)->GetColorTable();
diff --git a/sc/source/ui/drawfunc/drawsh5.cxx b/sc/source/ui/drawfunc/drawsh5.cxx
index e2b1dcbd7238..3c7907a84ba6 100644
--- a/sc/source/ui/drawfunc/drawsh5.cxx
+++ b/sc/source/ui/drawfunc/drawsh5.cxx
@@ -324,10 +324,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 c4ab05526dc8..a159a85eb3b1 100644
--- a/sc/source/ui/drawfunc/drformsh.cxx
+++ b/sc/source/ui/drawfunc/drformsh.cxx
@@ -50,6 +50,7 @@
#include "drawview.hxx"
#include "scresid.hxx"
#include <svx/svdobj.hxx>
+#include <sfx2/sidebar/EnumContext.hxx>
#define ScDrawFormShell
#include "scslots.hxx"
@@ -69,11 +70,9 @@ ScDrawFormShell::ScDrawFormShell(ScViewData* pData) :
{
SetHelpId(HID_SCSHELL_DRAWFORMSH);
SetName(String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("DrawForm")));
+ SfxShell::SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_Form));
}
ScDrawFormShell::~ScDrawFormShell()
{
}
-
-
-
diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx
index fa22a356a711..f8c2981546f7 100644
--- a/sc/source/ui/drawfunc/drtxtob.cxx
+++ b/sc/source/ui/drawfunc/drtxtob.cxx
@@ -42,6 +42,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>
@@ -68,6 +71,7 @@
#include <svx/svxdlg.hxx>
#include <svx/dialogs.hrc>
+#include <sfx2/sidebar/EnumContext.hxx>
#include "sc.hrc"
#include "globstr.hrc"
@@ -132,6 +136,7 @@ ScDrawTextObjectBar::ScDrawTextObjectBar(ScViewData* pData) :
SetHelpId( HID_SCSHELL_DRTXTOB );
SetName(String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("DrawText")));
+ SfxShell::SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_DrawText));
}
__EXPORT ScDrawTextObjectBar::~ScDrawTextObjectBar()
@@ -643,7 +648,7 @@ void lcl_RemoveFields( OutlinerView& rOutView )
{
SvUShorts aPortions;
rEditEng.GetPortions( (sal_uInt16)nPar, aPortions );
- //! GetPortions should use xub_StrLen instead of USHORT
+ //! GetPortions should use xub_StrLen instead of sal_uInt16
for ( sal_uInt16 nPos = aPortions.Count(); nPos; )
{
@@ -731,10 +736,11 @@ void __EXPORT 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:
@@ -851,6 +857,11 @@ void __EXPORT 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;
}
@@ -882,6 +893,122 @@ void __EXPORT 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 )
+ {
+ sal_uInt16 nId = 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 )
+ {
+ sal_uInt16 nId = 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
@@ -934,24 +1061,35 @@ void __EXPORT 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
@@ -963,6 +1101,32 @@ void __EXPORT 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)
@@ -992,7 +1156,7 @@ void __EXPORT 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 );
@@ -1089,3 +1253,54 @@ 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();
+ }
+}
+
diff --git a/sc/source/ui/drawfunc/drtxtob1.cxx b/sc/source/ui/drawfunc/drtxtob1.cxx
index 667efb0520ec..4ee43a36ad61 100644
--- a/sc/source/ui/drawfunc/drtxtob1.cxx
+++ b/sc/source/ui/drawfunc/drtxtob1.cxx
@@ -53,7 +53,7 @@
//------------------------------------------------------------------------
sal_Bool ScDrawTextObjectBar::ExecuteCharDlg( const SfxItemSet& rArgs,
- SfxItemSet& rOutSet )
+ SfxItemSet& rOutSet , sal_uInt16 nSlot)
{
//CHINA001 ScCharDlg* pDlg = new ScCharDlg( pViewData->GetDialogParent(),
//CHINA001 &rArgs,
@@ -65,6 +65,10 @@ sal_Bool ScDrawTextObjectBar::ExecuteCharDlg( const SfxItemSet& rArgs,
SfxAbstractTabDialog* pDlg = pFact->CreateScCharDlg( pViewData->GetDialogParent(), &rArgs,
pViewData->GetSfxDocShell(),RID_SCDLG_CHAR );
DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
+ 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/drtxtob2.cxx b/sc/source/ui/drawfunc/drtxtob2.cxx
index 0700b4b54dd6..66df37c73084 100644
--- a/sc/source/ui/drawfunc/drtxtob2.cxx
+++ b/sc/source/ui/drawfunc/drtxtob2.cxx
@@ -257,7 +257,7 @@ void ScDrawTextObjectBar::GetFormTextState(SfxItemSet& rSet)
if ( pDocSh )
{
const SfxPoolItem* pItem = pDocSh->GetItem( SID_COLOR_TABLE );
- XColorTable* pColorTable = NULL;
+ XColorList* pColorTable = NULL;
if ( pItem )
pColorTable = ((SvxColorTableItem*)pItem)->GetColorTable();
diff --git a/sc/source/ui/drawfunc/futext.cxx b/sc/source/ui/drawfunc/futext.cxx
index 61e2ebedec26..d14e6ecdef4a 100644
--- a/sc/source/ui/drawfunc/futext.cxx
+++ b/sc/source/ui/drawfunc/futext.cxx
@@ -67,6 +67,10 @@ 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 );
@@ -86,6 +90,11 @@ 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 );
}
void lcl_UpdateHyphenator( Outliner& rOutliner, SdrObject* pObj )
diff --git a/sc/source/ui/drawfunc/graphsh.cxx b/sc/source/ui/drawfunc/graphsh.cxx
index 0be5cc1bb904..a13c070d94ea 100644
--- a/sc/source/ui/drawfunc/graphsh.cxx
+++ b/sc/source/ui/drawfunc/graphsh.cxx
@@ -35,6 +35,7 @@
#include <svx/svdograf.hxx>
#include <svx/grfflt.hxx>
#include <svx/grafctrl.hxx>
+#include <sfx2/sidebar/EnumContext.hxx>
#include "graphsh.hxx"
#include "sc.hrc"
@@ -62,6 +63,7 @@ ScGraphicShell::ScGraphicShell(ScViewData* pData) :
{
SetHelpId(HID_SCSHELL_GRAPHIC);
SetName(String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("GraphicObject")));
+ SfxShell::SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_Graphic));
}
ScGraphicShell::~ScGraphicShell()
@@ -141,4 +143,3 @@ void ScGraphicShell::ExecuteFilter( SfxRequest& rReq )
Invalidate();
}
-
diff --git a/sc/source/ui/drawfunc/mediash.cxx b/sc/source/ui/drawfunc/mediash.cxx
index 05af38da9ed6..3484db14bcf6 100644
--- a/sc/source/ui/drawfunc/mediash.cxx
+++ b/sc/source/ui/drawfunc/mediash.cxx
@@ -31,6 +31,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"
@@ -57,6 +58,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 d98a919a78fc..eab864cb6c7c 100644
--- a/sc/source/ui/drawfunc/oleobjsh.cxx
+++ b/sc/source/ui/drawfunc/oleobjsh.cxx
@@ -50,6 +50,7 @@
#include "drawview.hxx"
#include "scresid.hxx"
#include <svx/svdobj.hxx>
+#include <sfx2/sidebar/EnumContext.hxx>
#define ScOleObjectShell
#include "scslots.hxx"
@@ -69,6 +70,7 @@ ScOleObjectShell::ScOleObjectShell(ScViewData* pData) :
{
SetHelpId(HID_SCSHELL_OLEOBEJCTSH);
SetName(String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("OleObject")));
+ SfxShell::SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_OLE));
}
ScOleObjectShell::~ScOleObjectShell()
@@ -76,4 +78,8 @@ ScOleObjectShell::~ScOleObjectShell()
}
-
+void ScOleObjectShell::HandleSelectionChange (void)
+{
+ // Do not call the implementation in the base class. Let
+ // Activate()/Deactivate() handle context switches.
+}
diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx
index 11611faabb1d..9e6f2270c89e 100644
--- a/sc/source/ui/formdlg/dwfunctr.cxx
+++ b/sc/source/ui/formdlg/dwfunctr.cxx
@@ -118,7 +118,10 @@ ScFunctionDockWin::ScFunctionDockWin( SfxBindings* pBindingsP,
aTimer.SetTimeout(200);
aTimer.SetTimeoutHdl(LINK( this, ScFunctionDockWin, TimerHdl));
- eSfxNewAlignment=GetAlignment();
+ if (pCW != NULL)
+ eSfxNewAlignment=GetAlignment();
+ else
+ eSfxNewAlignment=SFX_ALIGN_RIGHT;
eSfxOldAlignment=eSfxNewAlignment;
aFiFuncDesc.SetUpdateMode(sal_True);
pAllFuncList=&aFuncList;
diff --git a/sc/source/ui/inc/chartsh.hxx b/sc/source/ui/inc/chartsh.hxx
index 2091e0092b91..1cb83ac40350 100644
--- a/sc/source/ui/inc/chartsh.hxx
+++ b/sc/source/ui/inc/chartsh.hxx
@@ -42,7 +42,7 @@ public:
ScChartShell(ScViewData* pData);
virtual ~ScChartShell();
-
+ virtual void HandleSelectionChange (void);
};
#endif
diff --git a/sc/source/ui/inc/drawsh.hxx b/sc/source/ui/inc/drawsh.hxx
index bae217487f1b..f9c5c91d86e8 100644
--- a/sc/source/ui/inc/drawsh.hxx
+++ b/sc/source/ui/inc/drawsh.hxx
@@ -27,16 +27,22 @@
#include <sfx2/shell.hxx>
#include "shellids.hxx"
#include <sfx2/module.hxx>
+#include <sfx2/sidebar/EnumContext.hxx>
#include <svx/svdmark.hxx>
#include <tools/link.hxx>
+#include <rtl/ref.hxx>
class AbstractSvxNameDialog; //CHINA001 class SvxNameDialog;
class ScViewData;
class ScDrawView;
+namespace svx { namespace sidebar {
+class SelectionChangeHandler;
+} }
class ScDrawShell : public SfxShell
{
ScViewData* pViewData;
+ ::rtl::Reference<svx::sidebar::SelectionChangeHandler> mpSelectionChangeHandler;
DECL_LINK( NameObjectHdl, AbstractSvxNameDialog* );
@@ -81,6 +87,9 @@ public:
ScDrawView* GetDrawView();
sal_Bool AreAllObjectsOnLayer(sal_uInt16 nLayerNo,const SdrMarkList& rMark);
+
+ void GetDrawAttrStateForIFBX( SfxItemSet& rSet );
+ ::sfx2::sidebar::EnumContext::Context GetContextForSelection (void);
};
diff --git a/sc/source/ui/inc/drformsh.hxx b/sc/source/ui/inc/drformsh.hxx
index 5bcfac330bd5..f0d914832225 100644
--- a/sc/source/ui/inc/drformsh.hxx
+++ b/sc/source/ui/inc/drformsh.hxx
@@ -43,9 +43,6 @@ public:
ScDrawFormShell(ScViewData* pData);
virtual ~ScDrawFormShell();
-
-// void Execute(SfxRequest &);
-// void GetState(SfxItemSet &);
};
#endif
diff --git a/sc/source/ui/inc/drtxtob.hxx b/sc/source/ui/inc/drtxtob.hxx
index acd63a0cbedb..b4fce7831d58 100644
--- a/sc/source/ui/inc/drtxtob.hxx
+++ b/sc/source/ui/inc/drtxtob.hxx
@@ -64,8 +64,9 @@ public:
void ExecuteAttr( SfxRequest &rReq );
void GetAttrState( SfxItemSet& rSet );
void ExecuteToggle( SfxRequest &rReq );
+ void GetStatePropPanelAttr(SfxItemSet &);
- sal_Bool ExecuteCharDlg( const SfxItemSet& rArgs, SfxItemSet& rOutSet );
+ sal_Bool ExecuteCharDlg( const SfxItemSet& rArgs, SfxItemSet& rOutSet , sal_uInt16 nSlot);
sal_Bool ExecuteParaDlg( const SfxItemSet& rArgs, SfxItemSet& rOutSet );
void ExecuteExtra( SfxRequest &rReq );
diff --git a/sc/source/ui/inc/formatsh.hxx b/sc/source/ui/inc/formatsh.hxx
index 06501dfabc3b..2756aa5f4ff2 100644
--- a/sc/source/ui/inc/formatsh.hxx
+++ b/sc/source/ui/inc/formatsh.hxx
@@ -70,6