summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.com>2019-05-17 21:40:02 +0200
committerMiklos Vajna <vmiklos@collabora.com>2019-05-20 10:06:17 +0200
commit7e24483d12a1ae284b026cd737374b40f2a08aa2 (patch)
treeb8ef245f6a81a5cf0c9fe2a6bc18ca663c77943a
parentaebe2abe77ab748c5325df82e407663141ce2bf8 (diff)
writerfilter: make RTFParserState members private, part 3
Change-Id: I823122d89f674539d6aa54ffd48b406d199677d2 Reviewed-on: https://gerrit.libreoffice.org/72556 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
-rw-r--r--writerfilter/source/rtftok/rtfdispatchdestination.cxx2
-rw-r--r--writerfilter/source/rtftok/rtfdispatchflag.cxx6
-rw-r--r--writerfilter/source/rtftok/rtfdispatchvalue.cxx16
-rw-r--r--writerfilter/source/rtftok/rtfdocumentimpl.cxx119
-rw-r--r--writerfilter/source/rtftok/rtfdocumentimpl.hxx31
5 files changed, 108 insertions, 66 deletions
diff --git a/writerfilter/source/rtftok/rtfdispatchdestination.cxx b/writerfilter/source/rtftok/rtfdispatchdestination.cxx
index 881096130517..a855f1c99510 100644
--- a/writerfilter/source/rtftok/rtfdispatchdestination.cxx
+++ b/writerfilter/source/rtftok/rtfdispatchdestination.cxx
@@ -653,7 +653,7 @@ RTFError RTFDocumentImpl::dispatchDestination(RTFKeyword nKeyword)
}
// new destination => use new destination text
- m_aStates.top().setCurrentDestinationText(&m_aStates.top().aDestinationText);
+ m_aStates.top().setCurrentDestinationText(&m_aStates.top().getDestinationText());
return RTFError::OK;
}
diff --git a/writerfilter/source/rtftok/rtfdispatchflag.cxx b/writerfilter/source/rtftok/rtfdispatchflag.cxx
index 5bc0c75d4171..870ab1e9cd27 100644
--- a/writerfilter/source/rtftok/rtfdispatchflag.cxx
+++ b/writerfilter/source/rtftok/rtfdispatchflag.cxx
@@ -471,7 +471,7 @@ RTFError RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
m_aStates.top().nCurrentEncoding = getEncoding(getFontIndex(m_nDefaultFontIndex));
m_aStates.top().aCharacterAttributes = getDefaultState().aCharacterAttributes;
m_aStates.top().setCurrentCharacterStyleIndex(-1);
- m_aStates.top().isRightToLeft = false;
+ m_aStates.top().setIsRightToLeft(false);
m_aStates.top().eRunType = RTFParserState::RunType::LOCH;
}
break;
@@ -579,10 +579,10 @@ RTFError RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
break;
case RTF_LTRCH:
// dmapper does not support this.
- m_aStates.top().isRightToLeft = false;
+ m_aStates.top().setIsRightToLeft(false);
break;
case RTF_RTLCH:
- m_aStates.top().isRightToLeft = true;
+ m_aStates.top().setIsRightToLeft(true);
if (m_aDefaultState.nCurrentEncoding == RTL_TEXTENCODING_MS_1255)
m_aStates.top().nCurrentEncoding = m_aDefaultState.nCurrentEncoding;
break;
diff --git a/writerfilter/source/rtftok/rtfdispatchvalue.cxx b/writerfilter/source/rtftok/rtfdispatchvalue.cxx
index 06097845d5dc..fbf76b468ce0 100644
--- a/writerfilter/source/rtftok/rtfdispatchvalue.cxx
+++ b/writerfilter/source/rtftok/rtfdispatchvalue.cxx
@@ -164,7 +164,7 @@ RTFError RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam)
{
case RTF_FS:
case RTF_AFS:
- nSprm = (m_aStates.top().isRightToLeft
+ nSprm = (m_aStates.top().getIsRightToLeft()
|| m_aStates.top().eRunType == RTFParserState::RunType::HICH)
? NS_ooxml::LN_EG_RPrBase_szCs
: NS_ooxml::LN_EG_RPrBase_sz;
@@ -191,7 +191,7 @@ RTFError RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam)
{
case RTF_LANG:
case RTF_ALANG:
- if (m_aStates.top().isRightToLeft
+ if (m_aStates.top().getIsRightToLeft()
|| m_aStates.top().eRunType == RTFParserState::RunType::HICH)
{
nSprm = NS_ooxml::LN_CT_Language_bidi;
@@ -261,31 +261,31 @@ RTFError RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam)
{
case RTF_YR:
{
- m_aStates.top().nYear = nParam;
+ m_aStates.top().setYear(nParam);
nSprm = 1;
}
break;
case RTF_MO:
{
- m_aStates.top().nMonth = nParam;
+ m_aStates.top().setMonth(nParam);
nSprm = 1;
}
break;
case RTF_DY:
{
- m_aStates.top().nDay = nParam;
+ m_aStates.top().setDay(nParam);
nSprm = 1;
}
break;
case RTF_HR:
{
- m_aStates.top().nHour = nParam;
+ m_aStates.top().setHour(nParam);
nSprm = 1;
}
break;
case RTF_MIN:
{
- m_aStates.top().nMinute = nParam;
+ m_aStates.top().setMinute(nParam);
nSprm = 1;
}
break;
@@ -336,7 +336,7 @@ RTFError RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam)
{
case RTF_F:
case RTF_AF:
- if (m_aStates.top().isRightToLeft
+ if (m_aStates.top().getIsRightToLeft()
|| m_aStates.top().eRunType == RTFParserState::RunType::HICH)
{
nSprm = NS_ooxml::LN_CT_Fonts_cs;
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 0d4d4a290041..5ac66cce3abc 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -220,8 +220,14 @@ const char* keywordToString(RTFKeyword nKeyword)
static util::DateTime lcl_getDateTime(RTFParserState const& aState)
{
- return { 0 /*100sec*/, 0 /*sec*/, aState.nMinute, aState.nHour,
- aState.nDay, aState.nMonth, aState.nYear, false };
+ return { 0 /*100sec*/,
+ 0 /*sec*/,
+ aState.getMinute(),
+ aState.getHour(),
+ aState.getDay(),
+ aState.getMonth(),
+ static_cast<sal_Int16>(aState.getYear()),
+ false };
}
static void lcl_DestinationToMath(OUStringBuffer* pDestinationText,
@@ -842,7 +848,7 @@ void RTFDocumentImpl::resolvePict(bool const bInline, uno::Reference<drawing::XS
int b = 0, count = 2;
// Feed the destination text to a stream.
- OString aStr = OUStringToOString(m_aStates.top().aDestinationText.makeStringAndClear(),
+ OString aStr = OUStringToOString(m_aStates.top().getDestinationText().makeStringAndClear(),
RTL_TEXTENCODING_ASCII_US);
for (int i = 0; i < aStr.getLength(); ++i)
{
@@ -1834,14 +1840,14 @@ RTFError RTFDocumentImpl::dispatchToggle(RTFKeyword nKeyword, bool bParam, int n
{
case RTF_B:
case RTF_AB:
- nSprm = (m_aStates.top().isRightToLeft
+ nSprm = (m_aStates.top().getIsRightToLeft()
|| m_aStates.top().eRunType == RTFParserState::RunType::HICH)
? NS_ooxml::LN_EG_RPrBase_bCs
: NS_ooxml::LN_EG_RPrBase_b;
break;
case RTF_I:
case RTF_AI:
- nSprm = (m_aStates.top().isRightToLeft
+ nSprm = (m_aStates.top().getIsRightToLeft()
|| m_aStates.top().eRunType == RTFParserState::RunType::HICH)
? NS_ooxml::LN_EG_RPrBase_iCs
: NS_ooxml::LN_EG_RPrBase_i;
@@ -1940,7 +1946,7 @@ RTFError RTFDocumentImpl::pushState()
m_bMathNor);
m_aStates.push(m_aStates.top());
}
- m_aStates.top().aDestinationText.setLength(0); // was copied: always reset!
+ m_aStates.top().getDestinationText().setLength(0); // was copied: always reset!
m_pTokenizer->pushGroup();
@@ -1948,12 +1954,12 @@ RTFError RTFDocumentImpl::pushState()
{
case Destination::FONTTABLE:
// this is a "faked" destination for the font entry
- m_aStates.top().setCurrentDestinationText(&m_aStates.top().aDestinationText);
+ m_aStates.top().setCurrentDestinationText(&m_aStates.top().getDestinationText());
m_aStates.top().eDestination = Destination::FONTENTRY;
break;
case Destination::STYLESHEET:
// this is a "faked" destination for the style sheet entry
- m_aStates.top().setCurrentDestinationText(&m_aStates.top().aDestinationText);
+ m_aStates.top().setCurrentDestinationText(&m_aStates.top().getDestinationText());
m_aStates.top().eDestination = Destination::STYLEENTRY;
{
// the *default* is \s0 i.e. paragraph style default
@@ -1983,7 +1989,7 @@ RTFError RTFDocumentImpl::pushState()
break;
case Destination::REVISIONTABLE:
// this is a "faked" destination for the revision table entry
- m_aStates.top().setCurrentDestinationText(&m_aStates.top().aDestinationText);
+ m_aStates.top().setCurrentDestinationText(&m_aStates.top().getDestinationText());
m_aStates.top().eDestination = Destination::REVISIONENTRY;
break;
default:
@@ -2234,7 +2240,7 @@ RTFError RTFDocumentImpl::popState()
aBuf.append("0");
aBuf.append(OUString::number(ch, 16));
}
- m_aStates.top().aDestinationText = aBuf;
+ m_aStates.top().getDestinationText() = aBuf;
}
}
popState();
@@ -2244,7 +2250,8 @@ RTFError RTFDocumentImpl::popState()
break;
case Destination::LEVELTEXT:
{
- if (&m_aStates.top().aDestinationText != m_aStates.top().getCurrentDestinationText())
+ if (&m_aStates.top().getDestinationText()
+ != m_aStates.top().getCurrentDestinationText())
break; // not for nested group
OUString aStr = m_aStates.top().getCurrentDestinationText()->makeStringAndClear();
@@ -2301,7 +2308,8 @@ RTFError RTFDocumentImpl::popState()
break;
}
case Destination::SHAPEPROPERTYNAME:
- if (&m_aStates.top().aDestinationText != m_aStates.top().getCurrentDestinationText())
+ if (&m_aStates.top().getDestinationText()
+ != m_aStates.top().getCurrentDestinationText())
break; // not for nested group
aState.aShape.getProperties().emplace_back(
m_aStates.top().getCurrentDestinationText()->makeStringAndClear(), OUString());
@@ -2375,7 +2383,8 @@ RTFError RTFDocumentImpl::popState()
break;
case Destination::BOOKMARKSTART:
{
- if (&m_aStates.top().aDestinationText != m_aStates.top().getCurrentDestinationText())
+ if (&m_aStates.top().getDestinationText()
+ != m_aStates.top().getCurrentDestinationText())
break; // not for nested group
OUString aStr = m_aStates.top().getCurrentDestinationText()->makeStringAndClear();
int nPos = m_aBookmarks.size();
@@ -2389,7 +2398,8 @@ RTFError RTFDocumentImpl::popState()
break;
case Destination::BOOKMARKEND:
{
- if (&m_aStates.top().aDestinationText != m_aStates.top().getCurrentDestinationText())
+ if (&m_aStates.top().getDestinationText()
+ != m_aStates.top().getCurrentDestinationText())
break; // not for nested group
OUString aStr = m_aStates.top().getCurrentDestinationText()->makeStringAndClear();
if (!m_aStates.top().getCurrentBuffer())
@@ -2404,7 +2414,8 @@ RTFError RTFDocumentImpl::popState()
case Destination::INDEXENTRY:
case Destination::TOCENTRY:
{
- if (&m_aStates.top().aDestinationText != m_aStates.top().getCurrentDestinationText())
+ if (&m_aStates.top().getDestinationText()
+ != m_aStates.top().getCurrentDestinationText())
break; // not for nested group
OUString str(m_aStates.top().getCurrentDestinationText()->makeStringAndClear());
// dmapper expects this as a field, so let's fake something...
@@ -2421,7 +2432,8 @@ RTFError RTFDocumentImpl::popState()
break;
case Destination::FORMFIELDNAME:
{
- if (&m_aStates.top().aDestinationText != m_aStates.top().getCurrentDestinationText())
+ if (&m_aStates.top().getDestinationText()
+ != m_aStates.top().getCurrentDestinationText())
break; // not for nested group
auto pValue
= new RTFValue(m_aStates.top().getCurrentDestinationText()->makeStringAndClear());
@@ -2430,7 +2442,8 @@ RTFError RTFDocumentImpl::popState()
break;
case Destination::FORMFIELDLIST:
{
- if (&m_aStates.top().aDestinationText != m_aStates.top().getCurrentDestinationText())
+ if (&m_aStates.top().getDestinationText()
+ != m_aStates.top().getCurrentDestinationText())
break; // not for nested group
auto pValue
= new RTFValue(m_aStates.top().getCurrentDestinationText()->makeStringAndClear());
@@ -2441,7 +2454,7 @@ RTFError RTFDocumentImpl::popState()
{
if (m_bFormField)
{
- if (&m_aStates.top().aDestinationText
+ if (&m_aStates.top().getDestinationText()
!= m_aStates.top().getCurrentDestinationText())
break; // not for nested group
OString aStr = OUStringToOString(
@@ -2515,28 +2528,32 @@ RTFError RTFDocumentImpl::popState()
m_xDocumentProperties->setPrintDate(lcl_getDateTime(aState));
break;
case Destination::AUTHOR:
- if (&m_aStates.top().aDestinationText != m_aStates.top().getCurrentDestinationText())
+ if (&m_aStates.top().getDestinationText()
+ != m_aStates.top().getCurrentDestinationText())
break; // not for nested group
if (m_xDocumentProperties.is())
m_xDocumentProperties->setAuthor(
m_aStates.top().getCurrentDestinationText()->makeStringAndClear());
break;
case Destination::KEYWORDS:
- if (&m_aStates.top().aDestinationText != m_aStates.top().getCurrentDestinationText())
+ if (&m_aStates.top().getDestinationText()
+ != m_aStates.top().getCurrentDestinationText())
break; // not for nested group
if (m_xDocumentProperties.is())
m_xDocumentProperties->setKeywords(comphelper::string::convertCommaSeparated(
m_aStates.top().getCurrentDestinationText()->makeStringAndClear()));
break;
case Destination::COMMENT:
- if (&m_aStates.top().aDestinationText != m_aStates.top().getCurrentDestinationText())
+ if (&m_aStates.top().getDestinationText()
+ != m_aStates.top().getCurrentDestinationText())
break; // not for nested group
if (m_xDocumentProperties.is())
m_xDocumentProperties->setGenerator(
m_aStates.top().getCurrentDestinationText()->makeStringAndClear());
break;
case Destination::SUBJECT:
- if (&m_aStates.top().aDestinationText != m_aStates.top().getCurrentDestinationText())
+ if (&m_aStates.top().getDestinationText()
+ != m_aStates.top().getCurrentDestinationText())
break; // not for nested group
if (m_xDocumentProperties.is())
m_xDocumentProperties->setSubject(
@@ -2544,7 +2561,8 @@ RTFError RTFDocumentImpl::popState()
break;
case Destination::TITLE:
{
- if (&m_aStates.top().aDestinationText != m_aStates.top().getCurrentDestinationText())
+ if (&m_aStates.top().getDestinationText()
+ != m_aStates.top().getCurrentDestinationText())
break; // not for nested group
if (m_xDocumentProperties.is())
m_xDocumentProperties->setTitle(
@@ -2553,7 +2571,8 @@ RTFError RTFDocumentImpl::popState()
break;
case Destination::DOCCOMM:
- if (&m_aStates.top().aDestinationText != m_aStates.top().getCurrentDestinationText())
+ if (&m_aStates.top().getDestinationText()
+ != m_aStates.top().getCurrentDestinationText())
break; // not for nested group
if (m_xDocumentProperties.is())
m_xDocumentProperties->setDescription(
@@ -2562,7 +2581,8 @@ RTFError RTFDocumentImpl::popState()
case Destination::OPERATOR:
case Destination::COMPANY:
{
- if (&m_aStates.top().aDestinationText != m_aStates.top().getCurrentDestinationText())
+ if (&m_aStates.top().getDestinationText()
+ != m_aStates.top().getCurrentDestinationText())
break; // not for nested group
OUString aName = aState.eDestination == Destination::OPERATOR ? OUString("Operator")
: OUString("Company");
@@ -2586,7 +2606,8 @@ RTFError RTFDocumentImpl::popState()
break;
case Destination::OBJDATA:
{
- if (&m_aStates.top().aDestinationText != m_aStates.top().getCurrentDestinationText())
+ if (&m_aStates.top().getDestinationText()
+ != m_aStates.top().getCurrentDestinationText())
break; // not for nested group
RTFError eError = handleEmbeddedObject();
@@ -2639,7 +2660,8 @@ RTFError RTFDocumentImpl::popState()
break;
case Destination::ANNOTATIONDATE:
{
- if (&m_aStates.top().aDestinationText != m_aStates.top().getCurrentDestinationText())
+ if (&m_aStates.top().getDestinationText()
+ != m_aStates.top().getCurrentDestinationText())
break; // not for nested group
OUString aStr(OStringToOUString(
DTTM22OString(
@@ -2654,19 +2676,22 @@ RTFError RTFDocumentImpl::popState()
}
break;
case Destination::ANNOTATIONAUTHOR:
- if (&m_aStates.top().aDestinationText != m_aStates.top().getCurrentDestinationText())
+ if (&m_aStates.top().getDestinationText()
+ != m_aStates.top().getCurrentDestinationText())
break; // not for nested group
m_aAuthor = m_aStates.top().getCurrentDestinationText()->makeStringAndClear();
break;
case Destination::ATNID:
- if (&m_aStates.top().aDestinationText != m_aStates.top().getCurrentDestinationText())
+ if (&m_aStates.top().getDestinationText()
+ != m_aStates.top().getCurrentDestinationText())
break; // not for nested group
m_aAuthorInitials = m_aStates.top().getCurrentDestinationText()->makeStringAndClear();
break;
case Destination::ANNOTATIONREFERENCESTART:
case Destination::ANNOTATIONREFERENCEEND:
{
- if (&m_aStates.top().aDestinationText != m_aStates.top().getCurrentDestinationText())
+ if (&m_aStates.top().getDestinationText()
+ != m_aStates.top().getCurrentDestinationText())
break; // not for nested group
OUString aStr = m_aStates.top().getCurrentDestinationText()->makeStringAndClear();
auto pValue = new RTFValue(aStr.toInt32());
@@ -2682,7 +2707,8 @@ RTFError RTFDocumentImpl::popState()
break;
case Destination::ANNOTATIONREFERENCE:
{
- if (&m_aStates.top().aDestinationText != m_aStates.top().getCurrentDestinationText())
+ if (&m_aStates.top().getDestinationText()
+ != m_aStates.top().getCurrentDestinationText())
break; // not for nested group
OUString aStr = m_aStates.top().getCurrentDestinationText()->makeStringAndClear();
RTFSprms aAnnAttributes;
@@ -2692,7 +2718,8 @@ RTFError RTFDocumentImpl::popState()
break;
case Destination::FALT:
{
- if (&m_aStates.top().aDestinationText != m_aStates.top().getCurrentDestinationText())
+ if (&m_aStates.top().getDestinationText()
+ != m_aStates.top().getCurrentDestinationText())
break; // not for nested group
OUString aStr(m_aStates.top().getCurrentDestinationText()->makeStringAndClear());
auto pValue = new RTFValue(aStr);
@@ -3005,12 +3032,14 @@ RTFError RTFDocumentImpl::popState()
m_pSdrImport->popParent();
break;
case Destination::PROPNAME:
- if (&m_aStates.top().aDestinationText != m_aStates.top().getCurrentDestinationText())
+ if (&m_aStates.top().getDestinationText()
+ != m_aStates.top().getCurrentDestinationText())
break; // not for nested group
aState.setPropName(m_aStates.top().getCurrentDestinationText()->makeStringAndClear());
break;
case Destination::STATICVAL:
- if (&m_aStates.top().aDestinationText != m_aStates.top().getCurrentDestinationText())
+ if (&m_aStates.top().getDestinationText()
+ != m_aStates.top().getCurrentDestinationText())
break; // not for nested group
if (m_xDocumentProperties.is())
{
@@ -3232,7 +3261,7 @@ RTFError RTFDocumentImpl::popState()
if (!m_aStates.empty())
{
// FIXME: don't use pDestinationText, points to popped state
- auto pValue = new RTFValue(aState.aDestinationText.makeStringAndClear(), true);
+ auto pValue = new RTFValue(aState.getDestinationText().makeStringAndClear(), true);
m_aStates.top().aTableAttributes.set(NS_ooxml::LN_CT_LevelSuffix_val, pValue);
}
break;
@@ -3240,7 +3269,7 @@ RTFError RTFDocumentImpl::popState()
if (!m_aStates.empty())
{
// FIXME: don't use pDestinationText, points to popped state
- auto pValue = new RTFValue(aState.aDestinationText.makeStringAndClear(), true);
+ auto pValue = new RTFValue(aState.getDestinationText().makeStringAndClear(), true);
m_aStates.top().aTableAttributes.set(NS_ooxml::LN_CT_LevelText_val, pValue);
}
break;
@@ -3326,7 +3355,7 @@ RTFError RTFDocumentImpl::popState()
{
m_aStates.top().aPicture = aState.aPicture;
// both \sp and \sv are destinations, copy the text up-ward for later
- m_aStates.top().aDestinationText = aState.aDestinationText;
+ m_aStates.top().getDestinationText() = aState.getDestinationText();
}
break;
case Destination::FALT:
@@ -3477,8 +3506,8 @@ void RTFDocumentImpl::setDestination(Destination eDestination)
// situation where it looks like the "current" buffer is needed?
void RTFDocumentImpl::setDestinationText(OUString const& rString)
{
- m_aStates.top().aDestinationText.setLength(0);
- m_aStates.top().aDestinationText.append(rString);
+ m_aStates.top().getDestinationText().setLength(0);
+ m_aStates.top().getDestinationText().append(rString);
}
bool RTFDocumentImpl::getSkipUnknown() { return m_bSkipUnknown; }
@@ -3517,12 +3546,12 @@ RTFParserState::RTFParserState(RTFDocumentImpl* pDocumentImpl)
, bLevelNumbersValid(true)
, aFrame(this)
, eRunType(RunType::LOCH)
- , isRightToLeft(false)
- , nYear(0)
- , nMonth(0)
- , nDay(0)
- , nHour(0)
- , nMinute(0)
+ , m_bIsRightToLeft(false)
+ , m_nYear(0)
+ , m_nMonth(0)
+ , m_nDay(0)
+ , m_nHour(0)
+ , m_nMinute(0)
, m_pCurrentDestinationText(nullptr)
, m_nCurrentStyleIndex(-1)
, m_nCurrentCharacterStyleIndex(-1)
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index a0394ab55414..42249dd5e590 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -456,6 +456,19 @@ public:
m_pCurrentDestinationText = pDestinationText;
}
OUStringBuffer* getCurrentDestinationText() const { return m_pCurrentDestinationText; }
+ OUStringBuffer& getDestinationText() { return m_aDestinationText; }
+ void setMinute(sal_uInt16 nMinute) { m_nMinute = nMinute; }
+ sal_uInt16 getMinute() const { return m_nMinute; }
+ void setHour(sal_uInt16 nHour) { m_nHour = nHour; }
+ sal_uInt16 getHour() const { return m_nHour; }
+ void setDay(sal_uInt16 nDay) { m_nDay = nDay; }
+ sal_uInt16 getDay() const { return m_nDay; }
+ void setMonth(sal_uInt16 nMonth) { m_nMonth = nMonth; }
+ sal_uInt16 getMonth() const { return m_nMonth; }
+ void setYear(sal_uInt16 nYear) { m_nYear = nYear; }
+ sal_uInt16 getYear() const { return m_nYear; }
+ void setIsRightToLeft(bool bIsRightToLeft) { m_bIsRightToLeft = bIsRightToLeft; }
+ bool getIsRightToLeft() const { return m_bIsRightToLeft; }
RTFDocumentImpl* m_pDocumentImpl;
RTFInternalState nInternalState;
@@ -517,20 +530,20 @@ public:
DBCH
};
RunType eRunType;
+
+private:
/// ltrch or rtlch
- bool isRightToLeft;
+ bool m_bIsRightToLeft;
// Info group.
- sal_Int16 nYear;
- sal_uInt16 nMonth;
- sal_uInt16 nDay;
- sal_uInt16 nHour;
- sal_uInt16 nMinute;
+ sal_Int16 m_nYear;
+ sal_uInt16 m_nMonth;
+ sal_uInt16 m_nDay;
+ sal_uInt16 m_nHour;
+ sal_uInt16 m_nMinute;
/// Text from special destinations.
- OUStringBuffer aDestinationText;
-
-private:
+ OUStringBuffer m_aDestinationText;
/// point to the buffer of the current destination
OUStringBuffer* m_pCurrentDestinationText;