diff options
Diffstat (limited to 'sfx2/source/view')
| -rw-r--r-- | sfx2/source/view/frame.cxx | 14 | ||||
| -rw-r--r-- | sfx2/source/view/frame2.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/view/frmload.cxx | 34 | ||||
| -rw-r--r-- | sfx2/source/view/ipclient.cxx | 70 | ||||
| -rw-r--r-- | sfx2/source/view/printer.cxx | 26 | ||||
| -rw-r--r-- | sfx2/source/view/sfxbasecontroller.cxx | 84 | ||||
| -rw-r--r-- | sfx2/source/view/userinputinterception.cxx | 18 | ||||
| -rw-r--r-- | sfx2/source/view/viewfrm.cxx | 142 | ||||
| -rw-r--r-- | sfx2/source/view/viewfrm2.cxx | 4 | ||||
| -rw-r--r-- | sfx2/source/view/viewsh.cxx | 116 |
10 files changed, 255 insertions, 255 deletions
diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx index f565c8b54a2c..099e0907caa6 100644 --- a/sfx2/source/view/frame.cxx +++ b/sfx2/source/view/frame.cxx @@ -84,7 +84,7 @@ SvCompatWeakHdl* SfxFrame::GetHdl() return pImp->GetHdl(); } -//-------------------------------------------------------------------- + void SfxFrame::Construct_Impl() { pImp = new SfxFrame_Impl( this ); @@ -93,7 +93,7 @@ void SfxFrame::Construct_Impl() pFramesArr_Impl->push_back( this ); } -//-------------------------------------------------------------------- + SfxFrame::~SfxFrame() { @@ -240,7 +240,7 @@ bool SfxFrame::PrepareClose_Impl( sal_Bool bUI ) return nRet; } -//-------------------------------------------------------------------- + SfxFrame* SfxFrame::GetChildFrame( sal_uInt16 nPos ) const { @@ -458,7 +458,7 @@ void SfxFrame::UpdateDescriptor( SfxObjectShell *pDoc ) pSet->Put( SfxStringItem( SID_FILTER_NAME, aFilter )); } -//------------------------------------------------------------------------- + SfxFrameDescriptor* SfxFrame::GetDescriptor() const { @@ -475,7 +475,7 @@ SfxFrameDescriptor* SfxFrame::GetDescriptor() const return pImp->pDescr; } -//------------------------------------------------------------------------- + void SfxFrame::GetTargetList( TargetList& rList ) const { @@ -501,7 +501,7 @@ void SfxFrame::GetTargetList( TargetList& rList ) const } } -//------------------------------------------------------------------------- + sal_Bool SfxFrame::IsParent( SfxFrame *pFrame ) const { @@ -554,7 +554,7 @@ bool SfxFrameItem::operator==( const SfxPoolItem &rItem ) const ((SfxFrameItem&)rItem).wFrame == wFrame; } -//-------------------------------------------------------------------- + OUString SfxFrameItem::GetValueText() const { diff --git a/sfx2/source/view/frame2.cxx b/sfx2/source/view/frame2.cxx index 9e2d9f6b0043..9bcba34d75c5 100644 --- a/sfx2/source/view/frame2.cxx +++ b/sfx2/source/view/frame2.cxx @@ -60,7 +60,7 @@ using ::com::sun::star::lang::XMultiServiceFactory; using ::com::sun::star::lang::XComponent; using ::com::sun::star::frame::XComponentLoader; -//------------------------------------------------------------------------ + class SfxFrameWindow_Impl : public Window { diff --git a/sfx2/source/view/frmload.cxx b/sfx2/source/view/frmload.cxx index ddb17a1c4316..01f146aca582 100644 --- a/sfx2/source/view/frmload.cxx +++ b/sfx2/source/view/frmload.cxx @@ -117,9 +117,9 @@ public: virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException); - //---------------------------------------------------------------------------------- + // XSynchronousFrameLoader - //---------------------------------------------------------------------------------- + virtual sal_Bool SAL_CALL load( const css::uno::Sequence< css::beans::PropertyValue >& _rArgs, const css::uno::Reference< css::frame::XFrame >& _rxFrame ) throw( css::uno::RuntimeException ); virtual void SAL_CALL cancel() throw( css::uno::RuntimeException ); @@ -206,7 +206,7 @@ SfxFrameLoader_Impl::~SfxFrameLoader_Impl() { } -// -------------------------------------------------------------------------------------------------------------------- + const SfxFilter* SfxFrameLoader_Impl::impl_detectFilterForURL( const OUString& sURL, const ::comphelper::NamedValueCollection& i_rDescriptor, const SfxFilterMatcher& rMatcher ) const { @@ -253,7 +253,7 @@ const SfxFilter* SfxFrameLoader_Impl::impl_detectFilterForURL( const OUString& s return pFilter; } -// -------------------------------------------------------------------------------------------------------------------- + const SfxFilter* SfxFrameLoader_Impl::impl_getFilterFromServiceName_nothrow( const OUString& i_rServiceName ) const { try @@ -298,7 +298,7 @@ const SfxFilter* SfxFrameLoader_Impl::impl_getFilterFromServiceName_nothrow( con return NULL; } -// -------------------------------------------------------------------------------------------------------------------- + OUString SfxFrameLoader_Impl::impl_askForFilter_nothrow( const Reference< XInteractionHandler >& i_rxHandler, const OUString& i_rDocumentURL ) const { @@ -320,7 +320,7 @@ OUString SfxFrameLoader_Impl::impl_askForFilter_nothrow( const Reference< XInter return sFilterName; } -// -------------------------------------------------------------------------------------------------------------------- + namespace { sal_Bool lcl_getDispatchResult( const SfxPoolItem* _pResult ) @@ -342,7 +342,7 @@ namespace } } -// -------------------------------------------------------------------------------------------------------------------- + sal_Bool SfxFrameLoader_Impl::impl_createNewDocWithSlotParam( const sal_uInt16 _nSlotID, const Reference< XFrame >& i_rxFrame, const bool i_bHidden ) { @@ -353,7 +353,7 @@ sal_Bool SfxFrameLoader_Impl::impl_createNewDocWithSlotParam( const sal_uInt16 _ return lcl_getDispatchResult( SFX_APP()->ExecuteSlot( aRequest ) ); } -// -------------------------------------------------------------------------------------------------------------------- + void SfxFrameLoader_Impl::impl_determineFilter( ::comphelper::NamedValueCollection& io_rDescriptor ) const { const OUString sURL = io_rDescriptor.getOrDefault( "URL", OUString() ); @@ -402,7 +402,7 @@ void SfxFrameLoader_Impl::impl_determineFilter( ::comphelper::NamedValueCollecti } } -// -------------------------------------------------------------------------------------------------------------------- + SfxObjectShellRef SfxFrameLoader_Impl::impl_findObjectShell( const Reference< XModel2 >& i_rxDocument ) const { for ( SfxObjectShell* pDoc = SfxObjectShell::GetFirst( NULL, sal_False ); pDoc; pDoc = SfxObjectShell::GetNext( *pDoc, NULL, sal_False ) ) @@ -417,7 +417,7 @@ SfxObjectShellRef SfxFrameLoader_Impl::impl_findObjectShell( const Reference< XM return NULL; } -// -------------------------------------------------------------------------------------------------------------------- + bool SfxFrameLoader_Impl::impl_determineTemplateDocument( ::comphelper::NamedValueCollection& io_rDescriptor ) const { try @@ -468,7 +468,7 @@ bool SfxFrameLoader_Impl::impl_determineTemplateDocument( ::comphelper::NamedVal return false; } -// -------------------------------------------------------------------------------------------------------------------- + sal_uInt16 SfxFrameLoader_Impl::impl_findSlotParam( const OUString& i_rFactoryURL ) const { OUString sSlotParam; @@ -487,7 +487,7 @@ sal_uInt16 SfxFrameLoader_Impl::impl_findSlotParam( const OUString& i_rFactoryUR return 0; } -// -------------------------------------------------------------------------------------------------------------------- + void SfxFrameLoader_Impl::impl_handleCaughtError_nothrow( const Any& i_rCaughtError, const ::comphelper::NamedValueCollection& i_rDescriptor ) const { try @@ -519,7 +519,7 @@ void SfxFrameLoader_Impl::impl_handleCaughtError_nothrow( const Any& i_rCaughtEr } } -// -------------------------------------------------------------------------------------------------------------------- + void SfxFrameLoader_Impl::impl_removeLoaderArguments( ::comphelper::NamedValueCollection& io_rDescriptor ) { // remove the arguments which are for the loader only, and not for a call to attachResource @@ -527,7 +527,7 @@ void SfxFrameLoader_Impl::impl_removeLoaderArguments( ::comphelper::NamedValueCo io_rDescriptor.remove( "Model" ); } -// -------------------------------------------------------------------------------------------------------------------- + ::comphelper::NamedValueCollection SfxFrameLoader_Impl::impl_extractViewCreationArgs( ::comphelper::NamedValueCollection& io_rDescriptor ) { const sal_Char* pKnownViewArgs[] = { @@ -546,7 +546,7 @@ void SfxFrameLoader_Impl::impl_removeLoaderArguments( ::comphelper::NamedValueCo return aViewArgs; } -// -------------------------------------------------------------------------------------------------------------------- + sal_Int16 SfxFrameLoader_Impl::impl_determineEffectiveViewId_nothrow( const SfxObjectShell& i_rDocument, const ::comphelper::NamedValueCollection& i_rDescriptor ) { sal_Int16 nViewId = i_rDescriptor.getOrDefault( "ViewId", sal_Int16( 0 ) ); @@ -592,7 +592,7 @@ sal_Int16 SfxFrameLoader_Impl::impl_determineEffectiveViewId_nothrow( const SfxO return nViewId; } -// -------------------------------------------------------------------------------------------------------------------- + Reference< XController2 > SfxFrameLoader_Impl::impl_createDocumentView( const Reference< XModel2 >& i_rModel, const Reference< XFrame >& i_rFrame, const ::comphelper::NamedValueCollection& i_rViewFactoryArgs, const OUString& i_rViewName ) @@ -614,7 +614,7 @@ Reference< XController2 > SfxFrameLoader_Impl::impl_createDocumentView( const Re return xController; } -// -------------------------------------------------------------------------------------------------------------------- + sal_Bool SAL_CALL SfxFrameLoader_Impl::load( const Sequence< PropertyValue >& rArgs, const Reference< XFrame >& _rTargetFrame ) throw( RuntimeException ) diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx index 98c61b4c8902..518bdc9888fc 100644 --- a/sfx2/source/view/ipclient.cxx +++ b/sfx2/source/view/ipclient.cxx @@ -89,7 +89,7 @@ public: //==================================================================== // SfxInPlaceClient_Impl -//-------------------------------------------------------------------- + class SfxInPlaceClient_Impl : public ::cppu::WeakImplHelper5< embed::XEmbeddedClient, embed::XInplaceClient, document::XEventListener, @@ -206,7 +206,7 @@ throw (::com::sun::star::uno::RuntimeException) } // XEmbeddedClient -//-------------------------------------------------------------------- + uno::Reference < frame::XFrame > SfxInPlaceClient_Impl::GetFrame() const { if ( !m_pClient ) @@ -309,7 +309,7 @@ void SAL_CALL SfxInPlaceClient_Impl::saveObject() // m_pClient->Invalidate(); } -//-------------------------------------------------------------------- + void SAL_CALL SfxInPlaceClient_Impl::visibilityChanged( sal_Bool bVisible ) throw ( embed::WrongStateException, uno::RuntimeException ) @@ -325,7 +325,7 @@ void SAL_CALL SfxInPlaceClient_Impl::visibilityChanged( sal_Bool bVisible ) // XInplaceClient -//-------------------------------------------------------------------- + sal_Bool SAL_CALL SfxInPlaceClient_Impl::canInplaceActivate() throw ( uno::RuntimeException ) { @@ -339,7 +339,7 @@ sal_Bool SAL_CALL SfxInPlaceClient_Impl::canInplaceActivate() return sal_True; } -//-------------------------------------------------------------------- + void SAL_CALL SfxInPlaceClient_Impl::activatingInplace() throw ( embed::WrongStateException, uno::RuntimeException ) @@ -350,7 +350,7 @@ void SAL_CALL SfxInPlaceClient_Impl::activatingInplace() m_pClient->GetViewShell()->InplaceActivating( m_pClient ); } -//-------------------------------------------------------------------- + void SAL_CALL SfxInPlaceClient_Impl::activatingUI() throw ( embed::WrongStateException, uno::RuntimeException ) @@ -363,7 +363,7 @@ void SAL_CALL SfxInPlaceClient_Impl::activatingUI() m_pClient->GetViewShell()->UIActivating( m_pClient ); } -//-------------------------------------------------------------------- + void SAL_CALL SfxInPlaceClient_Impl::deactivatedInplace() throw ( embed::WrongStateException, uno::RuntimeException ) @@ -374,7 +374,7 @@ void SAL_CALL SfxInPlaceClient_Impl::deactivatedInplace() m_pClient->GetViewShell()->InplaceDeactivated( m_pClient ); } -//-------------------------------------------------------------------- + void SAL_CALL SfxInPlaceClient_Impl::deactivatedUI() throw ( embed::WrongStateException, uno::RuntimeException ) @@ -386,7 +386,7 @@ void SAL_CALL SfxInPlaceClient_Impl::deactivatedUI() m_bUIActive = sal_False; } -//-------------------------------------------------------------------- + uno::Reference< ::com::sun::star::frame::XLayoutManager > SAL_CALL SfxInPlaceClient_Impl::getLayoutManager() throw ( embed::WrongStateException, uno::RuntimeException ) @@ -409,7 +409,7 @@ uno::Reference< ::com::sun::star::frame::XLayoutManager > SAL_CALL SfxInPlaceCli return xMan; } -//-------------------------------------------------------------------- + uno::Reference< frame::XDispatchProvider > SAL_CALL SfxInPlaceClient_Impl::getInplaceDispatchProvider() throw ( embed::WrongStateException, uno::RuntimeException ) @@ -417,7 +417,7 @@ uno::Reference< frame::XDispatchProvider > SAL_CALL SfxInPlaceClient_Impl::getIn return uno::Reference < frame::XDispatchProvider >( GetFrame(), uno::UNO_QUERY_THROW ); } -//-------------------------------------------------------------------- + awt::Rectangle SAL_CALL SfxInPlaceClient_Impl::getPlacement() throw ( embed::WrongStateException, uno::RuntimeException ) @@ -434,7 +434,7 @@ awt::Rectangle SAL_CALL SfxInPlaceClient_Impl::getPlacement() return AWTRectangle( aRealObjArea ); } -//-------------------------------------------------------------------- + awt::Rectangle SAL_CALL SfxInPlaceClient_Impl::getClipRectangle() throw ( embed::WrongStateException, uno::RuntimeException ) @@ -451,7 +451,7 @@ awt::Rectangle SAL_CALL SfxInPlaceClient_Impl::getClipRectangle() return AWTRectangle( aRealObjArea ); } -//-------------------------------------------------------------------- + void SAL_CALL SfxInPlaceClient_Impl::translateAccelerators( const uno::Sequence< awt::KeyEvent >& /*aKeys*/ ) throw ( embed::WrongStateException, uno::RuntimeException ) @@ -462,7 +462,7 @@ void SAL_CALL SfxInPlaceClient_Impl::translateAccelerators( const uno::Sequence< // TODO/MBA: keyboard accelerators } -//-------------------------------------------------------------------- + void SAL_CALL SfxInPlaceClient_Impl::scrollObject( const awt::Size& /*aOffset*/ ) throw ( embed::WrongStateException, uno::RuntimeException ) @@ -471,7 +471,7 @@ void SAL_CALL SfxInPlaceClient_Impl::scrollObject( const awt::Size& /*aOffset*/ throw uno::RuntimeException(); } -//-------------------------------------------------------------------- + void SAL_CALL SfxInPlaceClient_Impl::changedPlacement( const awt::Rectangle& aPosRect ) throw ( embed::WrongStateException, uno::Exception, @@ -523,7 +523,7 @@ void SAL_CALL SfxInPlaceClient_Impl::changedPlacement( const awt::Rectangle& aPo } // XComponentSupplier -//-------------------------------------------------------------------- + uno::Reference< util::XCloseable > SAL_CALL SfxInPlaceClient_Impl::getComponent() throw ( uno::RuntimeException ) { @@ -544,7 +544,7 @@ uno::Reference< util::XCloseable > SAL_CALL SfxInPlaceClient_Impl::getComponent( // XWindowSupplier -//-------------------------------------------------------------------- + uno::Reference< awt::XWindow > SAL_CALL SfxInPlaceClient_Impl::getWindow() throw ( uno::RuntimeException ) { @@ -555,7 +555,7 @@ uno::Reference< awt::XWindow > SAL_CALL SfxInPlaceClient_Impl::getWindow() return xWin; } -//-------------------------------------------------------------------- + // notification to the client implementation that either the object area or the scaling has been changed // as a result the logical size of the window has changed also void SfxInPlaceClient_Impl::SizeHasChanged() @@ -594,7 +594,7 @@ void SfxInPlaceClient_Impl::SizeHasChanged() } } -//-------------------------------------------------------------------- + IMPL_LINK_NOARG(SfxInPlaceClient_Impl, TimerHdl) { if ( m_pClient && m_xObject.is() ) @@ -606,7 +606,7 @@ IMPL_LINK_NOARG(SfxInPlaceClient_Impl, TimerHdl) //==================================================================== // SfxInPlaceClient -//-------------------------------------------------------------------- + SfxInPlaceClient::SfxInPlaceClient( SfxViewShell* pViewShell, Window *pDraw, sal_Int64 nAspect ) : m_pImp( new SfxInPlaceClient_Impl ), m_pViewSh( pViewShell ), @@ -622,7 +622,7 @@ SfxInPlaceClient::SfxInPlaceClient( SfxViewShell* pViewShell, Window *pDraw, sal m_pImp->m_aTimer.SetTimeoutHdl( LINK( m_pImp, SfxInPlaceClient_Impl, TimerHdl ) ); } -//-------------------------------------------------------------------- + SfxInPlaceClient::~SfxInPlaceClient() { @@ -644,7 +644,7 @@ SfxInPlaceClient::~SfxInPlaceClient() // must be guarded with mutex } -//-------------------------------------------------------------------- + void SfxInPlaceClient::SetObjectState( sal_Int32 nState ) { if ( GetObject().is() ) @@ -665,7 +665,7 @@ void SfxInPlaceClient::SetObjectState( sal_Int32 nState ) } } -//-------------------------------------------------------------------- + sal_Int64 SfxInPlaceClient::GetObjectMiscStatus() const { if ( GetObject().is() ) @@ -673,13 +673,13 @@ sal_Int64 SfxInPlaceClient::GetObjectMiscStatus() const return 0; } -//-------------------------------------------------------------------- + uno::Reference < embed::XEmbeddedObject > SfxInPlaceClient::GetObject() const { return m_pImp->m_xObject; } -//-------------------------------------------------------------------- + void SfxInPlaceClient::SetObject( const uno::Reference < embed::XEmbeddedObject >& rObject ) { if ( m_pImp->m_xObject.is() && rObject != m_pImp->m_xObject ) @@ -730,7 +730,7 @@ void SfxInPlaceClient::SetObject( const uno::Reference < embed::XEmbeddedObject m_pImp->m_aTimer.Stop(); } -//-------------------------------------------------------------------- + sal_Bool SfxInPlaceClient::SetObjArea( const Rectangle& rArea ) { if( rArea != m_pImp->m_aObjArea ) @@ -745,7 +745,7 @@ sal_Bool SfxInPlaceClient::SetObjArea( const Rectangle& rArea ) return sal_False; } -//-------------------------------------------------------------------- + Rectangle SfxInPlaceClient::GetObjArea() const { return m_pImp->m_aObjArea; @@ -759,7 +759,7 @@ Rectangle SfxInPlaceClient::GetScaledObjArea() const return aRealObjArea; } -//-------------------------------------------------------------------- + void SfxInPlaceClient::SetSizeScale( const Fraction & rScaleWidth, const Fraction & rScaleHeight ) { if ( m_pImp->m_aScaleWidth != rScaleWidth || m_pImp->m_aScaleHeight != rScaleHeight ) @@ -775,7 +775,7 @@ void SfxInPlaceClient::SetSizeScale( const Fraction & rScaleWidth, const Fractio } } -//-------------------------------------------------------------------- + sal_Bool SfxInPlaceClient::SetObjAreaAndScale( const Rectangle& rArea, const Fraction& rScaleWidth, const Fraction& rScaleHeight ) { if( rArea != m_pImp->m_aObjArea || m_pImp->m_aScaleWidth != rScaleWidth || m_pImp->m_aScaleHeight != rScaleHeight ) @@ -793,19 +793,19 @@ sal_Bool SfxInPlaceClient::SetObjAreaAndScale( const Rectangle& rArea, const Fra return sal_False; } -//-------------------------------------------------------------------- + const Fraction& SfxInPlaceClient::GetScaleWidth() const { return m_pImp->m_aScaleWidth; } -//-------------------------------------------------------------------- + const Fraction& SfxInPlaceClient::GetScaleHeight() const { return m_pImp->m_aScaleHeight; } -//-------------------------------------------------------------------- + void SfxInPlaceClient::Invalidate() { // TODO/LATER: do we need both? @@ -819,7 +819,7 @@ void SfxInPlaceClient::Invalidate() ViewChanged(); } -//-------------------------------------------------------------------- + sal_Bool SfxInPlaceClient::IsObjectUIActive() const { try { @@ -831,7 +831,7 @@ sal_Bool SfxInPlaceClient::IsObjectUIActive() const return sal_False; } -//-------------------------------------------------------------------- + sal_Bool SfxInPlaceClient::IsObjectInPlaceActive() const { try { @@ -852,7 +852,7 @@ sal_Bool SfxInPlaceClient::IsObjectInPlaceActive() const return sal_False; } -//-------------------------------------------------------------------- + SfxInPlaceClient* SfxInPlaceClient::GetClient( SfxObjectShell* pDoc, const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >& xObject ) { for ( SfxViewFrame* pFrame = SfxViewFrame::GetFirst(pDoc); pFrame; pFrame=SfxViewFrame::GetNext(*pFrame,pDoc) ) diff --git a/sfx2/source/view/printer.cxx b/sfx2/source/view/printer.cxx index a0d0168872bd..8c22941bbc4e 100644 --- a/sfx2/source/view/printer.cxx +++ b/sfx2/source/view/printer.cxx @@ -83,7 +83,7 @@ SfxPrinter* SfxPrinter::Create( SvStream& rStream, SfxItemSet* pOptions ) return pPrinter; } -//-------------------------------------------------------------------- + SvStream& SfxPrinter::Store( SvStream& rStream ) const @@ -96,7 +96,7 @@ SvStream& SfxPrinter::Store( SvStream& rStream ) const return WriteJobSetup( rStream, GetJobSetup() ); } -//-------------------------------------------------------------------- + SfxPrinter::SfxPrinter( SfxItemSet* pTheOptions ) : @@ -112,7 +112,7 @@ SfxPrinter::SfxPrinter( SfxItemSet* pTheOptions ) : pImpl = new SfxPrinter_Impl; } -//-------------------------------------------------------------------- + SfxPrinter::SfxPrinter( SfxItemSet* pTheOptions, const JobSetup& rTheOrigJobSetup ) : @@ -128,7 +128,7 @@ SfxPrinter::SfxPrinter( SfxItemSet* pTheOptions, SetJobSetup( rTheOrigJobSetup ); } -//-------------------------------------------------------------------- + SfxPrinter::SfxPrinter( SfxItemSet* pTheOptions, const OUString& rPrinterName ) : @@ -141,7 +141,7 @@ SfxPrinter::SfxPrinter( SfxItemSet* pTheOptions, pImpl = new SfxPrinter_Impl; } -//-------------------------------------------------------------------- + SfxPrinter::SfxPrinter( const SfxPrinter& rPrinter ) : @@ -160,7 +160,7 @@ SfxPrinter::SfxPrinter( const SfxPrinter& rPrinter ) : pImpl->mbRange = rPrinter.pImpl->mbRange; } -//-------------------------------------------------------------------- + SfxPrinter* SfxPrinter::Clone() const { @@ -181,7 +181,7 @@ SfxPrinter* SfxPrinter::Clone() const return new SfxPrinter( *this ); } -//-------------------------------------------------------------------- + SfxPrinter::~SfxPrinter() { @@ -189,14 +189,14 @@ SfxPrinter::~SfxPrinter() delete pImpl; } -//-------------------------------------------------------------------- + void SfxPrinter::SetOptions( const SfxItemSet &rNewOptions ) { pOptions->Set(rNewOptions); } -//-------------------------------------------------------------------- + SfxPrintOptionsDialog::SfxPrintOptionsDialog(Window *pParent, SfxViewShell *pViewShell, @@ -221,7 +221,7 @@ SfxPrintOptionsDialog::SfxPrintOptionsDialog(Window *pParent, } } -//-------------------------------------------------------------------- + SfxPrintOptionsDialog::~SfxPrintOptionsDialog() { @@ -230,7 +230,7 @@ SfxPrintOptionsDialog::~SfxPrintOptionsDialog() delete pOptions; } -//-------------------------------------------------------------------- + short SfxPrintOptionsDialog::Execute() { @@ -245,7 +245,7 @@ short SfxPrintOptionsDialog::Execute() return nRet; } -//-------------------------------------------------------------------- + bool SfxPrintOptionsDialog::Notify( NotifyEvent& rNEvt ) { @@ -258,7 +258,7 @@ bool SfxPrintOptionsDialog::Notify( NotifyEvent& rNEvt ) return ModalDialog::Notify( rNEvt ); } -//-------------------------------------------------------------------- + void SfxPrintOptionsDialog::DisableHelp() { diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx index a69475464966..56634cd2a6e8 100644 --- a/sfx2/source/view/sfxbasecontroller.cxx +++ b/sfx2/source/view/sfxbasecontroller.cxx @@ -306,9 +306,9 @@ void SAL_CALL SfxStatusIndicator::disposing( const lang::EventObject& /*Source*/ xProgress.clear(); } -//________________________________________________________________________________________________________ + // declaration IMPL_SfxBaseController_ListenerHelper -//________________________________________________________________________________________________________ + class IMPL_SfxBaseController_ListenerHelper : public ::cppu::WeakImplHelper1< frame::XFrameActionListener > { @@ -382,9 +382,9 @@ void SAL_CALL IMPL_SfxBaseController_CloseListenerHelper::notifyClosing( const l { } -//________________________________________________________________________________________________________ + // declaration IMPL_SfxBaseController_DataContainer -//________________________________________________________________________________________________________ + struct IMPL_SfxBaseController_DataContainer { @@ -419,18 +419,18 @@ struct IMPL_SfxBaseController_DataContainer } ; // struct IMPL_SfxBaseController_DataContainer -//________________________________________________________________________________________________________ + // IMPL_SfxBaseController_ListenerHelper constructor -//________________________________________________________________________________________________________ + IMPL_SfxBaseController_ListenerHelper::IMPL_SfxBaseController_ListenerHelper( SfxBaseController* pController ) : m_pController ( pController ) { } -//________________________________________________________________________________________________________ + // IMPL_SfxBaseController_ListenerHelper destructor -//________________________________________________________________________________________________________ + IMPL_SfxBaseController_ListenerHelper::~IMPL_SfxBaseController_ListenerHelper() { @@ -457,9 +457,9 @@ void SAL_CALL IMPL_SfxBaseController_ListenerHelper::frameAction( const frame::F } } -//________________________________________________________________________________________________________ + // IMPL_SfxBaseController_ListenerHelper -> XEventListener -//________________________________________________________________________________________________________ + void SAL_CALL IMPL_SfxBaseController_ListenerHelper::disposing( const lang::EventObject& /*aEvent*/ ) throw( RuntimeException ) { @@ -468,9 +468,9 @@ void SAL_CALL IMPL_SfxBaseController_ListenerHelper::disposing( const lang::Even m_pController->getFrame()->removeFrameActionListener( this ) ; } -//________________________________________________________________________________________________________ + // SfxBaseController -> constructor -//________________________________________________________________________________________________________ + DBG_NAME(sfx2_SfxBaseController) SfxBaseController::SfxBaseController( SfxViewShell* pViewShell ) : m_pData ( new IMPL_SfxBaseController_DataContainer( m_aMutex, pViewShell, this )) @@ -479,9 +479,9 @@ SfxBaseController::SfxBaseController( SfxViewShell* pViewShell ) m_pData->m_pViewShell->SetController( this ); } -//________________________________________________________________________________________________________ + // SfxBaseController -> destructor -//________________________________________________________________________________________________________ + SfxBaseController::~SfxBaseController() { @@ -489,9 +489,9 @@ SfxBaseController::~SfxBaseController() delete m_pData; } -//________________________________________________________________________________________________________ + // SfxBaseController -> XController2 -//________________________________________________________________________________________________________ + Reference< XWindow > SAL_CALL SfxBaseController::getComponentWindow() throw (RuntimeException) { @@ -542,9 +542,9 @@ SfxViewFrame& SfxBaseController::GetViewFrame_Impl() const return *pActFrame; } -//________________________________________________________________________________________________________ + // SfxBaseController -> XController2 -> XController -//________________________________________________________________________________________________________ + void SAL_CALL SfxBaseController::attachFrame( const Reference< frame::XFrame >& xFrame ) throw( RuntimeException ) { @@ -580,9 +580,9 @@ void SAL_CALL SfxBaseController::attachFrame( const Reference< frame::XFrame >& } } -//________________________________________________________________________________________________________ + // SfxBaseController -> XController -//________________________________________________________________________________________________________ + sal_Bool SAL_CALL SfxBaseController::attachModel( const Reference< frame::XModel >& xModel ) throw( RuntimeException ) { @@ -599,9 +599,9 @@ sal_Bool SAL_CALL SfxBaseController::attachModel( const Reference< frame::XModel return sal_True; } -//________________________________________________________________________________________________________ + // SfxBaseController -> XController -//________________________________________________________________________________________________________ + sal_Bool SAL_CALL SfxBaseController::suspend( sal_Bool bSuspend ) throw( RuntimeException ) { @@ -657,9 +657,9 @@ sal_Bool SAL_CALL SfxBaseController::suspend( sal_Bool bSuspend ) throw( Runtime } } -//________________________________________________________________________________________________________ + // SfxBaseController -> XController -//________________________________________________________________________________________________________ + uno::Any SfxBaseController::getViewData() throw( RuntimeException ) { @@ -675,9 +675,9 @@ uno::Any SfxBaseController::getViewData() throw( RuntimeException ) return aAny ; } -//________________________________________________________________________________________________________ + // SfxBaseController -> XController -//________________________________________________________________________________________________________ + void SAL_CALL SfxBaseController::restoreViewData( const uno::Any& aValue ) throw( RuntimeException ) { @@ -690,9 +690,9 @@ void SAL_CALL SfxBaseController::restoreViewData( const uno::Any& aValue ) throw } } -//________________________________________________________________________________________________________ + // SfxBaseController -> XController -//________________________________________________________________________________________________________ + Reference< frame::XFrame > SAL_CALL SfxBaseController::getFrame() throw( RuntimeException ) { @@ -700,9 +700,9 @@ Reference< frame::XFrame > SAL_CALL SfxBaseController::getFrame() throw( Runtime return m_pData->m_xFrame; } -//________________________________________________________________________________________________________ + // SfxBaseController -> XController -//________________________________________________________________________________________________________ + Reference< frame::XModel > SAL_CALL SfxBaseController::getModel() throw( RuntimeException ) { @@ -710,9 +710,9 @@ Reference< frame::XModel > SAL_CALL SfxBaseController::getModel() throw( Runtime return m_pData->m_pViewShell ? m_pData->m_pViewShell->GetObjectShell()->GetModel() : Reference < frame::XModel > () ; } -//________________________________________________________________________________________________________ + // SfxBaseController -> XDispatchProvider -//________________________________________________________________________________________________________ + Reference< frame::XDispatch > SAL_CALL SfxBaseController::queryDispatch( const util::URL& aURL , const OUString& sTargetFrameName, @@ -868,9 +868,9 @@ Reference< frame::XDispatch > SAL_CALL SfxBaseController::queryDispatch( const return xDisp; } -//________________________________________________________________________________________________________ + // SfxBaseController -> XDispatchProvider -//________________________________________________________________________________________________________ + uno::Sequence< Reference< frame::XDispatch > > SAL_CALL SfxBaseController::queryDispatches( const uno::Sequence< frame::DispatchDescriptor >& seqDescripts ) throw( RuntimeException ) { @@ -889,9 +889,9 @@ uno::Sequence< Reference< frame::XDispatch > > SAL_CALL SfxBaseController::query return lDispatcher; } -//________________________________________________________________________________________________________ + // SfxBaseController -> XControllerBorder -//________________________________________________________________________________________________________ + frame::BorderWidths SAL_CALL SfxBaseController::getBorder() throw ( RuntimeException ) @@ -963,9 +963,9 @@ void SfxBaseController::BorderWidthsChanged_Impl() } } -//________________________________________________________________________________________________________ + // SfxBaseController -> XComponent -//________________________________________________________________________________________________________ + void SAL_CALL SfxBaseController::dispose() throw( RuntimeException ) { @@ -1034,18 +1034,18 @@ void SAL_CALL SfxBaseController::dispose() throw( RuntimeException ) } } -//________________________________________________________________________________________________________ + // SfxBaseController -> XComponent -//________________________________________________________________________________________________________ + void SAL_CALL SfxBaseController::addEventListener( const Reference< lang::XEventListener >& aListener ) throw( RuntimeException ) { m_pData->m_aListenerContainer.addInterface( ::getCppuType((const Reference< lang::XEventListener >*)0), aListener ); } -//________________________________________________________________________________________________________ + // SfxBaseController -> XComponent -//________________________________________________________________________________________________________ + void SAL_CALL SfxBaseController::removeEventListener( const Reference< lang::XEventListener >& aListener ) throw( RuntimeException ) { diff --git a/sfx2/source/view/userinputinterception.cxx b/sfx2/source/view/userinputinterception.cxx index e557c9a28b22..dc5d77905df3 100644 --- a/sfx2/source/view/userinputinterception.cxx +++ b/sfx2/source/view/userinputinterception.cxx @@ -117,56 +117,56 @@ namespace sfx2 //==================================================================== //= UserInputInterception //==================================================================== - //-------------------------------------------------------------------- + UserInputInterception::UserInputInterception( ::cppu::OWeakObject& _rControllerImpl, ::osl::Mutex& _rMutex ) :m_pData( new UserInputInterception_Data( _rControllerImpl, _rMutex ) ) { } - //-------------------------------------------------------------------- + UserInputInterception::~UserInputInterception() { } - //-------------------------------------------------------------------- + void UserInputInterception::addKeyHandler( const Reference< XKeyHandler >& _rxHandler ) throw (RuntimeException) { if ( _rxHandler.is() ) m_pData->m_aKeyHandlers.addInterface( _rxHandler ); } - //-------------------------------------------------------------------- + void UserInputInterception::removeKeyHandler( const Reference< XKeyHandler >& _rxHandler ) throw (RuntimeException) { m_pData->m_aKeyHandlers.removeInterface( _rxHandler ); } - //-------------------------------------------------------------------- + void UserInputInterception::addMouseClickHandler( const Reference< XMouseClickHandler >& _rxHandler ) throw (RuntimeException) { if ( _rxHandler.is() ) m_pData->m_aMouseClickHandlers.addInterface( _rxHandler ); } - //-------------------------------------------------------------------- + void UserInputInterception::removeMouseClickHandler( const Reference< XMouseClickHandler >& _rxHandler ) throw (RuntimeException) { m_pData->m_aMouseClickHandlers.removeInterface( _rxHandler ); } - //-------------------------------------------------------------------- + bool UserInputInterception::hasKeyHandlers() const { return m_pData->m_aKeyHandlers.getLength() > 0; } - //-------------------------------------------------------------------- + bool UserInputInterception::hasMouseClickListeners() const { return m_pData->m_aMouseClickHandlers.getLength() > 0; } - //-------------------------------------------------------------------- + bool UserInputInterception::handleNotifyEvent( const NotifyEvent& _rEvent ) { Reference < XInterface > xHoldAlive( m_pData->m_rControllerImpl ); diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index 2d39b8805e69..607ce9474a79 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -140,14 +140,14 @@ using ::com::sun::star::container::XIndexContainer; #include "../appl/app.hrc" #include "impviewframe.hxx" -//------------------------------------------------------------------------- + DBG_NAME(SfxViewFrame) #define SfxViewFrame #include "sfxslots.hxx" #undef SfxViewFrame -//------------------------------------------------------------------------- + SFX_IMPL_INTERFACE(SfxViewFrame,SfxShell,SfxResId(0)) { @@ -162,7 +162,7 @@ SFX_IMPL_INTERFACE(SfxViewFrame,SfxShell,SfxResId(0)) TYPEINIT2(SfxViewFrame,SfxShell,SfxListener); TYPEINIT1(SfxViewFrameItem, SfxPoolItem); -//------------------------------------------------------------------------- + namespace { bool moduleHasToolPanels( SfxViewFrame_Impl& i_rViewFrameImpl ) @@ -176,7 +176,7 @@ namespace } } -//------------------------------------------------------------------------- + static sal_Bool AskPasswordToModify_Impl( const uno::Reference< task::XInteractionHandler >& xHandler, const OUString& aPath, const SfxFilter* pFilter, sal_uInt32 nPasswordHash, const uno::Sequence< beans::PropertyValue > aInfo ) { // TODO/LATER: In future the info should replace the direct hash completely @@ -225,20 +225,20 @@ static sal_Bool AskPasswordToModify_Impl( const uno::Reference< task::XInteracti return bResult; } -//------------------------------------------------------------------------- + void SfxViewFrame::SetDowning_Impl() { pImp->bIsDowning = sal_True; } -//------------------------------------------------------------------------- + sal_Bool SfxViewFrame::IsDowning_Impl() const { return pImp->bIsDowning; } -//-------------------------------------------------------------------- + class SfxViewNotificatedFrameList_Impl : public SfxListener, public SfxViewFrameArr_Impl { @@ -252,7 +252,7 @@ public: void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); }; -//------------------------------------------------------------------------- + void SfxViewNotificatedFrameList_Impl::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) { if ( rHint.IsA(TYPE(SfxSimpleHint)) ) @@ -272,7 +272,7 @@ void SfxViewNotificatedFrameList_Impl::Notify( SfxBroadcaster& rBC, const SfxHin } } -//------------------------------------------------------------------------- + long ReloadDecouple_Impl( void* pObj, void* pArg ) { @@ -856,7 +856,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) } } -//------------------------------------------------------------------------- + void SfxViewFrame::StateReload_Impl( SfxItemSet& rSet ) { SfxObjectShell* pSh = GetObjectShell(); @@ -930,7 +930,7 @@ void SfxViewFrame::StateReload_Impl( SfxItemSet& rSet ) } -//-------------------------------------------------------------------- + void SfxViewFrame::ExecHistory_Impl( SfxRequest &rReq ) { // Is there an Undo-Manager on the top Shell? @@ -977,7 +977,7 @@ void SfxViewFrame::ExecHistory_Impl( SfxRequest &rReq ) rReq.Done(); } -//-------------------------------------------------------------------- + void SfxViewFrame::StateHistory_Impl( SfxItemSet &rSet ) { // Search for Undo-Manager @@ -1032,7 +1032,7 @@ void SfxViewFrame::StateHistory_Impl( SfxItemSet &rSet ) rSet.DisableItem( SID_REPEAT ); } -//-------------------------------------------------------------------- + void SfxViewFrame::PopShellAndSubShells_Impl( SfxViewShell& i_rViewShell ) { i_rViewShell.PopSubShells_Impl(); @@ -1055,7 +1055,7 @@ void SfxViewFrame::PopShellAndSubShells_Impl( SfxViewShell& i_rViewShell ) } -//-------------------------------------------------------------------- + void SfxViewFrame::ReleaseObjectShell_Impl() /* [Description] @@ -1127,7 +1127,7 @@ void SfxViewFrame::ReleaseObjectShell_Impl() GetDispatcher()->SetDisableFlags( 0 ); } -//-------------------------------------------------------------------- + sal_Bool SfxViewFrame::Close() { DBG_CHKTHIS(SfxViewFrame, 0); @@ -1151,7 +1151,7 @@ sal_Bool SfxViewFrame::Close() return sal_True; } -//-------------------------------------------------------------------- + void SfxViewFrame::DoActivate( sal_Bool bUI, SfxViewFrame* pOldFrame ) { @@ -1174,7 +1174,7 @@ void SfxViewFrame::DoActivate( sal_Bool bUI, SfxViewFrame* pOldFrame ) } } -//-------------------------------------------------------------------- + void SfxViewFrame::DoDeactivate(sal_Bool bUI, SfxViewFrame* pNewFrame ) { DBG_CHKTHIS(SfxViewFrame, 0); @@ -1195,7 +1195,7 @@ void SfxViewFrame::DoDeactivate(sal_Bool bUI, SfxViewFrame* pNewFrame ) } } -//------------------------------------------------------------------------ + void SfxViewFrame::InvalidateBorderImpl( const SfxViewShell* pSh ) { if( pSh && !nAdjustPosPixelLock ) @@ -1213,7 +1213,7 @@ void SfxViewFrame::InvalidateBorderImpl( const SfxViewShell* pSh ) } } -//------------------------------------------------------------------------ + sal_Bool SfxViewFrame::SetBorderPixelImpl ( const SfxViewShell* pVSh, @@ -1256,7 +1256,7 @@ sal_Bool SfxViewFrame::SetBorderPixelImpl return sal_True; } -//------------------------------------------------------------------------ + const SvBorder& SfxViewFrame::GetBorderPixelImpl ( const SfxViewShell* /*pSh*/ @@ -1266,7 +1266,7 @@ const SvBorder& SfxViewFrame::GetBorderPixelImpl return pImp->aBorder; } -//-------------------------------------------------------------------- + void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) { {DBG_CHKTHIS(SfxViewFrame, 0);} @@ -1394,7 +1394,7 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) } } -//------------------------------------------------------------------------ + void SfxViewFrame::Construct_Impl( SfxObjectShell *pObjSh ) { pImp->bResizeInToOut = sal_True; @@ -1476,7 +1476,7 @@ SfxViewFrame::SfxViewFrame rFrame.CreateWorkWindow_Impl(); } -//------------------------------------------------------------------------ + SfxViewFrame::~SfxViewFrame() { DBG_DTOR(SfxViewFrame, 0); @@ -1509,7 +1509,7 @@ SfxViewFrame::~SfxViewFrame() delete pImp; } -//------------------------------------------------------------------------ + void SfxViewFrame::KillDispatcher_Impl() // Remove and delete the Dispatcher. @@ -1530,13 +1530,13 @@ void SfxViewFrame::KillDispatcher_Impl() } } -//------------------------------------------------------------------------ + SfxViewFrame* SfxViewFrame::Current() { return SfxApplication::Get() ? SFX_APP()->Get_Impl()->pViewFrame : NULL; } -//-------------------------------------------------------------------- + // returns the first window of spec. type viewing the specified doc. SfxViewFrame* SfxViewFrame::GetFirst ( @@ -1559,7 +1559,7 @@ SfxViewFrame* SfxViewFrame::GetFirst return 0; } -//-------------------------------------------------------------------- + // returns thenext window of spec. type viewing the specified doc. SfxViewFrame* SfxViewFrame::GetNext @@ -1590,14 +1590,14 @@ SfxViewFrame* SfxViewFrame::GetNext return 0; } -//-------------------------------------------------------------------- + SfxProgress* SfxViewFrame::GetProgress() const { SfxObjectShell *pObjSh = GetObjectShell(); return pObjSh ? pObjSh->GetProgress() : 0; } -//-------------------------------------------------------------------- + void SfxViewFrame::DoAdjustPosSizePixel //! divide on Inner.../Outer... ( SfxViewShell* pSh, @@ -1626,19 +1626,19 @@ bool SfxViewFrameItem::operator==( const SfxPoolItem &rItem ) const return PTR_CAST(SfxViewFrameItem, &rItem)->pFrame== pFrame; } -//-------------------------------------------------------------------- + OUString SfxViewFrameItem::GetValueText() const { return OUString(); } -//-------------------------------------------------------------------- + SfxPoolItem* SfxViewFrameItem::Clone( SfxItemPool *) const { return new SfxViewFrameItem( pFrame); } -//-------------------------------------------------------------------- + void SfxViewFrame::SetViewShell_Impl( SfxViewShell *pVSh ) /* [Description] @@ -1655,7 +1655,7 @@ void SfxViewFrame::SetViewShell_Impl( SfxViewShell *pVSh ) pImp->bResizeInToOut = sal_False; } -//-------------------------------------------------------------------- + /* [Description] The ParentViewFrame of the Containers ViewFrame in the internal InPlace @@ -1667,20 +1667,20 @@ SfxViewFrame* SfxViewFrame::GetParentViewFrame_Impl() const return NULL; } -//-------------------------------------------------------------------- + void SfxViewFrame::ForceOuterResize_Impl(sal_Bool bOn) { if ( !pImp->bDontOverwriteResizeInToOut ) pImp->bResizeInToOut = !bOn; } -//-------------------------------------------------------------------- + sal_Bool SfxViewFrame::IsResizeInToOut_Impl() const { return pImp->bResizeInToOut; } -//-------------------------------------------------------------------- + void SfxViewFrame::GetDocNumber_Impl() { DBG_ASSERT( GetObjectShell(), "No Document!" ); @@ -1688,7 +1688,7 @@ void SfxViewFrame::GetDocNumber_Impl() pImp->nDocViewNo = GetObjectShell()->GetNoSet_Impl().GetFreeIndex()+1; } -//-------------------------------------------------------------------- + void SfxViewFrame::Enable( sal_Bool bEnable ) { @@ -1728,7 +1728,7 @@ void SfxViewFrame::Enable( sal_Bool bEnable ) } } -//-------------------------------------------------------------------- + void SfxViewFrame::Show() /* [Description] @@ -1764,13 +1764,13 @@ void SfxViewFrame::Show() GetFrame().GetWindow().Show(); } -//-------------------------------------------------------------------- + sal_Bool SfxViewFrame::IsVisible() const { return pImp->bObjLocked; } -//-------------------------------------------------------------------- + void SfxViewFrame::LockObjectShell_Impl( sal_Bool bLock ) { DBG_ASSERT( pImp->bObjLocked != bLock, "Wrong Locked status!" ); @@ -1780,7 +1780,7 @@ void SfxViewFrame::LockObjectShell_Impl( sal_Bool bLock ) pImp->bObjLocked = bLock; } -//-------------------------------------------------------------------- + void SfxViewFrame::MakeActive_Impl( sal_Bool bGrabFocus ) { if ( GetViewShell() && !GetFrame().IsClosing_Impl() ) @@ -1832,14 +1832,14 @@ void SfxViewFrame::MakeActive_Impl( sal_Bool bGrabFocus ) } } -//------------------------------------------------------------------------- + void SfxViewFrame::SetQuietMode_Impl( sal_Bool bOn ) { GetDispatcher()->SetQuietMode_Impl( bOn ); } -//------------------------------------------------------------------------- + SfxObjectShell* SfxViewFrame::GetObjectShell() { @@ -1873,7 +1873,7 @@ SfxViewFrame* SfxViewFrame::GetActiveChildFrame_Impl() const return pViewFrame; } -//-------------------------------------------------------------------- + SfxViewFrame* SfxViewFrame::LoadViewIntoFrame_Impl_NoThrow( const SfxObjectShell& i_rDoc, const Reference< XFrame >& i_rFrame, const sal_uInt16 i_nViewId, const bool i_bHidden ) { @@ -1944,7 +1944,7 @@ SfxViewFrame* SfxViewFrame::LoadViewIntoFrame_Impl_NoThrow( const SfxObjectShell return NULL; } -//-------------------------------------------------------------------- + SfxViewShell* SfxViewFrame::LoadViewIntoFrame_Impl( const SfxObjectShell& i_rDoc, const Reference< XFrame >& i_rFrame, const Sequence< PropertyValue >& i_rLoadArgs, const sal_uInt16 i_nViewId, const bool i_bHidden ) @@ -1974,35 +1974,35 @@ SfxViewShell* SfxViewFrame::LoadViewIntoFrame_Impl( const SfxObjectShell& i_rDoc return pViewShell; } -//-------------------------------------------------------------------- + SfxViewFrame* SfxViewFrame::LoadHiddenDocument( SfxObjectShell& i_rDoc, const sal_uInt16 i_nViewId ) { return LoadViewIntoFrame_Impl_NoThrow( i_rDoc, Reference< XFrame >(), i_nViewId, true ); } -//-------------------------------------------------------------------- + SfxViewFrame* SfxViewFrame::LoadDocument( SfxObjectShell& i_rDoc, const sal_uInt16 i_nViewId ) { return LoadViewIntoFrame_Impl_NoThrow( i_rDoc, Reference< XFrame >(), i_nViewId, false ); } -//-------------------------------------------------------------------- + SfxViewFrame* SfxViewFrame::LoadDocumentIntoFrame( SfxObjectShell& i_rDoc, const Reference< XFrame >& i_rTargetFrame, const sal_uInt16 i_nViewId ) { return LoadViewIntoFrame_Impl_NoThrow( i_rDoc, i_rTargetFrame, i_nViewId, false ); } -//-------------------------------------------------------------------- + SfxViewFrame* SfxViewFrame::LoadDocumentIntoFrame( SfxObjectShell& i_rDoc, const SfxFrameItem* i_pFrameItem, const sal_uInt16 i_nViewId ) { return LoadViewIntoFrame_Impl_NoThrow( i_rDoc, i_pFrameItem && i_pFrameItem->GetFrame() ? i_pFrameItem->GetFrame()->GetFrameInterface() : NULL, i_nViewId, false ); } -//-------------------------------------------------------------------- + SfxViewFrame* SfxViewFrame::DisplayNewDocument( SfxObjectShell& i_rDoc, const SfxRequest& i_rCreateDocRequest, const sal_uInt16 i_nViewId ) { SFX_REQUEST_ARG( i_rCreateDocRequest, pFrameItem, SfxUnoFrameItem, SID_FILLFRAME, false ); @@ -2016,7 +2016,7 @@ SfxViewFrame* SfxViewFrame::DisplayNewDocument( SfxObjectShell& i_rDoc, const Sf ); } -//-------------------------------------------------------------------- + SfxViewFrame* SfxViewFrame::Get( const Reference< XController>& i_rController, const SfxObjectShell* i_pDoc ) { @@ -2050,7 +2050,7 @@ SfxViewFrame* SfxViewFrame::Get( const Reference< XController>& i_rController, c return pViewFrame; } -//-------------------------------------------------------------------- + void SfxViewFrame::SaveCurrentViewData_Impl( const sal_uInt16 i_nNewViewId ) { @@ -2116,7 +2116,7 @@ void SfxViewFrame::SaveCurrentViewData_Impl( const sal_uInt16 i_nNewViewId ) } } -//-------------------------------------------------------------------- + sal_Bool SfxViewFrame::SwitchToViewShell_Impl ( @@ -2210,19 +2210,19 @@ sal_Bool SfxViewFrame::SwitchToViewShell_Impl return sal_True; } -//------------------------------------------------------------------------- + void SfxViewFrame::SetCurViewId_Impl( const sal_uInt16 i_nID ) { pImp->nCurViewId = i_nID; } -//------------------------------------------------------------------------- + sal_uInt16 SfxViewFrame::GetCurViewId() const { return pImp->nCurViewId; } -//------------------------------------------------------------------------- + void SfxViewFrame::ExecView_Impl ( SfxRequest& rReq // The executable <SfxRequest> @@ -2324,7 +2324,7 @@ void SfxViewFrame::ExecView_Impl } } -//------------------------------------------------------------------------- + /* TODO as96863: This method try to collect information about the count of currently open documents. But the algorithm is implemented very simple ... @@ -2374,7 +2374,7 @@ sal_Bool impl_maxOpenDocCountReached() return (nOpenDocs >= nMaxDocs); } -//------------------------------------------------------------------------- + void SfxViewFrame::StateView_Impl ( SfxItemSet& rSet /* empty <SfxItemSet> with <Which-Ranges>, @@ -2449,13 +2449,13 @@ void SfxViewFrame::StateView_Impl } } -//------------------------------------------------------------------------- + void SfxViewFrame::ToTop() { GetFrame().Appear(); } -//------------------------------------------------------------------------- + SfxViewFrame* SfxViewFrame::GetParentViewFrame() const /* [Description] @@ -2466,7 +2466,7 @@ SfxViewFrame* SfxViewFrame::GetParentViewFrame() const return pFrame ? pFrame->GetCurrentViewFrame() : NULL; } -//------------------------------------------------------------------------- + SfxFrame& SfxViewFrame::GetFrame() const /* [Description] @@ -2476,7 +2476,7 @@ SfxFrame& SfxViewFrame::GetFrame() const return pImp->rFrame; } -//------------------------------------------------------------------------- + SfxViewFrame* SfxViewFrame::GetTopViewFrame() const { return GetFrame().GetTopFrame().GetCurrentViewFrame(); @@ -3158,7 +3158,7 @@ void SfxViewFrame::ChildWindowExecute( SfxRequest &rReq ) } } -//-------------------------------------------------------------------- + void SfxViewFrame::ChildWindowState( SfxItemSet& rState ) @@ -3236,7 +3236,7 @@ void SfxViewFrame::ChildWindowState( SfxItemSet& rState ) } } -//-------------------------------------------------------------------- + SfxWorkWindow* SfxViewFrame::GetWorkWindow_Impl( sal_uInt16 /*nId*/ ) { SfxWorkWindow* pWork = 0; @@ -3251,7 +3251,7 @@ void SfxViewFrame::SetChildWindow(sal_uInt16 nId, sal_Bool bOn, sal_Bool bSetFoc pWork->SetChildWindow_Impl( nId, bOn, bSetFocus ); } -//-------------------------------------------------------------------- + void SfxViewFrame::ToggleChildWindow(sal_uInt16 nId) { @@ -3260,7 +3260,7 @@ void SfxViewFrame::ToggleChildWindow(sal_uInt16 nId) pWork->ToggleChildWindow_Impl( nId, sal_True ); } -//-------------------------------------------------------------------- + bool SfxViewFrame::HasChildWindow( sal_uInt16 nId ) { @@ -3268,7 +3268,7 @@ bool SfxViewFrame::HasChildWindow( sal_uInt16 nId ) return pWork && pWork->HasChildWindow_Impl(nId); } -//-------------------------------------------------------------------- + sal_Bool SfxViewFrame::KnowsChildWindow( sal_uInt16 nId ) { @@ -3276,7 +3276,7 @@ sal_Bool SfxViewFrame::KnowsChildWindow( sal_uInt16 nId ) return pWork ? pWork->KnowsChildWindow_Impl(nId) : sal_False; } -//-------------------------------------------------------------------- + void SfxViewFrame::ShowChildWindow( sal_uInt16 nId, sal_Bool bVisible ) { @@ -3288,7 +3288,7 @@ void SfxViewFrame::ShowChildWindow( sal_uInt16 nId, sal_Bool bVisible ) } } -//-------------------------------------------------------------------- + SfxChildWindow* SfxViewFrame::GetChildWindow(sal_uInt16 nId) { @@ -3311,7 +3311,7 @@ void SfxViewFrame::SetViewFrame( SfxViewFrame* pFrame ) SFX_APP()->SetViewFrame_Impl( pFrame ); } -// --------------------------------------------------------------------------------------------------------------------- + void SfxViewFrame::ActivateToolPanel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame, const OUString& i_rPanelURL ) { SolarMutexGuard aGuard; @@ -3329,7 +3329,7 @@ void SfxViewFrame::ActivateToolPanel( const ::com::sun::star::uno::Reference< :: pViewFrame->ActivateToolPanel_Impl( i_rPanelURL ); } -// --------------------------------------------------------------------------------------------------------------------- + void SfxViewFrame::ActivateToolPanel_Impl( const OUString& i_rPanelURL ) { // ensure the task pane is visible diff --git a/sfx2/source/view/viewfrm2.cxx b/sfx2/source/view/viewfrm2.cxx index e073426e8e97..8633f23d51b7 100644 --- a/sfx2/source/view/viewfrm2.cxx +++ b/sfx2/source/view/viewfrm2.cxx @@ -55,7 +55,7 @@ using namespace ::com::sun::star::beans; using ::com::sun::star::lang::XMultiServiceFactory; using ::com::sun::star::lang::XComponent; -//-------------------------------------------------------------------- + void SfxFrameViewWindow_Impl::StateChanged( StateChangedType nStateChange ) { if ( nStateChange == STATE_CHANGE_INITSHOW ) @@ -78,7 +78,7 @@ void SfxFrameViewWindow_Impl::Resize() //======================================================================== -//-------------------------------------------------------------------- + void SfxViewFrame::UpdateTitle() /* [Description] diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index f7a83e3319a8..1416c0fe5d2f 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -299,7 +299,7 @@ SFX_IMPL_INTERFACE(SfxViewShell,SfxShell,SfxResId(0)) TYPEINIT2(SfxViewShell,SfxShell,SfxListener); -//-------------------------------------------------------------------- + /** search for a filter name dependent on type and module */ @@ -341,7 +341,7 @@ static OUString impl_retrieveFilterNameFromTypeAndModule( return aFoundFilterName; } -//-------------------------------------------------------------------- + /** search for an internal typename, which map to the current app module and map also to a "family" of file formats as e.g. PDF/MS Doc/OOo Doc. */ @@ -410,7 +410,7 @@ OUString impl_searchFormatTypeForApp(const css::uno::Reference< css::frame::XFra return OUString(); } -//-------------------------------------------------------------------- + void SfxViewShell::IPClientGone_Impl( SfxInPlaceClient *pIPClient ) { @@ -428,7 +428,7 @@ void SfxViewShell::IPClientGone_Impl( SfxInPlaceClient *pIPClient ) -//-------------------------------------------------------------------- + void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq ) { @@ -778,7 +778,7 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq ) } } -//-------------------------------------------------------------------- + void SfxViewShell::GetState_Impl( SfxItemSet &rSet ) { @@ -843,7 +843,7 @@ void SfxViewShell::GetState_Impl( SfxItemSet &rSet ) } } -//-------------------------------------------------------------------- + void SfxViewShell::SetZoomFactor( const Fraction &rZoomX, const Fraction &rZoomY ) @@ -855,7 +855,7 @@ void SfxViewShell::SetZoomFactor( const Fraction &rZoomX, GetWindow()->SetMapMode( aMap ); } -//-------------------------------------------------------------------- + ErrCode SfxViewShell::DoVerb(long /*nVerb*/) /* [Description] @@ -869,7 +869,7 @@ ErrCode SfxViewShell::DoVerb(long /*nVerb*/) return ERRCODE_SO_NOVERBS; } -//-------------------------------------------------------------------- + void SfxViewShell::OutplaceActivated( sal_Bool bActive, SfxInPlaceClient* /*pClient*/ ) { @@ -877,7 +877,7 @@ void SfxViewShell::OutplaceActivated( sal_Bool bActive, SfxInPlaceClient* /*pCli GetFrame()->GetFrame().Appear(); } -//-------------------------------------------------------------------- + void SfxViewShell::InplaceActivating( SfxInPlaceClient* /*pClient*/ ) { @@ -885,14 +885,14 @@ void SfxViewShell::InplaceActivating( SfxInPlaceClient* /*pClient*/ ) // but may be the bug will not affect the real office vcl windows, then it is not required } -//-------------------------------------------------------------------- + void SfxViewShell::InplaceDeactivated( SfxInPlaceClient* /*pClient*/ ) { // TODO/LATER: paint the replacement image in normal way if the painting was stopped } -//-------------------------------------------------------------------- + void SfxViewShell::UIActivating( SfxInPlaceClient* /*pClient*/ ) { @@ -905,7 +905,7 @@ void SfxViewShell::UIActivating( SfxInPlaceClient* /*pClient*/ ) pFrame->GetDispatcher()->Update_Impl( sal_True ); } -//-------------------------------------------------------------------- + void SfxViewShell::UIDeactivated( SfxInPlaceClient* /*pClient*/ ) { @@ -916,7 +916,7 @@ void SfxViewShell::UIDeactivated( SfxInPlaceClient* /*pClient*/ ) pFrame->GetBindings().InvalidateAll(sal_True); } -//-------------------------------------------------------------------- + SfxInPlaceClient* SfxViewShell::FindIPClient ( @@ -940,14 +940,14 @@ SfxInPlaceClient* SfxViewShell::FindIPClient return 0; } -//-------------------------------------------------------------------- + SfxInPlaceClient* SfxViewShell::GetIPClient() const { return GetUIActiveClient(); } -//-------------------------------------------------------------------- + SfxInPlaceClient* SfxViewShell::GetUIActiveIPClient_Impl() const { @@ -982,7 +982,7 @@ SfxInPlaceClient* SfxViewShell::GetUIActiveClient() const return NULL; } -//-------------------------------------------------------------------- + void SfxViewShell::Activate( sal_Bool bMDI ) { @@ -997,14 +997,14 @@ void SfxViewShell::Activate( sal_Bool bMDI ) } } -//-------------------------------------------------------------------- + void SfxViewShell::Deactivate(sal_Bool /*bMDI*/) { DBG_CHKTHIS(SfxViewShell, 0); } -//-------------------------------------------------------------------- + void SfxViewShell::AdjustPosSizePixel ( @@ -1016,7 +1016,7 @@ void SfxViewShell::AdjustPosSizePixel DBG_CHKTHIS(SfxViewShell, 0); } -//-------------------------------------------------------------------- + void SfxViewShell::Move() @@ -1038,7 +1038,7 @@ void SfxViewShell::Move() { } -//-------------------------------------------------------------------- + void SfxViewShell::OuterResizePixel ( @@ -1089,7 +1089,7 @@ void SfxViewShell::OuterResizePixel SetBorderPixel( SvBorder() ); } -//-------------------------------------------------------------------- + void SfxViewShell::InnerResizePixel ( @@ -1140,7 +1140,7 @@ void SfxViewShell::InnerResizePixel SetBorderPixel( SvBorder() ); } -//-------------------------------------------------------------------- + void SfxViewShell::InvalidateBorder() { @@ -1154,7 +1154,7 @@ void SfxViewShell::InvalidateBorder() } } -//-------------------------------------------------------------------- + void SfxViewShell::SetBorderPixel( const SvBorder &rBorder ) { @@ -1170,7 +1170,7 @@ void SfxViewShell::SetBorderPixel( const SvBorder &rBorder ) } } -//-------------------------------------------------------------------- + const SvBorder& SfxViewShell::GetBorderPixel() const { @@ -1180,7 +1180,7 @@ const SvBorder& SfxViewShell::GetBorderPixel() const return GetViewFrame()->GetBorderPixelImpl( this ); } -//-------------------------------------------------------------------- + void SfxViewShell::SetWindow ( @@ -1222,7 +1222,7 @@ void SfxViewShell::SetWindow //SFX_APP()->GrabFocus( pWindow ); } -//-------------------------------------------------------------------- + SfxViewShell::SfxViewShell ( @@ -1256,7 +1256,7 @@ SfxViewShell::SfxViewShell rViewArr.push_back(this); } -//-------------------------------------------------------------------- + SfxViewShell::~SfxViewShell() { @@ -1284,7 +1284,7 @@ SfxViewShell::~SfxViewShell() DELETEZ( pIPClientList ); } -//-------------------------------------------------------------------- + bool SfxViewShell::PrepareClose ( @@ -1312,7 +1312,7 @@ bool SfxViewShell::PrepareClose return true; } -//-------------------------------------------------------------------- + SfxViewShell* SfxViewShell::Current() { @@ -1320,7 +1320,7 @@ SfxViewShell* SfxViewShell::Current() return pCurrent ? pCurrent->GetViewShell() : NULL; } -//-------------------------------------------------------------------- + SfxViewShell* SfxViewShell::Get( const Reference< XController>& i_rController ) { @@ -1338,7 +1338,7 @@ SfxViewShell* SfxViewShell::Get( const Reference< XController>& i_rController ) return NULL; } -//-------------------------------------------------------------------- + SdrView* SfxViewShell::GetDrawView() const @@ -1354,7 +1354,7 @@ SdrView* SfxViewShell::GetDrawView() const return 0; } -//-------------------------------------------------------------------- + OUString SfxViewShell::GetSelectionText ( @@ -1384,7 +1384,7 @@ OUString SfxViewShell::GetSelectionText return OUString(); } -//-------------------------------------------------------------------- + sal_Bool SfxViewShell::HasSelection( sal_Bool ) const @@ -1465,13 +1465,13 @@ void SfxViewShell::PushSubShells_Impl( sal_Bool bPush ) pDisp->Flush(); } -//-------------------------------------------------------------------- + void SfxViewShell::WriteUserData( OUString&, bool ) { } -//-------------------------------------------------------------------- + void SfxViewShell::ReadUserData(const OUString&, bool ) { @@ -1486,7 +1486,7 @@ void SfxViewShell::WriteUserDataSequence ( uno::Sequence < beans::PropertyValue } -//-------------------------------------------------------------------- + // returns the first shell of spec. type viewing the specified doc. SfxViewShell* SfxViewShell::GetFirst @@ -1523,7 +1523,7 @@ SfxViewShell* SfxViewShell::GetFirst return 0; } -//-------------------------------------------------------------------- + // returns the next shell of spec. type viewing the specified doc. SfxViewShell* SfxViewShell::GetNext @@ -1565,7 +1565,7 @@ SfxViewShell* SfxViewShell::GetNext return 0; } -//-------------------------------------------------------------------- + void SfxViewShell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) @@ -1604,7 +1604,7 @@ void SfxViewShell::Notify( SfxBroadcaster& rBC, } } -//-------------------------------------------------------------------- + sal_Bool SfxViewShell::ExecKey_Impl(const KeyEvent& aKey) { @@ -1619,7 +1619,7 @@ sal_Bool SfxViewShell::ExecKey_Impl(const KeyEvent& aKey) return pImp->m_pAccExec->execute(aKey.GetKeyCode()); } -//-------------------------------------------------------------------- + bool SfxViewShell::KeyInput( const KeyEvent &rKeyEvent ) @@ -1652,7 +1652,7 @@ bool SfxViewShell::GlobalKeyInput_Impl( const KeyEvent &rKeyEvent ) return ExecKey_Impl(rKeyEvent); } -//-------------------------------------------------------------------- + void SfxViewShell::ShowCursor( bool /*bOn*/ ) @@ -1666,7 +1666,7 @@ void SfxViewShell::ShowCursor( bool /*bOn*/ ) { } -//-------------------------------------------------------------------- + void SfxViewShell::GotFocus() const @@ -1685,7 +1685,7 @@ void SfxViewShell::GotFocus() const { } -//-------------------------------------------------------------------- + void SfxViewShell::ResetAllClients_Impl( SfxInPlaceClient *pIP ) { @@ -1701,7 +1701,7 @@ void SfxViewShell::ResetAllClients_Impl( SfxInPlaceClient *pIP ) } } -//-------------------------------------------------------------------- + void SfxViewShell::DisconnectAllClients() { @@ -1714,13 +1714,13 @@ void SfxViewShell::DisconnectAllClients() delete pClients->at( n ); } -//-------------------------------------------------------------------- + void SfxViewShell::QueryObjAreaPixel( Rectangle& ) const { } -//-------------------------------------------------------------------- + void SfxViewShell::VisAreaChanged(const Rectangle& /*rVisArea*/) { @@ -1737,7 +1737,7 @@ void SfxViewShell::VisAreaChanged(const Rectangle& /*rVisArea*/) } } -//-------------------------------------------------------------------- + void SfxViewShell::CheckIPClient_Impl( SfxInPlaceClient *pIPClient, const Rectangle& rVisArea ) { if ( GetObjectShell()->IsInClose() ) @@ -1775,7 +1775,7 @@ void SfxViewShell::CheckIPClient_Impl( SfxInPlaceClient *pIPClient, const Rectan } } -//-------------------------------------------------------------------- + void SfxViewShell::DiscardClients_Impl() /* [Description] @@ -1793,14 +1793,14 @@ void SfxViewShell::DiscardClients_Impl() delete pClients->at( n ); } -//-------------------------------------------------------------------- + SfxObjectShell* SfxViewShell::GetObjectShell() { return pFrame ? pFrame->GetObjectShell() : NULL; } -//-------------------------------------------------------------------- + Reference< XModel > SfxViewShell::GetCurrentDocument() const { @@ -1813,7 +1813,7 @@ Reference< XModel > SfxViewShell::GetCurrentDocument() const return xDocument; } -//-------------------------------------------------------------------- + void SfxViewShell::SetCurrentDocument() const { @@ -1822,14 +1822,14 @@ void SfxViewShell::SetCurrentDocument() const SfxObjectShell::SetCurrentComponent( xDocument ); } -//-------------------------------------------------------------------- + const Size& SfxViewShell::GetMargin() const { return pImp->aMargin; } -//-------------------------------------------------------------------- + void SfxViewShell::SetMargin( const Size& rSize ) { @@ -1847,27 +1847,27 @@ void SfxViewShell::SetMargin( const Size& rSize ) } } -//-------------------------------------------------------------------- + void SfxViewShell::MarginChanged() { } -//-------------------------------------------------------------------- + sal_Bool SfxViewShell::IsShowView_Impl() const { return pImp->m_bIsShowView; } -//-------------------------------------------------------------------- + SfxFrame* SfxViewShell::GetSmartSelf( SfxFrame* pSelf, SfxMedium& /*rMedium*/ ) { return pSelf; } -//------------------------------------------------------------------------ + void SfxViewShell::JumpToMark( const OUString& rMark ) { @@ -1878,7 +1878,7 @@ void SfxViewShell::JumpToMark( const OUString& rMark ) &aMarkItem, 0L ); } -//------------------------------------------------------------------------ + SfxInPlaceClientList* SfxViewShell::GetIPClientList_Impl( sal_Bool bCreate ) const { |