[Libreoffice-commits] .: basic/inc basic/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Tue Aug 28 12:53:58 PDT 2012
basic/inc/basic/basmgr.hxx | 4 ++--
basic/source/basmgr/basmgr.cxx | 12 ++++++------
2 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 9e2f8b9ec2d7418145cf514431e248e55e732cdb
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Tue Aug 28 13:52:19 2012 +0900
Fix typo ImpLoadLibary
Change-Id: I773678437aae6577f22078e97bcac1377c4307d8
Reviewed-on: https://gerrit.libreoffice.org/495
Reviewed-by: Tor Lillqvist <tml at iki.fi>
Tested-by: Kohei Yoshida <kohei.yoshida at gmail.com>
diff --git a/basic/inc/basic/basmgr.hxx b/basic/inc/basic/basmgr.hxx
index f8c4b40..a52771e 100644
--- a/basic/inc/basic/basmgr.hxx
+++ b/basic/inc/basic/basmgr.hxx
@@ -131,8 +131,8 @@ private:
BASIC_DLLPRIVATE void Init();
protected:
- sal_Bool ImpLoadLibary( BasicLibInfo* pLibInfo ) const;
- sal_Bool ImpLoadLibary( BasicLibInfo* pLibInfo, SotStorage* pCurStorage, sal_Bool bInfosOnly = sal_False );
+ sal_Bool ImpLoadLibrary( BasicLibInfo* pLibInfo ) const;
+ sal_Bool ImpLoadLibrary( BasicLibInfo* pLibInfo, SotStorage* pCurStorage, sal_Bool bInfosOnly = sal_False );
void ImpCreateStdLib( StarBASIC* pParentFromStdLib );
void ImpMgrNotLoaded( const String& rStorageName );
BasicLibInfo* CreateLibInfo();
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index 733e469..62fde97 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -749,7 +749,7 @@ void BasicManager::SetLibraryContainerInfo( const LibraryContainerInfo& rInfo )
StarBASIC* pLib = pBasLibInfo->GetLib();
if( !pLib )
{
- sal_Bool bLoaded = ImpLoadLibary( pBasLibInfo, NULL, sal_False );
+ sal_Bool bLoaded = ImpLoadLibrary( pBasLibInfo, NULL, sal_False );
if( bLoaded )
pLib = pBasLibInfo->GetLib();
}
@@ -900,7 +900,7 @@ void BasicManager::LoadBasicManager( SotStorage& rStorage, const String& rBaseUR
if ( bLoadLibs && pInfo->DoLoad() &&
( ( !pInfo->IsExtern() ) || ( pInfo->IsReference() ) ) )
{
- ImpLoadLibary( pInfo, &rStorage );
+ ImpLoadLibrary( pInfo, &rStorage );
}
}
@@ -1044,7 +1044,7 @@ BasicLibInfo* BasicManager::CreateLibInfo()
return pInf;
}
-sal_Bool BasicManager::ImpLoadLibary( BasicLibInfo* pLibInfo, SotStorage* pCurStorage, sal_Bool bInfosOnly )
+sal_Bool BasicManager::ImpLoadLibrary( BasicLibInfo* pLibInfo, SotStorage* pCurStorage, sal_Bool bInfosOnly )
{
DBG_CHKTHIS( BasicManager, 0 );
@@ -1235,14 +1235,14 @@ StarBASIC* BasicManager::AddLib( SotStorage& rStorage, const String& rLibName, s
aNewLibName += '_';
BasicLibInfo* pLibInfo = CreateLibInfo();
- // Use original name otherwise ImpLoadLibary failes...
+ // Use original name otherwise ImpLoadLibrary failes...
pLibInfo->SetLibName( rLibName );
// but doesn't work this way if name exists twice
sal_uInt16 nLibId = (sal_uInt16) pLibs->GetPos( pLibInfo );
// Set StorageName before load because it is compared with pCurStorage
pLibInfo->SetStorageName( aStorageName );
- sal_Bool bLoaded = ImpLoadLibary( pLibInfo, &rStorage );
+ sal_Bool bLoaded = ImpLoadLibrary( pLibInfo, &rStorage );
if ( bLoaded )
{
@@ -1480,7 +1480,7 @@ sal_Bool BasicManager::LoadLib( sal_uInt16 nLib )
}
else
{
- bDone = ImpLoadLibary( pLibInfo, NULL, sal_False );
+ bDone = ImpLoadLibrary( pLibInfo, NULL, sal_False );
StarBASIC* pLib = GetLib( nLib );
if ( pLib )
{
More information about the Libreoffice-commits
mailing list