summaryrefslogtreecommitdiff
path: root/dbaccess
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-08-04 16:28:49 +0200
committerNoel Grandin <noelgrandin@gmail.com>2015-08-05 09:39:22 +0000
commit403c13487c36f4200adf0986c5d11398f719cd7a (patch)
tree21a4acf87dce1e6c8772f5cbcff3c2a3de21f4ba /dbaccess
parent10560949f90e08fe4a04dd91c7d388c4998100e8 (diff)
loplugin:unusedmethods
Change-Id: I6801618efb5a66d24156fa429e026acb6ca03aba Reviewed-on: https://gerrit.libreoffice.org/17506 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'dbaccess')
-rw-r--r--dbaccess/source/core/recovery/storagestream.cxx18
-rw-r--r--dbaccess/source/core/recovery/storagestream.hxx14
-rw-r--r--dbaccess/source/core/recovery/storagetextstream.cxx2
-rw-r--r--dbaccess/source/core/recovery/storagexmlstream.cxx4
-rw-r--r--dbaccess/source/ext/macromigration/rangeprogressbar.hxx5
-rw-r--r--dbaccess/source/filter/xml/xmlComponent.hxx1
-rw-r--r--dbaccess/source/filter/xml/xmlDataSourceInfo.hxx1
-rw-r--r--dbaccess/source/filter/xml/xmlLogin.hxx1
-rw-r--r--dbaccess/source/filter/xml/xmlStyleImport.hxx2
-rw-r--r--dbaccess/source/filter/xml/xmlfilter.cxx1
-rw-r--r--dbaccess/source/filter/xml/xmlfilter.hxx4
-rw-r--r--dbaccess/source/ui/app/AppController.hxx7
-rw-r--r--dbaccess/source/ui/app/AppDetailPageHelper.hxx1
-rw-r--r--dbaccess/source/ui/app/AppDetailView.hxx1
-rw-r--r--dbaccess/source/ui/app/AppIconControl.hxx1
-rw-r--r--dbaccess/source/ui/app/AppSwapWindow.hxx1
-rw-r--r--dbaccess/source/ui/app/AppView.hxx2
-rw-r--r--dbaccess/source/ui/inc/IClipBoardTest.hxx2
-rw-r--r--dbaccess/source/ui/inc/TableDesignHelpBar.hxx1
-rw-r--r--dbaccess/source/ui/inc/TableDesignView.hxx1
-rw-r--r--dbaccess/source/ui/inc/brwctrlr.hxx3
-rw-r--r--dbaccess/source/ui/inc/dbtreelistbox.hxx2
-rw-r--r--dbaccess/source/ui/inc/sbagrid.hxx11
-rw-r--r--dbaccess/source/ui/inc/tabletree.hxx7
-rw-r--r--dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx1
-rw-r--r--dbaccess/source/ui/tabledesign/TEditControl.hxx1
-rw-r--r--dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx1
27 files changed, 9 insertions, 87 deletions
diff --git a/dbaccess/source/core/recovery/storagestream.cxx b/dbaccess/source/core/recovery/storagestream.cxx
index 90761120e6bc..be596970bb75 100644
--- a/dbaccess/source/core/recovery/storagestream.cxx
+++ b/dbaccess/source/core/recovery/storagestream.cxx
@@ -44,11 +44,9 @@ namespace dbaccess
namespace ElementModes = ::com::sun::star::embed::ElementModes;
// StorageOutputStream
- StorageOutputStream::StorageOutputStream( const Reference<XComponentContext>& i_rContext,
- const Reference< XStorage >& i_rParentStorage,
+ StorageOutputStream::StorageOutputStream( const Reference< XStorage >& i_rParentStorage,
const OUString& i_rStreamName
)
- :m_rContext( i_rContext )
{
ENSURE_OR_THROW( i_rParentStorage.is(), "illegal stream" );
@@ -72,11 +70,9 @@ namespace dbaccess
}
// StorageInputStream
- StorageInputStream::StorageInputStream( const Reference<XComponentContext>& i_rContext,
- const Reference< XStorage >& i_rParentStorage,
+ StorageInputStream::StorageInputStream( const Reference< XStorage >& i_rParentStorage,
const OUString& i_rStreamName
)
- :m_rContext( i_rContext )
{
ENSURE_OR_THROW( i_rParentStorage.is(), "illegal stream" );
@@ -89,16 +85,6 @@ namespace dbaccess
{
}
- void StorageInputStream::close()
- {
- ENSURE_OR_RETURN_VOID( m_xInputStream.is(), "already closed" );
- m_xInputStream->closeInput();
- m_xInputStream.clear();
-
- // if you add additional functionality here, be aware that there are derived classes which
- // (legitimately) do not call this method here.
- }
-
} // namespace dbaccess
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/recovery/storagestream.hxx b/dbaccess/source/core/recovery/storagestream.hxx
index 1a87ba91322a..ce5ce60b049e 100644
--- a/dbaccess/source/core/recovery/storagestream.hxx
+++ b/dbaccess/source/core/recovery/storagestream.hxx
@@ -35,7 +35,6 @@ namespace dbaccess
{
public:
StorageOutputStream(
- const css::uno::Reference< css::uno::XComponentContext >& i_rContext,
const css::uno::Reference< css::embed::XStorage >& i_rParentStorage,
const OUString& i_rStreamName
);
@@ -46,14 +45,10 @@ namespace dbaccess
virtual void close();
protected:
- const css::uno::Reference< css::uno::XComponentContext >&
- getContext() const { return m_rContext; }
const css::uno::Reference< css::io::XOutputStream >&
getOutputStream() const { return m_xOutputStream; }
private:
- const css::uno::Reference< css::uno::XComponentContext >&
- m_rContext;
css::uno::Reference< css::io::XOutputStream >
m_xOutputStream;
};
@@ -65,25 +60,16 @@ namespace dbaccess
{
public:
StorageInputStream(
- const css::uno::Reference< css::uno::XComponentContext >& i_rContext,
const css::uno::Reference< css::embed::XStorage >& i_rParentStorage,
const OUString& i_rStreamName
);
virtual ~StorageInputStream();
- /** simply calls closeInput on our input stream, override to extend/modify this behavior
- */
- void close();
-
protected:
- const css::uno::Reference< css::uno::XComponentContext >&
- getContext() const { return m_rContext; }
const css::uno::Reference< css::io::XInputStream >&
getInputStream() const { return m_xInputStream; }
private:
- const css::uno::Reference< css::uno::XComponentContext >&
- m_rContext;
css::uno::Reference< css::io::XInputStream >
m_xInputStream;
};
diff --git a/dbaccess/source/core/recovery/storagetextstream.cxx b/dbaccess/source/core/recovery/storagetextstream.cxx
index 6d5739837d50..94fa28f346af 100644
--- a/dbaccess/source/core/recovery/storagetextstream.cxx
+++ b/dbaccess/source/core/recovery/storagetextstream.cxx
@@ -56,7 +56,7 @@ namespace dbaccess
const Reference< XStorage >& i_rParentStorage,
const OUString& i_rStreamName
)
- :StorageOutputStream( i_rContext, i_rParentStorage, i_rStreamName )
+ :StorageOutputStream( i_rParentStorage, i_rStreamName )
,m_pData( new StorageTextOutputStream_Data )
{
m_pData->xTextOutput = TextOutputStream::create( i_rContext );
diff --git a/dbaccess/source/core/recovery/storagexmlstream.cxx b/dbaccess/source/core/recovery/storagexmlstream.cxx
index 06ef1bdea858..d694d6529704 100644
--- a/dbaccess/source/core/recovery/storagexmlstream.cxx
+++ b/dbaccess/source/core/recovery/storagexmlstream.cxx
@@ -70,7 +70,7 @@ namespace dbaccess
StorageXMLOutputStream::StorageXMLOutputStream( const Reference<XComponentContext>& i_rContext,
const Reference< XStorage >& i_rParentStorage,
const OUString& i_rStreamName )
- :StorageOutputStream( i_rContext, i_rParentStorage, i_rStreamName )
+ :StorageOutputStream( i_rParentStorage, i_rStreamName )
,m_pData( new StorageXMLOutputStream_Data )
{
const Reference< XWriter > xSaxWriter = Writer::create( i_rContext );
@@ -142,7 +142,7 @@ namespace dbaccess
StorageXMLInputStream::StorageXMLInputStream( const Reference<XComponentContext>& i_rContext,
const Reference< XStorage >& i_rParentStorage,
const OUString& i_rStreamName )
- :StorageInputStream( i_rContext, i_rParentStorage, i_rStreamName )
+ :StorageInputStream( i_rParentStorage, i_rStreamName )
,m_pData( new StorageXMLInputStream_Data )
{
m_pData->xParser.set( Parser::create(i_rContext) );
diff --git a/dbaccess/source/ext/macromigration/rangeprogressbar.hxx b/dbaccess/source/ext/macromigration/rangeprogressbar.hxx
index d0039eb87e2b..d312a7925663 100644
--- a/dbaccess/source/ext/macromigration/rangeprogressbar.hxx
+++ b/dbaccess/source/ext/macromigration/rangeprogressbar.hxx
@@ -59,11 +59,6 @@ namespace dbmm
m_pBar->SetValue( (sal_uInt16)( 100.0 * _nValue / m_nRange ) );
}
- sal_uInt32 GetValue() const
- {
- return (sal_uInt32)(m_pBar->GetValue() / 100.0 * m_nRange);
- }
-
private:
VclPtr<ProgressBar> m_pBar;
sal_uInt32 m_nRange;
diff --git a/dbaccess/source/filter/xml/xmlComponent.hxx b/dbaccess/source/filter/xml/xmlComponent.hxx
index 82a360c0641b..6020a1e35497 100644
--- a/dbaccess/source/filter/xml/xmlComponent.hxx
+++ b/dbaccess/source/filter/xml/xmlComponent.hxx
@@ -32,7 +32,6 @@ namespace dbaxml
OUString m_sComponentServiceName;
bool m_bAsTemplate;
- ODBFilter& GetOwnImport();
public:
OXMLComponent( ODBFilter& rImport
diff --git a/dbaccess/source/filter/xml/xmlDataSourceInfo.hxx b/dbaccess/source/filter/xml/xmlDataSourceInfo.hxx
index fc33cd6b305b..91e6ffcdf39b 100644
--- a/dbaccess/source/filter/xml/xmlDataSourceInfo.hxx
+++ b/dbaccess/source/filter/xml/xmlDataSourceInfo.hxx
@@ -26,7 +26,6 @@ namespace dbaxml
class ODBFilter;
class OXMLDataSourceInfo : public SvXMLImportContext
{
- ODBFilter& GetOwnImport();
public:
OXMLDataSourceInfo( ODBFilter& rImport, sal_uInt16 nPrfx,
diff --git a/dbaccess/source/filter/xml/xmlLogin.hxx b/dbaccess/source/filter/xml/xmlLogin.hxx
index 0a46eab2701a..ac13d93246ae 100644
--- a/dbaccess/source/filter/xml/xmlLogin.hxx
+++ b/dbaccess/source/filter/xml/xmlLogin.hxx
@@ -26,7 +26,6 @@ namespace dbaxml
class ODBFilter;
class OXMLLogin : public SvXMLImportContext
{
- ODBFilter& GetOwnImport();
public:
OXMLLogin( ODBFilter& rImport, sal_uInt16 nPrfx,
diff --git a/dbaccess/source/filter/xml/xmlStyleImport.hxx b/dbaccess/source/filter/xml/xmlStyleImport.hxx
index 23718c4199f1..73d9dd1f3480 100644
--- a/dbaccess/source/filter/xml/xmlStyleImport.hxx
+++ b/dbaccess/source/filter/xml/xmlStyleImport.hxx
@@ -68,8 +68,6 @@ namespace dbaxml
virtual void SetDefaults() SAL_OVERRIDE;
void AddProperty(sal_Int16 nContextID, const css::uno::Any& aValue);
-
- sal_Int32 GetNumberFormat() { return m_nNumberFormat; }
};
class OTableStylesContext : public SvXMLStylesContext
diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx
index 534e22c97d8f..194349c9bdd3 100644
--- a/dbaccess/source/filter/xml/xmlfilter.cxx
+++ b/dbaccess/source/filter/xml/xmlfilter.cxx
@@ -205,7 +205,6 @@ sal_Int32 ReadThroughComponent(
ODBFilter::ODBFilter( const uno::Reference< XComponentContext >& _rxContext )
: SvXMLImport(_rxContext, getImplementationName_Static())
- , m_nPreviewMode(0)
, m_bNewFormat(false)
{
diff --git a/dbaccess/source/filter/xml/xmlfilter.hxx b/dbaccess/source/filter/xml/xmlfilter.hxx
index c9547a779120..21226c19a9de 100644
--- a/dbaccess/source/filter/xml/xmlfilter.hxx
+++ b/dbaccess/source/filter/xml/xmlfilter.hxx
@@ -80,7 +80,6 @@ private:
mutable rtl::Reference < XMLPropertySetMapper > m_xColumnStylesPropertySetMapper;
mutable rtl::Reference < XMLPropertySetMapper > m_xCellStylesPropertySetMapper;
Reference<XPropertySet> m_xDataSource;
- sal_Int32 m_nPreviewMode;
bool m_bNewFormat;
bool implImport( const Sequence< PropertyValue >& rDescriptor ) throw (RuntimeException, std::exception);
@@ -127,7 +126,6 @@ public:
inline Reference<XPropertySet> getDataSource() const { return m_xDataSource; }
inline const TPropertyNameMap& getQuerySettings() const { return m_aQuerySettings;}
- inline const TPropertyNameMap& getTableSettings() const { return m_aTablesSettings;}
const SvXMLTokenMap& GetDocElemTokenMap() const;
const SvXMLTokenMap& GetDatabaseElemTokenMap() const;
@@ -154,8 +152,6 @@ public:
void setPropertyInfo();
- const ::std::map< sal_uInt16,css::beans::Property>& GetDataSourceInfoDefaulValueMap() const;
-
inline bool isNewFormat() const { return m_bNewFormat; }
inline void setNewFormat(bool _bNewFormat) { m_bNewFormat = _bNewFormat; }
};
diff --git a/dbaccess/source/ui/app/AppController.hxx b/dbaccess/source/ui/app/AppController.hxx
index 7e4c664f7999..ada71a0b3b40 100644
--- a/dbaccess/source/ui/app/AppController.hxx
+++ b/dbaccess/source/ui/app/AppController.hxx
@@ -394,10 +394,6 @@ namespace dbaui
protected:
// initalizing members
- /** forces usage of a connection which we do not own
- <p>To be used from within XInitialization::initialize only.</p>
- */
- void initializeConnection( const css::uno::Reference< css::sdbc::XConnection >& _rxForeignConn );
// state of a feature. 'feature' may be the handle of a css::util::URL somebody requested a dispatch interface for OR a toolbar slot.
virtual FeatureState GetState(sal_uInt16 nId) const SAL_OVERRIDE;
@@ -484,9 +480,6 @@ namespace dbaui
/// determines whether we're currently connected to the database
bool isConnected() const { return m_xDataSourceConnection.is(); }
- const css::uno::Reference< css::sdbc::XDatabaseMetaData >&
- getConnectionMetaData() const { return m_xMetaData; }
-
/** refreshes the tables
*/
void refreshTables();
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.hxx b/dbaccess/source/ui/app/AppDetailPageHelper.hxx
index d6c73cfcd261..31e71c5119b6 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.hxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.hxx
@@ -159,7 +159,6 @@ namespace dbaui
DECL_LINK( OnPasteEntry, void* );
DECL_LINK( OnDeleteEntry, void* );
- DECL_LINK(PreviewChangeHdl, void*);
// click a TB slot
DECL_LINK_TYPED(OnDropdownClickHdl, ToolBox*, void);
diff --git a/dbaccess/source/ui/app/AppDetailView.hxx b/dbaccess/source/ui/app/AppDetailView.hxx
index 9e0bf5055922..bf578274c483 100644
--- a/dbaccess/source/ui/app/AppDetailView.hxx
+++ b/dbaccess/source/ui/app/AppDetailView.hxx
@@ -195,7 +195,6 @@ namespace dbaui
bool isCutAllowed() SAL_OVERRIDE ;
bool isCopyAllowed() SAL_OVERRIDE ;
bool isPasteAllowed() SAL_OVERRIDE;
- virtual bool hasChildPathFocus() SAL_OVERRIDE { return HasChildPathFocus(); }
void copy() SAL_OVERRIDE;
void cut() SAL_OVERRIDE;
void paste() SAL_OVERRIDE;
diff --git a/dbaccess/source/ui/app/AppIconControl.hxx b/dbaccess/source/ui/app/AppIconControl.hxx
index 54a9c1a30954..b5a135cc2cf7 100644
--- a/dbaccess/source/ui/app/AppIconControl.hxx
+++ b/dbaccess/source/ui/app/AppIconControl.hxx
@@ -37,7 +37,6 @@ namespace dbaui
virtual void dispose() SAL_OVERRIDE;
void setControlActionListener( IControlActionListener* _pListener ) { m_pActionListener = _pListener; }
- IControlActionListener* getControlActionListener( ) const { return m_pActionListener; }
protected:
// DropTargetHelper overridables
diff --git a/dbaccess/source/ui/app/AppSwapWindow.hxx b/dbaccess/source/ui/app/AppSwapWindow.hxx
index 077bc165a219..11f04fc9aef8 100644
--- a/dbaccess/source/ui/app/AppSwapWindow.hxx
+++ b/dbaccess/source/ui/app/AppSwapWindow.hxx
@@ -51,7 +51,6 @@ namespace dbaui
bool isCutAllowed() SAL_OVERRIDE { return false; }
bool isCopyAllowed() SAL_OVERRIDE { return false; }
bool isPasteAllowed() SAL_OVERRIDE { return false; }
- virtual bool hasChildPathFocus() SAL_OVERRIDE { return HasChildPathFocus(); }
void copy() SAL_OVERRIDE { }
void cut() SAL_OVERRIDE { }
void paste() SAL_OVERRIDE { }
diff --git a/dbaccess/source/ui/app/AppView.hxx b/dbaccess/source/ui/app/AppView.hxx
index 5392c030fafc..1ff50802b01e 100644
--- a/dbaccess/source/ui/app/AppView.hxx
+++ b/dbaccess/source/ui/app/AppView.hxx
@@ -117,13 +117,11 @@ namespace dbaui
virtual void GetFocus() SAL_OVERRIDE;
inline IApplicationController& getAppController() const { return m_rAppController; }
- inline const css::lang::Locale& getLocale() const { return m_aLocale;}
// IClipboardTest
virtual bool isCutAllowed() SAL_OVERRIDE;
virtual bool isCopyAllowed() SAL_OVERRIDE;
virtual bool isPasteAllowed() SAL_OVERRIDE;
- virtual bool hasChildPathFocus() SAL_OVERRIDE { return HasChildPathFocus(); }
virtual void copy() SAL_OVERRIDE;
virtual void cut() SAL_OVERRIDE;
virtual void paste() SAL_OVERRIDE;
diff --git a/dbaccess/source/ui/inc/IClipBoardTest.hxx b/dbaccess/source/ui/inc/IClipBoardTest.hxx
index b44ec42b095a..428116704717 100644
--- a/dbaccess/source/ui/inc/IClipBoardTest.hxx
+++ b/dbaccess/source/ui/inc/IClipBoardTest.hxx
@@ -29,8 +29,6 @@ namespace dbaui
virtual bool isCopyAllowed() = 0;
virtual bool isPasteAllowed() = 0;
- virtual bool hasChildPathFocus() = 0;
-
virtual void copy() = 0;
virtual void cut() = 0;
virtual void paste() = 0;
diff --git a/dbaccess/source/ui/inc/TableDesignHelpBar.hxx b/dbaccess/source/ui/inc/TableDesignHelpBar.hxx
index bcc79095dec8..d78f3605cd1d 100644
--- a/dbaccess/source/ui/inc/TableDesignHelpBar.hxx
+++ b/dbaccess/source/ui/inc/TableDesignHelpBar.hxx
@@ -52,7 +52,6 @@ namespace dbaui
virtual bool isCutAllowed() SAL_OVERRIDE;
virtual bool isCopyAllowed() SAL_OVERRIDE;
virtual bool isPasteAllowed() SAL_OVERRIDE;
- virtual bool hasChildPathFocus() SAL_OVERRIDE { return HasChildPathFocus(); }
virtual void copy() SAL_OVERRIDE;
virtual void cut() SAL_OVERRIDE;
diff --git a/dbaccess/source/ui/inc/TableDesignView.hxx b/dbaccess/source/ui/inc/TableDesignView.hxx
index 863628c153f3..8b960403a723 100644
--- a/dbaccess/source/ui/inc/TableDesignView.hxx
+++ b/dbaccess/source/ui/inc/TableDesignView.hxx
@@ -94,7 +94,6 @@ namespace dbaui
virtual bool isCutAllowed() SAL_OVERRIDE;
virtual bool isCopyAllowed() SAL_OVERRIDE;
virtual bool isPasteAllowed() SAL_OVERRIDE;
- virtual bool hasChildPathFocus() SAL_OVERRIDE { return HasChildPathFocus(); }
virtual void copy() SAL_OVERRIDE;
virtual void cut() SAL_OVERRIDE;
virtual void paste() SAL_OVERRIDE;
diff --git a/dbaccess/source/ui/inc/brwctrlr.hxx b/dbaccess/source/ui/inc/brwctrlr.hxx
index 68cb712ce317..7c1dfef21e6a 100644
--- a/dbaccess/source/ui/inc/brwctrlr.hxx
+++ b/dbaccess/source/ui/inc/brwctrlr.hxx
@@ -139,9 +139,6 @@ namespace dbaui
void onStartLoading( const css::uno::Reference< css::form::XLoadable >& _rxLoadable );
void setLoadingCancelled() { m_bLoadCanceled = true; }
- const TransferableDataHelper&
- getViewClipboard() const { return m_aSystemClipboard; }
-
public:
SbaXDataBrowserController(const css::uno::Reference< css::uno::XComponentContext >& _rM);
diff --git a/dbaccess/source/ui/inc/dbtreelistbox.hxx b/dbaccess/source/ui/inc/dbtreelistbox.hxx
index a47af3e632d9..437bdd88b283 100644
--- a/dbaccess/source/ui/inc/dbtreelistbox.hxx
+++ b/dbaccess/source/ui/inc/dbtreelistbox.hxx
@@ -95,8 +95,6 @@ namespace dbaui
void setCopyHandler(const Link<>& _rHdl) { m_aCopyHandler = _rHdl; }
void setPasteHandler(const Link<>& _rHdl) { m_aPasteHandler = _rHdl; }
void setDeleteHandler(const Link<>& _rHdl) { m_aDeleteHandler = _rHdl; }
- void setEditingHandler(const Link<>& _rHdl) { m_aEditingHandler = _rHdl; }
- void setEditedHandler(const Link<>& _rHdl) { m_aEditedHandler = _rHdl; }
// modified the given entry so that the expand handler is called whenever the entry is expanded
// (normally, the expand handler is called only once)
diff --git a/dbaccess/source/ui/inc/sbagrid.hxx b/dbaccess/source/ui/inc/sbagrid.hxx
index c4019306a9fb..d12fb09d27af 100644
--- a/dbaccess/source/ui/inc/sbagrid.hxx
+++ b/dbaccess/source/ui/inc/sbagrid.hxx
@@ -215,18 +215,15 @@ namespace dbaui
// Attributes
protected:
svx::ODataAccessDescriptor m_aDataDescriptor;
- SbaGridListener* m_pMasterListener;
+ SbaGridListener* m_pMasterListener;
- ImplSVEvent * m_nAsyncDropEvent;
+ ImplSVEvent * m_nAsyncDropEvent;
- sal_uInt16 m_nCurrentActionColId;
+ sal_uInt16 m_nCurrentActionColId;
// ui actions (e.g. a context menu) may be performed on columns which aren't the current one
// and aren't selected, so we have to track this column id
- bool m_bActivatingForDrop;
- // Attribute Access
- public:
- sal_uInt16 GetCurrentActionColumn() const { return m_nCurrentActionColId; }
+ bool m_bActivatingForDrop;
public:
SbaGridControl(css::uno::Reference< css::uno::XComponentContext >,Window* pParent, FmXGridPeer* _pPeer, WinBits nBits = WB_TABSTOP);
diff --git a/dbaccess/source/ui/inc/tabletree.hxx b/dbaccess/source/ui/inc/tabletree.hxx
index 4cd9f8f8a8e6..ea35a8609167 100644
--- a/dbaccess/source/ui/inc/tabletree.hxx
+++ b/dbaccess/source/ui/inc/tabletree.hxx
@@ -63,13 +63,6 @@ public:
*/
static bool isFolderEntry( const SvTreeListEntry* _pEntry );
- /** determines whether the given entry denotes a table or view
- */
- static bool isTableOrViewEntry( const SvTreeListEntry* _pEntry )
- {
- return !isFolderEntry( _pEntry );
- }
-
/** fill the table list with the tables belonging to the connection described by the parameters
@param _rxConnection
the connection, which must support the service com.sun.star.sdb.Connection
diff --git a/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx b/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx
index 15eed590dbb5..c80a54ce3c1e 100644
--- a/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx
+++ b/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx
@@ -62,7 +62,6 @@ namespace dbaui
virtual bool isCutAllowed() SAL_OVERRIDE;
virtual bool isCopyAllowed() SAL_OVERRIDE;
virtual bool isPasteAllowed() SAL_OVERRIDE;
- virtual bool hasChildPathFocus() SAL_OVERRIDE { return HasChildPathFocus(); }
virtual void copy() SAL_OVERRIDE;
virtual void cut() SAL_OVERRIDE;
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.hxx b/dbaccess/source/ui/tabledesign/TEditControl.hxx
index 7a714ef6807f..c85cb511df22 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.hxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.hxx
@@ -169,7 +169,6 @@ namespace dbaui
virtual bool isCutAllowed() SAL_OVERRIDE { return IsCutAllowed(); }
virtual bool isCopyAllowed() SAL_OVERRIDE { return IsCopyAllowed(); }
virtual bool isPasteAllowed() SAL_OVERRIDE { return IsPasteAllowed(); }
- virtual bool hasChildPathFocus() SAL_OVERRIDE { return HasChildPathFocus(); }
virtual void cut() SAL_OVERRIDE;
virtual void copy() SAL_OVERRIDE;
diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx
index f38f0fd99c26..e300a483500c 100644
--- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx
+++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx
@@ -83,7 +83,6 @@ namespace dbaui
virtual bool isCutAllowed() SAL_OVERRIDE;
virtual bool isCopyAllowed() SAL_OVERRIDE;
virtual bool isPasteAllowed() SAL_OVERRIDE;
- virtual bool hasChildPathFocus() SAL_OVERRIDE { return HasChildPathFocus(); }
virtual void copy() SAL_OVERRIDE;
virtual void cut() SAL_OVERRIDE;