diff options
author | RĂ¼diger Timm <rt@openoffice.org> | 2008-04-11 09:13:38 +0000 |
---|---|---|
committer | RĂ¼diger Timm <rt@openoffice.org> | 2008-04-11 09:13:38 +0000 |
commit | 8e75fb3fa18e80e66236fd3d73d20927bcdd109d (patch) | |
tree | 89fe6c257926d590ae3a1f791e41ffbdeaf604da /swext | |
parent | 2f354ab5a63ea719cc5493db76e1b8b14727e1a9 (diff) |
INTEGRATION: CWS changefileheaderm6 (1.1.2); FILE MERGED
2008/04/09 16:08:19 rt 1.1.2.1: #i87884# Change license header to LPGL v3.
Diffstat (limited to 'swext')
5 files changed, 90 insertions, 110 deletions
diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiCancelException.java b/swext/mediawiki/src/com/sun/star/wiki/WikiCancelException.java index 6be90384e71c..249619e59ff4 100644 --- a/swext/mediawiki/src/com/sun/star/wiki/WikiCancelException.java +++ b/swext/mediawiki/src/com/sun/star/wiki/WikiCancelException.java @@ -1,35 +1,31 @@ /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * $RCSfile: WikiCancelException.java,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.1 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: mav $ $Date: 2007-11-28 11:14:34 $ + * $RCSfile: WikiCancelException.java,v $ * - * The Contents of this file are made available subject to - * the terms of GNU Lesser General Public License Version 2.1. + * $Revision: 1.2 $ * + * This file is part of OpenOffice.org. * - * GNU Lesser General Public License Version 2.1 - * ============================================= - * Copyright 2005 by Sun Microsystems, Inc. - * 901 San Antonio Road, Palo Alto, CA 94303, USA + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1, as published by the Free Software Foundation. + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. * ************************************************************************/ diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiProtocolSocketFactory.java b/swext/mediawiki/src/com/sun/star/wiki/WikiProtocolSocketFactory.java index fd4d19225acd..218dbfb7f0c7 100644 --- a/swext/mediawiki/src/com/sun/star/wiki/WikiProtocolSocketFactory.java +++ b/swext/mediawiki/src/com/sun/star/wiki/WikiProtocolSocketFactory.java @@ -1,35 +1,31 @@ /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * $RCSfile: WikiProtocolSocketFactory.java,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.1 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: mav $ $Date: 2007-11-28 11:15:42 $ + * $RCSfile: WikiProtocolSocketFactory.java,v $ * - * The Contents of this file are made available subject to - * the terms of GNU Lesser General Public License Version 2.1. + * $Revision: 1.2 $ * + * This file is part of OpenOffice.org. * - * GNU Lesser General Public License Version 2.1 - * ============================================= - * Copyright 2005 by Sun Microsystems, Inc. - * 901 San Antonio Road, Palo Alto, CA 94303, USA + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1, as published by the Free Software Foundation. + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. * ************************************************************************/ diff --git a/swext/mediawiki/src/registry/data/org/openoffice/Office/Addons.xcu b/swext/mediawiki/src/registry/data/org/openoffice/Office/Addons.xcu index f8ab0fe3e29c..012b46987eb5 100644 --- a/swext/mediawiki/src/registry/data/org/openoffice/Office/Addons.xcu +++ b/swext/mediawiki/src/registry/data/org/openoffice/Office/Addons.xcu @@ -1,36 +1,32 @@ <?xml version='1.0' encoding='UTF-8'?> <!--*********************************************************************** * - * OpenOffice.org - a multi-platform office productivity suite + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * $RCSfile: Addons.xcu,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.1 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: mav $ $Date: 2008-02-08 14:57:24 $ + * $RCSfile: Addons.xcu,v $ * - * The Contents of this file are made available subject to - * the terms of GNU Lesser General Public License Version 2.1. + * $Revision: 1.2 $ * + * This file is part of OpenOffice.org. * - * GNU Lesser General Public License Version 2.1 - * ============================================= - * Copyright 2005 by Sun Microsystems, Inc. - * 901 San Antonio Road, Palo Alto, CA 94303, USA + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1, as published by the Free Software Foundation. + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. * ************************************************************************ --> <oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="Addons" oor:package="org.openoffice.Office"> diff --git a/swext/mediawiki/src/registry/data/org/openoffice/Office/OptionsDialog.xcu b/swext/mediawiki/src/registry/data/org/openoffice/Office/OptionsDialog.xcu index 941d75a213cf..85e7f85afa72 100644 --- a/swext/mediawiki/src/registry/data/org/openoffice/Office/OptionsDialog.xcu +++ b/swext/mediawiki/src/registry/data/org/openoffice/Office/OptionsDialog.xcu @@ -1,36 +1,32 @@ <?xml version='1.0' encoding='UTF-8'?> <!--*********************************************************************** * - * OpenOffice.org - a multi-platform office productivity suite + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * $RCSfile: OptionsDialog.xcu,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.1 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: mav $ $Date: 2008-02-08 14:57:34 $ + * $RCSfile: OptionsDialog.xcu,v $ * - * The Contents of this file are made available subject to - * the terms of GNU Lesser General Public License Version 2.1. + * $Revision: 1.2 $ * + * This file is part of OpenOffice.org. * - * GNU Lesser General Public License Version 2.1 - * ============================================= - * Copyright 2005 by Sun Microsystems, Inc. - * 901 San Antonio Road, Palo Alto, CA 94303, USA + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1, as published by the Free Software Foundation. + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. * ************************************************************************ --> <oor:component-data oor:name="OptionsDialog" oor:package="org.openoffice.Office" xmlns:oor="http://openoffice.org/2001/registry"> diff --git a/swext/mediawiki/src/registry/data/org/openoffice/Office/ProtocolHandler.xcu b/swext/mediawiki/src/registry/data/org/openoffice/Office/ProtocolHandler.xcu index 1e85627525f6..66cf4af577e3 100644 --- a/swext/mediawiki/src/registry/data/org/openoffice/Office/ProtocolHandler.xcu +++ b/swext/mediawiki/src/registry/data/org/openoffice/Office/ProtocolHandler.xcu @@ -1,36 +1,32 @@ <?xml version='1.0' encoding='UTF-8'?> <!--*********************************************************************** * - * OpenOffice.org - a multi-platform office productivity suite + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * $RCSfile: ProtocolHandler.xcu,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.1 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: mav $ $Date: 2008-02-08 14:57:44 $ + * $RCSfile: ProtocolHandler.xcu,v $ * - * The Contents of this file are made available subject to - * the terms of GNU Lesser General Public License Version 2.1. + * $Revision: 1.2 $ * + * This file is part of OpenOffice.org. * - * GNU Lesser General Public License Version 2.1 - * ============================================= - * Copyright 2005 by Sun Microsystems, Inc. - * 901 San Antonio Road, Palo Alto, CA 94303, USA + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1, as published by the Free Software Foundation. + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. * ************************************************************************ --> <oor:component-data oor:name="ProtocolHandler" oor:package="org.openoffice.Office" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> |