diff options
| author | Katarina Behrens <Katarina.Behrens@cib.de> | 2016-10-24 15:16:37 +0200 |
|---|---|---|
| committer | Katarina Behrens <Katarina.Behrens@cib.de> | 2016-10-25 11:26:49 +0200 |
| commit | ae3fb69ebca4e253959cdf9bf620296e7797a501 (patch) | |
| tree | 2b778b7245b3b2f375bf501260e2ac38b0ac800c /cui/source | |
| parent | screenshot annotation: Make this a default button (diff) | |
| download | core-ae3fb69ebca4e253959cdf9bf620296e7797a501.tar.gz core-ae3fb69ebca4e253959cdf9bf620296e7797a501.zip | |
screenshot annotation: put back removed fields
I hate you loplugin !!!
Change-Id: I01067b04005a59b7ecb10a5a72ab6090b7f040a8
Diffstat (limited to 'cui/source')
| -rw-r--r-- | cui/source/dialogs/screenshotannotationdlg.cxx | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/cui/source/dialogs/screenshotannotationdlg.cxx b/cui/source/dialogs/screenshotannotationdlg.cxx index ca56d1ffb9fe..53a0cc94e298 100644 --- a/cui/source/dialogs/screenshotannotationdlg.cxx +++ b/cui/source/dialogs/screenshotannotationdlg.cxx @@ -92,8 +92,11 @@ namespace class ControlDataEntry { public: - ControlDataEntry(const basegfx::B2IRange& rB2IRange) - : maB2IRange(rB2IRange) + ControlDataEntry( + const vcl::Window& rControl, + const basegfx::B2IRange& rB2IRange) + : mrControl(rControl), + maB2IRange(rB2IRange) { } @@ -105,6 +108,7 @@ public: const OString GetHelpId() const { return mrControl.GetHelpId(); } private: + const vcl::Window& mrControl; basegfx::B2IRange maB2IRange; }; @@ -251,7 +255,7 @@ ScreenshotAnnotationDlg_Impl::ScreenshotAnnotationDlg_Impl( OUString aHelpId = OStringToOUString( mrParentDialog.GetHelpId(), RTL_TEXTENCODING_UTF8 ); maMainMarkupText = lcl_ParagraphWithImage( aHelpId); mpText->SetText( maMainMarkupText ); - mpText->SetReadOnly(true); + mpText->SetReadOnly(); } // set click handler for save button @@ -275,7 +279,7 @@ void ScreenshotAnnotationDlg_Impl::CollectChildren( if (!aCurrentRange.isEmpty()) { - rControlDataCollection.push_back(ControlDataEntry(aCurrentRange)); + rControlDataCollection.push_back(ControlDataEntry(rCurrent, aCurrentRange)); } for (sal_uInt16 a(0); a < rCurrent.GetChildCount(); a++) |