summaryrefslogtreecommitdiff
path: root/cppcanvas/source/wrapper/implfont.hxx
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:17:37 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:17:37 +0200
commite40ddb79dec2ad77915d8e8f8d32b20e3f6f2ead (patch)
treecafab92ed2df8e4a6fcb55d111a52dcc8af4620e /cppcanvas/source/wrapper/implfont.hxx
parent510e316a6f128161e6454fe35053231bd24b5a03 (diff)
recreated tag libreoffice-3.3.1.1 which had these commits:
commit 84ed51867436088ad2d5398e2da2ffda1bc110dc (tag: refs/tags/libreoffice-3.3.1.1) Author: Petr Mladek <pmladek@suse.cz> Date: Tue Feb 8 18:07:45 2011 +0100 Version 3.3.1.1, tag libreoffice-3.3.1.1 (3.3.1-rc1) commit 204b4ff9089332c833fea834b15c0fc3a3ead439 Author: bjoern.michaelsen@canonical.com <Bjoern Michaelsen> Date: Mon Feb 7 17:18:02 2011 +0100 lp#696527: enable human icon theme in LibreOffice (cherry picked from commit 00b43fc0d82950e2abc57cca3746d395252bc9e0) Signed-off-by: Thorsten Behrens <tbehrens@novell.com> (cherry picked from commit 462b3d61e352189d3d4c71acb7f62f6919381fd1) Signed-off-by: Cedric Bosdonnat <cedric.bosdonnat.ooo@free.fr> Signed-off-by: Petr Mladek <pmladek@suse.cz> vcl/inc/vcl/settings.hxx | 3 ++- vcl/source/app/settings.cxx | 3 +++ 2 files changed, 5 insertions(+), 1 deletions(-) commit 7b8d3d7c438e93d524d70544b5d5582727ebb730 Author: Jan Holesovsky <kendy@suse.cz> Date: Mon Feb 7 21:23:28 2011 +0100 Branch libreoffice-3-3-1 This is 'libreoffice-3-3-1' - the stable branch for the 3.3.1 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.3.x release, please use the 'libreoffice-3-3' branch. If you want to build something cool, unstable, and risky, use master. commit 55b64863ec6eec23de004be6de7bcea7d47d806c Author: Rene Engelhard <rene@debian.org> Date: Fri Feb 4 20:31:55 2011 +0100 add explicit QRegion* for clipRegion to fix compile vcl/unx/kde4/KDESalGraphics.cxx | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 1a4f2c597e4881271d6ffe1a4d726ec738f66b7e Author: Michael Meeks <michael.meeks@novell.com> Date: Fri Jan 28 17:15:32 2011 +0000 remove obsolete m_bSingleAltPress (cherry picked from commit a63e78439ca947499a4678cea4dd8e9e07054ab9) Signed-off-by: Caolán McNamara <caolanm@redhat.com> vcl/unx/gtk/window/gtkframe.cxx | 8 -------- vcl/unx/inc/plugins/gtk/gtkframe.hxx | 1 - 2 files changed, 0 insertions(+), 9 deletions(-) commit ba110ce308ac66d568a1f6430d4e3217a1849716 Author: Lucas Baudin <xapantu@gmail.com> Date: Fri Jan 28 16:41:29 2011 +0100 Remove the menu when Left Alt Key was pressed; for GTK (cherry picked from commit db1f9d326bdd678c177eea337997b3c0aefa0c19) Signed-off-by: Caolán McNamara <caolanm@redhat.com> vcl/unx/gtk/window/gtkframe.cxx | 30 ------------------------------ 1 files changed, 0 insertions(+), 30 deletions(-) commit f58ea508ad11a0ad4b581ef51e7a307d1cf87f48 Author: Cédric Bosdonnat <cedricbosdo@openoffice.org> Date: Mon Jan 31 14:51:36 2011 +0100 fdo#33459: year of era in long format for zh_TW by default i18npool/source/localedata/data/zh_TW.xml | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) commit c73ce65d4269861712a1febbc69c1c39193914e0 Author: Jesús Corrius <jesus@softcatala.org> Date: Sun Jan 30 15:00:14 2011 +0100 Fix wrong collation for Catalan language i18npool/source/collator/data/ca_charset.txt | 4 ++++ i18npool/source/collator/data/collator_data.map | 1 + i18npool/source/localedata/data/ca_ES.xml | 7 ++++++- 3 files changed, 11 insertions(+), 1 deletions(-) commit d1fa75c09bfd65232fab21712fde7daac736e78e Author: Caolán McNamara <caolanm@redhat.com> Date: Sat Jan 29 12:51:52 2011 +0000 Resolves: fdo#31271 wrong line break with ( (cherry picked from commit f36959ea3f48c491739deee1e152240ece9397f1) i18npool/source/breakiterator/makefile.mk | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) commit e479fe60e9ebefd18b591f48574c0b2424d4321f Author: Luboš Luňák <l.lunak@suse.cz> Date: Fri Jan 21 20:44:45 2011 +0100 fix KDE3 library search order (fdo#32797) Use LINKFLAGS instead of STDLIBS, as the latter comes way too late in the link command and may result in some stray -L/usr/lib getting before -L$KDEDIR/lib. Since KDE4 libs often tend to be installed under /usr while KDE3 libs are often somewhere else such as /opt/kde3/lib, this could cause using wrong libraries. (cherry picked from commit b799041d66f5f5ec944b6baeec43df01fd3ace2c) Signed-off-by: Thorsten Behrens <tbehrens@novell.com> vcl/util/makefile.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 9885200e656f9bbfdea90d5fc6701707a689dd40 Author: Caolán McNamara <caolanm@redhat.com> Date: Wed Jan 26 10:18:34 2011 +0000 fix for fdo#32561 crash when iterating over the database types, see the bug ( fdo#32561 ) for more details Signed-off-by: Noel Power <noel.power@novell.com> comphelper/source/property/opropertybag.cxx | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) commit e0328aba6a27485e7f71f95ca14c2f95bd7e698c Author: Andras Timar <timar@fsf.hu> Date: Sat Jan 15 19:49:16 2011 +0100 Default currency for Estonia should be Euro - fdo#33160 Signed-off-by: Kohei Yoshida <kyoshida@novell.com> i18npool/source/localedata/data/et_EE.xml | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) commit 6daaf110b9d13220763bb0fe6041fd38c95ba797 Author: Tor Lillqvist <tlillqvist@novell.com> Date: Fri Jan 21 13:31:46 2011 +0200 Avoid a pointless GetHelpText() call in the toolbox, too Fixes fdo#33315. GetHelpText() can be quite heavy, see fdo#33088. Also here the return value is passed to ShowHelpStatusText() which doesn't do anything at all. Signed-off-by: Caolan McNamara <caolanm@redhat.com> vcl/source/window/toolbox2.cxx | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) commit 699eac6373807f2ce2d731dd2f2640a540020f92 Author: Tor Lillqvist <tlillqvist@novell.com> Date: Tue Jan 18 16:25:52 2011 +0200 Avoid GetHelpText() call which can be quite heavy GetHelpText() can cause a quite heavy sequence of file and directory lookups. See fdo#33088. As its return value here was just passed on to ShowHelpStatusText() which doesn't do anything at all, it was completely unnecessary. The GetHelpText() calls here caused the noticeable slowdown in highlighting menu items on Windows with lots of localised help files for some bundled extensions. (cherry picked from commit 6fc21aa74b4d2aba07d854d5d3c2f404905b40ef) Signed-off-by: Caolan McNamara <caolanm@redhat.com> Signed-off-by: Michael Meeks <michael.meeks@novell.com> Signed-off-by: Thorsten Behrens <thb@documentfoundation.org> Signed-off-by: fstrba@novell.com vcl/source/window/menu.cxx | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) commit 3c13a7752cc1904e7a6a88380c10a2433a83feb8 Author: Luboš Luňák <l.lunak@suse.cz> Date: Tue Jan 18 12:33:16 2011 +0100 paint toolbar handle positioned properly (fdo#32558) ACK by Kendy. vcl/unx/kde4/KDESalGraphics.cxx | 22 ++++++++++------------ 1 files changed, 10 insertions(+), 12 deletions(-) commit ea29f32bd5bc1a937a747bd5a1f5b37f570ed25f Author: Andre Fischer <andre.f.fischer@oracle.com> Date: Tue Jan 18 10:41:22 2011 +0100 calc65: #i116318# Fixed the painting of axial gradients. Signed-off-by: Thorsten Behrens <tbehrens@novell.com> cppcanvas/source/mtfrenderer/implrenderer.cxx | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) commit 0ac6ad70d230f9115bd4dfa1ff45bf5991142603 Author: Pierre-André Jacquod <pjacquod@alumni.ethz.ch> Date: Mon Jan 17 20:37:33 2011 +0100 fix after struct member renaminge (pXRenderFormat) the right one, this time.... sorry. canvas/source/cairo/cairo_xlib_cairo.cxx | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 74da9d0752269ff4c750d89fe3d9024d46dfd81d Author: Pierre-André Jacquod <pjacquod@alumni.ethz.ch> Date: Mon Jan 17 20:33:32 2011 +0100 fix after variable renaming (pXrenderformat) canvas/source/cairo/cairo_xlib_cairo.cxx | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 828d4e5f3dd64c2986cc2dbc0491f28d6e0c6db7 Author: Luboš Luňák <l.lunak@suse.cz> Date: Wed Nov 3 15:17:33 2010 +0100 use sane scrollbar sizes when drawing bnc#619772 leads to a crash because maximum = minimum = 0, and this strange (but for whatever reason needed) '- mnVisibleSize' hack makes maximum be -1, eventually leading to a crash vcl/unx/kde4/KDESalGraphics.cxx | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit d46f89c39109a2ca351104c7feaefe59f187052a Author: Luboš Luňák <l.lunak@suse.cz> Date: Mon Jan 17 16:06:05 2011 +0100 cleanup into one patch: do not mix unrelated X11 Visuals (fdo#33108) Do not assume that there is just one generic Visual, as today's XServers are ARGB-capable and cases of both the default depth and 32bit visuals can happen. Signed-off-by: Michael Meeks <michael.meeks@novell.com> vcl/inc/vcl/sysdata.hxx | 2 +- vcl/unx/headless/svpgdi.cxx | 2 +- vcl/unx/headless/svppspgraphics.cxx | 2 +- vcl/unx/inc/salgdi.h | 8 +++--- vcl/unx/inc/salvd.h | 2 +- vcl/unx/source/gdi/pspgraphics.cxx | 2 +- vcl/unx/source/gdi/salgdi.cxx | 46 ++++++++++++++++------------------ vcl/unx/source/gdi/salgdi3.cxx | 10 +------- vcl/unx/source/gdi/salvd.cxx | 14 +++++----- 9 files changed, 39 insertions(+), 49 deletions(-) commit 6ac877774a2b0c067df150ef6abcf501b2c9ff23 Author: Andras Timar <timar@fsf.hu> Date: Sat Jan 15 19:55:40 2011 +0100 translation fix in hu_HU.xml (felette/alatta -> fentebb/alább) i18npool/source/localedata/data/hu_HU.xml | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 0d057e9a0c8bfd78ee6bc04b65b3ffe64508ef6e Author: Petr Mladek <pmladek@suse.cz> Date: Tue Jan 11 23:05:57 2011 +0100 Please, ignore the previous message; it was for the libreoffice-3-3-0 branch This is 'libreoffice-3-3' - the stable branch for the 3.3.x releases. Only safe changes, reviewed by anoter person are allowed. If you want to build something cool, unstable, and risky, use master. commit 913e3efa97a6c675f9a1187aa1d4d42449a76041 Author: Petr Mladek <pmladek@suse.cz> Date: Tue Jan 11 22:39:08 2011 +0100 Branch libreoffice-3-3-0 This is 'libreoffice-3-3-0' - the stable branch for the 3.3.0 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.3.x release, please use the 'libreoffice-3-3' branch. If you want to build something cool, unstable, and risky, use master.
Notes
split repo tag: libs-gui_libreoffice-3.3.1.1
Diffstat (limited to 'cppcanvas/source/wrapper/implfont.hxx')
-rw-r--r--cppcanvas/source/wrapper/implfont.hxx16
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;
};
}
}