diff options
author | Andre Fischer <Andre.W.Fischer <Andre Fischer<Andre.W.Fischer@Sun.COM> | 2010-03-23 15:37:20 +0100 |
---|---|---|
committer | Andre Fischer <Andre.W.Fischer <Andre Fischer<Andre.W.Fischer@Sun.COM> | 2010-03-23 15:37:20 +0100 |
commit | 9300afa21cbb4cd48c6cbd4fa92f206aa858329e (patch) | |
tree | c0a1e02a72a19340637f247e982b62343b4a7300 /sd/sdi | |
parent | renaissance1: #i107215# Fixed minor compilation problems. (diff) | |
parent | CWS-TOOLING: integrate CWS chartshapes (diff) | |
download | core-9300afa21cbb4cd48c6cbd4fa92f206aa858329e.tar.gz core-9300afa21cbb4cd48c6cbd4fa92f206aa858329e.zip |
renaissance1: merge with DEV300_m75
Diffstat (limited to 'sd/sdi')
-rw-r--r-- | sd/sdi/SlideSorterController.sdi | 5 | ||||
-rw-r--r-- | sd/sdi/TaskPaneViewShell.sdi | 5 | ||||
-rw-r--r-- | sd/sdi/ViewShellBase.sdi | 5 | ||||
-rw-r--r-- | sd/sdi/_docsh.sdi | 5 | ||||
-rw-r--r-- | sd/sdi/_drvwsh.sdi | 5 | ||||
-rw-r--r-- | sd/sdi/docshell.sdi | 5 | ||||
-rw-r--r-- | sd/sdi/drviewsh.sdi | 5 | ||||
-rw-r--r-- | sd/sdi/grdocsh.sdi | 5 | ||||
-rw-r--r-- | sd/sdi/grviewsh.sdi | 5 | ||||
-rw-r--r-- | sd/sdi/makefile.mk | 8 | ||||
-rw-r--r-- | sd/sdi/outlnvsh.sdi | 5 | ||||
-rw-r--r-- | sd/sdi/sdgslots.sdi | 5 | ||||
-rw-r--r-- | sd/sdi/sdslots.hrc | 7 | ||||
-rw-r--r-- | sd/sdi/sdslots.sdi | 5 | ||||
-rw-r--r-- | sd/sdi/tables.sdi | 5 |
15 files changed, 18 insertions, 62 deletions
diff --git a/sd/sdi/SlideSorterController.sdi b/sd/sdi/SlideSorterController.sdi index 449969ce5b96..faa752d601df 100644 --- a/sd/sdi/SlideSorterController.sdi +++ b/sd/sdi/SlideSorterController.sdi @@ -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: SlideSorterController.sdi,v $ - * $Revision: 1.14.70.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/sdi/TaskPaneViewShell.sdi b/sd/sdi/TaskPaneViewShell.sdi index 8d35e88155c4..22f0fba21265 100644 --- a/sd/sdi/TaskPaneViewShell.sdi +++ b/sd/sdi/TaskPaneViewShell.sdi @@ -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: TaskPaneViewShell.sdi,v $ - * $Revision: 1.9 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/sdi/ViewShellBase.sdi b/sd/sdi/ViewShellBase.sdi index 67d9cfb1e85e..e9cb7119fa89 100644 --- a/sd/sdi/ViewShellBase.sdi +++ b/sd/sdi/ViewShellBase.sdi @@ -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: ViewShellBase.sdi,v $ - * $Revision: 1.13 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/sdi/_docsh.sdi b/sd/sdi/_docsh.sdi index 6d3267aacf81..c63d20c0f5f6 100644 --- a/sd/sdi/_docsh.sdi +++ b/sd/sdi/_docsh.sdi @@ -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: _docsh.sdi,v $ - * $Revision: 1.12 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi index 5021249c4ff9..53813365a686 100644 --- a/sd/sdi/_drvwsh.sdi +++ b/sd/sdi/_drvwsh.sdi @@ -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: _drvwsh.sdi,v $ - * $Revision: 1.44.70.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/sdi/docshell.sdi b/sd/sdi/docshell.sdi index 159bd05227fc..b69a5bc9c041 100644 --- a/sd/sdi/docshell.sdi +++ b/sd/sdi/docshell.sdi @@ -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: docshell.sdi,v $ - * $Revision: 1.8 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/sdi/drviewsh.sdi b/sd/sdi/drviewsh.sdi index b0dc446a6c72..600bbdf19a06 100644 --- a/sd/sdi/drviewsh.sdi +++ b/sd/sdi/drviewsh.sdi @@ -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: drviewsh.sdi,v $ - * $Revision: 1.17 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/sdi/grdocsh.sdi b/sd/sdi/grdocsh.sdi index 4cd3ef0c905e..d033c02b2824 100644 --- a/sd/sdi/grdocsh.sdi +++ b/sd/sdi/grdocsh.sdi @@ -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: grdocsh.sdi,v $ - * $Revision: 1.7 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/sdi/grviewsh.sdi b/sd/sdi/grviewsh.sdi index 055f762aa314..7fd5b74cb7c0 100644 --- a/sd/sdi/grviewsh.sdi +++ b/sd/sdi/grviewsh.sdi @@ -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: grviewsh.sdi,v $ - * $Revision: 1.9 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/sdi/makefile.mk b/sd/sdi/makefile.mk index 7eb22a96c770..ab128c378afc 100644 --- a/sd/sdi/makefile.mk +++ b/sd/sdi/makefile.mk @@ -1,15 +1,11 @@ #************************************************************************* # # 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.12 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/sdi/outlnvsh.sdi b/sd/sdi/outlnvsh.sdi index 3b0c49af6901..1632b2fa4163 100644 --- a/sd/sdi/outlnvsh.sdi +++ b/sd/sdi/outlnvsh.sdi @@ -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: outlnvsh.sdi,v $ - * $Revision: 1.18.70.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/sdi/sdgslots.sdi b/sd/sdi/sdgslots.sdi index db62ca5cdfb3..e52bd8ea59e8 100644 --- a/sd/sdi/sdgslots.sdi +++ b/sd/sdi/sdgslots.sdi @@ -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: sdgslots.sdi,v $ - * $Revision: 1.10 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/sdi/sdslots.hrc b/sd/sdi/sdslots.hrc index 68d6be8c3eff..472f794be479 100644 --- a/sd/sdi/sdslots.hrc +++ b/sd/sdi/sdslots.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: sdslots.hrc,v $ - * $Revision: 1.7 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -29,6 +26,8 @@ ************************************************************************/ #include <sfx2/sfx.hrc> #include <sfx2/sfxsids.hrc> +#include <editeng/editids.hrc> +#include <editeng/memberids.hrc> #include <svx/svxids.hrc> #include <app.hrc> #include <sdattr.hrc> diff --git a/sd/sdi/sdslots.sdi b/sd/sdi/sdslots.sdi index 208613595b65..21e60e6a1a79 100644 --- a/sd/sdi/sdslots.sdi +++ b/sd/sdi/sdslots.sdi @@ -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: sdslots.sdi,v $ - * $Revision: 1.12 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/sdi/tables.sdi b/sd/sdi/tables.sdi index 5ff7a06a9938..8126df09b75a 100644 --- a/sd/sdi/tables.sdi +++ b/sd/sdi/tables.sdi @@ -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: tables.sdi,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify |