diff options
| author | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-03-11 11:26:05 +0100 |
|---|---|---|
| committer | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-03-11 11:26:05 +0100 |
| commit | 1529b9aa479c0dda9333d45519de253ae5d8f9b9 (patch) | |
| tree | f41ca795ba83869802632566281e688667488753 /dbaccess/source/ui/querydesign/JoinController.cxx | |
| parent | 2794d673422feaa907f74ea06c2aa3f86de46e48 (diff) | |
| parent | 12d970576092ff0c85eb4deb1642d5f63391c4eb (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 'dbaccess/source/ui/querydesign/JoinController.cxx')
| -rw-r--r-- | dbaccess/source/ui/querydesign/JoinController.cxx | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx index 06624ad32..0f9fd8507 100644 --- a/dbaccess/source/ui/querydesign/JoinController.cxx +++ b/dbaccess/source/ui/querydesign/JoinController.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: JoinController.cxx,v $ - * $Revision: 1.47 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify |