Return-Path: X-Original-To: apmail-incubator-ooo-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-ooo-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 83DB3BF3B for ; Thu, 12 Jan 2012 15:56:43 +0000 (UTC) Received: (qmail 78198 invoked by uid 500); 12 Jan 2012 15:56:43 -0000 Delivered-To: apmail-incubator-ooo-commits-archive@incubator.apache.org Received: (qmail 78062 invoked by uid 500); 12 Jan 2012 15:56:40 -0000 Mailing-List: contact ooo-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ooo-dev@incubator.apache.org Delivered-To: mailing list ooo-commits@incubator.apache.org Received: (qmail 78042 invoked by uid 99); 12 Jan 2012 15:56:40 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 Jan 2012 15:56:40 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 Jan 2012 15:56:34 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 601F72388C42; Thu, 12 Jan 2012 15:55:08 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1230603 [25/27] - in /incubator/ooo/branches/alg/linecap: ./ ext_sources/ main/ main/accessibility/bridge/org/openoffice/accessibility/ main/accessibility/bridge/source/java/ main/accessibility/inc/pch/ main/accessibility/source/extended/ ... Date: Thu, 12 Jan 2012 15:54:24 -0000 To: ooo-commits@incubator.apache.org From: alg@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120112155508.601F72388C42@eris.apache.org> Modified: incubator/ooo/branches/alg/linecap/main/testautomation/xml/required/oasis_graphics_update.bas URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/linecap/main/testautomation/xml/required/oasis_graphics_update.bas?rev=1230603&r1=1230602&r2=1230603&view=diff ============================================================================== --- incubator/ooo/branches/alg/linecap/main/testautomation/xml/required/oasis_graphics_update.bas (original) +++ incubator/ooo/branches/alg/linecap/main/testautomation/xml/required/oasis_graphics_update.bas Thu Jan 12 15:54:01 2012 @@ -1,31 +1,24 @@ 'encoding UTF-8 Do not remove or change this line! -'************************************************************************** -' DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -' -' Copyright 2000, 2010 Oracle and/or its affiliates. +'************************************************************************* ' -' OpenOffice.org - a multi-platform office productivity suite +' Licensed to the Apache Software Foundation (ASF) under one +' or more contributor license agreements. See the NOTICE file +' distributed with this work for additional information +' regarding copyright ownership. The ASF licenses this file +' to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 +' +' Unless required by applicable law or agreed to in writing, +' software distributed under the License is distributed on an +' "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +' KIND, either express or implied. See the License for the +' specific language governing permissions and limitations +' under the License. ' -' This file is part of OpenOffice.org. -' -' 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. -' -' 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). -' -' You should have received a copy of the GNU Lesser General Public License -' version 3 along with OpenOffice.org. If not, see -' -' for a copy of the LGPLv3 License. -' -'/************************************************************************ -'* -'* owner : wolfram.garten@oracle.com +'************************************************************************* '* '* short description : OASIS OpenDocument Fileformat Test (Presentation and Drawing) '* Modified: incubator/ooo/branches/alg/linecap/main/toolkit/Makefile URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/linecap/main/toolkit/Makefile?rev=1230603&r1=1230602&r2=1230603&view=diff ============================================================================== --- incubator/ooo/branches/alg/linecap/main/toolkit/Makefile (original) +++ incubator/ooo/branches/alg/linecap/main/toolkit/Makefile Thu Jan 12 15:54:01 2012 @@ -1,29 +1,23 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# 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. -# -# 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). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* +#************************************************************** +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +#************************************************************** ifeq ($(strip $(SOLARENV)),) $(error No environment set!) Modified: incubator/ooo/branches/alg/linecap/main/tools/Makefile URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/linecap/main/tools/Makefile?rev=1230603&r1=1230602&r2=1230603&view=diff ============================================================================== --- incubator/ooo/branches/alg/linecap/main/tools/Makefile (original) +++ incubator/ooo/branches/alg/linecap/main/tools/Makefile Thu Jan 12 15:54:01 2012 @@ -1,29 +1,23 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# 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. -# -# 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). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* +#************************************************************** +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +#************************************************************** ifeq ($(strip $(SOLARENV)),) $(error No environment set!) Modified: incubator/ooo/branches/alg/linecap/main/unoxml/Library_unordf.mk URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/linecap/main/unoxml/Library_unordf.mk?rev=1230603&r1=1230602&r2=1230603&view=diff ============================================================================== --- incubator/ooo/branches/alg/linecap/main/unoxml/Library_unordf.mk (original) +++ incubator/ooo/branches/alg/linecap/main/unoxml/Library_unordf.mk Thu Jan 12 15:54:01 2012 @@ -40,6 +40,7 @@ $(eval $(call gb_Library_add_linked_libs sal \ stl \ rdf \ + xml2 \ xslt \ $(gb_STDLIBS) \ )) Modified: incubator/ooo/branches/alg/linecap/main/unoxml/Makefile URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/linecap/main/unoxml/Makefile?rev=1230603&r1=1230602&r2=1230603&view=diff ============================================================================== --- incubator/ooo/branches/alg/linecap/main/unoxml/Makefile (original) +++ incubator/ooo/branches/alg/linecap/main/unoxml/Makefile Thu Jan 12 15:54:01 2012 @@ -1,29 +1,23 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# 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. -# -# 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). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* +#************************************************************** +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +#************************************************************** ifeq ($(strip $(SOLARENV)),) $(error No environment set!) Modified: incubator/ooo/branches/alg/linecap/main/unoxml/source/rdf/librdf_repository.cxx URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/linecap/main/unoxml/source/rdf/librdf_repository.cxx?rev=1230603&r1=1230602&r2=1230603&view=diff ============================================================================== --- incubator/ooo/branches/alg/linecap/main/unoxml/source/rdf/librdf_repository.cxx (original) +++ incubator/ooo/branches/alg/linecap/main/unoxml/source/rdf/librdf_repository.cxx Thu Jan 12 15:54:01 2012 @@ -36,6 +36,7 @@ #include #include +#include // #i114999# do not include librdf.h, it is broken in redland 1.0.11 #include @@ -873,6 +874,11 @@ bool formatNeedsBaseURI(::sal_Int16 i_Fo return true; } +xmlParserInputPtr myExtEntityLoader( const char* /*URL*/, const char* /*ID*/, xmlParserCtxtPtr /*context*/) +{ + return NULL; +} + //void SAL_CALL uno::Reference SAL_CALL librdf_Repository::importGraph(::sal_Int16 i_Format, @@ -960,6 +966,9 @@ throw (uno::RuntimeException, lang::Ille "librdf_new_parser failed"), *this); } + xmlExternalEntityLoader oldExtEntityLoader = xmlGetExternalEntityLoader(); + xmlSetExternalEntityLoader( myExtEntityLoader); + uno::Sequence buf; uno::Reference xSeekable(i_xInStream, uno::UNO_QUERY); // UGLY: if only that redland junk could read streams... @@ -984,6 +993,8 @@ throw (uno::RuntimeException, lang::Ille "librdf_Repository::importGraph: " "librdf_model_context_add_statements failed"), *this); } + + xmlSetExternalEntityLoader( oldExtEntityLoader); return getGraph(i_xGraphName); } Modified: incubator/ooo/branches/alg/linecap/main/ure/source/README URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/linecap/main/ure/source/README?rev=1230603&r1=1230602&r2=1230603&view=diff ============================================================================== --- incubator/ooo/branches/alg/linecap/main/ure/source/README (original) +++ incubator/ooo/branches/alg/linecap/main/ure/source/README Thu Jan 12 15:54:01 2012 @@ -1,29 +1,23 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# 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. -# -# 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). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* +#************************************************************** +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +#************************************************************** Overview of URE installation Modified: incubator/ooo/branches/alg/linecap/main/ure/source/uretest/Makefile URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/linecap/main/ure/source/uretest/Makefile?rev=1230603&r1=1230602&r2=1230603&view=diff ============================================================================== --- incubator/ooo/branches/alg/linecap/main/ure/source/uretest/Makefile (original) +++ incubator/ooo/branches/alg/linecap/main/ure/source/uretest/Makefile Thu Jan 12 15:54:01 2012 @@ -1,29 +1,23 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# 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. -# -# 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). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* +#************************************************************** +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +#************************************************************** # The following variable can be set, if necessary (see README): #GCCS_COMPAT := LD_PRELOAD=/lib/libgcc_s.so.1 Modified: incubator/ooo/branches/alg/linecap/main/ure/source/uretest/README URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/linecap/main/ure/source/uretest/README?rev=1230603&r1=1230602&r2=1230603&view=diff ============================================================================== --- incubator/ooo/branches/alg/linecap/main/ure/source/uretest/README (original) +++ incubator/ooo/branches/alg/linecap/main/ure/source/uretest/README Thu Jan 12 15:54:01 2012 @@ -1,29 +1,23 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# 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. -# -# 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). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* +#************************************************************** +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +#************************************************************** This directory contains test files for the UNO Runtime Environment (URE) as well Modified: incubator/ooo/branches/alg/linecap/main/vbahelper/Makefile URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/linecap/main/vbahelper/Makefile?rev=1230603&r1=1230602&r2=1230603&view=diff ============================================================================== --- incubator/ooo/branches/alg/linecap/main/vbahelper/Makefile (original) +++ incubator/ooo/branches/alg/linecap/main/vbahelper/Makefile Thu Jan 12 15:54:01 2012 @@ -1,29 +1,23 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# 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. -# -# 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). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* +#************************************************************** +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +#************************************************************** ifeq ($(strip $(SOLARENV)),) $(error No environment set!) Modified: incubator/ooo/branches/alg/linecap/main/vbahelper/source/msforms/vbanewfont.cxx URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/linecap/main/vbahelper/source/msforms/vbanewfont.cxx?rev=1230603&r1=1230602&r2=1230603&view=diff ============================================================================== --- incubator/ooo/branches/alg/linecap/main/vbahelper/source/msforms/vbanewfont.cxx (original) +++ incubator/ooo/branches/alg/linecap/main/vbahelper/source/msforms/vbanewfont.cxx Thu Jan 12 15:54:01 2012 @@ -1,29 +1,25 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +/************************************************************** * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * 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. - * - * 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). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + *************************************************************/ + + #include #include Modified: incubator/ooo/branches/alg/linecap/main/vbahelper/source/vbahelper/collectionbase.cxx URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/linecap/main/vbahelper/source/vbahelper/collectionbase.cxx?rev=1230603&r1=1230602&r2=1230603&view=diff ============================================================================== --- incubator/ooo/branches/alg/linecap/main/vbahelper/source/vbahelper/collectionbase.cxx (original) +++ incubator/ooo/branches/alg/linecap/main/vbahelper/source/vbahelper/collectionbase.cxx Thu Jan 12 15:54:01 2012 @@ -1,29 +1,25 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2011 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * 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. - * - * 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). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ +/************************************************************** + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + *************************************************************/ + + #include Modified: incubator/ooo/branches/alg/linecap/main/vcl/Library_vclplug_gen.mk URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/linecap/main/vcl/Library_vclplug_gen.mk?rev=1230603&r1=1230602&r2=1230603&view=diff ============================================================================== --- incubator/ooo/branches/alg/linecap/main/vcl/Library_vclplug_gen.mk (original) +++ incubator/ooo/branches/alg/linecap/main/vcl/Library_vclplug_gen.mk Thu Jan 12 15:54:01 2012 @@ -149,8 +149,8 @@ $(eval $(call gb_Library_set_defs,vclplu ifeq ($(XINERAMA_LINK),dynamic) $(eval $(call gb_Library_set_ldflags,vclplug_gen,\ $$(LDFLAGS) \ - -lXinerama \ )) + else $(eval $(call gb_Library_set_ldflags,vclplug_gen,\ $$(LDFLAGS) \ @@ -198,5 +198,8 @@ $(eval $(call gb_Library_add_linked_libs m \ pthread \ )) +$(eval $(call gb_Library_add_external_libs,vclplug_gen, \ + Xinerama Xrandr \ +)) endif # vim: set noet sw=4 ts=4: Modified: incubator/ooo/branches/alg/linecap/main/vcl/Library_vclplug_gtk.mk URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/linecap/main/vcl/Library_vclplug_gtk.mk?rev=1230603&r1=1230602&r2=1230603&view=diff ============================================================================== --- incubator/ooo/branches/alg/linecap/main/vcl/Library_vclplug_gtk.mk (original) +++ incubator/ooo/branches/alg/linecap/main/vcl/Library_vclplug_gtk.mk Thu Jan 12 15:54:01 2012 @@ -55,14 +55,18 @@ $(eval $(call gb_Library_set_defs,vclplu )) $(eval $(call gb_Library_set_ldflags,vclplug_gtk,\ $$(LDFLAGS) \ - $(shell pkg-config --libs dbus-glib-1)\ +)) +$(eval $(call gb_Library_add_external_libs,vclplug_gtk, \ + $(shell pkg-config --libs dbus-glib-1) \ )) endif -$(eval $(call gb_Library_set_ldflags,vclplug_gtk,\ - $$(LDFLAGS) \ - $$(GTK_LIBS) \ - $$(GTHREAD_LIBS) \ +$(eval $(call gb_Library_set_ldflags,vclplug_gtk, \ + $$(LDFLAGS) \ + $(filter-out -l%,$(GTK_LIBS)) \ +)) +$(eval $(call gb_Library_add_external_libs,vclplug_gtk, \ + $(patsubst -l%,%, $(filter -l%, $(GTK_LIBS))) \ )) $(eval $(call gb_Library_add_linked_libs,vclplug_gtk,\ @@ -125,4 +129,5 @@ $(eval $(call gb_Library_add_linked_libs pthread \ )) endif + # vim: set noet sw=4 ts=4: Modified: incubator/ooo/branches/alg/linecap/main/vcl/Makefile URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/linecap/main/vcl/Makefile?rev=1230603&r1=1230602&r2=1230603&view=diff ============================================================================== --- incubator/ooo/branches/alg/linecap/main/vcl/Makefile (original) +++ incubator/ooo/branches/alg/linecap/main/vcl/Makefile Thu Jan 12 15:54:01 2012 @@ -1,29 +1,23 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# 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. -# -# 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). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* +#************************************************************** +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +#************************************************************** ifeq ($(strip $(SOLARENV)),) $(error No environment set!) Modified: incubator/ooo/branches/alg/linecap/main/vcl/aqua/source/dtrans/PictToBmpFlt.cxx URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/linecap/main/vcl/aqua/source/dtrans/PictToBmpFlt.cxx?rev=1230603&r1=1230602&r2=1230603&view=diff ============================================================================== --- incubator/ooo/branches/alg/linecap/main/vcl/aqua/source/dtrans/PictToBmpFlt.cxx (original) +++ incubator/ooo/branches/alg/linecap/main/vcl/aqua/source/dtrans/PictToBmpFlt.cxx Thu Jan 12 15:54:01 2012 @@ -1,32 +1,25 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +/************************************************************** * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: OSXTransferable.hxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * 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. - * - * 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). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + *************************************************************/ + + /* This is a work-around to prevent 'deprecated' warning for 'KillPicture' API Hopefully we can get rid of this whole code again when the OOo PICT filter Modified: incubator/ooo/branches/alg/linecap/main/vcl/os2/source/window/makefile URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/linecap/main/vcl/os2/source/window/makefile?rev=1230603&r1=1230602&r2=1230603&view=diff ============================================================================== --- incubator/ooo/branches/alg/linecap/main/vcl/os2/source/window/makefile (original) +++ incubator/ooo/branches/alg/linecap/main/vcl/os2/source/window/makefile Thu Jan 12 15:54:01 2012 @@ -1,29 +1,23 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# 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. -# -# 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). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* +#************************************************************** +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +#************************************************************** PRJ=..\..\.. Modified: incubator/ooo/branches/alg/linecap/main/vcl/unx/generic/app/i18n_cb.cxx URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/linecap/main/vcl/unx/generic/app/i18n_cb.cxx?rev=1230603&r1=1230602&r2=1230603&view=diff ============================================================================== --- incubator/ooo/branches/alg/linecap/main/vcl/unx/generic/app/i18n_cb.cxx (original) +++ incubator/ooo/branches/alg/linecap/main/vcl/unx/generic/app/i18n_cb.cxx Thu Jan 12 15:54:01 2012 @@ -1,29 +1,25 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +/************************************************************** * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * 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. - * - * 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). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + *************************************************************/ + + // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" Modified: incubator/ooo/branches/alg/linecap/main/vcl/unx/generic/app/i18n_ic.cxx URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/linecap/main/vcl/unx/generic/app/i18n_ic.cxx?rev=1230603&r1=1230602&r2=1230603&view=diff ============================================================================== --- incubator/ooo/branches/alg/linecap/main/vcl/unx/generic/app/i18n_ic.cxx (original) +++ incubator/ooo/branches/alg/linecap/main/vcl/unx/generic/app/i18n_ic.cxx Thu Jan 12 15:54:01 2012 @@ -1,29 +1,25 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +/************************************************************** * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * 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. - * - * 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). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + *************************************************************/ + + // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" Modified: incubator/ooo/branches/alg/linecap/main/vcl/unx/generic/app/i18n_im.cxx URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/linecap/main/vcl/unx/generic/app/i18n_im.cxx?rev=1230603&r1=1230602&r2=1230603&view=diff ============================================================================== --- incubator/ooo/branches/alg/linecap/main/vcl/unx/generic/app/i18n_im.cxx (original) +++ incubator/ooo/branches/alg/linecap/main/vcl/unx/generic/app/i18n_im.cxx Thu Jan 12 15:54:01 2012 @@ -1,29 +1,25 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +/************************************************************** * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * 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. - * - * 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). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + *************************************************************/ + + // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" Modified: incubator/ooo/branches/alg/linecap/main/vcl/unx/generic/app/i18n_keysym.cxx URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/linecap/main/vcl/unx/generic/app/i18n_keysym.cxx?rev=1230603&r1=1230602&r2=1230603&view=diff ============================================================================== --- incubator/ooo/branches/alg/linecap/main/vcl/unx/generic/app/i18n_keysym.cxx (original) +++ incubator/ooo/branches/alg/linecap/main/vcl/unx/generic/app/i18n_keysym.cxx Thu Jan 12 15:54:01 2012 @@ -1,29 +1,25 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +/************************************************************** * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * 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. - * - * 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). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + *************************************************************/ + + // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" Modified: incubator/ooo/branches/alg/linecap/main/vcl/unx/generic/app/i18n_status.cxx URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/linecap/main/vcl/unx/generic/app/i18n_status.cxx?rev=1230603&r1=1230602&r2=1230603&view=diff ============================================================================== --- incubator/ooo/branches/alg/linecap/main/vcl/unx/generic/app/i18n_status.cxx (original) +++ incubator/ooo/branches/alg/linecap/main/vcl/unx/generic/app/i18n_status.cxx Thu Jan 12 15:54:01 2012 @@ -1,29 +1,25 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +/************************************************************** * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * 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. - * - * 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). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + *************************************************************/ + + // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" Modified: incubator/ooo/branches/alg/linecap/main/vcl/unx/generic/app/i18n_wrp.cxx URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/linecap/main/vcl/unx/generic/app/i18n_wrp.cxx?rev=1230603&r1=1230602&r2=1230603&view=diff ============================================================================== --- incubator/ooo/branches/alg/linecap/main/vcl/unx/generic/app/i18n_wrp.cxx (original) +++ incubator/ooo/branches/alg/linecap/main/vcl/unx/generic/app/i18n_wrp.cxx Thu Jan 12 15:54:01 2012 @@ -1,29 +1,25 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +/************************************************************** * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * 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. - * - * 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). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + *************************************************************/ + + // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" Modified: incubator/ooo/branches/alg/linecap/main/vcl/unx/generic/app/i18n_xkb.cxx URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/linecap/main/vcl/unx/generic/app/i18n_xkb.cxx?rev=1230603&r1=1230602&r2=1230603&view=diff ============================================================================== --- incubator/ooo/branches/alg/linecap/main/vcl/unx/generic/app/i18n_xkb.cxx (original) +++ incubator/ooo/branches/alg/linecap/main/vcl/unx/generic/app/i18n_xkb.cxx Thu Jan 12 15:54:01 2012 @@ -1,29 +1,25 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +/************************************************************** * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * 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. - * - * 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). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + *************************************************************/ + + // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" Modified: incubator/ooo/branches/alg/linecap/main/vcl/unx/generic/app/keysymnames.cxx URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/linecap/main/vcl/unx/generic/app/keysymnames.cxx?rev=1230603&r1=1230602&r2=1230603&view=diff ============================================================================== --- incubator/ooo/branches/alg/linecap/main/vcl/unx/generic/app/keysymnames.cxx (original) +++ incubator/ooo/branches/alg/linecap/main/vcl/unx/generic/app/keysymnames.cxx Thu Jan 12 15:54:01 2012 @@ -1,29 +1,25 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +/************************************************************** * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * 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. - * - * 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). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + *************************************************************/ + + // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" Modified: incubator/ooo/branches/alg/linecap/main/vcl/unx/generic/app/randrwrapper.cxx URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/linecap/main/vcl/unx/generic/app/randrwrapper.cxx?rev=1230603&r1=1230602&r2=1230603&view=diff ============================================================================== --- incubator/ooo/branches/alg/linecap/main/vcl/unx/generic/app/randrwrapper.cxx (original) +++ incubator/ooo/branches/alg/linecap/main/vcl/unx/generic/app/randrwrapper.cxx Thu Jan 12 15:54:01 2012 @@ -1,29 +1,25 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +/************************************************************** * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * 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. - * - * 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). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + *************************************************************/ + + #ifdef USE_RANDR Modified: incubator/ooo/branches/alg/linecap/main/vcl/unx/generic/app/saldata.cxx URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/linecap/main/vcl/unx/generic/app/saldata.cxx?rev=1230603&r1=1230602&r2=1230603&view=diff ============================================================================== --- incubator/ooo/branches/alg/linecap/main/vcl/unx/generic/app/saldata.cxx (original) +++ incubator/ooo/branches/alg/linecap/main/vcl/unx/generic/app/saldata.cxx Thu Jan 12 15:54:01 2012 @@ -1,29 +1,25 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +/************************************************************** * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * 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. - * - * 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). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + *************************************************************/ + + // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" Modified: incubator/ooo/branches/alg/linecap/main/vcl/unx/generic/app/saldisp.cxx URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/linecap/main/vcl/unx/generic/app/saldisp.cxx?rev=1230603&r1=1230602&r2=1230603&view=diff ============================================================================== --- incubator/ooo/branches/alg/linecap/main/vcl/unx/generic/app/saldisp.cxx (original) +++ incubator/ooo/branches/alg/linecap/main/vcl/unx/generic/app/saldisp.cxx Thu Jan 12 15:54:01 2012 @@ -1,29 +1,25 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +/************************************************************** * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * 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. - * - * 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). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + *************************************************************/ + + // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" Modified: incubator/ooo/branches/alg/linecap/main/vcl/unx/generic/app/salinst.cxx URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/linecap/main/vcl/unx/generic/app/salinst.cxx?rev=1230603&r1=1230602&r2=1230603&view=diff ============================================================================== --- incubator/ooo/branches/alg/linecap/main/vcl/unx/generic/app/salinst.cxx (original) +++ incubator/ooo/branches/alg/linecap/main/vcl/unx/generic/app/salinst.cxx Thu Jan 12 15:54:01 2012 @@ -1,29 +1,25 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +/************************************************************** * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * 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. - * - * 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). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + *************************************************************/ + + // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" Modified: incubator/ooo/branches/alg/linecap/main/vcl/unx/generic/app/salsys.cxx URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/linecap/main/vcl/unx/generic/app/salsys.cxx?rev=1230603&r1=1230602&r2=1230603&view=diff ============================================================================== --- incubator/ooo/branches/alg/linecap/main/vcl/unx/generic/app/salsys.cxx (original) +++ incubator/ooo/branches/alg/linecap/main/vcl/unx/generic/app/salsys.cxx Thu Jan 12 15:54:01 2012 @@ -1,29 +1,25 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +/************************************************************** * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * 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. - * - * 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). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + *************************************************************/ + + // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" Modified: incubator/ooo/branches/alg/linecap/main/vcl/unx/generic/app/saltimer.cxx URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/linecap/main/vcl/unx/generic/app/saltimer.cxx?rev=1230603&r1=1230602&r2=1230603&view=diff ============================================================================== --- incubator/ooo/branches/alg/linecap/main/vcl/unx/generic/app/saltimer.cxx (original) +++ incubator/ooo/branches/alg/linecap/main/vcl/unx/generic/app/saltimer.cxx Thu Jan 12 15:54:01 2012 @@ -1,29 +1,25 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +/************************************************************** * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * 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. - * - * 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). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + *************************************************************/ + + // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" Modified: incubator/ooo/branches/alg/linecap/main/vcl/unx/generic/app/sm.cxx URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/linecap/main/vcl/unx/generic/app/sm.cxx?rev=1230603&r1=1230602&r2=1230603&view=diff ============================================================================== --- incubator/ooo/branches/alg/linecap/main/vcl/unx/generic/app/sm.cxx (original) +++ incubator/ooo/branches/alg/linecap/main/vcl/unx/generic/app/sm.cxx Thu Jan 12 15:54:01 2012 @@ -1,29 +1,25 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +/************************************************************** * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * 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. - * - * 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). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + *************************************************************/ + + // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" Modified: incubator/ooo/branches/alg/linecap/main/vcl/unx/generic/app/soicon.cxx URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/linecap/main/vcl/unx/generic/app/soicon.cxx?rev=1230603&r1=1230602&r2=1230603&view=diff ============================================================================== --- incubator/ooo/branches/alg/linecap/main/vcl/unx/generic/app/soicon.cxx (original) +++ incubator/ooo/branches/alg/linecap/main/vcl/unx/generic/app/soicon.cxx Thu Jan 12 15:54:01 2012 @@ -1,29 +1,25 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +/************************************************************** * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * 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. - * - * 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). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + *************************************************************/ + + // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" Modified: incubator/ooo/branches/alg/linecap/main/vcl/unx/generic/app/wmadaptor.cxx URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/linecap/main/vcl/unx/generic/app/wmadaptor.cxx?rev=1230603&r1=1230602&r2=1230603&view=diff ============================================================================== --- incubator/ooo/branches/alg/linecap/main/vcl/unx/generic/app/wmadaptor.cxx (original) +++ incubator/ooo/branches/alg/linecap/main/vcl/unx/generic/app/wmadaptor.cxx Thu Jan 12 15:54:01 2012 @@ -1,29 +1,25 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +/************************************************************** * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * 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. - * - * 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). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + *************************************************************/ + + // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" Modified: incubator/ooo/branches/alg/linecap/main/vcl/unx/generic/desktopdetect/desktopdetector.cxx URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/linecap/main/vcl/unx/generic/desktopdetect/desktopdetector.cxx?rev=1230603&r1=1230602&r2=1230603&view=diff ============================================================================== --- incubator/ooo/branches/alg/linecap/main/vcl/unx/generic/desktopdetect/desktopdetector.cxx (original) +++ incubator/ooo/branches/alg/linecap/main/vcl/unx/generic/desktopdetect/desktopdetector.cxx Thu Jan 12 15:54:01 2012 @@ -1,29 +1,25 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +/************************************************************** * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * 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. - * - * 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). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + *************************************************************/ + + // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx"