Commit Graph

282 Commits

Author SHA1 Message Date
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
Caolán McNamara
76631b6b91 Resolves: fdo#81147 fix mismatching drawlayer and docshell colorlists
a bit of mis-merge + a bit of underlying crashiness

regression from 378dc6ef20

Change-Id: Id0f7b6b6f13e1ec70dc900c21d2d020a44cf6081
2014-07-11 14:09:53 +01: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
Armin Le Grand
7d9bb549d4 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

(cherry picked from commit cc25c58f7052827bfebdc9fbeec668c8fa29ed1b)

Conflicts:
	cui/source/factory/dlgfact.cxx
	cui/source/factory/dlgfact.hxx
	cui/source/inc/bbdlg.hxx
	cui/source/inc/cuires.hrc
	cui/source/tabpages/bbdlg.cxx
	cui/source/tabpages/bbdlg.src
	cui/source/tabpages/page.cxx
	cui/source/tabpages/tparea.cxx
	include/svx/pagectrl.hxx
	include/svx/svxdlg.hxx
	include/svx/svxids.hrc
	include/xmloff/PageMasterStyleMap.hxx
	include/xmloff/prstylei.hxx
	include/xmloff/txtprmap.hxx
	svx/Package_inc.mk
	svx/inc/svx/hdft.hxx
	svx/source/dialog/hdft.cxx
	svx/source/dialog/pagectrl.cxx
	svx/source/tbxctrls/tbxcolorupdate.cxx
	svx/source/unodraw/unobrushitemhelper.cxx
	sw/Library_sw.mk
	sw/inc/fillattributes.hxx
	sw/inc/format.hxx
	sw/inc/frmatr.hxx
	sw/inc/frmfmt.hxx
	sw/inc/hintids.hxx
	sw/inc/hints.hxx
	sw/inc/ndtxt.hxx
	sw/inc/node.hxx
	sw/inc/swunohelper.hxx
	sw/inc/unobrushitemhelper.hxx
	sw/inc/unoprnms.hxx
	sw/source/core/attr/format.cxx
	sw/source/core/attr/hints.cxx
	sw/source/core/doc/docdesc.cxx
	sw/source/core/doc/docdraw.cxx
	sw/source/core/doc/docfmt.cxx
	sw/source/core/doc/docnew.cxx
	sw/source/core/doc/docredln.cxx
	sw/source/core/doc/poolfmt.cxx
	sw/source/core/doc/visiturl.cxx
	sw/source/core/docnode/node.cxx
	sw/source/core/inc/frame.hxx
	sw/source/core/inc/frmtool.hxx
	sw/source/core/inc/rolbck.hxx
	sw/source/core/layout/atrfrm.cxx
	sw/source/core/layout/fillattributes.cxx
	sw/source/core/layout/findfrm.cxx
	sw/source/core/layout/paintfrm.cxx
	sw/source/core/txtnode/ndtxt.cxx
	sw/source/core/txtnode/thints.cxx
	sw/source/core/txtnode/txtedt.cxx
	sw/source/core/undo/rolbck.cxx
	sw/source/core/unocore/swunohelper.cxx
	sw/source/core/unocore/unoframe.cxx
	sw/source/core/unocore/unomap.cxx
	sw/source/core/unocore/unoparagraph.cxx
	sw/source/core/unocore/unoprnms.cxx
	sw/source/core/unocore/unostyle.cxx
	sw/source/ui/chrdlg/paradlg.src
	sw/source/ui/chrdlg/pardlg.cxx
	sw/source/ui/fmtui/tmpdlg.cxx
	sw/source/ui/fmtui/tmpdlg.src
	sw/source/uibase/app/docst.cxx
	sw/source/uibase/app/docstyle.cxx
	sw/source/uibase/frmdlg/colex.cxx
	sw/source/uibase/shells/basesh.cxx
	sw/source/uibase/shells/textsh1.cxx
	sw/source/uibase/uiview/viewstat.cxx
	sw/source/uibase/utlui/uitool.cxx
	xmloff/inc/PageMasterImportContext.hxx
	xmloff/inc/xmloff/XMLShapeStyleContext.hxx
	xmloff/source/draw/XMLShapeStyleContext.cxx
	xmloff/source/draw/sdpropls.hxx
	xmloff/source/style/PageMasterExportPropMapper.cxx
	xmloff/source/style/PageMasterImportContext.cxx
	xmloff/source/style/PageMasterPropHdlFactory.cxx
	xmloff/source/style/PageMasterStyleMap.cxx
	xmloff/source/style/prstylei.cxx
	xmloff/source/text/txtexppr.cxx
	xmloff/source/text/txtprhdl.cxx
	xmloff/source/text/txtprmap.cxx
	xmloff/source/text/txtstyli.cxx

Conflicts:
	svx/source/dialog/hdft.cxx
	sw/source/core/doc/visiturl.cxx
	sw/source/core/txtnode/thints.cxx
	sw/source/core/txtnode/txtatr2.cxx
	sw/source/core/unocore/unostyle.cxx

Change-Id: I7e8779db6c0cbd1e242b63eab888f468f2de509a
2014-07-01 13:30:09 +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
Jan-Marek Glogowski
d3070bc5f9 Update SwDoc::Paste from SwFEShell::Paste
SwDoc::Paste is already an minimal version of SwFEShell::Paste.

Update the code based on the changes made in
    commit 4580094d2d

Change-Id: I4d784f393952374e2a174510f9378b05cfdb78eb
Reviewed-on: https://gerrit.libreoffice.org/9861
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-06-24 15:35:56 +00: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
abf17aef7a Moved SwDoc's get<Interface> methods from docnew to doc.cxx
To have them all in the same place.

Change-Id: I8fd0f7fa0c88b5b17596998810d505deb14a8c06
2014-06-03 19:12:05 +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
a0e90ab606 Fixed a typo in IDocumentSettingAccess.hxx
Compatability -> Compatibility

Change-Id: Ia80e6db589a74d2aa8d1276195bc30ddb8d251fd
2014-06-03 19:12:03 +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
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
Jan Holesovsky
af10cb2c9c Rename SwDBMgr -> SwDBManager.
We were renaming it recently from SwNewDBMgr, let's use the full name to make
it more readable.

Change-Id: I2ceb3f1790321b70d5936c35e13870439969e64d
2014-05-02 21:32:23 +02:00
Valentin Kettner
185c270e66 Split out the IDocumentDeviceAccess interface of SwDoc.
The interface implementation is now in the class DocumentDeviceManager and
SwDoc has a member variable of that class to which the Interface's
method calls get forwarded.
The following methods were also moved because they are only used by this
interface:
CreateVirtualDevice_, CreatePrinter_ and PrtDataChanged.

Change-Id: I0b0de6540f0c8635ce560381fb924a3d9cd50c0e
2014-04-22 14:36:25 +02:00
anuragkanungo
e2a349c19d Refactor IDocumentSettingAccess Interface of SwDoc
Change-Id: I4a7ec73d3bdf9888e50d071b593798b74780b80c
2014-04-22 14:36:25 +02:00
Tor Lillqvist
f12237c4c6 More hacking on --disable-database-connectivity
Change-Id: Iefa6b104c60464e5a0d793bd676d8ea7ff2727c1
2014-04-22 13:04:19 +03:00
Tor Lillqvist
043bbbf198 There is nothing "new" with SwNewDBMgr any more
Change-Id: Icbf3d5663a358bf31b58ab8086ffe9160c26bf8f
2014-04-22 10:06:41 +03:00
Tor Lillqvist
b166e7af2b There is nothing "new" with SwNewDBMgr any more
Change-Id: I28c48be099ba680a5d6ea91981a1e1bfadff3f84
2014-04-22 08:07:17 +03:00
Thomas Arnhold
1635a70e31 typo: diposed -> disposed 2014-04-14 12:32:46 +02:00
Tor Lillqvist
3b47edcc76 This IOS ifdef has no visible effect nowadays
So bin it then.

Change-Id: Id8b073cffb4043793e91a06662ecea1c147a771f
2014-04-07 12:24:54 +03:00
Miklos Vajna
6055c6670f sw: translate internal name of default char/para style
Change-Id: Icda048beb9b4b580cdf2843ee34698decc035d04
2014-04-03 10:06:54 +02:00
Miklos Vajna
3d5349f290 missing SwExtraRedlineTbl dtor
Change-Id: I58eaedd89fa039945a3907c8f8858599ea5bbe9c
2014-03-22 14:22:15 +01:00
Noel Grandin
9278df2c21 sfx2: sal_Bool->bool
Change-Id: I73acb3a150b01114d32274a6842f6db9654b3e63
2014-03-19 09:21:24 +02:00
Rohit Deshmukh
06f7d1a96e fdo#74775: Preseved Citation after round trip.
Conflicts:
	sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Reviewed on:
	https://gerrit.libreoffice.org/8473

Change-Id: Ie1b0ac3cb4d4b9bf305323599d5e4b63f913fb1b
2014-03-14 10:45:33 +01:00
Alexander Wilms
a27462189d Remove visual noise from sw
Conflicts:
	sw/inc/unodraw.hxx
	sw/inc/unoframe.hxx
	sw/sdi/swriter.sdi
	sw/source/core/unocore/unoframe.cxx
	sw/source/core/unocore/unoparagraph.cxx
	sw/source/filter/ww8/rtfexportfilter.cxx
	sw/source/ui/inc/unotxvw.hxx
	sw/source/ui/lingu/hyp.cxx
	sw/source/ui/lingu/sdrhhcwrap.cxx
	sw/source/ui/uno/swdetect.hxx

Change-Id: Ic0a3fb2392187c277c9b36915ffb10dcf0317908
Reviewed-on: https://gerrit.libreoffice.org/8322
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-02-27 09:41:00 -06:00
Lei De Bin
5faf549274 Resolves: #i119612# fix the order of Hebraic string are changed after..
save as new .doc

* when opening .doc in AOO, preserve the RTL property(property ID is 0x085A)
and export.

Reported by: Lou Qing le
Patch by: Chen Zuo Jun
Review by: Lei De Bin
(cherry picked from commit daa4da26a7ba0c58c79af69fc6624729f7b22c10)

Conflicts:
	sw/inc/hintids.hxx
	sw/source/core/bastyp/init.cxx
	sw/source/core/doc/docnew.cxx
	sw/source/core/text/atrstck.cxx
	sw/source/filter/ww8/ww8atr.cxx

Change-Id: I2a1788452475e0deebf530aae41e543eae3cd45d

Resolves: #i120935# Insert blank entry for RES_CHRATR_BIDITRL...

and RES_CHRATR_IDCTHINT, to keep the identical res order

(cherry picked from commit 919e99308395c572a7298e6db2b96df8bf7ec3fd)

Conflicts:
	sw/source/filter/html/htmlatr.cxx

Change-Id: I3c2a3513de3c146ece583ff40bf3ffb3845f971c

Resolves: #i122867# HTML export - correct function pointer table...

which holds the export functions for certain attributes

(cherry picked from commit 5d963c0c996d50fa1033e7c2da48b5d1c3747f20)

Conflicts:
	sw/source/filter/html/css1atr.cxx

Change-Id: I7f31cfab8c654d5c549db1343d1e222f50a42c60
2014-02-26 16:13:25 +00:00
Adam Co
d688069023 Add support for 'Table Row Redlines' in SW core
This patch adds support for 'Table Row Redlines' (such as 'table row inserted'
or 'table row deleted' in SW core).
This is done by adding a new object called 'SwExtraRedlineTbl' that holds all
the redlines that are not of type 'SwRangedRedline'.
Also this patch adds a function for adding these types of redlines to the
'SwExtraRedlineTbl' object.
It also further develops the 'SwTableRowRedline' object.

Change-Id: Ic285f33e4f5af8f197d8fc24c2a8a3777755afad
Reviewed-on: https://gerrit.libreoffice.org/7821
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-02-11 14:18:34 +00:00
Michael Stahl
c6f3d909f8 sw: valgrind complains about uninitialized mbIsPrepareSelAll
Change-Id: I5405a6818fc63c3e29bb189858fd0abc73f67e43
2013-12-03 13:29:34 +01:00
Stephan Bergmann
bfcf3608e2 Uninitialized value
Change-Id: Id5ca398296658da61a9880beca7ee03a2db752e6
2013-12-02 15:20:42 +01:00
Miklos Vajna
ee3189489c sw: ViewShell -> SwViewShell rename
It's a public class, so it should have the 'Sw' prefix.

Change-Id: I0040c1cc37ffcba7fc5f58b71c86f4a7cb0bfce4
2013-10-26 20:03:50 +02:00
Tor Lillqvist
a7724966ab Bin comments that claim to say why some header is included
They are practically always useless, often misleading or obsolete.

Change-Id: I2d32182a31349c9fb3b982498fd22d93e84c0c0c
2013-10-22 16:56:28 +03:00
Tor Lillqvist
a537db8762 Bin useless swmod comments
Change-Id: I65df74242453a907b1a1a50f391e7b017bec5fcb
2013-10-22 15:19:17 +03:00
Jan Holesovsky
66013a154b [API CHANGE]: PreView -> Preview, including .uno:PrintPagePreView.
Will be .uno:PrintPagePreview going forward.

Change-Id: Ie5a35467917a54a60dab9eaacf0690c9df27e6f6
2013-10-16 16:57:22 +02:00
Tor Lillqvist
e036d4b706 Spell "indices" correctly
Change-Id: I63b1de195bf2f3f8bfd185181f48b1520cdd849f
2013-10-02 21:57:42 +03:00
Caolán McNamara
d66af0955d murder an auto_ptr
Change-Id: I46b07d117e5e452dbd2e50e0d4a04e6713e25945
Reviewed-on: https://gerrit.libreoffice.org/6112
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-10-02 15:49:16 +00:00
Caolán McNamara
c1198cf209 remove yet another StringHash impl
Change-Id: I1f7894a4a08b193b48dceb40bf0a451d4a3b3d6d
2013-10-02 16:03:54 +01:00
Stephan Bergmann
d3ca36915e More SAL_WNODEPRECATED_DECLARATIONS_PUSH/POP around std::auto_ptr
...as needed by Clang trunk towards 3.4.

Change-Id: Ibbfe9cb0ec03e0aed939d769feee9e046af4741f
2013-10-02 16:49:49 +02:00
Philipp Riemer
a323a7df85 whitespace work in sw/source/core/doc/
Change-Id: I79561a63db523b8da8de72a1096e908d184a8a0b
Reviewed-on: https://gerrit.libreoffice.org/6076
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2013-10-02 08:17:35 +00:00
Tor Lillqvist
c1015fdd51 Add hack to optionally get stable ODF output from the same input
To be used in regression testing and similar scenarios, where the output ODF
is *not* intended to be further manipulated in LibreOffice. An environment
variable LIBO_ONEWAY_STABLE_ODF_EXPORT is used to toggle this behaviour. I am
not 100% sure whether the generated ODF with the hack toggled on is even fully
correct, but correctness is not the purpose of the hack anyway.

Two classes of issues handled: 1) Automatic style names and 2) use of
randomness.

For class 1), when the hack toggle is in effect, we generate the names at
first as strings based on all the properties of the style, and sort them based
on those, and then rename them (for brevity in the output) to the "normal"
form of a short prefix plus a number (like "P12").

Sure, it would have been better to just figure out *why* the automatic style
naming currently is not stable in the first place, but outputs the styles in
different order (with some styles being assigned different numbers) in
separate invokations of LibreOffice), but I was unable to understand that.

Possibly this code could be used in all cases, except that it does break some
unit test (can't recall which right now). I don't know whether that is simply
because the unit test assumes too much knowledge of the internal workings of
the automatic style name generation, or whether the generated ODF is actually
invalid.

For 2), I found a handful of places where randomness was used to generated
various kinds of identifiers in ODF output. I changed those to just use large
(64-bit) non-overlapping integers instead. I assume there *is* a point in the
original code in each case that explains why randomness is needed, so the hack
definitely needs to be optional and used only for the above mentioned
scenarios.

Change-Id: I17b657197e38bcf24abdfe61ad4a277f4339eeae
2013-09-30 17:40:53 +03:00
Matteo Casalin
64b315df9b GetOutlineRuleName: return OUString instead of char*
Change-Id: I79cd722aa2d3bb0292f9b0f7fb6989e2e17d0ff0
Reviewed-on: https://gerrit.libreoffice.org/5563
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
2013-08-21 11:43:35 +00:00
Philipp Riemer
c99476fcfc deleted needless blank lines in sw/source/core/doc/
Change-Id: I5349ab03f7d2a4e66bf8ac5ef67382f47eb5b5d5
2013-08-09 22:44:41 +02:00
Luboš Luňák
8f8b31abd0 compatibility setting for MS Word wrapping text in less space (bnc#822908)
The document itself is stupid and uses a SURROUND_THROUGH object with a number
of empty lines that make it act is if it in fact was SURROUND_NONE, rather
than actually disabling wrapping for the object and be done with it.
But the difference was that Word still managed to fit those empty lines
next to the object into the little space that was there, while LO already
considered the space too small. So keep a compatibility setting for Word
documents in order to avoid problems with such lame documents and hopefully
that's enough.

Change-Id: I7d17b90de381fd86914ce5efd9c5a29fe4850edc
2013-08-06 17:17:53 +02:00
Jelle van der Waa
a1e10f8b46 fdo#63690 - replace RTL_CONTEXT_ macros with SAL_INFO
Change-Id: I26ca00f345b4f8b47dc35cd22652ef55f6d99536
Reviewed-on: https://gerrit.libreoffice.org/5218
Reviewed-by: Ioan Radu <ioan.radu.g@gmail.com>
Reviewed-by: Luboš Luňák <l.lunak@suse.cz>
Tested-by: Luboš Luňák <l.lunak@suse.cz>
2013-08-01 17:00:21 +00:00
Michael Stahl
f8dfa3a81a sw: remove SwDoc::ShareLayout
It is a crude hack that is no longer necessary because the underlying
problems that caused crashes when deleting the layout have been fixed.

Change-Id: I601bdb0dc0aff5f4ddb8b8f4ba4c8d1f72c76666
2013-07-03 16:38:35 +02:00
Armin Le Grand
c0eb5e7772 Resolves: #i121448# Aligned default fill color/line style for all apps
(cherry picked from commit 81664c037c8d6094b66c1660b6eee9693eadf401)

Conflicts:
	sc/inc/document.hxx
	sc/source/core/data/documen2.cxx
	sc/source/core/data/documen3.cxx
	sc/source/core/data/documen9.cxx
	svx/inc/svx/svdmodel.hxx
	svx/source/svdraw/svdmodel.cxx
	sw/inc/doc.hxx
	sw/source/core/doc/docdraw.cxx
	sw/source/core/doc/docnew.cxx
	sw/source/ui/app/docshini.cxx

Change-Id: Id0f62f0cd5b83794e2dbaee4e8b6afa704a0c23a
2013-06-06 21:04:07 +01:00
Jian Fang Zhang
6e426582ec Resolves: #i113606# in SwDoc dtor release the cyclic reference...
between XFormModel and bindings/submissions

Patch by: zhangjf
Review by: zhangjf

(cherry picked from commit adc0946638e8817d5e57b0003b414249ac481df0)

Conflicts:
	sw/inc/doc.hxx
	sw/source/core/doc/docnew.cxx
	sw/source/core/doc/docxforms.cxx

Change-Id: I3124daea8925b1efd8e151f3064582786d461718
2013-06-05 11:35:52 +01:00
Tor Lillqvist
c72bb2da7b Bin CLOOK comments and un-split one large switch statement
CLOOK = "Compiler Limit: Out Of Keys", an error reported by Microsoft's
compiler a long time ago. No such problem in those versions we support. No
need to mention CLOOK in comments any more.

While at it, re-combine one large switch statement that was split to avoid
CLOOK.

Change-Id: Id93d973a5fb3c81b6c754eef0ba3b0bd55a649d2
Reviewed-on: https://gerrit.libreoffice.org/3640
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
2013-04-28 14:28:29 +00:00