diff options
Diffstat (limited to 'sw/inc/doc.hxx')
| -rw-r--r-- | sw/inc/doc.hxx | 47 |
1 files changed, 21 insertions, 26 deletions
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index ae910d89c648..bfe2826f52d8 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef SW_DOC_HXX #define SW_DOC_HXX @@ -87,6 +78,7 @@ class SwList; #include <memory> #include <boost/scoped_ptr.hpp> +#include <boost/shared_ptr.hpp> #include <boost/ptr_container/ptr_vector.hpp> namespace editeng { class SvxBorderLine; } @@ -324,6 +316,7 @@ class SW_DLLPUBLIC SwDoc : SwDefTOXBase_Impl * pDefTOXBases; ///< defaults of SwTOXBase's ViewShell *pCurrentView; ///< SwDoc should get a new member pCurrentView//swmod 071225 + boost::shared_ptr<SwRootFrm> pLayoutPtr; SdrModel *pDrawModel; ///< StarView Drawing SwDocUpdtFld *pUpdtFlds; ///< Struct for updating fields @@ -594,11 +587,11 @@ private: // COMPATIBILITY FLAGS END // - bool mbStartIdleTimer; ///< idle timer mode start/stop + bool mbStartIdleTimer; ///< idle timer mode start/stop - bool mbSetDrawDefaults; ///< set draw pool defaults for freshly created documents + bool mbSetDrawDefaults; ///< set draw pool defaults for freshly created documents - static SwAutoCompleteWord *pACmpltWords; ///< List of all words for AutoComplete + static SwAutoCompleteWord *pACmpltWords; ///< List of all words for AutoComplete //---------------- private methods ------------------------------ void checkRedlining(RedlineMode_t& _rReadlineMode); @@ -1761,6 +1754,8 @@ public: const SwDocShell* GetDocShell() const { return pDocShell; } void SetDocShell( SwDocShell* pDSh ); + void ShareLayout( boost::shared_ptr<SwRootFrm>& rPtr); + /** in case during copying of embedded object a new shell is created, it should be set here and cleaned later */ void SetTmpDocShell( SfxObjectShellLock rLock ) { xTmpDocShell = rLock; } |