diff options
| author | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-03-11 11:26:05 +0100 |
|---|---|---|
| committer | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-03-11 11:26:05 +0100 |
| commit | a25c3f5d7b47120b4b48d518fd97e81ed8f4e83f (patch) | |
| tree | 0811460d9cbfa1d7643eca28c72bdfe18686a6e6 /sw/inc/ndgrf.hxx | |
| parent | 2f2c66a2f9994401780daf36618292d7c7a8f230 (diff) | |
| parent | 6d466e187b459263b41a33122bb7cd244bd1ea1c (diff) | |
autorecovery: merged changes from m74. Still need to find out how to re-do two patches (to module_hidden_ooo.scp and file_ooo.scp in scp2/source/ooo) which do not apply anymore.
Diffstat (limited to 'sw/inc/ndgrf.hxx')
| -rw-r--r-- | sw/inc/ndgrf.hxx | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx index 942cda61a5..417d6b2b09 100644 --- a/sw/inc/ndgrf.hxx +++ b/sw/inc/ndgrf.hxx @@ -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: ndgrf.hxx,v $ - * $Revision: 1.23 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -30,7 +27,7 @@ #ifndef _NDGRF_HXX #define _NDGRF_HXX #include <sfx2/lnkbase.hxx> -#include <goodies/grfmgr.hxx> +#include <svtools/grfmgr.hxx> #include <ndnotxt.hxx> // --> OD, MAV 2005-08-17 #i53025# #include <com/sun/star/embed/XStorage.hpp> |