diff options
author | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2010-08-04 13:22:45 +0200 |
---|---|---|
committer | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2010-08-04 13:22:45 +0200 |
commit | abb7e4699bb786ec96e94f2af68f4c3ad21a6683 (patch) | |
tree | bccdf414138d8bc576e3bb408b6d84a6a7861a47 | |
parent | 29457a0e3319b7185650820f9b567708f52b6e9f (diff) |
gnumake2: fixes for pch in framework
-rwxr-xr-x[-rw-r--r--] | framework/source/helper/dockingareadefaultacceptor.cxx | 18 | ||||
-rwxr-xr-x[-rw-r--r--] | framework/source/helper/ocomponentaccess.cxx | 44 | ||||
-rwxr-xr-x[-rw-r--r--] | framework/source/helper/ocomponentenumeration.cxx | 4 | ||||
-rwxr-xr-x[-rw-r--r--] | framework/source/helper/oframes.cxx | 56 |
4 files changed, 61 insertions, 61 deletions
diff --git a/framework/source/helper/dockingareadefaultacceptor.cxx b/framework/source/helper/dockingareadefaultacceptor.cxx index 91dbe941d2..06f5129545 100644..100755 --- a/framework/source/helper/dockingareadefaultacceptor.cxx +++ b/framework/source/helper/dockingareadefaultacceptor.cxx @@ -76,7 +76,7 @@ using namespace ::rtl ; //***************************************************************************************************************** // constructor //***************************************************************************************************************** -DockingAreaDefaultAcceptor::DockingAreaDefaultAcceptor( const Reference< XFrame >& xOwner ) +DockingAreaDefaultAcceptor::DockingAreaDefaultAcceptor( const css::uno::Reference< XFrame >& xOwner ) // Init baseclasses first : ThreadHelpBase ( &Application::GetSolarMutex() ) // Init member @@ -100,8 +100,8 @@ css::uno::Reference< css::awt::XWindow > SAL_CALL DockingAreaDefaultAcceptor::ge ResetableGuard aGuard( m_aLock ); // Try to "lock" the frame for access to taskscontainer. - Reference< XFrame > xFrame( m_xOwner.get(), UNO_QUERY ); - Reference< css::awt::XWindow > xContainerWindow( xFrame->getContainerWindow() ); + css::uno::Reference< XFrame > xFrame( m_xOwner.get(), UNO_QUERY ); + css::uno::Reference< css::awt::XWindow > xContainerWindow( xFrame->getContainerWindow() ); return xContainerWindow; } @@ -112,13 +112,13 @@ sal_Bool SAL_CALL DockingAreaDefaultAcceptor::requestDockingAreaSpace( const css ResetableGuard aGuard( m_aLock ); // Try to "lock" the frame for access to taskscontainer. - Reference< XFrame > xFrame( m_xOwner.get(), UNO_QUERY ); + css::uno::Reference< XFrame > xFrame( m_xOwner.get(), UNO_QUERY ); aGuard.unlock(); if ( xFrame.is() == sal_True ) { - Reference< css::awt::XWindow > xContainerWindow( xFrame->getContainerWindow() ); - Reference< css::awt::XWindow > xComponentWindow( xFrame->getComponentWindow() ); + css::uno::Reference< css::awt::XWindow > xContainerWindow( xFrame->getContainerWindow() ); + css::uno::Reference< css::awt::XWindow > xComponentWindow( xFrame->getComponentWindow() ); if (( xContainerWindow.is() == sal_True ) && ( xComponentWindow.is() == sal_True ) ) @@ -152,11 +152,11 @@ void SAL_CALL DockingAreaDefaultAcceptor::setDockingAreaSpace( const css::awt::R ResetableGuard aGuard( m_aLock ); // Try to "lock" the frame for access to taskscontainer. - Reference< XFrame > xFrame( m_xOwner.get(), UNO_QUERY ); + css::uno::Reference< XFrame > xFrame( m_xOwner.get(), UNO_QUERY ); if ( xFrame.is() == sal_True ) { - Reference< css::awt::XWindow > xContainerWindow( xFrame->getContainerWindow() ); - Reference< css::awt::XWindow > xComponentWindow( xFrame->getComponentWindow() ); + css::uno::Reference< css::awt::XWindow > xContainerWindow( xFrame->getContainerWindow() ); + css::uno::Reference< css::awt::XWindow > xComponentWindow( xFrame->getComponentWindow() ); if (( xContainerWindow.is() == sal_True ) && ( xComponentWindow.is() == sal_True ) ) diff --git a/framework/source/helper/ocomponentaccess.cxx b/framework/source/helper/ocomponentaccess.cxx index b0baf1bcf8..0089ee015c 100644..100755 --- a/framework/source/helper/ocomponentaccess.cxx +++ b/framework/source/helper/ocomponentaccess.cxx @@ -77,7 +77,7 @@ using namespace ::rtl ; //***************************************************************************************************************** // constructor //***************************************************************************************************************** -OComponentAccess::OComponentAccess( const Reference< XDesktop >& xOwner ) +OComponentAccess::OComponentAccess( const css::uno::Reference< XDesktop >& xOwner ) // Init baseclasses first : ThreadHelpBase ( &Application::GetSolarMutex() ) // Init member @@ -97,27 +97,27 @@ OComponentAccess::~OComponentAccess() //***************************************************************************************************************** // XEnumerationAccess //***************************************************************************************************************** -Reference< XEnumeration > SAL_CALL OComponentAccess::createEnumeration() throw( RuntimeException ) +css::uno::Reference< XEnumeration > SAL_CALL OComponentAccess::createEnumeration() throw( RuntimeException ) { // Ready for multithreading ResetableGuard aGuard( m_aLock ); // Set default return value, if method failed. // If no desktop exist and there is no task container - return an empty enumeration! - Reference< XEnumeration > xReturn = Reference< XEnumeration >(); + css::uno::Reference< XEnumeration > xReturn = css::uno::Reference< XEnumeration >(); // Try to "lock" the desktop for access to task container. - Reference< XInterface > xLock = m_xOwner.get(); + css::uno::Reference< XInterface > xLock = m_xOwner.get(); if ( xLock.is() == sal_True ) { // Desktop exist => pointer to task container must be valid. // Initialize a new enumeration ... if some tasks and his components exist! // (OTasksEnumeration will make an assert, if we initialize the new instance without valid values!) - Sequence< Reference< XComponent > > seqComponents; - impl_collectAllChildComponents( Reference< XFramesSupplier >( xLock, UNO_QUERY ), seqComponents ); + Sequence< css::uno::Reference< XComponent > > seqComponents; + impl_collectAllChildComponents( css::uno::Reference< XFramesSupplier >( xLock, UNO_QUERY ), seqComponents ); OComponentEnumeration* pEnumeration = new OComponentEnumeration( seqComponents ); - xReturn = Reference< XEnumeration >( (OWeakObject*)pEnumeration, UNO_QUERY ); + xReturn = css::uno::Reference< XEnumeration >( (OWeakObject*)pEnumeration, UNO_QUERY ); } // Return result of this operation. @@ -131,7 +131,7 @@ Type SAL_CALL OComponentAccess::getElementType() throw( RuntimeException ) { // Elements in list an enumeration are components! // Return the uno-type of XComponent. - return ::getCppuType((const Reference< XComponent >*)NULL); + return ::getCppuType((const css::uno::Reference< XComponent >*)NULL); } //***************************************************************************************************************** @@ -146,7 +146,7 @@ sal_Bool SAL_CALL OComponentAccess::hasElements() throw( RuntimeException ) sal_Bool bReturn = sal_False; // Try to "lock" the desktop for access to task container. - Reference< XFramesSupplier > xLock( m_xOwner.get(), UNO_QUERY ); + css::uno::Reference< XFramesSupplier > xLock( m_xOwner.get(), UNO_QUERY ); if ( xLock.is() == sal_True ) { // Ask container of owner for existing elements. @@ -160,8 +160,8 @@ sal_Bool SAL_CALL OComponentAccess::hasElements() throw( RuntimeException ) //***************************************************************************************************************** // private method //***************************************************************************************************************** -void OComponentAccess::impl_collectAllChildComponents( const Reference< XFramesSupplier >& xNode , - Sequence< Reference< XComponent > >& seqComponents ) +void OComponentAccess::impl_collectAllChildComponents( const css::uno::Reference< XFramesSupplier >& xNode , + Sequence< css::uno::Reference< XComponent > >& seqComponents ) { // If valid node was given ... if( xNode.is() == sal_True ) @@ -173,13 +173,13 @@ void OComponentAccess::impl_collectAllChildComponents( const Reference< XFramesS sal_Int32 nComponentCount = seqComponents.getLength(); - const Reference< XFrames > xContainer = xNode->getFrames(); - const Sequence< Reference< XFrame > > seqFrames = xContainer->queryFrames( FrameSearchFlag::CHILDREN ); + const css::uno::Reference< XFrames > xContainer = xNode->getFrames(); + const Sequence< css::uno::Reference< XFrame > > seqFrames = xContainer->queryFrames( FrameSearchFlag::CHILDREN ); const sal_Int32 nFrameCount = seqFrames.getLength(); for( sal_Int32 nFrame=0; nFrame<nFrameCount; ++nFrame ) { - Reference< XComponent > xComponent = impl_getFrameComponent( seqFrames[nFrame] ); + css::uno::Reference< XComponent > xComponent = impl_getFrameComponent( seqFrames[nFrame] ); if( xComponent.is() == sal_True ) { nComponentCount++; @@ -194,30 +194,30 @@ void OComponentAccess::impl_collectAllChildComponents( const Reference< XFramesS //***************************************************************************************************************** // private method //***************************************************************************************************************** -Reference< XComponent > OComponentAccess::impl_getFrameComponent( const Reference< XFrame >& xFrame ) const +css::uno::Reference< XComponent > OComponentAccess::impl_getFrameComponent( const css::uno::Reference< XFrame >& xFrame ) const { // Set default return value, if method failed. - Reference< XComponent > xComponent = Reference< XComponent >(); + css::uno::Reference< XComponent > xComponent = css::uno::Reference< XComponent >(); // Does no controller exists? - Reference< XController > xController = xFrame->getController(); + css::uno::Reference< XController > xController = xFrame->getController(); if ( xController.is() == sal_False ) { // Controller not exist - use the VCL-component. - xComponent = Reference< XComponent >( xFrame->getComponentWindow(), UNO_QUERY ); + xComponent = css::uno::Reference< XComponent >( xFrame->getComponentWindow(), UNO_QUERY ); } else { // Does no model exists? - Reference< XModel > xModel( xController->getModel(), UNO_QUERY ); + css::uno::Reference< XModel > xModel( xController->getModel(), UNO_QUERY ); if ( xModel.is() == sal_True ) { // Model exist - use the model as component. - xComponent = Reference< XComponent >( xModel, UNO_QUERY ); + xComponent = css::uno::Reference< XComponent >( xModel, UNO_QUERY ); } else { // Model not exist - use the controller as component. - xComponent = Reference< XComponent >( xController, UNO_QUERY ); + xComponent = css::uno::Reference< XComponent >( xController, UNO_QUERY ); } } @@ -241,7 +241,7 @@ Reference< XComponent > OComponentAccess::impl_getFrameComponent( const Referenc #ifdef ENABLE_ASSERTIONS //***************************************************************************************************************** -sal_Bool OComponentAccess::impldbg_checkParameter_OComponentAccessCtor( const Reference< XDesktop >& xOwner ) +sal_Bool OComponentAccess::impldbg_checkParameter_OComponentAccessCtor( const css::uno::Reference< XDesktop >& xOwner ) { // Set default return value. sal_Bool bOK = sal_True; diff --git a/framework/source/helper/ocomponentenumeration.cxx b/framework/source/helper/ocomponentenumeration.cxx index 912d80c75d..715a24f9a8 100644..100755 --- a/framework/source/helper/ocomponentenumeration.cxx +++ b/framework/source/helper/ocomponentenumeration.cxx @@ -74,7 +74,7 @@ using namespace ::rtl ; //***************************************************************************************************************** // constructor //***************************************************************************************************************** -OComponentEnumeration::OComponentEnumeration( const Sequence< Reference< XComponent > >& seqComponents ) +OComponentEnumeration::OComponentEnumeration( const Sequence< css::uno::Reference< XComponent > >& seqComponents ) // Init baseclasses first // Attention: // Don't change order of initialization! @@ -200,7 +200,7 @@ void OComponentEnumeration::impl_resetObject() //***************************************************************************************************************** // An empty list is allowed ... hasMoreElements() will return false then! -sal_Bool OComponentEnumeration::impldbg_checkParameter_OComponentEnumerationCtor( const Sequence< Reference< XComponent > >& seqComponents ) +sal_Bool OComponentEnumeration::impldbg_checkParameter_OComponentEnumerationCtor( const Sequence< css::uno::Reference< XComponent > >& seqComponents ) { // Set default return value. sal_Bool bOK = sal_True; diff --git a/framework/source/helper/oframes.cxx b/framework/source/helper/oframes.cxx index 405da6d91a..a17d6d7ed7 100644..100755 --- a/framework/source/helper/oframes.cxx +++ b/framework/source/helper/oframes.cxx @@ -79,8 +79,8 @@ using namespace ::vos ; //***************************************************************************************************************** // constructor //***************************************************************************************************************** -OFrames::OFrames( const Reference< XMultiServiceFactory >& xFactory , - const Reference< XFrame >& xOwner , +OFrames::OFrames( const css::uno::Reference< XMultiServiceFactory >& xFactory , + const css::uno::Reference< XFrame >& xOwner , FrameContainer* pFrameContainer ) // Init baseclasses first : ThreadHelpBase ( &Application::GetSolarMutex() ) @@ -107,7 +107,7 @@ OFrames::~OFrames() //***************************************************************************************************************** // XFrames //***************************************************************************************************************** -void SAL_CALL OFrames::append( const Reference< XFrame >& xFrame ) throw( RuntimeException ) +void SAL_CALL OFrames::append( const css::uno::Reference< XFrame >& xFrame ) throw( RuntimeException ) { // Ready for multithreading ResetableGuard aGuard( m_aLock ); @@ -118,7 +118,7 @@ void SAL_CALL OFrames::append( const Reference< XFrame >& xFrame ) throw( Runtim // Do the follow only, if owner instance valid! // Lock owner for follow operations - make a "hard reference"! - Reference< XFramesSupplier > xOwner( m_xOwner.get(), UNO_QUERY ); + css::uno::Reference< XFramesSupplier > xOwner( m_xOwner.get(), UNO_QUERY ); if ( xOwner.is() == sal_True ) { // Append frame to the end of the container ... @@ -133,7 +133,7 @@ void SAL_CALL OFrames::append( const Reference< XFrame >& xFrame ) throw( Runtim //***************************************************************************************************************** // XFrames //***************************************************************************************************************** -void SAL_CALL OFrames::remove( const Reference< XFrame >& xFrame ) throw( RuntimeException ) +void SAL_CALL OFrames::remove( const css::uno::Reference< XFrame >& xFrame ) throw( RuntimeException ) { // Ready for multithreading ResetableGuard aGuard( m_aLock ); @@ -144,7 +144,7 @@ void SAL_CALL OFrames::remove( const Reference< XFrame >& xFrame ) throw( Runtim // Do the follow only, if owner instance valid! // Lock owner for follow operations - make a "hard reference"! - Reference< XFramesSupplier > xOwner( m_xOwner.get(), UNO_QUERY ); + css::uno::Reference< XFramesSupplier > xOwner( m_xOwner.get(), UNO_QUERY ); if ( xOwner.is() == sal_True ) { // Search frame and remove it from container ... @@ -160,7 +160,7 @@ void SAL_CALL OFrames::remove( const Reference< XFrame >& xFrame ) throw( Runtim //***************************************************************************************************************** // XFrames //***************************************************************************************************************** -Sequence< Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int32 nSearchFlags ) throw( RuntimeException ) +Sequence< css::uno::Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int32 nSearchFlags ) throw( RuntimeException ) { // Ready for multithreading ResetableGuard aGuard( m_aLock ); @@ -170,11 +170,11 @@ Sequence< Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int32 nSearch LOG_ASSERT( impldbg_checkParameter_queryFrames( nSearchFlags ), "OFrames::queryFrames()\nInvalid parameter detected!\n" ) // Set default return value. (empty sequence) - Sequence< Reference< XFrame > > seqFrames; + Sequence< css::uno::Reference< XFrame > > seqFrames; // Do the follow only, if owner instance valid. // Lock owner for follow operations - make a "hard reference"! - Reference< XFrame > xOwner( m_xOwner.get(), UNO_QUERY ); + css::uno::Reference< XFrame > xOwner( m_xOwner.get(), UNO_QUERY ); if ( xOwner.is() == sal_True ) { // Work only, if search was not started here ...! @@ -203,10 +203,10 @@ Sequence< Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int32 nSearch // Add parent to list ... if any exist! if( nSearchFlags & FrameSearchFlag::PARENT ) { - Reference< XFrame > xParent( xOwner->getCreator(), UNO_QUERY ); + css::uno::Reference< XFrame > xParent( xOwner->getCreator(), UNO_QUERY ); if( xParent.is() == sal_True ) { - Sequence< Reference< XFrame > > seqParent( 1 ); + Sequence< css::uno::Reference< XFrame > > seqParent( 1 ); seqParent[0] = xParent; impl_appendSequence( seqFrames, seqParent ); } @@ -216,7 +216,7 @@ Sequence< Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int32 nSearch // Add owner to list if SELF is searched. if( nSearchFlags & FrameSearchFlag::SELF ) { - Sequence< Reference< XFrame > > seqSelf( 1 ); + Sequence< css::uno::Reference< XFrame > > seqSelf( 1 ); seqSelf[0] = xOwner; impl_appendSequence( seqFrames, seqSelf ); } @@ -229,7 +229,7 @@ Sequence< Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int32 nSearch // Protect this instance against recursive calls from parents. m_bRecursiveSearchProtection = sal_True; // Ask parent of my owner for frames and append results to return list. - Reference< XFramesSupplier > xParent( xOwner->getCreator(), UNO_QUERY ); + css::uno::Reference< XFramesSupplier > xParent( xOwner->getCreator(), UNO_QUERY ); // If a parent exist ... if ( xParent.is() == sal_True ) { @@ -254,7 +254,7 @@ Sequence< Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int32 nSearch { // We don't must control this conversion. // We have done this at append()! - Reference< XFramesSupplier > xItem( (*m_pFrameContainer)[nIndex], UNO_QUERY ); + css::uno::Reference< XFramesSupplier > xItem( (*m_pFrameContainer)[nIndex], UNO_QUERY ); impl_appendSequence( seqFrames, xItem->getFrames()->queryFrames( nChildSearchFlags ) ); } } @@ -280,7 +280,7 @@ sal_Int32 SAL_CALL OFrames::getCount() throw( RuntimeException ) // Do the follow only, if owner instance valid. // Lock owner for follow operations - make a "hard reference"! - Reference< XFrame > xOwner( m_xOwner.get(), UNO_QUERY ); + css::uno::Reference< XFrame > xOwner( m_xOwner.get(), UNO_QUERY ); if ( xOwner.is() == sal_True ) { // Set CURRENT size of container for return. @@ -311,7 +311,7 @@ Any SAL_CALL OFrames::getByIndex( sal_Int32 nIndex ) throw( IndexOutOfBoundsExce // Do the follow only, if owner instance valid. // Lock owner for follow operations - make a "hard reference"! - Reference< XFrame > xOwner( m_xOwner.get(), UNO_QUERY ); + css::uno::Reference< XFrame > xOwner( m_xOwner.get(), UNO_QUERY ); if ( xOwner.is() == sal_True ) { // Get element form container. @@ -329,7 +329,7 @@ Any SAL_CALL OFrames::getByIndex( sal_Int32 nIndex ) throw( IndexOutOfBoundsExce Type SAL_CALL OFrames::getElementType() throw( RuntimeException ) { // This "container" support XFrame-interfaces only! - return ::getCppuType( (const Reference< XFrame >*)NULL ); + return ::getCppuType( (const css::uno::Reference< XFrame >*)NULL ); } //***************************************************************************************************************** @@ -344,7 +344,7 @@ sal_Bool SAL_CALL OFrames::hasElements() throw( RuntimeException ) sal_Bool bHasElements = sal_False; // Do the follow only, if owner instance valid. // Lock owner for follow operations - make a "hard reference"! - Reference< XFrame > xOwner( m_xOwner.get(), UNO_QUERY ); + css::uno::Reference< XFrame > xOwner( m_xOwner.get(), UNO_QUERY ); if ( xOwner.is() == sal_True ) { // If some elements exist ... @@ -378,18 +378,18 @@ void OFrames::impl_resetObject() //***************************************************************************************************************** // private method //***************************************************************************************************************** -void OFrames::impl_appendSequence( Sequence< Reference< XFrame > >& seqDestination , - const Sequence< Reference< XFrame > >& seqSource ) +void OFrames::impl_appendSequence( Sequence< css::uno::Reference< XFrame > >& seqDestination , + const Sequence< css::uno::Reference< XFrame > >& seqSource ) { // Get some informations about the sequences. sal_Int32 nSourceCount = seqSource.getLength(); sal_Int32 nDestinationCount = seqDestination.getLength(); - const Reference< XFrame >* pSourceAccess = seqSource.getConstArray(); - Reference< XFrame >* pDestinationAccess = seqDestination.getArray(); + const css::uno::Reference< XFrame >* pSourceAccess = seqSource.getConstArray(); + css::uno::Reference< XFrame >* pDestinationAccess = seqDestination.getArray(); // Get memory for result list. - Sequence< Reference< XFrame > > seqResult ( nSourceCount + nDestinationCount ); - Reference< XFrame >* pResultAccess = seqResult.getArray(); + Sequence< css::uno::Reference< XFrame > > seqResult ( nSourceCount + nDestinationCount ); + css::uno::Reference< XFrame >* pResultAccess = seqResult.getArray(); sal_Int32 nResultPosition = 0; // Copy all items from first sequence. @@ -434,8 +434,8 @@ void OFrames::impl_appendSequence( Sequence< Reference< XFrame > >& seqDestina // An instance of this class can only work with valid initialization. // We share the mutex with ouer owner class, need a valid factory to instanciate new services and // use the access to ouer owner for some operations. -sal_Bool OFrames::impldbg_checkParameter_OFramesCtor( const Reference< XMultiServiceFactory >& xFactory , - const Reference< XFrame >& xOwner , +sal_Bool OFrames::impldbg_checkParameter_OFramesCtor( const css::uno::Reference< XMultiServiceFactory >& xFactory , + const css::uno::Reference< XFrame >& xOwner , FrameContainer* pFrameContainer ) { // Set default return value. @@ -458,7 +458,7 @@ sal_Bool OFrames::impldbg_checkParameter_OFramesCtor( const Reference< XMultiSer //***************************************************************************************************************** // Its only allowed to add valid references to container. // AND - alle frames must support XFrames-interface! -sal_Bool OFrames::impldbg_checkParameter_append( const Reference< XFrame >& xFrame ) +sal_Bool OFrames::impldbg_checkParameter_append( const css::uno::Reference< XFrame >& xFrame ) { // Set default return value. sal_Bool bOK = sal_True; @@ -477,7 +477,7 @@ sal_Bool OFrames::impldbg_checkParameter_append( const Reference< XFrame >& xFra //***************************************************************************************************************** // Its only allowed to add valid references to container... // ... => You can only delete valid references! -sal_Bool OFrames::impldbg_checkParameter_remove( const Reference< XFrame >& xFrame ) +sal_Bool OFrames::impldbg_checkParameter_remove( const css::uno::Reference< XFrame >& xFrame ) { // Set default return value. sal_Bool bOK = sal_True; |