Skip to content

C
core
Kaydet (Commit) fe36d24e authored tarafından Rüdiger Timm's avatar Rüdiger Timm
Dosyalara gözat
Seçenekler

INTEGRATION: CWS ooo19126 (1.4.402); FILE MERGED 

2005/09/05 14:38:54 rt 1.4.402.1: #i54170# Change license header: remove SISSL
üst 7987adcb
Show whitespace changes
Inline Side-by-side
Showing with 28 additions and 66 deletions
xmloff/source/forms/controlelement.cxx
Dosyayı görüntüle @ fe36d24e
/************************************************************************* /*************************************************************************
* *
* $RCSfile: controlelement.cxx,v $ * OpenOffice.org - a multi-platform office productivity suite
* *
* $Revision: 1.4 $ * $RCSfile: controlelement.cxx,v $
* *
* last change: $Author: kz $ $Date: 2003-12-11 12:07:12 $ * $Revision: 1.5 $
* *
* The Contents of this file are made available subject to the terms of * last change: $Author: rt $ $Date: 2005-09-09 14:03:48 $
* either of the following licenses
* *
* - GNU Lesser General Public License Version 2.1 * The Contents of this file are made available subject to
* - Sun Industry Standards Source License Version 1.1 * the terms of GNU Lesser General Public License Version 2.1.
* *
* Sun Microsystems Inc., October, 2000
* *
* GNU Lesser General Public License Version 2.1 * GNU Lesser General Public License Version 2.1
* ============================================= * =============================================
* Copyright 2000 by Sun Microsystems, Inc. * Copyright 2005 by Sun Microsystems, Inc.
* 901 San Antonio Road, Palo Alto, CA 94303, USA * 901 San Antonio Road, Palo Alto, CA 94303, USA
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
...@@ -33,30 +31,6 @@ ...@@ -33,30 +31,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA * MA 02111-1307 USA
* *
*
* Sun Industry Standards Source License Version 1.1
* =================================================
* The contents of this file are subject to the Sun Industry Standards
* Source License Version 1.1 (the "License"); You may not use this file
* except in compliance with the License. You may obtain a copy of the
* License at http://www.openoffice.org/license.html.
*
* Software provided under this License is provided on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING,
* WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
* MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
* See the License for the specific provisions governing your rights and
* obligations concerning the Software.
*
* The Initial Developer of the Original Code is: Sun Microsystems, Inc..
*
* Copyright: 2000 by Sun Microsystems, Inc.
*
* All Rights Reserved.
*
* Contributor(s): _______________________________________
*
*
************************************************************************/ ************************************************************************/
#ifndef _XMLOFF_FORMS_CONTROLELEMENT_HXX_ #ifndef _XMLOFF_FORMS_CONTROLELEMENT_HXX_
...@@ -105,6 +79,13 @@ namespace xmloff ...@@ -105,6 +79,13 @@ namespace xmloff
/************************************************************************* /*************************************************************************
* history: * history:
* $Log: not supported by cvs2svn $ * $Log: not supported by cvs2svn $
* Revision 1.4.402.1 2005/09/05 14:38:54 rt
* #i54170# Change license header: remove SISSL
*
* Revision 1.4 2003/12/11 12:07:12 kz
* INTEGRATION: CWS frmcontrols01 (1.3.210); FILE MERGED
* 2003/10/22 13:17:41 fs 1.3.210.1: #21277# new implementations for exporting/importing scrollbar controls as form:value-range elements
*
* Revision 1.3.210.1 2003/10/22 13:17:41 fs * Revision 1.3.210.1 2003/10/22 13:17:41 fs
* #21277# new implementations for exporting/importing scrollbar controls as form:value-range elements * #21277# new implementations for exporting/importing scrollbar controls as form:value-range elements
* *
......
xmloff/source/forms/controlelement.hxx
Dosyayı görüntüle @ fe36d24e
/************************************************************************* /*************************************************************************
* *
* $RCSfile: controlelement.hxx,v $ * OpenOffice.org - a multi-platform office productivity suite
* *
* $Revision: 1.4 $ * $RCSfile: controlelement.hxx,v $
* *
* last change: $Author: kz $ $Date: 2003-12-11 12:07:32 $ * $Revision: 1.5 $
* *
* The Contents of this file are made available subject to the terms of * last change: $Author: rt $ $Date: 2005-09-09 14:04:04 $
* either of the following licenses
* *
* - GNU Lesser General Public License Version 2.1 * The Contents of this file are made available subject to
* - Sun Industry Standards Source License Version 1.1 * the terms of GNU Lesser General Public License Version 2.1.
* *
* Sun Microsystems Inc., October, 2000
* *
* GNU Lesser General Public License Version 2.1 * GNU Lesser General Public License Version 2.1
* ============================================= * =============================================
* Copyright 2000 by Sun Microsystems, Inc. * Copyright 2005 by Sun Microsystems, Inc.
* 901 San Antonio Road, Palo Alto, CA 94303, USA * 901 San Antonio Road, Palo Alto, CA 94303, USA
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
...@@ -33,30 +31,6 @@ ...@@ -33,30 +31,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA * MA 02111-1307 USA
* *
*
* Sun Industry Standards Source License Version 1.1
* =================================================
* The contents of this file are subject to the Sun Industry Standards
* Source License Version 1.1 (the "License"); You may not use this file
* except in compliance with the License. You may obtain a copy of the
* License at http://www.openoffice.org/license.html.
*
* Software provided under this License is provided on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING,
* WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
* MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
* See the License for the specific provisions governing your rights and
* obligations concerning the Software.
*
* The Initial Developer of the Original Code is: Sun Microsystems, Inc..
*
* Copyright: 2000 by Sun Microsystems, Inc.
*
* All Rights Reserved.
*
* Contributor(s): _______________________________________
*
*
************************************************************************/ ************************************************************************/
#ifndef _XMLOFF_FORMS_CONTROLELEMENT_HXX_ #ifndef _XMLOFF_FORMS_CONTROLELEMENT_HXX_
...@@ -130,6 +104,13 @@ namespace xmloff ...@@ -130,6 +104,13 @@ namespace xmloff
/************************************************************************* /*************************************************************************
* history: * history:
* $Log: not supported by cvs2svn $ * $Log: not supported by cvs2svn $
* Revision 1.4.402.1 2005/09/05 14:38:54 rt
* #i54170# Change license header: remove SISSL
*
* Revision 1.4 2003/12/11 12:07:32 kz
* INTEGRATION: CWS frmcontrols01 (1.3.62); FILE MERGED
* 2003/10/22 13:17:42 fs 1.3.62.1: #21277# new implementations for exporting/importing scrollbar controls as form:value-range elements
*
* Revision 1.3.62.1 2003/10/22 13:17:42 fs * Revision 1.3.62.1 2003/10/22 13:17:42 fs
* #21277# new implementations for exporting/importing scrollbar controls as form:value-range elements * #21277# new implementations for exporting/importing scrollbar controls as form:value-range elements
* *
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment