[Libreoffice-commits] core.git: sw/inc sw/source

[Justin Luth (via logerrit)]

 sw/inc/formatcontentcontrol.hxx               |    2 +-
 sw/source/core/txtnode/attrcontentcontrol.cxx |    4 ++--
 sw/source/ui/vba/vbaformfield.cxx             |   10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 8b39cdfa8d725d65bbcb372b7cbf8ee0d7afa106
Author:     Justin Luth <justin.l...@collabora.com>
AuthorDate: Tue Dec 13 08:29:47 2022 -0500
Commit:     Justin Luth <jl...@mail.com>
CommitDate: Mon Dec 19 18:52:27 2022 +0000

    Typo in variable name: ContentCnotrol -> ContentControl
    
    Plus some bonus cleanup.
    I want these files to be clean of junk.
    How I missed these SAL_CALLs in my previous clean attempts,
    I don't even dare to speculate.
    
    Change-Id: I6056b61bbbdb088fe83752496df00d0fa319e637
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144137
    Tested-by: Jenkins
    Reviewed-by: Justin Luth <jl...@mail.com>

diff --git a/sw/inc/formatcontentcontrol.hxx b/sw/inc/formatcontentcontrol.hxx
index 77e6addbca09..889faeb89a07 100644
--- a/sw/inc/formatcontentcontrol.hxx
+++ b/sw/inc/formatcontentcontrol.hxx
@@ -215,7 +215,7 @@ public:
         return m_wXContentControl;
     }
 
-    void SetXContentControl(const rtl::Reference<SwXContentControl>& 
xContentCnotrol);
+    void SetXContentControl(const rtl::Reference<SwXContentControl>& 
xContentControl);
 
     virtual void SwClientNotify(const SwModify&, const SfxHint&) override;
 
diff --git a/sw/source/core/txtnode/attrcontentcontrol.cxx 
b/sw/source/core/txtnode/attrcontentcontrol.cxx
index d5e104f7790b..0f4c8832d2f1 100644
--- a/sw/source/core/txtnode/attrcontentcontrol.cxx
+++ b/sw/source/core/txtnode/attrcontentcontrol.cxx
@@ -187,9 +187,9 @@ SwContentControl::SwContentControl(SwFormatContentControl* 
pFormat)
 
 SwContentControl::~SwContentControl() {}
 
-void SwContentControl::SetXContentControl(const 
rtl::Reference<SwXContentControl>& xContentCnotrol)
+void SwContentControl::SetXContentControl(const 
rtl::Reference<SwXContentControl>& xContentControl)
 {
-    m_wXContentControl = xContentCnotrol.get();
+    m_wXContentControl = xContentControl.get();
 }
 
 SwTextContentControl* SwContentControl::GetTextAttr() const
diff --git a/sw/source/ui/vba/vbaformfield.cxx 
b/sw/source/ui/vba/vbaformfield.cxx
index 0c8a8644e990..6178a3e9cdba 100644
--- a/sw/source/ui/vba/vbaformfield.cxx
+++ b/sw/source/ui/vba/vbaformfield.cxx
@@ -46,25 +46,25 @@ SwVbaFormField::SwVbaFormField(const 
uno::Reference<ooo::vba::XHelperInterface>&
 
 SwVbaFormField::~SwVbaFormField() {}
 
-uno::Any SAL_CALL SwVbaFormField::CheckBox()
+uno::Any SwVbaFormField::CheckBox()
 {
     return uno::Any(uno::Reference<word::XCheckBox>(
         new SwVbaFormFieldCheckBox(mxParent, mxContext, m_rFormField)));
 }
 
-uno::Any SAL_CALL SwVbaFormField::DropDown()
+uno::Any SwVbaFormField::DropDown()
 {
     return uno::Any(uno::Reference<word::XDropDown>(
         new SwVbaFormFieldDropDown(mxParent, mxContext, m_rFormField)));
 }
 
-uno::Any SAL_CALL SwVbaFormField::TextInput()
+uno::Any SwVbaFormField::TextInput()
 {
     return uno::Any(uno::Reference<word::XTextInput>(
         new SwVbaFormFieldTextInput(mxParent, mxContext, m_rFormField)));
 }
 
-uno::Any SAL_CALL SwVbaFormField::Previous()
+uno::Any SwVbaFormField::Previous()
 {
     SwDoc* pDoc = word::getDocShell(m_xTextDocument)->GetDoc();
     if (!pDoc)
@@ -91,7 +91,7 @@ uno::Any SAL_CALL SwVbaFormField::Previous()
         new SwVbaFormField(mxParent, mxContext, m_xTextDocument, 
*pFieldMark)));
 }
 
-uno::Any SAL_CALL SwVbaFormField::Next()
+uno::Any SwVbaFormField::Next()
 {
     SwDoc* pDoc = word::getDocShell(m_xTextDocument)->GetDoc();
     if (!pDoc)