[Libreoffice-commits] .: 5 commits - binfilter/bf_sw binfilter/bf_xmloff filter/source
Caolán McNamara
caolan at kemper.freedesktop.org
Mon Apr 4 03:01:33 PDT 2011
binfilter/bf_sw/source/core/inc/wrong.hxx | 2
binfilter/bf_sw/source/core/txtnode/sw_fmtatr2.cxx | 20 +-
binfilter/bf_sw/source/core/txtnode/sw_ndtxt.cxx | 24 +--
binfilter/bf_xmloff/source/style/PagePropertySetContext.hxx | 1
binfilter/bf_xmloff/source/style/makefile.mk | 2
binfilter/bf_xmloff/source/style/xmloff_impastp4.cxx | 28 +--
binfilter/bf_xmloff/source/style/xmloff_numehelp.cxx | 36 ++--
binfilter/bf_xmloff/source/style/xmloff_opaquhdl.cxx | 4
binfilter/bf_xmloff/source/style/xmloff_prstylei.cxx | 36 ++--
binfilter/bf_xmloff/source/style/xmloff_shdwdhdl.cxx | 4
binfilter/bf_xmloff/source/style/xmloff_styleexp.cxx | 6
binfilter/bf_xmloff/source/style/xmloff_xmlbahdl.cxx | 16 +-
binfilter/bf_xmloff/source/style/xmloff_xmlexppr.cxx | 11 -
binfilter/bf_xmloff/source/style/xmloff_xmlimppr.cxx | 6
binfilter/bf_xmloff/source/style/xmloff_xmlnume.cxx | 20 +-
binfilter/bf_xmloff/source/style/xmloff_xmlnumfi.cxx | 92 ++++++------
filter/source/config/cache/basecontainer.cxx | 23 +--
filter/source/config/cache/basecontainer.hxx | 5
filter/source/config/cache/registration.cxx | 21 +-
filter/source/t602/t602filter.cxx | 21 --
filter/source/xsltdialog/xmlfilterdialogcomponent.cxx | 45 +++--
21 files changed, 204 insertions(+), 219 deletions(-)
New commits:
commit 7bb3586ab7786f2249c2d45d8bf4c9fd4dbda2ea
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Apr 4 09:44:17 2011 +0100
WaE: mark this dir as warnings free
diff --git a/binfilter/bf_sw/source/core/inc/wrong.hxx b/binfilter/bf_sw/source/core/inc/wrong.hxx
index 37fa0b1..81232b9 100644
--- a/binfilter/bf_sw/source/core/inc/wrong.hxx
+++ b/binfilter/bf_sw/source/core/inc/wrong.hxx
@@ -64,7 +64,7 @@ public:
{ if( STRING_LEN == GetBeginInv() ) SetInvalid( nBegin, nEnd );
else _Invalidate( nBegin, nEnd ); }
BOOL InvalidateWrong();
- void Move( xub_StrLen nPos, long nDiff ){DBG_BF_ASSERT(0, "STRIP");} ;
+ void Move( xub_StrLen /*nPos*/, long /*nDiff*/ ){DBG_BF_ASSERT(0, "STRIP");} ;
// Divide the list into two part, the wrong words until nSplitPos will be
// removed and transferred to a new SwWrongList.
diff --git a/binfilter/bf_sw/source/core/txtnode/sw_fmtatr2.cxx b/binfilter/bf_sw/source/core/txtnode/sw_fmtatr2.cxx
index bbac96e..09cb311 100644
--- a/binfilter/bf_sw/source/core/txtnode/sw_fmtatr2.cxx
+++ b/binfilter/bf_sw/source/core/txtnode/sw_fmtatr2.cxx
@@ -128,8 +128,8 @@ using namespace ::rtl;
/*N*/ SwFmtINetFmt::SwFmtINetFmt()
/*N*/ : SfxPoolItem( RES_TXTATR_INETFMT ),
-/*N*/ pTxtAttr( 0 ),
/*N*/ pMacroTbl( 0 ),
+/*N*/ pTxtAttr( 0 ),
/*N*/ nINetId( 0 ),
/*N*/ nVisitedId( 0 )
/*N*/ {}
@@ -138,8 +138,8 @@ using namespace ::rtl;
/*N*/ : SfxPoolItem( RES_TXTATR_INETFMT ),
/*N*/ aURL( rURL ),
/*N*/ aTargetFrame( rTarget ),
-/*N*/ pTxtAttr( 0 ),
/*N*/ pMacroTbl( 0 ),
+/*N*/ pTxtAttr( 0 ),
/*N*/ nINetId( 0 ),
/*N*/ nVisitedId( 0 )
/*N*/ {
@@ -150,12 +150,12 @@ using namespace ::rtl;
/*N*/ SwFmtINetFmt::SwFmtINetFmt( const SwFmtINetFmt& rAttr )
/*N*/ : SfxPoolItem( RES_TXTATR_INETFMT ),
/*N*/ aURL( rAttr.GetValue() ),
-/*N*/ aName( rAttr.aName ),
/*N*/ aTargetFrame( rAttr.aTargetFrame ),
/*N*/ aINetFmt( rAttr.aINetFmt ),
/*N*/ aVisitedFmt( rAttr.aVisitedFmt ),
-/*N*/ pTxtAttr( 0 ),
+/*N*/ aName( rAttr.aName ),
/*N*/ pMacroTbl( 0 ),
+/*N*/ pTxtAttr( 0 ),
/*N*/ nINetId( rAttr.nINetId ),
/*N*/ nVisitedId( rAttr.nVisitedId )
/*N*/ {
@@ -377,9 +377,10 @@ using namespace ::rtl;
/*N*/ SwFmtRuby::SwFmtRuby( const String& rRubyTxt )
/*N*/ : SfxPoolItem( RES_TXTATR_CJK_RUBY ),
/*N*/ sRubyTxt( rRubyTxt ),
+/*N*/ pTxtAttr( 0 ),
/*N*/ nCharFmtId( 0 ),
-/*N*/ nPosition( 0 ), nAdjustment( 0 ),
-/*N*/ pTxtAttr( 0 )
+/*N*/ nPosition( 0 ),
+/*N*/ nAdjustment( 0 )
/*N*/ {
/*N*/ }
@@ -387,9 +388,10 @@ using namespace ::rtl;
/*?*/ : SfxPoolItem( RES_TXTATR_CJK_RUBY ),
/*?*/ sRubyTxt( rAttr.sRubyTxt ),
/*?*/ sCharFmtName( rAttr.sCharFmtName ),
+/*?*/ pTxtAttr( 0 ),
/*?*/ nCharFmtId( rAttr.nCharFmtId),
-/*?*/ nPosition( rAttr.nPosition ), nAdjustment( rAttr.nAdjustment ),
-/*?*/ pTxtAttr( 0 )
+/*?*/ nPosition( rAttr.nPosition ),
+/*?*/ nAdjustment( rAttr.nAdjustment )
/*?*/ {
/*?*/ }
@@ -466,7 +468,7 @@ bool SwFmtRuby::QueryValue( ::com::sun::star::uno::Any& rVal,
/*N*/ break;
/*N*/ case MID_RUBY_ADJUST:
/*N*/ {
-/*N*/ sal_Int16 nSet; rVal >>= nSet;
+/*N*/ sal_Int16 nSet(0); rVal >>= nSet;
/*N*/ if(nSet >= 0 && nSet <= ::com::sun::star::text::RubyAdjust_INDENT_BLOCK)
/*N*/ nAdjustment = nSet;
/*N*/ else
diff --git a/binfilter/bf_sw/source/core/txtnode/sw_ndtxt.cxx b/binfilter/bf_sw/source/core/txtnode/sw_ndtxt.cxx
index a168456..304f56a 100644
--- a/binfilter/bf_sw/source/core/txtnode/sw_ndtxt.cxx
+++ b/binfilter/bf_sw/source/core/txtnode/sw_ndtxt.cxx
@@ -392,10 +392,10 @@ SV_DECL_PTRARR(SwpHts,SwTxtAttr*,1,1)
/*?*/ }
/*?*/
/*?*/ SwClientIter aIter( *this );
-/*?*/ SwClient* pLast = aIter.GoStart();
-/*?*/ if( pLast )
+/*?*/ SwClient* pLclLast = aIter.GoStart();
+/*?*/ if( pLclLast )
/*?*/ do
-/*?*/ { SwCntntFrm *pFrm = PTR_CAST( SwCntntFrm, pLast );
+/*?*/ { SwCntntFrm *pFrm = PTR_CAST( SwCntntFrm, pLclLast );
/*?*/ if ( pFrm )
/*?*/ {
/*?*/ pNode->Add( pFrm );
@@ -403,7 +403,7 @@ SV_DECL_PTRARR(SwpHts,SwTxtAttr*,1,1)
/*?*/ ((SwTxtFrm*)pFrm)->GetOfst() )
/*?*/ ((SwTxtFrm*)pFrm)->SetOfst( 0 );
/*?*/ }
-/*?*/ } while( 0 != ( pLast = aIter++ ));
+/*?*/ } while( 0 != ( pLclLast = aIter++ ));
/*?*/
/*?*/ if ( IsInCache() )
/*?*/ {
@@ -2138,7 +2138,7 @@ SV_DECL_PTRARR(SwpHts,SwTxtAttr*,1,1)
/*N*/ long SwTxtNode::GetLeftMarginWithNum( BOOL bTxtLeft ) const
/*N*/ {
-/*N*/ long nOffset;
+/*N*/ long nLclOffset;
/*N*/ const SwNodeNum* pNum;
/*N*/ const SwNumRule* pRule;
/*N*/ if( (( 0 != ( pNum = GetNum() ) &&
@@ -2148,23 +2148,23 @@ SV_DECL_PTRARR(SwpHts,SwTxtAttr*,1,1)
/*N*/ pNum->GetLevel() < NO_NUM )
/*N*/ {
/*N*/ const SwNumFmt& rFmt = pRule->Get( GetRealLevel( pNum->GetLevel() ) );
-/*N*/ nOffset = rFmt.GetAbsLSpace();
+/*N*/ nLclOffset = rFmt.GetAbsLSpace();
/*N*/
/*N*/ if( !bTxtLeft )
/*N*/ {
/*N*/ if( 0 > rFmt.GetFirstLineOffset() &&
-/*N*/ nOffset > -rFmt.GetFirstLineOffset() )
-/*N*/ nOffset += rFmt.GetFirstLineOffset();
+/*N*/ nLclOffset > -rFmt.GetFirstLineOffset() )
+/*N*/ nLclOffset += rFmt.GetFirstLineOffset();
/*N*/ else
-/*N*/ nOffset = 0;
+/*N*/ nLclOffset = 0;
/*N*/ }
/*N*/
/*N*/ if( pRule->IsAbsSpaces() )
-/*N*/ nOffset -= GetSwAttrSet().GetLRSpace().GetLeft();
+/*N*/ nLclOffset -= GetSwAttrSet().GetLRSpace().GetLeft();
/*N*/ }
/*N*/ else
-/*N*/ nOffset = 0;
-/*N*/ return nOffset;
+/*N*/ nLclOffset = 0;
+/*N*/ return nLclOffset;
/*N*/ }
/*N*/ BOOL SwTxtNode::GetFirstLineOfsWithNum( short& rFLOffset ) const
diff --git a/binfilter/bf_xmloff/source/style/PagePropertySetContext.hxx b/binfilter/bf_xmloff/source/style/PagePropertySetContext.hxx
index f79ede4..ecce9f7 100644
--- a/binfilter/bf_xmloff/source/style/PagePropertySetContext.hxx
+++ b/binfilter/bf_xmloff/source/style/PagePropertySetContext.hxx
@@ -55,6 +55,7 @@ public:
virtual ~PagePropertySetContext();
+ using SvXMLPropertySetContext::CreateChildContext;
virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
const ::rtl::OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList,
diff --git a/binfilter/bf_xmloff/source/style/makefile.mk b/binfilter/bf_xmloff/source/style/makefile.mk
index f70cf65..91d11c4 100644
--- a/binfilter/bf_xmloff/source/style/makefile.mk
+++ b/binfilter/bf_xmloff/source/style/makefile.mk
@@ -25,8 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
PRJ=..$/..$/..
PRJNAME=binfilter
diff --git a/binfilter/bf_xmloff/source/style/xmloff_impastp4.cxx b/binfilter/bf_xmloff/source/style/xmloff_impastp4.cxx
index 409d8b3..afe397f 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_impastp4.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_impastp4.cxx
@@ -116,7 +116,7 @@ void SvXMLAutoStylePoolP_Impl::RegisterName( sal_Int32 nFamily, const OUString&
sal_Bool SvXMLAutoStylePoolP_Impl::Add(OUString& rName, sal_Int32 nFamily,
const OUString& rParent,
const ::std::vector< XMLPropertyState >& rProperties,
- sal_Bool bCache)
+ sal_Bool /*bCache*/)
{
sal_Bool bRet(sal_False);
ULONG nPos;
@@ -131,11 +131,11 @@ sal_Bool SvXMLAutoStylePoolP_Impl::Add(OUString& rName, sal_Int32 nFamily,
DBG_ASSERT( pFamily, "SvXMLAutoStylePool_Impl::Add: unknown family" );
if( pFamily )
{
- SvXMLAutoStylePoolParentP_Impl aTmp( rParent );
+ SvXMLAutoStylePoolParentP_Impl aLclTmp( rParent );
SvXMLAutoStylePoolParentP_Impl *pParent = 0;
SvXMLAutoStylePoolParentsP_Impl *pParents = pFamily->mpParentList;
- if( pParents->Seek_Entry( &aTmp, &nPos ) )
+ if( pParents->Seek_Entry( &aLclTmp, &nPos ) )
{
pParent = pParents->GetObject( nPos );
}
@@ -178,11 +178,11 @@ OUString SvXMLAutoStylePoolP_Impl::Find( sal_Int32 nFamily,
if( pFamily )
{
- SvXMLAutoStylePoolParentP_Impl aTmp( rParent );
+ SvXMLAutoStylePoolParentP_Impl aLclTmp( rParent );
const SvXMLAutoStylePoolParentsP_Impl* pParents =
pFamily->mpParentList;
- if( pParents->Seek_Entry( &aTmp, &nPos ) )
+ if( pParents->Seek_Entry( &aLclTmp, &nPos ) )
sName = pParents->GetObject( nPos )->Find( pFamily, rProperties );
}
@@ -196,9 +196,9 @@ OUString SvXMLAutoStylePoolP_Impl::Find( sal_Int32 nFamily,
void SvXMLAutoStylePoolP_Impl::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 SvXMLAutoStylePoolP *pAntiImpl) const
{
sal_uInt32 nCount = 0;
@@ -244,15 +244,15 @@ void SvXMLAutoStylePoolP_Impl::exportXML(
{
const SvXMLAutoStylePoolPropertiesP_Impl *pProperties =
pParent->GetPropertiesList()[ j ];
- sal_uInt32 nPos = pProperties->GetPos();
- DBG_ASSERT( nPos < nCount,
+ sal_uInt32 nLclPos = pProperties->GetPos();
+ DBG_ASSERT( nLclPos < nCount,
"SvXMLAutoStylePool_Impl::exportXML: wrong position" );
- if( nPos < nCount )
+ if( nLclPos < nCount )
{
- DBG_ASSERT( !aExpStyles[nPos].mpProperties,
+ DBG_ASSERT( !aExpStyles[nLclPos].mpProperties,
"SvXMLAutoStylePool_Impl::exportXML: double position" );
- aExpStyles[nPos].mpProperties = pProperties;
- aExpStyles[nPos].mpParent = &pParent->GetParent();
+ aExpStyles[nLclPos].mpProperties = pProperties;
+ aExpStyles[nLclPos].mpParent = &pParent->GetParent();
}
}
}
diff --git a/binfilter/bf_xmloff/source/style/xmloff_numehelp.cxx b/binfilter/bf_xmloff/source/style/xmloff_numehelp.cxx
index e5fb1ba..51fd0ae 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_numehelp.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_numehelp.cxx
@@ -49,30 +49,30 @@ using namespace xmloff::token;
XMLNumberFormatAttributesExportHelper::XMLNumberFormatAttributesExportHelper(
::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& xTempNumberFormatsSupplier)
- : pExport(NULL),
- xNumberFormats(xTempNumberFormatsSupplier.is() ? xTempNumberFormatsSupplier->getNumberFormats() : ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats > ()),
- aNumberFormats(),
- sStandardFormat(RTL_CONSTASCII_USTRINGPARAM(XML_STANDARDFORMAT)),
- sType(RTL_CONSTASCII_USTRINGPARAM(XML_TYPE))
+ : xNumberFormats(xTempNumberFormatsSupplier.is() ? xTempNumberFormatsSupplier->getNumberFormats() : ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats > ())
+ , pExport(NULL)
+ , sStandardFormat(RTL_CONSTASCII_USTRINGPARAM(XML_STANDARDFORMAT))
+ , sType(RTL_CONSTASCII_USTRINGPARAM(XML_TYPE))
+ , aNumberFormats()
{
}
XMLNumberFormatAttributesExportHelper::XMLNumberFormatAttributesExportHelper(
::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& xTempNumberFormatsSupplier,
SvXMLExport& rTempExport, sal_uInt16 nTempNamespace)
- : pExport(&rTempExport),
- xNumberFormats(xTempNumberFormatsSupplier.is() ? xTempNumberFormatsSupplier->getNumberFormats() : ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats > ()),
- aNumberFormats(),
- nNamespace(nTempNamespace),
- sAttrValueType(rTempExport.GetNamespaceMap().GetQNameByKey( nTempNamespace, GetXMLToken(XML_VALUE_TYPE))),
- sAttrValue(rTempExport.GetNamespaceMap().GetQNameByKey( nTempNamespace, GetXMLToken(XML_VALUE))),
- sAttrDateValue(rTempExport.GetNamespaceMap().GetQNameByKey( nTempNamespace, GetXMLToken(XML_DATE_VALUE))),
- sAttrTimeValue(rTempExport.GetNamespaceMap().GetQNameByKey( nTempNamespace, GetXMLToken(XML_TIME_VALUE))),
- sAttrBooleanValue(rTempExport.GetNamespaceMap().GetQNameByKey( nTempNamespace, GetXMLToken(XML_BOOLEAN_VALUE))),
- sAttrStringValue(rTempExport.GetNamespaceMap().GetQNameByKey( nTempNamespace, GetXMLToken(XML_STRING_VALUE))),
- sAttrCurrency(rTempExport.GetNamespaceMap().GetQNameByKey( nTempNamespace, GetXMLToken(XML_CURRENCY))),
- sStandardFormat(RTL_CONSTASCII_USTRINGPARAM(XML_STANDARDFORMAT)),
- sType(RTL_CONSTASCII_USTRINGPARAM(XML_TYPE))
+ : xNumberFormats(xTempNumberFormatsSupplier.is() ? xTempNumberFormatsSupplier->getNumberFormats() : ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats > ())
+ , pExport(&rTempExport)
+ , sStandardFormat(RTL_CONSTASCII_USTRINGPARAM(XML_STANDARDFORMAT))
+ , sType(RTL_CONSTASCII_USTRINGPARAM(XML_TYPE))
+ , sAttrValueType(rTempExport.GetNamespaceMap().GetQNameByKey( nTempNamespace, GetXMLToken(XML_VALUE_TYPE)))
+ , sAttrValue(rTempExport.GetNamespaceMap().GetQNameByKey( nTempNamespace, GetXMLToken(XML_VALUE)))
+ , sAttrDateValue(rTempExport.GetNamespaceMap().GetQNameByKey( nTempNamespace, GetXMLToken(XML_DATE_VALUE)))
+ , sAttrTimeValue(rTempExport.GetNamespaceMap().GetQNameByKey( nTempNamespace, GetXMLToken(XML_TIME_VALUE)))
+ , sAttrBooleanValue(rTempExport.GetNamespaceMap().GetQNameByKey( nTempNamespace, GetXMLToken(XML_BOOLEAN_VALUE)))
+ , sAttrStringValue(rTempExport.GetNamespaceMap().GetQNameByKey( nTempNamespace, GetXMLToken(XML_STRING_VALUE)))
+ , sAttrCurrency(rTempExport.GetNamespaceMap().GetQNameByKey( nTempNamespace, GetXMLToken(XML_CURRENCY)))
+ , aNumberFormats()
+ , nNamespace(nTempNamespace)
{
}
diff --git a/binfilter/bf_xmloff/source/style/xmloff_opaquhdl.cxx b/binfilter/bf_xmloff/source/style/xmloff_opaquhdl.cxx
index e096cf7..bdb50ee 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_opaquhdl.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_opaquhdl.cxx
@@ -51,7 +51,7 @@ XMLOpaquePropHdl::~XMLOpaquePropHdl()
// nothing to do
}
-sal_Bool XMLOpaquePropHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const
+sal_Bool XMLOpaquePropHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
sal_Bool bRet = sal_True;
@@ -62,7 +62,7 @@ sal_Bool XMLOpaquePropHdl::importXML( const OUString& rStrImpValue, Any& rValue,
return bRet;
}
-sal_Bool XMLOpaquePropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const
+sal_Bool XMLOpaquePropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
sal_Bool bRet = sal_False;
sal_Bool bValue;
diff --git a/binfilter/bf_xmloff/source/style/xmloff_prstylei.cxx b/binfilter/bf_xmloff/source/style/xmloff_prstylei.cxx
index efd3aa9..59ea8df 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_prstylei.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_prstylei.cxx
@@ -69,15 +69,15 @@ void XMLPropStyleContext::SetAttribute( sal_uInt16 nPrefixKey,
TYPEINIT1( XMLPropStyleContext, SvXMLStyleContext );
-XMLPropStyleContext::XMLPropStyleContext( SvXMLImport& rImport,
+XMLPropStyleContext::XMLPropStyleContext( SvXMLImport& rInImport,
sal_uInt16 nPrfx, const OUString& rLName,
const Reference< XAttributeList > & xAttrList,
- SvXMLStylesContext& rStyles, sal_uInt16 nFamily,
+ SvXMLStylesContext& rStyles, sal_uInt16 nInFamily,
sal_Bool bDefault ) :
- SvXMLStyleContext( rImport, nPrfx, rLName, xAttrList, nFamily, bDefault ),
- xStyles( &rStyles ),
+ SvXMLStyleContext( rInImport, nPrfx, rLName, xAttrList, nInFamily, bDefault ),
sIsPhysical( RTL_CONSTASCII_USTRINGPARAM( "IsPhysical" ) ),
- sFollowStyle( RTL_CONSTASCII_USTRINGPARAM( "FollowStyle" ) )
+ sFollowStyle( RTL_CONSTASCII_USTRINGPARAM( "FollowStyle" ) ),
+ xStyles( &rStyles )
{
}
@@ -86,27 +86,27 @@ XMLPropStyleContext::~XMLPropStyleContext()
}
SvXMLImportContext *XMLPropStyleContext::CreateChildContext(
- sal_uInt16 nPrefix,
+ sal_uInt16 nInPrefix,
const OUString& rLocalName,
const Reference< XAttributeList > & xAttrList )
{
SvXMLImportContext *pContext = 0;
- if( XML_NAMESPACE_STYLE == nPrefix &&
+ if( XML_NAMESPACE_STYLE == nInPrefix &&
IsXMLToken( rLocalName, XML_PROPERTIES ) )
{
UniReference < SvXMLImportPropertyMapper > xImpPrMap =
((SvXMLStylesContext *)&xStyles)->GetImportPropertyMapper(
GetFamily() );
if( xImpPrMap.is() )
- pContext = new SvXMLPropertySetContext( GetImport(), nPrefix,
+ pContext = new SvXMLPropertySetContext( GetImport(), nInPrefix,
rLocalName, xAttrList,
aProperties,
xImpPrMap );
}
if( !pContext )
- pContext = SvXMLStyleContext::CreateChildContext( nPrefix, rLocalName,
+ pContext = SvXMLStyleContext::CreateChildContext( nInPrefix, rLocalName,
xAttrList );
return pContext;
@@ -162,7 +162,7 @@ void XMLPropStyleContext::CreateAndInsert( sal_Bool bOverwrite )
if( !xFamilies.is() )
return;
- sal_Bool bNew = sal_False;
+ sal_Bool bLclNew = sal_False;
if( xFamilies->hasByName( rName ) )
{
Any aAny = xFamilies->getByName( rName );
@@ -177,20 +177,20 @@ void XMLPropStyleContext::CreateAndInsert( sal_Bool bOverwrite )
Any aAny;
aAny <<= xStyle;
xFamilies->insertByName( rName, aAny );
- bNew = sal_True;
+ bLclNew = sal_True;
}
Reference < XPropertySet > xPropSet( xStyle, UNO_QUERY );
Reference< XPropertySetInfo > xPropSetInfo =
xPropSet->getPropertySetInfo();
- if( !bNew && xPropSetInfo->hasPropertyByName( sIsPhysical ) )
+ if( !bLclNew && xPropSetInfo->hasPropertyByName( sIsPhysical ) )
{
Any aAny = xPropSet->getPropertyValue( sIsPhysical );
- bNew = !*(sal_Bool *)aAny.getValue();
+ bLclNew = !*(sal_Bool *)aAny.getValue();
}
- SetNew( bNew );
+ SetNew( bLclNew );
- if( bOverwrite || bNew )
+ if( bOverwrite || bLclNew )
{
Reference< XPropertyState > xPropState( xPropSet, uno::UNO_QUERY );
@@ -216,9 +216,9 @@ void XMLPropStyleContext::CreateAndInsert( sal_Bool bOverwrite )
sal_Int32 i;
for( i = 0; i < nCount; i++ )
{
- const OUString& rName = xPrMap->GetEntryAPIName( i );
- if( xPropSetInfo->hasPropertyByName( rName ) )
- aNameSet.insert( rName );
+ const OUString& rInnerName = xPrMap->GetEntryAPIName( i );
+ if( xPropSetInfo->hasPropertyByName( rInnerName ) )
+ aNameSet.insert( rInnerName );
}
nCount = aNameSet.size();
diff --git a/binfilter/bf_xmloff/source/style/xmloff_shdwdhdl.cxx b/binfilter/bf_xmloff/source/style/xmloff_shdwdhdl.cxx
index 3bd79dc..c412f05 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_shdwdhdl.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_shdwdhdl.cxx
@@ -50,7 +50,7 @@ XMLShadowedPropHdl::~XMLShadowedPropHdl()
// nothing to do
}
-sal_Bool XMLShadowedPropHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const
+sal_Bool XMLShadowedPropHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
sal_Bool bRet = sal_False;
@@ -61,7 +61,7 @@ sal_Bool XMLShadowedPropHdl::importXML( const OUString& rStrImpValue, Any& rValu
return bRet;
}
-sal_Bool XMLShadowedPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const
+sal_Bool XMLShadowedPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
sal_Bool bRet = sal_False;
sal_Bool bValue;
diff --git a/binfilter/bf_xmloff/source/style/xmloff_styleexp.cxx b/binfilter/bf_xmloff/source/style/xmloff_styleexp.cxx
index aa525a4..5e51762 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_styleexp.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_styleexp.cxx
@@ -61,9 +61,9 @@ XMLStyleExport::XMLStyleExport(
SvXMLAutoStylePoolP *pAutoStyleP ) :
rExport( rExp ),
sIsPhysical( RTL_CONSTASCII_USTRINGPARAM( "IsPhysical" ) ),
+ sIsAutoUpdate( RTL_CONSTASCII_USTRINGPARAM( "IsAutoUpdate" ) ),
sFollowStyle( RTL_CONSTASCII_USTRINGPARAM( "FollowStyle" ) ),
sNumberingStyleName( RTL_CONSTASCII_USTRINGPARAM( "NumberingStyleName" ) ),
- sIsAutoUpdate( RTL_CONSTASCII_USTRINGPARAM( "IsAutoUpdate" ) ),
sPoolStyleName( rPoolStyleName ),
pAutoStylePool( pAutoStyleP )
{
@@ -73,11 +73,11 @@ XMLStyleExport::~XMLStyleExport()
{
}
-void XMLStyleExport::exportStyleAttributes( const Reference< XStyle >& rStyle )
+void XMLStyleExport::exportStyleAttributes( const Reference< XStyle >& /*rStyle*/ )
{
}
-void XMLStyleExport::exportStyleContent( const Reference< XStyle >& rStyle )
+void XMLStyleExport::exportStyleContent( const Reference< XStyle >& /*rStyle*/ )
{
}
diff --git a/binfilter/bf_xmloff/source/style/xmloff_xmlbahdl.cxx b/binfilter/bf_xmloff/source/style/xmloff_xmlbahdl.cxx
index 1723c11..5a5bc0f 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_xmlbahdl.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_xmlbahdl.cxx
@@ -71,14 +71,14 @@ sal_Bool lcl_xmloff_getAny( const Any& rValue, sal_Int32& nValue,
{
case 1:
{
- sal_Int8 nValue8;
+ sal_Int8 nValue8(0);
bRet = rValue >>= nValue8;
nValue = nValue8;
}
break;
case 2:
{
- sal_Int16 nValue16;
+ sal_Int16 nValue16(0);
bRet = rValue >>= nValue16;
nValue = nValue16;
}
@@ -436,7 +436,7 @@ XMLStringPropHdl::~XMLStringPropHdl()
// Nothing to do
}
-sal_Bool XMLStringPropHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const
+sal_Bool XMLStringPropHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
sal_Bool bRet = sal_False;
@@ -446,7 +446,7 @@ sal_Bool XMLStringPropHdl::importXML( const OUString& rStrImpValue, Any& rValue,
return bRet;
}
-sal_Bool XMLStringPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const
+sal_Bool XMLStringPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
sal_Bool bRet = sal_False;
@@ -562,7 +562,7 @@ XMLIsTransparentPropHdl::~XMLIsTransparentPropHdl()
// Nothing to do
}
-sal_Bool XMLIsTransparentPropHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const
+sal_Bool XMLIsTransparentPropHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
sal_Bool bValue = ( (rStrImpValue == sTransparent) == bTransPropValue);
rValue.setValue( &bValue, ::getBooleanCppuType() );
@@ -570,7 +570,7 @@ sal_Bool XMLIsTransparentPropHdl::importXML( const OUString& rStrImpValue, Any&
return sal_True;
}
-sal_Bool XMLIsTransparentPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const
+sal_Bool XMLIsTransparentPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
sal_Bool bRet = sal_False;
@@ -693,13 +693,13 @@ XMLCompareOnlyPropHdl::~XMLCompareOnlyPropHdl()
// Nothing to do
}
-sal_Bool XMLCompareOnlyPropHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const
+sal_Bool XMLCompareOnlyPropHdl::importXML( const OUString&, Any&, const SvXMLUnitConverter& ) const
{
DBG_ASSERT( !this, "importXML called for compare-only-property" );
return sal_False;
}
-sal_Bool XMLCompareOnlyPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const
+sal_Bool XMLCompareOnlyPropHdl::exportXML( OUString&, const Any&, const SvXMLUnitConverter& ) const
{
DBG_ASSERT( !this, "exportXML called for compare-only-property" );
return sal_False;
diff --git a/binfilter/bf_xmloff/source/style/xmloff_xmlexppr.cxx b/binfilter/bf_xmloff/source/style/xmloff_xmlexppr.cxx
index e29fa23..893dfc7 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_xmlexppr.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_xmlexppr.cxx
@@ -239,8 +239,8 @@ FilterPropertiesInfos_Impl::~FilterPropertiesInfos_Impl ()
// ----------------------------------------------------------------------------
FilterPropertiesInfo_Impl::FilterPropertiesInfo_Impl() :
- aPropInfos(),
nCount(0),
+ aPropInfos(),
pApiNames( 0 )
{
aLastItr = aPropInfos.begin();
@@ -411,7 +411,6 @@ void FilterPropertiesInfo_Impl::FillPropertyStateArray(
for(sal_uInt32 i = 0; i < nCount; i++ )
{
// The value is stored in the PropertySet itself, add to list.
- sal_Bool bGotValue = sal_False;
XMLPropertyState aNewProperty( -1 );
aNewProperty.maValue = *pValues;
for( ::std::list<sal_uInt32>::iterator aIndexItr =
@@ -482,9 +481,9 @@ void FilterPropertiesInfo_Impl::FillPropertyStateArray(
//
SvXMLExportPropertyMapper::SvXMLExportPropertyMapper(
- const UniReference< XMLPropertySetMapper >& rMapper ) :
- maPropMapper( rMapper ),
- pCache( 0 )
+ const UniReference< XMLPropertySetMapper >& rMapper )
+ : pCache( 0 )
+ , maPropMapper( rMapper )
{
}
@@ -815,7 +814,7 @@ void SvXMLExportPropertyMapper::_exportXML(
const XMLPropertyState& rProperty,
const SvXMLUnitConverter& rUnitConverter,
const SvXMLNamespaceMap& rNamespaceMap,
- sal_uInt16 nFlags,
+ sal_uInt16 /*nFlags*/,
const ::std::vector< XMLPropertyState > *pProperties,
sal_uInt32 nIdx ) const
{
diff --git a/binfilter/bf_xmloff/source/style/xmloff_xmlimppr.cxx b/binfilter/bf_xmloff/source/style/xmloff_xmlimppr.cxx
index 1473c55..c9da09c 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_xmlimppr.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_xmlimppr.cxx
@@ -72,9 +72,9 @@ using rtl::OUStringBuffer;
SvXMLImportPropertyMapper::SvXMLImportPropertyMapper(
const UniReference< XMLPropertySetMapper >& rMapper,
- SvXMLImport& rImp ):
- maPropMapper ( rMapper ),
- rImport(rImp)
+ SvXMLImport& rImp )
+ : rImport(rImp)
+ , maPropMapper(rMapper)
{
}
diff --git a/binfilter/bf_xmloff/source/style/xmloff_xmlnume.cxx b/binfilter/bf_xmloff/source/style/xmloff_xmlnume.cxx
index 4dcca7d..75dc059 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_xmlnume.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_xmlnume.cxx
@@ -387,15 +387,15 @@ void SvxXMLNumRuleExport::exportLevelStyle( INT32 nLevel,
else
{
Any aAny;
- OUString sTmp;
+ OUString sInnerTmp;
const SvXMLUnitConverter& rUnitConv =
GetExport().GetMM100UnitConverter();
XMLFontFamilyNamePropHdl aFamilyNameHdl;
aAny <<= sBulletFontName;
- if( aFamilyNameHdl.exportXML( sTmp, aAny, rUnitConv ) )
+ if( aFamilyNameHdl.exportXML( sInnerTmp, aAny, rUnitConv ) )
GetExport().AddAttribute( XML_NAMESPACE_FO,
- XML_FONT_FAMILY, sTmp );
+ XML_FONT_FAMILY, sInnerTmp );
if( sBulletFontStyleName.getLength() )
GetExport().AddAttribute( XML_NAMESPACE_STYLE,
@@ -404,22 +404,22 @@ void SvxXMLNumRuleExport::exportLevelStyle( INT32 nLevel,
XMLFontFamilyPropHdl aFamilyHdl;
aAny <<= (sal_Int16)eBulletFontFamily;
- if( aFamilyHdl.exportXML( sTmp, aAny, rUnitConv ) )
+ if( aFamilyHdl.exportXML( sInnerTmp, aAny, rUnitConv ) )
GetExport().AddAttribute( XML_NAMESPACE_STYLE,
XML_FONT_FAMILY_GENERIC,
- sTmp );
+ sInnerTmp );
XMLFontPitchPropHdl aPitchHdl;
aAny <<= (sal_Int16)eBulletFontPitch;
- if( aPitchHdl.exportXML( sTmp, aAny, rUnitConv ) )
+ if( aPitchHdl.exportXML( sInnerTmp, aAny, rUnitConv ) )
GetExport().AddAttribute( XML_NAMESPACE_STYLE,
- XML_FONT_PITCH, sTmp );
+ XML_FONT_PITCH, sInnerTmp );
XMLFontEncodingPropHdl aEncHdl;
aAny <<= (sal_Int16)eBulletFontEncoding;
- if( aEncHdl.exportXML( sTmp, aAny, rUnitConv ) )
+ if( aEncHdl.exportXML( sInnerTmp, aAny, rUnitConv ) )
GetExport().AddAttribute( XML_NAMESPACE_STYLE,
- XML_FONT_CHARSET, sTmp );
+ XML_FONT_CHARSET, sInnerTmp );
}
}
}
@@ -515,7 +515,7 @@ void SvxXMLNumRuleExport::exportLevelStyle( INT32 nLevel,
if( GetExport().GetAttrList().getLength() > 0 )
{
- SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_STYLE,
+ SvXMLElementExport aInnerElem( GetExport(), XML_NAMESPACE_STYLE,
XML_PROPERTIES, sal_True, sal_True );
}
if( NumberingType::BITMAP == eType && sImageURL.getLength() )
diff --git a/binfilter/bf_xmloff/source/style/xmloff_xmlnumfi.cxx b/binfilter/bf_xmloff/source/style/xmloff_xmlnumfi.cxx
index 034d04f..68ea7aa 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_xmlnumfi.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_xmlnumfi.cxx
@@ -148,7 +148,7 @@ class SvXMLNumFmtElementContext : public SvXMLImportContext
::rtl::OUString sCalendar;
public:
- SvXMLNumFmtElementContext( SvXMLImport& rImport, USHORT nPrfx,
+ SvXMLNumFmtElementContext( SvXMLImport& rInImport, USHORT nPrfx,
const ::rtl::OUString& rLName,
SvXMLNumFormatContext& rParentContext, sal_uInt16 nNewType,
const ::com::sun::star::uno::Reference<
@@ -173,7 +173,7 @@ class SvXMLNumFmtEmbeddedTextContext : public SvXMLImportContext
sal_Int32 nTextPosition;
public:
- SvXMLNumFmtEmbeddedTextContext( SvXMLImport& rImport, USHORT nPrfx,
+ SvXMLNumFmtEmbeddedTextContext( SvXMLImport& rInImport, USHORT nPrfx,
const ::rtl::OUString& rLName,
SvXMLNumFmtElementContext& rParentContext,
const ::com::sun::star::uno::Reference<
@@ -196,7 +196,7 @@ class SvXMLNumFmtMapContext : public SvXMLImportContext
::rtl::OUString sName;
public:
- SvXMLNumFmtMapContext( SvXMLImport& rImport, USHORT nPrfx,
+ SvXMLNumFmtMapContext( SvXMLImport& rInImport, USHORT nPrfx,
const ::rtl::OUString& rLName,
SvXMLNumFormatContext& rParentContext,
const ::com::sun::star::uno::Reference<
@@ -219,7 +219,7 @@ class SvXMLNumFmtPropContext : public SvXMLImportContext
sal_Bool bColSet;
public:
- SvXMLNumFmtPropContext( SvXMLImport& rImport, USHORT nPrfx,
+ SvXMLNumFmtPropContext( SvXMLImport& rInImport, USHORT nPrfx,
const ::rtl::OUString& rLName,
SvXMLNumFormatContext& rParentContext,
const ::com::sun::star::uno::Reference<
@@ -615,11 +615,11 @@ const LocaleDataWrapper& SvXMLNumImpData::GetLocaleData( LanguageType nLang )
// SvXMLNumFmtMapContext
//
-SvXMLNumFmtMapContext::SvXMLNumFmtMapContext( SvXMLImport& rImport,
+SvXMLNumFmtMapContext::SvXMLNumFmtMapContext( SvXMLImport& rInImport,
USHORT nPrfx, const ::rtl::OUString& rLName,
SvXMLNumFormatContext& rParentContext,
const uno::Reference<xml::sax::XAttributeList>& xAttrList ) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ SvXMLImportContext( rInImport, nPrfx, rLName ),
rParent( rParentContext )
{
sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
@@ -627,13 +627,13 @@ SvXMLNumFmtMapContext::SvXMLNumFmtMapContext( SvXMLImport& rImport,
{
OUString sAttrName = xAttrList->getNameByIndex( i );
OUString sValue = xAttrList->getValueByIndex( i );
- OUString aLocalName;
- sal_uInt16 nPrefix = rImport.GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
- if ( nPrefix == XML_NAMESPACE_STYLE )
+ OUString aLclLocalName;
+ sal_uInt16 nLclPrefix = rInImport.GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLclLocalName );
+ if ( nLclPrefix == XML_NAMESPACE_STYLE )
{
- if ( IsXMLToken( aLocalName, XML_CONDITION) )
+ if ( IsXMLToken( aLclLocalName, XML_CONDITION) )
sCondition = sValue;
- else if ( IsXMLToken( aLocalName, XML_APPLY_STYLE_NAME) )
+ else if ( IsXMLToken( aLclLocalName, XML_APPLY_STYLE_NAME) )
sName = sValue;
}
}
@@ -645,13 +645,13 @@ SvXMLNumFmtMapContext::~SvXMLNumFmtMapContext()
SvXMLImportContext* SvXMLNumFmtMapContext::CreateChildContext(
USHORT nPrfx, const ::rtl::OUString& rLName,
- const uno::Reference<xml::sax::XAttributeList>& xAttrList )
+ const uno::Reference<xml::sax::XAttributeList>& /*xAttrList*/ )
{
// no elements supported - use default context
return new SvXMLImportContext( GetImport(), nPrfx, rLName );
}
-void SvXMLNumFmtMapContext::Characters( const ::rtl::OUString& rChars )
+void SvXMLNumFmtMapContext::Characters( const ::rtl::OUString& /*rChars*/ )
{
}
@@ -666,11 +666,11 @@ void SvXMLNumFmtMapContext::EndElement()
// SvXMLNumFmtPropContext
//
-SvXMLNumFmtPropContext::SvXMLNumFmtPropContext( SvXMLImport& rImport,
+SvXMLNumFmtPropContext::SvXMLNumFmtPropContext( SvXMLImport& rInImport,
USHORT nPrfx, const ::rtl::OUString& rLName,
SvXMLNumFormatContext& rParentContext,
const uno::Reference<xml::sax::XAttributeList>& xAttrList ) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ SvXMLImportContext( rInImport, nPrfx, rLName ),
rParent( rParentContext ),
bColSet( sal_False )
{
@@ -679,9 +679,9 @@ SvXMLNumFmtPropContext::SvXMLNumFmtPropContext( SvXMLImport& rImport,
{
OUString sAttrName = xAttrList->getNameByIndex( i );
OUString sValue = xAttrList->getValueByIndex( i );
- OUString aLocalName;
- sal_uInt16 nPrefix = rImport.GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
- if ( nPrefix == XML_NAMESPACE_FO && IsXMLToken( aLocalName, XML_COLOR ) )
+ OUString aLclLocalName;
+ sal_uInt16 nLclPrefix = rInImport.GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLclLocalName );
+ if ( nLclPrefix == XML_NAMESPACE_FO && IsXMLToken( aLclLocalName, XML_COLOR ) )
bColSet = SvXMLUnitConverter::convertColor( aColor, sValue );
}
}
@@ -692,13 +692,13 @@ SvXMLNumFmtPropContext::~SvXMLNumFmtPropContext()
SvXMLImportContext* SvXMLNumFmtPropContext::CreateChildContext(
USHORT nPrfx, const ::rtl::OUString& rLName,
- const uno::Reference<xml::sax::XAttributeList>& xAttrList )
+ const uno::Reference<xml::sax::XAttributeList>& /*xAttrList*/ )
{
// no elements supported - use default context
return new SvXMLImportContext( GetImport(), nPrfx, rLName );
}
-void SvXMLNumFmtPropContext::Characters( const ::rtl::OUString& rChars )
+void SvXMLNumFmtPropContext::Characters( const ::rtl::OUString& /*rChars*/ )
{
}
@@ -714,11 +714,11 @@ void SvXMLNumFmtPropContext::EndElement()
// SvXMLNumFmtEmbeddedTextContext
//
-SvXMLNumFmtEmbeddedTextContext::SvXMLNumFmtEmbeddedTextContext( SvXMLImport& rImport,
+SvXMLNumFmtEmbeddedTextContext::SvXMLNumFmtEmbeddedTextContext( SvXMLImport& rInImport,
USHORT nPrfx, const ::rtl::OUString& rLName,
SvXMLNumFmtElementContext& rParentContext,
const uno::Reference<xml::sax::XAttributeList>& xAttrList ) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ SvXMLImportContext( rInImport, nPrfx, rLName ),
rParent( rParentContext ),
nTextPosition( 0 )
{
@@ -729,9 +729,9 @@ SvXMLNumFmtEmbeddedTextContext::SvXMLNumFmtEmbeddedTextContext( SvXMLImport& rIm
{
OUString sAttrName = xAttrList->getNameByIndex( i );
OUString sValue = xAttrList->getValueByIndex( i );
- OUString aLocalName;
- sal_uInt16 nPrefix = rImport.GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
- if ( nPrefix == XML_NAMESPACE_NUMBER && IsXMLToken( aLocalName, XML_POSITION ) )
+ OUString aLclLocalName;
+ sal_uInt16 nLclPrefix = rInImport.GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLclLocalName );
+ if ( nLclPrefix == XML_NAMESPACE_NUMBER && IsXMLToken( aLclLocalName, XML_POSITION ) )
{
if ( SvXMLUnitConverter::convertNumber( nAttrVal, sValue, 0 ) )
nTextPosition = nAttrVal;
@@ -745,7 +745,7 @@ SvXMLNumFmtEmbeddedTextContext::~SvXMLNumFmtEmbeddedTextContext()
SvXMLImportContext* SvXMLNumFmtEmbeddedTextContext::CreateChildContext(
USHORT nPrfx, const ::rtl::OUString& rLName,
- const uno::Reference<xml::sax::XAttributeList>& xAttrList )
+ const uno::Reference<xml::sax::XAttributeList>& /*xAttrList*/ )
{
// no elements supported - use default context
return new SvXMLImportContext( GetImport(), nPrfx, rLName );
@@ -898,11 +898,11 @@ void lcl_EnquoteIfNecessary( ::rtl::OUStringBuffer& rContent, sal_uInt16 nFormat
// SvXMLNumFmtElementContext
//
-SvXMLNumFmtElementContext::SvXMLNumFmtElementContext( SvXMLImport& rImport,
+SvXMLNumFmtElementContext::SvXMLNumFmtElementContext( SvXMLImport& rInImport,
USHORT nPrfx, const ::rtl::OUString& rLName,
SvXMLNumFormatContext& rParentContext, sal_uInt16 nNewType,
const uno::Reference<xml::sax::XAttributeList>& xAttrList ) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ SvXMLImportContext( rInImport, nPrfx, rLName ),
rParent( rParentContext ),
nType( nNewType ),
nElementLang( LANGUAGE_SYSTEM ),
@@ -920,11 +920,11 @@ SvXMLNumFmtElementContext::SvXMLNumFmtElementContext( SvXMLImport& rImport,
{
OUString sAttrName = xAttrList->getNameByIndex( i );
OUString sValue = xAttrList->getValueByIndex( i );
- OUString aLocalName;
- sal_uInt16 nPrefix = rImport.GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+ OUString aLclLocalName;
+ sal_uInt16 nLclPrefix = rInImport.GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLclLocalName );
const SvXMLTokenMap& rTokenMap = rParent.GetData()->GetStyleElemAttrTokenMap();
- sal_uInt16 nToken = rTokenMap.Get( nPrefix, aLocalName );
+ sal_uInt16 nToken = rTokenMap.Get( nLclPrefix, aLclLocalName );
switch (nToken)
{
@@ -1206,12 +1206,12 @@ sal_uInt16 SvXMLNumFmtDefaults::GetDefaultDateFormat( SvXMLDateElementAttributes
// SvXMLNumFormatContext
//
-SvXMLNumFormatContext::SvXMLNumFormatContext( SvXMLImport& rImport,
+SvXMLNumFormatContext::SvXMLNumFormatContext( SvXMLImport& rInImport,
USHORT nPrfx, const ::rtl::OUString& rLName,
SvXMLNumImpData* pNewData, sal_uInt16 nNewType,
const uno::Reference<xml::sax::XAttributeList>& xAttrList,
SvXMLStylesContext& rStyles ) :
- SvXMLStyleContext( rImport, nPrfx, rLName, xAttrList ),
+ SvXMLStyleContext( rInImport, nPrfx, rLName, xAttrList ),
pData( pNewData ),
pStyles( &rStyles ),
aMyConditions(),
@@ -1247,11 +1247,11 @@ SvXMLNumFormatContext::SvXMLNumFormatContext( SvXMLImport& rImport,
{
OUString sAttrName = xAttrList->getNameByIndex( i );
OUString sValue = xAttrList->getValueByIndex( i );
- OUString aLocalName;
- sal_uInt16 nPrefix = rImport.GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+ OUString aLclLocalName;
+ sal_uInt16 nLclPrefix = rInImport.GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLclLocalName );
const SvXMLTokenMap& rTokenMap = pData->GetStyleAttrTokenMap();
- sal_uInt16 nToken = rTokenMap.Get( nPrefix, aLocalName );
+ sal_uInt16 nToken = rTokenMap.Get( nLclPrefix, aLclLocalName );
switch (nToken)
{
case XML_TOK_STYLE_ATTR_NAME:
@@ -1330,12 +1330,12 @@ SvXMLNumFormatContext::SvXMLNumFormatContext( SvXMLImport& rImport,
}
}
-SvXMLNumFormatContext::SvXMLNumFormatContext( SvXMLImport& rImport,
+SvXMLNumFormatContext::SvXMLNumFormatContext( SvXMLImport& rInImport,
USHORT nPrfx, const ::rtl::OUString& rLName,
const uno::Reference<xml::sax::XAttributeList>& xAttrList,
const sal_Int32 nTempKey,
SvXMLStylesContext& rStyles ) :
- SvXMLStyleContext( rImport, nPrfx, rLName, xAttrList, XML_STYLE_FAMILY_DATA_STYLE ),
+ SvXMLStyleContext( rInImport, nPrfx, rLName, xAttrList, XML_STYLE_FAMILY_DATA_STYLE ),
pData( NULL ),
pStyles( &rStyles ),
aMyConditions(),
@@ -1496,7 +1496,7 @@ void SvXMLNumFormatContext::GetFormat( ::rtl::OUString& rFormatString, lang::Loc
rFormatString = sFormatString;
}
-void SvXMLNumFormatContext::CreateAndInsert(sal_Bool bOverwrite)
+void SvXMLNumFormatContext::CreateAndInsert(sal_Bool /*bOverwrite*/)
{
if (!(nKey > -1))
{
@@ -1581,8 +1581,8 @@ void SvXMLNumFormatContext::CreateAndInsert(sal_Bool bOverwrite)
if ( nIndex == NUMBERFORMAT_ENTRY_NOT_FOUND )
{
xub_StrLen nErrPos = 0;
- short nType = 0;
- sal_Bool bOk = pFormatter->PutEntry( aFormatStr, nErrPos, nType, nIndex, nFormatLang );
+ short nLclType = 0;
+ sal_Bool bOk = pFormatter->PutEntry( aFormatStr, nErrPos, nLclType, nIndex, nFormatLang );
if ( !bOk && nErrPos == 0 && aFormatStr != String(sFormat) )
{
// if the string was modified by PutEntry, look for an existing format
@@ -1970,11 +1970,11 @@ void SvXMLNumFormatContext::AddCondition( const sal_Int32 nIndex )
::rtl::OUString rApplyName = aMyConditions[nIndex].sMapName;
::rtl::OUString rCondition = aMyConditions[nIndex].sCondition;
SvNumberFormatter* pFormatter = pData->GetNumberFormatter();
- sal_uInt32 nKey = pData->GetKeyForName( rApplyName );
+ sal_uInt32 nLclKey = pData->GetKeyForName( rApplyName );
OUString sValue( RTL_CONSTASCII_USTRINGPARAM( "value()" )); //! define constant
sal_Int32 nValLen = sValue.getLength();
- if ( pFormatter && nKey != NUMBERFORMAT_ENTRY_NOT_FOUND &&
+ if ( pFormatter && nLclKey != NUMBERFORMAT_ENTRY_NOT_FOUND &&
rCondition.copy( 0, nValLen ) == sValue )
{
//! test for valid conditions
@@ -2010,7 +2010,7 @@ void SvXMLNumFormatContext::AddCondition( const sal_Int32 nIndex )
aConditions.append( (sal_Unicode) ']' );
}
- const SvNumberformat* pFormat = pFormatter->GetEntry(nKey);
+ const SvNumberformat* pFormat = pFormatter->GetEntry(nLclKey);
if ( pFormat )
aConditions.append( OUString( pFormat->GetFormatstring() ) );
@@ -2163,7 +2163,7 @@ SvXMLNumFmtHelper::~SvXMLNumFmtHelper()
delete pData;
}
-SvXMLStyleContext* SvXMLNumFmtHelper::CreateChildContext( SvXMLImport& rImport,
+SvXMLStyleContext* SvXMLNumFmtHelper::CreateChildContext( SvXMLImport& rInImport,
USHORT nPrefix, const OUString& rLocalName,
const uno::Reference<xml::sax::XAttributeList>& xAttrList,
SvXMLStylesContext& rStyles )
@@ -2181,7 +2181,7 @@ SvXMLStyleContext* SvXMLNumFmtHelper::CreateChildContext( SvXMLImport& rImport,
case XML_TOK_STYLES_TIME_STYLE:
case XML_TOK_STYLES_BOOLEAN_STYLE:
case XML_TOK_STYLES_TEXT_STYLE:
- pContext = new SvXMLNumFormatContext( rImport, nPrefix, rLocalName,
+ pContext = new SvXMLNumFormatContext( rInImport, nPrefix, rLocalName,
pData, nToken, xAttrList, rStyles );
break;
}
commit 222bf57a50c053aa1b62915b8d7d00160c19549b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Apr 2 17:04:32 2011 +0100
use rtl::Static where double-locked pattern used
diff --git a/filter/source/config/cache/registration.cxx b/filter/source/config/cache/registration.cxx
index 11f7a4d..7c57335 100644
--- a/filter/source/config/cache/registration.cxx
+++ b/filter/source/config/cache/registration.cxx
@@ -31,6 +31,8 @@
#include "registration.hxx"
+#include <rtl/instance.hxx>
+
//_______________________________________________
// includes
@@ -59,14 +61,13 @@ namespace css = ::com::sun::star;
// definitions
rtl::OUString pFilterStrings[19];
-static bool bInitialized = false;
-static void InitConstants()
+namespace
{
- if (!bInitialized)
+ class doInitConstants
{
- ::osl::MutexGuard aGuard(::osl::Mutex::getGlobalMutex());
- if (!bInitialized)
+ public:
+ doInitConstants()
{
PROPNAME_NAME;
PROPNAME_UINAME;
@@ -87,9 +88,15 @@ static void InitConstants()
PROPNAME_TEMPLATENAME;
PROPNAME_FILEFORMATVERSION;
PROPNAME_TYPES;
- bInitialized = true;
}
- }
+ };
+
+ struct theConstantsInitializer : public rtl::Static< doInitConstants, theConstantsInitializer > {};
+}
+
+static void InitConstants()
+{
+ theConstantsInitializer::get();
}
// extern "C" component_getImplementationEnvironment()
diff --git a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
index 9bb0ab5..4a8e927 100644
--- a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
+++ b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
@@ -48,6 +48,7 @@
#include <toolkit/awt/vclxwindow.hxx>
#include <tools/resmgr.hxx>
#include <vcl/svapp.hxx>
+#include <rtl/instance.hxx>
#include <svl/solar.hrc>
@@ -236,32 +237,25 @@ Reference< XInterface > SAL_CALL XMLFilterDialogComponent_createInstance( const
//-------------------------------------------------------------------------
+namespace { struct lcl_ImplId : public rtl::Static< ::cppu::OImplementationId, lcl_ImplId > {}; }
+
Sequence< sal_Int8 > SAL_CALL XMLFilterDialogComponent::getImplementationId( void ) throw( RuntimeException )
{
- static OImplementationId* pId = 0;
- if( !pId )
- {
- MutexGuard aGuard( Mutex::getGlobalMutex() );
- if( !pId)
- {
- static OImplementationId aId;
- pId = &aId;
- }
- }
- return pId->getImplementationId();
+ ::cppu::OImplementationId &rID = lcl_ImplId::get();
+ return rID.getImplementationId();
}
//-------------------------------------------------------------------------
-Sequence< Type > XMLFilterDialogComponent::getTypes() throw (RuntimeException)
+namespace
{
- static OTypeCollection * s_pTypes = 0;
- if (! s_pTypes)
+ class DialogComponentTypes
{
- MutexGuard aGuard( Mutex::getGlobalMutex() );
- if (! s_pTypes)
- {
- static OTypeCollection s_aTypes(
+ private:
+ OTypeCollection m_aTypes;
+ public:
+ DialogComponentTypes() :
+ m_aTypes(
::getCppuType( (const Reference< XComponent > *)0 ),
::getCppuType( (const Reference< XTypeProvider > *)0 ),
::getCppuType( (const Reference< XAggregation > *)0 ),
@@ -269,11 +263,18 @@ Sequence< Type > XMLFilterDialogComponent::getTypes() throw (RuntimeException)
::getCppuType( (const Reference< XServiceInfo > *)0 ),
::getCppuType( (const Reference< XInitialization > *)0 ),
::getCppuType( (const Reference< XTerminateListener > *)0 ),
- ::getCppuType( (const Reference< ::com::sun::star::ui::dialogs::XExecutableDialog > *)0 ));
- s_pTypes = &s_aTypes;
+ ::getCppuType( (const Reference< ::com::sun::star::ui::dialogs::XExecutableDialog > *)0 ))
+ {
}
- }
- return s_pTypes->getTypes();
+ OTypeCollection& getTypeCollection() { return m_aTypes; }
+ };
+
+ struct theDialogComponentTypes : rtl::Static<DialogComponentTypes, theDialogComponentTypes> {};
+}
+
+Sequence< Type > XMLFilterDialogComponent::getTypes() throw (RuntimeException)
+{
+ return theDialogComponentTypes::get().getTypeCollection().getTypes();
}
//-------------------------------------------------------------------------
commit 6f1a4bcc6d5b864a81dc35c7e83e360d223dfd39
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Apr 2 16:48:23 2011 +0100
ditch commented out code
diff --git a/filter/source/t602/t602filter.cxx b/filter/source/t602/t602filter.cxx
index d049271..0c2144d 100644
--- a/filter/source/t602/t602filter.cxx
+++ b/filter/source/t602/t602filter.cxx
@@ -918,27 +918,6 @@ Reference< XInterface > SAL_CALL T602ImportFilter_createInstance( const Referenc
return (cppu::OWeakObject*) new T602ImportFilter( rSMgr );
}
-/* Reference < XInterface > SAL_CALL CreateInstance( const Reference< XMultiServiceFactory > &r)
-throw ( Exception )
-{
- return Reference< XInterface > (( OWeakObject *) new T602ImportFilter(r));
-}
-
-Sequence < OUString > getSupportedServiceNames()
-throw ( RuntimeException )
-{
- static Sequence < OUString > *pNames = 0;
- if( ! pNames ) {
- MutexGuard guard( Mutex::getGlobalMutex() );
- if( !pNames ) {
- static Sequence< OUString > seqNames(2);
- seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(IMPLEMENTATION_NAME));
- pNames = &seqNames;
- }
- }
- return *pNames;
-}*/
-
T602ImportFilterDialog::T602ImportFilterDialog(const ::com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory > &r ) :
mxMSF( r ), mpResMgr( NULL ) {}
commit cb1c83de6c072695da6d08e5b6593ddac7b8c8ac
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Apr 2 16:23:53 2011 +0100
stick into anon namespace
diff --git a/filter/source/config/cache/basecontainer.cxx b/filter/source/config/cache/basecontainer.cxx
index f4e1044..d150595 100644
--- a/filter/source/config/cache/basecontainer.cxx
+++ b/filter/source/config/cache/basecontainer.cxx
@@ -53,11 +53,17 @@ namespace filter{
//_______________________________________________
// definitions
-typedef ::salhelper::SingletonRef< FilterCache > FilterCacheRefHold;
-/** @short hold at least one filter cache instance alive and
- prevent the office from unloading this cache if no filter
- is currently used.*/
-struct thePerformanceOptimizer : public rtl::Static<FilterCacheRefHold, thePerformanceOptimizer> {};
+namespace
+{
+ typedef ::salhelper::SingletonRef< FilterCache > FilterCacheRefHold;
+ /** @short hold at least one filter cache instance alive and
+ prevent the office from unloading this cache if no filter
+ is currently used.*/
+ struct thePerformanceOptimizer :
+ public rtl::Static<FilterCacheRefHold, thePerformanceOptimizer>
+ {
+ };
+}
BaseContainer::BaseContainer()
: BaseLock ( )
commit 7decec9ace816716eaf8e7e79e542ae754730f79
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Apr 2 15:59:15 2011 +0100
use rtl::Static pattern here
diff --git a/filter/source/config/cache/basecontainer.cxx b/filter/source/config/cache/basecontainer.cxx
index bf01fb8..f4e1044 100644
--- a/filter/source/config/cache/basecontainer.cxx
+++ b/filter/source/config/cache/basecontainer.cxx
@@ -38,6 +38,7 @@
#include <com/sun/star/uno/Type.h>
#include <comphelper/enumhelper.hxx>
#include <osl/diagnose.h>
+#include <rtl/instance.hxx>
//_______________________________________________
// namespace
@@ -52,9 +53,11 @@ namespace filter{
//_______________________________________________
// definitions
-::salhelper::SingletonRef< FilterCache >* BaseContainer::m_pPerformanceOptimizer = 0;
-
-
+typedef ::salhelper::SingletonRef< FilterCache > FilterCacheRefHold;
+/** @short hold at least one filter cache instance alive and
+ prevent the office from unloading this cache if no filter
+ is currently used.*/
+struct thePerformanceOptimizer : public rtl::Static<FilterCacheRefHold, thePerformanceOptimizer> {};
BaseContainer::BaseContainer()
: BaseLock ( )
@@ -64,13 +67,7 @@ BaseContainer::BaseContainer()
{
m_rCache->load(FilterCache::E_CONTAINS_STANDARD);
- // GLOBAL SAFE (!) -> -----------------------
- // TODO use rtl pattern to create it realy threadsafe!
- ::osl::ResettableMutexGuard aGlobalLock(::osl::Mutex::getGlobalMutex());
- if (!m_pPerformanceOptimizer)
- m_pPerformanceOptimizer = new ::salhelper::SingletonRef< FilterCache >();
- aGlobalLock.clear();
- // <- GLOBAL SAFE (!) -----------------------
+ thePerformanceOptimizer::get();
}
diff --git a/filter/source/config/cache/basecontainer.hxx b/filter/source/config/cache/basecontainer.hxx
index ba13b7a..9950200 100644
--- a/filter/source/config/cache/basecontainer.hxx
+++ b/filter/source/config/cache/basecontainer.hxx
@@ -123,11 +123,6 @@ class BaseContainer : public BaseLock
/** @short holds all listener, which are registered at this instance. */
::cppu::OMultiTypeInterfaceContainerHelper m_lListener;
- /** @short hold at least on filter cache instance alive and
- prevent he office from unloading this cache if no filter
- is currently used.*/
- static ::salhelper::SingletonRef< FilterCache >* m_pPerformanceOptimizer;
-
//-------------------------------------------
// native interface
More information about the Libreoffice-commits
mailing list