Applied Angus patch to compile on DEC C++ and to avoid name clashes

[lyx.git] / src / BufferView.C

diff --git a/src/BufferView.C b/src/BufferView.C
index 12ac9b7e02d8d8a7cbce7678ec59d8c5b4aa2a47..1e7db9e20b2b39d0dc69d57a2001c3ae1c6820ac 100644 (file)
--- a/src/BufferView.C
+++ b/src/BufferView.C
@@ -46,13 +46,13 @@ Buffer * BufferView::buffer() const
 
 LyXScreen * BufferView::screen() const
 {
-       return pimpl_->screen_;
+       return pimpl_->screen_.get();
 }
 
 
 WorkArea * BufferView::workarea() const
 {
-       return pimpl_->workarea_;
+       return &pimpl_->workarea_;
 }
 
 
@@ -233,7 +233,7 @@ bool BufferView::active() const
 
 int BufferView::workWidth() const
 {
-    return pimpl_->workarea_->workWidth();
+    return pimpl_->workarea_.workWidth();
 }