Skip to content

C
core
Kaydet (Commit) 902564bf authored tarafından Kohei Yoshida's avatar Kohei Yoshida
Dosyalara gözat
Seçenekler

bnc#592918: Display data description in pivot table. 

When there are no column fields and exactly one data field.

Change-Id: I10d2af7e626f98a4d8a981e078e99e7da9207d1c
üst 258888bc
Show whitespace changes
Inline Side-by-side
Showing with 30 additions and 21 deletions
sc/qa/unit/ucalc_pivottable.cxx
Dosyayı görüntüle @ 902564bf
...@@ -1075,7 +1075,7 @@ void Test::testPivotTableNormalGrouping() ...@@ -1075,7 +1075,7 @@ void Test::testPivotTableNormalGrouping()
{ {
// Expected output table content. 0 = empty cell // Expected output table content. 0 = empty cell
const char* aOutputCheck[][2] = { const char* aOutputCheck[][2] = {
{ "Name", 0 }, { "Name", "Sum - Value" },
{ "A", "1" }, { "A", "1" },
{ "B", "2" }, { "B", "2" },
{ "C", "3" }, { "C", "3" },
...@@ -1123,7 +1123,7 @@ void Test::testPivotTableNormalGrouping() ...@@ -1123,7 +1123,7 @@ void Test::testPivotTableNormalGrouping()
{ {
// Expected output table content. 0 = empty cell // Expected output table content. 0 = empty cell
const char* aOutputCheck[][3] = { const char* aOutputCheck[][3] = {
{ "Name2", "Name", 0 }, { "Name2", "Name", "Sum - Value" },
{ "D", "D", "4" }, { "D", "D", "4" },
{ "E", "E", "5" }, { "E", "E", "5" },
{ "F", "F", "6" }, { "F", "F", "6" },
...@@ -1160,7 +1160,7 @@ void Test::testPivotTableNormalGrouping() ...@@ -1160,7 +1160,7 @@ void Test::testPivotTableNormalGrouping()
{ {
// Expected output table content. 0 = empty cell // Expected output table content. 0 = empty cell
const char* aOutputCheck[][3] = { const char* aOutputCheck[][3] = {
{ "Name2", "Name", 0 }, { "Name2", "Name", "Sum - Value" },
{ "G", "G", "7" }, { "G", "G", "7" },
{ "Group1", "A", "1" }, { "Group1", "A", "1" },
{ 0, "B", "2" }, { 0, "B", "2" },
...@@ -1257,7 +1257,7 @@ void Test::testPivotTableNumberGrouping() ...@@ -1257,7 +1257,7 @@ void Test::testPivotTableNumberGrouping()
{ {
// Expected output table content. 0 = empty cell // Expected output table content. 0 = empty cell
const char* aOutputCheck[][2] = { const char* aOutputCheck[][2] = {
{ "Order", 0 }, { "Order", "Sum - Score" },
{ "<30", "423" }, { "<30", "423" },
{ "30-39", "87" }, { "30-39", "87" },
{ "40-49", "241" }, { "40-49", "241" },
...@@ -1372,7 +1372,7 @@ void Test::testPivotTableDateGrouping() ...@@ -1372,7 +1372,7 @@ void Test::testPivotTableDateGrouping()
{ {
// Expected output table content. 0 = empty cell // Expected output table content. 0 = empty cell
const char* aOutputCheck[][4] = { const char* aOutputCheck[][4] = {
{ "Years", "Quarters", "Date", 0 }, { "Years", "Quarters", "Date", "Sum - Value" },
{ "2011", "Q1", "Jan", "1" }, { "2011", "Q1", "Jan", "1" },
{ 0, 0, "Mar", "2" }, { 0, 0, "Mar", "2" },
{ 0, "Q3", "Sep", "7" }, { 0, "Q3", "Sep", "7" },
...@@ -1404,7 +1404,7 @@ void Test::testPivotTableDateGrouping() ...@@ -1404,7 +1404,7 @@ void Test::testPivotTableDateGrouping()
{ {
// Expected output table content. 0 = empty cell // Expected output table content. 0 = empty cell
const char* aOutputCheck[][4] = { const char* aOutputCheck[][4] = {
{ "Years", "Quarters", "Date", 0 }, { "Years", "Quarters", "Date", "Sum - Value" },
{ "2011", "Q1", "Jan", "1" }, { "2011", "Q1", "Jan", "1" },
{ 0, 0, "Mar", "2" }, { 0, 0, "Mar", "2" },
{ 0, "Q3", "Sep", "7" }, { 0, "Q3", "Sep", "7" },
...@@ -1428,7 +1428,7 @@ void Test::testPivotTableDateGrouping() ...@@ -1428,7 +1428,7 @@ void Test::testPivotTableDateGrouping()
{ {
// Expected output table content. 0 = empty cell // Expected output table content. 0 = empty cell
const char* aOutputCheck[][2] = { const char* aOutputCheck[][2] = {
{ "Date", 0 }, { "Date", "Sum - Value" },
{ "2011-01-01", "1" }, { "2011-01-01", "1" },
{ "2011-03-02", "2" }, { "2011-03-02", "2" },
{ "2011-09-03", "7" }, { "2011-09-03", "7" },
...@@ -1496,7 +1496,7 @@ void Test::testPivotTableEmptyRows() ...@@ -1496,7 +1496,7 @@ void Test::testPivotTableEmptyRows()
{ {
// Expected output table content. 0 = empty cell // Expected output table content. 0 = empty cell
const char* aOutputCheck[][2] = { const char* aOutputCheck[][2] = {
{ "Name", 0 }, { "Name", "Sum - Value" },
{ "A", "1" }, { "A", "1" },
{ "B", "2" }, { "B", "2" },
{ "C", "3" }, { "C", "3" },
...@@ -1519,7 +1519,7 @@ void Test::testPivotTableEmptyRows() ...@@ -1519,7 +1519,7 @@ void Test::testPivotTableEmptyRows()
{ {
// Expected output table content. 0 = empty cell // Expected output table content. 0 = empty cell
const char* aOutputCheck[][2] = { const char* aOutputCheck[][2] = {
{ "Name", 0 }, { "Name", "Sum - Value" },
{ "A", "1" }, { "A", "1" },
{ "B", "2" }, { "B", "2" },
{ "C", "3" }, { "C", "3" },
...@@ -1546,7 +1546,7 @@ void Test::testPivotTableEmptyRows() ...@@ -1546,7 +1546,7 @@ void Test::testPivotTableEmptyRows()
{ {
// Expected output table content. 0 = empty cell // Expected output table content. 0 = empty cell
const char* aOutputCheck[][2] = { const char* aOutputCheck[][2] = {
{ "Name", 0 }, { "Name", "Sum - Value" },
{ "B", "3" }, { "B", "3" },
{ "C", "3" }, { "C", "3" },
{ "D", "4" }, { "D", "4" },
...@@ -1624,7 +1624,7 @@ void Test::testPivotTableTextNumber() ...@@ -1624,7 +1624,7 @@ void Test::testPivotTableTextNumber()
{ {
// Expected output table content. 0 = empty cell // Expected output table content. 0 = empty cell
const char* aOutputCheck[][2] = { const char* aOutputCheck[][2] = {
{ "Name", 0 }, { "Name", "Sum - Value" },
{ "0001", "1" }, { "0001", "1" },
{ "0002", "2" }, { "0002", "2" },
{ "0003", "3" }, { "0003", "3" },
...@@ -1708,7 +1708,7 @@ void Test::testPivotTableCaseInsensitiveStrings() ...@@ -1708,7 +1708,7 @@ void Test::testPivotTableCaseInsensitiveStrings()
{ {
// Expected output table content. 0 = empty cell // Expected output table content. 0 = empty cell
const char* aOutputCheck[][2] = { const char* aOutputCheck[][2] = {
{ "Name", 0 }, { "Name", "Sum - Value" },
{ "A", "3" }, { "A", "3" },
{ "Total Result", "3" }, { "Total Result", "3" },
}; };
...@@ -1871,7 +1871,7 @@ void Test::testPivotTableFieldReference() ...@@ -1871,7 +1871,7 @@ void Test::testPivotTableFieldReference()
{ {
// Expected output table content. 0 = empty cell // Expected output table content. 0 = empty cell
const char* aOutputCheck[][2] = { const char* aOutputCheck[][2] = {
{ "Name", 0 }, { "Name", "Sum - Value" },
{ "A", "1" }, { "A", "1" },
{ "B", "2" }, { "B", "2" },
{ "C", "4" }, { "C", "4" },
...@@ -1898,7 +1898,7 @@ void Test::testPivotTableFieldReference() ...@@ -1898,7 +1898,7 @@ void Test::testPivotTableFieldReference()
{ {
// Expected output table content. 0 = empty cell // Expected output table content. 0 = empty cell
const char* aOutputCheck[][2] = { const char* aOutputCheck[][2] = {
{ "Name", 0 }, { "Name", "Sum - Value" },
{ "A", 0 }, { "A", 0 },
{ "B", "1" }, { "B", "1" },
{ "C", "3" }, { "C", "3" },
...@@ -1918,7 +1918,7 @@ void Test::testPivotTableFieldReference() ...@@ -1918,7 +1918,7 @@ void Test::testPivotTableFieldReference()
{ {
// Expected output table content. 0 = empty cell // Expected output table content. 0 = empty cell
const char* aOutputCheck[][2] = { const char* aOutputCheck[][2] = {
{ "Name", 0 }, { "Name", "Sum - Value" },
{ "A", "100.00%" }, { "A", "100.00%" },
{ "B", "200.00%" }, { "B", "200.00%" },
{ "C", "400.00%" }, { "C", "400.00%" },
...@@ -1938,7 +1938,7 @@ void Test::testPivotTableFieldReference() ...@@ -1938,7 +1938,7 @@ void Test::testPivotTableFieldReference()
{ {
// Expected output table content. 0 = empty cell // Expected output table content. 0 = empty cell
const char* aOutputCheck[][2] = { const char* aOutputCheck[][2] = {
{ "Name", 0 }, { "Name", "Sum - Value" },
{ "A", 0 }, { "A", 0 },
{ "B", "100.00%" }, { "B", "100.00%" },
{ "C", "300.00%" }, { "C", "300.00%" },
...@@ -1958,7 +1958,7 @@ void Test::testPivotTableFieldReference() ...@@ -1958,7 +1958,7 @@ void Test::testPivotTableFieldReference()
{ {
// Expected output table content. 0 = empty cell // Expected output table content. 0 = empty cell
const char* aOutputCheck[][2] = { const char* aOutputCheck[][2] = {
{ "Name", 0 }, { "Name", "Sum - Value" },
{ "A", "1" }, { "A", "1" },
{ "B", "3" }, { "B", "3" },
{ "C", "7" }, { "C", "7" },
...@@ -1978,7 +1978,7 @@ void Test::testPivotTableFieldReference() ...@@ -1978,7 +1978,7 @@ void Test::testPivotTableFieldReference()
{ {
// Expected output table content. 0 = empty cell // Expected output table content. 0 = empty cell
const char* aOutputCheck[][2] = { const char* aOutputCheck[][2] = {
{ "Name", 0 }, { "Name", "Sum - Value" },
{ "A", "6.67%" }, { "A", "6.67%" },
{ "B", "13.33%" }, { "B", "13.33%" },
{ "C", "26.67%" }, { "C", "26.67%" },
...@@ -2043,7 +2043,7 @@ void Test::testPivotTableDocFunc() ...@@ -2043,7 +2043,7 @@ void Test::testPivotTableDocFunc()
{ {
// Expected output table content. 0 = empty cell // Expected output table content. 0 = empty cell
const char* aOutputCheck[][2] = { const char* aOutputCheck[][2] = {
{ "Name", 0 }, { "Name", "Sum - Value" },
{ "Apple", "16" }, { "Apple", "16" },
{ "Microsoft", "32" }, { "Microsoft", "32" },
{ "Oracle", "2" }, { "Oracle", "2" },
...@@ -2112,7 +2112,7 @@ void Test::testFuncGETPIVOTDATA() ...@@ -2112,7 +2112,7 @@ void Test::testFuncGETPIVOTDATA()
{ {
// Expected output table content. 0 = empty cell // Expected output table content. 0 = empty cell
const char* aOutputCheck[][2] = { const char* aOutputCheck[][2] = {
{ "Name", 0 }, { "Name", "Sum - Value" },
{ "A", "6" }, { "A", "6" },
{ "B", "15" }, { "B", "15" },
{ "Total Result", "21" }, { "Total Result", "21" },
...@@ -2270,7 +2270,7 @@ void Test::testFuncGETPIVOTDATALeafAccess() ...@@ -2270,7 +2270,7 @@ void Test::testFuncGETPIVOTDATALeafAccess()
{ {
// Expected output table content. 0 = empty cell // Expected output table content. 0 = empty cell
const char* aOutputCheck[][3] = { const char* aOutputCheck[][3] = {
{ "Type", "Member", 0 }, { "Type", "Member", "Sum - Value" },
{ "A", "Anna", "1" }, { "A", "Anna", "1" },
{ 0, "Cecilia", "3" }, { 0, "Cecilia", "3" },
{ "B", "Brittany", "2" }, { "B", "Brittany", "2" },
......
sc/source/core/data/dpoutput.cxx
Dosyayı görüntüle @ 902564bf
...@@ -1128,6 +1128,15 @@ void ScDPOutput::Output() ...@@ -1128,6 +1128,15 @@ void ScDPOutput::Output()
} }
} }
if (nColCount == 1 && nRowCount > 0 && nColFieldCount == 0)
{
// the table contains excatly one data field and no column fields.
// Display data description at top right corner.
ScSetStringParam aParam;
aParam.setTextInput();
pDoc->SetString(nDataStartCol, nDataStartRow-1, nTab, aDataDescription, &aParam);
}
// output data results: // output data results:
for (long nRow=0; nRow<nRowCount; nRow++) for (long nRow=0; nRow<nRowCount; nRow++)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment