connectivity/source/drivers/firebird/Connection.cxx | 2 +- connectivity/source/drivers/firebird/Connection.hxx | 4 ++-- framework/source/uielement/popuptoolbarcontroller.cxx | 4 ++++ include/canvas/base/bitmapcanvasbase.hxx | 2 +- include/canvas/base/canvascustomspritebase.hxx | 2 +- include/svtools/treelistbox.hxx | 4 ++-- include/svx/unoshape.hxx | 4 ++-- oox/source/export/drawingml.cxx | 2 +- sc/qa/unit/ucalc.cxx | 4 ++++ svx/source/unodraw/unoshap2.cxx | 2 +- svx/source/unodraw/unoshap3.cxx | 2 +- sw/qa/core/uwriter.cxx | 4 ++-- sw/source/core/access/accpara.cxx | 7 +------ sw/source/core/frmedt/fecopy.cxx | 9 ++++++--- sw/source/core/uibase/inc/conttree.hxx | 4 ++-- sw/source/core/uibase/utlui/content.cxx | 6 ++++-- ucb/source/ucp/cmis/cmis_content.cxx | 2 +- ucb/source/ucp/cmis/cmis_content.hxx | 2 +- xmloff/source/chart/SchXMLPlotAreaContext.cxx | 6 +++--- 19 files changed, 40 insertions(+), 32 deletions(-)
New commits: commit 90b4c3a888de093a2f42318c5caeb5419e0e7d1c Author: Caolán McNamara <caol...@redhat.com> Date: Fri May 23 17:15:38 2014 +0100 coverity#1103737 Uncaught exception Change-Id: I53aab00dfad0310a7846fdf7185c50036329343c diff --git a/connectivity/source/drivers/firebird/Connection.cxx b/connectivity/source/drivers/firebird/Connection.cxx index 53349ee..69b2377 100644 --- a/connectivity/source/drivers/firebird/Connection.cxx +++ b/connectivity/source/drivers/firebird/Connection.cxx @@ -788,7 +788,7 @@ uno::Reference< XTablesSupplier > Connection::createCatalog() } -void Connection::rebuildIndexes() throw(SQLException) +void Connection::rebuildIndexes() throw (SQLException, RuntimeException) { MutexGuard aGuard(m_aMutex); diff --git a/connectivity/source/drivers/firebird/Connection.hxx b/connectivity/source/drivers/firebird/Connection.hxx index a68e181..1b42a64 100644 --- a/connectivity/source/drivers/firebird/Connection.hxx +++ b/connectivity/source/drivers/firebird/Connection.hxx @@ -149,9 +149,9 @@ namespace connectivity * versions. */ void rebuildIndexes() - throw(::com::sun::star::sdbc::SQLException); + throw (css::sdbc::SQLException, css::uno::RuntimeException); void buildTypeInfo() - throw(::com::sun::star::sdbc::SQLException); + throw (css::sdbc::SQLException); /** * Creates a new transaction with the desired parameters, if commit 6878f0debf38ba93aa5fad6c303a3c9e8e12b2ed Author: Caolán McNamara <caol...@redhat.com> Date: Fri May 23 17:11:30 2014 +0100 coverity#1209381 Unchecked dynamic_cast Change-Id: Idab888e866fa08e184b51b8209a4154062d61041 diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx index bd6e000..6b073fe 100644 --- a/sw/qa/core/uwriter.cxx +++ b/sw/qa/core/uwriter.cxx @@ -1045,8 +1045,8 @@ void SwDocTest::testMarkMove() // join paragraph 2 and 3 and check { SwNodeIndex aIdx(m_pDoc->GetNodes().GetEndOfContent(), -2); - SwTxtNode* pParaNode2 = dynamic_cast<SwTxtNode*>(&aIdx.GetNode()); - pParaNode2->JoinNext(); + SwTxtNode& rParaNode2 = dynamic_cast<SwTxtNode&>(aIdx.GetNode()); + rParaNode2.JoinNext(); } ::sw::mark::IMark* pBM1 = pMarksAccess->findMark("Para1")->get(); ::sw::mark::IMark* pBM2 = pMarksAccess->findMark("Para2")->get(); commit 3d39e41e1f07c481d741678b340755dfaef7e4f7 Author: Caolán McNamara <caol...@redhat.com> Date: Fri May 23 17:10:31 2014 +0100 coverity#1209494 Explicit null dereferenced Change-Id: I9e51f2af30f1e0a38079d76db93bac4fe65d13b2 diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx index d8f1437..aa7ac1a 100644 --- a/sc/qa/unit/ucalc.cxx +++ b/sc/qa/unit/ucalc.cxx @@ -5072,6 +5072,8 @@ void Test::testSortWithCellFormats() return false; } + CPPUNIT_ASSERT(pItem); + if (static_cast<const SvxWeightItem*>(pItem)->GetEnumValue() != WEIGHT_BOLD) { cerr << "Font weight should be bold." << endl; @@ -5096,6 +5098,8 @@ void Test::testSortWithCellFormats() return false; } + CPPUNIT_ASSERT(pItem); + if (static_cast<const SvxPostureItem*>(pItem)->GetEnumValue() != ITALIC_NORMAL) { cerr << "Italic should be applied.." << endl; commit 4dc0263505d05bef61d8dd7c392b168edb0a3724 Author: Caolán McNamara <caol...@redhat.com> Date: Fri May 23 17:06:28 2014 +0100 coverity#1209950 Uncaught exception Change-Id: I92da2ae224bab6d4781463c096a35ecaec6fecc8 diff --git a/include/svx/unoshape.hxx b/include/svx/unoshape.hxx index 2f7055c..f5e8fae 100644 --- a/include/svx/unoshape.hxx +++ b/include/svx/unoshape.hxx @@ -762,7 +762,7 @@ class Svx3DLatheObject : public SvxShape protected: // overide these for special property handling in subcasses. Return true if property is handled virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; - virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; + virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; public: Svx3DLatheObject( SdrObject* pObj ) throw(); diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx index bdd66d1..6316e75 100644 --- a/svx/source/unodraw/unoshap3.cxx +++ b/svx/source/unodraw/unoshap3.cxx @@ -872,7 +872,7 @@ bool Svx3DLatheObject::setPropertyValueImpl( const OUString& rName, const SfxIte } -bool Svx3DLatheObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +bool Svx3DLatheObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { switch( pProperty->nWID ) { commit b695519ab991e6f2844625a25a3f4901c673263a Author: Caolán McNamara <caol...@redhat.com> Date: Fri May 23 17:03:50 2014 +0100 coverity#1210006 Uncaught exception Change-Id: I9db3763ed1217e5560d092e689101dddd8027efa diff --git a/include/svx/unoshape.hxx b/include/svx/unoshape.hxx index 54caa33..2f7055c 100644 --- a/include/svx/unoshape.hxx +++ b/include/svx/unoshape.hxx @@ -827,7 +827,7 @@ protected: public: SvxCustomShape( SdrObject* pObj ) throw (); // overide these for special property handling in subcasses. Return true if property is handled - virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; + virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ~SvxCustomShape() throw (); diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx index c5043e2..2de75ec 100644 --- a/svx/source/unodraw/unoshap2.cxx +++ b/svx/source/unodraw/unoshap2.cxx @@ -1957,7 +1957,7 @@ void SAL_CALL SvxCustomShape::setPropertyValue( const OUString& aPropertyName, c } } -bool SvxCustomShape::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +bool SvxCustomShape::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { switch( pProperty->nWID ) { commit 7f88a26e172f303ebd34cc4ddff70171676d6346 Author: Caolán McNamara <caol...@redhat.com> Date: Fri May 23 17:01:20 2014 +0100 coverity#1210018 Uncaught exception Change-Id: I3033f3d84c5c7835c4f1f3809ff343abe8958fef diff --git a/include/canvas/base/bitmapcanvasbase.hxx b/include/canvas/base/bitmapcanvasbase.hxx index d43efee..b7a7887 100644 --- a/include/canvas/base/bitmapcanvasbase.hxx +++ b/include/canvas/base/bitmapcanvasbase.hxx @@ -83,7 +83,7 @@ namespace canvas } virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > SAL_CALL getScaledBitmap( const ::com::sun::star::geometry::RealSize2D& newSize, - sal_Bool beFast ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE + sal_Bool beFast ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { typename BaseType::MutexType aGuard( BaseType::m_aMutex ); commit ae08fe4327f6de11004a2d781883ddd2fa8a6558 Author: Caolán McNamara <caol...@redhat.com> Date: Fri May 23 16:56:11 2014 +0100 coverity#1212683 Logically dead code Change-Id: I5830c17a98c7dc193abdb5854c63aaba59e5e014 diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx index 5b0ab76..9e1667e 100644 --- a/sw/source/core/access/accpara.cxx +++ b/sw/source/core/access/accpara.cxx @@ -3508,8 +3508,6 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::addSelection( sal_Int32, sal_Int32 sta } - bool bRet = false; - // get cursor shell SwCrsrShell* pCrsrShell = GetCrsrShell(); if( pCrsrShell != NULL ) @@ -3520,13 +3518,10 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::addSelection( sal_Int32, sal_Int32 sta aPaM->SetMark(); aPaM->GetPoint()->nContent = GetPortionData().GetModelPosition(startOffset); aPaM->GetMark()->nContent = GetPortionData().GetModelPosition(endOffset); - //pCrsrShell->ShowCrsr(); pCrsrShell->EndAction(); - // set PaM at cursor shell - //bRet = Select( aPaM ); } - return bRet ? 1 : 0; + return 0; } /*accessibility::*/TextSegment SAL_CALL commit 783859e861a421138baba25fada94bc05a929bde Author: Caolán McNamara <caol...@redhat.com> Date: Fri May 23 16:52:46 2014 +0100 coverity#1213088 Dereference after null check Change-Id: I86ddf93e18594e9199dbcddca3ad32a58d5987dd diff --git a/sw/source/core/uibase/utlui/content.cxx b/sw/source/core/uibase/utlui/content.cxx index d2218d1..85632be 100644 --- a/sw/source/core/uibase/utlui/content.cxx +++ b/sw/source/core/uibase/utlui/content.cxx @@ -2307,7 +2307,7 @@ void SwContentTree::ExecCommand(sal_uInt16 nCmd, bool bModifier) // Set cursor back to the current position pShell->GotoOutline( nActPos + nDir); } - else if(bModifier) + else if(bModifier && pFirstEntry) { sal_uInt16 nActEndPos = nActPos; SvTreeListEntry* pEntry = pFirstEntry; commit 57223dbe8f38508dcf478961d28ffeaa5cb3c227 Author: Caolán McNamara <caol...@redhat.com> Date: Fri May 23 16:51:30 2014 +0100 coverity#1213120 Unchecked dynamic_cast Change-Id: I170e392fa883936f835f60ec4798548701f2a3d8 diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx index c1045a9..9353c80 100644 --- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx +++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx @@ -1018,10 +1018,10 @@ void SetErrorBarStyleProperties( const OUString& rStyleName, uno::Reference< bea const SvXMLStyleContext* pStyle = pStylesCtxt->FindStyleChildContext(rImportHelper.GetChartFamilyID(), rStyleName); - XMLPropStyleContext * pSeriesStyleContext = - const_cast< XMLPropStyleContext * >( dynamic_cast< const XMLPropStyleContext * >( pStyle )); + XMLPropStyleContext &rSeriesStyleContext = + const_cast< XMLPropStyleContext& >( dynamic_cast< const XMLPropStyleContext& >( *pStyle )); - pSeriesStyleContext->FillPropertySet( xBarProp ); + rSeriesStyleContext.FillPropertySet( xBarProp ); } void SetErrorBarPropertiesFromStyleName( const OUString& aStyleName, uno::Reference< beans::XPropertySet> xBarProp, commit b982a0cc7c3c8d668b77a80dde7859f3297752da Author: Caolán McNamara <caol...@redhat.com> Date: Fri May 23 16:48:06 2014 +0100 coverity#1213149 Missing break in switch Change-Id: I4978c8d36052119637acdda8121a511936a81cea diff --git a/sw/source/core/uibase/utlui/content.cxx b/sw/source/core/uibase/utlui/content.cxx index 6a2fbf9..d2218d1 100644 --- a/sw/source/core/uibase/utlui/content.cxx +++ b/sw/source/core/uibase/utlui/content.cxx @@ -2267,7 +2267,9 @@ void SwContentTree::ExecCommand(sal_uInt16 nCmd, bool bModifier) switch( nCmd ) { case FN_ITEM_DOWN: - case FN_ITEM_UP: nMove = true; + case FN_ITEM_UP: + nMove = true; + //fall-through case FN_ITEM_LEFT: case FN_ITEM_RIGHT: if( !GetWrtShell()->GetView().GetDocShell()->IsReadOnly() && commit 5ff1c499d45789cb1af29cc7ba8c0139c7c3b77a Author: Caolán McNamara <caol...@redhat.com> Date: Fri May 23 16:47:02 2014 +0100 coverity#1213245 Dereference null return value Change-Id: I53dc316ff15ef23a79774d4894aa0940622e1311 diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx index 9bf9f4f..f248666 100644 --- a/sw/source/core/frmedt/fecopy.cxx +++ b/sw/source/core/frmedt/fecopy.cxx @@ -942,9 +942,12 @@ bool SwFEShell::Paste( SwDoc* pClpDoc, bool bIncludingPageFrames ) SwPosition* pPos = PCURCRSR->GetPoint(); // allow shapes (no controls) in header/footer if( RES_DRAWFRMFMT == rCpyFmt.Which() && - GetDoc()->IsInHeaderFooter( pPos->nNode ) && - CheckControlLayer( rCpyFmt.FindSdrObject() ) ) - continue; + GetDoc()->IsInHeaderFooter( pPos->nNode ) ) + { + const SdrObject *pCpyObj = rCpyFmt.FindSdrObject(); + if (pCpyObj && CheckControlLayer(pCpyObj)) + continue; + } aAnchor.SetAnchor( pPos ); } commit 40c77417d18fadebe59b2e1b2e71cadbfc06bba6 Author: Caolán McNamara <caol...@redhat.com> Date: Fri May 23 16:44:03 2014 +0100 coverity#1213283 Resource leak Change-Id: I5002f3e935edcc9f09603a5b535e2b339ebed402 diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index 00a8876..b5369c3 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -2324,6 +2324,7 @@ void DrawingML::WriteShape3DEffects( Reference< XPropertySet > xPropSet ) sax_fastparser::FastAttributeList *aCameraAttrList = mpFS->createAttrList(); sax_fastparser::XFastAttributeListRef xCameraAttrList( aCameraAttrList ); sax_fastparser::FastAttributeList *aCameraRotationAttrList = mpFS->createAttrList(); + sax_fastparser::XFastAttributeListRef xRotAttrList( aCameraRotationAttrList ); for( sal_Int32 i=0; i < aEffectProps.getLength(); ++i ) { if( aEffectProps[i].Name == "prst" ) @@ -2403,7 +2404,6 @@ void DrawingML::WriteShape3DEffects( Reference< XPropertySet > xPropSet ) mpFS->startElementNS( XML_a, XML_camera, xCameraAttrList ); if( bCameraRotationPresent ) { - sax_fastparser::XFastAttributeListRef xRotAttrList( aCameraRotationAttrList ); mpFS->singleElementNS( XML_a, XML_rot, xRotAttrList ); } mpFS->endElementNS( XML_a, XML_camera ); commit ecbc0a3cc7da9fb5c209c468abbccf6cb731f4be Author: Caolán McNamara <caol...@redhat.com> Date: Fri May 23 16:38:24 2014 +0100 coverity#1213450 Uncaught exception Change-Id: I577b699d0d6b63d81565b0e2e6f2e0a96e87078c diff --git a/include/canvas/base/canvascustomspritebase.hxx b/include/canvas/base/canvascustomspritebase.hxx index 3e17319..92fa614 100644 --- a/include/canvas/base/canvascustomspritebase.hxx +++ b/include/canvas/base/canvascustomspritebase.hxx @@ -105,7 +105,7 @@ namespace canvas } // XCanvas: selectively override base's methods here, for opacity tracking - virtual void SAL_CALL clear() throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual void SAL_CALL clear() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { typename BaseType::MutexType aGuard( BaseType::m_aMutex ); commit 40507db2c27bdfffcb25501af88e6d98dcbac96f Author: Caolán McNamara <caol...@redhat.com> Date: Fri May 23 16:33:55 2014 +0100 coverity#1213513 Uncaught exception Change-Id: I04a05773891d680100ee1551eac21e203477935b diff --git a/ucb/source/ucp/cmis/cmis_content.cxx b/ucb/source/ucp/cmis/cmis_content.cxx index 80c60a6c..6a3df78 100644 --- a/ucb/source/ucp/cmis/cmis_content.cxx +++ b/ucb/source/ucp/cmis/cmis_content.cxx @@ -1137,7 +1137,7 @@ namespace cmis void Content::insert( const uno::Reference< io::XInputStream > & xInputStream, bool bReplaceExisting, const OUString& rMimeType, const uno::Reference< ucb::XCommandEnvironment >& xEnv ) - throw( uno::Exception ) + throw (uno::Exception, std::exception) { if ( !xInputStream.is() ) { diff --git a/ucb/source/ucp/cmis/cmis_content.hxx b/ucb/source/ucp/cmis/cmis_content.hxx index f7430bd..77da48e 100644 --- a/ucb/source/ucp/cmis/cmis_content.hxx +++ b/ucb/source/ucp/cmis/cmis_content.hxx @@ -96,7 +96,7 @@ private: void insert( const com::sun::star::uno::Reference< com::sun::star::io::XInputStream > & xInputStream, bool bReplaceExisting, const OUString & rMimeType, const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& xEnv ) - throw( com::sun::star::uno::Exception ); + throw (css::uno::Exception, std::exception); OUString checkIn( const com::sun::star::ucb::CheckinArgument& rArg, const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv ) commit c6f72b6a7ca7d64bd9386b0459ceccea1230bfe6 Author: Caolán McNamara <caol...@redhat.com> Date: Fri May 23 16:29:23 2014 +0100 coverity#1215320 Uncaught exception Change-Id: Icbc9f370573eda2a79c04825b00db77d1bf1924f diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx b/framework/source/uielement/popuptoolbarcontroller.cxx index 4f0c75c..8d09b35 100644 --- a/framework/source/uielement/popuptoolbarcontroller.cxx +++ b/framework/source/uielement/popuptoolbarcontroller.cxx @@ -40,6 +40,7 @@ #include <com/sun/star/frame/XUIControllerFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/ucb/CommandFailedException.hpp> +#include <com/sun/star/ucb/ContentCreationException.hpp> #define UNO_COMMAND_RECENT_FILE_LIST ".uno:RecentFileList" @@ -415,6 +416,9 @@ void SAL_CALL NewToolbarController::statusChanged( const css::frame::FeatureStat catch (const css::ucb::CommandFailedException&) { } + catch (const css::ucb::ContentCreationException&) + { + } } enable( rEvent.IsEnabled ); commit 6eaad9e41ae95a3d973e72439ef580349e3e8e4b Author: Ulrich Kitzinger <ulk...@hotmail.de> Date: Fri May 23 09:10:57 2014 +0200 Resolves: fdo#58187 Expand and Collapse should be virtual regression from ac7acb0ab1329913b0cec79790adcde0263960be Change-Id: I773871f08f43a8abadfc5ef9b641db722deb7d20 diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx index 188cfb6..e756d4a 100644 --- a/include/svtools/treelistbox.hxx +++ b/include/svtools/treelistbox.hxx @@ -732,8 +732,8 @@ public: void SetDragDropMode( DragDropMode ); void SetSelectionMode( SelectionMode ); - bool Expand( SvTreeListEntry* pParent ); - bool Collapse( SvTreeListEntry* pParent ); + virtual bool Expand( SvTreeListEntry* pParent ); + virtual bool Collapse( SvTreeListEntry* pParent ); virtual bool Select( SvTreeListEntry* pEntry, bool bSelect=true ); sal_uLong SelectChildren( SvTreeListEntry* pParent, bool bSelect ); virtual void SelectAll( bool bSelect, bool bPaint = true ) SAL_OVERRIDE; diff --git a/sw/source/core/uibase/inc/conttree.hxx b/sw/source/core/uibase/inc/conttree.hxx index 17bed3c..850422f 100644 --- a/sw/source/core/uibase/inc/conttree.hxx +++ b/sw/source/core/uibase/inc/conttree.hxx @@ -170,9 +170,9 @@ public: sal_uInt8 GetOutlineLevel()const {return nOutlineLevel;} void SetOutlineLevel(sal_uInt8 nSet); - bool Expand( SvTreeListEntry* pParent ); + virtual bool Expand( SvTreeListEntry* pParent ) SAL_OVERRIDE; - bool Collapse( SvTreeListEntry* pParent ); + virtual bool Collapse( SvTreeListEntry* pParent ) SAL_OVERRIDE; void ExecCommand(sal_uInt16 nCmd, bool bModifier);
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits