diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-10-24 14:10:40 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-10-24 14:10:40 +0000 |
| commit | 4e3a348cb9f4544fbab7c4fdfbdec17c7f9e2231 (patch) | |
| tree | e6ce465128790f03f919fda8329ed5cc55e3fd7f /xmloff/source/forms | |
| parent | e8b1824b866a29c2ff10b74357e4e540948639d1 (diff) | |
INTEGRATION: CWS dba205c (1.18.34); FILE MERGED
2006/10/10 08:16:26 fs 1.18.34.1: #i68882# make form:id document-wide unique
Diffstat (limited to 'xmloff/source/forms')
| -rw-r--r-- | xmloff/source/forms/layerexport.hxx | 36 |
1 files changed, 21 insertions, 15 deletions
diff --git a/xmloff/source/forms/layerexport.hxx b/xmloff/source/forms/layerexport.hxx index 2df5ede4b24a..cd9166d0a353 100644 --- a/xmloff/source/forms/layerexport.hxx +++ b/xmloff/source/forms/layerexport.hxx @@ -4,9 +4,9 @@ * * $RCSfile: layerexport.hxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: rt $ $Date: 2006-07-25 09:25:35 $ + * last change: $Author: hr $ $Date: 2006-10-24 15:10:40 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -57,9 +57,6 @@ #ifndef _VOS_REF_HXX_ #include <vos/ref.hxx> #endif -#ifndef _COMPHELPER_STLTYPES_HXX_ -#include <comphelper/stl_types.hxx> -#endif class SvXMLExport; class SvXMLNumFmtExport; @@ -71,8 +68,22 @@ namespace xmloff { //......................................................................... - typedef ::std::set< ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >, ::comphelper::OInterfaceCompare< ::com::sun::star::beans::XPropertySet > > - PropertySetBag; + typedef ::std::set < ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > + , OPropertySetCompare + > PropertySetBag; + + // maps objects (property sets) to strings, e.g. control ids. + typedef ::std::map < ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > + , ::rtl::OUString + , OPropertySetCompare + > MapPropertySet2String; + + // map pages to maps (of property sets to strings) + typedef ::std::map < ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > + , MapPropertySet2String + , ODrawPageCompare + > MapPropertySet2Map; + //===================================================================== //= OFormLayerXMLExport_Impl //===================================================================== @@ -113,22 +124,17 @@ namespace xmloff ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats > m_xControlNumberFormats; - DECLARE_STL_MAP( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >, ::rtl::OUString, OPropertySetCompare, MapPropertySet2String); - // maps objects (property sets) to strings, e.g. control ids. - DECLARE_STL_MAP( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >, MapPropertySet2String, ODrawPageCompare, MapPropertySet2Map); - // map pages to maps (of property sets to strings) - MapPropertySet2Map m_aControlIds; - // the control ids of all control on all pages we ever examined + // the control ids of all controls on all pages we ever examined MapPropertySet2Map m_aReferringControls; // for a given page (iter->first), and a given control (iter->second->first), this is the comma-separated // lists of ids of the controls refering to the control given. - MapPropertySet2MapIterator + MapPropertySet2Map::iterator m_aCurrentPageIds; // the iterator for the control id map for the page beeing handled - MapPropertySet2MapIterator + MapPropertySet2Map::iterator m_aCurrentPageReferring; // the same for the map of referring controls |