summaryrefslogtreecommitdiff
path: root/svx/source/unodraw/UnoGraphicExporter.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source/unodraw/UnoGraphicExporter.cxx')
-rw-r--r--svx/source/unodraw/UnoGraphicExporter.cxx42
1 files changed, 21 insertions, 21 deletions
diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx
index 440f6c313e20..eb9a7cb8128f 100644
--- a/svx/source/unodraw/UnoGraphicExporter.cxx
+++ b/svx/source/unodraw/UnoGraphicExporter.cxx
@@ -179,7 +179,7 @@ namespace svx
virtual sal_Bool SAL_CALL supportsMimeType( const ::rtl::OUString& MimeTypeName ) throw (RuntimeException);
virtual Sequence< OUString > SAL_CALL getSupportedMimeTypeNames( ) throw (RuntimeException);
- VirtualDevice* CreatePageVDev( SdrPage* pPage, ULONG nWidthPixel, ULONG nHeightPixel ) const;
+ VirtualDevice* CreatePageVDev( SdrPage* pPage, sal_uIntPtr nWidthPixel, sal_uIntPtr nHeightPixel ) const;
DECL_LINK( CalcFieldValueHdl, EditFieldInfo* );
@@ -221,7 +221,7 @@ namespace svx
/** creates a bitmap that is optionaly transparent from a metafile
*/
- BitmapEx GetBitmapFromMetaFile( const GDIMetaFile& rMtf, BOOL bTransparent, const Size* pSize )
+ BitmapEx GetBitmapFromMetaFile( const GDIMetaFile& rMtf, sal_Bool bTransparent, const Size* pSize )
{
Graphic aGraphic( rMtf );
BitmapEx aBmpEx;
@@ -349,7 +349,7 @@ IMPL_LINK(GraphicExporter, CalcFieldValueHdl, EditFieldInfo*, pInfo)
if( pField && pField->ISA( SvxPageField ) )
{
String aPageNumValue;
- BOOL bUpper = FALSE;
+ sal_Bool bUpper = sal_False;
switch(mpDoc->GetPageNumType())
{
@@ -360,7 +360,7 @@ IMPL_LINK(GraphicExporter, CalcFieldValueHdl, EditFieldInfo*, pInfo)
aPageNumValue += (sal_Unicode)(char)((mnPageNumber - 1) % 26 + 'a');
break;
case SVX_ROMAN_UPPER:
- bUpper = TRUE;
+ bUpper = sal_True;
case SVX_ROMAN_LOWER:
aPageNumValue += SvxNumberFormat::CreateRomanString(mnPageNumber, bUpper);
break;
@@ -391,7 +391,7 @@ IMPL_LINK(GraphicExporter, CalcFieldValueHdl, EditFieldInfo*, pInfo)
@return the returned VirtualDevice is owned by the caller
*/
-VirtualDevice* GraphicExporter::CreatePageVDev( SdrPage* pPage, ULONG nWidthPixel, ULONG nHeightPixel ) const
+VirtualDevice* GraphicExporter::CreatePageVDev( SdrPage* pPage, sal_uIntPtr nWidthPixel, sal_uIntPtr nHeightPixel ) const
{
VirtualDevice* pVDev = new VirtualDevice();
MapMode aMM( MAP_100TH_MM );
@@ -422,17 +422,17 @@ VirtualDevice* GraphicExporter::CreatePageVDev( SdrPage* pPage, ULONG nWidthPixe
pVDev->SetMapMode( aMM );
#ifdef DBG_UTIL
- BOOL bAbort = !
+ sal_Bool bAbort = !
#endif
pVDev->SetOutputSize(aPageSize);
DBG_ASSERT(!bAbort, "virt. Device nicht korrekt erzeugt");
SdrView* pView = new SdrView(mpDoc, pVDev);
- pView->SetPageVisible( FALSE );
- pView->SetBordVisible( FALSE );
- pView->SetGridVisible( FALSE );
- pView->SetHlplVisible( FALSE );
- pView->SetGlueVisible( FALSE );
+ pView->SetPageVisible( sal_False );
+ pView->SetBordVisible( sal_False );
+ pView->SetGridVisible( sal_False );
+ pView->SetHlplVisible( sal_False );
+ pView->SetGlueVisible( sal_False );
pView->ShowSdrPage(pPage);
Region aRegion (Rectangle( aPoint, aPageSize ) );
@@ -719,7 +719,7 @@ bool GraphicExporter::GetGraphic( ExportSettings& rSettings, Graphic& aGraphic,
aVDev.SetMapMode( aMap );
if( rSettings.mbUseHighContrast )
aVDev.SetDrawMode( aVDev.GetDrawMode() | DRAWMODE_SETTINGSLINE | DRAWMODE_SETTINGSFILL | DRAWMODE_SETTINGSTEXT | DRAWMODE_SETTINGSGRADIENT );
- aVDev.EnableOutput( FALSE );
+ aVDev.EnableOutput( sal_False );
aMtf.Record( &aVDev );
Size aNewSize;
@@ -735,14 +735,14 @@ bool GraphicExporter::GetGraphic( ExportSettings& rSettings, Graphic& aGraphic,
pView = new SdrView( mpDoc, &aVDev );
}
- pView->SetBordVisible( FALSE );
- pView->SetPageVisible( FALSE );
+ pView->SetBordVisible( sal_False );
+ pView->SetPageVisible( sal_False );
pView->ShowSdrPage( pPage );
if ( pView && pPage )
{
- pView->SetBordVisible( FALSE );
- pView->SetPageVisible( FALSE );
+ pView->SetBordVisible( sal_False );
+ pView->SetPageVisible( sal_False );
pView->ShowSdrPage( pPage );
const Point aNewOrg( pPage->GetLftBorder(), pPage->GetUppBorder() );
@@ -788,7 +788,7 @@ bool GraphicExporter::GetGraphic( ExportSettings& rSettings, Graphic& aGraphic,
if( rSettings.mbTranslucent )
{
Size aOutSize;
- aGraphic = GetBitmapFromMetaFile( aGraphic.GetGDIMetaFile(), TRUE, CalcSize( rSettings.mnWidth, rSettings.mnHeight, aNewSize, aOutSize ) );
+ aGraphic = GetBitmapFromMetaFile( aGraphic.GetGDIMetaFile(), sal_True, CalcSize( rSettings.mnWidth, rSettings.mnHeight, aNewSize, aOutSize ) );
}
}
}
@@ -887,11 +887,11 @@ bool GraphicExporter::GetGraphic( ExportSettings& rSettings, Graphic& aGraphic,
pMtf->AddAction( new MetaCommentAction(
"XTEXT_SCROLLRECT", 0,
- reinterpret_cast<BYTE const*>(&aScrollRectangle),
+ reinterpret_cast<sal_uInt8 const*>(&aScrollRectangle),
sizeof( Rectangle ) ) );
pMtf->AddAction( new MetaCommentAction(
"XTEXT_PAINTRECT", 0,
- reinterpret_cast<BYTE const*>(&aPaintRectangle),
+ reinterpret_cast<sal_uInt8 const*>(&aPaintRectangle),
sizeof( Rectangle ) ) );
aGraphic = Graphic( *pMtf );
@@ -924,7 +924,7 @@ bool GraphicExporter::GetGraphic( ExportSettings& rSettings, Graphic& aGraphic,
}
}
- aOut.EnableOutput( FALSE );
+ aOut.EnableOutput( sal_False );
aOut.SetMapMode( aMap );
if( rSettings.mbUseHighContrast )
aOut.SetDrawMode( aVDev.GetDrawMode() | DRAWMODE_SETTINGSLINE | DRAWMODE_SETTINGSFILL | DRAWMODE_SETTINGSTEXT | DRAWMODE_SETTINGSGRADIENT );
@@ -1022,7 +1022,7 @@ sal_Bool SAL_CALL GraphicExporter::filter( const Sequence< PropertyValue >& aDes
// create the output stuff
Graphic aGraphic;
- USHORT nStatus = GetGraphic( aSettings, aGraphic, bVectorType ) ? GRFILTER_OK : GRFILTER_FILTERERROR;
+ sal_uInt16 nStatus = GetGraphic( aSettings, aGraphic, bVectorType ) ? GRFILTER_OK : GRFILTER_FILTERERROR;
if( nStatus == GRFILTER_OK )
{
generated by cgit (git 2.34.1) at 2024-07-13 08:01:11 +0000