diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2007-07-06 06:37:18 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2007-07-06 06:37:18 +0000 |
| commit | 6ce2123d90c8771d2b130ae5a174464f37123b6c (patch) | |
| tree | a6f55f074f140e09870c1c6e9a6247abc1fb68a2 /svx/source/gallery2 | |
| parent | 321f7a0b88a7323174cceee7124f975c46634f66 (diff) | |
INTEGRATION: CWS oj14 (1.12.102); FILE MERGED
2007/02/20 16:13:58 oj 1.12.102.2: RESYNC: (1.12-1.13); FILE MERGED
2006/11/07 18:55:34 oj 1.12.102.1: change FmFrameModel to SdrModel
Diffstat (limited to 'svx/source/gallery2')
| -rw-r--r-- | svx/source/gallery2/galexpl.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/svx/source/gallery2/galexpl.cxx b/svx/source/gallery2/galexpl.cxx index d4156c200e56..75612735118c 100644 --- a/svx/source/gallery2/galexpl.cxx +++ b/svx/source/gallery2/galexpl.cxx @@ -4,9 +4,9 @@ * * $RCSfile: galexpl.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: obo $ $Date: 2007-01-23 08:59:28 $ + * last change: $Author: rt $ $Date: 2007-07-06 07:37:18 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -373,7 +373,7 @@ ULONG GalleryExplorer::GetSdrObjCount( ULONG nThemeId ) // ------------------------------------------------------------------------ BOOL GalleryExplorer::GetSdrObj( const String& rThemeName, ULONG nSdrModelPos, - FmFormModel* pModel, Bitmap* pThumb ) + SdrModel* pModel, Bitmap* pThumb ) { Gallery* pGal = ImplGetGallery(); BOOL bRet = FALSE; @@ -410,7 +410,7 @@ BOOL GalleryExplorer::GetSdrObj( const String& rThemeName, ULONG nSdrModelPos, // ------------------------------------------------------------------------ BOOL GalleryExplorer::GetSdrObj( ULONG nThemeId, ULONG nSdrModelPos, - FmFormModel* pModel, Bitmap* pThumb ) + SdrModel* pModel, Bitmap* pThumb ) { Gallery* pGal = ImplGetGallery(); return( pGal ? GetSdrObj( pGal->GetThemeName( nThemeId ), nSdrModelPos, pModel, pThumb ) : FALSE ); |