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

[Caolán McNamara]

 sw/inc/swabstdlg.hxx              |   10 +++++-----
 sw/source/ui/dialog/swdlgfact.cxx |   14 +++++++-------
 sw/source/ui/dialog/swdlgfact.hxx |   10 +++++-----
 sw/source/ui/fldui/javaedit.cxx   |    2 +-
 sw/source/ui/inc/javaedit.hxx     |   14 +++++---------
 sw/source/ui/shells/textfld.cxx   |    4 ++--
 6 files changed, 25 insertions(+), 29 deletions(-)

New commits:
commit 5f273ff915ddad362afe9134aba460999c44c939
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Dec 19 12:13:32 2013 +0000

    CID#703893 SwJavaEditDialog::Get[Text|Type] orthogonal to Dialog::Get*
    
    and const up
    
    Change-Id: I9bb363b26efaf83e36187df4bf762d64b3956ed1

diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index d7b81e8..a6bfa51 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -130,11 +130,11 @@ public:
 class AbstractJavaEditDialog : public VclAbstractDialog
 {
 public:
-    virtual OUString            GetText() = 0;
-    virtual OUString            GetType() = 0;
-    virtual sal_Bool            IsUrl() = 0;
-    virtual sal_Bool            IsNew() = 0;
-    virtual bool                IsUpdate() = 0;
+    virtual OUString            GetScriptText() const = 0;
+    virtual OUString            GetScriptType() const = 0;
+    virtual sal_Bool            IsUrl() const = 0;
+    virtual sal_Bool            IsNew() const = 0;
+    virtual bool                IsUpdate() const = 0;
 };
 
 class AbstractMailMergeDlg : public VclAbstractDialog
diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx
index e337589..c363300 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -451,27 +451,27 @@ void AbstractInsTableDlg_Impl::GetValues( OUString& rName, sal_uInt16& rRow, sal
     pDlg->GetValues( rName, rRow, rCol, rInsTblFlags, rTableAutoFmtName, prTAFmt);
 }
 
-OUString AbstractJavaEditDialog_Impl::GetText()
+OUString AbstractJavaEditDialog_Impl::GetScriptText() const
 {
-    return pDlg->GetText();
+    return pDlg->GetScriptText();
 }
 
-OUString AbstractJavaEditDialog_Impl::GetType()
+OUString AbstractJavaEditDialog_Impl::GetScriptType() const
 {
-    return pDlg->GetType();
+    return pDlg->GetScriptType();
 }
 
-sal_Bool AbstractJavaEditDialog_Impl::IsUrl()
+sal_Bool AbstractJavaEditDialog_Impl::IsUrl() const
 {
     return pDlg->IsUrl();
 }
 
-sal_Bool AbstractJavaEditDialog_Impl::IsNew()
+sal_Bool AbstractJavaEditDialog_Impl::IsNew() const
 {
     return pDlg->IsNew();
 }
 
-bool AbstractJavaEditDialog_Impl::IsUpdate()
+bool AbstractJavaEditDialog_Impl::IsUpdate() const
 {
     return pDlg->IsUpdate();
 }
diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx
index de45486..e025c48 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -273,11 +273,11 @@ class SwJavaEditDialog;
 class AbstractJavaEditDialog_Impl : public AbstractJavaEditDialog
 {
     DECL_ABSTDLG_BASE(AbstractJavaEditDialog_Impl,SwJavaEditDialog)
-    virtual OUString            GetText();
-    virtual OUString            GetType();
-    virtual sal_Bool            IsUrl();
-    virtual sal_Bool            IsNew();
-    virtual bool                IsUpdate();
+    virtual OUString            GetScriptText() const;
+    virtual OUString            GetScriptType() const;
+    virtual sal_Bool            IsUrl() const;
+    virtual sal_Bool            IsNew() const;
+    virtual bool                IsUpdate() const;
 };
 
 class SwMailMergeDlg;
diff --git a/sw/source/ui/fldui/javaedit.cxx b/sw/source/ui/fldui/javaedit.cxx
index 5dcbd0d..f59a477 100644
--- a/sw/source/ui/fldui/javaedit.cxx
+++ b/sw/source/ui/fldui/javaedit.cxx
@@ -220,7 +220,7 @@ void SwJavaEditDialog::SetFld()
         aType = "JavaScript";
 }
 
-bool SwJavaEditDialog::IsUpdate()
+bool SwJavaEditDialog::IsUpdate() const
 {
     return pFld && ( bIsUrl != pFld->GetFormat() || pFld->GetPar2() != aType || pFld->GetPar1() != aText );
 }
diff --git a/sw/source/ui/inc/javaedit.hxx b/sw/source/ui/inc/javaedit.hxx
index 569362e..209c39a 100644
--- a/sw/source/ui/inc/javaedit.hxx
+++ b/sw/source/ui/inc/javaedit.hxx
@@ -70,23 +70,19 @@ private:
     void            CheckTravel();
     void            SetFld();
 
-    using Dialog::GetText;
-    using Window::GetType;
-
 public:
     SwJavaEditDialog(Window* pParent, SwWrtShell* pWrtSh);
     ~SwJavaEditDialog();
 
-    OUString       GetText() { return aText; }
+    OUString GetScriptText() const { return aText; }
 
-    OUString       GetType() { return aType; }
+    OUString GetScriptType() const { return aType; }
 
-    sal_Bool                IsUrl() { return bIsUrl; }
-    sal_Bool                IsNew() { return bNew; }
-    bool                IsUpdate();
+    sal_Bool IsUrl() const { return bIsUrl; }
+    sal_Bool IsNew() const { return bNew; }
+    bool IsUpdate() const;
 };
 
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/shells/textfld.cxx b/sw/source/ui/shells/textfld.cxx
index a7050c4..91642ee 100644
--- a/sw/source/ui/shells/textfld.cxx
+++ b/sw/source/ui/shells/textfld.cxx
@@ -535,8 +535,8 @@ void SwTextShell::ExecField(SfxRequest &rReq)
                     OSL_ENSURE(pDlg, "Dialogdiet fail!");
                     if ( pDlg->Execute() )
                     {
-                        aType = pDlg->GetType();
-                        aText = pDlg->GetText();
+                        aType = pDlg->GetScriptType();
+                        aText = pDlg->GetScriptText();
                         bIsUrl = pDlg->IsUrl();
                         bNew = pDlg->IsNew();
                         bUpdate = pDlg->IsUpdate();