summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVort <vvort@yandex.ru>2014-05-08 11:54:35 +0300
committerCaolán McNamara <caolanm@redhat.com>2014-05-08 09:04:12 +0000
commite0bde4c53b1b8412833d4b84a214da8b8fc1f6e7 (patch)
tree20850bea83422a106c93dfd4ea43bd662ac2ad66
parent8ef22b95059f2158434eeebb567bd04fc8477b32 (diff)
fdo#78427 PDF Import: Improve detection of bold italic font
(Bug #78427 is fixed only partially by this commit) Change-Id: I080dca98a77a645c4c5ae19a9bbcae7d54179d3c Reviewed-on: https://gerrit.libreoffice.org/9276 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--sdext/source/pdfimport/wrapper/wrapper.cxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/sdext/source/pdfimport/wrapper/wrapper.cxx b/sdext/source/pdfimport/wrapper/wrapper.cxx
index 391e71abc4b8..6d8567e6196d 100644
--- a/sdext/source/pdfimport/wrapper/wrapper.cxx
+++ b/sdext/source/pdfimport/wrapper/wrapper.cxx
@@ -458,8 +458,8 @@ sal_Int32 Parser::parseFontCheckForString(
if (tolower(pCopy[i]) != pAttrib[i]
&& toupper(pCopy[i]) != pAttrib[i])
return 0;
- rResult.isItalic = bItalic;
- rResult.isBold = bBold;
+ rResult.isItalic |= bItalic;
+ rResult.isBold |= bBold;
return nAttribLen;
}
@@ -488,6 +488,7 @@ void Parser::parseFontFamilyName( FontAttributes& rResult )
nLen -= 7;
}
+ // TODO: Looks like this block needs to be refactored
while( nLen )
{
if (parseFontRemoveSuffix(pCopy, nLen, RTL_CONSTASCII_STRINGPARAM("PSMT")))