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

[Stephan Bergmann (via logerrit)]

 ucb/source/cacher/cachedcontentresultset.cxx        |    8 ++---
 ucb/source/ucp/expand/ucpexpand.cxx                 |    2 -
 ucb/source/ucp/ext/ucpext_services.cxx              |    2 -
 ucb/source/ucp/file/filtask.cxx                     |   30 ++++++++++----------
 ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx    |    2 -
 ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx |   26 ++++++++---------
 6 files changed, 35 insertions(+), 35 deletions(-)

New commits:
commit bbb35541d8e0a2b041ed05ccb23307afa5371211
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Thu Jul 2 09:33:58 2020 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Thu Jul 2 13:45:13 2020 +0200

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

diff --git a/ucb/source/cacher/cachedcontentresultset.cxx b/ucb/source/cacher/cachedcontentresultset.cxx
index c947b128c3e1..cd22e829b7e1 100644
--- a/ucb/source/cacher/cachedcontentresultset.cxx
+++ b/ucb/source/cacher/cachedcontentresultset.cxx
@@ -410,10 +410,10 @@ public:
 };
 
 //some helping variables ( names for my special properties )
-static const char g_sPropertyNameForCount[] = "RowCount";
-static const char g_sPropertyNameForFinalCount[] = "IsRowCountFinal";
-static const char g_sPropertyNameForFetchSize[] = "FetchSize";
-static const char g_sPropertyNameForFetchDirection[] = "FetchDirection";
+const char g_sPropertyNameForCount[] = "RowCount";
+const char g_sPropertyNameForFinalCount[] = "IsRowCountFinal";
+const char g_sPropertyNameForFetchSize[] = "FetchSize";
+const char g_sPropertyNameForFetchDirection[] = "FetchDirection";
 
 CCRS_PropertySetInfo::CCRS_PropertySetInfo(
         Reference< XPropertySetInfo > const & xInfo )
diff --git a/ucb/source/ucp/expand/ucpexpand.cxx b/ucb/source/ucp/expand/ucpexpand.cxx
index 16bf38bbfa05..8cd7818d6037 100644
--- a/ucb/source/ucp/expand/ucpexpand.cxx
+++ b/ucb/source/ucp/expand/ucpexpand.cxx
@@ -204,7 +204,7 @@ sal_Int32 ExpandContentProviderImpl::compareContentIds(
     }
 }
 
-static const ::cppu::ImplementationEntry s_entries [] =
+const ::cppu::ImplementationEntry s_entries [] =
 {
     {
         create,
diff --git a/ucb/source/ucp/ext/ucpext_services.cxx b/ucb/source/ucp/ext/ucpext_services.cxx
index b7ffde3d1b31..0bce79e0d4ca 100644
--- a/ucb/source/ucp/ext/ucpext_services.cxx
+++ b/ucb/source/ucp/ext/ucpext_services.cxx
@@ -30,7 +30,7 @@ namespace ucb::ucp::ext
 
     //= descriptors for the services implemented in this component
 
-    static struct ::cppu::ImplementationEntry const s_aServiceEntries[] =
+    struct ::cppu::ImplementationEntry const s_aServiceEntries[] =
     {
         {
             ContentProvider::Create,
diff --git a/ucb/source/ucp/file/filtask.cxx b/ucb/source/ucp/file/filtask.cxx
index 8d839d726a57..b03f758ab038 100644
--- a/ucb/source/ucp/file/filtask.cxx
+++ b/ucb/source/ucp/file/filtask.cxx
@@ -116,21 +116,21 @@ TaskManager::MyProperty::MyProperty( bool                               theisNat
 
         // Default properties
 
-static const OUStringLiteral Title( "Title" );
-static const OUStringLiteral CasePreservingURL( "CasePreservingURL" );
-static const OUStringLiteral IsDocument( "IsDocument" );
-static const OUStringLiteral IsFolder( "IsFolder" );
-static const OUStringLiteral DateModified( "DateModified" );
-static const OUStringLiteral Size( "Size" );
-static const OUStringLiteral IsVolume( "IsVolume" );
-static const OUStringLiteral IsRemoveable( "IsRemoveable" );
-static const OUStringLiteral IsRemote( "IsRemote" );
-static const OUStringLiteral IsCompactDisc( "IsCompactDisc" );
-static const OUStringLiteral IsFloppy( "IsFloppy" );
-static const OUStringLiteral IsHidden( "IsHidden" );
-static const OUStringLiteral ContentType( "ContentType" );
-static const OUStringLiteral IsReadOnly( "IsReadOnly" );
-static const OUStringLiteral CreatableContentsInfo( "CreatableContentsInfo" );
+const OUStringLiteral Title( "Title" );
+const OUStringLiteral CasePreservingURL( "CasePreservingURL" );
+const OUStringLiteral IsDocument( "IsDocument" );
+const OUStringLiteral IsFolder( "IsFolder" );
+const OUStringLiteral DateModified( "DateModified" );
+const OUStringLiteral Size( "Size" );
+const OUStringLiteral IsVolume( "IsVolume" );
+const OUStringLiteral IsRemoveable( "IsRemoveable" );
+const OUStringLiteral IsRemote( "IsRemote" );
+const OUStringLiteral IsCompactDisc( "IsCompactDisc" );
+const OUStringLiteral IsFloppy( "IsFloppy" );
+const OUStringLiteral IsHidden( "IsHidden" );
+const OUStringLiteral ContentType( "ContentType" );
+const OUStringLiteral IsReadOnly( "IsReadOnly" );
+const OUStringLiteral CreatableContentsInfo( "CreatableContentsInfo" );
 const OUStringLiteral TaskManager::FolderContentType( "application/vnd.sun.staroffice.fsys-folder" );
 const OUStringLiteral TaskManager::FileContentType( "application/vnd.sun.staroffice.fsys-file" );
 
diff --git a/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx b/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx
index f0576e049aad..436f26dd93cf 100644
--- a/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx
+++ b/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx
@@ -44,7 +44,7 @@ using namespace com::sun::star;
 
 // DAVAuthListener_Impl Implementation.
 
-static constexpr sal_uInt32 g_nRedirectLimit = 5;
+constexpr sal_uInt32 g_nRedirectLimit = 5;
 
 // virtual
 int DAVAuthListener_Impl::authenticate(
diff --git a/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx b/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx
index 6a06f0dcb9ba..497c700ec04a 100644
--- a/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx
+++ b/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx
@@ -49,19 +49,19 @@ struct UCBDeadPropertyValueParseContext
 
 }
 
-static const char aTypeString[] = "string";
-static const char aTypeLong[] = "long";
-static const char aTypeShort[] = "short";
-static const char aTypeBoolean[] = "boolean";
-static const char aTypeChar[] = "char";
-static const char aTypeByte[] = "byte";
-static const char aTypeHyper[] = "hyper";
-static const char aTypeFloat[] = "float";
-static const char aTypeDouble[] = "double";
-
-static const char aXMLPre[] = "<ucbprop><type>";
-static const char aXMLMid[] = "</type><value>";
-static const char aXMLEnd[] = "</value></ucbprop>";
+const char aTypeString[] = "string";
+const char aTypeLong[] = "long";
+const char aTypeShort[] = "short";
+const char aTypeBoolean[] = "boolean";
+const char aTypeChar[] = "char";
+const char aTypeByte[] = "byte";
+const char aTypeHyper[] = "hyper";
+const char aTypeFloat[] = "float";
+const char aTypeDouble[] = "double";
+
+const char aXMLPre[] = "<ucbprop><type>";
+const char aXMLMid[] = "</type><value>";
+const char aXMLEnd[] = "</value></ucbprop>";
 
 
 #define STATE_TOP (1)