diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2007-07-06 06:38:04 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2007-07-06 06:38:04 +0000 |
| commit | 101f96087c5424a942e727d054bdfaf3bb6611a2 (patch) | |
| tree | 1c7b3814813ff8828afb7378cf8e280850672d80 /svx/source/inc/fmvwimp.hxx | |
| parent | 3d08499f5fe5c426f01a6e54d6018249acc7dfef (diff) | |
INTEGRATION: CWS oj14 (1.26.172); FILE MERGED
2007/06/04 20:32:43 oj 1.26.172.6: RESYNC: (1.29-1.30); FILE MERGED
2007/05/04 10:47:10 oj 1.26.172.5: #i76758# new 2nd page
2007/02/20 16:15:27 oj 1.26.172.4: RESYNC: (1.28-1.29); FILE MERGED
2006/12/18 15:34:48 oj 1.26.172.3: RESYNC: (1.27-1.28); FILE MERGED
2006/07/04 08:52:06 oj 1.26.172.2: RESYNC: (1.26-1.27); FILE MERGED
2006/03/20 08:23:44 oj 1.26.172.1: new method to create control label pair
Diffstat (limited to 'svx/source/inc/fmvwimp.hxx')
| -rw-r--r-- | svx/source/inc/fmvwimp.hxx | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/svx/source/inc/fmvwimp.hxx b/svx/source/inc/fmvwimp.hxx index 1ccb028b44c0..89f722929077 100644 --- a/svx/source/inc/fmvwimp.hxx +++ b/svx/source/inc/fmvwimp.hxx @@ -4,9 +4,9 @@ * * $RCSfile: fmvwimp.hxx,v $ * - * $Revision: 1.31 $ + * $Revision: 1.32 $ * - * last change: $Author: hr $ $Date: 2007-06-27 18:23:36 $ + * last change: $Author: rt $ $Date: 2007-07-06 07:38:04 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -99,6 +99,8 @@ class FmFormView; class FmFormShell; class Window; class OutputDevice; +class SdrUnoObj; +class SdrView; FORWARD_DECLARE_INTERFACE(awt,XControl) FORWARD_DECLARE_INTERFACE(awt,XWindow) @@ -159,6 +161,7 @@ protected: }; typedef vector<FmXPageViewWinRec*> FmWinRecList; +class SdrModel; //================================================================== // FmXFormView //================================================================== @@ -259,16 +262,23 @@ private: /// does some initializations to the newly created control model, returns the ClassId sal_Int16 implInitializeNewControlModel( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxModel, const SdrObject* _pObject ) const; - void createControlLabelPair( + static void createControlLabelPair( + SdrView* _pView, OutputDevice* _pOutDev, + sal_Int32 _nXOffsetMM, sal_Int32 _nYOffsetMM, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats >& _rxNumberFormats, sal_uInt16 _nObjID, const ::rtl::OUString& _rFieldPostfix, - FmFormObj*& _rpLabel, - FmFormObj*& _rpControl - ) const; + UINT32 _nInventor, + UINT16 _nIndent, + SdrPage* _pLabelPage, + SdrPage* _pPage, + SdrModel* _pModel, + SdrUnoObj*& _rpLabel, + SdrUnoObj*& _rpControl + ); void ObjectRemovedInAliveMode(const SdrObject* pObject); |