diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2013-03-03 11:08:31 +0100 |
---|---|---|
committer | Michael Meeks <michael.meeks@suse.com> | 2013-03-04 11:34:07 +0000 |
commit | 5b04c9063cc9dd77dc55c361df081812af38cdbd (patch) | |
tree | 827cd9405e68df853362ac6a021c4619bf4a6bc3 | |
parent | discard explicit SetAccessibleRelationMemberOf when members of a true VclFrame (diff) | |
download | core-5b04c9063cc9dd77dc55c361df081812af38cdbd.tar.gz core-5b04c9063cc9dd77dc55c361df081812af38cdbd.zip |
remove unused and commented out code
This code gets never called.
Change-Id: I59228cba1444b7b09f74eb5cf8da9b755c7c32f7
75 files changed, 2 insertions, 565 deletions
diff --git a/autodoc/inc/display/corframe.hxx b/autodoc/inc/display/corframe.hxx index 0b9d109cfd3c..e362b6dbab93 100644 --- a/autodoc/inc/display/corframe.hxx +++ b/autodoc/inc/display/corframe.hxx @@ -54,12 +54,10 @@ class CorporateFrame CssStylesExplanation() const = 0; virtual const char * DevelopersGuideHtmlRoot() const = 0; - virtual bool SimpleLinks() const = 0; // ACCESS virtual void Set_DevelopersGuideHtmlRoot( const String & i_directory ) = 0; - virtual void Set_SimpleLinks() = 0; }; diff --git a/autodoc/source/display/html/cfrstd.cxx b/autodoc/source/display/html/cfrstd.cxx index a032ecdd6419..566273aa8b62 100644 --- a/autodoc/source/display/html/cfrstd.cxx +++ b/autodoc/source/display/html/cfrstd.cxx @@ -233,8 +233,7 @@ const char * const C_sStdStyle_withDivFrame = StdFrame::StdFrame() - : sDevelopersGuideHtmlRoot(), - bSimpleLinks(false) + : sDevelopersGuideHtmlRoot() { } @@ -291,12 +290,6 @@ StdFrame::DevelopersGuideHtmlRoot() const return sDevelopersGuideHtmlRoot; } -bool -StdFrame::SimpleLinks() const -{ - return bSimpleLinks; -} - void StdFrame::Set_DevelopersGuideHtmlRoot( const String & i_directory ) { @@ -311,12 +304,6 @@ StdFrame::Set_DevelopersGuideHtmlRoot( const String & i_directory ) sDevelopersGuideHtmlRoot = i_directory; } -void -StdFrame::Set_SimpleLinks() -{ - bSimpleLinks = true; -} - String MakeCopyRight() { diff --git a/autodoc/source/display/inc/cfrstd.hxx b/autodoc/source/display/inc/cfrstd.hxx index a539b043732a..cbedb10d878a 100644 --- a/autodoc/source/display/inc/cfrstd.hxx +++ b/autodoc/source/display/inc/cfrstd.hxx @@ -49,16 +49,13 @@ class StdFrame : public display::CorporateFrame CssStylesExplanation() const; virtual const char * DevelopersGuideHtmlRoot() const; - virtual bool SimpleLinks() const; // ACCESS virtual void Set_DevelopersGuideHtmlRoot( const String & i_directory ); - virtual void Set_SimpleLinks(); private: String sDevelopersGuideHtmlRoot; - bool bSimpleLinks; }; diff --git a/basctl/source/dlged/dlgedmod.cxx b/basctl/source/dlged/dlgedmod.cxx index d786633ad103..31767cc4afc0 100644 --- a/basctl/source/dlged/dlgedmod.cxx +++ b/basctl/source/dlged/dlgedmod.cxx @@ -53,13 +53,6 @@ SdrPage* DlgEdModel::AllocPage(bool bMasterPage) //---------------------------------------------------------------------------- -void DlgEdModel::DlgEdModelChanged(bool bChanged ) -{ - SetChanged( bChanged ); -} - -//---------------------------------------------------------------------------- - Window* DlgEdModel::GetCurDocViewWin() { return 0; diff --git a/basctl/source/inc/dlgedmod.hxx b/basctl/source/inc/dlgedmod.hxx index 0dea946cbec4..62a2e53a413b 100644 --- a/basctl/source/inc/dlgedmod.hxx +++ b/basctl/source/inc/dlgedmod.hxx @@ -43,8 +43,6 @@ public: DlgEdModel(); virtual ~DlgEdModel(); - virtual void DlgEdModelChanged( bool bChanged = true ); - virtual SdrPage* AllocPage(bool bMasterPage); virtual Window* GetCurDocViewWin(); diff --git a/basic/inc/basic/sbmod.hxx b/basic/inc/basic/sbmod.hxx index 1ff5b11c9b8b..f94e2c9e8a36 100644 --- a/basic/inc/basic/sbmod.hxx +++ b/basic/inc/basic/sbmod.hxx @@ -110,16 +110,11 @@ public: const SbxObject* FindType( OUString aTypeName ) const; virtual sal_Bool IsBreakable( sal_uInt16 nLine ) const; - virtual size_t GetBPCount() const; - virtual sal_uInt16 GetBP( size_t n ) const; virtual sal_Bool IsBP( sal_uInt16 nLine ) const; virtual sal_Bool SetBP( sal_uInt16 nLine ); virtual sal_Bool ClearBP( sal_uInt16 nLine ); virtual void ClearAllBP(); - // Lines of Subs - virtual SbMethod* GetFunctionForLine( sal_uInt16 ); - // Store only image, no source (needed for new password protection) sal_Bool StoreBinaryData( SvStream& ); sal_Bool StoreBinaryData( SvStream&, sal_uInt16 nVer ); diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx index 4b4472ea01e6..b612ee28d212 100644 --- a/basic/source/classes/sbxmod.cxx +++ b/basic/source/classes/sbxmod.cxx @@ -982,20 +982,6 @@ void SbModule::SetSource32( const OUString& r ) EndDefinitions( sal_True ); } -SbMethod* SbModule::GetFunctionForLine( sal_uInt16 nLine ) -{ - for( sal_uInt16 i = 0; i < pMethods->Count(); i++ ) - { - SbMethod* p = (SbMethod*) pMethods->Get( i ); - if( p->GetSbxId() == SBXID_BASICMETHOD ) - { - if( nLine >= p->nLine1 && nLine <= p->nLine2 ) - return p; - } - } - return NULL; -} - // Broadcast of a hint to all Basics static void _SendHint( SbxObject* pObj, sal_uIntPtr nId, SbMethod* p ) @@ -1589,19 +1575,6 @@ sal_Bool SbModule::IsBreakable( sal_uInt16 nLine ) const return sal_False; } -size_t SbModule::GetBPCount() const -{ - return pBreaks ? pBreaks->size() : 0; -} - -sal_uInt16 SbModule::GetBP( size_t n ) const -{ - if( pBreaks && n < pBreaks->size() ) - return pBreaks->operator[]( n ); - else - return 0; -} - sal_Bool SbModule::IsBP( sal_uInt16 nLine ) const { if( pBreaks ) diff --git a/connectivity/inc/connectivity/formattedcolumnvalue.hxx b/connectivity/inc/connectivity/formattedcolumnvalue.hxx index a56147afa011..11d121fa56a2 100644 --- a/connectivity/inc/connectivity/formattedcolumnvalue.hxx +++ b/connectivity/inc/connectivity/formattedcolumnvalue.hxx @@ -89,7 +89,6 @@ namespace dbtools virtual sal_Int32 getFormatKey() const; virtual sal_Int32 getFieldType() const; virtual sal_Int16 getKeyType() const; - virtual bool isNumericField() const; virtual const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& getColumn() const; virtual const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumnUpdate >& diff --git a/connectivity/source/commontools/formattedcolumnvalue.cxx b/connectivity/source/commontools/formattedcolumnvalue.cxx index 756e55cc6bf8..d897c9e5ff8c 100644 --- a/connectivity/source/commontools/formattedcolumnvalue.cxx +++ b/connectivity/source/commontools/formattedcolumnvalue.cxx @@ -262,12 +262,6 @@ namespace dbtools } //-------------------------------------------------------------------- - bool FormattedColumnValue::isNumericField() const - { - return m_pData->m_bNumericField; - } - - //-------------------------------------------------------------------- const Reference< XColumn >& FormattedColumnValue::getColumn() const { return m_pData->m_xColumn; diff --git a/cosv/inc/cosv/std_outp.hxx b/cosv/inc/cosv/std_outp.hxx index b660b35ce8f4..08fe179e16ab 100644 --- a/cosv/inc/cosv/std_outp.hxx +++ b/cosv/inc/cosv/std_outp.hxx @@ -38,9 +38,6 @@ class redirect_out : public ostream public: virtual ~redirect_out() {} - void re_endl() { do_re_endl(); } - void re_flush() { do_re_flush(); } - static void set_( redirect_out & o_rStdOut, redirect_out & o_rStdErr ) @@ -54,9 +51,6 @@ class redirect_out : public ostream static bool useme_() { return pStdOut_ != 0; } private: - virtual void do_re_endl() = 0; - virtual void do_re_flush() = 0; - // DATA static redirect_out * pStdOut_; diff --git a/cosv/source/service/std_outp.cxx b/cosv/source/service/std_outp.cxx index 7dc5e5f5069a..69a9e789e5b5 100644 --- a/cosv/source/service/std_outp.cxx +++ b/cosv/source/service/std_outp.cxx @@ -47,7 +47,6 @@ Endl( ostream & io_rStream ) io_rStream << std::endl; // else #endif -// static_cast< redirect_out& >(io_rStream).re_endl(); } void @@ -58,7 +57,6 @@ Flush( ostream & io_rStream ) io_rStream << std::flush; // else #endif -// static_cast< redirect_out& >(io_rStream).re_flush(); } void diff --git a/cppcanvas/inc/cppcanvas/canvasgraphic.hxx b/cppcanvas/inc/cppcanvas/canvasgraphic.hxx index d42302350878..e496df6aeb33 100644 --- a/cppcanvas/inc/cppcanvas/canvasgraphic.hxx +++ b/cppcanvas/inc/cppcanvas/canvasgraphic.hxx @@ -131,13 +131,6 @@ namespace cppcanvas */ virtual ::basegfx::B2DPolyPolygon const* getClip() const = 0; - /** Set object color - */ - virtual void setRGBAColor( Color::IntSRGBA ) = 0; - /** Get object color - */ - virtual Color::IntSRGBA getRGBAColor() const = 0; - /** Set object composite mode */ virtual void setCompositeOp( CompositeOp aOp ) = 0; diff --git a/cppcanvas/source/inc/canvasgraphichelper.hxx b/cppcanvas/source/inc/canvasgraphichelper.hxx index 125b1c2a828b..f0ab8bce88c3 100644 --- a/cppcanvas/source/inc/canvasgraphichelper.hxx +++ b/cppcanvas/source/inc/canvasgraphichelper.hxx @@ -52,8 +52,6 @@ namespace cppcanvas virtual void setClip( const ::basegfx::B2DPolyPolygon& rClipPoly ); virtual void setClip(); virtual ::basegfx::B2DPolyPolygon const* getClip() const; - virtual void setRGBAColor( Color::IntSRGBA ); - virtual Color::IntSRGBA getRGBAColor() const; virtual void setCompositeOp( CompositeOp aOp ); virtual CompositeOp getCompositeOp() const; diff --git a/cppcanvas/source/tools/canvasgraphichelper.cxx b/cppcanvas/source/tools/canvasgraphichelper.cxx index 6854ff9b366d..562be9715d58 100644 --- a/cppcanvas/source/tools/canvasgraphichelper.cxx +++ b/cppcanvas/source/tools/canvasgraphichelper.cxx @@ -105,18 +105,6 @@ namespace cppcanvas return maRenderState; } - void CanvasGraphicHelper::setRGBAColor( Color::IntSRGBA aColor ) - { - maRenderState.DeviceColor = tools::intSRGBAToDoubleSequence( mxGraphicDevice, - aColor ); - } - - Color::IntSRGBA CanvasGraphicHelper::getRGBAColor() const - { - return tools::doubleSequenceToIntSRGBA( mxGraphicDevice, - maRenderState.DeviceColor ); - } - void CanvasGraphicHelper::setCompositeOp( CompositeOp aOp ) { maRenderState.CompositeOperation = (sal_Int8)aOp; diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index 66934c4f2c22..d84cf85117b3 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -23,7 +23,6 @@ #include <tools/urlobj.hxx> #include <sfx2/objsh.hxx> #include <sfx2/docfile.hxx> -#include <svtools/wallitem.hxx> #include <svl/cntwall.hxx> #include <sfx2/cntids.hrc> #include <svx/dialogs.hrc> diff --git a/editeng/inc/editeng/splwrap.hxx b/editeng/inc/editeng/splwrap.hxx index 9126cae8e6b1..c3a559c8470c 100644 --- a/editeng/inc/editeng/splwrap.hxx +++ b/editeng/inc/editeng/splwrap.hxx @@ -138,7 +138,6 @@ protected: virtual void ScrollArea(); // Set ScrollArea // Replace word virtual void ChangeWord( const String& rNewWord, const sal_uInt16 nLang ); - virtual String GetThesWord(); // Wort via Thesaurus ersetzen virtual void ChangeThesWord( const String& rNewWord ); virtual void SetLanguage( const sal_uInt16 nLang ); // Change Language diff --git a/editeng/inc/editeng/unoedprx.hxx b/editeng/inc/editeng/unoedprx.hxx index 83ed5090c5fd..c6e067a6a633 100644 --- a/editeng/inc/editeng/unoedprx.hxx +++ b/editeng/inc/editeng/unoedprx.hxx @@ -42,7 +42,6 @@ public: virtual void RemoveAttribs( const ESelection& rSelection, sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich ); virtual void GetPortions( sal_uInt16 nPara, std::vector<sal_uInt16>& rList ) const; - virtual sal_Int32 CalcLogicalIndex( sal_uInt16 nPara, sal_uInt16 nEEIndex ); virtual sal_uInt16 CalcEditEngineIndex( sal_uInt16 nPara, sal_Int32 nLogicalIndex ); virtual sal_uInt16 GetItemState( const ESelection& rSel, sal_uInt16 nWhich ) const; diff --git a/editeng/source/editeng/edtspell.cxx b/editeng/source/editeng/edtspell.cxx index 4e44fe7772eb..8856564a1a06 100644 --- a/editeng/source/editeng/edtspell.cxx +++ b/editeng/source/editeng/edtspell.cxx @@ -680,30 +680,6 @@ sal_Bool EdtAutoCorrDoc::SetINetAttr( sal_uInt16 nStt, sal_uInt16 nEnd, return sal_True; } -sal_Bool EdtAutoCorrDoc::HasSymbolChars( sal_uInt16 nStt, sal_uInt16 nEnd ) -{ - sal_uInt16 nScriptType = mpEditEngine->GetScriptType( EditPaM( pCurNode, nStt ) ); - sal_uInt16 nScriptFontInfoItemId = GetScriptItemId( EE_CHAR_FONTINFO, nScriptType ); - - const CharAttribList::AttribsType& rAttribs = pCurNode->GetCharAttribs().GetAttribs(); - CharAttribList::AttribsType::const_iterator it = rAttribs.begin(), itEnd = rAttribs.end(); - for (; it != itEnd; ++it) - { - const EditCharAttrib& rAttr = *it; - if (rAttr.GetStart() >= nEnd) - return false; - - if (rAttr.Which() == nScriptFontInfoItemId && - static_cast<const SvxFontItem*>(rAttr.GetItem())->GetCharSet() == RTL_TEXTENCODING_SYMBOL) - { - // check if the Attribtuteis within range... - if (rAttr.GetEnd() >= nStt) - return true; - } - } - return false; -} - const String* EdtAutoCorrDoc::GetPrevPara( sal_Bool ) { // Return previous paragraph, so that it can be determined, diff --git a/editeng/source/editeng/edtspell.hxx b/editeng/source/editeng/edtspell.hxx index 63ffb8085dda..699a6dff358e 100644 --- a/editeng/source/editeng/edtspell.hxx +++ b/editeng/source/editeng/edtspell.hxx @@ -150,8 +150,6 @@ public: virtual sal_Bool SetAttr( sal_uInt16 nStt, sal_uInt16 nEnd, sal_uInt16 nSlotId, SfxPoolItem& ); virtual sal_Bool SetINetAttr( sal_uInt16 nStt, sal_uInt16 nEnd, const String& rURL ); - virtual sal_Bool HasSymbolChars( sal_uInt16 nStt, sal_uInt16 nEnd ); - virtual const String* GetPrevPara( sal_Bool bAtNormalPos ); virtual sal_Bool ChgAutoCorrWord( sal_uInt16& rSttPos, sal_uInt16 nEndPos, diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index e728d1968885..698a235bedea 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -49,7 +49,6 @@ #include <tools/urlobj.hxx> #include <comphelper/types.hxx> #include <svl/memberid.hrc> -#include <svtools/wallitem.hxx> #include <svl/cntwall.hxx> #include <svtools/borderhelper.hxx> #include <rtl/ustring.hxx> diff --git a/editeng/source/misc/splwrap.cxx b/editeng/source/misc/splwrap.cxx index 26edd7e69872..aefd764892cc 100644 --- a/editeng/source/misc/splwrap.cxx +++ b/editeng/source/misc/splwrap.cxx @@ -306,15 +306,6 @@ void SvxSpellWrapper::ChangeWord( const String&, const sal_uInt16 ) // ----------------------------------------------------------------------- -String SvxSpellWrapper::GetThesWord() -{ - // What word should be looked up? - return String(); -} - -// ----------------------------------------------------------------------- - - void SvxSpellWrapper::ChangeThesWord( const String& ) { // replace word due to Thesaurus. diff --git a/editeng/source/uno/unoedprx.cxx b/editeng/source/uno/unoedprx.cxx index 1eb478837072..a91b8f3cbebf 100644 --- a/editeng/source/uno/unoedprx.cxx +++ b/editeng/source/uno/unoedprx.cxx @@ -677,15 +677,6 @@ void SvxAccessibleTextAdapter::FieldClicked( const SvxFieldItem& rField, sal_uIn mrTextForwarder->FieldClicked( rField, nPara, nPos ); } -sal_Int32 SvxAccessibleTextAdapter::CalcLogicalIndex( sal_uInt16 nPara, sal_uInt16 nEEIndex ) -{ - DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder"); - - SvxAccessibleTextIndex aIndex; - aIndex.SetEEIndex(nPara, nEEIndex, *mrTextForwarder); - return aIndex.GetIndex(); -} - sal_uInt16 SvxAccessibleTextAdapter::CalcEditEngineIndex( sal_uInt16 nPara, sal_Int32 nLogicalIndex ) { DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder"); diff --git a/extensions/source/ole/oleobjw.hxx b/extensions/source/ole/oleobjw.hxx index 4fd17687e031..00b0753bbf4f 100644 --- a/extensions/source/ole/oleobjw.hxx +++ b/extensions/source/ole/oleobjw.hxx @@ -144,11 +144,6 @@ protected: Sequence< sal_Int16 >& OutParamIndex, Sequence< Any >& OutParam); -// virtual void setValueWithDispId(DISPID dispID, const Any& Value); - -// virtual Any getValueWithDispId(const OUString& sName, DISPID dispID); - - // UnoConversionUtilities ------------------------------------------------------------------------------- virtual Reference<XInterface> createUnoWrapperInstance(); virtual Reference<XInterface> createComWrapperInstance(); diff --git a/filter/inc/filter/msfilter/escherex.hxx b/filter/inc/filter/msfilter/escherex.hxx index f4fb9393969d..33cde07ab2f4 100644 --- a/filter/inc/filter/msfilter/escherex.hxx +++ b/filter/inc/filter/msfilter/escherex.hxx @@ -1623,8 +1623,6 @@ public: SvStream& GetStream() const { return *mpOutStrm; } sal_uLong GetStreamPos() const { return mpOutStrm->Tell(); } - virtual sal_Bool SeekBehindRecHeader( sal_uInt16 nRecType ); // the stream has to be in front of a valid Record Headeror Atom - // features during the creation of the following Containers: // // ESCHER_DggContainer: a EscherDgg Atom is automatically being created and managed diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index 75adc97ca68e..81a12ed86b00 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -4499,25 +4499,6 @@ void EscherEx::InsertAtCurrentPos( sal_uInt32 nBytes, bool bExpandEndOfAtom ) mpOutStrm->Seek( nCurPos ); } -sal_Bool EscherEx::SeekBehindRecHeader( sal_uInt16 nRecType ) -{ - sal_uInt32 nOldPos, nStreamEnd, nType, nSize; - - nOldPos = mpOutStrm->Tell(); - nStreamEnd = mpOutStrm->Seek( STREAM_SEEK_TO_END ); - mpOutStrm->Seek( nOldPos ); - while ( mpOutStrm->Tell() < nStreamEnd ) - { - *mpOutStrm >> nType >> nSize; - if ( ( nType >> 16 ) == nRecType ) - return sal_True; - if ( ( nType & 0xf ) != 0xf ) - mpOutStrm->SeekRel( nSize ); - } - mpOutStrm->Seek( nOldPos ); - return sal_False; -} - void EscherEx::InsertPersistOffset( sal_uInt32 nKey, sal_uInt32 nOffset ) { PtInsert( ESCHER_Persist_PrivateEntry | nKey, nOffset ); diff --git a/forms/source/xforms/submission/submission.hxx b/forms/source/xforms/submission/submission.hxx index 2c9edb4dbe13..0998b4c46cfc 100644 --- a/forms/source/xforms/submission/submission.hxx +++ b/forms/source/xforms/submission/submission.hxx @@ -138,7 +138,6 @@ public: virtual ~CSubmission() {} - // virtual CSS::uno::Sequence< rtl::OUString > getSupportedEncodings() = 0; virtual void setEncoding(const rtl::OUString& aEncoding) { m_aEncoding = aEncoding; diff --git a/sc/inc/dptabdat.hxx b/sc/inc/dptabdat.hxx index aba6060506d6..8a6c617a44fd 100644 --- a/sc/inc/dptabdat.hxx +++ b/sc/inc/dptabdat.hxx @@ -141,7 +141,6 @@ public: virtual long GetMembersCount( long nDim ); virtual const ScDPItemData* GetMemberByIndex( long nDim, long nIndex ); virtual const ScDPItemData* GetMemberById( long nDim, long nId); - virtual SCROW GetIdOfItemData( long nDim, const ScDPItemData& rData ); virtual long GetSourceDim( long nDim ); virtual long Compare( long nDim, long nDataId1, long nDataId2); diff --git a/sc/inc/drwlayer.hxx b/sc/inc/drwlayer.hxx index 0329f6c7ad5a..adb0c49623f8 100644 --- a/sc/inc/drwlayer.hxx +++ b/sc/inc/drwlayer.hxx @@ -119,7 +119,6 @@ public: ScDocument* GetDocument() const { return pDoc; } - void UpdateBasic(); // set DocShell Basic in DrawPages void UseHyphenator(); sal_Bool GetPrintArea( ScRange& rRange, sal_Bool bSetHor, sal_Bool bSetVer ) const; diff --git a/sc/source/core/data/dptabdat.cxx b/sc/source/core/data/dptabdat.cxx index f8483909dfd1..c92c23f964fb 100644 --- a/sc/source/core/data/dptabdat.cxx +++ b/sc/source/core/data/dptabdat.cxx @@ -273,11 +273,6 @@ const ScDPItemData* ScDPTableData::GetMemberById( long nDim, long nId) return GetCacheTable().getCache()->GetItemDataById(nDim, static_cast<SCROW>(nId)); } -SCROW ScDPTableData::GetIdOfItemData( long nDim, const ScDPItemData& rData ) -{ - return GetCacheTable().getCache()->GetIdByItemData((SCCOL) nDim, rData ); - } - const std::vector< SCROW >& ScDPTableData::GetColumnEntries( long nColumn ) { return GetCacheTable().getFieldEntries( nColumn ); diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx index 16b8e6c07943..aeb84e276830 100644 --- a/sc/source/core/data/drwlayer.cxx +++ b/sc/source/core/data/drwlayer.cxx @@ -326,12 +326,6 @@ sal_Bool ScDrawLayer::HasObjects() const return bFound; } -void ScDrawLayer::UpdateBasic() -{ - // don't create basic until it is needed - //! remove this method? -} - SdrModel* ScDrawLayer::AllocModel() const { // Allocated model (for clipboard etc) must not have a pointer diff --git a/sc/source/filter/xml/xmlstyli.hxx b/sc/source/filter/xml/xmlstyli.hxx index 4ac9d54bacec..09d61bae311f 100644 --- a/sc/source/filter/xml/xmlstyli.hxx +++ b/sc/source/filter/xml/xmlstyli.hxx @@ -46,22 +46,6 @@ public: SvXMLImport& rImport); virtual ~ScXMLCellImportPropertyMapper(); - /** this method is called for every item that has the MID_FLAG_SPECIAL_ITEM_IMPORT flag set */ -/* virtual sal_Bool handleSpecialItem( - XMLPropertyState& rProperty, - ::std::vector< XMLPropertyState >& rProperties, - const ::rtl::OUString& rValue, - const SvXMLUnitConverter& rUnitConverter, - const SvXMLNamespaceMap& rNamespaceMap ) const;*/ - - /** this method is called for every item that has the MID_FLAG_NO_ITEM_IMPORT flag set */ -/* virtual sal_Bool handleNoItem( - sal_Int32 nIndex, - ::std::vector< XMLPropertyState >& rProperties, - const ::rtl::OUString& rValue, - const SvXMLUnitConverter& rUnitConverter, - const SvXMLNamespaceMap& rNamespaceMap ) const;*/ - /** This method is called when all attributes have been processed. It may be used to remove items that are incomplete */ virtual void finished( ::std::vector< XMLPropertyState >& rProperties, sal_Int32 nStartIndex, sal_Int32 nEndIndex ) const; @@ -180,8 +164,6 @@ protected: const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); -// virtual SvXMLImportPropertyMapper *GetImpPropMapper(); - public: XMLTableStylesContext( SvXMLImport& rImport, sal_uInt16 nPrfx , @@ -190,12 +172,6 @@ public: const bool bAutoStyles ); virtual ~XMLTableStylesContext(); - // Create child element. -/* virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList );*/ - virtual void EndElement(); virtual UniReference < SvXMLImportPropertyMapper > GetImportPropertyMapper( diff --git a/sc/source/ui/docshell/docsh2.cxx b/sc/source/ui/docshell/docsh2.cxx index 84b74e05e684..1039219706ca 100644 --- a/sc/source/ui/docshell/docsh2.cxx +++ b/sc/source/ui/docshell/docsh2.cxx @@ -105,8 +105,6 @@ void ScDocShell::InitItems() // andere Anpassungen nach dem Anlegen des DrawLayers pDrawLayer->SetNotifyUndoActionHdl( LINK( pDocFunc, ScDocFunc, NotifyDrawUndo ) ); - - pDrawLayer->UpdateBasic(); // DocShell-Basic in DrawPages setzen } else { diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx index 56bab28c8b23..3d8997885403 100644 --- a/sd/inc/drawdoc.hxx +++ b/sd/inc/drawdoc.hxx @@ -203,8 +203,6 @@ public: virtual SdrModel* AllocModel() const; virtual SdrPage* AllocPage(bool bMasterPage); - virtual const SdrModel* LoadModel(const String& rFileName); - virtual void DisposeLoadedModels(); virtual bool IsReadOnly() const; virtual void SetChanged(sal_Bool bFlag = sal_True); diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx index ef6a28bf1b29..b811e325dd7a 100644 --- a/sd/source/core/drawdoc3.cxx +++ b/sd/source/core/drawdoc3.cxx @@ -1108,18 +1108,6 @@ void SdDrawDocument::CloseBookmarkDoc() maBookmarkFile = String(); } -// Load document (for linked objects) -const SdrModel* SdDrawDocument::LoadModel(const String& rFileName) -{ - return ( OpenBookmarkDoc(rFileName) ); -} - -// Close document (for linked objects) -void SdDrawDocument::DisposeLoadedModels() -{ - CloseBookmarkDoc(); -} - // Is this document read-only? bool SdDrawDocument::IsReadOnly() const { diff --git a/sdext/source/presenter/PresenterScrollBar.cxx b/sdext/source/presenter/PresenterScrollBar.cxx index bed4fccbb55f..774d5dfa00b9 100644 --- a/sdext/source/presenter/PresenterScrollBar.cxx +++ b/sdext/source/presenter/PresenterScrollBar.cxx @@ -693,12 +693,6 @@ geometry::RealPoint2D PresenterVerticalScrollBar::GetPoint ( return geometry::RealPoint2D(nMinor, nMajor); } -double PresenterVerticalScrollBar::GetMajor (const double nX, const double nY) const -{ - (void)nX; - return nY; -} - double PresenterVerticalScrollBar::GetMinor (const double nX, const double nY) const { (void)nY; diff --git a/sdext/source/presenter/PresenterScrollBar.hxx b/sdext/source/presenter/PresenterScrollBar.hxx index 5bac82280025..cc4ffc930a65 100644 --- a/sdext/source/presenter/PresenterScrollBar.hxx +++ b/sdext/source/presenter/PresenterScrollBar.hxx @@ -191,7 +191,6 @@ protected: virtual double GetDragDistance (const sal_Int32 nX, const sal_Int32 nY) const = 0; virtual void UpdateDragAnchor (const double nDragDistance) = 0; virtual css::geometry::RealPoint2D GetPoint (const double nMajor, const double nMinor) const = 0; - virtual double GetMajor (const double nX, const double nY) const = 0; virtual double GetMinor (const double nX, const double nY) const = 0; virtual void UpdateBorders (void) = 0; virtual void UpdateBitmaps (void) = 0; @@ -260,7 +259,6 @@ protected: virtual void UpdateDragAnchor (const double nDragDistance); virtual css::geometry::RealPoint2D GetPoint (const double nMajor, const double nMinor) const; virtual double GetMinor (const double nX, const double nY) const; - virtual double GetMajor (const double nX, const double nY) const; virtual void UpdateBorders (void); virtual void UpdateBitmaps (void); virtual void PaintComposite( diff --git a/sfx2/inc/sfx2/dispatch.hxx b/sfx2/inc/sfx2/dispatch.hxx index 59e87fa65f62..f87183830613 100644 --- a/sfx2/inc/sfx2/dispatch.hxx +++ b/sfx2/inc/sfx2/dispatch.hxx @@ -121,8 +121,6 @@ public: virtual ~SfxDispatcher(); - virtual void SetExecuteMode( sal_uInt16 ); - const SfxPoolItem* Execute( sal_uInt16 nSlot, SfxCallMode nCall = SFX_CALLMODE_SLOT, const SfxPoolItem **pArgs = 0, diff --git a/sfx2/inc/sfx2/objsh.hxx b/sfx2/inc/sfx2/objsh.hxx index 6a7dfb51fd08..5d597a83e816 100644 --- a/sfx2/inc/sfx2/objsh.hxx +++ b/sfx2/inc/sfx2/objsh.hxx @@ -500,8 +500,6 @@ public: virtual void SetOrganizerSearchMask( SfxStyleSheetBasePool* ) const; - virtual sal_uInt16 GetContentCount( sal_uInt16 nIdx1 = INDEX_IGNORE ); - virtual sal_Bool CanHaveChildren( sal_uInt16 nIdx1, sal_uInt16 nIdx2 = INDEX_IGNORE @@ -515,8 +513,6 @@ public: sal_uInt16 nIdx1 ); - virtual void TriggerHelpPI( sal_uInt16 nIdx1, sal_uInt16 nIdx2 ); - virtual Bitmap GetStyleFamilyBitmap(SfxStyleFamily eFamily); virtual sal_Bool Insert( SfxObjectShell &rSource, diff --git a/sfx2/inc/sfx2/shell.hxx b/sfx2/inc/sfx2/shell.hxx index 880c83df3289..344294a33c04 100644 --- a/sfx2/inc/sfx2/shell.hxx +++ b/sfx2/inc/sfx2/shell.hxx @@ -173,9 +173,6 @@ public: TYPEINFO(); virtual ~SfxShell(); - // TODO/CLEANUP: still needed?! - virtual SvGlobalName GetGlobalName() const; - virtual SfxInterface* GetInterface() const; static SfxInterface* GetStaticInterface() { return 0; } diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index 4a8fa5a8224b..8c8cf7a33837 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -146,7 +146,6 @@ struct SfxDispatcher_Impl // 2==ReadOnlyDoc overturned sal_uInt16 nFilterCount; // Number of SIDs in pFilterSIDs const sal_uInt16* pFilterSIDs; // sorted Array of SIDs - sal_uInt16 nStandardMode; // ExecuteMode from PlugInDispatcher std::vector<sal_uInt16>* pDisableList; sal_uInt32 nDisableFlags; }; @@ -325,7 +324,6 @@ void SfxDispatcher::Construct_Impl( SfxDispatcher* pParent ) pImp->bFilterEnabling = sal_False; pImp->nFilterCount = 0; pImp->pFilterSIDs = 0; - pImp->nStandardMode = 0; pImp->pDisableList = pSfxApp->GetDisabledSlotList_Impl(); pImp->nDisableFlags = 0; @@ -2223,11 +2221,6 @@ void SfxDispatcher::SetQuietMode_Impl( sal_Bool bOn ) pBindings->InvalidateAll(sal_True); } -void SfxDispatcher::SetExecuteMode( sal_uInt16 nMode ) -{ - pImp->nStandardMode = nMode; -} - SfxItemState SfxDispatcher::QueryState( sal_uInt16 nSlot, const SfxPoolItem* &rpState ) { SfxShell *pShell = 0; diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx index db940f033ddd..8c1de06a6592 100644 --- a/sfx2/source/control/shell.cxx +++ b/sfx2/source/control/shell.cxx @@ -195,21 +195,6 @@ const String& SfxShell::GetName() const //-------------------------------------------------------------------- -SvGlobalName SfxShell::GetGlobalName() const - -/* [Description] - - Provides the Global Unique Identifier of the Shell object. With this name - can the SfxShell instance for example be expressed via OLE Automation, or - be found in the Registration Database. -*/ - -{ - return SvGlobalName(); -} - -//-------------------------------------------------------------------- - SfxDispatcher* SfxShell::GetDispatcher() const /* [Description] diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx index 643d3fc414ff..950e669c101d 100644 --- a/sfx2/source/doc/objcont.cxx +++ b/sfx2/source/doc/objcont.cxx @@ -313,38 +313,6 @@ void SfxObjectShell::SetOrganizerSearchMask( //-------------------------------------------------------------------- -sal_uInt16 SfxObjectShell::GetContentCount(sal_uInt16 nIdx) -{ - switch(nIdx) - { - case INDEX_IGNORE: - return DEF_CONTENT_COUNT; - case CONTENT_STYLE: - { - SfxStyleSheetBasePool *pStylePool = GetStyleSheetPool(); - if(!pStylePool) - return 0; - SetOrganizerSearchMask(pStylePool); - return pStylePool->Count(); - } - case CONTENT_MACRO: - break; - } - return 0; -} - - -//-------------------------------------------------------------------- -//TODO/CLEANUP: remove this method -void SfxObjectShell::TriggerHelpPI(sal_uInt16 nIdx1, sal_uInt16 nIdx2) -{ - if(nIdx1==CONTENT_STYLE && nIdx2 != INDEX_IGNORE) //StyleSheets - { - SfxStyleSheetBasePool *pStylePool = GetStyleSheetPool(); - SetOrganizerSearchMask(pStylePool); - } -} - sal_Bool SfxObjectShell::CanHaveChildren(sal_uInt16 nIdx1, sal_uInt16 nIdx2) { switch(nIdx1) diff --git a/slideshow/test/testshape.cxx b/slideshow/test/testshape.cxx index 16ec235fb527..b25ce129939b 100644 --- a/slideshow/test/testshape.cxx +++ b/slideshow/test/testshape.cxx @@ -81,11 +81,6 @@ private: { return mnNumRenders; } - virtual sal_Int32 getAnimationCount() const - { - return mnAnimated; - } - // XShape virtual ::rtl::OUString SAL_CALL getShapeType( ) throw (uno::RuntimeException) diff --git a/store/workben/t_page.cxx b/store/workben/t_page.cxx index d36df003b2c9..95e248a27f91 100644 --- a/store/workben/t_page.cxx +++ b/store/workben/t_page.cxx @@ -210,12 +210,6 @@ struct PageData } }; -class IPageAllocator -{ -public: - virtual void deallocate (void * p) = 0; -}; - class PageAllocator { rtl_cache_type * m_cache; @@ -707,12 +701,10 @@ public: /*======================================================================*/ -class IPageAllocator; class IPageAccess { public: virtual storeError initialize (storeAccessMode eAccessMode, sal_uInt16 nPageSize) = 0; - virtual IPageAllocator & getAllocator () = 0; public: storeError readPageAt (PageHolder & rPage, sal_uInt32 nOffset) diff --git a/svl/inc/svl/flagitem.hxx b/svl/inc/svl/flagitem.hxx index 3a84fea32f67..6b0c88ef8f7e 100644 --- a/svl/inc/svl/flagitem.hxx +++ b/svl/inc/svl/flagitem.hxx @@ -44,7 +44,6 @@ public: DBG_DTOR(SfxFlagItem, 0); } virtual sal_uInt8 GetFlagCount() const; - virtual XubString GetFlagText( sal_uInt8 nFlag ) const; virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nVersion) const; diff --git a/svl/source/items/flagitem.cxx b/svl/source/items/flagitem.cxx index d2c5fbf169cb..cf9c5a5f3b71 100644 --- a/svl/source/items/flagitem.cxx +++ b/svl/source/items/flagitem.cxx @@ -86,15 +86,6 @@ SfxItemPresentation SfxFlagItem::GetPresentation // ----------------------------------------------------------------------- -XubString SfxFlagItem::GetFlagText( sal_uInt8 ) const -{ - DBG_CHKTHIS(SfxFlagItem, 0); - DBG_WARNING( "calling GetValueText(sal_uInt16) on SfxFlagItem -- overload!" ); - return XubString(); -} - -// ----------------------------------------------------------------------- - sal_uInt8 SfxFlagItem::GetFlagCount() const { DBG_CHKTHIS(SfxFlagItem, 0); diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk index dcabca004984..bfd409bd3d70 100644 --- a/svtools/Library_svt.mk +++ b/svtools/Library_svt.mk @@ -182,7 +182,6 @@ $(eval $(call gb_Library_add_exception_objects,svt,\ svtools/source/misc/transfer \ svtools/source/misc/transfer2 \ svtools/source/misc/unitconv \ - svtools/source/misc/wallitem \ svtools/source/misc/xwindowitem \ svtools/source/svhtml/htmlkywd \ svtools/source/svhtml/htmlout \ diff --git a/svtools/Package_inc.mk b/svtools/Package_inc.mk index 38047d484d4c..fe8ccf679cee 100644 --- a/svtools/Package_inc.mk +++ b/svtools/Package_inc.mk @@ -167,7 +167,6 @@ $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/unoimap.hxx,svtools/un $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/urlcontrol.hxx,svtools/urlcontrol.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/valueset.hxx,svtools/valueset.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/viewdataentry.hxx,svtools/viewdataentry.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/wallitem.hxx,svtools/wallitem.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/wizardmachine.hxx,svtools/wizardmachine.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/wizdlg.hxx,svtools/wizdlg.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/xwindowitem.hxx,svtools/xwindowitem.hxx)) diff --git a/svtools/inc/svtools/treelistbox.hxx b/svtools/inc/svtools/treelistbox.hxx index 14f97f46ccd6..30d05bd2a23e 100644 --- a/svtools/inc/svtools/treelistbox.hxx +++ b/svtools/inc/svtools/treelistbox.hxx @@ -560,8 +560,6 @@ protected: // This can be used to hide Elements which are painted from outside into the Control virtual void NotifyInvalidating(); - virtual sal_uLong GetAscInsertionPos( SvTreeListEntry*, SvTreeListEntry* pParent ); - virtual sal_uLong GetDescInsertionPos( SvTreeListEntry*, SvTreeListEntry* pParent ); virtual void Command( const CommandEvent& rCEvt ); virtual void RequestHelp( const HelpEvent& rHEvt ); @@ -728,8 +726,6 @@ public: void SetHighlightRange(sal_uInt16 nFirstTab=0,sal_uInt16 nLastTab=0xffff); - virtual Region GetDragRegion() const; - // A Parent's Children are turned into Children of the Parent which comes next in hierarchy void RemoveParentKeepChildren( SvTreeListEntry* pParent ); diff --git a/svtools/inc/svtools/wallitem.hxx b/svtools/inc/svtools/wallitem.hxx deleted file mode 100644 index b84b53235538..000000000000 --- a/svtools/inc/svtools/wallitem.hxx +++ /dev/null @@ -1,57 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#ifndef _WALLITEM_HXX -#define _WALLITEM_HXX - -#include <tools/shl.hxx> - -// ----------------------------------------------------------------------------------------- -// Hilfsklasse, um die Download-Funktionalitaet des SvxBrushItems unterhalb -// des SVX zu benutzen. Der Link wird im Konstruktor von SvxDialogDll gesetzt. -#ifndef _SFX_BRUSHITEMLINK_DECLARED -#define _SFX_BRUSHITEMLINK_DECLARED -#include <vcl/graph.hxx> - -#ifndef SHL_BRUSHITEM -#define SHL_BRUSHITEM SHL_SHL1 -#endif - -class Window; -class SfxItemSet; - -typedef void* (*CreateSvxBrushTabPage)(Window *pParent, const SfxItemSet &rAttrSet); -typedef sal_uInt16* (*GetSvxBrushTabPageRanges)(); - -class Graphic; -class String; -class SfxBrushItemLink -{ -public: - virtual ~SfxBrushItemLink() = 0; - virtual Graphic GetGraphic( const String& rLink, const String& rFilter) = 0; - virtual CreateSvxBrushTabPage GetBackgroundTabpageCreateFunc() = 0; - virtual GetSvxBrushTabPageRanges GetBackgroundTabpageRanges() = 0; - static SfxBrushItemLink* Get() { return *(SfxBrushItemLink**)GetAppData(SHL_BRUSHITEM); } - //static void Set( SfxBrushItemLink* pLink ); -}; -#endif // _SFX_BRUSHITEMLINK_DECLARED - -#endif // _WALLITEM_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx index a8e3b14e39a5..381d0d8b3fff 100644 --- a/svtools/source/contnr/treelistbox.cxx +++ b/svtools/source/contnr/treelistbox.cxx @@ -3571,32 +3571,6 @@ void SvTreeListBox::SetHighlightRange( sal_uInt16 nStart, sal_uInt16 nEnd) pImp->RecalcFocusRect(); } -sal_uLong SvTreeListBox::GetAscInsertionPos(SvTreeListEntry*,SvTreeListEntry*) -{ - return LIST_APPEND; -} - -sal_uLong SvTreeListBox::GetDescInsertionPos(SvTreeListEntry*,SvTreeListEntry*) -{ - DBG_CHKTHIS(SvTreeListBox,0); - return LIST_APPEND; -} - -Region SvTreeListBox::GetDragRegion() const -{ - DBG_CHKTHIS(SvTreeListBox,0); - Rectangle aRect; - SvTreeListEntry* pEntry = GetCurEntry(); - if( pEntry ) - { - Point aPos = GetEntryPosition( pEntry ); - aRect = ((SvTreeListBox*)this)->GetFocusRect( pEntry, aPos.Y() ); - } - Region aRegion( aRect ); - return aRegion; -} - - void SvTreeListBox::Command( const CommandEvent& rCEvt ) { DBG_CHKTHIS(SvTreeListBox,0); diff --git a/svtools/source/dialogs/filedlg2.cxx b/svtools/source/dialogs/filedlg2.cxx index ebc9d35b657e..210dfd48d84d 100644 --- a/svtools/source/dialogs/filedlg2.cxx +++ b/svtools/source/dialogs/filedlg2.cxx @@ -616,10 +616,6 @@ void ImpPathDialog::PreExecute() } } -void ImpPathDialog::PostExecute() -{ -} - void ImpPathDialog::SetPath( OUString const & rPath ) { aPath = DirEntry( rPath ); diff --git a/svtools/source/dialogs/filedlg2.hxx b/svtools/source/dialogs/filedlg2.hxx index 8f6652d5225c..07cea5928154 100644 --- a/svtools/source/dialogs/filedlg2.hxx +++ b/svtools/source/dialogs/filedlg2.hxx @@ -103,7 +103,6 @@ public: virtual OUString GetPath() const; virtual void PreExecute(); - virtual void PostExecute(); PathDialog* GetPathDialog() const { return pSvPathDialog; } diff --git a/svtools/source/misc/wallitem.cxx b/svtools/source/misc/wallitem.cxx deleted file mode 100644 index 24193e7158db..000000000000 --- a/svtools/source/misc/wallitem.cxx +++ /dev/null @@ -1,43 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include <cppuhelper/weak.hxx> -#include <com/sun/star/io/XOutputStream.hpp> -#include <com/sun/star/io/XActiveDataSource.hpp> -#include <com/sun/star/io/XActiveDataControl.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> - -#include <comphelper/processfactory.hxx> - -#include <tools/stream.hxx> - -#include <vcl/graph.hxx> -#include <vcl/svapp.hxx> -#include <vcl/wrkwin.hxx> -#include <vcl/gradient.hxx> -#include <vcl/cvtgrf.hxx> - -#include <svtools/wallitem.hxx> -#include <svl/cntwall.hxx> - -SfxBrushItemLink::~SfxBrushItemLink() -{ -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/svdotext.hxx b/svx/inc/svx/svdotext.hxx index 5f1eeac67bab..30a923bb566a 100644 --- a/svx/inc/svx/svdotext.hxx +++ b/svx/inc/svx/svdotext.hxx @@ -466,7 +466,6 @@ public: void NbcSetOutlinerParaObjectForText( OutlinerParaObject* pTextObject, SdrText* pText ); virtual OutlinerParaObject* GetOutlinerParaObject() const; virtual OutlinerParaObject* GetEditOutlinerParaObject() const; - virtual bool HasOutlinerParaObject() const; virtual void NbcReformatText(); virtual void ReformatText(); diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx index 195033bfb488..2d8d4b46bc7e 100644 --- a/svx/source/dialog/docrecovery.cxx +++ b/svx/source/dialog/docrecovery.cxx @@ -153,38 +153,6 @@ TURLList* RecoveryCore::getURLListAccess() } //=============================================== -sal_Bool RecoveryCore::existsBrokenTempEntries() -{ - TURLList::const_iterator pIt; - for ( pIt = m_lURLs.begin(); - pIt != m_lURLs.end() ; - ++pIt ) - { - const TURLInfo& rInfo = *pIt; - if (RecoveryCore::isBrokenTempEntry(rInfo)) - return sal_True; - } - - return sal_False; -} - -//=============================================== -sal_Bool RecoveryCore::existsNonRecoveredEntries() -{ - TURLList::const_iterator pIt; - for ( pIt = m_lURLs.begin(); - pIt != m_lURLs.end() ; - ++pIt ) - { - const TURLInfo& rInfo = *pIt; - if (rInfo.RecoveryState == E_NOT_RECOVERED_YET) - return sal_True; - } - - return sal_False; -} - -//=============================================== sal_Bool RecoveryCore::isBrokenTempEntry(const TURLInfo& rInfo) { if (rInfo.TempURL.isEmpty()) diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx index af39887cd3fa..d4ba999647e2 100644 --- a/svx/source/inc/docrecovery.hxx +++ b/svx/source/inc/docrecovery.hxx @@ -246,8 +246,6 @@ class RecoveryCore : public ::cppu::WeakImplHelper1< css::frame::XStatusListener //--------------------------------------- /** @short TODO */ - virtual sal_Bool existsBrokenTempEntries(); - virtual sal_Bool existsNonRecoveredEntries(); static sal_Bool isBrokenTempEntry(const TURLInfo& rInfo); virtual void saveBrokenTempEntries(const ::rtl::OUString& sSaveDir); virtual void saveAllTempEntries(const ::rtl::OUString& sSaveDir); diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index 646e66491919..763465aae58f 100644 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -1343,14 +1343,6 @@ OutlinerParaObject* SdrTextObj::GetOutlinerParaObject() const return 0; } -bool SdrTextObj::HasOutlinerParaObject() const -{ - SdrText* pText = getActiveText(); - if( pText && pText->GetOutlinerParaObject() ) - return true; - return false; -} - void SdrTextObj::NbcSetOutlinerParaObject(OutlinerParaObject* pTextObject) { NbcSetOutlinerParaObjectForText( pTextObject, getActiveText() ); diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx index 3341eaf7b582..5e4f4c7cf782 100644 --- a/sw/inc/shellio.hxx +++ b/sw/inc/shellio.hxx @@ -431,7 +431,6 @@ public: virtual sal_uLong Write( SwPaM&, const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, const String* = 0, SfxMedium* = 0 ); virtual sal_uLong Write( SwPaM&, SotStorage&, const String* = 0 ); - virtual void SetPasswd( const String& ); virtual void SetVersion( const String&, long ); virtual sal_Bool IsStgWriter() const; diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx index 0551921b0710..51d28901ca4c 100644 --- a/sw/inc/swabstdlg.hxx +++ b/sw/inc/swabstdlg.hxx @@ -119,14 +119,6 @@ public: virtual void SetText( const OUString& rStr ) = 0; }; -class AbstractInsertGrfRulerDlg : public VclAbstractDialog //add for SwInsertGrfRulerDlg -{ -public: - virtual String GetGraphicName() = 0; - virtual sal_Bool IsSimpleLine() = 0; - virtual sal_Bool HasImages() const = 0; -}; - class AbstractInsTableDlg : public VclAbstractDialog //add for SwInsTableDlg { public: diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx index 7564b283d3f7..cb95ff4ac5a9 100644 --- a/sw/source/core/draw/dflyobj.cxx +++ b/sw/source/core/draw/dflyobj.cxx @@ -142,11 +142,6 @@ sal_uInt16 SwFlyDrawObj::GetObjIdentifier() const } -sal_uInt16 SwFlyDrawObj::GetObjVersion() const -{ - return SwDrawFirst; -} - // SwVirtFlyDrawObj::CToren, Dtor // AW: Need own primitive to get the FlyFrame paint working diff --git a/sw/source/core/inc/dflyobj.hxx b/sw/source/core/inc/dflyobj.hxx index 40226930be58..5dd9133bbaeb 100644 --- a/sw/source/core/inc/dflyobj.hxx +++ b/sw/source/core/inc/dflyobj.hxx @@ -31,7 +31,6 @@ const sal_uInt32 SWGInventor = sal_uInt32('S')*0x00000001 + sal_uInt32('G')*0x00010000; const sal_uInt16 SwFlyDrawObjIdentifier = 0x0001; -const sal_uInt16 SwDrawFirst = 0x0001; // DrawObjects for Flys class SwFlyDrawObj : public SdrObject @@ -53,7 +52,6 @@ public: // for instantiation of this class while loading (via factory) virtual sal_uInt32 GetObjInventor() const; virtual sal_uInt16 GetObjIdentifier() const; - virtual sal_uInt16 GetObjVersion() const; }; // virtual objects for Flys diff --git a/sw/source/core/inc/swblocks.hxx b/sw/source/core/inc/swblocks.hxx index af1af9140287..74f7f716c79a 100644 --- a/sw/source/core/inc/swblocks.hxx +++ b/sw/source/core/inc/swblocks.hxx @@ -111,7 +111,6 @@ public: virtual sal_uLong Rename( sal_uInt16, const String&, const String& ) = 0; virtual sal_uLong CopyBlock( SwImpBlocks& rImp, String& rShort, const String& rLong) = 0; virtual sal_uLong GetDoc( sal_uInt16 ) = 0; - virtual sal_uLong GetDocForConversion( sal_uInt16 ); virtual sal_uLong BeginPutDoc( const String&, const String& ) = 0; virtual sal_uLong PutDoc() = 0; virtual sal_uLong GetText( sal_uInt16, String& ) = 0; diff --git a/sw/source/core/swg/swblocks.cxx b/sw/source/core/swg/swblocks.cxx index 6eed03bf4269..e122e511778f 100644 --- a/sw/source/core/swg/swblocks.cxx +++ b/sw/source/core/swg/swblocks.cxx @@ -113,11 +113,6 @@ void SwImpBlocks::ClearDoc() pDoc->ClearDoc(); } -sal_uLong SwImpBlocks::GetDocForConversion( sal_uInt16 n ) -{ - return GetDoc( n ); -} - // Erzeugen eines PaMs, der das ganze Dokument umfasst SwPaM* SwImpBlocks::MakePaM() { diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx index 2cf90c2bfa02..51bce34ebad7 100644 --- a/sw/source/filter/basflt/fltini.cxx +++ b/sw/source/filter/basflt/fltini.cxx @@ -200,9 +200,6 @@ SwRead GetReader( const String& rFltName ) } // namespace SwReaderWriter -void Writer::SetPasswd( const String& ) {} - - void Writer::SetVersion( const String&, long ) {} diff --git a/tools/inc/tools/shl.hxx b/tools/inc/tools/shl.hxx index 43a5d8a02d3d..e65d88de37d3 100644 --- a/tools/inc/tools/shl.hxx +++ b/tools/inc/tools/shl.hxx @@ -76,7 +76,7 @@ //48 (SHL_MONEY) removed //49 (SHL_HBCI) removed //50 (SHL_BASE3D) removed -#define SHL_BRUSHITEM 51 +//51 (SHL_BRUSHITEM) removed //52 (SHL_SFONTITEM) removed #define SHL_COUNT 53 diff --git a/vcl/inc/vcl/edit.hxx b/vcl/inc/vcl/edit.hxx index 434e4281e44b..aaa6e3a62f78 100644 --- a/vcl/inc/vcl/edit.hxx +++ b/vcl/inc/vcl/edit.hxx @@ -218,7 +218,6 @@ public: virtual void SetModifyHdl( const Link& rLink ) { maModifyHdl = rLink; } virtual const Link& GetModifyHdl() const { return maModifyHdl; } virtual void SetUpdateDataHdl( const Link& rLink ) { maUpdateDataHdl = rLink; } - virtual const Link& GetUpdateDataHdl() const { return maUpdateDataHdl; } void SetSubEdit( Edit* pEdit ); Edit* GetSubEdit() const { return mpSubEdit; } diff --git a/vcl/inc/vcl/fontmanager.hxx b/vcl/inc/vcl/fontmanager.hxx index ea2473f2c8f6..94f905d58815 100644 --- a/vcl/inc/vcl/fontmanager.hxx +++ b/vcl/inc/vcl/fontmanager.hxx @@ -530,21 +530,6 @@ public: // font administration functions - // for importFonts to provide the user feedback - class ImportFontCallback - { - public: - enum FailCondition { NoWritableDirectory, NoAfmMetric, AfmCopyFailed, FontCopyFailed }; - virtual void importFontsFailed( FailCondition eReason ) = 0; - virtual void progress( const rtl::OUString& rFile ) = 0; - virtual bool queryOverwriteFile( const rtl::OUString& rFile ) = 0; - virtual void importFontFailed( const rtl::OUString& rFile, FailCondition ) = 0; - virtual bool isCanceled() = 0; - - protected: - ~ImportFontCallback() {} - }; - /* system dependendent font matching <p> diff --git a/vcl/inc/vcl/svapp.hxx b/vcl/inc/vcl/svapp.hxx index ef929853dabc..9b4510e5c5dd 100644 --- a/vcl/inc/vcl/svapp.hxx +++ b/vcl/inc/vcl/svapp.hxx @@ -161,9 +161,6 @@ public: virtual void UserEvent( sal_uLong nEvent, void* pEventData ); - virtual void ActivateExtHelp(); - virtual void DeactivateExtHelp(); - virtual void FocusChanged(); virtual void DataChanged( const DataChangedEvent& rDCEvt ); diff --git a/vcl/inc/vcl/vclmedit.hxx b/vcl/inc/vcl/vclmedit.hxx index eddace761ecd..353cc94f203c 100644 --- a/vcl/inc/vcl/vclmedit.hxx +++ b/vcl/inc/vcl/vclmedit.hxx @@ -110,7 +110,6 @@ public: const Link& GetModifyHdl() const { return aModifyHdlLink; } void SetUpdateDataHdl( const Link& rLink ) { aUpdateDataHdlLink = rLink; } - const Link& GetUpdateDataHdl() const { return aUpdateDataHdlLink; } virtual void Resize(); virtual void GetFocus(); diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index f884d568ab42..2dbb2de6c90e 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -252,18 +252,6 @@ void Application::UserEvent( sal_uLong, void* ) // ----------------------------------------------------------------------- -void Application::ActivateExtHelp() -{ -} - -// ----------------------------------------------------------------------- - -void Application::DeactivateExtHelp() -{ -} - -// ----------------------------------------------------------------------- - void Application::FocusChanged() { } diff --git a/xmloff/inc/xmloff/xmlnume.hxx b/xmloff/inc/xmloff/xmlnume.hxx index dca651db2bcc..93a7260137dc 100644 --- a/xmloff/inc/xmloff/xmlnume.hxx +++ b/xmloff/inc/xmloff/xmlnume.hxx @@ -75,8 +75,6 @@ protected: SvXMLExport& GetExport() { return rExport; } - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace > GetUNONumRule() const; - public: SvxXMLNumRuleExport( SvXMLExport& rExport ); diff --git a/xmloff/source/style/xmlnume.cxx b/xmloff/source/style/xmlnume.cxx index 871c7024289a..364860513f5c 100644 --- a/xmloff/source/style/xmlnume.cxx +++ b/xmloff/source/style/xmlnume.cxx @@ -644,11 +644,6 @@ void SvxXMLNumRuleExport::exportLevelStyle( sal_Int32 nLevel, } -uno::Reference< ::com::sun::star::container::XIndexReplace > SvxXMLNumRuleExport::GetUNONumRule() const -{ - return uno::Reference< ::com::sun::star::container::XIndexReplace > (); -} - void SvxXMLNumRuleExport::AddListStyleAttributes() { } diff --git a/xmloff/source/text/XMLAutoTextEventExport.cxx b/xmloff/source/text/XMLAutoTextEventExport.cxx index 48175de93543..945b815d0cbe 100644 --- a/xmloff/source/text/XMLAutoTextEventExport.cxx +++ b/xmloff/source/text/XMLAutoTextEventExport.cxx @@ -211,7 +211,6 @@ void XMLAutoTextEventExport::_ExportFontDecls() {} void XMLAutoTextEventExport::_ExportStyles( sal_Bool ) {} void XMLAutoTextEventExport::_ExportAutoStyles() {} void XMLAutoTextEventExport::_ExportMasterStyles() {} -void XMLAutoTextEventExport::_ExportChangeTracking() {} void XMLAutoTextEventExport::_ExportContent() {} diff --git a/xmloff/source/text/XMLAutoTextEventExport.hxx b/xmloff/source/text/XMLAutoTextEventExport.hxx index ed0e50fd6467..c90615b4a846 100644 --- a/xmloff/source/text/XMLAutoTextEventExport.hxx +++ b/xmloff/source/text/XMLAutoTextEventExport.hxx @@ -95,7 +95,6 @@ protected: virtual void _ExportStyles( sal_Bool bUsed ) ; virtual void _ExportAutoStyles(); virtual void _ExportMasterStyles(); - virtual void _ExportChangeTracking(); virtual void _ExportContent(); }; |