filter/source/graphicfilter/icgm/cgm.cxx | 4 -
filter/source/msfilter/countryid.cxx | 2
filter/source/msfilter/dffpropset.cxx | 2
filter/source/msfilter/msdffimp.cxx | 2
filter/source/msfilter/services.cxx | 2
filter/source/msfilter/util.cxx | 6 +-
filter/source/storagefilterdetect/fdcomp.cxx | 2
filter/source/svg/svgexport.cxx | 22 ++++----
filter/source/svg/svgfilter.cxx | 4 -
filter/source/svg/svgfilter.hxx | 2
filter/source/svg/svgfontexport.cxx | 2
filter/source/svg/svgwriter.cxx | 74 +++++++++++++--------------
filter/source/xmlfilterdetect/fdcomp.cxx | 2
13 files changed, 63 insertions(+), 63 deletions(-)
New commits:
commit 38e5edbbb3625237a4859372a8112a43d45861f5
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Wed Jul 1 08:12:54 2020 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Wed Jul 1 09:47:53 2020 +0200
Upcoming improved loplugin:staticanonymous -> redundantstatic: filter
Change-Id: I345f4677b0ac32f8373fb13c6db07041247e3982
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97561
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/filter/source/graphicfilter/icgm/cgm.cxx
b/filter/source/graphicfilter/icgm/cgm.cxx
index c12ed6fa6625..b9736b610dc6 100644
--- a/filter/source/graphicfilter/icgm/cgm.cxx
+++ b/filter/source/graphicfilter/icgm/cgm.cxx
@@ -31,8 +31,8 @@
using namespace ::com::sun::star;
-static constexpr double gnOutdx = 28000; // Output size in
1/100TH mm
-static constexpr double gnOutdy = 21000; // on which is mapped
+constexpr double gnOutdx = 28000; // Output size in 1/100TH mm
+constexpr double gnOutdy = 21000; // on which is mapped
CGM::CGM(uno::Reference< frame::XModel > const & rModel)
: mnVDCXadd(0)
diff --git a/filter/source/msfilter/countryid.cxx
b/filter/source/msfilter/countryid.cxx
index 0e84e409b0d8..9ad504ab3272 100644
--- a/filter/source/msfilter/countryid.cxx
+++ b/filter/source/msfilter/countryid.cxx
@@ -71,7 +71,7 @@ struct CountryEntry
For now all entries are sorted by country ID, but this is not required.
*/
-static const CountryEntry pTable[] =
+const CountryEntry pTable[] =
{
{ COUNTRY_USA, LANGUAGE_ENGLISH_US,
false },
{ COUNTRY_DOMINICAN_REPUBLIC, LANGUAGE_SPANISH_DOMINICAN_REPUBLIC,
true },
diff --git a/filter/source/msfilter/dffpropset.cxx
b/filter/source/msfilter/dffpropset.cxx
index e5803046b4e4..e6ef672b0328 100644
--- a/filter/source/msfilter/dffpropset.cxx
+++ b/filter/source/msfilter/dffpropset.cxx
@@ -25,7 +25,7 @@
#include <rtl/ustrbuf.hxx>
#include <tools/stream.hxx>
-static const DffPropSetEntry mso_PropSetDefaults[] = {
+const DffPropSetEntry mso_PropSetDefaults[] = {
// 0
{ { false, false, false, false }, 0, 0 },
diff --git a/filter/source/msfilter/msdffimp.cxx
b/filter/source/msfilter/msdffimp.cxx
index aafb9d10755a..57f034e38870 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -6732,7 +6732,7 @@ struct ClsIDs {
}
-static const ClsIDs aClsIDs[] = {
+const ClsIDs aClsIDs[] = {
{ 0x000212F0, "MSWordArt", "Microsoft Word Art" },
{ 0x000212F0, "MSWordArt.2", "Microsoft Word Art 2.0" },
diff --git a/filter/source/msfilter/services.cxx
b/filter/source/msfilter/services.cxx
index 52b7f3d205d6..086a394d2b87 100644
--- a/filter/source/msfilter/services.cxx
+++ b/filter/source/msfilter/services.cxx
@@ -25,7 +25,7 @@ using namespace ::ooo::vba;
namespace {
-static ::cppu::ImplementationEntry const spServices[] =
+::cppu::ImplementationEntry const spServices[] =
{
{ VBAMacroResolver_createInstance, VBAMacroResolver_getImplementationName,
VBAMacroResolver_getSupportedServiceNames,
diff --git a/filter/source/msfilter/util.cxx b/filter/source/msfilter/util.cxx
index d5bee1968f88..279b9e6856bd 100644
--- a/filter/source/msfilter/util.cxx
+++ b/filter/source/msfilter/util.cxx
@@ -148,7 +148,7 @@ OString ConvertColor( const Color &rColor )
#define IN2MM100( v ) static_cast< sal_Int32 >( (v) * 2540.0 + 0.5 )
#define MM2MM100( v ) static_cast< sal_Int32 >( (v) * 100.0 + 0.5 )
-static const ApiPaperSize spPaperSizeTable[] =
+const ApiPaperSize spPaperSizeTable[] =
{
{ 0, 0 }, // 0 -
(undefined)
{ IN2MM100( 8.5 ), IN2MM100( 11 ) }, // 1 - Letter
paper
@@ -565,7 +565,7 @@ struct CustomShapeTypeTranslationTable
}
-static const CustomShapeTypeTranslationTable
pCustomShapeTypeTranslationTable[] =
+const CustomShapeTypeTranslationTable pCustomShapeTypeTranslationTable[] =
{
// { "non-primitive", mso_sptMin },
{ "frame", "frame" },
@@ -960,7 +960,7 @@ static const CustomShapeTypeTranslationTable
pCustomShapeTypeTranslationTable[]
{ "ooxml-rect", "rect" },
};
-static struct {
+struct {
const char* sDML;
MSO_SPT nVML;
} const pDMLToVMLTable[] = {
diff --git a/filter/source/storagefilterdetect/fdcomp.cxx
b/filter/source/storagefilterdetect/fdcomp.cxx
index 9a281e540efb..6649603f1823 100644
--- a/filter/source/storagefilterdetect/fdcomp.cxx
+++ b/filter/source/storagefilterdetect/fdcomp.cxx
@@ -17,7 +17,7 @@
namespace {
-static cppu::ImplementationEntry const services[] = {
+cppu::ImplementationEntry const services[] = {
{ &StorageFilterDetect_createInstance,
&StorageFilterDetect_getImplementationName,
&StorageFilterDetect_getSupportedServiceNames,
&cppu::createSingleComponentFactory, nullptr, 0 },
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index 556c3869fa77..e07ce224c1ea 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -81,23 +81,23 @@ using namespace ::xmloff::token;
#define SVG_PROP_POSITIONED_CHARACTERS "UsePositionedCharacters"
// ooo xml elements
-static const char aOOOElemTextField[] = NSPREFIX "text_field";
+const char aOOOElemTextField[] = NSPREFIX "text_field";
// ooo xml attributes for meta_slide
-static const char aOOOAttrSlide[] = NSPREFIX "slide";
-static const char aOOOAttrMaster[] = NSPREFIX "master";
-static const char aOOOAttrBackgroundVisibility[] = NSPREFIX
"background-visibility";
-static const char aOOOAttrMasterObjectsVisibility[] = NSPREFIX
"master-objects-visibility";
-static const char aOOOAttrSlideDuration[] = NSPREFIX "slide-duration";
-static const OUString aOOOAttrDateTimeField = NSPREFIX "date-time-field";
-static const char aOOOAttrFooterField[] = NSPREFIX "footer-field";
-static const char aOOOAttrHasTransition[] = NSPREFIX "has-transition";
+const char aOOOAttrSlide[] = NSPREFIX "slide";
+const char aOOOAttrMaster[] = NSPREFIX "master";
+const char aOOOAttrBackgroundVisibility[] = NSPREFIX
"background-visibility";
+const char aOOOAttrMasterObjectsVisibility[] = NSPREFIX
"master-objects-visibility";
+const char aOOOAttrSlideDuration[] = NSPREFIX "slide-duration";
+const OUString aOOOAttrDateTimeField = NSPREFIX "date-time-field";
+const char aOOOAttrFooterField[] = NSPREFIX "footer-field";
+const char aOOOAttrHasTransition[] = NSPREFIX "has-transition";
// ooo xml attributes for pages and shapes
-static const char aOOOAttrName[] = NSPREFIX "name";
+const char aOOOAttrName[] = NSPREFIX "name";
-static const char constSvgNamespace[] = "http://www.w3.org/2000/svg";;
+const char constSvgNamespace[] = "http://www.w3.org/2000/svg";;
/** Text Field Class Hierarchy
diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx
index 7808b633b74e..1757fa42f758 100644
--- a/filter/source/svg/svgfilter.cxx
+++ b/filter/source/svg/svgfilter.cxx
@@ -64,8 +64,8 @@ using namespace ::com::sun::star;
namespace
{
- static const char constFilterNameDraw[] =
"svg_Scalable_Vector_Graphics_Draw";
- static const char constFilterName[] = "svg_Scalable_Vector_Graphics";
+ const char constFilterNameDraw[] = "svg_Scalable_Vector_Graphics_Draw";
+ const char constFilterName[] = "svg_Scalable_Vector_Graphics";
}
SVGFilter::SVGFilter( const Reference< XComponentContext >& rxCtx ) :
diff --git a/filter/source/svg/svgfilter.hxx b/filter/source/svg/svgfilter.hxx
index b939cb95715f..6ad17b1f6732 100644
--- a/filter/source/svg/svgfilter.hxx
+++ b/filter/source/svg/svgfilter.hxx
@@ -53,7 +53,7 @@ using namespace ::com::sun::star::xml::sax;
// Placeholder tag used into the ImplWriteActions method to filter text
placeholder fields
-static const OUString sPlaceholderTag( "<[:isPlaceholder:]>" );
+const OUString sPlaceholderTag( "<[:isPlaceholder:]>" );
class SVGExport : public SvXMLExport
{
diff --git a/filter/source/svg/svgfontexport.cxx
b/filter/source/svg/svgfontexport.cxx
index a8c88dc8b307..dcaac5043fb8 100644
--- a/filter/source/svg/svgfontexport.cxx
+++ b/filter/source/svg/svgfontexport.cxx
@@ -33,7 +33,7 @@
#include <com/sun/star/i18n/CharacterIteratorMode.hpp>
#include <com/sun/star/i18n/XBreakIterator.hpp>
-static const sal_Int32 nFontEM = 2048;
+const sal_Int32 nFontEM = 2048;
SVGFontExport::SVGFontExport( SVGExport& rExport, const ::std::vector<
ObjectRepresentation >& rObjects ) :
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index c4337927846e..4baddb4743e9 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -47,43 +47,43 @@
#include <memory>
-static const char aPrefixClipPathId[] = "clip_path_";
-
-static const char aXMLElemG[] = "g";
-static const char aXMLElemDefs[] = "defs";
-static const char aXMLElemText[] = "text";
-static const char aXMLElemTspan[] = "tspan";
-static const char aXMLElemLinearGradient[] = "linearGradient";
-static const char aXMLElemStop[] = "stop";
-
-static const char aXMLAttrTransform[] = "transform";
-static const char aXMLAttrStyle[] = "style";
-static const char aXMLAttrId[] = "id";
-static const char aXMLAttrX[] = "x";
-static const char aXMLAttrY[] = "y";
-static const char aXMLAttrX1[] = "x1";
-static const char aXMLAttrY1[] = "y1";
-static const char aXMLAttrX2[] = "x2";
-static const char aXMLAttrY2[] = "y2";
-static const char aXMLAttrCX[] = "cx";
-static const char aXMLAttrCY[] = "cy";
-static const char aXMLAttrRX[] = "rx";
-static const char aXMLAttrRY[] = "ry";
-static const char aXMLAttrWidth[] = "width";
-static const char aXMLAttrHeight[] = "height";
-static const char aXMLAttrStrokeWidth[] = "stroke-width";
-static const char aXMLAttrFill[] = "fill";
-static const char aXMLAttrFontFamily[] = "font-family";
-static const char aXMLAttrFontSize[] = "font-size";
-static const char aXMLAttrFontStyle[] = "font-style";
-static const char aXMLAttrFontWeight[] = "font-weight";
-static const char aXMLAttrTextDecoration[] = "text-decoration";
-static const char aXMLAttrXLinkHRef[] = "xlink:href";
-static const char aXMLAttrGradientUnits[] = "gradientUnits";
-static const char aXMLAttrOffset[] = "offset";
-static const char aXMLAttrStopColor[] = "stop-color";
-static const char aXMLAttrStrokeLinejoin[] = "stroke-linejoin";
-static const char aXMLAttrStrokeLinecap[] = "stroke-linecap";
+const char aPrefixClipPathId[] = "clip_path_";
+
+const char aXMLElemG[] = "g";
+const char aXMLElemDefs[] = "defs";
+const char aXMLElemText[] = "text";
+const char aXMLElemTspan[] = "tspan";
+const char aXMLElemLinearGradient[] = "linearGradient";
+const char aXMLElemStop[] = "stop";
+
+const char aXMLAttrTransform[] = "transform";
+const char aXMLAttrStyle[] = "style";
+const char aXMLAttrId[] = "id";
+const char aXMLAttrX[] = "x";
+const char aXMLAttrY[] = "y";
+const char aXMLAttrX1[] = "x1";
+const char aXMLAttrY1[] = "y1";
+const char aXMLAttrX2[] = "x2";
+const char aXMLAttrY2[] = "y2";
+const char aXMLAttrCX[] = "cx";
+const char aXMLAttrCY[] = "cy";
+const char aXMLAttrRX[] = "rx";
+const char aXMLAttrRY[] = "ry";
+const char aXMLAttrWidth[] = "width";
+const char aXMLAttrHeight[] = "height";
+const char aXMLAttrStrokeWidth[] = "stroke-width";
+const char aXMLAttrFill[] = "fill";
+const char aXMLAttrFontFamily[] = "font-family";
+const char aXMLAttrFontSize[] = "font-size";
+const char aXMLAttrFontStyle[] = "font-style";
+const char aXMLAttrFontWeight[] = "font-weight";
+const char aXMLAttrTextDecoration[] = "text-decoration";
+const char aXMLAttrXLinkHRef[] = "xlink:href";
+const char aXMLAttrGradientUnits[] = "gradientUnits";
+const char aXMLAttrOffset[] = "offset";
+const char aXMLAttrStopColor[] = "stop-color";
+const char aXMLAttrStrokeLinejoin[] = "stroke-linejoin";
+const char aXMLAttrStrokeLinecap[] = "stroke-linecap";
PushFlags SVGContextHandler::getPushFlags() const
diff --git a/filter/source/xmlfilterdetect/fdcomp.cxx
b/filter/source/xmlfilterdetect/fdcomp.cxx
index 1cbec9680402..de4cbf5f41af 100644
--- a/filter/source/xmlfilterdetect/fdcomp.cxx
+++ b/filter/source/xmlfilterdetect/fdcomp.cxx
@@ -27,7 +27,7 @@
namespace {
-static cppu::ImplementationEntry const services[] = {
+cppu::ImplementationEntry const services[] = {
{ &FilterDetect_createInstance, &FilterDetect_getImplementationName,
&FilterDetect_getSupportedServiceNames,
&cppu::createSingleComponentFactory, nullptr, 0 },
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
