summaryrefslogtreecommitdiff
path: root/sw/source/uibase/config
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/uibase/config')
-rw-r--r--sw/source/uibase/config/StoredChapterNumbering.cxx20
-rw-r--r--sw/source/uibase/config/cfgitems.cxx14
-rw-r--r--sw/source/uibase/config/modcfg.cxx58
-rw-r--r--sw/source/uibase/config/uinums.cxx124
-rw-r--r--sw/source/uibase/config/usrpref.cxx6
-rw-r--r--sw/source/uibase/config/viewopt.cxx8
6 files changed, 115 insertions, 115 deletions
diff --git a/sw/source/uibase/config/StoredChapterNumbering.cxx b/sw/source/uibase/config/StoredChapterNumbering.cxx
index df5388cd4966..4fb902dd6503 100644
--- a/sw/source/uibase/config/StoredChapterNumbering.cxx
+++ b/sw/source/uibase/config/StoredChapterNumbering.cxx
@@ -124,18 +124,18 @@ public:
{
return uno::Any();
}
- SwNumFmt const* pNumFmt(0);
+ SwNumFormat const* pNumFormat(0);
OUString const* pCharStyleName(0);
- pRules->GetNumFmt(nIndex, pNumFmt, pCharStyleName);
- if (!pNumFmt)
+ pRules->GetNumFormat(nIndex, pNumFormat, pCharStyleName);
+ if (!pNumFormat)
{ // the dialog only fills in those levels that are non-default
return uno::Any(); // the export will ignore this level, yay
}
assert(pCharStyleName);
OUString dummy; // pass in empty HeadingStyleName - can't import anyway
uno::Sequence<beans::PropertyValue> const ret(
- SwXNumberingRules::GetPropertiesForNumFmt(
- *pNumFmt, *pCharStyleName, &dummy));
+ SwXNumberingRules::GetPropertiesForNumFormat(
+ *pNumFormat, *pCharStyleName, &dummy));
return uno::makeAny(ret);
}
@@ -154,15 +154,15 @@ public:
static_cast< ::cppu::OWeakObject*>(this), 1);
SolarMutexGuard g;
- SwNumFmt aNumberFormat;
+ SwNumFormat aNumberFormat;
OUString charStyleName;
- SwXNumberingRules::SetPropertiesToNumFmt(
+ SwXNumberingRules::SetPropertiesToNumFormat(
aNumberFormat,
charStyleName,
0, 0, 0, 0, 0,
props);
SwNumRulesWithName *const pRules(GetOrCreateRules());
- pRules->SetNumFmt(nIndex, aNumberFormat, charStyleName);
+ pRules->SetNumFormat(nIndex, aNumberFormat, charStyleName);
}
};
@@ -438,9 +438,9 @@ void ExportStoredChapterNumberingRules(SwChapterNumRules & rRules,
{
for (size_t j = 0; j < MAXLEVEL; ++j)
{
- SwNumFmt const* pDummy(0);
+ SwNumFormat const* pDummy(0);
OUString const* pCharStyleName(0);
- pRule->GetNumFmt(j, pDummy, pCharStyleName);
+ pRule->GetNumFormat(j, pDummy, pCharStyleName);
if (pCharStyleName && !pCharStyleName->isEmpty())
{
charStyles.insert(*pCharStyleName);
diff --git a/sw/source/uibase/config/cfgitems.cxx b/sw/source/uibase/config/cfgitems.cxx
index 44eddb23a983..c0cd60f49886 100644
--- a/sw/source/uibase/config/cfgitems.cxx
+++ b/sw/source/uibase/config/cfgitems.cxx
@@ -43,7 +43,7 @@ SwDocDisplayItem::SwDocDisplayItem( sal_uInt16 _nWhich ) :
bSpace =
bNonbreakingSpace =
bSoftHyphen =
- bFldHiddenText =
+ bFieldHiddenText =
bCharHiddenText =
bManualBreak =
bShowHiddenPara = false;
@@ -66,7 +66,7 @@ SwDocDisplayItem::SwDocDisplayItem(const SwViewOption& rVOpt, sal_uInt16 _nWhich
bNonbreakingSpace = rVOpt.IsHardBlank();
bSoftHyphen = rVOpt.IsSoftHyph();
bCharHiddenText = rVOpt.IsShowHiddenChar(true);
- bFldHiddenText = rVOpt.IsShowHiddenField();
+ bFieldHiddenText = rVOpt.IsShowHiddenField();
bManualBreak = rVOpt.IsLineBreak(true);
bShowHiddenPara = rVOpt.IsShowHiddenPara();
}
@@ -88,7 +88,7 @@ bool SwDocDisplayItem::operator==( const SfxPoolItem& rAttr ) const
bNonbreakingSpace == rItem.bNonbreakingSpace &&
bSoftHyphen == rItem.bSoftHyphen &&
bCharHiddenText == rItem.bCharHiddenText &&
- bFldHiddenText == rItem.bFldHiddenText &&
+ bFieldHiddenText == rItem.bFieldHiddenText &&
bManualBreak == rItem.bManualBreak &&
bShowHiddenPara == rItem.bShowHiddenPara );
}
@@ -101,7 +101,7 @@ void SwDocDisplayItem::operator=( const SwDocDisplayItem& rDocDisplayItem)
bNonbreakingSpace = rDocDisplayItem.bNonbreakingSpace ;
bSoftHyphen = rDocDisplayItem.bSoftHyphen ;
bCharHiddenText = rDocDisplayItem.bCharHiddenText ;
- bFldHiddenText = rDocDisplayItem.bFldHiddenText ;
+ bFieldHiddenText = rDocDisplayItem.bFieldHiddenText ;
bManualBreak = rDocDisplayItem.bManualBreak ;
bShowHiddenPara = rDocDisplayItem.bShowHiddenPara ;
}
@@ -114,7 +114,7 @@ void SwDocDisplayItem::FillViewOptions( SwViewOption& rVOpt) const
rVOpt.SetHardBlank (bNonbreakingSpace );
rVOpt.SetSoftHyph (bSoftHyphen );
rVOpt.SetShowHiddenChar(bCharHiddenText );
- rVOpt.SetShowHiddenField(bFldHiddenText );
+ rVOpt.SetShowHiddenField(bFieldHiddenText );
rVOpt.SetLineBreak (bManualBreak );
rVOpt.SetShowHiddenPara(bShowHiddenPara );
}
@@ -157,7 +157,7 @@ SwElemItem::SwElemItem(const SwViewOption& rVOpt, sal_uInt16 _nWhich) :
bTable = rVOpt.IsTable();
bGraphic = rVOpt.IsGraphic();
bDrawing = rVOpt.IsDraw() && rVOpt.IsControl();
- bFieldName = rVOpt.IsFldName();
+ bFieldName = rVOpt.IsFieldName();
bNotes = rVOpt.IsPostIts();
}
@@ -219,7 +219,7 @@ void SwElemItem::FillViewOptions( SwViewOption& rVOpt) const
rVOpt.SetGraphic (bGraphic );
rVOpt.SetDraw (bDrawing );
rVOpt.SetControl (bDrawing );
- rVOpt.SetFldName (bFieldName );
+ rVOpt.SetFieldName (bFieldName );
rVOpt.SetPostIts (bNotes );
}
diff --git a/sw/source/uibase/config/modcfg.cxx b/sw/source/uibase/config/modcfg.cxx
index e695c3247530..fcefb8ff4a76 100644
--- a/sw/source/uibase/config/modcfg.cxx
+++ b/sw/source/uibase/config/modcfg.cxx
@@ -591,7 +591,7 @@ SwInsertConfig::SwInsertConfig(bool bWeb) :
pOLEMiscOpt(0),
bInsWithCaption( false ),
bCaptionOrderNumberingFirst( false ),
- aInsTblOpts(0,0),
+ aInsTableOpts(0,0),
bIsWeb(bWeb)
{
aGlobalNames[GLOB_NAME_CALC ] = SvGlobalName(SO3_SC_CLASSID);
@@ -660,16 +660,16 @@ void SwInsertConfig::ImplCommit()
switch(nProp)
{
case INS_PROP_TABLE_HEADER:
- pValues[nProp] <<= 0 != (aInsTblOpts.mnInsMode & tabopts::HEADLINE);
+ pValues[nProp] <<= 0 != (aInsTableOpts.mnInsMode & tabopts::HEADLINE);
break;//"Table/Header",
case INS_PROP_TABLE_REPEATHEADER:
- pValues[nProp] <<= aInsTblOpts.mnRowsToRepeat > 0;
+ pValues[nProp] <<= aInsTableOpts.mnRowsToRepeat > 0;
break;//"Table/RepeatHeader",
case INS_PROP_TABLE_BORDER:
- pValues[nProp] <<= 0 != (aInsTblOpts.mnInsMode & tabopts::DEFAULT_BORDER );
+ pValues[nProp] <<= 0 != (aInsTableOpts.mnInsMode & tabopts::DEFAULT_BORDER );
break;//"Table/Border",
case INS_PROP_TABLE_SPLIT:
- pValues[nProp] <<= 0 != (aInsTblOpts.mnInsMode & tabopts::SPLIT_LAYOUT);
+ pValues[nProp] <<= 0 != (aInsTableOpts.mnInsMode & tabopts::SPLIT_LAYOUT);
break;//"Table/Split",
case INS_PROP_CAP_AUTOMATIC:
pValues[nProp] <<= bInsWithCaption;
@@ -894,7 +894,7 @@ void SwInsertConfig::Load()
else if (!bIsWeb)
return;
- sal_uInt16 nInsTblFlags = 0;
+ sal_uInt16 nInsTableFlags = 0;
for (sal_Int32 nProp = 0; nProp < aNames.getLength(); ++nProp)
{
if (pValues[nProp].hasValue())
@@ -905,25 +905,25 @@ void SwInsertConfig::Load()
case INS_PROP_TABLE_HEADER:
{
if(bBool)
- nInsTblFlags|= tabopts::HEADLINE;
+ nInsTableFlags|= tabopts::HEADLINE;
}
break;//"Table/Header",
case INS_PROP_TABLE_REPEATHEADER:
{
- aInsTblOpts.mnRowsToRepeat = bBool? 1 : 0;
+ aInsTableOpts.mnRowsToRepeat = bBool? 1 : 0;
}
break;//"Table/RepeatHeader",
case INS_PROP_TABLE_BORDER:
{
if(bBool)
- nInsTblFlags|= tabopts::DEFAULT_BORDER;
+ nInsTableFlags|= tabopts::DEFAULT_BORDER;
}
break;//"Table/Border",
case INS_PROP_TABLE_SPLIT:
{
if(bBool)
- nInsTblFlags|= tabopts::SPLIT_LAYOUT;
+ nInsTableFlags|= tabopts::SPLIT_LAYOUT;
}
break;//"Table/Split",
case INS_PROP_CAP_AUTOMATIC:
@@ -1091,7 +1091,7 @@ void SwInsertConfig::Load()
}
}
- aInsTblOpts.mnInsMode = nInsTblFlags;
+ aInsTableOpts.mnInsMode = nInsTableFlags;
}
const Sequence<OUString>& SwTableConfig::GetPropertyNames()
@@ -1138,14 +1138,14 @@ void SwTableConfig::ImplCommit()
{
switch(nProp)
{
- case 0 : pValues[nProp] <<= (sal_Int32)convertTwipToMm100(nTblHMove); break; //"Shift/Row",
- case 1 : pValues[nProp] <<= (sal_Int32)convertTwipToMm100(nTblVMove); break; //"Shift/Column",
- case 2 : pValues[nProp] <<= (sal_Int32)convertTwipToMm100(nTblHInsert); break; //"Insert/Row",
- case 3 : pValues[nProp] <<= (sal_Int32)convertTwipToMm100(nTblVInsert); break; //"Insert/Column",
- case 4 : pValues[nProp] <<= (sal_Int32)eTblChgMode; break; //"Change/Effect",
- case 5 : pValues[nProp] <<= bInsTblFormatNum; break; //"Input/NumberRecognition",
- case 6 : pValues[nProp] <<= bInsTblChangeNumFormat; break; //"Input/NumberFormatRecognition",
- case 7 : pValues[nProp] <<= bInsTblAlignNum; break; //"Input/Alignment"
+ case 0 : pValues[nProp] <<= (sal_Int32)convertTwipToMm100(nTableHMove); break; //"Shift/Row",
+ case 1 : pValues[nProp] <<= (sal_Int32)convertTwipToMm100(nTableVMove); break; //"Shift/Column",
+ case 2 : pValues[nProp] <<= (sal_Int32)convertTwipToMm100(nTableHInsert); break; //"Insert/Row",
+ case 3 : pValues[nProp] <<= (sal_Int32)convertTwipToMm100(nTableVInsert); break; //"Insert/Column",
+ case 4 : pValues[nProp] <<= (sal_Int32)eTableChgMode; break; //"Change/Effect",
+ case 5 : pValues[nProp] <<= bInsTableFormatNum; break; //"Input/NumberRecognition",
+ case 6 : pValues[nProp] <<= bInsTableChangeNumFormat; break; //"Input/NumberFormatRecognition",
+ case 7 : pValues[nProp] <<= bInsTableAlignNum; break; //"Input/Alignment"
}
}
PutProperties(aNames, aValues);
@@ -1164,14 +1164,14 @@ void SwTableConfig::Load()
sal_Int32 nTemp = 0;
switch (nProp)
{
- case 0 : pValues[nProp] >>= nTemp; nTblHMove = (sal_uInt16)convertMm100ToTwip(nTemp); break; //"Shift/Row",
- case 1 : pValues[nProp] >>= nTemp; nTblVMove = (sal_uInt16)convertMm100ToTwip(nTemp); break; //"Shift/Column",
- case 2 : pValues[nProp] >>= nTemp; nTblHInsert = (sal_uInt16)convertMm100ToTwip(nTemp); break; //"Insert/Row",
- case 3 : pValues[nProp] >>= nTemp; nTblVInsert = (sal_uInt16)convertMm100ToTwip(nTemp); break; //"Insert/Column",
- case 4 : pValues[nProp] >>= nTemp; eTblChgMode = (TblChgMode)nTemp; break; //"Change/Effect",
- case 5 : bInsTblFormatNum = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; //"Input/NumberRecognition",
- case 6 : bInsTblChangeNumFormat = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; //"Input/NumberFormatRecognition",
- case 7 : bInsTblAlignNum = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; //"Input/Alignment"
+ case 0 : pValues[nProp] >>= nTemp; nTableHMove = (sal_uInt16)convertMm100ToTwip(nTemp); break; //"Shift/Row",
+ case 1 : pValues[nProp] >>= nTemp; nTableVMove = (sal_uInt16)convertMm100ToTwip(nTemp); break; //"Shift/Column",
+ case 2 : pValues[nProp] >>= nTemp; nTableHInsert = (sal_uInt16)convertMm100ToTwip(nTemp); break; //"Insert/Row",
+ case 3 : pValues[nProp] >>= nTemp; nTableVInsert = (sal_uInt16)convertMm100ToTwip(nTemp); break; //"Insert/Column",
+ case 4 : pValues[nProp] >>= nTemp; eTableChgMode = (TableChgMode)nTemp; break; //"Change/Effect",
+ case 5 : bInsTableFormatNum = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; //"Input/NumberRecognition",
+ case 6 : bInsTableChangeNumFormat = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; //"Input/NumberFormatRecognition",
+ case 7 : bInsTableAlignNum = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; //"Input/Alignment"
}
}
}
@@ -1187,7 +1187,7 @@ SwMiscConfig::SwMiscConfig() :
bSinglePrintJob(false),
bIsNameFromColumn(true),
bAskForMailMergeInPrint(true),
- nMailingFormats(MailTxtFormats::NONE)
+ nMailingFormats(MailTextFormats::NONE)
{
Load();
}
@@ -1278,7 +1278,7 @@ void SwMiscConfig::Load()
case 3 : bGrfToGalleryAsLnk = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break;
case 4 : bNumAlignSize = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break;
case 5 : bSinglePrintJob = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break;
- case 6 : nMailingFormats = static_cast<MailTxtFormats>(*static_cast<sal_uInt8 const *>(pValues[nProp].getValue())); break;
+ case 6 : nMailingFormats = static_cast<MailTextFormats>(*static_cast<sal_uInt8 const *>(pValues[nProp].getValue())); break;
case 7 : pValues[nProp] >>= sTmp; sNameFromColumn = sTmp; break;
case 8 : pValues[nProp] >>= sTmp; sMailingPath = sTmp; break;
case 9 : pValues[nProp] >>= sTmp; sMailName = sTmp; break;
diff --git a/sw/source/uibase/config/uinums.cxx b/sw/source/uibase/config/uinums.cxx
index 1f00241779c7..7ac29152690f 100644
--- a/sw/source/uibase/config/uinums.cxx
+++ b/sw/source/uibase/config/uinums.cxx
@@ -115,29 +115,29 @@ SwNumRulesWithName::SwNumRulesWithName( const SwNumRule &rCopy,
{
for( sal_uInt16 n = 0; n < MAXLEVEL; ++n )
{
- const SwNumFmt* pFmt = rCopy.GetNumFmt( n );
- if( pFmt )
- aFmts[ n ] = new _SwNumFmtGlobal( *pFmt );
+ const SwNumFormat* pFormat = rCopy.GetNumFormat( n );
+ if( pFormat )
+ aFormats[ n ] = new _SwNumFormatGlobal( *pFormat );
else
- aFmts[ n ] = 0;
+ aFormats[ n ] = 0;
}
}
SwNumRulesWithName::SwNumRulesWithName()
{
- memset(aFmts, 0, sizeof(aFmts));
+ memset(aFormats, 0, sizeof(aFormats));
}
SwNumRulesWithName::SwNumRulesWithName( const SwNumRulesWithName& rCopy )
{
- memset( aFmts, 0, sizeof( aFmts ));
+ memset( aFormats, 0, sizeof( aFormats ));
*this = rCopy;
}
SwNumRulesWithName::~SwNumRulesWithName()
{
for( int n = 0; n < MAXLEVEL; ++n )
- delete aFmts[ n ];
+ delete aFormats[ n ];
}
const SwNumRulesWithName& SwNumRulesWithName::operator=(const SwNumRulesWithName &rCopy)
@@ -147,13 +147,13 @@ const SwNumRulesWithName& SwNumRulesWithName::operator=(const SwNumRulesWithName
maName = rCopy.maName;
for( int n = 0; n < MAXLEVEL; ++n )
{
- delete aFmts[ n ];
+ delete aFormats[ n ];
- _SwNumFmtGlobal* pFmt = rCopy.aFmts[ n ];
- if( pFmt )
- aFmts[ n ] = new _SwNumFmtGlobal( *pFmt );
+ _SwNumFormatGlobal* pFormat = rCopy.aFormats[ n ];
+ if( pFormat )
+ aFormats[ n ] = new _SwNumFormatGlobal( *pFormat );
else
- aFmts[ n ] = 0;
+ aFormats[ n ] = 0;
}
}
return *this;
@@ -166,46 +166,46 @@ void SwNumRulesWithName::MakeNumRule( SwWrtShell& rSh, SwNumRule& rChg ) const
rChg.SetAutoRule( false );
for( sal_uInt16 n = 0; n < MAXLEVEL; ++n )
{
- _SwNumFmtGlobal* pFmt = aFmts[ n ];
- if( 0 != pFmt)
+ _SwNumFormatGlobal* pFormat = aFormats[ n ];
+ if( 0 != pFormat)
{
- SwNumFmt aNew;
- pFmt->ChgNumFmt( rSh, aNew );
+ SwNumFormat aNew;
+ pFormat->ChgNumFormat( rSh, aNew );
rChg.Set( n, aNew );
}
}
}
-void SwNumRulesWithName::GetNumFmt(
- size_t const nIndex, SwNumFmt const*& rpNumFmt, OUString const*& rpName) const
+void SwNumRulesWithName::GetNumFormat(
+ size_t const nIndex, SwNumFormat const*& rpNumFormat, OUString const*& rpName) const
{
- rpNumFmt = (aFmts[nIndex]) ? &aFmts[nIndex]->aFmt : 0;
- rpName = (aFmts[nIndex]) ? &aFmts[nIndex]->sCharFmtName : 0;
+ rpNumFormat = (aFormats[nIndex]) ? &aFormats[nIndex]->aFormat : 0;
+ rpName = (aFormats[nIndex]) ? &aFormats[nIndex]->sCharFormatName : 0;
}
-void SwNumRulesWithName::SetNumFmt(
- size_t const nIndex, SwNumFmt const& rNumFmt, OUString const& rName)
+void SwNumRulesWithName::SetNumFormat(
+ size_t const nIndex, SwNumFormat const& rNumFormat, OUString const& rName)
{
- delete aFmts[nIndex];
- aFmts[nIndex] = new _SwNumFmtGlobal(rNumFmt);
- aFmts[nIndex]->sCharFmtName = rName;
- aFmts[nIndex]->nCharPoolId = USHRT_MAX;
- aFmts[nIndex]->aItems.clear();
+ delete aFormats[nIndex];
+ aFormats[nIndex] = new _SwNumFormatGlobal(rNumFormat);
+ aFormats[nIndex]->sCharFormatName = rName;
+ aFormats[nIndex]->nCharPoolId = USHRT_MAX;
+ aFormats[nIndex]->aItems.clear();
}
-SwNumRulesWithName::_SwNumFmtGlobal::_SwNumFmtGlobal( const SwNumFmt& rFmt )
- : aFmt( rFmt ), nCharPoolId( USHRT_MAX )
+SwNumRulesWithName::_SwNumFormatGlobal::_SwNumFormatGlobal( const SwNumFormat& rFormat )
+ : aFormat( rFormat ), nCharPoolId( USHRT_MAX )
{
// relative gaps?????
- SwCharFmt* pFmt = rFmt.GetCharFmt();
- if( pFmt )
+ SwCharFormat* pFormat = rFormat.GetCharFormat();
+ if( pFormat )
{
- sCharFmtName = pFmt->GetName();
- nCharPoolId = pFmt->GetPoolFmtId();
- if( pFmt->GetAttrSet().Count() )
+ sCharFormatName = pFormat->GetName();
+ nCharPoolId = pFormat->GetPoolFormatId();
+ if( pFormat->GetAttrSet().Count() )
{
- SfxItemIter aIter( pFmt->GetAttrSet() );
+ SfxItemIter aIter( pFormat->GetAttrSet() );
const SfxPoolItem *pCurr = aIter.GetCurItem();
while( true )
{
@@ -216,60 +216,60 @@ SwNumRulesWithName::_SwNumFmtGlobal::_SwNumFmtGlobal( const SwNumFmt& rFmt )
}
}
- aFmt.SetCharFmt( 0 );
+ aFormat.SetCharFormat( 0 );
}
}
-SwNumRulesWithName::_SwNumFmtGlobal::_SwNumFmtGlobal( const _SwNumFmtGlobal& rFmt )
+SwNumRulesWithName::_SwNumFormatGlobal::_SwNumFormatGlobal( const _SwNumFormatGlobal& rFormat )
:
- aFmt( rFmt.aFmt ),
- sCharFmtName( rFmt.sCharFmtName ),
- nCharPoolId( rFmt.nCharPoolId )
+ aFormat( rFormat.aFormat ),
+ sCharFormatName( rFormat.sCharFormatName ),
+ nCharPoolId( rFormat.nCharPoolId )
{
- for( sal_uInt16 n = rFmt.aItems.size(); n; )
- aItems.push_back( rFmt.aItems[ --n ].Clone() );
+ for( sal_uInt16 n = rFormat.aItems.size(); n; )
+ aItems.push_back( rFormat.aItems[ --n ].Clone() );
}
-SwNumRulesWithName::_SwNumFmtGlobal::~_SwNumFmtGlobal()
+SwNumRulesWithName::_SwNumFormatGlobal::~_SwNumFormatGlobal()
{
}
-void SwNumRulesWithName::_SwNumFmtGlobal::ChgNumFmt( SwWrtShell& rSh,
- SwNumFmt& rNew ) const
+void SwNumRulesWithName::_SwNumFormatGlobal::ChgNumFormat( SwWrtShell& rSh,
+ SwNumFormat& rNew ) const
{
- SwCharFmt* pFmt = 0;
- if( !sCharFmtName.isEmpty() )
+ SwCharFormat* pFormat = 0;
+ if( !sCharFormatName.isEmpty() )
{
// at first, look for the name
- sal_uInt16 nArrLen = rSh.GetCharFmtCount();
+ sal_uInt16 nArrLen = rSh.GetCharFormatCount();
for( sal_uInt16 i = 1; i < nArrLen; ++i )
{
- pFmt = &rSh.GetCharFmt( i );
- if (pFmt->GetName()==sCharFmtName)
+ pFormat = &rSh.GetCharFormat( i );
+ if (pFormat->GetName()==sCharFormatName)
// exists, so leave attributes as they are!
break;
- pFmt = 0;
+ pFormat = 0;
}
- if( !pFmt )
+ if( !pFormat )
{
- if( IsPoolUserFmt( nCharPoolId ) )
+ if( IsPoolUserFormat( nCharPoolId ) )
{
- pFmt = rSh.MakeCharFmt( sCharFmtName );
- pFmt->SetAuto( false );
+ pFormat = rSh.MakeCharFormat( sCharFormatName );
+ pFormat->SetAuto( false );
}
else
- pFmt = rSh.GetCharFmtFromPool( nCharPoolId );
+ pFormat = rSh.GetCharFormatFromPool( nCharPoolId );
- if( !pFmt->HasWriterListeners() ) // set attributes
+ if( !pFormat->HasWriterListeners() ) // set attributes
for( sal_uInt16 n = aItems.size(); n; )
- pFmt->SetFmtAttr( aItems[ --n ] );
+ pFormat->SetFormatAttr( aItems[ --n ] );
}
}
- const_cast<SwNumFmt&>(aFmt).SetCharFmt( pFmt );
- rNew = aFmt;
- if( pFmt )
- const_cast<SwNumFmt&>(aFmt).SetCharFmt( 0 );
+ const_cast<SwNumFormat&>(aFormat).SetCharFormat( pFormat );
+ rNew = aFormat;
+ if( pFormat )
+ const_cast<SwNumFormat&>(aFormat).SetCharFormat( 0 );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/config/usrpref.cxx b/sw/source/uibase/config/usrpref.cxx
index 4acbe987b471..7aec700cd7be 100644
--- a/sw/source/uibase/config/usrpref.cxx
+++ b/sw/source/uibase/config/usrpref.cxx
@@ -43,7 +43,7 @@ void SwMasterUsrPref::SetUsrPref(const SwViewOption &rCopy)
}
SwMasterUsrPref::SwMasterUsrPref(bool bWeb) :
- eFldUpdateFlags(AUTOUPD_OFF),
+ eFieldUpdateFlags(AUTOUPD_OFF),
nLinkUpdateMode(0),
bIsHScrollMetricSet(false),
bIsVScrollMetricSet(false),
@@ -142,7 +142,7 @@ void SwContentViewConfig::ImplCommit()
case 0: bVal = rParent.IsGraphic(); break;// "Display/GraphicObject",
case 1: bVal = rParent.IsTable(); break;// "Display/Table",
case 2: bVal = rParent.IsDraw(); break;// "Display/DrawingControl",
- case 3: bVal = rParent.IsFldName(); break;// "Display/FieldCode",
+ case 3: bVal = rParent.IsFieldName(); break;// "Display/FieldCode",
case 4: bVal = rParent.IsPostIts(); break;// "Display/Note",
case 5: bVal = rParent.IsShowContentTips(); break; // "Display/ShowContentTips"
case 6: bVal = rParent.IsViewMetaChars(); break; //"NonprintingCharacter/MetaCharacters"
@@ -183,7 +183,7 @@ void SwContentViewConfig::Load()
case 0: rParent.SetGraphic(bSet); break;// "Display/GraphicObject",
case 1: rParent.SetTable(bSet); break;// "Display/Table",
case 2: rParent.SetDraw(bSet); break;// "Display/DrawingControl",
- case 3: rParent.SetFldName(bSet); break;// "Display/FieldCode",
+ case 3: rParent.SetFieldName(bSet); break;// "Display/FieldCode",
case 4: rParent.SetPostIts(bSet); break;// "Display/Note",
case 5: rParent.SetShowContentTips(bSet); break;// "Display/ShowContentTips",
case 6: rParent.SetViewMetaChars(bSet); break; //"NonprintingCharacter/MetaCharacters"
diff --git a/sw/source/uibase/config/viewopt.cxx b/sw/source/uibase/config/viewopt.cxx
index 1418abee8cb2..190a6e3b5d72 100644
--- a/sw/source/uibase/config/viewopt.cxx
+++ b/sw/source/uibase/config/viewopt.cxx
@@ -167,7 +167,7 @@ SwViewOption::SwViewOption() :
bShowPlaceHolderFields( true ),
nZoom( 100 ),
eZoom( SvxZoomType::PERCENT ),
- nTblDest(TBL_DEST_CELL)
+ nTableDest(TBL_DEST_CELL)
{
// Initialisation is a little simpler now
// all Bits to 0
@@ -223,7 +223,7 @@ SwViewOption::SwViewOption(const SwViewOption& rVOpt)
nPagePrevCol = rVOpt.nPagePrevCol;
bIsPagePreview = rVOpt.bIsPagePreview;
eZoom = rVOpt.eZoom ;
- nTblDest = rVOpt.nTblDest ;
+ nTableDest = rVOpt.nTableDest ;
nUIOptions = rVOpt.nUIOptions ;
nCoreOptions = rVOpt.nCoreOptions ;
nCore2Options = rVOpt.nCore2Options ;
@@ -263,7 +263,7 @@ SwViewOption& SwViewOption::operator=( const SwViewOption &rVOpt )
nPagePrevCol = rVOpt.nPagePrevCol;
bIsPagePreview = rVOpt.bIsPagePreview;
eZoom = rVOpt.eZoom ;
- nTblDest = rVOpt.nTblDest ;
+ nTableDest = rVOpt.nTableDest ;
nUIOptions = rVOpt.nUIOptions ;
nCoreOptions = rVOpt.nCoreOptions;
nCore2Options = rVOpt.nCore2Options;
@@ -305,7 +305,7 @@ void SwViewOption::Init( vcl::Window *pWin )
bool SwViewOption::IsAutoCompleteWords()
{
- const SvxSwAutoFmtFlags& rFlags = SvxAutoCorrCfg::Get().GetAutoCorrect()->GetSwFlags();
+ const SvxSwAutoFormatFlags& rFlags = SvxAutoCorrCfg::Get().GetAutoCorrect()->GetSwFlags();
return rFlags.bAutoCmpltCollectWords;
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-08 18:59:33 +0000