framework/inc/framework/statusbarconfiguration.hxx | 17 -- framework/source/fwe/xml/statusbarconfiguration.cxx | 2 hwpfilter/source/hwpfile.cxx | 22 +-- lotuswordpro/source/filter/localtime.cxx | 1 lotuswordpro/source/filter/lwpframelayout.cxx | 43 ++---- lotuswordpro/source/filter/lwpgrfobj.cxx | 7 - lotuswordpro/source/filter/lwpobjstrm.cxx | 7 - lotuswordpro/source/filter/lwppara1.cxx | 4 lotuswordpro/source/filter/xfilter/xfconfigmanager.cxx | 19 +- lotuswordpro/source/filter/xfilter/xfconfigmanager.hxx | 1 lotuswordpro/source/filter/xfilter/xfcontentcontainer.cxx | 3 sdext/source/minimizer/description.xml | 2 sdext/source/pdfimport/config/description.xml | 2 sdext/source/presenter/description.xml | 2 sfx2/inc/sfx2/tabdlg.hxx | 7 - sfx2/source/dialog/tabdlg.cxx | 95 -------------- svl/inc/svl/style.hxx | 1 svl/source/items/style.cxx | 4 unusedcode.easy | 7 - 19 files changed, 50 insertions(+), 196 deletions(-)
New commits: commit c71bb2601ac39a8529725e1da926f854ba040caf Author: Caolán McNamara <[email protected]> Date: Sun Oct 2 23:18:46 2011 +0100 fix smoketest-breaking typo diff --git a/sdext/source/minimizer/description.xml b/sdext/source/minimizer/description.xml index b0bc64a..f8762c7 100644 --- a/sdext/source/minimizer/description.xml +++ b/sdext/source/minimizer/description.xml @@ -29,6 +29,6 @@ <extension-description> <src xlink:href="help/component.txt" lang="en-US" /> - </extension-desciption> + </extension-description> </description> diff --git a/sdext/source/pdfimport/config/description.xml b/sdext/source/pdfimport/config/description.xml index 8301167..c6c3b30 100644 --- a/sdext/source/pdfimport/config/description.xml +++ b/sdext/source/pdfimport/config/description.xml @@ -28,6 +28,6 @@ <extension-description> <src xlink:href="help/component.txt" lang="en-US" /> - </extension-desciption> + </extension-description> </description> diff --git a/sdext/source/presenter/description.xml b/sdext/source/presenter/description.xml index 6435733..bf9ce72 100644 --- a/sdext/source/presenter/description.xml +++ b/sdext/source/presenter/description.xml @@ -29,6 +29,6 @@ <extension-description> <src xlink:href="help/component.txt" lang="en-US" /> - </extension-desciption> + </extension-description> </description> commit 19a23df7f2dcdba88edd507ddd6d6201f1eeb1bc Author: Caolán McNamara <[email protected]> Date: Sun Oct 2 22:43:34 2011 +0100 valgrind: fix some leaks diff --git a/lotuswordpro/source/filter/localtime.cxx b/lotuswordpro/source/filter/localtime.cxx index 1eee2bf..9d25aca 100644 --- a/lotuswordpro/source/filter/localtime.cxx +++ b/lotuswordpro/source/filter/localtime.cxx @@ -185,6 +185,7 @@ bool LtgLocalTime(long rtime,LtTm& rtm) { TimeZone* pLocalZone = TimeZone::createDefault(); long offset = (pLocalZone->getRawOffset())/1000; + delete pLocalZone; long ltime = rtime + offset; return LtgGmTime(ltime,rtm); } diff --git a/lotuswordpro/source/filter/lwpframelayout.cxx b/lotuswordpro/source/filter/lwpframelayout.cxx index e1f3552..dcbe10d 100644 --- a/lotuswordpro/source/filter/lwpframelayout.cxx +++ b/lotuswordpro/source/filter/lwpframelayout.cxx @@ -764,16 +764,11 @@ void LwpFrameLink::Read(LwpObjectStream* pStrm) LwpFrameLayout::LwpFrameLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm) : LwpPlacableLayout(objHdr, pStrm), m_pFrame(NULL) { - } LwpFrameLayout::~LwpFrameLayout() { - if(m_pFrame) - { - delete m_pFrame; - m_pFrame = NULL; - } + delete m_pFrame; } /** @@ -856,10 +851,12 @@ void LwpFrameLayout::XFConvertFrame(XFContentContainer* pCont, sal_Int32 nStart void LwpFrameLayout::RegisterStyle() { //if it is for water mark, don't register style - if(IsForWaterMark()) - { + if (IsForWaterMark()) return; - } + + if (m_pFrame) + return; + //register frame style XFFrameStyle* pFrameStyle = new XFFrameStyle(); m_pFrame = new LwpFrame(this); @@ -875,9 +872,8 @@ void LwpFrameLayout::RegisterStyle() //register child frame style RegisterChildStyle(); - - } + /** * @descr get the name of the frame that current frame links * @@ -1021,18 +1017,15 @@ void LwpFrameLayout::ApplyGraphicSize(XFFrame * pXFFrame) } LwpGroupLayout::LwpGroupLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm) - : LwpPlacableLayout(objHdr, pStrm),m_pFrame(NULL) + : LwpPlacableLayout(objHdr, pStrm) + , m_pFrame(NULL) { } LwpGroupLayout::~LwpGroupLayout() { - if(m_pFrame) - { - delete m_pFrame; - m_pFrame = NULL; - } + delete m_pFrame; } /** * @descr read group layout object @@ -1049,6 +1042,9 @@ void LwpGroupLayout::Read() */ void LwpGroupLayout::RegisterStyle() { + if (m_pFrame) + return; + //register frame style XFFrameStyle* pFrameStyle = new XFFrameStyle(); m_pFrame = new LwpFrame(this); @@ -1056,15 +1052,6 @@ void LwpGroupLayout::RegisterStyle() //register child frame style RegisterChildStyle(); - /* - LwpVirtualLayout* pLayout = static_cast<LwpVirtualLayout*>(GetChildHead()->obj()); - while(pLayout) - { - pLayout->SetFoundry(m_pFoundry); - pLayout->RegisterStyle(); - pLayout = static_cast<LwpVirtualLayout*>(pLayout->GetNext()->obj()); - } - */ } /** * @descr create a xfframe and add into content container @@ -1134,9 +1121,11 @@ void LwpGroupFrame::Read() m_pObjStrm->SkipExtra(); } - void LwpGroupFrame::RegisterStyle() + +void LwpGroupFrame::RegisterStyle() { } + void LwpGroupFrame::XFConvert(XFContentContainer* /*pCont*/) { } diff --git a/lotuswordpro/source/filter/lwpgrfobj.cxx b/lotuswordpro/source/filter/lwpgrfobj.cxx index 1c46c2e..f836c7a 100644 --- a/lotuswordpro/source/filter/lwpgrfobj.cxx +++ b/lotuswordpro/source/filter/lwpgrfobj.cxx @@ -100,10 +100,11 @@ LwpGraphicObject::LwpGraphicObject(LwpObjectHeader &objHdr, LwpSvStream* pStrm) memset(m_sDataFormat, 0, sizeof(m_sDataFormat)); memset(m_sServerContextFormat, 0, sizeof(m_sServerContextFormat)); } + LwpGraphicObject::~LwpGraphicObject() { - m_vXFDrawObjects.clear(); } + void LwpGraphicObject::Read() { LwpGraphicOleObject::Read(); @@ -213,7 +214,6 @@ void LwpGraphicObject::XFConvert (XFContentContainer* pCont) std::vector <XFFrame*>::iterator iter; for (iter = m_vXFDrawObjects.begin(); iter != m_vXFDrawObjects.end(); ++iter) { - //pPara->Add(*iter); pCont->Add(*iter); } @@ -457,7 +457,6 @@ sal_uInt32 LwpGraphicObject::GetGrafData(sal_uInt8*& pGrafData) */ void LwpGraphicObject::CreateGrafObject() { - XFImage* pImage = new XFImage(); // set image processing styles @@ -594,8 +593,6 @@ void LwpGraphicObject::CreateGrafObject() else { // set left-top alignment -// pImageStyle->SetXPosType(enumXFFrameXPosLeft, enumXFFrameXRelFrame); -// pImageStyle->SetYPosType(enumXFFrameYPosTop, enumXFFrameYRelFrame); pImageStyle->SetYPosType(enumXFFrameYPosFromTop, enumXFFrameYRelFrame); pImageStyle->SetXPosType(enumXFFrameXPosFromLeft, enumXFFrameXRelFrame); diff --git a/lotuswordpro/source/filter/lwpobjstrm.cxx b/lotuswordpro/source/filter/lwpobjstrm.cxx index c7a3177..b9dc392 100644 --- a/lotuswordpro/source/filter/lwpobjstrm.cxx +++ b/lotuswordpro/source/filter/lwpobjstrm.cxx @@ -60,6 +60,7 @@ #include "lwpobjstrm.hxx" #include "lwptools.hxx" +#include <boost/scoped_array.hpp> /** * @descr ctor() from LwpSvStream @@ -99,15 +100,15 @@ void LwpObjectStream::Read2Buffer() if( m_bCompressed ) { - sal_uInt8* pCompressBuffer = new sal_uInt8[m_nBufSize]; + boost::scoped_array<sal_uInt8> xCompressBuf(new sal_uInt8[m_nBufSize]); + + sal_uInt8* pCompressBuffer = xCompressBuf.get(); memset(pCompressBuffer, 0, m_nBufSize); m_pStrm->Read(pCompressBuffer, m_nBufSize); sal_uInt8 pTempDst[IO_BUFFERSIZE]; m_nBufSize = DecompressBuffer(pTempDst, pCompressBuffer, m_nBufSize); assert( m_nBufSize < IO_BUFFERSIZE); - delete [] pCompressBuffer; - pCompressBuffer = NULL; m_pContentBuf = AllocBuffer(m_nBufSize); memcpy(m_pContentBuf, pTempDst, m_nBufSize); diff --git a/lotuswordpro/source/filter/lwppara1.cxx b/lotuswordpro/source/filter/lwppara1.cxx index 6b99b6a..30f33fa 100644 --- a/lotuswordpro/source/filter/lwppara1.cxx +++ b/lotuswordpro/source/filter/lwppara1.cxx @@ -356,7 +356,7 @@ void LwpPara::OverrideParaBorder(LwpParaProperty* pProps, XFParaStyle* pOverStyl LwpOverride* pBorder = pParaStyle->GetParaBorder(); SAL_WNODEPRECATED_DECLARATIONS_PUSH - std::auto_ptr<LwpParaBorderOverride> pFinalBorder( + boost::scoped_ptr<LwpParaBorderOverride> pFinalBorder( pBorder ? polymorphic_downcast<LwpParaBorderOverride*>(pBorder->clone()) : new LwpParaBorderOverride) @@ -372,7 +372,7 @@ void LwpPara::OverrideParaBorder(LwpParaProperty* pProps, XFParaStyle* pOverStyl pLocalBorder->Override(pFinalBorder.get()); } - pParaStyle->ApplyParaBorder(pOverStyle, pFinalBorder.release()); + pParaStyle->ApplyParaBorder(pOverStyle, pFinalBorder.get()); } /** * @short: Override parabreaks style. diff --git a/lotuswordpro/source/filter/xfilter/xfconfigmanager.cxx b/lotuswordpro/source/filter/xfilter/xfconfigmanager.cxx index 9a1f9b7..598363e 100644 --- a/lotuswordpro/source/filter/xfilter/xfconfigmanager.cxx +++ b/lotuswordpro/source/filter/xfilter/xfconfigmanager.cxx @@ -60,13 +60,21 @@ #include "xfconfigmanager.hxx" XFConfigManager::XFConfigManager() + : m_pLineNumberConfig(0) + , m_pFootnoteConfig(0) + , m_pEndnoteConfig(0) + { - m_pLineNumberConfig = NULL; - m_pFootnoteConfig = NULL; - m_pEndnoteConfig = NULL; } -void XFConfigManager::SetLineNumberConfig(XFLineNumberConfig *pLNConfig) +XFConfigManager::~XFConfigManager() +{ + delete m_pEndnoteConfig; + delete m_pFootnoteConfig; + delete m_pLineNumberConfig; +} + +void XFConfigManager::SetLineNumberConfig(XFLineNumberConfig *pLNConfig) { if( m_pLineNumberConfig ) delete m_pLineNumberConfig; @@ -82,8 +90,7 @@ void XFConfigManager::SetFootnoteConfig(XFFootnoteConfig *pFNConfig) void XFConfigManager::SetEndnoteConfig(XFEndnoteConfig *pENConfig) { - if( m_pEndnoteConfig ) - delete m_pEndnoteConfig; + delete m_pEndnoteConfig; m_pEndnoteConfig = pENConfig; } diff --git a/lotuswordpro/source/filter/xfilter/xfconfigmanager.hxx b/lotuswordpro/source/filter/xfilter/xfconfigmanager.hxx index 44a9c10..e1f9481 100644 --- a/lotuswordpro/source/filter/xfilter/xfconfigmanager.hxx +++ b/lotuswordpro/source/filter/xfilter/xfconfigmanager.hxx @@ -76,6 +76,7 @@ class XFConfigManager : public XFStyleContainer { public: XFConfigManager(); + ~XFConfigManager(); public: /** diff --git a/lotuswordpro/source/filter/xfilter/xfcontentcontainer.cxx b/lotuswordpro/source/filter/xfilter/xfcontentcontainer.cxx index 9a98ee3..3eaac06 100644 --- a/lotuswordpro/source/filter/xfilter/xfcontentcontainer.cxx +++ b/lotuswordpro/source/filter/xfilter/xfcontentcontainer.cxx @@ -104,8 +104,7 @@ XFContentContainer::~XFContentContainer() for( it = m_aContents.begin(); it != m_aContents.end(); ++it ) { IXFContent *pContent = *it; - if( pContent ) - delete pContent; + delete pContent; } } commit d820977d6aedc8447d50862751adb61cadf488c9 Author: Caolán McNamara <[email protected]> Date: Sat Oct 1 22:19:49 2011 +0100 valgrind: fix leak diff --git a/hwpfilter/source/hwpfile.cxx b/hwpfilter/source/hwpfile.cxx index b77cc1d..66e0eb9 100644 --- a/hwpfilter/source/hwpfile.cxx +++ b/hwpfilter/source/hwpfile.cxx @@ -70,16 +70,10 @@ HWPFile::HWPFile() SetCurrentDoc(this); } -/** - * TODO : Ãß°¡µÈ ½ºÅ¸Àϸ®½ºÆ®¿¡ ´ëÇÑ ¸Þ¸ð¸® ÇØÁ¦ - */ HWPFile::~HWPFile() { - if (oledata) - delete oledata; - - if (hiodev) - delete hiodev; + delete oledata; + delete hiodev; LinkedListIterator < ColumnInfo > it_column(&columnlist); for (; it_column.current(); it_column++) @@ -129,20 +123,17 @@ int detect_hwp_version(const char *str) int HWPFile::Open(HStream & stream) { - HStreamIODev *hstreamio; + HStreamIODev *hstreamio = new HStreamIODev(stream); - if (0 == (hstreamio = new HStreamIODev(stream))) - { - printf(" hstreamio is not instanciate \n"); - return SetState(errno); - } if (!hstreamio->open()) { delete hstreamio; return SetState(HWP_EMPTY_FILE); } - SetIODevice(hstreamio); + + HIODev *pPrev = SetIODevice(hstreamio); + delete pPrev; char idstr[HWPIDLen]; @@ -227,6 +218,7 @@ HIODev *HWPFile::SetIODevice(HIODev * new_hiodev) HIODev *old_hiodev = hiodev; hiodev = new_hiodev; + return old_hiodev; } commit b48e2d958c905322ebd3219cc2141c7c2f0ce768 Author: Caolán McNamara <[email protected]> Date: Sat Oct 1 22:02:12 2011 +0100 callcatcher: various unused methods diff --git a/sfx2/inc/sfx2/tabdlg.hxx b/sfx2/inc/sfx2/tabdlg.hxx index f7d1d24..ce1f84a 100644 --- a/sfx2/inc/sfx2/tabdlg.hxx +++ b/sfx2/inc/sfx2/tabdlg.hxx @@ -140,8 +140,6 @@ protected: bool PrepareLeaveCurrentPage(); public: - SfxTabDialog( Window* pParent, const ResId &rResId, sal_uInt16 nSetId, SfxBindings& rBindings, - sal_Bool bEditFmt = sal_False, const String *pUserButtonText = 0 ); SfxTabDialog( Window* pParent, const ResId &rResId, const SfxItemSet * = 0, sal_Bool bEditFmt = sal_False, const String *pUserButtonText = 0 ); SfxTabDialog( SfxViewFrame *pViewFrame, Window* pParent, const ResId &rResId, @@ -188,8 +186,6 @@ public: const sal_uInt16* GetInputRanges( const SfxItemPool& ); void SetInputSet( const SfxItemSet* pInSet ); const SfxItemSet* GetOutputItemSet() const { return pOutSet; } - const SfxItemSet* GetOutputItemSet( sal_uInt16 nId ) const; - int FillOutputItemSet(); sal_Bool IsFormat() const { return bFmt; } const OKButton& GetOKButton() const { return aOKBtn; } @@ -201,9 +197,6 @@ public: const PushButton& GetResetButton() const { return aResetBtn; } PushButton& GetResetButton() { return aResetBtn; } - const PushButton* GetApplyButton() const; - PushButton* GetApplyButton(); - const PushButton* GetUserButton() const { return pUserBtn; } PushButton* GetUserButton() { return pUserBtn; } void RemoveResetButton(); diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index 4afeb5e..738041f 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -514,41 +514,6 @@ SfxTabDialog::SfxTabDialog DBG_WARNING( "Please use the Construtor with the ViewFrame" ); } -SfxTabDialog::SfxTabDialog - -/* [Description] - - Constructor, temporary without Frame -*/ - -( - Window* pParent, // Parent Window - const ResId& rResId, // ResourceId - sal_uInt16 nSetId, - SfxBindings& rBindings, - sal_Bool bEditFmt, // Flag: templates are processed - // when yes -> additional Button for standard - const String* pUserButtonText // Text for UserButton; - // if != 0, the UserButton is created -) : - TabDialog( pParent, rResId ), - pFrame( 0 ), - INI_LIST(NULL) -{ - rBindings.ENTERREGISTRATIONS(); - pImpl->pController = new SfxTabDialogController( nSetId, rBindings, this ); - rBindings.LEAVEREGISTRATIONS(); - - EnableApplyButton( sal_True ); - SetApplyHandler( LINK( pImpl->pController, SfxTabDialogController, Execute_Impl ) ); - - rBindings.Invalidate( nSetId ); - rBindings.Update( nSetId ); - DBG_ASSERT( pSet, "No ItemSet!" ); - - Init_Impl( bFmt, pUserButtonText ); -} - // ----------------------------------------------------------------------- #if ENABLE_LAYOUT_SFX_TABDIALOG @@ -779,20 +744,6 @@ sal_Bool SfxTabDialog::IsApplyButtonEnabled() const // ----------------------------------------------------------------------- -const PushButton* SfxTabDialog::GetApplyButton() const -{ - return pImpl->pApplyButton; -} - -// ----------------------------------------------------------------------- - -PushButton* SfxTabDialog::GetApplyButton() -{ - return pImpl->pApplyButton; -} - -// ----------------------------------------------------------------------- - void SfxTabDialog::Start_Impl() { DBG_ASSERT( pImpl->pData->Count() == aTabCtrl.GetPageCount(), "not all pages registered" ); @@ -1518,52 +1469,6 @@ IMPL_LINK( SfxTabDialog, DeactivatePageHdl, TabControl *, pTabCtrl ) // ----------------------------------------------------------------------- -const SfxItemSet* SfxTabDialog::GetOutputItemSet - -/* [Description] - - Return the pages that provide their sets onDemand, the OutputItemSet. - - [Cross-reference] - - <SfxTabDialog::AddTabPage(sal_uInt16, CreateTabPage, GetTabPageRanges, sal_Bool)> - <SfxTabDialog::AddTabPage(sal_uInt16, const String &, CreateTabPage, GetTabPageRanges, sal_Bool, sal_uInt16)> - <SfxTabDialog::AddTabPage(sal_uInt16, const Bitmap &, CreateTabPage, GetTabPageRanges, sal_Bool, sal_uInt16)> -*/ - -( - sal_uInt16 nId // the Id, under which the page was added at AddTabPage(). -) const -{ - Data_Impl* pDataObject = Find( *pImpl->pData, nId ); - DBG_ASSERT( pDataObject, "TabPage not found" ); - - if ( pDataObject ) - { - if ( !pDataObject->pTabPage ) - return NULL; - - if ( pDataObject->bOnDemand ) - return &pDataObject->pTabPage->GetItemSet(); - return pOutSet; - } - return NULL; -} - -// ----------------------------------------------------------------------- - -int SfxTabDialog::FillOutputItemSet() -{ - int nRet = SfxTabPage::LEAVE_PAGE; - if ( OK_Impl() ) - Ok(); - else - nRet = SfxTabPage::KEEP_PAGE; - return nRet; -} - -// ----------------------------------------------------------------------- - extern "C" int SAL_CALL TabDlgCmpUS_Impl( const void* p1, const void* p2 ) /* [Description] diff --git a/svl/inc/svl/style.hxx b/svl/inc/svl/style.hxx index 7edecd7..ceb8050 100644 --- a/svl/inc/svl/style.hxx +++ b/svl/inc/svl/style.hxx @@ -285,7 +285,6 @@ public: virtual sal_Bool SetParent( const UniString& ); protected: - SfxStyleSheet(); // do not use! virtual ~SfxStyleSheet(); }; diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx index a44d642..2a1929e 100644 --- a/svl/source/items/style.cxx +++ b/svl/source/items/style.cxx @@ -892,10 +892,6 @@ SfxStyleSheet::SfxStyleSheet(const SfxStyleSheet& rStyle) : SfxBroadcaster( rStyle ) {} -SfxStyleSheet::SfxStyleSheet() -{ -} - SfxStyleSheet::~SfxStyleSheet() { Broadcast( SfxStyleSheetHint( SFX_STYLESHEET_INDESTRUCTION, *this ) ); diff --git a/unusedcode.easy b/unusedcode.easy index 44fe387..c4495d2 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -747,13 +747,7 @@ SfxRequest::SetTarget(String const&) SfxShell::GetBroadcaster() SfxShell::RemoveItem(unsigned short) SfxSlotPool::NextInterface() -SfxStyleSheet::SfxStyleSheet() -SfxTabDialog::FillOutputItemSet() -SfxTabDialog::GetApplyButton() -SfxTabDialog::GetApplyButton() const SfxTabDialog::GetApplyHandler() const -SfxTabDialog::GetOutputItemSet(unsigned short) const -SfxTabDialog::SfxTabDialog(Window*, ResId const&, unsigned short, SfxBindings&, unsigned char, String const*) SfxTabPage::SfxTabPage(Window*, long, SfxItemSet const&) SfxThesSubMenuControl::RegisterControl(unsigned short, SfxModule*) SfxToDoStack_Implarr_::Contains(SfxToDo_Impl const&) const commit 799e9515c08b9cf71e9294b5a1e83ab9d26d4b30 Author: Caolán McNamara <[email protected]> Date: Sat Oct 1 21:39:18 2011 +0100 StatusBarDescriptor never used diff --git a/framework/inc/framework/statusbarconfiguration.hxx b/framework/inc/framework/statusbarconfiguration.hxx index cb515ad..710f092 100644 --- a/framework/inc/framework/statusbarconfiguration.hxx +++ b/framework/inc/framework/statusbarconfiguration.hxx @@ -42,23 +42,6 @@ namespace framework { -struct FWE_DLLPUBLIC StatusBarItemDescriptor -{ - String aURL; // URL command to dispatch - long nItemBits; // properties for this statusbar item (WinBits) - long nWidth; // width of a statusbar item - long nOffset; // offset - - public: - - StatusBarItemDescriptor() : nItemBits( SIB_CENTER | SIB_IN ) - ,nWidth( 0 ) - ,nOffset( STATUSBAR_OFFSET ) {} -}; - -typedef StatusBarItemDescriptor* StatusBarItemDescriptorPtr; -SV_DECL_PTRARR_DEL( StatusBarDescriptor, StatusBarItemDescriptorPtr, 10, 2) - class FWE_DLLPUBLIC StatusBarConfiguration { public: diff --git a/framework/source/fwe/xml/statusbarconfiguration.cxx b/framework/source/fwe/xml/statusbarconfiguration.cxx index 613e457..d5f3f61 100644 --- a/framework/source/fwe/xml/statusbarconfiguration.cxx +++ b/framework/source/fwe/xml/statusbarconfiguration.cxx @@ -64,8 +64,6 @@ using namespace ::com::sun::star::container; namespace framework { -SV_IMPL_PTRARR( StatusBarDescriptor, StatusBarItemDescriptorPtr); - static Reference< XParser > GetSaxParser( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory ) diff --git a/unusedcode.easy b/unusedcode.easy index cd328c4..44fe387 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -2220,7 +2220,6 @@ formula::ResourceManager::loadString(unsigned short, char const*, rtl::OUString formula::StructPage::GetSelectedEntryText() formula::StructPage::GetSelectedToken() framework::ShareableMutex::getShareableOslMutex() -framework::StatusBarDescriptor::DeleteAndDestroy(unsigned short, unsigned short) framework::TabWindow::impl_createFactory(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&) framework::UIConfigElementWrapperBase::dispose() framework::UIElementWrapperBase::dispose()
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
