strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CWS-TOOLING: integrate CWS mib19

Browse source
This commit is contained in:
Hans-Joachim Lankenau 2010-12-17 13:36:59 +01:00
commit 025069983b
4 changed files with 3 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
sw/source/ui/vba/vbadocuments.cxx
View file

@ -120,7 +120,7 @@ SwVbaDocuments::Add( const uno::Any& Template, const uno::Any& /*NewTemplate*/,
{
return Open( sFileName, uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any());
}
uno::Reference <text::XTextDocument> xTextDoc( VbaDocumentsBase::Add() , uno::UNO_QUERY_THROW );
uno::Reference <text::XTextDocument> xTextDoc( createDocument() , uno::UNO_QUERY_THROW );
if( xTextDoc.is() )
return getDocument( mxContext, xTextDoc, Application() );
@ -131,7 +131,7 @@ SwVbaDocuments::Add( const uno::Any& Template, const uno::Any& /*NewTemplate*/,
void SAL_CALL
SwVbaDocuments::Close( const uno::Any& /*SaveChanges*/, const uno::Any& /*OriginalFormat*/, const uno::Any& /*RouteDocument*/ ) throw (uno::RuntimeException)
{
VbaDocumentsBase::Close();
closeDocuments();
}
// #TODO# #FIXME# can any of the unused params below be used?
@ -150,7 +150,7 @@ SwVbaDocuments::Open( const ::rtl::OUString& Filename, const uno::Any& /*Confirm
uno::Sequence< beans::PropertyValue > sProps(0);
uno::Reference <text::XTextDocument> xSpreadDoc( VbaDocumentsBase::Open( Filename, ReadOnly, sProps ), uno::UNO_QUERY_THROW );
uno::Reference <text::XTextDocument> xSpreadDoc( openDocument( Filename, ReadOnly, sProps ), uno::UNO_QUERY_THROW );
uno::Any aRet = getDocument( mxContext, xSpreadDoc, Application() );
uno::Reference< word::XDocument > xDocument( aRet, uno::UNO_QUERY );
if ( xDocument.is() )
@ -158,25 +158,6 @@ SwVbaDocuments::Open( const ::rtl::OUString& Filename, const uno::Any& /*Confirm
return aRet;
}
// VbaDocumentsBase / XDocumentsBase (to avoid warning C4266 for hiding function on wntmsci)
uno::Any SAL_CALL
SwVbaDocuments::Add() throw (uno::RuntimeException)
{
return VbaDocumentsBase::Add();
}
void SAL_CALL
SwVbaDocuments::Close( ) throw (uno::RuntimeException)
{
VbaDocumentsBase::Close();
}
uno::Any SAL_CALL
SwVbaDocuments::Open( const ::rtl::OUString& Filename, const uno::Any& ReadOnly, const uno::Sequence< beans::PropertyValue >& rProps ) throw (uno::RuntimeException)
{
return VbaDocumentsBase::Open( Filename, ReadOnly, rProps );
}
rtl::OUString&
SwVbaDocuments::getServiceImplName()
{

5
sw/source/ui/vba/vbadocuments.hxx
View file

@ -56,11 +56,6 @@ public:
virtual css::uno::Any SAL_CALL Add( const css::uno::Any& Template, const css::uno::Any& NewTemplate, const css::uno::Any& DocumentType, const css::uno::Any& Visible ) throw (css::uno::RuntimeException);
virtual css::uno::Any SAL_CALL Open( const ::rtl::OUString& Filename, const css::uno::Any& ConfirmConversions, const css::uno::Any& ReadOnly, const css::uno::Any& AddToRecentFiles, const css::uno::Any& PasswordDocument, const css::uno::Any& PasswordTemplate, const css::uno::Any& Revert, const css::uno::Any& WritePasswordDocument, const css::uno::Any& WritePasswordTemplate, const css::uno::Any& Format, const css::uno::Any& Encoding, const css::uno::Any& Visible, const css::uno::Any& OpenAndRepair, const css::uno::Any& DocumentDirection, const css::uno::Any& NoEncodingDialog, const css::uno::Any& XMLTransform ) throw (css::uno::RuntimeException);
virtual void SAL_CALL Close( const css::uno::Any& SaveChanges, const css::uno::Any& OriginalFormat, const css::uno::Any& RouteDocument ) throw (css::uno::RuntimeException);
// VbaDocumentsBase / XDocumentsBase (to avoid warning C4266 for hiding function on wntmsci)
virtual css::uno::Any SAL_CALL Add() throw (css::uno::RuntimeException);
virtual void SAL_CALL Close( ) throw (css::uno::RuntimeException);
virtual css::uno::Any SAL_CALL Open( const ::rtl::OUString& Filename, const css::uno::Any& ReadOnly, const css::uno::Sequence< css::beans::PropertyValue >& rProps ) throw (css::uno::RuntimeException);
};
#endif /* SW_VBA_DOCUMENTS_HXX */

5
sw/source/ui/vba/vbaeventshelper.cxx
View file

@ -50,11 +50,6 @@ SwVbaEventsHelper::~SwVbaEventsHelper()
{
}
bool SwVbaEventsHelper::implEventsEnabled() throw (uno::RuntimeException)
{
return true;
}
bool SwVbaEventsHelper::implPrepareEvent( EventQueue& rEventQueue,
const EventHandlerInfo& rInfo, const uno::Sequence< uno::Any >& /*rArgs*/ ) throw (uno::RuntimeException)
{

1
sw/source/ui/vba/vbaeventshelper.hxx
View file

@ -41,7 +41,6 @@ public:
virtual ~SwVbaEventsHelper();
protected:
virtual bool implEventsEnabled() throw (css::uno::RuntimeException);
virtual bool implPrepareEvent( EventQueue& rEventQueue, const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) throw (css::uno::RuntimeException);
virtual css::uno::Sequence< css::uno::Any > implBuildArgumentList( const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) throw (css::lang::IllegalArgumentException);
virtual void implPostProcessEvent( EventQueue& rEventQueue, const EventHandlerInfo& rInfo, bool bSuccess, bool bCancel ) throw (css::uno::RuntimeException);