summaryrefslogtreecommitdiff
path: root/sd/source/filter
diff options
context:
space:
mode:
Diffstat (limited to 'sd/source/filter')
-rwxr-xr-x[-rw-r--r--]sd/source/filter/cgm/sdcgmfilter.cxx10
-rwxr-xr-x[-rw-r--r--]sd/source/filter/eppt/eppt.cxx79
-rw-r--r--sd/source/filter/eppt/eppt.hxx6
-rwxr-xr-x[-rw-r--r--]sd/source/filter/eppt/epptdef.hxx2
-rw-r--r--sd/source/filter/eppt/epptso.cxx100
-rw-r--r--sd/source/filter/eppt/escherex.cxx34
-rwxr-xr-x[-rw-r--r--]sd/source/filter/eppt/escherex.hxx6
-rwxr-xr-x[-rw-r--r--]sd/source/filter/grf/sdgrffilter.cxx22
-rw-r--r--sd/source/filter/html/htmlex.cxx158
-rw-r--r--sd/source/filter/html/htmlex.hxx36
-rw-r--r--sd/source/filter/html/pubdlg.cxx150
-rw-r--r--sd/source/filter/html/pubdlg.src47
-rw-r--r--sd/source/filter/ppt/ppt97animations.cxx2
-rw-r--r--sd/source/filter/ppt/ppt97animations.hxx30
-rw-r--r--sd/source/filter/ppt/pptin.cxx230
-rwxr-xr-x[-rw-r--r--]sd/source/filter/ppt/pptin.hxx2
-rw-r--r--sd/source/filter/ppt/pptinanimations.cxx24
-rw-r--r--sd/source/filter/ppt/propread.cxx4
-rwxr-xr-x[-rw-r--r--]sd/source/filter/ppt/propread.hxx10
-rwxr-xr-x[-rw-r--r--]sd/source/filter/sdpptwrp.cxx8
-rwxr-xr-x[-rw-r--r--]sd/source/filter/xml/sdxmlwrp.cxx16
21 files changed, 514 insertions, 462 deletions
diff --git a/sd/source/filter/cgm/sdcgmfilter.cxx b/sd/source/filter/cgm/sdcgmfilter.cxx
index 884d5524bbee..405a3acb0cdf 100644..100755
--- a/sd/source/filter/cgm/sdcgmfilter.cxx
+++ b/sd/source/filter/cgm/sdcgmfilter.cxx
@@ -68,8 +68,8 @@ using namespace ::com::sun::star::frame;
// - Typedefs -
// ------------
-typedef UINT32 ( __LOADONCALLAPI *ImportCGM )( ::rtl::OUString&, Reference< XModel >&, UINT32, Reference< XStatusIndicator >& );
-typedef BOOL ( __LOADONCALLAPI *ExportCGM )( ::rtl::OUString&, Reference< XModel >&, Reference< XStatusIndicator >&, void* );
+typedef sal_uInt32 ( __LOADONCALLAPI *ImportCGM )( ::rtl::OUString&, Reference< XModel >&, sal_uInt32, Reference< XStatusIndicator >& );
+typedef sal_Bool ( __LOADONCALLAPI *ExportCGM )( ::rtl::OUString&, Reference< XModel >&, Reference< XStatusIndicator >&, void* );
// ---------------
// - SdPPTFilter -
@@ -97,7 +97,7 @@ sal_Bool SdCGMFilter::Import()
{
ImportCGM FncImportCGM = reinterpret_cast< ImportCGM >( pLibrary->getFunctionSymbol( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ImportCGM" ) ) ) );
::rtl::OUString aFileURL( mrMedium.GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) );
- UINT32 nRetValue;
+ sal_uInt32 nRetValue;
if( mrDocument.GetPageCount() == 0L )
mrDocument.CreateFirstPages();
@@ -107,7 +107,7 @@ sal_Bool SdCGMFilter::Import()
if( nRetValue )
{
- bRet = TRUE;
+ bRet = sal_True;
if( ( nRetValue &~0xff000000 ) != 0xffffff ) // maybe the backgroundcolor is already white
{ // so we must not set a master page
@@ -117,7 +117,7 @@ sal_Bool SdCGMFilter::Import()
if(pSdPage)
{
// set PageFill to given color
- const Color aColor((BYTE)(nRetValue >> 16), (BYTE)(nRetValue >> 8), (BYTE)(nRetValue >> 16));
+ const Color aColor((sal_uInt8)(nRetValue >> 16), (sal_uInt8)(nRetValue >> 8), (sal_uInt8)(nRetValue >> 16));
pSdPage->getSdrPageProperties().PutItem(XFillColorItem(String(), aColor));
pSdPage->getSdrPageProperties().PutItem(XFillStyleItem(XFILL_SOLID));
}
diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx
index 5c8cf3c4ba2d..b61043809a6e 100644..100755
--- a/sd/source/filter/eppt/eppt.cxx
+++ b/sd/source/filter/eppt/eppt.cxx
@@ -106,7 +106,7 @@ void PPTWriter::exportPPTPre()
if ( mXStatusIndicator.is() )
{
- mbStatusIndicator = TRUE;
+ mbStatusIndicator = sal_True;
mnStatMaxValue = ( mnPages + mnMasterPages ) * 5;
mXStatusIndicator->start( String( RTL_CONSTASCII_USTRINGPARAM( "PowerPoint Export" ) ),
mnStatMaxValue + ( mnStatMaxValue >> 3 ) );
@@ -154,7 +154,7 @@ void PPTWriter::exportPPTPost( )
if ( !ImplCreateDocumentSummaryInformation() )
return;
- mbStatus = TRUE;
+ mbStatus = sal_True;
};
// ---------------------------------------------------------------------------------------------
@@ -446,6 +446,11 @@ PPTWriter::~PPTWriter()
void* pPtr;
delete mpExEmbed;
delete mpPptEscherEx;
+ delete mpCurUserStrm;
+ delete mpPicStrm;
+ delete mpStrm;
+
+
std::vector< PPTExStyleSheet* >::iterator aStyleSheetIter( maStyleSheetList.begin() );
while( aStyleSheetIter < maStyleSheetList.end() )
@@ -468,7 +473,7 @@ sal_Bool PPTWriter::ImplCreateCurrentUserStream()
{
mpCurUserStrm = mrStg->OpenSotStream( String( RTL_CONSTASCII_USTRINGPARAM( "Current User" ) ) );
if ( !mpCurUserStrm )
- return FALSE;
+ return sal_False;
char pUserName[] = "Current User";
sal_uInt32 nLenOfUserName = strlen( pUserName );
sal_uInt32 nSizeOfRecord = 0x14 + ( ( nLenOfUserName + 4 ) & ~ 3 );
@@ -491,7 +496,7 @@ sal_Bool PPTWriter::ImplCreateCurrentUserStream()
*mpCurUserStrm << (sal_uInt8)0; // pad bytes
};
mpCurUserStrm->Seek( nEditPos );
- return TRUE;
+ return sal_True;
};
// ---------------------------------------------------------------------------------------------
@@ -698,9 +703,9 @@ sal_Bool PPTWriter::ImplCreateDocument()
mpPptEscherEx->AddAtom( 40, EPP_DocumentAtom, 1 );
*mpStrm << nWidth // Slide Size in Master coordinates X
<< nHeight // " " " " " Y
- << (INT32)maNotesPageSize.Width // Notes Page Size X
- << (INT32)maNotesPageSize.Height // " " " Y
- << (INT32)1 << (INT32)2; // the scale used when the Powerpoint document is embedded. the default is 1:2
+ << (sal_Int32)maNotesPageSize.Width // Notes Page Size X
+ << (sal_Int32)maNotesPageSize.Height // " " " Y
+ << (sal_Int32)1 << (sal_Int32)2; // the scale used when the Powerpoint document is embedded. the default is 1:2
mpPptEscherEx->InsertPersistOffset( EPP_MAINNOTESMASTER_PERSIST_KEY, mpStrm->Tell() );
*mpStrm << (sal_uInt32)0 // Reference to NotesMaster ( 0 if none );
<< (sal_uInt32)0 // Reference to HandoutMaster ( 0 if none );
@@ -734,12 +739,12 @@ sal_Bool PPTWriter::ImplCreateDocument()
mpPptEscherEx->InsertPersistOffset( EPP_MAINSLIDE_PERSIST_KEY | i, mpStrm->Tell() );
*mpStrm << (sal_uInt32)0 // psrReference - logical reference to the slide persist object ( EPP_MAINSLIDE_PERSIST_KEY )
<< (sal_uInt32)4 // flags - only bit 3 used, if set then slide contains shapes other than placeholders
- << (INT32)0 // numberTexts - number of placeholder texts stored with the persist object. Allows to display outline view without loading the slide persist objects
- << (INT32)i + 0x100 // slideId - Unique slide identifier, used for OLE link monikers for example
+ << (sal_Int32)0 // numberTexts - number of placeholder texts stored with the persist object. Allows to display outline view without loading the slide persist objects
+ << (sal_Int32)i + 0x100 // slideId - Unique slide identifier, used for OLE link monikers for example
<< (sal_uInt32)0; // reserved, usualy 0
if ( !GetPageByIndex( i, NORMAL ) ) // sehr aufregend: noch einmal ueber alle seiten
- return FALSE;
+ return sal_False;
SetCurrentStyleSheet( GetMasterIndex( NORMAL ) );
::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed >
@@ -763,8 +768,8 @@ sal_Bool PPTWriter::ImplCreateDocument()
mpPptEscherEx->InsertPersistOffset( EPP_MAINNOTES_PERSIST_KEY | i, mpStrm->Tell() );
*mpStrm << (sal_uInt32)0
<< (sal_uInt32)4
- << (INT32)0
- << (INT32)i + 0x100
+ << (sal_Int32)0
+ << (sal_Int32)i + 0x100
<< (sal_uInt32)0;
}
mpPptEscherEx->CloseContainer(); // EPP_SlideListWithText
@@ -784,7 +789,7 @@ sal_Bool PPTWriter::ImplCreateDocument()
{
::rtl::OUString aCustomShow;
sal_uInt32 nPenColor = 0x1000000;
- INT32 nRestartTime = 0x7fffffff;
+ sal_Int32 nRestartTime = 0x7fffffff;
sal_Int16 nStartSlide = 0;
sal_Int16 nEndSlide = 0;
sal_uInt32 nFlags = 0; // Bit 0: Auto advance
@@ -834,7 +839,7 @@ sal_Bool PPTWriter::ImplCreateDocument()
nFlags |= 1;
}
- if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "IsEndless" ) ) ) ) // muesste eigendlich heissen IsNotEndless !=)"()&
+ if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "IsEndless" ) ) ) ) // muesste eigendlich heissen IsNotEndless !=)"�()&
{
sal_Bool bBool = sal_False;
mAny >>= bBool;
@@ -902,8 +907,8 @@ sal_Bool PPTWriter::ImplCreateDocument()
{
mpPptEscherEx->BeginAtom();
- INT32 nSlideCount = aXIC->getCount();
- for ( INT32 j = 0; j < nSlideCount; j++ ) // Anzahl der Slides
+ sal_Int32 nSlideCount = aXIC->getCount();
+ for ( sal_Int32 j = 0; j < nSlideCount; j++ ) // Anzahl der Slides
{
mAny = aXIC->getByIndex( j );
if ( mAny.getValue() )
@@ -948,7 +953,7 @@ sal_Bool PPTWriter::ImplCreateDocument()
}
mpPptEscherEx->AddAtom( 0, EPP_EndDocument );
mpPptEscherEx->CloseContainer(); // EPP_Document
- return TRUE;
+ return sal_True;
};
// ---------------------------------------------------------------------------------------------
@@ -1031,7 +1036,7 @@ sal_Bool PPTWriter::ImplCreateHyperBlob( SvMemoryStream& rStrm )
rStrm << (sal_uInt32)( nCurrentOfs - ( nParaOfs + 4 ) );
rStrm << nParaCount;
rStrm.Seek( nCurrentOfs );
- return TRUE;
+ return sal_True;
}
// ---------------------------------------------------------------------------------------------
@@ -1049,7 +1054,7 @@ sal_Bool PPTWriter::ImplCreateMainNotes()
mpPptEscherEx->OpenContainer( ESCHER_DgContainer );
mpPptEscherEx->EnterGroup(0,0);
- ImplWritePage( GetLayout( 20 ), aSolverContainer, NOTICE, TRUE );
+ ImplWritePage( GetLayout( 20 ), aSolverContainer, NOTICE, sal_True );
mpPptEscherEx->LeaveGroup();
mpPptEscherEx->OpenContainer( ESCHER_SpContainer );
@@ -1073,7 +1078,7 @@ sal_Bool PPTWriter::ImplCreateMainNotes()
mpPptEscherEx->AddAtom( 32, EPP_ColorSchemeAtom, 0, 1 );
*mpStrm << (sal_uInt32)0xffffff << (sal_uInt32)0x000000 << (sal_uInt32)0x808080 << (sal_uInt32)0x000000 << (sal_uInt32)0x99cc00 << (sal_uInt32)0xcc3333 << (sal_uInt32)0xffcccc << (sal_uInt32)0xb2b2b2;
mpPptEscherEx->CloseContainer(); // EPP_Notes
- return TRUE;
+ return sal_True;
}
// ---------------------------------------------------------------------------------------------
@@ -1182,7 +1187,7 @@ void PPTWriter::ImplWriteNotes( sal_uInt32 nPageNum )
mpPptEscherEx->OpenContainer( ESCHER_DgContainer );
mpPptEscherEx->EnterGroup(0,0);
- ImplWritePage( GetLayout( 20 ), aSolverContainer, NOTICE, FALSE ); // Die Shapes der Seite werden im PPT Dok. erzeugt
+ ImplWritePage( GetLayout( 20 ), aSolverContainer, NOTICE, sal_False ); // Die Shapes der Seite werden im PPT Dok. erzeugt
mpPptEscherEx->LeaveGroup();
mpPptEscherEx->OpenContainer( ESCHER_SpContainer );
@@ -1310,13 +1315,13 @@ void PPTWriter::ImplWriteOLE( )
::uno::Reference < embed::XEmbeddedObject > xObj( ( (SdrOle2Obj*) pSdrObj )->GetObjRef() );
if( xObj.is() )
{
- SvStorageRef xTempStorage( new SvStorage( new SvMemoryStream(), TRUE ) );
+ SvStorageRef xTempStorage( new SvStorage( new SvMemoryStream(), sal_True ) );
aOleExport.ExportOLEObject( xObj, *xTempStorage );
//TODO/MBA: testing
String aPersistStream( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( SVEXT_PERSIST_STREAM ) ) );
SvMemoryStream aStream;
- SvStorageRef xCleanStorage( new SvStorage( FALSE, aStream ) );
+ SvStorageRef xCleanStorage( new SvStorage( sal_False, aStream ) );
xTempStorage->CopyTo( xCleanStorage );
// create a dummy content stream, the dummy content is necessary for ppt, but not for
// doc files, so we can't share code.
@@ -1342,7 +1347,7 @@ void PPTWriter::ImplWriteOLE( )
{
String aName;
::com::sun::star::awt::Size aSize;
- SvStorageRef xDest( new SvStorage( new SvMemoryStream(), TRUE ) );
+ SvStorageRef xDest( new SvStorage( new SvMemoryStream(), sal_True ) );
sal_Bool bOk = SvxMSConvertOCXControls::WriteOCXStream( xDest, pPtr->xControlModel, aSize, aName );
if ( bOk )
pStrm = xDest->CreateMemoryStream();
@@ -1469,7 +1474,7 @@ sal_Bool PPTWriter::ImplWriteAtomEnding()
*mpCurUserStrm << (sal_uInt32)nPos; // offset to current edit setzen
mpPptEscherEx->AddAtom( 28, EPP_UserEditAtom );
- *mpStrm << (INT32)0x100 // last slide ID
+ *mpStrm << (sal_Int32)0x100 // last slide ID
<< (sal_uInt32)0x03000dbc // minor and major app version that did the save
<< (sal_uInt32)0 // offset last save, 0 after a full save
<< nPersistOfs // File offset to persist pointers for this save operation
@@ -1478,37 +1483,37 @@ sal_Bool PPTWriter::ImplWriteAtomEnding()
<< (sal_Int16)EPP_LastViewTypeSlideView // last view type
<< (sal_Int16)0x12; // padword
- return TRUE;
+ return sal_True;
}
// ---------------------
// - exported function -
// ---------------------
-extern "C" SAL_DLLPUBLIC_EXPORT BOOL __LOADONCALLAPI ExportPPT( SvStorageRef& rSvStorage,
+extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI ExportPPT( SvStorageRef& rSvStorage,
::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & rXModel,
::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator > & rXStatInd,
SvMemoryStream* pVBA, sal_uInt32 nCnvrtFlags )
{
PPTWriter* pPPTWriter;
- BOOL bStatus = FALSE;
+ sal_Bool bStatus = sal_False;
pPPTWriter = new PPTWriter( rSvStorage, rXModel, rXStatInd, pVBA, nCnvrtFlags );
if ( pPPTWriter )
{
pPPTWriter->exportPPT();
- bStatus = ( pPPTWriter->IsValid() == TRUE );
+ bStatus = ( pPPTWriter->IsValid() == sal_True );
delete pPPTWriter;
}
return bStatus;
}
-extern "C" SAL_DLLPUBLIC_EXPORT BOOL __LOADONCALLAPI SaveVBA( SfxObjectShell& rDocShell, SvMemoryStream*& pBas )
+extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI SaveVBA( SfxObjectShell& rDocShell, SvMemoryStream*& pBas )
{
- SvStorageRef xDest( new SvStorage( new SvMemoryStream(), TRUE ) );
- SvxImportMSVBasic aMSVBas( rDocShell, *xDest, FALSE, FALSE );
- aMSVBas.SaveOrDelMSVBAStorage( TRUE, String( RTL_CONSTASCII_USTRINGPARAM("_MS_VBA_Overhead") ) );
+ SvStorageRef xDest( new SvStorage( new SvMemoryStream(), sal_True ) );
+ SvxImportMSVBasic aMSVBas( rDocShell, *xDest, sal_False, sal_False );
+ aMSVBas.SaveOrDelMSVBAStorage( sal_True, String( RTL_CONSTASCII_USTRINGPARAM("_MS_VBA_Overhead") ) );
SvStorageRef xOverhead = xDest->OpenSotStorage( String( RTL_CONSTASCII_USTRINGPARAM("_MS_VBA_Overhead") ) );
if ( xOverhead.Is() && ( xOverhead->GetError() == SVSTREAM_OK ) )
@@ -1519,7 +1524,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT BOOL __LOADONCALLAPI SaveVBA( SfxObjectShell& rD
SvStorageStreamRef xTemp = xOverhead2->OpenSotStream( String( RTL_CONSTASCII_USTRINGPARAM("_MS_VBA_Overhead2") ) );
if ( xTemp.Is() && ( xTemp->GetError() == SVSTREAM_OK ) )
{
- UINT32 nLen = xTemp->GetSize();
+ sal_uInt32 nLen = xTemp->GetSize();
if ( nLen )
{
char* pTemp = new char[ nLen ];
@@ -1528,15 +1533,15 @@ extern "C" SAL_DLLPUBLIC_EXPORT BOOL __LOADONCALLAPI SaveVBA( SfxObjectShell& rD
xTemp->Seek( STREAM_SEEK_TO_BEGIN );
xTemp->Read( pTemp, nLen );
pBas = new SvMemoryStream( pTemp, nLen, STREAM_READ );
- pBas->ObjectOwnsMemory( TRUE );
- return TRUE;
+ pBas->ObjectOwnsMemory( sal_True );
+ return sal_True;
}
}
}
}
}
- return FALSE;
+ return sal_False;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/filter/eppt/eppt.hxx b/sd/source/filter/eppt/eppt.hxx
index 11cd4f714fae..8ff33e63e9dc 100644
--- a/sd/source/filter/eppt/eppt.hxx
+++ b/sd/source/filter/eppt/eppt.hxx
@@ -192,9 +192,9 @@ class PPTWriter : public PPTWriterBase, public PPTExBulletProvider
sal_uInt32 mnTextSize;
SvStorageRef mrStg;
- SvStorageStream* mpCurUserStrm;
- SvStorageStream* mpStrm;
- SvStorageStream* mpPicStrm;
+ SvStream* mpCurUserStrm;
+ SvStream* mpStrm;
+ SvStream* mpPicStrm;
PptEscherEx* mpPptEscherEx;
List maExOleObj;
diff --git a/sd/source/filter/eppt/epptdef.hxx b/sd/source/filter/eppt/epptdef.hxx
index 7b5f2d17a9b8..ad93ec30f5a2 100644..100755
--- a/sd/source/filter/eppt/epptdef.hxx
+++ b/sd/source/filter/eppt/epptdef.hxx
@@ -133,7 +133,7 @@
#define EPP_PST_ExtendedParagraphMasterAtom 4013
#define EPP_PST_ExtendedPresRuleContainer 4014 // consist of 4012, 4015,
#define EPP_PST_ExtendedParagraphHeaderAtom 4015 // the instance of this atom indices the current presobj
- // the first UINT32 in this atom indices the current slideId
+ // the first sal_uInt32 in this atom indices the current slideId
#define EPP_FontEnityAtom 4023
#define EPP_FontEmbedData 4024
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index acd0a571e797..0466af7e6418 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -615,10 +615,10 @@ sal_Bool PPTWriter::ImplCloseDocument()
if ( nOldPos )
{
mpStrm->Seek( nOldPos );
- return TRUE;
+ return sal_True;
}
}
- return FALSE;
+ return sal_False;
}
// ---------------------------------------------------------------------------------------------
@@ -701,7 +701,7 @@ sal_Bool PropValue::ImplGetPropertyValue( const ::com::sun::star::uno::Reference
sal_Bool PropStateValue::ImplGetPropertyValue( const String& rString, sal_Bool bGetPropertyState )
{
ePropState = ::com::sun::star::beans::PropertyState_AMBIGUOUS_VALUE;
- sal_Bool bRetValue = TRUE;
+ sal_Bool bRetValue = sal_True;
#ifdef UNX
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo >
aXPropSetInfo( mXPropSet->getPropertySetInfo() );
@@ -712,7 +712,7 @@ sal_Bool PropStateValue::ImplGetPropertyValue( const String& rString, sal_Bool b
{
mAny = mXPropSet->getPropertyValue( rString );
if ( !mAny.hasValue() )
- bRetValue = FALSE;
+ bRetValue = sal_False;
else if ( bGetPropertyState )
ePropState = mXPropState->getPropertyState( rString );
else
@@ -720,7 +720,7 @@ sal_Bool PropStateValue::ImplGetPropertyValue( const String& rString, sal_Bool b
}
catch( ::com::sun::star::uno::Exception& )
{
- bRetValue = FALSE;
+ bRetValue = sal_False;
}
return bRetValue;
}
@@ -729,14 +729,14 @@ sal_Bool PropStateValue::ImplGetPropertyValue( const String& rString, sal_Bool b
void PPTWriter::ImplWriteParagraphs( SvStream& rOut, TextObj& rTextObj )
{
- sal_Bool bFirstParagraph = TRUE;
+ sal_Bool bFirstParagraph = sal_True;
sal_uInt32 nCharCount;
sal_uInt32 nPropertyFlags = 0;
sal_uInt16 nDepth = 0;
sal_Int16 nLineSpacing;
int nInstance = rTextObj.GetInstance();
- for ( ParagraphObj* pPara = rTextObj.First() ; pPara; pPara = rTextObj.Next(), bFirstParagraph = FALSE )
+ for ( ParagraphObj* pPara = rTextObj.First() ; pPara; pPara = rTextObj.Next(), bFirstParagraph = sal_False )
{
PortionObj* pPortion = (PortionObj*)pPara->First();
nCharCount = pPara->Count();
@@ -1450,12 +1450,12 @@ void PPTWriter::ImplWriteObjectEffect( SvStream& rSt,
sal_uInt32 nSoundRef = 0; // 0 if storage is from clipboard. Otherwise index(ID) in SoundCollection list.
sal_uInt32 nDelayTime = 0; // delay before playing object
sal_uInt16 nSlideCount = 1; // number of slides to play object
- UINT8 nBuildType = 1; // type of build
- UINT8 nFlyMethod = 0; // animation effect( fly, zoom, appear, etc )
- UINT8 nFlyDirection = 0; // Animation direction( left, right, up, down, etc )
- UINT8 nAfterEffect = 0; // what to do after build
- UINT8 nSubEffect = 0; // build by word or letter
- UINT8 nOleVerb = 0; // Determines object's class (sound, video, other)
+ sal_uInt8 nBuildType = 1; // type of build
+ sal_uInt8 nFlyMethod = 0; // animation effect( fly, zoom, appear, etc )
+ sal_uInt8 nFlyDirection = 0; // Animation direction( left, right, up, down, etc )
+ sal_uInt8 nAfterEffect = 0; // what to do after build
+ sal_uInt8 nSubEffect = 0; // build by word or letter
+ sal_uInt8 nOleVerb = 0; // Determines object's class (sound, video, other)
if ( eAe == ::com::sun::star::presentation::AnimationEffect_NONE )
{
@@ -1935,8 +1935,8 @@ void PPTWriter::ImplWriteObjectEffect( SvStream& rSt,
}
}
}
- sal_Bool bDimHide = FALSE;
- sal_Bool bDimPrevious = FALSE;
+ sal_Bool bDimHide = sal_False;
+ sal_Bool bDimPrevious = sal_False;
if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "DimHide" ) ) ) )
mAny >>= bDimHide;
if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "DimPrevious" ) ) ) )
@@ -2132,7 +2132,7 @@ sal_Bool PPTWriter::ImplGetEffect( const ::com::sun::star::uno::Reference< ::com
if ( GetPropertyValue( aAny, rPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "SoundOn" ) ) ) )
aAny >>= bIsSound;
else
- bIsSound = FALSE;
+ bIsSound = sal_False;
sal_Bool bHasEffect = ( ( eEffect != ::com::sun::star::presentation::AnimationEffect_NONE )
|| ( eTextEffect != ::com::sun::star::presentation::AnimationEffect_NONE )
@@ -2225,16 +2225,16 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
nIndices = nInstance = nLastPer = nShapeCount = nEffectCount = 0;
- sal_Bool bIsTitlePossible = TRUE; // bei mehr als einem title geht powerpoint in die knie
+ sal_Bool bIsTitlePossible = sal_True; // bei mehr als einem title geht powerpoint in die knie
sal_uInt32 nOutlinerCount = 0; // die gliederungsobjekte muessen dem layout entsprechen,
sal_uInt32 nPrevTextStyle = 0; // es darf nicht mehr als zwei geben
nOlePictureId = 0;
- sal_Bool bAdditionalText = FALSE;
+ sal_Bool bAdditionalText = sal_False;
- sal_Bool bSecOutl = FALSE;
+ sal_Bool bSecOutl = sal_False;
sal_uInt32 nPObjects = 0;
SvMemoryStream* pClientTextBox = NULL;
@@ -2260,7 +2260,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
nGroups = GetGroupsClosed();
for ( sal_uInt32 i = 0; i < nGroups; i++, mpPptEscherEx->LeaveGroup() ) ;
- if ( GetShapeByIndex( GetCurrentGroupIndex(), TRUE ) )
+ if ( GetShapeByIndex( GetCurrentGroupIndex(), sal_True ) )
{
sal_Bool bIsSound;
sal_Bool bMediaClickAction = sal_False;
@@ -2478,7 +2478,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
mpPptEscherEx->EnterGroup( 0,0 );
nGroupLevel = mpPptEscherEx->GetGroupLevel();
bNeedText = sal_False;
- bAdditionalText = TRUE;
+ bAdditionalText = sal_True;
mnTextSize = 0;
}
mnAngle = 0;
@@ -2562,7 +2562,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
::com::sun::star::awt::Size aSize;
String aControlName;
- SvStorageRef xTemp( new SvStorage( new SvMemoryStream(), TRUE ) );
+ SvStorageRef xTemp( new SvStorage( new SvMemoryStream(), sal_True ) );
if ( SvxMSConvertOCXControls::WriteOCXStream( xTemp, aXControlModel, aSize, aControlName ) )
{
String aUserName( xTemp->GetUserName() );
@@ -2594,7 +2594,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
if ( ( nStringLen > 1 ) && ( ( xCompObj->Tell() + nStringLen ) < nStreamLen ) )
{ // i think that the OleIdentifier will follow
ByteString aTemp;
- sal_Char* p = aTemp.AllocBuffer( (USHORT)(nStringLen - 1) );
+ sal_Char* p = aTemp.AllocBuffer( (sal_uInt16)(nStringLen - 1) );
xCompObj->Read( p, nStringLen - 1 );
aOleIdentifier = String( aTemp, gsl_getSystemTextEncoding() );
}
@@ -2636,7 +2636,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
}
*pTmp++ = 0;
*pTmp = 0;
- aPropOpt.AddOpt( ESCHER_Prop_wzName, TRUE, nBufSize, pBuf, nBufSize );
+ aPropOpt.AddOpt( ESCHER_Prop_wzName, sal_True, nBufSize, pBuf, nBufSize );
}
}
else if ( mType == "drawing.Connector" )
@@ -2668,7 +2668,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
{
aTextRefPoint = ::com::sun::star::awt::Point( maRect.Left(), maRect.Top() );
mnTextSize = 0;
- bAdditionalText = TRUE;
+ bAdditionalText = sal_True;
mpPptEscherEx->EnterGroup( &maRect,0 );
}
mpPptEscherEx->OpenContainer( ESCHER_SpContainer );
@@ -2689,7 +2689,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
{
mpPptEscherEx->EnterGroup( 0,0 );
nGroupLevel = mpPptEscherEx->GetGroupLevel();
- bAdditionalText = TRUE;
+ bAdditionalText = sal_True;
mnTextSize = 0;
}
mpPptEscherEx->OpenContainer( ESCHER_SpContainer );
@@ -2708,7 +2708,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
{
mpPptEscherEx->EnterGroup( 0,0 );
nGroupLevel = mpPptEscherEx->GetGroupLevel();
- bAdditionalText = TRUE;
+ bAdditionalText = sal_True;
mnTextSize = 0;
}
mpPptEscherEx->OpenContainer( ESCHER_SpContainer );
@@ -2727,7 +2727,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
{
mpPptEscherEx->EnterGroup( 0,0 );
nGroupLevel = mpPptEscherEx->GetGroupLevel();
- bAdditionalText = TRUE;
+ bAdditionalText = sal_True;
mnTextSize = 0;
}
mpPptEscherEx->OpenContainer( ESCHER_SpContainer );
@@ -2746,7 +2746,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
{
mpPptEscherEx->EnterGroup( 0,0 );
nGroupLevel = mpPptEscherEx->GetGroupLevel();
- bAdditionalText = TRUE;
+ bAdditionalText = sal_True;
mnTextSize = 0;
}
mpPptEscherEx->OpenContainer( ESCHER_SpContainer );
@@ -2816,7 +2816,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
else
nPlaceHolderAtom = EPP_PLACEHOLDER_NOTESBODY;
}
- ImplCreateTextShape( aPropOpt, aSolverContainer, TRUE );
+ ImplCreateTextShape( aPropOpt, aSolverContainer, sal_True );
}
else if ( mType == "presentation.TitleText" )
{
@@ -2832,7 +2832,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
}
else if ( rLayout.bTitlePossible && bIsTitlePossible )
{
- bIsTitlePossible = FALSE;
+ bIsTitlePossible = sal_False;
ImplGetText();
TextObjBinary aTextObj( mXText, EPP_TEXTTYPE_Title, maFontCollection, (PPTExBulletProvider&)*this );
@@ -2911,12 +2911,12 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
}
}
else
- mbPresObj = FALSE;
+ mbPresObj = sal_False;
}
if ( !mbPresObj )
{
mType = "drawing.Text";
- ImplCreateTextShape( aPropOpt, aSolverContainer, TRUE );
+ ImplCreateTextShape( aPropOpt, aSolverContainer, sal_True );
}
}
else if ( ( mType == "presentation.Outliner" ) || ( mType == "presentation.Subtitle" ) )
@@ -3007,12 +3007,12 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
}
}
else
- mbPresObj = FALSE;
+ mbPresObj = sal_False;
}
if ( !mbPresObj )
{
mType = "drawing.Text";
- ImplCreateTextShape( aPropOpt, aSolverContainer, TRUE );
+ ImplCreateTextShape( aPropOpt, aSolverContainer, sal_True );
}
}
else if ( ( mType == "drawing.Page" ) || ( mType == "presentation.Page" ) )
@@ -3024,7 +3024,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
else
nPlaceHolderAtom = EPP_PLACEHOLDER_NOTESSLIDEIMAGE;
}
- ImplCreateTextShape( aPropOpt, aSolverContainer, TRUE );
+ ImplCreateTextShape( aPropOpt, aSolverContainer, sal_True );
}
else if ( mType == "drawing.Frame" )
{
@@ -3111,7 +3111,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
{
mbPresObj = sal_False;
mType = "drawing.Text";
- ImplCreateTextShape( aPropOpt, aSolverContainer, TRUE );
+ ImplCreateTextShape( aPropOpt, aSolverContainer, sal_True );
}
}
else if ( mType == "presentation.Footer" )
@@ -3122,7 +3122,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
{
mbPresObj = sal_False;
mType = "drawing.Text";
- ImplCreateTextShape( aPropOpt, aSolverContainer, TRUE );
+ ImplCreateTextShape( aPropOpt, aSolverContainer, sal_True );
}
}
else if ( mType == "presentation.DateTime" )
@@ -3133,7 +3133,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
{
mbPresObj = sal_False;
mType = "drawing.Text";
- ImplCreateTextShape( aPropOpt, aSolverContainer, TRUE );
+ ImplCreateTextShape( aPropOpt, aSolverContainer, sal_True );
}
}
else if ( mType == "presentation.SlideNumber" )
@@ -3144,7 +3144,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
{
mbPresObj = sal_False;
mType = "drawing.Text";
- ImplCreateTextShape( aPropOpt, aSolverContainer, TRUE );
+ ImplCreateTextShape( aPropOpt, aSolverContainer, sal_True );
}
}
else if ( ( (sal_Char)'3' == mType.GetChar( 8 ) ) && ( (char)'D' == mType.GetChar( 9 ) ) ) // drawing.3D
@@ -3329,9 +3329,9 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
if ( !pClientTextBox )
pClientTextBox = new SvMemoryStream( 0x200, 0x200 );
- if ( mbEmptyPresObj == FALSE )
+ if ( mbEmptyPresObj == sal_False )
{
- if ( ( ePageType == NORMAL ) && ( bMasterPage == FALSE ) )
+ if ( ( ePageType == NORMAL ) && ( bMasterPage == sal_False ) )
{
sal_uInt32 nTextType = EPP_TEXTTYPE_Body;
if ( mnTextStyle == EPP_TEXTSTYLE_BODY )
@@ -3433,7 +3433,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
if ( bAdditionalText )
{
- bAdditionalText = FALSE;
+ bAdditionalText = sal_False;
::com::sun::star::uno::Any aAny;
EscherPropertyContainer aPropOpt;
@@ -3449,7 +3449,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
double fDist = hypot( maRect.GetWidth(), maRect.GetHeight() );
maRect = Rectangle( Point( aTextRefPoint.X, aTextRefPoint.Y ),
Point( (sal_Int32)( aTextRefPoint.X + fDist ), aTextRefPoint.Y - 1 ) );
- ImplCreateTextShape( aPropOpt, aSolverContainer, FALSE );
+ ImplCreateTextShape( aPropOpt, aSolverContainer, sal_False );
aPropOpt.AddOpt( ESCHER_Prop_FitTextToShape, 0x60006 ); // Size Shape To Fit Text
if ( mnAngle < 0 )
mnAngle = ( 36000 + mnAngle ) % 36000;
@@ -3458,7 +3458,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
}
else
{
- ImplCreateTextShape( aPropOpt, aSolverContainer, FALSE );
+ ImplCreateTextShape( aPropOpt, aSolverContainer, sal_False );
if ( mnAngle < 0 )
mnAngle = ( 36000 + mnAngle ) % 36000;
else
@@ -3561,10 +3561,10 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc
mpPptEscherEx->OpenContainer( ESCHER_SpgrContainer );
mpPptEscherEx->OpenContainer( ESCHER_SpContainer );
mpPptEscherEx->AddAtom( 16, ESCHER_Spgr, 1 );
- *mpStrm << (INT32)maRect.Left() // Bounding box fuer die Gruppierten shapes an die sie attached werden
- << (INT32)maRect.Top()
- << (INT32)maRect.Right()
- << (INT32)maRect.Bottom();
+ *mpStrm << (sal_Int32)maRect.Left() // Bounding box fuer die Gruppierten shapes an die sie attached werden
+ << (sal_Int32)maRect.Top()
+ << (sal_Int32)maRect.Right()
+ << (sal_Int32)maRect.Bottom();
sal_uInt32 nShapeId = mpPptEscherEx->GenerateShapeId();
mpPptEscherEx->AddShape( ESCHER_ShpInst_Min, 0x201, nShapeId ); // Flags: Group | Patriarch
@@ -3614,7 +3614,7 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc
if ( nRowCount )
{
SvMemoryStream aMemStrm;
- aMemStrm.ObjectOwnsMemory( FALSE );
+ aMemStrm.ObjectOwnsMemory( sal_False );
aMemStrm << nRowCount
<< nRowCount
<< (sal_uInt16)4;
diff --git a/sd/source/filter/eppt/escherex.cxx b/sd/source/filter/eppt/escherex.cxx
index dba09a161337..7714ca4d761b 100644
--- a/sd/source/filter/eppt/escherex.cxx
+++ b/sd/source/filter/eppt/escherex.cxx
@@ -51,7 +51,7 @@ sal_uInt32 PptEscherEx::DrawingGroupContainerSize()
void PptEscherEx::WriteDrawingGroupContainer( SvStream& rSt )
{
- UINT32 nSize = DrawingGroupContainerSize();
+ sal_uInt32 nSize = DrawingGroupContainerSize();
rSt << (sal_uInt32)( 0xf | ( 1035 << 16 ) ) // EPP_PPDrawingGroup
<< (sal_uInt32)( nSize - 8 );
@@ -62,7 +62,7 @@ void PptEscherEx::WriteDrawingGroupContainer( SvStream& rSt )
sal_uInt32 PptEscherEx::ImplDggContainerSize()
{
- UINT32 nSize;
+ sal_uInt32 nSize;
nSize = mxGlobal->GetDggAtomSize();
nSize += mxGlobal->GetBlibStoreContainerSize();
@@ -130,7 +130,7 @@ sal_uInt32 PptEscherEx::ImplSplitMenuColorsAtomSize()
void PptEscherEx::ImplWriteSplitMenuColorsAtom( SvStream& rSt )
{
- UINT32 nSize = ImplSplitMenuColorsAtomSize();
+ sal_uInt32 nSize = ImplSplitMenuColorsAtomSize();
if ( nSize )
{
rSt << (sal_uInt32)( ( ESCHER_SplitMenuColors << 16 ) | ( ESCHER_SPLIT_MENU_COLORS_COUNT << 4 ) )
@@ -151,9 +151,9 @@ PptEscherEx::~PptEscherEx()
// ---------------------------------------------------------------------------------------------
-void PptEscherEx::OpenContainer( UINT16 n_EscherContainer, int nRecInstance )
+void PptEscherEx::OpenContainer( sal_uInt16 n_EscherContainer, int nRecInstance )
{
- *mpOutStrm << (UINT16)( ( nRecInstance << 4 ) | 0xf ) << n_EscherContainer << (UINT32)0;
+ *mpOutStrm << (sal_uInt16)( ( nRecInstance << 4 ) | 0xf ) << n_EscherContainer << (sal_uInt32)0;
mOffsets.push_back( mpOutStrm->Tell() - 4 );
mRecTypes.push_back( n_EscherContainer );
@@ -163,12 +163,12 @@ void PptEscherEx::OpenContainer( UINT16 n_EscherContainer, int nRecInstance )
{
if ( !mbEscherDg )
{
- mbEscherDg = TRUE;
+ mbEscherDg = sal_True;
mnCurrentDg = mxGlobal->GenerateDrawingId();
AddAtom( 8, ESCHER_Dg, 0, mnCurrentDg );
PtReplaceOrInsert( ESCHER_Persist_Dg | mnCurrentDg, mpOutStrm->Tell() );
- *mpOutStrm << (UINT32)0 // The number of shapes in this drawing
- << (UINT32)0; // The last MSOSPID given to an SP in this DG
+ *mpOutStrm << (sal_uInt32)0 // The number of shapes in this drawing
+ << (sal_uInt32)0; // The last MSOSPID given to an SP in this DG
}
}
break;
@@ -177,7 +177,7 @@ void PptEscherEx::OpenContainer( UINT16 n_EscherContainer, int nRecInstance )
{
if ( mbEscherDg )
{
- mbEscherSpgr = TRUE;
+ mbEscherSpgr = sal_True;
}
}
break;
@@ -197,7 +197,7 @@ void PptEscherEx::CloseContainer()
*/
if ( ( mRecTypes.back() != ESCHER_SpgrContainer ) || ( mnGroupLevel < 12 ) )
{
- UINT32 nSize, nPos = mpOutStrm->Tell();
+ sal_uInt32 nSize, nPos = mpOutStrm->Tell();
nSize = ( nPos - mOffsets.back() ) - 4;
mpOutStrm->Seek( mOffsets.back() );
*mpOutStrm << nSize;
@@ -208,7 +208,7 @@ void PptEscherEx::CloseContainer()
{
if ( mbEscherDg )
{
- mbEscherDg = FALSE;
+ mbEscherDg = sal_False;
if ( DoSeek( ESCHER_Persist_Dg | mnCurrentDg ) )
*mpOutStrm << mxGlobal->GetDrawingShapeCount( mnCurrentDg ) << mxGlobal->GetLastShapeId( mnCurrentDg );
}
@@ -219,7 +219,7 @@ void PptEscherEx::CloseContainer()
{
if ( mbEscherSpgr )
{
- mbEscherSpgr = FALSE;
+ mbEscherSpgr = sal_False;
}
}
@@ -253,10 +253,10 @@ sal_uInt32 PptEscherEx::EnterGroup( Rectangle* pBoundRect, SvMemoryStream* pClie
OpenContainer( ESCHER_SpContainer );
AddAtom( 16, ESCHER_Spgr, 1 );
PtReplaceOrInsert( ESCHER_Persist_Grouping_Snap | mnGroupLevel, mpOutStrm->Tell() );
- *mpOutStrm << (INT32)aRect.Left() // Bounding box fuer die Gruppierten shapes an die sie attached werden
- << (INT32)aRect.Top()
- << (INT32)aRect.Right()
- << (INT32)aRect.Bottom();
+ *mpOutStrm << (sal_Int32)aRect.Left() // Bounding box fuer die Gruppierten shapes an die sie attached werden
+ << (sal_Int32)aRect.Top()
+ << (sal_Int32)aRect.Right()
+ << (sal_Int32)aRect.Bottom();
nShapeId = GenerateShapeId();
if ( !mnGroupLevel )
@@ -268,7 +268,7 @@ sal_uInt32 PptEscherEx::EnterGroup( Rectangle* pBoundRect, SvMemoryStream* pClie
{
AddAtom( 8, ESCHER_ClientAnchor );
PtReplaceOrInsert( ESCHER_Persist_Grouping_Logic | mnGroupLevel, mpOutStrm->Tell() );
- *mpOutStrm << (INT16)aRect.Top() << (INT16)aRect.Left() << (INT16)aRect.Right() << (INT16)aRect.Bottom();
+ *mpOutStrm << (sal_Int16)aRect.Top() << (sal_Int16)aRect.Left() << (sal_Int16)aRect.Right() << (sal_Int16)aRect.Bottom();
}
else
{
diff --git a/sd/source/filter/eppt/escherex.hxx b/sd/source/filter/eppt/escherex.hxx
index 4589ea8f5c6c..4b77a1a755c1 100644..100755
--- a/sd/source/filter/eppt/escherex.hxx
+++ b/sd/source/filter/eppt/escherex.hxx
@@ -31,7 +31,7 @@
#include <filter/msfilter/escherex.hxx>
// ---------------------------------------------------------------------------------------------
-// Werte fuer den ULONG im PPT_PST_TextHeaderAtom
+// Werte fuer den sal_uLong im PPT_PST_TextHeaderAtom
enum PPT_TextHeader
{
PPTTH_TITLE,
@@ -63,12 +63,12 @@ class PptEscherEx : public EscherEx
PptEscherEx( SvStream& rOut );
~PptEscherEx();
- void OpenContainer( UINT16 n_EscherContainer, int nRecInstance = 0 );
+ void OpenContainer( sal_uInt16 n_EscherContainer, int nRecInstance = 0 );
void CloseContainer();
sal_uInt32 EnterGroup( Rectangle* pBoundRect, SvMemoryStream* pClientData );
- UINT32 DrawingGroupContainerSize();
+ sal_uInt32 DrawingGroupContainerSize();
void WriteDrawingGroupContainer( SvStream& rSt );
using EscherEx::EnterGroup;
diff --git a/sd/source/filter/grf/sdgrffilter.cxx b/sd/source/filter/grf/sdgrffilter.cxx
index 162379581d3d..a40a84e693c0 100644..100755
--- a/sd/source/filter/grf/sdgrffilter.cxx
+++ b/sd/source/filter/grf/sdgrffilter.cxx
@@ -108,7 +108,7 @@ using namespace ::sfx2;
class SdGRFFilter_ImplInteractionHdl : public ::cppu::WeakImplHelper1< com::sun::star::task::XInteractionHandler >
{
com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler > m_xInter;
- USHORT nFilterError;
+ sal_uInt16 nFilterError;
public:
@@ -119,7 +119,7 @@ class SdGRFFilter_ImplInteractionHdl : public ::cppu::WeakImplHelper1< com::sun:
~SdGRFFilter_ImplInteractionHdl();
- USHORT GetErrorCode() const { return nFilterError; };
+ sal_uInt16 GetErrorCode() const { return nFilterError; };
virtual void SAL_CALL handle( const com::sun::star::uno::Reference< com::sun::star::task::XInteractionRequest >& )
throw( com::sun::star::uno::RuntimeException );
@@ -137,7 +137,7 @@ void SdGRFFilter_ImplInteractionHdl::handle( const com::sun::star::uno::Referenc
com::sun::star::drawing::GraphicFilterRequest aErr;
if ( xRequest->getRequest() >>= aErr )
- nFilterError = (USHORT)aErr.ErrCode;
+ nFilterError = (sal_uInt16)aErr.ErrCode;
else
m_xInter->handle( xRequest );
}
@@ -160,9 +160,9 @@ SdGRFFilter::~SdGRFFilter()
// -----------------------------------------------------------------------------
-void SdGRFFilter::HandleGraphicFilterError( USHORT nFilterError, ULONG nStreamError )
+void SdGRFFilter::HandleGraphicFilterError( sal_uInt16 nFilterError, sal_uLong nStreamError )
{
- USHORT nId;
+ sal_uInt16 nId;
switch( nFilterError )
{
@@ -209,14 +209,14 @@ sal_Bool SdGRFFilter::Import()
Graphic aGraphic;
const String aFileName( mrMedium.GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) );
GraphicFilter* pGraphicFilter = GraphicFilter::GetGraphicFilter();
- const USHORT nFilter = pGraphicFilter->GetImportFormatNumberForTypeName( mrMedium.GetFilter()->GetTypeName() );
+ const sal_uInt16 nFilter = pGraphicFilter->GetImportFormatNumberForTypeName( mrMedium.GetFilter()->GetTypeName() );
sal_Bool bRet = sal_False;
// ggf. Filterdialog ausfuehren
if ( !pGraphicFilter->HasImportDialog( nFilter ) || pGraphicFilter->DoImportDialog( NULL, nFilter ) )
{
SvStream* pIStm = mrMedium.GetInStream();
- USHORT nReturn = pIStm ? pGraphicFilter->ImportGraphic( aGraphic, aFileName, *pIStm, nFilter ) : 1;
+ sal_uInt16 nReturn = pIStm ? pGraphicFilter->ImportGraphic( aGraphic, aFileName, *pIStm, nFilter ) : 1;
if( nReturn )
HandleGraphicFilterError( nReturn, pGraphicFilter->GetLastError().nStreamError );
@@ -314,7 +314,7 @@ sal_Bool SdGRFFilter::Export()
if ( pSet && pGraphicFilter && xSource.is() )
{
const String aTypeName( mrMedium.GetFilter()->GetTypeName() );
- const USHORT nFilter = pGraphicFilter->GetExportFormatNumberForTypeName( aTypeName );
+ const sal_uInt16 nFilter = pGraphicFilter->GetExportFormatNumberForTypeName( aTypeName );
if ( nFilter != GRFILTER_FORMAT_NOTFOUND )
{
uno::Reference< task::XInteractionHandler > mXInteractionHandler;
@@ -479,11 +479,11 @@ void SdGRFFilter::SaveGraphic( const ::com::sun::star::uno::Reference< ::com::su
GraphicFilter& rGF = *GraphicFilter::GetGraphicFilter();
Reference<XFilterManager> xFltMgr(xFP, UNO_QUERY);
OUString aDefaultFormatName;
- USHORT nCount = rGF.GetExportFormatCount();
+ sal_uInt16 nCount = rGF.GetExportFormatCount();
std::map< OUString, OUString > aMimeTypeMap;
- for ( USHORT i = 0; i < nCount; i++ )
+ for ( sal_uInt16 i = 0; i < nCount; i++ )
{
const OUString aExportFormatName( rGF.GetExportFormatName( i ) );
const OUString aFilterMimeType( rGF.GetExportFormatMediaType( i ) );
@@ -496,7 +496,7 @@ void SdGRFFilter::SaveGraphic( const ::com::sun::star::uno::Reference< ::com::su
if( aDefaultFormatName.getLength() == 0 )
{
nCount = rGF.GetImportFormatCount();
- for( USHORT i = 0; i < nCount; i++ )
+ for( sal_uInt16 i = 0; i < nCount; i++ )
{
const OUString aFilterMimeType( rGF.GetImportFormatMediaType( i ) );
if( aMimeType == aFilterMimeType )
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index 80f21e0676f7..fd46e1412a5e 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -159,9 +159,9 @@ public:
EasyFile();
~EasyFile();
- ULONG createStream( const String& rUrl, SvStream*& rpStr );
- ULONG createFileName( const String& rUrl, String& rFileName );
- ULONG close();
+ sal_uLong createStream( const String& rUrl, SvStream*& rpStr );
+ sal_uLong createFileName( const String& rUrl, String& rFileName );
+ sal_uLong close();
};
// *********************************************************************
@@ -356,7 +356,7 @@ String HtmlState::SetLink( const String& aLink, const String& aTarget )
// class HtmlExport Methoden
// *********************************************************************
-static String getParagraphStyle( SdrOutliner* pOutliner, USHORT nPara )
+static String getParagraphStyle( SdrOutliner* pOutliner, sal_uInt16 nPara )
{
SfxItemSet aParaSet( pOutliner->GetParaAttribs( nPara ) );
@@ -439,7 +439,7 @@ HtmlExport::~HtmlExport()
// ------------------------------------------------------------------
if(mpImageFiles && mpHTMLFiles && mpPageNames && mpTextFiles)
{
- for ( USHORT nSdPage = 0; nSdPage < mnSdPageCount; nSdPage++)
+ for ( sal_uInt16 nSdPage = 0; nSdPage < mnSdPageCount; nSdPage++)
{
delete mpImageFiles[nSdPage];
delete mpHTMLFiles[nSdPage];
@@ -490,7 +490,7 @@ void HtmlExport::InitExportParameters( const Sequence< PropertyValue >& rParams
xub_StrLen nPos = aTmp.Search( '%' );
if(nPos != STRING_NOTFOUND)
aTmp.Erase(nPos,1);
- mnCompression = (INT16)aTmp.ToInt32();
+ mnCompression = (sal_Int16)aTmp.ToInt32();
}
}
else if( pParams->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Width" ) ) )
@@ -654,7 +654,7 @@ void HtmlExport::InitExportParameters( const Sequence< PropertyValue >& rParams
Size aTmpSize( pPage->GetSize() );
double dRatio=((double)aTmpSize.Width())/aTmpSize.Height();
- mnHeightPixel = (USHORT)(mnWidthPixel/dRatio);
+ mnHeightPixel = (sal_uInt16)(mnWidthPixel/dRatio);
//------------------------------------------------------------------
// Ziel ausklamuestern...
@@ -666,7 +666,7 @@ void HtmlExport::InitExportParameters( const Sequence< PropertyValue >& rParams
maIndex = aINetURLObj.GetLastName();
mnSdPageCount = mpDoc->GetSdPageCount( PK_STANDARD );
- for( USHORT nPage = 0; nPage < mnSdPageCount; nPage++ )
+ for( sal_uInt16 nPage = 0; nPage < mnSdPageCount; nPage++ )
{
pPage = mpDoc->GetSdPage( nPage, PK_STANDARD );
@@ -707,7 +707,7 @@ void HtmlExport::ExportHtml()
if( mbDownload )
{
// Separator such und Extension ausblenden
- USHORT nSepPos = maDocFileName.Search( sal_Unicode('.') );
+ sal_uInt16 nSepPos = maDocFileName.Search( sal_Unicode('.') );
if(nSepPos != STRING_NOTFOUND)
maDocFileName.Erase(nSepPos);
@@ -717,7 +717,7 @@ void HtmlExport::ExportHtml()
//////
- USHORT nProgrCount = mnSdPageCount;
+ sal_uInt16 nProgrCount = mnSdPageCount;
nProgrCount += mbImpress?mnSdPageCount:0;
nProgrCount += mbContentsPage?1:0;
nProgrCount += (mbFrames && mbNotes)?mnSdPageCount:0;
@@ -817,8 +817,8 @@ void HtmlExport::SetDocColors( SdPage* pPage )
if(pSheet)
{
SfxItemSet& rSet = pSheet->GetItemSet();
- if(rSet.GetItemState(EE_CHAR_COLOR,TRUE) == SFX_ITEM_ON)
- maTextColor = ((SvxColorItem*)rSet.GetItem(EE_CHAR_COLOR,TRUE))->GetValue();
+ if(rSet.GetItemState(EE_CHAR_COLOR,sal_True) == SFX_ITEM_ON)
+ maTextColor = ((SvxColorItem*)rSet.GetItem(EE_CHAR_COLOR,sal_True))->GetValue();
}
// Standard Hintergrundfarbe aus Background der MasterPage der ersten Seite
@@ -833,7 +833,7 @@ void HtmlExport::SetDocColors( SdPage* pPage )
///////////////////////////////////////////////////////////////////////
-void HtmlExport::InitProgress( USHORT nProgrCount )
+void HtmlExport::InitProgress( sal_uInt16 nProgrCount )
{
String aStr(SdResId(STR_CREATE_PAGES));
mpProgress = new SfxProgress( mpDocSh, aStr, nProgrCount );
@@ -872,7 +872,7 @@ void HtmlExport::ExportWebCast()
mnPagesWritten = 0;
InitProgress( mnSdPageCount + 9 );
- mpDocSh->SetWaitCursor( TRUE );
+ mpDocSh->SetWaitCursor( sal_True );
CreateFileNames();
@@ -1014,7 +1014,7 @@ bool HtmlExport::CreateImagesForPresPages()
aDescriptor[2].Name = OUString( RTL_CONSTASCII_USTRINGPARAM("FilterData") );
aDescriptor[2].Value <<= aFilterData;
- for (USHORT nSdPage = 0; nSdPage < mnSdPageCount; nSdPage++)
+ for (sal_uInt16 nSdPage = 0; nSdPage < mnSdPageCount; nSdPage++)
{
SdPage* pPage = maPages[ nSdPage ];
@@ -1044,11 +1044,11 @@ bool HtmlExport::CreateImagesForPresPages()
// =====================================================================
SdrTextObj* HtmlExport::GetLayoutTextObject(SdrPage* pPage)
{
- ULONG nObjectCount = pPage->GetObjCount();
+ sal_uLong nObjectCount = pPage->GetObjCount();
SdrObject* pObject = NULL;
SdrTextObj* pResult = NULL;
- for (ULONG nObject = 0; nObject < nObjectCount; nObject++)
+ for (sal_uLong nObject = 0; nObject < nObjectCount; nObject++)
{
pObject = pPage->GetObj(nObject);
if (pObject->GetObjInventor() == SdrInventor &&
@@ -1084,7 +1084,7 @@ bool HtmlExport::CreateHtmlTextForPresPages()
SdrOutliner* pOutliner = mpDoc->GetInternalOutliner();
- for(USHORT nSdPage = 0; nSdPage < mnSdPageCount && bOk; nSdPage++)
+ for(sal_uInt16 nSdPage = 0; nSdPage < mnSdPageCount && bOk; nSdPage++)
{
SdPage* pPage = maPages[ nSdPage ];
@@ -1151,7 +1151,7 @@ bool HtmlExport::CreateHtmlTextForPresPages()
the given filename */
bool HtmlExport::WriteHtml( const String& rFileName, bool bAddExtension, const String& rHtmlData )
{
- ULONG nErr = 0;
+ sal_uLong nErr = 0;
String aFileName( rFileName );
if( bAddExtension )
@@ -1221,19 +1221,19 @@ String HtmlExport::CreateTextForPage( SdrOutliner* pOutliner,
pOutliner->Clear();
pOutliner->SetText( *pOPO );
- ULONG nCount = pOutliner->GetParagraphCount();
+ sal_uLong nCount = pOutliner->GetParagraphCount();
Paragraph* pPara = NULL;
sal_Int16 nActDepth = -1;
String aParaText;
- for (ULONG nPara = 0; nPara < nCount; nPara++)
+ for (sal_uLong nPara = 0; nPara < nCount; nPara++)
{
pPara = pOutliner->GetParagraph(nPara);
if(pPara == 0)
continue;
- const sal_Int16 nDepth = (USHORT) pOutliner->GetDepth( (USHORT) nPara );
+ const sal_Int16 nDepth = (sal_uInt16) pOutliner->GetDepth( (sal_uInt16) nPara );
aParaText = ParagraphToHTMLString(pOutliner,nPara,rBackgroundColor);
if(aParaText.Len() == 0)
@@ -1318,8 +1318,8 @@ String HtmlExport::CreateTextForNotesPage( SdrOutliner* pOutliner,
pOutliner->Clear();
pOutliner->SetText( *pOPO );
- ULONG nCount = pOutliner->GetParagraphCount();
- for (ULONG nPara = 0; nPara < nCount; nPara++)
+ sal_uLong nCount = pOutliner->GetParagraphCount();
+ for (sal_uLong nPara = 0; nPara < nCount; nPara++)
{
aStr.AppendAscii("<p style=\"");
aStr.Append( getParagraphStyle( pOutliner, nPara ) );
@@ -1336,7 +1336,7 @@ String HtmlExport::CreateTextForNotesPage( SdrOutliner* pOutliner,
// =====================================================================
// Wandelt einen Paragraphen des Outliners in Html
// =====================================================================
-String HtmlExport::ParagraphToHTMLString( SdrOutliner* pOutliner, ULONG nPara, const Color& rBackgroundColor )
+String HtmlExport::ParagraphToHTMLString( SdrOutliner* pOutliner, sal_uLong nPara, const Color& rBackgroundColor )
{
String aStr;
@@ -1346,7 +1346,7 @@ String HtmlExport::ParagraphToHTMLString( SdrOutliner* pOutliner, ULONG nPara, c
// TODO: MALTE!!!
EditEngine& rEditEngine = *(EditEngine*)&pOutliner->GetEditEngine();
bool bOldUpdateMode = rEditEngine.GetUpdateMode();
- rEditEngine.SetUpdateMode(TRUE);
+ rEditEngine.SetUpdateMode(sal_True);
Paragraph* pPara = pOutliner->GetParagraph(nPara);
if(NULL == pPara)
@@ -1354,15 +1354,15 @@ String HtmlExport::ParagraphToHTMLString( SdrOutliner* pOutliner, ULONG nPara, c
HtmlState aState( (mbUserAttr || mbDocColors) ? maTextColor : Color(COL_BLACK) );
SvUShorts aPortionList;
- rEditEngine.GetPortions( (USHORT) nPara, aPortionList );
- USHORT nPortionCount = aPortionList.Count();
+ rEditEngine.GetPortions( (sal_uInt16) nPara, aPortionList );
+ sal_uInt16 nPortionCount = aPortionList.Count();
- USHORT nPos1 = 0;
- for( USHORT nPortion = 0; nPortion < nPortionCount; nPortion++ )
+ sal_uInt16 nPos1 = 0;
+ for( sal_uInt16 nPortion = 0; nPortion < nPortionCount; nPortion++ )
{
- USHORT nPos2 = aPortionList.GetObject(nPortion);
+ sal_uInt16 nPos2 = aPortionList.GetObject(nPortion);
- ESelection aSelection( (USHORT) nPara, nPos1, (USHORT) nPara, nPos2);
+ ESelection aSelection( (sal_uInt16) nPara, nPos1, (sal_uInt16) nPara, nPos2);
SfxItemSet aSet( rEditEngine.GetAttribs( aSelection ) );
@@ -1479,7 +1479,7 @@ bool HtmlExport::CreateHtmlForPresPages()
List aClickableObjects;
- for(USHORT nSdPage = 0; nSdPage < mnSdPageCount && bOk; nSdPage++)
+ for(sal_uInt16 nSdPage = 0; nSdPage < mnSdPageCount && bOk; nSdPage++)
{
// Klickbare Objekte finden (auch auf der Masterpage) und
// in Liste stellen. In umgekehrter Zeichenreihenfolge in
@@ -1497,8 +1497,8 @@ bool HtmlExport::CreateHtmlForPresPages()
while (!bMasterDone)
{
- // TRUE = rueckwaerts
- SdrObjListIter aIter(*pPage, IM_DEEPWITHGROUPS, TRUE);
+ // sal_True = rueckwaerts
+ SdrObjListIter aIter(*pPage, IM_DEEPWITHGROUPS, sal_True);
SdrObject* pObject = aIter.Next();
while (pObject)
@@ -1526,7 +1526,7 @@ bool HtmlExport::CreateHtmlForPresPages()
else
bMasterDone = true;
}
- ULONG nClickableObjectCount = aClickableObjects.Count();
+ sal_uLong nClickableObjectCount = aClickableObjects.Count();
// HTML Head
String aStr(maHTMLHeader);
@@ -1539,7 +1539,7 @@ bool HtmlExport::CreateHtmlForPresPages()
pPage = maPages[ nSdPage ];
if( meMode == PUBLISH_KIOSK )
{
- ULONG nSecs = 0;
+ sal_uLong nSecs = 0;
bool bEndless = false;
if( !mbAutoSlide )
{
@@ -1620,7 +1620,7 @@ bool HtmlExport::CreateHtmlForPresPages()
{
aStr.AppendAscii( "<map name=\"map0\">\r\n" );
- for (ULONG nObject = 0; nObject < nClickableObjectCount; nObject++)
+ for (sal_uLong nObject = 0; nObject < nClickableObjectCount; nObject++)
{
SdrObject* pObject = (SdrObject*)aClickableObjects.GetObject(nObject);
SdAnimationInfo* pInfo = mpDoc->GetAnimationInfo(pObject);
@@ -1630,7 +1630,7 @@ bool HtmlExport::CreateHtmlForPresPages()
Point aLogPos(aRect.TopLeft());
bool bIsSquare = aRect.GetWidth() == aRect.GetHeight();
- ULONG nPageWidth = pPage->GetSize().Width() - pPage->GetLftBorder() -
+ sal_uLong nPageWidth = pPage->GetSize().Width() - pPage->GetLftBorder() -
pPage->GetRgtBorder();
// das BoundRect bezieht sich auf den physikalischen
@@ -1652,17 +1652,17 @@ bool HtmlExport::CreateHtmlForPresPages()
if (pIMapInfo)
{
const ImageMap& rIMap = pIMapInfo->GetImageMap();
- UINT16 nAreaCount = rIMap.GetIMapObjectCount();
- for (UINT16 nArea = 0; nArea < nAreaCount; nArea++)
+ sal_uInt16 nAreaCount = rIMap.GetIMapObjectCount();
+ for (sal_uInt16 nArea = 0; nArea < nAreaCount; nArea++)
{
IMapObject* pArea = rIMap.GetIMapObject(nArea);
- UINT16 nType = pArea->GetType();
+ sal_uInt16 nType = pArea->GetType();
String aURL( pArea->GetURL() );
// ggfs. Seiten- oder Objektnamen umwandeln in den
// Namen der entsprechenden HTML-Datei
- BOOL bIsMasterPage;
- USHORT nPgNum = mpDoc->GetPageByName( aURL, bIsMasterPage );
+ sal_Bool bIsMasterPage;
+ sal_uInt16 nPgNum = mpDoc->GetPageByName( aURL, bIsMasterPage );
SdrObject* pObj = NULL;
if (nPgNum == SDRPAGE_NOTFOUND)
@@ -1706,9 +1706,9 @@ bool HtmlExport::CreateHtmlForPresPages()
aCenter.X() = (long)(aCenter.X() * fLogicToPixel);
aCenter.Y() = (long)(aCenter.Y() * fLogicToPixel);
- ULONG nCircleRadius = (((IMapCircleObject*)pArea)->
+ sal_uLong nCircleRadius = (((IMapCircleObject*)pArea)->
GetRadius(false));
- nCircleRadius = (ULONG)(nCircleRadius * fLogicToPixel);
+ nCircleRadius = (sal_uLong)(nCircleRadius * fLogicToPixel);
aStr += CreateHTMLCircleArea(nCircleRadius,
aCenter.X(), aCenter.Y(),
aURL);
@@ -1746,8 +1746,8 @@ bool HtmlExport::CreateHtmlForPresPages()
{
case presentation::ClickAction_BOOKMARK:
{
- BOOL bIsMasterPage;
- USHORT nPgNum = mpDoc->GetPageByName( pInfo->GetBookmark(), bIsMasterPage );
+ sal_Bool bIsMasterPage;
+ sal_uInt16 nPgNum = mpDoc->GetPageByName( pInfo->GetBookmark(), bIsMasterPage );
SdrObject* pObj = NULL;
if( nPgNum == SDRPAGE_NOTFOUND )
@@ -1769,25 +1769,25 @@ bool HtmlExport::CreateHtmlForPresPages()
case presentation::ClickAction_PREVPAGE:
{
- ULONG nPage = nSdPage;
+ sal_uLong nPage = nSdPage;
if (nSdPage == 0)
nPage = 0;
else
nPage = nSdPage - 1;
- aHRef = CreatePageURL( (USHORT) nPage);
+ aHRef = CreatePageURL( (sal_uInt16) nPage);
}
break;
case presentation::ClickAction_NEXTPAGE:
{
- ULONG nPage = nSdPage;
+ sal_uLong nPage = nSdPage;
if (nSdPage == mnSdPageCount - 1)
nPage = mnSdPageCount - 1;
else
nPage = nSdPage + 1;
- aHRef = CreatePageURL( (USHORT) nPage);
+ aHRef = CreatePageURL( (sal_uInt16) nPage);
}
break;
@@ -1898,7 +1898,7 @@ bool HtmlExport::CreateContentPage()
aStr += RESTOHTML(STR_HTMLEXP_CONTENTS);
aStr.AppendAscii( "</h3>" );
- for(USHORT nSdPage = 0; nSdPage < mnSdPageCount; nSdPage++)
+ for(sal_uInt16 nSdPage = 0; nSdPage < mnSdPageCount; nSdPage++)
{
String aPageName = *mpPageNames[nSdPage];
aStr.AppendAscii( "<div align=\"left\">" );
@@ -1982,7 +1982,7 @@ bool HtmlExport::CreateNotesPages()
bool bOk = true;
SdrOutliner* pOutliner = mpDoc->GetInternalOutliner();
- for( USHORT nSdPage = 0; bOk && nSdPage < mnSdPageCount; nSdPage++ )
+ for( sal_uInt16 nSdPage = 0; bOk && nSdPage < mnSdPageCount; nSdPage++ )
{
SdPage* pPage = maNotesPages[nSdPage];
if( mbDocColors )
@@ -2038,7 +2038,7 @@ bool HtmlExport::CreateOutlinePages()
aStr += CreateBodyTag();
SdrOutliner* pOutliner = mpDoc->GetInternalOutliner();
- for(USHORT nSdPage = 0; nSdPage < mnSdPageCount; nSdPage++)
+ for(sal_uInt16 nSdPage = 0; nSdPage < mnSdPageCount; nSdPage++)
{
SdPage* pPage = maPages[ nSdPage ];
@@ -2091,7 +2091,7 @@ void HtmlExport::CreateFileNames()
mbHeader = false; // Ueberschrift auf Uebersichtsseite?
- for (USHORT nSdPage = 0; nSdPage < mnSdPageCount; nSdPage++)
+ for (sal_uInt16 nSdPage = 0; nSdPage < mnSdPageCount; nSdPage++)
{
String* pName;
if(nSdPage == 0 && !mbContentsPage && !mbFrames )
@@ -2167,7 +2167,7 @@ String HtmlExport::getDocumentTitle()
}
}
- for( UINT16 i = 0; i < mDocTitle.Len(); i++ )
+ for( sal_uInt16 i = 0; i < mDocTitle.Len(); i++ )
if( mDocTitle.GetChar(i) == (sal_Unicode)0xff)
mDocTitle.SetChar(i, sal_Unicode(' ') );
}
@@ -2177,7 +2177,7 @@ String HtmlExport::getDocumentTitle()
mDocTitle = maDocFileName;
int nDot = mDocTitle.Search( '.' );
if( nDot > 0 )
- mDocTitle.Erase( (USHORT)nDot );
+ mDocTitle.Erase( (sal_uInt16)nDot );
}
mbHeader = true;
}
@@ -2515,7 +2515,7 @@ bool HtmlExport::CreateNavBarFrames()
// ====================================================================
// Buttonleiste fuer Standard ausgeben
// ====================================================================
-String HtmlExport::CreateNavBar( USHORT nSdPage, bool bIsText ) const
+String HtmlExport::CreateNavBar( sal_uInt16 nSdPage, bool bIsText ) const
{
// Navigationsleiste vorbereiten
String aStrNavFirst( SdResId(STR_HTMLEXP_FIRSTPAGE) );
@@ -2692,8 +2692,8 @@ String HtmlExport::CreateLink( const String& aLink,
// Erzeugt ein Image-tag
// =====================================================================
String HtmlExport::CreateImage( const String& aImage, const String& aAltText,
- INT16 nWidth,
- INT16 nHeight ) const
+ sal_Int16 nWidth,
+ sal_Int16 nHeight ) const
{
String aStr( RTL_CONSTASCII_USTRINGPARAM("<img src=\""));
aStr += StringToURL(aImage);
@@ -2748,9 +2748,9 @@ String HtmlExport::ColorToHTMLString( Color aColor )
// =====================================================================
// Area fuer Kreis erzeugen; es werden Pixelkoordinaten erwartet
// =====================================================================
-String HtmlExport::CreateHTMLCircleArea( ULONG nRadius,
- ULONG nCenterX,
- ULONG nCenterY,
+String HtmlExport::CreateHTMLCircleArea( sal_uLong nRadius,
+ sal_uLong nCenterX,
+ sal_uLong nCenterY,
const String& rHRef ) const
{
String aStr( RTL_CONSTASCII_USTRINGPARAM("<area shape=\"circle\" alt=\"\" coords=\"" ));
@@ -2847,7 +2847,7 @@ String HtmlExport::StringToHTMLString( const String& rString )
// =====================================================================
// Erzeugt die URL einer bestimmten Seite
// =====================================================================
-String HtmlExport::CreatePageURL( USHORT nPgNum )
+String HtmlExport::CreatePageURL( sal_uInt16 nPgNum )
{
if(mbFrames)
{
@@ -2870,7 +2870,7 @@ bool HtmlExport::CopyScript( const String& rPath, const String& rSource, const S
meEC.SetContext( STR_HTMLEXP_ERROR_OPEN_FILE, rSource );
- ULONG nErr = 0;
+ sal_uLong nErr = 0;
SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ );
if( pIStm )
@@ -2944,7 +2944,7 @@ static const char * ASP_Scripts[] = { "common.inc", "webcast.asp", "show.asp", "
/** erzeugt und speichert die f�r WebShow ben�tigte ASP Scripte */
bool HtmlExport::CreateASPScripts()
{
- for( USHORT n = 0; n < (sizeof( ASP_Scripts ) / sizeof(char *)); n++ )
+ for( sal_uInt16 n = 0; n < (sizeof( ASP_Scripts ) / sizeof(char *)); n++ )
{
String aScript;
@@ -2965,7 +2965,7 @@ static const char *PERL_Scripts[] = { "webcast.pl", "common.pl", "editpic.pl", "
/** erzeugt und speichert die f�r WebShow ben�tigte PERL Scripte */
bool HtmlExport::CreatePERLScripts()
{
- for( USHORT n = 0; n < (sizeof( PERL_Scripts ) / sizeof(char *)); n++ )
+ for( sal_uInt16 n = 0; n < (sizeof( PERL_Scripts ) / sizeof(char *)); n++ )
{
String aScript;
aScript.AssignAscii( PERL_Scripts[n] );
@@ -2986,7 +2986,7 @@ bool HtmlExport::CreatePERLScripts()
bool HtmlExport::CreateImageFileList()
{
String aStr;
- for( USHORT nSdPage = 0; nSdPage < mnSdPageCount; nSdPage++)
+ for( sal_uInt16 nSdPage = 0; nSdPage < mnSdPageCount; nSdPage++)
{
aStr += String::CreateFromInt32( nSdPage + 1 );
aStr.Append(sal_Unicode(';'));
@@ -3014,7 +3014,7 @@ bool HtmlExport::CreateImageNumberFile()
meEC.SetContext( STR_HTMLEXP_ERROR_CREATE_FILE, aFileName );
EasyFile aFile;
SvStream* pStr;
- ULONG nErr = aFile.createStream(aFull, pStr);
+ sal_uLong nErr = aFile.createStream(aFull, pStr);
if(nErr == 0)
{
*pStr << (const char *)"1";
@@ -3185,9 +3185,9 @@ EasyFile::~EasyFile()
}
// =====================================================================
-ULONG EasyFile::createStream( const String& rUrl, SvStream* &rpStr )
+sal_uLong EasyFile::createStream( const String& rUrl, SvStream* &rpStr )
{
- ULONG nErr = 0;
+ sal_uLong nErr = 0;
if(bOpen)
nErr = close();
@@ -3225,9 +3225,9 @@ ULONG EasyFile::createStream( const String& rUrl, SvStream* &rpStr )
}
// =====================================================================
-ULONG EasyFile::createFileName( const String& rURL, String& rFileName )
+sal_uLong EasyFile::createFileName( const String& rURL, String& rFileName )
{
- ULONG nErr = 0;
+ sal_uLong nErr = 0;
if( bOpen )
nErr = close();
@@ -3250,9 +3250,9 @@ ULONG EasyFile::createFileName( const String& rURL, String& rFileName )
}
// =====================================================================
-ULONG EasyFile::close()
+sal_uLong EasyFile::close()
{
- ULONG nErr = 0;
+ sal_uLong nErr = 0;
delete pOStm;
pOStm = NULL;
@@ -3286,7 +3286,7 @@ HtmlErrorContext::HtmlErrorContext(Window *_pWin)
// =====================================================================
-BOOL HtmlErrorContext::GetString( ULONG, String& rCtxStr )
+sal_Bool HtmlErrorContext::GetString( sal_uLong, String& rCtxStr )
{
DBG_ASSERT( mnResId != 0, "No error context set" );
if( mnResId == 0 )
@@ -3302,7 +3302,7 @@ BOOL HtmlErrorContext::GetString( ULONG, String& rCtxStr )
// =====================================================================
-void HtmlErrorContext::SetContext( USHORT nResId, const String& rURL )
+void HtmlErrorContext::SetContext( sal_uInt16 nResId, const String& rURL )
{
mnResId = nResId;
maURL1 = rURL;
@@ -3311,7 +3311,7 @@ void HtmlErrorContext::SetContext( USHORT nResId, const String& rURL )
// =====================================================================
-void HtmlErrorContext::SetContext( USHORT nResId, const String& rURL1, const String& rURL2 )
+void HtmlErrorContext::SetContext( sal_uInt16 nResId, const String& rURL1, const String& rURL2 )
{
mnResId = nResId;
maURL1 = rURL1;
diff --git a/sd/source/filter/html/htmlex.hxx b/sd/source/filter/html/htmlex.hxx
index fd5a30fa2f0c..31ae7ba80175 100644
--- a/sd/source/filter/html/htmlex.hxx
+++ b/sd/source/filter/html/htmlex.hxx
@@ -77,7 +77,7 @@ class View;
class HtmlErrorContext : public ErrorContext
{
private:
- USHORT mnResId;
+ sal_uInt16 mnResId;
String maURL1;
String maURL2;
@@ -85,10 +85,10 @@ public:
HtmlErrorContext(Window *pWin=0);
~HtmlErrorContext() {};
- virtual BOOL GetString( ULONG nErrId, String& rCtxStr );
+ virtual sal_Bool GetString( sal_uLong nErrId, String& rCtxStr );
- void SetContext( USHORT nResId, const String& rURL );
- void SetContext( USHORT nResId, const String& rURL1, const String& rURL2 );
+ void SetContext( sal_uInt16 nResId, const String& rURL );
+ void SetContext( sal_uInt16 nResId, const String& rURL1, const String& rURL2 );
};
// =====================================================================
@@ -109,12 +109,12 @@ class HtmlExport
HtmlPublishMode meMode;
SfxProgress* mpProgress;
bool mbImpress;
- USHORT mnSdPageCount;
- USHORT mnPagesWritten;
+ sal_uInt16 mnSdPageCount;
+ sal_uInt16 mnPagesWritten;
bool mbContentsPage;
- INT16 mnButtonThema;
- UINT16 mnWidthPixel;
- UINT16 mnHeightPixel;
+ sal_Int16 mnButtonThema;
+ sal_uInt16 mnWidthPixel;
+ sal_uInt16 mnHeightPixel;
PublishingFormat meFormat;
bool mbHeader;
bool mbNotes;
@@ -125,14 +125,14 @@ class HtmlExport
String maAuthor;
String maHomePage;
String maInfo;
- INT16 mnCompression;
+ sal_Int16 mnCompression;
String maDocFileName;
String maFramePage;
String mDocTitle;
bool mbDownload;
bool mbAutoSlide;
- UINT32 mnSlideDuration;
+ sal_uInt32 mnSlideDuration;
bool mbSlideSound;
bool mbHiddenSlides;
bool mbEndless;
@@ -190,30 +190,30 @@ class HtmlExport
String CreateLink( const String& aLink, const String& aText,
const String& aTarget = String()) const;
- String CreateImage( const String& aImage, const String& aAltText, INT16 nWidth = -1, INT16 nHeight = -1 ) const;
- String CreateNavBar( USHORT nSdPage, bool bIsText ) const;
+ String CreateImage( const String& aImage, const String& aAltText, sal_Int16 nWidth = -1, sal_Int16 nHeight = -1 ) const;
+ String CreateNavBar( sal_uInt16 nSdPage, bool bIsText ) const;
String CreateBodyTag() const;
- String ParagraphToHTMLString( SdrOutliner* pOutliner, ULONG nPara, const Color& rBackgroundColor );
+ String ParagraphToHTMLString( SdrOutliner* pOutliner, sal_uLong nPara, const Color& rBackgroundColor );
String TextAttribToHTMLString( SfxItemSet* pSet, HtmlState* pState, const Color& rBackgroundColor );
String CreateTextForTitle( SdrOutliner* pOutliner, SdPage* pPage, const Color& rBackgroundColor );
String CreateTextForPage( SdrOutliner* pOutliner, SdPage* pPage, bool bHeadLine, const Color& rBackgroundColor );
String CreateTextForNotesPage( SdrOutliner* pOutliner, SdPage* pPage, bool bHeadLine, const Color& rBackgroundColor );
- String CreateHTMLCircleArea( ULONG nRadius, ULONG nCenterX,
- ULONG nCenterY, const String& rHRef ) const;
+ String CreateHTMLCircleArea( sal_uLong nRadius, sal_uLong nCenterX,
+ sal_uLong nCenterY, const String& rHRef ) const;
String CreateHTMLPolygonArea( const ::basegfx::B2DPolyPolygon& rPolyPoly, Size aShift, double fFactor, const String& rHRef ) const;
String CreateHTMLRectArea( const Rectangle& rRect,
const String& rHRef ) const;
- String CreatePageURL( USHORT nPgNum );
+ String CreatePageURL( sal_uInt16 nPgNum );
String InsertSound( const String& rSoundFile );
bool CopyFile( const String& rSourceFile, const String& rDestPath );
bool CopyScript( const String& rPath, const String& rSource, const String& rDest, bool bUnix = false );
- void InitProgress( USHORT nProgrCount );
+ void InitProgress( sal_uInt16 nProgrCount );
void ResetProgress();
String WriteMetaCharset() const;
diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx
index f44c5f124992..07f44ce83aa4 100644
--- a/sd/source/filter/html/pubdlg.cxx
+++ b/sd/source/filter/html/pubdlg.cxx
@@ -76,13 +76,13 @@ using ::rtl::OUString;
extern void InterpolateFixedBitmap( FixedBitmap * pBitmap );
// Kennung fuer die Config Datei mit den Html Einstellungen
-const UINT16 nMagic = (UINT16)0x1977;
+const sal_uInt16 nMagic = (sal_uInt16)0x1977;
// Key fuer die soffice.ini
#define KEY_QUALITY "JPG-EXPORT-QUALITY"
// Die Help Ids der einzelnen Seiten
-ULONG aPageHelpIds[NOOFPAGES] =
+const char* aPageHelpIds[NOOFPAGES] =
{
HID_SD_HTMLEXPORT_PAGE1,
HID_SD_HTMLEXPORT_PAGE2,
@@ -108,39 +108,39 @@ public:
String m_aURL;
// special Kiosk options
- BOOL m_bAutoSlide;
- UINT32 m_nSlideDuration;
- BOOL m_bEndless;
+ sal_Bool m_bAutoSlide;
+ sal_uInt32 m_nSlideDuration;
+ sal_Bool m_bEndless;
// special HTML options
- BOOL m_bContentPage;
- BOOL m_bNotes;
+ sal_Bool m_bContentPage;
+ sal_Bool m_bNotes;
// misc options
- UINT16 m_nResolution;
+ sal_uInt16 m_nResolution;
String m_aCompression;
PublishingFormat m_eFormat;
- BOOL m_bSlideSound;
- BOOL m_bHiddenSlides;
+ sal_Bool m_bSlideSound;
+ sal_Bool m_bHiddenSlides;
// titel page information
String m_aAuthor;
String m_aEMail;
String m_aWWW;
String m_aMisc;
- BOOL m_bDownload;
- BOOL m_bCreated; // not used
+ sal_Bool m_bDownload;
+ sal_Bool m_bCreated; // not used
// buttons and colorscheme
- INT16 m_nButtonThema;
- BOOL m_bUserAttr;
+ sal_Int16 m_nButtonThema;
+ sal_Bool m_bUserAttr;
Color m_aBackColor;
Color m_aTextColor;
Color m_aLinkColor;
Color m_aVLinkColor;
Color m_aALinkColor;
- BOOL m_bUseAttribs;
- BOOL m_bUseColor;
+ sal_Bool m_bUseAttribs;
+ sal_Bool m_bUseColor;
SdPublishingDesign();
@@ -155,8 +155,8 @@ public:
SdPublishingDesign::SdPublishingDesign()
{
m_eMode = PUBLISH_HTML;
- m_bContentPage = TRUE;
- m_bNotes = TRUE;
+ m_bContentPage = sal_True;
+ m_bNotes = sal_True;
m_eFormat = FORMAT_PNG;
@@ -174,12 +174,12 @@ SdPublishingDesign::SdPublishingDesign()
m_aAuthor += sal_Unicode(' ');
m_aAuthor += (String)aUserOptions.GetLastName();
m_aEMail = aUserOptions.GetEmail();
- m_bDownload = FALSE;
+ m_bDownload = sal_False;
m_nButtonThema = -1;
- m_bUserAttr = FALSE;
- m_bUseAttribs = TRUE;
- m_bUseColor = TRUE;
+ m_bUserAttr = sal_False;
+ m_bUseAttribs = sal_True;
+ m_bUseColor = sal_True;
m_aBackColor = COL_WHITE;
m_aTextColor = COL_BLACK;
@@ -189,12 +189,12 @@ SdPublishingDesign::SdPublishingDesign()
m_eScript = SCRIPT_ASP;
- m_bAutoSlide = TRUE;
+ m_bAutoSlide = sal_True;
m_nSlideDuration = 15;
- m_bEndless = TRUE;
+ m_bEndless = sal_True;
- m_bSlideSound = TRUE;
- m_bHiddenSlides = FALSE;
+ m_bSlideSound = sal_True;
+ m_bHiddenSlides = sal_False;
}
// =====================================================================
@@ -268,7 +268,7 @@ SvStream& operator >> (SvStream& rIn, SdPublishingDesign& rDesign)
{
SdIOCompat aIO(rIn, STREAM_READ);
- UINT16 nTemp16;
+ sal_uInt16 nTemp16;
rIn.ReadByteString( rDesign.m_aDesignName, RTL_TEXTENCODING_UTF8 );
rIn >> nTemp16;
@@ -320,12 +320,12 @@ SvStream& operator << (SvStream& rOut, const SdPublishingDesign& rDesign)
// Name
rOut.WriteByteString( rDesign.m_aDesignName, RTL_TEXTENCODING_UTF8 );
- rOut << (UINT16)rDesign.m_eMode;
+ rOut << (sal_uInt16)rDesign.m_eMode;
rOut << rDesign.m_bContentPage;
rOut << rDesign.m_bNotes;
rOut << rDesign.m_nResolution;
rOut.WriteByteString( rDesign.m_aCompression, RTL_TEXTENCODING_UTF8 );
- rOut << (UINT16)rDesign.m_eFormat;
+ rOut << (sal_uInt16)rDesign.m_eFormat;
rOut.WriteByteString( rDesign.m_aAuthor, RTL_TEXTENCODING_UTF8 );
rOut.WriteByteString( rDesign.m_aEMail, RTL_TEXTENCODING_UTF8 );
rOut.WriteByteString( rDesign.m_aWWW, RTL_TEXTENCODING_UTF8 );
@@ -342,7 +342,7 @@ SvStream& operator << (SvStream& rOut, const SdPublishingDesign& rDesign)
rOut << rDesign.m_bUseAttribs;
rOut << rDesign.m_bUseColor;
- rOut << (UINT16)rDesign.m_eScript;
+ rOut << (sal_uInt16)rDesign.m_eScript;
rOut.WriteByteString( rDesign.m_aURL, RTL_TEXTENCODING_UTF8 );
rOut.WriteByteString( rDesign.m_aCGI, RTL_TEXTENCODING_UTF8 );
@@ -389,8 +389,8 @@ SdPublishingDlg::SdPublishingDlg(Window* pWindow, DocumentType eDocType)
, aNextPageButton(this,SdResId(BUT_NEXT))
, aFinishButton(this,SdResId(BUT_FINISH))
, aAssistentFunc(NOOFPAGES)
-, m_bButtonsDirty(TRUE)
-, m_bDesignListDirty(FALSE)
+, m_bButtonsDirty(sal_True)
+, m_bDesignListDirty(sal_False)
, m_pDesign(NULL)
{
m_bImpress = eDocType == DOCUMENT_TYPE_IMPRESS;
@@ -433,7 +433,7 @@ SdPublishingDlg::SdPublishingDlg(Window* pWindow, DocumentType eDocType)
pPage3_Png->SetClickHdl(LINK(this,SdPublishingDlg, GfxFormatHdl));
pPage3_Gif->SetClickHdl(LINK(this,SdPublishingDlg, GfxFormatHdl));
pPage3_Jpg->SetClickHdl(LINK(this,SdPublishingDlg, GfxFormatHdl));
- pPage3_Quality->Enable(FALSE);
+ pPage3_Quality->Enable(sal_False);
pPage3_Resolution_1->SetClickHdl(LINK(this,SdPublishingDlg, ResolutionHdl ));
pPage3_Resolution_2->SetClickHdl(LINK(this,SdPublishingDlg, ResolutionHdl ));
@@ -465,7 +465,7 @@ SdPublishingDlg::SdPublishingDlg(Window* pWindow, DocumentType eDocType)
pPage5_Buttons->SetLineCount( 4 );
pPage5_Buttons->SetExtraSpacing( 1 );
- for( UINT16 nIndex = 0; nIndex < m_pDesignList->Count(); nIndex++ )
+ for( sal_uInt16 nIndex = 0; nIndex < m_pDesignList->Count(); nIndex++ )
{
SdPublishingDesign *pDesign = (SdPublishingDesign*)
m_pDesignList->GetObject(nIndex);
@@ -489,7 +489,7 @@ SdPublishingDlg::~SdPublishingDlg()
{
if( m_pDesignList )
{
- for( UINT16 nIndex = 0; nIndex < m_pDesignList->Count(); nIndex++ )
+ for( sal_uInt16 nIndex = 0; nIndex < m_pDesignList->Count(); nIndex++ )
delete (SdPublishingDesign*)m_pDesignList->GetObject(nIndex);
}
@@ -790,8 +790,8 @@ void SdPublishingDlg::SetDefaults()
SdPublishingDesign aDefault;
SetDesign(&aDefault);
- pPage1_NewDesign->Check(TRUE);
- pPage1_OldDesign->Check(FALSE);
+ pPage1_NewDesign->Check(sal_True);
+ pPage1_OldDesign->Check(sal_False);
UpdatePage();
}
@@ -978,8 +978,8 @@ IMPL_LINK( SdPublishingDlg, DesignHdl, RadioButton *, pButton )
{
if(pButton == pPage1_NewDesign)
{
- pPage1_NewDesign->Check(TRUE); // wegen DesignDeleteHdl
- pPage1_OldDesign->Check(FALSE);
+ pPage1_NewDesign->Check(sal_True); // wegen DesignDeleteHdl
+ pPage1_OldDesign->Check(sal_False);
pPage1_Designs->Disable();
pPage1_DelDesign->Disable();
m_pDesign = NULL;
@@ -989,14 +989,14 @@ IMPL_LINK( SdPublishingDlg, DesignHdl, RadioButton *, pButton )
}
else
{
- pPage1_NewDesign->Check(FALSE);
+ pPage1_NewDesign->Check(sal_False);
pPage1_Designs->Enable();
pPage1_DelDesign->Enable();
if(pPage1_Designs->GetSelectEntryCount() == 0)
pPage1_Designs->SelectEntryPos(0);
- USHORT nPos = pPage1_Designs->GetSelectEntryPos();
+ sal_uInt16 nPos = pPage1_Designs->GetSelectEntryPos();
m_pDesign = (SdPublishingDesign*)m_pDesignList->GetObject(nPos);
DBG_ASSERT(m_pDesign, "Kein Design? Das darf nicht sein! (CL)");
@@ -1012,7 +1012,7 @@ IMPL_LINK( SdPublishingDlg, DesignHdl, RadioButton *, pButton )
// =====================================================================
IMPL_LINK( SdPublishingDlg, DesignSelectHdl, ListBox *, EMPTYARG )
{
- USHORT nPos = pPage1_Designs->GetSelectEntryPos();
+ sal_uInt16 nPos = pPage1_Designs->GetSelectEntryPos();
m_pDesign = (SdPublishingDesign*)m_pDesignList->GetObject(nPos);
DBG_ASSERT(m_pDesign, "Kein Design? Das darf nicht sein! (CL)");
@@ -1029,7 +1029,7 @@ IMPL_LINK( SdPublishingDlg, DesignSelectHdl, ListBox *, EMPTYARG )
// =====================================================================
IMPL_LINK( SdPublishingDlg, DesignDeleteHdl, PushButton *, EMPTYARG )
{
- USHORT nPos = pPage1_Designs->GetSelectEntryPos();
+ sal_uInt16 nPos = pPage1_Designs->GetSelectEntryPos();
SdPublishingDesign* pDesign = (SdPublishingDesign*)
m_pDesignList->GetObject(nPos);
DBG_ASSERT(pDesign, "Kein Design? Das darf nicht sein! (CL)");
@@ -1045,7 +1045,7 @@ IMPL_LINK( SdPublishingDlg, DesignDeleteHdl, PushButton *, EMPTYARG )
delete pDesign;
- m_bDesignListDirty = TRUE;
+ m_bDesignListDirty = sal_True;
UpdatePage();
@@ -1053,11 +1053,11 @@ IMPL_LINK( SdPublishingDlg, DesignDeleteHdl, PushButton *, EMPTYARG )
}
// =====================================================================
-// Clickhandler fuer das ndern des Servertyps
+// Clickhandler fuer das �ndern des Servertyps
// =====================================================================
IMPL_LINK( SdPublishingDlg, WebServerHdl, RadioButton *, pButton )
{
- BOOL bASP = pButton == pPage2_ASP;
+ sal_Bool bASP = pButton == pPage2_ASP;
pPage2_ASP->Check( bASP );
pPage2_PERL->Check( !bASP );
@@ -1130,7 +1130,7 @@ IMPL_LINK( SdPublishingDlg, ResolutionHdl, RadioButton *, pButton )
IMPL_LINK( SdPublishingDlg, ButtonsHdl, ValueSet *, EMPTYARG )
{
// wird eine Bitmap Schaltflaeche gewaehlt, TexOnly ausschalten
- pPage5_TextOnly->Check(FALSE);
+ pPage5_TextOnly->Check(sal_False);
return 0;
}
@@ -1172,7 +1172,7 @@ IMPL_LINK( SdPublishingDlg, ColorHdl, PushButton *, pButton)
m_aALinkColor = aDlg.GetColor();
}
- pPage6_User->Check(TRUE);
+ pPage6_User->Check(sal_True);
pPage6_Preview->SetColors( m_aBackColor, m_aTextColor, m_aLinkColor,
m_aVLinkColor, m_aALinkColor );
pPage6_Preview->Invalidate();
@@ -1194,19 +1194,19 @@ IMPL_LINK( SdPublishingDlg, FinishHdl, OKButton *, EMPTYARG )
SdPublishingDesign* pDesign = new SdPublishingDesign();
GetDesign(pDesign);
- BOOL bSave = FALSE;
+ sal_Bool bSave = sal_False;
if(pPage1_OldDesign->IsChecked() && m_pDesign)
{
// aenderungen??
if(!(*pDesign == *m_pDesign))
- bSave = TRUE;
+ bSave = sal_True;
}
else
{
SdPublishingDesign aDefaultDesign;
if(!(aDefaultDesign == *pDesign))
- bSave = TRUE;
+ bSave = sal_True;
}
if(bSave)
@@ -1215,10 +1215,10 @@ IMPL_LINK( SdPublishingDlg, FinishHdl, OKButton *, EMPTYARG )
if(m_pDesign)
aName = m_pDesign->m_aDesignName;
- BOOL bRetry;
+ sal_Bool bRetry;
do
{
- bRetry = FALSE;
+ bRetry = sal_False;
SdDesignNameDlg aDlg(this, aName );
@@ -1227,7 +1227,7 @@ IMPL_LINK( SdPublishingDlg, FinishHdl, OKButton *, EMPTYARG )
pDesign->m_aDesignName = aDlg.GetDesignName();
SdPublishingDesign* pSameNameDes = NULL;
- UINT16 nIndex;
+ sal_uInt16 nIndex;
for( nIndex = 0; nIndex < m_pDesignList->Count(); nIndex++ )
{
pSameNameDes = (SdPublishingDesign*)
@@ -1252,7 +1252,7 @@ IMPL_LINK( SdPublishingDlg, FinishHdl, OKButton *, EMPTYARG )
if(!bRetry)
{
m_pDesignList->Insert(pDesign);
- m_bDesignListDirty = TRUE;
+ m_bDesignListDirty = sal_True;
pDesign = NULL;
}
}
@@ -1322,7 +1322,7 @@ void SdPublishingDlg::UpdatePage()
pPage2_Index_txt->Show();
pPage2_Index->Show();
- BOOL bPerl = pPage2_PERL->IsChecked();
+ sal_Bool bPerl = pPage2_PERL->IsChecked();
pPage2_Index->Enable(bPerl);
pPage2_Index_txt->Enable(bPerl);
pPage2_URL_txt->Enable(bPerl);
@@ -1351,7 +1351,7 @@ void SdPublishingDlg::UpdatePage()
pPage2_Duration_txt->Show();
pPage2_Duration->Show();
pPage2_Endless->Show();
- BOOL bAuto = pPage2_ChgAuto->IsChecked();
+ sal_Bool bAuto = pPage2_ChgAuto->IsChecked();
pPage2_Duration->Enable(bAuto);
pPage2_Endless->Enable(bAuto);
}
@@ -1429,14 +1429,14 @@ void SdPublishingDlg::LoadPreviewButtons()
{
if( mpButtonSet->getPreview( nSet, aButtonNames, aImage ) )
{
- pPage5_Buttons->InsertItem( (USHORT)nSet+1, aImage );
+ pPage5_Buttons->InsertItem( (sal_uInt16)nSet+1, aImage );
if( nHeight < aImage.GetSizePixel().Height() )
nHeight = aImage.GetSizePixel().Height();
}
}
pPage5_Buttons->SetItemHeight( nHeight );
- m_bButtonsDirty = FALSE;
+ m_bButtonsDirty = sal_False;
}
}
@@ -1568,7 +1568,7 @@ void SdPublishingDlg::GetDesign( SdPublishingDesign* pDesign )
pDesign->m_aEMail = pPage4_Email->GetText();
pDesign->m_aWWW = pPage4_WWW->GetText();
pDesign->m_aMisc = pPage4_Misc->GetText();
- pDesign->m_bDownload = m_bImpress?pPage4_Download->IsChecked():FALSE;
+ pDesign->m_bDownload = m_bImpress?pPage4_Download->IsChecked():sal_False;
if(pPage5_TextOnly->IsChecked())
pDesign->m_nButtonThema = -1;
@@ -1589,7 +1589,7 @@ void SdPublishingDlg::GetDesign( SdPublishingDesign* pDesign )
pDesign->m_aURL = pPage2_URL->GetText();
pDesign->m_bAutoSlide = pPage2_ChgAuto->IsChecked();
- pDesign->m_nSlideDuration = (UINT32)pPage2_Duration->GetTime().GetMSFromTime() / 1000;
+ pDesign->m_nSlideDuration = (sal_uInt32)pPage2_Duration->GetTime().GetMSFromTime() / 1000;
pDesign->m_bEndless = pPage2_Endless->IsChecked();
}
@@ -1606,9 +1606,9 @@ IMPL_LINK( SdPublishingDlg, LastPageHdl, PushButton *, EMPTYARG )
// =====================================================================
// Designs laden
// =====================================================================
-BOOL SdPublishingDlg::Load()
+sal_Bool SdPublishingDlg::Load()
{
- m_bDesignListDirty = FALSE;
+ m_bDesignListDirty = sal_False;
m_pDesignList = new List();
@@ -1629,25 +1629,25 @@ BOOL SdPublishingDlg::Load()
return sal_False;
}
- SfxMedium aMedium( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ | STREAM_NOCREATE, TRUE );
+ SfxMedium aMedium( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ | STREAM_NOCREATE, sal_True );
SvStream* pStream = aMedium.GetInStream();
if( !pStream )
- return( FALSE );
+ return( sal_False );
- UINT16 aCheck;
+ sal_uInt16 aCheck;
*pStream >> aCheck;
if(aCheck != nMagic)
- return FALSE;
+ return sal_False;
SdIOCompat aIO(*pStream, STREAM_READ);
- UINT16 nDesigns;
+ sal_uInt16 nDesigns;
*pStream >> nDesigns;
- for( UINT16 nIndex = 0;
+ for( sal_uInt16 nIndex = 0;
pStream->GetError() == SVSTREAM_OK && nIndex < nDesigns;
nIndex++ )
{
@@ -1663,29 +1663,29 @@ BOOL SdPublishingDlg::Load()
// =====================================================================
// Designs speichern
// =====================================================================
-BOOL SdPublishingDlg::Save()
+sal_Bool SdPublishingDlg::Save()
{
INetURLObject aURL( SvtPathOptions().GetUserConfigPath() );
aURL.Append( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "designs.sod" ) ) );
- SfxMedium aMedium( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE | STREAM_TRUNC, FALSE );
+ SfxMedium aMedium( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE | STREAM_TRUNC, sal_False );
aMedium.IsRemote();
SvStream* pStream = aMedium.GetOutStream();
if( !pStream )
- return( FALSE );
+ return( sal_False );
- UINT16 aCheck = nMagic;
+ sal_uInt16 aCheck = nMagic;
*pStream << aCheck;
// damit SdIOCompat vor dem Stream destruiert wird
{
SdIOCompat aIO(*pStream, STREAM_WRITE, 0);
- UINT16 nDesigns = (UINT16) m_pDesignList->Count();
+ sal_uInt16 nDesigns = (sal_uInt16) m_pDesignList->Count();
*pStream << nDesigns;
- for( UINT16 nIndex = 0;
+ for( sal_uInt16 nIndex = 0;
pStream->GetError() == SVSTREAM_OK && nIndex < nDesigns;
nIndex++ )
{
diff --git a/sd/source/filter/html/pubdlg.src b/sd/source/filter/html/pubdlg.src
index 00e9b4af75e4..9aabf8f5e971 100644
--- a/sd/source/filter/html/pubdlg.src
+++ b/sd/source/filter/html/pubdlg.src
@@ -30,6 +30,7 @@
ModalDialog DLG_PUBLISHING
{
+ HelpID = "sd:ModalDialog:DLG_PUBLISHING";
OutputSize = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT ( 272 , 190 ) ;
@@ -59,6 +60,7 @@ ModalDialog DLG_PUBLISHING
RadioButton PAGE1_NEW_DESIGN
{
+ HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE1_NEW_DESIGN";
Pos = MAP_APPFONT( 12, 50 );
Size = MAP_APPFONT( 153, 10 );
Text [ en-US ] = "New design";
@@ -66,6 +68,7 @@ ModalDialog DLG_PUBLISHING
RadioButton PAGE1_OLD_DESIGN
{
+ HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE1_OLD_DESIGN";
Pos = MAP_APPFONT( 12, 63 );
Size = MAP_APPFONT( 153, 10 );
Text [ en-US ] = "Existing design";
@@ -73,6 +76,7 @@ ModalDialog DLG_PUBLISHING
ListBox PAGE1_DESIGNS
{
+ HelpID = "sd:ListBox:DLG_PUBLISHING:PAGE1_DESIGNS";
Border = TRUE ;
Pos = MAP_APPFONT ( 21 , 75 ) ;
Size = MAP_APPFONT ( 144 , 63 ) ;
@@ -82,6 +86,7 @@ ModalDialog DLG_PUBLISHING
PushButton PAGE1_DEL_DESIGN
{
+ HelpID = "sd:PushButton:DLG_PUBLISHING:PAGE1_DEL_DESIGN";
Pos = MAP_APPFONT ( 168 , 75 ) ;
Size = MAP_APPFONT ( 92 , 14 ) ;
TabStop = TRUE ;
@@ -120,6 +125,7 @@ ModalDialog DLG_PUBLISHING
RadioButton PAGE2_STANDARD
{
+ HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE2_STANDARD";
Pos = MAP_APPFONT( 12, 50 );
Size = MAP_APPFONT( 116, 10 );
Text [ en-US ] = "Standard H~TML format";
@@ -127,6 +133,7 @@ ModalDialog DLG_PUBLISHING
RadioButton PAGE2_FRAMES
{
+ HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE2_FRAMES";
Pos = MAP_APPFONT( 12, 63 );
Size = MAP_APPFONT( 116, 10 );
Text [ en-US ] = "Standard HTML with ~frames";
@@ -134,6 +141,7 @@ ModalDialog DLG_PUBLISHING
RadioButton PAGE2_KIOSK
{
+ HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE2_KIOSK";
Pos = MAP_APPFONT( 12, 76 );
Size = MAP_APPFONT( 116, 10 );
Text [ en-US ] = "~Automatic";
@@ -141,6 +149,7 @@ ModalDialog DLG_PUBLISHING
RadioButton PAGE2_WEBCAST
{
+ HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE2_WEBCAST";
Pos = MAP_APPFONT( 12, 89 );
Size = MAP_APPFONT( 116, 10 );
Text [ en-US ] = "~WebCast";
@@ -199,6 +208,7 @@ ModalDialog DLG_PUBLISHING
CheckBox PAGE2_CONTENT
{
+ HelpID = "sd:CheckBox:DLG_PUBLISHING:PAGE2_CONTENT";
Pos = MAP_APPFONT( 144, 49 );
Size = MAP_APPFONT( 116, 10 );
Text [ en-US ] = "Create title page";
@@ -213,6 +223,7 @@ ModalDialog DLG_PUBLISHING
CheckBox PAGE2_NOTES
{
+ HelpID = "sd:CheckBox:DLG_PUBLISHING:PAGE2_NOTES";
Pos = MAP_APPFONT( 144, 63 );
Size = MAP_APPFONT( 116, 10 );
Text [ en-US ] = "Show notes";
@@ -231,6 +242,7 @@ ModalDialog DLG_PUBLISHING
RadioButton PAGE2_CHG_DEFAULT
{
+ HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE2_CHG_DEFAULT";
Pos = MAP_APPFONT ( 144 , 49 ) ;
Size = MAP_APPFONT ( 116 , 10 ) ;
TabStop = TRUE ;
@@ -239,6 +251,7 @@ ModalDialog DLG_PUBLISHING
RadioButton PAGE2_CHG_AUTO
{
+ HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE2_CHG_AUTO";
Pos = MAP_APPFONT ( 144 , 63 ) ;
Size = MAP_APPFONT ( 116 , 10 ) ;
TabStop = TRUE ;
@@ -254,6 +267,7 @@ ModalDialog DLG_PUBLISHING
TimeField PAGE2_DURATION_TMF
{
+ HelpID = "sd:TimeField:DLG_PUBLISHING:PAGE2_DURATION_TMF";
Pos = MAP_APPFONT ( 196, 76 ) ;
Size = MAP_APPFONT ( 48, 12 ) ;
Border = TRUE ;
@@ -279,6 +293,7 @@ ModalDialog DLG_PUBLISHING
CheckBox PAGE2_ENDLESS
{
+ HelpID = "sd:CheckBox:DLG_PUBLISHING:PAGE2_ENDLESS";
Pos = MAP_APPFONT ( 154, 91 );
Size = MAP_APPFONT ( 108, 10 );
Text [ en-US ] = "~Endless" ;
@@ -297,6 +312,7 @@ ModalDialog DLG_PUBLISHING
RadioButton PAGE2_ASP
{
+ HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE2_ASP";
Pos = MAP_APPFONT( 144, 49 );
Size = MAP_APPFONT( 116, 10 );
Text [ en-US ] = "~Active Server Pages (ASP)";
@@ -304,6 +320,7 @@ ModalDialog DLG_PUBLISHING
RadioButton PAGE2_PERL
{
+ HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE2_PERL";
Pos = MAP_APPFONT( 144, 63 );
Size = MAP_APPFONT( 116, 10 );
Text [ en-US ] = "Perl" ;
@@ -318,6 +335,7 @@ ModalDialog DLG_PUBLISHING
Edit PAGE2_INDEX
{
+ HelpID = "sd:Edit:DLG_PUBLISHING:PAGE2_INDEX";
BORDER = TRUE;
Pos = MAP_APPFONT( 154, 88 );
Size = MAP_APPFONT( 105, 12 );
@@ -333,6 +351,7 @@ ModalDialog DLG_PUBLISHING
Edit PAGE2_URL
{
+ HelpID = "sd:Edit:DLG_PUBLISHING:PAGE2_URL";
BORDER = TRUE;
Pos = MAP_APPFONT( 154, 116 );
Size = MAP_APPFONT( 105, 12 );
@@ -348,6 +367,7 @@ ModalDialog DLG_PUBLISHING
Edit PAGE2_CGI
{
+ HelpID = "sd:Edit:DLG_PUBLISHING:PAGE2_CGI";
BORDER = TRUE;
Pos = MAP_APPFONT( 154, 144 );
Size = MAP_APPFONT( 105, 12 );
@@ -382,6 +402,7 @@ ModalDialog DLG_PUBLISHING
RadioButton PAGE3_PNG
{
+ HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE3_PNG";
Pos = MAP_APPFONT( 12, 49 );
Size = MAP_APPFONT( 116, 10 );
Text [ en-US ] = "~PNG";
@@ -389,6 +410,7 @@ ModalDialog DLG_PUBLISHING
RadioButton PAGE3_GIF
{
+ HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE3_GIF";
Pos = MAP_APPFONT( 12, 63 );
Size = MAP_APPFONT( 116, 10 );
Text [ en-US ] = "~GIF";
@@ -396,6 +418,7 @@ ModalDialog DLG_PUBLISHING
RadioButton PAGE3_JPG
{
+ HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE3_JPG";
Pos = MAP_APPFONT( 12, 77 );
Size = MAP_APPFONT( 116, 10 );
Text [ en-US ] = "~JPG";
@@ -403,6 +426,7 @@ ModalDialog DLG_PUBLISHING
ComboBox PAGE3_QUALITY
{
+ HelpID = "sd:ComboBox:DLG_PUBLISHING:PAGE3_QUALITY";
Pos = MAP_APPFONT( 18, 91 );
Size = MAP_APPFONT( 28, 70 );
TabStop = TRUE ;
@@ -436,6 +460,7 @@ ModalDialog DLG_PUBLISHING
RadioButton PAGE3_RESOLUTION_1
{
+ HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE3_RESOLUTION_1";
Pos = MAP_APPFONT( 144, 49 );
Size = MAP_APPFONT( 116, 10 );
Text [ en-US ] = "Low resolution (~640x480 pixels)";
@@ -443,6 +468,7 @@ ModalDialog DLG_PUBLISHING
RadioButton PAGE3_RESOLUTION_2
{
+ HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE3_RESOLUTION_2";
Pos = MAP_APPFONT( 144, 63 );
Size = MAP_APPFONT( 116, 10 );
Text [ en-US ] = "Medium resolution (~800x600 pixels)";
@@ -450,6 +476,7 @@ ModalDialog DLG_PUBLISHING
RadioButton PAGE3_RESOLUTION_3
{
+ HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE3_RESOLUTION_3";
Pos = MAP_APPFONT ( 144, 77 ) ;
Size = MAP_APPFONT ( 116 , 10 ) ;
Text [ en-US ] = "High resolution (~1024x768 pixels)";
@@ -468,6 +495,7 @@ ModalDialog DLG_PUBLISHING
CheckBox PAGE3_SLD_SOUND
{
+ HelpID = "sd:CheckBox:DLG_PUBLISHING:PAGE3_SLD_SOUND";
Pos = MAP_APPFONT ( 12, 125 );
Size = MAP_APPFONT ( 252, 10 );
Text [ en-US ] = "~Export sounds when slide advances" ;
@@ -475,6 +503,7 @@ ModalDialog DLG_PUBLISHING
CheckBox PAGE3_HIDDEN_SLIDES
{
+ HelpID = "sd:CheckBox:DLG_PUBLISHING:PAGE3_HIDDEN_SLIDES";
Pos = MAP_APPFONT ( 12, 138 );
Size = MAP_APPFONT ( 252, 10 );
Text [ en-US ] = "Export ~hidden slides" ;
@@ -509,6 +538,7 @@ ModalDialog DLG_PUBLISHING
Edit PAGE4_AUTHOR
{
+ HelpID = "sd:Edit:DLG_PUBLISHING:PAGE4_AUTHOR";
BORDER = TRUE ;
Pos = MAP_APPFONT ( 136, 49 );
Size = MAP_APPFONT ( 128, 12 );
@@ -524,6 +554,7 @@ ModalDialog DLG_PUBLISHING
Edit PAGE4_EMAIL_EDIT
{
+ HelpID = "sd:Edit:DLG_PUBLISHING:PAGE4_EMAIL_EDIT";
BORDER = TRUE ;
Pos = MAP_APPFONT ( 136 , 65 ) ;
Size = MAP_APPFONT ( 128 , 12 ) ;
@@ -539,6 +570,7 @@ ModalDialog DLG_PUBLISHING
Edit PAGE4_WWW_EDIT
{
+ HelpID = "sd:Edit:DLG_PUBLISHING:PAGE4_WWW_EDIT";
BORDER = TRUE ;
Pos = MAP_APPFONT ( 136, 81 ) ;
Size = MAP_APPFONT ( 128, 12 ) ;
@@ -554,6 +586,7 @@ ModalDialog DLG_PUBLISHING
MultiLineEdit PAGE4_MISC
{
+ HelpID = "sd:MultiLineEdit:DLG_PUBLISHING:PAGE4_MISC";
Border = TRUE ;
Pos = MAP_APPFONT ( 136, 97 ) ;
Size = MAP_APPFONT ( 128 , 45 ) ;
@@ -564,6 +597,7 @@ ModalDialog DLG_PUBLISHING
CheckBox PAGE4_DOWNLOAD
{
+ HelpID = "sd:CheckBox:DLG_PUBLISHING:PAGE4_DOWNLOAD";
Pos = MAP_APPFONT ( 12 , 149 ) ;
Size = MAP_APPFONT ( 252 , 10 ) ;
TabStop = TRUE ;
@@ -572,6 +606,7 @@ ModalDialog DLG_PUBLISHING
CheckBox PAGE4_CREATED
{
+ HelpID = "sd:CheckBox:DLG_PUBLISHING:PAGE4_CREATED";
Pos = MAP_APPFONT ( 12 , 152 ) ;
Size = MAP_APPFONT ( 252 , 10 ) ;
TabStop = TRUE ;
@@ -600,6 +635,7 @@ ModalDialog DLG_PUBLISHING
CheckBox PAGE5_TEXTONLY
{
+ HelpID = "sd:CheckBox:DLG_PUBLISHING:PAGE5_TEXTONLY";
Pos = MAP_APPFONT ( 12, 50 );
Size = MAP_APPFONT ( 243, 10 );
Text [ en-US ] = "~Text only";
@@ -635,6 +671,7 @@ ModalDialog DLG_PUBLISHING
RadioButton PAGE6_DOCCOLORS
{
+ HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE6_DOCCOLORS";
Pos = MAP_APPFONT( 12, 50 );
Size = MAP_APPFONT( 246, 10 );
Text [ en-US ] = "~Apply color scheme from document";
@@ -642,6 +679,7 @@ ModalDialog DLG_PUBLISHING
RadioButton PAGE6_DEFAULT
{
+ HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE6_DEFAULT";
Pos = MAP_APPFONT( 12, 63 );
Size = MAP_APPFONT( 246, 10 );
Text [ en-US ] = "Use ~browser colors";
@@ -649,6 +687,7 @@ ModalDialog DLG_PUBLISHING
RadioButton PAGE6_USER
{
+ HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE6_USER";
Pos = MAP_APPFONT( 12, 76 );
Size = MAP_APPFONT( 246, 10 );
Text [ en-US ] = "~Use custom color scheme";
@@ -656,6 +695,7 @@ ModalDialog DLG_PUBLISHING
PushButton PAGE6_TEXT
{
+ HelpID = "sd:PushButton:DLG_PUBLISHING:PAGE6_TEXT";
Pos = MAP_APPFONT( 21, 89 );
Size = MAP_APPFONT( 72, 14 );
Text [ en-US ] = "Text";
@@ -663,6 +703,7 @@ ModalDialog DLG_PUBLISHING
PushButton PAGE6_LINK
{
+ HelpID = "sd:PushButton:DLG_PUBLISHING:PAGE6_LINK";
Pos = MAP_APPFONT( 21, 106 );
Size = MAP_APPFONT( 72, 14 );
Text [ en-US ] = "Hyper~link";
@@ -670,6 +711,7 @@ ModalDialog DLG_PUBLISHING
PushButton PAGE6_ALINK
{
+ HelpID = "sd:PushButton:DLG_PUBLISHING:PAGE6_ALINK";
Pos = MAP_APPFONT( 21, 123 );
Size = MAP_APPFONT( 72, 14 );
Text [ en-US ] = "Active Li~nk";
@@ -677,6 +719,7 @@ ModalDialog DLG_PUBLISHING
PushButton PAGE6_VLINK
{
+ HelpID = "sd:PushButton:DLG_PUBLISHING:PAGE6_VLINK";
Pos = MAP_APPFONT( 21, 140 );
Size = MAP_APPFONT( 72, 14 );
Text [ en-US ] = "~Visited Link";
@@ -691,6 +734,7 @@ ModalDialog DLG_PUBLISHING
PushButton PAGE6_BACK
{
+ HelpID = "sd:PushButton:DLG_PUBLISHING:PAGE6_BACK";
Pos = MAP_APPFONT( 199, 89 );
Size = MAP_APPFONT( 60, 14 );
Text [ en-US ] = "Bac~kground";
@@ -706,6 +750,7 @@ ModalDialog DLG_PUBLISHING
PushButton BUT_LAST
{
+ HelpID = "sd:PushButton:DLG_PUBLISHING:BUT_LAST";
OutputSize = TRUE ;
Pos = MAP_APPFONT ( 112 , 170 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
@@ -715,6 +760,7 @@ ModalDialog DLG_PUBLISHING
PushButton BUT_NEXT
{
+ HelpID = "sd:PushButton:DLG_PUBLISHING:BUT_NEXT";
DefButton = TRUE ;
OutputSize = TRUE ;
Pos = MAP_APPFONT ( 165 , 170 ) ;
@@ -758,6 +804,7 @@ ModalDialog DLG_DESIGNNAME
Edit EDT_NAME
{
+ HelpID = "sd:Edit:DLG_DESIGNNAME:EDT_NAME";
BORDER = TRUE ;
Pos = MAP_APPFONT ( 4, 4 );
Size = MAP_APPFONT ( 152, 14 );
diff --git a/sd/source/filter/ppt/ppt97animations.cxx b/sd/source/filter/ppt/ppt97animations.cxx
index 033e0e33604e..8836b1b4851d 100644
--- a/sd/source/filter/ppt/ppt97animations.cxx
+++ b/sd/source/filter/ppt/ppt97animations.cxx
@@ -165,7 +165,7 @@ bool Ppt97Animation::HasAfterEffect_DimAfterEffect() const
return m_aAtom.nAfterEffect == 3;
}
#endif
-UINT32 Ppt97Animation::GetSoundRef() const
+sal_uInt32 Ppt97Animation::GetSoundRef() const
{
return m_aAtom.nSoundRef;
}
diff --git a/sd/source/filter/ppt/ppt97animations.hxx b/sd/source/filter/ppt/ppt97animations.hxx
index 64e10250a53c..705f42978a50 100644
--- a/sd/source/filter/ppt/ppt97animations.hxx
+++ b/sd/source/filter/ppt/ppt97animations.hxx
@@ -41,22 +41,22 @@ class Ppt97AnimationInfoAtom
friend class Ppt97Animation;
//-- member
- UINT32 nDimColor;
- UINT32 nFlags; // 0x0004: time instead of click
- UINT32 nSoundRef;
- INT32 nDelayTime; // 1/1000 sec
- UINT16 nOrderID;
- UINT16 nSlideCount;
- UINT8 nBuildType;
- UINT8 nFlyMethod;
- UINT8 nFlyDirection;
- UINT8 nAfterEffect; //nAfterEffect: 0: none; 1: change color; 2: dim on next effect; 3: dim after effect;
- UINT8 nSubEffect;
- UINT8 nOLEVerb;
+ sal_uInt32 nDimColor;
+ sal_uInt32 nFlags; // 0x0004: time instead of click
+ sal_uInt32 nSoundRef;
+ sal_Int32 nDelayTime; // 1/1000 sec
+ sal_uInt16 nOrderID;
+ sal_uInt16 nSlideCount;
+ sal_uInt8 nBuildType;
+ sal_uInt8 nFlyMethod;
+ sal_uInt8 nFlyDirection;
+ sal_uInt8 nAfterEffect; //nAfterEffect: 0: none; 1: change color; 2: dim on next effect; 3: dim after effect;
+ sal_uInt8 nSubEffect;
+ sal_uInt8 nOLEVerb;
// unknown, because whole size needs to be 28
- UINT8 nUnknown1;
- UINT8 nUnknown2;
+ sal_uInt8 nUnknown1;
+ sal_uInt8 nUnknown2;
//-- methods
void ReadStream( SvStream& rIn );
@@ -107,7 +107,7 @@ public: //public methods
bool HasParagraphEffect() const;
bool HasSoundEffect() const;
sal_Int32 GetDimColor() const;
- UINT32 GetSoundRef() const;
+ sal_uInt32 GetSoundRef() const;
bool HasAnimateAssociatedShape() const; //true if the shape should be animated in addition to the text
//set methods
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index c63aaf9f07c0..6fc45cc710a4 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -156,7 +156,7 @@ SdPPTImport::SdPPTImport( SdDrawDocument* pDocument, SvStream& rDocStream, SvSto
SfxItemSet& rSet = pSheet->GetItemSet();
// if autokerning is set in style, override it, ppt has no autokerning
- if( rSet.GetItemState( EE_CHAR_PAIRKERNING, FALSE ) == SFX_ITEM_SET )
+ if( rSet.GetItemState( EE_CHAR_PAIRKERNING, sal_False ) == SFX_ITEM_SET )
rSet.ClearItem( EE_CHAR_PAIRKERNING );
}
}
@@ -178,7 +178,7 @@ ImplSdPPTImport::ImplSdPPTImport( SdDrawDocument* pDocument, SvStorage& rStorage
: SdrPowerPointImport ( rParam, rMedium.GetBaseURL() )
, mrMed ( rMedium )
, mrStorage ( rStorage_ )
-, mbDocumentFound ( FALSE )
+, mbDocumentFound ( sal_False )
, mnFilterOptions ( 0 )
{
mpDoc = pDocument;
@@ -186,22 +186,22 @@ ImplSdPPTImport::ImplSdPPTImport( SdDrawDocument* pDocument, SvStorage& rStorage
{
mbDocumentFound = SeekToDocument( &maDocHd ); // maDocHd = the latest DocumentHeader
while ( SeekToRec( rStCtrl, PPT_PST_Document, nStreamLen, &maDocHd ) )
- mbDocumentFound = TRUE;
+ mbDocumentFound = sal_True;
- UINT32 nDggContainerOfs = 0;
+ sal_uInt32 nDggContainerOfs = 0;
if ( mbDocumentFound )
{
- ULONG nPosMerk = rStCtrl.Tell();
+ sal_uLong nPosMerk = rStCtrl.Tell();
pStData = rStorage_.OpenSotStream( String( RTL_CONSTASCII_USTRINGPARAM( "Pictures" ) ), STREAM_STD_READ );
rStCtrl.Seek( maDocHd.GetRecBegFilePos() + 8 );
- ULONG nDocLen = maDocHd.GetRecEndFilePos();
+ sal_uLong nDocLen = maDocHd.GetRecEndFilePos();
DffRecordHeader aPPDGHd;
if ( SeekToRec( rStCtrl, PPT_PST_PPDrawingGroup, nDocLen, &aPPDGHd ) )
{
- ULONG nPPDGLen = aPPDGHd.GetRecEndFilePos();
+ sal_uLong nPPDGLen = aPPDGHd.GetRecEndFilePos();
if ( SeekToRec( rStCtrl, DFF_msofbtDggContainer, nPPDGLen, NULL ) )
nDggContainerOfs = rStCtrl.Tell();
}
@@ -253,7 +253,7 @@ ImplSdPPTImport::~ImplSdPPTImport()
sal_Bool ImplSdPPTImport::Import()
{
if ( !bOk )
- return FALSE;
+ return sal_False;
pSdrModel->setLock(true);
pSdrModel->EnableUndo(false);
@@ -265,8 +265,8 @@ sal_Bool ImplSdPPTImport::Import()
((EditEngine&)rOutl.GetEditEngine()).SetControlWord( nControlWord );
SdrLayerAdmin& rAdmin = mpDoc->GetLayerAdmin();
- mnBackgroundLayerID = rAdmin.GetLayerID( String( SdResId( STR_LAYER_BCKGRND )), FALSE );
- mnBackgroundObjectsLayerID = rAdmin.GetLayerID( String( SdResId( STR_LAYER_BCKGRNDOBJ )), FALSE );
+ mnBackgroundLayerID = rAdmin.GetLayerID( String( SdResId( STR_LAYER_BCKGRND )), sal_False );
+ mnBackgroundObjectsLayerID = rAdmin.GetLayerID( String( SdResId( STR_LAYER_BCKGRNDOBJ )), sal_False );
::sd::DrawDocShell* pDocShell = mpDoc->GetDocSh();
if ( pDocShell )
@@ -278,11 +278,11 @@ sal_Bool ImplSdPPTImport::Import()
{
PropItem aPropItem;
- UINT32 nType, nPropSize, nPropCount;
+ sal_uInt32 nType, nPropSize, nPropCount;
pDInfoSec2->Read();
- BYTE aPropSetGUID[ 16 ] =
+ sal_uInt8 aPropSetGUID[ 16 ] =
{
0x02, 0xd5, 0xcd, 0xd5, 0x9c, 0x2e, 0x1b, 0x10, 0x93, 0x97, 0x08, 0x00, 0x2b, 0x2c, 0xf9, 0xae
};
@@ -295,14 +295,14 @@ sal_Bool ImplSdPPTImport::Import()
if ( ( nType == VT_I4 ) || ( nType == VT_UI4 ) )
{
// examine PID_HEADINGPAIR to get the correct entry for PID_DOCPARTS
- UINT32 nSlideCount, nVecCount;
+ sal_uInt32 nSlideCount, nVecCount;
aPropItem >> nSlideCount;
if ( nSlideCount && pSection->GetProperty( PID_HEADINGPAIR, aPropItem ) )
{
- UINT32 nSlideTitleIndex = 0, nSlideTitleCount = 0;
- UINT32 nFontIndex, nFontCount = 0;
- UINT32 nDesignTemplateIndex, nDesignTemplateCount = 0;
- UINT32 i, nTemp, nEntryCount = 0;
+ sal_uInt32 nSlideTitleIndex = 0, nSlideTitleCount = 0;
+ sal_uInt32 nFontIndex, nFontCount = 0;
+ sal_uInt32 nDesignTemplateIndex, nDesignTemplateCount = 0;
+ sal_uInt32 i, nTemp, nEntryCount = 0;
String aUString;
@@ -315,7 +315,7 @@ sal_Bool ImplSdPPTImport::Import()
for ( i = 0; i < nVecCount; i++ )
{
- if ( !aPropItem.Read( aUString, VT_EMPTY, FALSE ) )
+ if ( !aPropItem.Read( aUString, VT_EMPTY, sal_False ) )
break;
aPropItem >> nType;
if ( ( nType != VT_I4 ) && ( nType != VT_UI4 ) )
@@ -354,7 +354,7 @@ sal_Bool ImplSdPPTImport::Import()
}
for ( i = 0; i < nSlideTitleCount; i++ )
{
- if ( !aPropItem.Read( aUString, nType, FALSE ) )
+ if ( !aPropItem.Read( aUString, nType, sal_False ) )
break;
String* pString = new String( aUString );
if ( pString->EqualsAscii( "No Slide Title" ))
@@ -379,7 +379,7 @@ sal_Bool ImplSdPPTImport::Import()
}
}
- BYTE aUserPropSetGUID[ 16 ] =
+ sal_uInt8 aUserPropSetGUID[ 16 ] =
{
0x05, 0xd5, 0xcd, 0xd5, 0x9c, 0x2e, 0x1b, 0x10, 0x93, 0x97, 0x08, 0x00, 0x2b, 0x2c, 0xf9, 0xae
};
@@ -389,7 +389,7 @@ sal_Bool ImplSdPPTImport::Import()
Dictionary aDict;
if ( pSection->GetDictionary( aDict ) )
{
- UINT32 nPropId = aDict.GetProperty( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_PID_HLINKS" )));
+ sal_uInt32 nPropId = aDict.GetProperty( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_PID_HLINKS" )));
if ( nPropId )
{
if ( pSection->GetProperty( nPropId, aPropItem ) )
@@ -403,7 +403,7 @@ sal_Bool ImplSdPPTImport::Import()
if ( ! ( nPropCount % 6 ) )
{
- UINT32 i;
+ sal_uInt32 i;
nPropCount /= 6; // 6 propertys a hyperlink
@@ -515,7 +515,7 @@ sal_Bool ImplSdPPTImport::Import()
{
pHyperlink->aConvSubString = String( SdResId( STR_PAGE ) );
pHyperlink->aConvSubString.Append( sal_Unicode( ' ' ) );
- pHyperlink->aConvSubString.Append( mpDoc->CreatePageNumValue( (USHORT)nPageNumber + 1 ) );
+ pHyperlink->aConvSubString.Append( mpDoc->CreatePageNumValue( (sal_uInt16)nPageNumber + 1 ) );
}
}
}
@@ -540,7 +540,7 @@ sal_Bool ImplSdPPTImport::Import()
DffRecordHeader aHyperHd;
if ( SeekToRec( rStCtrl, PPT_PST_ExObjList, maDocHd.GetRecEndFilePos(), &aHyperHd ) )
{
- UINT32 nExObjHyperListLen = aHyperHd.GetRecEndFilePos();
+ sal_uInt32 nExObjHyperListLen = aHyperHd.GetRecEndFilePos();
for ( void* pPtr = aHyperList.First(); pPtr; pPtr = aHyperList.Next() )
{
DffRecordHeader aHyperE;
@@ -574,24 +574,24 @@ sal_Bool ImplSdPPTImport::Import()
SfxProgress* pStbMgr = new SfxProgress( pDocShell, String( SdResId( STR_POWERPOINT_IMPORT ) ),
pMasterPages->Count() + pSlidePages->Count() + pNotePages->Count() );
- UINT32 nImportedPages = 0;
+ sal_uInt32 nImportedPages = 0;
{
- UINT16 nMasterAnz = GetPageCount( PPT_MASTERPAGE );
+ sal_uInt16 nMasterAnz = GetPageCount( PPT_MASTERPAGE );
- for ( USHORT nMasterNum = 0; nMasterNum < nMasterAnz; nMasterNum++ )
+ for ( sal_uInt16 nMasterNum = 0; nMasterNum < nMasterAnz; nMasterNum++ )
{
SetPageNum( nMasterNum, PPT_MASTERPAGE );
- SdPage* pPage = (SdPage*)MakeBlancPage( TRUE );
+ SdPage* pPage = (SdPage*)MakeBlancPage( sal_True );
if ( pPage )
{
- BOOL bNotesMaster = (*GetPageList( eAktPageKind ) )[ nAktPageNum ]->bNotesMaster;
- BOOL bStarDrawFiller = (*GetPageList( eAktPageKind ) )[ nAktPageNum ]->bStarDrawFiller;
+ sal_Bool bNotesMaster = (*GetPageList( eAktPageKind ) )[ nAktPageNum ]->bNotesMaster;
+ sal_Bool bStarDrawFiller = (*GetPageList( eAktPageKind ) )[ nAktPageNum ]->bStarDrawFiller;
PageKind ePgKind = ( bNotesMaster ) ? PK_NOTES : PK_STANDARD;
pPage->SetPageKind( ePgKind );
pSdrModel->InsertMasterPage( (SdrPage*)pPage );
if ( bNotesMaster && bStarDrawFiller )
- ((SdPage*)pPage)->SetAutoLayout( AUTOLAYOUT_NOTES, TRUE );
+ ((SdPage*)pPage)->SetAutoLayout( AUTOLAYOUT_NOTES, sal_True );
if ( nMasterNum )
{
boost::optional< sal_Int16 > oStartNumbering;
@@ -651,8 +651,8 @@ sal_Bool ImplSdPPTImport::Import()
/////////////////////
if ( pPage->GetPageKind() == PK_STANDARD )
{
- UINT32 nTitleInstance = TSS_TYPE_PAGETITLE;
- UINT32 nOutlinerInstance = TSS_TYPE_BODY;
+ sal_uInt32 nTitleInstance = TSS_TYPE_PAGETITLE;
+ sal_uInt32 nOutlinerInstance = TSS_TYPE_BODY;
/////////////////////
// titelstylesheet //
@@ -670,7 +670,7 @@ sal_Bool ImplSdPPTImport::Import()
////////////////////////
// outlinerstylesheet //
////////////////////////
- UINT16 nLevel;
+ sal_uInt16 nLevel;
PPTParagraphObj* pParagraphs[ 9 ];
PPTParagraphObj* pPreviousPara = NULL;
@@ -751,7 +751,7 @@ sal_Bool ImplSdPPTImport::Import()
((SdPage*)pNotesClone)->SetLayoutName( aLayoutName );
}
}
- else if ( ( pPersist->bStarDrawFiller == FALSE ) )
+ else if ( ( pPersist->bStarDrawFiller == sal_False ) )
{
PptSlidePersistEntry* pE = pPersist;
while( ( pE->aSlideAtom.nFlags & 4 ) && pE->aSlideAtom.nMasterId )
@@ -762,7 +762,7 @@ sal_Bool ImplSdPPTImport::Import()
else
pE = (*pList)[ nNextMaster ];
}
- SdrObject* pObj = ImportPageBackgroundObject( *pMPage, pE->nBackgroundOffset, TRUE ); // import background
+ SdrObject* pObj = ImportPageBackgroundObject( *pMPage, pE->nBackgroundOffset, sal_True ); // import background
if ( pObj )
pMPage->NbcInsertObject( pObj );
@@ -898,24 +898,24 @@ sal_Bool ImplSdPPTImport::Import()
// importing slide pages //
////////////////////////////////////
{
- UINT32 nFPosMerk = rStCtrl.Tell();
+ sal_uInt32 nFPosMerk = rStCtrl.Tell();
PptPageKind ePageKind = eAktPageKind;
- UINT16 nPageNum = nAktPageNum;
+ sal_uInt16 nPageNum = nAktPageNum;
- SdPage* pHandoutPage = (SdPage*)MakeBlancPage( FALSE );
+ SdPage* pHandoutPage = (SdPage*)MakeBlancPage( sal_False );
pHandoutPage->SetPageKind( PK_HANDOUT );
pSdrModel->InsertPage( pHandoutPage );
- USHORT nPageAnz = GetPageCount( PPT_SLIDEPAGE );
+ sal_uInt16 nPageAnz = GetPageCount( PPT_SLIDEPAGE );
if ( nPageAnz )
{
- for ( USHORT nPage = 0; nPage < nPageAnz; nPage++ )
+ for ( sal_uInt16 nPage = 0; nPage < nPageAnz; nPage++ )
{
sal_Bool bNewAnimationsUsed = sal_False;
mePresChange = PRESCHANGE_SEMIAUTO;
SetPageNum( nPage, PPT_SLIDEPAGE );
- SdPage* pPage = (SdPage*)MakeBlancPage( FALSE );
+ SdPage* pPage = (SdPage*)MakeBlancPage( sal_False );
PptSlidePersistEntry* pMasterPersist = NULL;
if ( HasMasterPage( nPage, PPT_SLIDEPAGE ) ) // try to get the LayoutName from the masterpage
{
@@ -987,7 +987,7 @@ sal_Bool ImplSdPPTImport::Import()
// creating the corresponding note page
eAktPageKind = PPT_NOTEPAGE;
- SdPage* pNotesPage = (SdPage*)MakeBlancPage( FALSE );
+ SdPage* pNotesPage = (SdPage*)MakeBlancPage( sal_False );
sal_uInt16 nNotesMasterNum = GetMasterPageIndex( nPage, PPT_SLIDEPAGE ) + 1;
sal_uInt32 nNotesPageId = GetNotesPageId( nPage );
if ( nNotesPageId )
@@ -1011,13 +1011,13 @@ sal_Bool ImplSdPPTImport::Import()
pSdrModel->InsertPage( pNotesPage ); // SJ: #i29625# because of form controls, the
ImportPage( pNotesPage, pMasterPersist2 ); // page must be inserted before importing
SetHeaderFooterPageSettings( pNotesPage, pMasterPersist2 );
- pNotesPage->SetAutoLayout( AUTOLAYOUT_NOTES, FALSE );
+ pNotesPage->SetAutoLayout( AUTOLAYOUT_NOTES, sal_False );
}
else
{
pNotesPage->SetPageKind( PK_NOTES );
pNotesPage->TRG_SetMasterPage(*pSdrModel->GetMasterPage(nNotesMasterNum));
- pNotesPage->SetAutoLayout( AUTOLAYOUT_NOTES, TRUE );
+ pNotesPage->SetAutoLayout( AUTOLAYOUT_NOTES, sal_True );
pSdrModel->InsertPage( pNotesPage );
SdrObject* pPageObj = pNotesPage->GetPresObj( PRESOBJ_PAGE, 1 );
if ( pPageObj )
@@ -1033,7 +1033,7 @@ sal_Bool ImplSdPPTImport::Import()
{
// Das kann bei Dokumentvorlagen vorkommen
eAktPageKind = PPT_SLIDEPAGE;
- SdrPage* pPage = MakeBlancPage( FALSE );
+ SdrPage* pPage = MakeBlancPage( sal_False );
pSdrModel->InsertPage( pPage );
// #i37397#, trying to set the title master for the first page
@@ -1058,10 +1058,10 @@ sal_Bool ImplSdPPTImport::Import()
((SdPage*)pPage)->TRG_SetMasterPage( *((SdPage*)pFoundMaster) );
((SdPage*)pPage)->SetLayoutName( ((SdPage*)pFoundMaster)->GetLayoutName() );
}
- ((SdPage*)pPage)->SetAutoLayout( AUTOLAYOUT_TITLE, TRUE, TRUE );
+ ((SdPage*)pPage)->SetAutoLayout( AUTOLAYOUT_TITLE, sal_True, sal_True );
eAktPageKind = PPT_NOTEPAGE;
- SdrPage* pNPage = MakeBlancPage( FALSE );
+ SdrPage* pNPage = MakeBlancPage( sal_False );
pSdrModel->InsertPage( pNPage );
}
SetPageNum( nPageNum, ePageKind );
@@ -1089,7 +1089,7 @@ sal_Bool ImplSdPPTImport::Import()
case PPT_LAYOUT_TITLEANDBODYSLIDE :
{
eAutoLayout = AUTOLAYOUT_ENUM;
- USHORT nID1 = pSlideLayout->aPlaceholderId[ 1 ];
+ sal_uInt16 nID1 = pSlideLayout->aPlaceholderId[ 1 ];
switch ( nID1 )
{
case PPT_PLACEHOLDER_BODY :
@@ -1117,8 +1117,8 @@ sal_Bool ImplSdPPTImport::Import()
case PPT_LAYOUT_2COLUMNSANDTITLE :
{
eAutoLayout = AUTOLAYOUT_2TEXT;
- USHORT nID1 = pSlideLayout->aPlaceholderId[ 1 ];
- USHORT nID2 = pSlideLayout->aPlaceholderId[ 2 ];
+ sal_uInt16 nID1 = pSlideLayout->aPlaceholderId[ 1 ];
+ sal_uInt16 nID2 = pSlideLayout->aPlaceholderId[ 2 ];
if ( nID1 == PPT_PLACEHOLDER_BODY && nID2 == PPT_PLACEHOLDER_GRAPH )
eAutoLayout = AUTOLAYOUT_TEXTCHART;
else if ( nID1 == PPT_PLACEHOLDER_GRAPH && nID2 == PPT_PLACEHOLDER_BODY )
@@ -1143,8 +1143,8 @@ sal_Bool ImplSdPPTImport::Import()
case PPT_LAYOUT_2ROWSANDTITLE :
{
eAutoLayout = AUTOLAYOUT_2TEXT;
- USHORT nID1 = pSlideLayout->aPlaceholderId[ 1 ];
- USHORT nID2 = pSlideLayout->aPlaceholderId[ 2 ];
+ sal_uInt16 nID1 = pSlideLayout->aPlaceholderId[ 1 ];
+ sal_uInt16 nID2 = pSlideLayout->aPlaceholderId[ 2 ];
if ( nID1 == PPT_PLACEHOLDER_BODY && nID2 == PPT_PLACEHOLDER_OBJECT )
eAutoLayout = AUTOLAYOUT_TEXTOVEROBJ;
else if ( nID1 == PPT_PLACEHOLDER_OBJECT && nID2 == PPT_PLACEHOLDER_BODY )
@@ -1191,17 +1191,17 @@ sal_Bool ImplSdPPTImport::Import()
break;
}
if ( eAutoLayout != AUTOLAYOUT_NONE )
- pPage->SetAutoLayout( eAutoLayout, FALSE );
+ pPage->SetAutoLayout( eAutoLayout, sal_False );
}
}
//////////////////////////////////////////////////////////////
// Handzettel-MasterPage: Autolayout setzen //
//////////////////////////////////////////////////////////////
SdPage* pHandoutMPage = mpDoc->GetMasterSdPage( 0, PK_HANDOUT );
- pHandoutMPage->SetAutoLayout( AUTOLAYOUT_HANDOUT6, TRUE, TRUE );
+ pHandoutMPage->SetAutoLayout( AUTOLAYOUT_HANDOUT6, sal_True, sal_True );
}
- UINT32 nSlideCount = GetPageCount();
+ sal_uInt32 nSlideCount = GetPageCount();
for ( i = 0; ( i < nSlideCount) && ( i < maSlideNameList.Count() ); i++ )
{
SdPage* pPage = mpDoc->GetSdPage( i, PK_STANDARD );
@@ -1295,22 +1295,22 @@ sal_Bool ImplSdPPTImport::Import()
if ( SeekToRec( rStCtrl, PPT_PST_NamedShowSlides, aCuHeader.GetRecEndFilePos(), &aContent ) )
{
PptSlidePersistList* pPageList = GetPageList( PPT_SLIDEPAGE );
- UINT32 nSCount = aContent.nRecLen >> 2;
+ sal_uInt32 nSCount = aContent.nRecLen >> 2;
if ( pPageList && nSCount )
{
- List* pList = mpDoc->GetCustomShowList( TRUE );
+ List* pList = mpDoc->GetCustomShowList( sal_True );
if ( pList )
{
SdCustomShow* pSdCustomShow = new SdCustomShow( mpDoc );
if ( pSdCustomShow )
{
pSdCustomShow->SetName( aCuShow );
- UINT32 nFound = 0;
- for ( UINT32 nS = 0; nS < nSCount; nS++ )
+ sal_uInt32 nFound = 0;
+ for ( sal_uInt32 nS = 0; nS < nSCount; nS++ )
{
- UINT32 nPageNumber;
+ sal_uInt32 nPageNumber;
rStCtrl >> nPageNumber;
- USHORT nPage = pPageList->FindPage( nPageNumber );
+ sal_uInt16 nPage = pPageList->FindPage( nPageNumber );
if ( nPage != PPTSLIDEPERSIST_ENTRY_NOTFOUND )
{
SdPage* pPage = mpDoc->GetSdPage( nPage, PK_STANDARD );
@@ -1351,7 +1351,7 @@ sal_Bool ImplSdPPTImport::Import()
>> nEndSlide;
sal_Unicode nChar;
- for ( UINT32 i2 = 0; i2 < 32; i2++ )
+ for ( sal_uInt32 i2 = 0; i2 < 32; i2++ )
{
rStCtrl >> nChar;
if ( nChar )
@@ -1368,7 +1368,7 @@ sal_Bool ImplSdPPTImport::Import()
if ( aCustomShow.Len() )
{
void* pPtr;
- List* pList = mpDoc->GetCustomShowList( FALSE );
+ List* pList = mpDoc->GetCustomShowList( sal_False );
if ( pList )
{
for ( pPtr = pList->First(); pPtr; pPtr = pList->Next() )
@@ -1427,7 +1427,7 @@ void ImplSdPPTImport::SetHeaderFooterPageSettings( SdPage* pPage, const PptSlide
bool bVisible = pHFE->IsToDisplay( i );
if ( ( eAktPageKind == PPT_SLIDEPAGE )
&& ( rSlidePersist.aSlideAtom.aLayout.eLayout == PPT_LAYOUT_TITLESLIDE )
- && ( aDocAtom.bTitlePlaceholdersOmitted == TRUE ) )
+ && ( aDocAtom.bTitlePlaceholdersOmitted == sal_True ) )
{
bVisible = sal_False;
}
@@ -1512,7 +1512,7 @@ bool Ppt97AnimationStlSortHelper::operator()( const std::pair< SdrObject*, Ppt97
void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimationsUsed )
{
- ULONG nFilePosMerk = rStCtrl.Tell();
+ sal_uLong nFilePosMerk = rStCtrl.Tell();
// PageKind an der Seite setzen (bisher nur PK_STANDARD oder PK_NOTES)
if ( pPage->GetPageKind() == PK_STANDARD )
@@ -1528,7 +1528,7 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimat
if(pPage->TRG_HasMasterPage())
{
SetOfByte aVisibleLayers = pPage->TRG_GetMasterPageVisibleLayers();
- aVisibleLayers.Set(mnBackgroundObjectsLayerID, FALSE);
+ aVisibleLayers.Set(mnBackgroundObjectsLayerID, sal_False);
pPage->TRG_SetMasterPageVisibleLayers(aVisibleLayers);
}
}
@@ -1536,11 +1536,11 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimat
DffRecordHeader aPageRecHd;
if ( pPage && SeekToAktPage( &aPageRecHd ) )
{
- ULONG nPageRecEnd = aPageRecHd.GetRecEndFilePos();
+ sal_uLong nPageRecEnd = aPageRecHd.GetRecEndFilePos();
- BOOL bTryTwice = ( eAktPageKind == PPT_SLIDEPAGE );
- BOOL bSSSlideInfoAtom = FALSE;
- while ( TRUE )
+ sal_Bool bTryTwice = ( eAktPageKind == PPT_SLIDEPAGE );
+ sal_Bool bSSSlideInfoAtom = sal_False;
+ while ( sal_True )
{
while ( ( rStCtrl.GetError() == 0 ) && ( rStCtrl.Tell() < nPageRecEnd ) )
{
@@ -1550,7 +1550,7 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimat
{
case PPT_PST_SSSlideInfoAtom:
{
- bSSSlideInfoAtom = TRUE;
+ bSSSlideInfoAtom = sal_True;
if ( eAktPageKind == PPT_MASTERPAGE )
{
if ( pActualSlidePersist )
@@ -1800,10 +1800,10 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimat
pPage->SetPresChange( mePresChange );
if ( nBuildFlags & 4 )
- pPage->SetExcluded( TRUE ); // Dia nicht anzeigen
+ pPage->SetExcluded( sal_True ); // Dia nicht anzeigen
if ( nBuildFlags & 16 )
{ // Dia mit Soundeffekt
- pPage->SetSound( TRUE );
+ pPage->SetSound( sal_True );
String aSoundFile( ReadSound( nSoundRef ) );
pPage->SetSoundFile( aSoundFile );
}
@@ -1817,19 +1817,19 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimat
}
aHd.SeekToEndOfRecord( rStCtrl );
}
- if ( bTryTwice && ( bSSSlideInfoAtom == FALSE ) )
+ if ( bTryTwice && ( bSSSlideInfoAtom == sal_False ) )
{
- bTryTwice = FALSE;
+ bTryTwice = sal_False;
if ( HasMasterPage( nAktPageNum, eAktPageKind ) )
{
- USHORT nMasterNum = GetMasterPageIndex( nAktPageNum, eAktPageKind );
+ sal_uInt16 nMasterNum = GetMasterPageIndex( nAktPageNum, eAktPageKind );
PptSlidePersistList* pPageList = GetPageList( PPT_MASTERPAGE );
if ( pPageList && ( nMasterNum < pPageList->Count() ) )
{
PptSlidePersistEntry* pE = (*pPageList)[ nMasterNum ];
if ( pE )
{
- UINT32 nOfs = pE->aPersistAtom.nReserved;
+ sal_uInt32 nOfs = pE->aPersistAtom.nReserved;
if ( nOfs )
{
rStCtrl.Seek( nOfs );
@@ -1888,31 +1888,31 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimat
//
///////////////////////////////////////////////////////////////////////////
-String ImplSdPPTImport::ReadSound(UINT32 nSoundRef) const
+String ImplSdPPTImport::ReadSound(sal_uInt32 nSoundRef) const
{
String aRetval;
- UINT32 nPosMerk = rStCtrl.Tell();
+ sal_uInt32 nPosMerk = rStCtrl.Tell();
DffRecordHeader aDocHd;
if ( SeekToDocument( &aDocHd ) )
{
- UINT32 nSoundLen = aDocHd.GetRecEndFilePos();
+ sal_uInt32 nSoundLen = aDocHd.GetRecEndFilePos();
DffRecordHeader aSoundBlockRecHd;
if( SeekToRec( rStCtrl, PPT_PST_SoundCollection, nSoundLen, &aSoundBlockRecHd ) )
{
- UINT32 nDataLen = aSoundBlockRecHd.GetRecEndFilePos();
+ sal_uInt32 nDataLen = aSoundBlockRecHd.GetRecEndFilePos();
DffRecordHeader aSoundRecHd;
- BOOL bRefStrValid = FALSE;
- BOOL bDone = FALSE;
+ sal_Bool bRefStrValid = sal_False;
+ sal_Bool bDone = sal_False;
while( !bDone && SeekToRec( rStCtrl, PPT_PST_Sound, nDataLen, &aSoundRecHd ) )
{
- UINT32 nStrLen = aSoundRecHd.GetRecEndFilePos();
+ sal_uInt32 nStrLen = aSoundRecHd.GetRecEndFilePos();
String aRefStr;
- UINT32 nPosMerk2 = rStCtrl.Tell();
+ sal_uInt32 nPosMerk2 = rStCtrl.Tell();
if ( SeekToRec( rStCtrl, PPT_PST_CString, nStrLen, NULL, 2 ) )
{
if ( ReadString( aRefStr ) )
- bRefStrValid = TRUE;
+ bRefStrValid = sal_True;
}
if ( bRefStrValid )
{
@@ -1922,7 +1922,7 @@ String ImplSdPPTImport::ReadSound(UINT32 nSoundRef) const
if ( SeekToRec( rStCtrl, PPT_PST_CString, nStrLen, NULL, 0 ) )
{
ReadString( aRetval );
- bDone = TRUE;
+ bDone = sal_True;
}
}
}
@@ -1931,13 +1931,13 @@ String ImplSdPPTImport::ReadSound(UINT32 nSoundRef) const
// ueberpruefen, ob diese Sound-Datei schon
// existiert. Wenn nicht, exportiere diese
// in unser lokales Sound-Verzeichnis.
- BOOL bSoundExists = FALSE;
+ sal_Bool bSoundExists = sal_False;
List* pSoundList = new List();
GalleryExplorer::FillObjList( GALLERY_THEME_SOUNDS, *pSoundList );
GalleryExplorer::FillObjList( GALLERY_THEME_USERSOUNDS, *pSoundList );
- for( ULONG n = 0; ( n < pSoundList->Count() ) && !bSoundExists; n++ )
+ for( sal_uLong n = 0; ( n < pSoundList->Count() ) && !bSoundExists; n++ )
{
INetURLObject aURL( *(String*)pSoundList->GetObject( n ) );
String aSoundName( aURL.GetName() );
@@ -1945,7 +1945,7 @@ String ImplSdPPTImport::ReadSound(UINT32 nSoundRef) const
if( aSoundName == aRetval )
{
aRetval = *(String*)pSoundList->GetObject( n );
- bSoundExists = TRUE;
+ bSoundExists = sal_True;
}
}
@@ -1964,8 +1964,8 @@ String ImplSdPPTImport::ReadSound(UINT32 nSoundRef) const
INetURLObject aGalleryUserSound( aGalleryDir.GetToken( aGalleryDir.GetTokenCount( ';' ) - 1 ) );
aGalleryUserSound.Append( aRetval );
- UINT32 nSoundDataLen = aSoundDataRecHd.nRecLen;
- UINT8* pBuf = new UINT8[ nSoundDataLen ];
+ sal_uInt32 nSoundDataLen = aSoundDataRecHd.nRecLen;
+ sal_uInt8* pBuf = new sal_uInt8[ nSoundDataLen ];
rStCtrl.Read( pBuf, nSoundDataLen );
SvStream* pOStm = ::utl::UcbStreamHelper::CreateStream( aGalleryUserSound.GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE | STREAM_TRUNC );
@@ -2229,7 +2229,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj
{
pSheet = pPage->GetStyleSheetForPresObj( PRESOBJ_TITLE );
if ( pSheet )
- ((SdrAttrObj*)pText)->SdrAttrObj::NbcSetStyleSheet( pSheet, TRUE );
+ ((SdrAttrObj*)pText)->SdrAttrObj::NbcSetStyleSheet( pSheet, sal_True );
DBG_ASSERT( pSheet, "ImplSdPPTImport::ApplyTextObj -> could not get stylesheet for titleobject (SJ)" );
}
break;
@@ -2237,7 +2237,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj
{
pSheet = pPage->GetStyleSheetForPresObj( PRESOBJ_TEXT );
if ( pSheet )
- ((SdrAttrObj*)pText)->SdrAttrObj::NbcSetStyleSheet( pSheet, TRUE );
+ ((SdrAttrObj*)pText)->SdrAttrObj::NbcSetStyleSheet( pSheet, sal_True );
DBG_ASSERT( pSheet, "ImplSdPPTImport::ApplyTextObj -> could not get stylesheet for subtitleobject (SJ)" );
}
break;
@@ -2245,7 +2245,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj
case TSS_TYPE_HALFBODY :
case TSS_TYPE_QUARTERBODY :
{
- for ( UINT16 nLevel = 9; nLevel; nLevel-- )
+ for ( sal_uInt16 nLevel = 9; nLevel; nLevel-- )
{
String aName( pPage->GetLayoutName() );
aName.Append( (sal_Unicode)( ' ' ) );
@@ -2257,7 +2257,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj
}
DBG_ASSERT( pSheet, "ImplSdPPTImport::ApplyTextObj -> could not get stylesheet for outlinerobject (SJ)" );
if ( pSheet )
- ((SdrAttrObj*)pText)->SdrAttrObj::NbcSetStyleSheet( pSheet, TRUE );
+ ((SdrAttrObj*)pText)->SdrAttrObj::NbcSetStyleSheet( pSheet, sal_True );
ppStyleSheetAry = &pStyleSheetAry[ 0 ];
}
break;
@@ -2268,7 +2268,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj
{
pSheet = pPage->GetStyleSheetForPresObj( PRESOBJ_TITLE );
if ( pSheet )
- ((SdrAttrObj*)pText)->SdrAttrObj::NbcSetStyleSheet( pSheet, TRUE );
+ ((SdrAttrObj*)pText)->SdrAttrObj::NbcSetStyleSheet( pSheet, sal_True );
DBG_ASSERT( pSheet, "ImplSdPPTImport::ApplyTextObj -> could not get stylesheet for titleobject (SJ)" );
}
else
@@ -2276,7 +2276,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj
pSheet = pPage->GetStyleSheetForPresObj( PRESOBJ_NOTES );
DBG_ASSERT( pSheet, "ImplSdPPTImport::ApplyTextObj -> could not get stylesheet for notesobj (SJ)" );
if ( pSheet )
- ((SdrAttrObj*)pText)->SdrAttrObj::NbcSetStyleSheet( pSheet, TRUE );
+ ((SdrAttrObj*)pText)->SdrAttrObj::NbcSetStyleSheet( pSheet, sal_True );
}
}
break;
@@ -2311,8 +2311,8 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj
{
if ( !bIsHeaderFooter )
{
- pText->SetNotVisibleAsMaster( TRUE );
- pText->SetEmptyPresObj( TRUE );
+ pText->SetNotVisibleAsMaster( sal_True );
+ pText->SetEmptyPresObj( sal_True );
}
pText->SetUserCall( pPage );
pPage->InsertPresObj( pText, ePresKind );
@@ -2335,13 +2335,13 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj
rItemSet.Put( (SdrTextVertAdjustItem&)pText->GetMergedItem( SDRATTR_TEXT_VERTADJUST ) );
rItemSet.Put( (SdrTextHorzAdjustItem&)pText->GetMergedItem( SDRATTR_TEXT_HORZADJUST ) );
}
- pText->NbcSetStyleSheet( pSheet2, FALSE );
+ pText->NbcSetStyleSheet( pSheet2, sal_False );
}
SfxItemSet aTempAttr( mpDoc->GetPool() );
SdrTextMinFrameHeightItem aMinHeight( pText->GetLogicRect().GetSize().Height() );
aTempAttr.Put( aMinHeight );
- SdrTextAutoGrowHeightItem aAutoGrowHeight( FALSE );
+ SdrTextAutoGrowHeightItem aAutoGrowHeight( sal_False );
aTempAttr.Put( aAutoGrowHeight );
pText->SetMergedItemSet(aTempAttr);
}
@@ -2355,8 +2355,8 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj
const PptSlideLayoutAtom* pSlideLayout = GetSlideLayoutAtom();
if ( pSlideLayout || ( eAktPageKind == PPT_NOTEPAGE ) )
{
- INT16 nPlaceholderId = pPlaceHolder->nPlaceholderId;
- UINT16 i = 0;
+ sal_Int16 nPlaceholderId = pPlaceHolder->nPlaceholderId;
+ sal_uInt16 i = 0;
if ( eAktPageKind == PPT_SLIDEPAGE )
{
for ( ; i < 8; i++ )
@@ -2427,14 +2427,14 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj
}
else
{
- SdrObject* pPresObj = pPage->CreatePresObj( ePresObjKind, bVertical, pText->GetLogicRect(), TRUE );
+ SdrObject* pPresObj = pPage->CreatePresObj( ePresObjKind, bVertical, pText->GetLogicRect(), sal_True );
pPresObj->SetUserCall( pPage );
SfxItemSet aSet( pSdrModel->GetItemPool() );
ApplyAttributes( rStCtrl, aSet );
pPresObj->SetMergedItemSet(aSet);
- if ( ( eAktPageKind != PPT_NOTEPAGE ) && ( pSlideLayout->aPlacementId[ i ] != (ULONG)-1 ) )
+ if ( ( eAktPageKind != PPT_NOTEPAGE ) && ( pSlideLayout->aPlacementId[ i ] != (sal_uLong)-1 ) )
{
SdrObject* pTitleObj = ((SdPage&)pPage->TRG_GetMasterPage()).GetPresObj( PRESOBJ_TITLE );
SdrObject* pOutlineObj = ((SdPage&)pPage->TRG_GetMasterPage()).GetPresObj( PRESOBJ_OUTLINE );
@@ -2580,21 +2580,21 @@ SdrObject* ImplSdPPTImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi
pProcessData->pPage->InsertPresObj( pObj, PRESOBJ_PAGE );
}
- BOOL bInhabitanceChecked = FALSE;
- BOOL bAnimationInfoFound = FALSE;
+ sal_Bool bInhabitanceChecked = sal_False;
+ sal_Bool bAnimationInfoFound = sal_False;
DffRecordHeader aMasterShapeHd;
if ( maShapeRecords.SeekToContent( rSt, DFF_msofbtClientData, SEEK_FROM_CURRENT_AND_RESTART ) )
{
DffRecordHeader& rHdClientData = *maShapeRecords.Current();
- while( TRUE )
+ while( sal_True )
{
- UINT32 nClientDataLen = rHdClientData.GetRecEndFilePos();
+ sal_uInt32 nClientDataLen = rHdClientData.GetRecEndFilePos();
DffRecordHeader aHd;
do
{
rSt >> aHd;
- UINT32 nHdRecEnd = aHd.GetRecEndFilePos();
+ sal_uInt32 nHdRecEnd = aHd.GetRecEndFilePos();
switch ( aHd.nRecType )
{
case PPT_PST_AnimationInfo :
@@ -2638,14 +2638,14 @@ SdrObject* ImplSdPPTImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi
maAnimations[pObj] = pAnimation;
- bAnimationInfoFound = TRUE;
+ bAnimationInfoFound = sal_True;
}
}
}
break;
case PPT_PST_InteractiveInfo:
{
- UINT32 nFilePosMerk2 = rSt.Tell();
+ sal_uInt32 nFilePosMerk2 = rSt.Tell();
String aMacroName;
if(SeekToRec( rSt, PPT_PST_CString, nHdRecEnd, NULL, 0 ) )
@@ -2707,7 +2707,7 @@ SdrObject* ImplSdPPTImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi
if ( bInhabitanceChecked || bAnimationInfoFound )
break;
- bInhabitanceChecked = TRUE;
+ bInhabitanceChecked = sal_True;
if ( ! ( IsProperty( DFF_Prop_hspMaster ) && SeekToShape( rSt, pData, GetPropertyValue( DFF_Prop_hspMaster ) ) ) )
break;
rSt >> aMasterShapeHd;
diff --git a/sd/source/filter/ppt/pptin.hxx b/sd/source/filter/ppt/pptin.hxx
index f45505d75e1f..2f38ff74d444 100644..100755
--- a/sd/source/filter/ppt/pptin.hxx
+++ b/sd/source/filter/ppt/pptin.hxx
@@ -62,7 +62,7 @@ class ImplSdPPTImport : public SdrPowerPointImport
// SvStream* mpPicStream;
DffRecordHeader maDocHd;
List maSlideNameList;
- BOOL mbDocumentFound;
+ sal_Bool mbDocumentFound;
sal_uInt32 mnFilterOptions;
SdDrawDocument* mpDoc;
PresChange mePresChange;
diff --git a/sd/source/filter/ppt/pptinanimations.cxx b/sd/source/filter/ppt/pptinanimations.cxx
index 04c7566bbbee..4a5eb0688243 100644
--- a/sd/source/filter/ppt/pptinanimations.cxx
+++ b/sd/source/filter/ppt/pptinanimations.cxx
@@ -929,9 +929,9 @@ bool AnimationImporter::convertAnimationValue( MS_AttributeNames eAttribute, Any
if( aString.getLength() >= 7 && aString[0] == '#' )
{
Color aColor;
- aColor.SetRed( (UINT8)(lcl_gethex( aString[1] ) * 16 + lcl_gethex( aString[2] )) );
- aColor.SetGreen( (UINT8)(lcl_gethex( aString[3] ) * 16 + lcl_gethex( aString[4] )) );
- aColor.SetBlue( (UINT8)(lcl_gethex( aString[5] ) * 16 + lcl_gethex( aString[6] )) );
+ aColor.SetRed( (sal_uInt8)(lcl_gethex( aString[1] ) * 16 + lcl_gethex( aString[2] )) );
+ aColor.SetGreen( (sal_uInt8)(lcl_gethex( aString[3] ) * 16 + lcl_gethex( aString[4] )) );
+ aColor.SetBlue( (sal_uInt8)(lcl_gethex( aString[5] ) * 16 + lcl_gethex( aString[6] )) );
rValue <<= (sal_Int32)aColor.GetColor();
bRet = true;
}
@@ -940,9 +940,9 @@ bool AnimationImporter::convertAnimationValue( MS_AttributeNames eAttribute, Any
aString = aString.copy( 4, aString.getLength() - 5 );
Color aColor;
sal_Int32 index = 0;
- aColor.SetRed( (UINT8)aString.getToken( 0, (sal_Unicode)',', index ).toInt32() );
- aColor.SetGreen( (UINT8)aString.getToken( 0, (sal_Unicode)',', index ).toInt32() );
- aColor.SetRed( (UINT8)aString.getToken( 0, (sal_Unicode)',', index ).toInt32() );
+ aColor.SetRed( (sal_uInt8)aString.getToken( 0, (sal_Unicode)',', index ).toInt32() );
+ aColor.SetGreen( (sal_uInt8)aString.getToken( 0, (sal_Unicode)',', index ).toInt32() );
+ aColor.SetRed( (sal_uInt8)aString.getToken( 0, (sal_Unicode)',', index ).toInt32() );
rValue <<= (sal_Int32)aColor.GetColor();
bRet = true;
}
@@ -1839,7 +1839,7 @@ Any AnimationImporter::implGetColorAny( sal_Int32 nMode, sal_Int32 nA, sal_Int3
dump( "rgb(%ld", nA );
dump( ",%ld", nB );
dump( ",%ld)", nC );
- Color aColor( (UINT8)nA, (UINT8)nB, (UINT8)nC );
+ Color aColor( (sal_uInt8)nA, (sal_uInt8)nB, (sal_uInt8)nC );
return makeAny( (sal_Int32)aColor.GetRGBColor() );
}
case 1: // hsl
@@ -1857,7 +1857,7 @@ Any AnimationImporter::implGetColorAny( sal_Int32 nMode, sal_Int32 nA, sal_Int3
case 2: // index
{
Color aColor;
- mpPPTImport->GetColorFromPalette((USHORT)nA, aColor );
+ mpPPTImport->GetColorFromPalette((sal_uInt16)nA, aColor );
dump( "index(%ld", nA );
dump( " [%ld", (sal_Int32)aColor.GetRed() );
dump( ",%ld", (sal_Int32)aColor.GetGreen() );
@@ -3077,9 +3077,9 @@ sal_Int32 AnimationImporter::importTargetElementContainer( const Atom* pAtom, An
const EditTextObject& rEditTextObject = pOPO->GetTextObject();
- const USHORT nParaCount = rEditTextObject.GetParagraphCount();
+ const sal_uInt16 nParaCount = rEditTextObject.GetParagraphCount();
- USHORT nPara = 0;
+ sal_uInt16 nPara = 0;
while( (nPara < nParaCount) && (begin > 0) )
{
@@ -3238,11 +3238,11 @@ void AnimationImporter::dump_atom_header( const Atom* pAtom, bool bOpen, bool bA
// --------------------------------------------------------------------
-void AnimationImporter::dump( UINT32 nLen, bool bNewLine )
+void AnimationImporter::dump( sal_uInt32 nLen, bool bNewLine )
{
char * faul = "0123456789abcdef";
- UINT32 i = 0;
+ sal_uInt32 i = 0;
int b = 0;
sal_Int8 nData;
diff --git a/sd/source/filter/ppt/propread.cxx b/sd/source/filter/ppt/propread.cxx
index 74f89d2ebd45..150acf381c4d 100644
--- a/sd/source/filter/ppt/propread.cxx
+++ b/sd/source/filter/ppt/propread.cxx
@@ -103,7 +103,7 @@ static xub_StrLen lcl_getMaxSafeStrLen(sal_uInt32 nSize)
return static_cast< xub_StrLen >( nSize );
}
-BOOL PropItem::Read( String& rString, sal_uInt32 nStringType, sal_Bool bAlign )
+sal_Bool PropItem::Read( String& rString, sal_uInt32 nStringType, sal_Bool bAlign )
{
sal_uInt32 i, nItemSize, nType, nItemPos;
sal_Bool bRetValue = sal_False;
@@ -255,7 +255,7 @@ void Dictionary::AddProperty( sal_uInt32 nId, const String& rString )
// -----------------------------------------------------------------------
-UINT32 Dictionary::GetProperty( const String& rString )
+sal_uInt32 Dictionary::GetProperty( const String& rString )
{
for ( Dict* pDict = (Dict*)First(); pDict; pDict = (Dict*)Next() )
{
diff --git a/sd/source/filter/ppt/propread.hxx b/sd/source/filter/ppt/propread.hxx
index b268fb3d019d..9adbd89aeb3e 100644..100755
--- a/sd/source/filter/ppt/propread.hxx
+++ b/sd/source/filter/ppt/propread.hxx
@@ -129,13 +129,13 @@ class Dictionary : protected List
{
friend class Section;
- void AddProperty( UINT32 nId, const String& rString );
+ void AddProperty( sal_uInt32 nId, const String& rString );
public :
Dictionary(){};
~Dictionary();
Dictionary& operator=( Dictionary& rDictionary );
- UINT32 GetProperty( const String& rPropName );
+ sal_uInt32 GetProperty( const String& rPropName );
};
// ------------------------------------------------------------------------
@@ -146,7 +146,7 @@ class Section : private List
protected:
- BYTE aFMTID[ 16 ];
+ sal_uInt8 aFMTID[ 16 ];
void AddProperty( sal_uInt32 nId, const sal_uInt8* pBuf, sal_uInt32 nBufSize );
@@ -167,7 +167,7 @@ class Section : private List
class PropRead : private List
{
sal_Bool mbStatus;
- SvStorageStream* mpSvStream;
+ SvStorageStreamRef mpSvStream;
sal_uInt16 mnByteOrder;
sal_uInt16 mnFormat;
@@ -182,7 +182,7 @@ class PropRead : private List
~PropRead();
PropRead& operator=( PropRead& rPropRead );
- const Section* GetSection( const BYTE* pFMTID );
+ const Section* GetSection( const sal_uInt8* pFMTID );
sal_Bool IsValid() const { return mbStatus; };
void Read();
};
diff --git a/sd/source/filter/sdpptwrp.cxx b/sd/source/filter/sdpptwrp.cxx
index 05024bb46680..5f25abc4f9f3 100644..100755
--- a/sd/source/filter/sdpptwrp.cxx
+++ b/sd/source/filter/sdpptwrp.cxx
@@ -52,7 +52,7 @@ using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::task;
using namespace ::com::sun::star::frame;
-typedef BOOL ( __LOADONCALLAPI *ExportPPT )( SvStorageRef&,
+typedef sal_Bool ( __LOADONCALLAPI *ExportPPT )( SvStorageRef&,
Reference< XModel > &,
Reference< XStatusIndicator > &,
SvMemoryStream*, sal_uInt32 nCnvrtFlags );
@@ -60,7 +60,7 @@ typedef BOOL ( __LOADONCALLAPI *ExportPPT )( SvStorageRef&,
typedef sal_Bool ( SAL_CALL *ImportPPT )( const ::rtl::OUString&, Sequence< PropertyValue >*,
SdDrawDocument*, SvStream&, SvStorage&, SfxMedium& );
-typedef BOOL ( __LOADONCALLAPI *SaveVBA )( SfxObjectShell&, SvMemoryStream*& );
+typedef sal_Bool ( __LOADONCALLAPI *SaveVBA )( SfxObjectShell&, SvMemoryStream*& );
// ---------------
// - SdPPTFilter -
@@ -84,7 +84,7 @@ SdPPTFilter::~SdPPTFilter()
sal_Bool SdPPTFilter::Import()
{
sal_Bool bRet = sal_False;
- SotStorageRef pStorage = new SotStorage( mrMedium.GetInStream(), FALSE );
+ SotStorageRef pStorage = new SotStorage( mrMedium.GetInStream(), sal_False );
if( !pStorage->GetError() )
{
/* check if there is a dualstorage, then the
@@ -143,7 +143,7 @@ sal_Bool SdPPTFilter::Export()
{
if( mxModel.is() )
{
- SotStorageRef xStorRef = new SotStorage( mrMedium.GetOutStream(), FALSE );
+ SotStorageRef xStorRef = new SotStorage( mrMedium.GetOutStream(), sal_False );
ExportPPT PPTExport = reinterpret_cast<ExportPPT>(pLibrary->getFunctionSymbol( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ExportPPT")) ));
if( PPTExport && xStorRef.Is() )
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx
index 7c8e648778ed..1683734512fc 100644..100755
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -174,7 +174,7 @@ struct XML_SERVICES
const sal_Char* mpSettings;
};
-XML_SERVICES* getServices( bool bImport, bool bDraw, ULONG nStoreVer )
+XML_SERVICES* getServices( bool bImport, bool bDraw, sal_uLong nStoreVer )
{
static XML_SERVICES gServices[] =
{
@@ -197,7 +197,7 @@ XML_SERVICES* getServices( bool bImport, bool bDraw, ULONG nStoreVer )
// - SdXMLWrapper -
// ----------------
-SdXMLFilter::SdXMLFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, sal_Bool bShowProgress, SdXMLFilterMode eFilterMode, ULONG nStoreVer ) :
+SdXMLFilter::SdXMLFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, sal_Bool bShowProgress, SdXMLFilterMode eFilterMode, sal_uLong nStoreVer ) :
SdFilter( rMedium, rDocShell, bShowProgress ), meFilterMode( eFilterMode ), mnStoreVer( nStoreVer )
{
}
@@ -842,12 +842,12 @@ sal_Bool SdXMLFilter::Export()
SvXMLEmbeddedObjectHelper* pObjectHelper = NULL;
SvXMLGraphicHelper* pGraphicHelper = NULL;
- sal_Bool bDocRet = FALSE;
+ sal_Bool bDocRet = sal_False;
if( !mxModel.is() )
{
OSL_FAIL("Got NO Model in XMLExport");
- return FALSE;
+ return sal_False;
}
sal_Bool bLocked = mxModel->hasControllersLocked();
@@ -861,7 +861,7 @@ sal_Bool SdXMLFilter::Export()
if( !xServiceInfo.is() || !xServiceInfo->supportsService( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.GenericDrawingDocument" ) ) ) )
{
OSL_FAIL( "Model is no DrawingDocument in XMLExport" );
- return FALSE;
+ return sal_False;
}
uno::Reference< lang::XMultiServiceFactory> xServiceFactory( ::comphelper::getProcessServiceFactory() );
@@ -869,7 +869,7 @@ sal_Bool SdXMLFilter::Export()
if( !xServiceFactory.is() )
{
OSL_FAIL( "got no service manager" );
- return FALSE;
+ return sal_False;
}
uno::Reference< uno::XInterface > xWriter( xServiceFactory->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xml.sax.Writer" ) ) ) );
@@ -877,7 +877,7 @@ sal_Bool SdXMLFilter::Export()
if( !xWriter.is() )
{
OSL_FAIL( "com.sun.star.xml.sax.Writer service missing" );
- return FALSE;
+ return sal_False;
}
uno::Reference<xml::sax::XDocumentHandler> xHandler( xWriter, uno::UNO_QUERY );
@@ -963,7 +963,7 @@ sal_Bool SdXMLFilter::Export()
pObjectHelper = SvXMLEmbeddedObjectHelper::Create( xStorage, *mrDocShell.GetDoc()->GetPersist(), EMBEDDEDOBJECTHELPER_MODE_WRITE, sal_False );
xObjectResolver = pObjectHelper;
- pGraphicHelper = SvXMLGraphicHelper::Create( xStorage, GRAPHICHELPER_MODE_WRITE, FALSE );
+ pGraphicHelper = SvXMLGraphicHelper::Create( xStorage, GRAPHICHELPER_MODE_WRITE, sal_False );
xGrfResolver = pGraphicHelper;
}