diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-02-12 13:50:41 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-02-12 13:50:41 +0000 |
| commit | e1c85fe54316435306c8960a79c10d6f20f7f46a (patch) | |
| tree | 052a803ca4a256e4b8abb1cf04598ad0b5d479ab | |
| parent | 31b8bfb5f6678d3d7a9d0e1038262588a338a735 (diff) | |
INTEGRATION: CWS basexc_SRC680 (1.22.10.1.2); FILE MERGED
2007/02/05 13:06:23 fs 1.22.10.1.2.2: #i74051# DlgEdObj::getFormDeviceInfo superseded by DlgEdForm::getDeviceInfo
2007/02/05 13:02:48 fs 1.22.10.1.2.1: #i74065# cache the device info at the form, don't re-create the temporary control all the time
| -rw-r--r-- | basctl/source/inc/dlgedobj.hxx | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/basctl/source/inc/dlgedobj.hxx b/basctl/source/inc/dlgedobj.hxx index 4b5c08cad..552e3c504 100644 --- a/basctl/source/inc/dlgedobj.hxx +++ b/basctl/source/inc/dlgedobj.hxx @@ -4,9 +4,9 @@ * * $RCSfile: dlgedobj.hxx,v $ * - * $Revision: 1.24 $ + * $Revision: 1.25 $ * - * last change: $Author: vg $ $Date: 2007-01-16 16:36:58 $ + * last change: $Author: kz $ $Date: 2007-02-12 14:50:41 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -55,6 +55,7 @@ #include <vector> #include <map> +#include <boost/optional.hpp> typedef ::std::multimap< sal_Int16, ::rtl::OUString, ::std::less< sal_Int16 > > IndexToNameMap; @@ -77,7 +78,7 @@ private: sal_Bool bIsListening; DlgEdForm* pDlgEdForm; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener> m_xPropertyChangeListener; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener> m_xContainerListener; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener> m_xContainerListener; protected: DlgEdObj(); @@ -110,10 +111,6 @@ protected: sal_Int32 nXIn, sal_Int32 nYIn, sal_Int32 nWidthIn, sal_Int32 nHeightIn, sal_Int32& nXOut, sal_Int32& nYOut, sal_Int32& nWidthOut, sal_Int32& nHeightOut ); - /** returns the DeviceInfo for the given DlgEdForm object (needed for the various Transform* methods) - */ - ::com::sun::star::awt::DeviceInfo getFormDeviceInfo( const DlgEdForm& _rForm ); - public: TYPEINFO(); @@ -174,6 +171,9 @@ private: DlgEditor* pDlgEditor; ::std::vector<DlgEdObj*> pChilds; + mutable ::boost::optional< ::com::sun::star::awt::DeviceInfo > mpDeviceInfo; + + protected: DlgEdForm(const ::rtl::OUString& rModelName); DlgEdForm(const ::rtl::OUString& rModelName, @@ -189,7 +189,7 @@ public: virtual ~DlgEdForm(); - virtual void SetDlgEditor( DlgEditor* pEditor ) { pDlgEditor = pEditor; } + virtual void SetDlgEditor( DlgEditor* pEditor ); virtual DlgEditor* GetDlgEditor() const { return pDlgEditor; } virtual void AddChild( DlgEdObj* pDlgEdObj ); @@ -209,6 +209,11 @@ public: virtual void UpdateTabOrderAndGroups(); virtual SdrObject* CheckHit(const Point& rPnt,USHORT nTol,const SetOfByte*) const; + + ::com::sun::star::awt::DeviceInfo getDeviceInfo() const; + +private: + void ImplInvalidateDeviceInfo(); }; #endif // _BASCTL_DLGEDOBJ_HXX |