diff options
-rw-r--r-- | sdext/source/minimizer/informationdialog.hxx | 4 | ||||
-rw-r--r-- | sdext/source/pdfimport/inc/contentsink.hxx | 1 | ||||
-rw-r--r-- | sdext/source/pdfimport/test/tests.cxx | 5 | ||||
-rw-r--r-- | sdext/source/pdfimport/tree/genericelements.hxx | 1 | ||||
-rw-r--r-- | sdext/source/pdfimport/tree/pdfiprocessor.cxx | 5 | ||||
-rw-r--r-- | sdext/source/pdfimport/tree/pdfiprocessor.hxx | 6 | ||||
-rw-r--r-- | sdext/source/presenter/PresenterAccessibility.hxx | 2 | ||||
-rw-r--r-- | sdext/source/presenter/PresenterController.cxx | 1 | ||||
-rw-r--r-- | sdext/source/presenter/PresenterController.hxx | 4 | ||||
-rw-r--r-- | sdext/source/presenter/PresenterNotesView.hxx | 1 | ||||
-rw-r--r-- | sdext/source/presenter/PresenterPaneContainer.hxx | 4 | ||||
-rw-r--r-- | sdext/source/presenter/PresenterScrollBar.cxx | 6 | ||||
-rw-r--r-- | sdext/source/presenter/PresenterScrollBar.hxx | 2 | ||||
-rw-r--r-- | sdext/source/presenter/PresenterTextView.hxx | 1 | ||||
-rw-r--r-- | sdext/source/presenter/PresenterToolBar.hxx | 3 | ||||
-rw-r--r-- | sdext/source/presenter/PresenterWindowManager.cxx | 1 | ||||
-rw-r--r-- | sdext/source/presenter/PresenterWindowManager.hxx | 4 |
17 files changed, 0 insertions, 51 deletions
diff --git a/sdext/source/minimizer/informationdialog.hxx b/sdext/source/minimizer/informationdialog.hxx index d674e08986c5..502d732e9478 100644 --- a/sdext/source/minimizer/informationdialog.hxx +++ b/sdext/source/minimizer/informationdialog.hxx @@ -67,10 +67,6 @@ private : sal_Int64 mnApproxSize; bool& mrbOpenNewDocument; const OUString& maSaveAsURL; - -public : - - css::uno::Reference< css::frame::XFrame>& GetFrame() { return mxFrame; }; }; class OKActionListener : public ::cppu::WeakImplHelper1< css::awt::XActionListener > diff --git a/sdext/source/pdfimport/inc/contentsink.hxx b/sdext/source/pdfimport/inc/contentsink.hxx index d4fb3b187e90..17e58adae5a9 100644 --- a/sdext/source/pdfimport/inc/contentsink.hxx +++ b/sdext/source/pdfimport/inc/contentsink.hxx @@ -123,7 +123,6 @@ namespace pdfi virtual void setLineWidth(double) = 0; virtual void setFillColor( const css::rendering::ARGBColor& rColor ) = 0; virtual void setStrokeColor( const css::rendering::ARGBColor& rColor ) = 0; - virtual void setBlendMode( sal_Int8 blendMode ) = 0; virtual void setFont( const FontAttributes& rFont ) = 0; virtual void setTextRenderMode( sal_Int32 ) = 0; diff --git a/sdext/source/pdfimport/test/tests.cxx b/sdext/source/pdfimport/test/tests.cxx index e1e399b0202d..90425f912c36 100644 --- a/sdext/source/pdfimport/test/tests.cxx +++ b/sdext/source/pdfimport/test/tests.cxx @@ -201,11 +201,6 @@ namespace getCurrentContext().LineColor = rColor; } - virtual void setBlendMode(sal_Int8 nMode) SAL_OVERRIDE - { - getCurrentContext().BlendMode = nMode; - } - virtual void setFont( const FontAttributes& rFont ) SAL_OVERRIDE { FontToIdMap::const_iterator it = m_aFontToId.find( rFont ); diff --git a/sdext/source/pdfimport/tree/genericelements.hxx b/sdext/source/pdfimport/tree/genericelements.hxx index f1b9d3442738..b774ace53f1c 100644 --- a/sdext/source/pdfimport/tree/genericelements.hxx +++ b/sdext/source/pdfimport/tree/genericelements.hxx @@ -255,7 +255,6 @@ namespace pdfi virtual void visitedBy( ElementTreeVisitor&, const std::list< Element* >::const_iterator& rParentIt ) SAL_OVERRIDE; - void emitPageAnchoredElements( EmitContext& rEmitContext ); static void updateParagraphGeometry( Element* pEle ); void resolveHyperlinks(); void resolveFontStyles( PDFIProcessor& rProc ); diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.cxx b/sdext/source/pdfimport/tree/pdfiprocessor.cxx index fe81e28603c5..766d1e6b37f7 100644 --- a/sdext/source/pdfimport/tree/pdfiprocessor.cxx +++ b/sdext/source/pdfimport/tree/pdfiprocessor.cxx @@ -161,11 +161,6 @@ void PDFIProcessor::setStrokeColor( const rendering::ARGBColor& rColor ) getCurrentContext().LineColor = rColor; } -void PDFIProcessor::setBlendMode(sal_Int8) -{ - OSL_TRACE("PDFIProcessor::setBlendMode(): not supported by ODF"); -} - void PDFIProcessor::setFont( const FontAttributes& i_rFont ) { FontAttributes aChangedFont( i_rFont ); diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.hxx b/sdext/source/pdfimport/tree/pdfiprocessor.hxx index 363d86229439..d47c89e67b13 100644 --- a/sdext/source/pdfimport/tree/pdfiprocessor.hxx +++ b/sdext/source/pdfimport/tree/pdfiprocessor.hxx @@ -84,13 +84,8 @@ namespace pdfi GraphicsContext& getCurrentContext() { return m_aGCStack.back(); } const GraphicsContext& getCurrentContext() const { return m_aGCStack.back(); } - ImageContainer& getImages() { return m_aImages; } - boost::shared_ptr<ElementFactory> getElementFactory() const { return m_pElFactory; } - const css::uno::Reference< css::task::XStatusIndicator >& getStatusIndicator() const { return m_xStatusIndicator; } - void setStatusIndicator( const css::uno::Reference< css::task::XStatusIndicator >& xStatus ) - { m_xStatusIndicator = xStatus; } const FontAttributes& getFont( sal_Int32 nFontId ) const; sal_Int32 getFontId( const FontAttributes& rAttr ) const; @@ -122,7 +117,6 @@ namespace pdfi virtual void setLineWidth(double) SAL_OVERRIDE; virtual void setFillColor( const css::rendering::ARGBColor& rColor ) SAL_OVERRIDE; virtual void setStrokeColor( const css::rendering::ARGBColor& rColor ) SAL_OVERRIDE; - virtual void setBlendMode(sal_Int8) SAL_OVERRIDE; virtual void setFont( const FontAttributes& rFont ) SAL_OVERRIDE; virtual void setTextRenderMode( sal_Int32 ) SAL_OVERRIDE; diff --git a/sdext/source/presenter/PresenterAccessibility.hxx b/sdext/source/presenter/PresenterAccessibility.hxx index c3c429ffb755..ad4f88bfac93 100644 --- a/sdext/source/presenter/PresenterAccessibility.hxx +++ b/sdext/source/presenter/PresenterAccessibility.hxx @@ -64,8 +64,6 @@ public: const css::uno::Reference<css::drawing::framework::XPane>& rxMainPane); virtual ~PresenterAccessible(); - void SetAccessibleParent (const css::uno::Reference<css::accessibility::XAccessible>& rxAccessibleParent); - void UpdateAccessibilityHierarchy(); void NotifyCurrentSlideChange ( diff --git a/sdext/source/presenter/PresenterController.cxx b/sdext/source/presenter/PresenterController.cxx index 180e2fdfc043..726995306f8a 100644 --- a/sdext/source/presenter/PresenterController.cxx +++ b/sdext/source/presenter/PresenterController.cxx @@ -101,7 +101,6 @@ PresenterController::PresenterController ( mxCurrentSlide(), mxNextSlide(), mpWindowManager(new PresenterWindowManager(rxContext,mpPaneContainer,this)), - mnWindowBackgroundColor(0x00ffffff), mpTheme(), mxMainWindow(), mpPaneBorderPainter(), diff --git a/sdext/source/presenter/PresenterController.hxx b/sdext/source/presenter/PresenterController.hxx index 88d3d3ad1ca7..ad1356e62c33 100644 --- a/sdext/source/presenter/PresenterController.hxx +++ b/sdext/source/presenter/PresenterController.hxx @@ -106,7 +106,6 @@ public: ::boost::shared_ptr<PresenterCanvasHelper> GetCanvasHelper() const; css::uno::Reference<css::drawing::XPresenterHelper> GetPresenterHelper() const; ::boost::shared_ptr<PresenterPaintManager> GetPaintManager() const; - void HideSlideSorter(); double GetSlideAspectRatio() const; void ShowView (const OUString& rsViewURL); void HideView (const OUString& rsViewURL); @@ -206,7 +205,6 @@ private: css::uno::Reference<css::drawing::XDrawPage> mxNextSlide; ::rtl::Reference<PresenterWindowManager> mpWindowManager; ::boost::shared_ptr<PresenterPaneAnimator> mpCurrentPaneAnimation; - sal_Int32 mnWindowBackgroundColor; ::boost::shared_ptr<PresenterTheme> mpTheme; css::uno::Reference<css::awt::XWindow> mxMainWindow; ::rtl::Reference<PresenterPaneBorderPainter> mpPaneBorderPainter; @@ -218,8 +216,6 @@ private: ::rtl::Reference<PresenterAccessible> mpAccessibleObject; bool mbIsAccessibilityActive; - void InitializePresenterScreen(); - void InitializeSlideShowView (const css::uno::Reference<css::uno::XInterface>& rxView); void GetSlides (const sal_Int32 nOffset); void UpdateViews(); void InitializeMainPane (const css::uno::Reference<css::drawing::framework::XPane>& rxPane); diff --git a/sdext/source/presenter/PresenterNotesView.hxx b/sdext/source/presenter/PresenterNotesView.hxx index ce1734bb8cb6..322dbfab1427 100644 --- a/sdext/source/presenter/PresenterNotesView.hxx +++ b/sdext/source/presenter/PresenterNotesView.hxx @@ -166,7 +166,6 @@ private: void Scroll (const double nDistance); void SetTop (const double nTop); void UpdateScrollBar(); - void MoveCaret (const sal_Int32 nDistance); /** This method throws a DisposedException when the object has already been disposed. diff --git a/sdext/source/presenter/PresenterPaneContainer.hxx b/sdext/source/presenter/PresenterPaneContainer.hxx index d12913c042c9..c22eb278fc64 100644 --- a/sdext/source/presenter/PresenterPaneContainer.hxx +++ b/sdext/source/presenter/PresenterPaneContainer.hxx @@ -140,8 +140,6 @@ public: SharedPaneDescriptor RemoveView ( const css::uno::Reference<css::drawing::framework::XView>& rxView); - void CreateBorderWindow (PaneDescriptor& rDescriptor); - /** Find the pane whose border window is identical to the given border window. */ @@ -177,8 +175,6 @@ public: private: css::uno::Reference<css::drawing::XPresenterHelper> mxPresenterHelper; - - PaneList::const_iterator FindIteratorForPaneURL (const OUString& rsPaneURL); }; } } // end of namespace ::sdext::presenter diff --git a/sdext/source/presenter/PresenterScrollBar.cxx b/sdext/source/presenter/PresenterScrollBar.cxx index bfcccdc62607..fcf708e49f6f 100644 --- a/sdext/source/presenter/PresenterScrollBar.cxx +++ b/sdext/source/presenter/PresenterScrollBar.cxx @@ -674,12 +674,6 @@ sal_Int32 PresenterVerticalScrollBar::GetSize() const return mnScrollBarWidth; } -geometry::RealPoint2D PresenterVerticalScrollBar::GetPoint ( - const double nMajor, const double nMinor) const -{ - return geometry::RealPoint2D(nMinor, nMajor); -} - double PresenterVerticalScrollBar::GetMinor (const double nX, const double nY) const { (void)nY; diff --git a/sdext/source/presenter/PresenterScrollBar.hxx b/sdext/source/presenter/PresenterScrollBar.hxx index e9b3992273ac..09413586869e 100644 --- a/sdext/source/presenter/PresenterScrollBar.hxx +++ b/sdext/source/presenter/PresenterScrollBar.hxx @@ -191,7 +191,6 @@ protected: css::geometry::RealRectangle2D GetRectangle (const Area eArea) const; virtual double GetDragDistance (const sal_Int32 nX, const sal_Int32 nY) const = 0; virtual void UpdateDragAnchor (const double nDragDistance) = 0; - virtual css::geometry::RealPoint2D GetPoint (const double nMajor, const double nMinor) const = 0; virtual double GetMinor (const double nX, const double nY) const = 0; virtual void UpdateBorders() = 0; virtual void UpdateBitmaps() = 0; @@ -258,7 +257,6 @@ public: protected: virtual double GetDragDistance (const sal_Int32 nX, const sal_Int32 nY) const SAL_OVERRIDE; virtual void UpdateDragAnchor (const double nDragDistance) SAL_OVERRIDE; - virtual css::geometry::RealPoint2D GetPoint (const double nMajor, const double nMinor) const SAL_OVERRIDE; virtual double GetMinor (const double nX, const double nY) const SAL_OVERRIDE; virtual void UpdateBorders() SAL_OVERRIDE; virtual void UpdateBitmaps() SAL_OVERRIDE; diff --git a/sdext/source/presenter/PresenterTextView.hxx b/sdext/source/presenter/PresenterTextView.hxx index 0229d79fac1c..1a47da041d0d 100644 --- a/sdext/source/presenter/PresenterTextView.hxx +++ b/sdext/source/presenter/PresenterTextView.hxx @@ -271,7 +271,6 @@ private: void RequestFormat(); void Format(); - SharedPresenterTextParagraph GetParagraphForCharacterIndex (const sal_Int32 nCharacterIndex) const; css::awt::Rectangle GetCaretBounds ( const sal_Int32 nParagraphIndex, const sal_Int32 nCharacterIndex) const; diff --git a/sdext/source/presenter/PresenterToolBar.hxx b/sdext/source/presenter/PresenterToolBar.hxx index 42c225c076a9..fabdbc587a8c 100644 --- a/sdext/source/presenter/PresenterToolBar.hxx +++ b/sdext/source/presenter/PresenterToolBar.hxx @@ -194,9 +194,6 @@ private: const css::geometry::RealRectangle2D& rBoundingBox, const css::geometry::RealSize2D& rPartSize, const bool bIsHorizontal); - void Clear ( - const css::awt::Rectangle& rUpdateBox, - const css::rendering::ViewState& rViewState); void Paint ( const css::awt::Rectangle& rUpdateBox, const css::rendering::ViewState& rViewState); diff --git a/sdext/source/presenter/PresenterWindowManager.cxx b/sdext/source/presenter/PresenterWindowManager.cxx index 0fce6117345b..9a2f2212b47f 100644 --- a/sdext/source/presenter/PresenterWindowManager.cxx +++ b/sdext/source/presenter/PresenterWindowManager.cxx @@ -79,7 +79,6 @@ PresenterWindowManager::PresenterWindowManager ( mpTheme(), mpBackgroundBitmap(), mxScaledBackgroundBitmap(), - maPaneBackgroundColor(), mxClipPolygon(), meLayoutMode(LM_Generic), mbIsSlideSorterActive(false), diff --git a/sdext/source/presenter/PresenterWindowManager.hxx b/sdext/source/presenter/PresenterWindowManager.hxx index c9355b5511cf..9f25fbbb9cc6 100644 --- a/sdext/source/presenter/PresenterWindowManager.hxx +++ b/sdext/source/presenter/PresenterWindowManager.hxx @@ -178,7 +178,6 @@ private: ::boost::shared_ptr<PresenterTheme> mpTheme; SharedBitmapDescriptor mpBackgroundBitmap; css::uno::Reference<css::rendering::XBitmap> mxScaledBackgroundBitmap; - css::util::Color maPaneBackgroundColor; css::uno::Reference<css::rendering::XPolyPolygon2D> mxClipPolygon; LayoutMode meLayoutMode; bool mbIsSlideSorterActive; @@ -193,11 +192,8 @@ private: void PaintBackground (const css::awt::Rectangle& rUpdateBox); void ProvideBackgroundBitmap(); css::uno::Reference<css::rendering::XPolyPolygon2D> CreateClipPolyPolygon() const; - void ToTop (); static void UpdateWindowList(); - bool ChildNeedsRepaint ( - const css::uno::Reference<css::drawing::framework::XPane>& rxPane) const; void Invalidate(); |