[Libreoffice-commits] core.git: 103 commits - chart2/source cui/source cui/uiconfig editeng/source extras/source filter/source framework/inc framework/Library_fwk.mk framework/source framework/util icon-themes/galaxy icon-themes/hicontrast include/editeng include/sfx2 include/svtools include/svx include/vcl offapi/com offapi/UnoApi_offapi.mk officecfg/Configuration_officecfg.mk officecfg/files.mk officecfg/registry postprocess/CustomTarget_registry.mk sc/AllLangResTarget_sc.mk sc/inc sc/Library_sc.mk sc/sdi sc/source sc/uiconfig sc/util sd/inc sd/Library_sd.mk sd/sdi sd/source sd/uiconfig sd/util sfx2/AllLangResTarget_sfx2.mk sfx2/Library_sfx.mk sfx2/sdi sfx2/source svtools/source svx/AllLangResTarget_svx.mk svx/inc svx/Library_svxcore.mk svx/Library_svx.mk svx/sdi svx/source svx/util sw/AllLangResTarget_sw.mk sw/CppunitTest_sw_macros_test.mk sw/inc sw/Library_sw.mk sw/sdi sw/source sw/uiconfig sw/util vcl/inc vcl/source
Michael Meeks
michael.meeks at suse.com
Mon May 20 03:35:17 PDT 2013
chart2/source/controller/drawinglayer/DrawViewWrapper.cxx | 8
cui/source/inc/backgrnd.hxx | 4
cui/source/inc/cuitabarea.hxx | 6
cui/source/options/optjava.cxx | 12
cui/source/options/optjava.hxx | 1
cui/source/tabpages/backgrnd.cxx | 40
cui/source/tabpages/tpbitmap.cxx | 10
cui/source/tabpages/tpcolor.cxx | 57
cui/source/tabpages/tpline.cxx | 31
cui/source/tabpages/tplnedef.cxx | 24
cui/source/tabpages/tplneend.cxx | 7
cui/uiconfig/ui/backgroundpage.ui | 2
cui/uiconfig/ui/colorpage.ui | 2
cui/uiconfig/ui/optadvancedpage.ui | 19
editeng/source/items/textitem.cxx | 10
editeng/source/outliner/outliner.cxx | 46
editeng/source/outliner/outlvw.cxx | 319 +
extras/source/glade/libreoffice-catalog.xml.in | 3
filter/source/msfilter/msdffimp.cxx | 6
framework/Library_fwk.mk | 1
framework/inc/macros/registration.hxx | 2
framework/inc/services/ContextChangeEventMultiplexer.hxx | 138
framework/inc/services/EventMultiplexer.hxx | 116
framework/source/register/registerservices.cxx | 5
framework/source/services/ContextChangeEventMultiplexer.cxx | 383 +
framework/source/services/EventMultiplexer.cxx | 266 +
framework/util/fwk.component | 4
icon-themes/galaxy/cmd/lc_characterbackgroundpattern.png |binary
icon-themes/galaxy/cmd/lc_fliphorizontal.png |binary
icon-themes/galaxy/cmd/lc_flipvertical.png |binary
icon-themes/galaxy/cmd/lc_spacing.png |binary
icon-themes/galaxy/cmd/sc_characterbackgroundpattern.png |binary
icon-themes/galaxy/cmd/sc_fliphorizontal.png |binary
icon-themes/galaxy/cmd/sc_flipvertical.png |binary
icon-themes/galaxy/cmd/sc_spacing.png |binary
icon-themes/galaxy/cmd/sch_characterbackgroundpattern.png |binary
icon-themes/galaxy/cmd/sch_spacing.png |binary
icon-themes/galaxy/sc/res/sidebar/CellBorder.png |binary
icon-themes/galaxy/sc/res/sidebar/CellBorderLineStyle_005.png |binary
icon-themes/galaxy/sc/res/sidebar/CellBorderLineStyle_110.png |binary
icon-themes/galaxy/sc/res/sidebar/CellBorderLineStyle_250.png |binary
icon-themes/galaxy/sc/res/sidebar/CellBorderLineStyle_260.png |binary
icon-themes/galaxy/sc/res/sidebar/CellBorderLineStyle_400.png |binary
icon-themes/galaxy/sc/res/sidebar/CellBorderLineStyle_450.png |binary
icon-themes/galaxy/sc/res/sidebar/CellBorderLineStyle_500.png |binary
icon-themes/galaxy/sc/res/sidebar/CellBorderLineStyle_505.png |binary
icon-themes/galaxy/sc/res/sidebar/CellBorderLineStyle_750.png |binary
icon-themes/galaxy/sc/res/sidebar/CellBorder_All_18x18.png |binary
icon-themes/galaxy/sc/res/sidebar/CellBorder_Bottom_18x18.png |binary
icon-themes/galaxy/sc/res/sidebar/CellBorder_Bottom_Double_18x18.png |binary
icon-themes/galaxy/sc/res/sidebar/CellBorder_Bottom_Thick_18x18.png |binary
icon-themes/galaxy/sc/res/sidebar/CellBorder_Empty_18x18.png |binary
icon-themes/galaxy/sc/res/sidebar/CellBorder_FourBorders_18x18.png |binary
icon-themes/galaxy/sc/res/sidebar/CellBorder_FourBorders_Thick_18x18.png |binary
icon-themes/galaxy/sc/res/sidebar/CellBorder_LeftAndRight_18x18.png |binary
icon-themes/galaxy/sc/res/sidebar/CellBorder_LeftDiagonal_18x18.png |binary
icon-themes/galaxy/sc/res/sidebar/CellBorder_Left_18x18.png |binary
icon-themes/galaxy/sc/res/sidebar/CellBorder_RightDiagonal_18x18.png |binary
icon-themes/galaxy/sc/res/sidebar/CellBorder_Right_18x18.png |binary
icon-themes/galaxy/sc/res/sidebar/CellBorder_TopAndBottom_18x18.png |binary
icon-themes/galaxy/sc/res/sidebar/CellBorder_TopSingle_BottomDouble_18x18.png |binary
icon-themes/galaxy/sc/res/sidebar/CellBorder_TopThin_BottomThick_18x18.png |binary
icon-themes/galaxy/sc/res/sidebar/CellBorder_Top_18x18.png |binary
icon-themes/galaxy/sc/res/sidebar/Line_color.png |binary
icon-themes/galaxy/sc/res/sidebar/fill_color.png |binary
icon-themes/galaxy/sc/res/sidebar/morebutton.bmp |binary
icon-themes/galaxy/sc/res/sidebar/morebutton_h.bmp |binary
icon-themes/galaxy/sc/res/sidebar/sc_alignbottom.png |binary
icon-themes/galaxy/sc/res/sidebar/sc_aligncenter.png |binary
icon-themes/galaxy/sc/res/sidebar/sc_aligncenter_v.png |binary
icon-themes/galaxy/sc/res/sidebar/sc_alignjust.png |binary
icon-themes/galaxy/sc/res/sidebar/sc_alignleft.png |binary
icon-themes/galaxy/sc/res/sidebar/sc_alignright.png |binary
icon-themes/galaxy/sc/res/sidebar/sc_aligntop.png |binary
icon-themes/galaxy/sfx2/res/grip.png |binary
icon-themes/galaxy/sfx2/res/menu.png |binary
icon-themes/galaxy/sfx2/res/separator.png |binary
icon-themes/galaxy/sfx2/res/symphony/morebutton.png |binary
icon-themes/galaxy/sfx2/res/symphony/open_more.png |binary
icon-themes/galaxy/sfx2/res/symphony/sidebar-3d-large.png |binary
icon-themes/galaxy/sfx2/res/symphony/sidebar-3d-small.png |binary
icon-themes/galaxy/sfx2/res/symphony/sidebar-animation-large.png |binary
icon-themes/galaxy/sfx2/res/symphony/sidebar-animation-small.png |binary
icon-themes/galaxy/sfx2/res/symphony/sidebar-colors-large.png |binary
icon-themes/galaxy/sfx2/res/symphony/sidebar-colors-small.png |binary
icon-themes/galaxy/sfx2/res/symphony/sidebar-eyedropper-large.png |binary
icon-themes/galaxy/sfx2/res/symphony/sidebar-eyedropper-small.png |binary
icon-themes/galaxy/sfx2/res/symphony/sidebar-functions-large.png |binary
icon-themes/galaxy/sfx2/res/symphony/sidebar-functions-small.png |binary
icon-themes/galaxy/sfx2/res/symphony/sidebar-gallery-large.png |binary
icon-themes/galaxy/sfx2/res/symphony/sidebar-gallery-small.png |binary
icon-themes/galaxy/sfx2/res/symphony/sidebar-imganim-large.png |binary
icon-themes/galaxy/sfx2/res/symphony/sidebar-imganim-small.png |binary
icon-themes/galaxy/sfx2/res/symphony/sidebar-navigator-large.png |binary
icon-themes/galaxy/sfx2/res/symphony/sidebar-navigator-small.png |binary
icon-themes/galaxy/sfx2/res/symphony/sidebar-property-large.png |binary
icon-themes/galaxy/sfx2/res/symphony/sidebar-property-small.png |binary
icon-themes/galaxy/sfx2/res/symphony/sidebar-style-large.png |binary
icon-themes/galaxy/sfx2/res/symphony/sidebar-style-small.png |binary
icon-themes/galaxy/sfx2/res/symphony/sidebar-template-large.png |binary
icon-themes/galaxy/sfx2/res/symphony/sidebar-template-small.png |binary
icon-themes/galaxy/sfx2/res/symphony/sidebar-transition-large.png |binary
icon-themes/galaxy/sfx2/res/symphony/sidebar-transition-small.png |binary
icon-themes/galaxy/svx/res/rotation.png |binary
icon-themes/galaxy/svx/res/symphony/ |binary
icon-themes/galaxy/svx/res/symphony/AdjustColorBlue_16x16.png |binary
icon-themes/galaxy/svx/res/symphony/AdjustColorGamma_16x16.png |binary
icon-themes/galaxy/svx/res/symphony/AdjustColorGreen_16x16.png |binary
icon-themes/galaxy/svx/res/symphony/AdjustColorRed_16x16.png |binary
icon-themes/galaxy/svx/res/symphony/ColorModeBlackWhite_16x16.png |binary
icon-themes/galaxy/svx/res/symphony/ColorModeGrey_16x16.png |binary
icon-themes/galaxy/svx/res/symphony/ColorModeNormal_16x16.png |binary
icon-themes/galaxy/svx/res/symphony/ColorModeWaterMark_16x16.png |binary
icon-themes/galaxy/svx/res/symphony/DecreaseSpace_16x16.png |binary
icon-themes/galaxy/svx/res/symphony/Highlight.png |binary
icon-themes/galaxy/svx/res/symphony/IncreaseSpace_16x16.png |binary
icon-themes/galaxy/svx/res/symphony/Indent2.png |binary
icon-themes/galaxy/svx/res/symphony/Indent3.png |binary
icon-themes/galaxy/svx/res/symphony/Indent4.png |binary
icon-themes/galaxy/svx/res/symphony/Indent_Hanging.png |binary
icon-themes/galaxy/svx/res/symphony/Line_color.png |binary
icon-themes/galaxy/svx/res/symphony/Quadratic.png |binary
icon-themes/galaxy/svx/res/symphony/Square.png |binary
icon-themes/galaxy/svx/res/symphony/__morebutton.bmp |binary
icon-themes/galaxy/svx/res/symphony/axial.png |binary
icon-themes/galaxy/svx/res/symphony/blank.png |binary
icon-themes/galaxy/svx/res/symphony/decrease font.png |binary
icon-themes/galaxy/svx/res/symphony/ellipsoid.png |binary
icon-themes/galaxy/svx/res/symphony/enlarge font.png |binary
icon-themes/galaxy/svx/res/symphony/fill_color.png |binary
icon-themes/galaxy/svx/res/symphony/icon_normal.png |binary
icon-themes/galaxy/svx/res/symphony/last_custom_common.png |binary
icon-themes/galaxy/svx/res/symphony/last_custom_common_grey.png |binary
icon-themes/galaxy/svx/res/symphony/line1.png |binary
icon-themes/galaxy/svx/res/symphony/line10.png |binary
icon-themes/galaxy/svx/res/symphony/line2.png |binary
icon-themes/galaxy/svx/res/symphony/line3.png |binary
icon-themes/galaxy/svx/res/symphony/line4.png |binary
icon-themes/galaxy/svx/res/symphony/line5.png |binary
icon-themes/galaxy/svx/res/symphony/line6.png |binary
icon-themes/galaxy/svx/res/symphony/line7.png |binary
icon-themes/galaxy/svx/res/symphony/line8.png |binary
icon-themes/galaxy/svx/res/symphony/line9.png |binary
icon-themes/galaxy/svx/res/symphony/linear.png |binary
icon-themes/galaxy/svx/res/symphony/lpselected-spacing-1.png |binary
icon-themes/galaxy/svx/res/symphony/lpselected-spacing-1_15.png |binary
icon-themes/galaxy/svx/res/symphony/lpselected-spacing-1_5.png |binary
icon-themes/galaxy/svx/res/symphony/lpselected-spacing-2.png |binary
icon-themes/galaxy/svx/res/symphony/lpsmall-spacing-1.png |binary
icon-themes/galaxy/svx/res/symphony/lpspacing-1.png |binary
icon-themes/galaxy/svx/res/symphony/lpspacing-1_15.png |binary
icon-themes/galaxy/svx/res/symphony/lpspacing-1_5.png |binary
icon-themes/galaxy/svx/res/symphony/lpspacing-2.png |binary
icon-themes/galaxy/svx/res/symphony/no color.png |binary
icon-themes/galaxy/svx/res/symphony/para_numbullet01.png |binary
icon-themes/galaxy/svx/res/symphony/para_numbullet02.png |binary
icon-themes/galaxy/svx/res/symphony/para_numbullet_rtl01.png |binary
icon-themes/galaxy/svx/res/symphony/para_numbullet_rtl02.png |binary
icon-themes/galaxy/svx/res/symphony/para_numbulleth01.png |binary
icon-themes/galaxy/svx/res/symphony/para_numbulleth02.png |binary
icon-themes/galaxy/svx/res/symphony/radial.png |binary
icon-themes/galaxy/svx/res/symphony/rotate_left.png |binary
icon-themes/galaxy/svx/res/symphony/rotate_right.png |binary
icon-themes/galaxy/svx/res/symphony/rotation.png |binary
icon-themes/galaxy/svx/res/symphony/sc_backgroundcolor.png |binary
icon-themes/galaxy/svx/res/symphony/sc_bold.png |binary
icon-themes/galaxy/svx/res/symphony/sc_color.png |binary
icon-themes/galaxy/svx/res/symphony/sc_italic.png |binary
icon-themes/galaxy/svx/res/symphony/sc_shadowed.png |binary
icon-themes/galaxy/svx/res/symphony/sc_strikeout.png |binary
icon-themes/galaxy/svx/res/symphony/sc_subscript.png |binary
icon-themes/galaxy/svx/res/symphony/sc_superscript.png |binary
icon-themes/galaxy/svx/res/symphony/sc_underline.png |binary
icon-themes/galaxy/svx/res/symphony/sch_backgroundcolor.png |binary
icon-themes/galaxy/svx/res/symphony/selected-line1.png |binary
icon-themes/galaxy/svx/res/symphony/selected-line10.png |binary
icon-themes/galaxy/svx/res/symphony/selected-line2.png |binary
icon-themes/galaxy/svx/res/symphony/selected-line3.png |binary
icon-themes/galaxy/svx/res/symphony/selected-line4.png |binary
icon-themes/galaxy/svx/res/symphony/selected-line5.png |binary
icon-themes/galaxy/svx/res/symphony/selected-line6.png |binary
icon-themes/galaxy/svx/res/symphony/selected-line7.png |binary
icon-themes/galaxy/svx/res/symphony/selected-line8.png |binary
icon-themes/galaxy/svx/res/symphony/selected-line9.png |binary
icon-themes/galaxy/svx/res/symphony/spacing1.png |binary
icon-themes/galaxy/svx/res/symphony/spacing2.png |binary
icon-themes/galaxy/svx/res/symphony/spacing3.png |binary
icon-themes/galaxy/svx/res/symphony/spacing_loose.png |binary
icon-themes/galaxy/svx/res/symphony/spacing_loose_s.png |binary
icon-themes/galaxy/svx/res/symphony/spacing_normal.png |binary
icon-themes/galaxy/svx/res/symphony/spacing_normal_s.png |binary
icon-themes/galaxy/svx/res/symphony/spacing_tight.png |binary
icon-themes/galaxy/svx/res/symphony/spacing_tight_s.png |binary
icon-themes/galaxy/svx/res/symphony/spacing_very loose.png |binary
icon-themes/galaxy/svx/res/symphony/spacing_very loose_s.png |binary
icon-themes/galaxy/svx/res/symphony/spacing_very tight.png |binary
icon-themes/galaxy/svx/res/symphony/spacing_very tight_s.png |binary
icon-themes/galaxy/svx/res/symphony/width1.png |binary
icon-themes/galaxy/svx/res/symphony/width2.png |binary
icon-themes/galaxy/svx/res/symphony/width3.png |binary
icon-themes/galaxy/svx/res/symphony/width4.png |binary
icon-themes/galaxy/svx/res/symphony/width5.png |binary
icon-themes/galaxy/svx/res/symphony/width6.png |binary
icon-themes/galaxy/svx/res/symphony/width7.png |binary
icon-themes/galaxy/svx/res/symphony/width8.png |binary
icon-themes/galaxy/sw/res/sidebar/pageproppanel/Landscapecopy_24x24.png |binary
icon-themes/galaxy/sw/res/sidebar/pageproppanel/column1_24x24.png |binary
icon-themes/galaxy/sw/res/sidebar/pageproppanel/column2_24x24.png |binary
icon-themes/galaxy/sw/res/sidebar/pageproppanel/column3_24x24.png |binary
icon-themes/galaxy/sw/res/sidebar/pageproppanel/column_L_1_24x24.png |binary
icon-themes/galaxy/sw/res/sidebar/pageproppanel/column_L_2_24x24.png |binary
icon-themes/galaxy/sw/res/sidebar/pageproppanel/column_L_3_24x24.png |binary
icon-themes/galaxy/sw/res/sidebar/pageproppanel/column_L_copy_24x24.png |binary
icon-themes/galaxy/sw/res/sidebar/pageproppanel/column_L_left_24x24.png |binary
icon-themes/galaxy/sw/res/sidebar/pageproppanel/column_L_right_24x24.png |binary
icon-themes/galaxy/sw/res/sidebar/pageproppanel/columncopy_24x24.png |binary
icon-themes/galaxy/sw/res/sidebar/pageproppanel/columnleft_24x24.png |binary
icon-themes/galaxy/sw/res/sidebar/pageproppanel/columnright_24x24.png |binary
icon-themes/galaxy/sw/res/sidebar/pageproppanel/documentsizeA3_24x24.png |binary
icon-themes/galaxy/sw/res/sidebar/pageproppanel/documentsizeA4_24x24.png |binary
icon-themes/galaxy/sw/res/sidebar/pageproppanel/documentsizeA5_24x24.png |binary
icon-themes/galaxy/sw/res/sidebar/pageproppanel/documentsizeB4_24x24.png |binary
icon-themes/galaxy/sw/res/sidebar/pageproppanel/documentsizeB5_24x24.png |binary
icon-themes/galaxy/sw/res/sidebar/pageproppanel/documentsizeC5_24x24.png |binary
icon-themes/galaxy/sw/res/sidebar/pageproppanel/documentsize_L_A3_24x24.png |binary
icon-themes/galaxy/sw/res/sidebar/pageproppanel/documentsize_L_A4_24x24.png |binary
icon-themes/galaxy/sw/res/sidebar/pageproppanel/documentsize_L_A5_24x24.png |binary
icon-themes/galaxy/sw/res/sidebar/pageproppanel/documentsize_L_B4_24x24.png |binary
icon-themes/galaxy/sw/res/sidebar/pageproppanel/documentsize_L_B5_24x24.png |binary
icon-themes/galaxy/sw/res/sidebar/pageproppanel/documentsize_L_C5_24x24.png |binary
icon-themes/galaxy/sw/res/sidebar/pageproppanel/documentsize_L_copy_24x24.png |binary
icon-themes/galaxy/sw/res/sidebar/pageproppanel/documentsizecopy_24x24.png |binary
icon-themes/galaxy/sw/res/sidebar/pageproppanel/format_L_copy_24x24.png |binary
icon-themes/galaxy/sw/res/sidebar/pageproppanel/format_L_mirror_24x24.png |binary
icon-themes/galaxy/sw/res/sidebar/pageproppanel/format_L_narrow_24x24.png |binary
icon-themes/galaxy/sw/res/sidebar/pageproppanel/format_L_nomal_24x24.png |binary
icon-themes/galaxy/sw/res/sidebar/pageproppanel/format_L_wide_24x24.png |binary
icon-themes/galaxy/sw/res/sidebar/pageproppanel/formatcopy_24x24.png |binary
icon-themes/galaxy/sw/res/sidebar/pageproppanel/formatmirror_24x24.png |binary
icon-themes/galaxy/sw/res/sidebar/pageproppanel/formatnarrow_24x24.png |binary
icon-themes/galaxy/sw/res/sidebar/pageproppanel/formatnormal_24x24.png |binary
icon-themes/galaxy/sw/res/sidebar/pageproppanel/formatwide_24x24.png |binary
icon-themes/galaxy/sw/res/sidebar/pageproppanel/last_custom_common.png |binary
icon-themes/galaxy/sw/res/sidebar/pageproppanel/last_custom_common_grey.png |binary
icon-themes/galaxy/sw/res/sidebar/pageproppanel/portraitcopy_24x24.png |binary
icon-themes/hicontrast/cmd/lc_characterbackgroundpattern.png |binary
icon-themes/hicontrast/cmd/lc_fliphorizontal.png |binary
icon-themes/hicontrast/cmd/lc_flipvertical.png |binary
icon-themes/hicontrast/cmd/lc_spacing.png |binary
icon-themes/hicontrast/sc/res/sidebar/CellBorderLineStyle_005.png |binary
icon-themes/hicontrast/sc/res/sidebar/CellBorderLineStyle_110.png |binary
icon-themes/hicontrast/sc/res/sidebar/CellBorderLineStyle_250.png |binary
icon-themes/hicontrast/sc/res/sidebar/CellBorderLineStyle_260.png |binary
icon-themes/hicontrast/sc/res/sidebar/CellBorderLineStyle_400.png |binary
icon-themes/hicontrast/sc/res/sidebar/CellBorderLineStyle_450.png |binary
icon-themes/hicontrast/sc/res/sidebar/CellBorderLineStyle_500.png |binary
icon-themes/hicontrast/sc/res/sidebar/CellBorderLineStyle_505.png |binary
icon-themes/hicontrast/sc/res/sidebar/CellBorderLineStyle_750.png |binary
icon-themes/hicontrast/sc/res/sidebar/CellBorder_All_18x18.png |binary
icon-themes/hicontrast/sc/res/sidebar/CellBorder_Bottom_18x18.png |binary
icon-themes/hicontrast/sc/res/sidebar/CellBorder_Bottom_Double_18x18.png |binary
icon-themes/hicontrast/sc/res/sidebar/CellBorder_Bottom_Thick_18x18.png |binary
icon-themes/hicontrast/sc/res/sidebar/CellBorder_Empty_18x18.png |binary
icon-themes/hicontrast/sc/res/sidebar/CellBorder_FourBorders_18x18.png |binary
icon-themes/hicontrast/sc/res/sidebar/CellBorder_FourBorders_Thick_18x18.png |binary
icon-themes/hicontrast/sc/res/sidebar/CellBorder_LeftAndRight_18x18.png |binary
icon-themes/hicontrast/sc/res/sidebar/CellBorder_LeftDiagonal_18x18.png |binary
icon-themes/hicontrast/sc/res/sidebar/CellBorder_Left_18x18.png |binary
icon-themes/hicontrast/sc/res/sidebar/CellBorder_RightDiagonal_18x18.png |binary
icon-themes/hicontrast/sc/res/sidebar/CellBorder_Right_18x18.png |binary
icon-themes/hicontrast/sc/res/sidebar/CellBorder_TopAndBottom_18x18.png |binary
icon-themes/hicontrast/sc/res/sidebar/CellBorder_TopSingle_BottomDouble_18x18.png |binary
icon-themes/hicontrast/sc/res/sidebar/CellBorder_TopThin_BottomThick_18x18.png |binary
icon-themes/hicontrast/sc/res/sidebar/CellBorder_Top_18x18.png |binary
icon-themes/hicontrast/sc/res/sidebar/fill_color.png |binary
icon-themes/hicontrast/sfx2/res/grip.png |binary
icon-themes/hicontrast/sfx2/res/menu.png |binary
icon-themes/hicontrast/sfx2/res/symphony/morebutton.png |binary
icon-themes/hicontrast/sfx2/res/symphony/sidebar-3d-large.png |binary
icon-themes/hicontrast/sfx2/res/symphony/sidebar-3d-small.png |binary
icon-themes/hicontrast/sfx2/res/symphony/sidebar-animation-large.png |binary
icon-themes/hicontrast/sfx2/res/symphony/sidebar-animation-small.png |binary
icon-themes/hicontrast/sfx2/res/symphony/sidebar-colors-large.png |binary
icon-themes/hicontrast/sfx2/res/symphony/sidebar-colors-small.png |binary
icon-themes/hicontrast/sfx2/res/symphony/sidebar-eyedropper-large.png |binary
icon-themes/hicontrast/sfx2/res/symphony/sidebar-eyedropper-small.png |binary
icon-themes/hicontrast/sfx2/res/symphony/sidebar-functions-large.png |binary
icon-themes/hicontrast/sfx2/res/symphony/sidebar-functions-small.png |binary
icon-themes/hicontrast/sfx2/res/symphony/sidebar-gallery-large.png |binary
icon-themes/hicontrast/sfx2/res/symphony/sidebar-gallery-small.png |binary
icon-themes/hicontrast/sfx2/res/symphony/sidebar-imganim-large.png |binary
icon-themes/hicontrast/sfx2/res/symphony/sidebar-imganim-small.png |binary
icon-themes/hicontrast/sfx2/res/symphony/sidebar-navigator-large.png |binary
icon-themes/hicontrast/sfx2/res/symphony/sidebar-navigator-small.png |binary
icon-themes/hicontrast/sfx2/res/symphony/sidebar-property-large.png |binary
icon-themes/hicontrast/sfx2/res/symphony/sidebar-property-small.png |binary
icon-themes/hicontrast/sfx2/res/symphony/sidebar-style-large.png |binary
icon-themes/hicontrast/sfx2/res/symphony/sidebar-style-small.png |binary
icon-themes/hicontrast/sfx2/res/symphony/sidebar-template-large.png |binary
icon-themes/hicontrast/sfx2/res/symphony/sidebar-template-small.png |binary
icon-themes/hicontrast/sfx2/res/symphony/sidebar-transition-large.png |binary
icon-themes/hicontrast/sfx2/res/symphony/sidebar-transition-small.png |binary
icon-themes/hicontrast/svx/res/rotation.png |binary
icon-themes/hicontrast/svx/res/symphony/Quadratic.png |binary
icon-themes/hicontrast/svx/res/symphony/Square.png |binary
icon-themes/hicontrast/svx/res/symphony/__morebutton.bmp |binary
icon-themes/hicontrast/svx/res/symphony/axial.png |binary
icon-themes/hicontrast/svx/res/symphony/ellipsoid.png |binary
icon-themes/hicontrast/svx/res/symphony/fill_color.png |binary
icon-themes/hicontrast/svx/res/symphony/line1.png |binary
icon-themes/hicontrast/svx/res/symphony/line10.png |binary
icon-themes/hicontrast/svx/res/symphony/line2.png |binary
icon-themes/hicontrast/svx/res/symphony/line3.png |binary
icon-themes/hicontrast/svx/res/symphony/line4.png |binary
icon-themes/hicontrast/svx/res/symphony/line5.png |binary
icon-themes/hicontrast/svx/res/symphony/line6.png |binary
icon-themes/hicontrast/svx/res/symphony/line7.png |binary
icon-themes/hicontrast/svx/res/symphony/line8.png |binary
icon-themes/hicontrast/svx/res/symphony/line9.png |binary
icon-themes/hicontrast/svx/res/symphony/linear.png |binary
icon-themes/hicontrast/svx/res/symphony/radial.png |binary
icon-themes/hicontrast/svx/res/symphony/rotation.png |binary
icon-themes/hicontrast/svx/res/symphony/width1.png |binary
icon-themes/hicontrast/svx/res/symphony/width2.png |binary
icon-themes/hicontrast/svx/res/symphony/width3.png |binary
icon-themes/hicontrast/svx/res/symphony/width4.png |binary
icon-themes/hicontrast/svx/res/symphony/width5.png |binary
icon-themes/hicontrast/svx/res/symphony/width6.png |binary
icon-themes/hicontrast/svx/res/symphony/width7.png |binary
icon-themes/hicontrast/svx/res/symphony/width8.png |binary
include/editeng/outliner.hxx | 6
include/sfx2/navigat.hxx | 2
include/sfx2/sfx.hrc | 1
include/sfx2/sfxsids.hrc | 1
include/sfx2/shell.hxx | 2
include/sfx2/sidebar/CommandInfoProvider.hxx | 94
include/sfx2/sidebar/ContextChangeBroadcaster.hxx | 58
include/sfx2/sidebar/ControlFactory.hxx | 59
include/sfx2/sidebar/ControllerFactory.hxx | 47
include/sfx2/sidebar/ControllerItem.hxx | 137
include/sfx2/sidebar/EnumContext.hxx | 176
include/sfx2/sidebar/IContextChangeReceiver.hxx | 38
include/sfx2/sidebar/ILayoutableWindow.hxx | 45
include/sfx2/sidebar/PopupContainer.hxx | 37
include/sfx2/sidebar/ResourceDefinitions.hrc | 137
include/sfx2/sidebar/SidebarChildWindow.hxx | 52
include/sfx2/sidebar/SidebarPanelBase.hxx | 125
include/sfx2/sidebar/SidebarToolBox.hxx | 101
include/sfx2/sidebar/Theme.hxx | 279 +
include/sfx2/sidebar/Tools.hxx | 68
include/sfx2/styfitem.hxx | 3
include/sfx2/templdlg.hxx | 26
include/sfx2/viewfrm.hxx | 3
include/svtools/accessibilityoptions.hxx | 17
include/svtools/miscopt.hxx | 3
include/svtools/valueset.hxx | 32
include/svx/AffineMatrixItem.hxx | 54
include/svx/SvxColorChildWindow.hxx | 40
include/svx/SvxColorValueSet.hxx | 51
include/svx/XPropertyEntry.hxx | 47
include/svx/colrctrl.hxx | 36
include/svx/dialcontrol.hxx | 68
include/svx/dialogs.hrc | 110
include/svx/dlgctrl.hxx | 53
include/svx/dlgutil.hxx | 1
include/svx/galbrws.hxx | 6
include/svx/nbdtmg.hxx | 376 +
include/svx/nbdtmgfact.hxx | 33
include/svx/sdr/table/tablecontroller.hxx | 159
include/svx/sidebar/ColorControl.hxx | 83
include/svx/sidebar/ColorPopup.hxx | 51
include/svx/sidebar/ContextChangeEventMultiplexer.hxx | 65
include/svx/sidebar/Popup.hxx | 103
include/svx/sidebar/PopupContainer.hxx | 44
include/svx/sidebar/PopupControl.hxx | 47
include/svx/sidebar/SelectionAnalyzer.hxx | 67
include/svx/sidebar/SelectionChangeHandler.hxx | 85
include/svx/sidebar/SidebarDialControl.hxx | 41
include/svx/sidebar/ValueSetWithTextControl.hxx | 157
include/svx/svdedtv.hxx | 1
include/svx/svdedxv.hxx | 3
include/svx/svdobj.hxx | 4
include/svx/svdogrp.hxx | 3
include/svx/svdstr.hrc | 1
include/svx/svxids.hrc | 32
include/svx/xenum.hxx | 8
include/svx/xlinjoit.hxx | 9
include/svx/xlncapit.hxx | 2
include/svx/xtable.hxx | 131
include/vcl/bitmap.hxx | 31
include/vcl/button.hxx | 10
include/vcl/combobox.hxx | 1
include/vcl/lstbox.hxx | 19
include/vcl/settings.hxx | 97
include/vcl/split.hxx | 4
include/vcl/window.hxx | 8
offapi/UnoApi_offapi.mk | 7
offapi/com/sun/star/ui/ContextChangeEventMultiplexer.idl | 35
offapi/com/sun/star/ui/ContextChangeEventObject.idl | 47
offapi/com/sun/star/ui/LayoutSize.idl | 46
offapi/com/sun/star/ui/XContextChangeEventListener.idl | 43
offapi/com/sun/star/ui/XContextChangeEventMultiplexer.idl | 125
offapi/com/sun/star/ui/XContextChangeListener.idl | 45
offapi/com/sun/star/ui/XSidebar.idl | 40
offapi/com/sun/star/ui/XSidebarPanel.idl | 58
offapi/com/sun/star/util/EventMultiplexer.idl | 35
officecfg/Configuration_officecfg.mk | 1
officecfg/files.mk | 1
officecfg/registry/data/org/openoffice/Office/Impress.xcu | 22
officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu | 15
officecfg/registry/data/org/openoffice/Office/UI/Factories.xcu | 56
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 108
officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu | 991 ++++
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu | 18
officecfg/registry/schema/org/openoffice/Office/Common.xcs | 50
officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs | 237 +
postprocess/CustomTarget_registry.mk | 2
sc/AllLangResTarget_sc.mk | 3
sc/Library_sc.mk | 10
sc/inc/ScPanelFactory.hxx | 66
sc/inc/helpids.h | 68
sc/inc/sc.hrc | 21
sc/sdi/cellsh.sdi | 3
sc/sdi/drawsh.sdi | 25
sc/sdi/drtxtob.sdi | 15
sc/sdi/editsh.sdi | 2
sc/sdi/formatsh.sdi | 6
sc/sdi/scalc.sdi | 77
sc/source/core/data/docpool.cxx | 3
sc/source/filter/excel/xiescher.cxx | 2
sc/source/ui/app/inputhdl.cxx | 6
sc/source/ui/app/scdll.cxx | 2
sc/source/ui/app/scmod.cxx | 3
sc/source/ui/app/typemap.cxx | 8
sc/source/ui/docshell/docfunc.cxx | 5
sc/source/ui/drawfunc/chartsh.cxx | 7
sc/source/ui/drawfunc/drawsh.cxx | 28
sc/source/ui/drawfunc/drawsh2.cxx | 51
sc/source/ui/drawfunc/drawsh5.cxx | 4
sc/source/ui/drawfunc/drformsh.cxx | 4
sc/source/ui/drawfunc/drtxtob.cxx | 235 +
sc/source/ui/drawfunc/drtxtob1.cxx | 6
sc/source/ui/drawfunc/futext.cxx | 9
sc/source/ui/drawfunc/graphsh.cxx | 3
sc/source/ui/drawfunc/mediash.cxx | 2
sc/source/ui/drawfunc/oleobjsh.cxx | 8
sc/source/ui/formdlg/dwfunctr.cxx | 5
sc/source/ui/inc/chartsh.hxx | 2
sc/source/ui/inc/drawsh.hxx | 9
sc/source/ui/inc/drawview.hxx | 13
sc/source/ui/inc/drformsh.hxx | 3
sc/source/ui/inc/drtxtob.hxx | 3
sc/source/ui/inc/formatsh.hxx | 3
sc/source/ui/inc/navipi.hxx | 4
sc/source/ui/inc/oleobjsh.hxx | 1
sc/source/ui/inc/tabbgcolordlg.hxx | 4
sc/source/ui/miscdlgs/tabbgcolordlg.cxx | 90
sc/source/ui/navipi/navipi.cxx | 64
sc/source/ui/sidebar/AlignmentPropertyPanel.cxx | 635 +++
sc/source/ui/sidebar/AlignmentPropertyPanel.hrc | 84
sc/source/ui/sidebar/AlignmentPropertyPanel.hxx | 126
sc/source/ui/sidebar/AlignmentPropertyPanel.src | 213 +
sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx | 868 ++++
sc/source/ui/sidebar/CellAppearancePropertyPanel.hrc | 114
sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx | 197
sc/source/ui/sidebar/CellAppearancePropertyPanel.src | 495 ++
sc/source/ui/sidebar/CellBorderStyleControl.cxx | 344 +
sc/source/ui/sidebar/CellBorderStyleControl.hxx | 56
sc/source/ui/sidebar/CellBorderStylePopup.cxx | 37
sc/source/ui/sidebar/CellBorderStylePopup.hxx | 39
sc/source/ui/sidebar/CellBorderUpdater.cxx | 122
sc/source/ui/sidebar/CellBorderUpdater.hxx | 42
sc/source/ui/sidebar/CellLineStyleControl.cxx | 254 +
sc/source/ui/sidebar/CellLineStyleControl.hxx | 68
sc/source/ui/sidebar/CellLineStylePopup.cxx | 49
sc/source/ui/sidebar/CellLineStylePopup.hxx | 41
sc/source/ui/sidebar/CellLineStyleValueSet.cxx | 179
sc/source/ui/sidebar/CellLineStyleValueSet.hxx | 50
sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx | 397 +
sc/source/ui/sidebar/NumberFormatPropertyPanel.hrc | 65
sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx | 97
sc/source/ui/sidebar/NumberFormatPropertyPanel.src | 163
sc/source/ui/sidebar/ScPanelFactory.cxx | 168
sc/source/ui/unoobj/appluno.cxx | 112
sc/source/ui/view/auditsh.cxx | 3
sc/source/ui/view/cellsh.cxx | 3
sc/source/ui/view/cellsh3.cxx | 12
sc/source/ui/view/drawview.cxx | 61
sc/source/ui/view/editsh.cxx | 60
sc/source/ui/view/formatsh.cxx | 530 ++
sc/source/ui/view/gridwin.cxx | 26
sc/source/ui/view/pivotsh.cxx | 2
sc/source/ui/view/tabview3.cxx | 27
sc/source/ui/view/tabvwsh.cxx | 2
sc/source/ui/view/tabvwsh4.cxx | 5
sc/source/ui/view/viewfunc.cxx | 5
sc/uiconfig/scalc/menubar/menubar.xml | 1
sc/util/sc.component | 3
sd/Library_sd.mk | 18
sd/inc/glob.hrc | 8
sd/inc/glob.hxx | 4
sd/sdi/_drvwsh.sdi | 247 +
sd/sdi/drtxtob.sdi | 12
sd/sdi/outlnvsh.sdi | 15
sd/sdi/sdslots.sdi | 2
sd/source/core/glob.src | 8
sd/source/core/typemap.cxx | 7
sd/source/ui/animations/CustomAnimationPane.cxx | 55
sd/source/ui/animations/CustomAnimationPane.hxx | 4
sd/source/ui/animations/SlideTransitionPane.cxx | 41
sd/source/ui/animations/SlideTransitionPane.hxx | 5
sd/source/ui/app/sddll1.cxx | 1
sd/source/ui/app/sddll2.cxx | 4
sd/source/ui/app/sdmod1.cxx | 2
sd/source/ui/dlg/NavigatorChildWindow.cxx | 28
sd/source/ui/dlg/PaneChildWindows.cxx | 10
sd/source/ui/dlg/PaneShells.cxx | 3
sd/source/ui/dlg/navigatr.cxx | 68
sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx | 13
sd/source/ui/framework/configuration/ResourceFactoryManager.cxx | 15
sd/source/ui/framework/factories/BasicPaneFactory.cxx | 2
sd/source/ui/framework/factories/BasicViewFactory.cxx | 18
sd/source/ui/framework/factories/Pane.cxx | 10
sd/source/ui/framework/factories/TaskPanelFactory.cxx | 4
sd/source/ui/framework/factories/TaskPanelResource.cxx | 129
sd/source/ui/framework/factories/ViewShellWrapper.cxx | 2
sd/source/ui/framework/module/ImpressModule.cxx | 10
sd/source/ui/framework/module/ModuleController.cxx | 17
sd/source/ui/framework/module/ToolPanelModule.cxx | 5
sd/source/ui/framework/module/ToolPanelModule.hxx | 2
sd/source/ui/framework/tools/FrameworkHelper.cxx | 194
sd/source/ui/func/fuarea.cxx | 2
sd/source/ui/func/fuchar.cxx | 9
sd/source/ui/func/fuline.cxx | 15
sd/source/ui/func/fuolbull.cxx | 407 +
sd/source/ui/func/fuoltext.cxx | 3
sd/source/ui/func/fuparagr.cxx | 2
sd/source/ui/func/futext.cxx | 18
sd/source/ui/inc/DrawController.hxx | 5
sd/source/ui/inc/DrawViewShell.hxx | 14
sd/source/ui/inc/PaneChildWindows.hxx | 17
sd/source/ui/inc/SidebarPanelId.hxx | 49
sd/source/ui/inc/SlideSorterViewShell.hxx | 1
sd/source/ui/inc/TextObjectBar.hxx | 1
sd/source/ui/inc/View.hxx | 3
sd/source/ui/inc/ViewShell.hxx | 5
sd/source/ui/inc/framework/FrameworkHelper.hxx | 130
sd/source/ui/inc/framework/Pane.hxx | 1
sd/source/ui/inc/framework/TaskPanelResource.hxx | 81
sd/source/ui/inc/fuolbull.hxx | 7
sd/source/ui/inc/navigatr.hxx | 22
sd/source/ui/presenter/PresenterHelper.hxx | 2
sd/source/ui/sidebar/AllMasterPagesSelector.cxx | 229 +
sd/source/ui/sidebar/AllMasterPagesSelector.hxx | 95
sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx | 352 +
sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx | 88
sd/source/ui/sidebar/CustomAnimationPanel.cxx | 74
sd/source/ui/sidebar/CustomAnimationPanel.hxx | 46
sd/source/ui/sidebar/DocumentHelper.cxx | 570 ++
sd/source/ui/sidebar/DocumentHelper.hxx | 110
sd/source/ui/sidebar/IDisposable.hxx | 39
sd/source/ui/sidebar/ISidebarReceiver.hxx | 37
sd/source/ui/sidebar/LayoutMenu.cxx | 912 ++++
sd/source/ui/sidebar/LayoutMenu.hxx | 214 +
sd/source/ui/sidebar/MasterPageContainer.cxx | 1211 +++++
sd/source/ui/sidebar/MasterPageContainer.hxx | 208 +
sd/source/ui/sidebar/MasterPageContainerFiller.cxx | 189
sd/source/ui/sidebar/MasterPageContainerFiller.hxx | 92
sd/source/ui/sidebar/MasterPageContainerProviders.cxx | 403 +
sd/source/ui/sidebar/MasterPageContainerProviders.hxx | 192
sd/source/ui/sidebar/MasterPageContainerQueue.cxx | 299 +
sd/source/ui/sidebar/MasterPageContainerQueue.hxx | 134
sd/source/ui/sidebar/MasterPageDescriptor.cxx | 415 ++
sd/source/ui/sidebar/MasterPageDescriptor.hxx | 235 +
sd/source/ui/sidebar/MasterPagesSelector.cxx | 845 ++++
sd/source/ui/sidebar/MasterPagesSelector.hxx | 238 +
sd/source/ui/sidebar/NavigatorWrapper.cxx | 84
sd/source/ui/sidebar/NavigatorWrapper.hxx | 68
sd/source/ui/sidebar/PanelBase.cxx | 133
sd/source/ui/sidebar/PanelBase.hxx | 86
sd/source/ui/sidebar/PanelFactory.cxx | 221 +
sd/source/ui/sidebar/PanelFactory.hxx | 84
sd/source/ui/sidebar/PreviewValueSet.cxx | 180
sd/source/ui/sidebar/PreviewValueSet.hxx | 69
sd/source/ui/sidebar/RecentMasterPagesSelector.cxx | 178
sd/source/ui/sidebar/RecentMasterPagesSelector.hxx | 77
sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx | 479 ++
sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx | 119
sd/source/ui/sidebar/SidebarFocusManager.hxx | 130
sd/source/ui/sidebar/SidebarShellManager.cxx | 176
sd/source/ui/sidebar/SidebarShellManager.hxx | 116
sd/source/ui/sidebar/SlideTransitionPanel.cxx | 71
sd/source/ui/sidebar/SlideTransitionPanel.hxx | 46
sd/source/ui/sidebar/TableDesignPanel.cxx | 69
sd/source/ui/sidebar/TableDesignPanel.hxx | 45
sd/source/ui/slideshow/slideshowimpl.cxx | 2
sd/source/ui/slidesorter/controller/SlsSlotManager.cxx | 3
sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx | 53
sd/source/ui/table/TableDesignPane.cxx | 104
sd/source/ui/table/TableDesignPane.hxx | 7
sd/source/ui/table/TableDesignPane.src | 16
sd/source/ui/table/tablefunction.cxx | 2
sd/source/ui/table/tableobjectbar.cxx | 4
sd/source/ui/toolpanel/ToolPanelViewShell.cxx | 4
sd/source/ui/unoidl/DrawController.cxx | 50
sd/source/ui/unoidl/facreg.cxx | 27
sd/source/ui/view/ToolBarManager.cxx | 1
sd/source/ui/view/ViewShellBase.cxx | 12
sd/source/ui/view/ViewShellImplementation.cxx | 5
sd/source/ui/view/ViewShellManager.cxx | 61
sd/source/ui/view/drtxtob.cxx | 45
sd/source/ui/view/drtxtob1.cxx | 81
sd/source/ui/view/drviews1.cxx | 7
sd/source/ui/view/drviews2.cxx | 440 +-
sd/source/ui/view/drviews3.cxx | 93
sd/source/ui/view/drviews6.cxx | 2
sd/source/ui/view/drviews7.cxx | 7
sd/source/ui/view/drviews9.cxx | 42
sd/source/ui/view/drviewsa.cxx | 39
sd/source/ui/view/drviewsf.cxx | 276 +
sd/source/ui/view/drviewsj.cxx | 8
sd/source/ui/view/drvwshrg.cxx | 5
sd/source/ui/view/outlnvs2.cxx | 14
sd/source/ui/view/outlnvsh.cxx | 5
sd/source/ui/view/sdview.cxx | 193
sd/source/ui/view/viewshel.cxx | 101
sd/uiconfig/sdraw/menubar/menubar.xml | 1
sd/uiconfig/simpress/menubar/menubar.xml | 1
sd/util/sd.component | 3
sfx2/AllLangResTarget_sfx2.mk | 1
sfx2/Library_sfx.mk | 35
sfx2/sdi/frmslots.sdi | 5
sfx2/sdi/sfx.sdi | 26
sfx2/source/control/bindings.cxx | 2
sfx2/source/control/shell.cxx | 16
sfx2/source/dialog/dialog.src | 4
sfx2/source/dialog/dockwin.cxx | 8
sfx2/source/dialog/taskpane.cxx | 2
sfx2/source/dialog/templdlg.cxx | 190
sfx2/source/inc/helpid.hrc | 2
sfx2/source/inc/templdgi.hxx | 12
sfx2/source/sidebar/AsynchronousCall.cxx | 87
sfx2/source/sidebar/AsynchronousCall.hxx | 51
sfx2/source/sidebar/CommandInfoProvider.cxx | 354 +
sfx2/source/sidebar/Context.cxx | 116
sfx2/source/sidebar/Context.hxx | 65
sfx2/source/sidebar/ContextChangeBroadcaster.cxx | 134
sfx2/source/sidebar/ContextList.cxx | 112
sfx2/source/sidebar/ContextList.hxx | 72
sfx2/source/sidebar/ContextMatcher.cxx | 136
sfx2/source/sidebar/ContextMatcher.hxx | 71
sfx2/source/sidebar/ControlFactory.cxx | 98
sfx2/source/sidebar/ControllerFactory.cxx | 103
sfx2/source/sidebar/ControllerItem.cxx | 225 +
sfx2/source/sidebar/CustomImageRadioButton.cxx | 74
sfx2/source/sidebar/CustomImageRadioButton.hxx | 45
sfx2/source/sidebar/Deck.cxx | 467 ++
sfx2/source/sidebar/Deck.hxx | 110
sfx2/source/sidebar/DeckConfiguration.cxx | 51
sfx2/source/sidebar/DeckConfiguration.hxx | 45
sfx2/source/sidebar/DeckDescriptor.cxx | 57
sfx2/source/sidebar/DeckDescriptor.hxx | 51
sfx2/source/sidebar/DeckLayouter.cxx | 511 ++
sfx2/source/sidebar/DeckLayouter.hxx | 119
sfx2/source/sidebar/DeckTitleBar.cxx | 146
sfx2/source/sidebar/DeckTitleBar.hxx | 57
sfx2/source/sidebar/DrawHelper.cxx | 170
sfx2/source/sidebar/DrawHelper.hxx | 67
sfx2/source/sidebar/EnumContext.cxx | 350 +
sfx2/source/sidebar/FocusManager.cxx | 622 +++
sfx2/source/sidebar/FocusManager.hxx | 139
sfx2/source/sidebar/IContextChangeReceiver.cxx | 28
sfx2/source/sidebar/ILayoutableWindow.cxx | 28
sfx2/source/sidebar/MenuButton.cxx | 150
sfx2/source/sidebar/MenuButton.hxx | 52
sfx2/source/sidebar/Paint.cxx | 136
sfx2/source/sidebar/Paint.hxx | 80
sfx2/source/sidebar/Panel.cxx | 284 +
sfx2/source/sidebar/Panel.hxx | 90
sfx2/source/sidebar/PanelDescriptor.cxx | 60
sfx2/source/sidebar/PanelDescriptor.hxx | 52
sfx2/source/sidebar/PanelTitleBar.cxx | 200
sfx2/source/sidebar/PanelTitleBar.hxx | 63
sfx2/source/sidebar/PopupContainer.cxx | 50
sfx2/source/sidebar/ResourceManager.cxx | 691 +++
sfx2/source/sidebar/ResourceManager.hxx | 138
sfx2/source/sidebar/Sidebar.cxx | 77
sfx2/source/sidebar/Sidebar.hrc | 56
sfx2/source/sidebar/Sidebar.hxx | 64
sfx2/source/sidebar/Sidebar.src | 167
sfx2/source/sidebar/SidebarChildWindow.cxx | 85
sfx2/source/sidebar/SidebarController.cxx | 1186 +++++
sfx2/source/sidebar/SidebarController.hxx | 226 +
sfx2/source/sidebar/SidebarDockingWindow.cxx | 105
sfx2/source/sidebar/SidebarDockingWindow.hxx | 62
sfx2/source/sidebar/SidebarPanel.cxx | 171
sfx2/source/sidebar/SidebarPanel.hxx | 74
sfx2/source/sidebar/SidebarPanelBase.cxx | 243 +
sfx2/source/sidebar/SidebarResource.hxx | 35
sfx2/source/sidebar/SidebarToolBox.cxx | 365 +
sfx2/source/sidebar/TabBar.cxx | 403 +
sfx2/source/sidebar/TabBar.hxx | 122
sfx2/source/sidebar/TabItem.cxx | 142
sfx2/source/sidebar/TabItem.hxx | 54
sfx2/source/sidebar/Theme.cxx | 1156 +++++
sfx2/source/sidebar/TitleBar.cxx | 235 +
sfx2/source/sidebar/TitleBar.hxx | 75
sfx2/source/sidebar/ToolBox.hxx | 52
sfx2/source/sidebar/ToolBoxBackground.cxx | 133
sfx2/source/sidebar/ToolBoxBackground.hxx | 65
sfx2/source/sidebar/Tools.cxx | 182
sfx2/source/view/viewfrm.cxx | 63
svtools/source/config/accessibilityoptions.cxx | 201
svtools/source/config/miscopt.cxx | 36
svtools/source/control/ctrlbox.cxx | 32
svtools/source/control/valueset.cxx | 39
svx/AllLangResTarget_svx.mk | 10
svx/Library_svx.mk | 45
svx/Library_svxcore.mk | 4
svx/inc/GalleryControl.hxx | 75
svx/inc/galbrws2.hxx | 5
svx/inc/helpid.hrc | 125
svx/inc/sidebar/PanelFactory.hxx | 70
svx/sdi/svx.sdi | 769 +++
svx/sdi/xoitems.sdi | 26
svx/source/dialog/dialcontrol.cxx | 98
svx/source/dialog/dlgctrl.cxx | 480 --
svx/source/dialog/dlgutil.cxx | 5
svx/source/dialog/sdstring.src | 24
svx/source/dialog/svxbmpnumvalueset.src | 3
svx/source/gallery2/GalleryControl.cxx | 290 +
svx/source/gallery2/GallerySplitter.cxx | 50
svx/source/gallery2/GallerySplitter.hxx | 41
svx/source/gallery2/galbrws.cxx | 142
svx/source/gallery2/galbrws1.cxx | 19
svx/source/gallery2/galbrws1.hxx | 15
svx/source/gallery2/galbrws2.cxx | 14
svx/source/inc/linectrl.hrc | 21
svx/source/items/svxitems.src | 2
svx/source/sdr/attribute/sdrformtextattribute.cxx | 15
svx/source/sdr/primitive2d/sdrattributecreator.cxx | 45
svx/source/sidebar/ColorPanel.cxx | 229 +
svx/source/sidebar/ColorPanel.hxx | 60
svx/source/sidebar/ContextChangeEventMultiplexer.cxx | 86
svx/source/sidebar/EmptyPanel.cxx | 75
svx/source/sidebar/EmptyPanel.hrc | 25
svx/source/sidebar/EmptyPanel.hxx | 50
svx/source/sidebar/EmptyPanel.src | 29
svx/source/sidebar/PanelFactory.cxx | 213 +
svx/source/sidebar/SelectionAnalyzer.cxx | 479 ++
svx/source/sidebar/SelectionChangeHandler.cxx | 115
svx/source/sidebar/area/AreaPropertyPanel.cxx | 1425 ++++++
svx/source/sidebar/area/AreaPropertyPanel.hrc | 82
svx/source/sidebar/area/AreaPropertyPanel.hxx | 194
svx/source/sidebar/area/AreaPropertyPanel.src | 389 +
svx/source/sidebar/area/AreaTransparencyGradientControl.cxx | 345 +
svx/source/sidebar/area/AreaTransparencyGradientControl.hxx | 74
svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx | 56
svx/source/sidebar/area/AreaTransparencyGradientPopup.hxx | 47
svx/source/sidebar/debug/ColorPanel.cxx | 228 +
svx/source/sidebar/debug/ColorPanel.hxx | 57
svx/source/sidebar/debug/ContextPanel.cxx | 64
svx/source/sidebar/debug/ContextPanel.hxx | 52
svx/source/sidebar/debug/NotYetImplementedPanel.cxx | 44
svx/source/sidebar/debug/NotYetImplementedPanel.hxx | 43
svx/source/sidebar/gallery/GalleryPanel.hxx | 27
svx/source/sidebar/graphic/GraphicPropertyPanel.cxx | 498 ++
svx/source/sidebar/graphic/GraphicPropertyPanel.hrc | 37
svx/source/sidebar/graphic/GraphicPropertyPanel.hxx | 124
svx/source/sidebar/graphic/GraphicPropertyPanel.src | 237 +
svx/source/sidebar/insert/InsertPropertyPanel.cxx | 152
svx/source/sidebar/insert/InsertPropertyPanel.hrc | 38
svx/source/sidebar/insert/InsertPropertyPanel.hxx | 60
svx/source/sidebar/insert/InsertPropertyPanel.src | 142
svx/source/sidebar/line/LinePropertyPanel.cxx | 1179 +++++
svx/source/sidebar/line/LinePropertyPanel.hrc | 77
svx/source/sidebar/line/LinePropertyPanel.hxx | 190
svx/source/sidebar/line/LinePropertyPanel.src | 388 +
svx/source/sidebar/line/LineStyleValueSet.cxx | 127
svx/source/sidebar/line/LineStyleValueSet.hxx | 47
svx/source/sidebar/line/LineWidthControl.cxx | 372 +
svx/source/sidebar/line/LineWidthControl.hxx | 71
svx/source/sidebar/line/LineWidthPopup.cxx | 83
svx/source/sidebar/line/LineWidthPopup.hxx | 49
svx/source/sidebar/line/LineWidthValueSet.cxx | 192
svx/source/sidebar/line/LineWidthValueSet.hxx | 53
svx/source/sidebar/nbdtmg.cxx | 2051 ++++++++++
svx/source/sidebar/nbdtmgfact.cxx | 48
svx/source/sidebar/paragraph/ParaBulletsControl.cxx | 128
svx/source/sidebar/paragraph/ParaBulletsControl.hxx | 56
svx/source/sidebar/paragraph/ParaBulletsPopup.cxx | 59
svx/source/sidebar/paragraph/ParaBulletsPopup.hxx | 49
svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx | 780 +++
svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx | 111
svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx | 78
svx/source/sidebar/paragraph/ParaLineSpacingPopup.hxx | 49
svx/source/sidebar/paragraph/ParaNumberingControl.cxx | 148
svx/source/sidebar/paragraph/ParaNumberingControl.hxx | 61
svx/source/sidebar/paragraph/ParaNumberingPopup.cxx | 60
svx/source/sidebar/paragraph/ParaNumberingPopup.hxx | 50
svx/source/sidebar/paragraph/ParaPropertyPanel.cxx | 1621 +++++++
svx/source/sidebar/paragraph/ParaPropertyPanel.hrc | 359 +
svx/source/sidebar/paragraph/ParaPropertyPanel.hxx | 273 +
svx/source/sidebar/paragraph/ParaPropertyPanel.src | 893 ++++
svx/source/sidebar/possize/PosSizePropertyPanel.cxx | 1279 ++++++
svx/source/sidebar/possize/PosSizePropertyPanel.hrc | 102
svx/source/sidebar/possize/PosSizePropertyPanel.hxx | 188
svx/source/sidebar/possize/PosSizePropertyPanel.src | 206 +
svx/source/sidebar/possize/SidebarDialControl.cxx | 82
svx/source/sidebar/possize/SidebarDialControlBmp.cxx | 87
svx/source/sidebar/possize/SidebarDialControlBmp.hxx | 43
svx/source/sidebar/text/SvxSBFontNameBox.cxx | 171
svx/source/sidebar/text/SvxSBFontNameBox.hxx | 76
svx/source/sidebar/text/TextCharacterSpacingControl.cxx | 466 ++
svx/source/sidebar/text/TextCharacterSpacingControl.hxx | 97
svx/source/sidebar/text/TextCharacterSpacingPopup.cxx | 75
svx/source/sidebar/text/TextCharacterSpacingPopup.hxx | 44
svx/source/sidebar/text/TextPropertyPanel.cxx | 1198 +++++
svx/source/sidebar/text/TextPropertyPanel.hrc | 185
svx/source/sidebar/text/TextPropertyPanel.hxx | 180
svx/source/sidebar/text/TextPropertyPanel.src | 632 +++
svx/source/sidebar/text/TextUnderlineControl.cxx | 239 +
svx/source/sidebar/text/TextUnderlineControl.hxx | 81
svx/source/sidebar/text/TextUnderlinePopup.cxx | 56
svx/source/sidebar/text/TextUnderlinePopup.hxx | 43
svx/source/sidebar/tools/ColorControl.cxx | 223 +
svx/source/sidebar/tools/ColorPopup.cxx | 56
svx/source/sidebar/tools/Popup.cxx | 148
svx/source/sidebar/tools/PopupContainer.cxx | 53
svx/source/sidebar/tools/PopupControl.cxx | 58
svx/source/sidebar/tools/ValueSetWithTextControl.cxx | 514 ++
svx/source/svdraw/svdedtv1.cxx | 186
svx/source/svdraw/svdedxv.cxx | 32
svx/source/svdraw/svdfmtf.cxx | 10
svx/source/svdraw/svdoashp.cxx | 4
svx/source/svdraw/svdobj.cxx | 21
svx/source/svdraw/svdogrp.cxx | 32
svx/source/svdraw/svdopath.cxx | 4
svx/source/svdraw/svdotext.cxx | 4
svx/source/svdraw/svdstr.src | 6
svx/source/table/accessibletableshape.cxx | 2
svx/source/table/tablecontroller.cxx | 3
svx/source/table/tablecontroller.hxx | 156
svx/source/tbxctrls/SvxColorChildWindow.cxx | 47
svx/source/tbxctrls/SvxColorValueSet.cxx | 167
svx/source/tbxctrls/colorwindow.hxx | 3
svx/source/tbxctrls/colrctrl.cxx | 94
svx/source/tbxctrls/fillctrl.cxx | 45
svx/source/tbxctrls/itemwin.cxx | 4
svx/source/tbxctrls/linectrl.cxx | 15
svx/source/tbxctrls/linectrl.src | 27
svx/source/tbxctrls/tbcontrl.cxx | 77
svx/source/tbxctrls/tbxcolorupdate.cxx | 16
svx/source/unodraw/unoctabl.cxx | 11
svx/source/xoutdev/XPropertyEntry.cxx | 38
svx/source/xoutdev/xattr.cxx | 4
svx/source/xoutdev/xattr2.cxx | 172
svx/source/xoutdev/xpool.cxx | 7
svx/source/xoutdev/xtabbtmp.cxx | 9
svx/source/xoutdev/xtabcolr.cxx | 9
svx/source/xoutdev/xtabdash.cxx | 99
svx/source/xoutdev/xtabgrdt.cxx | 49
svx/source/xoutdev/xtabhtch.cxx | 43
svx/source/xoutdev/xtable.cxx | 155
svx/source/xoutdev/xtablend.cxx | 48
svx/util/svx.component | 3
sw/AllLangResTarget_sw.mk | 2
sw/CppunitTest_sw_macros_test.mk | 1
sw/Library_sw.mk | 7
sw/inc/SwPanelFactory.hxx | 70
sw/inc/cmdid.h | 16
sw/inc/docsh.hxx | 30
sw/inc/editsh.hxx | 3
sw/inc/helpid.h | 29
sw/inc/rcid.hrc | 4
sw/inc/swabstdlg.hxx | 9
sw/inc/swcommands.h | 7
sw/sdi/_annotsh.sdi | 25
sw/sdi/_basesh.sdi | 6
sw/sdi/_frmsh.sdi | 27
sw/sdi/_grfsh.sdi | 10
sw/sdi/_tabsh.sdi | 7
sw/sdi/_textsh.sdi | 39
sw/sdi/_viewsh.sdi | 25
sw/sdi/drawsh.sdi | 58
sw/sdi/drwbassh.sdi | 1
sw/sdi/drwtxtsh.sdi | 44
sw/sdi/sidebar.sdi | 30
sw/sdi/swriter.sdi | 233 -
sw/sdi/swslots.sdi | 1
sw/sdi/wdrwbase.sdi | 1
sw/source/core/doc/docdesc.cxx | 15
sw/source/core/edit/ednumber.cxx | 83
sw/source/core/frmedt/feshview.cxx | 2
sw/source/ui/app/docst.cxx | 28
sw/source/ui/app/mn.src | 12
sw/source/ui/app/swmodule.cxx | 4
sw/source/ui/dialog/swdlgfact.cxx | 8
sw/source/ui/dialog/swdlgfact.hxx | 2
sw/source/ui/docvw/HeaderFooterWin.cxx | 2
sw/source/ui/fmtui/tmpdlg.cxx | 12
sw/source/ui/inc/drwbassh.hxx | 1
sw/source/ui/inc/drwtxtsh.hxx | 1
sw/source/ui/inc/textsh.hxx | 1
sw/source/ui/inc/tmpdlg.hxx | 11
sw/source/ui/inc/wrap.hxx | 1
sw/source/ui/misc/titlepage.cxx | 2
sw/source/ui/shells/annotsh.cxx | 105
sw/source/ui/shells/basesh.cxx | 12
sw/source/ui/shells/beziersh.cxx | 3
sw/source/ui/shells/drawdlg.cxx | 25
sw/source/ui/shells/drawsh.cxx | 28
sw/source/ui/shells/drformsh.cxx | 2
sw/source/ui/shells/drwbassh.cxx | 16
sw/source/ui/shells/drwtxtex.cxx | 97
sw/source/ui/shells/drwtxtsh.cxx | 75
sw/source/ui/shells/frmsh.cxx | 83
sw/source/ui/shells/grfsh.cxx | 20
sw/source/ui/shells/mediash.cxx | 2
sw/source/ui/shells/olesh.cxx | 3
sw/source/ui/shells/slotadd.cxx | 5
sw/source/ui/shells/tabsh.cxx | 25
sw/source/ui/shells/textsh.cxx | 2
sw/source/ui/shells/textsh1.cxx | 81
sw/source/ui/shells/txtattr.cxx | 14
sw/source/ui/shells/txtnum.cxx | 209 -
sw/source/ui/sidebar/PageColumnControl.cxx | 110
sw/source/ui/sidebar/PageColumnControl.hxx | 63
sw/source/ui/sidebar/PageMarginControl.cxx | 520 ++
sw/source/ui/sidebar/PageMarginControl.hxx | 120
sw/source/ui/sidebar/PageOrientationControl.cxx | 88
sw/source/ui/sidebar/PageOrientationControl.hxx | 54
sw/source/ui/sidebar/PagePropertyPanel.cxx | 798 +++
sw/source/ui/sidebar/PagePropertyPanel.hrc | 196
sw/source/ui/sidebar/PagePropertyPanel.hxx | 230 +
sw/source/ui/sidebar/PagePropertyPanel.src | 695 +++
sw/source/ui/sidebar/PageSizeControl.cxx | 181
sw/source/ui/sidebar/PageSizeControl.hxx | 69
sw/source/ui/sidebar/PropertyPanel.hrc | 32
sw/source/ui/sidebar/SwPanelFactory.cxx | 147
sw/source/ui/sidebar/WrapPropertyPanel.cxx | 242 +
sw/source/ui/sidebar/WrapPropertyPanel.hrc | 38
sw/source/ui/sidebar/WrapPropertyPanel.hxx | 85
sw/source/ui/sidebar/WrapPropertyPanel.src | 86
sw/source/ui/uiview/view0.cxx | 2
sw/source/ui/uiview/view1.cxx | 1
sw/source/ui/uiview/view2.cxx | 6
sw/source/ui/uiview/viewstat.cxx | 6
sw/source/ui/uiview/viewtab.cxx | 1133 +++--
sw/source/ui/uno/unofreg.cxx | 9
sw/source/ui/utlui/navipi.cxx | 159
sw/source/ui/wrtsh/wrtsh1.cxx | 2
sw/source/ui/wrtsh/wrtsh3.cxx | 7
sw/uiconfig/sglobal/menubar/menubar.xml | 3
sw/uiconfig/sweb/menubar/menubar.xml | 3
sw/uiconfig/swform/menubar/menubar.xml | 3
sw/uiconfig/swreport/menubar/menubar.xml | 5
sw/uiconfig/swriter/menubar/menubar.xml | 3
sw/uiconfig/swxform/menubar/menubar.xml | 3
sw/util/sw.component | 3
vcl/inc/ilstbox.hxx | 165
vcl/inc/window.h | 3
vcl/source/app/settings.cxx | 41
vcl/source/control/combobox.cxx | 15
vcl/source/control/ilstbox.cxx | 191
vcl/source/control/lstbox.cxx | 56
vcl/source/gdi/bitmap4.cxx | 192
vcl/source/window/split.cxx | 58
vcl/source/window/window.cxx | 6
vcl/source/window/window3.cxx | 22
970 files changed, 70464 insertions(+), 3096 deletions(-)
New commits:
commit cec1323e50dd6fb13b1c70d70195676521841608
Author: Michael Meeks <michael.meeks at suse.com>
Date: Mon May 20 10:04:41 2013 +0100
remove redundant mmeeks comments around the place for misc. code pointers.
Change-Id: I53cf0596b39b00b634724db701d784dd4ab12281
diff --git a/officecfg/registry/data/org/openoffice/Office/Impress.xcu b/officecfg/registry/data/org/openoffice/Office/Impress.xcu
index 4d5ab3f..ad5cbd9 100644
--- a/officecfg/registry/data/org/openoffice/Office/Impress.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Impress.xcu
@@ -150,7 +150,7 @@
</node>
<node oor:name="F3" oor:op="replace">
<prop oor:name="ServiceName">
- <value>com.sun.star.drawing.framework.TaskPanelFactory</value> <!-- MMeeks -->
+ <value>com.sun.star.drawing.framework.TaskPanelFactory</value>
</prop>
<node oor:name="ResourceList">
<node oor:name="R0a" oor:op="replace">
@@ -164,7 +164,7 @@
</prop>
</node>
<node oor:name="R0c" oor:op="replace">
- <prop oor:name="URL"> <!-- MMeeks renamed from UsedMasterPages -->
+ <prop oor:name="URL">
<value>private:resource/toolpanel/DrawingFramework/MasterPages</value>
</prop>
</node>
diff --git a/sd/source/ui/dlg/PaneChildWindows.cxx b/sd/source/ui/dlg/PaneChildWindows.cxx
index 3b12bf1..df79974 100644
--- a/sd/source/ui/dlg/PaneChildWindows.cxx
+++ b/sd/source/ui/dlg/PaneChildWindows.cxx
@@ -194,7 +194,7 @@ void ToolPanelChildWindow::ActivateToolPanel( const OUString& i_rPanelURL )
if ( i_rPanelURL.indexOf( framework::FrameworkHelper::msTaskPanelURLPrefix ) == 0 )
{
// it's one of our standard panels known to the drawing framework
- pFrameworkHelper->RequestSidebarPanel( i_rPanelURL ); // MMeeks
+ pFrameworkHelper->RequestSidebarPanel( i_rPanelURL );
}
else
{
diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx
index 00667d2..3fe13aa 100644
--- a/sd/source/ui/framework/tools/FrameworkHelper.cxx
+++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx
@@ -198,7 +198,9 @@ const OUString FrameworkHelper::msViewTabBarURL( msToolBarURLPrefix + "ViewTabBa
// Task panel URLs.
-const OUString FrameworkHelper::msTaskPanelURLPrefix("private:resource/toolpanel/DrawingFramework/"); // MMeeks - checkout uielementfactorymanager.cxx (WindowContentFactoryManager::RetrieveTypeNameFromResourceURL) to get somewhere here ...
+// cf. uielementfactorymanager.cxx (WindowContentFactoryManager::RetrieveTypeNameFromResourceURL) which
+// requires the DrawingFramework/ sub-path to get it's lookup right.
+const OUString FrameworkHelper::msTaskPanelURLPrefix("private:resource/toolpanel/DrawingFramework/");
// const OUString FrameworkHelper::msTaskPanelURLPrefix( "private:resource/toolpanel/" );
const OUString FrameworkHelper::msMasterPagesTaskPanelURL( msTaskPanelURLPrefix + "MasterPages");
diff --git a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx
index 6d5878b..8765c89 100644
--- a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx
+++ b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx
@@ -410,7 +410,7 @@ void ToolPanelViewShell_Impl::Setup()
else
{
::boost::shared_ptr< FrameworkHelper > pFrameworkHelper( FrameworkHelper::Instance( GetAntiImpl().GetViewShellBase() ) );
- pFrameworkHelper->RequestSidebarPanel( aInitialPanel.sPanelResourceURL ); // MMeeks
+ pFrameworkHelper->RequestSidebarPanel( aInitialPanel.sPanelResourceURL );
}
}
@@ -804,7 +804,7 @@ void ToolPanelViewShell_Impl::ActivePanelChanged( const ::boost::optional< size_
{
// activate the resource belonging to the new panel. This will automatically de-activate the previously active
// panel resource (since ResourceActivationMode_REPLACE is used)
- pFrameworkHelper->RequestSidebarPanel( sNewPanelURL ); // MMeeks
+ pFrameworkHelper->RequestSidebarPanel( sNewPanelURL );
}
else if ( !sOldPanelURL.isEmpty() )
{
diff --git a/sfx2/source/dialog/taskpane.cxx b/sfx2/source/dialog/taskpane.cxx
index d79ede7..c7aa092 100644
--- a/sfx2/source/dialog/taskpane.cxx
+++ b/sfx2/source/dialog/taskpane.cxx
@@ -938,8 +938,6 @@ namespace sfx2
LINK( this, TaskPaneController_Impl, OnToolboxClicked )
);
m_rDockingWindow.SetEndDockingHdl( LINK( this, TaskPaneController_Impl, DockingChanged ) );
- // MMeeks - this is the big switch changing how the tabs look ...
-// impl_setLayout(LAYOUT_TABS_RIGHT, true);
impl_setLayout(LAYOUT_DRAWERS, true);
m_rTaskPane.GetPanelDeck().AddListener( *this );
commit 323dbd38e6cd67f725adba477323b59a0bc7a7c7
Author: Michael Meeks <michael.meeks at suse.com>
Date: Mon May 20 09:59:27 2013 +0100
WaE: quiet unused warning.
Change-Id: Iceb9ecd64da80deccbad33ecdae7b788c1a540b3
diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx
index 5252625..631635d 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -164,6 +164,7 @@ void LayoutMenu::implConstruct( DrawDocShell& rDocumentShell )
OSL_ENSURE( mrBase.GetDocument()->GetDocSh() == &rDocumentShell,
"LayoutMenu::implConstruct: hmm?" );
// if this fires, then my assumption that the rDocumentShell parameter to our first ctor is superfluous ...
+ (void) rDocumentShell;
SetStyle (
( GetStyle() & ~(WB_ITEMBORDER) )
commit 6b412f8bb1397fe18e5213549c50839879206eb7
Author: Jan Holesovsky <kendy at suse.cz>
Date: Sun May 19 15:39:17 2013 +0200
Seperator -> Separator to fix build.
Change-Id: Id86c0e6132f6f11bd6f9cb3d84746f750b8bccf4
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index e8392ee..9578918 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -1092,10 +1092,10 @@ void CustomAnimationPane::UpdateLook (void)
mpFTSpeed->SetBackground(aBackground);
if (mpFTChangeOrder != NULL)
mpFTChangeOrder->SetBackground(aBackground);
- if (mpFLSeperator1 != NULL)
- mpFLSeperator1->SetBackground(aBackground);
- if (mpFLSeperator2 != NULL)
- mpFLSeperator2->SetBackground(aBackground);
+ if (mpFLSeparator1 != NULL)
+ mpFLSeparator1->SetBackground(aBackground);
+ if (mpFLSeparator2 != NULL)
+ mpFLSeparator2->SetBackground(aBackground);
}
commit 9dc20ea96f87a85ec9e6f7c85893b77fe0cf15d4
Author: Jan Holesovsky <kendy at suse.cz>
Date: Fri May 17 23:36:03 2013 +0200
sidebar: The sidebar uses only small icons.
Force the Color toolbar buttons etc. to small icons too, otherwise
it's inconsistent.
Change-Id: I7eea09c47c2d2f888611d04b2177f490f4977ebb
diff --git a/sfx2/source/sidebar/SidebarToolBox.cxx b/sfx2/source/sidebar/SidebarToolBox.cxx
index 61110ee..0fcf64e 100644
--- a/sfx2/source/sidebar/SidebarToolBox.cxx
+++ b/sfx2/source/sidebar/SidebarToolBox.cxx
@@ -46,6 +46,7 @@ SidebarToolBox::SidebarToolBox (
{
SetBackground(Wallpaper());
SetPaintTransparent(true);
+ SetToolboxButtonSize( TOOLBOX_BUTTONSIZE_SMALL );
if (rxFrame.is())
{
@@ -250,14 +251,12 @@ Reference<frame::XToolbarController> SidebarToolBox::GetControllerForItemId (con
void SidebarToolBox::UpdateIcons (const Reference<frame::XFrame>& rxFrame)
{
- const sal_Bool bBigImages (SvtMiscOptions().AreCurrentSymbolsLarge());
-
for (ControllerContainer::iterator iController(maControllers.begin()), iEnd(maControllers.end());
iController!=iEnd;
++iController)
{
const ::rtl::OUString sCommandURL (iController->second.msCurrentCommand);
- Image aImage (framework::GetImageFromURL(rxFrame, sCommandURL, bBigImages));
+ Image aImage (framework::GetImageFromURL(rxFrame, sCommandURL, false));
SetItemImage(iController->first, aImage);
}
}
commit 78afd7f6579eff4c3d8688b38d3b9d025be2098b
Author: Jan Holesovsky <kendy at suse.cz>
Date: Fri May 17 23:29:31 2013 +0200
sidebar: Kill DrawBevelBorder(), nobody uses that now.
Change-Id: I7901ad17515002c8568a46f9a11c0c9919c0841e
diff --git a/sfx2/source/sidebar/DrawHelper.cxx b/sfx2/source/sidebar/DrawHelper.cxx
index f8172b2..85dbe37 100644
--- a/sfx2/source/sidebar/DrawHelper.cxx
+++ b/sfx2/source/sidebar/DrawHelper.cxx
@@ -21,7 +21,6 @@
#include <vcl/lineinfo.hxx>
-
namespace sfx2 { namespace sidebar {
void DrawHelper::DrawBorder (
@@ -65,70 +64,6 @@ void DrawHelper::DrawBorder (
rVerticalPaint);
}
-
-
-
-void DrawHelper::DrawBevelBorder (
- OutputDevice& rDevice,
- const Rectangle rBox,
- const SvBorder aBorderSize,
- const Paint& rTopLeftPaint,
- const Paint& rCenterPaint,
- const Paint& rBottomRightPaint)
-{
- // Draw top line.
- DrawHorizontalLine(
- rDevice,
- rBox.Left(),
- rBox.Right() - aBorderSize.Right(),
- rBox.Top(),
- aBorderSize.Top(),
- rTopLeftPaint);
- // Draw bottom line.
- DrawHorizontalLine(
- rDevice,
- rBox.Left()+aBorderSize.Left(),
- rBox.Right(),
- rBox.Bottom()-aBorderSize.Bottom()+1,
- aBorderSize.Bottom(),
- rBottomRightPaint);
- // Draw left line.
- DrawVerticalLine(
- rDevice,
- rBox.Top()+aBorderSize.Top(),
- rBox.Bottom() - aBorderSize.Bottom(),
- rBox.Left(),
- aBorderSize.Left(),
- rTopLeftPaint);
- // Draw right line.
- DrawVerticalLine(
- rDevice,
- rBox.Top()+aBorderSize.Top(),
- rBox.Bottom()-aBorderSize.Bottom(),
- rBox.Right()-aBorderSize.Right()+1,
- aBorderSize.Right(),
- rBottomRightPaint);
- // Draw top right corner.
- DrawVerticalLine(
- rDevice,
- rBox.Top(),
- rBox.Top()+aBorderSize.Top()-1,
- rBox.Right()-aBorderSize.Right()+1,
- aBorderSize.Right(),
- rCenterPaint);
- // Draw bottom right corner.
- DrawVerticalLine(
- rDevice,
- rBox.Bottom() - aBorderSize.Bottom()+1,
- rBox.Bottom(),
- rBox.Left(),
- aBorderSize.Left(),
- rCenterPaint);
-}
-
-
-
-
void DrawHelper::DrawHorizontalLine(
OutputDevice& rDevice,
const sal_Int32 nLeft,
@@ -165,9 +100,6 @@ void DrawHelper::DrawHorizontalLine(
}
}
-
-
-
void DrawHelper::DrawVerticalLine(
OutputDevice& rDevice,
const sal_Int32 nTop,
@@ -204,9 +136,6 @@ void DrawHelper::DrawVerticalLine(
}
}
-
-
-
void DrawHelper::DrawRoundedRectangle (
OutputDevice& rDevice,
const Rectangle& rBox,
@@ -238,7 +167,4 @@ void DrawHelper::DrawRoundedRectangle (
}
}
-
-
-
} } // end of namespace sfx2::sidebar
diff --git a/sfx2/source/sidebar/DrawHelper.hxx b/sfx2/source/sidebar/DrawHelper.hxx
index 45bf7ea..c17c9ed 100644
--- a/sfx2/source/sidebar/DrawHelper.hxx
+++ b/sfx2/source/sidebar/DrawHelper.hxx
@@ -39,13 +39,6 @@ public:
const SvBorder aBorderSize,
const Paint& rHorizontalPaint,
const Paint& rVerticalPaint);
- static void DrawBevelBorder (
- OutputDevice& rDevice,
- const Rectangle rBox,
- const SvBorder aBorderSize,
- const Paint& rTopLeftPaint,
- const Paint& rCenterPaint,
- const Paint& rBottomRightPaint);
static void DrawHorizontalLine(
OutputDevice& rDevice,
const sal_Int32 nLeft,
commit 956aae27b85d914a23044ebe437484f0dee26815
Author: Jan Holesovsky <kendy at suse.cz>
Date: Fri May 17 23:23:24 2013 +0200
sidebar: Simplify the look of the toolboxes.
Get rid of the background (that is not based on the theme the user uses, so
will not play good with system integration), and just draw a shadow frame
around the toolbar buttons.
[We cannot get rid of that for good, the controls then look 'lost in space'
;-)]
Change-Id: I1325a341c9cf3e5a91e102e233916735de7f8064
diff --git a/sfx2/source/sidebar/ToolBoxBackground.cxx b/sfx2/source/sidebar/ToolBoxBackground.cxx
index d98f709..a5105c9 100644
--- a/sfx2/source/sidebar/ToolBoxBackground.cxx
+++ b/sfx2/source/sidebar/ToolBoxBackground.cxx
@@ -21,8 +21,8 @@
#include "sfx2/sidebar/Tools.hxx"
#include "sfx2/sidebar/Theme.hxx"
+#include <vcl/svapp.hxx>
#include <vcl/toolbox.hxx>
-#include <vcl/gradient.hxx>
#include <svl/smplhint.hxx>
@@ -32,8 +32,6 @@ ToolBoxBackground::ToolBoxBackground (Window* pParentWindow)
: Window(pParentWindow, WB_DIALOGCONTROL),
maPadding(Tools::RectangleToSvBorder(Theme::GetRectangle(Theme::Rect_ToolBoxPadding)))
{
- SetBackground(Theme::GetPaint(Theme::Paint_ToolBoxBackground).GetWallpaper());
-
#ifdef DEBUG
SetText(A2S("ToolBoxBackground"));
#endif
@@ -87,19 +85,11 @@ void ToolBoxBackground::Paint (const Rectangle& rRect)
{
Window::Paint(rRect);
- Rectangle aBox (Point(0,0), GetSizePixel());
-
- const sidebar::Paint aTopLeftBorderPaint (Theme::GetPaint(Theme::Paint_ToolBoxBorderTopLeft));
- const sidebar::Paint aCenterBorderPaint (Theme::GetPaint(Theme::Paint_ToolBoxBorderCenterCorners));
- const sidebar::Paint aBottomRightBorderPaint (Theme::GetPaint(Theme::Paint_ToolBoxBorderBottomRight));
- const Rectangle aBorderSize (Theme::GetRectangle(Theme::Rect_ToolBoxBorder));
- DrawHelper::DrawBevelBorder (
- *this,
- aBox,
- Tools::RectangleToSvBorder(aBorderSize),
- aTopLeftBorderPaint,
- aCenterBorderPaint,
- aBottomRightBorderPaint);
+ const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
+ SetFillColor();
+ SetLineColor( rStyleSettings.GetShadowColor() );
+
+ DrawRect( Rectangle( Point( 0, 0 ), GetSizePixel() ) );
}
@@ -109,7 +99,6 @@ void ToolBoxBackground::DataChanged (const DataChangedEvent& rEvent)
{
(void)rEvent;
- SetBackground(Theme::GetPaint(Theme::Paint_ToolBoxBackground).GetWallpaper());
maPadding = Tools::RectangleToSvBorder(Theme::GetRectangle(Theme::Rect_ToolBoxPadding));
}
diff --git a/sfx2/source/sidebar/ToolBoxBackground.hxx b/sfx2/source/sidebar/ToolBoxBackground.hxx
index e5204b9..f1d1bdc 100644
--- a/sfx2/source/sidebar/ToolBoxBackground.hxx
+++ b/sfx2/source/sidebar/ToolBoxBackground.hxx
@@ -27,6 +27,7 @@ class ToolBox;
namespace sfx2 { namespace sidebar {
+/// Draws the sidebar ToolBoxes (groups of toolbar buttons).
class ToolBoxBackground
: public Window
{
commit 66a5cc468cef0c6db8b42b7f25367f04208e6f2e
Author: Michael Meeks <michael.meeks at suse.com>
Date: Fri May 17 20:32:16 2013 +0100
Only register and use the Sidebar if it is globally enabled.
diff --git a/include/sfx2/sidebar/SidebarChildWindow.hxx b/include/sfx2/sidebar/SidebarChildWindow.hxx
index 194f098..0d9739d 100644
--- a/include/sfx2/sidebar/SidebarChildWindow.hxx
+++ b/include/sfx2/sidebar/SidebarChildWindow.hxx
@@ -39,6 +39,8 @@ public:
SfxBindings* pBindings,
SfxChildWinInfo* pInfo);
+ static void RegisterChildWindowIfEnabled (sal_Bool bVisible=sal_False, SfxModule *pMod=NULL, sal_uInt16 nFlags=0);
+
SFX_DECL_CHILDWINDOW_WITHID(SidebarChildWindow);
static sal_Int32 GetDefaultWidth (Window* pWindow);
diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx
index 897a59f..b31a45e 100644
--- a/sc/source/ui/app/scdll.cxx
+++ b/sc/source/ui/app/scdll.cxx
@@ -229,7 +229,7 @@ void ScDLL::Init()
// common SFX controller
::sfx2::TaskPaneWrapper::RegisterChildWindow( false, pMod );
- ::sfx2::sidebar::SidebarChildWindow::RegisterChildWindow(false, pMod);
+ ::sfx2::sidebar::SidebarChildWindow::RegisterChildWindowIfEnabled(false, pMod);
// Svx-StatusBar-Controller
SvxInsertStatusBarControl ::RegisterControl(SID_ATTR_INSERT, pMod);
diff --git a/sd/source/ui/app/sddll2.cxx b/sd/source/ui/app/sddll2.cxx
index d28257d..78c78ea 100644
--- a/sd/source/ui/app/sddll2.cxx
+++ b/sd/source/ui/app/sddll2.cxx
@@ -127,7 +127,7 @@ void SdDLL::RegisterControllers()
::sd::LeftPaneImpressChildWindow::RegisterChildWindow(0, pMod);
::sd::LeftPaneDrawChildWindow::RegisterChildWindow(0, pMod);
::sd::ToolPanelChildWindow::RegisterChildWindow(0, pMod);
- ::sfx2::sidebar::SidebarChildWindow::RegisterChildWindow(0, pMod);
+ ::sfx2::sidebar::SidebarChildWindow::RegisterChildWindowIfEnabled(0, pMod);
SvxFillToolBoxControl::RegisterControl(0, pMod);
SvxLineStyleToolBoxControl::RegisterControl(0, pMod);
diff --git a/sfx2/source/sidebar/SidebarChildWindow.cxx b/sfx2/source/sidebar/SidebarChildWindow.cxx
index cb001ce..dfaff1e 100644
--- a/sfx2/source/sidebar/SidebarChildWindow.cxx
+++ b/sfx2/source/sidebar/SidebarChildWindow.cxx
@@ -22,6 +22,7 @@
#include "sfx2/sfxsids.hrc"
#include "helpid.hrc"
#include "sfx2/dockwin.hxx"
+#include "sfx2/viewfrm.hxx"
#include <sfx2/sidebar/ResourceDefinitions.hrc>
@@ -73,5 +74,12 @@ sal_Int32 SidebarChildWindow::GetDefaultWidth (Window* pWindow)
return 0;
}
+void SidebarChildWindow::RegisterChildWindowIfEnabled (sal_Bool bVisible,
+ SfxModule *pMod,
+ sal_uInt16 nFlags)
+{
+ if ( SfxViewFrame::IsSidebarEnabled() )
+ RegisterChildWindow( bVisible, pMod, nFlags );
+}
} } // end of namespace sfx2::sidebar
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index b8a9fb6..219f5dc 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -30,6 +30,7 @@
#include <com/sun/star/frame/XLoadable.hpp>
#include <com/sun/star/frame/XLayoutManager.hpp>
#include <com/sun/star/frame/XComponentLoader.hpp>
+#include <com/sun/star/ui/UIElementFactoryManager.hpp>
#include <toolkit/unohlp.hxx>
#include <vcl/splitwin.hxx>
@@ -3410,13 +3411,32 @@ bool SfxViewFrame::IsSidebarEnabled()
if (!bInitialized)
{
bInitialized = true;
+ css::uno::Reference< css::uno::XComponentContext > xContext;
+ xContext = ::comphelper::getProcessComponentContext();
try {
- bEnabled = officecfg::Office::Common::Misc::ExperimentalSidebar::get(
- comphelper::getProcessComponentContext());
+ bEnabled = officecfg::Office::Common::Misc::ExperimentalSidebar::get( xContext );
} catch (const uno::Exception &e) {
SAL_WARN("sfx2.view", "don't have experimental sidebar option installed");
}
+
+ // rip out the services from framework/ for good measure
+ if( !bEnabled )
+ {
+ try
+ {
+ uno::Reference< ui::XUIElementFactoryManager > xUIElementFactory = ui::UIElementFactoryManager::create( xContext );
+ xUIElementFactory->deregisterFactory( "toolpanel", "ScPanelFactory", "" );
+ xUIElementFactory->deregisterFactory( "toolpanel", "SwPanelFactory", "" );
+ xUIElementFactory->deregisterFactory( "toolpanel", "SvxPanelFactory", "" );
+ xUIElementFactory->deregisterFactory( "toolpanel", "SdPanelFactory", "" );
+ }
+ catch ( const uno::Exception &e )
+ {
+ SAL_WARN( "sfx2.view", "Exception de-registering sidebar factories " << e.Message );
+ }
+ }
}
+
return bEnabled;
}
diff --git a/sw/source/ui/app/swmodule.cxx b/sw/source/ui/app/swmodule.cxx
index 126cea5..fb53d18 100644
--- a/sw/source/ui/app/swmodule.cxx
+++ b/sw/source/ui/app/swmodule.cxx
@@ -400,7 +400,7 @@ void SwDLL::RegisterControls()
::avmedia::MediaPlayer::RegisterChildWindow(0, pMod);
SvxSmartTagsControl::RegisterControl(SID_OPEN_SMARTTAGMENU, pMod);
- ::sfx2::sidebar::SidebarChildWindow::RegisterChildWindow(0, pMod);
+ ::sfx2::sidebar::SidebarChildWindow::RegisterChildWindowIfEnabled(0, pMod);
::sfx2::TaskPaneWrapper::RegisterChildWindow(0, pMod);
}
commit 05f0eb57618d090fa45011120a907a3b1157accb
Author: Michael Meeks <michael.meeks at suse.com>
Date: Fri May 17 20:07:29 2013 +0100
disable sidebar menu option if it is disabled.
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 801b08c..b8a9fb6 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -3220,7 +3220,7 @@ void SfxViewFrame::ChildWindowState( SfxItemSet& rState )
}
else if ( nSID == SID_TASKPANE )
{
- if ( !KnowsChildWindow( nSID ) )
+ if ( !KnowsChildWindow( nSID ) )
{
OSL_FAIL( "SID_TASKPANE state requested, but no task pane child window exists for this ID!" );
rState.DisableItem( nSID );
@@ -3236,6 +3236,11 @@ void SfxViewFrame::ChildWindowState( SfxItemSet& rState )
}
else if ( nSID == SID_SIDEBAR )
{
+ if ( !IsSidebarEnabled() )
+ {
+ rState.DisableItem( nSID );
+ rState.Put( SfxVisibilityItem( nSID, sal_False ) );
+ }
if ( !KnowsChildWindow( nSID ) )
{
OSL_ENSURE( false, "SID_TASKPANE state requested, but no task pane child window exists for this ID!" );
commit 3fd311a944ff09084af325593beb380f85b5c128
Author: Michael Meeks <michael.meeks at suse.com>
Date: Fri May 17 17:35:05 2013 +0100
Remove apparently un-needed change to look of task-panes.
Change-Id: I8ebd1cf4482d7dc47db3f732b0d06cb318568c5a
diff --git a/sfx2/source/dialog/taskpane.cxx b/sfx2/source/dialog/taskpane.cxx
index 69aedf6..d79ede7 100644
--- a/sfx2/source/dialog/taskpane.cxx
+++ b/sfx2/source/dialog/taskpane.cxx
@@ -938,7 +938,9 @@ namespace sfx2
LINK( this, TaskPaneController_Impl, OnToolboxClicked )
);
m_rDockingWindow.SetEndDockingHdl( LINK( this, TaskPaneController_Impl, DockingChanged ) );
- impl_setLayout(LAYOUT_TABS_RIGHT, true);
+ // MMeeks - this is the big switch changing how the tabs look ...
+// impl_setLayout(LAYOUT_TABS_RIGHT, true);
+ impl_setLayout(LAYOUT_DRAWERS, true);
m_rTaskPane.GetPanelDeck().AddListener( *this );
commit 228bb7ffe0d404ba1225f7b4d26ca71e098577d9
Author: Michael Meeks <michael.meeks at suse.com>
Date: Fri May 17 17:25:36 2013 +0100
finally get the taskpane rendering again
NB. you need to re-build & install to sync. configuration after this.
diff --git a/officecfg/registry/data/org/openoffice/Office/Impress.xcu b/officecfg/registry/data/org/openoffice/Office/Impress.xcu
index 924d414..4d5ab3f 100644
--- a/officecfg/registry/data/org/openoffice/Office/Impress.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Impress.xcu
@@ -164,28 +164,28 @@
</prop>
</node>
<node oor:name="R0c" oor:op="replace">
- <prop oor:name="URL">
- <value>private:resource/toolpanel/UsedMasterPages</value>
+ <prop oor:name="URL"> <!-- MMeeks renamed from UsedMasterPages -->
+ <value>private:resource/toolpanel/DrawingFramework/MasterPages</value>
</prop>
</node>
<node oor:name="R1" oor:op="replace">
<prop oor:name="URL">
- <value>private:resource/toolpanel/Layouts</value>
+ <value>private:resource/toolpanel/DrawingFramework/Layouts</value>
</prop>
</node>
<node oor:name="R2" oor:op="replace">
<prop oor:name="URL">
- <value>private:resource/toolpanel/TableDesign</value>
+ <value>private:resource/toolpanel/DrawingFramework/TableDesign</value>
</prop>
</node>
<node oor:name="R3" oor:op="replace">
<prop oor:name="URL">
- <value>private:resource/toolpanel/CustomAnimations</value>
+ <value>private:resource/toolpanel/DrawingFramework/CustomAnimations</value>
</prop>
</node>
<node oor:name="R4" oor:op="replace">
<prop oor:name="URL">
- <value>private:resource/toolpanel/SlideTransitions</value>
+ <value>private:resource/toolpanel/DrawingFramework/SlideTransitions</value>
</prop>
</node>
</node>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
index d5df8ff..5aa630a 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
@@ -825,7 +825,7 @@
<value>true</value>
</prop>
</node>
- <node oor:name="private:resource/toolpanel/MasterPages" oor:op="replace">
+ <node oor:name="private:resource/toolpanel/DrawingFramework/MasterPages" oor:op="replace">
<prop oor:name="Visible" oor:type="xs:boolean">
<value>false</value>
</prop>
@@ -836,7 +836,7 @@
<value>private:commandimage/PresentationLayout</value>
</prop>
</node>
- <node oor:name="private:resource/toolpanel/Layouts" oor:op="replace">
+ <node oor:name="private:resource/toolpanel/DrawingFramework/Layouts" oor:op="replace">
<prop oor:name="Visible" oor:type="xs:boolean">
<value>false</value>
</prop>
@@ -847,7 +847,7 @@
<value>private:commandimage/ModifyPage</value>
</prop>
</node>
- <node oor:name="private:resource/toolpanel/TableDesign" oor:op="replace">
+ <node oor:name="private:resource/toolpanel/DrawingFramework/TableDesign" oor:op="replace">
<prop oor:name="Visible" oor:type="xs:boolean">
<value>false</value>
</prop>
@@ -858,7 +858,7 @@
<value>private:commandimage/InsertTable</value>
</prop>
</node>
- <node oor:name="private:resource/toolpanel/CustomAnimations" oor:op="replace">
+ <node oor:name="private:resource/toolpanel/DrawingFramework/CustomAnimations" oor:op="replace">
<prop oor:name="Visible" oor:type="xs:boolean">
<value>false</value>
</prop>
@@ -869,7 +869,7 @@
<value>private:commandimage/CustomAnimation</value>
</prop>
</node>
- <node oor:name="private:resource/toolpanel/SlideTransitions" oor:op="replace">
+ <node oor:name="private:resource/toolpanel/DrawingFramework/SlideTransitions" oor:op="replace">
<prop oor:name="Visible" oor:type="xs:boolean">
<value>false</value>
</prop>
diff --git a/sd/source/ui/framework/factories/TaskPanelFactory.cxx b/sd/source/ui/framework/factories/TaskPanelFactory.cxx
index 750df6a..091c3f5 100644
--- a/sd/source/ui/framework/factories/TaskPanelFactory.cxx
+++ b/sd/source/ui/framework/factories/TaskPanelFactory.cxx
@@ -151,7 +151,7 @@ void SAL_CALL TaskPanelFactory::initialize(
catch(RuntimeException&)
{}
-
+ SAL_DEBUG( "TaskPanelFactory::initialize !" );
Reference<XControllerManager> xCM (xController, UNO_QUERY_THROW);
Reference<XConfigurationController> xCC (
xCM->getConfigurationController(), UNO_QUERY_THROW);
diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx
index 8964304..00667d2 100644
--- a/sd/source/ui/framework/tools/FrameworkHelper.cxx
+++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx
@@ -198,7 +198,8 @@ const OUString FrameworkHelper::msViewTabBarURL( msToolBarURLPrefix + "ViewTabBa
// Task panel URLs.
-const OUString FrameworkHelper::msTaskPanelURLPrefix( "private:resource/toolpanel/" );
+const OUString FrameworkHelper::msTaskPanelURLPrefix("private:resource/toolpanel/DrawingFramework/"); // MMeeks - checkout uielementfactorymanager.cxx (WindowContentFactoryManager::RetrieveTypeNameFromResourceURL) to get somewhere here ...
+// const OUString FrameworkHelper::msTaskPanelURLPrefix( "private:resource/toolpanel/" );
const OUString FrameworkHelper::msMasterPagesTaskPanelURL( msTaskPanelURLPrefix + "MasterPages");
// these three appear to be unused ...
commit 645db9a2bd9b1eec381de60c491e6b7f9ee7a7b4
Author: Michael Meeks <michael.meeks at suse.com>
Date: Fri May 17 16:14:11 2013 +0100
don't throw up the sidebar on start.
diff --git a/officecfg/registry/data/org/openoffice/Office/Views.xcu b/officecfg/registry/data/org/openoffice/Office/Views.xcu
index 81f56d2..bd3a06b 100644
--- a/officecfg/registry/data/org/openoffice/Office/Views.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Views.xcu
@@ -24,11 +24,5 @@
<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>
commit 55f49970f4085e3a1498961edabd5303bd6bea6c
Author: Michael Meeks <michael.meeks at suse.com>
Date: Fri May 17 14:16:52 2013 +0100
update to the right service name for new URLs.
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
index 5aa630a..d5df8ff 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
@@ -825,7 +825,7 @@
<value>true</value>
</prop>
</node>
- <node oor:name="private:resource/toolpanel/DrawingFramework/MasterPages" oor:op="replace">
+ <node oor:name="private:resource/toolpanel/MasterPages" oor:op="replace">
<prop oor:name="Visible" oor:type="xs:boolean">
<value>false</value>
</prop>
@@ -836,7 +836,7 @@
<value>private:commandimage/PresentationLayout</value>
</prop>
</node>
- <node oor:name="private:resource/toolpanel/DrawingFramework/Layouts" oor:op="replace">
+ <node oor:name="private:resource/toolpanel/Layouts" oor:op="replace">
<prop oor:name="Visible" oor:type="xs:boolean">
<value>false</value>
</prop>
@@ -847,7 +847,7 @@
<value>private:commandimage/ModifyPage</value>
</prop>
</node>
- <node oor:name="private:resource/toolpanel/DrawingFramework/TableDesign" oor:op="replace">
+ <node oor:name="private:resource/toolpanel/TableDesign" oor:op="replace">
<prop oor:name="Visible" oor:type="xs:boolean">
<value>false</value>
</prop>
@@ -858,7 +858,7 @@
<value>private:commandimage/InsertTable</value>
</prop>
</node>
- <node oor:name="private:resource/toolpanel/DrawingFramework/CustomAnimations" oor:op="replace">
+ <node oor:name="private:resource/toolpanel/CustomAnimations" oor:op="replace">
<prop oor:name="Visible" oor:type="xs:boolean">
<value>false</value>
</prop>
@@ -869,7 +869,7 @@
<value>private:commandimage/CustomAnimation</value>
</prop>
</node>
- <node oor:name="private:resource/toolpanel/DrawingFramework/SlideTransitions" oor:op="replace">
+ <node oor:name="private:resource/toolpanel/SlideTransitions" oor:op="replace">
<prop oor:name="Visible" oor:type="xs:boolean">
<value>false</value>
</prop>
diff --git a/sd/source/ui/framework/factories/TaskPanelFactory.cxx b/sd/source/ui/framework/factories/TaskPanelFactory.cxx
index b8e7e79..750df6a 100644
--- a/sd/source/ui/framework/factories/TaskPanelFactory.cxx
+++ b/sd/source/ui/framework/factories/TaskPanelFactory.cxx
@@ -218,7 +218,7 @@ Reference<XResource> SAL_CALL TaskPanelFactory::createResource (
if ( pToolPanel != NULL )
xResource = new TaskPanelResource( rxResourceId );
- OSL_POSTCOND( xResource.is(), "TaskPanelFactory::createResource: did not find the given resource!" );
+ OSL_POSTCOND( xResource.is(), "TaskPanelFactory::createResource: did not find the given resource!");
}
}
diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx
index c820476..8964304 100644
--- a/sd/source/ui/framework/tools/FrameworkHelper.cxx
+++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx
@@ -20,6 +20,7 @@
#include <osl/time.h>
#include "sfx2/viewfrm.hxx"
+
#include "framework/FrameworkHelper.hxx"
#include "framework/ConfigurationController.hxx"
@@ -645,7 +646,7 @@ Reference<XResourceId> FrameworkHelper::RequestSidebarPanel (
mxConfigurationController->requestResourceActivation(
CreateResourceId(aViewURL, aPaneURL),
ResourceActivationMode_REPLACE);
- Reference<XResourceId> xPanelId (CreateResourceId(rsTaskPanelURL, aViewURL, aPanelURL));
+ Reference<XResourceId> xPanelId (CreateResourceId(rsTaskPanelURL, aViewURL, aPaneURL));
mxConfigurationController->requestResourceActivation(
xPanelId,
ResourceActivationMode_REPLACE);
diff --git a/sd/util/sd.component b/sd/util/sd.component
index ff6d79c..552e2d5 100644
--- a/sd/util/sd.component
+++ b/sd/util/sd.component
@@ -81,6 +81,9 @@
<implementation name="com.sun.star.comp.draw.SdHtmlOptionsDialog">
<service name="com.sun.star.ui.dialog.FilterOptionsDialog"/>
</implementation>
+ <implementation name="com.sun.star.comp.drawing.ToolPanelFactory">
+ <service name="com.sun.star.drawing.DefaultToolPanelFactory"/>
+ </implementation>
<implementation name="com.sun.star.comp.sd.InsertSlideController">
<service name="com.sun.star.frame.ToolbarController"/>
</implementation>
commit 052ac10a6f9b28b9b06884dd3ed41879722be6c9
Author: Michael Meeks <michael.meeks at suse.com>
Date: Fri May 17 13:48:27 2013 +0100
tentatively restore more UNO / task-pane goo ...
diff --git a/officecfg/registry/data/org/openoffice/Office/Impress.xcu b/officecfg/registry/data/org/openoffice/Office/Impress.xcu
index 2310cc2..924d414 100644
--- a/officecfg/registry/data/org/openoffice/Office/Impress.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Impress.xcu
@@ -82,6 +82,11 @@
<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">
@@ -121,6 +126,11 @@
</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>
@@ -140,7 +150,7 @@
</node>
<node oor:name="F3" oor:op="replace">
<prop oor:name="ServiceName">
- <value>com.sun.star.comp.Draw.framework.TaskPanelFactory</value>
+ <value>com.sun.star.drawing.framework.TaskPanelFactory</value> <!-- MMeeks -->
</prop>
<node oor:name="ResourceList">
<node oor:name="R0a" oor:op="replace">
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Factories.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Factories.xcu
index 15c0a04..61b2f8d 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Factories.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Factories.xcu
@@ -76,6 +76,20 @@
<value>com.sun.star.comp.framework.StatusBarFactory</value>
</prop>
</node>
+ <node oor:name="org.openoffice.Office.Impress.ImpressToolPanelFactory" oor:op="replace">
+ <prop oor:name="Type">
+ <value>toolpanel</value>
+ </prop>
+ <prop oor:name="Name">
+ <value>DrawingFramework</value>
+ </prop>
+ <prop oor:name="Module">
+ <value>com.sun.star.presentation.PresentationDocument</value>
+ </prop>
+ <prop oor:name="FactoryImplementation">
+ <value>com.sun.star.drawing.DefaultToolPanelFactory</value>
+ </prop>
+ </node>
<node oor:name="SvxPanelFactory" oor:op="replace">
<prop oor:name="Type">
<value>toolpanel</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
index c72079b..5aa630a 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
@@ -825,6 +825,61 @@
<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/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx
index 8851732..c820476 100644
--- a/sd/source/ui/framework/tools/FrameworkHelper.cxx
+++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx
@@ -197,12 +197,14 @@ const OUString FrameworkHelper::msViewTabBarURL( msToolBarURLPrefix + "ViewTabBa
// Task panel URLs.
-// FIXME: MMeeks - this set of urls changed:
const OUString FrameworkHelper::msTaskPanelURLPrefix( "private:resource/toolpanel/" );
const OUString FrameworkHelper::msMasterPagesTaskPanelURL( msTaskPanelURLPrefix + "MasterPages");
+
+// these three appear to be unused ...
const OUString FrameworkHelper::msAllMasterPagesTaskPanelURL( msTaskPanelURLPrefix + "AllMasterPages" );
const OUString FrameworkHelper::msRecentMasterPagesTaskPanelURL( msTaskPanelURLPrefix + "RecentMasterPages" );
const OUString FrameworkHelper::msUsedMasterPagesTaskPanelURL( msTaskPanelURLPrefix + "UsedMasterPages" );
+
const OUString FrameworkHelper::msLayoutTaskPanelURL( msTaskPanelURLPrefix + "Layouts" );
const OUString FrameworkHelper::msTableDesignPanelURL( msTaskPanelURLPrefix + "TableDesign" );
const OUString FrameworkHelper::msCustomAnimationTaskPanelURL( msTaskPanelURLPrefix + "CustomAnimations" );
diff --git a/sd/source/ui/unoidl/facreg.cxx b/sd/source/ui/unoidl/facreg.cxx
index df50159..c1445b5 100644
--- a/sd/source/ui/unoidl/facreg.cxx
+++ b/sd/source/ui/unoidl/facreg.cxx
@@ -113,6 +113,13 @@ extern OUString BasicViewFactory_getImplementationName(void) throw (uno::Runtime
extern uno::Sequence<OUString> SAL_CALL BasicViewFactory_getSupportedServiceNames (void)
throw (uno::RuntimeException);
+extern uno::Reference<uno::XInterface> SAL_CALL TaskPanelFactory_createInstance(
+ const uno::Reference<uno::XComponentContext>& rxContext)
+ throw(uno::Exception);
+extern OUString TaskPanelFactory_getImplementationName(void) throw (uno::RuntimeException);
+extern uno::Sequence<OUString> SAL_CALL TaskPanelFactory_getSupportedServiceNames (void)
+ throw (uno::RuntimeException);
+
extern uno::Reference<uno::XInterface> SAL_CALL ResourceId_createInstance(
const uno::Reference<uno::XComponentContext>& rxContext)
throw(uno::Exception);
@@ -140,6 +147,16 @@ extern uno::Sequence<OUString> SAL_CALL PanelFactory_getSupportedServiceNames (v
} }
+namespace sd { namespace toolpanel {
+extern uno::Reference<uno::XInterface> SAL_CALL ToolPanelFactory_createInstance(
+ const uno::Reference<uno::XComponentContext>& rxContext)
+ throw(uno::Exception);
+extern OUString ToolPanelFactory_getImplementationName(void) throw (uno::RuntimeException);
+extern uno::Sequence<OUString> SAL_CALL ToolPanelFactory_getSupportedServiceNames (void)
+ throw (uno::RuntimeException);
+
+} }
+
namespace sd { namespace presenter {
extern uno::Reference<uno::XInterface> SAL_CALL SlideRenderer_createInstance(
const uno::Reference<uno::XComponentContext>& rxContext)
@@ -198,6 +215,7 @@ using namespace ::sd::framework;
using namespace ::sd::presenter;
using namespace ::sd::slidesorter;
using namespace ::sd::sidebar;
+using namespace ::sd::toolpanel;
@@ -220,6 +238,8 @@ enum FactoryId
BasicPaneFactoryFactoryId,
BasicToolBarFactoryFactoryId,
BasicViewFactoryFactoryId,
+ TaskPanelFactoryFactoryId,
+ ToolPanelFactoryFactoryId,
PanelFactoryFactoryId,
ResourceIdFactoryId,
PresentationFactoryProviderFactoryId,
@@ -253,7 +273,9 @@ static ::boost::shared_ptr<FactoryMap> spFactoryMap;
(*spFactoryMap)[BasicPaneFactory_getImplementationName()] = BasicPaneFactoryFactoryId;
(*spFactoryMap)[BasicToolBarFactory_getImplementationName()] = BasicToolBarFactoryFactoryId;
(*spFactoryMap)[BasicViewFactory_getImplementationName()] = BasicViewFactoryFactoryId;
- (*spFactoryMap)[sidebar::PanelFactory_getImplementationName()] = PanelFactoryFactoryId;
+ (*spFactoryMap)[TaskPanelFactory_getImplementationName()] = TaskPanelFactoryFactoryId;
+ (*spFactoryMap)[ToolPanelFactory_getImplementationName()] = ToolPanelFactoryFactoryId;
+ (*spFactoryMap)[PanelFactory_getImplementationName()] = PanelFactoryFactoryId;
(*spFactoryMap)[ResourceId_getImplementationName()] = ResourceIdFactoryId;
(*spFactoryMap)[PresentationFactoryProvider_getImplementationName()] = PresentationFactoryProviderFactoryId;
(*spFactoryMap)[SlideRenderer_getImplementationName()] = SlideRendererFactoryId;
@@ -376,6 +398,20 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL sd_component_getFactory(
sd::framework::BasicViewFactory_getSupportedServiceNames());
break;
+ case TaskPanelFactoryFactoryId:
+ xComponentFactory = ::cppu::createSingleComponentFactory(
+ sd::framework::TaskPanelFactory_createInstance,
+ sd::framework::TaskPanelFactory_getImplementationName(),
+ sd::framework::TaskPanelFactory_getSupportedServiceNames());
+ break;
+
+ case ToolPanelFactoryFactoryId:
+ xComponentFactory = ::cppu::createSingleComponentFactory(
+ sd::toolpanel::ToolPanelFactory_createInstance,
+ sd::toolpanel::ToolPanelFactory_getImplementationName(),
+ sd::toolpanel::ToolPanelFactory_getSupportedServiceNames());
+ break;
+
case PanelFactoryFactoryId:
xComponentFactory = ::cppu::createSingleComponentFactory(
sd::sidebar::PanelFactory_createInstance,
diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx
index c5be674..d018821 100644
--- a/sd/source/ui/view/ToolBarManager.cxx
+++ b/sd/source/ui/view/ToolBarManager.cxx
@@ -1199,6 +1199,7 @@ void ToolBarRules::MainViewShellChanged (ViewShell::ShellType nShellType)
case ViewShell::ST_NONE:
case ViewShell::ST_PRESENTATION:
+ case ViewShell::ST_TASK_PANE:
case ViewShell::ST_SIDEBAR:
default:
break;
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
index 3348c19..91091c4 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -54,6 +54,7 @@
#include "PresentationViewShell.hxx"
#include "FormShellManager.hxx"
#include "ToolBarManager.hxx"
+#include "taskpane/PanelId.hxx"
#include "SidebarPanelId.hxx"
#include "Window.hxx"
#include "framework/ConfigurationController.hxx"
@@ -697,6 +698,13 @@ void ViewShellBase::Execute (SfxRequest& rRequest)
framework::FrameworkHelper::msSlideSorterURL);
break;
+ case SID_TASKPANE:
+ mpImpl->SetPaneVisibility(
+ rRequest,
+ framework::FrameworkHelper::msRightPaneURL,
+ framework::FrameworkHelper::msTaskPaneURL);
+ break;
+
case SID_NORMAL_MULTI_PANE_GUI:
case SID_SLIDE_SORTER_MULTI_PANE_GUI:
case SID_DRAWINGMODE:
@@ -1387,6 +1395,11 @@ void ViewShellBase::Implementation::GetSlotState (SfxItemSet& rSet)
xContext, FrameworkHelper::msLeftDrawPaneURL);
break;
+ case SID_TASKPANE:
+ xResourceId = ResourceId::create(
+ xContext, FrameworkHelper::msRightPaneURL);
+ break;
+
case SID_NORMAL_MULTI_PANE_GUI:
xResourceId = ResourceId::createWithAnchorURL(
xContext,
diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx
index 84c3181..07048c0 100644
--- a/sd/source/ui/view/ViewShellImplementation.cxx
+++ b/sd/source/ui/view/ViewShellImplementation.cxx
@@ -40,6 +40,7 @@
#include "FrameView.hxx"
#include "DrawViewShell.hxx"
#include "ViewShellHint.hxx"
+#include "taskpane/PanelId.hxx"
#include "SidebarPanelId.hxx"
#include "framework/FrameworkHelper.hxx"
@@ -330,6 +331,7 @@ sal_uInt16 ViewShell::Implementation::GetViewId (void)
// Since we have to return a view id for every possible shell type
// and there is not (yet) a proper ViewShellBase sub class for the
// remaining types we chose the Impress factory as a fall back.
+ case ViewShell::ST_TASK_PANE:
case ViewShell::ST_SIDEBAR:
case ViewShell::ST_NONE:
default:
diff --git a/sd/util/sd.component b/sd/util/sd.component
index a588165..ff6d79c 100644
--- a/sd/util/sd.component
+++ b/sd/util/sd.component
@@ -63,6 +63,9 @@
<implementation name="com.sun.star.comp.Draw.framework.ResourceId">
<service name="com.sun.star.drawing.framework.ResourceId"/>
</implementation>
+ <implementation name="com.sun.star.comp.Draw.framework.TaskPanelFactory">
+ <service name="com.sun.star.drawing.framework.TaskPanelFactory"/>
+ </implementation>
<implementation name="org.openoffice.comp.Draw.framework.PanelFactory">
<service name="com.sun.star.drawing.framework.PanelFactory"/>
</implementation>
commit a65a423e22fc03d0b7850bbf20dfc30f6cfa34dd
Author: Michael Meeks <michael.meeks at suse.com>
Date: Fri May 17 12:25:23 2013 +0100
more reverts, first cut at making sidebar optional.
diff --git a/sd/source/ui/app/sddll1.cxx b/sd/source/ui/app/sddll1.cxx
index 09a7346..100f527 100644
--- a/sd/source/ui/app/sddll1.cxx
+++ b/sd/source/ui/app/sddll1.cxx
@@ -37,6 +37,7 @@
#include "DrawDocShell.hxx"
#include "GraphicDocShell.hxx"
#include "SlideSorterViewShell.hxx"
+#include "taskpane/ToolPanelViewShell.hxx"
#include "FactoryIds.hxx"
#include "sdmod.hxx"
#include "app.hrc"
@@ -114,6 +115,11 @@ void SdDLL::RegisterInterfaces()
// View shells for the side panes.
::sd::slidesorter::SlideSorterViewShell::RegisterInterface (pMod);
+
+ ::sd::toolpanel::ToolPanelViewShell::RegisterInterface(pMod);
+ // Tell the tool panel view shell to register the interfaces of its
+ // controls.
+ ::sd::toolpanel::ToolPanelViewShell::RegisterControls();
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/app/sddll2.cxx b/sd/source/ui/app/sddll2.cxx
index 3088415..d28257d 100644
--- a/sd/source/ui/app/sddll2.cxx
+++ b/sd/source/ui/app/sddll2.cxx
@@ -126,6 +126,7 @@ void SdDLL::RegisterControllers()
::avmedia::MediaPlayer::RegisterChildWindow(0, pMod);
::sd::LeftPaneImpressChildWindow::RegisterChildWindow(0, pMod);
::sd::LeftPaneDrawChildWindow::RegisterChildWindow(0, pMod);
+ ::sd::ToolPanelChildWindow::RegisterChildWindow(0, pMod);
::sfx2::sidebar::SidebarChildWindow::RegisterChildWindow(0, pMod);
SvxFillToolBoxControl::RegisterControl(0, pMod);
diff --git a/sd/source/ui/dlg/PaneShells.cxx b/sd/source/ui/dlg/PaneShells.cxx
index 023dbcc..d3338ab 100644
--- a/sd/source/ui/dlg/PaneShells.cxx
+++ b/sd/source/ui/dlg/PaneShells.cxx
@@ -92,6 +92,29 @@ LeftDrawPaneShell::~LeftDrawPaneShell (void)
{
}
+//===== ToolPanelPaneShell ========================================================
+
+SFX_SLOTMAP( ToolPanelPaneShell )
+{
+ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
+};
+
+SFX_IMPL_INTERFACE( ToolPanelPaneShell, SfxShell, SdResId( STR_TOOL_PANEL_SHELL ) )
+{
+ SFX_CHILDWINDOW_REGISTRATION( ::sd::ToolPanelChildWindow::GetChildWindowId() );
+}
+
+TYPEINIT1( ToolPanelPaneShell, SfxShell );
+
+ToolPanelPaneShell::ToolPanelPaneShell()
+ :SfxShell()
+{
+ SetName(OUString("ToolPanel"));
+}
+
+ToolPanelPaneShell::~ToolPanelPaneShell(void)
+{
+}
} // end of namespace ::sd
diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.cxx b/sd/source/ui/framework/factories/BasicPaneFactory.cxx
index 5c5a043..c91265f 100644
--- a/sd/source/ui/framework/factories/BasicPaneFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicPaneFactory.cxx
@@ -45,7 +45,8 @@ namespace {
CenterPaneId,
FullScreenPaneId,
LeftImpressPaneId,
- LeftDrawPaneId
+ LeftDrawPaneId,
+ RightPaneId
};
static const sal_Int32 gnConfigurationUpdateStartEvent(0);
@@ -219,6 +220,11 @@ void SAL_CALL BasicPaneFactory::initialize (const Sequence<Any>& aArguments)
aDescriptor.mePaneId = LeftDrawPaneId;
mpPaneContainer->push_back(aDescriptor);
xCC->addResourceFactory(aDescriptor.msPaneURL, this);
+
+ aDescriptor.msPaneURL = FrameworkHelper::msRightPaneURL;
+ aDescriptor.mePaneId = RightPaneId;
+ mpPaneContainer->push_back(aDescriptor);
+ xCC->addResourceFactory(aDescriptor.msPaneURL, this);
}
// Register as configuration change listener.
@@ -287,6 +293,7 @@ Reference<XResource> SAL_CALL BasicPaneFactory::createResource (
case LeftImpressPaneId:
case LeftDrawPaneId:
+ case RightPaneId:
xPane = CreateChildWindowPane(
rxPaneId,
*iDescriptor);
@@ -472,6 +479,11 @@ Reference<XResource> BasicPaneFactory::CreateChildWindowPane (
nChildWindowId = ::sd::LeftPaneDrawChildWindow::GetChildWindowId();
break;
+ case RightPaneId:
+ pShell.reset(new ToolPanelPaneShell());
+ nChildWindowId = ::sd::ToolPanelChildWindow::GetChildWindowId();
+ break;
+
default:
break;
}
diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.hxx b/sd/source/ui/framework/factories/BasicPaneFactory.hxx
index de9c81b..472609a 100644
--- a/sd/source/ui/framework/factories/BasicPaneFactory.hxx
+++ b/sd/source/ui/framework/factories/BasicPaneFactory.hxx
@@ -59,6 +59,7 @@ namespace sd { namespace framework {
private:resource/pane/FullScreenPane
private:resource/pane/LeftImpressPane
private:resource/pane/LeftDrawPane
+ private:resource/pane/RightPane
There are two left panes because this is (seems to be) the only way to
show different titles for the left pane in Draw and Impress.
*/
diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx
index 78d7988..08b903b 100644
--- a/sd/source/ui/framework/factories/BasicViewFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx
@@ -33,6 +33,7 @@
#include "DrawViewShell.hxx"
#include "GraphicViewShell.hxx"
#include "OutlineViewShell.hxx"
+#include "taskpane/ToolPanelViewShell.hxx"
#include "PresentationViewShell.hxx"
#include "SlideSorterViewShell.hxx"
#include "FrameView.hxx"
@@ -318,6 +319,7 @@ void SAL_CALL BasicViewFactory::initialize (const Sequence<Any>& aArguments)
mxConfigurationController->addResourceFactory(FrameworkHelper::msNotesViewURL, this);
mxConfigurationController->addResourceFactory(FrameworkHelper::msHandoutViewURL, this);
mxConfigurationController->addResourceFactory(FrameworkHelper::msPresentationViewURL, this);
+ mxConfigurationController->addResourceFactory(FrameworkHelper::msTaskPaneURL, this);
mxConfigurationController->addResourceFactory(FrameworkHelper::msSlideSorterURL, this);
}
catch (RuntimeException&)
@@ -456,6 +458,15 @@ void SAL_CALL BasicViewFactory::initialize (const Sequence<Any>& aArguments)
pFrameView,
bIsCenterPane);
}
+ else if (rsViewURL.equals(FrameworkHelper::msTaskPaneURL))
+ {
+ pViewShell.reset(
+ new ::sd::toolpanel::ToolPanelViewShell(
+ &rFrame,
+ *mpBase,
+ &rWindow,
+ pFrameView));
+ }
return pViewShell;
}
@@ -522,6 +533,8 @@ bool BasicViewFactory::IsCacheable (const ::boost::shared_ptr<ViewDescriptor>& r
FrameworkHelper::msSlideSorterURL, FrameworkHelper::msLeftDrawPaneURL));
maCacheableResources.push_back(pHelper->CreateResourceId(
FrameworkHelper::msSlideSorterURL, FrameworkHelper::msLeftImpressPaneURL));
+ maCacheableResources.push_back(pHelper->CreateResourceId(
+ FrameworkHelper::msTaskPaneURL, FrameworkHelper::msRightPaneURL));
}
::std::vector<Reference<XResourceId> >::const_iterator iId;
diff --git a/sd/source/ui/framework/module/ToolPanelModule.cxx b/sd/source/ui/framework/module/ToolPanelModule.cxx
index c607fbd..273a22a 100644
--- a/sd/source/ui/framework/module/ToolPanelModule.cxx
+++ b/sd/source/ui/framework/module/ToolPanelModule.cxx
@@ -42,9 +42,10 @@ namespace sd { namespace framework {
ToolPanelModule::ToolPanelModule (
const Reference<frame::XController>& rxController,
- const OUString& rsSidebarPaneURL)
+ const OUString& rsViewURL,
+ const OUString& rsPaneURL)
: ResourceManager(rxController,
- FrameworkHelper::CreateResourceId(FrameworkHelper::msSidebarViewURL, rsSidebarPaneURL)),
+ FrameworkHelper::CreateResourceId(rsViewURL, rsPaneURL)),
mxControllerManager(rxController,UNO_QUERY)
{
if (mxConfigurationController.is())
diff --git a/sd/source/ui/framework/module/ToolPanelModule.hxx b/sd/source/ui/framework/module/ToolPanelModule.hxx
index ce28ef8..112ffbf 100644
--- a/sd/source/ui/framework/module/ToolPanelModule.hxx
+++ b/sd/source/ui/framework/module/ToolPanelModule.hxx
@@ -35,7 +35,7 @@ class ToolPanelModule
public:
ToolPanelModule (
const css::uno::Reference<css::frame::XController>& rxController,
- const OUString& rsRightPaneURL);
+ const OUString& rsViewURL, const OUString& rsPaneURL);
virtual ~ToolPanelModule (void);
virtual void SaveResourceState (void);
commit 54d820a7815af03a248c1aa424fae9bf9a4881f4
Author: Michael Meeks <michael.meeks at suse.com>
Date: Fri May 17 11:51:41 2013 +0100
add experimental option for sidebar to 'Advanced' pane.
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 8f7adca..1c03981 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -144,6 +144,7 @@ SvxJavaOptionsPage::SvxJavaOptionsPage( Window* pParent, const SfxItemSet& rSet
get(m_pParameterBtn, "parameters");
get(m_pClassPathBtn, "classpath");
get(m_pExperimentalCB, "experimental");
+ get(m_pExpSidebarCB, "exp_sidebar");
get(m_pMacroCB, "macrorecording");
m_sAccessibilityText = get<FixedText>("a11y")->GetText();
m_sAddDialogText = get<FixedText>("selectruntime")->GetText();
@@ -622,6 +623,13 @@ sal_Bool SvxJavaOptionsPage::FillItemSet( SfxItemSet& /*rCoreSet*/ )
bModified = sal_True;
}
+ if ( m_pExpSidebarCB->IsChecked() != m_pExpSidebarCB->GetSavedValue() )
+ {
+ SvtMiscOptions aMiscOpt;
+ aMiscOpt.SetExperimentalSidebar( m_pExpSidebarCB->IsChecked() );
+ bModified = sal_True;
+ }
+
if ( m_pMacroCB->IsChecked() != m_pMacroCB->GetSavedValue() )
{
SvtMiscOptions aMiscOpt;
@@ -629,8 +637,6 @@ sal_Bool SvxJavaOptionsPage::FillItemSet( SfxItemSet& /*rCoreSet*/ )
bModified = sal_True;
}
-
-
if ( m_pPathDlg )
{
OUString sPath( m_pPathDlg->GetClassPath() );
@@ -716,6 +722,8 @@ void SvxJavaOptionsPage::Reset( const SfxItemSet& /*rSet*/ )
m_pExperimentalCB->Check( aMiscOpt.IsExperimentalMode() );
m_pExperimentalCB->SaveValue();
+ m_pExpSidebarCB->Check( aMiscOpt.IsExperimentalSidebar() );
+ m_pExpSidebarCB->SaveValue();
m_pMacroCB->Check( aMiscOpt.IsMacroRecorderMode() );
m_pMacroCB->SaveValue();
diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx
index 07fa6be..b3e9c8e 100644
--- a/cui/source/options/optjava.hxx
+++ b/cui/source/options/optjava.hxx
@@ -65,6 +65,7 @@ private:
Timer m_aResetTimer;
CheckBox* m_pExperimentalCB;
+ CheckBox* m_pExpSidebarCB;
CheckBox* m_pMacroCB;
::std::vector< JavaInfo* >
diff --git a/cui/uiconfig/ui/optadvancedpage.ui b/cui/uiconfig/ui/optadvancedpage.ui
index ddfce7e..1c54497 100644
--- a/cui/uiconfig/ui/optadvancedpage.ui
+++ b/cui/uiconfig/ui/optadvancedpage.ui
@@ -340,6 +340,23 @@
</packing>
</child>
<child>
+ <object class="GtkCheckButton" id="exp_sidebar">
+ <property name="label" translatable="yes">Enable experimental sidebar (on restart)</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
<object class="GtkCheckButton" id="macrorecording">
<property name="label" translatable="yes">Enable macro recording</property>
<property name="visible">True</property>
@@ -350,7 +367,7 @@
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">1</property>
+ <property name="top_attach">2</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx
index 522b471..c31681b 100644
--- a/include/sfx2/viewfrm.hxx
+++ b/include/sfx2/viewfrm.hxx
@@ -152,6 +152,9 @@ public:
static void ActivateToolPanel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame, const OUString& i_rPanelURL );
+ /// is the new sidebar enabled for the app as a whole ?
+ static bool IsSidebarEnabled();
+
// interne Handler
SAL_DLLPRIVATE virtual sal_Bool SetBorderPixelImpl( const SfxViewShell *pSh, const SvBorder &rBorder );
SAL_DLLPRIVATE virtual const SvBorder& GetBorderPixelImpl( const SfxViewShell *pSh ) const;
diff --git a/include/svtools/miscopt.hxx b/include/svtools/miscopt.hxx
index 85c5b604..ca0b569 100644
--- a/include/svtools/miscopt.hxx
+++ b/include/svtools/miscopt.hxx
@@ -109,6 +109,9 @@ class SVT_DLLPUBLIC SvtMiscOptions: public utl::detail::Options
void SetExperimentalMode( sal_Bool bSet );
sal_Bool IsExperimentalMode() const;
+ void SetExperimentalSidebar( sal_Bool bSet );
+ sal_Bool IsExperimentalSidebar() const;
+
void SetMacroRecorderMode( sal_Bool bSet );
sal_Bool IsMacroRecorderMode() const;
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 314ee5c..be586f7 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -5527,11 +5527,17 @@
</prop>
<prop oor:name="ExperimentalMode" oor:type="xs:boolean" oor:nillable="false">
<info>
- <desc>Determins if various experimental, and potentially unstable
+ <desc>Determines if various experimental, and potentially unstable
features should be enabled in the user interface.</desc>
</info>
<value>false</value>
</prop>
+ <prop oor:name="ExperimentalSidebar" oor:type="xs:boolean" oor:nillable="false">
+ <info>
+ <desc>Determines if the experimental sidebar UI change should be enabled.</desc>
+ </info>
+ <value>false</value>
+ </prop>
<prop oor:name="MacroRecorderMode" oor:type="xs:boolean" oor:nillable="false">
<info>
<desc>Determins if the limited, and awkward code producing
diff --git a/sd/source/ui/framework/module/ImpressModule.cxx b/sd/source/ui/framework/module/ImpressModule.cxx
index 240a94a..cd41764 100644
--- a/sd/source/ui/framework/module/ImpressModule.cxx
+++ b/sd/source/ui/framework/module/ImpressModule.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
+#include "sfx2/viewfrm.hxx"
#include "framework/ImpressModule.hxx"
#include "framework/FrameworkHelper.hxx"
@@ -45,9 +45,15 @@ void ImpressModule::Initialize (Reference<frame::XController>& rxController)
new SlideSorterModule(
rxController,
FrameworkHelper::msLeftImpressPaneURL);
+
+ bool bSidebar = SfxViewFrame::IsSidebarEnabled();
new ToolPanelModule(
rxController,
- FrameworkHelper::msSidebarViewURL);
+ bSidebar ? FrameworkHelper::msSidebarViewURL :
+ FrameworkHelper::msTaskPaneURL,
+ bSidebar ? FrameworkHelper::msSidebarPaneURL :
+ FrameworkHelper::msRightPaneURL
+ );
new ToolBarModule(rxController);
new ShellStackGuard(rxController);
}
diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx
index ab98a7a..8851732 100644
--- a/sd/source/ui/framework/tools/FrameworkHelper.cxx
+++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx
@@ -19,6 +19,7 @@
#include <osl/time.h>
+#include "sfx2/viewfrm.hxx"
#include "framework/FrameworkHelper.hxx"
#include "framework/ConfigurationController.hxx"
@@ -608,6 +609,14 @@ Reference<XResourceId> FrameworkHelper::RequestSidebarPanel (
const OUString& rsTaskPanelURL,
const bool bEnsureTaskPaneIsVisible)
{
+ OUString aViewURL, aPaneURL;
+ bool bSidebar = SfxViewFrame::IsSidebarEnabled();
+
+ aViewURL = bSidebar ? FrameworkHelper::msSidebarViewURL :
+ FrameworkHelper::msTaskPaneURL;
+ aPaneURL = bSidebar ? FrameworkHelper::msSidebarPaneURL :
+ FrameworkHelper::msRightPaneURL;
+
try
{
if (mxConfigurationController.is())
@@ -619,7 +628,7 @@ Reference<XResourceId> FrameworkHelper::RequestSidebarPanel (
mxConfigurationController->getCurrentConfiguration());
if (xConfiguration.is())
if ( ! xConfiguration->hasResource(
- CreateResourceId(msSidebarViewURL, msSidebarPaneURL)))
+ CreateResourceId(aViewURL, aPaneURL)))
{
// Task pane is not active. Do not force it.
return NULL;
@@ -629,12 +638,12 @@ Reference<XResourceId> FrameworkHelper::RequestSidebarPanel (
// Create the resource id from URLs for the sidebar pane
// and view and the requested panel.
mxConfigurationController->requestResourceActivation(
- CreateResourceId(msSidebarPaneURL),
+ CreateResourceId(aPaneURL),
ResourceActivationMode_ADD);
mxConfigurationController->requestResourceActivation(
- CreateResourceId(msSidebarViewURL, msSidebarPaneURL),
+ CreateResourceId(aViewURL, aPaneURL),
ResourceActivationMode_REPLACE);
- Reference<XResourceId> xPanelId (CreateResourceId(rsTaskPanelURL, msSidebarViewURL, msSidebarPaneURL));
+ Reference<XResourceId> xPanelId (CreateResourceId(rsTaskPanelURL, aViewURL, aPanelURL));
mxConfigurationController->requestResourceActivation(
xPanelId,
ResourceActivationMode_REPLACE);
diff --git a/sd/source/ui/sidebar/PanelFactory.cxx b/sd/source/ui/sidebar/PanelFactory.cxx
index 193468a..2b45781 100644
--- a/sd/source/ui/sidebar/PanelFactory.cxx
+++ b/sd/source/ui/sidebar/PanelFactory.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
@@ -34,6 +35,10 @@
#include <vcl/window.hxx>
#include <toolkit/helper/vclunohelper.hxx>
+#include <comphelper/processfactory.hxx>
+#include <comphelper/configuration.hxx>
+#include "officecfg/Office/Common.hxx"
+
using namespace css;
using namespace cssu;
using namespace ::sd::framework;
@@ -71,6 +76,13 @@ Reference<lang::XEventListener> mxControllerDisposeListener;
Reference<XInterface> SAL_CALL PanelFactory_createInstance (
const Reference<XComponentContext>& rxContext)
{
+ bool bSidebar = SfxViewFrame::IsSidebarEnabled();
+ if (!bSidebar)
+ {
+ SAL_WARN( "sd", "Creating a disabled sidebar factory" );
+ return NULL;
+ }
+
return Reference<XInterface>(static_cast<XWeak*>(new PanelFactory(rxContext)));
}
@@ -205,3 +217,5 @@ Reference<ui::XUIElement> SAL_CALL PanelFactory::createUIElement (
} } // end of namespace sd::sidebar
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 4faf84f..801b08c 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -92,6 +92,10 @@
#include <svtools/svtresid.hxx>
#include <framework/framelistanalyzer.hxx>
+#include <comphelper/processfactory.hxx>
+#include <comphelper/configuration.hxx>
+#include "officecfg/Office/Common.hxx"
+
#include <boost/optional.hpp>
using namespace ::com::sun::star;
@@ -3391,4 +3395,24 @@ void SfxViewFrame::RemoveInfoBar( const OUString& sId )
}
}
+bool SfxViewFrame::IsSidebarEnabled()
+{
+ static bool bInitialized = false;
+ static bool bEnabled = false;
+
+ // read the setting once at start, and that's what we
+ // stick with for now.
+ if (!bInitialized)
+ {
+ bInitialized = true;
+ try {
+ bEnabled = officecfg::Office::Common::Misc::ExperimentalSidebar::get(
+ comphelper::getProcessComponentContext());
+ } catch (const uno::Exception &e) {
+ SAL_WARN("sfx2.view", "don't have experimental sidebar option installed");
+ }
+ }
+ return bEnabled;
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/config/miscopt.cxx b/svtools/source/config/miscopt.cxx
index ed509e0..4ac2f9f 100644
--- a/svtools/source/config/miscopt.cxx
+++ b/svtools/source/config/miscopt.cxx
@@ -63,8 +63,10 @@ using namespace ::com::sun::star;
#define PROPERTYHANDLE_ALWAYSALLOWSAVE 8
#define PROPERTYNAME_EXPERIMENTALMODE "ExperimentalMode"
#define PROPERTYHANDLE_EXPERIMENTALMODE 9
-#define PROPERTYNAME_MACRORECORDERMODE "MacroRecorderMode"
+#define PROPERTYNAME_MACRORECORDERMODE "MacroRecorderMode"
#define PROPERTYHANDLE_MACRORECORDERMODE 10
+#define PROPERTYNAME_EXPERIMENTALSIDEBAR "ExperimentalSidebar"
+#define PROPERTYHANDLE_EXPERIMENTALSIDEBAR 11
#define VCL_TOOLBOX_STYLE_FLAT ((sal_uInt16)0x0004) // from <vcl/toolbox.hxx>
@@ -88,6 +90,7 @@ class SvtMiscOptions_Impl : public ConfigItem
sal_Bool m_bDisableUICustomization;
sal_Bool m_bAlwaysAllowSave;
sal_Bool m_bExperimentalMode;
+ sal_Bool m_bExperimentalSidebar;
sal_Bool m_bMacroRecorderMode;
public:
@@ -160,6 +163,12 @@ class SvtMiscOptions_Impl : public ConfigItem
inline sal_Bool IsExperimentalMode() const
{ return m_bExperimentalMode; }
+ inline void SetExperimentalSidebar( sal_Bool bSet )
+ { m_bExperimentalSidebar = bSet; SetModified(); }
+
+ inline sal_Bool IsExperimentalSidebar() const
+ { return m_bExperimentalSidebar; }
+
inline void SetMacroRecorderMode( sal_Bool bSet )
{ m_bMacroRecorderMode = bSet; SetModified(); }
@@ -272,6 +281,7 @@ SvtMiscOptions_Impl::SvtMiscOptions_Impl()
, m_bIsShowLinkWarningDialogRO( sal_False )
, m_bAlwaysAllowSave( sal_False )
, m_bExperimentalMode( sal_False )
+ , m_bExperimentalSidebar( sal_False )
, m_bMacroRecorderMode( sal_False )
{
@@ -391,6 +401,12 @@ SvtMiscOptions_Impl::SvtMiscOptions_Impl()
OSL_FAIL("Wrong type of \"Misc\\MacroRecorderMode\"!" );
break;
}
+ case PROPERTYHANDLE_EXPERIMENTALSIDEBAR :
+ {
+ if( !(seqValues[nProperty] >>= m_bExperimentalSidebar) )
+ OSL_FAIL("Wrong type of \"Misc\\ExperimentalSidebar\"!" );
+ break;
+ }
}
}
@@ -673,6 +689,11 @@ void SvtMiscOptions_Impl::Commit()
seqValues[nProperty] <<= m_bMacroRecorderMode;
break;
}
+ case PROPERTYHANDLE_EXPERIMENTALSIDEBAR :
+ {
+ seqValues[nProperty] <<= m_bExperimentalSidebar;
+ break;
+ }
}
}
// Set properties in configuration.
@@ -697,7 +718,8 @@ Sequence< OUString > SvtMiscOptions_Impl::GetPropertyNames()
OUString(PROPERTYNAME_DISABLEUICUSTOMIZATION),
OUString(PROPERTYNAME_ALWAYSALLOWSAVE),
OUString(PROPERTYNAME_EXPERIMENTALMODE),
- OUString(PROPERTYNAME_MACRORECORDERMODE)
+ OUString(PROPERTYNAME_MACRORECORDERMODE),
+ OUString(PROPERTYNAME_EXPERIMENTALSIDEBAR)
};
// Initialize return sequence with these list ...
@@ -878,6 +900,16 @@ sal_Bool SvtMiscOptions::IsExperimentalMode() const
return m_pDataContainer->IsExperimentalMode();
}
+void SvtMiscOptions::SetExperimentalSidebar( sal_Bool bSet )
+{
+ m_pDataContainer->SetExperimentalSidebar( bSet );
+}
+
+sal_Bool SvtMiscOptions::IsExperimentalSidebar() const
+{
+ return m_pDataContainer->IsExperimentalSidebar();
+}
+
void SvtMiscOptions::SetMacroRecorderMode( sal_Bool bSet )
{
m_pDataContainer->SetMacroRecorderMode( bSet );
commit e9c2d5b26b1e1b52bdf87192a76314b7362fa80c
Author: Michael Meeks <michael.meeks at suse.com>
Date: Thu May 16 20:36:08 2013 +0100
Restore FrameworkHelper taskpane URLs.
Change-Id: If14c8784f4ee15f7611d3cbbb04b1a78c9171bf7
diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx
index f3ed525..ab98a7a 100644
--- a/sd/source/ui/framework/tools/FrameworkHelper.cxx
+++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx
@@ -171,6 +171,7 @@ const OUString FrameworkHelper::msCenterPaneURL( msPaneURLPrefix + "CenterPane")
const OUString FrameworkHelper::msFullScreenPaneURL( msPaneURLPrefix + "FullScreenPane");
const OUString FrameworkHelper::msLeftImpressPaneURL( msPaneURLPrefix + "LeftImpressPane");
const OUString FrameworkHelper::msLeftDrawPaneURL( msPaneURLPrefix + "LeftDrawPane");
+const OUString FrameworkHelper::msRightPaneURL( msPaneURLPrefix + "RightPane");
const OUString FrameworkHelper::msSidebarPaneURL( msPaneURLPrefix + "SidebarPane");
@@ -184,6 +185,7 @@ const OUString FrameworkHelper::msNotesViewURL( msViewURLPrefix + "NotesView");
const OUString FrameworkHelper::msHandoutViewURL( msViewURLPrefix + "HandoutView");
const OUString FrameworkHelper::msSlideSorterURL( msViewURLPrefix + "SlideSorter");
const OUString FrameworkHelper::msPresentationViewURL( msViewURLPrefix + "PresentationView");
+const OUString FrameworkHelper::msTaskPaneURL( msViewURLPrefix + "TaskPane");
const OUString FrameworkHelper::msSidebarViewURL( msViewURLPrefix + "SidebarView");
@@ -194,6 +196,7 @@ const OUString FrameworkHelper::msViewTabBarURL( msToolBarURLPrefix + "ViewTabBa
// Task panel URLs.
+// FIXME: MMeeks - this set of urls changed:
const OUString FrameworkHelper::msTaskPanelURLPrefix( "private:resource/toolpanel/" );
const OUString FrameworkHelper::msMasterPagesTaskPanelURL( msTaskPanelURLPrefix + "MasterPages");
const OUString FrameworkHelper::msAllMasterPagesTaskPanelURL( msTaskPanelURLPrefix + "AllMasterPages" );
diff --git a/sd/source/ui/inc/PaneChildWindows.hxx b/sd/source/ui/inc/PaneChildWindows.hxx
index 6da8cf1..b2f63d9 100644
--- a/sd/source/ui/inc/PaneChildWindows.hxx
+++ b/sd/source/ui/inc/PaneChildWindows.hxx
@@ -40,9 +40,6 @@ public:
virtual ~PaneChildWindow (void);
};
-
-
-
class LeftPaneImpressChildWindow
: public PaneChildWindow
{
@@ -52,9 +49,6 @@ public:
SFX_DECL_CHILDWINDOW_WITHID(LeftPaneImpressChildWindow);
};
-
-
-
class LeftPaneDrawChildWindow
: public PaneChildWindow
{
@@ -64,6 +58,21 @@ public:
SFX_DECL_CHILDWINDOW_WITHID(LeftPaneDrawChildWindow);
};
+class ToolPanelChildWindow : public PaneChildWindow
+ , public ::sfx2::ITaskPaneToolPanelAccess
+{
+public:
+ ToolPanelChildWindow(
+ ::Window* i_pParentWindow,
+ sal_uInt16 i_nId,
+ SfxBindings* i_pBindings,
+ SfxChildWinInfo* i_pChildWindowInfo );
+
+ SFX_DECL_CHILDWINDOW_WITHID( ToolPanelChildWindow );
+
+ // ::sfx2::ITaskPaneToolPanelAccess
+ virtual void ActivateToolPanel( const OUString& i_rPanelURL );
+};
} // end of namespace ::sd
diff --git a/sd/source/ui/inc/framework/FrameworkHelper.hxx b/sd/source/ui/inc/framework/FrameworkHelper.hxx
index 4aac186..9964bb6 100644
--- a/sd/source/ui/inc/framework/FrameworkHelper.hxx
+++ b/sd/source/ui/inc/framework/FrameworkHelper.hxx
@@ -66,6 +66,7 @@ public:
static const OUString msFullScreenPaneURL;
static const OUString msLeftImpressPaneURL;
static const OUString msLeftDrawPaneURL;
+ static const OUString msRightPaneURL;
static const OUString msSidebarPaneURL;
// URLs of frequently used views.
@@ -77,6 +78,7 @@ public:
static const OUString msHandoutViewURL;
static const OUString msSlideSorterURL;
static const OUString msPresentationViewURL;
+ static const OUString msTaskPaneURL;
static const OUString msSidebarViewURL;
// URLs of frequently used tool bars.
@@ -85,6 +87,7 @@ public:
// URLs of task panels.
static const OUString msTaskPanelURLPrefix;
+ static const OUString msMasterPagesTaskPanelURL;
static const OUString msAllMasterPagesTaskPanelURL;
static const OUString msRecentMasterPagesTaskPanelURL;
static const OUString msUsedMasterPagesTaskPanelURL;
commit c6b5466cea171446bf3abed91c5b29aeb875f952
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed May 15 09:58:16 2013 +0100
various build fixes
Change-Id: I07002afa93dbf1e3b0a9829970c548abff81d55b
diff --git a/include/sfx2/sidebar/SidebarToolBox.hxx b/include/sfx2/sidebar/SidebarToolBox.hxx
index 6bc9a34..4d5625c 100644
--- a/include/sfx2/sidebar/SidebarToolBox.hxx
+++ b/include/sfx2/sidebar/SidebarToolBox.hxx
@@ -85,8 +85,8 @@ private:
DECL_LINK(ClickHandler, ToolBox*);
DECL_LINK(DoubleClickHandler, ToolBox*);
DECL_LINK(SelectHandler, ToolBox*);
- DECL_LINK(Activate, ToolBox*);
- DECL_LINK(Deactivate, ToolBox*);
+ DECL_LINK(ActivateToolBox, ToolBox*);
+ DECL_LINK(DeactivateToolBox, ToolBox*);
void CreateController (
const sal_uInt16 nItemId,
diff --git a/sfx2/source/sidebar/ControllerFactory.cxx b/sfx2/source/sidebar/ControllerFactory.cxx
index e7463a8..7ce9eb8 100644
--- a/sfx2/source/sidebar/ControllerFactory.cxx
+++ b/sfx2/source/sidebar/ControllerFactory.cxx
@@ -15,7 +15,6 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "precompiled_sfx2.hxx"
#include "sfx2/sidebar/ControllerFactory.hxx"
#include "sfx2/sidebar/CommandInfoProvider.hxx"
@@ -53,7 +52,7 @@ Reference<frame::XToolbarController> ControllerFactory::CreateToolBoxController(
if ( ! xController.is())
xController.set(
static_cast<XWeak*>(new svt::GenericToolboxController(
- ::comphelper::getProcessServiceFactory(),
+ ::comphelper::getProcessComponentContext(),
rxFrame,
pToolBox,
nItemId,
diff --git a/sfx2/source/sidebar/SidebarToolBox.cxx b/sfx2/source/sidebar/SidebarToolBox.cxx
index ea4f910..61110ee 100644
--- a/sfx2/source/sidebar/SidebarToolBox.cxx
+++ b/sfx2/source/sidebar/SidebarToolBox.cxx
@@ -60,8 +60,8 @@ SidebarToolBox::SidebarToolBox (
SetClickHdl(LINK(this, SidebarToolBox, ClickHandler));
SetDoubleClickHdl(LINK(this, SidebarToolBox, DoubleClickHandler));
SetSelectHdl(LINK(this, SidebarToolBox, SelectHandler));
- SetActivateHdl(LINK(this, SidebarToolBox, Activate));
- SetDeactivateHdl(LINK(this, SidebarToolBox, Deactivate));
+ SetActivateHdl(LINK(this, SidebarToolBox, ActivateToolBox));
+ SetDeactivateHdl(LINK(this, SidebarToolBox, DeactivateToolBox));
}
#ifdef DEBUG
@@ -251,14 +251,13 @@ Reference<frame::XToolbarController> SidebarToolBox::GetControllerForItemId (con
void SidebarToolBox::UpdateIcons (const Reference<frame::XFrame>& rxFrame)
{
const sal_Bool bBigImages (SvtMiscOptions().AreCurrentSymbolsLarge());
- const bool bIsHighContrastActive (sfx2::sidebar::Theme::IsHighContrastMode());
for (ControllerContainer::iterator iController(maControllers.begin()), iEnd(maControllers.end());
iController!=iEnd;
++iController)
{
const ::rtl::OUString sCommandURL (iController->second.msCurrentCommand);
- Image aImage (framework::GetImageFromURL(rxFrame, sCommandURL, bBigImages, bIsHighContrastActive));
+ Image aImage (framework::GetImageFromURL(rxFrame, sCommandURL, bBigImages));
SetItemImage(iController->first, aImage);
}
}
@@ -349,7 +348,7 @@ IMPL_LINK(SidebarToolBox, SelectHandler, ToolBox*, pToolBox)
-IMPL_LINK(SidebarToolBox, Activate, ToolBox*, EMPTYARG)
+IMPL_LINK(SidebarToolBox, ActivateToolBox, ToolBox*, EMPTYARG)
{
return 1;
}
@@ -357,7 +356,7 @@ IMPL_LINK(SidebarToolBox, Activate, ToolBox*, EMPTYARG)
-IMPL_LINK(SidebarToolBox, Deactivate, ToolBox*, EMPTYARG)
+IMPL_LINK(SidebarToolBox, DeactivateToolBox, ToolBox*, EMPTYARG)
{
return 1;
}
commit 5429bcb3f04476486f0644bbad297f5a19d53bac
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed May 15 09:58:16 2013 +0100
setPosSizePixel->SetPosSizePixel
Change-Id: I07002afa93dbf1e3b0a9829970c548abff81d55b
diff --git a/include/sfx2/sidebar/SidebarToolBox.hxx b/include/sfx2/sidebar/SidebarToolBox.hxx
index 37717ad..6bc9a34 100644
--- a/include/sfx2/sidebar/SidebarToolBox.hxx
+++ b/include/sfx2/sidebar/SidebarToolBox.hxx
@@ -54,7 +54,7 @@ public:
virtual void Paint (const Rectangle& rRect);
virtual Point GetPosPixel (void) const;
- virtual void SetPosSizePixel (
+ virtual void setPosSizePixel (
long nX,
long nY,
long nWidth,
commit 80118379b2e930e85887480358cf1458e27c1064
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed May 15 09:10:25 2013 +0100
move some new includes files to new include locations
Change-Id: I34b18fb2e0f1eae01eff5b8e849dd5f5744335f6
diff --git a/svx/inc/svx/AffineMatrixItem.hxx b/include/svx/AffineMatrixItem.hxx
similarity index 100%
rename from svx/inc/svx/AffineMatrixItem.hxx
rename to include/svx/AffineMatrixItem.hxx
diff --git a/svx/inc/svx/XPropertyEntry.hxx b/include/svx/XPropertyEntry.hxx
similarity index 100%
rename from svx/inc/svx/XPropertyEntry.hxx
rename to include/svx/XPropertyEntry.hxx
diff --git a/svx/inc/svx/nbdtmg.hxx b/include/svx/nbdtmg.hxx
similarity index 100%
rename from svx/inc/svx/nbdtmg.hxx
rename to include/svx/nbdtmg.hxx
diff --git a/svx/inc/svx/nbdtmgfact.hxx b/include/svx/nbdtmgfact.hxx
similarity index 100%
rename from svx/inc/svx/nbdtmgfact.hxx
rename to include/svx/nbdtmgfact.hxx
diff --git a/svx/inc/svx/sdr/table/tablecontroller.hxx b/include/svx/sdr/table/tablecontroller.hxx
similarity index 100%
rename from svx/inc/svx/sdr/table/tablecontroller.hxx
rename to include/svx/sdr/table/tablecontroller.hxx
diff --git a/svx/inc/svx/sidebar/ColorControl.hxx b/include/svx/sidebar/ColorControl.hxx
similarity index 100%
rename from svx/inc/svx/sidebar/ColorControl.hxx
rename to include/svx/sidebar/ColorControl.hxx
diff --git a/svx/inc/svx/sidebar/ColorPopup.hxx b/include/svx/sidebar/ColorPopup.hxx
similarity index 100%
rename from svx/inc/svx/sidebar/ColorPopup.hxx
rename to include/svx/sidebar/ColorPopup.hxx
diff --git a/svx/inc/svx/sidebar/ContextChangeEventMultiplexer.hxx b/include/svx/sidebar/ContextChangeEventMultiplexer.hxx
similarity index 100%
rename from svx/inc/svx/sidebar/ContextChangeEventMultiplexer.hxx
rename to include/svx/sidebar/ContextChangeEventMultiplexer.hxx
diff --git a/svx/inc/svx/sidebar/Popup.hxx b/include/svx/sidebar/Popup.hxx
similarity index 100%
rename from svx/inc/svx/sidebar/Popup.hxx
rename to include/svx/sidebar/Popup.hxx
diff --git a/svx/inc/svx/sidebar/PopupContainer.hxx b/include/svx/sidebar/PopupContainer.hxx
similarity index 100%
rename from svx/inc/svx/sidebar/PopupContainer.hxx
rename to include/svx/sidebar/PopupContainer.hxx
diff --git a/svx/inc/svx/sidebar/PopupControl.hxx b/include/svx/sidebar/PopupControl.hxx
similarity index 100%
rename from svx/inc/svx/sidebar/PopupControl.hxx
rename to include/svx/sidebar/PopupControl.hxx
diff --git a/svx/inc/svx/sidebar/SelectionAnalyzer.hxx b/include/svx/sidebar/SelectionAnalyzer.hxx
similarity index 100%
rename from svx/inc/svx/sidebar/SelectionAnalyzer.hxx
rename to include/svx/sidebar/SelectionAnalyzer.hxx
diff --git a/svx/inc/svx/sidebar/SelectionChangeHandler.hxx b/include/svx/sidebar/SelectionChangeHandler.hxx
similarity index 100%
rename from svx/inc/svx/sidebar/SelectionChangeHandler.hxx
rename to include/svx/sidebar/SelectionChangeHandler.hxx
diff --git a/svx/inc/svx/sidebar/SidebarDialControl.hxx b/include/svx/sidebar/SidebarDialControl.hxx
similarity index 100%
rename from svx/inc/svx/sidebar/SidebarDialControl.hxx
rename to include/svx/sidebar/SidebarDialControl.hxx
diff --git a/svx/inc/svx/sidebar/ValueSetWithTextControl.hxx b/include/svx/sidebar/ValueSetWithTextControl.hxx
similarity index 100%
rename from svx/inc/svx/sidebar/ValueSetWithTextControl.hxx
rename to include/svx/sidebar/ValueSetWithTextControl.hxx
commit a9626f143a1466591764b03baa2d15905487b692
Author: Andre Fischer <af at apache.org>
Date: Tue May 14 15:21:57 2013 +0000
Resolves: #i122302# Use tool bar controls for color controls...
in text property panel
(cherry picked from commit 3b252796e1126b5ec1216082f55b8d12017eaeb1)
Conflicts:
sfx2/Package_inc.mk
sfx2/inc/sfx2/sidebar/ControlFactory.hxx
sfx2/inc/sfx2/sidebar/ControllerFactory.hxx
sfx2/inc/sfx2/sidebar/EnumContext.hxx
sfx2/source/sidebar/SidebarToolBox.cxx
svx/source/sidebar/insert/InsertPropertyPanel.cxx
svx/source/sidebar/insert/InsertPropertyPanel.hxx
svx/source/sidebar/text/TextPropertyPanel.cxx
Change-Id: Ifa1947c9e9bfdc3635dbb5b0c7a79f8ead613a90
diff --git a/include/sfx2/sidebar/ControlFactory.hxx b/include/sfx2/sidebar/ControlFactory.hxx
index 594c36c..3b286e9 100644
--- a/include/sfx2/sidebar/ControlFactory.hxx
+++ b/include/sfx2/sidebar/ControlFactory.hxx
@@ -19,21 +19,34 @@
#define SFX_SIDEBAR_CONTROL_FACTORY_HXX
#include <sfx2/dllapi.h>
+#include <sfx2/sidebar/SidebarToolBox.hxx>
#include <vcl/button.hxx>
-
+#include <com/sun/star/frame/XFrame.hpp>
class ToolBox;
namespace sfx2 { namespace sidebar {
class ToolBoxBackground;
-
class SFX2_DLLPUBLIC ControlFactory
{
public:
static CheckBox* CreateMenuButton (Window* pParentWindow);
static ImageRadioButton* CreateTabItem (Window* pParentWindow);
- static ToolBox* CreateToolBox (Window* pParentWindow, const ResId& rResId);
+
+ /** Create a tool box that does *not* handle its items.
+ */
+ static SidebarToolBox* CreateToolBox (
+ Window* pParentWindow,
+ const ResId& rResId);
+
+ /** Create a tool box that *does* handle its items.
+ */
+ static SidebarToolBox* CreateToolBox (
+ Window* pParentWindow,
+ const ResId& rResId,
+ const ::com::sun::star::uno::Reference<com::sun::star::frame::XFrame>& rxFrame);
+
static Window* CreateToolBoxBackground (Window* pParentWindow);
static ImageRadioButton* CreateCustomImageRadionButton(
Window* pParentWindow,
diff --git a/sfx2/source/sidebar/SidebarToolBox.hxx b/include/sfx2/sidebar/ControllerFactory.hxx
similarity index 58%
rename from sfx2/source/sidebar/SidebarToolBox.hxx
rename to include/sfx2/sidebar/ControllerFactory.hxx
index f76de46..030b050 100644
--- a/sfx2/source/sidebar/SidebarToolBox.hxx
+++ b/include/sfx2/sidebar/ControllerFactory.hxx
@@ -15,36 +15,30 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SFX_SIDEBAR_TOOLBOX_HXX
-#define SFX_SIDEBAR_TOOLBOX_HXX
+#ifndef SFX_SIDEBAR_CONTROLLER_FACTORY_HXX
+#define SFX_SIDEBAR_CONTROLLER_FACTORY_HXX
-#include "vcl/toolbox.hxx"
+#include "sfx2/dllapi.h"
+#include <com/sun/star/frame/XToolbarController.hpp>
+#include <com/sun/star/frame/XFrame.hpp>
+namespace css = ::com::sun::star;
+namespace cssu = ::com::sun::star::uno;
+
+class ToolBox;
namespace sfx2 { namespace sidebar {
-class SidebarToolBox
- : public ToolBox
+/** Convenience class for easy creation of toolbox controllers.
+*/
+class SFX2_DLLPUBLIC ControllerFactory
{
public:
- SidebarToolBox (Window* pParentWindow, const ResId& rResId);
- virtual ~SidebarToolBox (void);
-
- void SetBorderWindow (const Window* pBorderWindow);
- virtual void Paint (const Rectangle& rRect);
-
- virtual Point GetPosPixel (void) const;
- virtual void setPosSizePixel (
- long nX,
- long nY,
- long nWidth,
- long nHeight,
- sal_uInt16 nFlags);
- virtual long Notify (NotifyEvent& rEvent);
-
-private:
- bool mbParentIsBorder;
- Image maItemSeparator;
+ static cssu::Reference<css::frame::XToolbarController> CreateToolBoxController(
+ ToolBox* pToolBox,
+ const sal_uInt16 nItemId,
+ const ::rtl::OUString& rsCommandName,
+ const cssu::Reference<css::frame::XFrame>& rxFrame);
};
diff --git a/include/sfx2/sidebar/EnumContext.hxx b/include/sfx2/sidebar/EnumContext.hxx
index b11f3bf..f45ecd9 100644
--- a/include/sfx2/sidebar/EnumContext.hxx
+++ b/include/sfx2/sidebar/EnumContext.hxx
@@ -125,6 +125,9 @@ public:
sal_Int32 GetCombinedContext_DI(void) const;
const ::rtl::OUString& GetApplicationName (void) const;
+ Application GetApplication (void) const;
+ Application GetApplication_DI (void) const;
+
const ::rtl::OUString& GetContextName (void) const;
bool operator == (const EnumContext aOther);
diff --git a/include/sfx2/sidebar/SidebarToolBox.hxx b/include/sfx2/sidebar/SidebarToolBox.hxx
new file mode 100644
index 0000000..37717ad
--- /dev/null
+++ b/include/sfx2/sidebar/SidebarToolBox.hxx
@@ -0,0 +1,101 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#ifndef SFX_SIDEBAR_TOOLBOX_HXX
+#define SFX_SIDEBAR_TOOLBOX_HXX
+
+#include "sfx2/dllapi.h"
+#include "vcl/toolbox.hxx"
+#include <com/sun/star/frame/XDispatch.hpp>
+#include <com/sun/star/frame/XFrame.hpp>
+#include <com/sun/star/frame/XToolbarController.hpp>
+#include <com/sun/star/util/URL.hpp>
+#include <map>
+
+namespace css = ::com::sun::star;
+namespace cssu = ::com::sun::star::uno;
+
+namespace sfx2 { namespace sidebar {
+
+/** The sidebar tool box has two responsibilities:
+ 1. Coordinated location, size, and other states with its parent
+ background window.
+ 2. Create and handle tool bar controller for its items.
+*/
+class SFX2_DLLPUBLIC SidebarToolBox
+ : public ToolBox
+{
+public:
+ /** Create a new tool box.
+ When a valid XFrame is given then the tool box will handle its
+ buttons and drop-downs. Otherwise the caller has to do that.
+ */
+ SidebarToolBox (
+ Window* pParentWindow,
+ const ResId& rResId,
+ const cssu::Reference<css::frame::XFrame>& rxFrame);
+ virtual ~SidebarToolBox (void);
+
+ void SetBorderWindow (const Window* pBorderWindow);
+ virtual void Paint (const Rectangle& rRect);
+
+ virtual Point GetPosPixel (void) const;
+ virtual void SetPosSizePixel (
+ long nX,
+ long nY,
+ long nWidth,
+ long nHeight,
+ sal_uInt16 nFlags);
+ virtual long Notify (NotifyEvent& rEvent);
+
+ cssu::Reference<css::frame::XToolbarController> GetControllerForItemId (
+ const sal_uInt16 nItemId) const;
+ sal_uInt16 GetItemIdForSubToolbarName (
+ const ::rtl::OUString& rsCOmmandName) const;
+
+private:
+ bool mbParentIsBorder;
+ Image maItemSeparator;
+ class ItemDescriptor
+ {
+ public:
+ cssu::Reference<css::frame::XToolbarController> mxController;
+ css::util::URL maURL;
+ rtl::OUString msCurrentCommand;
+ cssu::Reference<css::frame::XDispatch> mxDispatch;
+ };
+ typedef ::std::map<sal_uInt16, ItemDescriptor> ControllerContainer;
+ ControllerContainer maControllers;
+
+ DECL_LINK(DropDownClickHandler, ToolBox*);
+ DECL_LINK(ClickHandler, ToolBox*);
+ DECL_LINK(DoubleClickHandler, ToolBox*);
+ DECL_LINK(SelectHandler, ToolBox*);
+ DECL_LINK(Activate, ToolBox*);
+ DECL_LINK(Deactivate, ToolBox*);
+
+ void CreateController (
+ const sal_uInt16 nItemId,
+ const cssu::Reference<css::frame::XFrame>& rxFrame);
+ void UpdateIcons (
+ const cssu::Reference<css::frame::XFrame>& rxFrame);
+};
+
+
+} } // end of namespace sfx2::sidebar
+
+#endif
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index 09ddbe1..03775fd 100644
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -239,6 +239,7 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\
sfx2/source/sidebar/ContextChangeBroadcaster \
sfx2/source/sidebar/ContextList \
sfx2/source/sidebar/ControlFactory \
+ sfx2/source/sidebar/ControllerFactory \
sfx2/source/sidebar/ControllerItem \
sfx2/source/sidebar/CustomImageRadioButton \
sfx2/source/sidebar/Deck \
diff --git a/sfx2/source/sidebar/ControlFactory.cxx b/sfx2/source/sidebar/ControlFactory.cxx
index 43946e0..1a6f9a5 100644
--- a/sfx2/source/sidebar/ControlFactory.cxx
+++ b/sfx2/source/sidebar/ControlFactory.cxx
@@ -19,7 +19,7 @@
#include "MenuButton.hxx"
#include "TabItem.hxx"
-#include "SidebarToolBox.hxx"
+#include "sfx2/sidebar/SidebarToolBox.hxx"
#include "ToolBoxBackground.hxx"
#include "CustomImageRadioButton.hxx"
#include <vcl/toolbox.hxx>
@@ -44,11 +44,27 @@ ImageRadioButton* ControlFactory::CreateTabItem (Window* pParentWindow)
-ToolBox* ControlFactory::CreateToolBox (
+SidebarToolBox* ControlFactory::CreateToolBox (
Window* pParentWindow,
const ResId& rResId)
{
- SidebarToolBox* pToolBox = new SidebarToolBox(pParentWindow, rResId);
+ SidebarToolBox* pToolBox = new SidebarToolBox(pParentWindow, rResId, NULL);
+ pToolBox->SetBorderWindow(pParentWindow);
+
+ pToolBox->Invalidate();
+
+ return pToolBox;
+}
+
+
+
+
+SidebarToolBox* ControlFactory::CreateToolBox (
+ Window* pParentWindow,
+ const ResId& rResId,
+ const cssu::Reference<css::frame::XFrame>& rxFrame)
+{
+ SidebarToolBox* pToolBox = new SidebarToolBox(pParentWindow, rResId, rxFrame);
pToolBox->SetBorderWindow(pParentWindow);
pToolBox->Invalidate();
diff --git a/sfx2/source/sidebar/ControllerFactory.cxx b/sfx2/source/sidebar/ControllerFactory.cxx
new file mode 100644
index 0000000..e7463a8
--- /dev/null
+++ b/sfx2/source/sidebar/ControllerFactory.cxx
@@ -0,0 +1,104 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#include "precompiled_sfx2.hxx"
+
+#include "sfx2/sidebar/ControllerFactory.hxx"
+#include "sfx2/sidebar/CommandInfoProvider.hxx"
+#include "sfx2/sidebar/Tools.hxx"
+
+#include <com/sun/star/frame/XToolbarController.hpp>
+#include <com/sun/star/frame/XFrame.hpp>
+
+#include <framework/sfxhelperfunctions.hxx>
+#include <svtools/generictoolboxcontroller.hxx>
+#include <comphelper/processfactory.hxx>
+
+
+using namespace css;
+using namespace cssu;
+using ::rtl::OUString;
+
+
+namespace sfx2 { namespace sidebar {
+
+Reference<frame::XToolbarController> ControllerFactory::CreateToolBoxController(
+ ToolBox* pToolBox,
+ const sal_uInt16 nItemId,
+ const OUString& rsCommandName,
+ const Reference<frame::XFrame>& rxFrame)
+{
+ // Create a controller for the new item.
+ Reference<frame::XToolbarController> xController(
+ static_cast<XWeak*>(::framework::CreateToolBoxController(
+ rxFrame,
+ pToolBox,
+ nItemId,
+ rsCommandName)),
+ UNO_QUERY);
+ if ( ! xController.is())
+ xController.set(
+ static_cast<XWeak*>(new svt::GenericToolboxController(
+ ::comphelper::getProcessServiceFactory(),
+ rxFrame,
+ pToolBox,
+ nItemId,
+ rsCommandName)),
+ UNO_QUERY);
+
+ // Initialize the controller with eg a service factory.
+ Reference<lang::XInitialization> xInitialization (xController, UNO_QUERY);
+ if (xInitialization.is())
+ {
+ beans::PropertyValue aPropValue;
+ std::vector<Any> aPropertyVector;
+
+ aPropValue.Name = A2S("Frame");
+ aPropValue.Value <<= rxFrame;
+ aPropertyVector.push_back(makeAny(aPropValue));
+
+ aPropValue.Name = A2S("ServiceManager");
+ aPropValue.Value <<= ::comphelper::getProcessServiceFactory();
+ aPropertyVector.push_back(makeAny(aPropValue));
+
+ aPropValue.Name = A2S("CommandURL");
+ aPropValue.Value <<= rsCommandName;
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list