diff options
Diffstat (limited to 'sfx2/source/dialog/dinfdlg.cxx')
| -rw-r--r-- | sfx2/source/dialog/dinfdlg.cxx | 202 |
1 files changed, 101 insertions, 101 deletions
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index 3d848d4d5648..b8c2bec4ba5a 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -117,26 +117,26 @@ bool operator==(const util::DateTime &i_rLeft, const util::DateTime &i_rRight) TYPEINIT1_AUTOFACTORY(SfxDocumentInfoItem, SfxStringItem); -const USHORT HI_NAME = 1; -const USHORT HI_TYPE = 2; -const USHORT HI_VALUE = 3; -const USHORT HI_ACTION = 4; +const sal_uInt16 HI_NAME = 1; +const sal_uInt16 HI_TYPE = 2; +const sal_uInt16 HI_VALUE = 3; +const sal_uInt16 HI_ACTION = 4; static const char DOCUMENT_SIGNATURE_MENU_CMD[] = "Signature"; //------------------------------------------------------------------------ -String CreateSizeText( ULONG nSize, BOOL bExtraBytes = TRUE, BOOL bSmartExtraBytes = FALSE ); -String CreateSizeText( ULONG nSize, BOOL bExtraBytes, BOOL bSmartExtraBytes ) +String CreateSizeText( sal_uIntPtr nSize, sal_Bool bExtraBytes = sal_True, sal_Bool bSmartExtraBytes = sal_False ); +String CreateSizeText( sal_uIntPtr nSize, sal_Bool bExtraBytes, sal_Bool bSmartExtraBytes ) { String aUnitStr = ' '; aUnitStr += String( SfxResId(STR_BYTES) ); - ULONG nSize1 = nSize; - ULONG nSize2 = nSize1; - ULONG nMega = 1024 * 1024; - ULONG nGiga = nMega * 1024; + sal_uIntPtr nSize1 = nSize; + sal_uIntPtr nSize2 = nSize1; + sal_uIntPtr nMega = 1024 * 1024; + sal_uIntPtr nGiga = nMega * 1024; double fSize = nSize; int nDec = 0; - BOOL bGB = FALSE; + sal_Bool bGB = sal_False; if ( nSize1 >= 10000 && nSize1 < nMega ) { @@ -159,7 +159,7 @@ String CreateSizeText( ULONG nSize, BOOL bExtraBytes, BOOL bSmartExtraBytes ) nSize1 /= nGiga; aUnitStr = ' '; aUnitStr += String( SfxResId(STR_GB) ); - bGB = TRUE; + bGB = sal_True; fSize /= nGiga; nDec = 3; } @@ -198,7 +198,7 @@ String ConvertDateTime_Impl( const String& rName, const String pDelim ( DEFINE_CONST_UNICODE( ", ")); String aStr( rWrapper.getDate( aD ) ); aStr += pDelim; - aStr += rWrapper.getTime( aT, TRUE, FALSE ); + aStr += rWrapper.getTime( aT, sal_True, sal_False ); String aAuthor = rName; aAuthor.EraseLeadingChars(); if ( aAuthor.Len() ) @@ -510,13 +510,13 @@ void SfxDocumentInfoItem::AddCustomProperty( const ::rtl::OUString& sName, const m_aCustomProperties.push_back( pProp ); } -sal_Bool SfxDocumentInfoItem::QueryValue( Any& rVal, BYTE nMemberId ) const +sal_Bool SfxDocumentInfoItem::QueryValue( Any& rVal, sal_uInt8 nMemberId ) const { String aValue; sal_Int32 nValue = 0; sal_Bool bValue = sal_False; - BOOL bIsInt = FALSE; - BOOL bIsString = FALSE; + sal_Bool bIsInt = sal_False; + sal_Bool bIsString = sal_False; nMemberId &= ~CONVERT_TWIPS; switch ( nMemberId ) { @@ -530,31 +530,31 @@ sal_Bool SfxDocumentInfoItem::QueryValue( Any& rVal, BYTE nMemberId ) const bValue = isAutoloadEnabled(); break; case MID_DOCINFO_AUTOLOADSECS: - bIsInt = TRUE; + bIsInt = sal_True; nValue = getAutoloadDelay(); break; case MID_DOCINFO_AUTOLOADURL: - bIsString = TRUE; + bIsString = sal_True; aValue = getAutoloadURL(); break; case MID_DOCINFO_DEFAULTTARGET: - bIsString = TRUE; + bIsString = sal_True; aValue = getDefaultTarget(); break; case MID_DOCINFO_DESCRIPTION: - bIsString = TRUE; + bIsString = sal_True; aValue = getDescription(); break; case MID_DOCINFO_KEYWORDS: - bIsString = TRUE; + bIsString = sal_True; aValue = getKeywords(); break; case MID_DOCINFO_SUBJECT: - bIsString = TRUE; + bIsString = sal_True; aValue = getSubject(); break; case MID_DOCINFO_TITLE: - bIsString = TRUE; + bIsString = sal_True; aValue = getTitle(); break; default: @@ -571,7 +571,7 @@ sal_Bool SfxDocumentInfoItem::QueryValue( Any& rVal, BYTE nMemberId ) const return sal_True; } -sal_Bool SfxDocumentInfoItem::PutValue( const Any& rVal, BYTE nMemberId ) +sal_Bool SfxDocumentInfoItem::PutValue( const Any& rVal, sal_uInt8 nMemberId ) { ::rtl::OUString aValue; sal_Int32 nValue=0; @@ -669,16 +669,16 @@ SfxTabPage *SfxDocumentDescPage::Create(Window *pParent, const SfxItemSet &rItem //------------------------------------------------------------------------ -BOOL SfxDocumentDescPage::FillItemSet(SfxItemSet &rSet) +sal_Bool SfxDocumentDescPage::FillItemSet(SfxItemSet &rSet) { // Pruefung, ob eine Aenderung vorliegt - const BOOL bTitleMod = aTitleEd.IsModified(); - const BOOL bThemeMod = aThemaEd.IsModified(); - const BOOL bKeywordsMod = aKeywordsEd.IsModified(); - const BOOL bCommentMod = aCommentEd.IsModified(); + const sal_Bool bTitleMod = aTitleEd.IsModified(); + const sal_Bool bThemeMod = aThemaEd.IsModified(); + const sal_Bool bKeywordsMod = aKeywordsEd.IsModified(); + const sal_Bool bCommentMod = aCommentEd.IsModified(); if( !( bTitleMod || bThemeMod || bKeywordsMod || bCommentMod ) ) { - return FALSE; + return sal_False; } // Erzeugung der Ausgabedaten @@ -690,7 +690,7 @@ BOOL SfxDocumentDescPage::FillItemSet(SfxItemSet &rSet) if ( pDlg ) pExSet = pDlg->GetExampleSet(); - if ( pExSet && SFX_ITEM_SET != pExSet->GetItemState( SID_DOCINFO, TRUE, &pItem ) ) + if ( pExSet && SFX_ITEM_SET != pExSet->GetItemState( SID_DOCINFO, sal_True, &pItem ) ) pInfo = pInfoItem; else if ( pItem ) pInfo = new SfxDocumentInfoItem( *(const SfxDocumentInfoItem *)pItem ); @@ -698,7 +698,7 @@ BOOL SfxDocumentDescPage::FillItemSet(SfxItemSet &rSet) if ( !pInfo ) { DBG_ERRORFILE( "SfxDocumentDescPage::FillItemSet(): no item found" ); - return FALSE; + return sal_False; } if( bTitleMod ) @@ -723,7 +723,7 @@ BOOL SfxDocumentDescPage::FillItemSet(SfxItemSet &rSet) delete pInfo; } - return TRUE; + return sal_True; } //------------------------------------------------------------------------ @@ -737,13 +737,13 @@ void SfxDocumentDescPage::Reset(const SfxItemSet &rSet) aKeywordsEd.SetText( pInfoItem->getKeywords() ); aCommentEd.SetText( pInfoItem->getDescription() ); - SFX_ITEMSET_ARG( &rSet, pROItem, SfxBoolItem, SID_DOC_READONLY, FALSE ); + SFX_ITEMSET_ARG( &rSet, pROItem, SfxBoolItem, SID_DOC_READONLY, sal_False ); if ( pROItem && pROItem->GetValue() ) { - aTitleEd.SetReadOnly( TRUE ); - aThemaEd.SetReadOnly( TRUE ); - aKeywordsEd.SetReadOnly( TRUE ); - aCommentEd.SetReadOnly( TRUE ); + aTitleEd.SetReadOnly( sal_True ); + aThemaEd.SetReadOnly( sal_True ); + aKeywordsEd.SetReadOnly( sal_True ); + aCommentEd.SetReadOnly( sal_True ); } } @@ -824,8 +824,8 @@ SfxDocumentPage::SfxDocumentPage( Window* pParent, const SfxItemSet& rItemSet ) aUnknownSize ( SfxResId( STR_UNKNOWNSIZE ) ), aMultiSignedStr ( SfxResId( STR_MULTSIGNED ) ), - bEnableUseUserData ( FALSE ), - bHandleDelete ( FALSE ) + bEnableUseUserData ( sal_False ), + bHandleDelete ( sal_False ) { FreeResource(); @@ -891,7 +891,7 @@ IMPL_LINK( SfxDocumentPage, DeleteHdl, PushButton*, EMPTYARG ) const Time aTime( 0 ); aTimeLogValFt.SetText( aLocaleWrapper.getDuration( aTime ) ); aDocNoValFt.SetText( '1' ); - bHandleDelete = TRUE; + bHandleDelete = sal_True; return 0; } @@ -954,16 +954,16 @@ SfxTabPage* SfxDocumentPage::Create( Window* pParent, const SfxItemSet& rItemSet void SfxDocumentPage::EnableUseUserData() { - bEnableUseUserData = TRUE; + bEnableUseUserData = sal_True; aUseUserDataCB.Show(); aDeleteBtn.Show(); } //------------------------------------------------------------------------ -BOOL SfxDocumentPage::FillItemSet( SfxItemSet& rSet ) +sal_Bool SfxDocumentPage::FillItemSet( SfxItemSet& rSet ) { - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; if ( !bHandleDelete && bEnableUseUserData && aUseUserDataCB.GetState() != aUseUserDataCB.GetSavedValue() && @@ -972,10 +972,10 @@ BOOL SfxDocumentPage::FillItemSet( SfxItemSet& rSet ) const SfxItemSet* pExpSet = GetTabDialog()->GetExampleSet(); const SfxPoolItem* pItem; - if ( pExpSet && SFX_ITEM_SET == pExpSet->GetItemState( SID_DOCINFO, TRUE, &pItem ) ) + if ( pExpSet && SFX_ITEM_SET == pExpSet->GetItemState( SID_DOCINFO, sal_True, &pItem ) ) { SfxDocumentInfoItem* pInfoItem = (SfxDocumentInfoItem*)pItem; - BOOL bUseData = ( STATE_CHECK == aUseUserDataCB.GetState() ); + sal_Bool bUseData = ( STATE_CHECK == aUseUserDataCB.GetState() ); pInfoItem->SetUseUserData( bUseData ); /* if ( !bUseData ) @@ -992,7 +992,7 @@ BOOL SfxDocumentPage::FillItemSet( SfxItemSet& rSet ) } */ rSet.Put( SfxDocumentInfoItem( *pInfoItem ) ); - bRet = TRUE; + bRet = sal_True; } } @@ -1000,10 +1000,10 @@ BOOL SfxDocumentPage::FillItemSet( SfxItemSet& rSet ) { const SfxItemSet* pExpSet = GetTabDialog()->GetExampleSet(); const SfxPoolItem* pItem; - if ( pExpSet && SFX_ITEM_SET == pExpSet->GetItemState( SID_DOCINFO, TRUE, &pItem ) ) + if ( pExpSet && SFX_ITEM_SET == pExpSet->GetItemState( SID_DOCINFO, sal_True, &pItem ) ) { SfxDocumentInfoItem* pInfoItem = (SfxDocumentInfoItem*)pItem; - BOOL bUseAuthor = bEnableUseUserData && aUseUserDataCB.IsChecked(); + sal_Bool bUseAuthor = bEnableUseUserData && aUseUserDataCB.IsChecked(); SfxDocumentInfoItem newItem( *pInfoItem ); newItem.resetUserData( bUseAuthor ? SvtUserOptions().GetFullName() @@ -1011,22 +1011,22 @@ BOOL SfxDocumentPage::FillItemSet( SfxItemSet& rSet ) pInfoItem->SetUseUserData( STATE_CHECK == aUseUserDataCB.GetState() ); newItem.SetUseUserData( STATE_CHECK == aUseUserDataCB.GetState() ); - newItem.SetDeleteUserData( TRUE ); + newItem.SetDeleteUserData( sal_True ); rSet.Put( newItem ); - bRet = TRUE; + bRet = sal_True; } } if ( aNameED.IsModified() && aNameED.GetText().Len() ) { rSet.Put( SfxStringItem( ID_FILETP_TITLE, aNameED.GetText() ) ); - bRet = TRUE; + bRet = sal_True; } - if ( /* aReadOnlyCB.IsModified() */ TRUE ) + if ( /* aReadOnlyCB.IsModified() */ sal_True ) { rSet.Put( SfxBoolItem( ID_FILETP_READONLY, aReadOnlyCB.IsChecked() ) ); - bRet = TRUE; + bRet = sal_True; } return bRet; @@ -1056,7 +1056,7 @@ void SfxDocumentPage::Reset( const SfxItemSet& rSet ) String aFactory( aFile ); if ( aFile.Len() > 2 && aFile.GetChar(0) == '[' ) { - USHORT nPos = aFile.Search( ']' ); + sal_uInt16 nPos = aFile.Search( ']' ); aFactory = aFile.Copy( 1, nPos-1 ); aFile = aFile.Copy( nPos+1 ); } @@ -1064,13 +1064,13 @@ void SfxDocumentPage::Reset( const SfxItemSet& rSet ) // determine name String aName; const SfxPoolItem* pItem = 0; - if ( SFX_ITEM_SET != rSet.GetItemState( ID_FILETP_TITLE, FALSE, &pItem ) ) + if ( SFX_ITEM_SET != rSet.GetItemState( ID_FILETP_TITLE, sal_False, &pItem ) ) { INetURLObject aURL(aFile); aName = aURL.GetName( INetURLObject::DECODE_WITH_CHARSET ); if ( !aName.Len() || aURL.GetProtocol() == INET_PROT_PRIVATE ) aName = String( SfxResId( STR_NONAME ) ); - aNameED.SetReadOnly( TRUE ); + aNameED.SetReadOnly( sal_True ); } else { @@ -1081,7 +1081,7 @@ void SfxDocumentPage::Reset( const SfxItemSet& rSet ) aNameED.ClearModifyFlag(); // determine RO-Flag - if ( SFX_ITEM_UNKNOWN == rSet.GetItemState( ID_FILETP_READONLY, FALSE, &pItem ) + if ( SFX_ITEM_UNKNOWN == rSet.GetItemState( ID_FILETP_READONLY, sal_False, &pItem ) || !pItem ) aReadOnlyCB.Hide(); else @@ -1092,7 +1092,7 @@ void SfxDocumentPage::Reset( const SfxItemSet& rSet ) aURL.SetSmartProtocol( INET_PROT_FILE ); aURL.SetSmartURL( aFactory); const String& rMainURL = aURL.GetMainURL( INetURLObject::NO_DECODE ); - aBmp1.SetImage( SvFileInformationManager::GetImage( aURL, TRUE ) ); + aBmp1.SetImage( SvFileInformationManager::GetImage( aURL, sal_True ) ); // determine size and type String aSizeText( aUnknownSize ); @@ -1147,12 +1147,12 @@ void SfxDocumentPage::Reset( const SfxItemSet& rSet ) TriState eState = (TriState)m_bUseUserData; if ( STATE_DONTKNOW == eState ) - aUseUserDataCB.EnableTriState( TRUE ); + aUseUserDataCB.EnableTriState( sal_True ); aUseUserDataCB.SetState( eState ); aUseUserDataCB.SaveValue(); aUseUserDataCB.Enable( bEnableUseUserData ); - bHandleDelete = FALSE; + bHandleDelete = sal_False; aDeleteBtn.Enable( bEnableUseUserData ); } @@ -1197,7 +1197,7 @@ SfxInternetPage::SfxInternetPage( Window* pParent, const SfxItemSet& rItemSet ) pFrame->GetTargetList( aList ); String* pObj; - for( USHORT nPos = ( USHORT ) aList.Count() ; nPos ; ) + for( sal_uInt16 nPos = ( sal_uInt16 ) aList.Count() ; nPos ; ) { pObj = aList.GetObject( --nPos ); aCBFrame.InsertEntry( *pObj ); @@ -1235,30 +1235,30 @@ void SfxInternetPage::ChangeState( STATE eNewState ) switch( eState ) { case S_Init: - EnableNoUpdate( TRUE ); - EnableReload( FALSE ); - EnableForward( FALSE ); + EnableNoUpdate( sal_True ); + EnableReload( sal_False ); + EnableForward( sal_False ); break; case S_NoUpdate: - EnableNoUpdate( FALSE ); + EnableNoUpdate( sal_False ); if( eNewState == S_Reload ) - EnableReload( TRUE ); + EnableReload( sal_True ); else - EnableForward( TRUE ); + EnableForward( sal_True ); break; case S_Reload: - EnableReload( FALSE ); + EnableReload( sal_False ); if( eNewState == S_NoUpdate ) - EnableNoUpdate( TRUE ); + EnableNoUpdate( sal_True ); else - EnableForward( TRUE ); + EnableForward( sal_True ); break; case S_Forward: - EnableForward( FALSE ); + EnableForward( sal_False ); if( eNewState == S_NoUpdate ) - EnableNoUpdate( TRUE ); + EnableNoUpdate( sal_True ); else - EnableReload( TRUE ); + EnableReload( sal_True ); break; default: DBG_ERROR( "*SfxInternetPage::SetState(): unhandled state!" ); @@ -1269,7 +1269,7 @@ void SfxInternetPage::ChangeState( STATE eNewState ) //------------------------------------------------------------------------ -void SfxInternetPage::EnableNoUpdate( BOOL bEnable ) +void SfxInternetPage::EnableNoUpdate( sal_Bool bEnable ) { if( bEnable ) aRBNoAutoUpdate.Check(); @@ -1277,7 +1277,7 @@ void SfxInternetPage::EnableNoUpdate( BOOL bEnable ) //------------------------------------------------------------------------ -void SfxInternetPage::EnableReload( BOOL bEnable ) +void SfxInternetPage::EnableReload( sal_Bool bEnable ) { aFTEvery.Enable( bEnable ); aNFReload.Enable( bEnable ); @@ -1289,7 +1289,7 @@ void SfxInternetPage::EnableReload( BOOL bEnable ) //------------------------------------------------------------------------ -void SfxInternetPage::EnableForward( BOOL bEnable ) +void SfxInternetPage::EnableForward( sal_Bool bEnable ) { aFTAfter.Enable( bEnable ); aNFAfter.Enable( bEnable ); @@ -1357,7 +1357,7 @@ IMPL_LINK( SfxInternetPage, DialogClosedHdl, sfx2::FileDialogHelper*, EMPTYARG ) //------------------------------------------------------------------------ -BOOL SfxInternetPage::FillItemSet( SfxItemSet& rSet ) +sal_Bool SfxInternetPage::FillItemSet( SfxItemSet& rSet ) { const SfxPoolItem* pItem = NULL; SfxDocumentInfoItem* pInfo = NULL; @@ -1367,7 +1367,7 @@ BOOL SfxInternetPage::FillItemSet( SfxItemSet& rSet ) if( pDlg ) pExSet = pDlg->GetExampleSet(); - if( pExSet && SFX_ITEM_SET != pExSet->GetItemState( SID_DOCINFO, TRUE, &pItem ) ) + if( pExSet && SFX_ITEM_SET != pExSet->GetItemState( SID_DOCINFO, sal_True, &pItem ) ) pInfo = pInfoItem; else if ( pItem ) pInfo = new SfxDocumentInfoItem( *(const SfxDocumentInfoItem*)pItem ); @@ -1375,33 +1375,33 @@ BOOL SfxInternetPage::FillItemSet( SfxItemSet& rSet ) if ( !pInfo ) { DBG_ERRORFILE( "SfxInternetPage::FillItemSet(): no item found" ); - return FALSE; + return sal_False; } DBG_ASSERT( eState != S_Init, "*SfxInternetPage::FillItemSet(): state init is not acceptable at this point!" ); - BOOL bEnableReload = FALSE; + sal_Bool bEnableReload = sal_False; ::std::auto_ptr< String > aURL( NULL ); ::std::auto_ptr< String > aFrame( NULL ); - ULONG nDelay = 0; + sal_uIntPtr nDelay = 0; switch( eState ) { case S_NoUpdate: break; case S_Reload: - bEnableReload = TRUE; + bEnableReload = sal_True; aURL = ::std::auto_ptr< String >( new String() ); aFrame = ::std::auto_ptr< String >( new String() ); - nDelay = static_cast<ULONG>(aNFReload.GetValue()); + nDelay = static_cast<sal_uIntPtr>(aNFReload.GetValue()); break; case S_Forward: DBG_ASSERT( aEDForwardURL.GetText().Len(), "+SfxInternetPage::FillItemSet(): empty URL should be not possible for forward option!" ); - bEnableReload = TRUE; + bEnableReload = sal_True; aURL = ::std::auto_ptr< String >( new String( URIHelper::SmartRel2Abs( INetURLObject(aBaseURL), aEDForwardURL.GetText(), URIHelper::GetMaybeFileHdl(), true ) ) ); aFrame = ::std::auto_ptr< String >( new String( aCBFrame.GetText() ) ); - nDelay = static_cast<ULONG>(aNFAfter.GetValue()); + nDelay = static_cast<sal_uIntPtr>(aNFAfter.GetValue()); break; default: break; @@ -1419,7 +1419,7 @@ BOOL SfxInternetPage::FillItemSet( SfxItemSet& rSet ) rSet.Put( *pInfo ); if( pInfo != pInfoItem ) delete pInfo; - return TRUE; + return sal_True; } //------------------------------------------------------------------------ @@ -1434,7 +1434,7 @@ SfxTabPage *SfxInternetPage::Create( Window* pParent, const SfxItemSet& rItemSet void SfxInternetPage::Reset( const SfxItemSet& rSet ) { pInfoItem = &( SfxDocumentInfoItem& ) rSet.Get( SID_DOCINFO ); - SFX_ITEMSET_ARG( &rSet, pURLItem, SfxStringItem, SID_BASEURL, FALSE ); + SFX_ITEMSET_ARG( &rSet, pURLItem, SfxStringItem, SID_BASEURL, sal_False ); DBG_ASSERT( pURLItem, "No BaseURL provided for InternetTabPage!" ); if ( pURLItem ) aBaseURL = pURLItem->GetValue(); @@ -1462,7 +1462,7 @@ void SfxInternetPage::Reset( const SfxItemSet& rSet ) ChangeState( eNewState ); // #102907# ------------------------ - SFX_ITEMSET_ARG( &rSet, pROItem, SfxBoolItem, SID_DOC_READONLY, FALSE ); + SFX_ITEMSET_ARG( &rSet, pROItem, SfxBoolItem, SID_DOC_READONLY, sal_False ); if ( pROItem && pROItem->GetValue() ) { aRBNoAutoUpdate.Disable(); @@ -1513,7 +1513,7 @@ SfxDocumentInfoDialog::SfxDocumentInfoDialog( Window* pParent, &(const SfxDocumentInfoItem &)rItemSet.Get( SID_DOCINFO ); #ifdef DBG_UTIL - SFX_ITEMSET_ARG( &rItemSet, pURLItem, SfxStringItem, SID_BASEURL, FALSE ); + SFX_ITEMSET_ARG( &rItemSet, pURLItem, SfxStringItem, SID_BASEURL, sal_False ); DBG_ASSERT( pURLItem, "No BaseURL provided for InternetTabPage!" ); #endif @@ -1521,7 +1521,7 @@ SfxDocumentInfoDialog::SfxDocumentInfoDialog( Window* pParent, const SfxPoolItem* pItem = 0; String aTitle( GetText() ); if ( SFX_ITEM_SET != - rItemSet.GetItemState( SID_EXPLORER_PROPS_START, FALSE, &pItem ) ) + rItemSet.GetItemState( SID_EXPLORER_PROPS_START, sal_False, &pItem ) ) { // Dateiname String aFile( pInfoItem->GetValue() ); @@ -1558,7 +1558,7 @@ SfxDocumentInfoDialog::SfxDocumentInfoDialog( Window* pParent, // ----------------------------------------------------------------------- -void SfxDocumentInfoDialog::PageCreated( USHORT nId, SfxTabPage &rPage ) +void SfxDocumentInfoDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) { if ( TP_DOCINFODOC == nId ) ( (SfxDocumentPage&)rPage ).EnableUseUserData(); @@ -1949,7 +1949,7 @@ bool CustomPropertiesWindow::IsLineValid( CustomPropertyLine* pLine ) const { sal_uInt32 nTemp = nIndex; bIsValid = const_cast< SvNumberFormatter& >( - m_aNumberFormatter ).IsNumberFormat( sValue, nIndex, fDummy ) != FALSE; + m_aNumberFormatter ).IsNumberFormat( sValue, nIndex, fDummy ) != sal_False; if ( bIsValid && nTemp != nIndex ) // sValue is a number but the format doesn't match the index bIsValid = false; @@ -2000,7 +2000,7 @@ void CustomPropertiesWindow::InitControls( HeaderBar* pHeaderBar, const ScrollBa Window* pWindows[] = { &m_aNameBox, &m_aTypeBox, &m_aValueEdit, &m_aRemoveButton, NULL }; Window** pCurrent = pWindows; - USHORT nPos = 0; + sal_uInt16 nPos = 0; while ( *pCurrent ) { Rectangle aRect = pHeaderBar->GetItemRect( pHeaderBar->GetItemId( nPos++ ) ); @@ -2041,9 +2041,9 @@ void CustomPropertiesWindow::InitControls( HeaderBar* pHeaderBar, const ScrollBa ( m_aRemoveButton.GetPosPixel().Y() * 2 ) + m_aRemoveButton.GetSizePixel().Height(); } -USHORT CustomPropertiesWindow::GetVisibleLineCount() const +sal_uInt16 CustomPropertiesWindow::GetVisibleLineCount() const { - USHORT nCount = 0; + sal_uInt16 nCount = 0; std::vector< CustomPropertyLine* >::const_iterator pIter; for ( pIter = m_aCustomPropertiesLines.begin(); pIter != m_aCustomPropertiesLines.end(); ++pIter ) @@ -2254,7 +2254,7 @@ Sequence< beans::PropertyValue > CustomPropertiesWindow::GetCustomProperties() c double nValue = 0; sal_uInt32 nIndex = const_cast< SvNumberFormatter& >( m_aNumberFormatter ).GetFormatIndex( NF_NUMBER_SYSTEM ); - BOOL bIsNum = const_cast< SvNumberFormatter& >( m_aNumberFormatter ). + sal_Bool bIsNum = const_cast< SvNumberFormatter& >( m_aNumberFormatter ). IsNumberFormat( pLine->m_aValueEdit.GetText(), nIndex, nValue ); if ( bIsNum ) aPropertiesSeq[i].Value <<= makeAny( nValue ); @@ -2401,9 +2401,9 @@ IMPL_LINK( SfxCustomPropertiesPage, AddHdl, PushButton*, EMPTYARG ) return 0; } -BOOL SfxCustomPropertiesPage::FillItemSet( SfxItemSet& rSet ) +sal_Bool SfxCustomPropertiesPage::FillItemSet( SfxItemSet& rSet ) { - BOOL bModified = FALSE; + sal_Bool bModified = sal_False; const SfxPoolItem* pItem = NULL; SfxDocumentInfoItem* pInfo = NULL; bool bMustDelete = false; @@ -2411,7 +2411,7 @@ BOOL SfxCustomPropertiesPage::FillItemSet( SfxItemSet& rSet ) if ( GetTabDialog() && GetTabDialog()->GetExampleSet() ) { if( SFX_ITEM_SET != - GetTabDialog()->GetExampleSet()->GetItemState( SID_DOCINFO, TRUE, &pItem ) ) + GetTabDialog()->GetExampleSet()->GetItemState( SID_DOCINFO, sal_True, &pItem ) ) pInfo = &( SfxDocumentInfoItem& )rSet.Get( SID_DOCINFO ); else { @@ -2432,7 +2432,7 @@ BOOL SfxCustomPropertiesPage::FillItemSet( SfxItemSet& rSet ) } } - bModified = TRUE; //!!! + bModified = sal_True; //!!! if ( bModified ) rSet.Put( *pInfo ); if ( bMustDelete ) |