From a45827b2308febc7369db27fb489a6d1389534e1 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 28 Jul 2015 08:39:57 +0200 Subject: loplugin:unusedmethods Change-Id: Ib4d77ee01e7362f5951f81fceeca3c489872d971 Reviewed-on: https://gerrit.libreoffice.org/17378 Tested-by: Jenkins Reviewed-by: Noel Grandin --- .../extended/accessibletabbarpagelist.hxx | 1 - .../source/extended/accessibletabbarpagelist.cxx | 18 ----- chart2/source/controller/inc/dlg_DataEditor.hxx | 2 - compilerplugins/clang/unusedmethods.py | 49 ++++++++++++- cui/source/inc/cuigaldlg.hxx | 2 - cui/source/inc/macroass.hxx | 1 - dbaccess/source/core/api/OptimisticSet.hxx | 3 - dbaccess/source/core/api/RowSetBase.hxx | 2 - dbaccess/source/core/api/RowSetCache.hxx | 4 -- dbaccess/source/core/api/RowSetCacheIterator.hxx | 1 - dbaccess/source/core/dataaccess/ModelImpl.hxx | 5 -- .../source/core/dataaccess/bookmarkcontainer.cxx | 11 --- .../source/core/dataaccess/bookmarkcontainer.hxx | 6 -- dbaccess/source/core/dataaccess/datasource.hxx | 2 - .../source/core/dataaccess/documentdefinition.cxx | 1 - .../source/core/dataaccess/documentdefinition.hxx | 18 ----- dbaccess/source/core/inc/TableDeco.hxx | 1 - editeng/source/editeng/editeng.cxx | 5 -- fpicker/source/office/RemoteFilesDialog.cxx | 22 ------ fpicker/source/office/RemoteFilesDialog.hxx | 3 - fpicker/source/office/fpsmartcontent.hxx | 10 --- framework/inc/classes/filtercachedata.hxx | 63 ----------------- framework/inc/classes/wildcard.hxx | 14 ---- framework/inc/protocols.h | 42 ----------- framework/inc/queries.h | 11 --- .../inc/uielement/spinfieldtoolbarcontroller.hxx | 2 - framework/inc/uielement/uicommanddescription.hxx | 6 +- framework/source/inc/pattern/window.hxx | 50 ------------- .../source/uiconfiguration/imagemanagerimpl.cxx | 11 --- .../source/uiconfiguration/imagemanagerimpl.hxx | 8 +-- .../uiconfiguration/uicategorydescription.cxx | 6 -- .../uielement/spinfieldtoolbarcontroller.cxx | 5 -- .../source/uielement/uicommanddescription.cxx | 4 -- helpcompiler/inc/HelpCompiler.hxx | 9 --- hwpfilter/source/hpara.h | 8 --- idl/inc/basobj.hxx | 7 -- idl/inc/bastype.hxx | 3 - idl/inc/database.hxx | 18 ++--- idl/inc/hash.hxx | 1 - idl/inc/lex.hxx | 18 ----- idl/inc/module.hxx | 13 +--- idl/inc/object.hxx | 12 ---- idl/inc/slot.hxx | 27 +------ idl/inc/types.hxx | 24 ------- idlc/inc/idlc/astdeclaration.hxx | 6 -- idlc/inc/idlc/astenum.hxx | 2 - idlc/inc/idlc/astexpression.hxx | 26 ------- idlc/inc/idlc/astinterface.hxx | 11 --- idlc/inc/idlc/astoperation.hxx | 2 - idlc/inc/idlc/astscope.hxx | 1 - idlc/inc/idlc/aststruct.hxx | 3 - idlc/inc/idlc/fehelper.hxx | 6 -- idlc/inc/idlc/idlc.hxx | 8 --- idlc/source/astinterface.cxx | 2 - include/editeng/editeng.hxx | 2 - include/formula/token.hxx | 3 - include/i18nutil/unicode.hxx | 5 -- include/registry/registry.hxx | 18 ----- include/sot/factory.hxx | 6 +- include/sot/stg.hxx | 5 -- include/svtools/brwbox.hxx | 2 - include/svtools/editbrowsebox.hxx | 2 - include/svx/EnhancedCustomShape2d.hxx | 2 - include/svx/framelink.hxx | 1 - include/svx/sdr/overlay/overlayobjectlist.hxx | 3 - include/svx/svdedtv.hxx | 2 - include/svx/svdhlpln.hxx | 6 -- include/svx/svdmrkv.hxx | 1 - include/svx/svdopath.hxx | 3 - include/svx/svdtrans.hxx | 1 - include/tools/inetmime.hxx | 67 ------------------ include/tools/poly.hxx | 2 - include/tools/rc.hxx | 3 - include/tools/resmgr.hxx | 2 - include/unotest/bootstrapfixturebase.hxx | 2 + include/unotools/charclass.hxx | 10 --- include/vcl/combobox.hxx | 2 - include/vcl/lstbox.hxx | 7 -- include/vcl/outdev.hxx | 3 - include/vcl/svapp.hxx | 28 -------- include/xmlscript/xml_helper.hxx | 8 --- l10ntools/inc/export.hxx | 2 - l10ntools/inc/xmlparse.hxx | 19 +---- l10ntools/inc/xrmmerge.hxx | 1 - l10ntools/source/helpmerge.cxx | 2 +- .../source/thesaurus/libnth/nthesimp.hxx | 14 +--- lotuswordpro/source/filter/lwp9reader.cxx | 20 ------ lotuswordpro/source/filter/lwp9reader.hxx | 1 - lotuswordpro/source/filter/lwpdllist.hxx | 6 -- lotuswordpro/source/filter/lwptblcell.hxx | 29 -------- sc/inc/chartpos.hxx | 1 - sc/inc/clkernelthread.hxx | 2 - sc/inc/colorscale.hxx | 1 - sc/inc/funcdesc.hxx | 12 ---- sc/inc/table.hxx | 3 - sc/source/core/data/colorscale.cxx | 23 ------ sc/source/core/data/funcdesc.cxx | 17 +---- sc/source/core/data/table2.cxx | 10 --- sc/source/core/tool/clkernelthread.cxx | 12 ---- sdext/source/presenter/PresenterPane.hxx | 5 -- sdext/source/presenter/PresenterPaneFactory.hxx | 5 -- sdext/source/presenter/PresenterSpritePane.hxx | 5 -- sdext/source/presenter/PresenterViewFactory.hxx | 5 -- sot/source/base/factory.cxx | 4 +- sot/source/base/object.cxx | 12 ++-- sot/source/sdstor/stg.cxx | 21 ------ sot/source/sdstor/stgdir.cxx | 82 ---------------------- sot/source/sdstor/stgdir.hxx | 2 - sot/source/sdstor/stgole.cxx | 12 ---- sot/source/sdstor/stgole.hxx | 2 - sot/source/sdstor/storage.cxx | 22 +++--- sot/source/sdstor/ucbstorage.cxx | 23 ------ starmath/inc/rect.hxx | 1 - stoc/source/corereflection/base.hxx | 6 +- store/source/stordata.hxx | 19 ----- svtools/source/brwbox/brwbox2.cxx | 6 -- tools/source/generic/poly2.cxx | 20 ------ ucb/source/ucp/webdav-neon/NeonLockStore.cxx | 16 ----- ucb/source/ucp/webdav-neon/NeonLockStore.hxx | 3 - unotest/source/cpp/bootstrapfixturebase.cxx | 1 - unoxml/source/dom/documentbuilder.hxx | 5 -- unoxml/source/dom/saxbuilder.hxx | 6 +- unoxml/source/xpath/xpathapi.hxx | 5 -- vcl/source/control/combobox.cxx | 3 - vcl/source/outdev/map.cxx | 16 ----- writerfilter/inc/dmapper/resourcemodel.hxx | 5 -- writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx | 5 -- writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx | 1 - writerfilter/source/rtftok/rtfvalue.cxx | 5 -- writerfilter/source/rtftok/rtfvalue.hxx | 1 - xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx | 3 - xmlhelp/source/cxxhelp/inc/qe/Query.hxx | 10 --- 132 files changed, 92 insertions(+), 1212 deletions(-) diff --git a/accessibility/inc/accessibility/extended/accessibletabbarpagelist.hxx b/accessibility/inc/accessibility/extended/accessibletabbarpagelist.hxx index 68a1727c56e8..5292b0bcb54b 100644 --- a/accessibility/inc/accessibility/extended/accessibletabbarpagelist.hxx +++ b/accessibility/inc/accessibility/extended/accessibletabbarpagelist.hxx @@ -56,7 +56,6 @@ namespace accessibility sal_Int32 m_nIndexInParent; protected: - void UpdateEnabled( sal_Int32 i, bool bEnabled ); void UpdateShowing( bool bShowing ); void UpdateSelected( sal_Int32 i, bool bSelected ); void UpdatePageText( sal_Int32 i ); diff --git a/accessibility/source/extended/accessibletabbarpagelist.cxx b/accessibility/source/extended/accessibletabbarpagelist.cxx index f8cf1fd3082c..95aaa42f802d 100644 --- a/accessibility/source/extended/accessibletabbarpagelist.cxx +++ b/accessibility/source/extended/accessibletabbarpagelist.cxx @@ -60,24 +60,6 @@ namespace accessibility { } - - - void AccessibleTabBarPageList::UpdateEnabled( sal_Int32 i, bool bEnabled ) - { - if ( i >= 0 && i < (sal_Int32)m_aAccessibleChildren.size() ) - { - Reference< XAccessible > xChild( m_aAccessibleChildren[i] ); - if ( xChild.is() ) - { - AccessibleTabBarPage* pAccessibleTabBarPage = static_cast< AccessibleTabBarPage* >( xChild.get() ); - if ( pAccessibleTabBarPage ) - pAccessibleTabBarPage->SetEnabled( bEnabled ); - } - } - } - - - void AccessibleTabBarPageList::UpdateShowing( bool bShowing ) { for ( size_t i = 0; i < m_aAccessibleChildren.size(); ++i ) diff --git a/chart2/source/controller/inc/dlg_DataEditor.hxx b/chart2/source/controller/inc/dlg_DataEditor.hxx index bddb3f8148e1..ac8d322fb049 100644 --- a/chart2/source/controller/inc/dlg_DataEditor.hxx +++ b/chart2/source/controller/inc/dlg_DataEditor.hxx @@ -79,8 +79,6 @@ private: DECL_LINK_TYPED( BrowserCursorMovedHdl, DataBrowser*, void); /// this is called if MiscOptions change, esp. High-Contrast mode DECL_LINK( MiscHdl, void* ); - /// is called when the width of any column in the edit browsebox has changed - DECL_LINK( BrowserColumnResized, void* ); void UpdateData(); /// moved and resizes the series name control etc. to fit the dimensions of the edit browsebox diff --git a/compilerplugins/clang/unusedmethods.py b/compilerplugins/clang/unusedmethods.py index 06adccb0b846..cdac8d5b7cbb 100755 --- a/compilerplugins/clang/unusedmethods.py +++ b/compilerplugins/clang/unusedmethods.py @@ -14,7 +14,11 @@ exclusionSet = set([ "int basegfx::Int32Traits::minVal()", "int basegfx::Int32Traits::neutral()", "unsigned long UniqueIndexImpl::Insert(void *)", + # used from a yacc lexer + "struct unoidl::detail::SourceProviderExpr unoidl::detail::SourceProviderExpr::Float(double)", + "struct unoidl::detail::SourceProviderExpr unoidl::detail::SourceProviderExpr::Int(long)", + "struct unoidl::detail::SourceProviderExpr unoidl::detail::SourceProviderExpr::Uint(unsigned long)", "class rtl::OUString unoidl::detail::SourceProviderType::getName() const", "_Bool unoidl::detail::SourceProviderType::equals(const struct unoidl::detail::SourceProviderType &) const", "_Bool unoidl::detail::SourceProviderEntityPad::isPublished() const", @@ -25,17 +29,57 @@ exclusionSet = set([ "_Bool unoidl::detail::SourceProviderInterfaceTypeEntityPad::addDirectMember(int,void *,struct unoidl::detail::SourceProviderScannerData *,const class rtl::OUString &)", "_Bool unoidl::detail::SourceProviderInterfaceTypeEntityPad::addOptionalBaseMembers(int,void *,struct unoidl::detail::SourceProviderScannerData *,const class rtl::OUString &,const class rtl::Reference &)", "void unoidl::detail::SourceProviderScannerData::setSource(const void *,unsigned long)", + "void Idlc::setParseState(enum ParseState)", + "_Bool AstDeclaration::isPredefined()", + "void Idlc::setOffset(unsigned int,unsigned int)", + "_Bool Idlc::isInMainFile()", + "void Idlc::setPublished(_Bool)", + "enum ParseState Idlc::getParseState()", + "void Idlc::setLineNumber(unsigned int)", + "void Idlc::incLineNumber()", + "void Idlc::setDocumentation(const class rtl::OString &)", + "void Idlc::setInMainfile(_Bool)", + "void AstInterface::forwardDefined(const class AstInterface &)", + "_Bool AstInterface::hasMandatoryInheritedInterfaces() const", + "_Bool AstInterface::usesSingleInheritance() const", + "struct AstInterface::DoubleDeclarations AstInterface::checkInheritedInterfaceClashes(const class AstInterface *,_Bool) const", + "class std::__debug::vector > AstInterface::checkMemberClashes(const class AstDeclaration *) const", + "void AstOperation::setExceptions(const class std::__debug::list > *)", + "_Bool AstOperation::isConstructor() const", + "_Bool AstService::isSingleInterfaceBasedService() const", + "void AstService::setSingleInterfaceBasedService()", + "void AstService::setDefaultConstructor(_Bool)", + "_Bool AstService::checkLastConstructor() const", + "class AstScope * AstStack::nextToTop()", + "class AstScope * AstStack::bottom()", + "const class AstDeclaration * AstStruct::findTypeParameter(const class rtl::OString &) const", + "int AstEnum::getEnumValueCount()", + "class AstConstant * AstEnum::checkValue(class AstExpression *)", + "void ErrorHandler::flagError(enum ErrorCode,unsigned int)", + "void ErrorHandler::error0(enum ErrorCode)", + "void ErrorHandler::syntaxError(enum ParseState,int,const char *)", + "void ErrorHandler::lookupError(enum ErrorCode,const class rtl::OString &,class AstDeclaration *)", + "void ErrorHandler::error3(enum ErrorCode,class AstDeclaration *,class AstDeclaration *,class AstDeclaration *)", + "void ErrorHandler::warning0(enum WarningCode,const char *)", + "void ErrorHandler::coercionError(class AstExpression *,enum ExprType)", + "class AstDeclaration * FeInheritanceHeader::getInherits()", + "const class std::__debug::vector > & FeInheritanceHeader::getTypeParameters() const", + "const class AstType * FeDeclarator::compose(const class AstDeclaration *)", + "const class rtl::OString & FeDeclarator::getName()", + "_Bool FeDeclarator::checkType(const class AstDeclaration *)", "enum connectivity::IParseContext::InternationalKeyCode connectivity::IParseContext::getIntlKeyCode(const class rtl::OString &) const", "void connectivity::OSQLParser::error(const char *)", "void connectivity::OSQLParseNode::insert(unsigned int,class connectivity::OSQLParseNode *)", + # TODO track instantiations of template class constructors "void comphelper::IEventProcessor::release()", "void SotMutexHolder::acquire()", "void SotMutexHolder::release()", + # only used by Windows build "_Bool basegfx::B2ITuple::equalZero() const", "class basegfx::B2DPolyPolygon basegfx::unotools::UnoPolyPolygon::getPolyPolygonUnsafe() const", - "void basegfx::B2IRange::expand(const basegfx::B2ITuple &)", + "void basegfx::B2IRange::expand(const class basegfx::B2IRange &)", "void OpenGLContext::requestSingleBufferedRendering()", "_Bool TabitemValue::isBothAligned() const", "_Bool TabitemValue::isNotAligned() const", @@ -49,6 +93,7 @@ exclusionSet = set([ "void Application::AppEvent(const class ApplicationEvent &)", "int PhysicalFontFace::GetWidth() const", "void PhysicalFontFace::SetBitmapSize(int,int)", + "class boost::intrusive_ptr FontCharMap::GetDefaultMap(_Bool)", "_Bool SalObject::IsEraseBackgroundEnabled()", "const class rtl::OUString & connectivity::OColumn::getCatalogName() const", "const class rtl::OUString & connectivity::OColumn::getSchemaName() const", @@ -68,6 +113,8 @@ exclusionSet = set([ "void StyleSettings::SetHideDisabledMenuItems(_Bool)", # debugging methods "void oox::drawingml::TextParagraphProperties::dump() const", + "void oox::PropertyMap::dumpCode(class com::sun::star::uno::Reference)", + "void oox::PropertyMap::dumpData(class com::sun::star::uno::Reference)", "class std::basic_string, class std::allocator > writerfilter::ooxml::OOXMLPropertySet::toString()", # called from the writerfilter generated code in $WORKDIR, not sure why it is not being picked up "_Bool writerfilter::ooxml::OOXMLFactory_ns::getElementId(unsigned int,unsigned int,enum writerfilter::ooxml::ResourceType_t &,unsigned int &)", diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx index f4078f484848..1ca117440692 100644 --- a/cui/source/inc/cuigaldlg.hxx +++ b/cui/source/inc/cuigaldlg.hxx @@ -189,7 +189,6 @@ private: GalleryTheme* pThm; DECL_LINK( ClickOkHdl, void* ); - DECL_LINK( ClickResNameHdl, void* ); public: GalleryIdDialog( vcl::Window* pParent, GalleryTheme* pThm ); virtual ~GalleryIdDialog(); @@ -285,7 +284,6 @@ class TPGalleryThemeProperties : public SfxTabPage DECL_LINK( ClickTakeHdl, void* ); DECL_LINK( ClickTakeAllHdl, void* ); DECL_LINK( SelectFoundHdl, void* ); - DECL_LINK( SelectThemeHdl, void* ); DECL_LINK( SelectFileTypeHdl, void* ); DECL_LINK( DClickFoundHdl, void* ); DECL_LINK_TYPED( PreviewTimerHdl, Timer*, void ); diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx index 38a8e6426d4c..4edb69f67f02 100644 --- a/cui/source/inc/macroass.hxx +++ b/cui/source/inc/macroass.hxx @@ -39,7 +39,6 @@ class _SfxMacroTabPage : public SfxTabPage DECL_DLLPRIVATE_LINK( SelectGroup_Impl, ListBox * ); DECL_DLLPRIVATE_LINK( SelectMacro_Impl, ListBox * ); - DECL_DLLPRIVATE_LINK( DoubleClickHdl_Impl, Control* ); DECL_DLLPRIVATE_LINK( AssignDeleteHdl_Impl, PushButton * ); DECL_DLLPRIVATE_LINK_TYPED( TimeOut_Impl, Idle*, void ); diff --git a/dbaccess/source/core/api/OptimisticSet.hxx b/dbaccess/source/core/api/OptimisticSet.hxx index fbcd33df42a5..abfde43c4a8d 100644 --- a/dbaccess/source/core/api/OptimisticSet.hxx +++ b/dbaccess/source/core/api/OptimisticSet.hxx @@ -42,8 +42,6 @@ namespace dbaccess mutable bool m_bResultSetChanged; - void impl_convertValue_throw(const ORowSetRow& _rInsertRow,const SelectColumnDescription& i_aMetaData); - void executeDelete(const ORowSetRow& _rDeleteRow,const OUString& i_sSQL,const OUString& i_sTableName); void fillJoinedColumns_throw(const ::std::vector< ::connectivity::TNodePair>& i_aJoinColumns); void fillJoinedColumns_throw(const OUString& i_sLeftColumn,const OUString& i_sRightColumn); @@ -74,7 +72,6 @@ namespace dbaccess virtual void fillMissingValues(ORowSetValueVector::Vector& io_aRow) const SAL_OVERRIDE; bool isReadOnly() const { return m_aJoinedKeyColumns.empty(); } - const ::std::map& getJoinedColumns() const { return m_aJoinedColumns; } const ::std::map& getJoinedKeyColumns() const { return m_aJoinedKeyColumns; } }; } diff --git a/dbaccess/source/core/api/RowSetBase.hxx b/dbaccess/source/core/api/RowSetBase.hxx index f5dd9541f511..e2bd50bd209e 100644 --- a/dbaccess/source/core/api/RowSetBase.hxx +++ b/dbaccess/source/core/api/RowSetBase.hxx @@ -346,8 +346,6 @@ namespace dbaccess firePropertyChange(_nPos,_rNewValue); } using ::comphelper::OPropertyStateContainer::getFastPropertyValue; - - ::osl::Mutex* getMutex() const { return m_pMutex; } }; /** eases the handling of the doCancelModification and notifyCancelInsert methods diff --git a/dbaccess/source/core/api/RowSetCache.hxx b/dbaccess/source/core/api/RowSetCache.hxx index 16912acac60b..f158da4baa89 100644 --- a/dbaccess/source/core/api/RowSetCache.hxx +++ b/dbaccess/source/core/api/RowSetCache.hxx @@ -100,10 +100,6 @@ namespace dbaccess bool reFillMatrix(sal_Int32 _nNewStartPos,sal_Int32 nNewEndPos); bool fillMatrix(sal_Int32 &_nNewStartPos,sal_Int32 &_nNewEndPos); bool moveWindow(); - // returns true when a keyset needs to be created. - bool impl_createBookmarkSet_nothrow(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet >& _xRs); - - void firePropertyChange(sal_Int32 _nColumnIndex,const ::connectivity::ORowSetValue& _rOldValue); void rotateCacheIterator(ORowSetMatrix::difference_type _nDist); void updateValue(sal_Int32 columnIndex diff --git a/dbaccess/source/core/api/RowSetCacheIterator.hxx b/dbaccess/source/core/api/RowSetCacheIterator.hxx index 82d118e499a2..4875c0cd2240 100644 --- a/dbaccess/source/core/api/RowSetCacheIterator.hxx +++ b/dbaccess/source/core/api/RowSetCacheIterator.hxx @@ -72,7 +72,6 @@ namespace dbaccess bool operator ==(const ORowSetMatrix::iterator& _rRH) const; void setBookmark(const ::com::sun::star::uno::Any& _rBookmark); - ::com::sun::star::uno::Any getBookmark() const { return m_aIter->second.aBookmark; } ORowSetCacheMap::iterator getIter() const { return m_aIter; } }; diff --git a/dbaccess/source/core/dataaccess/ModelImpl.hxx b/dbaccess/source/core/dataaccess/ModelImpl.hxx index e08671541d1f..7830567e8635 100644 --- a/dbaccess/source/core/dataaccess/ModelImpl.hxx +++ b/dbaccess/source/core/dataaccess/ModelImpl.hxx @@ -311,7 +311,6 @@ public: stripLoadArguments( const ::comphelper::NamedValueCollection& _rArguments ); // other stuff - void flushTables(); // disposes all elements in m_aStorages, and clears it void disposeStorages(); @@ -533,10 +532,6 @@ public: { return getMutex(); } - inline ::rtl::Reference< ODatabaseModelImpl > getImpl( GuardAccess ) const - { - return m_pImpl; - } /// checks whether the component is already disposed, throws a DisposedException if so inline void checkDisposed() const diff --git a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx index 881fe8b832e0..05faa3668652 100644 --- a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx +++ b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx @@ -52,18 +52,7 @@ OBookmarkContainer::OBookmarkContainer(OWeakObject& _rParent, Mutex& _rMutex) { } -void OBookmarkContainer::dispose() -{ - MutexGuard aGuard(m_rMutex); - // say goodbye to our listeners - EventObject aEvt(*this); - m_aContainerListeners.disposeAndClear(aEvt); - - // remove our elements - m_aBookmarksIndexed.clear(); - m_aBookmarks.clear(); -} void SAL_CALL OBookmarkContainer::acquire( ) throw() { diff --git a/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx b/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx index 6f88eff0b2ed..083482aaf220 100644 --- a/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx +++ b/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx @@ -123,12 +123,6 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; -// helper - /** tell the container to free all resources. After that it's in a state like after the construction, i.e. - you may call initialize again (maybe with another configuration node). - */ - void dispose(); - protected: /** quickly checks if there already is an element with a given name. No access to the configuration occurs, i.e. if there is such an object which is not already loaded, it won't be loaded now. diff --git a/dbaccess/source/core/dataaccess/datasource.hxx b/dbaccess/source/core/dataaccess/datasource.hxx index ff4d3385ed19..8e53e9facd73 100644 --- a/dbaccess/source/core/dataaccess/datasource.hxx +++ b/dbaccess/source/core/dataaccess/datasource.hxx @@ -211,8 +211,6 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( const OUString& user, const OUString& password , bool _bIsolated) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL connectWithCompletion( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& handler , bool _bIsolated) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - void clearConnections(); - protected: using ::cppu::OPropertySetHelper::getFastPropertyValue; }; diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx index d0d9695457bc..5bd28795a85f 100644 --- a/dbaccess/source/core/dataaccess/documentdefinition.cxx +++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx @@ -489,7 +489,6 @@ css::uno::Sequence ODocumentDefinition::getImplementationId() IMPLEMENT_GETTYPES3(ODocumentDefinition,OContentHelper,OPropertyStateContainer,ODocumentDefinition_Base); IMPLEMENT_FORWARD_XINTERFACE3( ODocumentDefinition,OContentHelper,OPropertyStateContainer,ODocumentDefinition_Base) -IMPLEMENT_SERVICE_INFO1(ODocumentDefinition,"com.sun.star.comp.dba.ODocumentDefinition",SERVICE_SDB_DOCUMENTDEFINITION) void ODocumentDefinition::registerProperties() { diff --git a/dbaccess/source/core/dataaccess/documentdefinition.hxx b/dbaccess/source/core/dataaccess/documentdefinition.hxx index 60616d2f1cb3..2f1f9958b6df 100644 --- a/dbaccess/source/core/dataaccess/documentdefinition.hxx +++ b/dbaccess/source/core/dataaccess/documentdefinition.hxx @@ -97,9 +97,6 @@ public: // ::com::sun::star::uno::XInterface DECLARE_XINTERFACE( ) -// ::com::sun::star::lang::XServiceInfo - DECLARE_SERVICE_INFO_STATIC(); - // ::com::sun::star::beans::XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -169,8 +166,6 @@ public: */ bool prepareClose(); - static ::com::sun::star::uno::Sequence< sal_Int8 > getDefaultDocumentTypeClassId(); - static OUString GetDocumentServiceFromMediaType( const OUString& _rMediaType, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & _rxContext, @@ -294,19 +289,6 @@ private: const bool _bReadOnly ); - /** loads the embedded object, if not already loaded. No new object can be created with this method. - */ - void loadEmbeddedObject( bool _bSuppressMacros = false ) - { - loadEmbeddedObject( - NULL, - ::com::sun::star::uno::Sequence< sal_Int8 >(), - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >(), - _bSuppressMacros, - false - ); - } - /** loads the embedded object for preview. Macros will be suppressed, and the document will be read-only. */ diff --git a/dbaccess/source/core/inc/TableDeco.hxx b/dbaccess/source/core/inc/TableDeco.hxx index 3fdfb7f274ec..3bd7179f2ee2 100644 --- a/dbaccess/source/core/inc/TableDeco.hxx +++ b/dbaccess/source/core/inc/TableDeco.hxx @@ -151,7 +151,6 @@ namespace dbaccess static ::com::sun::star::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId(); ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData> getMetaData() const { return m_xMetaData; } - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> getConnection() const { return m_xMetaData.is() ? m_xMetaData->getConnection() : ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>(); } // XColumnsSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getColumns( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx index 4cfecd0ffe96..910b4872c844 100644 --- a/editeng/source/editeng/editeng.cxx +++ b/editeng/source/editeng/editeng.cxx @@ -2170,11 +2170,6 @@ void EditEngine::ClearSpellErrors() pImpEditEngine->ClearSpellErrors(); } -void EditEngine::StartSpelling(EditView& rEditView, bool bMultipleDoc) -{ - pImpEditEngine->StartSpelling(rEditView, bMultipleDoc); -} - bool EditEngine::SpellSentence(EditView& rView, svx::SpellPortions& rToFill, bool bIsGrammarChecking ) { return pImpEditEngine->SpellSentence( rView, rToFill, bIsGrammarChecking ); diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx index 8607af606e36..5681efde578a 100644 --- a/fpicker/source/office/RemoteFilesDialog.cxx +++ b/fpicker/source/office/RemoteFilesDialog.cxx @@ -460,10 +460,6 @@ void RemoteFilesDialog::AddFilter( const OUString& rFilter, const OUString& rTyp m_pFilter_lb->SelectEntryPos( 0 ); } -OUString RemoteFilesDialog::GetPath() const -{ - return m_sPath; -} FileViewResult RemoteFilesDialog::OpenURL( OUString const & sURL ) { @@ -1154,25 +1150,7 @@ bool RemoteFilesDialog::ContentIsFolder( const OUString& rURL ) return false; } -bool RemoteFilesDialog::ContentIsDocument( const OUString& rURL ) -{ - try - { - Reference< XComponentContext > xContext = ::comphelper::getProcessComponentContext(); - Reference< XInteractionHandler > xInteractionHandler( - InteractionHandler::createWithParent( xContext, 0 ), UNO_QUERY_THROW ); - Reference< XCommandEnvironment > xEnv = new ::ucbhelper::CommandEnvironment( xInteractionHandler, Reference< XProgressHandler >() ); - ::ucbhelper::Content aContent( rURL, xEnv, xContext ); - return aContent.isDocument(); - } - catch( const Exception& ) - { - // a content doesn't exist - } - - return false; -} sal_Int32 RemoteFilesDialog::getTargetColorDepth() { diff --git a/fpicker/source/office/RemoteFilesDialog.hxx b/fpicker/source/office/RemoteFilesDialog.hxx index 63fbd94ba090..5e458738c2b9 100644 --- a/fpicker/source/office/RemoteFilesDialog.hxx +++ b/fpicker/source/office/RemoteFilesDialog.hxx @@ -67,8 +67,6 @@ public: virtual void Resize() SAL_OVERRIDE; virtual short Execute() SAL_OVERRIDE; - OUString GetPath() const; - // SvtFileDialog_Base virtual SvtFileView* GetView() SAL_OVERRIDE; @@ -82,7 +80,6 @@ public: virtual const OUString& GetPath() SAL_OVERRIDE; virtual std::vector GetPathList() const SAL_OVERRIDE; virtual bool ContentIsFolder( const OUString& rURL ) SAL_OVERRIDE; - virtual bool ContentIsDocument( const OUString& rURL ); virtual OUString getCurrentFileText() const SAL_OVERRIDE; virtual void setCurrentFileText( const OUString& rText, bool bSelectAll = false ) SAL_OVERRIDE; diff --git a/fpicker/source/office/fpsmartcontent.hxx b/fpicker/source/office/fpsmartcontent.hxx index b6ffd7281848..0e6f0b5fc1d6 100644 --- a/fpicker/source/office/fpsmartcontent.hxx +++ b/fpicker/source/office/fpsmartcontent.hxx @@ -180,16 +180,6 @@ namespace svt return implIs( _rURL, Folder ); } - /** binds to the given URL, checks whether or not it refers to a document - - @postcond - the content is not in the state UNKNOWN - */ - inline bool isDocument( const OUString& _rURL ) - { - return implIs( _rURL, Document ); - } - /** checks if the content is existent (it is if and only if it is a document or a folder) */ inline bool is( const OUString& _rURL ) diff --git a/framework/inc/classes/filtercachedata.hxx b/framework/inc/classes/filtercachedata.hxx index 538f683e946c..395b89d53673 100644 --- a/framework/inc/classes/filtercachedata.hxx +++ b/framework/inc/classes/filtercachedata.hxx @@ -400,49 +400,6 @@ class DataContainer DataContainer(); - static void convertFileTypeToPropertySequence ( const FileType& aSource , - css::uno::Sequence< css::beans::PropertyValue >& lDestination , - const OUString& sCurrentLocale ); - static void convertFilterToPropertySequence ( const Filter& aSource , - css::uno::Sequence< css::beans::PropertyValue >& lDestination , - const OUString& sCurrentLocale ); - static void convertDetectorToPropertySequence ( const Detector& aSource , - css::uno::Sequence< css::beans::PropertyValue >& lDestination ); - static void convertLoaderToPropertySequence ( const Loader& aSource , - css::uno::Sequence< css::beans::PropertyValue >& lDestination , - const OUString& sCurrentLocale ); - static void convertContentHandlerToPropertySequence ( const ContentHandler& aSource , - css::uno::Sequence< css::beans::PropertyValue >& lDestination ); - static void convertPropertySequenceToFilter ( const css::uno::Sequence< css::beans::PropertyValue >& lSource , - Filter& aDestination , - const OUString& sCurrentLocale ); - static void convertPropertySequenceToFileType ( const css::uno::Sequence< css::beans::PropertyValue >& lSource , - FileType& aDestination , - const OUString& sCurrentLocale ); - static void convertPropertySequenceToDetector ( const css::uno::Sequence< css::beans::PropertyValue >& lSource , - Detector& aDestination ); - static void convertPropertySequenceToLoader ( const css::uno::Sequence< css::beans::PropertyValue >& lSource , - Loader& aDestination , - const OUString& sCurrentLocale ); - static void convertPropertySequenceToContentHandler ( const css::uno::Sequence< css::beans::PropertyValue >& lSource , - ContentHandler& aDestination , - const OUString& sCurrentLocale ); - static void extractLocalizedStrings ( const OUString& sCurrentLocale , - const css::uno::Any& aCFGValue , - OUStringHashMap& lLocales ); - static void packLocalizedStrings ( sal_Int16 nMode , - const OUString& sCurrentLocale , - css::uno::Any& aCFGValue , - const OUStringHashMap& lLocales ); - static OUString getLocalelizedString ( const OUStringHashMap& lLocales , - const OUString& sLocale ); - static void setLocalelizedString ( OUStringHashMap& lLocales , - const OUString& sLocale , - const OUString& sValue ); - static void correctExtensions ( OUStringList& lExtensions ); - - public: - FileTypeHash m_aTypeCache; /// hold all information about registered file types FilterHash m_aFilterCache; /// hold all information about registered filters DetectorHash m_aDetectorCache; /// hold all information about registered detect services @@ -485,26 +442,6 @@ class FilterCFGAccess : public ::utl::ConfigItem ConfigItemMode nMode = DEFAULT_FILTERCACHE_MODE ); // open configuration virtual ~FilterCFGAccess( ); - static OUString encodeTypeData ( const FileType& aType ); // build own formatted string of type properties - static void decodeTypeData ( const OUString& sData , - FileType& aType ); - static OUString encodeFilterData( const Filter& aFilter ); // build own formatted string of filter properties - static void decodeFilterData( const OUString& sData , - Filter& aFilter ); - static OUString encodeStringList( const OUStringList& lList ); // build own formatted string of OUStringList - static OUStringList decodeStringList( const OUString& sValue ); - - private: - - // debug checks - - private: - static bool implcp_ctor ( const OUString& sPath , // methods to check incoming parameter on our interface methods! - sal_Int32 nVersion , - sal_Int16 nMode ); - static bool implcp_read ( const DataContainer& rData ); - static bool implcp_write( const DataContainer& rData ); - // member private: diff --git a/framework/inc/classes/wildcard.hxx b/framework/inc/classes/wildcard.hxx index c2bef274b3ab..e9ced168099a 100644 --- a/framework/inc/classes/wildcard.hxx +++ b/framework/inc/classes/wildcard.hxx @@ -56,20 +56,6 @@ class Wildcard virtual ~Wildcard(); - // interface - - /*-**************************************************************************************************** - @short try to find an agreement between given text and searchpattern - @descr You can use wildcards in pattern only! - @param "sText" is the text, in which we search given pattern. - @param "sPattern" is the searched pattern with includes wildcards. - @return true , if pattern was found. - @return false, if pattern don't match the text. - *//*-*****************************************************************************************************/ - - static bool match( const OUString& sText , - const OUString& sPattern ); - }; // class Wildcard } // namespace framework diff --git a/framework/inc/protocols.h b/framework/inc/protocols.h index 9857388e9118..fafba56637ce 100644 --- a/framework/inc/protocols.h +++ b/framework/inc/protocols.h @@ -75,48 +75,6 @@ class ProtocolCheck E_NEWS }; - /** - it checks, if the given URL string match one of the well known protocols. - It returns the right enum value. - Protocols are defined above ... - */ - static EProtocol specifyProtocol( const OUString& sURL ) - { - // because "private:" is part of e.g. "private:object" too ... - // we must check it before all other ones!!! - if (sURL.matchAsciiL(RTL_CONSTASCII_STRINGPARAM(SPECIALPROTOCOL_PRIVATE))) - return E_PRIVATE; - else - if (sURL.matchAsciiL(RTL_CONSTASCII_STRINGPARAM(SPECIALPROTOCOL_PRIVATE_OBJECT))) - return E_PRIVATE_OBJECT; - else - if (sURL.matchAsciiL(RTL_CONSTASCII_STRINGPARAM(SPECIALPROTOCOL_PRIVATE_STREAM))) - return E_PRIVATE_STREAM; - else - if (sURL.matchAsciiL(RTL_CONSTASCII_STRINGPARAM(SPECIALPROTOCOL_PRIVATE_FACTORY))) - return E_PRIVATE_FACTORY; - else - if (sURL.matchAsciiL(RTL_CONSTASCII_STRINGPARAM(SPECIALPROTOCOL_SLOT))) - return E_SLOT; - else - if (sURL.matchAsciiL(RTL_CONSTASCII_STRINGPARAM(SPECIALPROTOCOL_UNO))) - return E_UNO; - else - if (sURL.matchAsciiL(RTL_CONSTASCII_STRINGPARAM(SPECIALPROTOCOL_MACRO))) - return E_MACRO; - else - if (sURL.matchAsciiL(RTL_CONSTASCII_STRINGPARAM(SPECIALPROTOCOL_SERVICE))) - return E_SERVICE; - else - if (sURL.matchAsciiL(RTL_CONSTASCII_STRINGPARAM(SPECIALPROTOCOL_MAILTO))) - return E_MAILTO; - else - if (sURL.matchAsciiL(RTL_CONSTASCII_STRINGPARAM(SPECIALPROTOCOL_NEWS))) - return E_NEWS; - else - return E_UNKNOWN_PROTOCOL; - } - /** it checks if given URL match the required protocol only It should be used instead of specifyProtocol() if only this question diff --git a/framework/inc/queries.h b/framework/inc/queries.h index 1ce67f9abc96..be733cbb1c69 100644 --- a/framework/inc/queries.h +++ b/framework/inc/queries.h @@ -283,17 +283,6 @@ class QueryAnalyzer } } - // this method checks if given string match any supported query. - // (ignore additional parameters!) - - static bool isQuery( const OUString& sQuery ) - { - return( - sQuery.startsWith("_query_") || // new style - sQuery.startsWith("_filterquery_") // old style! - ); - } - private: EQuery m_eQuery; sal_uInt32 m_nIFlags; diff --git a/framework/inc/uielement/spinfieldtoolbarcontroller.hxx b/framework/inc/uielement/spinfieldtoolbarcontroller.hxx index 7d9a8e86eec7..b2f5efe2339e 100644 --- a/framework/inc/uielement/spinfieldtoolbarcontroller.hxx +++ b/framework/inc/uielement/spinfieldtoolbarcontroller.hxx @@ -45,7 +45,6 @@ class ISpinfieldListener virtual void KeyInput( const KeyEvent& rKEvt ) = 0; virtual void Modify() = 0; virtual void GetFocus() = 0; - virtual void LoseFocus() = 0; virtual void StateChanged( StateChangedType nType ) = 0; virtual void DataChanged( const DataChangedEvent& rDCEvt ) = 0; virtual bool PreNotify( NotifyEvent& rNEvt ) = 0; @@ -78,7 +77,6 @@ class SpinfieldToolbarController : public ISpinfieldListener, virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; virtual void Modify() SAL_OVERRIDE; virtual void GetFocus() SAL_OVERRIDE; - virtual void LoseFocus() SAL_OVERRIDE; virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; diff --git a/framework/inc/uielement/uicommanddescription.hxx b/framework/inc/uielement/uicommanddescription.hxx index c00507ba8a09..00fe3fcaba7f 100644 --- a/framework/inc/uielement/uicommanddescription.hxx +++ b/framework/inc/uielement/uicommanddescription.hxx @@ -94,10 +94,10 @@ public: protected: UICommandDescription( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& rxContext, bool ); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > impl_createConfigAccess(const OUString& _sName); void impl_fillElements(const sal_Char* _pName); - bool m_bConfigRead; - OUString m_aPrivateResourceURL; + + bool m_bConfigRead; + OUString m_aPrivateResourceURL; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; ModuleToCommandFileMap m_aModuleToCommandFileMap; UICommandsHashMap m_aUICommandsHashMap; diff --git a/framework/source/inc/pattern/window.hxx b/framework/source/inc/pattern/window.hxx index 8779aa28476c..9e93ae342398 100644 --- a/framework/source/inc/pattern/window.hxx +++ b/framework/source/inc/pattern/window.hxx @@ -41,59 +41,9 @@ class WindowHelper { public: -static OUString getWindowState(const css::uno::Reference< css::awt::XWindow >& xWindow) -{ - if (!xWindow.is()) - return OUString(); - - OString sWindowState; - // SOLAR SAFE -> ---------------------------- - { - SolarMutexGuard aSolarGuard; - vcl::Window* pWindow = VCLUnoHelper::GetWindow(xWindow); - // check for system window is necessary to guarantee correct pointer cast! - if (pWindow!=NULL && pWindow->IsSystemWindow()) - { - sal_uLong nMask = WINDOWSTATE_MASK_ALL; - nMask &= ~(WINDOWSTATE_MASK_MINIMIZED); - sWindowState = static_cast(pWindow)->GetWindowState(nMask); - } - } - // <- SOLAR SAFE ---------------------------- - return OStringToOUString(sWindowState,RTL_TEXTENCODING_UTF8); -} -static void setWindowState(const css::uno::Reference< css::awt::XWindow >& xWindow , - const OUString& sWindowState) -{ - if ( - (!xWindow.is() ) || - (!sWindowState.getLength()) - ) - return; - - // SOLAR SAFE -> ---------------------------- - SolarMutexGuard aSolarGuard; - - vcl::Window* pWindow = VCLUnoHelper::GetWindow(xWindow); - // check for system window is necessary to guarantee correct pointer cast! - if ( - (pWindow ) && - (pWindow->IsSystemWindow()) && - ( - // dont overwrite a might existing minimized mode! - (pWindow->GetType() != WINDOW_WORKWINDOW) || - (!static_cast(pWindow)->IsMinimized() ) - ) - ) - { - static_cast(pWindow)->SetWindowState(OUStringToOString(sWindowState,RTL_TEXTENCODING_UTF8)); - } - - // <- SOLAR SAFE ---------------------------- -} static bool isTopWindow(const css::uno::Reference< css::awt::XWindow >& xWindow) { diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx index 91ceb5c67a60..f102b87d7618 100644 --- a/framework/source/uiconfiguration/imagemanagerimpl.cxx +++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx @@ -298,11 +298,6 @@ bool CmdImageList::hasImage( sal_Int16 /*nImageType*/, const OUString& rCommandU return false; } -::std::vector< OUString >& CmdImageList::getImageNames() -{ - return impl_getImageNameVector(); -} - ::std::vector< OUString >& CmdImageList::getImageCommandNames() { return impl_getImageCommandNameVector(); @@ -332,12 +327,6 @@ bool GlobalImageList::hasImage( sal_Int16 nImageType, const OUString& rCommandUR return CmdImageList::hasImage( nImageType, rCommandURL ); } -::std::vector< OUString >& GlobalImageList::getImageNames() -{ - osl::MutexGuard guard( getGlobalImageListMutex() ); - return impl_getImageNameVector(); -} - ::std::vector< OUString >& GlobalImageList::getImageCommandNames() { osl::MutexGuard guard( getGlobalImageListMutex() ); diff --git a/framework/source/uiconfiguration/imagemanagerimpl.hxx b/framework/source/uiconfiguration/imagemanagerimpl.hxx index 9b5ee93daa49..a72e8274bb43 100644 --- a/framework/source/uiconfiguration/imagemanagerimpl.hxx +++ b/framework/source/uiconfiguration/imagemanagerimpl.hxx @@ -61,14 +61,13 @@ namespace framework virtual Image getImageFromCommandURL( sal_Int16 nImageType, const OUString& rCommandURL ); virtual bool hasImage( sal_Int16 nImageType, const OUString& rCommandURL ); - virtual ::std::vector< OUString >& getImageNames(); - virtual ::std::vector< OUString >& getImageCommandNames(); + virtual ::std::vector< OUString >& getImageCommandNames(); protected: void impl_fillCommandToImageNameMap(); ImageList* impl_getImageList( sal_Int16 nImageType ); - std::vector< OUString >& impl_getImageNameVector() { return m_aImageNameVector;} - std::vector< OUString >& impl_getImageCommandNameVector() { return m_aImageCommandNameVector;} + std::vector< OUString >& impl_getImageNameVector() { return m_aImageNameVector;} + std::vector< OUString >& impl_getImageCommandNameVector() { return m_aImageCommandNameVector;} private: bool m_bVectorInit; @@ -89,7 +88,6 @@ namespace framework virtual Image getImageFromCommandURL( sal_Int16 nImageType, const OUString& rCommandURL ) SAL_OVERRIDE; virtual bool hasImage( sal_Int16 nImageType, const OUString& rCommandURL ) SAL_OVERRIDE; - virtual ::std::vector< OUString >& getImageNames() SAL_OVERRIDE; virtual ::std::vector< OUString >& getImageCommandNames() SAL_OVERRIDE; }; diff --git a/framework/source/uiconfiguration/uicategorydescription.cxx b/framework/source/uiconfiguration/uicategorydescription.cxx index 44a1a37a5c43..2985457991f2 100644 --- a/framework/source/uiconfiguration/uicategorydescription.cxx +++ b/framework/source/uiconfiguration/uicategorydescription.cxx @@ -408,8 +408,6 @@ public: return aSeq; } -private: - virtual css::uno::Reference< css::container::XNameAccess > impl_createConfigAccess(const OUString& _sName) SAL_OVERRIDE; }; UICategoryDescription::UICategoryDescription( const Reference< XComponentContext >& rxContext ) : @@ -433,10 +431,6 @@ UICategoryDescription::UICategoryDescription( const Reference< XComponentContext UICategoryDescription::~UICategoryDescription() { } -Reference< XNameAccess > UICategoryDescription::impl_createConfigAccess(const OUString& _sName) -{ - return new ConfigurationAccess_UICategory( _sName, m_xGenericUICommands, m_xContext ); -} struct Instance { explicit Instance( diff --git a/framework/source/uielement/spinfieldtoolbarcontroller.cxx b/framework/source/uielement/spinfieldtoolbarcontroller.cxx index e9516021b0a1..2381be2351d8 100644 --- a/framework/source/uielement/spinfieldtoolbarcontroller.cxx +++ b/framework/source/uielement/spinfieldtoolbarcontroller.cxx @@ -297,11 +297,6 @@ void SpinfieldToolbarController::GetFocus() notifyFocusGet(); } -void SpinfieldToolbarController::LoseFocus() -{ - notifyFocusLost(); -} - void SpinfieldToolbarController::StateChanged( StateChangedType /*nType*/ ) { } diff --git a/framework/source/uielement/uicommanddescription.cxx b/framework/source/uielement/uicommanddescription.cxx index c021456cbde7..cbf0d61abb84 100644 --- a/framework/source/uielement/uicommanddescription.cxx +++ b/framework/source/uielement/uicommanddescription.cxx @@ -656,10 +656,6 @@ void UICommandDescription::impl_fillElements(const sal_Char* _pName) } } // for ( sal_Int32 i = 0; i < aElementNames.getLength(); i++ ) } -Reference< XNameAccess > UICommandDescription::impl_createConfigAccess(const OUString& _sName) -{ - return new ConfigurationAccess_UICommand( _sName, m_xGenericUICommands, m_xContext ); -} Any SAL_CALL UICommandDescription::getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) diff --git a/helpcompiler/inc/HelpCompiler.hxx b/helpcompiler/inc/HelpCompiler.hxx index 4d5a201c5fd3..0b0b0fad6ee3 100644 --- a/helpcompiler/inc/HelpCompiler.hxx +++ b/helpcompiler/inc/HelpCompiler.hxx @@ -97,7 +97,6 @@ namespace fs return (wchar_t const *) ustrSystemPath.getStr(); } #endif - std::string native_directory_string() const { return native_file_string(); } std::string toUTF8() const { OString tmp(OUStringToOString(data, RTL_TEXTENCODING_UTF8)); @@ -235,14 +234,6 @@ public: const std::string &in_lang, bool in_bExtensionMode); bool compile() throw (HelpProcessingException, BasicCodeTagger::TaggerException); - void addEntryToJarFile(const std::string &prefix, - const std::string &entryName, const std::string &bytesToAdd); - void addEntryToJarFile(const std::string &prefix, - const std::string &entryName, const HashSet &bytesToAdd); - void addEntryToJarFile(const std::string &prefix, - const std::string &entryName, const Stringtable &bytesToAdd); - void addEntryToJarFile(const std::string &prefix, - const std::string &entryName, const Hashtable &bytesToAdd); private: xmlDocPtr getSourceDocument(const fs::path &filePath); static void tagBasicCodeExamples(xmlDocPtr doc); diff --git a/hwpfilter/source/hpara.h b/hwpfilter/source/hpara.h index 193dcced637c..4b082eaf5efe 100644 --- a/hwpfilter/source/hpara.h +++ b/hwpfilter/source/hpara.h @@ -136,7 +136,6 @@ class DLLEXPORT HWPPara HWPPara *Next(void) { return _next;} int HomePos(int line) const; - int EndPos(int line) const; private: HBox *readHBox(HWPFile &); @@ -151,13 +150,6 @@ inline int HWPPara::HomePos(int line) const } -inline int HWPPara::EndPos(int line) const -{ - if( nline <= line + 1 ) return nch; - else return HomePos(line + 1); -} - - #endif // INCLUDED_HWPFILTER_SOURCE_HPARA_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/idl/inc/basobj.hxx b/idl/inc/basobj.hxx index c601fb1964ca..81194182db3c 100644 --- a/idl/inc/basobj.hxx +++ b/idl/inc/basobj.hxx @@ -59,10 +59,6 @@ public: void Push( SvMetaObject * pObj ) { aList.push_back( pObj ); } SvMetaObject * Pop() { return aList.pop_back(); } - SvMetaObject * Top() const { return aList.back(); } - void Clear() { aList.clear(); } - sal_uLong Count() const { return aList.size(); } - SvMetaObject * Get( TypeId nType ) { for( SvMetaObjectMemberList::reverse_iterator it = aList.rbegin(); it != aList.rend(); ++it ) @@ -92,8 +88,6 @@ public: SvMetaName(); virtual bool SetName( const OString& rName, SvIdlDataBase * = NULL ); - void SetDescription( const OString& rText ) - { aDescription.setString(rText); } const SvHelpContext& GetHelpContext() const { return aHelpContext; } virtual const SvString & GetName() const { return aName; } virtual const SvString & GetHelpText() const { return aHelpText; } @@ -171,7 +165,6 @@ public: SvMetaModule * GetModule() const; const SvGlobalName &GetUUId() const; - const SvVersion & GetVersion() const { return aVersion; } void SetModule( SvIdlDataBase & rBase ); virtual bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE; diff --git a/idl/inc/bastype.hxx b/idl/inc/bastype.hxx index 62052c0c7c4a..1b87c11589b4 100644 --- a/idl/inc/bastype.hxx +++ b/idl/inc/bastype.hxx @@ -55,7 +55,6 @@ public: SvBOOL & operator = ( bool n ) { nVal = n; bSet = true; return *this; } operator bool() const { return nVal; } - bool Is() const { return nVal; } bool IsSet() const { return bSet; } friend SvStream& WriteSvBOOL(SvStream &, const SvBOOL &); @@ -93,8 +92,6 @@ public: class SvNumberIdentifier : public SvIdentifier { sal_uInt32 nValue; - // must not be used - bool ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm ); public: SvNumberIdentifier() : nValue( 0 ) {}; bool IsSet() const diff --git a/idl/inc/database.hxx b/idl/inc/database.hxx index 050f44ca8586..087356b7e904 100644 --- a/idl/inc/database.hxx +++ b/idl/inc/database.hxx @@ -85,11 +85,10 @@ public: ~SvIdlDataBase(); SvMetaAttributeMemberList& GetAttrList() { return aAttrList; } - SvStringHashTable * GetIdTable() { return pIdTable; } - SvMetaTypeMemberList & GetTypeList(); - SvMetaClassMemberList & GetClassList() { return aClassList; } - SvMetaModuleMemberList & GetModuleList() { return aModuleList; } - SvMetaModule * GetModule( const OString& rName ); + SvMetaTypeMemberList & GetTypeList(); + SvMetaClassMemberList & GetClassList() { return aClassList; } + SvMetaModuleMemberList & GetModuleList() { return aModuleList; } + SvMetaModule * GetModule( const OString& rName ); // list of used types while writing SvMetaTypeMemberList aUsedTypes; @@ -115,15 +114,6 @@ public: void WriteError( SvTokenStream & rInStm ); void SetError( const OString& rError, SvToken& rTok ); void Push( SvMetaObject * pObj ); - bool Pop( bool bOk, SvTokenStream & rInStm, sal_uInt32 nTokPos ) - { - GetStack().Pop(); - if( bOk ) - aError.Clear(); - else - rInStm.Seek( nTokPos ); - return bOk; - } sal_uInt32 GetUniqueId() { return ++nUniqueId; } bool FindId( const OString& rIdName, sal_uLong * pVal ); bool InsertId( const OString& rIdName, sal_uLong nVal ); diff --git a/idl/inc/hash.hxx b/idl/inc/hash.hxx index a0450dbe109c..fc7258bdfb6e 100644 --- a/idl/inc/hash.hxx +++ b/idl/inc/hash.hxx @@ -73,7 +73,6 @@ public: const OString& GetName() const { return aName; } bool HasId() const { return bHasId; } - sal_uInt32 GetId() const { return nHashId; } void SetValue( sal_uLong n ) { nValue = n; } sal_uLong GetValue() const { return nValue; } diff --git a/idl/inc/lex.hxx b/idl/inc/lex.hxx index 5f5b18908814..ffcb0c91ee30 100644 --- a/idl/inc/lex.hxx +++ b/idl/inc/lex.hxx @@ -57,7 +57,6 @@ public: SvToken & operator = ( const SvToken & rObj ); OString GetTokenAsString() const; - SVTOKEN_ENUM GetType() const { return nType; } void SetLine( sal_uLong nLineP ) { nLine = nLineP; } sal_uLong GetLine() const { return nLine; } @@ -78,7 +77,6 @@ public: || nType == SVTOKEN_HASHID; } bool IsChar() const { return nType == SVTOKEN_CHAR; } - bool IsRttiBase() const { return nType == SVTOKEN_RTTIBASE; } bool IsEof() const { return nType == SVTOKEN_EOF; } const OString& GetString() const @@ -95,7 +93,6 @@ public: { pHash = pHashP; nType = SVTOKEN_HASHID; } bool HasHash() const { return nType == SVTOKEN_HASHID; } - SvStringHashEntry * GetHash() const { return pHash; } bool Is( SvStringHashEntry * pEntry ) const { return IsIdentifierHash() && pHash == pEntry; } }; @@ -179,10 +176,6 @@ public: const OUString & GetFileName() const { return aFileName; } SvStream & GetStream() { return rInStream; } - void SetTabSize( sal_uInt16 nTabSizeP ) - { nTabSize = nTabSizeP; } - sal_uInt16 GetTabSize() const { return nTabSize; } - SvToken* GetToken_PrevAll() { boost::ptr_vector::iterator pRetToken = pCurToken; @@ -244,17 +237,6 @@ public: SetMax(); } - void SeekRel( sal_uInt32 nRelPos ) - { - sal_uInt32 relIdx = Tell() + nRelPos; - - if ( relIdx < aTokList.size()) - { - pCurToken = aTokList.begin()+ (Tell() + nRelPos ); - SetMax(); - } - } - void SeekEnd() { pCurToken = aTokList.begin()+nMaxPos; diff --git a/idl/inc/module.hxx b/idl/inc/module.hxx index a9e800b78ab5..c8d1c40afc8a 100644 --- a/idl/inc/module.hxx +++ b/idl/inc/module.hxx @@ -55,24 +55,13 @@ protected: public: TYPEINFO_OVERRIDE(); - const OUString & GetIdlFileName() const { return aIdlFileName; } - const OString& GetModulePrefix() const { return aModulePrefix.getString(); } - - virtual bool SetName( const OString& rName, SvIdlDataBase * = NULL ) SAL_OVERRIDE; - - const OString& GetHelpFileName() const { return aHelpFileName.getString(); } - const OString& GetTypeLibFileName() const { return aTypeLibFile.getString(); } - - const SvMetaAttributeMemberList & GetAttrList() const { return aAttrList; } - const SvMetaTypeMemberList & GetTypeList() const { return aTypeList; } - const SvMetaClassMemberList & GetClassList() const { return aClassList; } + virtual bool SetName( const OString& rName, SvIdlDataBase * = NULL ) SAL_OVERRIDE; SvMetaModule( const OUString & rIdlFileName, bool bImported ); bool FillNextName( SvGlobalName * ); bool IsImported() const { return bImported; } - bool IsModified() const { return bIsModified; } virtual bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE; diff --git a/idl/inc/object.hxx b/idl/inc/object.hxx index 1f0a0721f2c7..37788d372ad1 100644 --- a/idl/inc/object.hxx +++ b/idl/inc/object.hxx @@ -56,9 +56,6 @@ public: void SetAutomation( bool rAutomation ) { aAutomation = rAutomation; } - bool GetAutomation() const - { return aAutomation; } - void SetClass( SvMetaClass * pClass ) { xClass = pClass; } SvMetaClass * GetClass() const @@ -106,17 +103,8 @@ public: TYPEINFO_OVERRIDE(); SvMetaClass(); - bool GetAutomation() const - { return aAutomation; } - SvMetaClass * GetSuperClass() const - { return aSuperClass; } - void FillClasses( SvMetaClassList & rList ); - const SvClassElementMemberList& - GetClassList() const - { return aClassList; } - virtual bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE; virtual void WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm ) SAL_OVERRIDE; }; diff --git a/idl/inc/slot.hxx b/idl/inc/slot.hxx index 3014d327b8e4..eee879b817bf 100644 --- a/idl/inc/slot.hxx +++ b/idl/inc/slot.hxx @@ -137,16 +137,6 @@ protected: } void SetRecordAbsolute( bool bSet ) { aRecordAbsolute = bSet; } - void SetHasDialog( bool bSet ) - { aHasDialog = bSet; } - void SetMenuConfig( bool bSet ) - { aMenuConfig = bSet; } - void SetToolBoxConfig( bool bSet ) - { aToolBoxConfig = bSet; } - void SetStatusBarConfig( bool bSet ) - { aStatusBarConfig = bSet; } - void SetAccelConfig( bool bSet ) - { aAccelConfig = bSet; } void SetAllConfig( bool bSet ) { aMenuConfig = bSet; @@ -154,14 +144,6 @@ protected: aStatusBarConfig = bSet; aAccelConfig = bSet; } - void SetFastCall( bool bSet ) - { aFastCall = bSet; } - void SetContainer( bool bSet ) - { aContainer = bSet; } - void SetImageRotation( bool bSet ) - { aImageRotation = bSet; } - void SetImageReflection( bool bSet ) - { aImageReflection = bSet; } public: TYPEINFO_OVERRIDE(); @@ -210,19 +192,14 @@ public: bool GetContainer() const; bool GetImageRotation() const; bool GetImageReflection() const; - SvMetaSlot* GetLinkedSlot() const - { return pLinkedSlot; } - SvMetaSlot* GetNextSlot() const - { return pNextSlot; } - sal_uLong GetListPos() const + + sal_uLong GetListPos() const { return nListPos; } void SetListPos(sal_uLong n) { nListPos = n; } void ResetSlotPointer() { pNextSlot = pLinkedSlot = 0; } - SvMetaEnumValue* GetEnumValue() const - { return pEnumValue; } virtual bool Test( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE; virtual void ReadAttributesSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm ) SAL_OVERRIDE; diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx index aa701f412847..79b976d5d4b1 100644 --- a/idl/inc/types.hxx +++ b/idl/inc/types.hxx @@ -54,34 +54,15 @@ public: void SetNewAttribute( bool bNew ) { bNewAttr = bNew; } - bool IsNewAttribute() const - { return bNewAttr; } bool GetReadonly() const; - void SetSlotId( const SvNumberIdentifier & rId ) { aSlotId = rId; } const SvNumberIdentifier & GetSlotId() const; - - void SetExport( bool bSet ) - { aExport = bSet; } bool GetExport() const; - - void SetHidden( bool bSet ) - { aHidden = bSet; } bool GetHidden() const; - - void SetAutomation( bool bSet ) - { aAutomation = bSet; } bool GetAutomation() const; - - void SetIsCollection( bool bSet ) - { aIsCollection = bSet; } bool GetIsCollection() const; - void SetReadOnlyDoc( bool bSet ) - { aReadOnlyDoc = bSet; } bool GetReadOnlyDoc() const; - - void SetType( SvMetaType * pT ) { aType = pT; } SvMetaType * GetType() const; virtual bool IsMethod() const; @@ -148,10 +129,6 @@ public: { return pAttrList ? pAttrList->size() : 0L; } - void AppendAttr( SvMetaAttribute * pAttr ) - { - GetAttrList().push_back( pAttr ); - } void SetType( int nT ); int GetType() const { return nType; } @@ -227,7 +204,6 @@ public: TYPEINFO_OVERRIDE(); SvMetaTypeEnum(); - sal_uInt16 GetMaxValue() const; sal_uLong Count() const { return aEnumValueList.size(); } const OString& GetPrefix() const { return aPrefix; } SvMetaEnumValue * GetObject( sal_uLong n ) const diff --git a/idlc/inc/idlc/astdeclaration.hxx b/idlc/inc/idlc/astdeclaration.hxx index d7d7aec22274..12f2ee6aa4fc 100644 --- a/idlc/inc/idlc/astdeclaration.hxx +++ b/idlc/inc/idlc/astdeclaration.hxx @@ -77,8 +77,6 @@ public: { return m_pScope; } const AstScope* getScope() const { return m_pScope; } - void setScope(AstScope* pSc) - { m_pScope = pSc; } NodeType getNodeType() const { return m_nodeType; } bool isInMainfile() const @@ -101,10 +99,6 @@ public: { return m_documentation; } void setDocumentation(const OUString& rDocumentation) { m_documentation = rDocumentation; } - bool isAdded() - { return m_bIsAdded; } - void markAsAdded() - { m_bIsAdded = true; } virtual bool isType() const; diff --git a/idlc/inc/idlc/astenum.hxx b/idlc/inc/idlc/astenum.hxx index 98c386fc8ae4..91aeb9e09100 100644 --- a/idlc/inc/idlc/astenum.hxx +++ b/idlc/inc/idlc/astenum.hxx @@ -31,8 +31,6 @@ public: virtual ~AstEnum(); - void setEnumValueCount(sal_Int32 count) - { m_enumValueCount = count; } sal_Int32 getEnumValueCount() { return m_enumValueCount++; } diff --git a/idlc/inc/idlc/astexpression.hxx b/idlc/inc/idlc/astexpression.hxx index 6f33b4d3696e..1e38895fd1ee 100644 --- a/idlc/inc/idlc/astexpression.hxx +++ b/idlc/inc/idlc/astexpression.hxx @@ -107,38 +107,12 @@ public: virtual ~AstExpression(); // Data Accessors - AstScope* getScope() - { return m_pScope; } - void setScope(AstScope* pScope) - { m_pScope = pScope; } - sal_Int32 getLine() - { return m_lineNo; } - void setLine(sal_Int32 l) - { m_lineNo = l; } - const OString& getFileName() - { return m_fileName; } - void setFileName(const OString& fileName) - { m_fileName = fileName; } ExprComb getCombOperator() { return m_combOperator; } - void setCombOperator(ExprComb new_ec) - { m_combOperator = new_ec; } AstExprValue* getExprValue() { return m_exprValue; } void setExprValue(AstExprValue *pEv) { m_exprValue = pEv; } - AstExpression* getExpr1() - { return m_subExpr1; } - void setExpr1(AstExpression *pExpr) - { m_subExpr1 = pExpr; } - AstExpression* getExpr2() - { return m_subExpr2; } - void setExpr2(AstExpression *pExpr) - { m_subExpr2 = pExpr; } - OString* getSymbolicName() - { return m_pSymbolicName; } - void setSymbolicName(OString* pSymbolicName) - { m_pSymbolicName = pSymbolicName; } // Evaluation and value coercion AstExprValue* coerce(ExprType type, bool bAssign=true); diff --git a/idlc/inc/idlc/astinterface.hxx b/idlc/inc/idlc/astinterface.hxx index e7a40ba3c456..54ad235c7afd 100644 --- a/idlc/inc/idlc/astinterface.hxx +++ b/idlc/inc/idlc/astinterface.hxx @@ -57,15 +57,6 @@ public: bool hasMandatoryInheritedInterfaces() const { return m_mandatoryInterfaces > 0; } - void setForwarded(bool bForwarded) - { m_bForwarded = bForwarded; } - bool isForwarded() - { return m_bForwarded; } - void setForwardedInSameFile(bool bForwarded) - { m_bForwardedInSameFile = bForwarded; } - bool isForwardedInSameFile() - { return m_bForwardedInSameFile; } - void setDefined() { m_bIsDefined = true; } bool isDefined() const { return m_bIsDefined; } @@ -125,8 +116,6 @@ private: InheritedInterfaces m_inheritedInterfaces; InheritedInterfaces::size_type m_mandatoryInterfaces; bool m_bIsDefined; - bool m_bForwarded; - bool m_bForwardedInSameFile; bool m_bSingleInheritance; VisibleInterfaces m_visibleInterfaces; VisibleMembers m_visibleMembers; diff --git a/idlc/inc/idlc/astoperation.hxx b/idlc/inc/idlc/astoperation.hxx index fd70cc39675d..e521557abaf2 100644 --- a/idlc/inc/idlc/astoperation.hxx +++ b/idlc/inc/idlc/astoperation.hxx @@ -42,8 +42,6 @@ public: bool isConstructor() const { return m_pReturnType == 0; } void setExceptions(DeclList const * pExceptions); - const DeclList& getExceptions() - { return m_exceptions; } sal_uInt16 nExceptions() { return (sal_uInt16)(m_exceptions.size()); } diff --git a/idlc/inc/idlc/astscope.hxx b/idlc/inc/idlc/astscope.hxx index 217afaffa940..c7d64a16dc2e 100644 --- a/idlc/inc/idlc/astscope.hxx +++ b/idlc/inc/idlc/astscope.hxx @@ -49,7 +49,6 @@ public: // Look up the identifier 'name' specified only in the local scope AstDeclaration* lookupByNameLocal(const OString& name) const; - AstDeclaration* lookupInForwarded(const OString& scopedName); AstDeclaration* lookupInInherited(const OString& scopedName) const; // Look up a predefined type by its ExprType diff --git a/idlc/inc/idlc/aststruct.hxx b/idlc/inc/idlc/aststruct.hxx index 87c54754a491..1f0e878d836e 100644 --- a/idlc/inc/idlc/aststruct.hxx +++ b/idlc/inc/idlc/aststruct.hxx @@ -40,9 +40,6 @@ public: AstScope* pScope); virtual ~AstStruct(); - AstStruct const* getBaseType() - { return m_pBaseType; } - DeclList::size_type getTypeParameterCount() const { return m_typeParameters.size(); } diff --git a/idlc/inc/idlc/fehelper.hxx b/idlc/inc/idlc/fehelper.hxx index 9c818e10923b..62566483435a 100644 --- a/idlc/inc/idlc/fehelper.hxx +++ b/idlc/inc/idlc/fehelper.hxx @@ -36,14 +36,8 @@ public: FeDeclarator(const OString& name, DeclaratorType declType, AstDeclaration* pComplPart); virtual ~FeDeclarator(); - - AstDeclaration* getComplexPart() - { return m_pComplexPart; } const OString& getName() { return m_name; } - DeclaratorType getDeclType() - { return m_declType; } - bool checkType(AstDeclaration const * pType); AstType const * compose(AstDeclaration const * pDecl); private: diff --git a/idlc/inc/idlc/idlc.hxx b/idlc/inc/idlc/idlc.hxx index 22d43c8569dd..4a65dc04cdf9 100644 --- a/idlc/inc/idlc/idlc.hxx +++ b/idlc/inc/idlc/idlc.hxx @@ -54,8 +54,6 @@ public: { return m_pScopes; } AstModule* getRoot() { return m_pRoot; } - ErrorHandler* error() - { return m_pErrorHandler; } const OString& getFileName() { return m_fileName; } void setFileName(const OString& fileName) @@ -85,14 +83,10 @@ public: { m_bIsInMainfile = bInMainfile; } sal_uInt32 getErrorCount() { return m_errorCount; } - void setErrorCount(sal_uInt32 errorCount) - { m_errorCount = errorCount; } void incErrorCount() { m_errorCount++; } sal_uInt32 getWarningCount() { return m_warningCount; } - void setWarningCount(sal_uInt32 warningCount) - { m_warningCount = warningCount; } void incWarningCount() { m_warningCount++; } sal_uInt32 getLineNumber() @@ -114,8 +108,6 @@ public: void addInclude(const OString& inc) { m_includes.insert(inc); } - StringSet& getIncludes() - { return m_includes; } void setPublished(bool published) { m_published = published; } bool isPublished() const { return m_published; } diff --git a/idlc/source/astinterface.cxx b/idlc/source/astinterface.cxx index 97d8f020170c..8dae59ea2bd7 100644 --- a/idlc/source/astinterface.cxx +++ b/idlc/source/astinterface.cxx @@ -34,8 +34,6 @@ AstInterface::AstInterface(const OString& name, , AstScope(NT_interface) , m_mandatoryInterfaces(0) , m_bIsDefined(false) - , m_bForwarded(false) - , m_bForwardedInSameFile(false) , m_bSingleInheritance(pInherits != 0) { if (pInherits != 0) { diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx index 66abc62852f4..11e81cd235d0 100644 --- a/include/editeng/editeng.hxx +++ b/include/editeng/editeng.hxx @@ -436,8 +436,6 @@ public: void ClearSpellErrors(); bool HasText( const SvxSearchItem& rSearchItem ); - //initialize sentence spelling - void StartSpelling(EditView& rEditView, bool bMultipleDoc); //spell and return a sentence bool SpellSentence(EditView& rEditView, svx::SpellPortions& rToFill, bool bIsGrammarChecking ); // put spell position to start of current sentence diff --git a/include/formula/token.hxx b/include/formula/token.hxx index 97213d723e17..c87a3c525ef9 100644 --- a/include/formula/token.hxx +++ b/include/formula/token.hxx @@ -191,9 +191,6 @@ public: /** This is dirty and only the compiler should use it! */ struct PrivateAccess { friend class FormulaCompiler; private: PrivateAccess() { } }; inline void NewOpCode( OpCode e, const PrivateAccess& ) { eOp = e; } - - static sal_Int32 GetStrLenBytes( sal_Int32 nLen ) - { return nLen * sizeof(sal_Unicode); } }; inline void intrusive_ptr_add_ref(const FormulaToken* p) diff --git a/include/i18nutil/unicode.hxx b/include/i18nutil/unicode.hxx index 64aa2a9bc096..6561da039f6b 100644 --- a/include/i18nutil/unicode.hxx +++ b/include/i18nutil/unicode.hxx @@ -41,15 +41,10 @@ public: static sal_Unicode SAL_CALL getUnicodeScriptStart(com::sun::star::i18n::UnicodeScript type); static sal_Unicode SAL_CALL getUnicodeScriptEnd(com::sun::star::i18n::UnicodeScript type); static sal_uInt8 SAL_CALL getUnicodeDirection( const sal_Unicode ch ); - static bool SAL_CALL isUpper( const sal_Unicode ch); - static bool SAL_CALL isLower( const sal_Unicode ch); - static bool SAL_CALL isDigit( const sal_Unicode ch); static bool SAL_CALL isControl( const sal_Unicode ch); - static bool SAL_CALL isPrint( const sal_Unicode ch); static bool SAL_CALL isAlpha( const sal_Unicode ch); static bool SAL_CALL isSpace( const sal_Unicode ch); static bool SAL_CALL isWhiteSpace( const sal_Unicode ch); - static bool SAL_CALL isAlphaDigit( const sal_Unicode ch); //Map an ISO 15924 script code to Latin/Asian/Complex/Weak static sal_Int16 SAL_CALL getScriptClassFromUScriptCode(UScriptCode eScript); diff --git a/include/registry/registry.hxx b/include/registry/registry.hxx index 15e7f620971c..e12e64e5f476 100644 --- a/include/registry/registry.hxx +++ b/include/registry/registry.hxx @@ -218,8 +218,6 @@ protected: @param length specifies the length of the array specified by phKeys. */ inline void setKeyHandles(Registry& registry, RegKeyHandle* phKeys, sal_uInt32 length); - /// close all subkeys - inline RegError closeKeyHandles(); /// stores the number of open subkeys, the number of elements. sal_uInt32 m_length; @@ -640,22 +638,6 @@ inline void RegistryKeyArray::setKeyHandles(Registry& registry, m_registry = registry; } -inline RegError RegistryKeyArray::closeKeyHandles() -{ - if (m_registry.isValid() && m_phKeys) - { - RegError ret; - ret = m_registry.m_pApi->closeSubKeys(m_phKeys, m_length); - m_registry = Registry(); - m_length = 0; - m_phKeys = NULL; - return ret; - } else - return RegError::INVALID_KEY; -} - - - inline RegistryKeyNames::RegistryKeyNames() : m_length(0) , m_pKeyNames(NULL) diff --git a/include/sot/factory.hxx b/include/sot/factory.hxx index 7314e3ae68e9..18f093b77446 100644 --- a/include/sot/factory.hxx +++ b/include/sot/factory.hxx @@ -36,13 +36,11 @@ typedef void * (*CreateInstanceType)( SotObject ** ); //==================class SotFactory======================================= class SOT_DLLPUBLIC SotFactory : public SvGlobalName { - sal_uInt16 nSuperCount; // Anzahl der Superklassen + sal_uInt16 nSuperCount; // Anzahl der Superklassen const SotFactory ** pSuperClasses; // Superklassen - CreateInstanceType pCreateFunc; OUString aClassName; - static bool ExistTest( const SvGlobalName & ); protected: virtual ~SotFactory(); public: @@ -54,7 +52,7 @@ public: #endif SotFactory( const SvGlobalName &, - const OUString & rClassName, CreateInstanceType ); + const OUString & rClassName ); void PutSuperClass( const SotFactory * ); diff --git a/include/sot/stg.hxx b/include/sot/stg.hxx index bfb5702e5d29..2e3c629950d0 100644 --- a/include/sot/stg.hxx +++ b/include/sot/stg.hxx @@ -119,7 +119,6 @@ public: virtual bool IsStorage( const OUString& rEleName ) const = 0; virtual bool IsContained( const OUString& rEleName ) const = 0; virtual bool Remove( const OUString & rEleName ) = 0; - virtual bool Rename( const OUString & rEleName, const OUString & rNewName ) = 0; virtual bool CopyTo( const OUString & rEleName, BaseStorage * pDest, const OUString & rNewName ) = 0; virtual bool ValidateFAT() = 0; virtual bool Equals( const BaseStorage& rStream ) const = 0; @@ -135,8 +134,6 @@ protected: ~OLEStorageBase(); bool Validate_Impl( bool=false ) const; static bool ValidateMode_Impl( StreamMode, StgDirEntry* p = NULL ); - const SvStream* GetSvStream_Impl() const; -public: }; class StorageStream : public BaseStorageStream, public OLEStorageBase @@ -212,7 +209,6 @@ public: virtual bool IsStorage( const OUString& rEleName ) const SAL_OVERRIDE; virtual bool IsContained( const OUString& rEleName ) const SAL_OVERRIDE; virtual bool Remove( const OUString & rEleName ) SAL_OVERRIDE; - virtual bool Rename( const OUString & rEleName, const OUString & rNewName ) SAL_OVERRIDE; virtual bool CopyTo( const OUString & rEleName, BaseStorage * pDest, const OUString & rNewName ) SAL_OVERRIDE; virtual bool ValidateFAT() SAL_OVERRIDE; virtual bool Validate( bool=false ) const SAL_OVERRIDE; @@ -318,7 +314,6 @@ public: virtual bool IsStorage( const OUString& rEleName ) const SAL_OVERRIDE; virtual bool IsContained( const OUString& rEleName ) const SAL_OVERRIDE; virtual bool Remove( const OUString & rEleName ) SAL_OVERRIDE; - virtual bool Rename( const OUString & rEleName, const OUString & rNewName ) SAL_OVERRIDE; virtual bool CopyTo( const OUString & rEleName, BaseStorage * pDest, const OUString & rNewName ) SAL_OVERRIDE; virtual bool ValidateFAT() SAL_OVERRIDE; virtual bool Validate( bool=false ) const SAL_OVERRIDE; diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx index ca356d45ce26..997dcb58c756 100644 --- a/include/svtools/brwbox.hxx +++ b/include/svtools/brwbox.hxx @@ -403,8 +403,6 @@ protected: bool IsDropFormatSupported( SotClipboardFormatId nFormat ); // need this because the base class' IsDropFormatSupported is not const ... - bool IsDropFormatSupported( const css::datatransfer::DataFlavor& _rFlavor ); // need this because the base class' IsDropFormatSupported is not const ... - private: void* implGetDataFlavors() const; // with this we can make GetDataFlavors() inline, which is strongly needed as SVTOOLS does not export diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx index d2294f4ad074..5d11cf3fe855 100644 --- a/include/svtools/editbrowsebox.hxx +++ b/include/svtools/editbrowsebox.hxx @@ -497,8 +497,6 @@ namespace svt protected: VclPtr pHeader; - void cancelGetCellFocus() { if (nStartEvent) Application::RemoveUserEvent(nStartEvent); nStartEvent = 0; } - BrowserMouseEventPtr& getMouseEvent() { return aMouseEvent; } protected: diff --git a/include/svx/EnhancedCustomShape2d.hxx b/include/svx/EnhancedCustomShape2d.hxx index 0811a67fef61..26b7adcf98db 100644 --- a/include/svx/EnhancedCustomShape2d.hxx +++ b/include/svx/EnhancedCustomShape2d.hxx @@ -225,8 +225,6 @@ class SVX_DLLPUBLIC EnhancedCustomShape2d : public SfxItemSet SAL_DLLPRIVATE static void AppendEnhancedCustomShapeEquationParameter( OUString& rParameter, const sal_Int32 nPara, const bool bIsSpecialValue ); - SAL_DLLPRIVATE static void SetEnhancedCustomShapeEquationParameter( com::sun::star::drawing::EnhancedCustomShapeParameter& - rParameter, const sal_Int16 nPara, const bool bIsSpecialValue ); static void SetEnhancedCustomShapeParameter( com::sun::star::drawing::EnhancedCustomShapeParameter& rParameter, const sal_Int32 nValue ); static void SetEnhancedCustomShapeHandleParameter( com::sun::star::drawing::EnhancedCustomShapeParameter& diff --git a/include/svx/framelink.hxx b/include/svx/framelink.hxx index 1983468ddc2e..e64f1ce5e985 100644 --- a/include/svx/framelink.hxx +++ b/include/svx/framelink.hxx @@ -149,7 +149,6 @@ public: /** Sets a new color, does not modify other settings. */ inline void SetColorPrim( const Color& rColor ) { maColorPrim = rColor; } inline void SetColorSecn( const Color& rColor ) { maColorSecn = rColor; } - inline void SetColorGap( bool bUseIt, const Color& rColor ) { maColorGap = rColor; mbUseGapColor = bUseIt; } /** Sets whether to use dotted style for single hair lines. */ inline void SetType( editeng::SvxBorderStyle nType ) { mnType = nType; } diff --git a/include/svx/sdr/overlay/overlayobjectlist.hxx b/include/svx/sdr/overlay/overlayobjectlist.hxx index f807e8c96e3a..459b9ab1ce82 100644 --- a/include/svx/sdr/overlay/overlayobjectlist.hxx +++ b/include/svx/sdr/overlay/overlayobjectlist.hxx @@ -43,9 +43,6 @@ namespace sdr // the vector of OverlayObjects OverlayObjectVector maVector; - // default value for HiTestPixel - static sal_uInt32 getDefaultValueForHitTestPixel() { return 4; } - public: OverlayObjectList() {} ~OverlayObjectList(); diff --git a/include/svx/svdedtv.hxx b/include/svx/svdedtv.hxx index b97f8eb3c618..ae10b8231677 100644 --- a/include/svx/svdedtv.hxx +++ b/include/svx/svdedtv.hxx @@ -203,8 +203,6 @@ public: void ForceMarkedObjToAnotherPage(); void ForceMarkedToAnotherPage() { ForceMarkedObjToAnotherPage(); } - bool IsReadOnly() const { ForcePossibilities(); return bReadOnly; } - // delete all marked objects void DeleteMarkedObj(); diff --git a/include/svx/svdhlpln.hxx b/include/svx/svdhlpln.hxx index 03b59aeb02a3..024124d464c0 100644 --- a/include/svx/svdhlpln.hxx +++ b/include/svx/svdhlpln.hxx @@ -84,12 +84,6 @@ public: delete p; aList.erase(aList.begin() + nPos); } - void Move(sal_uInt16 nPos, sal_uInt16 nNewPos) - { - SdrHelpLine* p = aList[nPos]; - aList.erase(aList.begin() + nPos); - aList.insert(aList.begin() + nNewPos, p); - } SdrHelpLine& operator[](sal_uInt16 nPos) { return *GetObject(nPos); } const SdrHelpLine& operator[](sal_uInt16 nPos) const { return *GetObject(nPos); } sal_uInt16 HitTest(const Point& rPnt, sal_uInt16 nTolLog, const OutputDevice& rOut) const; diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx index 5e0b0b1c67ea..966c7c56b9a9 100644 --- a/include/svx/svdmrkv.hxx +++ b/include/svx/svdmrkv.hxx @@ -390,7 +390,6 @@ public: // Get the Hdl (handle) of a marked GluePoint. Non-marked // GluePoints don`t have handles SdrHdl* GetGluePointHdl(const SdrObject* pObj, sal_uInt16 nId) const; - static bool IsGluePoint(const SdrHdl& rHdl) { return rHdl.GetKind()==HDL_GLUE; } // Mark all points within this rectangular (View coordinates) bool MarkAllGluePoints() { return MarkGluePoints(NULL,false); } diff --git a/include/svx/svdopath.hxx b/include/svx/svdopath.hxx index f625668498c9..948b4f3d28ac 100644 --- a/include/svx/svdopath.hxx +++ b/include/svx/svdopath.hxx @@ -58,7 +58,6 @@ protected: // brightness - used in EnhancedCustomShapes2d.cxx for DARKEN[LESS] and LIGHTEN[LESS] segments implementation double mdBrightness; -protected: // helper functions for GET, SET, INS etc. PNT void ImpSetClosed(bool bClose); void ImpForceKind(); @@ -67,11 +66,9 @@ protected: void impDeleteDAC() const; public: - static bool ImpFindPolyPnt(const basegfx::B2DPolyPolygon& rPoly, sal_uInt32 nAbsPnt, sal_uInt32& rPolyNum, sal_uInt32& rPointNum); virtual void SetRectsDirty(bool bNotMyself = false) SAL_OVERRIDE; double GetBrightness() { return mdBrightness; } -public: TYPEINFO_OVERRIDE(); SdrPathObj(SdrObjKind eNewKind); SdrPathObj(SdrObjKind eNewKind, const basegfx::B2DPolyPolygon& rPathPoly, double dBrightness = 1.0); diff --git a/include/svx/svdtrans.hxx b/include/svx/svdtrans.hxx index e54c74511cb0..daee84531fe1 100644 --- a/include/svx/svdtrans.hxx +++ b/include/svx/svdtrans.hxx @@ -320,7 +320,6 @@ public: void TakeStr(long nVal, OUString& rStr) const; static void TakeUnitStr(MapUnit eUnit, OUString& rStr); static void TakeUnitStr(FieldUnit eUnit, OUString& rStr); - static OUString GetUnitStr(MapUnit eUnit) { OUString aStr; TakeUnitStr(eUnit,aStr); return aStr; } static OUString GetUnitStr(FieldUnit eUnit) { OUString aStr; TakeUnitStr(eUnit,aStr); return aStr; } }; diff --git a/include/tools/inetmime.hxx b/include/tools/inetmime.hxx index 11d5ee748a2e..23b86f1a5739 100644 --- a/include/tools/inetmime.hxx +++ b/include/tools/inetmime.hxx @@ -220,23 +220,6 @@ public: HEADER_FIELD_ADDRESS }; - /** Check for ISO 8859-1 character. - - @param nChar Some UCS-4 character. - - @return True if nChar is a ISO 8859-1 character (0x00--0xFF). - */ - static inline bool isISO88591(sal_uInt32 nChar); - - /** Check for US-ASCII control character. - - @param nChar Some UCS-4 character. - - @return True if nChar is a US-ASCII control character (US-ASCII - 0x00--0x1F or 0x7F). - */ - static inline bool isControl(sal_uInt32 nChar); - /** Check for US-ASCII white space character. @param nChar Some UCS-4 character. @@ -255,15 +238,6 @@ public: */ static inline bool isVisible(sal_uInt32 nChar); - /** Check for US-ASCII Base 64 digit character. - - @param nChar Some UCS-4 character. - - @return True if nChar is a US-ASCII Base 64 digit character (US-ASCII - 'A'--'Z', 'a'--'z', '0'--'9', '+', or '/'). - */ - static inline bool isBase64Digit(sal_uInt32 nChar); - /** Check whether some character is valid within an RFC 822 . @param nChar Some UCS-4 character. @@ -381,9 +355,6 @@ public: const sal_Unicode * pEnd1, const sal_Char * pString2); - static inline bool startsWithLineBreak(const sal_Char * pBegin, - const sal_Char * pEnd); - static inline bool startsWithLineBreak(const sal_Unicode * pBegin, const sal_Unicode * pEnd); @@ -393,9 +364,6 @@ public: static inline bool startsWithLineFolding(const sal_Unicode * pBegin, const sal_Unicode * pEnd); - static bool startsWithLinearWhiteSpace(const sal_Char * pBegin, - const sal_Char * pEnd); - static const sal_Unicode * skipLinearWhiteSpace(const sal_Unicode * pBegin, const sal_Unicode * pEnd); @@ -550,18 +518,6 @@ public: sal_uInt32 nUTF32); }; -// static -inline bool INetMIME::isISO88591(sal_uInt32 nChar) -{ - return nChar <= 0xFF; -} - -// static -inline bool INetMIME::isControl(sal_uInt32 nChar) -{ - return nChar <= 0x1F || nChar == 0x7F; -} - // static inline bool INetMIME::isWhiteSpace(sal_uInt32 nChar) { @@ -574,13 +530,6 @@ inline bool INetMIME::isVisible(sal_uInt32 nChar) return nChar >= '!' && nChar <= '~'; } -// static -inline bool INetMIME::isBase64Digit(sal_uInt32 nChar) -{ - return rtl::isAsciiUpperCase(nChar) || rtl::isAsciiLowerCase(nChar) || rtl::isAsciiDigit(nChar) - || nChar == '+' || nChar == '/'; -} - // static inline int INetMIME::getWeight(sal_uInt32 nChar) { @@ -607,15 +556,7 @@ inline int INetMIME::getBase64Weight(sal_uInt32 nChar) } // static -inline bool INetMIME::startsWithLineBreak(const sal_Char * pBegin, - const sal_Char * pEnd) -{ - DBG_ASSERT(pBegin && pBegin <= pEnd, - "INetMIME::startsWithLineBreak(): Bad sequence"); - return pEnd - pBegin >= 2 && pBegin[0] == 0x0D && pBegin[1] == 0x0A; - // CR, LF -} // static inline bool INetMIME::startsWithLineBreak(const sal_Unicode * pBegin, @@ -651,15 +592,7 @@ inline bool INetMIME::startsWithLineFolding(const sal_Unicode * pBegin, } // static -inline bool INetMIME::startsWithLinearWhiteSpace(const sal_Char * pBegin, - const sal_Char * pEnd) -{ - DBG_ASSERT(pBegin && pBegin <= pEnd, - "INetMIME::startsWithLinearWhiteSpace(): Bad sequence"); - return pBegin != pEnd - && (isWhiteSpace(*pBegin) || startsWithLineFolding(pBegin, pEnd)); -} // static inline bool INetMIME::needsQuotedStringEscape(sal_uInt32 nChar) diff --git a/include/tools/poly.hxx b/include/tools/poly.hxx index 559b8d88b086..ad8ff402426d 100644 --- a/include/tools/poly.hxx +++ b/include/tools/poly.hxx @@ -269,8 +269,6 @@ public: bool operator!=( const tools::PolyPolygon& rPolyPoly ) const { return !(PolyPolygon::operator==( rPolyPoly )); } - bool IsEqual( const tools::PolyPolygon& rPolyPoly ) const; - TOOLS_DLLPUBLIC friend SvStream& ReadPolyPolygon( SvStream& rIStream, tools::PolyPolygon& rPolyPoly ); TOOLS_DLLPUBLIC friend SvStream& WritePolyPolygon( SvStream& rOStream, const tools::PolyPolygon& rPolyPoly ); diff --git a/include/tools/rc.hxx b/include/tools/rc.hxx index 7b8a175348ad..b26711dda949 100644 --- a/include/tools/rc.hxx +++ b/include/tools/rc.hxx @@ -54,9 +54,6 @@ protected: // get a 32bit value from Resource data static sal_Int32 GetLongRes( void * pLong ) { return ResMgr::GetLong( pLong ); } - // get a 16bit value from Resource data - static sal_Int16 GetShortRes( void * pShort ) - { return ResMgr::GetShort( pShort ); } // read a 32bit value from resource data and increment pointer sal_Int32 ReadLongRes() diff --git a/include/tools/resmgr.hxx b/include/tools/resmgr.hxx index 1c521d56c0d2..b9935488365c 100644 --- a/include/tools/resmgr.hxx +++ b/include/tools/resmgr.hxx @@ -127,8 +127,6 @@ private: // like ReadString but doesn't call the string hook TOOLS_DLLPRIVATE OUString ReadStringWithoutHook(); - static ResMgr* ImplCreateResMgr( InternalResMgr* pImpl ) { return new ResMgr( pImpl ); } - ResMgr(const ResMgr&) SAL_DELETED_FUNCTION; ResMgr& operator=(const ResMgr&) SAL_DELETED_FUNCTION; diff --git a/include/unotest/bootstrapfixturebase.hxx b/include/unotest/bootstrapfixturebase.hxx index 477fa1c275c6..f769d01190eb 100644 --- a/include/unotest/bootstrapfixturebase.hxx +++ b/include/unotest/bootstrapfixturebase.hxx @@ -66,8 +66,10 @@ public: // return a URL to a given c-str path from the workdir directory OUString getURLFromWorkdir( const char *pPath ); +#ifdef _WIN32 // return a Path to a given c-str path from the workdir directory OUString getPathFromWorkdir( const char *pPath ); +#endif virtual void setUp() SAL_OVERRIDE; virtual void tearDown() SAL_OVERRIDE; diff --git a/include/unotools/charclass.hxx b/include/unotools/charclass.hxx index 629700c585f9..cff4f869a02d 100644 --- a/include/unotools/charclass.hxx +++ b/include/unotools/charclass.hxx @@ -96,16 +96,6 @@ public: /// isalpha() on ascii values of entire string static bool isAsciiAlpha( const OUString& rStr ); - /// isalnum() on ascii values of entire string - static bool isAsciiAlphaNumeric( const OUString& rStr ); - - /// whether type is pure alpha or not, e.g. return of getStringType - static inline bool isAlphaType( sal_Int32 nType ) - { - return ((nType & nCharClassAlphaType) != 0) && - ((nType & ~(nCharClassAlphaTypeMask)) == 0); - } - /// whether type is pure numeric or not, e.g. return of getStringType static inline bool isNumericType( sal_Int32 nType ) { diff --git a/include/vcl/combobox.hxx b/include/vcl/combobox.hxx index d0189d5a6aaf..76526240d77c 100644 --- a/include/vcl/combobox.hxx +++ b/include/vcl/combobox.hxx @@ -121,7 +121,6 @@ public: void EnableMultiSelection( bool bMulti ); bool IsMultiSelectionEnabled() const; - void SetMultiSelectionSeparator( sal_Unicode cSep ); sal_Unicode GetMultiSelectionSeparator() const; void SetSelectHdl(const Link<>& rLink); @@ -177,7 +176,6 @@ public: using Control::GetIndexForPoint; long GetIndexForPoint( const Point& rPoint, sal_Int32 & rPos ) const; - sal_Int32 getMaxWidthChars() const; void setMaxWidthChars(sal_Int32 nWidth); virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; diff --git a/include/vcl/lstbox.hxx b/include/vcl/lstbox.hxx index 1197e686bff7..21b78bc7d39e 100644 --- a/include/vcl/lstbox.hxx +++ b/include/vcl/lstbox.hxx @@ -231,7 +231,6 @@ public: using Control::GetIndexForPoint; long GetIndexForPoint( const Point& rPoint, sal_Int32 & rPos ) const; - sal_Int32 getMaxWidthChars() const { return m_nMaxWidthChars; } void setMaxWidthChars(sal_Int32 nWidth); virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; @@ -249,13 +248,7 @@ public: using ListBox::SaveValue; using ListBox::GetSavedValue; using ListBox::IsValueChangedFromSaved; -private: - // Bei MultiListBox nicht erlaubt... - void SaveValue(); - sal_Int32 GetSavedValue(); - bool IsValueChangedFromSaved() const; -public: explicit MultiListBox( vcl::Window* pParent, WinBits nStyle = 0 ); }; diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index 325291b516e6..3dab4e0b75af 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -1784,9 +1784,6 @@ public: static basegfx::B2DPolygon LogicToLogic( const basegfx::B2DPolygon& rPoly, const MapMode& rMapModeSource, const MapMode& rMapModeDest ); - static basegfx::B2DPolyPolygon LogicToLogic( const basegfx::B2DPolyPolygon& rPolyPoly, - const MapMode& rMapModeSource, - const MapMode& rMapModeDest ); // create a mapping transformation from rMapModeSource to rMapModeDest (the above methods // for B2DPoly/Polygons use this internally anyway to transform the B2DPolygon) diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx index 36468167bdf1..49dbd6768ea6 100644 --- a/include/vcl/svapp.hxx +++ b/include/vcl/svapp.hxx @@ -834,28 +834,6 @@ public: */ static ImplSVEvent * PostMouseEvent( sal_uLong nEvent, vcl::Window *pWin, MouseEvent* pMouseEvent ); - /** Send zoom event - - Experimental work in progress. Available only for iOS and Android, and unclear whether actually - is needed now with tiled rendering. - - @param nEvent Event ID for zoom event - @param pWin Pointer to window to which the event is sent - @param pZoomEvent Zoom event to send - */ - static ImplSVEvent * PostZoomEvent( sal_uLong nEvent, vcl::Window *pWin, ZoomEvent* pZoomEvent ); - - /* Send scroll event - - Experimental work in progress. Available only for iOS and Android, and unclear whether actually - is needed now with tiled rendering. - - @param nEvent Event ID for scroll event - @param pWin Pointer to window to which the event is sent - @param pScrollEvent Scroll event to send - */ - static ImplSVEvent * PostScrollEvent( sal_uLong nEvent, vcl::Window *pWin, ScrollEvent* pScrollEvent ); - /** Remove mouse and keypress events from a window... any also zoom and scroll events if the platform supports it. @@ -1368,12 +1346,6 @@ public: */ static void SetFilterHdl( const Link<>& rLink ); - /*** Get a new graphics filter - - @return Const reference to the Link object (the filter) - */ - static const Link<>& GetFilterHdl(); - ///@} /** @name Headless Mode diff --git a/include/xmlscript/xml_helper.hxx b/include/xmlscript/xml_helper.hxx index f4dad80fa534..62b46996d5e5 100644 --- a/include/xmlscript/xml_helper.hxx +++ b/include/xmlscript/xml_helper.hxx @@ -66,14 +66,6 @@ public: */ void SAL_CALL addAttribute( OUString const & rAttrName, OUString const & rValue ); - /** Gets the tag name (qname) of element. - - @return - qname of element - */ - inline OUString SAL_CALL getName() - { return _name; } - /** Dumps out element (and all sub elements). @param xOut document handler to be written to diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx index b868c7a546ad..9badf8b9ad3f 100644 --- a/l10ntools/inc/export.hxx +++ b/l10ntools/inc/export.hxx @@ -148,8 +148,6 @@ private: bool WriteData( ResData *pResData, bool bCreateNew = false ); ///< called before dest. cur ResData bool WriteExportList( ResData *pResData, ExportList& rExportList, const sal_uInt16 nTyp ); - OString MergePairedList( OString const & sLine , OString const & sText ); - OString FullId(); ///< creates cur. GID static OString GetPairedListID(const OString & rText); diff --git a/l10ntools/inc/xmlparse.hxx b/l10ntools/inc/xmlparse.hxx index ab3f0e26e9e1..69ee3f9317ca 100644 --- a/l10ntools/inc/xmlparse.hxx +++ b/l10ntools/inc/xmlparse.hxx @@ -240,23 +240,12 @@ public: /// Return a Unicode String representation of this object OString ToOString(); - void SetProject ( OString const & sPrj ) { m_sProject = sPrj; } - void SetFileName ( OString const & sFileName ) { m_sFilename = sFileName; } void SetId ( OString const & sTheId ) { m_sId = sTheId; } - void SetResourceType ( OString const & sResType ) { m_sResourceType = sResType; } void SetLanguageId ( OString const & sLangId ) { m_sLanguageId = sLangId; } void SetPos ( int nPos ) { m_nPos = nPos; } void SetOldRef ( OString const & sOldRef ) { m_sOldRef = sOldRef; } - int GetPos() { return m_nPos; } - OString GetProject() const { return m_sProject; } - OString GetFileName() const { return m_sFilename; } - OString GetId() const { return m_sId; } OString GetOldref() const { return m_sOldRef; } - OString GetResourceType() const { return m_sResourceType; } - OString GetLanguageId() const { return m_sLanguageId; } - - }; /** Holds character data @@ -265,16 +254,14 @@ class XMLData : public XMLChildNode { private: OString m_sData; - bool m_bIsNewCreated; public: /// create a data node XMLData( const OString &rData, // the initial data - XMLParentNode *pParent, // the parent node of this data, typically a element node - bool bNewCreated = false + XMLParentNode *pParent // the parent node of this data, typically a element node ) - : XMLChildNode( pParent ), m_sData( rData ), m_bIsNewCreated( bNewCreated ){} + : XMLChildNode( pParent ), m_sData( rData ) {} // Default copy constructor and copy operator work well. @@ -283,8 +270,6 @@ public: /// returns the data OString GetData() const { return m_sData; } - bool isNew() const { return m_bIsNewCreated; } - /// adds new character data to the existing one void AddData( const OString &rData ) { m_sData += rData; } }; diff --git a/l10ntools/inc/xrmmerge.hxx b/l10ntools/inc/xrmmerge.hxx index 13fb191e3a00..9138369f71ea 100644 --- a/l10ntools/inc/xrmmerge.hxx +++ b/l10ntools/inc/xrmmerge.hxx @@ -57,7 +57,6 @@ protected: )=0; OString GetGID() { return sGID; } - OString GetLID() { return sLID; } public: XRMResParser(); diff --git a/l10ntools/source/helpmerge.cxx b/l10ntools/source/helpmerge.cxx index dd31a3a04d52..6567538ef1d1 100644 --- a/l10ntools/source/helpmerge.cxx +++ b/l10ntools/source/helpmerge.cxx @@ -252,7 +252,7 @@ void HelpParser::ProcessHelp( LangHashMap* aLangHM , const OString& sCur , ResDa { if( pXMLElement != NULL ) { - XMLData *data = new XMLData( sNewdata , NULL , true ); // Add new one + XMLData *data = new XMLData( sNewdata , NULL ); // Add new one pXMLElement->RemoveAndDeleteAllChildren(); pXMLElement->AddChild( data ); aLangHM->erase( sCur ); diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.hxx b/lingucomponent/source/thesaurus/libnth/nthesimp.hxx index 765234943231..87ab6dd1a30b 100644 --- a/lingucomponent/source/thesaurus/libnth/nthesimp.hxx +++ b/lingucomponent/source/thesaurus/libnth/nthesimp.hxx @@ -124,17 +124,9 @@ public: getSupportedServiceNames_Static() throw(); private: - static OUString SAL_CALL makeLowerCase(const OUString&, CharClass *); - static OUString SAL_CALL makeUpperCase(const OUString&, CharClass *); - static OUString SAL_CALL makeInitCap(const OUString&, CharClass *); - -/* static ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XLinguServiceManager > xLngSvcMgr; - static ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XSpellChecker1 > xSpell; -*/ - static ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XLinguServiceManager > GetLngSvcMgr(); - + static OUString SAL_CALL makeLowerCase(const OUString&, CharClass *); + static OUString SAL_CALL makeUpperCase(const OUString&, CharClass *); + static OUString SAL_CALL makeInitCap(const OUString&, CharClass *); }; inline OUString Thesaurus::getImplementationName_Static() throw() diff --git a/lotuswordpro/source/filter/lwp9reader.cxx b/lotuswordpro/source/filter/lwp9reader.cxx index 1cc12348ccf7..c947c60cd8a1 100644 --- a/lotuswordpro/source/filter/lwp9reader.cxx +++ b/lotuswordpro/source/filter/lwp9reader.cxx @@ -128,26 +128,6 @@ void Lwp9Reader::ReadIndex() m_pDocStream->Seek(oldpos); } -/** - * @descr Read all objects - * This function is replaced by the read on demand model - * Reserverd for future use -*/ - - -/** - * @descr Get file size -*/ -sal_Int64 Lwp9Reader::GetFileSize() -{ - sal_Int64 pos = m_pDocStream->Tell(); - m_pDocStream->Seek(0); - - sal_Int64 size = m_pDocStream->Seek( STREAM_SEEK_TO_END); - m_pDocStream->Seek(pos); - return size; -} - /** * @descr Parse all document content */ diff --git a/lotuswordpro/source/filter/lwp9reader.hxx b/lotuswordpro/source/filter/lwp9reader.hxx index ecf175d8e6c0..9cc92bc682da 100644 --- a/lotuswordpro/source/filter/lwp9reader.hxx +++ b/lotuswordpro/source/filter/lwp9reader.hxx @@ -76,7 +76,6 @@ private: LwpObjectFactory* m_pObjMgr; LwpFileHeader m_LwpFileHdr; //LWP7 object protected: - sal_Int64 GetFileSize(); void ReadFileHeader(); void ReadIndex(); void ParseDocument(); diff --git a/lotuswordpro/source/filter/lwpdllist.hxx b/lotuswordpro/source/filter/lwpdllist.hxx index 1c687df4b4b5..05a724ece8b7 100644 --- a/lotuswordpro/source/filter/lwpdllist.hxx +++ b/lotuswordpro/source/filter/lwpdllist.hxx @@ -69,7 +69,6 @@ public: void insert(LwpDLList*, LwpDLList*); void remove(); LwpDLList* GetNext(); - LwpDLList* GetPrevious(); void SetNext(LwpDLList*); void SetPrevious(LwpDLList*); private: @@ -87,11 +86,6 @@ inline void LwpDLList::SetNext(LwpDLList* Next) m_pNext = Next; } -inline LwpDLList* LwpDLList::GetPrevious() -{ - return m_pPrevious; -} - inline void LwpDLList::SetPrevious(LwpDLList* Previous) { m_pPrevious = Previous; diff --git a/lotuswordpro/source/filter/lwptblcell.hxx b/lotuswordpro/source/filter/lwptblcell.hxx index 73e676f76ac8..744fbd5f621a 100644 --- a/lotuswordpro/source/filter/lwptblcell.hxx +++ b/lotuswordpro/source/filter/lwptblcell.hxx @@ -230,15 +230,10 @@ public: LwpRowColumnQualifier(); ~LwpRowColumnQualifier(){} - inline void SetAbsolute(); - inline void ClearAbsolute(); bool IsAbsolute(); - inline void SetAfter(); - inline void ClearAfter(); bool IsAfter(); - void SetBad(bool Bad); bool IsBad(); void QuickRead(LwpObjectStream *pStrm); @@ -253,30 +248,6 @@ private: sal_uInt8 cFlags; }; -inline void -LwpRowColumnQualifier::SetAbsolute() -{ - cFlags |= REF_ABSOLUTE; -} - -inline void -LwpRowColumnQualifier::ClearAbsolute() -{ - cFlags &= ~REF_ABSOLUTE; -} - -inline void -LwpRowColumnQualifier::SetAfter() -{ - cFlags |= REF_AFTER; -} - -inline void -LwpRowColumnQualifier::ClearAfter() -{ - cFlags &= ~REF_AFTER; -} - inline LwpRowColumnQualifier::LwpRowColumnQualifier() { diff --git a/sc/inc/chartpos.hxx b/sc/inc/chartpos.hxx index 08d3a6114915..c3693b0d91cc 100644 --- a/sc/inc/chartpos.hxx +++ b/sc/inc/chartpos.hxx @@ -127,7 +127,6 @@ public: virtual ~ScChartPositioner(); const ScRangeListRef& GetRangeList() const { return aRangeListRef; } - void SetRangeList( const ScRangeListRef& rNew ) { aRangeListRef = rNew; } void SetRangeList( const ScRange& rNew ); void SetHeaders(bool bCol, bool bRow) { bColHeaders=bCol; bRowHeaders=bRow; } diff --git a/sc/inc/clkernelthread.hxx b/sc/inc/clkernelthread.hxx index ef53a5e689da..d4d83ed5d688 100644 --- a/sc/inc/clkernelthread.hxx +++ b/sc/inc/clkernelthread.hxx @@ -34,8 +34,6 @@ public: CLBuildKernelThread(); virtual ~CLBuildKernelThread(); - void push(CLBuildKernelWorkItem item); - osl::Condition maCompilationDoneCondition; protected: diff --git a/sc/inc/colorscale.hxx b/sc/inc/colorscale.hxx index 668d3e55473d..670ccd02b068 100644 --- a/sc/inc/colorscale.hxx +++ b/sc/inc/colorscale.hxx @@ -255,7 +255,6 @@ private: double GetMaxValue() const; void calcMinMax(double& nMin, double& nMax) const; - bool CheckEntriesForRel(const ScRange& rRange) const; double CalcValue(double nMin, double nMax, ColorScaleEntries::const_iterator& rItr) const; public: ScColorScaleFormat(ScDocument* pDoc); diff --git a/sc/inc/funcdesc.hxx b/sc/inc/funcdesc.hxx index 2410de3751a6..d1326c602418 100644 --- a/sc/inc/funcdesc.hxx +++ b/sc/inc/funcdesc.hxx @@ -309,18 +309,6 @@ public: */ static OUString GetCategoryName(sal_uInt32 _nCategoryNumber ); - /** - Returns function by name. - - Searches for a function with the function name rFName, while ignoring case. - - @param rFName - name of the function - - @return pointer to function with the name rFName, null if no such function was found. - */ - const ScFuncDesc* Get( const OUString& rFName ) const; - /** Returns function by index. diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx index 183fde607ec0..77330b3d4367 100644 --- a/sc/inc/table.hxx +++ b/sc/inc/table.hxx @@ -438,9 +438,6 @@ public: sc::StartListeningContext& rStartCxt, sc::EndListeningContext& rEndCxt, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ); - void EndListeningFormulaCells( - sc::EndListeningContext& rEndCxt, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ); - void SetDirtyFromClip( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, sc::ColumnSpanSet& rBroadcastSpans ); diff --git a/sc/source/core/data/colorscale.cxx b/sc/source/core/data/colorscale.cxx index 165532cd7d97..96f2a139d607 100644 --- a/sc/source/core/data/colorscale.cxx +++ b/sc/source/core/data/colorscale.cxx @@ -612,30 +612,7 @@ bool ScColorScaleFormat::NeedsRepaint() const return false; } -bool ScColorScaleFormat::CheckEntriesForRel(const ScRange& rRange) const -{ - bool bNeedUpdate = false; - for(const_iterator itr = begin(); itr != end(); ++itr) - { - ScColorScaleEntryType eType = itr->GetType(); - switch(eType) - { - case COLORSCALE_MIN: - case COLORSCALE_MAX: - bNeedUpdate = true; - break; - case COLORSCALE_FORMULA: - return true; - default: - break; - } - } - // TODO: check also if the changed value is the new min/max - // or has been the old min/max value - bNeedUpdate = bNeedUpdate && GetRange().Intersects(rRange); - return bNeedUpdate; -} condformat::ScFormatEntryType ScColorScaleFormat::GetType() const { diff --git a/sc/source/core/data/funcdesc.cxx b/sc/source/core/data/funcdesc.cxx index f464205d0afb..5e90a8f763a8 100644 --- a/sc/source/core/data/funcdesc.cxx +++ b/sc/source/core/data/funcdesc.cxx @@ -683,22 +683,7 @@ ScFunctionMgr::~ScFunctionMgr() delete aCatLists[i]; } -const ScFuncDesc* ScFunctionMgr::Get( const OUString& rFName ) const -{ - const ScFuncDesc* pDesc = NULL; - if (rFName.getLength() <= pFuncList->GetMaxFuncNameLen()) - { - ::boost::scoped_ptr dummy(new ScFuncDesc); - dummy->pFuncName = new OUString(rFName); - ::std::vector::iterator lower = - ::std::lower_bound(aCatLists[0]->begin(), aCatLists[0]->end(), - static_cast(dummy.get()), ScFuncDesc::compareByName); - - if(rFName.equalsIgnoreAsciiCase(*(*lower)->pFuncName)) - pDesc = *lower; - } - return pDesc; -} + const ScFuncDesc* ScFunctionMgr::Get( sal_uInt16 nFIndex ) const { diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx index 92ad6231282d..2ba437d07f98 100644 --- a/sc/source/core/data/table2.cxx +++ b/sc/source/core/data/table2.cxx @@ -1074,16 +1074,6 @@ void ScTable::StartListeningFormulaCells( aCol[i].StartListeningFormulaCells(rStartCxt, rEndCxt, nRow1, nRow2); } -void ScTable::EndListeningFormulaCells( - sc::EndListeningContext& rEndCxt, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ) -{ - if (nCol2 > MAXCOL) nCol2 = MAXCOL; - if (nRow2 > MAXROW) nRow2 = MAXROW; - if (ValidColRow(nCol1, nRow1) && ValidColRow(nCol2, nRow2)) - for (SCCOL i = nCol1; i <= nCol2; ++i) - aCol[i].EndListeningFormulaCells(rEndCxt, nRow1, nRow2); -} - void ScTable::CopyToTable( sc::CopyToDocContext& rCxt, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, InsertDeleteFlags nFlags, bool bMarked, ScTable* pDestTab, const ScMarkData* pMarkData, diff --git a/sc/source/core/tool/clkernelthread.cxx b/sc/source/core/tool/clkernelthread.cxx index 9a83a1e033ce..52a483051a4c 100644 --- a/sc/source/core/tool/clkernelthread.cxx +++ b/sc/source/core/tool/clkernelthread.cxx @@ -64,18 +64,6 @@ void CLBuildKernelThread::execute() } } -void CLBuildKernelThread::push(CLBuildKernelWorkItem item) -{ - osl::MutexGuard guard(maQueueMutex); - maQueue.push(item); - maQueueCondition.set(); - - // This is only to ensure that the OpenCL parameters are initialized on - // the main thread before spawning a worker thread for kernel - // pre-compilation. - sc::FormulaGroupInterpreter::getStatic(); -} - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterPane.hxx b/sdext/source/presenter/PresenterPane.hxx index eb93173bfa81..2afa1497d283 100644 --- a/sdext/source/presenter/PresenterPane.hxx +++ b/sdext/source/presenter/PresenterPane.hxx @@ -49,11 +49,6 @@ public: const ::rtl::Reference& rpPresenterController); virtual ~PresenterPane(); - static OUString getImplementationName_static(); - static css::uno::Sequence< OUString > getSupportedServiceNames_static(); - static css::uno::Reference Create( - const css::uno::Reference& rxContext); - // XPane css::uno::Reference SAL_CALL getWindow() diff --git a/sdext/source/presenter/PresenterPaneFactory.hxx b/sdext/source/presenter/PresenterPaneFactory.hxx index 0d7106ac4cce..98bf788d107b 100644 --- a/sdext/source/presenter/PresenterPaneFactory.hxx +++ b/sdext/source/presenter/PresenterPaneFactory.hxx @@ -73,11 +73,6 @@ public: const ::rtl::Reference& rpPresenterController); virtual ~PresenterPaneFactory(); - static OUString getImplementationName_static(); - static css::uno::Sequence< OUString > getSupportedServiceNames_static(); - static css::uno::Reference Create( - const css::uno::Reference& rxContext); - virtual void SAL_CALL disposing() throw (css::uno::RuntimeException) SAL_OVERRIDE; diff --git a/sdext/source/presenter/PresenterSpritePane.hxx b/sdext/source/presenter/PresenterSpritePane.hxx index 110499b7b62a..64c9a9eea6ba 100644 --- a/sdext/source/presenter/PresenterSpritePane.hxx +++ b/sdext/source/presenter/PresenterSpritePane.hxx @@ -60,11 +60,6 @@ public: ::boost::shared_ptr GetSprite(); - static OUString getImplementationName_static(); - static css::uno::Sequence< OUString > getSupportedServiceNames_static(); - static css::uno::Reference Create( - const css::uno::Reference& rxContext); - // XPane virtual css::uno::Reference SAL_CALL getWindow() diff --git a/sdext/source/presenter/PresenterViewFactory.hxx b/sdext/source/presenter/PresenterViewFactory.hxx index 0510ba4ced12..b75236438cd5 100644 --- a/sdext/source/presenter/PresenterViewFactory.hxx +++ b/sdext/source/presenter/PresenterViewFactory.hxx @@ -98,11 +98,6 @@ public: const ::rtl::Reference& rpPresenterController); virtual ~PresenterViewFactory(); - static OUString getImplementationName_static(); - static css::uno::Sequence< OUString > getSupportedServiceNames_static(); - static css::uno::Reference Create( - const css::uno::Reference& rxContext); - virtual void SAL_CALL disposing() throw (css::uno::RuntimeException) SAL_OVERRIDE; diff --git a/sot/source/base/factory.cxx b/sot/source/base/factory.cxx index 102e0fc81b91..3fc95ad6dda9 100644 --- a/sot/source/base/factory.cxx +++ b/sot/source/base/factory.cxx @@ -75,12 +75,10 @@ SotData_Impl * SOTDATA() *************************************************************************/ SotFactory::SotFactory( const SvGlobalName & rName, - const OUString & rClassName, - CreateInstanceType pCreateFuncP ) + const OUString & rClassName ) : SvGlobalName ( rName ) , nSuperCount ( 0 ) , pSuperClasses ( NULL ) - , pCreateFunc ( pCreateFuncP ) , aClassName ( rClassName ) { #ifdef DBG_UTIL diff --git a/sot/source/base/object.cxx b/sot/source/base/object.cxx index aa809904697f..3ed71d7d17ad 100644 --- a/sot/source/base/object.cxx +++ b/sot/source/base/object.cxx @@ -25,9 +25,8 @@ class SotObjectFactory : public SotFactory { public: SotObjectFactory( const SvGlobalName & rName, - const OUString & rClassName, - CreateInstanceType pCreateFuncP ) - : SotFactory( rName, rClassName, pCreateFuncP ) + const OUString & rClassName ) + : SotFactory( rName, rClassName ) {} }; @@ -37,9 +36,10 @@ SotFactory * SotObject::ClassFactory() SotFactory **ppFactory = GetFactoryAdress(); if( !*ppFactory ) { - *ppFactory = new SotObjectFactory( SvGlobalName( 0xf44b7830, 0xf83c, 0x11d0, - 0xaa, 0xa1, 0x0, 0xa0, 0x24, 0x9d, 0x55, 0x90 ), - OUString( "SotObject" ), SotObject::CreateInstance ); + *ppFactory = new SotObjectFactory( + SvGlobalName( 0xf44b7830, 0xf83c, 0x11d0, + 0xaa, 0xa1, 0x0, 0xa0, 0x24, 0x9d, 0x55, 0x90 ), + OUString( "SotObject" ) ); } return *ppFactory; } diff --git a/sot/source/sdstor/stg.cxx b/sot/source/sdstor/stg.cxx index 78c8d64c0056..af2de0e86dc7 100644 --- a/sot/source/sdstor/stg.cxx +++ b/sot/source/sdstor/stg.cxx @@ -80,13 +80,6 @@ void StorageBase::ResetError() const const_cast(this)->m_nError = SVSTREAM_OK; } -// Retrieve the underlying SvStream for info purposes - -const SvStream* OLEStorageBase::GetSvStream_Impl() const -{ - return pIo ? pIo->GetStrm() : NULL; -} - OLEStorageBase::OLEStorageBase( StgIo* p, StgDirEntry* pe, StreamMode& nMode ) : nStreamMode( nMode ), pIo( p ), pEntry( pe ) { @@ -679,20 +672,6 @@ bool Storage::Remove( const OUString& rName ) } } -// Rename a storage element - -bool Storage::Rename( const OUString& rOld, const OUString& rNew ) -{ - if( Validate( true ) ) - { - bool b = pIo->pTOC->Rename( *pEntry, rOld, rNew ); - pIo->MoveError( *this ); - return b; - } - else - return false; -} - // Copy one element bool Storage::CopyTo( const OUString& rElem, BaseStorage* pDest, const OUString& rNew ) diff --git a/sot/source/sdstor/stgdir.cxx b/sot/source/sdstor/stgdir.cxx index e2c8bf7b621e..cb88ca5def0f 100644 --- a/sot/source/sdstor/stgdir.cxx +++ b/sot/source/sdstor/stgdir.cxx @@ -547,68 +547,6 @@ bool StgDirEntry::Commit() return bRes; } -// Revert the entry - -bool StgDirEntry::Revert() -{ - aEntry = aSave; - switch( aEntry.GetType() ) - { - case STG_STREAM: - if( pCurStrm ) - delete pTmpStrm, pTmpStrm = pCurStrm, pCurStrm = NULL; - break; - case STG_STORAGE: - { - bool bSomeRenamed = false; - StgIterator aOIter( *this ); - StgDirEntry* op = aOIter.First(); - while( op ) - { - op->aEntry = op->aSave; - op->bDirty = false; - bSomeRenamed = ( bSomeRenamed || op->bRenamed ); - // Remove any new entries - if( op->bCreated ) - { - op->bCreated = false; - op->Close(); - op->bInvalid = true; - } - // Reactivate any removed entries - else if( op->bRemoved ) - op->bRemoved = op->bInvalid = op->bTemp = false; - op = aOIter.Next(); - } - // Resort all renamed entries - if( bSomeRenamed ) - { - StgIterator aIter( *this ); - StgDirEntry* p = aIter.First(); - while( p ) - { - if( p->bRenamed ) - { - StgAvlNode::Move - ( reinterpret_cast(&p->pUp->pDown), - reinterpret_cast(&p->pUp->pDown), p ); - p->bRenamed = false; - } - p = aIter.Next(); - } - } - DelTemp( false ); - break; - } - case STG_EMPTY: - case STG_LOCKBYTES: - case STG_PROPERTY: - case STG_ROOT: - break; - } - return true; -} - // Copy the stg stream to the temp stream bool StgDirEntry::Strm2Tmp() @@ -1070,24 +1008,4 @@ bool StgDirStrm::Rename( StgDirEntry& rStg, const OUString& rOld, const OUString } } -// Move the given entry to a different storage. - -bool StgDirStrm::Move( StgDirEntry& rStg1, StgDirEntry& rStg2, const OUString& rName ) -{ - StgDirEntry* p = Find( rStg1, rName ); - if( p ) - { - if( !StgAvlNode::Move - ( reinterpret_cast(&rStg1.pDown), reinterpret_cast(&rStg2.pDown), p ) ) - return false; - p->bDirty = true; - return true; - } - else - { - rIo.SetError( SVSTREAM_FILE_NOT_FOUND ); - return false; - } -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sot/source/sdstor/stgdir.hxx b/sot/source/sdstor/stgdir.hxx index 55be53d8d359..e8c3ec7acb90 100644 --- a/sot/source/sdstor/stgdir.hxx +++ b/sot/source/sdstor/stgdir.hxx @@ -77,7 +77,6 @@ public: bool IsDirty(); bool Commit(); - bool Revert(); void OpenStream( StgIo&, bool=false ); // set up an appropriate stream void Close(); @@ -105,7 +104,6 @@ public: StgDirEntry* Find( StgDirEntry&, const OUString& ); StgDirEntry* Create( StgDirEntry&, const OUString&, StgEntryType ); bool Rename( StgDirEntry&, const OUString&, const OUString& ); - bool Move( StgDirEntry&, StgDirEntry&, const OUString& ); }; class StgIterator : public StgAvlIterator diff --git a/sot/source/sdstor/stgole.cxx b/sot/source/sdstor/stgole.cxx index ae5b58c39e8a..6d5ff467f4b7 100644 --- a/sot/source/sdstor/stgole.cxx +++ b/sot/source/sdstor/stgole.cxx @@ -169,18 +169,6 @@ StgOleStream::StgOleStream( BaseStorage& rStg, bool bWr ) nFlags = 0; } -bool StgOleStream::Load() -{ - nFlags = 0; - if( GetError() != SVSTREAM_OK ) - return false; - - sal_Int32 version = 0; - Seek( 0L ); - ReadInt32( version ).ReadUInt32( nFlags ); - return GetError() == SVSTREAM_OK; -} - bool StgOleStream::Store() { if( GetError() != SVSTREAM_OK ) diff --git a/sot/source/sdstor/stgole.hxx b/sot/source/sdstor/stgole.hxx index 0ba992f70641..c1088633be0b 100644 --- a/sot/source/sdstor/stgole.hxx +++ b/sot/source/sdstor/stgole.hxx @@ -61,8 +61,6 @@ class StgOleStream : public StgInternalStream sal_uInt32 nFlags; public: StgOleStream( BaseStorage&, bool ); - sal_uInt32& GetFlags() { return nFlags; } - bool Load(); bool Store(); }; diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx index 60aa4106097a..db02b1750256 100644 --- a/sot/source/sdstor/storage.cxx +++ b/sot/source/sdstor/storage.cxx @@ -46,9 +46,8 @@ class SotStorageStreamFactory : public SotFactory { public: SotStorageStreamFactory( const SvGlobalName & rName, - const OUString & rClassName, - CreateInstanceType pCreateFuncP ) - : SotFactory( rName, rClassName, pCreateFuncP ) + const OUString & rClassName ) + : SotFactory( rName, rClassName ) {} }; @@ -58,9 +57,10 @@ SotFactory * SotStorageStream::ClassFactory() SotFactory **ppFactory = GetFactoryAdress(); if( !*ppFactory ) { - *ppFactory = new SotStorageStreamFactory( SvGlobalName( 0xd7deb420, 0xf902, 0x11d0, - 0xaa, 0xa1, 0x0, 0xa0, 0x24, 0x9d, 0x55, 0x90 ), - OUString( "SotStorageStream" ), SotStorageStream::CreateInstance ); + *ppFactory = new SotStorageStreamFactory( + SvGlobalName( 0xd7deb420, 0xf902, 0x11d0, + 0xaa, 0xa1, 0x0, 0xa0, 0x24, 0x9d, 0x55, 0x90 ), + OUString( "SotStorageStream" ) ); (*ppFactory)->PutSuperClass( SotObject::ClassFactory() ); } return *ppFactory; @@ -307,9 +307,8 @@ class SotStorageFactory : public SotFactory { public: SotStorageFactory( const SvGlobalName & rName, - const OUString & rClassName, - CreateInstanceType pCreateFuncP ) - : SotFactory( rName, rClassName, pCreateFuncP ) + const OUString & rClassName ) + : SotFactory( rName, rClassName ) {} }; @@ -319,9 +318,10 @@ SotFactory * SotStorage::ClassFactory() SotFactory **ppFactory = GetFactoryAdress(); if( !*ppFactory ) { - *ppFactory = new SotStorageFactory( SvGlobalName( 0x980ce7e0, 0xf905, 0x11d0, + *ppFactory = new SotStorageFactory( + SvGlobalName( 0x980ce7e0, 0xf905, 0x11d0, 0xaa, 0xa1, 0x0, 0xa0, 0x24, 0x9d, 0x55, 0x90 ), - OUString( "SotStorage" ), SotStorage::CreateInstance ); + OUString( "SotStorage" ) ); (*ppFactory)->PutSuperClass( SotObject::ClassFactory() ); } return *ppFactory; diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx index e2c84c0ba28a..fa557af651ea 100644 --- a/sot/source/sdstor/ucbstorage.cxx +++ b/sot/source/sdstor/ucbstorage.cxx @@ -2946,29 +2946,6 @@ bool UCBStorage::Remove( const OUString& rEleName ) return ( pElement != NULL ); } -bool UCBStorage::Rename( const OUString& rEleName, const OUString& rNewName ) -{ - if( rEleName.isEmpty()|| rNewName.isEmpty() ) - return false; - - UCBStorageElement_Impl *pAlreadyExisting = FindElement_Impl( rNewName ); - if ( pAlreadyExisting ) - { - SetError( SVSTREAM_ACCESS_DENIED ); - return false; // can't change to a name that is already used - } - - UCBStorageElement_Impl *pElement = FindElement_Impl( rEleName ); - if ( pElement ) - { - pElement->m_aName = rNewName; - } - else - SetError( SVSTREAM_FILE_NOT_FOUND ); - - return pElement != NULL; -} - bool UCBStorage::ValidateFAT() { // ??? diff --git a/starmath/inc/rect.hxx b/starmath/inc/rect.hxx index d590e3e23d7a..ac7e99d2e5ee 100644 --- a/starmath/inc/rect.hxx +++ b/starmath/inc/rect.hxx @@ -131,7 +131,6 @@ public: long GetLeft() const { return GetTopLeft().X(); } long GetBottom() const { return GetTop() + GetHeight() - 1; } long GetRight() const { return GetLeft() + GetWidth() - 1; } - long GetCenterX() const { return (GetLeft() + GetRight()) / 2L; } long GetCenterY() const { return (GetTop() + GetBottom()) / 2L; } long GetWidth() const { return GetSize().Width(); } long GetHeight() const { return GetSize().Height(); } diff --git a/stoc/source/corereflection/base.hxx b/stoc/source/corereflection/base.hxx index 2b2793471945..8259f7a6e62d 100644 --- a/stoc/source/corereflection/base.hxx +++ b/stoc/source/corereflection/base.hxx @@ -100,12 +100,8 @@ class IdlReflectionServiceImpl css::uno::Mapping _aUno2Cpp; inline css::uno::Reference< css::reflection::XIdlClass > constructClass( typelib_TypeDescription * pTypeDescr ); -public: - css::uno::Reference< css::container::XHierarchicalNameAccess > getTDMgr() const - { return _xTDMgr; } - css::uno::Reference< css::lang::XMultiServiceFactory > getSMgr() const - { return _xMgr; } +public: const css::uno::Mapping & getCpp2Uno() throw(css::uno::RuntimeException); const css::uno::Mapping & getUno2Cpp() throw(css::uno::RuntimeException); uno_Interface * mapToUno( const css::uno::Any & rObj, typelib_InterfaceTypeDescription * pTo ) throw(css::uno::RuntimeException); diff --git a/store/source/stordata.hxx b/store/source/stordata.hxx index 2ef8d8d763e2..fa1666471f13 100644 --- a/store/source/stordata.hxx +++ b/store/source/stordata.hxx @@ -307,16 +307,6 @@ struct OStorePageNameBlock */ static const size_t theSize = sizeof(G) + sizeof(K) + sizeof(sal_uInt32) + sizeof(sal_Char[STORE_MAXIMUM_NAMESIZE]); - /** initialize. - */ - void initialize() - { - m_aGuard = G(); - m_aKey = K(); - m_nAttrib = 0; - memset (m_pData, 0, sizeof(m_pData)); - } - /** Construction. */ OStorePageNameBlock() @@ -423,15 +413,6 @@ struct OStoreDirectoryDataBlock */ static const size_t theSize = sizeof(G) + sizeof(LinkTable) + sizeof(sal_uInt32); - /** initialize. - */ - void initialize() - { - m_aGuard = G(); - m_aTable.initialize(); - m_nDataLen = 0; - } - /** Construction. */ OStoreDirectoryDataBlock() diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx index 3b7fd2afcf6a..8e481a12231d 100644 --- a/svtools/source/brwbox/brwbox2.cxx +++ b/svtools/source/brwbox/brwbox2.cxx @@ -95,13 +95,7 @@ bool BrowseBox::IsDropFormatSupported( SotClipboardFormatId _nFormat ) } -bool BrowseBox::IsDropFormatSupported( const DataFlavor& _rFlavor ) -{ - if ( static_cast< BrowserDataWin* >( pDataWin.get() )->bCallingDropCallback ) - return static_cast< BrowserDataWin* >( pDataWin.get() )->IsDropFormatSupported( _rFlavor ); - return DropTargetHelper::IsDropFormatSupported( _rFlavor ); -} void BrowseBox::Command( const CommandEvent& rEvt ) diff --git a/tools/source/generic/poly2.cxx b/tools/source/generic/poly2.cxx index d1dddb17733a..1d36c654d065 100644 --- a/tools/source/generic/poly2.cxx +++ b/tools/source/generic/poly2.cxx @@ -549,26 +549,6 @@ bool PolyPolygon::operator==( const tools::PolyPolygon& rPolyPoly ) const return false; } -bool PolyPolygon::IsEqual( const tools::PolyPolygon& rPolyPoly ) const -{ - bool bIsEqual = true; - if ( Count() != rPolyPoly.Count() ) - bIsEqual = false; - else - { - sal_uInt16 i; - for ( i = 0; i < Count(); i++ ) - { - if (!GetObject( i ).IsEqual( rPolyPoly.GetObject( i ) ) ) - { - bIsEqual = false; - break; - } - } - } - return bIsEqual; -} - SvStream& ReadPolyPolygon( SvStream& rIStream, tools::PolyPolygon& rPolyPoly ) { DBG_ASSERTWARNING( rIStream.GetVersion(), "PolyPolygon::>> - Solar-Version not set on rIStream" ); diff --git a/ucb/source/ucp/webdav-neon/NeonLockStore.cxx b/ucb/source/ucp/webdav-neon/NeonLockStore.cxx index df90a253cef7..61efe8455a26 100644 --- a/ucb/source/ucp/webdav-neon/NeonLockStore.cxx +++ b/ucb/source/ucp/webdav-neon/NeonLockStore.cxx @@ -178,22 +178,6 @@ void NeonLockStore::addLock( NeonLock * pLock, startTicker(); } -void NeonLockStore::updateLock( NeonLock * pLock, - sal_Int32 nLastChanceToSendRefreshRequest ) -{ - osl::MutexGuard aGuard( m_aMutex ); - - LockInfoMap::iterator it( m_aLockInfoMap.find( pLock ) ); - OSL_ENSURE( it != m_aLockInfoMap.end(), - "NeonLockStore::updateLock: lock not found!" ); - - if ( it != m_aLockInfoMap.end() ) - { - (*it).second.nLastChanceToSendRefreshRequest - = nLastChanceToSendRefreshRequest; - } -} - void NeonLockStore::removeLock( NeonLock * pLock ) { osl::ClearableMutexGuard aGuard( m_aMutex ); diff --git a/ucb/source/ucp/webdav-neon/NeonLockStore.hxx b/ucb/source/ucp/webdav-neon/NeonLockStore.hxx index 1006f8ad4bed..d231009e2f2e 100644 --- a/ucb/source/ucp/webdav-neon/NeonLockStore.hxx +++ b/ucb/source/ucp/webdav-neon/NeonLockStore.hxx @@ -89,9 +89,6 @@ public: // -1: infinite lock, no refresh sal_Int32 nLastChanceToSendRefreshRequest ); - void updateLock( NeonLock * pLock, - sal_Int32 nLastChanceToSendRefreshRequest ); - void removeLock( NeonLock * pLock ); void refreshLocks(); diff --git a/unotest/source/cpp/bootstrapfixturebase.cxx b/unotest/source/cpp/bootstrapfixturebase.cxx index 41272c68b753..7a778ed2c443 100644 --- a/unotest/source/cpp/bootstrapfixturebase.cxx +++ b/unotest/source/cpp/bootstrapfixturebase.cxx @@ -88,7 +88,6 @@ OUString test::BootstrapFixtureBase::getURLFromWorkdir( const char *pPath ) OUString test::BootstrapFixtureBase::getPathFromWorkdir( const char *pPath ) { return m_aWorkdirRootPath + OUString::createFromAscii( pPath ); - } #endif diff --git a/unoxml/source/dom/documentbuilder.hxx b/unoxml/source/dom/documentbuilder.hxx index 2d16da2e7a85..1f7a96d2bd93 100644 --- a/unoxml/source/dom/documentbuilder.hxx +++ b/unoxml/source/dom/documentbuilder.hxx @@ -63,11 +63,6 @@ namespace DOM css::uno::Reference< css::lang::XMultiServiceFactory > const& xFactory); - // call for factory - static css::uno::Reference< XInterface > getInstance( - css::uno::Reference< css::lang::XMultiServiceFactory > const& - xFactory); - // static helpers for service info and component management static const char* aImplementationName; static const char* aSupportedServiceNames[]; diff --git a/unoxml/source/dom/saxbuilder.hxx b/unoxml/source/dom/saxbuilder.hxx index f15295c970e6..728a262f783b 100644 --- a/unoxml/source/dom/saxbuilder.hxx +++ b/unoxml/source/dom/saxbuilder.hxx @@ -67,13 +67,9 @@ namespace DOM public: - - // call for factory - static css::uno::Reference< XInterface > getInstance(const css::uno::Reference < css::lang::XMultiServiceFactory >& xFactory); - // static helpers for service info and component management static const char* aImplementationName; - static const char* aSupportedServiceNames[]; + static const char* aSupportedServiceNames[]; static OUString _getImplementationName(); static css::uno::Sequence< OUString > _getSupportedServiceNames(); static css::uno::Reference< XInterface > _getInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& rSMgr); diff --git a/unoxml/source/xpath/xpathapi.hxx b/unoxml/source/xpath/xpathapi.hxx index 32b03eeb12a0..5b47f89fd5b4 100644 --- a/unoxml/source/xpath/xpathapi.hxx +++ b/unoxml/source/xpath/xpathapi.hxx @@ -69,11 +69,6 @@ namespace XPath const css::uno::Reference< css::lang::XMultiServiceFactory >& rSMgr); - // call for factory - static css::uno::Reference< XInterface > getInstance( - const css::uno::Reference < css::lang::XMultiServiceFactory >& - xFactory); - // static helpers for service info and component management static const char* aImplementationName; static const char* aSupportedServiceNames[]; diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx index 70152d881b0e..bc041ea0117f 100644 --- a/vcl/source/control/combobox.cxx +++ b/vcl/source/control/combobox.cxx @@ -1049,7 +1049,6 @@ bool ComboBox::IsInDropDown() const return m_pImpl->m_pFloatWin && m_pImpl->m_pFloatWin->IsInPopupMode(); } -void ComboBox::SetMultiSelectionSeparator(sal_Unicode cSep) { m_pImpl->m_cMultiSep = cSep; } sal_Unicode ComboBox::GetMultiSelectionSeparator() const { return m_pImpl->m_cMultiSep; } void ComboBox::EnableMultiSelection( bool bMulti ) @@ -1569,8 +1568,6 @@ ComboBoxBounds ComboBox::Impl::calcComboBoxDropDownComponentBounds( return aBounds; } -sal_Int32 ComboBox::getMaxWidthChars() const { return m_pImpl->m_nMaxWidthChars; } - void ComboBox::setMaxWidthChars(sal_Int32 nWidth) { if (nWidth != m_pImpl->m_nMaxWidthChars) diff --git a/vcl/source/outdev/map.cxx b/vcl/source/outdev/map.cxx index c3fa43d7684c..b90f7e75bb15 100644 --- a/vcl/source/outdev/map.cxx +++ b/vcl/source/outdev/map.cxx @@ -1843,22 +1843,6 @@ basegfx::B2DPolygon OutputDevice::LogicToLogic( const basegfx::B2DPolygon& rPoly return aPoly; } -basegfx::B2DPolyPolygon OutputDevice::LogicToLogic( const basegfx::B2DPolyPolygon& rPolySource, - const MapMode& rMapModeSource, - const MapMode& rMapModeDest ) -{ - if(rMapModeSource == rMapModeDest) - { - return rPolySource; - } - - const basegfx::B2DHomMatrix aTransform(LogicToLogic(rMapModeSource, rMapModeDest)); - basegfx::B2DPolyPolygon aPoly(rPolySource); - - aPoly.transform(aTransform); - return aPoly; -} - basegfx::B2DHomMatrix OutputDevice::LogicToLogic(const MapMode& rMapModeSource, const MapMode& rMapModeDest) { basegfx::B2DHomMatrix aTransform; diff --git a/writerfilter/inc/dmapper/resourcemodel.hxx b/writerfilter/inc/dmapper/resourcemodel.hxx index 9e5be7f11f89..6f55b7d8437f 100644 --- a/writerfilter/inc/dmapper/resourcemodel.hxx +++ b/writerfilter/inc/dmapper/resourcemodel.hxx @@ -333,11 +333,6 @@ public: */ virtual writerfilter::Reference::Pointer_t getProperties() = 0; - /** - Returns stream of this value. - */ - virtual writerfilter::Reference::Pointer_t getStream() = 0; - /** Returns binary object of this value. */ diff --git a/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx b/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx index 8e58d4ebdd61..848b78a8c3fc 100644 --- a/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx +++ b/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx @@ -182,11 +182,6 @@ writerfilter::Reference::Pointer_t OOXMLValue::getProperties() return writerfilter::Reference::Pointer_t(); } -writerfilter::Reference::Pointer_t OOXMLValue::getStream() -{ - return writerfilter::Reference::Pointer_t(); -} - writerfilter::Reference::Pointer_t OOXMLValue::getBinary() { return writerfilter::Reference::Pointer_t(); diff --git a/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx b/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx index 5c419b471864..3a8c0f74d1d6 100644 --- a/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx +++ b/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx @@ -47,7 +47,6 @@ public: virtual OUString getString() const SAL_OVERRIDE; virtual css::uno::Any getAny() const SAL_OVERRIDE; virtual writerfilter::Reference::Pointer_t getProperties() SAL_OVERRIDE; - virtual writerfilter::Reference::Pointer_t getStream() SAL_OVERRIDE; virtual writerfilter::Reference::Pointer_t getBinary() SAL_OVERRIDE; #ifdef DEBUG_WRITERFILTER virtual std::string toString() const SAL_OVERRIDE; diff --git a/writerfilter/source/rtftok/rtfvalue.cxx b/writerfilter/source/rtftok/rtfvalue.cxx index e0bc59a210de..69b5eee0e338 100644 --- a/writerfilter/source/rtftok/rtfvalue.cxx +++ b/writerfilter/source/rtftok/rtfvalue.cxx @@ -202,11 +202,6 @@ writerfilter::Reference::Pointer_t RTFValue::getProperties() return std::make_shared(*m_pAttributes, *m_pSprms); } -writerfilter::Reference::Pointer_t RTFValue::getStream() -{ - return writerfilter::Reference::Pointer_t(); -} - writerfilter::Reference::Pointer_t RTFValue::getBinary() { return writerfilter::Reference::Pointer_t(); diff --git a/writerfilter/source/rtftok/rtfvalue.hxx b/writerfilter/source/rtftok/rtfvalue.hxx index 970c2328dad2..3a1c77749fa9 100644 --- a/writerfilter/source/rtftok/rtfvalue.hxx +++ b/writerfilter/source/rtftok/rtfvalue.hxx @@ -46,7 +46,6 @@ public: virtual OUString getString() const SAL_OVERRIDE; virtual css::uno::Any getAny() const SAL_OVERRIDE; virtual writerfilter::Reference::Pointer_t getProperties() SAL_OVERRIDE; - virtual writerfilter::Reference::Pointer_t getStream() SAL_OVERRIDE; virtual writerfilter::Reference::Pointer_t getBinary() SAL_OVERRIDE; #ifdef DEBUG_WRITERFILTER virtual std::string toString() const SAL_OVERRIDE; diff --git a/xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx b/xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx index 250c876fe55a..286369326f62 100644 --- a/xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx +++ b/xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx @@ -30,10 +30,7 @@ namespace xmlsearch { class RoleFiller { public: - static RoleFiller* STOP() { return &roleFiller_; } - RoleFiller(); - ~RoleFiller(); private: diff --git a/xmlhelp/source/cxxhelp/inc/qe/Query.hxx b/xmlhelp/source/cxxhelp/inc/qe/Query.hxx index dab5d383119f..fca4b17be5bc 100644 --- a/xmlhelp/source/cxxhelp/inc/qe/Query.hxx +++ b/xmlhelp/source/cxxhelp/inc/qe/Query.hxx @@ -61,16 +61,6 @@ namespace xmlsearch { OUString* terms_; }; // end class QueryHitData - - - class PrefixTranslator - { - public: - static PrefixTranslator* makePrefixTranslator( const OUString*,sal_Int32 ) - { - return 0; - } - }; } } -- cgit v1.2.3