chart2/source/inc/chartview/ChartSfxItemIds.hxx | 2
cui/source/options/optgdlg.cxx | 2
editeng/source/rtf/svxrtf.cxx | 7
idl/source/prj/database.cxx | 15 +-
include/editeng/editids.hrc | 6
include/sfx2/sfxsids.hrc | 176 ++++++++++++------------
include/svx/svxids.hrc | 90 ++++++------
sc/source/filter/xml/xmlwrap.cxx | 8 -
sd/source/filter/sdfilter.cxx | 4
sd/source/filter/xml/sdxmlwrp.cxx | 11 -
sd/source/ui/app/sdmod1.cxx | 4
starmath/source/mathml/export.cxx | 9 -
starmath/source/mathml/import.cxx | 7
starmath/source/mathml/mathmlexport.cxx | 7
starmath/source/mathml/mathmlimport.cxx | 7
svx/source/svdraw/svdedtv1.cxx | 2
svx/source/tbxctrls/grafctrl.cxx | 2
sw/source/filter/xml/swxml.cxx | 8 -
sw/source/filter/xml/wrtxml.cxx | 8 -
19 files changed, 202 insertions(+), 173 deletions(-)
New commits:
commit 8fed86b3ebb52cbf28ba2a561e67108e3a05a206
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Thu Jan 27 11:15:12 2022 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu Jan 27 14:10:25 2022 +0100
add some more TypeWhichId annotations
and update the idl compiler to cope with namespaced class names
Change-Id: I7b5242f872e358bc3c5584f543767719172aac83
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129026
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/chart2/source/inc/chartview/ChartSfxItemIds.hxx
b/chart2/source/inc/chartview/ChartSfxItemIds.hxx
index 55fec55872f3..45773344f873 100644
--- a/chart2/source/inc/chartview/ChartSfxItemIds.hxx
+++ b/chart2/source/inc/chartview/ChartSfxItemIds.hxx
@@ -163,7 +163,7 @@ constexpr TypedWhichId<SfxInt32Item>
SCHATTR_NUM_OF_LINES_FOR_BAR
constexpr TypedWhichId<SfxInt32Item> SCHATTR_SPLINE_ORDER
(SCHATTR_CHARTTYPE_START + 4);
constexpr TypedWhichId<SfxInt32Item> SCHATTR_SPLINE_RESOLUTION
(SCHATTR_CHARTTYPE_START + 5);
constexpr TypedWhichId<SfxBoolItem> SCHATTR_GROUP_BARS_PER_AXIS
(SCHATTR_CHARTTYPE_START + 6);
-constexpr TypedWhichId<SfxInt32Item> SCHATTR_STARTING_ANGLE
(SCHATTR_CHARTTYPE_START + 7);
+constexpr TypedWhichId<SdrAngleItem> SCHATTR_STARTING_ANGLE
(SCHATTR_CHARTTYPE_START + 7);
constexpr TypedWhichId<SfxBoolItem> SCHATTR_CLOCKWISE
(SCHATTR_CHARTTYPE_START + 8);
constexpr TypedWhichId<SfxInt32Item> SCHATTR_MISSING_VALUE_TREATMENT
(SCHATTR_CHARTTYPE_START + 9);
constexpr TypedWhichId<SfxIntegerListItem>
SCHATTR_AVAILABLE_MISSING_VALUE_TREATMENTS (SCHATTR_CHARTTYPE_START + 10);
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index e0b0bfdf8c5d..f31044aeaaff 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -244,7 +244,7 @@ bool OfaMiscTabPage::FillItemSet( SfxItemSet* rSet )
bModified = true;
}
- const SfxUInt16Item* pUInt16Item = dynamic_cast< const SfxUInt16Item* >(
GetOldItem( *rSet, SID_ATTR_YEAR2000 ) );
+ const SfxUInt16Item* pUInt16Item = GetOldItem( *rSet, SID_ATTR_YEAR2000 );
sal_uInt16 nNum =
static_cast<sal_uInt16>(m_xYearValueField->get_text().toInt32());
if ( pUInt16Item && pUInt16Item->GetValue() != nNum )
{
diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index 02772c7b2920..0822b3522817 100644
--- a/editeng/source/rtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -929,19 +929,20 @@ void SvxRTFParser::BuildWhichTable()
// Here are the IDs for all character attributes, which can be detected by
// SvxParser and can be set in a SfxItemSet. The IDs are set correctly
through
// the SlotIds from POOL.
- for (sal_uInt16 nWid : {
+ constexpr sal_uInt16 WIDS[] {
SID_ATTR_CHAR_CASEMAP, SID_ATTR_BRUSH_CHAR,
SID_ATTR_CHAR_COLOR,
SID_ATTR_CHAR_CONTOUR, SID_ATTR_CHAR_STRIKEOUT,
SID_ATTR_CHAR_ESCAPEMENT,
SID_ATTR_CHAR_FONT, SID_ATTR_CHAR_FONTHEIGHT,
SID_ATTR_CHAR_KERNING,
SID_ATTR_CHAR_LANGUAGE, SID_ATTR_CHAR_POSTURE,
SID_ATTR_CHAR_SHADOWED,
SID_ATTR_CHAR_UNDERLINE, SID_ATTR_CHAR_OVERLINE,
SID_ATTR_CHAR_WEIGHT,
SID_ATTR_CHAR_WORDLINEMODE, SID_ATTR_CHAR_AUTOKERN,
SID_ATTR_CHAR_CJK_FONT,
- SID_ATTR_CHAR_CJK_FONTHEIGHT, SID_ATTR_CHAR_CJK_LANGUAGE,
SID_ATTR_CHAR_CJK_POSTURE,
+ SID_ATTR_CHAR_CJK_FONTHEIGHT,
sal_uInt16(SID_ATTR_CHAR_CJK_LANGUAGE), SID_ATTR_CHAR_CJK_POSTURE,
SID_ATTR_CHAR_CJK_WEIGHT, SID_ATTR_CHAR_CTL_FONT,
SID_ATTR_CHAR_CTL_FONTHEIGHT,
SID_ATTR_CHAR_CTL_LANGUAGE, SID_ATTR_CHAR_CTL_POSTURE,
SID_ATTR_CHAR_CTL_WEIGHT,
SID_ATTR_CHAR_EMPHASISMARK, SID_ATTR_CHAR_TWO_LINES,
SID_ATTR_CHAR_SCALEWIDTH,
SID_ATTR_CHAR_ROTATED, SID_ATTR_CHAR_RELIEF,
SID_ATTR_CHAR_HIDDEN,
- })
+ };
+ for (sal_uInt16 nWid : WIDS)
{
sal_uInt16 nTrueWid = pAttrPool->GetTrueWhich(nWid, false);
aPlainMap[nWid] = nTrueWid;
diff --git a/idl/source/prj/database.cxx b/idl/source/prj/database.cxx
index dc4cecb34895..4b0a58424558 100644
--- a/idl/source/prj/database.cxx
+++ b/idl/source/prj/database.cxx
@@ -174,8 +174,19 @@ bool SvIdlDataBase::ReadIdFile( std::string_view
rOFileName )
if( !rTok.IsChar() || rTok.GetChar() != '<')
throw SvParseException( "expected '<'", rTok );
rTok = aTokStm.GetToken_Next();
- if( !rTok.IsIdentifier() )
- throw SvParseException( "expected identifier",
rTok );
+ if (rTok.IsChar() && rTok.GetChar() == ':')
+ {
+ // add support for "::avmedia::MediaItem"
namespaced identifier
+ rTok = aTokStm.GetToken_Next();
+ if( !rTok.IsChar() || rTok.GetChar() != ':')
+ throw SvParseException( "expected ':'", rTok );
+ // the lexer reads "avmedia::MediaItem" as an
identifier
+ rTok = aTokStm.GetToken_Next();
+ if( !rTok.IsIdentifier() )
+ throw SvParseException( "expected identifier",
rTok );
+ }
+ else if( !rTok.IsIdentifier() )
+ throw SvParseException( "expected identifier",
rTok );
rTok = aTokStm.GetToken_Next();
if( !rTok.IsChar() || rTok.GetChar() != '>')
throw SvParseException( "expected '<'", rTok );
diff --git a/include/editeng/editids.hrc b/include/editeng/editids.hrc
index 5560eea1336a..ac7c2bf763a9 100644
--- a/include/editeng/editids.hrc
+++ b/include/editeng/editids.hrc
@@ -21,6 +21,8 @@
#include <svl/solar.hrc>
+class SvxLanguageItem;
+
/*
These SID_SVX_START entries came from include/svx/svxids.hrc, avoid
accidentally colliding entries with include/svx/svxids.hrc and
@@ -90,12 +92,12 @@
#define SID_ATTR_CHAR_CHARSETCOLOR ( SID_SVX_START + 877 )
#define SID_ATTR_CHAR_CJK_FONT ( SID_SVX_START + 887 )
#define SID_ATTR_CHAR_CJK_FONTHEIGHT ( SID_SVX_START + 888 )
-#define SID_ATTR_CHAR_CJK_LANGUAGE ( SID_SVX_START + 889 )
+#define SID_ATTR_CHAR_CJK_LANGUAGE
TypedWhichId<SvxLanguageItem>( SID_SVX_START + 889 )
#define SID_ATTR_CHAR_CJK_POSTURE ( SID_SVX_START + 890 )
#define SID_ATTR_CHAR_CJK_WEIGHT ( SID_SVX_START + 891 )
#define SID_ATTR_CHAR_CTL_FONT ( SID_SVX_START + 892 )
#define SID_ATTR_CHAR_CTL_FONTHEIGHT ( SID_SVX_START + 893 )
-#define SID_ATTR_CHAR_CTL_LANGUAGE ( SID_SVX_START + 894 )
+#define SID_ATTR_CHAR_CTL_LANGUAGE
TypedWhichId<SvxLanguageItem>( SID_SVX_START + 894 )
#define SID_ATTR_CHAR_CTL_POSTURE ( SID_SVX_START + 895 )
#define SID_ATTR_CHAR_CTL_WEIGHT ( SID_SVX_START + 896 )
#define SID_ATTR_CHAR_TWO_LINES ( SID_SVX_START + 897 )
diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc
index e4bf9bbbe71b..b586f16fade0 100644
--- a/include/sfx2/sfxsids.hrc
+++ b/include/sfx2/sfxsids.hrc
@@ -23,11 +23,22 @@
#include <svl/memberid.h>
#include <svl/typedwhich.hxx>
-class SvxZoomItem;
+class SfxBoolItem;
+class SfxDocumentInfoItem;
+class SfxEventNamesItem;
+class SfxFlagItem;
+class SfxHyphenRegionItem;
+class SfxMacroInfoItem;
+class SfxScriptOrganizerItem;
+class SfxStringItem;
+class SfxStringListItem;
class SfxUInt16Item;
+class SfxUnoAnyItem;
+class SfxUnoFrameItem;
class SvxHyperlinkItem;
-class SfxDocumentInfoItem;
+class SvxLanguageItem;
class SvxSearchItem;
+class SvxZoomItem;
// Please be careful:
// Changing just one part here doesn't add new
@@ -59,9 +70,9 @@ class SvxSearchItem;
#define SID_CLIPBOARD_FORMAT_ITEMS (SID_SFX_START + 312)
#define SID_PASTE_UNFORMATTED (SID_SFX_START + 314)
-#define SID_PRINTER_NOTFOUND_WARN (SID_SFX_START + 320)
+#define SID_PRINTER_NOTFOUND_WARN
TypedWhichId<SfxBoolItem>(SID_SFX_START + 320)
#define SID_PRINTER_NAME (SID_SFX_START + 322)
-#define SID_PRINTER_CHANGESTODOC (SID_SFX_START + 324)
+#define SID_PRINTER_CHANGESTODOC
TypedWhichId<SfxFlagItem>(SID_SFX_START + 324)
#define SID_PRINTPREVIEW (SID_SFX_START + 325)
#define SID_MAIL_SUBJECT (SID_SFX_START + 328)
@@ -78,7 +89,7 @@ class SvxSearchItem;
#define SID_WEBHTML (SID_SFX_START + 393)
#define SID_MAIL_SCROLLBODY_PAGEDOWN (SID_SFX_START + 1588)
-#define SID_PROGRESS_STATUSBAR_CONTROL (SID_SFX_START + 1597)
+#define SID_PROGRESS_STATUSBAR_CONTROL
TypedWhichId<SfxUnoAnyItem>(SID_SFX_START + 1597)
#define SID_SELECTION
TypedWhichId<SfxBoolItem>(SID_SFX_START + 346)
@@ -118,7 +129,7 @@ class SvxSearchItem;
#define SID_SIGNPDF (SID_SFX_START + 519)
#define SID_SAVEACOPY (SID_SFX_START + 999)
#define SID_SAVEACOPYITEM (SID_SFX_START + 998)
-#define SID_CONVERT_IMAGES (SID_SFX_START + 997)
+#define SID_CONVERT_IMAGES
TypedWhichId<SfxStringItem>(SID_SFX_START + 997)
#define SID_CLOSING (SID_SFX_START +1539)
#define SID_CLOSEDOC (SID_SFX_START + 503)
#define SID_CLOSEDOCS (SID_SFX_START + 595)
@@ -131,13 +142,13 @@ class SvxSearchItem;
#define SID_PRINT_SORT (SID_SFX_START +1591)
#define SID_SAVEDOC (SID_SFX_START + 505)
#define SID_FILE_NAME (SID_SFX_START + 507)
-#define SID_DOCINFO_TITLE (SID_SFX_START + 557)
+#define SID_DOCINFO_TITLE
TypedWhichId<SfxStringItem>(SID_SFX_START + 557)
#define SID_FILE_FILTEROPTIONS (SID_SFX_START + 527)
#define SID_RELOAD (SID_SFX_START + 508)
#define SID_PRINTDOCDIRECT (SID_SFX_START + 509)
#define SID_DOC_REPAIR (SID_SFX_START + 510)
-#define SID_DOC_SERVICE (SID_SFX_START + 511)
-#define SID_PLUGIN_MODE (SID_SFX_START + 827)
+#define SID_DOC_SERVICE
TypedWhichId<SfxStringItem>(SID_SFX_START + 511)
+#define SID_PLUGIN_MODE
TypedWhichId<SfxUInt16Item>(SID_SFX_START + 827)
#define SID_EXPORTDOC (SID_SFX_START + 829)
#define SID_EXPORTDOCASPDF (SID_SFX_START + 1673)
#define SID_DIRECTEXPORTDOCASPDF (SID_SFX_START + 1674)
@@ -145,46 +156,46 @@ class SvxSearchItem;
#define SID_DIRECTEXPORTDOCASEPUB (SID_SFX_START + 1678)
#define SID_REDACTDOC (SID_SFX_START + 1732)
#define SID_AUTOREDACTDOC (SID_SFX_START + 1736)
-#define SID_UPDATEDOCMODE (SID_SFX_START + 1668)
+#define SID_UPDATEDOCMODE
TypedWhichId<SfxUInt16Item>(SID_SFX_START + 1668)
#define SID_CHECKOUT (SID_SFX_START + 512)
#define SID_CANCELCHECKOUT (SID_SFX_START + 513)
#define SID_CHECKIN (SID_SFX_START + 514)
-#define SID_FILTER_PROVIDER (SID_SFX_START + 515)
+#define SID_FILTER_PROVIDER
TypedWhichId<SfxStringItem>(SID_SFX_START + 515)
#define SID_FORCERELOAD (SID_SFX_START + 1502)
-#define SID_FILE_DIALOG (SID_SFX_START + 304)
+#define SID_FILE_DIALOG
TypedWhichId<SfxBoolItem>(SID_SFX_START + 304)
#define SID_REMOTE_DIALOG (SID_SFX_START + 305)
-#define SID_PATH (SID_SFX_START + 308)
+#define SID_PATH
TypedWhichId<SfxStringItem>(SID_SFX_START + 308)
#define SID_SAVEDOCS (SID_SFX_START + 309)
-#define SID_STANDARD_DIR (SID_SFX_START + 450)
-#define SID_DENY_LIST (SID_SFX_START + 451)
+#define SID_STANDARD_DIR
TypedWhichId<SfxStringItem>(SID_SFX_START + 450)
+#define SID_DENY_LIST
TypedWhichId<SfxStringListItem>(SID_SFX_START + 451)
// browse-ids
#define SID_BROWSE_FORWARD (SID_SFX_START + 1300)
#define SID_BROWSE_BACKWARD (SID_SFX_START + 1301)
#define SID_CREATELINK (SID_SFX_START + 1309)
-#define SID_EDITDOC (SID_SFX_START + 1312)
+#define SID_EDITDOC
TypedWhichId<SfxBoolItem>(SID_SFX_START + 1312)
#define SID_BROWSER_MODE (SID_SFX_START + 1313)
#define SID_READONLYDOC (SID_SFX_START + 1314)
#define SID_BROWSER (SID_SFX_START + 1318)
-#define SID_MACROEXECMODE (SID_SFX_START + 1319)
+#define SID_MACROEXECMODE
TypedWhichId<SfxUInt16Item>(SID_SFX_START + 1319)
-#define SID_FILTER_DATA (SID_SFX_START + 1375)
+#define SID_FILTER_DATA
TypedWhichId<SfxUnoAnyItem>(SID_SFX_START + 1375)
#define SID_EXPLORER_FILEPROPS_START (SID_SFX_START + 1390)
// SID_EXPLORER_FILEPROPS_END (SID_SFX_START + 1399)
-#define SID_ATTR_ZOOM
TypedWhichId<SvxZoomItem>(SID_SVX_START + 0)
+#define SID_ATTR_ZOOM
TypedWhichId<SvxZoomItem>(SID_SVX_START + 0)
-#define SID_EXPLORER_PROPS_START (SID_SFX_START + 1410)
+#define SID_EXPLORER_PROPS_START
TypedWhichId<SfxStringItem>(SID_SFX_START + 1410)
// SID_EXPLORER_PROPS_END (SID_SFX_START + 1499)
#define SID_AUTOLOAD (SID_SFX_START + 1509)
-#define SID_FILLFRAME (SID_SFX_START + 1516)
+#define SID_FILLFRAME
TypedWhichId<SfxUnoFrameItem>(SID_SFX_START + 1516)
#define SID_BASEURL (SID_SFX_START + 1518)
-#define SID_TEMPLATE (SID_SFX_START + 1519)
+#define SID_TEMPLATE
TypedWhichId<SfxBoolItem>(SID_SFX_START + 1519)
-#define SID_CONTENTTYPE (SID_SFX_START + 1541)
+#define SID_CONTENTTYPE
TypedWhichId<SfxStringItem>(SID_SFX_START + 1541)
#define SID_SAVETO
TypedWhichId<SfxBoolItem>(SID_SFX_START + 1546)
@@ -196,63 +207,63 @@ class SvxSearchItem;
#define SID_OFFICE_CHECK_PLZ (SID_SFX_START + 1610)
#define SID_CURRENT_URL (SID_SFX_START + 1613)
-#define SID_CHARSET (SID_SFX_START + 1633)
+#define SID_CHARSET
TypedWhichId<SfxStringItem>(SID_SFX_START + 1633)
#define SID_OVERWRITE (SID_SFX_START + 1634)
// FREE (was: SID_CRASH)
-#define SID_FAIL_ON_WARNING (SID_SFX_START + 1646)
-#define SID_INPUTSTREAM (SID_SFX_START + 1648)
+#define SID_FAIL_ON_WARNING
TypedWhichId<SfxBoolItem>(SID_SFX_START + 1646)
+#define SID_INPUTSTREAM
TypedWhichId<SfxUnoAnyItem>(SID_SFX_START + 1648)
#define SID_LOGOUT (SID_SFX_START + 1652)
-#define SID_JUMPMARK (SID_SFX_START + 1654)
+#define SID_JUMPMARK
TypedWhichId<SfxStringItem>(SID_SFX_START + 1654)
#define SID_BROWSE (SID_SFX_START + 1658)
// FREE (was: SID_BACKTOWEBTOP)
#define SID_VIEW_DATA_SOURCE_BROWSER (SID_SFX_START + 1660)
#define SID_UNPACK (SID_SFX_START + 1662)
// (SID_SFX_START + 1663) used further down
// FREE
-#define SID_OUTPUTSTREAM (SID_SFX_START + 1666)
+#define SID_OUTPUTSTREAM
TypedWhichId<SfxUnoAnyItem>(SID_SFX_START + 1666)
#define SID_IMAGE_ORIENTATION (SID_SFX_START + 1667)
#define SID_STOP_RECORDING (SID_SFX_START + 1671)
-#define SID_INTERACTIONHANDLER (SID_SFX_START + 1675)
+#define SID_INTERACTIONHANDLER
TypedWhichId<SfxUnoAnyItem>(SID_SFX_START + 1675)
#define SID_OPENHYPERLINK (SID_SFX_START + 1676)
-#define SID_CONTENT (SID_SFX_START + 1679)
-#define SID_VIEWONLY (SID_SFX_START + 1682)
-#define SID_REPAIRPACKAGE (SID_SFX_START + 1683)
-#define SID_MINIMIZED (SID_SFX_START + 1687)
-#define SID_COMPONENTDATA (SID_SFX_START + 1688)
-#define SID_COMPONENTCONTEXT (SID_SFX_START + 1689)
-#define SID_SCRIPTORGANIZER (SID_SFX_START + 1690)
-#define SID_MACROORGANIZER (SID_SFX_START + 1691)
+#define SID_CONTENT
TypedWhichId<SfxUnoAnyItem>(SID_SFX_START + 1679)
+#define SID_VIEWONLY
TypedWhichId<SfxBoolItem>(SID_SFX_START + 1682)
+#define SID_REPAIRPACKAGE
TypedWhichId<SfxBoolItem>(SID_SFX_START + 1683)
+#define SID_MINIMIZED
TypedWhichId<SfxBoolItem>(SID_SFX_START + 1687)
+#define SID_COMPONENTDATA
TypedWhichId<SfxUnoAnyItem>(SID_SFX_START + 1688)
+#define SID_COMPONENTCONTEXT
TypedWhichId<SfxUnoAnyItem>(SID_SFX_START + 1689)
+#define SID_SCRIPTORGANIZER
TypedWhichId<SfxScriptOrganizerItem>(SID_SFX_START + 1690)
+#define SID_MACROORGANIZER
TypedWhichId<SfxUInt16Item>(SID_SFX_START + 1691)
#define SID_RUNMACRO (SID_SFX_START + 1692)
-#define SID_AVMEDIA_TOOLBOX (SID_SFX_START + 1693)
+#define SID_AVMEDIA_TOOLBOX
TypedWhichId<::avmedia::MediaItem>(SID_SFX_START + 1693)
#define SID_AVMEDIA_PLAYER (SID_SFX_START + 1694)
#define SID_INSERT_AVMEDIA (SID_SFX_START + 1696)
#define SID_RECENTFILELIST (SID_SFX_START + 1697)
#define SID_AVAILABLE_TOOLBARS (SID_SFX_START + 1698)
-#define SID_STREAM (SID_SFX_START + 1699)
-#define SID_DOC_BASEURL (SID_SFX_START + 1700)
-#define SID_DOC_HIERARCHICALNAME (SID_SFX_START + 1701)
+#define SID_STREAM
TypedWhichId<SfxUnoAnyItem>(SID_SFX_START + 1699)
+#define SID_DOC_BASEURL
TypedWhichId<SfxStringItem>(SID_SFX_START + 1700)
+#define SID_DOC_HIERARCHICALNAME
TypedWhichId<SfxStringItem>(SID_SFX_START + 1701)
#define SID_TERMINATE_INPLACEACTIVATION (SID_SFX_START + 1702)
#define SID_APPLY_STYLE (SID_SFX_START + 1703)
#define SID_MACRO_SIGNATURE (SID_SFX_START + 1704)
#define SID_ATTR_WARNALIENFORMAT (SID_SFX_START + 1705)
-#define SID_COPY_STREAM_IF_POSSIBLE (SID_SFX_START + 1706)
+#define SID_COPY_STREAM_IF_POSSIBLE
TypedWhichId<SfxUnoAnyItem>(SID_SFX_START + 1706)
#define SID_MAIL_SENDDOCASFORMAT (SID_SFX_START + 1707)
#define SID_MAIL_SENDDOCASMS (SID_SFX_START + 1708)
#define SID_MAIL_SENDDOCASOOO (SID_SFX_START + 1709)
#define SID_NO_ACCEPT_DIALOG (SID_SFX_START + 1710)
-#define SID_NOAUTOSAVE (SID_SFX_START + 1711)
+#define SID_NOAUTOSAVE
TypedWhichId<SfxBoolItem>(SID_SFX_START + 1711)
#define SID_PRINT_SELECTEDSHEET (SID_SFX_START + 1712)
#define SID_OPTIONS_PAGEURL (SID_SFX_START + 1713)
#define SID_MORE_DICTIONARIES (SID_SFX_START + 1714)
#define SID_ACTIVATE_STYLE_APPLY (SID_SFX_START + 1715)
#define SID_FONT_NAME (SID_SFX_START + 1716)
#define SID_DEFAULTFILENAME (SID_SFX_START + 1717)
-#define SID_MODIFYPASSWORDINFO (SID_SFX_START + 1718)
+#define SID_MODIFYPASSWORDINFO
TypedWhichId<SfxUnoAnyItem>(SID_SFX_START + 1718)
#define SID_RECOMMENDREADONLY (SID_SFX_START + 1719)
-#define SID_SUGGESTEDSAVEASDIR (SID_SFX_START + 1720)
-#define SID_SUGGESTEDSAVEASNAME (SID_SFX_START + 1721)
-#define SID_ENCRYPTIONDATA (SID_SFX_START + 1722)
+#define SID_SUGGESTEDSAVEASDIR
TypedWhichId<SfxStringItem>(SID_SFX_START + 1720)
+#define SID_SUGGESTEDSAVEASNAME
TypedWhichId<SfxStringItem>(SID_SFX_START + 1721)
+#define SID_ENCRYPTIONDATA
TypedWhichId<SfxUnoAnyItem>(SID_SFX_START + 1722)
#define SID_PASSWORDINTERACTION (SID_SFX_START + 1723)
#define SID_GOTOLINE (SID_SFX_START + 1724)
#define SID_SHOWLINES (SID_SFX_START + 1725)
@@ -261,18 +272,18 @@ class SvxSearchItem;
#define SID_TOOLBAR_MODE (SID_SFX_START + 1728)
#define SID_NO_FILE_SYNC (SID_SFX_START + 1729)
#define SID_NO_THUMBNAIL (SID_SFX_START + 1730)
-#define SID_LOCK_CONTENT_EXTRACTION (SID_SFX_START + 1731)
-#define SID_LOCK_EXPORT (SID_SFX_START + 1732)
+#define SID_LOCK_CONTENT_EXTRACTION
TypedWhichId<SfxBoolItem>(SID_SFX_START + 1731)
+#define SID_LOCK_EXPORT
TypedWhichId<SfxBoolItem>(SID_SFX_START + 1732)
// Used to export a temporary file for preview in Mail Merge Wizard, where
saving the data source is
// not required for preview, but interferes with not-yet-saved embedded data
source for main document.
#define SID_NO_EMBEDDED_DS
TypedWhichId<SfxBoolItem>(SID_SFX_START + 1731)
#define SID_IS_REDACT_MODE (SID_SFX_START + 1733)
#define SID_REDACTION_STYLE (SID_SFX_START + 1734)
-#define SID_DIALOG_PARENT (SID_SFX_START + 1735)
-#define SID_LOCK_PRINT (SID_SFX_START + 1736)
-#define SID_LOCK_SAVE (SID_SFX_START + 1737)
-#define SID_LOCK_EDITDOC (SID_SFX_START + 1738)
-#define SID_REPLACEABLE (SID_SFX_START + 1739)
+#define SID_DIALOG_PARENT
TypedWhichId<SfxUnoAnyItem>(SID_SFX_START + 1735)
+#define SID_LOCK_PRINT
TypedWhichId<SfxBoolItem>(SID_SFX_START + 1736)
+#define SID_LOCK_SAVE
TypedWhichId<SfxBoolItem>(SID_SFX_START + 1737)
+#define SID_LOCK_EDITDOC
TypedWhichId<SfxBoolItem>(SID_SFX_START + 1738)
+#define SID_REPLACEABLE
TypedWhichId<SfxBoolItem>(SID_SFX_START + 1739)
#define SID_ADDITIONS_DIALOG (SID_SFX_START + 1740)
#define SID_ADDITIONS_TAG (SID_SFX_START + 1741)
#define SID_TOOLBAR_MODE_UI (SID_SFX_START + 1742)
@@ -280,14 +291,14 @@ class SvxSearchItem;
// SID_SFX_free_END (SID_SFX_START + 3999)
-#define SID_OPEN_NEW_VIEW (SID_SFX_START + 520)
+#define SID_OPEN_NEW_VIEW
TypedWhichId<SfxBoolItem>(SID_SFX_START + 520)
// FREE, was SID_VIEW_ZOOM_MODE
// FREE, was SID_VIEW_POS_SIZE
-#define SID_VIEW_ID (SID_SFX_START + 523)
+#define SID_VIEW_ID
TypedWhichId<SfxUInt16Item>(SID_SFX_START + 523)
// FREE, was SID_USER_DATA
-#define SID_VIEW_DATA (SID_SFX_START + 1582)
-#define SID_SILENT (SID_SFX_START + 528)
-#define SID_HIDDEN (SID_SFX_START + 534)
+#define SID_VIEW_DATA
TypedWhichId<SfxUnoAnyItem>(SID_SFX_START + 1582)
+#define SID_SILENT
TypedWhichId<SfxBoolItem>(SID_SFX_START + 528)
+#define SID_HIDDEN
TypedWhichId<SfxBoolItem>(SID_SFX_START + 534)
#define SID_PREVIEW
TypedWhichId<SfxBoolItem>(SID_SFX_START + 1404)
#define SID_FOCUSURLBOX (SID_SFX_START + 1406)
@@ -295,12 +306,12 @@ class SvxSearchItem;
#define SID_ACTIVATE (SID_SFX_START + 525)
#define SID_PRINTOUT (SID_SFX_START + 526)
-#define SID_FILTER_NAME (SID_SFX_START + 530)
-#define SID_DOC_SALVAGE (SID_SFX_START + 531)
+#define SID_FILTER_NAME
TypedWhichId<SfxStringItem>(SID_SFX_START + 530)
+#define SID_DOC_SALVAGE
TypedWhichId<SfxStringItem>(SID_SFX_START + 531)
#define SID_INSERTDOC (SID_SFX_START + 532)
#define SID_TYPE_NAME (SID_SFX_START + 533)
-#define SID_DOC_READONLY (SID_SFX_START + 590)
+#define SID_DOC_READONLY
TypedWhichId<SfxBoolItem>(SID_SFX_START + 590)
#define SID_DOC_MODIFIED (SID_SFX_START + 584)
#define SID_DOC_LOADING (SID_SFX_START + 585)
#define SID_IMG_LOADING (SID_SFX_START + 586)
@@ -312,8 +323,8 @@ class SvxSearchItem;
#define SID_DOCINFO_MAJOR (SID_SFX_START + 594)
#define SID_NEWDOCDIRECT (SID_SFX_START + 537)
#define SID_DOCFRAME (SID_SFX_START + 598)
-#define SID_TARGETNAME (SID_SFX_START + 560)
-#define SID_POSTDATA (SID_SFX_START + 1536)
+#define SID_TARGETNAME
TypedWhichId<SfxStringItem>(SID_SFX_START + 560)
+#define SID_POSTDATA
TypedWhichId<SfxUnoAnyItem>(SID_SFX_START + 1536)
#define SID_DONELINK (SID_SFX_START + 646)
#define SID_REFERER (SID_SFX_START + 654)
#define SID_PAGE_NUMBER (SID_SFX_START + 655)
@@ -321,7 +332,7 @@ class SvxSearchItem;
#define SID_SETOPTIONS (SID_SFX_START + 670)
#define SID_SOURCEVIEW (SID_SFX_START + 675)
#define SID_DOC_STARTPRESENTATION
TypedWhichId<SfxBoolItem>(SID_SFX_START + 695)
-#define SID_DDE_RECONNECT_ONLOAD (SID_SFX_START + 696)
+#define SID_DDE_RECONNECT_ONLOAD
TypedWhichId<SfxBoolItem>(SID_SFX_START + 696)
#define SID_DOCTEMPLATE (SID_SFX_START + 538)
#define SID_AUTOPILOTMENU (SID_SFX_START + 1381)
@@ -362,8 +373,8 @@ class SvxSearchItem;
#define SID_STYLE_UPD_BY_EX_NAME (SID_SFX_START + 1585)
#define SID_STYLE_REFERENCE
TypedWhichId<SfxStringItem>(SID_SFX_START + 1602)
-#define SID_TEMPLATE_NAME (SID_SFX_START + 660)
-#define SID_TEMPLATE_REGIONNAME (SID_SFX_START + 662)
+#define SID_TEMPLATE_NAME
TypedWhichId<SfxStringItem>(SID_SFX_START + 660)
+#define SID_TEMPLATE_REGIONNAME
TypedWhichId<SfxStringItem>(SID_SFX_START + 662)
#define SID_TEMPLATE_LOAD (SID_SFX_START + 663)
#define SID_INSERT_OBJECT (SID_SFX_START + 561)
@@ -385,14 +396,14 @@ class SvxSearchItem;
#define SID_DOCPATH (SID_SFX_START + 582)
#define SID_DOCTITLE
TypedWhichId<SfxStringItem>(SID_SFX_START + 583)
-#define SID_DOCUMENT (SID_SFX_START + 588)
+#define SID_DOCUMENT
TypedWhichId<SfxUnoAnyItem>(SID_SFX_START + 588)
// default-ids for windows
#define SID_COMMAND_POPUP (SID_SFX_START + 610)
#define SID_NEWWINDOW (SID_SFX_START + 620)
#define SID_CLOSEWIN (SID_SFX_START + 621)
-#define SID_VIEWSHELL (SID_SFX_START + 623)
+#define SID_VIEWSHELL
TypedWhichId<SfxUInt16Item>(SID_SFX_START + 623)
#define SID_WIN_FULLSCREEN (SID_SFX_START + 627)
#define SID_VIEWSHELL0 (SID_SFX_START + 630)
@@ -434,7 +445,7 @@ class SvxSearchItem;
// default-ids for macros
#define SID_RECORDING_FLOATWINDOW (SID_SFX_START + 800)
-#define SID_RECORDMACRO (SID_SFX_START + 1669)
+#define SID_RECORDMACRO
TypedWhichId<SfxBoolItem>(SID_SFX_START + 1669)
// Paste Special
#define SID_PASTE_ONLY_TEXT (SID_SFX_START + 802)
@@ -455,7 +466,7 @@ class SvxSearchItem;
#define SID_CONFIG (SID_SFX_START + 904)
#define SID_TOOLBOXOPTIONS (SID_SFX_START + 907)
#define SID_TOGGLEFUNCTIONBAR (SID_SFX_START + 910)
-#define SID_MACROINFO (SID_SFX_START + 919)
+#define SID_MACROINFO
TypedWhichId<SfxMacroInfoItem>(SID_SFX_START + 919)
#define SID_TOGGLESTATUSBAR (SID_SFX_START + 920)
#define SID_CONFIGSTATUSBAR (SID_SFX_START + 921)
#define SID_CONFIGMENU (SID_SFX_START + 924)
@@ -464,7 +475,8 @@ class SvxSearchItem;
#define SID_CFGFILE (SID_SFX_START + 927)
#define SID_SHOWPOPUPS (SID_SFX_START + 929)
-// Item-Id for the assigned event Tabpage
+// Item-Id for the assigned event Tabpage.
+// FIXME this has two different associated pool item types, SvxMacroItem and
SfxBoolItem
#define SID_ATTR_MACROITEM
TypedWhichId<SvxMacroItem>(SID_SFX_START + 934)
#define SID_OPTIONS (SID_SFX_START + 940)
@@ -487,7 +499,7 @@ class SvxSearchItem;
#define SID_OBJECTRESIZE
TypedWhichId<SfxRectangleItem>(SID_SFX_START + 1000)
-#define SID_EVENTCONFIG (SID_SFX_START + 1101)
+#define SID_EVENTCONFIG
TypedWhichId<SfxEventNamesItem>(SID_SFX_START + 1101)
#define SID_VERB_START (SID_SFX_START + 1100)
#define SID_VERB_END (SID_SFX_START + 1121)
@@ -511,15 +523,15 @@ class SvxSearchItem;
#define SID_ATTR_DEFTABSTOP (SID_OPTIONS_START + 14)
#define SID_ATTR_BUTTON_BIGSIZE (SID_OPTIONS_START + 63)
#define SID_ATTR_QUICKLAUNCHER (SID_OPTIONS_START + 74)
-#define SID_ATTR_YEAR2000 (SID_OPTIONS_START + 87)
-#define SID_ATTR_APPLYCHARUNIT (SID_OPTIONS_START + 88)
+#define SID_ATTR_YEAR2000
TypedWhichId<SfxUInt16Item>(SID_OPTIONS_START + 87)
+#define SID_ATTR_APPLYCHARUNIT
TypedWhichId<SfxBoolItem>(SID_OPTIONS_START + 88)
// PathTabPage
#define SID_ATTR_PATHNAME (SID_OPTIONS_START + 11)
// LinguTabPage
-#define SID_ATTR_LANGUAGE (SID_OPTIONS_START + 7)
-#define SID_ATTR_HYPHENREGION (SID_OPTIONS_START + 12)
+#define SID_ATTR_LANGUAGE
TypedWhichId<SvxLanguageItem>(SID_OPTIONS_START + 7)
+#define SID_ATTR_HYPHENREGION
TypedWhichId<SfxHyphenRegionItem>(SID_OPTIONS_START + 12)
#define SID_AUTOSPELL_CHECK (SID_OPTIONS_START + 21)
// InetTabPage
@@ -529,9 +541,9 @@ class SvxSearchItem;
#define SID_SAVEREL_INET (SID_OPTIONS_START + 30)
#define SID_SAVEREL_FSYS (SID_OPTIONS_START + 31)
-#define SID_PASSWORD (SID_OPTIONS_START + 36)
+#define SID_PASSWORD
TypedWhichId<SfxStringItem>(SID_OPTIONS_START + 36)
-#define SID_INET_NOPROXY (SID_OPTIONS_START + 37)
+#define SID_INET_NOPROXY
TypedWhichId<SfxStringItem>(SID_OPTIONS_START + 37)
#define SID_INET_HTTP_PROXY_NAME (SID_OPTIONS_START + 38)
#define SID_INET_HTTP_PROXY_PORT (SID_OPTIONS_START + 39)
@@ -539,9 +551,9 @@ class SvxSearchItem;
#define SID_INET_FTP_PROXY_PORT (SID_OPTIONS_START + 41)
// Automatic update of Styles - manage TabPage
-#define SID_ATTR_AUTO_STYLE_UPDATE (SID_OPTIONS_START + 65)
+#define SID_ATTR_AUTO_STYLE_UPDATE
TypedWhichId<SfxBoolItem>(SID_OPTIONS_START + 65)
-#define SID_SECURE_URL (SID_OPTIONS_START + 66)
+#define SID_SECURE_URL
TypedWhichId<SfxStringListItem>(SID_OPTIONS_START + 66)
// configured locale changed
#define SID_OPT_LOCALE_CHANGED (SID_OPTIONS_START + 94)
@@ -698,7 +710,7 @@ class SvxSearchItem;
#define FN_REDLINE_PROTECT (FN_EDIT2 + 23)
#define FN_REDLINE_ON (FN_EDIT2 + 25)
-#define SID_HTML_MODE (SID_SVX_START + 414)
+#define SID_HTML_MODE TypedWhichId<SfxUInt16Item>(SID_SVX_START +
414)
// Calc-Id's used for SfxSecurityPage
#ifndef SC_FUNCTION_START
diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc
index 573f036128c8..e222697abbbd 100644
--- a/include/svx/svxids.hrc
+++ b/include/svx/svxids.hrc
@@ -24,34 +24,40 @@
#include <editeng/editids.hrc>
#include <svl/typedwhich.hxx>
+class SdrAngleItem;
+class SfxBoolItem;
class SfxInt32Item;
+class SfxInt64Item;
+class SfxIntegerListItem;
class SfxPointItem;
-class SfxBoolItem;
-class SfxUInt32Item;
class SfxRectangleItem;
-class SvxPageItem;
-class SvxSizeItem;
-class SvxLongULSpaceItem;
-class SvxLongLRSpaceItem;
-class SvxPostItAuthorItem;
-class SvxPostItDateItem;
-class SvxPostItTextItem;
-class SvxPostItIdItem;
-class SvxColorListItem;
+class SfxStringItem;
+class SfxUInt32Item;
+class SvxBitmapListItem;
+class SvxBoxInfoItem;
+class SvxBrushItem;
+class SvxChartColorTableItem;
class SvxColorItem;
+class SvxColorListItem;
+class SvxDashListItem;
class SvxGradientListItem;
-class SvxRulerItem;
-class SvxNumberInfoItem;
+class SvxGridItem;
class SvxHatchListItem;
-class SvxBitmapListItem;
-class SvxPatternListItem;
-class SvxDashListItem;
class SvxLineEndListItem;
class SvxLineItem;
-class SvxBoxInfoItem;
-class SfxStringItem;
+class SvxLongLRSpaceItem;
+class SvxLongULSpaceItem;
+class SvxNumberInfoItem;
+class SvxPageItem;
+class SvxPatternListItem;
+class SvxPostItAuthorItem;
+class SvxPostItDateItem;
+class SvxPostItIdItem;
+class SvxPostItTextItem;
+class SvxRulerItem;
class SvxSetItem;
-class SdrAngleItem;
+class SvxSizeItem;
+class SvxViewLayoutItem;
// member IDs
@@ -83,7 +89,7 @@ class SdrAngleItem;
#define FID_SEARCH_OFF (FID_SVX_START + 1)
#define FID_SEARCH_NOW (FID_SVX_START + 2)
-#define SID_CHARMAP (FID_SVX_START + 3)
+#define SID_CHARMAP
TypedWhichId<SfxStringItem>(FID_SVX_START + 3)
#define FID_SEARCH_SEARCHSET (FID_SVX_START + 4)
#define FID_SEARCH_REPLACESET (FID_SVX_START + 5)
@@ -150,12 +156,12 @@ class SdrAngleItem;
#define SID_DASH (SID_SD_START+267)
#define SID_TEXT_FITTOSIZE_VERTICAL (SID_SD_START+286)
#define SID_GRID_VISIBLE (SID_SD_START+322)
-#define ID_VAL_USEFIRSTROWSTYLE (SID_SD_START+323)
-#define ID_VAL_USELASTROWSTYLE (SID_SD_START+324)
-#define ID_VAL_USEBANDINGROWSTYLE (SID_SD_START+325)
-#define ID_VAL_USEFIRSTCOLUMNSTYLE (SID_SD_START+326)
-#define ID_VAL_USELASTCOLUMNSTYLE (SID_SD_START+327)
-#define ID_VAL_USEBANDINGCOLUMNSTYLE (SID_SD_START+328)
+#define ID_VAL_USEFIRSTROWSTYLE
TypedWhichId<SfxBoolItem>(SID_SD_START+323)
+#define ID_VAL_USELASTROWSTYLE
TypedWhichId<SfxBoolItem>(SID_SD_START+324)
+#define ID_VAL_USEBANDINGROWSTYLE
TypedWhichId<SfxBoolItem>(SID_SD_START+325)
+#define ID_VAL_USEFIRSTCOLUMNSTYLE
TypedWhichId<SfxBoolItem>(SID_SD_START+326)
+#define ID_VAL_USELASTCOLUMNSTYLE
TypedWhichId<SfxBoolItem>(SID_SD_START+327)
+#define ID_VAL_USEBANDINGCOLUMNSTYLE
TypedWhichId<SfxBoolItem>(SID_SD_START+328)
// Writer IDs
@@ -393,20 +399,20 @@ class SdrAngleItem;
#define SID_SET_SUB_SCRIPT ( SID_SVX_START + 295 )
#define SID_CHAR_DLG ( SID_SVX_START + 296 )
#define SID_PARA_DLG ( SID_SVX_START + 297 )
-#define SID_ATTR_GRID_OPTIONS ( SID_SVX_START + 298 )
+#define SID_ATTR_GRID_OPTIONS
TypedWhichId<SvxGridItem>( SID_SVX_START + 298 )
#define SID_ATTR_FILL_SHADOW ( SID_SVX_START + 299 )
// CAUTION! Range <300 .. 300> used by EditEngine (!)
#define SID_ATTR_LINEEND_STYLE ( SID_SVX_START + 301 )
-#define SID_ATTR_TRANSFORM_SHEAR ( SID_SVX_START + 304 )
+#define SID_ATTR_TRANSFORM_SHEAR
TypedWhichId<SdrAngleItem>( SID_SVX_START + 304 )
#define SID_ATTR_TRANSFORM_SHEAR_X ( SID_SVX_START + 305 )
#define SID_ATTR_TRANSFORM_SHEAR_Y ( SID_SVX_START + 306 )
-#define SID_ATTR_TRANSFORM_SHEAR_VERTICAL ( SID_SVX_START + 307 )
+#define SID_ATTR_TRANSFORM_SHEAR_VERTICAL
TypedWhichId<SfxBoolItem>( SID_SVX_START + 307 )
#define SID_ATTR_TRANSFORM_RESIZE_REF_X ( SID_SVX_START + 308 )
#define SID_ATTR_TRANSFORM_RESIZE_REF_Y ( SID_SVX_START + 309 )
-#define SID_ATTR_TRANSFORM_AUTOWIDTH ( SID_SVX_START + 310 )
-#define SID_ATTR_TRANSFORM_AUTOHEIGHT ( SID_SVX_START + 311 )
+#define SID_ATTR_TRANSFORM_AUTOWIDTH
TypedWhichId<SfxBoolItem>( SID_SVX_START + 310 )
+#define SID_ATTR_TRANSFORM_AUTOHEIGHT
TypedWhichId<SfxBoolItem>( SID_SVX_START + 311 )
#define SID_ATTR_TRANSFORM_HORI_RELATION ( SID_SVX_START + 312 )
#define SID_ATTR_TRANSFORM_VERT_RELATION ( SID_SVX_START + 313 )
#define SID_ATTR_TRANSFORM_HORI_ORIENT ( SID_SVX_START + 314 )
@@ -471,7 +477,7 @@ class SdrAngleItem;
#define SID_DRAWTBX_RECTANGLES ( SID_SVX_START + 399 )
#define SID_DRAWTBX_ELLIPSES ( SID_SVX_START + 400 )
#define SID_DRAWTBX_LINES ( SID_SVX_START + 401 )
-#define SID_BACKGRND_DESTINATION ( SID_SVX_START + 404 )
+#define SID_BACKGRND_DESTINATION
TypedWhichId<SfxUInt16Item>( SID_SVX_START + 404 )
#define SID_ATTR_FLASH ( SID_SVX_START + 406 )
// CAUTION! Range <413 .. 413> used by EditEngine (!)
@@ -487,13 +493,13 @@ class SdrAngleItem;
#define SID_TABLE_INSERT_ROW_BEFORE ( SID_SVX_START + 420 )
#define SID_TABLE_INSERT_ROW_AFTER ( SID_SVX_START + 421 )
-#define SID_ATTR_3D_INTERN ( SID_SVX_START + 422 )
+#define SID_ATTR_3D_INTERN
TypedWhichId<SfxUInt32Item>( SID_SVX_START + 422 )
#define SID_PSZ_FUNCTION ( SID_SVX_START + 423 )
// CAUTION! <424 > used by sfxids (!)
#define SID_TABLE_INSERT_COL_DLG ( SID_SVX_START + 426 )
#define SID_TABLE_INSERT_ROW_DLG ( SID_SVX_START + 427 )
-#define SID_TABLE_PARAM_INSERT_AFTER ( SID_SVX_START + 428 )
+#define SID_TABLE_PARAM_INSERT_AFTER
TypedWhichId<SfxBoolItem>( SID_SVX_START + 428 )
#define SID_TABLEDESIGN ( SID_SVX_START + 429 )
#define SID_GENERAL_OPTIONS ( SID_SVX_START + 432 )
@@ -501,7 +507,7 @@ class SdrAngleItem;
#define SID_SD_EDITOPTIONS ( SID_SVX_START + 434 )
#define SID_SC_EDITOPTIONS ( SID_SVX_START + 435 )
#define SID_SM_EDITOPTIONS ( SID_SVX_START + 436 )
-#define SID_SCH_EDITOPTIONS ( SID_SVX_START + 437 )
+#define SID_SCH_EDITOPTIONS
TypedWhichId<SvxChartColorTableItem>( SID_SVX_START + 437 )
#define SID_SW_ONLINEOPTIONS ( SID_SVX_START + 439 )
#define SID_GET_COLORLIST ( SID_SVX_START + 441 )
#define SID_OUTLINE_TO_IMPRESS ( SID_SVX_START + 443 )
@@ -705,10 +711,10 @@ class SdrAngleItem;
#define SID_ATTR_GRAF_KEEP_ZOOM ( SID_SVX_START + 882 )
#define SID_ATTR_GRAF_CROP ( SID_SVX_START + 883 )
-#define SID_ATTR_GRAF_FRMSIZE ( SID_SVX_START + 884 )
+#define SID_ATTR_GRAF_FRMSIZE
TypedWhichId<SvxSizeItem>( SID_SVX_START + 884 )
#define SID_ATTR_GRAF_FRMSIZE_PERCENT ( SID_SVX_START + 885 )
-#define SID_ATTR_GRAF_GRAPHIC ( SID_SVX_START + 886 )
-#define SID_DRAW_TEXT_VERTICAL
SID_ATTR_CHAR_VERTICAL
+#define SID_ATTR_GRAF_GRAPHIC
TypedWhichId<SvxBrushItem>( SID_SVX_START + 886 )
+#define SID_DRAW_TEXT_VERTICAL SID_ATTR_CHAR_VERTICAL
// CAUTION! Range <887 .. 903> used by EditEngine (!)
@@ -953,8 +959,8 @@ class SdrAngleItem;
#define FN_SVX_SET_BULLET ( SID_SVX_START + 1137
)
#define FN_SVX_SET_OUTLINE ( SID_SVX_START + 1138
)
-#define SID_ATTR_BORDER_STYLES ( SID_SVX_START + 1140
)
-#define SID_ATTR_BORDER_DEFAULT_WIDTH ( SID_SVX_START + 1141
)
+#define SID_ATTR_BORDER_STYLES
TypedWhichId<SfxIntegerListItem>( SID_SVX_START + 1140 )
+#define SID_ATTR_BORDER_DEFAULT_WIDTH
TypedWhichId<SfxInt64Item>( SID_SVX_START + 1141 )
// 1142 is used by editeng (SID_ATTR_CHAR_GRABBAG)
#define SID_OFFER_IMPORT ( SID_SVX_START + 1143
)
@@ -1029,11 +1035,11 @@ class SdrAngleItem;
#define SID_ATTR_POSTIT_POSITION_Y
TypedWhichId<SfxInt32Item>( SID_SVX_START + 1205 )
#define SID_INSERT_TREECONTROL ( SID_SVX_START + 1206
)
-#define SID_ATTR_VIEWLAYOUT ( SID_SVX_START + 1207
)
+#define SID_ATTR_VIEWLAYOUT
TypedWhichId<SvxViewLayoutItem>( SID_SVX_START + 1207 )
#define SID_ATTR_ZOOMSLIDER ( SID_SVX_START + 1208
)
#define SID_LANGUAGE_STATUS ( SID_SVX_START + 1209
)
#define SID_CHAR_DLG_FOR_PARAGRAPH ( SID_SVX_START + 1210
)
-#define SID_SET_DOCUMENT_LANGUAGE ( SID_SVX_START + 1211
)
+#define SID_SET_DOCUMENT_LANGUAGE
TypedWhichId<SfxBoolItem>( SID_SVX_START + 1211 )
// IMPORTANT NOTE: adjust SID_SVX_FIRSTFREE, when adding new slot id
#define SID_SVX_FIRSTFREE ( SID_SVX_START + 1211
+ 1 )
diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx
index 1b275ea828d9..a891fdc14a97 100644
--- a/sc/source/filter/xml/xmlwrap.cxx
+++ b/sc/source/filter/xml/xmlwrap.cxx
@@ -361,8 +361,8 @@ bool ScXMLImportWrapper::Import( ImportFlags nMode,
ErrCode& rError )
{
if ( pMedium && pMedium->GetItemSet() )
{
- const SfxStringItem* pDocHierarchItem = static_cast<const
SfxStringItem*>(
- pMedium->GetItemSet()->GetItem(SID_DOC_HIERARCHICALNAME) );
+ const SfxStringItem* pDocHierarchItem =
+ pMedium->GetItemSet()->GetItem(SID_DOC_HIERARCHICALNAME);
if ( pDocHierarchItem )
aName = pDocHierarchItem->GetValue();
}
@@ -827,8 +827,8 @@ bool ScXMLImportWrapper::Export(bool bStylesOnly)
OUString aName("dummyObjectName");
if ( pMedium && pMedium->GetItemSet() )
{
- const SfxStringItem* pDocHierarchItem = static_cast<const
SfxStringItem*>(
- pMedium->GetItemSet()->GetItem(SID_DOC_HIERARCHICALNAME) );
+ const SfxStringItem* pDocHierarchItem =
+ pMedium->GetItemSet()->GetItem(SID_DOC_HIERARCHICALNAME);
if ( pDocHierarchItem )
aName = pDocHierarchItem->GetValue();
}
diff --git a/sd/source/filter/sdfilter.cxx b/sd/source/filter/sdfilter.cxx
index 7e55cac4d1b8..11ad11d7617a 100644
--- a/sd/source/filter/sdfilter.cxx
+++ b/sd/source/filter/sdfilter.cxx
@@ -97,8 +97,8 @@ void SdFilter::Preload()
void SdFilter::CreateStatusIndicator()
{
// The status indicator must be retrieved from the provided medium
arguments
- const SfxUnoAnyItem* pStatusBarItem = static_cast<const SfxUnoAnyItem*>(
- mrMedium.GetItemSet()->GetItem(SID_PROGRESS_STATUSBAR_CONTROL) );
+ const SfxUnoAnyItem* pStatusBarItem =
+ mrMedium.GetItemSet()->GetItem(SID_PROGRESS_STATUSBAR_CONTROL);
if ( pStatusBarItem )
pStatusBarItem->GetValue() >>= mxStatusIndicator;
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx
b/sd/source/filter/xml/sdxmlwrp.cxx
index bc757626df3c..126d031a03be 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -508,8 +508,7 @@ bool SdXMLFilter::Import( ErrCode& nError )
SfxItemSet* pSet = mrMedium.GetItemSet();
if(pSet)
{
- const SfxUnoAnyItem* pItem = static_cast<const SfxUnoAnyItem*>(
- pSet->GetItem(SID_PROGRESS_STATUSBAR_CONTROL) );
+ const SfxUnoAnyItem* pItem =
pSet->GetItem(SID_PROGRESS_STATUSBAR_CONTROL);
if (pItem)
{
pItem->GetValue() >>= mxStatusIndicator;
@@ -565,8 +564,8 @@ bool SdXMLFilter::Import( ErrCode& nError )
OUString aName;
if ( mrMedium.GetItemSet() )
{
- const SfxStringItem* pDocHierarchItem = static_cast<const
SfxStringItem*>(
- mrMedium.GetItemSet()->GetItem(SID_DOC_HIERARCHICALNAME) );
+ const SfxStringItem* pDocHierarchItem =
+ mrMedium.GetItemSet()->GetItem(SID_DOC_HIERARCHICALNAME);
if ( pDocHierarchItem )
aName = pDocHierarchItem->GetValue();
}
@@ -802,8 +801,8 @@ bool SdXMLFilter::Export()
OUString aName;
if ( mrMedium.GetItemSet() )
{
- const SfxStringItem* pDocHierarchItem = static_cast<const
SfxStringItem*>(
- mrMedium.GetItemSet()->GetItem(SID_DOC_HIERARCHICALNAME) );
+ const SfxStringItem* pDocHierarchItem =
+ mrMedium.GetItemSet()->GetItem(SID_DOC_HIERARCHICALNAME);
if ( pDocHierarchItem )
aName = pDocHierarchItem->GetValue();
}
diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx
index 7f8e44b6b1b1..74c40dffcd1c 100644
--- a/sd/source/ui/app/sdmod1.cxx
+++ b/sd/source/ui/app/sdmod1.cxx
@@ -161,9 +161,9 @@ void SdModule::Execute(SfxRequest& rReq)
LanguageType eLanguage = static_cast<const
SvxLanguageItem*>(pItem)->GetValue();
SdDrawDocument* pDoc = pDocSh->GetDoc();
- if( nSlotId == SID_ATTR_CHAR_CJK_LANGUAGE )
+ if( nSlotId == sal_uInt16(SID_ATTR_CHAR_CJK_LANGUAGE) )
pDoc->SetLanguage( eLanguage, EE_CHAR_LANGUAGE_CJK );
- else if( nSlotId == SID_ATTR_CHAR_CTL_LANGUAGE )
+ else if( nSlotId == sal_uInt16(SID_ATTR_CHAR_CTL_LANGUAGE)
)
pDoc->SetLanguage( eLanguage, EE_CHAR_LANGUAGE_CTL );
else
pDoc->SetLanguage( eLanguage, EE_CHAR_LANGUAGE );
diff --git a/starmath/source/mathml/export.cxx
b/starmath/source/mathml/export.cxx
index 3254ca58b3d2..f439d537e7b3 100644
--- a/starmath/source/mathml/export.cxx
+++ b/starmath/source/mathml/export.cxx
@@ -120,11 +120,11 @@ bool SmMLExportWrapper::Export(SfxMedium& rMedium)
}
// Fetch progress bar
- auto pItem = pMediumItemSet->GetItem(SID_PROGRESS_STATUSBAR_CONTROL);
+ const SfxUnoAnyItem* pItem =
pMediumItemSet->GetItem(SID_PROGRESS_STATUSBAR_CONTROL);
if (pItem)
{
// set progress range and start status indicator
- static_cast<const SfxUnoAnyItem*>(pItem)->GetValue() >>=
xStatusIndicator;
+ pItem->GetValue() >>= xStatusIndicator;
xStatusIndicator->start(SmResId(STR_STATSTR_WRITING), 3);
xStatusIndicator->setValue(0);
}
@@ -163,10 +163,11 @@ bool SmMLExportWrapper::Export(SfxMedium& rMedium)
// TODO/LATER: handle the case of embedded links gracefully
if (bEmbedded) //&& !pStg->IsRoot() )
{
- auto pDocHierarchItem =
pMediumItemSet->GetItem(SID_DOC_HIERARCHICALNAME);
+ const SfxStringItem* pDocHierarchItem
+ = pMediumItemSet->GetItem(SID_DOC_HIERARCHICALNAME);
if (pDocHierarchItem != nullptr)
{
- OUString aName = static_cast<const
SfxStringItem*>(pDocHierarchItem)->GetValue();
+ OUString aName = pDocHierarchItem->GetValue();
if (!aName.isEmpty())
xInfoSet->setPropertyValue("StreamRelPath",
makeAny(aName));
}
diff --git a/starmath/source/mathml/import.cxx
b/starmath/source/mathml/import.cxx
index efafcbf89005..6a3ea6104d1a 100644
--- a/starmath/source/mathml/import.cxx
+++ b/starmath/source/mathml/import.cxx
@@ -137,8 +137,7 @@ ErrCode SmMLImportWrapper::Import(SfxMedium& rMedium)
SfxItemSet* pSet = rMedium.GetItemSet();
if (pSet)
{
- const SfxUnoAnyItem* pItem
- = static_cast<const
SfxUnoAnyItem*>(pSet->GetItem(SID_PROGRESS_STATUSBAR_CONTROL));
+ const SfxUnoAnyItem* pItem =
pSet->GetItem(SID_PROGRESS_STATUSBAR_CONTROL);
if (pItem != nullptr)
pItem->GetValue() >>= xStatusIndicator;
}
@@ -180,8 +179,8 @@ ErrCode SmMLImportWrapper::Import(SfxMedium& rMedium)
OUString aName(u"dummyObjName");
if (rMedium.GetItemSet())
{
- const SfxStringItem* pDocHierarchItem = static_cast<const
SfxStringItem*>(
- rMedium.GetItemSet()->GetItem(SID_DOC_HIERARCHICALNAME));
+ const SfxStringItem* pDocHierarchItem
+ = rMedium.GetItemSet()->GetItem(SID_DOC_HIERARCHICALNAME);
if (pDocHierarchItem != nullptr)
aName = pDocHierarchItem->GetValue();
}
diff --git a/starmath/source/mathml/mathmlexport.cxx
b/starmath/source/mathml/mathmlexport.cxx
index d0f5089e241c..ec8bb1d61395 100644
--- a/starmath/source/mathml/mathmlexport.cxx
+++ b/starmath/source/mathml/mathmlexport.cxx
@@ -115,8 +115,7 @@ bool SmXMLExportWrapper::Export(SfxMedium& rMedium)
SfxItemSet* pSet = rMedium.GetItemSet();
if (pSet)
{
- const SfxUnoAnyItem* pItem = static_cast<const SfxUnoAnyItem*>(
- pSet->GetItem(SID_PROGRESS_STATUSBAR_CONTROL));
+ const SfxUnoAnyItem* pItem =
pSet->GetItem(SID_PROGRESS_STATUSBAR_CONTROL);
if (pItem)
pItem->GetValue() >>= xStatusIndicator;
}
@@ -166,8 +165,8 @@ bool SmXMLExportWrapper::Export(SfxMedium& rMedium)
OUString aName;
if (rMedium.GetItemSet())
{
- const SfxStringItem* pDocHierarchItem = static_cast<const
SfxStringItem*>(
- rMedium.GetItemSet()->GetItem(SID_DOC_HIERARCHICALNAME));
+ const SfxStringItem* pDocHierarchItem
+ = rMedium.GetItemSet()->GetItem(SID_DOC_HIERARCHICALNAME);
if (pDocHierarchItem)
aName = pDocHierarchItem->GetValue();
}
diff --git a/starmath/source/mathml/mathmlimport.cxx
b/starmath/source/mathml/mathmlimport.cxx
index f9068548af4b..6b96cd9a4ed1 100644
--- a/starmath/source/mathml/mathmlimport.cxx
+++ b/starmath/source/mathml/mathmlimport.cxx
@@ -116,8 +116,7 @@ ErrCode SmXMLImportWrapper::Import(SfxMedium& rMedium)
SfxItemSet* pSet = rMedium.GetItemSet();
if (pSet)
{
- const SfxUnoAnyItem* pItem
- = static_cast<const
SfxUnoAnyItem*>(pSet->GetItem(SID_PROGRESS_STATUSBAR_CONTROL));
+ const SfxUnoAnyItem* pItem =
pSet->GetItem(SID_PROGRESS_STATUSBAR_CONTROL);
if (pItem)
pItem->GetValue() >>= xStatusIndicator;
}
@@ -168,8 +167,8 @@ ErrCode SmXMLImportWrapper::Import(SfxMedium& rMedium)
OUString aName("dummyObjName");
if (rMedium.GetItemSet())
{
- const SfxStringItem* pDocHierarchItem = static_cast<const
SfxStringItem*>(
- rMedium.GetItemSet()->GetItem(SID_DOC_HIERARCHICALNAME));
+ const SfxStringItem* pDocHierarchItem
+ = rMedium.GetItemSet()->GetItem(SID_DOC_HIERARCHICALNAME);
if (pDocHierarchItem)
aName = pDocHierarchItem->GetValue();
}
diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx
index 3af57b7da229..ea98892f5d78 100644
--- a/svx/source/svdraw/svdedtv1.cxx
+++ b/svx/source/svdraw/svdedtv1.cxx
@@ -1636,7 +1636,7 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet&
rAttr, bool addPageMargin
if (nNewShearAngle>SDRMAXSHEAR) nNewShearAngle=SDRMAXSHEAR;
if (nNewShearAngle<-SDRMAXSHEAR) nNewShearAngle=-SDRMAXSHEAR;
if (nNewShearAngle!=nOldShearAngle) {
- bShearVert=static_cast<const
SfxBoolItem&>(rAttr.Get(SID_ATTR_TRANSFORM_SHEAR_VERTICAL)).GetValue();
+ bShearVert =
rAttr.Get(SID_ATTR_TRANSFORM_SHEAR_VERTICAL).GetValue();
if (bShearVert) {
nShearAngle=nNewShearAngle;
} else {
diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx
index 22631d149691..78dab1e0df2b 100644
--- a/svx/source/tbxctrls/grafctrl.cxx
+++ b/svx/source/tbxctrls/grafctrl.cxx
@@ -681,7 +681,7 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq,
SdrView& rView )
if( SfxItemState::SET <= pOutAttr->GetItemState(
SID_ATTR_GRAF_FRMSIZE ) )
{
Point aNewOrigin(
pObj->GetLogicRect().TopLeft() );
- const Size& rGrfSize = static_cast<const
SvxSizeItem&>( pOutAttr->Get( SID_ATTR_GRAF_FRMSIZE ) ).GetSize();
+ const Size& rGrfSize = pOutAttr->Get(
SID_ATTR_GRAF_FRMSIZE ).GetSize();
Size aNewGrfSize = o3tl::convert(rGrfSize,
o3tl::Length::twip, o3tl::Length::mm100);
Size aOldGrfSize(
pObj->GetLogicRect().GetSize() );
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index 5b74af04e794..234a802a4753 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -622,8 +622,8 @@ ErrCode XMLReader::Read( SwDoc &rDoc, const OUString&
rBaseURL, SwPaM &rPaM, con
SfxItemSet* pSet = pDocSh->GetMedium()->GetItemSet();
if (pSet)
{
- const SfxUnoAnyItem* pItem = static_cast<const SfxUnoAnyItem*>(
- pSet->GetItem(SID_PROGRESS_STATUSBAR_CONTROL) );
+ const SfxUnoAnyItem* pItem =
+ pSet->GetItem(SID_PROGRESS_STATUSBAR_CONTROL);
if (pItem)
{
pItem->GetValue() >>= xStatusIndicator;
@@ -724,8 +724,8 @@ ErrCode XMLReader::Read( SwDoc &rDoc, const OUString&
rBaseURL, SwPaM &rPaM, con
{
if ( pMedDescrMedium && pMedDescrMedium->GetItemSet() )
{
- const SfxStringItem* pDocHierarchItem = static_cast<const
SfxStringItem*>(
-
pMedDescrMedium->GetItemSet()->GetItem(SID_DOC_HIERARCHICALNAME) );
+ const SfxStringItem* pDocHierarchItem =
+
pMedDescrMedium->GetItemSet()->GetItem(SID_DOC_HIERARCHICALNAME);
if ( pDocHierarchItem )
StreamPath = pDocHierarchItem->GetValue();
}
diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx
index bd7c74c98282..1d55cad903d2 100644
--- a/sw/source/filter/xml/wrtxml.cxx
+++ b/sw/source/filter/xml/wrtxml.cxx
@@ -90,12 +90,12 @@ ErrCode SwXMLWriter::Write_(const SfxItemSet*
pMediumItemSet)
if (pMediumItemSet)
{
- const SfxUnoAnyItem* pStatusBarItem = static_cast<const
SfxUnoAnyItem*>(
- pMediumItemSet->GetItem(SID_PROGRESS_STATUSBAR_CONTROL));
+ const SfxUnoAnyItem* pStatusBarItem =
+ pMediumItemSet->GetItem(SID_PROGRESS_STATUSBAR_CONTROL);
if (pStatusBarItem)
pStatusBarItem->GetValue() >>= xStatusIndicator;
- const SfxStringItem* pDocHierarchItem = static_cast<const
SfxStringItem*>(
- pMediumItemSet->GetItem(SID_DOC_HIERARCHICALNAME));
+ const SfxStringItem* pDocHierarchItem =
+ pMediumItemSet->GetItem(SID_DOC_HIERARCHICALNAME);
if (pDocHierarchItem)
aDocHierarchicalName = pDocHierarchItem->GetValue();
const SfxBoolItem* pNoEmbDS =
pMediumItemSet->GetItem(SID_NO_EMBEDDED_DS);
