incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r1362931 - /incubator/ooo/trunk/main/sw/source/filter/rtf/rtffly.cxx
Date Wed, 18 Jul 2012 13:11:26 GMT
Author: alg
Date: Wed Jul 18 13:11:26 2012
New Revision: 1362931

URL: http://svn.apache.org/viewvc?rev=1362931&view=rev
Log:
RTF import filter review: correction to rtffly.cxx
Patch by: Michael Stahl

Modified:
    incubator/ooo/trunk/main/sw/source/filter/rtf/rtffly.cxx

Modified: incubator/ooo/trunk/main/sw/source/filter/rtf/rtffly.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sw/source/filter/rtf/rtffly.cxx?rev=1362931&r1=1362930&r2=1362931&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sw/source/filter/rtf/rtffly.cxx (original)
+++ incubator/ooo/trunk/main/sw/source/filter/rtf/rtffly.cxx Wed Jul 18 13:11:26 2012
@@ -1254,28 +1254,29 @@ void SwRTFParser::InsPicture( const Stri
             "SwRTFParser::InsPicture: fly array empty.");
         if (aFlyArr.Count())
         {
-		// erzeuge nur einen normalen GrafikNode und ersetze diesen gegen
-		// den vorhandenen Textnode
-		SwNodeIndex& rIdx = pPam->GetPoint()->nNode;
-		pGrfNd = pDoc->GetNodes().MakeGrfNode( rIdx,
-					rGrfNm, aEmptyStr,    // Name der Graphic !!
-					pGrf,
-					(SwGrfFmtColl*)pDoc->GetDfltGrfFmtColl() );
-
-		if( pGrfAttrSet )
-			pGrfNd->SetAttr( *pGrfAttrSet );
-
-		SwFlySave* pFlySave = aFlyArr[ aFlyArr.Count()-1 ];
-		pFlySave->nSttNd = rIdx.GetIndex() - 1;
-
-		if( 1 < aFlyArr.Count() )
-		{
-			pFlySave = aFlyArr[ aFlyArr.Count() - 2 ];
-			if( pFlySave->nEndNd == rIdx )
-				pFlySave->nEndNd = rIdx.GetIndex() - 1;
-		}
+		    // erzeuge nur einen normalen GrafikNode und ersetze diesen gegen
+		    // den vorhandenen Textnode
+		    SwNodeIndex& rIdx = pPam->GetPoint()->nNode;
+		    pGrfNd = pDoc->GetNodes().MakeGrfNode( rIdx,
+					    rGrfNm, aEmptyStr,    // Name der Graphic !!
+					    pGrf,
+					    (SwGrfFmtColl*)pDoc->GetDfltGrfFmtColl() );
+
+		    if( pGrfAttrSet )
+			    pGrfNd->SetAttr( *pGrfAttrSet );
+
+		    SwFlySave* pFlySave = aFlyArr[ aFlyArr.Count()-1 ];
+		    pFlySave->nSttNd = rIdx.GetIndex() - 1;
+
+		    if( 1 < aFlyArr.Count() )
+		    {
+			    pFlySave = aFlyArr[ aFlyArr.Count() - 2 ];
+			    if( pFlySave->nEndNd == rIdx )
+				    pFlySave->nEndNd = rIdx.GetIndex() - 1;
+		    }
 
-        pGrfNd->onGraphicChanged();
+            pGrfNd->onGraphicChanged();
+        }
 	}
 	else
 	{
@@ -1391,7 +1392,6 @@ void SwRTFParser::_SetPictureSize( const
 			if( aSize.Width() > nBoxWidth )
 				aSize.Width() = nBoxWidth;
 		}
-        }
 	}
 
 	//JP 8.11.2001: bug 94450 - if no size exist, then the size is set by



Mime
View raw message