[ooo-build-commit] 3 commits - patches/dev300

Tor Lillqvist tml at kemper.freedesktop.org
Thu Aug 13 07:08:47 PDT 2009


 patches/dev300/apply                                    |    3 
 patches/dev300/mozilla-source-1.7.5.patch.diff          |   11 --
 patches/dev300/scp2_accessories_templates_makefile.diff |   18 ++--
 patches/dev300/seamonkey-source-1.1.14.patch.diff       |   10 ++
 patches/dev300/sw-tab-export-fix-i100264.diff           |   71 ----------------
 5 files changed, 21 insertions(+), 92 deletions(-)

New commits:
commit 4ac1f46f91af331fb532de319bfaffdbf87db3ff
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Aug 13 17:00:59 2009 +0300

    Fix for i#100264 is in upstream
    
    * patches/dev300/sw-tab-export-fix-i100264.diff: Delete.
    * patches/dev300/apply: Drop it.
     Please enter the commit message for your changes. Lines starting

diff --git a/patches/dev300/apply b/patches/dev300/apply
index bb8c50f..c23ede3 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2662,7 +2662,6 @@ setup_native-package-glib2.diff
 fix-ppt-linespacing-import-export.diff, n#355302, rodo
 sw-section-import-fix.diff, n#364533, freuter
 sw-allow-negative-spacing.diff, n#364534, freuter
-sw-tab-export-fix-i100264.diff, n#479068, freuter
 sw-section-header-export-problem.diff, i#100918, freuter
 oox-fix-abs-relations.diff, n#493528, freuter
 field-patch.diff, n#248354, freuter
diff --git a/patches/dev300/sw-tab-export-fix-i100264.diff b/patches/dev300/sw-tab-export-fix-i100264.diff
deleted file mode 100644
index ec3419f..0000000
--- a/patches/dev300/sw-tab-export-fix-i100264.diff
+++ /dev/null
@@ -1,71 +0,0 @@
-diff --git sw/source/filter/ww8/wrtw8sty.cxx sw/source/filter/ww8/wrtw8sty.cxx
-index fc97f47..1528f49 100644
---- sw/source/filter/ww8/wrtw8sty.cxx
-+++ sw/source/filter/ww8/wrtw8sty.cxx
-@@ -432,7 +432,13 @@ void WW8WrtStyle::BuildUpx(const SwFmt* pFmt, bool bPap, USHORT nPos,
-     if( bPap )
-         SwWW8Writer::InsUInt16( *pO, nPos);     // Style-Nummer
- 
-+    assert(rWrt.pCurrentStyle==NULL);   // set current style before calling out
-+    rWrt.pCurrentStyle=pFmt;
-+    
-     rWrt.Out_SwFmt( *pFmt, bPap, !bPap );
-+    
-+    assert(rWrt.pCurrentStyle!=pFmt);  // reset current style...
-+    rWrt.pCurrentStyle=NULL;
- 
-     if( bInsDefCharSiz  )                   // nicht abgeleitet v. anderem Style
-         Set1StyleDefaults( *pFmt, bPap );
-diff --git sw/source/filter/ww8/wrtww8.cxx sw/source/filter/ww8/wrtww8.cxx
-index da32ca5..61e499e 100644
---- sw/source/filter/ww8/wrtww8.cxx
-+++ sw/source/filter/ww8/wrtww8.cxx
-@@ -2660,6 +2660,7 @@ ULONG SwWW8Writer::StoreDoc()
-     // <--
-     nStyleBeforeFly = nLastFmtId = 0;
-     pStyAttr = 0;
-+    pCurrentStyle = NULL;
-     pOutFmtNode = 0;
-     pEscher = 0;
-     pRedlAuthors = 0;
-diff --git sw/source/filter/ww8/wrtww8.hxx sw/source/filter/ww8/wrtww8.hxx
-index 9b3b5de..bd4e551 100644
---- sw/source/filter/ww8/wrtww8.hxx
-+++ sw/source/filter/ww8/wrtww8.hxx
-@@ -482,6 +482,7 @@ public:
-     SwWW8WrGrf* pGrf;
-     const SwAttrSet* pStyAttr;      // StyleAttr fuer Tabulatoren
-     const SwModify* pOutFmtNode;    // write Format or Node
-+    const SwFmt *pCurrentStyle;     // iff bStyDef=true, then this store the current style
- 
-     MainTxtPlcDrawObj *pSdrObjs;   // Draw-/Fly-Objects
-     HdFtPlcDrawObj *pHFSdrObjs;     // Draw-/Fly-Objects in header or footer
-diff --git sw/source/filter/ww8/ww8atr.cxx sw/source/filter/ww8/ww8atr.cxx
-index 3e01060..60a93db 100644
---- sw/source/filter/ww8/ww8atr.cxx
-+++ sw/source/filter/ww8/ww8atr.cxx
-@@ -4958,6 +4958,24 @@ static Writer& OutWW8_SwTabStop(Writer& rWrt, const SfxPoolItem& rHt)
-     const SfxPoolItem* pLR = rWW8Wrt.HasItem( RES_LR_SPACE );
-     long nCurrentLeft = pLR ? ((const SvxLRSpaceItem*)pLR)->GetTxtLeft() : 0;
- 
-+
-+    // --> FLR 2009-03-17 #i100264#
-+    if (rWW8Wrt.bStyDef 
-+	&& rWW8Wrt.pCurrentStyle!=NULL 
-+	&& rWW8Wrt.pCurrentStyle->DerivedFrom()!=NULL) {
-+      SvxTabStopItem aTabs(0, 0, SVX_TAB_ADJUST_DEFAULT, RES_PARATR_TABSTOP);
-+      const SwFmt *pParentStyle=rWW8Wrt.pCurrentStyle->DerivedFrom();
-+      const SvxTabStopItem* pParentTabs=HasItem<SvxTabStopItem>(pParentStyle->GetAttrSet(), RES_PARATR_TABSTOP);
-+      if (pParentTabs) {
-+	aTabs.Insert(pParentTabs);
-+      }
-+      
-+      OutWW8_SwTabStopDelAdd(rWW8Wrt, aTabs, 0, rTStops, 0);
-+      return rWrt;
-+    }
-+    // <--
-+
-+
-     // StyleDef -> "einfach" eintragen || keine Style-Attrs -> dito
-     const SvxTabStopItem* pStyleTabs = 0;
-     if (!rWW8Wrt.bStyDef && rWW8Wrt.pStyAttr)
commit 7b780cec62c422a0b1bb3b2e7f4d16c754d7a3b3
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Aug 13 16:50:14 2009 +0300

    Adapt mozilla patch patch
    
    * patches/dev300/mozilla-source-1.7.5.patch.diff: Delete.
    * patches/dev300/seamonkey-source-1.1.14.patch.diff: New file. Just
      remove the offending unnecessary added echo.
    * patches/dev300/apply: Corresponding change.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 968837f..bb8c50f 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2646,7 +2646,7 @@ ooowikipedia_toolbars.diff
 ooop-updatable-sameversion.diff
 
 [ Win32Only ]
-mozilla-source-1.7.5.patch.diff, i#84961, tml
+seamonkey-source-1.1.14.patch.diff, i#84961, tml
 
 [ TemporaryHacks ]
 
diff --git a/patches/dev300/mozilla-source-1.7.5.patch.diff b/patches/dev300/mozilla-source-1.7.5.patch.diff
deleted file mode 100644
index 01d0084..0000000
--- a/patches/dev300/mozilla-source-1.7.5.patch.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- moz/mozilla-source-1.7.5.patch
-+++ moz/mozilla-source-1.7.5.patch
-@@ -259,7 +259,7 @@
-   
-   $(XPIDL_GEN_DIR)/%.h: %.idl $(XPIDL_COMPILE) $(XPIDL_GEN_DIR)/.done
-   	$(REPORT_BUILD)
--+ 	echo "PATH=" $(PATH)
-++ 	echo "PATH=" "$(PATH)"
-    	$(ELOG) $(XPIDL_COMPILE) -m header -w -I$(srcdir) -I$(IDL_DIR) -o $(XPIDL_GEN_DIR)/$* $(_VPATH_SRCS)
-   	@if test -n "$(findstring $*.h, $(EXPORTS) $(SDK_HEADERS))"; \
-   	  then echo "*** WARNING: file $*.h generated from $*.idl overrides $(srcdir)/$*.h"; else true; fi
diff --git a/patches/dev300/seamonkey-source-1.1.14.patch.diff b/patches/dev300/seamonkey-source-1.1.14.patch.diff
new file mode 100644
index 0000000..e3e53d2
--- /dev/null
+++ b/patches/dev300/seamonkey-source-1.1.14.patch.diff
@@ -0,0 +1,10 @@
+--- moz/seamonkey-source-1.1.14.patch
++++ moz/seamonkey-source-1.1.14.patch
+@@ -259,7 +259,6 @@
+  
+  $(XPIDL_GEN_DIR)/%.h: %.idl $(XPIDL_COMPILE) $(XPIDL_GEN_DIR)/.done
+  	$(REPORT_BUILD)
+-+	echo "PATH=" $(PATH)
+  	$(ELOG) $(XPIDL_COMPILE) -m header -w -I$(srcdir) -I$(IDL_DIR) -o $(XPIDL_GEN_DIR)/$* $(_VPATH_SRCS)
+  	@if test -n "$(findstring $*.h, $(EXPORTS) $(SDK_HEADERS))"; \
+  	  then echo "*** WARNING: file $*.h generated from $*.idl overrides $(srcdir)/$*.h"; else true; fi
commit 88c09a8ef026822748c15852203e61dbd7345280
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Aug 13 16:40:33 2009 +0300

    Adapt scp2_accessories_templates_makefile.diff for dev300-m54
    
    * patches/dev300/scp2_accessories_templates_makefile.diff: Adapt for
      dev300-m54.

diff --git a/patches/dev300/scp2_accessories_templates_makefile.diff b/patches/dev300/scp2_accessories_templates_makefile.diff
index be7ea95..e7c0747 100644
--- a/patches/dev300/scp2_accessories_templates_makefile.diff
+++ b/patches/dev300/scp2_accessories_templates_makefile.diff
@@ -1,18 +1,20 @@
---- scp2/source/templates/makefile.mk.orig	2008-06-06 11:44:33.000000000 +0200
-+++ scp2/source/templates/makefile.mk	2008-07-22 10:39:23.000000000 +0200
-@@ -44,7 +44,7 @@
+--- scp2/source/templates/makefile.mk
++++ scp2/source/templates/makefile.mk
+@@ -44,13 +44,38 @@
  COMPLETELANGISO_VAR:=$(uniq $(completelangiso) $(alllangiso))
  .EXPORT : COMPLETELANGISO_VAR
  
 -ALLTAR : $(INCCOM)$/alllangmodules.inc $(INCCOM)$/alllangmodules_root.inc $(INCCOM)$/alllangmodules_base.inc $(INCCOM)$/alllangmodules_calc.inc $(INCCOM)$/alllangmodules_draw.inc $(INCCOM)$/alllangmodules_impress.inc $(INCCOM)$/alllangmodules_math.inc $(INCCOM)$/alllangmodules_writer.inc $(INCCOM)$/alllangmodules_binfilter.inc
 +ALLTAR : $(INCCOM)$/alllangmodules.inc $(INCCOM)$/alllangmodules_root.inc $(INCCOM)$/alllangmodules_base.inc $(INCCOM)$/alllangmodules_calc.inc $(INCCOM)$/alllangmodules_draw.inc $(INCCOM)$/alllangmodules_impress.inc $(INCCOM)$/alllangmodules_math.inc $(INCCOM)$/alllangmodules_writer.inc $(INCCOM)$/alllangmodules_binfilter.inc $(INCCOM)$/alllangmodules_accessories_templates_root.inc $(INCCOM)$/alllangmodules_accessories_samples_root.inc $(INCCOM)$/alllangmodules_accessories_templates.inc $(INCCOM)$/alllangmodules_accessories_samples.inc $(INCCOM)$/alllangmodules_extensions_root.inc $(INCCOM)$/alllangmodules_extensions_templates.inc
  
- .PHONY $(INCCOM)$/alllangmodules.inc:
+ .INCLUDE .IGNORE : $(MISC)$/$(TARGET)_lang_track.mk
+ .IF "$(LAST_COMPLETELANGISO_VAR)"!="$(COMPLETELANGISO_VAR)"
+ PHONYTEMPL=.PHONY
+ .ENDIF			# "$(LAST_COMPLETELANGISO_VAR)"!="$(COMPLETELANGISO_VAR)"
+ $(INCCOM)$/alllangmodules%.inc $(PHONYTEMPL) : module_langpack%.sct
  	@@-$(RENAME) $@ $@.tmp
-@@ -85,3 +85,28 @@
- .PHONY $(INCCOM)$/alllangmodules_binfilter.inc:
- 	@@-$(RENAME) $@ $@.tmp
- 	$(PERL) -w modules.pl -i $(PRJ)$/source$/templates$/module_langpack_binfilter.sct -o $@.tmp && $(RENAME:s/+//) $@.tmp $@
+ 	$(PERL) -w modules.pl -i $< -o $@.tmp && $(RENAME:s/+//) $@.tmp $@
+ 	@echo LAST_COMPLETELANGISO_VAR=$(COMPLETELANGISO_VAR) > $(MISC)$/$(TARGET)_lang_track.mk
 +
 +.PHONY $(INCCOM)$/alllangmodules_accessories_templates_root.inc:
 +	@@-$(RENAME) $@ $@.tmp


More information about the ooo-build-commit mailing list