summaryrefslogtreecommitdiff
path: root/sd
AgeCommit message (Collapse)AuthorFilesLines
2013-05-20Resolves: #i121981# Don't change sidebar context while in Impress tableAndre Fischer1-6/+2
(cherry picked from commit a97c4ca2c235a4654243cbbdf970800454b5aa56) Change-Id: I66ece2edb436b6e9f6bff110149d6c0c2aa37c7d
2013-05-20Resolves: #i122275# Don't show the layout panel for master pagesAndre Fischer2-1/+9
(cherry picked from commit 7fe1777ad29d92d16fbc11b7279375d37d11cef8) Conflicts: sd/source/ui/view/drviewsa.cxx Change-Id: I37bb08e08bd8537e692cf60f415ed40f9cf5abc5
2013-05-20Resolves: #i122218# Add new sidebar panel...Andre Fischer1-0/+2
for inserting shapes into Draw documents (cherry picked from commit 5e09229d726cbc288719c7466b277a4eb5bb244b) Conflicts: sd/source/ui/view/drviewsa.cxx sfx2/Package_inc.mk svx/inc/svx/dialogs.hrc Related: #i122218# Added missing files to sfx2/inc/sfx2/sidebar (cherry picked from commit 99572ff12af758a256703884811c7915c79f27ec) Conflicts: sfx2/inc/sfx2/sidebar/ResourceDefinitions.hrc Related: #i122218# Added more missing files (cherry picked from commit cdc8cb702630938c673255638aecbd2dd5c53ed7) fix up to build Change-Id: I098976d787e6a91d36aac98a5917f48b50872087 9c6f4d957924e177922e26606173d1b238b8006e ceb9b720c08fb1db5b418c618e280b9b68eda2cf 01712631eacbd3e58e2cd04d1903bbcb0ecb9301
2013-05-20Related: #i122156# #i122087# correct context notification...Oliver-Rainer Wittmann1-0/+11
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: #i122156# #i122087# correct context notification...Oliver-Rainer Wittmann1-8/+0
regarding the text edit mode for Drawing objects (cherry picked from commit a0e76afb572510e2c2c75fc6c558f271c0d74d0b) Change-Id: I8b4e5cbd865455ef3d7046f9d65c5dd68a53d8ce
2013-05-20Related: #i122121# moved automatic StartEnd adaption to svxArmin Le Grand1-128/+0
(cherry picked from commit 81e9ede3e748a40555e87efd1af19521dab5261d) Conflicts: sd/source/ui/view/drviews2.cxx Change-Id: I5ce51fce89e8f29d2f469bf11c5ba6f075f690f2
2013-05-20Resolves: #i122093# Don't show Impress layouts panel for master pagesAndre Fischer5-80/+57
(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: #i122085# Fixed over-painting of fixed textAndre Fischer1-9/+12
(cherry picked from commit 0ba322a27a8d0651f410741d79bbb7125a8ec2b7) Change-Id: I208297d67bdb9e0277b39c0dc78b777f5eb2a7fa
2013-05-20Resolves: #i122025# UNO commands introduced with sidebarOliver-Rainer Wittmann2-10/+0
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: #i122041# Unified and centralized control for Color ValueSetsArmin Le Grand5-4/+5
(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 Grand1-21/+21
(cherry picked from commit f45335265ec5597510bf7a17cf521906c0288b9d) Change-Id: I7d50a9bc5a17bce792cfd73ab830fd2ef0a17fe9
2013-05-20Resolves: #i121420# merge sidebar featureOliver-Rainer Wittmann124-362/+12645
(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: #i120642# expand target to maximum edge not to diagonalRegina Henschel3-12/+12
(cherry picked from commit 2e1700bf4f7cf913c23d35f325a50d3aa25426cc) Change-Id: Ic27fb3b18f42667419765a6adca41e1df27561c2
2013-05-18Resolves: #i116244# need to reset rotation...Armin Le Grand1-115/+115
This reverts commit f47ed987388e4df58ba74b9aca574a7d1fba396a. update layout tests Change-Id: I8a9daaa78acc98bf497241ebce856d5798b187f5
2013-05-18Resolves: #i118267# Add undo actions for adapted arrowhead sizes...Armin Le Grand1-6/+24
when linewidth is changed (cherry picked from commit 8e63413dbf514303095790630a2d77d854c3da95) Change-Id: I538805726ca29e3cdb05dc32577b91b7157d0e0f
2013-05-18Add unit test for xml:id loading.Thorsten Behrens2-0/+52
Guard against xml:id load breakage, that cause fdo#64512 and fdo#60075. Both connector shape and animation references need it to work. Change-Id: I7883d1d27eae02f605c83217a2e1b83934b31483
2013-05-16bnc#819614: Test for the runaway lines fix.Jan Holesovsky3-1/+6884
Change-Id: I60c072720392822eb5866310f3607271d72815b7
2013-05-16XShapeDumper: Dump more values, to be able to test n#819614.Jan Holesovsky6-281/+7529
Change-Id: I19cbae855996bffb18206b9003e22a2bcc0c75d9
2013-05-15Resolves: #i119551# Avoid grouping shapes on import from PPT...Andre Fischer1-15/+42
under certain conditions. Reported by: Li Feng Wang Patch and review by: Ma Bingbing and Armin Le Grand (cherry picked from commit f425d556504e055216d9402241ff598a97204509) Conflicts: sd/source/filter/eppt/epptso.cxx (cherry picked from commit 8c23e31acc61406103c1565960e4c5b391902754) Change-Id: I7e610b754ff7215201bc1ac47d618869e4e8fe2b
2013-05-15Revert "Resolves: #i119551# Avoid grouping shapes on import from PPT..."Caolán McNamara1-42/+15
This reverts commit 8c23e31acc61406103c1565960e4c5b391902754. wrong one
2013-05-15Resolves: #i119551# Avoid grouping shapes on import from PPT...Andre Fischer1-15/+42
under certain conditions. Reported by: Li Feng Wang Patch and review by: Ma Bingbing and Armin Le Grand (cherry picked from commit f425d556504e055216d9402241ff598a97204509) Conflicts: sd/source/filter/eppt/epptso.cxx Change-Id: I7e610b754ff7215201bc1ac47d618869e4e8fe2b
2013-05-15sd unittests: Do not dump the font name, depends on installed fonts.Jan Holesovsky11-83/+83
Change-Id: Id401feed7d629cbc0c24428b0c1273afdb31be89
2013-05-15sd unittests: Update XShapeDumper to dump also (some) font properties.Jan Holesovsky11-317/+317
+ update the expected dumps together with that. This allows testing of the other part (wrong text color and size, commit 55c63ccfd460895af22e91979967cec15d80b72d) of n#758621 too. Change-Id: Ie93feb9d9d05eb4e11106bf9aa1f237947351b4e
2013-05-15Spelling "separate" (etc) correctly is hardTor Lillqvist13-32/+32
2013-05-15fdo#64586: Fix incorrect import non-empty placeholders + unit test.Jan Holesovsky4-3/+34
Change-Id: Ibcb61dfa12c67fd9f93713ba7eb93f947b122f07
2013-05-14adapt code to use paste special .uiCaolán McNamara1-181/+0
Change-Id: Iaac28f442aa38dd6610c89ba04ea2d1ccfca35c5
2013-05-14sd unittests: Fix the loading of .ppt tests, and introduce test for n#758621.Jan Holesovsky5-20/+108
This also adds instructions how to easily add tests for which it is enough to check the drawinglayer dump. Change-Id: Ieaf261a9be0c8da2fa81c075dadebcac0c07def5
2013-05-14sd unittests: Cleanup in filters-test.Jan Holesovsky1-52/+1
Change-Id: I4dde07c4f796fa33b23cc3e67924270bb3e45ec1
2013-05-14sd unittests: Move Autofit test to the import tests.Jan Holesovsky2-20/+20
Change-Id: I6c49345fa518f19c942ff0fd7849c689d0cd5db6
2013-05-14sd unittests: Move a smoketest where it belongs.Jan Holesovsky3-31/+31
Change-Id: I495f8698f58a2a4a11999e8e439eddd6a703b321
2013-05-14sd unittests: Reorganize the Impress tests to be a bit more focused.Jan Holesovsky2-194/+179
Change-Id: I222c824681fc7bcc25c6f591f09c69fae8c812ec
2013-05-14sd unittests: Better name for the import tests.Jan Holesovsky3-15/+15
Change-Id: I62c47cbfd71e7606770552368e97e1c92fadf211
2013-05-14typo fix: s/inavlid/invalid/Andras Timar1-1/+1
Change-Id: If75cad038f35033be6dcad6f051673bd795accf3
2013-05-14this .ui is unneccessary, zoom is already converted (in cui)Caolán McNamara1-368/+0
Change-Id: I7e5b6523f3595667d3d1bfe42d864d5c7476bf43
2013-05-13zoomandviewlayout.ui widgetAlia Almusaireae1-0/+368
Change-Id: I8d607a5960ffc3c69ffa97ca3e2ebae555044581 Reviewed-on: https://gerrit.libreoffice.org/3794 Reviewed-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr> Tested-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr>
2013-05-13pastespecial.ui widgetAlia Almusaireae1-0/+181
Change-Id: I1e26bfe16a64aee8d94dc6a8042a8a4cd722ade1 Reviewed-on: https://gerrit.libreoffice.org/3790 Reviewed-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr> Tested-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr>
2013-05-13Related fdo#35546: Remove "1 Image with Title" Layout for Photo Album DialogSamuel Mehrbrodt3-153/+45
There will be an option for all Slide Layouts to have a title. Discussed and decided here: https://wiki.documentfoundation.org/Design/Meetings/2013-05-11 Change-Id: I891511d6cf8183e45b41a9358f4821f7de551836 Reviewed-on: https://gerrit.libreoffice.org/3858 Reviewed-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr> Tested-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr>
2013-05-13restore STR_PHOTO_ALBUM_TEXTBOX to fix buildCaolán McNamara2-0/+6
Change-Id: I7b8924406735d687cf16123880942530a8b42c7a
2013-05-13Related fdo#35546: Remove the "Text box" function from Photo Album DialogSamuel Mehrbrodt5-281/+196
This has been discussed and approved in the Design Team IRC Chat on 2013-05-11 Change-Id: I70b861c09af2dfa79c9f773a47791b101888c8f9 Reviewed-on: https://gerrit.libreoffice.org/3857 Reviewed-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr> Tested-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr>
2013-05-13Related fdo#35546: Further improve Layout of Photo Album DialogSamuel Mehrbrodt1-243/+231
With suggestions from http://nabble.documentfoundation.org/Streamlining-the-Photo-Album-Creator-td4054397.html * Moved "Album Layout" to the right * Changed buttons to GTK Stock buttons, added VCL equivalents * Improved the wording of the Layout options Change-Id: Icfb24a8678d096bb596bcdeabbf539e9fe1835db Reviewed-on: https://gerrit.libreoffice.org/3852 Reviewed-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr> Tested-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr>
2013-05-13Related fdo#35546: Simplyfy Code in Photo Album DialogSamuel Mehrbrodt2-71/+17
Create a method for enabling/disabling the Up/Down/Remove buttons. This also fixes some wrong behavior. Change-Id: Ie40a4f3bb4402b988071b315617404c802b7e92a Reviewed-on: https://gerrit.libreoffice.org/3855 Reviewed-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr> Tested-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr>
2013-05-13fix buildCaolán McNamara1-1/+1
Change-Id: Ib29160cc3468bc4a06e269e5cd5121d5689cb1dc
2013-05-13Resolves: #i120172# Add missing undo action for changing PresObj indexAndre Fischer1-0/+7
Reported by: Shan Zhu Fixed by: Andre Fischer (cherry picked from commit 1289f5be48f50b38b16fb0ad34c7743317e8c79d) Change-Id: I6c65dbe9bc87a64ebb2b46a9dc2fda855900c810
2013-05-12Resolves: #i118813# Update slide sorter after page format is modifiedAndre Fischer2-14/+31
(cherry picked from commit b8f5370aeea74b68333885450f7ec34918c1d8c8) Conflicts: sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx Change-Id: I42553defdce1636190e8c5c226774135e179e25d
2013-05-12Resolves: #i119740# Fixed export of fill property of animations to PPTAndre Fischer1-0/+10
Patch by: Tang Meng Review by: Andre Fischer (cherry picked from commit c4c014f74afaa9ca1b31c750b0445cf3f34e61a6) Change-Id: I5a57fed3b8ee13d88eaed6ed6e98a6d167f9fa89
2013-05-12bnc#758621: Set presentation object as non-empty only if not a placeholder.Jan Holesovsky1-3/+3
Based on work of Felix Zhang <fezhang@suse.com>, thank you! Change-Id: I26c7cef17b9a5f3d73107b5c974983e58c347d52
2013-05-12bnc#758621: We don't need this index for anything.Jan Holesovsky1-9/+1
Worse, it prevents us to enter part of the code that we need to execute in some (valid) circumstances. Change-Id: I15084b5efa10fbd5cd0d42856c2745c93d6765da
2013-05-12bnc#758621: Kill unused aPlacementId, it is never set.Jan Holesovsky1-2/+3
Based on work of Felix Zhang <fezhang@suse.com>, thank you! Change-Id: I733a2b69d01f86bcaf0fa401671d475d9b4641a6
2013-05-12Revert "bnc#758621: show preset texts in slide placeholder"Jan Holesovsky1-35/+7
This reverts commit 95bb951826c7fbaafb055008416f4f1d5cfc95dc. Mid-air collision :-) I've been working on an improvement based on this patch when Muthu pushed it - the following commits are based on the Felix's work, thank you Felix! Change-Id: I12d649219911815e6b97d62f4584fa4d258d8917
2013-05-12Resolves: #i119902# Rename all master pages in a template...Andre Fischer1-2/+11
not only the first one. Patch by: Ma Bingbing Review by: Andre Fischer (cherry picked from commit 7daa651fbc74a6fc08d713282b9e25cda14e39e9) Change-Id: Ibd8bf8c6f04785c93b7dae70b57fd9eb14623aaf