diff --git a/framework/inc/xml/imagesdocumenthandler.hxx b/framework/inc/xml/imagesdocumenthandler.hxx index 727d33a77478..2dd1ee2bda1d 100644 --- a/framework/inc/xml/imagesdocumenthandler.hxx +++ b/framework/inc/xml/imagesdocumenthandler.hxx @@ -123,7 +123,6 @@ class OWriteImagesDocumentHandler final const ImageItemDescriptorList& m_rImageItemList; css::uno::Reference< css::xml::sax::XDocumentHandler > m_xWriteDocumentHandler; - rtl::Reference< ::comphelper::AttributeList > m_xEmptyList; OUString m_aXMLImageNS; OUString m_aAttributeXlinkType; OUString m_aAttributeValueSimple; diff --git a/framework/inc/xml/statusbardocumenthandler.hxx b/framework/inc/xml/statusbardocumenthandler.hxx index 04e74f376010..c4cdb0429ed4 100644 --- a/framework/inc/xml/statusbardocumenthandler.hxx +++ b/framework/inc/xml/statusbardocumenthandler.hxx @@ -124,7 +124,6 @@ class OWriteStatusBarDocumentHandler final css::uno::Reference< css::container::XIndexAccess > m_aStatusBarItems; css::uno::Reference< css::xml::sax::XDocumentHandler > m_xWriteDocumentHandler; - rtl::Reference< comphelper::AttributeList > m_xEmptyList; OUString m_aXMLStatusBarNS; OUString m_aXMLXlinkNS; OUString m_aAttributeURL; diff --git a/framework/source/fwe/xml/statusbardocumenthandler.cxx b/framework/source/fwe/xml/statusbardocumenthandler.cxx index 46e734e34f64..2294e7f51ea4 100644 --- a/framework/source/fwe/xml/statusbardocumenthandler.cxx +++ b/framework/source/fwe/xml/statusbardocumenthandler.cxx @@ -453,7 +453,6 @@ OWriteStatusBarDocumentHandler::OWriteStatusBarDocumentHandler( m_aStatusBarItems( aStatusBarItems ), m_xWriteDocumentHandler( rWriteDocumentHandler ) { - m_xEmptyList = new ::comphelper::AttributeList; m_aXMLXlinkNS = XMLNS_XLINK_PREFIX; m_aXMLStatusBarNS = XMLNS_STATUSBAR_PREFIX; } diff --git a/framework/source/xml/imagesdocumenthandler.cxx b/framework/source/xml/imagesdocumenthandler.cxx index fe20553ee878..e11af9aae325 100644 --- a/framework/source/xml/imagesdocumenthandler.cxx +++ b/framework/source/xml/imagesdocumenthandler.cxx @@ -285,7 +285,6 @@ OWriteImagesDocumentHandler::OWriteImagesDocumentHandler( m_rImageItemList( rItems ), m_xWriteDocumentHandler( rWriteDocumentHandler ) { - m_xEmptyList = new ::comphelper::AttributeList; m_aXMLImageNS = XMLNS_IMAGE_PREFIX; m_aAttributeXlinkType = ATTRIBUTE_XLINK_TYPE; m_aAttributeValueSimple = ATTRIBUTE_XLINK_TYPE_VALUE; diff --git a/include/package/Inflater.hxx b/include/package/Inflater.hxx index eb28d3a547f2..6ecf3eb63757 100644 --- a/include/package/Inflater.hxx +++ b/include/package/Inflater.hxx @@ -55,8 +55,8 @@ class UNLESS_MERGELIBS(DLLPUBLIC_PACKAGE) InflaterBytes final { typedef struct z_stream_s z_stream; - bool bFinished, bNeedDict; - sal_Int32 nOffset, nLength, nLastInflateError; + bool bFinished; + sal_Int32 nOffset, nLength; std::unique_ptr pStream; const sal_Int8* sInBuffer; sal_Int32 doInflateBytes (sal_Int8* pOutBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength); diff --git a/include/sfx2/sidebar/TabBar.hxx b/include/sfx2/sidebar/TabBar.hxx index 06707f1bc339..a453c58cc579 100644 --- a/include/sfx2/sidebar/TabBar.hxx +++ b/include/sfx2/sidebar/TabBar.hxx @@ -103,7 +103,6 @@ private: typedef ::std::function DeckActivationFunctor; DeckActivationFunctor maDeckActivationFunctor; bool mbIsHidden; - bool mbIsHiddenByDefault; }; typedef ::std::vector> ItemContainer; ItemContainer maItems; diff --git a/package/source/zipapi/Inflater.cxx b/package/source/zipapi/Inflater.cxx index acabee88fb45..5a09415abe6c 100644 --- a/package/source/zipapi/Inflater.cxx +++ b/package/source/zipapi/Inflater.cxx @@ -136,10 +136,8 @@ sal_Int32 Inflater::doInflateBytes (Sequence < sal_Int8 > &rBuffer, sal_Int32 n InflaterBytes::InflaterBytes(bool bNoWrap) : bFinished(false), - bNeedDict(false), nOffset(0), nLength(0), - nLastInflateError(0), sInBuffer(nullptr) { pStream.reset(new z_stream); @@ -201,12 +199,9 @@ sal_Int32 InflaterBytes::doInflateBytes (sal_Int8* pOutBuffer, sal_Int32 nNewOff { if ( !pStream ) { - nLastInflateError = Z_STREAM_ERROR; return 0; } - nLastInflateError = 0; - pStream->next_in = reinterpret_cast( sInBuffer + nOffset ); pStream->avail_in = nLength; pStream->next_out = reinterpret_cast < unsigned char* > ( pOutBuffer + nNewOffset ); @@ -229,15 +224,13 @@ sal_Int32 InflaterBytes::doInflateBytes (sal_Int8* pOutBuffer, sal_Int32 nNewOff return nNewLength - pStream->avail_out; case Z_NEED_DICT: - bNeedDict = true; nOffset += nLength - pStream->avail_in; nLength = pStream->avail_in; return 0; default: // it is no error, if there is no input or no output - if ( nLength && nNewLength ) - nLastInflateError = nResult; + break; } return 0; diff --git a/sc/inc/SolverSettings.hxx b/sc/inc/SolverSettings.hxx index b9f59aa1ba3f..442570eaee6c 100644 --- a/sc/inc/SolverSettings.hxx +++ b/sc/inc/SolverSettings.hxx @@ -168,8 +168,6 @@ private: // SCO only OUString m_sLibrarySize; - css::uno::Sequence m_aEngineOptions; - std::vector m_aConstraints; void Initialize(); diff --git a/sc/source/core/data/SolverSettings.cxx b/sc/source/core/data/SolverSettings.cxx index bf325c204b43..215a662080f9 100644 --- a/sc/source/core/data/SolverSettings.cxx +++ b/sc/source/core/data/SolverSettings.cxx @@ -778,9 +778,6 @@ void SolverSettings::ResetToDefaults() // The default solver engine is the first implementation available m_sLOEngineName = aEngineNames[0]; - // Default engine options - m_aEngineOptions = ScSolverUtil::GetDefaults(m_sLOEngineName); - // Clear all constraints m_aConstraints.clear(); } diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx index eb495f58578b..8993b10fd92d 100644 --- a/sfx2/source/sidebar/TabBar.cxx +++ b/sfx2/source/sidebar/TabBar.cxx @@ -141,7 +141,6 @@ void TabBar::SetDecks(const ResourceManager::DeckContextDescriptorContainer& rDe xItem->mxButton->connect_clicked(LINK(xItem.get(), TabBar::Item, HandleClick)); xItem->maDeckActivationFunctor = maDeckActivationFunctor; xItem->mbIsHidden = !xDescriptor->mbIsEnabled; - xItem->mbIsHiddenByDefault = xItem->mbIsHidden; // the default is the state while creating xItem->mxButton->set_visible(deck.mbIsEnabled); } @@ -253,7 +252,6 @@ TabBar::Item::Item(TabBar& rTabBar) , mxBuilder(Application::CreateBuilder(rTabBar.GetContainer(), u"sfx/ui/tabbutton.ui"_ustr)) , mxButton(mxBuilder->weld_toolbar(u"button"_ustr)) , mbIsHidden(false) - , mbIsHiddenByDefault(false) { } diff --git a/sw/source/uibase/sidebar/CommentsPanel.cxx b/sw/source/uibase/sidebar/CommentsPanel.cxx index 0bfd33685093..ab50d9cfa439 100644 --- a/sw/source/uibase/sidebar/CommentsPanel.cxx +++ b/sw/source/uibase/sidebar/CommentsPanel.cxx @@ -132,8 +132,6 @@ void Comment::InitControls(const SwPostItField* pPostItField) return; msText = pPostItField->GetText(); msAuthor = pPostItField->GetPar1(); - msInitials = pPostItField->GetInitials(); - msName = pPostItField->GetName(); maDate = Date(pPostItField->GetDateTime().GetDate()); maTime = tools::Time(pPostItField->GetDateTime().GetTime()); mbResolved = pPostItField->GetResolved(); diff --git a/sw/source/uibase/sidebar/CommentsPanel.hxx b/sw/source/uibase/sidebar/CommentsPanel.hxx index a258472c9235..48f63b9dc01a 100644 --- a/sw/source/uibase/sidebar/CommentsPanel.hxx +++ b/sw/source/uibase/sidebar/CommentsPanel.hxx @@ -68,8 +68,6 @@ private: sw::sidebar::CommentsPanel& mrCommentsPanel; OUString msText; OUString msAuthor; - OUString msInitials; //Initials of Author. - OUString msName; //Name of the comment Date maDate; tools::Time maTime;