Modified: incubator/ooo/branches/alg/install/main/setup_native/scripts/deregister_extensions
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/setup_native/scripts/deregister_extensions?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/setup_native/scripts/deregister_extensions (original)
+++ incubator/ooo/branches/alg/install/main/setup_native/scripts/deregister_extensions Fri Feb 24 14:14:33 2012
@@ -1,4 +1,24 @@
#!/bin/sh
+# *************************************************************
+#
+# 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.
+#
+# *************************************************************
USAGE="Usage: $0"
Modified: incubator/ooo/branches/alg/install/main/setup_native/scripts/register_extensions
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/setup_native/scripts/register_extensions?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/setup_native/scripts/register_extensions (original)
+++ incubator/ooo/branches/alg/install/main/setup_native/scripts/register_extensions Fri Feb 24 14:14:33 2012
@@ -1,4 +1,24 @@
#!/bin/sh
+# *************************************************************
+#
+# 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.
+#
+# *************************************************************
USAGE="Usage: $0"
Modified: incubator/ooo/branches/alg/install/main/setup_native/source/opensolaris/bundledextensions/svc-ooo_bundled_extensions
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/setup_native/source/opensolaris/bundledextensions/svc-ooo_bundled_extensions?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/setup_native/source/opensolaris/bundledextensions/svc-ooo_bundled_extensions (original)
+++ incubator/ooo/branches/alg/install/main/setup_native/source/opensolaris/bundledextensions/svc-ooo_bundled_extensions Fri Feb 24 14:14:33 2012
@@ -1,4 +1,24 @@
#!/sbin/sh
+# *************************************************************
+#
+# 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.
+#
+# *************************************************************
. /lib/svc/share/smf_include.sh
Modified: incubator/ooo/branches/alg/install/main/setup_native/tests/opensolaris/bundledextensions/send_ooo
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/setup_native/tests/opensolaris/bundledextensions/send_ooo?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/setup_native/tests/opensolaris/bundledextensions/send_ooo (original)
+++ incubator/ooo/branches/alg/install/main/setup_native/tests/opensolaris/bundledextensions/send_ooo Fri Feb 24 14:14:33 2012
@@ -1,4 +1,24 @@
#!/bin/sh
+# *************************************************************
+#
+# 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.
+#
+# *************************************************************
if [ $# = 0 ]
Modified: incubator/ooo/branches/alg/install/main/solenv/bin/_mkout
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/solenv/bin/_mkout?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/solenv/bin/_mkout (original)
+++ incubator/ooo/branches/alg/install/main/solenv/bin/_mkout Fri Feb 24 14:14:33 2012
@@ -1,4 +1,24 @@
#!/bin/sh -e
+# *************************************************************
+#
+# 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.
+#
+# *************************************************************
if [ -z "$1" ]; then
exit 1;
fi
Modified: incubator/ooo/branches/alg/install/main/solenv/bin/createpdbrelocators
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/solenv/bin/createpdbrelocators?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/solenv/bin/createpdbrelocators (original)
+++ incubator/ooo/branches/alg/install/main/solenv/bin/createpdbrelocators Fri Feb 24 14:14:33 2012
@@ -1,4 +1,24 @@
#!/bin/sh
+# *************************************************************
+#
+# 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.
+#
+# *************************************************************
if [ x${SOLARENV}x = xx ]; then
echo createpdbrelocators: no environment found!
exit 1
Modified: incubator/ooo/branches/alg/install/main/solenv/bin/cws
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/solenv/bin/cws?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/solenv/bin/cws (original)
+++ incubator/ooo/branches/alg/install/main/solenv/bin/cws Fri Feb 24 14:14:33 2012
@@ -1,4 +1,24 @@
#!/bin/sh
+# *************************************************************
+#
+# 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.
+#
+# *************************************************************
if [ x${SOLARENV}x = xx ]; then
echo No environment found, please use 'configure'
exit 1
Modified: incubator/ooo/branches/alg/install/main/solenv/bin/cwsattach
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/solenv/bin/cwsattach?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/solenv/bin/cwsattach (original)
+++ incubator/ooo/branches/alg/install/main/solenv/bin/cwsattach Fri Feb 24 14:14:33 2012
@@ -1,4 +1,24 @@
#!/bin/sh
+# *************************************************************
+#
+# 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.
+#
+# *************************************************************
if [ x${SOLARENV}x = xx ]; then
echo No environment found, please use 'configure' or 'setsolar'
exit 1
Modified: incubator/ooo/branches/alg/install/main/solenv/bin/cwscreate
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/solenv/bin/cwscreate?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/solenv/bin/cwscreate (original)
+++ incubator/ooo/branches/alg/install/main/solenv/bin/cwscreate Fri Feb 24 14:14:33 2012
@@ -1,4 +1,24 @@
#!/bin/sh
+# *************************************************************
+#
+# 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.
+#
+# *************************************************************
if [ x${SOLARENV}x = xx ]; then
echo No environment found, please use 'configure' or 'setsolar'
exit 1
Modified: incubator/ooo/branches/alg/install/main/solenv/bin/cwstestresult
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/solenv/bin/cwstestresult?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/solenv/bin/cwstestresult (original)
+++ incubator/ooo/branches/alg/install/main/solenv/bin/cwstestresult Fri Feb 24 14:14:33 2012
@@ -1,4 +1,24 @@
#!/bin/sh
+# *************************************************************
+#
+# 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.
+#
+# *************************************************************
if [ x${SOLARENV}x = xx ]; then
echo No environment found, please use 'configure' or 'setsolar'
exit 1
Modified: incubator/ooo/branches/alg/install/main/solenv/bin/cwstouched
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/solenv/bin/cwstouched?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/solenv/bin/cwstouched (original)
+++ incubator/ooo/branches/alg/install/main/solenv/bin/cwstouched Fri Feb 24 14:14:33 2012
@@ -1,4 +1,24 @@
#!/bin/sh
+# *************************************************************
+#
+# 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.
+#
+# *************************************************************
if [ x${SOLARENV}x = xx ]; then
echo No environment found, please use 'configure' or 'setsolar'
exit 1
Modified: incubator/ooo/branches/alg/install/main/solenv/bin/gsicheck
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/solenv/bin/gsicheck?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/solenv/bin/gsicheck (original)
+++ incubator/ooo/branches/alg/install/main/solenv/bin/gsicheck Fri Feb 24 14:14:33 2012
@@ -1,4 +1,24 @@
#!/bin/sh
+# *************************************************************
+#
+# 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.
+#
+# *************************************************************
if [ x${SOLARENV}x = xx ]; then
echo No environment found, please use 'setsolar'
exit 1
Modified: incubator/ooo/branches/alg/install/main/solenv/bin/langwrap
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/solenv/bin/langwrap?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/solenv/bin/langwrap (original)
+++ incubator/ooo/branches/alg/install/main/solenv/bin/langwrap Fri Feb 24 14:14:33 2012
@@ -1,4 +1,24 @@
#!/usr/bin/perl -w
+# *************************************************************
+#
+# 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.
+#
+# *************************************************************
#
# langwrap - language wrapper for building resources
#
Modified: incubator/ooo/branches/alg/install/main/solenv/bin/localize
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/solenv/bin/localize?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/solenv/bin/localize (original)
+++ incubator/ooo/branches/alg/install/main/solenv/bin/localize Fri Feb 24 14:14:33 2012
@@ -1,4 +1,24 @@
#!/bin/sh
+# *************************************************************
+#
+# 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.
+#
+# *************************************************************
if [ x${SOLARENV}x = xx ]; then
echo No environment found, please use 'setsolar'
exit 1
Modified: incubator/ooo/branches/alg/install/main/solenv/bin/localize_sl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/solenv/bin/localize_sl?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/solenv/bin/localize_sl (original)
+++ incubator/ooo/branches/alg/install/main/solenv/bin/localize_sl Fri Feb 24 14:14:33 2012
@@ -1,4 +1,24 @@
#!/bin/sh
+# *************************************************************
+#
+# 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.
+#
+# *************************************************************
if [ x${SOLARENV}x = xx ]; then
echo No environment found, please use 'setsolar'
exit 1
Modified: incubator/ooo/branches/alg/install/main/solenv/bin/oochkpatch
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/solenv/bin/oochkpatch?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/solenv/bin/oochkpatch (original)
+++ incubator/ooo/branches/alg/install/main/solenv/bin/oochkpatch Fri Feb 24 14:14:33 2012
@@ -1,4 +1,24 @@
#!/bin/sh
+# *************************************************************
+#
+# 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.
+#
+# *************************************************************
if [ x${SOLARENV}x = xx ]; then
echo No environment found, please use 'configure' or 'setsolar'
exit 1
Modified: incubator/ooo/branches/alg/install/main/solenv/bin/pchdelta
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/solenv/bin/pchdelta?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/solenv/bin/pchdelta (original)
+++ incubator/ooo/branches/alg/install/main/solenv/bin/pchdelta Fri Feb 24 14:14:33 2012
@@ -1,4 +1,24 @@
#!/bin/sh
+# *************************************************************
+#
+# 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.
+#
+# *************************************************************
# Wrapper around the pchdelta.py script
bash -c "unset PYTHONHOME PYTHONPATH; /usr/bin/python ../solenv/bin/pchdelta.py $*"
Modified: incubator/ooo/branches/alg/install/main/solenv/bin/receditor
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/solenv/bin/receditor?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/solenv/bin/receditor (original)
+++ incubator/ooo/branches/alg/install/main/solenv/bin/receditor Fri Feb 24 14:14:33 2012
@@ -1,4 +1,24 @@
#!/bin/sh
+# *************************************************************
+#
+# 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.
+#
+# *************************************************************
if [ x${SOLARENV}x = xx ]; then
echo No environment found, please use 'configure' or 'setsolar'
exit 1
Modified: incubator/ooo/branches/alg/install/main/solenv/bin/srcrelease.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/solenv/bin/srcrelease.xml?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/solenv/bin/srcrelease.xml (original)
+++ incubator/ooo/branches/alg/install/main/solenv/bin/srcrelease.xml Fri Feb 24 14:14:33 2012
@@ -33,6 +33,7 @@
<zipfileset file="main/NOTICE" fullpath="${release.dir.name}/NOTICE"/>
<zipfileset file="main/LICENSE" fullpath="${release.dir.name}/LICENSE"/>
+ <zipfileset file="main/README" fullpath="${release.dir.name}/README"/>
<zipfileset dir="ext_libraries" excludes="${excludes.list},${excludes.outdirs}" prefix="${release.dir.name}/ext_libraries"/>
<zipfileset dir="main" excludes="${excludes.list},${excludes.executables},${excludes.outdirs}" prefix="${release.dir.name}/main"/>
<zipfileset dir="extras" excludes="${excludes.list},${excludes.executables},${excludes.outdirs}" prefix="${release.dir.name}/extras"/>
@@ -48,6 +49,7 @@
<tar destfile="${release.tar}" longfile="gnu">
<tarfileset file="main/NOTICE" fullpath="${release.dir.name}/NOTICE"/>
<tarfileset file="main/LICENSE" fullpath="${release.dir.name}/LICENSE"/>
+ <tarfileset file="main/README" fullpath="${release.dir.name}/README"/>
<tarfileset dir="ext_libraries" excludes="${excludes.list},${excludes.outdirs}" prefix="${release.dir.name}/ext_libraries"/>
<tarfileset dir="main" excludes="${excludes.list},${excludes.executables},${excludes.outdirs}" prefix="${release.dir.name}/main"/>
<tarfileset dir="extras" excludes="${excludes.list},${excludes.executables},${excludes.outdirs}" prefix="${release.dir.name}/extras"/>
Modified: incubator/ooo/branches/alg/install/main/solenv/inc/libs.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/solenv/inc/libs.mk?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/solenv/inc/libs.mk (original)
+++ incubator/ooo/branches/alg/install/main/solenv/inc/libs.mk Fri Feb 24 14:14:33 2012
@@ -350,7 +350,8 @@ MYTHESLIB=-lmythes
MYTHESLIB=-lmythes-1.2
.ENDIF
PYUNOLIB=-lpyuno
-COINMPLIB=-lCoinMP -lCoinUtils -lClp -lCbc -lOsi -lOsiClp -lCgl -lCbcSolver
+COINMPLIBS=-lCoinMP -lCoinUtils -lClp -lCbc -lOsi -lOsiClp -lCgl -lCbcSolver
+SERFLIBS=-lapr-1 -laprutil-1 -lserf-1
SOFFICELIB=-lsofficeapp
UNOPKGAPPLIB=-lunopkgapp
TESTLIB=-ltest
@@ -524,7 +525,8 @@ HUNSPELLLIB=$(LIBPRE) libhunspell.lib
.ENDIF
MYTHESLIB=libmythes.lib
PYUNOLIB=ipyuno.lib
-COINMPLIB=CoinMP.lib
+COINMPLIBS=CoinMP.lib
+SERFLIBS=libapr-1.lib iapr-util.lib iserf.lib
SOFFICELIB=isofficeapp.lib
UNOPKGAPPLIB=iunopkgapp.lib
TESTLIB=itest.lib
Modified: incubator/ooo/branches/alg/install/main/sw/inc/docsh.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/sw/inc/docsh.hxx?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/sw/inc/docsh.hxx (original)
+++ incubator/ooo/branches/alg/install/main/sw/inc/docsh.hxx Fri Feb 24 14:14:33 2012
@@ -147,6 +147,8 @@ public:
static rtl::OUString GetEventName( sal_Int32 nId );
+ static void InitDefaultFontAttr( SwDoc* pDoc ); //#115580# added at 2011/11/28
+
//Das Doc wird fuer SO-Datenaustausch benoetigt!
SwDocShell( SfxObjectCreateMode eMode = SFX_CREATE_MODE_EMBEDDED );
SwDocShell( const sal_uInt64 i_nSfxCreationFlags );
Modified: incubator/ooo/branches/alg/install/main/sw/source/ui/app/docshini.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/sw/source/ui/app/docshini.cxx?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/sw/source/ui/app/docshini.cxx (original)
+++ incubator/ooo/branches/alg/install/main/sw/source/ui/app/docshini.cxx Fri Feb 24 14:14:33 2012
@@ -358,6 +358,145 @@ sal_Bool SwDocShell::InitNew( const uno:
return bRet;
}
+//#115580# When creating a new document, if needed, set the default
+// font and languague attributes.
+void SwDocShell::InitDefaultFontAttr( SwDoc* pDoc )
+{
+ sal_uInt16 aFontWhich[] =
+ {
+ RES_CHRATR_FONT,
+ RES_CHRATR_CJK_FONT,
+ RES_CHRATR_CTL_FONT
+ };
+ sal_uInt16 aFontHeightWhich[] =
+ {
+ RES_CHRATR_FONTSIZE,
+ RES_CHRATR_CJK_FONTSIZE,
+ RES_CHRATR_CTL_FONTSIZE
+ };
+ sal_uInt16 aFontIds[] =
+ {
+ FONT_STANDARD,
+ FONT_STANDARD_CJK,
+ FONT_STANDARD_CTL
+ };
+ sal_uInt16 nFontTypes[] =
+ {
+ DEFAULTFONT_LATIN_TEXT,
+ DEFAULTFONT_CJK_TEXT,
+ DEFAULTFONT_CTL_TEXT
+ };
+
+ sal_uInt16 aLangWhich[] =
+ {
+ RES_CHRATR_LANGUAGE,
+ RES_CHRATR_CJK_LANGUAGE,
+ RES_CHRATR_CTL_LANGUAGE
+ };
+ sal_uInt16 aLangTypes[] =
+ {
+ LANGUAGE_ENGLISH_US,
+ LANGUAGE_ENGLISH_US,
+ LANGUAGE_ARABIC_SAUDI_ARABIA
+ };
+
+ SwStdFontConfig* pStdFont = SW_MOD()->GetStdFontConfig();
+ SfxPrinter* pPrt = pDoc->getPrinter( false );
+ String sEntry;
+
+ for(sal_uInt8 i = 0; i < 3; i++)
+ {
+ sal_uInt16 nFontWhich = aFontWhich[i];
+ sal_uInt16 nFontId = aFontIds[i];
+ SvxFontItem* pFontItem = 0;
+ const SvxLanguageItem& rLang = (const SvxLanguageItem&)pDoc->GetDefault( aLangWhich[i] );
+ LanguageType eLanguage = rLang.GetLanguage();
+ if ( (eLanguage == LANGUAGE_DONTKNOW) || (eLanguage == LANGUAGE_NONE) )
+ eLanguage = aLangTypes[i];
+ {
+ if ( i == 0 )
+ {//At present, just supports for the following languages: english, french and german.
+ LanguageType eUiLanguage = Application::GetSettings().GetUILanguage();
+ switch( eUiLanguage )
+ {
+ case LANGUAGE_ENGLISH_US:
+ case LANGUAGE_FRENCH:
+ case LANGUAGE_FRENCH_BELGIAN:
+ case LANGUAGE_FRENCH_CAMEROON:
+ case LANGUAGE_FRENCH_CANADIAN:
+ case LANGUAGE_FRENCH_COTE_D_IVOIRE:
+ case LANGUAGE_FRENCH_HAITI:
+ case LANGUAGE_FRENCH_LUXEMBOURG:
+ case LANGUAGE_FRENCH_MALI:
+ case LANGUAGE_FRENCH_MONACO:
+ case LANGUAGE_FRENCH_MOROCCO:
+ case LANGUAGE_FRENCH_NORTH_AFRICA:
+ case LANGUAGE_FRENCH_REUNION:
+ case LANGUAGE_FRENCH_SENEGAL:
+ case LANGUAGE_FRENCH_SWISS:
+ case LANGUAGE_FRENCH_WEST_INDIES:
+ case LANGUAGE_FRENCH_ZAIRE:
+ case LANGUAGE_GERMAN:
+ case LANGUAGE_GERMAN_AUSTRIAN:
+ case LANGUAGE_GERMAN_LIECHTENSTEIN:
+ case LANGUAGE_GERMAN_LUXEMBOURG:
+ case LANGUAGE_GERMAN_SWISS:
+ eLanguage = eUiLanguage;
+ break;
+
+ }
+ }
+
+ if ( i == 2 ) //CTL,just supports for HINDI and ARABIC_SAUDI_ARABIA
+ {
+ LanguageType eUiLanguage = Application::GetSettings().GetUILanguage();
+ switch( eUiLanguage )
+ {
+ case LANGUAGE_HINDI:
+ eLanguage = eUiLanguage;
+ break;
+
+ }
+ }
+
+ if ( i == 1 ) //CJK
+ {
+ LanguageType eUiLanguage = Application::GetSettings().GetUILanguage();
+ switch( eUiLanguage )
+ {
+ case LANGUAGE_KOREAN:
+ case LANGUAGE_KOREAN_JOHAB:
+ case LANGUAGE_CHINESE:
+ case LANGUAGE_CHINESE_HONGKONG:
+ case LANGUAGE_CHINESE_MACAU:
+ case LANGUAGE_CHINESE_SIMPLIFIED:
+ case LANGUAGE_CHINESE_SINGAPORE:
+ case LANGUAGE_CHINESE_TRADITIONAL:
+ case LANGUAGE_JAPANESE:
+ eLanguage = eUiLanguage;
+ break;
+ }
+ }
+
+ Font aLangDefFont = OutputDevice::GetDefaultFont(
+ nFontTypes[i],
+ eLanguage,
+ DEFAULTFONT_FLAGS_ONLYONE );
+ pFontItem = new SvxFontItem(aLangDefFont.GetFamily(), aLangDefFont.GetName(),
+ aEmptyStr, aLangDefFont.GetPitch(), aLangDefFont.GetCharSet(), nFontWhich);
+ }
+
+ pDoc->SetDefault(*pFontItem);
+ delete pFontItem;
+
+ sal_Int32 nFontHeight = pStdFont->GetFontHeight( FONT_STANDARD, i, eLanguage );
+ if(nFontHeight <= 0)
+ nFontHeight = pStdFont->GetDefaultHeightFor( nFontId, eLanguage );
+ pDoc->SetDefault(SvxFontHeightItem( nFontHeight, 100, aFontHeightWhich[i] ));
+ pDoc->SetDefault( SvxLanguageItem( eLanguage, aLangWhich[i] ) );
+ }
+}
+
/*--------------------------------------------------------------------
Beschreibung: Ctor mit SfxCreateMode ?????
--------------------------------------------------------------------*/
Modified: incubator/ooo/branches/alg/install/main/sw/source/ui/dochdl/swdtflvr.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/sw/source/ui/dochdl/swdtflvr.cxx?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/sw/source/ui/dochdl/swdtflvr.cxx (original)
+++ incubator/ooo/branches/alg/install/main/sw/source/ui/dochdl/swdtflvr.cxx Fri Feb 24 14:14:33 2012
@@ -838,6 +838,8 @@ int SwTransferable::PrepareForCopy( sal_
SwDoc *const pTmpDoc = lcl_GetDoc(*pClpDocFac);
+ SwDocShell::InitDefaultFontAttr( pTmpDoc ); //#115580#
+
pTmpDoc->LockExpFlds(); // nie die Felder updaten - Text so belassen
pWrtShell->Copy( pTmpDoc );
Modified: incubator/ooo/branches/alg/install/main/sysui/desktop/debian/postinst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/sysui/desktop/debian/postinst?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/sysui/desktop/debian/postinst (original)
+++ incubator/ooo/branches/alg/install/main/sysui/desktop/debian/postinst Fri Feb 24 14:14:33 2012
@@ -1,4 +1,24 @@
#!/bin/sh
+# *************************************************************
+#
+# 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.
+#
+# *************************************************************
if [ "$1" = "configure" ] ; then # first install
# update shared mime-info database
Modified: incubator/ooo/branches/alg/install/main/sysui/desktop/solaris/mailcap
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/sysui/desktop/solaris/mailcap?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/sysui/desktop/solaris/mailcap (original)
+++ incubator/ooo/branches/alg/install/main/sysui/desktop/solaris/mailcap Fri Feb 24 14:14:33 2012
@@ -1,3 +1,23 @@
+# *************************************************************
+#
+# 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.
+#
+# *************************************************************
if [ "$1" = install ]
then
# backing out existing entries to avoid duplicates
Modified: incubator/ooo/branches/alg/install/main/sysui/desktop/solaris/postinstall
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/sysui/desktop/solaris/postinstall?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/sysui/desktop/solaris/postinstall (original)
+++ incubator/ooo/branches/alg/install/main/sysui/desktop/solaris/postinstall Fri Feb 24 14:14:33 2012
@@ -1,4 +1,24 @@
#!/bin/sh
+# *************************************************************
+#
+# 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.
+#
+# *************************************************************
# check whether /usr is writable
tiptoe="${PKG_INSTALL_ROOT}/usr/_.$$"
Modified: incubator/ooo/branches/alg/install/main/sysui/desktop/solaris/postremove
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/sysui/desktop/solaris/postremove?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/sysui/desktop/solaris/postremove (original)
+++ incubator/ooo/branches/alg/install/main/sysui/desktop/solaris/postremove Fri Feb 24 14:14:33 2012
@@ -1,4 +1,24 @@
#!/bin/sh
+# *************************************************************
+#
+# 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.
+#
+# *************************************************************
# check whether /usr is writable
tiptoe="${PKG_INSTALL_ROOT}/usr/_.$$"
Modified: incubator/ooo/branches/alg/install/main/testgraphical/references/unxlngi/demo/CurrentTime.ods.ps
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/testgraphical/references/unxlngi/demo/CurrentTime.ods.ps?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/testgraphical/references/unxlngi/demo/CurrentTime.ods.ps (original)
+++ incubator/ooo/branches/alg/install/main/testgraphical/references/unxlngi/demo/CurrentTime.ods.ps Fri Feb 24 14:14:33 2012
@@ -9,6 +9,26 @@
%%Pages: (atend)
%%Orientation: (atend)
%%PageOrder: Ascend
+%% *************************************************************
+%%
+%% 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.
+%%
+%% *************************************************************
%%EndComments
%%BeginProlog
%%BeginResource: procset PSPrint-Prolog 1.0 0
Modified: incubator/ooo/branches/alg/install/main/testgraphical/references/unxlngi/singletest/eis-test.odt.ps
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/testgraphical/references/unxlngi/singletest/eis-test.odt.ps?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/testgraphical/references/unxlngi/singletest/eis-test.odt.ps (original)
+++ incubator/ooo/branches/alg/install/main/testgraphical/references/unxlngi/singletest/eis-test.odt.ps Fri Feb 24 14:14:33 2012
@@ -9,6 +9,26 @@
%%Pages: (atend)
%%Orientation: (atend)
%%PageOrder: Ascend
+%% *************************************************************
+%%
+%% 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.
+%%
+%% *************************************************************
%%EndComments
%%BeginProlog
%%BeginResource: procset PSPrint-Prolog 1.0 0
Modified: incubator/ooo/branches/alg/install/main/testgraphical/references/wntmsci/demo/CurrentTime.ods.ps
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/testgraphical/references/wntmsci/demo/CurrentTime.ods.ps?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/testgraphical/references/wntmsci/demo/CurrentTime.ods.ps (original)
+++ incubator/ooo/branches/alg/install/main/testgraphical/references/wntmsci/demo/CurrentTime.ods.ps Fri Feb 24 14:14:33 2012
@@ -12,6 +12,26 @@
%%DocumentData: Clean7Bit
%%TargetDevice: (Generic Printer For MSWord Testing) (1) 1
%%LanguageLevel: 2
+%% *************************************************************
+%%
+%% 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.
+%%
+%% *************************************************************
%%EndComments
%%BeginDefaults
@@ -496,4 +516,4 @@ ehsave restore
%%Pages: 1
(%%[LastPage]%%) =
%%EOF
-
\ No newline at end of file
+
Modified: incubator/ooo/branches/alg/install/main/testgraphical/references/wntmsci/singletest/eis-test.odt.ps
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/testgraphical/references/wntmsci/singletest/eis-test.odt.ps?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/testgraphical/references/wntmsci/singletest/eis-test.odt.ps (original)
+++ incubator/ooo/branches/alg/install/main/testgraphical/references/wntmsci/singletest/eis-test.odt.ps Fri Feb 24 14:14:33 2012
@@ -12,6 +12,26 @@
%%DocumentData: Clean7Bit
%%TargetDevice: (Generic Printer For MSWord Testing) (1) 1
%%LanguageLevel: 2
+%% *************************************************************
+%%
+%% 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.
+%%
+%% *************************************************************
%%EndComments
%%BeginDefaults
@@ -1981,4 +2001,4 @@ ehsave restore
%%Pages: 1
(%%[LastPage]%%) =
%%EOF
-
\ No newline at end of file
+
Modified: incubator/ooo/branches/alg/install/main/toolkit/workben/layout/TEST
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/toolkit/workben/layout/TEST?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/toolkit/workben/layout/TEST (original)
+++ incubator/ooo/branches/alg/install/main/toolkit/workben/layout/TEST Fri Feb 24 14:14:33 2012
@@ -1,4 +1,24 @@
#! /bin/sh
+# *************************************************************
+#
+# 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.
+#
+# *************************************************************
for d in $(cd ../../../../.. && pwd)/ooo-svn /usr/lib/ooo3/; do
if test -d $d; then
export OOO_INSTALL_PREFIX=$d
Modified: incubator/ooo/branches/alg/install/main/toolkit/workben/layout/ooo-patch
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/toolkit/workben/layout/ooo-patch?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/toolkit/workben/layout/ooo-patch (original)
+++ incubator/ooo/branches/alg/install/main/toolkit/workben/layout/ooo-patch Fri Feb 24 14:14:33 2012
@@ -1,4 +1,24 @@
#! /bin/sh
+# *************************************************************
+#
+# 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.
+#
+# *************************************************************
commit=${1-3249db59} # m5
git diff $commit layout | sed 's@^\([+-]\{3\}\) \(a\|b\)/@\1 @' > layout-dialogs-layout.diff
Modified: incubator/ooo/branches/alg/install/main/toolkit/workben/layout/refresh
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/toolkit/workben/layout/refresh?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/toolkit/workben/layout/refresh (original)
+++ incubator/ooo/branches/alg/install/main/toolkit/workben/layout/refresh Fri Feb 24 14:14:33 2012
@@ -1,3 +1,23 @@
+# *************************************************************
+#
+# 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.
+#
+# *************************************************************
echo "source me ..."
test -n "${INPATH}" && rm -Rf ../../${INPATH}
build debug=true\
Modified: incubator/ooo/branches/alg/install/main/toolkit/workben/layout/run-s2x
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/toolkit/workben/layout/run-s2x?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/toolkit/workben/layout/run-s2x (original)
+++ incubator/ooo/branches/alg/install/main/toolkit/workben/layout/run-s2x Fri Feb 24 14:14:33 2012
@@ -1,4 +1,24 @@
#! /bin/sh
+# *************************************************************
+#
+# 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.
+#
+# *************************************************************
SRC=${1-../../svx/source/dialog/zoom.src}
SRC=${1-../../sw/source/ui/dialog/wordcountdialog.src}
Modified: incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/ContentProperties.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/ContentProperties.cxx?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/ContentProperties.cxx (original)
+++ incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/ContentProperties.cxx Fri Feb 24 14:14:33 2012
@@ -31,7 +31,7 @@
*************************************************************************/
#include <osl/diagnose.h>
#include <com/sun/star/util/DateTime.hpp>
-#include "NeonUri.hxx"
+#include "SerfUri.hxx"
#include "DAVResource.hxx"
#include "DAVProperties.hxx"
#include "DateTimeHelper.hxx"
@@ -39,7 +39,7 @@
#include "ContentProperties.hxx"
using namespace com::sun::star;
-using namespace webdav_ucp;
+using namespace http_dav_ucp;
/*
=============================================================================
@@ -97,7 +97,7 @@ ContentProperties::ContentProperties( co
// Title
try
{
- NeonUri aURI( rResource.uri );
+ SerfUri aURI( rResource.uri );
m_aEscapedTitle = aURI.GetPathBaseName();
(*m_xProps)[ rtl::OUString::createFromAscii( "Title" ) ]
@@ -564,9 +564,6 @@ void ContentProperties::addProperty( con
? rtl::OUString::createFromAscii( WEBDAV_COLLECTION_TYPE )
: rtl::OUString::createFromAscii( WEBDAV_CONTENT_TYPE ) ), true );
}
- // else if ( rName.equals( DAVProperties::SOURCE ) )
- // {
- // }
// else if ( rName.equals( DAVProperties::SUPPORTEDLOCK ) )
// {
// }
Modified: incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/ContentProperties.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/ContentProperties.hxx?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/ContentProperties.hxx (original)
+++ incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/ContentProperties.hxx Fri Feb 24 14:14:33 2012
@@ -35,7 +35,7 @@ namespace com { namespace sun { namespac
struct Property;
} } } }
-namespace webdav_ucp
+namespace http_dav_ucp
{
struct DAVResource;
@@ -218,6 +218,6 @@ public:
operator const ContentProperties & () const { return m_aProps; }
};
-} // namespace webdav_ucp
+} // namespace http_dav_ucp
#endif /* !_WEBDAV_UCP_CONTENTPROPERTIES_HXX */
Modified: incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/DAVAuthListener.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/DAVAuthListener.hxx?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/DAVAuthListener.hxx (original)
+++ incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/DAVAuthListener.hxx Fri Feb 24 14:14:33 2012
@@ -29,7 +29,7 @@
#include <com/sun/star/uno/XReference.hpp>
#include <com/sun/star/ucb/XCommandEnvironment.hpp>
-namespace webdav_ucp
+namespace http_dav_ucp
{
class DAVAuthListener : public salhelper::SimpleReferenceObject
@@ -43,6 +43,6 @@ class DAVAuthListener : public salhelper
sal_Bool bCanUseSystemCredentials ) = 0;
};
-} // namespace webdav_ucp
+} // namespace http_dav_ucp
#endif // _DAVAUTHLISTENER_HXX_
Modified: incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/DAVAuthListenerImpl.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/DAVAuthListenerImpl.hxx?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/DAVAuthListenerImpl.hxx (original)
+++ incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/DAVAuthListenerImpl.hxx Fri Feb 24 14:14:33 2012
@@ -27,7 +27,7 @@
#include "DAVAuthListener.hxx"
-namespace webdav_ucp
+namespace http_dav_ucp
{
//=========================================================================
Modified: incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/DAVException.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/DAVException.hxx?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/DAVException.hxx (original)
+++ incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/DAVException.hxx Fri Feb 24 14:14:33 2012
@@ -26,7 +26,7 @@
#include <rtl/ustring.hxx>
-namespace webdav_ucp
+namespace http_dav_ucp
{
/////////////////////////////////////////////////////////////////////////////
@@ -139,17 +139,24 @@ class DAVException
sal_uInt16 mStatusCode;
public:
- DAVException( ExceptionCode inExceptionCode ) :
- mExceptionCode( inExceptionCode ), mStatusCode( SC_NONE ) {};
+ DAVException( ExceptionCode inExceptionCode )
+ : mExceptionCode( inExceptionCode )
+ , mData()
+ , mStatusCode( SC_NONE )
+ {};
DAVException( ExceptionCode inExceptionCode,
- const rtl::OUString & rData ) :
- mExceptionCode( inExceptionCode ), mData( rData ),
- mStatusCode( SC_NONE ) {};
+ const rtl::OUString & rData )
+ : mExceptionCode( inExceptionCode )
+ , mData( rData )
+ , mStatusCode( SC_NONE )
+ {};
DAVException( ExceptionCode inExceptionCode,
const rtl::OUString & rData,
- sal_uInt16 nStatusCode ) :
- mExceptionCode( inExceptionCode ), mData( rData ),
- mStatusCode( nStatusCode ) {};
+ sal_uInt16 nStatusCode )
+ : mExceptionCode( inExceptionCode )
+ , mData( rData )
+ , mStatusCode( nStatusCode )
+ {};
~DAVException( ) {};
const ExceptionCode & getError() const { return mExceptionCode; }
@@ -157,6 +164,6 @@ class DAVException
sal_uInt16 getStatus() const { return mStatusCode; }
};
-} // namespace webdav_ucp
+} // namespace http_dav_ucp
#endif // _DAVEXCEPTION_HXX_
Modified: incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/DAVProperties.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/DAVProperties.cxx?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/DAVProperties.cxx (original)
+++ incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/DAVProperties.cxx Fri Feb 24 14:14:33 2012
@@ -27,7 +27,7 @@
#include <string.h>
#include "DAVProperties.hxx"
-using namespace webdav_ucp;
+using namespace http_dav_ucp;
const ::rtl::OUString DAVProperties::CREATIONDATE =
::rtl::OUString::createFromAscii( "DAV:creationdate" );
@@ -47,8 +47,6 @@ const ::rtl::OUString DAVProperties::LOC
::rtl::OUString::createFromAscii( "DAV:lockdiscovery" );
const ::rtl::OUString DAVProperties::RESOURCETYPE =
::rtl::OUString::createFromAscii( "DAV:resourcetype" );
-const ::rtl::OUString DAVProperties::SOURCE =
- ::rtl::OUString::createFromAscii( "DAV:source" );
const ::rtl::OUString DAVProperties::SUPPORTEDLOCK =
::rtl::OUString::createFromAscii( "DAV:supportedlock" );
@@ -58,8 +56,8 @@ const ::rtl::OUString DAVProperties::EXE
// -------------------------------------------------------------------
// static
-void DAVProperties::createNeonPropName( const rtl::OUString & rFullName,
- NeonPropName & rName )
+void DAVProperties::createSerfPropName( const rtl::OUString & rFullName,
+ SerfPropName & rName )
{
if ( rFullName.compareToAscii( RTL_CONSTASCII_STRINGPARAM( "DAV:" ) ) == 0 )
{
@@ -145,9 +143,10 @@ void DAVProperties::createUCBPropName( c
DAVProperties::GETCONTENTLENGTH.matchIgnoreAsciiCase( aName, 4 ) ||
DAVProperties::GETCONTENTTYPE.matchIgnoreAsciiCase( aName, 4 ) ||
DAVProperties::GETETAG.matchIgnoreAsciiCase( aName, 4 ) ||
- DAVProperties::GETLASTMODIFIED.matchIgnoreAsciiCase( aName, 4 ) ||
- DAVProperties::SOURCE.matchIgnoreAsciiCase( aName, 4 ) )
+ DAVProperties::GETLASTMODIFIED.matchIgnoreAsciiCase( aName, 4 ) )
+ {
aNameSpace = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DAV:" ) );
+ }
}
// Note: Concatenating strings BEFORE comparing against known namespaces
@@ -186,7 +185,7 @@ void DAVProperties::createUCBPropName( c
// -------------------------------------------------------------------
// static
-bool DAVProperties::isUCBDeadProperty( const NeonPropName & rName )
+bool DAVProperties::isUCBDeadProperty( const SerfPropName & rName )
{
return ( rName.nspace &&
( rtl_str_compareIgnoreAsciiCase(
Modified: incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/DAVProperties.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/DAVProperties.hxx?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/DAVProperties.hxx (original)
+++ incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/DAVProperties.hxx Fri Feb 24 14:14:33 2012
@@ -24,9 +24,9 @@
#define _DAVPROPERTIES_HXX_
#include <rtl/ustring.hxx>
-#include "NeonTypes.hxx"
+#include "SerfTypes.hxx"
-namespace webdav_ucp
+namespace http_dav_ucp
{
struct DAVProperties
@@ -40,19 +40,18 @@ struct DAVProperties
static const ::rtl::OUString GETLASTMODIFIED;
static const ::rtl::OUString LOCKDISCOVERY;
static const ::rtl::OUString RESOURCETYPE;
- static const ::rtl::OUString SOURCE;
static const ::rtl::OUString SUPPORTEDLOCK;
static const ::rtl::OUString EXECUTABLE;
- static void createNeonPropName( const rtl::OUString & rFullName,
- NeonPropName & rName );
+ static void createSerfPropName( const rtl::OUString & rFullName,
+ SerfPropName & rName );
static void createUCBPropName ( const char * nspace,
const char * name,
rtl::OUString & rFullName );
- static bool isUCBDeadProperty( const NeonPropName & rName );
+ static bool isUCBDeadProperty( const SerfPropName & rName );
};
-} // namespace webdav_ucp
+} // namespace http_dav_ucp
#endif // _DAVPROPERTIES_HXX_
Modified: incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/DAVRequestEnvironment.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/DAVRequestEnvironment.hxx?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/DAVRequestEnvironment.hxx (original)
+++ incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/DAVRequestEnvironment.hxx Fri Feb 24 14:14:33 2012
@@ -27,7 +27,7 @@
#include <rtl/ref.hxx>
#include "DAVAuthListener.hxx"
-namespace webdav_ucp
+namespace http_dav_ucp
{
typedef std::pair< rtl::OUString, rtl::OUString > DAVRequestHeader;
typedef std::vector< DAVRequestHeader > DAVRequestHeaders;
@@ -53,6 +53,6 @@ DAVRequestEnvironment( const rtl::OUStri
DAVRequestEnvironment() {}
};
-} // namespace webdav_ucp
+} // namespace http_dav_ucp
#endif // _DAVREQUESTENVIRONMENT_HXX_
Modified: incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/DAVResource.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/DAVResource.hxx?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/DAVResource.hxx (original)
+++ incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/DAVResource.hxx Fri Feb 24 14:14:33 2012
@@ -29,7 +29,7 @@
#include "rtl/ustring.hxx"
#include "com/sun/star/uno/Any.hxx"
-namespace webdav_ucp
+namespace http_dav_ucp
{
struct DAVPropertyValue
@@ -58,6 +58,6 @@ struct DAVResourceInfo
DAVResourceInfo( const ::rtl::OUString & inUri ) : uri( inUri ) {}
};
-} // namespace webdav_ucp
+} // namespace http_dav_ucp
#endif // _DAVRESOURCE_HXX_
Modified: incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/DAVResourceAccess.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/DAVResourceAccess.cxx?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/DAVResourceAccess.cxx (original)
+++ incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/DAVResourceAccess.cxx Fri Feb 24 14:14:33 2012
@@ -35,7 +35,7 @@
#include "DAVAuthListenerImpl.hxx"
#include "DAVResourceAccess.hxx"
-using namespace webdav_ucp;
+using namespace http_dav_ucp;
using namespace com::sun::star;
//=========================================================================
@@ -169,48 +169,6 @@ DAVResourceAccess & DAVResourceAccess::o
return *this;
}
-#if 0 // currently not used, but please don't remove code
-//=========================================================================
-void DAVResourceAccess::OPTIONS(
- DAVCapabilities & rCapabilities,
- const uno::Reference< ucb::XCommandEnvironment > & xEnv )
- throw( DAVException )
-{
- initialize();
-
- bool bRetry;
- int errorCount = 0;
- do
- {
- bRetry = false;
- try
- {
- DAVRequestHeaders aHeaders;
- getUserRequestHeaders( xEnv,
- getRequestURI(),
- rtl::OUString::createFromAscii(
- "OPTIONS" ),
- aHeaders );
-
- m_xSession->OPTIONS( getRequestURI(),
- rCapabilities,
- DAVRequestEnvironment(
- getRequestURI(),
- new DAVAuthListener_Impl( xEnv, m_aURL ),
- aHeaders, xEnv) );
- }
- catch ( DAVException & e )
- {
- errorCount++;
- bRetry = handleException( e, errorCount );
- if ( !bRetry )
- throw;
- }
- }
- while ( bRetry );
-}
-#endif
-
//=========================================================================
void DAVResourceAccess::PROPFIND(
const Depth nDepth,
@@ -1056,7 +1014,7 @@ void DAVResourceAccess::initialize()
osl::Guard< osl::Mutex > aGuard( m_aMutex );
if ( m_aPath.getLength() == 0 )
{
- NeonUri aURI( m_aURL );
+ SerfUri aURI( m_aURL );
rtl::OUString aPath( aURI.GetPath() );
/* #134089# - Check URI */
@@ -1147,10 +1105,10 @@ sal_Bool DAVResourceAccess::detectRedire
{
osl::Guard< osl::Mutex > aGuard( m_aMutex );
- NeonUri aUri( rRedirectURL );
+ SerfUri aUri( rRedirectURL );
- std::vector< NeonUri >::const_iterator it = m_aRedirectURIs.begin();
- std::vector< NeonUri >::const_iterator end = m_aRedirectURIs.end();
+ std::vector< SerfUri >::const_iterator it = m_aRedirectURIs.begin();
+ std::vector< SerfUri >::const_iterator end = m_aRedirectURIs.end();
while ( it != end )
{
@@ -1169,9 +1127,9 @@ void DAVResourceAccess::resetUri()
osl::Guard< osl::Mutex > aGuard( m_aMutex );
if ( m_aRedirectURIs.size() > 0 )
{
- std::vector< NeonUri >::const_iterator it = m_aRedirectURIs.begin();
+ std::vector< SerfUri >::const_iterator it = m_aRedirectURIs.begin();
- NeonUri aUri( (*it) );
+ SerfUri aUri( (*it) );
m_aRedirectURIs.clear();
setURL ( aUri.GetURI() );
initialize();
Modified: incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/DAVResourceAccess.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/DAVResourceAccess.hxx?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/DAVResourceAccess.hxx (original)
+++ incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/DAVResourceAccess.hxx Fri Feb 24 14:14:33 2012
@@ -37,9 +37,9 @@
#include "DAVSession.hxx"
#include "DAVResource.hxx"
#include "DAVTypes.hxx"
-#include "NeonUri.hxx"
+#include "SerfUri.hxx"
-namespace webdav_ucp
+namespace http_dav_ucp
{
class DAVSessionFactory;
@@ -53,7 +53,7 @@ class DAVResourceAccess
rtl::Reference< DAVSessionFactory > m_xSessionFactory;
com::sun::star::uno::Reference<
com::sun::star::lang::XMultiServiceFactory > m_xSMgr;
- std::vector< NeonUri > m_aRedirectURIs;
+ std::vector< SerfUri > m_aRedirectURIs;
public:
DAVResourceAccess() : m_xSessionFactory( 0 ) {}
@@ -79,14 +79,6 @@ public:
// DAV methods
//
-#if 0 // currently not used, but please don't remove code
- void
- OPTIONS( DAVCapabilities & rCapabilities,
- const com::sun::star::uno::Reference<
- com::sun::star::ucb::XCommandEnvironment > & xEnv )
- throw ( DAVException );
-#endif
-
// allprop & named
void
PROPFIND( const Depth nDepth,
@@ -242,6 +234,6 @@ private:
throw ( DAVException );
};
-} // namespace webdav_ucp
+} // namespace http_dav_ucp
#endif // _DAVRESOURCEACCESS_HXX_
Modified: incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/DAVSession.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/DAVSession.hxx?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/DAVSession.hxx (original)
+++ incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/DAVSession.hxx Fri Feb 24 14:14:33 2012
@@ -39,7 +39,7 @@ namespace com { namespace sun { namespac
struct Lock;
} } } }
-namespace webdav_ucp
+namespace http_dav_ucp
{
class DAVAuthListener;
@@ -68,10 +68,13 @@ public:
// DAV methods
//
+ // NOT USED
+ /*
virtual void OPTIONS( const ::rtl::OUString & inPath,
DAVCapabilities & outCapabilities,
const DAVRequestEnvironment & rEnv )
throw( DAVException ) = 0;
+ */
// allprop & named
virtual void PROPFIND( const ::rtl::OUString & inPath,
@@ -210,6 +213,6 @@ private:
#endif // WNT
};
-} // namespace webdav_ucp
+} // namespace http_dav_ucp
#endif // _DAVSESSION_HXX_
Modified: incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/DAVSessionFactory.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/DAVSessionFactory.cxx?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/DAVSessionFactory.cxx (original)
+++ incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/DAVSessionFactory.cxx Fri Feb 24 14:14:33 2012
@@ -24,11 +24,11 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_ucb.hxx"
#include "DAVSessionFactory.hxx"
-#include "NeonSession.hxx"
-#include "NeonUri.hxx"
+#include "SerfSession.hxx"
+#include "SerfUri.hxx"
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-using namespace webdav_ucp;
+using namespace http_dav_ucp;
using namespace com::sun::star;
DAVSessionFactory::~DAVSessionFactory()
@@ -60,10 +60,10 @@ rtl::Reference< DAVSession > DAVSessionF
if ( aIt == aEnd )
{
- NeonUri aURI( inUri );
+ SerfUri aURI( inUri );
std::auto_ptr< DAVSession > xElement(
- new NeonSession( this, inUri, *m_xProxyDecider.get() ) );
+ new SerfSession( this, inUri, *m_xProxyDecider.get() ) );
aIt = m_aMap.insert( Map::value_type( inUri, xElement.get() ) ).first;
aIt->second->m_aContainerIt = aIt;
@@ -84,9 +84,9 @@ rtl::Reference< DAVSession > DAVSessionF
// If URL scheme is different from http or https we definitely
// have to use a proxy and therefore can optimize the getProxy
// call a little:
- NeonUri aURI( inUri );
+ SerfUri aURI( inUri );
- aIt->second = new NeonSession( this, inUri, *m_xProxyDecider.get() );
+ aIt->second = new SerfSession( this, inUri, *m_xProxyDecider.get() );
aIt->second->m_aContainerIt = aIt;
return aIt->second;
}
Modified: incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/DAVSessionFactory.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/DAVSessionFactory.hxx?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/DAVSessionFactory.hxx (original)
+++ incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/DAVSessionFactory.hxx Fri Feb 24 14:14:33 2012
@@ -41,7 +41,7 @@ namespace com { namespace sun { namespac
class XMultiServiceFactory;
} } } }
-namespace webdav_ucp
+namespace http_dav_ucp
{
class DAVSession;
@@ -73,6 +73,6 @@ private:
friend class DAVSession;
};
-} // namespace webdav_ucp
+} // namespace http_dav_ucp
#endif // _DAVSESSIONFACTORY_HXX_
Modified: incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/DAVTypes.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/DAVTypes.hxx?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/DAVTypes.hxx (original)
+++ incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/DAVTypes.hxx Fri Feb 24 14:14:33 2012
@@ -27,7 +27,7 @@
#include <rtl/ustring.hxx>
#include <com/sun/star/uno/Any.hxx>
-namespace webdav_ucp
+namespace http_dav_ucp
{
/* RFC 2518
@@ -76,6 +76,6 @@ struct ProppatchValue
: operation( o ), name( n ), value( v ) {}
};
-} // namespace webdav_ucp
+} // namespace http_dav_ucp
#endif // _DAVTYPES_HXX_
Modified: incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/DateTimeHelper.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/DateTimeHelper.cxx?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/DateTimeHelper.cxx (original)
+++ incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/DateTimeHelper.cxx Fri Feb 24 14:14:33 2012
@@ -32,7 +32,7 @@
using namespace com::sun::star::util;
using namespace rtl;
-using namespace webdav_ucp;
+using namespace http_dav_ucp;
bool DateTimeHelper::ISO8601_To_DateTime (const OUString& s,
DateTime& dateTime)
Modified: incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/DateTimeHelper.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/DateTimeHelper.hxx?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/DateTimeHelper.hxx (original)
+++ incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/DateTimeHelper.hxx Fri Feb 24 14:14:33 2012
@@ -34,7 +34,7 @@ namespace rtl {
class OUString;
}
-namespace webdav_ucp
+namespace http_dav_ucp
{
class DateTimeHelper
@@ -53,7 +53,7 @@ public:
::com::sun::star::util::DateTime& );
};
-} // namespace webdav_ucp
+} // namespace http_dav_ucp
#endif
Modified: incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/PropertyMap.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/PropertyMap.hxx?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/PropertyMap.hxx (original)
+++ incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/PropertyMap.hxx Fri Feb 24 14:14:33 2012
@@ -27,7 +27,7 @@
#include <hash_set>
#include <com/sun/star/beans/Property.hpp>
-namespace webdav_ucp {
+namespace http_dav_ucp {
//=========================================================================
Modified: incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx (original)
+++ incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx Fri Feb 24 14:14:33 2012
@@ -25,12 +25,12 @@
#include "precompiled_ucb.hxx"
#include <string.h>
-#include <ne_xml.h>
+//#include <ne_xml.h>
#include <osl/diagnose.h>
#include <rtl/ustrbuf.hxx>
#include "UCBDeadPropertyValue.hxx"
-using namespace webdav_ucp;
+using namespace http_dav_ucp;
using namespace com::sun::star;
//////////////////////////////////////////////////////////////////////////
@@ -78,11 +78,12 @@ const rtl::OUString UCBDeadPropertyValue
#define STATE_TYPE (STATE_TOP + 1)
#define STATE_VALUE (STATE_TOP + 2)
+/*
//////////////////////////////////////////////////////////////////////////
extern "C" int UCBDeadPropertyValue_startelement_callback(
void *,
int parent,
- const char * /*nspace*/,
+ const char * nspace,
const char *name,
const char ** )
{
@@ -166,6 +167,7 @@ extern "C" int UCBDeadPropertyValue_ende
}
return 0; // zero to continue, non-zero to abort parsing
}
+*/
//////////////////////////////////////////////////////////////////////////
static rtl::OUString encodeValue( const rtl::OUString & rValue )
@@ -352,11 +354,12 @@ bool UCBDeadPropertyValue::supportsType(
//////////////////////////////////////////////////////////////////////////
// static
-bool UCBDeadPropertyValue::createFromXML( const rtl::OString & rInData,
- uno::Any & rOutData )
+bool UCBDeadPropertyValue::createFromXML( const rtl::OString & /*rInData*/,
+ uno::Any & /*rOutData*/ )
{
bool success = false;
+ /*
ne_xml_parser * parser = ne_xml_create();
if ( parser )
{
@@ -431,7 +434,7 @@ bool UCBDeadPropertyValue::createFromXML
success = false;
}
}
-
+ */
return success;
}
@@ -529,11 +532,10 @@ bool UCBDeadPropertyValue::toXML( const
// Encode value! It must not contain XML reserved chars!
aStringValue = encodeValue( aStringValue );
- rOutData = aXMLPre;
+ rOutData = aXMLPre;
rOutData += aStringType;
rOutData += aXMLMid;
rOutData += aStringValue;
rOutData += aXMLEnd;
-
return true;
}
Modified: incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/UCBDeadPropertyValue.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/UCBDeadPropertyValue.hxx?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/UCBDeadPropertyValue.hxx (original)
+++ incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/UCBDeadPropertyValue.hxx Fri Feb 24 14:14:33 2012
@@ -27,7 +27,7 @@
#include <rtl/string.hxx>
#include <com/sun/star/uno/Any.hxx>
-namespace webdav_ucp
+namespace http_dav_ucp
{
class UCBDeadPropertyValue
|