move formula description extra data out of .src

and remove reading/writing of defunct ExtraData from rsc

Change-Id: I5be6e11c5921eb809143487a456d1e4ee203e68c
Reviewed-on: https://gerrit.libreoffice.org/34345
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

12 files changed, 47 insertions, 81 deletions

diff --git a/rsc/source/parser/rscdb.cxx b/rsc/source/parser/rscdb.cxx
index 9aa11931019e..36fd2de97c79 100644
--- a/rsc/source/parser/rscdb.cxx
+++ b/rsc/source/parser/rscdb.cxx
@@ -275,7 +275,7 @@ IMPL_LINK( RscEnumerateObj, CallBackWriteRc, const NameNode&, rNode, void )
 
     aError = pClass->WriteRcHeader( RSCINST( pClass, rObjNode.GetRscObj() ),
                                      aMem, pTypCont,
-                                     rObjNode.GetRscId(), 0, true );
+                                     rObjNode.GetRscId(), 0 );
     if( aError.IsError() || aError.IsWarning() )
         pTypCont->pEH->Error( aError, pClass, rObjNode.GetRscId() );
 
@@ -393,7 +393,7 @@ ERRTYPE RscTypCont::WriteRc( WriteRcContext& rContext )
 
     // version control
     RscWriteRc aMem( nByteOrder );
-    aVersion.pClass->WriteRcHeader( aVersion, aMem, this, RscId( RSCVERSION_ID ), 0, true );
+    aVersion.pClass->WriteRcHeader( aVersion, aMem, this, RscId( RSCVERSION_ID ), 0 );
     aEnumRef.aEnumObj.WriteRcFile( aMem, rContext.fOutput );
 
     return aError;
diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx
index fde078d4a341..69651c7cdd49 100644
--- a/rsc/source/parser/rscicpx.cxx
+++ b/rsc/source/parser/rscicpx.cxx
@@ -47,15 +47,6 @@ RscTop * RscTypCont::InitClassMgr()
     pClassMgr->SetCallPar( *pStdPar1, *pStdPar2, *pStdParType );
 
     // initialize variables
-    {
-        RscContWriteSrc *   pCont;
-
-        // initialize variables
-        aBaseLst.push_back( pCont = new RscContExtraData( pHS->getID( "ContExtradata" ), RSC_NOTYPE ) );
-        pCont->SetTypeClass( &aShort, &aString );
-        nRsc_EXTRADATA = nId = aNmTb.Put( "ExtraData", VARNAME );
-        pClassMgr->SetVariable( nId, pCont );
-    };
     nId = aNmTb.Put( "Comment", VARNAME );
     pClassMgr->SetVariable( nId, &aString, nullptr, RSCVAR::NoRc );
 
diff --git a/rsc/source/res/rscall.cxx b/rsc/source/res/rscall.cxx
index 744a42ec794d..84829c7e0ced 100644
--- a/rsc/source/res/rscall.cxx
+++ b/rsc/source/res/rscall.cxx
@@ -26,7 +26,6 @@
 
 Atom    nRsc_DELTALANG = InvalidAtom;
 Atom    nRsc_DELTASYSTEM = InvalidAtom;
-Atom    nRsc_EXTRADATA = InvalidAtom;
 
 void InitRscCompiler()
 {
diff --git a/rsc/source/res/rscarray.cxx b/rsc/source/res/rscarray.cxx
index 817a8c1dd935..de0e8feec0f0 100644
--- a/rsc/source/res/rscarray.cxx
+++ b/rsc/source/res/rscarray.cxx
@@ -387,7 +387,7 @@ void RscArray::WriteSrc( const RSCINST & rInst, FILE * fOutput,
 }
 
 ERRTYPE RscArray::WriteRc( const RSCINST & rInst, RscWriteRc & rMem,
-                           RscTypCont * pTC, sal_uInt32 nDeep, bool bExtra )
+                           RscTypCont * pTC, sal_uInt32 nDeep )
 {
     ERRTYPE aError;
     RscArrayInst * pClassData;
@@ -415,9 +415,9 @@ ERRTYPE RscArray::WriteRc( const RSCINST & rInst, RscWriteRc & rMem,
 
     if( pNode )
         aError = pNode->aInst.pClass->WriteRc( pNode->aInst, rMem, pTC,
-                                                nDeep, bExtra );
+                                                nDeep );
     else
-        aError = RscTop::WriteRc( rInst, rMem, pTC, nDeep, bExtra );
+        aError = RscTop::WriteRc( rInst, rMem, pTC, nDeep );
 
     return aError;
 }
diff --git a/rsc/source/res/rscclass.cxx b/rsc/source/res/rscclass.cxx
index 12fb7952f45f..1bbac234094c 100644
--- a/rsc/source/res/rscclass.cxx
+++ b/rsc/source/res/rscclass.cxx
@@ -567,8 +567,7 @@ void RscClass::WriteSrc( const RSCINST & rInst,
 ERRTYPE RscClass::WriteInstRc( const RSCINST & rInst,
                                RscWriteRc & rMem,
                                RscTypCont * pTC,
-                               sal_uInt32 nDeep,
-                               bool bExtra)
+                               sal_uInt32 nDeep )
 {
     sal_uInt32 i = 0;
     ERRTYPE aError;
@@ -595,11 +594,9 @@ ERRTYPE RscClass::WriteInstRc( const RSCINST & rInst,
                 if( !IsDflt( rInst.pData, i ) )
                 {
                     aTmpI = GetInstData( rInst.pData, i, true );
-                    // set only for variable extradata with bExtra not false
                     aError = aTmpI.pClass->
-                        WriteRcHeader( aTmpI, rMem, pTC,
-                                       RscId(), nDeep,
-                                       (nRsc_EXTRADATA == pVarTypeList[ i ].nVarName) && bExtra );
+                        WriteRcHeader(aTmpI, rMem, pTC,
+                                      RscId(), nDeep);
                     sal_uInt32 nMask = rMem.GetLong( nMaskOff );
                     nMask |= pVarTypeList[ i ].nMask;
                     rMem.PutAt( nMaskOff, nMask );
@@ -615,11 +612,9 @@ ERRTYPE RscClass::WriteInstRc( const RSCINST & rInst,
                 else
                     aTmpI = GetInstData( rInst.pData, i, true );
 
-                // set only for variable extradata with bExtra not false
                 aError = aTmpI.pClass->
                             WriteRcHeader( aTmpI, rMem, pTC,
-                                        RscId(), nDeep,
-                                        (nRsc_EXTRADATA == pVarTypeList[ i ].nVarName) && bExtra );
+                                        RscId(), nDeep );
             }
         }
     }
@@ -630,14 +625,13 @@ ERRTYPE RscClass::WriteInstRc( const RSCINST & rInst,
 ERRTYPE RscClass::WriteRc( const RSCINST & rInst,
                            RscWriteRc & rMem,
                            RscTypCont * pTC,
-                           sal_uInt32 nDeep,
-                           bool bExtra)
+                           sal_uInt32 nDeep )
 {
     ERRTYPE aError;
 
-    aError = RscTop::WriteRc( rInst, rMem, pTC, nDeep, bExtra );
+    aError = RscTop::WriteRc(rInst, rMem, pTC, nDeep);
     if( aError.IsOk() )
-        aError = WriteInstRc( rInst, rMem, pTC, nDeep, bExtra );
+        aError = WriteInstRc(rInst, rMem, pTC, nDeep);
 
     return aError;
 }
@@ -648,7 +642,7 @@ RscSysDepend::RscSysDepend( Atom nId, RESOURCE_TYPE nTypeId, RscTop * pSuper )
 }
 
 ERRTYPE RscSysDepend::WriteSysDependRc( const RSCINST & rInst, RscWriteRc & rMem,
-                                        RscTypCont * pTC, sal_uInt32 nDeep, bool bExtra )
+                                        RscTypCont * pTC, sal_uInt32 nDeep )
 {
     ERRTYPE     aError;
     RSCINST     aFileName;
@@ -659,7 +653,7 @@ ERRTYPE RscSysDepend::WriteSysDependRc( const RSCINST & rInst, RscWriteRc & rMem
     {
         RscWriteRc aTmpMem;
         aError = aFileName.pClass->WriteRcHeader( aFileName, aTmpMem, pTC,
-                                                  RscId(), nDeep, bExtra );
+                                                  RscId(), nDeep );
         // Obsolete - need changes in VCL
         rMem.Put( sal_uInt32(0) );
 
@@ -672,7 +666,7 @@ ERRTYPE RscSysDepend::WriteSysDependRc( const RSCINST & rInst, RscWriteRc & rMem
         }
         rMem.Put( nId );
         aError = aFileName.pClass->WriteRcHeader( aFileName, rMem, pTC,
-                                                  RscId(), nDeep, bExtra );
+                                                  RscId(), nDeep );
     }
     else
         aError = ERR_ERROR;
@@ -681,14 +675,14 @@ ERRTYPE RscSysDepend::WriteSysDependRc( const RSCINST & rInst, RscWriteRc & rMem
 }
 
 ERRTYPE RscSysDepend::WriteRc( const RSCINST & rInst, RscWriteRc & rMem,
-                               RscTypCont * pTC, sal_uInt32 nDeep, bool bExtra )
+                               RscTypCont * pTC, sal_uInt32 nDeep )
 {
-    ERRTYPE     aError = RscClass::WriteRc( rInst, rMem, pTC, nDeep, bExtra );
+    ERRTYPE     aError = RscClass::WriteRc( rInst, rMem, pTC, nDeep );
 
     if( this == rInst.pClass )
     {
         // only when it is own class
-        aError = WriteSysDependRc( rInst, rMem, pTC, nDeep, bExtra );
+        aError = WriteSysDependRc( rInst, rMem, pTC, nDeep );
     }
     return aError;
 }
diff --git a/rsc/source/res/rscconst.cxx b/rsc/source/res/rscconst.cxx
index 32aa1898ae93..845cb2322a26 100644
--- a/rsc/source/res/rscconst.cxx
+++ b/rsc/source/res/rscconst.cxx
@@ -181,7 +181,7 @@ void RscEnum::WriteSrc( const RSCINST & rInst, FILE * fOutput,
 }
 
 ERRTYPE RscEnum::WriteRc( const RSCINST & rInst, RscWriteRc & aMem,
-                          RscTypCont *, sal_uInt32, bool )
+                          RscTypCont *, sal_uInt32 )
 {
     aMem.Put( (sal_Int32)pVarArray[ reinterpret_cast<RscEnumInst *>(rInst.pData)->nValue ].lValue );
     return ERR_OK;
diff --git a/rsc/source/res/rsccont.cxx b/rsc/source/res/rsccont.cxx
index 6c389e788f47..fbc36d4d9dc9 100644
--- a/rsc/source/res/rsccont.cxx
+++ b/rsc/source/res/rsccont.cxx
@@ -677,13 +677,13 @@ void RscBaseCont::ContWriteSrc( const RSCINST & rInst, FILE * fOutput,
 }
 
 ERRTYPE RscBaseCont::ContWriteRc( const RSCINST & rInst, RscWriteRc & rMem,
-                                  RscTypCont * pTC, sal_uInt32 nDeep, bool bExtra )
+                                  RscTypCont * pTC, sal_uInt32 nDeep )
 {
     RscBaseContInst * pClassData;
     ERRTYPE       aError;
 
-    if( bExtra || bNoId )
-    { // only write sub resources when bExtra == true
+    if( bNoId )
+    {
         pClassData = reinterpret_cast<RscBaseContInst *>(rInst.pData + nOffInstData);
 
         for (sal_uInt32 i = 0; i < pClassData->nEntries && aError.IsOk(); i++ )
@@ -692,7 +692,7 @@ ERRTYPE RscBaseCont::ContWriteRc( const RSCINST & rInst, RscWriteRc & rMem,
                          WriteRcHeader( pClassData->pEntries[ i ].aInst,
                                         rMem, pTC,
                                         pClassData->pEntries[ i ].aName,
-                                        nDeep, bExtra );
+                                        nDeep );
         }
     }
 
@@ -708,13 +708,13 @@ void RscBaseCont::WriteSrc( const RSCINST & rInst, FILE * fOutput,
 }
 
 ERRTYPE RscBaseCont::WriteRc( const RSCINST & rInst, RscWriteRc & rMem,
-                              RscTypCont * pTC, sal_uInt32 nDeep, bool bExtra )
+                              RscTypCont * pTC, sal_uInt32 nDeep )
 {
     ERRTYPE       aError;
 
-    aError = RscTop::WriteRc( rInst, rMem, pTC, nDeep, bExtra );
+    aError = RscTop::WriteRc( rInst, rMem, pTC, nDeep );
     if( aError.IsOk() )
-        aError = ContWriteRc( rInst, rMem, pTC, nDeep, bExtra );
+        aError = ContWriteRc( rInst, rMem, pTC, nDeep );
 
     return aError;
 }
@@ -752,37 +752,19 @@ RscCont::RscCont( Atom nId, RESOURCE_TYPE nTypeId )
 }
 
 ERRTYPE RscCont::WriteRc( const RSCINST & rInst, RscWriteRc & rMem,
-                                 RscTypCont * pTC, sal_uInt32 nDeep, bool bExtra )
+                                 RscTypCont * pTC, sal_uInt32 nDeep )
 {
     RscBaseContInst * pClassData;
     ERRTYPE aError;
 
-    aError = RscTop::WriteRc( rInst, rMem, pTC, nDeep, bExtra );
+    aError = RscTop::WriteRc( rInst, rMem, pTC, nDeep );
 
     pClassData = reinterpret_cast<RscBaseContInst *>(rInst.pData + nOffInstData);
 
     rMem.Put( pClassData->nEntries );
 
     if( aError.IsOk() )
-        aError = ContWriteRc( rInst, rMem, pTC, nDeep, bExtra );
-
-    return aError;
-}
-
-RscContExtraData::RscContExtraData( Atom nId, RESOURCE_TYPE nTypeId )
-    : RscContWriteSrc( nId, nTypeId )
-{
-}
-
-ERRTYPE RscContExtraData::WriteRc( const RSCINST & rInst, RscWriteRc & rMem,
-                                   RscTypCont * pTC, sal_uInt32 nDeep, bool bExtra )
-{
-    ERRTYPE aError;
-
-    if( bExtra )
-        aError = RscContWriteSrc::WriteRc( rInst, rMem, pTC, nDeep, bExtra );
-    else
-        aError = RscTop::WriteRc( rInst, rMem, pTC, nDeep, bExtra );
+        aError = ContWriteRc( rInst, rMem, pTC, nDeep );
 
     return aError;
 }
diff --git a/rsc/source/res/rscflag.cxx b/rsc/source/res/rscflag.cxx
index d1d8afde9440..6321317baf1f 100644
--- a/rsc/source/res/rscflag.cxx
+++ b/rsc/source/res/rscflag.cxx
@@ -270,7 +270,7 @@ void RscFlag::WriteSrc( const RSCINST & rInst, FILE * fOutput,
 }
 
 ERRTYPE RscFlag::WriteRc( const RSCINST & rInst, RscWriteRc & aMem,
-                          RscTypCont *, sal_uInt32, bool )
+                          RscTypCont *, sal_uInt32 )
 {
     sal_Int32   lVal = 0;
     sal_uInt32  i = 0, Flag = 0, nIndex = 0;
diff --git a/rsc/source/res/rscmgr.cxx b/rsc/source/res/rscmgr.cxx
index c123a93cd256..39f0b655e81a 100644
--- a/rsc/source/res/rscmgr.cxx
+++ b/rsc/source/res/rscmgr.cxx
@@ -158,7 +158,7 @@ void RscMgr::WriteSrc( const RSCINST &, FILE *, RscTypCont *, sal_uInt32,
 
 ERRTYPE RscMgr::WriteRcHeader( const RSCINST & rInst, RscWriteRc & rMem,
                                RscTypCont * pTC, const RscId &rId,
-                               sal_uInt32 nDeep, bool bExtra )
+                               sal_uInt32 nDeep )
 {
     RscMgrInst *    pClassData;
     ERRTYPE         aError;
@@ -196,13 +196,13 @@ ERRTYPE RscMgr::WriteRcHeader( const RSCINST & rInst, RscWriteRc & rMem,
             if( pTmpRefClass == rInst.pClass )
             {
                 aError = aRefI.pClass->WriteRcHeader( aRefI, rMem, pTC,
-                                                       rId, nDeep, bExtra );
+                                                       rId, nDeep );
             }
             else
             {
                 RSCINST aRefInst = rInst.pClass->Create( nullptr, aRefI );
                 aError = aRefI.pClass->WriteRcHeader( aRefInst, rMem, pTC,
-                                                       rId, nDeep, bExtra );
+                                                       rId, nDeep );
                 pTmpRefClass->Destroy( aRefInst );
             }
         }
@@ -213,15 +213,15 @@ ERRTYPE RscMgr::WriteRcHeader( const RSCINST & rInst, RscWriteRc & rMem,
 
             nOldSize = rMem.IncSize( 16 /*sizeof( RSHEADER_TYPE )*/ );
 
-            aError = rInst.pClass->WriteRc( rInst, rMem, pTC, nDeep, bExtra );
+            aError = rInst.pClass->WriteRc( rInst, rMem, pTC, nDeep );
             if( aError.IsOk() )
-                aError = WriteInstRc( rInst, rMem, pTC, nDeep, bExtra );
+                aError = WriteInstRc( rInst, rMem, pTC, nDeep );
             nLocalSize = rMem.Size();
 
             if( aError.IsOk() )
             {
                 // RscClass is skipped
-                aError = RscTop::WriteRc( rInst, rMem, pTC, nDeep, bExtra );
+                aError = RscTop::WriteRc( rInst, rMem, pTC, nDeep );
             }
 
             /*
@@ -245,7 +245,7 @@ ERRTYPE RscMgr::WriteRcHeader( const RSCINST & rInst, RscWriteRc & rMem,
 }
 
 ERRTYPE RscMgr::WriteRc( const RSCINST &, RscWriteRc &,
-                         RscTypCont *, sal_uInt32, bool )
+                         RscTypCont *, sal_uInt32 )
 
 {
     return ERR_OK;
diff --git a/rsc/source/res/rscrange.cxx b/rsc/source/res/rscrange.cxx
index 403e7bcc8790..c252c625b823 100644
--- a/rsc/source/res/rscrange.cxx
+++ b/rsc/source/res/rscrange.cxx
@@ -117,7 +117,7 @@ void RscRange::WriteSrc( const RSCINST & rInst, FILE * fOutput,
 }
 
 ERRTYPE RscRange::WriteRc( const RSCINST & rInst, RscWriteRc & aMem,
-                           RscTypCont *, sal_uInt32, bool )
+                           RscTypCont *, sal_uInt32 )
 {
     if( nMin >= 0 )
     {
@@ -231,7 +231,7 @@ void RscLongRange::WriteSrc( const RSCINST & rInst, FILE * fOutput,
 }
 
 ERRTYPE RscLongRange::WriteRc( const RSCINST & rInst, RscWriteRc & aMem,
-                               RscTypCont *, sal_uInt32, bool )
+                               RscTypCont *, sal_uInt32 )
 {
     sal_Int32 lVal;
 
@@ -372,7 +372,7 @@ void RscIdRange::WriteSrc( const RSCINST & rInst, FILE * fOutput,
 }
 
 ERRTYPE RscIdRange::WriteRc( const RSCINST & rInst, RscWriteRc & aMem,
-                             RscTypCont *, sal_uInt32, bool )
+                             RscTypCont *, sal_uInt32 )
 {
     sal_Int32 lVal = reinterpret_cast<RscId*>(rInst.pData)->GetNumber();
 
diff --git a/rsc/source/res/rscstr.cxx b/rsc/source/res/rscstr.cxx
index dc54561ebfd0..90213085743a 100644
--- a/rsc/source/res/rscstr.cxx
+++ b/rsc/source/res/rscstr.cxx
@@ -226,7 +226,7 @@ void RscString::WriteSrc( const RSCINST & rInst, FILE * fOutput,
 }
 
 ERRTYPE RscString::WriteRc( const RSCINST & rInst, RscWriteRc & rMem,
-                            RscTypCont * pTC, sal_uInt32 nDeep, bool bExtra )
+                            RscTypCont * pTC, sal_uInt32 nDeep )
 {
     ERRTYPE aError;
     ObjNode *       pObjNode = nullptr;
@@ -277,7 +277,7 @@ ERRTYPE RscString::WriteRc( const RSCINST & rInst, RscWriteRc & rMem,
             RSCINST     aRefI;
 
             aRefI = RSCINST( pRefClass, pObjNode->GetRscObj() );
-            aError = aRefI.pClass->WriteRc( aRefI, rMem, pTC, nDeep, bExtra );
+            aError = aRefI.pClass->WriteRc( aRefI, rMem, pTC, nDeep );
         }
         else
         {
diff --git a/rsc/source/res/rsctop.cxx b/rsc/source/res/rsctop.cxx
index 3d48b8e6b7c4..3d447796b89d 100644
--- a/rsc/source/res/rsctop.cxx
+++ b/rsc/source/res/rsctop.cxx
@@ -396,19 +396,19 @@ void RscTop::WriteSrc( const RSCINST & rInst, FILE * fOutput,
 
 ERRTYPE RscTop::WriteRcHeader( const RSCINST & rInst, RscWriteRc & rMem,
                                RscTypCont * pTC, const RscId & rId,
-                               sal_uInt32 nDeep, bool bExtra )
+                               sal_uInt32 nDeep )
 {
     if( pSuperClass )
-        return pSuperClass->WriteRcHeader( rInst, rMem, pTC, rId, nDeep, bExtra );
+        return pSuperClass->WriteRcHeader( rInst, rMem, pTC, rId, nDeep );
     else
-        return rInst.pClass->WriteRc( rInst, rMem, pTC, nDeep, bExtra );
+        return rInst.pClass->WriteRc( rInst, rMem, pTC, nDeep );
 }
 
 ERRTYPE RscTop::WriteRc( const RSCINST & rInst, RscWriteRc & rMem,
-                         RscTypCont * pTC, sal_uInt32 nDeep, bool bExtra )
+                         RscTypCont * pTC, sal_uInt32 nDeep )
 {
     if( pSuperClass )
-        return pSuperClass->WriteRc( rInst, rMem, pTC, nDeep, bExtra );
+        return pSuperClass->WriteRc( rInst, rMem, pTC, nDeep );
     else
         return ERR_OK;
 }