mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Modify constructor, remove setters + unused define

Browse Source 
Change-Id: Ibf878c44ae761e59a04b6d5023296c5918cbf85e
Reviewed-on: https://gerrit.libreoffice.org/1665
Reviewed-by: Noel Power <noel.power@suse.com>
Tested-by: Noel Power <noel.power@suse.com>
This commit is contained in:
Julien Nabet
2013-01-13 14:01:57 +01:00
committed by Noel Power
parent d276d3f3ae
commit 460c55f620
2 changed files with 11 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -440,19 +440,11 @@ void PDFIProcessor::drawGlyphLine( const rtl::OUString& rGlyphs,
processGlyphLine(); processGlyphLine();
} }
CharGlyph aGlyph; CharGlyph aGlyph(fXPrevTextPosition, fYPrevTextPosition, fPrevTextHeight, fPrevTextWidth,
m_pCurElement, getCurrentContext(), rFontMatrix, rRect, rGlyphs);
aGlyph.setGlyph ( rGlyphs );
aGlyph.setRect ( rRect );
aGlyph.setFontMatrix ( rFontMatrix );
aGlyph.setGraphicsContext ( getCurrentContext() );
getGCId(getCurrentContext()); getGCId(getCurrentContext());
aGlyph.setCurElement( m_pCurElement );
aGlyph.setYPrevGlyphPosition( fYPrevTextPosition );
aGlyph.setXPrevGlyphPosition( fXPrevTextPosition );
aGlyph.setPrevGlyphHeight ( fPrevTextHeight );
aGlyph.setPrevGlyphWidth ( fPrevTextWidth );
m_GlyphsList.push_back( aGlyph ); m_GlyphsList.push_back( aGlyph );

23
sdext/source/pdfimport/tree/pdfiprocessor.hxx
View File

@@ -242,7 +242,13 @@ namespace pdfi
class CharGlyph class CharGlyph
{ {
public: public:
CharGlyph(){}; CharGlyph(double fXPrevGlyphPosition, double fYPrevGlyphPosition, double fPrevGlyphHeight, double fPrevGlyphWidth,
Element* pCurElement, const GraphicsContext& rCurrentContext, const com::sun::star::geometry::Matrix2D& rFontMatrix,
const com::sun::star::geometry::RealRectangle2D& rRect, const rtl::OUString& rGlyphs )
: m_fXPrevGlyphPosition(fXPrevGlyphPosition), m_fYPrevGlyphPosition(fYPrevGlyphPosition), m_fPrevGlyphHeight(fPrevGlyphHeight),
m_fPrevGlyphWidth(fPrevGlyphWidth), m_pCurElement(pCurElement), m_rCurrentContext(rCurrentContext),
m_rFontMatrix(rFontMatrix), m_rRect(rRect), m_rGlyphs(rGlyphs) {};
virtual ~CharGlyph(){}; virtual ~CharGlyph(){};
rtl::OUString& getGlyph(){ return m_rGlyphs; } rtl::OUString& getGlyph(){ return m_rGlyphs; }
com::sun::star::geometry::RealRectangle2D& getRect(){ return m_rRect; } com::sun::star::geometry::RealRectangle2D& getRect(){ return m_rRect; }
@@ -250,12 +256,6 @@ namespace pdfi
GraphicsContext& getGC(){ return m_rCurrentContext; } GraphicsContext& getGC(){ return m_rCurrentContext; }
Element* getCurElement(){ return m_pCurElement; } Element* getCurElement(){ return m_pCurElement; }
void setGlyph (const rtl::OUString& rGlyphs ){ m_rGlyphs=rGlyphs; }
void setRect (const ::com::sun::star::geometry::RealRectangle2D& rRect ){ m_rRect=rRect; }
void setFontMatrix (const ::com::sun::star::geometry::Matrix2D& rFontMatrix ){ m_rFontMatrix= rFontMatrix; }
void setGraphicsContext (GraphicsContext& rCurrentContext ){ m_rCurrentContext= rCurrentContext; }
void setCurElement( Element* pCurElement ){ m_pCurElement= pCurElement; }
double getYPrevGlyphPosition() const { return m_fYPrevGlyphPosition; } double getYPrevGlyphPosition() const { return m_fYPrevGlyphPosition; }
double getXPrevGlyphPosition() const { return m_fXPrevGlyphPosition; } double getXPrevGlyphPosition() const { return m_fXPrevGlyphPosition; }
double getPrevGlyphHeight() const { return m_fPrevGlyphHeight; } double getPrevGlyphHeight() const { return m_fPrevGlyphHeight; }
@@ -268,15 +268,10 @@ namespace pdfi
return m_rRect.X1-m_fXPrevGlyphPosition; return m_rRect.X1-m_fXPrevGlyphPosition;
} }
void setYPrevGlyphPosition( double fYPrevTextPosition ){ m_fYPrevGlyphPosition= fYPrevTextPosition; }
void setXPrevGlyphPosition( double fXPrevTextPosition ){ m_fXPrevGlyphPosition= fXPrevTextPosition; }
void setPrevGlyphHeight ( double fPrevTextHeight ){ m_fPrevGlyphHeight= fPrevTextHeight; }
void setPrevGlyphWidth ( double fPrevTextWidth ){ m_fPrevGlyphWidth= fPrevTextWidth; }
private: private:
double m_fYPrevGlyphPosition ;
double m_fXPrevGlyphPosition ; double m_fXPrevGlyphPosition ;
double m_fYPrevGlyphPosition ;
double m_fPrevGlyphHeight ; double m_fPrevGlyphHeight ;
double m_fPrevGlyphWidth ; double m_fPrevGlyphWidth ;
Element* m_pCurElement ; Element* m_pCurElement ;
@@ -287,8 +282,6 @@ namespace pdfi
}; };
} }
#define USTR(x) rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( x ) )
#endif #endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */