diff options
author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-22 21:20:15 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-23 03:38:49 +0000 |
commit | 0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf (patch) | |
tree | 5024cba9f9ea5e3b23ea26025323f6aef39488d0 /forms/source/richtext | |
parent | fdo#70414: Use correct target names for building Visual Studio projects. (diff) | |
download | core-0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf.tar.gz core-0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf.zip |
Remove unneccessary comments
Change-Id: I939160ae72fecbe3d4a60ce755730bd4c38497fb
Reviewed-on: https://gerrit.libreoffice.org/8182
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'forms/source/richtext')
-rw-r--r-- | forms/source/richtext/attributedispatcher.cxx | 14 | ||||
-rw-r--r-- | forms/source/richtext/clipboarddispatcher.cxx | 20 | ||||
-rw-r--r-- | forms/source/richtext/featuredispatcher.cxx | 22 | ||||
-rw-r--r-- | forms/source/richtext/parametrizedattributedispatcher.cxx | 12 | ||||
-rw-r--r-- | forms/source/richtext/richtextcontrol.cxx | 58 | ||||
-rw-r--r-- | forms/source/richtext/richtextengine.cxx | 14 | ||||
-rw-r--r-- | forms/source/richtext/richtextimplcontrol.cxx | 66 | ||||
-rw-r--r-- | forms/source/richtext/richtextmodel.cxx | 60 | ||||
-rw-r--r-- | forms/source/richtext/richtextunowrapper.cxx | 14 | ||||
-rw-r--r-- | forms/source/richtext/richtextvclcontrol.cxx | 52 | ||||
-rw-r--r-- | forms/source/richtext/richtextviewport.cxx | 22 | ||||
-rw-r--r-- | forms/source/richtext/rtattributehandler.cxx | 70 | ||||
-rw-r--r-- | forms/source/richtext/specialdispatchers.cxx | 22 |
13 files changed, 223 insertions, 223 deletions
diff --git a/forms/source/richtext/attributedispatcher.cxx b/forms/source/richtext/attributedispatcher.cxx index 5a2acfe146c0..b6aaa4665758 100644 --- a/forms/source/richtext/attributedispatcher.cxx +++ b/forms/source/richtext/attributedispatcher.cxx @@ -35,7 +35,7 @@ namespace frm //==================================================================== //= OAttributeDispatcher //==================================================================== - //-------------------------------------------------------------------- + OAttributeDispatcher::OAttributeDispatcher( EditView& _rView, AttributeId _nAttributeId, const URL& _rURL, IMultiAttributeDispatcher* _pMasterDispatcher ) :ORichTextFeatureDispatcher( _rView, _rURL ) @@ -45,21 +45,21 @@ namespace frm OSL_ENSURE( m_pMasterDispatcher, "OAttributeDispatcher::OAttributeDispatcher: invalid master dispatcher!" ); } - //-------------------------------------------------------------------- + OAttributeDispatcher::~OAttributeDispatcher( ) { acquire(); dispose(); } - //-------------------------------------------------------------------- + void OAttributeDispatcher::disposing( ::osl::ClearableMutexGuard& _rClearBeforeNotify ) { m_pMasterDispatcher = NULL; ORichTextFeatureDispatcher::disposing( _rClearBeforeNotify ); } - //-------------------------------------------------------------------- + void OAttributeDispatcher::fillFeatureEventFromAttributeState( FeatureStateEvent& _rEvent, const AttributeState& _rState ) const { if ( _rState.eSimpleState == eChecked ) @@ -68,7 +68,7 @@ namespace frm _rEvent.State <<= (sal_Bool)sal_False; } - //-------------------------------------------------------------------- + FeatureStateEvent OAttributeDispatcher::buildStatusEvent() const { FeatureStateEvent aEvent( ORichTextFeatureDispatcher::buildStatusEvent() ); @@ -83,7 +83,7 @@ namespace frm return aEvent; } - //-------------------------------------------------------------------- + void SAL_CALL OAttributeDispatcher::dispatch( const URL& _rURL, const Sequence< PropertyValue >& _rArguments ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -109,7 +109,7 @@ namespace frm m_pMasterDispatcher->executeAttribute( m_nAttributeId, NULL ); } - //-------------------------------------------------------------------- + void OAttributeDispatcher::onAttributeStateChanged( AttributeId _nAttributeId, const AttributeState& /*_rState*/ ) { OSL_ENSURE( _nAttributeId == m_nAttributeId, "OAttributeDispatcher::onAttributeStateChanged: wrong attribute!" ); diff --git a/forms/source/richtext/clipboarddispatcher.cxx b/forms/source/richtext/clipboarddispatcher.cxx index 61881550647f..5f3d0fe6dd8a 100644 --- a/forms/source/richtext/clipboarddispatcher.cxx +++ b/forms/source/richtext/clipboarddispatcher.cxx @@ -60,7 +60,7 @@ namespace frm //==================================================================== //= OClipboardDispatcher //==================================================================== - //-------------------------------------------------------------------- + OClipboardDispatcher::OClipboardDispatcher( EditView& _rView, ClipboardFunc _eFunc ) :ORichTextFeatureDispatcher( _rView, createClipboardURL( _eFunc ) ) ,m_eFunc( _eFunc ) @@ -68,7 +68,7 @@ namespace frm { } - //-------------------------------------------------------------------- + sal_Bool OClipboardDispatcher::implIsEnabled( ) const { sal_Bool bEnabled = sal_False; @@ -89,7 +89,7 @@ namespace frm return bEnabled; } - //-------------------------------------------------------------------- + FeatureStateEvent OClipboardDispatcher::buildStatusEvent() const { FeatureStateEvent aEvent( ORichTextFeatureDispatcher::buildStatusEvent() ); @@ -97,7 +97,7 @@ namespace frm return aEvent; } - //-------------------------------------------------------------------- + void OClipboardDispatcher::invalidateFeatureState_Broadcast() { sal_Bool bEnabled = implIsEnabled(); @@ -109,7 +109,7 @@ namespace frm ORichTextFeatureDispatcher::invalidateFeatureState_Broadcast(); } - //-------------------------------------------------------------------- + void SAL_CALL OClipboardDispatcher::dispatch( const URL& /*_rURL*/, const Sequence< PropertyValue >& /*Arguments*/ ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -135,7 +135,7 @@ namespace frm //==================================================================== //= OPasteClipboardDispatcher //==================================================================== - //-------------------------------------------------------------------- + OPasteClipboardDispatcher::OPasteClipboardDispatcher( EditView& _rView ) :OClipboardDispatcher( _rView, ePaste ) ,m_pClipListener( NULL ) @@ -150,7 +150,7 @@ namespace frm m_bPastePossible = ( aDataHelper.HasFormat( SOT_FORMAT_STRING ) || aDataHelper.HasFormat( SOT_FORMAT_RTF ) ); } - //-------------------------------------------------------------------- + OPasteClipboardDispatcher::~OPasteClipboardDispatcher() { if ( !isDisposed() ) @@ -160,7 +160,7 @@ namespace frm } } - //-------------------------------------------------------------------- + IMPL_LINK( OPasteClipboardDispatcher, OnClipboardChanged, TransferableDataHelper*, _pDataHelper ) { OSL_ENSURE( _pDataHelper, "OPasteClipboardDispatcher::OnClipboardChanged: ooops!" ); @@ -172,7 +172,7 @@ namespace frm return 0L; } - //-------------------------------------------------------------------- + void OPasteClipboardDispatcher::disposing( ::osl::ClearableMutexGuard& _rClearBeforeNotify ) { OSL_ENSURE( getEditView() && getEditView()->GetWindow(), "OPasteClipboardDispatcher::disposing: EditView should not (yet) be disfunctional here!" ); @@ -184,7 +184,7 @@ namespace frm OClipboardDispatcher::disposing( _rClearBeforeNotify ); } - //-------------------------------------------------------------------- + sal_Bool OPasteClipboardDispatcher::implIsEnabled( ) const { return m_bPastePossible && OClipboardDispatcher::implIsEnabled(); diff --git a/forms/source/richtext/featuredispatcher.cxx b/forms/source/richtext/featuredispatcher.cxx index bc7d66af02a8..47fc1375d2f2 100644 --- a/forms/source/richtext/featuredispatcher.cxx +++ b/forms/source/richtext/featuredispatcher.cxx @@ -32,7 +32,7 @@ namespace frm //==================================================================== //= ORichTextFeatureDispatcher //==================================================================== - //-------------------------------------------------------------------- + ORichTextFeatureDispatcher::ORichTextFeatureDispatcher( EditView& _rView, const URL& _rURL ) :m_aFeatureURL( _rURL ) ,m_aStatusListeners( m_aMutex ) @@ -41,7 +41,7 @@ namespace frm { } - //-------------------------------------------------------------------- + ORichTextFeatureDispatcher::~ORichTextFeatureDispatcher( ) { if ( !m_bDisposed ) @@ -51,7 +51,7 @@ namespace frm } } - //-------------------------------------------------------------------- + void ORichTextFeatureDispatcher::dispose() { EventObject aEvent( *this ); @@ -62,13 +62,13 @@ namespace frm disposing( aGuard ); } - //-------------------------------------------------------------------- + void ORichTextFeatureDispatcher::disposing( ::osl::ClearableMutexGuard& /*_rClearBeforeNotify*/ ) { m_pEditView = NULL; } - //-------------------------------------------------------------------- + void SAL_CALL ORichTextFeatureDispatcher::addStatusListener( const Reference< XStatusListener >& _rxControl, const URL& _rURL ) throw (RuntimeException) { OSL_ENSURE( !m_bDisposed, "ORichTextFeatureDispatcher::addStatusListener: already disposed!" ); @@ -84,19 +84,19 @@ namespace frm } } - //-------------------------------------------------------------------- + void SAL_CALL ORichTextFeatureDispatcher::removeStatusListener( const Reference< XStatusListener >& _rxControl, const URL& /*_rURL*/ ) throw (RuntimeException) { m_aStatusListeners.removeInterface( _rxControl ); } - //-------------------------------------------------------------------- + void ORichTextFeatureDispatcher::invalidate() { invalidateFeatureState_Broadcast(); } - //-------------------------------------------------------------------- + FeatureStateEvent ORichTextFeatureDispatcher::buildStatusEvent() const { FeatureStateEvent aEvent; @@ -107,7 +107,7 @@ namespace frm return aEvent; } - //-------------------------------------------------------------------- + void ORichTextFeatureDispatcher::invalidateFeatureState_Broadcast() { FeatureStateEvent aEvent( buildStatusEvent() ); @@ -116,13 +116,13 @@ namespace frm doNotify( static_cast< XStatusListener* >( aIter.next() ), aEvent ); } - //-------------------------------------------------------------------- + void ORichTextFeatureDispatcher::newStatusListener( const Reference< XStatusListener >& _rxListener ) { doNotify( _rxListener, buildStatusEvent() ); } - //-------------------------------------------------------------------- + void ORichTextFeatureDispatcher::doNotify( const Reference< XStatusListener >& _rxListener, const FeatureStateEvent& _rEvent ) const SAL_THROW(()) { OSL_PRECOND( _rxListener.is(), "ORichTextFeatureDispatcher::doNotify: invalid listener!" ); diff --git a/forms/source/richtext/parametrizedattributedispatcher.cxx b/forms/source/richtext/parametrizedattributedispatcher.cxx index fd729b47201e..fb90c2a0330b 100644 --- a/forms/source/richtext/parametrizedattributedispatcher.cxx +++ b/forms/source/richtext/parametrizedattributedispatcher.cxx @@ -41,20 +41,20 @@ namespace frm //==================================================================== //= OParametrizedAttributeDispatcher //==================================================================== - //-------------------------------------------------------------------- + OParametrizedAttributeDispatcher::OParametrizedAttributeDispatcher( EditView& _rView, AttributeId _nAttributeId, const URL& _rURL, IMultiAttributeDispatcher* _pMasterDispatcher ) :OAttributeDispatcher( _rView, _nAttributeId, _rURL, _pMasterDispatcher ) { } - //-------------------------------------------------------------------- + OParametrizedAttributeDispatcher::~OParametrizedAttributeDispatcher() { acquire(); dispose(); } - //-------------------------------------------------------------------- + namespace { static SfxSlotId lcl_normalizeLatinScriptSlotId( SfxSlotId _nSlotId ) @@ -71,7 +71,7 @@ namespace frm } } - //-------------------------------------------------------------------- + void OParametrizedAttributeDispatcher::fillFeatureEventFromAttributeState( FeatureStateEvent& _rEvent, const AttributeState& _rState ) const { OSL_ENSURE( getEditView(), "OParametrizedAttributeDispatcher::notifyState: already disposed!" ); @@ -91,7 +91,7 @@ namespace frm OAttributeDispatcher::fillFeatureEventFromAttributeState( _rEvent, _rState ); } - //-------------------------------------------------------------------- + const SfxPoolItem* OParametrizedAttributeDispatcher::convertDispatchArgsToItem( const Sequence< PropertyValue >& _rArguments ) { // get the real slot id. This may differ from our attribute id: for instance, both @@ -113,7 +113,7 @@ namespace frm return pArgument; } - //-------------------------------------------------------------------- + void SAL_CALL OParametrizedAttributeDispatcher::dispatch( const URL& _rURL, const Sequence< PropertyValue >& _rArguments ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/forms/source/richtext/richtextcontrol.cxx b/forms/source/richtext/richtextcontrol.cxx index 80cae8b7f1ad..9a942ea66ed0 100644 --- a/forms/source/richtext/richtextcontrol.cxx +++ b/forms/source/richtext/richtextcontrol.cxx @@ -40,7 +40,7 @@ #include <svl/itempool.hxx> #include <sfx2/msgpool.hxx> -//-------------------------------------------------------------------------- + extern "C" void SAL_CALL createRegistryInfo_ORichTextControl() { static ::frm::OMultiInstanceAutoRegistration< ::frm::ORichTextControl > aAutoRegistration; @@ -78,21 +78,21 @@ namespace frm //================================================================== // ORichTextControl //================================================================== - //------------------------------------------------------------------ + ORichTextControl::ORichTextControl() :UnoEditControl() { } - //------------------------------------------------------------------ + ORichTextControl::~ORichTextControl() { } - //------------------------------------------------------------------ + IMPLEMENT_FORWARD_XTYPEPROVIDER2( ORichTextControl, UnoEditControl, ORichTextControl_Base ) - //------------------------------------------------------------------ + Any SAL_CALL ORichTextControl::queryAggregation( const Type& _rType ) throw ( RuntimeException ) { Any aReturn = UnoEditControl::queryAggregation( _rType ); @@ -103,7 +103,7 @@ namespace frm return aReturn; } - //------------------------------------------------------------------ + namespace { //.............................................................. @@ -173,7 +173,7 @@ namespace frm } } - //------------------------------------------------------------------ + void SAL_CALL ORichTextControl::createPeer( const Reference< XToolkit >& _rToolkit, const Reference< XWindowPeer >& _rParentPeer ) throw( RuntimeException ) { sal_Bool bReallyActAsRichText = sal_False; @@ -248,25 +248,25 @@ namespace frm } } - //------------------------------------------------------------------ + OUString SAL_CALL ORichTextControl::getImplementationName() throw( RuntimeException ) { return getImplementationName_Static(); } - //------------------------------------------------------------------ + Sequence< OUString > SAL_CALL ORichTextControl::getSupportedServiceNames() throw( RuntimeException ) { return getSupportedServiceNames_Static(); } - //------------------------------------------------------------------ + OUString SAL_CALL ORichTextControl::getImplementationName_Static() { return OUString( "com.sun.star.comp.form.ORichTextControl" ); } - //------------------------------------------------------------------ + Sequence< OUString > SAL_CALL ORichTextControl::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 3 ); @@ -276,25 +276,25 @@ namespace frm return aServices; } - //------------------------------------------------------------------ + Reference< XInterface > SAL_CALL ORichTextControl::Create( const Reference< XMultiServiceFactory >& ) { return *( new ORichTextControl() ); } - //-------------------------------------------------------------------- + Reference< XDispatch > SAL_CALL ORichTextControl::queryDispatch( const ::com::sun::star::util::URL& _rURL, const OUString& _rTargetFrameName, sal_Int32 _nSearchFlags ) throw (RuntimeException) { FORWARD_TO_PEER_3_RET( Reference< XDispatch >, XDispatchProvider, queryDispatch, _rURL, _rTargetFrameName, _nSearchFlags ); } - //-------------------------------------------------------------------- + Sequence< Reference< XDispatch > > SAL_CALL ORichTextControl::queryDispatches( const Sequence< DispatchDescriptor >& _rRequests ) throw (RuntimeException) { FORWARD_TO_PEER_1_RET( Sequence< Reference< XDispatch > >, XDispatchProvider, queryDispatches, _rRequests ); } - //-------------------------------------------------------------------- + sal_Bool ORichTextControl::requiresNewPeer( const OUString& _rPropertyName ) const { return UnoControl::requiresNewPeer( _rPropertyName ) || _rPropertyName.equals( PROPERTY_RICH_TEXT ); @@ -303,7 +303,7 @@ namespace frm //================================================================== // ORichTextPeer //================================================================== - //------------------------------------------------------------------ + ORichTextPeer* ORichTextPeer::Create( const Reference< XControlModel >& _rxModel, Window* _pParentWindow, WinBits _nStyle ) { DBG_TESTSOLARMUTEX(); @@ -328,17 +328,17 @@ namespace frm return pPeer; } - //------------------------------------------------------------------ + ORichTextPeer::ORichTextPeer() { } - //------------------------------------------------------------------ + ORichTextPeer::~ORichTextPeer() { } - //------------------------------------------------------------------ + void ORichTextPeer::dispose( ) throw(RuntimeException) { { @@ -364,7 +364,7 @@ namespace frm VCLXWindow::dispose(); } - //-------------------------------------------------------------------- + void SAL_CALL ORichTextPeer::draw( sal_Int32 _nX, sal_Int32 _nY ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -391,7 +391,7 @@ namespace frm pControl->Draw( pTargetDevice, aPos, aSize, WINDOW_DRAW_NOCONTROLS ); } - //-------------------------------------------------------------------- + void SAL_CALL ORichTextPeer::setProperty( const OUString& _rPropertyName, const Any& _rValue ) throw (RuntimeException, std::exception) @@ -455,13 +455,13 @@ namespace frm VCLXWindow::setProperty( _rPropertyName, _rValue ); } - //------------------------------------------------------------------ + IMPLEMENT_FORWARD_XINTERFACE2( ORichTextPeer, VCLXWindow, ORichTextPeer_Base ) - //------------------------------------------------------------------ + IMPLEMENT_FORWARD_XTYPEPROVIDER2( ORichTextPeer, VCLXWindow, ORichTextPeer_Base ) - //-------------------------------------------------------------------- + namespace { static SfxSlotId lcl_translateConflictingSlot( SfxSlotId _nIDFromPool ) @@ -495,7 +495,7 @@ namespace frm } } - //-------------------------------------------------------------------- + ORichTextPeer::SingleAttributeDispatcher ORichTextPeer::implCreateDispatcher( SfxSlotId _nSlotId, const ::com::sun::star::util::URL& _rURL ) { RichTextControl* pRichTextControl = static_cast< RichTextControl* >( GetWindow() ); @@ -638,7 +638,7 @@ namespace frm return xDispatcher; } - //-------------------------------------------------------------------- + namespace { SfxSlotId lcl_getSlotFromUnoName( SfxSlotPool& _rSlotPool, const OUString& _rUnoSlotName ) @@ -664,7 +664,7 @@ namespace frm } } - //-------------------------------------------------------------------- + Reference< XDispatch > SAL_CALL ORichTextPeer::queryDispatch( const ::com::sun::star::util::URL& _rURL, const OUString& /*_rTargetFrameName*/, sal_Int32 /*_nSearchFlags*/ ) throw (RuntimeException) { Reference< XDispatch > xReturn; @@ -701,7 +701,7 @@ namespace frm return xReturn; } - //-------------------------------------------------------------------- + Sequence< Reference< XDispatch > > SAL_CALL ORichTextPeer::queryDispatches( const Sequence< DispatchDescriptor >& _rRequests ) throw (RuntimeException) { Sequence< Reference< XDispatch > > aReturn( _rRequests.getLength() ); @@ -716,7 +716,7 @@ namespace frm return aReturn; } - //-------------------------------------------------------------------- + void ORichTextPeer::onSelectionChanged( const ESelection& /*_rSelection*/ ) { AttributeDispatchers::iterator aDispatcherPos = m_aDispatchers.find( SID_COPY ); diff --git a/forms/source/richtext/richtextengine.cxx b/forms/source/richtext/richtextengine.cxx index 98221cc4a61e..488df7c5c7ba 100644 --- a/forms/source/richtext/richtextengine.cxx +++ b/forms/source/richtext/richtextengine.cxx @@ -44,7 +44,7 @@ namespace frm //==================================================================== //= RichTextEngine //==================================================================== - //-------------------------------------------------------------------- + RichTextEngine* RichTextEngine::Create() { SolarMutexGuard g; @@ -79,7 +79,7 @@ namespace frm return pReturn; } - //-------------------------------------------------------------------- + RichTextEngine* RichTextEngine::Clone() { RichTextEngine* pClone( NULL ); @@ -98,19 +98,19 @@ namespace frm return pClone; } - //-------------------------------------------------------------------- + RichTextEngine::RichTextEngine( SfxItemPool* _pPool ) :EditEngine( _pPool ) ,m_pEnginePool( _pPool ) { } - //-------------------------------------------------------------------- + RichTextEngine::~RichTextEngine( ) { } - //-------------------------------------------------------------------- + void RichTextEngine::registerEngineStatusListener( IEngineStatusListener* _pListener ) { OSL_ENSURE( _pListener, "RichTextEngine::registerEngineStatusListener: invalid listener!" ); @@ -118,7 +118,7 @@ namespace frm m_aStatusListeners.push_back( _pListener ); } - //-------------------------------------------------------------------- + void RichTextEngine::revokeEngineStatusListener( IEngineStatusListener* _pListener ) { ::std::vector< IEngineStatusListener* >::iterator aPos = ::std::find_if( @@ -131,7 +131,7 @@ namespace frm m_aStatusListeners.erase( aPos ); } - //-------------------------------------------------------------------- + IMPL_LINK( RichTextEngine, EditEngineStatusChanged, EditStatus*, _pStatus ) { for ( ::std::vector< IEngineStatusListener* >::const_iterator aLoop = m_aStatusListeners.begin(); diff --git a/forms/source/richtext/richtextimplcontrol.cxx b/forms/source/richtext/richtextimplcontrol.cxx index 8ae8f53c65bd..b81929e4e5b5 100644 --- a/forms/source/richtext/richtextimplcontrol.cxx +++ b/forms/source/richtext/richtextimplcontrol.cxx @@ -44,7 +44,7 @@ namespace frm //==================================================================== //= RichTextControlImpl //==================================================================== - //-------------------------------------------------------------------- + RichTextControlImpl::RichTextControlImpl( Control* _pAntiImpl, RichTextEngine* _pEngine, ITextAttributeListener* _pTextAttrListener, ITextSelectionListener* _pSelectionListener ) :m_pAntiImpl ( _pAntiImpl ) ,m_pViewport ( NULL ) @@ -89,7 +89,7 @@ namespace frm m_pAntiImpl->SetBackground( Wallpaper( m_pAntiImpl->GetSettings().GetStyleSettings().GetFieldColor() ) ); } - //-------------------------------------------------------------------- + RichTextControlImpl::~RichTextControlImpl( ) { m_pEngine->RemoveView( m_pView ); @@ -101,7 +101,7 @@ namespace frm delete m_pScrollCorner; } - //-------------------------------------------------------------------- + void RichTextControlImpl::implUpdateAttribute( AttributeHandlerPool::const_iterator _pHandler ) { if ( ( _pHandler->first == SID_ATTR_CHAR_WEIGHT ) @@ -127,7 +127,7 @@ namespace frm implCheckUpdateCache( _pHandler->first, _pHandler->second->getState( m_pView->GetAttribs() ) ); } - //-------------------------------------------------------------------- + void RichTextControlImpl::updateAttribute( AttributeId _nAttribute ) { AttributeHandlerPool::const_iterator pHandler = m_aAttributeHandlers.find( _nAttribute ); @@ -135,7 +135,7 @@ namespace frm implUpdateAttribute( pHandler ); } - //-------------------------------------------------------------------- + void RichTextControlImpl::updateAllAttributes( ) { for ( AttributeHandlerPool::const_iterator pHandler = m_aAttributeHandlers.begin(); @@ -158,7 +158,7 @@ namespace frm } } - //-------------------------------------------------------------------- + AttributeState RichTextControlImpl::getAttributeState( AttributeId _nAttributeId ) const { StateCache::const_iterator aCachedStatePos = m_aLastKnownStates.find( _nAttributeId ); @@ -170,7 +170,7 @@ namespace frm return aCachedStatePos->second; } - //-------------------------------------------------------------------- + bool RichTextControlImpl::executeAttribute( const SfxItemSet& _rCurrentAttribs, SfxItemSet& _rAttribs, AttributeId _nAttribute, const SfxPoolItem* _pArgument, ScriptType _nForScriptType ) { // let's see whether we have a handler for this attribute @@ -183,7 +183,7 @@ namespace frm return false; } - //-------------------------------------------------------------------- + void RichTextControlImpl::enableAttributeNotification( AttributeId _nAttributeId, ITextAttributeListener* _pListener ) { AttributeHandlerPool::const_iterator aHandlerPos = m_aAttributeHandlers.find( _nAttributeId ); @@ -206,7 +206,7 @@ namespace frm updateAttribute( _nAttributeId ); } - //-------------------------------------------------------------------- + void RichTextControlImpl::disableAttributeNotification( AttributeId _nAttributeId ) { // forget the handler for this attribute @@ -220,7 +220,7 @@ namespace frm m_aAttributeListeners.erase( aListenerPos ); } - //-------------------------------------------------------------------- + void RichTextControlImpl::normalizeScriptDependentAttribute( SvxScriptSetItem& _rScriptSetItem ) { _rScriptSetItem.GetItemSet().Put( m_pView->GetAttribs(), false ); @@ -238,7 +238,7 @@ namespace frm _rScriptSetItem.GetItemSet().InvalidateItem( nNormalizedWhichId ); } - //-------------------------------------------------------------------- + void RichTextControlImpl::implCheckUpdateCache( AttributeId _nAttribute, const AttributeState& _rState ) { StateCache::iterator aCachePos = m_aLastKnownStates.find( _nAttribute ); @@ -266,7 +266,7 @@ namespace frm m_pTextAttrListener->onAttributeStateChanged( _nAttribute, _rState ); } - //-------------------------------------------------------------------- + ScriptType RichTextControlImpl::getSelectedScriptType() const { ScriptType nScript = m_pView->GetSelectedScriptType(); @@ -275,7 +275,7 @@ namespace frm return nScript; } - //-------------------------------------------------------------------- + void RichTextControlImpl::EditEngineStatusChanged( const EditStatus& _rStatus ) { sal_uLong nStatusWord( _rStatus.GetStatusWord() ); @@ -314,28 +314,28 @@ namespace frm m_pVScroll->SetThumbPos( m_pView->GetVisArea().Top() ); } - //-------------------------------------------------------------------- + IMPL_LINK( RichTextControlImpl, OnInvalidateAllAttributes, void*, /*_pNotInterestedIn*/ ) { updateAllAttributes(); return 0L; } - //-------------------------------------------------------------------- + IMPL_LINK( RichTextControlImpl, OnHScroll, ScrollBar*, _pScrollbar ) { m_pView->Scroll( -_pScrollbar->GetDelta(), 0, RGCHK_PAPERSZ1 ); return 0L; } - //-------------------------------------------------------------------- + IMPL_LINK( RichTextControlImpl, OnVScroll, ScrollBar*, _pScrollbar ) { m_pView->Scroll( 0, -_pScrollbar->GetDelta(), RGCHK_PAPERSZ1 ); return 0L; } - //-------------------------------------------------------------------- + void RichTextControlImpl::ensureScrollbars() { bool bNeedVScroll = 0 != ( m_pAntiImpl->GetStyle() & WB_VSCROLL ); @@ -385,7 +385,7 @@ namespace frm layoutWindow(); } - //-------------------------------------------------------------------- + void RichTextControlImpl::ensureLineBreakSetting() { if ( !windowHasAutomaticLineBreak() ) @@ -394,7 +394,7 @@ namespace frm layoutWindow(); } - //-------------------------------------------------------------------- + void RichTextControlImpl::layoutWindow() { if ( !m_bHasEverBeenShown ) @@ -480,7 +480,7 @@ namespace frm updateScrollbars(); } - //-------------------------------------------------------------------- + void RichTextControlImpl::updateScrollbars() { if ( m_pVScroll ) @@ -499,7 +499,7 @@ namespace frm } } - //-------------------------------------------------------------------- + void RichTextControlImpl::notifyInitShow() { if ( !m_bHasEverBeenShown ) @@ -509,14 +509,14 @@ namespace frm } } - //-------------------------------------------------------------------- + void RichTextControlImpl::notifyStyleChanged() { ensureScrollbars(); ensureLineBreakSetting(); } - //-------------------------------------------------------------------- + void RichTextControlImpl::notifyZoomChanged() { const Fraction& rZoom = m_pAntiImpl->GetZoom(); @@ -532,25 +532,25 @@ namespace frm layoutWindow(); } - //-------------------------------------------------------------------- + bool RichTextControlImpl::windowHasAutomaticLineBreak() { return ( m_pAntiImpl->GetStyle() & WB_WORDBREAK ) != 0; } - //-------------------------------------------------------------------- + void RichTextControlImpl::SetReadOnly( bool _bReadOnly ) { m_pView->SetReadOnly( _bReadOnly ); } - //-------------------------------------------------------------------- + bool RichTextControlImpl::IsReadOnly() const { return m_pView->IsReadOnly( ); } - //-------------------------------------------------------------------- + namespace { static void lcl_inflate( Rectangle& _rRect, long _nInflateX, long _nInflateY ) @@ -561,7 +561,7 @@ namespace frm _rRect.Bottom() += _nInflateY; } } - //-------------------------------------------------------------------- + long RichTextControlImpl::HandleCommand( const CommandEvent& _rEvent ) { if ( ( _rEvent.GetCommand() == COMMAND_WHEEL ) @@ -575,7 +575,7 @@ namespace frm return 0; } - //-------------------------------------------------------------------- + void RichTextControlImpl::Draw( OutputDevice* _pDev, const Point& _rPos, const Size& _rSize, sal_uLong /*_nFlags*/ ) { // need to normalize the map mode of the device - every paint operation on any device needs @@ -635,13 +635,13 @@ namespace frm _pDev->Pop(); } - //-------------------------------------------------------------------- + void RichTextControlImpl::SetBackgroundColor( ) { SetBackgroundColor( Application::GetSettings().GetStyleSettings().GetFieldColor() ); } - //-------------------------------------------------------------------- + void RichTextControlImpl::SetBackgroundColor( const Color& _rColor ) { Wallpaper aWallpaper( _rColor ); @@ -649,13 +649,13 @@ namespace frm m_pViewport->SetBackground( aWallpaper ); } - //-------------------------------------------------------------------- + void RichTextControlImpl::SetHideInactiveSelection( bool _bHide ) { m_pViewport->SetHideInactiveSelection( _bHide ); } - //-------------------------------------------------------------------- + bool RichTextControlImpl::GetHideInactiveSelection() const { return m_pViewport->GetHideInactiveSelection( ); diff --git a/forms/source/richtext/richtextmodel.cxx b/forms/source/richtext/richtextmodel.cxx index 25134d69ab74..50ccfa8ef0db 100644 --- a/forms/source/richtext/richtextmodel.cxx +++ b/forms/source/richtext/richtextmodel.cxx @@ -33,7 +33,7 @@ #include <vcl/outdev.hxx> #include <vcl/svapp.hxx> -//-------------------------------------------------------------------------- + extern "C" void SAL_CALL createRegistryInfo_ORichTextModel() { static ::frm::OMultiInstanceAutoRegistration< ::frm::ORichTextModel > aRegisterModel; @@ -58,7 +58,7 @@ namespace frm //==================================================================== //= ORichTextModel //==================================================================== - //-------------------------------------------------------------------- + ORichTextModel::ORichTextModel( const Reference< XComponentContext >& _rxFactory ) :OControlModel ( _rxFactory, OUString() ) ,FontControlModel ( true ) @@ -90,7 +90,7 @@ namespace frm implInit(); } - //------------------------------------------------------------------ + ORichTextModel::ORichTextModel( const ORichTextModel* _pOriginal, const Reference< XComponentContext >& _rxFactory ) :OControlModel ( _pOriginal, _rxFactory, sal_False ) ,FontControlModel ( _pOriginal ) @@ -131,7 +131,7 @@ namespace frm implInit(); } - //------------------------------------------------------------------ + void ORichTextModel::implInit() { OSL_ENSURE( m_pEngine.get(), "ORichTextModel::implInit: where's the engine?" ); @@ -152,7 +152,7 @@ namespace frm implRegisterProperties(); } - //------------------------------------------------------------------ + void ORichTextModel::implDoAggregation() { increment( m_refCount ); @@ -166,7 +166,7 @@ namespace frm decrement( m_refCount ); } - //------------------------------------------------------------------ + void ORichTextModel::implRegisterProperties() { REGISTER_PROP_2( DEFAULTCONTROL, m_sDefaultControl, BOUND, MAYBEDEFAULT ); @@ -202,7 +202,7 @@ namespace frm REGISTER_VOID_PROP_2( ALIGN, m_aAlign, sal_Int16, BOUND, MAYBEDEFAULT ); } - //-------------------------------------------------------------------- + ORichTextModel::~ORichTextModel( ) { if ( !OComponentHelper::rBHelper.bDisposed ) @@ -221,7 +221,7 @@ namespace frm } - //------------------------------------------------------------------ + Any SAL_CALL ORichTextModel::queryAggregation( const Type& _rType ) throw ( RuntimeException ) { Any aReturn = ORichTextModel_BASE::queryInterface( _rType ); @@ -232,10 +232,10 @@ namespace frm return aReturn; } - //------------------------------------------------------------------ + IMPLEMENT_FORWARD_XTYPEPROVIDER2( ORichTextModel, OControlModel, ORichTextModel_BASE ) - //-------------------------------------------------------------------- + IMPLEMENT_SERVICE_REGISTRATION_8( ORichTextModel, OControlModel, FRM_SUN_COMPONENT_RICHTEXTCONTROL, OUString( "com.sun.star.text.TextRange" ), @@ -247,17 +247,17 @@ namespace frm OUString( "com.sun.star.style.ParagraphPropertiesComplex" ) ) - //------------------------------------------------------------------------------ + IMPLEMENT_DEFAULT_CLONING( ORichTextModel ) - //------------------------------------------------------------------------------ + void SAL_CALL ORichTextModel::disposing() { m_aModifyListeners.disposeAndClear( EventObject( *this ) ); OControlModel::disposing(); } - //------------------------------------------------------------------------------ + namespace { void lcl_removeProperty( Sequence< Property >& _rSeq, const OUString& _rPropertyName ) @@ -276,7 +276,7 @@ namespace frm } } } - //------------------------------------------------------------------------------ + void ORichTextModel::describeFixedProperties( Sequence< Property >& _rProps ) const { BEGIN_DESCRIBE_PROPERTIES( 1, OControlModel ) @@ -294,7 +294,7 @@ namespace frm _rProps = concatSequences( aContainedProperties, aFontProperties, _rProps ); } - //------------------------------------------------------------------------------ + void ORichTextModel::describeAggregateProperties( Sequence< Property >& _rAggregateProps ) const { OControlModel::describeAggregateProperties( _rAggregateProps ); @@ -309,7 +309,7 @@ namespace frm lcl_removeProperty( _rAggregateProps, PROPERTY_WRITING_MODE ); } - //-------------------------------------------------------------------- + void SAL_CALL ORichTextModel::getFastPropertyValue( Any& _rValue, sal_Int32 _nHandle ) const { if ( isRegisteredProperty( _nHandle ) ) @@ -326,7 +326,7 @@ namespace frm } } - //-------------------------------------------------------------------- + sal_Bool SAL_CALL ORichTextModel::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue ) throw( IllegalArgumentException ) { sal_Bool bModified = sal_False; @@ -347,7 +347,7 @@ namespace frm return bModified; } - //-------------------------------------------------------------------- + void SAL_CALL ORichTextModel::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) throw ( Exception) { if ( isRegisteredProperty( _nHandle ) ) @@ -411,7 +411,7 @@ namespace frm } } - //-------------------------------------------------------------------- + Any ORichTextModel::getPropertyDefaultByHandle( sal_Int32 _nHandle ) const { Any aDefault; @@ -480,7 +480,7 @@ namespace frm return aDefault; } - //-------------------------------------------------------------------- + void ORichTextModel::impl_smlock_setEngineText( const OUString& _rText ) { if ( m_pEngine.get() ) @@ -492,27 +492,27 @@ namespace frm } } - //-------------------------------------------------------------------- + OUString SAL_CALL ORichTextModel::getServiceName() throw ( RuntimeException) { return OUString(FRM_SUN_COMPONENT_RICHTEXTCONTROL); } - //-------------------------------------------------------------------- + void SAL_CALL ORichTextModel::write(const Reference< XObjectOutputStream >& _rxOutStream) throw ( IOException, RuntimeException) { OControlModel::write( _rxOutStream ); // TODO: place your code here } - //-------------------------------------------------------------------- + void SAL_CALL ORichTextModel::read(const Reference< XObjectInputStream >& _rxInStream) throw ( IOException, RuntimeException) { OControlModel::read( _rxInStream ); // TODO: place your code here } - //-------------------------------------------------------------------- + RichTextEngine* ORichTextModel::getEditEngine( const Reference< XControlModel >& _rxModel ) { RichTextEngine* pEngine = NULL; @@ -533,7 +533,7 @@ namespace frm return pEngine; } - //-------------------------------------------------------------------- + Sequence< sal_Int8 > ORichTextModel::getEditEngineTunnelId() { static ::cppu::OImplementationId * pId = 0; @@ -549,7 +549,7 @@ namespace frm return pId->getImplementationId(); } - //-------------------------------------------------------------------- + IMPL_LINK( ORichTextModel, OnEngineContentModified, void*, /*_pNotInterestedIn*/ ) { if ( !m_bSettingEngineText ) @@ -566,7 +566,7 @@ namespace frm return 0L; } - //-------------------------------------------------------------------- + sal_Int64 SAL_CALL ORichTextModel::getSomething( const Sequence< sal_Int8 >& _rId ) throw (RuntimeException) { Sequence< sal_Int8 > aEditEngineAccessId( getEditEngineTunnelId() ); @@ -582,19 +582,19 @@ namespace frm return 0; } - //-------------------------------------------------------------------- + void SAL_CALL ORichTextModel::addModifyListener( const Reference< XModifyListener >& _rxListener ) throw (RuntimeException) { m_aModifyListeners.addInterface( _rxListener ); } - //-------------------------------------------------------------------- + void SAL_CALL ORichTextModel::removeModifyListener( const Reference< XModifyListener >& _rxListener ) throw (RuntimeException) { m_aModifyListeners.removeInterface( _rxListener ); } - //-------------------------------------------------------------------- + void ORichTextModel::potentialTextChange( ) { OUString sCurrentEngineText; diff --git a/forms/source/richtext/richtextunowrapper.cxx b/forms/source/richtext/richtextunowrapper.cxx index 4415f15f4dcc..c091d28fd2eb 100644 --- a/forms/source/richtext/richtextunowrapper.cxx +++ b/forms/source/richtext/richtextunowrapper.cxx @@ -61,14 +61,14 @@ namespace frm //==================================================================== //= ORichTextUnoWrapper //==================================================================== - //-------------------------------------------------------------------- + ORichTextUnoWrapper::ORichTextUnoWrapper( EditEngine& _rEngine, IEngineTextChangeListener* _pTextChangeListener ) :SvxUnoText( getTextEnginePropertySet() ) { SetEditSource( new RichTextEditSource( _rEngine, _pTextChangeListener ) ); } - //-------------------------------------------------------------------- + ORichTextUnoWrapper::~ORichTextUnoWrapper() throw() { } @@ -76,7 +76,7 @@ namespace frm //==================================================================== //= RichTextEditSource //==================================================================== - //-------------------------------------------------------------------- + RichTextEditSource::RichTextEditSource( EditEngine& _rEngine, IEngineTextChangeListener* _pTextChangeListener ) :m_rEngine ( _rEngine ) ,m_pTextForwarder ( new SvxEditEngineForwarder( _rEngine ) ) @@ -84,25 +84,25 @@ namespace frm { } - //-------------------------------------------------------------------- + RichTextEditSource::~RichTextEditSource() { delete m_pTextForwarder; } - //-------------------------------------------------------------------- + SvxEditSource* RichTextEditSource::Clone() const { return new RichTextEditSource( m_rEngine, m_pTextChangeListener ); } - //-------------------------------------------------------------------- + SvxTextForwarder* RichTextEditSource::GetTextForwarder() { return m_pTextForwarder; } - //-------------------------------------------------------------------- + void RichTextEditSource::UpdateData() { // this means that the content of the EditEngine changed via the UNO API diff --git a/forms/source/richtext/richtextvclcontrol.cxx b/forms/source/richtext/richtextvclcontrol.cxx index 2367e51bdb85..fdd967bd618c 100644 --- a/forms/source/richtext/richtextvclcontrol.cxx +++ b/forms/source/richtext/richtextvclcontrol.cxx @@ -48,7 +48,7 @@ namespace frm //==================================================================== //= RichTextControl //==================================================================== - //-------------------------------------------------------------------- + RichTextControl::RichTextControl( RichTextEngine* _pEngine, Window* _pParent, WinBits _nStyle, ITextAttributeListener* _pTextAttribListener, ITextSelectionListener* _pSelectionListener ) :Control( _pParent, implInitStyle( _nStyle ) ) @@ -57,26 +57,26 @@ namespace frm implInit( _pEngine, _pTextAttribListener, _pSelectionListener ); } - //-------------------------------------------------------------------- + void RichTextControl::implInit( RichTextEngine* _pEngine, ITextAttributeListener* _pTextAttribListener, ITextSelectionListener* _pSelectionListener ) { m_pImpl = new RichTextControlImpl( this, _pEngine, _pTextAttribListener, _pSelectionListener ); SetCompoundControl( true ); } - //-------------------------------------------------------------------- + RichTextControl::~RichTextControl( ) { delete m_pImpl; } - //-------------------------------------------------------------------- + AttributeState RichTextControl::getState( AttributeId _nAttributeId ) const { return m_pImpl->getAttributeState( _nAttributeId ); } - //-------------------------------------------------------------------- + void RichTextControl::executeAttribute( AttributeId _nAttributeId, const SfxPoolItem* _pArgument ) { SfxItemSet aToApplyAttributes( getView().GetEmptyItemSet() ); @@ -89,7 +89,7 @@ namespace frm applyAttributes( aToApplyAttributes ); } - //-------------------------------------------------------------------- + void RichTextControl::applyAttributes( const SfxItemSet& _rAttributesToApply ) { // apply @@ -112,19 +112,19 @@ namespace frm // (the handler for the just executed attribute should know) } - //-------------------------------------------------------------------- + void RichTextControl::enableAttributeNotification( AttributeId _nAttributeId, ITextAttributeListener* _pListener ) { m_pImpl->enableAttributeNotification( _nAttributeId, _pListener ); } - //-------------------------------------------------------------------- + void RichTextControl::disableAttributeNotification( AttributeId _nAttributeId ) { m_pImpl->disableAttributeNotification( _nAttributeId ); } - //-------------------------------------------------------------------- + bool RichTextControl::isMappableSlot( SfxSlotId _nSlotId ) { switch ( _nSlotId ) @@ -152,20 +152,20 @@ namespace frm return false; } - //-------------------------------------------------------------------- + void RichTextControl::Resize() { m_pImpl->layoutWindow(); Invalidate(); } - //-------------------------------------------------------------------- + void RichTextControl::GetFocus() { getViewport().GrabFocus(); } - //-------------------------------------------------------------------- + WinBits RichTextControl::implInitStyle( WinBits nStyle ) { if ( !( nStyle & WB_NOTABSTOP ) ) @@ -173,7 +173,7 @@ namespace frm return nStyle; } - //-------------------------------------------------------------------- + void RichTextControl::StateChanged( StateChangedType _nStateChange ) { if ( _nStateChange == STATE_CHANGE_STYLE ) @@ -192,7 +192,7 @@ namespace frm Control::StateChanged( _nStateChange ); } - //-------------------------------------------------------------------- + bool RichTextControl::PreNotify( NotifyEvent& _rNEvt ) { if ( IsWindowOrChild( _rNEvt.GetWindow() ) ) @@ -285,7 +285,7 @@ namespace frm return Control::PreNotify( _rNEvt ); } - //-------------------------------------------------------------------- + bool RichTextControl::Notify( NotifyEvent& _rNEvt ) { bool nDone = false; @@ -297,67 +297,67 @@ namespace frm return nDone || Control::Notify( _rNEvt ); } - //-------------------------------------------------------------------- + void RichTextControl::Draw( OutputDevice* _pDev, const Point& _rPos, const Size& _rSize, sal_uLong _nFlags ) { m_pImpl->Draw( _pDev, _rPos, _rSize, _nFlags ); } - //-------------------------------------------------------------------- + EditView& RichTextControl::getView() { return *m_pImpl->getView( RichTextControlImpl::GrantAccess() ); } - //-------------------------------------------------------------------- + const EditView& RichTextControl::getView() const { return *m_pImpl->getView( RichTextControlImpl::GrantAccess() ); } - //-------------------------------------------------------------------- + EditEngine& RichTextControl::getEngine() const { return *m_pImpl->getEngine( RichTextControlImpl::GrantAccess() ); } - //-------------------------------------------------------------------- + Window& RichTextControl::getViewport() const { return *m_pImpl->getViewport( RichTextControlImpl::GrantAccess() ); } - //-------------------------------------------------------------------- + void RichTextControl::SetReadOnly( bool _bReadOnly ) { m_pImpl->SetReadOnly( _bReadOnly ); } - //-------------------------------------------------------------------- + bool RichTextControl::IsReadOnly() const { return m_pImpl->IsReadOnly(); } - //-------------------------------------------------------------------- + void RichTextControl::SetBackgroundColor( ) { m_pImpl->SetBackgroundColor( ); } - //-------------------------------------------------------------------- + void RichTextControl::SetBackgroundColor( const Color& _rColor ) { m_pImpl->SetBackgroundColor( _rColor ); } - //-------------------------------------------------------------------- + void RichTextControl::SetHideInactiveSelection( bool _bHide ) { m_pImpl->SetHideInactiveSelection( _bHide ); } - //-------------------------------------------------------------------- + bool RichTextControl::GetHideInactiveSelection() const { return m_pImpl->GetHideInactiveSelection( ); diff --git a/forms/source/richtext/richtextviewport.cxx b/forms/source/richtext/richtextviewport.cxx index a3f69c430d86..26077b52d48a 100644 --- a/forms/source/richtext/richtextviewport.cxx +++ b/forms/source/richtext/richtextviewport.cxx @@ -28,7 +28,7 @@ namespace frm //==================================================================== //= RichTextViewPort //==================================================================== - //-------------------------------------------------------------------- + RichTextViewPort::RichTextViewPort( Window* _pParent ) :Control ( _pParent ) ,m_pView(NULL) @@ -36,20 +36,20 @@ namespace frm { } - //-------------------------------------------------------------------- + void RichTextViewPort::setView( EditView& _rView ) { m_pView = &_rView; SetPointer( _rView.GetPointer() ); } - //-------------------------------------------------------------------- + void RichTextViewPort::Paint( const Rectangle& _rRect ) { m_pView->Paint( _rRect ); } - //-------------------------------------------------------------------- + void RichTextViewPort::GetFocus() { Control::GetFocus(); @@ -57,7 +57,7 @@ namespace frm m_pView->ShowCursor( true ); } - //-------------------------------------------------------------------- + void RichTextViewPort::LoseFocus() { m_pView->HideCursor(); @@ -65,7 +65,7 @@ namespace frm Control::LoseFocus(); } - //-------------------------------------------------------------------- + void RichTextViewPort::KeyInput( const KeyEvent& _rKEvt ) { if ( !m_pView->PostKeyEvent( _rKEvt ) ) @@ -74,14 +74,14 @@ namespace frm implInvalidateAttributes(); } - //-------------------------------------------------------------------- + void RichTextViewPort::MouseMove( const MouseEvent& _rMEvt ) { Control::MouseMove( _rMEvt ); m_pView->MouseMove( _rMEvt ); } - //-------------------------------------------------------------------- + void RichTextViewPort::MouseButtonDown( const MouseEvent& _rMEvt ) { Control::MouseButtonDown( _rMEvt ); @@ -89,7 +89,7 @@ namespace frm GrabFocus(); } - //-------------------------------------------------------------------- + void RichTextViewPort::MouseButtonUp( const MouseEvent& _rMEvt ) { Control::MouseButtonUp( _rMEvt ); @@ -97,7 +97,7 @@ namespace frm implInvalidateAttributes(); } - //-------------------------------------------------------------------- + void RichTextViewPort::SetHideInactiveSelection( bool _bHide ) { if ( m_bHideInactiveSelection == _bHide ) @@ -107,7 +107,7 @@ namespace frm m_pView->SetSelectionMode( m_bHideInactiveSelection ? EE_SELMODE_HIDDEN : EE_SELMODE_STD ); } - //-------------------------------------------------------------------- + bool RichTextViewPort::GetHideInactiveSelection() const { return m_bHideInactiveSelection; diff --git a/forms/source/richtext/rtattributehandler.cxx b/forms/source/richtext/rtattributehandler.cxx index a1b918d65b3f..d46891693eb3 100644 --- a/forms/source/richtext/rtattributehandler.cxx +++ b/forms/source/richtext/rtattributehandler.cxx @@ -42,19 +42,19 @@ namespace frm //==================================================================== //= ReferenceBase //==================================================================== - //-------------------------------------------------------------------- + oslInterlockedCount SAL_CALL ReferenceBase::acquire() { return osl_atomic_increment( &m_refCount ); } - //-------------------------------------------------------------------- + oslInterlockedCount SAL_CALL ReferenceBase::release() { return osl_atomic_decrement( &m_refCount ); } - //-------------------------------------------------------------------- + ReferenceBase::~ReferenceBase() { } @@ -62,44 +62,44 @@ namespace frm //==================================================================== //= AttributeHandler //==================================================================== - //-------------------------------------------------------------------- + AttributeHandler::AttributeHandler( AttributeId _nAttributeId, WhichId _nWhichId ) :m_nAttribute( _nAttributeId ) ,m_nWhich ( _nWhichId ) { } - //-------------------------------------------------------------------- + AttributeHandler::~AttributeHandler() { } - //-------------------------------------------------------------------- + oslInterlockedCount SAL_CALL AttributeHandler::acquire() { return ReferenceBase::acquire(); } - //-------------------------------------------------------------------- + oslInterlockedCount SAL_CALL AttributeHandler::release() { return ReferenceBase::release(); } - //-------------------------------------------------------------------- + AttributeId AttributeHandler::getAttributeId( ) const { return getAttribute(); } - //-------------------------------------------------------------------- + AttributeCheckState AttributeHandler::implGetCheckState( const SfxPoolItem& /*_rItem*/ ) const { OSL_FAIL( "AttributeHandler::implGetCheckState: not to be called!" ); return eIndetermined; } - //-------------------------------------------------------------------- + void AttributeHandler::putItemForScript( SfxItemSet& _rAttribs, const SfxPoolItem& _rItem, ScriptType _nForScriptType ) const { SvxScriptSetItem aSetItem( (WhichId)getAttributeId(), *_rAttribs.GetPool() ); @@ -107,7 +107,7 @@ namespace frm _rAttribs.Put( aSetItem.GetItemSet(), false ); } - //-------------------------------------------------------------------- + AttributeCheckState AttributeHandler::getCheckState( const SfxItemSet& _rAttribs ) const { AttributeCheckState eSimpleState( eIndetermined ); @@ -117,7 +117,7 @@ namespace frm return eSimpleState; } - //-------------------------------------------------------------------- + AttributeState AttributeHandler::getState( const SfxItemSet& _rAttribs ) const { AttributeState aState( eIndetermined ); @@ -128,7 +128,7 @@ namespace frm //==================================================================== //= AttributeHandlerFactory //==================================================================== - //-------------------------------------------------------------------- + namespace { static WhichId lcl_implGetWhich( const SfxItemPool& _rPool, AttributeId _nAttributeId ) @@ -148,7 +148,7 @@ namespace frm return nWhich; } } - //-------------------------------------------------------------------- + ::rtl::Reference< IAttributeHandler > AttributeHandlerFactory::getHandlerFor( AttributeId _nAttributeId, const SfxItemPool& _rEditEnginePool ) { ::rtl::Reference< IAttributeHandler > pReturn; @@ -202,7 +202,7 @@ namespace frm //==================================================================== //= ParaAlignmentHandler //==================================================================== - //-------------------------------------------------------------------- + ParaAlignmentHandler::ParaAlignmentHandler( AttributeId _nAttributeId ) :AttributeHandler( _nAttributeId, EE_PARA_JUST ) ,m_eAdjust( SVX_ADJUST_CENTER ) @@ -219,7 +219,7 @@ namespace frm } } - //-------------------------------------------------------------------- + AttributeCheckState ParaAlignmentHandler::implGetCheckState( const SfxPoolItem& _rItem ) const { OSL_ENSURE( _rItem.ISA( SvxAdjustItem ), "ParaAlignmentHandler::implGetCheckState: invalid pool item!" ); @@ -227,7 +227,7 @@ namespace frm return ( eAdjust == m_eAdjust ) ? eChecked : eUnchecked; } - //-------------------------------------------------------------------- + void ParaAlignmentHandler::executeAttribute( const SfxItemSet& /*_rCurrentAttribs*/, SfxItemSet& _rNewAttribs, const SfxPoolItem* _pAdditionalArg, ScriptType /*_nForScriptType*/ ) const { OSL_ENSURE( !_pAdditionalArg, "ParaAlignmentHandler::executeAttribute: this is a simple toggle attribute - no args possible!" ); @@ -238,7 +238,7 @@ namespace frm //==================================================================== //= LineSpacingHandler //==================================================================== - //-------------------------------------------------------------------- + LineSpacingHandler::LineSpacingHandler( AttributeId _nAttributeId ) :AttributeHandler( _nAttributeId, EE_PARA_SBL ) ,m_nLineSpace( 100 ) @@ -254,7 +254,7 @@ namespace frm } } - //-------------------------------------------------------------------- + AttributeCheckState LineSpacingHandler::implGetCheckState( const SfxPoolItem& _rItem ) const { OSL_ENSURE( _rItem.ISA( SvxLineSpacingItem ), "LineSpacingHandler::implGetCheckState: invalid pool item!" ); @@ -262,7 +262,7 @@ namespace frm return ( nLineSpace == m_nLineSpace ) ? eChecked : eUnchecked; } - //-------------------------------------------------------------------- + void LineSpacingHandler::executeAttribute( const SfxItemSet& /*_rCurrentAttribs*/, SfxItemSet& _rNewAttribs, const SfxPoolItem* _pAdditionalArg, ScriptType /*_nForScriptType*/ ) const { OSL_ENSURE( !_pAdditionalArg, "LineSpacingHandler::executeAttribute: this is a simple toggle attribute - no args possible!" ); @@ -281,7 +281,7 @@ namespace frm //==================================================================== //= EscapementHandler //==================================================================== - //-------------------------------------------------------------------- + EscapementHandler::EscapementHandler( AttributeId _nAttributeId ) :AttributeHandler( _nAttributeId, EE_CHAR_ESCAPEMENT ) ,m_eEscapement( SVX_ESCAPEMENT_OFF ) @@ -296,7 +296,7 @@ namespace frm } } - //-------------------------------------------------------------------- + AttributeCheckState EscapementHandler::implGetCheckState( const SfxPoolItem& _rItem ) const { OSL_ENSURE( _rItem.ISA( SvxEscapementItem ), "EscapementHandler::getState: invalid pool item!" ); @@ -304,7 +304,7 @@ namespace frm return ( eEscapement == m_eEscapement ) ? eChecked : eUnchecked; } - //-------------------------------------------------------------------- + void EscapementHandler::executeAttribute( const SfxItemSet& _rCurrentAttribs, SfxItemSet& _rNewAttribs, const SfxPoolItem* _pAdditionalArg, ScriptType /*_nForScriptType*/ ) const { OSL_ENSURE( !_pAdditionalArg, "EscapementHandler::executeAttribute: this is a simple toggle attribute - no args possible!" ); @@ -318,7 +318,7 @@ namespace frm //==================================================================== //= SlotHandler //==================================================================== - //-------------------------------------------------------------------- + SlotHandler::SlotHandler( AttributeId _nAttributeId, WhichId _nWhichId ) :AttributeHandler( _nAttributeId, _nWhichId ) ,m_bScriptDependent( false ) @@ -328,7 +328,7 @@ namespace frm || ( SID_ATTR_CHAR_FONT == _nAttributeId ); } - //-------------------------------------------------------------------- + AttributeState SlotHandler::getState( const SfxItemSet& _rAttribs ) const { AttributeState aState( eIndetermined ); @@ -340,7 +340,7 @@ namespace frm return aState; } - //-------------------------------------------------------------------- + void SlotHandler::executeAttribute( const SfxItemSet& /*_rCurrentAttribs*/, SfxItemSet& _rNewAttribs, const SfxPoolItem* _pAdditionalArg, ScriptType _nForScriptType ) const { if ( _pAdditionalArg ) @@ -361,7 +361,7 @@ namespace frm //==================================================================== //= FontSizeHandler //==================================================================== - //-------------------------------------------------------------------- + FontSizeHandler::FontSizeHandler( AttributeId _nAttributeId, WhichId _nWhichId ) :AttributeHandler( _nAttributeId, _nWhichId ) { @@ -370,7 +370,7 @@ namespace frm "FontSizeHandler::FontSizeHandler: invalid attribute id!" ); } - //-------------------------------------------------------------------- + AttributeState FontSizeHandler::getState( const SfxItemSet& _rAttribs ) const { AttributeState aState( eIndetermined ); @@ -399,7 +399,7 @@ namespace frm return aState; } - //-------------------------------------------------------------------- + void FontSizeHandler::executeAttribute( const SfxItemSet& /*_rCurrentAttribs*/, SfxItemSet& _rNewAttribs, const SfxPoolItem* _pAdditionalArg, ScriptType _nForScriptType ) const { const SvxFontHeightItem* pFontHeightItem = PTR_CAST( SvxFontHeightItem, _pAdditionalArg ); @@ -432,7 +432,7 @@ namespace frm //==================================================================== //= ParagraphDirectionHandler //==================================================================== - //-------------------------------------------------------------------- + ParagraphDirectionHandler::ParagraphDirectionHandler( AttributeId _nAttributeId ) :AttributeHandler( _nAttributeId, EE_PARA_WRITINGDIR ) ,m_eParagraphDirection( FRMDIR_HORI_LEFT_TOP ) @@ -453,7 +453,7 @@ namespace frm m_eOppositeDefaultAdjustment = SVX_ADJUST_RIGHT; } - //-------------------------------------------------------------------- + AttributeCheckState ParagraphDirectionHandler::implGetCheckState( const SfxPoolItem& _rItem ) const { OSL_ENSURE( _rItem.ISA( SvxFrameDirectionItem ), "ParagraphDirectionHandler::implGetCheckState: invalid pool item!" ); @@ -461,7 +461,7 @@ namespace frm return ( eDirection == m_eParagraphDirection ) ? eChecked : eUnchecked; } - //-------------------------------------------------------------------- + void ParagraphDirectionHandler::executeAttribute( const SfxItemSet& _rCurrentAttribs, SfxItemSet& _rNewAttribs, const SfxPoolItem* /*_pAdditionalArg*/, ScriptType /*_nForScriptType*/ ) const { _rNewAttribs.Put( SvxFrameDirectionItem( m_eParagraphDirection, getWhich() ) ); @@ -480,13 +480,13 @@ namespace frm //==================================================================== //= BooleanHandler //==================================================================== - //-------------------------------------------------------------------- + BooleanHandler::BooleanHandler( AttributeId _nAttributeId, WhichId _nWhichId ) :AttributeHandler( _nAttributeId, _nWhichId ) { } - //-------------------------------------------------------------------- + AttributeCheckState BooleanHandler::implGetCheckState( const SfxPoolItem& _rItem ) const { OSL_ENSURE( _rItem.ISA( SfxBoolItem ), "BooleanHandler::implGetCheckState: invalid item!" ); @@ -496,7 +496,7 @@ namespace frm return eIndetermined; } - //-------------------------------------------------------------------- + void BooleanHandler::executeAttribute( const SfxItemSet& /*_rCurrentAttribs*/, SfxItemSet& _rNewAttribs, const SfxPoolItem* _pAdditionalArg, ScriptType /*_nForScriptType*/ ) const { OSL_ENSURE( _pAdditionalArg && _pAdditionalArg->ISA( SfxBoolItem ), "BooleanHandler::executeAttribute: invalid argument!" ); diff --git a/forms/source/richtext/specialdispatchers.cxx b/forms/source/richtext/specialdispatchers.cxx index 0fa4212e3e3e..f9eaa1a64952 100644 --- a/forms/source/richtext/specialdispatchers.cxx +++ b/forms/source/richtext/specialdispatchers.cxx @@ -37,13 +37,13 @@ namespace frm //==================================================================== //= OSelectAllDispatcher //==================================================================== - //-------------------------------------------------------------------- + OSelectAllDispatcher::OSelectAllDispatcher( EditView& _rView, const URL& _rURL ) :ORichTextFeatureDispatcher( _rView, _rURL ) { } - //-------------------------------------------------------------------- + OSelectAllDispatcher::~OSelectAllDispatcher( ) { if ( !isDisposed() ) @@ -53,7 +53,7 @@ namespace frm } } - //-------------------------------------------------------------------- + void SAL_CALL OSelectAllDispatcher::dispatch( const URL& _rURL, const Sequence< PropertyValue >& /*_rArguments*/ ) throw (RuntimeException, std::exception) @@ -78,7 +78,7 @@ namespace frm } } - //-------------------------------------------------------------------- + FeatureStateEvent OSelectAllDispatcher::buildStatusEvent() const { FeatureStateEvent aEvent( ORichTextFeatureDispatcher::buildStatusEvent() ); @@ -89,14 +89,14 @@ namespace frm //==================================================================== //= OParagraphDirectionDispatcher //==================================================================== - //-------------------------------------------------------------------- + OParagraphDirectionDispatcher::OParagraphDirectionDispatcher( EditView& _rView, AttributeId _nAttributeId, const URL& _rURL, IMultiAttributeDispatcher* _pMasterDispatcher ) :OAttributeDispatcher( _rView, _nAttributeId, _rURL, _pMasterDispatcher ) { } - //-------------------------------------------------------------------- + FeatureStateEvent OParagraphDirectionDispatcher::buildStatusEvent() const { FeatureStateEvent aEvent( OAttributeDispatcher::buildStatusEvent() ); @@ -112,13 +112,13 @@ namespace frm //==================================================================== //= OTextDirectionDispatcher //==================================================================== - //-------------------------------------------------------------------- + OTextDirectionDispatcher::OTextDirectionDispatcher( EditView& _rView, const URL& _rURL ) :ORichTextFeatureDispatcher( _rView, _rURL ) { } - //-------------------------------------------------------------------- + void SAL_CALL OTextDirectionDispatcher::dispatch( const URL& _rURL, const Sequence< PropertyValue >& /*_rArguments*/ ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -135,7 +135,7 @@ namespace frm pEngine->SetVertical( !pEngine->IsVertical() ); } - //-------------------------------------------------------------------- + FeatureStateEvent OTextDirectionDispatcher::buildStatusEvent() const { FeatureStateEvent aEvent( ORichTextFeatureDispatcher::buildStatusEvent() ); @@ -152,13 +152,13 @@ namespace frm //==================================================================== //= OAsianFontLayoutDispatcher //==================================================================== - //-------------------------------------------------------------------- + OAsianFontLayoutDispatcher::OAsianFontLayoutDispatcher( EditView& _rView, AttributeId _nAttributeId, const URL& _rURL, IMultiAttributeDispatcher* _pMasterDispatcher ) :OParametrizedAttributeDispatcher( _rView, _nAttributeId, _rURL, _pMasterDispatcher ) { } - //-------------------------------------------------------------------- + const SfxPoolItem* OAsianFontLayoutDispatcher::convertDispatchArgsToItem( const Sequence< PropertyValue >& _rArguments ) { // look for the "Enable" parameter |