[Libreoffice-commits] .: binfilter/bf_xmloff binfilter/inc
Caolán McNamara
caolan at kemper.freedesktop.org
Wed Feb 23 03:04:29 PST 2011
binfilter/bf_xmloff/source/style/xmloff_DrawAspectHdl.cxx | 2
binfilter/bf_xmloff/source/style/xmloff_FillStyleContext.cxx | 26 -
binfilter/bf_xmloff/source/style/xmloff_NamedBoolPropertyHdl.cxx | 4
binfilter/bf_xmloff/source/style/xmloff_PageHeaderFooterContext.cxx | 18 -
binfilter/bf_xmloff/source/style/xmloff_PageMasterExportPropMapper.cxx | 24 -
binfilter/bf_xmloff/source/style/xmloff_PageMasterImportContext.cxx | 16 -
binfilter/bf_xmloff/source/style/xmloff_PageMasterImportPropMapper.cxx | 3
binfilter/bf_xmloff/source/style/xmloff_PageMasterPropHdl.cxx | 20 -
binfilter/bf_xmloff/source/style/xmloff_PageMasterStyleMap.cxx | 3
binfilter/bf_xmloff/source/style/xmloff_PagePropertySetContext.cxx | 30 +-
binfilter/bf_xmloff/source/style/xmloff_VisAreaContext.cxx | 26 -
binfilter/bf_xmloff/source/style/xmloff_XMLBackgroundImageContext.cxx | 25 +
binfilter/bf_xmloff/source/style/xmloff_XMLBackgroundImageExport.cxx | 10
binfilter/bf_xmloff/source/style/xmloff_XMLBitmapLogicalSizePropertyHandler.cxx | 8
binfilter/bf_xmloff/source/style/xmloff_XMLBitmapRepeatOffsetPropertyHandler.cxx | 4
binfilter/bf_xmloff/source/style/xmloff_XMLElementPropertyContext.cxx | 10
binfilter/bf_xmloff/source/style/xmloff_XMLFontStylesContext.cxx | 22 -
binfilter/bf_xmloff/source/style/xmloff_XMLFootnoteSeparatorExport.cxx | 1
binfilter/bf_xmloff/source/style/xmloff_XMLFootnoteSeparatorImport.cxx | 10
binfilter/bf_xmloff/source/style/xmloff_XMLIsPercentagePropertyHandler.cxx | 8
binfilter/bf_xmloff/source/style/xmloff_XMLPageExport.cxx | 4
binfilter/bf_xmloff/source/style/xmloff_backhdl.cxx | 11
binfilter/bf_xmloff/source/style/xmloff_breakhdl.cxx | 4
binfilter/bf_xmloff/source/style/xmloff_chrhghdl.cxx | 8
binfilter/bf_xmloff/source/style/xmloff_chrlohdl.cxx | 8
binfilter/bf_xmloff/source/style/xmloff_csmaphdl.cxx | 4
binfilter/bf_xmloff/source/style/xmloff_durationhdl.cxx | 4
binfilter/bf_xmloff/source/style/xmloff_escphdl.cxx | 2
binfilter/bf_xmloff/source/style/xmloff_tabsthdl.cxx | 4
binfilter/bf_xmloff/source/style/xmloff_xmlaustp.cxx | 18 -
binfilter/bf_xmloff/source/style/xmloff_xmlnumfe.cxx | 36 +-
binfilter/bf_xmloff/source/style/xmloff_xmlnumi.cxx | 6
binfilter/bf_xmloff/source/style/xmloff_xmlstyle.cxx | 134 +++++-----
binfilter/inc/bf_xmloff/PageMasterStyleMap.hxx | 16 -
34 files changed, 275 insertions(+), 254 deletions(-)
New commits:
commit 42445a9c713db53d730df1c552e39b41374ba125
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Feb 23 09:56:52 2011 +0000
throw out some warnings
diff --git a/binfilter/bf_xmloff/source/style/xmloff_DrawAspectHdl.cxx b/binfilter/bf_xmloff/source/style/xmloff_DrawAspectHdl.cxx
index 71a3a9f..e81a14f 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_DrawAspectHdl.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_DrawAspectHdl.cxx
@@ -78,7 +78,7 @@ sal_Bool DrawAspectHdl::importXML( const OUString& rStrImpValue, uno::Any& rValu
return nAspect != 0;
}
-sal_Bool DrawAspectHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const
+sal_Bool DrawAspectHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
sal_Bool bRet = sal_False;
OUStringBuffer aOut;
diff --git a/binfilter/bf_xmloff/source/style/xmloff_FillStyleContext.cxx b/binfilter/bf_xmloff/source/style/xmloff_FillStyleContext.cxx
index 58459d9..86de988 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_FillStyleContext.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_FillStyleContext.cxx
@@ -53,10 +53,10 @@ using namespace ::rtl;
TYPEINIT1( XMLGradientStyleContext, SvXMLStyleContext );
-XMLGradientStyleContext::XMLGradientStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
+XMLGradientStyleContext::XMLGradientStyleContext( SvXMLImport& rInImport, sal_uInt16 nPrfx,
const OUString& rLName,
const uno::Reference< xml::sax::XAttributeList >& xAttrList)
-: SvXMLStyleContext(rImport, nPrfx, rLName, xAttrList)
+: SvXMLStyleContext(rInImport, nPrfx, rLName, xAttrList)
{
// set Family
// SetFamily( XML_STYLE_FAMILY_FILLSTYLE_GRADIENT_ID );
@@ -102,10 +102,10 @@ BOOL XMLGradientStyleContext::IsTransient() const
TYPEINIT1( XMLHatchStyleContext, SvXMLStyleContext );
-XMLHatchStyleContext::XMLHatchStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
+XMLHatchStyleContext::XMLHatchStyleContext( SvXMLImport& rInImport, sal_uInt16 nPrfx,
const OUString& rLName,
const uno::Reference< xml::sax::XAttributeList >& xAttrList)
-: SvXMLStyleContext(rImport, nPrfx, rLName, xAttrList)
+: SvXMLStyleContext(rInImport, nPrfx, rLName, xAttrList)
{
// start import
XMLHatchStyleImport aHatchStyle( GetImport() );
@@ -148,14 +148,14 @@ BOOL XMLHatchStyleContext::IsTransient() const
TYPEINIT1( XMLBitmapStyleContext, SvXMLStyleContext );
-XMLBitmapStyleContext::XMLBitmapStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
+XMLBitmapStyleContext::XMLBitmapStyleContext( SvXMLImport& rInImport, sal_uInt16 nPrfx,
const OUString& rLName,
const uno::Reference< xml::sax::XAttributeList >& xAttrList)
-: SvXMLStyleContext(rImport, nPrfx, rLName, xAttrList)
+: SvXMLStyleContext(rInImport, nPrfx, rLName, xAttrList)
{
// start import
XMLImageStyle aBitmapStyle;
- aBitmapStyle.importXML( xAttrList, maAny, maStrName, rImport );
+ aBitmapStyle.importXML( xAttrList, maAny, maStrName, rInImport );
}
XMLBitmapStyleContext::~XMLBitmapStyleContext()
@@ -229,10 +229,10 @@ BOOL XMLBitmapStyleContext::IsTransient() const
TYPEINIT1( XMLTransGradientStyleContext, SvXMLStyleContext );
-XMLTransGradientStyleContext::XMLTransGradientStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
+XMLTransGradientStyleContext::XMLTransGradientStyleContext( SvXMLImport& rInImport, sal_uInt16 nPrfx,
const OUString& rLName,
const uno::Reference< xml::sax::XAttributeList >& xAttrList)
-: SvXMLStyleContext(rImport, nPrfx, rLName, xAttrList)
+: SvXMLStyleContext(rInImport, nPrfx, rLName, xAttrList)
{
// start import
XMLTransGradientStyleImport aTransGradientStyle( GetImport() );
@@ -275,10 +275,10 @@ BOOL XMLTransGradientStyleContext::IsTransient() const
TYPEINIT1( XMLMarkerStyleContext, SvXMLStyleContext );
-XMLMarkerStyleContext::XMLMarkerStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
+XMLMarkerStyleContext::XMLMarkerStyleContext( SvXMLImport& rInImport, sal_uInt16 nPrfx,
const OUString& rLName,
const uno::Reference< xml::sax::XAttributeList >& xAttrList)
-: SvXMLStyleContext(rImport, nPrfx, rLName, xAttrList)
+: SvXMLStyleContext(rInImport, nPrfx, rLName, xAttrList)
{
// start import
XMLMarkerStyleImport aMarkerStyle( GetImport() );
@@ -321,10 +321,10 @@ BOOL XMLMarkerStyleContext::IsTransient() const
TYPEINIT1( XMLDashStyleContext, SvXMLStyleContext );
-XMLDashStyleContext::XMLDashStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
+XMLDashStyleContext::XMLDashStyleContext( SvXMLImport& rInImport, sal_uInt16 nPrfx,
const OUString& rLName,
const uno::Reference< xml::sax::XAttributeList >& xAttrList)
-: SvXMLStyleContext(rImport, nPrfx, rLName, xAttrList)
+: SvXMLStyleContext(rInImport, nPrfx, rLName, xAttrList)
{
// start import
XMLDashStyleImport aDashStyle( GetImport() );
diff --git a/binfilter/bf_xmloff/source/style/xmloff_NamedBoolPropertyHdl.cxx b/binfilter/bf_xmloff/source/style/xmloff_NamedBoolPropertyHdl.cxx
index efc1405..d14f302 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_NamedBoolPropertyHdl.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_NamedBoolPropertyHdl.cxx
@@ -49,7 +49,7 @@ XMLNamedBoolPropertyHdl::~XMLNamedBoolPropertyHdl()
// Nothing to do
}
-sal_Bool XMLNamedBoolPropertyHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const
+sal_Bool XMLNamedBoolPropertyHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
if( rStrImpValue == maTrueStr )
{
@@ -66,7 +66,7 @@ sal_Bool XMLNamedBoolPropertyHdl::importXML( const OUString& rStrImpValue, Any&
return sal_False;
}
-sal_Bool XMLNamedBoolPropertyHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const
+sal_Bool XMLNamedBoolPropertyHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
if( ::cppu::any2bool( rValue ) )
{
diff --git a/binfilter/bf_xmloff/source/style/xmloff_PageHeaderFooterContext.cxx b/binfilter/bf_xmloff/source/style/xmloff_PageHeaderFooterContext.cxx
index 3ed3e49..b74b51d 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_PageHeaderFooterContext.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_PageHeaderFooterContext.cxx
@@ -43,20 +43,20 @@ using ::binfilter::xmloff::token::XML_PROPERTIES;
//------------------------------------------------------------------
-PageHeaderFooterContext::PageHeaderFooterContext( SvXMLImport& rImport,
+PageHeaderFooterContext::PageHeaderFooterContext( SvXMLImport& rInImport,
USHORT nPrfx,
const ::rtl::OUString& rLName,
const ::com::sun::star::uno::Reference<
- ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
+ ::com::sun::star::xml::sax::XAttributeList>& /*xAttrList*/,
::std::vector< XMLPropertyState > & rTempProperties,
const UniReference < SvXMLImportPropertyMapper > &rTempMap,
sal_Int32 nStart, sal_Int32 nEnd,
const sal_Bool bTempHeader ) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ SvXMLImportContext( rInImport, nPrfx, rLName ),
rProperties(rTempProperties),
- rMap(rTempMap),
nStartIndex(nStart),
- nEndIndex(nEnd)
+ nEndIndex(nEnd),
+ rMap(rTempMap)
{
bHeader = bTempHeader;
}
@@ -65,19 +65,19 @@ PageHeaderFooterContext::~PageHeaderFooterContext()
{
}
-SvXMLImportContext *PageHeaderFooterContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *PageHeaderFooterContext::CreateChildContext( USHORT nInPrefix,
const ::rtl::OUString& rLName,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList>& xAttrList )
{
SvXMLImportContext *pContext = 0;
- if( XML_NAMESPACE_STYLE == nPrefix && IsXMLToken( rLName, XML_PROPERTIES ) )
+ if( XML_NAMESPACE_STYLE == nInPrefix && IsXMLToken( rLName, XML_PROPERTIES ) )
{
PageContextType aType = Header;
if (!bHeader)
aType = Footer;
- pContext = new PagePropertySetContext( GetImport(), nPrefix,
+ pContext = new PagePropertySetContext( GetImport(), nInPrefix,
rLName, xAttrList,
rProperties,
rMap, nStartIndex, nEndIndex, aType);
@@ -85,7 +85,7 @@ SvXMLImportContext *PageHeaderFooterContext::CreateChildContext( USHORT nPrefix,
if( !pContext )
- pContext = new SvXMLImportContext( GetImport(), nPrefix, rLName );
+ pContext = new SvXMLImportContext( GetImport(), nInPrefix, rLName );
return pContext;
}
diff --git a/binfilter/bf_xmloff/source/style/xmloff_PageMasterExportPropMapper.cxx b/binfilter/bf_xmloff/source/style/xmloff_PageMasterExportPropMapper.cxx
index a5f4dd2..986e32a 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_PageMasterExportPropMapper.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_PageMasterExportPropMapper.cxx
@@ -126,7 +126,7 @@ XMLPropertyStateBuffer::XMLPropertyStateBuffer() :
{
}
-void XMLPropertyStateBuffer::ContextFilter( ::std::vector< XMLPropertyState >& rPropState )
+void XMLPropertyStateBuffer::ContextFilter( ::std::vector< XMLPropertyState >& /*rPropState*/ )
{
if( pPMBorderAll )
{
@@ -184,7 +184,7 @@ void XMLPropertyStateBuffer::ContextFilter( ::std::vector< XMLPropertyState >& r
{
if( pPMPaddingTop && pPMPaddingBottom && pPMPaddingLeft && pPMPaddingRight )
{
- sal_Int32 nTop, nBottom, nLeft, nRight;
+ sal_Int32 nTop(0), nBottom(0), nLeft(0), nRight(0);
pPMPaddingTop->maValue >>= nTop;
pPMPaddingBottom->maValue >>= nBottom;
@@ -223,9 +223,9 @@ XMLPageMasterExportPropMapper::~XMLPageMasterExportPropMapper()
}
void XMLPageMasterExportPropMapper::handleElementItem(
- SvXMLExport& rExport,
+ SvXMLExport& /*rExport*/,
const XMLPropertyState& rProperty,
- sal_uInt16 nFlags,
+ sal_uInt16 /*nFlags*/,
const ::std::vector< XMLPropertyState >* pProperties,
sal_uInt32 nIdx ) const
{
@@ -239,8 +239,8 @@ void XMLPageMasterExportPropMapper::handleElementItem(
case CTF_PM_FOOTERGRAPHICURL:
{
DBG_ASSERT( pProperties && (nIdx >= 2), "property vector missing" );
- sal_Int32 nPos;
- sal_Int32 nFilter;
+ sal_Int32 nPos(0);
+ sal_Int32 nFilter(0);
switch( nContextId )
{
case CTF_PM_GRAPHICURL:
@@ -289,12 +289,12 @@ void XMLPageMasterExportPropMapper::handleElementItem(
}
void XMLPageMasterExportPropMapper::handleSpecialItem(
- SvXMLAttributeList& rAttrList,
- const XMLPropertyState& rProperty,
- const SvXMLUnitConverter& rUnitConverter,
- const SvXMLNamespaceMap& rNamespaceMap,
- const ::std::vector< XMLPropertyState >* pProperties,
- sal_uInt32 nIdx) const
+ SvXMLAttributeList& /*rAttrList*/,
+ const XMLPropertyState& /*rProperty*/,
+ const SvXMLUnitConverter& /*rUnitConverter*/,
+ const SvXMLNamespaceMap& /*rNamespaceMap*/,
+ const ::std::vector< XMLPropertyState >* /*pProperties*/,
+ sal_uInt32 /*nIdx*/) const
{
}
diff --git a/binfilter/bf_xmloff/source/style/xmloff_PageMasterImportContext.cxx b/binfilter/bf_xmloff/source/style/xmloff_PageMasterImportContext.cxx
index c35dfe5..7b7a177 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_PageMasterImportContext.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_PageMasterImportContext.cxx
@@ -59,11 +59,11 @@ void PageStyleContext::SetAttribute( sal_uInt16 nPrefixKey,
TYPEINIT1( PageStyleContext, XMLPropStyleContext );
-PageStyleContext::PageStyleContext( SvXMLImport& rImport,
+PageStyleContext::PageStyleContext( SvXMLImport& rInImport,
sal_uInt16 nPrfx, const ::rtl::OUString& rLName,
const uno::Reference< xml::sax::XAttributeList > & xAttrList,
SvXMLStylesContext& rStyles) :
- XMLPropStyleContext( rImport, nPrfx, rLName, xAttrList, rStyles, XML_STYLE_FAMILY_PAGE_MASTER ),
+ XMLPropStyleContext( rInImport, nPrfx, rLName, xAttrList, rStyles, XML_STYLE_FAMILY_PAGE_MASTER ),
sPageUsage()
{
}
@@ -73,13 +73,13 @@ PageStyleContext::~PageStyleContext()
}
SvXMLImportContext *PageStyleContext::CreateChildContext(
- sal_uInt16 nPrefix,
+ sal_uInt16 nInPrefix,
const ::rtl::OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList > & xAttrList )
{
SvXMLImportContext *pContext = NULL;
- if( XML_NAMESPACE_STYLE == nPrefix &&
+ if( XML_NAMESPACE_STYLE == nInPrefix &&
((IsXMLToken(rLocalName, XML_HEADER_STYLE )) ||
(IsXMLToken(rLocalName, XML_FOOTER_STYLE )) ) )
{
@@ -118,11 +118,11 @@ SvXMLImportContext *PageStyleContext::CreateChildContext(
}
if (!bEnd)
nEndIndex = nIndex;
- pContext = new PageHeaderFooterContext(GetImport(), nPrefix, rLocalName,
+ pContext = new PageHeaderFooterContext(GetImport(), nInPrefix, rLocalName,
xAttrList, GetProperties(), xImpPrMap, nStartIndex, nEndIndex, bHeader);
}
}
- if( XML_NAMESPACE_STYLE == nPrefix &&
+ if( XML_NAMESPACE_STYLE == nInPrefix &&
IsXMLToken(rLocalName, XML_PROPERTIES) )
{
UniReference < SvXMLImportPropertyMapper > xImpPrMap =
@@ -147,7 +147,7 @@ SvXMLImportContext *PageStyleContext::CreateChildContext(
if (!bEnd)
nEndIndex = nIndex;
PageContextType aType = Page;
- pContext = new PagePropertySetContext( GetImport(), nPrefix,
+ pContext = new PagePropertySetContext( GetImport(), nInPrefix,
rLocalName, xAttrList,
GetProperties(),
xImpPrMap, 0, nEndIndex, aType);
@@ -155,7 +155,7 @@ SvXMLImportContext *PageStyleContext::CreateChildContext(
}
if (!pContext)
- pContext = XMLPropStyleContext::CreateChildContext( nPrefix, rLocalName,
+ pContext = XMLPropStyleContext::CreateChildContext( nInPrefix, rLocalName,
xAttrList );
return pContext;
}
diff --git a/binfilter/bf_xmloff/source/style/xmloff_PageMasterImportPropMapper.cxx b/binfilter/bf_xmloff/source/style/xmloff_PageMasterImportPropMapper.cxx
index b467bff..f2991d7 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_PageMasterImportPropMapper.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_PageMasterImportPropMapper.cxx
@@ -124,8 +124,7 @@ void PageMasterImportPropertyMapper::finished(::std::vector< XMLPropertyState >&
XMLPropertyState* pFooterHeight = NULL;
XMLPropertyState* pFooterMinHeight = NULL;
XMLPropertyState* pFooterDynamic = NULL;
- ::std::vector< XMLPropertyState >::iterator property = rProperties.begin();
- for (property; property != rProperties.end(); property++)
+ for (::std::vector< XMLPropertyState >::iterator property = rProperties.begin(); property != rProperties.end(); property++)
{
sal_Int16 nContextID = getPropertySetMapper()->GetEntryContextId(property->mnIndex);
if (property->mnIndex >= nStartIndex && property->mnIndex < nEndIndex)
diff --git a/binfilter/bf_xmloff/source/style/xmloff_PageMasterPropHdl.cxx b/binfilter/bf_xmloff/source/style/xmloff_PageMasterPropHdl.cxx
index ed652a4..d6675c0 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_PageMasterPropHdl.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_PageMasterPropHdl.cxx
@@ -68,7 +68,7 @@ sal_Bool XMLPMPropHdl_PageStyleLayout::equals( const Any& rAny1, const Any& rAny
sal_Bool XMLPMPropHdl_PageStyleLayout::importXML(
const OUString& rStrImpValue,
Any& rValue,
- const SvXMLUnitConverter& rUnitConverter ) const
+ const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
sal_Bool bRet = sal_True;
@@ -89,7 +89,7 @@ sal_Bool XMLPMPropHdl_PageStyleLayout::importXML(
sal_Bool XMLPMPropHdl_PageStyleLayout::exportXML(
OUString& rStrExpValue,
const Any& rValue,
- const SvXMLUnitConverter& rUnitConverter ) const
+ const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
sal_Bool bRet = sal_False;
PageStyleLayout eLayout;
@@ -245,7 +245,7 @@ XMLPMPropHdl_PaperTrayNumber::~XMLPMPropHdl_PaperTrayNumber()
sal_Bool XMLPMPropHdl_PaperTrayNumber::importXML(
const OUString& rStrImpValue,
Any& rValue,
- const SvXMLUnitConverter& rUnitConverter ) const
+ const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
sal_Bool bRet = sal_False;
@@ -270,7 +270,7 @@ sal_Bool XMLPMPropHdl_PaperTrayNumber::importXML(
sal_Bool XMLPMPropHdl_PaperTrayNumber::exportXML(
OUString& rStrExpValue,
const Any& rValue,
- const SvXMLUnitConverter& rUnitConverter ) const
+ const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
sal_Bool bRet = sal_False;
sal_Int32 nPaperTray;
@@ -306,7 +306,7 @@ XMLPMPropHdl_Print::~XMLPMPropHdl_Print()
sal_Bool XMLPMPropHdl_Print::importXML(
const OUString& rStrImpValue,
Any& rValue,
- const SvXMLUnitConverter& rUnitConverter ) const
+ const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
sal_Unicode cToken = ' ';
sal_Int32 nTokenIndex = 0;
@@ -325,7 +325,7 @@ sal_Bool XMLPMPropHdl_Print::importXML(
sal_Bool XMLPMPropHdl_Print::exportXML(
OUString& rStrExpValue,
const Any& rValue,
- const SvXMLUnitConverter& rUnitConverter ) const
+ const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
if( getBOOL( rValue ) )
{
@@ -347,7 +347,7 @@ XMLPMPropHdl_CenterHorizontal::~XMLPMPropHdl_CenterHorizontal()
sal_Bool XMLPMPropHdl_CenterHorizontal::importXML(
const OUString& rStrImpValue,
Any& rValue,
- const SvXMLUnitConverter& rUnitConverter ) const
+ const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
sal_Bool bRet = sal_False;
@@ -366,7 +366,7 @@ sal_Bool XMLPMPropHdl_CenterHorizontal::importXML(
sal_Bool XMLPMPropHdl_CenterHorizontal::exportXML(
OUString& rStrExpValue,
const Any& rValue,
- const SvXMLUnitConverter& rUnitConverter ) const
+ const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
sal_Bool bRet = sal_False;
@@ -389,7 +389,7 @@ XMLPMPropHdl_CenterVertical::~XMLPMPropHdl_CenterVertical()
sal_Bool XMLPMPropHdl_CenterVertical::importXML(
const OUString& rStrImpValue,
Any& rValue,
- const SvXMLUnitConverter& rUnitConverter ) const
+ const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
sal_Bool bRet = sal_False;
@@ -407,7 +407,7 @@ sal_Bool XMLPMPropHdl_CenterVertical::importXML(
sal_Bool XMLPMPropHdl_CenterVertical::exportXML(
OUString& rStrExpValue,
const Any& rValue,
- const SvXMLUnitConverter& rUnitConverter ) const
+ const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
sal_Bool bRet = sal_False;
diff --git a/binfilter/bf_xmloff/source/style/xmloff_PageMasterStyleMap.cxx b/binfilter/bf_xmloff/source/style/xmloff_PageMasterStyleMap.cxx
index fa86849..8118e62 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_PageMasterStyleMap.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_PageMasterStyleMap.cxx
@@ -34,6 +34,7 @@ namespace binfilter {
using namespace ::binfilter::xmloff::token;
#define MAP(name,prefix,token,type,context) { name, sizeof(name)-1, prefix, token, type, context }
+#define MAP_ENTRY_END { 0,0,0,xmloff::token::XML_TOKEN_INVALID,0,0 }
//______________________________________________________________________________
const XMLPropertyMapEntry aXMLPageMasterStyleMap[] =
@@ -170,7 +171,7 @@ const XMLPropertyMapEntry aXMLPageMasterStyleMap[] =
MAP( "FooterBackGraphicURL", XML_NAMESPACE_STYLE, XML_BACKGROUND_IMAGE, XML_TYPE_STRING | MID_FLAG_ELEMENT_ITEM, CTF_PM_FOOTERGRAPHICURL ),
MAP( "FooterDynamicSpacing", XML_NAMESPACE_STYLE, XML_DYNAMIC_SPACING, XML_TYPE_BOOL, CTF_PM_FOOTERFLAG ),
- { 0L }
+ MAP_ENTRY_END
};
}//end of namespace binfilter
diff --git a/binfilter/bf_xmloff/source/style/xmloff_PagePropertySetContext.cxx b/binfilter/bf_xmloff/source/style/xmloff_PagePropertySetContext.cxx
index 50c61c4..52a0bcf 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_PagePropertySetContext.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_PagePropertySetContext.cxx
@@ -40,14 +40,14 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star;
PagePropertySetContext::PagePropertySetContext(
- SvXMLImport& rImport, sal_uInt16 nPrfx,
+ SvXMLImport& rInImport, sal_uInt16 nPrfx,
const OUString& rLName,
const Reference< xml::sax::XAttributeList > & xAttrList,
::std::vector< XMLPropertyState > &rProps,
const UniReference < SvXMLImportPropertyMapper > &rMap,
sal_Int32 nStartIndex, sal_Int32 nEndIndex,
const PageContextType aTempType ) :
- SvXMLPropertySetContext( rImport, nPrfx, rLName, xAttrList, rProps, rMap, nStartIndex, nEndIndex )
+ SvXMLPropertySetContext( rInImport, nPrfx, rLName, xAttrList, rProps, rMap, nStartIndex, nEndIndex )
{
aType = aTempType;
}
@@ -57,10 +57,10 @@ PagePropertySetContext::~PagePropertySetContext()
}
SvXMLImportContext *PagePropertySetContext::CreateChildContext(
- sal_uInt16 nPrefix,
+ sal_uInt16 nInPrefix,
const OUString& rLocalName,
const Reference< xml::sax::XAttributeList > & xAttrList,
- ::std::vector< XMLPropertyState > &rProperties,
+ ::std::vector< XMLPropertyState > &rInProperties,
const XMLPropertyState& rProp )
{
sal_Int32 nPos = CTF_PM_GRAPHICPOSITION;
@@ -79,6 +79,8 @@ SvXMLImportContext *PagePropertySetContext::CreateChildContext(
nFil = CTF_PM_FOOTERGRAPHICFILTER;
}
break;
+ default:
+ break;
}
SvXMLImportContext *pContext = 0;
@@ -94,43 +96,45 @@ SvXMLImportContext *PagePropertySetContext::CreateChildContext(
nFil == xMapper->getPropertySetMapper()
->GetEntryContextId( rProp.mnIndex-1 ),
"invalid property map!");
+ (void)nPos;
+ (void)nFil;
pContext =
- new XMLBackgroundImageContext( GetImport(), nPrefix,
+ new XMLBackgroundImageContext( GetImport(), nInPrefix,
rLocalName, xAttrList,
rProp,
rProp.mnIndex-2,
rProp.mnIndex-1,
-1,
- rProperties );
+ rInProperties );
break;
case CTF_PM_TEXTCOLUMNS:
#ifndef SVX_LIGHT
- pContext = new XMLTextColumnsContext( GetImport(), nPrefix,
+ pContext = new XMLTextColumnsContext( GetImport(), nInPrefix,
rLocalName, xAttrList, rProp,
- rProperties );
+ rInProperties );
#else
// create default context to skip content
- pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
+ pContext = new SvXMLImportContext( GetImport(), nInPrefix, rLocalName );
#endif // #ifndef SVX_LIGHT
break;
case CTF_PM_FTN_LINE_WEIGTH:
#ifndef SVX_LIGHT
pContext = new XMLFootnoteSeparatorImport(
- GetImport(), nPrefix, rLocalName, rProperties,
+ GetImport(), nInPrefix, rLocalName, rInProperties,
xMapper->getPropertySetMapper(), rProp.mnIndex);
#else
// create default context to skip content
- pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName);
+ pContext = new SvXMLImportContext( GetImport(), nInPrefix, rLocalName);
#endif // #ifndef SVX_LIGHT
break;
}
if( !pContext )
- pContext = SvXMLPropertySetContext::CreateChildContext( nPrefix, rLocalName,
+ pContext = SvXMLPropertySetContext::CreateChildContext( nInPrefix, rLocalName,
xAttrList,
- rProperties, rProp );
+ rInProperties, rProp );
return pContext;
}
diff --git a/binfilter/bf_xmloff/source/style/xmloff_VisAreaContext.cxx b/binfilter/bf_xmloff/source/style/xmloff_VisAreaContext.cxx
index 797190f..4850c9e 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_VisAreaContext.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_VisAreaContext.cxx
@@ -47,12 +47,12 @@ using namespace ::binfilter::xmloff::token;
//------------------------------------------------------------------
-XMLVisAreaContext::XMLVisAreaContext( SvXMLImport& rImport,
+XMLVisAreaContext::XMLVisAreaContext( SvXMLImport& rInImport,
USHORT nPrfx,
const ::rtl::OUString& rLName,
const uno::Reference<xml::sax::XAttributeList>& xAttrList,
::com::sun::star::awt::Rectangle& rRect, const sal_Int16 nMeasureUnit ) :
- SvXMLImportContext( rImport, nPrfx, rLName )
+ SvXMLImportContext( rInImport, nPrfx, rLName )
{
process( xAttrList, rRect, nMeasureUnit );
}
@@ -73,29 +73,29 @@ void XMLVisAreaContext::process( const uno::Reference< xml::sax::XAttributeList>
for( sal_Int16 i=0; i < nAttrCount; i++ )
{
::rtl::OUString sAttrName = xAttrList->getNameByIndex( i );
- ::rtl::OUString aLocalName;
- USHORT nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName(
- sAttrName, &aLocalName );
+ ::rtl::OUString aLclLocalName;
+ USHORT nLclPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName(
+ sAttrName, &aLclLocalName );
::rtl::OUString sValue = xAttrList->getValueByIndex( i );
- if (nPrefix == XML_NAMESPACE_OFFICE)
+ if (nLclPrefix == XML_NAMESPACE_OFFICE)
{
- if (IsXMLToken( aLocalName, XML_X ))
+ if (IsXMLToken( aLclLocalName, XML_X ))
{
SvXMLUnitConverter::convertMeasure(nX, sValue, aMapUnit);
rRect.X = nX;
}
- else if (IsXMLToken( aLocalName, XML_Y ))
+ else if (IsXMLToken( aLclLocalName, XML_Y ))
{
SvXMLUnitConverter::convertMeasure(nY, sValue, aMapUnit);
rRect.Y = nY;
}
- else if (IsXMLToken( aLocalName, XML_WIDTH ))
+ else if (IsXMLToken( aLclLocalName, XML_WIDTH ))
{
SvXMLUnitConverter::convertMeasure(nWidth, sValue, aMapUnit);
rRect.Width = nWidth;
}
- else if (IsXMLToken( aLocalName, XML_HEIGHT ))
+ else if (IsXMLToken( aLclLocalName, XML_HEIGHT ))
{
SvXMLUnitConverter::convertMeasure(nHeight, sValue, aMapUnit);
rRect.Height = nHeight;
@@ -104,13 +104,13 @@ void XMLVisAreaContext::process( const uno::Reference< xml::sax::XAttributeList>
}
}
-SvXMLImportContext *XMLVisAreaContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *XMLVisAreaContext::CreateChildContext( USHORT nInPrefix,
const ::rtl::OUString& rLocalName,
const ::com::sun::star::uno::Reference<
- ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
+ ::com::sun::star::xml::sax::XAttributeList>& /*xAttrList*/ )
{
// here is no context
- SvXMLImportContext *pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
+ SvXMLImportContext *pContext = new SvXMLImportContext( GetImport(), nInPrefix, rLocalName );
return pContext;
}
diff --git a/binfilter/bf_xmloff/source/style/xmloff_XMLBackgroundImageContext.cxx b/binfilter/bf_xmloff/source/style/xmloff_XMLBackgroundImageContext.cxx
index 37123e5..db2b0a1 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_XMLBackgroundImageContext.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_XMLBackgroundImageContext.cxx
@@ -129,6 +129,9 @@ void lcl_xmlbic_MergeHoriPos( GraphicLocation& ePos,
? GraphicLocation_MIDDLE_BOTTOM
: GraphicLocation_RIGHT_BOTTOM);
break;
+
+ default:
+ break;
}
}
@@ -168,6 +171,8 @@ void lcl_xmlbic_MergeVertPos( GraphicLocation& ePos,
? GraphicLocation_RIGHT_MIDDLE
: GraphicLocation_RIGHT_BOTTOM);
break;
+ default:
+ break;
}
}
@@ -186,13 +191,13 @@ void XMLBackgroundImageContext::ProcessAttrs(
for( sal_Int16 i=0; i < nAttrCount; i++ )
{
const OUString& rAttrName = xAttrList->getNameByIndex( i );
- OUString aLocalName;
- sal_uInt16 nPrefix =
+ OUString aLclLocalName;
+ sal_uInt16 nLclPrefix =
GetImport().GetNamespaceMap().GetKeyByAttrName( rAttrName,
- &aLocalName );
+ &aLclLocalName );
const OUString& rValue = xAttrList->getValueByIndex( i );
- switch( aTokenMap.Get( nPrefix, aLocalName ) )
+ switch( aTokenMap.Get( nLclPrefix, aLclLocalName ) )
{
case XML_TOK_BGIMG_HREF:
sURL = rValue;
@@ -326,7 +331,7 @@ void XMLBackgroundImageContext::ProcessAttrs(
}
XMLBackgroundImageContext::XMLBackgroundImageContext(
- SvXMLImport& rImport, sal_uInt16 nPrfx,
+ SvXMLImport& rInImport, sal_uInt16 nPrfx,
const OUString& rLName,
const Reference< xml::sax::XAttributeList > & xAttrList,
const XMLPropertyState& rProp,
@@ -334,7 +339,7 @@ XMLBackgroundImageContext::XMLBackgroundImageContext(
sal_Int32 nFilterIdx,
sal_Int32 nTransparencyIdx,
::std::vector< XMLPropertyState > &rProps ) :
- XMLElementPropertyContext( rImport, nPrfx, rLName, rProp, rProps ),
+ XMLElementPropertyContext( rInImport, nPrfx, rLName, rProp, rProps ),
aPosProp( nPosIdx ),
aFilterProp( nFilterIdx ),
aTransparencyProp( nTransparencyIdx ),
@@ -348,11 +353,11 @@ XMLBackgroundImageContext::~XMLBackgroundImageContext()
}
SvXMLImportContext *XMLBackgroundImageContext::CreateChildContext(
- sal_uInt16 nPrefix, const OUString& rLocalName,
+ sal_uInt16 nInPrefix, const OUString& rLocalName,
const Reference< xml::sax::XAttributeList > & xAttrList )
{
SvXMLImportContext *pContext = NULL;
- if( (XML_NAMESPACE_OFFICE == nPrefix) &&
+ if( (XML_NAMESPACE_OFFICE == nInPrefix) &&
xmloff::token::IsXMLToken( rLocalName,
xmloff::token::XML_BINARY_DATA ) )
{
@@ -360,14 +365,14 @@ SvXMLImportContext *XMLBackgroundImageContext::CreateChildContext(
{
xBase64Stream = GetImport().GetStreamForGraphicObjectURLFromBase64();
if( xBase64Stream.is() )
- pContext = new XMLBase64ImportContext( GetImport(), nPrefix,
+ pContext = new XMLBase64ImportContext( GetImport(), nInPrefix,
rLocalName, xAttrList,
xBase64Stream );
}
}
if( !pContext )
{
- pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
+ pContext = new SvXMLImportContext( GetImport(), nInPrefix, rLocalName );
}
return pContext;
diff --git a/binfilter/bf_xmloff/source/style/xmloff_XMLBackgroundImageExport.cxx b/binfilter/bf_xmloff/source/style/xmloff_XMLBackgroundImageExport.cxx
index 27c02d9..f875d04 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_XMLBackgroundImageExport.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_XMLBackgroundImageExport.cxx
@@ -94,6 +94,8 @@ void XMLBackgroundImageExport::exportXML( const Any& rURL,
case GraphicLocation_RIGHT_BOTTOM:
aOut.append( GetXMLToken(XML_BOTTOM) );
break;
+ default:
+ break;
}
if( aOut.getLength() )
@@ -117,6 +119,8 @@ void XMLBackgroundImageExport::exportXML( const Any& rURL,
case GraphicLocation_RIGHT_BOTTOM:
aOut.append( GetXMLToken(XML_RIGHT) );
break;
+ default:
+ break;
}
}
if( aOut.getLength() )
@@ -149,10 +153,10 @@ void XMLBackgroundImageExport::exportXML( const Any& rURL,
sal_Int8 nTransparency;
if( (*pTransparency) >>= nTransparency )
{
- OUStringBuffer aOut;
- SvXMLUnitConverter::convertPercent( aOut, nTransparency );
+ OUStringBuffer aLclOut;
+ SvXMLUnitConverter::convertPercent( aLclOut, nTransparency );
GetExport().AddAttribute( XML_NAMESPACE_DRAW, XML_TRANSPARENCY,
- aOut.makeStringAndClear() );
+ aLclOut.makeStringAndClear() );
}
}
}
diff --git a/binfilter/bf_xmloff/source/style/xmloff_XMLBitmapLogicalSizePropertyHandler.cxx b/binfilter/bf_xmloff/source/style/xmloff_XMLBitmapLogicalSizePropertyHandler.cxx
index 794a835..437ec8a 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_XMLBitmapLogicalSizePropertyHandler.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_XMLBitmapLogicalSizePropertyHandler.cxx
@@ -49,16 +49,16 @@ XMLBitmapLogicalSizePropertyHandler::~XMLBitmapLogicalSizePropertyHandler()
sal_Bool XMLBitmapLogicalSizePropertyHandler::importXML(
const OUString& rStrImpValue,
Any& rValue,
- const SvXMLUnitConverter& rUnitConverter ) const
+ const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
rValue = ::cppu::bool2any( rStrImpValue.indexOf( sal_Unicode('%') ) == -1 );
return sal_True;
}
sal_Bool XMLBitmapLogicalSizePropertyHandler::exportXML(
- OUString& rStrExpValue,
- const Any& rValue,
- const SvXMLUnitConverter& rUnitConverter ) const
+ OUString& /*rStrExpValue*/,
+ const Any& /*rValue*/,
+ const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
return sal_False;
}
diff --git a/binfilter/bf_xmloff/source/style/xmloff_XMLBitmapRepeatOffsetPropertyHandler.cxx b/binfilter/bf_xmloff/source/style/xmloff_XMLBitmapRepeatOffsetPropertyHandler.cxx
index 3fcb948..cd213a1 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_XMLBitmapRepeatOffsetPropertyHandler.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_XMLBitmapRepeatOffsetPropertyHandler.cxx
@@ -58,7 +58,7 @@ XMLBitmapRepeatOffsetPropertyHandler::~XMLBitmapRepeatOffsetPropertyHandler()
sal_Bool XMLBitmapRepeatOffsetPropertyHandler::importXML(
const OUString& rStrImpValue,
Any& rValue,
- const SvXMLUnitConverter& rUnitConverter ) const
+ const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
SvXMLTokenEnumerator aTokenEnum( rStrImpValue );
OUString aToken;
@@ -85,7 +85,7 @@ sal_Bool XMLBitmapRepeatOffsetPropertyHandler::importXML(
sal_Bool XMLBitmapRepeatOffsetPropertyHandler::exportXML(
OUString& rStrExpValue,
const Any& rValue,
- const SvXMLUnitConverter& rUnitConverter ) const
+ const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
OUStringBuffer aOut;
diff --git a/binfilter/bf_xmloff/source/style/xmloff_XMLElementPropertyContext.cxx b/binfilter/bf_xmloff/source/style/xmloff_XMLElementPropertyContext.cxx
index 707e302..9e3d875 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_XMLElementPropertyContext.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_XMLElementPropertyContext.cxx
@@ -36,14 +36,14 @@ using namespace ::rtl;
TYPEINIT1( XMLElementPropertyContext , SvXMLImportContext );
XMLElementPropertyContext::XMLElementPropertyContext (
- SvXMLImport& rImport, sal_uInt16 nPrfx,
+ SvXMLImport& rInImport, sal_uInt16 nPrfx,
const OUString& rLName,
const XMLPropertyState& rProp,
::std::vector< XMLPropertyState > &rProps ) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
- aProp( rProp ),
- rProperties( rProps ),
- bInsert( sal_False )
+ SvXMLImportContext( rInImport, nPrfx, rLName ),
+ bInsert( sal_False ),
+ rProperties( rProps ),
+ aProp( rProp )
{
}
diff --git a/binfilter/bf_xmloff/source/style/xmloff_XMLFontStylesContext.cxx b/binfilter/bf_xmloff/source/style/xmloff_XMLFontStylesContext.cxx
index 7d53aad..b308263 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_XMLFontStylesContext.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_XMLFontStylesContext.cxx
@@ -97,7 +97,7 @@ public:
TYPEINFO();
- XMLFontStyleContext_Impl( SvXMLImport& rImport, sal_uInt16 nPrfx,
+ XMLFontStyleContext_Impl( SvXMLImport& rInImport, sal_uInt16 nPrfx,
const ::rtl::OUString& rLName,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList > & xAttrList,
@@ -118,11 +118,11 @@ public:
TYPEINIT1( XMLFontStyleContext_Impl, SvXMLStyleContext );
-XMLFontStyleContext_Impl::XMLFontStyleContext_Impl( SvXMLImport& rImport,
+XMLFontStyleContext_Impl::XMLFontStyleContext_Impl( SvXMLImport& rInImport,
sal_uInt16 nPrfx, const OUString& rLName,
const Reference< XAttributeList > & xAttrList,
XMLFontStylesContext& rStyles ) :
- SvXMLStyleContext( rImport, nPrfx, rLName, xAttrList, XML_STYLE_FAMILY_FONT ),
+ SvXMLStyleContext( rInImport, nPrfx, rLName, xAttrList, XML_STYLE_FAMILY_FONT ),
xStyles( &rStyles )
{
OUString sEmpty;
@@ -212,21 +212,21 @@ void XMLFontStyleContext_Impl::FillProperties(
}
SvXMLStyleContext *XMLFontStylesContext::CreateStyleChildContext(
- sal_uInt16 nPrefix,
+ sal_uInt16 nInPrefix,
const ::rtl::OUString& rLocalName,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList > & xAttrList )
{
SvXMLStyleContext *pStyle;
- if( XML_NAMESPACE_STYLE == nPrefix &&
+ if( XML_NAMESPACE_STYLE == nInPrefix &&
IsXMLToken( rLocalName, XML_FONT_DECL ) )
{
- pStyle = new XMLFontStyleContext_Impl( GetImport(), nPrefix,
+ pStyle = new XMLFontStyleContext_Impl( GetImport(), nInPrefix,
rLocalName, xAttrList, *this );
}
else
{
- pStyle = SvXMLStylesContext::CreateStyleChildContext( nPrefix,
+ pStyle = SvXMLStylesContext::CreateStyleChildContext( nInPrefix,
rLocalName, xAttrList );
}
@@ -235,17 +235,17 @@ SvXMLStyleContext *XMLFontStylesContext::CreateStyleChildContext(
TYPEINIT1( XMLFontStylesContext, SvXMLStylesContext );
-XMLFontStylesContext::XMLFontStylesContext( SvXMLImport& rImport,
+XMLFontStylesContext::XMLFontStylesContext( SvXMLImport& rInImport,
sal_uInt16 nPrfx, const OUString& rLName,
const Reference< XAttributeList > & xAttrList,
rtl_TextEncoding eDfltEnc ) :
- SvXMLStylesContext( rImport, nPrfx, rLName, xAttrList ),
- eDfltEncoding( eDfltEnc ),
+ SvXMLStylesContext( rInImport, nPrfx, rLName, xAttrList ),
pFamilyNameHdl( new XMLFontFamilyNamePropHdl ),
pFamilyHdl( new XMLFontFamilyPropHdl ),
pPitchHdl( new XMLFontPitchPropHdl ),
pEncHdl( new XMLFontEncodingPropHdl ),
- pFontStyleAttrTokenMap( new SvXMLTokenMap(aFontStyleAttrTokenMap) )
+ pFontStyleAttrTokenMap( new SvXMLTokenMap(aFontStyleAttrTokenMap) ),
+ eDfltEncoding( eDfltEnc )
{
}
diff --git a/binfilter/bf_xmloff/source/style/xmloff_XMLFootnoteSeparatorExport.cxx b/binfilter/bf_xmloff/source/style/xmloff_XMLFootnoteSeparatorExport.cxx
index 2f7a8f2..dd090c0 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_XMLFootnoteSeparatorExport.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_XMLFootnoteSeparatorExport.cxx
@@ -109,6 +109,7 @@ void XMLFootnoteSeparatorExport::exportXML(
case CTF_PM_FTN_LINE_WEIGTH:
DBG_ASSERT( i == nIdx,
"received wrong property state index" );
+ (void)nIdx;
rState.maValue >>= nLineWeight;
break;
}
diff --git a/binfilter/bf_xmloff/source/style/xmloff_XMLFootnoteSeparatorImport.cxx b/binfilter/bf_xmloff/source/style/xmloff_XMLFootnoteSeparatorImport.cxx
index 80d5543..d7a481b 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_XMLFootnoteSeparatorImport.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_XMLFootnoteSeparatorImport.cxx
@@ -61,13 +61,13 @@ TYPEINIT1(XMLFootnoteSeparatorImport, SvXMLImportContext);
XMLFootnoteSeparatorImport::XMLFootnoteSeparatorImport(
- SvXMLImport& rImport,
- sal_uInt16 nPrefix,
+ SvXMLImport& rInImport,
+ sal_uInt16 nInPrefix,
const OUString& rLocalName,
vector<XMLPropertyState> & rProps,
const UniReference<XMLPropertySetMapper> & rMapperRef,
sal_Int32 nIndex) :
- SvXMLImportContext(rImport, nPrefix, rLocalName),
+ SvXMLImportContext(rInImport, nInPrefix, rLocalName),
rProperties(rProps),
rMapper(rMapperRef),
nPropIndex(nIndex)
@@ -103,14 +103,14 @@ void XMLFootnoteSeparatorImport::StartElement(
for(sal_Int16 nAttr = 0; nAttr < nLength; nAttr++)
{
OUString sLocalName;
- sal_uInt16 nPrefix = GetImport().GetNamespaceMap().
+ sal_uInt16 nLclPrefix = GetImport().GetNamespaceMap().
GetKeyByAttrName( xAttrList->getNameByIndex(nAttr),
&sLocalName );
OUString sAttrValue = xAttrList->getValueByIndex(nAttr);
sal_Int32 nTmp;
- if (XML_NAMESPACE_STYLE == nPrefix)
+ if (XML_NAMESPACE_STYLE == nLclPrefix)
{
if (IsXMLToken( sLocalName, XML_WIDTH ))
{
diff --git a/binfilter/bf_xmloff/source/style/xmloff_XMLIsPercentagePropertyHandler.cxx b/binfilter/bf_xmloff/source/style/xmloff_XMLIsPercentagePropertyHandler.cxx
index 4554594..869cdc7 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_XMLIsPercentagePropertyHandler.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_XMLIsPercentagePropertyHandler.cxx
@@ -45,16 +45,16 @@ XMLIsPercentagePropertyHandler::~XMLIsPercentagePropertyHandler()
sal_Bool XMLIsPercentagePropertyHandler::importXML(
const OUString& rStrImpValue,
Any& rValue,
- const SvXMLUnitConverter& rUnitConverter ) const
+ const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
rValue <<= (sal_Bool)(rStrImpValue.indexOf( sal_Unicode('%') ) != -1);
return sal_True;
}
sal_Bool XMLIsPercentagePropertyHandler::exportXML(
- OUString& rStrExpValue,
- const Any& rValue,
- const SvXMLUnitConverter& rUnitConverter ) const
+ OUString& /*rStrExpValue*/,
+ const Any& /*rValue*/,
+ const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
DBG_ERROR( "XMLIsPercentagePropertyHandler is not for export!" );
return sal_False;
diff --git a/binfilter/bf_xmloff/source/style/xmloff_XMLPageExport.cxx b/binfilter/bf_xmloff/source/style/xmloff_XMLPageExport.cxx
index c7f3fd4..8eff46c 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_XMLPageExport.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_XMLPageExport.cxx
@@ -89,8 +89,8 @@ void XMLPageExport::collectPageMasterAutoStyle(
}
void XMLPageExport::exportMasterPageContent(
- const Reference < XPropertySet > & rPropSet,
- sal_Bool bAutoStyles )
+ const Reference < XPropertySet > & /*rPropSet*/,
+ sal_Bool /*bAutoStyles*/ )
{
}
diff --git a/binfilter/bf_xmloff/source/style/xmloff_backhdl.cxx b/binfilter/bf_xmloff/source/style/xmloff_backhdl.cxx
index d444f52..82de391 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_backhdl.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_backhdl.cxx
@@ -151,7 +151,7 @@ sal_Bool XMLBackGraphicPositionPropHdl::importXML( const OUString& rStrImpValue,
return bRet;
}
-sal_Bool XMLBackGraphicPositionPropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const
+sal_Bool XMLBackGraphicPositionPropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
sal_Bool bRet = sal_True;
OUStringBuffer aOut;
@@ -190,6 +190,8 @@ sal_Bool XMLBackGraphicPositionPropHdl::exportXML( OUString& rStrExpValue, const
aOut.append( GetXMLToken(XML_BOTTOM) );
bRet = sal_True;
break;
+ default:
+ break;
}
if( bRet )
@@ -213,6 +215,8 @@ sal_Bool XMLBackGraphicPositionPropHdl::exportXML( OUString& rStrExpValue, const
case style::GraphicLocation_RIGHT_BOTTOM:
aOut.append( GetXMLToken(XML_RIGHT) );
break;
+ default:
+ break;
}
}
}
@@ -252,6 +256,9 @@ void XMLBackGraphicPositionPropHdl::MergeXMLVertPos( style::GraphicLocation& ePo
style::GraphicLocation_RIGHT_MIDDLE :
style::GraphicLocation_RIGHT_BOTTOM);
break;
+
+ default:
+ break;
}
}
@@ -287,6 +294,8 @@ void XMLBackGraphicPositionPropHdl::MergeXMLHoriPos( style::GraphicLocation& ePo
style::GraphicLocation_MIDDLE_BOTTOM :
style::GraphicLocation_RIGHT_BOTTOM);
break;
+ default:
+ break;
}
}
diff --git a/binfilter/bf_xmloff/source/style/xmloff_breakhdl.cxx b/binfilter/bf_xmloff/source/style/xmloff_breakhdl.cxx
index 162e94f..4b27a08 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_breakhdl.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_breakhdl.cxx
@@ -109,7 +109,7 @@ sal_Bool XMLFmtBreakBeforePropHdl::exportXML( OUString& rStrExpValue, const uno:
}
OUStringBuffer aOut;
- sal_Bool bOk = rUnitConverter.convertEnum( aOut, nEnum, pXML_BreakTypes );
+ rUnitConverter.convertEnum( aOut, nEnum, pXML_BreakTypes );
rStrExpValue = aOut.makeStringAndClear();
return sal_True;
@@ -172,7 +172,7 @@ sal_Bool XMLFmtBreakAfterPropHdl::exportXML( OUString& rStrExpValue, const uno::
}
OUStringBuffer aOut;
- sal_Bool bOk = rUnitConverter.convertEnum( aOut, nEnum, pXML_BreakTypes );
+ rUnitConverter.convertEnum( aOut, nEnum, pXML_BreakTypes );
rStrExpValue = aOut.makeStringAndClear();
return sal_True;
diff --git a/binfilter/bf_xmloff/source/style/xmloff_chrhghdl.cxx b/binfilter/bf_xmloff/source/style/xmloff_chrhghdl.cxx
index 1abb676..64697f5 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_chrhghdl.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_chrhghdl.cxx
@@ -56,7 +56,7 @@ XMLCharHeightHdl::~XMLCharHeightHdl()
// nothing to do
}
-sal_Bool XMLCharHeightHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const
+sal_Bool XMLCharHeightHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
double fSize;
@@ -73,7 +73,7 @@ sal_Bool XMLCharHeightHdl::importXML( const OUString& rStrImpValue, uno::Any& rV
return sal_False;
}
-sal_Bool XMLCharHeightHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const
+sal_Bool XMLCharHeightHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
OUStringBuffer aOut;
@@ -139,7 +139,7 @@ XMLCharHeightDiffHdl::~XMLCharHeightDiffHdl()
// nothing to do
}
-sal_Bool XMLCharHeightDiffHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const
+sal_Bool XMLCharHeightDiffHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
sal_Int32 nRel = 0;
@@ -152,7 +152,7 @@ sal_Bool XMLCharHeightDiffHdl::importXML( const OUString& rStrImpValue, uno::Any
return sal_False;
}
-sal_Bool XMLCharHeightDiffHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const
+sal_Bool XMLCharHeightDiffHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
OUStringBuffer aOut;
diff --git a/binfilter/bf_xmloff/source/style/xmloff_chrlohdl.cxx b/binfilter/bf_xmloff/source/style/xmloff_chrlohdl.cxx
index 2aa0bec..44f95b2 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_chrlohdl.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_chrlohdl.cxx
@@ -68,7 +68,7 @@ sal_Bool XMLCharLanguageHdl::equals( const ::com::sun::star::uno::Any& r1, const
return bRet;
}
-sal_Bool XMLCharLanguageHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const
+sal_Bool XMLCharLanguageHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
lang::Locale aLocale;
@@ -81,7 +81,7 @@ sal_Bool XMLCharLanguageHdl::importXML( const OUString& rStrImpValue, uno::Any&
return sal_True;
}
-sal_Bool XMLCharLanguageHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const
+sal_Bool XMLCharLanguageHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
lang::Locale aLocale;
if(!(rValue >>= aLocale))
@@ -116,7 +116,7 @@ sal_Bool XMLCharCountryHdl::equals( const ::com::sun::star::uno::Any& r1, const
return bRet;
}
-sal_Bool XMLCharCountryHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const
+sal_Bool XMLCharCountryHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
lang::Locale aLocale;
@@ -129,7 +129,7 @@ sal_Bool XMLCharCountryHdl::importXML( const OUString& rStrImpValue, uno::Any& r
return sal_True;
}
-sal_Bool XMLCharCountryHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const
+sal_Bool XMLCharCountryHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
lang::Locale aLocale;
if(!(rValue >>= aLocale))
diff --git a/binfilter/bf_xmloff/source/style/xmloff_csmaphdl.cxx b/binfilter/bf_xmloff/source/style/xmloff_csmaphdl.cxx
index 6795243..86464ca 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_csmaphdl.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_csmaphdl.cxx
@@ -98,7 +98,7 @@ XMLCaseMapVariantHdl::~XMLCaseMapVariantHdl()
// nothing to do
}
-sal_Bool XMLCaseMapVariantHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const
+sal_Bool XMLCaseMapVariantHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
sal_Bool bRet = sal_False;
@@ -116,7 +116,7 @@ sal_Bool XMLCaseMapVariantHdl::importXML( const OUString& rStrImpValue, uno::Any
return bRet;
}
-sal_Bool XMLCaseMapVariantHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const
+sal_Bool XMLCaseMapVariantHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
sal_uInt16 nValue;
OUStringBuffer aOut;
diff --git a/binfilter/bf_xmloff/source/style/xmloff_durationhdl.cxx b/binfilter/bf_xmloff/source/style/xmloff_durationhdl.cxx
index 305be95..a412339 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_durationhdl.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_durationhdl.cxx
@@ -46,7 +46,7 @@ using namespace ::com::sun::star::util;
sal_Bool XMLDurationMS16PropHdl_Impl::importXML(
const OUString& rStrImpValue,
Any& rValue,
- const SvXMLUnitConverter& rUnitConverter ) const
+ const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
DateTime aTime;
if( !SvXMLUnitConverter::convertTime( aTime, rStrImpValue ) )
@@ -61,7 +61,7 @@ sal_Bool XMLDurationMS16PropHdl_Impl::importXML(
sal_Bool XMLDurationMS16PropHdl_Impl::exportXML(
OUString& rStrExpValue,
const Any& rValue,
- const SvXMLUnitConverter& rUnitConverter ) const
+ const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
sal_Int16 nMS;
diff --git a/binfilter/bf_xmloff/source/style/xmloff_escphdl.cxx b/binfilter/bf_xmloff/source/style/xmloff_escphdl.cxx
index 3819b2f..82da887 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_escphdl.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_escphdl.cxx
@@ -58,7 +58,6 @@ XMLEscapementPropHdl::~XMLEscapementPropHdl()
sal_Bool XMLEscapementPropHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const
{
- sal_Bool bRet = sal_False;
sal_Int16 nVal;
SvXMLTokenEnumerator aTokens( rStrImpValue );
@@ -90,7 +89,6 @@ sal_Bool XMLEscapementPropHdl::importXML( const OUString& rStrImpValue, uno::Any
sal_Bool XMLEscapementPropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const
{
- sal_Bool bRet = sal_False;
sal_Int32 nValue;
OUStringBuffer aOut;
diff --git a/binfilter/bf_xmloff/source/style/xmloff_tabsthdl.cxx b/binfilter/bf_xmloff/source/style/xmloff_tabsthdl.cxx
index 633dad3..5734ddd 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_tabsthdl.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_tabsthdl.cxx
@@ -82,12 +82,12 @@ sal_Bool XMLTabStopPropHdl::equals( const uno::Any& r1, const uno::Any& r2 ) con
return bEqual;
}
-sal_Bool XMLTabStopPropHdl::importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const
+sal_Bool XMLTabStopPropHdl::importXML( const ::rtl::OUString& /*rStrImpValue*/, ::com::sun::star::uno::Any& /*rValue*/, const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
return sal_False;
}
-sal_Bool XMLTabStopPropHdl::exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const
+sal_Bool XMLTabStopPropHdl::exportXML( ::rtl::OUString& /*rStrExpValue*/, const ::com::sun::star::uno::Any& /*rValue*/, const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
return sal_False;
}
diff --git a/binfilter/bf_xmloff/source/style/xmloff_xmlaustp.cxx b/binfilter/bf_xmloff/source/style/xmloff_xmlaustp.cxx
index fef9ed1..58edc8d 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_xmlaustp.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_xmlaustp.cxx
@@ -66,12 +66,12 @@ namespace
}
void SvXMLAutoStylePoolP::exportStyleAttributes(
- SvXMLAttributeList& rAttrList,
+ SvXMLAttributeList& /*rAttrList*/,
sal_Int32 nFamily,
const vector< XMLPropertyState >& rProperties,
const SvXMLExportPropertyMapper& rPropExp,
- const SvXMLUnitConverter& rUnitConverter,
- const SvXMLNamespaceMap& rNamespaceMap
+ const SvXMLUnitConverter& /*rUnitConverter*/,
+ const SvXMLNamespaceMap& /*rNamespaceMap*/
) const
{
if ( XML_STYLE_FAMILY_CONTROL_ID == nFamily )
@@ -182,12 +182,12 @@ void SvXMLAutoStylePoolP::exportStyleAttributes(
}
void SvXMLAutoStylePoolP::exportStyleContent(
- const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > & rHandler,
+ const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > & /*rHandler*/,
sal_Int32 nFamily,
const vector< XMLPropertyState >& rProperties,
const SvXMLExportPropertyMapper& rPropExp,
- const SvXMLUnitConverter& rUnitConverter,
- const SvXMLNamespaceMap& rNamespaceMap
+ const SvXMLUnitConverter& /*rUnitConverter*/,
+ const SvXMLNamespaceMap& /*rNamespaceMap*/
) const
{
if( nFamily == XML_STYLE_FAMILY_PAGE_MASTER )
@@ -344,9 +344,9 @@ OUString SvXMLAutoStylePoolP::Find( sal_Int32 nFamily,
}
void SvXMLAutoStylePoolP::exportXML( sal_Int32 nFamily,
- const uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > & rHandler,
- const SvXMLUnitConverter& rUnitConverter,
- const SvXMLNamespaceMap& rNamespaceMap
+ const uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > & /*rHandler*/,
+ const SvXMLUnitConverter& /*rUnitConverter*/,
+ const SvXMLNamespaceMap& /*rNamespaceMap*/
) const
{
pImpl->exportXML( nFamily,
diff --git a/binfilter/bf_xmloff/source/style/xmloff_xmlnumfe.cxx b/binfilter/bf_xmloff/source/style/xmloff_xmlnumfe.cxx
index f583909..36d8de6 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_xmlnumfe.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_xmlnumfe.cxx
@@ -227,12 +227,12 @@ void SvXMLNumUsedList_Impl::SetWasUsed(const uno::Sequence<sal_Int32>& rWasUsed)
SvXMLNumFmtExport::SvXMLNumFmtExport(
SvXMLExport& rExp,
- const uno::Reference< util::XNumberFormatsSupplier >& rSupp ) :
- rExport( rExp ),
- pFormatter( NULL ),
- pCharClass( NULL ),
- pLocaleData( NULL ),
- sPrefix( OUString( RTL_CONSTASCII_USTRINGPARAM( "N" )) )
+ const uno::Reference< util::XNumberFormatsSupplier >& rSupp )
+ : rExport( rExp )
+ , sPrefix( OUString( RTL_CONSTASCII_USTRINGPARAM( "N" )) )
+ , pFormatter( NULL )
+ , pCharClass( NULL )
+ , pLocaleData( NULL )
{
// supplier must be SvNumberFormatsSupplierObj
SvNumberFormatsSupplierObj* pObj =
@@ -265,12 +265,12 @@ SvXMLNumFmtExport::SvXMLNumFmtExport(
SvXMLExport& rExp,
const ::com::sun::star::uno::Reference<
::com::sun::star::util::XNumberFormatsSupplier >& rSupp,
- const ::rtl::OUString& rPrefix ) :
- rExport( rExp ),
- pFormatter( NULL ),
- pCharClass( NULL ),
- pLocaleData( NULL ),
- sPrefix( rPrefix )
+ const ::rtl::OUString& rPrefix )
+ : rExport( rExp )
+ , sPrefix( rPrefix )
+ , pFormatter( NULL )
+ , pCharClass( NULL )
+ , pLocaleData( NULL )
{
// supplier must be SvNumberFormatsSupplierObj
SvNumberFormatsSupplierObj* pObj =
@@ -1602,6 +1602,7 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt
case NUMBERFORMAT_OP_LE: eOp3 = NUMBERFORMAT_OP_GT; break;
case NUMBERFORMAT_OP_GT: eOp3 = NUMBERFORMAT_OP_LE; break;
case NUMBERFORMAT_OP_GE: eOp3 = NUMBERFORMAT_OP_LT; break;
+ default: break;
}
if ( fLimit1 == fLimit2 &&
@@ -1665,11 +1666,10 @@ void SvXMLNumFmtExport::Export( sal_Bool bIsAutoStyle )
return; // no formatter -> no entries
sal_uInt32 nKey;
- const SvNumberformat* pFormat = NULL;
sal_Bool bNext(pUsedList->GetFirstUsed(nKey));
while(bNext)
{
- pFormat = pFormatter->GetEntry(nKey);
+ const SvNumberformat* pFormat = pFormatter->GetEntry(nKey);
if(pFormat)
ExportFormat_Impl( *pFormat, nKey );
bNext = pUsedList->GetNextUsed(nKey);
@@ -1689,14 +1689,14 @@ void SvXMLNumFmtExport::Export( sal_Bool bIsAutoStyle )
SvNumberformat* pFormat = rTable.First();
while (pFormat)
{
- sal_uInt32 nKey(rTable.GetCurKey());
- if (!pUsedList->IsUsed(nKey))
+ sal_uInt32 nLclKey(rTable.GetCurKey());
+ if (!pUsedList->IsUsed(nLclKey))
{
DBG_ASSERT((pFormat->GetType() & NUMBERFORMAT_DEFINED) != 0, "a not user defined numberformat found");
// user-defined and used formats are exported
- ExportFormat_Impl( *pFormat, nKey );
+ ExportFormat_Impl( *pFormat, nLclKey );
// if it is a user-defined Format it will be added else nothing will hapen
- pUsedList->SetUsed(nKey);
+ pUsedList->SetUsed(nLclKey);
}
pFormat = rTable.Next();
diff --git a/binfilter/bf_xmloff/source/style/xmloff_xmlnumi.cxx b/binfilter/bf_xmloff/source/style/xmloff_xmlnumi.cxx
index 4f91be9..a75d00e 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_xmlnumi.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_xmlnumi.cxx
@@ -789,7 +789,7 @@ SvxXMLListLevelStyleAttrContext_Impl::SvxXMLListLevelStyleAttrContext_Impl(
if( sFontFamilyGeneric.getLength() &&
aFamilyHdl.importXML( sFontFamilyGeneric, aAny, rUnitConv ) )
{
- sal_Int16 nTmp;
+ sal_Int16 nTmp(0);
aAny >>= nTmp;
rListLevel.SetBulletFontFamily( nTmp );
}
@@ -801,7 +801,7 @@ SvxXMLListLevelStyleAttrContext_Impl::SvxXMLListLevelStyleAttrContext_Impl(
if( sFontPitch.getLength() &&
aPitchHdl.importXML( sFontPitch, aAny, rUnitConv ) )
{
- sal_Int16 nTmp;
+ sal_Int16 nTmp(0);
aAny >>= nTmp;
rListLevel.SetBulletFontPitch( nTmp );
}
@@ -810,7 +810,7 @@ SvxXMLListLevelStyleAttrContext_Impl::SvxXMLListLevelStyleAttrContext_Impl(
if( sFontCharset.getLength() &&
aEncHdl.importXML( sFontCharset, aAny, rUnitConv ) )
{
- sal_Int16 nTmp;
+ sal_Int16 nTmp(0);
aAny >>= nTmp;
rListLevel.SetBulletFontEncoding( nTmp );
}
diff --git a/binfilter/bf_xmloff/source/style/xmloff_xmlstyle.cxx b/binfilter/bf_xmloff/source/style/xmloff_xmlstyle.cxx
index 4abbf5e..6c24c1c 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_xmlstyle.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_xmlstyle.cxx
@@ -161,11 +161,11 @@ SvXMLStyleContext::~SvXMLStyleContext()
{
}
-SvXMLImportContext *SvXMLStyleContext::CreateChildContext( sal_uInt16 nPrefix,
+SvXMLImportContext *SvXMLStyleContext::CreateChildContext( sal_uInt16 nInPrefix,
const OUString& rLocalName,
- const uno::Reference< xml::sax::XAttributeList > & xAttrList )
+ const uno::Reference< xml::sax::XAttributeList > & /*xAttrList*/ )
{
- return new SvXMLImportContext( GetImport(), nPrefix, rLocalName );;
+ return new SvXMLImportContext( GetImport(), nInPrefix, rLocalName );;
}
void SvXMLStyleContext::StartElement( const uno::Reference< xml::sax::XAttributeList > & xAttrList )
@@ -174,11 +174,11 @@ void SvXMLStyleContext::StartElement( const uno::Reference< xml::sax::XAttribute
for( sal_Int16 i=0; i < nAttrCount; i++ )
{
const OUString& rAttrName = xAttrList->getNameByIndex( i );
- OUString aLocalName;
- sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( rAttrName, &aLocalName );
+ OUString aLclLocalName;
+ sal_uInt16 nLclPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( rAttrName, &aLclLocalName );
const OUString& rValue = xAttrList->getValueByIndex( i );
- SetAttribute( nPrefix, aLocalName, rValue );
+ SetAttribute( nLclPrefix, aLclLocalName, rValue );
}
}
@@ -186,15 +186,15 @@ void SvXMLStyleContext::SetDefaults()
{
}
-void SvXMLStyleContext::CreateAndInsert( sal_Bool bOverwrite )
+void SvXMLStyleContext::CreateAndInsert( sal_Bool /*bOverwrite*/ )
{
}
-void SvXMLStyleContext::CreateAndInsertLate( sal_Bool bOverwrite )
+void SvXMLStyleContext::CreateAndInsertLate( sal_Bool /*bOverwrite*/ )
{
}
-void SvXMLStyleContext::Finish( sal_Bool bOverwrite )
+void SvXMLStyleContext::Finish( sal_Bool /*bOverwrite*/ )
{
}
@@ -403,7 +403,7 @@ const SvXMLStyleContext *SvXMLStylesContext::GetStyle( sal_uInt32 i ) const
}
SvXMLStyleContext *SvXMLStylesContext::CreateStyleChildContext(
- sal_uInt16 nPrefix,
+ sal_uInt16 nInPrefix,
const OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList > & xAttrList )
{
@@ -411,14 +411,14 @@ SvXMLStyleContext *SvXMLStylesContext::CreateStyleChildContext(
if(GetImport().GetDataStylesImport())
{
- pStyle = GetImport().GetDataStylesImport()->CreateChildContext(GetImport(), nPrefix,
+ pStyle = GetImport().GetDataStylesImport()->CreateChildContext(GetImport(), nInPrefix,
rLocalName, xAttrList, *this);
}
if (!pStyle)
{
const SvXMLTokenMap& rTokenMap = GetStyleStylesElemTokenMap();
- sal_uInt16 nToken = rTokenMap.Get( nPrefix, rLocalName );
+ sal_uInt16 nToken = rTokenMap.Get( nInPrefix, rLocalName );
switch( nToken )
{
case XML_TOK_STYLE_STYLE:
@@ -429,12 +429,12 @@ SvXMLStyleContext *SvXMLStylesContext::CreateStyleChildContext(
for( sal_Int16 i=0; i < nAttrCount; i++ )
{
const OUString& rAttrName = xAttrList->getNameByIndex( i );
- OUString aLocalName;
- sal_uInt16 nPrefix =
+ OUString aLclLocalName;
+ sal_uInt16 nLclPrefix =
GetImport().GetNamespaceMap().GetKeyByAttrName( rAttrName,
- &aLocalName );
- if( XML_NAMESPACE_STYLE == nPrefix &&
- IsXMLToken( aLocalName, XML_FAMILY ) )
+ &aLclLocalName );
+ if( XML_NAMESPACE_STYLE == nLclPrefix &&
+ IsXMLToken( aLclLocalName, XML_FAMILY ) )
{
const OUString& rValue = xAttrList->getValueByIndex( i );
nFamily = GetFamily( rValue );
@@ -442,69 +442,69 @@ SvXMLStyleContext *SvXMLStylesContext::CreateStyleChildContext(
}
}
pStyle = XML_TOK_STYLE_STYLE==nToken
- ? CreateStyleStyleChildContext( nFamily, nPrefix,
+ ? CreateStyleStyleChildContext( nFamily, nInPrefix,
rLocalName, xAttrList )
- : CreateDefaultStyleStyleChildContext( nFamily, nPrefix,
+ : CreateDefaultStyleStyleChildContext( nFamily, nInPrefix,
rLocalName, xAttrList );
}
break;
case XML_TOK_STYLE_PAGE_MASTER:
{
- pStyle = new PageStyleContext( GetImport(), nPrefix,
+ pStyle = new PageStyleContext( GetImport(), nInPrefix,
rLocalName, xAttrList, *this );
}
break;
case XML_TOK_TEXT_LIST_STYLE:
- pStyle = new SvxXMLListStyleContext( GetImport(), nPrefix,
+ pStyle = new SvxXMLListStyleContext( GetImport(), nInPrefix,
rLocalName, xAttrList );
break;
case XML_TOK_TEXT_OUTLINE:
- pStyle = new SvxXMLListStyleContext( GetImport(), nPrefix,
+ pStyle = new SvxXMLListStyleContext( GetImport(), nInPrefix,
rLocalName, xAttrList, sal_True );
break;
case XML_TOK_TEXT_FOOTNOTE_CONFIG:
#ifndef SVX_LIGHT
pStyle = new XMLFootnoteConfigurationImportContext(GetImport(),
- nPrefix,
+ nInPrefix,
rLocalName,
xAttrList,
sal_False);
#else
// create default context to skip content
- pStyle = new SvXMLStyleContext( GetImport(), nPrefix, rLocalName, xAttrList );
+ pStyle = new SvXMLStyleContext( GetImport(), nInPrefix, rLocalName, xAttrList );
#endif // #ifndef SVX_LIGHT
break;
case XML_TOK_TEXT_ENDNOTE_CONFIG:
#ifndef SVX_LIGHT
pStyle = new XMLFootnoteConfigurationImportContext(GetImport(),
- nPrefix,
+ nInPrefix,
rLocalName,
xAttrList,
sal_True);
#else
// create default context to skip content
- pStyle = new SvXMLStyleContext( GetImport(), nPrefix, rLocalName, xAttrList );
+ pStyle = new SvXMLStyleContext( GetImport(), nInPrefix, rLocalName, xAttrList );
#endif // #ifndef SVX_LIGHT
break;
case XML_TOK_TEXT_BIBLIOGRAPHY_CONFIG:
#ifndef SVX_LIGHT
pStyle = new XMLIndexBibliographyConfigurationContext(
- GetImport(), nPrefix, rLocalName, xAttrList);
+ GetImport(), nInPrefix, rLocalName, xAttrList);
#else
// create default context to skip content
- pStyle = new SvXMLStyleContext( GetImport(), nPrefix, rLocalName, xAttrList );
+ pStyle = new SvXMLStyleContext( GetImport(), nInPrefix, rLocalName, xAttrList );
#endif // #ifndef SVX_LIGHT
break;
case XML_TOK_TEXT_LINENUMBERING_CONFIG:
#ifndef SVX_LIGHT
pStyle = new XMLLineNumberingImportContext(
- GetImport(), nPrefix, rLocalName, xAttrList);
+ GetImport(), nInPrefix, rLocalName, xAttrList);
#else
// create default context to skip content
- pStyle = new SvXMLStyleContext( GetImport(), nPrefix, rLocalName, xAttrList );
+ pStyle = new SvXMLStyleContext( GetImport(), nInPrefix, rLocalName, xAttrList );
#endif // #ifndef SVX_LIGHT
break;
@@ -513,32 +513,32 @@ SvXMLStyleContext *SvXMLStylesContext::CreateStyleChildContext(
//
case XML_TOK_STYLES_GRADIENTSTYLES:
{
- pStyle = new XMLGradientStyleContext( GetImport(), nPrefix, rLocalName, xAttrList );
+ pStyle = new XMLGradientStyleContext( GetImport(), nInPrefix, rLocalName, xAttrList );
break;
}
case XML_TOK_STYLES_HATCHSTYLES:
{
- pStyle = new XMLHatchStyleContext( GetImport(), nPrefix, rLocalName, xAttrList );
+ pStyle = new XMLHatchStyleContext( GetImport(), nInPrefix, rLocalName, xAttrList );
break;
}
case XML_TOK_STYLES_BITMAPSTYLES:
{
- pStyle = new XMLBitmapStyleContext( GetImport(), nPrefix, rLocalName, xAttrList );
+ pStyle = new XMLBitmapStyleContext( GetImport(), nInPrefix, rLocalName, xAttrList );
break;
}
case XML_TOK_STYLES_TRANSGRADIENTSTYLES:
{
- pStyle = new XMLTransGradientStyleContext( GetImport(), nPrefix, rLocalName, xAttrList );
+ pStyle = new XMLTransGradientStyleContext( GetImport(), nInPrefix, rLocalName, xAttrList );
break;
}
case XML_TOK_STYLES_MARKERSTYLES:
{
- pStyle = new XMLMarkerStyleContext( GetImport(), nPrefix, rLocalName, xAttrList );
+ pStyle = new XMLMarkerStyleContext( GetImport(), nInPrefix, rLocalName, xAttrList );
break;
}
case XML_TOK_STYLES_DASHSTYLES:
{
- pStyle = new XMLDashStyleContext( GetImport(), nPrefix, rLocalName, xAttrList );
+ pStyle = new XMLDashStyleContext( GetImport(), nInPrefix, rLocalName, xAttrList );
break;
}
}
@@ -548,7 +548,7 @@ SvXMLStyleContext *SvXMLStylesContext::CreateStyleChildContext(
}
SvXMLStyleContext *SvXMLStylesContext::CreateStyleStyleChildContext(
- sal_uInt16 nFamily, sal_uInt16 nPrefix, const OUString& rLocalName,
+ sal_uInt16 nFamily, sal_uInt16 nInPrefix, const OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList > & xAttrList )
{
SvXMLStyleContext *pStyle = 0;
@@ -558,33 +558,33 @@ SvXMLStyleContext *SvXMLStylesContext::CreateStyleStyleChildContext(
case XML_STYLE_FAMILY_TEXT_PARAGRAPH:
case XML_STYLE_FAMILY_TEXT_TEXT:
case XML_STYLE_FAMILY_TEXT_SECTION:
- pStyle = new XMLTextStyleContext( GetImport(), nPrefix, rLocalName,
+ pStyle = new XMLTextStyleContext( GetImport(), nInPrefix, rLocalName,
xAttrList, *this, nFamily );
break;
case XML_STYLE_FAMILY_CONTROL_ID:
pStyle = const_cast< SvXMLImport& >( GetImport() ).GetFormImport()->createControlStyleContext(
- nPrefix, rLocalName, xAttrList, *this, nFamily );
+ nInPrefix, rLocalName, xAttrList, *this, nFamily );
break;
case XML_STYLE_FAMILY_TEXT_RUBY:
- pStyle = new XMLPropStyleContext( GetImport(), nPrefix, rLocalName,
+ pStyle = new XMLPropStyleContext( GetImport(), nInPrefix, rLocalName,
xAttrList, *this, nFamily );
break;
case XML_STYLE_FAMILY_SCH_CHART_ID:
#ifndef SVX_LIGHT
- pStyle = new XMLChartStyleContext( GetImport(), nPrefix, rLocalName,
+ pStyle = new XMLChartStyleContext( GetImport(), nInPrefix, rLocalName,
xAttrList, *this, nFamily );
#else
// create default context to skip content
- pStyle = new SvXMLStyleContext( GetImport(), nPrefix, rLocalName, xAttrList, nFamily );
+ pStyle = new SvXMLStyleContext( GetImport(), nInPrefix, rLocalName, xAttrList, nFamily );
#endif
break;
case XML_STYLE_FAMILY_SD_GRAPHICS_ID:
case XML_STYLE_FAMILY_SD_PRESENTATION_ID:
case XML_STYLE_FAMILY_SD_POOL_ID:
- pStyle = new XMLShapeStyleContext( GetImport(), nPrefix, rLocalName,
+ pStyle = new XMLShapeStyleContext( GetImport(), nInPrefix, rLocalName,
xAttrList, *this, nFamily );
}
@@ -592,8 +592,8 @@ SvXMLStyleContext *SvXMLStylesContext::CreateStyleStyleChildContext(
}
SvXMLStyleContext *SvXMLStylesContext::CreateDefaultStyleStyleChildContext(
- sal_uInt16 nFamily, sal_uInt16 nPrefix, const OUString& rLocalName,
- const uno::Reference< xml::sax::XAttributeList > & xAttrList )
+ sal_uInt16 /*nFamily*/, sal_uInt16 /*nInPrefix*/, const OUString& /*rLocalName*/,
+ const uno::Reference< xml::sax::XAttributeList > & /*xAttrList*/ )
{
return 0;
}
@@ -818,25 +818,25 @@ OUString SvXMLStylesContext::GetServiceName( sal_uInt16 nFamily ) const
}
-SvXMLStylesContext::SvXMLStylesContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
+SvXMLStylesContext::SvXMLStylesContext( SvXMLImport& rInImport, sal_uInt16 nPrfx,
const OUString& rLName,
- const uno::Reference< xml::sax::XAttributeList > & xAttrList) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
- pImpl( new SvXMLStylesContext_Impl ),
- pStyleStylesElemTokenMap( 0 ),
- sParaStyleServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.style.ParagraphStyle" ) ),
- sTextStyleServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.style.CharacterStyle" ) )
+ const uno::Reference< xml::sax::XAttributeList > & xAttrList)
+ : SvXMLImportContext( rInImport, nPrfx, rLName )
+ , sParaStyleServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.style.ParagraphStyle" ) )
+ , sTextStyleServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.style.CharacterStyle" ) )
+ , pImpl( new SvXMLStylesContext_Impl )
+ , pStyleStylesElemTokenMap( 0 )
{
sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
for( sal_Int16 i=0; i < nAttrCount; i++ )
{
const OUString& rAttrName = xAttrList->getNameByIndex( i );
- OUString aLocalName;
- sal_uInt16 nPrefix =
+ OUString aLclLocalName;
+ sal_uInt16 nLclPrefix =
GetImport().GetNamespaceMap().GetKeyByAttrName( rAttrName,
- &aLocalName );
- if( XML_NAMESPACE_NONE == nPrefix &&
- IsXMLToken( aLocalName, XML_ID ) )
+ &aLclLocalName );
+ if( XML_NAMESPACE_NONE == nLclPrefix &&
+ IsXMLToken( aLclLocalName, XML_ID ) )
{
pImpl->SetId( xAttrList->getValueByIndex( i ) );
}
@@ -850,24 +850,24 @@ SvXMLStylesContext::~SvXMLStylesContext()
delete pImpl;
}
-SvXMLImportContext *SvXMLStylesContext::CreateChildContext( sal_uInt16 nPrefix,
+SvXMLImportContext *SvXMLStylesContext::CreateChildContext( sal_uInt16 nInPrefix,
const OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList > & xAttrList )
{
SvXMLImportContext *pContext = 0;
- if( XML_NAMESPACE_OFFICE == nPrefix &&
+ if( XML_NAMESPACE_OFFICE == nInPrefix &&
IsXMLToken( rLocalName, XML_USE_STYLES ) )
{
OUString sHRef;
- pContext = new SvXMLUseStylesContext( GetImport(), nPrefix, rLocalName,
+ pContext = new SvXMLUseStylesContext( GetImport(), nInPrefix, rLocalName,
xAttrList, sHRef );
pImpl->SetParentHRef( sHRef );
}
else
{
SvXMLStyleContext *pStyle =
- CreateStyleChildContext( nPrefix, rLocalName, xAttrList );
+ CreateStyleChildContext( nInPrefix, rLocalName, xAttrList );
// DBG_ASSERT( pStyle->GetFamily(), "Style without a family" );
if( pStyle )
{
@@ -877,7 +877,7 @@ SvXMLImportContext *SvXMLStylesContext::CreateChildContext( sal_uInt16 nPrefix,
}
else
{
- pContext = new SvXMLImportContext( GetImport(), nPrefix,
+ pContext = new SvXMLImportContext( GetImport(), nInPrefix,
rLocalName );
}
}
@@ -969,12 +969,12 @@ SvXMLUseStylesContext::SvXMLUseStylesContext(
for( sal_Int16 i=0; i < nAttrCount; i++ )
{
const OUString& rAttrName = xAttrList->getNameByIndex( i );
- OUString aLocalName;
- sal_uInt16 nPrefix =
+ OUString aLclLocalName;
+ sal_uInt16 nLclPrefix =
GetImport().GetNamespaceMap().GetKeyByAttrName( rAttrName,
- &aLocalName );
- if( XML_NAMESPACE_XLINK == nPrefix &&
- IsXMLToken( aLocalName, XML_HREF ) )
+ &aLclLocalName );
+ if( XML_NAMESPACE_XLINK == nLclPrefix &&
+ IsXMLToken( aLclLocalName, XML_HREF ) )
{
rHRef = xAttrList->getValueByIndex( i );
// TODO: Hack!
diff --git a/binfilter/inc/bf_xmloff/PageMasterStyleMap.hxx b/binfilter/inc/bf_xmloff/PageMasterStyleMap.hxx
index 506a119..00613af 100644
--- a/binfilter/inc/bf_xmloff/PageMasterStyleMap.hxx
+++ b/binfilter/inc/bf_xmloff/PageMasterStyleMap.hxx
@@ -77,14 +77,14 @@ namespace binfilter {
#define CTF_PM_PADDINGRIGHT (XML_PM_CTF_START + 0x000F)
#define CTF_PM_TEXTCOLUMNS (XML_PM_CTF_START + 0x0010)
#define CTF_PM_REGISTER_STYLE (XML_PM_CTF_START + 0x0011)
-#define CTF_PM_PRINT_ANNOTATIONS (CTF_PM_PRINTMASK|XML_PM_CTF_START + 0x0012)
-#define CTF_PM_PRINT_CHARTS (CTF_PM_PRINTMASK|XML_PM_CTF_START + 0x0013)
-#define CTF_PM_PRINT_DRAWING (CTF_PM_PRINTMASK|XML_PM_CTF_START + 0x0014)
-#define CTF_PM_PRINT_FORMULAS (CTF_PM_PRINTMASK|XML_PM_CTF_START + 0x0015)
-#define CTF_PM_PRINT_GRID (CTF_PM_PRINTMASK|XML_PM_CTF_START + 0x0016)
-#define CTF_PM_PRINT_HEADERS (CTF_PM_PRINTMASK|XML_PM_CTF_START + 0x0017)
-#define CTF_PM_PRINT_OBJECTS (CTF_PM_PRINTMASK|XML_PM_CTF_START + 0x0018)
-#define CTF_PM_PRINT_ZEROVALUES (CTF_PM_PRINTMASK|XML_PM_CTF_START + 0x0019)
+#define CTF_PM_PRINT_ANNOTATIONS (CTF_PM_PRINTMASK|(XML_PM_CTF_START + 0x0012))
+#define CTF_PM_PRINT_CHARTS (CTF_PM_PRINTMASK|(XML_PM_CTF_START + 0x0013))
+#define CTF_PM_PRINT_DRAWING (CTF_PM_PRINTMASK|(XML_PM_CTF_START + 0x0014))
+#define CTF_PM_PRINT_FORMULAS (CTF_PM_PRINTMASK|(XML_PM_CTF_START + 0x0015))
+#define CTF_PM_PRINT_GRID (CTF_PM_PRINTMASK|(XML_PM_CTF_START + 0x0016))
+#define CTF_PM_PRINT_HEADERS (CTF_PM_PRINTMASK|(XML_PM_CTF_START + 0x0017))
+#define CTF_PM_PRINT_OBJECTS (CTF_PM_PRINTMASK|(XML_PM_CTF_START + 0x0018))
+#define CTF_PM_PRINT_ZEROVALUES (CTF_PM_PRINTMASK|(XML_PM_CTF_START + 0x0019))
#define CTF_PM_PAGEUSAGE (XML_PM_CTF_START + 0x0031)
#define CTF_PM_GRAPHICPOSITION (XML_PM_CTF_START + 0x0032)
More information about the Libreoffice-commits
mailing list