Makefile | 1 + bin/convwatch.py | 5 ++++- sw/source/core/layout/paintfrm.cxx | 7 ++----- 3 files changed, 7 insertions(+), 6 deletions(-)
New commits: commit e731a98b79968f2c2b1c4e4a183bd952059c557a Author: Michael Stahl <[email protected]> Date: Fri Apr 27 16:01:25 2012 +0200 argh i am so stupid merge the 2 conflicting fixes to SwLineRects::ConnectEdges in 33ee840e7b45eb971feef83215841edc0ba66cd7 into something that maybe works. diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index 5ef023d..16b5221 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -643,7 +643,7 @@ void SwLineRects::ConnectEdges( OutputDevice *pOut ) SvPtrarr aCheck( 64 ); - for (size_t i = 0; i < this->size(); ) + for (size_t i = 0; i < this->size(); ++i) { SwLineRect &rL1 = (*this)[i]; if ( !rL1.GetTab() || rL1.IsPainted() || rL1.IsLocked() ) @@ -793,10 +793,7 @@ void SwLineRects::ConnectEdges( OutputDevice *pOut ) if ( bRemove ) { this->erase(this->begin() + i); - } - else - { - ++i; + --i; } } } commit d5ddbe4c3f71c5e8f1667c25e20bbcd565850374 Author: Michael Stahl <[email protected]> Date: Fri Apr 27 16:01:24 2012 +0200 convwatch.py: subprocess.check_output only in Python 2.7+ diff --git a/bin/convwatch.py b/bin/convwatch.py index 7880234..e0fb05d 100755 --- a/bin/convwatch.py +++ b/bin/convwatch.py @@ -336,7 +336,10 @@ def mkAllImages(dirs, suffix, resolution, reference): def identify(imagefile): argv = ["identify", "-format", "%k", imagefile] - result = subprocess.check_output(argv) + process = subprocess.Popen(argv, stdout=subprocess.PIPE) + result, _ = process.communicate() + if process.wait() != 0: + raise Exception("identify failed") if result.partition("\n")[0] != "1": print("identify result: " + result) print("DIFFERENCE in " + imagefile) commit e6d28ac3aadce1a130ad90e8281fef6aed95329e Author: Michael Stahl <[email protected]> Date: Fri Apr 27 16:01:24 2012 +0200 Makefile: "deliver -delete" on module.clean diff --git a/Makefile b/Makefile index 2086fd9..d6b06bf 100644 --- a/Makefile +++ b/Makefile @@ -289,6 +289,7 @@ $(1).deliver: $(1) cd $(1) && $(SOLARENV)/bin/deliver.pl $(1).clean: + cd $(1) && $(SOLARENV)/bin/deliver.pl -delete rm -fr $(1)/$(INPATH) endef _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
