dbaccess/source/ui/browser/unodatbr.cxx | 12 +++++++-----
dbaccess/source/ui/inc/unodatbr.hxx | 5 ++---
2 files changed, 9 insertions(+), 8 deletions(-)
New commits:
commit cb889f72116250ffcb874a4c950efe3b6972f541
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Sep 20 11:44:50 2021 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Tue Sep 21 10:08:15 2021 +0200
Related: tdf#136442 implAppendEntry is always passed a DBTreeListUserData*
Change-Id: Idb51b28a52d79476c2897a318314d6267727e9e9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122353
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx
b/dbaccess/source/ui/browser/unodatbr.cxx
index 685db87d432e..3d0fd95acc43 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -1183,7 +1183,7 @@ std::unique_ptr<weld::TreeIter>
SbaTableQueryBrowser::getObjectEntry(const OUStr
{
pEntryData->eType =
etQueryContainer;
}
- implAppendEntry(xObject.get(), sPath,
pEntryData, pEntryData->eType);
+ implAppendEntry(xObject.get(), sPath,
pEntryData);
}
}
}
@@ -2107,7 +2107,7 @@ void SbaTableQueryBrowser::populateTree(const
Reference<XNameAccess>& _xNameAcce
if ( xChild.is() )
pEntryData->eType = etQueryContainer;
}
- implAppendEntry(&rParent, rName, pEntryData,
pEntryData->eType);
+ implAppendEntry(&rParent, rName, pEntryData);
}
}
}
@@ -2119,8 +2119,10 @@ void SbaTableQueryBrowser::populateTree(const
Reference<XNameAccess>& _xNameAcce
rTreeView.make_sorted();
}
-std::unique_ptr<weld::TreeIter> SbaTableQueryBrowser::implAppendEntry(const
weld::TreeIter* pParent, const OUString& rName, void* pUserData, EntryType
eEntryType)
+std::unique_ptr<weld::TreeIter> SbaTableQueryBrowser::implAppendEntry(const
weld::TreeIter* pParent, const OUString& rName, DBTreeListUserData* pUserData)
{
+ EntryType eEntryType = pUserData->eType;
+
std::unique_ptr<ImageProvider>
xImageProvider(getImageProviderFor(pParent));
OUString aImage = xImageProvider->getImageId(rName,
getDatabaseObjectType(eEntryType));
@@ -2776,7 +2778,7 @@ void SAL_CALL SbaTableQueryBrowser::elementInserted(const
ContainerEvent& rEvent
}
pNewData->eType = etQuery;
}
- implAppendEntry(xEntry.get(),
::comphelper::getString(rEvent.Accessor), pNewData, pNewData->eType);
+ implAppendEntry(xEntry.get(),
::comphelper::getString(rEvent.Accessor), pNewData);
rTreeView.make_sorted();
}
@@ -2878,7 +2880,7 @@ void SAL_CALL SbaTableQueryBrowser::elementReplaced(
const ContainerEvent& _rEve
if ( etTableOrView == pData->eType )
{
// only insert userdata when we have a table because the
query is only a commanddefinition object and not a query
- _rEvent.Element >>= pData->xObjectProperties; //
remember the new element
+ _rEvent.Element >>= pData->xObjectProperties; // remember
the new element
}
else
{
diff --git a/dbaccess/source/ui/inc/unodatbr.hxx
b/dbaccess/source/ui/inc/unodatbr.hxx
index 637f173da20e..7899fed5fec6 100644
--- a/dbaccess/source/ui/inc/unodatbr.hxx
+++ b/dbaccess/source/ui/inc/unodatbr.hxx
@@ -46,6 +46,7 @@ namespace com::sun::star::container { class XNameContainer; }
namespace dbaui
{
struct DBTreeEditedEntry;
+ struct DBTreeListUserData;
class ImageProvider;
typedef ::cppu::ImplHelper5 < css::frame::XStatusListener
@@ -354,9 +355,7 @@ namespace dbaui
std::unique_ptr<weld::TreeIter> implAppendEntry(
const weld::TreeIter* pParent,
const OUString& rName,
- void* pUserData,
- EntryType eEntryType
- );
+ DBTreeListUserData* pUserData);
/// loads the grid control with the data object specified (which may
be a table, a query or a command)
bool implLoadAnything(const OUString& _rDataSourceName, const
OUString& _rCommand,
