diff options
| author | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-04-12 20:04:24 +0200 |
|---|---|---|
| committer | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-04-12 20:04:24 +0200 |
| commit | bec2d48753200fbd99a138908157a4294fbfb118 (patch) | |
| tree | 573df4aa535541b714d810c34d074abf113dea52 /sd/source/ui/func/fuinsert.cxx | |
| parent | 409b6bcfcc3c8baa285d1bcb16f8063682a952a9 (diff) | |
| parent | c88455c9782248b48bf897aa66cb5c1a4a4e3bfb (diff) | |
slidecopy: merge
Diffstat (limited to 'sd/source/ui/func/fuinsert.cxx')
| -rw-r--r-- | sd/source/ui/func/fuinsert.cxx | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx index 578830b37c25..931ff3a10cb8 100644 --- a/sd/source/ui/func/fuinsert.cxx +++ b/sd/source/ui/func/fuinsert.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: fuinsert.cxx,v $ - * $Revision: 1.48 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -52,9 +49,8 @@ #include <svl/globalnameitem.hxx> #include <unotools/pathoptions.hxx> #include <svx/pfiledlg.hxx> -#include <svx/impgrf.hxx> #include <svx/dialogs.hrc> -#include <svx/linkmgr.hxx> +#include <sfx2/linkmgr.hxx> #include <svx/svdetc.hxx> #include <avmedia/mediawindow.hxx> #ifndef _UNOTOOLS_UCBSTREAMHELPER_HXX @@ -70,7 +66,7 @@ #include <svx/svdoole2.hxx> #include <svx/svdomedia.hxx> #ifndef _EDITENG_HXX //autogen -#include <svx/editeng.hxx> +#include <editeng/editeng.hxx> #endif #include <sot/storage.hxx> #include <sot/formats.hxx> @@ -78,7 +74,7 @@ #ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> #endif -#include <svx/opengrf.hxx> +#include <sfx2/opengrf.hxx> #include <sfx2/viewfrm.hxx> @@ -187,7 +183,7 @@ void FuInsertGraphic::DoExecute( SfxRequest& ) } else { - SdGRFFilter::HandleGraphicFilterError( (USHORT)nError, GetGrfFilter()->GetLastError().nStreamError ); + SdGRFFilter::HandleGraphicFilterError( (USHORT)nError, GraphicFilter::GetGraphicFilter()->GetLastError().nStreamError ); } } } |