diff options
| author | Noel Grandin <noel@peralex.com> | 2015-07-24 16:22:29 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-07-27 08:18:16 +0200 |
| commit | 38ecca9b30e0fc5f7cc6264857f983e40dd58195 (patch) | |
| tree | 3ad61e6d5cddcf161d27cfe4c6ca85fcf1cab8f6 /include/sfx2 | |
| parent | efac5fa06e2d00bd67c582d8a6b1f1fc69c9b9f5 (diff) | |
inline a bunch of use-once macros
no point in having a macro unless it's actually going to reduce the
number of lines of code
Change-Id: Ic8760d6506cf272d7bd088f7b3b4dcbf288099fc
Diffstat (limited to 'include/sfx2')
| -rw-r--r-- | include/sfx2/childwin.hxx | 8 | ||||
| -rw-r--r-- | include/sfx2/sfxuno.hxx | 26 |
2 files changed, 0 insertions, 34 deletions
diff --git a/include/sfx2/childwin.hxx b/include/sfx2/childwin.hxx index dc9ec5f9ac26..9dee7f69c969 100644 --- a/include/sfx2/childwin.hxx +++ b/include/sfx2/childwin.hxx @@ -349,14 +349,6 @@ public: static_cast<SfxDockingWindow*>(GetWindow())->FillInfo( aInfo ); \ return aInfo; } -#define SFX_IMPL_TOOLBOX(Class, MyID) \ - SFX_IMPL_CHILDWINDOW(Class, MyID) \ - SfxChildWinInfo Class::GetInfo() const \ - { \ - SfxChildWinInfo aInfo = SfxChildWindow::GetInfo(); \ - static_cast<SfxToolbox*>(GetWindow())->FillInfo( aInfo ); \ - return aInfo; } - bool GetPosSizeFromString( const OUString& rStr, Point& rPos, Size& rSize ); bool GetSplitSizeFromString( const OUString& rStr, Size& rSize ); diff --git a/include/sfx2/sfxuno.hxx b/include/sfx2/sfxuno.hxx index 2e773ed50ce6..7a0a213d57f1 100644 --- a/include/sfx2/sfxuno.hxx +++ b/include/sfx2/sfxuno.hxx @@ -65,32 +65,6 @@ bool GetEncryptionData_Impl( const SfxItemSet* pSet, css::uno::Sequence< css::be typedef sal_Int32 FrameSearchFlags; -// macros for declaration and definition of uno-services - -// declaration of XInterface::queryInterface() -// XInterface::acquire() -// XInterface::release() -// XTypeProvider::getTypes() -// XTypeProvider::getImplementationId() -// XServiceInfo::getImplementationName() -// XServiceInfo::supportsService() -// XServiceInfo::getSupportedServiceNames() -// static xxx::impl_getStaticSupportedServiceNames() -// static xxx::impl_getStaticImplementationName() -// static xxx::impl_createInstance() -#define SFX_DECL_XSERVICEINFO_NOFACTORY \ - /* XServiceInfo */ \ - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; \ - virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; \ - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; \ - \ - /* Helper for XServiceInfo */ \ - static css::uno::Sequence< OUString > impl_getStaticSupportedServiceNames(); \ - static OUString impl_getStaticImplementationName(); \ - \ - /* Helper for registry */ \ - static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception ); - #endif // INCLUDED_SFX2_SFXUNO_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |