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

Simplify some PutProperties calls

Browse Source 
Change-Id: Idf91592e6cf34b5591f221c3c5bdc937bbe46014
This commit is contained in:
Stephan Bergmann
2016-06-28 14:50:49 +02:00
parent c63ae748b3
commit e3e79246cb
3 changed files with 125 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
canvas/source/directx/dx_config.cxx
View File

@@ -95,8 +95,6 @@ namespace dxcanvas
try try
{ {
uno::Sequence< OUString > aName { "DeviceBlacklist" };
uno::Sequence< sal_Int32 > aValues( sizeof(DeviceInfo)/sizeof(sal_Int32)*maValues.size() ); uno::Sequence< sal_Int32 > aValues( sizeof(DeviceInfo)/sizeof(sal_Int32)*maValues.size() );
sal_Int32* pValues = aValues.getArray(); sal_Int32* pValues = aValues.getArray();
@@ -113,9 +111,7 @@ namespace dxcanvas
*pValues++ = rInfo.nDriverBuildId; *pValues++ = rInfo.nDriverBuildId;
} }
uno::Sequence< uno::Any > aValue(1); PutProperties({"DeviceBlacklist"}, {css::uno::Any(aValues)});
aValue[0] <<= aValues;
PutProperties( aName, aValue );
} }
catch( const uno::Exception& ) catch( const uno::Exception& )
{ {

273
editeng/source/misc/acorrcfg.cxx
View File

@@ -238,73 +238,39 @@ SvxBaseAutoCorrCfg::~SvxBaseAutoCorrCfg()
void SvxBaseAutoCorrCfg::ImplCommit() void SvxBaseAutoCorrCfg::ImplCommit()
{ {
Sequence<OUString> aNames( GetPropertyNames() );
Sequence<Any> aValues(aNames.getLength());
Any* pValues = aValues.getArray();
const long nFlags = rParent.pAutoCorrect->GetFlags(); const long nFlags = rParent.pAutoCorrect->GetFlags();
for(int nProp = 0; nProp < aNames.getLength(); nProp++) PutProperties(
{ GetPropertyNames(),
switch(nProp) {css::uno::Any((nFlags & SaveWordCplSttLst) != 0),
{ // "Exceptions/TwoCapitalsAtStart"
case 0: css::uno::Any((nFlags & SaveWordWrdSttLst) != 0),
pValues[nProp] <<= ((nFlags & SaveWordCplSttLst) != 0); // "Exceptions/CapitalAtStartSentence"
break;//"Exceptions/TwoCapitalsAtStart", css::uno::Any((nFlags & Autocorrect) != 0), // "UseReplacementTable"
case 1: css::uno::Any((nFlags & CapitalStartWord) != 0),
pValues[nProp] <<= ((nFlags & SaveWordWrdSttLst) != 0); // "TwoCapitalsAtStart"
break;//"Exceptions/CapitalAtStartSentence", css::uno::Any((nFlags & CapitalStartSentence) != 0),
case 2: // "CapitalAtStartSentence"
pValues[nProp] <<= ((nFlags & Autocorrect) != 0); css::uno::Any((nFlags & ChgWeightUnderl) != 0),
break;//"UseReplacementTable", // "ChangeUnderlineWeight"
case 3: css::uno::Any((nFlags & SetINetAttr) != 0), // "SetInetAttribute"
pValues[nProp] <<= ((nFlags & CapitalStartWord) != 0); css::uno::Any((nFlags & ChgOrdinalNumber) != 0),
break;//"TwoCapitalsAtStart", // "ChangeOrdinalNumber"
case 4: css::uno::Any((nFlags & AddNonBrkSpace) != 0), // "AddNonBreakingSpace"
pValues[nProp] <<= ((nFlags & CapitalStartSentence) != 0); css::uno::Any((nFlags & ChgToEnEmDash) != 0), // "ChangeDash"
break;//"CapitalAtStartSentence", css::uno::Any((nFlags & IgnoreDoubleSpace) != 0),
case 5: // "RemoveDoubleSpaces"
pValues[nProp] <<= ((nFlags & ChgWeightUnderl) != 0); css::uno::Any((nFlags & ChgSglQuotes) != 0), // "ReplaceSingleQuote"
break;//"ChangeUnderlineWeight", css::uno::Any(sal_Int32(rParent.pAutoCorrect->GetStartSingleQuote())),
case 6: // "SingleQuoteAtStart"
pValues[nProp] <<= ((nFlags & SetINetAttr) != 0); css::uno::Any(sal_Int32(rParent.pAutoCorrect->GetEndSingleQuote())),
break;//"SetInetAttribute", // "SingleQuoteAtEnd"
case 7: css::uno::Any((nFlags & ChgQuotes) != 0), // "ReplaceDoubleQuote"
pValues[nProp] <<= ((nFlags & ChgOrdinalNumber) != 0); css::uno::Any(sal_Int32(rParent.pAutoCorrect->GetStartDoubleQuote())),
break;//"ChangeOrdinalNumber", // "DoubleQuoteAtStart"
case 8: css::uno::Any(sal_Int32(rParent.pAutoCorrect->GetEndDoubleQuote())),
pValues[nProp] <<= ((nFlags & AddNonBrkSpace) != 0); // "DoubleQuoteAtEnd"
break;//"AddNonBreakingSpace" css::uno::Any((nFlags & CorrectCapsLock) != 0)});
case 9: // "CorrectAccidentalCapsLock"
pValues[nProp] <<= ((nFlags & ChgToEnEmDash) != 0);
break;//"ChangeDash",
case 10:
pValues[nProp] <<= ((nFlags & IgnoreDoubleSpace) != 0);
break;//"RemoveDoubleSpaces",
case 11:
pValues[nProp] <<= ((nFlags & ChgSglQuotes) != 0);
break;//"ReplaceSingleQuote",
case 12:
pValues[nProp] <<= (sal_Int32)rParent.pAutoCorrect->GetStartSingleQuote();
break;//"SingleQuoteAtStart",
case 13:
pValues[nProp] <<= (sal_Int32) rParent.pAutoCorrect->GetEndSingleQuote();
break;//"SingleQuoteAtEnd",
case 14:
pValues[nProp] <<= ((nFlags & ChgQuotes) != 0);
break;//"ReplaceDoubleQuote",
case 15:
pValues[nProp] <<= (sal_Int32) rParent.pAutoCorrect->GetStartDoubleQuote();
break;//"DoubleQuoteAtStart",
case 16:
pValues[nProp] <<= (sal_Int32) rParent.pAutoCorrect->GetEndDoubleQuote();
break;//"DoubleQuoteAtEnd"
case 17:
pValues[nProp] <<= ((nFlags & CorrectCapsLock) != 0);
break;//"CorrectAccidentalCapsLock"
}
}
PutProperties(aNames, aValues);
} }
void SvxBaseAutoCorrCfg::Notify( const Sequence<OUString>& /* aPropertyNames */) void SvxBaseAutoCorrCfg::Notify( const Sequence<OUString>& /* aPropertyNames */)
@@ -531,97 +497,92 @@ SvxSwAutoCorrCfg::~SvxSwAutoCorrCfg()
void SvxSwAutoCorrCfg::ImplCommit() void SvxSwAutoCorrCfg::ImplCommit()
{ {
Sequence<OUString> aNames = GetPropertyNames();
Sequence<Any> aValues(aNames.getLength());
Any* pValues = aValues.getArray();
SvxSwAutoFormatFlags& rSwFlags = rParent.pAutoCorrect->GetSwFlags(); SvxSwAutoFormatFlags& rSwFlags = rParent.pAutoCorrect->GetSwFlags();
for(int nProp = 0; nProp < aNames.getLength(); nProp++) PutProperties(
{ GetPropertyNames(),
switch(nProp) {css::uno::Any(rParent.bFileRel), // "Text/FileLinks"
{ css::uno::Any(rParent.bNetRel), // "Text/InternetLinks"
case 0: pValues[nProp] <<= rParent.bFileRel; break; // "Text/FileLinks", css::uno::Any(rParent.bAutoTextPreview), // "Text/ShowPreview"
case 1: pValues[nProp] <<= rParent.bNetRel; break; // "Text/InternetLinks", css::uno::Any(rParent.bAutoTextTip), // "Text/ShowToolTip"
case 2: pValues[nProp] <<= rParent.bAutoTextPreview; break; // "Text/ShowPreview", css::uno::Any(rParent.bSearchInAllCategories),
case 3: pValues[nProp] <<= rParent.bAutoTextTip; break; // "Text/ShowToolTip", // "Text/SearchInAllCategories"
case 4: pValues[nProp] <<= rParent.bSearchInAllCategories;break; //"Text/SearchInAllCategories" css::uno::Any(rSwFlags.bAutoCorrect),
case 5: pValues[nProp] <<= rSwFlags.bAutoCorrect; break; // "Format/Option/UseReplacementTable", // "Format/Option/UseReplacementTable"
case 6: pValues[nProp] <<= rSwFlags.bCapitalStartSentence;; break; // "Format/Option/TwoCapitalsAtStart", css::uno::Any(rSwFlags.bCapitalStartSentence),
case 7: pValues[nProp] <<= rSwFlags.bCapitalStartWord; break; // "Format/Option/CapitalAtStartSentence", // "Format/Option/TwoCapitalsAtStart"
case 8: pValues[nProp] <<= rSwFlags.bChgWeightUnderl; break; // "Format/Option/ChangeUnderlineWeight", css::uno::Any(rSwFlags.bCapitalStartWord),
case 9: pValues[nProp] <<= rSwFlags.bSetINetAttr; break; // "Format/Option/SetInetAttribute", // "Format/Option/CapitalAtStartSentence"
case 10: pValues[nProp] <<= rSwFlags.bChgOrdinalNumber; break; // "Format/Option/ChangeOrdinalNumber", css::uno::Any(rSwFlags.bChgWeightUnderl),
case 11: pValues[nProp] <<= rSwFlags.bAddNonBrkSpace; break; // "Format/Option/AddNonBreakingSpace", // "Format/Option/ChangeUnderlineWeight"
// it doesn't exist here - the common flags are used for that -> LM css::uno::Any(rSwFlags.bSetINetAttr),
case 12: // "Format/Option/SetInetAttribute"
pValues[nProp] <<= true; css::uno::Any(rSwFlags.bChgOrdinalNumber),
break; // "Format/Option/ChangeDash", // "Format/Option/ChangeOrdinalNumber"
case 13: pValues[nProp] <<= rSwFlags.bDelEmptyNode; break; // "Format/Option/DelEmptyParagraphs", css::uno::Any(rSwFlags.bAddNonBrkSpace),
case 14: pValues[nProp] <<= rSwFlags.bChgUserColl; break; // "Format/Option/ReplaceUserStyle", // "Format/Option/AddNonBreakingSpace"
case 15: pValues[nProp] <<= rSwFlags.bChgEnumNum; break; // "Format/Option/ChangeToBullets/Enable", css::uno::Any(true),
case 16: // "Format/Option/ChangeDash"; it doesn't exist here - the common
pValues[nProp] <<= (sal_Int32)rSwFlags.cBullet; // flags are used for that -> LM
break; // "Format/Option/ChangeToBullets/SpecialCharacter/Char", css::uno::Any(rSwFlags.bDelEmptyNode),
case 17: // "Format/Option/DelEmptyParagraphs"
pValues[nProp] <<= OUString(rSwFlags.aBulletFont.GetFamilyName()); css::uno::Any(rSwFlags.bChgUserColl),
break; // "Format/Option/ChangeToBullets/SpecialCharacter/Font", // "Format/Option/ReplaceUserStyle"
case 18: css::uno::Any(rSwFlags.bChgEnumNum),
pValues[nProp] <<= (sal_Int32)rSwFlags.aBulletFont.GetFamilyType(); // "Format/Option/ChangeToBullets/Enable"
break; // "Format/Option/ChangeToBullets/SpecialCharacter/FontFamily", css::uno::Any(sal_Int32(rSwFlags.cBullet)),
case 19: // "Format/Option/ChangeToBullets/SpecialCharacter/Char"
pValues[nProp] <<= (sal_Int32)rSwFlags.aBulletFont.GetCharSet(); css::uno::Any(OUString(rSwFlags.aBulletFont.GetFamilyName())),
break; // "Format/Option/ChangeToBullets/SpecialCharacter/FontCharset", // "Format/Option/ChangeToBullets/SpecialCharacter/Font"
case 20: css::uno::Any(sal_Int32(rSwFlags.aBulletFont.GetFamilyType())),
pValues[nProp] <<= (sal_Int32)rSwFlags.aBulletFont.GetPitch(); // "Format/Option/ChangeToBullets/SpecialCharacter/FontFamily"
break; // "Format/Option/ChangeToBullets/SpecialCharacter/FontPitch", css::uno::Any(sal_Int32(rSwFlags.aBulletFont.GetCharSet())),
case 21: pValues[nProp] <<= rSwFlags.bRightMargin; break; // "Format/Option/CombineParagraphs", // "Format/Option/ChangeToBullets/SpecialCharacter/FontCharset"
case 22: css::uno::Any(sal_Int32(rSwFlags.aBulletFont.GetPitch())),
pValues[nProp] <<= (sal_Int32)rSwFlags.nRightMargin; // "Format/Option/ChangeToBullets/SpecialCharacter/FontPitch"
break; // "Format/Option/CombineValue", css::uno::Any(rSwFlags.bRightMargin),
case 23: pValues[nProp] <<= rSwFlags.bAFormatDelSpacesAtSttEnd; break; // "Format/Option/DelSpacesAtStartEnd", // "Format/Option/CombineParagraphs"
case 24: pValues[nProp] <<= rSwFlags.bAFormatDelSpacesBetweenLines; break; // "Format/Option/DelSpacesBetween", css::uno::Any(sal_Int32(rSwFlags.nRightMargin)),
case 25: pValues[nProp] <<= rParent.bAutoFmtByInput; break; // "Format/ByInput/Enable", // "Format/Option/CombineValue"
case 26: pValues[nProp] <<= rSwFlags.bChgToEnEmDash; break; // "Format/ByInput/ChangeDash", css::uno::Any(rSwFlags.bAFormatDelSpacesAtSttEnd),
case 27: pValues[nProp] <<= rSwFlags.bSetNumRule; break; // "Format/ByInput/ApplyNumbering/Enable", // "Format/Option/DelSpacesAtStartEnd"
case 28: pValues[nProp] <<= rSwFlags.bSetBorder; break; // "Format/ByInput/ChangeToBorders", css::uno::Any(rSwFlags.bAFormatDelSpacesBetweenLines),
case 29: pValues[nProp] <<= rSwFlags.bCreateTable; break; // "Format/ByInput/ChangeToTable", // "Format/Option/DelSpacesBetween"
case 30: pValues[nProp] <<= rSwFlags.bReplaceStyles; break; // "Format/ByInput/ReplaceStyle", css::uno::Any(rParent.bAutoFmtByInput), // "Format/ByInput/Enable"
case 31: pValues[nProp] <<= rSwFlags.bAFormatByInpDelSpacesAtSttEnd; break; // "Format/ByInput/DelSpacesAtStartEnd", css::uno::Any(rSwFlags.bChgToEnEmDash), // "Format/ByInput/ChangeDash"
case 32: pValues[nProp] <<= rSwFlags.bAFormatByInpDelSpacesBetweenLines; break; // "Format/ByInput/DelSpacesBetween", css::uno::Any(rSwFlags.bSetNumRule),
case 33: pValues[nProp] <<= rSwFlags.bAutoCompleteWords; break; // "Completion/Enable", // "Format/ByInput/ApplyNumbering/Enable"
case 34: css::uno::Any(rSwFlags.bSetBorder), // "Format/ByInput/ChangeToBorders"
pValues[nProp] <<= (sal_Int32)rSwFlags.nAutoCmpltWordLen; css::uno::Any(rSwFlags.bCreateTable), // "Format/ByInput/ChangeToTable"
break; // "Completion/MinWordLen", css::uno::Any(rSwFlags.bReplaceStyles),
case 35: // "Format/ByInput/ReplaceStyle"
pValues[nProp] <<= (sal_Int32)rSwFlags.nAutoCmpltListLen; css::uno::Any(rSwFlags.bAFormatByInpDelSpacesAtSttEnd),
break; // "Completion/MaxListLen", // "Format/ByInput/DelSpacesAtStartEnd"
case 36: pValues[nProp] <<= rSwFlags.bAutoCmpltCollectWords; break; // "Completion/CollectWords", css::uno::Any(rSwFlags.bAFormatByInpDelSpacesBetweenLines),
case 37: pValues[nProp] <<= rSwFlags.bAutoCmpltEndless; break; // "Completion/EndlessList", // "Format/ByInput/DelSpacesBetween"
case 38: pValues[nProp] <<= rSwFlags.bAutoCmpltAppendBlanc; break; // "Completion/AppendBlank", css::uno::Any(rSwFlags.bAutoCompleteWords), // "Completion/Enable"
case 39: pValues[nProp] <<= rSwFlags.bAutoCmpltShowAsTip; break; // "Completion/ShowAsTip", css::uno::Any(sal_Int32(rSwFlags.nAutoCmpltWordLen)),
case 40: // "Completion/MinWordLen"
pValues[nProp] <<= (sal_Int32)rSwFlags.nAutoCmpltExpandKey; css::uno::Any(sal_Int32(rSwFlags.nAutoCmpltListLen)),
break; // "Completion/AcceptKey" // "Completion/MaxListLen"
case 41 : pValues[nProp] <<= rSwFlags.bAutoCmpltKeepList; break;// "Completion/KeepList" css::uno::Any(rSwFlags.bAutoCmpltCollectWords),
case 42 : // "Completion/CollectWords"
pValues[nProp] <<= (sal_Int32)rSwFlags.cByInputBullet; css::uno::Any(rSwFlags.bAutoCmpltEndless), // "Completion/EndlessList"
break;// "Format/ByInput/ApplyNumbering/SpecialCharacter/Char", css::uno::Any(rSwFlags.bAutoCmpltAppendBlanc),
case 43 : // "Completion/AppendBlank"
pValues[nProp] <<= OUString(rSwFlags.aByInputBulletFont.GetFamilyName()); css::uno::Any(rSwFlags.bAutoCmpltShowAsTip), // "Completion/ShowAsTip"
break;// "Format/ByInput/ApplyNumbering/SpecialCharacter/Font", css::uno::Any(sal_Int32(rSwFlags.nAutoCmpltExpandKey)),
case 44 : // "Completion/AcceptKey"
pValues[nProp] <<= (sal_Int32)rSwFlags.aByInputBulletFont.GetFamilyType(); css::uno::Any(rSwFlags.bAutoCmpltKeepList), // "Completion/KeepList"
break;// "Format/ByInput/ApplyNumbering/SpecialCharacter/FontFamily", css::uno::Any(sal_Int32(rSwFlags.cByInputBullet)),
case 45 : // "Format/ByInput/ApplyNumbering/SpecialCharacter/Char"
pValues[nProp] <<= (sal_Int32)rSwFlags.aByInputBulletFont.GetCharSet(); css::uno::Any(OUString(rSwFlags.aByInputBulletFont.GetFamilyName())),
break;// "Format/ByInput/ApplyNumbering/SpecialCharacter/FontCharset", // "Format/ByInput/ApplyNumbering/SpecialCharacter/Font"
case 46 : css::uno::Any(sal_Int32(rSwFlags.aByInputBulletFont.GetFamilyType())),
pValues[nProp] <<= (sal_Int32)rSwFlags.aByInputBulletFont.GetPitch(); // "Format/ByInput/ApplyNumbering/SpecialCharacter/FontFamily"
break;// "Format/ByInput/ApplyNumbering/SpecialCharacter/FontPitch", css::uno::Any(sal_Int32(rSwFlags.aByInputBulletFont.GetCharSet())),
} // "Format/ByInput/ApplyNumbering/SpecialCharacter/FontCharset"
} css::uno::Any(sal_Int32(rSwFlags.aByInputBulletFont.GetPitch()))});
PutProperties(aNames, aValues); // "Format/ByInput/ApplyNumbering/SpecialCharacter/FontPitch"
} }
void SvxSwAutoCorrCfg::Notify( const Sequence<OUString>& /* aPropertyNames */ ) void SvxSwAutoCorrCfg::Notify( const Sequence<OUString>& /* aPropertyNames */ )

26
extensions/source/bibliography/bibconfig.cxx
View File

@@ -220,25 +220,13 @@ void BibConfig::Notify( const css::uno::Sequence<OUString>& )
void BibConfig::ImplCommit() void BibConfig::ImplCommit()
{ {
const Sequence<OUString> aPropertyNames = GetPropertyNames(); PutProperties(
Sequence<Any> aValues(aPropertyNames.getLength()); GetPropertyNames(),
Any* pValues = aValues.getArray(); {css::uno::Any(sDataSource), css::uno::Any(sTableOrQuery),
css::uno::Any(nTblOrQuery), css::uno::Any(nBeamerSize),
for(int nProp = 0; nProp < aPropertyNames.getLength(); nProp++) css::uno::Any(nViewSize), css::uno::Any(sQueryText),
{ css::uno::Any(sQueryField),
switch(nProp) css::uno::Any(bShowColumnAssignmentWarning)});
{
case 0: pValues[nProp] <<= sDataSource; break;
case 1: pValues[nProp] <<= sTableOrQuery; break;
case 2: pValues[nProp] <<= nTblOrQuery; break;
case 3: pValues[nProp] <<= nBeamerSize; break;
case 4: pValues[nProp] <<= nViewSize; break;
case 5: pValues[nProp] <<= sQueryText; break;
case 6: pValues[nProp] <<= sQueryField; break;
case 7: pValues[nProp] <<= bShowColumnAssignmentWarning; break;
}
}
PutProperties(aPropertyNames, aValues);
ClearNodeSet(cDataSourceHistory); ClearNodeSet(cDataSourceHistory);
Sequence< PropertyValue > aNodeValues(pMappingsArr->size() * 3); Sequence< PropertyValue > aNodeValues(pMappingsArr->size() * 3);
PropertyValue* pNodeValues = aNodeValues.getArray(); PropertyValue* pNodeValues = aNodeValues.getArray();