diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-08-18 20:36:06 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-08-19 09:30:43 +0100 |
commit | 7502d401de8a74b05ac7bcf0abab73ed87b53be6 (patch) | |
tree | 0b1ee96c3ac4b0c3e0cb7e2537a85716919b8724 | |
parent | 0c4c19aca64887e538229a712864ae1225b7efda (diff) |
regenerate list
-rw-r--r-- | lotuswordpro/source/filter/bencont.cxx | 6 | ||||
-rw-r--r-- | lotuswordpro/source/filter/bento.hxx | 1 | ||||
-rw-r--r-- | lotuswordpro/source/filter/lwpgrfobj.cxx | 37 | ||||
-rw-r--r-- | lotuswordpro/source/filter/lwpgrfobj.hxx | 1 | ||||
-rw-r--r-- | lotuswordpro/source/filter/lwpnumberingoverride.cxx | 30 | ||||
-rw-r--r-- | lotuswordpro/source/filter/lwpnumberingoverride.hxx | 3 | ||||
-rw-r--r-- | sfx2/inc/sfx2/tabdlg.hxx | 1 | ||||
-rw-r--r-- | sfx2/source/dialog/tabdlg.cxx | 19 | ||||
-rw-r--r-- | sfx2/source/inc/virtmenu.hxx | 2 | ||||
-rw-r--r-- | sfx2/source/menu/virtmenu.cxx | 15 | ||||
-rw-r--r-- | unusedcode.easy | 10 |
11 files changed, 1 insertions, 124 deletions
diff --git a/lotuswordpro/source/filter/bencont.cxx b/lotuswordpro/source/filter/bencont.cxx index f19535b361ca..e074e11e4200 100644 --- a/lotuswordpro/source/filter/bencont.cxx +++ b/lotuswordpro/source/filter/bencont.cxx @@ -171,12 +171,6 @@ LtcBenContainer::FindNextObjectWithProperty(pCBenObject pCurrObject, return NULL; } -pCBenObject -LtcBenContainer::FindObject(BenObjectID ObjectID) -{ - return (pCBenObject) FindID(&cObjects, ObjectID, NULL); -} - /** * Construction * @param Bento file stream pointer diff --git a/lotuswordpro/source/filter/bento.hxx b/lotuswordpro/source/filter/bento.hxx index f9715bf9628a..6f534d03051c 100644 --- a/lotuswordpro/source/filter/bento.hxx +++ b/lotuswordpro/source/filter/bento.hxx @@ -267,7 +267,6 @@ public: // Pass NULL to begin iteration. Done when returns NULL. // Objects are returned in order of increasing ID pCBenObject GetNextObject(pCBenObject pCurrObject); - pCBenObject FindObject(BenObjectID ObjectID); pCBenObject FindNextObjectWithProperty(pCBenObject pCurrObject, BenObjectID PropertyID); BenError BEN_EXPORT NewObject(pCBenObject * ppBenObject); diff --git a/lotuswordpro/source/filter/lwpgrfobj.cxx b/lotuswordpro/source/filter/lwpgrfobj.cxx index 6998e69e22ce..1c46c2ea9952 100644 --- a/lotuswordpro/source/filter/lwpgrfobj.cxx +++ b/lotuswordpro/source/filter/lwpgrfobj.cxx @@ -252,44 +252,7 @@ void LwpGraphicObject::XFConvert (XFContentContainer* pCont) } } -/** -* @short Get the rectangle of a chart -* @descr -* @param nLeft -* @param nTop -* @param nRight -* @param nBottom -*/ #include "lwpframelayout.hxx" -void LwpGraphicObject::GetRect(sal_Int32& nLeft, sal_Int32& nTop, sal_Int32& nRight, sal_Int32& nBottom) -{ - nLeft = nTop = nRight = nBottom = 0; - - LwpObjectID* pObjID = GetLayoutsWithMe()->GetOnlyLayout(); - if (pObjID) - { - LwpFrameLayout* pLayout = (LwpFrameLayout*)pObjID->obj(); - if (pLayout) - { - LwpLayoutGeometry* pGeometry =(LwpLayoutGeometry*) pLayout->GetGeometry(); - - if (pGeometry) - { - double fWidth =0; - double fHeight = 0; - GetGrafScaledSize(fWidth, fHeight); - - sal_Int32 nWidth = static_cast<sal_Int32>(fWidth * UNITS_PER_INCH /CM_PER_INCH); - sal_Int32 nHeight = static_cast<sal_Int32>(fHeight * UNITS_PER_INCH /CM_PER_INCH); - - nLeft = static_cast<sal_Int32>(pLayout->GetMarginsValue(MARGIN_LEFT) * UNITS_PER_INCH /CM_PER_INCH); - nTop = static_cast<sal_Int32>(pLayout->GetMarginsValue(MARGIN_TOP) * UNITS_PER_INCH /CM_PER_INCH); - nRight = nLeft+nWidth; - nBottom = nTop+nHeight; - } - } - } -} /** * @descr judge if the graphic format is what we can support: bmp, jpg, wmf, gif, tgf(tif). other format will be filtered to diff --git a/lotuswordpro/source/filter/lwpgrfobj.hxx b/lotuswordpro/source/filter/lwpgrfobj.hxx index a0dc6347e8bf..59e912d7c353 100644 --- a/lotuswordpro/source/filter/lwpgrfobj.hxx +++ b/lotuswordpro/source/filter/lwpgrfobj.hxx @@ -104,7 +104,6 @@ private: ImageProcessingData m_aIPData; - void GetRect(sal_Int32& nLeft, sal_Int32& nTop, sal_Int32& nRight, sal_Int32& nBottom); void XFConvertEquation(XFContentContainer* pCont); void ParseChart(IXFStream* pOutputStream); diff --git a/lotuswordpro/source/filter/lwpnumberingoverride.cxx b/lotuswordpro/source/filter/lwpnumberingoverride.cxx index a87ee781aeb7..78ae51d85057 100644 --- a/lotuswordpro/source/filter/lwpnumberingoverride.cxx +++ b/lotuswordpro/source/filter/lwpnumberingoverride.cxx @@ -98,34 +98,4 @@ void LwpNumberingOverride::OverrideLevel(sal_uInt16 nNewLv) LwpOverride::Override(NO_LEVEL, STATE_ON); } -void LwpNumberingOverride::OverridePosition(sal_uInt16 nNewPos) -{ - m_nPosition = nNewPos; - LwpOverride::Override(NO_POSITION, STATE_ON); -} - -void LwpNumberingOverride::OverrideHeading(sal_Bool bVal) -{ - if (bVal) - { - LwpOverride::Override(HEADING, STATE_ON); - } - else - { - LwpOverride::Override(HEADING, STATE_OFF); - } -} -void LwpNumberingOverride::OverrideSmartLevel(sal_Bool bVal) -{ - if (bVal) - { - LwpOverride::Override(SMARTLEVEL, STATE_ON); - } - else - { - LwpOverride::Override(SMARTLEVEL, STATE_OFF); - } -} -//end add - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/lwpnumberingoverride.hxx b/lotuswordpro/source/filter/lwpnumberingoverride.hxx index 4cb443f326f0..ee316e020f4e 100644 --- a/lotuswordpro/source/filter/lwpnumberingoverride.hxx +++ b/lotuswordpro/source/filter/lwpnumberingoverride.hxx @@ -92,9 +92,6 @@ public: inline sal_Bool IsSmartLevel(); void OverrideLevel(sal_uInt16 nNewLv); - void OverridePosition(sal_uInt16 nNewPos); - void OverrideHeading(sal_Bool bVal); - void OverrideSmartLevel(sal_Bool bVal); inline void RevertLevel(); inline void RevertPosition(); diff --git a/sfx2/inc/sfx2/tabdlg.hxx b/sfx2/inc/sfx2/tabdlg.hxx index fc240fc2f2eb..85bcb7a9babd 100644 --- a/sfx2/inc/sfx2/tabdlg.hxx +++ b/sfx2/inc/sfx2/tabdlg.hxx @@ -265,7 +265,6 @@ protected: sal_uInt16 GetWhich( sal_uInt16 nSlot, sal_Bool bDeep = sal_True ) const { return pSet->GetPool()->GetWhich( nSlot, bDeep ); } const SfxPoolItem* GetOldItem( const SfxItemSet& rSet, sal_uInt16 nSlot, sal_Bool bDeep = sal_True ); - const SfxPoolItem* GetExchangeItem( const SfxItemSet& rSet, sal_uInt16 nSlot ); SfxTabDialog* GetTabDialog() const { return pTabDlg; } void AddItemConnection( sfx::ItemConnectionBase* pConnection ); diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index e816322a0718..a91251f5d5a5 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -413,25 +413,6 @@ const SfxPoolItem* SfxTabPage::GetOldItem( const SfxItemSet& rSet, return pItem; } -// ----------------------------------------------------------------------- - -const SfxPoolItem* SfxTabPage::GetExchangeItem( const SfxItemSet& rSet, - sal_uInt16 nSlot ) - -/* [Description] - - This method returns an attribute for comparison of the old value. This way - it will be considered whether the dialogue has just been ended with OK. -*/ - -{ - if ( pTabDlg && !pTabDlg->IsInOK() && pTabDlg->GetExampleSet() ) - return GetItem( *pTabDlg->GetExampleSet(), nSlot ); - else - return GetOldItem( rSet, nSlot ); -} - - void SfxTabPage::PageCreated( SfxAllItemSet /*aSet*/ ) { DBG_ASSERT(0, "SfxTabPage::PageCreated should not be called"); diff --git a/sfx2/source/inc/virtmenu.hxx b/sfx2/source/inc/virtmenu.hxx index 3da800c37e60..cc7cb26ffdc4 100644 --- a/sfx2/source/inc/virtmenu.hxx +++ b/sfx2/source/inc/virtmenu.hxx @@ -99,8 +99,6 @@ public: void EnableItem( sal_uInt16 nItemId, sal_Bool bEnable ); void SetItemText( sal_uInt16 nItemId, const String& rText ); - sal_uInt16 GetItemPos( sal_uInt16 nItemId ) const; - sal_uInt16 GetItemCount() const; Menu* GetSVMenu() const; SfxMenuControl& operator[]( sal_uInt16 nPos ) const; diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx index 723f49000824..2da6e56e3271 100644 --- a/sfx2/source/menu/virtmenu.cxx +++ b/sfx2/source/menu/virtmenu.cxx @@ -1049,21 +1049,6 @@ Menu* SfxVirtualMenu::GetSVMenu() const //-------------------------------------------------------------------- -// return the position of the specified item - -sal_uInt16 SfxVirtualMenu::GetItemPos( sal_uInt16 nItemId ) const -{ - DBG_MEMTEST(); - DBG_CHKTHIS(SfxVirtualMenu, 0); - - for ( sal_uInt16 nPos = 0; nPos < nCount; ++nPos ) - if ( (pItems+nPos)->GetId() == nItemId ) - return nPos; - return MENU_ITEM_NOTFOUND; -} - -//-------------------------------------------------------------------- - // set the checkmark of the specified item void SfxVirtualMenu::CheckItem( sal_uInt16 nItemId, sal_Bool bCheck ) diff --git a/unusedcode.easy b/unusedcode.easy index 33762cd40529..099b29db973d 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -1027,7 +1027,6 @@ SfxTabDialog::GetApplyButton() const SfxTabDialog::GetApplyHandler() const SfxTabDialog::GetOutputItemSet(unsigned short) const SfxTabDialog::SfxTabDialog(Window*, ResId const&, unsigned short, SfxBindings&, unsigned char, String const*) -SfxTabPage::GetExchangeItem(SfxItemSet const&, unsigned short) SfxTabPage::SfxTabPage(Window*, long, SfxItemSet const&) SfxThesSubMenuControl::RegisterControl(unsigned short, SfxModule*) SfxToDoStack_Implarr_::Contains(SfxToDo_Impl const&) const @@ -2401,13 +2400,6 @@ binfilter::SwBookmarks::Insert(binfilter::SwBookmark* const*, unsigned short) binfilter::SwBookmarks::Insert(binfilter::SwBookmarks const*, unsigned short, unsigned short) binfilter::SwBookmarks::Remove(binfilter::SwBookmark* const&, unsigned short) binfilter::SwChartBoxes::DeleteAndDestroy(unsigned short, unsigned short) -binfilter::SwCurrShells::DeleteAndDestroy(unsigned short, unsigned short) -binfilter::SwCurrShells::Insert(binfilter::CurrShell* const&) -binfilter::SwCurrShells::Insert(binfilter::CurrShell* const&, unsigned short&) -binfilter::SwCurrShells::Insert(binfilter::CurrShell* const*, unsigned short) -binfilter::SwCurrShells::Insert(binfilter::SwCurrShells const*, unsigned short, unsigned short) -binfilter::SwCurrShells::Remove(binfilter::CurrShell* const&, unsigned short) -binfilter::SwCurrShells::Remove(unsigned short, unsigned short) binfilter::SwDependentFields::DeleteAndDestroy(unsigned short, unsigned short) binfilter::SwDestroyList::DeleteAndDestroy(unsigned short, unsigned short) binfilter::SwDestroyList::Insert(binfilter::SwDestroyList const*, unsigned short, unsigned short) @@ -3103,7 +3095,7 @@ oox::drawingml::GraphicProperties::assignUsed(oox::drawingml::GraphicProperties oox::drawingml::ShapeExport::GetXmlNamespace() const oox::drawingml::ShapeExport::SetXmlNamespace(int) oox::drawingml::TextBodyProperties::pushToPropMap(oox::PropertyMap&) const -oox::drawingml::TextParagraphProperties::dump() const +oox::drawingml::TextListStyle::dump() const oox::drawingml::Theme::getEffectStyle(int) const oox::drawingml::addMissingProperties(oox::PropertyMap const&, oox::PropertyMap&) oox::drawingml::chart::ObjectFormatter::convertAutomaticLine(oox::PropertySet&, oox::drawingml::chart::ObjectType, int) |