[Libreoffice-commits] .: 9 commits -
Jan Holesovsky
kendy at kemper.freedesktop.org
Mon Dec 20 04:20:21 PST 2010
0 files changed
New commits:
commit 3ad34bb9d696c27ab3dcaaacf62fc228f9ee2d30
Merge: 6ac1bfe... 64f237d...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Mon Dec 20 01:16:49 2010 +0100
Merge commit 'libreoffice-3.3.0.2'
Conflicts:
sdext/source/presenter/makefile.mk
commit 64f237d17d28af99bfab19628afedbc1aaae8135
Author: Petr Mladek <pmladek at suse.cz>
Date: Sat Dec 18 20:35:15 2010 +0100
Version 3.3.0.2, tag libreoffice-3.3.0.2 (3.3-rc2)
commit 2b7dfb20b1d82981604972b69477ba0ba922d077
Author: Thorsten Behrens <tbehrens at novell.com>
Date: Wed Dec 15 02:32:07 2010 +0100
Fix filled polygons on pdfimport
This fixes fdo#32330, by explicitely closing filled polygons on
ODF streaming-out. LibO does not fill polygons, even if specifically
asked to - unless they're closed on coordinate level.
diff --git a/sdext/source/pdfimport/tree/genericelements.cxx b/sdext/source/pdfimport/tree/genericelements.cxx
index 5242a6b..d8696dd 100644
--- a/sdext/source/pdfimport/tree/genericelements.cxx
+++ b/sdext/source/pdfimport/tree/genericelements.cxx
@@ -164,6 +164,10 @@ void PolyPolyElement::updateGeometry()
y = aRange.getMinY();
w = aRange.getWidth();
h = aRange.getHeight();
+
+ // fdo#32330 - non-closed paths will not show up filled in LibO
+ if( Action & (PATH_FILL | PATH_EOFILL) )
+ PolyPoly.setClosed(true);
}
void PolyPolyElement::visitedBy( ElementTreeVisitor& rVisitor,
commit e76befda7ccf15bb6f60de1916157d36e6e1331a
Author: Rene Engelhard <rene at debian.org>
Date: Tue Dec 14 22:49:07 2010 +0100
generate hash.cxx in $(INCCOM)
diff --git a/sdext/source/pdfimport/wrapper/makefile.mk b/sdext/source/pdfimport/wrapper/makefile.mk
index f558e97..b2fbdfa 100755
--- a/sdext/source/pdfimport/wrapper/makefile.mk
+++ b/sdext/source/pdfimport/wrapper/makefile.mk
@@ -37,7 +37,6 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE: ../pdfisettings.pmk
CDEFS+= -DPDFI_IMPL_IDENTIFIER=$(IMPLEMENTATION_IDENTIFIER)
-CFLAGS+=-I$(SOLARVER)$/$(INPATH)$/inc
# --- Files --------------------------------------------------------
@@ -53,8 +52,8 @@ SLOFILES=\
.INCLUDE : target.mk
-$(SLO)$/wrapper.obj: $(SOLARVER)$/$(INPATH)$/inc$/hash.cxx
+$(SLO)$/wrapper.obj: $(INCCOM)$/hash.cxx
-$(SOLARVER)$/$(INPATH)$/inc$/hash.cxx: keyword_list
+$(INCCOM)$/hash.cxx: keyword_list
$(GPERF) -C -t -l -L C++ -m 20 -Z PdfKeywordHash -k'4-5,$$' keyword_list > $@
commit 0e9a144ec399c348c91125defd1c252711a05212
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue Dec 14 18:34:52 2010 +0100
Revert "Stopgap help for the CPU-bound long hang in bug fdo#31716"
We the proper fix now.
This reverts commit e0913f3c3740453ea1570896d20140b92663ce3f.
diff --git a/sdext/source/presenter/makefile.mk b/sdext/source/presenter/makefile.mk
old mode 100644
new mode 100755
index f20fa5b..696d0e5
--- a/sdext/source/presenter/makefile.mk
+++ b/sdext/source/presenter/makefile.mk
@@ -252,7 +252,7 @@ PLATFORMID:=$(RTL_OS:l)_$(RTL_ARCH:l)
COMPONENT_HELP= \
$(ZIP1DIR)$/help/component.txt \
- $(ZIP1DIR)$/help$/en-US$/com.sun.PresenterScreen-$(PLATFORMID)$/presenter.xhp
+ $(foreach,l,$(alllangiso) $(ZIP1DIR)$/help$/$l$/com.sun.PresenterScreen-$(PLATFORMID)$/presenter.xhp)
ZIP1DEPS= \
$(DESCRIPTION) \
commit f86830f4e74489bec8431a23897d03f6da4071dc
Author: Rene Engelhard <rene at debian.org>
Date: Mon Dec 13 22:07:47 2010 +0100
build hash.cxx using gperf instead of having it prebuilt
diff --git a/sdext/source/pdfimport/wrapper/hash.cxx b/sdext/source/pdfimport/wrapper/hash.cxx
deleted file mode 100644
index c108377..0000000
--- a/sdext/source/pdfimport/wrapper/hash.cxx
+++ /dev/null
@@ -1,217 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* C++ code produced by gperf version 3.0.1 */
-/* Command-line: gperf -C -t -l -L C++ -m 20 -Z PdfKeywordHash keyword_list */
-/* Computed positions: -k'4-5,$' */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
- && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
- && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
- && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
- && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
- && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
- && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
- && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
- && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
- && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
- && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
- && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
- && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
- && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
- && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
- && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
- && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
- && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
- && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
- && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
- && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
- && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
- && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646. */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf at gnu.org>."
-#endif
-
-#line 1 "keyword_list"
-struct hash_entry { const char* name; enum parseKey eKey; };
-
-#if defined __GNUC__
-#pragma GCC system_header
-#endif
-
-#define TOTAL_KEYWORDS 46
-#define MIN_WORD_LENGTH 7
-#define MAX_WORD_LENGTH 19
-#define MIN_HASH_VALUE 8
-#define MAX_HASH_VALUE 68
-/* maximum key range = 61, duplicates = 0 */
-
-class PdfKeywordHash
-{
-private:
- static inline unsigned int hash (const char *str, unsigned int len);
-public:
- static const struct hash_entry *in_word_set (const char *str, unsigned int len);
-};
-
-inline unsigned int
-PdfKeywordHash::hash (register const char *str, register unsigned int len)
-{
- static const unsigned char asso_values[] =
- {
- 69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
- 69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
- 69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
- 69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
- 69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
- 69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
- 69, 69, 69, 69, 69, 69, 9, 69, 38, 69,
- 1, 69, 69, 69, 31, 69, 16, 35, 21, 69,
- 15, 0, 69, 21, 15, 69, 69, 69, 69, 69,
- 69, 69, 69, 69, 69, 69, 69, 0, 15, 69,
- 69, 5, 8, 69, 4, 8, 0, 20, 2, 27,
- 11, 31, 0, 69, 0, 9, 0, 5, 69, 5,
- 69, 13, 69, 69, 69, 69, 69, 69, 69, 69,
- 69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
- 69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
- 69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
- 69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
- 69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
- 69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
- 69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
- 69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
- 69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
- 69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
- 69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
- 69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
- 69, 69, 69, 69, 69, 69, 69
- };
- return len + asso_values[(unsigned char)str[4]+1] + asso_values[(unsigned char)str[3]] + asso_values[(unsigned char)str[len - 1]];
-}
-
-const struct hash_entry *
-PdfKeywordHash::in_word_set (register const char *str, register unsigned int len)
-{
- static const unsigned char lengthtable[] =
- {
- 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 8, 12,
- 8, 10, 10, 12, 13, 9, 15, 16, 17, 14, 15, 15, 10, 13,
- 14, 15, 14, 11, 12, 9, 9, 17, 13, 19, 11, 8, 14, 9,
- 7, 9, 19, 17, 15, 10, 13, 10, 9, 8, 17, 12, 8, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 8
- };
- static const struct hash_entry wordlist[] =
- {
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 29 "keyword_list"
- {"setFont",SETFONT},
- {""}, {""}, {""},
-#line 8 "keyword_list"
- {"clipPath",CLIPPATH},
-#line 28 "keyword_list"
- {"setFillColor",SETFILLCOLOR},
-#line 19 "keyword_list"
- {"fillPath",FILLPATH},
-#line 46 "keyword_list"
- {"updateFont",UPDATEFONT},
-#line 17 "keyword_list"
- {"eoClipPath",EOCLIPPATH},
-#line 25 "keyword_list"
- {"restoreState",RESTORESTATE},
-#line 47 "keyword_list"
- {"updateLineCap",UPDATELINECAP},
-#line 39 "keyword_list"
- {"startPage",STARTPAGE},
-#line 43 "keyword_list"
- {"updateFillColor",UPDATEFILLCOLOR},
-#line 51 "keyword_list"
- {"updateMiterLimit",UPDATEMITERLIMIT},
-#line 52 "keyword_list"
- {"updateStrokeColor",UPDATESTROKECOLOR},
-#line 48 "keyword_list"
- {"updateLineDash",UPDATELINEDASH},
-#line 50 "keyword_list"
- {"updateLineWidth",UPDATELINEWIDTH},
-#line 41 "keyword_list"
- {"updateBlendMode",UPDATEBLENDMODE},
-#line 30 "keyword_list"
- {"setLineCap",SETLINECAP},
-#line 21 "keyword_list"
- {"intersectClip",INTERSECTCLIP},
-#line 45 "keyword_list"
- {"updateFlatness",UPDATEFLATNESS},
-#line 22 "keyword_list"
- {"intersectEoClip",INTERSECTEOCLIP},
-#line 49 "keyword_list"
- {"updateLineJoin",UPDATELINEJOIN},
-#line 31 "keyword_list"
- {"setLineDash",SETLINEDASH},
-#line 33 "keyword_list"
- {"setLineWidth",SETLINEWIDTH},
-#line 24 "keyword_list"
- {"pushState",PUSHSTATE},
-#line 26 "keyword_list"
- {"saveState",SAVESTATE},
-#line 44 "keyword_list"
- {"updateFillOpacity",UPDATEFILLOPACITY},
-#line 16 "keyword_list"
- {"endTextObject",ENDTEXTOBJECT},
-#line 53 "keyword_list"
- {"updateStrokeOpacity",UPDATESTROKEOPACITY},
-#line 32 "keyword_list"
- {"setLineJoin",SETLINEJOIN},
-#line 23 "keyword_list"
- {"popState",POPSTATE},
-#line 36 "keyword_list"
- {"setStrokeColor",SETSTROKECOLOR},
-#line 42 "keyword_list"
- {"updateCtm",UPDATECTM},
-#line 15 "keyword_list"
- {"endPage",ENDPAGE},
-#line 20 "keyword_list"
- {"hyperLink",HYPERLINK},
-#line 14 "keyword_list"
- {"drawSoftMaskedImage",DRAWSOFTMASKEDIMAGE},
-#line 37 "keyword_list"
- {"setTextRenderMode",SETTEXTRENDERMODE},
-#line 13 "keyword_list"
- {"drawMaskedImage",DRAWMASKEDIMAGE},
-#line 40 "keyword_list"
- {"strokePath",STROKEPATH},
-#line 34 "keyword_list"
- {"setMiterLimit",SETMITERLIMIT},
-#line 18 "keyword_list"
- {"eoFillPath",EOFILLPATH},
-#line 10 "keyword_list"
- {"drawImage",DRAWIMAGE},
-#line 9 "keyword_list"
- {"drawChar",DRAWCHAR},
-#line 38 "keyword_list"
- {"setTransformation",SETTRANSFORMATION},
-#line 27 "keyword_list"
- {"setBlendMode",SETBLENDMODE},
-#line 12 "keyword_list"
- {"drawMask",DRAWMASK},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
- {""}, {""}, {""},
-#line 35 "keyword_list"
- {"setPageNum",SETPAGENUM},
-#line 11 "keyword_list"
- {"drawLink",DRAWLINK }
- };
-
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
- {
- register int key = hash (str, len);
-
- if (key <= MAX_HASH_VALUE && key >= 0)
- if (len == lengthtable[key])
- {
- register const char *s = wordlist[key].name;
-
- if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
- return &wordlist[key];
- }
- }
- return 0;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/pdfimport/wrapper/makefile.mk b/sdext/source/pdfimport/wrapper/makefile.mk
index 743633c..f558e97 100755
--- a/sdext/source/pdfimport/wrapper/makefile.mk
+++ b/sdext/source/pdfimport/wrapper/makefile.mk
@@ -37,6 +37,7 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE: ../pdfisettings.pmk
CDEFS+= -DPDFI_IMPL_IDENTIFIER=$(IMPLEMENTATION_IDENTIFIER)
+CFLAGS+=-I$(SOLARVER)$/$(INPATH)$/inc
# --- Files --------------------------------------------------------
@@ -51,3 +52,9 @@ SLOFILES=\
.ENDIF
.INCLUDE : target.mk
+
+$(SLO)$/wrapper.obj: $(SOLARVER)$/$(INPATH)$/inc$/hash.cxx
+
+$(SOLARVER)$/$(INPATH)$/inc$/hash.cxx: keyword_list
+ $(GPERF) -C -t -l -L C++ -m 20 -Z PdfKeywordHash -k'4-5,$$' keyword_list > $@
+
commit dffdb2c6d18435360b05a4fbf111fcd86cca4248
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Mon Dec 13 21:19:49 2010 +0100
Don't bundle MSVC runtime + don't dupplicate licenses
diff --git a/sdext/source/presenter/makefile.mk b/sdext/source/presenter/makefile.mk
index bb8a974..f20fa5b 100644
--- a/sdext/source/presenter/makefile.mk
+++ b/sdext/source/presenter/makefile.mk
@@ -313,7 +313,7 @@ $(COMPONENT_IMAGES) : $(SOLARSRC)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f)
$(COMPONENT_LIBRARY) : $(DLLDEST)$/$$(@:f)
@-$(MKDIRHIER) $(@:d)
+$(COPY) $< $@
-.IF "$(OS)$(CPU)"=="WNTI"
+.IF "$(OS)$(CPU)"=="WNTI" && "$(WITH_EXTENSION_INTEGRATION)"!="YES"
.IF "$(COM)"=="GCC"
$(GNUCOPY) $(SOLARBINDIR)$/mingwm10.dll $(ZIP1DIR)
.ELSE
@@ -353,7 +353,7 @@ $(COMPONENT_LIBRARY) : $(DLLDEST)$/$$(@:f)
.ENDIF
.ENDIF # "$(PACKMS)"!=""
.ENDIF #"$(COM)"=="GCC"
-.ENDIF
+.ENDIF #"$(OS)$(CPU)"=="WNTI" && "$(WITH_EXTENSION_INTEGRATION)"!="YES"
@@ -365,19 +365,14 @@ $(ZIP1DIR)$/%.xcs : %.xcs
@@-$(MKDIRHIER) $(@:d)
$(GNUCOPY) $< $@
-# Temporary file that is used to replace some placeholders in description.xml.
-DESCRIPTION_TMP:=$(ZIP1DIR)$/description.xml.tmp
-
.INCLUDE .IGNORE : $(ZIP1DIR)_lang_track.mk
.IF "$(LAST_WITH_LANG)"!="$(WITH_LANG)"
PHONYDESC=.PHONY
.ENDIF # "$(LAST_WITH_LANG)"!="$(WITH_LANG)"
$(DESCRIPTION) $(PHONYDESC) : $$(@:f)
@-$(MKDIRHIER) $(@:d)
- $(PERL) $(SOLARENV)$/bin$/licinserter.pl description.xml registry/LICENSE_xxx $(DESCRIPTION_TMP)
@echo LAST_WITH_LANG=$(WITH_LANG) > $(ZIP1DIR)_lang_track.mk
- $(TYPE) $(DESCRIPTION_TMP) | sed s/UPDATED_PLATFORM/$(PLATFORMID)/ > $@
- @@-$(RM) $(DESCRIPTION_TMP)
+ $(TYPE) description.tmp | sed s/UPDATED_PLATFORM/$(PLATFORMID)/ > $@
.ENDIF # "$(ENABLE_PRESENTER_SCREEN)" != "NO"
commit ce266a281b2d6a86507566fef749385915d33e70
Author: Petr Mladek <pmladek at suse.cz>
Date: Wed Dec 1 15:55:51 2010 +0100
Version 3.3.0.1, tag LIBREOFFICE_3_3_0_1 (3.3-rc1)
commit e0913f3c3740453ea1570896d20140b92663ce3f
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Tue Nov 30 15:24:30 2010 +0200
Stopgap help for the CPU-bound long hang in bug fdo#31716
As the hang seems to be causes by the code messing around in extension
help file directories, of which there are lots in a multi-lingual
build, just build en-US help for the Presenter Console
(a.k.a. presenter-screen) extension for now.
Why such a change is needed both here and in
solenv/inc/extension_helplink.mk (see commit
4e40f4ea586f240f38aa6856eda64619f505294a in the "bootstrap" repo) I
don't know, but that's how it seemed in my testing.
diff --git a/sdext/source/presenter/makefile.mk b/sdext/source/presenter/makefile.mk
old mode 100755
new mode 100644
index 818ecd1..bb8a974
--- a/sdext/source/presenter/makefile.mk
+++ b/sdext/source/presenter/makefile.mk
@@ -252,7 +252,7 @@ PLATFORMID:=$(RTL_OS:l)_$(RTL_ARCH:l)
COMPONENT_HELP= \
$(ZIP1DIR)$/help/component.txt \
- $(foreach,l,$(alllangiso) $(ZIP1DIR)$/help$/$l$/com.sun.PresenterScreen-$(PLATFORMID)$/presenter.xhp)
+ $(ZIP1DIR)$/help$/en-US$/com.sun.PresenterScreen-$(PLATFORMID)$/presenter.xhp
ZIP1DEPS= \
$(DESCRIPTION) \
More information about the Libreoffice-commits
mailing list