You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by al...@apache.org on 2012/01/12 16:54:24 UTC
svn commit: r1230603 [14/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/ ...
Modified: incubator/ooo/branches/alg/linecap/main/migrationanalysis/src/driver_docs/sources/word/Preparation.bas
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/linecap/main/migrationanalysis/src/driver_docs/sources/word/Preparation.bas?rev=1230603&r1=1230602&r2=1230603&view=diff
==============================================================================
--- incubator/ooo/branches/alg/linecap/main/migrationanalysis/src/driver_docs/sources/word/Preparation.bas (original)
+++ incubator/ooo/branches/alg/linecap/main/migrationanalysis/src/driver_docs/sources/word/Preparation.bas Thu Jan 12 15:54:01 2012
@@ -1,30 +1,24 @@
Attribute VB_Name = "Preparation"
-'/*************************************************************************
-' *
-' 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
-' <http://www.openoffice.org/license.html>
-' 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.
+'
+'*************************************************************************
Option Explicit
Function Prepare_HeaderFooter_GraphicFrames(docAnalysis As DocumentAnalysis, myIssue As IssueInfo, _
Modified: incubator/ooo/branches/alg/linecap/main/migrationanalysis/src/driver_docs/sources/word/ThisDocument.cls
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/linecap/main/migrationanalysis/src/driver_docs/sources/word/ThisDocument.cls?rev=1230603&r1=1230602&r2=1230603&view=diff
==============================================================================
--- incubator/ooo/branches/alg/linecap/main/migrationanalysis/src/driver_docs/sources/word/ThisDocument.cls (original)
+++ incubator/ooo/branches/alg/linecap/main/migrationanalysis/src/driver_docs/sources/word/ThisDocument.cls 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
-' <http://www.openoffice.org/license.html>
-' 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.
+'
+'*************************************************************************
Public wrdStrings As StringDataManager
Modified: incubator/ooo/branches/alg/linecap/main/migrationanalysis/src/driver_docs/sources/word/word_res.bas
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/linecap/main/migrationanalysis/src/driver_docs/sources/word/word_res.bas?rev=1230603&r1=1230602&r2=1230603&view=diff
==============================================================================
--- incubator/ooo/branches/alg/linecap/main/migrationanalysis/src/driver_docs/sources/word/word_res.bas (original)
+++ incubator/ooo/branches/alg/linecap/main/migrationanalysis/src/driver_docs/sources/word/word_res.bas Thu Jan 12 15:54:01 2012
@@ -1,31 +1,24 @@
Attribute VB_Name = "word_res"
-'/*************************************************************************
-' *
-' 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
-' <http://www.openoffice.org/license.html>
-' 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.
+'
+'*************************************************************************
'Word Strings
Public RID_STR_WORD_ATTRIBUTE_ALLOW_ONLY_COMMENTS As String
Modified: incubator/ooo/branches/alg/linecap/main/migrationanalysis/src/wizard/Analyse.bas
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/linecap/main/migrationanalysis/src/wizard/Analyse.bas?rev=1230603&r1=1230602&r2=1230603&view=diff
==============================================================================
--- incubator/ooo/branches/alg/linecap/main/migrationanalysis/src/wizard/Analyse.bas (original)
+++ incubator/ooo/branches/alg/linecap/main/migrationanalysis/src/wizard/Analyse.bas Thu Jan 12 15:54:01 2012
@@ -1,31 +1,24 @@
Attribute VB_Name = "Analyse"
-'/*************************************************************************
-' *
-' 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
-' <http://www.openoffice.org/license.html>
-' 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.
+'
+'*************************************************************************
Option Explicit
Private Const C_STAT_NOT_STARTED As Integer = 1
Modified: incubator/ooo/branches/alg/linecap/main/migrationanalysis/src/wizard/CollectedFiles.cls
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/linecap/main/migrationanalysis/src/wizard/CollectedFiles.cls?rev=1230603&r1=1230602&r2=1230603&view=diff
==============================================================================
--- incubator/ooo/branches/alg/linecap/main/migrationanalysis/src/wizard/CollectedFiles.cls (original)
+++ incubator/ooo/branches/alg/linecap/main/migrationanalysis/src/wizard/CollectedFiles.cls Thu Jan 12 15:54:01 2012
@@ -11,32 +11,26 @@ Attribute VB_GlobalNameSpace = False
Attribute VB_Creatable = True
Attribute VB_PredeclaredId = False
Attribute VB_Exposed = False
-'/*************************************************************************
-' *
-' 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
-' <http://www.openoffice.org/license.html>
-' 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.
+'
+'*************************************************************************
Option Explicit
Private Const vbDot = 46
Modified: incubator/ooo/branches/alg/linecap/main/migrationanalysis/src/wizard/IniSupport.bas
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/linecap/main/migrationanalysis/src/wizard/IniSupport.bas?rev=1230603&r1=1230602&r2=1230603&view=diff
==============================================================================
--- incubator/ooo/branches/alg/linecap/main/migrationanalysis/src/wizard/IniSupport.bas (original)
+++ incubator/ooo/branches/alg/linecap/main/migrationanalysis/src/wizard/IniSupport.bas Thu Jan 12 15:54:01 2012
@@ -1,30 +1,24 @@
Attribute VB_Name = "IniSupport"
-'/*************************************************************************
-' *
-' 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
-' <http://www.openoffice.org/license.html>
-' 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.
+'
+'*************************************************************************
Option Explicit
Private Declare Function GetPrivateProfileString Lib "kernel32" _
Modified: incubator/ooo/branches/alg/linecap/main/migrationanalysis/src/wizard/Office10Issues.bas
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/linecap/main/migrationanalysis/src/wizard/Office10Issues.bas?rev=1230603&r1=1230602&r2=1230603&view=diff
==============================================================================
--- incubator/ooo/branches/alg/linecap/main/migrationanalysis/src/wizard/Office10Issues.bas (original)
+++ incubator/ooo/branches/alg/linecap/main/migrationanalysis/src/wizard/Office10Issues.bas Thu Jan 12 15:54:01 2012
@@ -1,30 +1,24 @@
Attribute VB_Name = "Office10Issues"
-'/*************************************************************************
-' *
-' 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
-' <http://www.openoffice.org/license.html>
-' 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.
+'
+'*************************************************************************
'Disable Option Explicit so this will compile on earlier Office versions
'Option Explicit
Modified: incubator/ooo/branches/alg/linecap/main/migrationanalysis/src/wizard/RunServer.bas
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/linecap/main/migrationanalysis/src/wizard/RunServer.bas?rev=1230603&r1=1230602&r2=1230603&view=diff
==============================================================================
--- incubator/ooo/branches/alg/linecap/main/migrationanalysis/src/wizard/RunServer.bas (original)
+++ incubator/ooo/branches/alg/linecap/main/migrationanalysis/src/wizard/RunServer.bas Thu Jan 12 15:54:01 2012
@@ -1,31 +1,24 @@
Attribute VB_Name = "RunServer"
-'/*************************************************************************
-' *
-' 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
-' <http://www.openoffice.org/license.html>
-' 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.
+'
+'*************************************************************************
Option Explicit
Private Declare Function WritePrivateProfileString Lib "kernel32" _
Modified: incubator/ooo/branches/alg/linecap/main/migrationanalysis/src/wizard/Utilities.bas
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/linecap/main/migrationanalysis/src/wizard/Utilities.bas?rev=1230603&r1=1230602&r2=1230603&view=diff
==============================================================================
--- incubator/ooo/branches/alg/linecap/main/migrationanalysis/src/wizard/Utilities.bas (original)
+++ incubator/ooo/branches/alg/linecap/main/migrationanalysis/src/wizard/Utilities.bas Thu Jan 12 15:54:01 2012
@@ -1,30 +1,24 @@
Attribute VB_Name = "Utilities"
-'/*************************************************************************
-' *
-' 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
-' <http://www.openoffice.org/license.html>
-' 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.
+'
+'*************************************************************************
Option Explicit
Public Const LOCALE_ILANGUAGE As Long = &H1 'language id
Modified: incubator/ooo/branches/alg/linecap/main/migrationanalysis/src/wizard/Wizard.bas
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/linecap/main/migrationanalysis/src/wizard/Wizard.bas?rev=1230603&r1=1230602&r2=1230603&view=diff
==============================================================================
--- incubator/ooo/branches/alg/linecap/main/migrationanalysis/src/wizard/Wizard.bas (original)
+++ incubator/ooo/branches/alg/linecap/main/migrationanalysis/src/wizard/Wizard.bas Thu Jan 12 15:54:01 2012
@@ -1,30 +1,24 @@
Attribute VB_Name = "modWizard"
-'/*************************************************************************
-' *
-' 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
-' <http://www.openoffice.org/license.html>
-' 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.
+'
+'*************************************************************************
Option Explicit
Global Const WIZARD_NAME = "Analysis"
Modified: incubator/ooo/branches/alg/linecap/main/mythes/mythes-1.2.0-vanilla-th-gen-idx.patch
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/linecap/main/mythes/mythes-1.2.0-vanilla-th-gen-idx.patch?rev=1230603&r1=1230602&r2=1230603&view=diff
==============================================================================
--- incubator/ooo/branches/alg/linecap/main/mythes/mythes-1.2.0-vanilla-th-gen-idx.patch (original)
+++ incubator/ooo/branches/alg/linecap/main/mythes/mythes-1.2.0-vanilla-th-gen-idx.patch Thu Jan 12 15:54:01 2012
@@ -1,6 +1,6 @@
---- misc/mythes-1.2.0.orig/th_gen_idx.pl
-+++ misc/build/mythes-1.2.0/th_gen_idx.pl
-@@ -1,11 +1,32 @@
+--- misc/mythes-1.2.0.orig/th_gen_idx.pl 2010-02-27 12:52:58.000000000 -0300
++++ misc/build/mythes-1.2.0/th_gen_idx.pl 2012-01-12 04:13:15.149371123 -0300
+@@ -1,11 +1,26 @@
-#!/usr/bin/perl
-
-# perl program to take a thesaurus structured text data file
@@ -8,38 +8,32 @@
+:
+eval 'exec perl -wS $0 ${1+"$@"}'
+ if 0;
-+#*************************************************************************
++#**************************************************************
+#
-+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++# 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
+#
-+# 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).
++# http://www.apache.org/licenses/LICENSE-2.0
#
-# typcially invoked as follows:
-# cat th_en_US_new.dat | ./th_gen_idx.pl > th_en_US_new.idx
-+# You should have received a copy of the GNU Lesser General Public License
-+# version 3 along with OpenOffice.org. If not, see
-+# <http://www.openoffice.org/license.html>
-+# for a copy of the LGPLv3 License.
++# 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.
#
-+#*************************************************************************
++#**************************************************************
sub by_entry {
my ($aent, $aoff) = split('\|',$a);
-@@ -13,6 +34,27 @@ sub by_entry {
+@@ -13,6 +28,27 @@ sub by_entry {
$aent cmp $bent;
}
@@ -67,7 +61,7 @@
# main routine
my $ne = 0; # number of entries in index
my @tindex=(); # the index itself
-@@ -24,6 +66,10 @@ my $nm=0; # number of meaning fo
+@@ -24,6 +60,10 @@ my $nm=0; # number of meaning fo
my $meaning=""; # current meaning and synonyms
my $p; # misc uses
my $encoding; # encoding used by text file
@@ -78,7 +72,7 @@
# top line of thesaurus provides encoding
$encoding=<STDIN>;
-@@ -51,9 +97,13 @@ while ($rec=<STDIN>){
+@@ -51,9 +91,13 @@ while ($rec=<STDIN>){
# now we have all of the information
# so sort it and then output the encoding, count and index data
@tindex = sort by_entry @tindex;
Modified: incubator/ooo/branches/alg/linecap/main/oox/source/drawingml/shapepropertymap.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/linecap/main/oox/source/drawingml/shapepropertymap.cxx?rev=1230603&r1=1230602&r2=1230603&view=diff
==============================================================================
--- incubator/ooo/branches/alg/linecap/main/oox/source/drawingml/shapepropertymap.cxx (original)
+++ incubator/ooo/branches/alg/linecap/main/oox/source/drawingml/shapepropertymap.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
- * <http://www.openoffice.org/license.html>
- * 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 "oox/drawingml/shapepropertymap.hxx"
Modified: incubator/ooo/branches/alg/linecap/main/oox/source/xls/drawingbase.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/linecap/main/oox/source/xls/drawingbase.cxx?rev=1230603&r1=1230602&r2=1230603&view=diff
==============================================================================
--- incubator/ooo/branches/alg/linecap/main/oox/source/xls/drawingbase.cxx (original)
+++ incubator/ooo/branches/alg/linecap/main/oox/source/xls/drawingbase.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
- * <http://www.openoffice.org/license.html>
- * 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 "oox/xls/drawingbase.hxx"
Modified: incubator/ooo/branches/alg/linecap/main/oox/source/xls/drawingmanager.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/linecap/main/oox/source/xls/drawingmanager.cxx?rev=1230603&r1=1230602&r2=1230603&view=diff
==============================================================================
--- incubator/ooo/branches/alg/linecap/main/oox/source/xls/drawingmanager.cxx (original)
+++ incubator/ooo/branches/alg/linecap/main/oox/source/xls/drawingmanager.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
- * <http://www.openoffice.org/license.html>
- * 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 "oox/xls/drawingmanager.hxx"
Modified: incubator/ooo/branches/alg/linecap/main/oox/source/xls/sheetdatabuffer.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/linecap/main/oox/source/xls/sheetdatabuffer.cxx?rev=1230603&r1=1230602&r2=1230603&view=diff
==============================================================================
--- incubator/ooo/branches/alg/linecap/main/oox/source/xls/sheetdatabuffer.cxx (original)
+++ incubator/ooo/branches/alg/linecap/main/oox/source/xls/sheetdatabuffer.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
- * <http://www.openoffice.org/license.html>
- * 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 "oox/xls/sheetdatabuffer.hxx"
Modified: incubator/ooo/branches/alg/linecap/main/package/source/zipapi/blowfishcontext.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/linecap/main/package/source/zipapi/blowfishcontext.cxx?rev=1230603&r1=1230602&r2=1230603&view=diff
==============================================================================
--- incubator/ooo/branches/alg/linecap/main/package/source/zipapi/blowfishcontext.cxx (original)
+++ incubator/ooo/branches/alg/linecap/main/package/source/zipapi/blowfishcontext.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
- * <http://www.openoffice.org/license.html>
- * 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_package.hxx"
Modified: incubator/ooo/branches/alg/linecap/main/package/source/zipapi/sha1context.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/linecap/main/package/source/zipapi/sha1context.cxx?rev=1230603&r1=1230602&r2=1230603&view=diff
==============================================================================
--- incubator/ooo/branches/alg/linecap/main/package/source/zipapi/sha1context.cxx (original)
+++ incubator/ooo/branches/alg/linecap/main/package/source/zipapi/sha1context.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
- * <http://www.openoffice.org/license.html>
- * 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_package.hxx"
Modified: incubator/ooo/branches/alg/linecap/main/padmin/Makefile
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/linecap/main/padmin/Makefile?rev=1230603&r1=1230602&r2=1230603&view=diff
==============================================================================
--- incubator/ooo/branches/alg/linecap/main/padmin/Makefile (original)
+++ incubator/ooo/branches/alg/linecap/main/padmin/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
-# <http://www.openoffice.org/license.html>
-# 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/redland/raptor/raptor-1.4.18.patch.dmake
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/linecap/main/redland/raptor/raptor-1.4.18.patch.dmake?rev=1230603&r1=1230602&r2=1230603&view=diff
==============================================================================
--- incubator/ooo/branches/alg/linecap/main/redland/raptor/raptor-1.4.18.patch.dmake (original)
+++ incubator/ooo/branches/alg/linecap/main/redland/raptor/raptor-1.4.18.patch.dmake Thu Jan 12 15:54:01 2012
@@ -1,33 +1,27 @@
--- misc/raptor-1.4.18/src/makefile.mk Thu Nov 6 15:25:51 2008
+++ misc/build/raptor-1.4.18/src/makefile.mk Thu Nov 6 15:33:14 2008
-@@ -1,1 +1,122 @@
+@@ -1,1 +1,116 @@
-dummy
-+#*************************************************************************
-+#
-+# 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
-+# <http://www.openoffice.org/license.html>
-+# 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/redland/rasqal/rasqal-0.9.16.patch.dmake
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/linecap/main/redland/rasqal/rasqal-0.9.16.patch.dmake?rev=1230603&r1=1230602&r2=1230603&view=diff
==============================================================================
--- incubator/ooo/branches/alg/linecap/main/redland/rasqal/rasqal-0.9.16.patch.dmake (original)
+++ incubator/ooo/branches/alg/linecap/main/redland/rasqal/rasqal-0.9.16.patch.dmake Thu Jan 12 15:54:01 2012
@@ -1,33 +1,27 @@
--- misc/rasqal-0.9.16/src/makefile.mk Thu Nov 6 15:56:45 2008
+++ misc/build/rasqal-0.9.16/src/makefile.mk Thu Nov 6 15:55:09 2008
-@@ -1,1 +1,97 @@
+@@ -1,1 +1,91 @@
-dummy
-+#*************************************************************************
-+#
-+# 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
-+# <http://www.openoffice.org/license.html>
-+# 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/redland/redland/redland-1.0.8.patch.dmake
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/linecap/main/redland/redland/redland-1.0.8.patch.dmake?rev=1230603&r1=1230602&r2=1230603&view=diff
==============================================================================
--- incubator/ooo/branches/alg/linecap/main/redland/redland/redland-1.0.8.patch.dmake (original)
+++ incubator/ooo/branches/alg/linecap/main/redland/redland/redland-1.0.8.patch.dmake Thu Jan 12 15:54:01 2012
@@ -1,33 +1,27 @@
--- misc/redland-1.0.8/librdf/makefile.mk Mon Jun 16 19:32:46 2008
+++ misc/build/redland-1.0.8/librdf/makefile.mk Mon Jun 16 19:26:20 2008
-@@ -1,1 +1,114 @@
+@@ -1,1 +1,108 @@
-dummy
-+#*************************************************************************
-+#
-+# 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
-+# <http://www.openoffice.org/license.html>
-+# 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/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt-schema-v1.0-os.xsd
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/linecap/main/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt-schema-v1.0-os.xsd?rev=1230603&r1=1230602&r2=1230603&view=diff
==============================================================================
--- incubator/ooo/branches/alg/linecap/main/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt-schema-v1.0-os.xsd (original)
+++ incubator/ooo/branches/alg/linecap/main/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt-schema-v1.0-os.xsd Thu Jan 12 15:54:01 2012
@@ -1,29 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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
- <http://www.openoffice.org/license.html>
- 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.
+ *
+ ***********************************************************-->
- -->
<!---->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
Modified: incubator/ooo/branches/alg/linecap/main/sc/addin/datefunc/dfa.cl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/linecap/main/sc/addin/datefunc/dfa.cl?rev=1230603&r1=1230602&r2=1230603&view=diff
==============================================================================
--- incubator/ooo/branches/alg/linecap/main/sc/addin/datefunc/dfa.cl (original)
+++ incubator/ooo/branches/alg/linecap/main/sc/addin/datefunc/dfa.cl 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
- * <http://www.openoffice.org/license.html>
- * 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.
+ *
+ *************************************************************/
/* static char datefunc_Id[]="@(#) StarCalc Datefunc AddIn (c) 1998-2000 Sun Microsystems, Inc."; */
Modified: incubator/ooo/branches/alg/linecap/main/sc/addin/rot13/rot13.cl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/linecap/main/sc/addin/rot13/rot13.cl?rev=1230603&r1=1230602&r2=1230603&view=diff
==============================================================================
--- incubator/ooo/branches/alg/linecap/main/sc/addin/rot13/rot13.cl (original)
+++ incubator/ooo/branches/alg/linecap/main/sc/addin/rot13/rot13.cl 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
- * <http://www.openoffice.org/license.html>
- * 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.
+ *
+ *************************************************************/
/* static char rot13_Id[]="@(#) StarCalc Rot13 AddIn (c) 1998-2000 Sun Microsystems, Inc."; */
Modified: incubator/ooo/branches/alg/linecap/main/sc/source/core/data/documen2.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/linecap/main/sc/source/core/data/documen2.cxx?rev=1230603&r1=1230602&r2=1230603&view=diff
==============================================================================
--- incubator/ooo/branches/alg/linecap/main/sc/source/core/data/documen2.cxx (original)
+++ incubator/ooo/branches/alg/linecap/main/sc/source/core/data/documen2.cxx Thu Jan 12 15:54:01 2012
@@ -975,7 +975,9 @@ sal_uLong ScDocument::TransferTab( ScDoc
sal_False, pTab[nDestPos] );
}
}
- pTab[nDestPos]->SetTabNo(nDestPos);
+
+ pTab[nDestPos]->SetTabNo(nDestPos);
+ pTab[nDestPos]->SetTabBgColor(pSrcDoc->pTab[nSrcPos]->GetTabBgColor());
if ( !bResultsOnly )
{
Modified: incubator/ooo/branches/alg/linecap/main/sc/source/core/data/dpglobal.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/linecap/main/sc/source/core/data/dpglobal.cxx?rev=1230603&r1=1230602&r2=1230603&view=diff
==============================================================================
--- incubator/ooo/branches/alg/linecap/main/sc/source/core/data/dpglobal.cxx (original)
+++ incubator/ooo/branches/alg/linecap/main/sc/source/core/data/dpglobal.cxx Thu Jan 12 15:54:01 2012
@@ -1,33 +1,25 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+/**************************************************************
*
- * Copyright IBM Corporation 2009.
- * Copyright 2009 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: dpglobal.cxx,v $
- * $Revision: 1.0 $
- *
- * 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
- * <http://www.openoffice.org/license.html>
- * 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_sc.hxx"
Modified: incubator/ooo/branches/alg/linecap/main/sc/source/core/data/dptablecache.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/linecap/main/sc/source/core/data/dptablecache.cxx?rev=1230603&r1=1230602&r2=1230603&view=diff
==============================================================================
--- incubator/ooo/branches/alg/linecap/main/sc/source/core/data/dptablecache.cxx (original)
+++ incubator/ooo/branches/alg/linecap/main/sc/source/core/data/dptablecache.cxx Thu Jan 12 15:54:01 2012
@@ -1,33 +1,25 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+/**************************************************************
*
- * Copyright IBM Corporation 2009.
- * Copyright 2009 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: dptablecache.cxx,v $
- * $Revision: 1.0 $
- *
- * 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
- * <http://www.openoffice.org/license.html>
- * 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_sc.hxx"
// INCLUDE ---------------------------------------------------------------
Modified: incubator/ooo/branches/alg/linecap/main/sc/source/core/data/scdpoutputimpl.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/linecap/main/sc/source/core/data/scdpoutputimpl.cxx?rev=1230603&r1=1230602&r2=1230603&view=diff
==============================================================================
--- incubator/ooo/branches/alg/linecap/main/sc/source/core/data/scdpoutputimpl.cxx (original)
+++ incubator/ooo/branches/alg/linecap/main/sc/source/core/data/scdpoutputimpl.cxx Thu Jan 12 15:54:01 2012
@@ -1,33 +1,25 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+/**************************************************************
*
- * Copyright IBM Corporation 2009.
- * Copyright 2009 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: scdpoutputimpl.cxx,v $
- * $Revision: 1.0 $
- *
- * 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
- * <http://www.openoffice.org/license.html>
- * 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_sc.hxx"
Modified: incubator/ooo/branches/alg/linecap/main/sc/source/ui/undo/undotab.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/linecap/main/sc/source/ui/undo/undotab.cxx?rev=1230603&r1=1230602&r2=1230603&view=diff
==============================================================================
--- incubator/ooo/branches/alg/linecap/main/sc/source/ui/undo/undotab.cxx (original)
+++ incubator/ooo/branches/alg/linecap/main/sc/source/ui/undo/undotab.cxx Thu Jan 12 15:54:01 2012
@@ -990,6 +990,7 @@ void ScUndoImportTab::Undo()
pDoc->CopyToDocument(0,0,nTabPos, MAXCOL,MAXROW,nTabPos, IDF_ALL,sal_False, pRedoDoc );
pDoc->GetName( nTabPos, aOldName );
pRedoDoc->RenameTab( nTabPos, aOldName, sal_False );
+ pRedoDoc->SetTabBgColor( nTabPos, pDoc->GetTabBgColor(nTabPos) );
if ( pDoc->IsScenario(nTabPos) )
{
@@ -1044,6 +1045,7 @@ void ScUndoImportTab::Redo()
{
SCTAB nTabPos=nTab+i;
pRedoDoc->CopyToDocument(0,0,nTabPos, MAXCOL,MAXROW,nTabPos, IDF_ALL,sal_False, pDoc );
+ pDoc->SetTabBgColor( nTabPos, pRedoDoc->GetTabBgColor(nTabPos) );
if ( pRedoDoc->IsScenario(nTabPos) )
{
Modified: incubator/ooo/branches/alg/linecap/main/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/linecap/main/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx?rev=1230603&r1=1230602&r2=1230603&view=diff
==============================================================================
--- incubator/ooo/branches/alg/linecap/main/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx (original)
+++ incubator/ooo/branches/alg/linecap/main/sd/source/ui/slidesorter/controller/SlsTransferableData.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
- * <http://www.openoffice.org/license.html>
- * 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_sd.hxx"
Modified: incubator/ooo/branches/alg/linecap/main/sd/source/ui/toolpanel/controls/AnimationSchemesPanel.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/linecap/main/sd/source/ui/toolpanel/controls/AnimationSchemesPanel.cxx?rev=1230603&r1=1230602&r2=1230603&view=diff
==============================================================================
--- incubator/ooo/branches/alg/linecap/main/sd/source/ui/toolpanel/controls/AnimationSchemesPanel.cxx (original)
+++ incubator/ooo/branches/alg/linecap/main/sd/source/ui/toolpanel/controls/AnimationSchemesPanel.cxx Thu Jan 12 15:54:01 2012
@@ -19,37 +19,6 @@
*
*************************************************************/
-
-/*************************************************************************
- *
- * 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: AnimationSchemesPanel.cxx,v $
- * $Revision: 1.6 $
- *
- * 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
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sd.hxx"
#include "AnimationSchemesPanel.hxx"
Modified: incubator/ooo/branches/alg/linecap/main/sfx2/Library_qstart.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/linecap/main/sfx2/Library_qstart.mk?rev=1230603&r1=1230602&r2=1230603&view=diff
==============================================================================
--- incubator/ooo/branches/alg/linecap/main/sfx2/Library_qstart.mk (original)
+++ incubator/ooo/branches/alg/linecap/main/sfx2/Library_qstart.mk Thu Jan 12 15:54:01 2012
@@ -47,9 +47,14 @@ $(eval $(call gb_Library_set_cflags,qsta
$(eval $(call gb_Library_set_ldflags,qstart_gtk,\
$$(LDFLAGS) \
- $(GTK_LIBS) \
))
+$(eval $(call gb_Library_add_external_libs,qstart_gtk, \
+ $(patsubst -l%,%, $(filter -l%, $(GTK_LIBS))) \
+))
+
+
+
$(eval $(call gb_Library_add_linked_libs,qstart_gtk,\
comphelper \
cppu \
@@ -70,7 +75,7 @@ $(eval $(call gb_Library_add_linked_libs
vcl \
vos3 \
xml2 \
- sfx \
+ sfx \
))
$(eval $(call gb_Library_add_exception_objects,qstart_gtk,\
Modified: incubator/ooo/branches/alg/linecap/main/sfx2/Makefile
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/linecap/main/sfx2/Makefile?rev=1230603&r1=1230602&r2=1230603&view=diff
==============================================================================
--- incubator/ooo/branches/alg/linecap/main/sfx2/Makefile (original)
+++ incubator/ooo/branches/alg/linecap/main/sfx2/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
-# <http://www.openoffice.org/license.html>
-# 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!)