summaryrefslogtreecommitdiff
path: root/sw/source/ui
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/ui')
-rw-r--r--sw/source/ui/chrdlg/drpcps.cxx6
-rw-r--r--sw/source/ui/config/optpage.cxx4
-rw-r--r--sw/source/ui/dbui/mmresultdialogs.cxx12
-rw-r--r--sw/source/ui/dbui/selectdbtabledialog.cxx10
-rw-r--r--sw/source/ui/inc/mmresultdialogs.hxx6
5 files changed, 19 insertions, 19 deletions
diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx
index 18100659f45b..3e7f79ed095b 100644
--- a/sw/source/ui/chrdlg/drpcps.cxx
+++ b/sw/source/ui/chrdlg/drpcps.cxx
@@ -82,8 +82,8 @@ class SwDropCapsPict : public Control
sal_uLong textWidth; ///< Physical width of this segment.
sal_uInt16 scriptType; ///< Script type (e.g. Latin, Asian, Complex)
sal_Int32 changePos; ///< Character position where the script changes.
- ScriptInfo(sal_uLong txtWidth, sal_uInt16 scrptType, sal_Int32 position)
- : textWidth(txtWidth), scriptType(scrptType), changePos(position) {}
+ ScriptInfo(sal_uInt16 scrptType, sal_Int32 position)
+ : textWidth(0), scriptType(scrptType), changePos(position) {}
};
std::vector<ScriptInfo> maScriptChanges;
SvxFont maFont;
@@ -446,7 +446,7 @@ void SwDropCapsPict::CheckScript()
for(;;)
{
nChg = xBreak->endOfScript( maText, nChg, nScript );
- maScriptChanges.push_back( ScriptInfo(0, nScript, nChg) );
+ maScriptChanges.push_back( ScriptInfo(nScript, nChg) );
if( nChg >= maText.getLength() || nChg < 0 )
break;
nScript = xBreak->getScriptType( maText, nChg );
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index d6df1bd1eaeb..dde2cb6360cd 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -408,7 +408,7 @@ bool SwAddPrinterTabPage::FillItemSet( SfxItemSet* rCoreSet )
{
if ( bAttrModified )
{
- SwAddPrinterItem aAddPrinterAttr (FN_PARAM_ADDPRINTER);
+ SwAddPrinterItem aAddPrinterAttr;
aAddPrinterAttr.m_bPrintGraphic = m_pGrfCB->IsChecked();
aAddPrinterAttr.m_bPrintTable = true; // always enabled since CWS printerpullgpages /*aTabCB.IsChecked();*/
aAddPrinterAttr.m_bPrintDraw = m_pGrfCB->IsChecked(); // UI merged with m_pGrfCB in CWS printerpullgpages
@@ -2482,7 +2482,7 @@ bool SwTestTabPage::FillItemSet( SfxItemSet* rCoreSet )
if ( bAttrModified )
{
- SwTestItem aTestItem(FN_PARAM_SWTEST);
+ SwTestItem aTestItem;
aTestItem.bTest1=m_pTest1CBox->IsChecked();
aTestItem.bTest2=m_pTest2CBox->IsChecked();
aTestItem.bTest3=m_pTest3CBox->IsChecked();
diff --git a/sw/source/ui/dbui/mmresultdialogs.cxx b/sw/source/ui/dbui/mmresultdialogs.cxx
index b18a7380b32e..644a4de2b142 100644
--- a/sw/source/ui/dbui/mmresultdialogs.cxx
+++ b/sw/source/ui/dbui/mmresultdialogs.cxx
@@ -218,8 +218,8 @@ public:
void SetBCC(const OUString& rSet) {m_pBCCED->SetText(rSet);}
};
-SwMMResultSaveDialog::SwMMResultSaveDialog(vcl::Window* pParent)
- : SfxModalDialog(pParent, "MMResultSaveDialog", "modules/swriter/ui/mmresultsavedialog.ui"),
+SwMMResultSaveDialog::SwMMResultSaveDialog()
+ : SfxModalDialog(nullptr, "MMResultSaveDialog", "modules/swriter/ui/mmresultsavedialog.ui"),
m_bCancelSaving(false)
{
get(m_pSaveAsOneRB, "singlerb");
@@ -264,8 +264,8 @@ void SwMMResultSaveDialog::dispose()
SfxModalDialog::dispose();
}
-SwMMResultPrintDialog::SwMMResultPrintDialog(vcl::Window* pParent)
- : SfxModalDialog(pParent, "MMResultPrintDialog", "modules/swriter/ui/mmresultprintdialog.ui")
+SwMMResultPrintDialog::SwMMResultPrintDialog()
+ : SfxModalDialog(nullptr, "MMResultPrintDialog", "modules/swriter/ui/mmresultprintdialog.ui")
, m_pTempPrinter(nullptr)
{
get(m_pPrinterFT, "printerft");
@@ -314,8 +314,8 @@ void SwMMResultPrintDialog::dispose()
SfxModalDialog::dispose();
}
-SwMMResultEmailDialog::SwMMResultEmailDialog(vcl::Window* pParent)
- : SfxModalDialog(pParent, "MMResultEmailDialog", "modules/swriter/ui/mmresultemaildialog.ui"),
+SwMMResultEmailDialog::SwMMResultEmailDialog()
+ : SfxModalDialog(nullptr, "MMResultEmailDialog", "modules/swriter/ui/mmresultemaildialog.ui"),
m_sConfigureMail(SW_RES(ST_CONFIGUREMAIL))
{
get(m_pMailToFT, "mailtoft");
diff --git a/sw/source/ui/dbui/selectdbtabledialog.cxx b/sw/source/ui/dbui/selectdbtabledialog.cxx
index e9472ce6f1d2..db2a10f1cf07 100644
--- a/sw/source/ui/dbui/selectdbtabledialog.cxx
+++ b/sw/source/ui/dbui/selectdbtabledialog.cxx
@@ -46,7 +46,7 @@ class SwAddressTable : public SvSimpleTable
{
public:
explicit SwAddressTable(SvSimpleTableContainer& rParent);
- void InsertHeaderItem(sal_uInt16 nColumn, const OUString& rText, HeaderBarItemBits nBits);
+ void InsertHeaderItem(sal_uInt16 nColumn, const OUString& rText);
virtual void Resize() override;
void setColSizes();
};
@@ -60,9 +60,9 @@ SwAddressTable::SwAddressTable(SvSimpleTableContainer& rParent)
EnableAsyncDrag(false);
}
-void SwAddressTable::InsertHeaderItem(sal_uInt16 nColumn, const OUString& rText, HeaderBarItemBits nBits)
+void SwAddressTable::InsertHeaderItem(sal_uInt16 nColumn, const OUString& rText)
{
- GetTheHeaderBar().InsertItem( nColumn, rText, 0, nBits );
+ GetTheHeaderBar().InsertItem( nColumn, rText, 0, HeaderBarItemBits::LEFT | HeaderBarItemBits::VCENTER );
}
void SwAddressTable::Resize()
@@ -107,8 +107,8 @@ SwSelectDBTableDialog::SwSelectDBTableDialog(vcl::Window* pParent,
m_pTable = VclPtr<SwAddressTable>::Create(*pHeaderTreeContainer);
long aStaticTabs[]= { 2, 0, 0 };
m_pTable->SetTabs( aStaticTabs );
- m_pTable->InsertHeaderItem(1, m_sName, HeaderBarItemBits::LEFT | HeaderBarItemBits::VCENTER);
- m_pTable->InsertHeaderItem(2, m_sType, HeaderBarItemBits::LEFT | HeaderBarItemBits::VCENTER);
+ m_pTable->InsertHeaderItem(1, m_sName );
+ m_pTable->InsertHeaderItem(2, m_sType );
m_pPreviewPB->SetClickHdl(LINK(this, SwSelectDBTableDialog, PreviewHdl));
diff --git a/sw/source/ui/inc/mmresultdialogs.hxx b/sw/source/ui/inc/mmresultdialogs.hxx
index 17c0d1fc056d..2a7debc0b15b 100644
--- a/sw/source/ui/inc/mmresultdialogs.hxx
+++ b/sw/source/ui/inc/mmresultdialogs.hxx
@@ -62,7 +62,7 @@ class SwMMResultSaveDialog : public SfxModalDialog
DECL_LINK_TYPED(DocumentSelectionHdl_Impl, Button*, void);
public:
- SwMMResultSaveDialog(vcl::Window* pParent = nullptr);
+ SwMMResultSaveDialog();
virtual ~SwMMResultSaveDialog();
virtual void dispose() override;
@@ -94,7 +94,7 @@ class SwMMResultPrintDialog : public SfxModalDialog
void FillInPrinterSettings();
public:
- SwMMResultPrintDialog(vcl::Window* pParent = nullptr);
+ SwMMResultPrintDialog();
virtual ~SwMMResultPrintDialog();
virtual void dispose() override;
@@ -144,7 +144,7 @@ class SwMMResultEmailDialog : public SfxModalDialog
void FillInEmailSettings();
public:
- SwMMResultEmailDialog(vcl::Window* pParent = nullptr);
+ SwMMResultEmailDialog();
virtual ~SwMMResultEmailDialog();
virtual void dispose() override;