sd/source/ui/dlg/copydlg.cxx | 5 ++--- sd/source/ui/inc/copydlg.hxx | 2 +- sw/source/filter/writer/writer.cxx | 2 +- unusedcode.easy | 6 +++++- 4 files changed, 9 insertions(+), 6 deletions(-)
New commits: commit 13ade41fe6a94160968da00b14ee01fe96d0f957 Author: Caolán McNamara <caol...@redhat.com> Date: Fri Mar 2 08:51:03 2012 +0000 fix build diff --git a/sw/source/filter/writer/writer.cxx b/sw/source/filter/writer/writer.cxx index e1c4736..751743c 100644 --- a/sw/source/filter/writer/writer.cxx +++ b/sw/source/filter/writer/writer.cxx @@ -461,7 +461,7 @@ void Writer::CreateBookmarkTbl() sal_uInt16 Writer::GetBookmarks(const SwCntntNode& rNd, xub_StrLen nStt, xub_StrLen nEnd, std::vector< const ::sw::mark::IMark* >& rArr) { - OSL_ENSURE( !rArr.Count(), "es sind noch Eintraege vorhanden" ); + OSL_ENSURE( rArr.empty(), "es sind noch Eintraege vorhanden" ); sal_uLong nNd = rNd.GetIndex(); SwBookmarkNodeTable::const_iterator it = m_pImpl->aBkmkNodePos.find( nNd ); commit 17d263204891952bde4d0d8f7f318f120fbf8876 Author: Caolán McNamara <caol...@redhat.com> Date: Fri Mar 2 08:19:20 2012 +0000 callcatcher: update list diff --git a/unusedcode.easy b/unusedcode.easy index 92e5b72..8a5a54a 100755 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -92,6 +92,7 @@ ScHTMLColOffset_SAR::Replace(unsigned long const*, unsigned short, unsigned shor ScHTMLColOffset_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(unsigned long const&, void*), void*) ScNameDefDlg::LinkStubEdModifyHdl(void*, void*) ScNamedRangeObj::getImplementation(com::sun::star::uno::Reference<com::sun::star::uno::XInterface>) +ScPostIt::HasMultiLineText() const ScRTFColTwips::Insert(ScRTFColTwips const*, unsigned short, unsigned short) ScRTFColTwips::Insert(unsigned long const&, unsigned short&) ScRTFColTwips::Insert(unsigned long const*, unsigned short) @@ -99,9 +100,12 @@ ScRTFColTwips::Remove(unsigned long const&, unsigned short) ScRTFColTwips_SAR::Replace(unsigned long const&, unsigned short) ScRTFColTwips_SAR::Replace(unsigned long const*, unsigned short, unsigned short) ScRTFColTwips_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(unsigned long const&, void*), void*) +ScRangeData::ReplaceRangeNamesInUse(std::__debug::map<unsigned short, unsigned short, std::less<unsigned short>, std::allocator<std::pair<unsigned short const, unsigned short> > > const&) ScRangeData::ScRangeData(unsigned short) +ScRangeData::TransferTabRef(short, short) ScSimpleRangeList::Range::contains(ScSimpleRangeList::Range const&) const ScStringCell::ScStringCell() +ScTable::ReplaceRangeNamesInUse(short, int, short, int, std::__debug::map<unsigned short, unsigned short, std::less<unsigned short>, std::allocator<std::pair<unsigned short const, unsigned short> > > const&) ScTypedStrData::GetValue() const ScValidationEntries_Impl::Insert(ScValidationData* const&, unsigned short&) ScValidationEntries_Impl::Insert(ScValidationData* const*, unsigned short) @@ -503,6 +507,7 @@ _ZSortFlys_SAR::Replace(_ZSortFly const&, unsigned short) _ZSortFlys_SAR::Replace(_ZSortFly const*, unsigned short, unsigned short) _ZSortFlys_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(_ZSortFly const&, void*), void*) basebmp::debugDump(boost::shared_ptr<basebmp::BitmapDevice> const&, std::basic_ostream<char, std::char_traits<char> >&) +basegfx::tools::clipPolygonOnOrthogonalPlane(basegfx::B3DPolygon const&, basegfx::tools::B3DOrientation, bool, double, bool) basegfx::tools::equal(basegfx::B2DPolyPolygon const&, basegfx::B2DPolyPolygon const&, double const&) basegfx::tools::equal(basegfx::B3DPolyPolygon const&, basegfx::B3DPolyPolygon const&, double const&) basegfx::tools::getSignedArea(basegfx::B3DPolygon const&) @@ -1053,7 +1058,6 @@ psp::PrinterGfx::PSRMoveTo(int, int) psp::PrinterGfx::SetFallbackFont(int) rptui::OFieldExpressionControl::LinkStubAsynchActivate(void*, void*) rptui::OFieldExpressionControl::LinkStubAsynchDeactivate(void*, void*) -sd::CopyDlg::LinkStubReset(void*, void*) sd::LeftDrawPaneShell::RegisterInterface(SfxModule*) sd::LeftImpressPaneShell::RegisterInterface(SfxModule*) sd::ToolPanelPaneShell::RegisterInterface(SfxModule*) commit 92599076da1eb2fedd4c9d0fba5cb05ba81452a0 Author: Caolán McNamara <caol...@redhat.com> Date: Fri Mar 2 08:18:45 2012 +0000 CopyDlg::Reset doesn't need to be a LINK diff --git a/sd/source/ui/dlg/copydlg.cxx b/sd/source/ui/dlg/copydlg.cxx index fb3398a..1fb9a7e 100644 --- a/sd/source/ui/dlg/copydlg.cxx +++ b/sd/source/ui/dlg/copydlg.cxx @@ -120,7 +120,7 @@ CopyDlg::CopyDlg( SetFieldUnit( maMtrFldWidth, eFUnit, sal_True ); SetFieldUnit( maMtrFldHeight, eFUnit, sal_True ); - Reset(0L); + Reset(); } /************************************************************************* @@ -163,7 +163,7 @@ CopyDlg::~CopyDlg() |* \************************************************************************/ -IMPL_LINK_NOARG(CopyDlg, Reset) +void CopyDlg::Reset() { const SfxPoolItem* pPoolItem = NULL; String aStr( GetExtraData() ); @@ -242,7 +242,6 @@ IMPL_LINK_NOARG(CopyDlg, Reset) maLbEndColor.SelectEntry( Color( nTmp ) ); } - return 0; } /************************************************************************* diff --git a/sd/source/ui/inc/copydlg.hxx b/sd/source/ui/inc/copydlg.hxx index 1fa4e08..c327e1e 100644 --- a/sd/source/ui/inc/copydlg.hxx +++ b/sd/source/ui/inc/copydlg.hxx @@ -56,7 +56,7 @@ public: ~CopyDlg(); void GetAttr( SfxItemSet& rOutAttrs ); - DECL_LINK( Reset, void* ); + void Reset(); private: FixedText maFtCopies;
_______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits