[Libreoffice-commits] core.git: 6 commits - chart2/inc chart2/source connectivity/source cui/source sc/inc sc/qa sc/source sd/source sw/inc sw/source
Noel Grandin
noel at peralex.com
Mon Mar 23 00:43:17 PDT 2015
chart2/inc/ChartView.hxx | 1
chart2/source/controller/dialogs/DataBrowser.cxx | 13
chart2/source/controller/dialogs/DataBrowserModel.cxx | 7
chart2/source/controller/dialogs/dlg_View3D.cxx | 4
chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx | 4
chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx | 3
chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx | 4
chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx | 3
chart2/source/controller/dialogs/tp_AxisLabel.cxx | 6
chart2/source/controller/dialogs/tp_AxisLabel.hxx | 2
chart2/source/inc/ThreeDHelper.hxx | 5
chart2/source/model/template/BubbleChartType.cxx | 6
chart2/source/model/template/BubbleChartTypeTemplate.cxx | 6
chart2/source/tools/ThreeDHelper.cxx | 10
chart2/source/view/inc/AbstractShapeFactory.hxx | 2
chart2/source/view/main/AbstractShapeFactory.cxx | 5
chart2/source/view/main/ChartView.cxx | 11
chart2/source/view/main/VLegend.cxx | 4
connectivity/source/commontools/parameters.cxx | 5
connectivity/source/commontools/propertyids.cxx | 193 +++-------
connectivity/source/drivers/mork/MCatalog.cxx | 3
connectivity/source/drivers/mork/MConnection.hxx | 2
connectivity/source/drivers/mork/MQueryHelper.cxx | 5
connectivity/source/drivers/mork/MQueryHelper.hxx | 1
connectivity/source/drivers/mork/MResultSet.cxx | 72 ---
connectivity/source/drivers/mork/MResultSet.hxx | 2
connectivity/source/drivers/mork/MResultSetMetaData.cxx | 2
connectivity/source/drivers/mork/MStatement.cxx | 49 --
connectivity/source/drivers/mork/MStatement.hxx | 3
connectivity/source/drivers/mork/MTable.hxx | 2
connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx | 21 -
connectivity/source/drivers/odbc/OResultSet.cxx | 5
connectivity/source/drivers/postgresql/pq_databasemetadata.cxx | 20 -
connectivity/source/drivers/postgresql/pq_databasemetadata.hxx | 1
connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx | 10
connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx | 2
connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx | 11
connectivity/source/inc/odbc/OResultSet.hxx | 3
cui/source/customize/cfgutil.cxx | 20 -
cui/source/dialogs/iconcdlg.cxx | 22 -
cui/source/dialogs/scriptdlg.cxx | 5
cui/source/inc/align.hxx | 3
cui/source/inc/backgrnd.hxx | 4
cui/source/inc/border.hxx | 4
cui/source/inc/cfgutil.hxx | 3
cui/source/inc/chardlg.hxx | 13
cui/source/inc/connect.hxx | 3
cui/source/inc/cuitabarea.hxx | 11
cui/source/inc/cuitabline.hxx | 3
cui/source/inc/iconcdlg.hxx | 2
cui/source/inc/labdlg.hxx | 3
cui/source/inc/measure.hxx | 3
cui/source/inc/numfmt.hxx | 4
cui/source/inc/page.hxx | 4
cui/source/inc/paragrph.hxx | 9
cui/source/inc/scriptdlg.hxx | 15
cui/source/inc/tabstpge.hxx | 3
cui/source/inc/textanim.hxx | 3
cui/source/inc/textattr.hxx | 3
cui/source/inc/transfrm.hxx | 9
cui/source/tabpages/align.cxx | 7
cui/source/tabpages/backgrnd.cxx | 15
cui/source/tabpages/border.cxx | 9
cui/source/tabpages/chardlg.cxx | 37 -
cui/source/tabpages/connect.cxx | 7
cui/source/tabpages/labdlg.cxx | 9
cui/source/tabpages/macroass.cxx | 2
cui/source/tabpages/measure.cxx | 7
cui/source/tabpages/numfmt.cxx | 19
cui/source/tabpages/page.cxx | 10
cui/source/tabpages/paragrph.cxx | 21 -
cui/source/tabpages/tabarea.cxx | 1
cui/source/tabpages/tabstpge.cxx | 9
cui/source/tabpages/textanim.cxx | 7
cui/source/tabpages/textattr.cxx | 7
cui/source/tabpages/tparea.cxx | 21 -
cui/source/tabpages/tpline.cxx | 9
cui/source/tabpages/tpshadow.cxx | 9
cui/source/tabpages/transfrm.cxx | 27 -
sc/inc/dapiuno.hxx | 1
sc/inc/datauno.hxx | 9
sc/inc/dptabsrc.hxx | 1
sc/inc/rangeutl.hxx | 7
sc/inc/viewuno.hxx | 2
sc/qa/unit/helper/qahelper.cxx | 7
sc/qa/unit/helper/qahelper.hxx | 3
sc/source/core/data/dptabsrc.cxx | 9
sc/source/filter/excel/impop.cxx | 12
sc/source/filter/excel/read.cxx | 24 -
sc/source/filter/excel/xepivot.cxx | 6
sc/source/filter/excel/xichart.cxx | 2
sc/source/filter/inc/XclExpChangeTrack.hxx | 2
sc/source/filter/inc/imp_op.hxx | 3
sc/source/filter/inc/revisionfragment.hxx | 1
sc/source/filter/inc/sheetdatabuffer.hxx | 3
sc/source/filter/inc/tool.h | 2
sc/source/filter/inc/xepivot.hxx | 2
sc/source/filter/inc/xichart.hxx | 2
sc/source/filter/lotus/filter.cxx | 6
sc/source/filter/lotus/tool.cxx | 5
sc/source/filter/oox/revisionfragment.cxx | 6
sc/source/filter/oox/sheetdatabuffer.cxx | 7
sc/source/ui/Accessibility/AccessibleDocument.cxx | 10
sc/source/ui/Accessibility/AccessibleText.cxx | 9
sc/source/ui/app/inputwin.cxx | 2
sc/source/ui/app/seltrans.cxx | 7
sc/source/ui/attrdlg/scdlgfact.cxx | 2
sc/source/ui/attrdlg/tabpages.cxx | 7
sc/source/ui/condformat/condformatmgr.cxx | 4
sc/source/ui/dbgui/validate.cxx | 7
sc/source/ui/drawfunc/fusel.cxx | 3
sc/source/ui/drawfunc/futext.cxx | 9
sc/source/ui/drawfunc/futext3.cxx | 5
sc/source/ui/inc/AccessibleDocument.hxx | 3
sc/source/ui/inc/AccessibleText.hxx | 11
sc/source/ui/inc/condformatmgr.hxx | 2
sc/source/ui/inc/drawview.hxx | 6
sc/source/ui/inc/fupoor.hxx | 2
sc/source/ui/inc/futext.hxx | 1
sc/source/ui/inc/namepast.hxx | 1
sc/source/ui/inc/navipi.hxx | 2
sc/source/ui/inc/seltrans.hxx | 1
sc/source/ui/inc/tabpages.hxx | 3
sc/source/ui/inc/tptable.hxx | 3
sc/source/ui/inc/validate.hxx | 3
sc/source/ui/inc/xmlsourcedlg.hxx | 2
sc/source/ui/namedlg/namepast.cxx | 5
sc/source/ui/navipi/navcitem.cxx | 2
sc/source/ui/navipi/navipi.cxx | 8
sc/source/ui/pagedlg/tptable.cxx | 7
sc/source/ui/unoobj/dapiuno.cxx | 7
sc/source/ui/unoobj/datauno.cxx | 16
sc/source/ui/unoobj/viewuno.cxx | 16
sc/source/ui/vba/vbaworkbooks.cxx | 1
sc/source/ui/view/drawvie2.cxx | 19
sc/source/ui/view/drawview.cxx | 2
sc/source/ui/view/olkact.cxx | 18
sc/source/ui/view/olkact.hxx | 6
sc/source/ui/view/tabview3.cxx | 39 --
sc/source/ui/view/tabview5.cxx | 12
sc/source/ui/view/tabvwsh4.cxx | 2
sc/source/ui/xmlsource/xmlsourcedlg.cxx | 13
sd/source/filter/eppt/epptbase.hxx | 2
sd/source/filter/eppt/epptooxml.hxx | 2
sd/source/filter/eppt/epptso.cxx | 2
sd/source/filter/eppt/pptx-stylesheet.cxx | 5
sd/source/ui/annotations/annotationwindow.cxx | 5
sd/source/ui/annotations/annotationwindow.hxx | 2
sd/source/ui/app/optsitem.cxx | 4
sd/source/ui/app/sdmod2.cxx | 8
sd/source/ui/dlg/RemoteDialogClientBox.cxx | 9
sd/source/ui/func/fupoor.cxx | 4
sd/source/ui/inc/OutlineView.hxx | 1
sd/source/ui/inc/fupoor.hxx | 1
sd/source/ui/inc/optsitem.hxx | 2
sd/source/ui/slideshow/showwin.cxx | 7
sd/source/ui/slideshow/showwindow.hxx | 1
sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx | 2
sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx | 4
sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx | 2
sd/source/ui/slidesorter/controller/SlideSorterController.cxx | 6
sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx | 4
sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx | 1
sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx | 4
sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx | 1
sd/source/ui/slidesorter/model/SlideSorterModel.cxx | 4
sd/source/ui/slidesorter/shell/SlideSorter.cxx | 2
sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx | 4
sd/source/ui/view/drviews5.cxx | 9
sd/source/ui/view/outlnvsh.cxx | 8
sd/source/ui/view/outlview.cxx | 16
sw/inc/ccoll.hxx | 2
sw/inc/format.hxx | 12
sw/inc/printdata.hxx | 2
sw/inc/shellio.hxx | 4
sw/inc/swserv.hxx | 3
sw/source/core/access/acccell.cxx | 1
sw/source/core/access/accdoc.cxx | 1
sw/source/core/access/accpara.cxx | 2
sw/source/core/access/accselectionhelper.cxx | 5
sw/source/core/access/accselectionhelper.hxx | 2
sw/source/core/attr/format.cxx | 13
sw/source/core/doc/DocumentLinksAdministrationManager.cxx | 14
sw/source/core/doc/notxtfrm.cxx | 8
sw/source/core/doc/swserv.cxx | 7
sw/source/core/docnode/observablethread.cxx | 7
sw/source/core/inc/flyfrm.hxx | 10
sw/source/core/inc/observablethread.hxx | 2
sw/source/core/inc/pagefrm.hxx | 2
sw/source/core/layout/layact.cxx | 3
sw/source/core/layout/paintfrm.cxx | 13
sw/source/core/text/txtfly.cxx | 4
sw/source/core/view/printdata.cxx | 13
sw/source/filter/basflt/fltini.cxx | 10
sw/source/filter/ww8/docxexportfilter.hxx | 1
sw/source/ui/chrdlg/drpcps.cxx | 7
sw/source/ui/chrdlg/numpara.cxx | 7
sw/source/ui/chrdlg/swuiccoll.cxx | 7
sw/source/ui/config/optpage.cxx | 7
sw/source/ui/frmdlg/column.cxx | 7
sw/source/ui/frmdlg/frmpage.cxx | 14
sw/source/ui/frmdlg/wrap.cxx | 7
sw/source/ui/misc/glossary.cxx | 4
sw/source/ui/misc/pgfnote.cxx | 7
sw/source/ui/vba/vbadocuments.cxx | 1
sw/source/uibase/app/docsh.cxx | 27 -
sw/source/uibase/chrdlg/ccoll.cxx | 5
sw/source/uibase/dochdl/gloshdl.cxx | 12
sw/source/uibase/inc/column.hxx | 4
sw/source/uibase/inc/drpcps.hxx | 5
sw/source/uibase/inc/frmpage.hxx | 8
sw/source/uibase/inc/gloshdl.hxx | 3
sw/source/uibase/inc/numpara.hxx | 4
sw/source/uibase/inc/optpage.hxx | 5
sw/source/uibase/inc/pgfnote.hxx | 3
sw/source/uibase/inc/swuiccoll.hxx | 4
sw/source/uibase/inc/wrap.hxx | 4
sw/source/uibase/uno/unotxdoc.cxx | 4
218 files changed, 310 insertions(+), 1399 deletions(-)
New commits:
commit 5cbb51c009fa266e8418ef93799ac64e431c22f5
Author: Noel Grandin <noel at peralex.com>
Date: Fri Mar 20 16:25:51 2015 +0200
loplugin:constantfunction: connectivity
Change-Id: Ic1a71851a80ed2715969b0f00a0e59ab3a0593db
diff --git a/connectivity/source/commontools/parameters.cxx b/connectivity/source/commontools/parameters.cxx
index d520e37..1b512a0 100644
--- a/connectivity/source/commontools/parameters.cxx
+++ b/connectivity/source/commontools/parameters.cxx
@@ -115,11 +115,6 @@ namespace dbtools
}
- void ParameterManager::disposing( const EventObject& /*_rDisposingEvent*/ )
- {
- }
-
-
void ParameterManager::setAllParametersNull()
{
OSL_PRECOND( isAlive(), "ParameterManager::setAllParametersNull: not initialized, or already disposed!" );
diff --git a/connectivity/source/commontools/propertyids.cxx b/connectivity/source/commontools/propertyids.cxx
index 5b3d635..9f0635e 100644
--- a/connectivity/source/commontools/propertyids.cxx
+++ b/connectivity/source/commontools/propertyids.cxx
@@ -22,77 +22,6 @@
namespace dbtools
{
- const sal_Char* getPROPERTY_QUERYTIMEOUT() { return "QueryTimeOut"; }
- const sal_Char* getPROPERTY_MAXFIELDSIZE() { return "MaxFieldSize"; }
- const sal_Char* getPROPERTY_MAXROWS() { return "MaxRows"; }
- const sal_Char* getPROPERTY_CURSORNAME() { return "CursorName"; }
- const sal_Char* getPROPERTY_RESULTSETCONCURRENCY() { return "ResultSetConcurrency"; }
- const sal_Char* getPROPERTY_RESULTSETTYPE() { return "ResultSetType"; }
- const sal_Char* getPROPERTY_FETCHDIRECTION() { return "FetchDirection"; }
- const sal_Char* getPROPERTY_FETCHSIZE() { return "FetchSize"; }
- const sal_Char* getPROPERTY_ESCAPEPROCESSING() { return "EscapeProcessing"; }
- const sal_Char* getPROPERTY_USEBOOKMARKS() { return "UseBookmarks"; }
-
- const sal_Char* getPROPERTY_NAME() { return "Name"; }
- const sal_Char* getPROPERTY_TYPE() { return "Type"; }
- const sal_Char* getPROPERTY_TYPENAME() { return "TypeName"; }
- const sal_Char* getPROPERTY_PRECISION() { return "Precision"; }
- const sal_Char* getPROPERTY_SCALE() { return "Scale"; }
- const sal_Char* getPROPERTY_ISNULLABLE() { return "IsNullable"; }
- const sal_Char* getPROPERTY_ISAUTOINCREMENT() { return "IsAutoIncrement"; }
- const sal_Char* getPROPERTY_ISROWVERSION() { return "IsRowVersion"; }
- const sal_Char* getPROPERTY_DESCRIPTION() { return "Description"; }
- const sal_Char* getPROPERTY_DEFAULTVALUE() { return "DefaultValue"; }
-
- const sal_Char* getPROPERTY_REFERENCEDTABLE() { return "ReferencedTable"; }
- const sal_Char* getPROPERTY_UPDATERULE() { return "UpdateRule"; }
- const sal_Char* getPROPERTY_DELETERULE() { return "DeleteRule"; }
- const sal_Char* getPROPERTY_CATALOG() { return "Catalog"; }
- const sal_Char* getPROPERTY_ISUNIQUE() { return "IsUnique"; }
- const sal_Char* getPROPERTY_ISPRIMARYKEYINDEX() { return "IsPrimaryKeyIndex"; }
- const sal_Char* getPROPERTY_ISCLUSTERED() { return "IsClustered"; }
- const sal_Char* getPROPERTY_ISASCENDING() { return "IsAscending"; }
- const sal_Char* getPROPERTY_SCHEMANAME() { return "SchemaName"; }
- const sal_Char* getPROPERTY_CATALOGNAME() { return "CatalogName"; }
- const sal_Char* getPROPERTY_COMMAND() { return "Command"; }
- const sal_Char* getPROPERTY_CHECKOPTION() { return "CheckOption"; }
- const sal_Char* getPROPERTY_PASSWORD() { return "Password"; }
- const sal_Char* getPROPERTY_RELATEDCOLUMN() { return "RelatedColumn"; }
-
- const sal_Char* getPROPERTY_FUNCTION() { return "Function"; }
- const sal_Char* getPROPERTY_AGGREGATEFUNCTION() { return "AggregateFunction"; }
- const sal_Char* getPROPERTY_TABLENAME() { return "TableName"; }
- const sal_Char* getPROPERTY_REALNAME() { return "RealName"; }
- const sal_Char* getPROPERTY_DBASEPRECISIONCHANGED() { return "DbasePrecisionChanged"; }
- const sal_Char* getPROPERTY_ISCURRENCY() { return "IsCurrency"; }
- const sal_Char* getPROPERTY_ISBOOKMARKABLE() { return "IsBookmarkable"; }
-
- const sal_Char* getPROPERTY_FORMATKEY() { return "FormatKey"; }
- const sal_Char* getPROPERTY_LOCALE() { return "Locale"; }
-
- const sal_Char* getPROPERTY_AUTOINCREMENTCREATION() { return "AutoIncrementCreation"; }
- const sal_Char* getPROPERTY_PRIVILEGES() { return "Privileges"; }
- const sal_Char* getPROPERTY_ID_HAVINGCLAUSE() { return "HavingClause"; }
- const sal_Char* getPROPERTY_ID_ISSIGNED() { return "IsSigned"; }
- const sal_Char* getPROPERTY_ID_ISSEARCHABLE() { return "IsSearchable"; }
-
- const sal_Char* getPROPERTY_ID_APPLYFILTER() { return "ApplyFilter"; }
- const sal_Char* getPROPERTY_ID_FILTER() { return "Filter"; }
- const sal_Char* getPROPERTY_ID_MASTERFIELDS() { return "MasterFields"; }
- const sal_Char* getPROPERTY_ID_DETAILFIELDS() { return "DetailFields"; }
- const sal_Char* getPROPERTY_ID_FIELDTYPE() { return "FieldType"; }
- const sal_Char* getPROPERTY_ID_VALUE() { return "Value"; }
- const sal_Char* getPROPERTY_ID_ACTIVE_CONNECTION() { return "ActiveConnection"; }
- const sal_Char* getPROPERTY_ID_LABEL() { return "Label"; }
-
-
- //= error messages
-
- const sal_Char* getSQLSTATE_SEQUENCE() { return "HY010"; }
- const sal_Char* getSTR_DELIMITER() { return "/"; }
-
-
-
OPropertyMap::~OPropertyMap()
{
::std::map<sal_Int32 , rtl_uString*>::iterator aIter = m_aPropertyMap.begin();
@@ -117,68 +46,68 @@ namespace dbtools
rtl_uString* pStr = NULL;
switch(_nIndex)
{
- case PROPERTY_ID_QUERYTIMEOUT: { rtl_uString_newFromAscii(&pStr,getPROPERTY_QUERYTIMEOUT() ); break; }
- case PROPERTY_ID_MAXFIELDSIZE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_MAXFIELDSIZE() ); break; }
- case PROPERTY_ID_MAXROWS: { rtl_uString_newFromAscii(&pStr,getPROPERTY_MAXROWS() ); break; }
- case PROPERTY_ID_CURSORNAME: { rtl_uString_newFromAscii(&pStr,getPROPERTY_CURSORNAME() ); break; }
- case PROPERTY_ID_RESULTSETCONCURRENCY: { rtl_uString_newFromAscii(&pStr,getPROPERTY_RESULTSETCONCURRENCY() ); break; }
- case PROPERTY_ID_RESULTSETTYPE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_RESULTSETTYPE() ); break; }
- case PROPERTY_ID_FETCHDIRECTION: { rtl_uString_newFromAscii(&pStr,getPROPERTY_FETCHDIRECTION() ); break; }
- case PROPERTY_ID_FETCHSIZE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_FETCHSIZE() ); break; }
- case PROPERTY_ID_ESCAPEPROCESSING: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ESCAPEPROCESSING() ); break; }
- case PROPERTY_ID_USEBOOKMARKS: { rtl_uString_newFromAscii(&pStr,getPROPERTY_USEBOOKMARKS() ); break; }
+ case PROPERTY_ID_QUERYTIMEOUT: { rtl_uString_newFromAscii(&pStr, "QueryTimeOut" ); break; }
+ case PROPERTY_ID_MAXFIELDSIZE: { rtl_uString_newFromAscii(&pStr, "MaxFieldSize" ); break; }
+ case PROPERTY_ID_MAXROWS: { rtl_uString_newFromAscii(&pStr, "MaxRows" ); break; }
+ case PROPERTY_ID_CURSORNAME: { rtl_uString_newFromAscii(&pStr, "CursorName" ); break; }
+ case PROPERTY_ID_RESULTSETCONCURRENCY: { rtl_uString_newFromAscii(&pStr, "ResultSetConcurrency" ); break; }
+ case PROPERTY_ID_RESULTSETTYPE: { rtl_uString_newFromAscii(&pStr, "ResultSetType" ); break; }
+ case PROPERTY_ID_FETCHDIRECTION: { rtl_uString_newFromAscii(&pStr, "FetchDirection" ); break; }
+ case PROPERTY_ID_FETCHSIZE: { rtl_uString_newFromAscii(&pStr, "FetchSize" ); break; }
+ case PROPERTY_ID_ESCAPEPROCESSING: { rtl_uString_newFromAscii(&pStr, "EscapeProcessing" ); break; }
+ case PROPERTY_ID_USEBOOKMARKS: { rtl_uString_newFromAscii(&pStr, "UseBookmarks" ); break; }
// Column
- case PROPERTY_ID_NAME: { rtl_uString_newFromAscii(&pStr,getPROPERTY_NAME() ); break; }
- case PROPERTY_ID_TYPE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_TYPE() ); break; }
- case PROPERTY_ID_TYPENAME: { rtl_uString_newFromAscii(&pStr,getPROPERTY_TYPENAME() ); break; }
- case PROPERTY_ID_PRECISION: { rtl_uString_newFromAscii(&pStr,getPROPERTY_PRECISION() ); break; }
- case PROPERTY_ID_SCALE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_SCALE() ); break; }
- case PROPERTY_ID_ISNULLABLE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ISNULLABLE() ); break; }
- case PROPERTY_ID_ISAUTOINCREMENT: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ISAUTOINCREMENT() ); break; }
- case PROPERTY_ID_ISROWVERSION: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ISROWVERSION() ); break; }
- case PROPERTY_ID_DESCRIPTION: { rtl_uString_newFromAscii(&pStr,getPROPERTY_DESCRIPTION() ); break; }
- case PROPERTY_ID_DEFAULTVALUE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_DEFAULTVALUE() ); break; }
-
- case PROPERTY_ID_REFERENCEDTABLE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_REFERENCEDTABLE() ); break; }
- case PROPERTY_ID_UPDATERULE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_UPDATERULE() ); break; }
- case PROPERTY_ID_DELETERULE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_DELETERULE() ); break; }
- case PROPERTY_ID_CATALOG: { rtl_uString_newFromAscii(&pStr,getPROPERTY_CATALOG() ); break; }
- case PROPERTY_ID_ISUNIQUE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ISUNIQUE() ); break; }
- case PROPERTY_ID_ISPRIMARYKEYINDEX: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ISPRIMARYKEYINDEX() ); break; }
- case PROPERTY_ID_ISCLUSTERED: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ISCLUSTERED() ); break; }
- case PROPERTY_ID_ISASCENDING: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ISASCENDING() ); break; }
- case PROPERTY_ID_SCHEMANAME: { rtl_uString_newFromAscii(&pStr,getPROPERTY_SCHEMANAME() ); break; }
- case PROPERTY_ID_CATALOGNAME: { rtl_uString_newFromAscii(&pStr,getPROPERTY_CATALOGNAME() ); break; }
-
- case PROPERTY_ID_COMMAND: { rtl_uString_newFromAscii(&pStr,getPROPERTY_COMMAND() ); break; }
- case PROPERTY_ID_CHECKOPTION: { rtl_uString_newFromAscii(&pStr,getPROPERTY_CHECKOPTION() ); break; }
- case PROPERTY_ID_PASSWORD: { rtl_uString_newFromAscii(&pStr,getPROPERTY_PASSWORD() ); break; }
- case PROPERTY_ID_RELATEDCOLUMN: { rtl_uString_newFromAscii(&pStr,getPROPERTY_RELATEDCOLUMN() ); break; }
-
- case PROPERTY_ID_FUNCTION: { rtl_uString_newFromAscii(&pStr,getPROPERTY_FUNCTION() ); break; }
- case PROPERTY_ID_AGGREGATEFUNCTION: { rtl_uString_newFromAscii(&pStr,getPROPERTY_AGGREGATEFUNCTION() ); break; }
- case PROPERTY_ID_TABLENAME: { rtl_uString_newFromAscii(&pStr,getPROPERTY_TABLENAME() ); break; }
- case PROPERTY_ID_REALNAME: { rtl_uString_newFromAscii(&pStr,getPROPERTY_REALNAME() ); break; }
- case PROPERTY_ID_DBASEPRECISIONCHANGED: { rtl_uString_newFromAscii(&pStr,getPROPERTY_DBASEPRECISIONCHANGED()); break; }
- case PROPERTY_ID_ISCURRENCY: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ISCURRENCY() ); break; }
- case PROPERTY_ID_ISBOOKMARKABLE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ISBOOKMARKABLE() ); break; }
- case PROPERTY_ID_HY010: { rtl_uString_newFromAscii(&pStr,getSQLSTATE_SEQUENCE() ); break; }
- case PROPERTY_ID_DELIMITER: { rtl_uString_newFromAscii(&pStr,getSTR_DELIMITER() ); break; }
- case PROPERTY_ID_FORMATKEY: { rtl_uString_newFromAscii(&pStr,getPROPERTY_FORMATKEY() ); break; }
- case PROPERTY_ID_LOCALE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_LOCALE() ); break; }
- case PROPERTY_ID_AUTOINCREMENTCREATION: { rtl_uString_newFromAscii(&pStr,getPROPERTY_AUTOINCREMENTCREATION()); break; }
- case PROPERTY_ID_PRIVILEGES: { rtl_uString_newFromAscii(&pStr,getPROPERTY_PRIVILEGES() ); break; }
- case PROPERTY_ID_HAVINGCLAUSE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ID_HAVINGCLAUSE() ); break; }
- case PROPERTY_ID_ISSIGNED: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ID_ISSIGNED() ); break; }
- case PROPERTY_ID_ISSEARCHABLE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ID_ISSEARCHABLE() ); break; }
- case PROPERTY_ID_LABEL: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ID_LABEL() ); break; }
- case PROPERTY_ID_APPLYFILTER: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ID_APPLYFILTER() ); break; }
- case PROPERTY_ID_FILTER: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ID_FILTER() ); break; }
- case PROPERTY_ID_MASTERFIELDS: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ID_MASTERFIELDS() ); break; }
- case PROPERTY_ID_DETAILFIELDS: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ID_DETAILFIELDS() ); break; }
- case PROPERTY_ID_FIELDTYPE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ID_FIELDTYPE() ); break; }
- case PROPERTY_ID_VALUE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ID_VALUE() ); break; }
- case PROPERTY_ID_ACTIVE_CONNECTION: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ID_ACTIVE_CONNECTION() ); break; }
+ case PROPERTY_ID_NAME: { rtl_uString_newFromAscii(&pStr, "Name" ); break; }
+ case PROPERTY_ID_TYPE: { rtl_uString_newFromAscii(&pStr, "Type" ); break; }
+ case PROPERTY_ID_TYPENAME: { rtl_uString_newFromAscii(&pStr, "TypeName" ); break; }
+ case PROPERTY_ID_PRECISION: { rtl_uString_newFromAscii(&pStr, "Precision" ); break; }
+ case PROPERTY_ID_SCALE: { rtl_uString_newFromAscii(&pStr, "Scale" ); break; }
+ case PROPERTY_ID_ISNULLABLE: { rtl_uString_newFromAscii(&pStr, "IsNullable" ); break; }
+ case PROPERTY_ID_ISAUTOINCREMENT: { rtl_uString_newFromAscii(&pStr, "IsAutoIncrement" ); break; }
+ case PROPERTY_ID_ISROWVERSION: { rtl_uString_newFromAscii(&pStr, "IsRowVersion" ); break; }
+ case PROPERTY_ID_DESCRIPTION: { rtl_uString_newFromAscii(&pStr, "Description" ); break; }
+ case PROPERTY_ID_DEFAULTVALUE: { rtl_uString_newFromAscii(&pStr, "DefaultValue" ); break; }
+
+ case PROPERTY_ID_REFERENCEDTABLE: { rtl_uString_newFromAscii(&pStr, "ReferencedTable" ); break; }
+ case PROPERTY_ID_UPDATERULE: { rtl_uString_newFromAscii(&pStr, "UpdateRule" ); break; }
+ case PROPERTY_ID_DELETERULE: { rtl_uString_newFromAscii(&pStr, "DeleteRule" ); break; }
+ case PROPERTY_ID_CATALOG: { rtl_uString_newFromAscii(&pStr, "Catalog" ); break; }
+ case PROPERTY_ID_ISUNIQUE: { rtl_uString_newFromAscii(&pStr, "IsUnique" ); break; }
+ case PROPERTY_ID_ISPRIMARYKEYINDEX: { rtl_uString_newFromAscii(&pStr, "IsPrimaryKeyIndex" ); break; }
+ case PROPERTY_ID_ISCLUSTERED: { rtl_uString_newFromAscii(&pStr, "IsClustered" ); break; }
+ case PROPERTY_ID_ISASCENDING: { rtl_uString_newFromAscii(&pStr, "IsAscending" ); break; }
+ case PROPERTY_ID_SCHEMANAME: { rtl_uString_newFromAscii(&pStr, "SchemaName" ); break; }
+ case PROPERTY_ID_CATALOGNAME: { rtl_uString_newFromAscii(&pStr, "CatalogName" ); break; }
+
+ case PROPERTY_ID_COMMAND: { rtl_uString_newFromAscii(&pStr, "Command" ); break; }
+ case PROPERTY_ID_CHECKOPTION: { rtl_uString_newFromAscii(&pStr, "CheckOption" ); break; }
+ case PROPERTY_ID_PASSWORD: { rtl_uString_newFromAscii(&pStr, "Password" ); break; }
+ case PROPERTY_ID_RELATEDCOLUMN: { rtl_uString_newFromAscii(&pStr, "RelatedColumn" ); break; }
+
+ case PROPERTY_ID_FUNCTION: { rtl_uString_newFromAscii(&pStr, "Function" ); break; }
+ case PROPERTY_ID_AGGREGATEFUNCTION: { rtl_uString_newFromAscii(&pStr, "AggregateFunction" ); break; }
+ case PROPERTY_ID_TABLENAME: { rtl_uString_newFromAscii(&pStr, "TableName" ); break; }
+ case PROPERTY_ID_REALNAME: { rtl_uString_newFromAscii(&pStr, "RealName" ); break; }
+ case PROPERTY_ID_DBASEPRECISIONCHANGED: { rtl_uString_newFromAscii(&pStr, "DbasePrecisionChanged"); break; }
+ case PROPERTY_ID_ISCURRENCY: { rtl_uString_newFromAscii(&pStr, "IsCurrency" ); break; }
+ case PROPERTY_ID_ISBOOKMARKABLE: { rtl_uString_newFromAscii(&pStr, "IsBookmarkable" ); break; }
+ case PROPERTY_ID_HY010: { rtl_uString_newFromAscii(&pStr, "HY010" ); break; }
+ case PROPERTY_ID_DELIMITER: { rtl_uString_newFromAscii(&pStr, "/" ); break; }
+ case PROPERTY_ID_FORMATKEY: { rtl_uString_newFromAscii(&pStr, "FormatKey" ); break; }
+ case PROPERTY_ID_LOCALE: { rtl_uString_newFromAscii(&pStr, "Locale" ); break; }
+ case PROPERTY_ID_AUTOINCREMENTCREATION: { rtl_uString_newFromAscii(&pStr, "AutoIncrementCreation"); break; }
+ case PROPERTY_ID_PRIVILEGES: { rtl_uString_newFromAscii(&pStr, "Privileges" ); break; }
+ case PROPERTY_ID_HAVINGCLAUSE: { rtl_uString_newFromAscii(&pStr, "HavingClause" ); break; }
+ case PROPERTY_ID_ISSIGNED: { rtl_uString_newFromAscii(&pStr, "IsSigned" ); break; }
+ case PROPERTY_ID_ISSEARCHABLE: { rtl_uString_newFromAscii(&pStr, "IsSearchable" ); break; }
+ case PROPERTY_ID_LABEL: { rtl_uString_newFromAscii(&pStr, "Label" ); break; }
+ case PROPERTY_ID_APPLYFILTER: { rtl_uString_newFromAscii(&pStr, "ApplyFilter" ); break; }
+ case PROPERTY_ID_FILTER: { rtl_uString_newFromAscii(&pStr, "Filter" ); break; }
+ case PROPERTY_ID_MASTERFIELDS: { rtl_uString_newFromAscii(&pStr, "MasterFields" ); break; }
+ case PROPERTY_ID_DETAILFIELDS: { rtl_uString_newFromAscii(&pStr, "DetailFields" ); break; }
+ case PROPERTY_ID_FIELDTYPE: { rtl_uString_newFromAscii(&pStr, "FieldType" ); break; }
+ case PROPERTY_ID_VALUE: { rtl_uString_newFromAscii(&pStr, "Value" ); break; }
+ case PROPERTY_ID_ACTIVE_CONNECTION: { rtl_uString_newFromAscii(&pStr, "ActiveConnection" ); break; }
}
m_aPropertyMap[_nIndex] = pStr;
return pStr ? OUString(pStr) : OUString();
diff --git a/connectivity/source/drivers/mork/MCatalog.cxx b/connectivity/source/drivers/mork/MCatalog.cxx
index 65abe02..3602b3c 100644
--- a/connectivity/source/drivers/mork/MCatalog.cxx
+++ b/connectivity/source/drivers/mork/MCatalog.cxx
@@ -92,8 +92,7 @@ Reference< XNameAccess > SAL_CALL OCatalog::getTables( ) throw(RuntimeException
try
{
- if(!m_pTables || m_pConnection->getForceLoadTables())
- refreshTables();
+ refreshTables();
}
catch( const RuntimeException& )
{
diff --git a/connectivity/source/drivers/mork/MConnection.hxx b/connectivity/source/drivers/mork/MConnection.hxx
index 1a29491..397102d 100644
--- a/connectivity/source/drivers/mork/MConnection.hxx
+++ b/connectivity/source/drivers/mork/MConnection.hxx
@@ -102,8 +102,6 @@ namespace connectivity
static OUString getDriverImplementationName();
- bool getForceLoadTables() {return true;}
-
// Added to enable me to use SQLInterpreter which requires an
// XNameAccess i/f to access tables.
::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier > SAL_CALL createCatalog();
diff --git a/connectivity/source/drivers/mork/MQueryHelper.cxx b/connectivity/source/drivers/mork/MQueryHelper.cxx
index 08e5447..36f8a2e 100644
--- a/connectivity/source/drivers/mork/MQueryHelper.cxx
+++ b/connectivity/source/drivers/mork/MQueryHelper.cxx
@@ -144,11 +144,6 @@ sal_Int32 MQueryHelper::getResultCount() const
-bool MQueryHelper::queryComplete() const
-{
- return true;
-}
-
bool MQueryHelper::checkRowAvailable( sal_Int32 nDBRow )
{
/*
diff --git a/connectivity/source/drivers/mork/MQueryHelper.hxx b/connectivity/source/drivers/mork/MQueryHelper.hxx
index 42a2c93..f12a7c2 100644
--- a/connectivity/source/drivers/mork/MQueryHelper.hxx
+++ b/connectivity/source/drivers/mork/MQueryHelper.hxx
@@ -199,7 +199,6 @@ namespace connectivity
void reset();
MQueryHelperResultEntry* getByIndex( sal_uInt32 nRow );
bool isError() const;
- bool queryComplete() const;
sal_Int32 getResultCount() const;
bool checkRowAvailable( sal_Int32 nDBRow );
bool getRowValue( ORowSetValue& rValue, sal_Int32 nDBRow,const OUString& aDBColumnName, sal_Int32 nType );
diff --git a/connectivity/source/drivers/mork/MResultSet.cxx b/connectivity/source/drivers/mork/MResultSet.cxx
index b33cb54..3adaddd 100644
--- a/connectivity/source/drivers/mork/MResultSet.cxx
+++ b/connectivity/source/drivers/mork/MResultSet.cxx
@@ -332,35 +332,6 @@ bool OResultSet::fetchCurrentRow( ) throw(SQLException, RuntimeException)
}
-bool OResultSet::pushCard(sal_uInt32 /*cardNumber*/) throw(SQLException, RuntimeException)
-{
- return true;
-/*
- if (cardNumber == 0)
- return sal_True;
- // Check whether we are storing the updated row
- if ( (m_aRow->get())[0].isNull() || (sal_Int32)(m_aRow->get())[0] != (sal_Int32)cardNumber )
- return sal_False;
-
- sal_Int32 nCount = m_aColumnNames.getLength();
- m_aQuery.setRowStates(cardNumber,m_RowStates);
- for( sal_Int32 i = 1; i <= nCount; i++ )
- {
- if ( (m_aRow->get())[i].isBound() )
- {
-
- // Everything in the addressbook is a string!
-
- if ( !m_aQuery.setRowValue( (m_aRow->get())[i], cardNumber, m_aColumnNames[i-1], DataType::VARCHAR ))
- {
- m_pStatement->getOwnConnection()->throwSQLException( m_aQuery.getError(), *this );
- }
- }
- }
- return sal_True;
-*/
-}
-
bool OResultSet::fetchRow(sal_Int32 cardNumber,bool bForceReload) throw(SQLException, RuntimeException)
{
SAL_INFO("connectivity.mork", "cardNumber = " << cardNumber);
@@ -369,13 +340,6 @@ bool OResultSet::fetchRow(sal_Int32 cardNumber,bool bForceReload) throw(SQLExcep
// Check whether we've already fetched the row...
if ( !(m_aRow->get())[0].isNull() && (sal_Int32)(m_aRow->get())[0] == (sal_Int32)cardNumber )
return true;
- //Check whether the old row has been changed
- if (cardNumber == m_nUpdatedRow)
- {
- //write back the changes first
- if (!pushCard(cardNumber)) //error write back the changes
- throw SQLException();
- }
}
// else
// m_aQuery.resyncRow(cardNumber);
@@ -466,7 +430,7 @@ sal_Bool SAL_CALL OResultSet::isAfterLast( ) throw(SQLException, RuntimeExcepti
OSL_TRACE("In/Out: OResultSet::isAfterLast" );
// return sal_True;
- return m_nRowPos > currentRowCount() && m_aQueryHelper.queryComplete();
+ return m_nRowPos > currentRowCount();
}
sal_Bool SAL_CALL OResultSet::isFirst( ) throw(SQLException, RuntimeException, std::exception)
@@ -484,7 +448,7 @@ sal_Bool SAL_CALL OResultSet::isLast( ) throw(SQLException, RuntimeException, s
OSL_TRACE("In/Out: OResultSet::isLast" );
// return sal_True;
- return m_nRowPos == currentRowCount() && m_aQueryHelper.queryComplete();
+ return m_nRowPos == currentRowCount();
}
void SAL_CALL OResultSet::beforeFirst( ) throw(SQLException, RuntimeException, std::exception)
@@ -1258,8 +1222,6 @@ void SAL_CALL OResultSet::executeQuery() throw( ::com::sun::star::sdbc::SQLExcep
OSL_TRACE("Query is to be sorted");
- OSL_ENSURE( m_aQueryHelper.queryComplete(), "Query not complete!!");
-
OSortIndex aSortIndex(eKeyType,m_aOrderbyAscending);
OSL_TRACE("OrderbyColumnNumber->size() = %zu",m_aOrderbyColumnNumber.size());
@@ -1445,28 +1407,26 @@ bool OResultSet::validRow( sal_uInt32 nRow)
{
sal_Int32 nNumberOfRecords = m_aQueryHelper.getResultCount();
- while ( nRow > (sal_uInt32)nNumberOfRecords && !m_aQueryHelper.queryComplete() ) {
#if OSL_DEBUG_LEVEL > 0
- OSL_TRACE("validRow: waiting...");
+ OSL_TRACE("validRow: waiting...");
#endif
- if (m_aQueryHelper.checkRowAvailable( nRow ) == false)
- {
- SAL_INFO(
- "connectivity.mork",
- "validRow(" << nRow << "): return False");
- return false;
- }
-
- if ( m_aQueryHelper.hadError() )
- {
- m_pStatement->getOwnConnection()->throwSQLException( m_aQueryHelper.getError(), *this );
- }
+ if (m_aQueryHelper.checkRowAvailable( nRow ) == false)
+ {
+ SAL_INFO(
+ "connectivity.mork",
+ "validRow(" << nRow << "): return False");
+ return false;
+ }
- nNumberOfRecords = m_aQueryHelper.getResultCount();
+ if ( m_aQueryHelper.hadError() )
+ {
+ m_pStatement->getOwnConnection()->throwSQLException( m_aQueryHelper.getError(), *this );
}
+ nNumberOfRecords = m_aQueryHelper.getResultCount();
+
if (( nRow == 0 ) ||
- ( nRow > (sal_uInt32)nNumberOfRecords && m_aQueryHelper.queryComplete()) ){
+ ( nRow > (sal_uInt32)nNumberOfRecords) ){
SAL_INFO("connectivity.mork", "validRow(" << nRow << "): return False");
return false;
}
diff --git a/connectivity/source/drivers/mork/MResultSet.hxx b/connectivity/source/drivers/mork/MResultSet.hxx
index 6422c04..d40fe68 100644
--- a/connectivity/source/drivers/mork/MResultSet.hxx
+++ b/connectivity/source/drivers/mork/MResultSet.hxx
@@ -266,8 +266,6 @@ protected:
::com::sun::star::uno::RuntimeException);
bool fetchCurrentRow() throw( ::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
- bool pushCard(sal_uInt32 rowIndex) throw( ::com::sun::star::sdbc::SQLException,
- ::com::sun::star::uno::RuntimeException);
bool validRow( sal_uInt32 nRow );
bool seekRow( eRowPosition pos, sal_Int32 nOffset = 0 );
sal_Int32 deletedCount();
diff --git a/connectivity/source/drivers/mork/MResultSetMetaData.cxx b/connectivity/source/drivers/mork/MResultSetMetaData.cxx
index 2674658..b014c7a 100644
--- a/connectivity/source/drivers/mork/MResultSetMetaData.cxx
+++ b/connectivity/source/drivers/mork/MResultSetMetaData.cxx
@@ -176,7 +176,7 @@ sal_Bool SAL_CALL OResultSetMetaData::isReadOnly( sal_Int32 column ) throw(SQLEx
bool bReadOnly = (m_xColumns->get())[column-1]->getPropertySetInfo()->hasPropertyByName(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FUNCTION)) &&
::cppu::any2bool((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FUNCTION)));
- return m_bReadOnly || bReadOnly || m_pTable->isReadOnly();
+ return m_bReadOnly || bReadOnly;
}
diff --git a/connectivity/source/drivers/mork/MStatement.cxx b/connectivity/source/drivers/mork/MStatement.cxx
index e0766ce..e6be4a9 100644
--- a/connectivity/source/drivers/mork/MStatement.cxx
+++ b/connectivity/source/drivers/mork/MStatement.cxx
@@ -140,54 +140,6 @@ void SAL_CALL OCommonStatement::close( ) throw(SQLException, RuntimeException,
}
-
-void OCommonStatement::createTable( ) throw ( SQLException, RuntimeException )
-{
-/*
- if(m_pParseTree)
- {
- ::rtl::Reference<connectivity::OSQLColumns> xCreateColumn;
- if (m_pSQLIterator->getStatementType() == SQL_STATEMENT_CREATE_TABLE)
- {
- const OSQLTables& xTabs = m_pSQLIterator->getTables();
- OSL_ENSURE( !xTabs.empty(), "Need a Table");
- OUString ouTableName=xTabs.begin()->first;
- xCreateColumn = m_pSQLIterator->getCreateColumns();
- OSL_ENSURE(xCreateColumn.is(), "Need the Columns!!");
-
- const OColumnAlias& aColumnAlias = m_pConnection->getColumnAlias();
-
- OSQLColumns::Vector::const_iterator aIter = xCreateColumn->get().begin();
- const OUString sProprtyName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME);
- OUString sName;
- for (sal_Int32 i = 1; aIter != xCreateColumn->get().end();++aIter, i++)
- {
- (*aIter)->getPropertyValue(sProprtyName) >>= sName;
- if ( !aColumnAlias.hasAlias( sName ) )
- {
-
- const OUString sError( getOwnConnection()->getResources().getResourceStringWithSubstitution(
- STR_INVALID_COLUMNNAME,
- "$columnname$", sName
- ) );
- ::dbtools::throwGenericSQLException(sError,*this);
- }
- }
- MDatabaseMetaDataHelper _aDbHelper;
- if (!_aDbHelper.NewAddressBook(m_pConnection,ouTableName))
- {
- getOwnConnection()->throwSQLException( _aDbHelper.getError(), *this );
- }
- m_pSQLIterator.reset( new ::connectivity::OSQLParseTreeIterator(
- m_pConnection, m_pConnection->createCatalog()->getTables(), m_aParser, NULL ) );
- }
-
- }
- else
- getOwnConnection()->throwSQLException( STR_QUERY_TOO_COMPLEX, *this );
-*/
-}
-
OCommonStatement::StatementType OCommonStatement::parseSql( const OUString& sql , bool bAdjusted)
throw ( SQLException, RuntimeException )
{
@@ -242,7 +194,6 @@ OCommonStatement::StatementType OCommonStatement::parseSql( const OUString& sql
return eSelect;
case SQL_STATEMENT_CREATE_TABLE:
- createTable();
return eCreateTable;
default:
diff --git a/connectivity/source/drivers/mork/MStatement.hxx b/connectivity/source/drivers/mork/MStatement.hxx
index 08b4c56..3476d9b 100644
--- a/connectivity/source/drivers/mork/MStatement.hxx
+++ b/connectivity/source/drivers/mork/MStatement.hxx
@@ -144,9 +144,6 @@ namespace connectivity
void analyseSQL();
void setOrderbyColumn( connectivity::OSQLParseNode* pColumnRef,
connectivity::OSQLParseNode* pAscendingDescending);
- void createTable( ) throw (
- ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
-
public:
// other methods
OConnection* getOwnConnection() const { return m_pConnection;}
diff --git a/connectivity/source/drivers/mork/MTable.hxx b/connectivity/source/drivers/mork/MTable.hxx
index 3909051..454364b 100644
--- a/connectivity/source/drivers/mork/MTable.hxx
+++ b/connectivity/source/drivers/mork/MTable.hxx
@@ -43,8 +43,6 @@ namespace connectivity
OConnection* getConnection() { return m_pConnection;}
- bool isReadOnly() const { return false; }
-
OUString getTableName() const { return m_Name; }
OUString getSchema() const { return m_SchemaName; }
diff --git a/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx
index 36d7637..f5ffa38 100644
--- a/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx
@@ -698,27 +698,6 @@ Any SAL_CALL ODatabaseMetaDataResultSet::getWarnings( ) throw(SQLException, Run
return Any();
}
-sal_Int32 ODatabaseMetaDataResultSet::getResultSetConcurrency() const throw(SQLException, RuntimeException)
-{
- return ResultSetConcurrency::READ_ONLY;
-}
-
-sal_Int32 ODatabaseMetaDataResultSet::getResultSetType() const throw(SQLException, RuntimeException)
-{
- return ResultSetType::FORWARD_ONLY;
-}
-
-sal_Int32 ODatabaseMetaDataResultSet::getFetchDirection() const throw(SQLException, RuntimeException)
-{
- return FetchDirection::FORWARD;
-}
-
-sal_Int32 ODatabaseMetaDataResultSet::getFetchSize() const throw(SQLException, RuntimeException)
-{
- sal_Int32 nValue=1;
- return nValue;
-}
-
OUString ODatabaseMetaDataResultSet::getCursorName() const throw(SQLException, RuntimeException)
{
return OUString();
diff --git a/connectivity/source/drivers/odbc/OResultSet.cxx b/connectivity/source/drivers/odbc/OResultSet.cxx
index dc665ee..165ff0b 100644
--- a/connectivity/source/drivers/odbc/OResultSet.cxx
+++ b/connectivity/source/drivers/odbc/OResultSet.cxx
@@ -1327,11 +1327,6 @@ sal_Int32 OResultSet::getResultSetType() const
return nValue;
}
-sal_Int32 OResultSet::getFetchDirection() const
-{
- return FetchDirection::FORWARD;
-}
-
sal_Int32 OResultSet::getFetchSize() const
{
return getStmtOption<SQLULEN, SQL_IS_UINTEGER>(SQL_ATTR_ROW_ARRAY_SIZE);
diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
index d334dca1..b243dfa 100644
--- a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
+++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
@@ -124,11 +124,6 @@ std::vector
#define DEFERRABILITY_INITIALLY_IMMEDIATE 6
#define DEFERRABILITY_NONE 7
-void DatabaseMetaData::checkClosed()
- throw (SQLException, RuntimeException)
-{
-}
-
DatabaseMetaData::DatabaseMetaData(
const ::rtl::Reference< RefCountedMutex > & refMutex,
const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin,
@@ -1110,7 +1105,6 @@ sal_Bool DatabaseMetaData::dataDefinitionIgnoredInTransactions( ) throw (SQLExc
// LEM TODO: implement
// LEM TODO: at least fake the columns, even if no row.
MutexGuard guard( m_refMutex->mutex );
- checkClosed();
return new SequenceResultSet(
m_refMutex, *this, Sequence< OUString >(), Sequence< Sequence< Any > > (), m_pSettings->tc );
}
@@ -1123,7 +1117,6 @@ sal_Bool DatabaseMetaData::dataDefinitionIgnoredInTransactions( ) throw (SQLExc
{
(void) catalog; (void) schemaPattern; (void) procedureNamePattern; (void) columnNamePattern;
MutexGuard guard( m_refMutex->mutex );
- checkClosed();
// LEM TODO: implement
// LEM TODO: at least fake the columns, even if no row.
return new SequenceResultSet(
@@ -1141,7 +1134,6 @@ sal_Bool DatabaseMetaData::dataDefinitionIgnoredInTransactions( ) throw (SQLExc
Statics &statics = getStatics();
MutexGuard guard( m_refMutex->mutex );
- checkClosed();
if( isLog( m_pSettings, LogLevel::INFO ) )
{
@@ -1259,7 +1251,6 @@ struct SortInternalSchemasLastAndPublicFirst
throw (SQLException, RuntimeException, std::exception)
{
MutexGuard guard( m_refMutex->mutex );
- checkClosed();
if( isLog( m_pSettings, LogLevel::INFO ) )
{
@@ -1297,7 +1288,6 @@ struct SortInternalSchemasLastAndPublicFirst
// LEM TODO: return the current catalog like JDBC driver?
// at least fake the columns, even if no content
MutexGuard guard( m_refMutex->mutex );
- checkClosed();
return new SequenceResultSet(
m_refMutex, *this, Sequence< OUString >(), Sequence< Sequence< Any > > (), m_pSettings->tc );
}
@@ -1307,7 +1297,6 @@ struct SortInternalSchemasLastAndPublicFirst
{
// LEM TODO: this can be made dynamic, see JDBC driver
MutexGuard guard( m_refMutex->mutex );
- checkClosed();
return new SequenceResultSet(
m_refMutex, *this, getStatics().tableTypeNames, getStatics().tableTypeData,
m_pSettings->tc );
@@ -1471,7 +1460,6 @@ static void columnMetaData2DatabaseTypeDescription(
// continue !
MutexGuard guard( m_refMutex->mutex );
- checkClosed();
if( isLog( m_pSettings, LogLevel::INFO ) )
{
@@ -1655,7 +1643,6 @@ static void columnMetaData2DatabaseTypeDescription(
(void) catalog;
MutexGuard guard( m_refMutex->mutex );
- checkClosed();
if( isLog( m_pSettings, LogLevel::INFO ) )
{
@@ -1686,7 +1673,6 @@ static void columnMetaData2DatabaseTypeDescription(
{
(void) catalog;
MutexGuard guard( m_refMutex->mutex );
- checkClosed();
if( isLog( m_pSettings, LogLevel::INFO ) )
{
@@ -1717,7 +1703,6 @@ static void columnMetaData2DatabaseTypeDescription(
(void) catalog; (void) schema; (void) table; (void) scope; (void) nullable;
//LEM TODO: implement! See JDBC driver
MutexGuard guard( m_refMutex->mutex );
- checkClosed();
return new SequenceResultSet(
m_refMutex, *this, Sequence< OUString >(), Sequence< Sequence< Any > > (), m_pSettings->tc );
}
@@ -1730,7 +1715,6 @@ static void columnMetaData2DatabaseTypeDescription(
(void) catalog; (void) schema; (void) table;
//LEM TODO: implement! See JDBC driver
MutexGuard guard( m_refMutex->mutex );
- checkClosed();
return new SequenceResultSet(
m_refMutex, *this, Sequence< OUString >(), Sequence< Sequence< Any > > (), m_pSettings->tc );
}
@@ -1743,7 +1727,6 @@ static void columnMetaData2DatabaseTypeDescription(
(void) catalog;
//LEM TODO: review
MutexGuard guard( m_refMutex->mutex );
- checkClosed();
// 1. TABLE_CAT string => table catalog (may be NULL )
// 2. TABLE_SCHEM string => table schema (may be NULL )
@@ -2307,7 +2290,6 @@ static void pgTypeInfo2ResultSet(
{
// Note: Indexes start at 0 (in the API doc, they start at 1)
MutexGuard guard( m_refMutex->mutex );
- checkClosed();
if( isLog( m_pSettings, LogLevel::INFO ) )
{
@@ -2376,7 +2358,6 @@ static sal_Int32 seqContains( const Sequence< sal_Int32 > &seq, sal_Int32 value
(void) catalog; (void) approximate;
//LEM TODO: review
MutexGuard guard( m_refMutex->mutex );
- checkClosed();
/*
1. TABLE_CAT string -> table catalog (may be NULL )
@@ -2567,7 +2548,6 @@ sal_Bool DatabaseMetaData::supportsBatchUpdates( ) throw (SQLException, Runtime
(void) catalog; (void) schemaPattern; (void) typeNamePattern; (void) types;
//LEM TODO: implement! See JDBC driver
MutexGuard guard( m_refMutex->mutex );
- checkClosed();
return new SequenceResultSet(
m_refMutex, *this, Sequence< OUString >(), Sequence< Sequence< Any > > (), m_pSettings->tc );
}
diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.hxx b/connectivity/source/drivers/postgresql/pq_databasemetadata.hxx
index 9a54a20..a61ac4a 100644
--- a/connectivity/source/drivers/postgresql/pq_databasemetadata.hxx
+++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.hxx
@@ -56,7 +56,6 @@ class DatabaseMetaData :
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > m_getTablePrivs_stmt;
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > m_getColumnPrivs_stmt;
- void checkClosed() throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
sal_Int32 getIntSetting(const OUString& settingName) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
sal_Int32 getMaxIndexKeys() throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
sal_Int32 getMaxNameLength() throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
diff --git a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx
index 1e57850..406d31b 100644
--- a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx
+++ b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx
@@ -333,7 +333,6 @@ sal_Int32 ResultSetMetaData::getColumnDisplaySize( sal_Int32 column )
throw (SQLException, RuntimeException, std::exception)
{
MutexGuard guard( m_refMutex->mutex );
- checkClosed();
checkColumnIndex( column );
return m_colDesc[column-1].displaySize;
}
@@ -347,7 +346,6 @@ OUString ResultSetMetaData::getColumnLabel( sal_Int32 column )
OUString ResultSetMetaData::getColumnName( sal_Int32 column ) throw (SQLException, RuntimeException, std::exception)
{
MutexGuard guard( m_refMutex->mutex );
- checkClosed();
checkColumnIndex( column );
return m_colDesc[column-1].name;
@@ -363,7 +361,6 @@ sal_Int32 ResultSetMetaData::getPrecision( sal_Int32 column )
throw (SQLException, RuntimeException, std::exception)
{
MutexGuard guard( m_refMutex->mutex );
- checkClosed();
checkColumnIndex( column );
return m_colDesc[column-1].precision;
}
@@ -372,7 +369,6 @@ sal_Int32 ResultSetMetaData::getScale( sal_Int32 column )
throw (SQLException, RuntimeException, std::exception)
{
MutexGuard guard( m_refMutex->mutex );
- checkClosed();
checkColumnIndex( column );
return m_colDesc[column-1].scale;
}
@@ -458,12 +454,6 @@ OUString ResultSetMetaData::getColumnServiceName( sal_Int32 column )
return OUString();
}
-void ResultSetMetaData::checkClosed()
- throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
-{
- // we never close
-}
-
void ResultSetMetaData::checkColumnIndex(sal_Int32 columnIndex)
throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
{
diff --git a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx
index 6dc53f0..e70d5b0 100644
--- a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx
+++ b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx
@@ -81,8 +81,6 @@ class ResultSetMetaData :
sal_Int32 m_colCount;
- void checkClosed()
- throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
void checkColumnIndex( sal_Int32 columnIndex )
throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
void checkTable();
diff --git a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
index 4b7bbd4..74b507b 100644
--- a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
+++ b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
@@ -20,6 +20,9 @@
#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_ODBC_ODATABASEMETADATARESULTSET_HXX
#define INCLUDED_CONNECTIVITY_SOURCE_INC_ODBC_ODATABASEMETADATARESULTSET_HXX
+#include <com/sun/star/sdbc/FetchDirection.hpp>
+#include <com/sun/star/sdbc/ResultSetConcurrency.hpp>
+#include <com/sun/star/sdbc/ResultSetType.hpp>
#include <com/sun/star/sdbc/XResultSet.hpp>
#include <com/sun/star/sdbc/XRow.hpp>
#include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp>
@@ -80,10 +83,10 @@ namespace connectivity
// set the columncount of the driver
void checkColumnCount();
- sal_Int32 getResultSetConcurrency() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
- sal_Int32 getResultSetType() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
- sal_Int32 getFetchDirection() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
- sal_Int32 getFetchSize() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+ static sal_Int32 getResultSetConcurrency() { return css::sdbc::ResultSetConcurrency::READ_ONLY; }
+ static sal_Int32 getResultSetType() { return css::sdbc::ResultSetType::FORWARD_ONLY; }
+ static sal_Int32 getFetchDirection() { return css::sdbc::FetchDirection::FORWARD; }
+ static sal_Int32 getFetchSize() { return 1; }
OUString getCursorName() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
SWORD impl_getColumnType_nothrow(sal_Int32 columnIndex);
diff --git a/connectivity/source/inc/odbc/OResultSet.hxx b/connectivity/source/inc/odbc/OResultSet.hxx
index a423e73..104f617 100644
--- a/connectivity/source/inc/odbc/OResultSet.hxx
+++ b/connectivity/source/inc/odbc/OResultSet.hxx
@@ -20,6 +20,7 @@
#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_ODBC_ORESULTSET_HXX
#define INCLUDED_CONNECTIVITY_SOURCE_INC_ODBC_ORESULTSET_HXX
+#include <com/sun/star/sdbc/FetchDirection.hpp>
#include <com/sun/star/sdbc/XResultSet.hpp>
#include <com/sun/star/sdbc/XRow.hpp>
#include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp>
@@ -154,7 +155,7 @@ namespace connectivity
bool isBookmarkable() const;
sal_Int32 getResultSetConcurrency() const;
sal_Int32 getResultSetType() const;
- sal_Int32 getFetchDirection() const;
+ static sal_Int32 getFetchDirection() { return css::sdbc::FetchDirection::FORWARD; }
sal_Int32 getFetchSize() const;
OUString getCursorName() const;
template < typename T, SQLINTEGER BufferLength > T getStmtOption (SQLINTEGER fOption, T dflt = 0) const;
commit 9559cef61d0ca9159ef095fe28fc68121a8d30d3
Author: Noel Grandin <noel at peralex.com>
Date: Fri Mar 20 10:44:16 2015 +0200
loplugin:constantfunction: cui
Change-Id: I4bbfbd526f78c4806d6fc85a4011cbc4ef3a25fa
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 6cb2357..54be990 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -361,14 +361,6 @@ OUString SfxConfigFunctionListBox::GetCurLabel()
return pData->sCommand;
}
-void SfxConfigFunctionListBox::FunctionSelected()
-/* Description
- Resets the balloon-help because it shall
- always show the help-text of the selected entry.
-*/
-{
-}
-
void SfxConfigFunctionListBox::SetStylesInfo(SfxStylesInfo_Impl* pStyles)
{
pStylesInfo = pStyles;
@@ -496,16 +488,6 @@ void SfxConfigGroupListBox::InitModule()
}
-void SfxConfigGroupListBox::InitBasic()
-{
-}
-
-
-void SfxConfigGroupListBox::InitStyles()
-{
-}
-
-
namespace
{
@@ -578,8 +560,6 @@ void SfxConfigGroupListBox::Init(const css::uno::Reference< css::uno::XComponent
m_xUICmdDescription = css::frame::theUICommandDescription::get( m_xContext );
InitModule();
- InitBasic();
- InitStyles();
}
SAL_INFO("cui.customize", "** ** About to initialise SF Scripts");
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index 982ed6c..9832ce9 100644
--- a/cui/source/dialogs/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -74,25 +74,6 @@ int IconChoicePage::DeactivatePage( SfxItemSet* )
return LEAVE_PAGE;
}
-/**********************************************************************
-|
-| ...
-|
-\**********************************************************************/
-
-void IconChoicePage::FillUserData()
-{
-}
-
-
-
-bool IconChoicePage::IsReadOnly() const
-{
- return false;
-}
-
-
-
bool IconChoicePage::QueryClose()
{
return true;
@@ -240,7 +221,6 @@ IconChoiceDialog ::~IconChoiceDialog ()
if ( pData->pPage )
{
- pData->pPage->FillUserData();
OUString aPageData(pData->pPage->GetUserData());
if ( !aPageData.isEmpty() )
{
@@ -489,7 +469,7 @@ void IconChoiceDialog::ActivatePageImpl ()
if ( pExampleSet )
pData->pPage->ActivatePage( *pExampleSet );
SetHelpId( pData->pPage->GetHelpId() );
- bReadOnly = pData->pPage->IsReadOnly();
+ bReadOnly = false;
}
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index f740a89..801f949 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -339,10 +339,6 @@ bool SFTreeListBox::ExpandingHdl()
return true;
}
-void SFTreeListBox::ExpandAllTrees()
-{
-}
-
SvTreeListEntry * SFTreeListBox::insertEntry(
OUString const & rText, sal_uInt16 nBitmap, SvTreeListEntry * pParent,
bool bChildrenOnDemand, std::unique_ptr< SFEntry > && aUserData, const OUString& factoryURL )
@@ -514,7 +510,6 @@ short SvxScriptOrgDialog::Execute()
pDoc = SfxObjectShell::GetNext(*pDoc);
}
- m_pScriptsBox->ExpandAllTrees();
vcl::Window* pPrevDlgParent = Application::GetDefDialogParent();
Application::SetDefDialogParent( this );
diff --git a/cui/source/inc/align.hxx b/cui/source/inc/align.hxx
index fb5e07e..f3e0cfd 100644
--- a/cui/source/inc/align.hxx
+++ b/cui/source/inc/align.hxx
@@ -54,12 +54,13 @@ namespace svx {
class AlignmentTabPage : public SfxTabPage
{
using TabPage::DeactivatePage;
+ static const sal_uInt16 s_pRanges[];
public:
virtual ~AlignmentTabPage();
static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet );
- static const sal_uInt16* GetRanges();
+ static const sal_uInt16* GetRanges() { return s_pRanges; }
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx
index 9e34d66..6c3298e 100644
--- a/cui/source/inc/backgrnd.hxx
+++ b/cui/source/inc/backgrnd.hxx
@@ -45,9 +45,11 @@ class SvxBrushItem;
class SvxBackgroundTabPage : public SvxTabPage
{
using TabPage::DeactivatePage;
+ static const sal_uInt16 pPageRanges[];
public:
static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet );
- static const sal_uInt16* GetRanges();
+ // returns the area of the which-values
+ static const sal_uInt16* GetRanges() { return pPageRanges; }
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx
index 0a5aea5..244faa2 100644
--- a/cui/source/inc/border.hxx
+++ b/cui/source/inc/border.hxx
@@ -42,10 +42,12 @@ class SvxBorderTabPage : public SfxTabPage
{
using TabPage::DeactivatePage;
+ static const sal_uInt16 pRanges[];
+
public:
static SfxTabPage* Create( vcl::Window* pParent,
const SfxItemSet* rAttrSet);
- static const sal_uInt16* GetRanges();
+ static const sal_uInt16* GetRanges() { return pRanges; }
virtual bool FillItemSet( SfxItemSet* rCoreAttrs ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE;
diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx
index c2c1242..3e445ce 100644
--- a/cui/source/inc/cfgutil.hxx
+++ b/cui/source/inc/cfgutil.hxx
@@ -120,7 +120,6 @@ public:
OUString GetCurCommand();
OUString GetCurLabel();
OUString GetSelectedScriptURI();
- void FunctionSelected();
void SetStylesInfo(SfxStylesInfo_Impl* pStyles);
};
@@ -151,8 +150,6 @@ class SfxConfigGroupListBox : public SvTreeListBox
void InitModule();
- void InitBasic();
- void InitStyles();
OUString MapCommand2UIName(const OUString& sCommand);
diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx
index 424a976..43d7d61 100644
--- a/cui/source/inc/chardlg.hxx
+++ b/cui/source/inc/chardlg.hxx
@@ -78,6 +78,7 @@ class SvxCharNamePage : public SvxCharBasePage
{
private:
+ static const sal_uInt16 pNameRanges[];
VclContainer* m_pWestFrame;
FixedText* m_pWestFontNameFT;
FontNameBox* m_pWestFontNameLB;
@@ -153,7 +154,7 @@ public:
virtual ~SvxCharNamePage();
static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet );
- static const sal_uInt16* GetRanges();
+ static const sal_uInt16* GetRanges() { return pNameRanges; }
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
@@ -174,6 +175,7 @@ class SvxCharEffectsPage : public SvxCharBasePage
{
private:
+ static const sal_uInt16 pEffectsRanges[];
FixedText* m_pFontColorFT;
ColorListBox* m_pFontColorLB;
@@ -232,7 +234,7 @@ public:
public:
static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet );
- static const sal_uInt16* GetRanges();
+ static const sal_uInt16* GetRanges() { return pEffectsRanges; }
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
@@ -246,8 +248,10 @@ public:
// class SvxCharPositionPage ---------------------------------------------
+
class SvxCharPositionPage : public SvxCharBasePage
{
+ static const sal_uInt16 pPositionRanges[];
private:
RadioButton* m_pHighPosBtn;
@@ -311,7 +315,7 @@ public:
public:
static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet );
- static const sal_uInt16* GetRanges();
+ static const sal_uInt16* GetRanges() { return pPositionRanges; }
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
@@ -326,6 +330,7 @@ public:
class SvxCharTwoLinesPage : public SvxCharBasePage
{
private:
+ static const sal_uInt16 pTwoLinesRanges[];
CheckBox* m_pTwoLinesBtn;
VclContainer* m_pEnclosingFrame;
ListBox* m_pStartBracketLB;
@@ -354,7 +359,7 @@ public:
public:
static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet );
- static const sal_uInt16* GetRanges();
+ static const sal_uInt16* GetRanges() { return pTwoLinesRanges; }
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
diff --git a/cui/source/inc/connect.hxx b/cui/source/inc/connect.hxx
index e66fcd6..a85dabd 100644
--- a/cui/source/inc/connect.hxx
+++ b/cui/source/inc/connect.hxx
@@ -33,6 +33,7 @@ class SdrView;
class SvxConnectionPage : public SfxTabPage
{
private:
+ static const sal_uInt16 pRanges[];
ListBox* m_pLbType;
FixedText* m_pFtLine1;
@@ -64,7 +65,7 @@ public:
virtual ~SvxConnectionPage();
static SfxTabPage* Create( vcl::Window*, const SfxItemSet* );
- static const sal_uInt16* GetRanges();
+ static const sal_uInt16* GetRanges() { return pRanges; }
virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE;
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index 8c9bfc0..5d8c23d 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -107,6 +107,7 @@ class SvxTransparenceTabPage : public SvxTabPage
{
using TabPage::ActivatePage;
using TabPage::DeactivatePage;
+ static const sal_uInt16 pTransparenceRanges[];
const SfxItemSet& rOutAttrs;
RECT_POINT eRP;
@@ -160,10 +161,9 @@ class SvxTransparenceTabPage : public SvxTabPage
public:
SvxTransparenceTabPage(vcl::Window* pParent, const SfxItemSet& rInAttrs);
- void Construct();
static SfxTabPage* Create(vcl::Window*, const SfxItemSet*);
- static const sal_uInt16* GetRanges();
+ static const sal_uInt16* GetRanges() { return pTransparenceRanges; }
virtual bool FillItemSet(SfxItemSet*) SAL_OVERRIDE;
virtual void Reset(const SfxItemSet*) SAL_OVERRIDE;
@@ -182,7 +182,7 @@ class SvxAreaTabPage : public SvxTabPage
{
using TabPage::ActivatePage;
using TabPage::DeactivatePage;
-
+ static const sal_uInt16 pAreaRanges[];
private:
ListBox* m_pTypeLB;
@@ -293,7 +293,7 @@ public:
void Construct();
static SfxTabPage* Create( vcl::Window*, const SfxItemSet* );
- static const sal_uInt16* GetRanges();
+ static const sal_uInt16* GetRanges() { return pAreaRanges; }
virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE;
@@ -324,6 +324,7 @@ class SvxShadowTabPage : public SvxTabPage
{
using TabPage::ActivatePage;
using TabPage::DeactivatePage;
+ static const sal_uInt16 pShadowRanges[];
private:
TriStateBox* m_pTsbShowShadow;
@@ -358,7 +359,7 @@ public:
void Construct();
static SfxTabPage* Create( vcl::Window*, const SfxItemSet* );
- static const sal_uInt16* GetRanges();
+ static const sal_uInt16* GetRanges() { return pShadowRanges; }
virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE;
diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx
index bc4fffc..5db3330 100644
--- a/cui/source/inc/cuitabline.hxx
+++ b/cui/source/inc/cuitabline.hxx
@@ -90,6 +90,7 @@ class SvxLineTabPage : public SvxTabPage
{
using TabPage::ActivatePage;
using TabPage::DeactivatePage;
+ static const sal_uInt16 pLineRanges[];
private:
VclBox* m_pBoxColor;
LineLB* m_pLbLineStyle;
@@ -208,7 +209,7 @@ public:
void Construct();
static SfxTabPage* Create( vcl::Window*, const SfxItemSet* );
- static const sal_uInt16* GetRanges();
+ static const sal_uInt16* GetRanges() { return pLineRanges; }
virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE;
diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx
index 0c89da1..06d42ce 100644
--- a/cui/source/inc/iconcdlg.hxx
+++ b/cui/source/inc/iconcdlg.hxx
@@ -112,8 +112,6 @@ public :
virtual int DeactivatePage( SfxItemSet* pSet = 0 );
void SetUserData(const OUString& rString) { aUserString = rString; }
OUString GetUserData() { return aUserString; }
- void FillUserData();
- bool IsReadOnly() const;
virtual bool QueryClose();
void StateChanged( StateChangedType nType ) SAL_OVERRIDE;
diff --git a/cui/source/inc/labdlg.hxx b/cui/source/inc/labdlg.hxx
index 743ba93..446499f 100644
--- a/cui/source/inc/labdlg.hxx
+++ b/cui/source/inc/labdlg.hxx
@@ -33,6 +33,7 @@ const sal_uInt16 CAPTYPE_BITMAPS_COUNT = 3;
class SvxCaptionTabPage : public SfxTabPage
{
private:
+ static const sal_uInt16 pCaptionRanges[];
ValueSet* m_pCT_CAPTTYPE;
MetricField* m_pMF_ABSTAND;
ListBox* m_pLB_ANSATZ;
@@ -76,7 +77,7 @@ public:
SvxCaptionTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs );
static SfxTabPage* Create( vcl::Window*, const SfxItemSet* );
- static const sal_uInt16* GetRanges();
+ static const sal_uInt16* GetRanges() { return pCaptionRanges; }
virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE;
diff --git a/cui/source/inc/measure.hxx b/cui/source/inc/measure.hxx
index a42ea5e..aadc276 100644
--- a/cui/source/inc/measure.hxx
+++ b/cui/source/inc/measure.hxx
@@ -31,6 +31,7 @@ class SdrView;
class SvxMeasurePage : public SvxTabPage
{
private:
+ static const sal_uInt16 pRanges[];
MetricField* m_pMtrFldLineDist;
MetricField* m_pMtrFldHelplineOverhang;
@@ -68,7 +69,7 @@ public:
virtual ~SvxMeasurePage();
static SfxTabPage* Create( vcl::Window*, const SfxItemSet* );
- static const sal_uInt16* GetRanges();
+ static const sal_uInt16* GetRanges() { return pRanges; }
virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE;
diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx
index 0bbec43..e866670 100644
--- a/cui/source/inc/numfmt.hxx
+++ b/cui/source/inc/numfmt.hxx
@@ -66,13 +66,15 @@ public:
class SvxNumberFormatTabPage : public SfxTabPage
{
using SfxTabPage::DeactivatePage;
+ static const sal_uInt16 pRanges[];
public:
virtual ~SvxNumberFormatTabPage();
static SfxTabPage* Create( vcl::Window* pParent,
const SfxItemSet* rAttrSet );
- static const sal_uInt16* GetRanges();
+ // Returns area information.
+ static const sal_uInt16* GetRanges() { return pRanges; }
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx
index 2009188..fac3304 100644
--- a/cui/source/inc/page.hxx
+++ b/cui/source/inc/page.hxx
@@ -72,6 +72,7 @@ class SvxPageDescPage : public SfxTabPage
using TabPage::ActivatePage;
using TabPage::DeactivatePage;
+ static const sal_uInt16 pRanges[];
private:
// paper format
ListBox* m_pPaperSizeBox;
@@ -188,7 +189,8 @@ protected:
public:
static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet );
- static const sal_uInt16* GetRanges();
+ // returns the range of the Which values
+ static const sal_uInt16* GetRanges() { return pRanges; }
virtual bool FillItemSet( SfxItemSet* rOutSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx
index 4209e04..461f56a 100644
--- a/cui/source/inc/paragrph.hxx
+++ b/cui/source/inc/paragrph.hxx
@@ -46,6 +46,7 @@ class SvxLineSpacingItem;
class SvxStdParagraphTabPage: public SfxTabPage
{
using TabPage::DeactivatePage;
+ static const sal_uInt16 pStdRanges[];
private:
SvxStdParagraphTabPage( vcl::Window* pParent, const SfxItemSet& rSet );
@@ -100,7 +101,7 @@ public:
DECL_LINK(ELRLoseFocusHdl, void *);
static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet );
- static const sal_uInt16* GetRanges();
+ static const sal_uInt16* GetRanges() { return pStdRanges; }
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
@@ -123,6 +124,7 @@ public:
class SvxParaAlignTabPage : public SfxTabPage
{
using TabPage::DeactivatePage;
+ static const sal_uInt16 pAlignRanges[];
// alignment
RadioButton* m_pLeft;
@@ -161,7 +163,7 @@ protected:
public:
static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet );
- static const sal_uInt16* GetRanges();
+ static const sal_uInt16* GetRanges() { return pAlignRanges; }
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
@@ -187,13 +189,14 @@ public:
class SvxExtParagraphTabPage: public SfxTabPage
{
using TabPage::DeactivatePage;
+ static const sal_uInt16 pExtRanges[];
public:
virtual ~SvxExtParagraphTabPage();
static SfxTabPage* Create( vcl::Window* pParent,
const SfxItemSet* rSet );
- static const sal_uInt16* GetRanges();
+ static const sal_uInt16* GetRanges() { return pExtRanges; }
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx
index ef0cea6..8778123 100644
--- a/cui/source/inc/scriptdlg.hxx
+++ b/cui/source/inc/scriptdlg.hxx
@@ -72,21 +72,18 @@ protected:
virtual bool ExpandingHdl() SAL_OVERRIDE;
public:
void Init( const OUString& language );
- void RequestSubEntries( SvTreeListEntry* pRootEntry, ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& node,
- ::com::sun::star::uno::Reference< com::sun::star::frame::XModel>& model );
- SFTreeListBox(vcl::Window* pParent);
+ void RequestSubEntries( SvTreeListEntry* pRootEntry,
+ ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& node,
+ ::com::sun::star::uno::Reference< com::sun::star::frame::XModel>& model );
+ SFTreeListBox(vcl::Window* pParent);
virtual ~SFTreeListBox();
- void ExpandAllTrees();
-
-
-
- SvTreeListEntry * insertEntry(OUString const & rText, sal_uInt16 nBitmap,
+ SvTreeListEntry * insertEntry(OUString const & rText, sal_uInt16 nBitmap,
SvTreeListEntry * pParent,
bool bChildrenOnDemand,
std::unique_ptr< SFEntry > && aUserData,
const OUString& factoryURL );
- SvTreeListEntry * insertEntry(OUString const & rText, sal_uInt16 nBitmap,
+ SvTreeListEntry * insertEntry(OUString const & rText, sal_uInt16 nBitmap,
SvTreeListEntry * pParent,
bool bChildrenOnDemand,
std::unique_ptr< SFEntry > && aUserData );
diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx
index c5bf547..0bc84e3 100644
--- a/cui/source/inc/tabstpge.hxx
+++ b/cui/source/inc/tabstpge.hxx
@@ -46,12 +46,13 @@ class TabWin_Impl;
class SvxTabulatorTabPage : public SfxTabPage
{
using TabPage::DeactivatePage;
+ static const sal_uInt16 pRanges[];
public:
virtual ~SvxTabulatorTabPage();
static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet );
- static const sal_uInt16* GetRanges();
+ static const sal_uInt16* GetRanges() { return pRanges; }
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
diff --git a/cui/source/inc/textanim.hxx b/cui/source/inc/textanim.hxx
index 2981c4a..2f1031d 100644
--- a/cui/source/inc/textanim.hxx
+++ b/cui/source/inc/textanim.hxx
@@ -37,6 +37,7 @@ class SdrView;
class SvxTextAnimationPage : public SfxTabPage
{
private:
+ static const sal_uInt16 pRanges[];
ListBox* m_pLbEffect;
VclBox* m_pBoxDirection;
PushButton* m_pBtnUp;
@@ -77,7 +78,7 @@ public:
virtual ~SvxTextAnimationPage();
static SfxTabPage* Create( vcl::Window*, const SfxItemSet* );
- static const sal_uInt16* GetRanges();
+ static const sal_uInt16* GetRanges() { return pRanges; }
virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE;
diff --git a/cui/source/inc/textattr.hxx b/cui/source/inc/textattr.hxx
index 4f67dbf..234d140 100644
--- a/cui/source/inc/textattr.hxx
+++ b/cui/source/inc/textattr.hxx
@@ -37,6 +37,7 @@ class SdrView;
class SvxTextAttrPage : public SvxTabPage
{
private:
+ static const sal_uInt16 pRanges[];
TriStateBox* m_pTsbAutoGrowWidth;
TriStateBox* m_pTsbAutoGrowHeight;
TriStateBox* m_pTsbFitToSize;
@@ -78,7 +79,7 @@ public:
virtual ~SvxTextAttrPage();
static SfxTabPage* Create( vcl::Window*, const SfxItemSet* );
- static const sal_uInt16* GetRanges();
+ static const sal_uInt16* GetRanges() { return pRanges; }
virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE;
diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx
index f4f6925..5272a41 100644
--- a/cui/source/inc/transfrm.hxx
+++ b/cui/source/inc/transfrm.hxx
@@ -78,6 +78,7 @@ class SvxPositionSizeTabPage : public SvxTabPage
{
using TabPage::ActivatePage;
using TabPage::DeactivatePage;
+ static const sal_uInt16 pPosSizeRanges[];
private:
// position
@@ -148,7 +149,7 @@ public:
SvxPositionSizeTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs );
static SfxTabPage* Create( vcl::Window*, const SfxItemSet* );
- static const sal_uInt16* GetRanges();
+ static const sal_uInt16* GetRanges() { return pPosSizeRanges; }
virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE;
@@ -178,6 +179,7 @@ class SvxAngleTabPage : public SvxTabPage
{
using TabPage::ActivatePage;
using TabPage::DeactivatePage;
+ static const sal_uInt16 pAngleRanges[];
private:
VclFrame* m_pFlPosition;
@@ -203,7 +205,7 @@ public:
SvxAngleTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs );
static SfxTabPage* Create( vcl::Window*, const SfxItemSet* );
- static const sal_uInt16* GetRanges();
+ static const sal_uInt16* GetRanges() { return pAngleRanges; }
virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE;
@@ -226,6 +228,7 @@ class SvxSlantTabPage : public SvxTabPage
{
using TabPage::ActivatePage;
using TabPage::DeactivatePage;
+ static const sal_uInt16 pSlantRanges[];
private:
VclFrame* m_pFlRadius;
@@ -247,7 +250,7 @@ public:
SvxSlantTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs );
static SfxTabPage* Create( vcl::Window*, const SfxItemSet* );
- static const sal_uInt16* GetRanges();
+ static const sal_uInt16* GetRanges() { return pSlantRanges; }
virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE;
diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx
index 56cdabb..22b5088 100644
--- a/cui/source/tabpages/align.cxx
+++ b/cui/source/tabpages/align.cxx
@@ -92,7 +92,7 @@ static const RotateModeConnection::MapEntryType s_pRotateModeMap[] =
-static const sal_uInt16 s_pRanges[] =
+const sal_uInt16 AlignmentTabPage::s_pRanges[] =
{
SID_ATTR_ALIGN_HOR_JUSTIFY,SID_ATTR_ALIGN_VER_JUSTIFY,
SID_ATTR_ALIGN_STACKED,SID_ATTR_ALIGN_LINEBREAK,
@@ -258,11 +258,6 @@ SfxTabPage* AlignmentTabPage::Create( vcl::Window* pParent, const SfxItemSet* rA
return new AlignmentTabPage( pParent, *rAttrSet );
}
-const sal_uInt16* AlignmentTabPage::GetRanges()
-{
- return s_pRanges;
-}
-
bool AlignmentTabPage::FillItemSet( SfxItemSet* rSet )
{
bool bChanged = SfxTabPage::FillItemSet(rSet);
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index bf58de0..95a820f 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -61,7 +61,7 @@
using namespace ::com::sun::star;
// static ----------------------------------------------------------------
-static const sal_uInt16 pRanges[] =
+const sal_uInt16 SvxBackgroundTabPage::pPageRanges[] =
{
SID_VIEW_FLD_PIC, SID_VIEW_FLD_PIC,
SID_ATTR_BRUSH, SID_ATTR_BRUSH,
@@ -444,19 +444,6 @@ SvxBackgroundTabPage::~SvxBackgroundTabPage()
-const sal_uInt16* SvxBackgroundTabPage::GetRanges()
-
-/* [Description]
-
- returns the area of the which-values
-*/
-
-{
- return pRanges;
-}
-
-
-
SfxTabPage* SvxBackgroundTabPage::Create( vcl::Window* pParent,
const SfxItemSet* rAttrSet )
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index ea67be5..ded93e3 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -66,7 +66,7 @@ using namespace ::editeng;
// static ----------------------------------------------------------------
-static const sal_uInt16 pRanges[] =
+const sal_uInt16 SvxBorderTabPage::pRanges[] =
{
SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_SHADOW,
SID_ATTR_ALIGN_MARGIN, SID_ATTR_ALIGN_MARGIN,
@@ -342,13 +342,6 @@ SvxBorderTabPage::~SvxBorderTabPage()
-const sal_uInt16* SvxBorderTabPage::GetRanges()
-{
- return pRanges;
-}
-
-
-
SfxTabPage* SvxBorderTabPage::Create( vcl::Window* pParent,
const SfxItemSet* rAttrSet )
{
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index fa7e31f..c9a0f7c 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -87,7 +87,7 @@ using namespace ::com::sun::star;
// static ----------------------------------------------------------------
-static const sal_uInt16 pNameRanges[] =
+const sal_uInt16 SvxCharNamePage::pNameRanges[] =
{
SID_ATTR_CHAR_FONT,
SID_ATTR_CHAR_WEIGHT,
@@ -104,7 +104,7 @@ static const sal_uInt16 pNameRanges[] =
0
};
-static const sal_uInt16 pEffectsRanges[] =
+const sal_uInt16 SvxCharEffectsPage::pEffectsRanges[] =
{
SID_ATTR_CHAR_SHADOWED,
SID_ATTR_CHAR_UNDERLINE,
@@ -125,7 +125,7 @@ static const sal_uInt16 pEffectsRanges[] =
0
};
-static const sal_uInt16 pPositionRanges[] =
+const sal_uInt16 SvxCharPositionPage::pPositionRanges[] =
{
SID_ATTR_CHAR_KERNING,
SID_ATTR_CHAR_KERNING,
@@ -140,7 +140,7 @@ static const sal_uInt16 pPositionRanges[] =
0
};
-static const sal_uInt16 pTwoLinesRanges[] =
+const sal_uInt16 SvxCharTwoLinesPage::pTwoLinesRanges[] =
{
SID_ATTR_CHAR_TWO_LINES,
SID_ATTR_CHAR_TWO_LINES,
@@ -1187,13 +1187,6 @@ SfxTabPage* SvxCharNamePage::Create( vcl::Window* pParent, const SfxItemSet* rSe
-const sal_uInt16* SvxCharNamePage::GetRanges()
-{
- return pNameRanges;
-}
-
-
-
void SvxCharNamePage::Reset( const SfxItemSet* rSet )
{
Reset_Impl( *rSet, Western );
@@ -1734,13 +1727,6 @@ SfxTabPage* SvxCharEffectsPage::Create( vcl::Window* pParent, const SfxItemSet*
-const sal_uInt16* SvxCharEffectsPage::GetRanges()
-{
- return pEffectsRanges;
-}
-
-
-
void SvxCharEffectsPage::Reset( const SfxItemSet* rSet )
{
SvxFont& rFont = GetPreviewFont();
@@ -2908,12 +2894,6 @@ SfxTabPage* SvxCharPositionPage::Create( vcl::Window* pParent, const SfxItemSet*
-const sal_uInt16* SvxCharPositionPage::GetRanges()
-{
- return pPositionRanges;
-}
-
-
void SvxCharPositionPage::Reset( const SfxItemSet* rSet )
{
OUString sUser = GetUserData();
@@ -3476,15 +3456,6 @@ SfxTabPage* SvxCharTwoLinesPage::Create( vcl::Window* pParent, const SfxItemSet*
return new SvxCharTwoLinesPage( pParent, *rSet );
}
-
-
-const sal_uInt16* SvxCharTwoLinesPage::GetRanges()
-{
- return pTwoLinesRanges;
-}
-
-
-
void SvxCharTwoLinesPage::Reset( const SfxItemSet* rSet )
{
m_pTwoLinesBtn->Check( false );
diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx
index 439737e..6b49e2a 100644
--- a/cui/source/tabpages/connect.cxx
+++ b/cui/source/tabpages/connect.cxx
@@ -37,7 +37,7 @@
#include "connect.hxx"
#include "paragrph.hrc"
-static const sal_uInt16 pRanges[] =
+const sal_uInt16 SvxConnectionPage::pRanges[] =
{
SDRATTR_EDGE_FIRST,
SDRATTR_EDGE_LAST,
@@ -394,11 +394,6 @@ SfxTabPage* SvxConnectionPage::Create( vcl::Window* pWindow,
return new SvxConnectionPage( pWindow, *rAttrs );
}
-const sal_uInt16* SvxConnectionPage::GetRanges()
-{
- return pRanges;
-}
-
IMPL_LINK( SvxConnectionPage, ChangeAttrHdl_Impl, void *, p )
{
if( p == m_pMtrFldHorz1 )
diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx
index b9b02eb..243d9dc 100644
--- a/cui/source/tabpages/labdlg.cxx
+++ b/cui/source/tabpages/labdlg.cxx
@@ -55,7 +55,7 @@
// static ----------------------------------------------------------------
-static const sal_uInt16 pCaptionRanges[] =
+const sal_uInt16 SvxCaptionTabPage::pCaptionRanges[] =
{
SDRATTR_CAPTIONTYPE,
SDRATTR_CAPTIONFIXEDANGLE,
@@ -344,13 +344,6 @@ SfxTabPage* SvxCaptionTabPage::Create( vcl::Window* pWindow,
-const sal_uInt16* SvxCaptionTabPage::GetRanges()
-{
- return pCaptionRanges;
-}
-
-
-
void SvxCaptionTabPage::SetupAnsatz_Impl( sal_uInt16 nType )
{
switch( nType )
diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx
index 380d49c..64d38b7 100644
--- a/cui/source/tabpages/macroass.cxx
+++ b/cui/source/tabpages/macroass.cxx
@@ -289,8 +289,6 @@ IMPL_STATIC_LINK( _SfxMacroTabPage, SelectGroup_Impl, ListBox*, EMPTYARG )
IMPL_STATIC_LINK( _SfxMacroTabPage, SelectMacro_Impl, ListBox*, EMPTYARG )
{
- _SfxMacroTabPage_Impl* pImpl = pThis->mpImpl;
- pImpl->pMacroLB->FunctionSelected();
pThis->EnableButtons();
return 0;
}
diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx
index eace738..ea086be 100644
--- a/cui/source/tabpages/measure.cxx
+++ b/cui/source/tabpages/measure.cxx
@@ -47,7 +47,7 @@
#include "measure.hxx"
-static const sal_uInt16 pRanges[] =
+const sal_uInt16 SvxMeasurePage::pRanges[] =
{
SDRATTR_MEASURE_FIRST,
SDRATTR_MEASURE_LAST,
@@ -599,11 +599,6 @@ SfxTabPage* SvxMeasurePage::Create( vcl::Window* pWindow,
return new SvxMeasurePage( pWindow, *rAttrs );
}
-const sal_uInt16* SvxMeasurePage::GetRanges()
-{
- return pRanges;
-}
-
void SvxMeasurePage::PointChanged( vcl::Window* pWindow, RECT_POINT /*eRP*/ )
{
ChangeAttrHdl_Impl( pWindow );
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 97157ba..8fdcb7e 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -52,7 +52,7 @@ using ::com::sun::star::uno::UNO_QUERY;
// static ----------------------------------------------------------------
-static const sal_uInt16 pRanges[] =
+const sal_uInt16 SvxNumberFormatTabPage::pRanges[] =
{
SID_ATTR_NUMBERFORMAT_VALUE,
SID_ATTR_NUMBERFORMAT_INFO,
@@ -348,23 +348,6 @@ void SvxNumberFormatTabPage::Init_Impl()
}
/*************************************************************************
-#* Method: GetRanges
-#*------------------------------------------------------------------------
-#*
-#* Class: SvxNumberFormatTabPage
-#* Function: Returns area information.
-#* Input: ---
-#* Output: area
-#*
-#************************************************************************/
-
-const sal_uInt16* SvxNumberFormatTabPage::GetRanges()
-{
- return pRanges;
-}
-
-
-/*************************************************************************
#* Method: Create
#*------------------------------------------------------------------------
#*
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index d321103..5d6c92c 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -69,7 +69,7 @@ static const long MINBODY = 284; // 0,5 cm rounded up in twips
//static const long PRINT_OFFSET = 17; // 0,03 cm rounded down in twips
static const long PRINT_OFFSET = 0; // why was this ever set to 17 ? it led to wrong right and bottom margins.
-static const sal_uInt16 pRanges[] =
+const sal_uInt16 SvxPageDescPage::pRanges[] =
{
SID_ATTR_BORDER_OUTER,
SID_ATTR_BORDER_SHADOW,
@@ -164,14 +164,6 @@ bool IsEqualSize_Impl( const SvxSizeItem* pSize, const Size& rSize )
// class SvxPageDescPage --------------------------------------------------
-// returns the range of the Which values
-const sal_uInt16* SvxPageDescPage::GetRanges()
-{
- return pRanges;
-}
-
-
-
SfxTabPage* SvxPageDescPage::Create( vcl::Window* pParent, const SfxItemSet* rSet )
{
return new SvxPageDescPage( pParent, *rSet );
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 09a3894..7d1e279 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -53,7 +53,7 @@
#include <svl/intitem.hxx>
#include <boost/scoped_ptr.hpp>
-static const sal_uInt16 pStdRanges[] =
+const sal_uInt16 SvxStdParagraphTabPage::pStdRanges[] =
{
SID_ATTR_PARA_LINESPACE, // 10033
SID_ATTR_PARA_LINESPACE,
@@ -64,14 +64,14 @@ static const sal_uInt16 pStdRanges[] =
0
};
-static const sal_uInt16 pAlignRanges[] =
+const sal_uInt16 SvxParaAlignTabPage::pAlignRanges[] =
{
SID_ATTR_PARA_ADJUST, // 10027
SID_ATTR_PARA_ADJUST,
0
};
-static const sal_uInt16 pExtRanges[] =
+const sal_uInt16 SvxExtParagraphTabPage::pExtRanges[] =
{
SID_ATTR_PARA_PAGEBREAK, // 10037 -
SID_ATTR_PARA_WIDOWS, // 10041
@@ -667,11 +667,6 @@ void SvxStdParagraphTabPage::EnableNegativeMode()
bNegativeIndents = true;
}
-const sal_uInt16* SvxStdParagraphTabPage::GetRanges()
-{
- return pStdRanges;
-}
-
void SvxStdParagraphTabPage::SetLineSpacing_Impl
(
const SvxLineSpacingItem &rAttr
@@ -1037,11 +1032,6 @@ SfxTabPage* SvxParaAlignTabPage::Create( vcl::Window* pParent, const SfxItemSet*
return new SvxParaAlignTabPage(pParent, *rSet);
}
-const sal_uInt16* SvxParaAlignTabPage::GetRanges()
-{
- return pAlignRanges;
-}
-
bool SvxParaAlignTabPage::FillItemSet( SfxItemSet* rOutSet )
{
bool bModified = false;
@@ -1913,11 +1903,6 @@ SvxExtParagraphTabPage::~SvxExtParagraphTabPage()
{
}
-const sal_uInt16* SvxExtParagraphTabPage::GetRanges()
-{
- return pExtRanges;
-}
-
IMPL_LINK_NOARG(SvxExtParagraphTabPage, PageBreakHdl_Impl)
{
switch ( m_pPageBreakBox->GetState() )
diff --git a/cui/source/tabpages/tabarea.cxx b/cui/source/tabpages/tabarea.cxx
index cef9253..d856f6b 100644
--- a/cui/source/tabpages/tabarea.cxx
+++ b/cui/source/tabpages/tabarea.cxx
@@ -310,7 +310,6 @@ void SvxAreaTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
{
static_cast<SvxTransparenceTabPage&>(rPage).SetPageType( mnPageType );
static_cast<SvxTransparenceTabPage&>(rPage).SetDlgType( 0 );
- static_cast<SvxTransparenceTabPage&>(rPage).Construct();
}
}
diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx
index f5db32b..7772da1 100644
--- a/cui/source/tabpages/tabstpge.cxx
+++ b/cui/source/tabpages/tabstpge.cxx
@@ -63,7 +63,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeTabWin_Impl(vcl::Windo
}
// static ----------------------------------------------------------------
-static const sal_uInt16 pRanges[] =
+const sal_uInt16 SvxTabulatorTabPage::pRanges[] =
{
SID_ATTR_TABSTOP,
SID_ATTR_TABSTOP_OFFSET,
@@ -193,13 +193,6 @@ SvxTabulatorTabPage::~SvxTabulatorTabPage()
-const sal_uInt16* SvxTabulatorTabPage::GetRanges()
-{
- return pRanges;
-}
-
-
-
bool SvxTabulatorTabPage::FillItemSet( SfxItemSet* rSet )
{
bool bModified = false;
diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx
index 1df37c4..72626e9 100644
--- a/cui/source/tabpages/textanim.cxx
+++ b/cui/source/tabpages/textanim.cxx
@@ -28,7 +28,7 @@
#include <dialmgr.hxx>
#include "svx/dlgutil.hxx"
-static const sal_uInt16 pRanges[] =
+const sal_uInt16 SvxTextAnimationPage::pRanges[] =
{
SDRATTR_TEXT_ANIKIND,
SDRATTR_TEXT_ANIAMOUNT,
@@ -439,11 +439,6 @@ bool SvxTextAnimationPage::FillItemSet( SfxItemSet* rAttrs)
return bModified;
}
-const sal_uInt16* SvxTextAnimationPage::GetRanges()
-{
- return pRanges;
-}
-
/*************************************************************************
|*
|* creates the page
diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx
index 3237928..eae53cb 100644
--- a/cui/source/tabpages/textattr.cxx
+++ b/cui/source/tabpages/textattr.cxx
@@ -39,7 +39,7 @@
#include <svx/ofaitem.hxx>
#include <editeng/writingmodeitem.hxx>
-static const sal_uInt16 pRanges[] =
+const sal_uInt16 SvxTextAttrPage::pRanges[] =
{
SDRATTR_MISC_FIRST
, SDRATTR_TEXT_HORZADJUST
@@ -526,11 +526,6 @@ SfxTabPage* SvxTextAttrPage::Create( vcl::Window* pWindow,
return new SvxTextAttrPage( pWindow, *rAttrs );
}
-const sal_uInt16* SvxTextAttrPage::GetRanges()
-{
- return pRanges;
-}
-
/** Check whether we have to uncheck the "Full width" check box.
*/
void SvxTextAttrPage::PointChanged( vcl::Window*, RECT_POINT eRP )
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index 1ff5a81..5d4abf6 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -49,7 +49,7 @@ using namespace com::sun::star;
// static ----------------------------------------------------------------
-static const sal_uInt16 pAreaRanges[] =
+const sal_uInt16 SvxAreaTabPage::pAreaRanges[] =
{
XATTR_GRADIENTSTEPCOUNT,
XATTR_GRADIENTSTEPCOUNT,
@@ -58,7 +58,7 @@ static const sal_uInt16 pAreaRanges[] =
0
};
-static const sal_uInt16 pTransparenceRanges[] =
+const sal_uInt16 SvxTransparenceTabPage::pTransparenceRanges[] =
{
XATTR_FILLTRANSPARENCE,
XATTR_FILLTRANSPARENCE,
@@ -287,20 +287,11 @@ SvxTransparenceTabPage::SvxTransparenceTabPage(vcl::Window* pParent, const SfxIt
SetExchangeSupport();
}
-void SvxTransparenceTabPage::Construct()
-{
-}
-
SfxTabPage* SvxTransparenceTabPage::Create(vcl::Window* pWindow, const SfxItemSet* rAttrs)
{
return new SvxTransparenceTabPage(pWindow, *rAttrs);
}
-const sal_uInt16* SvxTransparenceTabPage::GetRanges()
-{
- return pTransparenceRanges;
-}
-
bool SvxTransparenceTabPage::FillItemSet(SfxItemSet* rAttrs)
{
const SfxPoolItem* pGradientItem = NULL;
@@ -573,8 +564,8 @@ void SvxTransparenceTabPage::PageCreated(const SfxAllItemSet& aSet)
SetPageType(pPageTypeItem->GetValue());
if (pDlgTypeItem)
SetDlgType(pDlgTypeItem->GetValue());
- Construct();
}
+
/*************************************************************************
|*
|* Dialog to modify fill-attributes
@@ -1766,12 +1757,6 @@ SfxTabPage* SvxAreaTabPage::Create( vcl::Window* pWindow,
-const sal_uInt16* SvxAreaTabPage::GetRanges()
-{
- return pAreaRanges;
-}
-
-
IMPL_LINK_NOARG(SvxAreaTabPage, SelectDialogTypeHdl_Impl)
{
switch( (drawing::FillStyle)m_pTypeLB->GetSelectEntryPos() )
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index baf14b5..85a7cbe 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -66,7 +66,7 @@ using namespace com::sun::star;
// static ----------------------------------------------------------------
-static const sal_uInt16 pLineRanges[] =
+const sal_uInt16 SvxLineTabPage::pLineRanges[] =
{
XATTR_LINETRANSPARENCE,
XATTR_LINETRANSPARENCE,
@@ -1496,13 +1496,6 @@ SfxTabPage* SvxLineTabPage::Create( vcl::Window* pWindow,
-const sal_uInt16* SvxLineTabPage::GetRanges()
-{
- return pLineRanges;
-}
-
-
-
IMPL_LINK( SvxLineTabPage, ChangePreviewHdl_Impl, void *, pCntrl )
{
if(pCntrl == m_pMtrLineWidth)
diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx
index 3f09743..d57db3f 100644
--- a/cui/source/tabpages/tpshadow.cxx
+++ b/cui/source/tabpages/tpshadow.cxx
@@ -36,7 +36,7 @@
using namespace com::sun::star;
-static const sal_uInt16 pShadowRanges[] =
+const sal_uInt16 SvxShadowTabPage::pShadowRanges[] =
{
SDRATTR_SHADOWCOLOR,
SDRATTR_SHADOWTRANSPARENCE,
@@ -463,13 +463,6 @@ SfxTabPage* SvxShadowTabPage::Create( vcl::Window* pWindow,
-const sal_uInt16* SvxShadowTabPage::GetRanges()
-{
- return pShadowRanges;
-}
-
-
-
IMPL_LINK_NOARG(SvxShadowTabPage, ClickShadowHdl_Impl)
{
if( m_pTsbShowShadow->GetState() == TRISTATE_FALSE )
diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
index b6792ae..5de0107 100644
--- a/cui/source/tabpages/transfrm.cxx
+++ b/cui/source/tabpages/transfrm.cxx
@@ -40,7 +40,7 @@
// static ----------------------------------------------------------------
-static const sal_uInt16 pPosSizeRanges[] =
+const sal_uInt16 SvxPositionSizeTabPage::pPosSizeRanges[] =
{
SID_ATTR_TRANSFORM_POS_X,
SID_ATTR_TRANSFORM_POS_Y,
@@ -59,7 +59,7 @@ static const sal_uInt16 pPosSizeRanges[] =
0
};
-static const sal_uInt16 pAngleRanges[] =
+const sal_uInt16 SvxAngleTabPage::pAngleRanges[] =
{
SID_ATTR_TRANSFORM_ROT_X,
SID_ATTR_TRANSFORM_ANGLE,
@@ -68,7 +68,7 @@ static const sal_uInt16 pAngleRanges[] =
0
};
-static const sal_uInt16 pSlantRanges[] =
+const sal_uInt16 SvxSlantTabPage::pSlantRanges[] =
{
SDRATTR_ECKENRADIUS,
SDRATTR_ECKENRADIUS,
@@ -320,13 +320,6 @@ SfxTabPage* SvxAngleTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rSe
-const sal_uInt16* SvxAngleTabPage::GetRanges()
-{
- return pAngleRanges;
-}
-
-
-
void SvxAngleTabPage::ActivatePage(const SfxItemSet& /*rSet*/)
{
}
@@ -554,13 +547,6 @@ SfxTabPage* SvxSlantTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rOu
-const sal_uInt16* SvxSlantTabPage::GetRanges()
-{
- return pSlantRanges;
-}
-
-
-
void SvxSlantTabPage::ActivatePage( const SfxItemSet& rSet )
{
SfxRectangleItem const * pRectItem = NULL;
@@ -993,13 +979,6 @@ SfxTabPage* SvxPositionSizeTabPage::Create( vcl::Window* pWindow, const SfxItemS
-const sal_uInt16* SvxPositionSizeTabPage::GetRanges()
-{
- return pPosSizeRanges;
-}
-
-
-
void SvxPositionSizeTabPage::ActivatePage( const SfxItemSet& rSet )
{
SfxRectangleItem const * pRectItem = NULL;
commit a46096884f5ab09d221694d40517628d85d25fc9
Author: Noel Grandin <noel at peralex.com>
Date: Fri Mar 20 09:56:07 2015 +0200
loplugin:constantfunction: sd
Change-Id: I4313ecd06a4a55685d55830aa5cc15321848652e
diff --git a/sd/source/filter/eppt/epptbase.hxx b/sd/source/filter/eppt/epptbase.hxx
index c3554cd..b012245 100644
--- a/sd/source/filter/eppt/epptbase.hxx
+++ b/sd/source/filter/eppt/epptbase.hxx
@@ -320,7 +320,7 @@ class PPTExStyleSheet
FontCollection& rFontCollection, int nInstance, int nLevel );
bool IsHardAttribute( sal_uInt32 nInstance, sal_uInt32 nLevel, PPTExTextAttr eAttr, sal_uInt32 nValue );
- sal_uInt32 SizeOfTxCFStyleAtom() const;
+ static sal_uInt32 SizeOfTxCFStyleAtom() { return 24; }
void WriteTxCFStyleAtom( SvStream& rSt );
};
diff --git a/sd/source/filter/eppt/epptooxml.hxx b/sd/source/filter/eppt/epptooxml.hxx
index f470066..2b20f91 100644
--- a/sd/source/filter/eppt/epptooxml.hxx
+++ b/sd/source/filter/eppt/epptooxml.hxx
@@ -74,7 +74,7 @@ public:
virtual bool exportDocument() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// only needed for import, leave them empty, refactor later XmlFilterBase to export and import base?
- sal_Int32 getSchemeClr( sal_Int32 /* nColorSchemeToken */ ) const { return 0; }
+ static sal_Int32 getSchemeClr( sal_Int32 /* nColorSchemeToken */ ) { return 0; }
virtual oox::vml::Drawing* getVmlDrawing() SAL_OVERRIDE { return NULL; }
virtual const oox::drawingml::Theme* getCurrentTheme() const SAL_OVERRIDE { return NULL; }
virtual const oox::drawingml::table::TableStyleListPtr getTableStyles() SAL_OVERRIDE { return oox::drawingml::table::TableStyleListPtr(); }
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index f4fae77..4042b5b 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -426,7 +426,7 @@ bool PPTWriter::ImplCloseDocument()
+ 20 // SrKinsoku container
+ 18 // 1 TxSiStyleAtom
+ aTxMasterStyleAtomStrm.Tell() // 1 TxMasterStyleAtom;
- + mpStyleSheet->SizeOfTxCFStyleAtom();
+ + PPTExStyleSheet::SizeOfTxCFStyleAtom();
sal_uInt32 nBytesToInsert = nEnvironment + 8;
diff --git a/sd/source/filter/eppt/pptx-stylesheet.cxx b/sd/source/filter/eppt/pptx-stylesheet.cxx
index b30f1f6..6dd1305 100644
--- a/sd/source/filter/eppt/pptx-stylesheet.cxx
+++ b/sd/source/filter/eppt/pptx-stylesheet.cxx
@@ -464,11 +464,6 @@ bool PPTExStyleSheet::IsHardAttribute( sal_uInt32 nInstance, sal_uInt32 nLevel,
return true;
}
-sal_uInt32 PPTExStyleSheet::SizeOfTxCFStyleAtom() const
-{
- return 24;
-}
-
// the TxCFStyleAtom stores the text properties that are used
// when creating new objects in PowerPoint.
diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx
index e132cef..eeae073 100644
--- a/sd/source/ui/annotations/annotationwindow.cxx
+++ b/sd/source/ui/annotations/annotationwindow.cxx
@@ -505,11 +505,6 @@ IMPL_LINK_NOARG(AnnotationWindow, ModifyHdl)
return 0;
}
-sal_Int32 AnnotationWindow::GetScrollbarWidth()
-{
- return 16;
-}
-
SvxLanguageItem AnnotationWindow::GetLanguage(void)
{
return SvxLanguageItem( Doc()->GetLanguage( EE_CHAR_LANGUAGE ), SID_ATTR_LANGUAGE );
diff --git a/sd/source/ui/annotations/annotationwindow.hxx b/sd/source/ui/annotations/annotationwindow.hxx
index c0e289d..ed2c13e 100644
--- a/sd/source/ui/annotations/annotationwindow.hxx
+++ b/sd/source/ui/annotations/annotationwindow.hxx
@@ -136,7 +136,7 @@ class AnnotationWindow : public FloatingWindow
void SetLanguage(const SvxLanguageItem &aNewItem);
- sal_Int32 GetScrollbarWidth();
+ static sal_Int32 GetScrollbarWidth() { return 16; }
void ToggleInsMode();
diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx
index bb89daf..95b303a 100644
--- a/sd/source/ui/app/optsitem.cxx
+++ b/sd/source/ui/app/optsitem.cxx
@@ -400,10 +400,6 @@ bool SdOptionsContentsItem::operator==( const SfxPoolItem& rAttr ) const
return bSameType && ( maOptionsContents == static_cast<const SdOptionsContentsItem&>( rAttr ).maOptionsContents );
}
-void SdOptionsContentsItem::SetOptions(SdOptions*) const
-{
-}
-
/*************************************************************************
|*
|* SdOptionsMisc
diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx
index d308ee8..9ca9b60 100644
--- a/sd/source/ui/app/sdmod2.cxx
+++ b/sd/source/ui/app/sdmod2.cxx
@@ -602,14 +602,6 @@ void SdModule::ApplyItemSet( sal_uInt16 nSlot, const SfxItemSet& rSet )
}
}
- // Contents
- const SdOptionsContentsItem* pContentsItem = NULL;
- if( SfxItemState::SET == rSet.GetItemState( ATTR_OPTIONS_CONTENTS,
- false, reinterpret_cast<const SfxPoolItem**>(&pContentsItem) ))
- {
- pContentsItem->SetOptions( pOptions );
- }
-
// Misc
const SdOptionsMiscItem* pMiscItem = NULL;
if( SfxItemState::SET == rSet.GetItemState( ATTR_OPTIONS_MISC,
diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.cxx b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
index 614a2b1..c3f4eba 100644
--- a/sd/source/ui/dlg/RemoteDialogClientBox.cxx
+++ b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
@@ -431,11 +431,6 @@ void ClientBox::RecalcAll()
m_bNeedsRecalc = false;
}
-bool ClientBox::HandleTabKey( bool )
-{
- return false;
-}
-
bool ClientBox::HandleCursorKey( sal_uInt16 nKeyCode )
{
if ( m_vEntries.empty() )
@@ -601,9 +596,7 @@ bool ClientBox::Notify( NotifyEvent& rNEvt )
vcl::KeyCode aKeyCode = pKEvt->GetKeyCode();
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list