mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sw: prefix members of SwMasterUsrPref

Browse Source 
Change-Id: I4988e6f58cfdabc0abcab56e912d46074b0946fe
Reviewed-on: https://gerrit.libreoffice.org/27764
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
This commit is contained in:
Miklos Vajna
2016-08-01 09:10:28 +02:00
parent 192365319d
commit 0db0fda5a1
2 changed files with 90 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
sw/source/uibase/config/usrpref.cxx
View File

@@ -47,40 +47,40 @@ void SwMasterUsrPref::SetUsrPref(const SwViewOption &rCopy)
}
SwMasterUsrPref::SwMasterUsrPref(bool bWeb) :
eFieldUpdateFlags(AUTOUPD_OFF),
nLinkUpdateMode(0),
bIsHScrollMetricSet(false),
bIsVScrollMetricSet(false),
nDefTab( MM50 * 4 ),
bIsSquaredPageMode(false),
bIsAlignMathObjectsToBaseline(false),
aContentConfig(bWeb, *this),
aLayoutConfig(bWeb, *this),
aGridConfig(bWeb, *this),
aCursorConfig(*this),
pWebColorConfig(bWeb ? new SwWebColorConfig(*this) : nullptr),
bApplyCharUnit(false)
m_eFieldUpdateFlags(AUTOUPD_OFF),
m_nLinkUpdateMode(0),
m_bIsHScrollMetricSet(false),
m_bIsVScrollMetricSet(false),
m_nDefTab( MM50 * 4 ),
m_bIsSquaredPageMode(false),
m_bIsAlignMathObjectsToBaseline(false),
m_aContentConfig(bWeb, *this),
m_aLayoutConfig(bWeb, *this),
m_aGridConfig(bWeb, *this),
m_aCursorConfig(*this),
m_pWebColorConfig(bWeb ? new SwWebColorConfig(*this) : nullptr),
m_bApplyCharUnit(false)
{
if (utl::ConfigManager::IsAvoidConfig())
{
eHScrollMetric = eVScrollMetric = eUserMetric = FUNIT_CM;
m_eHScrollMetric = m_eVScrollMetric = m_eUserMetric = FUNIT_CM;
return;
}
MeasurementSystem eSystem = SvtSysLocale().GetLocaleData().getMeasurementSystemEnum();
eUserMetric = MEASURE_METRIC == eSystem ? FUNIT_CM : FUNIT_INCH;
eHScrollMetric = eVScrollMetric = eUserMetric;
m_eUserMetric = MEASURE_METRIC == eSystem ? FUNIT_CM : FUNIT_INCH;
m_eHScrollMetric = m_eVScrollMetric = m_eUserMetric;
aContentConfig.Load();
aLayoutConfig.Load();
aGridConfig.Load();
aCursorConfig.Load();
if(pWebColorConfig)
pWebColorConfig->Load();
m_aContentConfig.Load();
m_aLayoutConfig.Load();
m_aGridConfig.Load();
m_aCursorConfig.Load();
if(m_pWebColorConfig)
m_pWebColorConfig->Load();
}
SwMasterUsrPref::~SwMasterUsrPref()
{
delete pWebColorConfig;
delete m_pWebColorConfig;
}
Sequence<OUString> SwContentViewConfig::GetPropertyNames()
@@ -289,12 +289,12 @@ void SwLayoutViewConfig::ImplCommit()
case 4: rVal <<= rParent.IsViewHRuler(true); break; // "Window/HorizontalRuler",
case 5: rVal <<= rParent.IsViewVRuler(true); break; // "Window/VerticalRuler",
case 6:
if(rParent.bIsHScrollMetricSet)
rVal <<= (sal_Int32)rParent.eHScrollMetric; // "Window/HorizontalRulerUnit"
if(rParent.m_bIsHScrollMetricSet)
rVal <<= (sal_Int32)rParent.m_eHScrollMetric; // "Window/HorizontalRulerUnit"
break;
case 7:
if(rParent.bIsVScrollMetricSet)
rVal <<= (sal_Int32)rParent.eVScrollMetric; // "Window/VerticalRulerUnit"
if(rParent.m_bIsVScrollMetricSet)
rVal <<= (sal_Int32)rParent.m_eVScrollMetric; // "Window/VerticalRulerUnit"
break;
case 8: rVal <<= rParent.IsSmoothScroll(); break; // "Window/SmoothScroll",
case 9: rVal <<= (sal_Int32)rParent.GetZoom(); break; // "Zoom/Value",
@@ -340,14 +340,14 @@ void SwLayoutViewConfig::Load()
case 5: rParent.SetViewVRuler(bSet); break;// "Window/VerticalRuler",
case 6:
{
rParent.bIsHScrollMetricSet = true;
rParent.eHScrollMetric = ((FieldUnit)nInt32Val); // "Window/HorizontalRulerUnit"
rParent.m_bIsHScrollMetricSet = true;
rParent.m_eHScrollMetric = ((FieldUnit)nInt32Val); // "Window/HorizontalRulerUnit"
}
break;
case 7:
{
rParent.bIsVScrollMetricSet = true;
rParent.eVScrollMetric = ((FieldUnit)nInt32Val); // "Window/VerticalRulerUnit"
rParent.m_bIsVScrollMetricSet = true;
rParent.m_eVScrollMetric = ((FieldUnit)nInt32Val); // "Window/VerticalRulerUnit"
}
break;
case 8: rParent.SetSmoothScroll(bSet); break;// "Window/SmoothScroll",

118
sw/source/uibase/inc/usrpref.hxx
View File

@@ -127,26 +127,26 @@ class SwMasterUsrPref : public SwViewOption
friend class SwCursorConfig;
friend class SwWebColorConfig;
SwFieldUpdateFlags eFieldUpdateFlags; //update of fields and charts
sal_Int32 nLinkUpdateMode;
FieldUnit eUserMetric;
FieldUnit eHScrollMetric;
bool bIsHScrollMetricSet;
FieldUnit eVScrollMetric;
bool bIsVScrollMetricSet;
SwFieldUpdateFlags m_eFieldUpdateFlags; //update of fields and charts
sal_Int32 m_nLinkUpdateMode;
FieldUnit m_eUserMetric;
FieldUnit m_eHScrollMetric;
bool m_bIsHScrollMetricSet;
FieldUnit m_eVScrollMetric;
bool m_bIsVScrollMetricSet;
sal_Int32 nDefTab; //default tab stop distance
sal_Int32 m_nDefTab; //default tab stop distance
bool bIsSquaredPageMode; //default page mode for text grid
bool bIsAlignMathObjectsToBaseline;
bool m_bIsSquaredPageMode; //default page mode for text grid
bool m_bIsAlignMathObjectsToBaseline;
SwContentViewConfig aContentConfig;
SwLayoutViewConfig aLayoutConfig;
SwGridConfig aGridConfig;
SwCursorConfig aCursorConfig;
SwWebColorConfig* pWebColorConfig;
SwContentViewConfig m_aContentConfig;
SwLayoutViewConfig m_aLayoutConfig;
SwGridConfig m_aGridConfig;
SwCursorConfig m_aCursorConfig;
SwWebColorConfig* m_pWebColorConfig;
bool bApplyCharUnit; // apply_char_unit
bool m_bApplyCharUnit; // apply_char_unit
public:
SwMasterUsrPref(bool bWeb);
~SwMasterUsrPref();
@@ -155,111 +155,111 @@ public:
void SetModified()
{
aContentConfig.SetModified();
aLayoutConfig.SetModified();
aGridConfig.SetModified();
aCursorConfig.SetModified();
if(pWebColorConfig)
pWebColorConfig->SetModified();
m_aContentConfig.SetModified();
m_aLayoutConfig.SetModified();
m_aGridConfig.SetModified();
m_aCursorConfig.SetModified();
if(m_pWebColorConfig)
m_pWebColorConfig->SetModified();
}
void SetUpdateLinkMode(sal_Int32 nSet, bool bNoModify = false)
{
nLinkUpdateMode = nSet;
m_nLinkUpdateMode = nSet;
if(!bNoModify)
aContentConfig.SetModified();
m_aContentConfig.SetModified();
}
sal_Int32 GetUpdateLinkMode() const {return nLinkUpdateMode; }
sal_Int32 GetUpdateLinkMode() const {return m_nLinkUpdateMode; }
void SetUpdateFields(bool bSet)
{
if(bSet && eFieldUpdateFlags == AUTOUPD_OFF)
if(bSet && m_eFieldUpdateFlags == AUTOUPD_OFF)
{
eFieldUpdateFlags = AUTOUPD_FIELD_ONLY;
m_eFieldUpdateFlags = AUTOUPD_FIELD_ONLY;
}
else if(!bSet)
{
eFieldUpdateFlags = AUTOUPD_OFF;
m_eFieldUpdateFlags = AUTOUPD_OFF;
}
};
bool IsUpdateFields()const {return eFieldUpdateFlags != AUTOUPD_OFF; }
bool IsUpdateFields()const {return m_eFieldUpdateFlags != AUTOUPD_OFF; }
SwFieldUpdateFlags GetFieldUpdateFlags()const {return eFieldUpdateFlags;}
SwFieldUpdateFlags GetFieldUpdateFlags()const {return m_eFieldUpdateFlags;}
void SetFieldUpdateFlags(SwFieldUpdateFlags eSet)
{
eFieldUpdateFlags = eSet;
aContentConfig.SetModified();
m_eFieldUpdateFlags = eSet;
m_aContentConfig.SetModified();
}
void SetUpdateCharts(bool bSet)
{
if(bSet)
{
eFieldUpdateFlags = AUTOUPD_FIELD_AND_CHARTS;
m_eFieldUpdateFlags = AUTOUPD_FIELD_AND_CHARTS;
}
else if(eFieldUpdateFlags == AUTOUPD_FIELD_AND_CHARTS)
else if(m_eFieldUpdateFlags == AUTOUPD_FIELD_AND_CHARTS)
{
eFieldUpdateFlags = AUTOUPD_FIELD_ONLY;
m_eFieldUpdateFlags = AUTOUPD_FIELD_ONLY;
}
};
bool IsUpdateCharts()const {return eFieldUpdateFlags == AUTOUPD_FIELD_AND_CHARTS; }
bool IsUpdateCharts()const {return m_eFieldUpdateFlags == AUTOUPD_FIELD_AND_CHARTS; }
FieldUnit GetMetric() const { return eUserMetric;}
FieldUnit GetMetric() const { return m_eUserMetric;}
void SetMetric(FieldUnit eSet, bool bNoModify = false)
{
eUserMetric = eSet;
m_eUserMetric = eSet;
if(!bNoModify)
aLayoutConfig.SetModified();
m_aLayoutConfig.SetModified();
}
bool IsHScrollMetric()const {return bIsHScrollMetricSet;}
FieldUnit GetHScrollMetric() const { return bIsHScrollMetricSet ? eHScrollMetric : eUserMetric;}
bool IsHScrollMetric()const {return m_bIsHScrollMetricSet;}
FieldUnit GetHScrollMetric() const { return m_bIsHScrollMetricSet ? m_eHScrollMetric : m_eUserMetric;}
void SetHScrollMetric(FieldUnit eSet)
{
eHScrollMetric = eSet; bIsHScrollMetricSet = true;
aLayoutConfig.SetModified();
m_eHScrollMetric = eSet; m_bIsHScrollMetricSet = true;
m_aLayoutConfig.SetModified();
}
bool IsVScrollMetric()const {return bIsVScrollMetricSet;}
FieldUnit GetVScrollMetric() const { return bIsVScrollMetricSet ? eVScrollMetric : eUserMetric;}
bool IsVScrollMetric()const {return m_bIsVScrollMetricSet;}
FieldUnit GetVScrollMetric() const { return m_bIsVScrollMetricSet ? m_eVScrollMetric : m_eUserMetric;}
void SetVScrollMetric(FieldUnit eSet)
{
eVScrollMetric = eSet; bIsVScrollMetricSet = true;
aLayoutConfig.SetModified();
m_eVScrollMetric = eSet; m_bIsVScrollMetricSet = true;
m_aLayoutConfig.SetModified();
}
bool IsApplyCharUnit() const
{
return bApplyCharUnit;
return m_bApplyCharUnit;
}
void SetApplyCharUnit(bool bSet)
{
bApplyCharUnit = bSet;
aLayoutConfig.SetModified();
m_bApplyCharUnit = bSet;
m_aLayoutConfig.SetModified();
}
sal_Int32 GetDefTab() const { return nDefTab;}
sal_Int32 GetDefTab() const { return m_nDefTab;}
void SetDefTab( sal_Int32 nSet, bool bNoModify = false )
{
nDefTab = nSet;
m_nDefTab = nSet;
if(!bNoModify)
aLayoutConfig.SetModified();
m_aLayoutConfig.SetModified();
}
//default page mode for text grid
bool IsSquaredPageMode() const {return bIsSquaredPageMode;}
bool IsSquaredPageMode() const {return m_bIsSquaredPageMode;}
void SetDefaultPageMode( bool bVal, bool bNoModify = false )
{
bIsSquaredPageMode = bVal;
m_bIsSquaredPageMode = bVal;
if(!bNoModify)
aLayoutConfig.SetModified();
m_aLayoutConfig.SetModified();
}
bool IsAlignMathObjectsToBaseline() const { return bIsAlignMathObjectsToBaseline; }
bool IsAlignMathObjectsToBaseline() const { return m_bIsAlignMathObjectsToBaseline; }
void SetAlignMathObjectsToBaseline( bool bVal )
{
bIsAlignMathObjectsToBaseline = bVal;
aLayoutConfig.SetModified();
m_bIsAlignMathObjectsToBaseline = bVal;
m_aLayoutConfig.SetModified();
}
};