diff options
-rw-r--r-- | sfx2/inc/sfx2/tabdlg.hxx | 7 | ||||
-rw-r--r-- | sfx2/source/dialog/tabdlg.cxx | 95 | ||||
-rw-r--r-- | svl/inc/svl/style.hxx | 1 | ||||
-rw-r--r-- | svl/source/items/style.cxx | 4 | ||||
-rw-r--r-- | unusedcode.easy | 6 |
5 files changed, 0 insertions, 113 deletions
diff --git a/sfx2/inc/sfx2/tabdlg.hxx b/sfx2/inc/sfx2/tabdlg.hxx index f7d1d24c9c32..ce1f84aa0040 100644 --- a/sfx2/inc/sfx2/tabdlg.hxx +++ b/sfx2/inc/sfx2/tabdlg.hxx @@ -140,8 +140,6 @@ protected: bool PrepareLeaveCurrentPage(); public: - SfxTabDialog( Window* pParent, const ResId &rResId, sal_uInt16 nSetId, SfxBindings& rBindings, - sal_Bool bEditFmt = sal_False, const String *pUserButtonText = 0 ); SfxTabDialog( Window* pParent, const ResId &rResId, const SfxItemSet * = 0, sal_Bool bEditFmt = sal_False, const String *pUserButtonText = 0 ); SfxTabDialog( SfxViewFrame *pViewFrame, Window* pParent, const ResId &rResId, @@ -188,8 +186,6 @@ public: const sal_uInt16* GetInputRanges( const SfxItemPool& ); void SetInputSet( const SfxItemSet* pInSet ); const SfxItemSet* GetOutputItemSet() const { return pOutSet; } - const SfxItemSet* GetOutputItemSet( sal_uInt16 nId ) const; - int FillOutputItemSet(); sal_Bool IsFormat() const { return bFmt; } const OKButton& GetOKButton() const { return aOKBtn; } @@ -201,9 +197,6 @@ public: const PushButton& GetResetButton() const { return aResetBtn; } PushButton& GetResetButton() { return aResetBtn; } - const PushButton* GetApplyButton() const; - PushButton* GetApplyButton(); - const PushButton* GetUserButton() const { return pUserBtn; } PushButton* GetUserButton() { return pUserBtn; } void RemoveResetButton(); diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index 4afeb5ed11ad..738041f9fbef 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -514,41 +514,6 @@ SfxTabDialog::SfxTabDialog DBG_WARNING( "Please use the Construtor with the ViewFrame" ); } -SfxTabDialog::SfxTabDialog - -/* [Description] - - Constructor, temporary without Frame -*/ - -( - Window* pParent, // Parent Window - const ResId& rResId, // ResourceId - sal_uInt16 nSetId, - SfxBindings& rBindings, - sal_Bool bEditFmt, // Flag: templates are processed - // when yes -> additional Button for standard - const String* pUserButtonText // Text for UserButton; - // if != 0, the UserButton is created -) : - TabDialog( pParent, rResId ), - pFrame( 0 ), - INI_LIST(NULL) -{ - rBindings.ENTERREGISTRATIONS(); - pImpl->pController = new SfxTabDialogController( nSetId, rBindings, this ); - rBindings.LEAVEREGISTRATIONS(); - - EnableApplyButton( sal_True ); - SetApplyHandler( LINK( pImpl->pController, SfxTabDialogController, Execute_Impl ) ); - - rBindings.Invalidate( nSetId ); - rBindings.Update( nSetId ); - DBG_ASSERT( pSet, "No ItemSet!" ); - - Init_Impl( bFmt, pUserButtonText ); -} - // ----------------------------------------------------------------------- #if ENABLE_LAYOUT_SFX_TABDIALOG @@ -779,20 +744,6 @@ sal_Bool SfxTabDialog::IsApplyButtonEnabled() const // ----------------------------------------------------------------------- -const PushButton* SfxTabDialog::GetApplyButton() const -{ - return pImpl->pApplyButton; -} - -// ----------------------------------------------------------------------- - -PushButton* SfxTabDialog::GetApplyButton() -{ - return pImpl->pApplyButton; -} - -// ----------------------------------------------------------------------- - void SfxTabDialog::Start_Impl() { DBG_ASSERT( pImpl->pData->Count() == aTabCtrl.GetPageCount(), "not all pages registered" ); @@ -1518,52 +1469,6 @@ IMPL_LINK( SfxTabDialog, DeactivatePageHdl, TabControl *, pTabCtrl ) // ----------------------------------------------------------------------- -const SfxItemSet* SfxTabDialog::GetOutputItemSet - -/* [Description] - - Return the pages that provide their sets onDemand, the OutputItemSet. - - [Cross-reference] - - <SfxTabDialog::AddTabPage(sal_uInt16, CreateTabPage, GetTabPageRanges, sal_Bool)> - <SfxTabDialog::AddTabPage(sal_uInt16, const String &, CreateTabPage, GetTabPageRanges, sal_Bool, sal_uInt16)> - <SfxTabDialog::AddTabPage(sal_uInt16, const Bitmap &, CreateTabPage, GetTabPageRanges, sal_Bool, sal_uInt16)> -*/ - -( - sal_uInt16 nId // the Id, under which the page was added at AddTabPage(). -) const -{ - Data_Impl* pDataObject = Find( *pImpl->pData, nId ); - DBG_ASSERT( pDataObject, "TabPage not found" ); - - if ( pDataObject ) - { - if ( !pDataObject->pTabPage ) - return NULL; - - if ( pDataObject->bOnDemand ) - return &pDataObject->pTabPage->GetItemSet(); - return pOutSet; - } - return NULL; -} - -// ----------------------------------------------------------------------- - -int SfxTabDialog::FillOutputItemSet() -{ - int nRet = SfxTabPage::LEAVE_PAGE; - if ( OK_Impl() ) - Ok(); - else - nRet = SfxTabPage::KEEP_PAGE; - return nRet; -} - -// ----------------------------------------------------------------------- - extern "C" int SAL_CALL TabDlgCmpUS_Impl( const void* p1, const void* p2 ) /* [Description] diff --git a/svl/inc/svl/style.hxx b/svl/inc/svl/style.hxx index 7edecd70883d..ceb8050f31c8 100644 --- a/svl/inc/svl/style.hxx +++ b/svl/inc/svl/style.hxx @@ -285,7 +285,6 @@ public: virtual sal_Bool SetParent( const UniString& ); protected: - SfxStyleSheet(); // do not use! virtual ~SfxStyleSheet(); }; diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx index a44d6424f276..2a1929e78fb0 100644 --- a/svl/source/items/style.cxx +++ b/svl/source/items/style.cxx @@ -892,10 +892,6 @@ SfxStyleSheet::SfxStyleSheet(const SfxStyleSheet& rStyle) : SfxBroadcaster( rStyle ) {} -SfxStyleSheet::SfxStyleSheet() -{ -} - SfxStyleSheet::~SfxStyleSheet() { Broadcast( SfxStyleSheetHint( SFX_STYLESHEET_INDESTRUCTION, *this ) ); diff --git a/unusedcode.easy b/unusedcode.easy index 44fe387e55d9..c4495d2ae1f0 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -747,13 +747,7 @@ SfxRequest::SetTarget(String const&) SfxShell::GetBroadcaster() SfxShell::RemoveItem(unsigned short) SfxSlotPool::NextInterface() -SfxStyleSheet::SfxStyleSheet() -SfxTabDialog::FillOutputItemSet() -SfxTabDialog::GetApplyButton() -SfxTabDialog::GetApplyButton() const SfxTabDialog::GetApplyHandler() const -SfxTabDialog::GetOutputItemSet(unsigned short) const -SfxTabDialog::SfxTabDialog(Window*, ResId const&, unsigned short, SfxBindings&, unsigned char, String const*) SfxTabPage::SfxTabPage(Window*, long, SfxItemSet const&) SfxThesSubMenuControl::RegisterControl(unsigned short, SfxModule*) SfxToDoStack_Implarr_::Contains(SfxToDo_Impl const&) const |