[Libreoffice-commits] core.git: sdext/source

Stephan Bergmann (via logerrit) logerrit at kemper.freedesktop.org
Thu Jul 2 05:10:15 UTC 2020 

 sdext/source/minimizer/pppoptimizertoken.cxx    |    2 -
 sdext/source/minimizer/pppoptimizeruno.cxx      |    2 -
 sdext/source/pdfimport/pdfparse/pdfentries.cxx  |    2 -
 sdext/source/pdfimport/tree/imagecontainer.cxx  |    2 -
 sdext/source/presenter/PresenterButton.cxx      |    4 +-
 sdext/source/presenter/PresenterComponent.cxx   |    2 -
 sdext/source/presenter/PresenterHelpView.cxx    |    6 ++--
 sdext/source/presenter/PresenterNotesView.cxx   |    6 ++--
 sdext/source/presenter/PresenterScrollBar.cxx   |    2 -
 sdext/source/presenter/PresenterSlideSorter.cxx |   36 ++++++++++++------------
 sdext/source/presenter/PresenterTextView.cxx    |    2 -
 sdext/source/presenter/PresenterToolBar.cxx     |    2 -
 12 files changed, 34 insertions(+), 34 deletions(-)

New commits:
commit 434391237010c94d54d89ad7f2ecef3638a772a0
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Wed Jul 1 21:31:12 2020 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Thu Jul 2 07:09:33 2020 +0200

    Upcoming improved loplugin:staticanonymous -> redundantstatic: sdext
    
    Change-Id: I767b6ca4bc2bfc3623aa2ba502f075bde1347df7
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97657
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/sdext/source/minimizer/pppoptimizertoken.cxx b/sdext/source/minimizer/pppoptimizertoken.cxx
index 255654838880..9a5c2eac9a62 100644
--- a/sdext/source/minimizer/pppoptimizertoken.cxx
+++ b/sdext/source/minimizer/pppoptimizertoken.cxx
@@ -42,7 +42,7 @@ struct TokenTable
 
 }
 
-static const TokenTable pTokenTableArray[] =
+const TokenTable pTokenTableArray[] =
 {
     { "rdmNavi",            TK_rdmNavi },
     { "btnNavBack",         TK_btnNavBack },
diff --git a/sdext/source/minimizer/pppoptimizeruno.cxx b/sdext/source/minimizer/pppoptimizeruno.cxx
index d972ab716060..da8745ef2c71 100644
--- a/sdext/source/minimizer/pppoptimizeruno.cxx
+++ b/sdext/source/minimizer/pppoptimizeruno.cxx
@@ -24,7 +24,7 @@
 namespace
 {
 
-static cppu::ImplementationEntry const services[] = {
+cppu::ImplementationEntry const services[] = {
     { &PPPOptimizerDialog_createInstance,
       &PPPOptimizerDialog_getImplementationName,
       &PPPOptimizerDialog_getSupportedServiceNames,
diff --git a/sdext/source/pdfimport/pdfparse/pdfentries.cxx b/sdext/source/pdfimport/pdfparse/pdfentries.cxx
index f8e24addeacb..e7fa4d511982 100644
--- a/sdext/source/pdfimport/pdfparse/pdfentries.cxx
+++ b/sdext/source/pdfimport/pdfparse/pdfentries.cxx
@@ -1093,7 +1093,7 @@ bool PDFFile::decrypt( const sal_uInt8* pInBuffer, sal_uInt32 nLen, sal_uInt8* p
     return aErr == rtl_Cipher_E_None;
 }
 
-static const sal_uInt8 nPadString[32] =
+const sal_uInt8 nPadString[32] =
 {
     0x28, 0xBF, 0x4E, 0x5E, 0x4E, 0x75, 0x8A, 0x41, 0x64, 0x00, 0x4E, 0x56, 0xFF, 0xFA, 0x01, 0x08,
     0x2E, 0x2E, 0x00, 0xB6, 0xD0, 0x68, 0x3E, 0x80, 0x2F, 0x0C, 0xA9, 0xFE, 0x64, 0x53, 0x69, 0x7A
diff --git a/sdext/source/pdfimport/tree/imagecontainer.cxx b/sdext/source/pdfimport/tree/imagecontainer.cxx
index 2be33dcede42..087849d6b5dc 100644
--- a/sdext/source/pdfimport/tree/imagecontainer.cxx
+++ b/sdext/source/pdfimport/tree/imagecontainer.cxx
@@ -36,7 +36,7 @@ namespace pdfi
 namespace
 {
 
-static const char aBase64EncodeTable[] =
+const char aBase64EncodeTable[] =
     { 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
       'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
       'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm',
diff --git a/sdext/source/presenter/PresenterButton.cxx b/sdext/source/presenter/PresenterButton.cxx
index 6c053a40e2ce..2f1a7767a57d 100644
--- a/sdext/source/presenter/PresenterButton.cxx
+++ b/sdext/source/presenter/PresenterButton.cxx
@@ -34,8 +34,8 @@ using namespace ::com::sun::star::uno;
 
 namespace sdext::presenter {
 
-const static double gnHorizontalBorder (15);
-const static double gnVerticalBorder (5);
+const double gnHorizontalBorder (15);
+const double gnVerticalBorder (5);
 
 ::rtl::Reference<PresenterButton> PresenterButton::Create (
     const css::uno::Reference<css::uno::XComponentContext>& rxComponentContext,
diff --git a/sdext/source/presenter/PresenterComponent.cxx b/sdext/source/presenter/PresenterComponent.cxx
index 943270928d9e..4d882526002d 100644
--- a/sdext/source/presenter/PresenterComponent.cxx
+++ b/sdext/source/presenter/PresenterComponent.cxx
@@ -30,7 +30,7 @@ using namespace osl;
 
 namespace sdext::presenter {
 
-static const struct ImplementationEntry gServiceEntries[] =
+const struct ImplementationEntry gServiceEntries[] =
 {
     {
         PresenterProtocolHandler::Create,
diff --git a/sdext/source/presenter/PresenterHelpView.cxx b/sdext/source/presenter/PresenterHelpView.cxx
index 3b7cfc4979b6..18fcb3d3c21b 100644
--- a/sdext/source/presenter/PresenterHelpView.cxx
+++ b/sdext/source/presenter/PresenterHelpView.cxx
@@ -41,9 +41,9 @@ using ::std::vector;
 namespace sdext::presenter {
 
 namespace {
-    const static sal_Int32 gnHorizontalGap (20);
-    const static sal_Int32 gnVerticalBorder (30);
-    const static sal_Int32 gnVerticalButtonPadding (12);
+    const sal_Int32 gnHorizontalGap (20);
+    const sal_Int32 gnVerticalBorder (30);
+    const sal_Int32 gnVerticalButtonPadding (12);
 
     class LineDescriptor
     {
diff --git a/sdext/source/presenter/PresenterNotesView.cxx b/sdext/source/presenter/PresenterNotesView.cxx
index f0c3d1eadde2..e042ae8f8965 100644
--- a/sdext/source/presenter/PresenterNotesView.cxx
+++ b/sdext/source/presenter/PresenterNotesView.cxx
@@ -42,9 +42,9 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::drawing::framework;
 
-static const sal_Int32 gnSpaceBelowSeparator (10);
-static const sal_Int32 gnSpaceAboveSeparator (10);
-static const double gnLineScrollFactor (1.2);
+const sal_Int32 gnSpaceBelowSeparator (10);
+const sal_Int32 gnSpaceAboveSeparator (10);
+const double gnLineScrollFactor (1.2);
 
 namespace sdext::presenter {
 
diff --git a/sdext/source/presenter/PresenterScrollBar.cxx b/sdext/source/presenter/PresenterScrollBar.cxx
index cb3efd61aed5..6aab45820c42 100644
--- a/sdext/source/presenter/PresenterScrollBar.cxx
+++ b/sdext/source/presenter/PresenterScrollBar.cxx
@@ -36,7 +36,7 @@
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 
-const static double gnScrollBarGap (10);
+const double gnScrollBarGap (10);
 
 namespace sdext::presenter {
 
diff --git a/sdext/source/presenter/PresenterSlideSorter.cxx b/sdext/source/presenter/PresenterSlideSorter.cxx
index ce687f8e9438..9762b7cd76cd 100644
--- a/sdext/source/presenter/PresenterSlideSorter.cxx
+++ b/sdext/source/presenter/PresenterSlideSorter.cxx
@@ -41,24 +41,24 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::drawing::framework;
 
 namespace {
-    const static sal_Int32 gnVerticalGap (10);
-    const static sal_Int32 gnVerticalBorder (10);
-    const static sal_Int32 gnHorizontalGap (10);
-    const static sal_Int32 gnHorizontalBorder (10);
-
-    const static double gnMinimalPreviewWidth (200);
-    const static double gnPreferredPreviewWidth (300);
-    const static double gnMaximalPreviewWidth (400);
-    const static sal_Int32 gnPreferredColumnCount (6);
-    const static double gnMinimalHorizontalPreviewGap(15);
-    const static double gnPreferredHorizontalPreviewGap(25);
-    const static double gnMaximalHorizontalPreviewGap(50);
-    const static double gnPreferredVerticalPreviewGap(25);
-
-    const static sal_Int32 gnHorizontalLabelBorder (3);
-    const static sal_Int32 gnHorizontalLabelPadding (5);
-
-    const static sal_Int32 gnVerticalButtonPadding (gnVerticalGap);
+    const sal_Int32 gnVerticalGap (10);
+    const sal_Int32 gnVerticalBorder (10);
+    const sal_Int32 gnHorizontalGap (10);
+    const sal_Int32 gnHorizontalBorder (10);
+
+    const double gnMinimalPreviewWidth (200);
+    const double gnPreferredPreviewWidth (300);
+    const double gnMaximalPreviewWidth (400);
+    const sal_Int32 gnPreferredColumnCount (6);
+    const double gnMinimalHorizontalPreviewGap(15);
+    const double gnPreferredHorizontalPreviewGap(25);
+    const double gnMaximalHorizontalPreviewGap(50);
+    const double gnPreferredVerticalPreviewGap(25);
+
+    const sal_Int32 gnHorizontalLabelBorder (3);
+    const sal_Int32 gnHorizontalLabelPadding (5);
+
+    const sal_Int32 gnVerticalButtonPadding (gnVerticalGap);
 }
 
 namespace sdext::presenter {
diff --git a/sdext/source/presenter/PresenterTextView.cxx b/sdext/source/presenter/PresenterTextView.cxx
index c6ef1a0c08bc..2acc432ee1fd 100644
--- a/sdext/source/presenter/PresenterTextView.cxx
+++ b/sdext/source/presenter/PresenterTextView.cxx
@@ -42,7 +42,7 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::accessibility;
 using namespace ::com::sun::star::uno;
 
-const static sal_Int64 CaretBlinkInterval = 500 * 1000 * 1000;
+const sal_Int64 CaretBlinkInterval = 500 * 1000 * 1000;
 
 //#define SHOW_CHARACTER_BOXES
 
diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx
index bd69a262ee59..e3f2d6da7cba 100644
--- a/sdext/source/presenter/PresenterToolBar.cxx
+++ b/sdext/source/presenter/PresenterToolBar.cxx
@@ -47,7 +47,7 @@ using namespace ::com::sun::star::drawing::framework;
 
 namespace sdext::presenter {
 
-static const sal_Int32 gnGapSize (20);
+const sal_Int32 gnGapSize (20);
 
 namespace {

More information about the Libreoffice-commits mailing list