diff options
author | Marco Cecchetti <mrcekets@gmail.com> | 2011-07-20 22:27:51 +0200 |
---|---|---|
committer | Thorsten Behrens <tbehrens@novell.com> | 2011-08-26 18:25:19 +0200 |
commit | edb6e65cc9d1d8612da4f22b2cd4dbbe007c1918 (patch) | |
tree | 76fbe6639f416f0bfbbff133a470d3a27f8bd336 | |
parent | 588329f5d2e4f7515380fc8b15d55a1d5c0cb16f (diff) |
Moved unointerfacetouniqueidentifiermapper.hxx under xmloff/inc/xmloff. The Package_inc.mk file has been modified in order to export the header under solver/*/*/inc/xmloff and the UnoInterfaceToUniqueIdentifierMapper class has been made visible from the outside by the XMLOFF_DLLPUBLIC macro.
-rw-r--r-- | xmloff/Package_inc.mk | 1 | ||||
-rw-r--r-- | xmloff/inc/xmloff/unointerfacetouniqueidentifiermapper.hxx (renamed from xmloff/inc/unointerfacetouniqueidentifiermapper.hxx) | 8 | ||||
-rw-r--r-- | xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/core/xmlexp.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/core/xmlimp.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/draw/animationexport.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/draw/animationimport.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/draw/animexp.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/draw/animimp.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/draw/sdxmlexp.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/draw/shapeexport.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/draw/shapeexport2.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/draw/shapeimport.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/draw/ximpbody.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/draw/ximppage.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/draw/ximpshap.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/text/txtparae.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/text/txtparai.cxx | 2 |
18 files changed, 23 insertions, 18 deletions
diff --git a/xmloff/Package_inc.mk b/xmloff/Package_inc.mk index 1d349bf3262e..6fc737c69f4c 100644 --- a/xmloff/Package_inc.mk +++ b/xmloff/Package_inc.mk @@ -97,6 +97,7 @@ $(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/txtstyle.hxx,xmloff/txts $(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/txtstyli.hxx,xmloff/txtstyli.hxx)) $(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/uniref.hxx,xmloff/uniref.hxx)) $(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/unoatrcn.hxx,xmloff/unoatrcn.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/unointerfacetouniqueidentifiermapper.hxx,xmloff/unointerfacetouniqueidentifiermapper.hxx)) $(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xformsexport.hxx,xmloff/xformsexport.hxx)) $(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xformsimport.hxx,xmloff/xformsimport.hxx)) $(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlaustp.hxx,xmloff/xmlaustp.hxx)) diff --git a/xmloff/inc/unointerfacetouniqueidentifiermapper.hxx b/xmloff/inc/xmloff/unointerfacetouniqueidentifiermapper.hxx index 0baf405c6b2e..8b3dff73666e 100644 --- a/xmloff/inc/unointerfacetouniqueidentifiermapper.hxx +++ b/xmloff/inc/xmloff/unointerfacetouniqueidentifiermapper.hxx @@ -2,6 +2,10 @@ #ifndef __COMPHELPER_UNOINTERFACETOUNIQUEIDENTIFIERMAPPER__ #define __COMPHELPER_UNOINTERFACETOUNIQUEIDENTIFIERMAPPER__ +#include "sal/config.h" +#include "xmloff/dllapi.h" +#include "sal/types.h" + #include <map> #include <rtl/ustring.hxx> #include <com/sun/star/uno/XInterface.hpp> @@ -11,7 +15,7 @@ namespace comphelper typedef ::std::map< rtl::OUString, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > > IdMap_t; -class UnoInterfaceToUniqueIdentifierMapper +class XMLOFF_DLLPUBLIC UnoInterfaceToUniqueIdentifierMapper { public: UnoInterfaceToUniqueIdentifierMapper(); @@ -44,7 +48,7 @@ private: bool findReference( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rInterface, IdMap_t::const_iterator& rIter ) const; bool findIdentifier( const rtl::OUString& rIdentifier, IdMap_t::const_iterator& rIter ) const; - IdMap_t maEntries; + IdMap_t maEntries; sal_Int32 mnNextId; }; diff --git a/xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx b/xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx index 6503a97bee03..fa195d01c11d 100644 --- a/xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx +++ b/xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx @@ -29,7 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" -#include "unointerfacetouniqueidentifiermapper.hxx" +#include <xmloff/unointerfacetouniqueidentifiermapper.hxx> using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::XInterface; diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx index 1498d48d9584..25f1e093cf03 100644 --- a/xmloff/source/core/xmlexp.cxx +++ b/xmloff/source/core/xmlexp.cxx @@ -32,7 +32,7 @@ #ifdef PRECOMPILED #include "filt_pch.hxx" #endif -#include "unointerfacetouniqueidentifiermapper.hxx" +#include <xmloff/unointerfacetouniqueidentifiermapper.hxx> #include <osl/mutex.hxx> #include <tools/debug.hxx> #include <tools/urlobj.hxx> diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx index 803290a7280b..1f9f87a73214 100644 --- a/xmloff/source/core/xmlimp.cxx +++ b/xmloff/source/core/xmlimp.cxx @@ -34,7 +34,7 @@ #include <osl/mutex.hxx> #include <rtl/memory.h> #include <svl/svarray.hxx> -#include "unointerfacetouniqueidentifiermapper.hxx" +#include <xmloff/unointerfacetouniqueidentifiermapper.hxx> #include <xmloff/nmspmap.hxx> #include <xmloff/xmluconv.hxx> #include "xmloff/xmlnmspe.hxx" diff --git a/xmloff/source/draw/animationexport.cxx b/xmloff/source/draw/animationexport.cxx index eeeead7374af..c24a7858e931 100644 --- a/xmloff/source/draw/animationexport.cxx +++ b/xmloff/source/draw/animationexport.cxx @@ -64,7 +64,7 @@ #include <tools/debug.hxx> #include <tools/time.hxx> -#include "unointerfacetouniqueidentifiermapper.hxx" +#include <xmloff/unointerfacetouniqueidentifiermapper.hxx> #include "sdxmlexp_impl.hxx" #include "sdpropls.hxx" #include <xmloff/xmltoken.hxx> diff --git a/xmloff/source/draw/animationimport.cxx b/xmloff/source/draw/animationimport.cxx index 0b4ec5178206..85528e83ceba 100644 --- a/xmloff/source/draw/animationimport.cxx +++ b/xmloff/source/draw/animationimport.cxx @@ -31,7 +31,7 @@ #include <tools/debug.hxx> #include <tools/time.hxx> -#include "unointerfacetouniqueidentifiermapper.hxx" +#include <xmloff/unointerfacetouniqueidentifiermapper.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/animations/AnimationTransformType.hpp> diff --git a/xmloff/source/draw/animexp.cxx b/xmloff/source/draw/animexp.cxx index d6b0eaf49215..f6bb306d9a4d 100644 --- a/xmloff/source/draw/animexp.cxx +++ b/xmloff/source/draw/animexp.cxx @@ -32,7 +32,7 @@ #include <tools/debug.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/presentation/AnimationSpeed.hpp> -#include "unointerfacetouniqueidentifiermapper.hxx" +#include <xmloff/unointerfacetouniqueidentifiermapper.hxx> #include <list> #include <comphelper/extract.hxx> diff --git a/xmloff/source/draw/animimp.cxx b/xmloff/source/draw/animimp.cxx index a9882591f69f..89c90e2ae05b 100644 --- a/xmloff/source/draw/animimp.cxx +++ b/xmloff/source/draw/animimp.cxx @@ -30,7 +30,7 @@ #include "precompiled_xmloff.hxx" #include <tools/debug.hxx> -#include "unointerfacetouniqueidentifiermapper.hxx" +#include <xmloff/unointerfacetouniqueidentifiermapper.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/presentation/AnimationEffect.hpp> #include <com/sun/star/presentation/AnimationSpeed.hpp> diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx index 9320657714aa..e8f727b51d73 100644 --- a/xmloff/source/draw/sdxmlexp.cxx +++ b/xmloff/source/draw/sdxmlexp.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" -#include "unointerfacetouniqueidentifiermapper.hxx" +#include <xmloff/unointerfacetouniqueidentifiermapper.hxx> #include <xmloff/nmspmap.hxx> #include "xmloff/xmlnmspe.hxx" #include <xmloff/xmluconv.hxx> diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx index da1ae6f0e3d4..c6d07c291011 100644 --- a/xmloff/source/draw/shapeexport.cxx +++ b/xmloff/source/draw/shapeexport.cxx @@ -31,7 +31,7 @@ #include <memory> -#include "unointerfacetouniqueidentifiermapper.hxx" +#include <xmloff/unointerfacetouniqueidentifiermapper.hxx> #include <com/sun/star/presentation/ClickAction.hpp> #include <com/sun/star/lang/ServiceNotRegisteredException.hpp> #include <com/sun/star/container/XChild.hpp> diff --git a/xmloff/source/draw/shapeexport2.cxx b/xmloff/source/draw/shapeexport2.cxx index b50c03db813a..aaf4acb6f1f5 100644 --- a/xmloff/source/draw/shapeexport2.cxx +++ b/xmloff/source/draw/shapeexport2.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" -#include "unointerfacetouniqueidentifiermapper.hxx" +#include <xmloff/unointerfacetouniqueidentifiermapper.hxx> #include <com/sun/star/text/XText.hpp> #include <com/sun/star/container/XNamed.hpp> #include <com/sun/star/container/XEnumerationAccess.hpp> diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx index 833e76966a13..e16392568151 100644 --- a/xmloff/source/draw/shapeimport.cxx +++ b/xmloff/source/draw/shapeimport.cxx @@ -34,7 +34,7 @@ #include <com/sun/star/text/PositionLayoutDir.hpp> #include <com/sun/star/chart/XChartDocument.hpp> -#include "unointerfacetouniqueidentifiermapper.hxx" +#include <xmloff/unointerfacetouniqueidentifiermapper.hxx> #include <list> diff --git a/xmloff/source/draw/ximpbody.cxx b/xmloff/source/draw/ximpbody.cxx index 38c82700e8e4..8b03cf31ed07 100644 --- a/xmloff/source/draw/ximpbody.cxx +++ b/xmloff/source/draw/ximpbody.cxx @@ -40,7 +40,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/animations/XAnimationNodeSupplier.hpp> -#include "unointerfacetouniqueidentifiermapper.hxx" +#include <xmloff/unointerfacetouniqueidentifiermapper.hxx> #include <xmloff/xmluconv.hxx> #include <xmloff/xmlprmap.hxx> #include <xmloff/families.hxx> diff --git a/xmloff/source/draw/ximppage.cxx b/xmloff/source/draw/ximppage.cxx index c6f66daed090..5ba019fee9f2 100644 --- a/xmloff/source/draw/ximppage.cxx +++ b/xmloff/source/draw/ximppage.cxx @@ -49,7 +49,7 @@ #include <xmloff/prstylei.hxx> #include "PropertySetMerger.hxx" -#include "unointerfacetouniqueidentifiermapper.hxx" +#include <xmloff/unointerfacetouniqueidentifiermapper.hxx> #include <xmloff/xmluconv.hxx> using ::rtl::OUString; diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx index 753aaaf612e1..15fba1a45f64 100644 --- a/xmloff/source/draw/ximpshap.cxx +++ b/xmloff/source/draw/ximpshap.cxx @@ -37,7 +37,7 @@ #include <com/sun/star/presentation/ClickAction.hpp> #include <com/sun/star/drawing/FillStyle.hpp> #include <com/sun/star/drawing/LineStyle.hpp> -#include "unointerfacetouniqueidentifiermapper.hxx" +#include <xmloff/unointerfacetouniqueidentifiermapper.hxx> #include <com/sun/star/drawing/XGluePointsSupplier.hpp> #include <com/sun/star/container/XIdentifierAccess.hpp> #include <com/sun/star/drawing/GluePoint2.hpp> diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx index 33317285505d..aac49a603091 100644 --- a/xmloff/source/text/txtparae.cxx +++ b/xmloff/source/text/txtparae.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" -#include "unointerfacetouniqueidentifiermapper.hxx" +#include <xmloff/unointerfacetouniqueidentifiermapper.hxx> #include <tools/debug.hxx> #include <svl/svarray.hxx> #include <rtl/ustrbuf.hxx> diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx index bc5149ca707a..7bb95f10be0b 100644 --- a/xmloff/source/text/txtparai.cxx +++ b/xmloff/source/text/txtparai.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" -#include "unointerfacetouniqueidentifiermapper.hxx" +#include <xmloff/unointerfacetouniqueidentifiermapper.hxx> #include <rtl/ustring.hxx> #include <rtl/ustrbuf.hxx> #include <tools/debug.hxx> |