diff options
Diffstat (limited to 'sw/source')
-rw-r--r-- | sw/source/core/inc/unobookmark.hxx | 2 | ||||
-rw-r--r-- | sw/source/core/text/itrform2.cxx | 4 | ||||
-rw-r--r-- | sw/source/core/text/portxt.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/unocore/unobkm.cxx | 10 | ||||
-rw-r--r-- | sw/source/filter/html/wrthtml.cxx | 4 | ||||
-rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/ww8/wrtww8.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/ww8/ww8par3.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/vba/vbaformfield.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/vba/vbaformfieldcheckbox.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/vba/vbaformfieldcheckbox.hxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/docvw/edtwin.cxx | 6 |
12 files changed, 20 insertions, 20 deletions
diff --git a/sw/source/core/inc/unobookmark.hxx b/sw/source/core/inc/unobookmark.hxx index 7082e3c09587..eeccb19d9216 100644 --- a/sw/source/core/inc/unobookmark.hxx +++ b/sw/source/core/inc/unobookmark.hxx @@ -182,7 +182,7 @@ typedef cppu::ImplInheritanceHelper< SwXBookmark, class SwXFieldmark final : public SwXFieldmark_Base { - ::sw::mark::ICheckboxFieldmark* getCheckboxFieldmark(); + ::sw::mark::CheckboxFieldmark* getCheckboxFieldmark(); bool const m_bReplacementObject; bool m_isFieldmarkSeparatorAtStart = false; diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx index 3a884203b414..913228480483 100644 --- a/sw/source/core/text/itrform2.cxx +++ b/sw/source/core/text/itrform2.cxx @@ -1184,8 +1184,8 @@ namespace sw::mark { { if (pBM->GetFieldname() == ODF_FORMCHECKBOX) { - ::sw::mark::ICheckboxFieldmark const*const pCheckboxFm( - dynamic_cast<ICheckboxFieldmark const*>(pBM)); + ::sw::mark::CheckboxFieldmark const*const pCheckboxFm( + dynamic_cast<CheckboxFieldmark const*>(pBM)); assert(pCheckboxFm); return pCheckboxFm->IsChecked() ? u"\u2612"_ustr diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx index d7c376de35ce..a9c738534e1e 100644 --- a/sw/source/core/text/portxt.cxx +++ b/sw/source/core/text/portxt.cxx @@ -913,7 +913,7 @@ void SwFieldFormCheckboxPortion::Paint( const SwTextPaintInfo& rInf ) const if (pBM && pBM->GetFieldname( ) == ODF_FORMCHECKBOX) { - const ICheckboxFieldmark* pCheckboxFm = dynamic_cast<ICheckboxFieldmark const*>(pBM); + const CheckboxFieldmark* pCheckboxFm = dynamic_cast<CheckboxFieldmark const*>(pBM); bool bChecked = pCheckboxFm && pCheckboxFm->IsChecked(); rInf.DrawCheckBox(*this, bChecked); } diff --git a/sw/source/core/unocore/unobkm.cxx b/sw/source/core/unocore/unobkm.cxx index f61d86f1267f..ea8363ac0f2e 100644 --- a/sw/source/core/unocore/unobkm.cxx +++ b/sw/source/core/unocore/unobkm.cxx @@ -704,13 +704,13 @@ SwXFieldmark::CreateXFieldmark(SwDoc & rDoc, ::sw::mark::IMark *const pMark, return xMark; } -::sw::mark::ICheckboxFieldmark* +::sw::mark::CheckboxFieldmark* SwXFieldmark::getCheckboxFieldmark() { - ::sw::mark::ICheckboxFieldmark* pCheckboxFm = nullptr; + ::sw::mark::CheckboxFieldmark* pCheckboxFm = nullptr; if ( getFieldType() == ODF_FORMCHECKBOX ) { - pCheckboxFm = dynamic_cast< ::sw::mark::ICheckboxFieldmark* >( GetBookmark()); + pCheckboxFm = dynamic_cast< ::sw::mark::CheckboxFieldmark* >( GetBookmark()); assert( GetBookmark() == nullptr || pCheckboxFm != nullptr ); // unclear to me whether GetBookmark() can be null here } @@ -728,7 +728,7 @@ SwXFieldmark::setPropertyValue(const OUString& PropertyName, SolarMutexGuard g; if ( PropertyName == "Checked" ) { - ::sw::mark::ICheckboxFieldmark* pCheckboxFm = getCheckboxFieldmark(); + ::sw::mark::CheckboxFieldmark* pCheckboxFm = getCheckboxFieldmark(); bool bChecked( false ); if ( !(pCheckboxFm && ( rValue >>= bChecked )) ) throw uno::RuntimeException(); @@ -754,7 +754,7 @@ uno::Any SAL_CALL SwXFieldmark::getPropertyValue(const OUString& rPropertyName) SolarMutexGuard g; if ( rPropertyName == "Checked" ) { - ::sw::mark::ICheckboxFieldmark* pCheckboxFm = getCheckboxFieldmark(); + ::sw::mark::CheckboxFieldmark* pCheckboxFm = getCheckboxFieldmark(); if ( !pCheckboxFm ) throw uno::RuntimeException(); diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx index 9d3a7dd584f2..d97349a28c36 100644 --- a/sw/source/filter/html/wrthtml.cxx +++ b/sw/source/filter/html/wrthtml.cxx @@ -1327,8 +1327,8 @@ void SwHTMLWriter::OutPointFieldmarks( const SwPosition& rPos ) if (pMark->GetFieldname() != ODF_FORMCHECKBOX) return; - const sw::mark::ICheckboxFieldmark* pCheckBox = - dynamic_cast<const sw::mark::ICheckboxFieldmark*>(pMark); + const sw::mark::CheckboxFieldmark* pCheckBox = + dynamic_cast<const sw::mark::CheckboxFieldmark*>(pMark); if (!pCheckBox) return; diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index e3ff688d0115..745997557f31 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -2500,7 +2500,7 @@ void DocxAttributeOutput::WriteFFData( const FieldInfos& rInfos ) const OUString sName = params.getName(); bool bChecked = false; - const sw::mark::ICheckboxFieldmark* pCheckboxFm = dynamic_cast<const sw::mark::ICheckboxFieldmark*>(&rFieldmark); + const sw::mark::CheckboxFieldmark* pCheckboxFm = dynamic_cast<const sw::mark::CheckboxFieldmark*>(&rFieldmark); if ( pCheckboxFm && pCheckboxFm->IsChecked() ) bChecked = true; diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index 1aeeaf47eefd..a5d7dac2ff32 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -4196,7 +4196,7 @@ void WW8SHDLong::Write( WW8Export& rExport ) void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark ) { const ::sw::mark::IFieldmark* pFieldmark = &rFieldmark; - const ::sw::mark::ICheckboxFieldmark* pAsCheckbox = dynamic_cast< const ::sw::mark::ICheckboxFieldmark* >( pFieldmark ); + const ::sw::mark::CheckboxFieldmark* pAsCheckbox = dynamic_cast< const ::sw::mark::CheckboxFieldmark* >( pFieldmark ); if ( ! ( rFieldmark.GetFieldname() == ODF_FORMTEXT || rFieldmark.GetFieldname() == ODF_FORMDROPDOWN || diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx index 0976737d7230..e6fc3ec44e55 100644 --- a/sw/source/filter/ww8/ww8par3.cxx +++ b/sw/source/filter/ww8/ww8par3.cxx @@ -227,7 +227,7 @@ eF_ResT SwWW8ImplReader::Read_F_FormCheckBox( WW8FieldDesc* pF, OUString& rStr ) OSL_ENSURE(pFieldmark!=nullptr, "hmmm; why was the bookmark not created?"); if (pFieldmark!=nullptr) { IFieldmark::parameter_map_t* const pParameters = pFieldmark->GetParameters(); - ICheckboxFieldmark* pCheckboxFm = dynamic_cast<ICheckboxFieldmark*>(pFieldmark); + CheckboxFieldmark* pCheckboxFm = dynamic_cast<CheckboxFieldmark*>(pFieldmark); (*pParameters)[ODF_FORMCHECKBOX_HELPTEXT] <<= aFormula.msToolTip; if(pCheckboxFm) diff --git a/sw/source/ui/vba/vbaformfield.cxx b/sw/source/ui/vba/vbaformfield.cxx index faecbd60f9b9..2efb092b8712 100644 --- a/sw/source/ui/vba/vbaformfield.cxx +++ b/sw/source/ui/vba/vbaformfield.cxx @@ -216,7 +216,7 @@ OUString SwVbaFormField::getResult() { return m_rFormField.GetContent(); } void SwVbaFormField::setResult(const OUString& rSet) { - if (dynamic_cast<sw::mark::ICheckboxFieldmark*>(&m_rFormField)) + if (dynamic_cast<sw::mark::CheckboxFieldmark*>(&m_rFormField)) m_rFormField.ReplaceContent(u"false"_ustr); else m_rFormField.ReplaceContent(rSet); diff --git a/sw/source/ui/vba/vbaformfieldcheckbox.cxx b/sw/source/ui/vba/vbaformfieldcheckbox.cxx index caf9d96397e8..9ee7b15c3018 100644 --- a/sw/source/ui/vba/vbaformfieldcheckbox.cxx +++ b/sw/source/ui/vba/vbaformfieldcheckbox.cxx @@ -25,7 +25,7 @@ SwVbaFormFieldCheckBox::SwVbaFormFieldCheckBox( const uno::Reference<ooo::vba::XHelperInterface>& rParent, const uno::Reference<uno::XComponentContext>& rContext, sw::mark::IFieldmark& rFormField) : SwVbaFormFieldCheckBox_BASE(rParent, rContext) - , m_pCheckBox(dynamic_cast<sw::mark::ICheckboxFieldmark*>(&rFormField)) + , m_pCheckBox(dynamic_cast<sw::mark::CheckboxFieldmark*>(&rFormField)) { } diff --git a/sw/source/ui/vba/vbaformfieldcheckbox.hxx b/sw/source/ui/vba/vbaformfieldcheckbox.hxx index c62549585b4e..87aaf1238855 100644 --- a/sw/source/ui/vba/vbaformfieldcheckbox.hxx +++ b/sw/source/ui/vba/vbaformfieldcheckbox.hxx @@ -19,7 +19,7 @@ typedef InheritedHelperInterfaceWeakImpl<ooo::vba::word::XCheckBox> SwVbaFormFie class SwVbaFormFieldCheckBox : public SwVbaFormFieldCheckBox_BASE { private: - sw::mark::ICheckboxFieldmark* m_pCheckBox; + sw::mark::CheckboxFieldmark* m_pCheckBox; public: /// @throws css::uno::RuntimeException diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx index 8a917ac2e806..8f49de4d5234 100644 --- a/sw/source/uibase/docvw/edtwin.cxx +++ b/sw/source/uibase/docvw/edtwin.cxx @@ -2546,8 +2546,8 @@ KEYINPUT_CHECKTABLE_INSDEL: if (rSh.GetChar(false)==CH_TXT_ATR_FORMELEMENT) { - ::sw::mark::ICheckboxFieldmark* pFieldmark = - dynamic_cast< ::sw::mark::ICheckboxFieldmark* > + ::sw::mark::CheckboxFieldmark* pFieldmark = + dynamic_cast< ::sw::mark::CheckboxFieldmark* > (rSh.GetCurrentFieldmark()); OSL_ENSURE(pFieldmark, "Where is my FieldMark??"); @@ -5100,7 +5100,7 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt) IFieldmark *fieldBM = const_cast< IFieldmark* > ( aContentAtPos.aFnd.pFieldmark ); if ( fieldBM->GetFieldname( ) == ODF_FORMCHECKBOX ) { - ICheckboxFieldmark& rCheckboxFm = dynamic_cast<ICheckboxFieldmark&>(*fieldBM); + CheckboxFieldmark& rCheckboxFm = dynamic_cast<CheckboxFieldmark&>(*fieldBM); rCheckboxFm.SetChecked(!rCheckboxFm.IsChecked()); rCheckboxFm.Invalidate(); rSh.InvalidateWindows( SwRect(m_rView.GetVisArea()) ); |