summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorRadek Doulik <rodo@novell.com>2011-07-11 20:36:47 +0200
committerCaolán McNamara <caolanm@redhat.com>2011-07-12 11:45:58 +0100
commit9a233212aba2c53507d9cd4c0a61168286b64b0a (patch)
tree49431dbf11e9b83a1a3b0a5c5f64fe56cd97f8a3 /tools
parent2128598c6b89eec1c2e3aa6ef9615f418d9f9620 (diff)
fix regression in SvGlobalName::operator <
- it was comparing wrong parts and ommiting part of ID's, resulting in wrong results and thus ::std::map didn't work well with default less compare function of it's keys - fixes fdo#32709 (cherry picked from commit 345dc7961bc142f167a1b8e5f43f4439e8234f06) Signed-off-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/source/ref/globname.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/source/ref/globname.cxx b/tools/source/ref/globname.cxx
index 05c7709931e6..a399f1107d3e 100644
--- a/tools/source/ref/globname.cxx
+++ b/tools/source/ref/globname.cxx
@@ -208,10 +208,10 @@ sal_Bool SvGlobalName::operator < ( const SvGlobalName & rObj ) const
else if( Data2_a == Data2_b )
{
sal_uInt32 Data1_a;
- memcpy(&Data1_a, pImp->szData+4, sizeof(sal_uInt32));
+ memcpy(&Data1_a, pImp->szData, sizeof(sal_uInt32));
sal_uInt32 Data1_b;
- memcpy(&Data1_b, rObj.pImp->szData+4, sizeof(sal_uInt32));
+ memcpy(&Data1_b, rObj.pImp->szData, sizeof(sal_uInt32));
return Data1_a < Data1_b;
}