summaryrefslogtreecommitdiff
path: root/dbaccess/source/ui
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-06-22 13:39:17 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-06-23 09:00:40 +0200
commit55ff9d3e2d160132f905b8c932b622c0c8575478 (patch)
tree00f3bf9c0745e9684a29f09e351ffd51e62af31b /dbaccess/source/ui
parent222bc56e21356520a55a871c9cdfc26d2fc3fcb2 (diff)
loplugin:unusedfields in dbaccess
Change-Id: I3f32573f25b4861799124905cefb3d9166570989 Reviewed-on: https://gerrit.libreoffice.org/39135 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'dbaccess/source/ui')
-rw-r--r--dbaccess/source/ui/control/dbtreelistbox.cxx1
-rw-r--r--dbaccess/source/ui/dlg/dbadmin.cxx3
-rw-r--r--dbaccess/source/ui/dlg/generalpage.cxx11
-rw-r--r--dbaccess/source/ui/dlg/generalpage.hxx3
-rw-r--r--dbaccess/source/ui/dlg/indexdialog.cxx4
-rw-r--r--dbaccess/source/ui/dlg/indexfieldscontrol.cxx4
-rw-r--r--dbaccess/source/ui/inc/DExport.hxx1
-rw-r--r--dbaccess/source/ui/inc/HtmlReader.hxx3
-rw-r--r--dbaccess/source/ui/inc/TableWindow.hxx2
-rw-r--r--dbaccess/source/ui/inc/dbadmin.hxx1
-rw-r--r--dbaccess/source/ui/inc/dbtreelistbox.hxx1
-rw-r--r--dbaccess/source/ui/inc/indexdialog.hxx3
-rw-r--r--dbaccess/source/ui/inc/indexfieldscontrol.hxx3
-rw-r--r--dbaccess/source/ui/misc/DExport.cxx2
-rw-r--r--dbaccess/source/ui/misc/HtmlReader.cxx17
-rw-r--r--dbaccess/source/ui/misc/RtfReader.cxx4
-rw-r--r--dbaccess/source/ui/querydesign/TableWindow.cxx8
-rw-r--r--dbaccess/source/ui/tabledesign/TEditControl.cxx6
-rw-r--r--dbaccess/source/ui/tabledesign/TEditControl.hxx1
-rw-r--r--dbaccess/source/ui/tabledesign/TableController.cxx2
20 files changed, 9 insertions, 71 deletions
diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx
index 07fcb331ce65..f6fb342290f5 100644
--- a/dbaccess/source/ui/control/dbtreelistbox.cxx
+++ b/dbaccess/source/ui/control/dbtreelistbox.cxx
@@ -373,7 +373,6 @@ bool DBTreeListBox::EditingEntry( SvTreeListEntry* /*pEntry*/, Selection& /*_aSe
bool DBTreeListBox::EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText )
{
DBTreeEditedEntry aEntry;
- aEntry.pEntry = pEntry;
aEntry.aNewText = rNewText;
SetEntryText(pEntry,aEntry.aNewText);
diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx b/dbaccess/source/ui/dlg/dbadmin.cxx
index bbf994354a42..5163372df0ac 100644
--- a/dbaccess/source/ui/dlg/dbadmin.cxx
+++ b/dbaccess/source/ui/dlg/dbadmin.cxx
@@ -52,7 +52,6 @@ ODbAdminDialog::ODbAdminDialog(vcl::Window* _pParent
, const Reference< XComponentContext >& _rxContext)
: SfxTabDialog(_pParent, "AdminDialog",
"dbaccess/ui/admindialog.ui", _pItems)
- , m_bApplied(false)
, m_bUIEnabled(true)
{
m_pImpl.reset(new ODbDataSourceAdministrationHelper(_rxContext,this,this));
@@ -250,8 +249,6 @@ ODbAdminDialog::ApplyResult ODbAdminDialog::implApplyChanges()
// This way, next time they're asked what has changed since now and here, they really
// can compare with the status they have _now_ (not the one they had before this apply call).
- m_bApplied = true;
-
return AR_LEAVE_MODIFIED;
}
diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx
index ba8387e7f436..5f4fafb65e36 100644
--- a/dbaccess/source/ui/dlg/generalpage.cxx
+++ b/dbaccess/source/ui/dlg/generalpage.cxx
@@ -52,10 +52,8 @@ namespace dbaui
// OGeneralPage
OGeneralPage::OGeneralPage( vcl::Window* pParent, const OUString& _rUIXMLDescription, const SfxItemSet& _rItems )
:OGenericAdministrationPage( pParent, "PageGeneral", _rUIXMLDescription, _rItems )
- ,m_eNotSupportedKnownType ( ::dbaccess::DST_UNKNOWN )
,m_pSpecialMessage ( nullptr )
,m_eLastMessage ( smNone )
- ,m_bDisplayingInvalid ( false )
,m_bInitTypeList ( true )
,m_pDatasourceType ( nullptr )
,m_pCollection ( nullptr )
@@ -255,7 +253,6 @@ namespace dbaui
sConnectURL = pUrlItem->GetValue();
}
- m_eNotSupportedKnownType = ::dbaccess::DST_UNKNOWN;
implSetCurrentType( OUString() );
// compare the DSN prefix with the registered ones
@@ -275,9 +272,6 @@ namespace dbaui
// show a message saying so
// eSpecialMessage = smUnsupportedType;
insertEmbeddedDBTypeEntryData( m_eCurrentSelection, sDisplayName );
- // remember this type so we can show the special message again if the user selects this
- // type again (without changing the data source)
- m_eNotSupportedKnownType = m_pCollection->determineType( m_eCurrentSelection ); // TODO:
}
return sDisplayName;
@@ -291,7 +285,6 @@ namespace dbaui
// if the selection is invalid, disable everything
OUString sName,sConnectURL;
- m_bDisplayingInvalid = !bValid;
if ( bValid )
{
// collect some items and some values
@@ -303,7 +296,6 @@ namespace dbaui
sConnectURL = pUrlItem->GetValue();
}
- m_eNotSupportedKnownType = ::dbaccess::DST_UNKNOWN;
implSetCurrentType( OUString() );
// compare the DSN prefix with the registered ones
@@ -323,9 +315,6 @@ namespace dbaui
// show a message saying so
// eSpecialMessage = smUnsupportedType;
insertDatasourceTypeEntryData( m_eCurrentSelection, sDisplayName );
- // remember this type so we can show the special message again if the user selects this
- // type again (without changing the data source)
- m_eNotSupportedKnownType = m_pCollection->determineType( m_eCurrentSelection );
}
return sDisplayName;
diff --git a/dbaccess/source/ui/dlg/generalpage.hxx b/dbaccess/source/ui/dlg/generalpage.hxx
index 7f3628a9eb1c..84269c2cbb6e 100644
--- a/dbaccess/source/ui/dlg/generalpage.hxx
+++ b/dbaccess/source/ui/dlg/generalpage.hxx
@@ -36,8 +36,6 @@ namespace dbaui
OGeneralPage( vcl::Window* pParent, const OUString& _rUIXMLDescription, const SfxItemSet& _rItems );
OUString m_eCurrentSelection; /// currently selected type
- ::dbaccess::DATASOURCE_TYPE
- m_eNotSupportedKnownType; /// if a data source of an unsupported, but known type is encountered ....
private:
VclPtr<FixedText> m_pSpecialMessage;
@@ -50,7 +48,6 @@ namespace dbaui
SPECIAL_MESSAGE m_eLastMessage;
Link<OGeneralPage&,void> m_aTypeSelectHandler; /// to be called if a new type is selected
- bool m_bDisplayingInvalid : 1; /// the currently displayed data source is deleted
bool m_bInitTypeList : 1;
bool approveDatasourceType( const OUString& _sURLPrefix, OUString& _inout_rDisplayName );
void insertDatasourceTypeEntryData( const OUString& _sType, const OUString& sDisplayName );
diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx
index cd11cc5b45ed..0c287c3ee20a 100644
--- a/dbaccess/source/ui/dlg/indexdialog.cxx
+++ b/dbaccess/source/ui/dlg/indexdialog.cxx
@@ -160,7 +160,7 @@ namespace dbaui
DbaIndexDialog::DbaIndexDialog( vcl::Window* _pParent, const Sequence< OUString >& _rFieldNames,
const Reference< XNameAccess >& _rxIndexes,
const Reference< XConnection >& _rxConnection,
- const Reference< XComponentContext >& _rxContext,sal_Int32 _nMaxColumnsInIndex)
+ const Reference< XComponentContext >& _rxContext)
:ModalDialog( _pParent, "IndexDesignDialog", "dbaccess/ui/indexdesigndialog.ui")
,m_xConnection(_rxConnection)
,m_pIndexes(nullptr)
@@ -211,7 +211,7 @@ namespace dbaui
m_pIndexList->setConnection(m_xConnection);
m_pFields->SetSizePixel(Size(300, 100));
- m_pFields->Init(_rFieldNames, _nMaxColumnsInIndex, ::dbtools::getBooleanDataSourceSetting( m_xConnection, "AddIndexAppendix" ));
+ m_pFields->Init(_rFieldNames, ::dbtools::getBooleanDataSourceSetting( m_xConnection, "AddIndexAppendix" ));
setToolBox(m_pActions);
diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
index dfad2d52b031..7ee609eb94dd 100644
--- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
+++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
@@ -72,7 +72,6 @@ namespace dbaui
, m_aSeekRow(m_aFields.end())
, m_pSortingCell(nullptr)
, m_pFieldNameCell(nullptr)
- , m_nMaxColumnsInIndex(0)
, m_bAddIndexAppendix(false)
{
}
@@ -190,9 +189,8 @@ namespace dbaui
return EditBrowseBox::GetTotalCellWidth(_nRow, _nColId);
}
- void IndexFieldsControl::Init(const Sequence< OUString >& _rAvailableFields, sal_Int32 _nMaxColumnsInIndex,bool _bAddIndexAppendix)
+ void IndexFieldsControl::Init(const Sequence< OUString >& _rAvailableFields, bool _bAddIndexAppendix)
{
- m_nMaxColumnsInIndex = _nMaxColumnsInIndex;
m_bAddIndexAppendix = _bAddIndexAppendix;
RemoveColumns();
diff --git a/dbaccess/source/ui/inc/DExport.hxx b/dbaccess/source/ui/inc/DExport.hxx
index 7fc704a83bc2..99c0c8053270 100644
--- a/dbaccess/source/ui/inc/DExport.hxx
+++ b/dbaccess/source/ui/inc/DExport.hxx
@@ -96,7 +96,6 @@ namespace dbaui
sal_Int32 m_nColumnPos; ///< current column position
sal_Int32 m_nRows; ///< number of rows to be searched
sal_Int32 m_nRowCount; ///< current count of rows
- rtl_TextEncoding m_nDefToken; ///< language
bool m_bError; ///< error and termination code
bool m_bInTbl; ///< true, if parser is in RTF table
bool m_bHead; ///< true, if the header hasn't been read yet
diff --git a/dbaccess/source/ui/inc/HtmlReader.hxx b/dbaccess/source/ui/inc/HtmlReader.hxx
index c7bd1d53badf..b610912f791d 100644
--- a/dbaccess/source/ui/inc/HtmlReader.hxx
+++ b/dbaccess/source/ui/inc/HtmlReader.hxx
@@ -33,10 +33,7 @@ namespace dbaui
{
OUString m_sCurrent;
sal_Int32 m_nTableCount;
- sal_Int16 m_nWidth;
sal_Int16 m_nColumnWidth; ///< maximum column width
- bool m_bMetaOptions; ///< true when we scanned the meta information
- bool m_bSDNum;
protected:
virtual void NextToken( HtmlTokenId nToken ) override; // base class
diff --git a/dbaccess/source/ui/inc/TableWindow.hxx b/dbaccess/source/ui/inc/TableWindow.hxx
index 5acc6b872f80..1dd689da1895 100644
--- a/dbaccess/source/ui/inc/TableWindow.hxx
+++ b/dbaccess/source/ui/inc/TableWindow.hxx
@@ -64,7 +64,6 @@ namespace dbaui
VclPtr<FixedImage> m_aTypeImage;
VclPtr<OTableWindowTitle> m_xTitle;
VclPtr<OTableWindowListBox> m_xListBox;
- OTableWindowAccess* m_pAccessible;
private:
TTableWindowData::value_type
@@ -74,7 +73,6 @@ namespace dbaui
sal_Int32 m_nMoveCount; // how often the arrow keys was pressed
sal_Int32 m_nMoveIncrement; // how many pixel we should move
SizingFlags m_nSizingFlags;
- bool m_bActive;
// OContainerListener
virtual void _elementInserted( const css::container::ContainerEvent& _rEvent ) override;
diff --git a/dbaccess/source/ui/inc/dbadmin.hxx b/dbaccess/source/ui/inc/dbadmin.hxx
index 1ccc6053caf8..39d664240dc2 100644
--- a/dbaccess/source/ui/inc/dbadmin.hxx
+++ b/dbaccess/source/ui/inc/dbadmin.hxx
@@ -53,7 +53,6 @@ private:
std::unique_ptr<ODbDataSourceAdministrationHelper> m_pImpl;
- bool m_bApplied : 1; /// sal_True if any changes have been applied while the dialog was executing
bool m_bUIEnabled : 1; /// <TRUE/> if the UI is enabled, false otherwise. Cannot be switched back to <TRUE/>, once it is <FALSE/>
sal_uInt16 m_nMainPageID;
diff --git a/dbaccess/source/ui/inc/dbtreelistbox.hxx b/dbaccess/source/ui/inc/dbtreelistbox.hxx
index 2c7aeb997007..100e21839e95 100644
--- a/dbaccess/source/ui/inc/dbtreelistbox.hxx
+++ b/dbaccess/source/ui/inc/dbtreelistbox.hxx
@@ -35,7 +35,6 @@ namespace dbaui
{
struct DBTreeEditedEntry
{
- SvTreeListEntry* pEntry;
OUString aNewText;
};
diff --git a/dbaccess/source/ui/inc/indexdialog.hxx b/dbaccess/source/ui/inc/indexdialog.hxx
index 1890fcd0e55f..bea8ed780266 100644
--- a/dbaccess/source/ui/inc/indexdialog.hxx
+++ b/dbaccess/source/ui/inc/indexdialog.hxx
@@ -104,8 +104,7 @@ namespace dbaui
const css::uno::Sequence< OUString >& _rFieldNames,
const css::uno::Reference< css::container::XNameAccess >& _rxIndexes,
const css::uno::Reference< css::sdbc::XConnection >& _rxConnection,
- const css::uno::Reference< css::uno::XComponentContext >& _rxContext,
- sal_Int32 _nMaxColumnsInIndex
+ const css::uno::Reference< css::uno::XComponentContext >& _rxContext
);
virtual ~DbaIndexDialog() override;
virtual void dispose() override;
diff --git a/dbaccess/source/ui/inc/indexfieldscontrol.hxx b/dbaccess/source/ui/inc/indexfieldscontrol.hxx
index 0fcfc4d8c0d3..39f7bd96fd80 100644
--- a/dbaccess/source/ui/inc/indexfieldscontrol.hxx
+++ b/dbaccess/source/ui/inc/indexfieldscontrol.hxx
@@ -48,7 +48,6 @@ namespace dbaui
OUString m_sAscendingText;
OUString m_sDescendingText;
- sal_Int32 m_nMaxColumnsInIndex;
bool m_bAddIndexAppendix;
public:
@@ -56,7 +55,7 @@ namespace dbaui
virtual ~IndexFieldsControl() override;
virtual void dispose() override;
- void Init(const css::uno::Sequence< OUString >& _rAvailableFields, sal_Int32 _nMaxColumnsInIndex,bool _bAddIndexAppendix);
+ void Init(const css::uno::Sequence< OUString >& _rAvailableFields, bool _bAddIndexAppendix);
void initializeFrom(const IndexFields& _rFields);
void commitTo(IndexFields& _rFields);
diff --git a/dbaccess/source/ui/misc/DExport.cxx b/dbaccess/source/ui/misc/DExport.cxx
index 7fb1768cedec..630421578240 100644
--- a/dbaccess/source/ui/misc/DExport.cxx
+++ b/dbaccess/source/ui/misc/DExport.cxx
@@ -100,7 +100,6 @@ ODatabaseExport::ODatabaseExport(sal_Int32 nRows,
,m_nColumnPos(0)
,m_nRows(1)
,m_nRowCount(0)
- ,m_nDefToken( osl_getThreadTextEncoding() )
,m_bError(false)
,m_bInTbl(false)
,m_bHead(true)
@@ -152,7 +151,6 @@ ODatabaseExport::ODatabaseExport(const SharedConnection& _rxConnection,
,m_nColumnPos(0)
,m_nRows(1)
,m_nRowCount(0)
- ,m_nDefToken( osl_getThreadTextEncoding() )
,m_bError(false)
,m_bInTbl(false)
,m_bHead(true)
diff --git a/dbaccess/source/ui/misc/HtmlReader.cxx b/dbaccess/source/ui/misc/HtmlReader.cxx
index 2cbf3202735e..fc14c73d3775 100644
--- a/dbaccess/source/ui/misc/HtmlReader.cxx
+++ b/dbaccess/source/ui/misc/HtmlReader.cxx
@@ -73,10 +73,7 @@ OHTMLReader::OHTMLReader(SvStream& rIn,const SharedConnection& _rxConnection,
: HTMLParser(rIn)
, ODatabaseExport( _rxConnection, _rxNumberF, _rxContext, rIn )
, m_nTableCount(0)
- , m_nWidth(0)
, m_nColumnWidth(87)
- , m_bMetaOptions(false)
- , m_bSDNum(false)
{
SetSrcEncoding( GetExtendedCompatibilityTextEncoding( RTL_TEXTENCODING_ISO_8859_1 ) );
// If the file starts with a BOM, switch to UCS2.
@@ -94,10 +91,7 @@ OHTMLReader::OHTMLReader(SvStream& rIn,
: HTMLParser(rIn)
, ODatabaseExport( nRows, _rColumnPositions, _rxNumberF, _rxContext, pList, _pInfoMap, _bAutoIncrementEnabled, rIn )
, m_nTableCount(0)
- , m_nWidth(0)
, m_nColumnWidth(87)
- , m_bMetaOptions(false)
- , m_bSDNum(false)
{
SetSrcEncoding( GetExtendedCompatibilityTextEncoding( RTL_TEXTENCODING_ISO_8859_1 ) );
// If the file starts with a BOM, switch to UCS2.
@@ -205,7 +199,7 @@ void OHTMLReader::NextToken( HtmlTokenId nToken )
m_sCurrent.clear();
m_nColumnPos++;
eraseTokens();
- m_bSDNum = m_bInTbl = false;
+ m_bInTbl = false;
}
break;
case HtmlTokenId::TABLEROW_OFF:
@@ -266,7 +260,7 @@ void OHTMLReader::NextToken( HtmlTokenId nToken )
m_sTextToken = m_sCurrent;
adjustFormat();
m_nColumnPos++;
- m_bSDNum = m_bInTbl = false;
+ m_bInTbl = false;
m_sCurrent.clear();
break;
case HtmlTokenId::TABLEROW_OFF:
@@ -291,10 +285,7 @@ void OHTMLReader::fetchOptions()
switch( rOption.GetToken() )
{
case HtmlOptionId::SDVAL:
- {
m_sValToken = rOption.GetString();
- m_bSDNum = true;
- }
break;
case HtmlOptionId::SDNUM:
m_sNumToken = rOption.GetString();
@@ -324,9 +315,6 @@ void OHTMLReader::TableDataOn(SvxCellHorJustify& eVal)
eVal = SvxCellHorJustify::Standard;
}
break;
- case HtmlOptionId::WIDTH:
- m_nWidth = GetWidthPixel( rOption );
- break;
default: break;
}
}
@@ -512,7 +500,6 @@ bool OHTMLReader::CreateTable(HtmlTokenId nToken)
void OHTMLReader::setTextEncoding()
{
- m_bMetaOptions = true;
ParseMetaOptions(nullptr, nullptr);
}
diff --git a/dbaccess/source/ui/misc/RtfReader.cxx b/dbaccess/source/ui/misc/RtfReader.cxx
index 29b27bd11f52..613af226b697 100644
--- a/dbaccess/source/ui/misc/RtfReader.cxx
+++ b/dbaccess/source/ui/misc/RtfReader.cxx
@@ -130,10 +130,6 @@ void ORTFReader::NextToken( int nToken )
}
break;
- case RTF_DEFLANG:
- case RTF_LANG: // inquire language
- m_nDefToken = (rtl_TextEncoding)nTokenValue;
- break;
case RTF_TROWD:
{
bool bInsertRow = true;
diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx
index e133b59bd093..01c7c45465fd 100644
--- a/dbaccess/source/ui/querydesign/TableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindow.cxx
@@ -95,12 +95,10 @@ OTableWindow::OTableWindow( vcl::Window* pParent, const TTableWindowData::value_
,Window( pParent, WB_3DLOOK|WB_MOVEABLE )
,m_aTypeImage( VclPtr<FixedImage>::Create(this) )
,m_xTitle( VclPtr<OTableWindowTitle>::Create(this) )
- ,m_pAccessible(nullptr)
,m_pData( pTabWinData )
,m_nMoveCount(0)
,m_nMoveIncrement(1)
,m_nSizingFlags( SizingFlags::NONE )
- ,m_bActive( false )
{
// Set position and size
@@ -135,7 +133,6 @@ void OTableWindow::dispose()
if ( m_pContainerListener.is() )
m_pContainerListener->dispose();
- m_pAccessible = nullptr;
m_aTypeImage.disposeAndClear();
m_xTitle.disposeAndClear();
vcl::Window::dispose();
@@ -485,7 +482,6 @@ void OTableWindow::GetFocus()
void OTableWindow::setActive(bool _bActive)
{
SetBoldTitle( _bActive );
- m_bActive = _bActive;
if (!_bActive && m_xListBox && m_xListBox->GetSelectionCount() != 0)
m_xListBox->SelectAll(false);
}
@@ -560,9 +556,7 @@ void OTableWindow::StateChanged( StateChangedType nType )
Reference< XAccessible > OTableWindow::CreateAccessible()
{
- OTableWindowAccess* pAccessible = new OTableWindowAccess(this);
- m_pAccessible = pAccessible;
- return pAccessible;
+ return new OTableWindowAccess(this);
}
void OTableWindow::Command(const CommandEvent& rEvt)
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx
index 2499e94cc618..7dc3db669f73 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx
@@ -140,7 +140,6 @@ OTableEditorCtrl::OTableEditorCtrl(vcl::Window* pWindow)
,nInvalidateTypeEvent(nullptr)
,m_eChildFocus(NONE)
,nOldDataPos(-1)
- ,bSaveOnMove(true)
,bReadOnly(true)
,m_aInvalidate(this)
{
@@ -801,9 +800,7 @@ void OTableEditorCtrl::InsertRows( long nRow )
}
// RowInserted calls CursorMoved.
// The UI data should not be stored here.
- bSaveOnMove = false;
RowInserted( nRow,vInsertedUndoRedoRows.size() );
- bSaveOnMove = true;
// Create the Undo-Action
GetUndoManager().AddUndoAction( new OTableEditorInsUndoAct(this, nRow,vInsertedUndoRedoRows) );
@@ -820,7 +817,6 @@ void OTableEditorCtrl::DeleteRows()
// Delete all marked rows
long nIndex = FirstSelectedRow();
nOldDataPos = nIndex;
- bSaveOnMove = false;
while( nIndex >= 0 && nIndex < static_cast<long>(m_pRowList->size()) )
{
@@ -835,8 +831,6 @@ void OTableEditorCtrl::DeleteRows()
nIndex = FirstSelectedRow();
}
- bSaveOnMove = true;
-
// Force the current record to be displayed
m_nDataPos = GetCurRow();
InvalidateStatusCell( nOldDataPos );
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.hxx b/dbaccess/source/ui/tabledesign/TEditControl.hxx
index e6ee1332318f..77bca283bf7b 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.hxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.hxx
@@ -62,7 +62,6 @@ namespace dbaui
long nOldDataPos;
- bool bSaveOnMove;
bool bReadOnly;
// helper class
diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx
index b300210f2d18..4e7865fe1a98 100644
--- a/dbaccess/source/ui/tabledesign/TableController.cxx
+++ b/dbaccess/source/ui/tabledesign/TableController.cxx
@@ -477,7 +477,7 @@ void OTableController::doEditIndexes()
if (!xIndexes.is())
return;
- ScopedVclPtrInstance< DbaIndexDialog > aDialog(getView(), aFieldNames, xIndexes, getConnection(), getORB(), isConnected() && getConnection()->getMetaData().is() ? getConnection()->getMetaData()->getMaxColumnsInIndex() : 0);
+ ScopedVclPtrInstance< DbaIndexDialog > aDialog(getView(), aFieldNames, xIndexes, getConnection(), getORB());
if (RET_OK != aDialog->Execute())
return;