diff options
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/ui/dialog/swdlgfact.cxx | 14 | ||||
| -rw-r--r-- | sw/source/ui/dialog/swdlgfact.hxx | 10 | ||||
| -rw-r--r-- | sw/source/ui/fldui/javaedit.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/inc/javaedit.hxx | 14 | ||||
| -rw-r--r-- | sw/source/ui/shells/textfld.cxx | 4 |
5 files changed, 20 insertions, 24 deletions
diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx index e337589c65f1..c363300b9087 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 de45486a1645..e025c4828b0c 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 5dcbd0dd14a2..f59a477de216 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 569362ebc98a..209c39a931fc 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 a7050c4d1fdc..91642eedb347 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(); |