loplugin:unusedfields in cui..idl

Change-Id: Icb393cc0b2f79ded154e186ab6975b95e5126903
Reviewed-on: https://gerrit.libreoffice.org/39496
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

17 files changed, 25 insertions, 130 deletions

diff --git a/compilerplugins/clang/unusedfields.writeonly.results b/compilerplugins/clang/unusedfields.writeonly.results
index 1cce206b57af..99a5e9411a05 100644
--- a/compilerplugins/clang/unusedfields.writeonly.results
+++ b/compilerplugins/clang/unusedfields.writeonly.results
@@ -242,14 +242,10 @@ cppuhelper/source/access_control.cxx:80
     cppu::(anonymous namespace)::permission m_str1 rtl_uString *
 cppuhelper/source/access_control.cxx:81
     cppu::(anonymous namespace)::permission m_str2 rtl_uString *
-cui/source/inc/cuicharmap.hxx:83
-    SvxCharacterMap bOne _Bool
 cui/source/inc/cuihyperdlg.hxx:47
     SvxHlinkCtrl aRdOnlyForwarder class SfxStatusForwarder
 cui/source/inc/cuihyperdlg.hxx:67
     SvxHpLinkDlg maCtrl class SvxHlinkCtrl
-cui/source/inc/scriptdlg.hxx:115
-    SFEntry nType sal_uInt8
 dbaccess/source/core/dataaccess/documentdefinition.cxx:289
     dbaccess::LifetimeCoupler m_xClient Reference<class com::sun::star::uno::XInterface>
 dbaccess/source/sdbtools/connection/connectiondependent.hxx:116
@@ -260,24 +256,10 @@ dbaccess/source/sdbtools/connection/objectnames.hxx:44
     sdbtools::ObjectNames m_aModuleClient class sdbtools::SdbtClient
 dbaccess/source/sdbtools/connection/tablename.cxx:56
     sdbtools::TableName_Impl m_aModuleClient class sdbtools::SdbtClient
-dbaccess/source/ui/inc/TypeInfo.hxx:87
-    dbaui::OTypeInfo bCaseSensitive _Bool
-dbaccess/source/ui/inc/TypeInfo.hxx:88
-    dbaui::OTypeInfo bUnsigned _Bool
 dbaccess/source/ui/misc/dbaundomanager.cxx:137
     dbaui::UndoManagerMethodGuard m_aGuard ::osl::ResettableMutexGuard
-dbaccess/source/ui/querydesign/QTableConnectionData.hxx:35
-    dbaui::OQueryTableConnectionData m_eFromType enum dbaui::ETableFieldType
-dbaccess/source/ui/querydesign/QTableConnectionData.hxx:36
-    dbaui::OQueryTableConnectionData m_eDestType enum dbaui::ETableFieldType
 desktop/qa/desktop_lib/test_desktop_lib.cxx:174
     DesktopLOKTest m_bModified _Bool
-desktop/source/deployment/gui/dp_gui_updatedata.hxx:74
-    dp_gui::UpdateData m_nID sal_uInt16
-desktop/source/deployment/gui/dp_gui_updatedialog.cxx:152
-    dp_gui::UpdateDialog::DisabledUpdate m_nID sal_uInt16
-desktop/source/deployment/gui/dp_gui_updatedialog.cxx:158
-    dp_gui::UpdateDialog::SpecificError m_nID sal_uInt16
 desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx:120
     dp_gui::UpdateCommandEnv m_installThread ::rtl::Reference<UpdateInstallDialog::Thread>
 desktop/unx/source/splashx.c:369
@@ -906,8 +888,6 @@ hwpfilter/source/hwpfile.h:264
     HWPFile info_block_len int
 hwpfilter/source/lexer.cxx:141
     yy_buffer_state yy_at_bol int
-idl/inc/database.hxx:103
-    SvIdlDataBase aIFaceName class rtl::OString
 include/basic/basmgr.hxx:52
     BasicError nReason enum BasicErrorReason
 include/basic/sbxvar.hxx:67
diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx
index 58438b0fa913..ad088cfa30e1 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -51,9 +51,8 @@ using namespace css;
 
 // class SvxCharacterMap =================================================
 
-SvxCharacterMap::SvxCharacterMap( vcl::Window* pParent, bool bOne_, const SfxItemSet* pSet )
+SvxCharacterMap::SvxCharacterMap( vcl::Window* pParent, const SfxItemSet* pSet )
     : SfxModalDialog(pParent, "SpecialCharactersDialog", "cui/ui/specialcharacters.ui")
-    , bOne( bOne_ )
     , pSubsetMap( nullptr )
     , mxContext(comphelper::getProcessComponentContext())
 {
@@ -91,10 +90,6 @@ SvxCharacterMap::SvxCharacterMap( vcl::Window* pParent, bool bOne_, const SfxIte
     get( m_pRecentCharView[14], "viewchar15" );
     get( m_pRecentCharView[15], "viewchar16" );
 
-    const SfxBoolItem* pItem = SfxItemSet::GetItem<SfxBoolItem>(pSet, FN_PARAM_1, false);
-    if ( pItem )
-        bOne = pItem->GetValue();
-
     init();
 
     const SfxInt32Item* pCharItem = SfxItemSet::GetItem<SfxInt32Item>(pSet, SID_ATTR_CHAR, false);
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index be35fb37e545..1e3860d71456 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -238,7 +238,7 @@ void SFTreeListBox::Init( const OUString& language  )
             getLangNodeFromRootNode( children[ n ], lang );
 
         insertEntry( uiName, app ? OUStringLiteral(RID_CUIBMP_HARDDISK) : OUStringLiteral(RID_CUIBMP_DOC),
-            nullptr, true, o3tl::make_unique< SFEntry >( OBJTYPE_SFROOT, langEntries, xDocumentModel ), factoryURL );
+            nullptr, true, o3tl::make_unique< SFEntry >( langEntries, xDocumentModel ), factoryURL );
     }
 
     SetUpdateMode( true );
@@ -319,11 +319,11 @@ void SFTreeListBox:: RequestSubEntries( SvTreeListEntry* pRootEntry, Reference<
         OUString name( children[ n ]->getName() );
         if (  children[ n ]->getType() !=  browse::BrowseNodeTypes::SCRIPT)
         {
-            insertEntry(name, RID_CUIBMP_LIB, pRootEntry, true, o3tl::make_unique< SFEntry >( OBJTYPE_SCRIPTCONTAINER, children[ n ],model));
+            insertEntry(name, RID_CUIBMP_LIB, pRootEntry, true, o3tl::make_unique< SFEntry >( children[ n ],model));
         }
         else
         {
-            insertEntry(name, RID_CUIBMP_MACRO, pRootEntry, false, o3tl::make_unique< SFEntry >( OBJTYPE_METHOD, children[ n ],model));
+            insertEntry(name, RID_CUIBMP_MACRO, pRootEntry, false, o3tl::make_unique< SFEntry >( children[ n ],model));
         }
     }
 }
@@ -951,12 +951,12 @@ void SvxScriptOrgDialog::createEntry( SvTreeListEntry* pEntry )
         if ( aChildNode->getType() == browse::BrowseNodeTypes::SCRIPT )
         {
             pNewEntry = m_pScriptsBox->insertEntry( aChildName,
-                    RID_CUIBMP_MACRO, pEntry, false, o3tl::make_unique< SFEntry >( OBJTYPE_METHOD, aChildNode,xDocumentModel ) );
+                    RID_CUIBMP_MACRO, pEntry, false, o3tl::make_unique< SFEntry >( aChildNode,xDocumentModel ) );
         }
         else
         {
             pNewEntry = m_pScriptsBox->insertEntry( aChildName,
-                RID_CUIBMP_LIB, pEntry, false, o3tl::make_unique< SFEntry >( OBJTYPE_SCRIPTCONTAINER, aChildNode,xDocumentModel ) );
+                RID_CUIBMP_LIB, pEntry, false, o3tl::make_unique< SFEntry >( aChildNode,xDocumentModel ) );
 
             // If the Parent is not loaded then set to
             // loaded, this will prevent RequestingChildren ( called
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index cf945c40f955..3c1287180cae 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -1232,7 +1232,7 @@ VclPtr<SfxAbstractDialog> AbstractDialogFactory_Impl::CreateSfxDialog( vcl::Wind
             pDlg = VclPtr<SfxMacroAssignDlg>::Create( pParent, _rxDocumentFrame, rAttr );
             break;
         case RID_SVXDLG_CHARMAP :
-            pDlg = VclPtr<SvxCharacterMap>::Create( pParent, true, &rAttr );
+            pDlg = VclPtr<SvxCharacterMap>::Create( pParent, &rAttr );
             break;
         default:
             break;
diff --git a/cui/source/inc/cuicharmap.hxx b/cui/source/inc/cuicharmap.hxx
index 4f1a63f5ec71..f3618bc9d51e 100644
--- a/cui/source/inc/cuicharmap.hxx
+++ b/cui/source/inc/cuicharmap.hxx
@@ -80,7 +80,6 @@ private:
     VclPtr<Edit>           m_pDecimalCodeText;
     VclPtr<SvxCharView>    m_pRecentCharView[16];
     vcl::Font       aFont;
-    bool            bOne;
     const SubsetMap* pSubsetMap;
 
     std::deque<OUString> maRecentCharList;
@@ -106,7 +105,7 @@ private:
     void selectCharByCode(Radix radix);
 
 public:
-                    SvxCharacterMap( vcl::Window* pParent, bool bOne=true, const SfxItemSet* pSet=nullptr );
+                    SvxCharacterMap( vcl::Window* pParent, const SfxItemSet* pSet=nullptr );
     virtual         ~SvxCharacterMap() override;
     virtual short Execute() override;
     virtual void    dispose() override;
diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx
index 15189d447568..0fdc0fd1e202 100644
--- a/cui/source/inc/scriptdlg.hxx
+++ b/cui/source/inc/scriptdlg.hxx
@@ -112,15 +112,13 @@ public:
 class SFEntry final
 {
 private:
-    sal_uInt8       nType;
     bool            loaded;
-        css::uno::Reference< css::script::browse::XBrowseNode > nodes;
-        css::uno::Reference< css::frame::XModel > model;
+    css::uno::Reference< css::script::browse::XBrowseNode > nodes;
+    css::uno::Reference< css::frame::XModel > model;
 public:
-                    SFEntry( sal_uInt8 nT,
-                            const css::uno::Reference< css::script::browse::XBrowseNode >& entryNodes ,
-                            const css::uno::Reference< css::frame::XModel >& entryModel) { nType = nT; nodes = entryNodes; loaded=false; model = entryModel; }
-                    SFEntry( const SFEntry& r ) { nType = r.nType; nodes = r.nodes; loaded = r.loaded; }
+                    SFEntry( const css::uno::Reference< css::script::browse::XBrowseNode >& entryNodes ,
+                             const css::uno::Reference< css::frame::XModel >& entryModel) { nodes = entryNodes; loaded=false; model = entryModel; }
+                    SFEntry( const SFEntry& r ) { nodes = r.nodes; loaded = r.loaded; }
     const css::uno::Reference< css::script::browse::XBrowseNode >& GetNode() { return nodes ;}
     const css::uno::Reference< css::frame::XModel >& GetModel() { return model ;};
     bool            isLoaded() const                    { return loaded; }
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index e4037f7c0ae1..0c7713894636 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -2057,7 +2057,7 @@ IMPL_LINK( OfaQuoteTabPage, QuoteHdl, Button*, pBtn, void )
     else if (pBtn == m_pDblEndQuotePB)
         nMode = DBL_END;
     // start character selection dialog
-    ScopedVclPtrInstance< SvxCharacterMap > pMap( this, true );
+    ScopedVclPtrInstance< SvxCharacterMap > pMap( this );
     pMap->SetCharFont( OutputDevice::GetDefaultFont(DefaultFontType::LATIN_TEXT,
                         LANGUAGE_ENGLISH_US, GetDefaultFontFlags::OnlyOne ));
     pMap->SetText(nMode < SGL_END ? CuiResId(RID_SVXSTR_STARTQUOTE)  : CuiResId(RID_SVXSTR_ENDQUOTE) );
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 8d4da92cedf5..f8c3f4de8738 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -2075,7 +2075,7 @@ IMPL_LINK_NOARG(SvxNumOptionsTabPage, PopupActivateHdl_Impl, MenuButton *, void)
 
 IMPL_LINK_NOARG(SvxNumOptionsTabPage, BulletHdl_Impl, Button*, void)
 {
-    VclPtrInstance< SvxCharacterMap > pMap( this, true );
+    VclPtrInstance< SvxCharacterMap > pMap( this );
 
     sal_uInt16 nMask = 1;
     const vcl::Font* pFmtFont = nullptr;
diff --git a/dbaccess/source/ui/inc/TypeInfo.hxx b/dbaccess/source/ui/inc/TypeInfo.hxx
index 66eb7df7d712..a7dc3f75091c 100644
--- a/dbaccess/source/ui/inc/TypeInfo.hxx
+++ b/dbaccess/source/ui/inc/TypeInfo.hxx
@@ -81,11 +81,9 @@ const sal_uInt16 TYPE_BIT       = 31;
 
         sal_Int16       nSearchType;    // if it is possible to search for type
 
-        bool        bCurrency       : 1,    // currency
+        bool            bCurrency       : 1,    // currency
                         bAutoIncrement  : 1,    // if automatic incrementing field
-                        bNullable       : 1,    // if field can be NULL
-                        bCaseSensitive  : 1,    // if type is case sensitive
-                        bUnsigned       : 1;    // if type is unsigned
+                        bNullable       : 1;    // if field can be NULL
 
         OTypeInfo()
                 :nPrecision(0)
@@ -97,8 +95,6 @@ const sal_uInt16 TYPE_BIT       = 31;
                 ,bCurrency(false)
                 ,bAutoIncrement(false)
                 ,bNullable(true)
-                ,bCaseSensitive(false)
-                ,bUnsigned(false)
         {}
         const OUString& getDBName() const { return aTypeName; }
 
diff --git a/dbaccess/source/ui/misc/DExport.cxx b/dbaccess/source/ui/misc/DExport.cxx
index 630421578240..45b514eed4d2 100644
--- a/dbaccess/source/ui/misc/DExport.cxx
+++ b/dbaccess/source/ui/misc/DExport.cxx
@@ -234,13 +234,13 @@ ODatabaseExport::ODatabaseExport(const SharedConnection& _rxConnection,
                 m_pTypeInfo->bNullable      = (sal_Int32)aValue == ColumnValue::NULLABLE;
                 ++nPos;
                 aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow);
-                m_pTypeInfo->bCaseSensitive = aValue;
+                // bCaseSensitive
                 ++nPos;
                 aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow);
                 m_pTypeInfo->nSearchType    = aValue;
                 ++nPos;
                 aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow);
-                m_pTypeInfo->bUnsigned      = aValue;
+                // bUnsigned
                 ++nPos;
                 aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow);
                 m_pTypeInfo->bCurrency      = aValue;
diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx
index 2149c6eb234d..23bbdaf58275 100644
--- a/dbaccess/source/ui/misc/UITools.cxx
+++ b/dbaccess/source/ui/misc/UITools.cxx
@@ -479,13 +479,13 @@ void fillTypeInfo(  const Reference< css::sdbc::XConnection>& _rxConnection,
             pInfo->bNullable        = (sal_Int32)aValue == ColumnValue::NULLABLE;
             ++nPos;
             aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow);
-            pInfo->bCaseSensitive   = (bool)aValue;
+            // bCaseSensitive
             ++nPos;
             aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow);
             pInfo->nSearchType      = aValue;
             ++nPos;
             aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow);
-            pInfo->bUnsigned        = (bool)aValue;
+            // bUnsigned
             ++nPos;
             aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow);
             pInfo->bCurrency        = (bool)aValue;
diff --git a/dbaccess/source/ui/querydesign/QTableConnectionData.cxx b/dbaccess/source/ui/querydesign/QTableConnectionData.cxx
index bfecb4906cde..d7e8ad467b9c 100644
--- a/dbaccess/source/ui/querydesign/QTableConnectionData.cxx
+++ b/dbaccess/source/ui/querydesign/QTableConnectionData.cxx
@@ -29,8 +29,6 @@ OQueryTableConnectionData::OQueryTableConnectionData()
     , m_nDestEntryIndex(0)
     , m_eJoinType (INNER_JOIN)
     , m_bNatural(false)
-    , m_eFromType(TAB_NORMAL_FIELD)
-    , m_eDestType(TAB_NORMAL_FIELD)
 {
 }
 
@@ -40,10 +38,7 @@ OQueryTableConnectionData::OQueryTableConnectionData( const OQueryTableConnectio
     , m_nDestEntryIndex(rConnData.m_nDestEntryIndex)
     , m_eJoinType(rConnData.m_eJoinType)
     , m_bNatural(rConnData.m_bNatural)
-    , m_eFromType(rConnData.m_eFromType)
-    , m_eDestType(rConnData.m_eDestType)
 {
-
 }
 
 OQueryTableConnectionData::OQueryTableConnectionData(const TTableWindowData::value_type& _pReferencingTable,
@@ -53,8 +48,6 @@ OQueryTableConnectionData::OQueryTableConnectionData(const TTableWindowData::val
     , m_nDestEntryIndex(0)
     , m_eJoinType (INNER_JOIN)
     , m_bNatural(false)
-    , m_eFromType(TAB_NORMAL_FIELD)
-    , m_eDestType(TAB_NORMAL_FIELD)
 {
 }
 
@@ -84,8 +77,6 @@ OQueryTableConnectionData& OQueryTableConnectionData::operator=(const OQueryTabl
     m_nFromEntryIndex = rConnData.m_nFromEntryIndex;
     m_nDestEntryIndex = rConnData.m_nDestEntryIndex;
 
-    m_eFromType = rConnData.m_eFromType;
-    m_eDestType = rConnData.m_eDestType;
     m_eJoinType = rConnData.m_eJoinType;
     m_bNatural  = rConnData.m_bNatural;
 
@@ -111,9 +102,6 @@ void OQueryTableConnectionData::InitFromDrag(const OTableFieldDescRef& rDragLeft
     SetFieldIndex(JTCS_FROM, rDragLeft->GetFieldIndex());
     SetFieldIndex(JTCS_TO, rDragRight->GetFieldIndex());
 
-    SetFieldType(JTCS_FROM, rDragLeft->GetFieldType());
-    SetFieldType(JTCS_TO, rDragRight->GetFieldType());
-
     AppendConnLine(rDragLeft->GetField(), rDragRight->GetField());
 }
 
diff --git a/dbaccess/source/ui/querydesign/QTableConnectionData.hxx b/dbaccess/source/ui/querydesign/QTableConnectionData.hxx
index c7137eb5e81b..4ff60d1c3a03 100644
--- a/dbaccess/source/ui/querydesign/QTableConnectionData.hxx
+++ b/dbaccess/source/ui/querydesign/QTableConnectionData.hxx
@@ -32,9 +32,6 @@ namespace dbaui
         EJoinType       m_eJoinType;
         bool            m_bNatural;
 
-        ETableFieldType m_eFromType;
-        ETableFieldType m_eDestType;
-
     protected:
         // for creation and duplication of lines of own type
         virtual OConnectionLineDataRef CreateLineDataObj() override;
@@ -61,8 +58,6 @@ namespace dbaui
         sal_Int32       GetFieldIndex(EConnectionSide nWhich) const { return nWhich==JTCS_TO ? m_nDestEntryIndex : m_nFromEntryIndex; }
         void            SetFieldIndex(EConnectionSide nWhich, sal_Int32 nVal) { if (nWhich==JTCS_TO) m_nDestEntryIndex=nVal; else m_nFromEntryIndex=nVal; }
 
-        void            SetFieldType(EConnectionSide nWhich, ETableFieldType eType) { if (nWhich==JTCS_TO) m_eDestType=eType; else m_eFromType=eType; }
-
         void            InitFromDrag(const OTableFieldDescRef& rDragLeft, const OTableFieldDescRef& rDragRight);
 
         EJoinType       GetJoinType() const { return m_eJoinType; };
diff --git a/dbaccess/source/ui/querydesign/QueryTableView.cxx b/dbaccess/source/ui/querydesign/QueryTableView.cxx
index ce4ac928d7c8..4d84cd288de2 100644
--- a/dbaccess/source/ui/querydesign/QueryTableView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx
@@ -60,39 +60,6 @@ using namespace ::com::sun::star::accessibility;
 
 namespace
 {
-    bool isColumnInKeyType(const Reference<XIndexAccess>& _rxKeys,const OUString& _rColumnName,sal_Int32 _nKeyType)
-    {
-        bool bReturn = false;
-        if(_rxKeys.is())
-        {
-            Reference<XColumnsSupplier> xColumnsSupplier;
-            // search the one and only primary key
-            const sal_Int32 nCount = _rxKeys->getCount();
-            for(sal_Int32 i=0;i< nCount;++i)
-            {
-                Reference<XPropertySet> xProp(_rxKeys->getByIndex(i),UNO_QUERY);
-                if(xProp.is())
-                {
-                    sal_Int32 nKeyType = 0;
-                    xProp->getPropertyValue(PROPERTY_TYPE) >>= nKeyType;
-                    if(_nKeyType == nKeyType)
-                    {
-                        xColumnsSupplier.set(xProp,UNO_QUERY);
-                        if(xColumnsSupplier.is())
-                        {
-                            Reference<XNameAccess> xColumns = xColumnsSupplier->getColumns();
-                            if(xColumns.is() && xColumns->hasByName(_rColumnName))
-                            {
-                                bReturn = true;
-                                break;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        return bReturn;
-    }
     /** appends a new TabAdd Undo action at controller
         @param  _pView          the view which we use
         @param  _pUndoAction    the undo action which should be added
@@ -183,10 +150,7 @@ namespace
                 continue;
             }
 
-            pNewConnData->SetFieldType(JTCS_FROM,TAB_NORMAL_FIELD);
-
             xColumn->getPropertyValue(PROPERTY_RELATEDCOLUMN) >>= sRelatedColumn;
-            pNewConnData->SetFieldType(JTCS_TO,isColumnInKeyType(xReferencedKeys,sRelatedColumn,KeyType::PRIMARY) ? TAB_PRIMARY_FIELD : TAB_NORMAL_FIELD);
 
             {
                 Sequence< sal_Int16> aFind(::comphelper::findValue(_rSource.GetOriginalColumns()->getElementNames(),*pIter,true));
@@ -593,26 +557,17 @@ void OQueryTableView::AddConnection(const OJoinExchangeData& jxdSource, const OJ
         TTableConnectionData::value_type aNewConnectionData(pNewConnectionData);
 
         sal_uInt32          nSourceFieldIndex, nDestFieldIndex;
-        ETableFieldType eSourceFieldType, eDestFieldType;
 
-        // Get name/position/type of both affected fields ...
+        // Get name/position of both affected fields ...
         // Source
-
         nSourceFieldIndex = jxdSource.pListBox->GetModel()->GetAbsPos(jxdSource.pEntry);
-        eSourceFieldType = static_cast< OTableFieldInfo*>(jxdSource.pEntry->GetUserData())->GetKeyType();
-
         // Dest
-
         nDestFieldIndex = jxdDest.pListBox->GetModel()->GetAbsPos(jxdDest.pEntry);
-        eDestFieldType = static_cast< OTableFieldInfo*>(jxdDest.pEntry->GetUserData())->GetKeyType();
 
         // ... and set them
         pNewConnectionData->SetFieldIndex(JTCS_FROM, nSourceFieldIndex);
         pNewConnectionData->SetFieldIndex(JTCS_TO, nDestFieldIndex);
 
-        pNewConnectionData->SetFieldType(JTCS_FROM, eSourceFieldType);
-        pNewConnectionData->SetFieldType(JTCS_TO, eDestFieldType);
-
         pNewConnectionData->AppendConnLine( aSourceFieldName,aDestFieldName );
 
         ScopedVclPtrInstance< OQueryTableConnection > aNewConnection(this, aNewConnectionData);
diff --git a/desktop/source/deployment/gui/dp_gui_updatedata.hxx b/desktop/source/deployment/gui/dp_gui_updatedata.hxx
index 4391e680c2d8..1e2c9db47f8a 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedata.hxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedata.hxx
@@ -36,7 +36,7 @@ namespace dp_gui {
 struct UpdateData
 {
     explicit UpdateData( css::uno::Reference< css::deployment::XPackage > const & aExt):
-        bIsShared(false), aInstalledPackage(aExt), aUpdateSource(nullptr), m_nID(0) {};
+        bIsShared(false), aInstalledPackage(aExt), aUpdateSource(nullptr) {};
 
     //When entries added to the listbox then there can be one for the user update and one
     //for the shared update. However, both list entries will contain the same UpdateData.
@@ -67,11 +67,7 @@ struct UpdateData
     //The locale extension which is used as update for the user or shared repository.
     //If set then the data for the online update (aUpdateInfo, sLocalURL, sWebsiteURL)
     //are to be ignored.
-    css::uno::Reference< css::deployment::XPackage >
-    aUpdateSource;
-
-    // ID to find this entry in the update listbox
-    sal_uInt16  m_nID;
+    css::uno::Reference< css::deployment::XPackage >  aUpdateSource;
 };
 }
 
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
index a3d40f08f28d..fe328d10f5b3 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
@@ -149,20 +149,18 @@ struct UpdateDialog::DisabledUpdate {
     uno::Sequence< OUString > unsatisfiedDependencies;
     // We also want to show release notes and publisher for disabled updates
     css::uno::Reference< css::xml::dom::XNode > aUpdateInfo;
-    sal_uInt16                m_nID;
 };
 
 struct UpdateDialog::SpecificError {
     OUString name;
     OUString message;
-    sal_uInt16 m_nID;
 };
 
 
 struct UpdateDialog::IgnoredUpdate {
     OUString sExtensionID;
     OUString sVersion;
-    bool          bRemoved;
+    bool     bRemoved;
 
     IgnoredUpdate( const OUString &rExtensionID, const OUString &rVersion );
 };
@@ -727,7 +725,6 @@ void UpdateDialog::addEnabledUpdate( OUString const & name,
     sal_uInt16 nIndex = sal::static_int_cast< sal_uInt16 >( m_enabledUpdates.size() );
     UpdateDialog::Index *pEntry = new UpdateDialog::Index( ENABLED_UPDATE, nIndex, name );
 
-    data.m_nID = m_nLastID;
     m_nLastID += 1;
 
     m_enabledUpdates.push_back( data );
@@ -753,7 +750,6 @@ void UpdateDialog::addDisabledUpdate( UpdateDialog::DisabledUpdate & data )
     sal_uInt16 nIndex = sal::static_int_cast< sal_uInt16 >( m_disabledUpdates.size() );
     UpdateDialog::Index *pEntry = new UpdateDialog::Index( DISABLED_UPDATE, nIndex, data.name );
 
-    data.m_nID = m_nLastID;
     m_nLastID += 1;
 
     m_disabledUpdates.push_back( data );
@@ -769,7 +765,6 @@ void UpdateDialog::addSpecificError( UpdateDialog::SpecificError & data )
     sal_uInt16 nIndex = sal::static_int_cast< sal_uInt16 >( m_specificErrors.size() );
     UpdateDialog::Index *pEntry = new UpdateDialog::Index( SPECIFIC_ERROR, nIndex, data.name );
 
-    data.m_nID = m_nLastID;
     m_nLastID += 1;
 
     m_specificErrors.push_back( data );
diff --git a/idl/inc/database.hxx b/idl/inc/database.hxx
index 0a9383cbc402..4444110b6172 100644
--- a/idl/inc/database.hxx
+++ b/idl/inc/database.hxx
@@ -86,7 +86,6 @@ protected:
     void WriteReset()
     {
         aUsedTypes.clear();
-        aIFaceName.clear();
     }
 public:
     OUString sSlotMapFile;
@@ -100,7 +99,6 @@ public:
 
     // list of used types while writing
     SvRefMemberList<SvMetaType *>    aUsedTypes;
-    OString                          aIFaceName;
 
     void                    StartNewFile( const OUString& rName );
     void                    SetExportFile( const OUString& rName )