comphelper/source/misc/documentinfo.cxx | 2 comphelper/source/misc/namedvaluecollection.cxx | 2 editeng/inc/editeng/unolingu.hxx | 3 - editeng/source/misc/unolingu.cxx | 6 -- sc/source/filter/ftools/ftools.cxx | 14 ----- sc/source/filter/inc/ftools.hxx | 2 sw/inc/editsh.hxx | 2 sw/source/core/edit/edfld.cxx | 13 ----- sw/source/ui/table/tabledlg.cxx | 7 +- sw/source/ui/table/tablepg.hxx | 2 unusedcode.easy | 6 -- vcl/inc/image.h | 1 vcl/source/gdi/impimage.cxx | 11 ---- xmloff/source/draw/sdxmlexp.cxx | 60 ------------------------ 14 files changed, 7 insertions(+), 124 deletions(-)
New commits: commit b540dc49a69a80bcc4160037198a5fb945969cb4 Author: Caolán McNamara <caol...@redhat.com> Date: Wed Oct 5 09:01:40 2011 +0100 conversion operator gone diff --git a/comphelper/source/misc/documentinfo.cxx b/comphelper/source/misc/documentinfo.cxx index a9b9a85..46bc112 100644 --- a/comphelper/source/misc/documentinfo.cxx +++ b/comphelper/source/misc/documentinfo.cxx @@ -187,7 +187,7 @@ namespace comphelper { sMessage += "\nin function:\n"; sMessage += BOOST_CURRENT_FUNCTION; sMessage += "\n"; - OSL_FAIL( sMessage ); + OSL_FAIL( sMessage.getStr() ); } return sTitle; diff --git a/comphelper/source/misc/namedvaluecollection.cxx b/comphelper/source/misc/namedvaluecollection.cxx index 6ed6cd1..ff7aa8c 100644 --- a/comphelper/source/misc/namedvaluecollection.cxx +++ b/comphelper/source/misc/namedvaluecollection.cxx @@ -211,7 +211,7 @@ namespace comphelper ::rtl::OStringBuffer message; message.append( "NamedValueCollection::impl_assign: encountered a value type which I cannot handle:\n" ); message.append( ::rtl::OUStringToOString( pArgument->getValueTypeName(), RTL_TEXTENCODING_ASCII_US ) ); - OSL_FAIL( message.makeStringAndClear() ); + OSL_FAIL( message.getStr() ); } #endif } commit 253576484ff4c991a1a1299c71cb8cfb463d2c83 Author: Caolán McNamara <caol...@redhat.com> Date: Tue Oct 4 23:38:52 2011 +0100 can replace ScfTools::AppendCString with SvStream::ReadCString diff --git a/sc/source/filter/ftools/ftools.cxx b/sc/source/filter/ftools/ftools.cxx index cf48cdd..744cb49 100644 --- a/sc/source/filter/ftools/ftools.cxx +++ b/sc/source/filter/ftools/ftools.cxx @@ -310,22 +310,10 @@ ByteString ScfTools::ReadCString( SvStream& rStrm, sal_Int32& rnBytesLeft ) return aRet.makeStringAndClear(); } -void ScfTools::AppendCString( SvStream& rStrm, ByteString& rString ) -{ - sal_Char cChar; - - rStrm >> cChar; - while( cChar ) - { - rString += cChar; - rStrm >> cChar; - } -} - void ScfTools::AppendCString( SvStream& rStrm, String& rString, rtl_TextEncoding eTextEnc ) { ByteString aByteString; - AppendCString( rStrm, aByteString ); + rStrm.ReadCString(aByteString); rString += String( aByteString, eTextEnc ); } diff --git a/sc/source/filter/inc/ftools.hxx b/sc/source/filter/inc/ftools.hxx index cdd2d62..39c49dc 100644 --- a/sc/source/filter/inc/ftools.hxx +++ b/sc/source/filter/inc/ftools.hxx @@ -249,8 +249,6 @@ public: { return String( ReadCString( rStrm, rnBytesLeft ), eTextEnc ); } /** Appends a zero terminted byte string. */ - static void AppendCString( SvStream& rStrm, ByteString& rString ); - /** Appends a zero terminted byte string. */ static void AppendCString( SvStream& rStrm, String& rString, rtl_TextEncoding eTextEnc ); // *** HTML table names <-> named range names *** ----------------------------- commit a1c936ce5364ffae88e682780f4579b3b94b673d Author: Caolán McNamara <caol...@redhat.com> Date: Tue Oct 4 23:24:19 2011 +0100 doesn't need to be a LINK diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index 25708a3..25bc3a8 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -247,7 +247,7 @@ IMPL_LINK( SwFormatTablePage, AutoClickHdl, CheckBox *, pBox ) } else if( ( RadioButton * ) pBox == &aFreeBtn ) { - RightModifyHdl(&aRightMF); + RightModify(); bLeftEnable = sal_True; bWidthEnable = sal_True; bOthers = sal_False; @@ -276,7 +276,7 @@ IMPL_LINK( SwFormatTablePage, AutoClickHdl, CheckBox *, pBox ) } /*----------------------------------------------------------------------*/ -IMPL_LINK( SwFormatTablePage, RightModifyHdl, MetricField *, EMPTYARG ) +void SwFormatTablePage::RightModify() { if(aFreeBtn.IsChecked()) { @@ -291,14 +291,13 @@ IMPL_LINK( SwFormatTablePage, RightModifyHdl, MetricField *, EMPTYARG ) aRightMF.Enable(!bEnable); aRightFT.Enable(!bEnable); } - return 0; } IMPL_LINK_INLINE_START( SwFormatTablePage, UpDownLoseFocusHdl, MetricField *, pEdit ) { if( &aRightMF == pEdit) - RightModifyHdl(pEdit); + RightModify(); ModifyHdl( pEdit ); return 0; } diff --git a/sw/source/ui/table/tablepg.hxx b/sw/source/ui/table/tablepg.hxx index 5103c03..6d29d6b 100644 --- a/sw/source/ui/table/tablepg.hxx +++ b/sw/source/ui/table/tablepg.hxx @@ -89,7 +89,7 @@ class SwFormatTablePage : public SfxTabPage DECL_LINK( AutoClickHdl, CheckBox * ); DECL_LINK( RelWidthClickHdl, CheckBox * ); - DECL_LINK( RightModifyHdl, MetricField * ); + void RightModify(); DECL_LINK( UpDownLoseFocusHdl, MetricField * ); using TabPage::ActivatePage; diff --git a/unusedcode.easy b/unusedcode.easy index f37b440..7680434 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -208,7 +208,6 @@ HeaderBar::SetHelpId(unsigned short, rtl::OString const&) HeaderBar::SetHelpText(unsigned short, String const&) IconChoiceDialog::RemoveResetButton() IconChoiceDialog::RemoveTabPage(unsigned short) -ImageAryData::ImageAryData() ImageButton::ImageButton(unsigned short) ImageList::Clear() ImageList::GetImageIds(std::vector<unsigned short, std::allocator<unsigned short> >&) const @@ -217,7 +216,6 @@ ImageList::ReplaceImage(rtl::OUString const&, rtl::OUString const&) ImageList::ReplaceImage(unsigned short, Image const&) ImageMap::GetBoundRect() const ImpBitmap::ImplDestroy() -ImpDefaultMapper::ImpDefaultMapper(com::sun::star::uno::Reference<com::sun::star::beans::XPropertyState>&) ImpSvMEdit::SetInsertMode(unsigned char) ImpSvtData::~ImpSvtData() ImplBorderWindow::ImplBorderWindow(Window*, long, unsigned short, com::sun::star::uno::Any const&) @@ -251,7 +249,6 @@ LineInfo::isDashDotOrFatLineUsed() const LineListBox::GetEntryDistance(unsigned short) const LineListBox::GetEntryLine1(unsigned short) const LineListBox::GetEntryLine2(unsigned short) const -LinguMgr::UpdateAll() LinkStructArr::DeleteAndDestroy(unsigned short, unsigned short) LngSvcMgr::RemoveLngSvcEvtBroadcaster(com::sun::star::uno::Reference<com::sun::star::linguistic2::XLinguServiceEventBroadcaster> const&) LocaleDataWrapper::getCollatorImplementations() const @@ -1160,10 +1157,8 @@ SwDestroyList::Insert(SwSectionFrm* const&, unsigned short&) SwDestroyList::Insert(SwSectionFrm* const*, unsigned short) SwDestroyList::Remove(SwSectionFrm* const&, unsigned short) SwDoc::LinkStubDoUpdateAllCharts(void*, void*) -SwEditShell::SetFixFields(unsigned char, DateTime const*) SwFilterDetect::impl_createFactory(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&) SwFldDataOnlyDlgWrapper::GetChildWindowId() -SwFormatTablePage::LinkStubRightModifyHdl(void*, void*) SwFrameControlsManager::GetControls(FrameControlType) SwGlblDocContents::Insert(SwGlblDocContent* const&, unsigned short&) SwGlblDocContents::Insert(SwGlblDocContent* const*, unsigned short) commit f42b66cc5104447a5505cc2c11e89fb42250d24b Author: Caolán McNamara <caol...@redhat.com> Date: Tue Oct 4 22:27:05 2011 +0100 callcatcher: unused methods diff --git a/editeng/inc/editeng/unolingu.hxx b/editeng/inc/editeng/unolingu.hxx index 11ed370..2773015 100644 --- a/editeng/inc/editeng/unolingu.hxx +++ b/editeng/inc/editeng/unolingu.hxx @@ -138,9 +138,6 @@ public: ::com::sun::star::linguistic2::XDictionary > GetIgnoreAllList(); static ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionary > GetChangeAllList(); - - // update all configuration entries - static void UpdateAll(); }; /////////////////////////////////////////////////////////////////////////// diff --git a/editeng/source/misc/unolingu.cxx b/editeng/source/misc/unolingu.cxx index 605623d..0178305 100644 --- a/editeng/source/misc/unolingu.cxx +++ b/editeng/source/misc/unolingu.cxx @@ -1029,12 +1029,6 @@ uno::Reference< XThesaurus > LinguMgr::GetThes() return xThes; } - -void LinguMgr::UpdateAll() -{ -} - - uno::Reference< XDictionaryList > LinguMgr::GetDicList() { if (bExiting) diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx index ab77265..d1e423f 100644 --- a/sw/inc/editsh.hxx +++ b/sw/inc/editsh.hxx @@ -354,8 +354,6 @@ public: // Check whether DB fields point to an available data source and returns it. sal_Bool IsFieldDataSourceAvailable(String& rUsedDataSource) const; void UpdateExpFlds(sal_Bool bCloseDB = sal_False);// nur alle ExpressionFelder updaten - void SetFixFields( sal_Bool bOnlyTimeDate = sal_False, - const DateTime* pNewDateTime = 0 ); void LockExpFlds(); void UnlockExpFlds(); diff --git a/sw/source/core/edit/edfld.cxx b/sw/source/core/edit/edfld.cxx index 9897e0a..0a074ac 100644 --- a/sw/source/core/edit/edfld.cxx +++ b/sw/source/core/edit/edfld.cxx @@ -493,19 +493,6 @@ SwFldUpdateFlags SwEditShell::GetFldUpdateFlags(sal_Bool bDocSettings) const return getIDocumentSettingAccess()->getFieldUpdateFlags( !bDocSettings ); } -void SwEditShell::SetFixFields( sal_Bool bOnlyTimeDate, - const DateTime* pNewDateTime ) -{ - SET_CURR_SHELL( this ); - sal_Bool bUnLockView = !IsViewLocked(); - LockView( sal_True ); - StartAllAction(); - GetDoc()->SetFixFields( bOnlyTimeDate, pNewDateTime ); - EndAllAction(); - if( bUnLockView ) - LockView( sal_False ); -} - void SwEditShell::SetLabelDoc( sal_Bool bFlag ) { GetDoc()->set(IDocumentSettingAccess::LABEL_DOCUMENT, bFlag ); diff --git a/vcl/inc/image.h b/vcl/inc/image.h index c7485dd..1eab7de 100644 --- a/vcl/inc/image.h +++ b/vcl/inc/image.h @@ -82,7 +82,6 @@ struct ImageAryData sal_uInt16 mnId; BitmapEx maBitmapEx; - ImageAryData(); ImageAryData( const rtl::OUString &aName, sal_uInt16 nId, const BitmapEx &aBitmap ); ImageAryData( const ImageAryData& rData ); diff --git a/vcl/source/gdi/impimage.cxx b/vcl/source/gdi/impimage.cxx index 4e979c8..20b4d7d 100644 --- a/vcl/source/gdi/impimage.cxx +++ b/vcl/source/gdi/impimage.cxx @@ -47,17 +47,6 @@ #define IMPSYSIMAGEITEM_ALPHA ( 0x02 ) #define DISA_ALL ( 0xffff ) -// ---------------- -// - ImageAryData - -// ---------------- - -ImageAryData::ImageAryData() : - maName(), - mnId( 0 ), - maBitmapEx() -{ -} - // ----------------------------------------------------------------------- ImageAryData::ImageAryData( const ImageAryData& rData ) : diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx index 67a007c..13eb605 100644 --- a/xmloff/source/draw/sdxmlexp.cxx +++ b/xmloff/source/draw/sdxmlexp.cxx @@ -741,68 +741,8 @@ SdXMLExport::~SdXMLExport() delete mpAutoLayoutInfoList; mpAutoLayoutInfoList = 0L; } - -// #82003# status indicator stop is called exclusively -// from SdXMLFilter::Export() now. -// -// stop progress view -// if(GetStatusIndicator().is()) -// { -// GetStatusIndicator()->end(); -// GetStatusIndicator()->reset(); -// } -} - -////////////////////////////////////////////////////////////////////////////// -// to get default values in XPropertySet use this wrapper class - -class ImpDefaultMapper : public ::cppu::WeakAggImplHelper1< beans::XPropertySet > -{ - Reference< beans::XPropertyState > mxState; - Reference< beans::XPropertySet > mxSet; - -public: - ImpDefaultMapper( Reference< beans::XPropertyState >& rxState ); - - // Methods - virtual Reference< beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException); - virtual Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException); - - // empty implementations - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const Reference< beans::XPropertyChangeListener >& xListener ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const Reference< beans::XPropertyChangeListener >& aListener ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const Reference< beans::XVetoableChangeListener >& aListener ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const Reference< beans::XVetoableChangeListener >& aListener ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException); -}; - -ImpDefaultMapper::ImpDefaultMapper( Reference< beans::XPropertyState >& rxState ) -: mxState( rxState ), - mxSet( rxState, UNO_QUERY ) -{ } -Reference< beans::XPropertySetInfo > SAL_CALL ImpDefaultMapper::getPropertySetInfo() throw(uno::RuntimeException) -{ - return mxSet->getPropertySetInfo(); -} - -void SAL_CALL ImpDefaultMapper::setPropertyValue( const OUString& aPropertyName, const Any& /*aValue*/ ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) -{ - mxState->setPropertyToDefault( aPropertyName /*, aValue */ ); -} - -Any SAL_CALL ImpDefaultMapper::getPropertyValue( const OUString& PropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) -{ - return mxState->getPropertyDefault( PropertyName ); -} - -// empty implementations -void SAL_CALL ImpDefaultMapper::addPropertyChangeListener( const OUString&, const Reference< beans::XPropertyChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {} -void SAL_CALL ImpDefaultMapper::removePropertyChangeListener( const OUString&, const Reference< beans::XPropertyChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {} -void SAL_CALL ImpDefaultMapper::addVetoableChangeListener( const OUString&, const Reference< beans::XVetoableChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {} -void SAL_CALL ImpDefaultMapper::removeVetoableChangeListener( const OUString&, const Reference< beans::XVetoableChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {} - ////////////////////////////////////////////////////////////////////////////// void SdXMLExport::ImpPrepAutoLayoutInfos() commit 2cd6e2259ce0777644af18b29ff424f10d908231 Author: Caolán McNamara <caol...@redhat.com> Date: Tue Oct 4 17:01:50 2011 +0100 sync list diff --git a/unusedcode.easy b/unusedcode.easy index 8203c75..f37b440 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -2417,7 +2417,6 @@ libvisio::VSDXOutputElementList::addStartLayer(WPXPropertyList const&) libvisio::VSDXOutputElementList::clear() libvisio::VSDXPage::VSDXPage(double, double, unsigned int, unsigned int, libvisio::VSDXOutputElementList const&) libvisio::VisioDocument::generateSVG(WPXInputStream*, WPXString&) -libwpg::WPGDashArray::at(unsigned int) const libwpg::WPGraphics::generateSVG(unsigned char const*, unsigned long, WPXString&, libwpg::WPGFileFormat) libwpg::WPGraphics::parse(unsigned char const*, unsigned long, libwpg::WPGPaintInterface*, libwpg::WPGFileFormat) linguistic::IsLower(String const&, unsigned short, unsigned short, short)
_______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits