summaryrefslogtreecommitdiff
path: root/basic
diff options
context:
space:
mode:
authordanielt998 <daniel@fearnley.net>2016-02-11 22:07:09 +0000
committerAshod Nakashian <ashod.nakashian@collabora.co.uk>2016-07-20 01:25:59 -0400
commit953ebe9618074d6a11022d7a94bd1909d20da003 (patch)
tree3f9a58a2eea8d384f8684cefc1970cf68394325f /basic
parentef5c4957959d7c0ad9b7bf8cedfae85e7fd77cde (diff)
tdf#95857 Sort out German plurals ...
Made a start in removing the incorrect 'Infos' German plural Reviewed-on: https://gerrit.libreoffice.org/22301 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> (cherry picked from commit 2b31daf74e33b988c849cb26e88fa7657a4015af) Change-Id: Ie989351a7473fc35b563e63ce6a4fb229093af60
Diffstat (limited to 'basic')
-rw-r--r--basic/source/classes/sbunoobj.cxx4
-rw-r--r--basic/source/inc/scriptcont.hxx2
-rw-r--r--basic/source/uno/scriptcont.cxx10
3 files changed, 8 insertions, 8 deletions
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index d58e28a3d518..d653720269e6 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -4055,10 +4055,10 @@ Any SAL_CALL InvocationToAllListenerMapper::invoke(const OUString& FunctionName,
sal_uInt32 nParamCount = aParamSeq.getLength();
if( nParamCount > 1 )
{
- const ParamInfo* pInfos = aParamSeq.getConstArray();
+ const ParamInfo* pInfo = aParamSeq.getConstArray();
for( sal_uInt32 i = 0 ; i < nParamCount ; i++ )
{
- if( pInfos[ i ].aMode != ParamMode_IN )
+ if( pInfo[ i ].aMode != ParamMode_IN )
{
bApproveFiring = true;
break;
diff --git a/basic/source/inc/scriptcont.hxx b/basic/source/inc/scriptcont.hxx
index 8913dc8dc71f..10256a2029d8 100644
--- a/basic/source/inc/scriptcont.hxx
+++ b/basic/source/inc/scriptcont.hxx
@@ -132,7 +132,7 @@ class SfxScriptLibrary : public SfxLibrary, public SfxScriptLibrary_BASE
bool mbLoadedSource;
bool mbLoadedBinary;
- ModuleInfoMap mModuleInfos;
+ ModuleInfoMap mModuleInfo;
// Provide modify state including resources
virtual bool isModified() override;
diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx
index a8fb044921f1..46cf1d61f6ca 100644
--- a/basic/source/uno/scriptcont.cxx
+++ b/basic/source/uno/scriptcont.cxx
@@ -1272,16 +1272,16 @@ script::ModuleInfo SAL_CALL SfxScriptLibrary::getModuleInfo( const OUString& Mod
{
throw NoSuchElementException();
}
- return mModuleInfos[ ModuleName ];
+ return mModuleInfo[ ModuleName ];
}
sal_Bool SAL_CALL SfxScriptLibrary::hasModuleInfo( const OUString& ModuleName )
throw (RuntimeException, std::exception)
{
bool bRes = false;
- ModuleInfoMap::iterator it = mModuleInfos.find( ModuleName );
+ ModuleInfoMap::iterator it = mModuleInfo.find( ModuleName );
- if ( it != mModuleInfos.end() )
+ if ( it != mModuleInfo.end() )
{
bRes = true;
}
@@ -1295,7 +1295,7 @@ void SAL_CALL SfxScriptLibrary::insertModuleInfo( const OUString& ModuleName, co
{
throw ElementExistException();
}
- mModuleInfos[ ModuleName ] = ModuleInfo;
+ mModuleInfo[ ModuleName ] = ModuleInfo;
}
void SAL_CALL SfxScriptLibrary::removeModuleInfo( const OUString& ModuleName )
@@ -1306,7 +1306,7 @@ void SAL_CALL SfxScriptLibrary::removeModuleInfo( const OUString& ModuleName )
{
throw NoSuchElementException();
}
- mModuleInfos.erase( mModuleInfos.find( ModuleName ) );
+ mModuleInfo.erase( mModuleInfo.find( ModuleName ) );
}
} // namespace basic