diff options
author | danielt998 <daniel@fearnley.net> | 2016-02-11 22:07:09 +0000 |
---|---|---|
committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2016-02-12 15:29:25 +0000 |
commit | 2b31daf74e33b988c849cb26e88fa7657a4015af (patch) | |
tree | b4385985063c60b7900c63a1a229ef5165dbc12d /basctl/source | |
parent | 662406b44d16c713c3d42585b57caf46689980f0 (diff) |
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>
Diffstat (limited to 'basctl/source')
-rw-r--r-- | basctl/source/basicide/basidesh.cxx | 6 | ||||
-rw-r--r-- | basctl/source/basicide/bastypes.cxx | 26 | ||||
-rw-r--r-- | basctl/source/basicide/iderdll2.hxx | 4 | ||||
-rw-r--r-- | basctl/source/inc/bastypes.hxx | 6 |
4 files changed, 21 insertions, 21 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&); |