summaryrefslogtreecommitdiff
path: root/rsc/inc
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-02-16 17:01:20 +0000
committerCaolán McNamara <caolanm@redhat.com>2017-02-17 14:00:08 +0000
commitb127134103e0fcf8b415f53eebed0b5180d782e3 (patch)
treeb12b39d0ab5a128cdd5acd6de30e49c774bb95b4 /rsc/inc
parentf4875397fbdfa78a95523db0dfe75551b83bf68a (diff)
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>
Diffstat (limited to 'rsc/inc')
-rw-r--r--rsc/inc/rscall.h1
-rw-r--r--rsc/inc/rscarray.hxx2
-rw-r--r--rsc/inc/rscclass.hxx8
-rw-r--r--rsc/inc/rscconst.hxx2
-rw-r--r--rsc/inc/rsccont.hxx14
-rw-r--r--rsc/inc/rscflag.hxx2
-rw-r--r--rsc/inc/rscmgr.hxx4
-rw-r--r--rsc/inc/rscrange.hxx6
-rw-r--r--rsc/inc/rscstr.hxx2
-rw-r--r--rsc/inc/rsctop.hxx4
10 files changed, 18 insertions, 27 deletions
diff --git a/rsc/inc/rscall.h b/rsc/inc/rscall.h
index 53cedd650963..3a043081658f 100644
--- a/rsc/inc/rscall.h
+++ b/rsc/inc/rscall.h
@@ -41,7 +41,6 @@ extern OString* pStdPar2;
extern sal_uInt32 nRefDeep;
extern sal_uInt32 nRsc_DELTALANG;
extern sal_uInt32 nRsc_DELTASYSTEM;
-extern sal_uInt32 nRsc_EXTRADATA;
extern AtomContainer* pHS;
/******************* D e f i n e s ***************************************/
diff --git a/rsc/inc/rscarray.hxx b/rsc/inc/rscarray.hxx
index b3bf672f7211..32d138675fe0 100644
--- a/rsc/inc/rscarray.hxx
+++ b/rsc/inc/rscarray.hxx
@@ -88,7 +88,7 @@ public:
void WriteSrc( const RSCINST & rInst, FILE * fOutput,
RscTypCont * pTC, sal_uInt32 nTab, const char * ) override;
ERRTYPE WriteRc( const RSCINST & rInst, RscWriteRc & aMem,
- RscTypCont * pTC, sal_uInt32, bool bExtra ) override;
+ RscTypCont * pTC, sal_uInt32 ) override;
};
class RscLangArray : public RscArray
diff --git a/rsc/inc/rscclass.hxx b/rsc/inc/rscclass.hxx
index 193e372ac855..59b3980c33e5 100644
--- a/rsc/inc/rscclass.hxx
+++ b/rsc/inc/rscclass.hxx
@@ -87,9 +87,9 @@ public:
void WriteSrc( const RSCINST & rInst, FILE * fOutput,
RscTypCont * pTC, sal_uInt32 nTab, const char * ) override;
ERRTYPE WriteInstRc( const RSCINST & rInst, RscWriteRc & aMem,
- RscTypCont * pTC, sal_uInt32, bool bExtra );
+ RscTypCont * pTC, sal_uInt32 );
ERRTYPE WriteRc( const RSCINST & rInst, RscWriteRc & aMem,
- RscTypCont * pTC, sal_uInt32, bool bExtra ) override;
+ RscTypCont * pTC, sal_uInt32 ) override;
};
class RscSysDepend : public RscClass
@@ -97,9 +97,9 @@ class RscSysDepend : public RscClass
public:
RscSysDepend( Atom nId, RESOURCE_TYPE nTypId, RscTop * pSuper );
ERRTYPE WriteSysDependRc( const RSCINST &, RscWriteRc & aMem,
- RscTypCont * pTC, sal_uInt32, bool bExtra );
+ RscTypCont * pTC, sal_uInt32 );
ERRTYPE WriteRc( const RSCINST &, RscWriteRc & aMem,
- RscTypCont * pTC, sal_uInt32, bool bExtra ) override;
+ RscTypCont * pTC, sal_uInt32 ) override;
};
class RscTupel : public RscClass
diff --git a/rsc/inc/rscconst.hxx b/rsc/inc/rscconst.hxx
index 8519f9a1104b..1b65f60e509a 100644
--- a/rsc/inc/rscconst.hxx
+++ b/rsc/inc/rscconst.hxx
@@ -77,7 +77,7 @@ public:
void WriteSrc( const RSCINST &rInst, FILE * fOutput,
RscTypCont * pTC, sal_uInt32 nTab, const char * ) override;
ERRTYPE WriteRc( const RSCINST & rInst, RscWriteRc & aMem,
- RscTypCont * pTC, sal_uInt32, bool bExtra ) override;
+ RscTypCont * pTC, sal_uInt32 ) override;
};
class RscNameTable;
diff --git a/rsc/inc/rsccont.hxx b/rsc/inc/rsccont.hxx
index e480ea6dc2fd..89d3b7701c63 100644
--- a/rsc/inc/rsccont.hxx
+++ b/rsc/inc/rsccont.hxx
@@ -52,7 +52,7 @@ protected:
void ContWriteSrc( const RSCINST & rInst, FILE * fOutput,
RscTypCont * pTC, sal_uInt32 nTab, const char * );
ERRTYPE ContWriteRc( const RSCINST & rInst, RscWriteRc & aMem,
- RscTypCont * pTC, sal_uInt32, bool bExtra );
+ RscTypCont * pTC, sal_uInt32 );
public:
RscBaseCont( Atom nId, RESOURCE_TYPE nTypId,
bool bNoId );
@@ -99,7 +99,7 @@ public:
void WriteSrc( const RSCINST & rInst, FILE * fOutput,
RscTypCont * pTC, sal_uInt32 nTab, const char * ) override;
ERRTYPE WriteRc( const RSCINST & rInst, RscWriteRc & aMem,
- RscTypCont * pTC, sal_uInt32 , bool bExtra) override;
+ RscTypCont * pTC, sal_uInt32 ) override;
};
class RscContWriteSrc : public RscBaseCont
@@ -115,15 +115,7 @@ class RscCont : public RscContWriteSrc
public:
RscCont( Atom nId, RESOURCE_TYPE nTypId );
ERRTYPE WriteRc( const RSCINST & rInst, RscWriteRc & aMem,
- RscTypCont * pTC, sal_uInt32, bool bExtra ) override;
-};
-
-class RscContExtraData : public RscContWriteSrc
-{
-public:
- RscContExtraData( Atom nId, RESOURCE_TYPE nTypId );
- ERRTYPE WriteRc( const RSCINST & rInst, RscWriteRc & aMem,
- RscTypCont * pTC, sal_uInt32, bool bExtra ) override;
+ RscTypCont * pTC, sal_uInt32 ) override;
};
#endif // INCLUDED_RSC_INC_RSCCONT_HXX
diff --git a/rsc/inc/rscflag.hxx b/rsc/inc/rscflag.hxx
index dd3b98653d07..de006bf2dee2 100644
--- a/rsc/inc/rscflag.hxx
+++ b/rsc/inc/rscflag.hxx
@@ -58,7 +58,7 @@ public:
void WriteSrc( const RSCINST & rInst, FILE * fOutput,
RscTypCont * pTC, sal_uInt32 nTab, const char * ) override;
ERRTYPE WriteRc( const RSCINST & rInst, RscWriteRc & aMem,
- RscTypCont * pTC, sal_uInt32, bool bExtra ) override;
+ RscTypCont * pTC, sal_uInt32 ) override;
};
/******************* R s c C l i e n t ***********************************/
diff --git a/rsc/inc/rscmgr.hxx b/rsc/inc/rscmgr.hxx
index 347512ae7a47..ad1ca97d7d5e 100644
--- a/rsc/inc/rscmgr.hxx
+++ b/rsc/inc/rscmgr.hxx
@@ -54,9 +54,9 @@ public:
RscTypCont * pTC, sal_uInt32 nTab, const char * ) override;
ERRTYPE WriteRcHeader( const RSCINST & rInst, RscWriteRc & aMem,
RscTypCont * pTC, const RscId & rId,
- sal_uInt32, bool bExtra ) override;
+ sal_uInt32 ) override;
ERRTYPE WriteRc( const RSCINST & rInst, RscWriteRc & aMem,
- RscTypCont * pTC, sal_uInt32, bool bExtra ) override;
+ RscTypCont * pTC, sal_uInt32 ) override;
bool IsConsistent( const RSCINST & rInst ) override;
ERRTYPE GetRef( const RSCINST & rInst, RscId * ) override;
ERRTYPE SetRef( const RSCINST & rInst, const RscId & rRefId ) override;
diff --git a/rsc/inc/rscrange.hxx b/rsc/inc/rscrange.hxx
index 00573f9048e2..bed213f8c80f 100644
--- a/rsc/inc/rscrange.hxx
+++ b/rsc/inc/rscrange.hxx
@@ -58,7 +58,7 @@ public:
void WriteSrc( const RSCINST &, FILE * fOutput,
RscTypCont * pTC, sal_uInt32 nTab, const char * ) override;
ERRTYPE WriteRc( const RSCINST &, RscWriteRc & aMem,
- RscTypCont * pTC, sal_uInt32, bool bExtra ) override;
+ RscTypCont * pTC, sal_uInt32 ) override;
};
class RscLongRange : public RscTop
@@ -95,7 +95,7 @@ public:
void WriteSrc( const RSCINST &, FILE * fOutput,
RscTypCont * pTC, sal_uInt32 nTab, const char * ) override;
ERRTYPE WriteRc( const RSCINST &, RscWriteRc & aMem,
- RscTypCont * pTC, sal_uInt32, bool bExtra ) override;
+ RscTypCont * pTC, sal_uInt32 ) override;
};
@@ -143,7 +143,7 @@ public:
void WriteSrc( const RSCINST &, FILE * fOutput,
RscTypCont * pTC, sal_uInt32 nTab, const char * ) override;
ERRTYPE WriteRc( const RSCINST &, RscWriteRc & aMem,
- RscTypCont * pTC, sal_uInt32, bool bExtra ) override;
+ RscTypCont * pTC, sal_uInt32 ) override;
bool IsConsistent( const RSCINST & rInst ) override;
};
diff --git a/rsc/inc/rscstr.hxx b/rsc/inc/rscstr.hxx
index 77010ac1aeb6..322eedb3be8f 100644
--- a/rsc/inc/rscstr.hxx
+++ b/rsc/inc/rscstr.hxx
@@ -59,7 +59,7 @@ public:
void WriteSrc( const RSCINST &, FILE * fOutput,
RscTypCont * pTC, sal_uInt32 nTab, const char * ) override;
ERRTYPE WriteRc( const RSCINST &, RscWriteRc & aMem,
- RscTypCont * pTC, sal_uInt32, bool bExtra ) override;
+ RscTypCont * pTC, sal_uInt32 ) override;
};
#endif // INCLUDED_RSC_INC_RSCSTR_HXX
diff --git a/rsc/inc/rsctop.hxx b/rsc/inc/rsctop.hxx
index 8d3f52f1ab1a..2c7a98d3f18c 100644
--- a/rsc/inc/rsctop.hxx
+++ b/rsc/inc/rsctop.hxx
@@ -204,9 +204,9 @@ public:
RscTypCont * pTC, sal_uInt32 nTab,const char * );
virtual ERRTYPE WriteRcHeader( const RSCINST & rInst, RscWriteRc & aMem,
RscTypCont * pTC, const RscId & aId,
- sal_uInt32 nDeep, bool bExtra );
+ sal_uInt32 nDeep );
virtual ERRTYPE WriteRc( const RSCINST & rInst, RscWriteRc & aMem,
- RscTypCont * pTC, sal_uInt32 nDeep, bool bExtra );
+ RscTypCont * pTC, sal_uInt32 nDeep );
};
#endif // INCLUDED_RSC_INC_RSCTOP_HXX
generated by cgit (git 2.34.1) at 2025-02-14 23:08:23 +0000