summaryrefslogtreecommitdiff
path: root/basic/source/uno/scriptcont.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'basic/source/uno/scriptcont.cxx')
-rw-r--r--basic/source/uno/scriptcont.cxx66
1 files changed, 38 insertions, 28 deletions
diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx
index 40c9c40ce6bc..d078deddece4 100644
--- a/basic/source/uno/scriptcont.cxx
+++ b/basic/source/uno/scriptcont.cxx
@@ -51,7 +51,6 @@
namespace basic
{
-using namespace com::sun::star::document;
using namespace com::sun::star::container;
using namespace com::sun::star::io;
using namespace com::sun::star::uno;
@@ -61,17 +60,31 @@ using namespace com::sun::star::script;
using namespace com::sun::star::xml::sax;
using namespace com::sun::star;
using namespace cppu;
-using namespace osl;
// Implementation class SfxScriptLibraryContainer
-const char* SfxScriptLibraryContainer::getInfoFileName() const { return "script"; }
-const char* SfxScriptLibraryContainer::getOldInfoFileName() const { return "script"; }
-const char* SfxScriptLibraryContainer::getLibElementFileExtension() const { return "xba"; }
-const char* SfxScriptLibraryContainer::getLibrariesDir() const { return "Basic"; }
+OUString SfxScriptLibraryContainer::getInfoFileName() const
+{
+ static constexpr OUStringLiteral script = u"script";
+ return script;
+}
+OUString SfxScriptLibraryContainer::getOldInfoFileName() const
+{
+ static constexpr OUStringLiteral script = u"script";
+ return script;
+}
+OUString SfxScriptLibraryContainer::getLibElementFileExtension() const
+{
+ static constexpr OUStringLiteral xba = u"xba";
+ return xba;
+}
+OUString SfxScriptLibraryContainer::getLibrariesDir() const
+{
+ static constexpr OUStringLiteral sBasic = u"Basic";
+ return sBasic;
+}
-// OldBasicPassword interface
void SfxScriptLibraryContainer::setLibraryPassword( const OUString& rLibraryName, const OUString& rPassword )
{
try
@@ -105,20 +118,18 @@ SfxScriptLibraryContainer::SfxScriptLibraryContainer( const uno::Reference< embe
}
// Methods to get library instances of the correct type
-SfxLibrary* SfxScriptLibraryContainer::implCreateLibrary( const OUString& )
+rtl::Reference<SfxLibrary> SfxScriptLibraryContainer::implCreateLibrary( const OUString& )
{
- SfxLibrary* pRet = new SfxScriptLibrary( maModifiable, mxSFI );
- return pRet;
+ return new SfxScriptLibrary( maModifiable, mxSFI );
}
-SfxLibrary* SfxScriptLibraryContainer::implCreateLibraryLink( const OUString&,
+rtl::Reference<SfxLibrary> SfxScriptLibraryContainer::implCreateLibraryLink( const OUString&,
const OUString& aLibInfoFileURL,
const OUString& StorageURL,
bool ReadOnly )
{
- SfxLibrary* pRet = new SfxScriptLibrary( maModifiable, mxSFI,
+ return new SfxScriptLibrary( maModifiable, mxSFI,
aLibInfoFileURL, StorageURL, ReadOnly );
- return pRet;
}
Any SfxScriptLibraryContainer::createEmptyLibraryElement()
@@ -313,7 +324,7 @@ Any SfxScriptLibraryContainer::importLibraryElement
return aRetAny;
}
-SfxLibraryContainer* SfxScriptLibraryContainer::createInstanceImpl()
+rtl::Reference<SfxLibraryContainer> SfxScriptLibraryContainer::createInstanceImpl()
{
return new SfxScriptLibraryContainer();
}
@@ -321,13 +332,13 @@ SfxLibraryContainer* SfxScriptLibraryContainer::createInstanceImpl()
void SfxScriptLibraryContainer::importFromOldStorage( const OUString& aFile )
{
// TODO: move loading from old storage to binary filters?
- auto xStorage = tools::make_ref<SotStorage>( false, aFile );
+ rtl::Reference<SotStorage> xStorage(new SotStorage(false, aFile));
if( xStorage->GetError() == ERRCODE_NONE )
{
auto pBasicManager = std::make_unique<BasicManager> ( *xStorage, aFile );
// Set info
- LibraryContainerInfo aInfo( this, nullptr, static_cast< OldBasicPassword* >( this ) );
+ LibraryContainerInfo aInfo( this, nullptr, this );
pBasicManager->SetLibraryContainerInfo( aInfo );
}
}
@@ -350,7 +361,7 @@ sal_Bool SAL_CALL SfxScriptLibraryContainer::isLibraryPasswordVerified( const OU
SfxLibrary* pImplLib = getImplLib( Name );
if( !pImplLib->mbPasswordProtected )
{
- throw IllegalArgumentException("!passwordProtected", static_cast<cppu::OWeakObject*>(this), 1);
+ throw IllegalArgumentException("!passwordProtected", getXWeak(), 1);
}
bool bRet = pImplLib->mbPasswordVerified;
return bRet;
@@ -363,7 +374,7 @@ sal_Bool SAL_CALL SfxScriptLibraryContainer::verifyLibraryPassword
SfxLibrary* pImplLib = getImplLib( Name );
if( !pImplLib->mbPasswordProtected || pImplLib->mbPasswordVerified )
{
- throw IllegalArgumentException("!PasswordProtected || PasswordVerified", static_cast<cppu::OWeakObject*>(this), 1);
+ throw IllegalArgumentException("!PasswordProtected || PasswordVerified", getXWeak(), 1);
}
// Test password
bool bSuccess = false;
@@ -507,7 +518,7 @@ void SAL_CALL SfxScriptLibraryContainer::changeLibraryPassword( const OUString&
}
else
{
- aElementInetObj.setExtension( "pba" );
+ aElementInetObj.setExtension( u"pba" );
}
OUString aElementPath( aElementInetObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ) );
@@ -559,13 +570,12 @@ bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary* pLib, cons
// save/saveas etc are handled in sfxbasemodel::storeSelf &
// sfxbasemodel::impl_store
std::vector<OUString> aNames;
- if ( bExport && pBasicMgr->LegacyPsswdBinaryLimitExceeded(aNames) )
+ if ( bExport && pBasicMgr->ImgVersion12PsswdBinaryLimitExceeded(aNames) )
{
if ( xHandler.is() )
{
- ModuleSizeExceeded* pReq = new ModuleSizeExceeded( aNames );
- uno::Reference< task::XInteractionRequest > xReq( pReq );
- xHandler->handle( xReq );
+ rtl::Reference<ModuleSizeExceeded> pReq = new ModuleSizeExceeded( aNames );
+ xHandler->handle( pReq );
if ( pReq->isAbort() )
{
throw util::VetoException();
@@ -703,7 +713,7 @@ bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary* pLib, cons
aElementInetObj.insertName( aElementName, false,
INetURLObject::LAST_SEGMENT,
INetURLObject::EncodeMechanism::All );
- aElementInetObj.setExtension( "pba" );
+ aElementInetObj.setExtension( u"pba" );
OUString aElementPath = aElementInetObj.GetMainURL( INetURLObject::DecodeMechanism::NONE );
if( !isLibraryElementValid( pLib->getByName( aElementName ) ) )
@@ -969,7 +979,7 @@ bool SfxScriptLibraryContainer::implLoadPasswordLibrary
INetURLObject aElementInetObj( aLibDirPath );
aElementInetObj.insertName( aElementName, false,
INetURLObject::LAST_SEGMENT, INetURLObject::EncodeMechanism::All );
- aElementInetObj.setExtension( "pba" );
+ aElementInetObj.setExtension( u"pba" );
OUString aElementPath = aElementInetObj.GetMainURL( INetURLObject::DecodeMechanism::NONE );
uno::Reference< embed::XStorage > xElementRootStorage;
@@ -1101,13 +1111,13 @@ sal_Bool SAL_CALL SfxScriptLibraryContainer:: HasExecutableCode( const OUString&
// Service
OUString SAL_CALL SfxScriptLibraryContainer::getImplementationName( )
{
- return "com.sun.star.comp.sfx2.ScriptLibraryContainer";
+ return u"com.sun.star.comp.sfx2.ScriptLibraryContainer"_ustr;
}
Sequence< OUString > SAL_CALL SfxScriptLibraryContainer::getSupportedServiceNames( )
{
- return {"com.sun.star.script.DocumentScriptLibraryContainer",
- "com.sun.star.script.ScriptLibraryContainer"}; // for compatibility
+ return {u"com.sun.star.script.DocumentScriptLibraryContainer"_ustr,
+ u"com.sun.star.script.ScriptLibraryContainer"_ustr}; // for compatibility
}
// Implementation class SfxScriptLibrary
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-26 02:53:04 +0000