[Libreoffice-commits] core.git: 2 commits - accessibility/inc accessibility/source basctl/source chart2/source comphelper/source cppcanvas/source dbaccess/source include/comphelper include/oox oox/source reportdesign/source svx/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Feb 25 07:06:30 UTC 2019
accessibility/inc/standard/vclxaccessiblelistitem.hxx | 1
accessibility/source/standard/vclxaccessiblelistitem.cxx | 2 -
basctl/source/basicide/baside3.cxx | 4 --
basctl/source/inc/baside3.hxx | 2 -
chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx | 17 +---------
chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx | 6 ---
comphelper/source/misc/SelectionMultiplex.cxx | 10 -----
cppcanvas/source/inc/canvasgraphichelper.hxx | 1
cppcanvas/source/tools/canvasgraphichelper.cxx | 9 -----
dbaccess/source/core/api/RowSet.cxx | 1
dbaccess/source/core/api/RowSetBase.cxx | 4 --
dbaccess/source/core/api/RowSetCacheIterator.cxx | 5 --
dbaccess/source/core/api/RowSetCacheIterator.hxx | 3 -
dbaccess/source/core/misc/dsntypes.cxx | 1
dbaccess/source/inc/dsntypes.hxx | 1
dbaccess/source/ui/app/AppIconControl.cxx | 1
dbaccess/source/ui/app/AppIconControl.hxx | 1
dbaccess/source/ui/browser/dbloader.cxx | 4 --
dbaccess/source/ui/dlg/RelationDlg.cxx | 2 -
dbaccess/source/ui/dlg/dbwizsetup.cxx | 6 +--
dbaccess/source/ui/dlg/generalpage.cxx | 16 ++-------
dbaccess/source/ui/dlg/generalpage.hxx | 10 +----
dbaccess/source/ui/inc/DExport.hxx | 1
dbaccess/source/ui/inc/FieldDescriptions.hxx | 1
dbaccess/source/ui/inc/RelationDlg.hxx | 1
dbaccess/source/ui/inc/TokenWriter.hxx | 1
dbaccess/source/ui/inc/TypeInfo.hxx | 2 -
dbaccess/source/ui/misc/DExport.cxx | 7 +---
dbaccess/source/ui/misc/HtmlReader.cxx | 3 -
dbaccess/source/ui/misc/TokenWriter.cxx | 17 ----------
dbaccess/source/ui/misc/UITools.cxx | 6 +--
dbaccess/source/ui/tabledesign/FieldDescriptions.cxx | 5 --
include/comphelper/SelectionMultiplex.hxx | 10 -----
include/oox/drawingml/shapegroupcontext.hxx | 2 -
oox/source/drawingml/shapegroupcontext.cxx | 5 +-
reportdesign/source/ui/dlg/Navigator.cxx | 2 -
svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx | 1
svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx | 3 -
38 files changed, 23 insertions(+), 151 deletions(-)
New commits:
commit 970ca8de0be4c4cd9485170f3c56a34b4069eec2
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Sun Feb 24 09:15:32 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Mon Feb 25 08:06:15 2019 +0100
loplugin:unusedfields in various
Change-Id: I31d0e6c3559af2e322fb474b97f3bbf4d5064831
Reviewed-on: https://gerrit.libreoffice.org/68280
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/accessibility/inc/standard/vclxaccessiblelistitem.hxx b/accessibility/inc/standard/vclxaccessiblelistitem.hxx
index 02eb11641755..d6fdb6f762bc 100644
--- a/accessibility/inc/standard/vclxaccessiblelistitem.hxx
+++ b/accessibility/inc/standard/vclxaccessiblelistitem.hxx
@@ -66,7 +66,6 @@ private:
sal_uInt32 m_nClientId;
rtl::Reference< VCLXAccessibleList > m_xParent;
- css::uno::Reference< css::accessibility::XAccessibleContext > m_xParentContext;
virtual ~VCLXAccessibleListItem() override = default;
/** this function is called upon disposing the component
diff --git a/accessibility/source/standard/vclxaccessiblelistitem.cxx b/accessibility/source/standard/vclxaccessiblelistitem.cxx
index b406725f519c..e674cd26e466 100644
--- a/accessibility/source/standard/vclxaccessiblelistitem.cxx
+++ b/accessibility/source/standard/vclxaccessiblelistitem.cxx
@@ -72,7 +72,6 @@ VCLXAccessibleListItem::VCLXAccessibleListItem(sal_Int32 _nIndexInParent, const
, m_xParent(_xParent)
{
assert(m_xParent.is());
- m_xParentContext = m_xParent->getAccessibleContext();
::accessibility::IComboListBoxHelper* pListBoxHelper = m_xParent->getListBoxHelper();
if (pListBoxHelper)
m_sEntryText = pListBoxHelper->GetEntry(static_cast<sal_uInt16>(_nIndexInParent));
@@ -157,7 +156,6 @@ void SAL_CALL VCLXAccessibleListItem::disposing()
VCLXAccessibleListItem_BASE::disposing();
m_sEntryText.clear();
m_xParent = nullptr;
- m_xParentContext = nullptr;
nId = m_nClientId;
m_nClientId = 0;
diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx
index 48eb1c8cf3e4..7de114b17ced 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -1261,7 +1261,6 @@ ItemType DialogWindow::GetType () const
DialogWindowLayout::DialogWindowLayout (vcl::Window* pParent, ObjectCatalog& rObjectCatalog_) :
Layout(pParent),
- pChild(nullptr),
rObjectCatalog(rObjectCatalog_),
pPropertyBrowser(nullptr)
{
@@ -1278,7 +1277,6 @@ void DialogWindowLayout::dispose()
if (pPropertyBrowser)
Remove(pPropertyBrowser);
pPropertyBrowser.disposeAndClear();
- pChild.clear();
Layout::dispose();
}
@@ -1321,7 +1319,6 @@ void DialogWindowLayout::UpdatePropertyBrowser ()
void DialogWindowLayout::Activating (BaseWindow& rChild)
{
assert(dynamic_cast<DialogWindow*>(&rChild));
- pChild = &static_cast<DialogWindow&>(rChild);
rObjectCatalog.SetLayoutWindow(this);
rObjectCatalog.UpdateEntries();
rObjectCatalog.Show();
@@ -1336,7 +1333,6 @@ void DialogWindowLayout::Deactivating ()
rObjectCatalog.Hide();
if (pPropertyBrowser)
pPropertyBrowser->Hide();
- pChild = nullptr;
}
void DialogWindowLayout::ExecuteGlobal (SfxRequest& rReq)
diff --git a/basctl/source/inc/baside3.hxx b/basctl/source/inc/baside3.hxx
index e48c135f4480..e955b6b71430 100644
--- a/basctl/source/inc/baside3.hxx
+++ b/basctl/source/inc/baside3.hxx
@@ -137,8 +137,6 @@ protected:
virtual void OnFirstSize (long nWidth, long nHeight) override;
private:
- // child window
- VclPtr<DialogWindow> pChild;
// dockable windows:
// object catalog (owned by Shell)
ObjectCatalog& rObjectCatalog;
diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
index adde5bc6aec1..dfaabff61fe6 100644
--- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
@@ -348,7 +348,6 @@ public:
protected:
DataSeriesPointWrapper* m_pDataSeriesPointWrapper;
mutable Any m_aDefaultValue;
- mutable Any m_aOuterValue;
};
WrappedLineColorProperty::WrappedLineColorProperty(
@@ -356,23 +355,18 @@ WrappedLineColorProperty::WrappedLineColorProperty(
: WrappedSeriesAreaOrLineProperty("LineColor","BorderColor","Color", pDataSeriesPointWrapper )
, m_pDataSeriesPointWrapper( pDataSeriesPointWrapper )
, m_aDefaultValue(uno::Any(sal_Int32( 0x0099ccff ))) // blue 8
- , m_aOuterValue(m_aDefaultValue)
{
}
void WrappedLineColorProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const
{
- if( m_pDataSeriesPointWrapper && m_pDataSeriesPointWrapper->isLinesForbidden() )
- m_aOuterValue = rOuterValue;
- else
+ if( !m_pDataSeriesPointWrapper || !m_pDataSeriesPointWrapper->isLinesForbidden() )
WrappedSeriesAreaOrLineProperty::setPropertyValue( rOuterValue, xInnerPropertySet );
}
void WrappedLineColorProperty::setPropertyToDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const
{
- if( m_pDataSeriesPointWrapper && m_pDataSeriesPointWrapper->isLinesForbidden() )
- m_aOuterValue = m_aDefaultValue;
- else
+ if( !m_pDataSeriesPointWrapper || !m_pDataSeriesPointWrapper->isLinesForbidden() )
WrappedSeriesAreaOrLineProperty::setPropertyToDefault( xInnerPropertyState );
}
@@ -396,7 +390,6 @@ public:
protected:
DataSeriesPointWrapper* m_pDataSeriesPointWrapper;
mutable Any m_aDefaultValue;
- mutable Any m_aOuterValue;
};
WrappedLineStyleProperty::WrappedLineStyleProperty(
@@ -404,7 +397,6 @@ WrappedLineStyleProperty::WrappedLineStyleProperty(
: WrappedSeriesAreaOrLineProperty("LineStyle","BorderStyle", "LineStyle", pDataSeriesPointWrapper )
, m_pDataSeriesPointWrapper( pDataSeriesPointWrapper )
, m_aDefaultValue(uno::Any(drawing::LineStyle_SOLID))
- , m_aOuterValue(m_aDefaultValue)
{
}
@@ -413,7 +405,6 @@ void WrappedLineStyleProperty::setPropertyValue( const Any& rOuterValue, const R
Any aNewValue(rOuterValue);
if( m_pDataSeriesPointWrapper && m_pDataSeriesPointWrapper->isLinesForbidden() )
{
- m_aOuterValue = rOuterValue;
aNewValue <<= drawing::LineStyle_NONE;
}
WrappedSeriesAreaOrLineProperty::setPropertyValue( aNewValue, xInnerPropertySet );
@@ -421,9 +412,7 @@ void WrappedLineStyleProperty::setPropertyValue( const Any& rOuterValue, const R
void WrappedLineStyleProperty::setPropertyToDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const
{
- if( m_pDataSeriesPointWrapper && m_pDataSeriesPointWrapper->isLinesForbidden() )
- m_aOuterValue = m_aDefaultValue;
- else
+ if( !m_pDataSeriesPointWrapper || !m_pDataSeriesPointWrapper->isLinesForbidden() )
WrappedSeriesAreaOrLineProperty::setPropertyToDefault( xInnerPropertyState );
}
diff --git a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
index c274f88aa48f..954c61aba2ff 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
@@ -657,9 +657,6 @@ public:
explicit WrappedErrorBarRangePositiveProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType );
-
-private:
- mutable Any m_aOuterValue;
};
WrappedErrorBarRangePositiveProperty::WrappedErrorBarRangePositiveProperty(
@@ -720,9 +717,6 @@ public:
explicit WrappedErrorBarRangeNegativeProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType );
-
-private:
- mutable Any m_aOuterValue;
};
WrappedErrorBarRangeNegativeProperty::WrappedErrorBarRangeNegativeProperty(
diff --git a/comphelper/source/misc/SelectionMultiplex.cxx b/comphelper/source/misc/SelectionMultiplex.cxx
index d7b7b721bbfc..267266388c71 100644
--- a/comphelper/source/misc/SelectionMultiplex.cxx
+++ b/comphelper/source/misc/SelectionMultiplex.cxx
@@ -40,18 +40,11 @@ void OSelectionChangeListener::_disposing(const EventObject&)
}
-void OSelectionChangeListener::setAdapter(OSelectionChangeMultiplexer* pAdapter)
-{
- ::osl::MutexGuard aGuard(m_rMutex);
- m_xAdapter = pAdapter;
-}
-
OSelectionChangeMultiplexer::OSelectionChangeMultiplexer(OSelectionChangeListener* _pListener, const Reference< XSelectionSupplier>& _rxSet)
:m_xSet(_rxSet)
,m_pListener(_pListener)
,m_nLockCount(0)
{
- m_pListener->setAdapter(this);
osl_atomic_increment(&m_refCount);
{
Reference< XSelectionChangeListener> xPreventDelete(this);
@@ -87,9 +80,6 @@ void SAL_CALL OSelectionChangeMultiplexer::disposing( const EventObject& _rSour
// tell the listener
if (!locked())
m_pListener->_disposing(_rSource);
- // disconnect the listener
- if (m_pListener) // may have been reset whilst calling into _disposing
- m_pListener->setAdapter(nullptr);
}
m_pListener = nullptr;
diff --git a/cppcanvas/source/inc/canvasgraphichelper.hxx b/cppcanvas/source/inc/canvasgraphichelper.hxx
index 96daa1a74b9f..fee174300e83 100644
--- a/cppcanvas/source/inc/canvasgraphichelper.hxx
+++ b/cppcanvas/source/inc/canvasgraphichelper.hxx
@@ -63,7 +63,6 @@ namespace cppcanvas
boost::optional<basegfx::B2DPolyPolygon> maClipPolyPolygon;
CanvasSharedPtr mpCanvas;
- css::uno::Reference< css::rendering::XGraphicDevice > mxGraphicDevice;
};
}
diff --git a/cppcanvas/source/tools/canvasgraphichelper.cxx b/cppcanvas/source/tools/canvasgraphichelper.cxx
index ded58f9f6b2e..592179f42364 100644
--- a/cppcanvas/source/tools/canvasgraphichelper.cxx
+++ b/cppcanvas/source/tools/canvasgraphichelper.cxx
@@ -43,19 +43,12 @@ namespace cppcanvas
{
CanvasGraphicHelper::CanvasGraphicHelper( const CanvasSharedPtr& rParentCanvas ) :
maClipPolyPolygon(),
- mpCanvas( rParentCanvas ),
- mxGraphicDevice()
+ mpCanvas( rParentCanvas )
{
OSL_ENSURE( mpCanvas.get() != nullptr &&
mpCanvas->getUNOCanvas().is(),
"CanvasGraphicHelper::CanvasGraphicHelper: no valid canvas" );
- if( mpCanvas.get() != nullptr &&
- mpCanvas->getUNOCanvas().is() )
- {
- mxGraphicDevice = mpCanvas->getUNOCanvas()->getDevice();
- }
-
::canvas::tools::initRenderState( maRenderState );
}
diff --git a/include/comphelper/SelectionMultiplex.hxx b/include/comphelper/SelectionMultiplex.hxx
index 77ed7a363636..f1a0e294d765 100644
--- a/include/comphelper/SelectionMultiplex.hxx
+++ b/include/comphelper/SelectionMultiplex.hxx
@@ -45,22 +45,14 @@ namespace comphelper
{
friend class OSelectionChangeMultiplexer;
- rtl::Reference<OSelectionChangeMultiplexer> m_xAdapter;
- ::osl::Mutex& m_rMutex;
-
public:
- OSelectionChangeListener(::osl::Mutex& _rMutex)
- : m_rMutex(_rMutex) { }
+ OSelectionChangeListener() {}
virtual ~OSelectionChangeListener();
/// @throws css::uno::RuntimeException
virtual void _selectionChanged( const css::lang::EventObject& aEvent ) = 0;
/// @throws css::uno::RuntimeException
virtual void _disposing(const css::lang::EventObject& _rSource);
-
- protected:
- // pseudo-private. Making it private now could break compatibility
- void setAdapter( OSelectionChangeMultiplexer* _pAdapter );
};
diff --git a/include/oox/drawingml/shapegroupcontext.hxx b/include/oox/drawingml/shapegroupcontext.hxx
index c273d9c03263..1f9c860dc940 100644
--- a/include/oox/drawingml/shapegroupcontext.hxx
+++ b/include/oox/drawingml/shapegroupcontext.hxx
@@ -38,9 +38,7 @@ public:
virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override;
protected:
-
ShapePtr mpGroupShapePtr;
- ShapePtr mpMasterShapePtr;
};
} }
diff --git a/oox/source/drawingml/shapegroupcontext.cxx b/oox/source/drawingml/shapegroupcontext.cxx
index c916642f1fcc..2bd12eafcb50 100644
--- a/oox/source/drawingml/shapegroupcontext.cxx
+++ b/oox/source/drawingml/shapegroupcontext.cxx
@@ -47,12 +47,11 @@ namespace oox { namespace drawingml {
ShapeGroupContext::ShapeGroupContext( ContextHandler2Helper const & rParent, ShapePtr const & pMasterShapePtr, ShapePtr const & pGroupShapePtr )
: ContextHandler2( rParent )
, mpGroupShapePtr( pGroupShapePtr )
-, mpMasterShapePtr( pMasterShapePtr )
{
if( pMasterShapePtr )
mpGroupShapePtr->setWps(pMasterShapePtr->getWps());
- if( mpMasterShapePtr.get() && mpGroupShapePtr.get() )
- mpMasterShapePtr->addChild( mpGroupShapePtr );
+ if( pMasterShapePtr.get() && mpGroupShapePtr.get() )
+ pMasterShapePtr->addChild( mpGroupShapePtr );
}
ShapeGroupContext::~ShapeGroupContext()
diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx
index e766a13cc6a9..cf72819673b7 100644
--- a/reportdesign/source/ui/dlg/Navigator.cxx
+++ b/reportdesign/source/ui/dlg/Navigator.cxx
@@ -207,7 +207,7 @@ private:
NavigatorTree::NavigatorTree( vcl::Window* pParent,OReportController& _rController )
:SvTreeListBox( pParent, WB_TABSTOP| WB_HASBUTTONS|WB_HASLINES|WB_BORDER|WB_HSCROLL|WB_HASBUTTONSATROOT )
- ,comphelper::OSelectionChangeListener(m_aMutex)
+ ,comphelper::OSelectionChangeListener()
,OPropertyChangeListener(m_aMutex)
,m_aTimerTriggered(-1,-1)
,m_aDropActionType( DA_SCROLLUP )
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
index 0cc102fd8030..52ed415d7fbd 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
@@ -50,7 +50,6 @@ DictionaryList::DictionaryList(std::unique_ptr<weld::TreeView> xControl)
, m_pED_Mapping(nullptr)
, m_pLB_Property(nullptr)
, m_aToBeDeleted()
- , m_nSortColumnIndex(0)
{
m_xControl->make_sorted();
}
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx
index fd4fe0b143ad..04925a5022af 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx
@@ -67,7 +67,6 @@ public:
DictionaryEntry* getFirstSelectedEntry() const;
void sortByColumn( sal_uInt16 nSortColumnIndex, bool bSortAtoZ );
- sal_uInt16 getSortColumn() const { return m_nSortColumnIndex;}
void set_size_request(int nWidth, int nHeight) { m_xControl->set_size_request(nWidth, nHeight); }
void hide() { m_xControl->hide(); }
@@ -100,8 +99,6 @@ private:
weld::ComboBox* m_pLB_Property;
std::vector< DictionaryEntry* > m_aToBeDeleted;
-
- sal_uInt16 m_nSortColumnIndex;
};
class ChineseDictionaryDialog : public weld::GenericDialogController
commit 880af0672c6362b0dbdae137d92e8ebf85a7b335
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Sun Feb 24 09:07:58 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Mon Feb 25 08:06:07 2019 +0100
loplugin:unusedfields in dbaccess
Change-Id: I858fd3d0bbd91b0ee7e02969b26d80e262c63b7d
Reviewed-on: https://gerrit.libreoffice.org/68279
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx
index 6da73ff09fd3..671f9d3abeea 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -1067,7 +1067,6 @@ void ORowSet::implCancelRowUpdates( bool _bNotifyModified )
m_aBookmark = m_pCache->getBookmark();
m_aCurrentRow = m_pCache->m_aMatrixIter;
m_bIsInsertRow = false;
- m_aCurrentRow.setBookmark(m_aBookmark);
// notification order
// IsModified
diff --git a/dbaccess/source/core/api/RowSetBase.cxx b/dbaccess/source/core/api/RowSetBase.cxx
index 94c7e9e7dd37..c203056815cd 100644
--- a/dbaccess/source/core/api/RowSetBase.cxx
+++ b/dbaccess/source/core/api/RowSetBase.cxx
@@ -1028,7 +1028,6 @@ void ORowSetBase::setCurrentRow( bool _bMoved, bool _bDoNotify, const ORowSetRow
m_aCurrentRow = m_pCache->m_aMatrixIter;
m_bIsInsertRow = false;
OSL_ENSURE(!m_aCurrentRow.isNull(),"CurrentRow is null!");
- m_aCurrentRow.setBookmark(m_aBookmark);
OSL_ENSURE(!m_aCurrentRow.isNull() && m_aCurrentRow != m_pCache->getEnd(),"Position of matrix iterator isn't valid!");
OSL_ENSURE(m_aCurrentRow->is(),"Currentrow isn't valid");
OSL_ENSURE(m_aBookmark.hasValue(),"Bookmark has no value!");
@@ -1052,7 +1051,6 @@ void ORowSetBase::setCurrentRow( bool _bMoved, bool _bDoNotify, const ORowSetRow
m_aOldRow->clearRow();
m_aCurrentRow = m_pCache->getEnd();
m_aBookmark = Any();
- m_aCurrentRow.setBookmark(m_aBookmark);
}
// TODO: can this be done before the notifications?
@@ -1290,7 +1288,6 @@ void ORowSetBase::movementFailed()
m_bBeforeFirst = m_pCache->isBeforeFirst();
m_bAfterLast = m_pCache->isAfterLast();
m_aBookmark = Any();
- m_aCurrentRow.setBookmark(m_aBookmark);
OSL_ENSURE(m_bBeforeFirst || m_bAfterLast,"BeforeFirst or AfterLast is wrong!");
SAL_INFO("dbaccess", "ORowSetBase::movementFailed() Clone = " << m_bClone);
}
@@ -1342,7 +1339,6 @@ void ORowSetBase::onDeletedRow( const Any& _rBookmark, sal_Int32 _nPos )
m_aOldRow->clearRow();
m_aCurrentRow = m_pCache->getEnd();
m_aBookmark = Any();
- m_aCurrentRow.setBookmark( m_aBookmark );
}
}
diff --git a/dbaccess/source/core/api/RowSetCacheIterator.cxx b/dbaccess/source/core/api/RowSetCacheIterator.cxx
index 9fbbc3209f41..7df7bae6b9f5 100644
--- a/dbaccess/source/core/api/RowSetCacheIterator.cxx
+++ b/dbaccess/source/core/api/RowSetCacheIterator.cxx
@@ -73,11 +73,6 @@ bool ORowSetCacheIterator::operator !=(const ORowSetMatrix::iterator& _rRH) cons
return m_aIter->second.aIterator != _rRH;
}
-void ORowSetCacheIterator::setBookmark(const css::uno::Any& _rBookmark)
-{
- m_aIter->second.aBookmark = _rBookmark;
-}
-
bool ORowSetCacheIterator::isNull() const
{
bool bRet = !m_pCache || !m_pRowSet || m_aIter == m_pCache->m_aCacheIterators.end();
diff --git a/dbaccess/source/core/api/RowSetCacheIterator.hxx b/dbaccess/source/core/api/RowSetCacheIterator.hxx
index 6e844e29422f..432f0e48663a 100644
--- a/dbaccess/source/core/api/RowSetCacheIterator.hxx
+++ b/dbaccess/source/core/api/RowSetCacheIterator.hxx
@@ -31,7 +31,6 @@ namespace dbaccess
typedef struct
{
ORowSetMatrix::iterator aIterator;
- css::uno::Any aBookmark;
ORowSetBase* pRowSet;
} ORowSetCacheIterator_Helper;
@@ -67,8 +66,6 @@ namespace dbaccess
bool operator <(const ORowSetMatrix::iterator& _rRH) const;
bool operator !=(const ORowSetMatrix::iterator& _rRH) const;
- void setBookmark(const css::uno::Any& _rBookmark);
-
const ORowSetCacheMap::iterator& getIter() const { return m_aIter; }
};
}
diff --git a/dbaccess/source/core/misc/dsntypes.cxx b/dbaccess/source/core/misc/dsntypes.cxx
index ee394325d74c..05e64ba5a001 100644
--- a/dbaccess/source/core/misc/dsntypes.cxx
+++ b/dbaccess/source/core/misc/dsntypes.cxx
@@ -49,7 +49,6 @@ namespace dbaccess
// ODsnTypeCollection
ODsnTypeCollection::ODsnTypeCollection(const css::uno::Reference< css::uno::XComponentContext >& _xContext)
:m_aDriverConfig(_xContext)
-,m_xContext(_xContext)
#if OSL_DEBUG_LEVEL > 0
,m_nLivingIterators(0)
#endif
diff --git a/dbaccess/source/inc/dsntypes.hxx b/dbaccess/source/inc/dsntypes.hxx
index 8ce435285bfe..f15c64410290 100644
--- a/dbaccess/source/inc/dsntypes.hxx
+++ b/dbaccess/source/inc/dsntypes.hxx
@@ -104,7 +104,6 @@ class OOO_DLLPUBLIC_DBA ODsnTypeCollection final
std::vector<OUString> m_aDsnTypesDisplayNames; /// user readable names for the datasource types
std::vector<OUString> m_aDsnPrefixes; /// DSN prefixes which determine the type of a datasource
::connectivity::DriversConfig m_aDriverConfig;
- css::uno::Reference< css::uno::XComponentContext > m_xContext;
#if OSL_DEBUG_LEVEL > 0
sal_Int32 m_nLivingIterators; /// just for debugging reasons, counts the living iterators
diff --git a/dbaccess/source/ui/app/AppIconControl.cxx b/dbaccess/source/ui/app/AppIconControl.cxx
index 1097094d822e..6352c7b8ad61 100644
--- a/dbaccess/source/ui/app/AppIconControl.cxx
+++ b/dbaccess/source/ui/app/AppIconControl.cxx
@@ -91,7 +91,6 @@ sal_Int8 OApplicationIconControl::AcceptDrop( const AcceptDropEvent& _rEvt )
{
SetCursor(pEntry);
nDropOption = m_pActionListener->queryDrop( _rEvt, GetDataFlavorExVector() );
- m_aMousePos = _rEvt.maPosPixel;
}
}
diff --git a/dbaccess/source/ui/app/AppIconControl.hxx b/dbaccess/source/ui/app/AppIconControl.hxx
index af3352e5ce29..12a03144b18e 100644
--- a/dbaccess/source/ui/app/AppIconControl.hxx
+++ b/dbaccess/source/ui/app/AppIconControl.hxx
@@ -28,7 +28,6 @@ namespace dbaui
class OApplicationIconControl :public SvtIconChoiceCtrl
,public DropTargetHelper
{
- Point m_aMousePos;
IControlActionListener* m_pActionListener;
public:
diff --git a/dbaccess/source/ui/browser/dbloader.cxx b/dbaccess/source/ui/browser/dbloader.cxx
index 8772bc983731..9d989c358553 100644
--- a/dbaccess/source/ui/browser/dbloader.cxx
+++ b/dbaccess/source/ui/browser/dbloader.cxx
@@ -65,10 +65,8 @@ using namespace dbaui;
class DBContentLoader : public ::cppu::WeakImplHelper< XFrameLoader, XServiceInfo>
{
private:
- OUString m_aURL;
Sequence< PropertyValue> m_aArgs;
Reference< XLoadEventListener > m_xListener;
- Reference< XFrame > m_xFrame;
Reference< XComponentContext > m_xContext;
public:
explicit DBContentLoader(const Reference< XComponentContext >&);
@@ -142,9 +140,7 @@ void SAL_CALL DBContentLoader::load(const Reference< XFrame > & rFrame, const OU
const Sequence< PropertyValue >& rArgs,
const Reference< XLoadEventListener > & rListener)
{
- m_xFrame = rFrame;
m_xListener = rListener;
- m_aURL = rURL;
m_aArgs = rArgs;
static const struct ServiceNameToImplName
diff --git a/dbaccess/source/ui/dlg/RelationDlg.cxx b/dbaccess/source/ui/dlg/RelationDlg.cxx
index 873028b4ec81..99dc63bbdb96 100644
--- a/dbaccess/source/ui/dlg/RelationDlg.cxx
+++ b/dbaccess/source/ui/dlg/RelationDlg.cxx
@@ -63,8 +63,6 @@ ORelationDialog::ORelationDialog( OJoinTableView* pParent,
get(m_pRB_CascDelDefault, "deldefault");
get(m_pPB_OK, "ok");
- m_xConnection = pParent->getDesignView()->getController().getConnection();
-
// Copy connection
m_pConnData.reset( static_cast<ORelationTableConnectionData*>(pConnectionData->NewInstance()) );
m_pConnData->CopyFrom( *pConnectionData );
diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index 17565955523b..5076997c30ed 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -338,7 +338,7 @@ void ODbTypeWizDialogSetup::activateDatabasePath()
case OGeneralPageWizard::eOpenExisting:
{
activatePath( static_cast<PathId>(m_pCollection->size() + 1), true );
- enableButtons( WizardButtonFlags::FINISH, !m_pGeneralPage->GetSelectedDocument().sURL.isEmpty() );
+ enableButtons( WizardButtonFlags::FINISH, !m_pGeneralPage->GetSelectedDocumentURL().isEmpty() );
}
break;
default:
@@ -594,7 +594,7 @@ IMPL_LINK_NOARG(ODbTypeWizDialogSetup, OnChangeCreationMode, OGeneralPageWizard&
IMPL_LINK_NOARG(ODbTypeWizDialogSetup, OnRecentDocumentSelected, OGeneralPageWizard&, void)
{
- enableButtons( WizardButtonFlags::FINISH, !m_pGeneralPage->GetSelectedDocument().sURL.isEmpty() );
+ enableButtons( WizardButtonFlags::FINISH, !m_pGeneralPage->GetSelectedDocumentURL().isEmpty() );
}
IMPL_LINK_NOARG(ODbTypeWizDialogSetup, OnSingleDocumentChosen, OGeneralPageWizard&, void)
@@ -974,7 +974,7 @@ bool ODbTypeWizDialogSetup::SaveDatabaseDocument()
try
{
- AsyncLoader* pAsyncLoader = new AsyncLoader( getORB(), m_pGeneralPage->GetSelectedDocument().sURL );
+ AsyncLoader* pAsyncLoader = new AsyncLoader( getORB(), m_pGeneralPage->GetSelectedDocumentURL() );
::rtl::Reference< AsyncLoader > xKeepAlive( pAsyncLoader );
pAsyncLoader->doLoadAsync();
}
diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx
index 567b1a2d65ae..c66241ce22e3 100644
--- a/dbaccess/source/ui/dlg/generalpage.cxx
+++ b/dbaccess/source/ui/dlg/generalpage.cxx
@@ -651,17 +651,12 @@ namespace dbaui
return bChangedSomething;
}
- OGeneralPageWizard::DocumentDescriptor OGeneralPageWizard::GetSelectedDocument() const
+ OUString OGeneralPageWizard::GetSelectedDocumentURL() const
{
- DocumentDescriptor aDocument;
- if ( !m_aBrowsedDocument.sURL.isEmpty() )
- aDocument = m_aBrowsedDocument;
+ if ( !m_aBrowsedDocumentURL.isEmpty() )
+ return m_aBrowsedDocumentURL;
else
- {
- aDocument.sURL = m_pLB_DocumentList->GetSelectedDocumentURL();
- aDocument.sFilter = m_pLB_DocumentList->GetSelectedDocumentFilter();
- }
- return aDocument;
+ return m_pLB_DocumentList->GetSelectedDocumentURL();
}
IMPL_LINK_NOARG( OGeneralPageWizard, OnCreateDatabaseModeSelected, Button*, void )
@@ -728,8 +723,7 @@ namespace dbaui
OnSetupModeSelected( m_pRB_ConnectDatabase );
return;
}
- m_aBrowsedDocument.sURL = sPath;
- m_aBrowsedDocument.sFilter.clear();
+ m_aBrowsedDocumentURL = sPath;
m_aChooseDocumentHandler.Call( *this );
}
}
diff --git a/dbaccess/source/ui/dlg/generalpage.hxx b/dbaccess/source/ui/dlg/generalpage.hxx
index eb4ec41af21a..a4a2dc3f870e 100644
--- a/dbaccess/source/ui/dlg/generalpage.hxx
+++ b/dbaccess/source/ui/dlg/generalpage.hxx
@@ -129,12 +129,6 @@ namespace dbaui
eOpenExisting
};
- struct DocumentDescriptor
- {
- OUString sURL;
- OUString sFilter;
- };
-
private:
// dialog controls
VclPtr<RadioButton> m_pRB_CreateDatabase;
@@ -149,7 +143,7 @@ namespace dbaui
VclPtr<OpenDocumentButton> m_pPB_OpenDatabase;
// state
- DocumentDescriptor m_aBrowsedDocument;
+ OUString m_aBrowsedDocumentURL;
CreationMode m_eOriginalCreationMode;
Link<OGeneralPageWizard&,void> m_aCreationModeHandler; /// to be called if a new type is selected
@@ -165,7 +159,7 @@ namespace dbaui
void SetDocumentSelectionHandler( const Link<OGeneralPageWizard&,void>& _rHandler) { m_aDocumentSelectionHandler = _rHandler; }
void SetChooseDocumentHandler( const Link<OGeneralPageWizard&,void>& _rHandler) { m_aChooseDocumentHandler = _rHandler; }
- DocumentDescriptor GetSelectedDocument() const;
+ OUString GetSelectedDocumentURL() const;
private:
virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) override;
diff --git a/dbaccess/source/ui/inc/DExport.hxx b/dbaccess/source/ui/inc/DExport.hxx
index 580a46577d79..397b527d6d7d 100644
--- a/dbaccess/source/ui/inc/DExport.hxx
+++ b/dbaccess/source/ui/inc/DExport.hxx
@@ -89,7 +89,6 @@ namespace dbaui
OUString m_sTextToken; ///< cell content
OUString m_sNumToken; ///< SDNUM value
- OUString m_sValToken; ///< SDVAL value
TOTypeInfoSP m_pTypeInfo; ///< contains the default type
const TColumnVector* m_pColumnList;
const OTypeInfoMap* m_pInfoMap;
diff --git a/dbaccess/source/ui/inc/FieldDescriptions.hxx b/dbaccess/source/ui/inc/FieldDescriptions.hxx
index f4cd5cee3b62..d485b60d4cd8 100644
--- a/dbaccess/source/ui/inc/FieldDescriptions.hxx
+++ b/dbaccess/source/ui/inc/FieldDescriptions.hxx
@@ -31,7 +31,6 @@ namespace dbaui
class OFieldDescription
{
private:
- css::uno::Any m_aDefaultValue; // the default value from the database
css::uno::Any m_aControlDefault; // the value which the control inserts as default
css::uno::Any m_aWidth; // sal_Int32 or void
css::uno::Any m_aRelativePosition; // sal_Int32 or void
diff --git a/dbaccess/source/ui/inc/RelationDlg.hxx b/dbaccess/source/ui/inc/RelationDlg.hxx
index 4bd536dd6fed..72c91215dca4 100644
--- a/dbaccess/source/ui/inc/RelationDlg.hxx
+++ b/dbaccess/source/ui/inc/RelationDlg.hxx
@@ -48,7 +48,6 @@ namespace dbaui
TTableConnectionData::value_type m_pConnData;
TTableConnectionData::value_type m_pOrigConnData;
- css::uno::Reference< css::sdbc::XConnection > m_xConnection;
bool m_bTriedOneUpdate;
diff --git a/dbaccess/source/ui/inc/TokenWriter.hxx b/dbaccess/source/ui/inc/TokenWriter.hxx
index 8b98120d0cef..9af27758e61b 100644
--- a/dbaccess/source/ui/inc/TokenWriter.hxx
+++ b/dbaccess/source/ui/inc/TokenWriter.hxx
@@ -50,7 +50,6 @@ namespace dbaui
class ODatabaseImportExport : public ::cppu::WeakImplHelper< css::lang::XEventListener>
{
protected:
- css::lang::Locale m_aLocale;
css::uno::Sequence< css::uno::Any> m_aSelection;
bool m_bBookmarkSelection;
SvStream* m_pStream;
diff --git a/dbaccess/source/ui/inc/TypeInfo.hxx b/dbaccess/source/ui/inc/TypeInfo.hxx
index a7dc3f75091c..4304bfd82c16 100644
--- a/dbaccess/source/ui/inc/TypeInfo.hxx
+++ b/dbaccess/source/ui/inc/TypeInfo.hxx
@@ -67,8 +67,6 @@ const sal_uInt16 TYPE_BIT = 31;
public:
OUString aUIName; // the name which is the user see (a combination of resource text and aTypeName)
OUString aTypeName; // name of type in database
- OUString aLiteralPrefix; // prefix for quoting
- OUString aLiteralSuffix; // suffix for quoting
OUString aCreateParams; // parameter for creation
OUString aLocalTypeName;
diff --git a/dbaccess/source/ui/misc/DExport.cxx b/dbaccess/source/ui/misc/DExport.cxx
index f070b730f9ab..1d34c41f0ddb 100644
--- a/dbaccess/source/ui/misc/DExport.cxx
+++ b/dbaccess/source/ui/misc/DExport.cxx
@@ -221,11 +221,9 @@ ODatabaseExport::ODatabaseExport(const SharedConnection& _rxConnection,
aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow);
m_pTypeInfo->nPrecision = aValue;
++nPos;
- aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow);
- m_pTypeInfo->aLiteralPrefix = aValue;
+ aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow); //LiteralPrefix
++nPos;
- aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow);
- m_pTypeInfo->aLiteralSuffix = aValue;
+ aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow); //LiteralSuffix
++nPos;
aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow);
m_pTypeInfo->aCreateParams = aValue;
@@ -781,7 +779,6 @@ void ODatabaseExport::eraseTokens()
{
m_sTextToken.clear();
m_sNumToken.clear();
- m_sValToken.clear();
}
void ODatabaseExport::ensureFormatter()
diff --git a/dbaccess/source/ui/misc/HtmlReader.cxx b/dbaccess/source/ui/misc/HtmlReader.cxx
index 709556dbbe1d..3dc3c38b558b 100644
--- a/dbaccess/source/ui/misc/HtmlReader.cxx
+++ b/dbaccess/source/ui/misc/HtmlReader.cxx
@@ -286,9 +286,6 @@ void OHTMLReader::fetchOptions()
{
switch( rOption.GetToken() )
{
- case HtmlOptionId::SDVAL:
- m_sValToken = rOption.GetString();
- break;
case HtmlOptionId::SDNUM:
m_sNumToken = rOption.GetString();
break;
diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx
index 28a316ac7621..a30614e5b82f 100644
--- a/dbaccess/source/ui/misc/TokenWriter.cxx
+++ b/dbaccess/source/ui/misc/TokenWriter.cxx
@@ -108,14 +108,6 @@ ODatabaseImportExport::ODatabaseImportExport( const ::dbtools::SharedConnection&
,m_bCheckOnly(false)
{
m_eDestEnc = osl_getThreadTextEncoding();
- try
- {
- SvtSysLocale aSysLocale;
- m_aLocale = aSysLocale.GetLanguageTag().getLocale();
- }
- catch(Exception&)
- {
- }
}
ODatabaseImportExport::~ODatabaseImportExport()
@@ -211,15 +203,6 @@ void ODatabaseImportExport::impl_initFromDescriptor( const ODataAccessDescriptor
}
else
initialize();
-
- try
- {
- SvtSysLocale aSysLocale;
- m_aLocale = aSysLocale.GetLanguageTag().getLocale();
- }
- catch(Exception&)
- {
- }
}
void ODatabaseImportExport::initialize()
diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx
index af8ec154deb9..9f7b94ca488c 100644
--- a/dbaccess/source/ui/misc/UITools.cxx
+++ b/dbaccess/source/ui/misc/UITools.cxx
@@ -460,11 +460,9 @@ void fillTypeInfo( const Reference< css::sdbc::XConnection>& _rxConnection,
aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow);
pInfo->nPrecision = aValue;
++nPos;
- aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow);
- pInfo->aLiteralPrefix = aValue;
+ aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow); // LiteralPrefix
++nPos;
- aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow);
- pInfo->aLiteralSuffix = aValue;
+ aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow); //LiteralSuffix
++nPos;
aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow);
pInfo->aCreateParams = aValue;
diff --git a/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx b/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx
index dda37a3192c3..86499d13f15a 100644
--- a/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx
+++ b/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx
@@ -56,8 +56,7 @@ OFieldDescription::OFieldDescription()
}
OFieldDescription::OFieldDescription( const OFieldDescription& rDescr )
- :m_aDefaultValue(rDescr.m_aDefaultValue)
- ,m_aControlDefault(rDescr.m_aControlDefault)
+ :m_aControlDefault(rDescr.m_aControlDefault)
,m_aWidth(rDescr.m_aWidth)
,m_aRelativePosition(rDescr.m_aRelativePosition)
,m_pType(rDescr.m_pType)
@@ -287,8 +286,6 @@ void OFieldDescription::SetDefaultValue(const Any& _rDefaultValue)
{
if ( m_xDest.is() && m_xDestInfo->hasPropertyByName(PROPERTY_DEFAULTVALUE) )
m_xDest->setPropertyValue(PROPERTY_DEFAULTVALUE, _rDefaultValue);
- else
- m_aDefaultValue = _rDefaultValue;
}
catch( const Exception& )
{
More information about the Libreoffice-commits
mailing list