summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2013-12-19 12:01:58 +0000
committerCaolán McNamara <caolanm@redhat.com>2013-12-19 12:06:22 +0000
commit7715f7e6b941a5b4bcde326c77647cd00c647a0b (patch)
treea44c3092a2c305ff1b74dba71bf9778c6fd523a5 /include
parent3b6891ff6fa92bf64b8013181999e44d6dfb0b01 (diff)
CID#703891 RubyDialog::GetText orthogonal to Dialog::GetText
Change-Id: I131daae13b11b5242e9a32a94532463f6e0d925b
Diffstat (limited to 'include')
-rw-r--r--include/svx/rubydialog.hxx13
1 files changed, 5 insertions, 8 deletions
diff --git a/include/svx/rubydialog.hxx b/include/svx/rubydialog.hxx
index e8cf275ab7aa..0afca8cf2625 100644
--- a/include/svx/rubydialog.hxx
+++ b/include/svx/rubydialog.hxx
@@ -87,9 +87,6 @@ public:
class SvxRubyDialog : public SfxModelessDialog
{
- using Dialog::SetText;
- using Dialog::GetText;
-
friend class RubyPreview;
FixedText* m_pLeftFT;
@@ -123,7 +120,7 @@ class SvxRubyDialog : public SfxModelessDialog
long nLastPos;
long nCurrentEdit;
- sal_Bool bModified;
+ sal_Bool bModified;
com::sun::star::uno::Reference<com::sun::star::view::XSelectionChangeListener> xImpl;
SfxBindings* pBindings;
@@ -140,18 +137,18 @@ class SvxRubyDialog : public SfxModelessDialog
DECL_LINK(EditScrollHdl_Impl, sal_Int32*);
DECL_LINK(EditJumpHdl_Impl, sal_Int32*);
- void SetText(sal_Int32 nPos, Edit& rLeft, Edit& rRight);
- void GetText();
+ void SetRubyText(sal_Int32 nPos, Edit& rLeft, Edit& rRight);
+ void GetRubyText();
void ClearCharStyleList();
void AssertOneEntry();
void Update();
- virtual sal_Bool Close();
+ virtual sal_Bool Close();
long GetLastPos() const {return nLastPos;}
void SetLastPos(long nSet) {nLastPos = nSet;}
- sal_Bool IsModified() const {return bModified;}
+ sal_Bool IsModified() const {return bModified;}
void SetModified(sal_Bool bSet) {bModified = bSet;}
void EnableControls(bool bEnable);