summaryrefslogtreecommitdiff
path: root/sw
AgeCommit message (Collapse)AuthorFilesLines
2013-05-22Resolves: #i122310# page property panel, page size controlOliver-Rainer Wittmann1-2/+2
display page size as Width x Height (cherry picked from commit b83fb522809c9b54427f60200164f878ae7f4658) Conflicts: sw/source/ui/sidebar/PageSizeControl.cxx Change-Id: I150eb045366ee1a712f2a7fc992d5ac76b7e19d7 (cherry picked from commit 2d00e944315ddbf25b1e566082ecbf576ea0dab6)
2013-05-21bnc#818997 RTF import: don't ignore page breaks between shapesMiklos Vajna2-0/+85
Change-Id: Ief71ba9a3c60356714e73d08e88d0a3105b17b1a (cherry picked from commit b40fe8e5a5037d2745cc7b1c9cc408ce6c79b9d9)
2013-05-20Fix fdo#64751 – Header & footer blue tags emptyKhaled Hosny1-1/+1
No idea FontMetric::GetHeight() is supposed to mean, probably the code here meant GetLineHeight(). What it actually need is GetAscent(), so use it instead (which is the same as GetLineHeight() - GetDescent()). Change-Id: Ic467e56ed6b8d245ac7800f94e6d40030833328b Reviewed-on: https://gerrit.libreoffice.org/3980 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-05-20sw: convert some usage of Point::X/Y to Point::set/getX/Y, take twoJulien Nabet32-282/+291
69c52bc5b7973a2e414209470f5bf9b66dcc4f30 had some typos, and got reverted in 78123a504b5215d061935d7b2771ba51e68cae0e, this does the same, except those typos corrected, so vertical layout is still OK. Change-Id: I79fe610e4cc8bbbddbd8415198d6309a93f4ba18 Reviewed-on: https://gerrit.libreoffice.org/3929 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-05-20drawinglayer: Fix typo Primitrive -> Primitive.Jan Holesovsky3-6/+6
Change-Id: Iec1f5192fb052e884c4878ffb017dfd2f5f99350
2013-05-20Only register and use the Sidebar if it is globally enabled.Michael Meeks1-1/+1
2013-05-20Resolves: #i122105# text property panel, underline style controlOliver-Rainer Wittmann1-6/+14
correct application of chosen underline style in Calc cells and Drawing objects in Writer (cherry picked from commit fd23db16149eb517de9b2b403ff28ed0d31c83d6) Change-Id: Id77299c173eef99ea2eea0c0896e9bfd0bd9d1eb
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-20Related: #i121793# correction for page property panel:Oliver-Rainer Wittmann6-49/+100
- 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: #i121960# Extend the sidebar::ControllerItem to check Disabled stateAndre Fischer4-4/+12
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 Wittmann12-100/+32
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-20Resolves: #i122025# UNO commands introduced with sidebarOliver-Rainer Wittmann6-43/+17
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: #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: #i121420# merge sidebar featureOliver-Rainer Wittmann89-250/+5470
(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-20add a copy and paste noteThomas Arnhold1-0/+1
Change-Id: I8dcb9c71f5c72bda24d55a6f550208f30e42cb4f
2013-05-20fdo#39468 Comment translation GER-ENGMatthias Freund2-37/+29
modified: sw/source/ui/vba/vbafield.cxx modified: sw/source/ui/wrtsh/wrtsh1.cxx Change-Id: I503a12e22d03b2b57a818701cdfbe4ecc94d89a1 Reviewed-on: https://gerrit.libreoffice.org/3965 Reviewed-by: Thomas Arnhold <thomas@arnhold.org> Tested-by: Thomas Arnhold <thomas@arnhold.org>
2013-05-19Related: #i119549# fix Position of drawing obj incorrectLei De Bin1-8/+16
* when opening .doc in AOO, if the text direction of the whole document is vertical, the pos of the drawing obj will be wrong. Reported by: Lou Qing le Patch by: Chen Zuo Jun Review by: Lei De Bin (cherry picked from commit 5c413ad6d8c2b2e16c19ff007e5315b383b73eb5) Conflicts: sw/source/filter/ww8/ww8graf.cxx Change-Id: I8cfa32974662f89406e1688be0b3dec22e9b7045
2013-05-19fdo#39468 Comment translation GER-ENG in sw/source/ui/ribbar/ (Part2)Matthias Freund3-17/+11
cleanups, translations and correction :-) Change-Id: I2eccf057fecf6151c4604656464f3d8d1f6a7788 Reviewed-on: https://gerrit.libreoffice.org/3924 Reviewed-by: Thomas Arnhold <thomas@arnhold.org> Tested-by: Thomas Arnhold <thomas@arnhold.org>
2013-05-18Resolves: #i120300# Add new property "ShowContentTips"...Ariel Constenla-Haile4-13/+13
in com.sun.star.text.ViewSettings (cherry picked from commit 8c5cd0cbad918949f898d7fccb4f1a00a8a9f5f5) Conflicts: offapi/com/sun/star/text/ViewSettings.idl officecfg/registry/schema/org/openoffice/Office/Writer.xcs sfx2/source/appl/newhelp.cxx sw/source/ui/docvw/edtwin2.cxx sw/source/ui/uno/unomod.cxx Change-Id: Ia03bea5c7a81efbf1f3f40e8299168887140fe40
2013-05-17unknown printer metrics property results in empty settings.xmlCaolán McNamara1-0/+6
regression since 0fd4d12c6233da2ac1936cd89838b006ffec5192 Change-Id: I894fe80f6c531af5c335dc1f3ba1c0ffaca1e07f
2013-05-17fdo#60967: re-enable deletion of paragraph following tableMichael Stahl3-1/+40
This was actually a documented feature, so removing it just because it only happened to work sometimes by accident was a bad idea :) (regression from f4b6c94c68b5f67b931cde8d0acda6ec8b288bb) So implement this in a less accidental way, so that Ctrl+Shift+Del at the last position inside a table will delete the following paragraph. Do not implement the weird "only delete first sentence and merge rest of paragraph into cell" behavior, because i don't think it makes sense; much better to just delete the whole paragraph, that is also the most likely use-case for this (with table in frame/header/footer). Change-Id: Ia88b3c8958798fd9c64ee75b56c61d787079133e
2013-05-16Resolves: #i120735# free the para object or editengine object...Jian Fang Zhang1-0/+2
attached to textfield object explicitly Found by: zhangjf Patch by: zhangjf (cherry picked from commit e2005137e019864578196d06be8ef63aa32a4e96) Change-Id: I5b7f240d0131017dc9fc35e6e1d14c553de8eacf
2013-05-16sw/qa: add a READMEMiklos Vajna1-0/+10
Change-Id: I4a318274f4b4175af1d4108484670eef9af9684c
2013-05-16Remove code associated with psprint::CompatMetricOverride serviceNoel Grandin4-23/+1
We don't actually have any implementations of this service. This service was introduced by commit 01cf481111436df2cc3f01d1c57cc4348fc037ef Author: Kurt Zenker <kz@openoffice.org> Date: Wed Jun 20 09:07:44 2007 +0000 INTEGRATION: CWS compmetric (1.77.2); FILE MERGED 2007/05/09 16:27:46 pl 1.77.2.2: #146890# algorithm is needed 2007/05/09 12:13:59 pl 1.77.2.1: #146890# backwards compatibility service for metrics Michael Stahl seems to think it was a Sun-internal hack introduced for a specific customer. Change-Id: I1b27778f827504c2adb0e27e8d7c0f0dedcaf940 Reviewed-on: https://gerrit.libreoffice.org/3824 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2013-05-16SwDoc::CopyImpl: avoid ~SwIndexReg assertions:Michael Stahl1-33/+42
These happen when enabling change tracking, deleting a full paragraph (incl. paragraph break) and then copying the deleted paragraph to the clipboard; the "rPos" and "aCpyPam" SwPositions are registered at a node that is deleted by lcl_DeleteRedlines. Change-Id: I3e9e29548d23377807c26fdd401b3c9637fddf25
2013-05-16Some string literal clean upStephan Bergmann1-12/+14
Change-Id: I108882af13fa97fa094547ec4efb468f988f337d
2013-05-16Wae: unused variableXisco Fauli1-1/+0
Change-Id: I1025bb9766d6d6aad2d60467a72a15d3a3af97d4
2013-05-16Related:#119576# fix indent and spacing between bullets and textLei De Bin1-0/+32
they are inconsistent with MS word Reported by: Yan Ji Patch by: Lei De Bin Review by: Chen Zuo Jun Conflicts: sw/source/filter/ww8/ww8par6.cxx Change-Id: I48a6761a8e8fb1c052aa4f2a261aefb850d6c112
2013-05-15Resolves: fdo#64584 revert convert Point::X/Y to Point::set/getX/YCaolán McNamara32-291/+282
This reverts commit 69c52bc5b7973a2e414209470f5bf9b66dcc4f30 I found one place where Y should have been X, but didn't clear the problem, so threw my hat at it and reverted the lot, its cosmetic anyway so no functionality lost be reverting.
2013-05-15sw: change pool default of RES_FOLLOW_TEXT_FLOW to "false"Michael Stahl5-20/+6
For a new document the default is already effectively "false" due to SwDocShell::InitNew() and the ODF and WW8 filters set it explicitly to false... which is also the appropriate value for RTF and DOCX. But only OOoXML and (perhaps) HTML (not sure) want "true" as the default. It is also mysteriously reset to "true" in SwDoc::RemoveAllFmtLanguageDependencies() (which is called after loading a template) for no apparent reason. Change-Id: If5ad33c99f97412cb3ad4f9cec32f47825ed6f6b
2013-05-15i#119922: reverse engineer 9a37613b5e8f08fae585d54a5745e887eb08f8ceMichael Stahl1-16/+0
It is not quite obvious what that commit attempts to do... especially since the bugdoc attachment does not actually exercise the code that was added in the commit, which changes the handling of the "IsFollowingTextFlow" property. The corresponding ODF attribute is style:flow-with-text, which has been added in OOo 2.0. Investigation revels that MSO's ODF filter does not support this attribute and acts as if it always had value "false". The code in FillBaseProperties effectively acts as a default if the value is not set; the ODF spec does not specify what the default should be. But when an ODF document was written by MSO, "false" makes more sense than the previous "true" default. Except when the document is not ODF but OOoXML format, which indicates it's likely written by OOo 1.x which did not support the attribute and acts as if it always had value "true". The Writer UNO API implementation is however not the right place for format specific handling, so replace that with an addition to the function reading the default graphic style that sets the "IsFollowingTextFlow" property to false as a default, which should have the same effect because all styles inherit from it. Note: MSO 2010 Word always writes a default graphic style into ODF docs. This has a side effect for loaded ODF documents: various newly inserted objects have the property turned off then. But it turns out this is actually an advantage, since the same behavior already exists for _new_ documents (see SwDocShell::InitNew) so it is more consistent now. Change-Id: Iba6444a0515fd583398ff052fc5018254da31c30
2013-05-15OSL_TRACE -> SAL_INFOStephan Bergmann1-18/+15
...to work around MSVC 2008 Express (at least) "warning C4503: 'rtl::operator +' : decorated name length exceeded, name was truncated." Change-Id: If6838aaa45ecfc0c092f95228e8616e69ea1f0e0
2013-05-15Resolves: #i119803# RTF export for User FieldsOliver-Rainer Wittmann1-2/+15
implementation for method <RtfAttributeOutput::WriteExpand(..)> Found by: ej197us at gmail dot com Patch by: yuanlin <yuanlin.ibm at gmail dot com> Review by: Oliver <orw at apache dot org> (cherry picked from commit 4536f0b98bc01850bf016dc1f60f0156cb7eb99e) Conflicts: sw/source/filter/ww8/rtfattributeoutput.cxx Change-Id: I1cde654dadd26e214a1c097fe2e0aeaa376195c2
2013-05-15WW8AttributeOutput::TableSpacing: accidently commented out codeMiklos Vajna1-1/+1
Change-Id: Ib4a18dafe4a0b5679e0a015f8208207ae482e720
2013-05-15fdo#36876 WW8 filter: fix export of table marginsMiklos Vajna1-1/+3
Actually no testcase, as the export bug does not affect our import filter. The problem was that we wrote SPRM's, which are properties of floating tables, so once the user edited the resulting document in Word and imported it back to Writer, frames around tables got created. Fix this by only writing floating table SPRM's for tables which are already in a fly frame. Regression from cbba191cf0fff148935f24d111cb124bd5a5328b. Change-Id: Ifeae93100ca80dcde34fc79f69a91064d44ea8f4
2013-05-15Resolves: #i119941# Avoid crash when chart is removed in Writer...Armin Le Grand1-1/+25
by keeping it's storage and graphic stream. Patch by: Clarence Guo, zhaoshzh Review by: alg Found by: Shan Zhu (cherry picked from commit 0b71c735dc10202b26972cf91779954b6a96af9a) Conflicts: comphelper/inc/comphelper/embeddedobjectcontainer.hxx comphelper/source/container/embeddedobjectcontainer.cxx Change-Id: I6ec172644806309d0f06f8522eb8a2adb45899ed
2013-05-15fdo#62977 allow SAL_MAX_INT16..SAL_MAX_UINT16 when importing RTF_UMiklos Vajna2-0/+32
Change-Id: Ie36d5881b0ebe8c38526690ca27d02bfb7af7829
2013-05-15Spelling "separate" (etc) correctly is hardTor Lillqvist60-164/+164
2013-05-15fdo#46808, More LinguProperties funNoel Grandin8-20/+14
Change-Id: Ia3173e980370f532fcabc8f1c7a913e5d66d6d8a
2013-05-14Detect and rotate image at drag&drop or copy&paste in Writer.Tomaž Vajngerl1-18/+48
Change-Id: Iaacbb78921f966703d4f1080f97d26ea4895281f
2013-05-14don't accumulate dirs in error stringDavid Tardon2-17/+32
Change-Id: Ied7437026009f07052dd07d41ba08c82bb6db295
2013-05-14bin dynamic alloc. nonsenseDavid Tardon1-16/+4
Change-Id: Iaed4e27a92937ddbdb0cde783c0e3be611eec7ca
2013-05-14fdo#39468 Comment translation GER-ENG in sw/source/ui/shells/ (Part 4)Matthias Freund5-41/+36
The last files of this directory. :-) Change-Id: I94cc2d50c85acd7434f12766094d3edd0cf9d71d Reviewed-on: https://gerrit.libreoffice.org/3890 Reviewed-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr> Tested-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr>
2013-05-14fdo#39468 Comment translation GER-ENG in sw/source/ui/utlui/Matthias Freund5-24/+19
Some of the files I had missed. Change-Id: Ie150e8812b674a9fdd0cb904489dfb561bdcf7a2 Reviewed-on: https://gerrit.libreoffice.org/3891 Reviewed-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr> Tested-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr>
2013-05-14fdo#39468 Comment translation GER-ENG in sw/source/ui/ribbar/Matthias Freund9-337/+65
cleanups and translations - and a forgotten file. Change-Id: I048ff445fa04b12cb86ae580370bfe444041d41f Reviewed-on: https://gerrit.libreoffice.org/3893 Reviewed-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr> Tested-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr>
2013-05-14coverity#1019413: Unitialized scalar variableNorbert Thiebaud1-0/+4
Change-Id: Ia0a2a1a137176f2f2176b2c16cd7a747d9bc9b52 Reviewed-on: https://gerrit.libreoffice.org/3895 Reviewed-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr> Tested-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr>
2013-05-14SolarMutex does not belong into the URE interfaceStephan Bergmann1-1/+2
...so move it from osl/mutex.hxx to its own comphelper/solarmutex.hxx. It looks like a newbie mistake that 59e7685d8d812ee8773f57475cbe3aa2a0bdfc81 "Create an abstract interface to be used to implement a SolarMutex" put it here in the first place. I do not consider this an incompatible change really, as no external URE client code should have used SolarMutex anyway. (Also included some clean up, like removing unused {Clearable,Resettable}SolarGuard, and spelling out SolarGuard in the few places it is used.) Change-Id: I121ffb5b7cefbc19e88b5405e5a85ffc895be852
2013-05-14initialized with plain 0, instead of sal_False/falseTakeshi Abe1-1/+1
Change-Id: I2df1bd52293c4423de5ac4c41f9392be1e8d2ccf
2013-05-14Out of bounds substring accessMiklos Vajna1-1/+1
Change-Id: I96e2845a17db78345adfb7c3e9e0dea5dbbb0a6b
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-01 03:25:41 +0000