[Libreoffice-commits] core.git: accessibility/inc accessibility/source compilerplugins/clang connectivity/source cppcanvas/source cui/source dbaccess/source editeng/source extensions/source fpicker/source framework/inc framework/source hwpfilter/source idlc/inc idl/inc include/connectivity include/cppcanvas include/dbaccess include/sot include/svtools include/svx include/tools include/vcl libreofficekit/source rsc/inc rsc/source sc/inc sc/source sd/inc sd/source sot/source svtools/source svx/source sw/inc sw/source ucb/source vcl/generic vcl/inc vcl/osx vcl/source vcl/win writerfilter/source xmloff/source
Noel Grandin
noel at peralex.com
Wed Aug 5 02:39:46 PDT 2015
accessibility/inc/accessibility/extended/accessibletabbarpage.hxx | 15 --
accessibility/source/extended/accessibletabbarpage.cxx | 25 ---
compilerplugins/clang/store/removevirtuals.cxx | 2
compilerplugins/clang/unusedmethods.cxx | 2
compilerplugins/clang/unusedmethods.py | 75 +++++++++-
compilerplugins/clang/unusedmethodsremove.cxx | 2
connectivity/source/drivers/file/fcode.cxx | 25 ---
connectivity/source/drivers/firebird/Connection.hxx | 3
connectivity/source/drivers/mork/MCatalog.hxx | 2
connectivity/source/drivers/mork/MColumnAlias.hxx | 4
connectivity/source/drivers/mork/MConnection.hxx | 3
connectivity/source/drivers/mork/MDatabaseMetaData.hxx | 4
connectivity/source/drivers/mork/MErrorResource.hxx | 6
connectivity/source/drivers/mork/MNSProfileDiscover.hxx | 4
connectivity/source/drivers/mork/MQueryHelper.hxx | 12 -
connectivity/source/drivers/mork/MorkParser.cxx | 5
connectivity/source/drivers/mork/MorkParser.hxx | 4
connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx | 4
connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx | 4
connectivity/source/drivers/odbc/OTools.cxx | 12 -
connectivity/source/drivers/postgresql/pq_baseresultset.hxx | 3
connectivity/source/drivers/postgresql/pq_xtable.hxx | 23 +--
connectivity/source/drivers/postgresql/pq_xuser.hxx | 13 -
connectivity/source/drivers/postgresql/pq_xview.hxx | 14 -
connectivity/source/inc/OTypeInfo.hxx | 2
connectivity/source/inc/dbase/DIndex.hxx | 3
connectivity/source/inc/dbase/DIndexIter.hxx | 5
connectivity/source/inc/dbase/dindexnode.hxx | 35 ----
connectivity/source/inc/file/FConnection.hxx | 3
connectivity/source/inc/file/FStatement.hxx | 1
connectivity/source/inc/file/fcode.hxx | 8 -
connectivity/source/inc/file/fcomp.hxx | 1
connectivity/source/inc/flat/ETable.hxx | 1
connectivity/source/inc/hsqldb/HTables.hxx | 14 -
connectivity/source/inc/java/ContextClassLoader.hxx | 2
connectivity/source/inc/java/lang/Object.hxx | 1
connectivity/source/inc/mysql/YTables.hxx | 14 -
connectivity/source/inc/odbc/OBoundParam.hxx | 48 ------
connectivity/source/inc/odbc/OConnection.hxx | 6
connectivity/source/inc/odbc/ODatabaseMetaData.hxx | 10 -
connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx | 2
connectivity/source/inc/odbc/OPreparedStatement.hxx | 1
connectivity/source/inc/odbc/OTools.hxx | 6
connectivity/source/sdbcx/VCollection.cxx | 6
cppcanvas/source/inc/canvasgraphichelper.hxx | 3
cppcanvas/source/inc/implrenderer.hxx | 20 --
cppcanvas/source/tools/canvasgraphichelper.cxx | 19 --
cppcanvas/source/wrapper/implcanvas.cxx | 5
cppcanvas/source/wrapper/implcanvas.hxx | 2
cppcanvas/source/wrapper/implcolor.cxx | 8 -
cppcanvas/source/wrapper/implcolor.hxx | 1
cppcanvas/source/wrapper/implfont.cxx | 21 --
cppcanvas/source/wrapper/implfont.hxx | 5
cppcanvas/source/wrapper/implpolypolygon.cxx | 50 ------
cppcanvas/source/wrapper/implpolypolygon.hxx | 4
cppcanvas/source/wrapper/implspritecanvas.cxx | 19 --
cppcanvas/source/wrapper/implspritecanvas.hxx | 1
cui/source/inc/cuitabline.hxx | 1
cui/source/inc/hangulhanjadlg.hxx | 4
cui/source/inc/linkdlg.hxx | 1
cui/source/inc/numpages.hxx | 3
cui/source/inc/optlingu.hxx | 1
cui/source/inc/scriptdlg.hxx | 1
cui/source/inc/thesdlg.hxx | 1
cui/source/inc/treeopt.hxx | 1
cui/source/tabpages/tpline.cxx | 38 -----
dbaccess/source/core/recovery/storagestream.cxx | 18 --
dbaccess/source/core/recovery/storagestream.hxx | 14 -
dbaccess/source/core/recovery/storagetextstream.cxx | 2
dbaccess/source/core/recovery/storagexmlstream.cxx | 4
dbaccess/source/ext/macromigration/rangeprogressbar.hxx | 5
dbaccess/source/filter/xml/xmlComponent.hxx | 1
dbaccess/source/filter/xml/xmlDataSourceInfo.hxx | 1
dbaccess/source/filter/xml/xmlLogin.hxx | 1
dbaccess/source/filter/xml/xmlStyleImport.hxx | 2
dbaccess/source/filter/xml/xmlfilter.cxx | 1
dbaccess/source/filter/xml/xmlfilter.hxx | 4
dbaccess/source/ui/app/AppController.hxx | 7
dbaccess/source/ui/app/AppDetailPageHelper.hxx | 1
dbaccess/source/ui/app/AppDetailView.hxx | 1
dbaccess/source/ui/app/AppIconControl.hxx | 1
dbaccess/source/ui/app/AppSwapWindow.hxx | 1
dbaccess/source/ui/app/AppView.hxx | 2
dbaccess/source/ui/inc/IClipBoardTest.hxx | 2
dbaccess/source/ui/inc/TableDesignHelpBar.hxx | 1
dbaccess/source/ui/inc/TableDesignView.hxx | 1
dbaccess/source/ui/inc/brwctrlr.hxx | 3
dbaccess/source/ui/inc/dbtreelistbox.hxx | 2
dbaccess/source/ui/inc/sbagrid.hxx | 11 -
dbaccess/source/ui/inc/tabletree.hxx | 7
dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx | 1
dbaccess/source/ui/tabledesign/TEditControl.hxx | 1
dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx | 1
editeng/source/editeng/impedit.hxx | 2
editeng/source/editeng/impedit4.cxx | 7
extensions/source/plugin/aqua/sysplug.mm | 18 --
extensions/source/plugin/inc/plugin/aqua/sysplug.hxx | 2
extensions/source/plugin/inc/plugin/impl.hxx | 6
extensions/source/plugin/inc/plugin/model.hxx | 7
extensions/source/plugin/inc/plugin/plcom.hxx | 7
extensions/source/plugin/inc/plugin/unx/mediator.hxx | 21 --
extensions/source/plugin/inc/plugin/unx/sysplug.hxx | 5
extensions/source/plugin/inc/plugin/win/sysplug.hxx | 2
extensions/source/plugin/unx/nppapi.cxx | 19 --
extensions/source/plugin/win/sysplug.cxx | 18 --
extensions/source/propctrlr/propcontroller.hxx | 2
extensions/source/propctrlr/sqlcommanddesign.hxx | 9 -
extensions/source/propctrlr/standardcontrol.hxx | 1
extensions/source/propctrlr/xsddatatypes.hxx | 3
extensions/source/scanner/scanner.hxx | 2
extensions/source/update/check/download.hxx | 4
fpicker/source/office/iodlgimp.hxx | 3
framework/inc/macros/xserviceinfo.hxx | 16 +-
framework/inc/tabwin/tabwindow.hxx | 2
framework/inc/uielement/macrosmenucontroller.hxx | 1
framework/inc/uifactory/configurationaccessfactorymanager.hxx | 4
framework/inc/uifactory/factoryconfiguration.hxx | 4
framework/inc/xml/imagesdocumenthandler.hxx | 5
framework/source/uiconfiguration/imagemanagerimpl.hxx | 1
framework/source/uielement/macrosmenucontroller.cxx | 16 --
hwpfilter/source/hpara.h | 11 -
idl/inc/database.hxx | 1
idlc/inc/idlc/astattribute.hxx | 4
include/connectivity/PColumn.hxx | 7
include/connectivity/formattedcolumnvalue.hxx | 4
include/connectivity/sdbcx/VCollection.hxx | 1
include/connectivity/sqliterator.hxx | 1
include/connectivity/sqlnode.hxx | 2
include/connectivity/sqlscan.hxx | 2
include/cppcanvas/bitmapcanvas.hxx | 8 -
include/cppcanvas/canvas.hxx | 2
include/cppcanvas/canvasgraphic.hxx | 11 -
include/cppcanvas/color.hxx | 1
include/cppcanvas/font.hxx | 6
include/cppcanvas/polypolygon.hxx | 5
include/cppcanvas/spritecanvas.hxx | 9 -
include/dbaccess/dataview.hxx | 4
include/dbaccess/genericcontroller.hxx | 1
include/sot/object.hxx | 1
include/sot/storage.hxx | 2
include/svtools/acceleratorexecute.hxx | 4
include/svtools/transfer.hxx | 1
include/svx/svdetc.hxx | 14 -
include/tools/inetmime.hxx | 14 -
include/vcl/longcurr.hxx | 6
include/vcl/morebtn.hxx | 14 -
include/vcl/spin.hxx | 6
include/vcl/texteng.hxx | 2
include/vcl/textview.hxx | 3
include/vcl/txtattr.hxx | 8 -
include/vcl/xtextedt.hxx | 5
libreofficekit/source/gtk/tilebuffer.cxx | 6
libreofficekit/source/gtk/tilebuffer.hxx | 2
rsc/inc/rscarray.hxx | 1
rsc/inc/rscclobj.hxx | 4
rsc/inc/rscconst.hxx | 4
rsc/inc/rscdb.hxx | 10 -
rsc/inc/rscdef.hxx | 1
rsc/inc/rsclex.hxx | 3
rsc/inc/rscpar.hxx | 4
rsc/inc/rscrange.hxx | 2
rsc/inc/rscrsc.hxx | 2
rsc/inc/rsctools.hxx | 7
rsc/inc/rsctop.hxx | 11 -
rsc/source/res/rscconst.cxx | 7
rsc/source/res/rsctop.cxx | 5
sc/inc/funcdesc.hxx | 3
sc/source/filter/inc/addressconverter.hxx | 3
sc/source/filter/inc/biffinputstream.hxx | 2
sc/source/filter/inc/defnamesbuffer.hxx | 8 -
sc/source/filter/inc/xestream.hxx | 3
sc/source/filter/oox/defnamesbuffer.cxx | 19 --
sc/source/ui/inc/autofmt.hxx | 7
sc/source/ui/inc/condformatdlgentry.hxx | 2
sc/source/ui/inc/dbnamdlg.hxx | 1
sc/source/ui/inc/filtdlg.hxx | 1
sc/source/ui/inc/mvtabdlg.hxx | 1
sc/source/ui/inc/namedlg.hxx | 1
sc/source/ui/inc/tpview.hxx | 4
sc/source/ui/inc/validate.hxx | 2
sc/source/ui/miscdlgs/mvtabdlg.cxx | 8 -
sc/source/ui/optdlg/calcoptionsdlg.hxx | 1
sc/source/ui/sidebar/AlignmentPropertyPanel.hxx | 1
sd/inc/sdhtmlfilter.hxx | 4
sd/source/ui/inc/PresentationViewShell.hxx | 1
sd/source/ui/inc/fuformatpaintbrush.hxx | 1
sd/source/ui/inc/unoaprms.hxx | 10 -
sd/source/ui/presenter/PresenterCanvas.hxx | 13 -
sd/source/ui/sidebar/AllMasterPagesSelector.hxx | 2
sd/source/ui/sidebar/IDisposable.hxx | 1
sd/source/ui/sidebar/ISidebarReceiver.hxx | 2
sd/source/ui/sidebar/MasterPageContainer.hxx | 4
sd/source/ui/sidebar/MasterPagesSelector.hxx | 15 --
sd/source/ui/sidebar/PanelBase.cxx | 13 -
sd/source/ui/sidebar/PanelBase.hxx | 6
sot/source/base/object.cxx | 9 -
sot/source/sdstor/stgavl.cxx | 13 -
sot/source/sdstor/stgavl.hxx | 1
sot/source/sdstor/stgdir.cxx | 23 ---
sot/source/sdstor/stgdir.hxx | 1
sot/source/sdstor/storage.cxx | 20 --
svtools/source/misc/transfer2.cxx | 18 --
svx/source/inc/fmcontrolbordermanager.hxx | 11 -
sw/inc/charatr.hxx | 12 -
sw/inc/swatrset.hxx | 6
sw/source/core/inc/swfont.hxx | 9 -
ucb/source/ucp/ftp/ftpcontent.hxx | 4
vcl/generic/print/genprnpsp.cxx | 7
vcl/inc/generic/genprn.h | 1
vcl/inc/ilstbox.hxx | 18 --
vcl/inc/osx/salprn.h | 1
vcl/inc/salprn.hxx | 1
vcl/inc/win/saldata.hxx | 2
vcl/inc/win/salinst.h | 1
vcl/inc/win/salprn.h | 1
vcl/osx/salprn.cxx | 5
vcl/source/edit/textdat2.hxx | 25 ---
vcl/source/edit/textdoc.hxx | 1
vcl/win/source/app/salinst.cxx | 4
vcl/win/source/gdi/salprn.cxx | 53 -------
writerfilter/source/dmapper/TableManager.hxx | 15 --
writerfilter/source/ooxml/OOXMLFastContextHandler.hxx | 3
writerfilter/source/ooxml/OOXMLPropertySet.hxx | 3
writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx | 20 --
writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx | 6
writerfilter/source/ooxml/OOXMLStreamImpl.hxx | 1
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 1
writerfilter/source/rtftok/rtfdocumentimpl.hxx | 3
writerfilter/source/rtftok/rtffly.hxx | 15 --
xmloff/source/chart/SchXMLTableContext.hxx | 6
xmloff/source/draw/XMLNumberStylesExport.hxx | 3
231 files changed, 144 insertions(+), 1474 deletions(-)
New commits:
commit 403c13487c36f4200adf0986c5d11398f719cd7a
Author: Noel Grandin <noel at peralex.com>
Date: Tue Aug 4 16:28:49 2015 +0200
loplugin:unusedmethods
Change-Id: I6801618efb5a66d24156fa429e026acb6ca03aba
Reviewed-on: https://gerrit.libreoffice.org/17506
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/accessibility/inc/accessibility/extended/accessibletabbarpage.hxx b/accessibility/inc/accessibility/extended/accessibletabbarpage.hxx
index 4959ab6..54abbf7 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 c3d6533..0c1479f 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 18aebb4..f58a565 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 2cc7740..71e75b4 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 cdac8d5..3bc61b8 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 758b8a1..498f8dc 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 e4c1426..95eeffd 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 47f0ad7..42ce010 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 4c0f9d0..2001941 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 742451d..3c6d395 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 ac4616b..41bbd84 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 d67b177..556eee3 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 4459293..6b142ec 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 8f01131..a7aae56 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 23cffe2..03d7028 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 040ad95..bcdda99 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 ddb5f4b..411c754 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 6df693a..95c816d 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 a897453..6883c56 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 f92f3df..f08b767 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 5f3296a..ed269f8 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 fa2e1f0..cbef55e 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 4272aec..9358f2b 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 35ab54b..e93d347 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 12a9658..5294c8e 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 ed42464..b40aaa1 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 772bfb9..7d3dd2f 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 b321635..17cb9b7 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 2b6bc47..eaede69 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 356a40e..fc481ed 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 2c59dfd..725e0f2 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 7f09023..5b0d52c 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 f45fe0f..ecd982e 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 75c95e0..26e5c39 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 fa04e0a9a..6d96a48 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 adaa7a8..2200bdf 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 e3bb892..5783c06 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 d851e2a..e07baf5 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 8dfb062..6598add 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 2a63bb7..38beb19 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 1685c24..16a7213 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 5996883..1aab573 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 c971548..ff544c9 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 b92b171..4cead41 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 a8c075a..26819ff 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 2ccd4a6..6c62728 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 43231ed..e766cc4 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 70a4c3f..a4f902b 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 c882ede..7c8920c 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 fa59576..1c69bb4 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 c61e374..7a317ad 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 e62cfa5..50b8510 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 89904a5..710cb41 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 9273778..ed0c4db 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 eba8f82..606c92e 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 9138d1d..f5f6203 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 a18f904..b2af49d 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 3f09f31..f2570fa 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 79ad87e..fd317ff 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 54915ab..0cf7f0a 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 161ea48..4b51379 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 ac75f14..e09b39e 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 b7db84a..9c82f2a 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 f68b4df..4aaa4da 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 e88b3e2..4bb282d 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 8b992c6..2145e1c 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 9076112..be59697 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 1a87ba9..ce5ce60 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 6d57398..94fa28f 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 06ef1bd..d694d65 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 d0039eb..d312a79 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 82a360c..6020a1e 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 fc33cd6..91e6ffc 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 0a46eab..ac13d93 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 23718c4..73d9dd1 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 534e22c..194349c 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 c9547a7..21226c1 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 7e4c664..ada71a0 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 d6c73cf..31e71c5 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 9e0bf50..bf57827 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 54a9c1a..b5a135c 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 077bc165..11f04fc 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 5392c03..1ff5080 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 b44ec42..4281167 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 bcc7909..d78f360 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 863628c..8b96040 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 68cb712..7c1dfef 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 a47af3e..437bdd8 100644
--- a/dbaccess/source/ui/inc/dbtreelistbox.hxx
+++ b/dbaccess/source/ui/inc/dbtreelistbox.hxx
@@ -95,8 +95,6 @@ namespace dbaui
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list