summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-08-16 02:07:57 +0100
committerCaolán McNamara <caolanm@redhat.com>2011-08-16 09:04:09 +0100
commitf88247d9c5fe484b799600e24a96abbdd34cfe2f (patch)
tree8b6815eded898aebcbd2ccac5250e7a2c2ad1d17 /sfx2
parentac96fbd737d01c074232ce74ba5279550ee8ce5d (diff)
callcatcher: unused code
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/inc/sfx2/viewfrm.hxx5
-rw-r--r--sfx2/inc/sfx2/viewsh.hxx6
-rw-r--r--sfx2/source/view/viewfrm.cxx52
-rw-r--r--sfx2/source/view/viewprn.cxx29
-rw-r--r--sfx2/source/view/viewsh.cxx85
5 files changed, 0 insertions, 177 deletions
diff --git a/sfx2/inc/sfx2/viewfrm.hxx b/sfx2/inc/sfx2/viewfrm.hxx
index f3251802342b..0c66d27157f5 100644
--- a/sfx2/inc/sfx2/viewfrm.hxx
+++ b/sfx2/inc/sfx2/viewfrm.hxx
@@ -114,7 +114,6 @@ public:
static SfxViewFrame* Current();
static SfxViewFrame* GetFirst( const SfxObjectShell* pDoc = 0, sal_Bool bOnlyVisible = sal_True );
static SfxViewFrame* GetNext( const SfxViewFrame& rPrev, const SfxObjectShell* pDoc = 0, sal_Bool bOnlyVisible = sal_True );
- static sal_uInt16 Count();
static SfxViewFrame* Get( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController>& i_rController, const SfxObjectShell* i_pDoc = NULL );
@@ -138,8 +137,6 @@ public:
SfxObjectShell* GetObjectShell() const
{ return xObjSh; }
- void DoAdjustPosSize( SfxViewShell *pSh,
- const Point rPos, const Size &rSize );
void LockAdjustPosSizePixel()
{ nAdjustPosPixelLock++; }
void UnlockAdjustPosSizePixel()
@@ -213,7 +210,6 @@ public:
SAL_DLLPRIVATE void GetState_Impl( SfxItemSet &rSet );
SAL_DLLPRIVATE void ExecReload_Impl( SfxRequest &rReq );
- SAL_DLLPRIVATE void ExecReload_Impl( SfxRequest &rReq, sal_Bool bAsync );
SAL_DLLPRIVATE void StateReload_Impl( SfxItemSet &rSet );
SAL_DLLPRIVATE void ExecView_Impl( SfxRequest &rReq );
SAL_DLLPRIVATE void StateView_Impl( SfxItemSet &rSet );
@@ -224,7 +220,6 @@ public:
SAL_DLLPRIVATE sal_Bool IsResizeInToOut_Impl() const;
SAL_DLLPRIVATE sal_Bool IsAdjustPosSizePixelLocked_Impl() const
{ return nAdjustPosPixelLock != 0; }
- SAL_DLLPRIVATE void ForceInnerResize_Impl( sal_Bool bOn );
SAL_DLLPRIVATE void UpdateDocument_Impl();
SAL_DLLPRIVATE void LockObjectShell_Impl(sal_Bool bLock=sal_True);
diff --git a/sfx2/inc/sfx2/viewsh.hxx b/sfx2/inc/sfx2/viewsh.hxx
index c904e8d1d28e..0a1ffdbc5482 100644
--- a/sfx2/inc/sfx2/viewsh.hxx
+++ b/sfx2/inc/sfx2/viewsh.hxx
@@ -218,7 +218,6 @@ public:
virtual sal_Bool HasSelection( sal_Bool bText = sal_True ) const;
virtual SdrView* GetDrawView() const;
- void SetSubShell( SfxShell *pShell );
SfxShell* GetSubShell() const { return pSubShell; }
void AddSubShell( SfxShell& rShell );
void RemoveSubShell( SfxShell *pShell=NULL );
@@ -239,14 +238,11 @@ public:
void SetBorderPixel( const SvBorder &rBorder );
void InvalidateBorder();
inline SfxViewFrame* GetViewFrame() const;
- void AdjustVisArea(const Rectangle& rRect);
// Printing Interface
virtual SfxPrinter* GetPrinter( sal_Bool bCreate = sal_False );
virtual sal_uInt16 SetPrinter( SfxPrinter *pNewPrinter, sal_uInt16 nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=sal_False );
virtual SfxTabPage* CreatePrintOptionsPage( Window *pParent, const SfxItemSet &rOptions );
- void LockPrinter( sal_Bool bLock = sal_True );
- sal_Bool IsPrinterLocked() const;
virtual JobSetup GetJobSetup() const;
Printer* GetActivePrinter() const;
@@ -286,7 +282,6 @@ public:
::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >
GetController();
- ::cppu::OInterfaceContainerHelper& GetContextMenuInterceptors() const;
sal_Bool TryContextMenuInterception( Menu& rIn, const ::rtl::OUString& rMenuIdentifier, Menu*& rpOut, ::com::sun::star::ui::ContextMenuExecuteEvent aEvent );
void SetAdditionalPrintOptions( const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >& );
@@ -328,7 +323,6 @@ public:
SAL_DLLPRIVATE void PushSubShells_Impl( sal_Bool bPush=sal_True );
SAL_DLLPRIVATE void PopSubShells_Impl() { PushSubShells_Impl( sal_False ); }
SAL_DLLPRIVATE void TakeOwnerShip_Impl();
- SAL_DLLPRIVATE void CheckOwnerShip_Impl();
SAL_DLLPRIVATE void TakeFrameOwnerShip_Impl();
SAL_DLLPRIVATE sal_Bool ExecKey_Impl(const KeyEvent& aKey);
#endif
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index e41ae1ff48c4..cafb0dbd8b2d 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -290,18 +290,6 @@ long ReloadDecouple_Impl( void* pObj, void* pArg )
return 0;
}
-void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq, sal_Bool bAsync )
-{
- if( bAsync )
- {
- if( !pImp->pReloader )
- pImp->pReloader = new svtools::AsynchronLink(
- Link( this, ReloadDecouple_Impl ) );
- pImp->pReloader->Call( new SfxRequest( rReq ) );
- }
- else ExecReload_Impl( rReq );
-}
-
void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
{
SfxFrame *pParent = GetFrame().GetParentFrame();
@@ -1541,28 +1529,6 @@ SfxViewFrame* SfxViewFrame::Current()
}
//--------------------------------------------------------------------
-sal_uInt16 SfxViewFrame::Count()
-
-/* [Description]
-
- Returns the number of visable <SfxViewFrame> instances.
-*/
-
-{
- SfxApplication *pSfxApp = SFX_APP();
- SfxViewFrameArr_Impl& rFrames = pSfxApp->GetViewFrames_Impl();
- const sal_uInt16 nCount = rFrames.Count();
- sal_uInt16 nFound = 0;
- for ( sal_uInt16 i = 0; i < nCount; ++i )
- {
- SfxViewFrame *pFrame = rFrames[i];
- if ( pFrame->IsVisible() )
- ++nFound;
- }
- return nFound;
-}
-
-//--------------------------------------------------------------------
// returns the first window of spec. type viewing the specified doc.
SfxViewFrame* SfxViewFrame::GetFirst
(
@@ -1718,29 +1684,11 @@ void SfxViewFrame::ForceOuterResize_Impl(sal_Bool bOn)
pImp->bResizeInToOut = !bOn;
}
-void SfxViewFrame::ForceInnerResize_Impl(sal_Bool bOn)
-{
- pImp->bDontOverwriteResizeInToOut = bOn;
-}
-
//--------------------------------------------------------------------
sal_Bool SfxViewFrame::IsResizeInToOut_Impl() const
{
return pImp->bResizeInToOut;
}
-//--------------------------------------------------------------------
-void SfxViewFrame::DoAdjustPosSize( SfxViewShell *pSh,
- const Point rPos, const Size &rSize )
-{
- DBG_CHKTHIS(SfxViewFrame, 0);
- if( pSh && !nAdjustPosPixelLock )
- {
- Window *pWindow = pSh->GetWindow();
- Point aPos = pWindow->LogicToPixel(rPos);
- Size aSize = pWindow->LogicToPixel(rSize);
- DoAdjustPosSizePixel(pSh, aPos, aSize);
- }
-}
//--------------------------------------------------------------------
void SfxViewFrame::GetDocNumber_Impl()
diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index 877005eb908c..70c98d6a55bd 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -878,35 +878,6 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq )
//--------------------------------------------------------------------
-sal_Bool SfxViewShell::IsPrinterLocked() const
-{
- return pImp->m_nPrinterLocks > 0;
-}
-
-//--------------------------------------------------------------------
-
-void SfxViewShell::LockPrinter( sal_Bool bLock)
-{
- sal_Bool bChanged = sal_False;
- if ( bLock )
- {
- bChanged = 1 == ++pImp->m_nPrinterLocks;
- }
- else
- {
- bChanged = 0 == --pImp->m_nPrinterLocks;
- }
-
- if ( bChanged )
- {
- Invalidate( SID_PRINTDOC );
- Invalidate( SID_PRINTDOCDIRECT );
- Invalidate( SID_SETUPPRINTER );
- }
-}
-
-//--------------------------------------------------------------------
-
SfxPrinter* SfxViewShell::GetPrinter( sal_Bool /*bCreate*/ )
{
return 0;
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index c835d8969cd5..befc248fa69f 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -1480,39 +1480,6 @@ sal_Bool SfxViewShell::HasSelection( sal_Bool ) const
return sal_False;
}
-//--------------------------------------------------------------------
-
-void SfxViewShell::SetSubShell( SfxShell *pShell )
-
-/* [Description]
-
- With this method a selection or cursor Shell can be registered, which are
- automatically pushed to SfxDispatcher immediately after SfxViewShell, and
- and automatically popped immediately before SfxViewShell.
-
- If the SfxViewShell instance is already pushed, then pShell will be
- immediately pushed as well. Is another SfxShell instance registered by
- using SetSubShell, which was previously registered, the previously
- registered shell is popped automatically if possible. With pShell==0
- the current sub-shell be can thus be unregistered.
-*/
-
-{
- // Is this ViewShell even active?
- SfxDispatcher *pDisp = pFrame->GetDispatcher();
- if ( pDisp->IsActive(*this) )
- {
- // Update Dispatcher
- if ( pSubShell )
- pDisp->Pop(*pSubShell);
- if ( pShell )
- pDisp->Push(*pShell);
- pDisp->Flush();
- }
-
- pSubShell = pShell;
-}
-
void SfxViewShell::AddSubShell( SfxShell& rShell )
{
pImp->aArr.Insert( &rShell, pImp->aArr.Count() );
@@ -1839,14 +1806,6 @@ void SfxViewShell::QueryObjAreaPixel( Rectangle& ) const
//--------------------------------------------------------------------
-void SfxViewShell::AdjustVisArea(const Rectangle& rRect)
-{
- DBG_ASSERT (pFrame, "No Frame?");
- GetObjectShell()->SetVisArea( rRect );
-}
-
-//--------------------------------------------------------------------
-
void SfxViewShell::VisAreaChanged(const Rectangle& /*rVisArea*/)
{
SfxInPlaceClientList *pClients = GetIPClientList_Impl(sal_False);
@@ -2065,11 +2024,6 @@ void SfxViewShell::RemoveContextMenuInterceptor_Impl( const REFERENCE< XCONTEXTM
pImp->aInterceptorContainer.removeInterface( xInterceptor );
}
-::cppu::OInterfaceContainerHelper& SfxViewShell::GetContextMenuInterceptors() const
-{
- return pImp->aInterceptorContainer;
-}
-
void Change( Menu* pMenu, SfxViewShell* pView )
{
SfxDispatcher *pDisp = pView->GetViewFrame()->GetDispatcher();
@@ -2183,45 +2137,6 @@ void SfxViewShell::TakeFrameOwnerShip_Impl()
pImp->m_bGotFrameOwnership = true;
}
-void SfxViewShell::CheckOwnerShip_Impl()
-{
- sal_Bool bSuccess = sal_False;
- if (pImp->m_bGotOwnership)
- {
- uno::Reference < util::XCloseable > xModel(
- GetObjectShell()->GetModel(), uno::UNO_QUERY );
- if ( xModel.is() )
- {
- try
- {
- // this call will destroy this object in case of success!
- xModel->close( sal_True );
- bSuccess = sal_True;
- }
- catch (const util::CloseVetoException&)
- {
- }
- }
- }
-
- if (!bSuccess && pImp->m_bGotFrameOwnership)
- {
- // document couldn't be closed or it shouldn't, now try at least to close the frame
- uno::Reference < util::XCloseable > xFrame(
- GetViewFrame()->GetFrame().GetFrameInterface(), com::sun::star::uno::UNO_QUERY );
- if ( xFrame.is() )
- {
- try
- {
- xFrame->close( sal_True );
- }
- catch (const util::CloseVetoException&)
- {
- }
- }
- }
-}
-
long SfxViewShell::HandleNotifyEvent_Impl( NotifyEvent& rEvent )
{
if (pImp->m_pController.is())