[Libreoffice-commits] .: Branch 'integration/dev300_m98' - oox/inc oox/source

[Thorsten Behrens]

 oox/inc/oox/xls/commentsfragment.hxx |    3 ++-
 oox/source/xls/commentsfragment.cxx  |    7 +++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit cac114d1819bdc054170208ff99a514c6d5e1815
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Tue Mar 8 16:50:17 2011 +0100

    FragmentHandler2::onEndElement no longer has char param
    
    Fixed un-called virtual func in CommentsFragment - the new base
    class defines onEndElement() w/o any parameter. Collecting
    needed element text in separate variable.

diff --git a/oox/inc/oox/xls/commentsfragment.hxx b/oox/inc/oox/xls/commentsfragment.hxx
index b063bf4..a84f7a4 100644
--- a/oox/inc/oox/xls/commentsfragment.hxx
+++ b/oox/inc/oox/xls/commentsfragment.hxx
@@ -46,7 +46,7 @@ public:
 protected:
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs );
     virtual void        onCharacters( const ::rtl::OUString& rChars );
-    virtual void        onEndElement( const ::rtl::OUString& rChars );
+    virtual void        onEndElement( );
 
     virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm );
     virtual void        onEndRecord();
@@ -61,6 +61,7 @@ private:
 
 private:
     CommentRef          mxComment;
+    ::rtl::OUString     maElementText;
 };
 
 // ============================================================================
diff --git a/oox/source/xls/commentsfragment.cxx b/oox/source/xls/commentsfragment.cxx
index f649346..3475ccc 100644
--- a/oox/source/xls/commentsfragment.cxx
+++ b/oox/source/xls/commentsfragment.cxx
@@ -48,6 +48,7 @@ CommentsFragment::CommentsFragment( const WorksheetHelper& rHelper, const OUStri
 
 ContextHandlerRef CommentsFragment::onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs )
 {
+    maElementText = OUString();
     switch( getCurrentElement() )
     {
         case XML_ROOT_CONTEXT:
@@ -87,9 +88,11 @@ void CommentsFragment::onCharacters( const OUString& rChars )
 {
     if( isCurrentElement( XLS_TOKEN( author ) ) )
         getComments().appendAuthor( rChars );
+    else
+        maElementText = rChars;
 }
 
-void CommentsFragment::onEndElement( const OUString& rChars )
+void CommentsFragment::onEndElement( )
 {
     bool bFrom = false;
     if( getParentElement() == XDR_TOKEN( from ) )
@@ -100,7 +103,7 @@ void CommentsFragment::onEndElement( const OUString& rChars )
         case XDR_TOKEN( colOff ):
         case XDR_TOKEN( row ):
         case XDR_TOKEN( rowOff ):
-            mxComment->importAnchor( bFrom, getCurrentElement(), rChars );
+            mxComment->importAnchor( bFrom, getCurrentElement(), maElementText );
             break;
         case XLS_TOKEN( comment ):
             mxComment.reset();