[Libreoffice-commits] core.git: include/svtools svtools/source sw/inc sw/source
Noel Grandin
noel at peralex.com
Thu Jun 2 06:33:01 UTC 2016
include/svtools/treelistbox.hxx | 3
svtools/source/contnr/imivctl.hxx | 4
svtools/source/contnr/imivctl1.cxx | 14 --
svtools/source/contnr/imivctl2.cxx | 49 ++------
svtools/source/contnr/treelistbox.cxx | 191 +++++++++++++++-----------------
sw/inc/dbmgr.hxx | 2
sw/inc/shellio.hxx | 2
sw/inc/swabstdlg.hxx | 5
sw/source/filter/html/htmlflywriter.cxx | 8 -
sw/source/filter/html/wrthtml.hxx | 2
sw/source/filter/writer/writer.cxx | 9 -
sw/source/ui/dialog/swdlgfact.cxx | 5
sw/source/ui/dialog/swdlgfact.hxx | 3
sw/source/uibase/dbui/dbmgr.cxx | 4
14 files changed, 127 insertions(+), 174 deletions(-)
New commits:
commit 84d15d6e5418bd5024bb21b6c8fdc2700667ac04
Author: Noel Grandin <noel at peralex.com>
Date: Wed Jun 1 10:09:07 2016 +0200
loplugin:unuseddefaultparams
Change-Id: I0fe173534dc2e70c3d507eae757a91e48a26acfc
Reviewed-on: https://gerrit.libreoffice.org/25757
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx
index f4342b8..aaeb1f6 100644
--- a/include/svtools/treelistbox.hxx
+++ b/include/svtools/treelistbox.hxx
@@ -560,8 +560,7 @@ protected:
SVT_DLLPRIVATE void AdjustEntryHeight();
SVT_DLLPRIVATE void ImpEntryInserted( SvTreeListEntry* pEntry );
- SVT_DLLPRIVATE void PaintEntry1( SvTreeListEntry&, long nLine, vcl::RenderContext& rRenderContext,
- SvLBoxTabFlags nTabFlagMask = SvLBoxTabFlags::ALL );
+ SVT_DLLPRIVATE void PaintEntry1( SvTreeListEntry&, long nLine, vcl::RenderContext& rRenderContext );
SVT_DLLPRIVATE void InitTreeView();
SVT_DLLPRIVATE SvLBoxItem* GetItem_Impl( SvTreeListEntry*, long nX, SvLBoxTab** ppTab );
diff --git a/svtools/source/contnr/imivctl.hxx b/svtools/source/contnr/imivctl.hxx
index 22d5470..0e0f09e 100644
--- a/svtools/source/contnr/imivctl.hxx
+++ b/svtools/source/contnr/imivctl.hxx
@@ -273,7 +273,7 @@ class SvxIconChoiceCtrl_Impl
Rectangle CalcMaxTextRect( const SvxIconChoiceCtrlEntry* pEntry ) const;
void ClipAtVirtOutRect( Rectangle& rRect ) const;
- void AdjustAtGrid( const SvxIconChoiceCtrlEntryPtrVec& rRow, SvxIconChoiceCtrlEntry* pStart=nullptr );
+ void AdjustAtGrid( const SvxIconChoiceCtrlEntryPtrVec& rRow );
Point AdjustAtGrid(
const Rectangle& rCenterRect, // balance point of object (typically Bmp-Rect)
const Rectangle& rBoundRect
@@ -547,7 +547,7 @@ public:
// Creates a list of entries for every row (height = nGridDY) sorted by
// BoundRect.Left(). A list may be empty. The lists become the property of
// the caller and have to be deleted with DestroyGridAdjustData.
- void CreateGridAjustData( IconChoiceMap& pLists, SvxIconChoiceCtrlEntry* pRow=nullptr);
+ void CreateGridAjustData( IconChoiceMap& pLists );
static void DestroyGridAdjustData( IconChoiceMap& rLists );
};
diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx
index 75c79f3..64b2d3d 100644
--- a/svtools/source/contnr/imivctl1.cxx
+++ b/svtools/source/contnr/imivctl1.cxx
@@ -2724,29 +2724,19 @@ void SvxIconChoiceCtrl_Impl::AdjustEntryAtGrid()
}
// align a row, might expand width, doesn't break the line
-void SvxIconChoiceCtrl_Impl::AdjustAtGrid( const SvxIconChoiceCtrlEntryPtrVec& rRow, SvxIconChoiceCtrlEntry* pStart )
+void SvxIconChoiceCtrl_Impl::AdjustAtGrid( const SvxIconChoiceCtrlEntryPtrVec& rRow )
{
if( rRow.empty() )
return;
- bool bGo;
- if( !pStart )
- bGo = true;
- else
- bGo = false;
-
long nCurRight = 0;
for(SvxIconChoiceCtrlEntry* pCur : rRow)
{
- if( !bGo && pCur == pStart )
- bGo = true;
-
- // SvIcnVwDataEntry* pViewData = ICNVIEWDATA(pCur);
// Decisive (for our eye) is the bitmap, else, the entry might jump too
// much within long texts.
const Rectangle& rBoundRect = GetEntryBoundRect( pCur );
Rectangle aCenterRect( CalcBmpRect( pCur ));
- if( bGo && !pCur->IsPosLocked() )
+ if( !pCur->IsPosLocked() )
{
long nWidth = aCenterRect.GetSize().Width();
Point aNewPos( AdjustAtGrid( aCenterRect, rBoundRect ) );
diff --git a/svtools/source/contnr/imivctl2.cxx b/svtools/source/contnr/imivctl2.cxx
index f785b0e..e9a914d 100644
--- a/svtools/source/contnr/imivctl2.cxx
+++ b/svtools/source/contnr/imivctl2.cxx
@@ -479,46 +479,21 @@ void IcnCursor_Impl::SetDeltas()
}
}
-void IcnCursor_Impl::CreateGridAjustData( IconChoiceMap& rLists, SvxIconChoiceCtrlEntry* pRefEntry)
+void IcnCursor_Impl::CreateGridAjustData( IconChoiceMap& rLists )
{
- if( !pRefEntry )
- {
- sal_uInt16 nGridRows = (sal_uInt16)(pView->aVirtOutputSize.Height() / pView->nGridDY);
- nGridRows++; // because we round down later!
+ sal_uInt16 nGridRows = (sal_uInt16)(pView->aVirtOutputSize.Height() / pView->nGridDY);
+ nGridRows++; // because we round down later!
- if( !nGridRows )
- return;
- const size_t nCount = pView->aEntries.size();
- for( size_t nCur = 0; nCur < nCount; nCur++ )
- {
- SvxIconChoiceCtrlEntry* pEntry = pView->aEntries[ nCur ];
- const Rectangle& rRect = pView->GetEntryBoundRect( pEntry );
- short nY = (short)( ((rRect.Top()+rRect.Bottom())/2) / pView->nGridDY );
- sal_uInt16 nIns = GetSortListPos( rLists[nY], rRect.Left(), false );
- rLists[ nY ].insert( rLists[ nY ].begin() + nIns, pEntry );
- }
- }
- else
+ if( !nGridRows )
+ return;
+ const size_t nCount = pView->aEntries.size();
+ for( size_t nCur = 0; nCur < nCount; nCur++ )
{
- // build a horizontal "tube" in the RefEntry line
- // STOP AND THINK: maybe use bounding rectangle because of overlaps?
- Rectangle rRefRect( pView->CalcBmpRect( pRefEntry ) );
- //const Rectangle& rRefRect = pView->GetEntryBoundRect( pRefEntry );
- short nRefRow = (short)( ((rRefRect.Top()+rRefRect.Bottom())/2) / pView->nGridDY );
- SvxIconChoiceCtrlEntryPtrVec& rRow = rLists[0];
- size_t nCount = pView->aEntries.size();
- for( size_t nCur = 0; nCur < nCount; nCur++ )
- {
- SvxIconChoiceCtrlEntry* pEntry = pView->aEntries[ nCur ];
- Rectangle rRect( pView->CalcBmpRect(pEntry) );
- //const Rectangle& rRect = pView->GetEntryBoundRect( pEntry );
- short nY = (short)( ((rRect.Top()+rRect.Bottom())/2) / pView->nGridDY );
- if( nY == nRefRow )
- {
- sal_uInt16 nIns = GetSortListPos( rRow, rRect.Left(), false );
- rRow.insert( rRow.begin() + nIns, pEntry );
- }
- }
+ SvxIconChoiceCtrlEntry* pEntry = pView->aEntries[ nCur ];
+ const Rectangle& rRect = pView->GetEntryBoundRect( pEntry );
+ short nY = (short)( ((rRect.Top()+rRect.Bottom())/2) / pView->nGridDY );
+ sal_uInt16 nIns = GetSortListPos( rLists[nY], rRect.Left(), false );
+ rLists[ nY ].insert( rLists[ nY ].begin() + nIns, pEntry );
}
}
diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx
index 7a931b8..da64363 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -2763,8 +2763,7 @@ void SvTreeListBox::InvalidateEntry(SvTreeListEntry* pEntry)
}
}
-void SvTreeListBox::PaintEntry1(SvTreeListEntry& rEntry, long nLine, vcl::RenderContext& rRenderContext,
- SvLBoxTabFlags nTabFlags)
+void SvTreeListBox::PaintEntry1(SvTreeListEntry& rEntry, long nLine, vcl::RenderContext& rRenderContext)
{
Rectangle aRect; // multi purpose
@@ -2842,122 +2841,120 @@ void SvTreeListBox::PaintEntry1(SvTreeListEntry& rEntry, long nLine, vcl::Render
else
nX = nTabPos + pTab->CalcOffset(aSize.Width(), nNextTabPos - nTabPos);
- if (nFlags & nTabFlags)
- {
- aEntryPos.X() = nX;
- aEntryPos.Y() = nLine;
+ aEntryPos.X() = nX;
+ aEntryPos.Y() = nLine;
- // set background pattern/color
+ // set background pattern/color
- Wallpaper aWallpaper = rRenderContext.GetBackground();
+ Wallpaper aWallpaper = rRenderContext.GetBackground();
- bool bSelTab = bool(nFlags & SvLBoxTabFlags::SHOW_SELECTION);
- sal_uInt16 nItemType = pItem->GetType();
+ bool bSelTab = bool(nFlags & SvLBoxTabFlags::SHOW_SELECTION);
+ sal_uInt16 nItemType = pItem->GetType();
- if (pViewDataEntry->IsHighlighted() && bSelTab && !pViewDataEntry->IsCursored())
- {
- Color aNewWallColor = rSettings.GetHighlightColor();
- if (!bInUse || nItemType != SV_ITEM_ID_LBOXCONTEXTBMP)
- {
- // if the face color is bright then the deactive color is also bright
- // -> so you can't see any deactive selection
- if (bHideSelection && !rSettings.GetFaceColor().IsBright()
- && aWallpaper.GetColor().IsBright() != rSettings.GetDeactiveColor().IsBright())
- {
- aNewWallColor = rSettings.GetDeactiveColor();
- }
- // set font color to highlight
- if (!bCurFontIsSel)
- {
- rRenderContext.SetTextColor(aHighlightTextColor);
- rRenderContext.SetFont(aHighlightFont);
- bCurFontIsSel = true;
- }
- }
- aWallpaper.SetColor(aNewWallColor);
- }
- else // no selection
+ if (pViewDataEntry->IsHighlighted() && bSelTab && !pViewDataEntry->IsCursored())
+ {
+ Color aNewWallColor = rSettings.GetHighlightColor();
+ if (!bInUse || nItemType != SV_ITEM_ID_LBOXCONTEXTBMP)
{
- if (bInUse && nItemType == SV_ITEM_ID_LBOXCONTEXTBMP)
+ // if the face color is bright then the deactive color is also bright
+ // -> so you can't see any deactive selection
+ if (bHideSelection && !rSettings.GetFaceColor().IsBright()
+ && aWallpaper.GetColor().IsBright() != rSettings.GetDeactiveColor().IsBright())
{
- aWallpaper.SetColor(rSettings.GetFieldColor());
+ aNewWallColor = rSettings.GetDeactiveColor();
}
- else if (bCurFontIsSel)
+ // set font color to highlight
+ if (!bCurFontIsSel)
{
- bCurFontIsSel = false;
- rRenderContext.SetTextColor(aBackupTextColor);
- rRenderContext.SetFont(aBackupFont);
- }
- else
- {
- aWallpaper.SetColor(rEntry.GetBackColor());
+ rRenderContext.SetTextColor(aHighlightTextColor);
+ rRenderContext.SetFont(aHighlightFont);
+ bCurFontIsSel = true;
}
}
-
- // draw background
- if (!(nTreeFlags & SvTreeFlags::USESEL))
+ aWallpaper.SetColor(aNewWallColor);
+ }
+ else // no selection
+ {
+ if (bInUse && nItemType == SV_ITEM_ID_LBOXCONTEXTBMP)
{
- // only draw the area that is used by the item
- aRectSize.Width() = aSize.Width();
- aRect.SetPos(aEntryPos);
- aRect.SetSize(aRectSize);
+ aWallpaper.SetColor(rSettings.GetFieldColor());
}
- else
+ else if (bCurFontIsSel)
{
- // draw from the current to the next tab
- if (nCurTab != 0)
- aRect.Left() = nTabPos;
- else
- // if we're in the 0th tab, always draw from column 0 --
- // else we get problems with centered tabs
- aRect.Left() = 0;
- aRect.Top() = nLine;
- aRect.Bottom() = nLine + nTempEntryHeight - 1;
- if (pNextTab)
- {
- long nRight;
- nRight = GetTabPos(&rEntry, pNextTab) - 1;
- if (nRight > nMaxRight)
- nRight = nMaxRight;
- aRect.Right() = nRight;
- }
- else
- {
- aRect.Right() = nMaxRight;
- }
+ bCurFontIsSel = false;
+ rRenderContext.SetTextColor(aBackupTextColor);
+ rRenderContext.SetFont(aBackupFont);
}
- // A custom selection that starts at a tab position > 0, do not fill
- // the background of the 0th item, else e.g. we might not be able to
- // realize tab listboxes with lines.
- if (!(nCurTab == 0 && (nTreeFlags & SvTreeFlags::USESEL) && nFirstSelTab))
+ else
{
- Color aBackgroundColor = aWallpaper.GetColor();
- if (aBackgroundColor != Color(COL_TRANSPARENT))
- {
- rRenderContext.SetFillColor(aBackgroundColor);
- // this case may occur for smaller horizontal resizes
- if (aRect.Left() < aRect.Right())
- rRenderContext.DrawRect(aRect);
- }
+ aWallpaper.SetColor(rEntry.GetBackColor());
}
- // draw item
- // center vertically
- aEntryPos.Y() += (nTempEntryHeight - aSize.Height()) / 2;
- pViewDataEntry->SetPaintRectangle(aRect);
-
- pItem->Paint(aEntryPos, *this, rRenderContext, pViewDataEntry, rEntry);
+ }
- // division line between tabs
- if (pNextTab && pItem->GetType() == SV_ITEM_ID_LBOXSTRING &&
- // not at the right edge of the window!
- aRect.Right() < nMaxRight)
+ // draw background
+ if (!(nTreeFlags & SvTreeFlags::USESEL))
+ {
+ // only draw the area that is used by the item
+ aRectSize.Width() = aSize.Width();
+ aRect.SetPos(aEntryPos);
+ aRect.SetSize(aRectSize);
+ }
+ else
+ {
+ // draw from the current to the next tab
+ if (nCurTab != 0)
+ aRect.Left() = nTabPos;
+ else
+ // if we're in the 0th tab, always draw from column 0 --
+ // else we get problems with centered tabs
+ aRect.Left() = 0;
+ aRect.Top() = nLine;
+ aRect.Bottom() = nLine + nTempEntryHeight - 1;
+ if (pNextTab)
{
- aRect.Left() = aRect.Right() - SV_TAB_BORDER;
- rRenderContext.DrawRect(aRect);
+ long nRight;
+ nRight = GetTabPos(&rEntry, pNextTab) - 1;
+ if (nRight > nMaxRight)
+ nRight = nMaxRight;
+ aRect.Right() = nRight;
}
+ else
+ {
+ aRect.Right() = nMaxRight;
+ }
+ }
+ // A custom selection that starts at a tab position > 0, do not fill
+ // the background of the 0th item, else e.g. we might not be able to
+ // realize tab listboxes with lines.
+ if (!(nCurTab == 0 && (nTreeFlags & SvTreeFlags::USESEL) && nFirstSelTab))
+ {
+ Color aBackgroundColor = aWallpaper.GetColor();
+ if (aBackgroundColor != Color(COL_TRANSPARENT))
+ {
+ rRenderContext.SetFillColor(aBackgroundColor);
+ // this case may occur for smaller horizontal resizes
+ if (aRect.Left() < aRect.Right())
+ rRenderContext.DrawRect(aRect);
+ }
+ }
+ // draw item
+ // center vertically
+ aEntryPos.Y() += (nTempEntryHeight - aSize.Height()) / 2;
+ pViewDataEntry->SetPaintRectangle(aRect);
- rRenderContext.SetFillColor(aBackupColor);
+ pItem->Paint(aEntryPos, *this, rRenderContext, pViewDataEntry, rEntry);
+
+ // division line between tabs
+ if (pNextTab && pItem->GetType() == SV_ITEM_ID_LBOXSTRING &&
+ // not at the right edge of the window!
+ aRect.Right() < nMaxRight)
+ {
+ aRect.Left() = aRect.Right() - SV_TAB_BORDER;
+ rRenderContext.DrawRect(aRect);
}
+
+ rRenderContext.SetFillColor(aBackupColor);
+
nCurItem++;
nCurTab++;
}
diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx
index 1e409a6..81f32d3 100644
--- a/sw/inc/dbmgr.hxx
+++ b/sw/inc/dbmgr.hxx
@@ -289,7 +289,7 @@ public:
inline void SetMergeSilent( bool bVal ) { bMergeSilent = bVal; }
/// Merging of data records into fields.
- bool Merge( const SwMergeDescriptor& rMergeDesc, vcl::Window* pParent = nullptr );
+ bool Merge( const SwMergeDescriptor& rMergeDesc );
void MergeCancel();
inline bool IsMergeOk() { return MergeStatus::OK == m_aMergeStatus; };
diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx
index 4f8ba19..ebd19461 100644
--- a/sw/inc/shellio.hxx
+++ b/sw/inc/shellio.hxx
@@ -375,7 +375,7 @@ protected:
bool CopyNextPam( SwPaM ** );
void PutNumFormatFontsInAttrPool();
- void PutEditEngFontsInAttrPool( bool bIncl_CJK_CTL = true );
+ void PutEditEngFontsInAttrPool();
virtual sal_uLong WriteStream() = 0;
void SetBaseURL( const OUString& rURL ) { sBaseURL = rURL; }
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index 87b3752..ba64db4 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -416,11 +416,10 @@ public:
SwWrtShell* pWrtSh) = 0;
virtual AbstractMailMergeDlg* CreateMailMergeDlg( int nResId,
vcl::Window* pParent, SwWrtShell& rSh,
- const OUString& rSourceName,
+ const OUString& rSourceName,
const OUString& rTableName,
sal_Int32 nCommandType,
- const css::uno::Reference< css::sdbc::XConnection>& xConnection,
- css::uno::Sequence< css::uno::Any >* pSelection = nullptr ) = 0;
+ const css::uno::Reference< css::sdbc::XConnection>& xConnection ) = 0;
virtual AbstractMailMergeCreateFromDlg* CreateMailMergeCreateFromDlg(vcl::Window* pParent) = 0;
virtual AbstractMailMergeFieldConnectionsDlg* CreateMailMergeFieldConnectionsDlg(vcl::Window* pParent) = 0;
virtual VclAbstractDialog* CreateMultiTOXMarkDlg(vcl::Window* pParent, SwTOXMgr &rTOXMgr) = 0;
diff --git a/sw/source/filter/html/htmlflywriter.cxx b/sw/source/filter/html/htmlflywriter.cxx
index cb44b34..b2e95fa 100644
--- a/sw/source/filter/html/htmlflywriter.cxx
+++ b/sw/source/filter/html/htmlflywriter.cxx
@@ -520,10 +520,9 @@ void SwHTMLWriter::OutFrameFormat( sal_uInt8 nMode, const SwFrameFormat& rFrameF
OString SwHTMLWriter::OutFrameFormatOptions( const SwFrameFormat &rFrameFormat,
const OUString& rAlternateText,
- sal_uInt32 nFrameOpts,
- const OString &rEndTags )
+ sal_uInt32 nFrameOpts )
{
- OString sRetEndTags(rEndTags);
+ OString sRetEndTags;
OStringBuffer sOut;
const SfxPoolItem* pItem;
const SfxItemSet& rItemSet = rFrameFormat.GetAttrSet();
@@ -796,11 +795,10 @@ OString SwHTMLWriter::OutFrameFormatOptions( const SwFrameFormat &rFrameFormat,
{
sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_linebreak).
append(' ').append(OOO_STRING_SVTOOLS_HTML_O_clear).
- append("=\"").append(pStr).append("\">").append(rEndTags);
+ append("=\"").append(pStr).append("\">");
sRetEndTags = sOut.makeStringAndClear();
}
}
- assert(sRetEndTags.endsWith(rEndTags)); // fdo#58286
return sRetEndTags;
}
diff --git a/sw/source/filter/html/wrthtml.hxx b/sw/source/filter/html/wrthtml.hxx
index 2c8e2fd..646afc0 100644
--- a/sw/source/filter/html/wrthtml.hxx
+++ b/sw/source/filter/html/wrthtml.hxx
@@ -464,7 +464,7 @@ public:
// Frame-Formats ausgeben und ggf. ein <BR CLEAR=...> vorne an
// rEndTags anhaengen
OString OutFrameFormatOptions( const SwFrameFormat& rFrameFormat, const OUString& rAltText,
- sal_uInt32 nFrameOpts, const OString& rEndTags = OString() );
+ sal_uInt32 nFrameOpts );
void writeFrameFormatOptions(HtmlWriter& aHtml, const SwFrameFormat& rFrameFormat, const OUString& rAltText, sal_uInt32 nFrameOpts);
diff --git a/sw/source/filter/writer/writer.cxx b/sw/source/filter/writer/writer.cxx
index 4b089d9..222f76d 100644
--- a/sw/source/filter/writer/writer.cxx
+++ b/sw/source/filter/writer/writer.cxx
@@ -391,17 +391,14 @@ void Writer::PutNumFormatFontsInAttrPool()
}
}
-void Writer::PutEditEngFontsInAttrPool( bool bIncl_CJK_CTL )
+void Writer::PutEditEngFontsInAttrPool()
{
SfxItemPool& rPool = pDoc->GetAttrPool();
if( rPool.GetSecondaryPool() )
{
AddFontItems_( rPool, EE_CHAR_FONTINFO );
- if( bIncl_CJK_CTL )
- {
- AddFontItems_( rPool, EE_CHAR_FONTINFO_CJK );
- AddFontItems_( rPool, EE_CHAR_FONTINFO_CTL );
- }
+ AddFontItems_( rPool, EE_CHAR_FONTINFO_CJK );
+ AddFontItems_( rPool, EE_CHAR_FONTINFO_CTL );
}
}
diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx
index 760333c..02d250d 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -998,14 +998,13 @@ AbstractMailMergeDlg * SwAbstractDialogFactory_Impl::CreateMailMergeDlg( int nRe
const OUString& rSourceName,
const OUString& rTableName,
sal_Int32 nCommandType,
- const uno::Reference< sdbc::XConnection>& xConnection,
- uno::Sequence< uno::Any >* pSelection )
+ const uno::Reference< sdbc::XConnection>& xConnection )
{
VclPtr<SwMailMergeDlg> pDlg;
switch ( nResId )
{
case DLG_MAILMERGE :
- pDlg = VclPtr<SwMailMergeDlg>::Create( pParent, rSh, rSourceName, rTableName, nCommandType, xConnection, pSelection );
+ pDlg = VclPtr<SwMailMergeDlg>::Create( pParent, rSh, rSourceName, rTableName, nCommandType, xConnection, nullptr );
break;
default:
break;
diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx
index b74968e..d087c47 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -457,8 +457,7 @@ public:
const OUString& rSourceName,
const OUString& rTableName,
sal_Int32 nCommandType,
- const css::uno::Reference< css::sdbc::XConnection>& xConnection,
- css::uno::Sequence< css::uno::Any >* pSelection = nullptr ) override;
+ const css::uno::Reference< css::sdbc::XConnection>& xConnection ) override;
virtual AbstractMailMergeCreateFromDlg* CreateMailMergeCreateFromDlg(vcl::Window* pParent) override;
virtual AbstractMailMergeFieldConnectionsDlg* CreateMailMergeFieldConnectionsDlg(vcl::Window* pParent) override;
virtual VclAbstractDialog* CreateMultiTOXMarkDlg(vcl::Window* pParent, SwTOXMgr &rTOXMgr) override;
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 97a0d92..d962b38 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -423,7 +423,7 @@ static bool lcl_GetColumnCnt(SwDSParam* pParam, const OUString& rColumnName,
};
// import data
-bool SwDBManager::Merge( const SwMergeDescriptor& rMergeDesc, vcl::Window* pParent )
+bool SwDBManager::Merge( const SwMergeDescriptor& rMergeDesc )
{
assert( !bInMerge && !pImpl->pMergeData && "merge already activated!" );
@@ -549,7 +549,7 @@ bool SwDBManager::Merge( const SwMergeDescriptor& rMergeDesc, vcl::Window* pPare
case DBMGR_MERGE_FILE:
case DBMGR_MERGE_SHELL:
// save files and send them as e-Mail if required
- bRet = MergeMailFiles(pWorkShell, rMergeDesc, pParent);
+ bRet = MergeMailFiles(pWorkShell, rMergeDesc, nullptr);
break;
default:
More information about the Libreoffice-commits
mailing list