diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-05-15 11:27:44 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-05-16 08:45:17 +0200 |
| commit | 98c4cd372bf0e9d4b5b129405f5af4562d8a0f64 (patch) | |
| tree | f3aae749f01d0453a227b922a6ad3217171700d7 | |
| parent | 666901bc82fab69f9a80b564f97b5456d0ef684e (diff) | |
loplugin:unusedfields improve write-only analysis
by whitelisting a couple of methods we know only write to their
parameters
Change-Id: Id7aef9c03c23d10c27707b21eb9a0db4a6c2757c
Reviewed-on: https://gerrit.libreoffice.org/37647
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
48 files changed, 82 insertions, 392 deletions
diff --git a/chart2/source/inc/MediaDescriptorHelper.hxx b/chart2/source/inc/MediaDescriptorHelper.hxx index f0180640c716..488a31851b25 100644 --- a/chart2/source/inc/MediaDescriptorHelper.hxx +++ b/chart2/source/inc/MediaDescriptorHelper.hxx @@ -71,30 +71,15 @@ public: //@todo define this for debug only, except URL bool AsTemplate; //document is a template. bool ISSET_AsTemplate; - OUString Author; - bool ISSET_Author; - OUString CharacterSet; //identifier of used character set. - bool ISSET_CharacterSet; - OUString Comment; - bool ISSET_Comment; css::uno::Any ComponentData; bool ISSET_ComponentData; - OUString FileName; //deprecated, same as url - bool ISSET_FileName; css::uno::Any FilterData; bool ISSET_FilterData; OUString FilterName; //internal filter name. bool ISSET_FilterName; - OUString FilterFlags;//deprecated, - bool ISSET_FilterFlags; - OUString FilterOptions; - bool ISSET_FilterOptions; - //not documented ... @todo remove? - OUString FrameName; //name of target frame. - bool ISSET_FrameName; bool Hidden; //load document, invisible. bool ISSET_Hidden; @@ -107,50 +92,20 @@ public: css::uno::Reference< css::io::XInputStream > InputStream; //content of document. bool ISSET_InputStream; - css::uno::Reference< css::uno::XInterface > - InteractionHandler; //css::task::XInteractionHandler - bool ISSET_InteractionHandler; - - OUString JumpMark; //specifies the name of a mark within the document where the first view is to position itself. - bool ISSET_JumpMark; - OUString MediaType; //mime type. - bool ISSET_MediaType; - OUString OpenFlags; //deprecated - bool ISSET_OpenFlags; + bool OpenNewView; //opens a new view for an already loaded document. bool ISSET_OpenNewView; bool Overwrite; //opens a new view for an already loaded document. bool ISSET_Overwrite; - OUString Password; - bool ISSET_Password; - //not documented ... @todo remove? - css::awt::Rectangle - PosSize; //position and size of document window. - bool ISSET_PosSize; - - css::uno::Sequence< sal_Int8 > - PostData; //contains the data for HTTP post method as a sequence of bytes. - bool ISSET_PostData; - OUString PostString; //deprecated, contains the data for HTTP post method as a sequence of bytes. - bool ISSET_PostString; bool Preview; //show preview. bool ISSET_Preview; bool ReadOnly; //open document readonly. bool ISSET_ReadOnly; - OUString Referer; //name of document referrer. - bool ISSET_Referer; - css::uno::Reference< css::uno::XInterface > - StatusIndicator; //css::task::XStatusIndicator - bool ISSET_StatusIndicator; //not documented ... @todo remove? bool Silent; //prevents dialogs to query for more information. bool ISSET_Silent; - OUString TemplateName; //deprecated, name of the template instead of the URL. - bool ISSET_TemplateName; - OUString TemplateRegionName; //deprecated, name of the region of the template. - bool ISSET_TemplateRegionName; bool Unpacked; bool ISSET_Unpacked; OUString URL;// FileName, URL of the document. @@ -172,10 +127,6 @@ public: Stream; bool ISSET_Stream; - // undocumented SFX Properties - css::uno::Sequence< sal_Int32 > - WinExtent; - bool ISSET_WinExtent; bool SetEmbedded; bool ISSET_SetEmbedded; diff --git a/chart2/source/tools/MediaDescriptorHelper.cxx b/chart2/source/tools/MediaDescriptorHelper.cxx index b964efaa2b87..fda1f0d442f6 100644 --- a/chart2/source/tools/MediaDescriptorHelper.cxx +++ b/chart2/source/tools/MediaDescriptorHelper.cxx @@ -66,17 +66,14 @@ MediaDescriptorHelper::MediaDescriptorHelper( const uno::Sequence< } else if (rProp.Name == "Author") { - ISSET_Author = rProp.Value >>= Author; addModelProp(rProp); } else if (rProp.Name == "CharacterSet") { - ISSET_CharacterSet = rProp.Value >>= CharacterSet; addModelProp(rProp); } else if (rProp.Name == "Comment") { - ISSET_Comment = rProp.Value >>= Comment; addModelProp(rProp); } else if (rProp.Name == "ComponentData") @@ -87,7 +84,6 @@ MediaDescriptorHelper::MediaDescriptorHelper( const uno::Sequence< } else if (rProp.Name == "FileName") { - ISSET_FileName = rProp.Value >>= FileName; addDepreciatedProp(rProp); } else if (rProp.Name == "FilterData") @@ -103,17 +99,14 @@ MediaDescriptorHelper::MediaDescriptorHelper( const uno::Sequence< } else if (rProp.Name == "FilterFlags") { - ISSET_FilterFlags = rProp.Value >>= FilterFlags; addDepreciatedProp(rProp); } else if (rProp.Name == "FilterOptions") { - ISSET_FilterOptions = rProp.Value >>= FilterOptions; addModelProp(rProp); } else if (rProp.Name == "FrameName") { - ISSET_FrameName = rProp.Value >>= FrameName; addModelProp(rProp); } else if (rProp.Name == "Hidden") @@ -138,22 +131,18 @@ MediaDescriptorHelper::MediaDescriptorHelper( const uno::Sequence< } else if (rProp.Name == "InteractionHandler") { - ISSET_InteractionHandler = rProp.Value >>= InteractionHandler; addRegularProp(rProp); } else if (rProp.Name == "JumpMark") { - ISSET_JumpMark = rProp.Value >>= JumpMark; addRegularProp(rProp); } else if (rProp.Name == "MediaType") { - ISSET_MediaType = rProp.Value >>= MediaType; addModelProp(rProp); } else if (rProp.Name == "OpenFlags") { - ISSET_OpenFlags = rProp.Value >>= OpenFlags; addDepreciatedProp(rProp); } else if (rProp.Name == "OpenNewView") @@ -168,22 +157,18 @@ MediaDescriptorHelper::MediaDescriptorHelper( const uno::Sequence< } else if (rProp.Name == "Password") { - ISSET_Password = rProp.Value >>= Password; addModelProp(rProp); } else if (rProp.Name == "PosSize") { - ISSET_PosSize = rProp.Value >>= PosSize; addRegularProp(rProp); } else if (rProp.Name == "PostData") { - ISSET_PostData = rProp.Value >>= PostData; addRegularProp(rProp); } else if (rProp.Name == "PostString") { - ISSET_PostString = rProp.Value >>= PostString; addDepreciatedProp(rProp); } else if (rProp.Name == "Preview") @@ -198,7 +183,6 @@ MediaDescriptorHelper::MediaDescriptorHelper( const uno::Sequence< } else if (rProp.Name == "Referer") { - ISSET_Referer = rProp.Value >>= Referer; addModelProp(rProp); } else if (rProp.Name == "SetEmbedded") @@ -213,7 +197,6 @@ MediaDescriptorHelper::MediaDescriptorHelper( const uno::Sequence< } else if (rProp.Name == "StatusIndicator") { - ISSET_StatusIndicator = rProp.Value >>= StatusIndicator; addRegularProp(rProp); } else if (rProp.Name == "Storage") @@ -228,12 +211,10 @@ MediaDescriptorHelper::MediaDescriptorHelper( const uno::Sequence< } else if (rProp.Name == "TemplateName") { - ISSET_TemplateName = rProp.Value >>= TemplateName; addDepreciatedProp(rProp); } else if (rProp.Name == "TemplateRegionName") { - ISSET_TemplateRegionName = rProp.Value >>= TemplateRegionName; addDepreciatedProp(rProp); } else if (rProp.Name == "Unpacked") @@ -264,7 +245,6 @@ MediaDescriptorHelper::MediaDescriptorHelper( const uno::Sequence< } else if (rProp.Name == "WinExtent") { - ISSET_WinExtent = rProp.Value >>= WinExtent; addDepreciatedProp(rProp); } else @@ -285,65 +265,37 @@ void MediaDescriptorHelper::impl_init() AsTemplate = false; ISSET_AsTemplate = false; - ISSET_Author = false; - ISSET_CharacterSet = false; - ISSET_Comment = false; - -// css::uno::Any ComponentData; ISSET_ComponentData = false; - ISSET_FileName = false; -// css::uno::Any FilterData; ISSET_FilterData = false; ISSET_FilterName = false; - ISSET_FilterFlags = false; - ISSET_FilterOptions = false; - ISSET_FrameName = false; Hidden = false; ISSET_Hidden = false; ISSET_HierarchicalDocumentName = false; ISSET_OutputStream = false; ISSET_InputStream = false; - ISSET_InteractionHandler = false; - ISSET_JumpMark = false; - ISSET_MediaType = false; - ISSET_OpenFlags = false; OpenNewView = false; ISSET_OpenNewView = false; Overwrite = false; ISSET_Overwrite = false; - ISSET_Password = false; - -// css::awt::Rectangle PosSize; - ISSET_PosSize = false; -// css::uno::Sequence< sal_Int8 > PostData; - ISSET_PostData = false; - ISSET_PostString = false; Preview = false; ISSET_Preview = false; ReadOnly = false; ISSET_ReadOnly = false; - ISSET_Referer = false; - ISSET_StatusIndicator = false; Silent = false; ISSET_Silent = false; - ISSET_TemplateName = false; - ISSET_TemplateRegionName = false; Unpacked = false; ISSET_Unpacked = false; ISSET_URL = false; Version = 0; ISSET_Version = false; -// css::uno::Any ViewData; ISSET_ViewData = false; ViewId = 0; ISSET_ViewId = false; - ISSET_WinExtent = false; - SetEmbedded = false; ISSET_SetEmbedded = false; diff --git a/compilerplugins/clang/unusedfields.cxx b/compilerplugins/clang/unusedfields.cxx index 1f9273a5a157..d3177e21ad24 100644 --- a/compilerplugins/clang/unusedfields.cxx +++ b/compilerplugins/clang/unusedfields.cxx @@ -12,6 +12,7 @@ #include <iostream> #include <fstream> #include <set> +#include <algorithm> #include "plugin.hxx" #include "compat.hxx" @@ -181,6 +182,13 @@ bool UnusedFields::VisitFieldDecl( const FieldDecl* fieldDecl ) return true; } +static char easytolower(char in) +{ + if (in<='Z' && in>='A') + return in-('Z'-'z'); + return in; +} + bool UnusedFields::VisitMemberExpr( const MemberExpr* memberExpr ) { const ValueDecl* decl = memberExpr->getMemberDecl(); @@ -236,7 +244,25 @@ bool UnusedFields::VisitMemberExpr( const MemberExpr* memberExpr ) bPotentiallyReadFrom = dyn_cast<DoStmt>(parent)->getCond() == child; break; } - else if (isa<ReturnStmt>(parent) || isa<CXXConstructExpr>(parent) || isa<CallExpr>(parent) + else if (auto callExpr = dyn_cast<CallExpr>(parent)) + { + // check for calls to ReadXXX() type methods and the operator>>= methods on Any. + const FunctionDecl * calleeFunctionDecl = callExpr->getDirectCallee(); + if (calleeFunctionDecl) + { + std::string name = calleeFunctionDecl->getQualifiedNameAsString(); + std::transform(name.begin(), name.end(), name.begin(), easytolower); + if (name.find("read") != std::string::npos || name.find(">>=") != std::string::npos) + // this is a write-only call + ; + else + bPotentiallyReadFrom = true; + } + else + bPotentiallyReadFrom = true; + break; + } + else if (isa<ReturnStmt>(parent) || isa<CXXConstructExpr>(parent) || isa<ConditionalOperator>(parent) || isa<SwitchStmt>(parent) || isa<ArraySubscriptExpr>(parent) || isa<DeclStmt>(parent) || isa<WhileStmt>(parent) || isa<CXXNewExpr>(parent) || isa<ForStmt>(parent) || isa<InitListExpr>(parent) diff --git a/compilerplugins/clang/unusedfields.untouched.results b/compilerplugins/clang/unusedfields.untouched.results index a846df2d7af8..fd926f78535f 100644 --- a/compilerplugins/clang/unusedfields.untouched.results +++ b/compilerplugins/clang/unusedfields.untouched.results @@ -38,36 +38,6 @@ compilerplugins/clang/test/unnecessaryoverride-dtor.hxx:42 IncludedDerived3 m rtl::Reference<Incomplete> connectivity/source/drivers/mork/MDatabaseMetaData.hxx:29 connectivity::mork::ODatabaseMetaData m_pMetaDataHelper std::unique_ptr<MDatabaseMetaDataHelper> -connectivity/source/inc/OTypeInfo.hxx:31 - connectivity::OTypeInfo aTypeName class rtl::OUString -connectivity/source/inc/OTypeInfo.hxx:32 - connectivity::OTypeInfo aLiteralPrefix class rtl::OUString -connectivity/source/inc/OTypeInfo.hxx:33 - connectivity::OTypeInfo aLiteralSuffix class rtl::OUString -connectivity/source/inc/OTypeInfo.hxx:34 - connectivity::OTypeInfo aCreateParams class rtl::OUString -connectivity/source/inc/OTypeInfo.hxx:35 - connectivity::OTypeInfo aLocalTypeName class rtl::OUString -connectivity/source/inc/OTypeInfo.hxx:37 - connectivity::OTypeInfo nPrecision sal_Int32 -connectivity/source/inc/OTypeInfo.hxx:39 - connectivity::OTypeInfo nMaximumScale sal_Int16 -connectivity/source/inc/OTypeInfo.hxx:40 - connectivity::OTypeInfo nMinimumScale sal_Int16 -connectivity/source/inc/OTypeInfo.hxx:43 - connectivity::OTypeInfo nSearchType sal_Int16 -connectivity/source/inc/OTypeInfo.hxx:44 - connectivity::OTypeInfo nNumPrecRadix sal_Int16 -connectivity/source/inc/OTypeInfo.hxx:46 - connectivity::OTypeInfo bCurrency _Bool -connectivity/source/inc/OTypeInfo.hxx:47 - connectivity::OTypeInfo bAutoIncrement _Bool -connectivity/source/inc/OTypeInfo.hxx:48 - connectivity::OTypeInfo bNullable _Bool -connectivity/source/inc/OTypeInfo.hxx:49 - connectivity::OTypeInfo bCaseSensitive _Bool -connectivity/source/inc/OTypeInfo.hxx:50 - connectivity::OTypeInfo bUnsigned _Bool cppu/source/threadpool/threadpool.cxx:377 _uno_ThreadPool dummy sal_Int32 cppu/source/typelib/typelib.cxx:61 @@ -96,9 +66,9 @@ include/LibreOfficeKit/LibreOfficeKitGtk.h:33 _LOKDocView aDrawingArea GtkDrawingArea include/LibreOfficeKit/LibreOfficeKitGtk.h:38 _LOKDocViewClass parent_class GtkDrawingAreaClass -include/sfx2/msg.hxx:116 +include/sfx2/msg.hxx:117 SfxType0 createSfxPoolItemFunc std::function<SfxPoolItem *(void)> -include/sfx2/msg.hxx:118 +include/sfx2/msg.hxx:119 SfxType0 nAttribs sal_uInt16 include/svtools/genericunodialog.hxx:170 svt::UnoDialogEntryGuard m_aGuard ::osl::MutexGuard @@ -120,46 +90,48 @@ pyuno/source/module/pyuno_impl.hxx:326 pyuno::stRuntimeImpl ob_base PyObject reportdesign/source/ui/inc/ReportWindow.hxx:54 rptui::OReportWindow m_pObjFac ::std::unique_ptr<DlgEdFactory> -sal/osl/unx/thread.cxx:97 +sal/osl/unx/thread.cxx:93 osl_thread_priority_st m_Highest int -sal/osl/unx/thread.cxx:98 +sal/osl/unx/thread.cxx:94 osl_thread_priority_st m_Above_Normal int -sal/osl/unx/thread.cxx:99 +sal/osl/unx/thread.cxx:95 osl_thread_priority_st m_Normal int -sal/osl/unx/thread.cxx:100 +sal/osl/unx/thread.cxx:96 osl_thread_priority_st m_Below_Normal int -sal/osl/unx/thread.cxx:101 +sal/osl/unx/thread.cxx:97 osl_thread_priority_st m_Lowest int -sal/osl/unx/thread.cxx:119 +sal/osl/unx/thread.cxx:115 osl_thread_global_st m_priority struct osl_thread_priority_st +sc/inc/formulalogger.hxx:42 + sc::FormulaLogger maMessages std::vector<OUString> sc/qa/unit/ucalc_column.cxx:103 aInputs aName const char * sc/source/filter/inc/sheetdatacontext.hxx:61 oox::xls::SheetDataContext aReleaser class SolarMutexReleaser -sc/source/ui/inc/docsh.hxx:441 +sc/source/ui/inc/docsh.hxx:438 ScDocShellModificator mpProtector std::unique_ptr<ScRefreshTimerProtector> sd/source/ui/remotecontrol/ZeroconfService.hxx:36 sd::ZeroconfService port uint -sd/source/ui/table/TableDesignPane.hxx:110 +sd/source/ui/table/TableDesignPane.hxx:113 sd::TableDesignPane aImpl class sd::TableDesignWidget sd/source/ui/view/DocumentRenderer.cxx:1335 sd::DocumentRenderer::Implementation mxObjectShell SfxObjectShellRef -sd/source/ui/view/viewshel.cxx:1235 - sd::KeepSlideSorterInSyncWithPageChanges m_aDrawLock sd::slidesorter::view::class SlideSorterView::DrawLock sd/source/ui/view/viewshel.cxx:1236 - sd::KeepSlideSorterInSyncWithPageChanges m_aModelLock sd::slidesorter::controller::class SlideSorterController::ModelChangeLock + sd::KeepSlideSorterInSyncWithPageChanges m_aDrawLock sd::slidesorter::view::class SlideSorterView::DrawLock sd/source/ui/view/viewshel.cxx:1237 - sd::KeepSlideSorterInSyncWithPageChanges m_aUpdateLock sd::slidesorter::controller::class PageSelector::UpdateLock + sd::KeepSlideSorterInSyncWithPageChanges m_aModelLock sd::slidesorter::controller::class SlideSorterController::ModelChangeLock sd/source/ui/view/viewshel.cxx:1238 + sd::KeepSlideSorterInSyncWithPageChanges m_aUpdateLock sd::slidesorter::controller::class PageSelector::UpdateLock +sd/source/ui/view/viewshel.cxx:1239 sd::KeepSlideSorterInSyncWithPageChanges m_aContext sd::slidesorter::controller::class SelectionObserver::Context sd/source/ui/view/ViewShellBase.cxx:201 sd::ViewShellBase::Implementation mpPageCacheManager std::shared_ptr<slidesorter::cache::PageCacheManager> -sfx2/source/doc/doctempl.cxx:118 +sfx2/source/doc/doctempl.cxx:119 DocTempl::DocTempl_EntryData_Impl mxObjShell class SfxObjectShellLock starmath/inc/view.hxx:224 SmViewShell maGraphicController class SmGraphicController svtools/source/svhtml/htmlkywd.cxx:558 - HTML_OptionEntry union HTML_OptionEntry::(anonymous at svtools/source/svhtml/htmlkywd.cxx:558:5) + HTML_OptionEntry union HTML_OptionEntry::(anonymous at /home/noel/libo/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 @@ -182,9 +154,9 @@ 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/source/gdi/jobset.cxx:35 +vcl/source/gdi/jobset.cxx:34 ImplOldJobSetupData cDeviceName char [32] -vcl/source/gdi/jobset.cxx:36 +vcl/source/gdi/jobset.cxx:35 ImplOldJobSetupData cPortName char [32] vcl/source/gdi/pdfwriter_impl.cxx:5448 (anonymous namespace)::(anonymous) extnID SECItem @@ -200,11 +172,11 @@ vcl/source/uitest/uno/uitest_uno.cxx:35 UITestUnoObj mpUITest std::unique_ptr<UITest> vcl/unx/generic/dtrans/X11_clipboard.hxx:45 x11::X11Clipboard m_xSelectionManager css::uno::Reference<css::lang::XInitialization> -vcl/unx/generic/dtrans/X11_dndcontext.hxx:41 +vcl/unx/generic/dtrans/X11_dndcontext.hxx:40 x11::DropTargetDropContext m_xManagerRef css::uno::Reference<XInterface> -vcl/unx/generic/dtrans/X11_dndcontext.hxx:58 +vcl/unx/generic/dtrans/X11_dndcontext.hxx:56 x11::DropTargetDragContext m_xManagerRef css::uno::Reference<XInterface> -vcl/unx/generic/dtrans/X11_dndcontext.hxx:74 +vcl/unx/generic/dtrans/X11_dndcontext.hxx:71 x11::DragSourceContext m_xManagerRef css::uno::Reference<XInterface> vcl/unx/gtk/a11y/atkhypertext.cxx:29 (anonymous) atk_hyper_link AtkHyperlink diff --git a/filter/source/flash/swfexporter.cxx b/filter/source/flash/swfexporter.cxx index 34d7d10bb9f9..3ec5942e0372 100644 --- a/filter/source/flash/swfexporter.cxx +++ b/filter/source/flash/swfexporter.cxx @@ -577,22 +577,6 @@ void FlashExporter::exportShape( const Reference< XShape >& xShape, bool bMaster pShapeInfo->mnWidth = aBoundRect.Width; pShapeInfo->mnHeight = aBoundRect.Height; - if( mbPresentation ) - { - xPropSet->getPropertyValue( "Bookmark" ) >>= pShapeInfo->maBookmark; - xPropSet->getPropertyValue( "DimColor" ) >>= pShapeInfo->mnDimColor; - xPropSet->getPropertyValue( "DimHide" ) >>= pShapeInfo->mbDimHide; - xPropSet->getPropertyValue( "DimPrevious" ) >>= pShapeInfo->mbDimPrev; - xPropSet->getPropertyValue( "Effect" ) >>= pShapeInfo->meEffect; - xPropSet->getPropertyValue( "PlayFull" ) >>= pShapeInfo->mbPlayFull; - xPropSet->getPropertyValue( "PresentationOrder" ) >>= pShapeInfo->mnPresOrder; - xPropSet->getPropertyValue( "Sound" ) >>= pShapeInfo->maSoundURL; - xPropSet->getPropertyValue( "SoundOn" ) >>= pShapeInfo->mbSoundOn; - xPropSet->getPropertyValue( "Speed" ) >>= pShapeInfo->meEffectSpeed; - xPropSet->getPropertyValue( "TextEffect" ) >>= pShapeInfo->meTextEffect; - xPropSet->getPropertyValue( "TransparentColor" ) >>= pShapeInfo->mnBlueScreenColor; - } - GDIMetaFile aMtf; Reference< XComponent > xComponent( xShape, UNO_QUERY ); diff --git a/filter/source/flash/swfexporter.hxx b/filter/source/flash/swfexporter.hxx index 117077a08b83..d76e56f024ae 100644 --- a/filter/source/flash/swfexporter.hxx +++ b/filter/source/flash/swfexporter.hxx @@ -64,36 +64,8 @@ public: sal_Int32 mnWidth; sal_Int32 mnHeight; - css::presentation::AnimationEffect meEffect; - css::presentation::AnimationEffect meTextEffect; - css::presentation::AnimationSpeed meEffectSpeed; - - sal_Int32 mnPresOrder; - - OUString maBookmark; - - sal_Int32 mnDimColor; - bool mbDimHide; - bool mbDimPrev; - - bool mbSoundOn; - bool mbPlayFull; - OUString maSoundURL; - - sal_Int32 mnBlueScreenColor; - ShapeInfo() : - mnID(0), mnX(0), mnY(0), mnWidth(0), mnHeight(0), - meEffect( css::presentation::AnimationEffect_NONE ), - meTextEffect( css::presentation::AnimationEffect_NONE ), - meEffectSpeed( css::presentation::AnimationSpeed_MEDIUM ), - mnPresOrder( 0 ), - mnDimColor( 0 ), - mbDimHide( false ), - mbDimPrev( false ), - mbSoundOn( false ), - mbPlayFull( false ), - mnBlueScreenColor( 0 ) {} + mnID(0), mnX(0), mnY(0), mnWidth(0), mnHeight(0) {} }; diff --git a/filter/source/graphic/GraphicExportDialog.cxx b/filter/source/graphic/GraphicExportDialog.cxx index a4318dbc65c6..b3b82ca98762 100644 --- a/filter/source/graphic/GraphicExportDialog.cxx +++ b/filter/source/graphic/GraphicExportDialog.cxx @@ -38,7 +38,6 @@ using namespace css::lang; GraphicExportDialog::GraphicExportDialog( const Reference< XComponentContext >& ) : meFieldUnit(FUNIT_NONE) - , mbExportSelection( false ) { } @@ -86,10 +85,6 @@ void GraphicExportDialog::setPropertyValues( const Sequence<PropertyValue>& aPro { maMediaDescriptor[ i ].Value >>= maFilterDataSequence; } - else if ( maMediaDescriptor[ i ].Name == "SelectionOnly" ) - { - maMediaDescriptor[ i ].Value >>= mbExportSelection; - } } } diff --git a/filter/source/graphic/GraphicExportDialog.hxx b/filter/source/graphic/GraphicExportDialog.hxx index 54e7117c8cce..bad51f9ae1ee 100644 --- a/filter/source/graphic/GraphicExportDialog.hxx +++ b/filter/source/graphic/GraphicExportDialog.hxx @@ -48,7 +48,6 @@ class GraphicExportDialog : public cppu::WeakImplHelper OUString maDialogTitle; FieldUnit meFieldUnit; - bool mbExportSelection; public: diff --git a/filter/source/graphic/GraphicExportFilter.cxx b/filter/source/graphic/GraphicExportFilter.cxx index b161e0b5cd84..65f70ba18a06 100644 --- a/filter/source/graphic/GraphicExportFilter.cxx +++ b/filter/source/graphic/GraphicExportFilter.cxx @@ -24,8 +24,7 @@ #include <svtools/DocumentToGraphicRenderer.hxx> GraphicExportFilter::GraphicExportFilter( const Reference<XComponentContext>& ) - : mExportSelection(false) - , mTargetWidth(0) + : mTargetWidth(0) , mTargetHeight(0) {} @@ -53,17 +52,6 @@ void GraphicExportFilter::gatherProperties( const Sequence<PropertyValue>& rProp { aProperty.Value >>= mFilterDataSequence; } - else if ( aProperty.Name == "SelectionOnly" ) - { - aProperty.Value >>= mExportSelection; - } - else if ( aProperty.Name == "URL" ) - { - if( !( aProperty.Value >>= mTargetUrl ) ) - { - aProperty.Value >>= mTargetUrl.Complete; - } - } else if ( aProperty.Name == "OutputStream" ) { aProperty.Value >>= mxOutputStream; diff --git a/filter/source/graphic/GraphicExportFilter.hxx b/filter/source/graphic/GraphicExportFilter.hxx index 7c7d95c4431b..6c3d7b8a8304 100644 --- a/filter/source/graphic/GraphicExportFilter.hxx +++ b/filter/source/graphic/GraphicExportFilter.hxx @@ -45,9 +45,7 @@ class GraphicExportFilter : void gatherProperties( const Sequence<PropertyValue>& rDescriptor ); - bool mExportSelection; OUString mFilterExtension; - util::URL mTargetUrl; Sequence<PropertyValue> mFilterDataSequence; diff --git a/filter/source/graphicfilter/ipcx/ipcx.cxx b/filter/source/graphicfilter/ipcx/ipcx.cxx index 6698b5e69601..fed075ed131b 100644 --- a/filter/source/graphicfilter/ipcx/ipcx.cxx +++ b/filter/source/graphicfilter/ipcx/ipcx.cxx @@ -38,7 +38,6 @@ private: sal_uLong nBitsPerPlanePix; // bits per plane per pixel sal_uLong nPlanes; // no of planes sal_uLong nBytesPerPlaneLin; // bytes per plane line - sal_uInt16 nPaletteInfo; sal_uLong nWidth, nHeight; // dimension in pixel sal_uInt16 nResX, nResY; // resolution in pixel per inch or 0,0 @@ -67,7 +66,6 @@ PCXReader::PCXReader(SvStream &rStream) , nBitsPerPlanePix(0) , nPlanes(0) , nBytesPerPlaneLin(0) - , nPaletteInfo(0) , nWidth(0) , nHeight(0) , nResX(0) @@ -178,6 +176,7 @@ void PCXReader::ImplReadHeader() m_rPCX.ReadUChar( nbyte ); nPlanes = (sal_uLong)nbyte; sal_uInt16 nushort(0); m_rPCX.ReadUInt16( nushort ); nBytesPerPlaneLin = (sal_uLong)nushort; + sal_uInt16 nPaletteInfo; m_rPCX.ReadUInt16( nPaletteInfo ); m_rPCX.SeekRel( 58 ); diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 52b5df44ff81..4dd1519bd74f 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -390,7 +390,8 @@ DffPropertyReader::~DffPropertyReader() SvStream& operator>>( SvStream& rIn, SvxMSDffConnectorRule& rRule ) { - rIn.ReadUInt32( rRule.nRuleId ) + sal_uInt32 nRuleId; + rIn.ReadUInt32( nRuleId ) .ReadUInt32( rRule.nShapeA ) .ReadUInt32( rRule.nShapeB ) .ReadUInt32( rRule.nShapeC ) @@ -5594,7 +5595,6 @@ SvxMSDffManager::SvxMSDffManager(SvStream& rStCtrl_, // files may yield to this being uninitialized maBaseURL( rBaseURL ), mnCurMaxShapeId(0), - mnDrawingsSaved(0), mnIdClusters(0), rStCtrl( rStCtrl_ ), pStData( pStData_ ), @@ -5639,7 +5639,6 @@ SvxMSDffManager::SvxMSDffManager( SvStream& rStCtrl_, const OUString& rBaseURL ) nGroupShapeFlags(0), maBaseURL( rBaseURL ), mnCurMaxShapeId(0), - mnDrawingsSaved(0), mnIdClusters(0), rStCtrl( rStCtrl_ ), pStData( nullptr ), @@ -5720,7 +5719,7 @@ void SvxMSDffManager::GetFidclData( sal_uInt32 nOffsDggL ) rStCtrl.ReadUInt32( mnCurMaxShapeId ) .ReadUInt32( mnIdClusters ) .ReadUInt32( nDummy ) - .ReadUInt32( mnDrawingsSaved ); + .ReadUInt32( nDummy ); // nDrawingsSaved if ( mnIdClusters-- > 2 ) { @@ -5735,8 +5734,9 @@ void SvxMSDffManager::GetFidclData( sal_uInt32 nOffsDggL ) maFidcls.resize(mnIdClusters); for (sal_uInt32 i = 0; i < mnIdClusters; ++i) { + sal_uInt32 cspidCur; ///< number of SPIDs used so far rStCtrl.ReadUInt32( maFidcls[ i ].dgid ) - .ReadUInt32( maFidcls[ i ].cspidCur ); + .ReadUInt32( cspidCur ); } } } diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx index 4dc6a9dca0cc..2c4849fd9928 100644 --- a/filter/source/pdf/pdfexport.cxx +++ b/filter/source/pdf/pdfexport.cxx @@ -95,7 +95,6 @@ PDFExport::PDFExport( const Reference< XComponent >& rxSrcDoc, mnPDFTypeSelection ( 0 ), mbExportNotes ( true ), mbExportPlaceholders ( false ), - mbViewPDF ( true ), mbUseReferenceXObject ( false ), mbExportNotesPages ( false ), mbExportOnlyNotesPages ( false ), @@ -457,8 +456,6 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >& rFilterData[ nData ].Value >>= mnPDFTypeSelection; else if ( rFilterData[ nData ].Name == "ExportNotes" ) rFilterData[ nData ].Value >>= mbExportNotes; - else if ( rFilterData[ nData ].Name == "ViewPDFAfterExport" ) - rFilterData[ nData ].Value >>= mbViewPDF; else if ( rFilterData[ nData ].Name == "ExportNotesPages" ) rFilterData[ nData ].Value >>= mbExportNotesPages; else if ( rFilterData[ nData ].Name == "ExportOnlyNotesPages" ) diff --git a/filter/source/pdf/pdfexport.hxx b/filter/source/pdf/pdfexport.hxx index 4051cd88ff21..723742a4bb26 100644 --- a/filter/source/pdf/pdfexport.hxx +++ b/filter/source/pdf/pdfexport.hxx @@ -45,7 +45,6 @@ private: sal_Int32 mnPDFTypeSelection; bool mbExportNotes; bool mbExportPlaceholders; - bool mbViewPDF; bool mbUseReferenceXObject; bool mbExportNotesPages; bool mbExportOnlyNotesPages; diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx index 0687c2a3b73d..d61bb6873cdc 100644 --- a/filter/source/svg/svgexport.cxx +++ b/filter/source/svg/svgexport.cxx @@ -1373,10 +1373,6 @@ void SVGFilter::implGetPagePropSet( const Reference< XDrawPage > & rxPage ) implSafeGetPagePropSet( "IsDateTimeFixed", xPropSet, xPropSetInfo ) >>= mVisiblePagePropSet.bIsDateTimeFieldFixed; implSafeGetPagePropSet( "DateTimeFormat", xPropSet, xPropSetInfo ) >>= mVisiblePagePropSet.nDateTimeFormat; - implSafeGetPagePropSet( "Number", xPropSet, xPropSetInfo ) >>= mVisiblePagePropSet.nPageNumber; - implSafeGetPagePropSet( "DateTimeText", xPropSet, xPropSetInfo ) >>= mVisiblePagePropSet.sDateTimeText; - implSafeGetPagePropSet( "FooterText", xPropSet, xPropSetInfo ) >>= mVisiblePagePropSet.sFooterText; - implSafeGetPagePropSet( "HeaderText", xPropSet, xPropSetInfo ) >>= mVisiblePagePropSet.sHeaderText; if( mVisiblePagePropSet.bIsPageNumberFieldVisible ) { diff --git a/filter/source/svg/svgfilter.hxx b/filter/source/svg/svgfilter.hxx index 4d724240f08e..cb1e9dd049cb 100644 --- a/filter/source/svg/svgfilter.hxx +++ b/filter/source/svg/svgfilter.hxx @@ -147,13 +147,9 @@ struct PagePropertySet bool bIsDateTimeFieldVisible; bool bIsFooterFieldVisible; bool bIsHeaderFieldVisible; - sal_Int32 nPageNumberingType; + sal_Int32 nPageNumberingType; bool bIsDateTimeFieldFixed; - sal_Int16 nPageNumber; - sal_Int32 nDateTimeFormat; - OUString sDateTimeText; - OUString sFooterText; - OUString sHeaderText; + sal_Int32 nDateTimeFormat; }; struct HashReferenceXInterface diff --git a/filter/source/t602/t602filter.cxx b/filter/source/t602/t602filter.cxx index 45ebedc2d900..fdd0e88b93ff 100644 --- a/filter/source/t602/t602filter.cxx +++ b/filter/source/t602/t602filter.cxx @@ -191,23 +191,8 @@ void SAL_CALL T602ImportFilter::setTargetDocument( const Reference< css::lang::X } // XInitialization -void SAL_CALL T602ImportFilter::initialize( const Sequence< Any >& aArguments ) +void SAL_CALL T602ImportFilter::initialize( const Sequence< Any >& /*aArguments*/ ) { - Sequence < PropertyValue > aAnySeq; - sal_Int32 nLength = aArguments.getLength(); - if ( nLength && ( aArguments[0] >>= aAnySeq ) ) - { - const PropertyValue * pValue = aAnySeq.getConstArray(); - nLength = aAnySeq.getLength(); - for ( sal_Int32 i = 0 ; i < nLength; i++) - { - if ( pValue[i].Name == "Type" ) - { - pValue[i].Value >>= msFilterName; - break; - } - } - } } // Other functions diff --git a/filter/source/t602/t602filter.hxx b/filter/source/t602/t602filter.hxx index 385b1b5d0d97..62d0ffe08dab 100644 --- a/filter/source/t602/t602filter.hxx +++ b/filter/source/t602/t602filter.hxx @@ -126,12 +126,10 @@ class T602ImportFilter : public cppu::WeakImplHelper < > { private: -// css::uno::Reference<css::io::XInputStream> xInputStream; css::uno::Reference<css::xml::sax::XDocumentHandler> mxHandler; css::uno::Reference< css::lang::XMultiServiceFactory > mxMSF; css::uno::Reference< css::lang::XComponent > mxDoc; css::uno::Reference < css::io::XInputStream > mxInputStream; - OUString msFilterName; SvXMLAttributeList *mpAttrList; diff --git a/framework/inc/uielement/menubarmerger.hxx b/framework/inc/uielement/menubarmerger.hxx index 1cced9978330..f5720da0c8b0 100644 --- a/framework/inc/uielement/menubarmerger.hxx +++ b/framework/inc/uielement/menubarmerger.hxx @@ -35,8 +35,6 @@ struct AddonMenuItem { OUString aTitle; OUString aURL; - OUString aTarget; - OUString aImageId; OUString aContext; AddonMenuContainer aSubMenu; }; diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx index 96cb03bdbc5f..adcf8b8b827f 100644 --- a/framework/source/fwe/classes/addonsoptions.cxx +++ b/framework/source/fwe/classes/addonsoptions.cxx @@ -970,7 +970,7 @@ void AddonsOptions_Impl::ReadStatusbarMergeInstructions( MergeStatusbarInstructi aNodePropValues[0] >>= aMergeStatusbarInstruction.aMergePoint; aNodePropValues[1] >>= aMergeStatusbarInstruction.aMergeCommand; aNodePropValues[2] >>= aMergeStatusbarInstruction.aMergeCommandParameter; - aNodePropValues[3] >>= aMergeStatusbarInstruction.aMergeFallback; + // aNodePropValues[3] >>= aMergeStatusbarInstruction.aMergeFallback; aNodePropValues[4] >>= aMergeStatusbarInstruction.aMergeContext; ReadMergeStatusbarData( aMergeAddonInstructionBase.makeStringAndClear(), diff --git a/framework/source/uielement/menubarmerger.cxx b/framework/source/uielement/menubarmerger.cxx index 8adb19f0b28e..7a9123cb96bb 100644 --- a/framework/source/uielement/menubarmerger.cxx +++ b/framework/source/uielement/menubarmerger.cxx @@ -396,8 +396,6 @@ void MenuBarMerger::GetMenuEntry( rAddonMenuEntry[i].Value >>= rAddonMenuItem.aURL; else if ( aMenuEntryPropName == ADDONSMENUITEM_STRING_TITLE ) rAddonMenuEntry[i].Value >>= rAddonMenuItem.aTitle; - else if ( aMenuEntryPropName == ADDONSMENUITEM_STRING_TARGET ) - rAddonMenuEntry[i].Value >>= rAddonMenuItem.aTarget; else if ( aMenuEntryPropName == ADDONSMENUITEM_STRING_SUBMENU ) { uno::Sequence< uno::Sequence< beans::PropertyValue > > aSubMenu; @@ -406,8 +404,6 @@ void MenuBarMerger::GetMenuEntry( } else if ( aMenuEntryPropName == ADDONSMENUITEM_STRING_CONTEXT ) rAddonMenuEntry[i].Value >>= rAddonMenuItem.aContext; - else if ( aMenuEntryPropName == ADDONSMENUITEM_STRING_IMAGEIDENTIFIER ) - rAddonMenuEntry[i].Value >>= rAddonMenuItem.aImageId; } } diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx index dcce24bb3644..3d4752768a58 100644 --- a/include/filter/msfilter/msdffimp.hxx +++ b/include/filter/msfilter/msdffimp.hxx @@ -151,7 +151,6 @@ typedef ::std::multiset< std::shared_ptr<SvxMSDffShapeInfo>, struct SvxMSDffConnectorRule { - sal_uInt32 nRuleId; sal_uInt32 nShapeA; ///< SPID of shape A sal_uInt32 nShapeB; ///< SPID of shape B sal_uInt32 nShapeC; ///< SPID of connector shape @@ -166,8 +165,7 @@ struct SvxMSDffConnectorRule SdrObject* pCObj; ///< pPtr of connector object SvxMSDffConnectorRule() - : nRuleId(0) - , nShapeA(0) + : nShapeA(0) , nShapeB(0) , nShapeC(0) , ncptiA(0) @@ -194,7 +192,6 @@ struct MSFILTER_DLLPUBLIC SvxMSDffSolverContainer struct FIDCL { sal_uInt32 dgid; ///< DG owning the SPIDs in this cluster - sal_uInt32 cspidCur; ///< number of SPIDs used so far }; /// provided by SvxMSDffManager for each shape in a group @@ -414,7 +411,6 @@ protected: OUString maBaseURL; sal_uInt32 mnCurMaxShapeId; // we need this information to - sal_uInt32 mnDrawingsSaved; // access the right drawing sal_uInt32 mnIdClusters; // while only knowing the shapeid std::vector<FIDCL> maFidcls; OffsetMap maDgOffsetTable; ///< array of fileoffsets diff --git a/include/framework/addonsoptions.hxx b/include/framework/addonsoptions.hxx index 30a46a9ff841..873315da46c0 100644 --- a/include/framework/addonsoptions.hxx +++ b/include/framework/addonsoptions.hxx @@ -74,7 +74,6 @@ struct FWE_DLLPUBLIC MergeStatusbarInstruction ::rtl::OUString aMergePoint; ::rtl::OUString aMergeCommand; ::rtl::OUString aMergeCommandParameter; - ::rtl::OUString aMergeFallback; ::rtl::OUString aMergeContext; css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > aMergeStatusbarItems; }; diff --git a/include/oox/export/chartexport.hxx b/include/oox/export/chartexport.hxx index ef537d688e4a..f8c055c3be92 100644 --- a/include/oox/export/chartexport.hxx +++ b/include/oox/export/chartexport.hxx @@ -105,7 +105,6 @@ private: // members filled by InitRangeSegmentationProperties (retrieved from DataProvider) bool mbHasCategoryLabels; //if the categories are only automatically generated this will be false OUString msChartAddress; - css::uno::Sequence< sal_Int32 > maSequenceMapping; //css::uno::Reference< css::drawing::XShapes > mxAdditionalShapes; css::uno::Reference< css::chart2::data::XDataSequence > mxCategoriesValues; diff --git a/lotuswordpro/source/filter/LotusWordProImportFilter.cxx b/lotuswordpro/source/filter/LotusWordProImportFilter.cxx index fb90b22f6085..d58f8afd2be5 100644 --- a/lotuswordpro/source/filter/LotusWordProImportFilter.cxx +++ b/lotuswordpro/source/filter/LotusWordProImportFilter.cxx @@ -143,23 +143,8 @@ OUString SAL_CALL LotusWordProImportFilter::detect( css::uno::Sequence< Property } // XInitialization -void SAL_CALL LotusWordProImportFilter::initialize( const Sequence< Any >& aArguments ) +void SAL_CALL LotusWordProImportFilter::initialize( const Sequence< Any >& /*aArguments*/ ) { - Sequence < PropertyValue > aAnySeq; - sal_Int32 nLength = aArguments.getLength(); - if ( nLength && ( aArguments[0] >>= aAnySeq ) ) - { - const PropertyValue * pValue = aAnySeq.getConstArray(); - nLength = aAnySeq.getLength(); - for ( sal_Int32 i = 0 ; i < nLength; i++) - { - if ( pValue[i].Name == "Type" ) - { - pValue[i].Value >>= msFilterName; - break; - } - } - } } // XServiceInfo diff --git a/lotuswordpro/source/filter/LotusWordProImportFilter.hxx b/lotuswordpro/source/filter/LotusWordProImportFilter.hxx index 59c028dc7360..535cc5593808 100644 --- a/lotuswordpro/source/filter/LotusWordProImportFilter.hxx +++ b/lotuswordpro/source/filter/LotusWordProImportFilter.hxx @@ -47,7 +47,6 @@ protected: // oo.org declares css::uno::Reference< css::uno::XComponentContext > mxContext; css::uno::Reference< css::lang::XComponent > mxDoc; - OUString msFilterName; /// @throws css::uno::RuntimeException bool SAL_CALL importImpl( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor ); diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx index e594a2f47bdd..28f8c6c4d7f8 100644 --- a/oox/source/export/chartexport.cxx +++ b/oox/source/export/chartexport.cxx @@ -631,8 +631,6 @@ void ChartExport::InitRangeSegmentationProperties( const Reference< chart2::XCha if( aArgs[i].Value >>= sBrokenRange ) bBrokenRangeAvailable = true; } - else if ( aArgs[i].Name == "SequenceMapping" ) - aArgs[i].Value >>= maSequenceMapping; } // #i79009# For Writer we have to export a broken version of the diff --git a/rsc/inc/rscrsc.hxx b/rsc/inc/rscrsc.hxx index 4dccfa9f227a..f09b42d6004d 100644 --- a/rsc/inc/rscrsc.hxx +++ b/rsc/inc/rscrsc.hxx @@ -40,7 +40,6 @@ public: RSCBYTEORDER_TYPE nByteOrder; CommandFlags nCommands; // command bits OString aOutputSrs; // Srs output file name - OString aILDir; struct OutputFile { diff --git a/sc/inc/filtopt.hxx b/sc/inc/filtopt.hxx index b1c48c6dc9bc..9c1a81e66281 100644 --- a/sc/inc/filtopt.hxx +++ b/sc/inc/filtopt.hxx @@ -29,8 +29,6 @@ class SC_DLLPUBLIC ScFilterOptions : public utl::ConfigItem { private: bool bWK3Flag; - double fExcelColScale; - double fExcelRowScale; virtual void ImplCommit() override; diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx index a2712f1696c9..96737e18a512 100644 --- a/sc/source/core/data/table1.cxx +++ b/sc/source/core/data/table1.cxx @@ -149,12 +149,10 @@ struct SetRowHeightOnlyFunc : public OptimalHeightsFuncObjBase struct SetRowHeightRangeFunc : public OptimalHeightsFuncObjBase { ScTable* mpTab; - double mnPPTX; double mnPPTY; - SetRowHeightRangeFunc(ScTable* pTab, double nPPTX, double nPPTY) : + SetRowHeightRangeFunc(ScTable* pTab, double nPPTY) : mpTab(pTab), - mnPPTX(nPPTX), mnPPTY(nPPTY) {} @@ -499,7 +497,7 @@ bool ScTable::SetOptimalHeight( GetOptimalHeightsInColumn(rCxt, aCol, nStartRow, nEndRow, pProgress, nProgressStart); rCxt.getHeightArray().enableTreeSearch(true); - SetRowHeightRangeFunc aFunc(this, rCxt.getPPTX(), rCxt.getPPTY()); + SetRowHeightRangeFunc aFunc(this, rCxt.getPPTY()); bool bChanged = SetOptimalHeightsToRows(rCxt, aFunc, pRowFlags, nStartRow, nEndRow); if ( pProgress != pOuterProgress ) diff --git a/sc/source/core/tool/filtopt.cxx b/sc/source/core/tool/filtopt.cxx index 05f112b9a4d2..9108e609d704 100644 --- a/sc/source/core/tool/filtopt.cxx +++ b/sc/source/core/tool/filtopt.cxx @@ -29,15 +29,11 @@ using namespace css::uno; #define CFGPATH_FILTER "Office.Calc/Filter/Import" -#define SCFILTOPT_COLSCALE 0 -#define SCFILTOPT_ROWSCALE 1 #define SCFILTOPT_WK3 2 ScFilterOptions::ScFilterOptions() : ConfigItem( CFGPATH_FILTER ), - bWK3Flag( false ), - fExcelColScale( 0 ), - fExcelRowScale( 0 ) + bWK3Flag( false ) { Sequence<OUString> aNames { "MS_Excel/ColScale", // SCFILTOPT_COLSCALE "MS_Excel/RowScale", // SCFILTOPT_ROWSCALE @@ -54,12 +50,6 @@ ScFilterOptions::ScFilterOptions() : { switch(nProp) { - case SCFILTOPT_COLSCALE: - pValues[nProp] >>= fExcelColScale; - break; - case SCFILTOPT_ROWSCALE: - pValues[nProp] >>= fExcelRowScale; - break; case SCFILTOPT_WK3: bWK3Flag = ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ); break; diff --git a/sc/source/filter/lotus/lotfilter.hxx b/sc/source/filter/lotus/lotfilter.hxx index 3b3634a08d5d..c7bdeda44642 100644 --- a/sc/source/filter/lotus/lotfilter.hxx +++ b/sc/source/filter/lotus/lotfilter.hxx @@ -43,8 +43,6 @@ struct LotusContext LOTUS_ROOT* pLotusRoot; std::map<sal_uInt16, ScPatternAttr> aLotusPatternPool; - sal_uInt8 nDefaultFormat; // -> op.cpp, standard cell format - SvxHorJustifyItem *pAttrRight, *pAttrLeft, *pAttrCenter, *pAttrRepeat, *pAttrStandard; ScProtectionAttr* pAttrUnprot; @@ -57,7 +55,6 @@ struct LotusContext , pDoc(nullptr) , pLotusRoot(nullptr) - , nDefaultFormat(0) , pAttrRight(nullptr) , pAttrLeft(nullptr) , pAttrCenter(nullptr) diff --git a/sc/source/filter/lotus/op.cxx b/sc/source/filter/lotus/op.cxx index 0f0b2ad4c180..8b8aa079471d 100644 --- a/sc/source/filter/lotus/op.cxx +++ b/sc/source/filter/lotus/op.cxx @@ -308,7 +308,8 @@ void OP_Window1(LotusContext& rContext, SvStream& r, sal_uInt16 n) { r.SeekRel( 4 ); // skip Cursor Pos - r.ReadUChar(rContext.nDefaultFormat); + sal_uInt8 nDefaultFormat; // -> op.cpp, standard cell format + r.ReadUChar(nDefaultFormat); r.SeekRel( 1 ); // skip 'unused' diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx index a4ba8dd088ee..71e52c5a11f8 100644 --- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx +++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx @@ -33,9 +33,6 @@ QueueProcessor::QueueProcessor ( const SharedCacheContext& rpCacheContext) : maMutex(), maTimer(), - mnTimeBetweenHighPriorityRequests (10/*ms*/), - mnTimeBetweenLowPriorityRequests (100/*ms*/), - mnTimeBetweenRequestsWhenNotIdle (1000/*ms*/), maPreviewSize(rPreviewSize), mbDoSuperSampling(bDoSuperSampling), mpCacheContext(rpCacheContext), @@ -44,20 +41,6 @@ QueueProcessor::QueueProcessor ( maBitmapFactory(), mbIsPaused(false) { - // Look into the configuration if there for overriding values. - css::uno::Any aTimeBetweenReqeusts; - aTimeBetweenReqeusts = CacheConfiguration::Instance()->GetValue("TimeBetweenHighPriorityRequests"); - if (aTimeBetweenReqeusts.has<sal_Int32>()) - aTimeBetweenReqeusts >>= mnTimeBetweenHighPriorityRequests; - - aTimeBetweenReqeusts = CacheConfiguration::Instance()->GetValue("TimeBetweenLowPriorityRequests"); - if (aTimeBetweenReqeusts.has<sal_Int32>()) - aTimeBetweenReqeusts >>= mnTimeBetweenLowPriorityRequests; - - aTimeBetweenReqeusts = CacheConfiguration::Instance()->GetValue("TimeBetweenRequestsDuringShow"); - if (aTimeBetweenReqeusts.has<sal_Int32>()) - aTimeBetweenReqeusts >>= mnTimeBetweenRequestsWhenNotIdle; - maTimer.SetInvokeHandler (LINK(this,QueueProcessor,ProcessRequestHdl)); maTimer.SetTimeout (10); } diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx index 38984747b1ae..aafe0648062e 100644 --- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx +++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx @@ -93,9 +93,6 @@ private: Timer maTimer; DECL_LINK(ProcessRequestHdl, Timer *, void); - sal_uInt32 mnTimeBetweenHighPriorityRequests; - sal_uInt32 mnTimeBetweenLowPriorityRequests; - sal_uInt32 mnTimeBetweenRequestsWhenNotIdle; Size maPreviewSize; bool mbDoSuperSampling; SharedCacheContext mpCacheContext; diff --git a/sdext/source/minimizer/graphiccollector.cxx b/sdext/source/minimizer/graphiccollector.cxx index f9024b460aa5..6e03ff69a0c3 100644 --- a/sdext/source/minimizer/graphiccollector.cxx +++ b/sdext/source/minimizer/graphiccollector.cxx @@ -100,7 +100,6 @@ void ImpAddGraphicEntity( const Reference< XComponentContext >& rxMSF, Reference aUser.mxShape = rxShape; aUser.mbFillBitmap = false; xShapePropertySet->getPropertyValue( "GraphicURL" ) >>= aUser.maGraphicURL; - xShapePropertySet->getPropertyValue( "GraphicStreamURL" ) >>= aUser.maGraphicStreamURL; xShapePropertySet->getPropertyValue( "GraphicCrop" ) >>= aGraphicCropLogic; awt::Size aLogicalSize( rxShape->getSize() ); diff --git a/sdext/source/minimizer/graphiccollector.hxx b/sdext/source/minimizer/graphiccollector.hxx index 2e54dc77dc6a..ae31016574b9 100644 --- a/sdext/source/minimizer/graphiccollector.hxx +++ b/sdext/source/minimizer/graphiccollector.hxx @@ -58,7 +58,6 @@ class GraphicCollector css::uno::Reference< css::beans::XPropertySet > mxPropertySet; // to be used otherwise the PropertySet css::uno::Reference< css::beans::XPropertySet > mxPagePropertySet; OUString maGraphicURL; - OUString maGraphicStreamURL; css::text::GraphicCrop maGraphicCropLogic; css::awt::Size maLogicalSize; bool mbFillBitmap; diff --git a/sdext/source/presenter/PresenterTextView.cxx b/sdext/source/presenter/PresenterTextView.cxx index f876ea729194..3e4d174a21eb 100644 --- a/sdext/source/presenter/PresenterTextView.cxx +++ b/sdext/source/presenter/PresenterTextView.cxx @@ -469,7 +469,6 @@ PresenterTextParagraph::PresenterTextParagraph ( mnAscent(0), mnDescent(0), mnLineHeight(-1), - meAdjust(style::ParagraphAdjust_LEFT), mnWritingMode (text::WritingMode2::LR_TB), mnCharacterOffset(0), maCells() @@ -488,14 +487,6 @@ PresenterTextParagraph::PresenterTextParagraph ( } try { - xProperties->getPropertyValue("ParaAdjust") >>= meAdjust; - } - catch(beans::UnknownPropertyException&) - { - // Ignore the exception. Use the default value. - } - try - { xProperties->getPropertyValue("WritingMode") >>= mnWritingMode; } catch(beans::UnknownPropertyException&) diff --git a/sdext/source/presenter/PresenterTextView.hxx b/sdext/source/presenter/PresenterTextView.hxx index b56bd5a85f31..cca8b4a89ad1 100644 --- a/sdext/source/presenter/PresenterTextView.hxx +++ b/sdext/source/presenter/PresenterTextView.hxx @@ -190,7 +190,6 @@ private: double mnAscent; double mnDescent; double mnLineHeight; - css::style::ParagraphAdjust meAdjust; sal_Int8 mnWritingMode; /// The index of the first character in this paragraph with respect to /// the whole text. diff --git a/sdext/source/presenter/PresenterTheme.cxx b/sdext/source/presenter/PresenterTheme.cxx index 6ff144ffa14c..10c7cf023482 100644 --- a/sdext/source/presenter/PresenterTheme.cxx +++ b/sdext/source/presenter/PresenterTheme.cxx @@ -235,7 +235,6 @@ public: PresenterConfigurationAccess& rConfiguration, ReadContext& rReadContext); - OUString msThemeName; OUString msConfigurationNodeName; std::shared_ptr<Theme> mpParentTheme; SharedBitmapDescriptor mpBackground; @@ -282,7 +281,8 @@ std::shared_ptr<PresenterTheme::Theme> PresenterTheme::ReadTheme() "/org.openoffice.Office.PresenterScreen/", PresenterConfigurationAccess::READ_ONLY); - return aReadContext.ReadTheme(aConfiguration, msThemeName); + OUString sThemeName; + return aReadContext.ReadTheme(aConfiguration, sThemeName); } bool PresenterTheme::HasCanvas() const @@ -578,11 +578,10 @@ double PresenterTheme::FontDescriptor::GetCellSizeForDesignSize ( //===== Theme ================================================================= PresenterTheme::Theme::Theme ( - const OUString& rsName, + const OUString& /*rsName*/, const Reference<container::XHierarchicalNameAccess>& rxThemeRoot, const OUString& rsNodeName) - : msThemeName(rsName), - msConfigurationNodeName(rsNodeName), + : msConfigurationNodeName(rsNodeName), mpParentTheme(), maPaneStyles(), maViewStyles(), @@ -596,9 +595,6 @@ void PresenterTheme::Theme::Read ( PresenterConfigurationAccess& rConfiguration, ReadContext& rReadContext) { - PresenterConfigurationAccess::GetConfigurationNode(mxThemeRoot, "ThemeName") - >>= msThemeName; - // Parent theme name. OUString sParentThemeName; if ((PresenterConfigurationAccess::GetConfigurationNode(mxThemeRoot, "ParentTheme") diff --git a/sdext/source/presenter/PresenterTheme.hxx b/sdext/source/presenter/PresenterTheme.hxx index 841f9782f900..82b3d78e9887 100644 --- a/sdext/source/presenter/PresenterTheme.hxx +++ b/sdext/source/presenter/PresenterTheme.hxx @@ -124,7 +124,6 @@ public: private: css::uno::Reference<css::uno::XComponentContext> mxContext; - const OUString msThemeName; std::shared_ptr<Theme> mpTheme; css::uno::Reference<css::rendering::XCanvas> mxCanvas; diff --git a/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx index 7411912b7fa4..4a4f84a4dacf 100644 --- a/starmath/source/mathtype.cxx +++ b/starmath/source/mathtype.cxx @@ -565,6 +565,10 @@ bool MathType::Parse(SotStorage *pStor) EQNOLEFILEHDR aHdr; aHdr.Read(pS); + sal_uInt8 nProdVersion; + sal_uInt8 nProdSubVersion; + sal_uInt8 nPlatform; + sal_uInt8 nProduct; pS->ReadUChar( nVersion ); pS->ReadUChar( nPlatform ); pS->ReadUChar( nProduct ); @@ -2640,6 +2644,7 @@ void MathType::HandleOperator(SmNode *pNode,int nLevel) bool MathType::HandlePile(int &rSetAlign, int nLevel, sal_uInt8 nSelector, sal_uInt8 nVariation) { + sal_uInt8 nVAlign; pS->ReadUChar( nHAlign ); pS->ReadUChar( nVAlign ); @@ -2660,7 +2665,7 @@ bool MathType::HandlePile(int &rSetAlign, int nLevel, sal_uInt8 nSelector, sal_u bool MathType::HandleMatrix(int nLevel, sal_uInt8 nSelector, sal_uInt8 nVariation) { - sal_uInt8 nH_just,nV_just,nRows,nCols; + sal_uInt8 nH_just,nV_just,nRows,nCols,nVAlign; pS->ReadUChar( nVAlign ); pS->ReadUChar( nH_just ); pS->ReadUChar( nV_just ); diff --git a/starmath/source/mathtype.hxx b/starmath/source/mathtype.hxx index 2e617a155339..2fd259fd81f7 100644 --- a/starmath/source/mathtype.hxx +++ b/starmath/source/mathtype.hxx @@ -55,15 +55,10 @@ class MathType public: explicit MathType(OUString &rIn) : nVersion(0) - , nPlatform(0) - , nProduct(0) - , nProdVersion(0) - , nProdSubVersion(0) , pS(nullptr) , rRet(rIn) , pTree(nullptr) , nHAlign(0) - , nVAlign(0) , nPendingAttributes(0) , nInsertion(0) , nLSize(0) @@ -81,15 +76,10 @@ public: MathType(OUString &rIn,SmNode *pIn) : nVersion(0) - , nPlatform(0) - , nProduct(0) - , nProdVersion(0) - , nProdSubVersion(0) , pS(nullptr) , rRet(rIn) , pTree(pIn) , nHAlign(2) - , nVAlign(0) , nPendingAttributes(0) , nInsertion(0) , nLSize(0) @@ -111,10 +101,6 @@ public: private: /*Ver 2 Header*/ sal_uInt8 nVersion; - sal_uInt8 nPlatform; - sal_uInt8 nProduct; - sal_uInt8 nProdVersion; - sal_uInt8 nProdSubVersion; SotStorageStream *pS; @@ -164,7 +150,6 @@ private: SmNode *pTree; sal_uInt8 nHAlign; - sal_uInt8 nVAlign; int nPendingAttributes; sal_uLong nInsertion; diff --git a/sw/source/uibase/inc/SwXFilterOptions.hxx b/sw/source/uibase/inc/SwXFilterOptions.hxx index 4c32cc0b588b..1674285e5364 100644 --- a/sw/source/uibase/inc/SwXFilterOptions.hxx +++ b/sw/source/uibase/inc/SwXFilterOptions.hxx @@ -37,7 +37,6 @@ class SwXFilterOptions : public ::cppu::WeakImplHelper< css::document::XExporter, css::lang::XServiceInfo > { - OUString sFilterName; OUString sFilterOptions; css::uno::Reference< css::io::XInputStream > xInputStream; diff --git a/sw/source/uibase/uno/SwXFilterOptions.cxx b/sw/source/uibase/uno/SwXFilterOptions.cxx index 512163200986..b30874bd560b 100644 --- a/sw/source/uibase/uno/SwXFilterOptions.cxx +++ b/sw/source/uibase/uno/SwXFilterOptions.cxx @@ -70,9 +70,7 @@ void SwXFilterOptions::setPropertyValues( const uno::Sequence<beans::PropertyV const beans::PropertyValue& rProp = pPropArray[i]; OUString aPropName = rProp.Name; - if ( aPropName == UNO_NAME_FILTER_NAME ) - rProp.Value >>= sFilterName; - else if ( aPropName == FILTER_OPTIONS_NAME ) + if ( aPropName == FILTER_OPTIONS_NAME ) rProp.Value >>= sFilterOptions; else if ( aPropName == "InputStream" ) rProp.Value >>= xInputStream; diff --git a/writerperfect/source/writer/WordPerfectImportFilter.cxx b/writerperfect/source/writer/WordPerfectImportFilter.cxx index 68c2a5cc8dd1..4eda39e02e26 100644 --- a/writerperfect/source/writer/WordPerfectImportFilter.cxx +++ b/writerperfect/source/writer/WordPerfectImportFilter.cxx @@ -205,23 +205,8 @@ OUString SAL_CALL WordPerfectImportFilter::detect(Sequence< PropertyValue > &Des // XInitialization -void SAL_CALL WordPerfectImportFilter::initialize(const Sequence< Any > &aArguments) +void SAL_CALL WordPerfectImportFilter::initialize(const Sequence< Any > &/*aArguments*/) { - Sequence < PropertyValue > aAnySeq; - sal_Int32 nLength = aArguments.getLength(); - if (nLength && (aArguments[0] >>= aAnySeq)) - { - const PropertyValue *pValue = aAnySeq.getConstArray(); - nLength = aAnySeq.getLength(); - for (sal_Int32 i = 0 ; i < nLength; i++) - { - if (pValue[i].Name == "Type") - { - pValue[i].Value >>= msFilterName; - break; - } - } - } } // XServiceInfo diff --git a/writerperfect/source/writer/WordPerfectImportFilter.hxx b/writerperfect/source/writer/WordPerfectImportFilter.hxx index 7f24ef2977b0..81f023874b62 100644 --- a/writerperfect/source/writer/WordPerfectImportFilter.hxx +++ b/writerperfect/source/writer/WordPerfectImportFilter.hxx @@ -37,7 +37,6 @@ class WordPerfectImportFilter : public cppu::WeakImplHelper protected: css::uno::Reference< css::uno::XComponentContext > mxContext; css::uno::Reference< css::lang::XComponent > mxDoc; - OUString msFilterName; /// @throws css::uno::RuntimeException bool SAL_CALL importImpl(const css::uno::Sequence< css::beans::PropertyValue > &aDescriptor); diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx index 4332c02b6b81..3c7191cc1eb1 100644 --- a/xmloff/source/chart/SchXMLExport.cxx +++ b/xmloff/source/chart/SchXMLExport.cxx @@ -254,7 +254,6 @@ public: OUString msString; // members filled by InitRangeSegmentationProperties (retrieved from DataProvider) - bool mbHasSeriesLabels; bool mbHasCategoryLabels; //if the categories are only automatically generated this will be false bool mbRowSourceColumns; OUString msChartAddress; @@ -1022,7 +1021,6 @@ SchXMLExportHelper_Impl::SchXMLExportHelper_Impl( SvXMLAutoStylePoolP& rASPool ) : mrExport( rExport ), mrAutoStylePool( rASPool ), - mbHasSeriesLabels( false ), mbHasCategoryLabels( false ), mbRowSourceColumns( true ), msCLSID( SvGlobalName( SO3_SCH_CLASSID ).GetHexName() ) @@ -3659,8 +3657,6 @@ void SchXMLExportHelper_Impl::InitRangeSegmentationProperties( const Reference< aArgs[i].Value >>= eRowSource; mbRowSourceColumns = ( eRowSource == chart::ChartDataRowSource_COLUMNS ); } - else if ( aArgs[i].Name == "FirstCellAsLabel" ) - aArgs[i].Value >>= mbHasSeriesLabels; else if ( aArgs[i].Name == "SequenceMapping" ) aArgs[i].Value >>= maSequenceMapping; else if ( aArgs[i].Name == "TableNumberList" ) |