[Libreoffice-commits] core.git: 2 commits - connectivity/source cui/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Feb 25 07:06:12 UTC 2019
connectivity/source/drivers/file/FPreparedStatement.cxx | 3 --
connectivity/source/drivers/file/FResultSet.cxx | 1
connectivity/source/drivers/file/FStatement.cxx | 4 --
connectivity/source/drivers/file/fanalyzer.cxx | 5 ---
connectivity/source/drivers/file/fcomp.cxx | 1
connectivity/source/drivers/mork/MPreparedStatement.cxx | 1
connectivity/source/drivers/mork/MResultSet.cxx | 1
connectivity/source/drivers/mork/MResultSet.hxx | 4 --
connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx | 3 --
connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx | 1
connectivity/source/drivers/mysqlc/mysqlc_connection.cxx | 2 -
connectivity/source/drivers/mysqlc/mysqlc_connection.hxx | 1
connectivity/source/drivers/writer/WTable.cxx | 4 --
connectivity/source/inc/file/FResultSet.hxx | 4 --
connectivity/source/inc/file/fanalyzer.hxx | 2 -
connectivity/source/inc/file/fcomp.hxx | 1
connectivity/source/inc/writer/WTable.hxx | 1
cui/source/customize/SvxToolbarConfigPage.cxx | 3 --
cui/source/customize/acccfg.cxx | 8 -----
cui/source/dialogs/colorpicker.cxx | 4 --
cui/source/dialogs/hlmarkwn.cxx | 2 -
cui/source/inc/SvxToolbarConfigPage.hxx | 1
cui/source/inc/acccfg.hxx | 10 -------
cui/source/inc/cuitabline.hxx | 2 -
cui/source/inc/hlmarkwn.hxx | 2 -
cui/source/inc/tabstpge.hxx | 6 ----
cui/source/inc/transfrm.hxx | 3 --
cui/source/options/treeopt.cxx | 15 -----------
cui/source/tabpages/tabline.cxx | 1
cui/source/tabpages/tabstpge.cxx | 9 ------
cui/source/tabpages/tpline.cxx | 8 -----
cui/source/tabpages/transfrm.cxx | 9 ------
32 files changed, 4 insertions(+), 118 deletions(-)
New commits:
commit d434bd5493443cd9af2e35fa540f931c1b3aa2bf
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Sun Feb 24 09:07:42 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Mon Feb 25 08:05:58 2019 +0100
loplugin:unusedfields in cui
Change-Id: Idf3cea56649c0f6eeb6c901ac33b128eb2dd97fb
Reviewed-on: https://gerrit.libreoffice.org/68278
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/cui/source/customize/SvxToolbarConfigPage.cxx b/cui/source/customize/SvxToolbarConfigPage.cxx
index 174cf7f458ae..6775c37e4a86 100644
--- a/cui/source/customize/SvxToolbarConfigPage.cxx
+++ b/cui/source/customize/SvxToolbarConfigPage.cxx
@@ -939,9 +939,6 @@ void SvxToolbarEntriesListBox::BuildCheckBoxButtonImages( SvLBoxButtonData* pDat
pData->SetImage(SvBmp::HIUNCHECKED, GetSizedImage( *pVDev, aSize, CheckBox::GetCheckImage( rSettings, DrawButtonFlags::Default | DrawButtonFlags::Pressed)) );
pData->SetImage(SvBmp::TRISTATE, GetSizedImage( *pVDev, aSize, Image() ) ); // Use tristate bitmaps to have no checkbox for separator entries
pData->SetImage(SvBmp::HITRISTATE, GetSizedImage( *pVDev, aSize, Image() ) );
-
- // Get image size
- m_aCheckBoxImageSizePixel = aImage.GetSizePixel();
}
Image SvxToolbarEntriesListBox::GetSizedImage(
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index 7f8abc0d83a0..a5a63eeba4bc 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -832,12 +832,6 @@ SfxAccCfgTabListBox_Impl::~SfxAccCfgTabListBox_Impl()
disposeOnce();
}
-void SfxAccCfgTabListBox_Impl::dispose()
-{
- m_pAccelConfigPage.clear();
- SvTabListBox::dispose();
-}
-
/** select the entry, which match the current key input ... excepting
keys, which are used for the dialog itself.
*/
@@ -904,7 +898,6 @@ SfxAcceleratorConfigPage::SfxAcceleratorConfigPage( vcl::Window* pParent, const
Size aSize(LogicToPixel(Size(174, 100), MapMode(MapUnit::MapAppFont)));
m_pEntriesBox->set_width_request(aSize.Width());
m_pEntriesBox->set_height_request(aSize.Height());
- m_pEntriesBox->SetAccelConfigPage(this);
get(m_pGroupLBox, "category");
aSize = LogicToPixel(Size(78 , 91), MapMode(MapUnit::MapAppFont));
m_pGroupLBox->set_width_request(aSize.Width());
@@ -1041,7 +1034,6 @@ void SfxAcceleratorConfigPage::InitAccCfg()
frame::ModuleManager::create(m_xContext);
m_sModuleLongName = xModuleManager->identify(m_xFrame);
comphelper::SequenceAsHashMap lModuleProps(xModuleManager->getByName(m_sModuleLongName));
- m_sModuleShortName = lModuleProps.getUnpackedValueOrDefault("ooSetupFactoryShortName", OUString());
m_sModuleUIName = lModuleProps.getUnpackedValueOrDefault("ooSetupFactoryUIName", OUString());
// get global accelerator configuration
diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx
index 06bba88c874a..ffb214140e35 100644
--- a/cui/source/dialogs/colorpicker.cxx
+++ b/cui/source/dialogs/colorpicker.cxx
@@ -1205,7 +1205,6 @@ public:
virtual sal_Int16 SAL_CALL execute( ) override;
private:
- OUString msTitle;
Color mnColor;
sal_Int16 mnMode;
Reference<css::awt::XWindow> mxParent;
@@ -1287,9 +1286,8 @@ void SAL_CALL ColorPicker::setPropertyValues( const Sequence< PropertyValue >& a
}
// XExecutableDialog
-void SAL_CALL ColorPicker::setTitle( const OUString& sTitle )
+void SAL_CALL ColorPicker::setTitle( const OUString& )
{
- msTitle = sTitle;
}
sal_Int16 SAL_CALL ColorPicker::execute()
diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx
index cbd9ba908673..408c8f36f9b7 100644
--- a/cui/source/dialogs/hlmarkwn.cxx
+++ b/cui/source/dialogs/hlmarkwn.cxx
@@ -287,8 +287,6 @@ void SvxHlinkDlgMarkWnd::RefreshTree (const OUString& aStrURL)
RestoreLastSelection();
LeaveWait();
-
- maStrLastURL = aStrURL;
}
// get links from document
diff --git a/cui/source/inc/SvxToolbarConfigPage.hxx b/cui/source/inc/SvxToolbarConfigPage.hxx
index 03fc04034995..e3de02d96ce6 100644
--- a/cui/source/inc/SvxToolbarConfigPage.hxx
+++ b/cui/source/inc/SvxToolbarConfigPage.hxx
@@ -90,7 +90,6 @@ public:
class SvxToolbarEntriesListBox final : public SvxMenuEntriesListBox
{
- Size m_aCheckBoxImageSizePixel;
std::unique_ptr<SvLBoxButtonData> m_pButtonData;
VclPtr<SvxConfigPage> pPage;
diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx
index 4c626059e6e2..436fbbe2d4d2 100644
--- a/cui/source/inc/acccfg.hxx
+++ b/cui/source/inc/acccfg.hxx
@@ -48,23 +48,14 @@ class SfxStringItem;
class SfxAccCfgTabListBox_Impl : public SvTabListBox
{
- VclPtr<SfxAcceleratorConfigPage> m_pAccelConfigPage;
-
void KeyInput( const KeyEvent &rKEvt ) override;
public:
SfxAccCfgTabListBox_Impl(vcl::Window *pParent, WinBits nStyle)
: SvTabListBox(pParent, nStyle)
- , m_pAccelConfigPage(nullptr)
{
}
virtual ~SfxAccCfgTabListBox_Impl() override;
- virtual void dispose() override;
-
- void SetAccelConfigPage(SfxAcceleratorConfigPage* pAccelConfigPage)
- {
- m_pAccelConfigPage = pAccelConfigPage;
- }
};
// class SfxAcceleratorConfigPage ----------------------------------------
@@ -136,7 +127,6 @@ private:
css::uno::Reference< css::frame::XFrame > m_xFrame;
OUString m_sModuleLongName;
- OUString m_sModuleShortName;
OUString m_sModuleUIName;
// For search
diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx
index 6349108da546..8cfdcc84d571 100644
--- a/cui/source/inc/cuitabline.hxx
+++ b/cui/source/inc/cuitabline.hxx
@@ -113,7 +113,6 @@ private:
XLineAttrSetItem m_aXLineAttr;
SfxItemSet& m_rXLSet;
- XColorListRef m_pColorList;
XDashListRef m_pDashList;
XLineEndListRef m_pLineEndList;
@@ -214,7 +213,6 @@ public:
virtual void FillUserData() override;
- void SetColorList( XColorListRef const & pColorList ) { m_pColorList = pColorList; }
void SetDashList( XDashListRef const & pDshLst ) { m_pDashList = pDshLst; }
void SetLineEndList( XLineEndListRef const & pLneEndLst) { m_pLineEndList = pLneEndLst; }
void SetObjSelected( bool bHasObj ) { m_bObjSelected = bHasObj; }
diff --git a/cui/source/inc/hlmarkwn.hxx b/cui/source/inc/hlmarkwn.hxx
index 160889c4f125..f1c79e719586 100644
--- a/cui/source/inc/hlmarkwn.hxx
+++ b/cui/source/inc/hlmarkwn.hxx
@@ -72,8 +72,6 @@ private:
VclPtr<SvxHyperlinkTabPageBase> mpParent;
- OUString maStrLastURL;
-
sal_uInt16 mnError;
protected:
diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx
index 7ad63e4cbf38..3288e0536ffb 100644
--- a/cui/source/inc/tabstpge.hxx
+++ b/cui/source/inc/tabstpge.hxx
@@ -33,19 +33,15 @@ class SvxTabulatorTabPage;
class TabWin_Impl : public weld::CustomWidgetController
{
private:
- VclPtr<SvxTabulatorTabPage> mpPage;
sal_uInt16 nTabStyle;
public:
- TabWin_Impl()
- : mpPage(nullptr)
- , nTabStyle(0)
+ TabWin_Impl() : nTabStyle(0)
{
}
virtual void Paint(vcl::RenderContext& rRenderContext, const ::tools::Rectangle& rRect) override;
- void SetTabulatorTabPage(SvxTabulatorTabPage* pPage);
void SetTabStyle(sal_uInt16 nStyle) {nTabStyle = nStyle; }
};
diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx
index 89569e2e35ea..0d7b6fe5a75b 100644
--- a/cui/source/inc/transfrm.hxx
+++ b/cui/source/inc/transfrm.hxx
@@ -224,9 +224,6 @@ private:
const SdrView* pView;
- // #i75273#
- basegfx::B2DRange maRange;
-
MapUnit ePoolUnit;
FieldUnit eDlgUnit;
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 0c01d7fc677c..27f8aa4dcb5e 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -468,12 +468,10 @@ struct OptionsGroupInfo
SfxShell* m_pShell; // used to create the page
SfxModule* m_pModule; // used to create the ItemSet
sal_uInt16 m_nDialogId; // Id of the former dialog
- OUString m_sPageURL;
OptionsGroupInfo( SfxShell* pSh, SfxModule* pMod, sal_uInt16 nId ) :
m_pShell( pSh ),
- m_pModule( pMod ), m_nDialogId( nId ),
- m_sPageURL( OUString() ) {}
+ m_pModule( pMod ), m_nDialogId( nId ) {}
};
#define INI_LIST() \
@@ -1985,17 +1983,6 @@ static void lcl_insertLeaf(
{
sal_uInt16 nNodeGrpId = getGroupNodeId( pNode->m_sId );
nGrpId = pDlg->AddGroup( pNode->m_sLabel, nullptr, nullptr, nNodeGrpId );
- if ( !pNode->m_sPageURL.isEmpty() )
- {
- SvTreeListEntry* pGrpEntry = rTreeLB.GetEntry( nullptr, nGrpId );
- DBG_ASSERT( pGrpEntry, "OfaTreeOptionsDialog::InsertNodes(): no group" );
- if ( pGrpEntry )
- {
- OptionsGroupInfo* pGrpInfo =
- static_cast<OptionsGroupInfo*>(pGrpEntry->GetUserData());
- pGrpInfo->m_sPageURL = pNode->m_sPageURL;
- }
- }
}
OptionsPageInfo* pInfo = pDlg->AddTabPage( 0, pLeaf->m_sLabel, nGrpId );
pInfo->m_sPageURL = pLeaf->m_sPageURL;
diff --git a/cui/source/tabpages/tabline.cxx b/cui/source/tabpages/tabline.cxx
index df1b6a3ba9d9..24d0af9d36de 100644
--- a/cui/source/tabpages/tabline.cxx
+++ b/cui/source/tabpages/tabline.cxx
@@ -166,7 +166,6 @@ void SvxLineTabDialog::PageCreated(const OString& rId, SfxTabPage &rPage)
{
if (rId == "RID_SVXPAGE_LINE")
{
- static_cast<SvxLineTabPage&>(rPage).SetColorList( pColorList );
static_cast<SvxLineTabPage&>(rPage).SetDashList( pDashList );
static_cast<SvxLineTabPage&>(rPage).SetLineEndList( pLineEndList );
static_cast<SvxLineTabPage&>(rPage).SetDlgType( 0 );
diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx
index ae4f559a43b1..1d7f009419fc 100644
--- a/cui/source/tabpages/tabstpge.cxx
+++ b/cui/source/tabpages/tabstpge.cxx
@@ -51,11 +51,6 @@ static void FillUpWithDefTabs_Impl( long nDefDist, SvxTabStopItem& rTabs )
}
}
-void TabWin_Impl::SetTabulatorTabPage(SvxTabulatorTabPage* pPage)
-{
- mpPage = pPage;
-}
-
void TabWin_Impl::Paint(vcl::RenderContext& rRenderContext, const ::tools::Rectangle&)
{
// Paint tabulators
@@ -96,10 +91,6 @@ SvxTabulatorTabPage::SvxTabulatorTabPage(TabPageParent pParent, const SfxItemSet
, m_xCenterWin(new weld::CustomWeld(*m_xBuilder, "drawingareaWIN_TABCENTER", m_aCenterWin))
, m_xDezWin(new weld::CustomWeld(*m_xBuilder, "drawingareaWIN_TABDECIMAL", m_aDezWin))
{
- m_aLeftWin.SetTabulatorTabPage(this);
- m_aRightWin.SetTabulatorTabPage(this);
- m_aCenterWin.SetTabulatorTabPage(this);
- m_aDezWin.SetTabulatorTabPage(this);
m_aLeftWin.SetTabStyle(sal_uInt16(RULER_TAB_LEFT|WB_HORZ));
m_aRightWin.SetTabStyle(sal_uInt16(RULER_TAB_RIGHT|WB_HORZ));
m_aCenterWin.SetTabStyle(sal_uInt16(RULER_TAB_CENTER|WB_HORZ));
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index db35461472b6..57d58f95adf8 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -338,10 +338,7 @@ void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet )
// ColorList
if( *m_pnColorListState != ChangeType::NONE )
{
- if( *m_pnColorListState & ChangeType::CHANGED )
- m_pColorList = static_cast<SvxLineTabDialog*>(GetDialogController())->GetNewColorList();
-
- ChangePreviewHdl_Impl( nullptr );
+ ChangePreviewHdl_Impl( nullptr );
}
m_nPageType = PageType::Area;
@@ -1664,7 +1661,6 @@ void SvxLineTabPage::DataChanged( const DataChangedEvent& rDCEvt )
void SvxLineTabPage::PageCreated(const SfxAllItemSet& aSet)
{
- const SvxColorListItem* pColorListItem = aSet.GetItem<SvxColorListItem>(SID_COLOR_TABLE, false);
const SvxDashListItem* pDashListItem = aSet.GetItem<SvxDashListItem>(SID_DASH_LIST, false);
const SvxLineEndListItem* pLineEndListItem = aSet.GetItem<SvxLineEndListItem>(SID_LINEEND_LIST, false);
const SfxUInt16Item* pPageTypeItem = aSet.GetItem<SfxUInt16Item>(SID_PAGE_TYPE, false);
@@ -1673,8 +1669,6 @@ void SvxLineTabPage::PageCreated(const SfxAllItemSet& aSet)
const SfxTabDialogItem* pSymbolAttrItem = aSet.GetItem<SfxTabDialogItem>(SID_ATTR_SET, false);
const SvxGraphicItem* pGraphicItem = aSet.GetItem<SvxGraphicItem>(SID_GRAPHIC, false);
- if (pColorListItem)
- SetColorList(pColorListItem->GetColorList());
if (pDashListItem)
SetDashList(pDashListItem->GetDashList());
if (pLineEndListItem)
diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
index 210869477114..9e3360953a9c 100644
--- a/cui/source/tabpages/transfrm.cxx
+++ b/cui/source/tabpages/transfrm.cxx
@@ -477,7 +477,6 @@ void SvxSlantTabPage::Construct()
{ // #i75273#
::tools::Rectangle aTempRect(pView->GetAllMarkedRect());
pView->GetSdrPageView()->LogicToPagePos(aTempRect);
- maRange = basegfx::B2DRange(aTempRect.Left(), aTempRect.Top(), aTempRect.Right(), aTempRect.Bottom());
}
}
@@ -743,14 +742,6 @@ VclPtr<SfxTabPage> SvxSlantTabPage::Create(TabPageParent pParent, const SfxItemS
void SvxSlantTabPage::ActivatePage( const SfxItemSet& rSet )
{
- SfxRectangleItem const * pRectItem = nullptr;
-
- if( SfxItemState::SET == rSet.GetItemState( GetWhich( SID_ATTR_TRANSFORM_INTERN ) , false, reinterpret_cast<SfxPoolItem const **>(&pRectItem) ) )
- {
- const ::tools::Rectangle aTempRect(pRectItem->GetValue());
- maRange = basegfx::B2DRange(aTempRect.Left(), aTempRect.Top(), aTempRect.Right(), aTempRect.Bottom());
- }
-
SfxBoolItem const * bPosProtect = nullptr;
if(SfxItemState::SET == rSet.GetItemState( GetWhich(SID_ATTR_TRANSFORM_PROTECT_POS ) , false, reinterpret_cast<SfxPoolItem const **>(&bPosProtect) ))
{
commit b61cfadb71597dd132d6a783484e6763c9361bde
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Sun Feb 24 09:07:21 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Mon Feb 25 08:05:51 2019 +0100
loplugin:unusedfields in connectivity
Change-Id: I72b6c34151815bef0f99f81ef67529b52fd33150
Reviewed-on: https://gerrit.libreoffice.org/68277
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/connectivity/source/drivers/file/FPreparedStatement.cxx b/connectivity/source/drivers/file/FPreparedStatement.cxx
index 2d72aa5b7330..b82a702a7c95 100644
--- a/connectivity/source/drivers/file/FPreparedStatement.cxx
+++ b/connectivity/source/drivers/file/FPreparedStatement.cxx
@@ -502,9 +502,6 @@ void OPreparedStatement::initializeResultSet(OResultSet* pRS)
{
OStatement_Base::initializeResultSet(pRS);
- pRS->setParameterColumns(m_xParamColumns);
- pRS->setParameterRow(m_aParameterRow);
-
// Substitute parameter (AssignValues and criteria):
if (!m_xParamColumns->get().empty())
{
diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx
index 13f6c5226018..fe8f8f4d79ba 100644
--- a/connectivity/source/drivers/file/FResultSet.cxx
+++ b/connectivity/source/drivers/file/FResultSet.cxx
@@ -137,7 +137,6 @@ void OResultSet::disposing()
m_pParseTree = nullptr;
m_xColNames.clear();
m_xColumns = nullptr;
- m_xParamColumns = nullptr;
m_xColsIdx.clear();
Reference<XComponent> xComp = m_pTable.get();
diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx
index ec74025fb945..5cd6bb8267e1 100644
--- a/connectivity/source/drivers/file/FStatement.cxx
+++ b/connectivity/source/drivers/file/FStatement.cxx
@@ -429,10 +429,6 @@ void OStatement_Base::construct(const OUString& sql)
m_pSQLAnalyzer.reset( new OSQLAnalyzer(m_pConnection.get()) );
- Reference<XIndexesSupplier> xIndexSup(xTunnel,UNO_QUERY);
- if(xIndexSup.is())
- m_pSQLAnalyzer->setIndexes(xIndexSup->getIndexes());
-
anylizeSQL();
}
diff --git a/connectivity/source/drivers/file/fanalyzer.cxx b/connectivity/source/drivers/file/fanalyzer.cxx
index 15fe2c431b7f..93b728827d9a 100644
--- a/connectivity/source/drivers/file/fanalyzer.cxx
+++ b/connectivity/source/drivers/file/fanalyzer.cxx
@@ -47,11 +47,6 @@ OSQLAnalyzer::~OSQLAnalyzer()
}
-void OSQLAnalyzer::setIndexes(const Reference< XNameAccess>& _xIndexes)
-{
- m_aCompiler->m_xIndexes = _xIndexes;
-}
-
void OSQLAnalyzer::start(OSQLParseNode const * pSQLParseNode)
{
if (SQL_ISRULE(pSQLParseNode,select_statement))
diff --git a/connectivity/source/drivers/file/fcomp.cxx b/connectivity/source/drivers/file/fcomp.cxx
index bdb46456fc38..63cbd0abb9b2 100644
--- a/connectivity/source/drivers/file/fcomp.cxx
+++ b/connectivity/source/drivers/file/fcomp.cxx
@@ -60,7 +60,6 @@ void OPredicateCompiler::dispose()
{
Clean();
m_orgColumns = nullptr;
- m_xIndexes.clear();
}
void OPredicateCompiler::start(OSQLParseNode const * pSQLParseNode)
diff --git a/connectivity/source/drivers/mork/MPreparedStatement.cxx b/connectivity/source/drivers/mork/MPreparedStatement.cxx
index b252a02b070b..c9a1fafd9c28 100644
--- a/connectivity/source/drivers/mork/MPreparedStatement.cxx
+++ b/connectivity/source/drivers/mork/MPreparedStatement.cxx
@@ -78,7 +78,6 @@ OCommonStatement::StatementType OPreparedStatement::parseSql( const OUString& sq
void OPreparedStatement::initializeResultSet( OResultSet* _pResult )
{
OCommonStatement::initializeResultSet( _pResult );
- _pResult->setParameterColumns( m_xParamColumns );
_pResult->setParameterRow( m_aParameterRow );
}
diff --git a/connectivity/source/drivers/mork/MResultSet.cxx b/connectivity/source/drivers/mork/MResultSet.cxx
index 880c035dbf6a..bd280b10b558 100644
--- a/connectivity/source/drivers/mork/MResultSet.cxx
+++ b/connectivity/source/drivers/mork/MResultSet.cxx
@@ -100,7 +100,6 @@ void OResultSet::disposing()
m_xMetaData.clear();
m_pParseTree = nullptr;
m_xColumns = nullptr;
- m_xParamColumns = nullptr;
m_pKeySet = nullptr;
m_xTable.clear();
}
diff --git a/connectivity/source/drivers/mork/MResultSet.hxx b/connectivity/source/drivers/mork/MResultSet.hxx
index dd329c3af25e..0531781d7cc1 100644
--- a/connectivity/source/drivers/mork/MResultSet.hxx
+++ b/connectivity/source/drivers/mork/MResultSet.hxx
@@ -231,7 +231,6 @@ protected:
void resetParameters() { m_nParamIndex = 0; }
::rtl::Reference<connectivity::OSQLColumns> m_xColumns; // this are the select columns
- ::rtl::Reference<connectivity::OSQLColumns> m_xParamColumns;
void parseParameter( const OSQLParseNode* pNode, OUString& rMatchString );
/// @throws css::sdbc::SQLException
@@ -285,9 +284,6 @@ public:
void setParameterRow(const OValueRow& _rParaRow)
{ m_aParameterRow = _rParaRow; }
- void setParameterColumns(const ::rtl::Reference<connectivity::OSQLColumns>& _xParamColumns)
- { m_xParamColumns = _xParamColumns; }
-
void setBindingRow(const OValueRow& _aRow)
{ m_aRow = _aRow; }
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx
index 4706e2c557ea..04c27cd0ed71 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx
@@ -77,9 +77,6 @@ IniParser::IniParser(OUString const & rIniName)
line.copy(nIndexStart + 1,nIndexEnd - nIndexStart -1).trim(), RTL_TEXTENCODING_ASCII_US );
if (sectionName.isEmpty())
sectionName = "no name section";
-
- ini_Section *aSection = &mAllSection[sectionName];
- aSection->sName = sectionName;
}
}
}
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx
index 95ca6d748cf5..f9cb0241b4a1 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx
@@ -38,7 +38,6 @@ typedef std::vector<
struct ini_Section
{
- OUString sName;
NameValueVector vVector;
};
typedef std::map<OUString,
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_connection.cxx b/connectivity/source/drivers/mysqlc/mysqlc_connection.cxx
index 981fe7392aa5..dfe71b4d35a6 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_connection.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_connection.cxx
@@ -189,8 +189,6 @@ void OConnection::construct(const OUString& url, const Sequence<PropertyValue>&
mysqlc_sdbc_driver::throwSQLExceptionWithMsg(mysql_error(&m_mysql), mysql_errno(&m_mysql),
*this, getConnectionEncoding());
- m_settings.schema = aDbName;
-
// Check if the server is 4.1 or above
if (getMysqlVersion() < 40100)
{
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_connection.hxx b/connectivity/source/drivers/mysqlc/mysqlc_connection.hxx
index b1c8d5bda8ed..cccbb294e204 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_connection.hxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_connection.hxx
@@ -69,7 +69,6 @@ typedef ::cppu::WeakComponentImplHelper3<css::sdbc::XConnection, css::sdbc::XWar
struct ConnectionSettings
{
rtl_TextEncoding encoding;
- OUString schema;
OUString connectionURL;
bool readOnly;
ConnectionSettings()
diff --git a/connectivity/source/drivers/writer/WTable.cxx b/connectivity/source/drivers/writer/WTable.cxx
index 1e847dfb9eb2..445ec79bc6da 100644
--- a/connectivity/source/drivers/writer/WTable.cxx
+++ b/connectivity/source/drivers/writer/WTable.cxx
@@ -205,10 +205,6 @@ void OWriterTable::construct()
m_bHasHeaders = true;
}
}
-
- uno::Reference<util::XNumberFormatsSupplier> xSupp(xDoc, uno::UNO_QUERY);
- if (xSupp.is())
- m_xFormats = xSupp->getNumberFormats();
}
fillColumns();
diff --git a/connectivity/source/inc/file/FResultSet.hxx b/connectivity/source/inc/file/FResultSet.hxx
index d223c0909d4e..155f7a6e2413 100644
--- a/connectivity/source/inc/file/FResultSet.hxx
+++ b/connectivity/source/inc/file/FResultSet.hxx
@@ -76,7 +76,6 @@ namespace connectivity
OValueRefRow m_aSelectRow;
OValueRefRow m_aRow;
OValueRefRow m_aEvaluateRow; // contains all values of a row
- OValueRefRow m_aParameterRow;
OValueRefRow m_aInsertRow; // needed for insert by cursor
ORefAssignValues m_aAssignValues; // needed for insert,update and parameters
// to compare with the restrictions
@@ -88,7 +87,6 @@ namespace connectivity
std::unique_ptr<OSortIndex> m_pSortIndex;
::rtl::Reference<connectivity::OSQLColumns> m_xColumns; // this are the select columns
- ::rtl::Reference<connectivity::OSQLColumns> m_xParamColumns;
rtl::Reference<OFileTable> m_pTable;
connectivity::OSQLParseNode* m_pParseTree;
@@ -262,9 +260,7 @@ namespace connectivity
void doTableSpecials(const OSQLTable& _xTable);
sal_Int32 getRowCountResult() const { return m_nRowCountResult; }
- void setParameterRow(const OValueRefRow& _rParaRow) { m_aParameterRow = _rParaRow; }
void setEvaluationRow(const OValueRefRow& _aRow) { m_aEvaluateRow = _aRow; }
- void setParameterColumns(const ::rtl::Reference<connectivity::OSQLColumns>& _xParamColumns) { m_xParamColumns = _xParamColumns; }
void setAssignValues(const ORefAssignValues& _aAssignValues) { m_aAssignValues = _aAssignValues; }
void setBindingRow(const OValueRefRow& _aRow) { m_aRow = _aRow; }
void setSelectRow(const OValueRefRow& _rRow)
diff --git a/connectivity/source/inc/file/fanalyzer.hxx b/connectivity/source/inc/file/fanalyzer.hxx
index bf0bf810299d..a2463870d1c9 100644
--- a/connectivity/source/inc/file/fanalyzer.hxx
+++ b/connectivity/source/inc/file/fanalyzer.hxx
@@ -58,8 +58,6 @@ namespace connectivity
*/
void bindParameterRow(OValueRefRow const & _pRow);
- void setIndexes(const css::uno::Reference< css::container::XNameAccess>& _xIndexes);
-
void dispose();
void start(OSQLParseNode const * pSQLParseNode);
bool hasRestriction() const;
diff --git a/connectivity/source/inc/file/fcomp.hxx b/connectivity/source/inc/file/fcomp.hxx
index 5b290c2f7212..3f1d0d9d545d 100644
--- a/connectivity/source/inc/file/fcomp.hxx
+++ b/connectivity/source/inc/file/fcomp.hxx
@@ -41,7 +41,6 @@ namespace connectivity
OCodeList m_aCodeList;
css::uno::Reference< css::container::XNameAccess> m_orgColumns; // in filecurs this are the filecolumns
OSQLAnalyzer* m_pAnalyzer;
- css::uno::Reference< css::container::XNameAccess> m_xIndexes;
sal_Int32 m_nParamCounter;
public:
OPredicateCompiler(OSQLAnalyzer* pAnalyzer);
diff --git a/connectivity/source/inc/writer/WTable.hxx b/connectivity/source/inc/writer/WTable.hxx
index 27c77f2dbf7a..6e2c3e89e88a 100644
--- a/connectivity/source/inc/writer/WTable.hxx
+++ b/connectivity/source/inc/writer/WTable.hxx
@@ -65,7 +65,6 @@ private:
sal_Int32 m_nStartCol;
sal_Int32 m_nDataCols;
bool m_bHasHeaders;
- css::uno::Reference<css::util::XNumberFormats> m_xFormats;
void fillColumns();
More information about the Libreoffice-commits
mailing list