diff options
author | Noel Grandin <noel@peralex.com> | 2014-06-25 14:57:44 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-07-11 14:12:25 +0200 |
commit | dac4ca5f682fdd0c3eee7f7ee1d98c9b3c8b7ce4 (patch) | |
tree | f0f66445c3f396759c41d7e3294e728653dbfa88 /sd | |
parent | 28b6325901138a6267320902ec889fc434ddde91 (diff) |
new loplugin: externalandnotdefined
Find "missing headers," where a function is declared directly in the
.cxx (as extern) and not defined, and should arguably instead be declared
in an include file.
Change-Id: I6d83ee432b2ab0cd050aec2b27c3658d32ac02a2
Diffstat (limited to 'sd')
-rw-r--r-- | sd/inc/CustomAnimationPreset.hxx | 5 | ||||
-rw-r--r-- | sd/source/core/TransitionPreset.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/animations/CustomAnimationCreateDialog.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/animations/CustomAnimationDialog.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/animations/CustomAnimationList.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/animations/CustomAnimationList.hxx | 4 | ||||
-rw-r--r-- | sd/source/ui/animations/CustomAnimationPane.hxx | 2 | ||||
-rw-r--r-- | sd/source/ui/annotations/annotationmanager.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/annotations/annotationmanagerimpl.hxx | 6 | ||||
-rw-r--r-- | sd/source/ui/annotations/annotationwindow.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/annotations/annotationwindow.hxx | 4 | ||||
-rw-r--r-- | sd/source/ui/controller/slidelayoutcontroller.cxx | 3 | ||||
-rw-r--r-- | sd/source/ui/inc/ViewShellBase.hxx | 3 | ||||
-rw-r--r-- | sd/source/ui/inc/unopage.hxx (renamed from sd/source/ui/unoidl/unopage.hxx) | 2 | ||||
-rw-r--r-- | sd/source/ui/slideshow/slideshow.cxx | 3 | ||||
-rw-r--r-- | sd/source/ui/slideshow/slideshowimpl.cxx | 3 | ||||
-rw-r--r-- | sd/source/ui/unoidl/unoobj.cxx | 2 |
17 files changed, 31 insertions, 24 deletions
diff --git a/sd/inc/CustomAnimationPreset.hxx b/sd/inc/CustomAnimationPreset.hxx index c380ba60dbcb..efe50de9d87f 100644 --- a/sd/inc/CustomAnimationPreset.hxx +++ b/sd/inc/CustomAnimationPreset.hxx @@ -138,8 +138,13 @@ private: typedef boost::shared_ptr< CustomAnimationPresets > CustomAnimationPresetsPtr; +css::uno::Reference< css::animations::XAnimationNode > implImportEffects( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceFactory, const OUString& rPath ); + +void implImportLabels( const css::uno::Reference< css::lang::XMultiServiceFactory >& xConfigProvider, const OUString& rNodePath, UStringMap& rStringMap ); + } + #endif // _SD_CUSTOMANIMATIONEFFECTS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/core/TransitionPreset.cxx b/sd/source/core/TransitionPreset.cxx index 7ba9a5d07699..06662b9dea4a 100644 --- a/sd/source/core/TransitionPreset.cxx +++ b/sd/source/core/TransitionPreset.cxx @@ -37,6 +37,7 @@ #include <rtl/instance.hxx> #include <tools/debug.hxx> +#include <CustomAnimationPreset.hxx> #include <TransitionPreset.hxx> #include <unotools/ucbstreamhelper.hxx> @@ -60,9 +61,6 @@ using ::com::sun::star::beans::NamedValue; namespace sd { -extern Reference< XAnimationNode > implImportEffects( const Reference< XMultiServiceFactory >& xServiceFactory, const OUString& rPath ); -extern void implImportLabels( const Reference< XMultiServiceFactory >& xConfigProvider, const OUString& rNodePath, UStringMap& rStringMap ); - TransitionPreset::TransitionPreset( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ) { // first locate preset id diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx index e9f1f23d81c8..de4b5b1c9a81 100644 --- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx @@ -63,8 +63,6 @@ const int EXIT = 2; const int MOTIONPATH = 3; const int MISCEFFECTS = 4; -extern void fillDurationComboBox( ListBox* pBox ); - class CategoryListBox : public ListBox { public: diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx index 0af0d213b462..99446e92d7b9 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationDialog.cxx @@ -95,10 +95,6 @@ using ::com::sun::star::beans::XPropertySet; namespace sd { -extern void fillDurationComboBox( ListBox* pBox ); -extern OUString getShapeDescription( const Reference< XShape >& xShape, bool bWithText = true ); -extern OUString getPropertyName( sal_Int32 nPropertyType ); - class PresetPropertyBox : public PropertySubControl { public: diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx index 3a23857f4c3a..e215e5b92c42 100644 --- a/sd/source/ui/animations/CustomAnimationList.cxx +++ b/sd/source/ui/animations/CustomAnimationList.cxx @@ -122,7 +122,7 @@ static sal_Int32 getShapeIndex( const Reference< XShape >& xShape ) return -1; } -OUString getShapeDescription( const Reference< XShape >& xShape, bool bWithText = true ) +OUString getShapeDescription( const Reference< XShape >& xShape, bool bWithText ) { OUString aDescription; Reference< XPropertySet > xSet( xShape, UNO_QUERY ); diff --git a/sd/source/ui/animations/CustomAnimationList.hxx b/sd/source/ui/animations/CustomAnimationList.hxx index 74942dcc2698..b8d121df9423 100644 --- a/sd/source/ui/animations/CustomAnimationList.hxx +++ b/sd/source/ui/animations/CustomAnimationList.hxx @@ -112,6 +112,10 @@ private: }; +OUString getPropertyName( sal_Int32 nPropertyType ); + +OUString getShapeDescription( const css::uno::Reference< css::drawing::XShape >& xShape, bool bWithText = true ); + } #endif // INCLUDED_SD_SOURCE_UI_ANIMATIONS_CUSTOMANIMATIONLIST_HXX diff --git a/sd/source/ui/animations/CustomAnimationPane.hxx b/sd/source/ui/animations/CustomAnimationPane.hxx index c2665b76e2be..e9fbbc10cfa2 100644 --- a/sd/source/ui/animations/CustomAnimationPane.hxx +++ b/sd/source/ui/animations/CustomAnimationPane.hxx @@ -177,6 +177,8 @@ private: void fillRepeatComboBox( ListBox* pBox ); +void fillDurationComboBox( ListBox* pBox ); + } #endif // INCLUDED_SD_SOURCE_UI_ANIMATIONS_CUSTOMANIMATIONPANE_HXX diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index 8213cd9d8e9c..613c2da963fa 100644 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx @@ -101,8 +101,6 @@ using namespace ::com::sun::star::office; namespace sd { -extern TextApiObject* getTextApiObject( const Reference< XAnnotation >& xAnnotation ); - SfxItemPool* GetAnnotationPool() { static SfxItemPool* mpAnnotationPool = 0; diff --git a/sd/source/ui/annotations/annotationmanagerimpl.hxx b/sd/source/ui/annotations/annotationmanagerimpl.hxx index 8ad5c1659598..36b40e40870c 100644 --- a/sd/source/ui/annotations/annotationmanagerimpl.hxx +++ b/sd/source/ui/annotations/annotationmanagerimpl.hxx @@ -127,6 +127,12 @@ private: Font maFont; }; +OUString getAnnotationDateTimeString( const css::uno::Reference< css::office::XAnnotation >& xAnnotation ); + +SfxItemPool* GetAnnotationPool(); + +com::sun::star::util::DateTime getCurrentDateTime(); + } #endif // INCLUDED_SD_SOURCE_UI_ANNOTATIONS_ANNOTATIONMANAGERIMPL_HXX diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx index 7665fbe39d84..9c6e530e0bc6 100644 --- a/sd/source/ui/annotations/annotationwindow.cxx +++ b/sd/source/ui/annotations/annotationwindow.cxx @@ -100,10 +100,6 @@ using namespace ::com::sun::star::text; namespace sd { -extern OUString getAnnotationDateTimeString( const Reference< XAnnotation >& xAnnotation ); -extern SfxItemPool* GetAnnotationPool(); -extern com::sun::star::util::DateTime getCurrentDateTime(); - Color ColorFromAlphaColor(sal_uInt8 aTransparency, Color &aFront, Color &aBack ) { return Color((sal_uInt8)(aFront.GetRed() * aTransparency/(double)255 + aBack.GetRed() * (1-aTransparency/(double)255)), diff --git a/sd/source/ui/annotations/annotationwindow.hxx b/sd/source/ui/annotations/annotationwindow.hxx index fc692a0944a6..1a7582b5d91a 100644 --- a/sd/source/ui/annotations/annotationwindow.hxx +++ b/sd/source/ui/annotations/annotationwindow.hxx @@ -43,6 +43,7 @@ namespace sd { class AnnotationManagerImpl; class AnnotationWindow; class DrawDocShell; +class TextApiObject; class View; class AnnotationTextWindow : public Control @@ -155,6 +156,9 @@ class AnnotationWindow : public FloatingWindow Color maColorLight; }; +TextApiObject* getTextApiObject( const css::uno::Reference< css::office::XAnnotation >& xAnnotation ); + + } // namespace sd #endif diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx index 5c199a302a10..790b7af599a5 100644 --- a/sd/source/ui/controller/slidelayoutcontroller.cxx +++ b/sd/source/ui/controller/slidelayoutcontroller.cxx @@ -50,6 +50,7 @@ #include "sdresid.hxx" #include "pres.hxx" #include "slidelayoutcontroller.hxx" +#include "ViewShellBase.hxx" using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -62,8 +63,6 @@ using namespace ::com::sun::star::beans; namespace sd { -extern OUString ImplRetrieveLabelFromCommand( const Reference< XFrame >& xFrame, const OUString& aCmdURL ); - class LayoutToolbarMenu : public svtools::ToolbarMenu { public: diff --git a/sd/source/ui/inc/ViewShellBase.hxx b/sd/source/ui/inc/ViewShellBase.hxx index 038de7685c9f..e2c7514137cd 100644 --- a/sd/source/ui/inc/ViewShellBase.hxx +++ b/sd/source/ui/inc/ViewShellBase.hxx @@ -252,6 +252,9 @@ private: OUString GetInitialViewShellType (void); }; +OUString ImplRetrieveLabelFromCommand( const css::uno::Reference< css::frame::XFrame >& xFrame, const OUString& aCmdURL ); + + } // end of namespace sd #endif diff --git a/sd/source/ui/unoidl/unopage.hxx b/sd/source/ui/inc/unopage.hxx index 62a3b245864f..e0c70e2c3e2f 100644 --- a/sd/source/ui/unoidl/unopage.hxx +++ b/sd/source/ui/inc/unopage.hxx @@ -313,6 +313,8 @@ public: virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; +OUString getUiNameFromPageApiNameImpl( const OUString& rApiName ); + #endif // INCLUDED_SD_SOURCE_UI_UNOIDL_UNOPAGE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx index 57be255a37ff..eaf5b737c4fe 100644 --- a/sd/source/ui/slideshow/slideshow.cxx +++ b/sd/source/ui/slideshow/slideshow.cxx @@ -52,6 +52,7 @@ #include "DrawController.hxx" #include "customshowlist.hxx" #include <boost/bind.hpp> +#include "unopage.hxx" using ::com::sun::star::presentation::XSlideShowController; using ::com::sun::star::container::XIndexAccess; @@ -67,8 +68,6 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::animations; using namespace ::com::sun::star::drawing::framework; -extern OUString getUiNameFromPageApiNameImpl( const OUString& rApiName ); - namespace { /** This local version of the work window overloads DataChanged() so that it can restart the slide show when a display is added or removed. diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index aeaf2121b707..606f804f2d8d 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -76,6 +76,7 @@ #include "svtools/colrdlg.hxx" #include "RemoteServer.hxx" #include "customshowlist.hxx" +#include "unopage.hxx" #include <boost/bind.hpp> @@ -92,8 +93,6 @@ using namespace ::com::sun::star::document; using namespace ::com::sun::star::presentation; using namespace ::com::sun::star::beans; -extern OUString getUiNameFromPageApiNameImpl( const OUString& rApiName ); - namespace sd { /** Slots, which will be disabled in the slide show and are managed by Sfx. diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx index 6c39a974dec7..c124631157ea 100644 --- a/sd/source/ui/unoidl/unoobj.cxx +++ b/sd/source/ui/unoidl/unoobj.cxx @@ -85,8 +85,6 @@ using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; using ::com::sun::star::drawing::XShape; -extern OUString getUiNameFromPageApiNameImpl( const OUString& rApiName ); - typedef std::map<sal_uIntPtr, SfxExtItemPropertySetInfo*> SdExtPropertySetInfoCache; static SdExtPropertySetInfoCache gImplImpressPropertySetInfoCache; static SdExtPropertySetInfoCache gImplDrawPropertySetInfoCache; |