diff options
author | Michael Stahl <mstahl@redhat.com> | 2015-06-15 21:34:58 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2015-06-15 21:49:58 +0200 |
commit | aaae5414177560fe40085abc0087ee63d629d5b4 (patch) | |
tree | a93f4db6270916330d2f7e29db3594f647fefb03 | |
parent | a624cf52ab08b18b08711567799a08f47c48f89b (diff) |
sw: move CheckAnchoredFlyConsistency to frmfmt.hxx
Change-Id: Ic7ccca9e59d2d17ed176d1961aa6f827e404c137
-rw-r--r-- | sw/inc/frmfmt.hxx | 6 | ||||
-rw-r--r-- | sw/source/core/doc/DocumentRedlineManager.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/doc/docedt.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/inc/atrfrm.hxx | 20 | ||||
-rw-r--r-- | sw/source/core/layout/atrfrm.cxx | 2 |
5 files changed, 9 insertions, 23 deletions
diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx index 2b88accce81f..6d80e230bfd1 100644 --- a/sw/inc/frmfmt.hxx +++ b/sw/inc/frmfmt.hxx @@ -302,6 +302,12 @@ public: SW_DLLPUBLIC bool IsFlyFrameFormatInHeader(const SwFrameFormat& rFormat); +namespace sw { + +void CheckAnchoredFlyConsistency(SwDoc const& rDoc); + +} + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx b/sw/source/core/doc/DocumentRedlineManager.cxx index 1bd877650c94..610c95f7f780 100644 --- a/sw/source/core/doc/DocumentRedlineManager.cxx +++ b/sw/source/core/doc/DocumentRedlineManager.cxx @@ -18,7 +18,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ #include <DocumentRedlineManager.hxx> -#include <atrfrm.hxx> +#include <frmfmt.hxx> #include <doc.hxx> #include <IDocumentUndoRedo.hxx> #include <IDocumentState.hxx> diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx index d4a3161c623d..d0a78cf45c34 100644 --- a/sw/source/core/doc/docedt.cxx +++ b/sw/source/core/doc/docedt.cxx @@ -44,7 +44,7 @@ #include <unoflatpara.hxx> #include <SwGrammarMarkUp.hxx> #include <docedt.hxx> -#include <atrfrm.hxx> +#include <frmfmt.hxx> #include <vector> diff --git a/sw/source/core/inc/atrfrm.hxx b/sw/source/core/inc/atrfrm.hxx deleted file mode 100644 index be59ad6c204f..000000000000 --- a/sw/source/core/inc/atrfrm.hxx +++ /dev/null @@ -1,20 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * 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/. - */ - -#include <sal/config.h> - -class SwDoc; - -namespace sw { - -void CheckAnchoredFlyConsistency(SwDoc const& rDoc); - -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index e48f4be06632..42e65b13bcb3 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -24,7 +24,7 @@ #include <svtools/unoimap.hxx> #include <svtools/imap.hxx> #include <svtools/imapobj.hxx> -#include <atrfrm.hxx> +#include <frmfmt.hxx> #include <unocoll.hxx> #include <unosett.hxx> #include <unostyle.hxx> |