[ooo-build-commit] patches/dev300

[Tor Lillqvist]

 patches/dev300/apply                        |    3 -
 patches/dev300/sw-export-commentfields.diff |   84 ----------------------------
 2 files changed, 87 deletions(-)

New commits:
commit b748f3649993c21d9ec14805cf457f7e6f468be6
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Aug 14 12:03:15 2009 +0300

    sw-export-commentfields.diff is upstream
    
    * patches/dev300/sw-export-commentfields.diff: Delete. Issue i#101159
      is fixed and closed.
    * patches/dev300/apply: Drop it.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 26ae38d..895b85d 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2708,9 +2708,6 @@ fit-list-to-size-popup.diff, i#94086, thorsten
 # to waste for time with this fix but to focus on the refactoring
 sw-nested-positionned-tables-ww8-import-fix.diff, n#376688, flr
 
-# fix crash when exporting notes with hyperlinks
-sw-export-commentfields.diff, i#101159, cmc
-
 xmloff_dis26300_conformance.diff, n#396280, flr
 
 # don't do dns lookup on startup
diff --git a/patches/dev300/sw-export-commentfields.diff b/patches/dev300/sw-export-commentfields.diff
deleted file mode 100644
index fd82080..0000000
--- a/patches/dev300/sw-export-commentfields.diff
+++ /dev/null
@@ -1,84 +0,0 @@
-diff -ru sw/source/filter/ww8/wrtww8.cxx sw/source/filter/ww8/wrtww8.cxx
---- sw.orig/source/filter/ww8/wrtww8.cxx	2009-04-21 16:44:21.000000000 +0100
-+++ sw/source/filter/ww8/wrtww8.cxx	2009-04-21 17:11:00.000000000 +0100
-@@ -645,6 +645,11 @@
-             plc = &rWrt.pFib->lcbPlcffldEdn;
-             break;
- 
-+        case TXT_ATN:
-+            pfc = &rWrt.pFib->fcPlcffldAtn;
-+            plc = &rWrt.pFib->lcbPlcffldAtn;
-+            break;
-+
-         case TXT_TXTBOX:
-             pfc = &rWrt.pFib->fcPlcffldTxbx;
-             plc = &rWrt.pFib->lcbPlcffldTxbx;
-@@ -2455,6 +2460,7 @@
-         pFldHdFt->Write( *this );               // Fields ( Header/Footer )
-         pFldFtn->Write( *this );                // Fields ( FootNotes )
-         pFldEdn->Write( *this );                // Fields ( EndNotes )
-+        pFldAtn->Write( *this );                // Fields ( Annotations )
-         pBkmks->Write( *this );                 // Bookmarks - sttbfBkmk/
-                                                 // plcfBkmkf/plcfBkmkl
-         WriteDop( *this );                      // Document-Properties
-@@ -2490,6 +2496,7 @@
-         pFldHdFt->Write( *this );               // Fields ( Header/Footer )
-         pFldFtn->Write( *this );                // Fields ( FootNotes )
-         pFldEdn->Write( *this );                // Fields ( EndNotes )
-+        pFldAtn->Write( *this );                // Fields ( Annotations )
-         pFldTxtBxs->Write( *this );             // Fields ( Textboxes )
-         pFldHFTxtBxs->Write( *this );           // Fields ( Head/Foot-Textboxes )
- 
-@@ -2834,6 +2841,7 @@
-     pFldHdFt = new WW8_WrPlcFld( 2, TXT_HDFT );
-     pFldFtn = new WW8_WrPlcFld( 2, TXT_FTN );
-     pFldEdn = new WW8_WrPlcFld( 2, TXT_EDN );
-+    pFldAtn = new WW8_WrPlcFld( 2, TXT_ATN );
-     pFldTxtBxs = new WW8_WrPlcFld( 2, TXT_TXTBOX );
-     pFldHFTxtBxs = new WW8_WrPlcFld( 2, TXT_HFTXTBOX );
- 
-@@ -2883,6 +2891,7 @@
-     DELETEZ( pFldFtn );
-     DELETEZ( pFldTxtBxs );
-     DELETEZ( pFldHFTxtBxs );
-+    DELETEZ( pFldAtn );
-     DELETEZ( pFldEdn );
-     DELETEZ( pFldHdFt );
-     DELETEZ( pFldMain );
-@@ -3110,7 +3119,11 @@
- 
- bool WW8_WrPlcPostIt::WriteTxt(SwWW8Writer& rWrt)
- {
--    return WriteGenericTxt( rWrt, TXT_ATN, rWrt.pFib->ccpAtn );
-+    bool bRet = WriteGenericTxt( rWrt, TXT_ATN, rWrt.pFib->ccpAtn );
-+    rWrt.pFldAtn->Finish( rWrt.Fc2Cp( rWrt.Strm().Tell() ),
-+                        rWrt.pFib->ccpText + rWrt.pFib->ccpFtn
-+                        + rWrt.pFib->ccpHdr );
-+    return bRet;
- }
- 
- void WW8_WrPlcPostIt::WritePlc( SwWW8Writer& rWrt ) const
-diff -ru sw/source/filter/ww8/wrtww8.hxx sw/source/filter/ww8/wrtww8.hxx
---- sw.orig/source/filter/ww8/wrtww8.hxx	2009-04-21 16:44:21.000000000 +0100
-+++ sw/source/filter/ww8/wrtww8.hxx	2009-04-21 16:49:27.000000000 +0100
-@@ -473,6 +473,7 @@
-     WW8_WrPlcFld* pFldHdFt;         // Felder in Header/Footer
-     WW8_WrPlcFld* pFldFtn;          // Felder in FootNotes
-     WW8_WrPlcFld* pFldEdn;          // Felder in EndNotes
-+    WW8_WrPlcFld* pFldAtn;          // Felder in Annotations
-     WW8_WrPlcFld* pFldTxtBxs;       // fields in textboxes
-     WW8_WrPlcFld* pFldHFTxtBxs;     // fields in header/footer textboxes
-     WW8_WrMagicTable *pMagicTable;  // keeps track of table cell positions, and
-diff -ru sw/source/filter/ww8/ww8atr.cxx sw/source/filter/ww8/ww8atr.cxx
---- sw.orig/source/filter/ww8/ww8atr.cxx	2009-04-21 16:44:21.000000000 +0100
-+++ sw/source/filter/ww8/ww8atr.cxx	2009-04-21 16:48:29.000000000 +0100
-@@ -1764,6 +1764,9 @@
-         case TXT_EDN:
-             pFldP = pFldEdn;
-             break;
-+        case TXT_ATN:
-+            pFldP = pFldAtn;
-+            break;
-         case TXT_TXTBOX:
-             pFldP = pFldTxtBxs;
-             break;