diff options
Diffstat (limited to 'sc/source/ui')
29 files changed, 76 insertions, 76 deletions
diff --git a/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx b/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx index f508b0217b60..23f9659c68c5 100644 --- a/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx @@ -26,7 +26,7 @@ struct StatisticCalculation { const char* aResultRangeName; }; -static StatisticCalculation const lclBasicStatistics[] = +StatisticCalculation const lclBasicStatistics[] = { { STR_ANOVA_LABEL_GROUPS, nullptr, nullptr }, { STRID_CALC_COUNT, "=COUNT(%RANGE%)", "COUNT_RANGE" }, @@ -36,7 +36,7 @@ static StatisticCalculation const lclBasicStatistics[] = { nullptr, nullptr, nullptr } }; -static const char* lclAnovaLabels[] = +const char* lclAnovaLabels[] = { STR_ANOVA_LABEL_SOURCE_OF_VARIATION, STR_ANOVA_LABEL_SS, @@ -48,7 +48,7 @@ static const char* lclAnovaLabels[] = nullptr }; -static const char strWildcardRange[] = "%RANGE%"; +const char strWildcardRange[] = "%RANGE%"; OUString lclCreateMultiParameterFormula( ScRangeList& aRangeList, const OUString& aFormulaTemplate, diff --git a/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx b/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx index 434271d0a3ca..f82b04bdf17a 100644 --- a/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx @@ -24,7 +24,7 @@ struct StatisticCalculation { const char* aFormula; }; -static const StatisticCalculation lclCalcDefinitions[] = +const StatisticCalculation lclCalcDefinitions[] = { { STRID_CALC_MEAN, "=AVERAGE(%RANGE%)" }, { STRID_CALC_STD_ERROR, "=SQRT(VAR(%RANGE%)/COUNT(%RANGE%))"}, diff --git a/sc/source/ui/app/msgpool.cxx b/sc/source/ui/app/msgpool.cxx index 8a48a87bd290..d8ae220bf6dc 100644 --- a/sc/source/ui/app/msgpool.cxx +++ b/sc/source/ui/app/msgpool.cxx @@ -23,7 +23,7 @@ #include <docpool.hxx> #include <msgpool.hxx> -static SfxItemInfo const aMsgItemInfos[] = +SfxItemInfo const aMsgItemInfos[] = { { 0, true }, // SCITEM_STRING { 0, true }, // SCITEM_SEARCHDATA - stop using this! diff --git a/sc/source/ui/app/rfindlst.cxx b/sc/source/ui/app/rfindlst.cxx index 9a27a0d0e298..330b8479b9a3 100644 --- a/sc/source/ui/app/rfindlst.cxx +++ b/sc/source/ui/app/rfindlst.cxx @@ -22,7 +22,7 @@ #define SC_RANGECOLORS 8 -static const Color aColNames[SC_RANGECOLORS] = +const Color aColNames[SC_RANGECOLORS] = { COL_LIGHTBLUE, COL_LIGHTRED, COL_LIGHTMAGENTA, COL_GREEN, COL_BLUE, COL_RED, COL_MAGENTA, COL_BROWN }; diff --git a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx index 6e05c824d5af..f03b789e8020 100644 --- a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx +++ b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx @@ -114,7 +114,7 @@ struct ScZoomSlider::ScZoomSliderWnd_Impl } }; -static constexpr sal_uInt16 gnSliderCenter(100); +constexpr sal_uInt16 gnSliderCenter(100); const long nButtonWidth = 10; const long nButtonHeight = 10; diff --git a/sc/source/ui/dbgui/asciiopt.cxx b/sc/source/ui/dbgui/asciiopt.cxx index 5f719a31c21c..d2082706d917 100644 --- a/sc/source/ui/dbgui/asciiopt.cxx +++ b/sc/source/ui/dbgui/asciiopt.cxx @@ -22,8 +22,8 @@ #include <comphelper/string.hxx> #include <osl/thread.h> -static const char pStrFix[] = "FIX"; -static const char pStrMrg[] = "MRG"; +const char pStrFix[] = "FIX"; +const char pStrMrg[] = "MRG"; ScAsciiOptions::ScAsciiOptions() : bFixedLen ( false ), diff --git a/sc/source/ui/dbgui/dpgroupdlg.cxx b/sc/source/ui/dbgui/dpgroupdlg.cxx index 44d5660cd793..64d61e55bbab 100644 --- a/sc/source/ui/dbgui/dpgroupdlg.cxx +++ b/sc/source/ui/dbgui/dpgroupdlg.cxx @@ -32,7 +32,7 @@ namespace { /** Date part flags in order of the list box entries. */ -static const sal_Int32 spnDateParts[] = +const sal_Int32 spnDateParts[] = { css::sheet::DataPilotFieldGroupBy::SECONDS, css::sheet::DataPilotFieldGroupBy::MINUTES, @@ -43,7 +43,7 @@ static const sal_Int32 spnDateParts[] = css::sheet::DataPilotFieldGroupBy::YEARS }; -static const char* aDatePartResIds[] = +const char* aDatePartResIds[] = { STR_DPFIELD_GROUP_BY_SECONDS, STR_DPFIELD_GROUP_BY_MINUTES, diff --git a/sc/source/ui/dbgui/imoptdlg.cxx b/sc/source/ui/dbgui/imoptdlg.cxx index 3de4d7ade31a..4229c2a307a5 100644 --- a/sc/source/ui/dbgui/imoptdlg.cxx +++ b/sc/source/ui/dbgui/imoptdlg.cxx @@ -23,7 +23,7 @@ #include <osl/thread.h> #include <global.hxx> -static const char pStrFix[] = "FIX"; +const char pStrFix[] = "FIX"; // The option string can no longer contain a semicolon (because of pick list), // therefore, starting with version 336 comma instead diff --git a/sc/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx index 5413b009a1a2..2456d40f608a 100644 --- a/sc/source/ui/dbgui/pvfundlg.cxx +++ b/sc/source/ui/dbgui/pvfundlg.cxx @@ -108,7 +108,7 @@ bool lclFillListBox(weld::TreeView& rLBox, const vector<ScDPLabelData::Member>& } /** This table represents the order of the strings in the resource string array. */ -static const PivotFunc spnFunctions[] = +const PivotFunc spnFunctions[] = { PivotFunc::Sum, PivotFunc::Count, diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx index ca92a787f18d..a270332ddf2c 100644 --- a/sc/source/ui/dbgui/scuiasciiopt.cxx +++ b/sc/source/ui/dbgui/scuiasciiopt.cxx @@ -279,7 +279,7 @@ static void lcl_SaveSeparators( aItem.PutProperties(aNames, aValues); } -static constexpr OUStringLiteral gaTextSepList(SCSTR_TEXTSEP); +constexpr OUStringLiteral gaTextSepList(SCSTR_TEXTSEP); ScImportAsciiDlg::ScImportAsciiDlg(weld::Window* pParent, const OUString& aDatName, SvStream* pInStream, ScImportAsciiCall eCall) diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index a305a1b5bc12..b0d3dd8f55cc 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -139,25 +139,25 @@ using ::std::vector; // Filter names (like in sclib.cxx) -static const char pFilterSc50[] = "StarCalc 5.0"; -static const char pFilterXML[] = "StarOffice XML (Calc)"; -static const char pFilterAscii[] = SC_TEXT_CSV_FILTER_NAME; -static const char pFilterLotus[] = "Lotus"; -static const char pFilterQPro6[] = "Quattro Pro 6.0"; -static const char pFilterExcel4[] = "MS Excel 4.0"; -static const char pFilterEx4Temp[] = "MS Excel 4.0 Vorlage/Template"; -static const char pFilterExcel5[] = "MS Excel 5.0/95"; -static const char pFilterEx5Temp[] = "MS Excel 5.0/95 Vorlage/Template"; -static const char pFilterExcel95[] = "MS Excel 95"; -static const char pFilterEx95Temp[] = "MS Excel 95 Vorlage/Template"; -static const char pFilterExcel97[] = "MS Excel 97"; -static const char pFilterEx97Temp[] = "MS Excel 97 Vorlage/Template"; -static const char pFilterDBase[] = "dBase"; -static const char pFilterDif[] = "DIF"; -static const char pFilterSylk[] = "SYLK"; -static const char pFilterHtml[] = "HTML (StarCalc)"; -static const char pFilterHtmlWebQ[] = "calc_HTML_WebQuery"; -static const char pFilterRtf[] = "Rich Text Format (StarCalc)"; +const char pFilterSc50[] = "StarCalc 5.0"; +const char pFilterXML[] = "StarOffice XML (Calc)"; +const char pFilterAscii[] = SC_TEXT_CSV_FILTER_NAME; +const char pFilterLotus[] = "Lotus"; +const char pFilterQPro6[] = "Quattro Pro 6.0"; +const char pFilterExcel4[] = "MS Excel 4.0"; +const char pFilterEx4Temp[] = "MS Excel 4.0 Vorlage/Template"; +const char pFilterExcel5[] = "MS Excel 5.0/95"; +const char pFilterEx5Temp[] = "MS Excel 5.0/95 Vorlage/Template"; +const char pFilterExcel95[] = "MS Excel 95"; +const char pFilterEx95Temp[] = "MS Excel 95 Vorlage/Template"; +const char pFilterExcel97[] = "MS Excel 97"; +const char pFilterEx97Temp[] = "MS Excel 97 Vorlage/Template"; +const char pFilterDBase[] = "dBase"; +const char pFilterDif[] = "DIF"; +const char pFilterSylk[] = "SYLK"; +const char pFilterHtml[] = "HTML (StarCalc)"; +const char pFilterHtmlWebQ[] = "calc_HTML_WebQuery"; +const char pFilterRtf[] = "Rich Text Format (StarCalc)"; #define ShellClass_ScDocShell #include <scslots.hxx> diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx index 543f516a1c4d..f87440b047b3 100644 --- a/sc/source/ui/docshell/impex.cxx +++ b/sc/source/ui/docshell/impex.cxx @@ -69,7 +69,7 @@ // times maximum cell content length, 2*1024*64K=128M, and because it's // sal_Unicode that's 256MB. If it's 2GB of data without LF we're out of luck // anyway. -static const sal_Int32 nArbitraryLineLengthLimit = 2 * MAXCOLCOUNT * 65536; +const sal_Int32 nArbitraryLineLengthLimit = 2 * MAXCOLCOUNT * 65536; namespace { diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx index 49d8b62c7fcf..eaeb767cafaa 100644 --- a/sc/source/ui/navipi/content.cxx +++ b/sc/source/ui/navipi/content.cxx @@ -58,7 +58,7 @@ using namespace com::sun::star; // order of the categories in navigator ------------------------------------- -static const ScContentId pTypeList[int(ScContentId::LAST) + 1] = +const ScContentId pTypeList[int(ScContentId::LAST) + 1] = { ScContentId::ROOT, // ROOT (0) has to be at the front ScContentId::TABLE, @@ -71,7 +71,7 @@ static const ScContentId pTypeList[int(ScContentId::LAST) + 1] = ScContentId::DRAWING }; -static const OUStringLiteral aContentBmps[]= +const OUStringLiteral aContentBmps[]= { RID_BMP_CONTENT_TABLE, RID_BMP_CONTENT_RANGENAME, diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx index ab4e73f2cc91..f970ef9c8683 100644 --- a/sc/source/ui/navipi/navipi.cxx +++ b/sc/source/ui/navipi/navipi.cxx @@ -51,7 +51,7 @@ using namespace com::sun::star; // macro is sufficient since only used in ctor #define SCNAV_COLDIGITS (static_cast<sal_Int32>( floor( log10( static_cast<double>(SCNAV_MAXCOL)))) + 1) // 1...256...18278 // precomputed constant because it is used in every change of spin button field -static const sal_Int32 SCNAV_COLLETTERS = ::ScColToAlpha(SCNAV_MAXCOL).getLength(); // A...IV...ZZZ +const sal_Int32 SCNAV_COLLETTERS = ::ScColToAlpha(SCNAV_MAXCOL).getLength(); // A...IV...ZZZ #define SCNAV_MAXROW (MAXROWCOUNT) diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx index 5d1868dc61ef..5cedd09b6895 100644 --- a/sc/source/ui/optdlg/tpusrlst.cxx +++ b/sc/source/ui/optdlg/tpusrlst.cxx @@ -41,7 +41,7 @@ #define CR u'\x000D' #define LF u'\x000A' -static const sal_Unicode cDelimiter = ','; +const sal_Unicode cDelimiter = ','; // Benutzerdefinierte Listen: diff --git a/sc/source/ui/unoobj/condformatuno.cxx b/sc/source/ui/unoobj/condformatuno.cxx index 6f9a25fcca89..da62003a86c1 100644 --- a/sc/source/ui/unoobj/condformatuno.cxx +++ b/sc/source/ui/unoobj/condformatuno.cxx @@ -80,7 +80,7 @@ struct ConditionEntryApiMap sal_Int32 nApiMode; }; -static ConditionEntryApiMap const aConditionEntryMap[] = +ConditionEntryApiMap const aConditionEntryMap[] = { {ScConditionMode::Equal, sheet::ConditionFormatOperator::EQUAL}, {ScConditionMode::Less, sheet::ConditionFormatOperator::LESS}, @@ -131,7 +131,7 @@ struct ColorScaleEntryTypeApiMap sal_Int32 nApiType; }; -static ColorScaleEntryTypeApiMap const aColorScaleEntryTypeMap[] = +ColorScaleEntryTypeApiMap const aColorScaleEntryTypeMap[] = { { COLORSCALE_MIN, sheet::ColorScaleEntryType::COLORSCALE_MIN }, { COLORSCALE_MAX, sheet::ColorScaleEntryType::COLORSCALE_MAX }, @@ -180,7 +180,7 @@ struct DataBarAxisApiMap sal_Int32 nApiPos; }; -static DataBarAxisApiMap const aDataBarAxisMap[] = +DataBarAxisApiMap const aDataBarAxisMap[] = { { databar::NONE, sheet::DataBarAxis::AXIS_NONE }, { databar::AUTOMATIC, sheet::DataBarAxis::AXIS_AUTOMATIC }, @@ -193,7 +193,7 @@ struct DataBarEntryTypeApiMap sal_Int32 nApiType; }; -static DataBarEntryTypeApiMap const aDataBarEntryTypeMap[] = +DataBarEntryTypeApiMap const aDataBarEntryTypeMap[] = { { COLORSCALE_AUTO, sheet::DataBarEntryType::DATABAR_AUTO }, { COLORSCALE_MIN, sheet::DataBarEntryType::DATABAR_MIN }, @@ -260,7 +260,7 @@ struct IconSetEntryTypeApiMap sal_Int32 nApiType; }; -static IconSetEntryTypeApiMap const aIconSetEntryTypeMap[] = +IconSetEntryTypeApiMap const aIconSetEntryTypeMap[] = { { COLORSCALE_MIN, sheet::IconSetFormatEntry::ICONSET_MIN }, { COLORSCALE_VALUE, sheet::IconSetFormatEntry::ICONSET_VALUE }, @@ -292,7 +292,7 @@ struct DateTypeApiMap sal_Int32 nApiType; }; -static DateTypeApiMap const aDateTypeApiMap[] = +DateTypeApiMap const aDateTypeApiMap[] = { { condformat::TODAY, sheet::DateType::TODAY }, { condformat::YESTERDAY, sheet::DateType::YESTERDAY }, diff --git a/sc/source/ui/unoobj/dispuno.cxx b/sc/source/ui/unoobj/dispuno.cxx index 2fc3f06c8313..74e3ba29a493 100644 --- a/sc/source/ui/unoobj/dispuno.cxx +++ b/sc/source/ui/unoobj/dispuno.cxx @@ -33,8 +33,8 @@ using namespace com::sun::star; -static const char cURLInsertColumns[] = ".uno:DataSourceBrowser/InsertColumns"; //data into text -static const char cURLDocDataSource[] = ".uno:DataSourceBrowser/DocumentDataSource"; +const char cURLInsertColumns[] = ".uno:DataSourceBrowser/InsertColumns"; //data into text +const char cURLDocDataSource[] = ".uno:DataSourceBrowser/DocumentDataSource"; static uno::Reference<view::XSelectionSupplier> lcl_GetSelectionSupplier( const SfxViewShell* pViewShell ) { diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx index ead34c2a9518..2a8f17da4d95 100644 --- a/sc/source/ui/unoobj/styleuno.cxx +++ b/sc/source/ui/unoobj/styleuno.cxx @@ -385,7 +385,7 @@ static const SfxItemPropertyMap* lcl_GetFooterStyleMap() #define SC_FAMILYNAME_CELL "CellStyles" #define SC_FAMILYNAME_PAGE "PageStyles" -static const SfxStyleFamily aStyleFamilyTypes[SC_STYLE_FAMILY_COUNT] = { SfxStyleFamily::Para, SfxStyleFamily::Page }; +const SfxStyleFamily aStyleFamilyTypes[SC_STYLE_FAMILY_COUNT] = { SfxStyleFamily::Para, SfxStyleFamily::Page }; using sc::HMMToTwips; using sc::TwipsToHMM; diff --git a/sc/source/ui/unoobj/targuno.cxx b/sc/source/ui/unoobj/targuno.cxx index 4da1765fd265..6ed91ab9b440 100644 --- a/sc/source/ui/unoobj/targuno.cxx +++ b/sc/source/ui/unoobj/targuno.cxx @@ -199,7 +199,7 @@ void SAL_CALL ScLinkTargetTypeObj::setPropertyValue(const OUString& /* aProperty //! exception? } -static const OUStringLiteral aContentBmps[]= +const OUStringLiteral aContentBmps[]= { RID_BMP_CONTENT_TABLE, RID_BMP_CONTENT_RANGENAME, diff --git a/sc/source/ui/vba/vbaassistant.cxx b/sc/source/ui/vba/vbaassistant.cxx index 25da8eee15eb..48e1ba22401f 100644 --- a/sc/source/ui/vba/vbaassistant.cxx +++ b/sc/source/ui/vba/vbaassistant.cxx @@ -26,7 +26,7 @@ using namespace ooo::vba; using namespace ooo::vba::office::MsoAnimationType; -static constexpr OUStringLiteral g_sName = "Clippit"; +constexpr OUStringLiteral g_sName = "Clippit"; ScVbaAssistant::ScVbaAssistant( const uno::Reference< XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext ): ScVbaAssistantImpl_BASE(rParent, rContext) { diff --git a/sc/source/ui/vba/vbaborders.cxx b/sc/source/ui/vba/vbaborders.cxx index 41e8f03c56d6..97034dec7a0b 100644 --- a/sc/source/ui/vba/vbaborders.cxx +++ b/sc/source/ui/vba/vbaborders.cxx @@ -40,15 +40,15 @@ typedef InheritedHelperInterfaceWeakImpl<excel::XBorder > ScVbaBorder_Base; // #TODO sort these indexes to match the order in which Excel iterates over the // borders, the enumeration will match the order in this list -static const sal_Int16 supportedIndexTable[] = { XlBordersIndex::xlEdgeLeft, XlBordersIndex::xlEdgeTop, XlBordersIndex::xlEdgeBottom, XlBordersIndex::xlEdgeRight, XlBordersIndex::xlDiagonalDown, XlBordersIndex::xlDiagonalUp, XlBordersIndex::xlInsideVertical, XlBordersIndex::xlInsideHorizontal }; +const sal_Int16 supportedIndexTable[] = { XlBordersIndex::xlEdgeLeft, XlBordersIndex::xlEdgeTop, XlBordersIndex::xlEdgeBottom, XlBordersIndex::xlEdgeRight, XlBordersIndex::xlDiagonalDown, XlBordersIndex::xlDiagonalUp, XlBordersIndex::xlInsideVertical, XlBordersIndex::xlInsideHorizontal }; -static const char sTableBorder[] = "TableBorder"; +const char sTableBorder[] = "TableBorder"; // Equiv widths in 1/100 mm -const static sal_Int32 OOLineThin = 35; -const static sal_Int32 OOLineMedium = 88; -const static sal_Int32 OOLineThick = 141; -const static sal_Int32 OOLineHairline = 2; +const sal_Int32 OOLineThin = 35; +const sal_Int32 OOLineMedium = 88; +const sal_Int32 OOLineThick = 141; +const sal_Int32 OOLineHairline = 2; namespace { diff --git a/sc/source/ui/vba/vbadialog.cxx b/sc/source/ui/vba/vbadialog.cxx index d3e47a289cc1..546b4a304e8e 100644 --- a/sc/source/ui/vba/vbadialog.cxx +++ b/sc/source/ui/vba/vbadialog.cxx @@ -23,7 +23,7 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -static const OUStringLiteral aStringList[]= +const OUStringLiteral aStringList[]= { ".uno:Open", ".uno:FormatCellDialog", diff --git a/sc/source/ui/vba/vbainterior.cxx b/sc/source/ui/vba/vbainterior.cxx index 0fe22e786e0e..c4897d92328c 100644 --- a/sc/source/ui/vba/vbainterior.cxx +++ b/sc/source/ui/vba/vbainterior.cxx @@ -34,9 +34,9 @@ using namespace ::com::sun::star; using namespace ::ooo::vba; using namespace ::ooo::vba::excel::XlPattern; -static const char BACKCOLOR[] = "CellBackColor"; -static const char PATTERN[] = "Pattern"; -static const char PATTERNCOLOR[] = "PatternColor"; +const char BACKCOLOR[] = "CellBackColor"; +const char PATTERN[] = "Pattern"; +const char PATTERNCOLOR[] = "PatternColor"; static std::map< sal_Int32, sal_Int32 > aPatternMap { { xlPatternAutomatic, 0 }, diff --git a/sc/source/ui/vba/vbapalette.cxx b/sc/source/ui/vba/vbapalette.cxx index 86bbc1031f15..2fdb74d77bfa 100644 --- a/sc/source/ui/vba/vbapalette.cxx +++ b/sc/source/ui/vba/vbapalette.cxx @@ -38,7 +38,7 @@ using namespace ::ooo::vba; #define EXC_PALETTE_EGA_COLORS_DARK \ Color(0x800000), Color(0x008000), Color(0x000080), Color(0x808000), Color(0x800080), Color(0x008080), Color(0xC0C0C0), Color(0x808080) -static const Color spnDefColorTable8[] = +const Color spnDefColorTable8[] = { /* 8 */ EXC_PALETTE_EGA_COLORS_LIGHT, /* 16 */ EXC_PALETTE_EGA_COLORS_DARK, diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx index 546ff7871c71..30c1904aed8b 100644 --- a/sc/source/ui/vba/vbarange.cxx +++ b/sc/source/ui/vba/vbarange.cxx @@ -171,7 +171,7 @@ const double fExtraWidth = 182.0 / 256.0; // * 1 cm = 567 twips static double lcl_hmmToPoints( double nVal ) { return nVal / 1000 * 567 / 20; } -static const sal_Int16 supportedIndexTable[] = { excel::XlBordersIndex::xlEdgeLeft, excel::XlBordersIndex::xlEdgeTop, excel::XlBordersIndex::xlEdgeBottom, excel::XlBordersIndex::xlEdgeRight, excel::XlBordersIndex::xlDiagonalDown, excel::XlBordersIndex::xlDiagonalUp, excel::XlBordersIndex::xlInsideVertical, excel::XlBordersIndex::xlInsideHorizontal }; +const sal_Int16 supportedIndexTable[] = { excel::XlBordersIndex::xlEdgeLeft, excel::XlBordersIndex::xlEdgeTop, excel::XlBordersIndex::xlEdgeBottom, excel::XlBordersIndex::xlEdgeRight, excel::XlBordersIndex::xlDiagonalDown, excel::XlBordersIndex::xlDiagonalUp, excel::XlBordersIndex::xlInsideVertical, excel::XlBordersIndex::xlInsideHorizontal }; static sal_uInt16 lcl_pointsToTwips( double nVal ) { @@ -673,15 +673,15 @@ public: } -static const char ISVISIBLE[] = "IsVisible"; -static const char EQUALS[] = "="; -static const char NOTEQUALS[] = "<>"; -static const char GREATERTHAN[] = ">"; -static const char GREATERTHANEQUALS[] = ">="; -static const char LESSTHAN[] = "<"; -static const char LESSTHANEQUALS[] = "<="; -static const char STR_ERRORMESSAGE_APPLIESTOSINGLERANGEONLY[] = "The command you chose cannot be performed with multiple selections.\nSelect a single range and click the command again"; -static const char CELLSTYLE[] = "CellStyle"; +const char ISVISIBLE[] = "IsVisible"; +const char EQUALS[] = "="; +const char NOTEQUALS[] = "<>"; +const char GREATERTHAN[] = ">"; +const char GREATERTHANEQUALS[] = ">="; +const char LESSTHAN[] = "<"; +const char LESSTHANEQUALS[] = "<="; +const char STR_ERRORMESSAGE_APPLIESTOSINGLERANGEONLY[] = "The command you chose cannot be performed with multiple selections.\nSelect a single range and click the command again"; +const char CELLSTYLE[] = "CellStyle"; namespace { @@ -970,7 +970,7 @@ public: } -static const char sNA[] = "#N/A"; +const char sNA[] = "#N/A"; namespace { diff --git a/sc/source/ui/vba/vbastyle.cxx b/sc/source/ui/vba/vbastyle.cxx index ba2d04553231..cf0012b45371 100644 --- a/sc/source/ui/vba/vbastyle.cxx +++ b/sc/source/ui/vba/vbastyle.cxx @@ -25,7 +25,7 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -static const char DISPLAYNAME[] = "DisplayName"; +const char DISPLAYNAME[] = "DisplayName"; uno::Reference< container::XNameAccess > ScVbaStyle::getStylesNameContainer( const uno::Reference< frame::XModel >& xModel ) diff --git a/sc/source/ui/view/olinewin.cxx b/sc/source/ui/view/olinewin.cxx index ea117e566c90..867e309c08b9 100644 --- a/sc/source/ui/view/olinewin.cxx +++ b/sc/source/ui/view/olinewin.cxx @@ -597,7 +597,7 @@ void ScOutlineWindow::HideFocus() } } -static const OUStringLiteral aLevelBmps[]= +const OUStringLiteral aLevelBmps[]= { RID_BMP_LEVEL1, RID_BMP_LEVEL2, diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx index 8683ecdadf77..4e1e53abc397 100644 --- a/sc/source/ui/view/output.cxx +++ b/sc/source/ui/view/output.cxx @@ -70,7 +70,7 @@ using namespace com::sun::star; #define SC_AUTHORCOLORCOUNT 9 -static const Color nAuthorColor[ SC_AUTHORCOLORCOUNT ] = { +const Color nAuthorColor[ SC_AUTHORCOLORCOUNT ] = { COL_LIGHTRED, COL_LIGHTBLUE, COL_LIGHTMAGENTA, COL_GREEN, COL_RED, COL_BLUE, COL_BROWN, COL_MAGENTA, COL_CYAN }; @@ -819,7 +819,7 @@ void ScOutputData::DrawDocumentBackground() namespace { -static const double lclCornerRectTransparency = 40.0; +const double lclCornerRectTransparency = 40.0; void drawDataBars(vcl::RenderContext& rRenderContext, const ScDataBarInfo* pOldDataBarInfo, const tools::Rectangle& rRect, long nOneX, long nOneY) { diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx index 4d92510d3257..51339744bc98 100644 --- a/sc/source/ui/view/viewdata.cxx +++ b/sc/source/ui/view/viewdata.cxx @@ -727,7 +727,7 @@ ScSplitPos ScViewDataTable::SanitizeWhichActive() const return eWhichActive; } -static const ScSheetLimits gaNoShellSheetLimits(MAXCOL, MAXROW); +const ScSheetLimits gaNoShellSheetLimits(MAXCOL, MAXROW); ScViewData::ScViewData( ScDocShell* pDocSh, ScTabViewShell* pViewSh ) : nPPTX(0.0), |