diff options
-rw-r--r-- | editeng/inc/editeng/editview.hxx | 2 | ||||
-rw-r--r-- | editeng/source/editeng/editview.cxx | 17 | ||||
-rw-r--r-- | sc/source/filter/excel/xipivot.cxx | 5 | ||||
-rw-r--r-- | sc/source/filter/excel/xistyle.cxx | 13 | ||||
-rw-r--r-- | sc/source/filter/inc/xipivot.hxx | 2 | ||||
-rw-r--r-- | sc/source/filter/inc/xistyle.hxx | 3 | ||||
-rw-r--r-- | svx/inc/svx/svdobj.hxx | 3 | ||||
-rw-r--r-- | svx/source/svdraw/svdobj.cxx | 11 | ||||
-rw-r--r-- | sw/inc/doc.hxx | 4 | ||||
-rw-r--r-- | sw/source/core/doc/docchart.cxx | 5 | ||||
-rw-r--r-- | sw/source/core/inc/pagefrm.hxx | 16 | ||||
-rwxr-xr-x | sw/source/core/layout/paintfrm.cxx | 24 | ||||
-rw-r--r-- | sw/source/ui/config/optload.cxx | 8 | ||||
-rw-r--r-- | sw/source/ui/inc/optload.hxx | 1 | ||||
-rw-r--r-- | unusedcode.easy | 8 |
15 files changed, 3 insertions, 119 deletions
diff --git a/editeng/inc/editeng/editview.hxx b/editeng/inc/editeng/editview.hxx index 31f08248ff9c..887439ef3267 100644 --- a/editeng/inc/editeng/editview.hxx +++ b/editeng/inc/editeng/editview.hxx @@ -192,8 +192,6 @@ public: void SetAnchorMode( EVAnchorMode eMode ); EVAnchorMode GetAnchorMode() const; - sal_Bool MatchGroup(); - void CompleteAutoCorrect( Window* pFrameWin = NULL ); EESpellState StartSpeller( sal_Bool bMultipleDoc = sal_False ); diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx index 919e40ffd77b..c94738658e21 100644 --- a/editeng/source/editeng/editview.cxx +++ b/editeng/source/editeng/editview.cxx @@ -819,23 +819,6 @@ void EditView::TransliterateText( sal_Int32 nTransliterationMode ) } } - -sal_Bool EditView::MatchGroup() -{ - DBG_CHKTHIS( EditView, 0 ); - DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 ); - EditSelection aNewSel( PIMPEE->MatchGroup( pImpEditView->GetEditSelection() ) ); - if ( aNewSel.HasRange() ) - { - pImpEditView->DrawSelection(); - pImpEditView->SetEditSelection( aNewSel ); - pImpEditView->DrawSelection(); - ShowCursor(); - return sal_True; - } - return sal_False; -} - void EditView::CompleteAutoCorrect( Window* pFrameWin ) { DBG_CHKTHIS( EditView, 0 ); diff --git a/sc/source/filter/excel/xipivot.cxx b/sc/source/filter/excel/xipivot.cxx index 34b1c0c2ea6e..6eb9ee9e5039 100644 --- a/sc/source/filter/excel/xipivot.cxx +++ b/sc/source/filter/excel/xipivot.cxx @@ -907,11 +907,6 @@ const String* XclImpPTItem::GetItemName() const return 0; } -const String* XclImpPTItem::GetVisItemName() const -{ - return maItemInfo.HasVisName() ? maItemInfo.GetVisName() : GetItemName(); -} - void XclImpPTItem::ReadSxvi( XclImpStream& rStrm ) { rStrm >> maItemInfo; diff --git a/sc/source/filter/excel/xistyle.cxx b/sc/source/filter/excel/xistyle.cxx index 49d1b196c668..2ea78a36cd32 100644 --- a/sc/source/filter/excel/xistyle.cxx +++ b/sc/source/filter/excel/xistyle.cxx @@ -157,19 +157,6 @@ ColorData XclImpPalette::GetColorData( sal_uInt16 nXclIndex ) const return GetDefColorData( nXclIndex ); } -::com::sun::star::uno::Sequence< sal_Int32 > XclImpPalette::CreateColorSequence() const -{ - sal_Int32 nCount = static_cast< sal_Int32 >( maColorTable.size() ); - ::com::sun::star::uno::Sequence< sal_Int32 > aSeq( nCount ); - if( nCount > 0 ) - { - sal_Int32* pnSeqColor = aSeq.getArray(); - for( ColorDataVec::const_iterator aIt = maColorTable.begin(), aEnd = maColorTable.end(); aIt != aEnd; ++aIt, ++pnSeqColor ) - *pnSeqColor = static_cast< sal_Int32 >( *aIt ); - } - return aSeq; -} - void XclImpPalette::ReadPalette( XclImpStream& rStrm ) { sal_uInt16 nCount; diff --git a/sc/source/filter/inc/xipivot.hxx b/sc/source/filter/inc/xipivot.hxx index 8a8e6b7696dd..ee5d03b76b8a 100644 --- a/sc/source/filter/inc/xipivot.hxx +++ b/sc/source/filter/inc/xipivot.hxx @@ -225,8 +225,6 @@ public: /** Returns the internal name of the item or 0, if no name could be found. */ const String* GetItemName() const; - /** Returns the displayed name of the item or 0, if no name could be found. */ - const String* GetVisItemName() const; /** Reads an SXVI record containing data of this item. */ void ReadSxvi( XclImpStream& rStrm ); diff --git a/sc/source/filter/inc/xistyle.hxx b/sc/source/filter/inc/xistyle.hxx index 5c74d82ee295..eb31e44ae3af 100644 --- a/sc/source/filter/inc/xistyle.hxx +++ b/sc/source/filter/inc/xistyle.hxx @@ -69,9 +69,6 @@ public: @return The color from current or default palette or COL_AUTO, if nothing else found. */ inline Color GetColor( sal_uInt16 nXclIndex ) const { return Color( GetColorData( nXclIndex ) ); } - /** Returns the palette colors as UNO sequence. */ - ::com::sun::star::uno::Sequence< sal_Int32 > - CreateColorSequence() const; /** Reads a PALETTE record. */ void ReadPalette( XclImpStream& rStrm ); diff --git a/svx/inc/svx/svdobj.hxx b/svx/inc/svx/svdobj.hxx index 4cdf86cff43d..fba48bf59297 100644 --- a/svx/inc/svx/svdobj.hxx +++ b/svx/inc/svx/svdobj.hxx @@ -507,9 +507,6 @@ private: static SdrItemPool* mpGlobalItemPool; public: static SdrItemPool& GetGlobalDrawObjectItemPool(); -private: - SVX_DLLPRIVATE static void FreeGlobalDrawObjectItemPool(); - protected: void ImpDeleteUserData(); SdrObjUserData* ImpGetMacroUserData() const; diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index 99a877a24af4..e91ec3ef9145 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -526,17 +526,6 @@ SdrItemPool& SdrObject::GetGlobalDrawObjectItemPool() return *mpGlobalItemPool; } -void SdrObject::FreeGlobalDrawObjectItemPool() -{ - // code for deletion of GlobalItemPool - if(mpGlobalItemPool) - { - SfxItemPool* pGlobalOutlPool = mpGlobalItemPool->GetSecondaryPool(); - SfxItemPool::Free(mpGlobalItemPool); - SfxItemPool::Free(pGlobalOutlPool); - } -} - SdrItemPool* SdrObject::GetObjectItemPool() const { if(pModel) diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index 656b0b7eb8fe..6a03eb504dde 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -680,7 +680,7 @@ private: // Our own 'IdleTimer' calls the following method DECL_LINK( DoIdleJobs, Timer * ); // CharTimer calls this method. - DECL_LINK( DoUpdateAllCharts, Timer * ); + void DoUpdateAllCharts(); DECL_LINK( DoUpdateModifiedOLE, Timer * ); SwFmt *_MakeCharFmt(const String &, SwFmt *, sal_Bool, sal_Bool ); @@ -1679,7 +1679,7 @@ public: void UpdateCharts( const String &rName ) const; // Update all charts, for that exists any table. - void UpdateAllCharts() { DoUpdateAllCharts( 0 ); } + void UpdateAllCharts() { DoUpdateAllCharts(); } // Table is renamed and refreshes charts. void SetTableName( SwFrmFmt& rTblFmt, const String &rNewName ); diff --git a/sw/source/core/doc/docchart.cxx b/sw/source/core/doc/docchart.cxx index 09ce981100f9..6be1b50642bf 100644 --- a/sw/source/core/doc/docchart.cxx +++ b/sw/source/core/doc/docchart.cxx @@ -106,9 +106,7 @@ sal_Bool SwTable::IsTblComplexForChart( const String& rSelection, *pEndBox->GetSttNd(), pGetCLines ); } - - -IMPL_LINK( SwDoc, DoUpdateAllCharts, Timer *, EMPTYARG ) +void SwDoc::DoUpdateAllCharts() { ViewShell* pVSh; GetEditShell( &pVSh ); @@ -129,7 +127,6 @@ IMPL_LINK( SwDoc, DoUpdateAllCharts, Timer *, EMPTYARG ) } } } - return 0; } void SwDoc::_UpdateCharts( const SwTable& rTbl, ViewShell& rVSh ) const diff --git a/sw/source/core/inc/pagefrm.hxx b/sw/source/core/inc/pagefrm.hxx index 0550c0a172a3..1e16a980e627 100644 --- a/sw/source/core/inc/pagefrm.hxx +++ b/sw/source/core/inc/pagefrm.hxx @@ -120,22 +120,6 @@ class SwPageFrm: public SwFtnBossFrm bool bPaintRightShadow, bool bRightSidebar ); - /** adds the sidebar used for notes to right and left border - #i6193# - - @param aRect - input parameter - current rect, we change borders if we want a sidebar - - @param _pViewShell - input parameter - instance of the view shell, for which the rectangle - has to be generated. - - @param bPx - input parameter - if set to true, we add in pixel - */ - static void AddSidebarBorders( Rectangle& aRect, ViewShell* _pViewShell, bool bRight, bool bPx = false); - static void AddSidebarBorders( SwRect& aRect, ViewShell* _pViewShell, bool bRight, bool bPx = false); - protected: virtual void MakeAll(); virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ); diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index 0a452e40dcb1..8985a9b4f4e3 100755 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -5788,30 +5788,6 @@ SwRect SwPageFrm::GetBoundRect() const return aResult; } -/*static*/ void SwPageFrm::AddSidebarBorders(SwRect &aRect, ViewShell* _pViewShell, bool bRightSidebar, bool bPx) -{ - const SwPostItMgr *pMgr = _pViewShell ? _pViewShell->GetPostItMgr() : 0; - if (pMgr && pMgr->ShowNotes() && pMgr->HasNotes()) - { - if (!bRightSidebar) - aRect.SetLeftAndWidth(aRect.Left() - pMgr->GetSidebarWidth(bPx) - pMgr->GetSidebarBorderWidth(bPx), aRect.Width() + pMgr->GetSidebarWidth(bPx) + pMgr->GetSidebarBorderWidth(bPx)); - else - aRect.AddRight(pMgr->GetSidebarWidth(bPx) + pMgr->GetSidebarBorderWidth(bPx)); - } -} - -/*static*/ void SwPageFrm::AddSidebarBorders(Rectangle &aRect, ViewShell* _pViewShell, bool bRightSidebar, bool bPx) -{ - const SwPostItMgr *pMgr = _pViewShell ? _pViewShell->GetPostItMgr() : 0; - if (pMgr && pMgr->ShowNotes() && pMgr->HasNotes()) - { - if (!bRightSidebar) - aRect.Left() -= (pMgr->GetSidebarWidth(bPx) + pMgr->GetSidebarBorderWidth(bPx)); - else - aRect.Right() += pMgr->GetSidebarWidth(bPx) + pMgr->GetSidebarBorderWidth(bPx); - } -} - /*static*/ SwTwips SwPageFrm::GetSidebarBorderWidth( const ViewShell* _pViewShell ) { const SwPostItMgr* pPostItMgr = _pViewShell ? _pViewShell->GetPostItMgr() : 0; diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index 74dfbc5085d2..c95cf60d6d38 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -332,14 +332,6 @@ IMPL_LINK(SwLoadOptPage, MetricHdl, ListBox*, EMPTYARG) return 0; } -IMPL_LINK(SwLoadOptPage, CaptionHdl, PushButton*, EMPTYARG) -{ - SwCaptionOptDlg aDlg(this, GetItemSet()); - aDlg.Execute(); - - return 0; -} - SwCaptionOptDlg::SwCaptionOptDlg(Window* pParent, const SfxItemSet& rSet) : SfxSingleTabDialog(pParent, rSet, 0) { diff --git a/sw/source/ui/inc/optload.hxx b/sw/source/ui/inc/optload.hxx index 1c5d0bd4d5b0..490e0f45d52f 100644 --- a/sw/source/ui/inc/optload.hxx +++ b/sw/source/ui/inc/optload.hxx @@ -70,7 +70,6 @@ private: sal_uInt16 nLastTab; sal_Int32 nOldLinkMode; - DECL_LINK(CaptionHdl, PushButton*); DECL_LINK(MetricHdl, ListBox*); public: diff --git a/unusedcode.easy b/unusedcode.easy index 50f9025678ad..155724ad0d35 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -108,7 +108,6 @@ EECharAttribArray::Replace(EECharAttrib const&, unsigned short) EECharAttribArray::Replace(EECharAttrib const*, unsigned short, unsigned short) EECharAttribArray::_ForEach(unsigned short, unsigned short, unsigned char (*)(EECharAttrib const&, void*), void*) EditView::GetSelectionMode() const -EditView::MatchGroup() EditView::SetCursor(Cursor const&) EditView::SetParaAttribs(SfxItemSet const&, unsigned short) EditView::SetPointer(Pointer const&) @@ -554,7 +553,6 @@ SdrModel::HasTransparentObjects(bool) const SdrModel::IsAllowShapePropertyChangeListener() const SdrObjFactory::MakeNewObjUserData(unsigned int, unsigned short, SdrObject*) SdrObject::ClearObjectItem(unsigned short) -SdrObject::FreeGlobalDrawObjectItemPool() SdrOle2Obj::SdrOle2Obj(svt::EmbeddedObjectRef const&, String const&, bool) SdrOle2Obj::SdrOle2Obj(svt::EmbeddedObjectRef const&, bool) SdrPage::AddComment(sdr::Comment const&) @@ -1064,7 +1062,6 @@ SwDestroyList::Insert(SwDestroyList const*, unsigned short, unsigned short) SwDestroyList::Insert(SwSectionFrm* const&, unsigned short&) SwDestroyList::Insert(SwSectionFrm* const*, unsigned short) SwDestroyList::Remove(SwSectionFrm* const&, unsigned short) -SwDoc::LinkStubDoUpdateAllCharts(void*, void*) SwFilterDetect::impl_createFactory(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&) SwFldDataOnlyDlgWrapper::GetChildWindowId() SwFrameControlsManager::GetControls(FrameControlType) @@ -1090,7 +1087,6 @@ SwLRects::Insert(SwLRects const*, unsigned short, unsigned short, unsigned short SwLRects::Replace(SwLineRect const&, unsigned short) SwLRects::Replace(SwLineRect const*, unsigned short, unsigned short) SwLRects::_ForEach(unsigned short, unsigned short, unsigned char (*)(SwLineRect const&, void*), void*) -SwLoadOptPage::LinkStubCaptionHdl(void*, void*) SwMailMergeChildWindow::GetChildWindowId() SwModify::GetClientCount() const SwOutlineNodes::Insert(SwNode* const&, unsigned short&) @@ -1098,8 +1094,6 @@ SwOutlineNodes::Insert(SwNode* const*, unsigned short) SwOutlineNodes::Insert(SwOutlineNodes const*, unsigned short, unsigned short) SwPaM::LessThan(SwPaM const&, SwPaM const&) SwPaM::Overlap(SwPaM const&, SwPaM const&) -SwPageFrm::AddSidebarBorders(Rectangle&, ViewShell*, bool, bool) -SwPageFrm::AddSidebarBorders(SwRect&, ViewShell*, bool, bool) SwPosFlyFrms::DeleteAndDestroy(unsigned short, unsigned short) SwPosFlyFrms::Insert(SwPosFlyFrm* const&, unsigned short&) SwPosFlyFrms::Insert(SwPosFlyFrm* const*, unsigned short) @@ -1312,8 +1306,6 @@ XclExpFontBuffer::Insert(ScPatternAttr const&, short, XclExpColorType, bool) XclExpName::IsHidden() const XclExpPivotCache::GetFieldAcc(String const&) XclExpString::SetFormats(std::__debug::vector<XclFormatRun, std::allocator<XclFormatRun> > const&) -XclImpPTItem::GetVisItemName() const -XclImpPalette::CreateColorSequence() const XclObjId::XclObjId() XclObjId::XclObjId(short, unsigned short) XclRoot::GetDatabaseRanges() const |