[Libreoffice-commits] core.git: sw/inc sw/source
Noel Grandin
noel.grandin at collabora.co.uk
Tue May 9 12:35:20 UTC 2017
sw/inc/swabstdlg.hxx | 2 +-
sw/source/filter/ww8/wrtww8.cxx | 8 ++++----
sw/source/filter/ww8/ww8glsy.cxx | 6 ++----
sw/source/filter/ww8/ww8glsy.hxx | 24 ++++++++++++++----------
sw/source/filter/ww8/ww8graf.cxx | 7 +++----
sw/source/filter/ww8/ww8par.cxx | 2 +-
sw/source/filter/ww8/ww8par.hxx | 4 ++--
sw/source/filter/ww8/ww8par6.cxx | 2 +-
sw/source/ui/dbui/dbinsdlg.cxx | 2 +-
sw/source/ui/dialog/swdlgfact.cxx | 4 ++--
sw/source/ui/dialog/swdlgfact.hxx | 2 +-
sw/source/ui/table/tabledlg.cxx | 2 +-
sw/source/ui/table/tautofmt.cxx | 8 ++++----
sw/source/ui/vba/vbacell.cxx | 2 +-
sw/source/ui/vba/vbadocumentproperties.cxx | 6 +++---
sw/source/ui/vba/vbatablehelper.cxx | 8 ++++----
sw/source/ui/vba/vbatablehelper.hxx | 4 ++--
sw/source/uibase/inc/tabledlg.hxx | 2 +-
sw/source/uibase/shells/tabsh.cxx | 2 +-
19 files changed, 49 insertions(+), 48 deletions(-)
New commits:
commit a9563370242f0b3b95482659d5cf75c5c9c72c32
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Mon May 8 15:50:31 2017 +0200
loplugin:checkunusedparams in sw(part6)
Change-Id: I8c32274081663038526e1af2bd2977604b3f88b5
Reviewed-on: https://gerrit.libreoffice.org/37393
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index 55ff52685209..05078ff93672 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -430,7 +430,7 @@ public:
virtual VclPtr<SfxAbstractDialog> CreateSwWrapDlg ( vcl::Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh ) = 0;
virtual VclPtr<VclAbstractDialog> CreateSwTableWidthDlg(vcl::Window *pParent, SwTableFUNC &rFnc) = 0;
- virtual VclPtr<SfxAbstractTabDialog> CreateSwTableTabDlg(vcl::Window* pParent, SfxItemPool& Pool,
+ virtual VclPtr<SfxAbstractTabDialog> CreateSwTableTabDlg(vcl::Window* pParent,
const SfxItemSet* pItemSet, SwWrtShell* pSh) = 0;
virtual VclPtr<AbstractSwFieldDlg> CreateSwFieldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, vcl::Window *pParent) = 0;
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 48f28ecc368a..5dd31ea30c87 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -200,7 +200,7 @@ public:
WW8_WrtBookmarks();
~WW8_WrtBookmarks();
//! Add a new bookmark to the list OR add an end position to an existing bookmark.
- void Append( WW8_CP nStartCp, const OUString& rNm, const ::sw::mark::IMark* pBkmk=nullptr );
+ void Append( WW8_CP nStartCp, const OUString& rNm );
//! Write out bookmarks to file.
void Write( WW8Export& rWrt );
//! Move existing field marks from one position to another.
@@ -223,7 +223,7 @@ WW8_WrtBookmarks::~WW8_WrtBookmarks()
}
}
-void WW8_WrtBookmarks::Append( WW8_CP nStartCp, const OUString& rNm, const ::sw::mark::IMark*)
+void WW8_WrtBookmarks::Append( WW8_CP nStartCp, const OUString& rNm)
{
std::pair<BKMKNames::iterator, bool> aResult = maSwBkmkNms.insert(std::pair<OUString,long>(rNm,0L));
if (aResult.second)
@@ -1461,14 +1461,14 @@ void WW8Export::AppendBookmarks( const SwTextNode& rNd, sal_Int32 nAktPos, sal_I
nContent < nAktEnd ) )
{
sal_uLong nCp = nSttCP + pPos->nContent.GetIndex() - nAktPos;
- m_pBkmks->Append(nCp, BookmarkToWord(rBkmk.GetName()), &rBkmk);
+ m_pBkmks->Append(nCp, BookmarkToWord(rBkmk.GetName()));
}
if( pOPos && nNd == pOPos->nNode.GetIndex() &&
( nContent = pOPos->nContent.GetIndex() ) >= nAktPos &&
nContent < nAktEnd )
{
sal_uLong nCp = nSttCP + pOPos->nContent.GetIndex() - nAktPos;
- m_pBkmks->Append(nCp, BookmarkToWord(rBkmk.GetName()), &rBkmk);
+ m_pBkmks->Append(nCp, BookmarkToWord(rBkmk.GetName()));
}
}
}
diff --git a/sw/source/filter/ww8/ww8glsy.cxx b/sw/source/filter/ww8/ww8glsy.cxx
index f206d1493fd9..21e116a1bbd1 100644
--- a/sw/source/filter/ww8/ww8glsy.cxx
+++ b/sw/source/filter/ww8/ww8glsy.cxx
@@ -50,7 +50,7 @@ WW8Glossary::WW8Glossary(tools::SvRef<SotStorageStream> &refStrm, sal_uInt8 nVer
if (xTableStream.is() && SVSTREAM_OK == xTableStream->GetError())
{
xTableStream->SetEndian(SvStreamEndian::LITTLE);
- pGlossary.reset( new WW8GlossaryFib(*refStrm, nVersion, *xTableStream, aWwFib) );
+ pGlossary.reset( new WW8GlossaryFib(*refStrm, nVersion, aWwFib) );
}
}
}
@@ -235,9 +235,7 @@ bool WW8Glossary::Load( SwTextBlocks &rBlocks, bool bSaveRelFile )
return bRet;
}
-sal_uInt32 WW8GlossaryFib::FindGlossaryFibOffset(SvStream & /* rTableStrm */,
- SvStream & /* rStrm */,
- const WW8Fib &rFib)
+sal_uInt32 WW8GlossaryFib::FindGlossaryFibOffset(const WW8Fib &rFib)
{
sal_uInt32 nGlossaryFibOffset = 0;
if ( rFib.m_fDot ) // it's a template
diff --git a/sw/source/filter/ww8/ww8glsy.hxx b/sw/source/filter/ww8/ww8glsy.hxx
index cfb8b297865e..e617fa0083d1 100644
--- a/sw/source/filter/ww8/ww8glsy.hxx
+++ b/sw/source/filter/ww8/ww8glsy.hxx
@@ -35,14 +35,14 @@ class SwNodeIndex;
class WW8GlossaryFib : public WW8Fib
{
public:
- WW8GlossaryFib( SvStream& rStrm, sal_uInt8 nWantedVersion ,
- SvStream& rTableStrm, const WW8Fib &rFib) : WW8Fib(rStrm,
- nWantedVersion,FindGlossaryFibOffset(rTableStrm,rStrm,rFib)) {}
+ WW8GlossaryFib( SvStream& rStrm, sal_uInt8 nWantedVersion, const WW8Fib &rFib)
+ : WW8Fib(rStrm, nWantedVersion, FindGlossaryFibOffset(rFib)) {}
// fGlsy will indicate whether this has AutoText or not
- bool IsGlossaryFib() { return m_fGlsy; }
+ bool IsGlossaryFib() {
+ return m_fGlsy;
+ }
private:
- static sal_uInt32 FindGlossaryFibOffset(SvStream &rTableStrm,SvStream &rStrm,
- const WW8Fib &rFib);
+ static sal_uInt32 FindGlossaryFibOffset(const WW8Fib &rFib);
};
/*
@@ -60,8 +60,12 @@ class WW8Glossary
public:
WW8Glossary( tools::SvRef<SotStorageStream> &refStrm, sal_uInt8 nVersion, SotStorage *pStg);
bool Load( SwTextBlocks &rBlocks, bool bSaveRelFile );
- WW8GlossaryFib *GetFib() { return pGlossary.get(); }
- sal_uInt16 GetNoStrings() const { return nStrings; }
+ WW8GlossaryFib *GetFib() {
+ return pGlossary.get();
+ }
+ sal_uInt16 GetNoStrings() const {
+ return nStrings;
+ }
private:
std::unique_ptr<WW8GlossaryFib> pGlossary;
@@ -71,8 +75,8 @@ private:
sal_uInt16 nStrings;
static bool MakeEntries(SwDoc *pD, SwTextBlocks &rBlocks, bool bSaveRelFile,
- const std::vector<OUString>& rStrings,
- const std::vector<ww::bytes>& rExtra);
+ const std::vector<OUString>& rStrings,
+ const std::vector<ww::bytes>& rExtra);
static bool HasBareGraphicEnd(SwDoc *pD,SwNodeIndex &rIdx);
WW8Glossary(const WW8Glossary&) = delete;
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 1057c4da933c..9623dd288355 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -2170,7 +2170,7 @@ bool SwWW8ImplReader::MiserableRTLGraphicsHack(SwTwips &rLeft, SwTwips nWidth,
}
RndStdIds SwWW8ImplReader::ProcessEscherAlign(SvxMSDffImportRec* pRecord,
- WW8_FSPA *pFSPA, SfxItemSet &rFlySet, bool /*bOrgObjectWasReplace*/)
+ WW8_FSPA *pFSPA, SfxItemSet &rFlySet)
{
OSL_ENSURE(pRecord || pFSPA, "give me something! to work with for anchoring");
if (!pRecord && !pFSPA)
@@ -2686,8 +2686,7 @@ SwFrameFormat* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp )
pF->nby = WW8_FSPA::RelPageBorder;
}
- RndStdIds eAnchor = ProcessEscherAlign(pRecord, pF, aFlySet,
- bReplaceable);
+ RndStdIds eAnchor = ProcessEscherAlign(pRecord, pF, aFlySet);
// Should we, and is it possible to make this into a writer textbox
if ((!(m_nIniFlags1 & WW8FL_NO_FLY_FOR_TXBX)) && pRecord->bReplaceByFly)
@@ -2995,7 +2994,7 @@ SwFlyFrameFormat* SwWW8ImplReader::ImportReplaceableDrawables( SdrObject* &rpObj
if (0 > nHeightTw)
nHeightTw = 0;
- ProcessEscherAlign(pRecord, pF, rFlySet, true);
+ ProcessEscherAlign(pRecord, pF, rFlySet);
rFlySet.Put(SwFormatFrameSize(ATT_FIX_SIZE, nWidthTw, nHeightTw));
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index b10c0f2887c5..243e0cb78a83 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -3726,7 +3726,7 @@ long SwWW8ImplReader::ReadTextAttr(WW8_CP& rTextPos, long nTextEnd, bool& rbStar
{
OSL_ENSURE(m_pPaM->GetNode().GetTextNode(), "Missing txtnode");
// Create PageDesc and fill it
- m_aSectionManager.CreateSep(rTextPos, m_bPgSecBreak);
+ m_aSectionManager.CreateSep(rTextPos);
// -> 0xc was a Sectionbreak, but not a Pagebreak;
// Create PageDesc and fill it
m_bPgSecBreak = false;
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index a67f03f806ac..43974de5952d 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -872,7 +872,7 @@ public:
void PrependedInlineNode(const SwPosition &rPos, const SwNode &rNode);
sal_uInt16 CurrentSectionColCount() const;
bool WillHavePageDescHere(const SwNodeIndex& rIdx) const;
- void CreateSep(const long nTextPos, bool bMustHaveBreak);
+ void CreateSep(const long nTextPos);
void InsertSegments();
void JoinNode(const SwPosition &rPos, const SwNode &rNode);
sal_uInt32 GetPageLeft() const;
@@ -1579,7 +1579,7 @@ private:
void ReadGrafLayer1( WW8PLCFspecial* pPF, long nGrafAnchorCp );
SdrObject* CreateContactObject(SwFrameFormat* pFlyFormat);
RndStdIds ProcessEscherAlign(SvxMSDffImportRec* pRecord, WW8_FSPA *pFSPA,
- SfxItemSet &rFlySet, bool bOrgObjectWasReplace);
+ SfxItemSet &rFlySet);
bool MiserableRTLGraphicsHack(SwTwips &rLeft, SwTwips nWidth,
sal_Int16 eHoriOri, sal_Int16 eHoriRel);
SwFrameFormat* Read_GrafLayer( long nGrafAnchorCp );
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 072ee40165ee..e62807df07ad 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -788,7 +788,7 @@ void wwSectionManager::SetNumberingType(const wwSection &rNewSection,
// fills it/them with attributes and KF texts.
// This has become necessary because the translation of the various
// page attributes is interconnected too much.
-void wwSectionManager::CreateSep(const long nTextPos, bool /*bMustHaveBreak*/)
+void wwSectionManager::CreateSep(const long nTextPos)
{
/*
#i1909# section/page breaks should not occur in tables or subpage
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index a96b74d61b6a..5bfc7a99c50e 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -765,7 +765,7 @@ IMPL_LINK( SwInsertDBColAutoPilot, TableFormatHdl, Button*, pButton, void )
SwAbstractDialogFactory* pFact = swui::GetFactory();
OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
- ScopedVclPtr<SfxAbstractTabDialog> pDlg(pFact->CreateSwTableTabDlg(pButton, rSh.GetAttrPool(), pTableSet, &rSh));
+ ScopedVclPtr<SfxAbstractTabDialog> pDlg(pFact->CreateSwTableTabDlg(pButton, pTableSet, &rSh));
OSL_ENSURE(pDlg, "Dialog creation failed!");
if( RET_OK == pDlg->Execute() )
pTableSet->Put( *pDlg->GetOutputItemSet() );
diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx
index a55f82321fd4..0840530fe608 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -831,10 +831,10 @@ VclPtr<VclAbstractDialog> SwAbstractDialogFactory_Impl::CreateSwTableWidthDlg(vc
return VclPtr<VclAbstractDialog_Impl>::Create( pDlg );
}
-VclPtr<SfxAbstractTabDialog> SwAbstractDialogFactory_Impl::CreateSwTableTabDlg(vcl::Window* pParent, SfxItemPool& Pool,
+VclPtr<SfxAbstractTabDialog> SwAbstractDialogFactory_Impl::CreateSwTableTabDlg(vcl::Window* pParent,
const SfxItemSet* pItemSet, SwWrtShell* pSh)
{
- VclPtr<SfxTabDialog> pDlg = VclPtr<SwTableTabDlg>::Create(pParent, Pool, pItemSet, pSh);
+ VclPtr<SfxTabDialog> pDlg = VclPtr<SwTableTabDlg>::Create(pParent, pItemSet, pSh);
return VclPtr<AbstractTabDialog_Impl>::Create(pDlg);
}
diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx
index 456a953b5c1b..75a690b730f0 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -417,7 +417,7 @@ public:
virtual VclPtr<SfxAbstractDialog> CreateSwWrapDlg ( vcl::Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh ) override;
virtual VclPtr<VclAbstractDialog> CreateSwTableWidthDlg(vcl::Window *pParent, SwTableFUNC &rFnc) override;
- virtual VclPtr<SfxAbstractTabDialog> CreateSwTableTabDlg(vcl::Window* pParent, SfxItemPool& Pool,
+ virtual VclPtr<SfxAbstractTabDialog> CreateSwTableTabDlg(vcl::Window* pParent,
const SfxItemSet* pItemSet, SwWrtShell* pSh) override;
virtual VclPtr<AbstractSwFieldDlg> CreateSwFieldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, vcl::Window *pParent) override;
virtual VclPtr<SfxAbstractDialog> CreateSwFieldEditDlg ( SwView& rVw ) override;
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index b06f51ab5188..603fa93c7fb5 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -1227,7 +1227,7 @@ void SwTableColumnPage::SetVisibleWidth(sal_uInt16 nPos, SwTwips nNewWidth)
}
-SwTableTabDlg::SwTableTabDlg(vcl::Window* pParent, SfxItemPool&,
+SwTableTabDlg::SwTableTabDlg(vcl::Window* pParent,
const SfxItemSet* pItemSet, SwWrtShell* pSh)
: SfxTabDialog(pParent, "TablePropertiesDialog",
"modules/swriter/ui/tableproperties.ui", pItemSet)
diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx
index 1295b902935c..0af33923bf71 100644
--- a/sw/source/ui/table/tautofmt.cxx
+++ b/sw/source/ui/table/tautofmt.cxx
@@ -83,7 +83,7 @@ private:
uno::Reference<i18n::XBreakIterator> m_xBreak;
void Init();
- void DoPaint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect);
+ void DoPaint(vcl::RenderContext& rRenderContext);
void CalcCellArray(bool bFitWidth);
void CalcLineMap();
void PaintCells(vcl::RenderContext& rRenderContext);
@@ -889,7 +889,7 @@ void AutoFormatPreview::NotifyChange( const SwTableAutoFormat& rNewData )
Invalidate(tools::Rectangle(Point(0,0), GetSizePixel()));
}
-void AutoFormatPreview::DoPaint(vcl::RenderContext& rRenderContext, const tools::Rectangle& /*rRect*/)
+void AutoFormatPreview::DoPaint(vcl::RenderContext& rRenderContext)
{
DrawModeFlags nOldDrawMode = aVD->GetDrawMode();
if (rRenderContext.GetSettings().GetStyleSettings().GetHighContrastMode())
@@ -935,9 +935,9 @@ void AutoFormatPreview::DoPaint(vcl::RenderContext& rRenderContext, const tools:
aVD->SetDrawMode(nOldDrawMode);
}
-void AutoFormatPreview::Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect )
+void AutoFormatPreview::Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& /*rRect*/ )
{
- DoPaint(rRenderContext, rRect);
+ DoPaint(rRenderContext);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/vba/vbacell.cxx b/sw/source/ui/vba/vbacell.cxx
index 17b518eb8b54..21b257b3cb48 100644
--- a/sw/source/ui/vba/vbacell.cxx
+++ b/sw/source/ui/vba/vbacell.cxx
@@ -42,7 +42,7 @@ SwVbaCell::~SwVbaCell()
::sal_Int32 SAL_CALL SwVbaCell::getWidth()
{
SwVbaTableHelper aTableHelper( mxTextTable );
- return aTableHelper.GetColWidth( mnColumn, mnRow, true );
+ return aTableHelper.GetColWidth( mnColumn, mnRow );
}
void SAL_CALL SwVbaCell::setWidth( ::sal_Int32 _width )
diff --git a/sw/source/ui/vba/vbadocumentproperties.cxx b/sw/source/ui/vba/vbadocumentproperties.cxx
index 5f042ab2abf7..c409de73df73 100644
--- a/sw/source/ui/vba/vbadocumentproperties.cxx
+++ b/sw/source/ui/vba/vbadocumentproperties.cxx
@@ -865,7 +865,7 @@ public:
return new DocPropEnumeration( simpleDocPropSnapShot );
}
- void addProp( const OUString& Name, ::sal_Int8 /*Type*/, const uno::Any& Value )
+ void addProp( const OUString& Name, const uno::Any& Value )
{
sal_Int16 attributes = 128;
uno::Reference< beans::XPropertyContainer > xContainer( mxUserDefinedProp, uno::UNO_QUERY_THROW );
@@ -883,14 +883,14 @@ SwVbaCustomDocumentProperties::SwVbaCustomDocumentProperties( const uno::Referen
}
uno::Reference< XDocumentProperty > SAL_CALL
-SwVbaCustomDocumentProperties::Add( const OUString& Name, sal_Bool LinkToContent, ::sal_Int8 Type, const uno::Any& Value, const uno::Any& LinkSource )
+SwVbaCustomDocumentProperties::Add( const OUString& Name, sal_Bool LinkToContent, ::sal_Int8 /*Type*/, const uno::Any& Value, const uno::Any& LinkSource )
{
CustomPropertiesImpl* pCustomProps = dynamic_cast< CustomPropertiesImpl* > ( m_xIndexAccess.get() );
uno::Reference< XDocumentProperty > xDocProp;
if ( pCustomProps )
{
OUString sLinkSource;
- pCustomProps->addProp( Name, Type, Value );
+ pCustomProps->addProp( Name, Value );
xDocProp.set( m_xNameAccess->getByName( Name ), uno::UNO_QUERY_THROW );
xDocProp->setLinkToContent( LinkToContent );
diff --git a/sw/source/ui/vba/vbatablehelper.cxx b/sw/source/ui/vba/vbatablehelper.cxx
index db7d62caddfb..eeff0d96ae69 100644
--- a/sw/source/ui/vba/vbatablehelper.cxx
+++ b/sw/source/ui/vba/vbatablehelper.cxx
@@ -151,7 +151,7 @@ SwTableBox* SwVbaTableHelper::GetTabBox( sal_Int32 nCol, sal_Int32 nRow )
return pStart;
}
-void SwVbaTableHelper::InitTabCols( SwTabCols& rCols, const SwTableBox *pStart, bool /*bCurRowOnly*/ )
+void SwVbaTableHelper::InitTabCols( SwTabCols& rCols, const SwTableBox *pStart )
{
rCols.SetLeftMin ( 0 );
rCols.SetLeft ( 0 );
@@ -182,11 +182,11 @@ sal_Int32 SwVbaTableHelper::GetRightSeparator( SwTabCols& rCols, sal_Int32 nNum)
return i - 1;
}
-sal_Int32 SwVbaTableHelper::GetColWidth( sal_Int32 nCol, sal_Int32 nRow, bool bCurRowOnly )
+sal_Int32 SwVbaTableHelper::GetColWidth( sal_Int32 nCol, sal_Int32 nRow )
{
SwTableBox* pStart = GetTabBox( nCol, nRow );
SwTabCols aCols;
- InitTabCols( aCols, pStart, bCurRowOnly );
+ InitTabCols( aCols, pStart );
sal_Int32 nWidth = GetColWidth( aCols, nCol );
sal_Int32 nTableWidth = getTableWidth( );
@@ -238,7 +238,7 @@ void SwVbaTableHelper::SetColWidth( sal_Int32 _width, sal_Int32 nCol, sal_Int32
SwTableBox* pStart = GetTabBox( nCol, nRow );
SwTabCols aOldCols;
- InitTabCols( aOldCols, pStart, bCurRowOnly );
+ InitTabCols( aOldCols, pStart );
SwTabCols aCols( aOldCols );
if ( aCols.Count() > 0 )
diff --git a/sw/source/ui/vba/vbatablehelper.hxx b/sw/source/ui/vba/vbatablehelper.hxx
index 42aeaaabe1bd..6f4a4d4424b6 100644
--- a/sw/source/ui/vba/vbatablehelper.hxx
+++ b/sw/source/ui/vba/vbatablehelper.hxx
@@ -33,7 +33,7 @@ private:
private:
/// @throws css::uno::RuntimeException
SwTableBox* GetTabBox( sal_Int32 nCol, sal_Int32 nRow );
- void InitTabCols( SwTabCols& rCols, const SwTableBox *pStart, bool bCurRowOnly );
+ void InitTabCols( SwTabCols& rCols, const SwTableBox *pStart );
static sal_Int32 GetRightSeparator( SwTabCols& rCols, sal_Int32 nNum);
static sal_Int32 GetColCount( SwTabCols& rCols );
/// @throws css::uno::RuntimeException
@@ -54,7 +54,7 @@ public:
sal_Int32 getTableWidth( );
/// @throws css::uno::RuntimeException
- sal_Int32 GetColWidth( sal_Int32 nCol, sal_Int32 nRow = 0, bool bCurRowOnly = false );
+ sal_Int32 GetColWidth( sal_Int32 nCol, sal_Int32 nRow = 0 );
/// @throws css::uno::RuntimeException
void SetColWidth( sal_Int32 _width, sal_Int32 nCol, sal_Int32 nRow = 0, bool bCurRowOnly = false );
diff --git a/sw/source/uibase/inc/tabledlg.hxx b/sw/source/uibase/inc/tabledlg.hxx
index 45f9ca152e33..c8463451d6a5 100644
--- a/sw/source/uibase/inc/tabledlg.hxx
+++ b/sw/source/uibase/inc/tabledlg.hxx
@@ -37,7 +37,7 @@ class SwTableTabDlg : public SfxTabDialog
virtual void PageCreated(sal_uInt16 nId, SfxTabPage& rPage) override;
public:
- SwTableTabDlg( vcl::Window* pParent, SfxItemPool& Pool,
+ SwTableTabDlg( vcl::Window* pParent,
const SfxItemSet* pItemSet, SwWrtShell* pSh );
};
diff --git a/sw/source/uibase/shells/tabsh.cxx b/sw/source/uibase/shells/tabsh.cxx
index 5106448688b4..86f278f1b3d4 100644
--- a/sw/source/uibase/shells/tabsh.cxx
+++ b/sw/source/uibase/shells/tabsh.cxx
@@ -598,7 +598,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
- pDlg.disposeAndReset(pFact->CreateSwTableTabDlg(GetView().GetWindow(), GetPool(), &aCoreSet, &rSh));
+ pDlg.disposeAndReset(pFact->CreateSwTableTabDlg(GetView().GetWindow(), &aCoreSet, &rSh));
OSL_ENSURE(pDlg, "Dialog creation failed!");
if (pItem)
More information about the Libreoffice-commits
mailing list