diff options
| author | Armin Le Grand <alg@apache.org> | 2014-06-05 08:44:38 +0000 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-07-01 13:30:10 +0200 |
| commit | 378dc6ef20ffd0e657d78dbf6646d48059be4045 (patch) | |
| tree | d4e50dfd3b492b8433f04da848fe0f7fd2f75859 /sw/inc/dpage.hxx | |
| parent | c3f70303cf3725cfd64d3b07c0e7e895f8ac629d (diff) | |
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
Diffstat (limited to 'sw/inc/dpage.hxx')
| -rw-r--r-- | sw/inc/dpage.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/inc/dpage.hxx b/sw/inc/dpage.hxx index 38bd63eff62a..5881dd938a26 100644 --- a/sw/inc/dpage.hxx +++ b/sw/inc/dpage.hxx @@ -23,7 +23,7 @@ #include <svx/svdobj.hxx> class SdrPageGridFrameList; -class SwDrawDocument; +class SwDrawModel; class SwDoc; class SwDPage : public FmFormPage, public SdrObjUserCall @@ -32,7 +32,7 @@ class SwDPage : public FmFormPage, public SdrObjUserCall SwDoc& rDoc; public: - SwDPage(SwDrawDocument& rNewModel, bool bMasterPage=false); + SwDPage(SwDrawModel& rNewModel, bool bMasterPage=false); virtual ~SwDPage(); // #i3694# |