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 | 69564cd94b91e1575741f55a449479e69cb5dea6 (patch) | |
| tree | 878c51d30f613c45f6151ebe87890282861eaa2f /sdext/source/presenter/PresenterPane.cxx | |
| parent | a4c9aaff986ef280dffee68c101323d4369c8eea (diff) | |
| parent | cd8457ee4ff0ddf490539b8d620c38638ee08ae2 (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 'sdext/source/presenter/PresenterPane.cxx')
| -rw-r--r-- | sdext/source/presenter/PresenterPane.cxx | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sdext/source/presenter/PresenterPane.cxx b/sdext/source/presenter/PresenterPane.cxx index 320878c32103..509fc4acacaa 100644 --- a/sdext/source/presenter/PresenterPane.cxx +++ b/sdext/source/presenter/PresenterPane.cxx @@ -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: PresenterPane.cxx,v $ - * - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify |