diff options
| -rw-r--r-- | extensions/source/abpilot/admininvokationpage.cxx | 1 | ||||
| -rw-r--r-- | extensions/source/abpilot/admininvokationpage.hxx | 2 | ||||
| -rw-r--r-- | extensions/source/dbpilots/groupboxwiz.hxx | 1 | ||||
| -rw-r--r-- | extensions/source/plugin/inc/plugin/unx/plugcon.hxx | 1 | ||||
| -rw-r--r-- | extensions/source/plugin/unx/plugcon.cxx | 1 | ||||
| -rw-r--r-- | extensions/source/plugin/unx/unxmgr.cxx | 10 |
6 files changed, 2 insertions, 14 deletions
diff --git a/extensions/source/abpilot/admininvokationpage.cxx b/extensions/source/abpilot/admininvokationpage.cxx index f8af951516b6..35b73eb70b32 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 5308357c4d9e..bfbc6b2d4e6f 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 ba90a5f8f50c..2c3262dd216e 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 ad3fc67d7126..81325eb30f59 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 65c9e610d1bf..d50d72a0a64b 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 811376841e1f..7f45607238e0 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)); |