summaryrefslogtreecommitdiff
path: root/svx/source
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2017-11-08 23:17:56 +0100
committerMichael Stahl <mstahl@redhat.com>2017-11-23 15:15:28 +0100
commit3f289fef2f2b00dcca4948dd9fb2ba2c493fac6f (patch)
treea8de9d45c853a467386278498d3be3689d761277 /svx/source
parentc46f0c9f6eb07db061d2f99c61c9ea05644a78ec (diff)
tdf#113657: fix crash when trying to format empty paragraph
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>
Diffstat (limited to 'svx/source')
-rw-r--r--svx/source/dialog/fntctrl.cxx32
1 files changed, 21 insertions, 11 deletions
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index c78c8f481d47..039f69fe2d80 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -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))