diff options
| author | Christian Lippka <christian.lippka@sun.com> | 2010-04-30 10:43:18 +0200 |
|---|---|---|
| committer | Christian Lippka <christian.lippka@sun.com> | 2010-04-30 10:43:18 +0200 |
| commit | 66973bc3700b4593c93e3fe2667a37f915381e29 (patch) | |
| tree | ff58818d50cf4e8064e45140853ab656985d25c2 /sd/source | |
| parent | renaissance2: rebase m77 (diff) | |
| download | core-66973bc3700b4593c93e3fe2667a37f915381e29.tar.gz core-66973bc3700b4593c93e3fe2667a37f915381e29.zip | |
fixed unix compiler warnings
Diffstat (limited to 'sd/source')
| -rw-r--r--[-rwxr-xr-x] | sd/source/ui/controller/slidelayoutcontroller.hxx | 1 | ||||
| -rwxr-xr-x | sd/source/ui/inc/View.hxx | 1 | ||||
| -rw-r--r--[-rwxr-xr-x] | sd/source/ui/view/makefile.mk | 1 |
3 files changed, 2 insertions, 1 deletions
diff --git a/sd/source/ui/controller/slidelayoutcontroller.hxx b/sd/source/ui/controller/slidelayoutcontroller.hxx index 9e1c1692f953..5e76d3ad74c7 100755..100644 --- a/sd/source/ui/controller/slidelayoutcontroller.hxx +++ b/sd/source/ui/controller/slidelayoutcontroller.hxx @@ -44,6 +44,7 @@ public: virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); + using svt::PopupWindowController::createPopupWindow; private: bool mbInsertPage; }; diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx index c2aacfaa2cb7..2b6c1a8abb77 100755 --- a/sd/source/ui/inc/View.hxx +++ b/sd/source/ui/inc/View.hxx @@ -209,7 +209,6 @@ public: void SetMarkedSegmentsKindPossible( bool bSet ) { bSetMarkedSegmentsKindPossible = bSet; } SdrObject* GetEmptyPresentationObject( PresObjKind eKind ); - protected: DECL_LINK( OnParagraphInsertedHdl, ::Outliner * ); DECL_LINK( OnParagraphRemovingHdl, ::Outliner * ); diff --git a/sd/source/ui/view/makefile.mk b/sd/source/ui/view/makefile.mk index 3ef489cadf94..2cc2a96d46a2 100755..100644 --- a/sd/source/ui/view/makefile.mk +++ b/sd/source/ui/view/makefile.mk @@ -53,6 +53,7 @@ SLOFILES = \ $(SLO)$/sdview2.obj \ $(SLO)$/sdview3.obj \ $(SLO)$/sdview4.obj \ + $(SLO)$/sdview5.obj \ $(SLO)$/viewshel.obj \ $(SLO)$/viewshe2.obj \ $(SLO)$/viewshe3.obj \ |