openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject svn commit: r1546808 [2/2] - in /openoffice/branches/capstone2013/main: ./ comphelper/ comphelper/prj/ drawinglayer/ drawinglayer/prj/ editeng/ editeng/inc/editeng/ editeng/prj/ external/unowinreg/ framework/ framework/prj/ padmin/ padmin/prj/ sfx2/ sf...
Date Sun, 01 Dec 2013 12:20:07 GMT
Added: openoffice/branches/capstone2013/main/solenv/bin/modules/installer/patch/ReleasesList.pm
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/solenv/bin/modules/installer/patch/ReleasesList.pm?rev=1546808&view=auto
==============================================================================
--- openoffice/branches/capstone2013/main/solenv/bin/modules/installer/patch/ReleasesList.pm (added)
+++ openoffice/branches/capstone2013/main/solenv/bin/modules/installer/patch/ReleasesList.pm Sun Dec  1 12:20:06 2013
@@ -0,0 +1,210 @@
+#**************************************************************
+#  
+#  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.
+#  
+#**************************************************************
+
+package installer::patch::ReleasesList;
+
+use XML::LibXML;
+use File::Spec;
+use strict;
+
+=head1 NAME
+
+    package installer::patch::ReleasesList  -  Functions for accessing the instsetoo_native/data/releases.xml file
+
+=cut
+
+
+my $Instance = undef;
+
+=head2 Instance()
+
+    Return the singleton instance.
+    
+=cut
+sub Instance()
+{
+    if ( ! defined $Instance)
+    {
+        $Instance = new installer::patch::ReleasesList();
+    }
+    return $Instance;
+}
+
+
+
+
+=head2 new($class)
+
+    Internal constructor.  Don't call.
+
+=cut
+sub new ($)
+{
+    my ($class) = @_;
+
+    my $self = {};
+    bless($self, $class);
+
+    $self->Read();
+
+    return $self;
+}
+
+
+
+
+=head2 GetFirstChild ($node, $child_name)
+
+    Internal function that returns the first child.  Use only when the
+    first child is the (expected) only child in a list.
+
+=cut
+sub GetFirstChild ($$)
+{
+    my ($node, $child_name) = @_;
+
+    if ( ! defined $node)
+    {
+        return undef;
+    }
+    else
+    {
+        my @child_nodes = $node->getElementsByTagName($child_name);
+        if (scalar @child_nodes == 0)
+        {
+            return undef;
+        }
+        else
+        {
+            return $child_nodes[0];
+        }
+    }
+}
+
+
+
+
+=head2 GetText ($node)
+
+    Internal function that returns the trimmed text content of a node.
+
+=cut
+sub GetText ($)
+{
+    my ($node) = @_;
+
+    if ( ! defined $node)
+    {
+        return "";
+    }
+    else
+    {
+        my $text = $node->textContent();
+        $text =~ s/(^\s+|\s+$)//g;
+        return $text;
+    }
+}
+
+
+
+
+=head2 Read($self)
+
+    Read the releases.xml file as doctree and parse its content.
+
+=cut
+sub Read ($)
+{
+    my ($self) = @_;
+
+    my $filename = File::Spec->catfile($ENV{'SRC_ROOT'}, "instsetoo_native", "data", "releases.xml");
+    my $parser = XML::LibXML->new();
+    my $document = $parser->parse_file($filename);
+    foreach my $release_node ($document->getElementsByTagName("release"))
+    {
+        my $version_node = GetFirstChild($release_node, "version");
+        my $version = GetText($version_node);
+        next if $version eq "";
+
+        foreach my $download_node (GetFirstChild($release_node, "download"))
+        {
+            my $package_node = GetFirstChild($download_node, "package-format");
+            my $package_format = GetText($package_node);
+            next if $package_format eq "";
+
+            my $download_data = ParseDownloadData($download_node);
+            if (defined $download_data)
+            {
+                $self->{$version}->{$package_format} = $download_data;
+            }
+        }
+    }
+
+}
+
+
+
+
+=head2 ParseDownloadData ($download_node)
+
+    Parse the data for one set of download data (there is one per release and package format).
+
+=cut
+sub ParseDownloadData ($)
+{
+    my ($download_node) = @_;
+
+    my $url_node = GetFirstChild($download_node, "url-template");
+    my $url_template = GetText($url_node);
+    if ($url_template eq "")
+    {
+        print STDERR "releases data file corrupt (no URL template)\n";
+        return undef;
+    }
+
+    my $download_data = {};
+    foreach my $item_node (@{$download_node->getElementsByTagName("item")})
+    {
+        my $language = GetText(GetFirstChild($item_node, "language"));
+        my $checksum_node = GetFirstChild($item_node, "checksum");
+        if ( ! defined $checksum_node)
+        {
+            print STDERR "releases data file corrupt (item has no 'checksum' node)\n";
+            return undef;
+        }
+        my $checksum_type = $checksum_node->getAttribute("type");
+        my $checksum_value = GetText($checksum_node);
+        my $file_size = GetText(GetFirstChild($item_node, "size"));
+        
+        my $url = $url_template;
+                $url =~ s/\%L/$language/g;
+        $download_data->{$language} = {
+            'URL' => $url,
+            'checksum-type' => $checksum_type,
+            'checksum-value' => $checksum_value,
+            'file-size' => $file_size
+        };
+    }
+
+    return $download_data;
+}
+
+1;

Added: openoffice/branches/capstone2013/main/solenv/bin/modules/installer/patch/Tools.pm
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/solenv/bin/modules/installer/patch/Tools.pm?rev=1546808&view=auto
==============================================================================
--- openoffice/branches/capstone2013/main/solenv/bin/modules/installer/patch/Tools.pm (added)
+++ openoffice/branches/capstone2013/main/solenv/bin/modules/installer/patch/Tools.pm Sun Dec  1 12:20:06 2013
@@ -0,0 +1,47 @@
+#**************************************************************
+#  
+#  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.
+#  
+#**************************************************************
+
+package installer::patch::Tools;
+
+=head1 NAME
+
+    package installer::patch::Tools - Collection of functions that don't fit anywhere else
+
+=cut
+
+
+
+
+=head2 CygpathToWindows ($path)
+
+    Convert the given path with the 'cygpath' command into Windows format.  Quote backslashes.
+
+=cut
+sub CygpathToWindows($)
+{
+    my ($path) = @_;
+    my $windows_path = qx(cygpath -w "$path");
+    $windows_path =~ s/(^\s+|\s+$)//g;
+    $windows_path =~ s/\\/\\\\/g;
+    return $windows_path;
+}
+
+1;

Added: openoffice/branches/capstone2013/main/solenv/bin/modules/installer/patch/Version.pm
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/solenv/bin/modules/installer/patch/Version.pm?rev=1546808&view=auto
==============================================================================
--- openoffice/branches/capstone2013/main/solenv/bin/modules/installer/patch/Version.pm (added)
+++ openoffice/branches/capstone2013/main/solenv/bin/modules/installer/patch/Version.pm Sun Dec  1 12:20:06 2013
@@ -0,0 +1,74 @@
+#**************************************************************
+#  
+#  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.
+#  
+#**************************************************************
+
+package installer::patch::Version;
+
+
+=head1 NAME
+
+    package installer::patch::Version - Functions for handling version numbers.
+
+=cut
+
+
+
+# We handle version numbers that consist of three parts: major, minor and micro version number.
+my $VersionPartCount = 3;
+
+
+
+=head StringToNumberArray($version_string)
+
+    Convert a version string (where the individual parts are separated by '.') into an array of three numbers.
+    Missing numbers are filled with 0.
+
+    Returns an array with three elements (major, minor, micro).
+=cut
+sub StringToNumberArray ($)
+{
+    my ($version_string) = @_;
+
+    my @version_parts = split(/\./, $version_string);
+    while (scalar @version_parts < $VersionPartCount)
+    {
+        push @version_parts, "0";
+    }
+    return @version_parts;
+}
+
+
+
+
+=head ArrayToDirectoryName (@)
+
+    Return a directory name (without any path) for the given array of version numbers.
+    
+=cut
+sub ArrayToDirectoryName (@)
+{
+    return "v-".join("-", @_);
+}
+
+
+
+
+
+1;

Added: openoffice/branches/capstone2013/main/solenv/bin/patch_make_releases_xml.pl
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/solenv/bin/patch_make_releases_xml.pl?rev=1546808&view=auto
==============================================================================
--- openoffice/branches/capstone2013/main/solenv/bin/patch_make_releases_xml.pl (added)
+++ openoffice/branches/capstone2013/main/solenv/bin/patch_make_releases_xml.pl Sun Dec  1 12:20:06 2013
@@ -0,0 +1,197 @@
+#!/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.
+#  
+#**************************************************************
+
+use LWP::UserAgent;
+
+use strict;
+
+=head1 NAME
+
+    patch_make_releases_xml.pl - Create a section for the instsetoo_native/data/releases.xml file.
+
+=head1 SYNOPSIS
+
+    patch_make_releases_xml.pl <version-number>
+
+        version-number is the version number (eg 4.0.1) for which to create the releases.xml file.
+    
+=head1 DESCRIPTION
+    
+    Will contact http://archive.apache.org/dist/openoffice/<version-number>/binaries/ and
+    a) determine the set of languages
+    b) collect sizes and sha256 check sums for all Windows installation sets.
+
+    The result is printed to the console.  It has to be added manually to releases.xml.
+
+=cut
+
+
+if (scalar @ARGV != 1)
+{
+    print STDERR "usage: $0 <version-number>\n";
+    die;
+}
+
+my $version = $ARGV[0];
+
+print <<EOT;
+<?xml version='1.0' encoding='UTF-8'?>
+<!--***********************************************************
+ * 
+ * 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.
+ * 
+ ***********************************************************-->
+EOT
+
+sub DownloadFile ($)
+{
+    my $url = shift;
+
+    my $agent = LWP::UserAgent->new();
+    $agent->timeout(120);
+    $agent->show_progress(0);
+
+    my $file_content = "";
+    my $last_was_redirect = 0;
+    my $bytes_read = 0;
+    $agent->add_handler('response_redirect'
+        => sub{
+            $last_was_redirect = 1;
+            return;
+        });
+    $agent->add_handler('response_data'
+        => sub{
+            if ($last_was_redirect)
+            {
+                $last_was_redirect = 0;
+                # Throw away the data we got so far.
+		$file_content = "";
+            }
+            my($response,$agent,$h,$data)=@_;
+	    $file_content .= $data;
+        });
+    $agent->get($url);
+
+    return $file_content;
+}
+
+
+
+
+sub GetResponse ($)
+{
+    my $url = shift;
+
+    my $agent = LWP::UserAgent->new();
+    $agent->timeout(120);
+    $agent->show_progress(0);
+
+    my $file_content = "";
+    my $last_was_redirect = 0;
+    my $bytes_read = 0;
+    $agent->add_handler('response_redirect'
+        => sub{
+            $last_was_redirect = 1;
+            return;
+        });
+    $agent->add_handler('response_data'
+        => sub{
+            if ($last_was_redirect)
+            {
+                $last_was_redirect = 0;
+                # Throw away the data we got so far.
+		$file_content = "";
+            }
+            my($response,$agent,$h,$data)=@_;
+	    $file_content .= $data;
+        });
+    return $agent->get($url, 'Range' => "bytes=0-0");
+}
+
+my @languages = ();
+my @lines = split(/\n/, DownloadFile("http://archive.apache.org/dist/openoffice/".$version."/binaries/"));
+foreach my $line (@lines)
+{
+    next unless $line =~ /folder.gif/;
+    if ($line =~ /a href=\"([^\"\/]+)\/\"/)
+    {
+	my $language = $1;
+	next if $language eq "SDK";
+	next if $language =~ /^[A-Z]/;
+	push @languages, $language;
+    }
+}
+
+print "<releases>\n";
+print "  <release>\n";
+printf "    <version>%s</version>\n", $version;
+print "    <download>\n";
+print "      <package-format>msi</package-format>\n";
+print "      <url-template>\n";
+printf "        http://archive.apache.org/dist/openoffice/%s/binaries/%%L/Apache_OpenOffice_%s_Win_x86_install_%%L.exe\n",$version, $version;
+print "      </url-template>\n";
+foreach my $language (sort @languages)
+{
+    print "      <item>\n";
+    printf "        <language>%s</language>\n", $language;
+    my $name = sprintf(
+	"Apache_OpenOffice_%s_Win_x86_install_%s.exe",
+	$version,
+	$language,
+	$version,
+	$language);
+
+    my $content = DownloadFile(
+	sprintf("http://archive.apache.org/dist/openoffice/%s/binaries/%s/%s.sha256", $version, $language, $name));
+    if ($content =~ /^([a-f0-9]+)/)
+    {
+	printf("        <checksum type=\"sha256\">%s</checksum>\n", $1);
+    }
+    my $response = GetResponse(
+	sprintf("http://archive.apache.org/dist/openoffice/%s/binaries/%s/%s", $version, $language, $name));
+    my $content_range = $response->{'_headers'}->{'content-range'};
+    if ($content_range =~ /bytes 0-0\/(\d+)/)
+    {
+	printf("        <size>%s</size>\n", $1);
+    }
+    print "      </item>\n";
+}
+
+print "    </download>\n";
+print "  </release>\n";
+print "</releases>\n";

Added: openoffice/branches/capstone2013/main/solenv/bin/release_prepare.pl
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/solenv/bin/release_prepare.pl?rev=1546808&view=auto
==============================================================================
--- openoffice/branches/capstone2013/main/solenv/bin/release_prepare.pl (added)
+++ openoffice/branches/capstone2013/main/solenv/bin/release_prepare.pl Sun Dec  1 12:20:06 2013
@@ -0,0 +1,226 @@
+#!/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.
+#  
+#**************************************************************
+
+use lib ("$ENV{SOLARENV}/bin/modules");
+use installer::patch::InstallationSet;
+use installer::patch::Msi;
+use installer::patch::ReleasesList;
+use installer::ziplist;
+use installer::logger;
+
+use Getopt::Long;
+use Pod::Usage;
+use Digest;
+
+use strict;
+
+=head1 NAME
+
+    release_prepare.pl - Several functions to prepare release builds
+
+=head1 SYNOPSIS
+
+    release_prepare.pl [options] <language1> <language2> ...
+
+    Options:
+        --lst-file <filename>
+             Path to the .lst file, eg ../util/openoffice.lst
+        --product-name <product-name>
+             The product name, eg Apache_OpenOffice
+        --output-path <path>
+             Path to the instsetoo_native platform output tree
+        --source-version <major>.<minor>.<micro>
+             Override version number of the source.  If not given it is computed from the target version.
+
+=head1 DESCRIPTION
+
+    Prepare a release build:
+
+        - Provide installation sets of the previous version.
+          If they are not in ext_sources/ then they are downloaded.
+
+        - Unpack the installation sets.
+
+=cut
+
+
+sub ProcessCommandline ()
+{
+    my $arguments = {
+        'lst-file' => undef,
+        'product-name' => undef,
+        'output-path' => undef,
+        'source-version' => undef};
+
+    if ( ! GetOptions(
+               "lst-file=s", \$arguments->{'lst-file'},
+               "product-name=s", \$arguments->{'product-name'},
+               "output-path=s", \$arguments->{'output-path'},
+               "source-version:s" => \$arguments->{'source-version'}
+        ))
+    {
+        pod2usage(1);
+    }
+
+    if ( ! defined $arguments->{'lst-file'})
+    {
+        print STDERR "lst-file missing, please provide --lst-file\n";
+        pod2usage(2);
+    }
+    if ( ! defined $arguments->{'product-name'})
+    {
+        print STDERR "product name missing, please provide --product-name\n";
+        pod2usage(2);
+    }
+    if ( ! defined $arguments->{'output-path'})
+    {
+        print STDERR "output path missing, please provide --output-path\n";
+        pod2usage(2);
+    }
+
+    $arguments->{'languages'} = \@ARGV;
+
+    return $arguments;
+}
+
+
+
+
+sub ProcessLanguage ($$$$)
+{
+    my ($source_version, $language, $package_format, $product_name) = @_;
+    
+    $installer::logger::Info->printf("%s\n", $language);
+    $installer::logger::Info->increase_indentation();
+
+    # For every language we need
+    # 1. have downloadable installation set available (download if missing)
+    # 2. unpack it to get access to .cab and .msi
+    # 3. unpack .cab so that msimsp.exe can be run
+
+    # Create paths to unpacked contents of .exe and .cab and determine if they exist.
+    # The existence of these paths is taken as flag whether the unpacking has already taken place.
+    my $unpacked_exe_path = installer::patch::InstallationSet::GetUnpackedMsiPath(
+        $source_version,
+        $language,
+        $package_format,
+        $product_name);
+    my $unpacked_cab_path = installer::patch::InstallationSet::GetUnpackedCabPath(
+        $source_version,
+        $language,
+        $package_format,
+        $product_name);
+    my $exe_is_unpacked = -d $unpacked_exe_path;
+    my $cab_is_unpacked = -d $unpacked_cab_path;
+
+    if ( ! $exe_is_unpacked)
+    {
+        # Interpret existence of path as proof that the installation
+        # set and the cab file have been successfully unpacked.
+        # Nothing to do.
+        my $filename = installer::patch::InstallationSet::ProvideDownloadSet(
+            $source_version,
+            $language,
+            $package_format);
+        if (defined $filename)
+        {
+            if ( ! -d $unpacked_exe_path)
+            {
+                installer::patch::InstallationSet::UnpackExe($filename, $unpacked_exe_path);
+            }
+        }
+        else
+        {
+            installer::logger::PrintError("could not provide .exe installation set at '%s'\n", $filename);
+        }
+    }
+    else
+    {
+        $installer::logger::Info->printf("downloadable installation set has already been unpacked to '%s'\n",
+            $unpacked_exe_path);
+    }
+
+    if ( ! $cab_is_unpacked)
+    {
+        my $cab_filename = File::Spec->catfile($unpacked_exe_path, "openoffice1.cab");
+        if ( ! -f $cab_filename)
+        {
+             # Cab file does not exist.
+            installer::logger::PrintError(
+                "could not find .cab file at '%s'.  Extraction of .exe seems to have failed.\n",
+                $cab_filename);
+        }
+
+        # Unpack the cab file.
+        my $msi = new installer::patch::Msi(
+            $source_version,
+            $language,
+            $product_name);
+
+        $installer::logger::Info->printf("unpacking cab file '%s' to '%s'\n",
+            $cab_filename, $unpacked_cab_path);
+        installer::patch::InstallationSet::UnpackCab(
+            $cab_filename,
+            $msi,
+            $unpacked_cab_path);
+    }
+    else
+    {
+        $installer::logger::Info->printf("cab has already been unpacked to\n");
+        $installer::logger::Info->printf("    %s\n", $unpacked_cab_path);
+    }
+
+    $installer::logger::Info->decrease_indentation();
+}
+
+
+
+
+installer::logger::SetupSimpleLogging("c:/tmp/log");
+
+my $arguments = ProcessCommandline();
+$arguments->{'package-format'} = 'msi';
+
+print "preparing release build\n";
+my ($variables, undef, undef)
+    = installer::ziplist::read_openoffice_lst_file(
+        $arguments->{'lst-file'},
+        $arguments->{'product-name'},
+        undef);
+if ( ! defined $arguments->{'source-version'})
+{
+    $arguments->{'source-version'} = $variables->{'PREVIOUS_VERSION'};
+}
+$installer::logger::Info->printf("    reading data from '%s'\n", $arguments->{'lst-file'});
+$installer::logger::Info->printf("    product name is '%s'\n", $arguments->{'product-name'});
+$installer::logger::Info->printf("    output path is '%s'\n", $arguments->{'output-path'});
+$installer::logger::Info->printf("    source version is '%s'\n", $arguments->{'source-version'});
+
+foreach my $language (@{$arguments->{'languages'}})
+{
+    ProcessLanguage(
+        $arguments->{'source-version'},
+        $language,
+        $arguments->{'package-format'},
+        $arguments->{'product-name'});
+}

Added: openoffice/branches/capstone2013/main/sot/Makefile
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/sot/Makefile?rev=1546808&view=auto
==============================================================================
--- openoffice/branches/capstone2013/main/sot/Makefile (added)
+++ openoffice/branches/capstone2013/main/sot/Makefile Sun Dec  1 12:20:06 2013
@@ -0,0 +1,32 @@
+#**************************************************************
+#  
+#  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!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:

Modified: openoffice/branches/capstone2013/main/sot/prj/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/sot/prj/makefile.mk?rev=1546808&r1=1546807&r2=1546808&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/sot/prj/makefile.mk (original)
+++ openoffice/branches/capstone2013/main/sot/prj/makefile.mk Sun Dec  1 12:20:06 2013
@@ -41,4 +41,4 @@ DEBUG_ARGUMENT=
 .ENDIF
 
 all:
-	cd $(PRJ) && $(GNUMAKE) -f Makefile.gb $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) -f Makefile.gb $(VERBOSEFLAG) -r deliverlog
+	cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog

Added: openoffice/branches/capstone2013/main/svgio/Makefile
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/svgio/Makefile?rev=1546808&view=auto
==============================================================================
--- openoffice/branches/capstone2013/main/svgio/Makefile (added)
+++ openoffice/branches/capstone2013/main/svgio/Makefile Sun Dec  1 12:20:06 2013
@@ -0,0 +1,32 @@
+#/**************************************************************
+# * 
+# * 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!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:

Modified: openoffice/branches/capstone2013/main/svgio/prj/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/svgio/prj/makefile.mk?rev=1546808&r1=1546807&r2=1546808&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/svgio/prj/makefile.mk (original)
+++ openoffice/branches/capstone2013/main/svgio/prj/makefile.mk Sun Dec  1 12:20:06 2013
@@ -41,4 +41,4 @@ DEBUG_ARGUMENT=
 .ENDIF
 
 all:
-    cd $(PRJ) && $(GNUMAKE) -f Makefile.gb $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) -f Makefile.gb $(VERBOSEFLAG) -r deliverlog
+    cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog

Modified: openoffice/branches/capstone2013/main/svl/prj/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/svl/prj/makefile.mk?rev=1546808&r1=1546807&r2=1546808&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/svl/prj/makefile.mk (original)
+++ openoffice/branches/capstone2013/main/svl/prj/makefile.mk Sun Dec  1 12:20:06 2013
@@ -41,4 +41,4 @@ DEBUG_ARGUMENT=
 .ENDIF
 
 all:
-	cd $(PRJ) && $(GNUMAKE) -f Makefile.gb $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) -f Makefile.gb $(VERBOSEFLAG) -r deliverlog
+	cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog

Modified: openoffice/branches/capstone2013/main/svl/source/items/whassert.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/svl/source/items/whassert.hxx?rev=1546808&r1=1546807&r2=1546808&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/svl/source/items/whassert.hxx (original)
+++ openoffice/branches/capstone2013/main/svl/source/items/whassert.hxx Sun Dec  1 12:20:06 2013
@@ -38,7 +38,7 @@
 			ByteString aMsg( sMessage );									\
 			aMsg.Append(RTL_CONSTASCII_STRINGPARAM("\nwith Id/Pos: "));     \
 			aMsg += ByteString::CreateFromInt32( nId );						\
-			DbgError( aMsg.GetBuffer(), __FILE__, __LINE__);	\
+			DbgError( aMsg.GetBuffer() );	\
 		}																	\
 	}																		\
 }

Added: openoffice/branches/capstone2013/main/svtools/Makefile
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/svtools/Makefile?rev=1546808&view=auto
==============================================================================
--- openoffice/branches/capstone2013/main/svtools/Makefile (added)
+++ openoffice/branches/capstone2013/main/svtools/Makefile Sun Dec  1 12:20:06 2013
@@ -0,0 +1,32 @@
+#**************************************************************
+#  
+#  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!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:

Modified: openoffice/branches/capstone2013/main/svtools/prj/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/svtools/prj/makefile.mk?rev=1546808&r1=1546807&r2=1546808&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/svtools/prj/makefile.mk (original)
+++ openoffice/branches/capstone2013/main/svtools/prj/makefile.mk Sun Dec  1 12:20:06 2013
@@ -41,4 +41,4 @@ DEBUG_ARGUMENT=
 .ENDIF
 
 all:
-	cd $(PRJ) && $(GNUMAKE) -f Makefile.gb $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) -f Makefile.gb $(VERBOSEFLAG) -r deliverlog
+	cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog

Added: openoffice/branches/capstone2013/main/svx/Makefile
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/svx/Makefile?rev=1546808&view=auto
==============================================================================
--- openoffice/branches/capstone2013/main/svx/Makefile (added)
+++ openoffice/branches/capstone2013/main/svx/Makefile Sun Dec  1 12:20:06 2013
@@ -0,0 +1,32 @@
+#**************************************************************
+#  
+#  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!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:

Modified: openoffice/branches/capstone2013/main/svx/prj/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/svx/prj/makefile.mk?rev=1546808&r1=1546807&r2=1546808&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/svx/prj/makefile.mk (original)
+++ openoffice/branches/capstone2013/main/svx/prj/makefile.mk Sun Dec  1 12:20:06 2013
@@ -41,4 +41,4 @@ DEBUG_ARGUMENT=
 .ENDIF
 
 all:
-	cd $(PRJ) && $(GNUMAKE) -f Makefile.gb $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) -f Makefile.gb $(VERBOSEFLAG) -r deliverlog
+	cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog

Added: openoffice/branches/capstone2013/main/sw/Makefile
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/sw/Makefile?rev=1546808&view=auto
==============================================================================
--- openoffice/branches/capstone2013/main/sw/Makefile (added)
+++ openoffice/branches/capstone2013/main/sw/Makefile Sun Dec  1 12:20:06 2013
@@ -0,0 +1,32 @@
+#**************************************************************
+#  
+#  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!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:

Modified: openoffice/branches/capstone2013/main/sw/prj/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/sw/prj/makefile.mk?rev=1546808&r1=1546807&r2=1546808&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/sw/prj/makefile.mk (original)
+++ openoffice/branches/capstone2013/main/sw/prj/makefile.mk Sun Dec  1 12:20:06 2013
@@ -41,4 +41,4 @@ DEBUG_ARGUMENT=
 .ENDIF
 
 all:
-	cd $(PRJ) && $(GNUMAKE) -f Makefile.gb $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) -f Makefile.gb $(VERBOSEFLAG) -r deliverlog
+	cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog

Added: openoffice/branches/capstone2013/main/sw/source/core/access/accfield.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/sw/source/core/access/accfield.cxx?rev=1546808&view=auto
==============================================================================
--- openoffice/branches/capstone2013/main/sw/source/core/access/accfield.cxx (added)
+++ openoffice/branches/capstone2013/main/sw/source/core/access/accfield.cxx Sun Dec  1 12:20:06 2013
@@ -0,0 +1,348 @@
+/**************************************************************
+ * 
+ * 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_sw.hxx"
+
+#ifndef COMPHELPER_ACCESSIBLE_KEYBINDING_HELPER_HXX
+#include <comphelper/accessiblekeybindinghelper.hxx>
+#endif
+#ifndef _SWURL_HXX //autogen
+#include <swurl.hxx>
+#endif
+#ifndef _VOS_MUTEX_HXX_ //autogen
+#include <vos/mutex.hxx>
+#endif
+#ifndef _SV_SVAPP_HXX //autogen
+#include <vcl/svapp.hxx>
+#endif
+#ifndef _NDTXT_HXX
+#include <ndtxt.hxx>
+#endif
+#ifndef _TXTINET_HXX
+#include <txtinet.hxx>
+#endif
+
+#ifndef _ACCPARA_HXX
+#include <accpara.hxx>
+#endif
+#ifndef _ACCFIELD_HXX
+#include <accfield.hxx>
+#endif
+
+#include <comphelper/processfactory.hxx>
+
+#ifndef _COM_SUN_STAR_FRAME_XDESKTOP_HPP_
+#include <com/sun/star/frame/XDesktop.hpp>
+#endif
+#ifndef _COM_SUN_STAR_FRAME_XCOMPONENTLOADER_HPP_
+#include <com/sun/star/frame/XComponentLoader.hpp>
+#endif
+#ifndef _COM_SUN_STAR_DOCUMENT_XLINKTARGETSUPPLIER_HPP_
+#include <com/sun/star/document/XLinkTargetSupplier.hpp>
+#endif
+#ifndef COMPHELPER_ACCESSIBLE_EVENT_NOTIFIER
+#include <comphelper/accessibleeventnotifier.hxx>
+#endif
+
+//Add end
+
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::accessibility;
+// using namespace ::rtl;
+
+SwAccessibleField::SwAccessibleField( SwField *pSwFld,SwAccessibleParagraph *p,sal_Int16 nRole) :
+	m_xPara( p ),m_pSwField(pSwFld),m_nRole(nRole)
+{
+	m_nClientId=0;
+}
+
+uno::Reference< XAccessibleContext > SAL_CALL
+	SwAccessibleField::getAccessibleContext( void )
+        throw (::com::sun::star::uno::RuntimeException)
+{
+	uno::Reference < XAccessibleContext > xRet( this );
+	return xRet;
+}
+
+sal_Int32 SAL_CALL SwAccessibleField::getAccessibleChildCount( void )
+        throw (::com::sun::star::uno::RuntimeException)
+{
+	vos::OGuard aGuard(Application::GetSolarMutex());
+	return 0;
+}
+
+uno::Reference< XAccessible> SAL_CALL
+	SwAccessibleField::getAccessibleChild( long )
+        throw (::com::sun::star::uno::RuntimeException,
+				::com::sun::star::lang::IndexOutOfBoundsException)
+{
+	vos::OGuard aGuard(Application::GetSolarMutex());
+	return uno::Reference< XAccessible >();
+}
+
+uno::Reference< XAccessible> SAL_CALL SwAccessibleField::getAccessibleParent (void)
+        throw (::com::sun::star::uno::RuntimeException)
+{
+	vos::OGuard aGuard(Application::GetSolarMutex());
+
+	uno::Reference< XAccessible > xParent(static_cast<XAccessible*>(m_xPara.getBodyPtr()),UNO_QUERY);
+	return xParent;
+}
+
+sal_Int32 SAL_CALL SwAccessibleField::getAccessibleIndexInParent (void)
+        throw (::com::sun::star::uno::RuntimeException)
+{
+	vos::OGuard aGuard(Application::GetSolarMutex());
+	return 0;
+}
+
+sal_Int16 SAL_CALL SwAccessibleField::getAccessibleRole (void)
+        throw (::com::sun::star::uno::RuntimeException)
+{
+	return m_nRole;
+}
+
+rtl::OUString SAL_CALL SwAccessibleField::getAccessibleDescription (void)
+        throw (::com::sun::star::uno::RuntimeException)
+{
+	ASSERT( !this, "description needs to be overloaded" );
+	//THROW_RUNTIME_EXCEPTION( XAccessibleContext, "internal error (method must be overloaded)" );
+	return rtl::OUString();
+}
+
+rtl::OUString SAL_CALL SwAccessibleField::getAccessibleName (void)
+        throw (::com::sun::star::uno::RuntimeException)
+{
+	return rtl::OUString();
+}
+
+uno::Reference< XAccessibleRelationSet> SAL_CALL
+	SwAccessibleField::getAccessibleRelationSet (void)
+        throw (::com::sun::star::uno::RuntimeException)
+{
+	return NULL;
+}
+
+uno::Reference<XAccessibleStateSet> SAL_CALL
+	SwAccessibleField::getAccessibleStateSet (void)
+        throw (::com::sun::star::uno::RuntimeException)
+{
+	vos::OGuard aGuard(Application::GetSolarMutex());
+	return uno::Reference<XAccessibleStateSet>();
+}
+
+com::sun::star::lang::Locale SAL_CALL SwAccessibleField::getLocale (void)
+		throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException)
+{
+	vos::OGuard aGuard(Application::GetSolarMutex());
+
+	com::sun::star::lang::Locale aLoc( Application::GetSettings().GetLocale() );
+	return aLoc;
+}
+
+static sal_Bool lcl_PointInRectangle(const awt::Point & aPoint,
+                                     const awt::Rectangle & aRect)
+{
+    long nDiffX = aPoint.X - aRect.X;
+    long nDiffY = aPoint.Y - aRect.Y;
+
+    return
+        nDiffX >= 0 && nDiffX < aRect.Width && nDiffY >= 0 &&
+        nDiffY < aRect.Height;
+
+}
+
+sal_Bool SAL_CALL SwAccessibleField::containsPoint(
+			const ::com::sun::star::awt::Point& aPoint )
+		throw (RuntimeException)
+{
+    awt::Rectangle aPixBounds = getBoundsImpl(sal_True);
+    aPixBounds.X = 0;
+    aPixBounds.Y = 0;
+
+    return lcl_PointInRectangle(aPoint, aPixBounds);
+}
+
+uno::Reference< XAccessible > SAL_CALL SwAccessibleField::getAccessibleAtPoint(
+				const awt::Point& aPoint )
+		throw (RuntimeException)
+{
+	vos::OGuard aGuard(Application::GetSolarMutex());
+	
+	uno::Reference< XAccessible > xAcc;
+	awt::Rectangle rc = getBounds();
+	if(aPoint.X >= rc.X && aPoint.X <= rc.X + rc.Width &&
+		aPoint.Y >= rc.Y && aPoint.Y <= rc.Y + rc.Height )
+	{
+		xAcc =this;
+	}	
+	return xAcc;
+}
+
+
+/**
+   Get bounding box.
+
+   There are two modes.
+
+   - realative
+
+     Return bounding box relative to parent if parent is no root
+     frame. Otherwise return the absolute bounding box.
+
+   - absolute
+
+     Return the absolute bounding box.
+
+   @param bRelative
+   true: Use relative mode.
+   false: Use absolute mode.
+*/
+awt::Rectangle SAL_CALL SwAccessibleField::getBoundsImpl( sal_Bool )
+		throw (RuntimeException)
+{
+	vos::OGuard aGuard(Application::GetSolarMutex());
+	return awt::Rectangle();
+}
+
+awt::Rectangle SAL_CALL SwAccessibleField::getBounds()
+		throw (RuntimeException)
+{
+    return getBoundsImpl(sal_True);
+}
+
+awt::Point SAL_CALL SwAccessibleField::getLocation()
+    throw (RuntimeException)
+{
+    awt::Rectangle aRect = getBoundsImpl(sal_True);
+    awt::Point aPoint(aRect.X, aRect.Y);
+
+    return aPoint;
+}
+
+
+awt::Point SAL_CALL SwAccessibleField::getLocationOnScreen()
+		throw (RuntimeException)
+{
+    awt::Rectangle aRect = getBoundsImpl(sal_False);
+    //Point aPixPos = m_xPara->getLocationOnScreen();
+    return awt::Point( aRect.X,aRect.Y);//aPixPos.X() + aRect.nLeft , aPixPos.Y() + + aRect.nRight );
+}
+
+
+awt::Size SAL_CALL SwAccessibleField::getSize()
+		throw (RuntimeException)
+{
+    awt::Rectangle aRect = getBoundsImpl(sal_False);
+	awt::Size aSize( aRect.Width, aRect.Height );
+
+	return aSize;
+}
+
+void SAL_CALL SwAccessibleField::grabFocus()
+		throw (RuntimeException)
+{
+	vos::OGuard aGuard(Application::GetSolarMutex());
+	return;
+}
+
+
+sal_Int32 SAL_CALL SwAccessibleField::getForeground()
+		throw (::com::sun::star::uno::RuntimeException)
+{
+	return 0;
+}
+
+sal_Int32 SAL_CALL SwAccessibleField::getBackground()
+		throw (::com::sun::star::uno::RuntimeException)
+{
+	return 0xffffff;
+}
+::com::sun::star::uno::Any SAL_CALL SwAccessibleField::queryInterface( 
+        const ::com::sun::star::uno::Type& rType ) 
+        throw (::com::sun::star::uno::RuntimeException)
+{
+	Any aRet;
+    if ( rType == ::getCppuType((uno::Reference<XAccessibleContext> *)0) )
+    {
+        Reference<XAccessibleContext> aAccContext = (XAccessibleContext *) this; // resolve ambiguity
+        aRet <<= aAccContext;
+    }
+    else if ( rType == ::getCppuType((Reference<XAccessibleComponent> *)0) )
+    {
+        Reference<XAccessibleComponent> aAccEditComponent = this;
+        aRet <<= aAccEditComponent;
+    }
+	if (rType == ::getCppuType((Reference<XAccessibleEventBroadcaster> *)0))
+	{
+        Reference<XAccessibleEventBroadcaster> aAccBroadcaster= this;
+        aRet <<= aAccBroadcaster;
+	}
+	return aRet;
+}
+
+void SAL_CALL SwAccessibleField::acquire(  ) throw () 
+{
+}
+void SAL_CALL SwAccessibleField::release(  ) throw () 
+{
+}
+
+void SAL_CALL SwAccessibleField::addEventListener(
+			const Reference< XAccessibleEventListener >& xListener )
+		throw (::com::sun::star::uno::RuntimeException)
+{
+	//DBG_MSG( "accessible event listener added" )
+
+	if (xListener.is())
+    {
+    	vos::OGuard aGuard(Application::GetSolarMutex());
+		if (!m_nClientId)
+            m_nClientId = comphelper::AccessibleEventNotifier::registerClient( );
+		comphelper::AccessibleEventNotifier::addEventListener( m_nClientId, xListener );
+    }
+}
+
+void SAL_CALL SwAccessibleField::removeEventListener(
+			const Reference< XAccessibleEventListener >& xListener )
+		throw (::com::sun::star::uno::RuntimeException)
+{
+	//DBG_MSG( "accessible event listener removed" )
+
+	if (xListener.is())
+	{
+    	vos::OGuard aGuard(Application::GetSolarMutex());
+		sal_Int32 nListenerCount = comphelper::AccessibleEventNotifier::removeEventListener( m_nClientId, xListener );
+		if ( !nListenerCount )
+		{
+			// no listeners anymore
+			// -> revoke ourself. This may lead to the notifier thread dying (if we were the last client),
+			// and at least to us not firing any events anymore, in case somebody calls
+			// NotifyAccessibleEvent, again
+			comphelper::AccessibleEventNotifier::revokeClient( m_nClientId );
+			m_nClientId = 0;
+		}
+	}
+}

Added: openoffice/branches/capstone2013/main/sw/source/core/access/accfield.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/sw/source/core/access/accfield.hxx?rev=1546808&view=auto
==============================================================================
--- openoffice/branches/capstone2013/main/sw/source/core/access/accfield.hxx (added)
+++ openoffice/branches/capstone2013/main/sw/source/core/access/accfield.hxx Sun Dec  1 12:20:06 2013
@@ -0,0 +1,213 @@
+/**************************************************************
+ * 
+ * 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.
+ * 
+ *************************************************************/
+
+#ifndef _ACCFIELD_HXX
+#define _ACCFIELD_HXX
+
+#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLE_HPP_
+#include <com/sun/star/accessibility/XAccessible.hpp>
+#endif
+#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLECONTEXT_HPP_
+#include <com/sun/star/accessibility/XAccessibleContext.hpp>
+#endif
+#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLECOMPONENT_HPP_
+#include <com/sun/star/accessibility/XAccessibleComponent.hpp>
+#endif
+#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLEEVENTBROADCASTER_HPP_
+#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
+#endif
+#ifndef _COM_SUN_STAR_ACCESSIBILITY_ILLEGALACCESSIBLECOMPONENTSTATEEXCEPTION_HDL_
+#include <com/sun/star/accessibility/IllegalAccessibleComponentStateException.hpp>
+#endif
+#ifndef _COM_SUN_STAR_LANG_DISPOSEDEXCEPTION_HPP_
+#include <com/sun/star/lang/DisposedException.hpp>
+#endif
+#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#endif
+#ifndef _COM_SUN_STAR_LANG_INDEXOUTOFBOUNDSEXCEPTION_HPP_
+#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
+#endif
+#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLEHYPERLINK_HPP_
+#include <com/sun/star/accessibility/XAccessibleHyperlink.hpp>
+#endif
+#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLEVALUE_HPP_
+#include <com/sun/star/accessibility/XAccessibleValue.hpp>
+#endif
+#ifndef _COM_SUN_STAR_UNO_RUNTIMEEXCEPTION_HPP_
+#include <com/sun/star/uno/RuntimeException.hpp>
+#endif
+#ifndef _VOS_REF_HXX_
+#include <vos/ref.hxx>
+#endif
+#ifndef _CPPUHELPER_IMPLBASE4_HXX_
+#include <cppuhelper/implbase4.hxx>
+#endif
+#ifndef _FMTINFMT_HXX //autogen
+#include <fmtinfmt.hxx>
+#endif
+
+class SwAccessibleParagraph;
+class SwField;
+class SwAccessibleField : 
+	public ::cppu::WeakImplHelper4<
+				::com::sun::star::accessibility::XAccessible,
+                ::com::sun::star::accessibility::XAccessibleContext,
+                ::com::sun::star::accessibility::XAccessibleComponent,
+				::com::sun::star::accessibility::XAccessibleEventBroadcaster
+                >
+{
+	friend class SwAccessibleParagraph;
+	friend class SwAccessibleHyperTextData;
+	
+protected:
+//	sal_uInt16 nHintPos;
+	::vos::ORef< SwAccessibleParagraph > m_xPara;
+	SwField *m_pSwField;
+
+    sal_uInt32 m_nClientId;   // client id in the AccessibleEventNotifier queue
+    sal_Int16 m_nRole;		// immutable outside constructor
+//	sal_Int32 nStartIdx;
+//	sal_Int32 nEndIdx;
+public:
+	SwAccessibleField( SwField *pSwFld,SwAccessibleParagraph *p,sal_Int16);
+
+    virtual void SAL_CALL addEventListener(
+			const ::com::sun::star::uno::Reference<
+				::com::sun::star::accessibility::XAccessibleEventListener >& xListener )
+		throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeEventListener(
+			const ::com::sun::star::uno::Reference<
+				::com::sun::star::accessibility::XAccessibleEventListener >& xListener )
+		throw (::com::sun::star::uno::RuntimeException);
+
+//	const SwTxtAttr *GetTxtAttr() const;
+//	void Invalidate();
+    virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( 
+        const ::com::sun::star::uno::Type& aType ) 
+        throw (::com::sun::star::uno::RuntimeException);
+
+    virtual void SAL_CALL acquire(  ) throw () ;
+    virtual void SAL_CALL release(  ) throw () ;
+
+public:
+	//=====  XAccessible  =====================================================
+
+    ///	Return the XAccessibleContext.
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext> SAL_CALL
+    	getAccessibleContext (void) throw (com::sun::star::uno::RuntimeException);
+
+	//=====  XAccessibleContext  ==============================================
+
+    ///	Return the number of currently visible children.
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount (void)
+        throw (::com::sun::star::uno::RuntimeException);
+
+    ///	Return the specified child or NULL if index is invalid.
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL
+    	getAccessibleChild (long nIndex)
+        throw (::com::sun::star::uno::RuntimeException,
+				::com::sun::star::lang::IndexOutOfBoundsException);
+
+    ///	Return a reference to the parent.
+	virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL
+    	getAccessibleParent (void)
+        throw (::com::sun::star::uno::RuntimeException);
+
+    ///	Return this objects index among the parents children.
+	virtual	sal_Int32 SAL_CALL
+    	getAccessibleIndexInParent (void)
+        throw (::com::sun::star::uno::RuntimeException);
+
+    ///	Return this object's role.
+	virtual sal_Int16 SAL_CALL
+    	getAccessibleRole (void)
+        throw (::com::sun::star::uno::RuntimeException);
+
+    ///	Return this object's description.
+	virtual ::rtl::OUString SAL_CALL
+    	getAccessibleDescription (void)
+        throw (::com::sun::star::uno::RuntimeException);
+
+    ///	Return the object's current name.
+	virtual ::rtl::OUString SAL_CALL
+    	getAccessibleName (void)
+        throw (::com::sun::star::uno::RuntimeException);
+
+	///	Return NULL to indicate that an empty relation set.
+	virtual ::com::sun::star::uno::Reference<
+            ::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL
+    	getAccessibleRelationSet (void)
+        throw (::com::sun::star::uno::RuntimeException);
+
+    ///	Return the set of current states.
+	virtual ::com::sun::star::uno::Reference<
+            ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL
+    	getAccessibleStateSet (void)
+        throw (::com::sun::star::uno::RuntimeException);
+
+	/**	Return the parents locale or throw exception if this object has no
+    	parent yet/anymore.
+    */
+	virtual ::com::sun::star::lang::Locale SAL_CALL
+    	getLocale (void)
+		throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException);
+
+	//=====  XAccessibleComponent  ============================================
+    virtual sal_Bool SAL_CALL containsPoint(
+			const ::com::sun::star::awt::Point& aPoint )
+		throw (::com::sun::star::uno::RuntimeException);
+
+    virtual ::com::sun::star::uno::Reference<
+		::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint(
+				const ::com::sun::star::awt::Point& aPoint )
+		throw (::com::sun::star::uno::RuntimeException);
+
+    virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds()
+		throw (::com::sun::star::uno::RuntimeException);
+
+    virtual ::com::sun::star::awt::Point SAL_CALL getLocation()
+		throw (::com::sun::star::uno::RuntimeException);
+
+    virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen()
+		throw (::com::sun::star::uno::RuntimeException);
+
+    virtual ::com::sun::star::awt::Size SAL_CALL getSize()
+		throw (::com::sun::star::uno::RuntimeException);
+
+    virtual void SAL_CALL grabFocus()
+		throw (::com::sun::star::uno::RuntimeException);
+
+    virtual sal_Int32 SAL_CALL getForeground() 
+		throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Int32 SAL_CALL getBackground() 
+		throw (::com::sun::star::uno::RuntimeException);
+
+
+    virtual ::com::sun::star::awt::Rectangle SAL_CALL 
+        getBoundsImpl(sal_Bool bRelative)
+		throw (::com::sun::star::uno::RuntimeException) ;
+
+
+};
+
+#endif
+

Added: openoffice/branches/capstone2013/main/sw/source/core/access/accnotexthyperlink.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/sw/source/core/access/accnotexthyperlink.cxx?rev=1546808&view=auto
==============================================================================
--- openoffice/branches/capstone2013/main/sw/source/core/access/accnotexthyperlink.cxx (added)
+++ openoffice/branches/capstone2013/main/sw/source/core/access/accnotexthyperlink.cxx Sun Dec  1 12:20:06 2013
@@ -0,0 +1,232 @@
+/**************************************************************
+ * 
+ * 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_sw.hxx"
+
+#include <comphelper/accessiblekeybindinghelper.hxx>
+#include <swurl.hxx>
+#include <vos/mutex.hxx>
+#include <vcl/svapp.hxx>
+#include <ndtxt.hxx>
+#include <txtinet.hxx>
+#include <frmfmt.hxx>
+
+#include <accnotexthyperlink.hxx>
+
+#include <fmturl.hxx>
+
+#include <svtools/imap.hxx>
+#include <svtools/imapobj.hxx>
+
+#include <accmap.hxx>
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::accessibility;
+//using namespace ::rtl;
+
+SwAccessibleNoTextHyperlink::SwAccessibleNoTextHyperlink( SwAccessibleNoTextFrame *p, const SwFrm *aFrm, sal_uInt16 nIndex) :
+	xFrame( p ),
+	mpFrm( aFrm ),
+	mnIndex(nIndex)
+{
+}
+
+// XAccessibleAction
+sal_Int32 SAL_CALL SwAccessibleNoTextHyperlink::getAccessibleActionCount() 
+		throw (RuntimeException)
+{
+	SwFmtURL aURL( GetFmt()->GetURL() );
+	ImageMap* pMap = aURL.GetMap();
+	if( pMap != NULL )
+	{
+		return	pMap->GetIMapObjectCount();
+	}else if( aURL.GetURL().Len() )
+	{
+		return 1;
+	}
+
+	return 0;
+}
+
+sal_Bool SAL_CALL SwAccessibleNoTextHyperlink::doAccessibleAction( sal_Int32 nIndex ) 
+		throw (IndexOutOfBoundsException, RuntimeException)
+{
+	vos::OGuard aGuard(Application::GetSolarMutex());
+
+	if(nIndex < 0 || nIndex >= getAccessibleActionCount())
+		throw new IndexOutOfBoundsException;
+
+	sal_Bool bRet = sal_False;
+	SwFmtURL aURL( GetFmt()->GetURL() );
+	ImageMap* pMap = aURL.GetMap();
+	if( pMap != NULL )
+	{	
+		IMapObject* pMapObj = pMap->GetIMapObject(nIndex);
+		if(pMapObj->GetURL().Len())
+		{
+			ViewShell *pVSh = xFrame->GetShell();
+			if( pVSh )
+			{
+				LoadURL( pMapObj->GetURL(), pVSh, URLLOAD_NOFILTER, 
+						 &pMapObj->GetTarget() );
+				bRet = sal_True;
+			}
+		}
+	}
+	else if( aURL.GetURL().Len() )
+	{
+		ViewShell *pVSh = xFrame->GetShell();
+		if( pVSh )
+		{
+			LoadURL( aURL.GetURL(), pVSh, URLLOAD_NOFILTER, 
+					 &aURL.GetTargetFrameName() );
+			bRet = sal_True;
+		}
+	}
+
+	return bRet;
+}
+		
+rtl::OUString SAL_CALL SwAccessibleNoTextHyperlink::getAccessibleActionDescription(
+		sal_Int32 nIndex ) 
+		throw (IndexOutOfBoundsException, RuntimeException)
+{
+	rtl::OUString sDesc;
+
+	if(nIndex < 0 || nIndex >= getAccessibleActionCount())
+		throw new IndexOutOfBoundsException;
+
+	SwFmtURL aURL( GetFmt()->GetURL() );
+	ImageMap* pMap = aURL.GetMap();
+	if( pMap != NULL )
+	{
+		IMapObject* pMapObj = pMap->GetIMapObject(nIndex);
+		if(pMapObj->GetDesc().Len())
+			sDesc = rtl::OUString( pMapObj->GetDesc() );
+		else if(pMapObj->GetURL().Len())
+			sDesc = rtl::OUString( pMapObj->GetURL() );
+	}
+	else if( aURL.GetURL().Len() )
+		sDesc = rtl::OUString( aURL.GetName() );
+		//sDesc = rtl::OUString( aURL.GetName() );
+
+	return sDesc;
+}
+
+Reference< XAccessibleKeyBinding > SAL_CALL
+	SwAccessibleNoTextHyperlink::getAccessibleActionKeyBinding( sal_Int32 nIndex ) 
+	throw (IndexOutOfBoundsException, RuntimeException)
+{
+	Reference< XAccessibleKeyBinding > xKeyBinding;
+
+	if(nIndex < 0 || nIndex >= getAccessibleActionCount())
+		throw new IndexOutOfBoundsException;
+
+	bool bIsValid = sal_False;
+	SwFmtURL aURL( GetFmt()->GetURL() );
+	ImageMap* pMap = aURL.GetMap();
+	if( pMap != NULL )
+	{
+		IMapObject* pMapObj = pMap->GetIMapObject(nIndex);
+		if(pMapObj->GetURL().Len())
+			bIsValid = sal_True;
+	}else if( aURL.GetURL().Len() )
+		bIsValid = sal_True;
+	
+	if(bIsValid)
+	{
+		::comphelper::OAccessibleKeyBindingHelper* pKeyBindingHelper =
+		   	new ::comphelper::OAccessibleKeyBindingHelper();
+		xKeyBinding = pKeyBindingHelper;
+
+		::com::sun::star::awt::KeyStroke aKeyStroke;
+		aKeyStroke.Modifiers = 0;
+		aKeyStroke.KeyCode = KEY_RETURN;
+		aKeyStroke.KeyChar = 0;
+		aKeyStroke.KeyFunc = 0;
+		pKeyBindingHelper->AddKeyBinding( aKeyStroke );
+	}
+
+	return xKeyBinding;
+}
+
+// XAccessibleHyperlink
+Any SAL_CALL SwAccessibleNoTextHyperlink::getAccessibleActionAnchor(
+		sal_Int32 nIndex ) 
+		throw (IndexOutOfBoundsException, RuntimeException)
+{
+	if(nIndex < 0 || nIndex >= getAccessibleActionCount())
+		throw new IndexOutOfBoundsException;
+
+	Any aRet;
+	//SwFrm* pAnchor = ((SwFlyFrm*)mpFrm)->GetAnchor();
+	Reference< XAccessible > xAnchor = xFrame->GetAccessibleMap()->GetContext(mpFrm, sal_True);
+	//SwAccessibleNoTextFrame* pFrame = xFrame.get();
+	//Reference< XAccessible > xAnchor = (XAccessible*)pFrame;
+	aRet <<= xAnchor;
+	return aRet;
+}
+
+Any SAL_CALL SwAccessibleNoTextHyperlink::getAccessibleActionObject( 
+			sal_Int32 nIndex ) 
+	throw (IndexOutOfBoundsException, RuntimeException)
+{
+	if(nIndex < 0 || nIndex >= getAccessibleActionCount())
+		throw new IndexOutOfBoundsException;
+
+	SwFmtURL aURL( GetFmt()->GetURL() );
+	::rtl::OUString retText;
+	ImageMap* pMap = aURL.GetMap();
+	if( pMap != NULL )
+	{
+		IMapObject* pMapObj = pMap->GetIMapObject(nIndex);
+		if(pMapObj->GetURL().Len())
+			retText = rtl::OUString( pMapObj->GetURL() );
+	}else if( aURL.GetURL().Len() )
+		retText = rtl::OUString( aURL.GetURL() );
+
+	Any aRet;
+	aRet <<= retText;
+	return aRet;
+}
+
+sal_Int32 SAL_CALL SwAccessibleNoTextHyperlink::getStartIndex() 
+		throw (RuntimeException)
+{
+	return 0;
+}
+
+sal_Int32 SAL_CALL SwAccessibleNoTextHyperlink::getEndIndex() 
+		throw (RuntimeException)
+{
+	return 0;
+}
+
+sal_Bool SAL_CALL SwAccessibleNoTextHyperlink::isValid(  ) 
+		throw (::com::sun::star::uno::RuntimeException)
+{
+	SwFmtURL aURL( GetFmt()->GetURL() );
+
+	if( aURL.GetMap() || aURL.GetURL().Len() )
+		return sal_True;
+	return sal_False;
+}

Added: openoffice/branches/capstone2013/main/sw/source/core/access/accnotexthyperlink.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/sw/source/core/access/accnotexthyperlink.hxx?rev=1546808&view=auto
==============================================================================
--- openoffice/branches/capstone2013/main/sw/source/core/access/accnotexthyperlink.hxx (added)
+++ openoffice/branches/capstone2013/main/sw/source/core/access/accnotexthyperlink.hxx Sun Dec  1 12:20:06 2013
@@ -0,0 +1,93 @@
+/**************************************************************
+ * 
+ * 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.
+ * 
+ *************************************************************/
+
+#ifndef _ACCNOTEXTHYPERLINK_HXX
+#define _ACCNOTEXTHYPERLINK_HXX
+
+
+#include <com/sun/star/accessibility/XAccessibleHyperlink.hpp>
+#include <com/sun/star/uno/RuntimeException.hpp>
+#include <vos/ref.hxx>
+#include <cppuhelper/implbase1.hxx>
+#include <fmtinfmt.hxx>
+#include <frame.hxx>
+#include <layfrm.hxx>
+
+#include "accnotextframe.hxx"
+/*
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::accessibility;
+using namespace ::rtl;
+*/
+class SwAccessibleNoTextHyperlink : 
+		public ::cppu::WeakImplHelper1<
+		::com::sun::star::accessibility::XAccessibleHyperlink >
+{
+	friend class SwAccessibleNoTextFrame;
+
+	::vos::ORef< SwAccessibleNoTextFrame > xFrame;
+	const SwFrm *mpFrm;
+	sal_uInt16 mnIndex;
+
+	SwFrmFmt *GetFmt()
+	{
+		return ((SwLayoutFrm*)mpFrm)->GetFmt();
+	}
+public:
+
+	SwAccessibleNoTextHyperlink( SwAccessibleNoTextFrame *p, const SwFrm* aFrm, sal_uInt16 nIndex = 0xFFFF );
+
+	// XAccessibleAction
+    virtual sal_Int32 SAL_CALL getAccessibleActionCount() 
+		throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL doAccessibleAction( sal_Int32 nIndex ) 
+		throw (::com::sun::star::lang::IndexOutOfBoundsException, 
+				::com::sun::star::uno::RuntimeException);
+    virtual ::rtl::OUString SAL_CALL getAccessibleActionDescription( 
+				sal_Int32 nIndex ) 
+		throw (::com::sun::star::lang::IndexOutOfBoundsException,
+				::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< 
+			::com::sun::star::accessibility::XAccessibleKeyBinding > SAL_CALL
+		   	getAccessibleActionKeyBinding( sal_Int32 nIndex ) 
+		throw (::com::sun::star::lang::IndexOutOfBoundsException, 
+				::com::sun::star::uno::RuntimeException);
+
+	// XAccessibleHyperlink
+    virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleActionAnchor( 
+				sal_Int32 nIndex ) 
+		throw (::com::sun::star::lang::IndexOutOfBoundsException, 
+				::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleActionObject( 
+			sal_Int32 nIndex ) 
+		throw (::com::sun::star::lang::IndexOutOfBoundsException, 
+				::com::sun::star::uno::RuntimeException);
+    virtual sal_Int32 SAL_CALL getStartIndex() 
+		throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Int32 SAL_CALL getEndIndex() 
+		throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL isValid(  ) 
+		throw (::com::sun::star::uno::RuntimeException);
+};
+
+#endif
+

Added: openoffice/branches/capstone2013/main/toolkit/Makefile
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/toolkit/Makefile?rev=1546808&view=auto
==============================================================================
--- openoffice/branches/capstone2013/main/toolkit/Makefile (added)
+++ openoffice/branches/capstone2013/main/toolkit/Makefile Sun Dec  1 12:20:06 2013
@@ -0,0 +1,32 @@
+#**************************************************************
+#  
+#  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!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:

Modified: openoffice/branches/capstone2013/main/toolkit/prj/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/toolkit/prj/makefile.mk?rev=1546808&r1=1546807&r2=1546808&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/toolkit/prj/makefile.mk (original)
+++ openoffice/branches/capstone2013/main/toolkit/prj/makefile.mk Sun Dec  1 12:20:06 2013
@@ -41,4 +41,4 @@ DEBUG_ARGUMENT=
 .ENDIF
 
 all:
-	cd $(PRJ) && $(GNUMAKE) -f Makefile.gb $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) -f Makefile.gb $(VERBOSEFLAG) -r deliverlog
+	cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog

Added: openoffice/branches/capstone2013/main/tools/Makefile
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/tools/Makefile?rev=1546808&view=auto
==============================================================================
--- openoffice/branches/capstone2013/main/tools/Makefile (added)
+++ openoffice/branches/capstone2013/main/tools/Makefile Sun Dec  1 12:20:06 2013
@@ -0,0 +1,32 @@
+#**************************************************************
+#  
+#  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!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:

Modified: openoffice/branches/capstone2013/main/tools/prj/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/tools/prj/makefile.mk?rev=1546808&r1=1546807&r2=1546808&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/tools/prj/makefile.mk (original)
+++ openoffice/branches/capstone2013/main/tools/prj/makefile.mk Sun Dec  1 12:20:06 2013
@@ -41,4 +41,4 @@ DEBUG_ARGUMENT=
 .ENDIF
 
 all:
-	cd $(PRJ) && $(GNUMAKE) -f Makefile.gb $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) -f Makefile.gb $(VERBOSEFLAG) -r deliverlog
+	cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog

Added: openoffice/branches/capstone2013/main/unoxml/Makefile
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/unoxml/Makefile?rev=1546808&view=auto
==============================================================================
--- openoffice/branches/capstone2013/main/unoxml/Makefile (added)
+++ openoffice/branches/capstone2013/main/unoxml/Makefile Sun Dec  1 12:20:06 2013
@@ -0,0 +1,32 @@
+#**************************************************************
+#  
+#  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!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:

Modified: openoffice/branches/capstone2013/main/unoxml/prj/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/unoxml/prj/makefile.mk?rev=1546808&r1=1546807&r2=1546808&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/unoxml/prj/makefile.mk (original)
+++ openoffice/branches/capstone2013/main/unoxml/prj/makefile.mk Sun Dec  1 12:20:06 2013
@@ -41,4 +41,4 @@ DEBUG_ARGUMENT=
 .ENDIF
 
 all:
-	cd $(PRJ) && $(GNUMAKE) -f Makefile.gb $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT)
+	cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT)

Added: openoffice/branches/capstone2013/main/vbahelper/Makefile
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/vbahelper/Makefile?rev=1546808&view=auto
==============================================================================
--- openoffice/branches/capstone2013/main/vbahelper/Makefile (added)
+++ openoffice/branches/capstone2013/main/vbahelper/Makefile Sun Dec  1 12:20:06 2013
@@ -0,0 +1,32 @@
+#**************************************************************
+#  
+#  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!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:

Modified: openoffice/branches/capstone2013/main/vbahelper/prj/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/vbahelper/prj/makefile.mk?rev=1546808&r1=1546807&r2=1546808&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/vbahelper/prj/makefile.mk (original)
+++ openoffice/branches/capstone2013/main/vbahelper/prj/makefile.mk Sun Dec  1 12:20:06 2013
@@ -41,4 +41,4 @@ DEBUG_ARGUMENT=
 .ENDIF
 
 all:
-	cd $(PRJ) && $(GNUMAKE) -f Makefile.gb $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) -f Makefile.gb $(VERBOSEFLAG) -r deliverlog
+	cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog

Modified: openoffice/branches/capstone2013/main/vcl/prj/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/vcl/prj/makefile.mk?rev=1546808&r1=1546807&r2=1546808&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/vcl/prj/makefile.mk (original)
+++ openoffice/branches/capstone2013/main/vcl/prj/makefile.mk Sun Dec  1 12:20:06 2013
@@ -41,4 +41,4 @@ DEBUG_ARGUMENT=
 .ENDIF
 
 all:
-	cd $(PRJ) && $(GNUMAKE) -f Makefile.gb $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT)
+	cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT)

Added: openoffice/branches/capstone2013/main/xmloff/Makefile
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/xmloff/Makefile?rev=1546808&view=auto
==============================================================================
--- openoffice/branches/capstone2013/main/xmloff/Makefile (added)
+++ openoffice/branches/capstone2013/main/xmloff/Makefile Sun Dec  1 12:20:06 2013
@@ -0,0 +1,32 @@
+#**************************************************************
+#  
+#  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!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:

Modified: openoffice/branches/capstone2013/main/xmloff/prj/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/xmloff/prj/makefile.mk?rev=1546808&r1=1546807&r2=1546808&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/xmloff/prj/makefile.mk (original)
+++ openoffice/branches/capstone2013/main/xmloff/prj/makefile.mk Sun Dec  1 12:20:06 2013
@@ -41,4 +41,4 @@ DEBUG_ARGUMENT=
 .ENDIF
 
 all:
-	cd $(PRJ) && $(GNUMAKE) -f Makefile.gb $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) -f Makefile.gb $(VERBOSEFLAG) -r deliverlog
+	cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog



Mime
View raw message