INTEGRATION: CWS xmlfilter04 (1.2.12); FILE MERGED

2008/03/11 09:50:33 dr 1.2.12.2: import manual chart title text
2008/02/21 12:42:01 hbrinkm 1.2.12.1: joined changes from xmlfilter03

3 files changed, 55 insertions, 55 deletions

diff --git a/oox/source/drawingml/textfield.cxx b/oox/source/drawingml/textfield.cxx
index 5d38ce0c5a92..2e5d3fa7ca0f 100644
--- a/oox/source/drawingml/textfield.cxx
+++ b/oox/source/drawingml/textfield.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: textfield.cxx,v $
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -179,7 +179,7 @@ namespace oox { namespace drawingml {
             }
             else
             {
-                xText->insertString( xStart, text(), sal_False );
+                xText->insertString( xStart, getText(), sal_False );
             }
         }
         catch( const Exception&  )
diff --git a/oox/source/drawingml/textfieldcontext.cxx b/oox/source/drawingml/textfieldcontext.cxx
index 1528a0918493..38d1c9354b0e 100644
--- a/oox/source/drawingml/textfieldcontext.cxx
+++ b/oox/source/drawingml/textfieldcontext.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: textfieldcontext.cxx,v $
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -72,7 +72,7 @@ namespace oox { namespace drawingml {
     {
         if( mbIsInText )
         {
-            mpTextField->text() += aChars;
+            mpTextField->getText() += aChars;
         }
     }
 
diff --git a/oox/source/drawingml/textrun.cxx b/oox/source/drawingml/textrun.cxx
index 6565d6082dc8..c3d1d8a817fa 100644
--- a/oox/source/drawingml/textrun.cxx
+++ b/oox/source/drawingml/textrun.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: textrun.cxx,v $
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -48,71 +48,71 @@ using namespace ::com::sun::star::lang;
 
 namespace oox { namespace drawingml {
 
-    TextRun::TextRun()
-        : mbIsLineBreak( false )
-        , maTextCharacterPropertiesPtr( new TextCharacterProperties() )
-    {
-    }
+TextRun::TextRun()
+    : mbIsLineBreak( false )
+    , maTextCharacterPropertiesPtr( new TextCharacterProperties() )
+{
+}
 
 
-    TextRun::~TextRun()
-    {
-    }
+TextRun::~TextRun()
+{
+}
 
-    void TextRun::insertAt(
-            const ::oox::core::XmlFilterBase& rFilterBase,
-            const Reference < XText > & xText,
-            const Reference < XTextCursor > &xAt,
-            const TextCharacterPropertiesPtr& rTextCharacterStyle )
-    {
-        try {
-            Reference< XTextRange > xStart( xAt, UNO_QUERY );
+void TextRun::insertAt(
+        const ::oox::core::XmlFilterBase& rFilterBase,
+        const Reference < XText > & xText,
+        const Reference < XTextCursor > &xAt,
+        const TextCharacterPropertiesPtr& rTextCharacterStyle )
+{
+    try {
+        Reference< XTextRange > xStart( xAt, UNO_QUERY );
 
-            Reference< XPropertySet > xProps( xStart, UNO_QUERY);
-            if ( rTextCharacterStyle.get() )
-                rTextCharacterStyle->pushToPropSet( rFilterBase, xProps );
+        Reference< XPropertySet > xProps( xStart, UNO_QUERY);
+        if ( rTextCharacterStyle.get() )
+            rTextCharacterStyle->pushToPropSet( rFilterBase, xProps );
 
-            maTextCharacterPropertiesPtr->pushToPropSet( rFilterBase, xProps );
+        maTextCharacterPropertiesPtr->pushToPropSet( rFilterBase, xProps );
 
-            if( maTextCharacterPropertiesPtr->getHyperlinkPropertyMap().empty() )
+        if( maTextCharacterPropertiesPtr->getHyperlinkPropertyMap().empty() )
+        {
+            if( mbIsLineBreak )
             {
-                 if( mbIsLineBreak )
-                {
-                    OSL_TRACE( "OOX: TextRun::insertAt() insert line break" );
-                    xText->insertControlCharacter( xStart, ControlCharacter::LINE_BREAK, sal_False );
-                }
-                else
-                {
-                    xText->insertString( xStart, text(), sal_False );
-                }
+                OSL_TRACE( "OOX: TextRun::insertAt() insert line break" );
+                xText->insertControlCharacter( xStart, ControlCharacter::LINE_BREAK, sal_False );
             }
             else
             {
-                OSL_TRACE( "OOX: URL field" );
-                Reference< XMultiServiceFactory > xFactory( rFilterBase.getModel(), UNO_QUERY );
-                Reference< XTextField > xField( xFactory->createInstance( CREATE_OUSTRING( "com.sun.star.text.TextField.URL" ) ), UNO_QUERY );
-                if( xField.is() )
-                {
-                    const rtl::OUString sRepresentation( OUString::intern( RTL_CONSTASCII_USTRINGPARAM( "Representation" ) ) );
-                    maTextCharacterPropertiesPtr->getHyperlinkPropertyMap()[ sRepresentation ] <<= text();
-
-                    Reference< XPropertySet > xFieldProps( xField, UNO_QUERY);
-                    maTextCharacterPropertiesPtr->pushToUrlFieldPropSet( xFieldProps );
-                    Reference< XTextContent > xContent( xField, UNO_QUERY);
-                    xText->insertTextContent( xStart, xContent, sal_False );
-                }
-                else
-                {
-                    OSL_TRACE( "OOX: URL field couldn't be created" );
-                    xText->insertString( xStart, text(), sal_False );
-                }
+                xText->insertString( xStart, getText(), sal_False );
             }
         }
-        catch( const Exception&  )
+        else
         {
-            OSL_TRACE("OOX:  TextRun::insertAt() exception");
+            OSL_TRACE( "OOX: URL field" );
+            Reference< XMultiServiceFactory > xFactory( rFilterBase.getModel(), UNO_QUERY );
+            Reference< XTextField > xField( xFactory->createInstance( CREATE_OUSTRING( "com.sun.star.text.TextField.URL" ) ), UNO_QUERY );
+            if( xField.is() )
+            {
+                const rtl::OUString sRepresentation( OUString::intern( RTL_CONSTASCII_USTRINGPARAM( "Representation" ) ) );
+                maTextCharacterPropertiesPtr->getHyperlinkPropertyMap()[ sRepresentation ] <<= getText();
+
+                Reference< XPropertySet > xFieldProps( xField, UNO_QUERY);
+                maTextCharacterPropertiesPtr->pushToUrlFieldPropSet( xFieldProps );
+                Reference< XTextContent > xContent( xField, UNO_QUERY);
+                xText->insertTextContent( xStart, xContent, sal_False );
+            }
+            else
+            {
+                OSL_TRACE( "OOX: URL field couldn't be created" );
+                xText->insertString( xStart, getText(), sal_False );
+            }
         }
     }
+    catch( const Exception&  )
+    {
+        OSL_TRACE("OOX:  TextRun::insertAt() exception");
+    }
+}
 
 
 } }