applied_patches/0122-sc-dp-gridlayout.diff

   1 diff --git sc/source/filter/xml/XMLExportDataPilot.cxx sc/source/filter/xml/XMLExportDataPilot.cxx
   2 index eeecd3b..135a6d1 100644
   3 --- sc/source/filter/xml/XMLExportDataPilot.cxx
   4 +++ sc/source/filter/xml/XMLExportDataPilot.cxx
   5 @@ -797,6 +797,9 @@ void ScXMLExportDataPilot::WriteDataPilots(const uno::Reference <sheet::XSpreads
   6                              rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_SHOW_FILTER_BUTTON, XML_FALSE);
   7                          if (!pDPSave->GetDrillDown())
   8                              rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DRILL_DOWN_ON_DOUBLE_CLICK, XML_FALSE);
   9 +                        if ((*pDPs)[i]->GetHeaderLayout())
  10 +                            rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_HEADER_GRID_LAYOUT, XML_TRUE);
  11 +
  12                          SvXMLElementExport aElemDP(rExport, XML_NAMESPACE_TABLE, XML_DATA_PILOT_TABLE, sal_True, sal_True);
  13
  14                          // grand total elements.
  15 diff --git sc/source/filter/xml/xmldpimp.cxx sc/source/filter/xml/xmldpimp.cxx
  16 index 070fbc2..0d4d467 100644
  17 --- sc/source/filter/xml/xmldpimp.cxx
  18 +++ sc/source/filter/xml/xmldpimp.cxx
  19 @@ -142,7 +142,8 @@ ScXMLDataPilotTableContext::ScXMLDataPilotTableContext( ScXMLImport& rImport,
  20      bTargetRangeAddress(sal_False),
  21      bSourceCellRange(sal_False),
  22      bShowFilter(sal_True),
  23 -    bDrillDown(sal_True)
  24 +    bDrillDown(sal_True),
  25 +    bHeaderGridLayout(sal_False)
  26  {
  27      sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
  28      const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetDataPilotTableAttrTokenMap();
  29 @@ -215,6 +216,11 @@ ScXMLDataPilotTableContext::ScXMLDataPilotTableContext( ScXMLImport& rImport,
  30                  bDrillDown = IsXMLToken(sValue, XML_TRUE);
  31              }
  32              break;
  33 +            case XML_TOK_DATA_PILOT_TABLE_ATTR_HEADER_GRID_LAYOUT :
  34 +            {
  35 +                bHeaderGridLayout = IsXMLToken(sValue, XML_TRUE);
  36 +            }
  37 +            break;
  38          }
  39      }
  40
  41 @@ -392,6 +398,7 @@ void ScXMLDataPilotTableContext::EndElement()
  42          pDPObject->SetName(sDataPilotTableName);
  43          pDPObject->SetTag(sApplicationData);
  44          pDPObject->SetOutRange(aTargetRangeAddress);
  45 +        pDPObject->SetHeaderLayout(bHeaderGridLayout);
  46          switch (nSourceType)
  47          {
  48              case SQL :
  49 diff --git sc/source/filter/xml/xmldpimp.hxx sc/source/filter/xml/xmldpimp.hxx
  50 index b4df6b1..0f604a4 100644
  51 --- sc/source/filter/xml/xmldpimp.hxx
  52 +++ sc/source/filter/xml/xmldpimp.hxx
  53 @@ -128,6 +128,7 @@ class ScXMLDataPilotTableContext : public SvXMLImportContext
  54      sal_Bool           bSourceCellRange;
  55      sal_Bool        bShowFilter;
  56      sal_Bool        bDrillDown;
  57 +    sal_Bool        bHeaderGridLayout;
  58
  59      const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
  60      ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
  61 diff --git sc/source/filter/xml/xmlimprt.cxx sc/source/filter/xml/xmlimprt.cxx
  62 index 7d9e882..bc43180 100644
  63 --- sc/source/filter/xml/xmlimprt.cxx
  64 +++ sc/source/filter/xml/xmlimprt.cxx
  65 @@ -1328,6 +1328,7 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotTableAttrTokenMap()
  66              { XML_NAMESPACE_TABLE, XML_BUTTONS,                                    XML_TOK_DATA_PILOT_TABLE_ATTR_BUTTONS                               },
  67              { XML_NAMESPACE_TABLE, XML_SHOW_FILTER_BUTTON,         XML_TOK_DATA_PILOT_TABLE_ATTR_SHOW_FILTER_BUTTON    },
  68              { XML_NAMESPACE_TABLE, XML_DRILL_DOWN_ON_DOUBLE_CLICK, XML_TOK_DATA_PILOT_TABLE_ATTR_DRILL_DOWN                    },
  69 +    { XML_NAMESPACE_TABLE, XML_HEADER_GRID_LAYOUT,      XML_TOK_DATA_PILOT_TABLE_ATTR_HEADER_GRID_LAYOUT    },
  70              XML_TOKEN_MAP_END
  71          };
  72
  73 diff --git sc/source/filter/xml/xmlimprt.hxx sc/source/filter/xml/xmlimprt.hxx
  74 index 139acf5..1e18bd8 100644
  75 --- sc/source/filter/xml/xmlimprt.hxx
  76 +++ sc/source/filter/xml/xmlimprt.hxx
  77 @@ -482,7 +482,8 @@ enum ScXMLDataPilotTableAttrTokens
  78      XML_TOK_DATA_PILOT_TABLE_ATTR_TARGET_RANGE_ADDRESS,
  79      XML_TOK_DATA_PILOT_TABLE_ATTR_BUTTONS,
  80      XML_TOK_DATA_PILOT_TABLE_ATTR_SHOW_FILTER_BUTTON,
  81 -    XML_TOK_DATA_PILOT_TABLE_ATTR_DRILL_DOWN
  82 +    XML_TOK_DATA_PILOT_TABLE_ATTR_DRILL_DOWN,
  83 +    XML_TOK_DATA_PILOT_TABLE_ATTR_HEADER_GRID_LAYOUT
  84  };
  85
  86  enum ScXMLDataPilotTableElemTokens
  87 diff --git xmloff/inc/xmloff/xmltoken.hxx xmloff/inc/xmloff/xmltoken.hxx
  88 index dacfd53..741a120 100644
  89 --- xmloff/inc/xmloff/xmltoken.hxx
  90 +++ xmloff/inc/xmloff/xmltoken.hxx
  91 @@ -2507,6 +2507,7 @@ namespace xmloff { namespace token {
  92
  93          XML_SHOW_FILTER_BUTTON,
  94          XML_DRILL_DOWN_ON_DOUBLE_CLICK,
  95 +        XML_HEADER_GRID_LAYOUT,
  96          XML_GROUPED_BY,
  97          XML_DAYS,
  98          XML_MONTHS,
  99 diff --git xmloff/source/core/xmltoken.cxx xmloff/source/core/xmltoken.cxx
 100 index 0aea4f9..a4a43bb 100644
 101 --- xmloff/source/core/xmltoken.cxx
 102 +++ xmloff/source/core/xmltoken.cxx
 103 @@ -2512,6 +2512,7 @@ namespace xmloff { namespace token {
 104
 105          TOKEN( "show-filter-button",                   XML_SHOW_FILTER_BUTTON ),
 106          TOKEN( "drill-down-on-double-click",           XML_DRILL_DOWN_ON_DOUBLE_CLICK ),
 107 +        TOKEN( "header-grid-layout",                   XML_HEADER_GRID_LAYOUT ),
 108          TOKEN( "grouped-by",                           XML_GROUPED_BY ),
 109          TOKEN( "days",                                 XML_DAYS ),
 110          TOKEN( "months",                               XML_MONTHS ),