diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2013-04-10 12:22:03 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2013-04-10 13:13:06 +0200 |
| commit | 9a8306a18998b42b387eb83128c82abbcfdd87a3 (patch) | |
| tree | 8a531111ae03e45f67ca0e8db587059492fae4b4 /writerfilter | |
| parent | 91a151085a9e8e77e30c0e21740f211fd5eedd95 (diff) | |
RTF import of new-style frames: fix name
Change-Id: Ifa8e79fb9c4b9ad5a0bf64466cefad91b6bbeb0c
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/rtftok/rtfsdrimport.cxx | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx b/writerfilter/source/rtftok/rtfsdrimport.cxx index 3cb4038a3afe..f8560996532e 100644 --- a/writerfilter/source/rtftok/rtfsdrimport.cxx +++ b/writerfilter/source/rtftok/rtfsdrimport.cxx @@ -26,6 +26,7 @@ * instead of those above. */ +#include <com/sun/star/container/XNamed.hpp> #include <com/sun/star/drawing/XEnhancedCustomShapeDefaulter.hpp> #include <com/sun/star/drawing/XDrawPageSupplier.hpp> #include <com/sun/star/drawing/LineStyle.hpp> @@ -171,7 +172,15 @@ void RTFSdrImport::resolve(RTFShape& rShape) xPropertySet->setPropertyValue("FillColor", aAny); } else if ( i->first == "wzName" ) - xPropertySet->setPropertyValue("Name", uno::makeAny(i->second)); + { + if (bTextFrame) + { + uno::Reference<container::XNamed> xNamed(xShape, uno::UNO_QUERY); + xNamed->setName(i->second); + } + else + xPropertySet->setPropertyValue("Name", uno::makeAny(i->second)); + } else if ( i->first == "wzDescription" ) xPropertySet->setPropertyValue("Description", uno::makeAny(i->second)); else if ( i->first == "pib" ) |