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/annotations/annotationwindow.hxx | |
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/annotations/annotationwindow.hxx')
-rw-r--r-- | sd/source/ui/annotations/annotationwindow.hxx | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sd/source/ui/annotations/annotationwindow.hxx b/sd/source/ui/annotations/annotationwindow.hxx index bdfe36c4ebf2..ba82d4e862d3 100644 --- a/sd/source/ui/annotations/annotationwindow.hxx +++ b/sd/source/ui/annotations/annotationwindow.hxx @@ -2,14 +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: postit.hxx,v $ - * - * $Revision: 1.8.84.7 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -44,7 +40,7 @@ #include <basegfx/polygon/b2dpolygon.hxx> #include <svx/sdr/overlay/overlayobject.hxx> -#include <svx/editstat.hxx> +#include <editeng/editstat.hxx> class OutlinerView; class Outliner; |