ooo-build r13794 - in branches/ooo-build-3-0: . patches/dev300

[freuter svn gnome org]

Author: freuter
Date: Thu Sep  4 13:22:45 2008
New Revision: 13794
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13794&view=rev

Log:
resolved conflict

Modified:
   branches/ooo-build-3-0/ChangeLog
   branches/ooo-build-3-0/patches/dev300/sw-ww8-fieldandcharstyle.diff

Modified: branches/ooo-build-3-0/patches/dev300/sw-ww8-fieldandcharstyle.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/sw-ww8-fieldandcharstyle.diff	(original)
+++ branches/ooo-build-3-0/patches/dev300/sw-ww8-fieldandcharstyle.diff	Thu Sep  4 13:22:45 2008
@@ -1,6 +1,8 @@
---- sw/source/filter/ww8/wrtw8nds.cxx	8 Jul 2008 08:29:15 -0000	1.109
-+++ sw/source/filter/ww8/wrtw8nds.cxx	25 Aug 2008 15:29:32 -0000
-@@ -1641,11 +1641,27 @@
+diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
+index b25a1b6..0ac46c7 100644
+--- sw/source/filter/ww8/wrtw8nds.cxx
++++ sw/source/filter/ww8/wrtw8nds.cxx
+@@ -1735,11 +1735,27 @@ Writer& OutWW8_SwTxtNode( Writer& rWrt, SwCntntNode& rNode )
                  }
              }
          }
@@ -32,18 +34,19 @@
  
                      // Ausnahme: Fussnoten am Zeilenende
          if (nNextAttr == nEnd)
---- sw/source/filter/ww8/wrtww8.hxx	10 Apr 2008 17:22:10 -0000	1.76
-+++ sw/source/filter/ww8/wrtww8.hxx	25 Aug 2008 15:29:34 -0000
-@@ -710,6 +710,8 @@
+diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
+index 9d47ee3..0f407a6 100644
+--- sw/source/filter/ww8/wrtww8.hxx
++++ sw/source/filter/ww8/wrtww8.hxx
+@@ -709,6 +709,7 @@ public:
+     const SwTxtNode *GetHdFtPageRoot() const { return mpTopNodeOfHdFtPage; }
+ 
      void AddLinkTarget(const String& rURL);
++    WW8_WrPlcFld* CurrentFieldPlc() const;
      void CollectOutlineBookmarks(const SwDoc &rDoc);
      void AddBookmark(String sBkmkName);
-+
-+    WW8_WrPlcFld* CurrentFieldPlc() const;
- private:
-     //No copying
-     SwWW8Writer(const SwWW8Writer&);
-@@ -842,15 +844,18 @@
+ 
+@@ -845,15 +846,18 @@ class WW8_WrPlcFld : public WW8_WrPlc1
  {
  private:
      BYTE nTxtTyp;
@@ -63,9 +66,11 @@
  };
  
  class WW8_WrMagicTable : public WW8_WrPlc1
---- sw/source/filter/ww8/ww8atr.cxx	8 Jul 2008 08:30:16 -0000	1.113
-+++ sw/source/filter/ww8/ww8atr.cxx	25 Aug 2008 15:29:35 -0000
-@@ -1695,20 +1695,29 @@
+diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
+index bd907bb..942eccf 100644
+--- sw/source/filter/ww8/ww8atr.cxx
++++ sw/source/filter/ww8/ww8atr.cxx
+@@ -1695,20 +1695,29 @@ static void InsertSpecialChar( SwWW8Writer& rWrt, BYTE c, String* _pLinkStr = 0L
          rStrm.Seek( nCurrPos );
  
          // write attributes of hyperlink character 0x01
@@ -101,7 +106,7 @@
  
      rWrt.pChpPlc->AppendFkpEntry(rWrt.Strm().Tell(), aItems.Count(),
          aItems.GetData());
-@@ -1724,11 +1730,9 @@
+@@ -1724,11 +1733,9 @@ String lcl_GetExpandedField(const SwField &rFld)
      return sRet;
  }
  
@@ -115,7 +120,7 @@
      switch (nTxtTyp)
      {
          case TXT_MAINTEXT:
-@@ -1751,8 +1755,15 @@
+@@ -1751,8 +1758,15 @@ void SwWW8Writer::OutField(const SwField* pFld, ww::eField eFldType,
              break;
          default:
              ASSERT( !this, "was ist das fuer ein SubDoc-Type?" );
@@ -132,7 +137,7 @@
  
      if (WRITEFIELD_START & nMode)
      {
-@@ -1820,6 +1831,7 @@
+@@ -1820,6 +1834,7 @@ void SwWW8Writer::OutField(const SwField* pFld, ww::eField eFldType,
      {
          static const BYTE aFld14[2] = { 0x14, 0xff };
          pFldP->Append( Fc2Cp( Strm().Tell() ), aFld14 );
@@ -140,7 +145,7 @@
          InsertSpecialChar( *this, 0x14 );
      }
      if (WRITEFIELD_END & nMode)
-@@ -1847,16 +1859,25 @@
+@@ -1847,16 +1862,25 @@ void SwWW8Writer::OutField(const SwField* pFld, ww::eField eFldType,
                      BYTE aArr[12];
                      BYTE *pArr = aArr;
  
@@ -174,7 +179,7 @@
                      pChpPlc->AppendFkpEntry( pStrm->Tell(), static_cast< short >(pArr - aArr), aArr );
                  }
              }
-@@ -2322,9 +2343,9 @@
+@@ -2322,9 +2346,9 @@ void SwWW8Writer::WritePostItBegin( WW8Bytes* pOut )
  
      // sprmCFSpec true
      if( bWrtWW8 )