summaryrefslogtreecommitdiff
path: root/xmloff/source/draw
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2008-03-12 09:34:55 +0000
committerRüdiger Timm <rt@openoffice.org>2008-03-12 09:34:55 +0000
commit5aefec0efdd534495536bb57b9923020d8c63563 (patch)
tree5ef8227059538b533cfd66a8811907f58fa52d48 /xmloff/source/draw
parent1da4de1ac84708399d8668c9149960b6c86792b8 (diff)
INTEGRATION: CWS impresstables2 (1.52.8); FILE MERGED
2008/03/06 18:14:05 cl 1.52.8.4: fixing merge errors 2008/02/13 20:09:57 cl 1.52.8.3: #i68103# import table shapes only in impress and draw 2007/08/01 14:12:14 cl 1.52.8.2: RESYNC: (1.52-1.54); FILE MERGED 2007/07/27 09:09:51 cl 1.52.8.1: fixed build issues due to pch and namespace ::rtl
Diffstat (limited to 'xmloff/source/draw')
-rw-r--r--xmloff/source/draw/sdxmlimp.cxx24
1 files changed, 21 insertions, 3 deletions
diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx
index eeba191e9148..f94340448cde 100644
--- a/xmloff/source/draw/sdxmlimp.cxx
+++ b/xmloff/source/draw/sdxmlimp.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: sdxmlimp.cxx,v $
*
- * $Revision: 1.56 $
+ * $Revision: 1.57 $
*
- * last change: $Author: obo $ $Date: 2008-03-03 07:12:47 $
+ * last change: $Author: rt $ $Date: 2008-03-12 10:34:55 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -119,7 +119,9 @@
#include <com/sun/star/document/XDocumentProperties.hpp>
#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
-using namespace ::rtl;
+using ::rtl::OUString;
+using ::rtl::OUStringBuffer;
+
using namespace ::com::sun::star;
using namespace ::xmloff::token;
@@ -564,6 +566,22 @@ void SAL_CALL SdXMLImport::setTargetDocument( const uno::Reference< lang::XCompo
// #88546# enable progress bar increments, SdXMLImport is only used for
// draw/impress import
GetShapeImport()->enableHandleProgressBar();
+
+ uno::Reference< lang::XMultiServiceFactory > xFac( GetModel(), uno::UNO_QUERY );
+ if( xFac.is() )
+ {
+ uno::Sequence< OUString > sSNS( xFac->getAvailableServiceNames() );
+ sal_Int32 n = sSNS.getLength();
+ const OUString* pSNS( sSNS.getConstArray() );
+ while( --n > 0 )
+ {
+ if( (*pSNS++).equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.TableShape") ) )
+ {
+ mbIsTableShapeSupported = true;
+ break;
+ }
+ }
+ }
}
// XInitialization