diff options
author | Thomas Lange [tl] <tl@openoffice.org> | 2010-02-26 08:13:29 +0100 |
---|---|---|
committer | Thomas Lange [tl] <tl@openoffice.org> | 2010-02-26 08:13:29 +0100 |
commit | f3f9bbf544328823c6816bcc6e9afecc886c18ab (patch) | |
tree | ef19e016bd5efea85f5e82ea265fd5a9531407c3 /svx/sdi | |
parent | 97d964702b7d8a9814a52b974505603ffba2e6c6 (diff) | |
parent | 4d8175599b8d193aba6eef89ef905c830b87d7e7 (diff) |
cws tl74: merge with DEV300_m72
Diffstat (limited to 'svx/sdi')
-rw-r--r-- | svx/sdi/fmslots.sdi | 5 | ||||
-rw-r--r-- | svx/sdi/makefile.mk | 8 | ||||
-rw-r--r-- | svx/sdi/svx.sdi | 30 | ||||
-rw-r--r-- | svx/sdi/svxitems.sdi | 5 | ||||
-rw-r--r-- | svx/sdi/svxslots.hrc | 9 | ||||
-rw-r--r-- | svx/sdi/svxslots.sdi | 5 | ||||
-rw-r--r-- | svx/sdi/xoitems.sdi | 5 |
7 files changed, 11 insertions, 56 deletions
diff --git a/svx/sdi/fmslots.sdi b/svx/sdi/fmslots.sdi index f372c6ad5e4b..83803b2bdaf6 100644 --- a/svx/sdi/fmslots.sdi +++ b/svx/sdi/fmslots.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: fmslots.sdi,v $ - * $Revision: 1.15.212.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/sdi/makefile.mk b/svx/sdi/makefile.mk index c86488daee1e..be41593be71a 100644 --- a/svx/sdi/makefile.mk +++ b/svx/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.8 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi index 5a248aa42d5e..5f7181f38734 100644 --- a/svx/sdi/svx.sdi +++ b/svx/sdi/svx.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: svx.sdi,v $ - * $Revision: 1.78.198.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -6945,31 +6942,6 @@ SfxBoolItem LastRecord SID_FM_RECORD_LAST ] //-------------------------------------------------------------------------- -SfxVoidItem LaunchStarImage SID_SIM_START -() -[ - /* flags: */ - AutoUpdate = FALSE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = FALSE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - Asynchron; - - /* config: */ - AccelConfig = TRUE, - MenuConfig = TRUE, - StatusBarConfig = FALSE, - ToolBoxConfig = TRUE, - GroupId = GID_APPLICATION; -] - -//-------------------------------------------------------------------------- SfxVoidItem LeaveFMCreateMode SID_FM_LEAVE_CREATE (SfxBoolItem Leave SID_FM_LEAVE_CREATE) [ diff --git a/svx/sdi/svxitems.sdi b/svx/sdi/svxitems.sdi index 65a59bccf3b6..3cd78dd5f09a 100644 --- a/svx/sdi/svxitems.sdi +++ b/svx/sdi/svxitems.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: svxitems.sdi,v $ - * $Revision: 1.32.212.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/sdi/svxslots.hrc b/svx/sdi/svxslots.hrc index 3c3d86218257..83ccbd763f38 100644 --- a/svx/sdi/svxslots.hrc +++ b/svx/sdi/svxslots.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: svxslots.hrc,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -28,7 +25,9 @@ * ************************************************************************/ #include <sfx2/sfx.hrc> +#include <sfx2/sfxsids.hrc> +#include <editeng/memberids.hrc> +#include <editeng/editids.hrc> #include <svx/svxids.hrc> #include <svx/unomid.hxx> -#include <sfx2/sfxsids.hrc> diff --git a/svx/sdi/svxslots.sdi b/svx/sdi/svxslots.sdi index 5b776c2e05d8..2ea6f7fef874 100644 --- a/svx/sdi/svxslots.sdi +++ b/svx/sdi/svxslots.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: svxslots.sdi,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/sdi/xoitems.sdi b/svx/sdi/xoitems.sdi index bc7795549556..0fcfd6d317e6 100644 --- a/svx/sdi/xoitems.sdi +++ b/svx/sdi/xoitems.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: xoitems.sdi,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify |