summaryrefslogtreecommitdiff
path: root/svx
AgeCommit message (Collapse)Author
2013-05-20Related: #i122156# #i122087# correct context notification...Oliver-Rainer Wittmann
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-20Resolved: #i122186# Rearranged controls in text property panel...Andre Fischer
to make font selection box wider. (cherry picked from commit 4484a62e0365fc36cc2a9e3ad1c71749d260d4d0) Change-Id: I4a189c106b497da36e3ad0d13a8e6087b95e73c2
2013-05-20Related: #i122156# #i122087# correct context notification...Oliver-Rainer Wittmann
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 Fischer
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-20Resolves: #ii122166# refine icons of numbering and bullets toolbox...Zheng Fan
inside sidebar for consistency (cherry picked from commit 6818706a832b4f6281cdf31d274b4a72c0ff2d58) Conflicts: svx/source/sidebar/paragraph/ParaPropertyPanel.cxx Change-Id: Ida87df66cd35066415a83e369008a4b1e20ab171
2013-05-20Resolves: #i122074# paragraph property panelOliver-Rainer Wittmann
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 Grand
(cherry picked from commit 81e9ede3e748a40555e87efd1af19521dab5261d) Conflicts: sd/source/ui/view/drviews2.cxx Change-Id: I5ce51fce89e8f29d2f469bf11c5ba6f075f690f2
2013-05-20Related: #i122111# Adapted pState usages in NotifyItemUpdate methodsArmin Le Grand
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 Wittmann
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 Fischer
(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-20Related: #i121793# correction for page property panel:Oliver-Rainer Wittmann
- 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: #ii122111# Corrected LinePropertyPanel::NotifyItemUpdateArmin Le Grand
to use pState with more care (cherry picked from commit 12df8f6dd3ed9ea37d9d0dd61bc56ada3bc062b1) Conflicts: svx/source/sidebar/line/LinePropertyPanel.cxx Change-Id: I380a4f9f8e43340ee03a1cd10546367b6818f74e
2013-05-20Related: #i121960# Fixed typo that made the superscript button...Andre Fischer
look like the subscript button. (cherry picked from commit eac056c47b2bf233ff36436136463cb3f3eb9e23) Change-Id: I1ba1a609954cd88aa38f76c8e329f35152951ae5
2013-05-20Related: #i122051# Sidebar handles more Writer variants.Andre Fischer
(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 Fischer
(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 Grand
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: #i121960# Extend the sidebar::ControllerItem to check Disabled stateAndre Fischer
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 Wittmann
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: #i122041# Added 'Automatic' to TextPropertyPanel, FontColor...Armin Le Grand
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 Wittmann
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 Fan
(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 Fan
(cherry picked from commit 07c075acd60e93962c785d066c84f2a80a47e958) Change-Id: Ide6bdd5177298a345bed90af68a24e0edcda1cd1
2013-05-20Resolves: #i122042# corrected adding default values in LineStyleListBoxArmin Le Grand
(cherry picked from commit 33242bbc8350f2b253fae2d4261561796d848455) Conflicts: svx/inc/svx/dlgctrl.hxx svx/source/dialog/dlgctrl.cxx Change-Id: I4391164c0dbdd99c64fe7eca1bdd10cd92e32128
2013-05-20adjust .ui widgets for centralized Color ValueSetsCaolán McNamara
Change-Id: Ie6b86a2a48e6697f816e9975b6e34491ab0ad17e
2013-05-20Resolves: #i122041# Unified and centralized control for Color ValueSetsArmin Le Grand
(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 Grand
(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-20Resolves: #i121420# merge sidebar featureOliver-Rainer Wittmann
(cherry picked from commit 0a0a9b32aa5bf1ce2554ad37cbba3c7a105db2b5) Conflicts: chart2/source/controller/dialogs/dlg_View3D.cxx chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx chart2/source/controller/drawinglayer/ViewElementListProvider.cxx chart2/source/controller/inc/ViewElementListProvider.hxx chart2/source/controller/inc/dlg_View3D.hxx chart2/source/controller/main/ShapeController.cxx chart2/source/inc/chartview/DrawModelWrapper.hxx chart2/source/view/main/DrawModelWrapper.cxx cui/source/inc/border.hxx cui/source/inc/cuitabarea.hxx cui/source/inc/cuitabline.hxx cui/source/inc/sdrcelldlg.hxx cui/source/inc/treeopt.hxx cui/source/options/optchart.cxx cui/source/options/optchart.hxx cui/source/options/optcolor.cxx cui/source/options/treeopt.cxx cui/source/tabpages/backgrnd.cxx cui/source/tabpages/border.cxx cui/source/tabpages/chardlg.cxx cui/source/tabpages/numpages.cxx cui/source/tabpages/tpcolor.cxx cui/source/tabpages/tplneend.cxx editeng/inc/editeng/outliner.hxx extensions/source/propctrlr/standardcontrol.cxx framework/source/register/registerservices.cxx offapi/com/sun/star/ui/makefile.mk officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu officecfg/registry/data/org/openoffice/Office/UI/makefile.mk officecfg/registry/schema/org/openoffice/Office/UI/makefile.mk postprocess/packregistry/makefile.mk reportdesign/source/ui/dlg/Condition.cxx reportdesign/source/ui/misc/UITools.cxx sc/inc/document.hxx sc/inc/helpids.h sc/inc/sc.hrc sc/prj/build.lst sc/sdi/scalc.sdi sc/source/core/data/documen9.cxx sc/source/core/data/drwlayer.cxx sc/source/ui/app/scdll.cxx sc/source/ui/app/typemap.cxx sc/source/ui/dbgui/scendlg.cxx sc/source/ui/docshell/docsh2.cxx sc/source/ui/docshell/docsh4.cxx sc/source/ui/drawfunc/chartsh.cxx sc/source/ui/drawfunc/drawsh.cxx sc/source/ui/drawfunc/drawsh2.cxx sc/source/ui/drawfunc/drawsh4.cxx sc/source/ui/drawfunc/drformsh.cxx sc/source/ui/drawfunc/drtxtob.cxx sc/source/ui/drawfunc/drtxtob1.cxx sc/source/ui/drawfunc/drtxtob2.cxx sc/source/ui/drawfunc/graphsh.cxx sc/source/ui/drawfunc/oleobjsh.cxx sc/source/ui/inc/chartsh.hxx sc/source/ui/inc/formatsh.hxx sc/source/ui/miscdlgs/tabbgcolordlg.cxx sc/source/ui/navipi/navipi.cxx sc/source/ui/optdlg/opredlin.cxx sc/source/ui/optdlg/tpview.cxx sc/source/ui/sidebar/makefile.mk sc/source/ui/view/auditsh.cxx sc/source/ui/view/cellsh.cxx sc/source/ui/view/editsh.cxx sc/source/ui/view/formatsh.cxx sc/source/ui/view/pivotsh.cxx sc/source/ui/view/tabvwsh.cxx sc/util/makefile.mk sd/inc/sdabstdlg.hxx sd/prj/build.lst sd/sdi/ToolPanelViewShell.sdi sd/sdi/makefile.mk sd/source/ui/accessibility/makefile.mk sd/source/ui/animations/CustomAnimationDialog.cxx sd/source/ui/dlg/PaneChildWindows.cxx sd/source/ui/dlg/PaneShells.cxx sd/source/ui/dlg/copydlg.cxx sd/source/ui/dlg/navigatr.cxx sd/source/ui/dlg/sddlgfact.cxx sd/source/ui/dlg/sddlgfact.hxx sd/source/ui/docshell/docshel3.cxx sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx sd/source/ui/framework/factories/TaskPanelFactory.cxx sd/source/ui/framework/factories/TaskPanelFactory.hxx sd/source/ui/framework/factories/ViewShellWrapper.cxx sd/source/ui/framework/factories/makefile.mk sd/source/ui/framework/module/ImpressModule.cxx sd/source/ui/framework/module/ToolPanelModule.cxx sd/source/ui/framework/tools/FrameworkHelper.cxx sd/source/ui/func/fuolbull.cxx sd/source/ui/inc/DrawViewShell.hxx sd/source/ui/inc/PaneChildWindows.hxx sd/source/ui/inc/celltempl.hxx sd/source/ui/inc/copydlg.hxx sd/source/ui/inc/dlgpage.hxx sd/source/ui/inc/framework/FrameworkHelper.hxx sd/source/ui/inc/prltempl.hxx sd/source/ui/inc/tabtempl.hxx sd/source/ui/inc/taskpane/ILayoutableWindow.hxx sd/source/ui/inc/taskpane/PanelId.hxx sd/source/ui/inc/tpaction.hxx sd/source/ui/sidebar/AllMasterPagesSelector.cxx sd/source/ui/sidebar/AllMasterPagesSelector.hxx sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx sd/source/ui/sidebar/DocumentHelper.cxx sd/source/ui/sidebar/DocumentHelper.hxx sd/source/ui/sidebar/LayoutMenu.cxx sd/source/ui/sidebar/LayoutMenu.hxx sd/source/ui/sidebar/MasterPageContainer.cxx sd/source/ui/sidebar/MasterPageContainer.hxx sd/source/ui/sidebar/MasterPageContainerFiller.cxx sd/source/ui/sidebar/MasterPageContainerFiller.hxx sd/source/ui/sidebar/MasterPageContainerProviders.cxx sd/source/ui/sidebar/MasterPageContainerProviders.hxx sd/source/ui/sidebar/MasterPageContainerQueue.cxx sd/source/ui/sidebar/MasterPageContainerQueue.hxx sd/source/ui/sidebar/MasterPageDescriptor.cxx sd/source/ui/sidebar/MasterPageDescriptor.hxx sd/source/ui/sidebar/MasterPageObserver.cxx sd/source/ui/sidebar/MasterPagesSelector.cxx sd/source/ui/sidebar/MasterPagesSelector.hxx sd/source/ui/sidebar/PreviewValueSet.cxx sd/source/ui/sidebar/PreviewValueSet.hxx sd/source/ui/sidebar/RecentMasterPagesSelector.cxx sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx sd/source/ui/sidebar/SidebarShellManager.cxx sd/source/ui/sidebar/SlideTransitionPanel.hxx sd/source/ui/sidebar/makefile.mk sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx sd/source/ui/table/TableDesignPane.hxx sd/source/ui/toolpanel/ControlContainer.cxx sd/source/ui/toolpanel/ControlContainerDescriptor.hxx sd/source/ui/toolpanel/MethodGuard.hxx sd/source/ui/toolpanel/ScrollPanel.cxx sd/source/ui/toolpanel/SlideSorterCacheDisplay.cxx sd/source/ui/toolpanel/SubToolPanel.cxx sd/source/ui/toolpanel/TaskPaneFocusManager.cxx sd/source/ui/toolpanel/TaskPaneTreeNode.cxx sd/source/ui/toolpanel/TitleBar.cxx sd/source/ui/toolpanel/TitledControl.cxx sd/source/ui/toolpanel/ToolPanel.cxx sd/source/ui/toolpanel/ToolPanel.hxx sd/source/ui/toolpanel/ToolPanelFactory.cxx sd/source/ui/toolpanel/ToolPanelUIElement.cxx sd/source/ui/toolpanel/ToolPanelUIElement.hxx sd/source/ui/toolpanel/ToolPanelViewShell.cxx sd/source/ui/toolpanel/controls/CustomAnimationPanel.cxx sd/source/ui/toolpanel/controls/CustomAnimationPanel.hxx sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx sd/source/ui/toolpanel/controls/MasterPagesPanel.hxx sd/source/ui/toolpanel/controls/SlideTransitionPanel.cxx sd/source/ui/toolpanel/controls/SlideTransitionPanel.hxx sd/source/ui/toolpanel/controls/TableDesignPanel.cxx sd/source/ui/toolpanel/controls/TableDesignPanel.hxx sd/source/ui/unoidl/UnoDocumentSettings.cxx sd/source/ui/view/ViewShellBase.cxx sd/source/ui/view/drtxtob.cxx sd/source/ui/view/drviews3.cxx sd/source/ui/view/drviews7.cxx sd/source/ui/view/drviewsa.cxx sd/source/ui/view/drviewsf.cxx sd/source/ui/view/outlnvsh.cxx sd/source/ui/view/sdview.cxx sd/source/ui/view/viewshel.cxx sd/uiconfig/sdraw/menubar/menubar.xml sd/util/makefile.mk sfx2/Package_inc.mk sfx2/inc/sfx2/sfx.hrc sfx2/inc/sfx2/sfxsids.hrc sfx2/source/control/bindings.cxx sfx2/source/dialog/templdlg.cxx sfx2/source/inc/templdgi.hxx svx/AllLangResTarget_svx.mk svx/Package_inc.mk svx/inc/svx/XPropertyTable.hxx svx/inc/svx/bmpmask.hxx svx/inc/svx/colrctrl.hxx svx/inc/svx/dialogs.hrc svx/inc/svx/dlgctrl.hxx svx/inc/svx/dlgutil.hxx svx/inc/svx/drawitem.hxx svx/inc/svx/fontwork.hxx svx/inc/svx/galbrws.hxx svx/inc/svx/sdr/table/tablecontroller.hxx svx/inc/svx/svdmodel.hxx svx/inc/svx/svdstr.hrc svx/inc/svx/svxids.hrc svx/inc/svx/svxitems.hrc svx/inc/svx/xattr.hxx svx/inc/svx/xflgrit.hxx svx/inc/svx/xflhtit.hxx svx/inc/svx/xit.hxx svx/inc/svx/xlineit.hxx svx/inc/svx/xlndsit.hxx svx/inc/svx/xlnedit.hxx svx/inc/svx/xlnstit.hxx svx/inc/svx/xtable.hxx svx/sdi/svx.sdi svx/source/dialog/_bmpmask.cxx svx/source/dialog/dialcontrol.cxx svx/source/dialog/dlgctrl.cxx svx/source/dialog/dlgutil.cxx svx/source/dialog/fontwork.cxx svx/source/gallery2/galbrws.cxx svx/source/gallery2/galbrws1.cxx svx/source/gallery2/gallery1.cxx svx/source/items/drawitem.cxx svx/source/items/svxitems.src svx/source/sdr/attribute/sdrformtextattribute.cxx svx/source/sidebar/ColorPanel.hxx svx/source/sidebar/EmptyPanel.hrc svx/source/sidebar/EmptyPanel.hxx svx/source/sidebar/gallery/GalleryPanel.hxx svx/source/svdraw/svdedtv1.cxx svx/source/svdraw/svdmodel.cxx svx/source/svdraw/svdogrp.cxx svx/source/svdraw/svdstr.src svx/source/tbxctrls/tbcontrl.cxx svx/source/unodraw/XPropertyTable.cxx svx/source/unodraw/unoctabl.cxx svx/source/xoutdev/XPropertyEntry.cxx svx/source/xoutdev/xattr.cxx svx/source/xoutdev/xattr2.cxx svx/source/xoutdev/xtabbtmp.cxx svx/source/xoutdev/xtabcolr.cxx svx/source/xoutdev/xtabdash.cxx svx/source/xoutdev/xtabgrdt.cxx svx/source/xoutdev/xtabhtch.cxx svx/source/xoutdev/xtable.cxx svx/source/xoutdev/xtablend.cxx svx/util/svx.component sw/inc/cmdid.h sw/inc/docsh.hxx sw/inc/editsh.hxx sw/inc/helpid.h sw/inc/rcid.hrc sw/inc/swabstdlg.hxx sw/inc/swcommands.h sw/sdi/swriter.sdi sw/source/core/doc/docdesc.cxx sw/source/core/draw/drawdoc.cxx sw/source/ui/app/docsh2.cxx sw/source/ui/app/docshdrw.cxx sw/source/ui/app/docshini.cxx sw/source/ui/app/docst.cxx sw/source/ui/config/optpage.cxx sw/source/ui/dialog/swdlgfact.cxx sw/source/ui/dialog/swdlgfact.hxx sw/source/ui/fmtui/tmpdlg.cxx sw/source/ui/inc/tmpdlg.hxx sw/source/ui/misc/pggrid.cxx sw/source/ui/shells/annotsh.cxx sw/source/ui/shells/basesh.cxx sw/source/ui/shells/beziersh.cxx sw/source/ui/shells/drawdlg.cxx sw/source/ui/shells/drawsh.cxx sw/source/ui/shells/drformsh.cxx sw/source/ui/shells/drwbassh.cxx sw/source/ui/shells/drwtxtex.cxx sw/source/ui/shells/drwtxtsh.cxx sw/source/ui/shells/frmsh.cxx sw/source/ui/shells/grfsh.cxx sw/source/ui/shells/olesh.cxx sw/source/ui/shells/tabsh.cxx sw/source/ui/shells/textsh.cxx sw/source/ui/shells/textsh1.cxx sw/source/ui/shells/txtnum.cxx sw/source/ui/uiview/viewtab.cxx sw/source/ui/uno/unofreg.cxx sw/source/ui/utlui/navipi.cxx sw/util/sw.component vcl/inc/vcl/split.hxx vcl/inc/vcl/window.hxx vcl/inc/window.h vcl/source/window/split.cxx vcl/source/window/window.cxx vcl/source/window/window4.cxx Change-Id: Idebaff59f9d60e4e93290cefefdda4c5a1e9215e Resolves: #i122194# Adapted license text in propertypanel.hrc then renamed it to ResourceDefinitions.hrc (cherry picked from commit e952d1401c1adc41934118ba7f542611ef9da11b) Conflicts: sfx2/Package_inc.mk sfx2/source/sidebar/SidebarChildWindow.cxx svx/source/sidebar/graphic/GraphicPropertyPanel.cxx svx/source/sidebar/line/LinePropertyPanel.cxx svx/source/sidebar/possize/PosSizePropertyPanel.cxx sw/source/ui/sidebar/PagePropertyPanel.src sw/source/ui/sidebar/WrapPropertyPanel.src Change-Id: Ie009056a78ab108556717a501399c83b477b3548 Resolves: #i122194# finally I got the correct file name Change-Id: If7a075af8c9a829f6f0a69f883c5c6d4ac97ba2a More merge changes for optional sidebar: revert toolpanel removal, restore and re-enable task pane remove apparently un-used SidebarFactory module add extra visibility annotation to ItemReceiverUpdate
2013-05-19Resolves: #i121128# added missing original data export for SVG...Armin Le Grand
in XOutBitmap::WriteGraphic (cherry picked from commit 04f10de02296b9bff1e022daabf0b8ff59234e38) Conflicts: svx/source/xoutdev/_xoutbmp.cxx Change-Id: I774557451c924d6e5b2beb22a83de0ce95a429f1
2013-05-19Related: #119885# Made EditMode work with text boxes...Armin Le Grand
where text is reaching over the TextBox's bounds (cherry picked from commit fbbef010986ea359b5209e6d3884bdf4e4ac86a6) Conflicts: editeng/source/editeng/impedit.cxx Change-Id: I00020a33faf86c8671259e71179932cddf54cfe1
2013-05-19Related: #i120569# Corrected 3D object creationsArmin Le Grand
(cherry picked from commit 753dd9ee0c8101ce613cdc7e1a68141e0f8561d3) Change-Id: Ic7534a310b8d8c526b2639243c9d734e26b55560
2013-05-19Resolves: #i120569# Enhanced 3D visualisation of line custom shapesArmin Le Grand
(cherry picked from commit aa4649b8feb28c250cbbab65c749ae01524726fe) Conflicts: svx/inc/svx/sdr/primitive2d/sdrattributecreator.hxx Change-Id: I642428e988e7bed9a5c1d2d2db0f95fe775f06cf
2013-05-19Resolves: #i119443# Import lines from ppt as one point connectorsArmin Le Grand
Patch by: Jianjuan Li Review by: alg (cherry picked from commit acd62709ad0d1d54764f00aabbd6c59ccb41a409) Change-Id: I1978444641d5f7c053dfae815096e7f2bacce15a
2013-05-19WaE: 0x80000000 -> MIN_INT32Caolán McNamara
Change-Id: Ifc892a5c0e436cce345a329bcef10b875eeb839f
2013-05-19#119881# fix the"RingInside" fontwork display incorrectly when open .ppt fileSun Ying
Reported by: Li Feng Wang Patch by: Ying Sun Review by: Jian Yuan Li(cherry picked from commit 4904b17b657750e565e30d56810da513057fba39)
2013-05-19Related: #120556# fix the "RingOutside" fontwork display incorrectly...Sun Ying
when open .ppt file Reported by: Li Feng Wang Patch by: Ying Sun Review by: Jian Yuan Li (cherry picked from commit 3473dbf606f525d95b898a08072259018eb4056f) Conflicts: svx/source/customshapes/EnhancedCustomShapeGeometry.cxx Change-Id: I356bf0b5af720765e8ca60ae79bd04e449ff6e18
2013-05-18Resolves: #i120437# Connector corrections in groups and PPT importsArmin Le Grand
(cherry picked from commit b26e298d31cad25c326041287acb6544efac21c6) Conflicts: svx/source/svdraw/svdoedge.cxx Change-Id: Id4bed1c85bccdae878872557fd3e625d772228ff
2013-05-18Resolves: #i116244# need to reset rotation...Armin Le Grand
This reverts commit f47ed987388e4df58ba74b9aca574a7d1fba396a. update layout tests Change-Id: I8a9daaa78acc98bf497241ebce856d5798b187f5
2013-05-18Revert "Resolves: #i116244# need to reset rotation..."Caolán McNamara
This reverts commit 20dee85b6390ef3edc5434889523cd9fd0137bae.
2013-05-18Resolves: #i119755# A new custom shape ellipse ribbon is added and usedArmin Le Grand
Patch by: Jianyuan Li Review by: alg (cherry picked from commit 462656d2f30fade52e38094dcc2392f75b28ef79) Conflicts: svx/inc/svx/EnhancedCustomShape2d.hxx svx/inc/svx/EnhancedCustomShapeGeometry.hxx svx/source/customshapes/EnhancedCustomShape2d.cxx Change-Id: Ifd1fdf1b79db8229b52db43b3c30f109a9930988
2013-05-18Resolves: #i116244# need to reset rotation...Armin Le Grand
when a polygon object in construction becomes more than a simple line (cherry picked from commit 0c170376f7e1896455f439237055e39df020e7ae) Change-Id: Ic3b3676b8932b40b1d0206220503cbcdea7385cd
2013-05-17fdo#57079: SvxSuperContourDlg: unregister configuration listenerMichael Stahl
... in destructor. Otherwise it will access freed memory when eventually called. This crashes since OOo 3.2 but no idea why it would appear to not crash in earlier versions. Change-Id: Ie3ab7ddf19fb1086f0b7d824555ab6b063e2b9ad
2013-05-17fdo#62965: fix crash in Edit Contour dialogMichael Stahl
The pObjList is 0, so use pObj's GetModel() which should be the same. (regression from 115054fef08998c56cba8f14472df1d15007f635) Change-Id: Ib20e1806518f7b3b33d3fb4472d79d531ea9f1de
2013-05-15Resolves: #i119519# Fixed import of closed borders from PPT...Andre Fischer
when an ellipse is involved. Reported by: liupingtan Patch by: Jianyuan Li Review by: Andre Fischer (cherry picked from commit da2c3ed52ae631dba11821f201a2fce49bf18c86) Change-Id: Iff8195365823b60a70641b9efeb9c9f6c86d5341
2013-05-15Do not dispose component context too early (DeInitVCL might still need it)Stephan Bergmann
Change-Id: Ibae79a962ef9d2ea6cf72b70df62c6fa170e05e9
2013-05-15gallery: cleanup scaling code.Michael Meeks
Change-Id: I783b0fe54c6273ce3d78996a02da02dc51944606
2013-05-15gallery: allow comments in .str files.Michael Meeks
Change-Id: I150dee5d9c3b8f2dc656c292d7e9ef56f05cff84
2013-05-15gallery: add auxiliary .desktop style translation files.Michael Meeks
Change-Id: I2f2f0d5d30fbcab83343f94fd16d9371baa380e5
2013-05-15gallery: remove obsolete GalleryImportThemeEntryMichael Meeks
Change-Id: I024bfa537360339befdc67a2fa2b51b15d9c3611
2013-05-15gengal: theme creation fix.Michael Meeks
Change-Id: I72544e2bea45cf3f83e944aee9ca95676f1879c1
2013-05-15gallery: fix hideous theme numbering / naming situation.Michael Meeks
Change-Id: Ibe288e5b2e782da4dd5804a7e018d8ae85c156cc