strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

We need to set the current cell range object regardless of style name.

Browse source 
Otherwise we would fail to import the cell contents of those documents
that don't include table styles at all.  Some hand-crafted ods documents
don't provide table styles, which 3.4 imported just fine.
This commit is contained in:
Kohei Yoshida 2011-12-07 23:53:56 -05:00
parent 2419d3c2de
commit 8d86abbc36
1 changed files with 43 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
sc/source/filter/xml/xmlsubti.cxx
View file

@ -170,6 +170,29 @@ ScMyTables::~ScMyTables()
{
}
namespace {
uno::Reference<sheet::XSpreadsheet> getCurrentSheet(const uno::Reference<frame::XModel>& xModel, SCTAB nSheet)
{
uno::Reference<sheet::XSpreadsheet> xSheet;
uno::Reference<sheet::XSpreadsheetDocument> xSpreadDoc(xModel, uno::UNO_QUERY);
if (!xSpreadDoc.is())
return xSheet;
uno::Reference <sheet::XSpreadsheets> xSheets(xSpreadDoc->getSheets());
if (!xSheets.is())
return xSheet;
uno::Reference <container::XIndexAccess> xIndex(xSheets, uno::UNO_QUERY);
if (!xIndex.is())
return xSheet;
xSheet.set(xIndex->getByIndex(nSheet), uno::UNO_QUERY);
return xSheet;
}
}
void ScMyTables::NewSheet(const rtl::OUString& sTableName, const rtl::OUString& sStyleName,
const ScXMLTabProtectionData& rProtectData)
{
@ -192,7 +215,14 @@ void ScMyTables::NewSheet(const rtl::OUString& sTableName, const rtl::OUString&
pDoc->SetTabNameOnLoad(nCurrentSheet, sTableName);
rImport.SetTableStyle(sStyleName);
SetTableStyle(sStyleName);
xCurrentSheet = getCurrentSheet(rImport.GetModel(), nCurrentSheet);
if (xCurrentSheet.is())
{
// We need to set the current cell range here regardless of
// presence of style name.
xCurrentCellRange.set(xCurrentSheet, uno::UNO_QUERY);
SetTableStyle(sStyleName);
}
}
NewTable(1);
@ -212,37 +242,23 @@ void ScMyTables::SetTableStyle(const rtl::OUString& sStyleName)
// RTL layout is only remembered, not actually applied, so the shapes can
// be loaded before mirroring.
uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( rImport.GetModel(), uno::UNO_QUERY );
if ( xSpreadDoc.is() )
if ( xCurrentSheet.is() )
{
uno::Reference <sheet::XSpreadsheets> xSheets(xSpreadDoc->getSheets());
if ( xSheets.is() )
xCurrentCellRange.set(xCurrentSheet, uno::UNO_QUERY);
uno::Reference <beans::XPropertySet> xProperties(xCurrentSheet, uno::UNO_QUERY);
if ( xProperties.is() )
{
uno::Reference <container::XIndexAccess> xIndex( xSheets, uno::UNO_QUERY );
if ( xIndex.is() )
XMLTableStylesContext *pStyles = (XMLTableStylesContext *)rImport.GetAutoStyles();
if ( pStyles )
{
xCurrentSheet.set(xIndex->getByIndex(nCurrentSheet), uno::UNO_QUERY);
if ( xCurrentSheet.is() )
XMLTableStyleContext* pStyle = (XMLTableStyleContext *)pStyles->FindStyleChildContext(
XML_STYLE_FAMILY_TABLE_TABLE, sStyleName, true);
if ( pStyle )
{
xCurrentCellRange.set(xCurrentSheet, uno::UNO_QUERY);
uno::Reference <beans::XPropertySet> xProperties(xCurrentSheet, uno::UNO_QUERY);
if ( xProperties.is() )
{
XMLTableStylesContext *pStyles = (XMLTableStylesContext *)rImport.GetAutoStyles();
if ( pStyles )
{
XMLTableStyleContext* pStyle = (XMLTableStyleContext *)pStyles->FindStyleChildContext(
XML_STYLE_FAMILY_TABLE_TABLE, sStyleName, true);
if ( pStyle )
{
pStyle->FillPropertySet(xProperties);
pStyle->FillPropertySet(xProperties);
ScSheetSaveData* pSheetData = ScModelObj::getImplementation(rImport.GetModel())->GetSheetSaveData();
pSheetData->AddTableStyle( sStyleName, ScAddress( 0, 0, nCurrentSheet ) );
}
}
}
ScSheetSaveData* pSheetData = ScModelObj::getImplementation(rImport.GetModel())->GetSheetSaveData();
pSheetData->AddTableStyle( sStyleName, ScAddress( 0, 0, nCurrentSheet ) );
}
}
}