summaryrefslogtreecommitdiff
path: root/sw/source/ui/app
AgeCommit message (Collapse)Author
2013-12-05fdo#68724: sw: fix crash on Insert->File with Hybrid PDFMichael Stahl
This is an unfortunate combination of 2 special cases: - the Hybrid PDF has its own XFilter implementation to extract the embedded ODF document - Writer needs to create a SwReader with SwPaM for Insert Since the PDF XFilter uses a special service in sfx2 to implement the import, handling this requires a new method in SfxObjectShell that calls back into Writer to create the properly setup SwReader. Change-Id: Ie85f3bfa322bfe883c479e1cb198a8bf0cbbac23
2013-12-02Integrate branch of IAccessible2Steve Yin
Conflicts: everything Change-Id: I9619634ee1e60d449025c006803da29c1e9d14b3
2013-11-27convert Rotate into standard orientation querybox to .uiManal Alhassoun
Change-Id: Id85362c0930a4156e569bd4c6b13aa94213f09c7 Reviewed-on: https://gerrit.libreoffice.org/6826 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2013-11-27Drop duplicate #includeTakeshi Abe
Change-Id: I8c5daff82b96e4d9e2e89e18473c9be8c9c8162b
2013-11-19Resolves: #i33737# enable in-place editing of Input FieldsOliver-Rainer Wittmann
(cherry picked from commit c2afeb1c3f11e8f420b59f3786eb8626c99ff595) Conflicts: sw/inc/IDocumentContentOperations.hxx sw/inc/crsrsh.hxx sw/inc/doc.hxx sw/inc/editsh.hxx sw/inc/expfld.hxx sw/inc/fldbas.hxx sw/inc/fmtfld.hxx sw/inc/hintids.hxx sw/inc/ndtxt.hxx sw/inc/txatbase.hxx sw/inc/txtfld.hxx sw/inc/txtrfmrk.hxx sw/inc/txttxmrk.hxx sw/inc/viscrs.hxx sw/source/core/bastyp/init.cxx sw/source/core/crsr/crsrsh.cxx sw/source/core/crsr/crstrvl.cxx sw/source/core/crsr/findattr.cxx sw/source/core/crsr/findtxt.cxx sw/source/core/crsr/swcrsr.cxx sw/source/core/crsr/viscrs.cxx sw/source/core/doc/dbgoutsw.cxx sw/source/core/doc/doc.cxx sw/source/core/doc/docfld.cxx sw/source/core/doc/docfmt.cxx sw/source/core/doc/docnum.cxx sw/source/core/doc/docredln.cxx sw/source/core/doc/docruby.cxx sw/source/core/doc/doctxm.cxx sw/source/core/doc/visiturl.cxx sw/source/core/docnode/nodes.cxx sw/source/core/edit/edatmisc.cxx sw/source/core/edit/edattr.cxx sw/source/core/edit/edfld.cxx sw/source/core/edit/edfldexp.cxx sw/source/core/edit/editsh.cxx sw/source/core/edit/edlingu.cxx sw/source/core/edit/ednumber.cxx sw/source/core/fields/expfld.cxx sw/source/core/fields/fldbas.cxx sw/source/core/fields/reffld.cxx sw/source/core/frmedt/fefly1.cxx sw/source/core/inc/docfld.hxx sw/source/core/inc/rolbck.hxx sw/source/core/inc/swfont.hxx sw/source/core/layout/flycnt.cxx sw/source/core/layout/laycache.cxx sw/source/core/layout/trvlfrm.cxx sw/source/core/text/atrhndl.hxx sw/source/core/text/atrstck.cxx sw/source/core/text/inftxt.cxx sw/source/core/text/porfld.cxx sw/source/core/text/porfld.hxx sw/source/core/text/txtfld.cxx sw/source/core/tox/tox.cxx sw/source/core/tox/txmsrt.cxx sw/source/core/txtnode/atrfld.cxx sw/source/core/txtnode/ndhints.cxx sw/source/core/txtnode/ndtxt.cxx sw/source/core/txtnode/thints.cxx sw/source/core/txtnode/txatbase.cxx sw/source/core/txtnode/txatritr.cxx sw/source/core/txtnode/txtedt.cxx sw/source/core/undo/SwUndoField.cxx sw/source/core/undo/rolbck.cxx sw/source/core/undo/unsect.cxx sw/source/core/undo/untbl.cxx sw/source/core/unocore/unocrsrhelper.cxx sw/source/core/unocore/unofield.cxx sw/source/core/unocore/unoframe.cxx sw/source/core/unocore/unorefmk.cxx sw/source/core/view/vprint.cxx sw/source/filter/ascii/ascatr.cxx sw/source/filter/html/htmlatr.cxx sw/source/filter/rtf/rtffly.cxx sw/source/filter/ww1/fltshell.cxx sw/source/filter/ww1/w1filter.cxx sw/source/filter/ww8/wrtw8esh.cxx sw/source/filter/ww8/wrtw8nds.cxx sw/source/filter/ww8/ww8atr.cxx sw/source/filter/ww8/ww8par.cxx sw/source/filter/ww8/ww8par3.cxx sw/source/filter/ww8/ww8par5.cxx sw/source/ui/app/applab.cxx sw/source/ui/docvw/edtwin.cxx sw/source/ui/docvw/edtwin2.cxx sw/source/ui/envelp/envfmt.cxx sw/source/ui/fldui/fldedt.cxx sw/source/ui/fldui/fldmgr.cxx sw/source/ui/inc/wrtsh.hxx sw/source/ui/lingu/hhcwrp.cxx sw/source/ui/shells/basesh.cxx sw/source/ui/shells/drwtxtex.cxx sw/source/ui/shells/grfsh.cxx sw/source/ui/shells/tabsh.cxx sw/source/ui/shells/textfld.cxx sw/source/ui/shells/textidx.cxx sw/source/ui/shells/textsh.cxx sw/source/ui/shells/textsh1.cxx sw/source/ui/shells/txtattr.cxx sw/source/ui/uiview/formatclipboard.cxx sw/source/ui/uiview/view.cxx sw/source/ui/uiview/view2.cxx sw/source/ui/uiview/viewsrch.cxx sw/source/ui/uiview/viewstat.cxx sw/source/ui/uiview/viewtab.cxx sw/source/ui/wrtsh/wrtsh1.cxx sw/source/ui/wrtsh/wrtsh2.cxx Change-Id: I6758d6719e1fd523797cc6ee2648ffcb47d52595
2013-11-15fdo#70978 Improve Word Count displaySamuel Mehrbrodt
Change-Id: I82b81d2fd33be47987268fbd3b32d461a136acf8 Reviewed-on: https://gerrit.libreoffice.org/6479 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-11-14remove unnecessary sal_Unicode casts in SW moduleNoel Grandin
Change-Id: I9e67d4f5e680a29718c4e7be7292913602cd9311
2013-11-11SAL_WARN_UNUSED INetURLObjectStephan Bergmann
Change-Id: Ia9af3b76c2a2ac654b02c1502aa2d0c2c987fbf2
2013-11-08sw: add InteropGrabBag for list stylesMiklos Vajna
Change-Id: I2881a507d71aad10e39272141b5d63c6e39e2cc9
2013-11-08sw: add InteropGrabBag for character stylesMiklos Vajna
offapi already documented this, but marked as optional, and previously only paragraph styles implemented it. Do the same for character styles. Change-Id: I3e331eb43f325ac8963984b2460db53f1be497a6
2013-11-08remove unnecessary use of OUString constructor in SW moduleNoel Grandin
Change-Id: I015959dce567e5579ebb5c775fb57ae14e1cd3b1
2013-11-06SwDocStyleSheet: add getter / setter for InteropGrabBagMiklos Vajna
Change-Id: I4163633f11c75cf9f12485212f563c8f53af38f7
2013-11-05fixincludeguards.sh: swThomas Arnhold
Change-Id: I8e0889200d1a1c36e53022a74792728efd66c2fc
2013-11-03Get rid of global aDotStrTor Lillqvist
Change-Id: I6be71a738162ed53f2b81b7e03a18b1a8ddbdae0
2013-11-01fdo#70998 Termchange: Graphics->ImageSamuel Mehrbrodt
Change-Id: I73458ad8c4f6017bd9fdc36a40b67684d36adbad Reviewed-on: https://gerrit.libreoffice.org/6483 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-10-26sw: ViewShell -> SwViewShell renameMiklos Vajna
It's a public class, so it should have the 'Sw' prefix. Change-Id: I0040c1cc37ffcba7fc5f58b71c86f4a7cb0bfce4
2013-10-22Bin comments that claim to say why some header is includedTor Lillqvist
They are practically always useless, often misleading or obsolete. Change-Id: I2d32182a31349c9fb3b982498fd22d93e84c0c0c
2013-10-22Bin useless swmod commentsTor Lillqvist
Change-Id: I65df74242453a907b1a1a50f391e7b017bec5fcb
2013-10-22fdo#44689: fix for specific case of page restart-value 0Adam Co
This bug fix is for roundtripping a DOCX that has a specific 'start value' for the page numbers. In most cases LO imports it ok. However - until now - Word allowed you to start page number from 0, while LO only allowed starting page numbers from 1. This was because the 'start value' was stored in an 'unsigned int', and the value '0' was used to mark 'there is no start value'. This patch changes the way the 'start value' is stored from 'unsigned int' to 'optional unsigned int'. This way - if there is no value applied - the variable will hold NULL. However - if a value is set - it can be 0 or more. This meant also tweaking all the places that used to get this value, so that now they handle an 'optional uint', instead of a 'uint'. Conflicts: sw/source/ui/inc/break.hxx sw/source/ui/inc/wrtsh.hxx sw/source/ui/shells/textsh1.cxx sw/source/ui/utlui/uitool.cxx sw/source/ui/wrtsh/wrtsh1.cxx Change-Id: I6ad9d90e03b42c58eed2271477df43c20ad6f20a Reviewed-on: https://gerrit.libreoffice.org/5681
2013-10-18converting remaining usage of String in SW to OUStringNoel Grandin
Change-Id: Iaaa3812412dc880eb9d08144219ebe428007884e
2013-10-16[API CHANGE]: PreView -> Preview, including .uno:PrintPagePreView.Jan Holesovsky
Will be .uno:PrintPagePreview going forward. Change-Id: Ie5a35467917a54a60dab9eaacf0690c9df27e6f6
2013-10-15convert sw/source/ui/app/*.cxx from String to OUStringNoel Grandin
Change-Id: I08cb425ae4be64116c3f88dad73d330a953af77a
2013-10-15convert sw/inc/doc.hxx from String to OUStringNoel Grandin
Change-Id: I8ddf0f59de506df4e3fea77824b5bb5679bcf7b1
2013-10-15convert sw/inc/docsh.hxx from String to OUStringNoel Grandin
and remove a dead method definition Change-Id: I8b07d5143d6e6eaa260cd312f7a7907738a5a7a8
2013-10-15convert sw/inc/editsh.hxx from String to OUStringNoel Grandin
Change-Id: Ib24edf99414b2f1821bdfe37d3b27b9c79820947
2013-10-14convert captions option page to .uiCaolán McNamara
Change-Id: I571cc68bacce315ceafbe54deed6efeac51a6f1f
2013-10-11sw: make it possible to accept/reject changes if they contain spelling errorsMiklos Vajna
If there were spelling errors in a text portion that is to be accepted/rejected, right mouse click just shown the spellcheck menu, so oddly if an inserted text contained spelling mistakes and we wanted to reject them, Writer didn't allow that. Fix this by adding the redline operations (accept change, reject change, next change, previous change) to the spellcheck menu, but make it only a wrapper around the SwView code, so all the logic on what to do and when to hide these menu items is not duplicated. Change-Id: I76cad2f58a47575f8ef9517af51f1ffe7c4b6844
2013-10-11convert merge source error dialog to .uiCaolán McNamara
Change-Id: I1f09a4b4377a9a6c21e0e260c856dd9fbff4f1bd
2013-10-09fix stringCaolán McNamara
Change-Id: Id441395365d3cb6f598760042d5e54e905783b91
2013-10-09Related: fdo#38838 remove UniString::SetToken & UniString::SearchAsciiCaolán McNamara
Change-Id: I5219578fbeb40a0fe363f03c64021a83f7e505fb
2013-10-08CID#1078608 unlikely NULL deref caseCaolán McNamara
Change-Id: I1f934512f2cf107d5ef72a30b85d569c9b97c640
2013-10-02fix format for code consistencyPhilipp Riemer
Conflicts: sw/source/core/doc/docglbl.cxx sw/source/filter/ww8/ww8par2.cxx Change-Id: I8deb4ecf2714f29d53e0653ecaeabac251e9f071 Reviewed-on: https://gerrit.libreoffice.org/6082 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-10-02remove/add blank linesPhilipp Riemer
Conflicts: sw/source/core/unocore/unoprnms.cxx Change-Id: Icc044955b7b9f28d9f237e97865198cd2ded89a1 Reviewed-on: https://gerrit.libreoffice.org/6079 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-10-02remove zhaojianwei code markersPhilipp Riemer
Conflicts: sw/source/core/doc/docfmt.cxx Change-Id: Iddda0d57ae547680634d45aaf8c6deb40855b860 Reviewed-on: https://gerrit.libreoffice.org/6078 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-10-02bWeiter -> bContinuePhilipp Riemer
Change-Id: Ia0bba3c1610dce5d364fb584f04e0b66cc41fb20 Reviewed-on: https://gerrit.libreoffice.org/6077 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-09-30fdo#43157 - Clean up OSL_ENSUREJacobo Aragunde Pérez
Replaced with C's assert() or SAL_WARN_IF depending on the meaning and context of the check. Change-Id: I70d2fe8128e39b38cce03caacf95fd3757e6974e Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
2013-09-30delete code that was commented outPhilipp Riemer
Change-Id: I86f53763305682946098ece4fd6d58bcfdc5a73f Reviewed-on: https://gerrit.libreoffice.org/6083 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2013-09-20Turn sidebar back to non-experimentalCaolán McNamara
This reverts commit 7ce2a89f4f8fa84232896766276cb3433ada239c. Change-Id: I53f572777e84f66fd4c3d18fb686dac09095804a revert d38cb53e3bcf3fd95a75e03b01c3b7a209d07b46 Change-Id: I5b243b69e50084316aaeab250d6b01079c12b718 Revert "sidebar: disable impress task pane if sidebar is enabled." This reverts commit ee1726bfdba483623d496a3bcc09089e8b55cd65. revert 54d820a7815af03a248c1aa424fae9bf9a4881f4 Change-Id: Ie7c83d88f5427a7e42fa50879280a0c4a7c2cdd1 Revert "Only register and use the Sidebar if it is globally enabled." This reverts commit 66a5cc468cef0c6db8b42b7f25367f04208e6f2e. Conflicts: sfx2/source/view/viewfrm.cxx Change-Id: I17fe702996c4adf7f387573d36ea993f8cc32c96 Revert "disable sidebar menu option if it is disabled." This reverts commit 05f0eb57618d090fa45011120a907a3b1157accb. Revert "finally get the taskpane rendering again" This reverts commit 228bb7ffe0d404ba1225f7b4d26ca71e098577d9. Conflicts: officecfg/registry/data/org/openoffice/Office/Impress.xcu sd/source/ui/framework/factories/TaskPanelFactory.cxx sd/source/ui/framework/tools/FrameworkHelper.cxx Change-Id: I248cc9a769695cde19e78774d42ce666dc685599 Revert "don't throw up the sidebar on start." This reverts commit 645db9a2bd9b1eec381de60c491e6b7f9ee7a7b4. Conflicts: officecfg/registry/data/org/openoffice/Office/Views.xcu Change-Id: I911859757e2e019836e8ed5213d2ba69ff82aec8 Revert "update to the right service name for new URLs." This reverts commit 55f49970f4085e3a1498961edabd5303bd6bea6c. Conflicts: sd/source/ui/framework/tools/FrameworkHelper.cxx Change-Id: I1ba2762a4c969a9125ff8354a9b6035813290021 Revert "tentatively restore more UNO / task-pane goo ..." This reverts commit 052ac10a6f9b28b9b06884dd3ed41879722be6c9. Conflicts: officecfg/registry/data/org/openoffice/Office/Impress.xcu Change-Id: I7e62f27329af033df811549436718648a6447dea Revert "more reverts, first cut at making sidebar optional." This reverts commit a65a423e22fc03d0b7850bbf20dfc30f6cfa34dd. Revert "add experimental option for sidebar to 'Advanced' pane." This reverts commit 54d820a7815af03a248c1aa424fae9bf9a4881f4. Conflicts: cui/source/options/optjava.cxx sd/source/ui/framework/module/ImpressModule.cxx Change-Id: I09a6c0f7834c8ef330d05a014505aaaf09ae096f Revert "Restore FrameworkHelper taskpane URLs." This reverts commit e9c2d5b26b1e1b52bdf87192a76314b7362fa80c. more foo Change-Id: I2eaa2fbd74dc7a2f7ba937d310472cee6b5a0b57 really go to town on it Change-Id: I885dc03cd0286bbfdf05c05da9f0bbea2b78bcf4
2013-08-29convert include/sfx2/objsh.hxx from String to OUStringNoel Grandin
Change-Id: I9587190cea24da93ec0496f2eccf0d32d98980ee
2013-08-23Remove some unused includeZolnai Tamás
Change-Id: Ibe5291544de2c1dcd1d769ecd40b0288f622ea05
2013-08-21String to OUStringMatteo Casalin
Change-Id: I3161b18f73fd3141b9832e0277d3f1071f75ba39 Reviewed-on: https://gerrit.libreoffice.org/5560 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2013-08-21String to OUString + some cleanupMatteo Casalin
Change-Id: If174b140014ca06007e3ad36e3ff80c1896406cd Reviewed-on: https://gerrit.libreoffice.org/5559 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2013-08-21String to OUStringMatteo Casalin
Change-Id: Ibbd6cfd969dd5ba3f839f48ff557d6c850ea3ab2 Reviewed-on: https://gerrit.libreoffice.org/5557 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2013-08-18remove various unused queryboxsCaolán McNamara
Change-Id: Ie8ae7c19b957410517c2a1a4f6463825bafd0e09
2013-08-17another unused QueryBoxCaolán McNamara
Change-Id: Ia317f09260853602f4dd313a0577de192834b1c5
2013-08-17String to OUStringMatteo Casalin
Change-Id: I73aef8d848e738fef987449ca60fe8340428e4c9 Reviewed-on: https://gerrit.libreoffice.org/5463 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2013-08-17WaE: C4701: potentially uninitialized local variable 'nId' usedTor Lillqvist
Change-Id: Ibc68d00837ac84e4954faac52769a500780a7309
2013-08-16sw_FindDocShell(): better place and name + String to OUStringMatteo Casalin
Change-Id: I345a2802b4428c607297cbe6972c5b7aebc5de0b Reviewed-on: https://gerrit.libreoffice.org/5439 Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
2013-08-15String to OUString, some formattingMatteo Casalin
Conflicts: sw/source/filter/basflt/fltini.cxx sw/source/ui/dialog/ascfldlg.cxx Change-Id: Ifa12105aa6f747e2797891b6c71128bd96f78bf3
2013-08-15gagh, NULL is an acceptable OString ctor argumentCaolán McNamara
Change-Id: I592af9986a0512f4dc4cb0aea4cd78f675f4fead