Kaydet (Commit) be075928 authored tarafından Tomaž Vajngerl's avatar Tomaž Vajngerl

Ruler: clear ruler elements at copying only when input is not empty

Change-Id: I633dcd452a0df426421eaccadf648ad06b8e124c
üst 51645520
...@@ -189,34 +189,45 @@ ImplRulerData& ImplRulerData::operator=( const ImplRulerData& rData ) ...@@ -189,34 +189,45 @@ ImplRulerData& ImplRulerData::operator=( const ImplRulerData& rData )
bAutoPageWidth = rData.bAutoPageWidth; bAutoPageWidth = rData.bAutoPageWidth;
bTextRTL = rData.bTextRTL; bTextRTL = rData.bTextRTL;
pLines.clear();
pBorders.clear();
pIndents.clear();
pTabs.clear();
if ( !rData.pLines.empty() ) if ( !rData.pLines.empty() )
{ {
pLines.resize(rData.pLines.size()); pLines.resize(rData.pLines.size());
std::copy(rData.pLines.begin(), rData.pLines.end(), pLines.begin()); std::copy(rData.pLines.begin(), rData.pLines.end(), pLines.begin());
} }
else
{
pLines.clear();
}
if ( !rData.pBorders.empty() ) if ( !rData.pBorders.empty() )
{ {
pBorders.resize(rData.pBorders.size()); pBorders.resize(rData.pBorders.size());
std::copy(rData.pBorders.begin(), rData.pBorders.end(), pBorders.begin()); std::copy(rData.pBorders.begin(), rData.pBorders.end(), pBorders.begin());
} }
else
{
pBorders.clear();
}
if ( !rData.pIndents.empty() ) if ( !rData.pIndents.empty() )
{ {
pIndents.resize(rData.pIndents.size()); pIndents.resize(rData.pIndents.size());
std::copy(rData.pIndents.begin(), rData.pIndents.end(), pIndents.begin()); std::copy(rData.pIndents.begin(), rData.pIndents.end(), pIndents.begin());
} }
else
{
pIndents.clear();
}
if ( !rData.pTabs.empty() ) if ( !rData.pTabs.empty() )
{ {
pTabs.resize(rData.pTabs.size()); pTabs.resize(rData.pTabs.size());
std::copy(rData.pTabs.begin(), rData.pTabs.end(), pTabs.begin()); std::copy(rData.pTabs.begin(), rData.pTabs.end(), pTabs.begin());
} }
else
{
pTabs.clear();
}
return *this; return *this;
} }
......
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