GNOME.org
 

ooo-build r11502 - in trunk: . patches/src680

Author: freuter
Date: Tue Feb  5 10:37:26 2008
New Revision: 11502
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11502&view=rev

Log:
Made enhanced field optional and fixed #n332443# - Disabling of field
 shading doesn't work


Added:
   trunk/patches/src680/officecfg-field-patch.diff
   trunk/patches/src680/svtools-field-patch.diff
Modified:
   trunk/ChangeLog
   trunk/patches/src680/apply
   trunk/patches/src680/offapi-field-patch.diff
   trunk/patches/src680/sw-field-patch.diff
   trunk/patches/src680/xmloff-field-patch.diff

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Tue Feb  5 10:37:26 2008
@@ -2124,10 +2124,12 @@
 [ TemporaryHacks ]
 
 # First work on field enhancements...
-# FIXME: please, make it unidiff
+offapi-field-patch.diff, flr, n#248354
+svtools-field-patch.diff, flr, n#248354
 sw-field-patch.diff, flr, n#248354
 xmloff-field-patch.diff, flr, n#248354
-offapi-field-patch.diff, flr, n#248354
+#officecfg-field-patch.diff, flr, n#248354 // to enable the field stuff enable tis
+
 
 [ Fixes ]
 sc-xclimpchangetrack-discard-bogus-formula-size.diff, n#355304, tml

Modified: trunk/patches/src680/offapi-field-patch.diff
==============================================================================
--- trunk/patches/src680/offapi-field-patch.diff	(original)
+++ trunk/patches/src680/offapi-field-patch.diff	Tue Feb  5 10:37:26 2008
@@ -1,30 +1,3 @@
---- /dev/null
-+++ offapi/com/sun/star/text/XFormField.idl	Sat Jan 19 13:02:10 2008
-@@ -0,0 +1,24 @@
-+ #ifndef __com_sun_star_text_XFormField_idl__
-+ #define __com_sun_star_text_XFormField_idl__
-+ 
-+ #ifndef __com_sun_star_uno_XInterface_idl__
-+ #include <com/sun/star/uno/XInterface.idl>
-+ #endif
-+ 
-+ module com {  module sun {  module star {  module text { 
-+ 
-+ interface XFormField: com::sun::star::uno::XInterface
-+ {
-+ 	short getType();
-+ 	short getRes();
-+ 	string getDescription( ); 	
-+ 
-+ 	void setType([in] short fieldType );
-+ 	void setRes([in] short res );
-+ 	void setDescription([in] string description );
-+ 
-+ };
-+ 
-+ }; }; }; }; 
-+ 
-+ #endif
 diff --git a/offapi/com/sun/star/text/makefile.mk b/offapi/com/sun/star/text/makefile.mk
 index 31d1337..6367eb9 100644
 --- offapi/com/sun/star/text/makefile.mk

Added: trunk/patches/src680/officecfg-field-patch.diff
==============================================================================
--- (empty file)
+++ trunk/patches/src680/officecfg-field-patch.diff	Tue Feb  5 10:37:26 2008
@@ -0,0 +1,18 @@
+diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+index c753f23..3675b36 100644
+--- officecfg/registry/schema/org/openoffice/Office/Common.xcs
++++ officecfg/registry/schema/org/openoffice/Office/Common.xcs
+@@ -3979,6 +3979,13 @@ Dymamic border coloring means that when the mouse is hovered over a control, and
+ 						</info>
+ 						<value>true</value>
+ 					</prop>
++					<prop oor:name="ImportWWFieldsAsEnhancedFields" oor:type="xs:boolean">
++						<info>
++							<desc>Flag to control
++							use of enhanced fields.</desc>
++						</info>
++						<value>true</value>
++					</prop>
+ 				</group>
+ 				<group oor:name="Export">
+ 					<info>

Added: trunk/patches/src680/svtools-field-patch.diff
==============================================================================
--- (empty file)
+++ trunk/patches/src680/svtools-field-patch.diff	Tue Feb  5 10:37:26 2008
@@ -0,0 +1,79 @@
+diff --git a/svtools/inc/fltrcfg.hxx b/svtools/inc/fltrcfg.hxx
+index e13565b..1f91edf 100644
+--- svtools/inc/fltrcfg.hxx
++++ svtools/inc/fltrcfg.hxx
+@@ -84,6 +84,9 @@ public:
+ 	sal_Bool IsWriter2WinWord() const;
+ 	void SetWriter2WinWord( sal_Bool bFlag );
+ 
++        sal_Bool IsUseEnhancedFields() const;
++        void SetUseEnhancedFields( sal_Bool  bFlag );
++
+ 	sal_Bool IsExcel2Calc() const;
+ 	void SetExcel2Calc( sal_Bool bFlag );
+ 	sal_Bool IsCalc2Excel() const;
+diff --git a/svtools/source/config/fltrcfg.cxx b/svtools/source/config/fltrcfg.cxx
+index 12611b9..451f578 100644
+--- svtools/source/config/fltrcfg.cxx
++++ svtools/source/config/fltrcfg.cxx
+@@ -72,6 +72,7 @@ using namespace com::sun::star::uno;
+ #define FILTERCFG_CALC_SAVE				0x2000
+ #define FILTERCFG_IMPRESS_LOAD			0x4000
+ #define FILTERCFG_IMPRESS_SAVE			0x8000
++#define FILTERCFG_USE_ENHANCED_FIELDS			0x10000
+ 
+ static SvtFilterOptions* pOptions=0;
+ 
+@@ -171,7 +172,7 @@ struct SvtFilterOptions_Impl
+ 					FILTERCFG_MATH_LOAD		| FILTERCFG_MATH_SAVE |
+ 					FILTERCFG_WRITER_LOAD	| FILTERCFG_WRITER_SAVE |
+ 					FILTERCFG_CALC_LOAD		| FILTERCFG_CALC_SAVE	|
+-					FILTERCFG_IMPRESS_LOAD	| FILTERCFG_IMPRESS_SAVE;
++					FILTERCFG_IMPRESS_LOAD	| FILTERCFG_IMPRESS_SAVE | FILTERCFG_USE_ENHANCED_FIELDS;
+ 		   Load();
+ 		}
+ 
+@@ -247,7 +248,7 @@ const Sequence<OUString>& SvtFilterOptions::GetPropertyNames()
+ 	static Sequence<OUString> aNames;
+ 	if(!aNames.getLength())
+ 	{
+-		int nCount = 8;
++		int nCount = 9;
+ 		aNames.realloc(nCount);
+ 		static const char* aPropNames[] =
+ 		{
+@@ -258,7 +259,8 @@ const Sequence<OUString>& SvtFilterOptions::GetPropertyNames()
+ 			"Export/MathToMathType",            //  4
+ 			"Export/WriterToWinWord",           //  5
+ 			"Export/ImpressToPowerPoint",       //  6
+-			"Export/CalcToExcel"            	//  7
++			"Export/CalcToExcel",            	//  7
++                        "Import/ImportWWFieldsAsEnhancedFields" // 8
+ 		};
+ 		OUString* pNames = aNames.getArray();
+ 		for(int i = 0; i < nCount; i++)
+@@ -280,6 +282,7 @@ static ULONG lcl_GetFlag(sal_Int32 nProp)
+ 		case  5: nFlag = FILTERCFG_WRITER_SAVE; break;
+ 		case  6: nFlag = FILTERCFG_IMPRESS_SAVE; break;
+ 		case  7: nFlag = FILTERCFG_CALC_SAVE; break;
++		case  8: nFlag =  FILTERCFG_USE_ENHANCED_FIELDS; break;
+ 		default: DBG_ERROR("illegal value");
+ 	}
+ 	return nFlag;
+@@ -453,6 +456,16 @@ void SvtFilterOptions::SetWriter2WinWord( BOOL bFlag )
+ 	SetModified();
+ }
+ 
++BOOL SvtFilterOptions::IsUseEnhancedFields() const
++{
++	return pImp->IsFlag( FILTERCFG_USE_ENHANCED_FIELDS );
++}
++
++void SvtFilterOptions::SetUseEnhancedFields( BOOL bFlag )
++{
++	pImp->SetFlag( FILTERCFG_USE_ENHANCED_FIELDS, bFlag );
++	SetModified();
++}
+ 
+ // -----------------------------------------------------------------------
+ BOOL SvtFilterOptions::IsExcel2Calc() const

Modified: trunk/patches/src680/sw-field-patch.diff
==============================================================================
--- trunk/patches/src680/sw-field-patch.diff	(original)
+++ trunk/patches/src680/sw-field-patch.diff	Tue Feb  5 10:37:26 2008
@@ -215,7 +215,7 @@
   * Hier kommen erst mal die enums fuer die Hints
   */
 diff --git a/sw/inc/unocoll.hxx b/sw/inc/unocoll.hxx
-index f28f44f..50deed4 100644
+index f28f44f..a3394fd 100644
 --- sw/inc/unocoll.hxx
 +++ sw/inc/unocoll.hxx
 @@ -220,8 +220,10 @@ class SwUnoCollection
@@ -230,16 +230,14 @@
  
  #define SW_SERVICE_INVALID			USHRT_MAX
  
-@@ -501,6 +503,9 @@ public:
+@@ -501,7 +503,6 @@ public:
  	static SwXBookmark* 	GetObject( SwBookmark& rBkm, SwDoc* pDoc );
  };
  
-+class SwXFieldmarks : public SwXBookmarks
-+{
-+};
- 
+-
  class SwXNumberingRulesCollection : public cppu::WeakImplHelper1
  <
+     ::com::sun::star::container::XIndexAccess
 diff --git a/sw/inc/unoobj.hxx b/sw/inc/unoobj.hxx
 index 0c71066..c7de042 100644
 --- sw/inc/unoobj.hxx
@@ -776,7 +774,7 @@
  	//Geht auch FlyFrms rekursiv hoch. Geht auch von Fussnoten zum Anker.
  	const SwFrm *pFrm = this;
 diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
-index 9637868..47900ed 100644
+index 9637868..c13102a 100644
 --- sw/source/core/text/inftxt.cxx
 +++ sw/source/core/text/inftxt.cxx
 @@ -156,6 +156,9 @@
@@ -864,17 +862,16 @@
  /*************************************************************************
   *					   SwTxtPaintInfo::DrawViewOpt()
   *************************************************************************/
-@@ -1244,7 +1308,7 @@ void SwTxtPaintInfo::DrawViewOpt( const SwLinePortion &rPor,
+@@ -1241,6 +1305,7 @@ void SwTxtPaintInfo::DrawViewOpt( const SwLinePortion &rPor,
+ 			default:
+ 			{
+ 				ASSERT( !this, "SwTxtPaintInfo::DrawViewOpt: don't know how to draw this" );
++				printf("SwTxtPaintInfo::DrawViewOpt %04X\n", (int)nWhich);
  				break;
  			}
  		}
--		if ( bDraw )
-+//		if ( bDraw )
- 			DrawBackground( rPor );
- 	}
- }
 diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx
-index 21cbddc..9d2bfe1 100644
+index 21cbddc..e96c784 100644
 --- sw/source/core/text/inftxt.hxx
 +++ sw/source/core/text/inftxt.hxx
 @@ -455,7 +455,9 @@ public:
@@ -882,7 +879,7 @@
  	void DrawViewOpt( const SwLinePortion &rPor, const MSHORT nWhich ) const;
  	inline void DrawBackBrush( const SwLinePortion &rPor ) const
 -		{ if( pFnt->GetBackColor() ) _DrawBackBrush( rPor ); }
-+	{ /*if( pFnt->GetBackColor() )*/ _DrawBackBrush( rPor ); }
++	{ /* if( pFnt->GetBackColor() ) */ _DrawBackBrush( rPor ); }
 +
 +        void DrawCheckBox( const SwFieldFormPortion &rPor, bool checked) const;
  
@@ -1141,7 +1138,7 @@
 +    return ret;
 +}
 diff --git a/sw/source/core/text/portxt.hxx b/sw/source/core/text/portxt.hxx
-index ca2fde9..d41aa2f 100644
+index ca2fde9..dbf9b27 100644
 --- sw/source/core/text/portxt.hxx
 +++ sw/source/core/text/portxt.hxx
 @@ -103,8 +103,30 @@ public:
@@ -1151,7 +1148,7 @@
 +class SwFieldMarkPortion : public SwTxtPortion {
 +public:
 +    inline SwFieldMarkPortion() : SwTxtPortion() {
-+	Width(100);
++
 +    }
 +    virtual void Paint( const SwTxtPaintInfo &rInf ) const;
 +    virtual sal_Bool Format( SwTxtFormatInfo &rInf );
@@ -1160,7 +1157,7 @@
 +class SwFieldFormPortion : public SwTxtPortion {
 +public:
 +    inline SwFieldFormPortion() : SwTxtPortion() {
-+//	Width(100);
++
 +    }
 +    virtual void Paint( const SwTxtPaintInfo &rInf ) const;
 +    virtual sal_Bool Format( SwTxtFormatInfo &rInf );
@@ -1990,7 +1987,7 @@
      //No copying
      SwWW8Writer(const SwWW8Writer&);
 diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
-index b902c49..4360751 100644
+index b902c49..d94b2e1 100644
 --- sw/source/filter/ww8/ww8par.cxx
 +++ sw/source/filter/ww8/ww8par.cxx
 @@ -286,6 +286,8 @@
@@ -2002,18 +1999,20 @@
  #define MM_250 1417             // WW-Default fuer Hor. Seitenraender: 2.5 cm
  #define MM_200 1134             // WW-Default fuer u.Seitenrand: 2.0 cm
  
-@@ -1616,6 +1618,10 @@ void SwWW8ImplReader::ImportDop()
+@@ -1616,6 +1618,12 @@ void SwWW8ImplReader::ImportDop()
          }
      }
  
-+    if (pWDop->fProtEnabled) {
-+	rDoc.set(IDocumentSettingAccess::PROTECT_FORM, true );
++    const SvtFilterOptions* pOpt = SvtFilterOptions::Get();
++    sal_Bool bUseEnhFields=(pOpt && pOpt->IsUseEnhancedFields());
++    if (bUseEnhFields) {
++	rDoc.set(IDocumentSettingAccess::PROTECT_FORM, pWDop->fProtEnabled );
 +    }
 +
      maTracer.LeaveEnvironment(sw::log::eDocumentProperties);
  }
  
-@@ -1722,6 +1728,7 @@ WW8ReaderSave::WW8ReaderSave(SwWW8ImplRe
+@@ -1722,6 +1730,7 @@ WW8ReaderSave::WW8ReaderSave(SwWW8ImplReader* pRdr ,WW8_CP nStartCp) :
      maOldApos.push_back(false);
      maOldApos.swap(pRdr->maApos);
      maOldFieldStack.swap(pRdr->maFieldStack);
@@ -2021,7 +2020,7 @@
  }
  
  void WW8ReaderSave::Restore( SwWW8ImplReader* pRdr )
-@@ -1768,6 +1775,7 @@ void WW8ReaderSave::Restore( SwWW8ImplRe
+@@ -1768,6 +1777,7 @@ void WW8ReaderSave::Restore( SwWW8ImplReader* pRdr )
          pRdr->pPlcxMan->RestoreAllPLCFx(maPLCFxSave);
      pRdr->maApos.swap(maOldApos);
      pRdr->maFieldStack.swap(maOldFieldStack);
@@ -2029,7 +2028,7 @@
  }
  
  void SwWW8ImplReader::Read_HdFtFtnText( const SwNodeIndex* pSttIdx,
-@@ -2737,6 +2745,22 @@ bool SwWW8ImplReader::ReadChar(long nPos
+@@ -2737,6 +2747,22 @@ bool SwWW8ImplReader::ReadChar(long nPosCp, long nCpOfs)
          case 0x15:
              if( !bSpec )        // Juristenparagraph
                  cInsert = '\xa7';
@@ -2052,17 +2051,26 @@
              break;
          case 0x9:
              cInsert = '\x9';    // Tab
-@@ -3530,7 +3554,7 @@ void wwSectionManager::InsertSegments()
+@@ -3522,6 +3548,8 @@ bool wwSectionManager::IsNewDoc() const
+ 
+ void wwSectionManager::InsertSegments()
+ {
++    const SvtFilterOptions* pOpt = SvtFilterOptions::Get();
++    sal_Bool bUseEnhFields=(pOpt && pOpt->IsUseEnhancedFields());
+     mySegIter aEnd = maSegments.end();
+     mySegIter aStart = maSegments.begin();
+     for (mySegIter aIter = aStart; aIter != aEnd; ++aIter)
+@@ -3530,7 +3558,7 @@ void wwSectionManager::InsertSegments()
  
          bool bInsertSection = aIter != aStart ? aIter->IsContinous() : false;
          bool bInsertPageDesc = !bInsertSection;
 -        bool bProtected = SectionIsProtected(*aIter);
-+        bool bProtected = false; //SectionIsProtected(*aIter);
++        bool bProtected = !bUseEnhFields && SectionIsProtected(*aIter); // do we really  need this ?? I guess I have a different logic in editshell which disales this...
  
          if (bInsertPageDesc)
          {
 diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
-index 5748ff8..95580bb 100644
+index 5748ff8..cb1124a 100644
 --- sw/source/filter/ww8/ww8par.hxx
 +++ sw/source/filter/ww8/ww8par.hxx
 @@ -390,6 +390,32 @@ public:
@@ -2117,14 +2125,15 @@
      A stack of open footnotes. Should only be one in it at any time.
      */
 diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
-index 9bfd62e..43de610 100644
+index 9bfd62e..5c0a897 100644
 --- sw/source/filter/ww8/ww8par3.cxx
 +++ sw/source/filter/ww8/ww8par3.cxx
-@@ -221,9 +221,57 @@
+@@ -221,9 +221,58 @@
  #include "ww8par2.hxx"  // wg. Listen-Attributen in Styles
  #endif
  
 +#include <bookmrk.hxx>	
++#include <svtools/fltrcfg.hxx>
 +
 +#include <stdio.h>
 +
@@ -2178,12 +2187,8 @@
  //-----------------------------------------
  //            UNO-Controls
  //-----------------------------------------
-@@ -239,10 +287,13 @@ eF_ResT SwWW8ImplReader::Read_F_OCX( WW8
- 
- eF_ResT SwWW8ImplReader::Read_F_FormTextBox( WW8FieldDesc* pF, String& rStr )
+@@ -241,8 +290,9 @@ eF_ResT SwWW8ImplReader::Read_F_FormTextBox( WW8FieldDesc* pF, String& rStr )
  {
-+    ::rtl::OUString us(rStr);
-+    ::rtl::OString os=::rtl::OUStringToOString(us, RTL_TEXTENCODING_UTF8);
      WW8FormulaEditBox aFormula(*this);
  
 -    if (0x01 == rStr.GetChar(writer_cast<xub_StrLen>(pF->nLCode-1)))
@@ -2193,28 +2198,45 @@
  
      /* #80205#
      Here we have a small complication. This formula control contains
-@@ -254,10 +305,12 @@ eF_ResT SwWW8ImplReader::Read_F_FormText
+@@ -254,23 +304,58 @@ eF_ResT SwWW8ImplReader::Read_F_FormTextBox( WW8FieldDesc* pF, String& rStr )
      the field result into the formula here in place of the default
      text.
      */
-+#if 0 // not needed any longer...
-     aFormula.sDefault = GetFieldResult(pF);
+-    aFormula.sDefault = GetFieldResult(pF);
  
-+    ::rtl::OUString fdlResult(GetFieldResult(pF));
-+    
-     //substituting Unicode spacing 0x2002 with double space for layout
+-    //substituting Unicode spacing 0x2002 with double space for layout
 -#if 0
-     aFormula.sDefault.SearchAndReplaceAll(
-         String(static_cast< sal_Unicode >(0x2002)),
-         CREATE_CONST_ASC("  "));
-@@ -268,9 +321,38 @@ eF_ResT SwWW8ImplReader::Read_F_FormText
-     aFld.SetHelp(aFormula.sHelp);
-     aFld.SetToolTip(aFormula.sToolTip);
+-    aFormula.sDefault.SearchAndReplaceAll(
+-        String(static_cast< sal_Unicode >(0x2002)),
+-        CREATE_CONST_ASC("  "));
+-#endif
++    const SvtFilterOptions* pOpt = SvtFilterOptions::Get();
++    sal_Bool bUseEnhFields=(pOpt && pOpt->IsUseEnhancedFields());
+ 
+-    SwInputField aFld((SwInputFieldType*)rDoc.GetSysFldType( RES_INPUTFLD ),
+-        aFormula.sDefault , aFormula.sTitle , INP_TXT, 0 );
+-    aFld.SetHelp(aFormula.sHelp);
+-    aFld.SetToolTip(aFormula.sToolTip);
++    if (!bUseEnhFields) {
++	aFormula.sDefault = GetFieldResult(pF);
  
 -    rDoc.Insert(*pPaM, SwFmtFld(aFld), 0);
-+//    rDoc.Insert(*pPaM, SwFmtFld(aFld), 0); not needed any longer... // enable this if you want legacy fields..
++#if 0 // why not? (flr)
++    //substituting Unicode spacing 0x2002 with double space for layout
++	aFormula.sDefault.SearchAndReplaceAll(
++	    String(static_cast< sal_Unicode >(0x2002)),
++	    CREATE_CONST_ASC("  "));
++#endif
  
 -    return FLD_OK;
++	SwInputField aFld((SwInputFieldType*)rDoc.GetSysFldType( RES_INPUTFLD ),
++			  aFormula.sDefault , aFormula.sTitle , INP_TXT, 0 );
++	aFld.SetHelp(aFormula.sHelp);
++	aFld.SetToolTip(aFormula.sToolTip);
++
++	rDoc.Insert(*pPaM, SwFmtFld(aFld), 0); 
++	return FLD_OK;
++    } else {
 +	WW8PLCFx_Book* pB = pPlcxMan->GetBook();
 +	String aBookmarkName;
 +	if (pB!=NULL) {
@@ -2243,20 +2265,27 @@
 +		pFieldCtx->AddParam(::rtl::OUString::createFromAscii("Description"), aFormula.sToolTip);
 +		pFieldCtx->AddParam(::rtl::OUString::createFromAscii("Name"), aFormula.sTitle);
 +	}
-+
-+    return FLD_TEXT; //FLD_OK;
++	return FLD_TEXT;
++    }
  }
  
  eF_ResT SwWW8ImplReader::Read_F_FormCheckBox( WW8FieldDesc* pF, String& rStr )
-@@ -283,7 +365,40 @@ eF_ResT SwWW8ImplReader::Read_F_FormChec
+@@ -282,9 +367,47 @@ eF_ResT SwWW8ImplReader::Read_F_FormCheckBox( WW8FieldDesc* pF, String& rStr )
+ 
      if (0x01 == rStr.GetChar(writer_cast<xub_StrLen>(pF->nLCode-1)))
          ImportFormulaControl(aFormula,pF->nSCode+pF->nLCode-1, WW8_CT_CHECKBOX);
- 
+-
 -    pFormImpl->InsertFormula(aFormula);
-+//    pFormImpl->InsertFormula(aFormula); not needed anymore; enable this if you want legacy field support
+-    return FLD_OK;
++    const SvtFilterOptions* pOpt = SvtFilterOptions::Get();
++    sal_Bool bUseEnhFields=(pOpt && pOpt->IsUseEnhancedFields());
 +
++    if (!bUseEnhFields) {
++	pFormImpl->InsertFormula(aFormula); 
++	return FLD_OK;
++    } else {
 +	String aBookmarkName;
-+    WW8PLCFx_Book* pB = pPlcxMan->GetBook();
++	WW8PLCFx_Book* pB = pPlcxMan->GetBook();
 +	if (pB!=NULL) {
 +		WW8_CP currentCP=pF->nSCode;
 +		WW8_CP currentLen=pF->nLen;
@@ -2287,10 +2316,12 @@
 +			// set field data here...
 +		}
 +	}
-     return FLD_OK;
++	return FLD_OK;
++    }
  }
  
-@@ -2041,6 +2156,10 @@ bool SwWW8ImplReader::ImportFormulaContr
+ eF_ResT SwWW8ImplReader::Read_F_FormListBox( WW8FieldDesc* pF, String& rStr)
+@@ -2041,6 +2164,10 @@ bool SwWW8ImplReader::ImportFormulaControl(WW8FormulaControl &aFormula,
      if((aPic.lcb > 0x3A) && !pDataStream->GetError() )
      {
          pDataStream->Seek( nPicLocFc + aPic.cbHeader );
@@ -2509,7 +2540,7 @@
  	// on graphics
  	BOOL SelectNextPrevHyperlink( BOOL bNext = TRUE );
 diff --git a/sw/source/ui/uno/SwXDocumentSettings.cxx b/sw/source/ui/uno/SwXDocumentSettings.cxx
-index a22a6ab..ac4c05c 100644
+index 70c570e..661cc1b 100644
 --- sw/source/ui/uno/SwXDocumentSettings.cxx
 +++ sw/source/ui/uno/SwXDocumentSettings.cxx
 @@ -160,7 +160,8 @@ enum SwDocumentSettingsPropertyHandles

Modified: trunk/patches/src680/xmloff-field-patch.diff
==============================================================================
--- trunk/patches/src680/xmloff-field-patch.diff	(original)
+++ trunk/patches/src680/xmloff-field-patch.diff	Tue Feb  5 10:37:26 2008
@@ -137,7 +137,7 @@
  
  	mxAttrList = (xml::sax::XAttributeList*)mpAttrList;
 diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
-index 1f20a76..1750977 100644
+index 326703e..f01cd9b 100644
 --- xmloff/source/core/xmlimp.cxx
 +++ xmloff/source/core/xmlimp.cxx
 @@ -191,6 +191,7 @@ sal_Char __READONLY_DATA sXML_np__db[] = "_db";
@@ -148,7 +148,7 @@
  
  sal_Char __READONLY_DATA sXML_np__fo_old[] = "__fo";
  sal_Char __READONLY_DATA sXML_np__xlink_old[] = "__xlink";
-@@ -357,6 +358,7 @@ void SvXMLImport::_InitCtor()
+@@ -354,6 +355,7 @@ void SvXMLImport::_InitCtor()
                              XML_NAMESPACE_XFORMS );
  		mpNamespaceMap->Add( OUString( RTL_CONSTASCII_USTRINGPARAM ( sXML_np__ooow ) ), GetXMLToken(XML_N_OOOW), XML_NAMESPACE_OOOW );
  		mpNamespaceMap->Add( OUString( RTL_CONSTASCII_USTRINGPARAM ( sXML_np__oooc ) ), GetXMLToken(XML_N_OOOC), XML_NAMESPACE_OOOC );
@@ -508,7 +508,7 @@
  
  #endif
 diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
-index 197d31d..b69c0d6 100644
+index 197d31d..0e643b1 100644
 --- xmloff/source/text/txtimp.cxx
 +++ xmloff/source/text/txtimp.cxx
 @@ -425,6 +425,11 @@ static __FAR_DATA SvXMLTokenMapEntry aTextPElemTokenMap[] =
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]