Commits

ihi  committed 3adce01

#i10000# build fix

  • Participants
  • Parent commits 895b116

Comments (0)

Files changed (1)

File sdext/source/pdfimport/tree/pdfiprocessor.cxx

     )
     {
         processGlyphLine();
-
-       CharGlyph aGlyph;
-
-       aGlyph.setGlyph ( rGlyphs );
-       aGlyph.setRect  ( rRect );
-       aGlyph.setFontMatrix ( rFontMatrix );
-       aGlyph.setGraphicsContext ( getCurrentContext() );
-       getGCId(getCurrentContext());
-       aGlyph.setCurElement( m_pCurElement );
-
-       aGlyph.setYPrevGlyphPosition( fYPrevTextPosition );
-       aGlyph.setXPrevGlyphPosition( fXPrevTextPosition );
-       aGlyph.setPrevGlyphHeight  ( fPrevTextHeight );
-       aGlyph.setPrevGlyphWidth   ( fPrevTextWidth );
-
-       m_GlyphsList.push_back( aGlyph );
-
-       fYPrevTextPosition  = rRect.Y1;
-       fXPrevTextPosition  = rRect.X2;
-       fPrevTextHeight     = rRect.Y2-rRect.Y1;
-       fPrevTextWidth      = rRect.X2-rRect.X1;
-
-       if( !m_bIsWhiteSpaceInLine )
-       {
-         rtl::OUString tempWhiteSpaceStr( 32 );
-         m_bIsWhiteSpaceInLine=rGlyphs.equals( tempWhiteSpaceStr );
-       }
-
-=======
-    
+    }
+   
     CharGlyph aGlyph;
     
     aGlyph.setGlyph ( rGlyphs );
         static rtl::OUString tempWhiteSpaceNonBreakingStr( 0xa0 ); 
         m_bIsWhiteSpaceInLine=(rGlyphs.equals( tempWhiteSpaceStr ) || rGlyphs.equals( tempWhiteSpaceNonBreakingStr ));
     }
->>>>>>> .merge-right.r272944
 }
 
 GraphicsContext& PDFIProcessor::getTransformGlyphContext( CharGlyph& rGlyph )