summaryrefslogtreecommitdiff
path: root/sw/inc
AgeCommit message (Collapse)Author
2014-10-13convert SW_TAB #defines to enumNoel Grandin
Change-Id: I8f2c63dc381416af1eb74794a1bbc3417eb272d6 Reviewed-on: https://gerrit.libreoffice.org/11936 Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org> Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
2014-10-12convert SW_MOVE constants to enumNoel Grandin
Change-Id: I504862618bfeeeed674c1cb816104a167cb2e27e Reviewed-on: https://gerrit.libreoffice.org/11935 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
2014-10-12Typo: compatability->compatibilityJulien Nabet
Change-Id: If0b98a30452a9d1fcc340173deb6856755926471
2014-10-12convert SWFMTFLD_ #defines to an enumNoel Grandin
Change-Id: I5daf6436fd049410c4863a4b065c9abd95b5d361 Reviewed-on: https://gerrit.libreoffice.org/11928 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
2014-10-10convert SWHTML_OPTTYPE #defines to enumNoel Grandin
Change-Id: I847c7c116984817c7d66d44431db0601f0a27209
2014-10-10only one value of the postit sort enum was being usedNoel Grandin
..so bin it Change-Id: Iff6bad245a5fdd14fb785f7f5b3ca65ab51b742b
2014-10-09copy document defaults/properties for separate mailmerge result filesLuboš Luňák
Also remove code duplication (that I'm not even sure why it's there). Change-Id: I9a20fe0de9b34adbd03155712869bb19f5969f9b
2014-10-09fdo#81356: convert Fraction to boost::rational<long> - wipJuan Picca
* Added rational util functions used by Fraction class not available in the boost::rational class. * Replaced usage of Fraction by boost::rational<long> * Removed code that relies on: 1. fraction.IsValid() -- rational only allow valid values, ie denominator() != 0 2. rational.denominator() == 0 -- always false 3. rational.denominator() < 0 -- always false but implementation detail: http://www.boost.org/doc/libs/release/libs/rational/rational.html#Internal%20representation * Simplified code that relies on: 1. rational.denominator() != 0 -- always true * BUGS EXIST because Fraction allows the creation of invalid values but boost::rational throws the exception boost::bad_rational Change-Id: I84970a4956afb3f91ac0c8f726547466319420f9 Reviewed-on: https://gerrit.libreoffice.org/11551 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-10-06Related; #i125163# rename IsAdaptedToNewFillPropertiesCaolán McNamara
to supportsFullDrawingLayerFillAttributeSet so as to rename our equivalent solution of d3de12fcfc85feb36eda3b0495807ef11d8fe772 "Resolves: fdo#81277 missing table cell background color in doc/html import" with that of 36cc153d32bc262c2285d333a1369f6ca36a7fba "i125163 Corrected FillStyle handling for tables in Writer" Change-Id: If8ecbc712e01d823d034ff3771bf38a4df16368d
2014-10-06fdo#71248 Excel VBA: ActiveDocument is not tracking currently selected DocJustin Luth
Change-Id: I86606646206ec26e2822a6e27888537d44351b7b Reviewed-on: https://gerrit.libreoffice.org/11725 Reviewed-by: Samuel Mehrbrodt <s.mehrbrodt@gmail.com> Tested-by: Samuel Mehrbrodt <s.mehrbrodt@gmail.com>
2014-10-03isDrawingLayerAttribute() maybe could return true for all drawinglayer attrsLuboš Luňák
Change-Id: I83013ecd45b32100bf14e004899561a57a087aef
2014-10-01fdo#75757: remove inheritance to std::vectorTakeshi Abe
from SwGrfFmtColls. Change-Id: I4dd83917584406704d1a52f85b8973f2714e9d0b Reviewed-on: https://gerrit.libreoffice.org/11731 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2014-10-01sw: std::auto_ptr -> std::unique_ptrStephan Bergmann
Change-Id: I60ac3706b9be335c31039ed0997cb8215808ddaa
2014-10-01Constify dumpAsXml and friendsJan-Marek Glogowski
All these dump functions should never change the dumped objects so 'const' all of them. Change-Id: Id83422e3950a73e48feb4708fbd4c251506997e0
2014-10-01MM: add non-UI LoadAndRegisterDataSource functionJan-Marek Glogowski
For the mail merge unit test we need a function to register new database sources without any UI interaction. This refactors and introduces new versions of LoadAndRegisterDataSource, which gets all previously interactive values as arguments. Change-Id: I1601b4112ddc800a0935950133d386ce349b9087
2014-10-01MM: export the SwDocShell mail merge via UNOJan-Marek Glogowski
This saves the loading time for large document. Use it if you want to present the generated document to the user or write a mail merge unit tests. This includes: * renaming "only" to "shell" at multiple occurences * dropping the DBMGR_MERGE_SINGLE_FILE special type for the mail merge wizard in favour of an additional SwMergeDescriptor boolean * cleanup and renaming of the internal merge type enums, so these actually match the diffferent merge targets: printer, email, file and shell Change-Id: I33c6773972195193687ba9c3e12b562310d330c1
2014-10-01fdo#82577: Handle TimeNoel Grandin
Put the TOOLS Time class in the tools namespace. Avoids clash with the X11 Time typedef. Change-Id: Iac57d5aef35e81ace1ee0d5e6d76cb278f8ad866 Reviewed-on: https://gerrit.libreoffice.org/11684 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
2014-09-30fdo#82577: Handle PolyPolygonNoel Grandin
Put the TOOLS PolyPolygon class in the tools namespace. Avoids clash with the Windows PolyPolygon typedef. Change-Id: I811ecbb3d55ba4ce66e4555a8586f60fcd57fb66
2014-09-30fdo#82577: Handle RegionNoel Grandin
Put the VCL Region class in the vcl namespace. Avoids clash with the X11 Region typedef. Change-Id: I6e008111df7cf37121fbc3eaabd44a8306338291
2014-09-29Resolves: fdo#81277 missing table cell background color in doc/html importCaolán McNamara
a regression from one of the DrawingLayer FillAttributes changes of... commit 7d9bb549d498d6beed2c4050c402d09643febdfa Author: Armin Le Grand <alg@apache.org> Date: Mon Jun 2 15:00:50 2014 +0000 Related: #i124638# Second step of DrawingLayer FillAttributes... for Writer objects, now added support for Paragraph and PageStyle (including Header and Footer) for direct attributes and style attributes commit 4a0b5e569d070c286daefb0fdfe45c0dd15d241c Author: Armin Le Grand <alg@apache.org> Date: Thu Apr 17 16:44:58 2014 +0000 i#124638 support for DrawingLayre FillStyle for GraphicFrames and ... ... EmbeddedObjectFrames in Writer commit 6e61ecd09679a66060f932835622821d39e92f01 Author: Armin Le Grand <alg@apache.org> Date: Wed Mar 19 16:17:02 2014 +0000 Merge back branch alg_writerframes to trunk all of which set all RES_FLYFRMFMT and RES_FRMFMT SwFmts to use the new fill attributes, but a) didn't change the aTableBoxSetRange for SwTableBoxFmt to include the XFILL attributes, so importing cell bgs from .doc got dropped b) didn't make any effort in the uno api for XCells to do the same sort of mapping that was done for XFrames its unclear to me if SwDrawFrmFmt is actually adapted or not, I've assumed that it is here Change-Id: I8d71def2aef6163099a16591f9e53ba2b430bd06
2014-09-24fdo#81782 MM: copy most document propertiesJan-Marek Glogowski
Mail merge wasn't copying the document properties into the target document. It also has to copy most document properties into the working copy, as ConvertFieldsToText is called just there. Change-Id: I7e07fec712c225f667d960a94f4eb3fd0b83f041 Reviewed-on: https://gerrit.libreoffice.org/10987 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2014-09-23loplugin: cstylecast, update PTR_CAST macro to use static_castNoel Grandin
I introduce a template method into the PTR_CAST machinery to maintain constness. There is now a FIXME in sd/../docshell.cxx because I needed to use a dynamic_cast there to work around the games it appears to be playing with OLE in-place activation. Signed-off-by: Stephan Bergmann <sbergman@redhat.com>, dropping the GCC-extension, unnecessary use of typeof from tools/rtti.hxx Change-Id: Iba5ace1aa27e02b34fcc91af1e658c43371afd03
2014-09-23fdo#82577: Handle WindowNoel Grandin
Put the VCL Window class in the vcl namespace. Avoids clash with the X11 Window typedef. Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a
2014-09-22Fix fdo#38884 Improve Up/Down movement in writerJuergen Funk
- It was provided, but the X-Position was reset after the cursor Up/Down - But in the Table is the X-Position not right -> other bug Change-Id: I2d70b7dc4ffa1e2612330d9b30ea5d916f5a9439 Reviewed-on: https://gerrit.libreoffice.org/11500 Reviewed-by: Samuel Mehrbrodt <s.mehrbrodt@gmail.com> Tested-by: Samuel Mehrbrodt <s.mehrbrodt@gmail.com>
2014-09-19SwCursor::SelectWordWT: include comment anchor character of a commented wordMiklos Vajna
In case the user double-clicks on a word and exactly that word is commented, then we used to select only the word, but not its comment anchor character. So when the user deleted the selection, the comment left there. It is still possible to manually select only the word, but on double-click let's just select the comment anchor as well, so a simple double-click on the commented word will remove the comment as well. Change-Id: I7322af61c31e8aba108eef5596849d17d55fc7eb
2014-09-18fdo#82577: Handle FontNoel Grandin
Put the VCL Font class in the vcl namespace. Avoids clash with the X11 Font typedef. Change-Id: I1a84f7cad8b31697b9860a3418f7dff794ff6537
2014-09-17TyposJulien Nabet
Change-Id: Icf850c4b7b146a82a5638a3cd88ad02f3171aff3
2014-09-17WaE: overriding virtual function declaration not marked 'override'Tor Lillqvist
Change-Id: Ic7f3e661a4824cca06fc16f2b1f23a2873ef4ecf
2014-09-17callcatcher: update unused codeCaolán McNamara
Change-Id: I2ddda0600ee876e9886ee3221f0ac5ad515fbd22
2014-09-17Remove unnecessary includeKrisztian Pinter
Change-Id: I46c7af376aacb824a0d4298674423cc227b592f3
2014-09-17Add writer document font colors to color palettesKrisztian Pinter
Change-Id: If3fedc45586eee068c40e92da87d5d550a456a64
2014-09-16Remove superfluous merge function.Eilidh McAdam
The only caller of MergeDocuments now uses MergeMailFiles instead, so MergeDocuments can be removed. Change-Id: I03903a7f85c8328ab3f28cb1d23130557a1be7b4 Reviewed-on: https://gerrit.libreoffice.org/10982 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2014-09-16Make UNO and wizard mail merge use same function.Eilidh McAdam
Instead of MergeDocuments and MergeMailFiles duplicating largely the same functionality, the only user of MergeDocuments (MM wizard) now uses MergeMailFiles. Change-Id: Ifad183bdeabf5ca1eb08b4b1df557404a54a9fdd Reviewed-on: https://gerrit.libreoffice.org/10981 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2014-09-16fdo#70346 MM: add mail merge data to condition dictJan-Marek Glogowski
Currently section hide conditions are just evaluated based on document field data. This adds the current mail merge dataset to the condition dictionary, so this can be used in the condition evaluation. The dataset values are named from their columns and added initially, therefore DB fields with identical names will overwrite the values in the dictionary! Change-Id: I82a5f9f6962628a76c836e8e2a7c9e264fdc16e0 Reviewed-on: https://gerrit.libreoffice.org/10978 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2014-09-12sw: rename SwDoc::Append to something uniqueMichael Stahl
Change-Id: Ibb9db5ecdea6439df20fc1ee609267dcdd864405
2014-09-10Fix single node CopyRangeJan-Marek Glogowski
Previously there was a restriction for the range to contain at least two nodes. Change-Id: Iadf21d3928303c2ab8df0d93dabd969ed1ff7e09 Reviewed-on: https://gerrit.libreoffice.org/10972 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2014-09-10MM: introduce SwDoc::Append helper functionJan-Marek Glogowski
This drops all the specialized, workaround code from MM, introduced to use the SwFEShell::Paste function and additionally merges and renames SwDoc::Paste into SwDoc::Append. There is still a little common codepath, therefore this adds comments to always update both functions. Change-Id: I704b3ef3257dd977dac95e16e25049ff8ade97ed Reviewed-on: https://gerrit.libreoffice.org/10967 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2014-09-10IDocumentContentOperations::CopyRange: fix commentMiklos Vajna
Change-Id: Ide5705323579aa5ea1e725685acb7421f416cf04
2014-09-09Replace the whole content for copied documentsJan-Marek Glogowski
If the document is initialized in CreateCopy, it already contains the initial empty paragraph. So we have to delete the content from initial document, as we're going to replace the whole content with the pasted document. Change-Id: Ie6a64dcb070f7d611dfde97f2c1a721834b4167b Reviewed-on: https://gerrit.libreoffice.org/10963 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2014-09-06SfxHint: convert home-grown RTTI to normal C++ RTTINoel Grandin
Also note that I fixed a bug in SvxFontMenuControl::Notify where the if statement had the check the wrong way around. Change-Id: I611e8929c65818191e36bd80f2b985820ada4411 Reviewed-on: https://gerrit.libreoffice.org/11147 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
2014-09-06Use size_t consistently, constify, reduce scopeMatteo Casalin
Change-Id: Ie5de70645becc5ac584f1b3ffe6048969d2a19a9
2014-09-05convert RID_SCROLL_NAVIGATION_WIN floating window to .uiCaolán McNamara
Change-Id: I92d13856fc4d206323d5517a8a48671bba683fec
2014-09-04sw::UnoImplPtr: add doxygen documentationMiklos Vajna
Change-Id: I336918d2aea005b7121a8f4a498bffd8b7b87899
2014-09-04coverity#707311 Uncaught exceptionCaolán McNamara
Change-Id: Ifdab456cb545e552a2efaed03ff00aeac874d47d
2014-09-04coverity#983958 Uncaught exceptionCaolán McNamara
Change-Id: Idd9c2dcfbeceb3519b1632a2f9b2651c73451061
2014-09-03Use enum type DBManagerOptions for merge type constantsEilidh McAdam
Change-Id: I64367939e25d71451ac23f5766c8dc0a16d79c9e
2014-09-02convert DLG_MAILMERGECHILD floating window to .uiCaolán McNamara
Change-Id: I0ab16d3f5d86004b63f9a1baa454b18b7948f86a
2014-09-02convert DLG_SYNC_BTN FloatingWindow to .uiCaolán McNamara
not much of a test, its just a single button Change-Id: I42f73ad0ad00e2af392bc6ab8bc827c3719b0304
2014-09-01fdo#83178 fix Chinese Conversion crashMatthew J. Francis
Reviewed on: https://gerrit.libreoffice.org/11187 Change-Id: Ifa9c7c1a29d7076903e038d3132c635b1143e2d8
2014-08-30fdo#80617 Use complete string to allow translation for page number infoSamuel Mehrbrodt
Change-Id: I8cc899f70ee4dcd65495b8ccc153a8fc3a2cc413 Reviewed-on: https://gerrit.libreoffice.org/11157 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Reviewed-by: Thomas Arnhold <thomas@arnhold.org> Tested-by: Thomas Arnhold <thomas@arnhold.org>