Anonymous avatar Anonymous committed 1fff7ef

#i10000# fix for aw061

Comments (0)

Files changed (1)

drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx

 								getDXArray().begin() + static_cast< sal_uInt32 >(nNewTextEnd - getTextPosition()));
 						}
 
-<<<<<<< .working
-						aNewTransform *= rDecTrans.getB2DHomMatrix();
-
-						// prepare new DXArray for the single word
-						::std::vector< double > aNewDXArray(
-							getDXArray().begin() + static_cast< sal_uInt32 >(nNewTextStart - getTextPosition()),
-							getDXArray().begin() + static_cast< sal_uInt32 >(nNewTextEnd - getTextPosition()));
-
-=======
->>>>>>> .merge-right.r266521
 						if(bNewStartIsNotOldStart)
 						{
 							// needs to be moved to a new start position
 								}
 							}
 						}
-<<<<<<< .working
-
-						// create geometry content for the single word
-=======
 
 						// add text transformation to new transformation
 						aNewTransform *= rDecTrans.getB2DHomMatrix();
 
 						// create geometry content for the single word. Do not forget
 						// to use the new transformation
->>>>>>> .merge-right.r266521
 						basegfx::DecomposedB2DHomMatrixContainer aDecTrans(aNewTransform);
-<<<<<<< .working
-						impCreateGeometryContent(rTarget, aDecTrans, getText(), nNewTextStart,
-=======
 						
 						impCreateGeometryContent(rTarget, aDecTrans, getText(), nNewTextStart, 
->>>>>>> .merge-right.r266521
 							nNewTextEnd - nNewTextStart, aNewDXArray, aNewFontAttributes);
 
 						// prepare next word and truncate to possibilities
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.