summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-08-22 21:51:44 +0100
committerCaolán McNamara <caolanm@redhat.com>2011-08-23 10:35:44 +0100
commit43f8cba7d238e6db25e05edd0d9713dcc42fc861 (patch)
tree797d2e5aeae4d288a143e7483997538758ea7af9 /sfx2
parent6c1e8719013b47ff3d3954173a17e49f3a361009 (diff)
callcatcher: yet more unused code
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/inc/macro.hxx1
-rw-r--r--sfx2/inc/sfx2/docfile.hxx1
-rw-r--r--sfx2/inc/sfx2/frame.hxx2
-rw-r--r--sfx2/inc/sfx2/frmdescr.hxx3
-rw-r--r--sfx2/inc/sfx2/frmhtmlw.hxx3
-rw-r--r--sfx2/inc/sfx2/objsh.hxx1
-rw-r--r--sfx2/inc/sfx2/unoctitm.hxx1
-rw-r--r--sfx2/source/appl/sfxpicklist.cxx10
-rw-r--r--sfx2/source/bastyp/frmhtmlw.cxx14
-rw-r--r--sfx2/source/control/macro.cxx30
-rw-r--r--sfx2/source/control/unoctitm.cxx7
-rw-r--r--sfx2/source/doc/docfile.cxx6
-rw-r--r--sfx2/source/doc/frmdescr.cxx15
-rw-r--r--sfx2/source/doc/objmisc.cxx43
-rw-r--r--sfx2/source/inc/sfxpicklist.hxx1
-rw-r--r--sfx2/source/view/frame.cxx22
-rw-r--r--sfx2/source/view/frame2.cxx11
17 files changed, 0 insertions, 171 deletions
diff --git a/sfx2/inc/macro.hxx b/sfx2/inc/macro.hxx
index b9e4b18dbe8d..50552ece897d 100644
--- a/sfx2/inc/macro.hxx
+++ b/sfx2/inc/macro.hxx
@@ -171,7 +171,6 @@ public:
void Record( SfxMacroStatement *pStatement );
void Replace( SfxMacroStatement *pStatement );
void Remove();
- const SfxMacroStatement*GetLastStatement() const;
String GenerateSource() const;
};
diff --git a/sfx2/inc/sfx2/docfile.hxx b/sfx2/inc/sfx2/docfile.hxx
index dba159d3d928..b2c999549fda 100644
--- a/sfx2/inc/sfx2/docfile.hxx
+++ b/sfx2/inc/sfx2/docfile.hxx
@@ -168,7 +168,6 @@ public:
sal_Bool IsOpen() const; // { return aStorage.Is() || pInStream; }
void DownLoad( const Link& aLink = Link());
void SetDoneLink( const Link& rLink );
- Link GetDoneLink( ) const;
void SetDataAvailableLink( const Link& rLink );
sal_uInt32 GetErrorCode() const;
diff --git a/sfx2/inc/sfx2/frame.hxx b/sfx2/inc/sfx2/frame.hxx
index c6756dca6727..a76e6fad5ea6 100644
--- a/sfx2/inc/sfx2/frame.hxx
+++ b/sfx2/inc/sfx2/frame.hxx
@@ -195,7 +195,6 @@ public:
SAL_DLLPRIVATE void SetIsClosing_Impl();
// Methods for accessing the current set
- SAL_DLLPRIVATE void SetDescriptor( SfxFrameDescriptor* );
SAL_DLLPRIVATE SfxFrameDescriptor* GetDescriptor() const;
SAL_DLLPRIVATE void Lock_Impl( sal_Bool bLock );
@@ -213,7 +212,6 @@ public:
SAL_DLLPRIVATE void SetToolSpaceBorderPixel_Impl( const SvBorder& );
SAL_DLLPRIVATE Rectangle GetTopOuterRectPixel_Impl() const;
SAL_DLLPRIVATE void CreateWorkWindow_Impl();
- SAL_DLLPRIVATE void SetWorkWindow_Impl( SfxWorkWindow* pWorkwin );
SAL_DLLPRIVATE void GrabFocusOnComponent_Impl();
SAL_DLLPRIVATE void SetInPlace_Impl( sal_Bool );
diff --git a/sfx2/inc/sfx2/frmdescr.hxx b/sfx2/inc/sfx2/frmdescr.hxx
index abd12ad2a8c4..168a30202ffd 100644
--- a/sfx2/inc/sfx2/frmdescr.hxx
+++ b/sfx2/inc/sfx2/frmdescr.hxx
@@ -103,9 +103,6 @@ public:
SfxFrameDescriptor();
~SfxFrameDescriptor();
- // Properties
- void TakeProperties( const SfxFrameProperties& rProp );
-
// FileName/URL
SfxItemSet* GetArgs();
const INetURLObject& GetURL() const
diff --git a/sfx2/inc/sfx2/frmhtmlw.hxx b/sfx2/inc/sfx2/frmhtmlw.hxx
index 9521d6982fb6..a3ac30bfb562 100644
--- a/sfx2/inc/sfx2/frmhtmlw.hxx
+++ b/sfx2/inc/sfx2/frmhtmlw.hxx
@@ -75,9 +75,6 @@ public:
SvStream&, const String& rBaseURL, const com::sun::star::uno::Reference < com::sun::star::beans::XPropertySet >& xSet,
rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252,
String *pNonConvertableChars = 0 );
-
- String CreateURL( SfxFrame* pFrame );
-
};
inline void SfxFrameHTMLWriter::OutMeta( SvStream& rStrm,
diff --git a/sfx2/inc/sfx2/objsh.hxx b/sfx2/inc/sfx2/objsh.hxx
index 104a67743d86..d1c58e3e2523 100644
--- a/sfx2/inc/sfx2/objsh.hxx
+++ b/sfx2/inc/sfx2/objsh.hxx
@@ -455,7 +455,6 @@ public:
void SetAutoLoad( const INetURLObject&, sal_uInt32 nTime, sal_Bool bReload = sal_True );
sal_Bool IsAutoLoadLocked() const;
void NotifyReloadAvailable();
- sal_Bool IsSecure();
// Misc
sal_Bool IsPreview() const;
diff --git a/sfx2/inc/sfx2/unoctitm.hxx b/sfx2/inc/sfx2/unoctitm.hxx
index d1fcf169046b..fc08a76bf297 100644
--- a/sfx2/inc/sfx2/unoctitm.hxx
+++ b/sfx2/inc/sfx2/unoctitm.hxx
@@ -160,7 +160,6 @@ public:
void SetFrame(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame);
void SetMasterUnoCommand( sal_Bool bSet );
- sal_Bool IsMasterUnoCommand() const;
SfxDispatcher* GetDispatcher_Impl();
};
diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx
index ed4c98638440..0be0c5d79c81 100644
--- a/sfx2/source/appl/sfxpicklist.cxx
+++ b/sfx2/source/appl/sfxpicklist.cxx
@@ -307,16 +307,6 @@ void SfxPickList::ExecuteMenuEntry( sal_uInt16 nId )
ExecuteEntry( (sal_uInt32)( nId - START_ITEMID_PICKLIST ) );
}
-String SfxPickList::GetMenuEntryTitle( sal_uInt32 nIndex )
-{
- PickListEntry *pPick = SfxPickList::Get().GetPickListEntry( nIndex );
-
- if ( pPick )
- return pPick->aTitle;
- else
- return String();
-}
-
void SfxPickList::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
if ( rHint.IsA( TYPE( SfxStringHint )))
diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx
index be086d13190f..dcbefab87dd2 100644
--- a/sfx2/source/bastyp/frmhtmlw.cxx
+++ b/sfx2/source/bastyp/frmhtmlw.cxx
@@ -338,18 +338,4 @@ void SfxFrameHTMLWriter::Out_FrameDescriptor(
{
}
}
-
-String SfxFrameHTMLWriter::CreateURL( SfxFrame* pFrame )
-{
- String aRet;
- SfxObjectShell* pShell = pFrame->GetCurrentDocument();
- if( !aRet.Len() && pShell )
- {
- aRet = pShell->GetMedium()->GetName();
- }
-
- return aRet;
-}
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/control/macro.cxx b/sfx2/source/control/macro.cxx
index d14ac4b7790f..d3edf45f9408 100644
--- a/sfx2/source/control/macro.cxx
+++ b/sfx2/source/control/macro.cxx
@@ -443,7 +443,6 @@ void SfxMacro::Record
<SfxMacro::Replace(SfxMacroStatement*)>
<SfxMacro::Remove()>
- <SfxMacro::GetLastStatement()const>
*/
{
@@ -482,7 +481,6 @@ void SfxMacro::Replace
<SfxMacro::Record(SfxMacroStatement*)>
<SfxMacro::Remove()>
- <SfxMacro::GetLastStatement()const>
*/
{
@@ -519,7 +517,6 @@ void SfxMacro::Remove()
<SfxMacro::Replace(SfxMacroStatement*)>
<SfxMacro::Record(SfxMacroStatement*)>
- <SfxMacro::GetLastStatement()const>
*/
{
@@ -530,33 +527,6 @@ void SfxMacro::Remove()
//--------------------------------------------------------------------
-const SfxMacroStatement* SfxMacro::GetLastStatement() const
-
-/* [Description]
-
- This method enables read access to the last recorded statement.
- Together with the method <SfxMacro::Replace(SfxMacroStatement*)> this opens
- for the possibility to summarize statements.
-
- The call is only valid if it is about a SfxMacro, which was constructed
- with SFX_MACRO_RECORDINGRELATIVE or SFX_MACRO_RECORDINGABSOLUTE and is
- available as an already recorded statement.
-
- [Cross-reference]
-
- <SfxMacro::Record(SfxMacroStatement*)>
- <SfxMacro::Replace(SfxMacroStatement*)>
-*/
-
-{
- DBG_ASSERT( pImp->eMode != SFX_MACRO_EXISTING, "invalid call to non-recording SfxMacro" );
- if ( pImp->aList.Count() )
- return pImp->aList.GetObject( pImp->aList.Count() - 1 );
- return 0;
-}
-
-//--------------------------------------------------------------------
-
String SfxMacro::GenerateSource() const
/* [Description]
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index e512340443a3..752c8250f0bf 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -431,13 +431,6 @@ void SfxOfficeDispatch::SetMasterUnoCommand( sal_Bool bSet )
pControllerItem->setMasterSlaveCommand( bSet );
}
-sal_Bool SfxOfficeDispatch::IsMasterUnoCommand() const
-{
- if ( pControllerItem )
- return pControllerItem->isMasterSlaveCommand();
- return sal_False;
-}
-
// Determine if URL contains a master/slave command which must be handled a little bit different
sal_Bool SfxOfficeDispatch::IsMasterUnoCommand( const ::com::sun::star::util::URL& aURL )
{
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 184768eb2000..ddeadec0f765 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -775,12 +775,6 @@ sal_Bool SfxMedium::IsStorage()
}
//------------------------------------------------------------------
-Link SfxMedium::GetDoneLink() const
-{
- return pImp->aDoneLink.GetLink();
-}
-
-//------------------------------------------------------------------
sal_Bool SfxMedium::IsPreview_Impl()
{
sal_Bool bPreview = sal_False;
diff --git a/sfx2/source/doc/frmdescr.cxx b/sfx2/source/doc/frmdescr.cxx
index 1856a2cf9985..51057306d26b 100644
--- a/sfx2/source/doc/frmdescr.cxx
+++ b/sfx2/source/doc/frmdescr.cxx
@@ -183,21 +183,6 @@ long SfxFrameDescriptor::GetSize() const
return nWidth;
}
-void SfxFrameDescriptor::TakeProperties( const SfxFrameProperties& rProp )
-{
- aURL = aActualURL = INetURLObject(rProp.aURL);
- aName = rProp.aName;
- aMargin.Width() = rProp.lMarginWidth;
- aMargin.Height() = rProp.lMarginHeight;
- nWidth = rProp.lSize;
- eScroll = rProp.eScroll;
- eSizeSelector = rProp.eSizeSelector;
- nHasBorder = rProp.bHasBorder ? BORDER_YES : BORDER_NO;
- if ( rProp.bBorderSet )
- nHasBorder |= BORDER_SET;
- bResizeHorizontal = bResizeVertical = rProp.bResizable;
-}
-
void SfxFrameDescriptor::SetWallpaper( const Wallpaper& rWallpaper )
{
DELETEZ( pImp->pWallpaper );
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 2f12a8bfa790..30205131d1ac 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -1813,49 +1813,6 @@ sal_Bool SfxObjectShell::IsPreview() const
return bPreview;
}
-sal_Bool SfxObjectShell::IsSecure()
-{
- // When global warning is on, go to Secure-Referer-Liste
- String aReferer = GetMedium()->GetName();
- if ( !aReferer.Len() )
- {
- // for new documents use the template as reference
- ::rtl::OUString aTempl( getDocProperties()->getTemplateURL() );
- if ( aTempl.getLength() )
- aReferer = INetURLObject( aTempl ).GetMainURL( INetURLObject::NO_DECODE );
- }
-
- INetURLObject aURL( "macro:" );
- if ( !aReferer.Len() )
- // empty new or embedded document
- return sal_True;
-
- SvtSecurityOptions aOpt;
-
- if( aOpt.GetBasicMode() == eALWAYS_EXECUTE )
- return sal_True;
-
- if( aOpt.GetBasicMode() == eNEVER_EXECUTE )
- return sal_False;
-
- if ( aOpt.IsSecureURL( aURL.GetMainURL( INetURLObject::NO_DECODE ), aReferer ) )
- {
- if ( GetMedium()->GetContent().is() )
- {
- Any aAny( ::utl::UCBContentHelper::GetProperty( aURL.GetMainURL( INetURLObject::NO_DECODE ), String( RTL_CONSTASCII_USTRINGPARAM("IsProtected")) ) );
- sal_Bool bIsProtected = sal_False;
- if ( ( aAny >>= bIsProtected ) && bIsProtected )
- return sal_False;
- else
- return sal_True;
- }
- else
- return sal_True;
- }
- else
- return sal_False;
-}
-
void SfxObjectShell::SetWaitCursor( sal_Bool bSet ) const
{
for( SfxViewFrame* pFrame = SfxViewFrame::GetFirst( this ); pFrame; pFrame = SfxViewFrame::GetNext( *pFrame, this ) )
diff --git a/sfx2/source/inc/sfxpicklist.hxx b/sfx2/source/inc/sfxpicklist.hxx
index 855eb99f5b99..79909056302a 100644
--- a/sfx2/source/inc/sfxpicklist.hxx
+++ b/sfx2/source/inc/sfxpicklist.hxx
@@ -75,7 +75,6 @@ class SfxPickList : public SfxListener
void CreateMenuEntries( Menu* pMenu );
void ExecuteMenuEntry( sal_uInt16 nId );
void ExecuteEntry( sal_uInt32 nIndex );
- String GetMenuEntryTitle( sal_uInt32 nIndex );
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
};
diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx
index 7b429e5bcf58..cb0dc6912651 100644
--- a/sfx2/source/view/frame.cxx
+++ b/sfx2/source/view/frame.cxx
@@ -455,23 +455,6 @@ void SfxFrame::UpdateDescriptor( SfxObjectShell *pDoc )
//-------------------------------------------------------------------------
-void SfxFrame::SetDescriptor( SfxFrameDescriptor *pD )
-{
- DBG_ASSERT( pD, "No Descriptor!" );
- DBG_ASSERT( pD != pImp->pDescr, "Descriptor is already set!" );
-
- if ( pImp->pDescr )
- {
- // Only TopLevel-Frames handels their Descriptor, for the others
- // this is done by the Frameset
- if ( !pParentFrame )
- delete pImp->pDescr;
- }
- pImp->pDescr = pD;
-}
-
-//-------------------------------------------------------------------------
-
SfxFrameDescriptor* SfxFrame::GetDescriptor() const
{
// Create a FrameDescriptor On Demand; if there is no TopLevel-Frame
@@ -832,11 +815,6 @@ SfxWorkWindow* SfxFrame::GetWorkWindow_Impl() const
return NULL;
}
-void SfxFrame::SetWorkWindow_Impl( SfxWorkWindow* pWorkwin )
-{
- pImp->pWorkWin = pWorkwin;
-}
-
void SfxFrame::CreateWorkWindow_Impl()
{
SfxFrame* pFrame = this;
diff --git a/sfx2/source/view/frame2.cxx b/sfx2/source/view/frame2.cxx
index f7966fcdc1f3..54bbdfbfdb6e 100644
--- a/sfx2/source/view/frame2.cxx
+++ b/sfx2/source/view/frame2.cxx
@@ -88,7 +88,6 @@ public:
virtual void Resize();
virtual void GetFocus();
void DoResize();
- DECL_LINK( CloserHdl, void* );
};
SfxFrameWindow_Impl::SfxFrameWindow_Impl( SfxFrame* pF, Window& i_rContainerWindow )
@@ -394,16 +393,6 @@ void SfxFrame::LockResize_Impl( sal_Bool bLock )
pImp->bLockResize = bLock;
}
-IMPL_LINK( SfxFrameWindow_Impl, CloserHdl, void*, EMPTYARG )
-{
- if ( pFrame && !pFrame->PrepareClose_Impl( sal_True ) )
- return 0L;
-
- if ( pFrame )
- pFrame->GetCurrentViewFrame()->GetBindings().Execute( SID_CLOSEWIN, 0, 0, SFX_CALLMODE_ASYNCHRON );
- return 0L;
-}
-
void SfxFrame::SetMenuBarOn_Impl( sal_Bool bOn )
{
pImp->bMenuBarOn = bOn;