diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-09-28 10:22:07 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-09-28 10:22:07 +0000 |
commit | 9a76024842002c2633882f3c1c91b4658b7adff8 (patch) | |
tree | bd8c186886c72925dc8aaa4ec99983e71b6b3281 /sw/source/core/unocore/unodraw.cxx | |
parent | 0ed5e0fb0255dddb90171951a050f719f01a0651 (diff) |
INTEGRATION: CWS swqbf35 (1.66.148); FILE MERGED
2005/09/22 17:15:57 fme 1.66.148.2: RESYNC: (1.66-1.67); FILE MERGED
2005/08/08 11:00:14 od 1.66.148.1: #i52858# - method name <SwDoc::MakeDrawModel()>
changed to <SwDoc::GetOrCreateDrawModel()>
Diffstat (limited to 'sw/source/core/unocore/unodraw.cxx')
-rw-r--r-- | sw/source/core/unocore/unodraw.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx index cf568cb548f0..c62b1cc4cb69 100644 --- a/sw/source/core/unocore/unodraw.cxx +++ b/sw/source/core/unocore/unodraw.cxx @@ -4,9 +4,9 @@ * * $RCSfile: unodraw.cxx,v $ * - * $Revision: 1.67 $ + * $Revision: 1.68 $ * - * last change: $Author: rt $ $Date: 2005-09-09 05:25:27 $ + * last change: $Author: hr $ $Date: 2005-09-28 11:22:07 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -902,7 +902,9 @@ SwFmDrawPage* SwXDrawPage::GetSvxPage() if(!xPageAgg.is() && pDoc) { vos::OGuard aGuard(Application::GetSolarMutex()); - SdrModel* pModel = pDoc->MakeDrawModel(); + // --> OD 2005-08-08 #i52858# - method name changed + SdrModel* pModel = pDoc->GetOrCreateDrawModel(); + // <-- SdrPage* pPage = pModel->GetPage( 0 ); { |