Author: damjan
Date: Wed Feb 24 00:21:16 2016
New Revision: 1731997
URL: http://svn.apache.org/viewvc?rev=1731997&view=rev
Log:
Merge r1409428 from branches/gbuild.
Modified:
openoffice/branches/gbuild-reintegration/ (props changed)
openoffice/branches/gbuild-reintegration/main/writerfilter/qa/cppunittests/xxml/testXXML.cxx
openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/DomainMapper.cxx
openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/DomainMapperTableManager.cxx
openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/DomainMapper_Impl.cxx
openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/FormControlHelper.cxx
openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/GraphicImport.cxx
openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/ModelEventListener.cxx
openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/NumberingManager.cxx
openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/NumberingManager.hxx
openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/OLEHandler.cxx
openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/PropertyMap.cxx
openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/PropertyMapHelper.cxx
openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/StyleSheetTable.cxx
Propchange: openoffice/branches/gbuild-reintegration/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 24 00:21:16 2016
@@ -1,4 +1,4 @@
-/incubator/ooo/branches/gbuild:1409313-1409425,1409470
+/incubator/ooo/branches/gbuild:1409313-1409425,1409428,1409470
/openoffice/branches/AOO400:1503684
/openoffice/branches/AOO410:1572480,1573601,1583349,1583635,1583666
/openoffice/branches/alg_writerframes:1556289-1579189
Modified:
openoffice/branches/gbuild-reintegration/main/writerfilter/qa/cppunittests/xxml/testXXML.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/writerfilter/qa/cppunittests/xxml/testXXML.cxx?rev=1731997&r1=1731996&r2=1731997&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/writerfilter/qa/cppunittests/xxml/testXXML.cxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/writerfilter/qa/cppunittests/xxml/testXXML.cxx
Wed Feb 24 00:21:16 2016
@@ -123,25 +123,29 @@ public:
}
virtual void endElement(QName_t name)
{
- //printf("</{%s}:%s>\n",
QName::serializer().getNamespaceUri(name),
QName::serializer().getLocalName(name));
- events++;
- switch(name)
- {
- case NS_table::LN_table:
- case NS_ss11::LN_Table:
- currentRow->append(*currentTable);
- currentRow=NULL;
- break;
- case NS_table::LN_table_row:
- case NS_ss11::LN_Row:
- currentCell->append(*currentRow);
- currentCell=NULL;
- break;
- case NS_table::LN_table_cell:
- case NS_ss11::LN_Cell:
- break;
-
- };
+ //printf("</{%s}:%s>\n",
QName::serializer().getNamespaceUri(name),
QName::serializer().getLocalName(name));
+ events++;
+ switch(name)
+ {
+ case NS_table::LN_table:
+ case NS_ss11::LN_Table:
+ if (currentTable != NULL)
+ {
+ currentRow->append(*currentTable);
+ }
+ currentRow=NULL;
+ break;
+ case NS_table::LN_table_row:
+ case NS_ss11::LN_Row:
+ if (currentRow != NULL)
+ currentCell->append(*currentRow);
+ currentCell=NULL;
+ break;
+ case NS_table::LN_table_cell:
+ case NS_ss11::LN_Cell:
+ break;
+
+ };
}
virtual void characters(const xxml::Value &value)
{
Modified:
openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/DomainMapper.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/DomainMapper.cxx?rev=1731997&r1=1731996&r2=1731997&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/DomainMapper.cxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/DomainMapper.cxx
Wed Feb 24 00:21:16 2016
@@ -3908,8 +3908,9 @@ void DomainMapper::sprmWithProps( Sprm&
xLineNumberingPropSet->setPropertyValue(rNameSupplier.GetName(
PROP_DISTANCE ), uno::makeAny(aSettings.nDistance) );
xLineNumberingPropSet->setPropertyValue(rNameSupplier.GetName(
PROP_RESTART_AT_EACH_PAGE ), uno::makeAny(aSettings.bRestartAtEachPage) );
}
- catch( const uno::Exception& )
+ catch( const uno::Exception& e)
{
+ (void) e;
}
}
@@ -4197,8 +4198,9 @@ void DomainMapper::sprmWithProps( Sprm&
uno::makeAny( nNumType ));
}
}
- catch( const uno::Exception& )
+ catch( const uno::Exception& e)
{
+ (void) e;
}
}
break;
@@ -4570,8 +4572,9 @@ void DomainMapper::lcl_utext(const sal_u
}
}
- catch( const uno::RuntimeException& )
+ catch( const uno::RuntimeException& e)
{
+ (void) e;
}
}
/*-- 09.06.2006 09:52:15---------------------------------------------------
Modified:
openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/DomainMapperTableHandler.cxx?rev=1731997&r1=1731996&r2=1731997&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
Wed Feb 24 00:21:16 2016
@@ -748,12 +748,14 @@ void DomainMapperTableHandler::endTable(
}
catch (lang::IllegalArgumentException e)
{
+ (void) e;
#ifdef DEBUG_DMAPPER_TABLE_HANDLER
dmapper_logger->chars("failed to import table!");
#endif
}
catch ( uno::Exception e )
{
+ (void) e;
#ifdef DEBUG_DMAPPER_TABLE_HANDLER
dmapper_logger->startElement("exception");
dmapper_logger->chars(rtl::OUStringToOString( e.Message,
RTL_TEXTENCODING_UTF8 ).getStr( ));
Modified:
openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/DomainMapperTableManager.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/DomainMapperTableManager.cxx?rev=1731997&r1=1731996&r2=1731997&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/DomainMapperTableManager.cxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/DomainMapperTableManager.cxx
Wed Feb 24 00:21:16 2016
@@ -66,8 +66,8 @@ DomainMapperTableManager::DomainMapperTa
-----------------------------------------------------------------------*/
DomainMapperTableManager::~DomainMapperTableManager()
{
- if ( m_pTablePropsHandler )
- delete m_pTablePropsHandler, m_pTablePropsHandler = NULL;
+ delete m_pTablePropsHandler;
+ m_pTablePropsHandler = NULL;
}
/*-- 23.04.2007 15:25:37---------------------------------------------------
Modified:
openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/DomainMapper_Impl.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/DomainMapper_Impl.cxx?rev=1731997&r1=1731996&r2=1731997&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/DomainMapper_Impl.cxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/DomainMapper_Impl.cxx
Wed Feb 24 00:21:16 2016
@@ -218,8 +218,9 @@ void DomainMapper_Impl::SetDocumentSetti
{
xSettings->setPropertyValue( rPropName, rValue );
}
- catch( const uno::Exception& )
+ catch( const uno::Exception& e)
{
+ (void) e;
}
}
}
@@ -251,9 +252,22 @@ void DomainMapper_Impl::SetIsLastParagra
void DomainMapper_Impl::PushProperties(ContextType eId)
{
SectionPropertyMap* pSectionContext = 0;
- PropertyMapPtr pInsert(eId == CONTEXT_SECTION ?
- (pSectionContext = new SectionPropertyMap( m_bIsFirstSection )) :
- eId == CONTEXT_PARAGRAPH ? new ParagraphPropertyMap : new
PropertyMap);
+ PropertyMapPtr pInsert;
+
+ switch (eId)
+ {
+ case CONTEXT_SECTION:
+ pSectionContext = new SectionPropertyMap( m_bIsFirstSection );
+ pInsert.reset(pSectionContext);
+ break;
+ case CONTEXT_PARAGRAPH:
+ pInsert.reset(new ParagraphPropertyMap);
+ break;
+ default:
+ pInsert.reset(new PropertyMap);
+ break;
+ }
+
if(eId == CONTEXT_SECTION)
{
if( m_bIsFirstSection )
@@ -846,9 +860,10 @@ void DomainMapper_Impl::finishParagraph(
#endif
xObj->attach( xTextRange );
}
- catch ( uno::RuntimeException& )
+ catch ( uno::RuntimeException& e)
{
// this is normal: the shape is already attached
+ (void) e;
}
m_aAnchoredStack.pop( );
}
@@ -954,11 +969,13 @@ void DomainMapper_Impl::appendTextConten
{
xTextAppendAndConvert->appendTextContent( xContent,
xPropertyValues );
}
- catch(const lang::IllegalArgumentException& )
+ catch(const lang::IllegalArgumentException& e)
{
+ (void) e;
}
- catch(const uno::Exception& )
+ catch(const uno::Exception& e)
{
+ (void) e;
}
}
}
@@ -1025,8 +1042,9 @@ uno::Reference< beans::XPropertySet > Do
xSection->attach( uno::Reference< text::XTextRange >( xCursor,
uno::UNO_QUERY_THROW) );
xRet = uno::Reference< beans::XPropertySet > (xSection,
uno::UNO_QUERY );
}
- catch(const uno::Exception& )
+ catch(const uno::Exception& e)
{
+ (void) e;
}
}
@@ -1066,8 +1084,9 @@ void DomainMapper_Impl::PushPageHeader(S
xPageStyle->getPropertyValue(rPropNameSupplier.GetName( bLeft ?
PROP_HEADER_TEXT_LEFT : PROP_HEADER_TEXT) ) >>= xHeaderText;
m_aTextAppendStack.push( uno::Reference< text::XTextAppend >(
xHeaderText, uno::UNO_QUERY_THROW));
}
- catch( uno::Exception& )
+ catch( uno::Exception& e)
{
+ (void) e;
}
}
}
@@ -1103,8 +1122,9 @@ void DomainMapper_Impl::PushPageFooter(S
xPageStyle->getPropertyValue(rPropNameSupplier.GetName( bLeft ?
PROP_FOOTER_TEXT_LEFT : PROP_FOOTER_TEXT) ) >>= xFooterText;
m_aTextAppendStack.push(uno::Reference< text::XTextAppend >(
xFooterText, uno::UNO_QUERY_THROW ));
}
- catch( uno::Exception& )
+ catch( uno::Exception& e)
{
+ (void) e;
}
}
}
@@ -1334,6 +1354,7 @@ void DomainMapper_Impl::PushShapeContext
}
catch ( const uno::Exception& e )
{
+ (void) e;
#if DEBUG
clog << "Exception when adding shape: ";
clog << rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8
).getStr( );
@@ -2256,8 +2277,9 @@ void DomainMapper_Impl::SetNumberFormat(
PropertyNameSupplier::GetPropertyNameSupplier().GetName(PROP_NUMBER_FORMAT),
uno::makeAny( nKey ));
}
- catch(const uno::Exception&)
+ catch(const uno::Exception& e)
{
+ (void) e;
}
}
@@ -3430,15 +3452,16 @@ void DomainMapper_Impl::SetFieldResult(
uno::makeAny( rResult ));
}
}
- catch( const beans::UnknownPropertyException& )
+ catch( const beans::UnknownPropertyException& e)
{
+ (void) e;
//some fields don't have a CurrentPresentation (DateTime)
}
}
}
- catch( uno::Exception& )
+ catch( uno::Exception& e)
{
-
+ (void) e;
}
}
}
@@ -3580,8 +3603,9 @@ void DomainMapper_Impl::AddBookmark(
m_aBookmarkMap.insert(BookmarkMap_t::value_type( nId,
BookmarkInsertPosition( bIsStart, rBookmarkName, xCurrent ) ));
}
}
- catch( const uno::Exception& )
+ catch( const uno::Exception& e)
{
+ (void) e;
//TODO: What happens to bookmarks where start and end are at different
XText objects?
}
}
@@ -3649,10 +3673,10 @@ void DomainMapper_Impl::SetLineNumbering
xProperties->setPropertyValue( rPropNameSupplier.GetName(
PROP_NUMBERING_TYPE ), uno::makeAny( style::NumberingType::ARABIC));
xProperties->setPropertyValue( rPropNameSupplier.GetName(
PROP_RESTART_AT_EACH_PAGE ), uno::makeAny( nLnc == 0 ));
}
- catch( const uno::Exception& )
- {}
-
-
+ catch( const uno::Exception& e)
+ {
+ (void) e;
+ }
/*
{ SW_PROP_NAME(UNO_NAME_CHAR_STYLE_NAME
@@ -3873,8 +3897,9 @@ void DomainMapper_Impl::ApplySettingsTab
sal_Int32 nDefTab = m_pSettingsTable->GetDefaultTabStop();
xTextDefaults->setPropertyValue(
PropertyNameSupplier::GetPropertyNameSupplier().GetName( PROP_TAB_STOP_DISTANCE
), uno::makeAny(nDefTab) );
}
- catch(const uno::Exception& )
+ catch(const uno::Exception& e)
{
+ (void) e;
}
}
}
Modified:
openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/FormControlHelper.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/FormControlHelper.cxx?rev=1731997&r1=1731996&r2=1731997&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/FormControlHelper.cxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/FormControlHelper.cxx
Wed Feb 24 00:21:16 2016
@@ -185,6 +185,7 @@ bool FormControlHelper::createCheckbox(u
}
catch (beans::UnknownPropertyException & rException)
{
+ (void) rException;
}
}
Modified:
openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/GraphicImport.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/GraphicImport.cxx?rev=1731997&r1=1731996&r2=1731997&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/GraphicImport.cxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/GraphicImport.cxx
Wed Feb 24 00:21:16 2016
@@ -1104,6 +1104,7 @@ void GraphicImport::lcl_attribute(Id nNa
}
catch( const beans::UnknownPropertyException e )
{
+ (void) e;
// It isn't a graphic image
}
@@ -1745,8 +1746,9 @@ uno::Reference< text::XTextContent > Gra
xNamed->setName( m_pImpl->sName );
}
}
- catch( const uno::Exception& )
+ catch( const uno::Exception& e)
{
+ (void) e;
}
}
}
Modified:
openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/ModelEventListener.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/ModelEventListener.cxx?rev=1731997&r1=1731996&r2=1731997&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/ModelEventListener.cxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/ModelEventListener.cxx
Wed Feb 24 00:21:16 2016
@@ -83,8 +83,9 @@ void ModelEventListener::disposing( cons
uno::Reference<document::XEventBroadcaster>(rEvent.Source,
uno::UNO_QUERY )->removeEventListener(
uno::Reference<document::XEventListener>(this));
}
- catch( const uno::Exception& )
+ catch( const uno::Exception& e)
{
+ (void) e;
}
}
Modified:
openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/NumberingManager.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/NumberingManager.cxx?rev=1731997&r1=1731996&r2=1731997&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/NumberingManager.cxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/NumberingManager.cxx
Wed Feb 24 00:21:16 2016
@@ -503,8 +503,9 @@ uno::Reference< container::XNameContaine
oFamily >>= xStyles;
}
- catch ( const uno::Exception )
+ catch ( const uno::Exception e)
{
+ (void) e;
}
return xStyles;
Modified:
openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/NumberingManager.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/NumberingManager.hxx?rev=1731997&r1=1731996&r2=1731997&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/NumberingManager.hxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/NumberingManager.hxx
Wed Feb 24 00:21:16 2016
@@ -143,13 +143,13 @@ public:
void AddRGISTD( rtl::OUString sValue ) { m_sRGISTD += sValue; };
// Accessors
- sal_Int32 GetId( ) { return m_nId; };
+ sal_Int32 GetId( ) const { return m_nId; };
sal_Int16 Size( ) { return sal_Int16( m_aLevels.size( ) ); };
ListLevel::Pointer GetLevel( sal_uInt16 nLvl );
void AddLevel( );
- ListLevel::Pointer GetCurrentLevel( ) { return m_pCurrentLevel; };
+ ListLevel::Pointer GetCurrentLevel( ) const { return m_pCurrentLevel; };
virtual com::sun::star::uno::Sequence<
com::sun::star::uno::Sequence<
Modified:
openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/OLEHandler.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/OLEHandler.cxx?rev=1731997&r1=1731996&r2=1731997&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/OLEHandler.cxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/OLEHandler.cxx
Wed Feb 24 00:21:16 2016
@@ -125,6 +125,7 @@ void OLEHandler::lcl_attribute(Id rName,
}
catch( const uno::Exception& e )
{
+ (void) e;
#if DEBUG
clog << "Exception in OLE Handler: ";
clog << rtl::OUStringToOString( e.Message,
RTL_TEXTENCODING_UTF8 ).getStr( ) << endl;
@@ -175,6 +176,7 @@ void OLEHandler::lcl_sprm(Sprm & rSprm)
}
catch( const uno::Exception& e )
{
+ (void) e;
#if DEBUG
clog << "Exception in OLE Handler: ";
clog << rtl::OUStringToOString( e.Message,
RTL_TEXTENCODING_UTF8 ).getStr( ) << endl;
Modified:
openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/PropertyMap.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/PropertyMap.cxx?rev=1731997&r1=1731996&r2=1731997&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/PropertyMap.cxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/PropertyMap.cxx
Wed Feb 24 00:21:16 2016
@@ -129,6 +129,7 @@ void lcl_AnyToTag(XMLTag::Pointer_t pTag
pTag->addAttr("stringValue", aStr);
}
catch (...) {
+ pTag->addAttr("exception", "true");
}
}
@@ -195,6 +196,7 @@ XMLTag::Pointer_t PropertyMap::toTag() c
pTag->addAttr("stringValue", aStr);
}
catch (...) {
+ pTag->addAttr("exception", "true");
}
}
break;
@@ -422,8 +424,9 @@ uno::Reference< beans::XPropertySet > Se
}
}
- catch( const uno::Exception& )
+ catch( const uno::Exception& e)
{
+ (void) e;
}
return xRet;
@@ -729,6 +732,7 @@ void SectionPropertyMap::CopyLastHeaderF
}
catch ( const uno::Exception& e )
{
+ (void) e;
#if DEBUG
clog << "An exception occurred in
SectionPropertyMap::CopyLastHeaderFooter( ) - ";
clog << rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8
).getStr( ) << endl;
Modified:
openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/PropertyMapHelper.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/PropertyMapHelper.cxx?rev=1731997&r1=1731996&r2=1731997&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/PropertyMapHelper.cxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/PropertyMapHelper.cxx
Wed Feb 24 00:21:16 2016
@@ -73,6 +73,7 @@ XMLTag::Pointer_t lcl_PropertyValuesToTa
}
catch (...)
{
+ pTag->addAttr("exception", "true");
}
if (pValues[n].Name.equalsAscii("TableColumnSeparators"))
Modified:
openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/StyleSheetTable.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/StyleSheetTable.cxx?rev=1731997&r1=1731996&r2=1731997&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/StyleSheetTable.cxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/writerfilter/source/dmapper/StyleSheetTable.cxx
Wed Feb 24 00:21:16 2016
@@ -1315,8 +1315,9 @@ void StyleSheetTable::applyDefaults(bool
}
}
}
- catch( const uno::Exception& )
+ catch( const uno::Exception& e)
{
+ (void) e;
}
}
/*-- 05.02.2008 10:27:36---------------------------------------------------
