Kaydet (Commit) 551c2047 authored tarafından Thorsten Behrens's avatar Thorsten Behrens

Fix tdf#87509 - default sdr attribute is special object.

The drawinglayer attributes signal defaultness by object identity, not
value equalness. That should fix a number of subtle cache and redraw
problems.

Change-Id: I049ffda228a48db71cef108571805c6e41e4b149
üst 187af9b0
...@@ -142,6 +142,10 @@ namespace drawinglayer ...@@ -142,6 +142,10 @@ namespace drawinglayer
bool FillGradientAttribute::operator==(const FillGradientAttribute& rCandidate) const bool FillGradientAttribute::operator==(const FillGradientAttribute& rCandidate) const
{ {
// tdf#87509 default attr is always != non-default attr, even with same values
if(rCandidate.isDefault() != isDefault())
return false;
return rCandidate.mpFillGradientAttribute == mpFillGradientAttribute; return rCandidate.mpFillGradientAttribute == mpFillGradientAttribute;
} }
......
...@@ -120,6 +120,10 @@ namespace drawinglayer ...@@ -120,6 +120,10 @@ namespace drawinglayer
bool FillGraphicAttribute::operator==(const FillGraphicAttribute& rCandidate) const bool FillGraphicAttribute::operator==(const FillGraphicAttribute& rCandidate) const
{ {
// tdf#87509 default attr is always != non-default attr, even with same values
if(rCandidate.isDefault() != isDefault())
return false;
return rCandidate.mpFillGraphicAttribute == mpFillGraphicAttribute; return rCandidate.mpFillGraphicAttribute == mpFillGraphicAttribute;
} }
......
...@@ -131,6 +131,10 @@ namespace drawinglayer ...@@ -131,6 +131,10 @@ namespace drawinglayer
bool FillHatchAttribute::operator==(const FillHatchAttribute& rCandidate) const bool FillHatchAttribute::operator==(const FillHatchAttribute& rCandidate) const
{ {
// tdf#87509 default attr is always != non-default attr, even with same values
if(rCandidate.isDefault() != isDefault())
return false;
return rCandidate.mpFillHatchAttribute == mpFillHatchAttribute; return rCandidate.mpFillHatchAttribute == mpFillHatchAttribute;
} }
......
...@@ -118,6 +118,10 @@ namespace drawinglayer ...@@ -118,6 +118,10 @@ namespace drawinglayer
bool LineAttribute::operator==(const LineAttribute& rCandidate) const bool LineAttribute::operator==(const LineAttribute& rCandidate) const
{ {
// tdf#87509 default attr is always != non-default attr, even with same values
if(rCandidate.isDefault() != isDefault())
return false;
return rCandidate.mpLineAttribute == mpLineAttribute; return rCandidate.mpLineAttribute == mpLineAttribute;
} }
......
...@@ -110,6 +110,10 @@ namespace drawinglayer ...@@ -110,6 +110,10 @@ namespace drawinglayer
bool LineStartEndAttribute::operator==(const LineStartEndAttribute& rCandidate) const bool LineStartEndAttribute::operator==(const LineStartEndAttribute& rCandidate) const
{ {
// tdf#87509 default attr is always != non-default attr, even with same values
if(rCandidate.isDefault() != isDefault())
return false;
return rCandidate.mpLineStartEndAttribute == mpLineStartEndAttribute; return rCandidate.mpLineStartEndAttribute == mpLineStartEndAttribute;
} }
......
...@@ -126,6 +126,10 @@ namespace drawinglayer ...@@ -126,6 +126,10 @@ namespace drawinglayer
bool SdrFillAttribute::operator==(const SdrFillAttribute& rCandidate) const bool SdrFillAttribute::operator==(const SdrFillAttribute& rCandidate) const
{ {
// tdf#87509 default attr is always != non-default attr, even with same values
if(rCandidate.isDefault() != isDefault())
return false;
return rCandidate.mpSdrFillAttribute == mpSdrFillAttribute; return rCandidate.mpSdrFillAttribute == mpSdrFillAttribute;
} }
......
...@@ -161,6 +161,10 @@ namespace drawinglayer ...@@ -161,6 +161,10 @@ namespace drawinglayer
bool SdrFillGraphicAttribute::operator==(const SdrFillGraphicAttribute& rCandidate) const bool SdrFillGraphicAttribute::operator==(const SdrFillGraphicAttribute& rCandidate) const
{ {
// tdf#87509 default attr is always != non-default attr, even with same values
if(rCandidate.isDefault() != isDefault())
return false;
return rCandidate.mpSdrFillGraphicAttribute == mpSdrFillGraphicAttribute; return rCandidate.mpSdrFillGraphicAttribute == mpSdrFillGraphicAttribute;
} }
......
...@@ -102,6 +102,10 @@ namespace drawinglayer ...@@ -102,6 +102,10 @@ namespace drawinglayer
bool SdrLightingAttribute::operator==(const SdrLightingAttribute& rCandidate) const bool SdrLightingAttribute::operator==(const SdrLightingAttribute& rCandidate) const
{ {
// tdf#87509 default attr is always != non-default attr, even with same values
if(rCandidate.isDefault() != isDefault())
return false;
return rCandidate.mpSdrLightingAttribute == mpSdrLightingAttribute; return rCandidate.mpSdrLightingAttribute == mpSdrLightingAttribute;
} }
......
...@@ -142,6 +142,10 @@ namespace drawinglayer ...@@ -142,6 +142,10 @@ namespace drawinglayer
bool SdrLineAttribute::operator==(const SdrLineAttribute& rCandidate) const bool SdrLineAttribute::operator==(const SdrLineAttribute& rCandidate) const
{ {
// tdf#87509 default attr is always != non-default attr, even with same values
if(rCandidate.isDefault() != isDefault())
return false;
return rCandidate.mpSdrLineAttribute == mpSdrLineAttribute; return rCandidate.mpSdrLineAttribute == mpSdrLineAttribute;
} }
......
...@@ -144,6 +144,10 @@ namespace drawinglayer ...@@ -144,6 +144,10 @@ namespace drawinglayer
bool SdrLineStartEndAttribute::operator==(const SdrLineStartEndAttribute& rCandidate) const bool SdrLineStartEndAttribute::operator==(const SdrLineStartEndAttribute& rCandidate) const
{ {
// tdf#87509 default attr is always != non-default attr, even with same values
if(rCandidate.isDefault() != isDefault())
return false;
return rCandidate.mpSdrLineStartEndAttribute == mpSdrLineStartEndAttribute; return rCandidate.mpSdrLineStartEndAttribute == mpSdrLineStartEndAttribute;
} }
......
...@@ -123,6 +123,10 @@ namespace drawinglayer ...@@ -123,6 +123,10 @@ namespace drawinglayer
bool SdrSceneAttribute::operator==(const SdrSceneAttribute& rCandidate) const bool SdrSceneAttribute::operator==(const SdrSceneAttribute& rCandidate) const
{ {
// tdf#87509 default attr is always != non-default attr, even with same values
if(rCandidate.isDefault() != isDefault())
return false;
return rCandidate.mpSdrSceneAttribute == mpSdrSceneAttribute; return rCandidate.mpSdrSceneAttribute == mpSdrSceneAttribute;
} }
......
...@@ -109,6 +109,10 @@ namespace drawinglayer ...@@ -109,6 +109,10 @@ namespace drawinglayer
bool SdrShadowAttribute::operator==(const SdrShadowAttribute& rCandidate) const bool SdrShadowAttribute::operator==(const SdrShadowAttribute& rCandidate) const
{ {
// tdf#87509 default attr is always != non-default attr, even with same values
if(rCandidate.isDefault() != isDefault())
return false;
return mpSdrShadowAttribute == rCandidate.mpSdrShadowAttribute; return mpSdrShadowAttribute == rCandidate.mpSdrShadowAttribute;
} }
......
...@@ -110,6 +110,10 @@ namespace drawinglayer ...@@ -110,6 +110,10 @@ namespace drawinglayer
bool StrokeAttribute::operator==(const StrokeAttribute& rCandidate) const bool StrokeAttribute::operator==(const StrokeAttribute& rCandidate) const
{ {
// tdf#87509 default attr is always != non-default attr, even with same values
if(rCandidate.isDefault() != isDefault())
return false;
return rCandidate.mpStrokeAttribute == mpStrokeAttribute; return rCandidate.mpStrokeAttribute == mpStrokeAttribute;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment