[Libreoffice-commits] core.git: 2 commits - dbaccess/source desktop/source drawinglayer/source editeng/source extensions/source filter/source include/drawinglayer include/editeng include/filter
Noel Grandin
noel.grandin at collabora.co.uk
Thu May 17 06:41:07 UTC 2018
dbaccess/source/core/api/resultset.cxx | 6 +-
dbaccess/source/core/api/resultset.hxx | 1
dbaccess/source/filter/xml/xmlTable.cxx | 3 -
dbaccess/source/filter/xml/xmlTable.hxx | 1
dbaccess/source/ui/app/AppView.cxx | 9 ---
dbaccess/source/ui/app/AppView.hxx | 1
dbaccess/source/ui/dlg/RelationDlg.cxx | 3 -
dbaccess/source/ui/dlg/queryorder.cxx | 2
dbaccess/source/ui/inc/RelationDlg.hxx | 1
dbaccess/source/ui/inc/WNameMatch.hxx | 2
dbaccess/source/ui/inc/queryorder.hxx | 1
dbaccess/source/ui/misc/WNameMatch.cxx | 12 ++---
dbaccess/source/ui/querydesign/querydlg.cxx | 3 -
dbaccess/source/ui/querydesign/querydlg.hxx | 1
desktop/source/deployment/gui/dp_gui_service.cxx | 8 +--
drawinglayer/source/processor3d/zbufferprocessor3d.cxx | 5 --
editeng/source/editeng/editobj.cxx | 4 -
editeng/source/editeng/editobj2.hxx | 2
editeng/source/editeng/editview.cxx | 2
editeng/source/misc/SvXMLAutoCorrectImport.cxx | 12 ++---
editeng/source/misc/SvXMLAutoCorrectImport.hxx | 4 -
editeng/source/uno/unotext2.cxx | 37 +++++++---------
extensions/source/bibliography/general.cxx | 3 -
extensions/source/bibliography/general.hxx | 1
filter/source/flash/swfwriter.cxx | 4 -
filter/source/flash/swfwriter.hxx | 1
filter/source/graphicfilter/idxf/dxfgrprd.cxx | 2
filter/source/graphicfilter/idxf/dxfgrprd.hxx | 2
filter/source/msfilter/svdfppt.cxx | 5 --
include/drawinglayer/processor3d/zbufferprocessor3d.hxx | 3 -
include/editeng/editstat.hxx | 5 --
include/editeng/unotext.hxx | 3 -
include/filter/msfilter/svdfppt.hxx | 1
33 files changed, 47 insertions(+), 103 deletions(-)
New commits:
commit ac13f4db592f91783e644535968a8d3202c94640
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Wed May 16 16:51:05 2018 +0200
loplugin:unusedfields in dbaccess..drawinglayer
Change-Id: I069badbce9b899d176fd3db91243139579dec6b1
Reviewed-on: https://gerrit.libreoffice.org/54456
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/dbaccess/source/core/api/resultset.cxx b/dbaccess/source/core/api/resultset.cxx
index e7ed9e24daf8..4942597e9774 100644
--- a/dbaccess/source/core/api/resultset.cxx
+++ b/dbaccess/source/core/api/resultset.cxx
@@ -57,7 +57,6 @@ OResultSet::OResultSet(const css::uno::Reference< css::sdbc::XResultSet >& _xRes
,OPropertySetHelper(OResultSetBase::rBHelper)
,m_xDelegatorResultSet(_xResultSet)
,m_aWarnings( Reference< XWarningsSupplier >( _xResultSet, UNO_QUERY ) )
- ,m_nResultSetType(0)
,m_nResultSetConcurrency(0)
,m_bIsBookmarkable(false)
{
@@ -71,11 +70,12 @@ OResultSet::OResultSet(const css::uno::Reference< css::sdbc::XResultSet >& _xRes
m_xDelegatorRowUpdate.set(m_xDelegatorResultSet, css::uno::UNO_QUERY);
Reference< XPropertySet > xSet(m_xDelegatorResultSet, UNO_QUERY);
- xSet->getPropertyValue(PROPERTY_RESULTSETTYPE) >>= m_nResultSetType;
+ sal_Int32 nResultSetType(0);
+ xSet->getPropertyValue(PROPERTY_RESULTSETTYPE) >>= nResultSetType;
xSet->getPropertyValue(PROPERTY_RESULTSETCONCURRENCY) >>= m_nResultSetConcurrency;
// test for Bookmarks
- if (ResultSetType::FORWARD_ONLY != m_nResultSetType)
+ if (ResultSetType::FORWARD_ONLY != nResultSetType)
{
Reference <XPropertySetInfo > xInfo(xSet->getPropertySetInfo());
if (xInfo->hasPropertyByName(PROPERTY_ISBOOKMARKABLE))
diff --git a/dbaccess/source/core/api/resultset.hxx b/dbaccess/source/core/api/resultset.hxx
index 574b458bf986..34f13a14d8bf 100644
--- a/dbaccess/source/core/api/resultset.hxx
+++ b/dbaccess/source/core/api/resultset.hxx
@@ -72,7 +72,6 @@ namespace dbaccess
::dbtools::WarningsContainer m_aWarnings;
std::unique_ptr<OColumns> m_pColumns;
- sal_Int32 m_nResultSetType;
sal_Int32 m_nResultSetConcurrency;
bool m_bIsBookmarkable : 1;
diff --git a/dbaccess/source/filter/xml/xmlTable.cxx b/dbaccess/source/filter/xml/xmlTable.cxx
index a951ab1302c6..94c51199d802 100644
--- a/dbaccess/source/filter/xml/xmlTable.cxx
+++ b/dbaccess/source/filter/xml/xmlTable.cxx
@@ -48,7 +48,6 @@ OXMLTable::OXMLTable( ODBFilter& _rImport
)
:SvXMLImportContext( _rImport, nPrfx, _sLocalName )
,m_xParentContainer(_xParentContainer)
- ,m_sServiceName(_sServiceName)
,m_bApplyFilter(false)
,m_bApplyOrder(false)
{
@@ -93,7 +92,7 @@ OXMLTable::OXMLTable( ODBFilter& _rImport
{"Parent", uno::Any(m_xParentContainer)}
}));
m_xTable.set(
- GetOwnImport().GetComponentContext()->getServiceManager()->createInstanceWithArgumentsAndContext(m_sServiceName,aArguments, GetOwnImport().GetComponentContext()),
+ GetOwnImport().GetComponentContext()->getServiceManager()->createInstanceWithArgumentsAndContext(_sServiceName,aArguments, GetOwnImport().GetComponentContext()),
UNO_QUERY);
}
diff --git a/dbaccess/source/filter/xml/xmlTable.hxx b/dbaccess/source/filter/xml/xmlTable.hxx
index b9cd2e14c68f..dc053cb03eec 100644
--- a/dbaccess/source/filter/xml/xmlTable.hxx
+++ b/dbaccess/source/filter/xml/xmlTable.hxx
@@ -37,7 +37,6 @@ namespace dbaxml
OUString m_sSchema;
OUString m_sCatalog;
OUString m_sStyleName;
- OUString m_sServiceName;
bool m_bApplyFilter;
bool m_bApplyOrder;
diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx
index d4ebeed87eae..78931828a8dd 100644
--- a/dbaccess/source/ui/app/AppView.cxx
+++ b/dbaccess/source/ui/app/AppView.cxx
@@ -176,15 +176,6 @@ OApplicationView::OApplicationView( vcl::Window* pParent
,m_rAppController( _rAppController )
,m_eChildFocus(NONE)
{
-
- try
- {
- m_aLocale = SvtSysLocale().GetLanguageTag().getLocale();
- }
- catch(Exception&)
- {
- }
-
m_pWin = VclPtr<OAppBorderWindow>::Create(this,_ePreviewMode);
m_pWin->Show();
diff --git a/dbaccess/source/ui/app/AppView.hxx b/dbaccess/source/ui/app/AppView.hxx
index 8c3ea051e191..745ab56ee8f4 100644
--- a/dbaccess/source/ui/app/AppView.hxx
+++ b/dbaccess/source/ui/app/AppView.hxx
@@ -78,7 +78,6 @@ namespace dbaui
NONE
};
private:
- css::lang::Locale m_aLocale;
css::uno::Reference< css::lang::XComponent >
m_xObject;
VclPtr<OAppBorderWindow> m_pWin;
diff --git a/dbaccess/source/ui/dlg/RelationDlg.cxx b/dbaccess/source/ui/dlg/RelationDlg.cxx
index 8229d53ea92e..a724f3e16482 100644
--- a/dbaccess/source/ui/dlg/RelationDlg.cxx
+++ b/dbaccess/source/ui/dlg/RelationDlg.cxx
@@ -50,7 +50,6 @@ ORelationDialog::ORelationDialog( OJoinTableView* pParent,
bool bAllowTableSelect )
: ModalDialog(pParent, "RelationDialog",
"dbaccess/ui/relationdialog.ui")
- , m_pTableMap(&pParent->GetTabWinMap())
, m_pOrigConnData(pConnectionData)
, m_bTriedOneUpdate(false)
{
@@ -71,7 +70,7 @@ ORelationDialog::ORelationDialog( OJoinTableView* pParent,
m_pConnData->CopyFrom( *pConnectionData );
Init(m_pConnData);
- m_xTableControl.reset( new OTableListBoxControl(this, m_pTableMap, this) );
+ m_xTableControl.reset( new OTableListBoxControl(this, &pParent->GetTabWinMap(), this) );
m_pPB_OK->SetClickHdl( LINK(this, ORelationDialog, OKClickHdl) );
diff --git a/dbaccess/source/ui/dlg/queryorder.cxx b/dbaccess/source/ui/dlg/queryorder.cxx
index 75068c040397..cb8af47b7f9b 100644
--- a/dbaccess/source/ui/dlg/queryorder.cxx
+++ b/dbaccess/source/ui/dlg/queryorder.cxx
@@ -49,7 +49,6 @@ DlgOrderCrit::DlgOrderCrit(vcl::Window * pParent,
const Reference< XSingleSelectQueryComposer >& _rxComposer,
const Reference< XNameAccess>& _rxCols)
: ModalDialog(pParent, "SortDialog", "dbaccess/ui/sortdialog.ui")
- , aSTR_NOENTRY(DBA_RES(STR_VALUE_NONE))
, m_xQueryComposer(_rxComposer)
, m_xColumns(_rxCols)
, m_xConnection(_rxConnection)
@@ -76,6 +75,7 @@ DlgOrderCrit::DlgOrderCrit(vcl::Window * pParent,
m_aValueList[1] = m_pLB_ORDERVALUE2;
m_aValueList[2] = m_pLB_ORDERVALUE3;
+ OUString aSTR_NOENTRY(DBA_RES(STR_VALUE_NONE));
for (VclPtr<ListBox> & j : m_aColumnList)
{
j->InsertEntry( aSTR_NOENTRY );
diff --git a/dbaccess/source/ui/inc/RelationDlg.hxx b/dbaccess/source/ui/inc/RelationDlg.hxx
index 0cd9598aa037..4bd536dd6fed 100644
--- a/dbaccess/source/ui/inc/RelationDlg.hxx
+++ b/dbaccess/source/ui/inc/RelationDlg.hxx
@@ -34,7 +34,6 @@ namespace dbaui
,public IRelationControlInterface
{
std::unique_ptr<OTableListBoxControl> m_xTableControl;
- OJoinTableView::OTableWindowMap* m_pTableMap;
VclPtr<RadioButton> m_pRB_NoCascUpd;
VclPtr<RadioButton> m_pRB_CascUpd;
diff --git a/dbaccess/source/ui/inc/WNameMatch.hxx b/dbaccess/source/ui/inc/WNameMatch.hxx
index 004a659f4885..fd34b5437aeb 100644
--- a/dbaccess/source/ui/inc/WNameMatch.hxx
+++ b/dbaccess/source/ui/inc/WNameMatch.hxx
@@ -62,8 +62,6 @@ namespace dbaui
VclPtr<PushButton> m_pNone;
OUString m_sSourceText;
OUString m_sDestText;
- Image m_aImgUp;
- Image m_aImgDown;
DECL_LINK( ButtonClickHdl, Button *, void );
DECL_LINK( RightButtonClickHdl, Button *, void );
diff --git a/dbaccess/source/ui/inc/queryorder.hxx b/dbaccess/source/ui/inc/queryorder.hxx
index ef4330484243..16cfa105f86b 100644
--- a/dbaccess/source/ui/inc/queryorder.hxx
+++ b/dbaccess/source/ui/inc/queryorder.hxx
@@ -64,7 +64,6 @@ namespace dbaui
VclPtr<ListBox> m_pLB_ORDERVALUE2;
VclPtr<ListBox> m_pLB_ORDERFIELD3;
VclPtr<ListBox> m_pLB_ORDERVALUE3;
- OUString aSTR_NOENTRY;
OUString m_sOrgOrder;
css::uno::Reference< css::sdb::XSingleSelectQueryComposer> m_xQueryComposer;
diff --git a/dbaccess/source/ui/misc/WNameMatch.cxx b/dbaccess/source/ui/misc/WNameMatch.cxx
index fa1a3b83370e..8333fe40324a 100644
--- a/dbaccess/source/ui/misc/WNameMatch.cxx
+++ b/dbaccess/source/ui/misc/WNameMatch.cxx
@@ -36,21 +36,21 @@ using namespace ::dbaui;
// OWizColumnSelect
OWizNameMatching::OWizNameMatching(vcl::Window* pParent)
: OWizardPage(pParent, "NameMatching", "dbaccess/ui/namematchingpage.ui")
- , m_aImgUp(BitmapEx(BMP_UP))
- , m_aImgDown(BitmapEx(BMP_DOWN))
{
+ Image aImgUp(BitmapEx(BMP_UP));
+ Image aImgDown(BitmapEx(BMP_DOWN));
get(m_pTABLE_LEFT, "leftlabel");
get(m_pTABLE_RIGHT, "rightlabel");
get(m_pCTRL_LEFT, "left");
get(m_pCTRL_RIGHT, "right");
get(m_pColumn_up, "up");
- m_pColumn_up->SetModeImage(m_aImgUp);
+ m_pColumn_up->SetModeImage(aImgUp);
get(m_pColumn_down, "down");
- m_pColumn_down->SetModeImage(m_aImgDown);
+ m_pColumn_down->SetModeImage(aImgDown);
get(m_pColumn_up_right, "up_right");
- m_pColumn_up_right->SetModeImage(m_aImgUp);
+ m_pColumn_up_right->SetModeImage(aImgUp);
get(m_pColumn_down_right, "down_right");
- m_pColumn_down_right->SetModeImage(m_aImgDown);
+ m_pColumn_down_right->SetModeImage(aImgDown);
get(m_pAll, "all");
get(m_pNone, "none");
diff --git a/dbaccess/source/ui/querydesign/querydlg.cxx b/dbaccess/source/ui/querydesign/querydlg.cxx
index a1692b5c4c9f..2bf06735b947 100644
--- a/dbaccess/source/ui/querydesign/querydlg.cxx
+++ b/dbaccess/source/ui/querydesign/querydlg.cxx
@@ -48,7 +48,6 @@ DlgQryJoin::DlgQryJoin( OQueryTableView * pParent,
bool _bAllowTableSelect)
: ModalDialog( pParent, "JoinDialog", "dbaccess/ui/joindialog.ui" )
, m_pTableControl( nullptr )
- , m_pTableMap(_pTableMap)
, eJoinType(static_cast<OQueryTableConnectionData*>(_pData.get())->GetJoinType())
, m_pOrigConnData(_pData)
, m_xConnection(_xConnection)
@@ -68,7 +67,7 @@ DlgQryJoin::DlgQryJoin( OQueryTableView * pParent,
m_pConnData.reset(_pData->NewInstance());
m_pConnData->CopyFrom(*_pData);
- m_pTableControl = new OTableListBoxControl(this, m_pTableMap, this);
+ m_pTableControl = new OTableListBoxControl(this, _pTableMap, this);
m_pCBNatural->Check(static_cast<OQueryTableConnectionData*>(m_pConnData.get())->isNatural());
diff --git a/dbaccess/source/ui/querydesign/querydlg.hxx b/dbaccess/source/ui/querydesign/querydlg.hxx
index 215a9c857c5f..93a8d53e54f8 100644
--- a/dbaccess/source/ui/querydesign/querydlg.hxx
+++ b/dbaccess/source/ui/querydesign/querydlg.hxx
@@ -44,7 +44,6 @@ namespace dbaui
VclPtr<CheckBox> m_pCBNatural;
OTableListBoxControl* m_pTableControl;
- OJoinTableView::OTableWindowMap* m_pTableMap;
EJoinType eJoinType;
TTableConnectionData::value_type m_pConnData; // contains left and right table
diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx
index d91cdc3e9d5a..4393029537e8 100644
--- a/desktop/source/deployment/gui/dp_gui_service.cxx
+++ b/desktop/source/deployment/gui/dp_gui_service.cxx
@@ -138,9 +138,6 @@ class ServiceImpl
{
Reference<XComponentContext> const m_xComponentContext;
boost::optional< Reference<awt::XWindow> > /* const */ m_parent;
- boost::optional<OUString> /* const */ m_view;
- /* if true then this service is running in an unopkg process and not in an office process */
- boost::optional<sal_Bool> /* const */ m_unopkg;
boost::optional<OUString> m_extensionURL;
OUString m_initialTitle;
bool m_bShowUpdateOnly;
@@ -164,8 +161,11 @@ ServiceImpl::ServiceImpl( Sequence<Any> const& args,
: m_xComponentContext(xComponentContext),
m_bShowUpdateOnly( false )
{
+ /* if true then this service is running in an unopkg process and not in an office process */
+ boost::optional<sal_Bool> unopkg;
+ boost::optional<OUString> view;
try {
- comphelper::unwrapArgs( args, m_parent, m_view, m_unopkg );
+ comphelper::unwrapArgs( args, m_parent, view, unopkg );
return;
} catch ( const css::lang::IllegalArgumentException & ) {
}
diff --git a/drawinglayer/source/processor3d/zbufferprocessor3d.cxx b/drawinglayer/source/processor3d/zbufferprocessor3d.cxx
index ab25e329a8b8..4413dd30a907 100644
--- a/drawinglayer/source/processor3d/zbufferprocessor3d.cxx
+++ b/drawinglayer/source/processor3d/zbufferprocessor3d.cxx
@@ -526,7 +526,6 @@ namespace drawinglayer
sal_uInt32 nStartLine,
sal_uInt32 nStopLine)
: DefaultProcessor3D(rViewInformation3D, rSdrSceneAttribute, rSdrLightingAttribute),
- mrBZPixelRaster(rBZPixelRaster),
maInvEyeToView(),
mpZBufferRasterConverter3D(nullptr),
mnAntiAlialize(nAntiAlialize),
@@ -595,10 +594,10 @@ namespace drawinglayer
// prepare maRasterRange
maRasterRange.reset();
maRasterRange.expand(basegfx::B2DPoint(0.0, nStartLine));
- maRasterRange.expand(basegfx::B2DPoint(mrBZPixelRaster.getWidth(), nStopLine));
+ maRasterRange.expand(basegfx::B2DPoint(rBZPixelRaster.getWidth(), nStopLine));
// create the raster converter
- mpZBufferRasterConverter3D.reset( new ZBufferRasterConverter3D(mrBZPixelRaster, *this) );
+ mpZBufferRasterConverter3D.reset( new ZBufferRasterConverter3D(rBZPixelRaster, *this) );
}
ZBufferProcessor3D::~ZBufferProcessor3D()
diff --git a/include/drawinglayer/processor3d/zbufferprocessor3d.hxx b/include/drawinglayer/processor3d/zbufferprocessor3d.hxx
index 7d1ea3f69b9a..90db04b2a546 100644
--- a/include/drawinglayer/processor3d/zbufferprocessor3d.hxx
+++ b/include/drawinglayer/processor3d/zbufferprocessor3d.hxx
@@ -56,9 +56,6 @@ namespace drawinglayer
class ZBufferProcessor3D : public DefaultProcessor3D
{
private:
- /// the raster target, a Z-Buffer
- basegfx::BZPixelRaster& mrBZPixelRaster;
-
/// inverse of EyeToView for rasterconversion with evtl. Phong shading
basegfx::B3DHomMatrix maInvEyeToView;
commit 82afd77a00c036f106a3aa5fb3402c92e10e2aa4
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Wed May 16 16:22:49 2018 +0200
loplugin:unusedfields in editeng..filter
Change-Id: I42e41ec69667a5560c5f31c85eb05074666a7bab
Reviewed-on: https://gerrit.libreoffice.org/54455
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx
index b76e99ea4d95..dbba13a7a3bf 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -502,10 +502,8 @@ EditEngineItemPool* getEditEngineItemPool(SfxItemPool* pPool)
EditTextObjectImpl::EditTextObjectImpl( EditTextObject* pFront, SfxItemPool* pP ) :
mpFront(pFront)
{
- nVersion = 0;
nMetric = 0xFFFF;
nUserType = OutlinerMode::DontKnow;
- nObjSettings = 0;
pPortionInfo = nullptr;
// #i101239# ensure target is a EditEngineItemPool, else
@@ -540,10 +538,8 @@ EditTextObjectImpl::EditTextObjectImpl( EditTextObject* pFront, SfxItemPool* pP
EditTextObjectImpl::EditTextObjectImpl( EditTextObject* pFront, const EditTextObjectImpl& r ) :
mpFront(pFront)
{
- nVersion = r.nVersion;
nMetric = r.nMetric;
nUserType = r.nUserType;
- nObjSettings = r.nObjSettings;
bVertical = r.bVertical;
bIsTopToBottomVert = r.bIsTopToBottomVert;
nScriptType = r.nScriptType;
diff --git a/editeng/source/editeng/editobj2.hxx b/editeng/source/editeng/editobj2.hxx
index 26576d4fdb1b..b30fadb3fe63 100644
--- a/editeng/source/editeng/editobj2.hxx
+++ b/editeng/source/editeng/editobj2.hxx
@@ -186,9 +186,7 @@ private:
SfxItemPool* pPool;
std::unique_ptr<XParaPortionList> pPortionInfo;
- sal_uInt32 nObjSettings;
sal_uInt16 nMetric;
- sal_uInt16 nVersion;
OutlinerMode nUserType;
SvtScriptType nScriptType;
diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx
index d336fc860758..5343877fc203 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -1068,7 +1068,7 @@ void EditView::ExecuteSpellPopup( const Point& rPosPixel, Link<SpellCallbackInfo
if ( pCallBack )
{
- SpellCallbackInfo aInf( ( nId == MN_WORDLANGUAGE ) ? SpellCallbackCommand::WORDLANGUAGE : SpellCallbackCommand::PARALANGUAGE, nLangToUse );
+ SpellCallbackInfo aInf( ( nId == MN_WORDLANGUAGE ) ? SpellCallbackCommand::WORDLANGUAGE : SpellCallbackCommand::PARALANGUAGE );
pCallBack->Call( aInf );
}
SetSelection( aOldSel );
diff --git a/editeng/source/misc/SvXMLAutoCorrectImport.cxx b/editeng/source/misc/SvXMLAutoCorrectImport.cxx
index 14d1461022d5..efd340efb055 100644
--- a/editeng/source/misc/SvXMLAutoCorrectImport.cxx
+++ b/editeng/source/misc/SvXMLAutoCorrectImport.cxx
@@ -72,8 +72,7 @@ SvXMLWordListContext::~SvXMLWordListContext()
SvXMLWordContext::SvXMLWordContext(
SvXMLAutoCorrectImport& rImport,
const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList ) :
- SvXMLImportContext ( rImport ),
- rLocalRef(rImport)
+ SvXMLImportContext ( rImport )
{
OUString sWrong, sRight;
if ( xAttrList.is() && xAttrList->hasAttribute( SvXMLAutoCorrectToken::ABBREVIATED_NAME ) )
@@ -89,14 +88,14 @@ SvXMLWordContext::SvXMLWordContext(
if( !bOnlyTxt )
{
const OUString sLongSave( sRight );
- if( !rLocalRef.rAutoCorrect.GetLongText( sWrong, sRight ) &&
+ if( !rImport.rAutoCorrect.GetLongText( sWrong, sRight ) &&
!sLongSave.isEmpty() )
{
sRight = sLongSave;
bOnlyTxt = true;
}
}
- rLocalRef.pAutocorr_List->LoadEntry( sWrong, sRight, bOnlyTxt );
+ rImport.pAutocorr_List->LoadEntry( sWrong, sRight, bOnlyTxt );
}
SvXMLWordContext::~SvXMLWordContext()
@@ -147,8 +146,7 @@ SvXMLExceptionListContext::~SvXMLExceptionListContext()
SvXMLExceptionContext::SvXMLExceptionContext(
SvXMLExceptionListImport& rImport,
const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList ) :
- SvXMLImportContext ( rImport ),
- rLocalRef(rImport)
+ SvXMLImportContext ( rImport )
{
OUString sWord;
if( xAttrList.is() && xAttrList->hasAttribute( SvXMLAutoCorrectToken::ABBREVIATED_NAME ) )
@@ -157,7 +155,7 @@ SvXMLExceptionContext::SvXMLExceptionContext(
if (sWord.isEmpty())
return;
- rLocalRef.rList.insert( sWord );
+ rImport.rList.insert( sWord );
}
SvXMLExceptionContext::~SvXMLExceptionContext()
diff --git a/editeng/source/misc/SvXMLAutoCorrectImport.hxx b/editeng/source/misc/SvXMLAutoCorrectImport.hxx
index d27785bf9b43..34ec61ed323d 100644
--- a/editeng/source/misc/SvXMLAutoCorrectImport.hxx
+++ b/editeng/source/misc/SvXMLAutoCorrectImport.hxx
@@ -62,8 +62,6 @@ public:
class SvXMLWordContext : public SvXMLImportContext
{
-private:
- SvXMLAutoCorrectImport & rLocalRef;
public:
SvXMLWordContext ( SvXMLAutoCorrectImport& rImport,
const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList );
@@ -105,8 +103,6 @@ public:
class SvXMLExceptionContext : public SvXMLImportContext
{
-private:
- SvXMLExceptionListImport & rLocalRef;
public:
SvXMLExceptionContext ( SvXMLExceptionListImport& rImport,
const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList );
diff --git a/editeng/source/uno/unotext2.cxx b/editeng/source/uno/unotext2.cxx
index 09c178e8c434..43d803c3d340 100644
--- a/editeng/source/uno/unotext2.cxx
+++ b/editeng/source/uno/unotext2.cxx
@@ -40,8 +40,7 @@ using namespace ::com::sun::star;
SvxUnoTextContentEnumeration::SvxUnoTextContentEnumeration( const SvxUnoTextBase& _rText, const ESelection& rSel ) throw()
-: mrText( _rText ),
- maSelection( rSel )
+: mrText( _rText )
{
mxParentText = const_cast<SvxUnoTextBase*>(&_rText);
if( mrText.GetEditSource() )
@@ -49,16 +48,16 @@ SvxUnoTextContentEnumeration::SvxUnoTextContentEnumeration( const SvxUnoTextBase
mnNextParagraph = 0;
for( sal_Int32 currentPara = 0; currentPara < mrText.GetEditSource()->GetTextForwarder()->GetParagraphCount(); currentPara++ )
{
- if( currentPara>=maSelection.nStartPara && currentPara<=maSelection.nEndPara )
+ if( currentPara>=rSel.nStartPara && currentPara<=rSel.nEndPara )
{
const SvxUnoTextRangeBaseVec& rRanges( mpEditSource->getRanges() );
SvxUnoTextContent* pContent = nullptr;
sal_Int32 nStartPos = 0;
sal_Int32 nEndPos = mrText.GetEditSource()->GetTextForwarder()->GetTextLen( currentPara );
- if( currentPara == maSelection.nStartPara )
- nStartPos = std::max(nStartPos, maSelection.nStartPos);
- if( currentPara == maSelection.nEndPara )
- nEndPos = std::min(nEndPos, maSelection.nEndPos);
+ if( currentPara == rSel.nStartPara )
+ nStartPos = std::max(nStartPos, rSel.nStartPos);
+ if( currentPara == rSel.nEndPara )
+ nEndPos = std::min(nEndPos, rSel.nEndPos);
ESelection aCurrentParaSel = ESelection( currentPara, nStartPos, currentPara, nEndPos );
for (auto const& elemRange : rRanges)
{
@@ -377,17 +376,15 @@ uno::Sequence< OUString > SAL_CALL SvxUnoTextContent::getSupportedServiceNames()
// class SvxUnoTextRangeEnumeration
-SvxUnoTextRangeEnumeration::SvxUnoTextRangeEnumeration(const SvxUnoTextBase& rText, sal_Int32 nPara, const ESelection& rSel)
-: mxParentText( const_cast<SvxUnoTextBase*>(&rText) ),
- mrParentText( rText ),
+SvxUnoTextRangeEnumeration::SvxUnoTextRangeEnumeration(const SvxUnoTextBase& rParentText, sal_Int32 nPara, const ESelection& rSel)
+: mxParentText( const_cast<SvxUnoTextBase*>(&rParentText) ),
mnParagraph( nPara ),
- mnNextPortion( 0 ),
- mnSel( rSel )
+ mnNextPortion( 0 )
{
- if (rText.GetEditSource())
- mpEditSource = rText.GetEditSource()->Clone();
+ if (rParentText.GetEditSource())
+ mpEditSource = rParentText.GetEditSource()->Clone();
- if( mpEditSource && mpEditSource->GetTextForwarder() && (mnParagraph == mnSel.nStartPara && mnParagraph == mnSel.nEndPara) )
+ if( mpEditSource && mpEditSource->GetTextForwarder() && (mnParagraph == rSel.nStartPara && mnParagraph == rSel.nEndPara) )
{
std::vector<sal_Int32> aPortions;
mpEditSource->GetTextForwarder()->GetPortions( nPara, aPortions );
@@ -396,14 +393,14 @@ SvxUnoTextRangeEnumeration::SvxUnoTextRangeEnumeration(const SvxUnoTextBase& rTe
sal_uInt16 nStartPos = 0;
if ( aPortionIndex > 0 )
nStartPos = aPortions.at( aPortionIndex - 1 );
- if( nStartPos > mnSel.nEndPos )
+ if( nStartPos > rSel.nEndPos )
continue;
sal_uInt16 nEndPos = aPortions.at( aPortionIndex );
- if( nEndPos < mnSel.nStartPos )
+ if( nEndPos < rSel.nStartPos )
continue;
- nStartPos = std::max<int>(nStartPos, mnSel.nStartPos);
- nEndPos = std::min<sal_uInt16>(nEndPos, mnSel.nEndPos);
+ nStartPos = std::max<int>(nStartPos, rSel.nStartPos);
+ nEndPos = std::min<sal_uInt16>(nEndPos, rSel.nEndPos);
ESelection aSel( mnParagraph, nStartPos, mnParagraph, nEndPos );
const SvxUnoTextRangeBaseVec& rRanges( mpEditSource->getRanges() );
@@ -418,7 +415,7 @@ SvxUnoTextRangeEnumeration::SvxUnoTextRangeEnumeration(const SvxUnoTextBase& rTe
}
if( pRange == nullptr )
{
- pRange = new SvxUnoTextRange( mrParentText, true );
+ pRange = new SvxUnoTextRange( rParentText, true );
pRange->SetSelection( aSel );
}
maPortions.emplace_back(pRange );
diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx
index 2d5594c478e0..bc86e4fa9d35 100644
--- a/extensions/source/bibliography/general.cxx
+++ b/extensions/source/bibliography/general.cxx
@@ -167,7 +167,6 @@ void BibPosListener::disposing(const lang::EventObject& /*Source*/)
BibGeneralPage::BibGeneralPage(vcl::Window* pParent, BibDataManager* pMan):
TabPage(pParent, "GeneralPage", "modules/sbibliography/ui/generalpage.ui"),
BibShortCutHandler( this ),
- sErrorPrefix(BibResId(ST_ERROR_PREFIX)),
mxBibGeneralPageFocusListener(new BibGeneralPageFocusListener(this)),
pDatMan(pMan)
{
@@ -332,7 +331,7 @@ BibGeneralPage::BibGeneralPage(vcl::Window* pParent, BibDataManager* pMan):
xFormCtrl->activateTabOrder();
if(!sTableErrorString.isEmpty())
- sTableErrorString = sErrorPrefix + sTableErrorString;
+ sTableErrorString = BibResId(ST_ERROR_PREFIX) + sTableErrorString;
SetText(BibResId(ST_TYPE_TITLE));
diff --git a/extensions/source/bibliography/general.hxx b/extensions/source/bibliography/general.hxx
index 13a457e4dc01..791b66ff26dd 100644
--- a/extensions/source/bibliography/general.hxx
+++ b/extensions/source/bibliography/general.hxx
@@ -109,7 +109,6 @@ class BibGeneralPage : public TabPage, public BibShortCutHandler
css::uno::Reference< css::awt::XWindow >
aControls[ FIELD_COUNT ];
- OUString sErrorPrefix;
OUString sTableErrorString;
OUString sTypeColumnName;
diff --git a/filter/source/flash/swfwriter.cxx b/filter/source/flash/swfwriter.cxx
index 366b156eb7f6..b2e22b9685c0 100644
--- a/filter/source/flash/swfwriter.cxx
+++ b/filter/source/flash/swfwriter.cxx
@@ -63,7 +63,7 @@ Writer::Writer( sal_Int32 nTWIPWidthOutput, sal_Int32 nTWIPHeightOutput, sal_Int
tools::Rectangle aRect( 0, 0, static_cast<long>( mnDocWidth * mnDocXScale ), static_cast<long>( mnDocHeight * mnDocYScale ) );
tools::Polygon aPoly( aRect );
FillStyle aFill = FillStyle( COL_WHITE );
- mnWhiteBackgroundShapeId = defineShape( aPoly, aFill );
+ sal_uInt16 nWhiteBackgroundShapeId = defineShape( aPoly, aFill );
::basegfx::B2DHomMatrix m; // #i73264#
mnPageButtonId = createID();
@@ -72,7 +72,7 @@ Writer::Writer( sal_Int32 nTWIPWidthOutput, sal_Int32 nTWIPHeightOutput, sal_Int
// button records
mpTag->addUI8( 0x08 ); // only hit state
- mpTag->addUI16( mnWhiteBackgroundShapeId ); // shape id of background rectangle
+ mpTag->addUI16( nWhiteBackgroundShapeId ); // shape id of background rectangle
mpTag->addUI16( 0 ); // depth for button DANGER!
mpTag->addMatrix( m ); // identity matrix
mpTag->addUI8( 0 ); // empty color transform
diff --git a/filter/source/flash/swfwriter.hxx b/filter/source/flash/swfwriter.hxx
index 61972b30b9d3..e5453c6b5882 100644
--- a/filter/source/flash/swfwriter.hxx
+++ b/filter/source/flash/swfwriter.hxx
@@ -372,7 +372,6 @@ private:
double mnDocXScale;
double mnDocYScale;
- sal_uInt16 mnWhiteBackgroundShapeId;
sal_uInt16 mnPageButtonId;
VclPtrInstance<VirtualDevice> mpVDev;
diff --git a/filter/source/graphicfilter/idxf/dxfgrprd.cxx b/filter/source/graphicfilter/idxf/dxfgrprd.cxx
index c7fbd2cfd65a..3ae2f7db8b5c 100644
--- a/filter/source/graphicfilter/idxf/dxfgrprd.cxx
+++ b/filter/source/graphicfilter/idxf/dxfgrprd.cxx
@@ -114,8 +114,6 @@ DXFGroupReader::DXFGroupReader(SvStream & rIStream)
, S()
, I(0)
{
- rIS.Seek(STREAM_SEEK_TO_END);
- nFileSize=rIS.Tell();
rIS.Seek(0);
}
diff --git a/filter/source/graphicfilter/idxf/dxfgrprd.hxx b/filter/source/graphicfilter/idxf/dxfgrprd.hxx
index 97a023420e74..4ed4450d0017 100644
--- a/filter/source/graphicfilter/idxf/dxfgrprd.hxx
+++ b/filter/source/graphicfilter/idxf/dxfgrprd.hxx
@@ -71,8 +71,6 @@ private:
sal_uInt16 nLastG;
sal_uLong nGCount;
- sal_uLong nFileSize;
-
OString S;
union {
double F;
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index c9e26c9e64c6..3aaf6c44dcba 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -3236,8 +3236,7 @@ bool PPTExtParaProv::GetGraphic( sal_uInt32 nInstance, Graphic& rGraph ) const
}
PPTExtParaProv::PPTExtParaProv( SdrPowerPointImport& rMan, SvStream& rSt, const DffRecordHeader* pHd ) :
- bStyles ( false ),
- bGraphics ( false )
+ bStyles ( false )
{
sal_uInt32 nOldPos = rSt.Tell();
@@ -3304,8 +3303,6 @@ PPTExtParaProv::PPTExtParaProv( SdrPowerPointImport& rMan, SvStream& rSt, const
if (!aBuGraAtomHd.SeekToEndOfRecord(rSt))
break;
}
- if ( !aBuGraList.empty() )
- bGraphics = true;
}
break;
diff --git a/include/editeng/editstat.hxx b/include/editeng/editstat.hxx
index c6b099d2202a..a88b00d15c7b 100644
--- a/include/editeng/editstat.hxx
+++ b/include/editeng/editstat.hxx
@@ -140,19 +140,16 @@ struct SpellCallbackInfo
{
SpellCallbackCommand nCommand;
OUString aWord;
- LanguageType eLanguage;
SpellCallbackInfo( SpellCallbackCommand nCMD, const OUString& rWord )
: aWord( rWord )
{
nCommand = nCMD;
- eLanguage = LANGUAGE_DONTKNOW;
}
- SpellCallbackInfo( SpellCallbackCommand nCMD, LanguageType eLang )
+ SpellCallbackInfo( SpellCallbackCommand nCMD )
{
nCommand = nCMD;
- eLanguage = eLang;
}
};
diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx
index 3c94d3675e61..07b1171e59f9 100644
--- a/include/editeng/unotext.hxx
+++ b/include/editeng/unotext.hxx
@@ -593,7 +593,6 @@ private:
std::unique_ptr<SvxEditSource> mpEditSource;
sal_Int32 mnNextParagraph;
const SvxUnoTextBase& mrText;
- const ESelection maSelection;
std::vector< rtl::Reference<SvxUnoTextContent> > maContents;
public:
@@ -611,11 +610,9 @@ class SvxUnoTextRangeEnumeration : public ::cppu::WeakAggImplHelper1< css::conta
private:
std::unique_ptr<SvxEditSource> mpEditSource;
css::uno::Reference< css::text::XText > mxParentText;
- const SvxUnoTextBase& mrParentText;
sal_Int32 mnParagraph;
std::vector< rtl::Reference<SvxUnoTextRange> > maPortions;
sal_uInt16 mnNextPortion;
- const ESelection mnSel;
public:
SvxUnoTextRangeEnumeration(const SvxUnoTextBase& rText, sal_Int32 nPara, const ESelection& rSel);
diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx
index 3ce61ea3d0b4..7dc6082fb931 100644
--- a/include/filter/msfilter/svdfppt.hxx
+++ b/include/filter/msfilter/svdfppt.hxx
@@ -724,7 +724,6 @@ class PPTExtParaProv
public:
bool bStyles;
- bool bGraphics;
DffRecordManager aExtendedPresRules;
o3tl::enumarray<TSS_Type, PPTExtParaSheet> aExtParaSheet;
More information about the Libreoffice-commits
mailing list