summaryrefslogtreecommitdiff
path: root/framework/source/interaction
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
commitaabc69e75dcde2bebc84df9242e86328de7fefd5 (patch)
tree3400a6d8c98f295be3c3bf29f70fda5b8b876d0f /framework/source/interaction
parentb7dc581d7ce45f9c692d942686ad0dd9ab701d90 (diff)
parent344e390b9d114b3cbdd9d1b39ea44e5cdf875788 (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 'framework/source/interaction')
-rw-r--r--framework/source/interaction/makefile.mk6
-rw-r--r--framework/source/interaction/preventduplicateinteraction.cxx5
-rw-r--r--framework/source/interaction/quietinteraction.cxx5
3 files changed, 3 insertions, 13 deletions
diff --git a/framework/source/interaction/makefile.mk b/framework/source/interaction/makefile.mk
index 4ae3564c21f7..0767cb6b3389 100644
--- a/framework/source/interaction/makefile.mk
+++ b/framework/source/interaction/makefile.mk
@@ -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: makefile.mk,v $
-#
-# $Revision: 1.5.82.1 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/interaction/preventduplicateinteraction.cxx b/framework/source/interaction/preventduplicateinteraction.cxx
index e005bdf7d627..6d0185a48080 100644
--- a/framework/source/interaction/preventduplicateinteraction.cxx
+++ b/framework/source/interaction/preventduplicateinteraction.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: preventduplicateinteraction.cxx,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/interaction/quietinteraction.cxx b/framework/source/interaction/quietinteraction.cxx
index 30130bf37360..f00bee4ed432 100644
--- a/framework/source/interaction/quietinteraction.cxx
+++ b/framework/source/interaction/quietinteraction.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: QuietInteraction.cxx,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify