renaissance1: merge with DEV300_m84

2 files changed, 0 insertions, 28 deletions

diff --git a/sd/source/ui/presenter/PresenterCanvas.cxx b/sd/source/ui/presenter/PresenterCanvas.cxx
index 8a87a10e43d0..a1f583a4e40c 100644
--- a/sd/source/ui/presenter/PresenterCanvas.cxx
+++ b/sd/source/ui/presenter/PresenterCanvas.cxx
@@ -908,22 +908,6 @@ css::rendering::ViewState PresenterCanvas::MergeViewState (
 
 
 
-Reference<rendering::XCanvas> PresenterCanvas::GetSharedCanvas (void) const
-{
-    return mxSharedCanvas;
-}
-
-
-
-
-void PresenterCanvas::SetClip (const awt::Rectangle& rClipRectangle)
-{
-    maClipRectangle = rClipRectangle;
-}
-
-
-
-
 awt::Point PresenterCanvas::GetOffset (const Reference<awt::XWindow>& rxBaseWindow)
 {
     mbOffsetUpdatePending = false;
diff --git a/sd/source/ui/presenter/PresenterTextView.cxx b/sd/source/ui/presenter/PresenterTextView.cxx
index 3734f488d370..ba90a92939ca 100644
--- a/sd/source/ui/presenter/PresenterTextView.cxx
+++ b/sd/source/ui/presenter/PresenterTextView.cxx
@@ -113,7 +113,6 @@ public:
     void SetFontDescriptor (const awt::FontDescriptor& rFontDescriptor);
     sal_Int32 GetTop (void) const;
     void SetTop (const sal_Int32 nTop);
-    void ClearText (void);
     void SetText (const OUString& Text);
     sal_Int32 ParseDistance (const OUString& rsDistance) const;
     Reference<rendering::XBitmap> GetBitmap (void);
@@ -533,17 +532,6 @@ void PresenterTextView::Implementation::SetTop (const sal_Int32 nTop)
 
 
 
-void PresenterTextView::Implementation::ClearText (void)
-{
-    DBG_ASSERT(mpEditEngine!=NULL, "EditEngine missing");
-    msText = OUString();
-    mnTotalHeight = 0;
-    mxBitmap = NULL;
-}
-
-
-
-
 void PresenterTextView::Implementation::SetText (const OUString& rText)
 {
     DBG_ASSERT(mpEditEngine!=NULL, "EditEngine missing");