diff options
29 files changed, 161 insertions, 474 deletions
diff --git a/compilerplugins/clang/unusedfields.only-used-in-constructor.results b/compilerplugins/clang/unusedfields.only-used-in-constructor.results index 70b38deb71d1..21e02d81160d 100644 --- a/compilerplugins/clang/unusedfields.only-used-in-constructor.results +++ b/compilerplugins/clang/unusedfields.only-used-in-constructor.results @@ -9,9 +9,9 @@ avmedia/source/vlc/wrapper/Types.hxx:44 avmedia/source/vlc/wrapper/Types.hxx:45 libvlc_event_t::(anonymous union)::(anonymous) dummy2 const char * avmedia/source/vlc/wrapper/Types.hxx:46 - libvlc_event_t::(anonymous) padding struct (anonymous struct at /home/noel/libo/avmedia/source/vlc/wrapper/Types.hxx:43:7) + libvlc_event_t::(anonymous) padding struct (anonymous struct at /media/noel/disk2/libo4/avmedia/source/vlc/wrapper/Types.hxx:43:7) avmedia/source/vlc/wrapper/Types.hxx:47 - libvlc_event_t u union (anonymous union at /home/noel/libo/avmedia/source/vlc/wrapper/Types.hxx:41:5) + libvlc_event_t u union (anonymous union at /media/noel/disk2/libo4/avmedia/source/vlc/wrapper/Types.hxx:41:5) avmedia/source/vlc/wrapper/Types.hxx:53 libvlc_track_description_t psz_name char * basegfx/source/polygon/b2dtrapezoid.cxx:201 @@ -66,13 +66,13 @@ connectivity/source/inc/flat/EResultSet.hxx:42 connectivity::flat::OFlatResultSet m_bBookmarkable _Bool connectivity/source/inc/java/lang/Object.hxx:45 connectivity::SDBThreadAttach m_aGuard jvmaccess::class VirtualMachine::AttachGuard -cppcanvas/source/mtfrenderer/textaction.cxx:820 +cppcanvas/source/mtfrenderer/textaction.cxx:821 cppcanvas::internal::(anonymous namespace)::EffectTextAction maTextLineInfo const tools::TextLineInfo -cppcanvas/source/mtfrenderer/textaction.cxx:1655 +cppcanvas/source/mtfrenderer/textaction.cxx:1653 cppcanvas::internal::(anonymous namespace)::OutlineAction maTextLineInfo const tools::TextLineInfo cppu/source/threadpool/threadpool.cxx:355 _uno_ThreadPool dummy sal_Int32 -cppu/source/typelib/typelib.cxx:62 +cppu/source/typelib/typelib.cxx:63 AlignSize_Impl nInt16 sal_Int16 cppu/source/uno/check.cxx:38 (anonymous namespace)::C1 n1 sal_Int16 @@ -120,7 +120,7 @@ cppu/source/uno/check.cxx:138 (anonymous namespace)::Char4 chars struct (anonymous namespace)::Char3 cui/source/dialogs/colorpicker.cxx:719 cui::ColorPickerDialog m_aColorPrevious class cui::ColorPreviewControl -cui/source/factory/dlgfact.cxx:1380 +cui/source/factory/dlgfact.cxx:1381 SvxMacroAssignDialog m_aItems class SfxItemSet cui/source/inc/cfgutil.hxx:190 SvxScriptSelectorDialog m_aStylesInfo struct SfxStylesInfo_Impl @@ -206,6 +206,10 @@ include/svx/itemwin.hxx:34 SvxLineBox aDelayTimer class Timer include/xmloff/shapeimport.hxx:140 SdXML3DLightContext mbSpecular _Bool +include/xmloff/txtparae.hxx:209 + XMLTextParagraphExport m_sBookmarkHidden const class rtl::OUString +include/xmloff/txtparae.hxx:210 + XMLTextParagraphExport m_sBookmarkCondition const class rtl::OUString jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx:102 jfw_plugin::SunVersion usVersion class rtl::OUString libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx:35 @@ -308,9 +312,9 @@ sc/inc/token.hxx:397 SingleDoubleRefModifier aDub struct ScComplexRefData sc/qa/unit/ucalc_column.cxx:104 aInputs aName const char * -sc/source/core/data/document.cxx:1251 +sc/source/core/data/document.cxx:1237 (anonymous namespace)::BroadcastRecalcOnRefMoveHandler aSwitch sc::AutoCalcSwitch -sc/source/core/data/document.cxx:1252 +sc/source/core/data/document.cxx:1238 (anonymous namespace)::BroadcastRecalcOnRefMoveHandler aBulk class ScBulkBroadcast sc/source/filter/inc/htmlpars.hxx:614 ScHTMLQueryParser mnUnusedId ScHTMLTableId @@ -380,7 +384,7 @@ sd/source/ui/remotecontrol/ZeroconfService.hxx:36 sd::ZeroconfService port uint sd/source/ui/table/TableDesignPane.hxx:106 sd::TableDesignPane aImpl class sd::TableDesignWidget -sd/source/ui/view/DocumentRenderer.cxx:1322 +sd/source/ui/view/DocumentRenderer.cxx:1317 sd::DocumentRenderer::Implementation mxObjectShell SfxObjectShellRef sd/source/ui/view/viewshel.cxx:1215 sd::KeepSlideSorterInSyncWithPageChanges m_aDrawLock sd::slidesorter::view::class SlideSorterView::DrawLock @@ -429,7 +433,7 @@ svl/source/crypto/cryptosign.cxx:281 svtools/source/inc/svimpbox.hxx:125 SvImpLBox aFctSet class ImpLBSelEng svtools/source/svhtml/htmlkywd.cxx:558 - HTML_OptionEntry union HTML_OptionEntry::(anonymous at /home/noel/libo/svtools/source/svhtml/htmlkywd.cxx:558:5) + HTML_OptionEntry union HTML_OptionEntry::(anonymous at /media/noel/disk2/libo4/svtools/source/svhtml/htmlkywd.cxx:558:5) svtools/source/svhtml/htmlkywd.cxx:560 HTML_OptionEntry::(anonymous) sToken const sal_Char * svtools/source/svhtml/htmlkywd.cxx:561 @@ -462,7 +466,7 @@ svx/source/dialog/framelinkarray.cxx:376 svx::frame::MergedCellIterator mnFirstRow size_t svx/source/dialog/imapwnd.hxx:78 IMapWindow maItemInfos struct SfxItemInfo [1] -svx/source/gallery2/galbrws2.cxx:116 +svx/source/gallery2/galbrws2.cxx:115 (anonymous namespace)::GalleryThemePopup maBuilder class VclBuilder svx/source/stbctrls/pszctrl.cxx:93 FunctionPopup_Impl m_aBuilder class VclBuilder @@ -478,11 +482,11 @@ sw/inc/unosett.hxx:144 SwXNumberingRules m_pImpl ::sw::UnoImplPtr<Impl> sw/qa/core/test_ToxTextGenerator.cxx:134 ToxTextGeneratorWithMockedChapterField mChapterFieldType class SwChapterFieldType -sw/qa/extras/uiwriter/uiwriter.cxx:4001 +sw/qa/extras/uiwriter/uiwriter.cxx:4005 IdleTask maIdle class Idle sw/source/core/crsr/crbm.cxx:64 (anonymous namespace)::CursorStateHelper m_aSaveState class SwCursorSaveState -sw/source/core/inc/swfont.hxx:977 +sw/source/core/inc/swfont.hxx:975 SvStatistics nGetStretchTextSize sal_uInt16 sw/source/core/layout/dbg_lay.cxx:169 SwImplEnterLeave nAction enum DbgAction @@ -536,7 +540,7 @@ ucb/source/ucp/gio/gio_mount.hxx:52 OOoMountOperationClass _gtk_reserved4 void (*)(void) unotools/source/config/defaultoptions.cxx:93 SvtDefaultOptions_Impl m_aUserDictionaryPath class rtl::OUString -vcl/headless/svpgdi.cxx:287 +vcl/headless/svpgdi.cxx:285 (anonymous namespace)::SourceHelper aTmpBmp class SvpSalBitmap vcl/inc/canvasbitmap.hxx:44 vcl::unotools::VclCanvasBitmap m_aAlpha ::Bitmap @@ -548,12 +552,6 @@ vcl/inc/opengl/RenderList.hxx:30 Vertex lineData glm::vec4 vcl/inc/opengl/zone.hxx:46 OpenGLVCLContextZone aZone class OpenGLZone -vcl/inc/qt5/Qt5Menu.hxx:74 - Qt5MenuItem mbVisible _Bool -vcl/inc/qt5/Qt5Object.hxx:34 - Qt5Object m_aSystemData struct SystemEnvData -vcl/inc/qt5/Qt5Object.hxx:36 - Qt5Object m_pParent class Qt5Frame * vcl/inc/salmenu.hxx:42 SalMenuButtonItem mnId sal_uInt16 vcl/inc/salmenu.hxx:43 @@ -574,25 +572,25 @@ vcl/inc/unx/i18n_ic.hxx:46 SalI18N_InputContext maSwitchIMCallback XIMCallback vcl/inc/unx/i18n_ic.hxx:47 SalI18N_InputContext maDestroyCallback XIMCallback -vcl/source/app/salvtables.cxx:1344 +vcl/source/app/salvtables.cxx:1354 SalInstanceEntry m_aTextFilter class SalInstanceEntry::WeldTextFilter vcl/source/gdi/jobset.cxx:34 ImplOldJobSetupData cDeviceName char [32] vcl/source/gdi/jobset.cxx:35 ImplOldJobSetupData cPortName char [32] -vcl/unx/gtk3/gtk3gtkinst.cxx:2221 +vcl/unx/gtk3/gtk3gtkinst.cxx:2231 CrippledViewport viewport GtkViewport vcl/unx/gtk/a11y/atkhypertext.cxx:29 (anonymous) atk_hyper_link AtkHyperlink vcl/unx/gtk/a11y/atkwrapper.hxx:49 AtkObjectWrapper aParent AtkObject -vcl/unx/gtk/a11y/atkwrapper.hxx:80 - AtkObjectWrapperClass aParentClass AtkObjectClass +vcl/unx/gtk/a11y/atkwrapper.hxx:78 + AtkObjectWrapperClass aParentClass GtkWidgetAccessibleClass vcl/unx/gtk/gloactiongroup.cxx:28 GLOAction parent_instance GObject vcl/unx/gtk/glomenu.cxx:20 GLOMenu parent_instance GMenuModel -writerfilter/source/dmapper/PropertyMap.hxx:198 +writerfilter/source/dmapper/PropertyMap.hxx:197 writerfilter::dmapper::SectionPropertyMap m_nDebugSectionNumber sal_Int32 xmloff/source/text/XMLTextListBlockContext.hxx:35 XMLTextListBlockContext msListStyleName class rtl::OUString diff --git a/compilerplugins/clang/unusedfields.readonly.results b/compilerplugins/clang/unusedfields.readonly.results index 6fe680af3a7b..ae56f3629458 100644 --- a/compilerplugins/clang/unusedfields.readonly.results +++ b/compilerplugins/clang/unusedfields.readonly.results @@ -44,13 +44,13 @@ bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx:135 __cxxabiv1::__cxa_eh_globals uncaughtExceptions unsigned int bridges/source/jni_uno/jni_info.h:68 jni_uno::JNI_type_info m_td ::com::sun::star::uno::TypeDescription -bridges/source/jni_uno/jni_java2uno.cxx:148 - jni_uno::largest n sal_Int64 bridges/source/jni_uno/jni_java2uno.cxx:149 - jni_uno::largest d double + jni_uno::largest n sal_Int64 bridges/source/jni_uno/jni_java2uno.cxx:150 - jni_uno::largest p void * + jni_uno::largest d double bridges/source/jni_uno/jni_java2uno.cxx:151 + jni_uno::largest p void * +bridges/source/jni_uno/jni_java2uno.cxx:152 jni_uno::largest a uno_Any chart2/source/model/main/DataPoint.hxx:108 chart::DataPoint m_bNoParentPropAllowed _Bool @@ -92,13 +92,13 @@ connectivity/source/inc/TConnection.hxx:55 connectivity::OMetaConnection m_aResources class connectivity::SharedResources connectivity/source/inc/writer/WTable.hxx:69 connectivity::writer::OWriterTable m_nStartCol sal_Int32 -cppcanvas/source/mtfrenderer/textaction.cxx:827 +cppcanvas/source/mtfrenderer/textaction.cxx:828 cppcanvas::internal::(anonymous namespace)::EffectTextAction maTextFillColor const ::Color -cppcanvas/source/mtfrenderer/textaction.cxx:1663 +cppcanvas/source/mtfrenderer/textaction.cxx:1661 cppcanvas::internal::(anonymous namespace)::OutlineAction maTextFillColor const ::Color -cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx:34 - Mapping m_from uno::Environment cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx:35 + Mapping m_from uno::Environment +cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx:36 Mapping m_to uno::Environment cppu/source/helper/purpenv/Proxy.hxx:36 Proxy m_from css::uno::Environment @@ -156,7 +156,7 @@ cppu/source/uno/check.cxx:138 (anonymous namespace)::Char4 chars struct (anonymous namespace)::Char3 cui/source/options/optcolor.cxx:254 ColorConfigWindow_Impl aModuleOptions class SvtModuleOptions -cui/source/options/optpath.cxx:78 +cui/source/options/optpath.cxx:79 OptPath_Impl m_aDefOpt class SvtDefaultOptions cui/source/options/personalization.hxx:35 SvxPersonalizationTabPage m_vDefaultPersonaImages VclPtr<class PushButton> [3] @@ -164,7 +164,7 @@ cui/source/options/personalization.hxx:86 SelectPersonaDialog m_vResultList VclPtr<class PushButton> [9] cui/source/options/personalization.hxx:87 SelectPersonaDialog m_vSearchSuggestions VclPtr<class PushButton> [6] -cui/source/options/treeopt.cxx:468 +cui/source/options/treeopt.cxx:469 OptionsGroupInfo m_bLoadError _Bool dbaccess/source/core/api/RowSetBase.hxx:85 dbaccess::ORowSetBase m_aEmptyValue connectivity::ORowSetValue @@ -314,12 +314,48 @@ include/svl/ondemand.hxx:58 OnDemandLocaleDataWrapper aSysLocale class SvtSysLocale include/svtools/editsyntaxhighlighter.hxx:33 MultiLineEditSyntaxHighlight m_aColorConfig svtools::ColorConfig -include/svx/colorbox.hxx:105 - ColorListBox m_nSlotId sal_uInt16 -include/svx/colorbox.hxx:106 - ColorListBox m_bShowNoneButton _Bool -include/svx/fntctrl.hxx:93 - FontPrevWindow maText class rtl::OUString +include/svx/colorbox.hxx:99 + ColorListBox m_aSelectedLink Link<class ColorListBox &, void> +include/svx/colorwindow.hxx:118 + ColorWindow maCommand class rtl::OUString +include/svx/colorwindow.hxx:136 + ColorWindow maSelectedLink Link<const NamedColor &, void> +include/svx/pagectrl.hxx:44 + SvxPageWindow bResetBackground _Bool +include/svx/pagectrl.hxx:45 + SvxPageWindow bFrameDirection _Bool +include/svx/pagectrl.hxx:46 + SvxPageWindow nFrameDirection enum SvxFrameDirection +include/svx/pagectrl.hxx:64 + SvxPageWindow bTable _Bool +include/svx/pagectrl.hxx:65 + SvxPageWindow bHorz _Bool +include/svx/pagectrl.hxx:66 + SvxPageWindow bVert _Bool +include/svx/paraprev.hxx:43 + SvxParaPrevWindow nLeftMargin long +include/svx/paraprev.hxx:44 + SvxParaPrevWindow nRightMargin long +include/svx/paraprev.hxx:45 + SvxParaPrevWindow nFirstLineOfst short +include/svx/paraprev.hxx:47 + SvxParaPrevWindow nUpper sal_uInt16 +include/svx/paraprev.hxx:48 + SvxParaPrevWindow nLower sal_uInt16 +include/svx/paraprev.hxx:50 + SvxParaPrevWindow eAdjust enum SvxAdjust +include/svx/paraprev.hxx:52 + SvxParaPrevWindow eLastLine enum SvxAdjust +include/svx/paraprev.hxx:54 + SvxParaPrevWindow eLine enum SvxPrevLineSpace +include/svx/relfld.hxx:31 + SvxRelativeField nRelMin sal_uInt16 +include/svx/relfld.hxx:32 + SvxRelativeField nRelMax sal_uInt16 +include/svx/relfld.hxx:33 + SvxRelativeField bRelativeMode _Bool +include/svx/relfld.hxx:35 + SvxRelativeField bNegativeEnabled _Bool include/svx/sdr/overlay/overlayanimatedbitmapex.hxx:51 sdr::overlay::OverlayAnimatedBitmapEx mbOverlayState _Bool include/svx/sdr/overlay/overlaymanager.hxx:73 @@ -332,8 +368,16 @@ include/svx/svdoedge.hxx:161 SdrEdgeObj mbBoundRectCalculationRunning _Bool include/svx/svdpntv.hxx:170 SdrPaintView maDrawinglayerOpt class SvtOptionsDrawinglayer +include/test/sheet/xdatapilottable.hxx:31 + apitest::XDataPilotTable xCellForChange css::uno::Reference<css::table::XCell> +include/test/sheet/xdatapilottable.hxx:32 + apitest::XDataPilotTable xCellForCheck css::uno::Reference<css::table::XCell> +include/test/sheet/xnamedranges.hxx:38 + apitest::XNamedRanges xSheet css::uno::Reference<css::sheet::XSpreadsheet> +include/test/sheet/xspreadsheets2.hxx:46 + apitest::XSpreadsheets2 xDocument css::uno::Reference<css::sheet::XSpreadsheetDocument> include/unoidl/unoidl.hxx:443 - unoidl::ConstantValue union unoidl::ConstantValue::(anonymous at /home/noel/libo/include/unoidl/unoidl.hxx:443:5) + unoidl::ConstantValue union unoidl::ConstantValue::(anonymous at /media/noel/disk2/libo4/include/unoidl/unoidl.hxx:443:5) include/unoidl/unoidl.hxx:444 unoidl::ConstantValue::(anonymous) booleanValue _Bool include/unoidl/unoidl.hxx:445 @@ -354,6 +398,8 @@ include/unoidl/unoidl.hxx:452 unoidl::ConstantValue::(anonymous) floatValue float include/unoidl/unoidl.hxx:453 unoidl::ConstantValue::(anonymous) doubleValue double +include/unotest/bootstrapfixturebase.hxx:37 + test::BootstrapFixtureBase m_directories class test::Directories include/vcl/filter/pdfdocument.hxx:188 vcl::filter::PDFNameElement m_nLength sal_uInt64 include/vcl/opengl/OpenGLContext.hxx:57 @@ -380,6 +426,8 @@ linguistic/source/dlistimp.hxx:56 DicList aOpt class LinguOptions oox/qa/token/tokenmap-test.cxx:34 oox::TokenmapTest tokenMap class oox::TokenMap +oox/qa/unit/vba_compression.cxx:71 + TestVbaCompression m_directories test::Directories oox/source/drawingml/chart/objectformatter.cxx:708 oox::drawingml::chart::ObjectFormatterData maFromLocale struct com::sun::star::lang::Locale oox/source/drawingml/diagram/diagramlayoutatoms.hxx:208 @@ -415,15 +463,13 @@ sal/rtl/uuid.cxx:65 sc/inc/compiler.hxx:129 ScRawToken::(anonymous union)::(anonymous) eItem class ScTableRefToken::Item sc/inc/compiler.hxx:130 - ScRawToken::(anonymous) table struct (anonymous struct at /home/noel/libo/sc/inc/compiler.hxx:127:9) + ScRawToken::(anonymous) table struct (anonymous struct at /media/noel/disk2/libo4/sc/inc/compiler.hxx:127:9) sc/inc/compiler.hxx:135 ScRawToken::(anonymous) pMat class ScMatrix * sc/inc/formulagroup.hxx:39 sc::FormulaGroupEntry::(anonymous) mpCells class ScFormulaCell ** sc/inc/reordermap.hxx:21 sc::ColRowReorderMapType maData sc::ColRowReorderMapType::DataType -sc/qa/extras/anchor.cxx:53 - sc_apitest::ScAnchorTest mxComponent uno::Reference<lang::XComponent> sc/source/core/inc/adiasync.hxx:41 ScAddInAsync::(anonymous) pStr class rtl::OUString * sc/source/core/inc/interpre.hxx:105 @@ -498,7 +544,7 @@ sfx2/source/appl/lnkbase2.cxx:96 sfx2::ImplDdeItem pLink class sfx2::SvBaseLink * slideshow/source/engine/slideshowimpl.cxx:152 (anonymous namespace)::FrameSynchronization maTimer canvas::tools::ElapsedTime -sot/source/sdstor/ucbstorage.cxx:414 +sot/source/sdstor/ucbstorage.cxx:407 UCBStorageStream_Impl m_aKey class rtl::OString starmath/source/view.cxx:855 SmViewShell_Impl aOpts class SvtMiscOptions @@ -534,6 +580,8 @@ svtools/source/dialogs/insdlg.cxx:52 OleObjectDescriptor dwFullUserTypeName sal_uInt32 svtools/source/dialogs/insdlg.cxx:53 OleObjectDescriptor dwSrcOfCopy sal_uInt32 +svtools/source/misc/transfer2.cxx:322 + TransferDataContainer_Impl pGrf std::unique_ptr<Graphic> svtools/source/table/gridtablerenderer.cxx:69 svt::table::CachedSortIndicator m_sortAscending class BitmapEx svtools/source/table/gridtablerenderer.cxx:70 @@ -564,7 +612,7 @@ sw/inc/calc.hxx:194 SwCalc m_aSysLocale class SvtSysLocale sw/inc/hints.hxx:199 SwAttrSetChg m_bDelSet _Bool -sw/inc/shellio.hxx:140 +sw/inc/shellio.hxx:141 SwReader pStg tools::SvRef<SotStorage> sw/inc/swevent.hxx:71 SwCallMouseEvent::(anonymous union)::(anonymous) pFormat const class SwFrameFormat * @@ -580,7 +628,7 @@ sw/source/core/inc/swblocks.hxx:68 SwImpBlocks m_bInPutMuchBlocks _Bool sw/source/core/text/atrhndl.hxx:48 SwAttrHandler::SwAttrStack m_pInitialArray class SwTextAttr *[3] -sw/source/filter/html/swhtml.hxx:497 +sw/source/filter/html/swhtml.hxx:454 SwHTMLParser m_bBodySeen _Bool sw/source/filter/inc/rtf.hxx:32 RTFSurround::(anonymous) nVal sal_uInt8 @@ -594,7 +642,7 @@ sw/source/uibase/dbui/mmconfigitem.cxx:108 SwMailMergeConfigItem_Impl m_aMaleGreetingLines std::vector<OUString> sw/source/uibase/dbui/mmconfigitem.cxx:110 SwMailMergeConfigItem_Impl m_aNeutralGreetingLines std::vector<OUString> -sw/source/uibase/inc/fldmgr.hxx:77 +sw/source/uibase/inc/fldmgr.hxx:78 SwInsertField_Data m_aDBDataSource css::uno::Any sw/source/uibase/inc/labimg.hxx:49 SwLabItem m_aBin class rtl::OUString @@ -668,6 +716,8 @@ vcl/inc/svdata.hxx:284 ImplSVNWFData mbNoActiveTabTextRaise _Bool vcl/inc/svdata.hxx:286 ImplSVNWFData mbProgressNeedsErase _Bool +vcl/inc/svdata.hxx:295 + ImplSVNWFData mbRolloverMenubar _Bool vcl/inc/unx/i18n_status.hxx:56 vcl::I18NStatus m_aCurrentIM class rtl::OUString vcl/inc/unx/saldisp.hxx:288 @@ -732,8 +782,8 @@ vcl/unx/generic/print/bitmap_gfx.cxx:67 psp::HexEncoder mpFileBuffer sal_Char [16400] vcl/unx/gtk/a11y/atkwrapper.hxx:49 AtkObjectWrapper aParent AtkObject -vcl/unx/gtk/a11y/atkwrapper.hxx:80 - AtkObjectWrapperClass aParentClass AtkObjectClass +vcl/unx/gtk/a11y/atkwrapper.hxx:78 + AtkObjectWrapperClass aParentClass GtkWidgetAccessibleClass vcl/unx/gtk/gloactiongroup.cxx:28 GLOAction parent_instance GObject vcl/unx/gtk/glomenu.cxx:20 @@ -748,7 +798,7 @@ writerfilter/source/ooxml/OOXMLFactory.hxx:64 writerfilter::ooxml::AttributeInfo m_nRef Id xmloff/inc/MultiPropertySetHelper.hxx:78 MultiPropertySetHelper aEmptyAny css::uno::Any -xmloff/source/chart/SchXMLChartContext.cxx:447 +xmloff/source/chart/SchXMLChartContext.cxx:448 (anonymous namespace)::NewDonutSeries msStyleName class rtl::OUString xmloff/source/chart/SchXMLChartContext.hxx:54 SeriesDefaultsAndStyles maErrorIndicatorDefault css::uno::Any @@ -762,5 +812,5 @@ 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:257 +xmloff/source/core/xmlexp.cxx:258 SvXMLExport_Impl maSaveOptions class SvtSaveOptions diff --git a/compilerplugins/clang/unusedfields.untouched.results b/compilerplugins/clang/unusedfields.untouched.results index 7743a742db28..0accd33a6ac2 100644 --- a/compilerplugins/clang/unusedfields.untouched.results +++ b/compilerplugins/clang/unusedfields.untouched.results @@ -5,9 +5,9 @@ avmedia/source/vlc/wrapper/Types.hxx:44 avmedia/source/vlc/wrapper/Types.hxx:45 libvlc_event_t::(anonymous union)::(anonymous) dummy2 const char * avmedia/source/vlc/wrapper/Types.hxx:46 - libvlc_event_t::(anonymous) padding struct (anonymous struct at /home/noel/libo/avmedia/source/vlc/wrapper/Types.hxx:43:7) + libvlc_event_t::(anonymous) padding struct (anonymous struct at /media/noel/disk2/libo4/avmedia/source/vlc/wrapper/Types.hxx:43:7) avmedia/source/vlc/wrapper/Types.hxx:47 - libvlc_event_t u union (anonymous union at /home/noel/libo/avmedia/source/vlc/wrapper/Types.hxx:41:5) + libvlc_event_t u union (anonymous union at /media/noel/disk2/libo4/avmedia/source/vlc/wrapper/Types.hxx:41:5) avmedia/source/vlc/wrapper/Types.hxx:53 libvlc_track_description_t psz_name char * basctl/source/inc/dlged.hxx:122 @@ -34,7 +34,7 @@ connectivity/source/drivers/mork/MDatabaseMetaData.hxx:29 connectivity::mork::ODatabaseMetaData m_pMetaDataHelper std::unique_ptr<MDatabaseMetaDataHelper> cppu/source/threadpool/threadpool.cxx:355 _uno_ThreadPool dummy sal_Int32 -cppu/source/typelib/typelib.cxx:62 +cppu/source/typelib/typelib.cxx:63 AlignSize_Impl nInt16 sal_Int16 cui/source/dialogs/colorpicker.cxx:721 cui::ColorPickerDialog m_xColorField std::unique_ptr<weld::CustomWeld> @@ -56,10 +56,6 @@ cui/source/inc/cuitabarea.hxx:704 SvxColorTabPage m_xCtlPreviewOld std::unique_ptr<weld::CustomWeld> cui/source/inc/cuitabarea.hxx:705 SvxColorTabPage m_xCtlPreviewNew std::unique_ptr<weld::CustomWeld> -cui/source/inc/cuitabarea.hxx:706 - SvxColorTabPage m_xValSetColorListWin std::unique_ptr<weld::CustomWeld> -cui/source/inc/cuitabarea.hxx:707 - SvxColorTabPage m_xValSetRecentListWin std::unique_ptr<weld::CustomWeld> cui/source/inc/insrc.hxx:31 SvxInsRowColDlg m_xBeforeBtn std::unique_ptr<weld::RadioButton> cui/source/inc/page.hxx:105 @@ -104,6 +100,8 @@ include/LibreOfficeKit/LibreOfficeKitGtk.h:33 _LOKDocView aDrawingArea GtkDrawingArea include/LibreOfficeKit/LibreOfficeKitGtk.h:38 _LOKDocViewClass parent_class GtkDrawingAreaClass +include/oox/crypto/DocumentDecryption.hxx:38 + oox::core::DocumentDecryption mxContext css::uno::Reference<css::uno::XComponentContext> include/oox/vml/vmlshapecontext.hxx:116 oox::vml::ShapeTypeContext m_pShapeType std::shared_ptr<ShapeType> include/registry/registry.hxx:35 @@ -128,10 +126,14 @@ include/svx/colorwindow.hxx:134 ColorWindow mxRecentColorSetWin std::unique_ptr<weld::CustomWeld> include/svx/hdft.hxx:87 SvxHFPage m_xBspWin std::unique_ptr<weld::CustomWeld> -include/vcl/uitest/uiobject.hxx:268 +include/vcl/uitest/uiobject.hxx:270 TabPageUIObject mxTabPage VclPtr<class TabPage> include/xmloff/formlayerexport.hxx:173 xmloff::OOfficeFormsExport m_pImpl std::unique_ptr<OFormsRootExport> +include/xmloff/txtparae.hxx:209 + XMLTextParagraphExport m_sBookmarkHidden const class rtl::OUString +include/xmloff/txtparae.hxx:210 + XMLTextParagraphExport m_sBookmarkCondition const class rtl::OUString libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx:35 GtvApplicationWindowPrivate lokDialog GtkWidget * libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx:50 @@ -188,11 +190,11 @@ sc/inc/interpretercontext.hxx:31 ScInterpreterContext mrDoc const class ScDocument & sc/qa/unit/ucalc_column.cxx:104 aInputs aName const char * -sc/source/core/data/document.cxx:1251 +sc/source/core/data/document.cxx:1237 (anonymous namespace)::BroadcastRecalcOnRefMoveHandler aSwitch sc::AutoCalcSwitch -sc/source/core/data/document.cxx:1252 +sc/source/core/data/document.cxx:1238 (anonymous namespace)::BroadcastRecalcOnRefMoveHandler aBulk class ScBulkBroadcast -sc/source/core/data/formulacell.cxx:1793 +sc/source/core/data/formulacell.cxx:1809 (anonymous namespace)::StackCleaner pInt std::unique_ptr<ScInterpreter> sc/source/filter/inc/sheetdatacontext.hxx:61 oox::xls::SheetDataContext aReleaser class SolarMutexReleaser @@ -200,7 +202,7 @@ sc/source/ui/inc/crdlg.hxx:33 ScColOrRowDlg m_xBtnRows std::unique_ptr<weld::RadioButton> sc/source/ui/inc/delcodlg.hxx:39 ScDeleteContentsDlg m_xBtnOk std::unique_ptr<weld::Button> -sc/source/ui/inc/docsh.hxx:462 +sc/source/ui/inc/docsh.hxx:463 ScDocShellModificator mpProtector std::unique_ptr<ScRefreshTimerProtector> sc/source/ui/inc/instbdlg.hxx:66 ScInsertTableDlg m_xBtnBehind std::unique_ptr<weld::RadioButton> @@ -220,7 +222,7 @@ sd/source/ui/slidesorter/view/SlsLayouter.cxx:61 sd::slidesorter::view::Layouter::Implementation mpTheme std::shared_ptr<view::Theme> sd/source/ui/table/TableDesignPane.hxx:106 sd::TableDesignPane aImpl class sd::TableDesignWidget -sd/source/ui/view/DocumentRenderer.cxx:1322 +sd/source/ui/view/DocumentRenderer.cxx:1317 sd::DocumentRenderer::Implementation mxObjectShell SfxObjectShellRef sd/source/ui/view/viewshel.cxx:1215 sd::KeepSlideSorterInSyncWithPageChanges m_aDrawLock sd::slidesorter::view::class SlideSorterView::DrawLock @@ -265,7 +267,7 @@ svl/source/crypto/cryptosign.cxx:280 svl/source/crypto/cryptosign.cxx:281 (anonymous namespace)::(anonymous) failInfo SECItem svtools/source/svhtml/htmlkywd.cxx:558 - HTML_OptionEntry union HTML_OptionEntry::(anonymous at /home/noel/libo/svtools/source/svhtml/htmlkywd.cxx:558:5) + HTML_OptionEntry union HTML_OptionEntry::(anonymous at /media/noel/disk2/libo4/svtools/source/svhtml/htmlkywd.cxx:558:5) svtools/source/svhtml/htmlkywd.cxx:560 HTML_OptionEntry::(anonymous) sToken const sal_Char * svtools/source/svhtml/htmlkywd.cxx:561 @@ -316,13 +318,9 @@ uui/source/unknownauthdlg.hxx:36 UnknownAuthDialog m_xOptionButtonDontAccept std::unique_ptr<weld::RadioButton> vcl/inc/opengl/zone.hxx:46 OpenGLVCLContextZone aZone class OpenGLZone -vcl/inc/qt5/Qt5Menu.hxx:74 - Qt5MenuItem mbVisible _Bool -vcl/inc/qt5/Qt5Object.hxx:34 - Qt5Object m_aSystemData struct SystemEnvData vcl/inc/salprn.hxx:44 SalPrinterQueueInfo mpPortName std::unique_ptr<OUString> -vcl/source/app/salvtables.cxx:494 +vcl/source/app/salvtables.cxx:504 SalInstanceContainer m_xContainer VclPtr<vcl::Window> vcl/source/gdi/jobset.cxx:34 ImplOldJobSetupData cDeviceName char [32] @@ -334,7 +332,7 @@ vcl/unx/generic/print/prtsetup.hxx:73 RTSPaperPage m_xContainer std::unique_ptr<weld::Widget> vcl/unx/generic/print/prtsetup.hxx:108 RTSDevicePage m_xContainer std::unique_ptr<weld::Widget> -vcl/unx/gtk3/gtk3gtkinst.cxx:2221 +vcl/unx/gtk3/gtk3gtkinst.cxx:2231 CrippledViewport viewport GtkViewport vcl/unx/gtk/a11y/atkhypertext.cxx:29 (anonymous) atk_hyper_link AtkHyperlink diff --git a/compilerplugins/clang/unusedfields.writeonly.results b/compilerplugins/clang/unusedfields.writeonly.results index 4b985610ef29..1b1a0798a2c1 100644 --- a/compilerplugins/clang/unusedfields.writeonly.results +++ b/compilerplugins/clang/unusedfields.writeonly.results @@ -42,13 +42,13 @@ bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx:125 __cxxabiv1::__cxa_exception unwindHeader _Unwind_Exception bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx:135 __cxxabiv1::__cxa_eh_globals uncaughtExceptions unsigned int -bridges/source/jni_uno/jni_java2uno.cxx:148 - jni_uno::largest n sal_Int64 bridges/source/jni_uno/jni_java2uno.cxx:149 - jni_uno::largest d double + jni_uno::largest n sal_Int64 bridges/source/jni_uno/jni_java2uno.cxx:150 - jni_uno::largest p void * + jni_uno::largest d double bridges/source/jni_uno/jni_java2uno.cxx:151 + jni_uno::largest p void * +bridges/source/jni_uno/jni_java2uno.cxx:152 jni_uno::largest a uno_Any canvas/source/cairo/cairo_spritedevicehelper.hxx:77 cairocanvas::SpriteDeviceHelper mbFullScreen _Bool @@ -56,9 +56,9 @@ canvas/source/cairo/cairo_spritehelper.hxx:103 cairocanvas::SpriteHelper mbTextureDirty _Bool canvas/source/opengl/ogl_spritedevicehelper.hxx:124 oglcanvas::SpriteDeviceHelper mpDevice css::rendering::XGraphicDevice * -chart2/inc/ChartModel.hxx:483 +chart2/inc/ChartModel.hxx:471 chart::ChartModel mnStart sal_Int32 -chart2/inc/ChartModel.hxx:484 +chart2/inc/ChartModel.hxx:472 chart::ChartModel mnEnd sal_Int32 chart2/source/controller/main/ElementSelector.hxx:37 chart::ListBoxEntryData nHierarchyDepth sal_Int32 @@ -74,8 +74,6 @@ codemaker/source/cppumaker/dependencies.hxx:114 codemaker::cppumaker::Dependencies m_floatDependency _Bool codemaker/source/cppumaker/dependencies.hxx:115 codemaker::cppumaker::Dependencies m_doubleDependency _Bool -comphelper/qa/container/comphelper_ifcontainer.cxx:45 - ContainerListener m_pStats struct ContainerStats * configmgr/source/components.cxx:164 configmgr::Components::WriteThread reference_ rtl::Reference<WriteThread> * connectivity/source/drivers/mork/MorkParser.hxx:133 @@ -144,6 +142,8 @@ cppu/source/uno/check.cxx:134 (anonymous namespace)::Char3 c3 char cppu/source/uno/check.cxx:138 (anonymous namespace)::Char4 chars struct (anonymous namespace)::Char3 +cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx:47 + ContainerListener m_pStats struct ContainerStats * cppuhelper/source/access_control.cxx:80 cppu::(anonymous namespace)::permission m_str1 rtl_uString * cppuhelper/source/access_control.cxx:81 @@ -152,8 +152,6 @@ cui/source/inc/cuihyperdlg.hxx:57 SvxHlinkCtrl aRdOnlyForwarder class SfxStatusForwarder cui/source/inc/cuihyperdlg.hxx:77 SvxHpLinkDlg maCtrl class SvxHlinkCtrl -cui/source/options/cfgchart.hxx:33 - SvxChartColorTable nNextElementNumber int dbaccess/source/core/dataaccess/documentdefinition.cxx:287 dbaccess::LifetimeCoupler m_xClient Reference<class com::sun::star::uno::XInterface> desktop/qa/desktop_lib/test_desktop_lib.cxx:178 @@ -202,8 +200,6 @@ emfio/inc/mtftools.hxx:128 emfio::LOGFONTW lfClipPrecision sal_uInt8 emfio/inc/mtftools.hxx:129 emfio::LOGFONTW lfQuality sal_uInt8 -emfio/inc/wmfreader.hxx:50 - emfio::WmfReader mnCurrentAction sal_uInt32 emfio/source/reader/emfreader.cxx:310 (anonymous namespace)::BLENDFUNCTION aBlendOperation unsigned char emfio/source/reader/emfreader.cxx:311 @@ -250,6 +246,8 @@ include/svx/bmpmask.hxx:130 SvxBmpMask aSelItem class SvxBmpMaskSelectItem include/svx/imapdlg.hxx:118 SvxIMapDlg aIMapItem class SvxIMapDlgItem +include/svx/svdobj.hxx:944 + SdrObject bNotMasterCachable _Bool include/vcl/opengl/OpenGLContext.hxx:41 GLWindow bMultiSampleSupported _Bool include/vcl/salnativewidgets.hxx:415 @@ -258,6 +256,8 @@ include/vcl/salnativewidgets.hxx:463 PushButtonValue mbBevelButton _Bool include/vcl/salnativewidgets.hxx:464 PushButtonValue mbSingleLine _Bool +include/xmloff/AutoStyleEntry.hxx:22 + xmloff::AutoStyleEntry m_nFamily sal_Int32 include/xmloff/shapeimport.hxx:180 SdXML3DSceneAttributesHelper mbVRPUsed _Bool include/xmloff/shapeimport.hxx:181 @@ -318,7 +318,7 @@ sc/inc/compiler.hxx:262 ScCompiler::AddInMap pEnglish const char * sc/inc/compiler.hxx:264 ScCompiler::AddInMap pUpper const char * -sc/inc/document.hxx:2509 +sc/inc/document.hxx:2527 ScMutationDisable mpDocument class ScDocument * sc/inc/pivot.hxx:75 ScDPLabelData mnFlags sal_Int32 @@ -384,8 +384,6 @@ sc/source/ui/inc/datastream.hxx:108 sc::DataStream mnSettings sal_uInt32 sc/source/ui/inc/preview.hxx:47 ScPreview nTabPage long -sc/source/ui/inc/tabvwsh.hxx:129 - ScTabViewShell pPivotSource class ScArea * sd/source/filter/eppt/eppt.hxx:142 PPTWriter mnTxId sal_uInt32 sd/source/filter/ppt/ppt97animations.hxx:41 @@ -402,8 +400,6 @@ sd/source/ui/sidebar/MasterPageContainerProviders.hxx:136 sd::sidebar::TemplatePreviewProvider msURL class rtl::OUString sd/source/ui/sidebar/SlideBackground.hxx:99 sd::sidebar::SlideBackground m_pContainer VclPtr<class VclVBox> -sfx2/inc/bitset.hxx:28 - IndexBitSet nCount sal_uInt16 sfx2/source/view/classificationcontroller.cxx:59 sfx2::ClassificationCategoriesController m_aPropertyListener class sfx2::ClassificationPropertyListener slideshow/source/engine/opengl/TransitionImpl.hxx:296 @@ -458,22 +454,20 @@ svx/source/svdraw/svdpdf.hxx:192 ImpSdrPdfImport mdPageWidthPts double svx/source/table/tablertfimporter.cxx:53 sdr::table::RTFCellDefault maItemSet class SfxItemSet -sw/inc/shellio.hxx:145 +sw/inc/shellio.hxx:146 SwReader aFileName class rtl::OUString sw/source/core/doc/tblafmt.cxx:185 SwAfVersions m_nVerticalAlignmentVersion sal_uInt16 -sw/source/core/inc/swfont.hxx:975 +sw/source/core/inc/swfont.hxx:973 SvStatistics nGetTextSize sal_uInt16 -sw/source/core/inc/swfont.hxx:976 +sw/source/core/inc/swfont.hxx:974 SvStatistics nDrawText sal_uInt16 -sw/source/core/inc/swfont.hxx:977 +sw/source/core/inc/swfont.hxx:975 SvStatistics nGetStretchTextSize sal_uInt16 -sw/source/core/inc/swfont.hxx:978 +sw/source/core/inc/swfont.hxx:976 SvStatistics nDrawStretchText sal_uInt16 -sw/source/core/inc/swfont.hxx:979 +sw/source/core/inc/swfont.hxx:977 SvStatistics nChangeFont sal_uInt16 -sw/source/core/text/xmldump.cxx:34 - XmlPortionDumper ofs TextFrameIndex sw/source/filter/html/htmlcss1.cxx:77 SwCSS1ItemIds nFormatBreak sal_uInt16 sw/source/filter/html/htmlcss1.cxx:78 @@ -487,7 +481,11 @@ sw/source/filter/inc/rtf.hxx:29 sw/source/filter/inc/rtf.hxx:30 RTFSurround::(anonymous union)::(anonymous) nJunk sal_uInt8 sw/source/filter/inc/rtf.hxx:31 - RTFSurround::(anonymous) Flags struct (anonymous struct at /home/noel/libo/sw/source/filter/inc/rtf.hxx:27:9) + RTFSurround::(anonymous) Flags struct (anonymous struct at /media/noel/disk2/libo4/sw/source/filter/inc/rtf.hxx:27:9) +sw/source/uibase/docvw/romenu.hxx:69 + SwReadOnlyPopup m_pImageMap class ImageMap * +sw/source/uibase/docvw/romenu.hxx:70 + SwReadOnlyPopup m_pTargetURL class INetImage * ucb/source/ucp/gio/gio_mount.hxx:46 OOoMountOperationClass parent_class GMountOperationClass ucb/source/ucp/gio/gio_mount.hxx:49 @@ -508,10 +506,6 @@ vcl/inc/opengl/RenderList.hxx:29 Vertex color glm::vec4 vcl/inc/opengl/RenderList.hxx:30 Vertex lineData glm::vec4 -vcl/inc/qt5/Qt5Frame.hxx:59 - Qt5Frame m_pSalMenu class Qt5Menu * -vcl/inc/qt5/Qt5Graphics.hxx:50 - Qt5Graphics m_pFontCollection class PhysicalFontCollection * vcl/inc/salmenu.hxx:34 SalItemParams nBits enum MenuItemBits vcl/inc/salmenu.hxx:42 @@ -542,8 +536,6 @@ vcl/inc/sft.hxx:461 vcl::TrueTypeFont mapper sal_uInt32 (*)(const sal_uInt8 *, sal_uInt32, sal_uInt32) vcl/inc/unx/gtk/gtkframe.hxx:215 GtkSalFrame m_nFloatFlags enum FloatWinPopupFlags -vcl/inc/window.h:293 - WindowImpl mnLockCount sal_uInt16 vcl/opengl/salbmp.cxx:435 (anonymous namespace)::ScanlineWriter mpCurrentScanline sal_uInt8 * vcl/source/filter/graphicfilter.cxx:1008 @@ -558,8 +550,8 @@ vcl/unx/generic/app/wmadaptor.cxx:1270 _mwmhints status unsigned long vcl/unx/gtk/a11y/atkwrapper.hxx:49 AtkObjectWrapper aParent AtkObject -vcl/unx/gtk/a11y/atkwrapper.hxx:80 - AtkObjectWrapperClass aParentClass AtkObjectClass +vcl/unx/gtk/a11y/atkwrapper.hxx:78 + AtkObjectWrapperClass aParentClass GtkWidgetAccessibleClass vcl/unx/gtk/gloactiongroup.cxx:28 GLOAction parent_instance GObject vcl/unx/gtk/glomenu.cxx:20 @@ -568,9 +560,7 @@ vcl/unx/gtk/hudawareness.cxx:20 (anonymous) connection GDBusConnection * vcl/unx/gtk/hudawareness.cxx:23 (anonymous) notify GDestroyNotify -vcl/unx/kde4/KDEXLib.hxx:49 - KDEXLib::SocketData pending YieldFunc -vcl/unx/kde4/KDEXLib.hxx:50 - KDEXLib::SocketData queued YieldFunc -writerfilter/source/dmapper/PropertyMap.hxx:198 +writerfilter/source/dmapper/DomainMapperTableManager.hxx:57 + writerfilter::dmapper::DomainMapperTableManager m_pTableStyleTextProperies writerfilter::dmapper::PropertyMapPtr +writerfilter/source/dmapper/PropertyMap.hxx:197 writerfilter::dmapper::SectionPropertyMap m_nDebugSectionNumber sal_Int32 diff --git a/include/oox/crypto/DocumentDecryption.hxx b/include/oox/crypto/DocumentDecryption.hxx index a18e94e10412..e32667760c9f 100644 --- a/include/oox/crypto/DocumentDecryption.hxx +++ b/include/oox/crypto/DocumentDecryption.hxx @@ -35,8 +35,6 @@ namespace core { class OOX_DLLPUBLIC DocumentDecryption { private: - css::uno::Reference< css::uno::XComponentContext > mxContext; - enum CryptoType { UNKNOWN, @@ -49,9 +47,7 @@ private: CryptoType mCryptoType; public: - DocumentDecryption( - oox::ole::OleStorage& rOleStorage, - css::uno::Reference< css::uno::XComponentContext > const & xContext); + DocumentDecryption(oox::ole::OleStorage& rOleStorage); bool decrypt(const css::uno::Reference< css::io::XStream >& xDocumentStream); bool readEncryptionInfo(); diff --git a/include/svx/colorbox.hxx b/include/svx/colorbox.hxx index 16baabb4ff3e..cedcbfff48a8 100644 --- a/include/svx/colorbox.hxx +++ b/include/svx/colorbox.hxx @@ -96,7 +96,6 @@ private: std::unique_ptr<ColorWindow> m_xColorWindow; std::unique_ptr<weld::MenuButton> m_xButton; weld::Window* m_pTopLevel; - Link<ColorListBox&, void> m_aSelectedLink; ListBoxColorWrapper m_aColorWrapper; Color m_aAutoDisplayColor; NamedColor m_aSelectedColor; diff --git a/include/svx/colorwindow.hxx b/include/svx/colorwindow.hxx index 7bfaa63466b4..1e92a543a2f8 100644 --- a/include/svx/colorwindow.hxx +++ b/include/svx/colorwindow.hxx @@ -115,7 +115,6 @@ private: std::unique_ptr<weld::Builder> m_xBuilder; const sal_uInt16 theSlotId; - OUString maCommand; weld::Window* mpParentWindow; weld::MenuButton* mpMenuButton; std::shared_ptr<PaletteManager> mxPaletteManager; @@ -133,7 +132,6 @@ private: std::unique_ptr<weld::CustomWeld> mxColorSetWin; std::unique_ptr<weld::CustomWeld> mxRecentColorSetWin; - Link<const NamedColor&, void> maSelectedLink; DECL_LINK(SelectHdl, SvtValueSet*, void); DECL_LINK(SelectPaletteHdl, weld::ComboBoxText&, void); DECL_LINK(AutoColorClickHdl, weld::Button&, void); diff --git a/include/svx/pagectrl.hxx b/include/svx/pagectrl.hxx index 4bd401049762..074c936328c6 100644 --- a/include/svx/pagectrl.hxx +++ b/include/svx/pagectrl.hxx @@ -41,10 +41,6 @@ private: long nLeft; long nRight; - bool bResetBackground; - bool bFrameDirection; - SvxFrameDirection nFrameDirection; - long nHdLeft; long nHdRight; long nHdDist; @@ -61,9 +57,6 @@ private: bool bFooter : 1; bool bHeader : 1; - bool bTable : 1; - bool bHorz : 1; - bool bVert : 1; SvxPageUsage eUsage; diff --git a/include/svx/paraprev.hxx b/include/svx/paraprev.hxx index 2c882e082be4..019cee94345e 100644 --- a/include/svx/paraprev.hxx +++ b/include/svx/paraprev.hxx @@ -38,21 +38,6 @@ enum class SvxPrevLineSpace class SVX_DLLPUBLIC SvxParaPrevWindow final : public vcl::Window { Size aSize; - - // indentation - long nLeftMargin; - long nRightMargin; - short nFirstLineOfst; - // distances - sal_uInt16 nUpper; - sal_uInt16 nLower; - // adjustment - SvxAdjust eAdjust; - // last line in justification - SvxAdjust eLastLine; - // line distance - SvxPrevLineSpace eLine; - OUString aText; tools::Rectangle Lines[9]; diff --git a/include/svx/relfld.hxx b/include/svx/relfld.hxx index 715f7e2c5287..63dd9178e889 100644 --- a/include/svx/relfld.hxx +++ b/include/svx/relfld.hxx @@ -28,14 +28,7 @@ class SVX_DLLPUBLIC SvxRelativeField : public MetricField { private: - sal_uInt16 nRelMin; - sal_uInt16 nRelMax; - bool bRelativeMode; bool bRelative; - bool bNegativeEnabled; - -protected: - void Modify() override; public: SvxRelativeField(vcl::Window* pParent, WinBits nBits, FieldUnit eUnit); diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx index 52183e78ecc1..5ae96300677d 100644 --- a/include/svx/svdobj.hxx +++ b/include/svx/svdobj.hxx @@ -944,7 +944,6 @@ protected: bool bIsEdge : 1; bool bIs3DObj : 1; bool bIsUnoObj : 1; - bool bNotMasterCachable : 1; // #i25616# bool mbLineIsOutsideGeometry : 1; // #i25616# diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx index e89b0b340e11..deb8e74477cf 100644 --- a/include/svx/svdotext.hxx +++ b/include/svx/svdotext.hxx @@ -251,7 +251,6 @@ protected: SdrOutliner& ImpGetDrawOutliner() const; private: - SVX_DLLPRIVATE void ImpCheckMasterCachable(); // #101029#: Extracted from ImpGetDrawOutliner() SVX_DLLPRIVATE void ImpInitDrawOutliner( SdrOutliner& rOutl ) const; // #101029#: Extracted from Paint() diff --git a/include/xmloff/AutoStyleEntry.hxx b/include/xmloff/AutoStyleEntry.hxx index c313aac15313..7cca2d868ef4 100644 --- a/include/xmloff/AutoStyleEntry.hxx +++ b/include/xmloff/AutoStyleEntry.hxx @@ -19,7 +19,6 @@ namespace xmloff { struct XMLOFF_DLLPUBLIC AutoStyleEntry { - sal_Int32 m_nFamily; OUString m_aParentName; OUString m_aName; std::vector<std::pair<OUString, css::uno::Any>> m_aXmlProperties; diff --git a/include/xmloff/txtparae.hxx b/include/xmloff/txtparae.hxx index 7bf35536156f..2322de350385 100644 --- a/include/xmloff/txtparae.hxx +++ b/include/xmloff/txtparae.hxx @@ -206,8 +206,6 @@ private: const OUString sTextFieldStart; const OUString sTextFieldEnd; const OUString sTextFieldStartEnd; - const OUString m_sBookmarkHidden; - const OUString m_sBookmarkCondition; protected: const OUString sFrameStyleName; diff --git a/oox/source/core/filterdetect.cxx b/oox/source/core/filterdetect.cxx index 805d2fb4b01d..0f1fe8625b7c 100644 --- a/oox/source/core/filterdetect.cxx +++ b/oox/source/core/filterdetect.cxx @@ -318,7 +318,7 @@ Reference< XInputStream > FilterDetect::extractUnencryptedPackage( MediaDescript { try { - DocumentDecryption aDecryptor(aOleStorage, mxContext); + DocumentDecryption aDecryptor(aOleStorage); if( aDecryptor.readEncryptionInfo() ) { diff --git a/oox/source/crypto/DocumentDecryption.cxx b/oox/source/crypto/DocumentDecryption.cxx index 16cc29551b21..a8462b657329 100644 --- a/oox/source/crypto/DocumentDecryption.cxx +++ b/oox/source/crypto/DocumentDecryption.cxx @@ -26,8 +26,7 @@ namespace core { using namespace css; -DocumentDecryption::DocumentDecryption(oox::ole::OleStorage& rOleStorage, uno::Reference<uno::XComponentContext> const & xContext) : - mxContext(xContext), +DocumentDecryption::DocumentDecryption(oox::ole::OleStorage& rOleStorage) : mrOleStorage(rOleStorage), mCryptoType(UNKNOWN) {} diff --git a/svtools/source/misc/transfer2.cxx b/svtools/source/misc/transfer2.cxx index f41163a729ba..fb4e1c694316 100644 --- a/svtools/source/misc/transfer2.cxx +++ b/svtools/source/misc/transfer2.cxx @@ -319,7 +319,6 @@ struct TransferDataContainer_Impl TDataCntnrEntryList aFmtList; Link<sal_Int8,void> aFinshedLnk; std::unique_ptr<INetBookmark> pBookmk; - std::unique_ptr<Graphic> pGrf; TransferDataContainer_Impl() { @@ -373,13 +372,6 @@ bool TransferDataContainer::GetData( bFnd = SetINetBookmark( *pImpl->pBookmk, rFlavor ); break; - case SotClipboardFormatId::SVXB: - case SotClipboardFormatId::PNG: - case SotClipboardFormatId::BITMAP: - case SotClipboardFormatId::GDIMETAFILE: - if( pImpl->pGrf ) - bFnd = SetGraphic( *pImpl->pGrf ); - break; default: break; } diff --git a/svx/source/dialog/pagectrl.cxx b/svx/source/dialog/pagectrl.cxx index 1daea5b6e7ba..a7e112d026a0 100644 --- a/svx/source/dialog/pagectrl.cxx +++ b/svx/source/dialog/pagectrl.cxx @@ -46,10 +46,6 @@ SvxPageWindow::SvxPageWindow(vcl::Window* pParent) nLeft(0), nRight(0), - bResetBackground(false), - bFrameDirection(false), - nFrameDirection(SvxFrameDirection::Horizontal_LR_TB), - nHdLeft(0), nHdRight(0), nHdDist(0), @@ -66,9 +62,7 @@ SvxPageWindow::SvxPageWindow(vcl::Window* pParent) bFooter(false), bHeader(false), - bTable(false), - bHorz(false), - bVert(false), + eUsage(SvxPageUsage::All) { // Count in Twips by default @@ -148,15 +142,12 @@ void SvxPageWindow::DrawPage(vcl::RenderContext& rRenderContext, const Point& rO const Color& rDlgColor = rStyleSettings.GetDialogColor(); // background - if (!bSecond || bResetBackground) + if (!bSecond) { rRenderContext.SetLineColor(COL_TRANSPARENT); rRenderContext.SetFillColor(rDlgColor); Size winSize(rRenderContext.GetOutputSize()); rRenderContext.DrawRect(tools::Rectangle(Point(0,0), winSize)); - - if (bResetBackground) - bResetBackground = false; } rRenderContext.SetLineColor(rFieldTextColor); @@ -235,101 +226,6 @@ void SvxPageWindow::DrawPage(vcl::RenderContext& rRenderContext, const Point& rO // draw PageFill and outline drawFillAttributes(rRenderContext, maPageFillAttributes, aRect, aRect); } - - if (bFrameDirection && !bTable) - { - Point aPos; - vcl::Font aFont(rRenderContext.GetFont()); - const Size aSaveSize = aFont.GetFontSize(); - Size aDrawSize(0,aRect.GetHeight() / 6); - aFont.SetFontSize(aDrawSize); - rRenderContext.SetFont(aFont); - OUString sText("ABC"); - Point aMove(1, rRenderContext.GetTextHeight()); - sal_Unicode cArrow = 0x2193; - long nAWidth = rRenderContext.GetTextWidth(sText.copy(0,1)); - switch (nFrameDirection) - { - case SvxFrameDirection::Horizontal_LR_TB: - aPos = aRect.TopLeft(); - aPos.AdjustX(PixelToLogic(Point(1,1)).X() ); - aMove.setY( 0 ); - cArrow = 0x2192; - break; - case SvxFrameDirection::Horizontal_RL_TB: - aPos = aRect.TopRight(); - aPos.AdjustX( -nAWidth ); - aMove.setY( 0 ); - aMove.setX( aMove.X() * -1 ); - cArrow = 0x2190; - break; - case SvxFrameDirection::Vertical_LR_TB: - aPos = aRect.TopLeft(); - aPos.AdjustX(rRenderContext.PixelToLogic(Point(1,1)).X() ); - aMove.setX( 0 ); - break; - case SvxFrameDirection::Vertical_RL_TB: - aPos = aRect.TopRight(); - aPos.AdjustX( -nAWidth ); - aMove.setX( 0 ); - break; - default: break; - } - sText += OUStringLiteral1(cArrow); - for (sal_Int32 i = 0; i < sText.getLength(); i++) - { - OUString sDraw(sText.copy(i,1)); - long nHDiff = 0; - long nCharWidth = GetTextWidth(sDraw); - bool bHorizontal = 0 == aMove.Y(); - if (!bHorizontal) - { - nHDiff = (nAWidth - nCharWidth) / 2; - aPos.AdjustX(nHDiff ); - } - rRenderContext.DrawText(aPos,sDraw); - if (bHorizontal) - { - aPos.AdjustX(aMove.X() < 0 ? -nCharWidth : nCharWidth ); - } - else - { - aPos.AdjustX( -nHDiff ); - aPos.AdjustY(aMove.Y() ); - } - } - aFont.SetFontSize(aSaveSize); - rRenderContext.SetFont(aFont); - - } - if (bTable) - { - // Paint Table, if necessary center it - rRenderContext.SetLineColor(COL_LIGHTGRAY); - - long nW = aRect.GetWidth(); - long nH = aRect.GetHeight(); - long const nTW = CELL_WIDTH * 3; - long const nTH = CELL_HEIGHT * 3; - long _nLeft = bHorz ? aRect.Left() + ((nW - nTW) / 2) : aRect.Left(); - long _nTop = bVert ? aRect.Top() + ((nH - nTH) / 2) : aRect.Top(); - tools::Rectangle aCellRect(Point(_nLeft, _nTop),Size(CELL_WIDTH, CELL_HEIGHT)); - - for (sal_uInt16 i = 0; i < 3; ++i) - { - aCellRect.SetLeft( _nLeft ); - aCellRect.SetRight( _nLeft + CELL_WIDTH ); - if(i > 0) - aCellRect.Move(0,CELL_HEIGHT); - - for (sal_uInt16 j = 0; j < 3; ++j) - { - if (j > 0) - aCellRect.Move(CELL_WIDTH,0); - rRenderContext.DrawRect(aCellRect); - } - } - } } void SvxPageWindow::drawFillAttributes(vcl::RenderContext& rRenderContext, diff --git a/svx/source/dialog/paraprev.cxx b/svx/source/dialog/paraprev.cxx index 3a4d2bd14651..5291fe0ac9a7 100644 --- a/svx/source/dialog/paraprev.cxx +++ b/svx/source/dialog/paraprev.cxx @@ -23,15 +23,7 @@ #include <vcl/settings.hxx> SvxParaPrevWindow::SvxParaPrevWindow( vcl::Window* pParent, WinBits nBits) : - Window( pParent, nBits), - nLeftMargin ( 0 ), - nRightMargin ( 0 ), - nFirstLineOfst ( 0 ), - nUpper ( 0 ), - nLower ( 0 ), - eAdjust ( SvxAdjust::Left ), - eLastLine ( SvxAdjust::Left ), - eLine ( SvxPrevLineSpace::N1 ) + Window( pParent, nBits) { // Count in Twips by default SetMapMode(MapMode(MapUnit::MapTwip)); @@ -83,57 +75,10 @@ void SvxParaPrevWindow::DrawParagraph(vcl::RenderContext& rRenderContext) for (sal_uInt16 i = 0; i < 9; ++i) { if (i == 3) - { rRenderContext.SetFillColor(COL_GRAY); - auto nTop = nUpper * aLineSiz.Height() / aSize.Height(); - aPnt.AdjustY(nTop * 2 ); - } - - if (i == 6 ) + else if (i == 6 ) rRenderContext.SetFillColor(aGrayColor); - if (3 <= i && 6 > i) - { - long nLeft = nLeftMargin * aLineSiz.Width() / aSize.Width(); - long nFirst = nFirstLineOfst * aLineSiz.Width() / aSize.Width(); - long nTmp = nLeft + nFirst; - - if (i == 3) - { - aPnt.AdjustX(nTmp ); - aSiz.AdjustWidth( -nTmp ); - } - else - { - aPnt.AdjustX(nLeft ); - aSiz.AdjustWidth( -nLeft ); - } - long nRight = nRightMargin * aLineSiz.Width() / aSize.Width(); - aSiz.AdjustWidth( -nRight ); - } - - if (4 == i || 5 == i || 6 == i) - { - switch (eLine) - { - case SvxPrevLineSpace::N1: - break; - case SvxPrevLineSpace::N115: - aPnt.AdjustY(nH / 6.67 ); // 1/.15 = 6.(6) - break; - case SvxPrevLineSpace::N15: - aPnt.AdjustY(nH / 2 ); - break; - case SvxPrevLineSpace::N2: - aPnt.AdjustY(nH ); - break; - case SvxPrevLineSpace::Prop: - case SvxPrevLineSpace::Min: - case SvxPrevLineSpace::Leading: - break; - } - } - aPnt.AdjustY(nH ); if (3 <= i && 5 >= i) @@ -155,41 +100,6 @@ void SvxParaPrevWindow::DrawParagraph(vcl::RenderContext& rRenderContext) if (nLW > aSiz.Width()) nLW = aSiz.Width(); - switch (eAdjust) - { - case SvxAdjust::Left: - break; - case SvxAdjust::Right: - aPnt.AdjustX( aSiz.Width() - nLW ); - break; - case SvxAdjust::Center: - aPnt.AdjustX(( aSiz.Width() - nLW ) / 2 ); - break; - default: ; //prevent warning - } - if (SvxAdjust::Block == eAdjust) - { - if(5 == i) - { - switch( eLastLine ) - { - case SvxAdjust::Left: - break; - case SvxAdjust::Right: - aPnt.AdjustX( aSiz.Width() - nLW ); - break; - case SvxAdjust::Center: - aPnt.AdjustX(( aSiz.Width() - nLW ) / 2 ); - break; - case SvxAdjust::Block: - nLW = aSiz.Width(); - break; - default: ; //prevent warning - } - } - else - nLW = aSiz.Width(); - } aSiz.setWidth( nLW ); } @@ -198,12 +108,6 @@ void SvxParaPrevWindow::DrawParagraph(vcl::RenderContext& rRenderContext) rRenderContext.DrawRect( aRect ); Lines[i] = aRect; - if (5 == i) - { - auto nBottom = nLower * aLineSiz.Height() / aSize.Height(); - aPnt.AdjustY(nBottom * 2 ); - } - aPnt.AdjustY(nH ); // Reset, recalculate for each line aPnt.setX( DEF_MARGIN / 2 ); diff --git a/svx/source/dialog/relfld.cxx b/svx/source/dialog/relfld.cxx index 659dde82529c..26d3aca05138 100644 --- a/svx/source/dialog/relfld.cxx +++ b/svx/source/dialog/relfld.cxx @@ -23,12 +23,7 @@ SvxRelativeField::SvxRelativeField( vcl::Window *const pParent, WinBits const nBits, FieldUnit const eUnit) : MetricField( pParent, nBits) - , nRelMin(0) - , nRelMax(0) - , bRelativeMode(false) , bRelative(false) - , bNegativeEnabled(false) - { SetUnit(eUnit); SetDecimalDigits( 2 ); @@ -46,44 +41,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void makeSvxRelativeField(VclPtr<vcl::Window> & eUnit); } -void SvxRelativeField::Modify() -{ - MetricField::Modify(); - - if ( bRelativeMode ) - { - OUString aStr = GetText(); - bool bNewMode = bRelative; - - if ( bRelative ) - { - const sal_Unicode* pStr = aStr.getStr(); - - while ( *pStr ) - { - if( ( ( *pStr < '0' ) || ( *pStr > '9' ) ) && - ( *pStr != '%' ) ) - { - bNewMode = false; - break; - } - pStr++; - } - } - else - { - if ( aStr.indexOf( "%" ) != -1 ) - bNewMode = true; - } - - if ( bNewMode != bRelative ) - SetRelative( bNewMode ); - - MetricField::Modify(); - } -} - - void SvxRelativeField::SetRelative( bool bNewRelative ) { Selection aSelection = GetSelection(); @@ -93,15 +50,15 @@ void SvxRelativeField::SetRelative( bool bNewRelative ) { bRelative = true; SetDecimalDigits( 0 ); - SetMin( nRelMin ); - SetMax( nRelMax ); + SetMin( 0 ); + SetMax( 0 ); SetUnit( FUNIT_PERCENT ); } else { bRelative = false; SetDecimalDigits( 2 ); - SetMin( bNegativeEnabled ? -9999 : 0 ); + SetMin( 0 ); SetMax( 9999 ); SetUnit( FUNIT_CM ); } diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index 89cee38cde37..0559d7516666 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -368,7 +368,6 @@ SdrObject::SdrObject(SdrModel& rSdrModel) // #i25616# mbSupportTextIndentingOnLineWidthChange = false; - bNotMasterCachable=false; bIsEdge=false; bIs3DObj=false; bMarkProt=false; @@ -997,7 +996,6 @@ SdrObject& SdrObject::operator=(const SdrObject& rObj) bEmptyPresObj =rObj.bEmptyPresObj; bNotVisibleAsMaster=rObj.bNotVisibleAsMaster; bSnapRectDirty=true; - bNotMasterCachable=rObj.bNotMasterCachable; pPlusData.reset(); if (rObj.pPlusData!=nullptr) { pPlusData.reset(rObj.pPlusData->Clone(this)); diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index d40dadb35131..3c4ee03d89b3 100644 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -1131,22 +1131,6 @@ Point SdrTextObj::GetSnapPoint(sal_uInt32 i) const return aP; } -void SdrTextObj::ImpCheckMasterCachable() -{ - bNotMasterCachable=false; - - OutlinerParaObject* pOutlinerParaObject = GetOutlinerParaObject(); - - if(!bNotVisibleAsMaster && pOutlinerParaObject && pOutlinerParaObject->IsEditDoc() ) - { - const EditTextObject& rText= pOutlinerParaObject->GetTextObject(); - bNotMasterCachable = rText.HasField(SvxPageField::CLASS_ID) - || rText.HasField(SvxHeaderField::CLASS_ID) - || rText.HasField(SvxFooterField::CLASS_ID) - || rText.HasField(SvxDateTimeField::CLASS_ID); - } -} - // Extracted from ImpGetDrawOutliner() void SdrTextObj::ImpInitDrawOutliner( SdrOutliner& rOutl ) const { @@ -1421,7 +1405,6 @@ void SdrTextObj::NbcSetOutlinerParaObjectForText( std::unique_ptr<OutlinerParaOb ActionChanged(); ImpSetTextStyleSheetListeners(); - ImpCheckMasterCachable(); } void SdrTextObj::NbcReformatText() diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index fb6a29b6a997..e2db0bfbd3a6 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -1461,12 +1461,6 @@ ColorWindow::ColorWindow(std::shared_ptr<PaletteManager> const & rPaletteManager mxRecentColorSet->set_size_request(aSize.Width(), aSize.Height()); AddStatusListener( ".uno:ColorTableState" ); - AddStatusListener( maCommand ); - if ( maCommand == ".uno:FrameLineColor" ) - { - AddStatusListener( ".uno:BorderTLBR" ); - AddStatusListener( ".uno:BorderBLTR" ); - } } void SvxColorWindow::ShowNoneButton() @@ -1625,9 +1619,7 @@ IMPL_LINK(ColorWindow, SelectHdl, SvtValueSet*, pColorSet, void) if (mpMenuButton->get_active()) mpMenuButton->set_active(false); - maSelectedLink.Call(aNamedColor); - - maColorSelectFunction(maCommand, aNamedColor); + maColorSelectFunction(OUString(), aNamedColor); } IMPL_LINK_NOARG(SvxColorWindow, SelectPaletteHdl, ListBox&, void) @@ -1681,9 +1673,7 @@ IMPL_LINK(ColorWindow, AutoColorClickHdl, weld::Button&, rButton, void) if (mpMenuButton->get_active()) mpMenuButton->set_active(false); - maSelectedLink.Call(aNamedColor); - - maColorSelectFunction(maCommand, aNamedColor); + maColorSelectFunction(OUString(), aNamedColor); } IMPL_LINK_NOARG(SvxColorWindow, OpenPickerClickHdl, Button*, void) @@ -1710,7 +1700,7 @@ IMPL_LINK_NOARG(ColorWindow, OpenPickerClickHdl, weld::Button&, void) { if (mpMenuButton->get_active()) mpMenuButton->set_active(false); - mxPaletteManager->PopupColorPicker(mpParentWindow, maCommand, GetSelectEntryColor().first); + mxPaletteManager->PopupColorPicker(mpParentWindow, OUString(), GetSelectEntryColor().first); } void SvxColorWindow::StartSelection() @@ -3806,8 +3796,6 @@ void ColorListBox::Selected(const NamedColor& rColor) { ShowPreview(rColor); m_aSelectedColor = rColor; - if (m_aSelectedLink.IsSet()) - m_aSelectedLink.Call(*this); } //to avoid the box resizing every time the color is changed to diff --git a/sw/source/uibase/docvw/romenu.cxx b/sw/source/uibase/docvw/romenu.cxx index 3b56c4b2fb29..0cb03faa3364 100644 --- a/sw/source/uibase/docvw/romenu.cxx +++ b/sw/source/uibase/docvw/romenu.cxx @@ -52,8 +52,6 @@ using namespace ::sfx2; SwReadOnlyPopup::~SwReadOnlyPopup() { - delete m_pImageMap; - delete m_pTargetURL; m_xMenu.disposeAndClear(); } @@ -109,8 +107,6 @@ SwReadOnlyPopup::SwReadOnlyPopup(const Point &rDPos, SwView &rV) , m_rView(rV) , m_aBrushItem(RES_BACKGROUND) , m_rDocPos(rDPos) - , m_pImageMap(nullptr) - , m_pTargetURL(nullptr) { m_bGrfToGalleryAsLnk = SW_MOD()->GetModuleConfig()->IsGrfToGalleryAsLnk(); SwWrtShell &rSh = m_rView.GetWrtShell(); @@ -136,19 +132,6 @@ SwReadOnlyPopup::SwReadOnlyPopup(const Point &rDPos, SwView &rV) else { m_aGraphic = *pGrf; - const SwFrameFormat* pGrfFormat = rSh.GetFormatFromObj( m_rDocPos ); - const SfxPoolItem* pURLItem; - if( pGrfFormat && SfxItemState::SET == pGrfFormat->GetItemState( - RES_URL, true, &pURLItem )) - { - const SwFormatURL& rURL = *static_cast<const SwFormatURL*>(pURLItem); - if( rURL.GetMap() ) - m_pImageMap = new ImageMap( *rURL.GetMap() ); - else if( !rURL.GetURL().isEmpty() ) - m_pTargetURL = new INetImage( bLink ? m_sGrfName : OUString(), - rURL.GetURL(), - rURL.GetTargetFrameName() ); - } } bool bEnableGraphicToGallery = bLink; diff --git a/sw/source/uibase/docvw/romenu.hxx b/sw/source/uibase/docvw/romenu.hxx index 06ac4ee3536b..78d592165450 100644 --- a/sw/source/uibase/docvw/romenu.hxx +++ b/sw/source/uibase/docvw/romenu.hxx @@ -66,8 +66,6 @@ class SwReadOnlyPopup OUString m_sGrfName; std::vector<OUString> m_aThemeList; bool m_bGrfToGalleryAsLnk; - ImageMap* m_pImageMap; - INetImage* m_pTargetURL; void Check( sal_uInt16 nMID, sal_uInt16 nSID, SfxDispatcher const &rDis ); OUString SaveGraphic( sal_uInt16 nId ); diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx index 633eca7e987b..10c252c764b8 100644 --- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx @@ -761,7 +761,6 @@ void DomainMapperTableManager::clearData() { m_nRow = m_nHeaderRepeat = m_nTableWidth = m_nLayoutType = 0; m_sTableStyleName.clear(); - m_pTableStyleTextProperies.clear(); } }} diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.hxx b/writerfilter/source/dmapper/DomainMapperTableManager.hxx index 48c5f8fee3ea..b9970f6a6b42 100644 --- a/writerfilter/source/dmapper/DomainMapperTableManager.hxx +++ b/writerfilter/source/dmapper/DomainMapperTableManager.hxx @@ -54,7 +54,6 @@ class DomainMapperTableManager : public TableManager std::vector< TablePositionHandlerPtr > m_aTablePositions; std::vector< TablePositionHandlerPtr > m_aTmpPosition; ///< Temporarily stores the position to compare it later std::vector< TablePropertyMapPtr > m_aTmpTableProperties; ///< Temporarily stores the table properties until end of row - PropertyMapPtr m_pTableStyleTextProperies; ::std::vector< IntVectorPtr > m_aTableGrid; ::std::vector< IntVectorPtr > m_aGridSpans; diff --git a/xmloff/source/style/impastpl.cxx b/xmloff/source/style/impastpl.cxx index 547a4834ea6e..67965fac188e 100644 --- a/xmloff/source/style/impastpl.cxx +++ b/xmloff/source/style/impastpl.cxx @@ -599,14 +599,12 @@ std::vector<xmloff::AutoStyleEntry> SvXMLAutoStylePoolP_Impl::GetAutoStyleEntrie for (std::unique_ptr<XMLAutoStyleFamily> const & rFamily : m_FamilySet) { rtl::Reference<XMLPropertySetMapper> aPropertyMapper = rFamily->mxMapper->getPropertySetMapper(); - sal_Int32 nFamily = rFamily->mnFamily; for (auto const & rParent : rFamily->m_ParentSet) { for (auto const & rProperty : rParent->GetPropertiesList()) { rReturnVector.emplace_back(); xmloff::AutoStyleEntry & rEntry = rReturnVector.back(); - rEntry.m_nFamily = nFamily; rEntry.m_aParentName = rParent->GetParent(); rEntry.m_aName = rProperty->GetName(); for (XMLPropertyState const & rPropertyState : rProperty->GetProperties()) diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx index e221bd766bfb..1f06a8eec257 100644 --- a/xmloff/source/text/txtparae.cxx +++ b/xmloff/source/text/txtparae.cxx @@ -1250,8 +1250,6 @@ XMLTextParagraphExport::XMLTextParagraphExport( sTextFieldStart( "TextFieldStart" ), sTextFieldEnd( "TextFieldEnd" ), sTextFieldStartEnd( "TextFieldStartEnd" ), - m_sBookmarkHidden("BookmarkHidden"), - m_sBookmarkCondition("BookmarkCondition"), sFrameStyleName("FrameStyleName"), aCharStyleNamesPropInfoCache( sCharStyleNames ) { |