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 | c73b3e8ea9e6c394d9c5c0f5cd38d010e6f6e631 (patch) | |
tree | 96c1dc8127a79fbcd20eed2ce6dbebfead138f0f /dbaccess/inc | |
parent | 8dd0c9c3f9bc8e4d0152edfb00294c4227db4555 (diff) | |
parent | f512282ff2fd3e55cb88dc5c94d2db91d91bd3f5 (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/inc')
-rw-r--r-- | dbaccess/inc/AsyncronousLink.hxx | 5 | ||||
-rw-r--r-- | dbaccess/inc/IController.hxx | 5 | ||||
-rw-r--r-- | dbaccess/inc/IEnvironment.hxx | 5 | ||||
-rw-r--r-- | dbaccess/inc/IReference.hxx | 5 | ||||
-rw-r--r-- | dbaccess/inc/ToolBoxHelper.hxx | 5 | ||||
-rw-r--r-- | dbaccess/inc/controllerframe.hxx | 5 | ||||
-rw-r--r-- | dbaccess/inc/dataview.hxx | 5 | ||||
-rw-r--r-- | dbaccess/inc/dbaccess_helpid.hrc | 5 | ||||
-rw-r--r-- | dbaccess/inc/dbaccess_slotid.hrc | 5 | ||||
-rw-r--r-- | dbaccess/inc/dbaccessdllapi.h | 5 | ||||
-rw-r--r-- | dbaccess/inc/genericcontroller.hxx | 5 | ||||
-rw-r--r-- | dbaccess/inc/makefile.mk | 6 | ||||
-rw-r--r-- | dbaccess/inc/pch/precompiled_dbaccess.cxx | 5 | ||||
-rw-r--r-- | dbaccess/inc/pch/precompiled_dbaccess.hxx | 7 | ||||
-rw-r--r-- | dbaccess/inc/singledoccontroller.hxx | 5 |
15 files changed, 16 insertions, 62 deletions
diff --git a/dbaccess/inc/AsyncronousLink.hxx b/dbaccess/inc/AsyncronousLink.hxx index 90be6c7147f8..2b2bbb597c7e 100644 --- a/dbaccess/inc/AsyncronousLink.hxx +++ b/dbaccess/inc/AsyncronousLink.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: AsyncronousLink.hxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/dbaccess/inc/IController.hxx b/dbaccess/inc/IController.hxx index a15e0f52e022..46d5a78922f3 100644 --- a/dbaccess/inc/IController.hxx +++ b/dbaccess/inc/IController.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: IController.hxx,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/dbaccess/inc/IEnvironment.hxx b/dbaccess/inc/IEnvironment.hxx index 4ea2a5e7dbb6..bc6766c91ebb 100644 --- a/dbaccess/inc/IEnvironment.hxx +++ b/dbaccess/inc/IEnvironment.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: IEnvironment.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/dbaccess/inc/IReference.hxx b/dbaccess/inc/IReference.hxx index e2a7a528acb6..ba78811e1e85 100644 --- a/dbaccess/inc/IReference.hxx +++ b/dbaccess/inc/IReference.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: IReference.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/dbaccess/inc/ToolBoxHelper.hxx b/dbaccess/inc/ToolBoxHelper.hxx index 26786dbf8e6f..0bb93681d8c6 100644 --- a/dbaccess/inc/ToolBoxHelper.hxx +++ b/dbaccess/inc/ToolBoxHelper.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: ToolBoxHelper.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/dbaccess/inc/controllerframe.hxx b/dbaccess/inc/controllerframe.hxx index 975722ab3539..942bdc42da64 100644 --- a/dbaccess/inc/controllerframe.hxx +++ b/dbaccess/inc/controllerframe.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: controllerframe.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/dbaccess/inc/dataview.hxx b/dbaccess/inc/dataview.hxx index adfc51a60734..ae93fa1d3284 100644 --- a/dbaccess/inc/dataview.hxx +++ b/dbaccess/inc/dataview.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: dataview.hxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/dbaccess/inc/dbaccess_helpid.hrc b/dbaccess/inc/dbaccess_helpid.hrc index ec30ff3d3d1d..ce0aafdd8da7 100644 --- a/dbaccess/inc/dbaccess_helpid.hrc +++ b/dbaccess/inc/dbaccess_helpid.hrc @@ -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: dbaccess_helpid.hrc,v $ - * $Revision: 1.73 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/dbaccess/inc/dbaccess_slotid.hrc b/dbaccess/inc/dbaccess_slotid.hrc index 53eed9b43e5f..c273a67edcbd 100644 --- a/dbaccess/inc/dbaccess_slotid.hrc +++ b/dbaccess/inc/dbaccess_slotid.hrc @@ -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: dbaccess_slotid.hrc,v $ - * $Revision: 1.11 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/dbaccess/inc/dbaccessdllapi.h b/dbaccess/inc/dbaccessdllapi.h index 217457959366..7edac96cf07c 100644 --- a/dbaccess/inc/dbaccessdllapi.h +++ b/dbaccess/inc/dbaccessdllapi.h @@ -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: dbaccessdllapi.h,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/dbaccess/inc/genericcontroller.hxx b/dbaccess/inc/genericcontroller.hxx index c35e166d374a..fefeec0125a1 100644 --- a/dbaccess/inc/genericcontroller.hxx +++ b/dbaccess/inc/genericcontroller.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: genericcontroller.hxx,v $ - * $Revision: 1.13.24.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/dbaccess/inc/makefile.mk b/dbaccess/inc/makefile.mk index a86c19b9058c..5aa9bfe11018 100644 --- a/dbaccess/inc/makefile.mk +++ b/dbaccess/inc/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.3 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/dbaccess/inc/pch/precompiled_dbaccess.cxx b/dbaccess/inc/pch/precompiled_dbaccess.cxx index 43dea13f3d62..1ef5d4b9c7a5 100644 --- a/dbaccess/inc/pch/precompiled_dbaccess.cxx +++ b/dbaccess/inc/pch/precompiled_dbaccess.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: precompiled_dbaccess.cxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/dbaccess/inc/pch/precompiled_dbaccess.hxx b/dbaccess/inc/pch/precompiled_dbaccess.hxx index 28e749191284..099adaf03988 100644 --- a/dbaccess/inc/pch/precompiled_dbaccess.hxx +++ b/dbaccess/inc/pch/precompiled_dbaccess.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: precompiled_dbaccess.hxx,v $ - * $Revision: 1.6 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -476,7 +473,7 @@ #include "svx/dbexch.hrc" #include "svx/dialogs.hrc" #include "svx/globlmn.hrc" -#include "svx/svxenum.hxx" +#include "editeng/svxenum.hxx" #include "svx/svxids.hrc" diff --git a/dbaccess/inc/singledoccontroller.hxx b/dbaccess/inc/singledoccontroller.hxx index eb21ad5b0ddc..5bda31fb4608 100644 --- a/dbaccess/inc/singledoccontroller.hxx +++ b/dbaccess/inc/singledoccontroller.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: singledoccontroller.hxx,v $ - * $Revision: 1.6 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify |