[Libreoffice-commits] core.git: 2 commits - solenv/bin

2013-12-10 Thread Matúš Kukan 
 solenv/bin/modules/installer/download.pm |   21 -
 solenv/bin/modules/installer/epmfile.pm  |5 +++--
 2 files changed, 7 insertions(+), 19 deletions(-)

New commits:
commit 2b1fcd466eea63cd8e694693255b765c863fda8c
Author: Matúš Kukan 
Date:   Tue Dec 10 21:49:57 2013 +0100

Add back check for missing libgetuid.so.

If the library does not work, things like fdo#67388 happen.

Change-Id: I3390fdb6f2cdf24145ddde4466146f91e5dfde82

diff --git a/solenv/bin/modules/installer/download.pm 
b/solenv/bin/modules/installer/download.pm
index d1e74bd..0fee1c7 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -192,7 +192,9 @@ sub call_sum
 
 sub get_path_for_library
 {
-return $ENV{'WORKDIR'} . '/LinkTarget/Library/libgetuid.so';
+my $getuidlibrary = $ENV{'WORKDIR'} . '/LinkTarget/Library/libgetuid.so';
+if ( ! -e $getuidlibrary ) { installer::exiter::exit_program("File 
$getuidlibrary does not exist!", "get_path_for_library"); }
+return $getuidlibrary;
 }
 
 #
diff --git a/solenv/bin/modules/installer/epmfile.pm 
b/solenv/bin/modules/installer/epmfile.pm
index dca6eea..b33aad1 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -794,8 +794,9 @@ sub set_patch_state
 
 sub get_ld_preload_string
 {
-return 'LD_PRELOAD=' . $ENV{'WORKDIR'}
-. '/LinkTarget/Library/libgetuid.so';
+my $getuidlibrary = $ENV{'WORKDIR'} . '/LinkTarget/Library/libgetuid.so';
+if ( ! -e $getuidlibrary ) { installer::exiter::exit_program("File 
$getuidlibrary does not exist!", "get_ld_preload_string"); }
+return 'LD_PRELOAD=' . $getuidlibrary;
 }
 
 #
commit 203e84d434de904add0b4426e87a4eb0a9a50c66
Author: Matúš Kukan 
Date:   Tue Dec 10 21:44:07 2013 +0100

installer: Fix path to libgetuid.so again. Hardcode it.

Hopefully fixes fdo#67388. I can't reproduce here.

Change-Id: I5bcbb59a0f49e925d60f225b0f8f925d6d5dc468

diff --git a/solenv/bin/modules/installer/download.pm 
b/solenv/bin/modules/installer/download.pm
index b678bbf..d1e74bd 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -192,22 +192,7 @@ sub call_sum
 
 sub get_path_for_library
 {
-my ($includepatharrayref) = @_;
-
-my $getuidlibraryname = "libgetuid.so";
-
-my $getuidlibraryref = "";
-
-if ( $installer::globals::include_paths_read )
-{
-$getuidlibraryref = 
installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$getuidlibraryname,
 $includepatharrayref, 0);
-}
-else
-{
-$getuidlibraryref = 
installer::scriptitems::get_sourcepath_from_filename_and_includepath_classic(\$getuidlibraryname,
 $includepatharrayref, 0);
-}
-
-return $$getuidlibraryref;
+return $ENV{'WORKDIR'} . '/LinkTarget/Library/libgetuid.so';
 }
 
 #
@@ -738,7 +723,7 @@ sub create_download_sets
 
 # getting the path of the getuid.so (only required for Solaris and 
Linux)
 my $getuidlibrary = "";
-if (( $installer::globals::issolarisbuild ) || ( 
$installer::globals::islinuxbuild )) { $getuidlibrary = 
get_path_for_library($includepatharrayref); }
+if (( $installer::globals::issolarisbuild ) || ( 
$installer::globals::islinuxbuild )) { $getuidlibrary = get_path_for_library(); 
}
 
 if ( $allvariableshashref->{'OOODOWNLOADNAME'} )
 {
diff --git a/solenv/bin/modules/installer/epmfile.pm 
b/solenv/bin/modules/installer/epmfile.pm
index c81ac99..dca6eea 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -795,7 +795,7 @@ sub set_patch_state
 sub get_ld_preload_string
 {
 return 'LD_PRELOAD=' . $ENV{'WORKDIR'}
-. '/CustomTarget/setup_native/libgetuid.so';
+. '/LinkTarget/Library/libgetuid.so';
 }
 
 #
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - solenv/bin

2014-01-21 Thread Tor Lillqvist 
 solenv/bin/native-code.py |   15 +--
 1 file changed, 9 insertions(+), 6 deletions(-)

New commits:
commit 4917be8a6f0bd650d9259b14af844f9bc081d2fd
Author: Tor Lillqvist 
Date:   Tue Jan 21 15:11:24 2014 +0200

Sort the sections of core_constructor_list for clarity

Change-Id: I845c26d0b69c08e07fb7159fb2bd6862ad9e5603

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 7bbee8a..2c91640 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -51,22 +51,22 @@ core_factory_list = [
 
 core_constructor_list = [
 # framework/util/fwk.component
-"com_sun_star_comp_framework_ModuleManager_get_implementation",
-"com_sun_star_comp_framework_URLTransformer_get_implementation",
-"com_sun_star_comp_framework_Frame_get_implementation",
-"com_sun_star_comp_framework_LayoutManager_get_implementation",
 "com_sun_star_comp_framework_AddonsToolBarFactory_get_implementation",
 "com_sun_star_comp_framework_AutoRecovery_get_implementation",
+"com_sun_star_comp_framework_Frame_get_implementation",
 "com_sun_star_comp_framework_JobExecutor_get_implementation",
+"com_sun_star_comp_framework_LayoutManager_get_implementation",
+"com_sun_star_comp_framework_ModuleManager_get_implementation",
 "com_sun_star_comp_framework_StatusIndicatorFactory_get_implementation",
+"com_sun_star_comp_framework_URLTransformer_get_implementation",
 # sax/source/expatwrap/expwrap.component
-"com_sun_star_comp_extensions_xml_sax_ParserExpat_get_implementation",
 "com_sun_star_comp_extensions_xml_sax_FastParser_get_implementation",
+"com_sun_star_comp_extensions_xml_sax_ParserExpat_get_implementation",
 # sfx2/util/sfx.component
+"SfxDocumentMetaData_get_implementation",
+"com_sun_star_comp_office_FrameLoader_get_implementation",
 "com_sun_star_comp_sfx2_DocumentTemplates_get_implementation",
 "com_sun_star_comp_sfx2_GlobalEventBroadcaster_get_implementation",
-"com_sun_star_comp_office_FrameLoader_get_implementation",
-"SfxDocumentMetaData_get_implementation",
 # svtools/util/svt.component
 "com_sun_star_comp_graphic_GraphicProvider_get_implementation",
 # svx/util/svx.component
commit e683bb91915ac52743659bc0434a73ab8eab05b9
Author: Tor Lillqvist 
Date:   Tue Jan 21 15:08:26 2014 +0200

Add fwk AutoRecovery, JobExecutor and StatusIndicatorFactory ctors to "core"

Seem to be needed by TiledLibreOffice at least, so possibly by any
app.

Change-Id: I52d4e6f4ce66e2a79b67e1f17ba926defd4ac8eb

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 9e8f1a2..7bbee8a 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -56,6 +56,9 @@ core_constructor_list = [
 "com_sun_star_comp_framework_Frame_get_implementation",
 "com_sun_star_comp_framework_LayoutManager_get_implementation",
 "com_sun_star_comp_framework_AddonsToolBarFactory_get_implementation",
+"com_sun_star_comp_framework_AutoRecovery_get_implementation",
+"com_sun_star_comp_framework_JobExecutor_get_implementation",
+"com_sun_star_comp_framework_StatusIndicatorFactory_get_implementation",
 # sax/source/expatwrap/expwrap.component
 "com_sun_star_comp_extensions_xml_sax_ParserExpat_get_implementation",
 "com_sun_star_comp_extensions_xml_sax_FastParser_get_implementation",
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - solenv/bin

2013-10-31 Thread Stephan Bergmann 
 solenv/bin/modules/installer/scriptitems.pm   |2 +-
 solenv/bin/modules/installer/simplepackage.pm |5 +
 2 files changed, 2 insertions(+), 5 deletions(-)

New commits:
commit 42f8c6feccb3168d1a39683497e7a6ec6e7215a8
Author: Stephan Bergmann 
Date:   Thu Oct 31 22:00:57 2013 +0100

Disambiguate where a "Source for ... not found!" error originates from

Change-Id: I424036d3a940fa53b1553c1c539bf1065cdc2759

diff --git a/solenv/bin/modules/installer/scriptitems.pm 
b/solenv/bin/modules/installer/scriptitems.pm
index b3d106a..fe767f7 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -916,7 +916,7 @@ sub get_sourcepath_from_filename_and_includepath_classic
 $onefile = "";  # the sourcepath has to be empty
 if ( $write_logfile)
 {
-$infoline = "ERROR: Source for $$searchfilenameref not found!\n";  
  # Important message in log file
+$infoline = "ERROR: Source for $$searchfilenameref not found 
(classic)!\n";# Important message in log file
 push( @installer::globals::logfileinfo, $infoline);
 }
 }
commit 2208fca2feb0360af95c7cb1bbe663577084bd15
Author: Stephan Bergmann 
Date:   Thu Oct 31 21:59:04 2013 +0100

$installer::globals::macinstallfilename is already an absolute pathname

Change-Id: I35ced0ef75f6b411807f24ecc19b4f2a9622f98c

diff --git a/solenv/bin/modules/installer/simplepackage.pm 
b/solenv/bin/modules/installer/simplepackage.pm
index 8ed693f..da58b40 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -345,15 +345,12 @@ sub create_package
 my $scripthelperfilename = $ENV{'SRCDIR'} . 
"/setup_native/scripts/mac_install.script";
 # my $scripthelperrealfilename = $volume_name;
 my $scripthelperrealfilename = $volume_name_classic_app;
-my $translationfilename = $installer::globals::macinstallfilename;
 
 # Finding both files in source tree
 
 my $scriptref = $ENV{'SRCDIR'} . "/setup_native/scripts/" . 
$scriptfilename;
 if (! -f $scriptref) { installer::exiter::exit_program("ERROR: 
Could not find Apple script $scriptfilename ($scriptref)!", "create_package"); }
 if (! -f $scripthelperfilename) { 
installer::exiter::exit_program("ERROR: Could not find Apple script 
$scripthelperfilename!", "create_package"); }
-my $translationfileref = 
installer::scriptitems::get_sourcepath_from_filename_and_includepath( 
\$translationfilename, $includepatharrayref, 0);
-if ($$translationfileref eq "") { 
installer::exiter::exit_program("ERROR: Could not find Apple script translation 
file $translationfilename ( includepatharrayref = $includepatharrayref )", 
"create_package"); }
 
 $scriptfilename = $contentsfolder . "/" . $scriptrealfilename;
 $scripthelperrealfilename = $contentsfolder . "/" . 
$scripthelperrealfilename;
@@ -364,7 +361,7 @@ sub create_package
 # Replacing variables in script $scriptfilename
 # Localizing script $scriptfilename
 my $scriptfilecontent = 
installer::files::read_file($scriptfilename);
-my $translationfilecontent = 
installer::files::read_file($$translationfileref);
+my $translationfilecontent = 
installer::files::read_file($installer::globals::macinstallfilename);
 localize_scriptfile($scriptfilecontent, $translationfilecontent, 
$languagestringref);
 # replace_variables_in_scriptfile($scriptfilecontent, 
$volume_name, $allvariables);
 replace_variables_in_scriptfile($scriptfilecontent, 
$volume_name_classic, $volume_name_classic_app, $allvariables);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - solenv/bin

2014-02-10 Thread Tor Lillqvist 
 solenv/bin/native-code.py |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 166ee2b27416a4bccfae8651e13b408acf2e8eca
Author: Tor Lillqvist 
Date:   Tue Feb 11 09:23:57 2014 +0200

Add 
css_comp_framework_ModuleUIConfigurationManagerSupplier_get_implementation

Change-Id: Ib0fc337b1a2e57ddd6ec9d5dcc468daafbcb0501

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index aeb76a8..965afe5 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -54,6 +54,7 @@ core_constructor_list = [
 "com_sun_star_comp_framework_LayoutManager_get_implementation",
 "com_sun_star_comp_framework_ModuleManager_get_implementation",
 
"com_sun_star_comp_framework_ModuleUIConfigurationManager_get_implementation",
+
"com_sun_star_comp_framework_ModuleUIConfigurationManagerSupplier_get_implementation",
 "com_sun_star_comp_framework_PathSettings_get_implementation",
 "com_sun_star_comp_framework_PathSubstitution_get_implementation",
 "com_sun_star_comp_framework_StatusIndicatorFactory_get_implementation",
commit 124bec81b3f4e807cebfcbdc7d98c585d8b1be58
Author: Tor Lillqvist 
Date:   Tue Feb 11 09:20:03 2014 +0200

Need XMLVersionListPersistence_get_implementation

Change-Id: Ideff360fe173c2809b6cc839b54a0839100b2b70

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 3883a8d..aeb76a8 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -91,6 +91,8 @@ core_constructor_list = [
 "stardiv_Toolkit_VCLXToolkit_get_implementation",
 # uui/util/uui.component
 "com_sun_star_comp_uui_UUIInteractionHandler_get_implementation",
+# xmloff/util/xo.component
+"XMLVersionListPersistence_get_implementation",
 ]
 
 extended_core_factory_list = core_factory_list + [
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - solenv/bin

2013-03-12 Thread Luboš Luňák 
 solenv/bin/update_pch.sh |   11 ++-
 1 file changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 7ac75351f16358fd0f9d83162eda25cca6de2622
Author: Luboš Luňák 
Date:   Tue Mar 12 17:23:18 2013 +0100

mention that temporary edits in autogenerated pch headers are ok

Change-Id: Ifafa5c8847dec80a3b80afc5e10044f9c1c8d48a

diff --git a/solenv/bin/update_pch.sh b/solenv/bin/update_pch.sh
index 84ff445..39569f7 100755
--- a/solenv/bin/update_pch.sh
+++ b/solenv/bin/update_pch.sh
@@ -91,6 +91,13 @@ function list_file_includes()
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+/*
+ This file has been autogenerated by update_pch.sh . It is possible to edit it
+ manually (such as when an include file has been moved/renamed/removed. All 
such
+ manual changes will be rewritten by the next run of update_pch.sh (which 
presumably
+ also fixes all possible problems, so it's usually better to use it).
+*/
+
 EOF
 
 # Library_svx needs this (sendreportw32.cxx)
commit 2b26ac2efca151ce00af66db9a57eea351fbd947
Author: Luboš Luňák 
Date:   Tue Mar 12 17:22:32 2013 +0100

do not require full path when passing a pch header file to update

Change-Id: Ie1b0588cf6424e836f865cda9d4451aa0e1db32d

diff --git a/solenv/bin/update_pch.sh b/solenv/bin/update_pch.sh
index fdb17a7a..84ff445 100755
--- a/solenv/bin/update_pch.sh
+++ b/solenv/bin/update_pch.sh
@@ -7,6 +7,8 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
+# Usage: update_pch.sh [precompiled_xxx.hxx]
+
 root=`dirname $0`
 root=`cd $root/../.. && pwd`
 
@@ -19,7 +21,7 @@ fi
 for x in $headers; do
 header=$x
 echo updating `echo $header | sed -e s%$root/%%`
-module=`echo $header | sed -e s%$root/%% -e s%/.*%%`
+module=`readlink -f $header | sed -e s%$root/%% -e s%/.*%%`
 name=`echo $header | sed -e s/.*precompiled_// -e s/\.hxx//`
 makefile="Library_$name.mk"
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - solenv/bin

2013-02-12 Thread Stephan Bergmann 
 solenv/bin/modules/installer/download.pm |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 9b2a01c1ca59ab88cf0f947a3d265c0e7d165340
Author: Stephan Bergmann 
Date:   Tue Feb 12 09:12:29 2013 +0100

A missing getuid.so is not fatal

...all the places that would LD_PRELOAD it check for it being set anyway.

Change-Id: I7937771e635654ae370e4f57ea9fa783ae7dad7f

diff --git a/solenv/bin/modules/installer/download.pm 
b/solenv/bin/modules/installer/download.pm
index 0f62eaa..56606e8 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -216,8 +216,6 @@ sub get_path_for_library
 $getuidlibraryref = 
installer::scriptitems::get_sourcepath_from_filename_and_includepath_classic(\$getuidlibraryname,
 $includepatharrayref, 0);
 }
 
-if ($$getuidlibraryref eq "") { installer::exiter::exit_program("ERROR: 
Could not find $getuidlibraryname!", "get_path_for_library"); }
-
 return $$getuidlibraryref;
 }
 
commit 9a38118b12113579a2eb8c794f97db27e992
Author: Stephan Bergmann 
Date:   Tue Feb 12 09:16:29 2013 +0100

call_sum has only one parameter

Change-Id: Ib8925506c3ea08f2166483b9e902484ef8dd60f6

diff --git a/solenv/bin/modules/installer/download.pm 
b/solenv/bin/modules/installer/download.pm
index ca39a96..0f62eaa 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -165,7 +165,7 @@ sub put_checksum_and_size_into_script
 
 sub call_sum
 {
-my ($filename, $getuidlibrary) = @_;
+my ($filename) = @_;
 
 my $systemcall = "/usr/bin/sum $filename |";
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - solenv/bin

2013-05-23 Thread Michael Meeks 
 solenv/bin/modules/installer/control.pm |   12 +++-
 1 file changed, 7 insertions(+), 5 deletions(-)

New commits:
commit 9490a5575320d06079f55869631f90ce80ecc6d3
Author: Michael Meeks 
Date:   Thu May 23 11:32:33 2013 +0100

further cleanup to tolerate DOS line endings.

Change-Id: I60345ed3eed84ef197bf145f2b26dfa8afdc51b1

diff --git a/solenv/bin/modules/installer/control.pm 
b/solenv/bin/modules/installer/control.pm
index 67dd193..a45ffcd 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -431,8 +431,10 @@ sub read_lcidlist
 for ( my $i = 0; $i <= $#{$lcidlist}; $i++ )
 {
 my $line = ${$lcidlist}[$i];
-
-$line =~ s/\#.*$//; # removing comments after "#"
+# de-mangle various potential DOS line-ending problems
+$line =~ s/\r//g;
+$line =~ s/\n//g;
+$line =~ s/\s*\#.*$//; # removing comments after "#"
 if ( $line =~ /^\s*$/ ) { next; }  # this is an empty line
 
 if ( $line =~ /^\s*([\w-]+)\s+(\d+)\s+(\d+)\s*$/ )
commit 197529947593132daf7a6e9dffa7c34e4203a393
Author: Michael Meeks 
Date:   Thu May 23 10:09:35 2013 +0100

attempted blind fix of msi encoding parsing issue.

Change-Id: Iae582b8733254233517dbbf20a9293041b2f9b6d

diff --git a/solenv/bin/modules/installer/control.pm 
b/solenv/bin/modules/installer/control.pm
index 7600754..67dd193 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -432,10 +432,10 @@ sub read_lcidlist
 {
 my $line = ${$lcidlist}[$i];
 
-if ( $line =~ /^\s*\#/ ) { next; }  # this is a comment line
-if ( $line =~ /^$/ ) { next; }  # this is an empty line
-if ( $line =~ /^(.*?)(\#.*)$/ ) { $line = $1; } # removing comments 
after "#"
-if ( $line =~ /^\s*([\w-]+)\s*(\d+)\s*(\d+)\s*$/ )
+$line =~ s/\#.*$//; # removing comments after "#"
+if ( $line =~ /^\s*$/ ) { next; }  # this is an empty line
+
+if ( $line =~ /^\s*([\w-]+)\s+(\d+)\s+(\d+)\s*$/ )
 {
 my $onelanguage = $1;
 my $windowslanguage = $3;
@@ -443,7 +443,7 @@ sub read_lcidlist
 }
 else
 {
-installer::exiter::exit_program("ERROR: Wrong syntax in Windows 
LCID list $installer::globals::lcidlistname in line $i.", "read_lcidlist");
+installer::exiter::exit_program("ERROR: Wrong syntax in Windows 
LCID list $installer::globals::lcidlistname in line $i: '$line'", 
"read_lcidlist");
 }
 }
 $installer::globals::msilanguage = \%msilanguage;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - solenv/bin sw/qa

2013-06-16 Thread Miklos Vajna 
 solenv/bin/modules/installer/scriptitems.pm |3 ---
 sw/qa/extras/inc/swmodeltestbase.hxx|2 ++
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit c03a1e46460e4255d7709df9ba8147947f66acfb
Author: Miklos Vajna 
Date:   Sun Jun 16 11:13:30 2013 +0200

SwModelTestBase: fix for leaking temporary files

This alone pushes down the number of created /tmp/lu* from 527 to 2
after a single run. Regression from
9b53538a076a2370df975655c8579dfe09cff09b.

Change-Id: I5ea2e3da0b89223fb32469af3d59a2a3b246d00f
Helped-by: Markus Mohrhard 

diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx 
b/sw/qa/extras/inc/swmodeltestbase.hxx
index 9f8d8b5..38c5a47 100644
--- a/sw/qa/extras/inc/swmodeltestbase.hxx
+++ b/sw/qa/extras/inc/swmodeltestbase.hxx
@@ -264,6 +264,8 @@ protected:
 
 void load(const char* pDir, const char* pName, bool bCalcLayout = true)
 {
+if (mxComponent.is())
+mxComponent->dispose();
 // Output name early, so in the case of a hang, the name of the 
hanging input file is visible.
 std::cerr << pName << ",";
 m_nStartTime = osl_getGlobalTimer();
commit 216fe5cf3c41713fa2a11731e4c3d514236b2480
Author: Miklos Vajna 
Date:   Sun Jun 16 01:41:20 2013 +0200

solenv: fix missing last char of the git hash in the about dialog

When 918695a2bf8f95fd437071bfc6ac59e446c256f8 introduced this, we were
having a "foo-bar-baz-"-like hash, and removing the last char made
sense.  Since we then switched to 'git log -n 1 --pretty=format:"%H"'
from './g -s log -n 1 --pretty=format:%h-', this is just no longer
necessary.

Change-Id: Icee0d38e5bd917163d678df5cb12c36902460c7b

diff --git a/solenv/bin/modules/installer/scriptitems.pm 
b/solenv/bin/modules/installer/scriptitems.pm
index 52aedf9..b22391d 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -667,9 +667,6 @@ sub replace_setup_variables
 if ($? || !$buildidstring) {
 $buildidstring = $localbuild . $localminor . "(Build:" . 
$installer::globals::buildid . ")";
 }
-else {
-$buildidstring = substr($buildidstring, 0, -1);
-}
 
 if ( $localminor =~ /^\s*\w(\d+)\w*\s*$/ ) { $localminor = $1; }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - solenv/bin solenv/gbuild

2013-06-18 Thread Bjoern Michaelsen 
 solenv/bin/concat-deps.c  |  115 ++
 solenv/gbuild/AllLangResTarget.mk |3 
 solenv/gbuild/LinkTarget.mk   |   51 +++-
 solenv/gbuild/SdiTarget.mk|   14 +++-
 solenv/gbuild/UnoApiTarget.mk |   15 
 5 files changed, 163 insertions(+), 35 deletions(-)

New commits:
commit 66a0713dc9c676182fcd7aa1e21f8dc25c05be5e
Author: Bjoern Michaelsen 
Date:   Sun Jun 16 05:01:45 2013 +0200

handle missing dep files in concat-deps

* this and Ib4762f5a260035f00b5e68cf45b687fdf02e9c02 reduces a default
  build on my machine from 2min25sec to 2min12sec
* without unitchecks, its down to 1min50sec now
* it reduces the build time on a i7-4770 Windows tinderbox from 99min to
  89min
* by now it also takes care of avoiding most string copying, although
  this can certainly be considered overeager given that the file
  creation on Windows took ~250ms per file before and still will take a
  lot longer than any string operation with this change

Change-Id: I515432bdefe2b055c78b6ba97868adbde65d9165

diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c
index 3613946..c60beeb 100644
--- a/solenv/bin/concat-deps.c
+++ b/solenv/bin/concat-deps.c
@@ -118,6 +118,7 @@
 int internal_boost = 0;
 static char* base_dir;
 static char* work_dir;
+int work_dir_len;
 
 #ifdef __GNUC__
 #define clz __builtin_clz
@@ -864,6 +865,44 @@ static inline char * eat_space_at_end(char * end)
 return real_end;
 }
 
+static char* phony_content_buffer;
+static inline char* generate_phony_line(char* phony_target, char* extension)
+{
+char* src;
+char* dest;
+char* last_dot;
+//fprintf(stderr, "generate_phony_line called with phony_target %s and 
extension %s\n", phony_target, extension);
+for(dest = phony_content_buffer+work_dir_len, src = phony_target; *src != 
0; ++src, ++dest)
+{
+*dest = *src;
+if(*dest == '.')
+{
+last_dot = dest;
+}
+}
+//fprintf(stderr, "generate_phony_line after phony_target copy: %s\n", 
phony_content_buffer);
+for(dest = last_dot+1, src = extension; *src != 0; ++src, ++dest)
+{
+*dest = *src;
+}
+//fprintf(stderr, "generate_phony_line after extension add: %s\n", 
phony_content_buffer);
+strcpy(dest, ": $(gb_Helper_PHONY)\n");
+//fprintf(stderr, "generate_phony_line after phony add: %s\n", 
phony_content_buffer);
+return phony_content_buffer;
+}
+
+static inline int generate_phony_file(char* fn, char* content)
+{
+FILE* depfile;
+depfile = fopen(fn, "w");
+if(depfile)
+{
+fputs(content, depfile);
+fclose(depfile);
+}
+return !depfile;
+}
+
 static int _process(struct hash* dep_hash, char* fn)
 {
 int rc;
@@ -872,6 +911,8 @@ char* end;
 char* cursor;
 char* cursor_out;
 char* base;
+char* created_line;
+char* src_relative;
 int continuation = 0;
 char last_ns = 0;
 off_t size;
@@ -985,6 +1026,75 @@ off_t size;
 }
 }
 }
+else
+{
+if(strncmp(fn, work_dir, work_dir_len) == 0)
+{
+if(strncmp(fn+work_dir_len, "/Dep/", 5) == 0)
+{
+src_relative = fn+work_dir_len+5;
+// cases ordered by frequency
+if(strncmp(src_relative, "CxxObject/", 10) == 0)
+{
+created_line = generate_phony_line(src_relative+10, "o");
+rc = generate_phony_file(fn, created_line);
+}
+else if(strncmp(fn+work_dir_len+5, "UnoApiPartTarget/", 17) == 
0)
+{
+created_line = generate_phony_line(src_relative+17, "urd");
+rc = generate_phony_file(fn, created_line);
+}
+else if(strncmp(fn+work_dir_len+5, "SrsPartTarget/", 14) == 0)
+{
+created_line = generate_phony_line(src_relative+14, "");
+rc = generate_phony_file(fn, created_line);
+}
+else if(strncmp(src_relative, "GenCxxObject/", 13) == 0)
+{
+created_line = generate_phony_line(src_relative+13, "o");
+rc = generate_phony_file(fn, created_line);
+}
+else if(strncmp(src_relative, "CObject/", 8) == 0)
+{
+created_line = generate_phony_line(src_relative+8, "o");
+rc = generate_phony_file(fn, created_line);
+}
+else if(strncmp(src_relative, "GenCObject/", 11) == 0)
+{
+created_line = generate_phony_line(src_relative+11, "o");
+rc = generate_phony_file(fn, created_line);
+}
+else if(strncmp(src_relative, "SdiObject/", 10) == 0)
+{
+created_line = generate_phony_line(src_relative+10, "

[Libreoffice-commits] core.git: 2 commits - solenv/bin sw/source

2014-03-24 Thread Tor Lillqvist 
 solenv/bin/native-code.py  |3 +++
 sw/source/core/view/viewsh.cxx |   12 
 2 files changed, 15 insertions(+)

New commits:
commit e5a6c3230e0593cc581267a4badb3409d4f01675
Author: Tor Lillqvist 
Date:   Thu Mar 20 09:32:21 2014 +0200

After Tsahi's "connect tile device to DrawLayer" we need some more 
components

Change-Id: I4a5784a63d3bcc8af3b50e51e410744d8b185be9

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index a1c7098..a6a21ce 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -26,6 +26,7 @@ core_factory_list = [
 ("libconfigmgrlo.a", "configmgr_component_getFactory"),
 ("libdrawinglayerlo.a", "drawinglayer_component_getFactory"),
 ("libfilterconfiglo.a", "filterconfig1_component_getFactory"),
+("libfrmlo.a", "frm_component_getFactory"),
 ("libfsstoragelo.a", "fsstorage_component_getFactory"),
 ("libhyphenlo.a", "hyphen_component_getFactory"),
 ("libi18npoollo.a", "i18npool_component_getFactory"),
@@ -103,6 +104,8 @@ core_constructor_list = [
 # stoc/source/inspect/introspection.component
 "com_sun_star_comp_stoc_Introspection_get_implementation",
 # toolkit/util/tk.component
+"stardiv_Toolkit_UnoControlContainer_get_implementation",
+"stardiv_Toolkit_UnoControlContainerModel_get_implementation",
 "stardiv_Toolkit_VCLXToolkit_get_implementation",
 # uui/util/uui.component
 "com_sun_star_comp_uui_UUIInteractionHandler_get_implementation",
commit f04907b4dd843a202a951f23d15532265605dac5
Author: tsahi glik 
Date:   Mon Mar 10 17:24:34 2014 -0700

connect tile device to DrawLayer

Change-Id: I4a2a7683a218103fc25d9b55786a5e77e49570fc

diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index aad5f47..8c144f9 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -1768,12 +1768,24 @@ void SwViewShell::PaintTile(VirtualDevice &rDevice, int 
contextWidth, int contex
 aMapMode.SetScaleY(scaleY);
 rDevice.SetMapMode(aMapMode);
 
+// Update this device in DrawLayer
+if (Imp()->GetDrawView())
+{
+Imp()->GetDrawView()->AddWindowToPaintView(&rDevice);
+}
+
 // scroll the requested area into view if necessary
 MakeVisible(SwRect(Point(tilePosX, tilePosY), 
rDevice.PixelToLogic(Size(contextWidth, contextHeight;
 
 // draw - works in logic coordinates
 Paint(Rectangle(Point(tilePosX, tilePosY), 
rDevice.PixelToLogic(Size(contextWidth, contextHeight;
 
+// Remove this device in DrawLayer
+if (Imp()->GetDrawView())
+{
+Imp()->GetDrawView()->DeleteWindowFromPaintView(&rDevice);
+}
+
 // SwViewShell's output device tear down
 mpOut = pSaveOut;
 mbTiledRendering = false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - solenv/bin solenv/gbuild

2014-01-29 Thread Tor Lillqvist 
 solenv/bin/native-code.py |4 
 solenv/gbuild/platform/IOS_ARM_GCC.mk |2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 1b7405bf11ccc4e3c081044b93ae1271a0bf2ca6
Author: Tor Lillqvist 
Date:   Wed Jan 29 15:22:09 2014 +0200

TiledLibreOffice needs more constructors

Change-Id: I8b3408e6fdd9e5bb01c8a366ef16a91bf33e64ba

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 7931aa4..3952ab5 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -55,8 +55,12 @@ core_constructor_list = [
 "com_sun_star_comp_framework_JobExecutor_get_implementation",
 "com_sun_star_comp_framework_LayoutManager_get_implementation",
 "com_sun_star_comp_framework_ModuleManager_get_implementation",
+
"com_sun_star_comp_framework_ModuleUIConfigurationManager_get_implementation",
 "com_sun_star_comp_framework_PathSettings_get_implementation",
 "com_sun_star_comp_framework_StatusIndicatorFactory_get_implementation",
+"com_sun_star_comp_framework_ToolBarControllerFactory_get_implementation",
+"com_sun_star_comp_framework_UIConfigurationManager_get_implementation",
+"com_sun_star_comp_framework_UIElementFactoryManager_get_implementation",
 "com_sun_star_comp_framework_URLTransformer_get_implementation",
 # i18npool/util/i18npool.component
 "com_sun_star_i18n_BreakIterator_get_implementation",
commit 79d7abe86908d5d8d267fa74ba9b5d7eba192fec
Author: Tor Lillqvist 
Date:   Wed Jan 29 15:18:06 2014 +0200

-fobjc_link_runtime seems bogus

Change-Id: I86a294f699a1277addb2dc0bee5acc3b1a39a687

diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk 
b/solenv/gbuild/platform/IOS_ARM_GCC.mk
index ffcc1e9..8d8406a 100644
--- a/solenv/gbuild/platform/IOS_ARM_GCC.mk
+++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk
@@ -103,7 +103,7 @@ define gb_LinkTarget__command_dynamiclink
$(gb_Executable_TARGETTYPEFLAGS) \
$(subst \d,$$,$(RPATH)) \
$(T_LDFLAGS) \
-   -dead_strip -fobjc_link_runtime \
+   -dead_strip \
$(foreach object,$(COBJECTS),$(call 
gb_CObject_get_target,$(object))) \
$(foreach object,$(CXXOBJECTS),$(call 
gb_CxxObject_get_target,$(object))) \
$(foreach object,$(ASMOBJECTS),$(call 
gb_AsmObject_get_target,$(object))) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - solenv/bin sw/Library_swd.mk sw/source

2014-01-09 Thread Matúš Kukan 
 solenv/bin/native-code.py|   76 ++-
 sw/Library_swd.mk|1 
 sw/source/filter/basflt/iodetect.cxx |6 ++
 sw/source/ui/uno/swdet2.cxx  |   71 
 sw/source/ui/uno/swdetect.cxx|   36 +++-
 5 files changed, 96 insertions(+), 94 deletions(-)

New commits:
commit fc1762f96540e18561fbc93c28a36e37ca6e6168
Author: Matúš Kukan 
Date:   Thu Jan 9 09:54:38 2014 +0100

Merge these source files. Also move a function to where it's used.

Change-Id: Ia0378a58c63364a73c40dd901d93e20a596a4c29

diff --git a/sw/Library_swd.mk b/sw/Library_swd.mk
index 477bcea..fd53b7b 100644
--- a/sw/Library_swd.mk
+++ b/sw/Library_swd.mk
@@ -56,7 +56,6 @@ $(eval $(call gb_Library_use_libraries,swd,\
 $(eval $(call gb_Library_add_exception_objects,swd,\
 sw/source/filter/basflt/iodetect \
 sw/source/ui/uno/detreg \
-sw/source/ui/uno/swdet2 \
 sw/source/ui/uno/swdetect \
 ))
 
diff --git a/sw/source/filter/basflt/iodetect.cxx 
b/sw/source/filter/basflt/iodetect.cxx
index 2a1ad72..a71587e 100644
--- a/sw/source/filter/basflt/iodetect.cxx
+++ b/sw/source/filter/basflt/iodetect.cxx
@@ -24,8 +24,12 @@
 #include 
 #include 
 #include 
+#include 
 
-bool IsDocShellRegistered();
+static bool IsDocShellRegistered()
+{
+return SvtModuleOptions().IsWriter();
+}
 
 SwIoDetect aFilterDetect[] =
 {
diff --git a/sw/source/ui/uno/swdet2.cxx b/sw/source/ui/uno/swdet2.cxx
deleted file mode 100644
index 0eacb62..000
--- a/sw/source/ui/uno/swdet2.cxx
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   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 .
- */
-
-#include "rtl/ustring.hxx"  // for OUString, operator==
-#include "sal/types.h"  // for sal_Bool
-#include "tools/errcode.hxx"// for ERRCODE_ABORT, ERRCODE_NONE
-#include "tools/solar.h"// for sal_uLong
-
-#include 
-#include 
-#include 
-#include 
-#include 
-
-#include 
-
-bool IsDocShellRegistered()
-{
-return SvtModuleOptions().IsWriter();
-}
-
-sal_uLong SwFilterDetect::DetectFilter( SfxMedium& rMedium, const SfxFilter** 
ppFilter )
-{
-sal_uLong nRet = ERRCODE_NONE;
-if( *ppFilter )
-{
-// verify the given filter
-OUString aPrefFlt = (*ppFilter)->GetUserData();
-
-// detection for TextFilter needs an additional checking
-sal_Bool bDetected = SwIoSystem::IsFileFilter(rMedium, aPrefFlt);
-return bDetected ? nRet : ERRCODE_ABORT;
-}
-
-// mba: without preselection there is no PrefFlt
-OUString aPrefFlt;
-const SfxFilter* pTmp = SwIoSystem::GetFileFilter( 
rMedium.GetPhysicalName(), aPrefFlt, &rMedium );
-if( !pTmp )
-return ERRCODE_ABORT;
-
-else
-{
-//Bug 41417: JP 09.07.97: HTML documents should be loaded by WebWriter
-SfxFilterContainer aFilterContainer( OUString("swriter/web") );
-if( !pTmp->GetUserData().equals(sHTML) ||
-pTmp->GetServiceName() == "com.sun.star.text.WebDocument" ||
-0 == ( (*ppFilter) = SwIoSystem::GetFilterOfFormat( 
OUString(sHTML),
-&aFilterContainer ) ) )
-*ppFilter = pTmp;
-}
-
-return nRet;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/uno/swdetect.cxx b/sw/source/ui/uno/swdetect.cxx
index bdfd354..81a0f11 100644
--- a/sw/source/ui/uno/swdetect.cxx
+++ b/sw/source/ui/uno/swdetect.cxx
@@ -56,8 +56,7 @@
 #include 
 #include 
 #include 
-
-#include 
+#include 
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -418,6 +417,39 @@ OUString SAL_CALL SwFilterDetect::detect( Sequence< 
PropertyValue >& lDescriptor
 return aTypeName;
 }
 
+sal_uLong SwFilterDetect::DetectFilter( SfxMedium& rMedium, const SfxFilter** 
ppFilter )
+{
+sal_uLong nRet = ERRCODE_NONE;
+if( *ppFilter )
+{
+// verify the given filter
+OUString aPrefFlt = (*ppFilter)->GetUserData();
+
+// detection for TextFilter needs an additional checking
+sal_Bool bDetected = SwIoSystem::IsFile

[Libreoffice-commits] core.git: 2 commits - solenv/bin solenv/gbuild sw/qa

2013-04-18 Thread Miklos Vajna 
 solenv/bin/gdb-core-bt.sh|3 ++-
 solenv/gbuild/CppunitTest.mk |4 ++--
 solenv/gbuild/platform/solaris.mk|2 +-
 solenv/gbuild/platform/unxgcc.mk |2 +-
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx |   11 +++
 5 files changed, 17 insertions(+), 5 deletions(-)

New commits:
commit 29b59f2e87d1b00ab6a1f4cc4e960603974992bc
Author: Miklos Vajna 
Date:   Thu Apr 18 12:05:10 2013 +0200

gdb-core-bt: don't talk about core files without a reason.

When exit code is <128, then the test probably just failed, it did not
get a SIGSEGV or similar signal, so it's expected that no core file is
created.

Change-Id: Ie9e3599bd6738c04afacb95000d09f9dd2a5c426

diff --git a/solenv/bin/gdb-core-bt.sh b/solenv/bin/gdb-core-bt.sh
index 4cbcf52..52ed3a3 100755
--- a/solenv/bin/gdb-core-bt.sh
+++ b/solenv/bin/gdb-core-bt.sh
@@ -30,6 +30,7 @@
 
 EXECUTABLE=${1}
 COREDIR=${2}
+EXITCODE=${3}
 
 if test -n "$(which gdb)"
 then
@@ -45,7 +46,7 @@ then
 rm "$GDBCOMMANDFILE"
 echo
 exit 0
-else
+elif [ $EXITCODE -ge 128 ]; then
 echo
 echo "No core file identified in directory ${COREDIR}"
 echo "To show backtraces for crashes during test execution,"
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 61cd717..a4478ee 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -97,9 +97,9 @@ $(call gb_CppunitTest_get_target,%) :| 
$(gb_CppunitTest_CPPTESTDEPS)
$(call gb_CppunitTest__make_args) \
$(if $(gb_CppunitTest__interactive),, \
> $@.log 2>&1 \
-   || (cat $@.log && $(UNIT_FAILED_MSG) \
+   || (RET=$$? && cat $@.log && $(UNIT_FAILED_MSG) \
$(if $(value gb_CppunitTest_postprocess), \
-   && $(call 
gb_CppunitTest_postprocess,$(gb_CppunitTest_CPPTESTCOMMAND),$@.core)) \
+   && $(call 
gb_CppunitTest_postprocess,$(gb_CppunitTest_CPPTESTCOMMAND),$@.core,$$RET)) \
&& false
 
 define gb_CppunitTest_CppunitTest
diff --git a/solenv/gbuild/platform/solaris.mk 
b/solenv/gbuild/platform/solaris.mk
index cfcca9e..965b2ef 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -342,7 +342,7 @@ $(call gb_LinkTarget_get_target,$(2)) : RPATH :=
 endef
 
 define gb_CppunitTest_postprocess
-$(SRCDIR)/solenv/bin/gdb-core-bt.sh $(1) $(2)
+$(SRCDIR)/solenv/bin/gdb-core-bt.sh $(1) $(2) $(3)
 endef
 
 # JunitTest class
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 0bcd366..ab54e27 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -339,7 +339,7 @@ $(call gb_LinkTarget_get_target,$(2)) : RPATH :=
 endef
 
 define gb_CppunitTest_postprocess
-$(SRCDIR)/solenv/bin/gdb-core-bt.sh $(1) $(2)
+$(SRCDIR)/solenv/bin/gdb-core-bt.sh $(1) $(2) $(3)
 endef
 
 # JunitTest class
commit 54d0673ba422d6408d8b2d39493a3a7bb4f56037
Author: Miklos Vajna 
Date:   Thu Apr 18 11:51:58 2013 +0200

testcase for 35b75ed510f49ff64cd86b38e228c2b5b9a9f3fc

Change-Id: Ib734717cdc293b3921c94f93b1d6d0d5e07120d5

diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 7c4051c..b8addac 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -124,6 +124,7 @@ public:
 void testFdo60922();
 void testFdo59273();
 void testTableWidth();
+void testConditionalstylesTbllook();
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX) && !defined(WNT)
@@ -199,6 +200,7 @@ void Test::run()
 {"fdo60922.docx", &Test::testFdo60922},
 {"fdo59273.docx", &Test::testFdo59273},
 {"table_width.docx", &Test::testTableWidth},
+{"conditionalstyles-tbllook.docx", 
&Test::testConditionalstylesTbllook},
 };
 header();
 for (unsigned int i = 0; i < SAL_N_ELEMENTS(aMethods); ++i)
@@ -1313,6 +1315,15 @@ void Test::testTableWidth()
 CPPUNIT_ASSERT_EQUAL(true, 
bool(getProperty(xTables->getByIndex(0), "IsWidthRelative")));
 }
 
+void Test::testConditionalstylesTbllook()
+{
+uno::Reference xTablesSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Reference 
xTables(xTablesSupplier->getTextTables(), uno::UNO_QUERY);
+uno::Reference xTable(xTables->getByIndex(0), 
uno::UNO_QUERY);
+// Background was -1.
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0x7F7F7F), 
getProperty(xTable->getCellByName("A1"), "BackColor"));
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits