diff options
Diffstat (limited to 'svx/inc')
| -rw-r--r-- | svx/inc/fmgridif.hxx | 5 | ||||
| -rw-r--r-- | svx/inc/svx/fmview.hxx | 44 | ||||
| -rw-r--r-- | svx/inc/svx/gridctrl.hxx | 3 |
3 files changed, 23 insertions, 29 deletions
diff --git a/svx/inc/fmgridif.hxx b/svx/inc/fmgridif.hxx index 2a819025fa47..39b108026654 100644 --- a/svx/inc/fmgridif.hxx +++ b/svx/inc/fmgridif.hxx @@ -30,6 +30,8 @@ #ifndef _SVX_FMGRIDIF_HXX #define _SVX_FMGRIDIF_HXX +#include "svx/svxdllapi.h" + #include <com/sun/star/view/XSelectionSupplier.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/container/XEnumerationAccess.hpp> @@ -49,11 +51,12 @@ #include <com/sun/star/util/XModeSelector.hpp> #include <com/sun/star/util/XModifyListener.hpp> #include <com/sun/star/util/XModifyBroadcaster.hpp> + +#include <vcl/wintypes.hxx> #include <toolkit/controls/unocontrol.hxx> #include <toolkit/awt/vclxwindow.hxx> #include <comphelper/uno3.hxx> #include <cppuhelper/implbase10.hxx> -#include "svx/svxdllapi.h" #if ! defined(INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_19) #define INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_19 diff --git a/svx/inc/svx/fmview.hxx b/svx/inc/svx/fmview.hxx index f7e4e0e1aebb..8f1243b3ab59 100644 --- a/svx/inc/svx/fmview.hxx +++ b/svx/inc/svx/fmview.hxx @@ -59,19 +59,10 @@ namespace com { namespace sun { namespace star { namespace form { class SVX_DLLPUBLIC FmFormView : public E3dView { - friend class FmXFormController; - friend class FmFormShell; - friend class FmXFormShell; - friend class FmXFormView; - friend class FmExplorer; - friend class FmFormObj; - FmXFormView* pImpl; FmFormShell* pFormShell; void Init(); - void SetFormShell( FmFormShell* pShell ) { pFormShell = pShell; } - FmFormShell* GetFormShell() const { return pFormShell; } public: TYPEINFO(); @@ -100,18 +91,17 @@ public: virtual void DeleteWindowFromPaintView(OutputDevice* pOldWin); 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, + sal_uInt16 _nControlObjectID, const ::rtl::OUString& _rFieldPostfix, UINT32 _nInventor, - UINT16 _nIndent, + UINT16 _nLabelObjectID, SdrPage* _pLabelPage, - SdrPage* _pPage, + SdrPage* _pControlPage, SdrModel* _pModel, SdrUnoObj*& _rpLabel, SdrUnoObj*& _rpControl @@ -131,11 +121,11 @@ public: @param _bForceSync <TRUE/> if the handling should be done synchronously. */ - void GrabFirstControlFocus( sal_Bool _bForceSync = sal_False ); + SVX_DLLPRIVATE void GrabFirstControlFocus( sal_Bool _bForceSync = sal_False ); /** returns the form controller for a given form and a given device */ - ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormController > + SVX_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormController > GetFormController( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& _rxForm, const OutputDevice& _rDevice ) const; // SdrView @@ -144,19 +134,21 @@ public: /// shortcut to "GetSdrPageView() ? PTR_CAST( FmFormPage, GetSdrPageView() ) : NULL" FmFormPage* GetCurPage(); -protected: - void ActivateControls(SdrPageView*); - void DeactivateControls(SdrPageView*); + SVX_DLLPRIVATE void ActivateControls(SdrPageView*); + SVX_DLLPRIVATE void DeactivateControls(SdrPageView*); - // Hinweis an die UI, da ein Control erzeugt worden ist - void ObjectCreated(FmFormObj* pObj); - void ChangeDesignMode(sal_Bool bDesign); + SVX_DLLPRIVATE void ChangeDesignMode(sal_Bool bDesign); -public: - FmXFormView* GetImpl() const {return pImpl;} + SVX_DLLPRIVATE FmXFormView* GetImpl() const { return pImpl; } + SVX_DLLPRIVATE FmFormShell* GetFormShell() const { return pFormShell; } + + struct FormShellAccess { friend class FmFormShell; private: FormShellAccess() { } }; + void SetFormShell( FmFormShell* pShell, FormShellAccess ) { pFormShell = pShell; } - virtual void InsertControlContainer(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >& xCC); - virtual void RemoveControlContainer(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >& xCC); + struct ImplAccess { friend class FmXFormView; private: ImplAccess() { } }; + void SetMoveOutside( bool _bMoveOutside, ImplAccess ) { E3dView::SetMoveOutside( _bMoveOutside ); } + virtual void InsertControlContainer(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >& xCC); + virtual void RemoveControlContainer(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >& xCC); // the following is a hack, only to be used on the 3.0.1 branch, to prevent becoming // incompatible there @@ -169,6 +161,8 @@ private: SVX_DLLPRIVATE void AdjustMarks(const SdrMarkList& rMarkList); SVX_DLLPRIVATE sal_Bool checkUnMarkAll(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xSource); SVX_DLLPRIVATE FmFormObj* getMarkedGrid() const; + protected: + using E3dView::SetMoveOutside; }; #endif // _FML_FMVIEW_HXX diff --git a/svx/inc/svx/gridctrl.hxx b/svx/inc/svx/gridctrl.hxx index d0461f886710..5b7637cce621 100644 --- a/svx/inc/svx/gridctrl.hxx +++ b/svx/inc/svx/gridctrl.hxx @@ -50,9 +50,6 @@ #include <svtools/transfer.hxx> #include "svx/svxdllapi.h" -extern XubString INVALIDTEXT; -extern XubString OBJECTTEXT; - class DbGridControl; class CursorWrapper; |