diff options
| author | thb <thb@openoffice.org> | 2010-03-31 14:57:58 +0200 |
|---|---|---|
| committer | thb <thb@openoffice.org> | 2010-03-31 14:57:58 +0200 |
| commit | da8e718e08b3d9bb19b3939884c5f4ba71fc3f07 (patch) | |
| tree | ffbefec84c811d0271dd22ec3d4eeefc408d474d /sd/source/ui/app/sdmod1.cxx | |
| parent | 542222f04c17b7534d34c79d40d609b8eb6ec2fd (diff) | |
| parent | 2b800723513199616bb04c6bb377b685c4bde218 (diff) | |
Merge DEV300_m75
* resolved two conflicts caused by lineend changes in
canvashelper_texturefill.cxx and implrenderer.cxx. Took the cws
version, which uses new texture fill semantics, and fixes clipping
bug
* binned file header changes from head for deleted files
Diffstat (limited to 'sd/source/ui/app/sdmod1.cxx')
| -rw-r--r-- | sd/source/ui/app/sdmod1.cxx | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx index 65485d9df447..fcc22b73f424 100644 --- a/sd/source/ui/app/sdmod1.cxx +++ b/sd/source/ui/app/sdmod1.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: sdmod1.cxx,v $ - * $Revision: 1.52 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -39,16 +36,16 @@ #include <svx/dialogs.hrc> -#include <svx/langitem.hxx> -#include <svx/editdata.hxx> +#include <editeng/langitem.hxx> +#include <editeng/editdata.hxx> #include <vcl/msgbox.hxx> -#include <svx/svxenum.hxx> +#include <editeng/svxenum.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/request.hxx> #include <sfx2/printer.hxx> #include <sfx2/docfile.hxx> -#include <svx/paperinf.hxx> -#include <svx/eeitem.hxx> +#include <editeng/paperinf.hxx> +#include <editeng/eeitem.hxx> #include <unotools/useroptions.hxx> #include "app.hrc" |