diff options
| author | Thomas Lange [tl] <tl@openoffice.org> | 2010-02-26 08:13:29 +0100 |
|---|---|---|
| committer | Thomas Lange [tl] <tl@openoffice.org> | 2010-02-26 08:13:29 +0100 |
| commit | dde2e41414ae1179b4f5d568c2cbd03a1c911fae (patch) | |
| tree | 4fab97ec89f02e9c4b6b5b8129662a6d2c60521b /sw/inc/editsh.hxx | |
| parent | e54a20bf1a45c1c0d2abfe2a7a19bbf2c0bd6bee (diff) | |
| parent | 7e12418df527339d4a78416596ea12ed3cd6133a (diff) | |
cws tl74: merge with DEV300_m72
Diffstat (limited to 'sw/inc/editsh.hxx')
| -rw-r--r-- | sw/inc/editsh.hxx | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx index 0e3407e0f6d8..4b6669ecc784 100644 --- a/sw/inc/editsh.hxx +++ b/sw/inc/editsh.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: editsh.hxx,v $ - * $Revision: 1.70 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -35,7 +32,7 @@ #include <tools/string.hxx> #include <svl/svarray.hxx> #include <vcl/font.hxx> -#include <svx/swafopt.hxx> +#include <editeng/swafopt.hxx> #include "swdllapi.h" #include <crsrsh.hxx> // fuer Basisklasse #include <itabenum.hxx> @@ -58,7 +55,6 @@ class SvUShortsSort; class SvNumberFormatter; class SfxPoolItem; class SfxItemSet; -class SvxLinkManager; class SvxAutoCorrect; class SwField; // fuer Felder @@ -121,7 +117,9 @@ struct SpellPortion; typedef std::vector<SpellPortion> SpellPortions; } - +namespace sfx2{ +class LinkManager; +} #define GETSELTXT_PARABRK_TO_BLANK 0 #define GETSELTXT_PARABRK_KEEP 1 @@ -850,8 +848,8 @@ public: // Optimierung UI void SetNewDoc(BOOL bNew = TRUE); - SvxLinkManager& GetLinkManager(); - inline const SvxLinkManager& GetLinkManager() const; + sfx2::LinkManager& GetLinkManager(); + inline const sfx2::LinkManager& GetLinkManager() const; // linken Rand ueber Objectleiste einstellen (aenhlich dem Stufen von // Numerierungen), optional kann man "um" den Offset stufen oder "auf" @@ -953,7 +951,7 @@ inline void SwEditShell::ApplyViewOptions( const SwViewOption &rOpt ) SwEditShell::EndAction(); } -inline const SvxLinkManager& SwEditShell::GetLinkManager() const +inline const sfx2::LinkManager& SwEditShell::GetLinkManager() const { return ((SwEditShell*)this)->GetLinkManager(); } /* |