[Libreoffice-commits] .: 2 commits - binfilter/bf_svx
Caolán McNamara
caolan at kemper.freedesktop.org
Mon Jan 17 01:35:15 PST 2011
binfilter/bf_svx/source/form/makefile.mk | 2
binfilter/bf_svx/source/form/svx_ParseContext.cxx | 11 +++
binfilter/bf_svx/source/form/svx_siimport.cxx | 2
binfilter/bf_svx/source/xml/makefile.mk | 2
binfilter/bf_svx/source/xml/svx_xmleohlp.cxx | 35 +++++------
binfilter/bf_svx/source/xml/svx_xmlgrhlp.cxx | 14 ++--
binfilter/bf_svx/source/xml/svx_xmltxtimp.cxx | 18 +++---
binfilter/bf_svx/source/xml/svx_xmlxtimp.cxx | 66 +++++++++++-----------
8 files changed, 79 insertions(+), 71 deletions(-)
New commits:
commit feebe5ccc5558f3ca53c86a246ce40019c0317a0
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 17 09:23:05 2011 +0000
WaE: this dir is now warnings free
diff --git a/binfilter/bf_svx/source/xml/makefile.mk b/binfilter/bf_svx/source/xml/makefile.mk
index d272c85..54a6979 100644
--- a/binfilter/bf_svx/source/xml/makefile.mk
+++ b/binfilter/bf_svx/source/xml/makefile.mk
@@ -25,8 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
PRJ=..$/..$/..
BFPRJ=..$/..
diff --git a/binfilter/bf_svx/source/xml/svx_xmleohlp.cxx b/binfilter/bf_svx/source/xml/svx_xmleohlp.cxx
index d50b126..cb0a21c 100644
--- a/binfilter/bf_svx/source/xml/svx_xmleohlp.cxx
+++ b/binfilter/bf_svx/source/xml/svx_xmleohlp.cxx
@@ -121,29 +121,29 @@ public:
/*N*/ }
/*?*/ sal_Int32 SAL_CALL InputStorageWrapper_Impl::readSomeBytes(
-/*?*/ Sequence< sal_Int8 >& aData,
-/*?*/ sal_Int32 nMaxBytesToRead)
+/*?*/ Sequence< sal_Int8 >& /*rData*/,
+/*?*/ sal_Int32 /*nMaxBytesToRead*/)
/*?*/ throw(NotConnectedException, BufferSizeExceededException, RuntimeException)
/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 MutexGuard aGuard( maMutex );
+/*?*/ DBG_BF_ASSERT(0, "STRIP"); return 0;
/*?*/ }
-/*?*/ void SAL_CALL InputStorageWrapper_Impl::skipBytes( sal_Int32 nBytesToSkip )
+/*?*/ void SAL_CALL InputStorageWrapper_Impl::skipBytes( sal_Int32 /*nBytesToSkip*/ )
/*?*/ throw(NotConnectedException, BufferSizeExceededException, RuntimeException)
/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 MutexGuard aGuard( maMutex );
+/*?*/ DBG_BF_ASSERT(0, "STRIP");
/*?*/ }
/*?*/ sal_Int32 SAL_CALL InputStorageWrapper_Impl::available()
/*?*/ throw(NotConnectedException, RuntimeException)
/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); return NULL;//STRIP001 MutexGuard aGuard( maMutex );
+/*?*/ DBG_BF_ASSERT(0, "STRIP"); return 0;
/*?*/ }
/*?*/ void SAL_CALL InputStorageWrapper_Impl::closeInput()
/*?*/ throw(NotConnectedException, RuntimeException)
/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 MutexGuard aGuard( maMutex );
+/*?*/ DBG_BF_ASSERT(0, "STRIP");
/*?*/ }
// -----------------------------------------------------------------------------
@@ -245,8 +245,8 @@ struct OUStringLess
/*N*/ maDefaultContainerStorageName( RTL_CONSTASCII_USTRINGPARAM(XML_CONTAINERSTORAGE_NAME) ),
/*N*/ mpRootStorage( 0 ),
/*N*/ mpDocPersist( 0 ),
-/*N*/ mpStreamMap( 0 ),
-/*N*/ meCreateMode( EMBEDDEDOBJECTHELPER_MODE_READ )
+/*N*/ meCreateMode( EMBEDDEDOBJECTHELPER_MODE_READ ),
+/*N*/ mpStreamMap( 0 )
/*N*/ {
/*N*/ }
@@ -255,8 +255,8 @@ struct OUStringLess
/*N*/ maDefaultContainerStorageName( RTL_CONSTASCII_USTRINGPARAM(XML_CONTAINERSTORAGE_NAME) ),
/*N*/ mpRootStorage( 0 ),
/*N*/ mpDocPersist( 0 ),
-/*N*/ mpStreamMap( 0 ),
-/*N*/ meCreateMode( EMBEDDEDOBJECTHELPER_MODE_READ )
+/*N*/ meCreateMode( EMBEDDEDOBJECTHELPER_MODE_READ ),
+/*N*/ mpStreamMap( 0 )
/*N*/ {
/*N*/ Init( 0, rDocPersist, eCreateMode );
/*N*/ }
@@ -270,7 +270,7 @@ struct OUStringLess
/*N*/ {
/*?*/ SvXMLEmbeddedObjectHelper_Impl::iterator aIter = mpStreamMap->begin();
/*?*/ SvXMLEmbeddedObjectHelper_Impl::iterator aEnd = mpStreamMap->end();
-/*?*/ for( aIter; aIter != aEnd; ++aIter )
+/*?*/ for( ; aIter != aEnd; ++aIter )
/*?*/ {
/*?*/ if( aIter->second )
/*?*/ {
@@ -302,7 +302,6 @@ struct OUStringLess
/*N*/ // or: #<path>/<object-name>
/*N*/ // or: #<object-name>
/*N*/ // currently, path may only consist of a single directory name
-/*N*/ sal_Bool bRet = sal_False;
/*N*/
/*N*/ if( !rURLStr.getLength() )
/*N*/ return sal_False;
@@ -401,7 +400,7 @@ struct OUStringLess
/*?*/ SvStorageRef SvXMLEmbeddedObjectHelper::ImplGetObjectStorage(
/*?*/ const OUString& rContainerStorageName,
/*?*/ const OUString& rObjectStorageName,
-/*?*/ sal_Bool bUCBStorage )
+/*?*/ sal_Bool /*bUCBStorage*/ )
/*?*/ {
/*?*/ SvStorageRef xObjStor;
/*?*/ SvStorageRef xCntnrStor( ImplGetContainerStorage( rContainerStorageName ) );
@@ -608,7 +607,7 @@ struct OUStringLess
/*N*/ SvStorage& rRootStorage,
/*N*/ SvPersist& rDocPersist,
/*N*/ SvXMLEmbeddedObjectHelperMode eCreateMode,
-/*N*/ sal_Bool bDirect )
+/*N*/ sal_Bool /*bDirect*/ )
/*N*/ {
/*N*/ SvXMLEmbeddedObjectHelper* pThis = new SvXMLEmbeddedObjectHelper;
/*N*/
@@ -707,13 +706,13 @@ struct OUStringLess
/*?*/ Sequence< OUString > SAL_CALL SvXMLEmbeddedObjectHelper::getElementNames()
/*?*/ throw (RuntimeException)
/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); Sequence< OUString > aSeq; return aSeq;//STRIP001 MutexGuard aGuard( maMutex );
+/*?*/ DBG_BF_ASSERT(0, "STRIP"); Sequence< OUString > aSeq; return aSeq;
/*?*/ }
-/*?*/ sal_Bool SAL_CALL SvXMLEmbeddedObjectHelper::hasByName( const OUString& rURLStr )
+/*?*/ sal_Bool SAL_CALL SvXMLEmbeddedObjectHelper::hasByName( const OUString& )
/*?*/ throw (RuntimeException)
/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 MutexGuard aGuard( maMutex );
+/*?*/ DBG_BF_ASSERT(0, "STRIP"); return FALSE;
/*?*/ }
// XNameAccess
diff --git a/binfilter/bf_svx/source/xml/svx_xmlgrhlp.cxx b/binfilter/bf_svx/source/xml/svx_xmlgrhlp.cxx
index 98e7c3b..9351206 100644
--- a/binfilter/bf_svx/source/xml/svx_xmlgrhlp.cxx
+++ b/binfilter/bf_svx/source/xml/svx_xmlgrhlp.cxx
@@ -156,32 +156,32 @@ public:
// -----------------------------------------------------------------------------
-/*?*/ sal_Int32 SAL_CALL SvXMLGraphicInputStream::readSomeBytes( Sequence< sal_Int8 >& rData, sal_Int32 nMaxBytesToRead )
+/*?*/ sal_Int32 SAL_CALL SvXMLGraphicInputStream::readSomeBytes( Sequence< sal_Int8 >& /*rData*/, sal_Int32 /*nMaxBytesToRead*/ )
/*?*/ throw( NotConnectedException, BufferSizeExceededException, RuntimeException )
/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 if( !mxStmWrapper.is() )
+/*?*/ DBG_BF_ASSERT(0, "STRIP"); return 0;
/*?*/ }
// -----------------------------------------------------------------------------
-/*?*/ void SAL_CALL SvXMLGraphicInputStream::skipBytes( sal_Int32 nBytesToSkip )
+/*?*/ void SAL_CALL SvXMLGraphicInputStream::skipBytes( sal_Int32 /*nBytesToSkip*/ )
/*?*/ throw( NotConnectedException, BufferSizeExceededException, RuntimeException )
/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if( !mxStmWrapper.is() )
+/*?*/ DBG_BF_ASSERT(0, "STRIP");
/*?*/ }
// -----------------------------------------------------------------------------
/*?*/ sal_Int32 SAL_CALL SvXMLGraphicInputStream::available() throw( NotConnectedException, RuntimeException )
/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 if( !mxStmWrapper.is() )
+/*?*/ DBG_BF_ASSERT(0, "STRIP"); return 0;
/*?*/ }
// -----------------------------------------------------------------------------
/*?*/ void SAL_CALL SvXMLGraphicInputStream::closeInput() throw( NotConnectedException, RuntimeException )
/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if( !mxStmWrapper.is() )
+/*?*/ DBG_BF_ASSERT(0, "STRIP");
/*?*/ }
// ----------------------------
@@ -256,7 +256,7 @@ public:
/*?*/ void SAL_CALL SvXMLGraphicOutputStream::flush()
/*?*/ throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException )
/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if( !mxStmWrapper.is() )
+/*?*/ DBG_BF_ASSERT(0, "STRIP");
/*?*/ }
// -----------------------------------------------------------------------------
diff --git a/binfilter/bf_svx/source/xml/svx_xmltxtimp.cxx b/binfilter/bf_svx/source/xml/svx_xmltxtimp.cxx
index a0cc13f..00e9e24 100644
--- a/binfilter/bf_svx/source/xml/svx_xmltxtimp.cxx
+++ b/binfilter/bf_svx/source/xml/svx_xmltxtimp.cxx
@@ -76,8 +76,8 @@ using rtl::OUString;
/*N*/
/*N*/ ///////////////////////////////////////////////////////////////////////
/*N*/
-/*N*/ SvxXMLTextImportContext::SvxXMLTextImportContext( SvXMLImport& rImport, USHORT nPrfx, const OUString& rLName, const Reference< XAttributeList >& xAttrList, const Reference< XText >& xText )
-/*N*/ : SvXMLImportContext( rImport, nPrfx, rLName ), mxText( xText )
+/*N*/ SvxXMLTextImportContext::SvxXMLTextImportContext( SvXMLImport& rInImport, USHORT nPrfx, const OUString& rLName, const Reference< XAttributeList >& /*xAttrList*/, const Reference< XText >& xText )
+/*N*/ : SvXMLImportContext( rInImport, nPrfx, rLName ), mxText( xText )
/*N*/ {
/*N*/ }
/*N*/
@@ -85,26 +85,26 @@ using rtl::OUString;
/*N*/ {
/*N*/ }
/*N*/
-/*N*/ SvXMLImportContext *SvxXMLTextImportContext::CreateChildContext( USHORT nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList )
+/*N*/ SvXMLImportContext *SvxXMLTextImportContext::CreateChildContext( USHORT nInPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList )
/*N*/ {
/*N*/ SvXMLImportContext* pContext = NULL;
-/*N*/ if(XML_NAMESPACE_OFFICE == nPrefix && IsXMLToken( rLocalName, XML_BODY ) )
+/*N*/ if(XML_NAMESPACE_OFFICE == nInPrefix && IsXMLToken( rLocalName, XML_BODY ) )
/*N*/ {
-/*N*/ pContext = new SvxXMLTextImportContext( GetImport(), nPrefix, rLocalName, xAttrList, mxText );
+/*N*/ pContext = new SvxXMLTextImportContext( GetImport(), nInPrefix, rLocalName, xAttrList, mxText );
/*N*/ }
-/*N*/ else if( XML_NAMESPACE_OFFICE == nPrefix && IsXMLToken( rLocalName, XML_AUTOMATIC_STYLES ) )
+/*N*/ else if( XML_NAMESPACE_OFFICE == nInPrefix && IsXMLToken( rLocalName, XML_AUTOMATIC_STYLES ) )
/*N*/ {
-/*N*/ pContext = new SvXMLStylesContext( GetImport(), nPrefix, rLocalName, xAttrList );
+/*N*/ pContext = new SvXMLStylesContext( GetImport(), nInPrefix, rLocalName, xAttrList );
/*N*/ GetImport().GetTextImport()->SetAutoStyles( (SvXMLStylesContext*)pContext );
/*N*/
/*N*/ }
/*N*/ else
/*N*/ {
-/*N*/ pContext = GetImport().GetTextImport()->CreateTextChildContext( GetImport(), nPrefix, rLocalName, xAttrList );
+/*N*/ pContext = GetImport().GetTextImport()->CreateTextChildContext( GetImport(), nInPrefix, rLocalName, xAttrList );
/*N*/ }
/*N*/
/*N*/ if( NULL == pContext )
-/*N*/ pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
+/*N*/ pContext = new SvXMLImportContext( GetImport(), nInPrefix, rLocalName );
/*N*/
/*N*/ return pContext;
/*N*/ }
diff --git a/binfilter/bf_svx/source/xml/svx_xmlxtimp.cxx b/binfilter/bf_svx/source/xml/svx_xmlxtimp.cxx
index fd4c42f..4bdef39 100644
--- a/binfilter/bf_svx/source/xml/svx_xmlxtimp.cxx
+++ b/binfilter/bf_svx/source/xml/svx_xmlxtimp.cxx
@@ -111,8 +111,10 @@ private:
///////////////////////////////////////////////////////////////////////
-/*N*/ SvxXMLTableImportContext::SvxXMLTableImportContext( SvXMLImport& rImport, USHORT nPrfx, const OUString& rLName, const Reference< XAttributeList >& xAttrList, SvxXMLTableImportContextEnum eContext, const Reference< XNameContainer >& xTable )
-/*N*/ : SvXMLImportContext( rImport, nPrfx, rLName ), meContext( eContext ), mxTable( xTable )
+/*N*/ SvxXMLTableImportContext::SvxXMLTableImportContext( SvXMLImport& rInImport, USHORT nPrfx, const OUString& rLName, const Reference< XAttributeList >& /*xAttrList*/, SvxXMLTableImportContextEnum eContext, const Reference< XNameContainer >& xTable )
+/*N*/ : SvXMLImportContext( rInImport, nPrfx, rLName )
+/*N*/ , mxTable( xTable )
+/*N*/ , meContext( eContext )
/*N*/ {
/*N*/ }
@@ -120,9 +122,9 @@ private:
/*N*/ {
/*N*/ }
-/*N*/ SvXMLImportContext *SvxXMLTableImportContext::CreateChildContext( USHORT nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList )
+/*N*/ SvXMLImportContext *SvxXMLTableImportContext::CreateChildContext( USHORT nInPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList )
/*N*/ {
-/*N*/ if( XML_NAMESPACE_DRAW == nPrefix )
+/*N*/ if( XML_NAMESPACE_DRAW == nInPrefix )
/*N*/ {
/*N*/ try
/*N*/ {
@@ -132,22 +134,24 @@ private:
/*N*/ switch( meContext )
/*N*/ {
/*N*/ case stice_color:
-/*N*/ importColor( nPrefix, rLocalName, xAttrList, aAny, aName );
+/*N*/ importColor( nInPrefix, rLocalName, xAttrList, aAny, aName );
/*N*/ break;
/*N*/ case stice_marker:
-/*N*/ importMarker( nPrefix, rLocalName, xAttrList, aAny, aName );
+/*N*/ importMarker( nInPrefix, rLocalName, xAttrList, aAny, aName );
/*N*/ break;
/*N*/ case stice_dash:
-/*N*/ importDash( nPrefix, rLocalName, xAttrList, aAny, aName );
+/*N*/ importDash( nInPrefix, rLocalName, xAttrList, aAny, aName );
/*N*/ break;
/*N*/ case stice_hatch:
-/*N*/ importHatch( nPrefix, rLocalName, xAttrList, aAny, aName );
+/*N*/ importHatch( nInPrefix, rLocalName, xAttrList, aAny, aName );
/*N*/ break;
/*N*/ case stice_gradient:
-/*N*/ importGradient( nPrefix, rLocalName, xAttrList, aAny, aName );
+/*N*/ importGradient( nInPrefix, rLocalName, xAttrList, aAny, aName );
/*N*/ break;
/*N*/ case stice_bitmap:
-/*N*/ importBitmap( nPrefix, rLocalName, xAttrList, aAny, aName );
+/*N*/ importBitmap( nInPrefix, rLocalName, xAttrList, aAny, aName );
+/*N*/ break;
+/*N*/ default:
/*N*/ break;
/*N*/ }
/*N*/
@@ -168,26 +172,26 @@ private:
/*N*/ }
/*N*/ }
/*N*/
-/*N*/ return new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
+/*N*/ return new SvXMLImportContext( GetImport(), nInPrefix, rLocalName );
/*N*/ }
-/*N*/ void SvxXMLTableImportContext::importColor( USHORT nPrfx, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName )
+/*N*/ void SvxXMLTableImportContext::importColor( USHORT /*nPrfx*/, const OUString& /*rLocalName*/, const Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName )
/*N*/ {
/*N*/ const sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
/*N*/ for( sal_Int16 i=0; i < nAttrCount; i++ )
/*N*/ {
/*N*/ const OUString& rFullAttrName = xAttrList->getNameByIndex( i );
-/*N*/ OUString aLocalName;
-/*N*/ sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( rFullAttrName, &aLocalName );
+/*N*/ OUString aLclLocalName;
+/*N*/ sal_uInt16 nLclPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( rFullAttrName, &aLclLocalName );
/*N*/
/*N*/
-/*N*/ if( XML_NAMESPACE_DRAW == nPrefix )
+/*N*/ if( XML_NAMESPACE_DRAW == nLclPrefix )
/*N*/ {
-/*N*/ if( aLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_name ) ) )
+/*N*/ if( aLclLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_name ) ) )
/*N*/ {
/*N*/ rName = xAttrList->getValueByIndex( i );
/*N*/ }
-/*N*/ else if( aLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_color ) ) )
+/*N*/ else if( aLclLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_color ) ) )
/*N*/ {
/*N*/ Color aColor;
/*N*/ SvXMLUnitConverter::convertColor(aColor, xAttrList->getValueByIndex( i ));
@@ -197,31 +201,31 @@ private:
/*N*/ }
/*N*/ }
-/*N*/ void SvxXMLTableImportContext::importMarker( USHORT nPrfx, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName )
+/*N*/ void SvxXMLTableImportContext::importMarker( USHORT /*nPrfx*/, const OUString& /*rLocalName*/, const Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName )
/*N*/ {
/*N*/ XMLMarkerStyleImport aMarkerStyle( GetImport() );
/*N*/ aMarkerStyle.importXML( xAttrList, rAny, rName );
/*N*/ }
-/*N*/ void SvxXMLTableImportContext::importDash( USHORT nPrfx, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName )
+/*N*/ void SvxXMLTableImportContext::importDash( USHORT /*nPrfx*/, const OUString& /*rLocalName*/, const Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName )
/*N*/ {
/*N*/ XMLDashStyleImport aDashStyle( GetImport() );
/*N*/ aDashStyle.importXML( xAttrList, rAny, rName );
/*N*/ }
-/*N*/ void SvxXMLTableImportContext::importHatch( USHORT nPrfx, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName )
+/*N*/ void SvxXMLTableImportContext::importHatch( USHORT /*nPrfx*/, const OUString& /*rLocalName*/, const Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName )
/*N*/ {
/*N*/ XMLHatchStyleImport aHatchStyle( GetImport() );
/*N*/ aHatchStyle.importXML( xAttrList, rAny, rName );
/*N*/ }
-/*N*/ void SvxXMLTableImportContext::importGradient( USHORT nPrfx, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName )
+/*N*/ void SvxXMLTableImportContext::importGradient( USHORT /*nPrfx*/, const OUString& /*rLocalName*/, const Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName )
/*N*/ {
/*N*/ XMLGradientStyleImport aGradientStyle( GetImport() );
/*N*/ aGradientStyle.importXML( xAttrList, rAny, rName );
/*N*/ }
-/*N*/ void SvxXMLTableImportContext::importBitmap( USHORT nPrfx, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName )
+/*N*/ void SvxXMLTableImportContext::importBitmap( USHORT /*nPrfx*/, const OUString& /*rLocalName*/, const Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName )
/*N*/ {
/*N*/ XMLImageStyle aImageStyle;
/*N*/ aImageStyle.importXML( xAttrList, rAny, rName, GetImport() );
@@ -330,45 +334,45 @@ private:
/*N*/ return bRet;
/*N*/ }
-/*N*/ SvXMLImportContext *SvxXMLXTableImport::CreateContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList )
+/*N*/ SvXMLImportContext *SvxXMLXTableImport::CreateContext( sal_uInt16 nInPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList )
/*N*/ {
-/*N*/ if( XML_NAMESPACE_OFFICE == nPrefix )
+/*N*/ if( XML_NAMESPACE_OFFICE == nInPrefix )
/*N*/ {
/*N*/ Type aType = mrTable->getElementType();
/*N*/
/*N*/ if( rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "color-table" ) ) )
/*N*/ {
/*N*/ if( aType == ::getCppuType((const sal_Int32*)0) )
-/*N*/ return new SvxXMLTableImportContext( *this, nPrefix, rLocalName, xAttrList, stice_color, mrTable );
+/*N*/ return new SvxXMLTableImportContext( *this, nInPrefix, rLocalName, xAttrList, stice_color, mrTable );
/*N*/ }
/*N*/ else if( rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "marker-table" ) ) )
/*N*/ {
/*N*/ if( aType == ::getCppuType((const drawing::PolyPolygonBezierCoords*)0) )
-/*N*/ return new SvxXMLTableImportContext( *this, nPrefix, rLocalName, xAttrList, stice_marker, mrTable );
+/*N*/ return new SvxXMLTableImportContext( *this, nInPrefix, rLocalName, xAttrList, stice_marker, mrTable );
/*N*/ }
/*N*/ else if( rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "dash-table" ) ) )
/*N*/ {
/*N*/ if( aType == ::getCppuType((const drawing::LineDash*)0) )
-/*N*/ return new SvxXMLTableImportContext( *this, nPrefix, rLocalName, xAttrList, stice_dash, mrTable );
+/*N*/ return new SvxXMLTableImportContext( *this, nInPrefix, rLocalName, xAttrList, stice_dash, mrTable );
/*N*/ }
/*N*/ else if( rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "hatch-table" ) ) )
/*N*/ {
/*N*/ if( aType == ::getCppuType((const drawing::Hatch*)0) )
-/*N*/ return new SvxXMLTableImportContext( *this, nPrefix, rLocalName, xAttrList, stice_hatch, mrTable );
+/*N*/ return new SvxXMLTableImportContext( *this, nInPrefix, rLocalName, xAttrList, stice_hatch, mrTable );
/*N*/ }
/*N*/ else if( rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "gradient-table" ) ) )
/*N*/ {
/*N*/ if( aType == ::getCppuType((const awt::Gradient*)0))
-/*N*/ return new SvxXMLTableImportContext( *this, nPrefix, rLocalName, xAttrList, stice_gradient, mrTable );
+/*N*/ return new SvxXMLTableImportContext( *this, nInPrefix, rLocalName, xAttrList, stice_gradient, mrTable );
/*N*/ }
/*N*/ else if( rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "bitmap-table" ) ) )
/*N*/ {
/*N*/ if( aType == ::getCppuType((const OUString*)0))
-/*N*/ return new SvxXMLTableImportContext( *this, nPrefix, rLocalName, xAttrList, stice_bitmap, mrTable );
+/*N*/ return new SvxXMLTableImportContext( *this, nInPrefix, rLocalName, xAttrList, stice_bitmap, mrTable );
/*N*/ }
/*N*/ }
/*N*/
-/*?*/ return new SvXMLImportContext( *this, nPrefix, rLocalName );
+/*?*/ return new SvXMLImportContext( *this, nInPrefix, rLocalName );
/*N*/ }
}
commit 6e6199f11c17b5ac236488756bf4ea28436615bf
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 17 09:06:25 2011 +0000
WaE: this dir is now warnings free
diff --git a/binfilter/bf_svx/source/form/makefile.mk b/binfilter/bf_svx/source/form/makefile.mk
index 9dc029e..3824b18 100644
--- a/binfilter/bf_svx/source/form/makefile.mk
+++ b/binfilter/bf_svx/source/form/makefile.mk
@@ -25,8 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
PRJ=..$/..$/..
BFPRJ=..$/..
diff --git a/binfilter/bf_svx/source/form/svx_ParseContext.cxx b/binfilter/bf_svx/source/form/svx_ParseContext.cxx
index 1639289..a74ed38 100644
--- a/binfilter/bf_svx/source/form/svx_ParseContext.cxx
+++ b/binfilter/bf_svx/source/form/svx_ParseContext.cxx
@@ -97,8 +97,17 @@ namespace
/*N*/ OSystemParseContext* getSharedContext(OSystemParseContext* _pContext = NULL,sal_Bool _bSet = sal_False)
/*N*/ {
/*N*/ static OSystemParseContext* s_pSharedContext = NULL;
-/*N*/ if ( _pContext && !s_pSharedContext || _bSet )
+/*N*/ if ( _pContext && !s_pSharedContext )
+/*N*/ {
/*N*/ s_pSharedContext = _pContext;
+/*N*/ return s_pSharedContext;
+/*N*/ }
+/*N*/ if ( _bSet )
+/*N*/ {
+/*N*/ OSystemParseContext* pReturn = _pContext ? _pContext : s_pSharedContext;
+/*N*/ s_pSharedContext = _pContext;
+/*N*/ return pReturn;
+/*N*/ }
/*N*/ return s_pSharedContext;
}
// -----------------------------------------------------------------------------
diff --git a/binfilter/bf_svx/source/form/svx_siimport.cxx b/binfilter/bf_svx/source/form/svx_siimport.cxx
index 2201923..9274ecd 100644
--- a/binfilter/bf_svx/source/form/svx_siimport.cxx
+++ b/binfilter/bf_svx/source/form/svx_siimport.cxx
@@ -125,7 +125,7 @@ public:
/*N*/ {
/*N*/ if( pObjFactory->nInventor == SiInventor )
/*N*/ {
-/*N*/ if( ((pObjFactory->nIdentifier >= OBJ_CHECKBOX) && (pObjFactory->nIdentifier <= OBJ_VSCROLLBAR)) ||
+/*N*/ if( pObjFactory->nIdentifier <= OBJ_VSCROLLBAR ||
/*N*/ pObjFactory->nIdentifier == OBJ_URLBUTTON )
/*N*/ {
/*N*/ switch( pObjFactory->nIdentifier )
More information about the Libreoffice-commits
mailing list