editeng/inc/editeng/bulitem.hxx | 7 --- editeng/inc/editeng/svxacorr.hxx | 2 editeng/source/items/bulitem.cxx | 84 --------------------------------------- editeng/source/misc/svxacorr.cxx | 28 ------------- svx/inc/svx/ctredlin.hxx | 4 - svx/source/dialog/ctredlin.cxx | 37 ----------------- 6 files changed, 162 deletions(-)
New commits: commit 6df7cfaa3f5e750e2bbdb3d6afb934c405a7a988 Author: August Sodora <aug...@gmail.com> Date: Thu Dec 22 21:41:09 2011 -0500 callcatcher: Remove unused code diff --git a/editeng/inc/editeng/bulitem.hxx b/editeng/inc/editeng/bulitem.hxx index 2a7eefb..2a5f3b1 100644 --- a/editeng/inc/editeng/bulitem.hxx +++ b/editeng/inc/editeng/bulitem.hxx @@ -94,10 +94,6 @@ public: TYPEINFO(); SvxBulletItem( sal_uInt16 nWhich = 0 ); - SvxBulletItem( sal_uInt8 nStyle, const Font& rFont, sal_uInt16 nStart = 0, sal_uInt16 nWhich = 0 ); - SvxBulletItem( const Font& rFont, sal_Unicode cSymbol, sal_uInt16 nWhich=0 ); - SvxBulletItem( const Bitmap&, sal_uInt16 nWhich = 0 ); - SvxBulletItem( const GraphicObject&, sal_uInt16 nWhich = 0 ); SvxBulletItem( SvStream& rStrm, sal_uInt16 nWhich = 0 ); SvxBulletItem( const SvxBulletItem& ); ~SvxBulletItem(); @@ -118,9 +114,6 @@ public: Font GetFont() const { return aFont; } sal_uInt16 GetScale() const { return nScale; } - Bitmap GetBitmap() const; - void SetBitmap( const Bitmap& rBmp ); - const GraphicObject& GetGraphicObject() const; void SetGraphicObject( const GraphicObject& rGraphicObject ); diff --git a/editeng/inc/editeng/svxacorr.hxx b/editeng/inc/editeng/svxacorr.hxx index dd83531..ed0d528 100644 --- a/editeng/inc/editeng/svxacorr.hxx +++ b/editeng/inc/editeng/svxacorr.hxx @@ -291,8 +291,6 @@ public: String GetAutoCorrFileName( LanguageType eLang = LANGUAGE_SYSTEM, sal_Bool bNewFile = sal_False, sal_Bool bTstUserExist = sal_False ) const; - void SetUserAutoCorrFileName( const String& rNew ); - void SetShareAutoCorrFileName( const String& rNew ); // Query/Set the current settings of AutoCorrect long GetFlags() const { return nFlags; } diff --git a/editeng/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx index caca392..106a5ab 100644 --- a/editeng/source/items/bulitem.cxx +++ b/editeng/source/items/bulitem.cxx @@ -123,57 +123,6 @@ SvxBulletItem::SvxBulletItem( sal_uInt16 _nWhich ) : SfxPoolItem( _nWhich ) // ----------------------------------------------------------------------- -SvxBulletItem::SvxBulletItem( sal_uInt8 nNewStyle, const Font& rFont, sal_uInt16 /*nStart*/, sal_uInt16 _nWhich ) : SfxPoolItem( _nWhich ) -{ - SetDefaults_Impl(); - nStyle = nNewStyle; - aFont = rFont; - nValidMask = 0xFFFF; -} - -// ----------------------------------------------------------------------- - -SvxBulletItem::SvxBulletItem( const Font& rFont, xub_Unicode cSymb, sal_uInt16 _nWhich ) : SfxPoolItem( _nWhich ) -{ - SetDefaults_Impl(); - aFont = rFont; - cSymbol = cSymb; - nStyle = BS_BULLET; - nValidMask = 0xFFFF; -} - -// ----------------------------------------------------------------------- - -SvxBulletItem::SvxBulletItem( const Bitmap& rBmp, sal_uInt16 _nWhich ) : SfxPoolItem( _nWhich ) -{ - SetDefaults_Impl(); - - if( !rBmp.IsEmpty() ) - { - pGraphicObject = new GraphicObject( rBmp ); - nStyle = BS_BMP; - } - - nValidMask = 0xFFFF; -} - -// ----------------------------------------------------------------------- - -SvxBulletItem::SvxBulletItem( const GraphicObject& rGraphicObject, sal_uInt16 _nWhich ) : SfxPoolItem( _nWhich ) -{ - SetDefaults_Impl(); - - if( ( GRAPHIC_NONE != pGraphicObject->GetType() ) && ( GRAPHIC_DEFAULT != pGraphicObject->GetType() ) ) - { - pGraphicObject = new GraphicObject( rGraphicObject ); - nStyle = BS_BMP; - } - - nValidMask = 0xFFFF; -} - -// ----------------------------------------------------------------------- - SvxBulletItem::SvxBulletItem( SvStream& rStrm, sal_uInt16 _nWhich ) : SfxPoolItem( _nWhich ), pGraphicObject( NULL ) @@ -464,39 +413,6 @@ SfxItemPresentation SvxBulletItem::GetPresentation //------------------------------------------------------------------------ -Bitmap SvxBulletItem::GetBitmap() const -{ - if( pGraphicObject ) - return pGraphicObject->GetGraphic().GetBitmap(); - else - { - const Bitmap aDefaultBitmap; - return aDefaultBitmap; - } -} - -//------------------------------------------------------------------------ - -void SvxBulletItem::SetBitmap( const Bitmap& rBmp ) -{ - if( rBmp.IsEmpty() ) - { - if( pGraphicObject ) - { - delete pGraphicObject; - pGraphicObject = NULL; - } - } - else - { - delete pGraphicObject; - pGraphicObject = new GraphicObject( rBmp ); - - } -} - -//------------------------------------------------------------------------ - const GraphicObject& SvxBulletItem::GetGraphicObject() const { if( pGraphicObject ) diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx index 8cbeb1e..e8cd59c 100644 --- a/editeng/source/misc/svxacorr.cxx +++ b/editeng/source/misc/svxacorr.cxx @@ -1564,34 +1564,6 @@ sal_Bool SvxAutoCorrect::AddWrtSttException( const String& rNew, return pLists->AddToWrdSttExceptList(rNew); } - - - -void SvxAutoCorrect::SetUserAutoCorrFileName( const String& rNew ) -{ - if( sUserAutoCorrFile != rNew ) - { - sUserAutoCorrFile = rNew; - - // if the lists are set, they must now be deleted - lcl_ClearTable(*pLangTable); - nFlags &= ~(CplSttLstLoad | WrdSttLstLoad | ChgWordLstLoad ); - } -} - -void SvxAutoCorrect::SetShareAutoCorrFileName( const String& rNew ) -{ - if( sShareAutoCorrFile != rNew ) - { - sShareAutoCorrFile = rNew; - - // if the lists are set, they must now be deleted - lcl_ClearTable(*pLangTable); - nFlags &= ~(CplSttLstLoad | WrdSttLstLoad | ChgWordLstLoad ); - } -} - - sal_Bool SvxAutoCorrect::GetPrevAutoCorrWord( SvxAutoCorrDoc& rDoc, const String& rTxt, xub_StrLen nPos, String& rWord ) const commit aec97e2af5c1bfd2fd56382f77350b8288634643 Author: August Sodora <aug...@gmail.com> Date: Thu Dec 22 21:22:42 2011 -0500 callcatcher: Remove unused code diff --git a/svx/inc/svx/ctredlin.hxx b/svx/inc/svx/ctredlin.hxx index 3b7ed86..18089c7 100644 --- a/svx/inc/svx/ctredlin.hxx +++ b/svx/inc/svx/ctredlin.hxx @@ -403,7 +403,6 @@ protected: virtual void Resize(); public: - SvxAcceptChgCtr( Window* pParent, WinBits nWinStyle = 0 ); SvxAcceptChgCtr( Window* pParent, const ResId& rResId ); ~SvxAcceptChgCtr(); @@ -413,9 +412,6 @@ public: void ShowFilterPage(); void ShowViewPage(); - sal_Bool IsFilterPageVisible(); - sal_Bool IsViewPageVisible(); - SvxTPFilter* GetFilterPage(); SvxTPView* GetViewPage(); SvxRedlinTable* GetViewTable(); diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx index 7494f32..a7ba956 100644 --- a/svx/source/dialog/ctredlin.cxx +++ b/svx/source/dialog/ctredlin.cxx @@ -1338,33 +1338,6 @@ static Size gDiffSize; // class SvxAcceptChgCtr //---------------------------------------------------------------------------- -SvxAcceptChgCtr::SvxAcceptChgCtr( Window* pParent, WinBits nWinStyle) - : Control(pParent,nWinStyle |WB_DIALOGCONTROL), - aTCAccept(this,WB_TABSTOP |WB_DIALOGCONTROL) -{ - pTPFilter=new SvxTPFilter(&aTCAccept); - pTPView=new SvxTPView(&aTCAccept); - aMinSize=pTPView->GetMinSizePixel(); - - aTCAccept.InsertPage( TP_VIEW, pTPView->GetMyName()); - aTCAccept.InsertPage( TP_FILTER, pTPFilter->GetMyName()); - aTCAccept.SetTabPage( TP_VIEW, pTPView); - aTCAccept.SetTabPage( TP_FILTER, pTPFilter); - aTCAccept.SetHelpId(HID_REDLINING_TABCONTROL); - - aTCAccept.SetTabPageSizePixel(aMinSize); - Size aSize=aTCAccept.GetSizePixel(); - - gDiffSize.Height()=aSize.Height()-aMinSize.Height(); - gDiffSize.Width()=aSize.Width()-aMinSize.Width(); - - - pTPFilter->SetRedlinTable(GetViewTable()); - - aTCAccept.Show(); - ShowViewPage(); -} - SvxAcceptChgCtr::SvxAcceptChgCtr( Window* pParent, const ResId& rResId ) : Control(pParent,rResId ), aTCAccept(this,WB_TABSTOP |WB_DIALOGCONTROL) @@ -1447,16 +1420,6 @@ void SvxAcceptChgCtr::ShowViewPage() aTCAccept.SetCurPageId(TP_VIEW); } -sal_Bool SvxAcceptChgCtr::IsFilterPageVisible() -{ - return (aTCAccept.GetCurPageId()==TP_FILTER); -} - -sal_Bool SvxAcceptChgCtr::IsViewPageVisible() -{ - return (aTCAccept.GetCurPageId()==TP_VIEW); -} - SvxTPFilter* SvxAcceptChgCtr::GetFilterPage() { return pTPFilter; _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits