INTEGRATION: CWS canvas05 (1.5.110); FILE MERGED
2008/04/21 07:27:55 thb 1.5.110.2: RESYNC: (1.5-1.6); FILE MERGED 2007/12/20 22:19:00 thb 1.5.110.1: #i81092# #i78888# #i78925# #i79258# #i79437# #i84784# Large canvas rework, completing various areas such as color spaces, bitmap data access, true sprite and non-sprite implementations, and upstreaming the canvas parts of rodos emf+ rendering
This commit is contained in:
@@ -7,7 +7,7 @@
|
|||||||
* OpenOffice.org - a multi-platform office productivity suite
|
* OpenOffice.org - a multi-platform office productivity suite
|
||||||
*
|
*
|
||||||
* $RCSfile: textlayout.hxx,v $
|
* $RCSfile: textlayout.hxx,v $
|
||||||
* $Revision: 1.6 $
|
* $Revision: 1.7 $
|
||||||
*
|
*
|
||||||
* This file is part of OpenOffice.org.
|
* This file is part of OpenOffice.org.
|
||||||
*
|
*
|
||||||
@@ -62,7 +62,9 @@ namespace vclcanvas
|
|||||||
sal_Int8 nDirection,
|
sal_Int8 nDirection,
|
||||||
sal_Int64 nRandomSeed,
|
sal_Int64 nRandomSeed,
|
||||||
const CanvasFont::Reference& rFont,
|
const CanvasFont::Reference& rFont,
|
||||||
const DeviceRef& rRefDevice );
|
const ::com::sun::star::uno::Reference<
|
||||||
|
::com::sun::star::rendering::XGraphicDevice>& xDevice,
|
||||||
|
const OutDevProviderSharedPtr& rOutDev );
|
||||||
|
|
||||||
/// Dispose all internal references
|
/// Dispose all internal references
|
||||||
virtual void SAL_CALL disposing();
|
virtual void SAL_CALL disposing();
|
||||||
@@ -105,7 +107,9 @@ namespace vclcanvas
|
|||||||
::com::sun::star::rendering::StringContext maText;
|
::com::sun::star::rendering::StringContext maText;
|
||||||
::com::sun::star::uno::Sequence< double > maLogicalAdvancements;
|
::com::sun::star::uno::Sequence< double > maLogicalAdvancements;
|
||||||
CanvasFont::Reference mpFont;
|
CanvasFont::Reference mpFont;
|
||||||
DeviceRef mpRefDevice;
|
::com::sun::star::uno::Reference<
|
||||||
|
::com::sun::star::rendering::XGraphicDevice> mxDevice;
|
||||||
|
OutDevProviderSharedPtr mpOutDevProvider;
|
||||||
sal_Int8 mnTextDirection;
|
sal_Int8 mnTextDirection;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user