mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tdf#95857 Sort out German plurals ...

Browse Source 
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>
This commit is contained in:
danielt998 2016-02-11 22:07:09 +00:00 committed by Samuel Mehrbrodt
parent 662406b44d
commit 2b31daf74e
20 changed files with 80 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
basctl/source/basicide/basidesh.cxx
View File

@ -324,7 +324,7 @@ void Shell::onDocumentClosed( const ScriptDocument& _rDocument )
// remove lib info // remove lib info
if (ExtraData* pData = GetExtraData()) if (ExtraData* pData = GetExtraData())
pData->GetLibInfos().RemoveInfoFor( _rDocument ); pData->GetLibInfo().RemoveInfoFor( _rDocument );
if ( bSetCurLib ) if ( bSetCurLib )
SetCurLib( ScriptDocument::getApplicationScriptDocument(), "Standard", true, false ); SetCurLib( ScriptDocument::getApplicationScriptDocument(), "Standard", true, false );
@ -665,9 +665,9 @@ void Shell::UpdateWindows()
if ( !bProtected ) if ( !bProtected )
{ {
LibInfos::Item const* pLibInfoItem = nullptr; LibInfo::Item const* pLibInfoItem = nullptr;
if (ExtraData* pData = GetExtraData()) if (ExtraData* pData = GetExtraData())
pLibInfoItem = pData->GetLibInfos().GetInfo(*doc, aLibName); pLibInfoItem = pData->GetLibInfo().GetInfo(*doc, aLibName);
// modules // modules
if ( xModLibContainer.is() && xModLibContainer->hasByName( aLibName ) ) if ( xModLibContainer.is() && xModLibContainer->hasByName( aLibName ) )

26
basctl/source/basicide/bastypes.cxx
View File

@ -222,7 +222,7 @@ void BaseWindow::OnNewDocument ()
void BaseWindow::InsertLibInfo () const void BaseWindow::InsertLibInfo () const
{ {
if (ExtraData* pData = GetExtraData()) 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 ( 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, ScriptDocument const& rDocument,
OUString const& rLibName, OUString const& rLibName,
OUString const& rCurrentName, OUString const& rCurrentName,
@ -724,7 +724,7 @@ void LibInfos::InsertInfo (
m_aMap.insert(Map::value_type(aKey, Item(rCurrentName, eCurrentType))); 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; Map::iterator it;
for (it = m_aMap.begin(); it != m_aMap.end(); ++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); m_aMap.erase(it);
} }
LibInfos::Item const* LibInfos::GetInfo ( LibInfo::Item const* LibInfo::GetInfo (
ScriptDocument const& rDocument, OUString const& rLibName ScriptDocument const& rDocument, OUString const& rLibName
) )
{ {
@ -742,24 +742,24 @@ LibInfos::Item const* LibInfos::GetInfo (
return it != m_aMap.end() ? &it->second : nullptr; 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) 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; 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(); return rKey.m_aDocument.hashCode() + rKey.m_aLibName.hashCode();
} }
LibInfos::Item::Item ( LibInfo::Item::Item (
OUString const& rCurrentName, OUString const& rCurrentName,
ItemType eCurrentType ItemType eCurrentType
) : ) :
@ -767,7 +767,7 @@ LibInfos::Item::Item (
m_eCurrentType(eCurrentType) m_eCurrentType(eCurrentType)
{ } { }
LibInfos::Item::~Item () LibInfo::Item::~Item ()
{ } { }
bool QueryDel( const OUString& rName, const ResId& rId, vcl::Window* pParent ) bool QueryDel( const OUString& rName, const ResId& rId, vcl::Window* pParent )

4
basctl/source/basicide/iderdll2.hxx
View File

@ -37,7 +37,7 @@ class ExtraData
private: private:
std::unique_ptr<SvxSearchItem> pSearchItem; std::unique_ptr<SvxSearchItem> pSearchItem;
LibInfos aLibInfos; LibInfo aLibInfo;
EntryDescriptor m_aLastEntryDesc; EntryDescriptor m_aLastEntryDesc;
@ -54,7 +54,7 @@ public:
ExtraData(); ExtraData();
~ExtraData(); ~ExtraData();
LibInfos& GetLibInfos () { return aLibInfos; } LibInfo& GetLibInfo () { return aLibInfo; }
EntryDescriptor& GetLastEntryDescriptor () { return m_aLastEntryDesc; } EntryDescriptor& GetLastEntryDescriptor () { return m_aLastEntryDesc; }
void SetLastEntryDescriptor (EntryDescriptor& rDesc) { m_aLastEntryDesc = rDesc; } void SetLastEntryDescriptor (EntryDescriptor& rDesc) { m_aLastEntryDesc = rDesc; }

6
basctl/source/inc/bastypes.hxx
View File

@ -237,13 +237,13 @@ public:
virtual bool HasActiveEditor () const; virtual bool HasActiveEditor () const;
}; };
class LibInfos class LibInfo
{ {
public: public:
class Item; class Item;
public: public:
LibInfos (); LibInfo ();
~LibInfos (); ~LibInfo ();
public: public:
void InsertInfo (ScriptDocument const&, OUString const& rLibName, OUString const& rCurrentName, ItemType eCurrentType); void InsertInfo (ScriptDocument const&, OUString const& rLibName, OUString const& rCurrentName, ItemType eCurrentType);
void RemoveInfoFor (ScriptDocument const&); void RemoveInfoFor (ScriptDocument const&);

4
basic/source/classes/sbunoobj.cxx
View File

@ -4052,10 +4052,10 @@ Any SAL_CALL InvocationToAllListenerMapper::invoke(const OUString& FunctionName,
sal_uInt32 nParamCount = aParamSeq.getLength(); sal_uInt32 nParamCount = aParamSeq.getLength();
if( nParamCount > 1 ) if( nParamCount > 1 )
{ {
const ParamInfo* pInfos = aParamSeq.getConstArray(); const ParamInfo* pInfo = aParamSeq.getConstArray();
for( sal_uInt32 i = 0 ; i < nParamCount ; i++ ) for( sal_uInt32 i = 0 ; i < nParamCount ; i++ )
{ {
if( pInfos[ i ].aMode != ParamMode_IN ) if( pInfo[ i ].aMode != ParamMode_IN )
{ {
bApproveFiring = true; bApproveFiring = true;
break; break;

2
basic/source/inc/scriptcont.hxx
View File

@ -132,7 +132,7 @@ class SfxScriptLibrary : public SfxLibrary, public SfxScriptLibrary_BASE
bool mbLoadedSource; bool mbLoadedSource;
bool mbLoadedBinary; bool mbLoadedBinary;
ModuleInfoMap mModuleInfos; ModuleInfoMap mModuleInfo;
// Provide modify state including resources // Provide modify state including resources
virtual bool isModified() override; virtual bool isModified() override;

10
basic/source/uno/scriptcont.cxx
View File

@ -1260,16 +1260,16 @@ script::ModuleInfo SAL_CALL SfxScriptLibrary::getModuleInfo( const OUString& Mod
{ {
throw NoSuchElementException(); throw NoSuchElementException();
} }
return mModuleInfos[ ModuleName ]; return mModuleInfo[ ModuleName ];
} }
sal_Bool SAL_CALL SfxScriptLibrary::hasModuleInfo( const OUString& ModuleName ) sal_Bool SAL_CALL SfxScriptLibrary::hasModuleInfo( const OUString& ModuleName )
throw (RuntimeException, std::exception) throw (RuntimeException, std::exception)
{ {
bool bRes = false; 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; bRes = true;
} }
@ -1283,7 +1283,7 @@ void SAL_CALL SfxScriptLibrary::insertModuleInfo( const OUString& ModuleName, co
{ {
throw ElementExistException(); throw ElementExistException();
} }
mModuleInfos[ ModuleName ] = ModuleInfo; mModuleInfo[ ModuleName ] = ModuleInfo;
} }
void SAL_CALL SfxScriptLibrary::removeModuleInfo( const OUString& ModuleName ) void SAL_CALL SfxScriptLibrary::removeModuleInfo( const OUString& ModuleName )
@ -1294,7 +1294,7 @@ void SAL_CALL SfxScriptLibrary::removeModuleInfo( const OUString& ModuleName )
{ {
throw NoSuchElementException(); throw NoSuchElementException();
} }
mModuleInfos.erase( mModuleInfos.find( ModuleName ) ); mModuleInfo.erase( mModuleInfo.find( ModuleName ) );
} }
} // namespace basic } // namespace basic

4
eventattacher/source/eventattacher.cxx
View File

@ -146,10 +146,10 @@ Any SAL_CALL InvocationToAllListenerMapper::invoke(const OUString& FunctionName,
sal_uInt32 nParamCount = aParamSeq.getLength(); sal_uInt32 nParamCount = aParamSeq.getLength();
if( nParamCount > 1 ) if( nParamCount > 1 )
{ {
const ParamInfo* pInfos = aParamSeq.getConstArray(); const ParamInfo* pInfo = aParamSeq.getConstArray();
for( sal_uInt32 i = 0 ; i < nParamCount ; i++ ) for( sal_uInt32 i = 0 ; i < nParamCount ; i++ )
{ {
if( pInfos[ i ].aMode != ParamMode_IN ) if( pInfo[ i ].aMode != ParamMode_IN )
{ {
bApproveFiring = true; bApproveFiring = true;
break; break;

4
include/svx/svdedxv.hxx
View File

@ -276,8 +276,8 @@ public:
static void ApplyFormatPaintBrushToText( SfxItemSet& rFormatSet, SdrTextObj& rTextObj, SdrText* pText, bool bNoCharacterFormats, bool bNoParagraphFormats ); static void ApplyFormatPaintBrushToText( SfxItemSet& rFormatSet, SdrTextObj& rTextObj, SdrText* pText, bool bNoCharacterFormats, bool bNoParagraphFormats );
protected: protected:
virtual void OnBeginPasteOrDrop( PasteOrDropInfos* pInfos ); virtual void OnBeginPasteOrDrop( PasteOrDropInfos* pInfo );
virtual void OnEndPasteOrDrop( PasteOrDropInfos* pInfos ); virtual void OnEndPasteOrDrop( PasteOrDropInfos* pInfo );
}; };

4
sd/source/ui/inc/OutlineView.hxx
View File

@ -151,8 +151,8 @@ public:
void UpdateParagraph( sal_Int32 nPara ); void UpdateParagraph( sal_Int32 nPara );
protected: protected:
virtual void OnBeginPasteOrDrop( PasteOrDropInfos* pInfos ) override; virtual void OnBeginPasteOrDrop( PasteOrDropInfos* pInfo ) override;
virtual void OnEndPasteOrDrop( PasteOrDropInfos* pInfos ) override; virtual void OnEndPasteOrDrop( PasteOrDropInfos* pInfo ) override;
private: private:
/** call this method before you do anything that can modify the outliner /** call this method before you do anything that can modify the outliner

4
sd/source/ui/inc/View.hxx
View File

@ -242,8 +242,8 @@ protected:
DECL_LINK_TYPED( OnParagraphInsertedHdl, ::Outliner *, void ); DECL_LINK_TYPED( OnParagraphInsertedHdl, ::Outliner *, void );
DECL_LINK_TYPED( OnParagraphRemovingHdl, ::Outliner *, void ); DECL_LINK_TYPED( OnParagraphRemovingHdl, ::Outliner *, void );
virtual void OnBeginPasteOrDrop( PasteOrDropInfos* pInfos ) override; virtual void OnBeginPasteOrDrop( PasteOrDropInfos* pInfo ) override;
virtual void OnEndPasteOrDrop( PasteOrDropInfos* pInfos ) override; virtual void OnEndPasteOrDrop( PasteOrDropInfos* pInfo ) override;
SdDrawDocument& mrDoc; SdDrawDocument& mrDoc;
DrawDocShell* mpDocSh; DrawDocShell* mpDocSh;

8
sd/source/ui/view/outlview.cxx
View File

@ -1723,18 +1723,18 @@ void OutlineView::UpdateParagraph( sal_Int32 nPara )
mrOutliner.SetParaAttribs( nPara, aNewAttrs2 ); 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 /** 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. */ get the correct style sheet and new slides are inserted. */
void OutlineView::OnEndPasteOrDrop( PasteOrDropInfos* pInfos ) void OutlineView::OnEndPasteOrDrop( PasteOrDropInfos* pInfo )
{ {
SdPage* pPage = nullptr; SdPage* pPage = nullptr;
SfxStyleSheetBasePool* pStylePool = GetDoc().GetStyleSheetPool(); 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 ); Paragraph* pPara = mrOutliner.GetParagraph( nPara );
@ -1754,7 +1754,7 @@ void OutlineView::OnEndPasteOrDrop( PasteOrDropInfos* pInfos )
if( !pPara ) if( !pPara )
continue; // fatality!? continue; // fatality!?
if( bPage && (nPara != pInfos->nStartPara) ) if( bPage && (nPara != pInfo->nStartPara) )
{ {
// insert new slide for this paragraph // insert new slide for this paragraph
pPage = InsertSlideForParagraph( pPara ); pPage = InsertSlideForParagraph( pPara );

8
sd/source/ui/view/sdview.cxx
View File

@ -1185,13 +1185,13 @@ void View::CheckPossibilities()
maSmartTags.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 /** this is called after a paste or drop operation, make sure that the newly inserted paragraphs
get the correct style sheet. */ get the correct style sheet. */
void View::OnEndPasteOrDrop( PasteOrDropInfos* pInfos ) void View::OnEndPasteOrDrop( PasteOrDropInfos* pInfo )
{ {
/* Style Sheet handling */ /* Style Sheet handling */
SdrTextObj* pTextObj = dynamic_cast< SdrTextObj* >( GetTextEditObject() ); SdrTextObj* pTextObj = dynamic_cast< SdrTextObj* >( GetTextEditObject() );
@ -1214,7 +1214,7 @@ void View::OnEndPasteOrDrop( PasteOrDropInfos* pInfos )
// new paragraph, depending on the paragraph depth // new paragraph, depending on the paragraph depth
SfxStyleSheetBasePool* pStylePool = GetDoc().GetStyleSheetPool(); 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 ); sal_Int16 nDepth = pOutliner->GetDepth( nPara );
@ -1238,7 +1238,7 @@ void View::OnEndPasteOrDrop( PasteOrDropInfos* pInfos )
else else
{ {
// just put the object style on each new paragraph // 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 ); pOutliner->SetStyleSheet( nPara, pStyleSheet );
} }

6
stoc/source/invocation/invocation.cxx
View File

@ -972,7 +972,7 @@ void Invocation_Impl::fillInfoForMethod
sal_Int32 nParamCount = aParamInfos.getLength(); sal_Int32 nParamCount = aParamInfos.getLength();
if( nParamCount > 0 ) if( nParamCount > 0 )
{ {
const ParamInfo* pInfos = aParamInfos.getConstArray(); const ParamInfo* pInfo = aParamInfos.getConstArray();
rInfo.aParamTypes.realloc( nParamCount ); rInfo.aParamTypes.realloc( nParamCount );
Type* pParamTypes = rInfo.aParamTypes.getArray(); Type* pParamTypes = rInfo.aParamTypes.getArray();
@ -981,10 +981,10 @@ void Invocation_Impl::fillInfoForMethod
for( sal_Int32 i = 0 ; i < nParamCount ; i++ ) 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() ); Type aParamType( xParamClass->getTypeClass(), xParamClass->getName() );
pParamTypes[ i ] = aParamType; pParamTypes[ i ] = aParamType;
pParamModes[ i ] = pInfos[i].aMode; pParamModes[ i ] = pInfo[i].aMode;
} }
} }
} }

14
svl/source/items/itempool.cxx
View File

@ -38,9 +38,9 @@
static void static void
lcl_CheckSlots2(std::map<sal_uInt16, sal_uInt16> & rSlotMap, 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 return; // may not be initialized yet
if (rPool.GetName() == "EditEngineItemPool") if (rPool.GetName() == "EditEngineItemPool")
return; // HACK: this one has loads of duplicates already, ignore it :( 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); sal_uInt16 const nCount(rPool.GetLastWhich() - rPool.GetFirstWhich() + 1);
for (sal_uInt16 n = 0; n < nCount; ++n) 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 if (nSlotId != 0
&& nSlotId != 10883 // preexisting duplicate SID_ATTR_GRAF_CROP && nSlotId != 10883 // preexisting duplicate SID_ATTR_GRAF_CROP
&& nSlotId != 10023 // preexisting duplicate SID_ATTR_BORDER_INNER && 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 */ const OUString& rName, /* Pool name to identify in the file format */
sal_uInt16 nStartWhich, /* First WhichId of the Pool */ sal_uInt16 nStartWhich, /* First WhichId of the Pool */
sal_uInt16 nEndWhich, /* Last 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; SfxPoolItem** pDefaults, /* Pointer to static Defaults;
is directly referenced by the Pool, is directly referenced by the Pool,
but no transfer of ownership */ but no transfer of ownership */
bool bLoadRefCounts /* Load RefCounts or set to 1? */ bool bLoadRefCounts /* Load RefCounts or set to 1? */
) : ) :
pItemInfos(pInfos), pItemInfos(pInfo),
pImp( new SfxItemPool_Impl( this, rName, nStartWhich, nEndWhich ) ) pImp( new SfxItemPool_Impl( this, rName, nStartWhich, nEndWhich ) )
{ {
pImp->eDefMetric = SFX_MAPUNIT_TWIP; pImp->eDefMetric = SFX_MAPUNIT_TWIP;
@ -441,9 +441,9 @@ void SfxItemPool::SetSecondaryPool( SfxItemPool *pPool )
CHECK_SLOTS(); CHECK_SLOTS();
} }
void SfxItemPool::SetItemInfos(SfxItemInfo const*const pInfos) void SfxItemPool::SetItemInfos(SfxItemInfo const*const pInfo)
{ {
pItemInfos = pInfos; pItemInfos = pInfo;
CHECK_SLOTS(); CHECK_SLOTS();
} }

8
svx/source/svdraw/svdedxv.cxx
View File

@ -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* ) void SdrObjEditView::OnBeginPasteOrDrop( PasteOrDropInfos* )

22
toolkit/source/helper/property.cxx
View File

@ -311,8 +311,8 @@ void ImplAssertValidPropertyArray()
if( !bSorted ) if( !bSorted )
{ {
sal_uInt16 nElements; sal_uInt16 nElements;
ImplPropertyInfo* pInfos = ImplGetPropertyInfos( nElements ); ImplPropertyInfo* pInfo = ImplGetPropertyInfos( nElements );
::std::sort(pInfos, pInfos+nElements,ImplPropertyInfoCompareFunctor()); ::std::sort(pInfo, pInfo+nElements,ImplPropertyInfoCompareFunctor());
bSorted = true; bSorted = true;
} }
} }
@ -322,14 +322,14 @@ sal_uInt16 GetPropertyId( const OUString& rPropertyName )
ImplAssertValidPropertyArray(); ImplAssertValidPropertyArray();
sal_uInt16 nElements; sal_uInt16 nElements;
ImplPropertyInfo* pInfos = ImplGetPropertyInfos( nElements ); ImplPropertyInfo* pInfo = ImplGetPropertyInfos( nElements );
ImplPropertyInfo* pInf = ::std::lower_bound(pInfos,pInfos+nElements,rPropertyName,ImplPropertyInfoCompareFunctor()); ImplPropertyInfo* pInf = ::std::lower_bound(pInfo,pInfo+nElements,rPropertyName,ImplPropertyInfoCompareFunctor());
/* /*
(ImplPropertyInfo*) (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 ) const ImplPropertyInfo* ImplGetImplPropertyInfo( sal_uInt16 nPropertyId )
@ -337,12 +337,12 @@ const ImplPropertyInfo* ImplGetImplPropertyInfo( sal_uInt16 nPropertyId )
ImplAssertValidPropertyArray(); ImplAssertValidPropertyArray();
sal_uInt16 nElements; sal_uInt16 nElements;
ImplPropertyInfo* pInfos = ImplGetPropertyInfos( nElements ); ImplPropertyInfo* pInfo = ImplGetPropertyInfos( nElements );
sal_uInt16 n; 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 ) sal_uInt16 GetPropertyOrderNr( sal_uInt16 nPropertyId )
@ -350,10 +350,10 @@ sal_uInt16 GetPropertyOrderNr( sal_uInt16 nPropertyId )
ImplAssertValidPropertyArray(); ImplAssertValidPropertyArray();
sal_uInt16 nElements; sal_uInt16 nElements;
ImplPropertyInfo* pInfos = ImplGetPropertyInfos( nElements ); ImplPropertyInfo* pInfo = ImplGetPropertyInfos( nElements );
for ( sal_uInt16 n = nElements; n; ) for ( sal_uInt16 n = nElements; n; )
{ {
if ( pInfos[--n].nPropId == nPropertyId ) if ( pInfo[--n].nPropId == nPropertyId )
return n; return n;
} }
return 0xFFFF; return 0xFFFF;

4
vcl/source/opengl/OpenGLContext.cxx
View File

@ -1190,10 +1190,10 @@ void OpenGLContext::initGLWindow(Visual* pVisual)
XVisualInfo aTemplate; XVisualInfo aTemplate;
aTemplate.visualid = XVisualIDFromVisual( pVisual ); aTemplate.visualid = XVisualIDFromVisual( pVisual );
int nVisuals = 0; int nVisuals = 0;
XVisualInfo* pInfos = XGetVisualInfo( m_aGLWin.dpy, VisualIDMask, &aTemplate, &nVisuals ); XVisualInfo* pInfo = XGetVisualInfo( m_aGLWin.dpy, VisualIDMask, &aTemplate, &nVisuals );
if( nVisuals != 1 ) if( nVisuals != 1 )
SAL_WARN( "vcl.opengl", "match count for visual id is not 1" ); SAL_WARN( "vcl.opengl", "match count for visual id is not 1" );
m_aGLWin.vi = pInfos; m_aGLWin.vi = pInfo;
} }
// Check multisample support // Check multisample support

10
vcl/unx/generic/app/saldisp.cxx
View File

@ -136,16 +136,16 @@ static bool sal_GetVisualInfo( Display *pDisplay, XID nVID, XVisualInfo &rVI )
{ {
int nInfos; int nInfos;
XVisualInfo aTemplate; XVisualInfo aTemplate;
XVisualInfo*pInfos; XVisualInfo*pInfo;
aTemplate.visualid = nVID; aTemplate.visualid = nVID;
pInfos = XGetVisualInfo( pDisplay, VisualIDMask, &aTemplate, &nInfos ); pInfo = XGetVisualInfo( pDisplay, VisualIDMask, &aTemplate, &nInfos );
if( !pInfos ) if( !pInfo )
return false; return false;
rVI = *pInfos; rVI = *pInfo;
XFree( pInfos ); XFree( pInfo );
DBG_ASSERT( rVI.visualid == nVID, DBG_ASSERT( rVI.visualid == nVID,
"sal_GetVisualInfo: could not get correct visual by visualId" ); "sal_GetVisualInfo: could not get correct visual by visualId" );

6
vcl/unx/generic/window/salobj.cxx
View File

@ -77,11 +77,11 @@ X11SalObject* X11SalObject::CreateObject( SalFrame* pParent, SystemWindowData* p
XVisualInfo aTemplate; XVisualInfo aTemplate;
aTemplate.visualid = aVisID; aTemplate.visualid = aVisID;
int nVisuals = 0; 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 // only one VisualInfo structure can match the visual id
DBG_ASSERT( nVisuals == 1, "match count for visual id is not 1" ); DBG_ASSERT( nVisuals == 1, "match count for visual id is not 1" );
unsigned int nDepth = pInfos->depth; unsigned int nDepth = pInfo->depth;
XFree( pInfos ); XFree( pInfo );
XSetWindowAttributes aAttribs; XSetWindowAttributes aAttribs;
aAttribs.event_mask = StructureNotifyMask aAttribs.event_mask = StructureNotifyMask
| ButtonPressMask | ButtonPressMask