From abda3776191f04d1f3f3e9e4fc966455cc25d346 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 18 Apr 2012 09:05:31 +0100 Subject: callcatcher: update list --- comphelper/inc/comphelper/logging.hxx | 13 ---- comphelper/source/misc/logging.cxx | 6 -- sc/source/filter/inc/stylesbuffer.hxx | 13 ---- sc/source/filter/oox/addressconverter.cxx | 16 ----- sc/source/filter/oox/stylesbuffer.cxx | 91 ------------------------ svtools/inc/svtools/svlbitm.hxx | 1 - svtools/source/contnr/svlbitm.cxx | 7 -- svx/inc/svx/sdr/contact/viewcontactofpageobj.hxx | 4 -- svx/source/sdr/contact/viewcontactofpageobj.cxx | 6 -- unusedcode.easy | 3 - 10 files changed, 160 deletions(-) diff --git a/comphelper/inc/comphelper/logging.hxx b/comphelper/inc/comphelper/logging.hxx index 5ad80ece3a79..2b1d03e30760 100644 --- a/comphelper/inc/comphelper/logging.hxx +++ b/comphelper/inc/comphelper/logging.hxx @@ -106,19 +106,6 @@ namespace comphelper ::boost::shared_ptr< EventLogger_Impl > m_pImpl; public: - /** creates an EventLogger instance working with a css.logging.XLogger - instance given by name. - - @param _rxContext - the component context to create services - @param _rLoggerName - the name of the logger to create. If empty, the office-wide default logger will be used. - */ - EventLogger( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, - const ::rtl::OUString& _rLoggerName = ::rtl::OUString() - ); - /** creates an EventLogger instance working with a css.logging.XLogger instance given by ASCII name. diff --git a/comphelper/source/misc/logging.cxx b/comphelper/source/misc/logging.cxx index 98a497cc7498..a72d8c887f5e 100644 --- a/comphelper/source/misc/logging.cxx +++ b/comphelper/source/misc/logging.cxx @@ -109,12 +109,6 @@ namespace comphelper //==================================================================== //= EventLogger //==================================================================== - //-------------------------------------------------------------------- - EventLogger::EventLogger( const Reference< XComponentContext >& _rxContext, const ::rtl::OUString& _rLoggerName ) - :m_pImpl( new EventLogger_Impl( _rxContext, _rLoggerName ) ) - { - } - //-------------------------------------------------------------------- EventLogger::EventLogger( const Reference< XComponentContext >& _rxContext, const sal_Char* _pAsciiLoggerName ) :m_pImpl( new EventLogger_Impl( _rxContext, ::rtl::OUString::createFromAscii( _pAsciiLoggerName ) ) ) diff --git a/sc/source/filter/inc/stylesbuffer.hxx b/sc/source/filter/inc/stylesbuffer.hxx index 6be78e61cd6a..5257f04f3155 100644 --- a/sc/source/filter/inc/stylesbuffer.hxx +++ b/sc/source/filter/inc/stylesbuffer.hxx @@ -275,9 +275,6 @@ public: /** Imports a font style flag from a DXF record. */ void importDxfFlag( sal_Int32 nElement, SequenceInputStream& rStrm ); - /** Sets the font attributes from the font block of a CFRULE record. */ - void importCfRule( BiffInputStream& rStrm ); - /** Returns the font model structure. This function can be called before finalizeImport() has been called. */ inline const FontModel& getModel() const { return maModel; } @@ -461,8 +458,6 @@ struct BorderLineModel /** Sets the passed BIFF line style. */ void setBiffStyle( sal_Int32 nLineStyle ); - /** Sets line style and line color from the passed BIFF data. */ - void setBiffData( sal_uInt8 nLineStyle, sal_uInt16 nLineColor ); }; // ---------------------------------------------------------------------------- @@ -524,9 +519,6 @@ public: /** Imports a border from a DXF record from the passed stream. */ void importDxfBorder( sal_Int32 nElement, SequenceInputStream& rStrm ); - /** Sets the border attributes from the border block of a CFRULE record. */ - void importCfRule( BiffInputStream& rStrm, sal_uInt32 nFlags ); - /** Final processing after import of all style settings. */ void finalizeImport(); @@ -575,8 +567,6 @@ struct PatternFillModel /** Sets the passed BIFF pattern identifier. */ void setBiffPattern( sal_Int32 nPattern ); - /** Sets the pattern and pattern colors from the passed BIFF data. */ - void setBiffData( sal_uInt16 nPatternColor, sal_uInt16 nFillColor, sal_uInt8 nPattern ); }; // ---------------------------------------------------------------------------- @@ -648,9 +638,6 @@ public: /** Imports gradient stop settings from a DXF record. */ void importDxfStop( SequenceInputStream& rStrm ); - /** Sets the fill attributes from the fill block of a CFRULE record. */ - void importCfRule( BiffInputStream& rStrm, sal_uInt32 nFlags ); - /** Final processing after import of all style settings. */ void finalizeImport(); diff --git a/sc/source/filter/oox/addressconverter.cxx b/sc/source/filter/oox/addressconverter.cxx index 9f1f6f1e8ff2..52e74ebbcecc 100644 --- a/sc/source/filter/oox/addressconverter.cxx +++ b/sc/source/filter/oox/addressconverter.cxx @@ -281,22 +281,6 @@ bool AddressConverter::parseOoxRange2d( return false; } -namespace { - -bool lclAppendUrlChar( OUStringBuffer& orUrl, sal_Unicode cChar, bool bEncodeSpecial ) -{ - // #126855# encode special characters - if( bEncodeSpecial ) switch( cChar ) - { - case '#': orUrl.appendAscii( "%23" ); return true; - case '%': orUrl.appendAscii( "%25" ); return true; - } - orUrl.append( cChar ); - return cChar >= ' '; -} - -} // namespace - // ---------------------------------------------------------------------------- bool AddressConverter::checkCol( sal_Int32 nCol, bool bTrackOverflow ) diff --git a/sc/source/filter/oox/stylesbuffer.cxx b/sc/source/filter/oox/stylesbuffer.cxx index 62d25080903c..1ac390a0d5af 100644 --- a/sc/source/filter/oox/stylesbuffer.cxx +++ b/sc/source/filter/oox/stylesbuffer.cxx @@ -881,49 +881,6 @@ void Font::importDxfFlag( sal_Int32 nElement, SequenceInputStream& rStrm ) } } -void Font::importCfRule( BiffInputStream& rStrm ) -{ - OSL_ENSURE( mbDxf, "Font::importCfRule - missing conditional formatting flag" ); - - sal_Int32 nHeight, nColor; - sal_uInt32 nStyle, nFontFlags1, nFontFlags2, nFontFlags3; - sal_uInt16 nWeight, nEscapement; - sal_uInt8 nUnderline; - - OSL_ENSURE( rStrm.getRemaining() >= 118, "Font::importCfRule - missing record data" ); - sal_Int64 nRecPos = rStrm.tell(); - maModel.maName = rStrm.readUniStringBody( rStrm.readuInt8() ); - maUsedFlags.mbNameUsed = !maModel.maName.isEmpty(); - OSL_ENSURE( !rStrm.isEof() && (rStrm.tell() <= nRecPos + 64), "Font::importCfRule - font name too long" ); - rStrm.seek( nRecPos + 64 ); - rStrm >> nHeight >> nStyle >> nWeight >> nEscapement >> nUnderline; - rStrm.skip( 3 ); - rStrm >> nColor; - rStrm.skip( 4 ); - rStrm >> nFontFlags1 >> nFontFlags2 >> nFontFlags3; - rStrm.skip( 18 ); - - if( (maUsedFlags.mbColorUsed = (0 <= nColor) && (nColor <= 0x7FFF)) == true ) - maModel.maColor.setIndexed( nColor ); - if( (maUsedFlags.mbHeightUsed = (0 < nHeight) && (nHeight <= 0x7FFF)) == true ) - maModel.setBiffHeight( static_cast< sal_uInt16 >( nHeight ) ); - if( (maUsedFlags.mbUnderlineUsed = !getFlag( nFontFlags3, BIFF_CFRULE_FONT_UNDERL )) == true ) - maModel.setBiffUnderline( nUnderline ); - if( (maUsedFlags.mbEscapementUsed = !getFlag( nFontFlags2, BIFF_CFRULE_FONT_ESCAPEM )) == true ) - maModel.setBiffEscapement( nEscapement ); - if( (maUsedFlags.mbWeightUsed = maUsedFlags.mbPostureUsed = !getFlag( nFontFlags1, BIFF_CFRULE_FONT_STYLE )) == true ) - { - maModel.setBiffWeight( nWeight ); - maModel.mbItalic = getFlag( nStyle, BIFF_CFRULE_FONT_STYLE ); - } - if( (maUsedFlags.mbStrikeoutUsed = !getFlag( nFontFlags1, BIFF_CFRULE_FONT_STRIKEOUT )) == true ) - maModel.mbStrikeout = getFlag( nStyle, BIFF_CFRULE_FONT_STRIKEOUT ); - if( (maUsedFlags.mbOutlineUsed = !getFlag( nFontFlags1, BIFF_CFRULE_FONT_OUTLINE )) == true ) - maModel.mbOutline = getFlag( nStyle, BIFF_CFRULE_FONT_OUTLINE ); - if( (maUsedFlags.mbShadowUsed = !getFlag( nFontFlags1, BIFF_CFRULE_FONT_SHADOW )) == true ) - maModel.mbShadow = getFlag( nStyle, BIFF_CFRULE_FONT_SHADOW ); -} - void Font::finalizeImport() { namespace cssawt = ::com::sun::star::awt; @@ -1608,12 +1565,6 @@ void BorderLineModel::setBiffStyle( sal_Int32 nLineStyle ) mnStyle = STATIC_ARRAY_SELECT( spnStyleIds, nLineStyle, XML_none ); } -void BorderLineModel::setBiffData( sal_uInt8 nLineStyle, sal_uInt16 nLineColor ) -{ - maColor.setIndexed( nLineColor ); - setBiffStyle( nLineStyle ); -} - // ---------------------------------------------------------------------------- BorderModel::BorderModel( bool bDxf ) : @@ -1743,24 +1694,6 @@ void Border::importDxfBorder( sal_Int32 nElement, SequenceInputStream& rStrm ) } } -void Border::importCfRule( BiffInputStream& rStrm, sal_uInt32 nFlags ) -{ - OSL_ENSURE( mbDxf, "Border::importCfRule - missing conditional formatting flag" ); - OSL_ENSURE( getFlag( nFlags, BIFF_CFRULE_BORDERBLOCK ), "Border::importCfRule - missing border block flag" ); - sal_uInt16 nStyle; - sal_uInt32 nColor; - rStrm >> nStyle >> nColor; - rStrm.skip( 2 ); - maModel.maLeft.setBiffData( extractValue< sal_uInt8 >( nStyle, 0, 4 ), extractValue< sal_uInt16 >( nColor, 0, 7 ) ); - maModel.maRight.setBiffData( extractValue< sal_uInt8 >( nStyle, 4, 4 ), extractValue< sal_uInt16 >( nColor, 7, 7 ) ); - maModel.maTop.setBiffData( extractValue< sal_uInt8 >( nStyle, 8, 4 ), extractValue< sal_uInt16 >( nColor, 16, 7 ) ); - maModel.maBottom.setBiffData( extractValue< sal_uInt8 >( nStyle, 12, 4 ), extractValue< sal_uInt16 >( nColor, 23, 7 ) ); - maModel.maLeft.mbUsed = !getFlag( nFlags, BIFF_CFRULE_BORDER_LEFT ); - maModel.maRight.mbUsed = !getFlag( nFlags, BIFF_CFRULE_BORDER_RIGHT ); - maModel.maTop.mbUsed = !getFlag( nFlags, BIFF_CFRULE_BORDER_TOP ); - maModel.maBottom.mbUsed = !getFlag( nFlags, BIFF_CFRULE_BORDER_BOTTOM ); -} - void Border::finalizeImport() { maApiData.mbBorderUsed = maModel.maLeft.mbUsed || maModel.maRight.mbUsed || maModel.maTop.mbUsed || maModel.maBottom.mbUsed; @@ -1924,14 +1857,6 @@ void PatternFillModel::setBiffPattern( sal_Int32 nPattern ) mnPattern = STATIC_ARRAY_SELECT( spnPatternIds, nPattern, XML_none ); } -void PatternFillModel::setBiffData( sal_uInt16 nPatternColor, sal_uInt16 nFillColor, sal_uInt8 nPattern ) -{ - maPatternColor.setIndexed( nPatternColor ); - maFillColor.setIndexed( nFillColor ); - // patterns equal in all BIFFs - setBiffPattern( nPattern ); -} - // ---------------------------------------------------------------------------- GradientFillModel::GradientFillModel() : @@ -2124,22 +2049,6 @@ void Fill::importDxfStop( SequenceInputStream& rStrm ) mxGradientModel->readGradientStop( rStrm, true ); } -void Fill::importCfRule( BiffInputStream& rStrm, sal_uInt32 nFlags ) -{ - OSL_ENSURE( mbDxf, "Fill::importCfRule - missing conditional formatting flag" ); - OSL_ENSURE( getFlag( nFlags, BIFF_CFRULE_FILLBLOCK ), "Fill::importCfRule - missing fill block flag" ); - mxPatternModel.reset( new PatternFillModel( mbDxf ) ); - sal_uInt32 nFillData; - rStrm >> nFillData; - mxPatternModel->setBiffData( - extractValue< sal_uInt16 >( nFillData, 16, 7 ), - extractValue< sal_uInt16 >( nFillData, 23, 7 ), - extractValue< sal_uInt8 >( nFillData, 10, 6 ) ); - mxPatternModel->mbPattColorUsed = !getFlag( nFlags, BIFF_CFRULE_FILL_PATTCOLOR ); - mxPatternModel->mbFillColorUsed = !getFlag( nFlags, BIFF_CFRULE_FILL_FILLCOLOR ); - mxPatternModel->mbPatternUsed = !getFlag( nFlags, BIFF_CFRULE_FILL_PATTERN ); -} - void Fill::finalizeImport() { const GraphicHelper& rGraphicHelper = getBaseFilter().getGraphicHelper(); diff --git a/svtools/inc/svtools/svlbitm.hxx b/svtools/inc/svtools/svlbitm.hxx index 8e1957bb0150..c001870fab78 100644 --- a/svtools/inc/svtools/svlbitm.hxx +++ b/svtools/inc/svtools/svlbitm.hxx @@ -74,7 +74,6 @@ public: SvLBoxButtonData( const Control* pControlForSettings ); SvLBoxButtonData( const Control* pControlForSettings, bool _bRadioBtn ); - SvLBoxButtonData(); ~SvLBoxButtonData(); sal_uInt16 GetIndex( sal_uInt16 nItemState ); diff --git a/svtools/source/contnr/svlbitm.cxx b/svtools/source/contnr/svlbitm.cxx index 49310c262d66..a4cbfc010427 100644 --- a/svtools/source/contnr/svlbitm.cxx +++ b/svtools/source/contnr/svlbitm.cxx @@ -77,13 +77,6 @@ SvLBoxButtonData::SvLBoxButtonData( const Control* pControlForSettings, bool _bR InitData( sal_True, _bRadioBtn, pControlForSettings ); } -SvLBoxButtonData::SvLBoxButtonData() -{ - DBG_CTOR(SvLBoxButtonData,0); - - InitData( sal_False, false ); -} - SvLBoxButtonData::~SvLBoxButtonData() { DBG_DTOR(SvLBoxButtonData,0); diff --git a/svx/inc/svx/sdr/contact/viewcontactofpageobj.hxx b/svx/inc/svx/sdr/contact/viewcontactofpageobj.hxx index ba7f940bcbae..71e5fc6c77bb 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofpageobj.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofpageobj.hxx @@ -53,10 +53,6 @@ namespace sdr // create graphical visualisation data virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const; - - // Access to referenced page - const SdrPage* GetReferencedPage() const; - public: // basic constructor, used from SdrObject. ViewContactOfPageObj(SdrPageObj& rPageObj); diff --git a/svx/source/sdr/contact/viewcontactofpageobj.cxx b/svx/source/sdr/contact/viewcontactofpageobj.cxx index 7b2c821ee740..d586fac06f39 100644 --- a/svx/source/sdr/contact/viewcontactofpageobj.cxx +++ b/svx/source/sdr/contact/viewcontactofpageobj.cxx @@ -50,12 +50,6 @@ namespace sdr return *pRetval; } - // Access to referenced page - const SdrPage* ViewContactOfPageObj::GetReferencedPage() const - { - return GetPageObj().GetReferencedPage(); - } - ViewContactOfPageObj::ViewContactOfPageObj(SdrPageObj& rPageObj) : ViewContactOfSdrObj(rPageObj) { diff --git a/unusedcode.easy b/unusedcode.easy index a2c8bcefea78..e1daecd20471 100755 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -130,7 +130,6 @@ SrchAttrItemList::Replace(SearchAttrItem const*, unsigned short, unsigned short) SrchAttrItemList::_ForEach(unsigned short, unsigned short, unsigned char (*)(SearchAttrItem const&, void*), void*) StgCache::Pos2Page(int) SvLBoxButton::Check(SvLBox*, SvLBoxEntry*, unsigned char) -SvLBoxButtonData::SvLBoxButtonData() SvLBoxEntryArr::DeleteAndDestroy(unsigned short, unsigned short) SvPtrarr::Replace(void* const*, unsigned short, unsigned short) SvStringsISortDtor::Insert(String* const*, unsigned short) @@ -702,7 +701,6 @@ canvas::createSurfaceProxyManager(boost::shared_ptr const canvas::tools::clipBlit(basegfx::B2IRange&, basegfx::B2IPoint&, basegfx::B2IRange const&, basegfx::B2IRange const&) cmis::Content::exchangeIdentity(com::sun::star::uno::Reference const&) cmis::Content::queryChildren(std::__debug::list, std::allocator > >&) -comphelper::EventLogger::EventLogger(com::sun::star::uno::Reference const&, rtl::OUString const&) comphelper::OSelectionChangeListener::disposeAdapter() comphelper::detail::ConfigurationWrapper::getGroupReadWrite(boost::shared_ptr const&, rtl::OUString const&) const comphelper::detail::ConfigurationWrapper::getLocalizedPropertyValue(rtl::OUString const&) const @@ -759,7 +757,6 @@ sd::LeftImpressPaneShell::RegisterInterface(SfxModule*) sd::ToolPanelPaneShell::RegisterInterface(SfxModule*) sd::ViewShellBase::RegisterFactory(unsigned short) sdr::animation::Scheduler::Reset(unsigned int) -sdr::contact::ViewContactOfPageObj::GetReferencedPage() const sdr::contact::ViewContactOfSdrMediaObj::hasPreferredSize() const sdr::contact::ViewObjectContactOfUnoControl::isControlVisible() const sfx2::TaskPaneWrapper::GetChildWindowId() -- cgit v1.2.3