diff options
| author | Christian Lippka <christian.lippka@sun.com> | 2010-06-07 16:51:17 +0200 |
|---|---|---|
| committer | Christian Lippka <christian.lippka@sun.com> | 2010-06-07 16:51:17 +0200 |
| commit | 9cc5a08e09f6977a7000a28a26accd4374c36102 (patch) | |
| tree | 53b77c4a7abd1f951cfd6b1c602683799cc15670 /sd/inc | |
| parent | 73637454a30efca9e4f515da64975037def535fd (diff) | |
| parent | 0cd8711b971b9700101605734c83408cbf3ca056 (diff) | |
cws impress190: merging
Diffstat (limited to 'sd/inc')
| -rw-r--r-- | sd/inc/Outliner.hxx | 3 | ||||
| -rw-r--r-- | sd/inc/stlpool.hxx | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/sd/inc/Outliner.hxx b/sd/inc/Outliner.hxx index 1b608fa7b637..dfc7e3e3bf88 100644 --- a/sd/inc/Outliner.hxx +++ b/sd/inc/Outliner.hxx @@ -136,6 +136,9 @@ public: */ void StartSpelling (void); + /** Proxy for method from base class to avoid compiler warning */ + void StartSpelling(EditView&, unsigned char); + /** Initiate a find and/or replace on the next relevant text object. @return Returns </TRUE> when the search/replace is finished (as diff --git a/sd/inc/stlpool.hxx b/sd/inc/stlpool.hxx index e8baba1aa79e..fd9dbeae5977 100644 --- a/sd/inc/stlpool.hxx +++ b/sd/inc/stlpool.hxx @@ -124,6 +124,8 @@ public: virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL acquire (void) throw (); + virtual void SAL_CALL release (void) throw (); protected: void CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily eFamily ); |