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

INTEGRATION: CWS presentationengine01 (1.2.2); FILE MERGED

Browse Source 
2004/07/20 19:09:06 thb 1.2.2.3: #110496# Unified include statements; removed external prefix from boost includes
2004/04/12 15:13:21 thb 1.2.2.2: #110496# Adaptions after canvas01 merge
2004/04/05 15:58:53 thb 1.2.2.1: Resync with canvas01 changes
This commit is contained in:
Rüdiger Timm
2004-11-26 20:01:11 +00:00
parent b31dbee71f
commit b25f541300
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
cppcanvas/source/wrapper/implfont.cxx
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: implfont.cxx,v $ * $RCSfile: implfont.cxx,v $
* *
* $Revision: 1.2 $ * $Revision: 1.3 $
* *
* last change: $Author: thb $ $Date: 2004-03-18 10:41:11 $ * last change: $Author: rt $ $Date: 2004-11-26 21:01:11 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@@ -59,7 +59,8 @@
* *
************************************************************************/ ************************************************************************/
#include "implfont.hxx" #include <implfont.hxx>
#include <canvas/canvastools.hxx>
using namespace ::drafts::com::sun::star; using namespace ::drafts::com::sun::star;
@@ -81,10 +82,15 @@ namespace cppcanvas
OSL_ENSURE( mxCanvas.is(), "ImplFont::ImplFont(): Invalid Canvas" ); OSL_ENSURE( mxCanvas.is(), "ImplFont::ImplFont(): Invalid Canvas" );
rendering::FontRequest aFontRequest; rendering::FontRequest aFontRequest;
aFontRequest.FamilyName = rFontName; aFontRequest.FontDescription.FamilyName = rFontName;
aFontRequest.CellSize = rCellSize; aFontRequest.CellSize = rCellSize;
mxFont = mxCanvas->queryFont( aFontRequest ); geometry::Matrix2D aFontMatrix;
::canvas::tools::setIdentityMatrix2D( aFontMatrix );
mxFont = mxCanvas->createFont( aFontRequest,
uno::Sequence< beans::PropertyValue >(),
aFontMatrix );
} }
@@ -96,7 +102,7 @@ namespace cppcanvas
{ {
OSL_ENSURE( mxFont.is(), "ImplFont::getName(): Invalid Font" ); OSL_ENSURE( mxFont.is(), "ImplFont::getName(): Invalid Font" );
return mxFont->getFontRequest().FamilyName; return mxFont->getFontRequest().FontDescription.FamilyName;
} }
double ImplFont::getCellSize() const double ImplFont::getCellSize() const