[Libreoffice-commits] .: Branch 'libreoffice-4-0' - sd/source

[Libreoffice Gerrit user]

 sd/source/filter/eppt/epptso.cxx |    4 ++--
 sd/source/filter/eppt/text.hxx   |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 00edfcff58032cc7f90026bd3ce92402e3c7e769
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Dec 19 09:15:14 2012 +0100

    fdo#58129 fix ppt export of paragraphs
    
    Change-Id: I8784c7a84e7f1d3173b6e134377e9232906d77ba
    (cherry picked from commit 2395a3fb74a90cc3166dbe4722250376eff58547)
    
    Signed-off-by: David Tardon <dtardon at redhat.com>

diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index 201f1f1..c28f4d1 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -732,7 +732,7 @@ void PPTWriter::ImplWriteParagraphs( SvStream& rOut, TextObj& rTextObj )
     {
         ParagraphObj* pPara = rTextObj.GetParagraph(i);
         PortionObj* pPortion = pPara->front();
-        nCharCount = pPara->size();
+        nCharCount = pPara->CharacterCount();
 
         nDepth = pPara->nDepth;
         if ( nDepth > 4)
@@ -2980,7 +2980,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
                                 for ( sal_uInt32 i = 0; i < aTextObj.ParagraphCount() ; ++i )
                                 {
                                     ParagraphObj* pPara = aTextObj.GetParagraph(i);
-                                    sal_uInt32 nCharCount = pPara->Count();
+                                    sal_uInt32 nCharCount = pPara->CharacterCount();
                                     sal_uInt16 nDepth = pPara->nDepth;
                                     if ( nDepth > 4)
                                         nDepth = 4;
diff --git a/sd/source/filter/eppt/text.hxx b/sd/source/filter/eppt/text.hxx
index 0137e68..e690238 100644
--- a/sd/source/filter/eppt/text.hxx
+++ b/sd/source/filter/eppt/text.hxx
@@ -214,7 +214,7 @@ class ParagraphObj : public std::vector<PortionObj*>, public PropStateValue, pub
                         ~ParagraphObj();
 
         void            Write( SvStream* pStrm );
-        sal_uInt32          Count() const { return mnTextSize; };
+        sal_uInt32      CharacterCount() const { return mnTextSize; };
 
         ParagraphObj&   operator=( const ParagraphObj& rParagraphObj );
 };