summaryrefslogtreecommitdiff
path: root/dbaccess/source/ui
diff options
context:
space:
mode:
Diffstat (limited to 'dbaccess/source/ui')
-rw-r--r--dbaccess/source/ui/browser/brwctrlr.cxx1
-rw-r--r--dbaccess/source/ui/control/FieldDescControl.cxx2
-rw-r--r--dbaccess/source/ui/control/RelationControl.cxx8
-rw-r--r--dbaccess/source/ui/control/TableGrantCtrl.cxx1
-rw-r--r--dbaccess/source/ui/dlg/ConnectionPage.cxx1
-rw-r--r--dbaccess/source/ui/dlg/ConnectionPage.hxx1
-rw-r--r--dbaccess/source/ui/dlg/admincontrols.cxx1
-rw-r--r--dbaccess/source/ui/dlg/advancedsettings.cxx1
-rw-r--r--dbaccess/source/ui/dlg/generalpage.cxx1
-rw-r--r--dbaccess/source/ui/dlg/generalpage.hxx1
-rw-r--r--dbaccess/source/ui/dlg/tablespage.cxx1
-rw-r--r--dbaccess/source/ui/dlg/tablespage.hxx1
-rw-r--r--dbaccess/source/ui/inc/CollectionView.hxx1
-rw-r--r--dbaccess/source/ui/inc/FieldDescControl.hxx1
-rw-r--r--dbaccess/source/ui/inc/QueryDesignView.hxx1
-rw-r--r--dbaccess/source/ui/inc/TableDesignHelpBar.hxx1
-rw-r--r--dbaccess/source/ui/inc/TableGrantCtrl.hxx1
-rw-r--r--dbaccess/source/ui/inc/TableWindowListBox.hxx1
-rw-r--r--dbaccess/source/ui/inc/WNameMatch.hxx2
-rw-r--r--dbaccess/source/ui/inc/advancedsettingsdlg.hxx1
-rw-r--r--dbaccess/source/ui/inc/brwctrlr.hxx1
-rw-r--r--dbaccess/source/ui/querydesign/QueryDesignView.cxx1
22 files changed, 3 insertions, 28 deletions
diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx
index a2931e72971f..a3c21e902c41 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -619,7 +619,6 @@ SbaXDataBrowserController::SbaXDataBrowserController(const Reference< ::com::sun
,m_nPendingLoadFinished(0)
,m_nFormActionNestingLevel(0)
,m_bLoadCanceled( sal_False )
- ,m_bClosingKillOpen( sal_False )
,m_bCannotSelectUnfiltered( true )
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::SbaXDataBrowserController" );
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx
index b1423140c2bd..2f9aa0dfbfdb 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -140,7 +140,6 @@ OFieldDescControl::OFieldDescControl( Window* pParent, const ResId& rResId, OTab
,m_pVertScroll( NULL )
,m_pHorzScroll( NULL )
,m_pPreviousType()
- ,nCurChildId(1)
,m_nPos(-1)
,aYes(ModuleRes(STR_VALUE_YES))
,aNo(ModuleRes(STR_VALUE_NO))
@@ -189,7 +188,6 @@ OFieldDescControl::OFieldDescControl( Window* pParent, OTableDesignHelpBar* pHel
,m_pVertScroll( NULL )
,m_pHorzScroll( NULL )
,m_pPreviousType()
- ,nCurChildId(1)
,m_nPos(-1)
,aYes(ModuleRes(STR_VALUE_YES))
,aNo(ModuleRes(STR_VALUE_NO))
diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx
index 4c0c71cd1e28..47c0155d016f 100644
--- a/dbaccess/source/ui/control/RelationControl.cxx
+++ b/dbaccess/source/ui/control/RelationControl.cxx
@@ -56,7 +56,6 @@ namespace dbaui
::std::auto_ptr< ::svt::ListBoxControl> m_pListCell;
TTableConnectionData::value_type m_pConnData;
- const OJoinTableView::OTableWindowMap* m_pTableMap;
OTableListBoxControl* m_pBoxControl;
long m_nDataPos;
Reference< XPropertySet> m_xSourceDef;
@@ -72,7 +71,7 @@ namespace dbaui
*/
sal_uInt16 getColumnIdent( sal_uInt16 _nColId ) const;
public:
- ORelationControl( OTableListBoxControl* pParent,const OJoinTableView::OTableWindowMap* _pTableMap );
+ ORelationControl( OTableListBoxControl* pParent );
virtual ~ORelationControl();
/** searches for a connection between these two tables
@@ -121,9 +120,8 @@ namespace dbaui
//========================================================================
DBG_NAME(ORelationControl)
//------------------------------------------------------------------------
- ORelationControl::ORelationControl( OTableListBoxControl* pParent ,const OJoinTableView::OTableWindowMap* _pTableMap)
+ ORelationControl::ORelationControl( OTableListBoxControl* pParent )
:EditBrowseBox( pParent, EBBF_SMART_TAB_TRAVEL | EBBF_NOROWPICTURE, WB_TABSTOP | WB_BORDER | BROWSER_AUTOSIZE_LASTCOL)
- ,m_pTableMap(_pTableMap)
,m_pBoxControl(pParent)
,m_xSourceDef( NULL )
,m_xDestDef( NULL )
@@ -459,7 +457,7 @@ OTableListBoxControl::OTableListBoxControl( Window* _pParent
, m_pTableMap(_pTableMap)
, m_pParentDialog(_pParentDialog)
{
- m_pRC_Tables = new ORelationControl( this,m_pTableMap );
+ m_pRC_Tables = new ORelationControl( this );
m_pRC_Tables->SetHelpId(HID_RELDLG_KEYFIELDS);
m_pRC_Tables->Init( );
m_pRC_Tables->SetZOrder(&m_lmbRightTable, WINDOW_ZORDER_BEHIND);
diff --git a/dbaccess/source/ui/control/TableGrantCtrl.cxx b/dbaccess/source/ui/control/TableGrantCtrl.cxx
index 6e548bb96d34..fb1eacb5e145 100644
--- a/dbaccess/source/ui/control/TableGrantCtrl.cxx
+++ b/dbaccess/source/ui/control/TableGrantCtrl.cxx
@@ -54,7 +54,6 @@ OTableGrantControl::OTableGrantControl( Window* pParent,const ResId& _RsId)
,m_pCheckCell( NULL )
,m_pEdit( NULL )
,m_nDataPos( 0 )
- ,m_bEnable(sal_True)
,m_nDeactivateEvent(0)
{
DBG_CTOR(OTableGrantControl,NULL);
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx
index 3f144577846d..50e26bff5911 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx
@@ -93,7 +93,6 @@ namespace dbaui
DBG_NAME(OConnectionTabPage)
OConnectionTabPage::OConnectionTabPage(Window* pParent, const SfxItemSet& _rCoreAttrs)
:OConnectionHelper(pParent, ModuleRes(PAGE_CONNECTION), _rCoreAttrs)
- ,m_bUserGrabFocus(sal_True)
,m_aFL1(this, ModuleRes(FL_SEPARATOR1))
,m_aFL2(this, ModuleRes(FL_SEPARATOR2))
,m_aUserNameLabel(this, ModuleRes(FT_USERNAME))
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.hxx b/dbaccess/source/ui/dlg/ConnectionPage.hxx
index 367741bf9d6e..b5d4eadef78c 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.hxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.hxx
@@ -38,7 +38,6 @@ namespace dbaui
*/
class OConnectionTabPage : public OConnectionHelper
{
- sal_Bool m_bUserGrabFocus : 1;
protected:
// connection
FixedLine m_aFL1;
diff --git a/dbaccess/source/ui/dlg/admincontrols.cxx b/dbaccess/source/ui/dlg/admincontrols.cxx
index 3f859db90954..097cde222c66 100644
--- a/dbaccess/source/ui/dlg/admincontrols.cxx
+++ b/dbaccess/source/ui/dlg/admincontrols.cxx
@@ -69,7 +69,6 @@ namespace dbaui
private:
const String m_sDisabledText;
String m_sUserText;
- sal_Bool m_bLastKnownEnabledState;
};
//--------------------------------------------------------------------
diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx b/dbaccess/source/ui/dlg/advancedsettings.cxx
index 6ae17f4d5003..f15fd2547825 100644
--- a/dbaccess/source/ui/dlg/advancedsettings.cxx
+++ b/dbaccess/source/ui/dlg/advancedsettings.cxx
@@ -453,7 +453,6 @@ namespace dbaui
AdvancedSettingsDialog::AdvancedSettingsDialog( Window* _pParent, SfxItemSet* _pItems,
const Reference< XMultiServiceFactory >& _rxORB, const Any& _aDataSourceName )
:SfxTabDialog(_pParent, ModuleRes(DLG_DATABASE_ADVANCED), _pItems)
- ,m_pItemSet(_pItems)
{
m_pImpl = ::std::auto_ptr<ODbDataSourceAdministrationHelper>(new ODbDataSourceAdministrationHelper(_rxORB,_pParent,this));
m_pImpl->setDataSourceOrName(_aDataSourceName);
diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx
index 34939b9bdeea..f6371552ffbc 100644
--- a/dbaccess/source/ui/dlg/generalpage.cxx
+++ b/dbaccess/source/ui/dlg/generalpage.cxx
@@ -82,7 +82,6 @@ namespace dbaui
,m_eNotSupportedKnownType ( ::dbaccess::DST_UNKNOWN)
,m_eLastMessage (smNone)
,m_bDisplayingInvalid (sal_False)
- ,m_bUserGrabFocus (sal_True)
,m_bInitTypeList (true)
{
// fill the listbox with the UI descriptions for the possible types
diff --git a/dbaccess/source/ui/dlg/generalpage.hxx b/dbaccess/source/ui/dlg/generalpage.hxx
index 3874f7bea363..53708847116e 100644
--- a/dbaccess/source/ui/dlg/generalpage.hxx
+++ b/dbaccess/source/ui/dlg/generalpage.hxx
@@ -100,7 +100,6 @@ namespace dbaui
Link m_aDocumentSelectionHandler; /// to be called when a document in the RecentDoc list is selected
Link m_aChooseDocumentHandler; /// to be called when a recent document has been definately chosen
sal_Bool m_bDisplayingInvalid : 1; // the currently displayed data source is deleted
- sal_Bool m_bUserGrabFocus : 1;
bool m_bInitTypeList : 1;
bool approveDataSourceType( const ::rtl::OUString& _sURLPrefix, String& _inout_rDisplayName );
void insertDatasourceTypeEntryData(const ::rtl::OUString& _sType, String sDisplayName);
diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx
index f57e0eca5794..19eba7de6f98 100644
--- a/dbaccess/source/ui/dlg/tablespage.cxx
+++ b/dbaccess/source/ui/dlg/tablespage.cxx
@@ -79,7 +79,6 @@ DBG_NAME(OTableSubscriptionPage)
,m_aTables (this, ModuleRes(FL_SEPARATOR1))
,m_aTablesList (this, NULL,ModuleRes(CTL_TABLESUBSCRIPTION),sal_True)
,m_aExplanation (this, ModuleRes(FT_FILTER_EXPLANATION))
- ,m_bCheckedAll ( sal_False )
,m_bCatalogAtStart ( sal_True )
,m_pTablesDlg(_pTablesDlg)
{
diff --git a/dbaccess/source/ui/dlg/tablespage.hxx b/dbaccess/source/ui/dlg/tablespage.hxx
index 45297b940ad4..02c9aa4c45f4 100644
--- a/dbaccess/source/ui/dlg/tablespage.hxx
+++ b/dbaccess/source/ui/dlg/tablespage.hxx
@@ -47,7 +47,6 @@ namespace dbaui
FixedText m_aExplanation;
::rtl::OUString m_sCatalogSeparator;
- sal_Bool m_bCheckedAll : 1;
sal_Bool m_bCatalogAtStart : 1;
::osl::Mutex m_aNotifierMutex;
diff --git a/dbaccess/source/ui/inc/CollectionView.hxx b/dbaccess/source/ui/inc/CollectionView.hxx
index 18a36b92dbaf..28f9bc1c5676 100644
--- a/dbaccess/source/ui/inc/CollectionView.hxx
+++ b/dbaccess/source/ui/inc/CollectionView.hxx
@@ -50,7 +50,6 @@ namespace dbaui
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xORB;
Size m_aDlgSize;
Size m_a6Size;
- sal_Int32 m_nFixDeltaHeight;
sal_Bool m_bCreateForm;
DECL_LINK(Up_Click,void*);
diff --git a/dbaccess/source/ui/inc/FieldDescControl.hxx b/dbaccess/source/ui/inc/FieldDescControl.hxx
index a43f0cc1f028..715160b7a5dd 100644
--- a/dbaccess/source/ui/inc/FieldDescControl.hxx
+++ b/dbaccess/source/ui/inc/FieldDescControl.hxx
@@ -101,7 +101,6 @@ namespace dbaui
ScrollBar* m_pHorzScroll;
TOTypeInfoSP m_pPreviousType;
- sal_uInt16 nCurChildId;
short m_nPos;
XubString aYes;
XubString aNo;
diff --git a/dbaccess/source/ui/inc/QueryDesignView.hxx b/dbaccess/source/ui/inc/QueryDesignView.hxx
index cab96e76c17f..07a55ce1e537 100644
--- a/dbaccess/source/ui/inc/QueryDesignView.hxx
+++ b/dbaccess/source/ui/inc/QueryDesignView.hxx
@@ -72,7 +72,6 @@ namespace dbaui
OSelectionBrowseBox* m_pSelectionBox; // presents the lower window
ChildFocusState m_eChildFocus;
- sal_Bool m_bInKeyEvent;
sal_Bool m_bInSplitHandler;
public:
diff --git a/dbaccess/source/ui/inc/TableDesignHelpBar.hxx b/dbaccess/source/ui/inc/TableDesignHelpBar.hxx
index 6b02354fcd3c..2d1865d98171 100644
--- a/dbaccess/source/ui/inc/TableDesignHelpBar.hxx
+++ b/dbaccess/source/ui/inc/TableDesignHelpBar.hxx
@@ -35,7 +35,6 @@ namespace dbaui
private:
String m_sHelpText;
MultiLineEdit* m_pTextWin;
- sal_uInt16 m_nDummy;
protected:
virtual void Resize();
diff --git a/dbaccess/source/ui/inc/TableGrantCtrl.hxx b/dbaccess/source/ui/inc/TableGrantCtrl.hxx
index 4c4bb84425fa..e95bc49dbdf7 100644
--- a/dbaccess/source/ui/inc/TableGrantCtrl.hxx
+++ b/dbaccess/source/ui/inc/TableGrantCtrl.hxx
@@ -53,7 +53,6 @@ class OTableGrantControl : public ::svt::EditBrowseBox
::svt::CheckBoxControl* m_pCheckCell;
Edit* m_pEdit;
long m_nDataPos;
- sal_Bool m_bEnable;
sal_uLong m_nDeactivateEvent;
public:
diff --git a/dbaccess/source/ui/inc/TableWindowListBox.hxx b/dbaccess/source/ui/inc/TableWindowListBox.hxx
index 2537ac925279..1bec9757ed0d 100644
--- a/dbaccess/source/ui/inc/TableWindowListBox.hxx
+++ b/dbaccess/source/ui/inc/TableWindowListBox.hxx
@@ -62,7 +62,6 @@ namespace dbaui
OJoinDropData m_aDropInfo;
sal_Bool m_bReallyScrolled : 1;
- sal_Bool m_bDragSource : 1;
protected:
virtual void LoseFocus();
diff --git a/dbaccess/source/ui/inc/WNameMatch.hxx b/dbaccess/source/ui/inc/WNameMatch.hxx
index c8b7a938a068..ba5cb519f565 100644
--- a/dbaccess/source/ui/inc/WNameMatch.hxx
+++ b/dbaccess/source/ui/inc/WNameMatch.hxx
@@ -67,8 +67,6 @@ namespace dbaui
String m_sSourceText;
String m_sDestText;
- sal_Bool m_bAttrsChanged;
-
DECL_LINK( ButtonClickHdl, Button * );
DECL_LINK( RightButtonClickHdl, Button * );
DECL_LINK( AllNoneClickHdl, Button * );
diff --git a/dbaccess/source/ui/inc/advancedsettingsdlg.hxx b/dbaccess/source/ui/inc/advancedsettingsdlg.hxx
index 529eaad925f1..ea0c311fe315 100644
--- a/dbaccess/source/ui/inc/advancedsettingsdlg.hxx
+++ b/dbaccess/source/ui/inc/advancedsettingsdlg.hxx
@@ -44,7 +44,6 @@ namespace dbaui
{
OModuleClient m_aModuleClient;
::std::auto_ptr<ODbDataSourceAdministrationHelper> m_pImpl;
- SfxItemSet* m_pItemSet;
protected:
virtual void PageCreated(sal_uInt16 _nId, SfxTabPage& _rPage);
diff --git a/dbaccess/source/ui/inc/brwctrlr.hxx b/dbaccess/source/ui/inc/brwctrlr.hxx
index 284a97adc2e2..27df5e66050b 100644
--- a/dbaccess/source/ui/inc/brwctrlr.hxx
+++ b/dbaccess/source/ui/inc/brwctrlr.hxx
@@ -115,7 +115,6 @@ namespace dbaui
sal_uInt16 m_nFormActionNestingLevel; // see enter-/leaveFormAction
sal_Bool m_bLoadCanceled : 1; // the load was canceled somehow
- sal_Bool m_bClosingKillOpen : 1; // are we killing the load thread because we are to be suspended ?
bool m_bCannotSelectUnfiltered : 1; // recieved an DATA_CANNOT_SELECT_UNFILTERED error
protected:
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 0e9d406158da..ebddbfc41813 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -2507,7 +2507,6 @@ OQueryDesignView::OQueryDesignView( OQueryContainerWindow* _pParent,
:OQueryView( _pParent, _rController, _rFactory )
,m_aSplitter( this )
,m_eChildFocus(NONE)
- ,m_bInKeyEvent(sal_False)
,m_bInSplitHandler( sal_False )
{
DBG_CTOR(OQueryDesignView,NULL);