summaryrefslogtreecommitdiff
path: root/oox/source/docprop
diff options
context:
space:
mode:
authorBartosz Kosiorek <gang65@poczta.onet.pl>2016-10-12 06:44:41 +0200
committerMichael Stahl <mstahl@redhat.com>2016-10-13 19:03:33 +0000
commit7d5d5e6e9b67807560a7db4123e8b41cc0f70a32 (patch)
tree404a4e407e9089eb3aa1f5ffea8adf1d064d9fea /oox/source/docprop
parentad707a3dafd020949cfd94098dc51c69466dafb8 (diff)
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>
Diffstat (limited to 'oox/source/docprop')
-rw-r--r--oox/source/docprop/docprophandler.cxx6
1 files changed, 5 insertions, 1 deletions
diff --git a/oox/source/docprop/docprophandler.cxx b/oox/source/docprop/docprophandler.cxx
index 773a6e5ba90c..d7a1e31c1ea8 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 ):