[Libreoffice-commits] .: vcl/inc vcl/source

[Miklos Vajna]

 vcl/inc/vcl/gdimtf.hxx    |    2 +-
 vcl/source/gdi/gdimtf.cxx |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit d3142771895c2e9ce029e3b52af7f1ea1b437a6b
Author: Miklos Vajna <vmiklos at frugalware.org>
Date:   Wed May 11 03:31:13 2011 +0200

    Fix build breakage introduced by commit 6fb23043
    
    GDIMetaFile's sal_uLong -> size_t conversion was incomplete.

diff --git a/vcl/inc/vcl/gdimtf.hxx b/vcl/inc/vcl/gdimtf.hxx
index fcc60ab..db00bf8 100644
--- a/vcl/inc/vcl/gdimtf.hxx
+++ b/vcl/inc/vcl/gdimtf.hxx
@@ -215,7 +215,7 @@ public:
     MetaAction*     GetAction( size_t nAction ) const;
     MetaAction*     CopyAction( size_t nPos ) const;
     MetaAction*     GetCurAction() const { return GetAction( nCurrentActionElement ); }
-    MetaAction*     ReplaceAction( MetaAction* pAction, sal_uLong nAction );
+    MetaAction*     ReplaceAction( MetaAction* pAction, size_t nAction );
 
     sal_Bool            InsertLabel( const String& rLabel, sal_uLong nActionPos );
     void            RemoveLabel( const String& rLabel );
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index 37638d5..5b9044a 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -701,7 +701,7 @@ void GDIMetaFile::ImplDelegate2PluggableRenderer( const MetaCommentAction* pAct,
 // ------------------------------------------------------------------------
 
 void GDIMetaFile::Play( OutputDevice* pOut, const Point& rPos,
-                        const Size& rSize, sal_uLong nPos )
+                        const Size& rSize, size_t nPos )
 {
     Region	aDrawClipRegion;
     MapMode aDrawMap( GetPrefMapMode() );
@@ -910,7 +910,7 @@ MetaAction* GDIMetaFile::CopyAction( size_t nPos ) const
 
 // ------------------------------------------------------------------------
 
-sal_uLong GDIMetaFile::GetActionPos( const String& rLabel )
+size_t GDIMetaFile::GetActionPos( const String& rLabel )
 {
     ImpLabel* pLabel = NULL;