fix merge peculiarities

Change-Id: I8f01f16c52624611ac19dbd040ba0389ceccece2

sw/source/core/unocore/unofield.cxx

@@ -1928,7 +1928,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
         else
             pDoc->InsertPoolItem(aPam, aFmt, nInsertFlags);
 
-        SwTxtAttr* pTxtAttr = aPam.GetNode()->GetTxtNode()->GetFldTxtAttrAt( aPam.GetPoint()->nContent.GetIndex()-1, true );
+        SwTxtAttr* pTxtAttr = aPam.GetNode().GetTxtNode()->GetFldTxtAttrAt( aPam.GetPoint()->nContent.GetIndex()-1, true );
 
         // What about updating the fields? (see fldmgr.cxx)
         if (pTxtAttr)

sw/source/core/unocore/unoframe.cxx

@@ -2708,7 +2708,7 @@ void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRan
         {
             eAnchorId = ((const SwFmtAnchor*)pItem)->GetAnchorId();
             if( FLY_AT_FLY == eAnchorId &&
-                !aPam.GetNode()->FindFlyStartNode())
+                !aPam.GetNode().FindFlyStartNode())
             {
                 // framebound only where a frame exists
                 SwFmtAnchor aAnchor(FLY_AT_PARA);