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/sdi/sdslots.hrc | |
| 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/sdi/sdslots.hrc')
| -rw-r--r-- | sd/sdi/sdslots.hrc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sd/sdi/sdslots.hrc b/sd/sdi/sdslots.hrc index 68d6be8c3eff..472f794be479 100644 --- a/sd/sdi/sdslots.hrc +++ b/sd/sdi/sdslots.hrc @@ -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: sdslots.hrc,v $ - * $Revision: 1.7 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -29,6 +26,8 @@ ************************************************************************/ #include <sfx2/sfx.hrc> #include <sfx2/sfxsids.hrc> +#include <editeng/editids.hrc> +#include <editeng/memberids.hrc> #include <svx/svxids.hrc> #include <app.hrc> #include <sdattr.hrc> |