summaryrefslogtreecommitdiff
path: root/sw/inc
AgeCommit message (Collapse)Author
2013-03-15fdo#61952: sw: fix left/right-only page styles and first-pageMichael Stahl
- remove PD_FIRST and GetFirstFmt: This flag makes no sense at all, since there are no "first-only" page styles (while there are left-only/right-only). - instead add a parameter to GetLeftFmt/GetRightFmt to request a first page format, if such exists and is not shared (regression from 02a934d03b101ce463a232f9cbb7b43e684de37e and fa0f42bafbf24e9141ddee728b160b5ab47077f2) Change-Id: I4d50c2c0cc4f3cf231eacba891df22d0bcf6c4df
2013-03-14SwFrmFmts: MSVC does stupid things with dllexporting templatesMichael Stahl
... so work around that. Was triggered by new use of std::vector<SwFrmFmt*> in 1c22545edf9085b9f2656ca92781158b6b123db3 Change-Id: Ibf2aa521c7561d3973c8293aacdf71353e6d65aa
2013-03-14Fix issue #i119405: Numbering text style changed after importing the *.docJian Hong Cheng
* main/sw/inc/doc.hxx * main/sw/inc/IDocumentContentOperations.hxx * main/sw/inc/ndtxt.hxx * main/sw/source/core/doc/docfmt.cxx * main/sw/source/core/txtnode/thints.cxx * main/sw/source/filter/inc/fltshell.hxx * main/sw/source/filter/ww1/fltshell.cxx * main/sw/source/filter/ww8/ww8par.cxx * main/sw/source/filter/ww8/ww8par.hxx * main/sw/source/filter/ww8/ww8par3.cxx MS Word Binary compatibility Patch by: Fan Zheng,<zheng.easyfan@gmail.com> Found by: Jian Hong Cheng,<chengjh@apache.org> Review by: Jian Hong Cheng,<chengjh@apache.org> Conflicts: sw/source/filter/inc/fltshell.hxx sw/source/filter/ww1/fltshell.cxx sw/source/filter/ww8/ww8par.cxx sw/source/filter/ww8/ww8par.hxx (cherry picked from commit ee3b12ab1d62faedcd2d62fcb8011b7454ea0474) Change-Id: I2f72969a54db53e6a51edcf3a3216647cec9424c
2013-03-13convert footnote area page to .ui formatCaolán McNamara
this, for non-CTL/CJK mode, completes format->page in writer to dynamic .ui format Change-Id: I576eed5d39807eff3c3fa775f7c4f2445f1ce940
2013-03-13Some little cleanupFridrich Štrba
Change-Id: I5b754441611224a0bf028a1a12b0b6d985df276d
2013-03-13Fix #i120928: Import Graphic Bullets of MS Word DocumentJian Hong Cheng
* sw/inc/numrule.hxx * sw/source/core/doc/number.cxx * sw/source/filter/ww8/attributeoutputbase.hxx * sw/source/filter/ww8/escher.hxx * sw/source/filter/ww8/rtfattributeoutput.cxx * sw/source/filter/ww8/rtfattributeoutput.hxx * sw/source/filter/ww8/rtfexport.hxx * sw/source/filter/ww8/rtfexport.cxx * sw/source/filter/ww8/writerhelper.cxx * sw/source/filter/ww8/writerhelper.hxx * sw/source/filter/ww8/wrtw8esh.cxx * sw/source/filter/ww8/wrtw8nds.cxx * sw/source/filter/ww8/wrtw8num.cxx * sw/source/filter/ww8/wrtww8.cxx * sw/source/filter/ww8/wrtww8.hxx * sw/source/filter/ww8/wrtww8gr.cxx * sw/source/filter/ww8/ww8attributeoutput.hxx * sw/source/filter/ww8/ww8par.cxx * sw/source/filter/ww8/ww8par.hxx * sw/source/filter/ww8/ww8par3.cxx * sw/source/ui/wrtsh/wrtsh1.cxx Graphic Bullets Fidelity Patch by: chengjh,<chengjh@apache.org> Found by: chengjh,<chengjh@apache.org> Review by: Fan Zheng,<zheng.easyfan@gmail.com> Conflicts: sw/inc/numrule.hxx sw/source/filter/ww8/writerhelper.cxx sw/source/filter/ww8/wrtw8nds.cxx Change-Id: I7b00590a9f05da745678b5ba99b6f6f4e870d197 Signed-off-by: Cedric Bosdonnat <cedric.bosdonnat.ooo@free.fr> Signed-off-by: Fridrich Strba <fridrich.strba@bluewin.ch>
2013-03-12update pch headersLuboš Luňák
Change-Id: Ibb368e6a806666a73bf6bf1a097d14bc6e75b24d
2013-03-10update pch filesPeter Foley
Change-Id: I07c1acc9f9e788f1165b3e241008aa944485790d
2013-03-08fdo#60691 add modelines to *.src and *.hrc filesBorim
use solenv/bin/add-modulelines script for the task and remove all UTF bom from *.src and *.hrc files svx/source/dialog/hdft.src Change-Id: I745d4f0fe9b05436a142a03f8512970f91c41bd4
2013-03-07fdo#38838 Replaced some use of (Uni)String with OUString.Jean-Noël Rouvignac
Change-Id: Iad623c9300919fbae34279268a5a720f978c6434 Reviewed-on: https://gerrit.libreoffice.org/2514 Reviewed-by: Joren De Cuyper <joren.libreoffice@telenet.be> Reviewed-by: Thomas Arnhold <thomas@arnhold.org> Tested-by: Thomas Arnhold <thomas@arnhold.org>
2013-03-05fdo#38838, replacement of String with OUStringÁdám Csaba Király
Replaced String with OUString in mediawindow.cxx, basdoc.cxx, basdoc.hxx and bastype3.cxx. In other files I only replaced, what was necessary for the changes in basdoc to work. Change-Id: I1ad0e7e262f8becdf57f182853aaa914a88895a4 Reviewed-on: https://gerrit.libreoffice.org/2554 Reviewed-by: Muthu Subramanian K <muthusuba@gmail.com> Tested-by: Muthu Subramanian K <muthusuba@gmail.com>
2013-03-05Remove unused variablesTor Lillqvist
Change-Id: I81c62dd3f6319d6ca9c0da518ca07391a80179da
2013-03-04remove unused and commented out codeThomas Arnhold
This code gets never called. Change-Id: I59228cba1444b7b09f74eb5cf8da9b755c7c32f7
2013-03-02Typo fix: informations -> information and a few other adjacent typos.Gregg King
FDO:60724 Change-Id: I73ad9f1c37cbbcf28d996ed73c75cf09553e499b Reviewed-on: https://gerrit.libreoffice.org/2479 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
2013-02-28regenerate pchPeter Foley
Change-Id: I130bfbeaf8723f0f9ee38051c8acf32cb7f5ba85
2013-02-28Remove dead voice command codeTor Lillqvist
I don't see voice input commands being generated anywhere. Nobody seems to know what this code has been used for. Change-Id: I4e4221dd4dff76086d0268be286c3605e669bae7 Reviewed-on: https://gerrit.libreoffice.org/2452 Reviewed-by: Niko Rönkkö <ronkko@iki.fi> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-02-28fdo#61016: sw::marks::MarkManager: delay deletion of text fieldmarksMichael Stahl
There is a STL assertion in deleteMarks because the ReleaseDoc call will recursively call into deleteMark again and delete marks that are in the vector vMarksToDelete up the stack. Change-Id: I9139b174f8a518a551a3ca8520396202c306abcf
2013-02-26embed also system fonts when embedding fonts in a documentLuboš Luňák
Without this, only fonts that had come embedded with the document were embedded when saving, which meant that it was impossible to create new documents that would have any fonts embedded. Change-Id: I3b4e87b1b3ca5ae1ccfe29d9b571b0262c568dcf
2013-02-23try and beat this weird SvxAcceptChgCtr into something sanishCaolán McNamara
a) convert to .ui b) The accept/reject changes dialogs now have a "close" button and the accept/reject etc buttons are relocated into the main dialog button area rather than as direct children of the view page. They now get disabled on switching to the non-view page. c) Merges the sc redline changes dialog, the sw redline changes dialog and the sw autocorrect changes dialog Change-Id: If0ba376c3f2d36709aeeed995fa9901741434c40
2013-02-23sw: rename member variables missing their prefix in ViewShellMiklos Vajna
Change-Id: I4ec171a42f589826071d6e9ea2c87e9e2c94fdb3
2013-02-22s/the the/the/Tor Lillqvist
Change-Id: Iadacffaad832c6ff06757e8567e24f929f24a4c3
2013-02-21Revert "embed also system fonts when embedding fonts in a document"David Ostrovsky
that's enouph breakage for now. This reverts commit 596bd0f61f8cfc957410148ae221c62331067bdd. Change-Id: I992f439a9a099e47115a30b3d745848f3af09e5e
2013-02-21embed also system fonts when embedding fonts in a documentLuboš Luňák
Without this, only fonts that had come embedded with the document were embedded when saving, which meant that it was impossible to create new documents that would have any fonts embedded. Change-Id: I3b4e87b1b3ca5ae1ccfe29d9b571b0262c568dcf
2013-02-21adapt writer to use centralised font dialog and fix some minor bugsNoel Power
fixed incorrect return of EmbeddFonts property and also make sure that NotifyEmbeddedFontRead is called on reload Change-Id: I085f50ff88bbf73b5dcdb9630b6c5844430a47c2
2013-02-18sw: let SwTxtNode::GetTxt() return OUStringMichael Stahl
Change-Id: I36e777b2f623429773277e092284f7d2ba61e6ef
2013-02-18sw; convert SwTxtNode::m_Text to OUStringMichael Stahl
Do not convert any of the 16bit index variables at this time: the enforced limit of TXTNODE_MAX should ensure that they are sufficient, and there are thousands of these variables all around sw. (also, STRING_LEN/STRING_NOTFOUND is used as a "not found" value all over the place) Change-Id: Id26a145701de731470b0bcb95359ed62d4d6d579
2013-02-18UI option for embedding fonts in a Writer document (fdo#42195)Luboš Luňák
File->Properties. Change-Id: I92757153c8815d17ea9f721a98b22b9088014f31
2013-02-18SwDoc: rename member variables missing their prefixMiklos Vajna
Change-Id: Id4683649aa9115f9075717768aa6cef4110c2ad2
2013-02-16sw: include SwFldTypes in doc model dumpMiklos Vajna
Change-Id: I62a86c1615ccddb23e658e01423dce8634156ffe
2013-02-15fdo#60732: check max size in SwTxtNode::ReplaceTextMichael Stahl
Also adjust SwUndoReplace to not assume that everything was inserted and use the stored indexes instead in Undo. Change-Id: I52f3aaf063c2b1bd52381bdc19e29a41a12c3847
2013-02-15fdo#60732: make callers of SwTxtNode::InsertText more robust:Michael Stahl
Return the actually inserted string from InsertText(), so callers can check if the insertion was actually successful. Especially InsertHint() will likely cause problems if it cannot insert its CH_TXTATR; also Undo objects should not Undo more than was actually inserted. Change-Id: I87c9ea8b226ae4a2a6c20c112da76db07051a1bf
2013-02-15fdo#60732: SwTxtNode: limit to less than STRING_LEN charsMichael Stahl
It's not a good idea to have STRING_LEN characters in a SwTxtNode because then there is no valid SwPosition at the end of the paragraph. Also it turns out that LO 3.6 and 4.0 do rather stupid things with a full SwTxtNode. So enforce a limit, at first in the usual places that are used during file import, SwTxtNode::InsertText() and SwCntntNode::CanJoinPrev()/CanJoinNext(). Change-Id: Icb0f44acd20aa81635d42b84d4ae0f9b693a661c
2013-02-15sal_Bool to boolTakeshi Abe
Change-Id: Ibc0cd792ee0d21ad4ed2958bad66e2536eec5250
2013-02-14fdo#60738 SwPostItMgr: let the cursor know if we're in annotation modeMiklos Vajna
This solves the conflicting requirements: If the annotation has focus ("in annotation mode"), then we want to be read-only only in case the comment anchor is inside a protected section, or so. Ignoring the fact that in the main document, the cursor is right before the annotation anchor, which is a read-only position. OTOH, if the annotation has no focus and the cursor position is before the annotation anchor position, then we do want to be read-only. With this commit, the first case passes around a boolean flag, so the annotation frame won't be read-only without a reason. Change-Id: I25781a4501f752f7c4d024795d57b884cb800547
2013-02-13asynchronous word-count.Michael Meeks
2013-02-13update pch headers, broken by 1aaf9a9Luboš Luňák
2013-02-12Renamed hard-to-remember 8-char headers in editeng.Kohei Yoshida
Change-Id: If255802082890e1b1b4c5197a791fa79a011773e
2013-02-12fdo#46808, convert xmloff module code to use XComponentContextNoel Grandin
with lots of repurcussions in other modules Change-Id: I6982671eecc701b06cf85d93533e1fe618044fea
2013-02-10Comment translation german - englishMatthias Freund
I moved order so "git grep '\<\(der\|die\|das\)\>' sw" does not show up this file because of "der" Change-Id: I98086993cf672806d763520b04e7693c8c772502 Reviewed-on: https://gerrit.libreoffice.org/2088 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
2013-02-10Comment translation german - englishMatthias Freund
Change-Id: Id40b6528515a9ebcf3deb0f84597955723118a15 Reviewed-on: https://gerrit.libreoffice.org/2087 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
2013-02-10Comment translation german - englishMatthias Freund
Change-Id: I752eaaeaa9835efb010da376824b10f25085bede Reviewed-on: https://gerrit.libreoffice.org/2085 Reviewed-by: Thomas Arnhold <thomas@arnhold.org> Tested-by: Thomas Arnhold <thomas@arnhold.org>
2013-02-10Comment translation german - englishMatthias Freund
Change-Id: I3af5ce71bb7758ae422e664ce2e0a44b8768134f Reviewed-on: https://gerrit.libreoffice.org/2084 Reviewed-by: Thomas Arnhold <thomas@arnhold.org> Tested-by: Thomas Arnhold <thomas@arnhold.org>
2013-02-09 Remarktranslations german - englishMatthias Freund
I have translated some german remarks into english for better understanding the sourcecode. I hope this helps a lot... Change-Id: I9d790684ec4c999aacbe5d7f47138a4bee26c7c7 Reviewed-on: https://gerrit.libreoffice.org/2058 Reviewed-by: Thomas Arnhold <thomas@arnhold.org> Tested-by: Thomas Arnhold <thomas@arnhold.org>
2013-02-06sw: let drawinglayer manage gradient styles of our textframesMiklos Vajna
With this, the hacks from commits 81a46fc86a530f028a5bd2f5e52fe0372d50ee38 and d7efffebd9651dd866349915360ade64b97d7301 are no longer necessary.
2013-02-05sal_Bool to boolTakeshi Abe
Change-Id: Ie3901ac8dc2cb46f6d06cbc2c80760570a474bf9
2013-02-03sw: remove class SwEventListenerContainerMichael Stahl
Change-Id: I576f5a0bdf04224d7032e0f592d2ad5cd9e77908
2013-02-03sw: replace SwEventListenerContainer in SwXTextTableMichael Stahl
OMultiTypeInterfaceContainerHelper appears to be a bit verbose to use... it needs a notifyEach method at least. But hopefully it will at least use less memory in case there are no listeners. Change-Id: I9f72ee8e4ad61f657f565b99cc37126d78b0c5cc
2013-02-03sw: replace SwEventListenerContainer in SwXFrameMichael Stahl
Change-Id: I9136d14364196810f0f64b086b9b06e5b558286d
2013-02-03sw: remove class SwRefreshListenerContainerMichael Stahl
Change-Id: Ieaec254358a70167deba1f604d766cceb8e3c5a7
2013-02-03sw: replace SwRefreshListenerContainer in SwXTextDocumentMichael Stahl
Change-Id: I67ddeacc80b833cee26ad0d34c80b9ce52c4db95