[ooo-build-commit] patches/dev300

[Pei Feng Lin]

 patches/dev300/field-patch.diff |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 2b6540baad1f99ab63b2ea446b078f9f8b3e53bd
Author: Fong Lin <pflin at novell.com>
Date:   Thu Oct 15 17:42:03 2009 +0800

    Fix the issue of failing to add param into form field during importing
    
    * patches/dev300/field-patch.diff:

diff --git a/patches/dev300/field-patch.diff b/patches/dev300/field-patch.diff
index 06cae96..26a3746 100644
--- a/patches/dev300/field-patch.diff
+++ b/patches/dev300/field-patch.diff
@@ -52,10 +52,10 @@ diff -urN '--exclude=unxlngi6.pro' '--exclude=*.orig' sw/inc/IDocumentMarkAccess
              const ::rtl::OUString& rProposedName,
              MarkType eMark) =0;
  
-+        virtual sw::mark::IMark* makeFieldBookmark( const SwPaM& rPaM, 
++        virtual sw::mark::IFieldmark* makeFieldBookmark( const SwPaM& rPaM, 
 +            const rtl::OUString& rName, 
 +            const rtl::OUString& rType) = 0;
-+        virtual sw::mark::IMark* makeNoTextFieldBookmark( const SwPaM& rPaM, 
++        virtual sw::mark::IFieldmark* makeNoTextFieldBookmark( const SwPaM& rPaM, 
 +            const rtl::OUString& rName, 
 +            const rtl::OUString& rType) = 0;
 +
@@ -612,7 +612,7 @@ diff -urN '--exclude=unxlngi6.pro' '--exclude=*.orig' sw/source/core/doc/docbm.c
          return pMark.get();
      }
  
-+    ::sw::mark::IMark* MarkManager::makeFieldBookmark( const SwPaM& rPaM,
++    ::sw::mark::IFieldmark* MarkManager::makeFieldBookmark( const SwPaM& rPaM,
 +        const rtl::OUString& rName,
 +        const rtl::OUString& rType )
 +    {
@@ -621,10 +621,10 @@ diff -urN '--exclude=unxlngi6.pro' '--exclude=*.orig' sw/source/core/doc/docbm.c
 +        sw::mark::IFieldmark* pFieldMark = dynamic_cast<sw::mark::IFieldmark*>( pMark );
 +        pFieldMark->SetFieldname( rType );
 +
-+        return pMark;
++        return pFieldMark;
 +    }
 +            
-+    ::sw::mark::IMark* MarkManager::makeNoTextFieldBookmark( const SwPaM& rPaM, 
++    ::sw::mark::IFieldmark* MarkManager::makeNoTextFieldBookmark( const SwPaM& rPaM, 
 +        const rtl::OUString& rName, 
 +        const rtl::OUString& rType)
 +    {
@@ -633,7 +633,7 @@ diff -urN '--exclude=unxlngi6.pro' '--exclude=*.orig' sw/source/core/doc/docbm.c
 +        sw::mark::IFieldmark* pFieldMark = dynamic_cast<sw::mark::IFieldmark*>( pMark );
 +        pFieldMark->SetFieldname( rType );
 +
-+        return pMark;
++        return pFieldMark;
 +    }
 +
      ::sw::mark::IMark* MarkManager::getMarkForTxtNode(const SwTxtNode& rTxtNode,
@@ -704,10 +704,10 @@ diff -urN '--exclude=unxlngi6.pro' '--exclude=*.orig' sw/source/core/inc/MarkMan
              // IDocumentMarkAccess
              virtual ::sw::mark::IMark* makeMark(const SwPaM& rPaM, const ::rtl::OUString& rName, IDocumentMarkAccess::MarkType eMark);
 +        
-+            virtual sw::mark::IMark* makeFieldBookmark( const SwPaM& rPaM, 
++            virtual sw::mark::IFieldmark* makeFieldBookmark( const SwPaM& rPaM, 
 +                const rtl::OUString& rName, 
 +                const rtl::OUString& rType);
-+            virtual sw::mark::IMark* makeNoTextFieldBookmark( const SwPaM& rPaM, 
++            virtual sw::mark::IFieldmark* makeNoTextFieldBookmark( const SwPaM& rPaM, 
 +                const rtl::OUString& rName, 
 +                const rtl::OUString& rType);
 +