Kaydet (Commit) 89969e67 authored tarafından Michael Stahl's avatar Michael Stahl

sw_redlinehide_3: SwXTextViewCursor::getString() without redlines

Change-Id: I734e27c95e20373f8de32f8db2183275c94144e5
üst cd1abbed
......@@ -36,6 +36,7 @@ class SwUnoTableCursor;
class SwFormatColl;
struct SwSortOptions;
class SwDoc;
class SwRootFrame;
namespace sw { namespace mark { class IMark; } }
......@@ -135,7 +136,7 @@ namespace SwUnoCursorHelper
void GetCursorAttr(SwPaM & rPam, SfxItemSet & rSet,
const bool bOnlyTextAttr = false,
const bool bGetFromChrFormat = true);
void GetTextFromPam(SwPaM & rPam, OUString & rBuffer);
void GetTextFromPam(SwPaM & rPam, OUString & rBuffer, SwRootFrame const* pLayout = nullptr);
SwFormatColl * GetCurTextFormatColl(SwPaM & rPam, const bool bConditional);
void SelectPam(SwPaM & rPam, const bool bExpand);
......
......@@ -160,7 +160,8 @@ void SwUnoCursorHelper::SelectPam(SwPaM & rPam, const bool bExpand)
}
}
void SwUnoCursorHelper::GetTextFromPam(SwPaM & rPam, OUString & rBuffer)
void SwUnoCursorHelper::GetTextFromPam(SwPaM & rPam, OUString & rBuffer,
SwRootFrame const*const pLayout)
{
if (!rPam.HasMark())
{
......@@ -188,6 +189,7 @@ void SwUnoCursorHelper::GetTextFromPam(SwPaM & rPam, OUString & rBuffer)
// #i68522#
const bool bOldShowProgress = xWrt->m_bShowProgress;
xWrt->m_bShowProgress = false;
xWrt->m_bHideDeleteRedlines = pLayout && pLayout->IsHideRedlines();
if( ! aWriter.Write( xWrt ).IsError() )
{
......
......@@ -1381,7 +1381,8 @@ OUString SwXTextViewCursor::getString()
{
SwWrtShell& rSh = m_pView->GetWrtShell();
SwPaM* pShellCursor = rSh.GetCursor();
SwUnoCursorHelper::GetTextFromPam(*pShellCursor, uRet);
SwUnoCursorHelper::GetTextFromPam(*pShellCursor, uRet,
rSh.GetLayout());
break;
}
default:;//prevent warning
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment