basic/source/comp/exprtree.cxx | 18 --- basic/source/inc/expr.hxx | 1 sfx2/source/doc/docvor.cxx | 12 -- svtools/inc/svtools/svtdata.hxx | 1 svtools/source/misc/svtdata.cxx | 3 svx/source/unodraw/unoshap2.cxx | 2 unusedcode.easy | 16 --- xmloff/inc/xmloff/xmluconv.hxx | 19 ---- xmloff/source/core/xmluconv.cxx | 46 ---------- xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.cxx | 3 xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.hxx | 2 xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx | 3 xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx | 2 13 files changed, 4 insertions(+), 124 deletions(-)
New commits: commit 5833c182edd9f0fe82a38175601753bd676e5eba Author: Caolán McNamara <caol...@redhat.com> Date: Wed Feb 1 09:39:56 2012 +0000 callcatcher: update list diff --git a/basic/source/comp/exprtree.cxx b/basic/source/comp/exprtree.cxx index d4d0fa5..6e3ad7f 100644 --- a/basic/source/comp/exprtree.cxx +++ b/basic/source/comp/exprtree.cxx @@ -789,24 +789,6 @@ SbiExprNode* SbiExpression::VBA_Eqv() return pNd; } -SbiExprNode* SbiExpression::VBA_Imp() -{ - SbiExprNode* pNd = VBA_Eqv(); - if( m_eMode != EXPRMODE_EMPTY_PAREN ) - { - for( ;; ) - { - SbiToken eTok = pParser->Peek(); - if( eTok != IMP ) - break; - eTok = pParser->Next(); - pNd = new SbiExprNode( pParser, pNd, eTok, VBA_Eqv() ); - } - } - return pNd; - -} - SbiExprNode* SbiExpression::Like() { SbiExprNode* pNd = pParser->IsVBASupportOn() ? VBA_Not() : Comp(); diff --git a/basic/source/inc/expr.hxx b/basic/source/inc/expr.hxx index c6a656c..edd221e 100644 --- a/basic/source/inc/expr.hxx +++ b/basic/source/inc/expr.hxx @@ -193,7 +193,6 @@ protected: SbiExprNode* VBA_Or(); SbiExprNode* VBA_Xor(); SbiExprNode* VBA_Eqv(); - SbiExprNode* VBA_Imp(); SbiExprNode* Comp(); SbiExprNode* Boolean(); public: diff --git a/sfx2/source/doc/docvor.cxx b/sfx2/source/doc/docvor.cxx index ab7a6bd..d137aa4 100644 --- a/sfx2/source/doc/docvor.cxx +++ b/sfx2/source/doc/docvor.cxx @@ -177,7 +177,6 @@ friend class SfxOrganizeListBox_Impl; DECL_LINK( AddFilesHdl, sfx2::FileDialogHelper* ); sal_Bool DontDelete_Impl( SvLBoxEntry* pEntry ); - void OkHdl( Button* ); public: SfxOrganizeDlg_Impl( SfxTemplateOrganizeDlg* pParent, SfxDocumentTemplates* pTempl ); @@ -1993,17 +1992,6 @@ IMPL_LINK( SfxOrganizeDlg_Impl, AccelSelect_Impl, Accelerator *, pAccel ) Dispatch_Impl( pAccel->GetCurItemId(), NULL ) : 0; } -//------------------------------------------------------------------------- - -void SfxOrganizeDlg_Impl::OkHdl(Button *pButton) -{ - if(pFocusBox && pFocusBox->IsEditingActive()) - pFocusBox->EndEditing(sal_False); - pButton->Click(); -} - - - IMPL_LINK( SfxOrganizeDlg_Impl, MenuActivate_Impl, Menu *, pMenu ) /* [Description] diff --git a/svtools/inc/svtools/svtdata.hxx b/svtools/inc/svtools/svtdata.hxx index f647c6e..8689915 100644 --- a/svtools/inc/svtools/svtdata.hxx +++ b/svtools/inc/svtools/svtdata.hxx @@ -61,7 +61,6 @@ public: class SVT_DLLPUBLIC SvtResId: public ResId { public: - SvtResId(sal_uInt16 nId, const ::com::sun::star::lang::Locale aLocale); SvtResId(sal_uInt16 nId); // VCL dependant, only available in SVT, not in SVL! }; diff --git a/svtools/source/misc/svtdata.cxx b/svtools/source/misc/svtdata.cxx index 93a8963..6debd9c 100644 --- a/svtools/source/misc/svtdata.cxx +++ b/svtools/source/misc/svtdata.cxx @@ -69,9 +69,6 @@ ImpSvtData & ImpSvtData::GetSvtData() return *static_cast<ImpSvtData *>(*pAppData); } -SvtResId::SvtResId(sal_uInt16 nId, const ::com::sun::star::lang::Locale aLocale): - ResId(nId, *ImpSvtData::GetSvtData().GetResMgr(aLocale)) {} - SvtResId::SvtResId(sal_uInt16 nId): ResId(nId, *ImpSvtData::GetSvtData().GetResMgr()) {} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx index 34fd6c5..befaf47 100644 --- a/svx/source/unodraw/unoshap2.cxx +++ b/svx/source/unodraw/unoshap2.cxx @@ -1399,7 +1399,7 @@ bool SvxShapePolyPolygonBezier::getPropertyValueImpl( const ::rtl::OUString& rNa } case OWN_ATTR_VALUE_POLYGONKIND: { - rValue <<= mePolygonKind; + rValue <<= GetPolygonKind(); break; } default: diff --git a/unusedcode.easy b/unusedcode.easy index 32f3dac..ab56dea 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -122,10 +122,8 @@ SalGraphics::DrawNativeControlText(unsigned int, unsigned int, Rectangle const&, SalGraphics::drawAlphaBitmap(SalTwoRect const&, SalBitmap const&, SalBitmap const&) SalGraphics::drawPolyLine(basegfx::B2DPolygon const&, double, basegfx::B2DVector const&, basegfx::B2DLineJoin) SalGraphics::drawPolyPolygon(basegfx::B2DPolyPolygon const&, double) -SanExtensionImpl::extractCertExt() SanExtensionImpl::setCertExtn(com::sun::star::uno::Sequence<signed char>, com::sun::star::uno::Sequence<signed char>, unsigned char) SanExtensionImpl::setCertExtn(unsigned char*, unsigned int, unsigned char*, unsigned int, unsigned char) -SbiExpression::VBA_Imp() SbiRuntime::GetParams() SbiSymPool::Clear() SbxDecimal::getByte(unsigned char&) @@ -278,7 +276,6 @@ SfxModuleArr_Impl::DeleteAndDestroy(unsigned short, unsigned short) SfxNavigatorWrapper::GetChildWindowId() SfxOleDateProperty::SfxOleDateProperty(int, com::sun::star::util::Date const&) SfxOleString16Property::SfxOleString16Property(int, String const&) -SfxOrganizeDlg_Impl::OkHdl(Button*) SfxPartChildWnd_Impl::GetChildWindowId() SfxPasswordDialog::SetMaxLen(unsigned short) SfxPopupWindow::LinkStubDelete(void*, void*) @@ -384,9 +381,6 @@ SvXMLTokenMap_Impl::Insert(SvXMLTokenMapEntry_Impl* const*, unsigned short) SvXMLTokenMap_Impl::Insert(SvXMLTokenMap_Impl const*, unsigned short, unsigned short) SvXMLTokenMap_Impl::Remove(SvXMLTokenMapEntry_Impl* const&, unsigned short) SvXMLTokenMap_Impl::Remove(unsigned short, unsigned short) -SvXMLUnitConverter::GetCoreMeasureUnit() const -SvXMLUnitConverter::convertEnum(rtl::OUStringBuffer&, unsigned short, SvXMLEnumStringMapEntry const*, char*) -SvXMLUnitConverter::convertMeasureToXML(rtl::OUStringBuffer&, int, short) const SvpSalInstance::CancelEvent(SalFrame const*, void*, unsigned short) SvtBroadcaster::Forward(SvtBroadcaster&, SfxHint const&) SvtIconChoiceCtrl::SvtIconChoiceCtrl(Window*, ResId const&) @@ -396,7 +390,6 @@ SvtListenerIter::GoEnd() SvtListenerIter::GoPrev() SvtListenerIter::GoRoot() SvtListenerIter::Next() -SvtResId::SvtResId(unsigned short, com::sun::star::lang::Locale) SvtScriptedTextHelper::GetText() const SvtScriptedTextHelper::GetTextHeight() const SvtScriptedTextHelper::GetTextWidth() const @@ -478,7 +471,6 @@ SvxSearchDialog::GetReplaceItems(SfxItemSet&) SvxSearchDialog::GetSearchItems(SfxItemSet&) SvxSearchDialog::SvxSearchDialog(Window*, SfxBindings&) SvxSelectionModeControl::GetDefItemWidth(StatusBar const&) -SvxShapePolyPolygonBezier::GetPolygonKind() const SvxShapeText::SvxShapeText() SvxSimpleTable::SvxSimpleTable(SvxSimpleTableContainer&, ResId const&) SvxTabStopArr::Insert(SvxTabStop const&, unsigned short&) @@ -1256,6 +1248,9 @@ comphelper::PropertySetHelper::setInfo(comphelper::PropertySetInfo*) comphelper::PropertySetInfo::add(comphelper::PropertyMapEntry*, int) comphelper::ResourceBasedEventLogger::ResourceBasedEventLogger(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&, rtl::OUString const&, rtl::OUString const&) comphelper::ServiceInfoHelper::concatSequences(com::sun::star::uno::Sequence<rtl::OUString> const&, com::sun::star::uno::Sequence<rtl::OUString> const&) +comphelper::detail::ConfigurationWrapper::getGroupReadWrite(boost::shared_ptr<comphelper::ConfigurationChanges> const&, rtl::OUString const&) const +comphelper::detail::ConfigurationWrapper::getLocalizedPropertyValue(rtl::OUString const&) const +comphelper::detail::ConfigurationWrapper::setLocalizedPropertyValue(boost::shared_ptr<comphelper::ConfigurationChanges> const&, rtl::OUString const&, com::sun::star::uno::Any const&) const comphelper::findProperty(com::sun::star::beans::Property&, com::sun::star::uno::Sequence<com::sun::star::beans::Property>&, rtl::OUString const&) comphelper::string::isalnumAsciiString(rtl::OUString const&) comphelper::string::islowerAsciiString(rtl::OUString const&) @@ -1359,8 +1354,6 @@ jfw_plugin::VendorBase::createInstance() jfw_plugin::VendorBase::getJavaExePaths(int*) jvmaccess::ClassPath::doLoadClass(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&, void*, rtl::OUString const&, rtl::OUString const&) libcdr::CDRDocument::generateSVG(WPXInputStream*, WPXString&) -libcdr::CDRInternalStream::CDRInternalStream(unsigned char const*, unsigned long) -libcdr::readDouble(WPXInputStream*) libcmis::SessionFactory::getRepositories(std::__debug::map<int, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::less<int>, std::allocator<std::pair<int const, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > >) libvisio::VisioDocument::generateSVG(WPXInputStream*, WPXString&) libwpg::WPGraphics::generateSVG(unsigned char const*, unsigned long, WPXString&, libwpg::WPGFileFormat) @@ -1631,9 +1624,6 @@ unicode::isBase(unsigned short) unicode::isPunctuation(unsigned short) unicode::isTitle(unsigned short) unographic::GraphicDescriptor::isValid() const -unotools::detail::ConfigurationWrapper::getGroupReadWrite(boost::shared_ptr<unotools::ConfigurationChanges> const&, rtl::OUString const&) const -unotools::detail::ConfigurationWrapper::getLocalizedPropertyValue(rtl::OUString const&) const -unotools::detail::ConfigurationWrapper::setLocalizedPropertyValue(boost::shared_ptr<unotools::ConfigurationChanges> const&, rtl::OUString const&, com::sun::star::uno::Any const&) const utl::NodeValueAccessor::bind(com::sun::star::uno::Any*) utl::OConfigurationNode::appendNode(rtl::OUString const&, utl::OConfigurationNode const&) const utl::OConfigurationValueContainer::getServiceFactory() const diff --git a/xmloff/inc/xmloff/xmluconv.hxx b/xmloff/inc/xmloff/xmluconv.hxx index 7e9a460..7506a28 100644 --- a/xmloff/inc/xmloff/xmluconv.hxx +++ b/xmloff/inc/xmloff/xmluconv.hxx @@ -115,9 +115,6 @@ public: /** sets the default unit for numerical measures */ void SetCoreMeasureUnit( sal_Int16 const eCoreMeasureUnit ); - /** gets the default unit for numerical measures */ - sal_Int16 GetCoreMeasureUnit() const; - /** sets the default unit for textual measures */ void SetXMLMeasureUnit( sal_Int16 const eXMLMeasureUnit ); @@ -139,12 +136,6 @@ public: void convertMeasureToXML( ::rtl::OUStringBuffer& rBuffer, sal_Int32 nMeasure ) const; - /** convert measure with given unit to string with meXMLMeasureUnit */ - void convertMeasureToXML( ::rtl::OUStringBuffer&, - sal_Int32 nMeasure, - sal_Int16 eSrcUnit ) const; - - /** convert string to enum using given enum map, if the enum is not found in the map, this method will return false */ static sal_Bool convertEnum( sal_uInt16& rEnum, @@ -167,16 +158,6 @@ public: enum ::xmloff::token::XMLTokenEnum eDefault = ::xmloff::token::XML_TOKEN_INVALID ); - /** convert enum to string using given token map with an optional - default token. If the enum is not found in the map, - this method will either use the given default or return - false if not default is set */ - static sal_Bool convertEnum( ::rtl::OUStringBuffer& rBuffer, - sal_uInt16 nValue, - const SvXMLEnumStringMapEntry *pMap, - sal_Char* pDefault = NULL ); - - /** convert double number to string (using ::rtl::math) and DO convert to export MapUnit using meCoreMeasureUnit/meXMLMeasureUnit */ void convertDouble(::rtl::OUStringBuffer& rBuffer, diff --git a/xmloff/source/core/xmluconv.cxx b/xmloff/source/core/xmluconv.cxx index 1109eb5..f6e0621 100644 --- a/xmloff/source/core/xmluconv.cxx +++ b/xmloff/source/core/xmluconv.cxx @@ -117,11 +117,6 @@ void SvXMLUnitConverter::SetCoreMeasureUnit(sal_Int16 const eCoreMeasureUnit) m_pImpl->m_eCoreMeasureUnit = eCoreMeasureUnit; } -sal_Int16 SvXMLUnitConverter::GetCoreMeasureUnit() const -{ - return m_pImpl->m_eCoreMeasureUnit; -} - void SvXMLUnitConverter::SetXMLMeasureUnit(sal_Int16 const eXMLMeasureUnit) { m_pImpl->m_eXMLMeasureUnit = eXMLMeasureUnit; @@ -195,16 +190,6 @@ void SvXMLUnitConverter::convertMeasureToXML( OUStringBuffer& rString, m_pImpl->m_eXMLMeasureUnit ); } -/** convert measure with given unit to string */ -void SvXMLUnitConverter::convertMeasureToXML( OUStringBuffer& rString, - sal_Int32 nMeasure, - sal_Int16 eSrcUnit ) const -{ - ::sax::Converter::convertMeasure( rString, nMeasure, - eSrcUnit, - m_pImpl->m_eXMLMeasureUnit ); -} - /** convert string to enum using given enum map, if the enum is not found in the map, this method will return false */ @@ -244,37 +229,6 @@ sal_Bool SvXMLUnitConverter::convertEnum( return sal_False; } -/** convert enum to string using given enum map with optional - default string. If the enum is not found in the map, - this method will either use the given default or return - false if not default is set -*/ -sal_Bool SvXMLUnitConverter::convertEnum( OUStringBuffer& rBuffer, - sal_uInt16 nValue, - const SvXMLEnumStringMapEntry *pMap, - sal_Char * pDefault /* = NULL */ ) -{ - const sal_Char *pStr = pDefault; - - while( pMap->pName ) - { - if( pMap->nValue == nValue ) - { - pStr = pMap->pName; - break; - } - ++pMap; - } - - if( NULL == pStr ) - pStr = pDefault; - - if( NULL != pStr ) - rBuffer.appendAscii( pStr ); - - return NULL != pStr; -} - /** convert enum to string using given token map with an optional default token. If the enum is not found in the map, this method will either use the given default or return diff --git a/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.cxx index aab3508..1dc97f9 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.cxx @@ -176,7 +176,4 @@ void SanExtensionImpl :: setCertExtn( unsigned char* value, unsigned int vlen, u m_critical = critical ; } -void SanExtensionImpl :: extractCertExt () { -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.hxx index 10d6006..ee28760 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.hxx +++ b/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.hxx @@ -77,8 +77,6 @@ class SanExtensionImpl : public ::cppu::WeakImplHelper1< void setCertExtn( ::com::sun::star::uno::Sequence< sal_Int8 > extnId, ::com::sun::star::uno::Sequence< sal_Int8 > extnValue, sal_Bool critical ) ; void setCertExtn( unsigned char* value, unsigned int vlen, unsigned char* id, unsigned int idlen, sal_Bool critical ) ; - - void extractCertExt() ; } ; #endif // _CERTIFICATEEXTENSION_XMLSECIMPL_HXX_ diff --git a/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx index c42f59f..f83aff3 100644 --- a/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx @@ -238,7 +238,4 @@ void SanExtensionImpl :: setCertExtn( unsigned char* value, unsigned int vlen, u m_critical = critical ; } -void SanExtensionImpl :: extractCertExt () { -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx index df33e83..fed9f65 100644 --- a/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx +++ b/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx @@ -70,8 +70,6 @@ class SanExtensionImpl : public ::cppu::WeakImplHelper1< void setCertExtn( ::com::sun::star::uno::Sequence< sal_Int8 > extnId, ::com::sun::star::uno::Sequence< sal_Int8 > extnValue, sal_Bool critical ) ; void setCertExtn( unsigned char* value, unsigned int vlen, unsigned char* id, unsigned int idlen, sal_Bool critical ) ; - - void extractCertExt() ; } ; #endif // _CERTIFICATEEXTENSION_XMLSECIMPL_HXX_
_______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits