diff options
22 files changed, 1 insertions, 115 deletions
diff --git a/comphelper/source/inc/comphelper_module.hxx b/comphelper/source/inc/comphelper_module.hxx index 11f5c36dbf37..aaa547649b8e 100644 --- a/comphelper/source/inc/comphelper_module.hxx +++ b/comphelper/source/inc/comphelper_module.hxx @@ -39,19 +39,6 @@ namespace comphelper::module ComphelperModule(); }; - /* -------------------------------------------------------------------- */ - template < class TYPE > - class OAutoRegistration : public ::comphelper::OAutoRegistration< TYPE > - { - private: - typedef ::comphelper::OAutoRegistration< TYPE > BaseClass; - - public: - OAutoRegistration() : BaseClass( ComphelperModule::getInstance() ) - { - } - }; - } // namespace comphelper::module diff --git a/comphelper/source/misc/componentmodule.cxx b/comphelper/source/misc/componentmodule.cxx index 76c3b823557f..d4e23c70f48e 100644 --- a/comphelper/source/misc/componentmodule.cxx +++ b/comphelper/source/misc/componentmodule.cxx @@ -74,13 +74,6 @@ namespace comphelper registerImplementation( aComponent ); } - void* OModule::getComponentFactory( const char* _pImplementationName ) - { - Reference< XInterface > xFactory( getComponentFactory( - OUString::createFromAscii( _pImplementationName ) ) ); - return xFactory.get(); - } - Reference< XInterface > OModule::getComponentFactory( const OUString& _rImplementationName ) { Reference< XInterface > xReturn; diff --git a/connectivity/source/inc/calc/CDriver.hxx b/connectivity/source/inc/calc/CDriver.hxx index 73b2f564c149..02d9dea55033 100644 --- a/connectivity/source/inc/calc/CDriver.hxx +++ b/connectivity/source/inc/calc/CDriver.hxx @@ -38,8 +38,6 @@ namespace connectivity css::uno::XComponentContext >& _rxContext) : file::OFileDriver(_rxContext) {} - /// @throws css::uno::RuntimeException - static OUString getImplementationName_Static( ); OUString SAL_CALL getImplementationName( ) override; // XDriver diff --git a/connectivity/source/inc/dbase/DDriver.hxx b/connectivity/source/inc/dbase/DDriver.hxx index 9378b4c5f693..63de640dfe22 100644 --- a/connectivity/source/inc/dbase/DDriver.hxx +++ b/connectivity/source/inc/dbase/DDriver.hxx @@ -36,12 +36,8 @@ namespace connectivity public: ODriver(const css::uno::Reference< css::uno::XComponentContext >& _rxContext) : file::OFileDriver(_rxContext){} - // XInterface - /// @throws css::uno::RuntimeException - static OUString getImplementationName_Static( ); - // static css::uno::Sequence< OUString > getSupportedServiceNames_Static( ) throw (css::uno::RuntimeException); - OUString SAL_CALL getImplementationName( ) override; + // XDriver virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL connect( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) override; virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) override; diff --git a/connectivity/source/inc/flat/EDriver.hxx b/connectivity/source/inc/flat/EDriver.hxx index c818b363203a..9b5669920415 100644 --- a/connectivity/source/inc/flat/EDriver.hxx +++ b/connectivity/source/inc/flat/EDriver.hxx @@ -36,11 +36,6 @@ namespace connectivity public: ODriver(const css::uno::Reference< css::uno::XComponentContext >& _rxContext) : file::OFileDriver(_rxContext){} - // XInterface - /// @throws css::uno::RuntimeException - static OUString getImplementationName_Static( ); - // static css::uno::Sequence< OUString > getSupportedServiceNames_Static( ) throw (css::uno::RuntimeException); - OUString SAL_CALL getImplementationName( ) override; // XDriver virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL connect( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) override; diff --git a/dbaccess/source/filter/xml/xmlExport.hxx b/dbaccess/source/filter/xml/xmlExport.hxx index 337163f648db..118e3ac94cfa 100644 --- a/dbaccess/source/filter/xml/xmlExport.hxx +++ b/dbaccess/source/filter/xml/xmlExport.hxx @@ -164,16 +164,6 @@ public: ODBExport(const Reference< XComponentContext >& _rxContext, OUString const & implementationName, SvXMLExportFlags nExportFlag = SvXMLExportFlags::CONTENT | SvXMLExportFlags::AUTOSTYLES | SvXMLExportFlags::PRETTY | SvXMLExportFlags::FONTDECLS | SvXMLExportFlags::SCRIPTS ); - /// @throws css::uno::RuntimeException - static OUString getImplementationName_Static(); - - /// @throws css::uno::RuntimeException - static css::uno::Sequence<OUString> - getSupportedServiceNames_Static(); - - static css::uno::Reference<css::uno::XInterface> Create( - css::uno::Reference<css::lang::XMultiServiceFactory> const & _rxORB); - rtl::Reference < XMLPropertySetMapper > const & GetColumnStylesPropertySetMapper() const; rtl::Reference < XMLPropertySetMapper > const & GetCellStylesPropertySetMapper() const; diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx index bafe618bacc9..bcf498e8c16e 100644 --- a/dbaccess/source/filter/xml/xmlfilter.cxx +++ b/dbaccess/source/filter/xml/xmlfilter.cxx @@ -201,18 +201,6 @@ OUString ODBFilter::getImplementationName_Static() } -css::uno::Sequence<OUString> ODBFilter::getSupportedServiceNames_Static() -{ - return { "com.sun.star.document.ImportFilter" }; -} - - -css::uno::Reference< css::uno::XInterface > - ODBFilter::Create(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxORB) -{ - return static_cast< XServiceInfo* >(new ODBFilter( comphelper::getComponentContext(_rxORB))); -} - namespace { class FocusWindowWaitGuard { diff --git a/dbaccess/source/filter/xml/xmlfilter.hxx b/dbaccess/source/filter/xml/xmlfilter.hxx index 983b7da5f6bf..9e5e3965ec37 100644 --- a/dbaccess/source/filter/xml/xmlfilter.hxx +++ b/dbaccess/source/filter/xml/xmlfilter.hxx @@ -92,13 +92,6 @@ public: /// @throws css::uno::RuntimeException static OUString getImplementationName_Static(); - /// @throws css::uno::RuntimeException - static css::uno::Sequence<OUString> - getSupportedServiceNames_Static(); - - static css::uno::Reference<css::uno::XInterface> Create( - css::uno::Reference<css::lang::XMultiServiceFactory> const & _rxORB); - // helper class virtual void SetViewSettings(const css::uno::Sequence<css::beans::PropertyValue>& aViewProps) override; virtual void SetConfigurationSettings(const css::uno::Sequence<css::beans::PropertyValue>& aConfigProps) override; diff --git a/include/comphelper/componentmodule.hxx b/include/comphelper/componentmodule.hxx index cfffcb39b844..0ca1b7e5a457 100644 --- a/include/comphelper/componentmodule.hxx +++ b/include/comphelper/componentmodule.hxx @@ -118,10 +118,6 @@ namespace comphelper css::uno::Reference< css::uno::XInterface > getComponentFactory( const OUString& _rImplementationName ); - /** version of getComponentFactory which directly takes the char argument you got in your component_getFactory call - */ - void* getComponentFactory( const char* _pImplementationName ); - private: OModule( const OModule& ) = delete; OModule& operator=( const OModule& ) = delete; diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx index 9ace81d5d3f3..b5ffad460555 100644 --- a/include/svtools/editbrowsebox.hxx +++ b/include/svtools/editbrowsebox.hxx @@ -178,8 +178,6 @@ namespace svt public: GenericEditImplementation( EDIT& _rEdit ); - EDIT& GetEditWindow() { return static_cast< EDIT& >( GetControl() ); } - virtual Control& GetControl() override; virtual OUString GetText( LineEnd aSeparator ) const override; diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx index e48c5748d38f..84e10a8fd963 100644 --- a/include/vcl/edit.hxx +++ b/include/vcl/edit.hxx @@ -171,7 +171,6 @@ public: virtual void SetModifyFlag(); virtual void ClearModifyFlag(); - virtual bool IsModified() const { return mpSubEdit ? mpSubEdit->mbModified : mbModified; } void SetEchoChar( sal_Unicode c ); sal_Unicode GetEchoChar() const { return mcEchoChar; } diff --git a/include/vcl/toolkit/button.hxx b/include/vcl/toolkit/button.hxx index bcc7ac1c40cb..1f47597397a2 100644 --- a/include/vcl/toolkit/button.hxx +++ b/include/vcl/toolkit/button.hxx @@ -157,17 +157,12 @@ public: void EnableTriState( bool bTriState = true ); bool IsTriStateEnabled() const { return mbTriState; } - void SaveValue() { meSaveValue = GetState(); } - TriState GetSavedValue() const { return meSaveValue; } - bool IsValueChangedFromSaved() const { return meSaveValue != GetState(); } - static Image GetCheckImage( const AllSettings& rSettings, DrawButtonFlags nFlags ); Size CalcMinimumSize( long nMaxWidth = 0 ) const; virtual Size GetOptimalSize() const override; void SetToggleHdl( const Link<CheckBox&,void>& rLink ) { maToggleHdl = rLink; } - void SetLegacyNoTextAlign( bool bVal ) { mbLegacyNoTextAlign = bVal; } virtual bool set_property(const OString &rKey, const OUString &rValue) override; virtual void ShowFocus(const tools::Rectangle& rRect) override; diff --git a/include/vcl/vclmedit.hxx b/include/vcl/vclmedit.hxx index a21e7ba66b83..9292ebe037cd 100644 --- a/include/vcl/vclmedit.hxx +++ b/include/vcl/vclmedit.hxx @@ -110,7 +110,6 @@ public: virtual void SetModifyFlag() override; virtual void ClearModifyFlag() override; - virtual bool IsModified() const override; void EnableUpdateData( sal_uLong nTimeout ); virtual void UpdateData(); diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index c4cd34f52513..bcd98f64d572 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -1149,8 +1149,6 @@ public: void SetHelpId( const OString& ); const OString& GetHelpId() const; - vcl::Window* FindWindow( const Point& rPos ) const; - sal_uInt16 GetChildCount() const; vcl::Window* GetChild( sal_uInt16 nChild ) const; vcl::Window* GetWindow( GetWindowType nType ) const; diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index c6e280205eb9..4c1eb3211412 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -2065,11 +2065,6 @@ VclPtr<Control> DbCurrencyField::createField(BrowserDataWin* pParent, bool bSpin return VclPtr<LongCurrencyControl>::Create(pParent, bSpinButton); } -double DbCurrencyField::GetCurrency(const Reference< css::sdb::XColumn >& _rxField, const Reference< XNumberFormatter >& xFormatter) const -{ - return GetValue(_rxField, xFormatter); -} - namespace { OUString lcl_setFormattedCurrency_nothrow( FormattedControlBase& _rField, const DbCurrencyField& _rControl, diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx index 6b4a3afc8585..d62e08d094c2 100644 --- a/svx/source/inc/gridcell.hxx +++ b/svx/source/inc/gridcell.hxx @@ -608,8 +608,6 @@ public: virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = nullptr) override; virtual void UpdateFromField(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter) override; - double GetCurrency(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter) const; - protected: // DbCellControl virtual bool commitControl( ) override; diff --git a/ucb/source/cacher/cacheddynamicresultsetstub.hxx b/ucb/source/cacher/cacheddynamicresultsetstub.hxx index 5ce4f3bfacaa..50bb06c93d95 100644 --- a/ucb/source/cacher/cacheddynamicresultsetstub.hxx +++ b/ucb/source/cacher/cacheddynamicresultsetstub.hxx @@ -86,10 +86,6 @@ public: virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; - static css::uno::Reference< css::lang::XSingleServiceFactory > - createServiceFactory( const css::uno::Reference< - css::lang::XMultiServiceFactory >& rxServiceMgr ); - // XCachedDynamicResultSetStubFactory virtual css::uno::Reference< css::ucb::XDynamicResultSet > SAL_CALL diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx index 1e2fa89786c6..d5061b3e066c 100644 --- a/vcl/inc/salvtables.hxx +++ b/vcl/inc/salvtables.hxx @@ -648,9 +648,6 @@ public: // one thing for focus virtual bool has_focus() const override; - //so with hh::mm::ss, incrementing mm will not reset ss - void DisableRemainderFactor(); - //off by default for direct SpinButtons, MetricSpinButton enables it void SetUseThousandSep(); diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx index a4f8fb427230..74436a1644e9 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -5284,12 +5284,6 @@ bool SalInstanceSpinButton::has_focus() const return m_xWidget->HasChildPathFocus(); } -//so with hh::mm::ss, incrementing mm will not reset ss -void SalInstanceSpinButton::DisableRemainderFactor() -{ - m_rFormatter.DisableRemainderFactor(); -} - //off by default for direct SpinButtons, MetricSpinButton enables it void SalInstanceSpinButton::SetUseThousandSep() { diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx index b3fb80f2dbc6..6ed335dae9ac 100644 --- a/vcl/source/edit/vclmedit.cxx +++ b/vcl/source/edit/vclmedit.cxx @@ -66,7 +66,6 @@ public: virtual ~ImpVclMEdit() override; void SetModified( bool bMod ); - bool IsModified() const; void SetReadOnly( bool bRdOnly ); bool IsReadOnly() const; @@ -284,11 +283,6 @@ void ImpVclMEdit::SetModified( bool bMod ) mpTextWindow->GetTextEngine()->SetModified( bMod ); } -bool ImpVclMEdit::IsModified() const -{ - return mpTextWindow->GetTextEngine()->IsModified(); -} - void ImpVclMEdit::SetReadOnly( bool bRdOnly ) { mpTextWindow->GetTextView()->SetReadOnly( bRdOnly ); @@ -1053,11 +1047,6 @@ void VclMultiLineEdit::ClearModifyFlag() pImpVclMEdit->SetModified( false ); } -bool VclMultiLineEdit::IsModified() const -{ - return pImpVclMEdit->IsModified(); -} - void VclMultiLineEdit::EnableUpdateData( sal_uLong nTimeout ) { if ( !nTimeout ) diff --git a/vcl/source/window/stacking.cxx b/vcl/source/window/stacking.cxx index d5b130031de3..82a17e63e228 100644 --- a/vcl/source/window/stacking.cxx +++ b/vcl/source/window/stacking.cxx @@ -629,13 +629,6 @@ bool Window::IsTopWindow() const return mpWindowImpl->mpWinData->mnIsTopWindow == 1; } -vcl::Window* Window::FindWindow( const Point& rPos ) const -{ - - Point aPos = OutputToScreenPixel( rPos ); - return const_cast<vcl::Window*>(this)->ImplFindWindow( aPos ); -} - vcl::Window* Window::ImplFindWindow( const Point& rFramePos ) { vcl::Window* pTempWindow; diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.hxx b/writerfilter/source/dmapper/DomainMapperTableManager.hxx index b3d44eeb8217..1b116f94084c 100644 --- a/writerfilter/source/dmapper/DomainMapperTableManager.hxx +++ b/writerfilter/source/dmapper/DomainMapperTableManager.hxx @@ -90,7 +90,6 @@ public: virtual void endOfRowAction() override; IntVectorPtr const & getCurrentGrid( ); - IntVectorPtr const & getCurrentSpans( ); IntVectorPtr const & getCurrentCellWidths( ); TableParagraphVectorPtr getCurrentParagraphs( ); |