diff options
| -rw-r--r-- | desktop/source/app/dispatchwatcher.cxx | 1 | ||||
| -rw-r--r-- | desktop/source/deployment/gui/dp_gui_updatedata.hxx | 3 | ||||
| -rw-r--r-- | desktop/source/deployment/gui/dp_gui_updatedialog.cxx | 28 | ||||
| -rw-r--r-- | desktop/source/deployment/manager/dp_extensionmanager.hxx | 8 | ||||
| -rw-r--r-- | desktop/source/migration/migration_impl.hxx | 14 |
5 files changed, 12 insertions, 42 deletions
diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx index 3239f1270d99..67a6a144c576 100644 --- a/desktop/source/app/dispatchwatcher.cxx +++ b/desktop/source/app/dispatchwatcher.cxx @@ -82,7 +82,6 @@ struct DispatchHolder aURL( rURL ), xDispatch( rDispatch ) {} URL aURL; - OUString cwdUrl; Reference< XDispatch > xDispatch; }; diff --git a/desktop/source/deployment/gui/dp_gui_updatedata.hxx b/desktop/source/deployment/gui/dp_gui_updatedata.hxx index f49019234037..4391e680c2d8 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), m_bIgnored(false){}; + bIsShared(false), aInstalledPackage(aExt), aUpdateSource(nullptr), m_nID(0) {}; //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. @@ -72,7 +72,6 @@ struct UpdateData // ID to find this entry in the update listbox sal_uInt16 m_nID; - bool m_bIgnored; }; } diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx index eded3b3920cb..dd4fac0ff9c9 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx @@ -181,23 +181,17 @@ struct UpdateDialog::Index { Kind m_eKind; bool m_bIgnored; - sal_uInt16 m_nID; - sal_uInt16 m_nIndex; - OUString m_aName; - - Index( Kind theKind, sal_uInt16 nID, sal_uInt16 nIndex, const OUString &rName ); + sal_uInt16 m_nIndex; + OUString m_aName; + + Index( Kind theKind, sal_uInt16 nIndex, const OUString &rName ) : + m_eKind( theKind ), + m_bIgnored( false ), + m_nIndex( nIndex ), + m_aName( rName ) {} }; -UpdateDialog::Index::Index( Kind theKind, sal_uInt16 nID, sal_uInt16 nIndex, const OUString &rName ): - m_eKind( theKind ), - m_bIgnored( false ), - m_nID( nID ), - m_nIndex( nIndex ), - m_aName( rName ) -{} - - class UpdateDialog::Thread: public salhelper::Thread { @@ -738,7 +732,7 @@ void UpdateDialog::addEnabledUpdate( OUString const & name, dp_gui::UpdateData & data ) { sal_uInt16 nIndex = sal::static_int_cast< sal_uInt16 >( m_enabledUpdates.size() ); - UpdateDialog::Index *pEntry = new UpdateDialog::Index( ENABLED_UPDATE, m_nLastID, nIndex, name ); + UpdateDialog::Index *pEntry = new UpdateDialog::Index( ENABLED_UPDATE, nIndex, name ); data.m_nID = m_nLastID; m_nLastID += 1; @@ -764,7 +758,7 @@ void UpdateDialog::addEnabledUpdate( OUString const & name, 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, m_nLastID, nIndex, data.name ); + UpdateDialog::Index *pEntry = new UpdateDialog::Index( DISABLED_UPDATE, nIndex, data.name ); data.m_nID = m_nLastID; m_nLastID += 1; @@ -780,7 +774,7 @@ void UpdateDialog::addDisabledUpdate( UpdateDialog::DisabledUpdate & data ) 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, m_nLastID, nIndex, data.name ); + UpdateDialog::Index *pEntry = new UpdateDialog::Index( SPECIFIC_ERROR, nIndex, data.name ); data.m_nID = m_nLastID; m_nLastID += 1; diff --git a/desktop/source/deployment/manager/dp_extensionmanager.hxx b/desktop/source/deployment/manager/dp_extensionmanager.hxx index 6ec3ff4e6eaf..1d9e3be32f62 100644 --- a/desktop/source/deployment/manager/dp_extensionmanager.hxx +++ b/desktop/source/deployment/manager/dp_extensionmanager.hxx @@ -202,14 +202,6 @@ private: struct StrSyncRepository : public ::dp_misc::StaticResourceString< StrSyncRepository, RID_STR_SYNCHRONIZING_REPOSITORY> {}; - struct ExtensionInfos - { - OUString identifier; - OUString fileName; - OUString displayName; - OUString version; - }; - css::uno::Reference< css::uno::XComponentContext> m_xContext; css::uno::Reference<css::deployment::XPackageManagerFactory> m_xPackageManagerFactory; diff --git a/desktop/source/migration/migration_impl.hxx b/desktop/source/migration/migration_impl.hxx index d6c757aa6f1a..bb8a731217b5 100644 --- a/desktop/source/migration/migration_impl.hxx +++ b/desktop/source/migration/migration_impl.hxx @@ -137,20 +137,6 @@ struct MigrationItem typedef std::unordered_map< OUString, std::vector< MigrationItem >, OUStringHash, std::equal_to< OUString > > MigrationHashMap; -struct MigrationItemInfo -{ - OUString m_sResourceURL; - MigrationItem m_aMigrationItem; - - MigrationItemInfo(){} - - MigrationItemInfo(const OUString& sResourceURL, const MigrationItem& aMigrationItem) - : m_sResourceURL(sResourceURL), m_aMigrationItem(aMigrationItem) - { - } -}; - - /** information for the UI elements to be migrated for one module */ |