Commit Graph

505 Commits

Author SHA1 Message Date
Jan-Marek Glogowski
cde554a731 fdo#81782 MM: copy most document properties
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-24 16:11:07 +00:00
Krisztian Pinter
e75a3b87cb Remove unnecessary include
Change-Id: I46c7af376aacb824a0d4298674423cc227b592f3
2014-09-17 10:19:29 +02:00
Krisztian Pinter
5f27596bed Add writer document font colors to color palettes
Change-Id: If3fedc45586eee068c40e92da87d5d550a456a64
2014-09-17 10:19:29 +02:00
Michael Stahl
3b11057b75 sw: rename SwDoc::Append to something unique
Change-Id: Ibb9db5ecdea6439df20fc1ee609267dcdd864405
2014-09-12 21:51:08 +02:00
Jan-Marek Glogowski
c808802e94 MM: introduce SwDoc::Append helper function
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-10 11:06:01 +00:00
Tor Lillqvist
30ae83c268 fdo#82577: Handle KeyCode
Put the VCL KeyCode class in the vcl namespace. Avoids clash with the X11
KeyCode typedef.

Change-Id: I624c9d937f7c5f5986d313b6c5f060bd8bb7e028
2014-08-23 22:33:30 +03:00
Michael Stahl
9f01ba1b78 i#107771: sw: burn, UnoCallBack, burn!
Change-Id: Ifdb6d4b2e404bd160e6fcec3229691e750bdf698
2014-08-20 16:40:18 +02:00
Valentin Kettner
15295ab6db Refactored SwDoc::GetEditShell .
Removed its output paramater as GetCurrentViewShell should be
used instead and added a const version.

Change-Id: Iad8b57553b6e93e3472ce8c6905d08e8d49af770
2014-08-19 21:57:06 +02:00
Takeshi Abe
44afb981a5 fdo#75757: remove inheritance to std::vector
by replacing it with a typedef.

Change-Id: Iaa88086e3c5195012982dd625bfd589de2e484a2
Reviewed-on: https://gerrit.libreoffice.org/11017
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
2014-08-19 08:30:44 -05:00
Valentin Kettner
1f4d9846ae Refactored IDocumentExternalData out of SwDoc.
Into the new class DocumentExternalDataManager.

Change-Id: Ib863daec170044c46143b47a91739d4c0940d963
2014-08-12 23:26:39 +02:00
Valentin Kettner
535971f3a1 Refactored IDocumentStylePoolAccess out of SwDoc.
Added non const SwDoc::GetDfltTxtFmtColl and SwDoc::GetTxtFmtColls
and SwDoc::GetCharFmts.
Had to make the manager friend of SwTxtFmtColl and SwConditionTxtFmtColl
Had to make SwDoc::_MakeCharFmt and SwDoc::_MakeFrmFmt public.

Change-Id: I19a36d91f92b3781a6c4313ec12eb8f7d4dfacc3
2014-08-12 23:26:38 +02:00
Valentin Kettner
5494954b26 Refactored IDocumentLayoutAccess out of SwDoc.
Into the new class DocumentLayoutManager.

Change-Id: I02d0cfcc63633d0bdab380508b2ef563187fd269
2014-08-12 23:26:38 +02:00
Valentin Kettner
64e13a1456 Refactored IDocumentState out of SwDoc.
Into the new class DocumentStateManager.

Change-Id: I91c9097b091ff6118d58fd15fff2a4cefe0171fd
2014-08-12 23:26:38 +02:00
Valentin Kettner
9cc617afcd Refactored IDocumentStatistics our of SwDoc.
Into the new class DocumentStatisticsManager.

Change-Id: I281232dc09dbd79c2faf3c2a78ae49625bbe88ee
2014-08-12 23:26:37 +02:00
Valentin Kettner
9d43f6d2c4 Refactored IDocumentLineNumberAccess.
This interface is obsolete and was deleted.

Change-Id: I56d37814f6e43f083ab3d199237ade06db287e18
2014-08-12 23:26:37 +02:00
Valentin Kettner
69e5f335ab Refactored IDocumentFieldsAccess out of SwDoc.
Into the new class DocumentFieldsManager.
Removed SwDoc::_MakeFldList because it is not defined anywhere.
Also moved a few non interface methods that belong to the manager.

Change-Id: Icefd7ca7adcbb05a18d6fae0529fc54150b862fd
2014-08-12 23:26:36 +02:00
Valentin Kettner
274f1811b9 Refactored IDocumentRedlineAccess out of SwDoc.
Into the new class DocumentRedlineManager.
Added an non const version of GetRedlineTbl to the interface.
Also Moved SetAutoFmtRedlineComment which is not part of interface.

Change-Id: I600d5821d5d5831557f5fc5375fb1203fe67a295
2014-08-12 23:26:36 +02:00
Valentin Kettner
f634ec520f Refactored IDocumentContentOperations out of SwDoc.
Into the new class DocumentContentOperationsManager.

Made SwNodes in sw/inc/ndarr.hxx friend class to
DocumentContentOperationsManager so it can call DelNodes at end of
DocumentContentOperationsManager::DeleteSection .

Added DeleteAutoCorrExceptWord to SwDoc, its needed in the Manager.

Added a non const version of SwDoc::GetDfltGrfFmtColl() to SwDoc
because its needed in the Manager.

Made SwDoc a friend class to DocumentContentOperationsManager so it
can call SwDoc::checkRedlining and SwDocL::_MakeFlySection.

Moved SwDoc::CopyImpl_ , SwDoc::CopyWithFlyInFly and
SwDoc::CopyFlyInFlyImpl into the Manager.

Moved "struct ParaRstFmt" and "lcl_RstTxtAttr" from docfmt.cxx
in DocumentContentOperationsManager.hxx .

Change-Id: Icaab57f4a8c158a85e549ecb4aacc752bc95bbc9
2014-07-15 15:44:04 +02:00
Valentin Kettner
3fed83524d Refactored IDocumentOutlineNodes out of SwDoc.
Into the new class DocumentOutlineNodesManager.

Change-Id: I05581391a1474872113ae91d6429709d181cabfe
2014-07-15 15:44:04 +02:00
Valentin Kettner
87cb919c7c Refactored IDocumentListsAccess out of SwDoc.
In the new class DocumentListsManager.
The method listfunc::CreateUniqueListId was also moved there.
Added a new method deleteListsByDefaultListStyle to the Interface,
which is needed for SwDoc::DelNumRule.

Change-Id: I75ea554a57d9402d2fcfeaedf9fbe50fbae2b020
2014-07-15 15:44:03 +02:00
Valentin Kettner
c8a8695d4d Refactored IDocumentListItems out of SwDoc.
Into the new class DocumentListItemsManager.

Change-Id: Ic86200280caa1b6e2c940bb12149235223ed0cd2
2014-07-15 15:44:03 +02:00
Valentin Kettner
54ca3a6efa Refactored IDocumentLinksAdministration out of SwDoc.
To the new class DocumentLinksAdministrationManager.
Additional to the Interface methods SwDoc::SelectServerObj was also moved
and sw/source/core/doc/docdde.cxx was deleted as it became empty.
Also fixed OUString usage in IDocumentLinksAdministration.hxx .

Change-Id: I1f2bf0881a7d4add9c657b6441851ae14ad8d161
2014-07-15 15:44:03 +02:00
Valentin Kettner
a27e8f6c8d Refactored IDocumentTimerAccess in SwDoc into DocumentTimerManager.
Change-Id: Idb39ef2cdc34e0c0e7853de0a656f579ca3528da
2014-07-15 15:44:02 +02:00
Valentin Kettner
c88a3d3e8c Refactored IDocumentChartDataProviderAccess in SwDoc.
Into the new class DocumentChartDataProviderManager.

Change-Id: I3be038ba276642546223c0c2fba3bea21980b33d
2014-07-15 15:44:02 +02:00
Armin Le Grand
378dc6ef20 Related: #i124638# Corrected relationship between DrawModel and...
DocShell in Writer, made SwDrawModel and handling more known

(includes suspicious removal of setting SID_ATTR_LINEEND_WIDTH_DEFAULT)

(cherry picked from commit a7ccadbf3b1ac378ca15d3630d48f48734700e5c)

Conflicts:
	sw/inc/IDocumentDrawModelAccess.hxx
	sw/inc/doc.hxx
	sw/inc/docsh.hxx
	sw/inc/dpage.hxx
	sw/inc/drawdoc.hxx
	sw/source/core/access/accmap.cxx
	sw/source/core/doc/doc.cxx
	sw/source/core/doc/docdesc.cxx
	sw/source/core/doc/docdraw.cxx
	sw/source/core/doc/docfly.cxx
	sw/source/core/doc/doclay.cxx
	sw/source/core/doc/docnew.cxx
	sw/source/core/draw/dcontact.cxx
	sw/source/core/draw/dpage.cxx
	sw/source/core/draw/drawdoc.cxx
	sw/source/core/frmedt/feshview.cxx
	sw/source/core/layout/fly.cxx
	sw/source/core/layout/frmtool.cxx
	sw/source/core/layout/newfrm.cxx
	sw/source/core/layout/paintfrm.cxx
	sw/source/core/undo/docundo.cxx
	sw/source/core/undo/unattr.cxx
	sw/source/core/unocore/unodraw.cxx
	sw/source/core/unocore/unoframe.cxx
	sw/source/core/view/vdraw.cxx
	sw/source/core/view/viewimp.cxx
	sw/source/core/view/viewsh.cxx
	sw/source/filter/html/htmldrawreader.cxx
	sw/source/filter/rtf/rtffly.cxx
	sw/source/filter/rtf/swparrtf.cxx
	sw/source/filter/ww8/docxattributeoutput.cxx
	sw/source/filter/ww8/rtfattributeoutput.cxx
	sw/source/filter/ww8/wrtw8esh.cxx
	sw/source/filter/ww8/wrtww8.cxx
	sw/source/filter/ww8/ww8graf.cxx
	sw/source/filter/xml/swxml.cxx
	sw/source/filter/xml/xmlexp.cxx
	sw/source/filter/xml/xmlimp.cxx
	sw/source/ui/app/docshdrw.cxx
	sw/source/ui/uiview/view.cxx
	sw/source/ui/uno/unodefaults.cxx
	sw/source/uibase/app/docst.cxx
	sw/source/uibase/app/docstyle.cxx
	sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx
	sw/source/uibase/lingu/sdrhhcwrap.cxx
	sw/source/uibase/shells/drwbassh.cxx
	sw/source/uibase/shells/frmsh.cxx
	sw/source/uibase/shells/grfsh.cxx
	sw/source/uibase/shells/textsh1.cxx
	sw/source/uibase/uno/unotxdoc.cxx
	sw/source/uibase/utlui/content.cxx

Conflicts:
	sw/source/uibase/app/docshdrw.cxx

Change-Id: Icb99eaa7bfb1eb8922a9fd928b5e4149821130dd
2014-07-01 13:30:10 +02:00
Oliver-Rainer Wittmann
b733d208b0 Related: #i78498# Do not keep OutlineLevel attribute at paragraph...
when a Paragraph Style is assigned.

(cherry picked from commit 6a1564284d90c7e175f7848520924f7f6a5884b7)
(cherry picked from commit 4a381b1124f60b76cabb558fa24827448a1caab0)

Conflicts:
	sw/inc/doc.hxx
	sw/inc/editsh.hxx
	sw/inc/fmtcol.hxx
	sw/inc/ndtxt.hxx
	sw/source/core/attr/format.cxx
	sw/source/core/doc/docfmt.cxx
	sw/source/core/doc/docglbl.cxx
	sw/source/core/doc/doctxm.cxx
	sw/source/core/doc/fmtcol.cxx
	sw/source/core/edit/edfcol.cxx
	sw/source/core/txtnode/ndtxt.cxx
	sw/source/core/undo/unfmco.cxx
	sw/source/core/unocore/unosett.cxx
	sw/source/core/unocore/unostyle.cxx

Change-Id: Ifa1214876df296f2e1210cc4a35f2df67f9f6bc4
2014-06-27 17:22:09 +01:00
Jan Holesovsky
c1be76ec98 pagedesc: Consolidate FindPageDescByName() and FindPageDesc().
Change-Id: I18d570509cd3f3b65a19a12a9df0b1d5db901d04
2014-06-25 20:03:19 +02:00
Jan Holesovsky
f246ac13bd pagedesc: It's better when MakePageDesc returns a pointer.
This removes many uses of GetPageDesc(sal_uInt16).

Change-Id: I9660e30d7fccd4336422ba03b19087321a7ae973
2014-06-25 20:03:19 +02:00
Michael Stahl
17dc7f1153 remove spurious com::sun::util prefix
Change-Id: I002a14fe0cb0cbdb4d5da51db8da6c8208cf604e
2014-06-25 15:04:47 +02:00
Michael Stahl
ca18092a78 remove spurious com::sun::text prefix
Change-Id: I98d2fc7de3c2d3f95fb96192da83761ac1146172
2014-06-25 15:04:47 +02:00
Michael Stahl
426b940a94 remove spurious ::com::sun::sdbcx namespace prefix
Change-Id: I37220af64c15259ab5bcf61b324d2a73ed8f5348
2014-06-25 15:04:46 +02:00
Michael Stahl
0de1e3a015 remove spurious com::sun::chaos
Apparently some time before inital CVS import a global
search-and-replace went horribly wrong and added spurious namespace
prefixes everywhere.

Change-Id: I4009bc3ab4b1d4c80412f75ad0e4628a382f99f0
2014-06-25 15:04:46 +02:00
Noel Grandin
3e82897353 improve the inlinesimplememberfunctions clang plugin
Change-Id: I6d5a952901648e01904ef5c37f953c517304d31e
2014-06-17 10:55:17 +02:00
Stephan Bergmann
3f4ea7a647 rtl::Reference fits just fine here
Change-Id: If06465ebad4083b8cdcd102ed0bbc6f61e78410f
2014-06-16 14:40:33 +02:00
Noel Grandin
184a00b962 loplugin: inlinesimplememberfunctions
Change-Id: I42119f656ca528286fb25d2d36c0af54b7d04a6b
2014-06-09 10:10:13 +02:00
Valentin Kettner
86075a3f0f Split out IDocumentDrawModelAccess from SwDoc.
To the new class DocumentDrawModelManager.
All moved methods and members have the same in thew new class.

Change-Id: I89ad0e0c4a42885d5810e834983ea8e8e6c0a2d2
2014-06-03 19:12:05 +02:00
Valentin Kettner
b7dd4ad818 Added IDocumentSettingAccess& getIDocumentSettingAccess() to SwDoc
Which returns the DocumentSettingManager as its interface.

Change-Id: I7d2c2d28a28fbcf19176ab5dda6940ce6d9b17cb
2014-06-03 19:12:03 +02:00
Valentin Kettner
f8455332dc Removed IDocumentDeviceAccess.hxx include in SwDoc.hxx
Because it is not needed there anymore in that class.
I added it as an include in all files that need it.

Change-Id: I3eb2e1da9d153017968b286e1a0250f145ca7cfe
2014-06-03 19:12:03 +02:00
Valentin Kettner
4161070eb2 Removed IDocumentSettingAccess.hxx include in SwDoc.hxx
Because it is not needed there anymore with IDocumentSettingManager.

Change-Id: Iad5e0a03f2628c9d26698d23e691b3e6228eee0b
2014-06-03 19:12:02 +02:00
Valentin Kettner
6f77ce5870 Removed DocumentSettingManager methods from SwDoc.
And moved all calls to those methods to GetDocumentSettingManager().

Change-Id: I9b6cc8c3aa9b57bbc0c39f39499dfb4f5f254ad9
2014-06-03 19:12:02 +02:00
Valentin Kettner
72e71364c6 Added 32DummyCompatabilityOptions to DocumentSettingMananger
And corresponding getter and setter which had to be made part of
IDocumentSettingAccess so their symbols get correclty exported.

Change-Id: Ia33244767110364174b115eaca5d733462be61ca
2014-06-03 19:12:01 +02:00
Valentin Kettner
051bf9d29e Work on DocumentSettingManager for SwDoc.
Moved mn32DummyCompatabilityOptions1 from SwDoc to DocumentSettingManager
and moved a comment from SwDoc to it.

Change-Id: I4abd5cd9596d23dc3ac12460ee9b38345d0bf0a7
2014-06-03 19:12:01 +02:00
Valentin Kettner
dbb2e6befb Made SwDoc::getDocumentDeviceAccess return a reference.
Also overloaded SwDoc::getDocumentDeviceAccess with its const
version.

Change-Id: I3272be3ee067aa2e0174663ede3c98190ecf2b09
2014-06-03 19:12:01 +02:00
Valentin Kettner
2ec2ec98bc Finished cleaning up of IDocumentDeviceAccess methods in SwDoc.
Moved all SwDoc::getPrintData and SwDoc::setPrintData calls to their
appropriate interface methods (SwDoc::getIDocumentDeviceAccess::").

Change-Id: I5671b365238abae6d94f125fb7a99481d81392f9
2014-06-03 19:12:01 +02:00
Valentin Kettner
95179fe909 Cleaning up of IDocumentDeviceAccess methods in SwDoc.
Moved all SwDoc::getJobSetup and SwDoc::setJobSetup calls to their
appropriate interface methods (SwDoc::getIDocumentDeviceAccess::").

Change-Id: I155a0341363ec42eaad3290d2e6feb8c7d73bbb1
2014-06-03 19:12:00 +02:00
Valentin Kettner
cf8a3e700f Cleaning up of IDocumentDeviceAccess methods in SwDoc.
Moved all SwDoc::getReferenceDevice and SwDoc::setReferenceDevice calls to their
appropriate interface methods (SwDoc::getIDocumentDeviceAccess::").

Change-Id: I2a1b488500fa4f0bfbb7ebadccde2c94b70efd85
2014-06-03 19:12:00 +02:00
Valentin Kettner
50682e7205 Removed getVirtualDevice and setVirtualDevice from SwDoc.
Nothing else had to be chaned because they werent call from anywhere
else.

Change-Id: I708b54b909c5a1814bcec858dd356e17e5c6c473
2014-06-03 19:12:00 +02:00
Valentin Kettner
a0c057f137 Started cleaning up of IDocumentDeviceAccess methods in SwDoc.
Moved all SwDoc::getPrinter and SwDoc::setPrinter calls to their
appropriate interface methods (SwDoc::getIDocumenterDeviceAccess::").

Change-Id: Icbe5369ba03a05d9e2afb1300a9c67b0a0a20c60
2014-06-03 19:11:59 +02:00
Miklos Vajna
b12bb0fb2e SwXFrames::getByIndex: ignore textboxes
Change-Id: I58a8c3cf5e0384f68a9259b3a1575a201436057e
2014-05-27 09:32:46 +02:00
Miklos Vajna
23a12e015b SwXFrames::getCount: ignore TextFrames, which are TextBoxes
Change-Id: I12d2912f566a31e36f6d091d554106b927abb9c9
2014-05-27 09:32:45 +02:00