diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-08-18 00:56:28 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-08-18 09:16:28 +0100 |
commit | b48a6f14e5fff7ec8f2a9f9fcf49a035b7287c97 (patch) | |
tree | 6591bd060485537467558df50f14bb4ca2718e6d | |
parent | f0cb9d723ed4b561ec771abbb9f1888c66ba348e (diff) |
callcatcher: unused code
-rw-r--r-- | lotuswordpro/source/filter/bencont.cxx | 69 | ||||
-rw-r--r-- | lotuswordpro/source/filter/bento.hxx | 6 | ||||
-rw-r--r-- | lotuswordpro/source/filter/lwpgrfobj.cxx | 34 | ||||
-rw-r--r-- | lotuswordpro/source/filter/lwpgrfobj.hxx | 2 | ||||
-rw-r--r-- | lotuswordpro/source/filter/lwplayout.cxx | 36 | ||||
-rw-r--r-- | lotuswordpro/source/filter/lwplayout.hxx | 5 | ||||
-rw-r--r-- | lotuswordpro/source/filter/lwpnumberingoverride.cxx | 51 | ||||
-rw-r--r-- | lotuswordpro/source/filter/lwpnumberingoverride.hxx | 2 | ||||
-rw-r--r-- | lotuswordpro/source/filter/lwpobj.cxx | 6 | ||||
-rw-r--r-- | sfx2/inc/orgmgr.hxx | 1 | ||||
-rw-r--r-- | sfx2/inc/sfx2/objsh.hxx | 2 | ||||
-rw-r--r-- | sfx2/inc/sfx2/sfxstatuslistener.hxx | 2 | ||||
-rw-r--r-- | sfx2/inc/sorgitm.hxx | 1 | ||||
-rw-r--r-- | sfx2/source/control/sfxstatuslistener.cxx | 43 | ||||
-rw-r--r-- | sfx2/source/control/sorgitm.cxx | 11 | ||||
-rw-r--r-- | sfx2/source/doc/objmisc.cxx | 35 | ||||
-rw-r--r-- | sfx2/source/inc/virtmenu.hxx | 5 | ||||
-rw-r--r-- | sfx2/source/menu/virtmenu.cxx | 80 | ||||
-rw-r--r-- | sfx2/source/view/orgmgr.cxx | 7 | ||||
-rw-r--r-- | unusedcode.easy | 23 |
20 files changed, 0 insertions, 421 deletions
diff --git a/lotuswordpro/source/filter/bencont.cxx b/lotuswordpro/source/filter/bencont.cxx index 6a68f2c6f6e0..f19535b361ca 100644 --- a/lotuswordpro/source/filter/bencont.cxx +++ b/lotuswordpro/source/filter/bencont.cxx @@ -113,12 +113,6 @@ LtcBenContainer::Open() // delete two inputs return BenErr_OK; } -void -LtcBenContainer::Release() -{ - delete this; -} - BenError LtcBenContainer::RegisterPropertyName(const char * sPropertyName, pCBenPropertyName * ppPropertyName) @@ -148,34 +142,6 @@ LtcBenContainer::RegisterPropertyName(const char * sPropertyName, } BenError -LtcBenContainer::RegisterTypeName(const char * sTypeName, - pCBenTypeName * ppTypeName) -{ - pCBenNamedObjectListElmt pPrevNamedObjectListElmt; - pCBenNamedObject pNamedObject = FindNamedObject(&cNamedObjects, sTypeName, - &pPrevNamedObjectListElmt); - - if (pNamedObject != NULL) - { - if (! pNamedObject->IsTypeName()) - return BenErr_NameConflict; - else *ppTypeName = (pCBenTypeName) pNamedObject; - } - else - { - pCBenIDListElmt pPrevObject; - if (FindID(&cObjects, cNextAvailObjectID, &pPrevObject) != NULL) - return BenErr_DuplicateObjectID; - - *ppTypeName = new CBenTypeName(this, cNextAvailObjectID, - (pCBenObject) pPrevObject, sTypeName, pPrevNamedObjectListElmt); - ++cNextAvailObjectID; - } - - return BenErr_OK; -} - -BenError LtcBenContainer::NewObject(pCBenObject * ppBenObject) { pCBenIDListElmt pPrev; @@ -280,17 +246,6 @@ BenError LtcBenContainer::SeekFromEnd(long Offset) return BenErr_OK; } /** -* Get position in the bento file -* @date 07/05/2004 -* @param pointer of current position in container file from end -* @return BenError -*/ -BenError LtcBenContainer::GetPosition(BenContainerPos * pPosition) -{ - *pPosition = cpStream->Tell(); - return BenErr_OK; -} -/** * Find the next value stream with property name * @date 07/05/2004 * @param string of property name @@ -338,30 +293,6 @@ LtcUtBenValueStream * LtcBenContainer::FindValueStreamWithPropertyName(const cha return FindNextValueStreamWithPropertyName(sPropertyName, NULL); } /** -* Find the unique value stream with property name and Object ID -* @date 10/24/2005 -* @param object ID -* @param string of property name -* @return the only value stream pointer with the property names -*/ -LtcUtBenValueStream * LtcBenContainer::FindObjectValueStreamWithObjectIDAndProperty(BenObjectID ObjectID, const char * sPropertyName) -{ - CBenPropertyName * pPropertyName; - RegisterPropertyName(sPropertyName, &pPropertyName); // Get property name object - if (NULL == pPropertyName) - return NULL; // Property not exist - // Get current object - CBenObject * pObj = NULL; - pObj = FindObject(ObjectID); // Get object with object ID - if (NULL == pObj) - return NULL; - CBenValue * pValue; - LtcUtBenValueStream * pValueStream; - pValue = pObj->UseValue(pPropertyName->GetID()); - pValueStream = new LtcUtBenValueStream(pValue); - return pValueStream; -} -/** * <description> * @date 07/05/2004 * @param pointer to length of bento file diff --git a/lotuswordpro/source/filter/bento.hxx b/lotuswordpro/source/filter/bento.hxx index c870f0d3a9bb..f9715bf9628a 100644 --- a/lotuswordpro/source/filter/bento.hxx +++ b/lotuswordpro/source/filter/bento.hxx @@ -261,10 +261,7 @@ class LtcBenContainer { public: BenError Open(); - void Release(); // Deletes container object--last call BenError Close(); - BenError RegisterTypeName(const char * sTypeName, - pCBenTypeName * ppTypeName); BenError RegisterPropertyName(const char * sPropertyName, pCBenPropertyName * ppPropertyName); // Pass NULL to begin iteration. Done when returns NULL. @@ -285,8 +282,6 @@ public: // Internal methods BenError SeekToPosition(BenContainerPos Pos); BenError SeekFromEnd(long Offset); - BenError GetPosition(BenContainerPos * pPosition); - BenObjectID GetNextAvailObjectID() { return cNextAvailObjectID; } void SetNextAvailObjectID(BenObjectID ID) { cNextAvailObjectID = ID; } pCUtList GetObjects() { return &cObjects; } @@ -294,7 +289,6 @@ public: // Internal methods LtcUtBenValueStream * FindNextValueStreamWithPropertyName(const char * sPropertyName, LtcUtBenValueStream * pCurrentValueStream); LtcUtBenValueStream * FindValueStreamWithPropertyName(const char * sPropertyName); - LtcUtBenValueStream * FindObjectValueStreamWithObjectIDAndProperty(BenObjectID ObjectID, const char * sPropertyName); BenError CreateGraphicStream(SvStream * &pStream, const char *pObjectName); BenError GetSize(sal_uLong * pLength); diff --git a/lotuswordpro/source/filter/lwpgrfobj.cxx b/lotuswordpro/source/filter/lwpgrfobj.cxx index 04fba146d28a..6998e69e22ce 100644 --- a/lotuswordpro/source/filter/lwpgrfobj.cxx +++ b/lotuswordpro/source/filter/lwpgrfobj.cxx @@ -250,40 +250,6 @@ void LwpGraphicObject::XFConvert (XFContentContainer* pCont) { XFConvertEquation(pCont); } - if (m_sServerContextFormat[1]=='l'&&m_sServerContextFormat[2]=='c'&&m_sServerContextFormat[3]=='h') - { - //LwpSvStream* pDocStream = m_pStrm; - //LwpChartStreamTools::ParseChart(pDocStream, GetObjectID(), - // GetRectIn100thMM(), GetRectInCM(), pOutputStream); - //LwpChartStreamTools::ParseChart(pDocStream, GetObjectID(), - // GetRectIn100thMM(), GetRectInCM(), pCont, m_strStyleName); - } -} - -/** -* @short Get the rectangle of a chart in 100thMM -* @descr -* @return the rectangle of the chart -*/ -Rectangle LwpGraphicObject::GetRectIn100thMM() -{ -#define To100thMM(num) (long)(2540* (double(num)/(72 * 65536L))) - sal_Int32 nLeft,nTop,nRight,nBottom; - GetRect(nLeft,nTop,nRight,nBottom); - return Rectangle( To100thMM(nLeft),To100thMM(nTop),To100thMM(nRight),To100thMM(nBottom) ); -} - -/** -* @short Get the rectangle of a chart in CM -* @descr -* @return The rectangle of the chart -*/ -XFRect LwpGraphicObject::GetRectInCM() -{ -#define ToCM(num) (2.54*(double(num)/(72 * 65536L))) - sal_Int32 nLeft,nTop,nRight,nBottom; - GetRect(nLeft,nTop,nRight,nBottom); - return XFRect( ToCM(nLeft),ToCM(nTop),ToCM(nRight-nLeft),ToCM(nBottom-nTop) ); } /** diff --git a/lotuswordpro/source/filter/lwpgrfobj.hxx b/lotuswordpro/source/filter/lwpgrfobj.hxx index b5c3ef4cdeac..a0dc6347e8bf 100644 --- a/lotuswordpro/source/filter/lwpgrfobj.hxx +++ b/lotuswordpro/source/filter/lwpgrfobj.hxx @@ -105,8 +105,6 @@ private: ImageProcessingData m_aIPData; void GetRect(sal_Int32& nLeft, sal_Int32& nTop, sal_Int32& nRight, sal_Int32& nBottom); - XFRect GetRectInCM(); - Rectangle GetRectIn100thMM(); void XFConvertEquation(XFContentContainer* pCont); void ParseChart(IXFStream* pOutputStream); diff --git a/lotuswordpro/source/filter/lwplayout.cxx b/lotuswordpro/source/filter/lwplayout.cxx index 2bb90d7cccb2..4a4ebe9a5bcd 100644 --- a/lotuswordpro/source/filter/lwplayout.cxx +++ b/lotuswordpro/source/filter/lwplayout.cxx @@ -955,15 +955,6 @@ sal_uInt16 LwpMiddleLayout::GetScaleTile(void) return 0; } -void LwpMiddleLayout::SetScaleTile(sal_uInt16 nVal) -{ - m_nOverrideFlag |= OVER_SCALING; - if (nVal) - GetLayoutScale()->SetPlacement(GetLayoutScale()->GetPlacement() | LwpLayoutScale::TILED); - else - GetLayoutScale()->SetPlacement(GetLayoutScale()->GetPlacement() & ~LwpLayoutScale::TILED); -} - sal_uInt16 LwpMiddleLayout::GetScaleCenter(void) { if ((m_nOverrideFlag & OVER_SCALING) && m_LayScale.obj()) @@ -975,15 +966,6 @@ sal_uInt16 LwpMiddleLayout::GetScaleCenter(void) return 0; } -void LwpMiddleLayout::SetScaleCenter(sal_uInt16 nVal) -{ - m_nOverrideFlag |= OVER_SCALING; - if (nVal) - GetLayoutScale()->SetPlacement(GetLayoutScale()->GetPlacement() | LwpLayoutScale::CENTERED); - else - GetLayoutScale()->SetPlacement(GetLayoutScale()->GetPlacement() & ~LwpLayoutScale::CENTERED); -} - sal_uInt32 LwpMiddleLayout::GetScalePercentage(void) { if ((m_nOverrideFlag & OVER_SCALING) && m_LayScale.obj()) @@ -994,12 +976,6 @@ sal_uInt32 LwpMiddleLayout::GetScalePercentage(void) return 100; } -void LwpMiddleLayout::SetScalePercentage(sal_uInt32 nVal) -{ - m_nOverrideFlag |= OVER_SCALING; - GetLayoutScale()->SetScalePercentage(nVal*10); -} - double LwpMiddleLayout::GetScaleWidth(void) { if ((m_nOverrideFlag & OVER_SCALING) && m_LayScale.obj()) @@ -1010,12 +986,6 @@ double LwpMiddleLayout::GetScaleWidth(void) return 0; } -void LwpMiddleLayout::SetScaleWidth(double fVal) -{ - m_nOverrideFlag |= OVER_SCALING; - GetLayoutScale()->SetScaleWidth(LwpTools::ConvertToUnits(fVal)); -} - double LwpMiddleLayout::GetScaleHeight(void) { if ((m_nOverrideFlag & OVER_SCALING) && m_LayScale.obj()) @@ -1144,12 +1114,6 @@ LwpPoint LwpMiddleLayout::GetOrigin() return LwpPoint(); } -void LwpMiddleLayout::SetScaleHeight(double fVal) -{ - m_nOverrideFlag |= OVER_SCALING; - GetLayoutScale()->SetScaleHeight(LwpTools::ConvertToUnits(fVal)); -} - /** * @descr: Whether the fill is pattern fill or not * @return: True if yes, false if not. diff --git a/lotuswordpro/source/filter/lwplayout.hxx b/lotuswordpro/source/filter/lwplayout.hxx index 39f82e98d050..2ea81957856e 100644 --- a/lotuswordpro/source/filter/lwplayout.hxx +++ b/lotuswordpro/source/filter/lwplayout.hxx @@ -306,15 +306,10 @@ public: LwpLayoutScale* GetLayoutScale(){return dynamic_cast<LwpLayoutScale*>(m_LayScale.obj());} sal_uInt16 GetScaleMode(void); sal_uInt16 GetScaleTile(void); - void SetScaleTile(sal_uInt16 nVal); sal_uInt16 GetScaleCenter(void); - void SetScaleCenter(sal_uInt16 nVal); sal_uInt32 GetScalePercentage(void); - void SetScalePercentage(sal_uInt32 nVal); double GetScaleWidth(void); - void SetScaleWidth(double fVal); double GetScaleHeight(void); - void SetScaleHeight(double fVal); sal_Bool CanSizeRight(void); virtual double GetWidth(); diff --git a/lotuswordpro/source/filter/lwpnumberingoverride.cxx b/lotuswordpro/source/filter/lwpnumberingoverride.cxx index 47f3b9a8976c..a87ee781aeb7 100644 --- a/lotuswordpro/source/filter/lwpnumberingoverride.cxx +++ b/lotuswordpro/source/filter/lwpnumberingoverride.cxx @@ -92,57 +92,6 @@ void LwpNumberingOverride::Read(LwpObjectStream *pStrm) pStrm->SkipExtra(); } -void LwpNumberingOverride::Override(LwpNumberingOverride* pOther) -{ - if (m_nApply & NO_LEVEL) - { - if (IsLevelOverridden()) - { - pOther->OverrideLevel(m_nLevel); - } - else - { - pOther->RevertLevel(); - } - } - - if (m_nApply & NO_POSITION) - { - if (IsPositionOverridden()) - { - pOther->OverridePosition(m_nPosition); - } - else - { - pOther->RevertPosition(); - } - } - - if (m_nApply & HEADING) - { - if (IsHeadingOverridden()) - { - pOther->OverrideHeading(IsHeading()); - } - else - { - pOther->RevertHeading(); - } - } - - if (m_nApply & SMARTLEVEL) - { - if (IsSmartLevelOverridden()) - { - pOther->OverrideSmartLevel(IsSmartLevel()); - } - else - { - pOther->RevertSmartLevel(); - } - } -} - void LwpNumberingOverride::OverrideLevel(sal_uInt16 nNewLv) { m_nLevel = nNewLv; diff --git a/lotuswordpro/source/filter/lwpnumberingoverride.hxx b/lotuswordpro/source/filter/lwpnumberingoverride.hxx index 68749a12d0f6..4cb443f326f0 100644 --- a/lotuswordpro/source/filter/lwpnumberingoverride.hxx +++ b/lotuswordpro/source/filter/lwpnumberingoverride.hxx @@ -81,8 +81,6 @@ public: public: virtual void Read(LwpObjectStream *pStrm); - void Override(LwpNumberingOverride* pOther); - inline sal_uInt16 GetLevel() const; inline sal_uInt16 GetPosition() const; diff --git a/lotuswordpro/source/filter/lwpobj.cxx b/lotuswordpro/source/filter/lwpobj.cxx index b434f655e085..be52cda36c32 100644 --- a/lotuswordpro/source/filter/lwpobj.cxx +++ b/lotuswordpro/source/filter/lwpobj.cxx @@ -61,12 +61,6 @@ #include "lwpobj.hxx" /** - * @descr private contor to ensure only object constructed from stream - */ -LwpObject::LwpObject() - : m_pObjStrm(NULL), m_pFoundry(NULL), m_pStrm(NULL) -{} -/** * @descr construct lwpobject from stream */ LwpObject::LwpObject(LwpObjectHeader objHdr, LwpSvStream* pStrm) diff --git a/sfx2/inc/orgmgr.hxx b/sfx2/inc/orgmgr.hxx index da26a55f0921..d2fe396b6bf4 100644 --- a/sfx2/inc/orgmgr.hxx +++ b/sfx2/inc/orgmgr.hxx @@ -46,7 +46,6 @@ public: ~SfxObjectList(); const String& GetBaseName( sal_uInt16 nId ) const; - const String& GetFileName( sal_uInt16 nId ) const; }; class IntlWrapper; diff --git a/sfx2/inc/sfx2/objsh.hxx b/sfx2/inc/sfx2/objsh.hxx index 31890aa1d5e4..104a67743d86 100644 --- a/sfx2/inc/sfx2/objsh.hxx +++ b/sfx2/inc/sfx2/objsh.hxx @@ -282,7 +282,6 @@ public: sal_Bool IsInModalMode() const; sal_Bool IsInPrepareClose() const; virtual sal_Bool AcceptStateUpdate() const; - sal_Bool HasModalViews() const; sal_Bool IsHelpDocument() const; sal_Bool IsDocShared() const; @@ -454,7 +453,6 @@ public: sal_Bool IsLoading() const; sal_Bool IsLoadingFinished() const; void SetAutoLoad( const INetURLObject&, sal_uInt32 nTime, sal_Bool bReload = sal_True ); - void LockAutoLoad( sal_Bool bLock ); sal_Bool IsAutoLoadLocked() const; void NotifyReloadAvailable(); sal_Bool IsSecure(); diff --git a/sfx2/inc/sfx2/sfxstatuslistener.hxx b/sfx2/inc/sfx2/sfxstatuslistener.hxx index c8b709e2aeb5..2fa370e717b7 100644 --- a/sfx2/inc/sfx2/sfxstatuslistener.hxx +++ b/sfx2/inc/sfx2/sfxstatuslistener.hxx @@ -62,8 +62,6 @@ class SFX2_DLLPUBLIC SfxStatusListener : // old methods from SfxControllerItem sal_uInt16 GetId() const { return m_nSlotID; } - void Bind(); - void Bind( sal_uInt16 nSlotID, const rtl::OUString& rNewCommand ); void UnBind(); void ReBind(); diff --git a/sfx2/inc/sorgitm.hxx b/sfx2/inc/sorgitm.hxx index aedb2ab16ac8..a162bcc35ae4 100644 --- a/sfx2/inc/sorgitm.hxx +++ b/sfx2/inc/sorgitm.hxx @@ -40,7 +40,6 @@ private: public: TYPEINFO(); SfxScriptOrganizerItem(); - SfxScriptOrganizerItem( const String &rLanguage ); SfxScriptOrganizerItem( const SfxScriptOrganizerItem& ); virtual ~SfxScriptOrganizerItem(); diff --git a/sfx2/source/control/sfxstatuslistener.cxx b/sfx2/source/control/sfxstatuslistener.cxx index c40263f18cac..24bfb7d67306 100644 --- a/sfx2/source/control/sfxstatuslistener.cxx +++ b/sfx2/source/control/sfxstatuslistener.cxx @@ -85,49 +85,6 @@ void SfxStatusListener::StateChanged( sal_uInt16, SfxItemState, const SfxPoolIte // must be implemented by sub class } -void SfxStatusListener::Bind() -{ - if ( !m_xDispatch.is() && m_xDispatchProvider.is() ) - { - m_xDispatch = m_xDispatchProvider->queryDispatch( m_aCommand, rtl::OUString(), 0 ); - try - { - Reference< XStatusListener > aStatusListener( static_cast< OWeakObject* >( this ), UNO_QUERY ); - m_xDispatch->addStatusListener( aStatusListener, m_aCommand ); - } - catch( Exception& ) - { - } - } -} - -void SfxStatusListener::Bind( sal_uInt16 nSlotId, const rtl::OUString& rNewCommand ) -{ - // first remove old listener, if we have a dispatch object - Reference< XStatusListener > aStatusListener( static_cast< OWeakObject* >( this ), UNO_QUERY ); - if ( m_xDispatch.is() ) - m_xDispatch->removeStatusListener( aStatusListener, m_aCommand ); - if ( m_xDispatchProvider.is() ) - { - // Store new command data and query for new dispatch - m_nSlotID = nSlotId; - m_aCommand.Complete = rNewCommand; - Reference < XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer"))), UNO_QUERY ); - xTrans->parseStrict( m_aCommand ); - - m_xDispatch = m_xDispatchProvider->queryDispatch( m_aCommand, rtl::OUString(), 0 ); - - try - { - m_xDispatch->addStatusListener( aStatusListener, m_aCommand ); - } - catch( Exception& ) - { - } - } -} - void SfxStatusListener::UnBind() { if ( m_xDispatch.is() ) diff --git a/sfx2/source/control/sorgitm.cxx b/sfx2/source/control/sorgitm.cxx index 4bf146527839..65301b985f1a 100644 --- a/sfx2/source/control/sorgitm.cxx +++ b/sfx2/source/control/sorgitm.cxx @@ -46,17 +46,6 @@ SfxScriptOrganizerItem::SfxScriptOrganizerItem() : //------------------------------------------------------------------------ -SfxScriptOrganizerItem::SfxScriptOrganizerItem( const String& rLanguage ) : - - SfxStringItem( SID_SCRIPTORGANIZER, rLanguage ), - - aLanguage( rLanguage ) - -{ -} - -//------------------------------------------------------------------------ - SfxScriptOrganizerItem::SfxScriptOrganizerItem( const SfxScriptOrganizerItem& rItem ) : SfxStringItem( rItem ), diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index 14d87ac3df96..2f12a8bfa790 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -483,22 +483,6 @@ sal_Bool SfxObjectShell::AcceptStateUpdate() const //------------------------------------------------------------------------- -sal_Bool SfxObjectShell::HasModalViews() const -{ - SfxViewFrame* pFrame = SfxViewFrame::GetFirst( this ); - while( pFrame ) - { - if ( pFrame->IsInModalMode() ) - return sal_True; - - pFrame = SfxViewFrame::GetNext( *pFrame, this ); - } - - return sal_False; -} - -//------------------------------------------------------------------------- - void SfxObjectShell::SetMacroMode_Impl( sal_Bool bModal ) { if ( !pImp->bRunningMacro != !bModal ) @@ -1137,25 +1121,6 @@ void SfxObjectShell::PrepareReload( ) { } -//------------------------------------------------------------------------- - -void SfxObjectShell::LockAutoLoad( sal_Bool bLock ) - -/* [Description] - - Prevents an possible occuring autoload. Takes also FrameSet into account. - before the autoload. -*/ - -{ - if ( bLock ) - ++pImp->nAutoLoadLocks; - else - --pImp->nAutoLoadLocks; -} - -//------------------------------------------------------------------------- - // Can be moved to frame.cxx, when 358+36x-State have been merged sal_Bool SfxFrame::IsAutoLoadLocked_Impl() const diff --git a/sfx2/source/inc/virtmenu.hxx b/sfx2/source/inc/virtmenu.hxx index 3d3270d51a37..3da800c37e60 100644 --- a/sfx2/source/inc/virtmenu.hxx +++ b/sfx2/source/inc/virtmenu.hxx @@ -106,9 +106,6 @@ public: SfxMenuControl& operator[]( sal_uInt16 nPos ) const; sal_uInt16 GetItemId( sal_uInt16 nPos ) const; - SfxVirtualMenu* GetPopupMenu( sal_uInt16 nId ) const; - String GetItemText( sal_uInt16 nId ) const; - SfxVirtualMenu* GetParentMenu() const { return pParent; } void SetParentMenu( SfxVirtualMenu* pNewParent ) @@ -121,8 +118,6 @@ public: void InitializeHelp(); void SetResMgr(ResMgr* pMgr) {pResMgr = pMgr; } ResMgr* GetResMgr() { return pResMgr; } - void SetHelpIds( ResMgr* ); - void UpdateImages(); DECL_LINK( Select, Menu * ); }; diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx index e427b052b2b4..723f49000824 100644 --- a/sfx2/source/menu/virtmenu.cxx +++ b/sfx2/source/menu/virtmenu.cxx @@ -609,51 +609,6 @@ IMPL_LINK( SfxVirtualMenu, SettingsChanged, void*, EMPTYARG ) //-------------------------------------------------------------------- -void SfxVirtualMenu::UpdateImages() -{ - sal_Bool bIcons = Application::GetSettings().GetStyleSettings().GetUseImagesInMenus(); - - if ( bIcons ) - { - sal_uInt16 nItemCount = pSVMenu->GetItemCount(); - SfxViewFrame * pViewFrame = pBindings->GetDispatcher()->GetFrame(); - Reference<com::sun::star::frame::XFrame> xFrame( pViewFrame->GetFrame().GetFrameInterface() ); - - for ( sal_uInt16 nSVPos=0; nSVPos < nItemCount; ++nSVPos ) - { - sal_uInt16 nSlotId = pSVMenu->GetItemId( nSVPos ); - if ( pSVMenu->GetItemType( nSVPos ) == MENUITEM_STRINGIMAGE ) - { - if ( framework::AddonMenuManager::IsAddonMenuId( nSlotId )) - { - // Special code for Add-On menu items. They can appear inside the help menu. - rtl::OUString aCmd( pSVMenu->GetItemCommand( nSlotId ) ); - rtl::OUString aImageId; - - ::framework::MenuConfiguration::Attributes* pMenuAttributes = - (::framework::MenuConfiguration::Attributes*)pSVMenu->GetUserValue( nSlotId ); - - if ( pMenuAttributes ) - aImageId = pMenuAttributes->aImageId; // Retrieve image id from menu attributes - - pSVMenu->SetItemImage( nSlotId, RetrieveAddOnImage( xFrame, aImageId, aCmd, false )); - } - else - { - rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" )); - aSlotURL += rtl::OUString::valueOf( sal_Int32( nSlotId )); - pSVMenu->SetItemImage( nSlotId, GetImage( xFrame, aSlotURL, false )); - } - } - } - - if ( pImageControl ) - pImageControl->Update(); - } -} - -//-------------------------------------------------------------------- - void SfxVirtualMenu::UpdateImages( Menu* pMenu ) { if ( !pMenu ) @@ -1109,34 +1064,6 @@ sal_uInt16 SfxVirtualMenu::GetItemPos( sal_uInt16 nItemId ) const //-------------------------------------------------------------------- -// returns the popup-menu assigned to the item or 0 if none - -SfxVirtualMenu* SfxVirtualMenu::GetPopupMenu( sal_uInt16 nItemId ) const -{ - DBG_MEMTEST(); - DBG_CHKTHIS(SfxVirtualMenu, 0); - - sal_uInt16 nPos = GetItemPos(nItemId); - if ( nPos != MENU_ITEM_NOTFOUND ) - return (pItems+nPos)->GetPopupMenu(); - return 0; -} -//-------------------------------------------------------------------- - -// returns the text of the item as currently shown in the menu - -String SfxVirtualMenu::GetItemText( sal_uInt16 nSlotId ) const -{ - DBG_MEMTEST(); - DBG_CHKTHIS(SfxVirtualMenu, 0); - - sal_uInt16 nPos = GetItemPos(nSlotId); - if ( nPos != MENU_ITEM_NOTFOUND ) - return (pItems+nPos)->GetTitle(); - return String(); -} -//-------------------------------------------------------------------- - // set the checkmark of the specified item void SfxVirtualMenu::CheckItem( sal_uInt16 nItemId, sal_Bool bCheck ) @@ -1241,11 +1168,4 @@ void SfxVirtualMenu::InitializeHelp() bHelpInitialized = sal_True; } -typedef sal_uIntPtr (__LOADONCALLAPI *HelpIdFunc) ( const String& ); - -void SfxVirtualMenu::SetHelpIds( ResMgr *pRes ) -{ - pResMgr = pRes; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/view/orgmgr.cxx b/sfx2/source/view/orgmgr.cxx index b33684a4e6f4..c1015d225bfc 100644 --- a/sfx2/source/view/orgmgr.cxx +++ b/sfx2/source/view/orgmgr.cxx @@ -214,13 +214,6 @@ const String &SfxObjectList::GetBaseName(sal_uInt16 i) const //------------------------------------------------------------------------- -const String& SfxObjectList::GetFileName( sal_uInt16 i ) const -{ - return (*this)[i]->aFileName; -} - -//------------------------------------------------------------------------- - SfxOrganizeMgr::SfxOrganizeMgr( SfxOrganizeListBox_Impl *pLeft, SfxOrganizeListBox_Impl *pRight, SfxDocumentTemplates *pTempl) : diff --git a/unusedcode.easy b/unusedcode.easy index 125d038d00c8..863627d7d8d6 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -364,15 +364,6 @@ LwpDocument::GetMaxNumberOfPages() LwpDocument::ParseMasterDoc(IXFStream*) LwpFootnote::FindFootnoteTable() LwpFribTable::Parse(IXFStream*) -LwpGraphicObject::GetRectIn100thMM() -LwpGraphicObject::GetRectInCM() -LwpMiddleLayout::SetScaleCenter(unsigned short) -LwpMiddleLayout::SetScaleHeight(double) -LwpMiddleLayout::SetScalePercentage(unsigned int) -LwpMiddleLayout::SetScaleTile(unsigned short) -LwpMiddleLayout::SetScaleWidth(double) -LwpNumberingOverride::Override(LwpNumberingOverride*) -LwpObject::LwpObject() MSDffImportRecords::Insert(MSDffImportRecords const*, unsigned short, unsigned short) MSDffImportRecords::Insert(SvxMSDffImportRec* const&, unsigned short&) MSDffImportRecords::Insert(SvxMSDffImportRec* const*, unsigned short) @@ -458,10 +449,6 @@ OpenStormBento::CUtList::GetCount() OpenStormBento::CUtList::GetIndex(OpenStormBento::CUtListElmt*) OpenStormBento::CUtList::GetIndex(int) OpenStormBento::CUtList::GetPrevOrNULL(OpenStormBento::CUtListElmt*) -OpenStormBento::LtcBenContainer::FindObjectValueStreamWithObjectIDAndProperty(unsigned long, char const*) -OpenStormBento::LtcBenContainer::GetPosition(unsigned long*) -OpenStormBento::LtcBenContainer::RegisterTypeName(char const*, OpenStormBento::CBenTypeName**) -OpenStormBento::LtcBenContainer::Release() Outliner::Draw(OutputDevice*, Rectangle const&, Point const&) Outliner::EndSpelling() Outliner::GetAsianCompressionMode() const @@ -986,13 +973,10 @@ SfxModule::IsActive() const SfxModule::RegisterChildWindowContext(unsigned short, SfxChildWinContextFactory*) SfxModuleArr_Impl::DeleteAndDestroy(unsigned short, unsigned short) SfxNavigatorWrapper::GetChildWindowId() -SfxObjectList::GetFileName(unsigned short) const SfxObjectShell::Count() SfxObjectShell::CreateAndLoadObject(SfxItemSet const&, SfxFrame*) SfxObjectShell::DisconnectFromShared() -SfxObjectShell::HasModalViews() const SfxObjectShell::IsSecure() -SfxObjectShell::LockAutoLoad(unsigned char) SfxObjectShell::SetFlags(unsigned int) SfxObjectShell::SetTemplate(unsigned char) SfxObjectVerbsControl::RegisterControl(unsigned short, SfxModule*) @@ -1027,14 +1011,11 @@ SfxRecordingFloatWrapper_Impl::GetChildWindowId() SfxRectangleItem::SfxRectangleItem(unsigned short, SvStream&) SfxRequest::IsRecording() const SfxRequest::SetTarget(String const&) -SfxScriptOrganizerItem::SfxScriptOrganizerItem(String const&) SfxShell::GetBroadcaster() SfxShell::RemoveItem(unsigned short) SfxSingleTabDialog::GetInputRanges(SfxItemPool const&) SfxSizeItem::SfxSizeItem(unsigned short, SvStream&) SfxSlotPool::NextInterface() -SfxStatusListener::Bind() -SfxStatusListener::Bind(unsigned short, rtl::OUString const&) SfxStringListItem::Sort(unsigned char) SfxStyleSheet::SfxStyleSheet() SfxStyleSheetBasePool::GetStreamName() @@ -1078,10 +1059,6 @@ SfxViewFrame::Hide() SfxViewShell::PlugInsActive() const SfxViewShell::SetAdditionalPrintOptions(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) SfxViewShell::SetScrollingMode(SfxScrollingMode) -SfxVirtualMenu::GetItemText(unsigned short) const -SfxVirtualMenu::GetPopupMenu(unsigned short) const -SfxVirtualMenu::SetHelpIds(ResMgr*) -SfxVirtualMenu::UpdateImages() SfxWhichIter::LastWhich() Slider::SetRangeMax(long) Slider::SetRangeMin(long) |