summaryrefslogtreecommitdiff
path: root/sdext
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2009-06-22 10:07:11 +0000
committerIvo Hinkelmann <ihi@openoffice.org>2009-06-22 10:07:11 +0000
commit308f6e8efee214233bc38ce69db2fa305704206b (patch)
treee652504d79a0c7d23b15dd5b97de93c09cd398b4 /sdext
parente5f2a5bb841a424d583293b3a6b5cd4f035cb82a (diff)
#i10000# build fix
Diffstat (limited to 'sdext')
-rw-r--r--sdext/source/pdfimport/tree/pdfiprocessor.cxx31
1 files changed, 1 insertions, 30 deletions
diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.cxx b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
index ccfc273124e1..2a025430b722 100644
--- a/sdext/source/pdfimport/tree/pdfiprocessor.cxx
+++ b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
@@ -455,35 +455,7 @@ void PDFIProcessor::drawGlyphLine( const rtl::OUString& rGlyphs,
)
{
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;
@@ -512,7 +484,6 @@ void PDFIProcessor::drawGlyphLine( const rtl::OUString& rGlyphs,
static rtl::OUString tempWhiteSpaceNonBreakingStr( 0xa0 );
m_bIsWhiteSpaceInLine=(rGlyphs.equals( tempWhiteSpaceStr ) || rGlyphs.equals( tempWhiteSpaceNonBreakingStr ));
}
->>>>>>> .merge-right.r272944
}
GraphicsContext& PDFIProcessor::getTransformGlyphContext( CharGlyph& rGlyph )