[Libreoffice-commits] core.git: cui/source dbaccess/source desktop/source extensions/source forms/source framework/source rsc/inc rsc/source

Noel Grandin noel at peralex.com
Tue Apr 5 11:30:22 UTC 2016


 cui/source/options/optfltr.hxx                                        |    4 -
 dbaccess/source/ui/inc/RelationController.hxx                         |    2 
 dbaccess/source/ui/relationdesign/RelationController.cxx              |   10 +--
 desktop/source/deployment/dp_persmap.cxx                              |   15 +----
 desktop/source/deployment/inc/dp_persmap.h                            |    3 -
 desktop/source/deployment/manager/dp_activepackages.cxx               |    2 
 desktop/source/deployment/registry/configuration/dp_configuration.cxx |    2 
 extensions/source/bibliography/loadlisteneradapter.cxx                |   11 +---
 extensions/source/bibliography/loadlisteneradapter.hxx                |    4 -
 extensions/source/propctrlr/browserpage.cxx                           |    4 -
 extensions/source/propctrlr/browserpage.hxx                           |    2 
 extensions/source/propctrlr/browserview.cxx                           |    4 -
 extensions/source/propctrlr/browserview.hxx                           |    2 
 forms/source/component/DatabaseForm.cxx                               |   27 ++++------
 forms/source/component/DatabaseForm.hxx                               |    2 
 framework/source/inc/loadenv/loadenv.hxx                              |   23 +-------
 framework/source/loadenv/loadenv.cxx                                  |   11 +---
 rsc/inc/rsccont.hxx                                                   |    3 -
 rsc/source/res/rsccont.cxx                                            |    8 +-
 19 files changed, 51 insertions(+), 88 deletions(-)

New commits:
commit 9866efe3e5a670bab54d931be31e1989aeb382a7
Author: Noel Grandin <noel at peralex.com>
Date:   Tue Apr 5 08:03:35 2016 +0200

    loplugin:constantparam
    
    Change-Id: I821ed77a6c6014c9a82d31a4b117ed6f1b4abf18
    Reviewed-on: https://gerrit.libreoffice.org/23832
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noelgrandin at gmail.com>

diff --git a/cui/source/options/optfltr.hxx b/cui/source/options/optfltr.hxx
index ac825b7..d18bd23 100644
--- a/cui/source/options/optfltr.hxx
+++ b/cui/source/options/optfltr.hxx
@@ -68,8 +68,8 @@ class OfaMSFilterTabPage2 : public SfxTabPage
         virtual void    KeyInput( const KeyEvent& rKEvt ) override;
 
     public:
-        MSFltrSimpleTable(SvSimpleTableContainer& rParent, WinBits nBits = 0)
-            : SvSimpleTable(rParent, nBits)
+        MSFltrSimpleTable(SvSimpleTableContainer& rParent)
+            : SvSimpleTable(rParent, 0)
         {
         }
     };
diff --git a/dbaccess/source/ui/inc/RelationController.hxx b/dbaccess/source/ui/inc/RelationController.hxx
index 9488158..05e5d37b 100644
--- a/dbaccess/source/ui/inc/RelationController.hxx
+++ b/dbaccess/source/ui/inc/RelationController.hxx
@@ -41,7 +41,7 @@ namespace dbaui
         virtual void            Execute(sal_uInt16 nId, const css::uno::Sequence< css::beans::PropertyValue>& aArgs) override;
 
         void loadData();
-        TTableWindowData::value_type existsTable(const OUString& _rComposedTableName,bool _bCase) const;
+        TTableWindowData::value_type existsTable(const OUString& _rComposedTableName) const;
 
         // load the window positions out of the datasource
         void loadLayoutInformation();
diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx
index 3572e34..f884dcc 100644
--- a/dbaccess/source/ui/relationdesign/RelationController.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationController.cxx
@@ -443,18 +443,16 @@ void ORelationController::mergeData(const TTableConnectionData& _aConnectionData
     ::osl::MutexGuard aGuard( getMutex() );
 
     ::std::copy( _aConnectionData.begin(), _aConnectionData.end(), ::std::back_inserter( m_vTableConnectionData ));
-    //const Reference< XDatabaseMetaData> xMetaData = getConnection()->getMetaData();
-    const bool bCase = true;//xMetaData.is() && xMetaData->supportsMixedCaseQuotedIdentifiers();
     // here we are finished, so we can collect the table from connection data
     TTableConnectionData::const_iterator aConnDataIter = m_vTableConnectionData.begin();
     TTableConnectionData::const_iterator aConnDataEnd = m_vTableConnectionData.end();
     for(;aConnDataIter != aConnDataEnd;++aConnDataIter)
     {
-        if ( !existsTable((*aConnDataIter)->getReferencingTable()->GetComposedName(),bCase) )
+        if ( !existsTable((*aConnDataIter)->getReferencingTable()->GetComposedName()) )
         {
             m_vTableData.push_back((*aConnDataIter)->getReferencingTable());
         }
-        if ( !existsTable((*aConnDataIter)->getReferencedTable()->GetComposedName(),bCase) )
+        if ( !existsTable((*aConnDataIter)->getReferencedTable()->GetComposedName()) )
         {
             m_vTableData.push_back((*aConnDataIter)->getReferencedTable());
         }
@@ -533,9 +531,9 @@ void ORelationController::loadData()
     }
 }
 
-TTableWindowData::value_type ORelationController::existsTable(const OUString& _rComposedTableName,bool _bCase)  const
+TTableWindowData::value_type ORelationController::existsTable(const OUString& _rComposedTableName)  const
 {
-    ::comphelper::UStringMixEqual bCase(_bCase);
+    ::comphelper::UStringMixEqual bCase(true);
     TTableWindowData::const_iterator aIter = m_vTableData.begin();
     TTableWindowData::const_iterator aEnd = m_vTableData.end();
     for(;aIter != aEnd;++aIter)
diff --git a/desktop/source/deployment/dp_persmap.cxx b/desktop/source/deployment/dp_persmap.cxx
index f77aff0..78f5b42 100644
--- a/desktop/source/deployment/dp_persmap.cxx
+++ b/desktop/source/deployment/dp_persmap.cxx
@@ -35,11 +35,10 @@ namespace dp_misc
 
 static const char PmapMagic[4] = {'P','m','p','1'};
 
-PersistentMap::PersistentMap( OUString const & url_, bool readOnly )
+PersistentMap::PersistentMap( OUString const & url_ )
 :    m_MapFile( expandUnoRcUrl(url_) )
-,    m_bReadOnly( readOnly )
 ,    m_bIsOpen( false )
-,    m_bToBeCreated( !readOnly )
+,    m_bToBeCreated( true )
 ,    m_bIsDirty( false )
 {
     open();
@@ -47,7 +46,6 @@ PersistentMap::PersistentMap( OUString const & url_, bool readOnly )
 
 PersistentMap::PersistentMap()
 :    m_MapFile( OUString() )
-,    m_bReadOnly( false )
 ,    m_bIsOpen( false )
 ,    m_bToBeCreated( false )
 ,    m_bIsDirty( false )
@@ -141,9 +139,7 @@ static OString decodeString( const sal_Char* pEncChars, int nLen)
 void PersistentMap::open()
 {
     // open the existing file
-    sal_uInt32 nOpenFlags = osl_File_OpenFlag_Read;
-    if( !m_bReadOnly)
-        nOpenFlags |= osl_File_OpenFlag_Write;
+    sal_uInt32 nOpenFlags = osl_File_OpenFlag_Read | osl_File_OpenFlag_Write;
 
     const osl::File::RC rcOpen = m_MapFile.open( nOpenFlags);
     m_bIsOpen = (rcOpen == osl::File::E_None);
@@ -210,7 +206,6 @@ void PersistentMap::flush()
 {
     if( !m_bIsDirty)
         return;
-    OSL_ASSERT( !m_bReadOnly);
     if( m_bToBeCreated && !m_entries.empty())
     {
         const sal_uInt32 nOpenFlags = osl_File_OpenFlag_Read | osl_File_OpenFlag_Write | osl_File_OpenFlag_Create;
@@ -273,8 +268,6 @@ bool PersistentMap::get( OString * value, OString const & key ) const
 
 void PersistentMap::add( OString const & key, OString const & value )
 {
-    if( m_bReadOnly)
-        return;
     typedef std::pair<t_string2string_map::iterator,bool> InsertRC;
     InsertRC r = m_entries.insert( t_string2string_map::value_type(key,value));
     m_bIsDirty = r.second;
@@ -292,8 +285,6 @@ void PersistentMap::put( OString const & key, OString const & value )
 
 bool PersistentMap::erase( OString const & key )
 {
-    if( m_bReadOnly)
-        return false;
     size_t nCount = m_entries.erase( key);
     if( !nCount)
         return false;
diff --git a/desktop/source/deployment/inc/dp_persmap.h b/desktop/source/deployment/inc/dp_persmap.h
index 8923395..3b172ff 100644
--- a/desktop/source/deployment/inc/dp_persmap.h
+++ b/desktop/source/deployment/inc/dp_persmap.h
@@ -36,14 +36,13 @@ class PersistentMap
 {
     ::osl::File m_MapFile;
     t_string2string_map m_entries;
-    bool m_bReadOnly;
     bool m_bIsOpen;
     bool m_bToBeCreated;
     bool m_bIsDirty;
 
 public:
     ~PersistentMap();
-    PersistentMap( OUString const & url, bool readOnly );
+    PersistentMap( OUString const & url );
     /** in mem db */
     PersistentMap();
 
diff --git a/desktop/source/deployment/manager/dp_activepackages.cxx b/desktop/source/deployment/manager/dp_activepackages.cxx
index 83bb347..99cc5f8 100644
--- a/desktop/source/deployment/manager/dp_activepackages.cxx
+++ b/desktop/source/deployment/manager/dp_activepackages.cxx
@@ -118,7 +118,7 @@ ActivePackages::ActivePackages() {}
 
 ActivePackages::ActivePackages(OUString const & url)
 #if HAVE_FEATURE_EXTENSIONS
-    : m_map(url, false/*readOnly*/)
+    : m_map(url)
 #endif
 {
     (void) url;
diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.cxx b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
index 27e229a..6ffbc25 100644
--- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx
+++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
@@ -227,7 +227,7 @@ BackendImpl::BackendImpl(
         {
             try
             {
-                pMap.reset( new PersistentMap( aCompatURL, false ) );
+                pMap.reset( new PersistentMap( aCompatURL ) );
             }
             catch (const Exception &e)
             {
diff --git a/extensions/source/bibliography/loadlisteneradapter.cxx b/extensions/source/bibliography/loadlisteneradapter.cxx
index bb452bf..bb81feb 100644
--- a/extensions/source/bibliography/loadlisteneradapter.cxx
+++ b/extensions/source/bibliography/loadlisteneradapter.cxx
@@ -59,12 +59,11 @@ namespace bib
         }
     }
 
-    OComponentAdapterBase::OComponentAdapterBase( const Reference< XComponent >& _rxComp, bool _bAutoRelease )
+    OComponentAdapterBase::OComponentAdapterBase( const Reference< XComponent >& _rxComp )
         :m_xComponent( _rxComp )
         ,m_pListener( nullptr )
         ,m_nLockCount( 0 )
         ,m_bListening( false )
-        ,m_bAutoRelease( _bAutoRelease )
     {
         OSL_ENSURE( m_xComponent.is(), "OComponentAdapterBase::OComponentAdapterBase: invalid component!" );
     }
@@ -102,8 +101,7 @@ namespace bib
             m_pListener = nullptr;
             m_bListening = false;
 
-            if (m_bAutoRelease)
-                m_xComponent = nullptr;
+            m_xComponent = nullptr;
         }
     }
 
@@ -122,12 +120,11 @@ namespace bib
         m_pListener = nullptr;
         m_bListening = false;
 
-        if ( m_bAutoRelease )
-            m_xComponent = nullptr;
+        m_xComponent = nullptr;
     }
 
     OLoadListenerAdapter::OLoadListenerAdapter( const Reference< XLoadable >& _rxLoadable )
-        :OComponentAdapterBase( Reference< XComponent >( _rxLoadable, UNO_QUERY ), true/*_bAutoRelease*/ )
+        :OComponentAdapterBase( Reference< XComponent >( _rxLoadable, UNO_QUERY ) )
     {
     }
 
diff --git a/extensions/source/bibliography/loadlisteneradapter.hxx b/extensions/source/bibliography/loadlisteneradapter.hxx
index 28e3e39..1ef0432 100644
--- a/extensions/source/bibliography/loadlisteneradapter.hxx
+++ b/extensions/source/bibliography/loadlisteneradapter.hxx
@@ -61,7 +61,6 @@ namespace bib
         OComponentListener*                 m_pListener;
         sal_Int32                           m_nLockCount;
         bool                                m_bListening    : 1;
-        bool                                m_bAutoRelease  : 1;
 
         // impl method for dispose - virtual, 'cause you at least need to remove the listener from the broadcaster
         virtual void disposing() = 0;
@@ -79,8 +78,7 @@ namespace bib
 
     public:
         OComponentAdapterBase(
-            const css::uno::Reference< css::lang::XComponent >& _rxComp,
-            bool _bAutoRelease = true
+            const css::uno::Reference< css::lang::XComponent >& _rxComp
         );
 
         // late construction
diff --git a/extensions/source/propctrlr/browserpage.cxx b/extensions/source/propctrlr/browserpage.cxx
index 6aaf03f..81caba5 100644
--- a/extensions/source/propctrlr/browserpage.cxx
+++ b/extensions/source/propctrlr/browserpage.cxx
@@ -26,8 +26,8 @@ namespace pcr
     #define LAYOUT_BORDER_RIGHT     3
     #define LAYOUT_BORDER_BOTTOM    3
 
-    OBrowserPage::OBrowserPage(vcl::Window* pParent,WinBits nWinStyle)
-            :TabPage(pParent,nWinStyle)
+    OBrowserPage::OBrowserPage(vcl::Window* pParent)
+            :TabPage(pParent,0)
             ,m_aListBox(VclPtr<OBrowserListBox>::Create(this))
     {
         m_aListBox->SetBackground(GetBackground());
diff --git a/extensions/source/propctrlr/browserpage.hxx b/extensions/source/propctrlr/browserpage.hxx
index 9653fe6..01677a2 100644
--- a/extensions/source/propctrlr/browserpage.hxx
+++ b/extensions/source/propctrlr/browserpage.hxx
@@ -37,7 +37,7 @@ namespace pcr
         virtual void StateChanged(StateChangedType nType) override;
 
     public:
-        OBrowserPage(vcl::Window* pParent, WinBits nWinStyle = 0);
+        OBrowserPage(vcl::Window* pParent);
         virtual ~OBrowserPage();
         virtual void dispose() override;
 
diff --git a/extensions/source/propctrlr/browserview.cxx b/extensions/source/propctrlr/browserview.cxx
index aff7994..276c524 100644
--- a/extensions/source/propctrlr/browserview.cxx
+++ b/extensions/source/propctrlr/browserview.cxx
@@ -28,8 +28,8 @@ namespace pcr
     using namespace ::com::sun::star::uno;
     using namespace ::com::sun::star::lang;
 
-    OPropertyBrowserView::OPropertyBrowserView(vcl::Window* _pParent, WinBits nBits)
-                  :Window(_pParent, nBits | WB_3DLOOK)
+    OPropertyBrowserView::OPropertyBrowserView(vcl::Window* _pParent)
+                  :Window(_pParent, WB_3DLOOK)
                   ,m_nActivePage(0)
     {
         m_pPropBox = VclPtr<OPropertyEditor>::Create( this );
diff --git a/extensions/source/propctrlr/browserview.hxx b/extensions/source/propctrlr/browserview.hxx
index 5be841c..b8cd2aa 100644
--- a/extensions/source/propctrlr/browserview.hxx
+++ b/extensions/source/propctrlr/browserview.hxx
@@ -44,7 +44,7 @@ namespace pcr
         virtual bool Notify( NotifyEvent& _rNEvt ) override;
 
     public:
-        OPropertyBrowserView( vcl::Window* pParent, WinBits nBits = 0);
+        OPropertyBrowserView( vcl::Window* pParent);
 
         virtual ~OPropertyBrowserView();
         virtual void dispose() override;
diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx
index e44e90e..393f0e5 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -185,7 +185,7 @@ void OFormSubmitResetThread::processEvent(
         bool _bSubmit)
 {
     if (_bSubmit)
-        static_cast<ODatabaseForm *>(pCompImpl)->submit_impl(_rControl, *static_cast<const css::awt::MouseEvent*>(_pEvt), true);
+        static_cast<ODatabaseForm *>(pCompImpl)->submit_impl(_rControl, *static_cast<const css::awt::MouseEvent*>(_pEvt));
     else
         static_cast<ODatabaseForm *>(pCompImpl)->reset_impl(true);
 }
@@ -2118,7 +2118,7 @@ void SAL_CALL ODatabaseForm::submit( const Reference<XControl>& Control,
     {
         // direct call without any approving by the listeners
         aGuard.clear();
-        submit_impl( Control, MouseEvt, true );
+        submit_impl( Control, MouseEvt );
     }
 }
 
@@ -2152,24 +2152,21 @@ void lcl_dispatch(const Reference< XFrame >& xFrame,const Reference<XURLTransfor
     } // if (xDisp.is())
 }
 
-void ODatabaseForm::submit_impl(const Reference<XControl>& Control, const css::awt::MouseEvent& MouseEvt, bool _bAproveByListeners)
+void ODatabaseForm::submit_impl(const Reference<XControl>& Control, const css::awt::MouseEvent& MouseEvt)
 {
 
-    if (_bAproveByListeners)
+    ::comphelper::OInterfaceIteratorHelper2 aIter(m_aSubmitListeners);
+    EventObject aEvt(static_cast<XWeak*>(this));
+    bool bCanceled = false;
+    while (aIter.hasMoreElements() && !bCanceled)
     {
-        ::comphelper::OInterfaceIteratorHelper2 aIter(m_aSubmitListeners);
-        EventObject aEvt(static_cast<XWeak*>(this));
-        bool bCanceled = false;
-        while (aIter.hasMoreElements() && !bCanceled)
-        {
-            if (!static_cast<XSubmitListener*>(aIter.next())->approveSubmit(aEvt))
-                bCanceled = true;
-        }
-
-        if (bCanceled)
-            return;
+        if (!static_cast<XSubmitListener*>(aIter.next())->approveSubmit(aEvt))
+            bCanceled = true;
     }
 
+    if (bCanceled)
+        return;
+
     FormSubmitEncoding eSubmitEncoding;
     FormSubmitMethod eSubmitMethod;
     OUString aURLStr;
diff --git a/forms/source/component/DatabaseForm.hxx b/forms/source/component/DatabaseForm.hxx
index f51f999..415fb24 100644
--- a/forms/source/component/DatabaseForm.hxx
+++ b/forms/source/component/DatabaseForm.hxx
@@ -461,7 +461,7 @@ private:
     void    reload_impl(bool bMoveToFirst,
         const css::uno::Reference< css::task::XInteractionHandler >& _rxCompletionHandler = css::uno::Reference< css::task::XInteractionHandler >())
         throw(css::uno::RuntimeException, std::exception);
-    void    submit_impl(const css::uno::Reference< css::awt::XControl>& Control, const css::awt::MouseEvent& MouseEvt, bool _bAproveByListeners);
+    void    submit_impl(const css::uno::Reference< css::awt::XControl>& Control, const css::awt::MouseEvent& MouseEvt);
     void    reset_impl(bool _bAproveByListeners);
 
     bool    implEnsureConnection();
diff --git a/framework/source/inc/loadenv/loadenv.hxx b/framework/source/inc/loadenv/loadenv.hxx
index 082362d..d8503ee 100644
--- a/framework/source/inc/loadenv/loadenv.hxx
+++ b/framework/source/inc/loadenv/loadenv.hxx
@@ -253,18 +253,6 @@ public:
                 flag field, which enable/disable special features of this
                 new instance for following load call.
 
-        @param  eContentType
-                classify the given content.
-                This value is set to a default value "UNKNOWN_CONTENT", which force
-                an internal check, if this content is loadable or not.
-                But may this check was already made by the caller of this method and
-                passing this information to this LoadEnv instance can suppress this
-                might expensive check.
-                That can be useful in case this information is needed outside too,
-                to decide if its necessary to create some resources for this load
-                request ... or to reject the request immediately if it seems to be not
-                loadable in general.
-
         @throw  A LoadEnvException e.g. if another load operation is till in progress
                 or initialization of a new one fail by other reasons.
                 The real reason, a suitable message and ID will be given here immidiatly.
@@ -273,12 +261,11 @@ public:
                 the whole runtime can't be used any longer.
      */
     void initializeLoading(const OUString&                                           sURL            ,
-                                   const css::uno::Sequence< css::beans::PropertyValue >&           lMediaDescriptor,
-                                   const css::uno::Reference< css::frame::XFrame >&                 xBaseFrame      ,
-                                   const OUString&                                           sTarget         ,
-                                         sal_Int32                                                  nSearchFlags    ,
-                                         EFeature                                                   eFeature        = E_NO_FEATURE         ,
-                                         EContentType                                               eContentType    = E_UNSUPPORTED_CONTENT);
+                           const css::uno::Sequence< css::beans::PropertyValue >&    lMediaDescriptor,
+                           const css::uno::Reference< css::frame::XFrame >&          xBaseFrame      ,
+                           const OUString&                                           sTarget         ,
+                                 sal_Int32                                           nSearchFlags    ,
+                                 EFeature                                            eFeature        = E_NO_FEATURE);
 
     /** @short  start loading of the resource represented by this loadenv instance.
 
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx
index 7e715aa..6084133 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -222,7 +222,7 @@ utl::MediaDescriptor addModelArgs(const uno::Sequence<beans::PropertyValue>& rDe
 
 void LoadEnv::initializeLoading(const OUString& sURL, const uno::Sequence<beans::PropertyValue>& lMediaDescriptor,
         const uno::Reference<frame::XFrame>& xBaseFrame, const OUString& sTarget,
-        sal_Int32 nSearchFlags, EFeature eFeature, EContentType eContentType)
+        sal_Int32 nSearchFlags, EFeature eFeature)
 {
     osl::MutexGuard g(m_mutex);
 
@@ -237,7 +237,7 @@ void LoadEnv::initializeLoading(const OUString& sURL, const uno::Sequence<beans:
     m_sTarget = sTarget;
     m_nSearchFlags = nSearchFlags;
     m_eFeature = eFeature;
-    m_eContentType = eContentType;
+    m_eContentType = E_UNSUPPORTED_CONTENT;
     m_bCloseFrameOnError = false;
     m_bReactivateControllerOnError = false;
     m_bLoaded = false;
@@ -246,12 +246,9 @@ void LoadEnv::initializeLoading(const OUString& sURL, const uno::Sequence<beans:
     // We use a default value for this in-parameter. Then we have to start a complex check method
     // internally. But if this check was already done outside it can be suppressed to perform
     // the load request. We take over the result then!
+    m_eContentType = LoadEnv::classifyContent(sURL, lMediaDescriptor);
     if (m_eContentType == E_UNSUPPORTED_CONTENT)
-    {
-        m_eContentType = LoadEnv::classifyContent(sURL, lMediaDescriptor);
-        if (m_eContentType == E_UNSUPPORTED_CONTENT)
-            throw LoadEnvException(LoadEnvException::ID_UNSUPPORTED_CONTENT, "from LoadEnv::initializeLoading");
-    }
+        throw LoadEnvException(LoadEnvException::ID_UNSUPPORTED_CONTENT, "from LoadEnv::initializeLoading");
 
     // make URL part of the MediaDescriptor
     // It doesn't matter if it is already an item of it.
diff --git a/rsc/inc/rsccont.hxx b/rsc/inc/rsccont.hxx
index 0f4bece..129cc23 100644
--- a/rsc/inc/rsccont.hxx
+++ b/rsc/inc/rsccont.hxx
@@ -107,8 +107,7 @@ class RscContWriteSrc : public RscBaseCont
 {
 public:
                     RscContWriteSrc( Atom nId, sal_uInt32 nTypId,
-                                     RscTop * pSuper = nullptr,
-                                     bool bNoId = true );
+                                     RscTop * pSuper = nullptr );
     void            WriteSrc( const RSCINST & rInst, FILE * fOutput,
                               RscTypCont * pTC, sal_uInt32 nTab, const char * ) override;
 };
diff --git a/rsc/source/res/rsccont.cxx b/rsc/source/res/rsccont.cxx
index 5ae59a3..012aa28 100644
--- a/rsc/source/res/rsccont.cxx
+++ b/rsc/source/res/rsccont.cxx
@@ -722,8 +722,8 @@ ERRTYPE RscBaseCont::WriteRc( const RSCINST & rInst, RscWriteRc & rMem,
 }
 
 RscContWriteSrc::RscContWriteSrc( Atom nId, sal_uInt32 nTypeId,
-                                  RscTop * pSuper, bool bNoIdent )
-    : RscBaseCont( nId, nTypeId, pSuper, bNoIdent )
+                                  RscTop * pSuper )
+    : RscBaseCont( nId, nTypeId, pSuper, true )
 {
 }
 
@@ -750,7 +750,7 @@ void RscContWriteSrc::WriteSrc( const RSCINST & rInst, FILE * fOutput,
 }
 
 RscCont::RscCont( Atom nId, sal_uInt32 nTypeId, RscTop * pSuper )
-    : RscContWriteSrc( nId, nTypeId, pSuper, true/*bNoIdent*/ )
+    : RscContWriteSrc( nId, nTypeId, pSuper )
 {
 }
 
@@ -774,7 +774,7 @@ ERRTYPE RscCont::WriteRc( const RSCINST & rInst, RscWriteRc & rMem,
 
 RscContExtraData::RscContExtraData( Atom nId, sal_uInt32 nTypeId,
                                     RscTop * pSuper )
-    : RscContWriteSrc( nId, nTypeId, pSuper, true/*bNoIdent*/ )
+    : RscContWriteSrc( nId, nTypeId, pSuper )
 {
 }
 


More information about the Libreoffice-commits mailing list