diff options
| author | Noel Grandin <noel@peralex.com> | 2015-08-04 16:28:49 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-08-05 09:39:22 +0000 |
| commit | 403c13487c36f4200adf0986c5d11398f719cd7a (patch) | |
| tree | 21a4acf87dce1e6c8772f5cbcff3c2a3de21f4ba | |
| parent | 10560949f90e08fe4a04dd91c7d388c4998100e8 (diff) | |
loplugin:unusedmethods
Change-Id: I6801618efb5a66d24156fa429e026acb6ca03aba
Reviewed-on: https://gerrit.libreoffice.org/17506
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
231 files changed, 144 insertions, 1474 deletions
diff --git a/accessibility/inc/accessibility/extended/accessibletabbarpage.hxx b/accessibility/inc/accessibility/extended/accessibletabbarpage.hxx index 4959ab659679..54abbf74f485 100644 --- a/accessibility/inc/accessibility/extended/accessibletabbarpage.hxx +++ b/accessibility/inc/accessibility/extended/accessibletabbarpage.hxx @@ -51,26 +51,25 @@ namespace accessibility private: sal_uInt16 m_nPageId; - bool m_bEnabled; - bool m_bShowing; - bool m_bSelected; + bool m_bEnabled; + bool m_bShowing; + bool m_bSelected; OUString m_sPageText; css::uno::Reference< css::accessibility::XAccessible > m_xParent; protected: - bool IsEnabled(); - bool IsShowing(); - bool IsSelected(); + bool IsEnabled(); + bool IsShowing(); + bool IsSelected(); - void SetEnabled( bool bEnabled ); void SetShowing( bool bShowing ); void SetSelected( bool bSelected ); void SetPageText( const OUString& sPageText ); sal_uInt16 GetPageId() const { return m_nPageId; } - void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ); + void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ); // OCommonAccessibleComponent virtual css::awt::Rectangle implGetBounds( ) throw (css::uno::RuntimeException) SAL_OVERRIDE; diff --git a/accessibility/source/extended/accessibletabbarpage.cxx b/accessibility/source/extended/accessibletabbarpage.cxx index c3d6533261ee..0c1479f86337 100644 --- a/accessibility/source/extended/accessibletabbarpage.cxx +++ b/accessibility/source/extended/accessibletabbarpage.cxx @@ -102,31 +102,6 @@ namespace accessibility } - - void AccessibleTabBarPage::SetEnabled( bool bEnabled ) - { - if ( m_bEnabled != bEnabled ) - { - Any aOldValue[2], aNewValue[2]; - if ( m_bEnabled ) - { - aOldValue[0] <<= AccessibleStateType::SENSITIVE; - aOldValue[1] <<= AccessibleStateType::ENABLED; - } - else - { - - aNewValue[0] <<= AccessibleStateType::ENABLED; - aNewValue[1] <<= AccessibleStateType::SENSITIVE; - } - m_bEnabled = bEnabled; - NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue[0], aNewValue[0] ); - NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue[1], aNewValue[1] ); - } - } - - - void AccessibleTabBarPage::SetShowing( bool bShowing ) { if ( m_bShowing != bShowing ) diff --git a/compilerplugins/clang/store/removevirtuals.cxx b/compilerplugins/clang/store/removevirtuals.cxx index 18aebb41e479..f58a5652fefb 100644 --- a/compilerplugins/clang/store/removevirtuals.cxx +++ b/compilerplugins/clang/store/removevirtuals.cxx @@ -53,7 +53,7 @@ static size_t getFilesize(const char* filename) RemoveVirtuals::RemoveVirtuals(InstantiationData const & data): RewritePlugin(data) { - static const char sInputFile[] = "/home/noel/libo5/result.txt"; + static const char sInputFile[] = SRCDIR "/result.txt"; mmapFilesize = getFilesize(sInputFile); //Open file mmapFD = open(sInputFile, O_RDONLY, 0); diff --git a/compilerplugins/clang/unusedmethods.cxx b/compilerplugins/clang/unusedmethods.cxx index 2cc77407a221..71e75b431fee 100644 --- a/compilerplugins/clang/unusedmethods.cxx +++ b/compilerplugins/clang/unusedmethods.cxx @@ -62,7 +62,7 @@ public: for (const std::string & s : definitionSet) output += "definition:\t" + s + "\t\n"; ofstream myfile; - myfile.open("/home/noel/libo4/unusedmethods.log", ios::app | ios::out); + myfile.open( SRCDIR "/unusedmethods.log", ios::app | ios::out); myfile << output; myfile.close(); } diff --git a/compilerplugins/clang/unusedmethods.py b/compilerplugins/clang/unusedmethods.py index cdac8d5b7cbb..3bc61b8b673c 100755 --- a/compilerplugins/clang/unusedmethods.py +++ b/compilerplugins/clang/unusedmethods.py @@ -14,11 +14,15 @@ exclusionSet = set([ "int basegfx::Int32Traits::minVal()", "int basegfx::Int32Traits::neutral()", "unsigned long UniqueIndexImpl::Insert(void *)", + "class XMLPropertyBackpatcher<short> & XMLTextImportHelper::GetFootnoteBP()", + "class XMLPropertyBackpatcher<short> & XMLTextImportHelper::GetSequenceIdBP()", + "void XclExpPivotCache::SaveXml(class XclExpXmlStream &)", # 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)", + "struct unoidl::detail::SourceProviderExpr unoidl::detail::SourceProviderExpr::Bool(_Bool)", "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", @@ -65,11 +69,40 @@ exclusionSet = set([ "class AstDeclaration * FeInheritanceHeader::getInherits()", "const class std::__debug::vector<class rtl::OString, class std::allocator<class rtl::OString> > & FeInheritanceHeader::getTypeParameters() const", "const class AstType * FeDeclarator::compose(const class AstDeclaration *)", + "const class AstType * AstStructInstance::getTypeTemplate() const", + "class __gnu_debug::_Safe_iterator<struct std::__cxx1998::_List_const_iterator<class AstDeclaration *>, class std::__debug::list<class AstDeclaration *, class std::allocator<class AstDeclaration *> > > AstStructInstance::getTypeArgumentsBegin() const", + "class __gnu_debug::_Safe_iterator<struct std::__cxx1998::_List_const_iterator<class AstDeclaration *>, class std::__debug::list<class AstDeclaration *, class std::allocator<class AstDeclaration *> > > AstStructInstance::getTypeArgumentsEnd() const", + "void AstAttribute::setExceptions(const class rtl::OUString *,const class std::__debug::list<class AstDeclaration *, class std::allocator<class AstDeclaration *> > *,const class rtl::OUString *,const class std::__debug::list<class AstDeclaration *, class std::allocator<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 *)", + "int connectivity::OSQLParser::SQLlex()", "void connectivity::OSQLParseNode::insert(unsigned int,class connectivity::OSQLParseNode *)", + "const class rtl::OUString & connectivity::OSQLParser::getFieldName() const", + "short connectivity::OSQLParser::buildLikeRule(class connectivity::OSQLParseNode *,class connectivity::OSQLParseNode *&,const class connectivity::OSQLParseNode *)", + "void connectivity::OSQLParser::reduceLiteral(class connectivity::OSQLParseNode *&,_Bool)", + "short connectivity::OSQLParser::buildComparsionRule(class connectivity::OSQLParseNode *&,class connectivity::OSQLParseNode *)", + "enum connectivity::IParseContext::InternationalKeyCode connectivity::OSQLScanner::getInternationalTokenID(const char *) const", + "class rtl::OString connectivity::OSQLScanner::getStatement() const", + "void connectivity::OSQLScanner::SQLyyerror(const char *)", + "int connectivity::OSQLScanner::GetCurrentPos() const", + "int connectivity::OSQLScanner::SQLyygetc()", + "void connectivity::OSQLParser::setParseTree(class connectivity::OSQLParseNode *)", + "short connectivity::OSQLParser::buildPredicateRule(class connectivity::OSQLParseNode *&,class connectivity::OSQLParseNode *const,class connectivity::OSQLParseNode *,class connectivity::OSQLParseNode *)", + "int connectivity::OSQLScanner::SQLlex()", + + "const struct RSCINST & ObjectStack::Top()", + "void ObjectStack::Push(struct RSCINST)", + "_Bool RefNode::PutObjNode(class ObjNode *)", + "void RscFileInst::SetFileIndex(unsigned long)", + "void RscFileInst::SetLineNo(unsigned int)", + "class RscDefine * RscFileTab::NewDef(unsigned long,const class rtl::OString &,class RscExpression *,unsigned long)", + "class RscDefine * RscFileTab::NewDef(unsigned long,const class rtl::OString &,int,unsigned long)", + "class RscTop * RscTypCont::GetRoot()", + "class RscTop * RscTypCont::SearchType(unsigned int)", + "void RscTypCont::InsertType(class RscTop *)", # TODO track instantiations of template class constructors "void comphelper::IEventProcessor::release()", @@ -146,6 +179,38 @@ exclusionSet = set([ "void writerfilter::ooxml::OOXMLFastContextHandlerProperties::handlePicture()", "void writerfilter::ooxml::OOXMLFastContextHandlerProperties::handleHdrFtr()", "void writerfilter::ooxml::OOXMLFastContextHandlerProperties::handleBreak()", + "int writerfilter::ooxml::OOXMLPropertySetEntryToInteger::getValue() const", + "void writerfilter::ooxml::OOXMLFastContextHandler::fieldSeparator()", + "void writerfilter::ooxml::OOXMLFastContextHandler::startField()", + "void writerfilter::ooxml::OOXMLFastContextHandlerStream::sendProperty(unsigned int)", + "void writerfilter::ooxml::OOXMLFastContextHandlerProperties::handleXNotes()", + "void writerfilter::ooxml::OOXMLFastContextHandler::propagateTableProperties()", + "void writerfilter::ooxml::OOXMLFastContextHandlerTextTableRow::endRow()", + "void writerfilter::ooxml::OOXMLFastContextHandler::propagateCellProperties()", + "void writerfilter::ooxml::OOXMLFastContextHandler::endSdt()", + "void writerfilter::ooxml::OOXMLFastContextHandlerTextTableCell::endCell()", + "void writerfilter::ooxml::OOXMLFastContextHandler::propagateRowProperties()", + "void writerfilter::ooxml::OOXMLFastContextHandler::sendTableProperties()", + "_Bool writerfilter::ooxml::OOXMLPropertySetEntryToBool::getValue() const", + "void writerfilter::ooxml::OOXMLFastContextHandler::lockField()", + "void writerfilter::ooxml::OOXMLFastContextHandlerStream::handleHyperlink()", + "void writerfilter::ooxml::OOXMLFastContextHandler::setLastParagraphInSection()", + "void writerfilter::ooxml::OOXMLFastContextHandler::startSdt()", + "void writerfilter::ooxml::OOXMLFastContextHandler::setHandle()", + "void writerfilter::ooxml::OOXMLFastContextHandler::sendTableDepth() const", + "void writerfilter::ooxml::OOXMLFastContextHandler::startTxbxContent()", + "void writerfilter::ooxml::OOXMLFastContextHandler::handleLastParagraphInSection()", + "void writerfilter::ooxml::OOXMLFastContextHandlerTextTableCell::startCell()", + "void writerfilter::ooxml::OOXMLFastContextHandlerTextTableRow::startRow()", + "void writerfilter::ooxml::OOXMLFastContextHandler::propagateCharacterProperties()", + "void writerfilter::ooxml::OOXMLFastContextHandlerProperties::handleFontRel()", + "void writerfilter::ooxml::OOXMLFastContextHandler::ignore()", + "void writerfilter::ooxml::OOXMLFastContextHandler::resolvePropertySetAttrs()", + "void writerfilter::ooxml::OOXMLFastContextHandlerXNote::checkId(class std::shared_ptr<class writerfilter::ooxml::OOXMLValue>)", + "void writerfilter::ooxml::OOXMLFastContextHandlerTextTableRow::handleGridBefore(class std::shared_ptr<class writerfilter::ooxml::OOXMLValue>)", + "void writerfilter::ooxml::OOXMLFastContextHandlerXNote::checkType(class std::shared_ptr<class writerfilter::ooxml::OOXMLValue>)", + "void writerfilter::ooxml::OOXMLFastContextHandler::setXNoteId(class std::shared_ptr<class writerfilter::ooxml::OOXMLValue>)", + # deep template magic in SW "Ring<value_type> * sw::Ring::Ring_node_traits::get_next(const Ring<value_type> *)", "Ring<value_type> * sw::Ring::Ring_node_traits::get_previous(const Ring<value_type> *)", @@ -202,7 +267,7 @@ for clazz in sorted(definitionSet - callSet - exclusionSet): clazz2 = clazz.replace("::iterator", "::const_iterator") + " const" if (clazz2 in callSet): continue - # There is lots of macro magic going on in /home/noel/libo4/include/sax/fshelper.hxx that should be using C++11 varag templates + # There is lots of macro magic going on in SRCDIR/include/sax/fshelper.hxx that should be using C++11 varag templates if clazz.startswith("void sax_fastparser::FastSerializerHelper::"): continue # used by Windows build @@ -219,7 +284,15 @@ for clazz in sorted(definitionSet - callSet - exclusionSet): if (clazz.find("::StaticType()") != -1 or clazz.find("::IsOf(void *(*)(void))") != -1): continue + # too much template magic here for my plugin + if (clazz.find(" cairocanvas::") != -1 + or clazz.find(" canvas::") != -1 + or clazz.find(" oglcanvas::") != -1 + or clazz.find(" vclcanvas::") != -1): + continue print clazz + + # add an empty line at the end to make it easier for the unusedmethodsremove plugin to mmap() the output file print diff --git a/compilerplugins/clang/unusedmethodsremove.cxx b/compilerplugins/clang/unusedmethodsremove.cxx index 758b8a107c14..498f8dc75dea 100644 --- a/compilerplugins/clang/unusedmethodsremove.cxx +++ b/compilerplugins/clang/unusedmethodsremove.cxx @@ -53,7 +53,7 @@ static size_t getFilesize(const char* filename) UnusedMethodsRemove::UnusedMethodsRemove(InstantiationData const & data): RewritePlugin(data) { - static const char sInputFile[] = "/home/noel/libo4/result.txt"; + static const char sInputFile[] = SRCDIR "/result.txt"; mmapFilesize = getFilesize(sInputFile); //Open file mmapFD = open(sInputFile, O_RDONLY, 0); diff --git a/connectivity/source/drivers/file/fcode.cxx b/connectivity/source/drivers/file/fcode.cxx index e4c14261fa2d..95eeffdd987c 100644 --- a/connectivity/source/drivers/file/fcode.cxx +++ b/connectivity/source/drivers/file/fcode.cxx @@ -66,11 +66,6 @@ OCode::~OCode() } -OEvaluateSet* OOperand::preProcess(OBoolOperator* /*pOp*/, OOperand* /*pRight*/) -{ - return NULL; -} - OOperandRow::OOperandRow(sal_uInt16 _nPos, sal_Int32 _rType) : OOperand(_rType) , m_nRowPos(_nPos) @@ -178,8 +173,6 @@ OOperandConst::OOperandConst(const OSQLParseNode& rColumnRef, const OUString& aS // Implementation of the operators -sal_uInt16 OOperator::getRequestedOperands() const {return 2;} - bool OBoolOperator::operate(const OOperand*, const OOperand*) const { @@ -217,12 +210,6 @@ void OOp_NOT::Exec(OCodeStack& rCodeStack) delete pOperand; } -sal_uInt16 OOp_NOT::getRequestedOperands() const -{ - return 1; -} - - bool OOp_AND::operate(const OOperand* pLeft, const OOperand* pRight) const { return pLeft->isValid() && pRight->isValid(); @@ -235,12 +222,6 @@ bool OOp_OR::operate(const OOperand* pLeft, const OOperand* pRight) const } -sal_uInt16 OOp_ISNULL::getRequestedOperands() const -{ - return 1; -} - - void OOp_ISNULL::Exec(OCodeStack& rCodeStack) { OOperand* pOperand = rCodeStack.top(); @@ -388,11 +369,6 @@ double OOp_DIV::operate(const double& fLeft,const double& fRight) const return fLeft / fRight; } -OEvaluateSet* OOperandAttr::preProcess(OBoolOperator* /*pOp*/, OOperand* /*pRight*/) -{ - return NULL; -} - void ONthOperator::Exec(OCodeStack& rCodeStack) { ::std::vector<ORowSetValue> aValues; @@ -449,7 +425,6 @@ void OUnaryOperator::Exec(OCodeStack& rCodeStack) delete pOperand; } -sal_uInt16 OUnaryOperator::getRequestedOperands() const {return 1;} diff --git a/connectivity/source/drivers/firebird/Connection.hxx b/connectivity/source/drivers/firebird/Connection.hxx index 47f0ad7bf026..42ce0109a424 100644 --- a/connectivity/source/drivers/firebird/Connection.hxx +++ b/connectivity/source/drivers/firebird/Connection.hxx @@ -181,8 +181,7 @@ namespace connectivity std::exception); ::rtl::OUString getConnectionURL() const {return m_sConnectionURL;} - bool isEmbedded() const {return m_bIsEmbedded;} - ::rtl::OUString getUserName() const {return m_sUser;} + bool isEmbedded() const {return m_bIsEmbedded;} isc_db_handle& getDBHandle() {return m_aDBHandle;} isc_tr_handle& getTransaction() throw(::com::sun::star::sdbc::SQLException); diff --git a/connectivity/source/drivers/mork/MCatalog.hxx b/connectivity/source/drivers/mork/MCatalog.hxx index 4c0f9d0973e8..2001941d977e 100644 --- a/connectivity/source/drivers/mork/MCatalog.hxx +++ b/connectivity/source/drivers/mork/MCatalog.hxx @@ -44,8 +44,6 @@ namespace connectivity explicit OCatalog(OConnection* _pCon); OConnection* getConnection() const { return m_pConnection; } - sdbcx::OCollection* getPrivateTables() const { return m_pTables;} - sdbcx::OCollection* getPrivateViews() const { return m_pViews; } }; } diff --git a/connectivity/source/drivers/mork/MColumnAlias.hxx b/connectivity/source/drivers/mork/MColumnAlias.hxx index 742451dd191d..3c6d39531e9f 100644 --- a/connectivity/source/drivers/mork/MColumnAlias.hxx +++ b/connectivity/source/drivers/mork/MColumnAlias.hxx @@ -58,10 +58,6 @@ namespace connectivity public: explicit OColumnAlias( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & ); - inline bool hasAlias( const OUString& _rAlias ) const - { - return m_aAliasMap.find( _rAlias ) != m_aAliasMap.end(); - } OString getProgrammaticNameOrFallbackToUTF8Alias( const OUString& _rAlias ) const; inline AliasMap::const_iterator begin() const { return m_aAliasMap.begin(); } diff --git a/connectivity/source/drivers/mork/MConnection.hxx b/connectivity/source/drivers/mork/MConnection.hxx index ac4616be9785..41bbd84b3dbd 100644 --- a/connectivity/source/drivers/mork/MConnection.hxx +++ b/connectivity/source/drivers/mork/MConnection.hxx @@ -64,7 +64,6 @@ namespace connectivity MorkDriver* getDriver() {return m_pDriver;}; MorkParser* getMorkParser(const OString& t) {return t == "CollectedAddressBook" ? m_pHistory : m_pBook;}; - void closeAllStatements () throw( ::com::sun::star::sdbc::SQLException); // OComponentHelper virtual void SAL_CALL disposing() SAL_OVERRIDE; @@ -100,8 +99,6 @@ namespace connectivity const OColumnAlias & getColumnAlias() const { return m_aColumnAlias; } - static OUString getDriverImplementationName(); - static bool getForceLoadTables() {return true;} // Added to enable me to use SQLInterpreter which requires an diff --git a/connectivity/source/drivers/mork/MDatabaseMetaData.hxx b/connectivity/source/drivers/mork/MDatabaseMetaData.hxx index d67b177dc1b8..556eee32fcf6 100644 --- a/connectivity/source/drivers/mork/MDatabaseMetaData.hxx +++ b/connectivity/source/drivers/mork/MDatabaseMetaData.hxx @@ -41,10 +41,8 @@ namespace connectivity protected: virtual ~ODatabaseMetaData(); - public: - - inline OConnection* getOwnConnection() const { return m_pConnection; } + public: explicit ODatabaseMetaData(OConnection* _pCon); private: diff --git a/connectivity/source/drivers/mork/MErrorResource.hxx b/connectivity/source/drivers/mork/MErrorResource.hxx index 4459293daf49..6b142ece3a62 100644 --- a/connectivity/source/drivers/mork/MErrorResource.hxx +++ b/connectivity/source/drivers/mork/MErrorResource.hxx @@ -41,12 +41,6 @@ namespace connectivity { } - inline void set( const sal_uInt16 _nErrorResourceId, const sal_Int32 _nErrorCondition, const OUString& _rParam ) - { - m_nErrorResourceId = _nErrorResourceId; - m_nErrorCondition = _nErrorCondition; - m_sParameter = _rParam; - } inline void setResId( const sal_uInt16 _nErrorResourceId ) { m_nErrorResourceId = _nErrorResourceId; diff --git a/connectivity/source/drivers/mork/MNSProfileDiscover.hxx b/connectivity/source/drivers/mork/MNSProfileDiscover.hxx index 8f011315a7dd..a7aae562a254 100644 --- a/connectivity/source/drivers/mork/MNSProfileDiscover.hxx +++ b/connectivity/source/drivers/mork/MNSProfileDiscover.hxx @@ -45,7 +45,6 @@ namespace connectivity ProfileStruct(MozillaProductType aProduct = MozillaProductType_Default, const OUString& aProfileName = OUString(), const OUString &aProfilePath = OUString() ); - MozillaProductType getProductType() { return product;} OUString getProfileName(){ return profileName;} OUString getProfilePath() { return profilePath; } protected: @@ -59,10 +58,7 @@ namespace connectivity class ProductStruct { public: - void setCurrentProfile(const OUString& aProfileName){mCurrentProfileName = aProfileName;} - OUString mCurrentProfileName; - ProfileList mProfileList; }; diff --git a/connectivity/source/drivers/mork/MQueryHelper.hxx b/connectivity/source/drivers/mork/MQueryHelper.hxx index 23cffe295140..03d702808346 100644 --- a/connectivity/source/drivers/mork/MQueryHelper.hxx +++ b/connectivity/source/drivers/mork/MQueryHelper.hxx @@ -69,7 +69,6 @@ namespace connectivity public: virtual ~MQueryExpressionBase() {} - bool isUnknown( ) const { return m_eNodeType == Unknown; } bool isStringExpr( ) const { return m_eNodeType == StringExpr; } bool isExpr( ) const { return m_eNodeType == Expr; } }; @@ -182,23 +181,12 @@ namespace connectivity ErrorDescriptor m_aError; OUString m_aAddressbook; -/* - void clearResultOrComplete(); - void notifyResultOrComplete(); - sal_Bool waitForResultOrComplete( ); - void getCardValues(nsIAbCard *card,sal_uInt32 rowIndex=0); -*/ - - sal_Int32 doQueryDefaultTable(OConnection* xConnection); - sal_Int32 doQueryListTable(OConnection* xConnection, OString& ouStringTable); - public: explicit MQueryHelper(const OColumnAlias& _ca); virtual ~MQueryHelper(); void reset(); MQueryHelperResultEntry* getByIndex( sal_uInt32 nRow ); - bool isError() const; static bool queryComplete() { return true; } sal_Int32 getResultCount() const; bool checkRowAvailable( sal_Int32 nDBRow ); diff --git a/connectivity/source/drivers/mork/MorkParser.cxx b/connectivity/source/drivers/mork/MorkParser.cxx index 040ad950b1c1..bcdda99e104e 100644 --- a/connectivity/source/drivers/mork/MorkParser.cxx +++ b/connectivity/source/drivers/mork/MorkParser.cxx @@ -88,11 +88,6 @@ bool MorkParser::open( const std::string &path ) return parse(); } -inline MorkErrors MorkParser::error() -{ - return error_; -} - void MorkParser::initVars() { error_ = NoError; diff --git a/connectivity/source/drivers/mork/MorkParser.hxx b/connectivity/source/drivers/mork/MorkParser.hxx index ddb5f4ba0f20..411c7544e978 100644 --- a/connectivity/source/drivers/mork/MorkParser.hxx +++ b/connectivity/source/drivers/mork/MorkParser.hxx @@ -89,10 +89,6 @@ public: bool open( const std::string &path ); - /// Return error status - - MorkErrors error(); - /// Returns all tables of specified scope MorkTableMap *getTables( int tableScope ); diff --git a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx index 6df693a7229f..95c816d0159a 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx +++ b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx @@ -81,10 +81,6 @@ namespace connectivity // XProxyRunner virtual ::sal_Int32 SAL_CALL Run( const ::com::sun::star::uno::Reference< ::com::sun::star::mozilla::XCodeProxy >& aCode ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > - & getMSFactory() const { return m_xMSFactory; } - }; } diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx index a897453380eb..6883c5615acf 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx @@ -58,7 +58,6 @@ namespace connectivity nsILocalFile * aProfilePath #endif ); - MozillaProductType getProductType() { return product;} OUString getProfileName(){ return profileName;} OUString getProfilePath() ; #ifndef MINIMAL_PROFILEDISCOVER @@ -77,10 +76,7 @@ namespace connectivity class ProductStruct { public: - void setCurrentProfile(const OUString& aProfileName){mCurrentProfileName = aProfileName;} - OUString mCurrentProfileName; - ProfileList mProfileList; }; diff --git a/connectivity/source/drivers/odbc/OTools.cxx b/connectivity/source/drivers/odbc/OTools.cxx index f92f3df1b79d..f08b767ff915 100644 --- a/connectivity/source/drivers/odbc/OTools.cxx +++ b/connectivity/source/drivers/odbc/OTools.cxx @@ -564,18 +564,6 @@ void OTools::GetInfo(OConnection* _pConnection, _aConnectionHandle,SQL_HANDLE_DBC,_xInterface); } -void OTools::GetInfo(OConnection* _pConnection, - SQLHANDLE _aConnectionHandle, - SQLUSMALLINT _nInfo, - bool &_rValue, - const Reference< XInterface >& _xInterface) throw(SQLException, RuntimeException) -{ - SQLSMALLINT nValueLen; - OTools::ThrowException(_pConnection, - (*reinterpret_cast<T3SQLGetInfo>(_pConnection->getOdbcFunction(ODBC3SQLFunctionId::GetInfo)))(_aConnectionHandle,_nInfo,&_rValue,sizeof _rValue,&nValueLen), - _aConnectionHandle,SQL_HANDLE_DBC,_xInterface); -} - sal_Int32 OTools::MapOdbcType2Jdbc(SQLSMALLINT _nType) { sal_Int32 nValue = DataType::VARCHAR; diff --git a/connectivity/source/drivers/postgresql/pq_baseresultset.hxx b/connectivity/source/drivers/postgresql/pq_baseresultset.hxx index 5f3296aa6feb..ed269f867204 100644 --- a/connectivity/source/drivers/postgresql/pq_baseresultset.hxx +++ b/connectivity/source/drivers/postgresql/pq_baseresultset.hxx @@ -77,9 +77,6 @@ protected: sal_Int32 m_fieldCount; bool m_wasNull; -public: - inline cppu::OBroadcastHelper & getRBHelper() { return OComponentHelper::rBHelper;} - protected: /** mutex should be locked before called */ diff --git a/connectivity/source/drivers/postgresql/pq_xtable.hxx b/connectivity/source/drivers/postgresql/pq_xtable.hxx index fa2e1f00aba4..cbef55eeca2c 100644 --- a/connectivity/source/drivers/postgresql/pq_xtable.hxx +++ b/connectivity/source/drivers/postgresql/pq_xtable.hxx @@ -73,46 +73,43 @@ public: Table( const ::rtl::Reference< RefCountedMutex > & refMutex, const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & connection, ConnectionSettings *pSettings); -public: - void refetch(); -public: // XInterface + // XInterface virtual void SAL_CALL acquire() throw() SAL_OVERRIDE { OComponentHelper::acquire(); } virtual void SAL_CALL release() throw() SAL_OVERRIDE { OComponentHelper::release(); } virtual com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type & reqType ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; -public: // XTypeProvider, first implemented by OPropertySetHelper + // XTypeProvider, first implemented by OPropertySetHelper virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual com::sun::star::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; -public: // XDataDescriptorFactory + // XDataDescriptorFactory virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL createDataDescriptor( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; -public: // XColumnsSupplier + // 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; -public: // XIndexesSupplier + // XIndexesSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getIndexes( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; -public: // XKeysSupplier + // XKeysSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL getKeys( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; -public: // XRename + // XRename virtual void SAL_CALL rename( const OUString& newName ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; -public: // XAlterTable - // Methods + // XAlterTable virtual void SAL_CALL alterColumnByName( const OUString& colName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) @@ -127,11 +124,11 @@ public: // XAlterTable ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; -public: // TODO: remove again + // TODO: remove again virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(const OUString& aPropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; -public: // XNamed + // XNamed virtual OUString SAL_CALL getName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/connectivity/source/drivers/postgresql/pq_xuser.hxx b/connectivity/source/drivers/postgresql/pq_xuser.hxx index 4272aecfee79..9358f2bcc867 100644 --- a/connectivity/source/drivers/postgresql/pq_xuser.hxx +++ b/connectivity/source/drivers/postgresql/pq_xuser.hxx @@ -57,35 +57,30 @@ public: User( const ::rtl::Reference< RefCountedMutex > & refMutex, const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & connection, ConnectionSettings *pSettings); -public: - void refetch(); -public: // XInterface + // XInterface virtual void SAL_CALL acquire() throw() SAL_OVERRIDE { OComponentHelper::acquire(); } virtual void SAL_CALL release() throw() SAL_OVERRIDE { OComponentHelper::release(); } virtual com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type & reqType ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; -public: // XTypeProvider, first implemented by OPropertySetHelper + // XTypeProvider, first implemented by OPropertySetHelper virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual com::sun::star::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; -public: // XDataDescriptorFactory + // XDataDescriptorFactory virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL createDataDescriptor( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; -public: // XUser : XAuthorizable - // Methods + // XUser : XAuthorizable virtual sal_Int32 SAL_CALL getPrivileges( const OUString& objName, sal_Int32 objType ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL changePassword( const OUString& oldPassword, const OUString& newPassword ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - }; class UserDescriptor : public ReflectionBase diff --git a/connectivity/source/drivers/postgresql/pq_xview.hxx b/connectivity/source/drivers/postgresql/pq_xview.hxx index 35ab54bf0a00..e93d34766488 100644 --- a/connectivity/source/drivers/postgresql/pq_xview.hxx +++ b/connectivity/source/drivers/postgresql/pq_xview.hxx @@ -56,33 +56,31 @@ public: View( const ::rtl::Reference< RefCountedMutex > & refMutex, const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & connection, ConnectionSettings *pSettings); -public: - void refetch(); -public: // XInterface + // XInterface virtual void SAL_CALL acquire() throw() SAL_OVERRIDE { OComponentHelper::acquire(); } virtual void SAL_CALL release() throw() SAL_OVERRIDE { OComponentHelper::release(); } virtual com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type & reqType ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; -public: // XTypeProvider, first implemented by OPropertySetHelper + // XTypeProvider, first implemented by OPropertySetHelper virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual com::sun::star::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; -public: // XDataDescriptorFactory + // XDataDescriptorFactory virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL createDataDescriptor( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; -public: // XRename + // XRename virtual void SAL_CALL rename( const OUString& newName ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; -public: // XNamed + // XNamed virtual OUString SAL_CALL getName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -96,7 +94,7 @@ public: const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & connection, ConnectionSettings *pSettings); -public: // XDataDescriptorFactory + // XDataDescriptorFactory virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL createDataDescriptor( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/connectivity/source/inc/OTypeInfo.hxx b/connectivity/source/inc/OTypeInfo.hxx index 12a96580ca43..5294c8e5ac36 100644 --- a/connectivity/source/inc/OTypeInfo.hxx +++ b/connectivity/source/inc/OTypeInfo.hxx @@ -74,8 +74,6 @@ namespace connectivity bool operator == (const OTypeInfo& lh) const { return lh.nType == nType; } bool operator != (const OTypeInfo& lh) const { return lh.nType != nType; } - - inline OUString getDBName() const { return aTypeName; } }; } diff --git a/connectivity/source/inc/dbase/DIndex.hxx b/connectivity/source/inc/dbase/DIndex.hxx index ed424641373c..b40aaa1d4fff 100644 --- a/connectivity/source/inc/dbase/DIndex.hxx +++ b/connectivity/source/inc/dbase/DIndex.hxx @@ -111,10 +111,8 @@ namespace connectivity void SetRootPos(sal_uInt32 nPos) {m_nRootPage = nPos;} void SetPageCount(sal_uInt32 nCount) {m_nPageCount = nCount;} - sal_uInt32 GetRootPos() {return m_nRootPage;} sal_uInt32 GetPageCount() {return m_nPageCount;} - bool IsText() const {return m_aHeader.db_keytype == 0;} sal_uInt16 GetMaxNodes() const {return m_aHeader.db_maxkeys;} bool Insert(sal_uInt32 nRec, const ORowSetValue& rValue); @@ -136,7 +134,6 @@ namespace connectivity bool isUnique() const { return m_IsUnique; } bool UseCollector() const {return m_bUseCollector;} // Tree operations - void Insert(ONDXPagePtr aCurPage, ONDXNode& rNode); void Release(bool bSave = true); bool ConvertToKey(ONDXKey* rKey, sal_uInt32 nRec, const ORowSetValue& rValue); }; diff --git a/connectivity/source/inc/dbase/DIndexIter.hxx b/connectivity/source/inc/dbase/DIndexIter.hxx index 772bfb93de99..7d3dd2fb5b56 100644 --- a/connectivity/source/inc/dbase/DIndexIter.hxx +++ b/connectivity/source/inc/dbase/DIndexIter.hxx @@ -39,9 +39,8 @@ namespace connectivity ODbaseIndex* m_pIndex; ONDXPagePtr m_aRoot, m_aCurLeaf; - sal_uInt16 m_nCurNode; + sal_uInt16 m_nCurNode; - protected: sal_uIntPtr Find(bool bFirst); sal_uIntPtr GetCompare(bool bFirst); sal_uIntPtr GetLike(bool bFirst); @@ -51,8 +50,6 @@ namespace connectivity ONDXKey* GetFirstKey(ONDXPage* pPage, const file::OOperand& rKey); ONDXKey* GetNextKey(); - ODbaseIndex* GetIndex() const {return m_pIndex;} - public: OIndexIterator(ODbaseIndex* pInd, diff --git a/connectivity/source/inc/dbase/dindexnode.hxx b/connectivity/source/inc/dbase/dindexnode.hxx index b32163511e6a..17cb9b769f43 100644 --- a/connectivity/source/inc/dbase/dindexnode.hxx +++ b/connectivity/source/inc/dbase/dindexnode.hxx @@ -70,9 +70,6 @@ namespace connectivity bool operator > (const ONDXKey& rKey) const; bool operator >= (const ONDXKey& rKey) const; - bool Load (SvFileStream& rStream, bool bText); - bool Write(SvFileStream& rStream, bool bText); - static bool IsText(sal_Int32 eType); private: @@ -157,7 +154,6 @@ namespace connectivity bool IsLeaf() const; bool IsModified() const; bool HasParent(); - bool HasChild() const; bool IsFull() const; @@ -224,7 +220,6 @@ namespace connectivity inline bool ONDXPage::IsLeaf() const {return !aChild.HasPage();} inline bool ONDXPage::IsModified() const {return bModified;} inline bool ONDXPage::HasParent() {return aParent.Is();} - inline bool ONDXPage::HasChild() const {return aChild.HasPage();} inline ONDXPagePtr ONDXPage::GetParent() {return aParent;} inline void ONDXPage::SetParent(ONDXPagePtr aPa = ONDXPagePtr()) @@ -269,41 +264,11 @@ namespace connectivity // Setting the child, via reference to retain the PagePos void SetChild(ONDXPagePtr aCh = ONDXPagePtr(), ONDXPage* = NULL); - void SetKey(ONDXKey& rKey) {aKey = rKey;} void Write(SvStream &rStream, const ONDXPage& rPage) const; void Read(SvStream &rStream, ODbaseIndex&); }; - // inline implementation - -// inline ONDXKey::ONDXKey(const ORowSetValue& rVal, sal_Int32 eType, sal_uInt32 nRec) -// : ONDXKey_BASE(eType) -// , nRecord(nRec),xValue(rVal) -// { -// } - - -// inline ONDXKey::ONDXKey(const OUString& aStr, sal_uInt32 nRec) -// : ONDXKey_BASE(::com::sun::star::sdbc::DataType::VARCHAR) -// ,nRecord(nRec) -// { -// if (aStr.len()) -// xValue = aStr; -// } - -// inline ONDXKey::ONDXKey(double aVal, sal_uInt32 nRec) -// : ONDXKey_BASE(::com::sun::star::sdbc::DataType::DOUBLE) -// ,nRecord(nRec) -// ,xValue(aVal) -// { -// } - -// inline ONDXKey::ONDXKey(sal_uInt32 nRec) -// :nRecord(nRec) -// { -// } - inline ONDXKey::ONDXKey(const ONDXKey& rKey) : ONDXKey_BASE(rKey.getDBType()) ,nRecord(rKey.nRecord) diff --git a/connectivity/source/inc/file/FConnection.hxx b/connectivity/source/inc/file/FConnection.hxx index 2b6bc47069f6..eaede692c871 100644 --- a/connectivity/source/inc/file/FConnection.hxx +++ b/connectivity/source/inc/file/FConnection.hxx @@ -83,9 +83,6 @@ namespace connectivity css::uno::RuntimeException, css::uno::DeploymentException); - - void closeAllStatements () throw( ::com::sun::star::sdbc::SQLException); - // OComponentHelper virtual void SAL_CALL disposing() SAL_OVERRIDE; // XInterface diff --git a/connectivity/source/inc/file/FStatement.hxx b/connectivity/source/inc/file/FStatement.hxx index 356a40e997b1..fc481ed47813 100644 --- a/connectivity/source/inc/file/FStatement.hxx +++ b/connectivity/source/inc/file/FStatement.hxx @@ -112,7 +112,6 @@ namespace connectivity OSQLAnalyzer* createAnalyzer(); void closeResultSet() throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception); - sal_Int32 getPrecision ( sal_Int32 sqlType); void disposeResultSet(); void GetAssignValues(); diff --git a/connectivity/source/inc/file/fcode.hxx b/connectivity/source/inc/file/fcode.hxx index 2c59dfd9f44b..725e0f28ccdb 100644 --- a/connectivity/source/inc/file/fcode.hxx +++ b/connectivity/source/inc/file/fcode.hxx @@ -76,7 +76,6 @@ namespace connectivity virtual void setValue(const ORowSetValue& _rVal) = 0; sal_Int32 getDBType() const {return m_eDBType;} - virtual OEvaluateSet* preProcess(OBoolOperator* pOp, OOperand* pRight = 0); inline bool isValid() const; TYPEINFO_OVERRIDE(); @@ -90,7 +89,6 @@ namespace connectivity OOperandRow(sal_uInt16 _nPos, sal_Int32 _rType); public: - sal_uInt16 getRowPos() const {return m_nRowPos;} virtual const ORowSetValue& getValue() const SAL_OVERRIDE; virtual void setValue(const ORowSetValue& _rVal) SAL_OVERRIDE; void bindValue(const OValueRefRow& _pRow); // Bind to the value that the operand represents @@ -108,7 +106,6 @@ namespace connectivity OOperandAttr(sal_uInt16 _nPos, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xColumn); - virtual OEvaluateSet* preProcess(OBoolOperator* pOp, OOperand* pRight = 0) SAL_OVERRIDE; TYPEINFO_OVERRIDE(); }; @@ -202,8 +199,6 @@ namespace connectivity { public: virtual void Exec(OCodeStack&) = 0; - virtual sal_uInt16 getRequestedOperands() const; // Count of requested operands - // Defaults to 2 TYPEINFO_OVERRIDE(); }; @@ -225,7 +220,6 @@ namespace connectivity protected: virtual void Exec(OCodeStack&) SAL_OVERRIDE; virtual bool operate(const OOperand*, const OOperand* = NULL) const SAL_OVERRIDE; - virtual sal_uInt16 getRequestedOperands() const SAL_OVERRIDE; }; class OOp_AND : public OBoolOperator @@ -251,7 +245,6 @@ namespace connectivity TYPEINFO_OVERRIDE(); public: virtual void Exec(OCodeStack&) SAL_OVERRIDE; - virtual sal_uInt16 getRequestedOperands() const SAL_OVERRIDE; virtual bool operate(const OOperand*, const OOperand* = NULL) const SAL_OVERRIDE; }; @@ -366,7 +359,6 @@ namespace connectivity { public: virtual void Exec(OCodeStack&) SAL_OVERRIDE; - virtual sal_uInt16 getRequestedOperands() const SAL_OVERRIDE; virtual ORowSetValue operate(const ORowSetValue& lhs) const = 0; TYPEINFO_OVERRIDE(); diff --git a/connectivity/source/inc/file/fcomp.hxx b/connectivity/source/inc/file/fcomp.hxx index 7f09023ae4b6..5b0d52c8b644 100644 --- a/connectivity/source/inc/file/fcomp.hxx +++ b/connectivity/source/inc/file/fcomp.hxx @@ -65,7 +65,6 @@ namespace connectivity void Clean(); bool isClean() const {return m_aCodeList.empty();} bool hasCode() const {return !isClean();} - bool hasORCondition() const {return m_bORCondition;} void setOrigColumns(const OFileColumns& rCols) { m_orgColumns = rCols; } const OFileColumns getOrigColumns() const { return m_orgColumns; } protected: diff --git a/connectivity/source/inc/flat/ETable.hxx b/connectivity/source/inc/flat/ETable.hxx index f45fe0fd5ba3..ecd982ef0c62 100644 --- a/connectivity/source/inc/flat/ETable.hxx +++ b/connectivity/source/inc/flat/ETable.hxx @@ -57,7 +57,6 @@ namespace connectivity bool m_bNeedToReadLine; private: void fillColumns(const ::com::sun::star::lang::Locale& _aLocale); - bool CreateFile(const INetURLObject& aFile, bool& bCreateMemo); bool readLine(sal_Int32 *pEndPos = NULL, sal_Int32 *pStartPos = NULL, bool nonEmpty = false); void setRowPos(::std::vector<TRowPositionInFile>::size_type rowNum, const TRowPositionInFile &rowPos); void impl_fillColumnInfo_nothrow(QuotedTokenizedString& aFirstLine, sal_Int32& nStartPosFirstLine, sal_Int32& nStartPosFirstLine2, diff --git a/connectivity/source/inc/hsqldb/HTables.hxx b/connectivity/source/inc/hsqldb/HTables.hxx index 75c95e013a37..26e5c3965460 100644 --- a/connectivity/source/inc/hsqldb/HTables.hxx +++ b/connectivity/source/inc/hsqldb/HTables.hxx @@ -49,20 +49,6 @@ namespace connectivity // XDrop void appendNew(const OUString& _rsNewTable); - // some helper functions - /** - returns a sql string which contains the column definition part for create or alter statements - */ - static OUString getColumnSqlType(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxColProp); - /** - returns the "not null" part or the default part of the table statement - */ - static OUString getColumnSqlNotNullDefault(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxColProp); - /** - returns the corresponding typename - can contain () which have to filled with values - */ - static OUString getTypeString(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxColProp); }; } } diff --git a/connectivity/source/inc/java/ContextClassLoader.hxx b/connectivity/source/inc/java/ContextClassLoader.hxx index fa04e0a9ae1c..6d96a48e3e72 100644 --- a/connectivity/source/inc/java/ContextClassLoader.hxx +++ b/connectivity/source/inc/java/ContextClassLoader.hxx @@ -57,8 +57,6 @@ namespace connectivity { namespace jdbc ~ContextClassLoaderScope() { pop(true); } - void pop() { pop(false); } - bool isActive() const { return ( m_currentThread.is() ) diff --git a/connectivity/source/inc/java/lang/Object.hxx b/connectivity/source/inc/java/lang/Object.hxx index adaa7a87a7ad..2200bdf1b661 100644 --- a/connectivity/source/inc/java/lang/Object.hxx +++ b/connectivity/source/inc/java/lang/Object.hxx @@ -92,7 +92,6 @@ namespace connectivity void saveRef( JNIEnv * pEnv, jobject myObj ); jobject getJavaObject() const { return object; } - java_lang_Object * GetWrapper() { return this; } void clearObject(JNIEnv& rEnv); void clearObject(); diff --git a/connectivity/source/inc/mysql/YTables.hxx b/connectivity/source/inc/mysql/YTables.hxx index e3bb892c8ed5..5783c06ca334 100644 --- a/connectivity/source/inc/mysql/YTables.hxx +++ b/connectivity/source/inc/mysql/YTables.hxx @@ -51,20 +51,6 @@ namespace connectivity // XDrop void appendNew(const OUString& _rsNewTable); - // some helper functions - /** - returns a sql string which contains the column definition part for create or alter statements - */ - static OUString getColumnSqlType(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxColProp); - /** - returns the "not null" part or the default part of the table statement - */ - static OUString getColumnSqlNotNullDefault(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxColProp); - /** - returns the corresponding typename - can contain () which have to filled with values - */ - static OUString getTypeString(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxColProp); /** convert the sql statement to fit MySQL notation @param _sSql in/out diff --git a/connectivity/source/inc/odbc/OBoundParam.hxx b/connectivity/source/inc/odbc/OBoundParam.hxx index d851e2a2740e..e07baf5ba000 100644 --- a/connectivity/source/inc/odbc/OBoundParam.hxx +++ b/connectivity/source/inc/odbc/OBoundParam.hxx @@ -61,15 +61,6 @@ namespace connectivity } - // getBindDataBuffer - // Returns the data buffer to be used when binding to a parameter - - void* getBindDataBuffer () - { - return binaryData; - } - - // getBindLengthBuffer // Returns the length buffer to be used when binding to a parameter @@ -113,45 +104,6 @@ namespace connectivity } - // setSqlType - // Sets the Java sql type used to register an OUT parameter - - - void setSqlType(sal_Int32 type) - { - sqlType = type; - } - - - // getSqlType - // Gets the Java sql type used to register an OUT parameter - - - sal_Int32 getSqlType () - { - return sqlType; - } - - - // setOutputParameter - // Sets the flag indicating if this is an OUTPUT parameter - - - void setOutputParameter (bool output) - { - outputParameter = output; - } - - - // isOutputParameter - // Gets the OUTPUT parameter flag - - - bool isOutputParameter () - { - return outputParameter; - } - protected: // Data attributes diff --git a/connectivity/source/inc/odbc/OConnection.hxx b/connectivity/source/inc/odbc/OConnection.hxx index 8dfb0627efc8..6598addf60a5 100644 --- a/connectivity/source/inc/odbc/OConnection.hxx +++ b/connectivity/source/inc/odbc/OConnection.hxx @@ -91,8 +91,6 @@ namespace connectivity // OConnection(const SQLHANDLE _pConnectionHandle); virtual ~OConnection(); - void closeAllStatements () throw( ::com::sun::star::sdbc::SQLException); - // OComponentHelper virtual void SAL_CALL disposing() SAL_OVERRIDE; // XInterface @@ -133,15 +131,11 @@ namespace connectivity inline bool isIgnoreDriverPrivilegesEnabled() const { return m_bIgnoreDriverPrivileges; } inline bool preventGetVersionColumns() const { return m_bPreventGetVersionColumns; } inline bool useOldDateFormat() const { return m_bUseOldDateFormat; } - inline SQLHANDLE getDriverHandle() const { return m_pDriverHandleCopy;} inline ODBCDriver* getDriver() const { return m_pDriver;} - inline OUString getUserName() const { return m_sUser; } SQLHANDLE createStatementHandle(); // close and free the handle and set it to SQL_NULLHANDLE void freeStatementHandle(SQLHANDLE& _pHandle); - - const TTypeInfoVector& getTypeInfo() const { return m_aTypeInfo; } }; } } diff --git a/connectivity/source/inc/odbc/ODatabaseMetaData.hxx b/connectivity/source/inc/odbc/ODatabaseMetaData.hxx index 2a63bb7187f1..38beb19b7d33 100644 --- a/connectivity/source/inc/odbc/ODatabaseMetaData.hxx +++ b/connectivity/source/inc/odbc/ODatabaseMetaData.hxx @@ -58,18 +58,10 @@ namespace connectivity OUString getURLImpl(); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > impl_getTypeInfo_throw() SAL_OVERRIDE; virtual ~ODatabaseMetaData(); - public: - - inline OConnection* getOwnConnection() const { return m_pConnection; } - inline oslGenericFunction getOdbcFunction(ODBC3SQLFunctionId _nIndex) const - { - return m_pConnection->getOdbcFunction(_nIndex); - } + public: ODatabaseMetaData(const SQLHANDLE _pHandle,OConnection* _pCon); - - // XDatabaseMetaData virtual sal_Bool SAL_CALL allProceduresAreCallable( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL allTablesAreSelectable( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx index 1685c248b031..16a7213e2086 100644 --- a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx +++ b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx @@ -192,8 +192,6 @@ namespace connectivity // XColumnLocate virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - const ::connectivity::TIntVector& getColumnMapping() { return m_aColMapping; } - void openTablesTypes( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); void openTypeInfo() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); void openCatalogs() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/odbc/OPreparedStatement.hxx b/connectivity/source/inc/odbc/OPreparedStatement.hxx index 59968836c6d3..1aab573aa498 100644 --- a/connectivity/source/inc/odbc/OPreparedStatement.hxx +++ b/connectivity/source/inc/odbc/OPreparedStatement.hxx @@ -82,7 +82,6 @@ namespace connectivity void setParameterPre(sal_Int32 parameterIndex); template <typename T> void setScalarParameter(sal_Int32 parameterIndex, sal_Int32 _nType, SQLULEN _nColumnSize, const T i_Value); void setParameter(sal_Int32 parameterIndex, sal_Int32 _nType, SQLULEN _nColumnSize, sal_Int32 _nScale, const void* _pData, SQLULEN _nDataLen, SQLLEN _nDataAllocLen); - void setParameter(sal_Int32 parameterIndex, sal_Int32 _nType, sal_Int32 _nColumnSize, sal_Int32 _nByteSize, void* _pData); // Wrappers for special cases void setParameter(sal_Int32 parameterIndex, sal_Int32 _nType, sal_Int16 _nScale, const OUString &_sData); void setParameter(sal_Int32 parameterIndex, sal_Int32 _nType, const com::sun::star::uno::Sequence< sal_Int8 > &_Data); diff --git a/connectivity/source/inc/odbc/OTools.hxx b/connectivity/source/inc/odbc/OTools.hxx index c971548e59f3..ff544c9fb047 100644 --- a/connectivity/source/inc/odbc/OTools.hxx +++ b/connectivity/source/inc/odbc/OTools.hxx @@ -134,12 +134,6 @@ namespace connectivity SQLUINTEGER &_rValue, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - static void GetInfo(OConnection* _pConnection, - SQLHANDLE _aConnectionHandle, - SQLUSMALLINT _nInfo, - bool &_rValue, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - static sal_Int32 MapOdbcType2Jdbc(SQLSMALLINT _nType); static SQLSMALLINT jdbcTypeToOdbc(sal_Int32 jdbcType); diff --git a/connectivity/source/sdbcx/VCollection.cxx b/connectivity/source/sdbcx/VCollection.cxx index b92b17131986..4cead412a0f4 100644 --- a/connectivity/source/sdbcx/VCollection.cxx +++ b/connectivity/source/sdbcx/VCollection.cxx @@ -186,12 +186,6 @@ namespace return m_aElements.size() - (m_aElements.end() - ::std::find(m_aElements.begin(),m_aElements.end(),aIter)); } - virtual OUString findColumnAtIndex( sal_Int32 _nIndex) SAL_OVERRIDE - { - OSL_ENSURE(_nIndex >= 0 && _nIndex < static_cast<sal_Int32>(m_aElements.size()),"Illegal argument!"); - return m_aElements[_nIndex]->first; - } - virtual ObjectType getObject(sal_Int32 _nIndex) SAL_OVERRIDE { OSL_ENSURE(_nIndex >= 0 && _nIndex < static_cast<sal_Int32>(m_aElements.size()),"Illegal argument!"); diff --git a/cppcanvas/source/inc/canvasgraphichelper.hxx b/cppcanvas/source/inc/canvasgraphichelper.hxx index a8c075a68c36..26819ff5a087 100644 --- a/cppcanvas/source/inc/canvasgraphichelper.hxx +++ b/cppcanvas/source/inc/canvasgraphichelper.hxx @@ -48,12 +48,9 @@ namespace cppcanvas // CanvasGraphic implementation virtual void setTransformation( const ::basegfx::B2DHomMatrix& rMatrix ) SAL_OVERRIDE; - virtual ::basegfx::B2DHomMatrix getTransformation() const SAL_OVERRIDE; virtual void setClip( const ::basegfx::B2DPolyPolygon& rClipPoly ) SAL_OVERRIDE; virtual void setClip() SAL_OVERRIDE; - virtual ::basegfx::B2DPolyPolygon const* getClip() const SAL_OVERRIDE; virtual void setCompositeOp( CompositeOp aOp ) SAL_OVERRIDE; - virtual CompositeOp getCompositeOp() const SAL_OVERRIDE; protected: // for our clients diff --git a/cppcanvas/source/inc/implrenderer.hxx b/cppcanvas/source/inc/implrenderer.hxx index 2ccd4a6a3ace..6c627282d43f 100644 --- a/cppcanvas/source/inc/implrenderer.hxx +++ b/cppcanvas/source/inc/implrenderer.hxx @@ -96,16 +96,6 @@ namespace cppcanvas eDx = eDy = eM12 = eM21 = 0.0f; } - void Set (float m11, float m12, float dx, float m21, float m22, float dy) - { - eM11 = m11; - eM12 = m12; - eDx = dx; - eM21 = m21; - eM22 = m22; - eDy = dy; - } - void Set (const XForm& f) { eM11 = f.eM11; @@ -116,16 +106,6 @@ namespace cppcanvas eDy = f.eDy; } - void Multiply (float m11, float m12, float dx, float m21, float m22, float dy) - { - eM11 = eM11*m11 + eM12*m21; - eM12 = eM11*m12 + eM12*m22; - eM21 = eM21*m11 + eM22*m21; - eM22 = eM21*m12 + eM22*m22; - eDx *= eDx*m11 + eDy*m21 + dx; - eDy *= eDx*m12 + eDy*m22 + dy; - } - void Multiply (const XForm& f) { eM11 = eM11*f.eM11 + eM12*f.eM21; diff --git a/cppcanvas/source/tools/canvasgraphichelper.cxx b/cppcanvas/source/tools/canvasgraphichelper.cxx index 43231ed347d5..e766cc451d65 100644 --- a/cppcanvas/source/tools/canvasgraphichelper.cxx +++ b/cppcanvas/source/tools/canvasgraphichelper.cxx @@ -64,13 +64,6 @@ namespace cppcanvas ::canvas::tools::setRenderStateTransform( maRenderState, rMatrix ); } - ::basegfx::B2DHomMatrix CanvasGraphicHelper::getTransformation() const - { - ::basegfx::B2DHomMatrix aMatrix; - return ::canvas::tools::getRenderStateTransform( aMatrix, - maRenderState ); - } - void CanvasGraphicHelper::setClip( const ::basegfx::B2DPolyPolygon& rClipPoly ) { // TODO(T3): not thread-safe. B2DPolyPolygon employs copy-on-write @@ -84,11 +77,6 @@ namespace cppcanvas maRenderState.Clip.clear(); } - ::basegfx::B2DPolyPolygon const* CanvasGraphicHelper::getClip() const - { - return !maClipPolyPolygon ? NULL : &(*maClipPolyPolygon); - } - const rendering::RenderState& CanvasGraphicHelper::getRenderState() const { if( maClipPolyPolygon && !maRenderState.Clip.is() ) @@ -110,13 +98,6 @@ namespace cppcanvas maRenderState.CompositeOperation = (sal_Int8)aOp; } - CanvasGraphic::CompositeOp CanvasGraphicHelper::getCompositeOp() const - { - return static_cast<CompositeOp>(maRenderState.CompositeOperation); - } - - - } } diff --git a/cppcanvas/source/wrapper/implcanvas.cxx b/cppcanvas/source/wrapper/implcanvas.cxx index 70a4c3f24f42..a4f902bbcbf3 100644 --- a/cppcanvas/source/wrapper/implcanvas.cxx +++ b/cppcanvas/source/wrapper/implcanvas.cxx @@ -84,11 +84,6 @@ namespace cppcanvas return !maClipPolyPolygon ? NULL : &(*maClipPolyPolygon); } - FontSharedPtr ImplCanvas::createFont( const OUString& rFontName, const double& rCellSize ) const - { - return FontSharedPtr( new ImplFont( getUNOCanvas(), rFontName, rCellSize ) ); - } - ColorSharedPtr ImplCanvas::createColor() const { return ColorSharedPtr( new ImplColor( getUNOCanvas()->getDevice() ) ); diff --git a/cppcanvas/source/wrapper/implcanvas.hxx b/cppcanvas/source/wrapper/implcanvas.hxx index c882ede2ccbe..7c8920cb65e9 100644 --- a/cppcanvas/source/wrapper/implcanvas.hxx +++ b/cppcanvas/source/wrapper/implcanvas.hxx @@ -60,8 +60,6 @@ namespace cppcanvas virtual void setClip() SAL_OVERRIDE; virtual ::basegfx::B2DPolyPolygon const* getClip() const SAL_OVERRIDE; - virtual FontSharedPtr createFont( const OUString& rFontName, const double& rCellSize ) const SAL_OVERRIDE; - virtual ColorSharedPtr createColor() const SAL_OVERRIDE; virtual CanvasSharedPtr clone() const SAL_OVERRIDE; diff --git a/cppcanvas/source/wrapper/implcolor.cxx b/cppcanvas/source/wrapper/implcolor.cxx index fa59576e68cf..1c69bb4251f3 100644 --- a/cppcanvas/source/wrapper/implcolor.cxx +++ b/cppcanvas/source/wrapper/implcolor.cxx @@ -39,14 +39,6 @@ namespace cppcanvas { } - Color::IntSRGBA ImplColor::getIntSRGBA( uno::Sequence< double >& rDeviceColor ) const - { - OSL_ENSURE( mxDevice.is(), "ImplColor::getIntSRGBA(): Invalid graphic device" ); - - // TODO(F1): Color space handling - return tools::doubleSequenceToIntSRGBA( mxDevice, rDeviceColor ); - } - uno::Sequence< double > ImplColor::getDeviceColor( Color::IntSRGBA aSRGBA ) const { OSL_ENSURE( mxDevice.is(), "ImplColor::getDeviceColor(): Invalid graphic device" ); diff --git a/cppcanvas/source/wrapper/implcolor.hxx b/cppcanvas/source/wrapper/implcolor.hxx index c61e37457110..7a317ad60ca1 100644 --- a/cppcanvas/source/wrapper/implcolor.hxx +++ b/cppcanvas/source/wrapper/implcolor.hxx @@ -41,7 +41,6 @@ namespace cppcanvas css::rendering::XGraphicDevice >& rDevice ); virtual ~ImplColor(); - virtual IntSRGBA getIntSRGBA( css::uno::Sequence< double >& rDeviceColor ) const SAL_OVERRIDE; virtual css::uno::Sequence< double > getDeviceColor( IntSRGBA aSRGBA ) const SAL_OVERRIDE; private: diff --git a/cppcanvas/source/wrapper/implfont.cxx b/cppcanvas/source/wrapper/implfont.cxx index e62cfa543227..50b851063f6f 100644 --- a/cppcanvas/source/wrapper/implfont.cxx +++ b/cppcanvas/source/wrapper/implfont.cxx @@ -56,27 +56,6 @@ namespace cppcanvas { } - OUString ImplFont::getName() const - { - OSL_ENSURE( mxFont.is(), "ImplFont::getName(): Invalid Font" ); - - return mxFont->getFontRequest().FontDescription.FamilyName; - } - - double ImplFont::getCellSize() const - { - OSL_ENSURE( mxFont.is(), "ImplFont::getCellSize(): Invalid Font" ); - - return mxFont->getFontRequest().CellSize; - } - - uno::Reference< rendering::XCanvasFont > ImplFont::getUNOFont() const - { - OSL_ENSURE( mxFont.is(), "ImplFont::getUNOFont(): Invalid Font" ); - - return mxFont; - } - } } diff --git a/cppcanvas/source/wrapper/implfont.hxx b/cppcanvas/source/wrapper/implfont.hxx index 89904a5a1b44..710cb41c6784 100644 --- a/cppcanvas/source/wrapper/implfont.hxx +++ b/cppcanvas/source/wrapper/implfont.hxx @@ -50,11 +50,6 @@ namespace cppcanvas virtual ~ImplFont(); - virtual OUString getName() const SAL_OVERRIDE; - virtual double getCellSize() const SAL_OVERRIDE; - - virtual css::uno::Reference< css::rendering::XCanvasFont > getUNOFont() const SAL_OVERRIDE; - private: css::uno::Reference< css::rendering::XCanvas > mxCanvas; css::uno::Reference< css::rendering::XCanvasFont > mxFont; diff --git a/cppcanvas/source/wrapper/implpolypolygon.cxx b/cppcanvas/source/wrapper/implpolypolygon.cxx index 927377811c42..ed0c4dbd5a89 100644 --- a/cppcanvas/source/wrapper/implpolypolygon.cxx +++ b/cppcanvas/source/wrapper/implpolypolygon.cxx @@ -62,50 +62,6 @@ namespace cppcanvas { } - void ImplPolyPolygon::addPolygon( const ::basegfx::B2DPolygon& rPoly ) - { - OSL_ENSURE( mxPolyPoly.is(), - "ImplPolyPolygon::addPolygon(): Invalid polygon" ); - - if( !mxPolyPoly.is() ) - return; - - uno::Reference< rendering::XGraphicDevice > xDevice( getGraphicDevice() ); - - OSL_ENSURE( xDevice.is(), - "ImplPolyPolygon::addPolygon(): Invalid graphic device" ); - - if( !xDevice.is() ) - return; - - mxPolyPoly->addPolyPolygon( geometry::RealPoint2D(0.0, 0.0), - ::basegfx::unotools::xPolyPolygonFromB2DPolygon( - xDevice, - rPoly) ); - } - - void ImplPolyPolygon::addPolyPolygon( const ::basegfx::B2DPolyPolygon& rPoly ) - { - OSL_ENSURE( mxPolyPoly.is(), - "ImplPolyPolygon::addPolyPolygon(): Invalid polygon" ); - - if( !mxPolyPoly.is() ) - return; - - uno::Reference< rendering::XGraphicDevice > xDevice( getGraphicDevice() ); - - OSL_ENSURE( xDevice.is(), - "ImplPolyPolygon::addPolyPolygon(): Invalid graphic device" ); - - if( !xDevice.is() ) - return; - - mxPolyPoly->addPolyPolygon( geometry::RealPoint2D(0.0, 0.0), - ::basegfx::unotools::xPolyPolygonFromB2DPolyPolygon( - xDevice, - rPoly) ); - } - void ImplPolyPolygon::setRGBAFillColor( Color::IntSRGBA aColor ) { maFillColor = tools::intSRGBAToDoubleSequence( getGraphicDevice(), @@ -120,12 +76,6 @@ namespace cppcanvas mbStrokeColorSet = true; } - Color::IntSRGBA ImplPolyPolygon::getRGBAFillColor() const - { - return tools::doubleSequenceToIntSRGBA( getGraphicDevice(), - maFillColor ); - } - Color::IntSRGBA ImplPolyPolygon::getRGBALineColor() const { return tools::doubleSequenceToIntSRGBA( getGraphicDevice(), diff --git a/cppcanvas/source/wrapper/implpolypolygon.hxx b/cppcanvas/source/wrapper/implpolypolygon.hxx index eba8f820dbbe..606c92e915c0 100644 --- a/cppcanvas/source/wrapper/implpolypolygon.hxx +++ b/cppcanvas/source/wrapper/implpolypolygon.hxx @@ -48,12 +48,8 @@ namespace cppcanvas virtual ~ImplPolyPolygon(); - virtual void addPolygon( const ::basegfx::B2DPolygon& rPoly ) SAL_OVERRIDE; - virtual void addPolyPolygon( const ::basegfx::B2DPolyPolygon& rPoly ) SAL_OVERRIDE; - virtual void setRGBAFillColor( Color::IntSRGBA ) SAL_OVERRIDE; virtual void setRGBALineColor( Color::IntSRGBA ) SAL_OVERRIDE; - virtual Color::IntSRGBA getRGBAFillColor() const SAL_OVERRIDE; virtual Color::IntSRGBA getRGBALineColor() const SAL_OVERRIDE; virtual void setStrokeWidth( const double& rStrokeWidth ) SAL_OVERRIDE; diff --git a/cppcanvas/source/wrapper/implspritecanvas.cxx b/cppcanvas/source/wrapper/implspritecanvas.cxx index 9138d1d724f4..f5f6203508c1 100644 --- a/cppcanvas/source/wrapper/implspritecanvas.cxx +++ b/cppcanvas/source/wrapper/implspritecanvas.cxx @@ -99,25 +99,6 @@ namespace cppcanvas mpTransformArbiter ) ); } - SpriteSharedPtr ImplSpriteCanvas::createClonedSprite( const SpriteSharedPtr& rSprite ) const - { - OSL_ENSURE( mxSpriteCanvas.is(), "ImplSpriteCanvas::createCustomSprite(): Invalid canvas" ); - OSL_ENSURE( rSprite.get() != NULL && rSprite->getUNOSprite().is(), - "ImplSpriteCanvas::createCustomSprite(): Invalid sprite" ); - - if( !mxSpriteCanvas.is() || - rSprite.get() == NULL || - !rSprite->getUNOSprite().is() ) - { - return SpriteSharedPtr(); - } - - return SpriteSharedPtr( - new ImplSprite( mxSpriteCanvas, - mxSpriteCanvas->createClonedSprite( rSprite->getUNOSprite() ), - mpTransformArbiter ) ); - } - CanvasSharedPtr ImplSpriteCanvas::clone() const { return SpriteCanvasSharedPtr( new ImplSpriteCanvas( *this ) ); diff --git a/cppcanvas/source/wrapper/implspritecanvas.hxx b/cppcanvas/source/wrapper/implspritecanvas.hxx index a18f904d028e..b2af49deee31 100644 --- a/cppcanvas/source/wrapper/implspritecanvas.hxx +++ b/cppcanvas/source/wrapper/implspritecanvas.hxx @@ -50,7 +50,6 @@ namespace cppcanvas virtual bool updateScreen( bool bUpdateAll ) const SAL_OVERRIDE; virtual CustomSpriteSharedPtr createCustomSprite( const ::basegfx::B2DSize& ) const SAL_OVERRIDE; - virtual SpriteSharedPtr createClonedSprite( const SpriteSharedPtr& ) const SAL_OVERRIDE; virtual CanvasSharedPtr clone() const SAL_OVERRIDE; diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx index 3f09f31c092b..f2570fa0d5c8 100644 --- a/cui/source/inc/cuitabline.hxx +++ b/cui/source/inc/cuitabline.hxx @@ -175,7 +175,6 @@ private: // handler for gallery popup menu button + size DECL_LINK_TYPED( GraphicHdl_Impl, MenuButton *, void ); DECL_LINK( MenuCreateHdl_Impl, MenuButton * ); - DECL_LINK( GraphicArrivedHdl_Impl, SvxBrushItem* ); DECL_LINK( SizeHdl_Impl, MetricField * ); DECL_LINK( RatioHdl_Impl, CheckBox * ); diff --git a/cui/source/inc/hangulhanjadlg.hxx b/cui/source/inc/hangulhanjadlg.hxx index 79ad87e677ed..fd317ff5983b 100644 --- a/cui/source/inc/hangulhanjadlg.hxx +++ b/cui/source/inc/hangulhanjadlg.hxx @@ -180,7 +180,6 @@ namespace svx void EnableRubySupport( bool bVal ); private: - DECL_LINK( OnClose, void* ); DECL_LINK( OnOption, void* ); DECL_LINK( OnSuggestionModified, void* ); DECL_LINK( OnSuggestionSelected, void* ); @@ -212,9 +211,6 @@ namespace svx css::uno::Reference< css::linguistic2::XConversionDictionaryList > m_xConversionDictionaryList; DECL_LINK( OkHdl, void* ); - DECL_LINK( OnNew, void* ); - DECL_LINK( OnEdit, void* ); - DECL_LINK( OnDelete, void* ); DECL_LINK( DictsLB_SelectHdl, void* ); DECL_LINK( NewDictHdl, void* ); DECL_LINK( EditDictHdl, void* ); diff --git a/cui/source/inc/linkdlg.hxx b/cui/source/inc/linkdlg.hxx index 54915ab7f988..0cf7f0af72ca 100644 --- a/cui/source/inc/linkdlg.hxx +++ b/cui/source/inc/linkdlg.hxx @@ -71,7 +71,6 @@ class SvBaseLinksDlg : public ModalDialog DECL_LINK( AutomaticClickHdl, RadioButton * ); DECL_LINK( ManualClickHdl, RadioButton * ); DECL_LINK(UpdateNowClickHdl, void *); - DECL_LINK( OpenSourceClickHdl, PushButton * ); DECL_LINK( ChangeSourceClickHdl, PushButton * ); DECL_LINK( BreakLinkClickHdl, PushButton * ); DECL_LINK_TYPED( UpdateWaitingHdl, Idle *, void ); diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx index 161ea488d4cb..4b51379be685 100644 --- a/cui/source/inc/numpages.hxx +++ b/cui/source/inc/numpages.hxx @@ -223,7 +223,6 @@ class SvxBitmapPickTabPage : public SfxTabPage protected: DECL_LINK(NumSelectHdl_Impl, void *); DECL_LINK(DoubleClickHdl_Impl, void *); - DECL_LINK(LinkBmpHdl_Impl, void *); DECL_LINK(ClickAddBrowseHdl_Impl, void * ); @@ -336,8 +335,6 @@ class SvxNumOptionsTabPage : public SfxTabPage DECL_LINK( BulRelSizeHdl_Impl, MetricField *); DECL_LINK_TYPED(PreviewInvalidateHdl_Impl, Timer *, void); - DECL_STATIC_LINK( SvxNumOptionsTabPage, GraphicArrivedHdl_Impl, SvxBrushItem* ); - public: SvxNumOptionsTabPage(vcl::Window* pParent, const SfxItemSet& rSet); diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx index ac75f148dbbf..e09b39e277e6 100644 --- a/cui/source/inc/optlingu.hxx +++ b/cui/source/inc/optlingu.hxx @@ -78,7 +78,6 @@ class SvxEditModulesDlg : public ModalDialog DECL_LINK(UpDownHdl_Impl, PushButton *); DECL_LINK(ClickHdl_Impl, void *); DECL_LINK(BackHdl_Impl, void *); - DECL_LINK( SelectHdlLB_Impl, ListBox * ); DECL_LINK( LangSelectHdl_Impl, ListBox* ); DECL_LINK( BoxCheckButtonHdl_Impl, SvTreeListBox * ); DECL_LINK(OpenURLHdl_Impl, void *); diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx index b7db84a86bb2..9c82f2acd8c7 100644 --- a/cui/source/inc/scriptdlg.hxx +++ b/cui/source/inc/scriptdlg.hxx @@ -156,7 +156,6 @@ protected: const OUString m_renameDupStr; const OUString m_renameErrTitleStr; - DECL_LINK( MacroSelectHdl, SvTreeListBox * ); DECL_LINK( ScriptSelectHdl, SvTreeListBox * ); DECL_LINK( ButtonHdl, Button * ); static bool getBoolProperty( css::uno::Reference< css::beans::XPropertySet >& xProps, OUString& propName ); diff --git a/cui/source/inc/thesdlg.hxx b/cui/source/inc/thesdlg.hxx index f68b4dfbb2e3..4aaa4da782ec 100644 --- a/cui/source/inc/thesdlg.hxx +++ b/cui/source/inc/thesdlg.hxx @@ -145,7 +145,6 @@ public: DECL_LINK( ReplaceBtnHdl_Impl, Button * ); DECL_LINK( LeftBtnHdl_Impl, Button * ); DECL_LINK( LanguageHdl_Impl, ListBox * ); - DECL_LINK( LookUpHdl_Impl, Button * ); DECL_LINK( WordSelectHdl_Impl, ComboBox * ); DECL_LINK( AlternativesSelectHdl_Impl, SvxCheckListBox * ); DECL_LINK( AlternativesDoubleClickHdl_Impl, SvxCheckListBox * ); diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx index e88b3e21e0ec..4bb282dbccba 100644 --- a/cui/source/inc/treeopt.hxx +++ b/cui/source/inc/treeopt.hxx @@ -187,7 +187,6 @@ protected: DECL_LINK(ShowPageHdl_Impl, void *); DECL_LINK(BackHdl_Impl, void *); DECL_LINK(OKHdl_Impl, void *); - DECL_LINK( HintHdl_Impl, Timer * ); void SelectHdl_Impl(); virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index 8b992c6d2cdc..2145e1c47679 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -1733,44 +1733,6 @@ IMPL_LINK( SvxLineTabPage, MenuCreateHdl_Impl, MenuButton *, pButton ) InitSymbols(pButton); return 0; } -// #58425# Symbols on a list (e.g. StarChart) -// Handler for the symbol selection's popup menu (NumMenueButton) -// The following link originates from SvxNumOptionsTabPage -IMPL_LINK(SvxLineTabPage, GraphicArrivedHdl_Impl, SvxBrushItem*, pItem) -{ - PopupMenu* pPopup = m_pSymbolMB->GetPopupMenu()->GetPopupMenu( MN_GALLERY ); - - SvxBmpItemInfo* pBmpInfo = 0; - for ( size_t i = 0; i < aGrfBrushItems.size(); i++ ) - { - SvxBmpItemInfo* pInfo = aGrfBrushItems[ i ]; - if( pInfo->pBrushItem == pItem ) - { - pBmpInfo = pInfo; break; - } - } - if( pBmpInfo ) - { - const Graphic* pGraphic = pItem->GetGraphic(); - if (pGraphic) - { - Bitmap aBitmap(pGraphic->GetBitmap()); - Size aSize(aBitmap.GetSizePixel()); - if(aSize.Width() > MAX_BMP_WIDTH || aSize.Height() > MAX_BMP_HEIGHT) - { - bool bWidth = aSize.Width() > aSize.Height(); - double nScale = bWidth ? - (double)MAX_BMP_WIDTH / (double)aSize.Width(): - (double)MAX_BMP_HEIGHT / (double)aSize.Height(); - aBitmap.Scale(nScale, nScale); - } - Image aImage(aBitmap); - pPopup->SetItemImage( pBmpInfo->nItemId, aImage ); - } - } - - return 0; -} // #58425# Symbols on a list (e.g. StarChart) // Handler for menu button diff --git a/dbaccess/source/core/recovery/storagestream.cxx b/dbaccess/source/core/recovery/storagestream.cxx index 90761120e6bc..be596970bb75 100644 --- a/dbaccess/source/core/recovery/storagestream.cxx +++ b/dbaccess/source/core/recovery/storagestream.cxx @@ -44,11 +44,9 @@ namespace dbaccess namespace ElementModes = ::com::sun::star::embed::ElementModes; // StorageOutputStream - StorageOutputStream::StorageOutputStream( const Reference<XComponentContext>& i_rContext, - const Reference< XStorage >& i_rParentStorage, + StorageOutputStream::StorageOutputStream( const Reference< XStorage >& i_rParentStorage, const OUString& i_rStreamName ) - :m_rContext( i_rContext ) { ENSURE_OR_THROW( i_rParentStorage.is(), "illegal stream" ); @@ -72,11 +70,9 @@ namespace dbaccess } // StorageInputStream - StorageInputStream::StorageInputStream( const Reference<XComponentContext>& i_rContext, - const Reference< XStorage >& i_rParentStorage, + StorageInputStream::StorageInputStream( const Reference< XStorage >& i_rParentStorage, const OUString& i_rStreamName ) - :m_rContext( i_rContext ) { ENSURE_OR_THROW( i_rParentStorage.is(), "illegal stream" ); @@ -89,16 +85,6 @@ namespace dbaccess { } - void StorageInputStream::close() - { - ENSURE_OR_RETURN_VOID( m_xInputStream.is(), "already closed" ); - m_xInputStream->closeInput(); - m_xInputStream.clear(); - - // if you add additional functionality here, be aware that there are derived classes which - // (legitimately) do not call this method here. - } - } // namespace dbaccess /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/recovery/storagestream.hxx b/dbaccess/source/core/recovery/storagestream.hxx index 1a87ba91322a..ce5ce60b049e 100644 --- a/dbaccess/source/core/recovery/storagestream.hxx +++ b/dbaccess/source/core/recovery/storagestream.hxx @@ -35,7 +35,6 @@ namespace dbaccess { public: StorageOutputStream( - const css::uno::Reference< css::uno::XComponentContext >& i_rContext, const css::uno::Reference< css::embed::XStorage >& i_rParentStorage, const OUString& i_rStreamName ); @@ -46,14 +45,10 @@ namespace dbaccess virtual void close(); protected: - const css::uno::Reference< css::uno::XComponentContext >& - getContext() const { return m_rContext; } const css::uno::Reference< css::io::XOutputStream >& getOutputStream() const { return m_xOutputStream; } private: - const css::uno::Reference< css::uno::XComponentContext >& - m_rContext; css::uno::Reference< css::io::XOutputStream > m_xOutputStream; }; @@ -65,25 +60,16 @@ namespace dbaccess { public: StorageInputStream( - const css::uno::Reference< css::uno::XComponentContext >& i_rContext, const css::uno::Reference< css::embed::XStorage >& i_rParentStorage, const OUString& i_rStreamName ); virtual ~StorageInputStream(); - /** simply calls closeInput on our input stream, override to extend/modify this behavior - */ - void close(); - protected: - const css::uno::Reference< css::uno::XComponentContext >& - getContext() const { return m_rContext; } const css::uno::Reference< css::io::XInputStream >& getInputStream() const { return m_xInputStream; } private: - const css::uno::Reference< css::uno::XComponentContext >& - m_rContext; css::uno::Reference< css::io::XInputStream > m_xInputStream; }; diff --git a/dbaccess/source/core/recovery/storagetextstream.cxx b/dbaccess/source/core/recovery/storagetextstream.cxx index 6d5739837d50..94fa28f346af 100644 --- a/dbaccess/source/core/recovery/storagetextstream.cxx +++ b/dbaccess/source/core/recovery/storagetextstream.cxx @@ -56,7 +56,7 @@ namespace dbaccess const Reference< XStorage >& i_rParentStorage, const OUString& i_rStreamName ) - :StorageOutputStream( i_rContext, i_rParentStorage, i_rStreamName ) + :StorageOutputStream( i_rParentStorage, i_rStreamName ) ,m_pData( new StorageTextOutputStream_Data ) { m_pData->xTextOutput = TextOutputStream::create( i_rContext ); diff --git a/dbaccess/source/core/recovery/storagexmlstream.cxx b/dbaccess/source/core/recovery/storagexmlstream.cxx index 06ef1bdea858..d694d6529704 100644 --- a/dbaccess/source/core/recovery/storagexmlstream.cxx +++ b/dbaccess/source/core/recovery/storagexmlstream.cxx @@ -70,7 +70,7 @@ namespace dbaccess StorageXMLOutputStream::StorageXMLOutputStream( const Reference<XComponentContext>& i_rContext, const Reference< XStorage >& i_rParentStorage, const OUString& i_rStreamName ) - :StorageOutputStream( i_rContext, i_rParentStorage, i_rStreamName ) + :StorageOutputStream( i_rParentStorage, i_rStreamName ) ,m_pData( new StorageXMLOutputStream_Data ) { const Reference< XWriter > xSaxWriter = Writer::create( i_rContext ); @@ -142,7 +142,7 @@ namespace dbaccess StorageXMLInputStream::StorageXMLInputStream( const Reference<XComponentContext>& i_rContext, const Reference< XStorage >& i_rParentStorage, const OUString& i_rStreamName ) - :StorageInputStream( i_rContext, i_rParentStorage, i_rStreamName ) + :StorageInputStream( i_rParentStorage, i_rStreamName ) ,m_pData( new StorageXMLInputStream_Data ) { m_pData->xParser.set( Parser::create(i_rContext) ); diff --git a/dbaccess/source/ext/macromigration/rangeprogressbar.hxx b/dbaccess/source/ext/macromigration/rangeprogressbar.hxx index d0039eb87e2b..d312a7925663 100644 --- a/dbaccess/source/ext/macromigration/rangeprogressbar.hxx +++ b/dbaccess/source/ext/macromigration/rangeprogressbar.hxx @@ -59,11 +59,6 @@ namespace dbmm m_pBar->SetValue( (sal_uInt16)( 100.0 * _nValue / m_nRange ) ); } - sal_uInt32 GetValue() const - { - return (sal_uInt32)(m_pBar->GetValue() / 100.0 * m_nRange); - } - private: VclPtr<ProgressBar> m_pBar; sal_uInt32 m_nRange; diff --git a/dbaccess/source/filter/xml/xmlComponent.hxx b/dbaccess/source/filter/xml/xmlComponent.hxx index 82a360c0641b..6020a1e35497 100644 --- a/dbaccess/source/filter/xml/xmlComponent.hxx +++ b/dbaccess/source/filter/xml/xmlComponent.hxx @@ -32,7 +32,6 @@ namespace dbaxml OUString m_sComponentServiceName; bool m_bAsTemplate; - ODBFilter& GetOwnImport(); public: OXMLComponent( ODBFilter& rImport diff --git a/dbaccess/source/filter/xml/xmlDataSourceInfo.hxx b/dbaccess/source/filter/xml/xmlDataSourceInfo.hxx index fc33cd6b305b..91e6ffcdf39b 100644 --- a/dbaccess/source/filter/xml/xmlDataSourceInfo.hxx +++ b/dbaccess/source/filter/xml/xmlDataSourceInfo.hxx @@ -26,7 +26,6 @@ namespace dbaxml class ODBFilter; class OXMLDataSourceInfo : public SvXMLImportContext { - ODBFilter& GetOwnImport(); public: OXMLDataSourceInfo( ODBFilter& rImport, sal_uInt16 nPrfx, diff --git a/dbaccess/source/filter/xml/xmlLogin.hxx b/dbaccess/source/filter/xml/xmlLogin.hxx index 0a46eab2701a..ac13d93246ae 100644 --- a/dbaccess/source/filter/xml/xmlLogin.hxx +++ b/dbaccess/source/filter/xml/xmlLogin.hxx @@ -26,7 +26,6 @@ namespace dbaxml class ODBFilter; class OXMLLogin : public SvXMLImportContext { - ODBFilter& GetOwnImport(); public: OXMLLogin( ODBFilter& rImport, sal_uInt16 nPrfx, diff --git a/dbaccess/source/filter/xml/xmlStyleImport.hxx b/dbaccess/source/filter/xml/xmlStyleImport.hxx index 23718c4199f1..73d9dd1f3480 100644 --- a/dbaccess/source/filter/xml/xmlStyleImport.hxx +++ b/dbaccess/source/filter/xml/xmlStyleImport.hxx @@ -68,8 +68,6 @@ namespace dbaxml virtual void SetDefaults() SAL_OVERRIDE; void AddProperty(sal_Int16 nContextID, const css::uno::Any& aValue); - - sal_Int32 GetNumberFormat() { return m_nNumberFormat; } }; class OTableStylesContext : public SvXMLStylesContext diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx index 534e22c97d8f..194349c9bdd3 100644 --- a/dbaccess/source/filter/xml/xmlfilter.cxx +++ b/dbaccess/source/filter/xml/xmlfilter.cxx @@ -205,7 +205,6 @@ sal_Int32 ReadThroughComponent( ODBFilter::ODBFilter( const uno::Reference< XComponentContext >& _rxContext ) : SvXMLImport(_rxContext, getImplementationName_Static()) - , m_nPreviewMode(0) , m_bNewFormat(false) { diff --git a/dbaccess/source/filter/xml/xmlfilter.hxx b/dbaccess/source/filter/xml/xmlfilter.hxx index c9547a779120..21226c19a9de 100644 --- a/dbaccess/source/filter/xml/xmlfilter.hxx +++ b/dbaccess/source/filter/xml/xmlfilter.hxx @@ -80,7 +80,6 @@ private: mutable rtl::Reference < XMLPropertySetMapper > m_xColumnStylesPropertySetMapper; mutable rtl::Reference < XMLPropertySetMapper > m_xCellStylesPropertySetMapper; Reference<XPropertySet> m_xDataSource; - sal_Int32 m_nPreviewMode; bool m_bNewFormat; bool implImport( const Sequence< PropertyValue >& rDescriptor ) throw (RuntimeException, std::exception); @@ -127,7 +126,6 @@ public: inline Reference<XPropertySet> getDataSource() const { return m_xDataSource; } inline const TPropertyNameMap& getQuerySettings() const { return m_aQuerySettings;} - inline const TPropertyNameMap& getTableSettings() const { return m_aTablesSettings;} const SvXMLTokenMap& GetDocElemTokenMap() const; const SvXMLTokenMap& GetDatabaseElemTokenMap() const; @@ -154,8 +152,6 @@ public: void setPropertyInfo(); - const ::std::map< sal_uInt16,css::beans::Property>& GetDataSourceInfoDefaulValueMap() const; - inline bool isNewFormat() const { return m_bNewFormat; } inline void setNewFormat(bool _bNewFormat) { m_bNewFormat = _bNewFormat; } }; diff --git a/dbaccess/source/ui/app/AppController.hxx b/dbaccess/source/ui/app/AppController.hxx index 7e4c664f7999..ada71a0b3b40 100644 --- a/dbaccess/source/ui/app/AppController.hxx +++ b/dbaccess/source/ui/app/AppController.hxx @@ -394,10 +394,6 @@ namespace dbaui protected: // initalizing members - /** forces usage of a connection which we do not own - <p>To be used from within XInitialization::initialize only.</p> - */ - void initializeConnection( const css::uno::Reference< css::sdbc::XConnection >& _rxForeignConn ); // state of a feature. 'feature' may be the handle of a css::util::URL somebody requested a dispatch interface for OR a toolbar slot. virtual FeatureState GetState(sal_uInt16 nId) const SAL_OVERRIDE; @@ -484,9 +480,6 @@ namespace dbaui /// determines whether we're currently connected to the database bool isConnected() const { return m_xDataSourceConnection.is(); } - const css::uno::Reference< css::sdbc::XDatabaseMetaData >& - getConnectionMetaData() const { return m_xMetaData; } - /** refreshes the tables */ void refreshTables(); diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.hxx b/dbaccess/source/ui/app/AppDetailPageHelper.hxx index d6c73cfcd261..31e71c5119b6 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.hxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.hxx @@ -159,7 +159,6 @@ namespace dbaui DECL_LINK( OnPasteEntry, void* ); DECL_LINK( OnDeleteEntry, void* ); - DECL_LINK(PreviewChangeHdl, void*); // click a TB slot DECL_LINK_TYPED(OnDropdownClickHdl, ToolBox*, void); diff --git a/dbaccess/source/ui/app/AppDetailView.hxx b/dbaccess/source/ui/app/AppDetailView.hxx index 9e0bf5055922..bf578274c483 100644 --- a/dbaccess/source/ui/app/AppDetailView.hxx +++ b/dbaccess/source/ui/app/AppDetailView.hxx @@ -195,7 +195,6 @@ namespace dbaui bool isCutAllowed() SAL_OVERRIDE ; bool isCopyAllowed() SAL_OVERRIDE ; bool isPasteAllowed() SAL_OVERRIDE; - virtual bool hasChildPathFocus() SAL_OVERRIDE { return HasChildPathFocus(); } void copy() SAL_OVERRIDE; void cut() SAL_OVERRIDE; void paste() SAL_OVERRIDE; diff --git a/dbaccess/source/ui/app/AppIconControl.hxx b/dbaccess/source/ui/app/AppIconControl.hxx index 54a9c1a30954..b5a135cc2cf7 100644 --- a/dbaccess/source/ui/app/AppIconControl.hxx +++ b/dbaccess/source/ui/app/AppIconControl.hxx @@ -37,7 +37,6 @@ namespace dbaui virtual void dispose() SAL_OVERRIDE; void setControlActionListener( IControlActionListener* _pListener ) { m_pActionListener = _pListener; } - IControlActionListener* getControlActionListener( ) const { return m_pActionListener; } protected: // DropTargetHelper overridables diff --git a/dbaccess/source/ui/app/AppSwapWindow.hxx b/dbaccess/source/ui/app/AppSwapWindow.hxx index 077bc165a219..11f04fc9aef8 100644 --- a/dbaccess/source/ui/app/AppSwapWindow.hxx +++ b/dbaccess/source/ui/app/AppSwapWindow.hxx @@ -51,7 +51,6 @@ namespace dbaui bool isCutAllowed() SAL_OVERRIDE { return false; } bool isCopyAllowed() SAL_OVERRIDE { return false; } bool isPasteAllowed() SAL_OVERRIDE { return false; } - virtual bool hasChildPathFocus() SAL_OVERRIDE { return HasChildPathFocus(); } void copy() SAL_OVERRIDE { } void cut() SAL_OVERRIDE { } void paste() SAL_OVERRIDE { } diff --git a/dbaccess/source/ui/app/AppView.hxx b/dbaccess/source/ui/app/AppView.hxx index 5392c030fafc..1ff50802b01e 100644 --- a/dbaccess/source/ui/app/AppView.hxx +++ b/dbaccess/source/ui/app/AppView.hxx @@ -117,13 +117,11 @@ namespace dbaui virtual void GetFocus() SAL_OVERRIDE; inline IApplicationController& getAppController() const { return m_rAppController; } - inline const css::lang::Locale& getLocale() const { return m_aLocale;} // IClipboardTest virtual bool isCutAllowed() SAL_OVERRIDE; virtual bool isCopyAllowed() SAL_OVERRIDE; virtual bool isPasteAllowed() SAL_OVERRIDE; - virtual bool hasChildPathFocus() SAL_OVERRIDE { return HasChildPathFocus(); } virtual void copy() SAL_OVERRIDE; virtual void cut() SAL_OVERRIDE; virtual void paste() SAL_OVERRIDE; diff --git a/dbaccess/source/ui/inc/IClipBoardTest.hxx b/dbaccess/source/ui/inc/IClipBoardTest.hxx index b44ec42b095a..428116704717 100644 --- a/dbaccess/source/ui/inc/IClipBoardTest.hxx +++ b/dbaccess/source/ui/inc/IClipBoardTest.hxx @@ -29,8 +29,6 @@ namespace dbaui virtual bool isCopyAllowed() = 0; virtual bool isPasteAllowed() = 0; - virtual bool hasChildPathFocus() = 0; - virtual void copy() = 0; virtual void cut() = 0; virtual void paste() = 0; diff --git a/dbaccess/source/ui/inc/TableDesignHelpBar.hxx b/dbaccess/source/ui/inc/TableDesignHelpBar.hxx index bcc79095dec8..d78f3605cd1d 100644 --- a/dbaccess/source/ui/inc/TableDesignHelpBar.hxx +++ b/dbaccess/source/ui/inc/TableDesignHelpBar.hxx @@ -52,7 +52,6 @@ namespace dbaui virtual bool isCutAllowed() SAL_OVERRIDE; virtual bool isCopyAllowed() SAL_OVERRIDE; virtual bool isPasteAllowed() SAL_OVERRIDE; - virtual bool hasChildPathFocus() SAL_OVERRIDE { return HasChildPathFocus(); } virtual void copy() SAL_OVERRIDE; virtual void cut() SAL_OVERRIDE; diff --git a/dbaccess/source/ui/inc/TableDesignView.hxx b/dbaccess/source/ui/inc/TableDesignView.hxx index 863628c153f3..8b960403a723 100644 --- a/dbaccess/source/ui/inc/TableDesignView.hxx +++ b/dbaccess/source/ui/inc/TableDesignView.hxx @@ -94,7 +94,6 @@ namespace dbaui virtual bool isCutAllowed() SAL_OVERRIDE; virtual bool isCopyAllowed() SAL_OVERRIDE; virtual bool isPasteAllowed() SAL_OVERRIDE; - virtual bool hasChildPathFocus() SAL_OVERRIDE { return HasChildPathFocus(); } virtual void copy() SAL_OVERRIDE; virtual void cut() SAL_OVERRIDE; virtual void paste() SAL_OVERRIDE; diff --git a/dbaccess/source/ui/inc/brwctrlr.hxx b/dbaccess/source/ui/inc/brwctrlr.hxx index 68cb712ce317..7c1dfef21e6a 100644 --- a/dbaccess/source/ui/inc/brwctrlr.hxx +++ b/dbaccess/source/ui/inc/brwctrlr.hxx @@ -139,9 +139,6 @@ namespace dbaui void onStartLoading( const css::uno::Reference< css::form::XLoadable >& _rxLoadable ); void setLoadingCancelled() { m_bLoadCanceled = true; } - const TransferableDataHelper& - getViewClipboard() const { return m_aSystemClipboard; } - public: SbaXDataBrowserController(const css::uno::Reference< css::uno::XComponentContext >& _rM); diff --git a/dbaccess/source/ui/inc/dbtreelistbox.hxx b/dbaccess/source/ui/inc/dbtreelistbox.hxx index a47af3e632d9..437bdd88b283 100644 --- a/dbaccess/source/ui/inc/dbtreelistbox.hxx +++ b/dbaccess/source/ui/inc/dbtreelistbox.hxx @@ -95,8 +95,6 @@ namespace dbaui void setCopyHandler(const Link<>& _rHdl) { m_aCopyHandler = _rHdl; } void setPasteHandler(const Link<>& _rHdl) { m_aPasteHandler = _rHdl; } void setDeleteHandler(const Link<>& _rHdl) { m_aDeleteHandler = _rHdl; } - void setEditingHandler(const Link<>& _rHdl) { m_aEditingHandler = _rHdl; } - void setEditedHandler(const Link<>& _rHdl) { m_aEditedHandler = _rHdl; } // modified the given entry so that the expand handler is called whenever the entry is expanded // (normally, the expand handler is called only once) diff --git a/dbaccess/source/ui/inc/sbagrid.hxx b/dbaccess/source/ui/inc/sbagrid.hxx index c4019306a9fb..d12fb09d27af 100644 --- a/dbaccess/source/ui/inc/sbagrid.hxx +++ b/dbaccess/source/ui/inc/sbagrid.hxx @@ -215,18 +215,15 @@ namespace dbaui // Attributes protected: svx::ODataAccessDescriptor m_aDataDescriptor; - SbaGridListener* m_pMasterListener; + SbaGridListener* m_pMasterListener; - ImplSVEvent * m_nAsyncDropEvent; + ImplSVEvent * m_nAsyncDropEvent; - sal_uInt16 m_nCurrentActionColId; + sal_uInt16 m_nCurrentActionColId; // ui actions (e.g. a context menu) may be performed on columns which aren't the current one // and aren't selected, so we have to track this column id - bool m_bActivatingForDrop; - // Attribute Access - public: - sal_uInt16 GetCurrentActionColumn() const { return m_nCurrentActionColId; } + bool m_bActivatingForDrop; public: SbaGridControl(css::uno::Reference< css::uno::XComponentContext >,Window* pParent, FmXGridPeer* _pPeer, WinBits nBits = WB_TABSTOP); diff --git a/dbaccess/source/ui/inc/tabletree.hxx b/dbaccess/source/ui/inc/tabletree.hxx index 4cd9f8f8a8e6..ea35a8609167 100644 --- a/dbaccess/source/ui/inc/tabletree.hxx +++ b/dbaccess/source/ui/inc/tabletree.hxx @@ -63,13 +63,6 @@ public: */ static bool isFolderEntry( const SvTreeListEntry* _pEntry ); - /** determines whether the given entry denotes a table or view - */ - static bool isTableOrViewEntry( const SvTreeListEntry* _pEntry ) - { - return !isFolderEntry( _pEntry ); - } - /** fill the table list with the tables belonging to the connection described by the parameters @param _rxConnection the connection, which must support the service com.sun.star.sdb.Connection diff --git a/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx b/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx index 15eed590dbb5..c80a54ce3c1e 100644 --- a/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx +++ b/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx @@ -62,7 +62,6 @@ namespace dbaui virtual bool isCutAllowed() SAL_OVERRIDE; virtual bool isCopyAllowed() SAL_OVERRIDE; virtual bool isPasteAllowed() SAL_OVERRIDE; - virtual bool hasChildPathFocus() SAL_OVERRIDE { return HasChildPathFocus(); } virtual void copy() SAL_OVERRIDE; virtual void cut() SAL_OVERRIDE; diff --git a/dbaccess/source/ui/tabledesign/TEditControl.hxx b/dbaccess/source/ui/tabledesign/TEditControl.hxx index 7a714ef6807f..c85cb511df22 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.hxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.hxx @@ -169,7 +169,6 @@ namespace dbaui virtual bool isCutAllowed() SAL_OVERRIDE { return IsCutAllowed(); } virtual bool isCopyAllowed() SAL_OVERRIDE { return IsCopyAllowed(); } virtual bool isPasteAllowed() SAL_OVERRIDE { return IsPasteAllowed(); } - virtual bool hasChildPathFocus() SAL_OVERRIDE { return HasChildPathFocus(); } virtual void cut() SAL_OVERRIDE; virtual void copy() SAL_OVERRIDE; diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx index f38f0fd99c26..e300a483500c 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx +++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx @@ -83,7 +83,6 @@ namespace dbaui virtual bool isCutAllowed() SAL_OVERRIDE; virtual bool isCopyAllowed() SAL_OVERRIDE; virtual bool isPasteAllowed() SAL_OVERRIDE; - virtual bool hasChildPathFocus() SAL_OVERRIDE { return HasChildPathFocus(); } virtual void copy() SAL_OVERRIDE; virtual void cut() SAL_OVERRIDE; diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx index bb199c0c3f51..793a85eb1331 100644 --- a/editeng/source/editeng/impedit.hxx +++ b/editeng/source/editeng/impedit.hxx @@ -939,8 +939,6 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellAlternatives > ImpFindNextError(EditSelection& rSelection); - //initialize sentence spelling - void StartSpelling(EditView& rEditView, bool bMultipleDoc); //spell and return a sentence bool SpellSentence(EditView& rView, svx::SpellPortions& rToFill, bool bIsGrammarChecking ); //put spelling back to start of current sentence - needed after switch of grammar support diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx index 1fbb791f5b14..4f4045cfe72e 100644 --- a/editeng/source/editeng/impedit4.cxx +++ b/editeng/source/editeng/impedit4.cxx @@ -1901,13 +1901,6 @@ Reference< XSpellAlternatives > ImpEditEngine::ImpSpell( EditView* pEditView ) return xSpellAlt; } -void ImpEditEngine::StartSpelling(EditView& rEditView, bool bMultipleDoc) -{ - DBG_ASSERT(!pSpellInfo, "pSpellInfo already set?"); - rEditView.pImpEditView->SetEditSelection( aEditDoc.GetStartPaM() ); - pSpellInfo = CreateSpellInfo( bMultipleDoc ); -} - Reference< XSpellAlternatives > ImpEditEngine::ImpFindNextError(EditSelection& rSelection) { EditSelection aCurSel( rSelection.Min() ); diff --git a/extensions/source/plugin/aqua/sysplug.mm b/extensions/source/plugin/aqua/sysplug.mm index 27134d038360..ad6210026851 100644 --- a/extensions/source/plugin/aqua/sysplug.mm +++ b/extensions/source/plugin/aqua/sysplug.mm @@ -761,24 +761,6 @@ NPError MacPluginComm::NPP_GetValue( NPP instance, NPPVariable variable, void *r } -NPError MacPluginComm::NPP_SetValue( NPP instance, NPNVariable variable, void *set_value ) -{ - DBG_ASSERT( m_aNPPfuncs.setvalue, "### NPP_SetValue(): null pointer in NPP functions table!" ); - m_eCall = eNPP_SetValue; - m_aArgs[0] = (void*)instance; - m_aArgs[1] = (void*)variable; - m_aArgs[2] = set_value; - return (NPError)execute(); -} - - -void * MacPluginComm::NPP_GetJavaClass() -{ - OSL_FAIL( "no java class available!" ); - return 0; -} - - NPError MacPluginComm::NPP_Initialize() { return NPERR_NO_ERROR; diff --git a/extensions/source/plugin/inc/plugin/aqua/sysplug.hxx b/extensions/source/plugin/inc/plugin/aqua/sysplug.hxx index 9c1f5cc53f14..a9b752244c7a 100644 --- a/extensions/source/plugin/inc/plugin/aqua/sysplug.hxx +++ b/extensions/source/plugin/inc/plugin/aqua/sysplug.hxx @@ -116,7 +116,6 @@ public: public: virtual NPError NPP_Destroy( NPP instance, NPSavedData** save ); virtual NPError NPP_DestroyStream( NPP instance, NPStream* stream, NPError reason ); - virtual void * NPP_GetJavaClass(); virtual NPError NPP_Initialize(); virtual NPError NPP_New( NPMIMEType pluginType, NPP instance, uint16_t mode, int16_t argc, char* argn[], char* argv[], NPSavedData *saved ); @@ -132,7 +131,6 @@ public: int32_t len, void* buffer ); virtual int32_t NPP_WriteReady( NPP instance, NPStream* stream ); virtual NPError NPP_GetValue( NPP instance, NPPVariable variable, void *ret_value ); - virtual NPError NPP_SetValue( NPP instance, NPNVariable variable, void *ret_value ); virtual int16_t NPP_HandleEvent( NPP instance, void* event ); virtual NPError NPP_SetWindow( XPlugin_Impl* ); diff --git a/extensions/source/plugin/inc/plugin/impl.hxx b/extensions/source/plugin/inc/plugin/impl.hxx index 80c45a7a6f8c..fdd05b7188b5 100644 --- a/extensions/source/plugin/inc/plugin/impl.hxx +++ b/extensions/source/plugin/inc/plugin/impl.hxx @@ -198,7 +198,6 @@ public: rtl_TextEncoding getTextEncoding() { return m_aEncoding; } NPP_t& getNPPInstance() { return m_aInstance; } NPWindow& getNPWindow() { return m_aNPWindow; } - SysPlugData& getSysPlugData() { return *m_pSysPlugData; } void enterPluginCallback() { m_nCalledFromPlugin++; } void leavePluginCallback() { m_nCalledFromPlugin--; } @@ -232,10 +231,6 @@ public: { return m_rBrowserContext; } void setPluginContext( const Reference< com::sun::star::plugin::XPluginContext > & ); - void secondLevelDispose(); - -// static const Reference< com::sun::star::reflection::XIdlClass > & staticGetIdlClass(); - // XInterface virtual Any SAL_CALL queryInterface( const Type& ) throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL acquire() throw() SAL_OVERRIDE @@ -340,7 +335,6 @@ public: virtual ~PluginStream(); NPStream& getStream() { return m_aNPStream; } - XPlugin_Impl* getPlugin() { return m_pPlugin; } virtual PluginStreamType getStreamType() = 0; }; diff --git a/extensions/source/plugin/inc/plugin/model.hxx b/extensions/source/plugin/inc/plugin/model.hxx index b5ac5477b9fc..bd1f2a22e7d0 100644 --- a/extensions/source/plugin/inc/plugin/model.hxx +++ b/extensions/source/plugin/inc/plugin/model.hxx @@ -54,9 +54,6 @@ public: BroadcasterHelperHolder( osl::Mutex& rMutex ) : m_aHelper( rMutex ) {} ~BroadcasterHelperHolder() {} - - ::cppu::OBroadcastHelper& getHelper() { return m_aHelper; } - }; class PluginModel : public BroadcasterHelperHolder, @@ -84,10 +81,6 @@ class PluginModel : public BroadcasterHelperHolder, PluginModel( const OUString& rURL, const OUString& rMimeType ); virtual ~PluginModel(); - - const OUString& getCreationURL() { return m_aCreationURL; } - void setMimeType( const OUString& rMime ) { m_aMimeType = rMime; } - // XInterface virtual Any SAL_CALL queryInterface( const Type& rType ) throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE { return OWeakAggObject::queryInterface( rType ); } diff --git a/extensions/source/plugin/inc/plugin/plcom.hxx b/extensions/source/plugin/inc/plugin/plcom.hxx index 883a5a5122ce..213c6c494a96 100644 --- a/extensions/source/plugin/inc/plugin/plcom.hxx +++ b/extensions/source/plugin/inc/plugin/plcom.hxx @@ -42,12 +42,10 @@ public: PluginComm( const OString& rLibName, bool bReusable = true ); virtual ~PluginComm(); - int getRefCount() { return m_nRefCount; } void addRef() { m_nRefCount++; } void decRef() { m_nRefCount--; if( ! m_nRefCount ) delete this; } const OString& getLibName() { return m_aLibName; } - void setLibName( const OString& rName ) { m_aLibName = rName; } void addFileToDelete( const OUString& filename ) { m_aFilesToDelete.push_back( filename ); } @@ -55,7 +53,6 @@ public: virtual NPError NPP_Destroy( NPP instance, NPSavedData** save ) = 0; virtual NPError NPP_DestroyStream( NPP instance, NPStream* stream, NPError reason ) = 0; - virtual void* NPP_GetJavaClass() = 0; virtual NPError NPP_Initialize() = 0; virtual NPError NPP_New( NPMIMEType pluginType, NPP instance, uint16_t mode, int16_t argc, @@ -64,7 +61,6 @@ public: virtual NPError NPP_NewStream( NPP instance, NPMIMEType type, NPStream* stream, NPBool seekable, uint16_t* stype ) = 0; - virtual void NPP_Print( NPP instance, NPPrint* platformPrint ) = 0; virtual NPError NPP_SetWindow( NPP instance, NPWindow* window ) = 0; virtual void NPP_Shutdown() = 0; virtual void NPP_StreamAsFile( NPP instance, NPStream* stream, @@ -74,9 +70,6 @@ public: virtual int32_t NPP_Write( NPP instance, NPStream* stream, int32_t offset, int32_t len, void* buffer ) = 0; virtual int32_t NPP_WriteReady( NPP instance, NPStream* stream ) = 0; - virtual NPError NPP_GetValue( NPP instance, NPPVariable variable, void* value ) = 0; - virtual NPError NPP_SetValue( NPP instance, NPNVariable variable, - void *value) = 0; NPError NPP_SetWindow( XPlugin_Impl* ); NPError NPP_Destroy( XPlugin_Impl*, NPSavedData** save ); diff --git a/extensions/source/plugin/inc/plugin/unx/mediator.hxx b/extensions/source/plugin/inc/plugin/unx/mediator.hxx index ee4787c3994a..cdfc471fcac6 100644 --- a/extensions/source/plugin/inc/plugin/unx/mediator.hxx +++ b/extensions/source/plugin/inc/plugin/unx/mediator.hxx @@ -60,22 +60,11 @@ struct MediatorMessage delete [] m_pBytes; } - void Set( sal_uLong nBytes, char* pBytes ) - { - if( m_pBytes ) - delete [] m_pBytes; - m_nBytes = nBytes; - m_pBytes = new char[ m_nBytes ]; - memcpy( m_pBytes, pBytes, (size_t)m_nBytes ); - } - sal_uLong ExtractULONG(); - char* GetString(); + char* GetString(); sal_uInt32 GetUINT32(); - void* GetBytes( sal_uLong& ); - void* GetBytes() { sal_uLong nBytes; return GetBytes( nBytes ); } - - void Rewind() { m_pRun = NULL; } + void* GetBytes( sal_uLong& ); + void* GetBytes() { sal_uLong nBytes; return GetBytes( nBytes ); } }; class MediatorListener; @@ -110,10 +99,6 @@ public: void invalidate() { m_bValid = false; } sal_uLong SendMessage( sal_uLong nBytes, const char* pBytes, sal_uLong nMessageID = 0 ); - sal_uLong SendMessage( const OString& rMessage, sal_uLong nMessageID = 0 ) - { - return SendMessage( rMessage.getLength(), rMessage.getStr(), nMessageID ); - } bool WaitForMessage( sal_uLong nTimeOut = 5000 ); // timeout in ms diff --git a/extensions/source/plugin/inc/plugin/unx/sysplug.hxx b/extensions/source/plugin/inc/plugin/unx/sysplug.hxx index aac6e97e1745..b1ccb1e1283d 100644 --- a/extensions/source/plugin/inc/plugin/unx/sysplug.hxx +++ b/extensions/source/plugin/inc/plugin/unx/sysplug.hxx @@ -51,7 +51,6 @@ public: virtual NPError NPP_Destroy( NPP instance, NPSavedData** save ) SAL_OVERRIDE; virtual NPError NPP_DestroyStream( NPP instance, NPStream* stream, NPError reason ) SAL_OVERRIDE; - virtual void* NPP_GetJavaClass() SAL_OVERRIDE; virtual NPError NPP_Initialize() SAL_OVERRIDE; virtual NPError NPP_New( NPMIMEType pluginType, NPP instance, uint16_t mode, int16_t argc, @@ -59,7 +58,6 @@ public: virtual NPError NPP_NewStream( NPP instance, NPMIMEType type, NPStream* stream, NPBool seekable, uint16_t* stype ) SAL_OVERRIDE; - virtual void NPP_Print( NPP instance, NPPrint* platformPrint ) SAL_OVERRIDE; using PluginComm::NPP_SetWindow; virtual NPError NPP_SetWindow( NPP instance, NPWindow* window ) SAL_OVERRIDE; @@ -71,9 +69,6 @@ public: virtual int32_t NPP_Write( NPP instance, NPStream* stream, int32_t offset, int32_t len, void* buffer ) SAL_OVERRIDE; virtual int32_t NPP_WriteReady( NPP instance, NPStream* stream ) SAL_OVERRIDE; - virtual NPError NPP_GetValue( NPP instance, NPPVariable variable, void* value ) SAL_OVERRIDE; - virtual NPError NPP_SetValue( NPP instance, NPNVariable variable, - void *value) SAL_OVERRIDE; static bool getPluginappPath(OString * path); }; diff --git a/extensions/source/plugin/inc/plugin/win/sysplug.hxx b/extensions/source/plugin/inc/plugin/win/sysplug.hxx index 555d4004e3e2..3753212ac889 100644 --- a/extensions/source/plugin/inc/plugin/win/sysplug.hxx +++ b/extensions/source/plugin/inc/plugin/win/sysplug.hxx @@ -93,7 +93,6 @@ public: using PluginComm::NPP_Destroy; virtual NPError NPP_Destroy( NPP instance, NPSavedData** save ); virtual NPError NPP_DestroyStream( NPP instance, NPStream* stream, NPError reason ); - virtual void * NPP_GetJavaClass(); virtual NPError NPP_Initialize(); virtual NPError NPP_New( NPMIMEType pluginType, NPP instance, uint16_t mode, int16_t argc, char* argn[], char* argv[], NPSavedData *saved ); @@ -111,7 +110,6 @@ public: int32_t len, void* buffer ); virtual int32_t NPP_WriteReady( NPP instance, NPStream* stream ); virtual NPError NPP_GetValue( NPP instance, NPPVariable variable, void *ret_alue ); - virtual NPError NPP_SetValue( NPP instance, NPNVariable variable, void *ret_alue ); private: BOOL retrieveFunction( TCHAR const * pName, void** ppFunc ) const; diff --git a/extensions/source/plugin/unx/nppapi.cxx b/extensions/source/plugin/unx/nppapi.cxx index 9fbf3d3afd66..2ea3af174350 100644 --- a/extensions/source/plugin/unx/nppapi.cxx +++ b/extensions/source/plugin/unx/nppapi.cxx @@ -395,11 +395,6 @@ NPError UnxPluginComm::NPP_DestroyStream( NPP instance, NPStream* stream, NPErro return aRet; } -void* UnxPluginComm::NPP_GetJavaClass() -{ - return NULL; -} - NPError UnxPluginComm::NPP_Initialize() { MediatorMessage* pMes = @@ -503,10 +498,6 @@ NPError UnxPluginComm::NPP_NewStream( NPP instance, NPMIMEType type, NPStream* s return aRet; } -void UnxPluginComm::NPP_Print( NPP /*instance*/, NPPrint* /*platformPrint*/ ) -{ -} - NPError UnxPluginComm::NPP_SetWindow( NPP instance, NPWindow* window ) { NPError aRet = NPERR_GENERIC_ERROR; @@ -601,14 +592,4 @@ int32_t UnxPluginComm::NPP_WriteReady( NPP instance, NPStream* stream ) return aRet; } -NPError UnxPluginComm::NPP_GetValue( NPP /*instance*/, NPPVariable /*variable*/, void* /*value*/ ) -{ - return 0; -} - -NPError UnxPluginComm::NPP_SetValue( NPP /*instance*/, NPNVariable /*variable*/, void* /*value*/ ) -{ - return 0; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/plugin/win/sysplug.cxx b/extensions/source/plugin/win/sysplug.cxx index d34c80012295..58d8951b7d7e 100644 --- a/extensions/source/plugin/win/sysplug.cxx +++ b/extensions/source/plugin/win/sysplug.cxx @@ -418,24 +418,6 @@ NPError PluginComm_Impl::NPP_GetValue( NPP instance, NPPVariable variable, void } -NPError PluginComm_Impl::NPP_SetValue( NPP instance, NPNVariable variable, void *set_value ) -{ - DBG_ASSERT( _NPPfuncs.setvalue, "### NPP_SetValue(): null pointer in NPP functions table!" ); - m_eCall = eNPP_SetValue; - m_aArgs[0] = (void*)instance; - m_aArgs[1] = (void*)variable; - m_aArgs[2] = set_value; - return (NPError)execute(); -} - - -void * PluginComm_Impl::NPP_GetJavaClass() -{ - OSL_FAIL( "no java class available!" ); - return 0; -} - - NPError PluginComm_Impl::NPP_Initialize() { return NPERR_NO_ERROR; diff --git a/extensions/source/propctrlr/propcontroller.hxx b/extensions/source/propctrlr/propcontroller.hxx index f204a86c8735..4d04ecb5faff 100644 --- a/extensions/source/propctrlr/propcontroller.hxx +++ b/extensions/source/propctrlr/propcontroller.hxx @@ -272,8 +272,6 @@ namespace pcr return ( m_aDependencyHandlers.find( _rPropertyName ) != m_aDependencyHandlers.end() ); } - sal_uInt32 GetPropertyPos(const OUString& _rPropName); - /** retrieves the value of the given property, by asking the appropriate XPropertyHandler @param _rPropertyName the name whose handler is to be obtained. Must be the name of a property diff --git a/extensions/source/propctrlr/sqlcommanddesign.hxx b/extensions/source/propctrlr/sqlcommanddesign.hxx index 41bb74e5e85f..43c1cdfcb2ea 100644 --- a/extensions/source/propctrlr/sqlcommanddesign.hxx +++ b/extensions/source/propctrlr/sqlcommanddesign.hxx @@ -170,15 +170,6 @@ namespace pcr */ bool impl_trySuspendDesigner_nothrow() const; - /** gets the current value of the command property - */ - OUString - impl_getCommandPropertyValue_nothrow(); - - /** sets anew value for the command property - */ - void impl_setCommandPropertyValue_nothrow( const OUString& _rCommand ) const; - private: SQLCommandDesigner( const SQLCommandDesigner& ) SAL_DELETED_FUNCTION; SQLCommandDesigner& operator=( const SQLCommandDesigner& ) SAL_DELETED_FUNCTION; diff --git a/extensions/source/propctrlr/standardcontrol.hxx b/extensions/source/propctrlr/standardcontrol.hxx index aa8e6aff5fd9..c85ef521935c 100644 --- a/extensions/source/propctrlr/standardcontrol.hxx +++ b/extensions/source/propctrlr/standardcontrol.hxx @@ -175,7 +175,6 @@ namespace pcr when the hyperlink has been clicked by the user */ void SetClickHdl( const Link<>& _rHdl ) { m_aClickHandler = _rHdl; } - const Link<>& GetClickHdl( ) const { return m_aClickHandler; } protected: virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; diff --git a/extensions/source/propctrlr/xsddatatypes.hxx b/extensions/source/propctrlr/xsddatatypes.hxx index cc1dd243ba80..37f92bba5c4e 100644 --- a/extensions/source/propctrlr/xsddatatypes.hxx +++ b/extensions/source/propctrlr/xsddatatypes.hxx @@ -49,9 +49,6 @@ namespace pcr ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > m_xFacetInfo; - protected: - inline ::com::sun::star::xsd::XDataType* getDataTypeInterface() const { return m_xDataType.get(); } - public: XSDDataType( const ::com::sun::star::uno::Reference< ::com::sun::star::xsd::XDataType >& _rxDataType diff --git a/extensions/source/scanner/scanner.hxx b/extensions/source/scanner/scanner.hxx index e7384e8ec476..70434d6fe6c4 100644 --- a/extensions/source/scanner/scanner.hxx +++ b/extensions/source/scanner/scanner.hxx @@ -81,7 +81,9 @@ public: static OUString getImplementationName_Static() throw(); static Sequence< OUString > getSupportedServiceNames_Static() throw(); +#ifdef WIN32 void* GetData() const { return mpData; } +#endif void SetData( void* pData ) { ReleaseData(); mpData = pData; } }; diff --git a/extensions/source/update/check/download.hxx b/extensions/source/update/check/download.hxx index db3968f9163b..a8285d0f8459 100644 --- a/extensions/source/update/check/download.hxx +++ b/extensions/source/update/check/download.hxx @@ -64,10 +64,6 @@ public: // stops the download after the next write operation void stop(); - // returns true if the stop condition is set - bool isStopped() const - { return const_cast <Download *> (this)->m_aCondition.check(); }; - protected: // Determines the appropriate proxy settings for the given URL. Returns true if a proxy should be used diff --git a/fpicker/source/office/iodlgimp.hxx b/fpicker/source/office/iodlgimp.hxx index 243f6afa620e..008bda646800 100644 --- a/fpicker/source/office/iodlgimp.hxx +++ b/fpicker/source/office/iodlgimp.hxx @@ -120,9 +120,6 @@ class SvtURLBox; class SvtExpFileDlg_Impl { private: - DECL_STATIC_LINK( SvtExpFileDlg_Impl, UnClickHdl, Button* ); - -private: const SvtFileDialogFilter_Impl* _pCurFilter; OUString m_sCurrentFilterDisplayName; // may differ from _pCurFilter->GetName in case it is a cached entry diff --git a/framework/inc/macros/xserviceinfo.hxx b/framework/inc/macros/xserviceinfo.hxx index 22fd2015ab79..514f3c8249d8 100644 --- a/framework/inc/macros/xserviceinfo.hxx +++ b/framework/inc/macros/xserviceinfo.hxx @@ -145,14 +145,14 @@ namespace framework{ #define DECLARE_XSERVICEINFO_NOFACTORY \ /* interface XServiceInfo */ \ - virtual OUString SAL_CALL getImplementationName ( ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; \ - virtual sal_Bool SAL_CALL supportsService ( const OUString& sServiceName ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; \ - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames ( ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; \ - /* Helper for XServiceInfo */ \ - static css::uno::Sequence< OUString > SAL_CALL impl_getStaticSupportedServiceNames( ); \ - static OUString SAL_CALL impl_getStaticImplementationName ( ); \ - /* Helper for initialization of service by using own reference! */ \ - virtual void SAL_CALL impl_initService ( ); \ + virtual OUString SAL_CALL getImplementationName ( ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; \ + virtual sal_Bool SAL_CALL supportsService ( const OUString& sServiceName ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; \ + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames ( ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; \ + /* Helper for XServiceInfo */ \ + static css::uno::Sequence< OUString > SAL_CALL impl_getStaticSupportedServiceNames( ); \ + static OUString SAL_CALL impl_getStaticImplementationName ( ); \ + /* Helper for initialization of service by using own reference! */ \ + virtual void SAL_CALL impl_initService ( ); \ #define DECLARE_XSERVICEINFO \ DECLARE_XSERVICEINFO_NOFACTORY \ diff --git a/framework/inc/tabwin/tabwindow.hxx b/framework/inc/tabwin/tabwindow.hxx index e693ae20bb26..9bdc6a827b21 100644 --- a/framework/inc/tabwin/tabwindow.hxx +++ b/framework/inc/tabwin/tabwindow.hxx @@ -139,8 +139,6 @@ class TabWindow : public ::com::sun::star::lang::XTypeProvider , NOTIFY_DEACTIVATED }; - sal_Int32 impl_GetPageIdFromIndex( ::sal_Int32 nIndex ) const; - bool impl_CheckIndex( ::sal_Int32 nIndex ) const; void implts_LayoutWindows() const; void impl_SetTitle( const OUString& rTitle ); TabControl* impl_GetTabControl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& xTabControlWindow ) const; diff --git a/framework/inc/uielement/macrosmenucontroller.hxx b/framework/inc/uielement/macrosmenucontroller.hxx index d8803971beeb..c81f0e412cd1 100644 --- a/framework/inc/uielement/macrosmenucontroller.hxx +++ b/framework/inc/uielement/macrosmenucontroller.hxx @@ -50,7 +50,6 @@ namespace framework ::com::sun::star::util::URL aTargetURL; ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs; }; - DECL_STATIC_LINK( MacrosMenuController, ExecuteHdl_Impl, ExecuteInfo* ); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > m_xDispatchProvider; OUString m_aModuleIdentifier; diff --git a/framework/inc/uifactory/configurationaccessfactorymanager.hxx b/framework/inc/uifactory/configurationaccessfactorymanager.hxx index 26349235e8ec..b704d7e0f703 100644 --- a/framework/inc/uifactory/configurationaccessfactorymanager.hxx +++ b/framework/inc/uifactory/configurationaccessfactorymanager.hxx @@ -62,10 +62,6 @@ namespace framework { OUStringHash, std::equal_to< OUString > > { - inline void free() - { - FactoryManagerMap().swap( *this );// get rid of reserved capacity - } }; bool impl_getElementProps( const ::com::sun::star::uno::Any& rElement, OUString& rType, OUString& rName, OUString& rModule, OUString& rServiceSpecifier ) const; diff --git a/framework/inc/uifactory/factoryconfiguration.hxx b/framework/inc/uifactory/factoryconfiguration.hxx index d63bdc201882..a913129431d2 100644 --- a/framework/inc/uifactory/factoryconfiguration.hxx +++ b/framework/inc/uifactory/factoryconfiguration.hxx @@ -78,10 +78,6 @@ private: OUStringHash, std::equal_to< OUString > > { - inline void free() - { - MenuControllerMap().swap( *this );// get rid of reserved capacity - } }; bool impl_getElementProps( const ::com::sun::star::uno::Any& aElement, OUString& aCommand, OUString& aModule, OUString& aServiceSpecifier,OUString& aValue ) const; diff --git a/framework/inc/xml/imagesdocumenthandler.hxx b/framework/inc/xml/imagesdocumenthandler.hxx index fcdaa6a1874b..abc52a3461b3 100644 --- a/framework/inc/xml/imagesdocumenthandler.hxx +++ b/framework/inc/xml/imagesdocumenthandler.hxx @@ -113,11 +113,6 @@ class OReadImagesDocumentHandler : public ::cppu::WeakImplHelper1< ::com::sun::s OUStringHash, std::equal_to< OUString > > { - public: - inline void free() - { - ImageHashMap().swap( *this );// get rid of reserved capacity - } }; bool m_bImageContainerStartFound; diff --git a/framework/source/uiconfiguration/imagemanagerimpl.hxx b/framework/source/uiconfiguration/imagemanagerimpl.hxx index a72e8274bb43..fac7f3533904 100644 --- a/framework/source/uiconfiguration/imagemanagerimpl.hxx +++ b/framework/source/uiconfiguration/imagemanagerimpl.hxx @@ -66,7 +66,6 @@ namespace framework 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;} private: diff --git a/framework/source/uielement/macrosmenucontroller.cxx b/framework/source/uielement/macrosmenucontroller.cxx index adc215eda5fa..132771b07f54 100644 --- a/framework/source/uielement/macrosmenucontroller.cxx +++ b/framework/source/uielement/macrosmenucontroller.cxx @@ -122,22 +122,6 @@ void SAL_CALL MacrosMenuController::statusChanged( const FeatureStateEvent& ) th } } -IMPL_STATIC_LINK( MacrosMenuController, ExecuteHdl_Impl, ExecuteInfo*, pExecuteInfo ) -{ - try - { - // Asynchronous execution as this can lead to our own destruction! - // Framework can recycle our current frame and the layout manager disposes all user interface - // elements if a component gets detached from its frame! - pExecuteInfo->xDispatch->dispatch( pExecuteInfo->aTargetURL, pExecuteInfo->aArgs ); - } - catch ( const Exception& ) - { - } - delete pExecuteInfo; - return 0; -} - OUString MacrosMenuController::RetrieveLabelFromCommand(const OUString& rCmdURL) { bool bModuleIdentified = !m_aModuleIdentifier.isEmpty(); diff --git a/hwpfilter/source/hpara.h b/hwpfilter/source/hpara.h index 4b082eaf5efe..e9886656abc9 100644 --- a/hwpfilter/source/hpara.h +++ b/hwpfilter/source/hpara.h @@ -135,21 +135,10 @@ class DLLEXPORT HWPPara */ HWPPara *Next(void) { return _next;} - int HomePos(int line) const; - private: HBox *readHBox(HWPFile &); }; -// inline functions - -inline int HWPPara::HomePos(int line) const -{ - if( nline < line + 1 ) return nch; - return linfo[line].pos; -} - - #endif // INCLUDED_HWPFILTER_SOURCE_HPARA_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/idl/inc/database.hxx b/idl/inc/database.hxx index 087356b7e904..8871c39fc216 100644 --- a/idl/inc/database.hxx +++ b/idl/inc/database.hxx @@ -44,7 +44,6 @@ public: const OString& GetText() const { return aText; } void SetText( const OString& rT ) { aText = rT; } bool IsError() const { return nLine != 0; } - void Clear() { nLine = nColumn = 0; } SvIdlError & operator = ( const SvIdlError & rRef ) { aText = rRef.aText; nLine = rRef.nLine; diff --git a/idlc/inc/idlc/astattribute.hxx b/idlc/inc/idlc/astattribute.hxx index 173c393d912c..733dbd9e2419 100644 --- a/idlc/inc/idlc/astattribute.hxx +++ b/idlc/inc/idlc/astattribute.hxx @@ -73,10 +73,6 @@ public: { return ((m_flags & AF_READONLY) == AF_READONLY); } bool isOptional() const { return ((m_flags & AF_OPTIONAL) == AF_OPTIONAL); } - bool isAttribute() const - { return ((m_flags & AF_ATTRIBUTE) == AF_ATTRIBUTE); } - bool isProperty() const - { return ((m_flags & AF_PROPERTY) == AF_PROPERTY); } bool isBound() const { return ((m_flags & AF_BOUND) == AF_BOUND); } bool isMayBeVoid() const diff --git a/include/connectivity/PColumn.hxx b/include/connectivity/PColumn.hxx index e5b4c73db2d5..741fe412bf8a 100644 --- a/include/connectivity/PColumn.hxx +++ b/include/connectivity/PColumn.hxx @@ -81,15 +81,8 @@ namespace connectivity void setFunction(bool _bFunction) { m_bFunction = _bFunction; } void setAggregateFunction(bool _bFunction) { m_bAggregateFunction = _bFunction; } void setIsSearchable( bool _bIsSearchable ) { m_bIsSearchable = _bIsSearchable; } - void setDbasePrecisionChanged(bool _bDbasePrecisionChanged) { m_bDbasePrecisionChanged = _bDbasePrecisionChanged; } - const OUString& getRealName() const { return m_aRealName; } - const OUString& getLabel() const { return m_sLabel; } - const OUString& getTableName() const { return m_TableName; } - bool getFunction() const { return m_bFunction; } - bool getDbasePrecisionChanged() const { return m_bDbasePrecisionChanged; } - public: /** creates a collection of OParseColumn, as described by a result set meta data instance. */ static ::rtl::Reference< OSQLColumns > diff --git a/include/connectivity/formattedcolumnvalue.hxx b/include/connectivity/formattedcolumnvalue.hxx index 4ce1309a9fea..f946ce264305 100644 --- a/include/connectivity/formattedcolumnvalue.hxx +++ b/include/connectivity/formattedcolumnvalue.hxx @@ -79,13 +79,9 @@ namespace dbtools void clear(); // access to the details of the formatting we determined - sal_Int32 getFormatKey() const; - sal_Int32 getFieldType() const; sal_Int16 getKeyType() const; const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& getColumn() const; - const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumnUpdate >& - getColumnUpdate() const; bool setFormattedValue( const OUString& _rFormattedStringValue ) const; OUString getFormattedValue() const; diff --git a/include/connectivity/sdbcx/VCollection.hxx b/include/connectivity/sdbcx/VCollection.hxx index b056ddd92459..54e5a386b2d0 100644 --- a/include/connectivity/sdbcx/VCollection.hxx +++ b/include/connectivity/sdbcx/VCollection.hxx @@ -78,7 +78,6 @@ namespace connectivity virtual void disposeAndErase(sal_Int32 _nIndex) = 0; virtual void disposeElements() = 0; virtual sal_Int32 findColumn( const OUString& columnName ) = 0; - virtual OUString findColumnAtIndex( sal_Int32 _nIndex) = 0; virtual ObjectType getObject(sal_Int32 _nIndex) = 0; virtual ObjectType getObject(const OUString& columnName) = 0; virtual void setObject(sal_Int32 _nIndex,const ObjectType& _xObject) = 0; diff --git a/include/connectivity/sqliterator.hxx b/include/connectivity/sqliterator.hxx index be8274a8e607..0a9fd32e0460 100644 --- a/include/connectivity/sqliterator.hxx +++ b/include/connectivity/sqliterator.hxx @@ -215,7 +215,6 @@ namespace connectivity ::rtl::Reference<OSQLColumns> getGroupColumns() const { return m_aGroupColumns;} ::rtl::Reference<OSQLColumns> getOrderColumns() const { return m_aOrderColumns;} ::rtl::Reference<OSQLColumns> getParameters() const { return m_aParameters; } - ::rtl::Reference<OSQLColumns> getCreateColumns() const { return m_aCreateColumns;} /** return the columname and the table range @param _pColumnRef diff --git a/include/connectivity/sqlnode.hxx b/include/connectivity/sqlnode.hxx index 691cedd0e563..61c6afa4bcc0 100644 --- a/include/connectivity/sqlnode.hxx +++ b/include/connectivity/sqlnode.hxx @@ -368,8 +368,6 @@ namespace connectivity const OUString& getTokenValue() const {return m_aNodeValue;} - void setTokenValue(const OUString& rString) { if (isToken()) m_aNodeValue = rString;} - bool isLeaf() const {return m_aChildren.empty();} // negate only a searchcondition, any other rule could cause a gpf diff --git a/include/connectivity/sqlscan.hxx b/include/connectivity/sqlscan.hxx index 1506c74dd842..ad17f7d28e0d 100644 --- a/include/connectivity/sqlscan.hxx +++ b/include/connectivity/sqlscan.hxx @@ -55,8 +55,6 @@ namespace connectivity sal_Int32 SQLyygetc(); void SQLyyerror(char const *fmt); - static void output(sal_Int32) { OSL_FAIL("Internal error in sdblex.l: output not possible"); } - static void ECHO() { OSL_FAIL("Internal error in sdblex.l: ECHO not possible"); } IParseContext::InternationalKeyCode getInternationalTokenID(const char* sToken) const; // setting the new information before scanning diff --git a/include/cppcanvas/bitmapcanvas.hxx b/include/cppcanvas/bitmapcanvas.hxx index 714879230ab9..b47d438151e5 100644 --- a/include/cppcanvas/bitmapcanvas.hxx +++ b/include/cppcanvas/bitmapcanvas.hxx @@ -43,14 +43,6 @@ namespace cppcanvas { public: virtual ::basegfx::B2ISize getSize() const = 0; - - // shared_ptr does not allow for covariant return types - BitmapCanvasSharedPtr cloneBitmapCanvas() const - { - BitmapCanvasSharedPtr p( ::boost::dynamic_pointer_cast< BitmapCanvas >(this->clone()) ); - OSL_ENSURE(p.get(), "BitmapCanvas::cloneBitmapCanvas(): dynamic cast failed"); - return p; - } }; } diff --git a/include/cppcanvas/canvas.hxx b/include/cppcanvas/canvas.hxx index 2104dee39a5e..3538ffd619f3 100644 --- a/include/cppcanvas/canvas.hxx +++ b/include/cppcanvas/canvas.hxx @@ -85,8 +85,6 @@ namespace cppcanvas */ virtual ::basegfx::B2DPolyPolygon const* getClip() const = 0; - virtual FontSharedPtr createFont( const OUString& rFontName, const double& rCellSize ) const = 0; - virtual ColorSharedPtr createColor() const = 0; virtual CanvasSharedPtr clone() const = 0; diff --git a/include/cppcanvas/canvasgraphic.hxx b/include/cppcanvas/canvasgraphic.hxx index 09d8018ef76f..173ee466cef2 100644 --- a/include/cppcanvas/canvasgraphic.hxx +++ b/include/cppcanvas/canvasgraphic.hxx @@ -115,9 +115,6 @@ namespace cppcanvas /** Set object transformation matrix */ virtual void setTransformation( const ::basegfx::B2DHomMatrix& rMatrix ) = 0; - /** Get object transformation matrix - */ - virtual ::basegfx::B2DHomMatrix getTransformation() const = 0; /** Set object clipping polygon */ @@ -125,18 +122,10 @@ namespace cppcanvas /** Clear object clipping polygon */ virtual void setClip() = 0; - /** Get object clipping polygon - - @return NULL, if no clip is set; otherwise, the current clip poly-polygon is returned - */ - virtual ::basegfx::B2DPolyPolygon const* getClip() const = 0; /** Set object composite mode */ virtual void setCompositeOp( CompositeOp aOp ) = 0; - /** Get object composite mode - */ - virtual CompositeOp getCompositeOp() const = 0; /** Render to parent canvas diff --git a/include/cppcanvas/color.hxx b/include/cppcanvas/color.hxx index f259fa1ee176..b6ed71d823bf 100644 --- a/include/cppcanvas/color.hxx +++ b/include/cppcanvas/color.hxx @@ -41,7 +41,6 @@ namespace cppcanvas virtual ~Color() {} - virtual IntSRGBA getIntSRGBA( ::com::sun::star::uno::Sequence< double >& rDeviceColor ) const = 0; virtual ::com::sun::star::uno::Sequence< double > getDeviceColor( IntSRGBA aSRGBA ) const = 0; }; diff --git a/include/cppcanvas/font.hxx b/include/cppcanvas/font.hxx index c7d8ad6e600e..cbe30123f924 100644 --- a/include/cppcanvas/font.hxx +++ b/include/cppcanvas/font.hxx @@ -39,12 +39,6 @@ namespace cppcanvas { public: virtual ~Font() {} - - virtual OUString getName() const = 0; - virtual double getCellSize() const = 0; - - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XCanvasFont > getUNOFont() const = 0; }; typedef ::boost::shared_ptr< ::cppcanvas::Font > FontSharedPtr; diff --git a/include/cppcanvas/polypolygon.hxx b/include/cppcanvas/polypolygon.hxx index 3cb186354512..d8a2876522dd 100644 --- a/include/cppcanvas/polypolygon.hxx +++ b/include/cppcanvas/polypolygon.hxx @@ -56,8 +56,6 @@ namespace cppcanvas class PolyPolygon : public virtual CanvasGraphic { public: - virtual void addPolygon( const ::basegfx::B2DPolygon& rPoly ) = 0; - virtual void addPolyPolygon( const ::basegfx::B2DPolyPolygon& rPoly ) = 0; /** Set polygon fill color */ @@ -65,9 +63,6 @@ namespace cppcanvas /** Set polygon line color */ virtual void setRGBALineColor( Color::IntSRGBA ) = 0; - /** Get polygon fill color - */ - virtual Color::IntSRGBA getRGBAFillColor() const = 0; /** Get polygon line color */ virtual Color::IntSRGBA getRGBALineColor() const = 0; diff --git a/include/cppcanvas/spritecanvas.hxx b/include/cppcanvas/spritecanvas.hxx index 91fc52b3cc41..1ac219e7a86f 100644 --- a/include/cppcanvas/spritecanvas.hxx +++ b/include/cppcanvas/spritecanvas.hxx @@ -55,15 +55,6 @@ namespace cppcanvas virtual bool updateScreen( bool bUpdateAll ) const = 0; virtual CustomSpriteSharedPtr createCustomSprite( const ::basegfx::B2DSize& ) const = 0; - virtual SpriteSharedPtr createClonedSprite( const SpriteSharedPtr& ) const = 0; - - // shared_ptr does not allow for covariant return types - SpriteCanvasSharedPtr cloneSpriteCanvas() const - { - SpriteCanvasSharedPtr p( ::boost::dynamic_pointer_cast< SpriteCanvas >(this->clone()) ); - OSL_ENSURE(p.get(), "SpriteCanvas::cloneSpriteCanvas(): dynamic cast failed"); - return p; - } virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XSpriteCanvas > getUNOSpriteCanvas() const = 0; diff --git a/include/dbaccess/dataview.hxx b/include/dbaccess/dataview.hxx index 06ee42b21ded..6b56ba28a11b 100644 --- a/include/dbaccess/dataview.hxx +++ b/include/dbaccess/dataview.hxx @@ -60,10 +60,6 @@ namespace dbaui inline IController& getCommandController() const { return *m_xController.get(); } - /** will be called when the controls need to be resized. - */ - void resizeControls(const Size& /*_rDiff*/) { Resize(); } - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > getORB() { return m_xContext;} // the default implementation simply calls resizeAll( GetSizePixel() ) diff --git a/include/dbaccess/genericcontroller.hxx b/include/dbaccess/genericcontroller.hxx index 3b40f65b774c..6dad86f9a501 100644 --- a/include/dbaccess/genericcontroller.hxx +++ b/include/dbaccess/genericcontroller.hxx @@ -400,7 +400,6 @@ namespace dbaui void ImplInvalidateFeature( sal_Int32 _nId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& _xListener, bool _bForceBroadcast ); - bool ImplInvalidateTBItem(sal_uInt16 nId, const FeatureState& rState); void ImplBroadcastFeatureState(const OUString& _rFeature, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xListener, bool _bIgnoreCache); // link methods diff --git a/include/sot/object.hxx b/include/sot/object.hxx index 41077fe312d6..4d140969c286 100644 --- a/include/sot/object.hxx +++ b/include/sot/object.hxx @@ -43,7 +43,6 @@ private: static SotFactory ** GetFactoryAdress() { return &(SOTDATA()->pSotObjectFactory); } public: - static void * CreateInstance( SotObject ** = NULL ); static SotFactory * ClassFactory(); virtual void * Cast( const SotFactory * ); diff --git a/include/sot/storage.hxx b/include/sot/storage.hxx index 8d0bcc8db091..33f5a83c35a0 100644 --- a/include/sot/storage.hxx +++ b/include/sot/storage.hxx @@ -60,7 +60,6 @@ private: static SotFactory ** GetFactoryAdress() { return &(SOTDATA()->pSotStorageStreamFactory); } public: - static void * CreateInstance( SotObject ** = NULL ); static SotFactory * ClassFactory(); virtual void * Cast( const SotFactory * ) SAL_OVERRIDE; @@ -113,7 +112,6 @@ private: static SotFactory ** GetFactoryAdress() { return &(SOTDATA()->pSotStorageFactory); } public: - static void * CreateInstance( SotObject ** = NULL ); static SotFactory * ClassFactory(); virtual void * Cast( const SotFactory * ) SAL_OVERRIDE; diff --git a/include/svtools/acceleratorexecute.hxx b/include/svtools/acceleratorexecute.hxx index 1f2bfc26c6ff..d25df279b6a7 100644 --- a/include/svtools/acceleratorexecute.hxx +++ b/include/svtools/acceleratorexecute.hxx @@ -201,10 +201,6 @@ class SVT_DLLPUBLIC AcceleratorExecute : private TMutexInit /** TODO document me */ - static css::uno::Reference< css::ui::XAcceleratorConfiguration > st_openGlobalConfig(const css::uno::Reference< css::uno::XComponentContext >& rxContext); - - - /** TODO document me */ static css::uno::Reference< css::ui::XAcceleratorConfiguration > st_openModuleConfig(const css::uno::Reference< css::uno::XComponentContext >& rxContext , const css::uno::Reference< css::frame::XFrame >& xFrame); diff --git a/include/svtools/transfer.hxx b/include/svtools/transfer.hxx index c19f4039dad8..675b191a5980 100644 --- a/include/svtools/transfer.hxx +++ b/include/svtools/transfer.hxx @@ -478,7 +478,6 @@ public: // typically called by the application in ::AcceptDrop and ::ExecuteDrop and (see above) bool IsDropFormatSupported( SotClipboardFormatId nFormat ); - bool IsDropFormatSupported( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); DataFlavorExVector& GetDataFlavorExVector() const {return *mpFormats; } diff --git a/include/svx/svdetc.hxx b/include/svx/svdetc.hxx index 0f82c5b1dbad..417ddb06466c 100644 --- a/include/svx/svdetc.hxx +++ b/include/svx/svdetc.hxx @@ -70,30 +70,24 @@ private: public: SdrEngineDefaults(); - // Default Fontname ist "Times New Roman" - static void SetFontName(const OUString& rFontName) { GetDefaults().aFontName=rFontName; } - static OUString GetFontName() { return GetDefaults().aFontName; } - // Default FontFamily ist FAMILY_ROMAN - static void SetFontFamily(FontFamily eFam) { GetDefaults().eFontFamily=eFam; } - static FontFamily GetFontFamily() { return GetDefaults().eFontFamily; } + // Default FontColor ist COL_BLACK - static void SetFontColor(const Color& rColor) { GetDefaults().aFontColor=rColor; } static Color GetFontColor() { return GetDefaults().aFontColor; } + // Default FontHeight ist 847. Die Fonthoehe wird in logischen Einheiten // (MapUnit/MapFraction (siehe unten)) angegeben. Die Defaulteinstellung // 847/100mm entspricht also ca. 24 Point. Verwendet man stattdessen // beispielsweise Twips (SetMapUnit(MAP_TWIP)) (20 Twip = 1 Point) muss // man als Fonthoehe 480 angeben um 24 Point als default zu erhalten. - static void SetFontHeight(sal_uIntPtr nHeight) { GetDefaults().nFontHeight=nHeight; } static sal_uIntPtr GetFontHeight() { return GetDefaults().nFontHeight; } + // Der MapMode wird fuer den globalen Outliner benoetigt. // Gleichzeitig bekommt auch jedes neu instanziierte SdrModel // diesen MapMode default zugewiesen. // Default MapUnit ist MAP_100TH_MM - static void SetMapUnit(MapUnit eMap) { GetDefaults().eMapUnit=eMap; } static MapUnit GetMapUnit() { return GetDefaults().eMapUnit; } + // Default MapFraction ist 1/1. - static void SetMapFraction(const Fraction& rMap) { GetDefaults().aMapFraction=rMap; } static Fraction GetMapFraction() { return GetDefaults().aMapFraction; } // Einen Outliner mit den engineglobalen diff --git a/include/tools/inetmime.hxx b/include/tools/inetmime.hxx index 23b86f1a5739..78dd8e5f2db3 100644 --- a/include/tools/inetmime.hxx +++ b/include/tools/inetmime.hxx @@ -358,9 +358,6 @@ public: static inline bool startsWithLineBreak(const sal_Unicode * pBegin, const sal_Unicode * pEnd); - static inline bool startsWithLineFolding(const sal_Char * pBegin, - const sal_Char * pEnd); - static inline bool startsWithLineFolding(const sal_Unicode * pBegin, const sal_Unicode * pEnd); @@ -570,17 +567,6 @@ inline bool INetMIME::startsWithLineBreak(const sal_Unicode * pBegin, } // static -inline bool INetMIME::startsWithLineFolding(const sal_Char * pBegin, - const sal_Char * pEnd) -{ - DBG_ASSERT(pBegin && pBegin <= pEnd, - "INetMIME::startsWithLineFolding(): Bad sequence"); - - return pEnd - pBegin >= 3 && pBegin[0] == 0x0D && pBegin[1] == 0x0A - && isWhiteSpace(pBegin[2]); // CR, LF -} - -// static inline bool INetMIME::startsWithLineFolding(const sal_Unicode * pBegin, const sal_Unicode * pEnd) { diff --git a/include/vcl/longcurr.hxx b/include/vcl/longcurr.hxx index 0dbe82ca401f..2a00c995eedb 100644 --- a/include/vcl/longcurr.hxx +++ b/include/vcl/longcurr.hxx @@ -70,9 +70,6 @@ public: void SetValue(const BigInt& rNewValue); void SetUserValue( BigInt nNewValue ); BigInt GetValue() const; - bool IsEmptyValue() const { return GetField()->GetText().isEmpty(); } - - BigInt GetCorrectedValue() const { return mnCorrectedValue; } }; @@ -122,9 +119,6 @@ public: void Modify() SAL_OVERRIDE; void ReformatAll() SAL_OVERRIDE; - - BigInt GetValue() const - { return LongCurrencyFormatter::GetValue(); } }; #endif // INCLUDED_VCL_LONGCURR_HXX diff --git a/include/vcl/morebtn.hxx b/include/vcl/morebtn.hxx index 936cbba77d9e..01a6e95da5cf 100644 --- a/include/vcl/morebtn.hxx +++ b/include/vcl/morebtn.hxx @@ -54,26 +54,12 @@ public: void Click() SAL_OVERRIDE; - void SetDelta( sal_uLong nNewDelta ) { mnDelta = nNewDelta; } - sal_uLong GetDelta() const { return mnDelta; } - - void SetMapUnit( MapUnit eNewUnit = MAP_PIXEL ) { meUnit = eNewUnit; } - MapUnit GetMapUnit() const { return meUnit; } - using PushButton::SetState; - void SetState( bool bNewState = true ); - bool GetState() const { return mbState; } void SetText( const OUString& rNewText ) SAL_OVERRIDE; OUString GetText() const SAL_OVERRIDE; }; -inline void MoreButton::SetState( bool bNewState ) -{ - if ( mbState != bNewState ) - Click(); -} - #endif // INCLUDED_VCL_MOREBTN_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/spin.hxx b/include/vcl/spin.hxx index c97b1b11a0e7..69e6d03e0108 100644 --- a/include/vcl/spin.hxx +++ b/include/vcl/spin.hxx @@ -77,18 +77,12 @@ public: void SetRangeMax( long nNewRange ); long GetRangeMax() const { return mnMaxRange; } void SetRange( const Range& rRange ); - Range GetRange() const { return Range( GetRangeMin(), GetRangeMax() ); } void SetValue( long nValue ); long GetValue() const { return mnValue; } void SetValueStep( long nNewStep ) { mnValueStep = nNewStep; } long GetValueStep() const { return mnValueStep; } virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - void SetUpHdl( const Link<>& rLink ) { maUpHdlLink = rLink; } - const Link<>& GetUpHdl() const { return maUpHdlLink; } - void SetDownHdl( const Link<>& rLink ) { maDownHdlLink = rLink; } - const Link<>& GetDownHdl() const { return maDownHdlLink; } - private: // moves the focus to the upper or lower rect. Return sal_True if the focus rect actually changed. SAL_DLLPRIVATE bool ImplMoveFocus( bool _bUpper ); diff --git a/include/vcl/texteng.hxx b/include/vcl/texteng.hxx index 17e07456503d..47cb547e7001 100644 --- a/include/vcl/texteng.hxx +++ b/include/vcl/texteng.hxx @@ -237,8 +237,6 @@ public: void SetFont( const vcl::Font& rFont ); const vcl::Font& GetFont() const { return maFont; } - sal_uInt16 GetDefTab() const; - void SetLeftMargin( sal_uInt16 n ); void SetUpdateMode( bool bUpdate ); diff --git a/include/vcl/textview.hxx b/include/vcl/textview.hxx index e126ea23c868..39b32cf3510b 100644 --- a/include/vcl/textview.hxx +++ b/include/vcl/textview.hxx @@ -66,7 +66,6 @@ protected: TextSelection ImpMoveCursor( const KeyEvent& rKeyEvent ); TextPaM ImpDelete( sal_uInt8 nMode, sal_uInt8 nDelMode ); - void ImpSetSelection( const TextSelection& rNewSel, bool bUI ); bool IsInSelection( const TextPaM& rPaM ); void ImpPaint(vcl::RenderContext& rRenderContext, const Point& rStartPos, Rectangle const* pPaintArea, TextSelection const* pPaintRange = 0, TextSelection const* pSelection = 0); @@ -80,7 +79,7 @@ protected: void ImpShowDDCursor(); bool ImplTruncateNewText( OUString& rNewText ) const; - bool ImplCheckTextLen( const OUString& rNewText ); + bool ImplCheckTextLen( const OUString& rNewText ); VirtualDevice* GetVirtualDevice(); diff --git a/include/vcl/txtattr.hxx b/include/vcl/txtattr.hxx index f82f52443fb4..fa76a484b9d4 100644 --- a/include/vcl/txtattr.hxx +++ b/include/vcl/txtattr.hxx @@ -107,15 +107,7 @@ public: TextAttribHyperLink( const TextAttribHyperLink& rAttr ); virtual ~TextAttribHyperLink(); - void SetURL( const OUString& rURL ) { maURL = rURL; } const OUString& GetURL() const { return maURL; } - - void SetDescription( const OUString& rDescr ) { maDescription = rDescr; } - const OUString& GetDescription() const { return maDescription; } - - void SetColor( const Color& rColor ) { maColor = rColor; } - const Color& GetColor() const { return maColor; } - virtual void SetFont( vcl::Font& rFont ) const SAL_OVERRIDE; virtual TextAttrib* Clone() const SAL_OVERRIDE; virtual bool operator==( const TextAttrib& rAttr ) const SAL_OVERRIDE; diff --git a/include/vcl/xtextedt.hxx b/include/vcl/xtextedt.hxx index c5dd3770851f..d54a6496d7e9 100644 --- a/include/vcl/xtextedt.hxx +++ b/include/vcl/xtextedt.hxx @@ -39,11 +39,8 @@ public: ExtTextEngine(); virtual ~ExtTextEngine(); - const OUString& GetGroupChars() const { return maGroupChars; } - void SetGroupChars( const OUString& r ) { maGroupChars = r; } TextSelection MatchGroup( const TextPaM& rCursor ) const; - - bool Search( TextSelection& rSel, const ::com::sun::star::util::SearchOptions& rSearchOptions, bool bForward = true ); + bool Search( TextSelection& rSel, const ::com::sun::star::util::SearchOptions& rSearchOptions, bool bForward = true ); }; class VCL_DLLPUBLIC ExtTextView : public TextView diff --git a/libreofficekit/source/gtk/tilebuffer.cxx b/libreofficekit/source/gtk/tilebuffer.cxx index 85f6eb0422c2..75c3d0d2c5c4 100644 --- a/libreofficekit/source/gtk/tilebuffer.cxx +++ b/libreofficekit/source/gtk/tilebuffer.cxx @@ -36,12 +36,6 @@ GdkPixbuf* Tile::getBuffer() return m_pBuffer; } -void Tile::release() -{ - g_object_unref (m_pBuffer); - m_pBuffer = NULL; -} - void Tile::setPixbuf(GdkPixbuf *buffer) { m_pBuffer = buffer; diff --git a/libreofficekit/source/gtk/tilebuffer.hxx b/libreofficekit/source/gtk/tilebuffer.hxx index d4e7120e6587..750ff790e1e4 100644 --- a/libreofficekit/source/gtk/tilebuffer.hxx +++ b/libreofficekit/source/gtk/tilebuffer.hxx @@ -62,8 +62,6 @@ class Tile /// Function to get the pointer to enclosing GdkPixbuf GdkPixbuf* getBuffer(); - /// Destroys the enclosing GdkPixbuf object pointed to by m_pBuffer - void release(); /// Used to set the pixel buffer of this object void setPixbuf(GdkPixbuf*); diff --git a/rsc/inc/rscarray.hxx b/rsc/inc/rscarray.hxx index 080a60e45fed..232091f278ff 100644 --- a/rsc/inc/rscarray.hxx +++ b/rsc/inc/rscarray.hxx @@ -67,7 +67,6 @@ public: virtual ~RscArray(); virtual RSCCLASS_TYPE GetClassType() const SAL_OVERRIDE; - void SetTypeClass( RscEnum * pClass ) { pTypeClass = pClass; } virtual RscTop * GetTypeClass() const SAL_OVERRIDE; RSCINST Create( RSCINST * pInst, const RSCINST & rDflt, bool ) SAL_OVERRIDE; void Destroy( const RSCINST & rInst ) SAL_OVERRIDE; diff --git a/rsc/inc/rscclobj.hxx b/rsc/inc/rscclobj.hxx index 18151148c7e6..5eaedb6da2b5 100644 --- a/rsc/inc/rscclobj.hxx +++ b/rsc/inc/rscclobj.hxx @@ -70,10 +70,6 @@ public: ObjNode* pObjBiTree; // Zeiger auf Objektbaum RefNode( Atom nTyp ); sal_uInt32 GetId() const SAL_OVERRIDE; - RefNode* Search( Atom typ ) const //< search the index in the b-tree - { - return static_cast<RefNode *>(IdNode::Search( typ )); - } bool Insert( RefNode* pTN ) //< insert a new node in the b-tree { return IdNode::Insert( static_cast<IdNode *>(pTN) ); diff --git a/rsc/inc/rscconst.hxx b/rsc/inc/rscconst.hxx index c6778f24f1ed..55ea45851fee 100644 --- a/rsc/inc/rscconst.hxx +++ b/rsc/inc/rscconst.hxx @@ -38,13 +38,11 @@ public: RscConst( Atom nId, sal_uInt32 nTypId ); virtual ~RscConst(); virtual RSCCLASS_TYPE GetClassType() const SAL_OVERRIDE; - sal_uInt32 GetEntryCount() const { return nEntries; } // Die erlaubten Werte werden gesetzt ERRTYPE SetConstant( Atom nVarName, sal_Int32 lValue ); - Atom GetConstant( sal_uInt32 nPos ) SAL_OVERRIDE; bool GetConstValue( Atom nConstId, sal_Int32 * pVal ) const; bool GetValueConst( sal_Int32 nValue, Atom * pConstId ) const; - sal_uInt32 GetConstPos( Atom nConstId ); + sal_uInt32 GetConstPos( Atom nConstId ); }; class RscEnum : public RscConst diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx index 7fadead2e5f2..b4454ff950b1 100644 --- a/rsc/inc/rscdb.hxx +++ b/rsc/inc/rscdb.hxx @@ -148,10 +148,8 @@ class RscTypCont inline void SETCONST( RscConst *p1, Atom p2, ToolBoxItemBits p3 ) { SETCONST(p1, p2, static_cast<sal_uInt32>(p3)); } inline void SETCONST( RscConst *p1, Atom p2, WindowBorderStyle p3 ) { SETCONST(p1, p2, static_cast<sal_uInt32>(p3)); } inline void SETCONST( RscConst *p1, const char * p2, KeyFuncType p3 ) { SETCONST(p1, p2, static_cast<sal_uInt32>(p3)); } - inline void SETCONST( RscConst *p1, const char * p2, MenuItemBits p3 ) { SETCONST(p1, p2, static_cast<sal_uInt32>(p3)); } inline void SETCONST( RscConst *p1, Atom p2, MenuItemBits p3 ) { SETCONST(p1, p2, static_cast<sal_uInt32>(p3)); } inline void SETCONST( RscConst *p1, const char * p2, ToolBoxItemType p3 ) { SETCONST(p1, p2, static_cast<sal_uInt32>(p3)); } - inline void SETCONST( RscConst *p1, Atom p2, ButtonType p3 ) { SETCONST(p1, p2, static_cast<sal_uInt32>(p3)); } inline void SETCONST( RscConst *p1, const char * p2, ButtonType p3 ) { SETCONST(p1, p2, static_cast<sal_uInt32>(p3)); } inline void SETCONST( RscConst *p1, const char * p2, WindowAlign p3 ) { SETCONST(p1, p2, static_cast<sal_uInt32>(p3)); } RscEnum * InitLangType(); @@ -162,7 +160,6 @@ class RscTypCont RscEnum * InitTriState(); RscTupel * InitGeometry(); RscArray * InitLangGeometry( RscTupel * pGeo ); - RscArray * InitSystemGeometry( RscTupel * pGeo ); RscCont * InitStringList(); RscArray * InitLangStringList( RscCont * pStrLst ); RscTupel * InitStringTupel(); @@ -190,7 +187,6 @@ class RscTypCont RscTop * InitClassImageButton( RscTop * pSuper, RscTop * pClassImage, RscEnum * pTriState ); RscTop * InitClassEdit( RscTop * pSuper ); - RscTop * InitClassScrollBar( RscTop * pSuper ); RscTop * InitClassListBox( RscTop * pSuper, RscArray * pStrLst ); RscTop * InitClassComboBox( RscTop * pSuper, RscArray * pStrLst ); RscTop * InitClassFixedText( RscTop * pSuper ); @@ -261,11 +257,6 @@ public: ~RscTypCont(); Atom AddLanguage( const char* ); - - bool IsPreload() const - { return (nFlags & PRELOAD_FLAG) != 0; } - bool IsSysResTest() const - { return (nFlags & NOSYSRESTEST_FLAG) == 0; } bool IsSrsDefault() const { return (nFlags & SRSDEFAULT_FLAG) != 0; } OString ChangeLanguage(const OString & rNewLang); @@ -280,7 +271,6 @@ public: nSourceCharSet = aCharSet; return aOld; } - void SetSearchPath( const OString& rStr) { aSearchPath = rStr; } OString GetSearchPath() const { return aSearchPath; } void SetSysSearchPath( const OString& rStr ) { aSysSearchPath = rStr; } void InsertType( RscTop * pType ) diff --git a/rsc/inc/rscdef.hxx b/rsc/inc/rscdef.hxx index ce0126570d2a..6b033a195111 100644 --- a/rsc/inc/rscdef.hxx +++ b/rsc/inc/rscdef.hxx @@ -135,7 +135,6 @@ protected: RscExpression * pExpression ); virtual ~RscDefine(); void IncRef(){ nRefCount++; } - sal_uInt32 GetRefCount() const { return nRefCount; } void DecRef(); void DefineToNumber(); void SetName(const OString& rNewName) { m_aName = rNewName; } diff --git a/rsc/inc/rsclex.hxx b/rsc/inc/rsclex.hxx index c05fd0ce6d24..6d6fc43a5c3a 100644 --- a/rsc/inc/rsclex.hxx +++ b/rsc/inc/rsclex.hxx @@ -73,9 +73,6 @@ class ObjectStack const RSCINST & Top () { return pRoot->aInst; } bool IsEmpty() { return( pRoot == NULL ); } - void IncTupelRec() { pRoot->nTupelRec++; } - void DecTupelRec() { pRoot->nTupelRec--; } - sal_uInt32 TupelRecCount() const { return pRoot->nTupelRec; } void Push( RSCINST aInst ) { Node* pTmp; diff --git a/rsc/inc/rscpar.hxx b/rsc/inc/rscpar.hxx index 90c9eee5589a..41d83fd9e3d8 100644 --- a/rsc/inc/rscpar.hxx +++ b/rsc/inc/rscpar.hxx @@ -55,7 +55,6 @@ public: bool IsEof() const { return bEof; } void SetFileIndex( sal_uLong lFIndex ) { lFileIndex = lFIndex; } sal_uLong GetFileIndex() { return lFileIndex; } - sal_uLong GetSrcIndex() { return lSrcIndex; } void SetLineNo( sal_uInt32 nLine ) { nLineNo = nLine; } sal_uInt32 GetLineNo() { return nLineNo; } sal_uInt32 GetScanPos() { return nScanPos; } @@ -69,9 +68,6 @@ public: void GetNewLine(); // Fehlerbehandlung void SetError( ERRTYPE aError ); - ERRTYPE GetError() { return aFirstError; } - sal_uInt32 GetErrorLine() { return nErrorLine; } - sal_uInt32 GetErrorPos() { return nErrorPos; } }; void IncludeParser( RscFileInst * pFileInst ); diff --git a/rsc/inc/rscrange.hxx b/rsc/inc/rscrange.hxx index 0efe0d94d02e..51f74a308ffb 100644 --- a/rsc/inc/rscrange.hxx +++ b/rsc/inc/rscrange.hxx @@ -156,8 +156,6 @@ class RscBool : public RscRange public: RscBool( Atom nId, sal_uInt32 nTypId ); virtual RSCCLASS_TYPE GetClassType() const SAL_OVERRIDE; - // Der zulaessige Bereich wird gesetzt - static ERRTYPE SetRange( sal_Int32, sal_Int32 ){ return ERR_UNKNOWN_METHOD; } ERRTYPE SetBool( const RSCINST & rInst, bool b ) SAL_OVERRIDE { return SetNumber( rInst, (sal_Int32)b ); diff --git a/rsc/inc/rscrsc.hxx b/rsc/inc/rscrsc.hxx index 5d982d2ff77a..a52e3ab218dd 100644 --- a/rsc/inc/rscrsc.hxx +++ b/rsc/inc/rscrsc.hxx @@ -67,8 +67,6 @@ struct WriteRcContext; class RscCompiler { private: - void CreateResFile( const char * pRc ); - static bool GetImageFilePath( const RscCmdLine::OutputFile& rOutputFile, const WriteRcContext& rContext, const OString& rBaseFileName, diff --git a/rsc/inc/rsctools.hxx b/rsc/inc/rsctools.hxx index bfff4d5629ac..b2ad7c483e87 100644 --- a/rsc/inc/rsctools.hxx +++ b/rsc/inc/rsctools.hxx @@ -119,9 +119,6 @@ public: { return GetPointer( nPos ); } - - - RSCBYTEORDER_TYPE GetByteOrder() const { return nByteOrder; } sal_uInt32 Size(){ return nLen; } void Put( sal_uInt64 lVal ) { @@ -193,10 +190,6 @@ public: { PutAt( nPos, (sal_Int32)lVal); } - void PutAt( sal_uInt32 nPos, short nVal ) - { - PutAt( nPos, (sal_uInt16)nVal ); - } void PutAt( sal_uInt32 nPos, sal_uInt16 nVal ) { if( bSwap ) diff --git a/rsc/inc/rsctop.hxx b/rsc/inc/rsctop.hxx index 4570dd0752a5..c3859587c72c 100644 --- a/rsc/inc/rsctop.hxx +++ b/rsc/inc/rsctop.hxx @@ -49,10 +49,6 @@ public: OString aCallPar2; // Klassenaufruf ohne Typen ab ResId OString aCallParType; // Klassenaufruf mit Typen - void SetSuperClass( RscTop * pClass ) - { - pSuperClass = pClass; - } RscTop* GetSuperClass() const { return pSuperClass; } // Gibt den Typidentifier zurueck @@ -60,13 +56,8 @@ public: { return nTypId; }; // Gibt die Oberklasse zurueck bool InHierarchy( RscTop * pClass ); - bool IsCodeWriteable() const - { - return( 0 != aCallParType.getLength() ); - } void SetCallPar( const OString& rPar1, const OString& rPar2, const OString& rParType ); - void SetRefClass( RscTop * pRef ) { pRefClass = pRef; } RscTop* GetRefClass() const { return pRefClass; } virtual RSCCLASS_TYPE GetClassType() const = 0; RSCINST GetDefault(); @@ -77,8 +68,6 @@ public: // ausgehen, dass alle Klassenzeiger noch gueltig sind virtual void Pre_dtor(); - virtual Atom GetConstant( sal_uInt32 ); - virtual RscTop* GetTypeClass() const; // Gibt die Groesse der Klasse in Bytes diff --git a/rsc/source/res/rscconst.cxx b/rsc/source/res/rscconst.cxx index a7a83293d396..ed47f9ae2e5a 100644 --- a/rsc/source/res/rscconst.cxx +++ b/rsc/source/res/rscconst.cxx @@ -58,13 +58,6 @@ ERRTYPE RscConst::SetConstant( Atom nVarName, sal_Int32 lValue ) return ERR_OK; } -Atom RscConst::GetConstant( sal_uInt32 nPos ) -{ - if( nPos < nEntries ) - return pVarArray[ nPos ].nId; - return InvalidAtom; -} - bool RscConst::GetConstValue( Atom nConst, sal_Int32 * pValue ) const { sal_uInt32 i = 0; diff --git a/rsc/source/res/rsctop.cxx b/rsc/source/res/rsctop.cxx index d91626e2f667..6038ab932a3b 100644 --- a/rsc/source/res/rsctop.cxx +++ b/rsc/source/res/rsctop.cxx @@ -58,11 +58,6 @@ void RscTop :: Pre_dtor() }; } -Atom RscTop :: GetConstant( sal_uInt32 ) -{ - return InvalidAtom; -} - RscTop * RscTop::GetTypeClass() const { if( pSuperClass ) diff --git a/sc/inc/funcdesc.hxx b/sc/inc/funcdesc.hxx index d1326c602418..2bf4d01e5e2d 100644 --- a/sc/inc/funcdesc.hxx +++ b/sc/inc/funcdesc.hxx @@ -235,9 +235,6 @@ public: const ScFuncDesc* GetFunction( sal_uInt32 nIndex ) const; - sal_Int32 GetMaxFuncNameLen() const - { return nMaxFuncNameLen; } - private: ::std::vector<const ScFuncDesc*> aFunctionList; /**< List of functions */ ::std::vector<const ScFuncDesc*>::iterator aFunctionListIter; /**< position in function list */ diff --git a/sc/source/filter/inc/addressconverter.hxx b/sc/source/filter/inc/addressconverter.hxx index abe6aecebb4c..25da7e98d24d 100644 --- a/sc/source/filter/inc/addressconverter.hxx +++ b/sc/source/filter/inc/addressconverter.hxx @@ -93,9 +93,6 @@ struct BinAddress inline explicit BinAddress( sal_Int32 nCol, sal_Int32 nRow ) : mnCol( nCol ), mnRow( nRow ) {} inline explicit BinAddress( const ::com::sun::star::table::CellAddress& rAddr ) : mnCol( rAddr.Column ), mnRow( rAddr.Row ) {} - inline void set( sal_Int32 nCol, sal_Int32 nRow ) { mnCol = nCol; mnRow = nRow; } - inline void set( const ::com::sun::star::table::CellAddress& rAddr ) { mnCol = rAddr.Column; mnRow = rAddr.Row; } - void read( SequenceInputStream& rStrm ); void read( BiffInputStream& rStrm, bool bCol16Bit = true, bool bRow32Bit = false ); }; diff --git a/sc/source/filter/inc/biffinputstream.hxx b/sc/source/filter/inc/biffinputstream.hxx index 74c1c890bd68..13f9dbaa5e03 100644 --- a/sc/source/filter/inc/biffinputstream.hxx +++ b/sc/source/filter/inc/biffinputstream.hxx @@ -329,8 +329,6 @@ public: bool restorePosition(); - inline BiffInputStream& getStream() { return mrStrm; } - private: BiffInputStream& mrStrm; sal_Int64 mnRecHandle; diff --git a/sc/source/filter/inc/defnamesbuffer.hxx b/sc/source/filter/inc/defnamesbuffer.hxx index 187a46adda83..0eee4f55e910 100644 --- a/sc/source/filter/inc/defnamesbuffer.hxx +++ b/sc/source/filter/inc/defnamesbuffer.hxx @@ -84,14 +84,6 @@ public: ::com::sun::star::uno::Any getReference( const ::com::sun::star::table::CellAddress& rBaseAddr ) const; protected: - /** Converts the OOXML formula string stored in the own model. */ - ApiTokenSequence importOoxFormula( sal_Int16 nBaseSheet ); - /** Imports the BIFF12 formula from the passed stream. */ - ApiTokenSequence importBiff12Formula( sal_Int16 nBaseSheet, SequenceInputStream& rStrm ); - /** Imports the BIFF formula from the passed stream. */ - ApiTokenSequence importBiffFormula( sal_Int16 nBaseSheet, BiffInputStream& rStrm, const sal_uInt16* pnFmlaSize = 0 ); - -protected: DefinedNameModel maModel; /// Model data for this defined name. mutable OUString maUpModelName; /// Model name converted to uppercase ASCII. OUString maCalcName; /// Final name used in the Calc document. diff --git a/sc/source/filter/inc/xestream.hxx b/sc/source/filter/inc/xestream.hxx index 77d79a88bf4f..ac75f7f033ce 100644 --- a/sc/source/filter/inc/xestream.hxx +++ b/sc/source/filter/inc/xestream.hxx @@ -350,8 +350,7 @@ public: SAX_ARGS_FUNC_SUBST( arg, convert, 13 ) SAX_ARGS_FUNC_SUBST( arg, convert, 14 ) \ SAX_ARGS_FUNC_SUBST( arg, convert, 15 ) SAX_ARGS_FUNC_SUBST( arg, convert, 16 ) \ SAX_ARGS_FUNC_SUBST( arg, convert, 17 ) SAX_ARGS_FUNC_SUBST( arg, convert, 18 ) \ - SAX_ARGS_FUNC_SUBST( arg, convert, 19 ) SAX_ARGS_FUNC_SUBST( arg, convert, 20 ) \ - SAX_ARGS_FUNC_SUBST( arg, convert, 21 ) SAX_ARGS_FUNC_SUBST( arg, convert, 22 ) + SAX_ARGS_FUNC_SUBST( arg, convert, 19 ) SAX_ARGS_FUNC_SUBST( arg, convert, 20 ) SAX_ARGS_FUNC( const char*, ) SAX_ARGS_FUNC( const OString&, .getStr() ) #undef SAX_ARGS_FUNC_DECL diff --git a/sc/source/filter/oox/defnamesbuffer.cxx b/sc/source/filter/oox/defnamesbuffer.cxx index 69cf01a18b51..20bb85281fa3 100644 --- a/sc/source/filter/oox/defnamesbuffer.cxx +++ b/sc/source/filter/oox/defnamesbuffer.cxx @@ -227,25 +227,6 @@ Any DefinedNameBase::getReference( const CellAddress& rBaseAddr ) const return Any(); } -ApiTokenSequence DefinedNameBase::importOoxFormula( sal_Int16 nBaseSheet ) -{ - return (!maModel.maFormula.isEmpty()) ? - getFormulaParser().importFormula( CellAddress( nBaseSheet, 0, 0 ), maModel.maFormula ) : - getFormulaParser().convertErrorToFormula( BIFF_ERR_NAME ); -} - -ApiTokenSequence DefinedNameBase::importBiff12Formula( sal_Int16 nBaseSheet, SequenceInputStream& rStrm ) -{ - return getFormulaParser().importFormula( CellAddress( nBaseSheet, 0, 0 ), FORMULATYPE_DEFINEDNAME, rStrm ); -} - -ApiTokenSequence DefinedNameBase::importBiffFormula( sal_Int16 nBaseSheet, BiffInputStream& rStrm, const sal_uInt16* pnFmlaSize ) -{ - return (!pnFmlaSize || (*pnFmlaSize > 0)) ? - getFormulaParser().importFormula( CellAddress( nBaseSheet, 0, 0 ), FORMULATYPE_DEFINEDNAME, rStrm, pnFmlaSize ) : - getFormulaParser().convertErrorToFormula( BIFF_ERR_NAME ); -} - DefinedName::DefinedName( const WorkbookHelper& rHelper ) : DefinedNameBase( rHelper ), mpScRangeData(NULL), diff --git a/sc/source/ui/inc/autofmt.hxx b/sc/source/ui/inc/autofmt.hxx index 6beebfd9b994..4f0b96a876df 100644 --- a/sc/source/ui/inc/autofmt.hxx +++ b/sc/source/ui/inc/autofmt.hxx @@ -95,13 +95,6 @@ private: SAL_DLLPRIVATE void MakeFonts(sal_uInt16 nIndex, vcl::Font& rFont, vcl::Font& rCJKFont, vcl::Font& rCTLFont ); - - SAL_DLLPRIVATE void CheckPriority(sal_uInt16 nCurLine, AutoFmtLine eLine, editeng::SvxBorderLine& rLine); - SAL_DLLPRIVATE void GetLines(sal_uInt16 nIndex, AutoFmtLine eLine, - editeng::SvxBorderLine& rLineD, editeng::SvxBorderLine& rLineLT, - editeng::SvxBorderLine& rLineL, editeng::SvxBorderLine& rLineLB, - editeng::SvxBorderLine& rLineRT, editeng::SvxBorderLine& rLineR, - editeng::SvxBorderLine& rLineRB); }; #endif // INCLUDED_SC_SOURCE_UI_INC_AUTOFMT_HXX diff --git a/sc/source/ui/inc/condformatdlgentry.hxx b/sc/source/ui/inc/condformatdlgentry.hxx index d5c78f92ab9e..5bb04e32721c 100644 --- a/sc/source/ui/inc/condformatdlgentry.hxx +++ b/sc/source/ui/inc/condformatdlgentry.hxx @@ -57,8 +57,6 @@ protected: ScDocument* mpDoc; ScAddress maPos; - DECL_LINK( EdModifyHdl, Edit* ); - virtual void Select(); virtual void Deselect(); diff --git a/sc/source/ui/inc/dbnamdlg.hxx b/sc/source/ui/inc/dbnamdlg.hxx index 41fb9a5f91b4..68154228fb02 100644 --- a/sc/source/ui/inc/dbnamdlg.hxx +++ b/sc/source/ui/inc/dbnamdlg.hxx @@ -84,7 +84,6 @@ private: ScDBCollection aLocalDbCol; ScRange theCurArea; std::vector<ScRange> aRemoveList; - DECL_LINK( FocusToComoboxHdl, Timer* ); private: void Init(); diff --git a/sc/source/ui/inc/filtdlg.hxx b/sc/source/ui/inc/filtdlg.hxx index aeb9905f76dc..b7d0e060f807 100644 --- a/sc/source/ui/inc/filtdlg.hxx +++ b/sc/source/ui/inc/filtdlg.hxx @@ -218,7 +218,6 @@ private: DECL_LINK( FilterAreaSelHdl, ListBox* ); DECL_LINK( FilterAreaModHdl, formula::RefEdit* ); DECL_LINK( EndDlgHdl, Button* ); - DECL_LINK( ScrollHdl, ScrollBar* ); // Hack: RefInput control DECL_LINK_TYPED( TimeOutHdl, Idle*, void ); diff --git a/sc/source/ui/inc/mvtabdlg.hxx b/sc/source/ui/inc/mvtabdlg.hxx index c19d14a607bd..fa3e5ed2a051 100644 --- a/sc/source/ui/inc/mvtabdlg.hxx +++ b/sc/source/ui/inc/mvtabdlg.hxx @@ -40,7 +40,6 @@ public: bool GetRenameTable () const { return bRenameTable; } void GetTabNameString( OUString& rString ) const; void SetForceCopyTable (); - void EnableCopyTable (bool bFlag=true); void EnableRenameTable (bool bFlag=true); private: diff --git a/sc/source/ui/inc/namedlg.hxx b/sc/source/ui/inc/namedlg.hxx index 1642311e60b6..467193d8d6f0 100644 --- a/sc/source/ui/inc/namedlg.hxx +++ b/sc/source/ui/inc/namedlg.hxx @@ -106,7 +106,6 @@ private: DECL_LINK( CancelBtnHdl, void * ); DECL_LINK( AddBtnHdl, void * ); DECL_LINK( RemoveBtnHdl, void * ); - DECL_LINK( SelectBtnHdl, void * ); DECL_LINK( EdModifyHdl, void * ); DECL_LINK( AssignGetFocusHdl, void * ); DECL_LINK( SelectionChangedHdl_Impl, void* ); diff --git a/sc/source/ui/inc/tpview.hxx b/sc/source/ui/inc/tpview.hxx index baece6cffd4a..2dc3667ae9ab 100644 --- a/sc/source/ui/inc/tpview.hxx +++ b/sc/source/ui/inc/tpview.hxx @@ -106,15 +106,11 @@ class ScTpLayoutOptions : public SfxTabPage SvxStringArray aUnitArr; - DECL_LINK( CBHdl, CheckBox* ); - DECL_LINK(MetricHdl, void *); DECL_LINK( AlignHdl, CheckBox* ); ScDocument *pDoc; - DECL_LINK( UpdateHdl, CheckBox* ); - ScTpLayoutOptions( vcl::Window* pParent, const SfxItemSet& rArgSet ); public: diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx index 371d99369f76..d050942fb8bb 100644 --- a/sc/source/ui/inc/validate.hxx +++ b/sc/source/ui/inc/validate.hxx @@ -171,8 +171,6 @@ class ScValidationDlg { typedef ScRefHdlrImpl<ScValidationDlg, SfxTabDialog, false> ScValidationDlgBase; - DECL_LINK( OkHdl, Button * ); - ScTabViewShell *m_pTabVwSh; VclPtr<VclHBox> m_pHBox; sal_uInt16 m_nValuePageId; diff --git a/sc/source/ui/miscdlgs/mvtabdlg.cxx b/sc/source/ui/miscdlgs/mvtabdlg.cxx index b589a592f5a0..7948d09111f4 100644 --- a/sc/source/ui/miscdlgs/mvtabdlg.cxx +++ b/sc/source/ui/miscdlgs/mvtabdlg.cxx @@ -92,14 +92,6 @@ void ScMoveTableDlg::SetForceCopyTable() pBtnCopy->Disable(); } -void ScMoveTableDlg::EnableCopyTable(bool bFlag) -{ - if(bFlag) - pBtnCopy->Enable(); - else - pBtnCopy->Disable(); -} - void ScMoveTableDlg::EnableRenameTable(bool bFlag) { bRenameTable = bFlag; diff --git a/sc/source/ui/optdlg/calcoptionsdlg.hxx b/sc/source/ui/optdlg/calcoptionsdlg.hxx index 4d80e9657b0d..ff29e4bd9f6d 100644 --- a/sc/source/ui/optdlg/calcoptionsdlg.hxx +++ b/sc/source/ui/optdlg/calcoptionsdlg.hxx @@ -40,7 +40,6 @@ public: DECL_LINK( BtnAutomaticSelectHdl, void* ); DECL_LINK( DeviceSelHdl, void* ); - DECL_LINK( NumModifiedHdl, void * ); DECL_LINK( EditModifiedHdl, Edit * ); DECL_STATIC_LINK( ScCalcOptionsDialog, TestClickHdl, PushButton* ); DECL_LINK( AsZeroModifiedHdl, CheckBox*); diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx index 6702194630e1..42e4bcac6352 100644 --- a/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx +++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx @@ -101,7 +101,6 @@ private: DECL_LINK( CBOXMergnCellClkHdl, void * ); DECL_LINK( CBOXWrapTextClkHdl, void * ); DECL_LINK( AngleModifiedHdl, void * ); - DECL_LINK( RotationHdl, void * ); DECL_LINK( ClickStackHdl, void * ); DECL_LINK( ReferenceEdgeHdl, Control* ); diff --git a/sd/inc/sdhtmlfilter.hxx b/sd/inc/sdhtmlfilter.hxx index 356d3a2dce09..487a5d7c024a 100644 --- a/sd/inc/sdhtmlfilter.hxx +++ b/sd/inc/sdhtmlfilter.hxx @@ -34,10 +34,6 @@ public: virtual ~SdHTMLFilter(); virtual bool Export() SAL_OVERRIDE; - -private: - DECL_LINK( IOProgressHdl, sal_uInt16* ); - }; #endif // INCLUDED_SD_INC_SDHTMLFILTER_HXX diff --git a/sd/source/ui/inc/PresentationViewShell.hxx b/sd/source/ui/inc/PresentationViewShell.hxx index e91ae3de7ad6..7a837567c778 100644 --- a/sd/source/ui/inc/PresentationViewShell.hxx +++ b/sd/source/ui/inc/PresentationViewShell.hxx @@ -32,7 +32,6 @@ class PresentationViewShell : public DrawViewShell public: TYPEINFO_OVERRIDE(); - SFX_DECL_VIEWFACTORY(PresViewShell); SFX_DECL_INTERFACE( SD_IF_SDPRESVIEWSHELL ) private: diff --git a/sd/source/ui/inc/fuformatpaintbrush.hxx b/sd/source/ui/inc/fuformatpaintbrush.hxx index 13ec578608a2..46622c6cfd55 100644 --- a/sd/source/ui/inc/fuformatpaintbrush.hxx +++ b/sd/source/ui/inc/fuformatpaintbrush.hxx @@ -45,7 +45,6 @@ public: virtual void Deactivate() SAL_OVERRIDE; static void GetMenuState( DrawViewShell& rDrawViewShell, SfxItemSet &rSet ); - static bool CanCopyThisType( sal_uInt32 nObjectInventor, sal_uInt16 nObjectIdentifier ); private: FuFormatPaintBrush ( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq); diff --git a/sd/source/ui/inc/unoaprms.hxx b/sd/source/ui/inc/unoaprms.hxx index ee53ca82e434..375bb4b2fbca 100644 --- a/sd/source/ui/inc/unoaprms.hxx +++ b/sd/source/ui/inc/unoaprms.hxx @@ -69,8 +69,6 @@ class SdAnimationPrmsUndoAction : public SdUndoAction ::com::sun::star::presentation::ClickAction eNewClickAction; OUString aOldBookmark; OUString aNewBookmark; - bool bOldInvisibleInPres; - bool bNewInvisibleInPres; sal_uInt16 nOldVerb; sal_uInt16 nNewVerb; sal_uLong nOldPresOrder; @@ -112,8 +110,6 @@ public: , pNewPathObj(NULL) , eOldClickAction(css::presentation::ClickAction_NONE) , eNewClickAction(css::presentation::ClickAction_NONE) - , bOldInvisibleInPres(false) - , bNewInvisibleInPres(false) , nOldVerb(0) , nNewVerb(0) , nOldPresOrder(0) @@ -140,8 +136,6 @@ public: { bOldSoundOn = bTheOldSoundOn; bNewSoundOn = bTheNewSoundOn; } void SetSound(const OUString& aTheOldSound, const OUString& aTheNewSound) { aOldSoundFile = aTheOldSound; aNewSoundFile = aTheNewSound; } - void SetBlueScreen(Color aTheOldBlueScreen, Color aTheNewBlueScreen) - { aOldBlueScreen = aTheOldBlueScreen; aNewBlueScreen = aTheNewBlueScreen; } void SetPlayFull(bool bTheOldPlayFull, bool bTheNewPlayFull) { bOldPlayFull = bTheOldPlayFull; bNewPlayFull = bTheNewPlayFull; } void SetPathObj(SdrPathObj* pTheOldPath, SdrPathObj* pTheNewPath) @@ -150,8 +144,6 @@ public: { eOldClickAction = eTheOldAction; eNewClickAction = eTheNewAction; } void SetBookmark(const OUString& aTheOldBookmark, const OUString& aTheNewBookmark) { aOldBookmark = aTheOldBookmark; aNewBookmark = aTheNewBookmark; } - void SetInvisibleInPres(bool bTheOldInvisibleInPres, bool bTheNewInvisibleInPres) - { bOldInvisibleInPres = bTheOldInvisibleInPres; bNewInvisibleInPres = bTheNewInvisibleInPres; } void SetVerb(sal_uInt16 nTheOldVerb, sal_uInt16 nTheNewVerb) { nOldVerb = nTheOldVerb; nNewVerb = nTheNewVerb; } void SetSecondEffect(::com::sun::star::presentation::AnimationEffect eTheOldEffect, ::com::sun::star::presentation::AnimationEffect eTheNewEffect) @@ -162,8 +154,6 @@ public: { bOldSecondSoundOn = bTheOldSoundOn; bNewSecondSoundOn = bTheNewSoundOn; } void SetSecondPlayFull(bool bTheOldPlayFull, bool bTheNewPlayFull) { bOldSecondPlayFull = bTheOldPlayFull; bNewSecondPlayFull = bTheNewPlayFull; } - void SetPresOrder(sal_uLong nTheOldPresOrder, sal_uLong nTheNewPresOrder) - { nOldPresOrder = nTheOldPresOrder; nNewPresOrder = nTheNewPresOrder; } virtual ~SdAnimationPrmsUndoAction(); virtual void Undo() SAL_OVERRIDE; diff --git a/sd/source/ui/presenter/PresenterCanvas.hxx b/sd/source/ui/presenter/PresenterCanvas.hxx index 606117caca4e..af3b06d718f9 100644 --- a/sd/source/ui/presenter/PresenterCanvas.hxx +++ b/sd/source/ui/presenter/PresenterCanvas.hxx @@ -119,19 +119,6 @@ public: const css::rendering::ViewState& rViewState, const css::awt::Point& raOffset); - css::uno::Reference<css::rendering::XCanvas> GetSharedCanvas() const; - - /** This method is typically called by CanvasPane objects to set the - repaint rectangle of a windowPaint() call as clip rectangle. When - no or an empty rectangle is given then the window bounds are used - instead. - @param rClipRectangle - A valid rectangle is used to clip the view state clip polygon. - When an empty rectangle is given then the view state clip - polygons are clipped against the window bounds. - */ - void SetClip (const css::awt::Rectangle& rClipRectangle); - /** Called by custom sprites to update their clip polygon so that they are clipped at the borders of the canvas. This method has to be called after each change of the sprite location so that the bounds diff --git a/sd/source/ui/sidebar/AllMasterPagesSelector.hxx b/sd/source/ui/sidebar/AllMasterPagesSelector.hxx index e63e00c5b76c..96130c6f6efe 100644 --- a/sd/source/ui/sidebar/AllMasterPagesSelector.hxx +++ b/sd/source/ui/sidebar/AllMasterPagesSelector.hxx @@ -65,8 +65,6 @@ private: const css::uno::Reference<css::ui::XSidebar>& rxSidebar); virtual ~AllMasterPagesSelector(); - void AddTemplate (const TemplateEntry& rEntry); - void AddItem (MasterPageContainer::Token aToken); /** Add all items in the internal master page list into the given list. diff --git a/sd/source/ui/sidebar/IDisposable.hxx b/sd/source/ui/sidebar/IDisposable.hxx index 3bad77980735..ee4424f3000c 100644 --- a/sd/source/ui/sidebar/IDisposable.hxx +++ b/sd/source/ui/sidebar/IDisposable.hxx @@ -29,7 +29,6 @@ namespace sd { namespace sidebar { class IDisposable { public: - virtual void Dispose() = 0; virtual ~IDisposable(); }; diff --git a/sd/source/ui/sidebar/ISidebarReceiver.hxx b/sd/source/ui/sidebar/ISidebarReceiver.hxx index 2c5867391981..4e6b8de1d29b 100644 --- a/sd/source/ui/sidebar/ISidebarReceiver.hxx +++ b/sd/source/ui/sidebar/ISidebarReceiver.hxx @@ -26,8 +26,6 @@ namespace sd { namespace sidebar { class ISidebarReceiver { public: - virtual void SetSidebar (const ::com::sun::star::uno::Reference< - ::com::sun::star::ui::XSidebar>& rxSidebar) = 0; virtual ~ISidebarReceiver(); }; diff --git a/sd/source/ui/sidebar/MasterPageContainer.hxx b/sd/source/ui/sidebar/MasterPageContainer.hxx index b1db0558dc41..9b28bef0e152 100644 --- a/sd/source/ui/sidebar/MasterPageContainer.hxx +++ b/sd/source/ui/sidebar/MasterPageContainer.hxx @@ -158,10 +158,6 @@ private: class Implementation; ::boost::shared_ptr<Implementation> mpImpl; PreviewSize mePreviewSize; - - /** Retrieve the preview of the document specified by the given URL. - */ - static BitmapEx LoadPreviewFromURL (const OUString& aURL); }; /** For some changes to the set of master pages in a MasterPageContainer or diff --git a/sd/source/ui/sidebar/MasterPagesSelector.hxx b/sd/source/ui/sidebar/MasterPagesSelector.hxx index 179f57a4089d..801254b0ead5 100644 --- a/sd/source/ui/sidebar/MasterPagesSelector.hxx +++ b/sd/source/ui/sidebar/MasterPagesSelector.hxx @@ -67,19 +67,6 @@ public: virtual void LateInit(); - /** Return the height that this control needs to show all of its lines. - */ - long GetRequiredHeight (int nWidth) const; - - /** The given master page, either the master page of a slide or a notes - page, is cloned and inserted into mrDocument. The necessary styles - are copied as well. - */ - static SdPage* AddMasterPage ( - SdDrawDocument* pTargetDocument, - SdPage* pMasterPage, - sal_uInt16 nInsertionIndex); - sal_Int32 GetPreferredHeight (sal_Int32 nWidth); /** Update the selection of previews according to whatever @@ -96,8 +83,6 @@ public: */ virtual void UpdateSelection(); - void FillPageSet(); - /** Make the selector empty. This method clear the value set from any entries. Override this method to add functionality, especially to destroy objects set as data items at the value set. diff --git a/sd/source/ui/sidebar/PanelBase.cxx b/sd/source/ui/sidebar/PanelBase.cxx index c7bcde32e36a..3aaa0b2cd90f 100644 --- a/sd/source/ui/sidebar/PanelBase.cxx +++ b/sd/source/ui/sidebar/PanelBase.cxx @@ -47,12 +47,6 @@ void PanelBase::dispose() Control::dispose(); } -void PanelBase::Dispose() -{ - OSL_TRACE("PanelBase::DisposeL: deleting wrapped control at %p", mpWrappedControl.get()); - mpWrappedControl.disposeAndClear(); -} - css::ui::LayoutSize PanelBase::GetHeightForWidth (const sal_Int32 /*nWidth*/) { sal_Int32 nHeight (0); @@ -70,13 +64,6 @@ void PanelBase::Resize() } } -void PanelBase::SetSidebar (const css::uno::Reference<css::ui::XSidebar>& rxSidebar) -{ - mxSidebar = rxSidebar; - if (mxSidebar.is() && mpWrappedControl!=nullptr) - mxSidebar->requestLayout(); -} - bool PanelBase::ProvideWrappedControl() { if ( ! mpWrappedControl) diff --git a/sd/source/ui/sidebar/PanelBase.hxx b/sd/source/ui/sidebar/PanelBase.hxx index a9971fc5d9f6..b05e1a7a77fb 100644 --- a/sd/source/ui/sidebar/PanelBase.hxx +++ b/sd/source/ui/sidebar/PanelBase.hxx @@ -49,15 +49,9 @@ public: virtual void Resize() SAL_OVERRIDE; - // IDisposable - virtual void Dispose() SAL_OVERRIDE; - // ILayoutableWindow virtual css::ui::LayoutSize GetHeightForWidth (const sal_Int32 nWidth) SAL_OVERRIDE; - // ISidebarReceiver - virtual void SetSidebar (const css::uno::Reference<css::ui::XSidebar>& rxSidebar) SAL_OVERRIDE; - protected: VclPtr<vcl::Window> mpWrappedControl; virtual vcl::Window* CreateWrappedControl ( diff --git a/sot/source/base/object.cxx b/sot/source/base/object.cxx index 1cb951b3fbfc..88e457e4bd8e 100644 --- a/sot/source/base/object.cxx +++ b/sot/source/base/object.cxx @@ -42,15 +42,6 @@ SotFactory * SotObject::ClassFactory() return *ppFactory; } -void * SotObject::CreateInstance( SotObject ** ppObj ) -{ - SotObject * p = new SotObject(); - if( ppObj ) - *ppObj = p; - return p; -} - - void * SotObject::Cast( const SotFactory * pFact ) { void * pRet = NULL; diff --git a/sot/source/sdstor/stgavl.cxx b/sot/source/sdstor/stgavl.cxx index 0b6e20bb3e6a..be26ac00f909 100644 --- a/sot/source/sdstor/stgavl.cxx +++ b/sot/source/sdstor/stgavl.cxx @@ -365,20 +365,7 @@ bool StgAvlNode::Remove( StgAvlNode** pRoot, StgAvlNode* pDel, bool bDel ) // Move node to a different tree. Returns true is found and moved. This routine // may be called when the key has changed. -bool StgAvlNode::Move( StgAvlNode** pRoot1, StgAvlNode** pRoot2, StgAvlNode* pMove ) -{ - if ( !pRoot1 ) - return false; - // special case - empty tree - if( *pRoot1 == NULL ) - return false; - pMove = Rem( pRoot1, pMove, false ); - if( pMove ) - return Insert( pRoot2, pMove ); - else - return false; -} ////////////////////////// class AvlIterator diff --git a/sot/source/sdstor/stgavl.hxx b/sot/source/sdstor/stgavl.hxx index c59d25af82a9..ad3d44d870ac 100644 --- a/sot/source/sdstor/stgavl.hxx +++ b/sot/source/sdstor/stgavl.hxx @@ -45,7 +45,6 @@ public: StgAvlNode* Find( StgAvlNode* ); static bool Insert( StgAvlNode**, StgAvlNode* ); static bool Remove( StgAvlNode**, StgAvlNode*, bool bDel = true ); - static bool Move( StgAvlNode**, StgAvlNode**, StgAvlNode* ); virtual short Compare( const StgAvlNode* ) const = 0; }; diff --git a/sot/source/sdstor/stgdir.cxx b/sot/source/sdstor/stgdir.cxx index cb88ca5def0f..8af41b05bd1b 100644 --- a/sot/source/sdstor/stgdir.cxx +++ b/sot/source/sdstor/stgdir.cxx @@ -985,27 +985,4 @@ StgDirEntry* StgDirStrm::Create( StgDirEntry& rStg, const OUString& rName, StgEn return pRes; } -// Rename the given entry. - -bool StgDirStrm::Rename( StgDirEntry& rStg, const OUString& rOld, const OUString& rNew ) -{ - StgDirEntry* p = Find( rStg, rOld ); - if( p ) - { - - if( !StgAvlNode::Remove( reinterpret_cast<StgAvlNode**>(&rStg.pDown), p, false ) ) - return false; - p->aEntry.SetName( rNew ); - if( !StgAvlNode::Insert( reinterpret_cast<StgAvlNode**>(&rStg.pDown), p ) ) - return false; - p->bRenamed = 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 e8c3ec7acb90..d810b6d9397f 100644 --- a/sot/source/sdstor/stgdir.hxx +++ b/sot/source/sdstor/stgdir.hxx @@ -103,7 +103,6 @@ public: StgDirEntry* GetRoot() { return pRoot; } StgDirEntry* Find( StgDirEntry&, const OUString& ); StgDirEntry* Create( StgDirEntry&, const OUString&, StgEntryType ); - bool Rename( StgDirEntry&, const OUString&, const OUString& ); }; class StgIterator : public StgAvlIterator diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx index 70dd249b7a2d..00a4801d0778 100644 --- a/sot/source/sdstor/storage.cxx +++ b/sot/source/sdstor/storage.cxx @@ -64,16 +64,6 @@ SotFactory * SotStorageStream::ClassFactory() return *ppFactory; } -void * SotStorageStream::CreateInstance( SotObject ** ppObj ) -{ - SotStorageStream * p = new SotStorageStream(); - SotObject* pSuper1 = p; - SotObject* pBasicObj = pSuper1; - if( ppObj ) - *ppObj = pBasicObj; - return p; -} - void * SotStorageStream::Cast( const SotFactory * pFact ) { void * pRet = NULL; @@ -323,16 +313,6 @@ SotFactory * SotStorage::ClassFactory() return *ppFactory; } -void * SotStorage::CreateInstance( SotObject ** ppObj ) -{ - SotStorage * p = new SotStorage(); - SotObject* pSuper1 = p; - SotObject* pBasicObj = pSuper1; - if( ppObj ) - *ppObj = pBasicObj; - return p; -} - void * SotStorage::Cast( const SotFactory * pFact ) { void * pRet = NULL; diff --git a/svtools/source/misc/transfer2.cxx b/svtools/source/misc/transfer2.cxx index c3e09908153d..b74bcd50223c 100644 --- a/svtools/source/misc/transfer2.cxx +++ b/svtools/source/misc/transfer2.cxx @@ -340,24 +340,6 @@ bool DropTargetHelper::IsDropFormatSupported( SotClipboardFormatId nFormat ) -bool DropTargetHelper::IsDropFormatSupported( const DataFlavor& rFlavor ) -{ - DataFlavorExVector::iterator aIter( mpFormats->begin() ), aEnd( mpFormats->end() ); - bool bRet = false; - - while( aIter != aEnd ) - { - if( TransferableDataHelper::IsEqual( rFlavor, *aIter++ ) ) - { - bRet = true; - aIter = aEnd; - } - } - - return bRet; -} - - // TransferDataContainer diff --git a/svx/source/inc/fmcontrolbordermanager.hxx b/svx/source/inc/fmcontrolbordermanager.hxx index bbce39c3ac35..26dd6626485d 100644 --- a/svx/source/inc/fmcontrolbordermanager.hxx +++ b/svx/source/inc/fmcontrolbordermanager.hxx @@ -54,11 +54,6 @@ namespace svxform ,nBorderColor( 0x00000000 ) { } - inline void clear() - { - nBorderType = ::com::sun::star::awt::VisualEffect::FLAT; - nBorderColor = 0x00000000; - } }; struct UnderlineDescriptor @@ -77,12 +72,6 @@ namespace svxform ,nUnderlineColor( _nUnderlineColor ) { } - - inline void clear() - { - nUnderlineType = ::com::sun::star::awt::FontUnderline::NONE; - nUnderlineColor = 0x00000000; - } }; struct ControlData : public BorderDescriptor, UnderlineDescriptor diff --git a/sw/inc/charatr.hxx b/sw/inc/charatr.hxx index 8a1b5573ece9..5dd029a4f073 100644 --- a/sw/inc/charatr.hxx +++ b/sw/inc/charatr.hxx @@ -85,8 +85,6 @@ inline const SvxFontHeightItem &SwAttrSet::GetCJKSize(bool bInP) const { return static_cast<const SvxFontHeightItem&>(Get( RES_CHRATR_CJK_FONTSIZE,bInP)); } inline const SvxFontHeightItem &SwAttrSet::GetCTLSize(bool bInP) const { return static_cast<const SvxFontHeightItem&>(Get( RES_CHRATR_CTL_FONTSIZE,bInP)); } -inline const SvxPropSizeItem &SwAttrSet::GetPropSize(bool bInP) const - { return static_cast<const SvxPropSizeItem&>(Get( RES_CHRATR_PROPORTIONALFONTSIZE,bInP)); } inline const SvxFontItem &SwAttrSet::GetFont(bool bInP) const { return static_cast<const SvxFontItem&>(Get( RES_CHRATR_FONT,bInP)); } inline const SvxFontItem &SwAttrSet::GetCJKFont(bool bInP) const @@ -95,8 +93,6 @@ inline const SvxFontItem &SwAttrSet::GetCTLFont(bool bInP) const { return static_cast<const SvxFontItem&>(Get( RES_CHRATR_CTL_FONT,bInP)); } inline const SvxColorItem &SwAttrSet::GetColor(bool bInP) const { return static_cast<const SvxColorItem&>(Get( RES_CHRATR_COLOR,bInP)); } -inline const SvxCharSetColorItem &SwAttrSet::GetCharSetColor(bool bInP) const - { return static_cast<const SvxCharSetColorItem&>(Get( RES_CHRATR_CHARSETCOLOR,bInP)); } inline const SvxLanguageItem &SwAttrSet::GetLanguage(bool bInP) const { return static_cast<const SvxLanguageItem&>(Get( RES_CHRATR_LANGUAGE,bInP)); } inline const SvxLanguageItem &SwAttrSet::GetCJKLanguage(bool bInP) const @@ -111,10 +107,6 @@ inline const SvxNoHyphenItem &SwAttrSet::GetNoHyphenHere(bool bInP) const { return static_cast<const SvxNoHyphenItem&>(Get( RES_CHRATR_NOHYPHEN,bInP)); } inline const SvxBlinkItem &SwAttrSet::GetBlink(bool bInP) const { return static_cast<const SvxBlinkItem&>(Get( RES_CHRATR_BLINK,bInP)); } -inline const SvxBrushItem &SwAttrSet::GetChrBackground( bool bInP ) const - { return static_cast<const SvxBrushItem&>(Get( RES_CHRATR_BACKGROUND, bInP )); } -inline const SvxBrushItem &SwAttrSet::GetChrHighlight( bool bInP ) const - { return static_cast<const SvxBrushItem&>(Get( RES_CHRATR_HIGHLIGHT, bInP )); } inline const SvxEmphasisMarkItem &SwAttrSet::GetEmphasisMark( bool bInP ) const { return static_cast<const SvxEmphasisMarkItem&>(Get( RES_CHRATR_EMPHASIS_MARK, bInP )); } inline const SvxTwoLinesItem &SwAttrSet::Get2Lines( bool bInP ) const @@ -127,10 +119,6 @@ inline const SvxCharReliefItem &SwAttrSet::GetCharRelief( bool bInP ) const { return static_cast<const SvxCharReliefItem&>(Get( RES_CHRATR_RELIEF, bInP )); } inline const SvxCharHiddenItem &SwAttrSet::GetCharHidden( bool bInP ) const { return static_cast<const SvxCharHiddenItem&>(Get( RES_CHRATR_HIDDEN, bInP )); } -inline const SvxBoxItem &SwAttrSet::GetCharBorder( bool bInP ) const - { return static_cast<const SvxBoxItem&>(Get( RES_CHRATR_BOX, bInP )); } -inline const SvxShadowItem &SwAttrSet::GetCharShadow( bool bInP ) const - { return static_cast<const SvxShadowItem&>(Get( RES_CHRATR_SHADOW, bInP )); } // implementation of the character attribute methods of SwFormat diff --git a/sw/inc/swatrset.hxx b/sw/inc/swatrset.hxx index 418d67d4de63..c40e2662a513 100644 --- a/sw/inc/swatrset.hxx +++ b/sw/inc/swatrset.hxx @@ -230,17 +230,13 @@ public: inline const SvxOverlineItem &GetOverline( bool = true ) const; inline const SvxCrossedOutItem &GetCrossedOut( bool = true ) const; inline const SvxFontHeightItem &GetSize( bool = true ) const; - inline const SvxPropSizeItem &GetPropSize( bool = true ) const; inline const SvxFontItem &GetFont( bool = true ) const; inline const SvxColorItem &GetColor( bool = true ) const; - inline const SvxCharSetColorItem &GetCharSetColor( bool = true ) const; inline const SvxLanguageItem &GetLanguage( bool = true ) const; inline const SvxEscapementItem &GetEscapement( bool = true ) const; inline const SvxCaseMapItem &GetCaseMap( bool = true ) const; inline const SvxNoHyphenItem &GetNoHyphenHere( bool = true ) const; inline const SvxBlinkItem &GetBlink( bool = true ) const; - inline const SvxBrushItem &GetChrBackground( bool = true ) const; - inline const SvxBrushItem &GetChrHighlight( bool = true ) const; inline const SvxFontItem &GetCJKFont( bool = true ) const; inline const SvxFontHeightItem &GetCJKSize( bool = true ) const; inline const SvxLanguageItem &GetCJKLanguage( bool = true ) const; @@ -257,8 +253,6 @@ public: inline const SvxCharRotateItem &GetCharRotate( bool = true ) const; inline const SvxCharReliefItem &GetCharRelief( bool = true ) const; inline const SvxCharHiddenItem &GetCharHidden( bool = true ) const; - inline const SvxBoxItem &GetCharBorder( bool = true ) const; - inline const SvxShadowItem &GetCharShadow( bool = true ) const; // Frame attributes. Implementation in frmatr.hxx. inline const SwFormatFillOrder &GetFillOrder( bool = true ) const; diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx index 076352107411..e9c96e137bb3 100644 --- a/sw/source/core/inc/swfont.hxx +++ b/sw/source/core/inc/swfont.hxx @@ -65,9 +65,6 @@ class SwSubFont : public SvxFont const sal_uInt16 nOldAscent ) const; void CalcEsc( SwDrawTextInfo& rInf, Point& rPos ); - inline void CopyMagic( const SwSubFont& rFnt ) - { pMagic = rFnt.pMagic; nFntIndex = rFnt.nFntIndex; } - SwSubFont& operator=( const SwSubFont &rFont ); short _CheckKerning( ); @@ -999,12 +996,6 @@ public: } inline SvStatistics() { Reset(); } - - inline bool IsEmpty() const - { - return !( nGetTextSize || nDrawText || - nDrawStretchText || nChangeFont || nGetFontMetric ); - } }; // global variable, implemented in swfont.cxx diff --git a/ucb/source/ucp/ftp/ftpcontent.hxx b/ucb/source/ucp/ftp/ftpcontent.hxx index 265771ba1e3c..71f4c4a7146f 100644 --- a/ucb/source/ucp/ftp/ftpcontent.hxx +++ b/ucb/source/ucp/ftp/ftpcontent.hxx @@ -89,10 +89,6 @@ public: static OUString getImplementationName_Static(); static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - static css::uno::Reference< css::lang::XSingleServiceFactory > - createServiceFactory( const css::uno::Reference< - css::lang::XMultiServiceFactory >& rxServiceMgr ); - // XContent virtual OUString SAL_CALL getContentType() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; diff --git a/vcl/generic/print/genprnpsp.cxx b/vcl/generic/print/genprnpsp.cxx index b64206f6168f..1a18c80476b8 100644 --- a/vcl/generic/print/genprnpsp.cxx +++ b/vcl/generic/print/genprnpsp.cxx @@ -951,13 +951,6 @@ bool PspSalPrinter::EndJob() return bSuccess; } -bool PspSalPrinter::AbortJob() -{ - bool bAbort = m_aPrintJob.AbortJob(); - GetSalData()->m_pInstance->jobEndedPrinterUpdate(); - return bAbort; -} - SalGraphics* PspSalPrinter::StartPage( ImplJobSetup* pJobSetup, bool ) { OSL_TRACE("PspSalPrinter::StartPage"); diff --git a/vcl/inc/generic/genprn.h b/vcl/inc/generic/genprn.h index 5c903c6ab834..00639d336fc5 100644 --- a/vcl/inc/generic/genprn.h +++ b/vcl/inc/generic/genprn.h @@ -86,7 +86,6 @@ public: ImplJobSetup*, vcl::PrinterController& i_rController ) SAL_OVERRIDE; virtual bool EndJob() SAL_OVERRIDE; - virtual bool AbortJob() SAL_OVERRIDE; virtual SalGraphics* StartPage( ImplJobSetup* pSetupData, bool bNewJobData ) SAL_OVERRIDE; virtual bool EndPage() SAL_OVERRIDE; virtual sal_uIntPtr GetErrorCode() SAL_OVERRIDE; diff --git a/vcl/inc/ilstbox.hxx b/vcl/inc/ilstbox.hxx index 39746dc7f35f..5a010e957748 100644 --- a/vcl/inc/ilstbox.hxx +++ b/vcl/inc/ilstbox.hxx @@ -313,7 +313,6 @@ public: bool IsTrackingSelect() const { return mbTrackingSelect; } void SetUserItemSize( const Size& rSz ); - const Size& GetUserItemSize() const { return maUserItemSize; } void EnableUserDraw( bool bUserDraw ) { mbUserDrawEnabled = bUserDraw; } bool IsUserDrawEnabled() const { return mbUserDrawEnabled; } @@ -325,7 +324,6 @@ public: bool IsMultiSelectionSimpleMode() const { return mbSimpleMode; } void EnableMouseMoveSelect( bool bMouseMoveSelect ) { mbMouseMoveSelect = bMouseMoveSelect; } - bool IsMouseMoveSelectEnabled() const { return mbMouseMoveSelect; } bool IsMouseMoveSelect() const { return mbMouseMoveSelect||mbStackMode; } Size CalcSize(sal_Int32 nMaxLines) const; @@ -335,7 +333,6 @@ public: long GetMaxEntryWidth() const { return mnMaxWidth; } void SetScrollHdl( const Link<>& rLink ) { maScrollHdl = rLink; } - const Link<>& GetScrollHdl() const { return maScrollHdl; } void SetSelectHdl( const Link<>& rLink ) { maSelectHdl = rLink; } const Link<>& GetSelectHdl() const { return maSelectHdl; } void SetCancelHdl( const Link<>& rLink ) { maCancelHdl = rLink; } @@ -343,7 +340,6 @@ public: void SetDoubleClickHdl( const Link<>& rLink ) { maDoubleClickHdl = rLink; } const Link<>& GetDoubleClickHdl() const { return maDoubleClickHdl; } void SetMRUChangedHdl( const Link<>& rLink ) { maMRUChangedHdl = rLink; } - const Link<>& GetMRUChangedHdl() const { return maMRUChangedHdl; } void SetFocusHdl( const Link<>& rLink ) { maFocusHdl = rLink ; } const Link<>& GetFocusHdl() const { return maFocusHdl; } @@ -370,7 +366,6 @@ public: void EnableQuickSelection( const bool& b ); using Control::ImplInitSettings; - void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); virtual void ApplySettings(vcl::RenderContext& rRenderContext) SAL_OVERRIDE; protected: @@ -450,11 +445,9 @@ public: bool IsVisible( sal_Int32 nEntry ) const { return maLBWindow->IsVisible( nEntry ); } void SetProminentEntryType( ProminentEntry eType ) { maLBWindow->SetProminentEntryType( eType ); } - ProminentEntry GetProminentEntryType() const { return maLBWindow->GetProminentEntryType(); } long GetLeftIndent() const { return maLBWindow->GetLeftIndent(); } void SetLeftIndent( sal_uInt16 n ) { maLBWindow->SetLeftIndent( n ); } - void ScrollHorz( short nDiff ) { maLBWindow->ScrollHorz( nDiff ); } void SetTravelSelect( bool bTravelSelect ) { maLBWindow->SetTravelSelect( bTravelSelect ); } bool IsTravelSelect() const { return maLBWindow->IsTravelSelect(); } @@ -464,7 +457,6 @@ public: bool IsMultiSelectionEnabled() const { return maLBWindow->IsMultiSelectionEnabled(); } void SetMultiSelectionSimpleMode( bool bSimple ) { maLBWindow->SetMultiSelectionSimpleMode( bSimple ); } - bool IsMultiSelectionSimpleMode() const { return maLBWindow->IsMultiSelectionSimpleMode(); } void SetReadOnly( bool b ) { maLBWindow->SetReadOnly( b ); } bool IsReadOnly() const { return maLBWindow->IsReadOnly(); } @@ -474,20 +466,14 @@ public: long GetMaxEntryWidth() const { return maLBWindow->GetMaxEntryWidth(); } void SetScrollHdl( const Link<>& rLink ) { maScrollHdl = rLink; } - const Link<>& GetScrollHdl() const { return maScrollHdl; } void SetSelectHdl( const Link<>& rLink ) { maLBWindow->SetSelectHdl( rLink ); } - const Link<>& GetSelectHdl() const { return maLBWindow->GetSelectHdl(); } void SetCancelHdl( const Link<>& rLink ) { maLBWindow->SetCancelHdl( rLink ); } - const Link<>& GetCancelHdl() const { return maLBWindow->GetCancelHdl(); } void SetDoubleClickHdl( const Link<>& rLink ) { maLBWindow->SetDoubleClickHdl( rLink ); } - const Link<>& GetDoubleClickHdl() const { return maLBWindow->GetDoubleClickHdl(); } boost::signals2::signal< void ( UserDrawEvent* ) > userDrawSignal; void SetFocusHdl( const Link<>& rLink ) { maLBWindow->SetFocusHdl( rLink ); } - const Link<>& GetFocusHdl() const { return maLBWindow->GetFocusHdl(); } void SetListItemSelectHdl( const Link<>& rLink ) { maLBWindow->SetListItemSelectHdl( rLink ); } - const Link<>& GetListItemSelectHdl() const { return maLBWindow->GetListItemSelectHdl(); } void SetSelectionChangedHdl( const Link<>& rLnk ) { maLBWindow->GetEntryList()->SetSelectionChangedHdl( rLnk ); } void SetCallSelectionChangedHdl( bool bCall ) { maLBWindow->GetEntryList()->SetCallSelectionChangedHdl( bCall ); } bool IsSelectionChanged() const { return maLBWindow->IsSelectionChanged(); } @@ -530,7 +516,6 @@ public: const Size& GetPrefSize() const { return maPrefSz; } void SetAutoWidth( bool b ) { mbAutoWidth = b; } - bool IsAutoWidth() const { return mbAutoWidth; } Size CalcFloatSize(); void StartFloat( bool bStartTracking ); @@ -581,10 +566,8 @@ public: sal_Int32 GetItemPos() const { return mnItemPos; } void SetItemPos( sal_Int32 n ) { mnItemPos = n; } - const OUString& GetString() const { return maString; } void SetString( const OUString& rStr ) { maString = rStr; } - const Image& GetImage() const { return maImage; } void SetImage( const Image& rImg ) { maImage = rImg; } void MBDown(); @@ -593,7 +576,6 @@ public: boost::signals2::signal< void ( UserDrawEvent* ) > userDrawSignal; void SetUserItemSize( const Size& rSz ) { maUserItemSize = rSz; } - const Size& GetUserItemSize() const { return maUserItemSize; } void EnableUserDraw( bool bUserDraw ) { mbUserDrawEnabled = bUserDraw; } bool IsUserDrawEnabled() const { return mbUserDrawEnabled; } diff --git a/vcl/inc/osx/salprn.h b/vcl/inc/osx/salprn.h index 435e5b0f8ba8..51964643d37e 100644 --- a/vcl/inc/osx/salprn.h +++ b/vcl/inc/osx/salprn.h @@ -137,7 +137,6 @@ class AquaSalPrinter : public SalPrinter vcl::PrinterController& i_rListener ) SAL_OVERRIDE; virtual bool EndJob() SAL_OVERRIDE; - virtual bool AbortJob() SAL_OVERRIDE; virtual SalGraphics* StartPage( ImplJobSetup* i_pSetupData, bool i_bNewJobData ) SAL_OVERRIDE; virtual bool EndPage() SAL_OVERRIDE; virtual sal_uLong GetErrorCode() SAL_OVERRIDE; diff --git a/vcl/inc/salprn.hxx b/vcl/inc/salprn.hxx index d719b48be4d3..0d688bdc488a 100644 --- a/vcl/inc/salprn.hxx +++ b/vcl/inc/salprn.hxx @@ -107,7 +107,6 @@ public: vcl::PrinterController& rController ); virtual bool EndJob() = 0; - virtual bool AbortJob() = 0; virtual SalGraphics* StartPage( ImplJobSetup* pSetupData, bool bNewJobData ) = 0; virtual bool EndPage() = 0; virtual sal_uLong GetErrorCode() = 0; diff --git a/vcl/inc/win/saldata.hxx b/vcl/inc/win/saldata.hxx index 519b24489de9..ed8a2fd9a2ec 100644 --- a/vcl/inc/win/saldata.hxx +++ b/vcl/inc/win/saldata.hxx @@ -212,8 +212,6 @@ int ImplSalWICompareAscii( const wchar_t* pStr1, const char* pStr2 ); #define SAL_MOUSELEAVE_TIMEOUT 300 -// wParam == hDC; lParam == 0 -#define SAL_MSG_PRINTABORTJOB (WM_USER+110) // wParam == bWait; lParam == 0 #define SAL_MSG_THREADYIELD (WM_USER+111) // wParam == 0; lParam == 0 diff --git a/vcl/inc/win/salinst.h b/vcl/inc/win/salinst.h index 6eab9b3227ef..6c413143f555 100644 --- a/vcl/inc/win/salinst.h +++ b/vcl/inc/win/salinst.h @@ -89,7 +89,6 @@ SalFrame* ImplSalCreateFrame( WinSalInstance* pInst, HWND hWndParent, sal_uIntPt SalObject* ImplSalCreateObject( WinSalInstance* pInst, WinSalFrame* pParent ); HWND ImplSalReCreateHWND( HWND hWndParent, HWND oldhWnd, bool bAsChild ); void ImplSalStartTimer( sal_uIntPtr nMS, bool bMutex = false ); -void ImplSalPrinterAbortJobAsync( HDC hPrnDC ); #endif // INCLUDED_VCL_INC_WIN_SALINST_H diff --git a/vcl/inc/win/salprn.h b/vcl/inc/win/salprn.h index 05bfac6cbeb8..1835e79b992f 100644 --- a/vcl/inc/win/salprn.h +++ b/vcl/inc/win/salprn.h @@ -100,7 +100,6 @@ public: bool bDirect, ImplJobSetup* pSetupData ) SAL_OVERRIDE; virtual bool EndJob() SAL_OVERRIDE; - virtual bool AbortJob() SAL_OVERRIDE; virtual SalGraphics* StartPage( ImplJobSetup* pSetupData, bool bNewJobData ) SAL_OVERRIDE; virtual bool EndPage() SAL_OVERRIDE; virtual sal_uIntPtr GetErrorCode() SAL_OVERRIDE; diff --git a/vcl/osx/salprn.cxx b/vcl/osx/salprn.cxx index 99684315c488..7007868b3f36 100644 --- a/vcl/osx/salprn.cxx +++ b/vcl/osx/salprn.cxx @@ -603,11 +603,6 @@ bool AquaSalPrinter::EndJob() return mpInfoPrinter->EndJob(); } -bool AquaSalPrinter::AbortJob() -{ - return mpInfoPrinter->AbortJob(); -} - SalGraphics* AquaSalPrinter::StartPage( ImplJobSetup* i_pSetupData, bool i_bNewJobData ) { return mpInfoPrinter->StartPage( i_pSetupData, i_bNewJobData ); diff --git a/vcl/source/edit/textdat2.hxx b/vcl/source/edit/textdat2.hxx index d18166e662bc..801d55843cfe 100644 --- a/vcl/source/edit/textdat2.hxx +++ b/vcl/source/edit/textdat2.hxx @@ -48,9 +48,9 @@ class TETextPortion { private: sal_uInt16 nLen; - long nWidth; + long nWidth; sal_uInt8 nKind; - sal_uInt8 nRightToLeft; + sal_uInt8 nRightToLeft; TETextPortion() { nLen = 0; nKind = PORTIONKIND_TEXT; nWidth = -1; nRightToLeft = 0;} @@ -61,21 +61,12 @@ public: nWidth= -1; nRightToLeft = 0; } - - sal_uInt16 GetLen() const { return nLen; } sal_uInt16& GetLen() { return nLen; } - - long GetWidth()const { return nWidth; } - long& GetWidth() { return nWidth; } - - sal_uInt8 GetKind() const { return nKind; } + long& GetWidth() { return nWidth; } sal_uInt8& GetKind() { return nKind; } - - sal_uInt8 GetRightToLeft() const { return nRightToLeft; } sal_uInt8& GetRightToLeft() { return nRightToLeft; } - bool IsRightToLeft() const { return (nRightToLeft&1); } - - bool HasValidSize() const { return nWidth != (-1); } + bool IsRightToLeft() const { return (nRightToLeft&1); } + bool HasValidSize() const { return nWidth != (-1); } }; class TETextPortionList : public std::vector<TETextPortion*> @@ -86,7 +77,6 @@ public: void Reset(); sal_uInt16 FindPortion( sal_uInt16 nCharPos, sal_uInt16& rPortionStart, bool bPreferStartingPortion = false ); - sal_uInt16 GetPortionStartIndex( sal_uInt16 nPortion ); void DeleteFromPortion( sal_uInt16 nDelFrom ); }; @@ -123,9 +113,6 @@ public: mbInvalid = true; } - bool IsIn( sal_uInt16 nIndex ) const - { return ( (nIndex >= mnStart ) && ( nIndex < mnEnd ) ); } - bool IsIn( sal_uInt16 nIndex, bool bInclEnd ) const { return ( ( nIndex >= mnStart ) && ( bInclEnd ? ( nIndex <= mnEnd ) : ( nIndex < mnEnd ) ) ); } @@ -152,8 +139,6 @@ public: void SetInvalid() { mbInvalid = true; } void SetValid() { mbInvalid = false; } - bool IsEmpty() const { return mnEnd <= mnStart; } - short GetStartX() const { return mnStartX; } void SetStartX( short n ) { mnStartX = n; } diff --git a/vcl/source/edit/textdoc.hxx b/vcl/source/edit/textdoc.hxx index 566c9f384262..77aa782c7e3d 100644 --- a/vcl/source/edit/textdoc.hxx +++ b/vcl/source/edit/textdoc.hxx @@ -51,7 +51,6 @@ public: void DeleteEmptyAttribs(); void ResortAttribs(); - bool HasEmptyAttribs() const { return mbHasEmptyAttribs; } bool& HasEmptyAttribs() { return mbHasEmptyAttribs; } TextCharAttrib* FindAttrib( sal_uInt16 nWhich, sal_uInt16 nPos ); diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx index 8a794712882f..8726814548b3 100644 --- a/vcl/win/source/app/salinst.cxx +++ b/vcl/win/source/app/salinst.cxx @@ -705,10 +705,6 @@ LRESULT CALLBACK SalComWndProc( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lPar switch ( nMsg ) { - case SAL_MSG_PRINTABORTJOB: - ImplSalPrinterAbortJobAsync( (HDC)wParam ); - rDef = FALSE; - break; case SAL_MSG_THREADYIELD: ImplSalYield( (bool)wParam, (bool)lParam ); rDef = FALSE; diff --git a/vcl/win/source/gdi/salprn.cxx b/vcl/win/source/gdi/salprn.cxx index c6d7623af238..7179e8cbefcc 100644 --- a/vcl/win/source/gdi/salprn.cxx +++ b/vcl/win/source/gdi/salprn.cxx @@ -1607,59 +1607,6 @@ bool WinSalPrinter::EndJob() return TRUE; } -bool WinSalPrinter::AbortJob() -{ - mbAbort = TRUE; - - // trigger Abort asynchronously - HDC hDC = mhDC; - if ( hDC ) - { - SalData* pSalData = GetSalData(); - PostMessageW( pSalData->mpFirstInstance->mhComWnd, - SAL_MSG_PRINTABORTJOB, (WPARAM)hDC, 0 ); - } - - return TRUE; -} - -void ImplSalPrinterAbortJobAsync( HDC hPrnDC ) -{ - SalData* pSalData = GetSalData(); - WinSalPrinter* pPrinter = pSalData->mpFirstPrinter; - - // check if printer still exists - while ( pPrinter ) - { - if ( pPrinter->mhDC == hPrnDC ) - break; - - pPrinter = pPrinter->mpNextPrinter; - } - - // if printer still exists, cancel the job - if ( pPrinter ) - { - HDC hDC = pPrinter->mhDC; - if ( hDC ) - { - if ( pPrinter->mpGraphics ) - { - pPrinter->mpGraphics->DeInitGraphics(); - delete pPrinter->mpGraphics; - pPrinter->mpGraphics = NULL; - } - - CATCH_DRIVER_EX_BEGIN; - ::AbortDoc( hDC ); - CATCH_DRIVER_EX_END( "exception in AbortDoc", pPrinter ); - - DeleteDC( hDC ); - pPrinter->mhDC = 0; - } - } -} - SalGraphics* WinSalPrinter::StartPage( ImplJobSetup* pSetupData, bool bNewJobData ) { if( ! isValid() || mhDC == 0 ) diff --git a/writerfilter/source/dmapper/TableManager.hxx b/writerfilter/source/dmapper/TableManager.hxx index 1a459cd1b784..2429f4d32bae 100644 --- a/writerfilter/source/dmapper/TableManager.hxx +++ b/writerfilter/source/dmapper/TableManager.hxx @@ -120,21 +120,6 @@ class TableManager mbCellEnd = false; } - void resetProps() - { - mpProps.reset(); - } - - void setProps(TablePropertyMapPtr pProps) - { - mpProps = pProps; - } - - TablePropertyMapPtr getProps() - { - return mpProps; - } - void resetCellProps() { mpCellProps.reset(); diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx index 54b9bd33be43..a0a6b45b7fe6 100644 --- a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx +++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx @@ -123,8 +123,6 @@ public: OUString getTargetForId(const OUString & rId); - css::uno::Reference < css::xml::sax::XFastContextHandler > createFromStart(Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs); - void setDocument(OOXMLDocumentImpl* pDocument); OOXMLDocumentImpl* getDocument(); void setXNoteId(OOXMLValue::Pointer_t pValue); @@ -197,7 +195,6 @@ public: void sendPropertyToParent(); - sal_uInt32 getInstanceNumber() { return mnInstanceNumber; } protected: OOXMLFastContextHandler * mpParent; Id mId; diff --git a/writerfilter/source/ooxml/OOXMLPropertySet.hxx b/writerfilter/source/ooxml/OOXMLPropertySet.hxx index 85efac814805..33ec78a92036 100644 --- a/writerfilter/source/ooxml/OOXMLPropertySet.hxx +++ b/writerfilter/source/ooxml/OOXMLPropertySet.hxx @@ -40,8 +40,6 @@ public: virtual std::string toString() const SAL_OVERRIDE = 0; #endif virtual void resolve(Properties & rProperties) = 0; - - virtual Sprm * clone() = 0; }; class OOXMLPropertySet : public writerfilter::Reference<Properties> @@ -55,7 +53,6 @@ public: virtual void add(OOXMLProperty::Pointer_t pProperty) = 0; virtual void add(OOXMLPropertySet::Pointer_t pPropertySet) = 0; virtual OOXMLPropertySet * clone() const = 0; - virtual void setType(const std::string & rsType) = 0; #ifdef DEBUG_WRITERFILTER virtual std::string toString() = 0; diff --git a/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx b/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx index 848b78a8c3fc..81d5bd02402a 100644 --- a/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx +++ b/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx @@ -123,11 +123,6 @@ string OOXMLPropertyImpl::toString() const } #endif -Sprm * OOXMLPropertyImpl::clone() -{ - return new OOXMLPropertyImpl(*this); -} - void OOXMLPropertyImpl::resolve(writerfilter::Properties & rProperties) { writerfilter::Properties * pProperties = nullptr; @@ -157,11 +152,6 @@ OOXMLValue::~OOXMLValue() { } -bool OOXMLValue::getBool() const -{ - return false; -} - int OOXMLValue::getInt() const { return 0; @@ -265,11 +255,6 @@ OOXMLBooleanValue::~OOXMLBooleanValue() { } -bool OOXMLBooleanValue::getBool() const -{ - return mbValue; -} - int OOXMLBooleanValue::getInt() const { return mbValue ? 1 : 0; @@ -460,11 +445,6 @@ OOXMLPropertySet * OOXMLPropertySetImpl::clone() const return new OOXMLPropertySetImpl(*this); } -void OOXMLPropertySetImpl::setType(const string & rsType) -{ - maType = OString(rsType.c_str(), rsType.size()); -} - #ifdef DEBUG_WRITERFILTER string OOXMLPropertySetImpl::toString() { diff --git a/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx b/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx index 3a8c0f74d1d6..65c3ce2f141a 100644 --- a/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx +++ b/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx @@ -43,7 +43,7 @@ public: virtual ~OOXMLValue(); virtual int getInt() const SAL_OVERRIDE; - virtual bool getBool() const; + ; virtual OUString getString() const SAL_OVERRIDE; virtual css::uno::Any getAny() const SAL_OVERRIDE; virtual writerfilter::Reference<Properties>::Pointer_t getProperties() SAL_OVERRIDE; @@ -77,7 +77,6 @@ public: virtual std::string getName() const SAL_OVERRIDE; virtual std::string toString() const SAL_OVERRIDE; #endif - virtual Sprm * clone() SAL_OVERRIDE; virtual void resolve(Properties & rProperties) SAL_OVERRIDE; }; @@ -108,7 +107,6 @@ public: virtual ~OOXMLBooleanValue(); virtual int getInt() const SAL_OVERRIDE; - virtual bool getBool() const SAL_OVERRIDE; virtual css::uno::Any getAny() const SAL_OVERRIDE; #ifdef DEBUG_WRITERFILTER virtual std::string toString() const SAL_OVERRIDE; @@ -175,8 +173,6 @@ public: OOXMLProperties_t::const_iterator begin() const; OOXMLProperties_t::const_iterator end() const; - virtual void setType(const std::string & rsType) SAL_OVERRIDE; - #ifdef DEBUG_WRITERFILTER virtual std::string toString() SAL_OVERRIDE; #endif diff --git a/writerfilter/source/ooxml/OOXMLStreamImpl.hxx b/writerfilter/source/ooxml/OOXMLStreamImpl.hxx index bf900ba1642f..dba1871e4e68 100644 --- a/writerfilter/source/ooxml/OOXMLStreamImpl.hxx +++ b/writerfilter/source/ooxml/OOXMLStreamImpl.hxx @@ -81,7 +81,6 @@ public: virtual css::uno::Reference<css::xml::sax::XFastTokenHandler> getFastTokenHandler() SAL_OVERRIDE; - void setInputStream(css::uno::Reference<css::io::XInputStream> rxInputStream); // Giving access to mxDocumentStream. It is needed by resolving custom xml to get list of customxml's used in document. css::uno::Reference<css::io::XStream> accessDocumentStream() { return mxDocumentStream;} }; diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 7f8f7612b9d7..d398153a2c64 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -260,7 +260,6 @@ RTFDocumentImpl::RTFDocumentImpl(uno::Reference<uno::XComponentContext> const& x m_aStyleTableEntries(), m_nCurrentStyleIndex(0), m_bFormField(false), - m_bIsInFrame(false), m_aUnicodeBuffer(), m_aHexBuffer(), m_bMathNor(false), diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx b/writerfilter/source/rtftok/rtfdocumentimpl.hxx index ae320adf5425..b610de05293e 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx @@ -360,7 +360,6 @@ public: { return *m_pMapperStream; } - void setSubstream(bool bIsSubtream); void setSuperstream(RTFDocumentImpl* pSuperstream); void setStreamType(Id nId); void setAuthor(OUString& rAuthor); @@ -564,8 +563,6 @@ private: RTFReferenceTable::Entries_t m_aStyleTableEntries; int m_nCurrentStyleIndex; bool m_bFormField; - /// If a frame start token is already sent to dmapper (nesting them is not OK). - bool m_bIsInFrame; // Unicode characters are collected here so we don't have to send them one by one. OUStringBuffer m_aUnicodeBuffer; /// Same for hex characters. diff --git a/writerfilter/source/rtftok/rtffly.hxx b/writerfilter/source/rtftok/rtffly.hxx index e33927a2e14a..505002f95af4 100644 --- a/writerfilter/source/rtftok/rtffly.hxx +++ b/writerfilter/source/rtftok/rtffly.hxx @@ -71,11 +71,6 @@ public: return nAnchor; } - sal_uInt16 GetValue() const - { - return nVal; - } - private: sal_uInt16 nVal; }; @@ -99,11 +94,6 @@ public: return OSL_LONIBBLE(OSL_HIBYTE(nVal)); } - sal_uInt16 GetRelAnchor() const - { - return OSL_HINIBBLE(OSL_LOBYTE(nVal)); - } - sal_Int32 GetAlign() const { sal_Int32 nAlign = 0; @@ -148,11 +138,6 @@ public: return nAnchor; } - sal_uInt16 GetValue() const - { - return nVal; - } - private: sal_uInt16 nVal; }; diff --git a/xmloff/source/chart/SchXMLTableContext.hxx b/xmloff/source/chart/SchXMLTableContext.hxx index 1326d300e90d..e9484c481162 100644 --- a/xmloff/source/chart/SchXMLTableContext.hxx +++ b/xmloff/source/chart/SchXMLTableContext.hxx @@ -66,12 +66,6 @@ public: class SchXMLTableHelper { -private: - static void GetCellAddress( const OUString& rStr, sal_Int32& rCol, sal_Int32& rRow ); - static bool GetCellRangeAddress( const OUString& rStr, SchNumericCellRangeAddress& rResult ); - static void AdjustMax( const SchNumericCellRangeAddress& rAddr, - sal_Int32& nRows, sal_Int32& nColumns ); - public: static void applyTableToInternalDataProvider( const SchXMLTable& rTable, com::sun::star::uno::Reference< com::sun::star::chart2::XChartDocument > xChartDoc ); diff --git a/xmloff/source/draw/XMLNumberStylesExport.hxx b/xmloff/source/draw/XMLNumberStylesExport.hxx index ecaf1d1e8773..7d1f062dfdf3 100644 --- a/xmloff/source/draw/XMLNumberStylesExport.hxx +++ b/xmloff/source/draw/XMLNumberStylesExport.hxx @@ -34,9 +34,6 @@ public: static void exportTimeStyle( SdXMLExport& rExport, sal_Int32 nStyle ); static void exportDateStyle( SdXMLExport& rExport, sal_Int32 nStyle ); - static sal_Int32 getDateStyleCount() { return SdXMLDateFormatCount; } - static sal_Int32 getTimeStyleCount() { return SdXMLTimeFormatCount; } - static OUString getTimeStyleName(const sal_Int32 nTimeFormat ); static OUString getDateStyleName(const sal_Int32 nDateFormat ); }; |