summaryrefslogtreecommitdiff
path: root/sfx2/source/dialog
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-03-02 13:50:43 +0200
committerNoel Grandin <noel@peralex.com>2015-03-19 10:45:00 +0200
commit5133b27e638140ba574016b33dae70ca92edc323 (patch)
tree8c113b072c017a2beb6b96fa144c7ccb399373f5 /sfx2/source/dialog
parent062e40c76bcab664907737feace74f134a25c29c (diff)
loplugin:constantfunction: sfx2
Change-Id: I7b4c18b1f9644048f506fc1b1d1fb8c8c590ea7f
Diffstat (limited to 'sfx2/source/dialog')
-rw-r--r--sfx2/source/dialog/dockwin.cxx4
-rw-r--r--sfx2/source/dialog/navigat.cxx8
-rw-r--r--sfx2/source/dialog/securitypage.cxx5
-rw-r--r--sfx2/source/dialog/splitwin.cxx14
-rw-r--r--sfx2/source/dialog/templdlg.cxx7
5 files changed, 4 insertions, 34 deletions
diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx
index 5e21f99bdce8..bc0a3bf83774 100644
--- a/sfx2/source/dialog/dockwin.cxx
+++ b/sfx2/source/dialog/dockwin.cxx
@@ -1900,10 +1900,6 @@ void SfxDockingWindow::AutoShow_Impl( bool bShow )
}
}
-void SfxDockingWindow::FadeIn( bool /*bFadeIn*/ )
-{
-}
-
void SfxDockingWindow::StateChanged( StateChangedType nStateChange )
{
if ( nStateChange == StateChangedType::INITSHOW )
diff --git a/sfx2/source/dialog/navigat.cxx b/sfx2/source/dialog/navigat.cxx
index eb3c76e97ba9..bee29462f5ee 100644
--- a/sfx2/source/dialog/navigat.cxx
+++ b/sfx2/source/dialog/navigat.cxx
@@ -77,12 +77,8 @@ void SfxNavigator::Resizing( Size &rSize )
bool SfxNavigator::Close()
{
- SfxChildWindowContext *pCon = GetChildWindow_Impl()->GetContext_Impl();
- DBG_ASSERT( pCon, "No Context!" );
- if ( !pCon || pCon->Close() )
- return SfxDockingWindow::Close();
- else
- return false;
+ DBG_ASSERT( GetChildWindow_Impl()->GetContext_Impl(), "No Context!" );
+ return SfxDockingWindow::Close();
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/dialog/securitypage.cxx b/sfx2/source/dialog/securitypage.cxx
index af2c2a419818..b3fcb3dd50ca 100644
--- a/sfx2/source/dialog/securitypage.cxx
+++ b/sfx2/source/dialog/securitypage.cxx
@@ -226,8 +226,7 @@ bool SfxSecurityPage_Impl::FillItemSet_Impl( SfxItemSet & )
// open read-only?
const bool bDoOpenReadonly = m_pOpenReadonlyCB->IsChecked();
- if (pCurDocShell->HasSecurityOptOpenReadOnly() &&
- bDoOpenReadonly != pCurDocShell->IsSecurityOptOpenReadOnly())
+ if (bDoOpenReadonly != pCurDocShell->IsSecurityOptOpenReadOnly())
{
pCurDocShell->SetSecurityOptOpenReadOnly( bDoOpenReadonly );
bModified = true;
@@ -269,7 +268,7 @@ void SfxSecurityPage_Impl::Reset_Impl( const SfxItemSet & )
}
bool bIsReadonly = pCurDocShell->IsReadOnly();
- if (pCurDocShell->HasSecurityOptOpenReadOnly() && !bIsHTMLDoc)
+ if (!bIsHTMLDoc)
{
m_pOpenReadonlyCB->Check( pCurDocShell->IsSecurityOptOpenReadOnly() );
m_pOpenReadonlyCB->Enable( !bIsReadonly );
diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx
index ca6f7be22812..9270710ae285 100644
--- a/sfx2/source/dialog/splitwin.cxx
+++ b/sfx2/source/dialog/splitwin.cxx
@@ -156,7 +156,6 @@ void SfxEmptySplitWin_Impl::FadeIn()
if (!bAutoHide )
bAutoHide = IsFadeNoButtonMode();
pOwner->SetFadeIn_Impl( true );
- pOwner->Show_Impl();
if ( bAutoHide )
{
// Set Timer to close; the caller has to ensure themselves that the
@@ -1225,7 +1224,6 @@ void SfxSplitWindow::FadeOut_Impl()
}
SetFadeIn_Impl( false );
- Show_Impl();
}
void SfxSplitWindow::FadeOut()
@@ -1237,18 +1235,6 @@ void SfxSplitWindow::FadeOut()
void SfxSplitWindow::FadeIn()
{
SetFadeIn_Impl( true );
- Show_Impl();
-}
-
-void SfxSplitWindow::Show_Impl()
-{
- sal_uInt16 nCount = pDockArr->size();
- for ( sal_uInt16 n=0; n<nCount; n++ )
- {
- const SfxDock_Impl& rDock = (*pDockArr)[n];
- if ( rDock.pWin )
- rDock.pWin->FadeIn( pEmptyWin->bFadeIn );
- }
}
bool SfxSplitWindow::ActivateNextChild_Impl( bool bForward )
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 70f8c977880d..7d0bea97a369 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -1941,7 +1941,6 @@ void SfxCommonTemplateDialog_Impl::DeleteHdl(void *)
for (; it != itEnd; ++it)
{
const OUString aTemplName(pTreeBox ? pTreeBox->GetEntryText(*it) : aFmtLb.GetEntryText(*it));
- PrepareDeleteAction();
bDontUpdate = true; // To prevent the Treelistbox to shut down while deleting
Execute_Impl( SID_STYLE_DELETE, aTemplName,
OUString(), (sal_uInt16)GetFamilyItem_Impl()->GetFamily() );
@@ -2154,12 +2153,6 @@ void SfxCommonTemplateDialog_Impl::EnableExample_Impl(sal_uInt16 nId, bool bEnab
EnableItem(nId, bEnable);
}
-void SfxCommonTemplateDialog_Impl::PrepareDeleteAction()
-{
-}
-
-
-
PopupMenu* SfxCommonTemplateDialog_Impl::CreateContextMenu( void )
{
if ( bBindingUpdate )