[Libreoffice-commits] core.git: oox/source
alexey.chemichev
alexey.chemichev at gmail.com
Thu Nov 19 06:45:20 PST 2015
oox/source/core/xmlfilterbase.cxx | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
New commits:
commit 24346dc6630471da65a2c19d767cb9deed73405a
Author: alexey.chemichev <alexey.chemichev at gmail.com>
Date: Thu Nov 19 08:47:55 2015 -0500
tdf#90904 Sorry, mixed Characters and CharactersWithSpaces at a first time
Without this patch Windows Explorer shows different "Character count" for the same text saved with MSW an LO.
Now both stats are explicitly exported this way:
NonWhitespaceCharacterCount -> XML_Characters
CharacterCount -> XML_CharactersWithSpaces
Change-Id: I0a3b827629e88ab5e09aa8440e5f19e7fba2d831
Reviewed-on: https://gerrit.libreoffice.org/20058
Reviewed-by: Michael Stahl <mstahl at redhat.com>
Tested-by: Michael Stahl <mstahl at redhat.com>
diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx
index a89cc9d..aa202ff 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -664,7 +664,6 @@ writeAppProperties( XmlFilterBase& rSelf, Reference< XDocumentProperties > xProp
writeElement( pAppProps, XML_HeadingPairs, "heading pairs" );
writeElement( pAppProps, XML_TitlesOfParts, "titles of parts" );
writeElement( pAppProps, XML_LinksUpToDate, "links up-to-date" );
- writeElement( pAppProps, XML_CharactersWithSpaces, "characters with spaces" );
writeElement( pAppProps, XML_SharedDoc, "shared doc" );
writeElement( pAppProps, XML_HyperlinkBase, "hyperlink base" );
writeElement( pAppProps, XML_HLinks, "hlinks" );
@@ -695,13 +694,20 @@ writeAppProperties( XmlFilterBase& rSelf, Reference< XDocumentProperties > xProp
writeElement(pAppProps, XML_Words, nValue);
}
- it = aStats.find("CharacterCount");
+ it = aStats.find("NonWhitespaceCharacterCount");
if (it != aStats.end())
{
if (it->second >>= nValue)
writeElement(pAppProps, XML_Characters, nValue);
}
+ it = aStats.find("CharacterCount");
+ if (it != aStats.end())
+ {
+ if (it->second >>= nValue)
+ writeElement(pAppProps, XML_CharactersWithSpaces, nValue);
+ }
+
it = aStats.find("ParagraphCount");
if (it != aStats.end())
{
More information about the Libreoffice-commits
mailing list