tdf#95857 Sort out German plurals ...

Made a start in removing the incorrect 'Infos' German plural

Change-Id: Ie989351a7473fc35b563e63ce6a4fb229093af60
Reviewed-on: https://gerrit.libreoffice.org/22301
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>

20 files changed, 80 insertions, 80 deletions

diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx
index e9feef8b856b..5758dec8c716 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -324,7 +324,7 @@ void Shell::onDocumentClosed( const ScriptDocument& _rDocument )
 
     // remove lib info
     if (ExtraData* pData = GetExtraData())
-        pData->GetLibInfos().RemoveInfoFor( _rDocument );
+        pData->GetLibInfo().RemoveInfoFor( _rDocument );
 
     if ( bSetCurLib )
         SetCurLib( ScriptDocument::getApplicationScriptDocument(), "Standard", true, false );
@@ -665,9 +665,9 @@ void Shell::UpdateWindows()
 
                 if ( !bProtected )
                 {
-                    LibInfos::Item const* pLibInfoItem = nullptr;
+                    LibInfo::Item const* pLibInfoItem = nullptr;
                     if (ExtraData* pData = GetExtraData())
-                        pLibInfoItem = pData->GetLibInfos().GetInfo(*doc, aLibName);
+                        pLibInfoItem = pData->GetLibInfo().GetInfo(*doc, aLibName);
 
                     // modules
                     if ( xModLibContainer.is() && xModLibContainer->hasByName( aLibName ) )
diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx
index 94b36025e914..f911713648ef 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -222,7 +222,7 @@ void BaseWindow::OnNewDocument ()
 void BaseWindow::InsertLibInfo () const
 {
     if (ExtraData* pData = GetExtraData())
-        pData->GetLibInfos().InsertInfo(m_aDocument, m_aLibName, m_aName, GetType());
+        pData->GetLibInfo().InsertInfo(m_aDocument, m_aLibName, m_aName, GetType());
 }
 
 bool BaseWindow::Is (
@@ -703,16 +703,16 @@ sal_uLong CalcLineCount( SvStream& rStream )
 }
 
 
-// LibInfos
+// LibInfo
 
 
-LibInfos::LibInfos ()
+LibInfo::LibInfo ()
 { }
 
-LibInfos::~LibInfos ()
+LibInfo::~LibInfo ()
 { }
 
-void LibInfos::InsertInfo (
+void LibInfo::InsertInfo (
     ScriptDocument const& rDocument,
     OUString const& rLibName,
     OUString const& rCurrentName,
@@ -724,7 +724,7 @@ void LibInfos::InsertInfo (
     m_aMap.insert(Map::value_type(aKey, Item(rCurrentName, eCurrentType)));
 }
 
-void LibInfos::RemoveInfoFor (ScriptDocument const& rDocument)
+void LibInfo::RemoveInfoFor (ScriptDocument const& rDocument)
 {
     Map::iterator it;
     for (it = m_aMap.begin(); it != m_aMap.end(); ++it)
@@ -734,7 +734,7 @@ void LibInfos::RemoveInfoFor (ScriptDocument const& rDocument)
         m_aMap.erase(it);
 }
 
-LibInfos::Item const* LibInfos::GetInfo (
+LibInfo::Item const* LibInfo::GetInfo (
     ScriptDocument const& rDocument, OUString const& rLibName
 )
 {
@@ -742,24 +742,24 @@ LibInfos::Item const* LibInfos::GetInfo (
     return it != m_aMap.end() ? &it->second : nullptr;
 }
 
-LibInfos::Key::Key (ScriptDocument const& rDocument, OUString const& rLibName) :
+LibInfo::Key::Key (ScriptDocument const& rDocument, OUString const& rLibName) :
     m_aDocument(rDocument), m_aLibName(rLibName)
 { }
 
-LibInfos::Key::~Key ()
+LibInfo::Key::~Key ()
 { }
 
-bool LibInfos::Key::operator == (Key const& rKey) const
+bool LibInfo::Key::operator == (Key const& rKey) const
 {
     return m_aDocument == rKey.m_aDocument && m_aLibName == rKey.m_aLibName;
 }
 
-size_t LibInfos::Key::Hash::operator () (Key const& rKey) const
+size_t LibInfo::Key::Hash::operator () (Key const& rKey) const
 {
     return rKey.m_aDocument.hashCode() + rKey.m_aLibName.hashCode();
 }
 
-LibInfos::Item::Item (
+LibInfo::Item::Item (
     OUString const& rCurrentName,
     ItemType eCurrentType
 ) :
@@ -767,7 +767,7 @@ LibInfos::Item::Item (
     m_eCurrentType(eCurrentType)
 { }
 
-LibInfos::Item::~Item ()
+LibInfo::Item::~Item ()
 { }
 
 bool QueryDel( const OUString& rName, const ResId& rId, vcl::Window* pParent )
diff --git a/basctl/source/basicide/iderdll2.hxx b/basctl/source/basicide/iderdll2.hxx
index d1f5d157682a..896a870030c1 100644
--- a/basctl/source/basicide/iderdll2.hxx
+++ b/basctl/source/basicide/iderdll2.hxx
@@ -37,7 +37,7 @@ class ExtraData
 private:
     std::unique_ptr<SvxSearchItem> pSearchItem;
 
-    LibInfos        aLibInfos;
+    LibInfo        aLibInfo;
 
     EntryDescriptor m_aLastEntryDesc;
 
@@ -54,7 +54,7 @@ public:
     ExtraData();
     ~ExtraData();
 
-    LibInfos&         GetLibInfos () { return aLibInfos; }
+    LibInfo&         GetLibInfo () { return aLibInfo; }
 
     EntryDescriptor&  GetLastEntryDescriptor () { return m_aLastEntryDesc; }
     void              SetLastEntryDescriptor (EntryDescriptor& rDesc) { m_aLastEntryDesc = rDesc; }
diff --git a/basctl/source/inc/bastypes.hxx b/basctl/source/inc/bastypes.hxx
index 8b1e06b4157b..9f1c0fa46fdf 100644
--- a/basctl/source/inc/bastypes.hxx
+++ b/basctl/source/inc/bastypes.hxx
@@ -237,13 +237,13 @@ public:
     virtual bool HasActiveEditor () const;
 };
 
-class LibInfos
+class LibInfo
 {
 public:
     class Item;
 public:
-    LibInfos ();
-    ~LibInfos ();
+    LibInfo ();
+    ~LibInfo ();
 public:
     void InsertInfo (ScriptDocument const&, OUString const& rLibName, OUString const& rCurrentName, ItemType eCurrentType);
     void RemoveInfoFor (ScriptDocument const&);
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index ef7ba198856a..4b41c39b6559 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -4052,10 +4052,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 0106ce7cc1a3..ef93b4a385a0 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 ab49180eeafd..ca57a71580eb 100644
--- a/basic/source/uno/scriptcont.cxx
+++ b/basic/source/uno/scriptcont.cxx
@@ -1260,16 +1260,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;
     }
@@ -1283,7 +1283,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 )
@@ -1294,7 +1294,7 @@ void SAL_CALL SfxScriptLibrary::removeModuleInfo( const OUString& ModuleName )
     {
         throw NoSuchElementException();
     }
-    mModuleInfos.erase( mModuleInfos.find( ModuleName ) );
+    mModuleInfo.erase( mModuleInfo.find( ModuleName ) );
 }
 
 }   // namespace basic
diff --git a/eventattacher/source/eventattacher.cxx b/eventattacher/source/eventattacher.cxx
index 562a46ce085b..8ca0c9fd9c18 100644
--- a/eventattacher/source/eventattacher.cxx
+++ b/eventattacher/source/eventattacher.cxx
@@ -146,10 +146,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/include/svx/svdedxv.hxx b/include/svx/svdedxv.hxx
index bf6676f82f1f..9ef93a14d382 100644
--- a/include/svx/svdedxv.hxx
+++ b/include/svx/svdedxv.hxx
@@ -276,8 +276,8 @@ public:
     static void ApplyFormatPaintBrushToText( SfxItemSet& rFormatSet, SdrTextObj& rTextObj, SdrText* pText, bool bNoCharacterFormats, bool bNoParagraphFormats );
 
 protected:
-    virtual void OnBeginPasteOrDrop( PasteOrDropInfos* pInfos );
-    virtual void OnEndPasteOrDrop( PasteOrDropInfos* pInfos );
+    virtual void OnBeginPasteOrDrop( PasteOrDropInfos* pInfo );
+    virtual void OnEndPasteOrDrop( PasteOrDropInfos* pInfo );
 
 };
 
diff --git a/sd/source/ui/inc/OutlineView.hxx b/sd/source/ui/inc/OutlineView.hxx
index c45909f9711b..f309db41246e 100644
--- a/sd/source/ui/inc/OutlineView.hxx
+++ b/sd/source/ui/inc/OutlineView.hxx
@@ -151,8 +151,8 @@ public:
     void UpdateParagraph( sal_Int32 nPara );
 
 protected:
-    virtual void OnBeginPasteOrDrop( PasteOrDropInfos* pInfos ) override;
-    virtual void OnEndPasteOrDrop( PasteOrDropInfos* pInfos ) override;
+    virtual void OnBeginPasteOrDrop( PasteOrDropInfos* pInfo ) override;
+    virtual void OnEndPasteOrDrop( PasteOrDropInfos* pInfo ) override;
 
 private:
     /** call this method before you do anything that can modify the outliner
diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx
index 662679e146d7..dc4893a7f30e 100644
--- a/sd/source/ui/inc/View.hxx
+++ b/sd/source/ui/inc/View.hxx
@@ -242,8 +242,8 @@ protected:
     DECL_LINK_TYPED( OnParagraphInsertedHdl, ::Outliner *, void );
     DECL_LINK_TYPED( OnParagraphRemovingHdl, ::Outliner *, void );
 
-    virtual void OnBeginPasteOrDrop( PasteOrDropInfos* pInfos ) override;
-    virtual void OnEndPasteOrDrop( PasteOrDropInfos* pInfos ) override;
+    virtual void OnBeginPasteOrDrop( PasteOrDropInfos* pInfo ) override;
+    virtual void OnEndPasteOrDrop( PasteOrDropInfos* pInfo ) override;
 
     SdDrawDocument&         mrDoc;
     DrawDocShell*           mpDocSh;
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index 0e6a8de22d80..3e1f12c38b90 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -1723,18 +1723,18 @@ void OutlineView::UpdateParagraph( sal_Int32 nPara )
     mrOutliner.SetParaAttribs( nPara, aNewAttrs2 );
 }
 
-void OutlineView::OnBeginPasteOrDrop( PasteOrDropInfos* /*pInfos*/ )
+void OutlineView::OnBeginPasteOrDrop( PasteOrDropInfos* /*pInfo*/ )
 {
 }
 
 /** this is called after a paste or drop operation, make sure that the newly inserted paragraphs
     get the correct style sheet and new slides are inserted. */
-void OutlineView::OnEndPasteOrDrop( PasteOrDropInfos* pInfos )
+void OutlineView::OnEndPasteOrDrop( PasteOrDropInfos* pInfo )
 {
     SdPage* pPage = nullptr;
     SfxStyleSheetBasePool* pStylePool = GetDoc().GetStyleSheetPool();
 
-    for( sal_Int32 nPara = pInfos->nStartPara; nPara <= pInfos->nEndPara; nPara++ )
+    for( sal_Int32 nPara = pInfo->nStartPara; nPara <= pInfo->nEndPara; nPara++ )
     {
         Paragraph* pPara = mrOutliner.GetParagraph( nPara );
 
@@ -1754,7 +1754,7 @@ void OutlineView::OnEndPasteOrDrop( PasteOrDropInfos* pInfos )
         if( !pPara )
             continue; // fatality!?
 
-        if( bPage && (nPara != pInfos->nStartPara) )
+        if( bPage && (nPara != pInfo->nStartPara) )
         {
             // insert new slide for this paragraph
             pPage = InsertSlideForParagraph( pPara );
diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx
index 482ad6135812..c569d19bee33 100644
--- a/sd/source/ui/view/sdview.cxx
+++ b/sd/source/ui/view/sdview.cxx
@@ -1185,13 +1185,13 @@ void View::CheckPossibilities()
     maSmartTags.CheckPossibilities();
 }
 
-void View::OnBeginPasteOrDrop( PasteOrDropInfos* /*pInfos*/ )
+void View::OnBeginPasteOrDrop( PasteOrDropInfos* /*pInfo*/ )
 {
 }
 
 /** this is called after a paste or drop operation, make sure that the newly inserted paragraphs
     get the correct style sheet. */
-void View::OnEndPasteOrDrop( PasteOrDropInfos* pInfos )
+void View::OnEndPasteOrDrop( PasteOrDropInfos* pInfo )
 {
     /* Style Sheet handling */
     SdrTextObj* pTextObj = dynamic_cast< SdrTextObj* >( GetTextEditObject() );
@@ -1214,7 +1214,7 @@ void View::OnEndPasteOrDrop( PasteOrDropInfos* pInfos )
             // new paragraph, depending on the paragraph depth
             SfxStyleSheetBasePool* pStylePool = GetDoc().GetStyleSheetPool();
 
-            for ( sal_Int32 nPara = pInfos->nStartPara; nPara <= pInfos->nEndPara; nPara++ )
+            for ( sal_Int32 nPara = pInfo->nStartPara; nPara <= pInfo->nEndPara; nPara++ )
             {
                 sal_Int16 nDepth = pOutliner->GetDepth( nPara );
 
@@ -1238,7 +1238,7 @@ void View::OnEndPasteOrDrop( PasteOrDropInfos* pInfos )
         else
         {
             // just put the object style on each new paragraph
-            for ( sal_Int32 nPara = pInfos->nStartPara; nPara <= pInfos->nEndPara; nPara++ )
+            for ( sal_Int32 nPara = pInfo->nStartPara; nPara <= pInfo->nEndPara; nPara++ )
             {
                 pOutliner->SetStyleSheet( nPara, pStyleSheet );
             }
diff --git a/stoc/source/invocation/invocation.cxx b/stoc/source/invocation/invocation.cxx
index 5d57fd6ff83b..9f2c4c0fc06d 100644
--- a/stoc/source/invocation/invocation.cxx
+++ b/stoc/source/invocation/invocation.cxx
@@ -972,7 +972,7 @@ void Invocation_Impl::fillInfoForMethod
     sal_Int32 nParamCount = aParamInfos.getLength();
     if( nParamCount > 0 )
     {
-        const ParamInfo* pInfos = aParamInfos.getConstArray();
+        const ParamInfo* pInfo = aParamInfos.getConstArray();
 
         rInfo.aParamTypes.realloc( nParamCount );
         Type* pParamTypes = rInfo.aParamTypes.getArray();
@@ -981,10 +981,10 @@ void Invocation_Impl::fillInfoForMethod
 
         for( sal_Int32 i = 0 ; i < nParamCount ; i++ )
         {
-            Reference< XIdlClass > xParamClass = pInfos[i].aType;
+            Reference< XIdlClass > xParamClass = pInfo[i].aType;
             Type aParamType( xParamClass->getTypeClass(), xParamClass->getName() );
             pParamTypes[ i ] = aParamType;
-            pParamModes[ i ] = pInfos[i].aMode;
+            pParamModes[ i ] = pInfo[i].aMode;
         }
     }
 }
diff --git a/svl/source/items/itempool.cxx b/svl/source/items/itempool.cxx
index 424d35e90d35..ca03fb863f31 100644
--- a/svl/source/items/itempool.cxx
+++ b/svl/source/items/itempool.cxx
@@ -38,9 +38,9 @@
 
 static void
 lcl_CheckSlots2(std::map<sal_uInt16, sal_uInt16> & rSlotMap,
-        SfxItemPool const& rPool, SfxItemInfo const* pInfos)
+        SfxItemPool const& rPool, SfxItemInfo const* pInfo)
 {
-    if (!pInfos)
+    if (!pInfo)
         return; // may not be initialized yet
     if (rPool.GetName() == "EditEngineItemPool")
         return; // HACK: this one has loads of duplicates already, ignore it :(
@@ -48,7 +48,7 @@ lcl_CheckSlots2(std::map<sal_uInt16, sal_uInt16> & rSlotMap,
     sal_uInt16 const nCount(rPool.GetLastWhich() - rPool.GetFirstWhich() + 1);
     for (sal_uInt16 n = 0; n < nCount; ++n)
     {
-        sal_uInt16 const nSlotId(pInfos[n]._nSID);
+        sal_uInt16 const nSlotId(pInfo[n]._nSID);
         if (nSlotId != 0
             && nSlotId != 10883  // preexisting duplicate SID_ATTR_GRAF_CROP
             && nSlotId != 10023  // preexisting duplicate SID_ATTR_BORDER_INNER
@@ -166,13 +166,13 @@ SfxItemPool::SfxItemPool
     const OUString&     rName,          /* Pool name to identify in the file format */
     sal_uInt16          nStartWhich,    /* First WhichId of the Pool */
     sal_uInt16          nEndWhich,      /* Last WhichId of the Pool */
-    const SfxItemInfo*  pInfos,         /* SID Map and Item flags */
+    const SfxItemInfo*  pInfo,         /* SID Map and Item flags */
     SfxPoolItem**       pDefaults,      /* Pointer to static Defaults;
                                            is directly referenced by the Pool,
                                            but no transfer of ownership */
     bool                bLoadRefCounts  /* Load RefCounts or set to 1? */
 ) :
-    pItemInfos(pInfos),
+    pItemInfos(pInfo),
     pImp( new SfxItemPool_Impl( this, rName, nStartWhich, nEndWhich ) )
 {
     pImp->eDefMetric = SFX_MAPUNIT_TWIP;
@@ -441,9 +441,9 @@ void SfxItemPool::SetSecondaryPool( SfxItemPool *pPool )
     CHECK_SLOTS();
 }
 
-void SfxItemPool::SetItemInfos(SfxItemInfo const*const pInfos)
+void SfxItemPool::SetItemInfos(SfxItemInfo const*const pInfo)
 {
-    pItemInfos = pInfos;
+    pItemInfos = pInfo;
     CHECK_SLOTS();
 }
 
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index f9a3d7a039a3..f32a7980c83f 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -1988,14 +1988,14 @@ void SdrObjEditView::MarkListHasChanged()
     }
 }
 
-IMPL_LINK_TYPED( SdrObjEditView, EndPasteOrDropHdl, PasteOrDropInfos*, pInfos, void )
+IMPL_LINK_TYPED( SdrObjEditView, EndPasteOrDropHdl, PasteOrDropInfos*, pInfo, void )
 {
-    OnEndPasteOrDrop( pInfos );
+    OnEndPasteOrDrop( pInfo );
 }
 
-IMPL_LINK_TYPED( SdrObjEditView, BeginPasteOrDropHdl, PasteOrDropInfos*, pInfos, void )
+IMPL_LINK_TYPED( SdrObjEditView, BeginPasteOrDropHdl, PasteOrDropInfos*, pInfo, void )
 {
-    OnBeginPasteOrDrop( pInfos );
+    OnBeginPasteOrDrop( pInfo );
 }
 
 void SdrObjEditView::OnBeginPasteOrDrop( PasteOrDropInfos* )
diff --git a/toolkit/source/helper/property.cxx b/toolkit/source/helper/property.cxx
index ca81a1e5b850..9e8b544db346 100644
--- a/toolkit/source/helper/property.cxx
+++ b/toolkit/source/helper/property.cxx
@@ -311,8 +311,8 @@ void ImplAssertValidPropertyArray()
     if( !bSorted )
     {
         sal_uInt16 nElements;
-        ImplPropertyInfo* pInfos = ImplGetPropertyInfos( nElements );
-        ::std::sort(pInfos, pInfos+nElements,ImplPropertyInfoCompareFunctor());
+        ImplPropertyInfo* pInfo = ImplGetPropertyInfos( nElements );
+        ::std::sort(pInfo, pInfo+nElements,ImplPropertyInfoCompareFunctor());
         bSorted = true;
     }
 }
@@ -322,14 +322,14 @@ sal_uInt16 GetPropertyId( const OUString& rPropertyName )
     ImplAssertValidPropertyArray();
 
     sal_uInt16 nElements;
-    ImplPropertyInfo* pInfos = ImplGetPropertyInfos( nElements );
-    ImplPropertyInfo* pInf = ::std::lower_bound(pInfos,pInfos+nElements,rPropertyName,ImplPropertyInfoCompareFunctor());
+    ImplPropertyInfo* pInfo = ImplGetPropertyInfos( nElements );
+    ImplPropertyInfo* pInf = ::std::lower_bound(pInfo,pInfo+nElements,rPropertyName,ImplPropertyInfoCompareFunctor());
 /*
         (ImplPropertyInfo*)
-                                bsearch( &aSearch, pInfos, nElements, sizeof( ImplPropertyInfo ), ImplPropertyInfoCompare );
+                                bsearch( &aSearch, pInfo, nElements, sizeof( ImplPropertyInfo ), ImplPropertyInfoCompare );
 */
 
-    return ( pInf && pInf != (pInfos+nElements) && pInf->aName == rPropertyName) ? pInf->nPropId: 0;
+    return ( pInf && pInf != (pInfo+nElements) && pInf->aName == rPropertyName) ? pInf->nPropId: 0;
 }
 
 const ImplPropertyInfo* ImplGetImplPropertyInfo( sal_uInt16 nPropertyId )
@@ -337,12 +337,12 @@ const ImplPropertyInfo* ImplGetImplPropertyInfo( sal_uInt16 nPropertyId )
     ImplAssertValidPropertyArray();
 
     sal_uInt16 nElements;
-    ImplPropertyInfo* pInfos = ImplGetPropertyInfos( nElements );
+    ImplPropertyInfo* pInfo = ImplGetPropertyInfos( nElements );
     sal_uInt16 n;
-    for ( n = 0; n < nElements && pInfos[n].nPropId != nPropertyId; ++n)
+    for ( n = 0; n < nElements && pInfo[n].nPropId != nPropertyId; ++n)
         ;
 
-    return (n < nElements) ? &pInfos[n] : nullptr;
+    return (n < nElements) ? &pInfo[n] : nullptr;
 }
 
 sal_uInt16 GetPropertyOrderNr( sal_uInt16 nPropertyId )
@@ -350,10 +350,10 @@ sal_uInt16 GetPropertyOrderNr( sal_uInt16 nPropertyId )
     ImplAssertValidPropertyArray();
 
     sal_uInt16 nElements;
-    ImplPropertyInfo* pInfos = ImplGetPropertyInfos( nElements );
+    ImplPropertyInfo* pInfo = ImplGetPropertyInfos( nElements );
     for ( sal_uInt16 n = nElements; n; )
     {
-        if ( pInfos[--n].nPropId == nPropertyId )
+        if ( pInfo[--n].nPropId == nPropertyId )
             return n;
     }
     return 0xFFFF;
diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx
index fb0a5dc1bd34..49a9b3e6d5d9 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -1190,10 +1190,10 @@ void OpenGLContext::initGLWindow(Visual* pVisual)
         XVisualInfo aTemplate;
         aTemplate.visualid = XVisualIDFromVisual( pVisual );
         int nVisuals = 0;
-        XVisualInfo* pInfos = XGetVisualInfo( m_aGLWin.dpy, VisualIDMask, &aTemplate, &nVisuals );
+        XVisualInfo* pInfo = XGetVisualInfo( m_aGLWin.dpy, VisualIDMask, &aTemplate, &nVisuals );
         if( nVisuals != 1 )
             SAL_WARN( "vcl.opengl", "match count for visual id is not 1" );
-        m_aGLWin.vi = pInfos;
+        m_aGLWin.vi = pInfo;
     }
 
     // Check multisample support
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index 8f8f92ed7bd7..dcc92d3cc090 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -136,16 +136,16 @@ static bool sal_GetVisualInfo( Display *pDisplay, XID nVID, XVisualInfo &rVI )
 {
     int         nInfos;
     XVisualInfo aTemplate;
-    XVisualInfo*pInfos;
+    XVisualInfo*pInfo;
 
     aTemplate.visualid = nVID;
 
-    pInfos = XGetVisualInfo( pDisplay, VisualIDMask, &aTemplate, &nInfos );
-    if( !pInfos )
+    pInfo = XGetVisualInfo( pDisplay, VisualIDMask, &aTemplate, &nInfos );
+    if( !pInfo )
         return false;
 
-    rVI = *pInfos;
-    XFree( pInfos );
+    rVI = *pInfo;
+    XFree( pInfo );
 
     DBG_ASSERT( rVI.visualid == nVID,
                 "sal_GetVisualInfo: could not get correct visual by visualId" );
diff --git a/vcl/unx/generic/window/salobj.cxx b/vcl/unx/generic/window/salobj.cxx
index 3622aae2f144..d2809f11d466 100644
--- a/vcl/unx/generic/window/salobj.cxx
+++ b/vcl/unx/generic/window/salobj.cxx
@@ -77,11 +77,11 @@ X11SalObject* X11SalObject::CreateObject( SalFrame* pParent, SystemWindowData* p
     XVisualInfo aTemplate;
     aTemplate.visualid = aVisID;
     int nVisuals = 0;
-    XVisualInfo* pInfos = XGetVisualInfo( pDisp, VisualIDMask, &aTemplate, &nVisuals );
+    XVisualInfo* pInfo = XGetVisualInfo( pDisp, VisualIDMask, &aTemplate, &nVisuals );
     // only one VisualInfo structure can match the visual id
     DBG_ASSERT( nVisuals == 1, "match count for visual id is not 1" );
-    unsigned int nDepth     = pInfos->depth;
-    XFree( pInfos );
+    unsigned int nDepth     = pInfo->depth;
+    XFree( pInfo );
     XSetWindowAttributes aAttribs;
     aAttribs.event_mask =   StructureNotifyMask
                           | ButtonPressMask