diff options
| author | Noel Power <noel.power@suse.com> | 2012-09-13 12:49:08 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-09-13 12:49:32 +0100 |
| commit | a6c18caef16b9eb0742c2a2cbb724e66bb31c3c3 (patch) | |
| tree | 273b82d875f1b55db73b56bb2fd147c7abe43917 /oox/inc | |
| parent | 41747c962603222b2d6221a9f5fca28cd71c103a (diff) | |
targetted container_controls rework.
Diffstat (limited to 'oox/inc')
| -rw-r--r-- | oox/inc/oox/ole/vbacontrol.hxx | 9 | ||||
| -rw-r--r-- | oox/inc/oox/ole/vbamodule.hxx | 10 |
2 files changed, 10 insertions, 9 deletions
diff --git a/oox/inc/oox/ole/vbacontrol.hxx b/oox/inc/oox/ole/vbacontrol.hxx index e3c9421978e5..8c56ac6d3b15 100644 --- a/oox/inc/oox/ole/vbacontrol.hxx +++ b/oox/inc/oox/ole/vbacontrol.hxx @@ -158,7 +158,13 @@ private: /** Imports the site models of all embedded controls from the 'f' stream. */ bool importEmbeddedSiteModels( BinaryInputStream& rInStrm ); /* Final processing of all embedded controls after import. */ - void finalizeEmbeddedControls( StorageBase& rStrg ); + void finalizeEmbeddedControls(); + + /** Moves the control relative to its current position by the passed distance. */ + void moveRelative( const AxPairData& rDistance ); + /** Moves all embedded controls from their relative position in this + control to an absolute position in the parent of this control. */ + void moveEmbeddedToAbsoluteParent(); /** Functor for comparing controls by their tab index. */ static bool compareByTabIndex( const VbaFormControlRef& rxLeft, const VbaFormControlRef& rxRight ); @@ -186,7 +192,6 @@ public: /** Imports the form and its embedded controls, and inserts the form with all its controls into the passed dialog library. */ void importForm( - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxDocModel, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& rxDialogLib, StorageBase& rVbaFormStrg, const ::rtl::OUString& rModuleName, diff --git a/oox/inc/oox/ole/vbamodule.hxx b/oox/inc/oox/ole/vbamodule.hxx index 14195d9d769f..65cd41a440cc 100644 --- a/oox/inc/oox/ole/vbamodule.hxx +++ b/oox/inc/oox/ole/vbamodule.hxx @@ -67,21 +67,17 @@ public: void createAndImportModule( StorageBase& rVbaStrg, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& rxBasicLib, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& rxDocObjectNA, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& rxOleNameOverrides ) const; + const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& rxDocObjectNA ) const; /** Creates an empty Basic module in the passed Basic library. */ void createEmptyModule( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& rxBasicLib, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& rxDocObjectNA ) const; private: - /** Reads and returns the VBA source code from the passed storage. */ - ::rtl::OUString readSourceCode( - StorageBase& rVbaStrg, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& rxOleNameOverrides ) const; - void extractOleOverrideFromAttr( const rtl::OUString& rAttribute, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& rxOleNameOverrides ) const; + /** Reads and returns the VBA source code from the passed storage. */ + ::rtl::OUString readSourceCode( StorageBase& rVbaStrg ) const; /** Creates a new Basic module and inserts it into the passed Basic library. */ void createModule( |