tdf#88205 use list ctor for uno::Sequence<OUString> in sc
Change-Id: Icda2d7a2f16fbcdf3a1e796026540bfa568be2d9
Reviewed-on: https://gerrit.libreoffice.org/28800
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
diff --git a/sc/source/core/tool/addincol.cxx b/sc/source/core/tool/addincol.cxx
index 18fd947..4d5fd74 100644
--- a/sc/source/core/tool/addincol.cxx
+++ b/sc/source/core/tool/addincol.cxx
@@ -436,14 +436,10 @@ void ScUnoAddInCollection::ReadConfiguration()
aFuncPropPath += pFuncNameArray[nFuncPos];
aFuncPropPath += sSlash;
uno::Sequence<OUString> aFuncPropNames(CFG_FUNCPROP_COUNT);
OUString* pNameArray = aFuncPropNames.getArray();
pNameArray[CFG_FUNCPROP_DISPLAYNAME] = aFuncPropPath
+ CFGSTR_DISPLAYNAME;
pNameArray[CFG_FUNCPROP_DESCRIPTION] = aFuncPropPath
+ CFGSTR_DESCRIPTION;
pNameArray[CFG_FUNCPROP_CATEGORY] = aFuncPropPath
+ CFGSTR_CATEGORY;
uno::Sequence<OUString> aFuncPropNames{
(aFuncPropPath + CFGSTR_DISPLAYNAME), // CFG_FUNCPROP_DISPLAYNAME
(aFuncPropPath + CFGSTR_DESCRIPTION), // CFG_FUNCPROP_DESCRIPTION
(aFuncPropPath + CFGSTR_CATEGORY)}; // CFG_FUNCPROP_CATEGORY
uno::Sequence<uno::Any> aFuncProperties = rAddInConfig.GetProperties( aFuncPropNames );
if ( aFuncProperties.getLength() == CFG_FUNCPROP_COUNT )
diff --git a/sc/source/core/tool/appoptio.cxx b/sc/source/core/tool/appoptio.cxx
index ff73190..f2f2dd0 100644
--- a/sc/source/core/tool/appoptio.cxx
+++ b/sc/source/core/tool/appoptio.cxx
@@ -216,14 +216,12 @@ static void lcl_GetSortList( Any& rDest )
#define SCLAYOUTOPT_ZOOMTYPE 3
#define SCLAYOUTOPT_SYNCZOOM 4
#define SCLAYOUTOPT_STATUSBARMULTI 5
#define SCLAYOUTOPT_COUNT 6
#define CFGPATH_INPUT "Office.Calc/Input"
#define SCINPUTOPT_LASTFUNCS 0
#define SCINPUTOPT_AUTOINPUT 1
#define SCINPUTOPT_DET_AUTO 2
#define SCINPUTOPT_COUNT 3
#define CFGPATH_REVISION "Office.Calc/Revision/Color"
@@ -231,29 +229,24 @@ static void lcl_GetSortList( Any& rDest )
#define SCREVISOPT_INSERTION 1
#define SCREVISOPT_DELETION 2
#define SCREVISOPT_MOVEDENTRY 3
#define SCREVISOPT_COUNT 4
#define CFGPATH_CONTENT "Office.Calc/Content/Update"
#define SCCONTENTOPT_LINK 0
#define SCCONTENTOPT_COUNT 1
#define CFGPATH_SORTLIST "Office.Calc/SortList"
#define SCSORTLISTOPT_LIST 0
#define SCSORTLISTOPT_COUNT 1
#define CFGPATH_MISC "Office.Calc/Misc"
#define SCMISCOPT_DEFOBJWIDTH 0
#define SCMISCOPT_DEFOBJHEIGHT 1
#define SCMISCOPT_SHOWSHAREDDOCWARN 2
#define SCMISCOPT_COUNT 3
#define CFGPATH_COMPAT "Office.Calc/Compatibility"
#define SCCOMPATOPT_KEY_BINDING 0
#define SCCOMPATOPT_COUNT 1
// Default value of Layout/Other/StatusbarMultiFunction
#define SCLAYOUTOPT_STATUSBARMULTI_DEFAULTVAL 514
@@ -275,116 +268,52 @@ static sal_uInt32 lcl_ConvertStatusBarFuncSetToSingle( sal_uInt32 nFuncSet )
Sequence<OUString> ScAppCfg::GetLayoutPropertyNames()
{
static const char* aPropNames[] =
{
"Other/MeasureUnit/NonMetric", // SCLAYOUTOPT_MEASURE
"Other/StatusbarFunction", // SCLAYOUTOPT_STATUSBAR
"Zoom/Value", // SCLAYOUTOPT_ZOOMVAL
"Zoom/Type", // SCLAYOUTOPT_ZOOMTYPE
"Zoom/Synchronize", // SCLAYOUTOPT_SYNCZOOM
"Other/StatusbarMultiFunction" // SCLAYOUTOPT_STATUSBARMULTI
};
Sequence<OUString> aNames(SCLAYOUTOPT_COUNT);
OUString* pNames = aNames.getArray();
for(int i = 0; i < SCLAYOUTOPT_COUNT; i++)
pNames[i] = OUString::createFromAscii(aPropNames[i]);
const bool bIsMetric = ScOptionsUtil::IsMetricSystem();
// adjust for metric system
if (ScOptionsUtil::IsMetricSystem())
pNames[SCLAYOUTOPT_MEASURE] = "Other/MeasureUnit/Metric";
return aNames;
return {(bIsMetric ? OUString("Other/MeasureUnit/Metric")
: OUString("Other/MeasureUnit/NonMetric")), // SCLAYOUTOPT_MEASURE
"Other/StatusbarFunction", // SCLAYOUTOPT_STATUSBAR
"Zoom/Value", // SCLAYOUTOPT_ZOOMVAL
"Zoom/Type", // SCLAYOUTOPT_ZOOMTYPE
"Zoom/Synchronize", // SCLAYOUTOPT_SYNCZOOM
"Other/StatusbarMultiFunction"}; // SCLAYOUTOPT_STATUSBARMULTI
}
Sequence<OUString> ScAppCfg::GetInputPropertyNames()
{
static const char* aPropNames[] =
{
"LastFunctions", // SCINPUTOPT_LASTFUNCS
"AutoInput", // SCINPUTOPT_AUTOINPUT
"DetectiveAuto" // SCINPUTOPT_DET_AUTO
};
Sequence<OUString> aNames(SCINPUTOPT_COUNT);
OUString* pNames = aNames.getArray();
for(int i = 0; i < SCINPUTOPT_COUNT; i++)
pNames[i] = OUString::createFromAscii(aPropNames[i]);
return aNames;
return {"LastFunctions", // SCINPUTOPT_LASTFUNCS
"AutoInput", // SCINPUTOPT_AUTOINPUT
"DetectiveAuto"}; // SCINPUTOPT_DET_AUTO
}
Sequence<OUString> ScAppCfg::GetRevisionPropertyNames()
{
static const char* aPropNames[] =
{
"Change", // SCREVISOPT_CHANGE
"Insertion", // SCREVISOPT_INSERTION
"Deletion", // SCREVISOPT_DELETION
"MovedEntry" // SCREVISOPT_MOVEDENTRY
};
Sequence<OUString> aNames(SCREVISOPT_COUNT);
OUString* pNames = aNames.getArray();
for(int i = 0; i < SCREVISOPT_COUNT; i++)
pNames[i] = OUString::createFromAscii(aPropNames[i]);
return aNames;
return {"Change", // SCREVISOPT_CHANGE
"Insertion", // SCREVISOPT_INSERTION
"Deletion", // SCREVISOPT_DELETION
"MovedEntry"}; // SCREVISOPT_MOVEDENTRY
}
Sequence<OUString> ScAppCfg::GetContentPropertyNames()
{
static const char* aPropNames[] =
{
"Link" // SCCONTENTOPT_LINK
};
Sequence<OUString> aNames(SCCONTENTOPT_COUNT);
OUString* pNames = aNames.getArray();
for(int i = 0; i < SCCONTENTOPT_COUNT; i++)
pNames[i] = OUString::createFromAscii(aPropNames[i]);
return aNames;
return {"Link"}; // SCCONTENTOPT_LINK
}
Sequence<OUString> ScAppCfg::GetSortListPropertyNames()
{
static const char* aPropNames[] =
{
"List" // SCSORTLISTOPT_LIST
};
Sequence<OUString> aNames(SCSORTLISTOPT_COUNT);
OUString* pNames = aNames.getArray();
for(int i = 0; i < SCSORTLISTOPT_COUNT; i++)
pNames[i] = OUString::createFromAscii(aPropNames[i]);
return aNames;
return {"List"}; // SCSORTLISTOPT_LIST
}
Sequence<OUString> ScAppCfg::GetMiscPropertyNames()
{
static const char* aPropNames[] =
{
"DefaultObjectSize/Width", // SCMISCOPT_DEFOBJWIDTH
"DefaultObjectSize/Height", // SCMISCOPT_DEFOBJHEIGHT
"SharedDocument/ShowWarning" // SCMISCOPT_SHOWSHAREDDOCWARN
};
Sequence<OUString> aNames(SCMISCOPT_COUNT);
OUString* pNames = aNames.getArray();
for(int i = 0; i < SCMISCOPT_COUNT; i++)
pNames[i] = OUString::createFromAscii(aPropNames[i]);
return aNames;
return {"DefaultObjectSize/Width", // SCMISCOPT_DEFOBJWIDTH
"DefaultObjectSize/Height", // SCMISCOPT_DEFOBJHEIGHT
"SharedDocument/ShowWarning"}; // SCMISCOPT_SHOWSHAREDDOCWARN
}
Sequence<OUString> ScAppCfg::GetCompatPropertyNames()
{
static const char* aPropNames[] =
{
"KeyBindings/BaseGroup" // SCCOMPATOPT_KEY_BINDING
};
Sequence<OUString> aNames(SCCOMPATOPT_COUNT);
OUString* pNames = aNames.getArray();
for (int i = 0; i < SCCOMPATOPT_COUNT; ++i)
pNames[i] = OUString::createFromAscii(aPropNames[i]);
return aNames;
return {"KeyBindings/BaseGroup"}; // SCCOMPATOPT_KEY_BINDING
}
ScAppCfg::ScAppCfg() :
diff --git a/sc/source/core/tool/defaultsoptions.cxx b/sc/source/core/tool/defaultsoptions.cxx
index 7f8d8ea..ceeba4e 100644
--- a/sc/source/core/tool/defaultsoptions.cxx
+++ b/sc/source/core/tool/defaultsoptions.cxx
@@ -87,21 +87,11 @@ SfxPoolItem* ScTpDefaultsItem::Clone( SfxItemPool * ) const
#define SCDEFAULTSOPT_TAB_COUNT 0
#define SCDEFAULTSOPT_TAB_PREFIX 1
#define SCDEFAULTSOPT_COUNT 2
Sequence<OUString> ScDefaultsCfg::GetPropertyNames()
{
static const char* aPropNames[] =
{
"Sheet/SheetCount", // SCDEFAULTSOPT_TAB_COUNT
"Sheet/SheetPrefix" // SCDEFAULTSOPT_TAB_PREFIX
};
Sequence<OUString> aNames(SCDEFAULTSOPT_COUNT);
OUString* pNames = aNames.getArray();
for (int i = 0; i < SCDEFAULTSOPT_COUNT; ++i)
pNames[i] = OUString::createFromAscii(aPropNames[i]);
return aNames;
return {"Sheet/SheetCount", // SCDEFAULTSOPT_TAB_COUNT
"Sheet/SheetPrefix"}; // SCDEFAULTSOPT_TAB_PREFIX
}
ScDefaultsCfg::ScDefaultsCfg() :
diff --git a/sc/source/core/tool/docoptio.cxx b/sc/source/core/tool/docoptio.cxx
index 5fcf4a6..cf5671f 100644
--- a/sc/source/core/tool/docoptio.cxx
+++ b/sc/source/core/tool/docoptio.cxx
@@ -185,55 +185,34 @@ SfxPoolItem* ScTpCalcItem::Clone( SfxItemPool * ) const
#define SCCALCOPT_FINDLABEL 10
#define SCCALCOPT_REGEX 11
#define SCCALCOPT_WILDCARDS 12
#define SCCALCOPT_COUNT 13
#define CFGPATH_DOCLAYOUT "Office.Calc/Layout/Other"
#define SCDOCLAYOUTOPT_TABSTOP 0
#define SCDOCLAYOUTOPT_COUNT 1
Sequence<OUString> ScDocCfg::GetCalcPropertyNames()
{
static const char* aPropNames[] =
{
"IterativeReference/Iteration", // SCCALCOPT_ITER_ITER
"IterativeReference/Steps", // SCCALCOPT_ITER_STEPS
"IterativeReference/MinimumChange", // SCCALCOPT_ITER_MINCHG
"Other/Date/DD", // SCCALCOPT_DATE_DAY
"Other/Date/MM", // SCCALCOPT_DATE_MONTH
"Other/Date/YY", // SCCALCOPT_DATE_YEAR
"Other/DecimalPlaces", // SCCALCOPT_DECIMALS
"Other/CaseSensitive", // SCCALCOPT_CASESENSITIVE
"Other/Precision", // SCCALCOPT_PRECISION
"Other/SearchCriteria", // SCCALCOPT_SEARCHCRIT
"Other/FindLabel", // SCCALCOPT_FINDLABEL
"Other/RegularExpressions", // SCCALCOPT_REGEX
"Other/Wildcards", // SCCALCOPT_WILDCARDS
};
Sequence<OUString> aNames(SCCALCOPT_COUNT);
OUString* pNames = aNames.getArray();
for(int i = 0; i < SCCALCOPT_COUNT; i++)
pNames[i] = OUString::createFromAscii(aPropNames[i]);
return aNames;
return {"IterativeReference/Iteration", // SCCALCOPT_ITER_ITER
"IterativeReference/Steps", // SCCALCOPT_ITER_STEPS
"IterativeReference/MinimumChange", // SCCALCOPT_ITER_MINCHG
"Other/Date/DD", // SCCALCOPT_DATE_DAY
"Other/Date/MM", // SCCALCOPT_DATE_MONTH
"Other/Date/YY", // SCCALCOPT_DATE_YEAR
"Other/DecimalPlaces", // SCCALCOPT_DECIMALS
"Other/CaseSensitive", // SCCALCOPT_CASESENSITIVE
"Other/Precision", // SCCALCOPT_PRECISION
"Other/SearchCriteria", // SCCALCOPT_SEARCHCRIT
"Other/FindLabel", // SCCALCOPT_FINDLABEL
"Other/RegularExpressions", // SCCALCOPT_REGEX
"Other/Wildcards"}; // SCCALCOPT_WILDCARDS
}
Sequence<OUString> ScDocCfg::GetLayoutPropertyNames()
{
static const char* aPropNames[] =
{
"TabStop/NonMetric" // SCDOCLAYOUTOPT_TABSTOP
};
Sequence<OUString> aNames(SCDOCLAYOUTOPT_COUNT);
OUString* pNames = aNames.getArray();
for(int i = 0; i < SCDOCLAYOUTOPT_COUNT; i++)
pNames[i] = OUString::createFromAscii(aPropNames[i]);
// adjust for metric system
if (ScOptionsUtil::IsMetricSystem())
pNames[SCDOCLAYOUTOPT_TABSTOP] = "TabStop/Metric";
return aNames;
return {"TabStop/Metric"}; // SCDOCLAYOUTOPT_TABSTOP
else
return {"TabStop/NonMetric"}; // SCDOCLAYOUTOPT_TABSTOP
}
ScDocCfg::ScDocCfg() :
diff --git a/sc/source/core/tool/filtopt.cxx b/sc/source/core/tool/filtopt.cxx
index 2d8304c..24a28ea 100644
--- a/sc/source/core/tool/filtopt.cxx
+++ b/sc/source/core/tool/filtopt.cxx
@@ -32,22 +32,12 @@ using namespace css::uno;
#define SCFILTOPT_COLSCALE 0
#define SCFILTOPT_ROWSCALE 1
#define SCFILTOPT_WK3 2
#define SCFILTOPT_COUNT 3
Sequence<OUString> ScFilterOptions::GetPropertyNames()
{
static const char* aPropNames[] =
{
"MS_Excel/ColScale", // SCFILTOPT_COLSCALE
"MS_Excel/RowScale", // SCFILTOPT_ROWSCALE
"Lotus123/WK3" // SCFILTOPT_WK3
};
Sequence<OUString> aNames(SCFILTOPT_COUNT);
OUString* pNames = aNames.getArray();
for(int i = 0; i < SCFILTOPT_COUNT; i++)
pNames[i] = OUString::createFromAscii(aPropNames[i]);
return aNames;
return {"MS_Excel/ColScale", // SCFILTOPT_COLSCALE
"MS_Excel/RowScale", // SCFILTOPT_ROWSCALE
"Lotus123/WK3"}; // SCFILTOPT_WK3
}
ScFilterOptions::ScFilterOptions() :
diff --git a/sc/source/core/tool/formulaopt.cxx b/sc/source/core/tool/formulaopt.cxx
index a3fb677..2d853cf 100644
--- a/sc/source/core/tool/formulaopt.cxx
+++ b/sc/source/core/tool/formulaopt.cxx
@@ -200,34 +200,24 @@ SfxPoolItem* ScTpFormulaItem::Clone( SfxItemPool * ) const
#define SCFORMULAOPT_OPENCL_SUBSET_ONLY 12
#define SCFORMULAOPT_OPENCL_MIN_SIZE 13
#define SCFORMULAOPT_OPENCL_SUBSET_OPS 14
#define SCFORMULAOPT_COUNT 15
Sequence<OUString> ScFormulaCfg::GetPropertyNames()
{
static const char* aPropNames[] =
{
"Syntax/Grammar", // SCFORMULAOPT_GRAMMAR
"Syntax/EnglishFunctionName", // SCFORMULAOPT_ENGLISH_FUNCNAME
"Syntax/SeparatorArg", // SCFORMULAOPT_SEP_ARG
"Syntax/SeparatorArrayRow", // SCFORMULAOPT_SEP_ARRAY_ROW
"Syntax/SeparatorArrayCol", // SCFORMULAOPT_SEP_ARRAY_COL
"Syntax/StringRefAddressSyntax", // SCFORMULAOPT_STRING_REF_SYNTAX
"Syntax/StringConversion", // SCFORMULAOPT_STRING_CONVERSION
"Syntax/EmptyStringAsZero", // SCFORMULAOPT_EMPTY_OUSTRING_AS_ZERO
"Load/OOXMLRecalcMode", // SCFORMULAOPT_OOXML_RECALC
"Load/ODFRecalcMode", // SCFORMULAOPT_ODF_RECALC
"Calculation/OpenCLAutoSelect", // SCFORMULAOPT_OPENCL_AUTOSELECT
"Calculation/OpenCLDevice", // SCFORMULAOPT_OPENCL_DEVICE
"Calculation/OpenCLSubsetOnly", // SCFORMULAOPT_OPENCL_SUBSET_ONLY
"Calculation/OpenCLMinimumDataSize", // SCFORMULAOPT_OPENCL_MIN_SIZE
"Calculation/OpenCLSubsetOpCodes", // SCFORMULAOPT_OPENCL_SUBSET_OPS
};
Sequence<OUString> aNames(SCFORMULAOPT_COUNT);
OUString* pNames = aNames.getArray();
for (int i = 0; i < SCFORMULAOPT_COUNT; ++i)
pNames[i] = OUString::createFromAscii(aPropNames[i]);
return aNames;
return {"Syntax/Grammar", // SCFORMULAOPT_GRAMMAR
"Syntax/EnglishFunctionName", // SCFORMULAOPT_ENGLISH_FUNCNAME
"Syntax/SeparatorArg", // SCFORMULAOPT_SEP_ARG
"Syntax/SeparatorArrayRow", // SCFORMULAOPT_SEP_ARRAY_ROW
"Syntax/SeparatorArrayCol", // SCFORMULAOPT_SEP_ARRAY_COL
"Syntax/StringRefAddressSyntax", // SCFORMULAOPT_STRING_REF_SYNTAX
"Syntax/StringConversion", // SCFORMULAOPT_STRING_CONVERSION
"Syntax/EmptyStringAsZero", // SCFORMULAOPT_EMPTY_OUSTRING_AS_ZERO
"Load/OOXMLRecalcMode", // SCFORMULAOPT_OOXML_RECALC
"Load/ODFRecalcMode", // SCFORMULAOPT_ODF_RECALC
"Calculation/OpenCLAutoSelect", // SCFORMULAOPT_OPENCL_AUTOSELECT
"Calculation/OpenCLDevice", // SCFORMULAOPT_OPENCL_DEVICE
"Calculation/OpenCLSubsetOnly", // SCFORMULAOPT_OPENCL_SUBSET_ONLY
"Calculation/OpenCLMinimumDataSize", // SCFORMULAOPT_OPENCL_MIN_SIZE
"Calculation/OpenCLSubsetOpCodes"}; // SCFORMULAOPT_OPENCL_SUBSET_OPS
}
ScFormulaCfg::PropsToIds ScFormulaCfg::GetPropNamesToId()
diff --git a/sc/source/core/tool/inputopt.cxx b/sc/source/core/tool/inputopt.cxx
index a1deae26..3e214e1 100644
--- a/sc/source/core/tool/inputopt.cxx
+++ b/sc/source/core/tool/inputopt.cxx
@@ -97,31 +97,21 @@ ScInputOptions& ScInputOptions::operator=( const ScInputOptions& rCpy )
#define SCINPUTOPT_TEXTWYSIWYG 9
#define SCINPUTOPT_REPLCELLSWARN 10
#define SCINPUTOPT_LEGACY_CELL_SELECTION 11
#define SCINPUTOPT_COUNT 12
Sequence<OUString> ScInputCfg::GetPropertyNames()
{
static const char* aPropNames[] =
{
"MoveSelectionDirection", // SCINPUTOPT_MOVEDIR
"MoveSelection", // SCINPUTOPT_MOVESEL
"SwitchToEditMode", // SCINPUTOPT_EDTEREDIT
"ExpandFormatting", // SCINPUTOPT_EXTENDFMT
"ShowReference", // SCINPUTOPT_RANGEFIND
"ExpandReference", // SCINPUTOPT_EXPANDREFS
"UpdateReferenceOnSort", // SCINPUTOPT_SORT_REF_UPDATE
"HighlightSelection", // SCINPUTOPT_MARKHEADER
"UseTabCol", // SCINPUTOPT_USETABCOL
"UsePrinterMetrics", // SCINPUTOPT_TEXTWYSIWYG
"ReplaceCellsWarning", // SCINPUTOPT_REPLCELLSWARN
"LegacyCellSelection" // SCINPUTOPT_LEGACY_CELL_SELECTION
};
Sequence<OUString> aNames(SCINPUTOPT_COUNT);
OUString* pNames = aNames.getArray();
for(int i = 0; i < SCINPUTOPT_COUNT; i++)
pNames[i] = OUString::createFromAscii(aPropNames[i]);
return aNames;
return {"MoveSelectionDirection", // SCINPUTOPT_MOVEDIR
"MoveSelection", // SCINPUTOPT_MOVESEL
"SwitchToEditMode", // SCINPUTOPT_EDTEREDIT
"ExpandFormatting", // SCINPUTOPT_EXTENDFMT
"ShowReference", // SCINPUTOPT_RANGEFIND
"ExpandReference", // SCINPUTOPT_EXPANDREFS
"UpdateReferenceOnSort", // SCINPUTOPT_SORT_REF_UPDATE
"HighlightSelection", // SCINPUTOPT_MARKHEADER
"UseTabCol", // SCINPUTOPT_USETABCOL
"UsePrinterMetrics", // SCINPUTOPT_TEXTWYSIWYG
"ReplaceCellsWarning", // SCINPUTOPT_REPLCELLSWARN
"LegacyCellSelection"}; // SCINPUTOPT_LEGACY_CELL_SELECTION
}
ScInputCfg::ScInputCfg() :
diff --git a/sc/source/core/tool/printopt.cxx b/sc/source/core/tool/printopt.cxx
index 877a68a..82ced83 100644
--- a/sc/source/core/tool/printopt.cxx
+++ b/sc/source/core/tool/printopt.cxx
@@ -100,22 +100,12 @@ SfxPoolItem* ScTpPrintItem::Clone( SfxItemPool * ) const
#define SCPRINTOPT_EMPTYPAGES 0
#define SCPRINTOPT_ALLSHEETS 1
#define SCPRINTOPT_FORCEBREAKS 2
#define SCPRINTOPT_COUNT 3
Sequence<OUString> ScPrintCfg::GetPropertyNames()
{
static const char* aPropNames[] =
{
"Page/EmptyPages", // SCPRINTOPT_EMPTYPAGES
"Other/AllSheets", // SCPRINTOPT_ALLSHEETS
"Page/ForceBreaks" // SCPRINTOPT_FORCEBREAKS
};
Sequence<OUString> aNames(SCPRINTOPT_COUNT);
OUString* pNames = aNames.getArray();
for(int i = 0; i < SCPRINTOPT_COUNT; i++)
pNames[i] = OUString::createFromAscii(aPropNames[i]);
return aNames;
return {"Page/EmptyPages", // SCPRINTOPT_EMPTYPAGES
"Other/AllSheets", // SCPRINTOPT_ALLSHEETS
"Page/ForceBreaks"}; // SCPRINTOPT_FORCEBREAKS;
}
ScPrintCfg::ScPrintCfg() :
diff --git a/sc/source/core/tool/viewopti.cxx b/sc/source/core/tool/viewopti.cxx
index 863fbe0..95491e6 100644
--- a/sc/source/core/tool/viewopti.cxx
+++ b/sc/source/core/tool/viewopti.cxx
@@ -237,7 +237,6 @@ SfxPoolItem* ScTpViewItem::Clone( SfxItemPool * ) const
#define SCLAYOUTOPT_SHEETTAB 7
#define SCLAYOUTOPT_OUTLINE 8
#define SCLAYOUTOPT_GRID_ONCOLOR 9
#define SCLAYOUTOPT_COUNT 10
#define CFGPATH_DISPLAY "Office.Calc/Content/Display"
@@ -250,7 +249,6 @@ SfxPoolItem* ScTpViewItem::Clone( SfxItemPool * ) const
#define SCDISPLAYOPT_OBJECTGRA 6
#define SCDISPLAYOPT_CHART 7
#define SCDISPLAYOPT_DRAWING 8
#define SCDISPLAYOPT_COUNT 9
#define CFGPATH_GRID "Office.Calc/Grid"
@@ -264,83 +262,52 @@ SfxPoolItem* ScTpViewItem::Clone( SfxItemPool * ) const
#define SCGRIDOPT_SYNCHRON 7
#define SCGRIDOPT_VISIBLE 8
#define SCGRIDOPT_SIZETOGRID 9
#define SCGRIDOPT_COUNT 10
Sequence<OUString> ScViewCfg::GetLayoutPropertyNames()
{
static const char* aPropNames[] =
{
"Line/GridLine", // SCLAYOUTOPT_GRIDLINES
"Line/GridLineColor", // SCLAYOUTOPT_GRIDCOLOR
"Line/PageBreak", // SCLAYOUTOPT_PAGEBREAK
"Line/Guide", // SCLAYOUTOPT_GUIDE
"Window/ColumnRowHeader", // SCLAYOUTOPT_COLROWHDR
"Window/HorizontalScroll", // SCLAYOUTOPT_HORISCROLL
"Window/VerticalScroll", // SCLAYOUTOPT_VERTSCROLL
"Window/SheetTab", // SCLAYOUTOPT_SHEETTAB
"Window/OutlineSymbol", // SCLAYOUTOPT_OUTLINE
"Line/GridOnColoredCells" // SCLAYOUTOPT_GRID_ONCOLOR
};
Sequence<OUString> aNames(SCLAYOUTOPT_COUNT);
OUString* pNames = aNames.getArray();
for(int i = 0; i < SCLAYOUTOPT_COUNT; i++)
pNames[i] = OUString::createFromAscii(aPropNames[i]);
return aNames;
return {"Line/GridLine", // SCLAYOUTOPT_GRIDLINES
"Line/GridLineColor", // SCLAYOUTOPT_GRIDCOLOR
"Line/PageBreak", // SCLAYOUTOPT_PAGEBREAK
"Line/Guide", // SCLAYOUTOPT_GUIDE
"Window/ColumnRowHeader", // SCLAYOUTOPT_COLROWHDR
"Window/HorizontalScroll", // SCLAYOUTOPT_HORISCROLL
"Window/VerticalScroll", // SCLAYOUTOPT_VERTSCROLL
"Window/SheetTab", // SCLAYOUTOPT_SHEETTAB
"Window/OutlineSymbol", // SCLAYOUTOPT_OUTLINE
"Line/GridOnColoredCells"}; // SCLAYOUTOPT_GRID_ONCOLOR;
}
Sequence<OUString> ScViewCfg::GetDisplayPropertyNames()
{
static const char* aPropNames[] =
{
"Formula", // SCDISPLAYOPT_FORMULA
"ZeroValue", // SCDISPLAYOPT_ZEROVALUE
"NoteTag", // SCDISPLAYOPT_NOTETAG
"ValueHighlighting", // SCDISPLAYOPT_VALUEHI
"Anchor", // SCDISPLAYOPT_ANCHOR
"TextOverflow", // SCDISPLAYOPT_TEXTOVER
"ObjectGraphic", // SCDISPLAYOPT_OBJECTGRA
"Chart", // SCDISPLAYOPT_CHART
"DrawingObject" // SCDISPLAYOPT_DRAWING
};
Sequence<OUString> aNames(SCDISPLAYOPT_COUNT);
OUString* pNames = aNames.getArray();
for(int i = 0; i < SCDISPLAYOPT_COUNT; i++)
pNames[i] = OUString::createFromAscii(aPropNames[i]);
return aNames;
return {"Formula", // SCDISPLAYOPT_FORMULA
"ZeroValue", // SCDISPLAYOPT_ZEROVALUE
"NoteTag", // SCDISPLAYOPT_NOTETAG
"ValueHighlighting", // SCDISPLAYOPT_VALUEHI
"Anchor", // SCDISPLAYOPT_ANCHOR
"TextOverflow", // SCDISPLAYOPT_TEXTOVER
"ObjectGraphic", // SCDISPLAYOPT_OBJECTGRA
"Chart", // SCDISPLAYOPT_CHART
"DrawingObject"}; // SCDISPLAYOPT_DRAWING;
}
Sequence<OUString> ScViewCfg::GetGridPropertyNames()
{
static const char* aPropNames[] =
{
"Resolution/XAxis/NonMetric", // SCGRIDOPT_RESOLU_X
"Resolution/YAxis/NonMetric", // SCGRIDOPT_RESOLU_Y
"Subdivision/XAxis", // SCGRIDOPT_SUBDIV_X
"Subdivision/YAxis", // SCGRIDOPT_SUBDIV_Y
"Option/XAxis/NonMetric", // SCGRIDOPT_OPTION_X
"Option/YAxis/NonMetric", // SCGRIDOPT_OPTION_Y
"Option/SnapToGrid", // SCGRIDOPT_SNAPTOGRID
"Option/Synchronize", // SCGRIDOPT_SYNCHRON
"Option/VisibleGrid", // SCGRIDOPT_VISIBLE
"Option/SizeToGrid" // SCGRIDOPT_SIZETOGRID
};
Sequence<OUString> aNames(SCGRIDOPT_COUNT);
OUString* pNames = aNames.getArray();
for(int i = 0; i < SCGRIDOPT_COUNT; i++)
pNames[i] = OUString::createFromAscii(aPropNames[i]);
const bool bIsMetric = ScOptionsUtil::IsMetricSystem();
// adjust for metric system
if (ScOptionsUtil::IsMetricSystem())
{
pNames[SCGRIDOPT_RESOLU_X] = "Resolution/XAxis/Metric";
pNames[SCGRIDOPT_RESOLU_Y] = "Resolution/YAxis/Metric";
pNames[SCGRIDOPT_OPTION_X] = "Option/XAxis/Metric";
pNames[SCGRIDOPT_OPTION_Y] = "Option/YAxis/Metric";
}
return aNames;
return {(bIsMetric ? OUString("Resolution/XAxis/Metric")
: OUString("Resolution/XAxis/NonMetric")), // SCGRIDOPT_RESOLU_X
(bIsMetric ? OUString("Resolution/YAxis/Metric")
: OUString("Resolution/YAxis/NonMetric")), // SCGRIDOPT_RESOLU_Y
"Subdivision/XAxis", // SCGRIDOPT_SUBDIV_X
"Subdivision/YAxis", // SCGRIDOPT_SUBDIV_Y
(bIsMetric ? OUString("Option/XAxis/Metric")
: OUString("Option/XAxis/NonMetric")), // SCGRIDOPT_OPTION_X
(bIsMetric ? OUString("Option/YAxis/Metric")
: OUString("Option/YAxis/NonMetric")), // SCGRIDOPT_OPTION_Y
"Option/SnapToGrid", // SCGRIDOPT_SNAPTOGRID
"Option/Synchronize", // SCGRIDOPT_SYNCHRON
"Option/VisibleGrid", // SCGRIDOPT_VISIBLE
"Option/SizeToGrid"}; // SCGRIDOPT_SIZETOGRID;
}
ScViewCfg::ScViewCfg() :
diff --git a/sc/source/ui/Accessibility/AccessibleContextBase.cxx b/sc/source/ui/Accessibility/AccessibleContextBase.cxx
index b971cff..a044814 100644
--- a/sc/source/ui/Accessibility/AccessibleContextBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleContextBase.cxx
@@ -470,15 +470,8 @@ uno::Sequence< OUString> SAL_CALL
ScAccessibleContextBase::getSupportedServiceNames()
throw (uno::RuntimeException, std::exception)
{
uno::Sequence<OUString> aServiceNames(2);
OUString* pServiceNames = aServiceNames.getArray();
if (pServiceNames)
{
pServiceNames[0] = "com.sun.star.accessibility.Accessible";
pServiceNames[1] = "com.sun.star.accessibility.AccessibleContext";
}
return aServiceNames;
return {"com.sun.star.accessibility.Accessible",
"com.sun.star.accessibility.AccessibleContext"};
}
//===== XTypeProvider =======================================================
diff --git a/sc/source/ui/unoobj/addruno.cxx b/sc/source/ui/unoobj/addruno.cxx
index c44ea24..fa09033 100644
--- a/sc/source/ui/unoobj/addruno.cxx
+++ b/sc/source/ui/unoobj/addruno.cxx
@@ -300,11 +300,10 @@ sal_Bool SAL_CALL ScAddressConversionObj::supportsService( const OUString& rServ
uno::Sequence<OUString> SAL_CALL ScAddressConversionObj::getSupportedServiceNames()
throw(uno::RuntimeException, std::exception)
{
uno::Sequence<OUString> aRet(1);
OUString* pArray = aRet.getArray();
pArray[0] = bIsRange ? OUString(SC_SERVICENAME_RANGEADDRESS)
: OUString(SC_SERVICENAME_CELLADDRESS);
return aRet;
if (bIsRange)
return {SC_SERVICENAME_RANGEADDRESS};
else
return {SC_SERVICENAME_CELLADDRESS};
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/unoobj/celllistsource.cxx b/sc/source/ui/unoobj/celllistsource.cxx
index b00ea8a..c17c239 100644
--- a/sc/source/ui/unoobj/celllistsource.cxx
+++ b/sc/source/ui/unoobj/celllistsource.cxx
@@ -144,10 +144,8 @@ namespace calc
Sequence< OUString > SAL_CALL OCellListSource::getSupportedServiceNames( ) throw (RuntimeException, std::exception)
{
Sequence< OUString > aServices( 2 );
aServices[ 0 ] = "com.sun.star.table.CellRangeListSource";
aServices[ 1 ] = "com.sun.star.form.binding.ListEntrySource";
return aServices;
return {"com.sun.star.table.CellRangeListSource",
"com.sun.star.form.binding.ListEntrySource"};
}
CellRangeAddress OCellListSource::getRangeAddress( ) const
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 7fb5029..591d8ef 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -4770,13 +4770,10 @@ sal_Bool SAL_CALL ScCellRangesObj::supportsService( const OUString& rServiceName
uno::Sequence<OUString> SAL_CALL ScCellRangesObj::getSupportedServiceNames()
throw(uno::RuntimeException, std::exception)
{
uno::Sequence<OUString> aRet(4);
OUString* pArray = aRet.getArray();
pArray[0] = SCSHEETCELLRANGES_SERVICE;
pArray[1] = SCCELLPROPERTIES_SERVICE;
pArray[2] = SCCHARPROPERTIES_SERVICE;
pArray[3] = SCPARAPROPERTIES_SERVICE;
return aRet;
return {SCSHEETCELLRANGES_SERVICE,
SCCELLPROPERTIES_SERVICE,
SCCHARPROPERTIES_SERVICE,
SCPARAPROPERTIES_SERVICE};
}
uno::Reference<table::XCellRange> ScCellRangeObj::CreateRangeFromDoc( ScDocument* pDoc, const ScRange& rR )
@@ -6037,14 +6034,11 @@ sal_Bool SAL_CALL ScCellRangeObj::supportsService( const OUString& rServiceName
uno::Sequence<OUString> SAL_CALL ScCellRangeObj::getSupportedServiceNames()
throw(uno::RuntimeException, std::exception)
{
uno::Sequence<OUString> aRet(5);
OUString* pArray = aRet.getArray();
pArray[0] = SCSHEETCELLRANGE_SERVICE;
pArray[1] = SCCELLRANGE_SERVICE;
pArray[2] = SCCELLPROPERTIES_SERVICE;
pArray[3] = SCCHARPROPERTIES_SERVICE;
pArray[4] = SCPARAPROPERTIES_SERVICE;
return aRet;
return {SCSHEETCELLRANGE_SERVICE,
SCCELLRANGE_SERVICE,
SCCELLPROPERTIES_SERVICE,
SCCHARPROPERTIES_SERVICE,
SCPARAPROPERTIES_SERVICE};
}
const SvxItemPropertySet* ScCellObj::GetEditPropertySet()
@@ -6724,16 +6718,13 @@ sal_Bool SAL_CALL ScCellObj::supportsService( const OUString& rServiceName )
uno::Sequence<OUString> SAL_CALL ScCellObj::getSupportedServiceNames()
throw(uno::RuntimeException, std::exception)
{
uno::Sequence<OUString> aRet(7);
OUString* pArray = aRet.getArray();
pArray[0] = SCSHEETCELL_SERVICE;
pArray[1] = SCCELL_SERVICE;
pArray[2] = SCCELLPROPERTIES_SERVICE;
pArray[3] = SCCHARPROPERTIES_SERVICE;
pArray[4] = SCPARAPROPERTIES_SERVICE;
pArray[5] = SCSHEETCELLRANGE_SERVICE;
pArray[6] = SCCELLRANGE_SERVICE;
return aRet;
return {SCSHEETCELL_SERVICE,
SCCELL_SERVICE,
SCCELLPROPERTIES_SERVICE,
SCCHARPROPERTIES_SERVICE,
SCPARAPROPERTIES_SERVICE,
SCSHEETCELLRANGE_SERVICE,
SCCELLRANGE_SERVICE};
}
// XActionLockable
@@ -8612,16 +8603,13 @@ sal_Bool SAL_CALL ScTableSheetObj::supportsService( const OUString& rServiceName
uno::Sequence<OUString> SAL_CALL ScTableSheetObj::getSupportedServiceNames()
throw(uno::RuntimeException, std::exception)
{
uno::Sequence<OUString> aRet(7);
OUString* pArray = aRet.getArray();
pArray[0] = SCSPREADSHEET_SERVICE;
pArray[1] = SCSHEETCELLRANGE_SERVICE;
pArray[2] = SCCELLRANGE_SERVICE;
pArray[3] = SCCELLPROPERTIES_SERVICE;
pArray[4] = SCCHARPROPERTIES_SERVICE;
pArray[5] = SCPARAPROPERTIES_SERVICE;
pArray[6] = SCLINKTARGET_SERVICE;
return aRet;
return {SCSPREADSHEET_SERVICE,
SCSHEETCELLRANGE_SERVICE,
SCCELLRANGE_SERVICE,
SCCELLPROPERTIES_SERVICE,
SCCHARPROPERTIES_SERVICE,
SCPARAPROPERTIES_SERVICE,
SCLINKTARGET_SERVICE};
}
// XUnoTunnel
diff --git a/sc/source/ui/unoobj/confuno.cxx b/sc/source/ui/unoobj/confuno.cxx
index 6f57f18..f59c12e 100644
--- a/sc/source/ui/unoobj/confuno.cxx
+++ b/sc/source/ui/unoobj/confuno.cxx
@@ -542,11 +542,8 @@ sal_Bool SAL_CALL ScDocumentConfiguration::supportsService( const OUString& rSer
uno::Sequence<OUString> SAL_CALL ScDocumentConfiguration::getSupportedServiceNames()
throw(uno::RuntimeException, std::exception)
{
uno::Sequence<OUString> aRet(2);
OUString* pArray = aRet.getArray();
pArray[0] = "com.sun.star.comp.SpreadsheetSettings";
pArray[1] = "com.sun.star.document.Settings";
return aRet;
return {"com.sun.star.comp.SpreadsheetSettings",
"com.sun.star.document.Settings"};
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx
index 2cd9e61..af738ef 100644
--- a/sc/source/ui/unoobj/datauno.cxx
+++ b/sc/source/ui/unoobj/datauno.cxx
@@ -2173,11 +2173,8 @@ sal_Bool SAL_CALL ScDatabaseRangeObj::supportsService( const OUString& rServiceN
uno::Sequence<OUString> SAL_CALL ScDatabaseRangeObj::getSupportedServiceNames()
throw(uno::RuntimeException, std::exception)
{
uno::Sequence<OUString> aRet(2);
OUString* pArray = aRet.getArray();
pArray[0] = "com.sun.star.sheet.DatabaseRange";
pArray[1] = SCLINKTARGET_SERVICE;
return aRet;
return {"com.sun.star.sheet.DatabaseRange",
SCLINKTARGET_SERVICE};
}
ScDatabaseRangesObj::ScDatabaseRangesObj(ScDocShell* pDocSh) :
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 6d300b8..730e9e0 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -273,16 +273,18 @@ ScPrintUIOptions::ScPrintUIOptions()
aPrintRangeOpt);
// create a choice for the content to create
uno::Sequence< OUString > aChoices( 3 ), aHelpIds( 3 ), aWidgetIds( 3 );
aChoices[0] = SC_RESSTR( SCSTR_PRINTOPT_ALLSHEETS );
aHelpIds[0] = ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:0";
aWidgetIds[0] = "printallsheets";
aChoices[1] = SC_RESSTR( SCSTR_PRINTOPT_SELECTEDSHEETS );
aHelpIds[1] = ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:1";
aWidgetIds[1] = "printselectedsheets";
aChoices[2] = SC_RESSTR( SCSTR_PRINTOPT_SELECTEDCELLS );
aHelpIds[2] = ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:2";
aWidgetIds[2] = "printselectedcells";
uno::Sequence< OUString > aChoices{
SC_RESSTR( SCSTR_PRINTOPT_ALLSHEETS ),
SC_RESSTR( SCSTR_PRINTOPT_SELECTEDSHEETS ),
SC_RESSTR( SCSTR_PRINTOPT_SELECTEDCELLS )};
uno::Sequence< OUString > aHelpIds{
".HelpID:vcl:PrintDialog:PrintContent:RadioButton:0",
".HelpID:vcl:PrintDialog:PrintContent:RadioButton:1",
".HelpID:vcl:PrintDialog:PrintContent:RadioButton:2"};
uno::Sequence< OUString > aWidgetIds{
"printallsheets",
"printselectedsheets",
"printselectedcells"};
m_aUIProperties[nIdx++].Value = setChoiceRadiosControlOpt(aWidgetIds, OUString(),
aHelpIds, "PrintContent",
aChoices, nContent );
@@ -2578,11 +2580,7 @@ sal_Bool SAL_CALL ScModelObj::supportsService( const OUString& rServiceName )
uno::Sequence<OUString> SAL_CALL ScModelObj::getSupportedServiceNames()
throw(uno::RuntimeException, std::exception)
{
uno::Sequence<OUString> aRet(3);
aRet[0] = SCMODELOBJ_SERVICE;
aRet[1] = SCDOCSETTINGS_SERVICE;
aRet[2] = SCDOC_SERVICE;
return aRet;
return {SCMODELOBJ_SERVICE, SCDOCSETTINGS_SERVICE, SCDOC_SERVICE};
}
// XUnoTunnel
diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx
index c71ac79..6969bb8 100644
--- a/sc/source/ui/unoobj/fielduno.cxx
+++ b/sc/source/ui/unoobj/fielduno.cxx
@@ -1392,11 +1392,8 @@ sal_Bool SAL_CALL ScEditFieldObj::supportsService( const OUString& rServiceName
uno::Sequence<OUString> SAL_CALL ScEditFieldObj::getSupportedServiceNames()
throw(uno::RuntimeException, std::exception)
{
uno::Sequence<OUString> aRet(2);
OUString* pArray = aRet.getArray();
pArray[0] = "com.sun.star.text.TextField";
pArray[1] = "com.sun.star.text.TextContent";
return aRet;
return {"com.sun.star.text.TextField",
"com.sun.star.text.TextContent"};
}
uno::Sequence<uno::Type> SAL_CALL ScEditFieldObj::getTypes() throw(uno::RuntimeException, std::exception)
diff --git a/sc/source/ui/unoobj/funcuno.cxx b/sc/source/ui/unoobj/funcuno.cxx
index 23ff3d5..b54e238 100644
--- a/sc/source/ui/unoobj/funcuno.cxx
+++ b/sc/source/ui/unoobj/funcuno.cxx
@@ -226,11 +226,7 @@ sal_Bool SAL_CALL ScFunctionAccess::supportsService( const OUString& rServiceNam
uno::Sequence<OUString> SAL_CALL ScFunctionAccess::getSupportedServiceNames()
throw(uno::RuntimeException, std::exception)
{
uno::Sequence<OUString> aRet(2);
OUString* pArray = aRet.getArray();
pArray[0] = SCFUNCTIONACCESS_SERVICE;
pArray[1] = SCDOCSETTINGS_SERVICE;
return aRet;
return {SCFUNCTIONACCESS_SERVICE, SCDOCSETTINGS_SERVICE};
}
// XPropertySet (document settings)
diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx
index fa61a67..f58b10a 100644
--- a/sc/source/ui/unoobj/nameuno.cxx
+++ b/sc/source/ui/unoobj/nameuno.cxx
@@ -435,10 +435,7 @@ sal_Bool SAL_CALL ScNamedRangeObj::supportsService( const OUString& rServiceName
uno::Sequence<OUString> SAL_CALL ScNamedRangeObj::getSupportedServiceNames()
throw(uno::RuntimeException, std::exception)
{
uno::Sequence<OUString> aRet(2);
aRet[0] = SCNAMEDRANGEOBJ_SERVICE;
aRet[1] = SCLINKTARGET_SERVICE;
return aRet;
return {SCNAMEDRANGEOBJ_SERVICE, SCLINKTARGET_SERVICE};
}
// XUnoTunnel
diff --git a/sc/source/ui/unoobj/srchuno.cxx b/sc/source/ui/unoobj/srchuno.cxx
index 3e51113..e60a572 100644
--- a/sc/source/ui/unoobj/srchuno.cxx
+++ b/sc/source/ui/unoobj/srchuno.cxx
@@ -204,11 +204,7 @@ sal_Bool SAL_CALL ScCellSearchObj::supportsService( const OUString& rServiceName
uno::Sequence<OUString> SAL_CALL ScCellSearchObj::getSupportedServiceNames()
throw(uno::RuntimeException, std::exception)
{
uno::Sequence<OUString> aRet(2);
OUString* pArray = aRet.getArray();
pArray[0] = SCSEARCHDESCRIPTOR_SERVICE;
pArray[1] = SCREPLACEDESCRIPTOR_SERVICE;
return aRet;
return {SCSEARCHDESCRIPTOR_SERVICE, SCREPLACEDESCRIPTOR_SERVICE};
}
// XUnoTunnel
diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx
index 4140596..1624ca5 100644
--- a/sc/source/ui/unoobj/styleuno.cxx
+++ b/sc/source/ui/unoobj/styleuno.cxx
@@ -506,12 +506,7 @@ uno::Any SAL_CALL ScStyleFamiliesObj::getByName( const OUString& aName )
uno::Sequence<OUString> SAL_CALL ScStyleFamiliesObj::getElementNames()
throw(uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
uno::Sequence<OUString> aNames(SC_STYLE_FAMILY_COUNT);
OUString* pNames = aNames.getArray();
pNames[0] = SC_FAMILYNAME_CELL;
pNames[1] = SC_FAMILYNAME_PAGE;
return aNames;
return {SC_FAMILYNAME_CELL, SC_FAMILYNAME_PAGE};
}
sal_Bool SAL_CALL ScStyleFamiliesObj::hasByName( const OUString& aName )
@@ -2016,13 +2011,11 @@ sal_Bool SAL_CALL ScStyleObj::supportsService( const OUString& rServiceName )
uno::Sequence<OUString> SAL_CALL ScStyleObj::getSupportedServiceNames()
throw(uno::RuntimeException, std::exception)
{
bool bPage = ( eFamily == SfxStyleFamily::Page );
uno::Sequence<OUString> aRet(2);
OUString* pArray = aRet.getArray();
pArray[0] = SCSTYLE_SERVICE;
pArray[1] = bPage ? OUString(SCPAGESTYLE_SERVICE)
: OUString(SCCELLSTYLE_SERVICE);
return aRet;
const bool bPage = ( eFamily == SfxStyleFamily::Page );
return {SCSTYLE_SERVICE,
(bPage ? OUString(SCPAGESTYLE_SERVICE)
: OUString(SCCELLSTYLE_SERVICE))};
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx
index a1cf8d2..8356c70 100644
--- a/sc/source/ui/unoobj/viewuno.cxx
+++ b/sc/source/ui/unoobj/viewuno.cxx
@@ -2170,11 +2170,7 @@ sal_Bool SAL_CALL ScTabViewObj::supportsService( const OUString& rServiceName )
uno::Sequence<OUString> SAL_CALL ScTabViewObj::getSupportedServiceNames()
throw(uno::RuntimeException, std::exception)
{
uno::Sequence<OUString> aRet(2);
OUString* pArray = aRet.getArray();
pArray[0] = SCTABVIEWOBJ_SERVICE;
pArray[1] = SCVIEWSETTINGS_SERVICE;
return aRet;
return {SCTABVIEWOBJ_SERVICE, SCVIEWSETTINGS_SERVICE};
}
// XUnoTunnel
