loplugin:constantparam

Change-Id: Ib92aba17c46a4ada75c2a0630f281759d995f32e
Reviewed-on: https://gerrit.libreoffice.org/40843
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

69 files changed, 1083 insertions, 1116 deletions

diff --git a/compilerplugins/clang/constantparam.bitmask.results b/compilerplugins/clang/constantparam.bitmask.results
index 975005fc2817..da025efc323b 100644
--- a/compilerplugins/clang/constantparam.bitmask.results
+++ b/compilerplugins/clang/constantparam.bitmask.results
@@ -13,10 +13,13 @@ dbaccess/source/filter/xml/xmlExport.hxx:172
 include/framework/framelistanalyzer.hxx:181
     void framework::FrameListAnalyzer::FrameListAnalyzer(const class com::sun::star::uno::Reference<class com::sun::star::frame::XFramesSupplier> &,const class com::sun::star::uno::Reference<class com::sun::star::frame::XFrame> &,enum FrameAnalyzerFlags)
     enum FrameAnalyzerFlags eDetectMode setBits=0x4
-include/svl/itemset.hxx:134
+include/sfx2/objsh.hxx:458
+    void SfxObjectShell::FinishedLoading(enum SfxLoadedFlags)
+    enum SfxLoadedFlags nWhich setBits=0x1
+include/svl/itemset.hxx:188
     void SfxItemSet::PutExtended(const class SfxItemSet &,enum SfxItemState,enum SfxItemState)
     enum SfxItemState eDefaultAs setBits=0x20 clearBits=0xf
-include/svtools/brwbox.hxx:441
+include/svtools/brwbox.hxx:439
     void BrowseBox::InsertDataColumn(unsigned short,const class rtl::OUString &,long,enum HeaderBarItemBits,unsigned short)
     enum HeaderBarItemBits nBits setBits=0x410 clearBits=0x3ac
 include/svtools/wizardmachine.hxx:173
@@ -32,7 +35,7 @@ sc/inc/rangelst.hxx:45
     void ScRangeList::Format(class rtl::OUString &,enum ScRefFlags,class ScDocument *,enum formula::FormulaGrammar::AddressConvention,char16_t) const
     enum ScRefFlags nFlags setBits=0x8000 clearBits=0x7f80
 sc/inc/xmlwrap.hxx:92
-    _Bool ScXMLImportWrapper::Import(enum ImportFlags,unsigned int &)
+    _Bool ScXMLImportWrapper::Import(enum ImportFlags,class ErrCode &)
     enum ImportFlags nMode setBits=0x1
 xmloff/inc/MetaExportComponent.hxx:32
     void XMLMetaExportComponent::XMLMetaExportComponent(const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &,const class rtl::OUString &,enum SvXMLExportFlags)
diff --git a/compilerplugins/clang/constantparam.booleans.results b/compilerplugins/clang/constantparam.booleans.results
index 494984d75268..c07a9bd35a31 100644
--- a/compilerplugins/clang/constantparam.booleans.results
+++ b/compilerplugins/clang/constantparam.booleans.results
@@ -34,6 +34,10 @@ chart2/qa/extras/chart2dump/chart2dump.cxx:99
     void Chart2DumpTest::Chart2DumpTest(_Bool)
     _Bool bDumpMode
     0
+chart2/qa/extras/chart2export.cxx:789
+    void ::change(const class com::sun::star::uno::Reference<class com::sun::star::chart2::XChartDocument> &,_Bool,short)
+    _Bool bSetNumFmtLinked
+    0
 chart2/source/controller/dialogs/ChartTypeDialogController.hxx:55
     void chart::ChartTypeParameter::ChartTypeParameter(int,_Bool,_Bool,enum chart::GlobalStackMode,_Bool,_Bool,enum com::sun::star::chart2::CurveStyle)
     enum com::sun::star::chart2::CurveStyle eCurveStyle
@@ -42,11 +46,11 @@ chart2/source/controller/dialogs/DataBrowserModel.cxx:223
     void chart::DataBrowserModel::tDataColumn::tDataColumn(const class com::sun::star::uno::Reference<class com::sun::star::chart2::XDataSeries> &,const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::chart2::data::XLabeledDataSequence> &,enum chart::DataBrowserModel::eCellType,int)
     enum chart::DataBrowserModel::eCellType aCellType
     0
-chart2/source/controller/dialogs/DialogModel.cxx:190
+chart2/source/controller/dialogs/DialogModel.cxx:188
     struct (anonymous namespace)::lcl_DataSeriesContainerAppend & (anonymous namespace)::lcl_DataSeriesContainerAppend::operator++(int)
     int 
     0
-chart2/source/controller/dialogs/DialogModel.cxx:252
+chart2/source/controller/dialogs/DialogModel.cxx:250
     struct (anonymous namespace)::lcl_RolesWithRangeAppend & (anonymous namespace)::lcl_RolesWithRangeAppend::operator++(int)
     int 
     0
@@ -54,6 +58,10 @@ chart2/source/controller/inc/ChartController.hxx:360
     class chart::ChartController::TheModelRef & chart::ChartController::TheModelRef::operator=(class chart::ChartController::TheModel *)
      ###1
     0
+chart2/source/controller/inc/ViewElementListProvider.hxx:50
+    class Graphic chart::ViewElementListProvider::GetSymbolGraphic(int,const class SfxItemSet *) const
+    int nStandardSymbol
+    0
 chart2/source/model/template/ColumnLineChartTypeTemplate.hxx:38
     void chart::ColumnLineChartTypeTemplate::ColumnLineChartTypeTemplate(const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &,const class rtl::OUString &,enum chart::StackMode,int)
     int nNumberOfLines
@@ -110,7 +118,7 @@ chart2/source/view/inc/VSeriesPlotter.hxx:59
     int chart::AxesNumberFormats::getFormat(int,int) const
     int nDimIndex
     1
-chart2/source/view/main/VButton.hxx:44
+chart2/source/view/main/VButton.hxx:45
     void chart::VButton::showArrow(_Bool)
     _Bool bShowArrow
     0
@@ -118,10 +126,6 @@ codemaker/source/javamaker/classfile.hxx:120
     void codemaker::javamaker::ClassFile::Code::storeLocalReference(unsigned short)
     unsigned short index
     1
-compilerplugins/clang/test/stringconstant.cxx:20
-    void Foo::Foo(const class rtl::OUString &,int)
-    int 
-    1
 connectivity/source/drivers/postgresql/pq_connection.cxx:415
     void pq_sdbc_driver::cstr_vector::push_back(const char *,enum __sal_NoAcquire)
     enum __sal_NoAcquire 
@@ -138,7 +142,7 @@ connectivity/source/inc/OColumn.hxx:72
     void connectivity::OColumn::OColumn(const class rtl::OUString &,const class rtl::OUString &,int,int,int,int,int)
     int _aScale
     0
-cui/source/inc/cuitabarea.hxx:779
+cui/source/inc/cuitabarea.hxx:754
     void SvxColorTabPage::SetPropertyList(enum XPropertyListType,const class rtl::Reference<class XPropertyList> &)
     enum XPropertyListType t
     0
@@ -166,19 +170,19 @@ cui/source/options/optjsearch.hxx:71
     void SvxJSearchOptionsPage::EnableSaveOptions(_Bool)
     _Bool bVal
     0
-dbaccess/source/core/dataaccess/databasedocument.hxx:658
+dbaccess/source/core/dataaccess/databasedocument.hxx:659
     void dbaccess::DocumentGuard::DocumentGuard(const class dbaccess::ODatabaseDocument &,enum dbaccess::DocumentGuard::DefaultMethod_)
     enum dbaccess::DocumentGuard::DefaultMethod_ 
     0
-dbaccess/source/core/dataaccess/databasedocument.hxx:676
+dbaccess/source/core/dataaccess/databasedocument.hxx:677
     void dbaccess::DocumentGuard::DocumentGuard(const class dbaccess::ODatabaseDocument &,enum dbaccess::DocumentGuard::InitMethod_)
     enum dbaccess::DocumentGuard::InitMethod_ 
     0
-dbaccess/source/core/dataaccess/databasedocument.hxx:695
+dbaccess/source/core/dataaccess/databasedocument.hxx:696
     void dbaccess::DocumentGuard::DocumentGuard(const class dbaccess::ODatabaseDocument &,enum dbaccess::DocumentGuard::MethodUsedDuringInit_)
     enum dbaccess::DocumentGuard::MethodUsedDuringInit_ 
     0
-dbaccess/source/core/dataaccess/databasedocument.hxx:710
+dbaccess/source/core/dataaccess/databasedocument.hxx:711
     void dbaccess::DocumentGuard::DocumentGuard(const class dbaccess::ODatabaseDocument &,enum dbaccess::DocumentGuard::MethodWithoutInit_)
     enum dbaccess::DocumentGuard::MethodWithoutInit_ 
     0
@@ -194,7 +198,7 @@ dbaccess/source/ui/app/AppSwapWindow.hxx:59
     class SvxIconChoiceCtrlEntry * dbaui::OApplicationSwapWindow::GetEntry(unsigned long) const
     unsigned long nPos
     0
-dbaccess/source/ui/inc/charsets.hxx:49
+dbaccess/source/ui/inc/charsets.hxx:47
     class dbaui::OCharsetDisplay::ExtendedCharsetIterator dbaui::OCharsetDisplay::findEncoding(const unsigned short) const
     const unsigned short _eEncoding
     0
@@ -214,6 +218,10 @@ desktop/source/deployment/gui/dp_gui_theextmgr.hxx:92
     void dp_gui::TheExtensionManager::ToTop(enum ToTopFlags)
     enum ToTopFlags nFlags
     1
+desktop/source/deployment/manager/dp_commandenvironments.hxx:40
+    void dp_manager::BaseCommandEnv::handle_(_Bool,_Bool,const class com::sun::star::uno::Reference<class com::sun::star::task::XInteractionRequest> &)
+    _Bool abort
+    0
 editeng/source/editeng/editstt2.hxx:29
     void InternalEditStatus::TurnOnFlags(enum EEControlBits)
     enum EEControlBits nFlags
@@ -222,23 +230,23 @@ editeng/source/editeng/editstt2.hxx:32
     void InternalEditStatus::TurnOffFlags(enum EEControlBits)
     enum EEControlBits nFlags
     1
-editeng/source/editeng/impedit.hxx:824
+editeng/source/editeng/impedit.hxx:820
     unsigned short ImpEditEngine::GetLineHeight(int,int)
     int nLine
     0
-extensions/source/propctrlr/propertyhandler.hxx:189
+extensions/source/propctrlr/propertyhandler.hxx:186
     void pcr::PropertyHandler::addDoublePropertyDescription(class std::__debug::vector<struct com::sun::star::beans::Property, class std::allocator<struct com::sun::star::beans::Property> > &,const class rtl::OUString &,short) const
     short _nAttribs
     1
-extensions/source/propctrlr/propertyhandler.hxx:197
+extensions/source/propctrlr/propertyhandler.hxx:194
     void pcr::PropertyHandler::addDatePropertyDescription(class std::__debug::vector<struct com::sun::star::beans::Property, class std::allocator<struct com::sun::star::beans::Property> > &,const class rtl::OUString &,short) const
     short _nAttribs
     1
-extensions/source/propctrlr/propertyhandler.hxx:205
+extensions/source/propctrlr/propertyhandler.hxx:202
     void pcr::PropertyHandler::addTimePropertyDescription(class std::__debug::vector<struct com::sun::star::beans::Property, class std::allocator<struct com::sun::star::beans::Property> > &,const class rtl::OUString &,short) const
     short _nAttribs
     1
-extensions/source/propctrlr/propertyhandler.hxx:213
+extensions/source/propctrlr/propertyhandler.hxx:210
     void pcr::PropertyHandler::addDateTimePropertyDescription(class std::__debug::vector<struct com::sun::star::beans::Property, class std::allocator<struct com::sun::star::beans::Property> > &,const class rtl::OUString &,short) const
     short _nAttribs
     1
@@ -258,11 +266,11 @@ filter/source/flash/swfwriter.hxx:325
     void swf::Writer::Impl_writePolygon(const class tools::Polygon &,_Bool,const class Color &,const class Color &)
     _Bool bFilled
     1
-filter/source/graphicfilter/eps/eps.cxx:210
+filter/source/graphicfilter/eps/eps.cxx:211
     void PSWriter::ImplWriteLineColor(unsigned long)
     unsigned long nMode
     1
-filter/source/graphicfilter/eps/eps.cxx:211
+filter/source/graphicfilter/eps/eps.cxx:212
     void PSWriter::ImplWriteFillColor(unsigned long)
     unsigned long nMode
     1
@@ -270,11 +278,11 @@ filter/source/graphicfilter/icgm/cgm.hxx:93
     unsigned char CGM::ImplGetByte(unsigned int,unsigned int)
     unsigned int nPrecision
     1
-filter/source/svg/svgfilter.hxx:235
+filter/source/svg/svgfilter.hxx:247
     _Bool SVGFilter::implExportMasterPages(const class std::__debug::vector<class com::sun::star::uno::Reference<class com::sun::star::drawing::XDrawPage>, class std::allocator<class com::sun::star::uno::Reference<class com::sun::star::drawing::XDrawPage> > > &,int,int)
     int nFirstPage
     0
-filter/source/svg/svgfilter.hxx:237
+filter/source/svg/svgfilter.hxx:249
     void SVGFilter::implExportDrawPages(const class std::__debug::vector<class com::sun::star::uno::Reference<class com::sun::star::drawing::XDrawPage>, class std::allocator<class com::sun::star::uno::Reference<class com::sun::star::drawing::XDrawPage> > > &,int,int)
     int nFirstPage
     0
@@ -286,7 +294,7 @@ forms/source/component/DatabaseForm.hxx:238
     void frm::ODatabaseForm::fire(int *,const class com::sun::star::uno::Any *,const class com::sun::star::uno::Any *,int)
     int nCount
     1
-forms/source/component/GroupManager.hxx:153
+forms/source/component/GroupManager.hxx:152
     const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> & frm::OGroup::GetObject(unsigned short) const
     unsigned short nP
     0
@@ -294,10 +302,14 @@ forms/source/inc/featuredispatcher.hxx:50
     void frm::IFeatureDispatcher::dispatchWithArgument(short,const char *,const class com::sun::star::uno::Any &) const
     short _nFeatureId
     1
-formula/source/ui/dlg/structpg.hxx:92
-    class SvTreeListEntry * formula::StructPage::InsertEntry(const class rtl::OUString &,class SvTreeListEntry *,unsigned short,unsigned long,class formula::IFormulaToken *)
+formula/source/ui/dlg/structpg.hxx:89
+    class SvTreeListEntry * formula::StructPage::InsertEntry(const class rtl::OUString &,class SvTreeListEntry *,unsigned short,unsigned long,const class formula::IFormulaToken *)
     unsigned long nPos
     0
+framework/inc/dispatch/closedispatcher.hxx:183
+    _Bool framework::CloseDispatcher::implts_prepareFrameForClosing(const class com::sun::star::uno::Reference<class com::sun::star::frame::XFrame> &,_Bool,_Bool,_Bool &)
+    _Bool bAllowSuspend
+    1
 framework/inc/uielement/uicommanddescription.hxx:85
     void framework::UICommandDescription::UICommandDescription(const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &,_Bool)
     _Bool 
@@ -318,7 +330,7 @@ hwpfilter/source/hwpfile.h:149
     void HWPFile::Read4b(void *,unsigned long)
     unsigned long nmemb
     1
-i18npool/source/localedata/LocaleNode.hxx:117
+i18npool/source/localedata/LocaleNode.hxx:116
     class rtl::OUString LocaleNode::writeParameterCheckLen(const class OFileWriter &,const char *,const char *,int,int) const
     int nMinLen
     1
@@ -382,7 +394,7 @@ include/basegfx/range/b2ibox.hxx:77
     void basegfx::B2IBox::B2IBox(int,int,int,int)
     int x1
     0
-include/basic/sbstar.hxx:155
+include/basic/sbstar.hxx:153
     class SbxVariable * StarBASIC::VBAFind(const class rtl::OUString &,enum SbxClassType)
     enum SbxClassType t
     1
@@ -402,22 +414,14 @@ include/canvas/spriteredrawmanager.hxx:113
     void canvas::SpriteRedrawManager::SpriteInfo::SpriteInfo(const class rtl::Reference<class canvas::Sprite> &,const class basegfx::B2DRange &,_Bool,_Bool)
     _Bool bNeedsUpdate
     1
-include/comphelper/propertysethelper.hxx:67
-    void comphelper::PropertySetHelper::PropertySetHelper(class comphelper::PropertySetInfo *,enum __sal_NoAcquire)
-    enum __sal_NoAcquire 
-    0
-include/comphelper/unique_disposing_ptr.hxx:164
+include/comphelper/unique_disposing_ptr.hxx:163
     void comphelper::unique_disposing_solar_mutex_reset_ptr::unique_disposing_solar_mutex_reset_ptr<T>(const class com::sun::star::uno::Reference<class com::sun::star::lang::XComponent> &,type-parameter-?-? *,_Bool)
     _Bool bComponent
     1
-include/comphelper/unique_disposing_ptr.hxx:169
+include/comphelper/unique_disposing_ptr.hxx:168
     void comphelper::unique_disposing_solar_mutex_reset_ptr::reset(type-parameter-?-? *)
     type-parameter-?-? * p
     0
-include/connectivity/filtermanager.hxx:84
-    const class rtl::OUString & dbtools::FilterManager::getFilterComponent(enum dbtools::FilterManager::FilterComponent) const
-    enum dbtools::FilterManager::FilterComponent _eWhich
-    0
 include/connectivity/FValue.hxx:478
     void connectivity::TSetBound::TSetBound(_Bool)
     _Bool _bBound
@@ -450,6 +454,10 @@ include/connectivity/sqlscan.hxx:61
     void connectivity::OSQLScanner::prepareScan(const class rtl::OUString &,const class connectivity::IParseContext *,_Bool)
     _Bool bInternational
     1
+include/drawinglayer/processor2d/hittestprocessor2d.hxx:80
+    void drawinglayer::processor2d::HitTestProcessor2D::collectHitStack(_Bool)
+    _Bool bCollect
+    1
 include/editeng/boxitem.hxx:115
     _Bool SvxBoxItem::HasBorder(_Bool) const
     _Bool bTreatPaddingAsBorder
@@ -478,6 +486,10 @@ include/editeng/editobj.hxx:121
     const class SvxFieldData * EditTextObject::GetFieldData(int,unsigned long,int) const
     int nPara
     0
+include/editeng/editobj.hxx:141
+    _Bool EditTextObject::Equals(const class EditTextObject &,_Bool) const
+    _Bool bComparePool
+    0
 include/editeng/fwdtitem.hxx:38
     void SvxFontWidthItem::SvxFontWidthItem(const unsigned short,const unsigned short,const unsigned short)
     const unsigned short nSz
@@ -486,7 +498,7 @@ include/editeng/outliner.hxx:255
     void OutlinerView::SelectRange(int,int)
     int nFirst
     0
-include/editeng/outliner.hxx:657
+include/editeng/outliner.hxx:653
     _Bool Outliner::ImpCanDeleteSelectedPages(class OutlinerView *,int,int)
     int nPages
     1
@@ -494,7 +506,7 @@ include/editeng/pmdlitem.hxx:40
     void SvxPageModelItem::SvxPageModelItem(unsigned short)
     unsigned short nWh
     0
-include/editeng/splwrap.hxx:76
+include/editeng/splwrap.hxx:74
     void SvxSpellWrapper::SvxSpellWrapper(class vcl::Window *,const _Bool,const _Bool)
     const _Bool bIsAllRight
     0
@@ -502,31 +514,35 @@ include/filter/msfilter/escherex.hxx:479
     void EscherExAtom::EscherExAtom(class SvStream &,const unsigned short,const unsigned short,const unsigned char)
     const unsigned char nVersion
     0
-include/filter/msfilter/escherex.hxx:576
+include/filter/msfilter/escherex.hxx:574
     void EscherGraphicProvider::WriteBlibStoreEntry(class SvStream &,unsigned int,unsigned int)
     unsigned int nBlipId
     1
-include/filter/msfilter/escherex.hxx:777
+include/filter/msfilter/escherex.hxx:776
     void EscherPropertyContainer::CreateFillProperties(const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,_Bool,const class com::sun::star::uno::Reference<class com::sun::star::drawing::XShape> &)
     _Bool bEdge
     1
-include/filter/msfilter/escherex.hxx:1115
+include/filter/msfilter/escherex.hxx:1114
     void EscherEx::EndAtom(unsigned short,int,int)
     int nRecVersion
     0
-include/filter/msfilter/msdffimp.hxx:690
-    void SvxMSDffManager::ExchangeInShapeOrder(class SdrObject *,unsigned long,class SdrObject *) const
+include/filter/msfilter/msdffimp.hxx:474
+    class SdrObject * SvxMSDffManager::ImportOLE(unsigned int,const class Graphic &,const class tools::Rectangle &,const class tools::Rectangle &,const int,long) const
+    long nAspect
+    1
+include/filter/msfilter/msdffimp.hxx:694
+    void SvxMSDffManager::ExchangeInShapeOrder(const class SdrObject *,unsigned long,class SdrObject *) const
     unsigned long nTxBx
     0
-include/filter/msfilter/msdffimp.hxx:737
+include/filter/msfilter/msdffimp.hxx:741
     void SvxMSDffShapeInfo::SvxMSDffShapeInfo(unsigned long,unsigned int,unsigned short,unsigned short)
     unsigned short nBoxId
     0
-include/filter/msfilter/msdffimp.hxx:737
+include/filter/msfilter/msdffimp.hxx:741
     void SvxMSDffShapeInfo::SvxMSDffShapeInfo(unsigned long,unsigned int,unsigned short,unsigned short)
     unsigned short nSeqId
     0
-include/formula/FormulaCompiler.hxx:321
+include/formula/FormulaCompiler.hxx:322
     void formula::FormulaCompiler::PushTokenArray(class formula::FormulaTokenArray *,_Bool)
     _Bool 
     1
@@ -534,6 +550,10 @@ include/formula/token.hxx:244
     void formula::FormulaByteToken::FormulaByteToken(enum OpCode,unsigned char,enum formula::StackVar,enum formula::ParamClass)
     enum formula::ParamClass c
     0
+include/formula/tokenarray.hxx:164
+    void formula::FormulaTokenArrayReferencesIterator::FormulaTokenArrayReferencesIterator(const class formula::FormulaTokenArrayStandardRange &,enum formula::FormulaTokenArrayReferencesIterator::Dummy)
+    enum formula::FormulaTokenArrayReferencesIterator::Dummy 
+    0
 include/formula/vectortoken.hxx:50
     void formula::VectorRefArray::VectorRefArray(enum formula::VectorRefArray::InitInvalid)
     enum formula::VectorRefArray::InitInvalid 
@@ -618,6 +638,10 @@ include/oox/crypto/CryptTools.hxx:108
     void oox::core::Encrypt::Encrypt(class std::__debug::vector<unsigned char, class std::allocator<unsigned char> > &,class std::__debug::vector<unsigned char, class std::allocator<unsigned char> > &,enum oox::core::Crypto::CryptoType)
     enum oox::core::Crypto::CryptoType type
     1
+include/oox/export/drawingml.hxx:210
+    void oox::drawingml::DrawingML::WritePresetShape(const char *,enum MSO_SPT,_Bool,int,const struct com::sun::star::beans::PropertyValue &)
+    int nAdjustmentsWhichNeedsToBeConverted
+    0
 include/oox/helper/attributelist.hxx:151
     long oox::AttributeList::getHyper(int,long) const
     long nDefault
@@ -635,7 +659,7 @@ include/oox/mathml/importutils.hxx:210
     _Bool silent
     0
 include/oox/ole/axcontrol.hxx:321
-    void oox::ole::ControlConverter::convertToAxState(class oox::PropertySet &,class rtl::OUString &,int &,enum oox::ole::ApiDefaultStateMode,_Bool)
+    void oox::ole::ControlConverter::convertToAxState(const class oox::PropertySet &,class rtl::OUString &,int &,enum oox::ole::ApiDefaultStateMode)
     enum oox::ole::ApiDefaultStateMode eDefStateMode
     0
 include/oox/ole/olestorage.hxx:60
@@ -650,8 +674,8 @@ include/package/Deflater.hxx:51
     int ZipUtils::Deflater::doDeflateSegment(class com::sun::star::uno::Sequence<signed char> &,int,int)
     int nNewOffset
     0
-include/sfx2/dispatch.hxx:164
-    unsigned int SfxDispatcher::GetObjectBarId(unsigned short) const
+include/sfx2/dispatch.hxx:166
+    enum ToolbarId SfxDispatcher::GetObjectBarId(unsigned short) const
     unsigned short nPos
     1
 include/sfx2/docfile.hxx:83
@@ -662,7 +686,7 @@ include/sfx2/docfile.hxx:98
     void SfxMedium::SfxMedium(const class com::sun::star::uno::Reference<class com::sun::star::embed::XStorage> &,const class rtl::OUString &,const class rtl::OUString &,const class SfxItemSet *)
     const class SfxItemSet * pSet
     0
-include/sfx2/event.hxx:122
+include/sfx2/event.hxx:160
     void SfxPrintingHint::SfxPrintingHint(enum com::sun::star::view::PrintableState,const class com::sun::star::uno::Sequence<struct com::sun::star::beans::PropertyValue> &,class SfxObjectShell *,const class com::sun::star::uno::Reference<class com::sun::star::frame::XController2> &)
     enum com::sun::star::view::PrintableState nState
     0
@@ -718,11 +742,11 @@ include/sfx2/sidebar/FocusManager.hxx:117
     _Bool sfx2::sidebar::FocusManager::IsPanelTitleVisible(const int) const
     const int nPanelIndex
     0
-include/sfx2/sidebar/SidebarToolBox.hxx:55
+include/sfx2/sidebar/SidebarToolBox.hxx:54
     void sfx2::sidebar::SidebarToolBox::SetController(const unsigned short,const class com::sun::star::uno::Reference<class com::sun::star::frame::XToolbarController> &)
     const unsigned short nItemId
     1
-include/sfx2/tabdlg.hxx:138
+include/sfx2/tabdlg.hxx:137
     void SfxTabDialog::AddTabPage(unsigned short,const class rtl::OUString &,class VclPtr<class SfxTabPage> (*)(class vcl::Window *, const class SfxItemSet *),const unsigned short *(*)(void),unsigned short)
     const unsigned short *(*)(void) pRangesFunc
     0
@@ -740,25 +764,25 @@ include/sot/stg.hxx:261
     0
 include/sot/stg.hxx:261
     void UCBStorage::UCBStorage(const class ucbhelper::Content &,const class rtl::OUString &,enum StreamMode,_Bool,_Bool)
-    enum StreamMode nMode
+    _Bool bIsRoot
     1
 include/sot/stg.hxx:261
     void UCBStorage::UCBStorage(const class ucbhelper::Content &,const class rtl::OUString &,enum StreamMode,_Bool,_Bool)
-    _Bool bIsRoot
+    enum StreamMode nMode
     1
 include/sot/stg.hxx:267
     void UCBStorage::UCBStorage(const class rtl::OUString &,enum StreamMode,_Bool,_Bool)
-    _Bool bDirect
+    _Bool bIsRoot
     1
 include/sot/stg.hxx:267
     void UCBStorage::UCBStorage(const class rtl::OUString &,enum StreamMode,_Bool,_Bool)
-    _Bool bIsRoot
+    _Bool bDirect
     1
 include/sot/stg.hxx:272
     void UCBStorage::UCBStorage(const class rtl::OUString &,enum StreamMode,_Bool,_Bool,_Bool,const class com::sun::star::uno::Reference<class com::sun::star::ucb::XProgressHandler> &)
     _Bool bIsRoot
     0
-include/store/store.hxx:110
+include/store/store.hxx:105
     storeError store::OStoreStream::writeAt(unsigned int,const void *,unsigned int,unsigned int &)
     unsigned int nOffset
     0
@@ -778,7 +802,7 @@ include/svl/svdde.hxx:139
     void DdeLink::DdeLink(class DdeConnection &,const class rtl::OUString &,long)
     long 
     0
-include/svl/zformat.hxx:440
+include/svl/zformat.hxx:441
     _Bool SvNumberformat::IsIso8601(unsigned short)
     unsigned short nNumFor
     0
@@ -786,7 +810,7 @@ include/svtools/accessibletableprovider.hxx:114
     _Bool svt::IAccessibleTableProvider::GetGlyphBoundRects(const class Point &,const class rtl::OUString &,int,int,class std::__debug::vector<class tools::Rectangle, class std::allocator<class tools::Rectangle> > &)
     int nIndex
     0
-include/svtools/ctrlbox.hxx:244
+include/svtools/ctrlbox.hxx:243
     void LineListBox::SelectEntry(enum SvxBorderLineStyle,_Bool)
     _Bool bSelect
     1
@@ -794,31 +818,23 @@ include/svtools/editsyntaxhighlighter.hxx:42
     void MultiLineEditSyntaxHighlight::MultiLineEditSyntaxHighlight(class vcl::Window *,long,enum HighlighterLanguage)
     enum HighlighterLanguage aLanguage
     1
-include/svtools/fileview.hxx:176
+include/svtools/fileview.hxx:175
     void SvtFileView::EnableDelete(_Bool)
     _Bool bEnable
     1
-include/svtools/htmlout.hxx:69
-    class SvStream & HTMLOutFuncs::Out_Hex(class SvStream &,unsigned long,unsigned char,unsigned short)
-    unsigned short eDestEnc
-    1
 include/svtools/HtmlWriter.hxx:36
     void HtmlWriter::prettyPrint(_Bool)
     _Bool b
     0
-include/svtools/inettbc.hxx:61
+include/svtools/inettbc.hxx:60
     void SvtURLBox::SvtURLBox(class vcl::Window *,enum INetProtocol,_Bool)
     _Bool bSetDefaultHelpID
     1
-include/svtools/parhtml.hxx:183
-    void HTMLParser::FinishHeader(_Bool)
-    _Bool bBody
-    1
-include/svtools/ruler.hxx:738
+include/svtools/ruler.hxx:735
     void Ruler::SetWinPos(long,long)
     long nWidth
     0
-include/svtools/svlbitm.hxx:76
+include/svtools/svlbitm.hxx:75
     void SvLBoxButtonData::SvLBoxButtonData(const class Control *,_Bool)
     _Bool _bRadioBtn
     1
@@ -826,27 +842,31 @@ include/svtools/svmedit2.hxx:37
     void ExtMultiLineEdit::SetAttrib(const class TextAttrib &,unsigned int,int,int)
     int nStart
     0
-include/svtools/transfer.hxx:245
+include/svtools/table/tablerenderer.hxx:108
+    void svt::table::ITableRenderer::PaintColumnHeader(int,_Bool,_Bool,class OutputDevice &,const class tools::Rectangle &,const class StyleSettings &)
+    _Bool _bSelected
+    0
+include/svtools/transfer.hxx:249
     void TransferableHelper::StartDrag(class vcl::Window *,signed char,int)
     int nDragPointer
     0
-include/svtools/treelistbox.hxx:629
+include/svtools/treelistbox.hxx:631
     class SvTreeListEntry * SvTreeListBox::InsertEntry(const class rtl::OUString &,const class Image &,const class Image &,class SvTreeListEntry *,_Bool,unsigned long,void *,enum SvLBoxButtonKind)
     enum SvLBoxButtonKind eButtonKind
     0
-include/svtools/treelistbox.hxx:705
+include/svtools/treelistbox.hxx:707
     void SvTreeListBox::MakeVisible(class SvTreeListEntry *,_Bool)
     _Bool bMoveToTop
     1
-include/svtools/treelistbox.hxx:731
+include/svtools/treelistbox.hxx:733
     unsigned long SvTreeListBox::SelectChildren(class SvTreeListEntry *,_Bool)
     _Bool bSelect
     0
-include/svtools/valueset.hxx:324
+include/svtools/valueset.hxx:323
     void ValueSet::EnableFullItemMode(_Bool)
     _Bool bFullMode
     0
-include/svtools/valueset.hxx:363
+include/svtools/valueset.hxx:361
     void ValueSet::SetItemColor(unsigned short,const class Color &)
     unsigned short nItemId
     1
@@ -854,11 +874,11 @@ include/svx/algitem.hxx:41
     void SvxOrientationItem::SvxOrientationItem(int,_Bool,const unsigned short)
     const unsigned short nId
     0
-include/svx/ctredlin.hxx:258
+include/svx/ctredlin.hxx:257
     void SvxTPFilter::SelectedAuthorPos(int)
     int nPos
     0
-include/svx/ctredlin.hxx:281
+include/svx/ctredlin.hxx:280
     void SvxTPFilter::CheckAction(_Bool)
     _Bool bFlag
     0
@@ -878,55 +898,55 @@ include/svx/fmmodel.hxx:54
     void FmFormModel::FmFormModel(const class rtl::OUString &,class SfxItemPool *,class SfxObjectShell *,_Bool)
     _Bool bUseExtColorTable
     1
-include/svx/fmtools.hxx:105
+include/svx/fmtools.hxx:99
     void CursorWrapper::CursorWrapper(const class com::sun::star::uno::Reference<class com::sun::star::sdbc::XRowSet> &,_Bool)
     _Bool bUseCloned
     0
-include/svx/fmtools.hxx:170
+include/svx/fmtools.hxx:164
     void FmXDisposeListener::disposing(const struct com::sun::star::lang::EventObject &,short)
     short _nId
     0
-include/svx/framelink.hxx:113
+include/svx/framelink.hxx:114
     void svx::frame::Style::Style(double,double,double,enum SvxBorderLineStyle)
-    double nS
+    enum SvxBorderLineStyle nType
     0
-include/svx/framelink.hxx:113
+include/svx/framelink.hxx:114
     void svx::frame::Style::Style(double,double,double,enum SvxBorderLineStyle)
-    enum SvxBorderLineStyle nType
+    double nS
     0
-include/svx/framelink.hxx:113
+include/svx/framelink.hxx:114
     void svx::frame::Style::Style(double,double,double,enum SvxBorderLineStyle)
     double nD
     0
-include/svx/framelinkarray.hxx:342
-    void svx::frame::Array::DrawRange(class OutputDevice &,unsigned long,unsigned long,unsigned long,unsigned long) const
-    unsigned long nFirstCol
-    0
-include/svx/framelinkarray.hxx:342
-    void svx::frame::Array::DrawRange(class OutputDevice &,unsigned long,unsigned long,unsigned long,unsigned long) const
-    unsigned long nFirstRow
-    0
 include/svx/frmsel.hxx:144
     void svx::FrameSelector::SelectAllBorders(_Bool)
     _Bool bSelect
     0
-include/svx/galmisc.hxx:213
+include/svx/galmisc.hxx:194
     void GalleryHint::GalleryHint(enum GalleryHintType,const class rtl::OUString &,const class rtl::OUString &,unsigned long)
     unsigned long nData1
     0
-include/svx/gridctrl.hxx:395
+include/svx/gridctrl.hxx:394
     void DbGridControl::RemoveRows(_Bool)
     _Bool bNewCursor
     0
-include/svx/langbox.hxx:115
+include/svx/IAccessibleParent.hxx:77
+    _Bool accessibility::IAccessibleParent::ReplaceChild(class accessibility::AccessibleShape *,const class com::sun::star::uno::Reference<class com::sun::star::drawing::XShape> &,const long,const class accessibility::AccessibleShapeTreeInfo &)
+    const long _nIndex
+    0
+include/svx/langbox.hxx:114
     void SvxLanguageBoxBase::ImplSelectEntryPos(int,_Bool)
     _Bool bSelect
     1
-include/svx/nbdtmg.hxx:137
+include/svx/nbdtmg.hxx:133
     unsigned short svx::sidebar::NBOTypeMgrBase::GetNBOIndexForNumRule(class SvxNumRule &,unsigned short,unsigned short)
     unsigned short nFromIndex
     0
-include/svx/nbdtmg.hxx:140
+include/svx/nbdtmg.hxx:134
+    void svx::sidebar::NBOTypeMgrBase::RelplaceNumRule(class SvxNumRule &,unsigned short,unsigned short)
+    unsigned short mLevel
+    1
+include/svx/nbdtmg.hxx:136
     class rtl::OUString svx::sidebar::NBOTypeMgrBase::GetDescription(unsigned short,_Bool)
     _Bool isDefault
     1
@@ -946,8 +966,8 @@ include/svx/postattr.hxx:128
     void SvxPostItIdItem::SvxPostItIdItem(unsigned short)
     unsigned short nWhich
     0
-include/svx/relfld.hxx:45
-    void SvxRelativeField::EnableRelativeMode(unsigned short,unsigned short,unsigned short)
+include/svx/relfld.hxx:44
+    void SvxRelativeField::EnableRelativeMode(unsigned short,unsigned short)
     unsigned short nMin
     0
 include/svx/rulritem.hxx:136
@@ -974,18 +994,10 @@ include/svx/svdlayer.hxx:137
     void SdrLayerAdmin::NewStandardLayer(unsigned short)
     unsigned short nPos
     0
-include/svx/svdview.hxx:186
+include/svx/svdview.hxx:175
     void SdrView::EnableExtendedKeyInputDispatcher(_Bool)
     _Bool bOn
     0
-include/svx/svdview.hxx:189
-    void SdrView::EnableExtendedCommandEventDispatcher(_Bool)
-    _Bool bOn
-    0
-include/svx/svdview.hxx:191
-    void SdrView::EnableTextEditOnObjectsWithoutTextIfTextTool(_Bool)
-    _Bool bOn
-    1
 include/svx/svx3ditems.hxx:65
     void Svx3DReducedLineGeometryItem::Svx3DReducedLineGeometryItem(_Bool)
     _Bool bVal
@@ -1070,21 +1082,21 @@ include/tools/datetime.hxx:43
     void DateTime::DateTime(enum DateTime::DateTimeInitSystem)
     enum DateTime::DateTimeInitSystem 
     0
-include/tools/stream.hxx:583
+include/tools/stream.hxx:599
     _Bool SvFileStream::LockRange(unsigned long,unsigned long)
-    unsigned long nBytes
+    unsigned long nByteOffset
     0
-include/tools/stream.hxx:583
+include/tools/stream.hxx:599
     _Bool SvFileStream::LockRange(unsigned long,unsigned long)
-    unsigned long nByteOffset
+    unsigned long nBytes
     0
-include/tools/stream.hxx:584
+include/tools/stream.hxx:600
     _Bool SvFileStream::UnlockRange(unsigned long,unsigned long)
-    unsigned long nByteOffset
+    unsigned long nBytes
     0
-include/tools/stream.hxx:584
+include/tools/stream.hxx:600
     _Bool SvFileStream::UnlockRange(unsigned long,unsigned long)
-    unsigned long nBytes
+    unsigned long nByteOffset
     0
 include/tools/time.hxx:67
     void tools::Time::Time(enum tools::Time::TimeInitEmpty)
@@ -1126,11 +1138,11 @@ include/unotools/fontdefs.hxx:59
     void ConvertChar::RecodeString(class rtl::OUString &,int,int) const
     int nIndex
     0
-include/unotools/historyoptions.hxx:72
+include/unotools/historyoptions.hxx:71
     unsigned int SvtHistoryOptions::GetSize(enum EHistoryType) const
     enum EHistoryType eHistory
     0
-include/unotools/historyoptions.hxx:102
+include/unotools/historyoptions.hxx:101
     void SvtHistoryOptions::DeleteItem(enum EHistoryType,const class rtl::OUString &)
     enum EHistoryType eHistory
     0
@@ -1160,11 +1172,11 @@ include/unotools/transliterationwrapper.hxx:83
     0
 include/unotools/transliterationwrapper.hxx:99
     _Bool utl::TransliterationWrapper::equals(const class rtl::OUString &,int,int,int &,const class rtl::OUString &,int,int,int &) const
-    int nPos2
+    int nPos1
     0
 include/unotools/transliterationwrapper.hxx:99
     _Bool utl::TransliterationWrapper::equals(const class rtl::OUString &,int,int,int &,const class rtl::OUString &,int,int,int &) const
-    int nPos1
+    int nPos2
     0
 include/vcl/alpha.hxx:62
     _Bool AlphaMask::Replace(unsigned char,unsigned char)
@@ -1234,18 +1246,14 @@ include/vcl/dialog.hxx:138
     void Dialog::SetModalInputMode(_Bool,_Bool)
     _Bool bSubModalDialogs
     1
-include/vcl/edit.hxx:113
+include/vcl/edit.hxx:112
     void Edit::ImplClearBackground(class OutputDevice &,const class tools::Rectangle &,long,long)
     long nXStart
     0
-include/vcl/edit.hxx:114
-    void Edit::ImplPaintBorder(class OutputDevice &,long,long)
+include/vcl/edit.hxx:113
+    void Edit::ImplPaintBorder(const class OutputDevice &,long,long)
     long nXStart
     0
-include/vcl/idle.hxx:42
-    void Idle::Idle(_Bool,const char *)
-    _Bool bAuto
-    0
 include/vcl/lstbox.hxx:149
     void ListBox::EnableDDAutoWidth(_Bool)
     _Bool b
@@ -1258,35 +1266,35 @@ include/vcl/lstbox.hxx:267
     void ListBox::EnableQuickSelection(_Bool)
     _Bool b
     0
-include/vcl/outdev.hxx:546
+include/vcl/outdev.hxx:545
     _Bool OutputDevice::SupportsOperation(enum OutDevSupportType) const
     enum OutDevSupportType 
     0
-include/vcl/outdev.hxx:1183
+include/vcl/outdev.hxx:1185
     void OutputDevice::ImplDrawWaveTextLine(long,long,long,long,long,enum FontLineStyle,class Color,_Bool)
     long nY
     0
-include/vcl/outdev.hxx:1184
+include/vcl/outdev.hxx:1186
     void OutputDevice::ImplDrawStraightTextLine(long,long,long,long,long,enum FontLineStyle,class Color,_Bool)
     long nY
     0
-include/vcl/outdev.hxx:1185
+include/vcl/outdev.hxx:1187
     void OutputDevice::ImplDrawStrikeoutLine(long,long,long,long,long,enum FontStrikeout,class Color)
     long nY
     0
-include/vcl/outdev.hxx:1186
+include/vcl/outdev.hxx:1188
     void OutputDevice::ImplDrawStrikeoutChar(long,long,long,long,long,enum FontStrikeout,class Color)
     long nY
     0
-include/vcl/outdev.hxx:1211
+include/vcl/outdev.hxx:1213
     void OutputDevice::RefreshFontData(const _Bool)
     const _Bool bNewFontLists
     1
-include/vcl/outdev.hxx:1288
+include/vcl/outdev.hxx:1290
     void OutputDevice::ImplClearFontData(_Bool)
     _Bool bNewFontLists
     1
-include/vcl/outdev.hxx:1336
+include/vcl/outdev.hxx:1338
     _Bool OutputDevice::GetTextIsRTL(const class rtl::OUString &,int,int) const
     int nIndex
     0
@@ -1302,7 +1310,7 @@ include/vcl/syschild.hxx:50
     void SystemChildWindow::EnableEraseBackground(_Bool)
     _Bool bEnable
     0
-include/vcl/texteng.hxx:301
+include/vcl/texteng.hxx:300
     void TextEngine::RemoveAttribs(unsigned int,unsigned short)
     unsigned int nPara
     0
@@ -1310,43 +1318,47 @@ include/vcl/textview.hxx:194
     void TextView::SupportProtectAttribute(_Bool)
     _Bool bSupport
     1
-include/vcl/timer.hxx:57
+include/vcl/timer.hxx:56
     void Timer::Invoke(class Timer *)
     class Timer * arg
     0
-include/vcl/toolbox.hxx:313
+include/vcl/toolbox.hxx:309
     void ToolBox::InsertItem(unsigned short,const class Image &,enum ToolBoxItemBits,unsigned long)
     enum ToolBoxItemBits nBits
     0
-include/vcl/toolbox.hxx:323
+include/vcl/toolbox.hxx:319
     void ToolBox::InsertWindow(unsigned short,class vcl::Window *,enum ToolBoxItemBits,unsigned long)
     enum ToolBoxItemBits nBits
     0
-include/vcl/toolbox.hxx:433
+include/vcl/toolbox.hxx:429
     class Size ToolBox::CalcWindowSizePixel(unsigned long,enum WindowAlign)
     unsigned long nCalcLines
     1
-include/vcl/toolbox.hxx:457
+include/vcl/toolbox.hxx:453
     void ToolBox::EnableCustomize(_Bool)
     _Bool bEnable
     1
-include/vcl/vclptr.hxx:122
+include/vcl/vclptr.hxx:87
     void VclPtr::VclPtr<T>(type-parameter-?-? *,enum __sal_NoAcquire)
     enum __sal_NoAcquire 
     0
-include/vcl/vclptr.hxx:135
-    void VclPtr::VclPtr<T>(const VclPtr<type-parameter-?-?> &,typename UpCast<type-parameter-?-?, type-parameter-?-?>::t)
-    typename UpCast<type-parameter-?-?, type-parameter-?-?>::t 
+include/vcl/vclptr.hxx:100
+    void VclPtr::VclPtr<T>(const VclPtr<type-parameter-?-?> &,typename enable_if<std::is_base_of<reference_type, derived_type>::value, int>::type)
+    typename enable_if<std::is_base_of<reference_type, derived_type>::value, int>::type 
     0
-include/vcl/vclptr.hxx:374
-    void ScopedVclPtr::ScopedVclPtr<reference_type>(const VclPtr<type-parameter-?-?> &,typename UpCast<type-parameter-?-?, type-parameter-?-?>::t)
-    typename UpCast<type-parameter-?-?, type-parameter-?-?>::t 
+include/vcl/vclptr.hxx:343
+    void ScopedVclPtr::ScopedVclPtr<reference_type>(const VclPtr<type-parameter-?-?> &,typename enable_if<std::is_base_of<reference_type, derived_type>::value, int>::type)
+    typename enable_if<std::is_base_of<reference_type, derived_type>::value, int>::type 
     0
-include/vcl/vclptr.hxx:403
+include/vcl/vclptr.hxx:390
     void ScopedVclPtr::ScopedVclPtr<reference_type>(type-parameter-?-? *,enum __sal_NoAcquire)
     enum __sal_NoAcquire 
     0
-include/vcl/window.hxx:614
+include/vcl/vectorgraphicdata.hxx:81
+    void VectorGraphicData::VectorGraphicData(const class rtl::OUString &,enum VectorGraphicDataType)
+    enum VectorGraphicDataType eVectorDataType
+    0
+include/vcl/window.hxx:611
     void vcl::Window::ImplSetMouseTransparent(_Bool)
     _Bool bTransparent
     1
@@ -1358,10 +1370,18 @@ include/xmloff/txtparae.hxx:273
     void XMLTextParagraphExport::exportText(const class com::sun::star::uno::Reference<class com::sun::star::text::XText> &,const class com::sun::star::uno::Reference<class com::sun::star::text::XTextSection> &,_Bool,_Bool,_Bool)
     _Bool bExportParagraph
     1
+include/xmloff/txtparae.hxx:278
+    void XMLTextParagraphExport::exportTextContentEnumeration(const class com::sun::star::uno::Reference<class com::sun::star::container::XEnumeration> &,_Bool,const class com::sun::star::uno::Reference<class com::sun::star::text::XTextSection> &,_Bool,_Bool,const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> *,_Bool,enum TextPNS)
+    _Bool bExportLevels
+    1
 include/xmloff/XMLEventExport.hxx:86
-    void XMLEventExport::Export(class com::sun::star::uno::Reference<class com::sun::star::document::XEventsSupplier> &,_Bool)
+    void XMLEventExport::Export(const class com::sun::star::uno::Reference<class com::sun::star::document::XEventsSupplier> &,_Bool)
     _Bool bUseWhitespace
     1
+l10ntools/inc/export.hxx:126
+    _Bool MergeEntrys::GetText(class rtl::OString &,enum StringType,const class rtl::OString &,_Bool)
+    enum StringType nTyp
+    0
 l10ntools/inc/po.hxx:108
     void PoOfstream::PoOfstream(const class rtl::OString &,enum PoOfstream::OpenMode)
     enum PoOfstream::OpenMode aMode
@@ -1388,11 +1408,11 @@ lotuswordpro/source/filter/xfilter/xfdrawstyle.hxx:116
     0
 lotuswordpro/source/filter/xfilter/xfframestyle.hxx:127
     void XFFrameStyle::SetProtect(_Bool,_Bool,_Bool)
-    _Bool size
+    _Bool pos
     1
 lotuswordpro/source/filter/xfilter/xfframestyle.hxx:127
     void XFFrameStyle::SetProtect(_Bool,_Bool,_Bool)
-    _Bool pos
+    _Bool size
     1
 lotuswordpro/source/filter/xfilter/xfframestyle.hxx:127
     void XFFrameStyle::SetProtect(_Bool,_Bool,_Bool)
@@ -1418,26 +1438,34 @@ oox/inc/drawingml/textspacing.hxx:44
     void oox::drawingml::TextSpacing::TextSpacing(int)
     int nPoints
     0
+oox/source/dump/dffdumper.cxx:165
+    void oox::dump::(anonymous namespace)::PropInfo::PropInfo(const class rtl::OUString &,enum oox::dump::(anonymous namespace)::PropType,unsigned short,unsigned int)
+    enum oox::dump::(anonymous namespace)::PropType eType
+    0
 oox/source/export/ColorPropertySet.hxx:41
     void oox::drawingml::ColorPropertySet::ColorPropertySet(int,_Bool)
     _Bool bFillColor
     1
 oox/source/ppt/timenodelistcontext.cxx:63
     void oox::ppt::AnimColor::AnimColor(short,int,int,int)
-    int o
+    int th
     0
 oox/source/ppt/timenodelistcontext.cxx:63
     void oox::ppt::AnimColor::AnimColor(short,int,int,int)
-    int th
+    int t
     0
 oox/source/ppt/timenodelistcontext.cxx:63
     void oox::ppt::AnimColor::AnimColor(short,int,int,int)
-    int t
+    int o
     0
 oox/source/ppt/timenodelistcontext.cxx:63
     void oox::ppt::AnimColor::AnimColor(short,int,int,int)
     short cs
     0
+package/inc/ZipPackageStream.hxx:77
+    class com::sun::star::uno::Reference<class com::sun::star::io::XInputStream> ZipPackageStream::getRawData(const _Bool)
+    const _Bool bUseBufferedStream
+    0
 pyuno/inc/pyuno.hxx:96
     void pyuno::PyRef::PyRef(struct _object *,enum __sal_NoAcquire)
     enum __sal_NoAcquire 
@@ -1454,7 +1482,7 @@ pyuno/source/module/pyuno_impl.hxx:166
     void log(struct pyuno::RuntimeCargo *,int,const class rtl::OUString &)
     int level
     1
-reportdesign/source/filter/xml/xmlFixedContent.cxx:52
+reportdesign/source/filter/xml/xmlFixedContent.cxx:51
     void rptxml::OXMLCharContent::OXMLCharContent(class SvXMLImport &,class rptxml::OXMLFixedContent *,unsigned short,const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::xml::sax::XAttributeList> &,short)
     short nControl
     1
@@ -1462,19 +1490,19 @@ reportdesign/source/filter/xml/xmlStyleImport.hxx:118
     void rptxml::OReportStylesContext::OReportStylesContext(class rptxml::ORptFilter &,unsigned short,const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::xml::sax::XAttributeList> &,const _Bool)
     unsigned short nPrfx
     0
-reportdesign/source/ui/inc/DesignView.hxx:237
+reportdesign/source/ui/inc/DesignView.hxx:236
     void rptui::ODesignView::setMarked(const class com::sun::star::uno::Sequence<class com::sun::star::uno::Reference<class com::sun::star::report::XReportComponent> > &,_Bool)
     _Bool _bMark
     1
-reportdesign/source/ui/inc/GeometryHandler.hxx:94
-    void rptui::GeometryHandler::implCreateListLikeControl(const class com::sun::star::uno::Reference<class com::sun::star::inspection::XPropertyControlFactory> &,struct com::sun::star::inspection::LineDescriptor &,unsigned short,_Bool,_Bool)
+reportdesign/source/ui/inc/GeometryHandler.hxx:95
+    void rptui::GeometryHandler::implCreateListLikeControl(const class com::sun::star::uno::Reference<class com::sun::star::inspection::XPropertyControlFactory> &,struct com::sun::star::inspection::LineDescriptor &,const char **,_Bool,_Bool)
     _Bool _bReadOnlyControl
     0
-reportdesign/source/ui/inc/GeometryHandler.hxx:94
-    void rptui::GeometryHandler::implCreateListLikeControl(const class com::sun::star::uno::Reference<class com::sun::star::inspection::XPropertyControlFactory> &,struct com::sun::star::inspection::LineDescriptor &,unsigned short,_Bool,_Bool)
+reportdesign/source/ui/inc/GeometryHandler.hxx:95
+    void rptui::GeometryHandler::implCreateListLikeControl(const class com::sun::star::uno::Reference<class com::sun::star::inspection::XPropertyControlFactory> &,struct com::sun::star::inspection::LineDescriptor &,const char **,_Bool,_Bool)
     _Bool _bTrueIfListBoxFalseIfComboBox
     1
-sal/osl/unx/file.cxx:101
+sal/osl/unx/file.cxx:93
     void FileHandle_Impl::FileHandle_Impl(int,enum FileHandle_Impl::Kind,const char *)
     enum FileHandle_Impl::Kind kind
     1
@@ -1490,27 +1518,31 @@ sal/qa/rtl/random/rtl_random.cxx:170
     void rtl_random::Statistics::addValue(unsigned char,int)
     int _nValue
     1
-sc/inc/address.hxx:320
+sc/inc/address.hxx:322
     void ScAddress::Format(class rtl::OStringBuffer &,enum ScRefFlags,const class ScDocument *,const struct ScAddress::Details &) const
     const class ScDocument * pDocument
     0
-sc/inc/address.hxx:474
+sc/inc/address.hxx:488
     void ScRange::ScRange(enum ScAddress::Uninitialized)
     enum ScAddress::Uninitialized eUninitialized
     0
-sc/inc/address.hxx:477
+sc/inc/address.hxx:491
     void ScRange::ScRange(enum ScAddress::InitializeInvalid)
     enum ScAddress::InitializeInvalid eInvalid
     0
-sc/inc/chgtrack.hxx:742
+sc/inc/chgtrack.hxx:743
     void ScChangeActionContent::PutOldValueToDoc(class ScDocument *,short,int) const
-    short nDx
+    int nDy
     0
-sc/inc/chgtrack.hxx:742
+sc/inc/chgtrack.hxx:743
     void ScChangeActionContent::PutOldValueToDoc(class ScDocument *,short,int) const
-    int nDy
+    short nDx
+    0
+sc/inc/column.hxx:252
+    void ScColumn::GetUnprotectedCells(int,int,class ScRangeList &) const
+    int nStartRow
     0
-sc/inc/column.hxx:686
+sc/inc/column.hxx:687
     void ScColumn::AttachNewFormulaCell(const class mdds::__mtv::iterator_base<struct mdds::multi_type_vector<struct mdds::mtv::custom_block_func3<struct mdds::mtv::default_element_block<52, class svl::SharedString>, struct mdds::mtv::noncopyable_managed_element_block<53, class EditTextObject>, struct mdds::mtv::noncopyable_managed_element_block<54, class ScFormulaCell> >, class sc::CellStoreEvent>::iterator_trait, struct mdds::__mtv::private_data_forward_update<struct mdds::__mtv::iterator_value_node<unsigned long, struct mdds::mtv::base_element_block> > > &,int,class ScFormulaCell &,_Bool,enum sc::StartListeningType)
     _Bool bJoin
     1
@@ -1534,7 +1566,7 @@ sc/inc/columnspanset.hxx:104
     void sc::ColumnSpanSet::scan(const class ScDocument &,short,short,int,short,int,_Bool)
     _Bool bVal
     1
-sc/inc/compiler.hxx:369
+sc/inc/compiler.hxx:368
     char16_t ScCompiler::GetNativeAddressSymbol(enum ScCompiler::Convention::SpecialSymbolType) const
     enum ScCompiler::Convention::SpecialSymbolType eType
     0
@@ -1550,99 +1582,103 @@ sc/inc/dapiuno.hxx:311
     void ScFieldIdentifier::ScFieldIdentifier(const class rtl::OUString &,_Bool)
     _Bool bDataLayout
     1
-sc/inc/dociter.hxx:533
+sc/inc/dociter.hxx:531
     void ScUsedAreaIterator::ScUsedAreaIterator(class ScDocument *,short,short,int,short,int)
     short nCol1
     0
-sc/inc/dociter.hxx:533
+sc/inc/dociter.hxx:531
     void ScUsedAreaIterator::ScUsedAreaIterator(class ScDocument *,short,short,int,short,int)
     int nRow1
     0
-sc/inc/dociter.hxx:569
+sc/inc/dociter.hxx:567
     void ScDocRowHeightUpdater::TabRanges::TabRanges(short)
     short nTab
     0
-sc/inc/document.hxx:841
+sc/inc/document.hxx:844
     void ScDocument::SetPendingRowHeights(short,_Bool)
     _Bool bSet
     0
-sc/inc/document.hxx:845
+sc/inc/document.hxx:848
     void ScDocument::SetScenario(short,_Bool)
     _Bool bFlag
     1
-sc/inc/document.hxx:1384
+sc/inc/document.hxx:1178
+    void ScDocument::GetBorderLines(short,int,short,const class editeng::SvxBorderLine **,const class editeng::SvxBorderLine **,const class editeng::SvxBorderLine **,const class editeng::SvxBorderLine **) const
+    short nTab
+    0
+sc/inc/document.hxx:1387
     void ScDocument::EnableUserInteraction(_Bool)
     _Bool bVal
     0
-sc/inc/document.hxx:1471
+sc/inc/document.hxx:1474
     void ScDocument::CopyMultiRangeFromClip(const class ScAddress &,const class ScMarkData &,enum InsertDeleteFlags,class ScDocument *,_Bool,_Bool,_Bool,_Bool)
     _Bool bResetCut
     1
-sc/inc/document.hxx:1520
+sc/inc/document.hxx:1523
     void ScDocument::UndoToDocument(short,int,short,short,int,short,enum InsertDeleteFlags,_Bool,class ScDocument &)
-    _Bool bMarked
+    short nCol1
     0
-sc/inc/document.hxx:1520
+sc/inc/document.hxx:1523
     void ScDocument::UndoToDocument(short,int,short,short,int,short,enum InsertDeleteFlags,_Bool,class ScDocument &)
-    short nCol1
+    _Bool bMarked
     0
-sc/inc/document.hxx:1527
+sc/inc/document.hxx:1530
     void ScDocument::UndoToDocument(const class ScRange &,enum InsertDeleteFlags,_Bool,class ScDocument &)
     _Bool bMarked
     0
-sc/inc/document.hxx:1564
+sc/inc/document.hxx:1567
     const class ScPatternAttr * ScDocument::GetMostUsedPattern(short,int,int,short) const
     int nStartRow
     0
-sc/inc/document.hxx:1703
+sc/inc/document.hxx:1707
     unsigned long ScDocument::GetColWidth(short,short,short) const
     short nStartCol
     0
-sc/inc/document.hxx:1744
+sc/inc/document.hxx:1748
     void ScDocument::ShowRow(int,short,_Bool)
     _Bool bShow
     0
-sc/inc/document.hxx:1747
+sc/inc/document.hxx:1751
     void ScDocument::SetRowFlags(int,int,short,enum CRFlags)
     int nStartRow
     0
-sc/inc/document.hxx:1752
+sc/inc/document.hxx:1756
     void ScDocument::GetAllRowBreaks(class std::__debug::set<int, struct std::less<int>, class std::allocator<int> > &,short,_Bool,_Bool) const
-    _Bool bPage
-    0
-sc/inc/document.hxx:1752
-    void ScDocument::GetAllRowBreaks(class std::__debug::set<int, struct std::less<int>, class std::allocator<int> > &,short,_Bool,_Bool) const
-    _Bool bManual
-    1
-sc/inc/document.hxx:1753
-    void ScDocument::GetAllColBreaks(class std::__debug::set<short, struct std::less<short>, class std::allocator<short> > &,short,_Bool,_Bool) const
     _Bool bManual
     1
-sc/inc/document.hxx:1753
+sc/inc/document.hxx:1756
+    void ScDocument::GetAllRowBreaks(class std::__debug::set<int, struct std::less<int>, class std::allocator<int> > &,short,_Bool,_Bool) const
+    _Bool bPage
+    0
+sc/inc/document.hxx:1757
     void ScDocument::GetAllColBreaks(class std::__debug::set<short, struct std::less<short>, class std::allocator<short> > &,short,_Bool,_Bool) const
     _Bool bPage
     0
-sc/inc/document.hxx:1758
-    void ScDocument::RemoveRowBreak(int,short,_Bool,_Bool)
+sc/inc/document.hxx:1757
+    void ScDocument::GetAllColBreaks(class std::__debug::set<short, struct std::less<short>, class std::allocator<short> > &,short,_Bool,_Bool) const
     _Bool bManual
     1
-sc/inc/document.hxx:1758
+sc/inc/document.hxx:1762
     void ScDocument::RemoveRowBreak(int,short,_Bool,_Bool)
     _Bool bPage
     0
-sc/inc/document.hxx:1759
+sc/inc/document.hxx:1762
+    void ScDocument::RemoveRowBreak(int,short,_Bool,_Bool)
+    _Bool bManual
+    1
+sc/inc/document.hxx:1763
     void ScDocument::RemoveColBreak(short,short,_Bool,_Bool)
     _Bool bPage
     0
-sc/inc/document.hxx:1759
+sc/inc/document.hxx:1763
     void ScDocument::RemoveColBreak(short,short,_Bool,_Bool)
     _Bool bManual
     1
-sc/inc/document.hxx:2060
+sc/inc/document.hxx:2065
     void ScDocument::UpdateBroadcastAreas(enum UpdateRefMode,const class ScRange &,short,int,short)
     enum UpdateRefMode eUpdateRefMode
     0
-sc/inc/document.hxx:2073
+sc/inc/document.hxx:2078
     void ScDocument::CollectAllAreaListeners(class std::__debug::vector<class SvtListener *, class std::allocator<class SvtListener *> > &,const class ScRange &,enum sc::AreaOverlapType)
     enum sc::AreaOverlapType eType
     1
@@ -1674,15 +1710,15 @@ sc/inc/dptabres.hxx:144
     void ScDPRelativePos::ScDPRelativePos(long,long)
     long nBase
     0
-sc/inc/filter.hxx:97
-    unsigned long ScFormatFilterPlugin::ScExportExcel5(class SfxMedium &,class ScDocument *,enum ExportFormatExcel,unsigned short)
+sc/inc/filter.hxx:81
+    class ErrCode ScFormatFilterPlugin::ScExportExcel5(class SfxMedium &,class ScDocument *,enum ExportFormatExcel,unsigned short)
     unsigned short eDest
     1
-sc/inc/filter.hxx:100
+sc/inc/filter.hxx:84
     void ScFormatFilterPlugin::ScExportHTML(class SvStream &,const class rtl::OUString &,class ScDocument *,const class ScRange &,const unsigned short,_Bool,const class rtl::OUString &,class rtl::OUString &,const class rtl::OUString &)
     const unsigned short eDest
     0
-sc/inc/filter.hxx:102
+sc/inc/filter.hxx:86
     void ScFormatFilterPlugin::ScExportRTF(class SvStream &,class ScDocument *,const class ScRange &,const unsigned short)
     const unsigned short eDest
     0
@@ -1690,6 +1726,10 @@ sc/inc/formulacell.hxx:172
     void ScFormulaCell::ScFormulaCell(class ScDocument *,const class ScAddress &,class ScTokenArray *,const enum formula::FormulaGrammar::Grammar,enum ScMatrixMode)
     enum ScMatrixMode cMatInd
     0
+sc/inc/PivotTableDataSequence.hxx:62
+    void sc::ValueAndFormat::ValueAndFormat(double,unsigned int)
+    unsigned int nNumberFormat
+    0
 sc/inc/postit.hxx:167
     void ScPostIt::ScPostIt(class ScDocument &,const class ScAddress &,unsigned int)
     unsigned int nPostItId
@@ -1698,10 +1738,18 @@ sc/inc/progress.hxx:81
     void ScProgress::SetStateText(unsigned long,const class rtl::OUString &)
     unsigned long nVal
     0
+sc/inc/queryparam.hxx:60
+    struct ScQueryEntry * ScQueryParamBase::FindEntryByField(int,_Bool)
+    _Bool bNew
+    1
 sc/inc/scabstdlg.hxx:459
     class VclPtr<class AbstractScMetricInputDlg> ScAbstractDialogFactory::CreateScMetricInputDlg(class vcl::Window *,const class rtl::OString &,long,long,enum FieldUnit,unsigned short,long,long)
     long nMinimum
     0
+sc/inc/scabstdlg.hxx:517
+    class VclPtr<class AbstractScImportOptionsDlg> ScAbstractDialogFactory::CreateScImportOptionsDlg(_Bool,const class ScImportOptions *,const class rtl::OUString *,_Bool,_Bool,_Bool)
+    _Bool bMultiByte
+    1
 sc/inc/scopetools.hxx:47
     void sc::UndoSwitch::UndoSwitch(class ScDocument &,_Bool)
     _Bool bUndo
@@ -1710,31 +1758,31 @@ sc/inc/scopetools.hxx:56
     void sc::IdleSwitch::IdleSwitch(class ScDocument &,_Bool)
     _Bool bEnableIdle
     0
-sc/inc/table.hxx:733
+sc/inc/table.hxx:735
     void ScTable::SetOptimalHeightOnly(class sc::RowHeightContext &,int,int,class ScProgress *,unsigned long)
     int nStartRow
     0
-sc/inc/table.hxx:848
+sc/inc/table.hxx:850
     _Bool ScTable::RowHiddenLeaf(int,int *,int *) const
     int * pFirstRow
     0
-sc/inc/table.hxx:853
+sc/inc/table.hxx:855
     void ScTable::CopyColHidden(class ScTable &,short,short)
     short nStartCol
     0
-sc/inc/table.hxx:854
+sc/inc/table.hxx:856
     void ScTable::CopyRowHidden(class ScTable &,int,int)
     int nStartRow
     0
-sc/inc/table.hxx:864
+sc/inc/table.hxx:866
     _Bool ScTable::ColFiltered(short,short *,short *) const
     short * pFirstCol
     0
-sc/inc/table.hxx:866
+sc/inc/table.hxx:868
     void ScTable::CopyColFiltered(class ScTable &,short,short)
     short nStartCol
     0
-sc/inc/table.hxx:867
+sc/inc/table.hxx:869
     void ScTable::CopyRowFiltered(class ScTable &,int,int)
     int nStartRow
     0
@@ -1742,11 +1790,15 @@ sc/inc/token.hxx:272
     void ScRefListToken::ScRefListToken(_Bool)
     _Bool bArrayResult
     1
-sc/inc/types.hxx:110
+sc/inc/types.hxx:109
     void sc::MultiDataCellState::MultiDataCellState(enum sc::MultiDataCellState::StateType)
     enum sc::MultiDataCellState::StateType eState
     1
-sc/source/core/data/dociter.cxx:1278
+sc/source/core/data/column.cxx:887
+    void (anonymous namespace)::CopyToClipHandler::CopyToClipHandler(const class ScColumn &,class ScColumn &,struct sc::ColumnBlockPosition *,_Bool)
+    _Bool bCopyNotes
+    1
+sc/source/core/data/dociter.cxx:1277
     void BoolResetter::BoolResetter(_Bool &,_Bool)
     _Bool b
     1
@@ -1762,7 +1814,7 @@ sc/source/core/opencl/opbase.hxx:113
     class std::basic_string<char, struct std::char_traits<char>, class std::allocator<char> > sc::opencl::DynamicKernelArgument::GenStringSlidingWindowDeclRef(_Bool) const
     _Bool 
     0
-sc/source/core/tool/compiler.cxx:746
+sc/source/core/tool/compiler.cxx:745
     void ConventionOOO_A1::ConventionOOO_A1(enum formula::FormulaGrammar::AddressConvention)
     enum formula::FormulaGrammar::AddressConvention eConv
     1
@@ -1848,11 +1900,11 @@ sc/source/filter/inc/xechart.hxx:333
     1
 sc/source/filter/inc/xechart.hxx:361
     void XclExpChFrame::SetAutoFlags(_Bool,_Bool)
-    _Bool bAutoPos
+    _Bool bAutoSize
     0
 sc/source/filter/inc/xechart.hxx:361
     void XclExpChFrame::SetAutoFlags(_Bool,_Bool)
-    _Bool bAutoSize
+    _Bool bAutoPos
     0
 sc/source/filter/inc/xeextlst.hxx:189
     class std::shared_ptr<class XclExpExt> XclExtLst::GetItem(enum XclExpExtType)
@@ -1870,57 +1922,57 @@ sc/source/filter/inc/xepivot.hxx:273
     unsigned short XclExpPTField::GetItemIndex(const class rtl::OUString &,unsigned short) const
     unsigned short nDefaultIdx
     0
-sc/source/filter/inc/xestream.hxx:352
+sc/source/filter/inc/xestream.hxx:341
     class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,struct FSEND_t)
-    const char * value2
+    const char * value6
+    0
+sc/source/filter/inc/xestream.hxx:341
+    class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,struct FSEND_t)
+    const char * value13
     0
-sc/source/filter/inc/xestream.hxx:352
+sc/source/filter/inc/xestream.hxx:341
     class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,struct FSEND_t)
-    const char * value8
+    const char * value7
     0
-sc/source/filter/inc/xestream.hxx:352
+sc/source/filter/inc/xestream.hxx:341
     class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,struct FSEND_t)
-    const char * value4
+    const char * value5
     0
-sc/source/filter/inc/xestream.hxx:352
+sc/source/filter/inc/xestream.hxx:341
     class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,struct FSEND_t)
     const char * value3
     0
-sc/source/filter/inc/xestream.hxx:352
+sc/source/filter/inc/xestream.hxx:341
     class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,struct FSEND_t)
-    const char * value9
+    const char * value10
     0
-sc/source/filter/inc/xestream.hxx:352
+sc/source/filter/inc/xestream.hxx:341
     class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,struct FSEND_t)
     const char * value12
     0
-sc/source/filter/inc/xestream.hxx:352
-    class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,struct FSEND_t)
-    const char * value13
-    0
-sc/source/filter/inc/xestream.hxx:352
-    class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,struct FSEND_t)
-    const char * value14
-    0
-sc/source/filter/inc/xestream.hxx:352
+sc/source/filter/inc/xestream.hxx:341
     class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,struct FSEND_t)
-    const char * value7
+    const char * value4
     0
-sc/source/filter/inc/xestream.hxx:352
+sc/source/filter/inc/xestream.hxx:341
     class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,struct FSEND_t)
-    const char * value5
+    const char * value2
     0
-sc/source/filter/inc/xestream.hxx:352
+sc/source/filter/inc/xestream.hxx:341
     class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,struct FSEND_t)
     const char * value11
     0
-sc/source/filter/inc/xestream.hxx:352
+sc/source/filter/inc/xestream.hxx:341
     class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,struct FSEND_t)
-    const char * value6
+    const char * value9
     0
-sc/source/filter/inc/xestream.hxx:352
+sc/source/filter/inc/xestream.hxx:341
     class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,struct FSEND_t)
-    const char * value10
+    const char * value8
+    0
+sc/source/filter/inc/xestream.hxx:341
+    class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,struct FSEND_t)
+    const char * value14
     0
 sc/source/filter/inc/xestring.hxx:74
     void XclExpString::Assign(char16_t)
@@ -1967,7 +2019,7 @@ sc/source/filter/inc/xipage.hxx:59
     unsigned short nXclPaperSize
     0
 sc/source/filter/inc/xiroot.hxx:120
-    void XclImpRootData::XclImpRootData(enum XclBiff,class SfxMedium &,class tools::SvRef<class SotStorage>,class ScDocument &,unsigned short)
+    void XclImpRootData::XclImpRootData(enum XclBiff,class SfxMedium &,const class tools::SvRef<class SotStorage> &,class ScDocument &,unsigned short)
     unsigned short eTextEnc
     1
 sc/source/filter/inc/xladdress.hxx:63
@@ -1992,11 +2044,11 @@ sc/source/filter/inc/xlformula.hxx:445
     1
 sc/source/filter/inc/xltools.hxx:62
     void XclGuid::XclGuid(unsigned int,unsigned short,unsigned short,unsigned char,unsigned char,unsigned char,unsigned char,unsigned char,unsigned char,unsigned char,unsigned char)
-    unsigned char nData45
+    unsigned char nData43
     0
 sc/source/filter/inc/xltools.hxx:62
     void XclGuid::XclGuid(unsigned int,unsigned short,unsigned short,unsigned char,unsigned char,unsigned char,unsigned char,unsigned char,unsigned char,unsigned char,unsigned char)
-    unsigned char nData43
+    unsigned char nData45
     0
 sc/source/filter/oox/formulaparser.cxx:462
     struct com::sun::star::sheet::FormulaToken & oox::xls::FormulaParserImpl::getOperandToken(unsigned long,unsigned long)
@@ -2026,14 +2078,18 @@ sc/source/ui/inc/AccessibleDocument.hxx:250
     void ScAccessibleDocument::RemoveChild(const class com::sun::star::uno::Reference<class com::sun::star::accessibility::XAccessible> &,_Bool)
     _Bool bFireEvent
     1
-sc/source/ui/inc/acredlin.hxx:127
+sc/source/ui/inc/acredlin.hxx:125
     class SvTreeListEntry * ScAcceptChgDlg::AppendFilteredAction(const class ScChangeAction *,enum ScChangeActionState,class SvTreeListEntry *,_Bool,_Bool)
     _Bool bDelMaster
     0
-sc/source/ui/inc/acredlin.hxx:127
+sc/source/ui/inc/acredlin.hxx:125
     class SvTreeListEntry * ScAcceptChgDlg::AppendFilteredAction(const class ScChangeAction *,enum ScChangeActionState,class SvTreeListEntry *,_Bool,_Bool)
     _Bool bDisabled
     0
+sc/source/ui/inc/dataprovider.hxx:160
+    void sc::ScDBDataManager::ScDBDataManager(class ScDBData *,_Bool)
+    _Bool bAllowResize
+    0
 sc/source/ui/inc/dbdocfun.hxx:86
     _Bool ScDBDocFunc::RepeatDB(const class rtl::OUString &,_Bool,_Bool,short)
     _Bool bApi
@@ -2070,7 +2126,7 @@ sc/source/ui/inc/docfunc.hxx:184
     _Bool ScDocFunc::FillAuto(class ScRange &,const class ScMarkData *,enum FillDir,enum FillCmd,enum FillDateCmd,unsigned long,double,double,_Bool,_Bool)
     _Bool bRecord
     1
-sc/source/ui/inc/navipi.hxx:271
+sc/source/ui/inc/navipi.hxx:270
     void ScNavigatorDialogWrapper::ScNavigatorDialogWrapper(class vcl::Window *,unsigned short,class SfxBindings *,struct SfxChildWinInfo *)
     unsigned short nId
     0
@@ -2084,14 +2140,14 @@ sc/source/ui/inc/spellparam.hxx:37
     0
 sc/source/ui/inc/spellparam.hxx:40
     void ScConversionParam::ScConversionParam(enum ScConversionType,struct o3tl::strong_int<unsigned short, struct LanguageTypeTag>,int,_Bool)
-    int nOptions
-    0
-sc/source/ui/inc/spellparam.hxx:40
-    void ScConversionParam::ScConversionParam(enum ScConversionType,struct o3tl::strong_int<unsigned short, struct LanguageTypeTag>,int,_Bool)
     _Bool bIsInteractive
     1
 sc/source/ui/inc/spellparam.hxx:40
     void ScConversionParam::ScConversionParam(enum ScConversionType,struct o3tl::strong_int<unsigned short, struct LanguageTypeTag>,int,_Bool)
+    int nOptions
+    0
+sc/source/ui/inc/spellparam.hxx:40
+    void ScConversionParam::ScConversionParam(enum ScConversionType,struct o3tl::strong_int<unsigned short, struct LanguageTypeTag>,int,_Bool)
     enum ScConversionType eConvType
     1
 sc/source/ui/inc/spellparam.hxx:47
@@ -2126,10 +2182,14 @@ sc/source/ui/inc/tabview.hxx:427
     void ScTabView::MoveCursorScreen(short,int,enum ScFollowMode,_Bool)
     short nMovX
     0
-sc/source/ui/inc/undobase.hxx:147
+sc/source/ui/inc/undobase.hxx:145
     void ScMoveUndo::ScMoveUndo(class ScDocShell *,class ScDocument *,class ScRefUndoData *,enum ScMoveUndoMode)
     enum ScMoveUndoMode eRefMode
     1
+sc/source/ui/inc/undodat.hxx:428
+    void ScUndoDataForm::ScUndoDataForm(class ScDocShell *,short,int,short,short,int,short,const class ScMarkData &,class ScDocument *,class ScDocument *,enum InsertDeleteFlags,class ScRefUndoData *)
+    enum InsertDeleteFlags nNewFlags
+    0
 sc/source/ui/inc/viewdata.hxx:484
     class Point ScViewData::GetScrPos(short,int,enum ScHSplitPos) const
     int nWhereY
@@ -2162,23 +2222,23 @@ sc/source/ui/vba/vbarange.hxx:114
     class com::sun::star::uno::Reference<class ooo::vba::excel::XRange> ScVbaRange::getArea(int)
     int nIndex
     0
-scaddins/source/analysis/analysishelper.hxx:83
+scaddins/source/analysis/analysishelper.hxx:79
     int GetDiffDate360(const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,int,int,_Bool)
     _Bool bUSAMethod
     1
-scaddins/source/analysis/analysishelper.hxx:97
+scaddins/source/analysis/analysishelper.hxx:93
     int GetDaysInYear(int,int,int)
-    int nDate
+    int nNullDate
     0
-scaddins/source/analysis/analysishelper.hxx:97
+scaddins/source/analysis/analysishelper.hxx:93
     int GetDaysInYear(int,int,int)
-    int nNullDate
+    int nDate
     0
-scaddins/source/analysis/analysishelper.hxx:283
+scaddins/source/analysis/analysishelper.hxx:273
     void sca::analysis::SortedIndividualInt32List::InsertHolidayList(const class sca::analysis::ScaAnyConverter &,const class com::sun::star::uno::Any &,int,_Bool)
     _Bool bInsertOnWeekend
     0
-scaddins/source/analysis/analysishelper.hxx:933
+scaddins/source/analysis/analysishelper.hxx:923
     int sca::analysis::ScaAnyConverter::getInt32(const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,const class com::sun::star::uno::Any &,int)
     int nDefault
     0
@@ -2198,6 +2258,10 @@ sd/inc/CustomAnimationEffect.hxx:134
     _Bool sd::CustomAnimationEffect::setTransformationProperty(int,enum sd::EValue,const class com::sun::star::uno::Any &)
     enum sd::EValue eValue
     1
+sd/inc/drawdoc.hxx:257
+    void SdDrawDocument::InsertBookmark(const class std::__debug::vector<class rtl::OUString, class std::allocator<class rtl::OUString> > &,class std::__debug::vector<class rtl::OUString, class std::allocator<class rtl::OUString> > &,_Bool,_Bool,unsigned short,class sd::DrawDocShell *,const class Point *)
+    _Bool bReplace
+    0
 sd/inc/shapelist.hxx:56
     void sd::ShapeList::seekShape(unsigned int)
     unsigned int nIndex
@@ -2206,27 +2270,27 @@ sd/qa/unit/misc-tests.cxx:73
     class tools::SvRef<class sd::DrawDocShell> SdMiscTest::Load(const class rtl::OUString &,int)
     int nFormat
     0
-sd/qa/unit/sdmodeltestbase.hxx:294
+sd/qa/unit/sdmodeltestbase.hxx:297
     const class SdrPage * SdModelTestBase::GetPage(int,class tools::SvRef<class sd::DrawDocShell>)
     int nPage
     1
-sd/qa/unit/sdmodeltestbase.hxx:351
+sd/qa/unit/sdmodeltestbase.hxx:354
     class com::sun::star::uno::Reference<class com::sun::star::text::XTextField> SdModelTestBase::getTextFieldFromPage(int,int,int,int,class tools::SvRef<class sd::DrawDocShell>)
-    int nPara
+    int nRun
     0
-sd/qa/unit/sdmodeltestbase.hxx:351
+sd/qa/unit/sdmodeltestbase.hxx:354
     class com::sun::star::uno::Reference<class com::sun::star::text::XTextField> SdModelTestBase::getTextFieldFromPage(int,int,int,int,class tools::SvRef<class sd::DrawDocShell>)
-    int nRun
+    int nPara
     0
-sd/source/filter/eppt/epptbase.hxx:385
+sd/source/filter/eppt/epptbase.hxx:384
     unsigned int PPTWriterBase::GetMasterIndex(enum PageType)
     enum PageType ePageType
     0
-sd/source/filter/eppt/epptooxml.hxx:104
-    void oox::core::PowerPointExport::WriteAnimationCondition(const class std::shared_ptr<class sax_fastparser::FastSerializerHelper> &,class com::sun::star::uno::Any &,_Bool,_Bool)
+sd/source/filter/eppt/epptooxml.hxx:102
+    void oox::core::PowerPointExport::WriteAnimationCondition(const class std::shared_ptr<class sax_fastparser::FastSerializerHelper> &,const class com::sun::star::uno::Any &,_Bool,_Bool)
     _Bool bWriteEvent
     0
-sd/source/filter/eppt/epptooxml.hxx:113
+sd/source/filter/eppt/epptooxml.hxx:111
     void oox::core::PowerPointExport::WriteAnimationNodeCommonPropsStart(const class std::shared_ptr<class sax_fastparser::FastSerializerHelper> &,const class com::sun::star::uno::Reference<class com::sun::star::animations::XAnimationNode> &,_Bool,_Bool)
     _Bool bSingle
     1
@@ -2238,11 +2302,11 @@ sd/source/filter/eppt/text.hxx:109
     void FieldEntry::FieldEntry(unsigned int,unsigned int,unsigned int)
     unsigned int nStart
     0
-sd/source/ui/inc/DrawDocShell.hxx:70
+sd/source/ui/inc/DrawDocShell.hxx:71
     void sd::DrawDocShell::DrawDocShell(class SdDrawDocument *,enum SfxObjectCreateMode,_Bool,enum DocumentType)
     _Bool bSdDataObj
     1
-sd/source/ui/inc/DrawDocShell.hxx:70
+sd/source/ui/inc/DrawDocShell.hxx:71
     void sd::DrawDocShell::DrawDocShell(class SdDrawDocument *,enum SfxObjectCreateMode,_Bool,enum DocumentType)
     enum SfxObjectCreateMode eMode
     0
@@ -2270,23 +2334,19 @@ sd/source/ui/inc/TemplateScanner.hxx:81
     void sd::TemplateDir::EnableSorting(_Bool)
     _Bool bSortingEnabled
     0
-sd/source/ui/inc/ToolBarManager.hxx:218
-    void sd::ToolBarManager::SetToolBarShell(enum sd::ToolBarManager::ToolBarGroup,int)
+sd/source/ui/inc/ToolBarManager.hxx:217
+    void sd::ToolBarManager::SetToolBarShell(enum sd::ToolBarManager::ToolBarGroup,enum ToolbarId)
     enum sd::ToolBarManager::ToolBarGroup eGroup
     1
 sd/source/ui/inc/tools/ConfigurationAccess.hxx:56
     void sd::tools::ConfigurationAccess::ConfigurationAccess(const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &,const class rtl::OUString &,const enum sd::tools::ConfigurationAccess::WriteMode)
     const enum sd::tools::ConfigurationAccess::WriteMode eMode
     1
-sd/source/ui/inc/unoaprms.hxx:134
-    void SdAnimationPrmsUndoAction::SetPathObj(class SdrPathObj *,class SdrPathObj *)
-    class SdrPathObj * pTheOldPath
-    0
-sd/source/ui/inc/unomodel.hxx:135
+sd/source/ui/inc/unomodel.hxx:133
     void SdXImpressDocument::SdXImpressDocument(class SdDrawDocument *,_Bool)
     _Bool bClipBoard
     1
-sd/source/ui/inc/View.hxx:159
+sd/source/ui/inc/View.hxx:158
     _Bool sd::View::IsPresObjSelected(_Bool,_Bool,_Bool,_Bool) const
     _Bool bOnMasterPage
     1
@@ -2302,15 +2362,15 @@ sdext/source/minimizer/configurationaccess.hxx:93
     short ConfigurationAccess::GetConfigProperty(const enum PPPOptimizerTokenEnum,const short) const
     const short nDefault
     0
-sdext/source/pdfimport/wrapper/wrapper.cxx:990
+sdext/source/pdfimport/wrapper/wrapper.cxx:983
     oslFileError pdfi::Buffering::read(char *,short,unsigned long *)
     short count
     1
-sdext/source/presenter/PresenterTextView.hxx:230
+sdext/source/presenter/PresenterTextView.hxx:232
     void sdext::presenter::PresenterTextView::SetOffset(const double,const double)
     const double nLeft
     0
-sfx2/source/inc/workwin.hxx:286
+sfx2/source/inc/workwin.hxx:280
     void SfxWorkWindow::SetChildWindowVisible_Impl(unsigned int,_Bool,enum SfxVisibilityFlags)
     _Bool 
     1
@@ -2330,11 +2390,11 @@ starmath/inc/rect.hxx:176
     class SmRect & SmRect::ExtendBy(const class SmRect &,enum RectCopyMBL,_Bool)
     enum RectCopyMBL eCopyMode
     0
-starmath/source/cfgitem.hxx:85
+starmath/source/cfgitem.hxx:86
     const class rtl::OUString SmFontFormatList::GetFontFormatId(const struct SmFontFormat &,_Bool)
     _Bool bAdd
     1
-store/source/object.hxx:62
+store/source/object.hxx:57
     type-parameter-?-? * query(class store::OStoreObject *,type-parameter-?-? *)
     type-parameter-?-? * 
     0
@@ -2342,19 +2402,19 @@ svl/source/inc/passwordcontainer.hxx:152
     void NamePassRecord::RemovePasswords(signed char)
     signed char nStatus
     1
-svl/source/numbers/zforfind.hxx:403
+svl/source/numbers/zforfind.hxx:404
     _Bool ImpSvNumberInputScan::IsDatePatternNumberOfType(unsigned short,char16_t)
     unsigned short nNumber
     0
-svtools/source/contnr/imivctl.hxx:415
+svtools/source/contnr/imivctl.hxx:410
     const class Size & SvxIconChoiceCtrl_Impl::GetItemSize(enum IcnViewFieldType) const
     enum IcnViewFieldType 
     1
-svtools/source/contnr/imivctl.hxx:466
+svtools/source/contnr/imivctl.hxx:461
     void SvxIconChoiceCtrl_Impl::SetColumn(unsigned short,const class SvxIconChoiceCtrlColumnInfo &)
     unsigned short nIndex
     0
-svtools/source/contnr/imivctl.hxx:467
+svtools/source/contnr/imivctl.hxx:462
     const class SvxIconChoiceCtrlColumnInfo * SvxIconChoiceCtrl_Impl::GetColumn(unsigned short) const
     unsigned short nIndex
     0
@@ -2362,11 +2422,11 @@ svtools/source/control/valueimp.hxx:217
     void ValueItemAcc::FireAccessibleEvent(short,const class com::sun::star::uno::Any &,const class com::sun::star::uno::Any &)
     short nEventId
     1
-svtools/source/inc/svimpbox.hxx:185
+svtools/source/inc/svimpbox.hxx:182
     void SvImpLBox::FindMostRight(class SvTreeListEntry *,class SvTreeListEntry *)
     class SvTreeListEntry * EntryToIgnore
     0
-svtools/source/inc/svimpbox.hxx:278
+svtools/source/inc/svimpbox.hxx:275
     void SvImpLBox::SelectEntry(class SvTreeListEntry *,_Bool)
     _Bool bSelect
     0
@@ -2406,7 +2466,7 @@ svx/inc/sxsoitm.hxx:36
     void SdrVertShearOneItem::SdrVertShearOneItem(long)
     long nAngle
     0
-svx/source/dialog/srchdlg.cxx:756
+svx/source/dialog/srchdlg.cxx:753
     void (anonymous namespace)::ToggleSaveToModule::ToggleSaveToModule(class SvxSearchDialog &,_Bool)
     _Bool bValue
     0
@@ -2414,19 +2474,19 @@ svx/source/gallery2/galbrws1.hxx:126
     void GalleryBrowser1::SelectTheme(unsigned short)
     unsigned short nThemePos
     0
-svx/source/inc/fmexpl.hxx:503
+svx/source/inc/fmexpl.hxx:502
     signed char svxform::NavigatorTree::implExecuteDataTransfer(const class svxform::OControlTransferData &,signed char,const class Point &,_Bool)
     _Bool _bDnD
     1
-svx/source/inc/fmshimp.hxx:263
+svx/source/inc/fmshimp.hxx:262
     void FmXFormShell::didPrepareClose(_Bool)
     _Bool _bDid
     1
 svx/source/inc/fmvwimp.hxx:269
-    _Bool FmXFormView::createControlLabelPair(class OutputDevice &,int,int,const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,const class com::sun::star::uno::Reference<class com::sun::star::util::XNumberFormats> &,unsigned short,const class rtl::OUString &,class SdrUnoObj *&,class SdrUnoObj *&,const class com::sun::star::uno::Reference<class com::sun::star::sdbc::XDataSource> &,const class rtl::OUString &,const class rtl::OUString &,const int)
+    _Bool FmXFormView::createControlLabelPair(const class OutputDevice &,int,int,const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,const class com::sun::star::uno::Reference<class com::sun::star::util::XNumberFormats> &,unsigned short,const class rtl::OUString &,class SdrUnoObj *&,class SdrUnoObj *&,const class com::sun::star::uno::Reference<class com::sun::star::sdbc::XDataSource> &,const class rtl::OUString &,const class rtl::OUString &,const int)
     int _nXOffsetMM
     0
-svx/source/svdraw/svdoole2.cxx:630
+svx/source/svdraw/svdoole2.cxx:627
     void SdrOle2ObjImpl::SdrOle2ObjImpl(_Bool,const class svt::EmbeddedObjectRef &)
     _Bool bFrame
     0
@@ -2434,7 +2494,7 @@ svx/source/table/celltypes.hxx:59
     void sdr::table::RangeIterator::RangeIterator<T>(const type-parameter-?-? &,const type-parameter-?-? &,_Bool)
     const type-parameter-?-? & rStart
     0
-sw/inc/calc.hxx:106
+sw/inc/calc.hxx:107
     void SwSbxValue::SwSbxValue(long)
     long n
     0
@@ -2442,74 +2502,74 @@ sw/inc/charfmt.hxx:29
     void SwCharFormat::SwCharFormat(class SwAttrPool &,const char *,class SwCharFormat *)
     class SwCharFormat * pDerivedFrom
     0
-sw/inc/crsrsh.hxx:548
+sw/inc/crsrsh.hxx:547
     _Bool SwCursorShell::GotoMark(const class sw::mark::IMark *const,_Bool)
     _Bool bAtStart
     1
-sw/inc/dbfld.hxx:85
+sw/inc/dbfld.hxx:83
     void SwDBField::ChgValue(double,_Bool)
     _Bool bVal
     1
-sw/inc/doc.hxx:381
+sw/inc/doc.hxx:375
     signed char SwDoc::SetFlyFrameAnchor(class SwFrameFormat &,class SfxItemSet &,_Bool)
     _Bool bNewFrames
     0
-sw/inc/doc.hxx:1000
+sw/inc/doc.hxx:991
     void SwDoc::CorrAbs(const class SwNodeIndex &,const struct SwPosition &,const int,_Bool)
     _Bool bMoveCursor
     1
-sw/inc/doc.hxx:1020
+sw/inc/doc.hxx:1011
     void SwDoc::CorrRel(const class SwNodeIndex &,const struct SwPosition &,const int,_Bool)
     const int nOffset
     0
-sw/inc/doc.hxx:1060
+sw/inc/doc.hxx:1049
     void SwDoc::SetCounted(const class SwPaM &,_Bool)
     _Bool bCounted
     1
-sw/inc/doc.hxx:1127
+sw/inc/doc.hxx:1116
     const class SwNumRule * SwDoc::SearchNumRule(const struct SwPosition &,const _Bool,const _Bool,const _Bool,int,class rtl::OUString &,const _Bool)
     const _Bool bOutline
     0
-sw/inc/doc.hxx:1127
+sw/inc/doc.hxx:1116
     const class SwNumRule * SwDoc::SearchNumRule(const struct SwPosition &,const _Bool,const _Bool,const _Bool,int,class rtl::OUString &,const _Bool)
     const _Bool bForward
     0
-sw/inc/doc.hxx:1403
+sw/inc/doc.hxx:1393
     const class SvNumberFormatter * SwDoc::GetNumberFormatter(_Bool) const
     _Bool bCreate
     1
-sw/inc/doc.hxx:1609
+sw/inc/doc.hxx:1598
     void SwDoc::dumpAsXml(struct _xmlTextWriter *) const
     struct _xmlTextWriter * 
     0
-sw/inc/docary.hxx:395
+sw/inc/docary.hxx:397
     _Bool SwExtraRedlineTable::DeleteTableRowRedline(class SwDoc *,const class SwTableLine &,_Bool,unsigned short)
     _Bool bSaveInUndo
     1
-sw/inc/docary.hxx:396
+sw/inc/docary.hxx:398
     _Bool SwExtraRedlineTable::DeleteTableCellRedline(class SwDoc *,const class SwTableBox &,_Bool,unsigned short)
     _Bool bSaveInUndo
     1
-sw/inc/docufld.hxx:308
+sw/inc/docufld.hxx:307
     void SwHiddenTextField::SwHiddenTextField(class SwHiddenTextFieldType *,_Bool,const class rtl::OUString &,const class rtl::OUString &,_Bool,unsigned short)
     _Bool bConditional
     1
-sw/inc/docufld.hxx:308
+sw/inc/docufld.hxx:307
     void SwHiddenTextField::SwHiddenTextField(class SwHiddenTextFieldType *,_Bool,const class rtl::OUString &,const class rtl::OUString &,_Bool,unsigned short)
     _Bool bHidden
     0
-sw/inc/docufld.hxx:514
+sw/inc/docufld.hxx:513
     void SwDocInfoField::SwDocInfoField(class SwDocInfoFieldType *,unsigned short,const class rtl::OUString &,const class rtl::OUString &,unsigned int)
     unsigned int nFormat
     0
 sw/inc/fesh.hxx:416
     const class SwFrameFormat * SwFEShell::GetFlyNum(unsigned long,enum FlyCntType,_Bool) const
-    _Bool bIgnoreTextBoxes
-    0
-sw/inc/fesh.hxx:416
-    const class SwFrameFormat * SwFEShell::GetFlyNum(unsigned long,enum FlyCntType,_Bool) const
     enum FlyCntType eType
     1
+sw/inc/fesh.hxx:416
+    const class SwFrameFormat * SwFEShell::GetFlyNum(unsigned long,enum FlyCntType,_Bool) const
+    _Bool bIgnoreTextBoxes
+    0
 sw/inc/fesh.hxx:418
     class std::__debug::vector<const class SwFrameFormat *, class std::allocator<const class SwFrameFormat *> > SwFEShell::GetFlyFrameFormats(enum FlyCntType,_Bool)
     _Bool bIgnoreTextBoxes
@@ -2522,10 +2582,18 @@ sw/inc/fmtcol.hxx:141
     void SwGrfFormatColl::SwGrfFormatColl(class SwAttrPool &,const char *,class SwGrfFormatColl *)
     class SwGrfFormatColl * pDerFrom
     0
-sw/inc/frmfmt.hxx:83
+sw/inc/frmfmt.hxx:84
     void SwFrameFormat::SwFrameFormat(class SwAttrPool &,const char *,class SwFrameFormat *,unsigned short,const unsigned short *)
     const unsigned short * pWhichRange
     0
+sw/inc/htmltbl.hxx:251
+    void SwHTMLTableLayout::SwHTMLTableLayout(const class SwTable *,unsigned short,unsigned short,_Bool,_Bool,unsigned short,_Bool,unsigned short,unsigned short,unsigned short,enum SvxAdjust,unsigned short,unsigned short,unsigned short,unsigned short,unsigned short,unsigned short,unsigned short)
+    unsigned short nInhLeftBWidth
+    0
+sw/inc/htmltbl.hxx:251
+    void SwHTMLTableLayout::SwHTMLTableLayout(const class SwTable *,unsigned short,unsigned short,_Bool,_Bool,unsigned short,_Bool,unsigned short,unsigned short,unsigned short,enum SvxAdjust,unsigned short,unsigned short,unsigned short,unsigned short,unsigned short,unsigned short,unsigned short)
+    unsigned short nInhRightBWidth
+    0
 sw/inc/IDocumentRedlineAccess.hxx:172
     _Bool IDocumentRedlineAccess::AppendTableRowRedline(class SwTableRowRedline *,_Bool)
     _Bool bCallDelete
@@ -2551,8 +2619,8 @@ sw/inc/index.hxx:66
      ###1
     0
 sw/inc/ndgrf.hxx:65
-    void SwGrfNode::SwGrfNode(const class SwNodeIndex &,const class GraphicObject &,class SwGrfFormatColl *,class SwAttrSet *)
-    class SwAttrSet * pAutoAttr
+    void SwGrfNode::SwGrfNode(const class SwNodeIndex &,const class GraphicObject &,class SwGrfFormatColl *,const class SwAttrSet *)
+    const class SwAttrSet * pAutoAttr
     0
 sw/inc/ndindex.hxx:87
     unsigned long SwNodeIndex::operator++(int)
@@ -2567,14 +2635,14 @@ sw/inc/ndindex.hxx:143
     unsigned long nEndIdx
     0
 sw/inc/ndole.hxx:93
-    void SwOLENode::SwOLENode(const class SwNodeIndex &,const class svt::EmbeddedObjectRef &,class SwGrfFormatColl *,class SwAttrSet *)
-    class SwAttrSet * pAutoAttr
+    void SwOLENode::SwOLENode(const class SwNodeIndex &,const class svt::EmbeddedObjectRef &,class SwGrfFormatColl *,const class SwAttrSet *)
+    const class SwAttrSet * pAutoAttr
     0
-sw/inc/ndtxt.hxx:322
+sw/inc/ndtxt.hxx:319
     void SwTextNode::CopyText(class SwTextNode *const,const class SwIndex &,const int,const _Bool)
     const _Bool bForceCopyOfAllAttrs
     1
-sw/inc/ndtxt.hxx:684
+sw/inc/ndtxt.hxx:681
     _Bool SwTextNode::GetExpandText(class SwTextNode &,const class SwIndex *,int,int,_Bool,_Bool,_Bool) const
     _Bool bWithNum
     0
@@ -2594,24 +2662,24 @@ sw/inc/pam.hxx:196
     _Bool SwPaM::Find(const class SfxPoolItem &,_Bool,const struct SwMoveFnCollection &,const class SwPaM *,_Bool)
     _Bool bValue
     0
-sw/inc/shellio.hxx:502
+sw/inc/shellio.hxx:501
     void SwWriter::SwWriter(class SvStream &,class SwCursorShell &,_Bool)
     _Bool bWriteAll
     0
-sw/inc/shellio.hxx:504
+sw/inc/shellio.hxx:503
     void SwWriter::SwWriter(class SvStream &,class SwPaM &,_Bool)
     _Bool bWriteAll
     0
-sw/inc/shellio.hxx:508
+sw/inc/shellio.hxx:507
     void SwWriter::SwWriter(class SfxMedium &,class SwCursorShell &,_Bool)
     _Bool bWriteAll
     1
-sw/inc/swabstdlg.hxx:306
+sw/inc/swabstdlg.hxx:305
     void AbstractSwSelGlossaryDlg::SelectEntryPos(int)
     int nIdx
     0
 sw/inc/swcrsr.hxx:153
-    _Bool SwCursor::SelectWordWT(class SwViewShell *,short,const class Point *)
+    _Bool SwCursor::SelectWordWT(const class SwViewShell *,short,const class Point *)
     short nWordType
     1
 sw/inc/swmodule.hxx:156
@@ -2626,11 +2694,11 @@ sw/qa/extras/inc/swmodeltestbase.hxx:255
     void SwModelTestBase::executeImportExport(const char *,const char *)
     const char * pPassword
     0
-sw/qa/extras/ooxmlimport/ooxmlimport.cxx:91
+sw/qa/extras/ooxmlimport/ooxmlimport.cxx:93
     void FailTest::executeImportTest(const char *,const char *)
     const char * 
     0
-sw/source/core/access/accmap.cxx:402
+sw/source/core/access/accmap.cxx:399
     void SwAccessibleEvent_Impl::SwAccessibleEvent_Impl(enum SwAccessibleEvent_Impl::EventType,class SwAccessibleContext *,const class sw::access::SwAccessibleChild &,const enum AccessibleStates)
     enum SwAccessibleEvent_Impl::EventType eT
     0
@@ -2638,19 +2706,19 @@ sw/source/core/crsr/swcrsr.cxx:65
     void PercentHdl::PercentHdl(unsigned long,unsigned long,class SwDocShell *)
     unsigned long nStt
     0
-sw/source/core/doc/tblrwcl.cxx:233
-    _Bool lcl_InsDelSelLine(class SwTableLine *,struct CR_SetLineHeight &,long,_Bool)
-    _Bool bCheck
-    1
-sw/source/core/doc/tblrwcl.cxx:233
+sw/source/core/doc/tblrwcl.cxx:228
     _Bool lcl_InsDelSelLine(class SwTableLine *,struct CR_SetLineHeight &,long,_Bool)
     long nDist
     0
+sw/source/core/doc/tblrwcl.cxx:228
+    _Bool lcl_InsDelSelLine(class SwTableLine *,struct CR_SetLineHeight &,long,_Bool)
+    _Bool bCheck
+    1
 sw/source/core/inc/rolbck.hxx:358
-    void SwHistory::CopyAttr(class SwpHints *,const unsigned long,const int,const int,const _Bool)
+    void SwHistory::CopyAttr(const class SwpHints *,const unsigned long,const int,const int,const _Bool)
     const int nStart
     0
-sw/source/core/inc/swfont.hxx:294
+sw/source/core/inc/swfont.hxx:290
     const class rtl::OUString & SwFont::GetName(const enum SwFontScript) const
     const enum SwFontScript nWhich
     0
@@ -2678,11 +2746,11 @@ sw/source/filter/html/htmltab.cxx:483
     class SwTableLine * HTMLTable::MakeTableLine(class SwTableBox *,unsigned short,unsigned short,unsigned short,unsigned short)
     unsigned short nLeftCol
     0
-sw/source/filter/html/swhtml.hxx:819
+sw/source/filter/html/swhtml.hxx:815
     void SwHTMLParser::BuildTableCell(class HTMLTable *,_Bool,_Bool)
     _Bool bReadOptions
     1
-sw/source/filter/html/wrthtml.hxx:455
+sw/source/filter/html/wrthtml.hxx:454
     void SwHTMLWriter::OutBackground(const class SfxItemSet &,_Bool)
     _Bool bGraphic
     0
@@ -2690,11 +2758,11 @@ sw/source/filter/inc/fltshell.hxx:236
     void SwFltRedline::SwFltRedline(unsigned short,unsigned long,const class DateTime &,unsigned short,unsigned long)
     unsigned short eTypePrev_
     0
-sw/source/filter/inc/wrtswtbl.hxx:288
+sw/source/filter/inc/wrtswtbl.hxx:285
     unsigned short SwWriteTable::GetRelWidth(unsigned short,unsigned short) const
     unsigned short nColSpan
     1
-sw/source/filter/ww8/writerwordglue.cxx:330
+sw/source/filter/ww8/writerwordglue.cxx:328
     void myImplHelpers::IfBeforeStart::IfBeforeStart(int)
     int nStart
     0
@@ -2714,15 +2782,15 @@ sw/source/filter/ww8/wrtww8.hxx:1327
     void WW8_WrMagicTable::Append(int,unsigned long)
     unsigned long nData
     0
-sw/source/filter/ww8/ww8par.cxx:409
+sw/source/filter/ww8/ww8par.cxx:398
     class rtl::OUString Sttb::getStringAtIndex(unsigned int)
     unsigned int 
     1
-sw/source/filter/ww8/ww8par.hxx:1654
+sw/source/filter/ww8/ww8par.hxx:1673
     _Bool SwWW8ImplReader::SetUpperSpacing(class SwPaM &,int)
     int nSpace
     0
-sw/source/filter/ww8/ww8par.hxx:1690
+sw/source/filter/ww8/ww8par.hxx:1709
     void SwWW8ImplReader::Read_Obj(unsigned short,const unsigned char *,short)
     short nLen
     1
@@ -2760,11 +2828,11 @@ sw/source/uibase/inc/FrameControlsManager.hxx:46
     0
 sw/source/uibase/inc/frmmgr.hxx:96
     void SwFlyFrameAttrMgr::SetLRSpace(long,long)
-    long nRight
+    long nLeft
     0
 sw/source/uibase/inc/frmmgr.hxx:96
     void SwFlyFrameAttrMgr::SetLRSpace(long,long)
-    long nLeft
+    long nRight
     0
 sw/source/uibase/inc/frmmgr.hxx:98
     void SwFlyFrameAttrMgr::SetULSpace(long,long)
@@ -2774,7 +2842,7 @@ sw/source/uibase/inc/frmmgr.hxx:98
     void SwFlyFrameAttrMgr::SetULSpace(long,long)
     long nTop
     0
-sw/source/uibase/inc/mmconfigitem.hxx:139
+sw/source/uibase/inc/mmconfigitem.hxx:135
     void SwMailMergeConfigItem::SetIndividualGreeting(_Bool,_Bool)
     _Bool bInEMail
     0
@@ -2822,11 +2890,19 @@ vbahelper/source/vbahelper/vbacommandbarcontrols.hxx:38
     class com::sun::star::uno::Sequence<struct com::sun::star::beans::PropertyValue> ScVbaCommandBarControls::CreateMenuItemData(const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,unsigned short,const class com::sun::star::uno::Any &,_Bool,_Bool)
     _Bool isVisible
     1
+vbahelper/source/vbahelper/vbacommandbarcontrols.hxx:45
+    class com::sun::star::uno::Sequence<struct com::sun::star::beans::PropertyValue> ScVbaCommandBarControls::CreateToolbarItemData(const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,unsigned short,const class com::sun::star::uno::Any &,_Bool,int)
+    _Bool isVisible
+    1
+vbahelper/source/vbahelper/vbacommandbarcontrols.hxx:45
+    class com::sun::star::uno::Sequence<struct com::sun::star::beans::PropertyValue> ScVbaCommandBarControls::CreateToolbarItemData(const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,unsigned short,const class com::sun::star::uno::Any &,_Bool,int)
+    int nStyle
+    0
 vcl/inc/listbox.hxx:133
     class rtl::OUString ImplEntryList::GetSelectEntry(int) const
     int nIndex
     0
-vcl/inc/listbox.hxx:310
+vcl/inc/listbox.hxx:309
     void ImplListBoxWindow::EnableMouseMoveSelect(_Bool)
     _Bool bMouseMoveSelect
     1
@@ -2834,6 +2910,10 @@ vcl/inc/opengl/program.hxx:112
     void OpenGLProgram::SetVertexAttrib(unsigned int &,const class rtl::OString &,int,unsigned int,unsigned char,int,const void *)
     unsigned char bNormalized
     0
+vcl/inc/opengl/texture.hxx:79
+    _Bool OpenGLTexture::GetTextureRect(const struct SalTwoRect &,_Bool,float &,float &,float &,float &) const
+    _Bool bInverted
+    0
 vcl/inc/openglgdiimpl.hxx:108
     void OpenGLSalGraphicsImpl::ImplSetClipBit(const class vcl::Region &,unsigned int)
     unsigned int nMask
@@ -2862,7 +2942,7 @@ vcl/inc/salgdi.hxx:486
     void SalGraphics::copyArea(long,long,long,long,long,long,_Bool)
     _Bool bWindowInvalidate
     1
-vcl/inc/sallayout.hxx:198
+vcl/inc/sallayout.hxx:195
     int SalLayout::CalcAsianKerning(unsigned int,_Bool,_Bool)
     _Bool bVertical
     0
@@ -2870,6 +2950,10 @@ vcl/inc/scrptrun.h:70
     void vcl::ScriptRun::reset(const char16_t *,int,int)
     int start
     0
+vcl/inc/unx/gensys.h:36
+    int SalGenericSystem::ShowNativeDialog(const class rtl::OUString &,const class rtl::OUString &,const class std::__debug::list<class rtl::OUString, class std::allocator<class rtl::OUString> > &,int)
+    int nDefButton
+    0
 vcl/inc/unx/gtk/gtkprintwrapper.hxx:45
     void vcl::unx::GtkPrintWrapper::print_job_send(struct _GtkPrintJob *,void (*)(struct _GtkPrintJob *, void *, struct _GError *),void *,void (*)(void *)) const
     void (*)(void *) dnotify
@@ -2902,21 +2986,25 @@ vcl/inc/unx/gtk/gtkprintwrapper.hxx:65
     void vcl::unx::GtkPrintWrapper::print_unix_dialog_set_has_selection(struct _GtkPrintUnixDialog *,int) const
     int has_selection
     1
-vcl/inc/unx/printergfx.hxx:226
+vcl/inc/unx/gtk/gtkprn.hxx:34
+    _Bool GtkSalPrinter::impl_doJob(const class rtl::OUString *,const class rtl::OUString &,const class rtl::OUString &,class ImplJobSetup *,int,_Bool,class vcl::PrinterController &)
+    int i_nCopies
+    1
+vcl/inc/unx/printergfx.hxx:225
     void psp::PrinterGfx::PSSetFont(const class rtl::OString &,unsigned short)
     unsigned short nEncoding
     0
-vcl/inc/unx/printergfx.hxx:252
+vcl/inc/unx/printergfx.hxx:251
     void psp::PrinterGfx::PSHexString(const unsigned char *,short)
     short nLen
     1
 vcl/inc/unx/salbmp.h:49
     struct BitmapBuffer * X11SalBitmap::ImplCreateDIB(unsigned long,class SalX11Screen,long,long,long,long,long,_Bool)
-    long nX
+    long nY
     0
 vcl/inc/unx/salbmp.h:49
     struct BitmapBuffer * X11SalBitmap::ImplCreateDIB(unsigned long,class SalX11Screen,long,long,long,long,long,_Bool)
-    long nY
+    long nX
     0
 vcl/inc/unx/wmadaptor.hxx:182
     const class tools::Rectangle & vcl_sal::WMAdaptor::getWorkArea(int) const
@@ -2938,7 +3026,7 @@ vcl/source/gdi/bmpfast.cxx:32
     void BasePixelPtr::BasePixelPtr(unsigned char *)
     unsigned char * p
     0
-vcl/source/window/menufloatingwindow.hxx:108
+vcl/source/window/menufloatingwindow.hxx:107
     void MenuFloatingWindow::EnableScrollMenu(_Bool)
     _Bool b
     1
@@ -2974,11 +3062,11 @@ writerfilter/inc/ooxml/OOXMLDocument.hxx:151
     void writerfilter::ooxml::OOXMLDocument::resolveEndnote(class writerfilter::Stream &,unsigned int,const int)
     unsigned int aNoteType
     0
-writerfilter/source/dmapper/TDefTableHandler.hxx:74
+writerfilter/source/dmapper/TDefTableHandler.hxx:67
     void writerfilter::dmapper::TDefTableHandler::fillCellProperties(unsigned long,const class std::shared_ptr<class writerfilter::dmapper::TablePropertyMap> &) const
     unsigned long nCell
     0
-writerfilter/source/ooxml/OOXMLPropertySet.hxx:221
+writerfilter/source/ooxml/OOXMLPropertySet.hxx:222
     void writerfilter::ooxml::OOXMLHexValue::OOXMLHexValue(unsigned int)
     unsigned int nValue
     0
@@ -2986,11 +3074,11 @@ writerfilter/source/ooxml/OOXMLStreamImpl.hxx:65
     void writerfilter::ooxml::OOXMLStreamImpl::OOXMLStreamImpl(const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &,const class com::sun::star::uno::Reference<class com::sun::star::io::XInputStream> &,enum writerfilter::ooxml::OOXMLStream::StreamType_t,_Bool)
     enum writerfilter::ooxml::OOXMLStream::StreamType_t nType
     1
-xmlhelp/source/cxxhelp/provider/databases.hxx:379
+xmlhelp/source/cxxhelp/provider/databases.hxx:376
     void chelp::DataBaseIterator::DataBaseIterator(const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &,class chelp::Databases &,const class rtl::OUString &,const class rtl::OUString &,_Bool)
     _Bool bHelpText
     1
-xmlhelp/source/cxxhelp/provider/databases.hxx:384
+xmlhelp/source/cxxhelp/provider/databases.hxx:381
     void chelp::DataBaseIterator::DataBaseIterator(class chelp::Databases &,const class rtl::OUString &,const class rtl::OUString &,_Bool)
     _Bool bHelpText
     0
@@ -3018,7 +3106,7 @@ xmloff/source/text/XMLSectionExport.hxx:105
     _Bool XMLSectionExport::IsMuteSection(const class com::sun::star::uno::Reference<class com::sun::star::text::XTextContent> &,_Bool) const
     _Bool bDefault
     0
-xmloff/source/transform/TransformerBase.hxx:171
+xmloff/source/transform/TransformerBase.hxx:170
     const class XMLTransformerContext * XMLTransformerBase::GetAncestorContext(unsigned int) const
     unsigned int i
     1
diff --git a/compilerplugins/clang/constantparam.constructors.results b/compilerplugins/clang/constantparam.constructors.results
index 3d6f42ae3b60..f36996121ff2 100644
--- a/compilerplugins/clang/constantparam.constructors.results
+++ b/compilerplugins/clang/constantparam.constructors.results
@@ -10,49 +10,57 @@ bridges/source/jni_uno/nativethreadpool.cxx:40
     void (anonymous namespace)::Pool::Pool(const class rtl::Reference<class jvmaccess::VirtualMachine> &,struct _jmethodID *,struct _uno_ThreadPool *)
     struct _uno_ThreadPool * thePool
     uno_threadpool_create()
-chart2/source/controller/inc/CommandDispatchContainer.hxx:82
+chart2/source/controller/inc/CommandDispatchContainer.hxx:81
     void chart::CommandDispatchContainer::setChartDispatch(const class com::sun::star::uno::Reference<class com::sun::star::frame::XDispatch> &,const class std::__debug::set<class rtl::OUString, struct std::less<class rtl::OUString>, class std::allocator<class rtl::OUString> > &)
     const class std::__debug::set<class rtl::OUString, struct std::less<class rtl::OUString>, class std::allocator<class rtl::OUString> > & rChartCommands
     impl_getAvailableCommands()
-connectivity/source/commontools/sqlerror.cxx:62
-    void connectivity::SQLError_Impl::raiseException(const int,const class connectivity::SQLError::ParamValue &,const class connectivity::SQLError::ParamValue &,const class connectivity::SQLError::ParamValue &)
-    const class connectivity::SQLError::ParamValue & _rParamValue2
-    ParamValue()
-connectivity/source/commontools/sqlerror.cxx:62
+connectivity/source/commontools/sqlerror.cxx:64
     void connectivity::SQLError_Impl::raiseException(const int,const class connectivity::SQLError::ParamValue &,const class connectivity::SQLError::ParamValue &,const class connectivity::SQLError::ParamValue &)
     const class connectivity::SQLError::ParamValue & _rParamValue3
     ParamValue()
-connectivity/source/commontools/sqlerror.cxx:62
+connectivity/source/commontools/sqlerror.cxx:64
     void connectivity::SQLError_Impl::raiseException(const int,const class connectivity::SQLError::ParamValue &,const class connectivity::SQLError::ParamValue &,const class connectivity::SQLError::ParamValue &)
     const class connectivity::SQLError::ParamValue & _rParamValue1
     ParamValue()
+connectivity/source/commontools/sqlerror.cxx:64
+    void connectivity::SQLError_Impl::raiseException(const int,const class connectivity::SQLError::ParamValue &,const class connectivity::SQLError::ParamValue &,const class connectivity::SQLError::ParamValue &)
+    const class connectivity::SQLError::ParamValue & _rParamValue2
+    ParamValue()
 connectivity/source/commontools/TColumnsHelper.cxx:53
     void connectivity::OColumnsHelperImpl::OColumnsHelperImpl(_Bool)
     _Bool _bCase
     isCaseSensitive()
-connectivity/source/inc/calc/CTable.hxx:67
+connectivity/source/drivers/evoab2/NTable.hxx:37
+    void connectivity::evoab::OEvoabTable::OEvoabTable(class connectivity::sdbcx::OCollection *,class connectivity::evoab::OEvoabConnection *,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &)
+    const class rtl::OUString & CatalogName
+    ""
+connectivity/source/drivers/evoab2/NTable.hxx:37
+    void connectivity::evoab::OEvoabTable::OEvoabTable(class connectivity::sdbcx::OCollection *,class connectivity::evoab::OEvoabConnection *,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &)
+    const class rtl::OUString & SchemaName
+    ""
+connectivity/source/inc/calc/CTable.hxx:60
     void connectivity::calc::OCalcTable::OCalcTable(class connectivity::sdbcx::OCollection *,class connectivity::calc::OCalcConnection *,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &)
-    const class rtl::OUString & Description
+    const class rtl::OUString & CatalogName
     ""
-connectivity/source/inc/calc/CTable.hxx:67
+connectivity/source/inc/calc/CTable.hxx:60
     void connectivity::calc::OCalcTable::OCalcTable(class connectivity::sdbcx::OCollection *,class connectivity::calc::OCalcConnection *,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &)
     const class rtl::OUString & SchemaName
     ""
-connectivity/source/inc/calc/CTable.hxx:67
+connectivity/source/inc/calc/CTable.hxx:60
     void connectivity::calc::OCalcTable::OCalcTable(class connectivity::sdbcx::OCollection *,class connectivity::calc::OCalcConnection *,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &)
-    const class rtl::OUString & CatalogName
+    const class rtl::OUString & Description
     ""
-connectivity/source/inc/dbase/DTable.hxx:133
+connectivity/source/inc/dbase/DTable.hxx:149
     void connectivity::dbase::ODbaseTable::ODbaseTable(class connectivity::sdbcx::OCollection *,class connectivity::dbase::ODbaseConnection *,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &)
     const class rtl::OUString & SchemaName
     ""
-connectivity/source/inc/dbase/DTable.hxx:133
+connectivity/source/inc/dbase/DTable.hxx:149
     void connectivity::dbase::ODbaseTable::ODbaseTable(class connectivity::sdbcx::OCollection *,class connectivity::dbase::ODbaseConnection *,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &)
-    const class rtl::OUString & Description
+    const class rtl::OUString & CatalogName
     ""
-connectivity/source/inc/dbase/DTable.hxx:133
+connectivity/source/inc/dbase/DTable.hxx:149
     void connectivity::dbase::ODbaseTable::ODbaseTable(class connectivity::sdbcx::OCollection *,class connectivity::dbase::ODbaseConnection *,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &)
-    const class rtl::OUString & CatalogName
+    const class rtl::OUString & Description
     ""
 connectivity/source/inc/flat/ETable.hxx:80
     void connectivity::flat::OFlatTable::OFlatTable(class connectivity::sdbcx::OCollection *,class connectivity::flat::OFlatConnection *,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &)
@@ -74,11 +82,23 @@ connectivity/source/inc/OColumn.hxx:72
     void connectivity::OColumn::OColumn(const class rtl::OUString &,const class rtl::OUString &,int,int,int,int,int)
     const class rtl::OUString & _aTableName
     ""
+connectivity/source/inc/writer/WTable.hxx:79
+    void connectivity::writer::OWriterTable::OWriterTable(class connectivity::sdbcx::OCollection *,class connectivity::writer::OWriterConnection *,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &)
+    const class rtl::OUString & SchemaName
+    ""
+connectivity/source/inc/writer/WTable.hxx:79
+    void connectivity::writer::OWriterTable::OWriterTable(class connectivity::sdbcx::OCollection *,class connectivity::writer::OWriterConnection *,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &)
+    const class rtl::OUString & CatalogName
+    ""
+connectivity/source/inc/writer/WTable.hxx:79
+    void connectivity::writer::OWriterTable::OWriterTable(class connectivity::sdbcx::OCollection *,class connectivity::writer::OWriterConnection *,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &)
+    const class rtl::OUString & Description
+    ""
 dbaccess/source/core/api/RowSetRow.hxx:41
     void dbaccess::ORowSetOldRowHelper::ORowSetOldRowHelper(const class rtl::Reference<class connectivity::ORowVector<class connectivity::ORowSetValue> > &)
     const class rtl::Reference<class connectivity::ORowVector<class connectivity::ORowSetValue> > & _rRow
     ORowSetRow()
-dbaccess/source/core/dataaccess/ModelImpl.hxx:360
+dbaccess/source/core/dataaccess/ModelImpl.hxx:357
     void dbaccess::ODatabaseModelImpl::modelIsDisposing(const _Bool,struct dbaccess::ODatabaseModelImpl::ResetModelAccess)
     const _Bool _wasInitialized
     impl_isInitialized()
@@ -94,7 +114,7 @@ dbaccess/source/ui/inc/indexes.hxx:75
     void dbaui::OIndex::flagAsCommitted(const struct dbaui::GrantIndexAccess &)
     const struct dbaui::GrantIndexAccess & 
     GrantIndexAccess()
-dbaccess/source/ui/inc/TableCopyHelper.hxx:101
+dbaccess/source/ui/inc/TableCopyHelper.hxx:100
     void dbaui::OTableCopyHelper::pasteTable(const class TransferableDataHelper &,const class rtl::OUString &,const class utl::SharedUNOComponent<class com::sun::star::sdbc::XConnection, class utl::DisposableComponent> &)
     const class utl::SharedUNOComponent<class com::sun::star::sdbc::XConnection, class utl::DisposableComponent> & _xConnection
     ensureConnection()
@@ -102,7 +122,7 @@ dbaccess/source/ui/inc/TableWindowData.hxx:66
     _Bool dbaui::OTableWindowData::init(const class com::sun::star::uno::Reference<class com::sun::star::sdbc::XConnection> &,_Bool)
     _Bool _bAllowQueries
     allowQueries()
-dbaccess/source/ui/uno/copytablewizard.cxx:203
+dbaccess/source/ui/uno/copytablewizard.cxx:204
     void dbaui::CopyTableWizard::impl_dialogToAttributes_nothrow(const class dbaui::OCopyTableWizard &)
     const class dbaui::OCopyTableWizard & _rDialog
     impl_getDialog_throw()
@@ -110,6 +130,10 @@ desktop/source/deployment/inc/dp_interact.h:58
     void dp_misc::ProgressLevel::update(const class com::sun::star::uno::Any &) const
     const class com::sun::star::uno::Any & status
     Any()
+emfio/inc/mtftools.hxx:621
+    void emfio::MtfTools::ExcludeClipRect(const class tools::Rectangle &)
+    const class tools::Rectangle & rRect
+    ReadRectangle()
 extensions/source/abpilot/datasourcehandling.hxx:178
     void abp::ODataSource::setDataSource(const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,const class rtl::OUString &,struct abp::PackageAccessControl)
     struct abp::PackageAccessControl 
@@ -138,11 +162,11 @@ extensions/source/logging/filehandler.cxx:110
     void logging::FileHandler::leaveMethod(class logging::ComponentMethodGuard<class logging::FileHandler>::Access)
     class logging::ComponentMethodGuard<class logging::FileHandler>::Access 
     Access()
-extensions/source/propctrlr/browserlistbox.hxx:113
+extensions/source/propctrlr/browserlistbox.hxx:112
     void pcr::OBrowserListBox::ActivateListBox(_Bool)
     _Bool _bActive
     IsVisible()
-extensions/source/propctrlr/formcomponenthandler.hxx:450
+extensions/source/propctrlr/formcomponenthandler.hxx:449
     void pcr::WaitCursor::WaitCursor(class vcl::Window *)
     class vcl::Window * _pWindow
     impl_getDefaultDialogParent_nothrow()
@@ -150,15 +174,15 @@ extensions/source/propctrlr/usercontrol.hxx:62
     void pcr::OFormatSampleControl::OFormatSampleControl(class vcl::Window *)
     class vcl::Window * pParent
     impl_getDefaultDialogParent_nothrow()
-extensions/source/propctrlr/usercontrol.hxx:105
+extensions/source/propctrlr/usercontrol.hxx:102
     void pcr::OFormattedNumericControl::OFormattedNumericControl(class vcl::Window *,long)
     class vcl::Window * pParent
     impl_getDefaultDialogParent_nothrow()
-extensions/source/propctrlr/usercontrol.hxx:131
+extensions/source/propctrlr/usercontrol.hxx:128
     void pcr::OFileUrlControl::OFileUrlControl(class vcl::Window *)
     class vcl::Window * pParent
     impl_getDefaultDialogParent_nothrow()
-extensions/source/propctrlr/usercontrol.hxx:148
+extensions/source/propctrlr/usercontrol.hxx:145
     void pcr::OTimeDurationControl::OTimeDurationControl(class vcl::Window *)
     class vcl::Window * pParent
     impl_getDefaultDialogParent_nothrow()
@@ -171,8 +195,8 @@ forms/source/xforms/computedexpression.hxx:75
     const class rtl::OUString & sExpression
     _getExpressionForEvaluation()
 idl/inc/parser.hxx:66
-    void SvIdlParser::Read(class SvStringHashEntry *)
-    class SvStringHashEntry * 
+    void SvIdlParser::Read(const class SvStringHashEntry *)
+    const class SvStringHashEntry * 
     SvHash_module()
 include/avmedia/mediaplayer.hxx:50
     void avmedia::MediaFloater::setURL(const class rtl::OUString &,const class rtl::OUString &,_Bool)
@@ -182,10 +206,6 @@ include/comphelper/propertybag.hxx:108
     void comphelper::PropertyBag::addVoidProperty(const class rtl::OUString &,const class com::sun::star::uno::Type &,int,int)
     int _nHandle
     findFreeHandle()
-include/comphelper/propertysethelper.hxx:67
-    void comphelper::PropertySetHelper::PropertySetHelper(class comphelper::PropertySetInfo *,enum __sal_NoAcquire)
-    class comphelper::PropertySetInfo * pInfo
-    createPropertySetInfo()
 include/comphelper/servicedecl.hxx:222
     void comphelper::service_decl::detail::CreateFunc::CreateFunc<type-parameter-?-?, type-parameter-?-?, comphelper::service_decl::with_args<false> >(const type-parameter-?-? &)
     const type-parameter-?-? & postProcessFunc
@@ -226,7 +246,7 @@ include/connectivity/sqlerror.hxx:241
     class com::sun::star::sdbc::SQLException connectivity::SQLError::getSQLException(const int,const class com::sun::star::uno::Reference<class com::sun::star::uno::XInterface> &,const class connectivity::SQLError::ParamValue &,const class connectivity::SQLError::ParamValue &,const class connectivity::SQLError::ParamValue &) const
     const class connectivity::SQLError::ParamValue & _rParamValue2
     ParamValue()
-include/editeng/brushitem.hxx:61
+include/editeng/brushitem.hxx:60
     void SvxBrushItem::SvxBrushItem(class SvStream &,unsigned short,unsigned short)
     unsigned short nWhich
     Which()
@@ -258,7 +278,7 @@ include/editeng/scripttypeitem.hxx:53
     const class SfxPoolItem * SvxScriptSetItem::GetItemOfScript(unsigned short,const class SfxItemSet &,enum SvtScriptType)
     unsigned short nSlotId
     Which()
-include/formula/FormulaCompiler.hxx:280
+include/formula/FormulaCompiler.hxx:286
     void formula::FormulaCompiler::fillAddInToken(class std::__debug::vector<struct com::sun::star::sheet::FormulaOpCodeMapEntry, class std::allocator<struct com::sun::star::sheet::FormulaOpCodeMapEntry> > &,_Bool) const
     _Bool _bIsEnglish
     isEnglish()
@@ -330,7 +350,11 @@ include/sfx2/dinfdlg.hxx:90
     void SfxDocumentInfoItem::SfxDocumentInfoItem(const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::document::XDocumentProperties> &,const class com::sun::star::uno::Sequence<struct com::sun::star::document::CmisProperty> &,_Bool,_Bool)
     _Bool bUseThumbnailSave
     IsUseThumbnailSave()
-include/sfx2/objsh.hxx:634
+include/sfx2/mailmodelapi.hxx:89
+    enum SfxMailModel::SendMailResult SfxMailModel::AttachDocument(const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::uno::XInterface> &,const class rtl::OUString &)
+    const class rtl::OUString & sDocumentType
+    ""
+include/sfx2/objsh.hxx:630
     void SfxObjectShell::DoDraw(class OutputDevice *,const class Point &,const class Size &,const class JobSetup &,unsigned short)
     const class JobSetup & rSetup
     JobSetup()
@@ -374,15 +398,35 @@ include/svtools/accessibletable.hxx:84
     class tools::Rectangle svt::table::IAccessibleTable::calcHeaderRect(_Bool)
     _Bool _bIsColumnBar
     isColumnBar()
-include/svtools/transfer.hxx:309
+include/svtools/ehdl.hxx:37
+    void SfxErrorContext::SfxErrorContext(unsigned short,class vcl::Window *,const struct std::pair<const char *, class ErrCode> *,const class std::locale &)
+    const class std::locale & rResLocaleP
+    SvtResLocale()
+include/svtools/imapobj.hxx:73
+    void IMapObject::AppendCERNURL(class rtl::OStringBuffer &,const class rtl::OUString &) const
+    const class rtl::OUString & rBaseURL
+    ""
+include/svtools/imapobj.hxx:75
+    void IMapObject::AppendNCSAURL(class rtl::OStringBuffer &,const class rtl::OUString &) const
+    const class rtl::OUString & rBaseURL
+    ""
+include/svtools/imapobj.hxx:93
+    void IMapObject::Write(class SvStream &,const class rtl::OUString &) const
+    const class rtl::OUString & rBaseURL
+    ""
+include/svtools/imapobj.hxx:94
+    void IMapObject::Read(class SvStream &,const class rtl::OUString &)
+    const class rtl::OUString & rBaseURL
+    ""
+include/svtools/transfer.hxx:313
     class com::sun::star::uno::Any TransferableDataHelper::GetAny(enum SotClipboardFormatId,const class rtl::OUString &) const
     const class rtl::OUString & rDestDoc
     ""
-include/svtools/transfer.hxx:347
+include/svtools/transfer.hxx:351
     class com::sun::star::uno::Sequence<signed char> TransferableDataHelper::GetSequence(enum SotClipboardFormatId,const class rtl::OUString &)
     const class rtl::OUString & rDestDoc
     ""
-include/svtools/treelistbox.hxx:760
+include/svtools/treelistbox.hxx:762
     void SvTreeListBox::ShowFocusRect(const class SvTreeListEntry *)
     const class SvTreeListEntry * pEntry
     FirstSelected()
@@ -458,11 +502,11 @@ include/vcl/FilterConfigItem.hxx:74
     class rtl::OUString FilterConfigItem::ReadString(const class rtl::OUString &,const class rtl::OUString &)
     const class rtl::OUString & rDefault
     ""
-include/vcl/outdev.hxx:1547
+include/vcl/outdev.hxx:1549
     class Bitmap OutputDevice::GetDownsampledBitmap(const class Size &,const class Point &,const class Size &,const class Bitmap &,long,long)
     const class Point & rSrcPt
     Point()
-include/vcl/toolbox.hxx:422
+include/vcl/toolbox.hxx:418
     void ToolBox::SetHelpText(unsigned short,const class rtl::OUString &)
     const class rtl::OUString & rText
     ""
@@ -486,8 +530,8 @@ include/xmloff/txtparae.hxx:535
     void XMLTextParagraphExport::exportText(const class com::sun::star::uno::Reference<class com::sun::star::text::XText> &,const class com::sun::star::uno::Reference<class com::sun::star::text::XTextSection> &,_Bool)
     _Bool bIsProgress
     IsShowProgress()
-include/xmloff/xmlexp.hxx:278
-    void SvXMLExport::SvXMLExport(const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &,const class rtl::OUString &,const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::xml::sax::XDocumentHandler> &,const class com::sun::star::uno::Reference<class com::sun::star::frame::XModel> &,const enum FieldUnit)
+include/xmloff/xmlexp.hxx:279
+    void SvXMLExport::SvXMLExport(const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &,const class rtl::OUString &,const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::xml::sax::XDocumentHandler> &,const class com::sun::star::uno::Reference<class com::sun::star::frame::XModel> &,const enum FieldUnit,enum SvXMLExportFlags)
     const class rtl::OUString & implementationName
     ""
 include/xmloff/XMLFontStylesContext.hxx:57
@@ -530,19 +574,19 @@ lotuswordpro/source/filter/lwpbreaksoverride.hxx:128
     void LwpBreaksOverride::OverrideUseNextStyle(_Bool)
     _Bool bVal
     IsUseNextStyle()
-lotuswordpro/source/filter/lwpoverride.hxx:196
+lotuswordpro/source/filter/lwpoverride.hxx:197
     void LwpBulletOverride::OverrideSkip(_Bool)
     _Bool bOver
     IsSkip()
-lotuswordpro/source/filter/lwpoverride.hxx:197
+lotuswordpro/source/filter/lwpoverride.hxx:198
     void LwpBulletOverride::OverrideRightAligned(_Bool)
     _Bool bOver
     IsRightAligned()
-lotuswordpro/source/filter/lwpoverride.hxx:418
+lotuswordpro/source/filter/lwpoverride.hxx:419
     void LwpIndentOverride::OverrideUseRelative(_Bool)
     _Bool use
     IsUseRelative()
-opencl/source/opencl_device.cxx:495
+opencl/source/opencl_device.cxx:494
     void opencl::(anonymous namespace)::LogWriter::text(const class rtl::OString &)
     const class rtl::OString & rText
     ""
@@ -550,10 +594,6 @@ reportdesign/source/ui/dlg/Condition.hxx:154
     void rptui::Condition::setConditionIndex(unsigned long,unsigned long)
     unsigned long _nCondCount
     impl_getConditionCount()
-rsc/inc/rscerror.h:143
-    void RscError::FatalError(const class ERRTYPE &,const class RscId &,const char *)
-    const class RscId & aId
-    RscId()
 sc/inc/chartarr.hxx:73
     void ScChartArray::ScChartArray(class ScDocument *,const class tools::SvRef<class ScRangeList> &,const class rtl::OUString &)
     const class rtl::OUString & rChartName
@@ -614,7 +654,7 @@ sc/source/ui/vba/vbawindows.cxx:101
     void WindowEnumImpl::WindowEnumImpl(const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &,const class com::sun::star::uno::Any &)
     const class com::sun::star::uno::Any & aApplication
     Application()
-sd/source/filter/eppt/eppt.hxx:212
+sd/source/filter/eppt/eppt.hxx:211
     unsigned int PPTWriter::ImplInsertBookmarkURL(const class rtl::OUString &,const unsigned int,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &)
     const class rtl::OUString & rStringVer2
     ""
@@ -642,7 +682,7 @@ sdext/source/pdfimport/inc/contentsink.hxx:150
     void pdfi::ContentSink::drawMask(const class com::sun::star::uno::Sequence<struct com::sun::star::beans::PropertyValue> &,_Bool)
     const class com::sun::star::uno::Sequence<struct com::sun::star::beans::PropertyValue> & xBitmap
     readImageImpl()
-soltools/cpp/cpp.h:213
+soltools/cpp/cpp.h:212
     void peektokens(struct tokenrow *,char *)
     char * 
     ""
@@ -650,11 +690,11 @@ starmath/inc/cursor.hxx:185
     void SmCursor::Draw(class OutputDevice &,class Point,_Bool)
     _Bool isCaretVisible
     IsCursorVisible()
-store/source/lockbyte.cxx:816
+store/source/lockbyte.cxx:815
     void store::ResourceHolder::ResourceHolder<T>(const type-parameter-?-? &)
     const type-parameter-?-? & value
     T()
-svtools/source/contnr/imivctl.hxx:466
+svtools/source/contnr/imivctl.hxx:461
     void SvxIconChoiceCtrl_Impl::SetColumn(unsigned short,const class SvxIconChoiceCtrlColumnInfo &)
     const class SvxIconChoiceCtrlColumnInfo & 
     SvxIconChoiceCtrlColumnInfo()
@@ -670,11 +710,11 @@ svx/source/inc/treevisitor.hxx:29
     void TreeVisitor::TreeVisitor<ELEMENT, NODEINFO, PROCESSOR>(type-parameter-?-?)
     type-parameter-?-? _nodeInfo
     FormHierarchyComparator()
-sw/inc/doc.hxx:936
+sw/inc/doc.hxx:927
     const class SwTOXMark & SwDoc::GotoTOXMark(const class SwTOXMark &,enum SwTOXSearch,_Bool)
     _Bool bInReadOnly
     IsReadOnlyAvailable()
-sw/inc/editsh.hxx:785
+sw/inc/editsh.hxx:793
     void SwEditShell::AutoCorrect(class SvxAutoCorrect &,_Bool,char16_t)
     _Bool bInsertMode
     IsInsMode()
@@ -686,7 +726,7 @@ sw/inc/shellio.hxx:162
     void SwReader::SwReader(const class com::sun::star::uno::Reference<class com::sun::star::embed::XStorage> &,const class rtl::OUString &,class SwPaM &)
     const class rtl::OUString & rFilename
     ""
-sw/source/core/access/acctable.cxx:107
+sw/source/core/access/acctable.cxx:106
     void SwAccessibleTableData_Impl::SwAccessibleTableData_Impl(class SwAccessibleMap &,const class SwTabFrame *,_Bool,_Bool)
     _Bool bIsInPagePreview
     IsInPagePreview()
@@ -694,15 +734,15 @@ sw/source/core/inc/anchoredobjectposition.hxx:184
     long objectpositioning::SwAnchoredObjectPosition::AdjustVertRelPos(const long,const _Bool,const _Bool,const class SwFrame &,const long,const _Bool,const _Bool) const
     const _Bool bFollowTextFlow
     DoesObjFollowsTextFlow()
-sw/source/core/inc/frame.hxx:1198
+sw/source/core/inc/frame.hxx:1195
     void SwRectFnSet::SubLeft(class SwRect &,long) const
     class SwRect & rRect
     Frame()
-sw/source/core/inc/frame.hxx:1201
+sw/source/core/inc/frame.hxx:1198
     void SwRectFnSet::AddHeight(class SwRect &,long) const
     class SwRect & rRect
     Prt()
-sw/source/core/inc/frame.hxx:1221
+sw/source/core/inc/frame.hxx:1218
     _Bool SwRectFnSet::OverStep(const class SwRect &,long) const
     const class SwRect & rRect
     Frame()
@@ -734,23 +774,23 @@ sw/source/core/text/inftxt.hxx:417
     void SwTextPaintInfo::DrawPostIts(_Bool) const
     _Bool bScript
     IsScript()
-sw/source/core/text/inftxt.hxx:578
-    void SwTextFormatInfo::ChkNoHyph(const unsigned char,const unsigned char)
-    const unsigned char bMid
-    CntMidHyph()
-sw/source/core/text/inftxt.hxx:578
+sw/source/core/text/inftxt.hxx:575
     void SwTextFormatInfo::ChkNoHyph(const unsigned char,const unsigned char)
     const unsigned char bEnd
     CntEndHyph()
+sw/source/core/text/inftxt.hxx:575
+    void SwTextFormatInfo::ChkNoHyph(const unsigned char,const unsigned char)
+    const unsigned char bMid
+    CntMidHyph()
 sw/source/core/text/itrpaint.hxx:47
     void SwTextPainter::DrawTextLine(const class SwRect &,class SwSaveClip &,const _Bool)
     const _Bool bUnderSz
     IsUndersized()
 sw/source/filter/html/swcss1.hxx:75
-    void SwCSS1Parser::SwCSS1Parser(class SwDoc *,unsigned int *,const class rtl::OUString &,_Bool)
+    void SwCSS1Parser::SwCSS1Parser(class SwDoc *,const unsigned int *,const class rtl::OUString &,_Bool)
     _Bool bNewDoc
     IsNewDoc()
-sw/source/filter/html/swhtml.hxx:879
+sw/source/filter/html/swhtml.hxx:875
     void SwHTMLParser::SwHTMLParser(class SwDoc *,class SwPaM &,class SvStream &,const class rtl::OUString &,const class rtl::OUString &,_Bool,class SfxMedium *,_Bool,_Bool)
     _Bool bReadUTF8
     IsReadUTF8()
@@ -758,7 +798,7 @@ sw/source/filter/ww8/wrtww8.hxx:265
     void WW8_WrPlcSepx::WriteSepx(class SvStream &) const
     class SvStream & rStrm
     Strm()
-sw/source/filter/ww8/ww8scan.hxx:1531
+sw/source/filter/ww8/ww8scan.hxx:1532
     void WW8Fib::Write(class SvStream &)
     class SvStream & rStrm
     Strm()
@@ -778,7 +818,7 @@ sw/source/filter/xml/xmltexti.hxx:38
     void SwXMLTextImportHelper::SwXMLTextImportHelper(const class com::sun::star::uno::Reference<class com::sun::star::frame::XModel> &,class SvXMLImport &,const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,_Bool,_Bool,_Bool,_Bool)
     _Bool bBlockM
     IsBlockMode()
-sw/source/ui/vba/vbadocuments.cxx:66
+sw/source/ui/vba/vbadocuments.cxx:61
     void DocumentEnumImpl::DocumentEnumImpl(const class com::sun::star::uno::Reference<class ooo::vba::XHelperInterface> &,const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &,const class com::sun::star::uno::Reference<class com::sun::star::container::XEnumeration> &,const class com::sun::star::uno::Any &)
     const class com::sun::star::uno::Any & aApplication
     Application()
@@ -790,7 +830,7 @@ vcl/inc/salgdi.hxx:582
     _Bool SalGraphics::getNativeControlRegion(enum ControlType,enum ControlPart,const class tools::Rectangle &,enum ControlState,const class ImplControlValue &,const class rtl::OUString &,class tools::Rectangle &,class tools::Rectangle &)
     const class rtl::OUString & aCaption
     ""
-vcl/inc/unx/fc_fontoptions.hxx:49
+vcl/inc/unx/fc_fontoptions.hxx:38
     void FontConfigFontOptions::SyncPattern(const class rtl::OString &,int,_Bool)
     _Bool bEmbolden
     NeedsArtificialBold()
@@ -802,10 +842,6 @@ vcl/source/edit/vclmedit.cxx:133
     void ImpVclMEdit::Enable(_Bool)
     _Bool bEnable
     IsEnabled()
-vcl/source/filter/wmf/winmtf.hxx:605
-    void WinMtfOutput::ExcludeClipRect(const class tools::Rectangle &)
-    const class tools::Rectangle & rRect
-    ReadRectangle()
 vcl/source/window/menuitemlist.hxx:71
     void MenuItemData::MenuItemData(const class rtl::OUString &,const class Image &)
     const class Image & rImage
@@ -818,11 +854,11 @@ writerperfect/qa/unit/WpftLoader.hxx:75
     void writerperfect::test::WpftLoader::WpftLoader(const class com::sun::star::uno::Reference<class com::sun::star::io::XInputStream> &,const class com::sun::star::uno::Reference<class com::sun::star::document::XFilter> &,const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::frame::XDesktop2> &,const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &)
     const class com::sun::star::uno::Reference<class com::sun::star::io::XInputStream> & rxInputStream
     createDummyInput()
-xmlhelp/source/cxxhelp/provider/urlparameter.cxx:304
+xmlhelp/source/cxxhelp/provider/urlparameter.cxx:301
     void InputStreamTransformer::InputStreamTransformer(class chelp::URLParameter *,class chelp::Databases *,_Bool)
     _Bool isRoot
     isRoot()
-xmlhelp/source/cxxhelp/provider/urlparameter.hxx:227
+xmlhelp/source/cxxhelp/provider/urlparameter.hxx:218
     _Bool chelp::URLParameter::name(_Bool)
     _Bool modulePresent
     module()
diff --git a/compilerplugins/clang/constantparam.numbers.results b/compilerplugins/clang/constantparam.numbers.results
index 5b63188baba0..8b3224cc82db 100644
--- a/compilerplugins/clang/constantparam.numbers.results
+++ b/compilerplugins/clang/constantparam.numbers.results
@@ -14,11 +14,7 @@ basic/source/inc/codegen.hxx:38
     void SbiCodeGen::SbiCodeGen(class SbModule &,class SbiParser *,short)
     short 
     1024
-basic/source/inc/runtime.hxx:334
-    void SbiRuntime::StepFIND_Impl(class SbxObject *,unsigned int,unsigned int,unsigned long,_Bool)
-    unsigned long 
-    87560
-basic/source/inc/runtime.hxx:351
+basic/source/inc/runtime.hxx:344
     _Bool SbiRuntime::IsImageFlag(enum SbiImageFlags) const
     enum SbiImageFlags n
     2
@@ -26,6 +22,10 @@ basic/source/inc/sbjsmeth.hxx:33
     void SbJScriptMethod::SbJScriptMethod(enum SbxDataType)
     enum SbxDataType 
     12
+chart2/qa/extras/chart2export.cxx:789
+    void ::change(const class com::sun::star::uno::Reference<class com::sun::star::chart2::XChartDocument> &,_Bool,short)
+    short nNumFmtTypeFlag
+    16
 chart2/source/controller/inc/AccessibleBase.hxx:145
     void chart::AccessibleBase::RemoveState(short)
     short aState
@@ -38,7 +38,7 @@ chart2/source/model/template/ScatterChartType.hxx:31
     void chart::ScatterChartType::ScatterChartType(const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &,enum com::sun::star::chart2::CurveStyle,int,int)
     int nOrder
     3
-chart2/source/view/charttypes/GL3DBarChart.cxx:157
+chart2/source/view/charttypes/GL3DBarChart.cxx:158
     void chart::RenderAnimationThread::RenderAnimationThread(class chart::GL3DBarChart *,const struct glm::detail::tvec3<float> &,const struct glm::detail::tvec3<float> &,const int)
     const int nSteps
     200
@@ -90,18 +90,14 @@ connectivity/source/inc/java/sql/ConnectionLog.hxx:118
     _Bool connectivity::java::sql::ConnectionLog::log(const int,const class rtl::OUString &,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?) const
     const int _nLogLevel
     300
+connectivity/source/inc/mysql/YTable.hxx:83
+    void connectivity::mysql::OMySQLTable::OMySQLTable(class connectivity::sdbcx::OCollection *,const class com::sun::star::uno::Reference<class com::sun::star::sdbc::XConnection> &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,int)
+    int _nPrivileges
+    511
 connectivity/source/inc/odbc/OPreparedStatement.hxx:79
     void connectivity::odbc::OPreparedStatement::setParameter(int,int,const class com::sun::star::uno::Sequence<signed char> &)
     int _nType
     -2
-connectivity/source/inc/resource/sharedresources.hxx:122
-    class rtl::OUString connectivity::SharedResources::getResourceStringWithSubstitution(unsigned short,const char *,const class rtl::OUString &,const char *,const class rtl::OUString &,const char *,const class rtl::OUString &) const
-    unsigned short _nResId
-    1201
-connectivity/source/inc/resource/sharedresources.hxx:142
-    class rtl::OUString connectivity::SharedResources::getResourceStringWithSubstitution(unsigned short,const class std::__debug::list<struct std::pair<const char *, class rtl::OUString>, class std::allocator<struct std::pair<const char *, class rtl::OUString> > > &) const
-    unsigned short _nResId
-    1409
 cppcanvas/source/inc/implrenderer.hxx:253
     _Bool cppcanvas::internal::ImplRenderer::isActionContained(class GDIMetaFile &,const char *,enum MetaActionType)
     enum MetaActionType nType
@@ -110,15 +106,11 @@ cui/source/inc/autocdlg.hxx:398
     class SvTreeListEntry * OfaQuoteTabPage::CreateEntry(class rtl::OUString &,unsigned short)
     unsigned short nCol
     2
-cui/source/inc/backgrnd.hxx:131
-    _Bool SvxBackgroundTabPage::FillItemSetWithWallpaperItem(class SfxItemSet &,unsigned short)
-    unsigned short nSlot
-    9185
 cui/source/inc/chardlg.hxx:296
     void SvxCharPositionPage::UpdatePreview_Impl(unsigned char,unsigned char,short)
     unsigned char nProp
     100
-cui/source/inc/cuihyperdlg.hxx:46
+cui/source/inc/cuihyperdlg.hxx:59
     void SvxHlinkCtrl::SvxHlinkCtrl(unsigned short,class SfxBindings &,class SvxHpLinkDlg *)
     unsigned short nId
     10361
@@ -134,7 +126,7 @@ cui/source/options/cfgchart.hxx:92
     void SvxChartColorTableItem::SvxChartColorTableItem(unsigned short,const class SvxChartColorTable &)
     unsigned short nWhich
     10437
-dbaccess/source/core/dataaccess/documentdefinition.hxx:181
+dbaccess/source/core/dataaccess/documentdefinition.hxx:180
     void dbaccess::ODocumentDefinition::firePropertyChange(int,const class com::sun::star::uno::Any &,const class com::sun::star::uno::Any &,_Bool,const struct dbaccess::ODocumentDefinition::NotifierAccess &)
     int i_nHandle
     7
@@ -158,10 +150,6 @@ dbaccess/source/ui/inc/charsetlistbox.hxx:39
     _Bool dbaui::CharSetListBox::StoreSelectedCharSet(class SfxItemSet &,const unsigned short)
     const unsigned short _nItemId
     11
-dbaccess/source/ui/inc/dbadmin.hxx:101
-    void dbaui::ODbAdminDialog::addDetailPage(unsigned short,unsigned short,class VclPtr<class SfxTabPage> (*)(class vcl::Window *, const class SfxItemSet *))
-    unsigned short _nTextId
-    19663
 dbaccess/source/ui/inc/FieldDescControl.hxx:159
     void dbaui::OFieldDescControl::CellModified(long,unsigned short)
     long nRow
@@ -194,19 +182,19 @@ desktop/source/deployment/gui/license_dialog.cxx:60
     void dp_gui::LicenseView::ScrollDown(enum ScrollType)
     enum ScrollType eScroll
     4
-editeng/source/editeng/editobj.cxx:1098
+editeng/source/editeng/editobj.cxx:1122
     void (anonymous namespace)::FindAttribByChar::FindAttribByChar(unsigned short,int)
     unsigned short nWhich
     4013
-editeng/source/editeng/impedit.hxx:622
+editeng/source/editeng/impedit.hxx:618
     _Bool ImpEditEngine::HasScriptType(int,unsigned short) const
     unsigned short nType
     3
-editeng/source/editeng/impedit.hxx:946
+editeng/source/editeng/impedit.hxx:942
     void ImpEditEngine::SetLanguageAndFont(const struct ESelection &,struct o3tl::strong_int<unsigned short, struct LanguageTypeTag>,unsigned short,const class vcl::Font *,unsigned short)
     unsigned short nLangWhichId
     4027
-editeng/source/editeng/impedit.hxx:946
+editeng/source/editeng/impedit.hxx:942
     void ImpEditEngine::SetLanguageAndFont(const struct ESelection &,struct o3tl::strong_int<unsigned short, struct LanguageTypeTag>,unsigned short,const class vcl::Font *,unsigned short)
     unsigned short nFontWhichId
     4029
@@ -222,6 +210,10 @@ editeng/source/outliner/outlundo.hxx:33
     void OutlinerUndoBase::OutlinerUndoBase(unsigned short,class Outliner *)
     unsigned short nId
     200
+emfio/inc/mtftools.hxx:436
+    void emfio::BSaveStruct::BSaveStruct(const class BitmapEx &,const class tools::Rectangle &,unsigned int)
+    unsigned int nRop
+    15597766
 filter/source/config/cache/filtercache.hxx:335
     _Bool filter::config::FilterCache::isFillState(enum filter::config::FilterCache::EFillState) const
     enum filter::config::FilterCache::EFillState eRequired
@@ -230,7 +222,7 @@ filter/source/flash/swfwriter.hxx:304
     void swf::Writer::waitOnClick(unsigned short)
     unsigned short nDepth
     10
-filter/source/graphicfilter/eps/eps.cxx:184
+filter/source/graphicfilter/eps/eps.cxx:185
     void PSWriter::ImplCurveTo(const class Point &,const class Point &,const class Point &,unsigned int)
     unsigned int nMode
     4
@@ -246,15 +238,11 @@ forms/source/richtext/rtattributes.hxx:52
     void frm::AttributeState::AttributeState(enum frm::AttributeCheckState)
     enum frm::AttributeCheckState _eCheckState
     2
-fpicker/source/office/iodlgimp.cxx:69
-    void (anonymous namespace)::SvtSimpleResId::SvtSimpleResId(unsigned short)
-    unsigned short nId
-    17485
 framework/inc/tabwin/tabwindow.hxx:145
     void framework::TabWindow::implts_SendNotification(enum framework::TabWindow::Notification,int,const class com::sun::star::uno::Sequence<struct com::sun::star::beans::NamedValue> &) const
     enum framework::TabWindow::Notification eNotify
     2
-framework/inc/uielement/macrosmenucontroller.hxx:68
+framework/inc/uielement/macrosmenucontroller.hxx:63
     void framework::MacrosMenuController::addScriptItems(class PopupMenu *,unsigned short)
     unsigned short startItemId
     4
@@ -342,7 +330,7 @@ include/connectivity/sqlerror.hxx:206
     void connectivity::SQLError::raiseTypedException(const int,const class com::sun::star::uno::Reference<class com::sun::star::uno::XInterface> &,const class com::sun::star::uno::Type &) const
     const int _eCondition
     100
-include/dbaccess/genericcontroller.hxx:338
+include/dbaccess/genericcontroller.hxx:346
     _Bool dbaui::OGenericUnoController::isFeatureSupported(int)
     int _nId
     5502
@@ -354,15 +342,15 @@ include/drawinglayer/primitive2d/mediaprimitive2d.hxx:67
     void drawinglayer::primitive2d::MediaPrimitive2D::MediaPrimitive2D(const class basegfx::B2DHomMatrix &,const class rtl::OUString &,const class basegfx::BColor &,unsigned int,const class Graphic &)
     unsigned int nDiscreteBorder
     4
-include/editeng/AccessibleParaManager.hxx:127
+include/editeng/AccessibleParaManager.hxx:126
     void accessibility::AccessibleParaManager::FireEvent(int,const short) const
     const short nEventId
     21
-include/editeng/AccessibleParaManager.hxx:241
+include/editeng/AccessibleParaManager.hxx:240
     void accessibility::AccessibleParaManager::SetState(int,const short)
     const short nStateId
     11
-include/editeng/AccessibleParaManager.hxx:243
+include/editeng/AccessibleParaManager.hxx:242
     void accessibility::AccessibleParaManager::UnSetState(int,const short)
     const short nStateId
     11
@@ -382,15 +370,15 @@ include/editeng/colritem.hxx:80
     void SvxBackgroundColorItem::SvxBackgroundColorItem(const class Color &,const unsigned short)
     const unsigned short nId
     4044
-include/editeng/editeng.hxx:294
+include/editeng/editeng.hxx:295
     struct ESelection EditEngine::GetWord(const struct ESelection &,unsigned short) const
     unsigned short nWordType
     2
-include/editeng/editeng.hxx:306
+include/editeng/editeng.hxx:307
     void EditEngine::InsertParagraph(int,const class EditTextObject &)
     int nPara
     2147483647
-include/editeng/editeng.hxx:332
+include/editeng/editeng.hxx:333
     void EditEngine::UndoActionStart(unsigned short,const struct ESelection &)
     unsigned short nId
     111
@@ -398,7 +386,7 @@ include/editeng/editund2.hxx:37
     void EditUndoManager::EditUndoManager(unsigned short)
     unsigned short nMaxUndoActionCount
     20
-include/editeng/editview.hxx:187
+include/editeng/editview.hxx:188
     void EditView::RemoveCharAttribs(int,unsigned short)
     unsigned short nWhich
     4016
@@ -419,14 +407,14 @@ include/editeng/justifyitem.hxx:65
     const unsigned short nId
     36
 include/editeng/optitems.hxx:39
-    void SfxSpellCheckItem::SfxSpellCheckItem(class com::sun::star::uno::Reference<class com::sun::star::linguistic2::XSpellChecker1> &,unsigned short)
+    void SfxSpellCheckItem::SfxSpellCheckItem(const class com::sun::star::uno::Reference<class com::sun::star::linguistic2::XSpellChecker1> &,unsigned short)
     unsigned short nWhich
     12009
 include/editeng/outliner.hxx:168
     void Paragraph::RemoveFlag(enum ParaFlag)
     enum ParaFlag nFlag
     256
-include/editeng/outliner.hxx:879
+include/editeng/outliner.hxx:873
     void Outliner::SetParaFlag(class Paragraph *,enum ParaFlag)
     enum ParaFlag nFlag
     256
@@ -450,15 +438,15 @@ include/filter/msfilter/dffpropset.hxx:64
     class rtl::OUString DffPropSet::GetPropertyString(unsigned int,class SvStream &) const
     unsigned int nId
     896
-include/filter/msfilter/escherex.hxx:708
+include/filter/msfilter/escherex.hxx:707
     void EscherPropertyContainer::Commit(class SvStream &,unsigned short,unsigned short)
     unsigned short nVersion
     3
-include/filter/msfilter/msdffimp.hxx:547
+include/filter/msfilter/msdffimp.hxx:551
     _Bool SvxMSDffManager::SeekToRec2(unsigned short,unsigned short,unsigned long) const
     unsigned short nRecId2
     4000
-include/filter/msfilter/msdffimp.hxx:547
+include/filter/msfilter/msdffimp.hxx:551
     _Bool SvxMSDffManager::SeekToRec2(unsigned short,unsigned short,unsigned long) const
     unsigned short nRecId1
     4008
@@ -466,22 +454,26 @@ include/filter/msfilter/util.hxx:109
     _Bool msfilter::util::WW8ReadFieldParams::GetTokenSttFromTo(int *,int *,int)
     int _nMax
     9
-include/formula/FormulaCompiler.hxx:97
+include/formula/FormulaCompiler.hxx:99
     void formula::FormulaCompiler::OpCodeMap::OpCodeMap(unsigned short,_Bool,enum formula::FormulaGrammar::Grammar)
     unsigned short nSymbols
-    494
-include/formula/tokenarray.hxx:174
+    496
+include/formula/tokenarray.hxx:282
     unsigned short formula::FormulaTokenArray::RemoveToken(unsigned short,unsigned short)
     unsigned short nCount
     2
-include/formula/tokenarray.hxx:372
+include/formula/tokenarray.hxx:519
     void formula::FormulaTokenIterator::Item::Item(const class formula::FormulaTokenArray *,short,short)
     short stop
     32767
-include/formula/tokenarray.hxx:372
+include/formula/tokenarray.hxx:519
     void formula::FormulaTokenIterator::Item::Item(const class formula::FormulaTokenArray *,short,short)
     short pc
     -1
+include/formula/tokenarray.hxx:638
+    void formula::FormulaTokenArrayPlainIterator::AfterRemoveToken(unsigned short,unsigned short)
+    unsigned short nCount
+    2
 include/o3tl/string_view.hxx:282
     void o3tl::basic_string_view::remove_prefix(unsigned long)
     unsigned long n
@@ -614,21 +606,21 @@ include/oox/drawingml/color.hxx:44
     int oox::drawingml::Color::getDmlPresetColor(int,int)
     int nDefaultRgb
     -1
-include/oox/drawingml/drawingmltypes.hxx:197
+include/oox/drawingml/drawingmltypes.hxx:203
     void oox::drawingml::EmuRectangle::EmuRectangle(long,long,long,long)
-    long nHeight
+    long nWidth
     -1
-include/oox/drawingml/drawingmltypes.hxx:197
+include/oox/drawingml/drawingmltypes.hxx:203
     void oox::drawingml::EmuRectangle::EmuRectangle(long,long,long,long)
     long nY
     -1
-include/oox/drawingml/drawingmltypes.hxx:197
+include/oox/drawingml/drawingmltypes.hxx:203
     void oox::drawingml::EmuRectangle::EmuRectangle(long,long,long,long)
-    long nWidth
+    long nX
     -1
-include/oox/drawingml/drawingmltypes.hxx:197
+include/oox/drawingml/drawingmltypes.hxx:203
     void oox::drawingml::EmuRectangle::EmuRectangle(long,long,long,long)
-    long nX
+    long nHeight
     -1
 include/oox/export/drawingml.hxx:180
     void oox::drawingml::DrawingML::WriteBlipFill(const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,const class rtl::OUString &,int)
@@ -674,7 +666,7 @@ include/oox/mathml/importutils.hxx:154
     char16_t oox::formulaimport::XmlStream::Tag::attribute(int,char16_t) const
     int token
     1447388
-include/oox/ole/axcontrol.hxx:953
+include/oox/ole/axcontrol.hxx:951
     type-parameter-?-? & oox::ole::EmbeddedControl::createModel(const type-parameter-?-? &)
     const type-parameter-?-? & rParam
     6
@@ -682,14 +674,10 @@ include/oox/ole/olehelper.hxx:78
     void oox::ole::StdFontInfo::StdFontInfo(const class rtl::OUString &,unsigned int)
     unsigned int nHeight
     82500
-include/oox/ole/vbaproject.hxx:150
+include/oox/ole/vbaproject.hxx:154
     void oox::ole::VbaProject::addDummyModule(const class rtl::OUString &,int)
     int nType
     4
-include/sax/fastattribs.hxx:84
-    void sax_fastparser::FastAttributeList::addNS(int,int,const class rtl::OString &)
-    int nToken
-    572
 include/sfx2/controlwrapper.hxx:82
     void sfx::PosValueMapper::PosValueMapper<PosT, ValueT>(type-parameter-?-?,const struct sfx::PosValueMapper::MapEntryType *)
     type-parameter-?-? nNFPos
@@ -755,12 +743,12 @@ include/sfx2/request.hxx:65
     unsigned short nSlot
     5904
 include/sfx2/sfxhtml.hxx:64
-    _Bool SfxHTMLParser::ParseAreaOptions(class ImageMap *,const class rtl::OUString &,unsigned short,unsigned short)
-    unsigned short nEventMouseOver
+    _Bool SfxHTMLParser::ParseAreaOptions(class ImageMap *,const class rtl::OUString &,enum SvMacroItemId,enum SvMacroItemId)
+    enum SvMacroItemId nEventMouseOver
     5100
 include/sfx2/sfxhtml.hxx:64
-    _Bool SfxHTMLParser::ParseAreaOptions(class ImageMap *,const class rtl::OUString &,unsigned short,unsigned short)
-    unsigned short nEventMouseOut
+    _Bool SfxHTMLParser::ParseAreaOptions(class ImageMap *,const class rtl::OUString &,enum SvMacroItemId,enum SvMacroItemId)
+    enum SvMacroItemId nEventMouseOut
     5102
 include/sfx2/sidebar/Theme.hxx:138
     _Bool sfx2::sidebar::Theme::GetBoolean(const enum sfx2::sidebar::Theme::ThemeItem)
@@ -770,14 +758,10 @@ include/sfx2/tabdlg.hxx:54
     void SfxTabDialogItem::SfxTabDialogItem(unsigned short,const class SfxItemSet &)
     unsigned short nId
     11022
-include/sfx2/tbxctrl.hxx:96
+include/sfx2/tbxctrl.hxx:95
     void SfxPopupWindow::SfxPopupWindow(unsigned short,const class com::sun::star::uno::Reference<class com::sun::star::frame::XFrame> &,long)
     long nBits
     1610612810
-include/sfx2/tbxctrl.hxx:107
-    void SfxPopupWindow::SfxPopupWindow(unsigned short,const class com::sun::star::uno::Reference<class com::sun::star::frame::XFrame> &,class vcl::Window *,long)
-    long nBits
-    139049566410
 include/sot/stg.hxx:108
     class BaseStorage * BaseStorage::OpenUCBStorage(const class rtl::OUString &,enum StreamMode,_Bool)
     enum StreamMode 
@@ -814,7 +798,7 @@ include/svl/int64item.hxx:21
     void SfxInt64Item::SfxInt64Item(unsigned short,long)
     unsigned short nWhich
     11141
-include/svl/itemset.hxx:134
+include/svl/itemset.hxx:188
     void SfxItemSet::PutExtended(const class SfxItemSet &,enum SfxItemState,enum SfxItemState)
     enum SfxItemState eDontCareAs
     16
@@ -830,7 +814,7 @@ include/svl/svdde.hxx:172
     void DdeExecute::DdeExecute(class DdeConnection &,const class rtl::OUString &,long)
     long 
     30000
-include/svl/zformat.hxx:349
+include/svl/zformat.hxx:350
     _Bool SvNumberformat::IsInQuote(const class rtl::OUString &,int,char16_t,char16_t,char16_t)
     char16_t cEscOut
     92
@@ -838,36 +822,36 @@ include/svtools/accessiblefactory.hxx:115
     class com::sun::star::uno::Reference<class com::sun::star::accessibility::XAccessible> svt::IAccessibleFactory::createAccessibleBrowseBoxHeaderBar(const class com::sun::star::uno::Reference<class com::sun::star::accessibility::XAccessible> &,class svt::IAccessibleTableProvider &,enum svt::AccessibleBrowseBoxObjType) const
     enum svt::AccessibleBrowseBoxObjType _eObjType
     3
-include/svtools/brwbox.hxx:572
+include/svtools/brwbox.hxx:570
     void BrowseBox::commitBrowseBoxEvent(short,const class com::sun::star::uno::Any &,const class com::sun::star::uno::Any &)
     short nEventId
     7
-include/svtools/ctrlbox.hxx:381
+include/svtools/ctrlbox.hxx:378
+    void FontSizeBox::EnableRelativeMode(unsigned short,unsigned short,unsigned short)
+    unsigned short nMin
+    5
+include/svtools/ctrlbox.hxx:378
     void FontSizeBox::EnableRelativeMode(unsigned short,unsigned short,unsigned short)
     unsigned short nStep
     5
-include/svtools/ctrlbox.hxx:381
+include/svtools/ctrlbox.hxx:378
     void FontSizeBox::EnableRelativeMode(unsigned short,unsigned short,unsigned short)
     unsigned short nMax
     995
-include/svtools/ctrlbox.hxx:381
-    void FontSizeBox::EnableRelativeMode(unsigned short,unsigned short,unsigned short)
-    unsigned short nMin
-    5
-include/svtools/ctrlbox.hxx:383
+include/svtools/ctrlbox.hxx:380
     void FontSizeBox::EnablePtRelativeMode(short,short,short)
     short nStep
     10
-include/svtools/grfmgr.hxx:340
-    _Bool GraphicObject::IsCached(class OutputDevice *,const class Size &,const class GraphicAttr *,enum GraphicManagerDrawFlags) const
+include/svtools/grfmgr.hxx:339
+    _Bool GraphicObject::IsCached(const class OutputDevice *,const class Size &,const class GraphicAttr *,enum GraphicManagerDrawFlags) const
     enum GraphicManagerDrawFlags nFlags
     3
-include/svtools/grfmgr.hxx:450
+include/svtools/grfmgr.hxx:449
     void GraphicObject::DrawTiled(class OutputDevice *,const class tools::Rectangle &,const class Size &,const class Size &,enum GraphicManagerDrawFlags,int)
     enum GraphicManagerDrawFlags nFlags
     3
-include/svtools/htmlout.hxx:69
-    class SvStream & HTMLOutFuncs::Out_Hex(class SvStream &,unsigned long,unsigned char,unsigned short)
+include/svtools/htmlout.hxx:68
+    class SvStream & HTMLOutFuncs::Out_Hex(class SvStream &,unsigned long,unsigned char)
     unsigned char nLen
     2
 include/svtools/imap.hxx:115
@@ -882,7 +866,7 @@ include/svtools/roadmapwizard.hxx:207
     void svt::RoadmapWizard::updateRoadmapItemLabel(short)
     short _nState
     2
-include/svtools/sampletext.hxx:42
+include/svtools/sampletext.hxx:41
     class rtl::OUString makeMinimalTextForScript(enum UScriptCode)
     enum UScriptCode eScript
     19
@@ -890,39 +874,39 @@ include/svtools/simptabl.hxx:97
     void SvSimpleTable::InsertHeaderEntry(const class rtl::OUString &,unsigned short,enum HeaderBarItemBits)
     unsigned short nCol
     65535
-include/svtools/svtabbx.hxx:108
+include/svtools/svtabbx.hxx:106
     void SvTabListBox::SetTabJustify(unsigned short,enum SvTabJustify)
     unsigned short nTab
     2
-include/svtools/svtabbx.hxx:108
+include/svtools/svtabbx.hxx:106
     void SvTabListBox::SetTabJustify(unsigned short,enum SvTabJustify)
     enum SvTabJustify 
     2
-include/svtools/transfer.hxx:215
+include/svtools/transfer.hxx:219
     void TransferableHelper::RemoveFormat(enum SotClipboardFormatId)
     enum SotClipboardFormatId nFormat
     59
-include/svtools/transfer.hxx:315
+include/svtools/transfer.hxx:319
     _Bool TransferableDataHelper::GetBitmapEx(enum SotClipboardFormatId,class BitmapEx &)
     enum SotClipboardFormatId nFormat
     2
-include/svtools/transfer.hxx:326
+include/svtools/transfer.hxx:330
     _Bool TransferableDataHelper::GetGDIMetaFile(enum SotClipboardFormatId,class GDIMetaFile &,unsigned long)
     enum SotClipboardFormatId nFormat
     3
-include/svtools/transfer.hxx:332
+include/svtools/transfer.hxx:336
     _Bool TransferableDataHelper::GetImageMap(enum SotClipboardFormatId,class ImageMap &)
     enum SotClipboardFormatId nFormat
     13
-include/svtools/transfer.hxx:347
+include/svtools/transfer.hxx:351
     class com::sun::star::uno::Sequence<signed char> TransferableDataHelper::GetSequence(enum SotClipboardFormatId,const class rtl::OUString &)
     enum SotClipboardFormatId nFormat
     59
-include/svtools/treelistbox.hxx:561
+include/svtools/treelistbox.hxx:563
     class SvLBoxTab * SvTreeListBox::GetFirstTab(enum SvLBoxTabFlags,unsigned short &)
     enum SvLBoxTabFlags nFlagMask
     64
-include/svtools/treelistbox.hxx:562
+include/svtools/treelistbox.hxx:564
     void SvTreeListBox::GetLastTab(enum SvLBoxTabFlags,unsigned short &)
     enum SvLBoxTabFlags nFlagMask
     64
@@ -954,7 +938,7 @@ include/svx/chrtitem.hxx:132
     void SvxChartIndicateItem::SvxChartIndicateItem(enum SvxChartIndicate,unsigned short)
     unsigned short nId
     22
-include/svx/ctredlin.hxx:169
+include/svx/ctredlin.hxx:168
     class SvTreeListEntry * SvxRedlinTable::InsertEntry(const class rtl::OUString &,class RedlinData *,class SvTreeListEntry *,unsigned long)
     unsigned long nPos
     18446744073709551615
@@ -970,10 +954,6 @@ include/svx/dbaexchange.hxx:110
     void svx::OColumnTransferable::OColumnTransferable(const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,const class com::sun::star::uno::Reference<class com::sun::star::sdbc::XConnection> &,enum ColumnTransferFormatFlags)
     enum ColumnTransferFormatFlags _nFormats
     5
-include/svx/DescriptionGenerator.hxx:76
-    void accessibility::DescriptionGenerator::Initialize(int)
-    int nResourceId
-    2679
 include/svx/dlgctrl.hxx:110
     void SvxRectCtl::SvxRectCtl(class vcl::Window *,enum RectPoint,unsigned short,unsigned short)
     unsigned short nBorder
@@ -1030,7 +1010,7 @@ include/svx/drawitem.hxx:183
     void SvxLineEndListItem::SvxLineEndListItem(const class rtl::Reference<class XLineEndList> &,unsigned short)
     unsigned short nWhich
     10185
-include/svx/float3d.hxx:242
+include/svx/float3d.hxx:243
     void Svx3DCtrlItem::Svx3DCtrlItem(unsigned short,class SfxBindings *)
     unsigned short 
     10645
@@ -1050,15 +1030,15 @@ include/svx/fontworkgallery.hxx:79
     void svx::FontWorkGalleryDialog::fillFavorites(unsigned short)
     unsigned short nThemeId
     37
-include/svx/framelink.hxx:113
+include/svx/framelink.hxx:114
     void svx::frame::Style::Style(double,double,double,enum SvxBorderLineStyle)
     double nP
     3
-include/svx/galmisc.hxx:185
+include/svx/galmisc.hxx:166
     void GalleryTransferable::StartDrag(class vcl::Window *,signed char)
     signed char nDragSourceActions
     5
-include/svx/galmisc.hxx:213
+include/svx/galmisc.hxx:194
     void GalleryHint::GalleryHint(enum GalleryHintType,const class rtl::OUString &,const class rtl::OUString &,unsigned long)
     enum GalleryHintType nType
     2
@@ -1066,7 +1046,7 @@ include/svx/grfcrop.hxx:33
     void SvxGrfCrop::SvxGrfCrop(unsigned short)
     unsigned short 
     131
-include/svx/langbox.hxx:104
+include/svx/langbox.hxx:103
     int SvxLanguageBoxBase::ImplInsertLanguage(struct o3tl::strong_int<unsigned short, struct LanguageTypeTag>,int,short)
     int nPos
     2147483647
@@ -1098,19 +1078,15 @@ include/svx/optgrid.hxx:81
     void SvxGridItem::SvxGridItem(unsigned short)
     unsigned short _nWhich
     10298
-include/svx/relfld.hxx:45
-    void SvxRelativeField::EnableRelativeMode(unsigned short,unsigned short,unsigned short)
+include/svx/relfld.hxx:44
+    void SvxRelativeField::EnableRelativeMode(unsigned short,unsigned short)
     unsigned short nMax
     999
-include/svx/relfld.hxx:45
-    void SvxRelativeField::EnableRelativeMode(unsigned short,unsigned short,unsigned short)
-    unsigned short nStep
-    5
-include/svx/ruler.hxx:243
+include/svx/ruler.hxx:240
     _Bool SvxRuler::IsActLastColumn(_Bool,unsigned short) const
     unsigned short nAct
     65535
-include/svx/ruler.hxx:246
+include/svx/ruler.hxx:243
     _Bool SvxRuler::IsActFirstColumn(_Bool,unsigned short) const
     unsigned short nAct
     65535
@@ -1118,10 +1094,6 @@ include/svx/sdtaitm.hxx:39
     void SdrTextVertAdjustItem::SdrTextVertAdjustItem(enum SdrTextVertAdjust,unsigned short)
     unsigned short nWhich
     129
-include/svx/strarray.hxx:30
-    void SvxStringArray::SvxStringArray(unsigned int)
-    unsigned int nResId
-    10311
 include/svx/svdhdl.hxx:335
     void SdrHdlLine::SdrHdlLine(class SdrHdl &,class SdrHdl &,enum SdrHdlKind)
     enum SdrHdlKind eNewKind
@@ -1146,7 +1118,7 @@ include/svx/svdmodel.hxx:133
     void SdrHint::SdrHint(enum SdrHintKind,const class SdrPage *)
     enum SdrHintKind eNewHint
     2
-include/svx/svdmrkv.hxx:275
+include/svx/svdmrkv.hxx:274
     _Bool SdrMarkView::PickMarkedObj(const class Point &,class SdrObject *&,class SdrPageView *&,enum SdrSearchOptions) const
     enum SdrSearchOptions nOptions
     2048
@@ -1176,10 +1148,6 @@ include/toolkit/controls/unocontrolbase.hxx:48
     74
 include/tools/b3dtrans.hxx:106
     void B3dTransformationSet::SetDeviceRectangle(double,double,double,double)
-    double fL
-    -2
-include/tools/b3dtrans.hxx:106
-    void B3dTransformationSet::SetDeviceRectangle(double,double,double,double)
     double fB
     -2
 include/tools/b3dtrans.hxx:106
@@ -1190,6 +1158,10 @@ include/tools/b3dtrans.hxx:106
     void B3dTransformationSet::SetDeviceRectangle(double,double,double,double)
     double fT
     2
+include/tools/b3dtrans.hxx:106
+    void B3dTransformationSet::SetDeviceRectangle(double,double,double,double)
+    double fL
+    -2
 include/tools/gen.hxx:90
     class Point & Point::operator*=(const long)
      ###1
@@ -1198,10 +1170,10 @@ include/tools/gen.hxx:91
     class Point & Point::operator/=(const long)
      ###1
     2
-include/tools/inetstrm.hxx:53
-    int INetMIMEMessageStream::GetMsgLine(char *,unsigned long)
-    unsigned long nSize
-    2048
+include/tools/gen.hxx:96
+    class Point operator/(const class Point &,const long)
+    const long nVal2
+    3
 include/tools/poly.hxx:99
     void tools::Polygon::Polygon(const class Point &,const class Point &,const class Point &,const class Point &,unsigned short)
     unsigned short nPoints
@@ -1280,12 +1252,12 @@ include/tools/urlobj.hxx:600
     76
 include/tools/urlobj.hxx:624
     _Bool INetURLObject::setBase(const class rtl::OUString &,int,enum INetURLObject::EncodeMechanism,unsigned short)
-    int nIndex
-    -1
-include/tools/urlobj.hxx:624
-    _Bool INetURLObject::setBase(const class rtl::OUString &,int,enum INetURLObject::EncodeMechanism,unsigned short)
     unsigned short eCharset
     76
+include/tools/urlobj.hxx:624
+    _Bool INetURLObject::setBase(const class rtl::OUString &,int,enum INetURLObject::EncodeMechanism,unsigned short)
+    int nIndex
+    -1
 include/tools/urlobj.hxx:653
     class rtl::OUString INetURLObject::getExtension(int,_Bool,enum INetURLObject::DecodeMechanism,unsigned short) const
     unsigned short eCharset
@@ -1296,12 +1268,12 @@ include/tools/urlobj.hxx:653
     -1
 include/tools/urlobj.hxx:677
     _Bool INetURLObject::setExtension(const class rtl::OUString &,int,_Bool,unsigned short)
-    unsigned short eCharset
-    76
-include/tools/urlobj.hxx:677
-    _Bool INetURLObject::setExtension(const class rtl::OUString &,int,_Bool,unsigned short)
     int nIndex
     -1
+include/tools/urlobj.hxx:677
+    _Bool INetURLObject::setExtension(const class rtl::OUString &,int,_Bool,unsigned short)
+    unsigned short eCharset
+    76
 include/tools/urlobj.hxx:696
     _Bool INetURLObject::removeExtension(int,_Bool)
     int nIndex
@@ -1354,7 +1326,7 @@ include/unotools/calendarwrapper.hxx:73
     void CalendarWrapper::addValue(short,int)
     int nAmount
     7
-include/unotools/compatibility.hxx:204
+include/unotools/compatibility.hxx:205
     void SvtCompatibilityOptions::SetDefault(enum SvtCompatibilityEntry::Index,_Bool)
     enum SvtCompatibilityEntry::Index rIdx
     12
@@ -1378,12 +1350,12 @@ include/vcl/btndlg.hxx:77
     void ButtonDialog::ButtonDialog(enum WindowType)
     enum WindowType nType
     304
-include/vcl/dockwin.hxx:143
+include/vcl/dockwin.hxx:142
     void ImplDockingWindowWrapper::ShowTitleButton(enum TitleButton,_Bool)
     enum TitleButton nButton
     4
-include/vcl/errinf.hxx:190
-    void TwoStringErrorInfo::TwoStringErrorInfo(unsigned int,const class rtl::OUString &,const class rtl::OUString &,enum DialogMask)
+include/vcl/errinf.hxx:188
+    void TwoStringErrorInfo::TwoStringErrorInfo(class ErrCode,const class rtl::OUString &,const class rtl::OUString &,enum DialogMask)
     enum DialogMask nMask
     4097
 include/vcl/font.hxx:91
@@ -1398,15 +1370,15 @@ include/vcl/lstbox.hxx:113
     void ListBox::ListBox(enum WindowType)
     enum WindowType nType
     332
-include/vcl/outdev.hxx:1162
+include/vcl/outdev.hxx:1164
     int OutputDevice::GetTextBreak(const class rtl::OUString &,long,char16_t,int &,int,int,long,const class vcl::TextLayoutCache *) const
     char16_t nExtraChar
     45
-include/vcl/texteng.hxx:151
+include/vcl/texteng.hxx:148
     class TextPaM TextEngine::ImpInsertText(const class TextSelection &,char16_t,_Bool)
     char16_t c
     9
-include/vcl/texteng.hxx:297
+include/vcl/texteng.hxx:296
     _Bool TextEngine::HasAttrib(unsigned short) const
     unsigned short nWhich
     2
@@ -1414,15 +1386,15 @@ include/vcl/vclevent.hxx:226
     void VclAccessibleEvent::VclAccessibleEvent(enum VclEventId,const class com::sun::star::uno::Reference<class com::sun::star::accessibility::XAccessible> &)
     enum VclEventId n
     36
-include/vcl/vclptr.hxx:162
+include/vcl/vclptr.hxx:129
     VclPtr<T> VclPtr::Create(type-parameter-?-? &&...)
      ###9
     100
-include/vcl/window.hxx:1171
+include/vcl/window.hxx:1170
     void vcl::Window::InvertTracking(const class tools::Polygon &,enum ShowTrackFlags)
     enum ShowTrackFlags nFlags
     4097
-include/vcl/window.hxx:1540
+include/vcl/window.hxx:1539
     void vcl::Window::SimulateKeyPress(unsigned short) const
     unsigned short nKeyCode
     1312
@@ -1454,15 +1426,15 @@ include/xmloff/xmlerror.hxx:135
     void XMLErrors::ThrowErrorAsSAXException(int)
     int nIdMask
     1073741824
-include/xmloff/xmlexp.hxx:271
+include/xmloff/xmlexp.hxx:272
     void SvXMLExport::SvXMLExport(const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &,const class rtl::OUString &,const class rtl::OUString &,const short,const class com::sun::star::uno::Reference<class com::sun::star::xml::sax::XDocumentHandler> &)
     const short eDefaultMeasureUnit
     3
-include/xmloff/xmlexp.hxx:336
+include/xmloff/xmlexp.hxx:338
     void SvXMLExport::AddAttributeASCII(unsigned short,const char *,const char *)
     unsigned short nPrefix
     24
-include/xmloff/xmlexp.hxx:511
+include/xmloff/xmlexp.hxx:513
     void SvXMLExport::SetError(int,const class com::sun::star::uno::Sequence<class rtl::OUString> &)
     int nId
     1074266113
@@ -1470,7 +1442,7 @@ include/xmloff/xmlexppr.hxx:131
     void SvXMLExportPropertyMapper::exportXML(class SvXMLExport &,const class std::__debug::vector<struct XMLPropertyState, class std::allocator<struct XMLPropertyState> > &,enum SvXmlExportFlags,_Bool) const
     enum SvXmlExportFlags nFlags
     8
-include/xmloff/xmlimp.hxx:472
+include/xmloff/xmlimp.hxx:476
     void SvXMLImport::SetError(int,const class rtl::OUString &,const class rtl::OUString &)
     int nId
     268566538
@@ -1542,39 +1514,7 @@ reportdesign/source/filter/xml/xmlStyleImport.hxx:73
     void rptxml::OControlStyleContext::AddProperty(short,const class com::sun::star::uno::Any &)
     short nContextID
     28673
-reportdesign/source/ui/inc/ReportController.hxx:207
-    void rptui::OReportController::alignControlsWithUndo(unsigned short,enum rptui::ControlModification,_Bool)
-    unsigned short _nUndoStrId
-    30885
-reportdesign/source/ui/inc/ReportController.hxx:219
-    void rptui::OReportController::shrinkSection(unsigned short,const class com::sun::star::uno::Reference<class com::sun::star::report::XSection> &,int)
-    unsigned short _nUndoStrId
-    30923
-rsc/inc/rscdef.hxx:205
-    class RscDefine * RscDefineList::New(struct o3tl::strong_int<unsigned int, struct UniqueIndexImpl::IndexTagType>,const class rtl::OString &,int,unsigned long)
-    unsigned long lPos
-    18446744073709551615
-rsc/inc/rscdef.hxx:207
-    class RscDefine * RscDefineList::New(struct o3tl::strong_int<unsigned int, struct UniqueIndexImpl::IndexTagType>,const class rtl::OString &,class RscExpression *,unsigned long)
-    unsigned long lPos
-    18446744073709551615
-rsc/inc/rsckey.hxx:45
-    unsigned int RscNameTable::Put(const char *,unsigned int)
-    unsigned int nTyp
-    273
-rsc/inc/rsckey.hxx:46
-    void RscNameTable::Put(unsigned int,unsigned int,class RscTop *)
-    unsigned int nTyp
-    272
-rsc/inc/rscrange.hxx:41
-    void RscLongRange::SetRange(int,int)
-    int nMinimum
-    -2147483648
-rsc/inc/rscrange.hxx:41
-    void RscLongRange::SetRange(int,int)
-    int nMaximum
-    2147483647
-sal/osl/unx/file_path_helper.cxx:167
+sal/osl/unx/file_path_helper.cxx:164
     void path_list_iterator::path_list_iterator(const class rtl::OUString &,char16_t)
     char16_t list_separator
     58
@@ -1586,27 +1526,31 @@ sal/osl/unx/file_url.cxx:797
     unsigned long (anonymous namespace)::TextToUnicodeConverter_Impl::convert(const char *,unsigned long,char16_t *,unsigned long,unsigned int,unsigned int *,unsigned long *)
     unsigned int nFlags
     33587
-sax/inc/xml2utf.hxx:56
+sax/inc/xml2utf.hxx:55
     void sax_expatwrap::Unicode2TextConverter::Unicode2TextConverter(unsigned short)
     unsigned short encoding
     76
-sax/inc/xml2utf.hxx:95
+sax/inc/xml2utf.hxx:93
     int sax_expatwrap::XMLFile2UTFConverter::readAndConvert(class com::sun::star::uno::Sequence<signed char> &,int)
     int nMaxToRead
     16384
-sc/inc/address.hxx:320
+sc/inc/AccessibleFilterMenu.hxx:50
+    void ScAccessibleFilterMenu::ScAccessibleFilterMenu(const class com::sun::star::uno::Reference<class com::sun::star::accessibility::XAccessible> &,class ScMenuFloatingWindow *,const class rtl::OUString &,unsigned long)
+    unsigned long nMenuPos
+    999
+sc/inc/address.hxx:322
     void ScAddress::Format(class rtl::OStringBuffer &,enum ScRefFlags,const class ScDocument *,const struct ScAddress::Details &) const
     enum ScRefFlags nFlags
     32768
-sc/inc/autoform.hxx:124
+sc/inc/autoform.hxx:125
     void ScAfVersions::Write(class SvStream &,unsigned short)
     unsigned short fileVersion
     5050
-sc/inc/autoform.hxx:293
+sc/inc/autoform.hxx:294
     void ScAutoFormatData::CopyItem(unsigned short,unsigned short,unsigned short)
     unsigned short nWhich
     150
-sc/inc/autoform.hxx:303
+sc/inc/autoform.hxx:304
     _Bool ScAutoFormatData::Save(class SvStream &,unsigned short)
     unsigned short fileVersion
     5050
@@ -1618,23 +1562,27 @@ sc/inc/cellvalues.hxx:69
     void sc::CellValues::reset(unsigned long)
     unsigned long nSize
     1048576
-sc/inc/chgtrack.hxx:247
+sc/inc/chgtrack.hxx:248
     void ScChangeAction::ScChangeAction(enum ScChangeActionType,const class ScBigRange &,const unsigned long)
     enum ScChangeActionType 
     8
-sc/inc/colcontainer.hxx:38
-    void ScColContainer::ScColContainer(class ScDocument *,const unsigned long)
+sc/inc/colcontainer.hxx:37
+    void ScColContainer::ScColContainer(const unsigned long)
     const unsigned long nSize
     1024
+sc/inc/column.hxx:252
+    void ScColumn::GetUnprotectedCells(int,int,class ScRangeList &) const
+    int nEndRow
+    1048575
 sc/inc/column.hxx:266
     void ScColumn::DeleteRanges(const class std::__debug::vector<struct sc::RowSpan, class std::allocator<struct sc::RowSpan> > &,enum InsertDeleteFlags)
     enum InsertDeleteFlags nDelFlag
     2071
-sc/inc/column.hxx:511
+sc/inc/column.hxx:512
     unsigned short ScColumn::GetOptimalColWidth(class OutputDevice *,double,double,const class Fraction &,const class Fraction &,_Bool,unsigned short,const class ScMarkData *,const struct ScColWidthParam *) const
     unsigned short nOldWidth
     1167
-sc/inc/column.hxx:592
+sc/inc/column.hxx:593
     void ScColumn::BroadcastRows(int,int,enum SfxHintId)
     enum SfxHintId nHint
     54
@@ -1666,35 +1614,35 @@ sc/inc/compressedarray.hxx:176
     type-parameter-?-? ScBitMaskCompressedArray::GetLastAnyBitAccess(const type-parameter-?-? &) const
     const type-parameter-?-? & rBitMask
     15
-sc/inc/document.hxx:1203
+sc/inc/document.hxx:1206
     _Bool ScDocument::CompileErrorCells(enum FormulaError)
     enum FormulaError nErrCode
     525
-sc/inc/document.hxx:1520
-    void ScDocument::UndoToDocument(short,int,short,short,int,short,enum InsertDeleteFlags,_Bool,class ScDocument &)
-    enum InsertDeleteFlags nFlags
-    2303
-sc/inc/document.hxx:1520
+sc/inc/document.hxx:1523
     void ScDocument::UndoToDocument(short,int,short,short,int,short,enum InsertDeleteFlags,_Bool,class ScDocument &)
     short nCol2
     1023
-sc/inc/document.hxx:1690
+sc/inc/document.hxx:1523
+    void ScDocument::UndoToDocument(short,int,short,short,int,short,enum InsertDeleteFlags,_Bool,class ScDocument &)
+    enum InsertDeleteFlags nFlags
+    2303
+sc/inc/document.hxx:1694
     void ScDocument::DeleteSelectionTab(short,enum InsertDeleteFlags,const class ScMarkData &)
     enum InsertDeleteFlags nDelFlag
     2303
-sc/inc/document.hxx:1747
-    void ScDocument::SetRowFlags(int,int,short,enum CRFlags)
-    enum CRFlags nNewFlags
-    8
-sc/inc/document.hxx:1747
+sc/inc/document.hxx:1751
     void ScDocument::SetRowFlags(int,int,short,enum CRFlags)
     int nEndRow
     1048575
-sc/inc/document.hxx:1777
+sc/inc/document.hxx:1751
+    void ScDocument::SetRowFlags(int,int,short,enum CRFlags)
+    enum CRFlags nNewFlags
+    8
+sc/inc/document.hxx:1781
     int ScDocument::LastNonFilteredRow(int,int,short) const
     int nEndRow
     1048575
-sc/inc/document.hxx:2054
+sc/inc/document.hxx:2059
     void ScDocument::BroadcastCells(const class ScRange &,enum SfxHintId,_Bool)
     enum SfxHintId nHint
     34
@@ -1718,7 +1666,7 @@ sc/inc/optutil.hxx:44
     void ScLinkConfigItem::ScLinkConfigItem(const class rtl::OUString &,enum ConfigItemMode)
     enum ConfigItemMode nMode
     2
-sc/inc/scmod.hxx:250
+sc/inc/scmod.hxx:252
     class vcl::Window * ScModule::Find1RefWindow(unsigned short,class vcl::Window *)
     unsigned short nSlotId
     26161
@@ -1730,26 +1678,26 @@ sc/inc/stlpool.hxx:54
     class ScStyleSheet * ScStyleSheetPool::FindCaseIns(const class rtl::OUString &,enum SfxStyleFamily)
     enum SfxStyleFamily eFam
     2
-sc/inc/table.hxx:381
+sc/inc/table.hxx:382
     void ScTable::SetFormula(short,int,const class ScTokenArray &,enum formula::FormulaGrammar::Grammar)
     enum formula::FormulaGrammar::Grammar eGram
     65539
-sc/inc/table.hxx:633
+sc/inc/table.hxx:634
     _Bool ScTable::HasAttribSelection(const class ScMarkData &,enum HasAttrFlags) const
     enum HasAttrFlags nMask
     8
-sc/inc/table.hxx:733
+sc/inc/table.hxx:735
     void ScTable::SetOptimalHeightOnly(class sc::RowHeightContext &,int,int,class ScProgress *,unsigned long)
     int nEndRow
     1048575
 sc/inc/tokenarray.hxx:254
     void ScTokenArray::WrapReference(const class ScAddress &,short,int)
-    short nMaxCol
-    255
-sc/inc/tokenarray.hxx:254
-    void ScTokenArray::WrapReference(const class ScAddress &,short,int)
     int nMaxRow
     65535
+sc/inc/tokenarray.hxx:254
+    void ScTokenArray::WrapReference(const class ScAddress &,short,int)
+    short nMaxCol
+    255
 sc/inc/tokenarray.hxx:255
     _Bool ScTokenArray::NeedsWrapReference(const class ScAddress &,short,int) const
     int nMaxRow
@@ -1766,27 +1714,27 @@ sc/qa/unit/ucalc.hxx:30
     void FormulaGrammarSwitch::FormulaGrammarSwitch(class ScDocument *,enum formula::FormulaGrammar::Grammar)
     enum formula::FormulaGrammar::Grammar eGrammar
     17104900
-sc/qa/unit/ucalc_formula.cxx:7524
+sc/qa/unit/ucalc_formula.cxx:7707
     void (anonymous namespace)::ColumnTest::ColumnTest(class ScDocument *,int,int,int,int,int)
-    int nTotalRows
-    330
-sc/qa/unit/ucalc_formula.cxx:7524
+    int nStart1
+    9
+sc/qa/unit/ucalc_formula.cxx:7707
     void (anonymous namespace)::ColumnTest::ColumnTest(class ScDocument *,int,int,int,int,int)
-    int nEnd2
-    319
-sc/qa/unit/ucalc_formula.cxx:7524
+    int nEnd1
+    159
+sc/qa/unit/ucalc_formula.cxx:7707
     void (anonymous namespace)::ColumnTest::ColumnTest(class ScDocument *,int,int,int,int,int)
     int nStart2
     169
-sc/qa/unit/ucalc_formula.cxx:7524
+sc/qa/unit/ucalc_formula.cxx:7707
     void (anonymous namespace)::ColumnTest::ColumnTest(class ScDocument *,int,int,int,int,int)
-    int nStart1
-    9
-sc/qa/unit/ucalc_formula.cxx:7524
+    int nTotalRows
+    330
+sc/qa/unit/ucalc_formula.cxx:7707
     void (anonymous namespace)::ColumnTest::ColumnTest(class ScDocument *,int,int,int,int,int)
-    int nEnd1
-    159
-sc/source/core/data/documen8.cxx:508
+    int nEnd2
+    319
+sc/source/core/data/documen8.cxx:509
     void (anonymous namespace)::IdleCalcTextWidthScope::incCol(short)
     short nInc
     -1
@@ -1794,7 +1742,7 @@ sc/source/core/data/segmenttree.cxx:254
     void ScFlatUInt16SegmentsImpl::ScFlatUInt16SegmentsImpl(int,unsigned short)
     int nMax
     1048575
-sc/source/core/tool/compiler.cxx:1240
+sc/source/core/tool/compiler.cxx:1239
     void ConventionXL_A1::ConventionXL_A1(enum formula::FormulaGrammar::AddressConvention)
     enum formula::FormulaGrammar::AddressConvention eConv
     4
@@ -1802,7 +1750,7 @@ sc/source/filter/excel/xelink.cxx:294
     void XclExpSupbook::XclExpSupbook(const class XclExpRoot &,const class rtl::OUString &,enum XclSupbookType)
     enum XclSupbookType 
     5
-sc/source/filter/excel/xepage.cxx:340
+sc/source/filter/excel/xepage.cxx:341
     void XclExpXmlStartHeaderFooterElementRecord::XclExpXmlStartHeaderFooterElementRecord(const int)
     const int nElement
     2611
@@ -1818,18 +1766,6 @@ sc/source/filter/inc/addressconverter.hxx:483
     void oox::xls::AddressConverter::initializeMaxPos(short,int,int)
     int nMaxXlsRow
     1048575
-sc/source/filter/inc/addressconverter.hxx:495
-    void oox::xls::AddressConverter::ControlCharacters::set(char16_t,char16_t,char16_t,char16_t,char16_t)
-    char16_t cSameSheet
-    65535
-sc/source/filter/inc/addressconverter.hxx:495
-    void oox::xls::AddressConverter::ControlCharacters::set(char16_t,char16_t,char16_t,char16_t,char16_t)
-    char16_t cThisWorkbook
-    65535
-sc/source/filter/inc/addressconverter.hxx:495
-    void oox::xls::AddressConverter::ControlCharacters::set(char16_t,char16_t,char16_t,char16_t,char16_t)
-    char16_t cThisSheet
-    65535
 sc/source/filter/inc/formulabase.hxx:276
     void oox::xls::ApiTokenVector::reserve(unsigned long)
     unsigned long n
@@ -1838,11 +1774,7 @@ sc/source/filter/inc/formulabase.hxx:763
     void oox::xls::FormulaProcessorBase::convertStringToStringList(class com::sun::star::uno::Sequence<struct com::sun::star::sheet::FormulaToken> &,char16_t,_Bool) const
     char16_t cStringSep
     44
-sc/source/filter/inc/fprogressbar.hxx:191
-    void ScfSimpleProgressBar::ScfSimpleProgressBar(unsigned long,class SfxObjectShell *,unsigned short)
-    unsigned short nResId
-    70
-sc/source/filter/inc/tokstack.hxx:215
+sc/source/filter/inc/tokstack.hxx:252
     _Bool TokenPool::IsSingleOp(const struct TokenId &,const enum OpCode) const
     const enum OpCode eId
     13
@@ -1898,142 +1830,142 @@ sc/source/filter/inc/xerecord.hxx:360
     void XclExpSubStream::XclExpSubStream(unsigned short)
     unsigned short nSubStrmType
     32
-sc/source/filter/inc/xestream.hxx:309
+sc/source/filter/inc/xestream.hxx:298
     class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const class rtl::OString &,struct FSEND_t)
     int nAttribute
     3477
-sc/source/filter/inc/xestream.hxx:352
+sc/source/filter/inc/xestream.hxx:341
+    class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,struct FSEND_t)
+    int attribute11
+    5627
+sc/source/filter/inc/xestream.hxx:341
+    class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,struct FSEND_t)
+    int attribute1
+    5807
+sc/source/filter/inc/xestream.hxx:341
+    class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const char *,int,const char *,int,const char *,int,const char *,struct FSEND_t)
+    int attribute2
+    1667
+sc/source/filter/inc/xestream.hxx:341
+    class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,struct FSEND_t)
+    int attribute3
+    4564
+sc/source/filter/inc/xestream.hxx:341
+    class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,struct FSEND_t)
+    int attribute12
+    4068
+sc/source/filter/inc/xestream.hxx:341
+    class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,struct FSEND_t)
+    int attribute9
+    5627
+sc/source/filter/inc/xestream.hxx:341
+    class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,struct FSEND_t)
+    int attribute7
+    2685
+sc/source/filter/inc/xestream.hxx:341
+    class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,struct FSEND_t)
+    int attribute5
+    4564
+sc/source/filter/inc/xestream.hxx:341
     class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,struct FSEND_t)
     int attribute6
     5380
-sc/source/filter/inc/xestream.hxx:352
+sc/source/filter/inc/xestream.hxx:341
     class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,struct FSEND_t)
-    int attribute7
-    2137
-sc/source/filter/inc/xestream.hxx:352
+    int attribute8
+    4310
+sc/source/filter/inc/xestream.hxx:341
     class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,struct FSEND_t)
     int attribute4
     2965
-sc/source/filter/inc/xestream.hxx:352
+sc/source/filter/inc/xestream.hxx:341
     class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,struct FSEND_t)
     int attribute6
     1809
-sc/source/filter/inc/xestream.hxx:352
+sc/source/filter/inc/xestream.hxx:341
     class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const char *,int,const char *,int,const char *,int,const char *,struct FSEND_t)
-    int attribute3
-    5566
-sc/source/filter/inc/xestream.hxx:352
+    int attribute4
+    273681094
+sc/source/filter/inc/xestream.hxx:341
     class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,struct FSEND_t)
-    int attribute11
-    4111
-sc/source/filter/inc/xestream.hxx:352
+    int attribute4
+    1809
+sc/source/filter/inc/xestream.hxx:341
     class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,struct FSEND_t)
-    int attribute11
-    5627
-sc/source/filter/inc/xestream.hxx:352
+    int attribute13
+    4111
+sc/source/filter/inc/xestream.hxx:341
+    class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,struct FSEND_t)
+    int attribute1
+    2549
+sc/source/filter/inc/xestream.hxx:341
     class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,struct FSEND_t)
     int attribute5
     2685
-sc/source/filter/inc/xestream.hxx:352
+sc/source/filter/inc/xestream.hxx:341
     class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,struct FSEND_t)
-    int attribute12
-    2922
-sc/source/filter/inc/xestream.hxx:352
+    int attribute2
+    380571728
+sc/source/filter/inc/xestream.hxx:341
     class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,struct FSEND_t)
-    int attribute10
-    2922
-sc/source/filter/inc/xestream.hxx:352
+    int attribute11
+    4111
+sc/source/filter/inc/xestream.hxx:341
+    class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,struct FSEND_t)
+    int attribute2
+    2965
+sc/source/filter/inc/xestream.hxx:341
     class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,struct FSEND_t)
     int attribute3
     2549
-sc/source/filter/inc/xestream.hxx:352
+sc/source/filter/inc/xestream.hxx:341
     class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,struct FSEND_t)
     int attribute8
     5380
-sc/source/filter/inc/xestream.hxx:352
-    class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,struct FSEND_t)
-    int attribute10
-    4310
-sc/source/filter/inc/xestream.hxx:352
-    class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const char *,int,const char *,int,const char *,int,const char *,struct FSEND_t)
-    int attribute2
-    1667
-sc/source/filter/inc/xestream.hxx:352
-    class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,struct FSEND_t)
-    int attribute2
-    380571728
-sc/source/filter/inc/xestream.hxx:352
+sc/source/filter/inc/xestream.hxx:341
     class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,struct FSEND_t)
-    int attribute7
-    2685
-sc/source/filter/inc/xestream.hxx:352
+    int attribute12
+    2922
+sc/source/filter/inc/xestream.hxx:341
     class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,struct FSEND_t)
-    int attribute8
-    4310
-sc/source/filter/inc/xestream.hxx:352
-    class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,struct FSEND_t)
-    int attribute1
-    5807
-sc/source/filter/inc/xestream.hxx:352
+    int attribute7
+    2137
+sc/source/filter/inc/xestream.hxx:341
     class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,struct FSEND_t)
-    int attribute13
-    4111
-sc/source/filter/inc/xestream.hxx:352
-    class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,struct FSEND_t)
     int attribute9
-    5627
-sc/source/filter/inc/xestream.hxx:352
-    class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,struct FSEND_t)
-    int attribute2
-    2965
-sc/source/filter/inc/xestream.hxx:352
-    class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,struct FSEND_t)
-    int attribute3
-    4564
-sc/source/filter/inc/xestream.hxx:352
+    2137
+sc/source/filter/inc/xestream.hxx:341
     class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,struct FSEND_t)
     int attribute14
     4068
-sc/source/filter/inc/xestream.hxx:352
+sc/source/filter/inc/xestream.hxx:341
     class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const char *,int,const char *,int,const char *,int,const char *,struct FSEND_t)
-    int attribute4
-    273681094
-sc/source/filter/inc/xestream.hxx:352
-    class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,struct FSEND_t)
-    int attribute9
-    2137
-sc/source/filter/inc/xestream.hxx:352
+    int attribute3
+    5566
+sc/source/filter/inc/xestream.hxx:341
     class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,struct FSEND_t)
-    int attribute5
-    4564
-sc/source/filter/inc/xestream.hxx:352
-    class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,struct FSEND_t)
-    int attribute1
-    2549
-sc/source/filter/inc/xestream.hxx:352
-    class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,struct FSEND_t)
-    int attribute12
-    4068
-sc/source/filter/inc/xestream.hxx:352
+    int attribute10
+    4310
+sc/source/filter/inc/xestream.hxx:341
     class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,struct FSEND_t)
-    int attribute4
-    1809
-sc/source/filter/inc/xestream.hxx:353
+    int attribute10
+    2922
+sc/source/filter/inc/xestream.hxx:342
+    class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const class rtl::OString &,int,const class rtl::OString &,int,const class rtl::OString &,int,const class rtl::OString &,struct FSEND_t)
+    int attribute3
+    2237
+sc/source/filter/inc/xestream.hxx:342
     class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const class rtl::OString &,int,const class rtl::OString &,int,const class rtl::OString &,int,const class rtl::OString &,struct FSEND_t)
     int attribute4
     2236
-sc/source/filter/inc/xestream.hxx:353
+sc/source/filter/inc/xestream.hxx:342
     class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const class rtl::OString &,int,const class rtl::OString &,int,const class rtl::OString &,int,const class rtl::OString &,struct FSEND_t)
     int attribute1
     4242
-sc/source/filter/inc/xestream.hxx:353
+sc/source/filter/inc/xestream.hxx:342
     class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const class rtl::OString &,int,const class rtl::OString &,int,const class rtl::OString &,int,const class rtl::OString &,struct FSEND_t)
     int attribute2
     2241
-sc/source/filter/inc/xestream.hxx:353
-    class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const class rtl::OString &,int,const class rtl::OString &,int,const class rtl::OString &,int,const class rtl::OString &,struct FSEND_t)
-    int attribute3
-    2237
 sc/source/filter/inc/xestring.hxx:51
     void XclExpString::XclExpString(unsigned short,unsigned short)
     unsigned short nMaxLen
@@ -2058,34 +1990,38 @@ sc/source/filter/inc/xiformula.hxx:51
     const class ScTokenArray * XclImpFormulaCompiler::CreateFormula(enum XclFormulaType,const class XclTokenArray &)
     enum XclFormulaType eType
     6
-sc/source/filter/xcl97/XclExpChangeTrack.cxx:1398
+sc/source/filter/xcl97/XclExpChangeTrack.cxx:1399
     void EndXmlElement::EndXmlElement(int)
     int nElement
     2619
 sc/source/filter/xml/xmlfonte.cxx:39
-    void ScXMLFontAutoStylePool_Impl::AddFontItems(unsigned short *,unsigned char,const class SfxItemPool *,const _Bool)
+    void ScXMLFontAutoStylePool_Impl::AddFontItems(const unsigned short *,unsigned char,const class SfxItemPool *,const _Bool)
     unsigned char nIdCount
     3
-sc/source/filter/xml/xmlstyli.cxx:280
+sc/source/filter/xml/xmlstyli.cxx:279
     void XMLTableCellPropsContext::XMLTableCellPropsContext(class SvXMLImport &,unsigned short,const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::xml::sax::XAttributeList> &,unsigned int,class std::__debug::vector<struct XMLPropertyState, class std::allocator<struct XMLPropertyState> > &,const class rtl::Reference<class SvXMLImportPropertyMapper> &)
     unsigned int nFamily
     196608
+sc/source/ui/docshell/dataprovider.cxx:182
+    void sc::CSVHandler::CSVHandler(struct sc::Line &,unsigned long)
+    unsigned long nColCount
+    1023
 sc/source/ui/inc/AccessibleCell.hxx:158
     void ScAccessibleCell::AddRelation(const class ScAddress &,const unsigned short,class utl::AccessibleRelationSetHelper *)
     const unsigned short aRelationType
     4
-sc/source/ui/inc/AccessibleSpreadsheet.hxx:289
+sc/source/ui/inc/AccessibleSpreadsheet.hxx:288
     _Bool ScAccessibleSpreadsheet::CalcScRangeListDifferenceMax(class ScRangeList *,class ScRangeList *,int,class std::__debug::vector<class ScMyAddress, class std::allocator<class ScMyAddress> > &)
     int nMax
     10
-sc/source/ui/inc/docfunc.hxx:75
-    void ScDocFunc::EnterListAction(unsigned short)
-    unsigned short nNameResId
-    19
 sc/source/ui/inc/docfunc.hxx:112
     _Bool ScDocFunc::SetCellText(const class ScAddress &,const class rtl::OUString &,_Bool,_Bool,_Bool,const enum formula::FormulaGrammar::Grammar)
     const enum formula::FormulaGrammar::Grammar eGrammar
     16908294
+sc/source/ui/inc/imoptdlg.hxx:37
+    void ScImportOptions::ScImportOptions(char16_t,char16_t,unsigned short)
+    char16_t nTextSep
+    34
 sc/source/ui/inc/select.hxx:35
     void ScViewSelectionEngine::ScViewSelectionEngine(class vcl::Window *,class ScTabView *,enum ScSplitPos)
     enum ScSplitPos eSplitPos
@@ -2138,15 +2074,15 @@ sc/source/ui/inc/viewfunc.hxx:187
     void ScViewFunc::Protect(short,const class rtl::OUString &)
     short nTab
     32767
-scaddins/source/analysis/analysishelper.hxx:118
+scaddins/source/analysis/analysishelper.hxx:114
     class rtl::OUString GetString(double,_Bool,unsigned short)
     unsigned short nMaxNumOfDigits
     15
-scaddins/source/analysis/analysishelper.hxx:513
+scaddins/source/analysis/analysishelper.hxx:503
     void sca::analysis::ComplexList::Append(const class com::sun::star::uno::Sequence<class com::sun::star::uno::Sequence<class rtl::OUString> > &,enum sca::analysis::ComplListAppendHandl)
     enum sca::analysis::ComplListAppendHandl eAH
     2
-scaddins/source/analysis/analysishelper.hxx:573
+scaddins/source/analysis/analysishelper.hxx:563
     void sca::analysis::ConvertDataLinear::ConvertDataLinear(const char *,double,double,enum sca::analysis::ConvertDataClass,_Bool)
     enum sca::analysis::ConvertDataClass eClass
     8
@@ -2154,10 +2090,6 @@ sd/inc/sdpage.hxx:351
     class SdStyleSheet * SdPage::getPresentationStyle(unsigned int) const
     unsigned int nHelpId
     59865
-sd/source/filter/html/htmlex.hxx:74
-    void HtmlErrorContext::SetContext(unsigned short,const class rtl::OUString &,const class rtl::OUString &)
-    unsigned short nResId
-    20580
 sd/source/ui/animations/STLPropertySet.hxx:64
     void sd::STLPropertySet::setPropertyState(int,enum sd::STLPropertyState)
     enum sd::STLPropertyState nState
@@ -2182,11 +2114,11 @@ sd/source/ui/inc/assclass.hxx:51
     void Assistent::DisablePage(int)
     int nPage
     4
-sd/source/ui/inc/navigatr.hxx:156
+sd/source/ui/inc/navigatr.hxx:155
     void SdNavigatorControllerItem::SdNavigatorControllerItem(unsigned short,class SdNavigatorWin *,class SfxBindings *,const class std::function<void (void)> &)
     unsigned short 
     27288
-sd/source/ui/inc/navigatr.hxx:174
+sd/source/ui/inc/navigatr.hxx:173
     void SdPageNameControllerItem::SdPageNameControllerItem(unsigned short,class SdNavigatorWin *,class SfxBindings *)
     unsigned short 
     27287
@@ -2195,8 +2127,8 @@ sd/source/ui/inc/smarttag.hxx:168
     enum SdrHdlKind eNewKind
     23
 sd/source/ui/inc/ViewShellManager.hxx:159
-    class SfxShell * sd::ViewShellManager::GetShell(int) const
-    int nId
+    class SfxShell * sd::ViewShellManager::GetShell(enum ToolbarId) const
+    enum ToolbarId nId
     23016
 sd/source/ui/remotecontrol/ImagePreparer.hxx:37
     class com::sun::star::uno::Sequence<signed char> sd::ImagePreparer::preparePreview(unsigned int,unsigned int,unsigned int,unsigned long &)
@@ -2206,12 +2138,12 @@ sd/source/ui/remotecontrol/ImagePreparer.hxx:37
     class com::sun::star::uno::Sequence<signed char> sd::ImagePreparer::preparePreview(unsigned int,unsigned int,unsigned int,unsigned long &)
     unsigned int aHeight
     240
-sd/source/ui/sidebar/LayoutMenu.hxx:178
+sd/source/ui/sidebar/LayoutMenu.hxx:173
     class SfxRequest sd::sidebar::LayoutMenu::CreateRequest(unsigned short,enum AutoLayout)
     unsigned short nSlotId
     27014
-sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx:120
-    void sd::slidesorter::controller::SelectionFunction::EventDescriptor::EventDescriptor(unsigned int,const struct AcceptDropEvent &,const signed char,class sd::slidesorter::SlideSorter &)
+sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx:119
+    void sd::slidesorter::controller::SelectionFunction::EventDescriptor::EventDescriptor(unsigned int,const struct AcceptDropEvent &,const signed char,const class sd::slidesorter::SlideSorter &)
     unsigned int nEventType
     2048
 sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx:137
@@ -2226,11 +2158,11 @@ sdext/source/minimizer/configurationaccess.hxx:93
     short ConfigurationAccess::GetConfigProperty(const enum PPPOptimizerTokenEnum,const short) const
     const enum PPPOptimizerTokenEnum 
     38
-sdext/source/minimizer/optimizerdialog.hxx:115
+sdext/source/minimizer/optimizerdialog.hxx:116
     void OptimizerDialog::EnablePage(short)
     short nStep
     4
-sdext/source/minimizer/optimizerdialog.hxx:116
+sdext/source/minimizer/optimizerdialog.hxx:117
     void OptimizerDialog::DisablePage(short)
     short nStep
     4
@@ -2282,7 +2214,7 @@ slideshow/source/engine/transitions/zigzagwipe.hxx:45
     void slideshow::internal::BarnZigZagWipe::BarnZigZagWipe(int)
     int nZigs
     5
-sot/source/sdstor/stgdir.hxx:65
+sot/source/sdstor/stgdir.hxx:62
     void StgDirEntry::StgDirEntry(const void *,unsigned int,unsigned long,_Bool *)
     unsigned int nBufferLen
     128
@@ -2294,11 +2226,11 @@ sot/source/sdstor/stgstrms.hxx:137
     void StgSmallStrm::StgSmallStrm(class StgIo &,int)
     int nBgn
     -2
-starmath/inc/node.hxx:441
+starmath/inc/node.hxx:439
     void SmSpecialNode::SmSpecialNode(enum SmNodeType,const struct SmToken &,unsigned short)
     unsigned short _nFontDesc
     7
-starmath/inc/node.hxx:618
+starmath/inc/node.hxx:616
     void SmLineNode::SmLineNode(enum SmNodeType,const struct SmToken &)
     enum SmNodeType eNodeType
     21
@@ -2314,11 +2246,11 @@ starmath/inc/view.hxx:155
     void SmEditController::SmEditController(class SmEditWindow &,unsigned short,class SfxBindings &)
     unsigned short 
     30356
-store/source/storbase.hxx:314
+store/source/storbase.hxx:284
     void store::PageData::location(unsigned int)
     unsigned int nAddr
     -1
-svl/source/numbers/zforfind.hxx:403
+svl/source/numbers/zforfind.hxx:404
     _Bool ImpSvNumberInputScan::IsDatePatternNumberOfType(unsigned short,char16_t)
     char16_t cType
     89
@@ -2334,7 +2266,7 @@ svtools/inc/table/tablecontrolinterface.hxx:225
     void svt::table::ITableControl::showTracking(const class tools::Rectangle &,const enum ShowTrackFlags)
     const enum ShowTrackFlags i_flags
     4099
-svtools/source/contnr/imivctl.hxx:322
+svtools/source/contnr/imivctl.hxx:317
     void SvxIconChoiceCtrl_Impl::InsertEntry(class SvxIconChoiceCtrlEntry *,unsigned long)
     unsigned long nPos
     18446744073709551615
@@ -2354,15 +2286,15 @@ svx/inc/sxmtaitm.hxx:41
     void SdrMeasureTextAutoAngleViewItem::SdrMeasureTextAutoAngleViewItem(long)
     long nVal
     31500
-svx/inc/xpolyimp.hxx:39
+svx/inc/xpolyimp.hxx:41
     void ImpXPolygon::ImpXPolygon(unsigned short,unsigned short)
     unsigned short nResize
     16
-svx/source/inc/AccessibleFrameSelector.hxx:99
+svx/source/inc/AccessibleFrameSelector.hxx:98
     void svx::a11y::AccFrameSelector::NotifyAccessibleEvent(const short,const class com::sun::star::uno::Any &,const class com::sun::star::uno::Any &)
     const short _nEventId
     4
-svx/source/inc/charmapacc.hxx:260
+svx/source/inc/charmapacc.hxx:259
     void svx::SvxShowCharSetItemAcc::fireEvent(const short,const class com::sun::star::uno::Any &,const class com::sun::star::uno::Any &)
     const short _nEventId
     4
@@ -2378,11 +2310,11 @@ svx/source/inc/fmitems.hxx:33
     void FmInterfaceItem::FmInterfaceItem(const unsigned short,const class com::sun::star::uno::Reference<class com::sun::star::uno::XInterface> &)
     const unsigned short nId
     10703
-svx/source/inc/fmshimp.hxx:476
+svx/source/inc/fmshimp.hxx:475
     void FmXFormShell::UpdateSlot(short)
     short nId
     10636
-svx/source/inc/GraphCtlAccessibleContext.hxx:194
+svx/source/inc/GraphCtlAccessibleContext.hxx:193
     void SvxGraphCtrlAccessibleContext::CommitChange(short,const class com::sun::star::uno::Any &,const class com::sun::star::uno::Any &)
     short aEventId
     7
@@ -2395,26 +2327,26 @@ svx/source/inc/svxpixelctlaccessiblecontext.hxx:219
     short nEventId
     5
 sw/inc/authfld.hxx:132
-    void SwAuthorityFieldType::SetSortKeys(unsigned short,struct SwTOXSortKey *)
+    void SwAuthorityFieldType::SetSortKeys(unsigned short,const struct SwTOXSortKey *)
     unsigned short nKeyCount
     3
-sw/inc/docary.hxx:394
+sw/inc/docary.hxx:396
     _Bool SwExtraRedlineTable::DeleteAllTableRedlines(class SwDoc *,const class SwTable &,_Bool,unsigned short)
     unsigned short nRedlineTypeToDelete
     65535
-sw/inc/docary.hxx:395
+sw/inc/docary.hxx:397
     _Bool SwExtraRedlineTable::DeleteTableRowRedline(class SwDoc *,const class SwTableLine &,_Bool,unsigned short)
     unsigned short nRedlineTypeToDelete
     65535
-sw/inc/docary.hxx:396
+sw/inc/docary.hxx:398
     _Bool SwExtraRedlineTable::DeleteTableCellRedline(class SwDoc *,const class SwTableBox &,_Bool,unsigned short)
     unsigned short nRedlineTypeToDelete
     65535
-sw/inc/editsh.hxx:174
+sw/inc/editsh.hxx:175
     void SwEditShell::Insert(char16_t,_Bool)
     char16_t 
     32
-sw/inc/editsh.hxx:249
+sw/inc/editsh.hxx:250
     class std::__debug::vector<struct std::pair<const class SfxPoolItem *, class std::unique_ptr<class SwPaM, struct std::default_delete<class SwPaM> > >, class std::allocator<struct std::pair<const class SfxPoolItem *, class std::unique_ptr<class SwPaM, struct std::default_delete<class SwPaM> > > > > SwEditShell::GetItemWithPaM(unsigned short)
     unsigned short nWhich
     8
@@ -2426,7 +2358,7 @@ sw/inc/fmtcol.hxx:69
     void SwTextFormatColl::SwTextFormatColl(class SwAttrPool &,const char *,class SwTextFormatColl *,unsigned short)
     unsigned short nFormatWh
     154
-sw/inc/frmfmt.hxx:83
+sw/inc/frmfmt.hxx:84
     void SwFrameFormat::SwFrameFormat(class SwAttrPool &,const char *,class SwFrameFormat *,unsigned short,const unsigned short *)
     unsigned short nFormatWhich
     152
@@ -2434,15 +2366,15 @@ sw/inc/IDocumentRedlineAccess.hxx:182
     _Bool IDocumentRedlineAccess::DeleteRedline(const class SwStartNode &,_Bool,unsigned short)
     unsigned short nDelType
     65535
-sw/inc/ndtxt.hxx:156
-    void SwTextNode::SetLanguageAndFont(const class SwPaM &,struct o3tl::strong_int<unsigned short, struct LanguageTypeTag>,unsigned short,const class vcl::Font *,unsigned short)
-    unsigned short nFontWhichId
-    22
-sw/inc/ndtxt.hxx:156
+sw/inc/ndtxt.hxx:153
     void SwTextNode::SetLanguageAndFont(const class SwPaM &,struct o3tl::strong_int<unsigned short, struct LanguageTypeTag>,unsigned short,const class vcl::Font *,unsigned short)
     unsigned short nLangWhichId
     24
-sw/inc/node.hxx:445
+sw/inc/ndtxt.hxx:153
+    void SwTextNode::SetLanguageAndFont(const class SwPaM &,struct o3tl::strong_int<unsigned short, struct LanguageTypeTag>,unsigned short,const class vcl::Font *,unsigned short)
+    unsigned short nFontWhichId
+    22
+sw/inc/node.hxx:441
     const class SfxPoolItem * SwContentNode::GetNoCondAttr(unsigned short,_Bool) const
     unsigned short nWhich
     72
@@ -2450,11 +2382,11 @@ sw/inc/swfltopt.hxx:30
     void SwFilterOptions::SwFilterOptions(unsigned short,const char **,unsigned long *)
     unsigned short nCnt
     13
-sw/inc/tblafmt.hxx:190
+sw/inc/tblafmt.hxx:191
     _Bool SwBoxAutoFormat::SaveVersionNo(class SvStream &,unsigned short) const
     unsigned short fileVersion
     5050
-sw/inc/tblafmt.hxx:325
+sw/inc/tblafmt.hxx:327
     _Bool SwTableAutoFormat::Save(class SvStream &,unsigned short) const
     unsigned short fileVersion
     5050
@@ -2470,15 +2402,15 @@ sw/inc/unotextcursor.hxx:87
     void SwXTextCursor::SwXTextCursor(const class com::sun::star::uno::Reference<class com::sun::star::text::XText> &,const class SwPaM &,const enum CursorType)
     const enum CursorType eType
     7
-sw/source/core/access/accmap.cxx:366
+sw/source/core/access/accmap.cxx:363
     void SwAccessibleEvent_Impl::SwAccessibleEvent_Impl(enum SwAccessibleEvent_Impl::EventType,const class sw::access::SwAccessibleChild &)
     enum SwAccessibleEvent_Impl::EventType eT
     5
-sw/source/core/access/accmap.cxx:377
+sw/source/core/access/accmap.cxx:374
     void SwAccessibleEvent_Impl::SwAccessibleEvent_Impl(enum SwAccessibleEvent_Impl::EventType)
     enum SwAccessibleEvent_Impl::EventType eT
     4
-sw/source/core/access/accmap.cxx:416
+sw/source/core/access/accmap.cxx:413
     void SwAccessibleEvent_Impl::SwAccessibleEvent_Impl(enum SwAccessibleEvent_Impl::EventType,const class SwFrame *,const class sw::access::SwAccessibleChild &,const class SwRect &)
     enum SwAccessibleEvent_Impl::EventType eT
     3
@@ -2518,11 +2450,11 @@ sw/source/filter/html/svxcss1.hxx:153
     void SvxCSS1PropertyInfo::SetBoxItem(class SfxItemSet &,unsigned short,const class SvxBoxItem *)
     unsigned short nMinBorderDist
     28
-sw/source/filter/html/svxcss1.hxx:245
+sw/source/filter/html/svxcss1.hxx:240
     void SvxCSS1Parser::SvxCSS1Parser(class SfxItemPool &,const class rtl::OUString &,unsigned short *,unsigned short)
     unsigned short nWhichIds
     3
-sw/source/filter/html/swhtml.hxx:628
+sw/source/filter/html/swhtml.hxx:624
     void SwHTMLParser::NewStdAttr(enum HtmlTokenId)
     enum HtmlTokenId nToken
     414
@@ -2538,7 +2470,7 @@ sw/source/filter/inc/fltshell.hxx:236
     void SwFltRedline::SwFltRedline(unsigned short,unsigned long,const class DateTime &,unsigned short,unsigned long)
     unsigned long nAutorNoPrev_
     18446744073709551615
-sw/source/filter/ww8/docxexport.hxx:178
+sw/source/filter/ww8/docxexport.hxx:181
     void DocxExport::WriteOutliner(const class OutlinerParaObject &,unsigned char)
     unsigned char nTyp
     5
@@ -2558,11 +2490,11 @@ sw/source/filter/ww8/ww8glsy.hxx:61
     void WW8Glossary::WW8Glossary(class tools::SvRef<class SotStorageStream> &,unsigned char,class SotStorage *)
     unsigned char nVersion
     8
-sw/source/filter/ww8/ww8par.hxx:1565
+sw/source/filter/ww8/ww8par.hxx:1584
     class OutlinerParaObject * SwWW8ImplReader::ImportAsOutliner(class rtl::OUString &,int,int,enum ManTypes)
     enum ManTypes eType
     4
-sw/source/filter/ww8/ww8par.hxx:1724
+sw/source/filter/ww8/ww8par.hxx:1743
     void SwWW8ImplReader::Read_Justify(unsigned short,const unsigned char *,short)
     unsigned short 
     9219
@@ -2574,7 +2506,7 @@ sw/source/filter/ww8/ww8scan.hxx:989
     struct SprmResult WW8PLCFMan::HasCharSprm(unsigned short) const
     unsigned short nId
     2138
-sw/source/filter/ww8/ww8scan.hxx:1528
+sw/source/filter/ww8/ww8scan.hxx:1529
     void WW8Fib::WW8Fib(unsigned char,_Bool)
     unsigned char nVersion
     8
@@ -2622,11 +2554,11 @@ vcl/inc/fontsubset.hxx:53
     _Bool FontSubsetInfo::LoadFont(enum FontType,const unsigned char *,int)
     enum FontType eInFontType
     32
-vcl/inc/listbox.hxx:455
+vcl/inc/listbox.hxx:454
     void ImplListBox::SetMRUEntries(const class rtl::OUString &,char16_t)
     char16_t cSep
     59
-vcl/inc/listbox.hxx:456
+vcl/inc/listbox.hxx:455
     class rtl::OUString ImplListBox::GetMRUEntries(char16_t) const
     char16_t cSep
     59
@@ -2635,11 +2567,11 @@ vcl/inc/octree.hxx:101
     const unsigned long nMax
     32
 vcl/inc/opengl/program.hxx:86
-    void OpenGLProgram::SetUniform1fv(const class rtl::OString &,int,float *)
+    void OpenGLProgram::SetUniform1fv(const class rtl::OString &,int,const float *)
     int nCount
     16
 vcl/inc/opengl/program.hxx:87
-    void OpenGLProgram::SetUniform2fv(const class rtl::OString &,int,float *)
+    void OpenGLProgram::SetUniform2fv(const class rtl::OString &,int,const float *)
     int nCount
     16
 vcl/inc/opengl/program.hxx:108
@@ -2650,8 +2582,12 @@ vcl/inc/salgdi.hxx:539
     _Bool SalGraphics::hitTestNativeControl(enum ControlType,enum ControlPart,const class tools::Rectangle &,const class Point &,_Bool &)
     enum ControlType eType
     60
+vcl/inc/sallayout.hxx:269
+    void GlyphItem::GlyphItem(int,unsigned int,const class Point &,long,int)
+    long nFlags
+    3
 vcl/inc/unx/gendisp.hxx:66
-    void SalGenericDisplay::CancelInternalEvent(class SalFrame *,void *,enum SalEvent)
+    void SalGenericDisplay::CancelInternalEvent(const class SalFrame *,const void *,enum SalEvent)
     enum SalEvent nEvent
     21
 vcl/inc/unx/gtk/gtkprintwrapper.hxx:59
@@ -2662,15 +2598,15 @@ vcl/inc/unx/saldata.hxx:62
     void X11SalData::X11SalData(enum SalGenericDataType,class SalInstance *)
     enum SalGenericDataType t
     5
-vcl/qa/cppunit/timer.cxx:35
+vcl/qa/cppunit/timer.cxx:36
     void WatchDog::WatchDog(int)
     int nSeconds
     120
-vcl/qa/cppunit/timer.cxx:303
+vcl/qa/cppunit/timer.cxx:336
     void YieldTimer::YieldTimer(unsigned long)
     unsigned long nMS
     5
-vcl/qa/cppunit/timer.cxx:330
+vcl/qa/cppunit/timer.cxx:363
     void SlowCallbackTimer::SlowCallbackTimer(unsigned long,_Bool &)
     unsigned long nMS
     250
@@ -2686,17 +2622,21 @@ vcl/source/filter/wmf/wmfwr.hxx:145
     void WMFWriter::WMFRecord_Escape(unsigned int,unsigned int,const signed char *)
     unsigned int nEsc
     2
-vcl/source/gdi/pdfwriter_impl.hxx:1085
+vcl/source/gdi/pdfwriter_impl.hxx:1082
     void vcl::PDFWriterImpl::insertError(enum vcl::PDFWriter::ErrorCode)
     enum vcl::PDFWriter::ErrorCode eErr
     3
-vcl/unx/generic/dtrans/X11_selection.hxx:390
+vcl/unx/generic/app/i18n_status.cxx:51
+    void vcl::StatusWindow::StatusWindow(long)
+    long nWinBits
+    38654705672
+vcl/unx/generic/dtrans/X11_selection.hxx:383
     unsigned long x11::SelectionManager::createCursor(const unsigned char *,const unsigned char *,int,int,int,int)
-    int width
+    int height
     32
-vcl/unx/generic/dtrans/X11_selection.hxx:390
+vcl/unx/generic/dtrans/X11_selection.hxx:383
     unsigned long x11::SelectionManager::createCursor(const unsigned char *,const unsigned char *,int,int,int,int)
-    int height
+    int width
     32
 vcl/unx/generic/gdi/xrender_peer.hxx:52
     void XRenderPeer::ChangePicture(unsigned long,unsigned long,const struct _XRenderPictureAttributes *) const
@@ -2710,26 +2650,26 @@ vcl/unx/generic/gdi/xrender_peer.hxx:62
     void XRenderPeer::CompositeTrapezoids(int,unsigned long,unsigned long,const XRenderPictFormat *,int,int,const struct _XTrapezoid *,int) const
     int nOp
     3
-writerfilter/source/ooxml/OOXMLFastContextHandler.hxx:175
+writerfilter/source/ooxml/OOXMLFastContextHandler.hxx:173
     void writerfilter::ooxml::OOXMLFastContextHandler::sendPropertiesWithId(unsigned int)
     unsigned int nId
-    92455
-writerfilter/source/ooxml/OOXMLFastContextHandler.hxx:490
+    92458
+writerfilter/source/ooxml/OOXMLFastContextHandler.hxx:495
     void writerfilter::ooxml::OOXMLFastContextHandlerWrapper::addToken(int)
     int Element
     2102388
-writerfilter/source/ooxml/OOXMLPropertySet.hxx:298
+writerfilter/source/ooxml/OOXMLPropertySet.hxx:332
     void writerfilter::ooxml::OOXMLPropertySetEntryToInteger::OOXMLPropertySetEntryToInteger(unsigned int)
     unsigned int nId
     92215
-writerfilter/source/ooxml/OOXMLPropertySet.hxx:312
+writerfilter/source/ooxml/OOXMLPropertySet.hxx:346
     void writerfilter::ooxml::OOXMLPropertySetEntryToBool::OOXMLPropertySetEntryToBool(unsigned int)
     unsigned int nId
     92216
-writerfilter/source/rtftok/rtfsprm.hxx:67
+writerfilter/source/rtftok/rtfsprm.hxx:66
     void writerfilter::rtftok::RTFSprms::eraseLast(unsigned int)
     unsigned int nKeyword
-    92666
+    92669
 xmloff/inc/txtflde.hxx:253
     void XMLTextFieldExport::ProcessIntegerDef(enum xmloff::token::XMLTokenEnum,int,int)
     enum xmloff::token::XMLTokenEnum eXmlName
@@ -2770,7 +2710,7 @@ xmloff/source/draw/ximpstyl.cxx:129
     void SdXMLDrawingPageStyleContext::SdXMLDrawingPageStyleContext(class SvXMLImport &,unsigned short,const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::xml::sax::XAttributeList> &,class SvXMLStylesContext &,unsigned short)
     unsigned short nFamily
     305
-xmloff/source/forms/elementimport.cxx:1421
+xmloff/source/forms/elementimport.cxx:1409
     void xmloff::EqualHandle::EqualHandle(int)
     int _nHandle
     2
@@ -2794,7 +2734,7 @@ xmloff/source/transform/TransformerContext.hxx:58
     _Bool XMLTransformerContext::HasNamespace(unsigned short) const
     unsigned short nPrefix
     15
-xmlsecurity/inc/xsecctl.hxx:84
+xmlsecurity/inc/xsecctl.hxx:85
     void InternalSignatureInformation::addReference(enum SignatureReferenceType,int,const class rtl::OUString &,int)
     int keeperId
     -1
diff --git a/connectivity/source/drivers/writer/WTable.cxx b/connectivity/source/drivers/writer/WTable.cxx
index c609bb242861..fd759cc88ad9 100644
--- a/connectivity/source/drivers/writer/WTable.cxx
+++ b/connectivity/source/drivers/writer/WTable.cxx
@@ -173,15 +173,12 @@ void OWriterTable::fillColumns()
 
 OWriterTable::OWriterTable(sdbcx::OCollection* _pTables, OWriterConnection* _pConnection,
                            const OUString& Name,
-                           const OUString& Type,
-                           const OUString& Description,
-                           const OUString& SchemaName,
-                           const OUString& CatalogName
+                           const OUString& Type
                           ) : OWriterTable_BASE(_pTables,_pConnection,Name,
                                       Type,
-                                      Description,
-                                      SchemaName,
-                                      CatalogName)
+                                      OUString()/*Description*/,
+                                      OUString()/*SchemaName*/,
+                                      OUString()/*CatalogName*/)
     ,m_pWriterConnection(_pConnection)
     ,m_nStartCol(0)
     ,m_nDataCols(0)
diff --git a/connectivity/source/inc/writer/WTable.hxx b/connectivity/source/inc/writer/WTable.hxx
index 750a66b65df5..744e6c3a8c05 100644
--- a/connectivity/source/inc/writer/WTable.hxx
+++ b/connectivity/source/inc/writer/WTable.hxx
@@ -77,10 +77,7 @@ private:
 public:
     OWriterTable(sdbcx::OCollection* _pTables, OWriterConnection* _pConnection,
                  const OUString& Name,
-                 const OUString& Type,
-                 const OUString& Description = OUString(),
-                 const OUString& SchemaName = OUString(),
-                 const OUString& CatalogName = OUString()
+                 const OUString& Type
                 );
 
     virtual bool fetchRow(OValueRefRow& _rRow, const OSQLColumns& _rCols, bool bRetrieveData) override;
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index 86c6d7df25ad..97a1d9edcaf7 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -1368,7 +1368,7 @@ void OApplicationController::Execute(sal_uInt16 _nId, const Sequence< PropertyVa
             case SID_MAIL_SENDDOC:
                 {
                     SfxMailModel aSendMail;
-                    if ( aSendMail.AttachDocument(OUString(),getModel(), OUString()) == SfxMailModel::SEND_MAIL_OK )
+                    if ( aSendMail.AttachDocument(getModel(), OUString()) == SfxMailModel::SEND_MAIL_OK )
                         aSendMail.Send( getFrame() );
                 }
                 break;
diff --git a/dbaccess/source/ui/app/AppControllerGen.cxx b/dbaccess/source/ui/app/AppControllerGen.cxx
index 3fda1ec29e3b..fc733502ba33 100644
--- a/dbaccess/source/ui/app/AppControllerGen.cxx
+++ b/dbaccess/source/ui/app/AppControllerGen.cxx
@@ -715,7 +715,7 @@ void OApplicationController::doAction(sal_uInt16 _nId, const ElementOpenMode _eO
                 Reference< XModel > xModel(componentIter->second,UNO_QUERY);
 
                 // Send document as e-Mail using stored/default type
-                eResult = aSendMail.AttachDocument(OUString(),xModel,componentIter->first);
+                eResult = aSendMail.AttachDocument(xModel,componentIter->first);
                 ::comphelper::disposeComponent(xModel);
             }
             catch(const Exception&)
diff --git a/desktop/source/deployment/manager/dp_commandenvironments.cxx b/desktop/source/deployment/manager/dp_commandenvironments.cxx
index 732c479d9036..1ac6ae7ecb92 100644
--- a/desktop/source/deployment/manager/dp_commandenvironments.cxx
+++ b/desktop/source/deployment/manager/dp_commandenvironments.cxx
@@ -71,10 +71,10 @@ void BaseCommandEnv::handle(
 {
 }
 
-void BaseCommandEnv::handle_(bool approve, bool abort,
+void BaseCommandEnv::handle_(bool approve,
                              Reference< task::XInteractionRequest> const & xRequest )
 {
-    if (!approve && !abort)
+    if (!approve)
     {
         //not handled so far -> forwarding
         if (m_forwardHandler.is())
@@ -101,15 +101,6 @@ void BaseCommandEnv::handle_(bool approve, bool abort,
                     approve = false;
                 }
             }
-            else if (abort) {
-                Reference< task::XInteractionAbort > xInteractionAbort(
-                    pConts[ pos ], uno::UNO_QUERY );
-                if (xInteractionAbort.is()) {
-                    xInteractionAbort->select();
-                    // don't query again for ongoing continuations:
-                    abort = false;
-                }
-            }
         }
     }
 
@@ -158,7 +149,7 @@ void TmpRepositoryCommandEnv::handle(
         approve = true;
     }
 
-    handle_(approve, false/*abort*/, xRequest);
+    handle_(approve, xRequest);
 }
 
 
@@ -195,7 +186,7 @@ void LicenseCommandEnv::handle(
         }
     }
 
-    handle_(approve, false/*abort*/, xRequest);
+    handle_(approve, xRequest);
 }
 
 
@@ -219,7 +210,7 @@ void NoLicenseCommandEnv::handle(
     {
         approve = true;
     }
-    handle_(approve, false/*abort*/, xRequest);
+    handle_(approve, xRequest);
 }
 
 SilentCheckPrerequisitesCommandEnv::SilentCheckPrerequisitesCommandEnv()
@@ -238,7 +229,7 @@ void SilentCheckPrerequisitesCommandEnv::handle(
 
     if (request >>= licExc)
     {
-        handle_(true, false, xRequest); // approve = true, abort = false
+        handle_(true, xRequest); // approve = true
     }
     else if ((request >>= platformExc)
              || (request >>= depExc))
diff --git a/desktop/source/deployment/manager/dp_commandenvironments.hxx b/desktop/source/deployment/manager/dp_commandenvironments.hxx
index a9f810b3c728..3f7798bc1fe7 100644
--- a/desktop/source/deployment/manager/dp_commandenvironments.hxx
+++ b/desktop/source/deployment/manager/dp_commandenvironments.hxx
@@ -37,7 +37,7 @@ class BaseCommandEnv
 protected:
     css::uno::Reference< css::task::XInteractionHandler> m_forwardHandler;
 
-    void handle_(bool approve, bool abort,
+    void handle_(bool approve,
                  css::uno::Reference< css::task::XInteractionRequest> const & xRequest );
 public:
     virtual ~BaseCommandEnv() override;
diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx
index 0148fb280624..8b459e3dae68 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -433,9 +433,9 @@ bool EditTextObject::operator==( const EditTextObject& rCompare ) const
     return mpImpl->operator==(*rCompare.mpImpl);
 }
 
-bool EditTextObject::Equals( const EditTextObject& rCompare, bool bComparePool ) const
+bool EditTextObject::Equals( const EditTextObject& rCompare ) const
 {
-    return mpImpl->Equals(*rCompare.mpImpl, bComparePool);
+    return mpImpl->Equals(*rCompare.mpImpl, false/*bComparePool*/);
 }
 
 // #i102062#
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index e49eb2264593..adbd3d41b9a3 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -3940,8 +3940,7 @@ SdrObject* SvxMSDffManager::ImportGraphic( SvStream& rSt, SfxItemSet& rSet, cons
         {
             // TODO/LATER: in future probably the correct aspect should be provided here
             // #i32596# - pass <nCalledByGroup> to method
-            pRet = ImportOLE( GetPropertyValue( DFF_Prop_pictureId, 0 ), aGraf, rObjData.aBoundRect, aVisArea, rObjData.nCalledByGroup,
-                              embed::Aspects::MSOLE_CONTENT );
+            pRet = ImportOLE( GetPropertyValue( DFF_Prop_pictureId, 0 ), aGraf, rObjData.aBoundRect, aVisArea, rObjData.nCalledByGroup );
         }
         if( !pRet )
         {
@@ -6558,8 +6557,7 @@ SdrObject* SvxMSDffManager::ImportOLE( sal_uInt32 nOLEId,
                                        const Graphic& rGrf,
                                        const tools::Rectangle& rBoundRect,
                                        const tools::Rectangle& rVisArea,
-                                       const int /* _nCalledByGroup */,
-                                       sal_Int64 nAspect ) const
+                                       const int /* _nCalledByGroup */ ) const
 {
     SdrObject* pRet = nullptr;
     OUString sStorageName;
@@ -6569,7 +6567,7 @@ SdrObject* SvxMSDffManager::ImportOLE( sal_uInt32 nOLEId,
     if( GetOLEStorageName( nOLEId, sStorageName, xSrcStg, xDstStg ))
         pRet = CreateSdrOLEFromStorage( sStorageName, xSrcStg, xDstStg,
                                         rGrf, rBoundRect, rVisArea, pStData, nError,
-                                        nSvxMSDffOLEConvFlags, nAspect, maBaseURL);
+                                        nSvxMSDffOLEConvFlags, embed::Aspects::MSOLE_CONTENT, maBaseURL);
     return pRet;
 }
 
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 748dab777e7d..889e44eefe3d 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -1777,8 +1777,7 @@ SdrObject* SdrPowerPointImport::ImportOLE( sal_uInt32 nOLEId,
                                            const Graphic& rGraf,
                                            const tools::Rectangle& rBoundRect,
                                            const tools::Rectangle& rVisArea,
-                                           const int /*_nCalledByGroup*/,
-                                           sal_Int64 /*nAspect*/ ) const
+                                           const int /*_nCalledByGroup*/ ) const
 {
     SdrObject* pRet = nullptr;
 
diff --git a/framework/inc/dispatch/closedispatcher.hxx b/framework/inc/dispatch/closedispatcher.hxx
index 2661687b5f7c..8cbda9de0a7e 100644
--- a/framework/inc/dispatch/closedispatcher.hxx
+++ b/framework/inc/dispatch/closedispatcher.hxx
@@ -168,9 +168,6 @@ class CloseDispatcher : public  ::cppu::WeakImplHelper<
                     ignores it and open/close other documents, we can't know
                     which state the office has after closing of this frame.
 
-            @param  bAllowSuspend
-                    force calling of XController->suspend().
-
             @param  bCloseAllOtherViewsToo
                     if there are other top level frames, which
                     contains views to the same document then our m_xCloseFrame,
@@ -180,10 +177,9 @@ class CloseDispatcher : public  ::cppu::WeakImplHelper<
             @return [boolean]
                     sal_True if closing was successfully.
          */
-        bool implts_prepareFrameForClosing(const css::uno::Reference< css::frame::XFrame >& xFrame                ,
-                                                     bool                                   bAllowSuspend         ,
-                                                     bool                                   bCloseAllOtherViewsToo,
-                                                     bool&                                  bControllerSuspended  );
+        bool implts_prepareFrameForClosing(const css::uno::Reference< css::frame::XFrame >& xFrame,
+                                           bool                                   bCloseAllOtherViewsToo,
+                                           bool&                                  bControllerSuspended  );
 
         /** @short  close the member m_xCloseFrame.
 
diff --git a/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx
index 7302507ebbe5..8ee7791ecd60 100644
--- a/framework/source/dispatch/closedispatcher.cxx
+++ b/framework/source/dispatch/closedispatcher.cxx
@@ -324,7 +324,7 @@ IMPL_LINK_NOARG(CloseDispatcher, impl_asyncCallback, LinkParamNone*, void)
     //    document inside our own frame and decide then again, what has to be done!
     else
     {
-        if (implts_prepareFrameForClosing(m_xCloseFrame, true/*bAllowSuspend*/, bCloseAllViewsToo, bControllerSuspended))
+        if (implts_prepareFrameForClosing(m_xCloseFrame, bCloseAllViewsToo, bControllerSuspended))
         {
             // OK; this frame is empty now.
             // Check the environment again to decide, what is the next step.
@@ -429,10 +429,9 @@ IMPL_LINK_NOARG(CloseDispatcher, impl_asyncCallback, LinkParamNone*, void)
     }
 }
 
-bool CloseDispatcher::implts_prepareFrameForClosing(const css::uno::Reference< css::frame::XFrame >& xFrame                ,
-                                                          bool                                   bAllowSuspend         ,
-                                                          bool                                   bCloseAllOtherViewsToo,
-                                                          bool&                                  bControllerSuspended  )
+bool CloseDispatcher::implts_prepareFrameForClosing(const css::uno::Reference< css::frame::XFrame >& xFrame,
+                                                    bool                                   bCloseAllOtherViewsToo,
+                                                    bool&                                  bControllerSuspended  )
 {
     // Frame already dead ... so this view is closed ... is closed ... is ... .-)
     if (! xFrame.is())
@@ -462,9 +461,7 @@ bool CloseDispatcher::implts_prepareFrameForClosing(const css::uno::Reference< c
         }
     }
 
-    // If allowed - inform user about modified documents or
-    // still running jobs (e.g. printing).
-    if (bAllowSuspend)
+    // Inform user about modified documents or still running jobs (e.g. printing).
     {
         css::uno::Reference< css::frame::XController > xController = xFrame->getController();
         if (xController.is()) // some views don't uses a controller .-( (e.g. the help window)
diff --git a/include/editeng/editobj.hxx b/include/editeng/editobj.hxx
index 33a32ec9f222..520cf5b482f8 100644
--- a/include/editeng/editobj.hxx
+++ b/include/editeng/editobj.hxx
@@ -131,12 +131,9 @@ public:
 
     bool operator==( const EditTextObject& rCompare ) const;
 
-    /** Compare possibly ignoring SfxItemPool pointer.
-        @param  bComparePool
-                if <FALSE/> ignore SfxItemPool pointer,
-                if <TRUE/> compare also SfxItemPool pointer (identical to operator==())
+    /** Compare, ignoring SfxItemPool pointer.
      */
-    bool Equals( const EditTextObject& rCompare, bool bComparePool ) const;
+    bool Equals( const EditTextObject& rCompare ) const;
 
     // #i102062#
     bool isWrongListEqual(const EditTextObject& rCompare) const;
diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx
index 265b2c915dd5..82fb3751a3ed 100644
--- a/include/filter/msfilter/msdffimp.hxx
+++ b/include/filter/msfilter/msdffimp.hxx
@@ -475,8 +475,7 @@ protected:
                                   const Graphic& rGraf,
                                   const tools::Rectangle& rBoundRect,
                                   const tools::Rectangle& rVisArea,
-                                  const int _nCalledByGroup,
-                                  sal_Int64 nAspect ) const;
+                                  const int _nCalledByGroup ) const;
     static css::uno::Reference < css::embed::XEmbeddedObject > CheckForConvertToSOObj(
                 sal_uInt32 nConvertFlags, SotStorage& rSrcStg,
                 const css::uno::Reference < css::embed::XStorage >& xDestStg,
diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx
index 2fc15a4e7b6b..558a0396daa4 100644
--- a/include/filter/msfilter/svdfppt.hxx
+++ b/include/filter/msfilter/svdfppt.hxx
@@ -581,8 +581,7 @@ protected:
                                 const Graphic& rGraf,
                                 const tools::Rectangle& rBoundRect,
                                 const tools::Rectangle& rVisArea,
-                                const int _nCalledByGroup,
-                                sal_Int64 nAspect
+                                const int _nCalledByGroup
                             ) const override;
     SvMemoryStream*         ImportExOleObjStg( sal_uInt32 nPersistPtr, sal_uInt32& nOleId ) const;
     SdrPage*                MakeBlancPage(bool bMaster) const;
diff --git a/include/sfx2/mailmodelapi.hxx b/include/sfx2/mailmodelapi.hxx
index bcf04760dde3..5c16060d7934 100644
--- a/include/sfx2/mailmodelapi.hxx
+++ b/include/sfx2/mailmodelapi.hxx
@@ -78,16 +78,13 @@ public:
     /** attaches a document to the current attachment list, can be called more than once.
     *   at the moment there will be a dialog for export executed for every model which is going to be attached.
     *
-    * \param sDocumentType
-        The doc type to export. PDF will be at the moment only a direct export (no dialog).
     * \param xModel
         The current model to attach
     * \param sAttachmentTitle
         The title which will be used as attachment title
     * \return @see error code
     */
-    SendMailResult      AttachDocument( const OUString& sDocumentType,
-                                        const css::uno::Reference< css::uno::XInterface >& xFrameOrModel,
+    SendMailResult      AttachDocument( const css::uno::Reference< css::uno::XInterface >& xFrameOrModel,
                                         const OUString& sAttachmentTitle );
 
     SendMailResult      SaveAndSend( const css::uno::Reference< css::frame::XFrame >& xFrame,
diff --git a/include/svtools/imapobj.hxx b/include/svtools/imapobj.hxx
index f5d83ccaeb01..9c79dbc0152c 100644
--- a/include/svtools/imapobj.hxx
+++ b/include/svtools/imapobj.hxx
@@ -70,9 +70,9 @@ protected:
 
     // helper methods
     static void AppendCERNCoords(OStringBuffer& rBuf, const Point& rPoint100);
-    void AppendCERNURL(OStringBuffer& rBuf, const OUString& rBaseURL) const;
+    void AppendCERNURL(OStringBuffer& rBuf) const;
     static void AppendNCSACoords(OStringBuffer& rBuf, const Point& rPoint100);
-    void AppendNCSAURL(OStringBuffer&rBuf, const OUString& rBaseURL) const;
+    void AppendNCSAURL(OStringBuffer&rBuf) const;
 
 public:
 
@@ -90,8 +90,8 @@ public:
     virtual sal_uInt16  GetType() const = 0;
     virtual bool        IsHit( const Point& rPoint ) const = 0;
 
-    void                Write ( SvStream& rOStm, const OUString& rBaseURL ) const;
-    void                Read( SvStream& rIStm, const OUString& rBaseURL );
+    void                Write ( SvStream& rOStm ) const;
+    void                Read( SvStream& rIStm );
 
     const OUString&     GetURL() const { return aURL; }
     void                SetURL( const OUString& rURL ) { aURL = rURL; }
diff --git a/include/svtools/table/tablerenderer.hxx b/include/svtools/table/tablerenderer.hxx
index 9d7ebd95d808..fa75952e94e4 100644
--- a/include/svtools/table/tablerenderer.hxx
+++ b/include/svtools/table/tablerenderer.hxx
@@ -95,9 +95,6 @@ namespace svt { namespace table
             @param _bActive
                 <TRUE/> if and only if the column whose column is to be painted
                 contains the active cell.
-            @param _bSelected
-                <TRUE/> if and only if the column whose column is to be painted
-                is selected currently.
             @param _rDevice
                 denotes the device to paint onto
             @param _rArea
@@ -105,7 +102,7 @@ namespace svt { namespace table
             @param _rStyle
                 the style to be used for drawing
         */
-        virtual void    PaintColumnHeader( ColPos _nCol, bool _bActive, bool _bSelected,
+        virtual void    PaintColumnHeader( ColPos _nCol, bool _bActive,
                             OutputDevice& _rDevice, const tools::Rectangle& _rArea,
                             const StyleSettings& _rStyle ) = 0;
 
diff --git a/include/xmloff/txtparae.hxx b/include/xmloff/txtparae.hxx
index 1c534f82b5cc..c62a25d0b6f3 100644
--- a/include/xmloff/txtparae.hxx
+++ b/include/xmloff/txtparae.hxx
@@ -282,7 +282,6 @@ protected:
         bool bProgress,
         bool bExportParagraph = true,
         const css::uno::Reference< css::beans::XPropertySet > *pRangePropSet = nullptr,
-        bool bExportLevels = true,
         TextPNS eExtensionNS = TextPNS::ODF);
     void exportParagraph(
         const css::uno::Reference< css::text::XTextContent > & rTextContent,
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index 8127305423c7..40f8c27ff6df 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -123,7 +123,7 @@ public:
         sTitle[ rId ] = rTitle;
         bTitleFirst[ rId ] = true;
     }
-    bool GetText( OString &rReturn, StringType nTyp, const OString &nLangIndex, bool bDel = false );
+    bool GetText( OString &rReturn, const OString &nLangIndex, bool bDel = false );
 
     /**
       Generate QTZ string with ResData
diff --git a/l10ntools/source/cfgmerge.cxx b/l10ntools/source/cfgmerge.cxx
index e7596e85d0fc..8e4868471f01 100644
--- a/l10ntools/source/cfgmerge.cxx
+++ b/l10ntools/source/cfgmerge.cxx
@@ -470,7 +470,7 @@ void CfgMerge::WorkOnResourceEnd()
                 sCur = aLanguages[ i ];
 
                 OString sContent;
-                pEntrys->GetText( sContent, StringType::Text, sCur , true );
+                pEntrys->GetText( sContent, sCur, true );
                 if (
                     ( !sCur.equalsIgnoreAsciiCase("en-US") ) && !sContent.isEmpty())
                 {
diff --git a/l10ntools/source/helpmerge.cxx b/l10ntools/source/helpmerge.cxx
index af48e3c86c85..1933afdd6325 100644
--- a/l10ntools/source/helpmerge.cxx
+++ b/l10ntools/source/helpmerge.cxx
@@ -235,7 +235,7 @@ void HelpParser::ProcessHelp( LangHashMap* aLangHM , const OString& sCur , ResDa
                 pEntrys = pMergeDataFile->GetMergeEntrys( pResData );
                 if( pEntrys != nullptr)
                 {
-                    pEntrys->GetText( sNewText, StringType::Text, sCur, true );
+                    pEntrys->GetText( sNewText, sCur, true );
                     if (helper::isWellFormedXML(XMLUtil::QuotHTML(sNewText)))
                     {
                         sNewdata = sSourceText.copy(0,nPreSpaces) + sNewText;
diff --git a/l10ntools/source/lngmerge.cxx b/l10ntools/source/lngmerge.cxx
index b412f882e914..347972c91a06 100644
--- a/l10ntools/source/lngmerge.cxx
+++ b/l10ntools/source/lngmerge.cxx
@@ -230,7 +230,7 @@ bool LngParser::Merge(
                         if( !sLang.isEmpty() )
                         {
                             OString sNewText;
-                            pEntrys->GetText( sNewText, StringType::Text, sLang, true );
+                            pEntrys->GetText( sNewText, sLang, true );
                             if( sLang == "qtz" )
                                 continue;
 
@@ -268,7 +268,7 @@ bool LngParser::Merge(
                 {
 
                     OString sNewText;
-                    pEntrys->GetText( sNewText, StringType::Text, sCur, true );
+                    pEntrys->GetText( sNewText, sCur, true );
                     if( sCur == "qtz" )
                         continue;
                     if ( !sNewText.isEmpty() && sCur != "x-comment")
diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx
index af4ffb8d308c..eba518a8165d 100644
--- a/l10ntools/source/merge.cxx
+++ b/l10ntools/source/merge.cxx
@@ -78,32 +78,14 @@ ResData::ResData( const OString &rGId, const OString &rFilename)
 
 
 bool MergeEntrys::GetText( OString &rReturn,
-    StringType nTyp, const OString &nLangIndex, bool bDel )
+    const OString &nLangIndex, bool bDel )
 {
     bool bReturn = true;
-    switch ( nTyp ) {
-        case StringType::Text :
-            rReturn = sText[ nLangIndex ];
-            if ( bDel )
-                sText[ nLangIndex ] = "";
-            bReturn = bTextFirst[ nLangIndex ];
-            bTextFirst[ nLangIndex ] = false;
-            break;
-        case StringType::QuickHelpText :
-            rReturn = sQuickHelpText[ nLangIndex ];
-            if ( bDel )
-                sQuickHelpText[ nLangIndex ] = "";
-            bReturn = bQuickHelpTextFirst[ nLangIndex ];
-            bQuickHelpTextFirst[ nLangIndex ] = false;
-            break;
-        case StringType::Title :
-            rReturn = sTitle[ nLangIndex ];
-            if ( bDel )
-                sTitle[ nLangIndex ] = "";
-            bReturn = bTitleFirst[ nLangIndex ];
-            bTitleFirst[ nLangIndex ] = false;
-            break;
-    }
+    rReturn = sText[ nLangIndex ];
+    if ( bDel )
+        sText[ nLangIndex ] = "";
+    bReturn = bTextFirst[ nLangIndex ];
+    bTextFirst[ nLangIndex ] = false;
     return bReturn;
 }
 
diff --git a/l10ntools/source/propmerge.cxx b/l10ntools/source/propmerge.cxx
index bb58876c5d14..15850d911001 100644
--- a/l10ntools/source/propmerge.cxx
+++ b/l10ntools/source/propmerge.cxx
@@ -205,7 +205,7 @@ void PropParser::Merge( const OString &rMergeSrc, const OString &rDestinationFil
                 MergeEntrys* pEntrys = pMergeDataFile->GetMergeEntrys( &aResData );
                 if( pEntrys )
                 {
-                    pEntrys->GetText( sNewText, StringType::Text, m_sLang );
+                    pEntrys->GetText( sNewText, m_sLang );
                 }
             }
             if( !sNewText.isEmpty() )
diff --git a/l10ntools/source/treemerge.cxx b/l10ntools/source/treemerge.cxx
index 95b6ab2595dc..582017dbd2a3 100644
--- a/l10ntools/source/treemerge.cxx
+++ b/l10ntools/source/treemerge.cxx
@@ -168,7 +168,7 @@ namespace
                             pMergeDataFile->GetMergeEntrys( &aResData );
                         if( pEntrys )
                         {
-                            pEntrys->GetText( sNewText, StringType::Text, rLang );
+                            pEntrys->GetText( sNewText, rLang );
                         }
                     }
                     else if( rLang == "qtz" )
diff --git a/l10ntools/source/xrmmerge.cxx b/l10ntools/source/xrmmerge.cxx
index 84aec0313b45..e3dc7777c9e2 100644
--- a/l10ntools/source/xrmmerge.cxx
+++ b/l10ntools/source/xrmmerge.cxx
@@ -410,8 +410,7 @@ void XRMResMerge::WorkOnDesc(
                 sCur = aLanguages[ n ];
                 OString sContent;
                 if ( !sCur.equalsIgnoreAsciiCase("en-US")  &&
-                    ( pEntrys->GetText(
-                        sContent, StringType::Text, sCur, true )) &&
+                    ( pEntrys->GetText( sContent, sCur, true )) &&
                     !sContent.isEmpty())
                 {
                     OString sText( sContent );
@@ -498,8 +497,7 @@ void XRMResMerge::EndOfText(
                 sCur = aLanguages[ n ];
                 OString sContent;
                 if (!sCur.equalsIgnoreAsciiCase("en-US") &&
-                    ( pEntrys->GetText(
-                        sContent, StringType::Text, sCur, true )) &&
+                    ( pEntrys->GetText( sContent, sCur, true )) &&
                     !sContent.isEmpty() &&
                     helper::isWellFormedXML( sContent ))
                 {
diff --git a/package/inc/ZipPackageStream.hxx b/package/inc/ZipPackageStream.hxx
index 228b5c08618d..c84d39ca565d 100644
--- a/package/inc/ZipPackageStream.hxx
+++ b/package/inc/ZipPackageStream.hxx
@@ -73,8 +73,9 @@ private:
 
     /// Check that m_xStream implements io::XSeekable and return it
     css::uno::Reference< css::io::XInputStream > const & GetOwnSeekStream();
+    /// get raw data using unbuffered stream
     /// @throws css::uno::RuntimeException
-    css::uno::Reference< css::io::XInputStream > SAL_CALL getRawData( const bool bUseBufferedStream = true );
+    css::uno::Reference< css::io::XInputStream > SAL_CALL getRawData();
 
 public:
     bool IsPackageMember () const { return m_nStreamMode == PACKAGE_STREAM_PACKAGEMEMBER;}
diff --git a/package/source/zippackage/ZipPackageStream.cxx b/package/source/zippackage/ZipPackageStream.cxx
index e7f4e88f55c7..460e33f0e245 100644
--- a/package/source/zippackage/ZipPackageStream.cxx
+++ b/package/source/zippackage/ZipPackageStream.cxx
@@ -572,7 +572,7 @@ bool ZipPackageStream::saveChild(
 
     if ( !bUseNonSeekableAccess )
     {
-        xStream = getRawData( false );
+        xStream = getRawData();
 
         if ( !xStream.is() )
         {
@@ -708,7 +708,7 @@ bool ZipPackageStream::saveChild(
         // to get a new version of it as we can't seek backwards.
         if ( IsPackageMember() )
         {
-            xStream = getRawData( false );
+            xStream = getRawData();
             if ( !xStream.is() )
             {
                 // Make sure that we actually _got_ a new one !
@@ -937,13 +937,13 @@ void SAL_CALL ZipPackageStream::setInputStream( const uno::Reference< io::XInput
     m_nStreamMode = PACKAGE_STREAM_DETECT;
 }
 
-uno::Reference< io::XInputStream > SAL_CALL ZipPackageStream::getRawData( const bool bUseBufferedStream )
+uno::Reference< io::XInputStream > SAL_CALL ZipPackageStream::getRawData()
 {
     try
     {
         if ( IsPackageMember() )
         {
-            return m_rZipPackage.getZipFile().getRawData( aEntry, GetEncryptionData(), m_bIsEncrypted, m_rZipPackage.GetSharedMutexRef(), bUseBufferedStream );
+            return m_rZipPackage.getZipFile().getRawData( aEntry, GetEncryptionData(), m_bIsEncrypted, m_rZipPackage.GetSharedMutexRef(), false/*bUseBufferedStream*/ );
         }
         else if ( GetOwnSeekStream().is() )
         {
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index fa613e0c5a13..3fd2c01f8526 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -517,7 +517,6 @@ public:
     virtual VclPtr<AbstractScImportOptionsDlg> CreateScImportOptionsDlg ( bool                    bAscii,
                                                                     const ScImportOptions*  pOptions,
                                                                     const OUString*         pStrTitle = nullptr,
-                                                                    bool                    bMultiByte = false,
                                                                     bool                    bOnlyDbtoolsEncodings = false,
                                                                     bool                    bImport = true ) = 0;
 
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index ae2a2e795b7f..3d6e316e6222 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -874,7 +874,6 @@ class CopyToClipHandler
     ScColumn& mrDestCol;
     sc::ColumnBlockPosition maDestPos;
     sc::ColumnBlockPosition* mpDestPos;
-    bool mbCopyNotes;
 
     void setDefaultAttrsToDest(size_t nRow, size_t nSize)
     {
@@ -884,8 +883,8 @@ class CopyToClipHandler
     }
 
 public:
-    CopyToClipHandler(const ScColumn& rSrcCol, ScColumn& rDestCol, sc::ColumnBlockPosition* pDestPos, bool bCopyNotes) :
-        mrSrcCol(rSrcCol), mrDestCol(rDestCol), mpDestPos(pDestPos), mbCopyNotes(bCopyNotes)
+    CopyToClipHandler(const ScColumn& rSrcCol, ScColumn& rDestCol, sc::ColumnBlockPosition* pDestPos) :
+        mrSrcCol(rSrcCol), mrDestCol(rDestCol), mpDestPos(pDestPos)
     {
         if (mpDestPos)
             maDestPos = *mpDestPos;
@@ -989,8 +988,7 @@ public:
         if (bSet)
             setDefaultAttrsToDest(nTopRow, nDataSize);
 
-        if (mbCopyNotes)
-            mrSrcCol.DuplicateNotes(nTopRow, nDataSize, mrDestCol, maDestPos, false);
+        mrSrcCol.DuplicateNotes(nTopRow, nDataSize, mrDestCol, maDestPos, false);
     }
 };
 
@@ -1028,7 +1026,7 @@ void ScColumn::CopyToClip(
                           rCxt.isKeepScenarioFlags() ? (ScMF::All & ~ScMF::Scenario) : ScMF::All );
 
     {
-        CopyToClipHandler aFunc(*this, rColumn, rCxt.getBlockPosition(rColumn.nTab, rColumn.nCol), true/*CloneNotes*/);
+        CopyToClipHandler aFunc(*this, rColumn, rCxt.getBlockPosition(rColumn.nTab, rColumn.nCol));
         sc::ParseBlock(maCells.begin(), maCells, aFunc, nRow1, nRow2);
     }
 
@@ -1750,7 +1748,7 @@ void ScColumn::CopyUpdated( const ScColumn& rPosCol, ScColumn& rDestCol ) const
     sc::SingleColumnSpanSet::SpansType aRanges;
     aRangeSet.getSpans(aRanges);
 
-    CopyToClipHandler aFunc(*this, rDestCol, nullptr, true/*bCopyNotes*/);
+    CopyToClipHandler aFunc(*this, rDestCol, nullptr);
     sc::CellStoreType::const_iterator itPos = maCells.begin();
     sc::SingleColumnSpanSet::SpansType::const_iterator it = aRanges.begin(), itEnd = aRanges.end();
     for (; it != itEnd; ++it)
diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx
index 4a06ca612d6d..d6da69632833 100644
--- a/sc/source/core/data/global.cxx
+++ b/sc/source/core/data/global.cxx
@@ -786,7 +786,7 @@ bool ScGlobal::EETextObjEqual( const EditTextObject* pObj1,
         return true;
 
     if ( pObj1 && pObj2 )
-        return pObj1->Equals( *pObj2, false);
+        return pObj1->Equals( *pObj2);
 
     return false;
 }
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx
index 302e6d0ccbc0..3932ad66f6ec 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -863,11 +863,10 @@ VclPtr<AbstractScImportOptionsDlg> ScAbstractDialogFactory_Impl::CreateScImportO
                                                                     bool                    bAscii,
                                                                     const ScImportOptions*  pOptions,
                                                                     const OUString*         pStrTitle,
-                                                                    bool                    bMultiByte,
                                                                     bool                    bOnlyDbtoolsEncodings,
                                                                     bool                    bImport )
 {
-    VclPtr<ScImportOptionsDlg> pDlg = VclPtr<ScImportOptionsDlg>::Create( nullptr, bAscii, pOptions,pStrTitle, bMultiByte,bOnlyDbtoolsEncodings, bImport );
+    VclPtr<ScImportOptionsDlg> pDlg = VclPtr<ScImportOptionsDlg>::Create( nullptr, bAscii, pOptions,pStrTitle, true/*bMultiByte*/,bOnlyDbtoolsEncodings, bImport );
     return VclPtr<AbstractScImportOptionsDlg_Impl>::Create( pDlg );
 }
 
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx
index 0970af51a622..7fc7d9d53590 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -534,7 +534,6 @@ public:
     virtual VclPtr<AbstractScImportOptionsDlg> CreateScImportOptionsDlg ( bool                    bAscii,
                                                                     const ScImportOptions*  pOptions,
                                                                     const OUString*         pStrTitle = nullptr,
-                                                                    bool                    bMultiByte = false,
                                                                     bool                    bOnlyDbtoolsEncodings = false,
                                                                     bool                    bImport = true ) override;
     virtual VclPtr<SfxAbstractTabDialog> CreateScAttrDlg( vcl::Window*          pParent,
diff --git a/sc/source/ui/inc/undodat.hxx b/sc/source/ui/inc/undodat.hxx
index fdb6f3c27504..7f60385d32af 100644
--- a/sc/source/ui/inc/undodat.hxx
+++ b/sc/source/ui/inc/undodat.hxx
@@ -430,7 +430,6 @@ public:
                    SCCOL nEndX, SCROW nEndY, SCTAB nEndZ,
                    const ScMarkData& rMark,
                    ScDocument* pNewUndoDoc, ScDocument* pNewRedoDoc,
-                   InsertDeleteFlags nNewFlags,
                    ScRefUndoData* pRefData);
     virtual void    Undo() override;
     virtual void    Redo() override;
@@ -443,7 +442,6 @@ private:
     std::unique_ptr<ScMarkData> mxMarkData;
     std::unique_ptr<ScDocument> xUndoDoc;
     std::unique_ptr<ScDocument> xRedoDoc;
-    InsertDeleteFlags nFlags;
     std::unique_ptr<ScRefUndoData> xRefUndoData;
     std::unique_ptr<ScRefUndoData> xRefRedoData;
     sal_uLong       nStartChangeAction;
diff --git a/sc/source/ui/undo/undodat.cxx b/sc/source/ui/undo/undodat.cxx
index 965fcf6f912e..759d49a0b390 100644
--- a/sc/source/ui/undo/undodat.cxx
+++ b/sc/source/ui/undo/undodat.cxx
@@ -1719,13 +1719,11 @@ ScUndoDataForm::ScUndoDataForm( ScDocShell* pNewDocShell,
                                 SCCOL nEndX, SCROW nEndY, SCTAB nEndZ,
                                 const ScMarkData& rMark,
                                 ScDocument* pNewUndoDoc, ScDocument* pNewRedoDoc,
-                                InsertDeleteFlags nNewFlags,
                                 ScRefUndoData* pRefData )
     : ScBlockUndo(pNewDocShell, ScRange( nStartX, nStartY, nStartZ, nEndX, nEndY, nEndZ ), SC_UNDO_SIMPLE)
     , mxMarkData(new ScMarkData(rMark))
     , xUndoDoc(pNewUndoDoc)
     , xRedoDoc(pNewRedoDoc)
-    , nFlags(nNewFlags)
     , xRefUndoData(pRefData)
     , bRedoFilled(false)
 {
@@ -1749,12 +1747,7 @@ OUString ScUndoDataForm::GetComment() const
 
 void ScUndoDataForm::SetChangeTrack()
 {
-    ScChangeTrack* pChangeTrack = pDocShell->GetDocument().GetChangeTrack();
-    if ( pChangeTrack && (nFlags & InsertDeleteFlags::CONTENTS) )
-        pChangeTrack->AppendContentRange(aBlockRange, xUndoDoc.get(),
-                nStartChangeAction, nEndChangeAction, SC_CACM_PASTE);
-    else
-        nStartChangeAction = nEndChangeAction = 0;
+    nStartChangeAction = nEndChangeAction = 0;
 }
 
 void ScUndoDataForm::Undo()
@@ -1798,13 +1791,6 @@ void ScUndoDataForm::DoChange( const bool bUndo )
 
     ScRefUndoData* pWorkRefData = bUndo ? xRefUndoData.get() : xRefRedoData.get();
 
-    // Always back-up either all or none of the content for Undo
-    InsertDeleteFlags nUndoFlags = InsertDeleteFlags::NONE;
-    if (nFlags & InsertDeleteFlags::CONTENTS)
-            nUndoFlags |= InsertDeleteFlags::CONTENTS;
-    if (nFlags & InsertDeleteFlags::ATTRIB)
-            nUndoFlags |= InsertDeleteFlags::ATTRIB;
-
     bool bPaintAll = false;
 
     ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
diff --git a/sc/source/ui/unoobj/filtuno.cxx b/sc/source/ui/unoobj/filtuno.cxx
index ce02ff831079..3d54306280aa 100644
--- a/sc/source/ui/unoobj/filtuno.cxx
+++ b/sc/source/ui/unoobj/filtuno.cxx
@@ -318,7 +318,7 @@ sal_Int16 SAL_CALL ScFilterOptionsObj::execute()
         else
         {
             ScopedVclPtr<AbstractScImportOptionsDlg> pDlg(pFact->CreateScImportOptionsDlg(
-                                                                            bAscii, &aOptions, &aTitle, true/*bMultiByte*/,
+                                                                            bAscii, &aOptions, &aTitle,
                                                                             bDBEnc, !bExport));
             OSL_ENSURE(pDlg, "Dialog create fail!");
             if ( pDlg->Execute() == RET_OK )
diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx
index 4fab715aafd5..7eacb848350f 100644
--- a/sc/source/ui/view/viewfun3.cxx
+++ b/sc/source/ui/view/viewfun3.cxx
@@ -1994,10 +1994,10 @@ void ScViewFunc::DataFormPutData( SCROW nCurrentRow ,
         }
         pDocSh->UpdatePaintExt( nExtFlags, nStartCol, nCurrentRow, nStartTab, nEndCol, nCurrentRow, nEndTab );  // content after the change
         SfxUndoAction* pUndo = new ScUndoDataForm( pDocSh,
-                                                                nStartCol, nCurrentRow, nStartTab,
-                                                                nUndoEndCol, nUndoEndRow, nEndTab, rMark,
-                                                                pUndoDoc, pRedoDoc, InsertDeleteFlags::NONE,
-                                                                pUndoData );
+                                                   nStartCol, nCurrentRow, nStartTab,
+                                                   nUndoEndCol, nUndoEndRow, nEndTab, rMark,
+                                                   pUndoDoc, pRedoDoc,
+                                                   pUndoData );
         pUndoMgr->AddUndoAction( new ScUndoWrapper( pUndo ), true );
 
         PaintPartFlags nPaint = PaintPartFlags::Grid;
diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx
index e0836dcdee7b..fc04e2ce2b30 100644
--- a/sd/inc/drawdoc.hxx
+++ b/sd/inc/drawdoc.hxx
@@ -256,7 +256,7 @@ public:
 
     SAL_DLLPRIVATE void InsertBookmark(const std::vector<OUString> &rBookmarkList,
                             std::vector<OUString> &rExchangeList, bool bLink,
-                            bool bReplace, sal_uInt16 nPgPos,
+                            sal_uInt16 nPgPos,
                             ::sd::DrawDocShell* pBookmarkDocSh,
                             Point const * pObjPos);
 
diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx
index a567d700c099..23c687e6dc1e 100644
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
@@ -281,7 +281,6 @@ void SdDrawDocument::InsertBookmark(
     const std::vector<OUString> &rBookmarkList,     // List of names of the bookmarks to be inserted
     std::vector<OUString> &rExchangeList,           // List of the names to be used
     bool bLink,                                     // Insert bookmarks as links?
-    bool bReplace,                                  // Replace current default and notes pages?
     sal_uInt16 nInsertPos,                          // Insertion position of pages
     ::sd::DrawDocShell* pBookmarkDocSh,             // If set, this is the source document
     Point const * pObjPos)                                 // Insertion position of objects
@@ -327,7 +326,7 @@ void SdDrawDocument::InsertBookmark(
     if ( bOK && bInsertPages )
     {
         // Insert all page bookmarks
-        bOK = InsertBookmarkAsPage(rBookmarkList, &rExchangeList, bLink, bReplace,
+        bOK = InsertBookmarkAsPage(rBookmarkList, &rExchangeList, bLink, false/*bReplace*/,
                                    nInsertPos, false/*bNoDialogs*/, pBookmarkDocSh, true/*bCopy*/, true, false);
     }
 
diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx
index 22f248c3cef6..2e1d0ed38b2e 100644
--- a/sd/source/ui/view/sdview2.cxx
+++ b/sd/source/ui/view/sdview2.cxx
@@ -840,7 +840,7 @@ IMPL_LINK( View, ExecuteNavigatorDrop, void*, p, void )
         if( bNameOK )
         {
             mrDoc.InsertBookmark( aBookmarkList, aExchangeList,
-                                  bLink, false/*bReplace*/, nPgPos,
+                                  bLink, nPgPos,
                                   &pPageObjsTransferable->GetDocShell(),
                                   &aPos );
         }
diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx
index 81c0f80338b8..997c8ecd1fac 100644
--- a/sfx2/source/dialog/mailmodel.cxx
+++ b/sfx2/source/dialog/mailmodel.cxx
@@ -665,13 +665,12 @@ void SfxMailModel::AddToAddress( const OUString& rAddress )
 }
 
 SfxMailModel::SendMailResult SfxMailModel::AttachDocument(
-    const OUString& sDocumentType,
     const css::uno::Reference< css::uno::XInterface >& xFrameOrModel,
     const OUString& sAttachmentTitle )
 {
     OUString sFileName;
 
-    SaveResult eSaveResult = SaveDocumentAsFormat( sAttachmentTitle, xFrameOrModel, sDocumentType, sFileName );
+    SaveResult eSaveResult = SaveDocumentAsFormat( sAttachmentTitle, xFrameOrModel, OUString()/*sDocumentType*/, sFileName );
     if ( eSaveResult == SAVE_SUCCESSFULL &&  !sFileName.isEmpty() )
         maAttachedDocuments.push_back(sFileName);
     return eSaveResult == SAVE_SUCCESSFULL ? SEND_MAIL_OK : SEND_MAIL_ERROR;
diff --git a/svtools/inc/table/gridtablerenderer.hxx b/svtools/inc/table/gridtablerenderer.hxx
index 67360c78fc12..e091158a1981 100644
--- a/svtools/inc/table/gridtablerenderer.hxx
+++ b/svtools/inc/table/gridtablerenderer.hxx
@@ -69,7 +69,7 @@ namespace svt { namespace table
                             OutputDevice& _rDevice, const tools::Rectangle& _rArea,
                             bool _bIsColHeaderArea, bool _bIsRowHeaderArea,
                             const StyleSettings& _rStyle ) override;
-        virtual void    PaintColumnHeader( ColPos _nCol, bool _bActive, bool _bSelected,
+        virtual void    PaintColumnHeader( ColPos _nCol, bool _bActive,
                             OutputDevice& _rDevice, const tools::Rectangle& _rArea,
                             const StyleSettings& _rStyle ) override;
         virtual void    PrepareRow( RowPos _nRow, bool i_hasControlFocus, bool _bSelected,
diff --git a/svtools/source/misc/imap.cxx b/svtools/source/misc/imap.cxx
index 83d8cc5c205a..f22c87ca6240 100644
--- a/svtools/source/misc/imap.cxx
+++ b/svtools/source/misc/imap.cxx
@@ -66,7 +66,7 @@ IMapObject::IMapObject( const OUString& rURL, const OUString& rAltText, const OU
 }
 
 
-void IMapObject::Write( SvStream& rOStm, const OUString& rBaseURL ) const
+void IMapObject::Write( SvStream& rOStm ) const
 {
     const rtl_TextEncoding  eEncoding = osl_getThreadTextEncoding();
 
@@ -75,7 +75,7 @@ void IMapObject::Write( SvStream& rOStm, const OUString& rBaseURL ) const
     rOStm.WriteUInt16( eEncoding  );
 
     const OString aRelURL = OUStringToOString(
-        URIHelper::simpleNormalizedMakeRelative(rBaseURL, aURL), eEncoding);
+        URIHelper::simpleNormalizedMakeRelative("", aURL), eEncoding);
     write_uInt16_lenPrefixed_uInt8s_FromOString(rOStm, aRelURL);
     write_uInt16_lenPrefixed_uInt8s_FromOUString(rOStm, aAltText, eEncoding);
     rOStm.WriteBool( bActive );
@@ -95,7 +95,7 @@ void IMapObject::Write( SvStream& rOStm, const OUString& rBaseURL ) const
 |*
 \******************************************************************************/
 
-void IMapObject::Read( SvStream& rIStm, const OUString& rBaseURL )
+void IMapObject::Read( SvStream& rIStm )
 {
     rtl_TextEncoding    nTextEncoding;
 
@@ -109,7 +109,7 @@ void IMapObject::Read( SvStream& rIStm, const OUString& rBaseURL )
     aTarget = read_uInt16_lenPrefixed_uInt8s_ToOUString(rIStm, nTextEncoding);
 
     // make URL absolute
-    aURL = URIHelper::SmartRel2Abs( INetURLObject(rBaseURL), aURL, URIHelper::GetMaybeFileHdl(), true, false, INetURLObject::EncodeMechanism::WasEncoded, INetURLObject::DecodeMechanism::Unambiguous );
+    aURL = URIHelper::SmartRel2Abs( INetURLObject(""), aURL, URIHelper::GetMaybeFileHdl(), true, false, INetURLObject::EncodeMechanism::WasEncoded, INetURLObject::DecodeMechanism::Unambiguous );
     std::unique_ptr<IMapCompat> pCompat(new IMapCompat( rIStm, StreamMode::READ ));
 
     ReadIMapObject( rIStm );
@@ -840,7 +840,7 @@ void ImageMap::ImpWriteImageMap( SvStream& rOStm ) const
     for ( size_t i = 0; i < nCount; i++ )
     {
         IMapObject* pObj = maList[ i ];
-        pObj->Write( rOStm, "" );
+        pObj->Write( rOStm );
     }
 }
 
@@ -876,7 +876,7 @@ void ImageMap::ImpReadImageMap( SvStream& rIStm, size_t nCount )
             case IMAP_OBJ_RECTANGLE:
             {
                 IMapRectangleObject* pObj = new IMapRectangleObject;
-                pObj->Read( rIStm, "" );
+                pObj->Read( rIStm );
                 maList.push_back( pObj );
             }
             break;
@@ -884,7 +884,7 @@ void ImageMap::ImpReadImageMap( SvStream& rIStm, size_t nCount )
             case IMAP_OBJ_CIRCLE:
             {
                 IMapCircleObject* pObj = new IMapCircleObject;
-                pObj->Read( rIStm, "" );
+                pObj->Read( rIStm );
                 maList.push_back( pObj );
             }
             break;
@@ -892,7 +892,7 @@ void ImageMap::ImpReadImageMap( SvStream& rIStm, size_t nCount )
             case IMAP_OBJ_POLYGON:
             {
                 IMapPolygonObject* pObj = new IMapPolygonObject;
-                pObj->Read( rIStm, "" );
+                pObj->Read( rIStm );
                 maList.push_back( pObj );
             }
             break;
diff --git a/svtools/source/misc/imap2.cxx b/svtools/source/misc/imap2.cxx
index 665f54894e06..648d4758eb87 100644
--- a/svtools/source/misc/imap2.cxx
+++ b/svtools/source/misc/imap2.cxx
@@ -58,14 +58,14 @@ void IMapObject::AppendNCSACoords(OStringBuffer& rBuf, const Point& rPoint100)
     rBuf.append(' ');
 }
 
-void IMapObject::AppendCERNURL(OStringBuffer& rBuf, const OUString& rBaseURL) const
+void IMapObject::AppendCERNURL(OStringBuffer& rBuf) const
 {
-    rBuf.append(OUStringToOString(URIHelper::simpleNormalizedMakeRelative(rBaseURL, aURL), osl_getThreadTextEncoding()));
+    rBuf.append(OUStringToOString(URIHelper::simpleNormalizedMakeRelative("", aURL), osl_getThreadTextEncoding()));
 }
 
-void IMapObject::AppendNCSAURL(OStringBuffer& rBuf, const OUString& rBaseURL) const
+void IMapObject::AppendNCSAURL(OStringBuffer& rBuf) const
 {
-    rBuf.append(OUStringToOString(URIHelper::simpleNormalizedMakeRelative(rBaseURL, aURL), osl_getThreadTextEncoding()));
+    rBuf.append(OUStringToOString(URIHelper::simpleNormalizedMakeRelative("", aURL), osl_getThreadTextEncoding()));
     rBuf.append(' ');
 }
 
@@ -75,7 +75,7 @@ void IMapRectangleObject::WriteCERN( SvStream& rOStm ) const
 
     AppendCERNCoords(aStrBuf, aRect.TopLeft());
     AppendCERNCoords(aStrBuf, aRect.BottomRight());
-    AppendCERNURL(aStrBuf, "");
+    AppendCERNURL(aStrBuf);
 
     rOStm.WriteLine(aStrBuf.makeStringAndClear());
 }
@@ -84,7 +84,7 @@ void IMapRectangleObject::WriteNCSA( SvStream& rOStm ) const
 {
     OStringBuffer aStrBuf("rect ");
 
-    AppendNCSAURL(aStrBuf, "");
+    AppendNCSAURL(aStrBuf);
     AppendNCSACoords(aStrBuf, aRect.TopLeft());
     AppendNCSACoords(aStrBuf, aRect.BottomRight());
 
@@ -98,7 +98,7 @@ void IMapCircleObject::WriteCERN( SvStream& rOStm ) const
     AppendCERNCoords(aStrBuf, aCenter);
     aStrBuf.append(nRadius);
     aStrBuf.append(' ');
-    AppendCERNURL(aStrBuf, "");
+    AppendCERNURL(aStrBuf);
 
     rOStm.WriteLine(aStrBuf.makeStringAndClear());
 }
@@ -107,7 +107,7 @@ void IMapCircleObject::WriteNCSA( SvStream& rOStm ) const
 {
     OStringBuffer aStrBuf("circle ");
 
-    AppendNCSAURL(aStrBuf, "");
+    AppendNCSAURL(aStrBuf);
     AppendNCSACoords(aStrBuf, aCenter);
     AppendNCSACoords(aStrBuf, aCenter + Point(nRadius, 0));
 
@@ -122,7 +122,7 @@ void IMapPolygonObject::WriteCERN( SvStream& rOStm  ) const
     for (sal_uInt16 i = 0; i < nCount; ++i)
         AppendCERNCoords(aStrBuf, aPoly[i]);
 
-    AppendCERNURL(aStrBuf, "");
+    AppendCERNURL(aStrBuf);
 
     rOStm.WriteLine(aStrBuf.makeStringAndClear());
 }
@@ -132,7 +132,7 @@ void IMapPolygonObject::WriteNCSA( SvStream& rOStm  ) const
     OStringBuffer aStrBuf("poly ");
     const sal_uInt16 nCount = std::min( aPoly.GetSize(), (sal_uInt16) 100 );
 
-    AppendNCSAURL(aStrBuf, "");
+    AppendNCSAURL(aStrBuf);
 
     for (sal_uInt16 i = 0; i < nCount; ++i)
         AppendNCSACoords(aStrBuf, aPoly[i]);
diff --git a/svtools/source/table/gridtablerenderer.cxx b/svtools/source/table/gridtablerenderer.cxx
index d9af224e8153..a33b9f9a63db 100644
--- a/svtools/source/table/gridtablerenderer.cxx
+++ b/svtools/source/table/gridtablerenderer.cxx
@@ -239,7 +239,6 @@ namespace svt { namespace table
     void GridTableRenderer::PaintColumnHeader(
         ColPos _nCol,
         bool, // _bActive: no special painting for the active column at the moment
-        bool, // _bSelected: selection for column header not yet implemented
         vcl::RenderContext& rRenderContext,
         const tools::Rectangle& _rArea, const StyleSettings& _rStyle)
     {
diff --git a/svtools/source/table/tablecontrol_impl.cxx b/svtools/source/table/tablecontrol_impl.cxx
index c43469c40f33..5bdb7678b6ea 100644
--- a/svtools/source/table/tablecontrol_impl.cxx
+++ b/svtools/source/table/tablecontrol_impl.cxx
@@ -1205,7 +1205,7 @@ namespace svt { namespace table
                     continue;
 
                 bool isActiveColumn = (aCell.getColumn() == getCurrentColumn());
-                pRenderer->PaintColumnHeader(aCell.getColumn(), isActiveColumn, false/*isSelectedColumn*/, rRenderContext, aCell.getRect(), rStyle);
+                pRenderer->PaintColumnHeader(aCell.getColumn(), isActiveColumn, rRenderContext, aCell.getRect(), rStyle);
             }
         }
         // the area occupied by the row header, if any
diff --git a/sw/inc/htmltbl.hxx b/sw/inc/htmltbl.hxx
index dc263e378d62..098956b246b3 100644
--- a/sw/inc/htmltbl.hxx
+++ b/sw/inc/htmltbl.hxx
@@ -253,8 +253,7 @@ public:
                        sal_uInt16 nWidth, bool bPrcWidth, sal_uInt16 nBorderOpt,
                        sal_uInt16 nCellPad, sal_uInt16 nCellSp, SvxAdjust eAdjust,
                        sal_uInt16 nLMargin, sal_uInt16 nRMargin, sal_uInt16 nBWidth,
-                       sal_uInt16 nLeftBWidth, sal_uInt16 nRightBWidth,
-                       sal_uInt16 nInhLeftBWidth, sal_uInt16 nInhRightBWidth );
+                       sal_uInt16 nLeftBWidth, sal_uInt16 nRightBWidth );
 
     ~SwHTMLTableLayout();
 
diff --git a/sw/source/core/doc/htmltbl.cxx b/sw/source/core/doc/htmltbl.cxx
index 7d9d8e5bb2d4..a86030a01301 100644
--- a/sw/source/core/doc/htmltbl.cxx
+++ b/sw/source/core/doc/htmltbl.cxx
@@ -166,9 +166,7 @@ SwHTMLTableLayout::SwHTMLTableLayout( const SwTable * pTable,
                                       sal_uInt16 nCellSp, SvxAdjust eAdjust,
                                       sal_uInt16 nLMargin, sal_uInt16 nRMargin,
                                       sal_uInt16 nBWidth, sal_uInt16 nLeftBWidth,
-                                      sal_uInt16 nRightBWidth,
-                                      sal_uInt16 nInhLeftBWidth,
-                                      sal_uInt16 nInhRightBWidth )
+                                      sal_uInt16 nRightBWidth )
     : m_aColumns( nCls )
     , m_aCells( static_cast<size_t>(nRws)*nCls )
     , m_pSwTable( pTable )
@@ -191,8 +189,8 @@ SwHTMLTableLayout::SwHTMLTableLayout( const SwTable * pTable,
     , m_nBorder( nBorderOpt )
     , m_nLeftBorderWidth( nLeftBWidth )
     , m_nRightBorderWidth( nRightBWidth )
-    , m_nInhLeftBorderWidth( nInhLeftBWidth )
-    , m_nInhRightBorderWidth( nInhRightBWidth )
+    , m_nInhLeftBorderWidth( 0 )
+    , m_nInhRightBorderWidth( 0 )
     , m_nBorderWidth( nBWidth )
     , m_nDelayedResizeAbsAvail( 0 )
     , m_nLastResizeAbsAvail( 0 )
diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx
index c595c7bc6f61..7c8e2ddb3ae5 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -1100,8 +1100,7 @@ SwHTMLTableLayout *HTMLTable::CreateLayoutInfo()
                         nW, m_bPrcWidth, m_nBorder, m_nCellPadding,
                         m_nCellSpacing, m_eTableAdjust,
                         m_nLeftMargin, m_nRightMargin,
-                        nBorderWidth, nLeftBorderWidth, nRightBorderWidth,
-                        0/*nInhLeftBorderWidth*/, 0/*nInhRightBorderWidth*/ );
+                        nBorderWidth, nLeftBorderWidth, nRightBorderWidth );
 
     bool bExportable = true;
     sal_uInt16 i;
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index b1b7ca61eb81..9b8795fa63b9 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -21,6 +21,7 @@
 
 #include <sal/config.h>
 
+#include <com/sun/star/embed/Aspects.hpp>
 #include <com/sun/star/embed/ElementModes.hpp>
 
 #include <i18nlangtag/languagetag.hxx>
@@ -493,8 +494,7 @@ SdrObject* SwMSDffManager::ImportOLE( sal_uInt32 nOLEId,
                                       const Graphic& rGrf,
                                       const tools::Rectangle& rBoundRect,
                                       const tools::Rectangle& rVisArea,
-                                      const int _nCalledByGroup,
-                                      sal_Int64 nAspect ) const
+                                      const int _nCalledByGroup ) const
 {
     // #i32596# - no import of OLE object, if it's inside a group.
     // NOTE: This can be undone, if grouping of Writer fly frames is possible or
@@ -523,7 +523,7 @@ SdrObject* SwMSDffManager::ImportOLE( sal_uInt32 nOLEId,
             ErrCode nError = ERRCODE_NONE;
             pRet = CreateSdrOLEFromStorage( sStorageName, xSrcStg, xDstStg,
                 rGrf, rBoundRect, rVisArea, pStData, nError,
-                nSvxMSDffOLEConvFlags, nAspect, rReader.GetBaseURL());
+                nSvxMSDffOLEConvFlags, css::embed::Aspects::MSOLE_CONTENT, rReader.GetBaseURL());
         }
     }
     return pRet;
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index d6abe149a5fb..a849d47b6507 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -749,8 +749,7 @@ private:
                                   const Graphic& rGrf,
                                   const tools::Rectangle& rBoundRect,
                                   const tools::Rectangle& rVisArea,
-                                  const int _nCalledByGroup,
-                                  sal_Int64 nAspect ) const override;
+                                  const int _nCalledByGroup ) const override;
 
     SwMSDffManager(const SwMSDffManager&) = delete;
     SwMSDffManager& operator=(const SwMSDffManager&) = delete;
diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx
index 56d6c39a303a..a2cb49cb60aa 100644
--- a/vcl/android/androidinst.cxx
+++ b/vcl/android/androidinst.cxx
@@ -82,8 +82,7 @@ public:
     virtual ~AndroidSalSystem() {}
     virtual int ShowNativeDialog( const OUString& rTitle,
                                   const OUString& rMessage,
-                                  const std::list< OUString >& rButtons,
-                                  int nDefButton );
+                                  const std::list< OUString >& rButtons );
 };
 
 SalSystem *AndroidSalInstance::CreateSalSystem()
@@ -204,10 +203,9 @@ void DestroySalInstance( SalInstance *pInst )
 
 int AndroidSalSystem::ShowNativeDialog( const OUString& rTitle,
                                         const OUString& rMessage,
-                                        const std::list< OUString >& rButtons,
-                                        int nDefButton )
+                                        const std::list< OUString >& rButtons )
 {
-    (void)rButtons; (void)nDefButton;
+    (void)rButtons;
     LOGI("LibreOffice native dialog '%s': '%s'",
          OUStringToOString(rTitle, RTL_TEXTENCODING_ASCII_US).getStr(),
          OUStringToOString(rMessage, RTL_TEXTENCODING_ASCII_US).getStr());
diff --git a/vcl/headless/headlessinst.cxx b/vcl/headless/headlessinst.cxx
index d783cbade58d..e6f5cf03f5b3 100644
--- a/vcl/headless/headlessinst.cxx
+++ b/vcl/headless/headlessinst.cxx
@@ -28,10 +28,9 @@ public:
     HeadlessSalSystem() : SvpSalSystem() {}
     virtual int ShowNativeDialog( const OUString& rTitle,
                                   const OUString& rMessage,
-                                  const std::list< OUString >& rButtons,
-                                  int nDefButton ) override
+                                  const std::list< OUString >& rButtons ) override
     {
-        (void)rButtons; (void)nDefButton;
+        (void)rButtons;
         ::fprintf(stdout, "LibreOffice - dialog '%s': '%s'",
                             OUStringToOString(rTitle, RTL_TEXTENCODING_ASCII_US).getStr(),
                             OUStringToOString(rMessage, RTL_TEXTENCODING_ASCII_US).getStr());
diff --git a/vcl/headless/svpdummies.cxx b/vcl/headless/svpdummies.cxx
index 46ff2841a961..31a4de7fc171 100644
--- a/vcl/headless/svpdummies.cxx
+++ b/vcl/headless/svpdummies.cxx
@@ -59,7 +59,7 @@ tools::Rectangle SvpSalSystem::GetDisplayScreenPosSizePixel( unsigned int nScree
 }
 
 int SvpSalSystem::ShowNativeDialog( const OUString&, const OUString&,
-                                    const std::list< OUString >&, int )
+                                    const std::list< OUString >& )
 {
     return 0;
 }
diff --git a/vcl/inc/headless/svpdummies.hxx b/vcl/inc/headless/svpdummies.hxx
index a14aabe2b447..ff304cc03579 100644
--- a/vcl/inc/headless/svpdummies.hxx
+++ b/vcl/inc/headless/svpdummies.hxx
@@ -59,8 +59,7 @@ public:
 
     virtual int ShowNativeDialog( const OUString& rTitle,
                                   const OUString& rMessage,
-                                  const std::list< OUString >& rButtons,
-                                  int nDefButton ) override;
+                                  const std::list< OUString >& rButtons ) override;
 };
 
 #endif // INCLUDED_VCL_INC_HEADLESS_SVPDUMMIES_HXX
diff --git a/vcl/inc/unx/gensys.h b/vcl/inc/unx/gensys.h
index fabc6937b586..8f4f71af5757 100644
--- a/vcl/inc/unx/gensys.h
+++ b/vcl/inc/unx/gensys.h
@@ -35,8 +35,7 @@ class VCL_DLLPUBLIC SalGenericSystem : public SalSystem
     virtual ~SalGenericSystem() override;
     virtual int ShowNativeDialog( const OUString& rTitle,
                                   const OUString& rMessage,
-                                  const std::list< OUString >& rButtons,
-                                  int nDefButton ) = 0;
+                                  const std::list< OUString >& rButtons ) = 0;
 
     virtual int ShowNativeMessageBox( const OUString& rTitle,
                                       const OUString& rMessage) override;
diff --git a/vcl/inc/unx/gtk/gtkprn.hxx b/vcl/inc/unx/gtk/gtkprn.hxx
index 5ef0563592e1..d2fb5fab081d 100644
--- a/vcl/inc/unx/gtk/gtkprn.hxx
+++ b/vcl/inc/unx/gtk/gtkprn.hxx
@@ -34,7 +34,7 @@ private:
     bool impl_doJob(
             const OUString* i_pFileName, const OUString& i_rJobName,
             const OUString& i_rAppName, ImplJobSetup* io_pSetupData,
-            int i_nCopies, bool i_bCollate, vcl::PrinterController& io_rController);
+            bool i_bCollate, vcl::PrinterController& io_rController);
 
 private:
     std::unique_ptr<GtkSalPrinter_Impl> m_xImpl;
diff --git a/vcl/inc/unx/gtk/gtksys.hxx b/vcl/inc/unx/gtk/gtksys.hxx
index d888bce5bca3..94e748887a12 100644
--- a/vcl/inc/unx/gtk/gtksys.hxx
+++ b/vcl/inc/unx/gtk/gtksys.hxx
@@ -32,8 +32,7 @@ public:
     virtual tools::Rectangle     GetDisplayScreenPosSizePixel   (unsigned int nScreen) override;
     virtual int           ShowNativeDialog (const OUString&              rTitle,
                                             const OUString&              rMessage,
-                                            const std::list< OUString >& rButtons,
-                                            int                        nDefButton) override;
+                                            const std::list< OUString >& rButtons) override;
     SalX11Screen      GetDisplayDefaultXScreen()
             { return getXScreenFromDisplayScreen( GetDisplayBuiltInScreen() ); }
     int               GetDisplayXScreenCount();
diff --git a/vcl/inc/unx/x11/x11sys.hxx b/vcl/inc/unx/x11/x11sys.hxx
index bcb97f7714af..d99542164545 100644
--- a/vcl/inc/unx/x11/x11sys.hxx
+++ b/vcl/inc/unx/x11/x11sys.hxx
@@ -37,8 +37,7 @@ public:
     virtual tools::Rectangle    GetDisplayScreenPosSizePixel( unsigned int nScreen ) override;
     virtual int ShowNativeDialog( const OUString& rTitle,
                                   const OUString& rMessage,
-                                  const std::list< OUString >& rButtons,
-                                  int nDefButton ) override;
+                                  const std::list< OUString >& rButtons ) override;
 };
 
 #endif // INCLUDED_VCL_INC_UNX_X11_X11SYS_HXX
diff --git a/vcl/ios/iosinst.cxx b/vcl/ios/iosinst.cxx
index b2b090834d87..b4b6f1f9f0bd 100644
--- a/vcl/ios/iosinst.cxx
+++ b/vcl/ios/iosinst.cxx
@@ -73,8 +73,7 @@ public:
     virtual ~IosSalSystem() {}
     virtual int ShowNativeDialog( const OUString& rTitle,
                                   const OUString& rMessage,
-                                  const std::list< OUString >& rButtons,
-                                  int nDefButton );
+                                  const std::list< OUString >& rButtons );
 };
 
 SalSystem *IosSalInstance::CreateSalSystem()
@@ -185,11 +184,9 @@ void DestroySalInstance( SalInstance *pInst )
 
 int IosSalSystem::ShowNativeDialog( const OUString& rTitle,
                                     const OUString& rMessage,
-                                    const std::list< OUString >& rButtons,
-                                    int nDefButton )
+                                    const std::list< OUString >& rButtons )
 {
     (void)rButtons;
-    (void)nDefButton;
 
     NSLog(@"%@: %@", CreateNSString(rTitle), CreateNSString(rMessage));
 
diff --git a/vcl/unx/generic/app/gensys.cxx b/vcl/unx/generic/app/gensys.cxx
index b336a90561eb..dbcb1fffd4f8 100644
--- a/vcl/unx/generic/app/gensys.cxx
+++ b/vcl/unx/generic/app/gensys.cxx
@@ -99,7 +99,7 @@ int SalGenericSystem::ShowNativeMessageBox( const OUString& rTitle, const OUStri
 
     aButtons.push_back( GetNativeMessageBoxButtonText( StandardButtonType::OK, false/*bUseResources*/ ) );
     nButtonIds[nBut++] = SALSYSTEM_SHOWNATIVEMSGBOX_BTN_OK;
-    int nResult = ShowNativeDialog( rTitle, rMessage, aButtons, 0/*nDefButton*/ );
+    int nResult = ShowNativeDialog( rTitle, rMessage, aButtons );
 
     return nResult != -1 ? nButtonIds[ nResult ] : 0;
 }
diff --git a/vcl/unx/gtk/gtksys.cxx b/vcl/unx/gtk/gtksys.cxx
index 5c047e4453a8..7e46498e6461 100644
--- a/vcl/unx/gtk/gtksys.cxx
+++ b/vcl/unx/gtk/gtksys.cxx
@@ -269,8 +269,7 @@ static OString MapToGtkAccelerator(const OUString &rStr)
 }
 
 int GtkSalSystem::ShowNativeDialog (const OUString& rTitle, const OUString& rMessage,
-                                    const std::list< OUString >& rButtonNames,
-                                    int nDefaultButton)
+                                    const std::list< OUString >& rButtonNames)
 {
     OString aTitle (OUStringToOString (rTitle, RTL_TEXTENCODING_UTF8));
     OString aMessage (OUStringToOString (rMessage, RTL_TEXTENCODING_UTF8));
@@ -285,7 +284,7 @@ int GtkSalSystem::ShowNativeDialog (const OUString& rTitle, const OUString& rMes
     std::list< OUString >::const_iterator it;
     for (it = rButtonNames.begin(); it != rButtonNames.end(); ++it)
         gtk_dialog_add_button (pDialog, MapToGtkAccelerator(*it).getStr(), nButton++);
-    gtk_dialog_set_default_response (pDialog, nDefaultButton);
+    gtk_dialog_set_default_response (pDialog, 0/*nDefaultButton*/);
 
     nButton = gtk_dialog_run (pDialog);
     if (nButton < 0)
diff --git a/vcl/unx/gtk/salprn-gtk.cxx b/vcl/unx/gtk/salprn-gtk.cxx
index 7ffbffb9c939..f82525481731 100644
--- a/vcl/unx/gtk/salprn-gtk.cxx
+++ b/vcl/unx/gtk/salprn-gtk.cxx
@@ -172,7 +172,6 @@ GtkSalPrinter::impl_doJob(
         const OUString& i_rJobName,
         const OUString& i_rAppName,
         ImplJobSetup* const io_pSetupData,
-        const int i_nCopies,
         const bool i_bCollate,
         vcl::PrinterController& io_rController)
 {
@@ -180,7 +179,7 @@ GtkSalPrinter::impl_doJob(
     io_rController.jobStarted();
     const bool bJobStarted(
             PspSalPrinter::StartJob(i_pFileName, i_rJobName, i_rAppName,
-                i_nCopies, i_bCollate, true, io_pSetupData))
+                1/*i_nCopies*/, i_bCollate, true, io_pSetupData))
         ;
 
     if (bJobStarted)
@@ -253,7 +252,7 @@ GtkSalPrinter::StartJob(
 
     //To-Do, swap ps/pdf for gtk_printer_accepts_ps()/gtk_printer_accepts_pdf() ?
 
-    return impl_doJob(&aFileName, i_rJobName, i_rAppName, io_pSetupData, 1/*nCopies*/, bCollate, io_rController);
+    return impl_doJob(&aFileName, i_rJobName, i_rAppName, io_pSetupData, bCollate, io_rController);
 }
 
 bool
diff --git a/vcl/unx/x11/x11sys.cxx b/vcl/unx/x11/x11sys.cxx
index 69a626274a0c..19a9c41049eb 100644
--- a/vcl/unx/x11/x11sys.cxx
+++ b/vcl/unx/x11/x11sys.cxx
@@ -84,7 +84,7 @@ tools::Rectangle X11SalSystem::GetDisplayScreenPosSizePixel( unsigned int nScree
     return aRet;
 }
 
-int X11SalSystem::ShowNativeDialog( const OUString& rTitle, const OUString& rMessage, const std::list< OUString >& rButtons, int nDefButton )
+int X11SalSystem::ShowNativeDialog( const OUString& rTitle, const OUString& rMessage, const std::list< OUString >& rButtons )
 {
     int nRet = -1;
 
@@ -99,10 +99,10 @@ int X11SalSystem::ShowNativeDialog( const OUString& rTitle, const OUString& rMes
     sal_uInt16 nButton = 0;
     for( std::list< OUString >::const_iterator it = rButtons.begin(); it != rButtons.end(); ++it )
     {
-            aWarn->AddButton( *it, nButton+1, nButton == (sal_uInt16)nDefButton ? ButtonDialogFlags::Default : ButtonDialogFlags::NONE );
+            aWarn->AddButton( *it, nButton+1, (nButton == 0) ? ButtonDialogFlags::Default : ButtonDialogFlags::NONE );
             nButton++;
     }
-    aWarn->SetFocusButton( (sal_uInt16)nDefButton+1 );
+    aWarn->SetFocusButton( (sal_uInt16)1 );
 
     nRet = ((int)aWarn->Execute()) - 1;
 
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index e6ce3a0c453c..361d968f696a 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -1677,7 +1677,7 @@ void XMLTextParagraphExport::exportText(
     if( !bAutoStyles && (pRedlineExport != nullptr) )
         pRedlineExport->ExportStartOrEndRedline( xPropertySet, true );
     exportTextContentEnumeration( xParaEnum, bAutoStyles, xBaseSection,
-                                  bIsProgress, bExportParagraph, nullptr, true/*bExportLevels*/, eExtensionNS );
+                                  bIsProgress, bExportParagraph, nullptr, eExtensionNS );
     if( !bAutoStyles && (pRedlineExport != nullptr) )
         pRedlineExport->ExportStartOrEndRedline( xPropertySet, false );
 }
@@ -1720,7 +1720,7 @@ void XMLTextParagraphExport::exportTextContentEnumeration(
         bool bIsProgress,
         bool bExportParagraph,
         const Reference < XPropertySet > *pRangePropSet,
-        bool bExportLevels, TextPNS eExtensionNS )
+        TextPNS eExtensionNS )
 {
     SAL_WARN_IF( !rContEnum.is(), "xmloff", "No enumeration to export!" );
     bool bHasMoreElements = rContEnum->hasMoreElements();
@@ -1756,30 +1756,27 @@ void XMLTextParagraphExport::exportTextContentEnumeration(
         Reference<XServiceInfo> xServiceInfo( xTxtCntnt, UNO_QUERY );
         if( xServiceInfo->supportsService( sParagraphService ) )
         {
-            if( bExportLevels )
+            if( bAutoStyles )
             {
-                if( bAutoStyles )
-                {
-                    exportListAndSectionChange( xCurrentTextSection, xTxtCntnt,
-                                                aPrevNumInfo, aNextNumInfo,
-                                                bAutoStyles );
-                }
-                else
-                {
-                    /* Pass list auto style pool to <XMLTextNumRuleInfo> instance
-                       Pass info about request to export <text:number> element
-                       to <XMLTextNumRuleInfo> instance (#i69627#)
-                    */
-                    aNextNumInfo.Set( xTxtCntnt,
-                                      GetExport().writeOutlineStyleAsNormalListStyle(),
-                                      GetListAutoStylePool(),
-                                      GetExport().exportTextNumberElement() );
-
-                    exportListAndSectionChange( xCurrentTextSection, aPropSetHelper,
-                                                TEXT_SECTION, xTxtCntnt,
-                                                aPrevNumInfo, aNextNumInfo,
-                                                bAutoStyles );
-                }
+                exportListAndSectionChange( xCurrentTextSection, xTxtCntnt,
+                                            aPrevNumInfo, aNextNumInfo,
+                                            bAutoStyles );
+            }
+            else
+            {
+                /* Pass list auto style pool to <XMLTextNumRuleInfo> instance
+                   Pass info about request to export <text:number> element
+                   to <XMLTextNumRuleInfo> instance (#i69627#)
+                */
+                aNextNumInfo.Set( xTxtCntnt,
+                                  GetExport().writeOutlineStyleAsNormalListStyle(),
+                                  GetListAutoStylePool(),
+                                  GetExport().exportTextNumberElement() );
+
+                exportListAndSectionChange( xCurrentTextSection, aPropSetHelper,
+                                            TEXT_SECTION, xTxtCntnt,
+                                            aPrevNumInfo, aNextNumInfo,
+                                            bAutoStyles );
             }
 
             // if we found a mute section: skip all section content
@@ -1866,7 +1863,7 @@ void XMLTextParagraphExport::exportTextContentEnumeration(
         bHasMoreElements = rContEnum->hasMoreElements();
     }
 
-    if( bExportLevels && bHasContent && !bAutoStyles )
+    if( bHasContent && !bAutoStyles )
     {
         aNextNumInfo.Reset();