diff options
-rw-r--r-- | compilerplugins/clang/store/constantfunction.cxx | 8 | ||||
-rw-r--r-- | sc/Library_sc.mk | 1 | ||||
-rw-r--r-- | sc/inc/sc.hrc | 16 | ||||
-rw-r--r-- | sc/sdi/docsh.sdi | 14 | ||||
-rw-r--r-- | sc/sdi/scalc.sdi | 238 | ||||
-rw-r--r-- | sc/sdi/tabvwsh.sdi | 6 | ||||
-rw-r--r-- | sc/source/ui/docshell/docsh4.cxx | 19 | ||||
-rw-r--r-- | sc/source/ui/docshell/docsh7.cxx | 27 | ||||
-rw-r--r-- | sc/source/ui/inc/docsh.hxx | 3 | ||||
-rw-r--r-- | sc/source/ui/inc/tabvwsh.hxx | 3 | ||||
-rw-r--r-- | sc/source/ui/view/tabvwshh.cxx | 13 |
11 files changed, 0 insertions, 348 deletions
diff --git a/compilerplugins/clang/store/constantfunction.cxx b/compilerplugins/clang/store/constantfunction.cxx index 20f69712fa07..79ba7a4e1e53 100644 --- a/compilerplugins/clang/store/constantfunction.cxx +++ b/compilerplugins/clang/store/constantfunction.cxx @@ -350,18 +350,10 @@ bool ConstantFunction::VisitFunctionDecl(const FunctionDecl * pFunctionDecl) { if (startsWith(aFunctionName, "sc::(anonymous namespace)::CSVHandler::")) { return true; } - // called from SDI file, I don't know what that stuff is about, sc/source/ui/docshell/docsh7.cxx - if (aFunctionName == "ScDocShell::GetDrawObjState") { - return true; - } // called from SDI file, I don't know what that stuff is about, sc/source/ui/view/cellsh4.cxx if (aFunctionName == "ScCellShell::GetStateCursor") { return true; } - // called from SDI file, I don't know what that stuff is about, sc/source/ui/view/tabvwshh.cxx - if (aFunctionName == "ScTabViewShell::ExecuteSbx" || aFunctionName == "ScTabViewShell::GetSbxState") { - return true; - } // template magic, sc/source/filter/excel/xepivot.cxx if (aFunctionName == "XclExpPivotCache::SaveXml") { return true; diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk index 99c66b78af47..3b2e88529977 100644 --- a/sc/Library_sc.mk +++ b/sc/Library_sc.mk @@ -412,7 +412,6 @@ $(eval $(call gb_Library_add_exception_objects,sc,\ sc/source/ui/docshell/docsh4 \ sc/source/ui/docshell/docsh5 \ sc/source/ui/docshell/docsh6 \ - sc/source/ui/docshell/docsh7 \ sc/source/ui/docshell/docsh8 \ sc/source/ui/docshell/documentlinkmgr \ sc/source/ui/docshell/editable \ diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc index db37b7729ac2..9af51c9f6f29 100644 --- a/sc/inc/sc.hrc +++ b/sc/inc/sc.hrc @@ -531,18 +531,10 @@ #define SID_NEW_SLOTS (SID_KEYFUNC_END) #define SID_NEW_TABLENAME (SID_NEW_SLOTS+1) - #define SID_EXPORT_AS_GRAPHIC (SID_NEW_SLOTS+2) #define FID_MERGE_TOGGLE (SID_NEW_SLOTS+10) -#define SID_SC_CELLS (SID_NEW_SLOTS+13) -#define SID_SC_RANGE (SID_NEW_SLOTS+14) -#define SID_SC_SELECTION (SID_NEW_SLOTS+15) -#define SID_SC_CELLTEXT (SID_NEW_SLOTS+16) - -#define SID_SC_ACTIVECELL (SID_NEW_SLOTS+18) -#define SID_SC_ACTIVETAB (SID_NEW_SLOTS+19) #define SID_RANGE_ROW (SID_NEW_SLOTS+20) #define SID_RANGE_COL (SID_NEW_SLOTS+21) #define SID_RANGE_TABLE (SID_NEW_SLOTS+22) @@ -550,14 +542,12 @@ #define SID_RANGE_FORMULA (SID_NEW_SLOTS+24) #define SID_RANGE_TEXTVALUE (SID_NEW_SLOTS+26) #define SID_TABLE_ACTIVATE (SID_NEW_SLOTS+27) -#define SID_TABLES_GET (SID_NEW_SLOTS+28) #define SID_DEFINE_PRINTAREA (SID_NEW_SLOTS+31) #define SID_DELETE_PRINTAREA (SID_NEW_SLOTS+32) #define SID_CHANGE_PRINTAREA (SID_NEW_SLOTS+33) #define SID_OPENDLG_EDIT_PRINTAREA (SID_NEW_SLOTS+34) -#define SID_OLE_OBJECT (SID_NEW_SLOTS+35) #define SID_OLE_ACTIVATE (SID_NEW_SLOTS+36) #define SID_OLE_DEACTIVATE (SID_NEW_SLOTS+37) @@ -574,11 +564,9 @@ #define SID_SC_SETTEXT (SID_NEW_SLOTS+46) #define SID_RANGE_ADDRESS (SID_NEW_SLOTS+47) -#define SID_RANGE_OFFSET (SID_NEW_SLOTS+48) #define SID_NUMBER_FORMAT (SID_NEW_SLOTS+49) #define SID_OLE_SELECT (SID_NEW_SLOTS+50) -#define SID_SC_ACTIVEOBJECT (SID_NEW_SLOTS+51) #define SID_RANGE_NOTETEXT (SID_NEW_SLOTS+52) #define FID_INSERT_FILE (SID_NEW_SLOTS+53) @@ -608,7 +596,6 @@ #define FID_VALID_ERRTEXT (SID_NEW_SLOTS+71) #define SID_REFRESH_DBAREA (SID_NEW_SLOTS+72) -#define SID_RANGE_REGION (SID_NEW_SLOTS+73) #define FID_FOCUS_POSWND (SID_NEW_SLOTS+74) @@ -630,9 +617,6 @@ #define SID_OBJECT_WIDTH (SID_NEW_SLOTS+87) #define SID_OBJECT_HEIGHT (SID_NEW_SLOTS+88) -#define SID_PIVOT_CREATE (SID_NEW_SLOTS+89) -#define SID_PIVOT_GET (SID_NEW_SLOTS+94) - #define SID_DELETE_SCENARIO (SID_NEW_SLOTS+95) #define SID_EDIT_SCENARIO (SID_NEW_SLOTS+96) #define SID_INSERT_FIELD_SHEET (SID_NEW_SLOTS+97) diff --git a/sc/sdi/docsh.sdi b/sc/sdi/docsh.sdi index 852af49223da..3160e88a4795 100644 --- a/sc/sdi/docsh.sdi +++ b/sc/sdi/docsh.sdi @@ -24,11 +24,6 @@ interface TableSelection SID_CHANGE_PRINTAREA [ ExecMethod = Execute; ] FID_DEL_MANUALBREAKS [ ExecMethod = Execute; StateMethod = GetState; ] FID_RESET_PRINTZOOM [ ExecMethod = Execute; StateMethod = GetState; ] - SbxObject Cells SID_SC_CELLS - ( - INT16 Column SID_SC_CELLS, - INT32 Row FN_PARAM_1 - ) UINT16 Index FID_TAB_INDEX () FID_PROTECT_TABLE [ ExecMethod = Execute; StateMethod = GetState; ] FID_PROTECT_DOC [ ExecMethod = Execute; StateMethod = GetState; ] @@ -55,17 +50,8 @@ interface TableDocument { SID_OPEN_CALC [ ExecMethod = Execute; StateMethod = GetState; ] SID_SBA_IMPORT [ ExecMethod = Execute; StateMethod = GetState; ] - SID_SC_CELLS [ ExecMethod = Execute; StateMethod = GetState; ] - SID_SC_CELLTEXT [ ExecMethod = Execute; StateMethod = GetState; ] SID_SC_SETTEXT [ ExecMethod = Execute; StateMethod = GetState; ] - SID_SC_RANGE [ ExecMethod = Execute; StateMethod = GetState; ] - SID_SC_SELECTION [ StateMethod = GetSbxState; ] - SID_SC_ACTIVECELL [ StateMethod = GetSbxState; ] - SID_SC_ACTIVETAB [ StateMethod = GetSbxState; ] - SID_TABLES_GET [ StateMethod = GetSbxState; ] SID_TABLES_COUNT [ StateMethod = GetState; ] - SID_PIVOT_GET [ StateMethod = GetSbxState; ] - SID_SC_ACTIVEOBJECT [ StateMethod = GetDrawObjState; ] SID_ATTR_YEAR2000 [ StateMethod = GetState; ExecMethod = Execute; ] SID_CHART_SOURCE [ ExecMethod = Execute; ] SID_CHART_ADDSOURCE [ ExecMethod = Execute; ] diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi index 827975e84fd8..bb68273e3091 100644 --- a/sc/sdi/scalc.sdi +++ b/sc/sdi/scalc.sdi @@ -70,40 +70,6 @@ SfxVoidItem ActivateTable SID_TABLE_ACTIVATE ] -SfxObjectItem ActiveCell SID_SC_ACTIVECELL -[ - AutoUpdate = FALSE, - FastCall = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - - AccelConfig = FALSE, - MenuConfig = FALSE, - ToolBoxConfig = FALSE, - GroupId = GID_INTERN; -] - - -SfxObjectItem ActiveTable SID_SC_ACTIVETAB -[ - AutoUpdate = FALSE, - FastCall = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - - AccelConfig = FALSE, - MenuConfig = FALSE, - ToolBoxConfig = FALSE, - GroupId = GID_INTERN; -] - - SfxVoidItem Add FID_TAB_APPEND (SfxStringItem Name FID_TAB_APPEND) [ @@ -518,42 +484,6 @@ SfxVoidItem Cancel SID_CANCEL ] -SfxVoidItem Cells SID_SC_CELLS -(SfxInt16Item Column SID_SC_CELLS,SfxInt32Item Row FN_PARAM_1,SfxInt16Item Table FN_PARAM_2) -[ - AutoUpdate = FALSE, - FastCall = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - - AccelConfig = FALSE, - MenuConfig = FALSE, - ToolBoxConfig = FALSE, - GroupId = GID_INTERN; -] - - -SfxVoidItem CellText SID_SC_CELLTEXT -(SfxInt16Item Column SID_SC_CELLTEXT,SfxInt32Item Row FN_PARAM_1,SfxInt16Item Table FN_PARAM_2) -[ - AutoUpdate = FALSE, - FastCall = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - - AccelConfig = FALSE, - MenuConfig = FALSE, - ToolBoxConfig = FALSE, - GroupId = GID_INTERN; -] - - SfxVoidItem ChangeChartData SID_CHART_SOURCE (SfxStringItem Name SID_CHART_NAME,SfxStringItem Range SID_CHART_SOURCE,SfxBoolItem ColHeaders FN_PARAM_1,SfxBoolItem RowHeaders FN_PARAM_2) [ @@ -930,25 +860,6 @@ SfxVoidItem ColumnOperations SID_COLUMN_OPERATIONS GroupId = GID_OPTIONS; ] -SfxObjectItem CurrentRegion SID_RANGE_REGION - -[ - AutoUpdate = FALSE, - FastCall = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - - - AccelConfig = FALSE, - MenuConfig = FALSE, - ToolBoxConfig = FALSE, - GroupId = ; -] - - SfxVoidItem DataAreaRefresh SID_REFRESH_DBAREA () [ @@ -1093,24 +1004,6 @@ SfxVoidItem DataFilterStandardFilter SID_FILTER ] -SfxVoidItem DataPilotCreate SID_PIVOT_CREATE -(SfxStringItem Destination FN_PARAM_1,SfxStringItem Name FN_PARAM_2,SfxBoolItem TotalCol FN_PARAM_3,SfxBoolItem TotalRow FN_PARAM_4) -[ - AutoUpdate = FALSE, - FastCall = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - - AccelConfig = FALSE, - MenuConfig = FALSE, - ToolBoxConfig = FALSE, - GroupId = GID_INTERN; -] - - SfxVoidItem DataPilotExec SID_PIVOT_TABLE () [ @@ -1129,25 +1022,6 @@ SfxVoidItem DataPilotExec SID_PIVOT_TABLE ] -SfxObjectItem DataPilotTables SID_PIVOT_GET - -[ - AutoUpdate = FALSE, - FastCall = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - - - AccelConfig = FALSE, - MenuConfig = FALSE, - ToolBoxConfig = FALSE, - GroupId = GID_INTERN; -] - - SfxVoidItem DataReImport SID_REIMPORT_DATA () [ @@ -3961,43 +3835,6 @@ SfxInt32Item ObjectWidth SID_OBJECT_WIDTH ] -SfxVoidItem Offset SID_RANGE_OFFSET -(SfxInt16Item Column FN_PARAM_1,SfxInt32Item Row FN_PARAM_2,SfxInt16Item Table FN_PARAM_3) -[ - AutoUpdate = FALSE, - FastCall = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - - AccelConfig = FALSE, - MenuConfig = FALSE, - ToolBoxConfig = FALSE, - GroupId = GID_INTERN; -] - - -SfxObjectItem OleObject SID_OLE_OBJECT - -[ - AutoUpdate = FALSE, - FastCall = TRUE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - - - AccelConfig = FALSE, - MenuConfig = FALSE, - ToolBoxConfig = FALSE, - GroupId = GID_EDIT; -] - - SfxVoidItem OriginalSize SID_ORIGINALSIZE () [ @@ -4144,24 +3981,6 @@ SfxVoidItem PutCell SID_SC_SETTEXT ] -SfxVoidItem Range SID_SC_RANGE -(SfxStringItem Range SID_SC_RANGE,SfxBoolItem KeepSelect FN_PARAM_1) -[ - AutoUpdate = FALSE, - FastCall = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - - AccelConfig = FALSE, - MenuConfig = FALSE, - ToolBoxConfig = FALSE, - GroupId = GID_INTERN; -] - - SfxVoidItem RecalcPivotTable SID_PIVOT_RECALC () [ @@ -4649,25 +4468,6 @@ SfxVoidItem ManageXMLSource SID_MANAGE_XML_SOURCE GroupId = GID_DATA; ] -SfxObjectItem SelectedObject SID_SC_ACTIVEOBJECT - -[ - AutoUpdate = FALSE, - FastCall = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - - - AccelConfig = FALSE, - MenuConfig = FALSE, - ToolBoxConfig = FALSE, - GroupId = GID_INTERN; -] - - SfxStringItem SelectedObjectName SID_ACTIVE_OBJ_NAME [ @@ -4687,25 +4487,6 @@ SfxStringItem SelectedObjectName SID_ACTIVE_OBJ_NAME ] -SfxObjectItem Selection SID_SC_SELECTION - -[ - AutoUpdate = FALSE, - FastCall = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - - - AccelConfig = FALSE, - MenuConfig = FALSE, - ToolBoxConfig = FALSE, - GroupId = GID_INTERN; -] - - SfxVoidItem SelectRow SID_SELECT_ROW (SfxInt32Item Row FN_PARAM_1,SfxInt16Item Modifier FN_PARAM_2) [ @@ -5438,25 +5219,6 @@ SfxVoidItem RenameTable FID_TAB_MENU_RENAME ] -SfxObjectItem Tables SID_TABLES_GET - -[ - AutoUpdate = FALSE, - FastCall = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - - - AccelConfig = FALSE, - MenuConfig = FALSE, - ToolBoxConfig = FALSE, - GroupId = GID_VIEW; -] - - SfxVoidItem TableSelectAll FID_TAB_SELECTALL () [ diff --git a/sc/sdi/tabvwsh.sdi b/sc/sdi/tabvwsh.sdi index a8112742310a..8df105eb28ec 100644 --- a/sc/sdi/tabvwsh.sdi +++ b/sc/sdi/tabvwsh.sdi @@ -21,7 +21,6 @@ interface TableOLEObject { SID_ACTIVE_OBJ_NAME [ StateMethod = GetObjectState; ] - SID_OLE_OBJECT [ StateMethod = GetObjectState; ] SID_OLE_ACTIVATE [ ExecMethod = ExecuteObject; ] SID_OLE_DEACTIVATE [ ExecMethod = ExecuteObject; ] SID_OLE_SELECT [ ExecMethod = ExecuteObject; ] // api: @@ -72,11 +71,6 @@ interface BaseSelection Asynchron ; ] - SID_PIVOT_CREATE [ ExecMethod = ExecuteSbx; StateMethod = GetSbxState; ] - SID_RANGE_OFFSET [ ExecMethod = ExecuteSbx; ] - SID_RANGE_REGION [ StateMethod = GetSbxState; ] - - SID_INSERT_SMATH [ ExecMethod = ExecDrawIns; StateMethod = GetDrawInsState; ] SID_GALLERY_FORMATS [ ExecMethod = ExecGallery; ] SID_GALLERY [ ExecMethod = ExecChildWin; ] diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index 33d175ea5553..ac0208c91259 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -110,10 +110,6 @@ using namespace ::com::sun::star; void ScDocShell::Execute( SfxRequest& rReq ) { - // SID_SC_RANGE (Range), - // SID_SC_CELLTEXT (CellText), - // SID_SC_CELLS (Cells) - removed (old Basic) - const SfxItemSet* pReqArgs = rReq.GetArgs(); SfxBindings* pBindings = GetViewBindings(); bool bUndo (aDocument.IsUndoEnabled()); @@ -1891,21 +1887,6 @@ void ScDocShell::GetState( SfxItemSet &rSet ) } } -void ScDocShell::GetSbxState( SfxItemSet &rSet ) -{ - // SID_SC_SELECTION (Selection), - // SID_SC_ACTIVECELL (ActiveCell), - // SID_SC_ACTIVETAB (ActiveTable), - // SID_TABLES_GET (Tables), - // SID_PIVOT_GET (DataPilotTables) - removed (old Basic) - - // If slots from the view shell are executed here, the GetState must also be forwarded! - - ScTabViewShell* pVisibleSh = GetBestViewShell(); // visible view - if ( pVisibleSh ) - pVisibleSh->GetState( rSet ); -} - void ScDocShell::Draw( OutputDevice* pDev, const JobSetup & /* rSetup */, sal_uInt16 nAspect ) { diff --git a/sc/source/ui/docshell/docsh7.cxx b/sc/source/ui/docshell/docsh7.cxx deleted file mode 100644 index 3400001d3561..000000000000 --- a/sc/source/ui/docshell/docsh7.cxx +++ /dev/null @@ -1,27 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "docsh.hxx" - -void ScDocShell::GetDrawObjState( SfxItemSet & /* rSet */ ) -{ - // SID_SC_ACTIVEOBJECT (SelectedObject) - removed (old Basic) -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx index 161979d89a68..de82e9377fe4 100644 --- a/sc/source/ui/inc/docsh.hxx +++ b/sc/source/ui/inc/docsh.hxx @@ -225,9 +225,6 @@ public: void AsciiSave( SvStream& rStream, const ScImportOptions& rOpt ); - void GetSbxState( SfxItemSet &rSet ); - static void GetDrawObjState( SfxItemSet &rSet ); - void Execute( SfxRequest& rReq ); void GetState( SfxItemSet &rSet ); void ExecutePageStyle ( SfxViewShell& rCaller, SfxRequest& rReq, SCTAB nCurTab ); diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx index 8e4067625fa8..08aeaaf85929 100644 --- a/sc/source/ui/inc/tabvwsh.hxx +++ b/sc/source/ui/inc/tabvwsh.hxx @@ -273,9 +273,6 @@ public: void ExecuteUndo(SfxRequest& rReq); void GetUndoState(SfxItemSet &rSet); - static void ExecuteSbx( SfxRequest& rReq ); - static void GetSbxState( SfxItemSet& rSet ); - void ExecuteObject(SfxRequest& rReq); void GetObjectState(SfxItemSet &rSet); diff --git a/sc/source/ui/view/tabvwshh.cxx b/sc/source/ui/view/tabvwshh.cxx index 98e125292cc7..316c81ce3926 100644 --- a/sc/source/ui/view/tabvwshh.cxx +++ b/sc/source/ui/view/tabvwshh.cxx @@ -40,17 +40,6 @@ using namespace com::sun::star; -void ScTabViewShell::ExecuteSbx( SfxRequest& /* rReq */ ) -{ - // SID_RANGE_OFFSET (Offset), - // SID_PIVOT_CREATE (DataPilotCreate) - removed (old Basic) -} - -void ScTabViewShell::GetSbxState( SfxItemSet& /* rSet */ ) -{ - // SID_RANGE_REGION (CurrentRegion) - removed (old Basic) -} - void ScTabViewShell::ExecuteObject( SfxRequest& rReq ) { sal_uInt16 nSlotId = rReq.GetSlot(); @@ -163,8 +152,6 @@ static uno::Reference < embed::XEmbeddedObject > lcl_GetSelectedObj( SdrView* pD void ScTabViewShell::GetObjectState( SfxItemSet& rSet ) { - // SID_OLE_OBJECT - removed (old Basic) - SfxWhichIter aIter(rSet); sal_uInt16 nWhich = aIter.FirstWhich(); while ( nWhich ) |