summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drawinglayer/source/attribute/sdrlineattribute.cxx11
-rw-r--r--drawinglayer/source/attribute/strokeattribute.cxx8
-rw-r--r--include/connectivity/FValue.hxx11
-rw-r--r--include/drawinglayer/attribute/strokeattribute.hxx1
4 files changed, 17 insertions, 14 deletions
diff --git a/drawinglayer/source/attribute/sdrlineattribute.cxx b/drawinglayer/source/attribute/sdrlineattribute.cxx
index 8541aa4c2801..21da3a249aed 100644
--- a/drawinglayer/source/attribute/sdrlineattribute.cxx
+++ b/drawinglayer/source/attribute/sdrlineattribute.cxx
@@ -124,10 +124,7 @@ namespace drawinglayer
{
}
- SdrLineAttribute::SdrLineAttribute(SdrLineAttribute&& rCandidate)
- : mpSdrLineAttribute(rCandidate.mpSdrLineAttribute)
- {
- }
+ SdrLineAttribute::SdrLineAttribute(SdrLineAttribute&& rCandidate) = default;
SdrLineAttribute::~SdrLineAttribute()
{
@@ -144,11 +141,7 @@ namespace drawinglayer
return *this;
}
- SdrLineAttribute& SdrLineAttribute::operator=(SdrLineAttribute&& rCandidate)
- {
- mpSdrLineAttribute = rCandidate.mpSdrLineAttribute;
- return *this;
- }
+ SdrLineAttribute& SdrLineAttribute::operator=(SdrLineAttribute&& rCandidate) = default;
bool SdrLineAttribute::operator==(const SdrLineAttribute& rCandidate) const
{
diff --git a/drawinglayer/source/attribute/strokeattribute.cxx b/drawinglayer/source/attribute/strokeattribute.cxx
index c5b2d8dad33e..7c152c8479de 100644
--- a/drawinglayer/source/attribute/strokeattribute.cxx
+++ b/drawinglayer/source/attribute/strokeattribute.cxx
@@ -92,6 +92,8 @@ namespace drawinglayer
{
}
+ StrokeAttribute::StrokeAttribute(StrokeAttribute&& rCandidate) = default;
+
StrokeAttribute::~StrokeAttribute()
{
}
@@ -107,11 +109,7 @@ namespace drawinglayer
return *this;
}
- StrokeAttribute& StrokeAttribute::operator=(StrokeAttribute&& rCandidate)
- {
- mpStrokeAttribute = rCandidate.mpStrokeAttribute;
- return *this;
- }
+ StrokeAttribute& StrokeAttribute::operator=(StrokeAttribute&& rCandidate) = default;
bool StrokeAttribute::operator==(const StrokeAttribute& rCandidate) const
{
diff --git a/include/connectivity/FValue.hxx b/include/connectivity/FValue.hxx
index 3964f3a1be3f..aeac0c105371 100644
--- a/include/connectivity/FValue.hxx
+++ b/include/connectivity/FValue.hxx
@@ -98,6 +98,17 @@ namespace connectivity
operator=(_rRH);
}
+ ORowSetValue(ORowSetValue&& _rRH)
+ :m_eTypeKind(css::sdbc::DataType::VARCHAR)
+ ,m_bNull(true)
+ ,m_bBound(true)
+ ,m_bModified(false)
+ ,m_bSigned(true)
+ {
+ m_aValue.m_pString = nullptr;
+ operator=(_rRH);
+ }
+
ORowSetValue(const OUString& _rRH)
:m_eTypeKind(css::sdbc::DataType::VARCHAR)
,m_bNull(true)
diff --git a/include/drawinglayer/attribute/strokeattribute.hxx b/include/drawinglayer/attribute/strokeattribute.hxx
index 4ca39552d9ec..5404158b661c 100644
--- a/include/drawinglayer/attribute/strokeattribute.hxx
+++ b/include/drawinglayer/attribute/strokeattribute.hxx
@@ -51,6 +51,7 @@ namespace drawinglayer
double fFullDotDashLen = 0.0);
StrokeAttribute();
StrokeAttribute(const StrokeAttribute& rCandidate);
+ StrokeAttribute(StrokeAttribute&& rCandidate);
StrokeAttribute& operator=(const StrokeAttribute& rCandidate);
StrokeAttribute& operator=(StrokeAttribute&& rCandidate);
~StrokeAttribute();