diff options
author | Ivo Hinkelmann <ihi@openoffice.org> | 2009-10-28 15:40:57 +0000 |
---|---|---|
committer | Ivo Hinkelmann <ihi@openoffice.org> | 2009-10-28 15:40:57 +0000 |
commit | 0211e8bc457a12570988f4aee7dea42c2fc6d56f (patch) | |
tree | 222a07982b8f2345681c26cd675b359ae4b47f41 /writerfilter/source/dmapper/OLEHandler.hxx | |
parent | Create DEV300_m60 milestone tag from trunk@276428 (diff) | |
download | core-0211e8bc457a12570988f4aee7dea42c2fc6d56f.tar.gz core-0211e8bc457a12570988f4aee7dea42c2fc6d56f.zip |
CWS-TOOLING: integrate CWS writerfilter32bugfixes01
2009-10-16 10:25:35 +0200 os r276956 : warning fixed
2009-10-16 10:18:35 +0200 os r276954 : using namespace std removed from headers
2009-10-16 10:18:19 +0200 os r276953 : using namespace std removed from headers
2009-10-16 10:17:35 +0200 os r276952 : using namespace std removed from headers
2009-10-14 12:14:16 +0200 cedricbosdo r276890 : Fixed warnings
2009-10-09 08:36:35 +0200 cedricbosdo r276796 : Rebased to OOO320_m1
2009-10-05 11:32:53 +0200 cedricbosdo r276668 : * Fixed namespace_preprocess for windows build
* Removed some unused variable
* Set a default value for GetCurrentToken
2009-09-07 13:05:30 +0200 os r275892 : #i104155# support for empty URLs if called from writerfilter re-introduced
2009-09-04 14:36:14 +0200 cedricbosdo r275803 : CWS-TOOLING: rebase CWS writerfilter32bugfixes01 to trunk@275331 (milestone: DEV300:m56)
2009-05-15 17:36:28 +0200 cedricbosdo r271958 : Added file to test docx numbering import fixes
2009-05-15 17:28:27 +0200 cedricbosdo r271955 : * Implemented a VML import basis.
* Fixed some docx numbering import bugs
* Implemented docx outline style import
2009-03-16 11:42:06 +0100 hbrinkm r269515 : moved clog inside #ifdef
2009-03-13 18:30:14 +0100 cedricbosdo r269493 : Fixed a dummy paragraph ending problem
2009-03-13 13:57:58 +0100 cedricbosdo r269477 : Added the missing headers
2009-03-13 12:03:25 +0100 cedricbosdo r269466 : Fixed i#93786 and i#100176
2009-03-12 11:39:10 +0100 cedricbosdo r269377 : Fixed a crash in the redlines patch
2009-03-12 10:11:48 +0100 cedricbosdo r269362 : Fixes for the docx import
2009-03-12 10:10:37 +0100 cedricbosdo r269361 : docx import fixes for:
+ tables styles
+ pictures positionning
+ redlines
Started to implement the docx settings.xml import
Diffstat (limited to 'writerfilter/source/dmapper/OLEHandler.hxx')
-rw-r--r-- | writerfilter/source/dmapper/OLEHandler.hxx | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/writerfilter/source/dmapper/OLEHandler.hxx b/writerfilter/source/dmapper/OLEHandler.hxx index 34b4a0316819..bdd94a802b7b 100644 --- a/writerfilter/source/dmapper/OLEHandler.hxx +++ b/writerfilter/source/dmapper/OLEHandler.hxx @@ -38,6 +38,8 @@ #include <com/sun/star/awt/Size.hpp> #include <com/sun/star/awt/Point.hpp> +#include <com/sun/star/drawing/XShape.hpp> + namespace com{ namespace sun{ namespace star{ namespace embed{ class XEmbeddedObject; @@ -72,6 +74,9 @@ class WRITERFILTER_DLLPRIVATE OLEHandler : public Properties sal_Int32 m_nDxaOrig; sal_Int32 m_nDyaOrig; + sal_Int32 m_nWrapMode; + + ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > m_xShape; ::com::sun::star::awt::Size m_aShapeSize; ::com::sun::star::awt::Point m_aShapePosition; @@ -87,6 +92,10 @@ public: virtual void attribute(Id Name, Value & val); virtual void sprm(Sprm & sprm); + inline ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > getShape( ) { return m_xShape; }; + + inline bool isOLEObject( ) { return m_xInputStream.is( ); }; + ::rtl::OUString copyOLEOStream( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextDocument > xTextDocument ); ::com::sun::star::awt::Size getSize() const { return m_aShapeSize;} |