commit 7d5d5e6e9b67807560a7db4123e8b41cc0f70a32
author Bartosz Kosiorek <gang65@poczta.onet.pl> Wed Oct 12 06:44:41 2016 +0200
committer Michael Stahl <mstahl@redhat.com> Thu Oct 13 19:03:33 2016 +0000
tree 404a4e407e9089eb3aa1f5ffea8adf1d064d9fea
parent ad707a3dafd020949cfd94098dc51c69466dafb8

tdf#103143 Fix importing number of characters from docx files

Change-Id: I45429626f7299f84fda2969dd6000c8aa8d23982
Reviewed-on: https://gerrit.libreoffice.org/29721
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>

oox/source/docprop/docprophandler.cxx

diff --git a/oox/source/docprop/docprophandler.cxx b/oox/source/docprop/docprophandler.cxx
index 773a6e5..d7a1e31 100644
--- a/oox/source/docprop/docprophandler.cxx
+++ b/oox/source/docprop/docprophandler.cxx
@@ -216,6 +216,10 @@ void OOXMLDocPropHandler::UpdateDocStatistic( const OUString& aChars )
    switch( m_nBlock )
    {
    case EXTPR_TOKEN( Characters ):
        aName = "NonWhitespaceCharacterCount";
        break;

    case EXTPR_TOKEN( CharactersWithSpaces ):
        aName = "CharacterCount";
        break;

@@ -513,6 +517,7 @@ void SAL_CALL OOXMLDocPropHandler::characters( const OUString& aChars )
                    break;

                case EXTPR_TOKEN( Characters ):
                case EXTPR_TOKEN( CharactersWithSpaces ):
                case EXTPR_TOKEN( Pages ):
                case EXTPR_TOKEN( Words ):
                case EXTPR_TOKEN( Paragraphs ):
@@ -589,7 +594,6 @@ void SAL_CALL OOXMLDocPropHandler::characters( const OUString& aChars )
                    AddCustomProperty( uno::makeAny( aChars ) ); // the property has string type
                    break;

                case EXTPR_TOKEN( CharactersWithSpaces ):
                case EXTPR_TOKEN( Lines ):
                case EXTPR_TOKEN( DigSig ):
                case EXTPR_TOKEN( HeadingPairs ):