summaryrefslogtreecommitdiff
path: root/oox/inc/oox/ppt/pptshapegroupcontext.hxx
diff options
context:
space:
mode:
authorFrank Schoenheit [fs] <frank.schoenheit@sun.com>2010-03-11 11:26:05 +0100
committerFrank Schoenheit [fs] <frank.schoenheit@sun.com>2010-03-11 11:26:05 +0100
commit8122194ff0a27b467de23498483887fc2b760508 (patch)
tree8be6de3bbd5b979f2ab18dd57186ba32febc0066 /oox/inc/oox/ppt/pptshapegroupcontext.hxx
parentc835dffaf3525f6f8d0c1d3d34c3ec68600da32a (diff)
parent47d83021c1fb1fb51cb268f7549d9d0f92531e66 (diff)
autorecovery: merged changes from m74. Still need to find out how to re-do two patches (to module_hidden_ooo.scp and file_ooo.scp in scp2/source/ooo) which do not apply anymore.
Diffstat (limited to 'oox/inc/oox/ppt/pptshapegroupcontext.hxx')
-rw-r--r--oox/inc/oox/ppt/pptshapegroupcontext.hxx5
1 files changed, 1 insertions, 4 deletions
diff --git a/oox/inc/oox/ppt/pptshapegroupcontext.hxx b/oox/inc/oox/ppt/pptshapegroupcontext.hxx
index e14596424b81..c69a6de78155 100644
--- a/oox/inc/oox/ppt/pptshapegroupcontext.hxx
+++ b/oox/inc/oox/ppt/pptshapegroupcontext.hxx
@@ -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: pptshapegroupcontext.hxx,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify