AccessibleTableBase.cxx (4d7c9de0) | AccessibleTableBase.cxx (3ea0c3d5) |
---|---|
1/************************************************************** 2 * 3 * Licensed to the Apache Software Foundation (ASF) under one 4 * or more contributor license agreements. See the NOTICE file 5 * distributed with this work for additional information 6 * regarding copyright ownership. The ASF licenses this file 7 * to you under the Apache License, Version 2.0 (the 8 * "License"); you may not use this file except in compliance --- 156 unchanged lines hidden (view full) --- 165 if (mpDoc) 166 { 167 SCROW nEndRow(0); 168 SCCOL nEndCol(0); 169 mpDoc->GetTableByIndex(maRange.aStart.Tab())->GetColumnByIndex(nColumn)-> 170 ExtendMerge( static_cast<SCCOL>(nColumn), static_cast<SCROW>(nRow), nRow, nEndCol, nEndRow, sal_False, sal_False ); 171 if (nEndRow > nRow) 172 nCount = nEndRow - nRow + 1; | 1/************************************************************** 2 * 3 * Licensed to the Apache Software Foundation (ASF) under one 4 * or more contributor license agreements. See the NOTICE file 5 * distributed with this work for additional information 6 * regarding copyright ownership. The ASF licenses this file 7 * to you under the Apache License, Version 2.0 (the 8 * "License"); you may not use this file except in compliance --- 156 unchanged lines hidden (view full) --- 165 if (mpDoc) 166 { 167 SCROW nEndRow(0); 168 SCCOL nEndCol(0); 169 mpDoc->GetTableByIndex(maRange.aStart.Tab())->GetColumnByIndex(nColumn)-> 170 ExtendMerge( static_cast<SCCOL>(nColumn), static_cast<SCROW>(nRow), nRow, nEndCol, nEndRow, sal_False, sal_False ); 171 if (nEndRow > nRow) 172 nCount = nEndRow - nRow + 1; |
173 // if (mpDoc->ExtendMerge(static_cast<SCCOL>(nColumn), static_cast<SCROW>(nRow), 174 // nEndCol, nEndRow, maRange.aStart.Tab())) 175 //{ 176 // if (nEndRow > nRow) 177 // nCount = nEndRow - nRow + 1; 178 //} | |
179 } 180 181 return nCount; 182} 183 184sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) 185 throw (uno::RuntimeException, lang::IndexOutOfBoundsException) 186{ --- 11 unchanged lines hidden (view full) --- 198 if (mpDoc) 199 { 200 SCROW nEndRow(0); 201 SCCOL nEndCol(0); 202 mpDoc->GetTableByIndex(maRange.aStart.Tab())->GetColumnByIndex(nColumn)-> 203 ExtendMerge( static_cast<SCCOL>(nColumn), static_cast<SCROW>(nRow), nRow, nEndCol, nEndRow, sal_False, sal_False ); 204 if (nEndCol > nColumn) 205 nCount = nEndCol - nColumn + 1; | 173 } 174 175 return nCount; 176} 177 178sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) 179 throw (uno::RuntimeException, lang::IndexOutOfBoundsException) 180{ --- 11 unchanged lines hidden (view full) --- 192 if (mpDoc) 193 { 194 SCROW nEndRow(0); 195 SCCOL nEndCol(0); 196 mpDoc->GetTableByIndex(maRange.aStart.Tab())->GetColumnByIndex(nColumn)-> 197 ExtendMerge( static_cast<SCCOL>(nColumn), static_cast<SCROW>(nRow), nRow, nEndCol, nEndRow, sal_False, sal_False ); 198 if (nEndCol > nColumn) 199 nCount = nEndCol - nColumn + 1; |
206 // if (mpDoc->ExtendMerge(static_cast<SCCOL>(nColumn), static_cast<SCROW>(nRow), 207 // nEndCol, nEndRow, maRange.aStart.Tab())) 208 //{ 209 // if (nEndCol > nColumn) 210 // nCount = nEndCol - nColumn + 1; 211 //} | |
212 } 213 214 return nCount; 215} 216 217uno::Reference< XAccessibleTable > SAL_CALL ScAccessibleTableBase::getAccessibleRowHeaders( ) 218 throw (uno::RuntimeException) 219{ --- 315 unchanged lines hidden --- | 200 } 201 202 return nCount; 203} 204 205uno::Reference< XAccessibleTable > SAL_CALL ScAccessibleTableBase::getAccessibleRowHeaders( ) 206 throw (uno::RuntimeException) 207{ --- 315 unchanged lines hidden --- |