diff options
| author | Christian Lippka <christian.lippka@sun.com> | 2010-03-12 20:13:16 +0100 |
|---|---|---|
| committer | Christian Lippka <christian.lippka@sun.com> | 2010-03-12 20:13:16 +0100 |
| commit | 1c858f73a9994340b8735fdcd5cfd018115e01cd (patch) | |
| tree | 6435d9ff657e86301c9ba47ff90795950b8a6595 /sd/source/filter/ppt/pptin.cxx | |
| parent | 9b03159e7030963753dcc7ff82f0b49207bd42b4 (diff) | |
| parent | 2b800723513199616bb04c6bb377b685c4bde218 (diff) | |
renaissance2: merge to m73
Diffstat (limited to 'sd/source/filter/ppt/pptin.cxx')
| -rw-r--r-- | sd/source/filter/ppt/pptin.cxx | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index ce06753f11b0..c80abb208fe3 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.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: pptin.cxx,v $ - * $Revision: 1.92.78.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -31,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sd.hxx" -#include <svx/numitem.hxx> +#include <editeng/numitem.hxx> #include <unotools/ucbstreamhelper.hxx> #include <vcl/wrkwin.hxx> @@ -46,19 +43,19 @@ #include <vcl/msgbox.hxx> #include <svl/style.hxx> #include <svx/xflclit.hxx> -#include <svx/eeitem.hxx> -#include <svx/colritem.hxx> +#include <editeng/eeitem.hxx> +#include <editeng/colritem.hxx> #include <svl/whiter.hxx> #include <svx/xgrad.hxx> #include <svx/xflgrit.hxx> #include <svx/xbtmpit.hxx> #include <svx/xlnclit.hxx> -#include <svx/adjitem.hxx> -#include <svx/editeng.hxx> -#include <svx/bulitem.hxx> -#include <svx/lrspitem.hxx> -#include <svx/lspcitem.hxx> -#include <svx/tstpitem.hxx> +#include <editeng/adjitem.hxx> +#include <editeng/editeng.hxx> +#include <editeng/bulitem.hxx> +#include <editeng/lrspitem.hxx> +#include <editeng/lspcitem.hxx> +#include <editeng/tstpitem.hxx> #include <sfx2/docinf.hxx> @@ -74,9 +71,9 @@ #include "anminfo.hxx" #include <svx/gallery.hxx> #include <tools/urlobj.hxx> -#include <svx/numitem.hxx> +#include <editeng/numitem.hxx> #include <svl/itempool.hxx> -#include <svx/fhgtitem.hxx> +#include <editeng/fhgtitem.hxx> #include <svx/svdopage.hxx> #include <svx/svdomedia.hxx> #include <svx/svdogrp.hxx> @@ -91,7 +88,7 @@ #include <unotools/fltrcfg.hxx> #include <sfx2/progress.hxx> #include <unotools/localfilehelper.hxx> -#include <svx/editstat.hxx> +#include <editeng/editstat.hxx> #include <unotools/pathoptions.hxx> #include <sfx2/docfac.hxx> #define MAX_USER_MOVE 2 |