diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:02:56 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:02:56 +0200 |
commit | fdc4da32a09265b19470ab09db998ea28936106e (patch) | |
tree | 960b32cda2755f988d0d34e568f1019ad2bce0d2 /reportdesign/source/core/inc/FixedLine.hxx | |
parent | aa20084bd041208841d5ad3ca50b1e963eb5986e (diff) |
recreated tag libreoffice-3.3.0.4 which had these commits:
commit e082905e4ce8c9018a2a38035e212eb45e9f70b1 (tag: refs/tags/libreoffice-3.3.0.4, refs/remotes/origin/libreoffice-3-3-0)
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Jan 18 19:01:14 2011 +0100
Version 3.3.0.4, tag libreoffice-3.3.0.4 (3.3-rc4)
commit 35131d5a73dd02924bf4b404c55d0dbeb324db1f
Author: Lionel Elie Mamane <lionel@mamane.lu>
Date: Sat Jan 15 05:39:40 2011 +0100
i#116187: report left/right page margin setting ignored on Unix 64 bit
(cherry picked from commit 51a9333217687ff16df40ea3bd8983faaf5e425a)
Signed-off-by: Michael Meeks <michael.meeks@novell.com>
reportdesign/source/ui/report/ReportController.cxx | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
commit ae3903b548d8d05807cc7f3a029495388de5e302
Author: Kohei Yoshida <kyoshida@novell.com>
Date: Fri Jan 14 11:24:43 2011 -0500
Remove the Registration... menu item which we don't want. (fdo#33112)
dbaccess/uiconfig/dbtdata/menubar/menubar.xml | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
commit c71822d4eb36b43cdb08c25d207cae5e3c1660cd
Author: Noel Power <noel.power@novell.com>
Date: Wed Jan 12 11:09:51 2011 +0000
fix for fdo#32742#
reportdesign/source/ui/inspection/metadata.cxx | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit 66d25b635de422a4a811710cb3289266d9a11a84
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Jan 11 22:59:35 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
Notes:
split repo tag: base_libreoffice-3.3.0.4
Diffstat (limited to 'reportdesign/source/core/inc/FixedLine.hxx')
-rw-r--r-- | reportdesign/source/core/inc/FixedLine.hxx | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/reportdesign/source/core/inc/FixedLine.hxx b/reportdesign/source/core/inc/FixedLine.hxx index 5ae4790701d2..bc551a8ff136 100644 --- a/reportdesign/source/core/inc/FixedLine.hxx +++ b/reportdesign/source/core/inc/FixedLine.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 @@ -39,32 +39,32 @@ namespace reportdesign { - typedef ::cppu::PropertySetMixin< com::sun::star::report::XFixedLine > FixedLinePropertySet; + typedef ::cppu::PropertySetMixin< com::sun::star::report::XFixedLine > FixedLinePropertySet; typedef ::cppu::WeakComponentImplHelper2< com::sun::star::report::XFixedLine - ,com::sun::star::lang::XServiceInfo > FixedLineBase; + ,com::sun::star::lang::XServiceInfo > FixedLineBase; /** \class OFixedLine Defines the implementation of a \interface com:::sun::star::report::XFixedLine * \ingroup reportdesign_api * */ - class OFixedLine : public comphelper::OBaseMutex, + class OFixedLine : public comphelper::OBaseMutex, public FixedLineBase, public FixedLinePropertySet { friend class OShapeHelper; - OReportControlModel m_aProps; - ::com::sun::star::drawing::LineStyle m_LineStyle; - ::com::sun::star::drawing::LineDash m_LineDash; - sal_Int32 m_nOrientation; - ::sal_Int32 m_LineColor; - ::sal_Int16 m_LineTransparence; - ::sal_Int32 m_LineWidth; + OReportControlModel m_aProps; + ::com::sun::star::drawing::LineStyle m_LineStyle; + ::com::sun::star::drawing::LineDash m_LineDash; + sal_Int32 m_nOrientation; + ::sal_Int32 m_LineColor; + ::sal_Int16 m_LineTransparence; + ::sal_Int32 m_LineWidth; private: OFixedLine(const OFixedLine&); OFixedLine& operator=(const OFixedLine&); - template <typename T> void set( const ::rtl::OUString& _sProperty + template <typename T> void set( const ::rtl::OUString& _sProperty ,const T& _Value ,T& _member) { @@ -116,7 +116,7 @@ namespace reportdesign // XReportControlModel REPORTCONTROLMODEL_HEADER() - + // XFixedLine virtual ::sal_Int32 SAL_CALL getOrientation() throw (::com::sun::star::beans::UnknownPropertyException,::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setOrientation( ::sal_Int32 _orientation ) throw (::com::sun::star::beans::UnknownPropertyException,::com::sun::star::uno::RuntimeException); @@ -139,12 +139,12 @@ namespace reportdesign // XComponent virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) + { cppu::WeakComponentImplHelperBase::addEventListener(aListener); } virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + { cppu::WeakComponentImplHelperBase::removeEventListener(aListener); } |