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

return shared_ptr from AnyWidget::Clone

Browse Source 
which is what the only call-site wants

Change-Id: I74aa7b9ce059890eb1bdd84d7a0a331ecf227be3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92606
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2020-04-21 09:33:19 +02:00
parent ca5b322fd4
commit 491fbb1de3
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
include/vcl/pdfwriter.hxx
View File

@@ -262,7 +262,7 @@ public:
WidgetType getType() const { return Type; } WidgetType getType() const { return Type; }
virtual std::unique_ptr<AnyWidget> Clone() const = 0; virtual std::shared_ptr<AnyWidget> Clone() const = 0;
protected: protected:
// note that this equals the default compiler-generated copy-ctor, but we want to have it // note that this equals the default compiler-generated copy-ctor, but we want to have it
@@ -321,9 +321,9 @@ public:
Dest( -1 ), Submit( false ), SubmitGet( false ) Dest( -1 ), Submit( false ), SubmitGet( false )
{} {}
virtual std::unique_ptr<AnyWidget> Clone() const override virtual std::shared_ptr<AnyWidget> Clone() const override
{ {
return std::unique_ptr<AnyWidget>(new PushButtonWidget( *this )); return std::make_shared<PushButtonWidget>( *this );
} }
}; };
@@ -336,9 +336,9 @@ public:
Checked( false ) Checked( false )
{} {}
virtual std::unique_ptr<AnyWidget> Clone() const override virtual std::shared_ptr<AnyWidget> Clone() const override
{ {
return std::unique_ptr<AnyWidget>(new CheckBoxWidget( *this )); return std::make_shared<CheckBoxWidget>( *this );
} }
}; };
@@ -354,9 +354,9 @@ public:
RadioGroup( 0 ) RadioGroup( 0 )
{} {}
virtual std::unique_ptr<AnyWidget> Clone() const override virtual std::shared_ptr<AnyWidget> Clone() const override
{ {
return std::unique_ptr<AnyWidget>(new RadioButtonWidget( *this )); return std::make_shared<RadioButtonWidget>( *this );
} }
// radio buttons having the same RadioGroup id comprise one // radio buttons having the same RadioGroup id comprise one
// logical radio button group, that is at most one of the RadioButtons // logical radio button group, that is at most one of the RadioButtons
@@ -383,9 +383,9 @@ public:
MaxLen( 0 ) MaxLen( 0 )
{} {}
virtual std::unique_ptr<AnyWidget> Clone() const override virtual std::shared_ptr<AnyWidget> Clone() const override
{ {
return std::unique_ptr<AnyWidget>(new EditWidget( *this )); return std::make_shared<EditWidget>( *this );
} }
}; };
@@ -405,9 +405,9 @@ public:
MultiSelect( false ) MultiSelect( false )
{} {}
virtual std::unique_ptr<AnyWidget> Clone() const override virtual std::shared_ptr<AnyWidget> Clone() const override
{ {
return std::unique_ptr<AnyWidget>(new ListBoxWidget( *this )); return std::make_shared<ListBoxWidget>( *this );
} }
}; };
@@ -421,9 +421,9 @@ public:
: AnyWidget( vcl::PDFWriter::ComboBox ) : AnyWidget( vcl::PDFWriter::ComboBox )
{} {}
virtual std::unique_ptr<AnyWidget> Clone() const override virtual std::shared_ptr<AnyWidget> Clone() const override
{ {
return std::unique_ptr<AnyWidget>(new ComboBoxWidget( *this )); return std::make_shared<ComboBoxWidget>( *this );
} }
}; };
@@ -433,9 +433,9 @@ public:
: AnyWidget( vcl::PDFWriter::Signature ) : AnyWidget( vcl::PDFWriter::Signature )
{} {}
virtual std::unique_ptr<AnyWidget> Clone() const override virtual std::shared_ptr<AnyWidget> Clone() const override
{ {
return std::unique_ptr<AnyWidget>(new SignatureWidget( *this )); return std::make_shared<SignatureWidget>( *this );
} }
}; };