summaryrefslogtreecommitdiff
path: root/xmloff
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2004-05-07 14:59:52 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2004-05-07 14:59:52 +0000
commit98a89f2805cc07888eb7a7b6735413c5cb227379 (patch)
tree5bbc51ce5d2dc3616825140953cb78f7024d40e4 /xmloff
parentfbb4a8a70aa7f3e23c638ce0939b4d870d802074 (diff)
INTEGRATION: CWS frmcontrols03 (1.21.150); FILE MERGED
2004/02/17 15:39:08 fs 1.21.150.1: #i24387# analyze text styles of a rich text control
Diffstat (limited to 'xmloff')
-rw-r--r--xmloff/source/forms/layerexport.cxx21
1 files changed, 18 insertions, 3 deletions
diff --git a/xmloff/source/forms/layerexport.cxx b/xmloff/source/forms/layerexport.cxx
index 45f7a777eb7d..f3b798845b59 100644
--- a/xmloff/source/forms/layerexport.cxx
+++ b/xmloff/source/forms/layerexport.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: layerexport.cxx,v $
*
- * $Revision: 1.22 $
+ * $Revision: 1.23 $
*
- * last change: $Author: rt $ $Date: 2004-05-03 13:35:19 $
+ * last change: $Author: rt $ $Date: 2004-05-07 15:59:52 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -140,6 +140,12 @@
#include "xmlnumfe.hxx"
#endif
+/** === begin UNO includes === **/
+#ifndef _COM_SUN_STAR_TEXT_XTEXT_HPP_
+#include <com/sun/star/text/XText.hpp>
+#endif
+/** === end UNO includes === **/
+
//.........................................................................
namespace xmloff
{
@@ -154,6 +160,7 @@ namespace xmloff
using namespace ::com::sun::star::form;
using namespace ::com::sun::star::script;
using namespace ::com::sun::star::util;
+ using namespace ::com::sun::star::text;
//=====================================================================
//= OFormLayerXMLExport_Impl
@@ -591,6 +598,14 @@ namespace xmloff
}
// ----------------------------------
+ // check if it's a control providing text
+ Reference< XText > xControlText( _rxObject, UNO_QUERY );
+ if ( xControlText.is() )
+ {
+ m_rContext.GetTextParagraphExport()->collectTextAutoStyles( xControlText );
+ }
+
+ // ----------------------------------
// check if it is a grid control - in this case, we need special handling for the columns
sal_Int16 nControlType = FormComponentType::CONTROL;
_rxObject->getPropertyValue( PROPERTY_CLASSID ) >>= nControlType;
@@ -640,7 +655,7 @@ namespace xmloff
aPropertyStates.push_back( aNumberStyleState );
}
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 0
::std::vector< XMLPropertyState >::const_iterator aHaveALook = aPropertyStates.begin();
for ( ; aHaveALook != aPropertyStates.end(); ++aHaveALook )
{