diff options
author | Kohei Yoshida <kyoshida@novell.com> | 2010-02-26 15:31:46 +0100 |
---|---|---|
committer | Kohei Yoshida <kyoshida@novell.com> | 2010-02-26 15:31:46 +0100 |
commit | 8c3ce6044a3a250a65eaa39c976ba0c03f3e09db (patch) | |
tree | 2a4f8677621076e780a8348d7ebd74ddf9abe8e4 /sc/source/ui/docshell/docfunc.cxx | |
parent | b9fce326449160ed0c6f5c07446baa64d38fa3d3 (diff) | |
parent | 22e99ad710239c0604f883f303d91b8c43a71f16 (diff) |
calctabcolor: rebased to m72.
Diffstat (limited to 'sc/source/ui/docshell/docfunc.cxx')
-rw-r--r-- | sc/source/ui/docshell/docfunc.cxx | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index acc9f16e7730..c9871a08d7c9 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -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: docfunc.cxx,v $ - * $Revision: 1.70.100.10 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -36,11 +33,11 @@ // INCLUDE --------------------------------------------------------------- #include "scitems.hxx" -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <sfx2/app.hxx> -#include <svx/editobj.hxx> -#include <svx/linkmgr.hxx> +#include <editeng/editobj.hxx> +#include <sfx2/linkmgr.hxx> #include <svx/svdundo.hxx> #include <sfx2/bindings.hxx> #include <sfx2/printer.hxx> @@ -4649,7 +4646,7 @@ BOOL ScDocFunc::InsertAreaLink( const String& rFile, const String& rFilter, ScDocument* pDoc = rDocShell.GetDocument(); BOOL bUndo (pDoc->IsUndoEnabled()); - SvxLinkManager* pLinkManager = pDoc->GetLinkManager(); + sfx2::LinkManager* pLinkManager = pDoc->GetLinkManager(); // #i52120# if other area links exist at the same start position, // remove them first (file format specifies only one link definition |