diff options
| -rw-r--r-- | sdext/source/pdfimport/tree/pdfiprocessor.cxx | 4 | ||||
| -rw-r--r-- | sdext/source/pdfimport/tree/pdfiprocessor.hxx | 2 | ||||
| -rw-r--r-- | vcl/source/window/dlgctrl.cxx | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.cxx b/sdext/source/pdfimport/tree/pdfiprocessor.cxx index 0e9955f10192..a457d476f99f 100644 --- a/sdext/source/pdfimport/tree/pdfiprocessor.cxx +++ b/sdext/source/pdfimport/tree/pdfiprocessor.cxx @@ -486,9 +486,10 @@ GraphicsContext& PDFIProcessor::getTransformGlyphContext( CharGlyph& rGlyph ) return rGlyph.getGC(); } + void PDFIProcessor::drawCharGlyphs( rtl::OUString& rGlyphs, geometry::RealRectangle2D& rRect, - GraphicsContext aGC, + const GraphicsContext& aGC, ParagraphElement* pPara, FrameElement* pFrame, bool bSpaceFlag ) @@ -523,6 +524,7 @@ void PDFIProcessor::drawCharGlyphs( rtl::OUString& rGlyphs, pFrame->updateGeometryWith( pPara ); } + void PDFIProcessor::drawGlyphs( const rtl::OUString& rGlyphs, const geometry::RealRectangle2D& rRect, const geometry::Matrix2D& rFontMatrix ) diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.hxx b/sdext/source/pdfimport/tree/pdfiprocessor.hxx index 1e4af2513205..e86ccfe2aafe 100644 --- a/sdext/source/pdfimport/tree/pdfiprocessor.hxx +++ b/sdext/source/pdfimport/tree/pdfiprocessor.hxx @@ -116,7 +116,7 @@ namespace pdfi void drawCharGlyphs( rtl::OUString& rGlyphs, ::com::sun::star::geometry::RealRectangle2D& rRect, - GraphicsContext aGC, + const GraphicsContext& aGC, ParagraphElement* pPara, FrameElement* pFrame, bool bSpaceFlag ); diff --git a/vcl/source/window/dlgctrl.cxx b/vcl/source/window/dlgctrl.cxx index 15078a0bda17..19d68a08fe06 100644 --- a/vcl/source/window/dlgctrl.cxx +++ b/vcl/source/window/dlgctrl.cxx @@ -1167,10 +1167,9 @@ static Window* ImplGetLabelFor( Window* pFrameWindow, WindowType nMyType, Window // #i100833# MT 2010/02: Group box and fixed lines can also lable a fixed text. // See tools/options/print for example. sal_Bool bThisIsAGroupControl = (nMyType == WINDOW_GROUPBOX) || (nMyType == WINDOW_FIXEDLINE); - Window* pSWindow = NULL; // get index, form start and form end sal_uInt16 nIndex=0, nFormStart=0, nFormEnd=0; - pSWindow = ::ImplFindDlgCtrlWindow( pFrameWindow, + Window* pSWindow = ::ImplFindDlgCtrlWindow( pFrameWindow, pLabel, nIndex, nFormStart, |