sc/inc/printopt.hxx | 2 +-
solenv/bin/modules/installer.pm | 5 +++--
solenv/bin/modules/installer/windows/mergemodule.pm | 3 ++-
3 files changed, 6 insertions(+), 4 deletions(-)
New commits:
commit d199c01ec765c62dee232bc1d6a9929cdbbb5158
Author: Michael Stahl <mst...@redhat.com>
Date: Fri Nov 8 15:33:45 2013 +0100
installer: the perl is borked
Apparently the $$languagesref in create_directories results in the full
path to services.rdb when called from mergemodules.pm as
my $unpackdir = installer::systemactions::create_directories("cab", "");
... which apparently means that there's some variable whose name is the
empty string and whose value is the path to services.rdb.
Add some mysterious workaround suggested by mmeeks.
Change-Id: I6ba203f5cc44786969795eebab5359d5e9a8a12a
diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm
index d5698cf..a081456 100644
--- a/solenv/bin/modules/installer.pm
+++ b/solenv/bin/modules/installer.pm
@@ -126,7 +126,8 @@ sub run {
# Creating the log directory
######################################
- my $loggingdir = installer::systemactions::create_directories("logging",
"");
+ my $empty = "";
+ my $loggingdir = installer::systemactions::create_directories("logging",
\$empty);
$loggingdir = $loggingdir . $installer::globals::separator;
$installer::globals::exitlog = $loggingdir;
@@ -176,7 +177,7 @@ sub run {
# FIXME: It would be better to use
installer::systemactions::remove_complete_directory
# Though, we would need to remove only the lang-specific
subdirectory for langpacks and helppacks
rmdir $oldloggingdir;
- $loggingdir = installer::systemactions::create_directories("logging", "");
+ $loggingdir = installer::systemactions::create_directories("logging",
\$empty);
$loggingdir = $loggingdir . $installer::globals::separator;
$installer::globals::exitlog = $loggingdir;
diff --git a/solenv/bin/modules/installer/windows/mergemodule.pm
b/solenv/bin/modules/installer/windows/mergemodule.pm
index 3989e26..8922f7c 100644
--- a/solenv/bin/modules/installer/windows/mergemodule.pm
+++ b/solenv/bin/modules/installer/windows/mergemodule.pm
@@ -1101,7 +1101,8 @@ sub change_file_table
# Unpacking the MergeModule.CABinet (only once)
# Unpacking into temp directory. Warning: expand.exe has problems with
very long unpack directories.
- my $unpackdir = installer::systemactions::create_directories("cab", "");
+ my $empty = "";
+ my $unpackdir = installer::systemactions::create_directories("cab",
\$empty);
push(@installer::globals::removedirs, $unpackdir);
$unpackdir = $unpackdir . $installer::globals::separator . $mergemodulegid;
commit c5a7928fb56b9b5d73f7527a8248a28af4895167
Author: Michael Stahl <mst...@redhat.com>
Date: Fri Nov 8 13:25:47 2013 +0100
warning C4805 unsafe mix of type sal_Bool and type bool
Change-Id: I00064edb5105ede4bdf6a0cdec4bab00cdd52331
diff --git a/sc/inc/printopt.hxx b/sc/inc/printopt.hxx
index ff1fd67..83710bd 100644
--- a/sc/inc/printopt.hxx
+++ b/sc/inc/printopt.hxx
@@ -40,7 +40,7 @@ public:
void SetSkipEmpty( sal_Bool bVal ) { bSkipEmpty = bVal; }
sal_Bool GetAllSheets() const { return bAllSheets; }
void SetAllSheets( sal_Bool bVal ) { bAllSheets = bVal; }
- sal_Bool GetForceBreaks() const { return bForceBreaks; }
+ bool GetForceBreaks() const { return bForceBreaks; }
void SetForceBreaks( sal_Bool bVal ) { bForceBreaks = bVal; }
void SetDefaults();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
