diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-04-13 23:50:17 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-04-13 23:50:17 +0200 |
commit | 8a3eeff238d97d9d5ae548193e32c8b00a22219e (patch) | |
tree | 81ee15d4b7c99cda5f34b8695e8e7996a2078eff /sdext | |
parent | a6611be6bc145a9f538a9f1bbe6d40f32ebad1c9 (diff) |
Clean up function declarations and some unused functions
Change-Id: I80d15f503bb5714340c051cc1c4890a445e44d56
Diffstat (limited to 'sdext')
-rw-r--r-- | sdext/source/pdfimport/wrapper/wrapper.cxx | 1 | ||||
-rw-r--r-- | sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 10 | ||||
-rw-r--r-- | sdext/source/presenter/PresenterAccessibility.cxx | 2 | ||||
-rw-r--r-- | sdext/source/presenter/PresenterHelpView.cxx | 4 | ||||
-rw-r--r-- | sdext/source/presenter/PresenterPaneBorderPainter.cxx | 22 | ||||
-rw-r--r-- | sdext/source/presenter/PresenterToolBar.cxx | 7 |
6 files changed, 3 insertions, 43 deletions
diff --git a/sdext/source/pdfimport/wrapper/wrapper.cxx b/sdext/source/pdfimport/wrapper/wrapper.cxx index 189b29ced8b7..d02407192576 100644 --- a/sdext/source/pdfimport/wrapper/wrapper.cxx +++ b/sdext/source/pdfimport/wrapper/wrapper.cxx @@ -22,6 +22,7 @@ #include "contentsink.hxx" #include "pdfparse.hxx" #include "pdfihelper.hxx" +#include "wrapper.hxx" #include "osl/file.h" #include "osl/file.hxx" diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx index e186dda13aa0..cf601b9fb4f5 100644 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx @@ -370,21 +370,11 @@ void writeImage_( OutputBuffer& o_rOutputBuf, // forwarders -inline void writeImage( OutputBuffer& o_rOutputBuf, - Stream* str, - int width, - int height, - GfxImageColorMap* colorMap ) { writeImage_(o_rOutputBuf,str,width,height,colorMap,false); } inline void writeImageLF( OutputBuffer& o_rOutputBuf, Stream* str, int width, int height, GfxImageColorMap* colorMap ) { writeImage_(o_rOutputBuf,str,width,height,colorMap,true); } -inline void writeMask( OutputBuffer& o_rOutputBuf, - Stream* str, - int width, - int height, - bool bInvert ) { writeMask_(o_rOutputBuf,str,width,height,false,bInvert); } inline void writeMaskLF( OutputBuffer& o_rOutputBuf, Stream* str, int width, diff --git a/sdext/source/presenter/PresenterAccessibility.cxx b/sdext/source/presenter/PresenterAccessibility.cxx index 38b7adbb62d7..6b98df0289d0 100644 --- a/sdext/source/presenter/PresenterAccessibility.cxx +++ b/sdext/source/presenter/PresenterAccessibility.cxx @@ -81,8 +81,6 @@ public: virtual void SAL_CALL disposing (void) SAL_OVERRIDE; - void NotifyCurrentSlideChange (const sal_Int32 nCurrentSlideIndex); - void AddChild (const ::rtl::Reference<AccessibleObject>& rpChild); void RemoveChild (const ::rtl::Reference<AccessibleObject>& rpChild); diff --git a/sdext/source/presenter/PresenterHelpView.cxx b/sdext/source/presenter/PresenterHelpView.cxx index ae255b65ddda..0c3acc30e12d 100644 --- a/sdext/source/presenter/PresenterHelpView.cxx +++ b/sdext/source/presenter/PresenterHelpView.cxx @@ -34,6 +34,7 @@ #include <algorithm> #include <vector> #include <boost/bind.hpp> +#include <boost/noncopyable.hpp> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -95,10 +96,9 @@ namespace { const sal_Int32 nMaximalWidth); }; - class Block + class Block: private boost::noncopyable { public: - Block (const Block& rBlock); Block ( const OUString& rsLeftText, const OUString& rsRightText, diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.cxx b/sdext/source/presenter/PresenterPaneBorderPainter.cxx index 6d494cd9e889..8e3378f9ef91 100644 --- a/sdext/source/presenter/PresenterPaneBorderPainter.cxx +++ b/sdext/source/presenter/PresenterPaneBorderPainter.cxx @@ -50,8 +50,6 @@ namespace { { public: BorderSize (void); - BorderSize (const BorderSize& rBorderSize); - BorderSize& operator= (const BorderSize& rBoderSize); sal_Int32 mnLeft; sal_Int32 mnTop; sal_Int32 mnRight; @@ -793,26 +791,6 @@ BorderSize::BorderSize (void) { } -BorderSize::BorderSize (const BorderSize& rBorderSize) - : mnLeft(rBorderSize.mnLeft), - mnTop(rBorderSize.mnTop), - mnRight(rBorderSize.mnRight), - mnBottom(rBorderSize.mnBottom) -{ -} - -BorderSize& BorderSize::operator= (const BorderSize& rBorderSize) -{ - if (&rBorderSize != this) - { - mnLeft = rBorderSize.mnLeft; - mnTop = rBorderSize.mnTop; - mnRight = rBorderSize.mnRight; - mnBottom = rBorderSize.mnBottom; - } - return *this; -} - //===== RendererPaneStyle ============================================================ RendererPaneStyle::RendererPaneStyle ( diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx index 470ef3d92c50..dd0ca9170e38 100644 --- a/sdext/source/presenter/PresenterToolBar.cxx +++ b/sdext/source/presenter/PresenterToolBar.cxx @@ -67,7 +67,6 @@ namespace { { public: Text (void); - Text (const Text& rText); Text ( const OUString& rsText, const PresenterTheme::SharedFontDescriptor& rpFont); @@ -1698,12 +1697,6 @@ Text::Text (void) { } -Text::Text (const Text& rText) - : msText(rText.msText), - mpFont(rText.mpFont) -{ -} - Text::Text ( const OUString& rsText, const PresenterTheme::SharedFontDescriptor& rpFont) |