Kaydet (Commit) 1a078a05 authored tarafından Miklos Vajna's avatar Miklos Vajna

writerfilter: prefix SectionColumnHandler members

Change-Id: I3b0710aafd4a305d38a5559d38c1a56a8ed9e716
üst 9ce71b67
......@@ -30,12 +30,12 @@ using namespace ::com::sun::star;
SectionColumnHandler::SectionColumnHandler()
: LoggedProperties("SectionColumnHandler")
, bEqualWidth(false)
, nSpace(1270) // 720 twips
, nNum(0)
, bSep(false)
, m_bEqualWidth(false)
, m_nSpace(1270) // 720 twips
, m_nNum(0)
, m_bSep(false)
{
aTempColumn.nWidth = aTempColumn.nSpace = 0;
m_aTempColumn.nWidth = m_aTempColumn.nSpace = 0;
}
SectionColumnHandler::~SectionColumnHandler()
......@@ -48,23 +48,23 @@ void SectionColumnHandler::lcl_attribute(Id rName, Value & rVal)
switch( rName )
{
case NS_ooxml::LN_CT_Columns_equalWidth:
bEqualWidth = (nIntValue != 0);
m_bEqualWidth = (nIntValue != 0);
break;
case NS_ooxml::LN_CT_Columns_space:
nSpace = ConversionHelper::convertTwipToMM100( nIntValue );
m_nSpace = ConversionHelper::convertTwipToMM100( nIntValue );
break;
case NS_ooxml::LN_CT_Columns_num:
nNum = nIntValue;
m_nNum = nIntValue;
break;
case NS_ooxml::LN_CT_Columns_sep:
bSep = (nIntValue != 0);
m_bSep = (nIntValue != 0);
break;
case NS_ooxml::LN_CT_Column_w:
aTempColumn.nWidth = ConversionHelper::convertTwipToMM100( nIntValue );
m_aTempColumn.nWidth = ConversionHelper::convertTwipToMM100( nIntValue );
break;
case NS_ooxml::LN_CT_Column_space:
aTempColumn.nSpace = ConversionHelper::convertTwipToMM100( nIntValue );
m_aTempColumn.nSpace = ConversionHelper::convertTwipToMM100( nIntValue );
break;
default:
OSL_FAIL( "SectionColumnHandler: unknown attribute");
......@@ -77,12 +77,12 @@ void SectionColumnHandler::lcl_sprm(Sprm & rSprm)
{
case NS_ooxml::LN_CT_Columns_col:
{
aTempColumn.nWidth = aTempColumn.nSpace = 0;
m_aTempColumn.nWidth = m_aTempColumn.nSpace = 0;
writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps();
if( pProperties.get())
{
pProperties->resolve(*this);
aCols.push_back(aTempColumn);
m_aCols.push_back(m_aTempColumn);
}
}
break;
......
......@@ -35,13 +35,13 @@ struct _Column
class SectionColumnHandler : public LoggedProperties
{
bool bEqualWidth;
sal_Int32 nSpace;
sal_Int32 nNum;
bool bSep;
std::vector<_Column> aCols;
bool m_bEqualWidth;
sal_Int32 m_nSpace;
sal_Int32 m_nNum;
bool m_bSep;
std::vector<_Column> m_aCols;
_Column aTempColumn;
_Column m_aTempColumn;
// Properties
virtual void lcl_attribute(Id Name, Value & val) SAL_OVERRIDE;
......@@ -51,12 +51,12 @@ public:
SectionColumnHandler();
virtual ~SectionColumnHandler();
bool IsEqualWidth() const { return bEqualWidth; }
sal_Int32 GetSpace() const { return nSpace; }
sal_Int32 GetNum() const { return nNum; }
bool IsSeparator() const { return bSep; }
bool IsEqualWidth() const { return m_bEqualWidth; }
sal_Int32 GetSpace() const { return m_nSpace; }
sal_Int32 GetNum() const { return m_nNum; }
bool IsSeparator() const { return m_bSep; }
const std::vector<_Column>& GetColumns() const { return aCols;}
const std::vector<_Column>& GetColumns() const { return m_aCols;}
};
typedef std::shared_ptr< SectionColumnHandler > SectionColumnHandlerPtr;
......
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