summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-05-20Related: #i122144# Color mode control now looks like in toolbarAndre Fischer4-113/+70
and fixed overlapping icons and metric fields. (cherry picked from commit 835892332e2fda9e2082668679fb0385bf37eaaf) Change-Id: I21a78328bf11f7368ba97fc47b72f247e7316706
2013-05-20Related: #i122156# #i122087# correct context notification...Oliver-Rainer Wittmann4-4/+78
regarding the text edit mode for Drawing objects - take two (cherry picked from commit 3dd1e0f85ba7d0fdcb2de134184407201ca7fae0) Conflicts: sc/source/ui/inc/drawview.hxx sc/source/ui/view/drawview.cxx Change-Id: Icfe16b76fc4fcc838133d8410736877703e5c23b
2013-05-20Related: #i122157# Added sidebar menu entry to more writer variantsAndre Fischer5-0/+5
(cherry picked from commit bbd95678a1ba46a715243c563c6a4a86bfa5ad91) Change-Id: Iea83e8778b293fc78e3aa7a0bd34e940e54755d7
2013-05-20Resolved: #i122186# Rearranged controls in text property panel...Andre Fischer4-76/+43
to make font selection box wider. (cherry picked from commit 4484a62e0365fc36cc2a9e3ad1c71749d260d4d0) Change-Id: I4a189c106b497da36e3ad0d13a8e6087b95e73c2
2013-05-20Resolves: #i122082# Hide sidebar panels for read only documentsAndre Fischer15-203/+535
(cherry picked from commit aae247a34cd6f3bf421e57bbec08837d73ddf258) Conflicts: sfx2/inc/sfx2/sidebar/SidebarChildWindow.hxx sfx2/inc/sfx2/sidebar/Theme.hxx sfx2/source/sidebar/SidebarChildWindow.cxx sfx2/source/sidebar/SidebarController.cxx sfx2/source/sidebar/SidebarDockingWindow.cxx Change-Id: Ib59132d6d5e177d5a02ee24973b0fb07114db60a
2013-05-20Related: #i122156# #i122087# correct context notification...Oliver-Rainer Wittmann3-30/+41
regarding the text edit mode for Drawing objects (cherry picked from commit a0e76afb572510e2c2c75fc6c558f271c0d74d0b) Change-Id: I8b4e5cbd865455ef3d7046f9d65c5dd68a53d8ce
2013-05-20Related: #i122144# Replace more Symphony icons with standard iconsAndre Fischer18-199/+68
ParaPropertyPanel (cherry picked from commit 8808ad841fd74a482c8b0f192c1a3a936f12dcfc) Conflicts: icon-themes/galaxy/svx/res/symphony/AlignTextCenter_16x16.png icon-themes/galaxy/svx/res/symphony/AlignTextJustified_16x16.png icon-themes/galaxy/svx/res/symphony/AlignTextLeft_16x16.png icon-themes/galaxy/svx/res/symphony/AlignTextRight_16x16.png icon-themes/galaxy/svx/res/symphony/Indent_16x16.png icon-themes/galaxy/svx/res/symphony/Outdent_16x16.png icon-themes/galaxy/svx/res/symphony/para_vert01.png icon-themes/galaxy/svx/res/symphony/para_vert02.png icon-themes/galaxy/svx/res/symphony/para_vert03.png icon-themes/galaxy/svx/res/symphony/para_verth01.png icon-themes/galaxy/svx/res/symphony/para_verth02.png icon-themes/galaxy/svx/res/symphony/para_verth03.png icon-themes/galaxy/svx/res/symphony/rte_Indent_16x16.png icon-themes/galaxy/svx/res/symphony/rte_Outdent_16x16.png Change-Id: Idedcbb16b99a0fa7126d4e095e13e4f3a1f3f013 Fix build breaker: declare missing member variable (cherry picked from commit eb15aa364708f091c4c59a66f9c3f43e35dafd31) Change-Id: Ie53ff7cea8874048fe575003a0ae4ded25b6535b Fix build breaker: remove missing images (cherry picked from commit 2f116e91d1960503589ce10b726a5383dead800f) Change-Id: I6130c7b55b03b3962ec72f49d48084324dfdc3df
2013-05-20Related: #i122144# Use standard icons for sidebar number formatsAndre Fischer9-42/+20
(cherry picked from commit 7a309ee2def4ece46f78371ee18e94fae9fc3c05) Conflicts: icon-themes/galaxy/sc/res/sidebar/123.png icon-themes/galaxy/sc/res/sidebar/ABC.png icon-themes/galaxy/sc/res/sidebar/canlendar.png icon-themes/galaxy/sc/res/sidebar/money.png icon-themes/galaxy/sc/res/sidebar/percent.png Change-Id: I69c6c9b6f6cf887332186b68ca4b9e8775575855
2013-05-20Related: #i122144# Use same color for all sidebar backgroundsAndre Fischer1-5/+5
(cherry picked from commit ae86d3036171e63bfe193e678c9c05a1ec1a12bb) Change-Id: I4879d515f45f74b25e0319d3244c5722a449c7ed
2013-05-20Resolves: #ii122166# refine icons of numbering and bullets toolbox...Zheng Fan2-4/+16
inside sidebar for consistency (cherry picked from commit 6818706a832b4f6281cdf31d274b4a72c0ff2d58) Conflicts: svx/source/sidebar/paragraph/ParaPropertyPanel.cxx Change-Id: Ida87df66cd35066415a83e369008a4b1e20ab171
2013-05-20Resolves: #i122141# introduce missing Char Font dialog SlotOliver-Rainer Wittmann4-2/+34
for opening Character Font dialog for Text property panel in Calc (cherry picked from commit 2ec379f0bc8af50ead792677b1f69c61d6903cf3) Change-Id: I07e7affe744efe151c8701e096fde01a52c2d7e0
2013-05-20Related: #i121420# apply context dependent Show Menu Commands...Oliver-Rainer Wittmann6-31/+51
according given panel configurations (cherry picked from commit c4a3b967b0ba367b219ac181fe2ed24a64e3c224) Change-Id: Ib2b3161c70112032659e712556641a46f43edcd0
2013-05-20Resolves: #i122074# paragraph property panelOliver-Rainer Wittmann1-21/+14
correct enable/disable of indentation increase/decrease controls (cherry picked from commit cc9eaeaaa2ab279db0bf9a8fa63034333dbdaae3) Change-Id: Ia7c676435859027f0526d6253db771e2359bb7cc
2013-05-20Related: #i122121# moved automatic StartEnd adaption to svxArmin Le Grand2-128/+42
(cherry picked from commit 81e9ede3e748a40555e87efd1af19521dab5261d) Conflicts: sd/source/ui/view/drviews2.cxx Change-Id: I5ce51fce89e8f29d2f469bf11c5ba6f075f690f2
2013-05-20Related: #ii122121# Adapted ScDrawShell::GetDrawAttrStateArmin Le Grand1-14/+3
(cherry picked from commit 8120312665d94223a1e506fb6f46d2e0e9bc30ad) Conflicts: sc/source/ui/drawfunc/drawsh2.cxx Change-Id: I19b1b7e83f16b618ecac95f000c15a60288ce5ae
2013-05-20Related: #i122111# Adapted pState usages in NotifyItemUpdate methodsArmin Le Grand6-667/+809
adapted control positioning in PosSizePanel (cherry picked from commit 76e55d0f6effee49090d1e931c372671ec184123) Conflicts: svx/source/sidebar/area/AreaPropertyPanel.cxx svx/source/sidebar/area/AreaPropertyPanel.hxx Change-Id: I5762c5208259ca071decebcc937bfaab8e0464b2
2013-05-20Resolves: #i122067# show correct state in paragraph property panelOliver-Rainer Wittmann8-133/+82
i.e. the paragraph property panel's bullet and numbering popup control (cherry picked from commit 167f05365100f6c9bcbd17045e4feeea3cd120d9) Conflicts: svx/source/sidebar/paragraph/ParaBulletsControl.cxx svx/source/sidebar/paragraph/ParaNumberingControl.cxx svx/source/sidebar/paragraph/ParaPropertyPanel.cxx svx/source/sidebar/paragraph/ParaPropertyPanel.hrc Change-Id: Iacea3f063d1050f873cff443fb3e1df4b8983279
2013-05-20Resolves: #i122093# Don't show Impress layouts panel for master pagesAndre Fischer7-82/+59
(cherry picked from commit 573490c7240fc02dcf82bf0ba262863612e53187) Conflicts: sd/source/ui/sidebar/LayoutMenu.cxx Change-Id: Ie5c0a1e15ea8db2d2b033efb1234492bd438658d Related: #i122093# WaE in DrawController::BroadcastContextChenge() (cherry picked from commit 26e4fcdbb8594696b45d0600e1b7a5e5946cd2aa) Change-Id: I416215077643f3eb4d43eb761e457d0893bcc429
2013-05-20Resolves: #i122086# Show icons in decks and titles (optionally)Andre Fischer9-2/+127
(cherry picked from commit 80b53edb04ed2d4b4f27f8256b754593902f0c23) Change-Id: Ic9aafce182b96aa44956d9ddbf165f4cc736e41b
2013-05-20Related: #i121793# correction for page property panel:Oliver-Rainer Wittmann7-51/+106
- show correct state in popups - aggregate multiple attribute changes into one undo action (cherry picked from commit 306b1c56dc88ac357093d1dc5eb8c8360f8f7100) Conflicts: sw/source/ui/sidebar/PagePropertyPanel.cxx sw/source/ui/uiview/viewtab.cxx Change-Id: I4764be46535fe7a00cbb296c06094e3f8ea461df
2013-05-20Resolves: #i122085# Fixed over-painting of fixed textAndre Fischer1-9/+12
(cherry picked from commit 0ba322a27a8d0651f410741d79bbb7125a8ec2b7) Change-Id: I208297d67bdb9e0277b39c0dc78b777f5eb2a7fa
2013-05-20Resolves: #ii122111# Corrected LinePropertyPanel::NotifyItemUpdateArmin Le Grand2-104/+126
to use pState with more care (cherry picked from commit 12df8f6dd3ed9ea37d9d0dd61bc56ada3bc062b1) Conflicts: svx/source/sidebar/line/LinePropertyPanel.cxx Change-Id: I380a4f9f8e43340ee03a1cd10546367b6818f74e
2013-05-20Related: #i122144# Paint titles of sidebar decks and titles boldAndre Fischer1-0/+1
(cherry picked from commit 4b7c52c48793d005d3bd618b025b890ff94e7774) Change-Id: I5e8ad1db7a962f002beb1b976d85a29bfcb5403f
2013-05-20Related: #i121960# Fixed typo that made the superscript button...Andre Fischer1-1/+1
look like the subscript button. (cherry picked from commit eac056c47b2bf233ff36436136463cb3f3eb9e23) Change-Id: I1ba1a609954cd88aa38f76c8e329f35152951ae5
2013-05-20Related: #i122051# Sidebar handles more Writer variants.Andre Fischer8-97/+122
(cherry picked from commit dc36f82362dc1fb159668937cde7cedbc3fad503) Conflicts: sfx2/inc/sfx2/sidebar/EnumContext.hxx Change-Id: I230b6dd3a68d2a17d0433f7919e74f1fcfae8d01
2013-05-20Related: #i122144#: Use AOO icons for flipping shapes.Andre Fischer6-29/+9
(cherry picked from commit 52450684d9c02f0d6d96bff731c348d85ca4ced1) Conflicts: icon-themes/galaxy/svx/res/symphony/FlipHorizontally_16x16.png icon-themes/galaxy/svx/res/symphony/FlipVertically_16x16.png Change-Id: I99e3d3b9e7046ee0de60075f49dc47f086e17dcc
2013-05-20Related: #i122041# More unifications for FillStylesArmin Le Grand27-707/+705
better defaults and better preview visualizations (cherry picked from commit 35c9acfc98fc98399005815e0464b1944f327d4e) Conflicts: officecfg/registry/schema/org/openoffice/Office/Common.xcs svtools/inc/svtools/accessibilityoptions.hxx svtools/inc/svtools/valueset.hxx svtools/source/config/accessibilityoptions.cxx svtools/source/control/ctrlbox.cxx svtools/source/control/valueset.cxx svtools/source/inc/configitems/accessibilityoptions_const.hxx svx/inc/svx/dlgctrl.hxx svx/inc/svx/xtable.hxx svx/source/dialog/dlgctrl.cxx svx/source/tbxctrls/SvxColorValueSet.cxx svx/source/xoutdev/xtabdash.cxx svx/source/xoutdev/xtable.cxx vcl/inc/ilstbox.hxx vcl/inc/vcl/combobox.hxx vcl/inc/vcl/lstbox.hxx vcl/inc/vcl/settings.hxx vcl/source/app/settings.cxx vcl/source/control/combobox.cxx vcl/source/control/ilstbox.cxx vcl/source/control/lstbox.cxx Change-Id: I905b6814cb796a35aa23fedb9ce716f77e2bfda0
2013-05-20Resolves: #i122095# React asynchronously to context changesAndre Fischer2-13/+21
In order to avoid problems in SFX2 (cherry picked from commit 61ed9eac0583e34a9b69f0a1adcc208509e336a1) Change-Id: I375603a28e788ce9257be308dc09a589240d0e58
2013-05-20minor change in syntax to make localize happyJürgen Schmidt1-7/+1
(cherry picked from commit e271ee33bd29cb8e5a7bbecdcdac71596ee2442f) Change-Id: I2079c019575c32bca0323515e51ec166c36ef94e
2013-05-20Resolves: #i122104# Fixed selection of sidebar button.Andre Fischer1-15/+7
(cherry picked from commit 8d956f9ec332f818fbe49286ba8eec28179486f2) Change-Id: If87b0dd13d1d333212d41f0a1e1122e4ef6c5ab2
2013-05-20Resolves: #i121960# Extend the sidebar::ControllerItem to check Disabled stateAndre Fischer44-647/+1090
Converted TextPropertyPanel to use this new functionality. (cherry picked from commit 5e32abe48b0833e4e370507a1e74fbb1ba98b5e3) Conflicts: officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu sfx2/inc/sfx2/sidebar/ControllerItem.hxx sfx2/source/sidebar/ControllerItem.cxx sfx2/source/sidebar/FocusManager.cxx sfx2/source/sidebar/SidebarChildWindow.cxx svx/Library_svx.mk svx/source/sidebar/text/TextPropertyPanel.cxx svx/source/sidebar/text/TextPropertyPanel.hrc svx/source/sidebar/text/TextPropertyPanel.hxx svx/source/sidebar/text/TextPropertyPanel.src svx/source/sidebar/text/TextUnderlineControl.hxx Change-Id: I3a25bb0a02e6165ceeb6dbd9e6ecd3e94051f594
2013-05-20Resolves: #i122026# adjust names of newly introduced UNO commandsOliver-Rainer Wittmann22-138/+68
correct uno:FlipHorizontal and uno:FlipVertical (cherry picked from commit 1ea8067f70bb806aa501ea72686a950f1e5ee591) Conflicts: default_images/res/commandimagelist/lc_fliphorizontal.png default_images/res/commandimagelist/lc_flipvertical.png default_images/res/commandimagelist/lch_fliphorizontal.png default_images/res/commandimagelist/lch_flipvertical.png default_images/res/commandimagelist/sc_fliphorizontal.png default_images/res/commandimagelist/sc_flipvertical.png officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu svx/sdi/svx.sdi sw/inc/cmdid.h sw/source/ui/shells/drawsh.cxx sw/uiconfig/sglobal/toolbar/graphicobjectbar.xml sw/uiconfig/swform/toolbar/graphicobjectbar.xml sw/uiconfig/swreport/toolbar/graphicobjectbar.xml sw/uiconfig/swriter/toolbar/graphicobjectbar.xml sw/uiconfig/swxform/toolbar/graphicobjectbar.xml Change-Id: I2c646586d592eb1d703c6db07e4c913d858fdc47
2013-05-20Related: #i122072# map SID_ATTR_LINE_START and SID_ATTR_LINE_END...Armin Le Grand1-2/+2
...to the correct GetState method GetDrawAttrState (cherry picked from commit 6c248d4f4f3a6e432e140900e5735e249e27dd01) Change-Id: I08636bf35dbcacf2b34fca94be3f8867e2092981
2013-05-20Related: #i122072# map SID_ATTR_LINE_START and SID_ATTR_LINE_END...Armin Le Grand1-2/+2
...to the correct GetState method GetDrawAttrState (cherry picked from commit e9b32f693643ae28d60922e344d908082f15c510) Change-Id: Ibb94a6297536d65e6f50e692306b38f7d6feb74b
2013-05-20Related: #i122041# Added 'Automatic' to TextPropertyPanel, FontColor...Armin Le Grand10-50/+45
and HilightColor. Added 'No Color' to ParagraphPropertyPanel and BackgroundColor (cherry picked from commit 6b722f7d7c1ae5a1b344a24442bd591afba8606b) Conflicts: svx/inc/svx/dialogs.hrc Change-Id: If75bdb87a1fc43e753c8c8ab15370808235926fd
2013-05-20Resolves: #i122025# UNO commands introduced with sidebarOliver-Rainer Wittmann17-226/+174
apply labels and disable their UI customization (cherry picked from commit 339494cf948e22dcb089c0d921dfb396d9233cb8) Conflicts: officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu svx/inc/svx/svxids.hrc svx/sdi/svx.sdi sw/sdi/swriter.sdi Change-Id: Ie95fb2fde14afe67c80e0037f4252e788f5ec1fb Related: #i122025# followup - remove usage of removed Slot (cherry picked from commit 0bef7cb68127ab4ff81cc80bc3f7274adf87f5ac) Change-Id: I0cf4d8c4c93d5754e4e46d4d1edc43529849b3bf
2013-05-20Resolves: #i122118# changed for incorrect tips for bullets drop downZheng Fan1-30/+34
(cherry picked from commit 947c734dfcb6fe78c9838f9c88bf89b186a424de) Conflicts: svx/source/sidebar/paragraph/ParaPropertyPanel.src Change-Id: I3e5a5650264d280206f57c8b8ff146c696b2a88d
2013-05-20Resolves: #i122054# for change the drop down list issueZheng Fan1-2/+4
(cherry picked from commit 07c075acd60e93962c785d066c84f2a80a47e958) Change-Id: Ide6bdd5177298a345bed90af68a24e0edcda1cd1
2013-05-20Related: #i122042# corrected adding default values in LineStyleListBoxArmin Le Grand1-4/+12
(cherry picked from commit 246d57106712df34b05c2522c145d244df2d31eb) Conflicts: cui/source/tabpages/tplnedef.cxx Change-Id: I6fde45b3e5a5d0a25a549ea03ec50302c8541195
2013-05-20Resolves: #i122042# corrected adding default values in LineStyleListBoxArmin Le Grand2-12/+47
(cherry picked from commit 33242bbc8350f2b253fae2d4261561796d848455) Conflicts: svx/inc/svx/dlgctrl.hxx svx/source/dialog/dlgctrl.cxx Change-Id: I4391164c0dbdd99c64fe7eca1bdd10cd92e32128
2013-05-20Related: #i122041# Adapted the descriptions in Common.xcs slightlyArmin Le Grand1-80/+47
(cherry picked from commit df8441aab1ea0d6df5619f2c7403a65dfacad125) Conflicts: officecfg/registry/schema/org/openoffice/Office/Common.xcs Change-Id: Ia107a029b431d54739fc5524c6978bb53b53a785
2013-05-20adjust .ui widgets for centralized Color ValueSetsCaolán McNamara2-0/+19
Change-Id: Ie6b86a2a48e6697f816e9975b6e34491ab0ad17e
2013-05-20Resolves: #i122041# Unified and centralized control for Color ValueSetsArmin Le Grand31-271/+1030
(cherry picked from commit 68e707bbc6fe23881b822e6efab8a2933343dc1a) Conflicts: cui/source/inc/backgrnd.hxx cui/source/inc/cuitabarea.hxx cui/source/tabpages/backgrnd.cxx cui/source/tabpages/tpcolor.cxx sd/source/ui/view/drviews6.cxx svx/Package_inc.mk svx/inc/svx/colrctrl.hxx svx/source/sidebar/tools/ColorControl.cxx svx/source/tbxctrls/colorwindow.hxx svx/source/tbxctrls/colrctrl.cxx svx/source/tbxctrls/tbcontrl.cxx Change-Id: Ie06fe355846b737ec8aae9aade4d408232c83193 Related: #i122041# Add a11y values for defining behaviour of ColorValueSets (cherry picked from commit 401e8f2db607081e62eaaa1f08a8cd8971a3f637) Conflicts: cui/source/tabpages/backgrnd.cxx officecfg/registry/schema/org/openoffice/Office/Common.xcs sc/source/ui/miscdlgs/tabbgcolordlg.cxx svtools/inc/svtools/accessibilityoptions.hxx svtools/source/inc/configitems/accessibilityoptions_const.hxx vcl/inc/vcl/bitmap.hxx vcl/source/gdi/bitmap4.cxx Change-Id: If9d0db5f22974cad1ac886eca3719ca92ca7f240
2013-05-20Related: #i121791# Corrected names for LineDashes, cleaned up resourcesArmin Le Grand6-143/+27
(cherry picked from commit f8f9cb1148f70f61f486517a1f353c4a3de8211f) Conflicts: svx/inc/svx/xtable.hxx svx/source/sidebar/line/LinePropertyPanel.cxx svx/source/sidebar/line/LinePropertyPanel.hrc svx/source/sidebar/line/LinePropertyPanel.src Change-Id: Ie49b28503e092c6685fb02c00820d4a3eaa3abb6
2013-05-20Related: #i121791# Corrected names for LineDashes, cleaned up resourcesArmin Le Grand1-21/+21
(cherry picked from commit f45335265ec5597510bf7a17cf521906c0288b9d) Change-Id: I7d50a9bc5a17bce792cfd73ab830fd2ef0a17fe9
2013-05-20Related: #i121791# Corrected names for LineDashes, cleaned up resourcesArmin Le Grand22-0/+0
(cherry picked from commit ef75cc7bf6ceb6ecf5f2fb32dd560ef05303f1f2) Conflicts: icon-themes/galaxy/svx/res/symphony/style_line1.png icon-themes/galaxy/svx/res/symphony/style_line10.png icon-themes/galaxy/svx/res/symphony/style_line11.png icon-themes/galaxy/svx/res/symphony/style_line2.png icon-themes/galaxy/svx/res/symphony/style_line3.png icon-themes/galaxy/svx/res/symphony/style_line4.png icon-themes/galaxy/svx/res/symphony/style_line5.png icon-themes/galaxy/svx/res/symphony/style_line6.png icon-themes/galaxy/svx/res/symphony/style_line7.png icon-themes/galaxy/svx/res/symphony/style_line8.png icon-themes/galaxy/svx/res/symphony/style_line9.png icon-themes/hicontrast/svx/res/symphony/style_line1.png icon-themes/hicontrast/svx/res/symphony/style_line10.png icon-themes/hicontrast/svx/res/symphony/style_line11.png icon-themes/hicontrast/svx/res/symphony/style_line2.png icon-themes/hicontrast/svx/res/symphony/style_line3.png icon-themes/hicontrast/svx/res/symphony/style_line4.png icon-themes/hicontrast/svx/res/symphony/style_line5.png icon-themes/hicontrast/svx/res/symphony/style_line6.png icon-themes/hicontrast/svx/res/symphony/style_line7.png icon-themes/hicontrast/svx/res/symphony/style_line8.png icon-themes/hicontrast/svx/res/symphony/style_line9.png Change-Id: Iccb0c2b6b1870806d05ee02569b7fdf1f96405c2
2013-05-20Resolves: #i122027# Fixed crash when processing .uno:NumberType commandAndre Fischer1-36/+40
Reported by: Ariel Constenla-Haile Patch by: Ariel Constenla-Haile Review by: Andre Fischer (cherry picked from commit 6a56f5db1d478297aedd3395a882fc2dcce80e82) Change-Id: Idbcb46b617fc2d2e2d587cdd74226380a2019303
2013-05-20Resolves: #i122028# Fixed crash when processing .uno:SwPageColumnAndre Fischer1-558/+565
Reported by: Ariel Constenla-Haile Patch by: Ariel Constenla-Haile Review by: Andre Fischer (cherry picked from commit 717671a6ec6eab7d87fe7236bb792569151e6b08) Conflicts: sw/source/ui/uiview/viewtab.cxx Change-Id: I127db2160c16789f672b5520a77e27d1f6dac719
2013-05-20Resolves: #i122030# Fixed bug in documentation that breaks autodoc processingAndre Fischer1-1/+1
Found and patched by: Ariel Constenla-Haile Review by: Andre Fischer (cherry picked from commit 2784b2266ba8ce1dcd899a06626669dfd4dadde5) Change-Id: I5fafe38f007a9a98b34e3fc99950bdb8e4c79278
2013-05-20Related: #i121420# Provide sidebar panels with XCanvas objects.Andre Fischer2-3/+15
(cherry picked from commit d179a612f5f9c01776ea52bfdcf27f1cb864f249) Conflicts: sfx2/source/sidebar/SidebarController.cxx Change-Id: I755d55ac0f5a97fdd11476ce11631afb362e83d8