From 9ae0361e22c4535edc9fe151747c5975b70043a4 Mon Sep 17 00:00:00 2001 From: Fong Lin Date: Thu, 15 Oct 2009 11:48:19 +0800 Subject: [PATCH] merge the formfield patch from ooo-build --- sw/inc/IDocumentMarkAccess.hxx | 4 ++-- sw/source/core/doc/docbm.cxx | 8 ++++---- sw/source/core/inc/MarkManager.hxx | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sw/inc/IDocumentMarkAccess.hxx b/sw/inc/IDocumentMarkAccess.hxx index e5a011227..0625e016b 100644 --- a/sw/inc/IDocumentMarkAccess.hxx +++ b/sw/inc/IDocumentMarkAccess.hxx @@ -86,10 +86,10 @@ class 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; diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx index e6b13f286..d85c18a5f 100644 --- a/sw/source/core/doc/docbm.cxx +++ b/sw/source/core/doc/docbm.cxx @@ -443,7 +443,7 @@ namespace sw { namespace mark 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 ) { @@ -452,10 +452,10 @@ namespace sw { namespace mark sw::mark::IFieldmark* pFieldMark = dynamic_cast( 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) { @@ -464,7 +464,7 @@ namespace sw { namespace mark sw::mark::IFieldmark* pFieldMark = dynamic_cast( pMark ); pFieldMark->SetFieldname( rType ); - return pMark; + return pFieldMark; } ::sw::mark::IMark* MarkManager::getMarkForTxtNode(const SwTxtNode& rTxtNode, diff --git a/sw/source/core/inc/MarkManager.hxx b/sw/source/core/inc/MarkManager.hxx index fd20406e2..878a3b8a0 100644 --- a/sw/source/core/inc/MarkManager.hxx +++ b/sw/source/core/inc/MarkManager.hxx @@ -48,10 +48,10 @@ namespace sw { namespace mark // 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); -- 2.11.4.GIT