Kaydet (Commit) 104e2278 authored tarafından Miklos Vajna's avatar Miklos Vajna

sw: translate last Anz occurrences in headers

Change-Id: I36e11fe9b5a8979478029162e0f51015fc1360fb
Reviewed-on: https://gerrit.libreoffice.org/24583Reviewed-by: 's avatarMiklos Vajna <vmiklos@collabora.co.uk>
Tested-by: 's avatarJenkins <ci@libreoffice.org>
üst 9793d761
...@@ -418,7 +418,7 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient ...@@ -418,7 +418,7 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient
size_t m_nParaCnt; size_t m_nParaCnt;
size_t m_nContextStMin; // Untergrenze fuer PopContext size_t m_nContextStMin; // Untergrenze fuer PopContext
size_t m_nContextStAttrMin; // Untergrenze fuer Attributierung size_t m_nContextStAttrMin; // Untergrenze fuer Attributierung
sal_uInt16 m_nSelectEntryCnt; // Anzahl der Eintraege der akt. Listbox sal_uInt16 m_nSelectEntryCnt; // Number of entries in the actual listbox
sal_uInt16 m_nOpenParaToken; // ein geoeffnetes Absatz-Element sal_uInt16 m_nOpenParaToken; // ein geoeffnetes Absatz-Element
enum JumpToMarks { JUMPTO_NONE, JUMPTO_MARK, JUMPTO_TABLE, JUMPTO_FRAME, enum JumpToMarks { JUMPTO_NONE, JUMPTO_MARK, JUMPTO_TABLE, JUMPTO_FRAME,
......
...@@ -653,7 +653,7 @@ void WW8AttributeOutput::StartStyles() ...@@ -653,7 +653,7 @@ void WW8AttributeOutput::StartStyles()
++nCurPos; ++nCurPos;
} }
rFib.fcStshfOrig = rFib.fcStshf = nCurPos; rFib.fcStshfOrig = rFib.fcStshf = nCurPos;
m_nStyAnzPos = nCurPos + 2; // Anzahl wird nachgetragen m_nStyleCountPos = nCurPos + 2; // Anzahl wird nachgetragen
static sal_uInt8 aStShi[] = { static sal_uInt8 aStShi[] = {
0x12, 0x00, 0x12, 0x00,
...@@ -669,7 +669,7 @@ void WW8AttributeOutput::EndStyles( sal_uInt16 nNumberOfStyles ) ...@@ -669,7 +669,7 @@ void WW8AttributeOutput::EndStyles( sal_uInt16 nNumberOfStyles )
WW8Fib& rFib = *m_rWW8Export.pFib; WW8Fib& rFib = *m_rWW8Export.pFib;
rFib.lcbStshfOrig = rFib.lcbStshf = m_rWW8Export.pTableStrm->Tell() - rFib.fcStshf; rFib.lcbStshfOrig = rFib.lcbStshf = m_rWW8Export.pTableStrm->Tell() - rFib.fcStshf;
SwWW8Writer::WriteShort( *m_rWW8Export.pTableStrm, m_nStyAnzPos, nNumberOfStyles ); SwWW8Writer::WriteShort( *m_rWW8Export.pTableStrm, m_nStyleCountPos, nNumberOfStyles );
} }
void MSWordStyles::OutputStylesTable() void MSWordStyles::OutputStylesTable()
......
...@@ -445,7 +445,7 @@ protected: ...@@ -445,7 +445,7 @@ protected:
/// For output of styles. /// For output of styles.
/// ///
/// Used between StartStyles() and EndStyles(). /// Used between StartStyles() and EndStyles().
sal_uLong m_nStyAnzPos; sal_uLong m_nStyleCountPos;
/// For output of run properties. /// For output of run properties.
/// ///
...@@ -463,7 +463,7 @@ public: ...@@ -463,7 +463,7 @@ public:
, nPOPosStdLen2(0) , nPOPosStdLen2(0)
, m_nStyleStartSize(0) , m_nStyleStartSize(0)
, m_nStyleLenPos(0) , m_nStyleLenPos(0)
, m_nStyAnzPos(0) , m_nStyleCountPos(0)
, m_nFieldResults(0) , m_nFieldResults(0)
, mbOnTOXEnding(false) , mbOnTOXEnding(false)
{ {
......
...@@ -1840,7 +1840,7 @@ public: // really private, but can only be done public ...@@ -1840,7 +1840,7 @@ public: // really private, but can only be done public
bool ForceFieldLanguage(SwField &rField, sal_uInt16 nLang); bool ForceFieldLanguage(SwField &rField, sal_uInt16 nLang);
eF_ResT Read_F_DateTime( WW8FieldDesc*, OUString& rStr ); eF_ResT Read_F_DateTime( WW8FieldDesc*, OUString& rStr );
eF_ResT Read_F_FileName( WW8FieldDesc*, OUString& rStr); eF_ResT Read_F_FileName( WW8FieldDesc*, OUString& rStr);
eF_ResT Read_F_Anz( WW8FieldDesc* pF, OUString& ); eF_ResT Read_F_Num( WW8FieldDesc* pF, OUString& );
eF_ResT Read_F_CurPage( WW8FieldDesc*, OUString& ); eF_ResT Read_F_CurPage( WW8FieldDesc*, OUString& );
eF_ResT Read_F_Ref( WW8FieldDesc* pF, OUString& ); eF_ResT Read_F_Ref( WW8FieldDesc* pF, OUString& );
......
...@@ -758,9 +758,9 @@ long SwWW8ImplReader::Read_Field(WW8PLCFManResult* pRes) ...@@ -758,9 +758,9 @@ long SwWW8ImplReader::Read_Field(WW8PLCFManResult* pRes)
&SwWW8ImplReader::Read_F_DocInfo, // 23 &SwWW8ImplReader::Read_F_DocInfo, // 23
&SwWW8ImplReader::Read_F_DocInfo, // 24 &SwWW8ImplReader::Read_F_DocInfo, // 24
&SwWW8ImplReader::Read_F_DocInfo, // 25 &SwWW8ImplReader::Read_F_DocInfo, // 25
&SwWW8ImplReader::Read_F_Anz, // 26 &SwWW8ImplReader::Read_F_Num, // 26
&SwWW8ImplReader::Read_F_Anz, // 27 &SwWW8ImplReader::Read_F_Num, // 27
&SwWW8ImplReader::Read_F_Anz, // 28 &SwWW8ImplReader::Read_F_Num, // 28
&SwWW8ImplReader::Read_F_FileName, // 29 &SwWW8ImplReader::Read_F_FileName, // 29
&SwWW8ImplReader::Read_F_TemplName, // 30 &SwWW8ImplReader::Read_F_TemplName, // 30
&SwWW8ImplReader::Read_F_DateTime, // 31 &SwWW8ImplReader::Read_F_DateTime, // 31
...@@ -1817,7 +1817,7 @@ eF_ResT SwWW8ImplReader::Read_F_FileName(WW8FieldDesc*, OUString &rStr) ...@@ -1817,7 +1817,7 @@ eF_ResT SwWW8ImplReader::Read_F_FileName(WW8FieldDesc*, OUString &rStr)
return FLD_OK; return FLD_OK;
} }
eF_ResT SwWW8ImplReader::Read_F_Anz( WW8FieldDesc* pF, OUString& rStr ) eF_ResT SwWW8ImplReader::Read_F_Num( WW8FieldDesc* pF, OUString& rStr )
{ {
sal_uInt16 nSub = DS_PAGE; // page number sal_uInt16 nSub = DS_PAGE; // page number
switch ( pF->nId ){ switch ( pF->nId ){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment