summaryrefslogtreecommitdiff
path: root/svx/source/gallery2/galexpl.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source/gallery2/galexpl.cxx')
-rwxr-xr-x[-rw-r--r--]svx/source/gallery2/galexpl.cxx116
1 files changed, 58 insertions, 58 deletions
diff --git a/svx/source/gallery2/galexpl.cxx b/svx/source/gallery2/galexpl.cxx
index 174c8a557b3b..2f41aeae0eff 100644..100755
--- a/svx/source/gallery2/galexpl.cxx
+++ b/svx/source/gallery2/galexpl.cxx
@@ -32,9 +32,9 @@
#include <unotools/pathoptions.hxx>
#include <sfx2/viewfrm.hxx>
#include "svx/gallery1.hxx"
-#include "galtheme.hxx"
-#include "galbrws.hxx"
-#include "gallery.hxx"
+#include "svx/galtheme.hxx"
+#include "svx/galbrws.hxx"
+#include "svx/gallery.hxx"
#include "galobj.hxx"
// -----------
@@ -95,14 +95,14 @@ Graphic GalleryExplorer::GetGraphic() const
// ------------------------------------------------------------------------
-BOOL GalleryExplorer::GetVCDrawModel( FmFormModel& rModel ) const
+sal_Bool GalleryExplorer::GetVCDrawModel( FmFormModel& rModel ) const
{
return GALLERYBROWSER()->GetVCDrawModel( rModel );
}
// ------------------------------------------------------------------------
-BOOL GalleryExplorer::IsLinkage() const
+sal_Bool GalleryExplorer::IsLinkage() const
{
return GALLERYBROWSER()->IsLinkage();
}
@@ -115,7 +115,7 @@ bool GalleryExplorer::FillThemeList( std::vector<String>& rThemeList )
if( pGal )
{
- for( ULONG i = 0, nCount = pGal->GetThemeCount(); i < nCount; i++ )
+ for( sal_uIntPtr i = 0, nCount = pGal->GetThemeCount(); i < nCount; i++ )
{
const GalleryThemeEntry* pEntry = pGal->GetThemeInfo( i );
@@ -129,7 +129,7 @@ bool GalleryExplorer::FillThemeList( std::vector<String>& rThemeList )
// ------------------------------------------------------------------------
-BOOL GalleryExplorer::FillObjList( const String& rThemeName, List& rObjList )
+sal_Bool GalleryExplorer::FillObjList( const String& rThemeName, List& rObjList )
{
Gallery* pGal = ImplGetGallery();
@@ -140,7 +140,7 @@ BOOL GalleryExplorer::FillObjList( const String& rThemeName, List& rObjList )
if( pTheme )
{
- for( ULONG i = 0, nCount = pTheme->GetObjectCount(); i < nCount; i++ )
+ for( sal_uIntPtr i = 0, nCount = pTheme->GetObjectCount(); i < nCount; i++ )
rObjList.Insert( new String( pTheme->GetObjectURL( i ).GetMainURL( INetURLObject::NO_DECODE ) ), LIST_APPEND );
pGal->ReleaseTheme( pTheme, aListener );
@@ -152,10 +152,10 @@ BOOL GalleryExplorer::FillObjList( const String& rThemeName, List& rObjList )
// ------------------------------------------------------------------------
-BOOL GalleryExplorer::FillObjList( ULONG nThemeId, List& rObjList )
+sal_Bool GalleryExplorer::FillObjList( sal_uIntPtr nThemeId, List& rObjList )
{
Gallery* pGal = ImplGetGallery();
- return( pGal ? FillObjList( pGal->GetThemeName( nThemeId ), rObjList ) : FALSE );
+ return( pGal ? FillObjList( pGal->GetThemeName( nThemeId ), rObjList ) : sal_False );
}
// ------------------------------------------------------------------------
@@ -170,7 +170,7 @@ sal_Bool GalleryExplorer::FillObjListTitle( const sal_uInt32 nThemeId, std::vect
if( pTheme )
{
- for( ULONG i = 0, nCount = pTheme->GetObjectCount(); i < nCount; i++ )
+ for( sal_uIntPtr i = 0, nCount = pTheme->GetObjectCount(); i < nCount; i++ )
{
SgaObject* pObj = pTheme->AcquireObject( i );
if ( pObj )
@@ -188,24 +188,24 @@ sal_Bool GalleryExplorer::FillObjListTitle( const sal_uInt32 nThemeId, std::vect
// ------------------------------------------------------------------------
-BOOL GalleryExplorer::InsertURL( const String& rThemeName, const String& rURL )
+sal_Bool GalleryExplorer::InsertURL( const String& rThemeName, const String& rURL )
{
return InsertURL( rThemeName, rURL, SGA_FORMAT_ALL );
}
// ------------------------------------------------------------------------
-BOOL GalleryExplorer::InsertURL( ULONG nThemeId, const String& rURL )
+sal_Bool GalleryExplorer::InsertURL( sal_uIntPtr nThemeId, const String& rURL )
{
return InsertURL( nThemeId, rURL, SGA_FORMAT_ALL );
}
// ------------------------------------------------------------------------
-BOOL GalleryExplorer::InsertURL( const String& rThemeName, const String& rURL, const ULONG )
+sal_Bool GalleryExplorer::InsertURL( const String& rThemeName, const String& rURL, const sal_uIntPtr )
{
Gallery* pGal = ImplGetGallery();
- BOOL bRet = FALSE;
+ sal_Bool bRet = sal_False;
if( pGal )
{
@@ -226,18 +226,18 @@ BOOL GalleryExplorer::InsertURL( const String& rThemeName, const String& rURL, c
// ------------------------------------------------------------------------
-BOOL GalleryExplorer::InsertURL( ULONG nThemeId, const String& rURL, const ULONG nSgaFormat )
+sal_Bool GalleryExplorer::InsertURL( sal_uIntPtr nThemeId, const String& rURL, const sal_uIntPtr nSgaFormat )
{
Gallery* pGal = ImplGetGallery();
- return( pGal ? InsertURL( pGal->GetThemeName( nThemeId ), rURL, nSgaFormat ) : FALSE );
+ return( pGal ? InsertURL( pGal->GetThemeName( nThemeId ), rURL, nSgaFormat ) : sal_False );
}
// ------------------------------------------------------------------------
-ULONG GalleryExplorer::GetObjCount( const String& rThemeName )
+sal_uIntPtr GalleryExplorer::GetObjCount( const String& rThemeName )
{
Gallery* pGal = ImplGetGallery();
- ULONG nRet = 0;
+ sal_uIntPtr nRet = 0;
if( pGal )
{
@@ -256,20 +256,20 @@ ULONG GalleryExplorer::GetObjCount( const String& rThemeName )
// ------------------------------------------------------------------------
-ULONG GalleryExplorer::GetObjCount( ULONG nThemeId )
+sal_uIntPtr GalleryExplorer::GetObjCount( sal_uIntPtr nThemeId )
{
Gallery* pGal = ImplGetGallery();
- return( pGal ? GetObjCount( pGal->GetThemeName( nThemeId ) ) : FALSE );
+ return( pGal ? GetObjCount( pGal->GetThemeName( nThemeId ) ) : sal_False );
}
// ------------------------------------------------------------------------
-BOOL GalleryExplorer::GetGraphicObj( const String& rThemeName, ULONG nPos,
+sal_Bool GalleryExplorer::GetGraphicObj( const String& rThemeName, sal_uIntPtr nPos,
Graphic* pGraphic, Bitmap* pThumb,
- BOOL bProgress )
+ sal_Bool bProgress )
{
Gallery* pGal = ImplGetGallery();
- BOOL bRet = FALSE;
+ sal_Bool bRet = sal_False;
if( pGal )
{
@@ -293,20 +293,20 @@ BOOL GalleryExplorer::GetGraphicObj( const String& rThemeName, ULONG nPos,
// ------------------------------------------------------------------------
-BOOL GalleryExplorer::GetGraphicObj( ULONG nThemeId, ULONG nPos,
+sal_Bool GalleryExplorer::GetGraphicObj( sal_uIntPtr nThemeId, sal_uIntPtr nPos,
Graphic* pGraphic, Bitmap* pThumb,
- BOOL bProgress )
+ sal_Bool bProgress )
{
Gallery* pGal = ImplGetGallery();
- return( pGal ? GetGraphicObj( pGal->GetThemeName( nThemeId ), nPos, pGraphic, pThumb, bProgress ) : FALSE );
+ return( pGal ? GetGraphicObj( pGal->GetThemeName( nThemeId ), nPos, pGraphic, pThumb, bProgress ) : sal_False );
}
// ------------------------------------------------------------------------
-BOOL GalleryExplorer::InsertGraphicObj( const String& rThemeName, const Graphic& rGraphic )
+sal_Bool GalleryExplorer::InsertGraphicObj( const String& rThemeName, const Graphic& rGraphic )
{
Gallery* pGal = ImplGetGallery();
- BOOL bRet = FALSE;
+ sal_Bool bRet = sal_False;
if( pGal )
{
@@ -325,18 +325,18 @@ BOOL GalleryExplorer::InsertGraphicObj( const String& rThemeName, const Graphic&
// ------------------------------------------------------------------------
-BOOL GalleryExplorer::InsertGraphicObj( ULONG nThemeId, const Graphic& rGraphic )
+sal_Bool GalleryExplorer::InsertGraphicObj( sal_uIntPtr nThemeId, const Graphic& rGraphic )
{
Gallery* pGal = ImplGetGallery();
- return( pGal ? InsertGraphicObj( pGal->GetThemeName( nThemeId ), rGraphic ) : FALSE );
+ return( pGal ? InsertGraphicObj( pGal->GetThemeName( nThemeId ), rGraphic ) : sal_False );
}
// ------------------------------------------------------------------------
-ULONG GalleryExplorer::GetSdrObjCount( const String& rThemeName )
+sal_uIntPtr GalleryExplorer::GetSdrObjCount( const String& rThemeName )
{
Gallery* pGal = ImplGetGallery();
- ULONG nRet = 0;
+ sal_uIntPtr nRet = 0;
if( pGal )
{
@@ -345,7 +345,7 @@ ULONG GalleryExplorer::GetSdrObjCount( const String& rThemeName )
if( pTheme )
{
- for( ULONG i = 0, nCount = pTheme->GetObjectCount(); i < nCount; i++ )
+ for( sal_uIntPtr i = 0, nCount = pTheme->GetObjectCount(); i < nCount; i++ )
if( SGA_OBJ_SVDRAW == pTheme->GetObjectKind( i ) )
nRet++;
@@ -358,19 +358,19 @@ ULONG GalleryExplorer::GetSdrObjCount( const String& rThemeName )
// ------------------------------------------------------------------------
-ULONG GalleryExplorer::GetSdrObjCount( ULONG nThemeId )
+sal_uIntPtr GalleryExplorer::GetSdrObjCount( sal_uIntPtr nThemeId )
{
Gallery* pGal = ImplGetGallery();
- return( pGal ? GetSdrObjCount( pGal->GetThemeName( nThemeId ) ) : FALSE );
+ return( pGal ? GetSdrObjCount( pGal->GetThemeName( nThemeId ) ) : sal_False );
}
// ------------------------------------------------------------------------
-BOOL GalleryExplorer::GetSdrObj( const String& rThemeName, ULONG nSdrModelPos,
+sal_Bool GalleryExplorer::GetSdrObj( const String& rThemeName, sal_uIntPtr nSdrModelPos,
SdrModel* pModel, Bitmap* pThumb )
{
Gallery* pGal = ImplGetGallery();
- BOOL bRet = FALSE;
+ sal_Bool bRet = sal_False;
if( pGal )
{
@@ -379,14 +379,14 @@ BOOL GalleryExplorer::GetSdrObj( const String& rThemeName, ULONG nSdrModelPos,
if( pTheme )
{
- for( ULONG i = 0, nCount = pTheme->GetObjectCount(), nActPos = 0; ( i < nCount ) && !bRet; i++ )
+ for( sal_uIntPtr i = 0, nCount = pTheme->GetObjectCount(), nActPos = 0; ( i < nCount ) && !bRet; i++ )
{
if( SGA_OBJ_SVDRAW == pTheme->GetObjectKind( i ) )
{
if( nActPos++ == nSdrModelPos )
{
if( pModel )
- bRet = bRet || pTheme->GetModel( i, *pModel, FALSE );
+ bRet = bRet || pTheme->GetModel( i, *pModel, sal_False );
if( pThumb )
bRet = bRet || pTheme->GetThumb( i, *pThumb );
@@ -403,19 +403,19 @@ BOOL GalleryExplorer::GetSdrObj( const String& rThemeName, ULONG nSdrModelPos,
// ------------------------------------------------------------------------
-BOOL GalleryExplorer::GetSdrObj( ULONG nThemeId, ULONG nSdrModelPos,
+sal_Bool GalleryExplorer::GetSdrObj( sal_uIntPtr nThemeId, sal_uIntPtr nSdrModelPos,
SdrModel* pModel, Bitmap* pThumb )
{
Gallery* pGal = ImplGetGallery();
- return( pGal ? GetSdrObj( pGal->GetThemeName( nThemeId ), nSdrModelPos, pModel, pThumb ) : FALSE );
+ return( pGal ? GetSdrObj( pGal->GetThemeName( nThemeId ), nSdrModelPos, pModel, pThumb ) : sal_False );
}
// ------------------------------------------------------------------------
-BOOL GalleryExplorer::InsertSdrObj( const String& rThemeName, FmFormModel& rModel )
+sal_Bool GalleryExplorer::InsertSdrObj( const String& rThemeName, FmFormModel& rModel )
{
Gallery* pGal = ImplGetGallery();
- BOOL bRet = FALSE;
+ sal_Bool bRet = sal_False;
if( pGal )
{
@@ -434,18 +434,18 @@ BOOL GalleryExplorer::InsertSdrObj( const String& rThemeName, FmFormModel& rMode
// ------------------------------------------------------------------------
-BOOL GalleryExplorer::InsertSdrObj( ULONG nThemeId, FmFormModel& rModel )
+sal_Bool GalleryExplorer::InsertSdrObj( sal_uIntPtr nThemeId, FmFormModel& rModel )
{
Gallery* pGal = ImplGetGallery();
- return( pGal ? InsertSdrObj( pGal->GetThemeName( nThemeId ), rModel ) : FALSE );
+ return( pGal ? InsertSdrObj( pGal->GetThemeName( nThemeId ), rModel ) : sal_False );
}
// -----------------------------------------------------------------------------
-BOOL GalleryExplorer::BeginLocking( const String& rThemeName )
+sal_Bool GalleryExplorer::BeginLocking( const String& rThemeName )
{
Gallery* pGal = ImplGetGallery();
- BOOL bRet = FALSE;
+ sal_Bool bRet = sal_False;
if( pGal )
{
@@ -454,7 +454,7 @@ BOOL GalleryExplorer::BeginLocking( const String& rThemeName )
if( pTheme )
{
pTheme->LockTheme();
- bRet = TRUE;
+ bRet = sal_True;
}
}
@@ -463,18 +463,18 @@ BOOL GalleryExplorer::BeginLocking( const String& rThemeName )
// -----------------------------------------------------------------------------
-BOOL GalleryExplorer::BeginLocking( ULONG nThemeId )
+sal_Bool GalleryExplorer::BeginLocking( sal_uIntPtr nThemeId )
{
Gallery* pGal = ImplGetGallery();
- return( pGal ? BeginLocking( pGal->GetThemeName( nThemeId ) ) : FALSE );
+ return( pGal ? BeginLocking( pGal->GetThemeName( nThemeId ) ) : sal_False );
}
// -----------------------------------------------------------------------------
-BOOL GalleryExplorer::EndLocking( const String& rThemeName )
+sal_Bool GalleryExplorer::EndLocking( const String& rThemeName )
{
Gallery* pGal = ImplGetGallery();
- BOOL bRet = FALSE;
+ sal_Bool bRet = sal_False;
if( pGal )
{
@@ -483,7 +483,7 @@ BOOL GalleryExplorer::EndLocking( const String& rThemeName )
if( pTheme )
{
- const BOOL bReleaseLockedTheme = pTheme->UnlockTheme();
+ const sal_Bool bReleaseLockedTheme = pTheme->UnlockTheme();
// release acquired theme
pGal->ReleaseTheme( pTheme, aListener );
@@ -492,7 +492,7 @@ BOOL GalleryExplorer::EndLocking( const String& rThemeName )
{
// release locked theme
pGal->ReleaseTheme( pTheme, aLockListener );
- bRet = TRUE;
+ bRet = sal_True;
}
}
}
@@ -502,15 +502,15 @@ BOOL GalleryExplorer::EndLocking( const String& rThemeName )
// -----------------------------------------------------------------------------
-BOOL GalleryExplorer::EndLocking( ULONG nThemeId )
+sal_Bool GalleryExplorer::EndLocking( sal_uIntPtr nThemeId )
{
Gallery* pGal = ImplGetGallery();
- return( pGal ? EndLocking( pGal->GetThemeName( nThemeId ) ) : FALSE );
+ return( pGal ? EndLocking( pGal->GetThemeName( nThemeId ) ) : sal_False );
}
// -----------------------------------------------------------------------------
-BOOL GalleryExplorer::DrawCentered( OutputDevice* pOut, const FmFormModel& rModel )
+sal_Bool GalleryExplorer::DrawCentered( OutputDevice* pOut, const FmFormModel& rModel )
{
return SgaObjectSvDraw::DrawCentered( pOut, rModel );
}