diff options
Diffstat (limited to 'embeddedobj/source')
-rw-r--r-- | embeddedobj/source/general/docholder.cxx | 6 | ||||
-rw-r--r-- | embeddedobj/source/msole/graphconvert.cxx | 4 | ||||
-rw-r--r-- | embeddedobj/source/msole/olecomponent.hxx | 2 | ||||
-rw-r--r-- | embeddedobj/source/msole/oleembed.cxx | 6 | ||||
-rw-r--r-- | embeddedobj/source/msole/olepersist.cxx | 2 | ||||
-rw-r--r-- | embeddedobj/source/msole/ownview.cxx | 8 |
6 files changed, 14 insertions, 14 deletions
diff --git a/embeddedobj/source/general/docholder.cxx b/embeddedobj/source/general/docholder.cxx index 6520423cf9da..a9709798ce87 100644 --- a/embeddedobj/source/general/docholder.cxx +++ b/embeddedobj/source/general/docholder.cxx @@ -78,7 +78,7 @@ using namespace ::com::sun::star; -//=========================================================================== + class IntCounterGuard { sal_Int32& m_nFlag; @@ -96,7 +96,7 @@ public: } }; -//=========================================================================== + static void InsertMenu_Impl( const uno::Reference< container::XIndexContainer >& xTargetMenu, sal_Int32 nTargetIndex, @@ -148,7 +148,7 @@ static void InsertMenu_Impl( const uno::Reference< container::XIndexContainer >& xTargetMenu->insertByIndex( nTargetIndex, uno::makeAny( aTargetProps ) ); } -//=========================================================================== + DocumentHolder::DocumentHolder( const uno::Reference< uno::XComponentContext >& xContext, OCommonEmbeddedObject* pEmbObj ) : m_pEmbedObj( pEmbObj ), diff --git a/embeddedobj/source/msole/graphconvert.cxx b/embeddedobj/source/msole/graphconvert.cxx index 9883c490cb16..ad8e910c8431 100644 --- a/embeddedobj/source/msole/graphconvert.cxx +++ b/embeddedobj/source/msole/graphconvert.cxx @@ -79,9 +79,9 @@ sal_Bool ConvertBufferToFormat( void* pBuf, return sal_False; } -// ===================================================================== + // MainThreadNotificationRequest -// ===================================================================== + MainThreadNotificationRequest::MainThreadNotificationRequest( const ::rtl::Reference< OleEmbeddedObject >& xObj, sal_uInt16 nNotificationType, sal_uInt32 nAspect ) : m_pObject( xObj.get() ) , m_xObject( static_cast< embed::XEmbeddedObject* >( xObj.get() ) ) diff --git a/embeddedobj/source/msole/olecomponent.hxx b/embeddedobj/source/msole/olecomponent.hxx index 2ec7f8922db3..12389885eb14 100644 --- a/embeddedobj/source/msole/olecomponent.hxx +++ b/embeddedobj/source/msole/olecomponent.hxx @@ -114,7 +114,7 @@ public: void CreateLinkFromFile( const OUString& aFileName ); void InitEmbeddedCopyOfLink( OleComponent* pOleLinkComponent ); - // ====================================================================== + void RunObject(); // switch OLE object to running state void CloseObject(); // switch OLE object to loaded state diff --git a/embeddedobj/source/msole/oleembed.cxx b/embeddedobj/source/msole/oleembed.cxx index 7d3c4636ff6a..244c543bed94 100644 --- a/embeddedobj/source/msole/oleembed.cxx +++ b/embeddedobj/source/msole/oleembed.cxx @@ -799,7 +799,7 @@ void SAL_CALL OleEmbeddedObject::doVerb( sal_Int32 nVerbID ) // ==== the STAMPIT related solution ============================= m_aVerbExecutionController.StartControlExecution(); - // =============================================================== + m_pOleComponent->ExecuteVerb( nVerbID ); @@ -810,13 +810,13 @@ void SAL_CALL OleEmbeddedObject::doVerb( sal_Int32 nVerbID ) // if object was modified during verb execution it is saved here if ( bModifiedOnExecution && m_pOleComponent->IsDirty() ) SaveObject_Impl(); - // =============================================================== + } catch( uno::Exception& ) { // ==== the STAMPIT related solution ============================= m_aVerbExecutionController.EndControlExecution_WasModified(); - // =============================================================== + aGuard.clear(); StateChangeNotification_Impl( sal_False, nOldState, m_nObjectState ); diff --git a/embeddedobj/source/msole/olepersist.cxx b/embeddedobj/source/msole/olepersist.cxx index 3b5bad584248..e3c17be8443c 100644 --- a/embeddedobj/source/msole/olepersist.cxx +++ b/embeddedobj/source/msole/olepersist.cxx @@ -897,7 +897,7 @@ void OleEmbeddedObject::OnViewChanged_Impl() SaveObject_Impl(); MakeEventListenerNotification_Impl( OUString( "OnVisAreaChanged" ) ); } - // =============================================================== + } diff --git a/embeddedobj/source/msole/ownview.cxx b/embeddedobj/source/msole/ownview.cxx index 3ca096b47619..ebe91a98908f 100644 --- a/embeddedobj/source/msole/ownview.cxx +++ b/embeddedobj/source/msole/ownview.cxx @@ -53,9 +53,9 @@ OUString GetNewFilledTempFile_Impl( const uno::Reference< io::XInputStream >& xI sal_Bool KillFile_Impl( const OUString& aURL, const uno::Reference< lang::XMultiServiceFactory >& xFactory ); uno::Reference< io::XStream > TryToGetAcceptableFormat_Impl( const uno::Reference< io::XStream >& xStream, const uno::Reference< lang::XMultiServiceFactory >& xFactory ) throw ( uno::Exception ); -//======================================================== + // Dummy interaction handler -//======================================================== + class DummyHandler_Impl : public ::cppu::WeakImplHelper1< task::XInteractionHandler > { @@ -79,9 +79,9 @@ void SAL_CALL DummyHandler_Impl::handle( const uno::Reference< task::XInteractio return; } -//======================================================== + // Object viewer -//======================================================== + OwnView_Impl::OwnView_Impl( const uno::Reference< lang::XMultiServiceFactory >& xFactory, const uno::Reference< io::XInputStream >& xInputStream ) |