desktop/source/app/dispatchwatcher.cxx | 1 desktop/source/deployment/gui/dp_gui_updatedata.hxx | 3 - desktop/source/deployment/gui/dp_gui_updatedialog.cxx | 28 +++++--------- desktop/source/deployment/manager/dp_extensionmanager.hxx | 8 ---- desktop/source/migration/migration_impl.hxx | 14 ------- extensions/source/abpilot/admininvokationpage.cxx | 1 extensions/source/abpilot/admininvokationpage.hxx | 2 - extensions/source/dbpilots/groupboxwiz.hxx | 1 extensions/source/plugin/inc/plugin/unx/plugcon.hxx | 1 extensions/source/plugin/unx/plugcon.cxx | 1 extensions/source/plugin/unx/unxmgr.cxx | 10 +---- 11 files changed, 14 insertions(+), 56 deletions(-)
New commits: commit e3990370f832c8a69d1b6b22ec315dc0616d5535 Author: Noel Grandin <n...@peralex.com> Date: Fri Nov 20 14:21:57 2015 +0200 loplugin:unusedfields extensions Change-Id: I7cee47eca35b02472639cdd267ddd450145803de diff --git a/extensions/source/abpilot/admininvokationpage.cxx b/extensions/source/abpilot/admininvokationpage.cxx index f8af951..35b73eb 100644 --- a/extensions/source/abpilot/admininvokationpage.cxx +++ b/extensions/source/abpilot/admininvokationpage.cxx @@ -27,7 +27,6 @@ namespace abp AdminDialogInvokationPage::AdminDialogInvokationPage( OAddessBookSourcePilot* _pParent ) : AddressBookSourcePage(_pParent, "InvokeAdminPage", "modules/sabpilot/ui/invokeadminpage.ui") - , m_bSuccessfullyExecutedDialog(false) { get(m_pInvokeAdminDialog, "settings"); get(m_pErrorMessage, "warning"); diff --git a/extensions/source/abpilot/admininvokationpage.hxx b/extensions/source/abpilot/admininvokationpage.hxx index 5308357..bfbc6b2 100644 --- a/extensions/source/abpilot/admininvokationpage.hxx +++ b/extensions/source/abpilot/admininvokationpage.hxx @@ -31,8 +31,6 @@ namespace abp VclPtr<PushButton> m_pInvokeAdminDialog; VclPtr<FixedText> m_pErrorMessage; - bool m_bSuccessfullyExecutedDialog; - public: explicit AdminDialogInvokationPage(OAddessBookSourcePilot* _pParent); virtual ~AdminDialogInvokationPage(); diff --git a/extensions/source/dbpilots/groupboxwiz.hxx b/extensions/source/dbpilots/groupboxwiz.hxx index ba90a5f..2c3262d 100644 --- a/extensions/source/dbpilots/groupboxwiz.hxx +++ b/extensions/source/dbpilots/groupboxwiz.hxx @@ -33,7 +33,6 @@ namespace dbp StringArray aValues; OUString sDefaultField; OUString sDBField; - OUString sName; }; class OGroupBoxWizard : public OControlWizard diff --git a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx index ad3fc67..81325eb 100644 --- a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx +++ b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx @@ -98,7 +98,6 @@ public: char* pMimeType; void* pShell; void* pWidget; - void* pForm; GtkWidget* pGtkWindow; GtkWidget* pGtkWidget; diff --git a/extensions/source/plugin/unx/plugcon.cxx b/extensions/source/plugin/unx/plugcon.cxx index 65c9e61..d50d72a 100644 --- a/extensions/source/plugin/unx/plugcon.cxx +++ b/extensions/source/plugin/unx/plugcon.cxx @@ -197,7 +197,6 @@ ConnectorInstance::ConnectorInstance( NPP inst, char* type, instance( inst ), pShell( nullptr ), pWidget( nullptr ), - pForm( nullptr ), pGtkWindow( nullptr ), pGtkWidget( nullptr ), bShouldUseXEmbed( false ), diff --git a/extensions/source/plugin/unx/unxmgr.cxx b/extensions/source/plugin/unx/unxmgr.cxx index 8113768..7f45607 100644 --- a/extensions/source/plugin/unx/unxmgr.cxx +++ b/extensions/source/plugin/unx/unxmgr.cxx @@ -178,12 +178,6 @@ static bool CheckPlugin( const OString& rPath, list< PluginDescription* >& rDesc return nDescriptions > 0; } -union maxDirent -{ - char aBuffer[ sizeof( struct dirent ) + PATH_MAX +1 ]; - struct dirent asDirent; -}; - static void CheckPluginRegistryFiles( const OString& rPath, list< PluginDescription* >& rDescriptions ) { OStringBuffer aPath( 1024 ); @@ -212,7 +206,7 @@ static void CheckPluginRegistryFiles( const OString& rPath, list< PluginDescript DIR* pDIR = opendir( rPath.getStr() ); struct dirent* pDirEnt = nullptr; struct stat aStat; - maxDirent u; + struct dirent u; while( pDIR && ! readdir_r( pDIR, &u.asDirent, &pDirEnt ) && pDirEnt ) { char* pBaseName = u.asDirent.d_name; @@ -267,7 +261,7 @@ Sequence<PluginDescription> XPluginManager_Impl::impl_getPluginDescriptions() th OString aSearchPath = aSearchBuffer.makeStringAndClear(); sal_Int32 nIndex = 0; - maxDirent u; + struct dirent u; do { OString aPath(aSearchPath.getToken(0, ':', nIndex)); commit 6ed47b1da44340ccc7a13e54b2366537ef53a9fe Author: Noel Grandin <n...@peralex.com> Date: Fri Nov 20 14:13:42 2015 +0200 loplugin:unusedfields in desktop Change-Id: Iab2f05ca2ec2bc313121b4edfb9a0129911c2c91 diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx index 3239f12..67a6a14 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 f490192..4391e68 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 eded3b3..dd4fac0 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 6ec3ff4..1d9e3be 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 d6c757a..bb8a731 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 */ _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits