[Libreoffice-commits] core.git: vcl/source writerfilter/source

[Miklos Vajna]

 vcl/source/filter/ipdf/pdfread.cxx             |    2 +-
 writerfilter/source/rtftok/rtfdispatchflag.cxx |    2 +-
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 89e339fc1937b7de0d0e1f4ced802db7b4a68a9b
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Fri Feb 24 09:28:52 2017 +0100

    vcl PDF import: there is no PNG encoding here
    
    It was a copy&paste error from xmlsecurity/workben/pdfverify.cxx, which
    does PNG encoding.
    
    Change-Id: I7b5108a7cddffdc859276b656a6e1168f23d3863

diff --git a/vcl/source/filter/ipdf/pdfread.cxx b/vcl/source/filter/ipdf/pdfread.cxx
index 12d41af..c855400 100644
--- a/vcl/source/filter/ipdf/pdfread.cxx
+++ b/vcl/source/filter/ipdf/pdfread.cxx
@@ -37,7 +37,7 @@ double pointToPixel(double fPoint)
     return fPoint / 72 * 96;
 }
 
-/// Does PDF to PNG conversion using pdfium.
+/// Does PDF to bitmap conversion using pdfium.
 bool generatePreview(SvStream& rStream, Graphic& rGraphic)
 {
     FPDF_LIBRARY_CONFIG aConfig;
diff --git a/writerfilter/source/rtftok/rtfdispatchflag.cxx b/writerfilter/source/rtftok/rtfdispatchflag.cxx
index 3491499..93d5eeb 100644
--- a/writerfilter/source/rtftok/rtfdispatchflag.cxx
+++ b/writerfilter/source/rtftok/rtfdispatchflag.cxx
@@ -1071,7 +1071,7 @@ RTFError RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
     break;
     case RTF_HTMAUTSP:
         m_aSettingsTableSprms.set(NS_ooxml::LN_CT_Compat_doNotUseHTMLParagraphAutoSpacing, std::make_shared<RTFValue>(0));
-    break;
+        break;
     default:
     {
         SAL_INFO("writerfilter", "TODO handle flag '" << keywordToString(nKeyword) << "'");
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index ef5e086..05212b9 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -1123,7 +1123,7 @@ RTFError RTFDocumentImpl::resolveChars(char ch)
         {
             // note: apparently \'0d\'0a is interpreted as 2 breaks, not 1
             if (m_aStates.top().eDestination != Destination::DOCCOMM
-                && (ch == '\r' || ch == '\n'))
+                    && (ch == '\r' || ch == '\n'))
             {
                 checkUnicode(/*bUnicode =*/ false, /*bHex =*/ true);
                 dispatchSymbol(RTF_PAR);