[Libreoffice-commits] .: sw/source

[Joseph Powers]

 sw/source/filter/ww1/w1filter.cxx |    4 ++--
 sw/source/filter/ww8/ww8graf2.cxx |    4 ++--
 sw/source/filter/ww8/ww8par4.cxx  |    4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 30c1f9ef9c11efc5a04e4365dd31e1cf8b1daae3
Author: Joseph Powers <jpowers27 at cox.net>
Date:   Tue May 10 06:34:05 2011 -0700

    GDIMetaFile cleanup
    
    Plus trailing whitespace cleanup.

diff --git a/sw/source/filter/ww1/w1filter.cxx b/sw/source/filter/ww1/w1filter.cxx
index 5aeae5c..3960919 100644
--- a/sw/source/filter/ww1/w1filter.cxx
+++ b/sw/source/filter/ww1/w1filter.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -1911,7 +1911,7 @@ void Ww1Picture::Out(Ww1Shell& rOut, Ww1Manager& /*rMan*/)
          (sizeof(*pPic)-sizeof(pPic->rgb)));
         aOut.Seek(0);
         GDIMetaFile aWMF;
-        if (ReadWindowMetafile( aOut, aWMF, NULL ) && aWMF.GetActionCount() > 0)
+        if (ReadWindowMetafile( aOut, aWMF, NULL ) && aWMF.GetActionSize() > 0)
         {
             aWMF.SetPrefMapMode(MapMode(MAP_100TH_MM));
             Size aOldSiz(aWMF.GetPrefSize());
diff --git a/sw/source/filter/ww8/ww8graf2.cxx b/sw/source/filter/ww8/ww8graf2.cxx
index bfc40b0..74c9a49 100644
--- a/sw/source/filter/ww8/ww8graf2.cxx
+++ b/sw/source/filter/ww8/ww8graf2.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -282,7 +282,7 @@ bool SwWW8ImplReader::ReadGrafFile(String& rFileName, Graphic*& rpGraphic,
     pSt->Seek( nPosFc );
     bool bOk = ReadWindowMetafile( *pSt, aWMF, NULL ) ? true : false;
 
-    if (!bOk || pSt->GetError() || !aWMF.GetActionCount())
+    if (!bOk || pSt->GetError() || !aWMF.GetActionSize())
         return false;
 
     if (pWwFib->envr != 1) // !MAC als Creator
diff --git a/sw/source/filter/ww8/ww8par4.cxx b/sw/source/filter/ww8/ww8par4.cxx
index b13871e..c99d48d 100644
--- a/sw/source/filter/ww8/ww8par4.cxx
+++ b/sw/source/filter/ww8/ww8par4.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -168,7 +168,7 @@ static bool SwWw6ReadMetaStream(GDIMetaFile& rWMF, OLE_MFP* pMfp,
     }
     bool bOk = ReadWindowMetafile( *pSt, rWMF, NULL ) ? true : false;   // WMF lesen
                     // *pSt >> aWMF  geht nicht ohne placable Header
-    if (!bOk || pSt->GetError() || rWMF.GetActionCount() == 0)
+    if (!bOk || pSt->GetError() || rWMF.GetActionSize() == 0)
     {
         OSL_ENSURE( !pSt, "+OLE: Konnte Metafile nicht lesen" );
         return false;