summaryrefslogtreecommitdiff
path: root/dbaccess/source
diff options
context:
space:
mode:
Diffstat (limited to 'dbaccess/source')
-rw-r--r--dbaccess/source/core/api/RowSet.hxx1
-rw-r--r--dbaccess/source/core/api/datacolumn.hxx3
-rw-r--r--dbaccess/source/core/dataaccess/ComponentDefinition.hxx2
-rw-r--r--dbaccess/source/core/inc/preparedstatement.hxx1
-rw-r--r--dbaccess/source/ui/dlg/ConnectionPageSetup.hxx1
-rw-r--r--dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx24
-rw-r--r--dbaccess/source/ui/dlg/detailpages.hxx5
-rw-r--r--dbaccess/source/ui/inc/GeneralUndo.hxx1
8 files changed, 14 insertions, 24 deletions
diff --git a/dbaccess/source/core/api/RowSet.hxx b/dbaccess/source/core/api/RowSet.hxx
index 6c66c159fc13..3f88d98c15e6 100644
--- a/dbaccess/source/core/api/RowSet.hxx
+++ b/dbaccess/source/core/api/RowSet.hxx
@@ -455,7 +455,6 @@ namespace dbaccess
,public ORowSetBase
,public ::comphelper::OPropertyArrayUsageHelper < ORowSetClone >
{
- protected:
ORowSet* m_pParent;
sal_Int32 m_nFetchDirection;
sal_Int32 m_nFetchSize;
diff --git a/dbaccess/source/core/api/datacolumn.hxx b/dbaccess/source/core/api/datacolumn.hxx
index 1d5dd9966f90..fa40e0765cc1 100644
--- a/dbaccess/source/core/api/datacolumn.hxx
+++ b/dbaccess/source/core/api/datacolumn.hxx
@@ -35,10 +35,9 @@ namespace dbaccess
public css::sdb::XColumn,
public css::sdb::XColumnUpdate
{
- protected:
css::uno::Reference < css::sdbc::XRow > m_xRow;
css::uno::Reference < css::sdbc::XRowUpdate > m_xRowUpdate;
-
+ protected:
virtual ~ODataColumn() override;
public:
ODataColumn (const css::uno::Reference < css::sdbc::XResultSetMetaData >& _xMetaData,
diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.hxx b/dbaccess/source/core/dataaccess/ComponentDefinition.hxx
index 58f78745a4bc..d43ae556ec17 100644
--- a/dbaccess/source/core/dataaccess/ComponentDefinition.hxx
+++ b/dbaccess/source/core/dataaccess/ComponentDefinition.hxx
@@ -84,11 +84,11 @@ class OComponentDefinition :public OContentHelper
,public OComponentDefinition_BASE
,public ::comphelper::OPropertyArrayUsageHelper< OComponentDefinition >
{
-protected:
rtl::Reference< OColumns > m_xColumns;
rtl::Reference<OColumnPropertyListener> m_xColumnPropertyListener;
bool m_bTable;
+protected:
virtual ~OComponentDefinition() override;
virtual void SAL_CALL disposing() override;
diff --git a/dbaccess/source/core/inc/preparedstatement.hxx b/dbaccess/source/core/inc/preparedstatement.hxx
index eb5b6a5f5dc5..d8e0f5b6a7b5 100644
--- a/dbaccess/source/core/inc/preparedstatement.hxx
+++ b/dbaccess/source/core/inc/preparedstatement.hxx
@@ -39,7 +39,6 @@ namespace dbaccess
public css::sdbcx::XColumnsSupplier,
public css::lang::XServiceInfo
{
- protected:
std::unique_ptr<OColumns> m_pColumns;
css::uno::Reference< css::sdbc::XParameters > m_xAggregateAsParameters;
diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx
index c66ba64f3259..a21364cc45a6 100644
--- a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx
+++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx
@@ -37,7 +37,6 @@ namespace dbaui
class OConnectionTabPageSetup : public OConnectionHelper
{
friend class VclPtr<OConnectionTabPageSetup>;
- protected:
std::unique_ptr<weld::Label> m_xHelpText;
std::unique_ptr<weld::Label> m_xHeaderText;
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
index fdc36ff6db16..b5fbbb8e5a9b 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
@@ -55,9 +55,6 @@ namespace dbaui
class OTextConnectionPageSetup : public OConnectionTabPageSetup
{
public:
- std::unique_ptr<weld::Widget> m_xSubContainer;
- std::unique_ptr<OTextConnectionHelper> m_xTextConnectionHelper;
-
virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) override;
static VclPtr<OGenericAdministrationPage> CreateTextTabPage(TabPageParent pParent, const SfxItemSet& _rAttrSet );
OTextConnectionPageSetup(TabPageParent pParent, const SfxItemSet& _rCoreAttrs);
@@ -69,9 +66,10 @@ namespace dbaui
virtual void fillControls(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList) override;
virtual void fillWindows(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList) override;
bool checkTestConnection() override;
-
private:
DECL_LINK(ImplGetExtensionHdl, OTextConnectionHelper*, void);
+ std::unique_ptr<weld::Widget> m_xSubContainer;
+ std::unique_ptr<OTextConnectionHelper> m_xTextConnectionHelper;
};
// OLDAPConnectionPageSetup
@@ -255,15 +253,6 @@ namespace dbaui
virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) override;
static VclPtr<OGenericAdministrationPage> CreateFinalDBTabPageSetup( vcl::Window* pParent, const SfxItemSet& _rAttrSet);
- VclPtr<FixedText> m_pFTFinalHeader;
- VclPtr<FixedText> m_pFTFinalHelpText;
- VclPtr<RadioButton> m_pRBRegisterDataSource;
- VclPtr<RadioButton> m_pRBDontregisterDataSource;
- VclPtr<FixedText> m_pFTAdditionalSettings;
- VclPtr<CheckBox> m_pCBOpenAfterwards;
- VclPtr<CheckBox> m_pCBStartTableWizard;
- VclPtr<FixedText> m_pFTFinalText;
-
OFinalDBPageSetup(vcl::Window* pParent, const SfxItemSet& _rCoreAttrs);
virtual ~OFinalDBPageSetup() override;
virtual void dispose() override;
@@ -277,6 +266,15 @@ namespace dbaui
virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override;
virtual void fillControls(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList) override;
virtual void fillWindows(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList) override;
+ private:
+ VclPtr<FixedText> m_pFTFinalHeader;
+ VclPtr<FixedText> m_pFTFinalHelpText;
+ VclPtr<RadioButton> m_pRBRegisterDataSource;
+ VclPtr<RadioButton> m_pRBDontregisterDataSource;
+ VclPtr<FixedText> m_pFTAdditionalSettings;
+ VclPtr<CheckBox> m_pCBOpenAfterwards;
+ VclPtr<CheckBox> m_pCBStartTableWizard;
+ VclPtr<FixedText> m_pFTFinalText;
};
} // namespace dbaui
diff --git a/dbaccess/source/ui/dlg/detailpages.hxx b/dbaccess/source/ui/dlg/detailpages.hxx
index 47ba2089850a..8de9f2f3e757 100644
--- a/dbaccess/source/ui/dlg/detailpages.hxx
+++ b/dbaccess/source/ui/dlg/detailpages.hxx
@@ -51,8 +51,6 @@ namespace dbaui
*/
class OCommonBehaviourTabPage : public OGenericAdministrationPage
{
- protected:
-
OCommonBehaviourTabPageFlags m_nControlFlags;
std::unique_ptr<weld::Label> m_xOptionsLabel;
@@ -244,8 +242,6 @@ namespace dbaui
OTextDetailsPage(TabPageParent pParent, const SfxItemSet& rCoreAttrs);
- std::unique_ptr<OTextConnectionHelper> m_xTextConnectionHelper;
-
protected:
virtual ~OTextDetailsPage() override;
virtual void dispose() override;
@@ -256,6 +252,7 @@ namespace dbaui
virtual void fillWindows(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList) override;
private:
+ std::unique_ptr<OTextConnectionHelper> m_xTextConnectionHelper;
};
} // namespace dbaui
diff --git a/dbaccess/source/ui/inc/GeneralUndo.hxx b/dbaccess/source/ui/inc/GeneralUndo.hxx
index c869babc7651..3a7365c1da9c 100644
--- a/dbaccess/source/ui/inc/GeneralUndo.hxx
+++ b/dbaccess/source/ui/inc/GeneralUndo.hxx
@@ -29,7 +29,6 @@ namespace dbaui
class OCommentUndoAction : public SfxUndoAction
{
- protected:
OUString m_strComment; // undo, redo comment
public:
generated by cgit (git 2.34.1) at 2025-01-10 16:22:09 +0000