sc/source/filter/xml/xmlstyli.cxx | 34 +++++++++++++++-------------------
xmloff/source/style/prstylei.cxx | 3 +++
2 files changed, 18 insertions(+), 19 deletions(-)
New commits:
commit 8eec78d3fb715987a81cf17d6363343d59ae10f4
Author: Michael Stahl <mst...@redhat.com>
Date: Fri Nov 11 16:10:06 2016 +0100
xmloff: print a warning if we drop a style on the floor
Turns out we do not support section styles.
Change-Id: I2858c639c1c9743f53836548b4c73645fa32d87b
diff --git a/xmloff/source/style/prstylei.cxx b/xmloff/source/style/prstylei.cxx
index 7870e02..bc00a86 100644
--- a/xmloff/source/style/prstylei.cxx
+++ b/xmloff/source/style/prstylei.cxx
@@ -368,7 +368,10 @@ void XMLPropStyleContext::CreateAndInsert( bool bOverwrite
)
Reference < XNameContainer > xFamilies =
pSvXMLStylesContext->GetStylesContainer( GetFamily() );
if( !xFamilies.is() )
+ {
+ SAL_WARN("xmloff", "no styles container for family " <<
GetFamily());
return;
+ }
bool bNew = false;
if( xFamilies->hasByName( rName ) )
commit 33a32bb1e19eb4cd9017c3e2016d165f38dc7c7d
Author: Michael Stahl <mst...@redhat.com>
Date: Fri Nov 11 15:55:14 2016 +0100
sc: OUString cleanup
Change-Id: I2fcd14adaa20d2692beb12ffd0b40b1a47538fbc
diff --git a/sc/source/filter/xml/xmlstyli.cxx
b/sc/source/filter/xml/xmlstyli.cxx
index 277df69..d0f8a43 100644
--- a/sc/source/filter/xml/xmlstyli.cxx
+++ b/sc/source/filter/xml/xmlstyli.cxx
@@ -699,17 +699,17 @@ XMLTableStylesContext::XMLTableStylesContext(
SvXMLImport& rImport,
sal_uInt16 nPrfx ,
const OUString& rLName ,
const uno::Reference< XAttributeList > & xAttrList,
- const bool bTempAutoStyles ) :
- SvXMLStylesContext( rImport, nPrfx, rLName, xAttrList ),
- sCellStyleServiceName( OUString( "com.sun.star.style.CellStyle" )),
- sColumnStyleServiceName( OUString(
XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_NAME )),
- sRowStyleServiceName( OUString( XML_STYLE_FAMILY_TABLE_ROW_STYLES_NAME )),
- sTableStyleServiceName( OUString( XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME
)),
- nNumberFormatIndex(-1),
- nConditionalFormatIndex(-1),
- nCellStyleIndex(-1),
- nMasterPageNameIndex(-1),
- bAutoStyles(bTempAutoStyles)
+ const bool bTempAutoStyles )
+ : SvXMLStylesContext( rImport, nPrfx, rLName, xAttrList )
+ , sCellStyleServiceName("com.sun.star.style.CellStyle")
+ , sColumnStyleServiceName(XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_NAME)
+ , sRowStyleServiceName(XML_STYLE_FAMILY_TABLE_ROW_STYLES_NAME)
+ , sTableStyleServiceName(XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME)
+ , nNumberFormatIndex(-1)
+ , nConditionalFormatIndex(-1)
+ , nCellStyleIndex(-1)
+ , nMasterPageNameIndex(-1)
+ , bAutoStyles(bTempAutoStyles)
{
}
@@ -791,8 +791,7 @@ uno::Reference < XNameContainer >
if( xTableStyles.is() )
xStyles.set(xTableStyles);
else
- sName =
- OUString( OUString( "TableStyles" ));
+ sName = "TableStyles";
}
break;
case XML_STYLE_FAMILY_TABLE_CELL:
@@ -800,8 +799,7 @@ uno::Reference < XNameContainer >
if( xCellStyles.is() )
xStyles.set(xCellStyles);
else
- sName =
- OUString( OUString( "CellStyles" ));
+ sName = "CellStyles";
}
break;
case XML_STYLE_FAMILY_TABLE_COLUMN:
@@ -809,8 +807,7 @@ uno::Reference < XNameContainer >
if( xColumnStyles.is() )
xStyles.set(xColumnStyles);
else
- sName =
- OUString( OUString( "ColumnStyles" ));
+ sName = "ColumnStyles";
}
break;
case XML_STYLE_FAMILY_TABLE_ROW:
@@ -818,8 +815,7 @@ uno::Reference < XNameContainer >
if( xRowStyles.is() )
xStyles.set(xRowStyles);
else
- sName =
- OUString( OUString( "RowStyles" ));
+ sName = "RowStyles";
}
break;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
