[Libreoffice-commits] core.git: basctl/source compilerplugins/clang cui/source editeng/source framework/source include/editeng include/sfx2 include/svx sc/source sd/inc sd/source sfx2/source svx/source sw/source
Noel Grandin
noel at peralex.com
Wed Jun 1 06:48:51 UTC 2016
basctl/source/basicide/basides1.cxx | 6 -
compilerplugins/clang/unusedfields.cxx | 2
compilerplugins/clang/unusedmethods.cxx | 2
cui/source/dialogs/SpellDialog.cxx | 1
cui/source/options/treeopt.cxx | 9 --
editeng/source/editeng/editdoc.cxx | 1
framework/source/uielement/menubarmanager.cxx | 3
include/editeng/editids.hrc | 101 --------------------------
include/sfx2/sfxsids.hrc | 29 -------
include/svx/linectrl.hxx | 1
include/svx/svxids.hrc | 16 ----
sc/source/filter/html/htmlexp.cxx | 12 ---
sc/source/ui/view/cellsh4.cxx | 6 -
sd/inc/app.hrc | 6 -
sd/source/ui/func/fuconbez.cxx | 13 ---
sd/source/ui/func/fuoltext.cxx | 1
sd/source/ui/func/fupage.cxx | 2
sd/source/ui/inc/fuconbez.hxx | 1
sd/source/ui/view/drviews2.cxx | 37 ---------
sd/source/ui/view/drviews7.cxx | 4 -
sd/source/ui/view/drviewsj.cxx | 1
sd/source/ui/view/outlnvsh.cxx | 1
sfx2/source/appl/appcfg.cxx | 10 --
sfx2/source/appl/appserv.cxx | 4 -
sfx2/source/appl/appuno.cxx | 4 -
sfx2/source/doc/docfile.cxx | 45 +----------
sfx2/source/doc/objserv.cxx | 19 ----
sfx2/source/toolbox/tbxitem.cxx | 3
sfx2/source/view/viewfrm.cxx | 1
sfx2/source/view/viewfrm2.cxx | 4 -
svx/source/tbxctrls/linectrl.cxx | 5 -
sw/source/uibase/app/docstyle.cxx | 1
sw/source/uibase/uiview/viewstat.cxx | 5 -
33 files changed, 12 insertions(+), 344 deletions(-)
New commits:
commit fa135fd0e05fc4ba784b4349d65f2e5ed26c0f55
Author: Noel Grandin <noel at peralex.com>
Date: Tue May 31 10:30:35 2016 +0200
remove unused SID constants and associated code
found with a python script that looks like:
process = subprocess.Popen(
"git ls-files *.hrc | xargs grep -hE '#define +SID_' | cut -d ' ' -f 2 | sort -u",
shell=True, stdout=subprocess.PIPE)
for line in iter(process.stdout.readline, b''):
line = line.strip()
if line.startswith("//"): continue
if line.startswith("sfx"): continue
if len(line) < 10: continue
i = subprocess.check_output("git grep -nP \"#define +" + line + " \"",
shell=True)
if i.count("#define") < 2: continue
print line + "
" + i
Change-Id: I40eac2569c2b5b129d9459cb723a9d6f26d09264
Reviewed-on: https://gerrit.libreoffice.org/25715
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx
index 8dee9c8..e09809f 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -817,12 +817,6 @@ void Shell::GetState(SfxItemSet &rSet)
rSet.DisableItem( nWh );
}
break;
- case SID_SHOW_FORMS:
- case SID_SHOW_HIDDEN:
- {
- rSet.DisableItem( nWh );
- }
- break;
case SID_SEARCH_OPTIONS:
{
SearchOptionFlags nOptions = SearchOptionFlags::NONE;
diff --git a/compilerplugins/clang/unusedfields.cxx b/compilerplugins/clang/unusedfields.cxx
index a370cb3..7191577 100644
--- a/compilerplugins/clang/unusedfields.cxx
+++ b/compilerplugins/clang/unusedfields.cxx
@@ -297,7 +297,7 @@ bool UnusedFields::VisitDeclRefExpr( const DeclRefExpr* declRefExpr )
return true;
}
-loplugin::Plugin::Registration< UnusedFields > X("unusedfields", false);
+loplugin::Plugin::Registration< UnusedFields > X("unusedfields", true);
}
diff --git a/compilerplugins/clang/unusedmethods.cxx b/compilerplugins/clang/unusedmethods.cxx
index aa645fb..9b3e9e8 100644
--- a/compilerplugins/clang/unusedmethods.cxx
+++ b/compilerplugins/clang/unusedmethods.cxx
@@ -378,7 +378,7 @@ bool UnusedMethods::VisitDeclRefExpr( const DeclRefExpr* declRefExpr )
return true;
}
-loplugin::Plugin::Registration< UnusedMethods > X("unusedmethods", false);
+loplugin::Plugin::Registration< UnusedMethods > X("unusedmethods", true);
}
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index 439499f..5fa1b72 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -512,7 +512,6 @@ void SpellDialog::StartSpellOptDlg_Impl()
sal_uInt16 aSpellInfos[] =
{
SID_ATTR_SPELL,SID_ATTR_SPELL,
- SID_SPELL_MODIFIED, SID_SPELL_MODIFIED,
SID_AUTOSPELL_CHECK, SID_AUTOSPELL_CHECK,
0
};
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index a2d47e0..fc03332 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -1288,11 +1288,8 @@ SfxItemSet* OfaTreeOptionsDialog::CreateItemSet( sal_uInt16 nId )
pRet = new SfxItemSet( SfxGetpApp()->GetPool(),
SID_BASIC_ENABLED, SID_BASIC_ENABLED,
//SID_OPTIONS_START - ..END
- SID_INET_PROXY_TYPE, SID_INET_PROXY_PORT,
SID_SAVEREL_INET, SID_SAVEREL_FSYS,
- SID_INET_SMTPSERVER, SID_INET_SMTPSERVER,
- SID_INET_NOPROXY, SID_INET_SOCKS_PROXY_PORT,
- SID_INET_DNS_AUTO, SID_INET_DNS_SERVER,
+ SID_INET_NOPROXY, SID_INET_FTP_PROXY_PORT,
SID_SECURE_URL, SID_SECURE_URL,
0L );
SfxGetpApp()->GetOptions(*pRet);
@@ -1410,10 +1407,6 @@ void OfaTreeOptionsDialog::ApplyLanguageOptions(const SfxItemSet& rSet)
bool bSaveSpellCheck = false;
const SfxPoolItem* pItem = nullptr;
- if ( SfxItemState::SET == rSet.GetItemState( SID_SPELL_MODIFIED, false, &pItem ) )
- {
- bSaveSpellCheck = static_cast<const SfxBoolItem*>(pItem)->GetValue();
- }
Reference< XComponentContext > xContext( ::comphelper::getProcessComponentContext() );
Reference< XLinguProperties > xProp = LinguProperties::create( xContext );
if ( SfxItemState::SET == rSet.GetItemState(SID_ATTR_HYPHENREGION, false, &pItem ) )
diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx
index 78fa1f0..f4e12e8 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -212,7 +212,6 @@ const SfxItemInfo aItemInfos[EDITITEMCOUNT] = {
{ 0, true }, // EE_FEATURE_TAB
{ 0, true }, // EE_FEATURE_LINEBR
{ SID_ATTR_CHAR_CHARSETCOLOR, true }, // EE_FEATURE_NOTCONV
- { SID_FIELD, false }
};
const sal_uInt16 aV1Map[] = {
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index 2317852..a056be0 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -95,7 +95,6 @@ namespace framework
// special menu ids/command ids for dynamic popup menus
#define SID_SFX_START 5000
#define SID_MDIWINDOWLIST (SID_SFX_START + 610)
-#define SID_ADDONLIST (SID_SFX_START + 1677)
#define SID_HELPMENU (SID_SFX_START + 410)
#define aCmdHelpIndex ".uno:HelpIndex"
@@ -1257,7 +1256,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF
// Check if this is the help menu. Add menu item if needed
CheckAndAddMenuExtension( pPopup );
}
- else if (( nItemId == SID_ADDONLIST || aItemCommand == aSlotSpecialToolsMenu || aItemCommand == aCmdToolsMenu ) &&
+ else if (( aItemCommand == aSlotSpecialToolsMenu || aItemCommand == aCmdToolsMenu ) &&
AddonMenuManager::HasAddonMenuElements() )
{
// Create addon popup menu if there exist elements and this is the tools popup menu
diff --git a/include/editeng/editids.hrc b/include/editeng/editids.hrc
index 676578f..3f2fd5f 100644
--- a/include/editeng/editids.hrc
+++ b/include/editeng/editids.hrc
@@ -57,7 +57,6 @@
#define SID_ATTR_PARA_ADJUST_RIGHT ( SID_SVX_START + 29 )
#define SID_ATTR_PARA_ADJUST_CENTER ( SID_SVX_START + 30 )
#define SID_ATTR_PARA_ADJUST_BLOCK ( SID_SVX_START + 31 )
-#define SID_ATTR_PARA_ADJUST_BLOCKLINE ( SID_SVX_START + 32 )
#define SID_ATTR_PARA_LINESPACE ( SID_SVX_START + 33 )
#define SID_ATTR_PARA_LINESPACE_10 ( SID_SVX_START + 34 )
#define SID_ATTR_PARA_LINESPACE_15 ( SID_SVX_START + 35 )
@@ -71,13 +70,11 @@
#define SID_ATTR_PARA_LRSPACE ( SID_SVX_START + 43 )
#define SID_ATTR_LRSPACE ( SID_SVX_START + 48 )
#define SID_ATTR_ULSPACE ( SID_SVX_START + 49 )
-#define SID_ATTR_CHAR_MAPTYPE ( SID_SVX_START + 64 )
#define SID_ATTR_PARA_MODEL ( SID_SVX_START + 65 )
#define SID_ATTR_PARA_KEEP ( SID_SVX_START + 66 )
#define SID_ATTR_CHAR_AUTOKERN ( SID_SVX_START + 67 )
#define SID_ATTR_PARA_BULLET ( SID_SVX_START + 250 )
#define SID_ATTR_PARA_OUTLLEVEL ( SID_SVX_START + 300 )
-#define SID_FIELD ( SID_SVX_START + 363 )
#define SID_ATTR_PARA_REGISTER ( SID_SVX_START + 413 )
#define SID_ATTR_PARA_PAGENUM ( SID_SVX_START + 457 )
#define SID_ATTR_PARA_NUMRULE ( SID_SVX_START + 587 )
@@ -131,104 +128,6 @@
#define SID_ATTR_CHAR_PREVIEW_FONT ( SID_EDIT_START + 74 )
#define SID_ATTR_CHAR_ENDPREVIEW_FONT ( SID_EDIT_START + 75 )
-/*
-// planned, but not doable: changing value of SIDs will break code that uses them for WhichRanges
-#define SID_PARA_VERTALIGN ( SID_EDIT_START )
-#define SID_ATTR_BORDER_OUTER ( SID_EDIT_START + 1 )
-#define SID_ATTR_BORDER_SHADOW ( SID_EDIT_START + 2 )
-#define SID_ATTR_BRUSH ( SID_EDIT_START + 3 )
-#define SID_ATTR_BRUSH_CHAR ( SID_EDIT_START + 4 )
-
-#define SID_FIELD ( SID_EDIT_START + 7 )
-#define SID_ATTR_FRAMEDIRECTION ( SID_EDIT_START + 8 )
-#define SID_ATTR_PARA ( SID_EDIT_START + 9 )
-#define SID_ATTR_PARA_ADJUST ( SID_EDIT_START + 10 )
-#define SID_ATTR_PARA_ADJUST_LEFT ( SID_EDIT_START + 11 )
-#define SID_ATTR_PARA_BULLET ( SID_EDIT_START + 12 )
-#define SID_ATTR_PARA_OUTLLEVEL ( SID_EDIT_START + 13 )
-#define SID_ATTR_PARA_REGISTER ( SID_EDIT_START + 14 )
-#define SID_ATTR_PARA_PAGENUM ( SID_EDIT_START + 15 )
-#define SID_ATTR_PARA_NUMRULE ( SID_EDIT_START + 16 )
-#define SID_ATTR_PARA_SCRIPTSPACE ( SID_EDIT_START + 17 )
-#define SID_ATTR_PARA_HANGPUNCTUATION ( SID_EDIT_START + 18 )
-#define SID_ATTR_PARA_FORBIDDEN_RULES ( SID_EDIT_START + 19 )
-#define SID_ATTR_PARA_SNAPTOGRID ( SID_EDIT_START + 20 )
-#define SID_ATTR_PARA_LRSPACE_VERTICAL ( SID_EDIT_START + 21 )
-#define SID_ATTR_PARA_LEFT_TO_RIGHT ( SID_EDIT_START + 22 )
-#define SID_ATTR_PARA_RIGHT_TO_LEFT ( SID_EDIT_START + 23 )
-#define SID_ATTR_PARA_OUTLINE_LEVEL ( SID_EDIT_START + 24 )
-#define SID_ATTR_PARA_ADJUST_RIGHT ( SID_EDIT_START + 25 )
-#define SID_ATTR_PARA_ADJUST_CENTER ( SID_EDIT_START + 26 )
-#define SID_ATTR_PARA_ADJUST_BLOCK ( SID_EDIT_START + 27 )
-#define SID_ATTR_PARA_ADJUST_BLOCKLINE ( SID_EDIT_START + 28 )
-#define SID_ATTR_PARA_LINESPACE ( SID_EDIT_START + 29 )
-#define SID_ATTR_PARA_LINESPACE_10 ( SID_EDIT_START + 30 )
-#define SID_ATTR_PARA_LINESPACE_15 ( SID_EDIT_START + 31 )
-#define SID_ATTR_PARA_LINESPACE_20 ( SID_EDIT_START + 32 )
-#define SID_ATTR_PARA_PAGEBREAK ( SID_EDIT_START + 33 )
-#define SID_ATTR_PARA_HYPHENZONE ( SID_EDIT_START + 34 )
-#define SID_ATTR_PARA_SPLIT ( SID_EDIT_START + 35 )
-#define SID_ATTR_PARA_ORPHANS ( SID_EDIT_START + 36 )
-#define SID_ATTR_PARA_WIDOWS ( SID_EDIT_START + 37 )
-#define SID_ATTR_PARA_ULSPACE ( SID_EDIT_START + 38 )
-#define SID_ATTR_PARA_LRSPACE ( SID_EDIT_START + 39 )
-#define SID_ATTR_PARA_MODEL ( SID_EDIT_START + 40 )
-#define SID_ATTR_PARA_KEEP ( SID_EDIT_START + 41 )
-#define SID_ATTR_NUMBERING_RULE ( SID_EDIT_START + 42 )
-#define SID_ATTR_LRSPACE ( SID_EDIT_START + 43 )
-#define SID_ATTR_ULSPACE ( SID_EDIT_START + 44 )
-#define SID_ATTR_TABSTOP ( SID_EDIT_START + 45 )
-#define SID_ATTR_TABSTOP_DEFAULTS ( SID_EDIT_START + 46 )
-#define SID_ATTR_TABSTOP_POS ( SID_EDIT_START + 47 )
-#define SID_ATTR_TABSTOP_OFFSET ( SID_EDIT_START + 48 )
-#define SID_ATTR_CHAR ( SID_EDIT_START + 49 )
-#define SID_ATTR_CHAR_FONT ( SID_EDIT_START + 50 )
-#define SID_ATTR_CHAR_POSTURE ( SID_EDIT_START + 51 )
-#define SID_ATTR_CHAR_WEIGHT ( SID_EDIT_START + 52 )
-#define SID_ATTR_CHAR_SHADOWED ( SID_EDIT_START + 53 )
-#define SID_ATTR_CHAR_WORDLINEMODE ( SID_EDIT_START + 54 )
-#define SID_ATTR_CHAR_CONTOUR ( SID_EDIT_START + 55 )
-#define SID_ATTR_CHAR_STRIKEOUT ( SID_EDIT_START + 56 )
-#define SID_ATTR_CHAR_UNDERLINE ( SID_EDIT_START + 57 )
-#define SID_ATTR_CHAR_FONTHEIGHT ( SID_EDIT_START + 58 )
-#define SID_ATTR_CHAR_PROPSIZE ( SID_EDIT_START + 59 )
-#define SID_ATTR_CHAR_COLOR ( SID_EDIT_START + 60 )
-#define SID_ATTR_CHAR_KERNING ( SID_EDIT_START + 61 )
-#define SID_ATTR_CHAR_CASEMAP ( SID_EDIT_START + 62 )
-#define SID_ATTR_CHAR_LANGUAGE ( SID_EDIT_START + 63 )
-#define SID_ATTR_CHAR_ESCAPEMENT ( SID_EDIT_START + 64 )
-#define SID_ATTR_CHAR_FONTLIST ( SID_EDIT_START + 65 )
-#define SID_ATTR_CHAR_MAPTYPE ( SID_EDIT_START + 66 )
-#define SID_ATTR_CHAR_AUTOKERN ( SID_EDIT_START + 67 )
-#define SID_ATTR_CHAR_OVERLINE ( SID_EDIT_START + 68 )
-#define SID_ATTR_CHAR_CHARSETCOLOR ( SID_EDIT_START + 69 )
-#define SID_ATTR_CHAR_CJK_FONT ( SID_EDIT_START + 70 )
-#define SID_ATTR_CHAR_CJK_FONTHEIGHT ( SID_EDIT_START + 71 )
-#define SID_ATTR_CHAR_CJK_LANGUAGE ( SID_EDIT_START + 72 )
-#define SID_ATTR_CHAR_CJK_POSTURE ( SID_EDIT_START + 73 )
-#define SID_ATTR_CHAR_CJK_WEIGHT ( SID_EDIT_START + 74 )
-#define SID_ATTR_CHAR_CTL_FONT ( SID_EDIT_START + 75 )
-#define SID_ATTR_CHAR_CTL_FONTHEIGHT ( SID_EDIT_START + 76 )
-#define SID_ATTR_CHAR_CTL_LANGUAGE ( SID_EDIT_START + 77 )
-#define SID_ATTR_CHAR_CTL_POSTURE ( SID_EDIT_START + 78 )
-#define SID_ATTR_CHAR_CTL_WEIGHT ( SID_EDIT_START + 79 )
-#define SID_ATTR_CHAR_TWO_LINES ( SID_EDIT_START + 80 )
-#define SID_ATTR_CHAR_CJK_RUBY ( SID_EDIT_START + 81 )
-#define SID_ATTR_CHAR_EMPHASISMARK ( SID_EDIT_START + 82 )
-#define SID_ATTR_CHAR_SCRIPTTYPE ( SID_EDIT_START + 83 )
-#define SID_ATTR_CHAR_VERTICAL ( SID_EDIT_START + 84 )
-#define SID_ATTR_CHAR_ROTATED ( SID_EDIT_START + 85 )
-#define SID_ATTR_CHAR_SCALEWIDTH ( SID_EDIT_START + 86 )
-#define SID_ATTR_CHAR_WIDTH_FIT_TO_LINE ( SID_EDIT_START + 87 )
-#define SID_ATTR_CHAR_RELIEF ( SID_EDIT_START + 88 )
-#define SID_ATTR_CHAR_HIDDEN ( SID_EDIT_START + 89 )
-#define SID_ATTR_CHAR_LATIN_FONT ( SID_EDIT_START + 90 )
-#define SID_ATTR_CHAR_LATIN_FONTHEIGHT ( SID_EDIT_START + 91 )
-#define SID_ATTR_CHAR_LATIN_LANGUAGE ( SID_EDIT_START + 92 )
-#define SID_ATTR_CHAR_LATIN_POSTURE ( SID_EDIT_START + 93 )
-#define SID_ATTR_CHAR_LATIN_WEIGHT ( SID_EDIT_START + 94 )
-#define SID_ATTR_CHAR_BACK_COLOR ( SID_EDIT_START + 95 )
-*/
#if 95 > (SID_EDIT_END-SID_EDIT_START)
#error Resource-Overflow in #line, #file
diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc
index f5bbec7..cb461ee 100644
--- a/include/sfx2/sfxsids.hrc
+++ b/include/sfx2/sfxsids.hrc
@@ -44,7 +44,6 @@
#define SID_QUITAPP (SID_SFX_START + 300)
#define SID_ABOUT (SID_SFX_START + 301)
#define SID_SETUPPRINTER (SID_SFX_START + 302)
-#define SID_EXITANDRETURN (SID_SFX_START + 303)
#define SID_CONTEXT (SID_SFX_START + 310)
@@ -87,7 +86,6 @@
#define SID_HELPBALLOONS (SID_SFX_START + 403)
#define SID_HELPTIPS (SID_SFX_START + 404)
#define SID_HELPMENU (SID_SFX_START + 410)
-#define SID_HELP_DOWNLOAD (SID_SFX_START + 415)
#define SID_SEND_FEEDBACK (SID_SFX_START + 421)
#define SID_SHOW_LICENSE (SID_SFX_START + 1683)
#define SID_SHOW_CREDITS (SID_SFX_START + 1711)
@@ -98,7 +96,6 @@
#define SID_OPENDOC (SID_SFX_START + 501)
#define SID_OPENREMOTE (SID_SFX_START + 517)
#define SID_OPENURL (SID_SFX_START + 596)
-#define SID_SAVEASURL (SID_SFX_START + 643)
#define SID_JUMPTOMARK (SID_SFX_START + 598)
#define SID_OPENTEMPLATE (SID_SFX_START + 594)
#define SID_SAVEASDOC (SID_SFX_START + 502)
@@ -119,7 +116,6 @@
#define SID_PRINT_COLLATE (SID_SFX_START +1590)
#define SID_PRINT_SORT (SID_SFX_START +1591)
#define SID_SAVEDOC (SID_SFX_START + 505)
-#define SID_UPDATEDOC (SID_SFX_START + 506)
#define SID_FILE_NAME (SID_SFX_START + 507)
#define SID_DOCINFO_TITLE (SID_SFX_START + 557)
#define SID_FILE_FILTEROPTIONS (SID_SFX_START + 527)
@@ -187,7 +183,6 @@
#define SID_TIPWINDOW (SID_SFX_START + 1632)
#define SID_CHARSET (SID_SFX_START + 1633)
#define SID_OVERWRITE (SID_SFX_START + 1634)
-#define SID_RENAME (SID_SFX_START + 1653)
#define SID_PARTWIN (SID_SFX_START + 1640)
// FREE (was: SID_CRASH)
#define SID_FAIL_ON_WARNING (SID_SFX_START + 1646)
@@ -196,7 +191,6 @@
#define SID_JUMPMARK (SID_SFX_START + 1654)
#define SID_BROWSE (SID_SFX_START + 1658)
// FREE (was: SID_BACKTOWEBTOP)
-#define SID_SEGMENTSIZE (SID_SFX_START + 1659)
#define SID_VIEW_DATA_SOURCE_BROWSER (SID_SFX_START + 1660)
#define SID_UNPACK (SID_SFX_START + 1662)
// (SID_SFX_START + 1663) used further down
@@ -209,14 +203,12 @@
#define SID_STOP_RECORDING (SID_SFX_START + 1671)
#define SID_INTERACTIONHANDLER (SID_SFX_START + 1675)
#define SID_OPENHYPERLINK (SID_SFX_START + 1676)
-#define SID_ADDONLIST (SID_SFX_START + 1677)
#define SID_ADDONS (SID_SFX_START + 1678)
#define SID_CONTENT (SID_SFX_START + 1679)
#define SID_SHOW_IME_STATUS_WINDOW (SID_SFX_START + 1680)
#define SID_UPDATE_CONFIG (SID_SFX_START + 1681)
#define SID_VIEWONLY (SID_SFX_START + 1682)
#define SID_REPAIRPACKAGE (SID_SFX_START + 1683)
-#define SID_ADDONHELP (SID_SFX_START + 1684)
#define SID_MINIMIZED (SID_SFX_START + 1687)
#define SID_COMPONENTDATA (SID_SFX_START + 1688)
#define SID_COMPONENTCONTEXT (SID_SFX_START + 1689)
@@ -294,7 +286,6 @@
#define SID_NEWDOCDIRECT (SID_SFX_START + 537)
#define SID_DOCFRAME (SID_SFX_START + 598)
#define SID_TARGETNAME (SID_SFX_START + 560)
-#define SID_ORIGURL (SID_SFX_START + 644)
#define SID_POSTDATA (SID_SFX_START + 1536)
#define SID_DONELINK (SID_SFX_START + 646)
#define SID_REFERER (SID_SFX_START + 654)
@@ -304,8 +295,6 @@
#define SID_DOC_STARTPRESENTATION (SID_SFX_START + 695)
#define SID_DDE_RECONNECT_ONLOAD (SID_SFX_START + 696)
-#define SID_NEWWINDOWFOREDIT (SID_SFX_START + 667)
-
#define SID_DOCTEMPLATE (SID_SFX_START + 538)
#define SID_AUTOPILOTMENU (SID_SFX_START + 1381)
@@ -366,7 +355,6 @@
// default-ids for windows
-#define SID_CLOSEWINS (SID_SFX_START + 605)
#define SID_MDIWINDOWLIST (SID_SFX_START + 610)
#define SID_NEWWINDOW (SID_SFX_START + 620)
#define SID_CLOSEWIN (SID_SFX_START + 621)
@@ -401,8 +389,6 @@
#define SID_CURSORRIGHT (SID_SFX_START + 734)
#define SID_CURSORPAGEDOWN (SID_SFX_START + 735)
#define SID_CURSORPAGEUP (SID_SFX_START + 736)
-#define SID_CURSORPAGERIGHT (SID_SFX_START + 737)
-#define SID_CURSORPAGELEFT (SID_SFX_START + 738)
#define SID_CURSORENDOFFILE (SID_SFX_START + 741)
#define SID_CURSORTOPOFFILE (SID_SFX_START + 742)
#define SID_CURSORENDOFSCREEN (SID_SFX_START + 743)
@@ -410,9 +396,6 @@
#define SID_CURSORHOME (SID_SFX_START + 745)
#define SID_CURSOREND (SID_SFX_START + 746)
#define SID_FORMATMENU (SID_SFX_START + 780)
-#define SID_OBJECTMENU0 SID_FORMATMENU
-#define SID_OBJECTMENU3 (SID_SFX_START + 783)
-#define SID_OBJECTMENU_LAST SID_OBJECTMENU3
#define SID_FORMATMENUSTATE (SID_SFX_START + 791)
#define SID_UNICODE_NOTATION_TOGGLE (SID_SFX_START + 792)
@@ -433,10 +416,8 @@
// default-ids for configuration
#define SID_CONFIG (SID_SFX_START + 904)
-#define SID_TOGGLECOMMONTASKBAR (SID_SFX_START + 928)
#define SID_TOOLBOXOPTIONS (SID_SFX_START + 907)
#define SID_TOGGLEFUNCTIONBAR (SID_SFX_START + 910)
-#define SID_CONFIGITEMID (SID_SFX_START + 919)
#define SID_MACROINFO (SID_SFX_START + 919)
#define SID_TOGGLESTATUSBAR (SID_SFX_START + 920)
#define SID_CONFIGSTATUSBAR (SID_SFX_START + 921)
@@ -464,7 +445,6 @@
#define SID_GALLERY (SID_SFX_START + 960)
#define SID_SEARCH_DLG (SID_SFX_START + 961)
#define SID_SEARCH_QUIET (SID_SFX_START + 1684)
-#define SID_HELP_PI (SID_SFX_START + 962)
#define SID_BASIC_ENABLED (SID_SFX_START + 964)
#define SID_EXPORT_DIALOG (SID_SFX_START + 965)
#define SID_IMPORT_DIALOG (SID_SFX_START + 966)
@@ -479,7 +459,6 @@
#define SID_SIGNATURE (SID_SFX_START + 1643)
-#define SID_FRAMEDESCRIPTOR (SID_SFX_START + 1229)
#define SID_INSERT_3DMODEL (SID_SFX_START + 1230)
// SaveTabPage
@@ -501,7 +480,6 @@
#define SID_ATTR_BUTTON_OUTSTYLE3D (SID_OPTIONS_START + 62)
#define SID_ATTR_BUTTON_BIGSIZE (SID_OPTIONS_START + 63)
#define SID_ATTR_WELCOMESCREEN (SID_OPTIONS_START + 81)
-#define SID_WELCOMESCREEN_RESET (SID_OPTIONS_START + 82)
#define SID_ATTR_QUICKLAUNCHER (SID_OPTIONS_START + 74)
#define SID_ATTR_YEAR2000 (SID_OPTIONS_START + 87)
#define SID_ATTR_APPLYCHARUNIT (SID_OPTIONS_START + 88)
@@ -514,15 +492,12 @@
#define SID_ATTR_LANGUAGE (SID_OPTIONS_START + 7)
#define SID_ATTR_SPELL (SID_OPTIONS_START + 9)
#define SID_ATTR_HYPHENREGION (SID_OPTIONS_START + 12)
-#define SID_SPELL_MODIFIED (SID_OPTIONS_START + 15)
#define SID_AUTOSPELL_CHECK (SID_OPTIONS_START + 21)
// InetTabPage
#define SID_INET_PROXY_TYPE (SID_OPTIONS_START + 23)
-#define SID_INET_PROXY_PORT (SID_OPTIONS_START + 25)
-#define SID_INET_SMTPSERVER (SID_OPTIONS_START + 33)
#define SID_PASSWORD (SID_OPTIONS_START + 36)
#define SID_INET_NOPROXY (SID_OPTIONS_START + 37)
@@ -531,13 +506,9 @@
#define SID_INET_HTTP_PROXY_PORT (SID_OPTIONS_START + 39)
#define SID_INET_FTP_PROXY_NAME (SID_OPTIONS_START + 40)
#define SID_INET_FTP_PROXY_PORT (SID_OPTIONS_START + 41)
-#define SID_INET_SOCKS_PROXY_PORT (SID_OPTIONS_START + 43)
#define SID_INET_EXE_PLUGIN (SID_OPTIONS_START + 52)
-#define SID_INET_DNS_AUTO (SID_OPTIONS_START + 57)
-#define SID_INET_DNS_SERVER (SID_OPTIONS_START + 58)
-
#define SID_SAVEREL_INET (SID_OPTIONS_START + 30)
#define SID_SAVEREL_FSYS (SID_OPTIONS_START + 31)
diff --git a/include/svx/linectrl.hxx b/include/svx/linectrl.hxx
index 16f548f..555ce47 100644
--- a/include/svx/linectrl.hxx
+++ b/include/svx/linectrl.hxx
@@ -84,7 +84,6 @@ private:
VclPtr<ValueSet> aLineEndSet;
sal_uInt16 nCols;
sal_uInt16 nLines;
- sal_uIntPtr nLineEndWidth;
Size aBmpSize;
bool bPopupMode;
bool mbInResize;
diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc
index 340fc61..6d2a297 100644
--- a/include/svx/svxids.hrc
+++ b/include/svx/svxids.hrc
@@ -271,7 +271,6 @@
#define SID_ATTR_PAGE_SIZE ( SID_SVX_START + 51 )
#define SID_ATTR_PAGE_MAXSIZE ( SID_SVX_START + 52 )
#define SID_ATTR_PAGE_PAPERBIN ( SID_SVX_START + 54 )
-#define SID_ATTR_PAGE_APP ( SID_SVX_START + 55 )
#define SID_ATTR_PAGE_EXT1 ( SID_SVX_START + 56 )
#define SID_ATTR_PAGE_EXT2 ( SID_SVX_START + 57 )
#define SID_ATTR_PAGE_HEADERSET ( SID_SVX_START + 58 )
@@ -279,7 +278,6 @@
#define SID_ATTR_PAGE_ON ( SID_SVX_START + 60 )
#define SID_ATTR_PAGE_DYNAMIC ( SID_SVX_START + 61 )
#define SID_ATTR_PAGE_SHARED ( SID_SVX_START + 62 )
-#define SID_ATTR_PAGE_BSP ( SID_SVX_START + 63 )
// CAUTION! Range <64 .. 67> used by EditEngine (!)
@@ -348,7 +346,6 @@
#define SID_PRESENTATION ( SID_SVX_START + 157 )
#define SID_PRESENTATION_CURRENT_SLIDE ( SID_SVX_START + 158 )
#define SID_REHEARSE_TIMINGS ( SID_SVX_START + 159 )
-#define SID_LAST_EDITED_SLIDE ( SID_SVX_START + 160 )
#define SID_HIDE_SLIDE ( SID_SVX_START + 161 )
#define SID_CHOOSE_POLYGON ( SID_SVX_START + 162 )
#define SID_ATTR_FILL_STYLE ( SID_SVX_START + 164 )
@@ -494,8 +491,6 @@
#define SID_OPTFILTER_MSOFFICE ( SID_SVX_START + 369 )
#define SID_IMAP ( SID_SVX_START + 371 )
#define SID_IMAP_EXEC ( SID_SVX_START + 374 )
-#define SID_SHOW_HIDDEN ( SID_SVX_START + 375 )
-#define SID_SHOW_FORMS ( SID_SVX_START + 376 )
#define SID_DRAW_RECT_NOFILL ( SID_SVX_START + 378 )
#define SID_DRAW_RECT_ROUND_NOFILL ( SID_SVX_START + 379 )
#define SID_DRAW_SQUARE ( SID_SVX_START + 380 )
@@ -588,7 +583,6 @@
#define SID_FIELD_GRABFOCUS ( SID_SVX_START + 567 )
#define SID_ATTR_ALIGN_DEGREES ( SID_SVX_START + 577 )
#define SID_ATTR_ALIGN_LOCKPOS ( SID_SVX_START + 578 )
-#define SID_ATTR_LINEEND_WIDTH_DEFAULT ( SID_SVX_START + 579 )
#define SID_ATTR_NUMBERFORMAT_ONE_AREA ( SID_SVX_START + 580 )
// CAUTION! Range <587 .. 587> used by EditEngine (!)
@@ -650,10 +644,8 @@
#define SID_3D_ASSIGN ( SID_SVX_START + 647 )
#define SID_CONVERT_TO_3D ( SID_SVX_START + 648 )
#define SID_CONVERT_TO_3D_LATHE_FAST ( SID_SVX_START + 649 )
-#define SID_ATTR_3D_LIGHTDIRECTION_8 ( SID_SVX_START + 691 )
-#define SID_ATTR_3D_END SID_ATTR_3D_LIGHTDIRECTION_8
+#define SID_ATTR_3D_END SID_CONVERT_TO_3D_LATHE_FAST
#define SID_ATTR_NUMBERFORMAT_NOLANGUAGE ( SID_SVX_START + 700 )
-#define SID_MN_GROUP ( SID_SVX_START + 701 )
#define SID_MORE_FMSLOTS_START ( SID_SVX_START + 702 )
#define SID_FM_SHOW_PROPERTY_BROWSER ( SID_SVX_START + 703 )
@@ -728,10 +720,6 @@
#define SID_FM_DATANAVIGATOR_CONTROL ( SID_SVX_START + 774 )
#define SID_FM_REFRESH_FORM_CONTROL ( SID_SVX_START + 775 )
-#define SID_HLINKBAR_LINK ( SID_SVX_START + 851 )
-#define SID_HLINKBAR_SEARCH ( SID_SVX_START + 853 )
-#define SID_HLINKBAR_TARGET ( SID_SVX_START + 854 )
-
// CAUTION! Range <855 .. 855> used by EditEngine (!)
#define SID_PARAM_NUM_PRESET ( SID_SVX_START + 856 )
@@ -772,7 +760,6 @@
#define SID_TRANSLITERATE_FULLWIDTH ( SID_SVX_START + 915 )
#define SID_TRANSLITERATE_HIRAGANA ( SID_SVX_START + 916 )
#define SID_TRANSLITERATE_KATAGANA ( SID_SVX_START + 917 )
-#define SID_MN_SUB_TRANSLITERATE ( SID_SVX_START + 918 )
// CAUTION! Range <919 .. 920> used by EditEngine (!)
@@ -986,7 +973,6 @@
#define SID_ATTR_SPECIALCHAR ( SID_SVX_START + 1120 )
#define SID_ROTATE_GRAPHIC_LEFT ( SID_SVX_START + 1121 )
#define SID_ROTATE_GRAPHIC_RIGHT ( SID_SVX_START + 1122 )
-#define SID_MENU_MANAGE_GRAPHIC ( SID_SVX_START + 1123 )
// new slots for panels
#define SID_ATTR_FILL_TRANSPARENCE ( SID_SVX_START + 1124 )
diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx
index 7518ddf..ac29f3d 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -252,18 +252,6 @@ ScHTMLExport::ScHTMLExport( SvStream& rStrmP, const OUString& rBaseURL, ScDocume
if ( !IsEmptyTable( nTab ) )
nUsedTables++;
}
-
- // Content-Id for Mail export?
- SfxObjectShell* pDocSh = pDoc->GetDocumentShell();
- if ( pDocSh )
- {
- const SfxPoolItem* pItem = pDocSh->GetItem( SID_ORIGURL );
- if( pItem )
- {
- aCId = static_cast<const SfxStringItem *>(pItem)->GetValue();
- OSL_ENSURE( !aCId.isEmpty(), "CID without length!" );
- }
- }
}
ScHTMLExport::~ScHTMLExport()
diff --git a/sc/source/ui/view/cellsh4.cxx b/sc/source/ui/view/cellsh4.cxx
index e6e98c6..0aa9280 100644
--- a/sc/source/ui/view/cellsh4.cxx
+++ b/sc/source/ui/view/cellsh4.cxx
@@ -84,12 +84,6 @@ void ScCellShell::ExecuteCursor( SfxRequest& rReq )
case SID_CURSORPAGEUP:
rReq.SetSlot(SID_CURSORPAGEUP_SEL);
break;
- case SID_CURSORPAGERIGHT:
- rReq.SetSlot(SID_CURSORPAGERIGHT_SEL);
- break;
- case SID_CURSORPAGELEFT:
- rReq.SetSlot(SID_CURSORPAGELEFT_SEL);
- break;
case SID_CURSORBLKDOWN:
rReq.SetSlot(SID_CURSORBLKDOWN_SEL);
break;
diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc
index e9b5755..70d730a 100644
--- a/sd/inc/app.hrc
+++ b/sd/inc/app.hrc
@@ -80,8 +80,6 @@
#define SID_PRESENTATION_END (SID_SD_START+18)
// FREE
#define SID_POSITION (SID_SD_START+22)
-#define SID_MIRROR (SID_SD_START+23)
-#define SID_CONVERT (SID_SD_START+24)
// FREE
#define SID_COMBINE (SID_SD_START+26)
#define SID_NAME_GROUP (SID_SD_START+27)
@@ -127,7 +125,6 @@
// In svxids.hrc: SID_BEZIER_CONVERT (SID_SD_START+65)
// In svxids.hrc: SID_BEZIER_EDGE (SID_SD_START+66)
// In svxids.hrc: SID_BEZIER_SYMMTR (SID_SD_START+67)
-#define SID_PRESENTATION_TEMPLATES (SID_SD_START+68)
#define SID_NOTES_MODE (SID_SD_START+69)
#define SID_HANDOUT_MASTER_MODE (SID_SD_START+70)
#define SID_LINEEND_POLYGON (SID_SD_START+71)
@@ -290,7 +287,6 @@
// In svxids.hrc: SID_BEZIERTO (SID_SD_START+252)
#define SID_PAGESIZE (SID_SD_START+253)
#define SID_PAGEMARGIN (SID_SD_START+254)
-#define SID_ZOOMING (SID_SD_START+255)
#define SID_SELECTAT (SID_SD_START+256)
#define SID_COLORVIEW (SID_SD_START+257)
// FREE
@@ -401,7 +397,6 @@
#define SID_OUTPUT_QUALITY_BLACKWHITE (SID_SD_START+368)
#define SID_PREVIEW_QUALITY_COLOR (SID_SD_START+369)
// FREE
-#define SID_VECTORIZE (SID_SD_START+372)
#define SID_INSERT_FLD_PAGES (SID_SD_START+373)
// FREE
#define SID_CONVERT_TO_BITMAP (SID_SD_START+378)
@@ -464,7 +459,6 @@
// Add companion for the SID_HIDE_SLIDE (that is defined in svx)
#define SID_SHOW_SLIDE (SID_SD_START+441)
-#define SID_ADD_MOTION_PATH (SID_SD_START+442)
#define SID_TABLE_TOOLBOX (SID_SD_START+443)
// FREE
#define SID_ZOOM_MODE (SID_SD_START+447)
diff --git a/sd/source/ui/func/fuconbez.cxx b/sd/source/ui/func/fuconbez.cxx
index c0d8113..bc0cc72 100644
--- a/sd/source/ui/func/fuconbez.cxx
+++ b/sd/source/ui/func/fuconbez.cxx
@@ -70,19 +70,6 @@ rtl::Reference<FuPoor> FuConstructBezierPolygon::Create( ViewShell* pViewSh, ::s
return xFunc;
}
-void FuConstructBezierPolygon::DoExecute( SfxRequest& rReq )
-{
- FuConstruct::DoExecute( rReq );
-
- const SfxItemSet* pArgs = rReq.GetArgs();
- if( pArgs )
- {
- const SfxPoolItem* pPoolItem = nullptr;
- if( SfxItemState::SET == pArgs->GetItemState( SID_ADD_MOTION_PATH, true, &pPoolItem ) )
- maTargets = static_cast<const SfxUnoAnyItem*>( pPoolItem )->GetValue();
- }
-}
-
bool FuConstructBezierPolygon::MouseButtonDown(const MouseEvent& rMEvt)
{
bool bReturn = FuConstruct::MouseButtonDown(rMEvt);
diff --git a/sd/source/ui/func/fuoltext.cxx b/sd/source/ui/func/fuoltext.cxx
index 5a753bb..271909e 100644
--- a/sd/source/ui/func/fuoltext.cxx
+++ b/sd/source/ui/func/fuoltext.cxx
@@ -72,7 +72,6 @@ static sal_uInt16 SidArray[] = {
SID_SET_SUPER_SCRIPT,
SID_SET_SUB_SCRIPT,
SID_HYPERLINK_GETLINK,
- SID_PRESENTATION_TEMPLATES,
SID_STATUS_PAGE,
SID_STATUS_LAYOUT,
SID_EXPAND_PAGE,
diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx
index 530da42..d9c8ad9 100644
--- a/sd/source/ui/func/fupage.cxx
+++ b/sd/source/ui/func/fupage.cxx
@@ -215,7 +215,7 @@ const SfxItemSet* FuPage::ExecuteDialog( vcl::Window* pParent )
SfxItemSet aNewAttr(mpDoc->GetPool(),
mpDoc->GetPool().GetWhich(SID_ATTR_LRSPACE),
mpDoc->GetPool().GetWhich(SID_ATTR_ULSPACE),
- SID_ATTR_PAGE, SID_ATTR_PAGE_BSP,
+ SID_ATTR_PAGE, SID_ATTR_PAGE_SHARED,
SID_ATTR_BORDER_OUTER, SID_ATTR_BORDER_OUTER,
SID_ATTR_BORDER_SHADOW, SID_ATTR_BORDER_SHADOW,
XATTR_FILL_FIRST, XATTR_FILL_LAST,
diff --git a/sd/source/ui/inc/fuconbez.hxx b/sd/source/ui/inc/fuconbez.hxx
index 0684f7d..55958d0 100644
--- a/sd/source/ui/inc/fuconbez.hxx
+++ b/sd/source/ui/inc/fuconbez.hxx
@@ -33,7 +33,6 @@ class FuConstructBezierPolygon
public:
static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq, bool bPermanent );
- virtual void DoExecute( SfxRequest& rReq ) override;
// Mouse- & Key-Events
virtual bool KeyInput(const KeyEvent& rKEvt) override;
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 8704f87..b78b8ce 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -538,36 +538,6 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
rReq.Done ();
break;
}
- case SID_ZOOMING : // no menu entry, but generated from zoom dialog
- {
- const SfxItemSet* pArgs = rReq.GetArgs();
-
- if (pArgs)
- if (pArgs->Count () == 1)
- {
- const SfxUInt32Item* pScale = rReq.GetArg<SfxUInt32Item>(ID_VAL_ZOOM);
- if (CHECK_RANGE (10, pScale->GetValue (), 1000))
- {
- SetZoom (pScale->GetValue ());
-
- SfxBindings& rBindings = GetViewFrame()->GetBindings();
- rBindings.Invalidate( SID_ATTR_ZOOM );
- rBindings.Invalidate( SID_ZOOM_IN );
- rBindings.Invalidate( SID_ZOOM_OUT );
- rBindings.Invalidate( SID_ATTR_ZOOMSLIDER );
- }
-#if HAVE_FEATURE_SCRIPTING
- else StarBASIC::FatalError (ERRCODE_BASIC_BAD_PROP_VALUE);
-#endif
- rReq.Ignore ();
- break;
- }
-#if HAVE_FEATURE_SCRIPTING
- StarBASIC::FatalError (ERRCODE_BASIC_WRONG_ARGS);
-#endif
- rReq.Ignore ();
- break;
- }
case SID_ATTR_ZOOM:
{
@@ -1385,13 +1355,6 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
}
break;
- case SID_VECTORIZE:
- {
- SetCurrentFunction( FuVectorize::Create( this, GetActiveWindow(), mpDrawView, GetDoc(), rReq ) );
- Cancel();
- }
- break;
-
case SID_INSERTLAYER:
{
if ( mpDrawView->IsTextEdit() )
diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx
index 3f679b9..c75417c 100644
--- a/sd/source/ui/view/drviews7.cxx
+++ b/sd/source/ui/view/drviews7.cxx
@@ -539,10 +539,6 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
if ( !mpDrawView->IsMorphingAllowed() )
rSet.DisableItem( SID_POLYGON_MORPHING );
- // disable vectorizing if necessary
- if ( !mpDrawView->IsVectorizeAllowed() )
- rSet.DisableItem( SID_VECTORIZE );
-
if( !mpDrawView->IsReverseOrderPossible() )
{
rSet.DisableItem( SID_REVERSE_ORDER );
diff --git a/sd/source/ui/view/drviewsj.cxx b/sd/source/ui/view/drviewsj.cxx
index 0909cbb..febb543 100644
--- a/sd/source/ui/view/drviewsj.cxx
+++ b/sd/source/ui/view/drviewsj.cxx
@@ -457,7 +457,6 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet )
rSet.DisableItem( SID_FRAME_TO_BOTTOM );
rSet.DisableItem( SID_BEFORE_OBJ );
rSet.DisableItem( SID_BEHIND_OBJ );
- rSet.DisableItem( SID_CONVERT );
rSet.DisableItem( SID_POSITION );
rSet.DisableItem( SID_SIZE_OPTIMAL );
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index c875ce3..23922b5 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -842,7 +842,6 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet )
if (aTest.isEmpty())
{
bUnique = false;
- rSet.DisableItem(SID_PRESENTATION_TEMPLATES);
}
if (!bUnique)
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index bd221e8..c8134ba 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -615,16 +615,6 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
aHelpOptions.SetWelcomeScreen( static_cast<const SfxBoolItem *>(pItem)->GetValue() );
}
- // WelcomeScreen
- if ( SfxItemState::SET == rSet.GetItemState(rPool.GetWhich(SID_WELCOMESCREEN_RESET ), true, &pItem))
- {
- DBG_ASSERT(dynamic_cast< const SfxBoolItem *>( pItem ) != nullptr, "BoolItem expected");
- bool bReset = static_cast<const SfxBoolItem *>(pItem)->GetValue();
- if ( bReset )
- {
- OSL_FAIL( "Not implemented, may be EOL!" );
- } }
-
if ( SfxItemState::SET == rSet.GetItemState(rPool.GetWhich(SID_HELP_STYLESHEET ), true, &pItem))
{
DBG_ASSERT(dynamic_cast< const SfxStringItem *>( pItem ) != nullptr, "StringItem expected");
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 4f03e86..88d74d5 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -273,7 +273,6 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
}
case SID_QUITAPP:
- case SID_EXITANDRETURN:
case SID_LOGOUT:
{
// protect against reentrant calls
@@ -380,7 +379,6 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
}
case SID_CLOSEDOCS:
- case SID_CLOSEWINS:
{
Reference < XDesktop2 > xDesktop = Desktop::create( ::comphelper::getProcessComponentContext() );
@@ -705,7 +703,6 @@ void SfxApplication::MiscState_Impl(SfxItemSet &rSet)
if ( !SvtModuleOptions().IsModuleInstalled(SvtModuleOptions::EModule::DATABASE) )
rSet.Put(SfxVisibilityItem(nWhich, false));
break;
- case SID_EXITANDRETURN:
case SID_QUITAPP:
{
if ( pAppData_Impl->nDocModalMode )
@@ -751,7 +748,6 @@ void SfxApplication::MiscState_Impl(SfxItemSet &rSet)
break;
case SID_CLOSEDOCS:
- case SID_CLOSEWINS:
{
Reference < XDesktop2 > xDesktop = Desktop::create( ::comphelper::getProcessComponentContext() );
Reference< XIndexAccess > xTasks( xDesktop->getFrames(), UNO_QUERY );
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index 7c3089b..6e7158a 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -182,8 +182,6 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert
if ( nSlotId == SID_OPENURL )
nSlotId = SID_OPENDOC;
- if ( nSlotId == SID_SAVEASURL )
- nSlotId = SID_SAVEASDOC;
sal_Int32 nCount = rArgs.getLength();
if ( !nCount )
@@ -922,7 +920,7 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, uno::Sequence<b
if ( nSlotId == SID_OPENURL )
nSlotId = SID_OPENDOC;
- if ( nSlotId == SID_SAVEASURL || nSlotId == SID_SAVEASREMOTE )
+ if ( nSlotId == SID_SAVEASREMOTE )
nSlotId = SID_SAVEASDOC;
// find number of properties to avoid permanent reallocations in the sequence
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 184a307..2b6f96b 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -1692,9 +1692,7 @@ void SfxMedium::TransactedTransferForFS_Impl( const INetURLObject& aSource,
{
bool bTransactStarted = false;
const SfxBoolItem* pOverWrite = SfxItemSet::GetItem<SfxBoolItem>(GetItemSet(), SID_OVERWRITE, false);
- const SfxBoolItem* pRename = SfxItemSet::GetItem<SfxBoolItem>(GetItemSet(), SID_RENAME, false);
- bool bRename = pRename && pRename->GetValue();
- bool bOverWrite = pOverWrite ? pOverWrite->GetValue() : !bRename;
+ bool bOverWrite = !pOverWrite || pOverWrite->GetValue();
try
{
@@ -1807,12 +1805,10 @@ bool SfxMedium::TryDirectTransfer( const OUString& aURL, SfxItemSet& aTargetSet
InsertCommandArgument aInsertArg;
aInsertArg.Data = xInStream;
- const SfxBoolItem* pRename = aTargetSet.GetItem<SfxBoolItem>(SID_RENAME, false);
- const SfxBoolItem* pOverWrite = aTargetSet.GetItem<SfxBoolItem>(SID_OVERWRITE, false);
- if ( (pOverWrite && !pOverWrite->GetValue()) // argument says: never overwrite
- || (pRename && pRename->GetValue()) ) // argument says: rename file
+ const SfxBoolItem* pOverWrite = aTargetSet.GetItem<SfxBoolItem>(SID_OVERWRITE, false);
+ if ( pOverWrite && !pOverWrite->GetValue() ) // argument says: never overwrite
aInsertArg.ReplaceExisting = false;
- else
+ else
aInsertArg.ReplaceExisting = true; // default is overwrite existing files
Any aCmdArg;
@@ -1925,35 +1921,6 @@ void SfxMedium::Transfer_Impl()
return;
}
- const SfxInt32Item* pSegmentSize = SfxItemSet::GetItem<SfxInt32Item>(GetItemSet(), SID_SEGMENTSIZE, false);
- if ( pSegmentSize )
- {
- // this file must be stored into a disk spanned package
- try
- {
- uno::Reference < embed::XStorage > xStor = comphelper::OStorageHelper::GetStorageFromURL( GetName(),
- embed::ElementModes::READWRITE | embed::ElementModes::TRUNCATE );
-
- // set segment size property; package will automatically be divided in pieces fitting
- // into this size
-
- uno::Reference < beans::XPropertySet > xSet( pImpl->xStorage, uno::UNO_QUERY );
- xSet->setPropertyValue("SegmentSize", Any(pSegmentSize->GetValue()) );
-
- // copy the temporary storage into the disk spanned package
- GetStorage()->copyToStorage( xStor );
- uno::Reference < embed::XTransactedObject > xTrans( pImpl->xStorage, uno::UNO_QUERY );
- if ( xTrans.is() )
- xTrans->commit();
-
- }
- catch ( const uno::Exception& )
- {
- //TODO/MBA: error handling
- }
- return;
- }
-
INetURLObject aDest( GetURLObject() );
// source is the temp file written so far
@@ -2056,15 +2023,11 @@ void SfxMedium::Transfer_Impl()
(void)::ucbhelper::Content::create( aSource.GetMainURL( INetURLObject::NO_DECODE ), xEnv, comphelper::getProcessComponentContext(), aSourceContent );
// check for external parameters that may customize the handling of NameClash situations
- const SfxBoolItem* pRename = SfxItemSet::GetItem<SfxBoolItem>(GetItemSet(), SID_RENAME, false);
const SfxBoolItem* pOverWrite = SfxItemSet::GetItem<SfxBoolItem>(GetItemSet(), SID_OVERWRITE, false);
sal_Int32 nNameClash;
if ( pOverWrite && !pOverWrite->GetValue() )
// argument says: never overwrite
nNameClash = NameClash::ERROR;
- else if ( pRename && pRename->GetValue() )
- // argument says: rename file
- nNameClash = NameClash::RENAME;
else
// default is overwrite existing files
nNameClash = NameClash::OVERWRITE;
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index 77c17d2..0dd4cbd 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -1240,25 +1240,6 @@ void SfxObjectShell::ExecView_Impl(SfxRequest &rReq)
rReq.Done();
break;
}
- case SID_NEWWINDOWFOREDIT:
- {
- SfxViewFrame* pFrame = SfxViewFrame::Current();
- if( pFrame->GetObjectShell() == this &&
- ( pFrame->GetFrameType() & SFXFRAME_HASTITLE ) )
- pFrame->ExecuteSlot( rReq );
- else
- {
- OUString aFileName( GetObjectShell()->GetMedium()->GetName() );
- if ( !aFileName.isEmpty() )
- {
- SfxStringItem aName( SID_FILE_NAME, aFileName );
- SfxBoolItem aCreateView( SID_OPEN_NEW_VIEW, true );
- SfxGetpApp()->GetAppDispatcher_Impl()->ExecuteList(
- SID_OPENDOC, SfxCallMode::ASYNCHRON,
- { &aName, &aCreateView });
- }
- }
- }
}
}
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index 1f0a2d9..93de318 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -654,9 +654,6 @@ void SfxToolBoxControl::StateChanged
{
DBG_ASSERT( pImpl->pBox != nullptr, "setting state to dangling ToolBox" );
- if ( GetId() >= SID_OBJECTMENU0 && GetId() <= SID_OBJECTMENU_LAST )
- return;
-
// enabled/disabled-Flag correcting the lump sum
pImpl->pBox->EnableItem( GetId(), eState != SfxItemState::DISABLED );
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 0ee0d60..0997452 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -654,7 +654,6 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
if( pSalvageItem )
{
aURL = pSalvageItem->GetValue();
- pNewSet->ClearItem( SID_ORIGURL );
pNewSet->ClearItem( SID_DOC_SALVAGE );
}
diff --git a/sfx2/source/view/viewfrm2.cxx b/sfx2/source/view/viewfrm2.cxx
index 27292d8..3299933 100644
--- a/sfx2/source/view/viewfrm2.cxx
+++ b/sfx2/source/view/viewfrm2.cxx
@@ -161,8 +161,6 @@ void SfxViewFrame::Exec_Impl(SfxRequest &rReq )
{
const SfxBoolItem* pShowItem = rReq.GetArg<SfxBoolItem>(SID_SHOWPOPUPS);
bool bShow = pShowItem == nullptr || pShowItem->GetValue();
- const SfxUInt16Item* pIdItem = rReq.GetArg<SfxUInt16Item>(SID_CONFIGITEMID);
- sal_uInt16 nId = pIdItem ? pIdItem->GetValue() : 0;
SfxWorkWindow *pWorkWin = GetFrame().GetWorkWindow_Impl();
if ( bShow )
@@ -184,7 +182,7 @@ void SfxViewFrame::Exec_Impl(SfxRequest &rReq )
pBind = pBind->GetSubBindings_Impl();
}
- pWorkWin->HidePopups_Impl( !bShow, true, nId );
+ pWorkWin->HidePopups_Impl( !bShow, true );
pWorkWin->MakeChildrenVisible_Impl( bShow );
}
diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx
index 116491c..ef930dd 100644
--- a/svx/source/tbxctrls/linectrl.cxx
+++ b/svx/source/tbxctrls/linectrl.cxx
@@ -254,7 +254,6 @@ SvxLineEndWindow::SvxLineEndWindow(
aLineEndSet ( VclPtr<ValueSet>::Create(this, WinBits( WB_ITEMBORDER | WB_3DLOOK | WB_NO_DIRECTSELECT ) )),
nCols ( 2 ),
nLines ( 12 ),
- nLineEndWidth ( 400 ),
bPopupMode ( true ),
mbInResize ( false ),
mxFrame ( rFrame )
@@ -275,10 +274,6 @@ void SvxLineEndWindow::implInit()
const SfxPoolItem* pItem = pDocSh->GetItem( SID_LINEEND_LIST );
if( pItem )
pLineEndList = static_cast<const SvxLineEndListItem*>( pItem )->GetLineEndList();
-
- pItem = pDocSh->GetItem( SID_ATTR_LINEEND_WIDTH_DEFAULT );
- if( pItem )
- nLineEndWidth = static_cast<const SfxUInt16Item*>( pItem )->GetValue();
}
DBG_ASSERT( pLineEndList.is(), "LineEndList not found" );
diff --git a/sw/source/uibase/app/docstyle.cxx b/sw/source/uibase/app/docstyle.cxx
index 13e22a6..52001b9 100644
--- a/sw/source/uibase/app/docstyle.cxx
+++ b/sw/source/uibase/app/docstyle.cxx
@@ -771,7 +771,6 @@ OUString SwDocStyleSheet::GetDescription(SfxMapUnit eUnit)
case SID_ATTR_PAGE_SIZE:
case SID_ATTR_PAGE_MAXSIZE:
case SID_ATTR_PAGE_PAPERBIN:
- case SID_ATTR_PAGE_APP:
case SID_ATTR_BORDER_INNER:
break;
default:
diff --git a/sw/source/uibase/uiview/viewstat.cxx b/sw/source/uibase/uiview/viewstat.cxx
index 5723088..6815a61 100644
--- a/sw/source/uibase/uiview/viewstat.cxx
+++ b/sw/source/uibase/uiview/viewstat.cxx
@@ -508,11 +508,6 @@ void SwView::GetDrawState(SfxItemSet &rSet)
rSet.Put( SfxBoolItem( nWhich, m_nDrawSfxId == nWhich ) );
break;
- case SID_SHOW_HIDDEN:
- case SID_SHOW_FORMS:
- rSet.DisableItem( nWhich );
- break;
-
case SID_DRAW_TEXT_MARQUEE:
if (::GetHtmlMode(GetDocShell()) & HTMLMODE_SOME_STYLES)
rSet.Put( SfxBoolItem(nWhich, m_nDrawSfxId == nWhich));
More information about the Libreoffice-commits
mailing list