summaryrefslogtreecommitdiff
path: root/slideshow
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2012-03-14 13:27:56 +0100
committerStephan Bergmann <sbergman@redhat.com>2012-03-14 13:32:02 +0100
commit6e67c03dc0225fc66343546b14e902b9d238b1a3 (patch)
tree6e078783d65e280a721b4e46f0ae0ca6b950f121 /slideshow
parentfe4be5047988782f3143a1af505c5eecb3f2af5a (diff)
Enable -Wnon-virtual-dtor for GCC 4.6
...which has the necessary features to support it. Change a lot of classes to either contain a protected non-virtual dtor (which is backwards compatible, so even works for cppumaker-generated UNO headers) or a public virtual one. cppuhelper/propertysetmixin.hxx still needs to disable the warning, as the relevant class has a non-virtual dtor but friends, which would still cause GCC to warn. Includes a patch for libcmis, intended to be upstreamed.
Diffstat (limited to 'slideshow')
-rw-r--r--slideshow/source/inc/doctreenodesupplier.hxx3
-rw-r--r--slideshow/source/inc/hyperlinkarea.hxx3
-rw-r--r--slideshow/source/inc/hyperlinkhandler.hxx3
-rw-r--r--slideshow/source/inc/pauseeventhandler.hxx3
-rw-r--r--slideshow/source/inc/screenupdater.hxx8
-rw-r--r--slideshow/source/inc/slide.hxx3
6 files changed, 22 insertions, 1 deletions
diff --git a/slideshow/source/inc/doctreenodesupplier.hxx b/slideshow/source/inc/doctreenodesupplier.hxx
index 971ad028cb03..943a4b16af2c 100644
--- a/slideshow/source/inc/doctreenodesupplier.hxx
+++ b/slideshow/source/inc/doctreenodesupplier.hxx
@@ -144,6 +144,9 @@ namespace slideshow
virtual DocTreeNode getSubsetTreeNode( const DocTreeNode& rParentNode,
sal_Int32 nNodeIndex,
DocTreeNode::NodeType eNodeType ) const = 0; // throw ShapeLoadFailedException;
+
+ protected:
+ ~DocTreeNodeSupplier() {}
};
}
diff --git a/slideshow/source/inc/hyperlinkarea.hxx b/slideshow/source/inc/hyperlinkarea.hxx
index 14a1064b51d4..32426d4bdb9d 100644
--- a/slideshow/source/inc/hyperlinkarea.hxx
+++ b/slideshow/source/inc/hyperlinkarea.hxx
@@ -96,6 +96,9 @@ namespace slideshow
return nPrioL == nPrioR ? rLHS.get() < rRHS.get() : nPrioL < nPrioR;
}
};
+
+ protected:
+ ~HyperlinkArea() {}
};
typedef boost::shared_ptr< HyperlinkArea > HyperlinkAreaSharedPtr;
diff --git a/slideshow/source/inc/hyperlinkhandler.hxx b/slideshow/source/inc/hyperlinkhandler.hxx
index 0d3ccfd2ed0d..2abef61e6d65 100644
--- a/slideshow/source/inc/hyperlinkhandler.hxx
+++ b/slideshow/source/inc/hyperlinkhandler.hxx
@@ -59,6 +59,9 @@ namespace slideshow
too.
*/
virtual bool handleHyperlink( ::rtl::OUString const& rLink ) = 0;
+
+ protected:
+ ~HyperlinkHandler() {}
};
typedef ::boost::shared_ptr< HyperlinkHandler > HyperlinkHandlerSharedPtr;
diff --git a/slideshow/source/inc/pauseeventhandler.hxx b/slideshow/source/inc/pauseeventhandler.hxx
index d830ee0d5f46..c5f01a86e440 100644
--- a/slideshow/source/inc/pauseeventhandler.hxx
+++ b/slideshow/source/inc/pauseeventhandler.hxx
@@ -60,6 +60,9 @@ namespace slideshow
called, too.
*/
virtual bool handlePause( bool bPauseShow ) = 0;
+
+ protected:
+ ~PauseEventHandler() {}
};
typedef ::boost::shared_ptr< PauseEventHandler > PauseEventHandlerSharedPtr;
diff --git a/slideshow/source/inc/screenupdater.hxx b/slideshow/source/inc/screenupdater.hxx
index 15ed1e26f3fe..c779efc144fc 100644
--- a/slideshow/source/inc/screenupdater.hxx
+++ b/slideshow/source/inc/screenupdater.hxx
@@ -109,7 +109,13 @@ namespace slideshow
*/
void requestImmediateUpdate();
- class UpdateLock {public: virtual void Activate (void) = 0; };
+ class UpdateLock {
+ public:
+ virtual void Activate (void) = 0;
+
+ protected:
+ ~UpdateLock() {}
+ };
/** Call this method to create a lock instead of calling
lockUpdates() and unlockUpdates() directly.
diff --git a/slideshow/source/inc/slide.hxx b/slideshow/source/inc/slide.hxx
index d39a1b315785..7b39419ca0b8 100644
--- a/slideshow/source/inc/slide.hxx
+++ b/slideshow/source/inc/slide.hxx
@@ -155,6 +155,9 @@ namespace slideshow
*/
virtual SlideBitmapSharedPtr
getCurrentSlideBitmap( const UnoViewSharedPtr& rView ) const = 0;
+
+ protected:
+ ~Slide() {}
};
typedef ::boost::shared_ptr< Slide > SlideSharedPtr;