ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

tdf#113657: fix crash when trying to format empty paragraph

Browse Source 
by creating a function to clean line feeds and returns if it's empty or not

Change-Id: I3a744c52bdb457c92f38595463099e1cbf17a37e
Reviewed-on: https://gerrit.libreoffice.org/44513
Tested-by: Jenkins <ci@libreoffice.org>
Tested-by: Xisco Faulí <xiscofauli@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
This commit is contained in:
Julien Nabet
2017-11-23 15:15:28 +01:00
committed by Michael Stahl
parent c46f0c9f6e
commit 3f289fef2f
2 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/svx/fntctrl.hxx
+1
View File
@@ -63,6 +63,7 @@ public:
void ResetColor();
void SetBackColor( const Color& rColor );
void UseResourceText();
bool CleanAndCheckEmpty(OUString& rText);
void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& ) override;
bool IsTwoLines() const;
svx/source/dialog/fntctrl.cxx
+21 -11
View File
@@ -612,6 +612,24 @@ void SvxFontPrevWindow::UseResourceText()
pImpl->mbUseResText = true;
}
/*
* removes line feeds and carriage returns from string
* returns if param is empty
*/
bool SvxFontPrevWindow::CleanAndCheckEmpty(OUString& rText)
{
bool bEmpty = true;
for (sal_Int32 i = 0; i < rText.getLength(); ++i)
{
if (0xa == rText[i] || 0xd == rText[i])
rText = rText.replaceAt(i, 1, " ");
else
bEmpty = false;
}
return bEmpty;
}
void SvxFontPrevWindow::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&)
{
ApplySettings(rRenderContext);
@@ -645,7 +663,7 @@ void SvxFontPrevWindow::Paint(vcl::RenderContext& rRenderContext, const tools::R
{
pImpl->maText = pSh->GetSelectionText();
pImpl->mbGetSelection = true;
pImpl->mbSelection = !pImpl->maText.isEmpty();
pImpl->mbSelection = !CleanAndCheckEmpty(pImpl->maText);
}
if (!pImpl->mbSelection || pImpl->mbUseFontNameAsText)
@@ -681,16 +699,8 @@ void SvxFontPrevWindow::Paint(vcl::RenderContext& rRenderContext, const tools::R
pImpl->maText = makeRepresentativeTextForFont(LATIN, rFont);
}
// remove line feeds and carriage returns from string
bool bNotEmpty = false;
for (sal_Int32 i = 0; i < pImpl->maText.getLength(); ++i)
{
if (0xa == pImpl->maText[i] || 0xd == pImpl->maText[i])
pImpl->maText = pImpl->maText.replaceAt(i, 1, " ");
else
bNotEmpty = true;
}
if (!bNotEmpty)
bool bEmpty = CleanAndCheckEmpty(pImpl->maText);
if (bEmpty)
pImpl->maText = GetText();
if (pImpl->maText.getLength() > (TEXT_WIDTH - 1))