diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2012-06-22 10:52:19 +0200 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2012-06-22 11:05:01 +0200 |
commit | 69419bcab3839ab22bf429d25eed836221130121 (patch) | |
tree | fe5b0035a3c7f050cd79110149e9728edabdf74e | |
parent | de48c99f7eefbf8910ca4835a6980f4ba532b2c0 (diff) |
Remove empty or non-called methods
empty:
ClearTip
implOnShapeInserted
ImpCopyMarkedPoints
ImpMakeDragAttr
ImpCopyMarkedPoints
ImpMakeDragAttr
ImpDelDragAttr
ImpMakeCreateAttr
Is1stLessThan2nd
LinkToListTemplate
NewCoreSelection
ScrollStart
ScrollEnd
SetNoOutlineNum
non-called:
NewCoreSelection
Change-Id: Ief273b741aaf49ff66c0dac898686e4def4de0c1
42 files changed, 0 insertions, 235 deletions
diff --git a/oovbaapi/ooo/vba/word/XStyle.idl b/oovbaapi/ooo/vba/word/XStyle.idl index c5b0ab5bb6ca..b66cbc74d9a2 100644 --- a/oovbaapi/ooo/vba/word/XStyle.idl +++ b/oovbaapi/ooo/vba/word/XStyle.idl @@ -51,8 +51,6 @@ interface XStyle [attribute] any BaseStyle; [attribute] any NextParagraphStyle; [attribute, readonly] long ListLevelNumber; - - void LinkToListTemplate( [in] XListTemplate ListTemplate, [in] any ListLevelNumber ); }; }; }; }; diff --git a/sc/source/ui/drawfunc/fudraw.cxx b/sc/source/ui/drawfunc/fudraw.cxx index 459790daa9c4..016f1cd4f1e6 100644 --- a/sc/source/ui/drawfunc/fudraw.cxx +++ b/sc/source/ui/drawfunc/fudraw.cxx @@ -675,28 +675,6 @@ void FuDraw::SelectionHasChanged() /************************************************************************* |* -|* Vor dem Scrollen Selektionsdarstellung ausblenden -|* -\************************************************************************/ - -void FuDraw::ScrollStart() -{ -// HideShownXor in Gridwin -} - -/************************************************************************* -|* -|* Nach dem Scrollen Selektionsdarstellung wieder anzeigen -|* -\************************************************************************/ - -void FuDraw::ScrollEnd() -{ -// ShowShownXor in Gridwin -} - -/************************************************************************* -|* |* Function aktivieren |* \************************************************************************/ diff --git a/sc/source/ui/drawfunc/fumark.cxx b/sc/source/ui/drawfunc/fumark.cxx index c900b1f97905..561a879ec037 100644 --- a/sc/source/ui/drawfunc/fumark.cxx +++ b/sc/source/ui/drawfunc/fumark.cxx @@ -212,26 +212,6 @@ sal_Bool FuMarkRect::KeyInput(const KeyEvent& rKEvt) /************************************************************************* |* -|* Vor dem Scrollen Selektionsdarstellung ausblenden -|* -\************************************************************************/ - -void FuMarkRect::ScrollStart() -{ -} - -/************************************************************************* -|* -|* Nach dem Scrollen Selektionsdarstellung wieder anzeigen -|* -\************************************************************************/ - -void FuMarkRect::ScrollEnd() -{ -} - -/************************************************************************* -|* |* Function aktivieren |* \************************************************************************/ diff --git a/sc/source/ui/drawfunc/fupoor.cxx b/sc/source/ui/drawfunc/fupoor.cxx index 7d0265104a63..e1e259f01a60 100644 --- a/sc/source/ui/drawfunc/fupoor.cxx +++ b/sc/source/ui/drawfunc/fupoor.cxx @@ -151,9 +151,7 @@ void FuPoor::ForceScroll(const Point& aPixPos) if ( dx != 0 || dy != 0 ) { - ScrollStart(); // Scrollaktion in abgeleiteter Klasse pViewShell->ScrollLines(2*dx, 4*dy); - ScrollEnd(); aScrollTimer.Start(); } } diff --git a/sc/source/ui/inc/fudraw.hxx b/sc/source/ui/inc/fudraw.hxx index c2820c5c0569..8dbd426a7f67 100644 --- a/sc/source/ui/inc/fudraw.hxx +++ b/sc/source/ui/inc/fudraw.hxx @@ -51,9 +51,6 @@ class FuDraw : public FuPoor virtual sal_Bool KeyInput(const KeyEvent& rKEvt); - virtual void ScrollStart(); - virtual void ScrollEnd(); - virtual void Activate(); virtual void Deactivate(); diff --git a/sc/source/ui/inc/fumark.hxx b/sc/source/ui/inc/fumark.hxx index 11afd3eee23e..47cef3f81266 100644 --- a/sc/source/ui/inc/fumark.hxx +++ b/sc/source/ui/inc/fumark.hxx @@ -46,9 +46,6 @@ class FuMarkRect : public FuPoor virtual sal_Bool KeyInput(const KeyEvent& rKEvt); - virtual void ScrollStart(); - virtual void ScrollEnd(); - virtual void Activate(); virtual void Deactivate(); diff --git a/sc/source/ui/inc/fupoor.hxx b/sc/source/ui/inc/fupoor.hxx index 71a20ec02683..cb713b1fb850 100644 --- a/sc/source/ui/inc/fupoor.hxx +++ b/sc/source/ui/inc/fupoor.hxx @@ -109,9 +109,6 @@ public: virtual void Activate(); // Function aktivieren virtual void Deactivate(); // Function deaktivieren - virtual void ScrollStart() {} // diese Funktionen werden von - virtual void ScrollEnd() {} // ForceScroll aufgerufen - void SetWindow(Window* pWin) { pWindow = pWin; } sal_uInt16 GetSlotID() const { return( aSfxRequest.GetSlot() ); } diff --git a/sc/source/ui/vba/vbasheetobjects.cxx b/sc/source/ui/vba/vbasheetobjects.cxx index 0277a203a7dc..76a7cdc6de18 100644 --- a/sc/source/ui/vba/vbasheetobjects.cxx +++ b/sc/source/ui/vba/vbasheetobjects.cxx @@ -131,8 +131,6 @@ protected: virtual OUString implGetShapeName( const uno::Reference< drawing::XShape >& rxShape ) const throw (uno::RuntimeException); /** Is called when a new UNO shape has been created but not yet inserted into the drawing page. */ virtual void implOnShapeCreated( const uno::Reference< drawing::XShape >& rxShape ) throw (uno::RuntimeException); - /** Is called when a new UNO shape has been inserted into the drawing page. */ - virtual void implOnShapeInserted( const uno::Reference< drawing::XShape >& rxShape ) throw (uno::RuntimeException); protected: uno::Reference< XHelperInterface > mxParent; @@ -189,7 +187,6 @@ sal_Int32 ScVbaObjectContainer::insertShape( const uno::Reference< drawing::XSha { mxShapes->add( rxShape ); maShapes.push_back( rxShape ); - implOnShapeInserted( rxShape ); return mxShapes->getCount() - 1; } @@ -253,10 +250,6 @@ void ScVbaObjectContainer::implOnShapeCreated( const uno::Reference< drawing::XS { } -void ScVbaObjectContainer::implOnShapeInserted( const uno::Reference< drawing::XShape >& /*rxShape*/ ) throw (uno::RuntimeException) -{ -} - // ============================================================================ class ScVbaObjectEnumeration : public SimpleEnumerationBase diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx index 68d7418485ed..daa3b61c169a 100644 --- a/sd/source/ui/func/fudraw.cxx +++ b/sd/source/ui/func/fudraw.cxx @@ -534,26 +534,6 @@ sal_Bool FuDraw::KeyInput(const KeyEvent& rKEvt) /************************************************************************* |* -|* Fade out the selection-presentation before scrolling -|* -\************************************************************************/ - -void FuDraw::ScrollStart() -{ -} - -/************************************************************************* -|* -|* After scrolling show the selection-presentation again -|* -\************************************************************************/ - -void FuDraw::ScrollEnd() -{ -} - -/************************************************************************* -|* |* Aktivate function |* \************************************************************************/ diff --git a/sd/source/ui/func/fuoutl.cxx b/sd/source/ui/func/fuoutl.cxx index 76eb960a4e1e..a02bf5f9c887 100644 --- a/sd/source/ui/func/fuoutl.cxx +++ b/sd/source/ui/func/fuoutl.cxx @@ -68,15 +68,6 @@ sal_Bool FuOutline::Command(const CommandEvent& rCEvt) return bResult; } -void FuOutline::ScrollStart() -{ -} - -void FuOutline::ScrollEnd() -{ -} - - } // end of namespace sd /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/func/fupoor.cxx b/sd/source/ui/func/fupoor.cxx index 4f1dc007ba20..7e468ecb265b 100644 --- a/sd/source/ui/func/fupoor.cxx +++ b/sd/source/ui/func/fupoor.cxx @@ -199,9 +199,7 @@ void FuPoor::ForceScroll(const Point& aPixPos) if (bScrollable) { // Scrollaktion in abgeleiteter Klasse - ScrollStart(); mpViewShell->ScrollLines(dx, dy); - ScrollEnd(); aScrollTimer.Start(); } else if (! bDelayActive) StartDelayToScrollTimer (); @@ -830,9 +828,7 @@ sal_Bool FuPoor::KeyInput(const KeyEvent& rKEvt) else { // Seite scrollen - ScrollStart(); mpViewShell->ScrollLines(nX, nY); - ScrollEnd(); } bReturn = sal_True; diff --git a/sd/source/ui/inc/fudraw.hxx b/sd/source/ui/inc/fudraw.hxx index 4c38a96e5833..acc9aff35943 100644 --- a/sd/source/ui/inc/fudraw.hxx +++ b/sd/source/ui/inc/fudraw.hxx @@ -46,9 +46,6 @@ public: virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); virtual sal_Bool RequestHelp(const HelpEvent& rHEvt); - virtual void ScrollStart(); - virtual void ScrollEnd(); - virtual void Activate(); virtual void Deactivate(); diff --git a/sd/source/ui/inc/fuoutl.hxx b/sd/source/ui/inc/fuoutl.hxx index 9dd9528e61f7..47c67a5134f0 100644 --- a/sd/source/ui/inc/fuoutl.hxx +++ b/sd/source/ui/inc/fuoutl.hxx @@ -48,9 +48,6 @@ public: virtual sal_Bool Command(const CommandEvent& rCEvt); - virtual void ScrollStart(); - virtual void ScrollEnd(); - protected: FuOutline ( ViewShell* pViewShell, diff --git a/sd/source/ui/inc/fupoor.hxx b/sd/source/ui/inc/fupoor.hxx index b77ec9ca239a..8d85bb8225ef 100644 --- a/sd/source/ui/inc/fupoor.hxx +++ b/sd/source/ui/inc/fupoor.hxx @@ -92,9 +92,6 @@ public: virtual void Activate(); // Function aktivieren virtual void Deactivate(); // Function deaktivieren - virtual void ScrollStart() {} // diese Funktionen werden von - virtual void ScrollEnd() {} // ForceScroll aufgerufen - void SetWindow(::sd::Window* pWin) { mpWindow = pWin; } virtual void SelectionHasChanged(); diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx index 0d3fc63bd1f3..82e02cc57039 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx @@ -664,20 +664,6 @@ void SelectionFunction::Deactivate() -void SelectionFunction::ScrollStart (void) -{ -} - - - - -void SelectionFunction::ScrollEnd (void) -{ -} - - - - void SelectionFunction::DoCut (void) { if ( ! mrSlideSorter.GetProperties()->IsUIReadOnly()) diff --git a/sd/source/ui/slidesorter/controller/SlsSlideFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSlideFunction.cxx index 54155a2dee8d..88550135f9e0 100644 --- a/sd/source/ui/slidesorter/controller/SlsSlideFunction.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlideFunction.cxx @@ -43,14 +43,6 @@ SlideFunction::SlideFunction ( { } -void SlideFunction::ScrollStart (void) -{ -} - -void SlideFunction::ScrollEnd (void) -{ -} - sal_Bool SlideFunction::MouseMove(const MouseEvent& ) { return sal_False; diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx index 9d77f1a89cef..4c15dc45caf6 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx @@ -69,9 +69,6 @@ public: virtual void Activate(); virtual void Deactivate(); - virtual void ScrollStart(); - virtual void ScrollEnd(); - /// Forward to the clipboard manager. virtual void DoCut (void); diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSlideFunction.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSlideFunction.hxx index 29b97cb05aaf..93414f3374e0 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsSlideFunction.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsSlideFunction.hxx @@ -46,14 +46,6 @@ public: virtual sal_Bool MouseButtonUp (const MouseEvent& rMEvt); virtual sal_Bool MouseButtonDown (const MouseEvent& rMEvt); - /** Called from ForceScroll() before the actual scrolling. - */ - virtual void ScrollStart (void); - - /** Called from ForceScroll() after the actual scrolling. - */ - virtual void ScrollEnd (void); - protected: SlideFunction ( SlideSorter& rSlideSorter, diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index 61942aba5ac5..bcf57130f930 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -1218,11 +1218,7 @@ void ViewShell::ExecReq( SfxRequest& rReq ) { FunctionReference xFunc( GetCurrentFunction() ); if( xFunc.is() ) - { - xFunc->ScrollStart(); ScrollLines( 0, -1 ); - xFunc->ScrollEnd(); - } rReq.Done(); } diff --git a/svx/inc/svx/svdcrtv.hxx b/svx/inc/svx/svdcrtv.hxx index 0215f800d1f0..89525c732d31 100644 --- a/svx/inc/svx/svdcrtv.hxx +++ b/svx/inc/svx/svdcrtv.hxx @@ -86,7 +86,6 @@ protected: private: SVX_DLLPRIVATE void ImpClearVars(); - SVX_DLLPRIVATE void ImpMakeCreateAttr(); protected: sal_Bool ImpBegCreateObj(sal_uInt32 nInvent, sal_uInt16 nIdent, const Point& rPnt, OutputDevice* pOut, diff --git a/svx/inc/svx/svddrgv.hxx b/svx/inc/svx/svddrgv.hxx index 731161bea2a3..3bcecf9f65df 100644 --- a/svx/inc/svx/svddrgv.hxx +++ b/svx/inc/svx/svddrgv.hxx @@ -95,8 +95,6 @@ protected: private: SVX_DLLPRIVATE void ImpClearVars(); - SVX_DLLPRIVATE void ImpMakeDragAttr(); - SVX_DLLPRIVATE void ImpDelDragAttr(); protected: virtual void SetMarkHandles(); diff --git a/svx/inc/svx/svdetc.hxx b/svx/inc/svx/svdetc.hxx index 3bd50f4485cb..51b3e5dc29c2 100644 --- a/svx/inc/svx/svdetc.hxx +++ b/svx/inc/svx/svdetc.hxx @@ -151,11 +151,6 @@ public: protected: ~ContainerSorter() {} - -private: // damit keiner vergessen wird -virtual - void - Is1stLessThan2nd(const void* pElem1, const void* pElem2) const; }; //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/svx/inc/svx/svdpoev.hxx b/svx/inc/svx/svdpoev.hxx index 6d6305ae8e82..0722083e5283 100644 --- a/svx/inc/svx/svdpoev.hxx +++ b/svx/inc/svx/svdpoev.hxx @@ -64,9 +64,6 @@ private: SVX_DLLPRIVATE void ImpResetPolyPossibilityFlags(); SVX_DLLPRIVATE void ImpCheckPolyPossibilities(); - // Markierte Punkte kopieren und anstelle der alten markieren - // ist noch nicht implementiert! - SVX_DLLPRIVATE void ImpCopyMarkedPoints(); typedef void (*PPolyTrFunc)(Point&, Point*, Point*, const void*, const void*, const void*, const void*, const void*); SVX_DLLPRIVATE void ImpTransformMarkedPoints(PPolyTrFunc pTrFunc, const void* p1=NULL, const void* p2=NULL, const void* p3=NULL, const void* p4=NULL, const void* p5=NULL); diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx index 6ea7cac6faed..8ea566fa592d 100644 --- a/svx/source/svdraw/svdcrtv.cxx +++ b/svx/source/svdraw/svdcrtv.cxx @@ -215,17 +215,12 @@ void SdrCreateView::ImpClearVars() ImpClearConnectMarker(); } -void SdrCreateView::ImpMakeCreateAttr() -{ -} - SdrCreateView::SdrCreateView(SdrModel* pModel1, OutputDevice* pOut) : SdrDragView(pModel1,pOut), mpCoMaOverlay(0L), mpCreateViewExtraData(new ImpSdrCreateViewExtraData()) { ImpClearVars(); - ImpMakeCreateAttr(); } SdrCreateView::~SdrCreateView() diff --git a/svx/source/svdraw/svddrgv.cxx b/svx/source/svdraw/svddrgv.cxx index 0baddd30db0d..44f79a212208 100644 --- a/svx/source/svdraw/svddrgv.cxx +++ b/svx/source/svdraw/svddrgv.cxx @@ -91,25 +91,14 @@ void SdrDragView::ImpClearVars() mbSolidDragging = getOptionsDrawinglayer().IsSolidDragCreate(); } -void SdrDragView::ImpMakeDragAttr() -{ - ImpDelDragAttr(); -} - SdrDragView::SdrDragView(SdrModel* pModel1, OutputDevice* pOut) : SdrExchangeView(pModel1,pOut) { ImpClearVars(); - ImpMakeDragAttr(); } SdrDragView::~SdrDragView() { - ImpDelDragAttr(); -} - -void SdrDragView::ImpDelDragAttr() -{ } sal_Bool SdrDragView::IsAction() const diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx index c561e82f5895..7383a236c254 100644 --- a/svx/source/svdraw/svdetc.cxx +++ b/svx/source/svdraw/svdetc.cxx @@ -241,10 +241,6 @@ void ContainerSorter::DoSort(sal_uIntPtr a, sal_uIntPtr b) const if (a<b) ImpSubSort(a,b); } -void ContainerSorter::Is1stLessThan2nd(const void* /*pElem1*/, const void* /*pElem2*/) const -{ -} - void ContainerSorter::ImpSubSort(long nL, long nR) const { long i,j; diff --git a/svx/source/svdraw/svdpoev.cxx b/svx/source/svdraw/svdpoev.cxx index cb132453be31..db899bde6f52 100644 --- a/svx/source/svdraw/svdpoev.cxx +++ b/svx/source/svdraw/svdpoev.cxx @@ -587,12 +587,6 @@ void SdrPolyEditView::CloseMarkedObjects(sal_Bool bToggle, sal_Bool bOpen) //////////////////////////////////////////////////////////////////////////////////////////////////// -void SdrPolyEditView::ImpCopyMarkedPoints() -{ -} - -//////////////////////////////////////////////////////////////////////////////////////////////////// - void SdrPolyEditView::ImpTransformMarkedPoints(PPolyTrFunc pTrFunc, const void* p1, const void* p2, const void* p3, const void* p4, const void* p5) { const bool bUndo = IsUndoEnabled(); @@ -682,7 +676,6 @@ void SdrPolyEditView::MoveMarkedPoints(const Size& rSiz, bool bCopy) XubString aStr(ImpGetResStr(STR_EditMove)); if (bCopy) aStr+=ImpGetResStr(STR_EditWithCopy); BegUndo(aStr,GetDescriptionOfMarkedPoints(),SDRREPFUNC_OBJ_MOVE); - if (bCopy) ImpCopyMarkedPoints(); ImpTransformMarkedPoints(ImpMove,&rSiz); EndUndo(); AdjustMarkHdl(); @@ -704,7 +697,6 @@ void SdrPolyEditView::ResizeMarkedPoints(const Point& rRef, const Fraction& xFac XubString aStr(ImpGetResStr(STR_EditResize)); if (bCopy) aStr+=ImpGetResStr(STR_EditWithCopy); BegUndo(aStr,GetDescriptionOfMarkedPoints(),SDRREPFUNC_OBJ_RESIZE); - if (bCopy) ImpCopyMarkedPoints(); ImpTransformMarkedPoints(ImpResize,&rRef,&xFact,&yFact); EndUndo(); AdjustMarkHdl(); @@ -726,7 +718,6 @@ void SdrPolyEditView::RotateMarkedPoints(const Point& rRef, long nWink, bool bCo XubString aStr(ImpGetResStr(STR_EditResize)); if (bCopy) aStr+=ImpGetResStr(STR_EditWithCopy); BegUndo(aStr,GetDescriptionOfMarkedPoints(),SDRREPFUNC_OBJ_ROTATE); - if (bCopy) ImpCopyMarkedPoints(); double nSin=sin(nWink*nPi180); double nCos=cos(nWink*nPi180); ImpTransformMarkedPoints(ImpRotate,&rRef,&nWink,&nSin,&nCos); diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx index fa2b287750be..b3efdfcb69ba 100644 --- a/sw/inc/crsrsh.hxx +++ b/sw/inc/crsrsh.hxx @@ -798,10 +798,6 @@ public: void ClearTblBoxCntnt(); sal_Bool EndAllTblBoxEdit(); - // gets called when a table selection gets created in UpdateCrsr without - // the UI knowing of it - virtual void NewCoreSelection(); - void SetSelTblCells( sal_Bool bFlag ) { bSelTblCells = bFlag; } sal_Bool IsSelTblCells() const { return bSelTblCells; } diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx index 751f63840c8a..5bfbb721cac2 100644 --- a/sw/inc/shellio.hxx +++ b/sw/inc/shellio.hxx @@ -240,7 +240,6 @@ public: SwgReaderOption& GetReaderOpt() { return aOpt; } virtual void SetFltName( const String& rFltNm ); - static void SetNoOutlineNum( SwDoc& rDoc ); // Adapt item-set of a Frm-Format to the old format. static void ResetFrmFmtAttrs( SfxItemSet &rFrmSet ); diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx index dfd80d97e6db..310e27185a80 100644 --- a/sw/source/core/crsr/crsrsh.cxx +++ b/sw/source/core/crsr/crsrsh.cxx @@ -2911,11 +2911,6 @@ sal_Bool SwCrsrShell::FindValidCntntNode( sal_Bool bOnlyText ) } -void SwCrsrShell::NewCoreSelection() -{ -} - - sal_Bool SwCrsrShell::IsCrsrReadonly() const { if ( GetViewOptions()->IsReadonly() || diff --git a/sw/source/filter/ascii/parasc.cxx b/sw/source/filter/ascii/parasc.cxx index ce04e49a3417..1dea0d1b18f1 100644 --- a/sw/source/filter/ascii/parasc.cxx +++ b/sw/source/filter/ascii/parasc.cxx @@ -86,11 +86,6 @@ sal_uLong AsciiReader::Read( SwDoc &rDoc, const String&, SwPaM &rPam, const Stri return ERR_SWG_READ_ERROR; } - // All headers normally do not have a chapter number. - // We explicitly disable them here, because the default is set back to on. - if( !bInsertMode ) - Reader::SetNoOutlineNum( rDoc ); - SwASCIIParser* pParser = new SwASCIIParser( &rDoc, rPam, *pStrm, !bInsertMode, aOpt.GetASCIIOpts() ); sal_uLong nRet = pParser->CallParser(); diff --git a/sw/source/filter/basflt/shellio.cxx b/sw/source/filter/basflt/shellio.cxx index 72eeeb3bc2c1..c6132fd677f0 100644 --- a/sw/source/filter/basflt/shellio.cxx +++ b/sw/source/filter/basflt/shellio.cxx @@ -640,12 +640,6 @@ void Reader::SetFltName( const String& ) } -void Reader::SetNoOutlineNum( SwDoc& /*rDoc*/ ) -{ - // jetzt wieder keine Nummerierung in den Vorlagen -} - - void Reader::ResetFrmFmtAttrs( SfxItemSet &rFrmSet ) { rFrmSet.Put( SvxLRSpaceItem(RES_LR_SPACE) ); diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index 166ad70f8347..a21d97616808 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -213,7 +213,6 @@ sal_uLong HTMLReader::Read( SwDoc &rDoc, const String& rBaseURL, SwPaM &rPam, co if( !bInsertMode ) { - Reader::SetNoOutlineNum( rDoc ); Reader::ResetFrmFmts( rDoc ); // Die HTML-Seitenvorlage setzen, wenn des kein HTML-Dokument ist, diff --git a/sw/source/filter/rtf/swparrtf.cxx b/sw/source/filter/rtf/swparrtf.cxx index 5c76ed20333b..9404a101ca79 100644 --- a/sw/source/filter/rtf/swparrtf.cxx +++ b/sw/source/filter/rtf/swparrtf.cxx @@ -179,13 +179,8 @@ sal_uLong RtfReader::Read( SwDoc &rDoc, const String& rBaseURL, SwPaM &rPam, con return ERR_SWG_READ_ERROR; } - // Alle Ueberschriften sind normalerweise ohne - // Kapitelnummer. Darum hier explizit abschalten - // weil das Default jetzt wieder auf AN ist. if( !bInsertMode ) { - Reader::SetNoOutlineNum( rDoc ); - // MIB 27.09.96: Umrandung uns Abstaende aus Frm-Vorlagen entf. Reader::ResetFrmFmts( rDoc ); } diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index bb4a8d47800d..fd22df1efccc 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -5524,11 +5524,8 @@ sal_uLong WW8Reader::Read(SwDoc &rDoc, const String& rBaseURL, SwPaM &rPam, cons if( !nRet ) { - // Alle Ueberschriften sind normalerweise ohne Kapitelnummer. - // Darum hier explizit abschalten weil das Default jetzt wieder auf AN ist. if (bNew) { - Reader::SetNoOutlineNum( rDoc ); // MIB 27.09.96: Umrandung uns Abstaende aus Frm-Vorlagen entf. Reader::ResetFrmFmts( rDoc ); } diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx index 9f6d2f229f25..f2d1f47325df 100644 --- a/sw/source/ui/docvw/edtwin.cxx +++ b/sw/source/ui/docvw/edtwin.cxx @@ -5396,10 +5396,6 @@ SfxShell* lcl_GetShellFromDispatcher( SwView& rView, TypeId nType ) return pShell; } -void SwEditWin::ClearTip() -{ -} - IMPL_LINK_NOARG(SwEditWin, KeyInputFlushHandler) { FlushInBuffer(); diff --git a/sw/source/ui/inc/edtwin.hxx b/sw/source/ui/inc/edtwin.hxx index ac78de99a8f2..90a1c3ab7257 100644 --- a/sw/source/ui/inc/edtwin.hxx +++ b/sw/source/ui/inc/edtwin.hxx @@ -293,9 +293,6 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); - // delete tip window - static void ClearTip(); - static inline long GetDDStartPosX() { return nDDStartPosX; } static inline long GetDDStartPosY() { return nDDStartPosY; } diff --git a/sw/source/ui/inc/wrtsh.hxx b/sw/source/ui/inc/wrtsh.hxx index d6a238347c9a..59431b4ab662 100644 --- a/sw/source/ui/inc/wrtsh.hxx +++ b/sw/source/ui/inc/wrtsh.hxx @@ -444,9 +444,6 @@ typedef sal_Bool (SwWrtShell:: *FNSimpleMove)(); void NavigatorPaste( const NaviContentBookmark& rBkmk, const sal_uInt16 nAction ); - // Core creates a selection, SttSelect has to be called - virtual void NewCoreSelection(); - virtual void ApplyViewOptions( const SwViewOption &rOpt ); virtual void SetReadonlyOption( sal_Bool bSet ); diff --git a/sw/source/ui/uiview/viewport.cxx b/sw/source/ui/uiview/viewport.cxx index 7acaa98250e1..5505c5ff832c 100644 --- a/sw/source/ui/uiview/viewport.cxx +++ b/sw/source/ui/uiview/viewport.cxx @@ -297,8 +297,6 @@ void SwView::SetVisArea( const Rectangle &rRect, sal_Bool bUpdateScrollbar ) InvalidateRulerPos(); - SwEditWin::ClearTip(); - if ( bOuterResize && !bInOuterResizePixel && !bInInnerResizePixel) OuterResizePixel( Point(), GetViewFrame()->GetWindow().GetOutputSizePixel() ); diff --git a/sw/source/ui/vba/vbastyle.cxx b/sw/source/ui/vba/vbastyle.cxx index f591a6e1a5d1..a951e4ca707b 100644 --- a/sw/source/ui/vba/vbastyle.cxx +++ b/sw/source/ui/vba/vbastyle.cxx @@ -100,11 +100,6 @@ SwVbaStyle::getFont() throw ( uno::RuntimeException ) return new SwVbaFont( mxParent, mxContext, aColors.getPalette(), mxStyleProps ); } - -void SAL_CALL SwVbaStyle::LinkToListTemplate( const uno::Reference< word::XListTemplate >& /*ListTemplate*/, const uno::Any& /*ListLevelNumber*/ ) throw (uno::RuntimeException) -{ -} - void SwVbaStyle::setStyle( const uno::Reference< beans::XPropertySet >& xParaProps, const uno::Any& rStyle )throw (uno::RuntimeException) { rtl::OUString sStyle; diff --git a/sw/source/ui/vba/vbastyle.hxx b/sw/source/ui/vba/vbastyle.hxx index 7343a4c70c13..e98f2b1bbe00 100644 --- a/sw/source/ui/vba/vbastyle.hxx +++ b/sw/source/ui/vba/vbastyle.hxx @@ -60,7 +60,6 @@ public: virtual void SAL_CALL setLanguageID( ::sal_Int32 _languageid ) throw (css::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException); virtual css::uno::Reference< ooo::vba::word::XFont > SAL_CALL getFont() throw (css::uno::RuntimeException); - virtual void SAL_CALL LinkToListTemplate( const css::uno::Reference< ooo::vba::word::XListTemplate >& ListTemplate, const css::uno::Any& ListLevelNumber ) throw (css::uno::RuntimeException); virtual ::rtl::OUString SAL_CALL getNameLocal() throw (css::uno::RuntimeException); virtual void SAL_CALL setNameLocal( const ::rtl::OUString& _namelocal ) throw (css::uno::RuntimeException); virtual css::uno::Reference< ::ooo::vba::word::XParagraphFormat > SAL_CALL getParagraphFormat() throw (css::uno::RuntimeException); diff --git a/sw/source/ui/wrtsh/wrtsh1.cxx b/sw/source/ui/wrtsh/wrtsh1.cxx index efd9930b78f0..1f2073bf3274 100644 --- a/sw/source/ui/wrtsh/wrtsh1.cxx +++ b/sw/source/ui/wrtsh/wrtsh1.cxx @@ -1759,12 +1759,6 @@ sal_Bool SwWrtShell::CanInsert() return (!(IsSelFrmMode() | IsObjSelected() | (GetView().GetDrawFuncPtr() != NULL) | (GetView().GetPostItMgr()->GetActiveSidebarWin()!= NULL))); } -// die Core erzeugt eine Selektion, das SttSelect muss gerufen werden -void SwWrtShell::NewCoreSelection() -{ - SttSelect(); -} - // -------------- void SwWrtShell::ChgDBData(const SwDBData& aDBData) { |