diff options
author | Philipp Riemer <ruderphilipp@gmail.com> | 2013-08-31 17:50:25 +0200 |
---|---|---|
committer | Philipp Riemer <ruderphilipp@gmail.com> | 2013-08-31 22:41:10 +0200 |
commit | bf42b6f9f51b4bc66e267ae24c87ac79122825cc (patch) | |
tree | 449f642fc53e3d654ae36a39877efc41a8b74fcc /sd | |
parent | 3f84d81412f123bda0dde57c4e52abe9f49f58af (diff) |
fdo#62475 - remove visual noise
This is a follow up commit to
- 22d1beb78a475e4846af945afde1c4d6c263b5d6
- 1c7af455ab9345304a7ac48ce2e0310de2ac8a75
Change-Id: I102685391125f3b4f7bdf838f8bd17a2283d558d
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/core/drawdoc.cxx | 20 | ||||
-rw-r--r-- | sd/source/ui/view/outlview.cxx | 33 |
2 files changed, 1 insertions, 52 deletions
diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx index 2295c97d07b6..c188d2b22279 100644 --- a/sd/source/core/drawdoc.cxx +++ b/sd/source/core/drawdoc.cxx @@ -110,14 +110,10 @@ using ::com::sun::star::lang::XMultiServiceFactory; using ::com::sun::star::container::XNameAccess; using ::com::sun::star::beans::PropertyValue; -////////////////////////////////////////////////////////////////////////////// - TYPEINIT1( SdDrawDocument, FmFormModel ); SdDrawDocument* SdDrawDocument::pDocLockedInsertingLinks = NULL; -////////////////////////////////////////////////////////////////////////////// - PresentationSettings::PresentationSettings() : mbAll( true ), mbEndless( false ), @@ -135,8 +131,6 @@ PresentationSettings::PresentationSettings() { } -// --------------------------------------------------------------------------- - PresentationSettings::PresentationSettings( const PresentationSettings& r ) : maPresPage( r.maPresPage ), mbAll( r.mbAll ), @@ -155,8 +149,6 @@ PresentationSettings::PresentationSettings( const PresentationSettings& r ) { } -// --------------------------------------------------------------------------- - SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh) : FmFormModel( SvtPathOptions().GetPalettePath(), NULL, pDrDocSh ) , mpOutliner(NULL) @@ -380,9 +372,7 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh) } - // Destructor - SdDrawDocument::~SdDrawDocument() { Broadcast(SdrHint(HINT_MODELCLEARED)); @@ -447,11 +437,9 @@ SdDrawDocument::~SdDrawDocument() mpCharClass = NULL; } - // This method creates a new document (SdDrawDocument) and returns a pointer to // said document. The drawing engine uses this method to put the document (or // parts of it) into the clipboard/DragServer. - SdrModel* SdDrawDocument::AllocModel() const { SdDrawDocument* pNewModel = NULL; @@ -516,7 +504,6 @@ SdrModel* SdDrawDocument::AllocModel() const // This method creates a new page (SdPage) and returns a pointer to said page. // The drawing engine uses this method to create pages (whose types it does // not know, as they are _derivatives_ of SdrPage) when loading. - SdrPage* SdDrawDocument::AllocPage(bool bMasterPage) { return new SdPage(*this, NULL, bMasterPage); @@ -552,7 +539,6 @@ void SdDrawDocument::NbcSetChanged(sal_Bool bFlag) // NewOrLoadCompleted is called when the document is loaded, or when it is clear // it won't load any more. - void SdDrawDocument::NewOrLoadCompleted(DocCreationMode eMode) { if (eMode == NEW_DOC) @@ -806,7 +792,6 @@ void SdDrawDocument::NewOrLoadCompleted( SdPage* pPage, SdStyleSheetPool* pSPool return(mpOutliner); } - // Internal outliner that is used to create text objects. We don't insert any // OutlinerViews into this outliner! ::sd::Outliner* SdDrawDocument::GetInternalOutliner(sal_Bool bCreateOutliner) @@ -891,7 +876,6 @@ void SdDrawDocument::SetOnlineSpell(sal_Bool bIn) } } - // OnlineSpelling: highlighting on/off uno::Reference< uno::XInterface > SdDrawDocument::createUnoModel() { @@ -914,9 +898,6 @@ SvxNumType SdDrawDocument::GetPageNumType() const return mePageNumType; } - - - void SdDrawDocument::SetPrinterIndependentLayout (sal_Int32 nMode) { switch (nMode) @@ -1059,4 +1040,5 @@ void SdDrawDocument::InitLayoutVector() maLayoutInfo.push_back( layoutlist->item(index) ); } } + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx index 2e3a7e540348..66d424913eeb 100644 --- a/sd/source/ui/view/outlview.cxx +++ b/sd/source/ui/view/outlview.cxx @@ -89,7 +89,6 @@ struct SdParaAndPos TYPEINIT1( OutlineView, ::sd::View ); - OutlineView::OutlineView( DrawDocShell& rDocSh, ::Window* pWindow, OutlineViewShell& rOutlineViewSh) : ::sd::View(*rDocSh.GetDoc(), pWindow, &rOutlineViewSh) , mrOutlineViewShell(rOutlineViewSh) @@ -205,27 +204,17 @@ OutlineView::~OutlineView() } } - - - void OutlineView::ConnectToApplication (void) { mrOutlineViewShell.GetActiveWindow()->GrabFocus(); Application::AddEventListener(LINK(this, OutlineView, AppEventListenerHdl)); } - - - void OutlineView::DisconnectFromApplication (void) { Application::RemoveEventListener(LINK(this, OutlineView, AppEventListenerHdl)); } - - - - void OutlineView::Paint(const Rectangle& rRect, ::sd::Window* pWin) { OutlinerView* pOlView = GetViewByWindow(pWin); @@ -248,12 +237,10 @@ void OutlineView::InvalidateSlideNumberArea() /** * Window size was changed */ - void OutlineView::AdjustPosSizePixel(const Point &,const Size &,::sd::Window*) { } - void OutlineView::AddWindowToPaintView(OutputDevice* pWin) { sal_Bool bAdded = sal_False; @@ -291,7 +278,6 @@ void OutlineView::AddWindowToPaintView(OutputDevice* pWin) ::sd::View::AddWindowToPaintView(pWin); } - void OutlineView::DeleteWindowFromPaintView(OutputDevice* pWin) { sal_Bool bRemoved = sal_False; @@ -338,7 +324,6 @@ OutlinerView* OutlineView::GetViewByWindow (::Window* pWin) const return (pOlView); } - /** * Return the title before a random paragraph */ @@ -981,7 +966,6 @@ SdrTextObj* OutlineView::GetTitleTextObject(SdrPage* pPage) return pResult; } - /** * Look for the outline text object in one page of the model */ @@ -1075,7 +1059,6 @@ sal_Bool OutlineView::PrepareClose(sal_Bool) return sal_True; } - /** * Set attributes of the selected text */ @@ -1344,8 +1327,6 @@ SfxStyleSheet* OutlineView::GetStyleSheet() const return pResult; } - - /** * Mark pages as selected / not selected */ @@ -1390,7 +1371,6 @@ void OutlineView::SetSelectedPages() } } - /** * Set new links */ @@ -1412,8 +1392,6 @@ void OutlineView::SetLinks() mrOutliner.SetEndPasteOrDropHdl(LINK(this,OutlineView, EndPasteOrDropHdl)); } - - /** * Restore old links */ @@ -1433,13 +1411,11 @@ void OutlineView::ResetLinks() const mrOutliner.SetEndPasteOrDropHdl(aEmptyLink); } - sal_Int8 OutlineView::AcceptDrop( const AcceptDropEvent&, DropTargetHelper&, ::sd::Window*, sal_uInt16, sal_uInt16) { return DND_ACTION_NONE; } - sal_Int8 OutlineView::ExecuteDrop( const ExecuteDropEvent&, DropTargetHelper&, ::sd::Window*, sal_uInt16, sal_uInt16) { return DND_ACTION_NONE; @@ -1493,9 +1469,6 @@ IMPL_LINK_NOARG(OutlineView, AppEventListenerHdl) return 0; } - - - IMPL_LINK(OutlineView, EventMultiplexerListener, ::sd::tools::EventMultiplexerEvent*, pEvent) { if (pEvent != NULL) @@ -1796,8 +1769,6 @@ IMPL_LINK(OutlineView, PaintingFirstLineHdl, PaintFirstLineInfo*, pInfo) return 0; } -// -------------------------------------------------------------------- - void OutlineView::UpdateParagraph( sal_Int32 nPara ) { SfxItemSet aNewAttrs2( mrOutliner.GetParaAttribs( nPara ) ); @@ -1805,8 +1776,6 @@ void OutlineView::UpdateParagraph( sal_Int32 nPara ) mrOutliner.SetParaAttribs( nPara, aNewAttrs2 ); } -// -------------------------------------------------------------------- - void OutlineView::OnBeginPasteOrDrop( PasteOrDropInfos* /*pInfos*/ ) { } @@ -1877,7 +1846,6 @@ void OutlineView::OnEndPasteOrDrop( PasteOrDropInfos* pInfos ) // ==================================================================== - OutlineViewModelChangeGuard::OutlineViewModelChangeGuard( OutlineView& rView ) : mrView( rView ) { @@ -1902,7 +1870,6 @@ OutlineViewPageChangesGuard::~OutlineViewPageChangesGuard() mpView->IgnoreCurrentPageChanges( false ); } - } // end of namespace sd /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |