[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - solenv/bin

[Andrea Pescetti]

 solenv/bin/srcrelease.xml |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 0d06ab4fc6dc9b9295c1126b0c239cdb654c6332
Author: Andrea Pescetti 
Date:   Sat Oct 1 15:46:32 2016 +

#i127148# Include testgraphical/references in generated source package.

diff --git a/solenv/bin/srcrelease.xml b/solenv/bin/srcrelease.xml
index 45bca58..43c380e 100644
--- a/solenv/bin/srcrelease.xml
+++ b/solenv/bin/srcrelease.xml
@@ -32,6 +32,7 @@
   
   
   
+  
   
 
 
@@ -73,6 +74,7 @@
   
   
   
+  
 
 
   
@@ -89,6 +91,7 @@
   
   
   
+  
 
 
   
commit 92209efe38c47e65ec5d34c81199749dca7dfb78
Author: Andrea Pescetti 
Date:   Sat Oct 1 14:12:51 2016 +

#i126605# Ignore generated scripts for supported platforms when creating 
source package.

diff --git a/solenv/bin/srcrelease.xml b/solenv/bin/srcrelease.xml
index 5a05488..45bca58 100644
--- a/solenv/bin/srcrelease.xml
+++ b/solenv/bin/srcrelease.xml
@@ -29,7 +29,7 @@
   
   
 
-  
+  
   
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - solenv/bin vcl/aqua vcl/inc vcl/os2 vcl/unx vcl/win

[Andre Fischer]

 solenv/bin/patch_tool.pl|   28 
 vcl/aqua/source/gdi/salgdi.cxx  |6 +++---
 vcl/aqua/source/gdi/salprn.cxx  |2 +-
 vcl/aqua/source/window/salframe.cxx |4 ++--
 vcl/inc/aqua/salframe.h |2 +-
 vcl/inc/aqua/salgdi.h   |2 +-
 vcl/inc/os2/salgdi.h|2 +-
 vcl/inc/win/salgdi.h|2 +-
 vcl/os2/source/gdi/salgdi.cxx   |9 ++---
 vcl/unx/generic/gdi/salgdi3.cxx |6 ++
 vcl/win/source/gdi/salgdi.cxx   |2 +-
 11 files changed, 35 insertions(+), 30 deletions(-)

New commits:
commit 1d5583df9bdad2b61f05dd504b30944851fe64a7
Author: Andre Fischer a...@apache.org
Date:   Tue Dec 17 15:47:29 2013 +

123531: Create log path before using it.

diff --git a/solenv/bin/patch_tool.pl b/solenv/bin/patch_tool.pl
index c82806c..f7cc82d 100644
--- a/solenv/bin/patch_tool.pl
+++ b/solenv/bin/patch_tool.pl
@@ -2203,9 +2203,9 @@ sub UpdateReleasesXML($$)
 sub main ()
 {
 my $context = ProcessCommandline();
-installer::logger::starttime();
-$installer::logger::Global-add_timestamp(starting logging);
-#installer::logger::SetupSimpleLogging(undef);
+#installer::logger::starttime();
+#$installer::logger::Global-add_timestamp(starting logging);
+installer::logger::SetupSimpleLogging(undef);
 
 die ERROR: list file is not defined, please use --lst-file option
 unless defined $context-{'lst-file'};
@@ -,15 +,19 @@ sub main ()
 
 if ($context-{'command'} =~ /create|check/)
 {
-$installer::logger::Lang-set_filename(
-File::Spec-catfile(
-$context-{'output-path'},
-$context-{'product-name'},
-msp,
-$context-{'source-version-dash'} . _ . 
$context-{'target-version-dash'},
-$context-{'language'},
-log,
-patch-creation.log));
+my $filename = File::Spec-catfile(
+$context-{'output-path'},
+$context-{'product-name'},
+msp,
+$context-{'source-version-dash'} . _ . 
$context-{'target-version-dash'},
+$context-{'language'},
+log,
+patch-creation.log);
+my $dirname = dirname($filename);
+File::Path::make_path($dirname) unless -d $dirname;
+printf(directing output to $filename\n);
+
+$installer::logger::Lang-set_filename($filename);
 $installer::logger::Lang-copy_lines_from($installer::logger::Global);
 $installer::logger::Lang-set_forward(undef);
 $installer::logger::Info-set_forward($installer::logger::Lang);
commit 8a7cfd2bded9a531a034222c71ba3eda9df7d436
Author: Herbert Dürr h...@apache.org
Date:   Tue Dec 17 15:01:25 2013 +

#i123840# normalize SalFrame resolution type to sal_Int32

diff --git a/vcl/aqua/source/gdi/salgdi.cxx b/vcl/aqua/source/gdi/salgdi.cxx
index a45ae9f..76f13a6 100644
--- a/vcl/aqua/source/gdi/salgdi.cxx
+++ b/vcl/aqua/source/gdi/salgdi.cxx
@@ -430,13 +430,13 @@ void AquaSalGraphics::initResolution( NSWindow* )
 mfFakeDPIScale = 1.0;
 }
 
-void AquaSalGraphics::GetResolution( long rDPIX, long rDPIY )
+void AquaSalGraphics::GetResolution( sal_Int32 rDPIX, sal_Int32 rDPIY )
 {
 if( !mnRealDPIY )
 initResolution( (mbWindow  mpFrame) ? mpFrame-getNSWindow() : nil );
 
-rDPIX = static_castlong(mfFakeDPIScale * mnRealDPIX);
-rDPIY = static_castlong(mfFakeDPIScale * mnRealDPIY);
+rDPIX = lrint( mfFakeDPIScale * mnRealDPIX);
+rDPIY = lrint( mfFakeDPIScale * mnRealDPIY);
 }
 
 void AquaSalGraphics::copyResolution( AquaSalGraphics rGraphics )
diff --git a/vcl/aqua/source/gdi/salprn.cxx b/vcl/aqua/source/gdi/salprn.cxx
index 0a652c6..6bb3a057 100644
--- a/vcl/aqua/source/gdi/salprn.cxx
+++ b/vcl/aqua/source/gdi/salprn.cxx
@@ -407,7 +407,7 @@ void AquaSalInfoPrinter::GetPageInfo( const ImplJobSetup*,
 {
 if( mpPrintInfo )
 {
-long nDPIX = 72, nDPIY = 72;
+sal_Int32 nDPIX = 72, nDPIY = 72;
 mpGraphics-GetResolution( nDPIX, nDPIY );
 const double fXScaling = static_castdouble(nDPIX)/72.0,
  fYScaling = static_castdouble(nDPIY)/72.0;
diff --git a/vcl/aqua/source/window/salframe.cxx 
b/vcl/aqua/source/window/salframe.cxx
index 63c0447..715a6fd 100644
--- a/vcl/aqua/source/window/salframe.cxx
+++ b/vcl/aqua/source/window/salframe.cxx
@@ -1219,7 +1219,7 @@ static Font getFont( NSFont* pFont, long nDPIY, const 
Font rDefault )
 return aResult;
 }
 
-void AquaSalFrame::getResolution( long o_rDPIX, long o_rDPIY )
+void AquaSalFrame::getResolution( sal_Int32 o_rDPIX, sal_Int32 o_rDPIY )
 {
 if( ! mpGraphics )
 {
@@ -1264,7 +1264,7 @@ void AquaSalFrame::UpdateSettings( AllSettings rSettings 
)
 
 // get the system font settings
 Font aAppFont = aStyleSettings.GetAppFont();
-long nDPIX = 72, nDPIY = 72;
+sal_Int32 nDPIX = 72, nDPIY = 

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - solenv/bin

[Andre Fischer]

 solenv/bin/make_installer.pl  |   92 ---
 solenv/bin/modules/installer/globals.pm   |5 
 solenv/bin/modules/installer/scriptitems.pm   |6 
 solenv/bin/modules/installer/windows/directory.pm |1 
 solenv/bin/modules/installer/windows/property.pm  |   12 -
 solenv/bin/modules/installer/ziplist.pm   |  134 +-
 6 files changed, 182 insertions(+), 68 deletions(-)

New commits:
commit 7bb645484e11308be6c6de5b5de7079cd532a662
Author: Andre Fischer a...@apache.org
Date:   Fri Nov 22 09:36:12 2013 +

123729: Factored out reading of openoffice.lst to its own function.

diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 400949c..463f2d4f9 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -87,6 +87,58 @@ use installer::worker;
 use installer::xpdinstaller;
 use installer::ziplist;
 
+use strict;
+
+sub GetSetupScriptLines ($$$)
+{
+my ($allsettingsarrayref, $allvariableshashref, $includepatharrayref) = @_;
+
+if ($installer::globals::setupscript_defined_in_productlist)
+{
+installer::setupscript::set_setupscript_name($allsettingsarrayref, 
$includepatharrayref);
+}
+
+$installer::logger::Info-print( ... analyzing script: 
$installer::globals::setupscriptname ... \n );
+installer::logger::globallog(setup script file: 
$installer::globals::setupscriptname);
+$installer::logger::Info-print( ... analyzing script: 
$installer::globals::setupscriptname ... \n );
+
+# Reading the setup script file
+my $setupscriptref = 
installer::files::read_file($installer::globals::setupscriptname);
+
+# Resolving variables defined in the zip list file into setup
+# script.  All the variables are defined in $allvariablesarrayref
+
installer::scpzipfiles::replace_all_ziplistvariables_in_file($setupscriptref, 
$allvariableshashref);
+
+# Resolving %variables defined in the installation object
+my $allscriptvariablesref = 
installer::setupscript::get_all_scriptvariables_from_installation_object(
+$setupscriptref,
+$installer::globals::setupscriptname);
+
installer::setupscript::add_lowercase_productname_setupscriptvariable($allscriptvariablesref);
+
installer::setupscript::resolve_lowercase_productname_setupscriptvariable($allscriptvariablesref);
+
+$setupscriptref = 
installer::setupscript::replace_all_setupscriptvariables_in_script(
+$setupscriptref,
+$allscriptvariablesref);
+
+# Adding all variables defined in the installation object into the
+# hash of all variables.  This is needed if variables are defined
+# in the installation object, but not in the zip list file.  If
+# there is a definition in the zip list file and in the
+# installation object, the installation object is more important
+
installer::setupscript::add_installationobject_to_variables($allvariableshashref,
 $allscriptvariablesref);
+
+# Adding also all variables, that must be included into the 
$allvariableshashref.
+installer::setupscript::add_forced_properties($allvariableshashref);
+
+# Replacing preset properties, not using the default mechanisms (for 
example for UNIXPRODUCTNAME)
+installer::setupscript::replace_preset_properties($allvariableshashref);
+
+# We did this already.  Can this or the other one be removed.
+
installer::scpzipfiles::replace_all_ziplistvariables_in_file($setupscriptref, 
$allvariableshashref);
+
+return $setupscriptref;
+}
+
 #
 # Main program
 #
@@ -334,43 +386,7 @@ 
installer::control::check_java_for_xpd($allvariableshashref);
 # Analyzing the setup script
 #
 
-if ($installer::globals::setupscript_defined_in_productlist) { 
installer::setupscript::set_setupscript_name($allsettingsarrayref, 
$includepatharrayref); }
-
-installer::logger::globallog(setup script file: 
$installer::globals::setupscriptname);
-
-$installer::logger::Info-print( ... analyzing script: 
$installer::globals::setupscriptname ... \n );
-
-my $setupscriptref = 
installer::files::read_file($installer::globals::setupscriptname); # Reading 
the setup script file
-
-# Resolving variables defined in the zip list file into setup script
-# All the variables are defined in $allvariablesarrayref
-
-installer::scpzipfiles::replace_all_ziplistvariables_in_file($setupscriptref, 
$allvariableshashref);
-
-# Resolving %variables defined in the installation object
-
-my $allscriptvariablesref = 
installer::setupscript::get_all_scriptvariables_from_installation_object($setupscriptref);
-
-installer::setupscript::add_lowercase_productname_setupscriptvariable($allscriptvariablesref);
-
-installer::setupscript::resolve_lowercase_productname_setupscriptvariable($allscriptvariablesref);
-
-$setupscriptref = 

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - solenv/bin sw/source sysui/desktop

[Andre Fischer]

 solenv/bin/modules/installer/epmfile.pm |   12 +---
 sw/source/core/docnode/nodes.cxx|   24 
 sysui/desktop/debian/control|4 ++--
 3 files changed, 27 insertions(+), 13 deletions(-)

New commits:
commit 7f250ed4ce273c5d54898a142f07ef93f38c3056
Author: Andre Fischer a...@apache.org
Date:   Mon Jul 1 15:10:21 2013 +

121479: Prevent crash when loading some RTF documents.

diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx
index 1150d509..eddef2a 100644
--- a/sw/source/core/docnode/nodes.cxx
+++ b/sw/source/core/docnode/nodes.cxx
@@ -522,6 +522,30 @@ sal_Bool SwNodes::_MoveNodes( const SwNodeRange aRange, 
SwNodes  rNodes,
 sal_uInt16 nSectNdCnt = 0;
 sal_Bool bSaveNewFrms = bNewFrms;
 
+// Check that the range of nodes to move is valid.
+// This is a very specific test that only checks that table nodes
+// are completely covered by the range.  Issue 121479 has a
+// document for which this test fails.
+SwNodeIndex aNodeIndex (aRg.aEnd);
+while (aNodeIndex  aRg.aStart)
+{
+SwNode* pNode = rNodes[aNodeIndex.GetIndex()];
+if (pNode-GetNodeType() != ND_ENDNODE)
+break;
+SwStartNode* pStartNode = pNode-pStartOfSection;
+if (pStartNode==NULL)
+break;
+if ( ! pStartNode-IsTableNode())
+break;
+aNodeIndex = *pStartNode;
+if (aNodeIndex  aRg.aStart.GetIndex())
+{
+return sal_False;
+}
+--aNodeIndex;
+}
+
+
 // bis alles verschoben ist
 while( aRg.aStart  aRg.aEnd )
 switch( (pAktNode = aRg.aEnd.GetNode())-GetNodeType() )
commit e9991e068f17bbe588b97cdfa07fdd0a3f901f33
Author: Oliver-Rainer Wittmann o...@apache.org
Date:   Mon Jul 1 14:23:10 2013 +

121968: further changes for the creation of debian packages in order to get 
them installed when a former AOO resp. OOo version is installed.

diff --git a/solenv/bin/modules/installer/epmfile.pm 
b/solenv/bin/modules/installer/epmfile.pm
index cd7ed76..d0efdc0 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -538,23 +538,13 @@ sub create_epm_header
 if ( $installer::globals::debian ) { $onereplaces =~ s/_/-/g; 
} # Debian allows no underline in package name
 $line = %replaces .   . $onereplaces . \n;
 push(@epmheader, $line);
-
-# Force the openofficeorg packages to get removed,
-# see 
http://www.debian.org/doc/debian-policy/ch-relationships.html
-# 7.5.2 Replacing whole packages, forcing their removal
-
-if ( $installer::globals::debian )
-{
-$line = %incompat .   . $onereplaces . \n;
-push(@epmheader, $line);
-}
 }
 
 if ( $installer::globals::debian  
$variableshashref-{'UNIXPRODUCTNAME'} eq 'openoffice' )
 {
 $line = %provides .  openoffice.org-unbundled\n;
 push(@epmheader, $line);
-$line = %incompat .  openoffice.org-bundled\n;
+$line = %replaces .  openoffice.org-bundled\n;
 push(@epmheader, $line);
 }
 }
diff --git a/sysui/desktop/debian/control b/sysui/desktop/debian/control
index a1db639..90f0c09 100644
--- a/sysui/desktop/debian/control
+++ b/sysui/desktop/debian/control
@@ -2,5 +2,5 @@ Description: %productname desktop integration
 Maintainer: Apache Software Foundation
 Architecture: all
 Provides: openoffice-desktop-integration, openoffice.org-unbundled
-Conflicts: openoffice-desktop-integration, openofficeorg-desktop-integration, 
openoffice.org-debian-menus, openoffice.org-bundled
-Replaces: openoffice-desktop-integration, openoffice.org-debian-menus
+Conflicts: openoffice-desktop-integration, openofficeorg-desktop-integration, 
openoffice.org-debian-menus
+Replaces: openoffice-desktop-integration, openoffice.org-debian-menus, 
openoffice.org-bundled, openoffice.org-common
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits