filter/source/flash/swfexporter.cxx | 8 ----- filter/source/flash/swfexporter.hxx | 24 ---------------- filter/source/flash/swfwriter.hxx | 3 -- filter/source/graphicfilter/eps/eps.cxx | 18 ------------ filter/source/graphicfilter/icgm/cgm.cxx | 4 +- filter/source/graphicfilter/icgm/chart.cxx | 5 +-- filter/source/graphicfilter/icgm/chart.hxx | 24 ---------------- filter/source/graphicfilter/icgm/class7.cxx | 8 +---- filter/source/graphicfilter/icgm/elements.cxx | 3 -- filter/source/graphicfilter/icgm/elements.hxx | 5 +-- filter/source/graphicfilter/itga/itga.cxx | 11 +++---- filter/source/msfilter/eschesdo.cxx | 4 -- filter/source/msfilter/eschesdo.hxx | 3 -- filter/source/msfilter/msdffimp.cxx | 8 ++--- filter/source/svg/gfxtypes.hxx | 1 filter/source/svg/svgwriter.cxx | 2 - filter/source/svg/svgwriter.hxx | 3 -- forms/source/component/FormComponent.cxx | 1 forms/source/inc/FormComponent.hxx | 2 - formula/source/ui/dlg/formula.cxx | 4 -- fpicker/source/office/iodlgimp.cxx | 3 -- fpicker/source/office/iodlgimp.hxx | 2 - framework/inc/uielement/macrosmenucontroller.hxx | 1 framework/inc/uielement/menubarmanager.hxx | 5 --- framework/source/uielement/uicommanddescription.cxx | 6 ---- helpcompiler/inc/BasCodeTagger.hxx | 1 helpcompiler/inc/HelpLinker.hxx | 3 -- helpcompiler/source/HelpCompiler.cxx | 1 helpcompiler/source/HelpLinker.cxx | 9 ++---- i18npool/inc/breakiterator_unicode.hxx | 2 - i18npool/inc/textconversion.hxx | 1 i18npool/source/breakiterator/breakiterator_unicode.cxx | 1 i18npool/source/nativenumber/data/numberchar.h | 6 ---- idl/inc/module.hxx | 6 +--- idlc/inc/idlc/astexpression.hxx | 1 lotuswordpro/source/filter/lwpdocdata.hxx | 7 ---- lotuswordpro/source/filter/lwplayout.cxx | 1 lotuswordpro/source/filter/lwplayout.hxx | 1 lotuswordpro/source/filter/lwppara.hxx | 1 lotuswordpro/source/filter/lwptoc.hxx | 2 - lotuswordpro/source/filter/xfilter/xfdate.cxx | 2 - lotuswordpro/source/filter/xfilter/xfdate.hxx | 9 ++---- lotuswordpro/source/filter/xfilter/xfdefs.hxx | 11 ------- lotuswordpro/source/filter/xfilter/xfdrawobj.hxx | 1 lotuswordpro/source/filter/xfilter/xfliststyle.hxx | 3 -- 45 files changed, 31 insertions(+), 196 deletions(-)
New commits: commit 0f5d0aaed33d68cb6fe52d693d351dda79b990bc Author: Noel Grandin <n...@peralex.com> Date: Fri Nov 20 15:05:51 2015 +0200 loplugin:unusedfields lotuswordpro Change-Id: If7d15d4293993f52e68ac059b3091aa88fb68e95 diff --git a/lotuswordpro/source/filter/lwpdocdata.hxx b/lotuswordpro/source/filter/lwpdocdata.hxx index e6ea5c6..5abf214 100644 --- a/lotuswordpro/source/filter/lwpdocdata.hxx +++ b/lotuswordpro/source/filter/lwpdocdata.hxx @@ -99,13 +99,6 @@ struct LwpDocControl LwpAtomHolder cDocControlOnlyEditor; sal_uInt16 nEditorVerification; }; -struct lcolor -{ - sal_uInt16 cred; // When extra is AGLRGB_INDEX, cred holds the - sal_uInt16 cgreen; // hi 16 bits and cgreen holds the lo 16 bits of - sal_uInt16 cblue; // the 32-bit LUT index. - sal_uInt16 cextra; -}; struct LwpFontDescriptionOverrideBase { sal_uInt8 cOverrideBits; diff --git a/lotuswordpro/source/filter/lwplayout.cxx b/lotuswordpro/source/filter/lwplayout.cxx index 967b49c..7f031d2 100644 --- a/lotuswordpro/source/filter/lwplayout.cxx +++ b/lotuswordpro/source/filter/lwplayout.cxx @@ -1874,7 +1874,6 @@ LwpPlacableLayout::LwpPlacableLayout( LwpObjectHeader &objHdr, LwpSvStream* pStr , m_nWrapType(0) , m_nBuoyancy(0) , m_nBaseLineOffset(0) - , m_nPageNumber(0) {} LwpPlacableLayout::~LwpPlacableLayout() diff --git a/lotuswordpro/source/filter/lwplayout.hxx b/lotuswordpro/source/filter/lwplayout.hxx index d6bfcdd..a5e8c26 100644 --- a/lotuswordpro/source/filter/lwplayout.hxx +++ b/lotuswordpro/source/filter/lwplayout.hxx @@ -430,7 +430,6 @@ protected: sal_Int32 m_nBaseLineOffset; LwpAtomHolder m_Script; LwpObjectID m_LayRelativity; - sal_uInt16 m_nPageNumber;//for frame anchored to page rtl::Reference<XFFont> m_pFont;//for frame position }; #endif diff --git a/lotuswordpro/source/filter/lwppara.hxx b/lotuswordpro/source/filter/lwppara.hxx index 758f196..6e77876 100644 --- a/lotuswordpro/source/filter/lwppara.hxx +++ b/lotuswordpro/source/filter/lwppara.hxx @@ -241,7 +241,6 @@ protected: XFContentContainer* m_pXFContainer; //Current container for VO_PARA - OUString m_TabStyleName; enum { /* bit definitions for the paragraph object flags */ diff --git a/lotuswordpro/source/filter/lwptoc.hxx b/lotuswordpro/source/filter/lwptoc.hxx index 790f80f..c97fec2 100644 --- a/lotuswordpro/source/filter/lwptoc.hxx +++ b/lotuswordpro/source/filter/lwptoc.hxx @@ -128,8 +128,6 @@ private: LwpAtomHolder m_DestPGName[MAX_LEVELS]; sal_uInt32 m_nFlags[MAX_LEVELS]; - std::vector<std::pair<OUString,OUString> > m_TOCList; - OUString m_TabStyleName; XFContentContainer* m_pCont; diff --git a/lotuswordpro/source/filter/xfilter/xfdate.cxx b/lotuswordpro/source/filter/xfilter/xfdate.cxx index ec2df74..3236602 100644 --- a/lotuswordpro/source/filter/xfilter/xfdate.cxx +++ b/lotuswordpro/source/filter/xfilter/xfdate.cxx @@ -63,13 +63,11 @@ XFDate::XFDate() { m_bFixed = false; - memset(&m_aDateTime, 0, sizeof(m_aDateTime)); m_bValued = false; } XFDate::~XFDate() { - } void XFDate::ToXml(IXFStream *pStrm) diff --git a/lotuswordpro/source/filter/xfilter/xfdate.hxx b/lotuswordpro/source/filter/xfilter/xfdate.hxx index ead4062..94dd4dc 100644 --- a/lotuswordpro/source/filter/xfilter/xfdate.hxx +++ b/lotuswordpro/source/filter/xfilter/xfdate.hxx @@ -76,11 +76,10 @@ public: virtual void ToXml(IXFStream *pStrm) override; private: - bool m_bFixed; - OUString m_strText; - XFDateTime m_aDateTime; - OUString m_strDate; - bool m_bValued; + bool m_bFixed; + OUString m_strText; + OUString m_strDate; + bool m_bValued; }; class XFDateStart : public XFDate diff --git a/lotuswordpro/source/filter/xfilter/xfdefs.hxx b/lotuswordpro/source/filter/xfilter/xfdefs.hxx index a7da34f..ff814a3 100644 --- a/lotuswordpro/source/filter/xfilter/xfdefs.hxx +++ b/lotuswordpro/source/filter/xfilter/xfdefs.hxx @@ -462,17 +462,6 @@ enum enumXFIndexTemplate enumXFIndexTemplateBibliography, }; -struct XFDateTime -{ - sal_Int32 nYear; - sal_Int32 nMonth; - sal_Int32 nDay; - sal_Int32 nHour; - sal_Int32 nMinute; - sal_Int32 nSecond; - sal_Int32 nMillSecond; -}; - enum enumXFRubyPosition { enumXFRubyLeft = 4, diff --git a/lotuswordpro/source/filter/xfilter/xfdrawobj.hxx b/lotuswordpro/source/filter/xfilter/xfdrawobj.hxx index 5624c6f..4f7fad2 100644 --- a/lotuswordpro/source/filter/xfilter/xfdrawobj.hxx +++ b/lotuswordpro/source/filter/xfilter/xfdrawobj.hxx @@ -99,7 +99,6 @@ public: protected: rtl::Reference<XFContentContainer> m_aContents; - OUString m_strTextStyle; double m_fRotate; XFPoint m_aRotatePoint; double m_fScaleX; diff --git a/lotuswordpro/source/filter/xfilter/xfliststyle.hxx b/lotuswordpro/source/filter/xfilter/xfliststyle.hxx index 12324cb..e145f17 100644 --- a/lotuswordpro/source/filter/xfilter/xfliststyle.hxx +++ b/lotuswordpro/source/filter/xfilter/xfliststyle.hxx @@ -175,9 +175,6 @@ class XFListLevelImage : public XFListLevel public: virtual void ToXml(IXFStream *pStrm) override; private: - sal_Int16 m_nWidth; - sal_Int16 m_nHeight; - OUString m_strBinaryData; }; class XFListStyle : public XFStyle commit 2e1d74dc4fb4590fd7ded360457ad867a9002e94 Author: Noel Grandin <n...@peralex.com> Date: Fri Nov 20 14:54:04 2015 +0200 loplugin:unusedfields idl,idlc Change-Id: I39816fc613aadb5250eed39fd0c6830abe1cde2c diff --git a/idl/inc/module.hxx b/idl/inc/module.hxx index 12b4b4a..b8dfa9d 100644 --- a/idl/inc/module.hxx +++ b/idl/inc/module.hxx @@ -26,10 +26,8 @@ struct SvNamePos { SvGlobalName aUUId; - sal_uInt32 nStmPos; - SvNamePos( const SvGlobalName & rName, sal_uInt32 nPos ) - : aUUId( rName ) - , nStmPos( nPos ) {} + SvNamePos( const SvGlobalName & rName ) + : aUUId( rName ) {} }; class SvMetaModule : public SvMetaExtern diff --git a/idlc/inc/idlc/astexpression.hxx b/idlc/inc/idlc/astexpression.hxx index 6723297..83fa6d7 100644 --- a/idlc/inc/idlc/astexpression.hxx +++ b/idlc/inc/idlc/astexpression.hxx @@ -81,7 +81,6 @@ struct AstExprValue bool bval; // Contains boolean expression value float fval; // Contains 32-bit float expr value double dval; // Contains 64-bit float expr value - sal_uInt32 eval; // Contains enumeration value } u; ExprType et; }; commit 60e61e4434b3c8443bfa1303122be6a9773a70f2 Author: Noel Grandin <n...@peralex.com> Date: Fri Nov 20 14:52:56 2015 +0200 loplugin:unusedfields i18npool Change-Id: I09dad8485f7a558dd389032a6052b88a8285afea diff --git a/i18npool/inc/breakiterator_unicode.hxx b/i18npool/inc/breakiterator_unicode.hxx index 2d41c01..22bcbb7 100644 --- a/i18npool/inc/breakiterator_unicode.hxx +++ b/i18npool/inc/breakiterator_unicode.hxx @@ -93,8 +93,6 @@ protected: } character, sentence, line, *icuBI; BI_Data words[4]; // 4 is css::i18n::WordType enumeration size - sal_Int16 aBreakType; - void SAL_CALL loadICUBreakIterator(const css::lang::Locale& rLocale, sal_Int16 rBreakType, sal_Int16 rWordType, const sal_Char* name, const OUString& rText) throw(css::uno::RuntimeException); }; diff --git a/i18npool/inc/textconversion.hxx b/i18npool/inc/textconversion.hxx index 6b8b16d..6071cdf 100644 --- a/i18npool/inc/textconversion.hxx +++ b/i18npool/inc/textconversion.hxx @@ -152,7 +152,6 @@ private: // for SChines/TChinese word conversion typedef struct { - sal_uInt16 start; sal_Int16 count; } STC_WordIndex; diff --git a/i18npool/source/breakiterator/breakiterator_unicode.cxx b/i18npool/source/breakiterator/breakiterator_unicode.cxx index 0db928b..91c1d35 100644 --- a/i18npool/source/breakiterator/breakiterator_unicode.cxx +++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx @@ -44,7 +44,6 @@ BreakIterator_Unicode::BreakIterator_Unicode() : cBreakIterator( "com.sun.star.i18n.BreakIterator_Unicode" ) // implementation name , lineRule( "line" ) , icuBI( nullptr ) - , aBreakType(0) { } diff --git a/i18npool/source/nativenumber/data/numberchar.h b/i18npool/source/nativenumber/data/numberchar.h index 5b28a6c..cd22f12 100644 --- a/i18npool/source/nativenumber/data/numberchar.h +++ b/i18npool/source/nativenumber/data/numberchar.h @@ -259,12 +259,6 @@ static const sal_Unicode MultiplierChar_7_CJK[][ExponentCount_7_CJK] = { {0x4EAC, 0x5146, 0x5104, 0x842C, 0x9621, 0x767E, 0x62FE} // Japanese Traditional }; -typedef struct { - sal_Int16 ExponentCount; - sal_Int16* MultiplierExponent; - sal_Unicode *MultiplierChar; -} Multiplier; - } } } } #endif // INCLUDED_I18NPOOL_SOURCE_NATIVENUMBER_DATA_NUMBERCHAR_H commit 275ccca3d266e8ffd837b53a35bc2cbd6cb95660 Author: Noel Grandin <n...@peralex.com> Date: Fri Nov 20 14:48:17 2015 +0200 loplugin:unusedfields helpcompiler Change-Id: I8a4feaea642cf781fde54e4afc5cd98e326f8db3 diff --git a/helpcompiler/inc/BasCodeTagger.hxx b/helpcompiler/inc/BasCodeTagger.hxx index a0c7f29..ccc7582 100644 --- a/helpcompiler/inc/BasCodeTagger.hxx +++ b/helpcompiler/inc/BasCodeTagger.hxx @@ -30,7 +30,6 @@ class L10N_DLLPUBLIC BasicCodeTagger xmlDocPtr m_pDocument; std::list<xmlNodePtr> m_BasicCodeContainerTags; LibXmlTreeWalker *m_pXmlTreeWalker; - std::list<std::string> m_BasicCodeStringList; SyntaxHighlighter m_Highlighter; bool m_bTaggingCompleted; void tagParagraph( xmlNodePtr paragraph ); diff --git a/helpcompiler/inc/HelpLinker.hxx b/helpcompiler/inc/HelpLinker.hxx index 21873e3..d416cf2 100644 --- a/helpcompiler/inc/HelpLinker.hxx +++ b/helpcompiler/inc/HelpLinker.hxx @@ -30,7 +30,6 @@ class L10N_DLLPUBLIC IndexerPreProcessor { private: - std::string m_aModuleName; fs::path m_fsIndexBaseDir; fs::path m_fsCaptionFilesDirName; fs::path m_fsContentFilesDirName; @@ -39,7 +38,7 @@ private: xsltStylesheetPtr m_xsltStylesheetPtrContent; public: - IndexerPreProcessor( const std::string& aModuleName, const fs::path& fsIndexBaseDir, + IndexerPreProcessor( const fs::path& fsIndexBaseDir, const fs::path& idxCaptionStylesheet, const fs::path& idxContentStylesheet ); ~IndexerPreProcessor(); diff --git a/helpcompiler/source/HelpCompiler.cxx b/helpcompiler/source/HelpCompiler.cxx index 5d37091..85a82d0 100644 --- a/helpcompiler/source/HelpCompiler.cxx +++ b/helpcompiler/source/HelpCompiler.cxx @@ -263,7 +263,6 @@ public: } void traverse( xmlNodePtr parentNode ); private: - std::string module; std::string dump(xmlNodePtr node); }; diff --git a/helpcompiler/source/HelpLinker.cxx b/helpcompiler/source/HelpLinker.cxx index 33e684a..7d4cfe5 100644 --- a/helpcompiler/source/HelpLinker.cxx +++ b/helpcompiler/source/HelpLinker.cxx @@ -39,10 +39,9 @@ #include <memory> IndexerPreProcessor::IndexerPreProcessor - ( const std::string& aModuleName, const fs::path& fsIndexBaseDir, + ( const fs::path& fsIndexBaseDir, const fs::path& idxCaptionStylesheet, const fs::path& idxContentStylesheet ) - : m_aModuleName( aModuleName ) - , m_fsIndexBaseDir( fsIndexBaseDir ) + : m_fsIndexBaseDir( fsIndexBaseDir ) { m_fsCaptionFilesDirName = fsIndexBaseDir / "caption"; fs::create_directory( m_fsCaptionFilesDirName ); @@ -270,9 +269,7 @@ void HelpLinker::addBookmark( FILE* pFile_DBHelp, std::string thishid, void HelpLinker::initIndexerPreProcessor() { delete m_pIndexerPreProcessor; - std::string mod = module; - std::transform (mod.begin(), mod.end(), mod.begin(), tocharlower); - m_pIndexerPreProcessor = new IndexerPreProcessor( mod, indexDirParentName, + m_pIndexerPreProcessor = new IndexerPreProcessor( indexDirParentName, idxCaptionStylesheet, idxContentStylesheet ); } commit fafac0d248c3ebc8eb9a9cef5fa68f193d851b33 Author: Noel Grandin <n...@peralex.com> Date: Fri Nov 20 14:38:54 2015 +0200 loplugin:unusedfields forms,formula,fpicker,framework Change-Id: Ic7af56ac801c1e5b3fcf3c4e8413656e96220279 diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx index d3cbc30..3ac6da0 100644 --- a/forms/source/component/FormComponent.cxx +++ b/forms/source/component/FormComponent.cxx @@ -334,7 +334,6 @@ OBoundControl::OBoundControl( const Reference< XComponentContext >& _rxContext, :OControl( _rxContext, _rAggregateService, _bSetDelegator ) ,m_bLocked(false) ,m_aOriginalFont( EmptyFontDescriptor() ) - ,m_nOriginalTextLineColor( 0 ) { } diff --git a/forms/source/inc/FormComponent.hxx b/forms/source/inc/FormComponent.hxx index 0faf022..8973065 100644 --- a/forms/source/inc/FormComponent.hxx +++ b/forms/source/inc/FormComponent.hxx @@ -269,10 +269,8 @@ class OBoundControl :public OControl protected: bool m_bLocked : 1; - OUString m_sOriginalHelpText; // as long as the text/value is invalid, we change the help text of our peer css::awt::FontDescriptor m_aOriginalFont; // as long as the text/value is invalid, we also change the font - sal_Int32 m_nOriginalTextLineColor; // (we add red underlining) public: OBoundControl( diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx index 4fe6478..8b87bdf 100644 --- a/formula/source/ui/dlg/formula.cxx +++ b/formula/source/ui/dlg/formula.cxx @@ -146,7 +146,6 @@ public: ::std::map<FormulaToken*,sheet::FormulaToken> m_aTokenMap; IFormulaEditorHelper* m_pHelper; VclPtr<Dialog> m_pParent; - IControlReferenceHandler* m_pDlg; VclPtr<TabControl> m_pTabCtrl; VclPtr<VclVBox> m_pParaWinBox; VclPtr<ParaWin> pParaWin; @@ -187,7 +186,6 @@ public: const OUString aTitle1; const OUString aTitle2; - const OUString aTxtEnd; OUString aTxtOk; // behind aBtnEnd FormulaHelper m_aFormulaHelper; @@ -233,14 +231,12 @@ FormulaDlg_Impl::FormulaDlg_Impl(Dialog* pParent m_pBinaryOpCodesEnd(nullptr), m_pHelper (_pHelper), m_pParent (pParent), - m_pDlg (_pDlg), pTheRefEdit (nullptr), pTheRefButton (nullptr), pMEdit (nullptr), bUserMatrixFlag (false), aTitle1 ( ModuleRes( STR_TITLE1 ) ), aTitle2 ( ModuleRes( STR_TITLE2 ) ), - aTxtEnd ( ModuleRes( STR_END ) ), m_aFormulaHelper(_pFunctionMgr), bIsShutDown (false), bMakingTree (false), diff --git a/fpicker/source/office/iodlgimp.cxx b/fpicker/source/office/iodlgimp.cxx index 4bc2ecb..c5e0552 100644 --- a/fpicker/source/office/iodlgimp.cxx +++ b/fpicker/source/office/iodlgimp.cxx @@ -239,8 +239,7 @@ SvtExpFileDlg_Impl::SvtExpFileDlg_Impl( WinBits ) : _bDoubleClick ( false ), m_bNeedDelayedFilterExecute ( false ), _pDefaultFilter ( nullptr ), - _bMultiSelection ( false ), - _bFolderHasOpened ( false ) + _bMultiSelection ( false ) { } diff --git a/fpicker/source/office/iodlgimp.hxx b/fpicker/source/office/iodlgimp.hxx index 3db543b..5452c94 100644 --- a/fpicker/source/office/iodlgimp.hxx +++ b/fpicker/source/office/iodlgimp.hxx @@ -181,8 +181,6 @@ public: // remember sizes OUString _aIniKey; - bool _bFolderHasOpened; - SvtExpFileDlg_Impl( WinBits nBits ); ~SvtExpFileDlg_Impl(); diff --git a/framework/inc/uielement/macrosmenucontroller.hxx b/framework/inc/uielement/macrosmenucontroller.hxx index a46c822..c794419 100644 --- a/framework/inc/uielement/macrosmenucontroller.hxx +++ b/framework/inc/uielement/macrosmenucontroller.hxx @@ -52,7 +52,6 @@ namespace framework }; css::uno::Reference< css::uno::XComponentContext > m_xContext; css::uno::Reference< css::frame::XDispatchProvider > m_xDispatchProvider; - OUString m_aModuleIdentifier; css::uno::Reference< css::container::XNameAccess > m_xUICommandLabels; public: diff --git a/framework/inc/uielement/menubarmanager.hxx b/framework/inc/uielement/menubarmanager.hxx index 5f41fb6..0374b3f 100644 --- a/framework/inc/uielement/menubarmanager.hxx +++ b/framework/inc/uielement/menubarmanager.hxx @@ -173,17 +173,12 @@ class MenuBarManager : public css::frame::XStatusListener , css::uno::Reference< css::frame::XStatusListener >& xManager, css::uno::Reference< css::frame::XDispatch >& rDispatch ) : nItemId( aItemId ), - bCheckHide( true ), xSubMenuManager( xManager ), xMenuItemDispatch( rDispatch ) {} sal_uInt16 nItemId; - bool bCheckHide; OUString aTargetFrame; OUString aMenuItemURL; - OUString aFilter; - OUString aPassword; - OUString aTitle; css::uno::Reference< css::frame::XStatusListener > xSubMenuManager; css::uno::Reference< css::frame::XDispatch > xMenuItemDispatch; css::uno::Reference< css::frame::XPopupMenuController > xPopupMenuController; diff --git a/framework/source/uielement/uicommanddescription.cxx b/framework/source/uielement/uicommanddescription.cxx index 462c69d..9ab1462 100644 --- a/framework/source/uielement/uicommanddescription.cxx +++ b/framework/source/uielement/uicommanddescription.cxx @@ -48,12 +48,6 @@ using namespace ::com::sun::star::frame; // Namespace -struct ModuleToCommands -{ - const char* pModuleId; - const char* pCommands; -}; - static const char CONFIGURATION_ROOT_ACCESS[] = "/org.openoffice.Office.UI."; static const char CONFIGURATION_CMD_ELEMENT_ACCESS[] = "/UserInterface/Commands"; static const char CONFIGURATION_POP_ELEMENT_ACCESS[] = "/UserInterface/Popups"; commit b55fb34c4baab993cf3286448b6c00b5ae095be0 Author: Noel Grandin <n...@peralex.com> Date: Fri Nov 20 14:37:01 2015 +0200 loplugin:unusedfields filter Change-Id: I6c049c5318b71c48cd4e64d2b051035012dc11e4 diff --git a/filter/source/flash/swfexporter.cxx b/filter/source/flash/swfexporter.cxx index 8834965..360da87 100644 --- a/filter/source/flash/swfexporter.cxx +++ b/filter/source/flash/swfexporter.cxx @@ -62,15 +62,9 @@ using com::sun::star::lang::XServiceInfo; PageInfo::PageInfo() - : meFadeEffect( FadeEffect_NONE ) - , meFadeSpeed( AnimationSpeed_MEDIUM ) - , mnDuration( 0 ) - , mnChange( 0 ) - , mnBackgroundID( 0 ) + : mnBackgroundID( 0 ) , mnObjectsID( 0) , mnForegroundID( 0) - , mbBackgroundVisible( false ) - , mbBackgroundObjectsVisible( false ) { } diff --git a/filter/source/flash/swfexporter.hxx b/filter/source/flash/swfexporter.hxx index 8895f39..e4b831e 100644 --- a/filter/source/flash/swfexporter.hxx +++ b/filter/source/flash/swfexporter.hxx @@ -70,8 +70,7 @@ public: sal_Int32 mnPresOrder; - css::presentation::ClickAction meClickAction; - OUString maBookmark; + OUString maBookmark; sal_Int32 mnDimColor; bool mbDimHide; @@ -89,7 +88,6 @@ public: meTextEffect( css::presentation::AnimationEffect_NONE ), meEffectSpeed( css::presentation::AnimationSpeed_MEDIUM ), mnPresOrder( 0 ), - meClickAction( css::presentation::ClickAction_NONE ), mnDimColor( 0 ), mbDimHide( false ), mbDimPrev( false ), @@ -99,32 +97,12 @@ public: }; -struct ShapeAnimationInfo -{ - ShapeInfo* mpShapeInfo; - sal_uInt16 mnDepth; - - ShapeAnimationInfo( ShapeInfo* pShapeInfo, sal_uInt16 nDepth ) : mpShapeInfo( pShapeInfo ), mnDepth( nDepth ) {} -}; - - - - struct PageInfo { - css::presentation::FadeEffect meFadeEffect; - css::presentation::AnimationSpeed meFadeSpeed; - - sal_Int32 mnDuration; - sal_Int32 mnChange; - sal_uInt16 mnBackgroundID; sal_uInt16 mnObjectsID; sal_uInt16 mnForegroundID; - bool mbBackgroundVisible; - bool mbBackgroundObjectsVisible; - ::std::vector<ShapeInfo*> maShapesVector; diff --git a/filter/source/flash/swfwriter.hxx b/filter/source/flash/swfwriter.hxx index b362082..333c2af 100644 --- a/filter/source/flash/swfwriter.hxx +++ b/filter/source/flash/swfwriter.hxx @@ -413,9 +413,6 @@ private: sal_uInt16 mnNextId; sal_uInt32 mnFrames; -// css::uno::Reference< css::io::XOutputStream > mxOutStream; - oslFileHandle mxOutStream; - utl::TempFile maMovieTempFile; utl::TempFile maFontsTempFile; diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx index c2d9bfb..3c63a76 100644 --- a/filter/source/graphicfilter/eps/eps.cxx +++ b/filter/source/graphicfilter/eps/eps.cxx @@ -60,14 +60,6 @@ using namespace ::com::sun::star::uno; // -----------------------------field-types------------------------------ -struct ChrSet -{ - struct ChrSet * pSucc; - sal_uInt8 nSet; - OUString aName; - FontWeight eWeight; -}; - struct StackMember { struct StackMember * pSucc; @@ -146,7 +138,6 @@ private: vcl::Font maFont; vcl::Font maLastFont; sal_uInt8 nChrSet; - ChrSet* pChrSetList; // list of character sets sal_uInt8 nNextChrSetId; // first unused ChrSet-Id PSLZWCTreeNode* pTable; // LZW compression data @@ -283,7 +274,6 @@ PSWriter::PSWriter() , maFont() , maLastFont() , nChrSet(0) - , pChrSetList(nullptr) , nNextChrSetId(0) , pTable(nullptr) , pPrefix(nullptr) @@ -407,7 +397,6 @@ bool PSWriter::WritePS( const Graphic& rGraphic, SvStream& rTargetStream, Filter } // global default value setting - ChrSet* pCS; StackMember* pGS; if (rGraphic.GetType() == GRAPHIC_GDIMETAFILE) @@ -447,7 +436,6 @@ bool PSWriter::WritePS( const Graphic& rGraphic, SvStream& rTargetStream, Filter bRegionChanged = false; nChrSet = 0x00; - pChrSetList = nullptr; nNextChrSetId = 1; if( pMTF->GetActionSize() ) @@ -464,12 +452,6 @@ bool PSWriter::WritePS( const Graphic& rGraphic, SvStream& rTargetStream, Filter rTargetStream.WriteUInt32( nPosition - nPSPosition ); rTargetStream.Seek( nPosition ); } - while( pChrSetList ) - { - pCS=pChrSetList; - pChrSetList=pCS->pSucc; - delete pCS; - } while( pGDIStack ) { pGS=pGDIStack; diff --git a/filter/source/graphicfilter/icgm/cgm.cxx b/filter/source/graphicfilter/icgm/cgm.cxx index ead44f8..b71aa03 100644 --- a/filter/source/graphicfilter/icgm/cgm.cxx +++ b/filter/source/graphicfilter/icgm/cgm.cxx @@ -68,8 +68,8 @@ CGM::CGM( sal_uInt32 nMode, uno::Reference< frame::XModel > const & rModel ) , mnElementSize(0) , mpGDIMetaFile(nullptr) { - pElement = new CGMElements( *this ); - pCopyOfE = new CGMElements( *this ); + pElement = new CGMElements; + pCopyOfE = new CGMElements; } CGM::~CGM() diff --git a/filter/source/graphicfilter/icgm/chart.cxx b/filter/source/graphicfilter/icgm/chart.cxx index 73961fe..5c9e2ce 100644 --- a/filter/source/graphicfilter/icgm/chart.cxx +++ b/filter/source/graphicfilter/icgm/chart.cxx @@ -21,9 +21,8 @@ #include <chart.hxx> -CGMChart::CGMChart(CGM& rCGM) - : mpCGM(&rCGM) - , mnCurrentFileType(0) +CGMChart::CGMChart() + : mnCurrentFileType(0) { for ( sal_Int8 i = 0; i < 7; i++ ) { diff --git a/filter/source/graphicfilter/icgm/chart.hxx b/filter/source/graphicfilter/icgm/chart.hxx index 8a5067d..632ec0a 100644 --- a/filter/source/graphicfilter/icgm/chart.hxx +++ b/filter/source/graphicfilter/icgm/chart.hxx @@ -113,26 +113,6 @@ struct BulletOption } }; -struct BulDef -{ - char btype; - char bsize; - char bcolor; - char bnumber; - BulDef() - : btype(0) - , bsize(0) - , bcolor(0) - , bnumber(0) - { - } -}; - -typedef struct BulletLines -{ - BulDef nBulDef[ 48 ]; -} BulletLines; - struct IntSettings { sal_uInt16 nCountry; @@ -215,19 +195,17 @@ class CGMChart friend class CGMImpressOutAct; protected: - CGM* mpCGM; sal_Int8 mnCurrentFileType; ::std::vector< TextEntry* > maTextEntryList; DataNode mDataNode[ 7 ]; ChartZone mChartZone; PageOrientDim mPageOrientDim; BulletOption mBulletOption; - BulletLines mBulletLines; ZoneOption mZoneOption; IntSettings mIntSettings; public: - CGMChart( CGM& rCGM ); + CGMChart(); ~CGMChart(); void DeleteTextEntry( TextEntry* ); diff --git a/filter/source/graphicfilter/icgm/class7.cxx b/filter/source/graphicfilter/icgm/class7.cxx index 21951e8..b4f7994 100644 --- a/filter/source/graphicfilter/icgm/class7.cxx +++ b/filter/source/graphicfilter/icgm/class7.cxx @@ -42,7 +42,7 @@ void CGM::ImplDoClass7() case 0x000 : /*AppData - Beginning of File Opcodes*/ { if ( mpChart == nullptr ) - mpChart = new CGMChart( *this ); + mpChart = new CGMChart; mpChart->mnCurrentFileType = pAppData[ 3 ]; } break; @@ -179,11 +179,7 @@ void CGM::ImplDoClass7() mpChart->mBulletOption = *reinterpret_cast<BulletOption*>( pAppData ); } break; - case 0x454 : /*AppData - BULLETLINES*/ - { - mpChart->mBulletLines = *reinterpret_cast<BulletLines*>( pAppData ); - } - break; + case 0x454 : /*AppData - BULLETLINES*/break; case 0x456 : /*AppData - BULAUTOBUILD */break; case 0x4B2 : /*AppData - TBLTEXTOPTN */break; case 0x4B6 : /*AppData - TBLOPTN */break; diff --git a/filter/source/graphicfilter/icgm/elements.cxx b/filter/source/graphicfilter/icgm/elements.cxx index 2be1308..2172b72 100644 --- a/filter/source/graphicfilter/icgm/elements.cxx +++ b/filter/source/graphicfilter/icgm/elements.cxx @@ -23,8 +23,7 @@ -CGMElements::CGMElements( CGM& rCGM ) : - mpCGM ( &rCGM ) +CGMElements::CGMElements() { Init(); }; diff --git a/filter/source/graphicfilter/icgm/elements.hxx b/filter/source/graphicfilter/icgm/elements.hxx index fc7acac..b2a5fcd 100644 --- a/filter/source/graphicfilter/icgm/elements.hxx +++ b/filter/source/graphicfilter/icgm/elements.hxx @@ -32,7 +32,6 @@ class CGMElements { void ImplInsertHatch( sal_Int32 Key, int Style, long Distance, long Angle ); public: - CGM* mpCGM; long nMetaFileVersion; sal_uInt32 nIntegerPrecision; // maybe 1, 2, 4 Bytes @@ -125,8 +124,8 @@ class CGMElements // Delimiter Counts -> which will be increased by each 'begin' operation // and decreased by each 'end' operation - bool bSegmentCount; - explicit CGMElements( CGM& rCGM ); + bool bSegmentCount; + explicit CGMElements(); ~CGMElements(); CGMElements& operator=( CGMElements& ); void Init(); diff --git a/filter/source/graphicfilter/itga/itga.cxx b/filter/source/graphicfilter/itga/itga.cxx index 2a06bd5..e36146b 100644 --- a/filter/source/graphicfilter/itga/itga.cxx +++ b/filter/source/graphicfilter/itga/itga.cxx @@ -57,12 +57,11 @@ struct TGAFileFooter struct TGAExtension { sal_uInt16 nExtensionSize; - char sAuthorName[41]; - char sAuthorComment[324]; - char sDateTimeStamp[12]; - char sJobNameID[41]; - sal_uInt16 nJobTime[3]; - char sSoftwareID[41]; + char sAuthorName[41]; + char sAuthorComment[324]; + char sDateTimeStamp[12]; + char sJobNameID[41]; + char sSoftwareID[41]; sal_uInt16 nSoftwareVersionNumber; sal_uInt8 nSoftwareVersionLetter; sal_uInt32 nKeyColor; diff --git a/filter/source/msfilter/eschesdo.cxx b/filter/source/msfilter/eschesdo.cxx index 16ea2f1..d325345 100644 --- a/filter/source/msfilter/eschesdo.cxx +++ b/filter/source/msfilter/eschesdo.cxx @@ -68,16 +68,12 @@ ImplEESdrWriter::ImplEESdrWriter( EscherEx& rEx ) , mpPicStrm(nullptr) , mpHostAppData(nullptr) , mnPagesWritten(0) - , mnShapeMasterTitle(0) - , mnShapeMasterBody(0) , mnIndices(0) , mnOutlinerCount(0) - , mnPrevTextStyle(0) , mnStatMaxValue(0) , mnEffectCount(0) , mbIsTitlePossible(false) , mbStatusIndicator(false) - , mbStatus(false) { } diff --git a/filter/source/msfilter/eschesdo.hxx b/filter/source/msfilter/eschesdo.hxx index 3acb304..f4b50ca 100644 --- a/filter/source/msfilter/eschesdo.hxx +++ b/filter/source/msfilter/eschesdo.hxx @@ -124,20 +124,17 @@ protected: sal_uInt32 mnPagesWritten; - sal_uInt32 mnShapeMasterTitle; sal_uInt32 mnShapeMasterBody; // per page values sal_uInt32 mnIndices; sal_uInt32 mnOutlinerCount; - sal_uInt32 mnPrevTextStyle; sal_uInt32 mnStatMaxValue; sal_uInt16 mnEffectCount; bool mbIsTitlePossible; bool mbStatusIndicator; - bool mbStatus; explicit ImplEESdrWriter( EscherEx& rEx ); diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 41c1e5a..235c274 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -152,11 +152,9 @@ static sal_uInt32 nMSOleObjCntr = 0; struct SvxMSDffBLIPInfo { - sal_uInt16 nBLIPType; ///< type of BLIP: e.g. 6 for PNG sal_uLong nFilePos; ///< offset of the BLIP in data strem - sal_uLong nBLIPSize; ///< number of bytes that the BLIP needs in stream - SvxMSDffBLIPInfo(sal_uInt16 nBType, sal_uLong nFPos, sal_uLong nBSize): - nBLIPType( nBType ), nFilePos( nFPos ), nBLIPSize( nBSize ){} + SvxMSDffBLIPInfo(sal_uLong nFPos): + nFilePos( nFPos ) {} }; /// the following will be sorted by the order of their appearance: @@ -5886,7 +5884,7 @@ void SvxMSDffManager::GetDrawingGroupContainerData( SvStream& rSt, sal_uLong nLe nBLIPCount++; // now save the info for later access - m_pBLIPInfos->push_back(SvxMSDffBLIPInfo(nInst, nBLIPPos, nBLIPLen)); + m_pBLIPInfos->push_back(SvxMSDffBLIPInfo(nBLIPPos)); } rSt.SeekRel( nLength ); } diff --git a/filter/source/svg/gfxtypes.hxx b/filter/source/svg/gfxtypes.hxx index fddefde..3d502da 100644 --- a/filter/source/svg/gfxtypes.hxx +++ b/filter/source/svg/gfxtypes.hxx @@ -72,7 +72,6 @@ struct Gradient GradientType meType; union { - double test; struct { double mfX1; diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx index f33cb4d..14981f5 100644 --- a/filter/source/svg/svgwriter.cxx +++ b/filter/source/svg/svgwriter.cxx @@ -98,8 +98,6 @@ SVGAttributeWriter::SVGAttributeWriter( SVGExport& rExport, SVGFontExport& rFont , mrFontExport( rFontExport ) , mpElemFont( nullptr ) , mpElemPaint( nullptr ) - , maLineJoin(basegfx::B2DLineJoin::NONE) - , maLineCap(css::drawing::LineCap_BUTT) { } diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx index 1175a26..7afb41b 100644 --- a/filter/source/svg/svgwriter.hxx +++ b/filter/source/svg/svgwriter.hxx @@ -97,9 +97,6 @@ private: SvXMLElementExport* mpElemFont; SvXMLElementExport* mpElemPaint; - basegfx::B2DLineJoin maLineJoin; - css::drawing::LineCap maLineCap; - SVGAttributeWriter(); static double ImplRound( double fVal, sal_Int32 nDecs = 3 ); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits