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 | aabc69e75dcde2bebc84df9242e86328de7fefd5 (patch) | |
| tree | 3400a6d8c98f295be3c3bf29f70fda5b8b876d0f /svx/inc/pch | |
| parent | b7dc581d7ce45f9c692d942686ad0dd9ab701d90 (diff) | |
| parent | 344e390b9d114b3cbdd9d1b39ea44e5cdf875788 (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 'svx/inc/pch')
| -rw-r--r-- | svx/inc/pch/precompiled_svx.cxx | 5 | ||||
| -rw-r--r-- | svx/inc/pch/precompiled_svx.hxx | 7 |
2 files changed, 3 insertions, 9 deletions
diff --git a/svx/inc/pch/precompiled_svx.cxx b/svx/inc/pch/precompiled_svx.cxx index 70dd166aea8f..71c3408c6f31 100644 --- a/svx/inc/pch/precompiled_svx.cxx +++ b/svx/inc/pch/precompiled_svx.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_svx.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/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx index c83e875cd651..95ed1449c846 100644 --- a/svx/inc/pch/precompiled_svx.hxx +++ b/svx/inc/pch/precompiled_svx.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_svx.hxx,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -740,7 +737,7 @@ #include "sfx2/sfxstatuslistener.hxx" #include "sfx2/sfxuno.hxx" #include "sfx2/shell.hxx" -#include "sfx2/srchdefs.hxx" +#include "svl/srchdefs.hxx" #include "sfx2/tplpitem.hxx" #include "sfx2/viewfrm.hxx" #include "sot/clsids.hxx" |