ooo-build r11342 - trunk/patches/src680

[strba svn gnome org]

Author: strba
Date: Mon Jan 21 15:52:30 2008
New Revision: 11342
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11342&view=rev

Log:
test for pmladek

Modified:
   trunk/patches/src680/sw-field-patch.diff

Modified: trunk/patches/src680/sw-field-patch.diff
==============================================================================
--- trunk/patches/src680/sw-field-patch.diff	(original)
+++ trunk/patches/src680/sw-field-patch.diff	Mon Jan 21 15:52:30 2008
@@ -697,7 +697,7 @@
   	}
   
 ! 	if (FORM_FIELDMARK_TEXT == eMark || FORM_FIELDMARK_NO_TEXT == eMark /* pBM->GetName().CompareToAscii(FIELD_BOOKMARK_PREFIX, strlen(FIELD_BOOKMARK_PREFIX))==0 */) {
-! 	    StartUndo(UIUNDO_REPLACE, NULL);
+! 	    StartUndo(UNDO_UI_REPLACE, NULL);
 ! 	    ASSERT(*PBM->pPos1<=*pBM->pPos2, "Bookmark positions not normalized!!!!");
 ! 	    const SwTxtNode* pStartTxtNode=this->GetNodes()[pBM->GetPos().nNode]->GetTxtNode();
 ! 	    const SwTxtNode* pEndTxtNode=this->GetNodes()[pBM->GetOtherPos()->nNode]->GetTxtNode();
@@ -735,7 +735,7 @@
   	    }
   	}
 + 	if (FORM_FIELDMARK_TEXT == eMark || FORM_FIELDMARK_NO_TEXT == eMark /*pBM->GetName().CompareToAscii(FIELD_BOOKMARK_PREFIX, strlen(FIELD_BOOKMARK_PREFIX))==0*/) {
-+ 	    EndUndo(UIUNDO_REPLACE, NULL);
++ 	    EndUndo(UNDO_UI_REPLACE, NULL);
 + 	}
 + 	return pBM;
 + }
@@ -2682,7 +2682,7 @@
 --- sw/source/filter/ww8/ww8par.hxx	21 Jan 2008 08:32:44 -0000
 ***************
 *** 385,390 ****
---- 385,414 ----
+--- 385,415 ----
       void Swap(FieldEntry &rOther) throw();
   };
   
@@ -2696,12 +2696,13 @@
 + 	typedef ::std::pair< ::rtl::OUString, ::rtl::OUString> Param_t;
 + 	typedef ::std::vector< Param_t > Params_t;
 + 	Params_t maParams;
++   SwPaM * mpPaM;
 + 
 + public:
 + 	WW8NewFieldCtx(SwPosition &aStartPos, ::rtl::OUString sBookmarkName, ::rtl::OUString sBookmarkType);
 + 	~WW8NewFieldCtx();
 + 
-+ 	SwPaM GetRange(SwPosition &aEndPos);
++ 	SwPaM& GetRange(SwPosition &aEndPos);
 + 	::rtl::OUString GetBookmarkName();
 + 	::rtl::OUString GetBookmarkType();
 + 	void AddParam(::rtl::OUString name, ::rtl::OUString value);
@@ -2744,7 +2745,7 @@
 --- sw/source/filter/ww8/ww8par3.cxx	21 Jan 2008 08:32:45 -0000
 ***************
 *** 221,229 ****
---- 221,283 ----
+--- 221,286 ----
   #include "ww8par2.hxx"  // wg. Listen-Attributen in Styles
   #endif
   
@@ -2759,20 +2760,23 @@
 + WW8NewFieldCtx::WW8NewFieldCtx(SwPosition &aStartPos, ::rtl::OUString sBookmarkName, ::rtl::OUString sBookmarkType)
 + : maPtNode(aStartPos.nNode), mnPtCntnt(aStartPos.nContent.GetIndex()), 
 +   sBookmarkName(sBookmarkName),
-+   sBookmarkType(sBookmarkType)
++   sBookmarkType(sBookmarkType), mpPaM(NULL)
 + {
 + }
 + 
 + 
 + WW8NewFieldCtx::~WW8NewFieldCtx()
 + {
++ 	if (mpPaM) delete mpPaM;
 + }
 + 
 + 
-+ SwPaM WW8NewFieldCtx::GetRange(SwPosition &aEndPos)
++ SwPaM& WW8NewFieldCtx::GetRange(SwPosition &aEndPos)
 + {
 + 	SwPosition aStartPos( maPtNode );
-+ 	return SwPaM( maPtNode, mnPtCntnt, aEndPos.nNode, aEndPos.nContent.GetIndex());
++ 	if (mpPaM) delete mpPaM;
++ 	mpPaM = new SwPaM( maPtNode, mnPtCntnt, aEndPos.nNode, aEndPos.nContent.GetIndex());
++ 	return *mpPaM;
 + }
 + 
 + ::rtl::OUString WW8NewFieldCtx::GetBookmarkName()