diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2009-04-01 13:20:55 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2009-04-01 13:20:55 +0000 |
| commit | dc5af79e0098a8b20cdb6299d8190408c134be65 (patch) | |
| tree | e33e1b58559fe9126edb922b7e14de4d357d9628 /store | |
| parent | a24a0885d9e2f4c2fd5fec1f92c5b21fcfbfecfd (diff) | |
CWS-TOOLING: integrate CWS cmcfixes56
2009-03-26 14:46:13 +0100 cmc r270080 : #i100517# merge changes of locales32 to match
2009-03-26 14:31:32 +0100 cmc r270079 : #i100517# add some brackets and remove stray ;
2009-03-25 13:30:36 +0100 cmc r270021 : #i100503# make tralay work again
2009-03-25 10:13:35 +0100 cmc r269999 : #i100536# remove last unused method
2009-03-24 15:13:50 +0100 cmc r269955 : #i100517# fix straight-forward warnings
2009-03-24 14:36:37 +0100 cmc r269947 : #i100469# keep ia64 and arm alignments after fork-exec to signal change, but hackaround for arm to keep userlevel qemu-arm working
2009-03-24 14:02:27 +0100 cmc r269943 : #i100223# make stl headers warning free for extra gcc 4.3 warnings
2009-03-24 13:58:15 +0100 cmc r269942 : #i100504# drawinglayer is warning free on ix86 linux
2009-03-24 13:56:15 +0100 cmc r269940 : #i100469# keep ia64 and arm alignments after fork-exec to signal change
Diffstat (limited to 'store')
| -rw-r--r-- | store/source/stortree.cxx | 2 | ||||
| -rw-r--r-- | store/source/stortree.hxx | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/store/source/stortree.cxx b/store/source/stortree.cxx index 648aaf7a1..71cdb47e8 100644 --- a/store/source/stortree.cxx +++ b/store/source/stortree.cxx @@ -127,6 +127,7 @@ void OStoreBTreeNodeData::remove (sal_uInt16 i) } } +#if 0 /* NYI */ /* * merge (with right page). */ @@ -140,6 +141,7 @@ void OStoreBTreeNodeData::merge (const self& rPageR) usageCount (n + m); } } +#endif /* * split (left half copied from right half of left page). diff --git a/store/source/stortree.hxx b/store/source/stortree.hxx index a7471be03..34c49aab5 100644 --- a/store/source/stortree.hxx +++ b/store/source/stortree.hxx @@ -224,9 +224,11 @@ struct OStoreBTreeNodeData : public store::OStorePageData void insert (sal_uInt16 i, const T& t); void remove (sal_uInt16 i); +#if 0 /* NYI */ /** merge (with right page). */ void merge (const self& rPageR); +#endif /** split (left half copied from right half of left page). */ |