connectivity/source/parse/sqlnode.cxx | 2
extensions/source/plugin/base/context.cxx | 4 -
extensions/source/plugin/base/manager.cxx | 5 +-
extensions/source/plugin/base/xplugin.cxx | 3 -
extensions/source/plugin/inc/plugin/impl.hxx | 8 ++-
sw/source/core/doc/SwStyleNameMapper.cxx | 4 -
sw/source/filter/ww8/ww8par.cxx | 40 ++++++++--------
sw/source/filter/ww8/ww8par.hxx | 7 ++
sw/source/filter/ww8/ww8par2.cxx | 10 ++--
sw/source/filter/ww8/ww8par3.cxx | 60 +++++++------------------
xmloff/source/transform/StyleOASISTContext.cxx | 1
11 files changed, 67 insertions(+), 77 deletions(-)
New commits:
commit 8871a650b951a012a251a72aa1d3de46628d4c2d
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Jul 2 10:41:25 2014 +0100
SAL_WARN->assert
immediately dereferenced
Change-Id: I96a657973c219facbaa64dd079dcaaaa3c1c4dd8
diff --git a/connectivity/source/parse/sqlnode.cxx
b/connectivity/source/parse/sqlnode.cxx
index 1b83a24..fa7f395 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -1994,7 +1994,7 @@ void OSQLParseNode::negateSearchCondition(OSQLParseNode*&
pSearchCondition, bool
pNewComparison = new
OSQLParseNode(OUString("="),SQL_NODE_EQUAL,SQL_EQUAL);
break;
default:
- SAL_WARN( "connectivity.parse",
"OSQLParseNode::negateSearchCondition: unexpected node type!" );
+ assert(false && "OSQLParseNode::negateSearchCondition:
unexpected node type!");
break;
}
pSearchCondition->replace(pComparison, pNewComparison);
commit c7eb405d226e7594b5e9c6f62dab60c127b1167f
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Jul 2 10:39:43 2014 +0100
coverity#1209529 Explicit null dereferenced
Change-Id: I3d5f1880deaa43fd4d40f456c0d265c18bb9b9c5
diff --git a/sw/source/core/doc/SwStyleNameMapper.cxx
b/sw/source/core/doc/SwStyleNameMapper.cxx
index 6bff575..deabe3c 100644
--- a/sw/source/core/doc/SwStyleNameMapper.cxx
+++ b/sw/source/core/doc/SwStyleNameMapper.cxx
@@ -468,9 +468,7 @@ const NameToIdHash & SwStyleNameMapper::getHashTable (
SwGetPoolIdFromName eFlag
break;
default:
{
- // TODO: Is there a better way of failing here?
- *pHashPointer = new NameToIdHash( 0 );
- return **pHashPointer;
+ assert(false && "unknown pool family");
}
break;
}
commit 63bfc8ab1038477bce0059e6b75982635527fcab
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Jul 2 10:24:44 2014 +0100
coverity#705353 Missing break in switch, probably intentional
Change-Id: I17d22443f24de5b4bf5c259e38912abc2c14ab94
diff --git a/xmloff/source/transform/StyleOASISTContext.cxx
b/xmloff/source/transform/StyleOASISTContext.cxx
index 0e78db0..4807b1d 100644
--- a/xmloff/source/transform/StyleOASISTContext.cxx
+++ b/xmloff/source/transform/StyleOASISTContext.cxx
@@ -864,6 +864,7 @@ void XMLStyleOASISTContext::StartElement(
break;
case XML_ATACTION_DECODE_STYLE_NAME:
m_bControlStyle = rAttrValue.startsWith( "ctrl" );
+ // fall-through
case XML_ATACTION_DECODE_STYLE_NAME_REF:
{
OUString aAttrValue( rAttrValue );
commit fa0421c763a92dbfead1d0144b434a3b6ab9dccb
Author: Oliver-Rainer Wittmann <o...@apache.org>
Date: Tue Jul 1 15:20:58 2014 +0000
Related: #i78498# some further improvements and corrections for outlines
- apply default outline level to WW8 Build-in Heading Styles
- get WW8 Build-In Heading Styles' list level applied to the paragraphs
- apply list level properties of WW8 Built-In Heading Styles only, if
the list level of the WW8 Build-In Heading Style corresponds to its
outline level
(cherry picked from commit 90ea610040acc8cc2ae66e774aff11b0bafcc59c)
(cherry picked from commit 2b0eadc3a706a2b2b41c48caa4f01691978f1190)
Conflicts:
sw/source/filter/ww8/ww8par.cxx
sw/source/filter/ww8/ww8par2.cxx
sw/source/filter/ww8/ww8par2.hxx
sw/source/filter/ww8/ww8par3.cxx
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index b9c9771..53d7aa5 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -5794,12 +5794,6 @@ void SwWW8ImplReader::SetOutlineStyles()
}
}
- if (pChosenWW8ListStyle == NULL)
- {
- // no WW8 list style for Outline Style found --> nothing to do
- return;
- }
-
// - set list level properties of Outline Style - ODF's list style applied
// by default to headings
// - assign corresponding Heading Paragraph Styles to the Outline Style
@@ -5807,8 +5801,9 @@ void SwWW8ImplReader::SetOutlineStyles()
// had been chosen as
// the one which provides the list level properties for the Outline
Style,
// its assignment to
- // the Outline Style is removed and a potential applied WW8 list style is
- // assigned directly.
+ // the Outline Style is removed. A potential applied WW8 list style is
+ // assigned directly and
+ // its default outline level is applied.
SwNumRule aOutlineRule(*rDoc.GetOutlineNumRule());
bool bAppliedChangedOutlineStyle = false;
std::vector<SwWW8StyInf*>::iterator aStylesIterEnd
@@ -5827,22 +5822,23 @@ void SwWW8ImplReader::SetOutlineStyles()
continue;
}
-#if OSL_DEBUG_LEVEL > 1
- OSL_ENSURE(pStyleInf->mnWW8OutlineLevel == pStyleInf->nListLevel,
- "WW8 import - <SwWW8ImplReader::SetOutlineStyles()> - it is not
"
- "expected that WW8 Built-In Heading styles have different "
- "outline level and list level");
-#endif
- const SwNumFmt& rRule
- = pChosenWW8ListStyle->Get(pStyleInf->mnWW8OutlineLevel);
- aOutlineRule.Set(pStyleInf->mnWW8OutlineLevel, rRule);
- bAppliedChangedOutlineStyle = true;
+ if (pChosenWW8ListStyle != NULL && pStyleInf->mnWW8OutlineLevel
+ == pStyleInf->nListLevel)
+ {
+ const SwNumFmt& rRule
+ = pChosenWW8ListStyle->Get(pStyleInf->mnWW8OutlineLevel);
+ aOutlineRule.Set(pStyleInf->mnWW8OutlineLevel, rRule);
+ bAppliedChangedOutlineStyle = true;
+ }
+
// in case that there are more styles on this level ignore them
nOutlineStyleListLevelWithAssignment
|= nOutlineStyleListLevelOfWW8BuiltInHeadingStyle;
SwTxtFmtColl* pTxtFmtColl =
static_cast<SwTxtFmtColl*>(pStyleInf->pFmt);
- if (pStyleInf->GetOutlineNumrule() != pChosenWW8ListStyle)
+ if (pStyleInf->GetOutlineNumrule() != pChosenWW8ListStyle
+ || (pStyleInf->nListLevel < WW8ListManager::nMaxLevel
+ && pStyleInf->mnWW8OutlineLevel != pStyleInf->nListLevel))
{
// WW8 Built-In Heading Style does not apply the chosen one.
// --> delete assignment to OutlineStyle, but keep its current
@@ -5855,6 +5851,12 @@ void SwWW8ImplReader::SetOutlineStyles()
pTxtFmtColl->SetFmtAttr(
SwNumRuleItem(pStyleInf->GetOutlineNumrule()->GetName()));
}
+ // apply default outline level of WW8 Built-in Heading Style
+ const sal_uInt8 nOutlineLevel
+ = SwWW8StyInf::WW8OutlineLevelToOutlinelevel(
+ pStyleInf->mnWW8OutlineLevel);
+ pTxtFmtColl->SetFmtAttr(
+ SfxUInt16Item(RES_PARATR_OUTLINELEVEL, nOutlineLevel));
}
else
{
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index 372bd9a..677a0cf 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -301,7 +301,14 @@ public:
{
sWWStyleName = rName;
nWWStyleId = nId;
+
+ // apply default WW8 outline level to WW8 Built-in Heading styles
+ if (IsWW8BuiltInHeadingStyle())
+ {
+ mnWW8OutlineLevel = nWWStyleId - 1;
+ }
}
+
const OUString& GetOrgWWName() const
{
return sWWStyleName;
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 68da537..b91d83e 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -564,13 +564,14 @@ static void SetBaseAnlv(SwNumFmt &rNum, WW8_ANLV &rAV,
sal_uInt8 nSwLevel )
static const SvxAdjust eAdjA[4] = { SVX_ADJUST_LEFT,
SVX_ADJUST_RIGHT, SVX_ADJUST_LEFT, SVX_ADJUST_LEFT };
-// in fact the following 2, but writer UI does not provide
-// SVX_ADJUST_CENTER, SVX_ADJUST_BLOCKLINE };
rNum.SetNumberingType( static_cast< sal_Int16 >(( rAV.nfc < 8 ) ?
eNumA[ rAV.nfc ] : SVX_NUM_NUMBER_NONE) );
+
if ((rAV.aBits1 & 0x4) >> 2)
+ {
rNum.SetIncludeUpperLevels(nSwLevel + 1);
+ }
rNum.SetStart( SVBT16ToShort( rAV.iStartAt ) );
rNum.SetNumAdjust( eAdjA[ rAV.aBits1 & 0x3] );
@@ -3745,7 +3746,10 @@ bool WW8RStyle::PrepareStyle(SwWW8StyInf &rSI, ww::sti
eSti, sal_uInt16 nThisSty
rSI.eCJKFontSrcCharSet = pj->eCJKFontSrcCharSet;
rSI.n81Flags = pj->n81Flags;
rSI.n81BiDiFlags = pj->n81BiDiFlags;
- rSI.mnWW8OutlineLevel = pj->mnWW8OutlineLevel;
+ if (!rSI.IsWW8BuiltInHeadingStyle())
+ {
+ rSI.mnWW8OutlineLevel = pj->mnWW8OutlineLevel;
+ }
rSI.bParaAutoBefore = pj->bParaAutoBefore;
rSI.bParaAutoAfter = pj->bParaAutoAfter;
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index c55eeea..0083716 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -1645,16 +1645,12 @@ bool SwWW8ImplReader::SetTxtFmtCollAndListLevel(const
SwPaM& rRg,
pTxtNode->ResetAttr( RES_PARATR_NUMRULE );
}
- if (rStyleInfo.GetOutlineNumrule() == NULL)
+ if (USHRT_MAX > rStyleInfo.nLFOIndex && WW8ListManager::nMaxLevel
+ > rStyleInfo.nListLevel)
{
- if (
- (USHRT_MAX > rStyleInfo.nLFOIndex) &&
- (WW8ListManager::nMaxLevel > rStyleInfo.nListLevel)
- )
- {
- RegisterNumFmtOnTxtNode(rStyleInfo.nLFOIndex,
- rStyleInfo.nListLevel, false);
- }
+ const bool bApplyListStyle = false;
+ RegisterNumFmtOnTxtNode(rStyleInfo.nLFOIndex,
rStyleInfo.nListLevel,
+ bApplyListStyle);
}
}
return bRes;
@@ -1804,34 +1800,10 @@ void
SwWW8ImplReader::RegisterNumFmtOnTxtNode(sal_uInt16 nActLFO,
if (pRule != NULL || !bSetAttr)
{
- //#i24136# old is the same as new, and its the outline numbering,
- //then we don't set the numrule again, and we just take the num
node
- //(the actual outline numbering gets set in SetOutlineNum)
- using namespace sw::util;
- bool bUnchangedOutlineNumbering = false;
- /*
- If the node is outline numbered, and the new numbering to apply
- is the one that was chosen to be the outline numbering then all
- is unchanged
- */
- if (pTxtNd->GetNumRule() == rDoc.GetOutlineNumRule())
- {
- bUnchangedOutlineNumbering = true;
- }
- if (!bUnchangedOutlineNumbering)
+ if (bSetAttr && pTxtNd->GetNumRule() != pRule
+ && pTxtNd->GetNumRule() != rDoc.GetOutlineNumRule())
{
- //If its normal numbering, see if its the same as it already
- //was, if its not, and we have been asked to set it, then set
- //it to the new one
- if (bSetAttr)
- {
- const SwNumRule *pNormal = pTxtNd->GetNumRule();
- if (pNormal != pRule)
- {
- pTxtNd->SetAttr
- (SwNumRuleItem(pRule->GetName()));
- }
- }
+ pTxtNd->SetAttr(SwNumRuleItem(pRule->GetName()));
}
pTxtNd->SetAttrListLevel(nActLevel);
@@ -1844,18 +1816,20 @@ void
SwWW8ImplReader::RegisterNumFmtOnTxtNode(sal_uInt16 nActLFO,
// #i99822#
// Direct application of the list level formatting no longer
// needed for list levels of mode LABEL_ALIGNMENT
- bool bApplyListLevelIndentDirectlyAtPara( true );
- if ( pTxtNd->GetNumRule() && nActLevel < MAXLEVEL )
+ bool bApplyListLevelIndentDirectlyAtPara(true);
{
- const SwNumFmt& rFmt = pTxtNd->GetNumRule()->Get( nActLevel );
- if ( rFmt.GetPositionAndSpaceMode() ==
- SvxNumberFormat::LABEL_ALIGNMENT )
+ if (pTxtNd->GetNumRule() && nActLevel < MAXLEVEL)
{
- bApplyListLevelIndentDirectlyAtPara = false;
+ const SwNumFmt& rFmt =
pTxtNd->GetNumRule()->Get(nActLevel);
+ if (rFmt.GetPositionAndSpaceMode()
+ == SvxNumberFormat::LABEL_ALIGNMENT)
+ {
+ bApplyListLevelIndentDirectlyAtPara = false;
+ }
}
}
- if ( bApplyListLevelIndentDirectlyAtPara )
+ if (bApplyListLevelIndentDirectlyAtPara)
{
SfxItemSet aListIndent(rDoc.GetAttrPool(), RES_LR_SPACE,
RES_LR_SPACE);
commit 9fb4cf25cf25b565058baff74af40398127c4083
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Jul 2 10:11:17 2014 +0100
coverity#983663 Uncaught exception
Change-Id: Iecfbb9b7cd1cb8507028cbaf7e39a1e401f74dbe
diff --git a/extensions/source/plugin/base/xplugin.cxx
b/extensions/source/plugin/base/xplugin.cxx
index d9509f0..6b3ea7b 100644
--- a/extensions/source/plugin/base/xplugin.cxx
+++ b/extensions/source/plugin/base/xplugin.cxx
@@ -835,7 +835,8 @@ void XPlugin_Impl::disposing( const
com::sun::star::lang::EventObject& /*rSource
{
}
-void XPlugin_Impl::propertyChange( const
com::sun::star::beans::PropertyChangeEvent& rEvent ) throw(std::exception)
+void XPlugin_Impl::propertyChange(const
com::sun::star::beans::PropertyChangeEvent& rEvent)
+ throw (css::uno::RuntimeException, std::exception)
{
Guard< Mutex > aGuard( m_aMutex );
diff --git a/extensions/source/plugin/inc/plugin/impl.hxx
b/extensions/source/plugin/inc/plugin/impl.hxx
index 1c2d7db..c9b545e 100644
--- a/extensions/source/plugin/inc/plugin/impl.hxx
+++ b/extensions/source/plugin/inc/plugin/impl.hxx
@@ -262,7 +262,8 @@ public:
// com::sun::star::beans::XPropertyChangeListener
virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject&
rSource ) throw(std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL propertyChange( const
com::sun::star::beans::PropertyChangeEvent& rEvent ) throw(std::exception)
SAL_OVERRIDE;
+ virtual void SAL_CALL propertyChange(const
com::sun::star::beans::PropertyChangeEvent& rEvent)
+ throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
class PluginManager
commit 5f5768e022d4ecc679f471ae13caed4ad990f570
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Jul 2 10:03:50 2014 +0100
coverity#983661 Uncaught exception
Change-Id: Id0cecd2a6431e21c896210e255f37ba220a0941f
diff --git a/extensions/source/plugin/base/manager.cxx
b/extensions/source/plugin/base/manager.cxx
index fad40e2..45e5e77 100644
--- a/extensions/source/plugin/base/manager.cxx
+++ b/extensions/source/plugin/base/manager.cxx
@@ -169,7 +169,8 @@ XPlugin_Impl* XPluginManager_Impl::getPluginImplementation(
const Reference< ::c
return NULL;
}
-Sequence<com::sun::star::plugin::PluginDescription>
XPluginManager_Impl::getPluginDescriptions() throw(std::exception)
+Sequence<com::sun::star::plugin::PluginDescription>
XPluginManager_Impl::getPluginDescriptions()
+ throw (RuntimeException, std::exception)
{
Sequence<com::sun::star::plugin::PluginDescription> aRet;
diff --git a/extensions/source/plugin/inc/plugin/impl.hxx
b/extensions/source/plugin/inc/plugin/impl.hxx
index 7b2cb89..1c2d7db 100644
--- a/extensions/source/plugin/inc/plugin/impl.hxx
+++ b/extensions/source/plugin/inc/plugin/impl.hxx
@@ -305,7 +305,8 @@ public:
virtual Sequence< com::sun::star::plugin::PluginDescription > SAL_CALL
impl_getPluginDescriptions(void) throw();
// calls system specific impl_getPluginDescriptions
// checks whether plugins are disabled
- virtual Sequence< com::sun::star::plugin::PluginDescription > SAL_CALL
getPluginDescriptions(void) throw(std::exception) SAL_OVERRIDE;
+ virtual Sequence< com::sun::star::plugin::PluginDescription > SAL_CALL
getPluginDescriptions()
+ throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual Reference< com::sun::star::plugin::XPlugin > SAL_CALL
createPlugin( const Reference< com::sun::star::plugin::XPluginContext > &
acontext, sal_Int16 mode, const Sequence< OUString >& argn, const Sequence<
OUString >& argv, const com::sun::star::plugin::PluginDescription& plugintype)
throw( RuntimeException,::com::sun::star::plugin::PluginException,
std::exception ) SAL_OVERRIDE;
commit 1851e1e29c20fae23f3401f06397e6538a2c4eb1
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Jul 2 10:01:45 2014 +0100
coverity#983659 Uncaught exception
and
coverity#983660 Uncaught exception
Change-Id: I509805fd6517196d505e78bcbf632d83dff01f03
diff --git a/extensions/source/plugin/base/manager.cxx
b/extensions/source/plugin/base/manager.cxx
index dc09366..fad40e2 100644
--- a/extensions/source/plugin/base/manager.cxx
+++ b/extensions/source/plugin/base/manager.cxx
@@ -199,7 +199,7 @@ Reference< ::com::sun::star::plugin::XPlugin >
XPluginManager_Impl::createPlugin
return pImpl;
}
-Reference< ::com::sun::star::plugin::XPlugin >
XPluginManager_Impl::createPluginFromURL( const Reference<
::com::sun::star::plugin::XPluginContext > & acontext, sal_Int16 mode, const
Sequence< OUString >& argn, const Sequence< OUString >& argv, const Reference<
::com::sun::star::awt::XToolkit > & toolkit, const Reference<
::com::sun::star::awt::XWindowPeer > & parent, const OUString& url )
throw(std::exception)
+Reference< ::com::sun::star::plugin::XPlugin >
XPluginManager_Impl::createPluginFromURL( const Reference<
::com::sun::star::plugin::XPluginContext > & acontext, sal_Int16 mode, const
Sequence< OUString >& argn, const Sequence< OUString >& argv, const Reference<
::com::sun::star::awt::XToolkit > & toolkit, const Reference<
::com::sun::star::awt::XWindowPeer > & parent, const OUString& url ) throw
(RuntimeException, std::exception)
{
XPlugin_Impl* pImpl = new XPlugin_Impl( Reference<
::com::sun::star::lang::XMultiServiceFactory>(m_xContext->getServiceManager(),
UNO_QUERY_THROW) );
Reference< ::com::sun::star::plugin::XPlugin > xRef = pImpl;
diff --git a/extensions/source/plugin/inc/plugin/impl.hxx
b/extensions/source/plugin/inc/plugin/impl.hxx
index 7aabb92..7b2cb89 100644
--- a/extensions/source/plugin/inc/plugin/impl.hxx
+++ b/extensions/source/plugin/inc/plugin/impl.hxx
@@ -309,7 +309,7 @@ public:
virtual Reference< com::sun::star::plugin::XPlugin > SAL_CALL
createPlugin( const Reference< com::sun::star::plugin::XPluginContext > &
acontext, sal_Int16 mode, const Sequence< OUString >& argn, const Sequence<
OUString >& argv, const com::sun::star::plugin::PluginDescription& plugintype)
throw( RuntimeException,::com::sun::star::plugin::PluginException,
std::exception ) SAL_OVERRIDE;
- virtual Reference< com::sun::star::plugin::XPlugin > SAL_CALL
createPluginFromURL( const Reference< com::sun::star::plugin::XPluginContext >
& acontext, sal_Int16 mode, const Sequence< OUString >& argn, const Sequence<
OUString >& argv, const Reference< com::sun::star::awt::XToolkit > & toolkit,
const Reference< com::sun::star::awt::XWindowPeer > & parent, const OUString&
url ) throw(std::exception) SAL_OVERRIDE;
+ virtual Reference< com::sun::star::plugin::XPlugin > SAL_CALL
createPluginFromURL( const Reference< com::sun::star::plugin::XPluginContext >
& acontext, sal_Int16 mode, const Sequence< OUString >& argn, const Sequence<
OUString >& argv, const Reference< com::sun::star::awt::XToolkit > & toolkit,
const Reference< com::sun::star::awt::XWindowPeer > & parent, const OUString&
url ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
throw() SAL_OVERRIDE;
virtual OUString SAL_CALL getImplementationName() throw() SAL_OVERRIDE;
commit bae5099882c37c45476fbac23c18b44576aa17dc
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Jul 2 10:00:32 2014 +0100
coverity#983658 Uncaught exception
Change-Id: I99cb4f64b093765d0667ddcddf1f696891450a9a
diff --git a/extensions/source/plugin/base/context.cxx
b/extensions/source/plugin/base/context.cxx
index 39289f5..7ab64f7 100644
--- a/extensions/source/plugin/base/context.cxx
+++ b/extensions/source/plugin/base/context.cxx
@@ -78,7 +78,7 @@ public:
// ::com::sun::star::io::XOutputStream
virtual void SAL_CALL writeBytes( const Sequence<sal_Int8>& )
throw(std::exception) SAL_OVERRIDE;
virtual void SAL_CALL flush() throw(std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL closeOutput() throw(std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL closeOutput() throw (RuntimeException,
std::exception) SAL_OVERRIDE;
};
}
@@ -292,7 +292,7 @@ FileSink::~FileSink()
osl::File::remove( m_aFileName );
}
-void FileSink::closeOutput() throw(std::exception)
+void FileSink::closeOutput() throw (RuntimeException, std::exception)
{
if( fp )
fclose( fp );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
