diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:18:13 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:18:13 +0200 |
| commit | b817eb954419c818e04432e87af692bc0f53ce18 (patch) | |
| tree | 1f51e4435aa74ba91c752831f08caee599ff0d43 /cppcanvas/source/wrapper/implfont.hxx | |
| parent | 8ade1b264b756914ca121db4379cbbe709b7eb89 (diff) | |
recreated tag libreoffice-3.3.3.1 which had these commits:
commit f4e5c3d6e530c85d1d9be70f2f3b4f5b35d6db80 (tag: refs/tags/libreoffice-3.3.3.1)
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue May 31 17:39:07 2011 +0200
Version 3.3.3.1, tag libreoffice-3.3.3.1 (3.3.3-rc1)
commit a7febbdcdc9fd4a80e8357f3812456fc3fa0f39f
Author: Radek Doulik <rodo@novell.com>
Date: Thu Mar 10 15:47:35 2011 +0100
fix for 3.3.2 blocker fdo#34718 - change the type of nDrawerHeight to long
- before it became big positive long in the called Point::Move
function, moving the drawer under the visible area. so it was
basically signed/unsigned problem in the layouter
svtools/source/toolpanel/drawerlayouter.cxx | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Notes
split repo tag: libs-gui_libreoffice-3.3.3.1
Diffstat (limited to 'cppcanvas/source/wrapper/implfont.hxx')
| -rw-r--r-- | cppcanvas/source/wrapper/implfont.hxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/cppcanvas/source/wrapper/implfont.hxx b/cppcanvas/source/wrapper/implfont.hxx index 589bab707e84..e5fed9da466c 100644 --- a/cppcanvas/source/wrapper/implfont.hxx +++ b/cppcanvas/source/wrapper/implfont.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ namespace rtl class OUString; } -namespace com { namespace sun { namespace star { namespace rendering +namespace com { namespace sun { namespace star { namespace rendering { class XCanvasFont; } } } } @@ -57,22 +57,22 @@ namespace cppcanvas class ImplFont : public Font { public: - ImplFont( const ::com::sun::star::uno::Reference< + ImplFont( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvas >& rCanvas, - const ::rtl::OUString& rFontName, + const ::rtl::OUString& rFontName, const double& rCellSize ); virtual ~ImplFont(); virtual ::rtl::OUString getName() const; - virtual double getCellSize() const; + virtual double getCellSize() const; - virtual ::com::sun::star::uno::Reference< + virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvasFont > getUNOFont() const; private: - ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvas > mxCanvas; - ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvasFont > mxFont; + ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvas > mxCanvas; + ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvasFont > mxFont; }; } } |