[Libreoffice-commits] core.git: compilerplugins/clang editeng/inc editeng/source formula/source include/formula sc/inc sc/source sfx2/source vcl/inc vcl/source
Noel Grandin
noel.grandin at collabora.co.uk
Fri Dec 1 07:13:50 UTC 2017
compilerplugins/clang/unusedfields.readonly.results | 42 +++++++++-------
compilerplugins/clang/unusedfields.untouched.results | 26 +++-------
compilerplugins/clang/unusedfields.writeonly.results | 40 +++++++++++-----
editeng/inc/editdoc.hxx | 3 -
editeng/source/editeng/editdoc.cxx | 6 --
editeng/source/editeng/impedit3.cxx | 2
formula/source/core/api/vectortoken.cxx | 16 +++---
include/formula/vectortoken.hxx | 6 --
sc/inc/chartarr.hxx | 4 -
sc/source/core/data/grouptokenconverter.cxx | 4 -
sc/source/core/tool/chartarr.cxx | 4 -
sc/source/ui/unoobj/cellsuno.cxx | 8 +--
sfx2/source/appl/workwin.cxx | 1
sfx2/source/inc/workwin.hxx | 2
vcl/inc/PhysicalFontCollection.hxx | 2
vcl/source/font/PhysicalFontCollection.cxx | 47 -------------------
16 files changed, 80 insertions(+), 133 deletions(-)
New commits:
commit e7f6fdd5c3805469e1905b11d11d9b01bef477a9
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Thu Nov 30 13:57:07 2017 +0200
loplugin:unusedfields
The mnRequestedLength fields in formula/ were introduced in
commit 6ef6dd0122b8e44d8547ec31f40def42173e4e41
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date: Wed Feb 26 14:32:57 2014 -0500
Store the length of originally requested array size prior to
trimming.
but then partially removed in
commit d7f1f91b194da1cb96e66268ce7ef38602aa5754
Author: Noel Grandin <noel at peralex.com>
Date: Mon Mar 3 13:29:43 2014 +0200
remove unused code in formula/vectortoken
Change-Id: Ic56b6e42682131ee45df7838867145f980f3d601
Reviewed-on: https://gerrit.libreoffice.org/45571
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/compilerplugins/clang/unusedfields.readonly.results b/compilerplugins/clang/unusedfields.readonly.results
index de6aa98570ca..c3d55dca208a 100644
--- a/compilerplugins/clang/unusedfields.readonly.results
+++ b/compilerplugins/clang/unusedfields.readonly.results
@@ -46,7 +46,7 @@ bridges/source/jni_uno/jni_java2uno.cxx:150
jni_uno::largest p void *
bridges/source/jni_uno/jni_java2uno.cxx:151
jni_uno::largest a uno_Any
-chart2/source/model/main/DataPoint.hxx:108
+chart2/source/model/main/DataPoint.hxx:107
chart::DataPoint m_bNoParentPropAllowed _Bool
chart2/source/view/inc/GL3DRenderer.hxx:54
chart::opengl3D::MaterialParameters pad float
@@ -364,10 +364,6 @@ sal/rtl/uuid.cxx:64
UUID clock_seq_low sal_uInt8
sal/rtl/uuid.cxx:65
UUID node sal_uInt8 [6]
-sc/inc/attrib.hxx:175
- ScRangeItem aRange class ScRange
-sc/inc/attrib.hxx:214
- ScTableListItem nCount sal_uInt16
sc/inc/compiler.hxx:126
ScRawToken::(anonymous union)::(anonymous) eItem class ScTableRefToken::Item
sc/inc/compiler.hxx:127
@@ -378,7 +374,7 @@ sc/inc/formulagroup.hxx:42
sc::FormulaGroupEntry::(anonymous) mpCells class ScFormulaCell **
sc/inc/reordermap.hxx:21
sc::ColRowReorderMapType maData sc::ColRowReorderMapType::DataType
-sc/source/core/inc/interpre.hxx:104
+sc/source/core/inc/interpre.hxx:105
ScTokenStack pPointer const formula::FormulaToken *[512]
sc/source/filter/inc/autofilterbuffer.hxx:178
oox::xls::FilterColumn mxSettings std::shared_ptr<FilterSettingsBase>
@@ -414,6 +410,10 @@ sd/inc/sdmod.hxx:117
SdModule gImplImpressPropertySetInfoCache SdExtPropertySetInfoCache
sd/inc/sdmod.hxx:118
SdModule gImplDrawPropertySetInfoCache SdExtPropertySetInfoCache
+sd/source/core/CustomAnimationCloner.cxx:69
+ sd::CustomAnimationClonerImpl maSourceNodeVector std::vector<Reference<XAnimationNode> >
+sd/source/core/CustomAnimationCloner.cxx:70
+ sd::CustomAnimationClonerImpl maCloneNodeVector std::vector<Reference<XAnimationNode> >
sd/source/ui/sidebar/MasterPageContainer.cxx:148
sd::sidebar::MasterPageContainer::Implementation maLargePreviewBeingCreated class Image
sd/source/ui/sidebar/MasterPageContainer.cxx:149
@@ -520,7 +520,7 @@ sw/source/uibase/dbui/mmconfigitem.cxx:107
SwMailMergeConfigItem_Impl m_aNeutralGreetingLines std::vector<OUString>
sw/source/uibase/inc/fldmgr.hxx:77
SwInsertField_Data m_aDBDataSource css::uno::Any
-sw/source/uibase/inc/labimg.hxx:50
+sw/source/uibase/inc/labimg.hxx:49
SwLabItem m_aBin class rtl::OUString
toolkit/source/awt/vclxtoolkit.cxx:179
(anonymous namespace)::VCLXToolkit mxSelection css::uno::Reference<css::datatransfer::clipboard::XClipboard>
@@ -564,6 +564,8 @@ unoidl/source/unoidlprovider.cxx:456
unoidl::detail::MapEntry data struct unoidl::detail::(anonymous namespace)::Memory32
unotools/source/config/saveopt.cxx:82
SvtSaveOptions_Impl bROUserAutoSave _Bool
+vcl/inc/PhysicalFontCollection.hxx:71
+ PhysicalFontCollection mbMapNames _Bool
vcl/inc/printerinfomanager.hxx:72
psp::PrinterInfoManager::SystemPrintQueue m_aComment class rtl::OUString
vcl/inc/salwtype.hxx:153
@@ -576,17 +578,17 @@ vcl/inc/salwtype.hxx:202
SalSurroundingTextSelectionChangeEvent mnEnd sal_uLong
vcl/inc/salwtype.hxx:208
SalQueryCharPositionEvent mnCharPos sal_uLong
-vcl/inc/svdata.hxx:268
+vcl/inc/svdata.hxx:267
ImplSVNWFData mnStatusBarLowerRightOffset int
-vcl/inc/svdata.hxx:274
+vcl/inc/svdata.hxx:273
ImplSVNWFData mbMenuBarDockingAreaCommonBG _Bool
-vcl/inc/svdata.hxx:284
+vcl/inc/svdata.hxx:283
ImplSVNWFData mbCenteredTabs _Bool
-vcl/inc/svdata.hxx:285
+vcl/inc/svdata.hxx:284
ImplSVNWFData mbNoActiveTabTextRaise _Bool
-vcl/inc/svdata.hxx:287
+vcl/inc/svdata.hxx:286
ImplSVNWFData mbProgressNeedsErase _Bool
-vcl/inc/svdata.hxx:296
+vcl/inc/svdata.hxx:295
ImplSVNWFData mbRolloverMenubar _Bool
vcl/inc/unx/i18n_status.hxx:56
vcl::I18NStatus m_aCurrentIM class rtl::OUString
@@ -654,6 +656,8 @@ vcl/unx/gtk/gloactiongroup.cxx:28
GLOAction parent_instance GObject
vcl/unx/gtk/glomenu.cxx:20
GLOMenu parent_instance GMenuModel
+writerfilter/source/dmapper/DomainMapper_Impl.hxx:395
+ writerfilter::dmapper::DomainMapper_Impl m_aSaveOpt class SvtSaveOptions
writerfilter/source/ooxml/OOXMLFactory.hxx:61
writerfilter::ooxml::AttributeInfo m_nToken writerfilter::Token_t
writerfilter/source/ooxml/OOXMLFactory.hxx:62
@@ -664,17 +668,17 @@ xmloff/inc/MultiPropertySetHelper.hxx:78
MultiPropertySetHelper aEmptyAny css::uno::Any
xmloff/source/chart/SchXMLChartContext.cxx:447
(anonymous namespace)::NewDonutSeries msStyleName class rtl::OUString
-xmloff/source/chart/SchXMLChartContext.hxx:53
- SeriesDefaultsAndStyles maErrorIndicatorDefault css::uno::Any
xmloff/source/chart/SchXMLChartContext.hxx:54
- SeriesDefaultsAndStyles maErrorCategoryDefault css::uno::Any
+ SeriesDefaultsAndStyles maErrorIndicatorDefault css::uno::Any
xmloff/source/chart/SchXMLChartContext.hxx:55
- SeriesDefaultsAndStyles maConstantErrorLowDefault css::uno::Any
+ SeriesDefaultsAndStyles maErrorCategoryDefault css::uno::Any
xmloff/source/chart/SchXMLChartContext.hxx:56
- SeriesDefaultsAndStyles maConstantErrorHighDefault css::uno::Any
+ SeriesDefaultsAndStyles maConstantErrorLowDefault css::uno::Any
xmloff/source/chart/SchXMLChartContext.hxx:57
- SeriesDefaultsAndStyles maPercentageErrorDefault css::uno::Any
+ SeriesDefaultsAndStyles maConstantErrorHighDefault css::uno::Any
xmloff/source/chart/SchXMLChartContext.hxx:58
+ SeriesDefaultsAndStyles maPercentageErrorDefault css::uno::Any
+xmloff/source/chart/SchXMLChartContext.hxx:59
SeriesDefaultsAndStyles maErrorMarginDefault css::uno::Any
xmloff/source/core/xmlexp.cxx:251
SvXMLExport_Impl maSaveOptions class SvtSaveOptions
diff --git a/compilerplugins/clang/unusedfields.untouched.results b/compilerplugins/clang/unusedfields.untouched.results
index 894a4521605a..308cffd7a734 100644
--- a/compilerplugins/clang/unusedfields.untouched.results
+++ b/compilerplugins/clang/unusedfields.untouched.results
@@ -1,5 +1,5 @@
-basctl/source/inc/dlged.hxx:121
- basctl::DlgEditor pObjFac std::unique_ptr<DlgEdFactory>
+basctl/source/inc/dlged.hxx:122
+ basctl::DlgEditor pObjFac std::unique_ptr<DlgEdFactory, o3tl::default_delete<DlgEdFactory> >
basic/qa/cppunit/basictest.hxx:27
MacroSnippet maDll class BasicDLL
basic/source/runtime/dllmgr.hxx:48
@@ -24,7 +24,7 @@ connectivity/source/drivers/evoab2/EApi.h:126
(anonymous) ext char *
connectivity/source/drivers/mork/MDatabaseMetaData.hxx:29
connectivity::mork::ODatabaseMetaData m_pMetaDataHelper std::unique_ptr<MDatabaseMetaDataHelper>
-cppu/source/threadpool/threadpool.cxx:377
+cppu/source/threadpool/threadpool.cxx:355
_uno_ThreadPool dummy sal_Int32
cppu/source/typelib/typelib.cxx:61
AlignSize_Impl nInt16 sal_Int16
@@ -34,8 +34,6 @@ emfio/source/emfuno/xemfparser.cxx:59
emfio::emfreader::XEmfParser context_ uno::Reference<uno::XComponentContext>
extensions/source/scanner/scanner.hxx:44
ScannerManager maProtector osl::Mutex
-include/comphelper/MasterPropertySet.hxx:38
- comphelper::SlaveData mxSlave css::uno::Reference<css::beans::XPropertySet>
include/drawinglayer/primitive2d/textlayoutdevice.hxx:61
drawinglayer::primitive2d::TextLayouterDevice maSolarGuard class SolarMutexGuard
include/editeng/unotext.hxx:608
@@ -113,7 +111,7 @@ pyuno/source/module/pyuno_impl.hxx:224
pyuno/source/module/pyuno_impl.hxx:324
pyuno::stRuntimeImpl ob_base PyObject
reportdesign/source/ui/inc/ReportWindow.hxx:54
- rptui::OReportWindow m_pObjFac ::std::unique_ptr<DlgEdFactory>
+ rptui::OReportWindow m_pObjFac std::unique_ptr<DlgEdFactory, o3tl::default_delete<DlgEdFactory> >
sal/osl/unx/thread.cxx:90
osl_thread_priority_st m_Highest int
sal/osl/unx/thread.cxx:91
@@ -128,8 +126,12 @@ sal/osl/unx/thread.cxx:112
osl_thread_global_st m_priority struct osl_thread_priority_st
sc/inc/formulalogger.hxx:42
sc::FormulaLogger maMessages std::vector<OUString>
+sc/inc/interpretercontext.hxx:23
+ ScInterpreterContext mrDoc const class ScDocument &
sc/qa/unit/ucalc_column.cxx:103
aInputs aName const char *
+sc/source/core/data/formulacell.cxx:1741
+ (anonymous namespace)::StackCleaner pInt std::unique_ptr<ScInterpreter>
sc/source/filter/inc/sheetdatacontext.hxx:61
oox::xls::SheetDataContext aReleaser class SolarMutexReleaser
sc/source/ui/inc/docsh.hxx:439
@@ -152,12 +154,6 @@ sd/source/ui/view/ViewShellBase.cxx:194
sd::ViewShellBase::Implementation mpPageCacheManager std::shared_ptr<slidesorter::cache::PageCacheManager>
sfx2/source/doc/doctempl.cxx:115
DocTempl::DocTempl_EntryData_Impl mxObjShell class SfxObjectShellLock
-sfx2/source/inc/shellimpl.hxx:33
- SfxObjectShellArr_Impl maData SfxObjectShellArr_Impl::DataType
-sfx2/source/inc/shellimpl.hxx:54
- SfxViewFrameArr_Impl maData SfxViewFrameArr_Impl::DataType
-sfx2/source/inc/shellimpl.hxx:75
- SfxViewShellArr_Impl maData SfxViewShellArr_Impl::DataType
starmath/inc/smmod.hxx:69
SmModule mpLocSymbolData std::unique_ptr<SmLocalizedSymbolData>
starmath/inc/view.hxx:218
@@ -196,8 +192,6 @@ unoidl/source/unoidlprovider.cxx:673
unoidl::detail::(anonymous namespace)::UnoidlCursor reference2_ rtl::Reference<UnoidlModuleEntity>
vcl/inc/opengl/zone.hxx:46
OpenGLVCLContextZone aZone class OpenGLZone
-vcl/inc/svdata.hxx:149
- ImplSVAppData mbShutdownDelayed _Bool
vcl/inc/unx/cpdmgr.hxx:60
psp::CPDPrinterOption name class rtl::OUString
vcl/inc/unx/cpdmgr.hxx:61
@@ -214,7 +208,3 @@ vcl/source/uitest/uno/uitest_uno.cxx:35
UITestUnoObj mpUITest std::unique_ptr<UITest>
vcl/unx/gtk/a11y/atkhypertext.cxx:29
(anonymous) atk_hyper_link AtkHyperlink
-writerfilter/source/rtftok/rtfdocumentimpl.hxx:663
- writerfilter::rtftok::RTFDocumentImpl m_hasLHeader _Bool
-writerfilter/source/rtftok/rtfdocumentimpl.hxx:666
- writerfilter::rtftok::RTFDocumentImpl m_hasLFooter _Bool
diff --git a/compilerplugins/clang/unusedfields.writeonly.results b/compilerplugins/clang/unusedfields.writeonly.results
index 942a5357c753..d34eef064553 100644
--- a/compilerplugins/clang/unusedfields.writeonly.results
+++ b/compilerplugins/clang/unusedfields.writeonly.results
@@ -64,7 +64,7 @@ chart2/inc/ChartModel.hxx:483
chart::ChartModel mnEnd sal_Int32
chart2/source/controller/main/ElementSelector.hxx:37
chart::ListBoxEntryData nHierarchyDepth sal_Int32
-chart2/source/inc/MediaDescriptorHelper.hxx:85
+chart2/source/inc/MediaDescriptorHelper.hxx:82
apphelper::MediaDescriptorHelper ReadOnly _Bool
chart2/source/model/inc/BaseCoordinateSystem.hxx:118
chart::BaseCoordinateSystem m_xContext css::uno::Reference<css::uno::XComponentContext>
@@ -174,7 +174,7 @@ desktop/qa/desktop_lib/test_desktop_lib.cxx:176
DesktopLOKTest m_bModified _Bool
desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx:119
dp_gui::UpdateCommandEnv m_installThread ::rtl::Reference<UpdateInstallDialog::Thread>
-desktop/unx/source/splashx.c:369
+desktop/unx/source/splashx.c:371
input_mode long
drawinglayer/source/tools/emfpbrush.hxx:104
emfplushelper::EMFPBrush wrapMode sal_Int32
@@ -194,6 +194,8 @@ drawinglayer/source/tools/emfppen.hxx:63
emfplushelper::EMFPPen customStartCap struct emfplushelper::EMFPCustomLineCap *
drawinglayer/source/tools/emfppen.hxx:65
emfplushelper::EMFPPen customEndCap struct emfplushelper::EMFPCustomLineCap *
+editeng/inc/editdoc.hxx:486
+ EditLine nCrsrHeight sal_uInt16
embeddedobj/source/inc/oleembobj.hxx:127
OleEmbeddedObject m_nTargetState sal_Int32
embeddedobj/source/inc/oleembobj.hxx:139
@@ -244,6 +246,10 @@ include/connectivity/OSubComponent.hxx:54
connectivity::OSubComponent m_xParent css::uno::Reference<css::uno::XInterface>
include/editeng/adjustitem.hxx:39
SvxAdjustItem bLeft _Bool
+include/formula/vectortoken.hxx:65
+ formula::SingleVectorRefToken mnRequestedLength size_t
+include/formula/vectortoken.hxx:85
+ formula::DoubleVectorRefToken mnRequestedLength size_t
include/LibreOfficeKit/LibreOfficeKit.h:108
_LibreOfficeKitDocumentClass nSize size_t
include/opencl/openclwrapper.hxx:36
@@ -266,6 +272,8 @@ include/svx/srchdlg.hxx:231
SvxSearchDialog pSearchController class SvxSearchController *
include/svx/srchdlg.hxx:232
SvxSearchDialog pOptionsController class SvxSearchController *
+include/vcl/opengl/OpenGLContext.hxx:41
+ GLWindow bMultiSampleSupported _Bool
include/vcl/salnativewidgets.hxx:415
ToolbarValue mbIsTopDockingArea _Bool
include/vcl/salnativewidgets.hxx:463
@@ -310,7 +318,7 @@ sal/rtl/alloc_cache.hxx:36
rtl_cache_stat_type m_mem_alloc sal_Size
sal/rtl/alloc_cache.hxx:151
rtl_cache_st m_cpu_stats struct rtl_cache_stat_type
-sal/rtl/math.cxx:996
+sal/rtl/math.cxx:1004
md union sal_math_Double
sal/textenc/tcvtutf7.cxx:96
ImplUTF7ToUCContextData mbShifted _Bool
@@ -328,26 +336,28 @@ sal/textenc/tcvtutf7.cxx:396
ImplUTF7FromUCContextData mnBitBuffer sal_uInt32
sal/textenc/tcvtutf7.cxx:397
ImplUTF7FromUCContextData mnBufferBits sal_uInt32
+sc/inc/chartarr.hxx:61
+ ScChartArray aName class rtl::OUString
sc/inc/compiler.hxx:258
ScCompiler::AddInMap pODFF const char *
sc/inc/compiler.hxx:259
ScCompiler::AddInMap pEnglish const char *
sc/inc/compiler.hxx:261
ScCompiler::AddInMap pUpper const char *
+sc/inc/document.hxx:2483
+ ScMutationDisable mpDocument class ScDocument *
sc/inc/pivot.hxx:74
ScDPLabelData mnFlags sal_Int32
sc/inc/pivot.hxx:77
ScDPLabelData mbIsValue _Bool
sc/source/core/data/cellvalues.cxx:25
sc::(anonymous namespace)::BlockPos mnEnd size_t
-sc/source/core/data/column4.cxx:1291
+sc/source/core/data/column4.cxx:1290
(anonymous namespace)::StartListeningFormulaCellsHandler mnStartRow SCROW
-sc/source/core/data/document.cxx:1257
+sc/source/core/data/document.cxx:1269
(anonymous namespace)::BroadcastRecalcOnRefMoveHandler aSwitch sc::AutoCalcSwitch
-sc/source/core/data/document.cxx:1258
+sc/source/core/data/document.cxx:1270
(anonymous namespace)::BroadcastRecalcOnRefMoveHandler aBulk class ScBulkBroadcast
-sc/source/core/data/formulacell.cxx:1756
- StackCleaner pInt class ScInterpreter *
sc/source/filter/excel/xltoolbar.hxx:23
TBCCmd cmdID sal_uInt16
sc/source/filter/excel/xltoolbar.hxx:24
@@ -380,9 +390,9 @@ sc/source/filter/inc/exp_op.hxx:52
ExportBiff5 pExcRoot struct RootData *
sc/source/filter/inc/imp_op.hxx:88
ImportExcel::LastFormula mpCell class ScFormulaCell *
-sc/source/filter/inc/orcusinterface.hxx:352
+sc/source/filter/inc/orcusinterface.hxx:355
ScOrcusStyles::xf mnStyleXf size_t
-sc/source/filter/inc/orcusinterface.hxx:370
+sc/source/filter/inc/orcusinterface.hxx:373
ScOrcusStyles::cell_style mnBuiltInId size_t
sc/source/filter/inc/root.hxx:95
LOTUS_ROOT eActType enum Lotus123Typ
@@ -398,6 +408,8 @@ sc/source/filter/xml/xmldrani.hxx:75
ScXMLDatabaseRangeContext bIsSelection _Bool
sc/source/filter/xml/xmlexternaltabi.hxx:113
ScXMLExternalRefCellContext mnCellType sal_Int16
+sc/source/ui/inc/AccessibleText.hxx:195
+ ScAccessiblePreviewHeaderCellTextData mbRowHeader _Bool
sc/source/ui/inc/datastream.hxx:108
sc::DataStream mnSettings sal_uInt32
sc/source/ui/inc/filtdlg.hxx:198
@@ -436,6 +448,8 @@ sfx2/source/inc/appdata.hxx:75
SfxAppData_Impl pTriggerTopic class SfxDdeTriggerTopic_Impl *
sfx2/source/inc/appdata.hxx:76
SfxAppData_Impl pDdeService2 class DdeService *
+sfx2/source/inc/workwin.hxx:50
+ SfxObjectBar_Impl nPos sal_uInt16
sfx2/source/view/classificationcontroller.cxx:59
sfx2::ClassificationCategoriesController m_aPropertyListener class sfx2::ClassificationPropertyListener
slideshow/source/engine/opengl/TransitionImpl.hxx:296
@@ -444,6 +458,8 @@ slideshow/source/engine/opengl/TransitionImpl.hxx:297
Vertex texcoord glm::vec2
slideshow/source/engine/slideshowimpl.cxx:1044
(anonymous namespace)::SlideShowImpl::PrefetchPropertiesFunc mpSlideShowImpl class (anonymous namespace)::SlideShowImpl *const
+soltools/cpp/cpp.h:143
+ macroValidator pMacro Nlist *
starmath/inc/view.hxx:158
SmCmdBoxWindow aController class SmEditController
store/source/storbase.hxx:248
@@ -568,9 +584,9 @@ vcl/source/filter/jpeg/Exif.hxx:56
Exif::ExifIFD type sal_uInt16
vcl/source/filter/jpeg/Exif.hxx:57
Exif::ExifIFD count sal_uInt32
-vcl/unx/generic/app/wmadaptor.cxx:1270
- _mwmhints input_mode long
vcl/unx/generic/app/wmadaptor.cxx:1271
+ _mwmhints input_mode long
+vcl/unx/generic/app/wmadaptor.cxx:1272
_mwmhints status unsigned long
vcl/unx/gtk/a11y/atkwrapper.hxx:45
AtkObjectWrapper aParent AtkObject
diff --git a/editeng/inc/editdoc.hxx b/editeng/inc/editdoc.hxx
index 59ebecc11a32..45cd7f0bf907 100644
--- a/editeng/inc/editdoc.hxx
+++ b/editeng/inc/editdoc.hxx
@@ -483,7 +483,6 @@ private:
sal_Int32 nEndPortion;
sal_uInt16 nHeight; // Total height of the line
sal_uInt16 nTxtHeight; // Pure Text height
- sal_uInt16 nCrsrHeight; // For contour flow high lines => cursor is large.
sal_uInt16 nMaxAscent;
bool bHangingPunctuation:1;
bool bInvalid:1; // for skillful formatting
@@ -515,7 +514,7 @@ public:
sal_Int32 GetEndPortion() const { return nEndPortion; }
sal_Int32& GetEndPortion() { return nEndPortion; }
- void SetHeight( sal_uInt16 nH, sal_uInt16 nTxtH = 0, sal_uInt16 nCrsrH = 0 );
+ void SetHeight( sal_uInt16 nH, sal_uInt16 nTxtH = 0 );
sal_uInt16 GetHeight() const { return nHeight; }
sal_uInt16 GetTxtHeight() const { return nTxtHeight; }
diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx
index 5ef52667846a..8c84c685c956 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -926,7 +926,6 @@ EditLine::EditLine() :
nEndPortion(0),
nHeight(0),
nTxtHeight(0),
- nCrsrHeight(0),
nMaxAscent(0),
bHangingPunctuation(false),
bInvalid(true)
@@ -942,7 +941,6 @@ EditLine::EditLine( const EditLine& r ) :
nEndPortion(r.nEndPortion),
nHeight(0),
nTxtHeight(0),
- nCrsrHeight(0),
nMaxAscent(0),
bHangingPunctuation(r.bHangingPunctuation),
bInvalid(true)
@@ -966,7 +964,6 @@ EditLine* EditLine::Clone() const
pL->nHeight = nHeight;
pL->nTxtWidth = nTxtWidth;
pL->nTxtHeight = nTxtHeight;
- pL->nCrsrHeight = nCrsrHeight;
pL->nMaxAscent = nMaxAscent;
return pL;
@@ -999,11 +996,10 @@ EditLine& EditLine::operator = ( const EditLine& r )
}
-void EditLine::SetHeight( sal_uInt16 nH, sal_uInt16 nTxtH, sal_uInt16 nCrsrH )
+void EditLine::SetHeight( sal_uInt16 nH, sal_uInt16 nTxtH )
{
nHeight = nH;
nTxtHeight = ( nTxtH ? nTxtH : nH );
- nCrsrHeight = ( nCrsrH ? nCrsrH : nTxtHeight );
}
void EditLine::SetStartPosX( long start )
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index ee2dac949f40..3c990f25cb71 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -1554,7 +1554,7 @@ bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY )
pLine->SetStartPosX( pLine->GetStartPosX() + nTextXOffset );
if ( nTextExtraYOffset )
{
- pLine->SetHeight( (sal_uInt16) ( pLine->GetHeight() + nTextExtraYOffset ), 0, pLine->GetHeight() );
+ pLine->SetHeight( (sal_uInt16) ( pLine->GetHeight() + nTextExtraYOffset ), 0 );
pLine->SetMaxAscent( (sal_uInt16) ( pLine->GetMaxAscent() + nTextExtraYOffset ) );
}
}
diff --git a/formula/source/core/api/vectortoken.cxx b/formula/source/core/api/vectortoken.cxx
index abd311053d7f..b98b5ecb8487 100644
--- a/formula/source/core/api/vectortoken.cxx
+++ b/formula/source/core/api/vectortoken.cxx
@@ -41,15 +41,15 @@ bool VectorRefArray::isValid() const
return mbValid;
}
-SingleVectorRefToken::SingleVectorRefToken( const VectorRefArray& rArray, size_t nReqLength, size_t nArrayLength ) :
- FormulaToken(svSingleVectorRef, ocPush), maArray(rArray), mnRequestedLength(nReqLength), mnArrayLength(nArrayLength)
+SingleVectorRefToken::SingleVectorRefToken( const VectorRefArray& rArray, size_t nArrayLength ) :
+ FormulaToken(svSingleVectorRef, ocPush), maArray(rArray), mnArrayLength(nArrayLength)
{
- SAL_INFO("formula.core", "Created SingleVectorRefToken nReqLength=" << nReqLength << " nArrayLength=" << nArrayLength);
+ SAL_INFO("formula.core", "Created SingleVectorRefToken nArrayLength=" << nArrayLength);
}
FormulaToken* SingleVectorRefToken::Clone() const
{
- return new SingleVectorRefToken(maArray, mnRequestedLength, mnArrayLength);
+ return new SingleVectorRefToken(maArray, mnArrayLength);
}
const VectorRefArray& SingleVectorRefToken::GetArray() const
@@ -63,19 +63,19 @@ size_t SingleVectorRefToken::GetArrayLength() const
}
DoubleVectorRefToken::DoubleVectorRefToken(
- const std::vector<VectorRefArray>& rArrays, size_t nReqLength, size_t nArrayLength,
+ const std::vector<VectorRefArray>& rArrays, size_t nArrayLength,
size_t nRefRowSize, bool bStartFixed, bool bEndFixed ) :
FormulaToken(svDoubleVectorRef, ocPush),
- maArrays(rArrays), mnRequestedLength(nReqLength), mnArrayLength(nArrayLength),
+ maArrays(rArrays), mnArrayLength(nArrayLength),
mnRefRowSize(nRefRowSize), mbStartFixed(bStartFixed), mbEndFixed(bEndFixed)
{
- SAL_INFO("formula.core", "Created DoubleVectorRefToken nReqLength=" << nReqLength << " nArrayLength=" << nArrayLength);
+ SAL_INFO("formula.core", "Created DoubleVectorRefToken nArrayLength=" << nArrayLength);
}
FormulaToken* DoubleVectorRefToken::Clone() const
{
return new DoubleVectorRefToken(
- maArrays, mnRequestedLength, mnArrayLength, mnRefRowSize, mbStartFixed, mbEndFixed);
+ maArrays, mnArrayLength, mnRefRowSize, mbStartFixed, mbEndFixed);
}
const std::vector<VectorRefArray>& DoubleVectorRefToken::GetArrays() const
diff --git a/include/formula/vectortoken.hxx b/include/formula/vectortoken.hxx
index 61d4725916b3..5d995f71a130 100644
--- a/include/formula/vectortoken.hxx
+++ b/include/formula/vectortoken.hxx
@@ -62,11 +62,10 @@ struct FORMULA_DLLPUBLIC VectorRefArray
class FORMULA_DLLPUBLIC SingleVectorRefToken : public FormulaToken
{
VectorRefArray maArray;
- size_t mnRequestedLength;
size_t mnArrayLength;
public:
- SingleVectorRefToken( const VectorRefArray& rArray, size_t nReqLength, size_t nArrayLength );
+ SingleVectorRefToken( const VectorRefArray& rArray, size_t nArrayLength );
virtual FormulaToken* Clone() const override;
@@ -82,7 +81,6 @@ class FORMULA_DLLPUBLIC DoubleVectorRefToken : public FormulaToken
{
std::vector<VectorRefArray> maArrays;
- size_t mnRequestedLength; /// requested length of all arrays which include trailing empty region.
size_t mnArrayLength; /// length of all arrays which does not include trailing empty region.
size_t mnRefRowSize; /// original reference row size. The row size may
/// change as it goes down the array if either the
@@ -93,7 +91,7 @@ class FORMULA_DLLPUBLIC DoubleVectorRefToken : public FormulaToken
public:
DoubleVectorRefToken(
- const std::vector<VectorRefArray>& rArrays, size_t nReqLength, size_t nArrayLength,
+ const std::vector<VectorRefArray>& rArrays, size_t nArrayLength,
size_t nRefRowSize, bool bStartFixed, bool bEndFixed );
virtual FormulaToken* Clone() const override;
diff --git a/sc/inc/chartarr.hxx b/sc/inc/chartarr.hxx
index 3580b31f008b..671d88b94e8c 100644
--- a/sc/inc/chartarr.hxx
+++ b/sc/inc/chartarr.hxx
@@ -58,7 +58,6 @@ public:
class SC_DLLPUBLIC ScChartArray // only parameter-struct
{
- OUString aName;
ScDocument* pDocument;
ScChartPositioner aPositioner;
@@ -66,8 +65,7 @@ private:
ScMemChart* CreateMemChartSingle();
ScMemChart* CreateMemChartMulti();
public:
- ScChartArray( ScDocument* pDoc, const ScRangeListRef& rRangeList,
- const OUString& rChartName );
+ ScChartArray( ScDocument* pDoc, const ScRangeListRef& rRangeList );
ScChartArray( const ScChartArray& rArr );
~ScChartArray();
diff --git a/sc/source/core/data/grouptokenconverter.cxx b/sc/source/core/data/grouptokenconverter.cxx
index 98ba8cdfa9b1..f13daaf0384a 100644
--- a/sc/source/core/data/grouptokenconverter.cxx
+++ b/sc/source/core/data/grouptokenconverter.cxx
@@ -135,7 +135,7 @@ bool ScGroupTokenConverter::convert( const ScTokenArray& rCode, sc::FormulaLogge
if (!aArray.isValid())
return false;
- formula::SingleVectorRefToken aTok(aArray, nLen, nTrimLen);
+ formula::SingleVectorRefToken aTok(aArray, nTrimLen);
mrGroupTokens.AddToken(aTok);
rScope.addRefMessage(mrPos, aRefPos, nLen, aArray);
@@ -225,7 +225,7 @@ bool ScGroupTokenConverter::convert( const ScTokenArray& rCode, sc::FormulaLogge
aArrays.push_back(aArray);
}
- formula::DoubleVectorRefToken aTok(aArrays, nRequestedLength, nArrayLength, nRefRowSize, bAbsFirst, bAbsLast);
+ formula::DoubleVectorRefToken aTok(aArrays, nArrayLength, nRefRowSize, bAbsFirst, bAbsLast);
mrGroupTokens.AddToken(aTok);
rScope.addRefMessage(mrPos, aAbs.aStart, nRequestedLength, aArrays);
diff --git a/sc/source/core/tool/chartarr.cxx b/sc/source/core/tool/chartarr.cxx
index 4e9cdc57a867..11e57e480828 100644
--- a/sc/source/core/tool/chartarr.cxx
+++ b/sc/source/core/tool/chartarr.cxx
@@ -56,13 +56,11 @@ ScMemChart::~ScMemChart()
}
ScChartArray::ScChartArray(
- ScDocument* pDoc, const ScRangeListRef& rRangeList, const OUString& rChartName ) :
- aName( rChartName ),
+ ScDocument* pDoc, const ScRangeListRef& rRangeList ) :
pDocument( pDoc ),
aPositioner(pDoc, rRangeList) {}
ScChartArray::ScChartArray( const ScChartArray& rArr ) :
- aName(rArr.aName),
pDocument(rArr.pDocument),
aPositioner(rArr.aPositioner) {}
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 9ef72684da1c..66470eac4194 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -3038,7 +3038,7 @@ ScMemChart* ScCellRangesBase::CreateMemChart_Impl() const
}
if (!xChartRanges.is()) // otherwise take Ranges directly
xChartRanges = new ScRangeList(aRanges);
- ScChartArray aArr( &pDocShell->GetDocument(), xChartRanges, OUString() );
+ ScChartArray aArr( &pDocShell->GetDocument(), xChartRanges );
// RowAsHdr = ColHeaders and vice versa
aArr.SetHeaders( bChartRowAsHdr, bChartColAsHdr );
@@ -3118,7 +3118,7 @@ void SAL_CALL ScCellRangesBase::setData( const uno::Sequence< uno::Sequence<doub
if ( pDocShell && xChartRanges.is() )
{
ScDocument& rDoc = pDocShell->GetDocument();
- ScChartArray aArr( &rDoc, xChartRanges, OUString() );
+ ScChartArray aArr( &rDoc, xChartRanges );
aArr.SetHeaders( bChartRowAsHdr, bChartColAsHdr ); // RowAsHdr = ColHeaders
const ScChartPositionMap* pPosMap = aArr.GetPositionMap();
if (pPosMap)
@@ -3189,7 +3189,7 @@ void SAL_CALL ScCellRangesBase::setRowDescriptions(
if ( pDocShell && xChartRanges.is() )
{
ScDocument& rDoc = pDocShell->GetDocument();
- ScChartArray aArr( &rDoc, xChartRanges, OUString() );
+ ScChartArray aArr( &rDoc, xChartRanges );
aArr.SetHeaders( bChartRowAsHdr, bChartColAsHdr ); // RowAsHdr = ColHeaders
const ScChartPositionMap* pPosMap = aArr.GetPositionMap();
if (pPosMap)
@@ -3258,7 +3258,7 @@ void SAL_CALL ScCellRangesBase::setColumnDescriptions(
if ( pDocShell && xChartRanges.is() )
{
ScDocument& rDoc = pDocShell->GetDocument();
- ScChartArray aArr( &rDoc, xChartRanges, OUString() );
+ ScChartArray aArr( &rDoc, xChartRanges );
aArr.SetHeaders( bChartRowAsHdr, bChartColAsHdr ); // RowAsHdr = ColHeaders
const ScChartPositionMap* pPosMap = aArr.GetPositionMap();
if (pPosMap)
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index 9d41fe95ae43..4e228b4ffd8b 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -1001,7 +1001,6 @@ void SfxWorkWindow::SetObjectBar_Impl(sal_uInt16 nPos, SfxVisibilityFlags nFlags
SfxObjectBar_Impl aObjBar;
aObjBar.eId = eId;
- aObjBar.nPos = nPos;
aObjBar.nMode = nFlags;
for (SfxObjectBar_Impl & rBar : aObjBarList)
diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx
index 5ceeb8daf0cd..c50bd6fdd226 100644
--- a/sfx2/source/inc/workwin.hxx
+++ b/sfx2/source/inc/workwin.hxx
@@ -47,13 +47,11 @@ struct SfxObjectBar_Impl
{
ToolbarId eId; // ConfigId of Toolbox
SfxVisibilityFlags nMode; // special visibility flags
- sal_uInt16 nPos;
bool bDestroy;
SfxObjectBar_Impl() :
eId(ToolbarId::None),
nMode(SfxVisibilityFlags::Invisible),
- nPos(0),
bDestroy(false)
{}
};
diff --git a/vcl/inc/PhysicalFontCollection.hxx b/vcl/inc/PhysicalFontCollection.hxx
index 41382cd0116e..2c32408ce158 100644
--- a/vcl/inc/PhysicalFontCollection.hxx
+++ b/vcl/inc/PhysicalFontCollection.hxx
@@ -68,7 +68,6 @@ public:
private:
mutable bool mbMatchData; // true if matching attributes are initialized
- bool mbMapNames; // true if MapNames are available
typedef std::unordered_map<OUString, PhysicalFontFamily*> PhysicalFontFamilies;
PhysicalFontFamilies maPhysicalFontFamilies;
@@ -83,7 +82,6 @@ private:
void ImplInitGenericGlyphFallback() const;
PhysicalFontFamily* ImplFindFontFamilyBySearchName( const OUString& ) const;
- PhysicalFontFamily* ImplFindFontFamilyByAliasName ( const OUString& rSearchName, const OUString& rShortName) const;
PhysicalFontFamily* ImplFindFontFamilyBySubstFontAttr( const utl::FontNameAttr& ) const;
PhysicalFontFamily* ImplFindFontFamilyOfDefaultFont() const;
diff --git a/vcl/source/font/PhysicalFontCollection.cxx b/vcl/source/font/PhysicalFontCollection.cxx
index 39390b7bf107..bde66d9ab466 100644
--- a/vcl/source/font/PhysicalFontCollection.cxx
+++ b/vcl/source/font/PhysicalFontCollection.cxx
@@ -61,7 +61,6 @@ static ImplFontAttrs lcl_IsCJKFont( const OUString& rFontName )
PhysicalFontCollection::PhysicalFontCollection()
: mbMatchData( false )
- , mbMapNames( false )
, mpPreMatchHook( nullptr )
, mpFallbackHook( nullptr )
, mpFallbackList( nullptr )
@@ -306,43 +305,6 @@ PhysicalFontFamily* PhysicalFontCollection::ImplFindFontFamilyBySearchName( cons
return pFoundData;
}
-PhysicalFontFamily* PhysicalFontCollection::ImplFindFontFamilyByAliasName(const OUString& rSearchName,
- const OUString& rShortName) const
-{
- // short circuit for impossible font name alias
- if (rSearchName.isEmpty())
- return nullptr;
-
- // short circuit if no alias names are available
- if (!mbMapNames)
- return nullptr;
-
- // use the font's alias names to find the font
- // TODO: get rid of linear search
- PhysicalFontFamilies::const_iterator it = maPhysicalFontFamilies.begin();
- while( it != maPhysicalFontFamilies.end() )
- {
- PhysicalFontFamily* pData = (*it).second;
- if( pData->GetAliasNames().isEmpty() )
- continue;
-
- // if one alias name matches we found a matching font
- OUString aTempName;
- sal_Int32 nIndex = 0;
-
- do
- {
- aTempName = GetNextFontToken( pData->GetAliasNames(), nIndex );
- // Test, if the Font name match with one of the mapping names
- if ( (aTempName == rSearchName) || (aTempName == rShortName) )
- return pData;
- }
- while ( nIndex != -1 );
- }
-
- return nullptr;
-}
-
PhysicalFontFamily* PhysicalFontCollection::FindFontFamily( const OUString& rFontName ) const
{
return ImplFindFontFamilyBySearchName( GetEnglishSearchFontName( rFontName ) );
@@ -922,7 +884,6 @@ PhysicalFontFamily* PhysicalFontCollection::ImplFindFontFamilyOfDefaultFont() co
PhysicalFontCollection* PhysicalFontCollection::Clone() const
{
PhysicalFontCollection* pClonedCollection = new PhysicalFontCollection;
- pClonedCollection->mbMapNames = mbMapNames;
pClonedCollection->mpPreMatchHook = mpPreMatchHook;
pClonedCollection->mpFallbackHook = mpFallbackHook;
@@ -1264,14 +1225,6 @@ PhysicalFontFamily* PhysicalFontCollection::FindFontFamily( FontSelectPattern& r
}
}
- // if still needed use the alias names of the installed fonts
- if( mbMapNames )
- {
- PhysicalFontFamily* pFoundData = ImplFindFontFamilyByAliasName( rFSD.maTargetName, aSearchShortName );
- if( pFoundData )
- return pFoundData;
- }
-
// if still needed use the font request's attributes to find a good match
if (MsLangId::isSimplifiedChinese(rFSD.meLanguage))
nSearchType |= ImplFontAttrs::CJK | ImplFontAttrs::CJK_SC;
More information about the Libreoffice-commits
mailing list