]>
Commit | Line | Data |
---|---|---|
f5126770 AM |
1 | --- libreoffice-4.1.0.4/sc/inc/mtvelements.hxx.org 2013-07-25 21:25:20.837766596 +0200 |
2 | +++ libreoffice-4.1.0.4/sc/inc/mtvelements.hxx 2013-07-25 21:26:32.853493134 +0200 | |
3 | @@ -63,11 +63,11 @@ | |
4 | namespace sc { | |
86698b0e | 5 | |
f5126770 AM |
6 | // Broadcaster storage container |
7 | -typedef mdds::mtv::custom_block_func1<sc::element_type_broadcaster, sc::custom_broadcaster_block> BCBlkFunc; | |
8 | +typedef mdds::mtv::custom_block_func1<sc::custom_broadcaster_block> BCBlkFunc; | |
9 | typedef mdds::multi_type_vector<BCBlkFunc> BroadcasterStoreType; | |
86698b0e | 10 | |
f5126770 AM |
11 | // Cell text attribute container. |
12 | -typedef mdds::mtv::custom_block_func1<sc::element_type_celltextattr, sc::custom_celltextattr_block> CTAttrFunc; | |
13 | +typedef mdds::mtv::custom_block_func1<sc::custom_celltextattr_block> CTAttrFunc; | |
14 | typedef mdds::multi_type_vector<CTAttrFunc> CellTextAttrStoreType; | |
15 | ||
16 | /** | |
17 | --- libreoffice-4.1.0.4/sc/source/core/tool/scmatrix.cxx.org 2013-07-25 21:26:36.733621612 +0200 | |
18 | +++ libreoffice-4.1.0.4/sc/source/core/tool/scmatrix.cxx 2013-07-25 21:27:08.784683394 +0200 | |
19 | @@ -89,7 +89,7 @@ | |
20 | } | |
86698b0e AM |
21 | } |
22 | ||
f5126770 AM |
23 | - static void delete_block(mdds::mtv::base_element_block* p) |
24 | + static void delete_block(const mdds::mtv::base_element_block* p) | |
25 | { | |
26 | if (!p) | |
27 | return; |