mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

screenshot annotation: put back removed fields

Browse Source 
I hate you loplugin !!!

Change-Id: I01067b04005a59b7ecb10a5a72ab6090b7f040a8
This commit is contained in:
Katarina Behrens
2016-10-24 15:16:37 +02:00
parent dbecfbdde5
commit ae3fb69ebc
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cui/source/dialogs/screenshotannotationdlg.cxx
View File

@@ -92,8 +92,11 @@ namespace
class ControlDataEntry class ControlDataEntry
{ {
public: public:
ControlDataEntry(const basegfx::B2IRange& rB2IRange) ControlDataEntry(
: maB2IRange(rB2IRange) const vcl::Window& rControl,
const basegfx::B2IRange& rB2IRange)
: mrControl(rControl),
maB2IRange(rB2IRange)
{ {
} }
@@ -105,6 +108,7 @@ public:
const OString GetHelpId() const { return mrControl.GetHelpId(); } const OString GetHelpId() const { return mrControl.GetHelpId(); }
private: private:
const vcl::Window& mrControl;
basegfx::B2IRange maB2IRange; basegfx::B2IRange maB2IRange;
}; };
@@ -251,7 +255,7 @@ ScreenshotAnnotationDlg_Impl::ScreenshotAnnotationDlg_Impl(
OUString aHelpId = OStringToOUString( mrParentDialog.GetHelpId(), RTL_TEXTENCODING_UTF8 ); OUString aHelpId = OStringToOUString( mrParentDialog.GetHelpId(), RTL_TEXTENCODING_UTF8 );
maMainMarkupText = lcl_ParagraphWithImage( aHelpId); maMainMarkupText = lcl_ParagraphWithImage( aHelpId);
mpText->SetText( maMainMarkupText ); mpText->SetText( maMainMarkupText );
mpText->SetReadOnly(true); mpText->SetReadOnly();
} }
// set click handler for save button // set click handler for save button
@@ -275,7 +279,7 @@ void ScreenshotAnnotationDlg_Impl::CollectChildren(
if (!aCurrentRange.isEmpty()) if (!aCurrentRange.isEmpty())
{ {
rControlDataCollection.push_back(ControlDataEntry(aCurrentRange)); rControlDataCollection.push_back(ControlDataEntry(rCurrent, aCurrentRange));
} }
for (sal_uInt16 a(0); a < rCurrent.GetChildCount(); a++) for (sal_uInt16 a(0); a < rCurrent.GetChildCount(); a++)