Attachment #85235 for issue #126765

View | Details | Raw Unified | Return to issue 126765
Collapse All | Expand All




    ValueType nValue = 0;
    if (!mbTreeSearchEnabled)
    {
        maSegments.search(nPos, nValue).second;
        return nValue;
    }


    if (!maSegments.is_tree_valid())
        maSegments.build_tree();

    maSegments.search_tree(nPos, nValue).second;
    return nValue;
}


        if (!maSegments.is_tree_valid())
            maSegments.build_tree();

        if (!maSegments.search_tree(nPos, nValue, &nPos1, &nPos2).second)
            return false;
    }
    else
    {
        // Conduct leaf-node only search.  Faster when searching between range insertion.
        if (!maSegments.search(nPos, nValue, &nPos1, &nPos2).second)
            return false;
    }


Lines 1-5 Link Here

(-)mdds/prj/d.lst (-2 lines)
1	mkdir: %_DEST%\inc%_EXT%\mdds	1	mkdir: %_DEST%\inc%_EXT%\mdds
2	mkdir: %_DEST%\inc%_EXT%\mdds\hash_container
3		2
4	..\%__SRC%\inc\mdds\* %_DEST%\inc%_EXT%\mdds	3	..\%__SRC%\inc\mdds\* %_DEST%\inc%_EXT%\mdds
5	..\%__SRC%\inc\mdds\hash_container\* %_DEST%\inc%_EXT%\mdds\hash_container

Line 0 Link Here

(-)mdds/makefile.mk (-3 / +5 lines)
		1	diff -ru misc/mdds/flat_segment_tree_def.inl misc/build/mdds_1.0.0/include/mdds/flat_segment_tree_def.inl
		2	--- misc/mdds/flat_segment_tree_def.inl 2015-10-07 00:57:07.000000000 +0200
Lines 32-40 Link Here
32		32
33	# --- Files --------------------------------------------------------	33	# --- Files --------------------------------------------------------
34		34
35	TARFILE_NAME=mdds_0.3.1	35	TARFILE_NAME=mdds_1.0.0
36	TARFILE_MD5=0dd138efff4412c707e239290fb82d4f	36	TARFILE_MD5=74e0a81c5af4137285fe6a52217f71e4
37	PATCH_FILES=	37	PATCH_FILES=mdds_1.0.0_wayback.patch
38		38
39	CONFIGURE_DIR=	39	CONFIGURE_DIR=
40	CONFIGURE_ACTION=	40	CONFIGURE_ACTION=

Lines 55-63 Link Here

(-)external_deps.lst (-3 / +3 lines)
55	URL2 = $(OOO_EXTRAS)$(MD5)-$(name)	55	URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
56		56
57	if (SYSTEM_MDDS != YES)	57	if (SYSTEM_MDDS != YES)
58	MD5 = 0dd138efff4412c707e239290fb82d4f	58	MD5 = 74e0a81c5af4137285fe6a52217f71e4
59	name = mdds_0.3.1.tar.bz2	59	name = mdds_1.0.0.tar.bz2
60	URL1 = http://multidimalgorithm.googlecode.com/files/mdds_0.3.1.tar.bz2	60	URL1 = http://kohei.us/files/mdds/src/$(name)
61	URL2 = $(OOO_EXTRAS)$(MD5)-$(name)	61	URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
62		62
63	if (SYSTEM_LIBTEXTCAT != YES)	63	if (SYSTEM_LIBTEXTCAT != YES)

Return to issue 126765

Lines 120-126 Link Here

(-)sc/source/core/data/segmenttree.cxx (-4 / +4 lines)
120	ValueType nValue = 0;	120	ValueType nValue = 0;
121	if (!mbTreeSearchEnabled)	121	if (!mbTreeSearchEnabled)
122	{	122	{
123	maSegments.search(nPos, nValue);	123	maSegments.search(nPos, nValue).second;
124	return nValue;	124	return nValue;
125	}	125	}
126		126
Lines 127-133 Link Here
127	if (!maSegments.is_tree_valid())	127	if (!maSegments.is_tree_valid())
128	maSegments.build_tree();	128	maSegments.build_tree();
129		129
130	maSegments.search_tree(nPos, nValue);	130	maSegments.search_tree(nPos, nValue).second;
131	return nValue;	131	return nValue;
132	}	132	}
133		133
Lines 171-183 Link Here
171	if (!maSegments.is_tree_valid())	171	if (!maSegments.is_tree_valid())
172	maSegments.build_tree();	172	maSegments.build_tree();
173		173
174	if (!maSegments.search_tree(nPos, nValue, &nPos1, &nPos2))	174	if (!maSegments.search_tree(nPos, nValue, &nPos1, &nPos2).second)
175	return false;	175	return false;
176	}	176	}
177	else	177	else
178	{	178	{
179	// Conduct leaf-node only search. Faster when searching between range insertion.	179	// Conduct leaf-node only search. Faster when searching between range insertion.
180	if (!maSegments.search(nPos, nValue, &nPos1, &nPos2))	180	if (!maSegments.search(nPos, nValue, &nPos1, &nPos2).second)
181	return false;	181	return false;
182	}	182	}
183		183