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 | 42dc12206956b6c4a5444af80c1663bc94fba3f7 (patch) | |
| tree | 1eb8360c5dfa74ab9b36e023e298462672273a2b /sc/source/ui/view/viewfun2.cxx | |
| parent | 7bda65ff163feb3678846fa7f01bb261765a9dec (diff) | |
| parent | 315cc25e3f1ec5ee7c0adb5b8e51b036d54b603a (diff) | |
calctabcolor: rebased to m72.
Diffstat (limited to 'sc/source/ui/view/viewfun2.cxx')
| -rw-r--r-- | sc/source/ui/view/viewfun2.cxx | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx index f53bc7946..00f39423f 100644 --- a/sc/source/ui/view/viewfun2.cxx +++ b/sc/source/ui/view/viewfun2.cxx @@ -1,14 +1,11 @@ /************************************************************************* * * 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: viewfun2.cxx,v $ - * $Revision: 1.41.100.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -36,15 +33,15 @@ // INCLUDE --------------------------------------------------------------- #include "scitems.hxx" -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <sfx2/app.hxx> #define _SVSTDARR_STRINGS -#include <svx/boxitem.hxx> -#include <svx/fontitem.hxx> -#include <svx/scripttypeitem.hxx> -#include <svx/srchitem.hxx> -#include <svx/linkmgr.hxx> +#include <editeng/boxitem.hxx> +#include <editeng/fontitem.hxx> +#include <editeng/scripttypeitem.hxx> +#include <svl/srchitem.hxx> +#include <sfx2/linkmgr.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/docfilt.hxx> #include <sfx2/docfile.hxx> @@ -2431,7 +2428,7 @@ void ScViewFunc::ImportTables( ScDocShell* pSrcShell, if (bLink) { - SvxLinkManager* pLinkManager = pDoc->GetLinkManager(); + sfx2::LinkManager* pLinkManager = pDoc->GetLinkManager(); SfxMedium* pMed = pSrcShell->GetMedium(); String aFileName = pMed->GetName(); |