summaryrefslogtreecommitdiff
path: root/sw/source
AgeCommit message (Collapse)Author
2013-06-09Remove remnants of help agentCaolán McNamara
it was removed with 66714f1888eaccef4eb5341971278ae7dfafa16b but gobs of code (and UI) still existed to collect the help id and give it to the missing help agent with various UI visible options and buttons to control the help agent which isn't there Change-Id: I625da27b3046d481e43f4d35d32cc7063a1c6291
2013-06-07sw: fix AutoCorrect bold/underline regressionMichael Stahl
The horrible SvxAutoCorrect::AutoCorrect() inserts the character into the document half-way through, and then _expects_ this inserted character to show up in its rTxt parameter. This broke in Writer when SwTxtNode::m_Text was converted to OUString, because now a temporary String copy is created. Work around this disaster area for now. (regression from 0295c8a34e39326414c1b98cf4da905802f061b0) Change-Id: I1cb11a20cb0c2577036176e605426105631f3311 (cherry picked from commit e2b9946022c2a286ebac625ccb45f5ddddd5a5d6)
2013-06-06OpenSymbol is a symbol fontLuboš Luňák
Change-Id: I2489b836950db63f5f53f8a272970b7769c29282
2013-06-06bnc#382137 DocxAttributeOutput: don't store address of local variableMiklos Vajna
AttributeOutputBase::TextField() passes the address of its local variable to WriteExpand(), and DocxAttributeOutput::WriteField_Impl() stored this. When it was to be used, the variable already went out of scope, resulting in a crash. Given that SwField is an abstract base class, the easiest way is to just copy the field and manually delete it when it's no longer needed. Change-Id: I9d1fe2485277f1ac21a576d7ff0d05003f0ac8a1 (cherry picked from commit 92f328fb5eef672d379ed0b712b025eb80622d5a)
2013-06-06fdo#64283: SwMailMergeDlg: add back missing initializeMichael Stahl
(regression from b248624126c271c88381d3dad6e04fc954f65779) Change-Id: I0ed8c4ec91a095babccd089c7fe4508d123ba86d (cherry picked from commit 61ab0ca621898afa817c92c4d13229fa943dfba8)
2013-06-06wwSectionManager: fix import of page bordersMiklos Vajna
Regression from 1e113cb7604e1509e7d598a9be329f1f7b6e9322. According to the spec (see 2.9.181), the first bit disables border of "all but first" pages, the second bit disables the border of first pages. Change-Id: Ie49c9b7b76d34c2a93350481965790976f49d7df (cherry picked from commit f06cc552a0699f7c2c34db981e77d4c8efe5e9e7)
2013-06-06oups, I shouldn't have commited itXisco Fauli
Change-Id: I0b7433431c2da50c17f46549cde30b2b0131c61f (cherry picked from commit 6e2ff4edb2aae441142280ef31286f4627347fb8)
2013-06-06Related #i120832#, the style and color set on table text by user...Jian Fang Zhang
should have higher priority than that from table style Found by: Jinlong Wu,wujinlong@gmail.com Patch by: bjcheny,companycy@gmail.com Review by: zhangjf (cherry picked from commit fe7e723a727f6def90ee80ef2964a40546b37a90) Conflicts: writerfilter/source/dmapper/DomainMapper.cxx Change-Id: I3f4c96d49de40b21cc3da9bcb5e588a270434cd8 (cherry picked from commit 8943478b8d34216d3f2d64dfccd48d181d1a0f91)
2013-06-05Resolves: fdo#64151 Convert Comparison tab page to .uiabdulmajeed ahmed
(cherry picked from commit c99830c221cd2362d58caac15dd2fb33a2b1ad38) Change-Id: Ia1cd8c868de4c73ae518b2775dc568d32a15f16f fix spellings in opt comparision .ui conversion Change-Id: If5d85eede864adf150c417adeb08fc32e5eb7acf (cherry picked from commit 4f34a463dcf781ff23619b4513f6f88aa7d8e75e)
2013-06-04fdo#61923: sw: word completion: do not add trailing '.'Michael Stahl
SwAutoCompleteWord::InsertWord(): use the computed nWrdLen to cut off trailing periods. (regression from d602a3b280fcc1cf16660d8719cd8eb8797dd2ad) Change-Id: I9f4ace62f8d9e7d233e7e210f476856d7841d869 (cherry picked from commit 246d7e280ea8b7d1e27e14a6568d2a65cc8c9e7b)
2013-06-04fdo#65014 Fix backwards/forwards search change of direction.Andrzej J.R. Hunt
Begin a search from the extremity of the selected region instead of from the cursor position. Previously when changing search direction the first "result" is the same as has been previously found when searching forwards as the cursor is at the end of the selection, and the search region is from the end of the previous result to the begin of the document. Now the selected or previously found region is ignored. This only affects normal searches, and does not have any effect when multiple regions are selected. Change-Id: I65a5d94b898dd4b7467889b1932f42c9b6b523fe Reviewed-on: https://gerrit.libreoffice.org/4061 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit c73a65db14f8ee57e382a04b0d38a704c0308458) Signed-off-by: Michael Stahl <mstahl@redhat.com>
2013-06-04fdo#64761: sw: avoid another ~SwIndexReg assertMichael Stahl
SwXText::convertToTextFrame(): This one is rather spurious since the local variables aren't used later anyway, so just park them somewhere safe. Change-Id: I47d3092fbf22a228fa3f440602c0affa43fbb6d7 (cherry picked from commit 0e86210bc480de38919aacf709513f95fab26d35)
2013-06-04i#30979: sw: fix crash on Flys anchored in ToXMichael Stahl
When a fly is anchored at the first paragraph of a ToX, as happens in the WW8 bugdoc in i#30979, updating the ToX will remove the anchor node, and bad things happen, including ~SwIndexReg assert and also eventually a crash when editing the Frame and updating the ToX a few times. Probably best to really remove all anchored flys here. Note that it's not enough to re-anchor to the empty node that is inserted here because that one will also be removed again. While we're at it the _DelBookmarks is superfluous because CorrAbs does exactly that 2 lines above. Change-Id: Id40ae1d88ad99813b93bea7470f5dc790edcc80c (cherry picked from commit a396485f5b8bd5724f9897e1df466c5dcee0ffed)
2013-06-03SwDoc::AppendRedline: fix an obscure memory leakMichael Stahl
... that also causes ~SwIndexReg assertion on closing the document. Change-Id: Icea617c893ddc08b817a5b16f68fa128a41531d4 (cherry picked from commit 460507f07177587a9bb6438a438de95c47abb3f0)
2013-06-03sw: fix ~SwIndexReg assertMichael Stahl
Not really a problem, since local aRegion's point is not used after its node is deleted. Change-Id: Ibeb885fb31f19b02e4c3c63e3b99d00ced756810 (cherry picked from commit bb6ecd8b40313b7cc83d4e619029f4e001334a52)
2013-05-31audit incorrect uses of SwDrawTextInfo (fdo#65013)Luboš Luňák
f22006dc6ac34a35a060e15466cf6b2d2058617d stopped SwDrawTextInfo using pointers to outside data (which lead to various uses of variables that have already gone out of scope). This commit (hopefully) fixes all uses of the clash that relied on the fact that the underlying data changed behind the scenes. Change-Id: I820f13a90b9d1a8055f8e317ca8debc969c39bc0
2013-05-31sw: SwXFrame: fix gradient import problem:Michael Stahl
BaseFrameProperties_Impl::FillBaseProperties: It may happen that checkForUniqueItem returns an item with a name that already exists, if the same gradient appears multiple times; don't crash with unhandled ElementExistException then. (can be reproduced with test3.docx from fdo#41466) (regression from 1a3c90a292c7fc9060604151de9dc51eecf5b6a7) Change-Id: Iace7af4c5679c1c7e978525fa31abf884038567c (cherry picked from commit f5e8f5b0b5410d29b5cb1fb6fbbd8bf3c48a0201)
2013-05-28Resolves: #i113600# Add call to subtable SwXMLTableRow_Impl.dispose()...Jian Fang Zhang
to break cycle reference to SwXMLTableContext object Found by: zhangjf Patch by: zhangjf (cherry picked from commit ba47a717e009b2b497cbccfca2872e66f9ecb130) Change-Id: Iba0b581920417b3866b07542621d56ccdc272261 (cherry picked from commit fc08fc98655397103ce7aacc18c2aa538ccff4e1)
2013-05-27Fix fdo#64685 - Superscript broken in masterKhaled Hosny
After f22006dc6ac34a35a060e15466cf6b2d2058617d the position member of SwDrawTextInfo is no longer a pointer, so changing the passed Point after calling SetPos() has no effect, but some code seems to be relying on it being pointer. Moving SetPos() to after changing the point seems to do the trick, but there may be other similarly broken code like SwSubFont::_DrawStretchText() below. Change-Id: I2f563c1543ff7bff68e573f69fce39694181b370 Reviewed-on: https://gerrit.libreoffice.org/4032 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 6e6b028164176e39219dccbe1b84380b10b6e64f) Signed-off-by: David Tardon <dtardon@redhat.com>
2013-05-27fix fdo#64872 infinite loop saving as docLuke Deller
When loading from odt, table cells which are covered (due to merging of cells) are replaced with an empty cell by SwXMLTableContext::ReplaceWithEmptyCell. However if there is a sequence of cells covered from above then their replacements are accidentally inserted in reverse order, which produces this infinite loop problem when saving as doc. The reverse ordering in SwXMLTableContext::ReplaceWithEmptyCell was because the insert position came from SwXMLTableContext::GetPrevStartNode which was very careful to skip previous covered cells. However those cells have already been replaced with an empty cell so they should not be skipped. Change-Id: I6a022cd1490afa181dbc3e4b2d6ed4af3077b363 Reviewed-on: https://gerrit.libreoffice.org/4028 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2013-05-22Resolves: #ii122335# Disabling the old task paneAndre Fischer
(cherry picked from commit f19d927b19ec6263ffedc9a20585d0fa2e74fc54) Change-Id: I084b132f3a2f2a103c16edab1de6196d3219b468 (cherry picked from commit 94b868141e5ad43f8e2affb77563ec0f999a2d60)
2013-05-22Resolves: #i122310# page property panel, page size controlOliver-Rainer Wittmann
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-20Fix fdo#64751 – Header & footer blue tags emptyKhaled Hosny
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 Nabet
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 Holesovsky
Change-Id: Iec1f5192fb052e884c4878ffb017dfd2f5f99350
2013-05-20Only register and use the Sidebar if it is globally enabled.Michael Meeks
2013-05-20Resolves: #i122105# text property panel, underline style controlOliver-Rainer Wittmann
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: #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: #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-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: #i122028# Fixed crash when processing .uno:SwPageColumnAndre Fischer
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 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-20add a copy and paste noteThomas Arnhold
Change-Id: I8dcb9c71f5c72bda24d55a6f550208f30e42cb4f
2013-05-20fdo#39468 Comment translation GER-ENGMatthias Freund
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 Bin
* 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 Freund
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-Haile
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 McNamara
regression since 0fd4d12c6233da2ac1936cd89838b006ffec5192 Change-Id: I894fe80f6c531af5c335dc1f3ba1c0ffaca1e07f
2013-05-17fdo#60967: re-enable deletion of paragraph following tableMichael Stahl
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 Zhang
attached to textfield object explicitly Found by: zhangjf Patch by: zhangjf (cherry picked from commit e2005137e019864578196d06be8ef63aa32a4e96) Change-Id: I5b7f240d0131017dc9fc35e6e1d14c553de8eacf
2013-05-16Remove code associated with psprint::CompatMetricOverride serviceNoel Grandin
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 Stahl
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 Bergmann
Change-Id: I108882af13fa97fa094547ec4efb468f988f337d
2013-05-16Wae: unused variableXisco Fauli
Change-Id: I1025bb9766d6d6aad2d60467a72a15d3a3af97d4
2013-05-16Related:#119576# fix indent and spacing between bullets and textLei De Bin
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 McNamara
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 Stahl
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 Stahl
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 Bergmann
...to work around MSVC 2008 Express (at least) "warning C4503: 'rtl::operator +' : decorated name length exceeded, name was truncated." Change-Id: If6838aaa45ecfc0c092f95228e8616e69ea1f0e0
generated by cgit (git 2.34.1) at 2024-07-12 01:44:25 +0000