From 7799914b16ac11d59524a9e5aa1d2a2c06645185 Mon Sep 17 00:00:00 2001 From: Xiaofei Zhang Date: Fri, 5 Nov 2010 10:31:15 +0800 Subject: removetooltypes01: #i112600# remove tooltypes from toolkit, svtools and framework --- framework/source/services/autorecovery.cxx | 16 ++++---- framework/source/services/backingcomp.cxx | 14 +++---- framework/source/services/backingwindow.cxx | 26 ++++++------ framework/source/services/desktop.cxx | 2 +- framework/source/services/frame.cxx | 14 +++---- framework/source/services/license.cxx | 24 ++++++------ framework/source/services/menudocumenthandler.cxx | 48 +++++++++++------------ framework/source/services/tabwindowservice.cxx | 12 +++--- 8 files changed, 78 insertions(+), 78 deletions(-) (limited to 'framework/source/services') diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index c4cc7149ab6d..530252c9440f 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -229,7 +229,7 @@ static const sal_Int32 GIVE_UP_RETRY = 1; // in // should be flushed an exception ... so the special error handler for this scenario is triggered // #define TRIGGER_FULL_DISC_CHECK -// force "return FALSE" for the method impl_enoughDiscSpace(). +// force "return sal_False" for the method impl_enoughDiscSpace(). // #define SIMULATE_FULL_DISC //----------------------------------------------- @@ -923,7 +923,7 @@ void SAL_CALL AutoRecovery::notifyEvent(const css::document::EventObject& aEvent else if (aEvent.EventName.equals(EVENT_ON_UNLOAD)) { - implts_deregisterDocument(xDocument, sal_True); // TRUE => stop listening for disposing() ! + implts_deregisterDocument(xDocument, sal_True); // sal_True => stop listening for disposing() ! } } @@ -1018,7 +1018,7 @@ void SAL_CALL AutoRecovery::disposing(const css::lang::EventObject& aEvent) css::uno::Reference< css::frame::XModel > xDocument(aEvent.Source, css::uno::UNO_QUERY); if (xDocument.is()) { - implts_deregisterDocument(xDocument, sal_False); // FALSE => dont call removeEventListener() .. because it's not needed here + implts_deregisterDocument(xDocument, sal_False); // sal_False => dont call removeEventListener() .. because it's not needed here return; } @@ -1572,7 +1572,7 @@ void AutoRecovery::implts_updateTimer() ) return; - ULONG nMilliSeconds = 0; + sal_uIntPtr nMilliSeconds = 0; if (m_eTimerType == AutoRecovery::E_NORMAL_AUTOSAVE_INTERVALL) { nMilliSeconds = (m_nAutoSaveTimeIntervall*60000); // [min] => 60.000 ms @@ -1906,7 +1906,7 @@ void AutoRecovery::implts_deregisterDocument(const css::uno::Reference< css::fra AutoRecovery::st_impl_removeFile(aInfo.OldTempURL); AutoRecovery::st_impl_removeFile(aInfo.NewTempURL); - implts_flushConfigItem(aInfo, sal_True); // TRUE => remove it from config + implts_flushConfigItem(aInfo, sal_True); // sal_True => remove it from config } //----------------------------------------------- @@ -1947,7 +1947,7 @@ void AutoRecovery::implts_updateModifiedState(const css::uno::Reference< css::fr { AutoRecovery::TDocumentInfo& rInfo = *pIt; - // use TRUE as fallback ... so we recognize every document on EmergencySave/AutoRecovery! + // use sal_True as fallback ... so we recognize every document on EmergencySave/AutoRecovery! sal_Bool bModified = sal_True; css::uno::Reference< css::util::XModifiable > xModify(xDocument, css::uno::UNO_QUERY); if (xModify.is()) @@ -3297,7 +3297,7 @@ void AutoRecovery::implts_cleanUpWorkingEntry(const DispatchParams& aParams) AutoRecovery::st_impl_removeFile(rInfo.OldTempURL); AutoRecovery::st_impl_removeFile(rInfo.NewTempURL); - implts_flushConfigItem(rInfo, sal_True); // TRUE => remove it from xml config! + implts_flushConfigItem(rInfo, sal_True); // sal_True => remove it from xml config! m_lDocCache.erase(pIt); break; /// !!! pIt is not defined any longer ... further this function has finished it's work @@ -3378,7 +3378,7 @@ void SAL_CALL AutoRecovery::getFastPropertyValue(css::uno::Any& aValue , sal_Bool bRecoveryData = ((sal_Bool)(m_lDocCache.size()>0)); // exists session data ... => then we cant say, that these - // data are valid for recovery. So we have to return FALSE then! + // data are valid for recovery. So we have to return sal_False then! if (bSessionData) bRecoveryData = sal_False; diff --git a/framework/source/services/backingcomp.cxx b/framework/source/services/backingcomp.cxx index 13c5647341e6..1c188fb111f9 100644 --- a/framework/source/services/backingcomp.cxx +++ b/framework/source/services/backingcomp.cxx @@ -283,8 +283,8 @@ css::uno::Sequence< sal_Int8 > SAL_CALL BackingComp::getImplementationId() @see impl_getStaticSupportedServiceNames() @see SERVICENAME - @return if the queried service is supported; -
otherwise. + @return if the queried service is supported; +
otherwise. */ sal_Bool SAL_CALL BackingComp::supportsService( /*IN*/ const ::rtl::OUString& sServiceName ) @@ -506,7 +506,7 @@ void SAL_CALL BackingComp::attachFrame( /*IN*/ const css::uno::Reference< css::f // disable full screen mode of the frame! if (pParent->IsFullScreenMode()) { - pParent->ShowFullScreenMode(FALSE); + pParent->ShowFullScreenMode(sal_False); pParent->SetMenuBarMode(MENUBAR_MODE_NORMAL); } @@ -546,7 +546,7 @@ void SAL_CALL BackingComp::attachFrame( /*IN*/ const css::uno::Reference< css::f This component does not know any model. It will be represented by a window and it's controller only. - return everytime. + return everytime. */ sal_Bool SAL_CALL BackingComp::attachModel( /*IN*/ const css::uno::Reference< css::frame::XModel >& ) @@ -625,10 +625,10 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL BackingComp::getFrame() UI user. @param bSuspend - If its set to TRUE this controller should be suspended. - FALSE will resuspend it. + If its set to sal_True this controller should be suspended. + sal_False will resuspend it. - @return TRUE if the request could be finished successfully; FALSE otherwise. + @return sal_True if the request could be finished successfully; sal_False otherwise. */ sal_Bool SAL_CALL BackingComp::suspend( /*IN*/ sal_Bool ) diff --git a/framework/source/services/backingwindow.cxx b/framework/source/services/backingwindow.cxx index 0f6815a69cc3..e2e18f1a8564 100644 --- a/framework/source/services/backingwindow.cxx +++ b/framework/source/services/backingwindow.cxx @@ -82,7 +82,7 @@ DecoToolBox::DecoToolBox( Window* pParent, WinBits nStyle ) : ToolBox( pParent, nStyle ) { SetBackground(); - SetPaintTransparent( TRUE ); + SetPaintTransparent( sal_True ); } void DecoToolBox::DataChanged( const DataChangedEvent& rDCEvt ) @@ -93,17 +93,17 @@ void DecoToolBox::DataChanged( const DataChangedEvent& rDCEvt ) { calcMinSize(); SetBackground(); - SetPaintTransparent( TRUE ); + SetPaintTransparent( sal_True ); } } void DecoToolBox::calcMinSize() { ToolBox aTbx( GetParent() ); - USHORT nItems = GetItemCount(); - for( USHORT i = 0; i < nItems; i++ ) + sal_uInt16 nItems = GetItemCount(); + for( sal_uInt16 i = 0; i < nItems; i++ ) { - USHORT nId = GetItemId( i ); + sal_uInt16 nId = GetItemId( i ); aTbx.InsertItem( nId, GetItemImage( nId ) ); } aTbx.SetOutStyle( TOOLBOX_STYLE_FLAT ); @@ -192,8 +192,8 @@ BackingWindow::BackingWindow( Window* i_pParent ) : // clean up resource stack FreeResource(); - maWelcome.SetPaintTransparent( TRUE ); - maProduct.SetPaintTransparent( TRUE ); + maWelcome.SetPaintTransparent( sal_True ); + maProduct.SetPaintTransparent( sal_True ); EnableChildTransparentMode(); SetStyle( GetStyle() | WB_DIALOGCONTROL ); @@ -386,7 +386,7 @@ void BackingWindow::prepareRecentFileMenu() aBuf.append( i+1 ); aBuf.appendAscii( ": " ); aBuf.append( aMenuTitle ); - mpRecentMenu->InsertItem( static_cast(i+1), aBuf.makeStringAndClear() ); + mpRecentMenu->InsertItem( static_cast(i+1), aBuf.makeStringAndClear() ); } maOpenButton.SetPopupMenu( mpRecentMenu ); } @@ -558,9 +558,9 @@ void BackingWindow::initControls() MenuBar* pMBar = pSysWin->GetMenuBar(); if( pMBar ) { - for( USHORT i = 0; i < pMBar->GetItemCount(); i++ ) + for( sal_uInt16 i = 0; i < pMBar->GetItemCount(); i++ ) { - USHORT nItemId = pMBar->GetItemId( i ); + sal_uInt16 nItemId = pMBar->GetItemId( i ); String aItemText( pMBar->GetItemText( nItemId ) ); if( aItemText.Len() ) aMnemns.RegisterMnemonic( aItemText ); @@ -671,11 +671,11 @@ void BackingWindow::layoutButton( { rtl::OUString aURL( rtl::OUString::createFromAscii( i_pURL ? i_pURL : "" ) ); // setup button - i_rBtn.SetPaintTransparent( TRUE ); + i_rBtn.SetPaintTransparent( sal_True ); i_rBtn.SetClickHdl( LINK( this, BackingWindow, ClickHdl ) ); if( i_pURL && (! i_rOpt.IsModuleInstalled( i_eMod ) || i_rURLS.find( aURL ) == i_rURLS.end()) ) { - i_rBtn.Enable( FALSE ); + i_rBtn.Enable( sal_False ); } // setup text @@ -1123,7 +1123,7 @@ void BackingWindow::dispatchURL( const rtl::OUString& i_rURL, if ( xDispatch.is() ) { ImplDelayedDispatch* pDisp = new ImplDelayedDispatch( xDispatch, aDispatchURL, i_rArgs ); - ULONG nEventId = 0; + sal_uIntPtr nEventId = 0; if( ! Application::PostUserEvent( nEventId, Link( NULL, implDispatchDelayed ), pDisp ) ) delete pDisp; // event could not be posted for unknown reason, at least don't leak } diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx index 293e03ee655b..447ccc208d6b 100644 --- a/framework/source/services/desktop.cxx +++ b/framework/source/services/desktop.cxx @@ -1519,7 +1519,7 @@ sal_Bool SAL_CALL Desktop::convertFastPropertyValue( css::uno::Any& aCon // Register transaction and reject wrong calls. TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS ); - // Initialize state with FALSE !!! + // Initialize state with sal_False !!! // (Handle can be invalid) sal_Bool bReturn = sal_False; diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx index 18d5a1c31bef..a9638f3e6c74 100644 --- a/framework/source/services/frame.cxx +++ b/framework/source/services/frame.cxx @@ -280,7 +280,7 @@ Frame::Frame( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFac , PropertySetHelper ( xFactory, &m_aLock, &m_aTransactionManager, - sal_False) // FALSE => dont release shared mutex on calling us! + sal_False) // sal_False => dont release shared mutex on calling us! , ::cppu::OWeakObject ( ) // init member , m_xFactory ( xFactory ) @@ -1345,9 +1345,9 @@ void SAL_CALL Frame::contextChanged() throw( css::uno::RuntimeException ) reference to new component controller (may for relasing or setting of a simple component) - @return if operation was successful, otherwise. + @return if operation was successful, otherwise. - @onerror We return . + @onerror We return . @threadsafe yes @modified 06.05.2002 11:39, as96863 *//*-*****************************************************************************************************/ @@ -1605,14 +1605,14 @@ void SAL_CALL Frame::removeFrameActionListener( const css::uno::Reference< css:: /*-****************************************************************************************************//** @short support two way mechanism to release a frame @descr This method ask internal component (controller) if he accept this close request. - In case of nothing will be happen (from point of caller of this close method). - In case of a CloseVetoException is thrown. After such exception given parameter + In case of nothing will be happen (from point of caller of this close method). + In case of a CloseVetoException is thrown. After such exception given parameter bDeliverOwnerShip regulate which will be the new owner of this instance. @attention It's the replacement for XTask::close() which is marked as obsolete method. @param bDeliverOwnerShip - If parameter is set to the original caller will be the owner after thrown + If parameter is set to the original caller will be the owner after thrown veto exception and must try to close this frame at later time again. Otherwhise the source of throwed exception is the right one. May it will be the frame himself. @@ -3077,7 +3077,7 @@ void Frame::implts_checkSuicide() Its existence regulate visibility of this closer item. @param bState - enable; disable this state + enable; disable this state */ void Frame::impl_setCloser( /*IN*/ const css::uno::Reference< css::frame::XFrame >& xFrame , diff --git a/framework/source/services/license.cxx b/framework/source/services/license.cxx index 18f3e21bf67d..455231f7bc51 100644 --- a/framework/source/services/license.cxx +++ b/framework/source/services/license.cxx @@ -243,7 +243,7 @@ static sal_Bool _parseDateTime(const ::rtl::OUString& aString, DateTime& aDateTi sal_Int32 nMinute = aTimeString.getToken(0, ':', nIndex).toInt32(); sal_Int32 nSecond = aTimeString.getToken(0, ':', nIndex).toInt32(); - Date tmpDate((USHORT)nDay, (USHORT)nMonth, (USHORT)nYear); + Date tmpDate((sal_uInt16)nDay, (sal_uInt16)nMonth, (sal_uInt16)nYear); Time tmpTime(nHour, nMinute, nSecond); DateTime tmpDateTime(tmpDate, tmpTime); if (aString.indexOf(aUTCString) < 0) @@ -439,7 +439,7 @@ LicenseDialog::LicenseDialog(const ::rtl::OUString & aLicensePath, ResMgr *pResM aArrow(this, ResId(IMG_ARROW, *pResMgr)), aStrAccept( ResId(LICENSE_ACCEPT, *pResMgr) ), aStrNotAccept( ResId(LICENSE_NOTACCEPT, *pResMgr) ), - bEndReached(FALSE) + bEndReached(sal_False) { FreeResource(); @@ -502,7 +502,7 @@ IMPL_LINK( LicenseDialog, PageDownHdl, PushButton *, EMPTYARG ) IMPL_LINK( LicenseDialog, EndReachedHdl, LicenseView *, EMPTYARG ) { - bEndReached = TRUE; + bEndReached = sal_True; EnableControls(); @@ -532,7 +532,7 @@ void LicenseDialog::EnableControls() { if( !bEndReached && ( aLicenseML.IsEndReached() || !aLicenseML.GetText().Len() ) ) - bEndReached = TRUE; + bEndReached = sal_True; if ( bEndReached ) { @@ -583,20 +583,20 @@ void LicenseView::ScrollDown( ScrollType eScroll ) pScroll->DoScrollAction( eScroll ); } -BOOL LicenseView::IsEndReached() const +sal_Bool LicenseView::IsEndReached() const { - BOOL bEndReached; + sal_Bool bEndReached; ExtTextView* pView = GetTextView(); ExtTextEngine* pEdit = GetTextEngine(); - ULONG nHeight = pEdit->GetTextHeight(); + sal_uIntPtr nHeight = pEdit->GetTextHeight(); Size aOutSize = pView->GetWindow()->GetOutputSizePixel(); Point aBottom( 0, aOutSize.Height() ); - if ( (ULONG) pView->GetDocPos( aBottom ).Y() >= nHeight - 1 ) - bEndReached = TRUE; + if ( (sal_uIntPtr) pView->GetDocPos( aBottom ).Y() >= nHeight - 1 ) + bEndReached = sal_True; else - bEndReached = FALSE; + bEndReached = sal_False; return bEndReached; } @@ -605,8 +605,8 @@ void LicenseView::Notify( SfxBroadcaster&, const SfxHint& rHint ) { if ( rHint.IsA( TYPE(TextHint) ) ) { - BOOL bLastVal = EndReached(); - ULONG nId = ((const TextHint&)rHint).GetId(); + sal_Bool bLastVal = EndReached(); + sal_uIntPtr nId = ((const TextHint&)rHint).GetId(); if ( nId == TEXT_HINT_PARAINSERTED ) { diff --git a/framework/source/services/menudocumenthandler.cxx b/framework/source/services/menudocumenthandler.cxx index 8741fff39320..1d4dae6284ac 100644 --- a/framework/source/services/menudocumenthandler.cxx +++ b/framework/source/services/menudocumenthandler.cxx @@ -94,7 +94,7 @@ const ::rtl::OUString aSlotAutoPilot( RTL_CONSTASCII_USTRINGPARAM( "slot:6381" ) const ::rtl::OUString aSpecialFileMenu( RTL_CONSTASCII_USTRINGPARAM( "file" )); const ::rtl::OUString aSpecialWindowMenu( RTL_CONSTASCII_USTRINGPARAM( "window" )); -const ULONG MENU_SAVE_LABEL = 0x00000001; +const sal_uIntPtr MENU_SAVE_LABEL = 0x00000001; namespace framework { @@ -259,7 +259,7 @@ void SAL_CALL OReadMenuDocumentHandler::endElement( const OUString& aName ) // #110897# OReadMenuBarHandler::OReadMenuBarHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, - MenuBar* pMenuBar, USHORT* pItemId ) + MenuBar* pMenuBar, sal_uInt16* pItemId ) : // #110897# mxServiceFactory( xServiceFactory ), m_pMenuBar( pMenuBar ), @@ -306,7 +306,7 @@ throw( SAXException, RuntimeException ) { ++m_nElementDepth; - ULONG nHelpId = 0; + sal_uIntPtr nHelpId = 0; OUString aCommandId; OUString aLabel; @@ -328,9 +328,9 @@ throw( SAXException, RuntimeException ) if ( aCommandId.getLength() > 0 ) { - USHORT nItemId; + sal_uInt16 nItemId; if ( aCommandId.compareTo( aSlotProtocol, aSlotProtocol.getLength() ) == 0 ) - nItemId = (USHORT) aCommandId.copy( aSlotProtocol.getLength() ).toInt32(); + nItemId = (sal_uInt16) aCommandId.copy( aSlotProtocol.getLength() ).toInt32(); else nItemId = ++(*m_pItemId); @@ -402,7 +402,7 @@ void OReadMenuBarHandler::endElement( const OUString& aName ) // ----------------------------------------------------------------------------- -OReadMenuHandler::OReadMenuHandler( Menu* pMenu, USHORT* pItemId ) : +OReadMenuHandler::OReadMenuHandler( Menu* pMenu, sal_uInt16* pItemId ) : m_pMenu( pMenu ), m_nElementDepth( 0 ), m_bMenuPopupMode( sal_False ), @@ -486,7 +486,7 @@ void SAL_CALL OReadMenuHandler::endElement( const OUString& aName ) // ----------------------------------------------------------------------------- -OReadMenuPopupHandler::OReadMenuPopupHandler( Menu* pMenu, USHORT* pItemId ) : +OReadMenuPopupHandler::OReadMenuPopupHandler( Menu* pMenu, sal_uInt16* pItemId ) : m_pMenu( pMenu ), m_nElementDepth( 0 ), m_bMenuMode( sal_False ), @@ -523,7 +523,7 @@ throw( SAXException, RuntimeException ) m_xReader->startElement( aName, xAttrList ); else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ELEMENT_MENU ))) { - ULONG nHelpId = 0; + sal_uIntPtr nHelpId = 0; OUString aCommandId; OUString aLabel; @@ -545,9 +545,9 @@ throw( SAXException, RuntimeException ) if ( aCommandId.getLength() > 0 ) { - USHORT nItemId; + sal_uInt16 nItemId; if ( aCommandId.compareTo( aSlotProtocol, aSlotProtocol.getLength() ) == 0 ) - nItemId = (USHORT) aCommandId.copy( aSlotProtocol.getLength() ).toInt32(); + nItemId = (sal_uInt16) aCommandId.copy( aSlotProtocol.getLength() ).toInt32(); else nItemId = ++(*m_pItemId); @@ -579,7 +579,7 @@ throw( SAXException, RuntimeException ) } else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ELEMENT_MENUITEM ))) { - ULONG nHelpId = 0; + sal_uIntPtr nHelpId = 0; OUString aCommandId; OUString aLabel; @@ -598,9 +598,9 @@ throw( SAXException, RuntimeException ) if ( aCommandId.getLength() > 0 ) { - USHORT nItemId; + sal_uInt16 nItemId; if ( aCommandId.compareTo( aSlotProtocol, aSlotProtocol.getLength() ) == 0 ) - nItemId = (USHORT) aCommandId.copy( aSlotProtocol.getLength() ).toInt32(); + nItemId = (sal_uInt16) aCommandId.copy( aSlotProtocol.getLength() ).toInt32(); else nItemId = ++(*m_pItemId); @@ -744,12 +744,12 @@ throw ( SAXException, RuntimeException ) void OWriteMenuDocumentHandler::WriteMenu( Menu* pMenu ) throw ( SAXException, RuntimeException ) { - USHORT nItemCount = pMenu->GetItemCount(); - BOOL bSeparator = FALSE; + sal_uInt16 nItemCount = pMenu->GetItemCount(); + sal_Bool bSeparator = sal_False; - for ( USHORT nItemPos = 0; nItemPos < nItemCount; nItemPos++ ) + for ( sal_uInt16 nItemPos = 0; nItemPos < nItemCount; nItemPos++ ) { - USHORT nItemId = pMenu->GetItemId( nItemPos ); + sal_uInt16 nItemId = pMenu->GetItemId( nItemPos ); PopupMenu* pPopupMenu = pMenu->GetPopupMenu( nItemId ); if ( pPopupMenu ) @@ -761,7 +761,7 @@ throw ( SAXException, RuntimeException ) { // special popup menus (filled during runtime) must be saved as a menuitem!!! WriteMenuItem( pMenu, nItemId ); - bSeparator = FALSE; + bSeparator = sal_False; } else if ( nItemId == SID_FORMATMENU ) { @@ -793,7 +793,7 @@ throw ( SAXException, RuntimeException ) m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); m_xWriteDocumentHandler->endElement( OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENU )) ); m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); - bSeparator = FALSE; + bSeparator = sal_False; } else if ( !AddonPopupMenu::IsCommandURLPrefix ( aItemCommand )) { @@ -829,7 +829,7 @@ throw ( SAXException, RuntimeException ) m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); m_xWriteDocumentHandler->endElement( OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENU )) ); m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); - bSeparator = FALSE; + bSeparator = sal_False; } } else @@ -841,7 +841,7 @@ throw ( SAXException, RuntimeException ) !MenuConfiguration::IsWindowListItemId( nItemId ) && !AddonMenuManager::IsAddonMenuId( nItemId )) { - bSeparator = FALSE; + bSeparator = sal_False; WriteMenuItem( pMenu, nItemId ); } } @@ -849,14 +849,14 @@ throw ( SAXException, RuntimeException ) { // Don't write two separators together WriteMenuSeparator(); - bSeparator = TRUE; + bSeparator = sal_True; } } } } -void OWriteMenuDocumentHandler::WriteMenuItem( Menu* pMenu, USHORT nItemId ) +void OWriteMenuDocumentHandler::WriteMenuItem( Menu* pMenu, sal_uInt16 nItemId ) { AttributeListImpl* pList = new AttributeListImpl; Reference< XAttributeList > xList( (XAttributeList *) pList , UNO_QUERY ); @@ -872,7 +872,7 @@ void OWriteMenuDocumentHandler::WriteMenuItem( Menu* pMenu, USHORT nItemId ) m_aAttributeType, aCommand ); - ULONG nHelpId = pMenu->GetHelpId( nItemId ); + sal_uIntPtr nHelpId = pMenu->GetHelpId( nItemId ); if ( nHelpId > 0 ) { pList->addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_NS_HELPID )), diff --git a/framework/source/services/tabwindowservice.cxx b/framework/source/services/tabwindowservice.cxx index 9af8581652d3..9d8c8fd8cae1 100644 --- a/framework/source/services/tabwindowservice.cxx +++ b/framework/source/services/tabwindowservice.cxx @@ -119,7 +119,7 @@ TabWindowService::TabWindowService( const css::uno::Reference< css::lang::XMulti , PropertySetHelper ( xFactory , &m_aLock , &m_aTransactionManager , - sal_False ) // FALSE => dont release shared mutex on calling us! + sal_False ) // sal_False => dont release shared mutex on calling us! , OWeakObject ( ) // Init member @@ -368,7 +368,7 @@ IMPL_LINK( TabWindowService, EventListener, VclSimpleEvent*, pEvent ) if ( !pEvent && !pEvent->ISA(VclWindowEvent)) return 0; - ULONG nEventId = pEvent->GetId(); + sal_uIntPtr nEventId = pEvent->GetId(); VclWindowEvent* pWinEvt = static_cast< VclWindowEvent* >(pEvent); css::uno::Reference< css::uno::XInterface > xThis ( static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY ); @@ -399,19 +399,19 @@ IMPL_LINK( TabWindowService, EventListener, VclSimpleEvent*, pEvent ) switch (nEventId) { case VCLEVENT_TABPAGE_ACTIVATE : - pListener->activated( (sal_Int32)(ULONG)pWinEvt->GetData() ); + pListener->activated( (sal_Int32)(sal_uIntPtr)pWinEvt->GetData() ); break; case VCLEVENT_TABPAGE_DEACTIVATE : - pListener->deactivated( (sal_Int32)(ULONG)pWinEvt->GetData() ); + pListener->deactivated( (sal_Int32)(sal_uIntPtr)pWinEvt->GetData() ); break; case VCLEVENT_TABPAGE_INSERTED : - pListener->inserted( (sal_Int32)(ULONG)pWinEvt->GetData() ); + pListener->inserted( (sal_Int32)(sal_uIntPtr)pWinEvt->GetData() ); break; case VCLEVENT_TABPAGE_REMOVED : - pListener->removed( (sal_Int32)(ULONG)pWinEvt->GetData() ); + pListener->removed( (sal_Int32)(sal_uIntPtr)pWinEvt->GetData() ); break; case VCLEVENT_TABPAGE_PAGETEXTCHANGED : -- cgit From baa228bd0d3c925bdceec1baf7b0095380bb2c69 Mon Sep 17 00:00:00 2001 From: Carsten Driesner Date: Thu, 13 Jan 2011 13:11:20 +0100 Subject: removetooltypes01: #i112600# Exchange misleading sal_uIntPtr with sal_uLong in framework --- framework/source/services/autorecovery.cxx | 2 +- framework/source/services/backingwindow.cxx | 2 +- framework/source/services/license.cxx | 6 +++--- framework/source/services/tabwindowservice.cxx | 10 +++++----- 4 files changed, 10 insertions(+), 10 deletions(-) (limited to 'framework/source/services') diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index 086d60ad1962..564e26f2651b 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -1576,7 +1576,7 @@ void AutoRecovery::implts_updateTimer() ) return; - sal_uIntPtr nMilliSeconds = 0; + sal_uLong nMilliSeconds = 0; if (m_eTimerType == AutoRecovery::E_NORMAL_AUTOSAVE_INTERVALL) { nMilliSeconds = (m_nAutoSaveTimeIntervall*60000); // [min] => 60.000 ms diff --git a/framework/source/services/backingwindow.cxx b/framework/source/services/backingwindow.cxx index dd6cc8e3306d..1d1e877a5a86 100644 --- a/framework/source/services/backingwindow.cxx +++ b/framework/source/services/backingwindow.cxx @@ -1136,7 +1136,7 @@ void BackingWindow::dispatchURL( const rtl::OUString& i_rURL, if ( xDispatch.is() ) { ImplDelayedDispatch* pDisp = new ImplDelayedDispatch( xDispatch, aDispatchURL, i_rArgs ); - sal_uIntPtr nEventId = 0; + sal_uLong nEventId = 0; if( ! Application::PostUserEvent( nEventId, Link( NULL, implDispatchDelayed ), pDisp ) ) delete pDisp; // event could not be posted for unknown reason, at least don't leak } diff --git a/framework/source/services/license.cxx b/framework/source/services/license.cxx index 455231f7bc51..f140b8e22886 100644 --- a/framework/source/services/license.cxx +++ b/framework/source/services/license.cxx @@ -589,11 +589,11 @@ sal_Bool LicenseView::IsEndReached() const ExtTextView* pView = GetTextView(); ExtTextEngine* pEdit = GetTextEngine(); - sal_uIntPtr nHeight = pEdit->GetTextHeight(); + sal_uLong nHeight = pEdit->GetTextHeight(); Size aOutSize = pView->GetWindow()->GetOutputSizePixel(); Point aBottom( 0, aOutSize.Height() ); - if ( (sal_uIntPtr) pView->GetDocPos( aBottom ).Y() >= nHeight - 1 ) + if ( (sal_uLong) pView->GetDocPos( aBottom ).Y() >= nHeight - 1 ) bEndReached = sal_True; else bEndReached = sal_False; @@ -606,7 +606,7 @@ void LicenseView::Notify( SfxBroadcaster&, const SfxHint& rHint ) if ( rHint.IsA( TYPE(TextHint) ) ) { sal_Bool bLastVal = EndReached(); - sal_uIntPtr nId = ((const TextHint&)rHint).GetId(); + sal_uLong nId = ((const TextHint&)rHint).GetId(); if ( nId == TEXT_HINT_PARAINSERTED ) { diff --git a/framework/source/services/tabwindowservice.cxx b/framework/source/services/tabwindowservice.cxx index 9d8c8fd8cae1..ef29214bc229 100644 --- a/framework/source/services/tabwindowservice.cxx +++ b/framework/source/services/tabwindowservice.cxx @@ -368,7 +368,7 @@ IMPL_LINK( TabWindowService, EventListener, VclSimpleEvent*, pEvent ) if ( !pEvent && !pEvent->ISA(VclWindowEvent)) return 0; - sal_uIntPtr nEventId = pEvent->GetId(); + sal_uLong nEventId = pEvent->GetId(); VclWindowEvent* pWinEvt = static_cast< VclWindowEvent* >(pEvent); css::uno::Reference< css::uno::XInterface > xThis ( static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY ); @@ -399,19 +399,19 @@ IMPL_LINK( TabWindowService, EventListener, VclSimpleEvent*, pEvent ) switch (nEventId) { case VCLEVENT_TABPAGE_ACTIVATE : - pListener->activated( (sal_Int32)(sal_uIntPtr)pWinEvt->GetData() ); + pListener->activated( (sal_Int32)(sal_uLong)pWinEvt->GetData() ); break; case VCLEVENT_TABPAGE_DEACTIVATE : - pListener->deactivated( (sal_Int32)(sal_uIntPtr)pWinEvt->GetData() ); + pListener->deactivated( (sal_Int32)(sal_uLong)pWinEvt->GetData() ); break; case VCLEVENT_TABPAGE_INSERTED : - pListener->inserted( (sal_Int32)(sal_uIntPtr)pWinEvt->GetData() ); + pListener->inserted( (sal_Int32)(sal_uLong)pWinEvt->GetData() ); break; case VCLEVENT_TABPAGE_REMOVED : - pListener->removed( (sal_Int32)(sal_uIntPtr)pWinEvt->GetData() ); + pListener->removed( (sal_Int32)(sal_uLong)pWinEvt->GetData() ); break; case VCLEVENT_TABPAGE_PAGETEXTCHANGED : -- cgit From 94eae11e9ee5956df320078b759ad86459df6694 Mon Sep 17 00:00:00 2001 From: Mikhail Voytenko Date: Fri, 14 Jan 2011 11:20:36 +0100 Subject: removetooltypes01: #i112600# fix TRUE/FALSE autodoc tags --- framework/source/services/backingcomp.cxx | 6 +++--- framework/source/services/frame.cxx | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'framework/source/services') diff --git a/framework/source/services/backingcomp.cxx b/framework/source/services/backingcomp.cxx index ae354919491c..b8db175886d2 100644 --- a/framework/source/services/backingcomp.cxx +++ b/framework/source/services/backingcomp.cxx @@ -283,8 +283,8 @@ css::uno::Sequence< sal_Int8 > SAL_CALL BackingComp::getImplementationId() @see impl_getStaticSupportedServiceNames() @see SERVICENAME - @return if the queried service is supported; -
otherwise. + @return if the queried service is supported; +
otherwise. */ sal_Bool SAL_CALL BackingComp::supportsService( /*IN*/ const ::rtl::OUString& sServiceName ) @@ -546,7 +546,7 @@ void SAL_CALL BackingComp::attachFrame( /*IN*/ const css::uno::Reference< css::f This component does not know any model. It will be represented by a window and it's controller only. - return everytime. + return everytime. */ sal_Bool SAL_CALL BackingComp::attachModel( /*IN*/ const css::uno::Reference< css::frame::XModel >& ) diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx index a3ccf6887cf6..b9dd626cf06d 100644 --- a/framework/source/services/frame.cxx +++ b/framework/source/services/frame.cxx @@ -1345,9 +1345,9 @@ void SAL_CALL Frame::contextChanged() throw( css::uno::RuntimeException ) reference to new component controller (may for relasing or setting of a simple component) - @return if operation was successful, otherwise. + @return if operation was successful, otherwise. - @onerror We return . + @onerror We return . @threadsafe yes @modified 06.05.2002 11:39, as96863 *//*-*****************************************************************************************************/ @@ -1606,14 +1606,14 @@ void SAL_CALL Frame::removeFrameActionListener( const css::uno::Reference< css:: /*-****************************************************************************************************//** @short support two way mechanism to release a frame @descr This method ask internal component (controller) if he accept this close request. - In case of nothing will be happen (from point of caller of this close method). - In case of a CloseVetoException is thrown. After such exception given parameter + In case of nothing will be happen (from point of caller of this close method). + In case of a CloseVetoException is thrown. After such exception given parameter bDeliverOwnerShip regulate which will be the new owner of this instance. @attention It's the replacement for XTask::close() which is marked as obsolete method. @param bDeliverOwnerShip - If parameter is set to the original caller will be the owner after thrown + If parameter is set to the original caller will be the owner after thrown veto exception and must try to close this frame at later time again. Otherwhise the source of throwed exception is the right one. May it will be the frame himself. @@ -3078,7 +3078,7 @@ void Frame::implts_checkSuicide() Its existence regulate visibility of this closer item. @param bState - enable; disable this state + enable; disable this state */ void Frame::impl_setCloser( /*IN*/ const css::uno::Reference< css::frame::XFrame >& xFrame , -- cgit