diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-21 18:51:11 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-21 18:51:11 +0200 |
| commit | 200bc6c582d6cf2365001f27928c1e3d1f9c9845 (patch) | |
| tree | 0f27abe75bc3603341aef715372676aee8d86835 /xmlscript | |
| parent | 01ea92166c12fe080575f8faba4162779fb46c28 (diff) | |
| parent | 1b465fcc0f5f699308c6ee5113dde6b82842c3dd (diff) | |
resyncing to master
Diffstat (limited to 'xmlscript')
| -rw-r--r-- | xmlscript/prj/d.lst | 1 | ||||
| -rw-r--r-- | xmlscript/source/misc/unoservices.cxx | 8 | ||||
| -rw-r--r-- | xmlscript/source/xmldlg_imexp/imp_share.hxx | 1 | ||||
| -rw-r--r-- | xmlscript/source/xmldlg_imexp/xmldlg_import.cxx | 21 |
4 files changed, 1 insertions, 30 deletions
diff --git a/xmlscript/prj/d.lst b/xmlscript/prj/d.lst index e69de29bb2d1..cde5ebec26c2 100644 --- a/xmlscript/prj/d.lst +++ b/xmlscript/prj/d.lst @@ -0,0 +1 @@ +..\%__SRC%\lib\*.a %_DEST%\lib\*.a diff --git a/xmlscript/source/misc/unoservices.cxx b/xmlscript/source/misc/unoservices.cxx index 0e7119368d20..d795ee65ab9e 100644 --- a/xmlscript/source/misc/unoservices.cxx +++ b/xmlscript/source/misc/unoservices.cxx @@ -106,14 +106,6 @@ namespace xmlscript extern "C" { - SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - const sal_Char ** ppEnvTypeName, uno_Environment ** ) - { - *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; - } - - // ----------------------------------------------------------------------------- - SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { diff --git a/xmlscript/source/xmldlg_imexp/imp_share.hxx b/xmlscript/source/xmldlg_imexp/imp_share.hxx index 0c413a3afe53..4751091a7d73 100644 --- a/xmlscript/source/xmldlg_imexp/imp_share.hxx +++ b/xmlscript/source/xmldlg_imexp/imp_share.hxx @@ -193,7 +193,6 @@ public: inline css::uno::Reference< css::frame::XModel > getDocOwner() { return _xDoc; } - css::uno::Reference< css::script::XLibraryContainer > getScriptLibraryContainer(); // XRoot virtual void SAL_CALL startDocument( css::uno::Reference< css::xml::input::XNamespaceMapping > diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx index 8e3b28dafcb9..c438053d4941 100644 --- a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx +++ b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx @@ -2027,28 +2027,7 @@ Reference< xml::input::XElement > DialogImport::getStyle( } return 0; } -//__________________________________________________________________________________________________ -Reference< script::XLibraryContainer > DialogImport::getScriptLibraryContainer() -{ - if( !_xScriptLibraryContainer.is() ) - { - try - { - Reference< beans::XPropertySet > xProps( _xDoc, UNO_QUERY ); - if( xProps.is() ) - _xScriptLibraryContainer.set( xProps->getPropertyValue( OUSTR("BasicLibraries") ), UNO_QUERY ); - } - catch( const Exception& ) - { - } - } - - return _xScriptLibraryContainer; -} -//################################################################################################## - -//================================================================================================== Reference< xml::sax::XDocumentHandler > SAL_CALL importDialogModel( Reference< container::XNameContainer > const & xDialogModel, Reference< XComponentContext > const & xContext, |