diff options
| -rw-r--r-- | comphelper/qa/container/comphelper_ifcontainer.cxx | 2 | ||||
| -rw-r--r-- | comphelper/source/misc/backupfilehelper.cxx | 4 | ||||
| -rw-r--r-- | comphelper/source/misc/numberedcollection.cxx | 2 | ||||
| -rw-r--r-- | comphelper/source/misc/simplefileaccessinteraction.cxx | 10 | ||||
| -rw-r--r-- | comphelper/source/misc/solarmutex.cxx | 2 | ||||
| -rw-r--r-- | comphelper/source/officeinstdir/officeinstallationdirectories.cxx | 4 | ||||
| -rw-r--r-- | comphelper/source/xml/ofopxmlhelper.cxx | 24 | ||||
| -rw-r--r-- | comphelper/source/xml/xmltools.cxx | 2 | ||||
| -rw-r--r-- | include/comphelper/parallelsort.hxx | 4 |
9 files changed, 27 insertions, 27 deletions
diff --git a/comphelper/qa/container/comphelper_ifcontainer.cxx b/comphelper/qa/container/comphelper_ifcontainer.cxx index 4d28c496fe2e..ed92aa692f4e 100644 --- a/comphelper/qa/container/comphelper_ifcontainer.cxx +++ b/comphelper/qa/container/comphelper_ifcontainer.cxx @@ -56,7 +56,7 @@ public: namespace comphelper_ifcontainer { - static const int nTests = 10; + const int nTests = 10; class IfTest : public CppUnit::TestFixture { osl::Mutex m_aGuard; diff --git a/comphelper/source/misc/backupfilehelper.cxx b/comphelper/source/misc/backupfilehelper.cxx index 6e21a27611c0..5d1262838011 100644 --- a/comphelper/source/misc/backupfilehelper.cxx +++ b/comphelper/source/misc/backupfilehelper.cxx @@ -48,7 +48,7 @@ using namespace comphelper; using namespace css; using namespace css::xml::dom; -static const sal_uInt32 BACKUP_FILE_HELPER_BLOCK_SIZE = 16384; +const sal_uInt32 BACKUP_FILE_HELPER_BLOCK_SIZE = 16384; namespace { @@ -353,7 +353,7 @@ namespace typedef std::vector< ExtensionInfoEntry > ExtensionInfoEntryVector; - static const OUStringLiteral gaRegPath { "/registry/com.sun.star.comp.deployment.bundle.PackageRegistryBackend/backenddb.xml" }; + const OUStringLiteral gaRegPath { "/registry/com.sun.star.comp.deployment.bundle.PackageRegistryBackend/backenddb.xml" }; class ExtensionInfo { diff --git a/comphelper/source/misc/numberedcollection.cxx b/comphelper/source/misc/numberedcollection.cxx index 20c1b7cf8754..c4ed3319d5c2 100644 --- a/comphelper/source/misc/numberedcollection.cxx +++ b/comphelper/source/misc/numberedcollection.cxx @@ -24,7 +24,7 @@ namespace comphelper{ -static const char ERRMSG_INVALID_COMPONENT_PARAM[] = "NULL as component reference not allowed."; +const char ERRMSG_INVALID_COMPONENT_PARAM[] = "NULL as component reference not allowed."; NumberedCollection::NumberedCollection() diff --git a/comphelper/source/misc/simplefileaccessinteraction.cxx b/comphelper/source/misc/simplefileaccessinteraction.cxx index 2d0cf5de5ca1..aaf9d280e7b7 100644 --- a/comphelper/source/misc/simplefileaccessinteraction.cxx +++ b/comphelper/source/misc/simplefileaccessinteraction.cxx @@ -19,15 +19,15 @@ namespace comphelper { /// Will handle com::sun::star::ucb::InteractiveIOException and derived classes -static const sal_Int32 HANDLE_INTERACTIVEIOEXCEPTION = 0; +const sal_Int32 HANDLE_INTERACTIVEIOEXCEPTION = 0; /// Will handle com::sun::star::ucb::UnsupportedDataSinkException -static const sal_Int32 HANDLE_UNSUPPORTEDDATASINKEXCEPTION = 1; +const sal_Int32 HANDLE_UNSUPPORTEDDATASINKEXCEPTION = 1; /// Will handle com::sun::star::ucb::InteractiveNetworkException -static const sal_Int32 HANDLE_INTERACTIVENETWORKEXCEPTION = 2; +const sal_Int32 HANDLE_INTERACTIVENETWORKEXCEPTION = 2; /// Will handle com::sun::star::ucb::CertificateValidationRequest -static const sal_Int32 HANDLE_CERTIFICATEREQUEST = 3; +const sal_Int32 HANDLE_CERTIFICATEREQUEST = 3; /// Will handle com::sun::star::ucb::AuthenticationRequest -static const sal_Int32 HANDLE_AUTHENTICATIONREQUEST = 4; +const sal_Int32 HANDLE_AUTHENTICATIONREQUEST = 4; SimpleFileAccessInteraction::SimpleFileAccessInteraction( const css::uno::Reference< css::task::XInteractionHandler >& xHandler ) diff --git a/comphelper/source/misc/solarmutex.cxx b/comphelper/source/misc/solarmutex.cxx index b9747dbac1b3..5d1052327154 100644 --- a/comphelper/source/misc/solarmutex.cxx +++ b/comphelper/source/misc/solarmutex.cxx @@ -28,7 +28,7 @@ namespace comphelper { namespace { - static SolarMutex* g_pSolarMutex = nullptr; + SolarMutex* g_pSolarMutex = nullptr; } SolarMutex *SolarMutex::get() diff --git a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx index b255fd3b9d44..4090fda37ada 100644 --- a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx +++ b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx @@ -75,8 +75,8 @@ static bool makeCanonicalFileURL( OUString & rURL ) namespace comphelper { -static OUString const g_aOfficeBrandDirMacro("$(brandbaseurl)"); -static OUString const g_aUserDirMacro("$(userdataurl)"); +OUString const g_aOfficeBrandDirMacro("$(brandbaseurl)"); +OUString const g_aUserDirMacro("$(userdataurl)"); OfficeInstallationDirectories::OfficeInstallationDirectories( const uno::Reference< uno::XComponentContext > & xCtx ) diff --git a/comphelper/source/xml/ofopxmlhelper.cxx b/comphelper/source/xml/ofopxmlhelper.cxx index 70df6fea96a6..8045f9b767b6 100644 --- a/comphelper/source/xml/ofopxmlhelper.cxx +++ b/comphelper/source/xml/ofopxmlhelper.cxx @@ -269,20 +269,20 @@ uno::Sequence< uno::Sequence< beans::StringPair > > ReadSequence_Impl( } // namespace OFOPXMLHelper // Relations info related strings -static OUString const g_aRelListElement("Relationships"); -static OUString const g_aRelElement( "Relationship" ); -static OUString const g_aIDAttr( "Id" ); -static OUString const g_aTypeAttr( "Type" ); -static OUString const g_aTargetModeAttr( "TargetMode" ); -static OUString const g_aTargetAttr( "Target" ); +OUString const g_aRelListElement("Relationships"); +OUString const g_aRelElement( "Relationship" ); +OUString const g_aIDAttr( "Id" ); +OUString const g_aTypeAttr( "Type" ); +OUString const g_aTargetModeAttr( "TargetMode" ); +OUString const g_aTargetAttr( "Target" ); // ContentType related strings -static OUString const g_aTypesElement( "Types" ); -static OUString const g_aDefaultElement( "Default" ); -static OUString const g_aOverrideElement( "Override" ); -static OUString const g_aExtensionAttr( "Extension" ); -static OUString const g_aPartNameAttr( "PartName" ); -static OUString const g_aContentTypeAttr( "ContentType" ); +OUString const g_aTypesElement( "Types" ); +OUString const g_aDefaultElement( "Default" ); +OUString const g_aOverrideElement( "Override" ); +OUString const g_aExtensionAttr( "Extension" ); +OUString const g_aPartNameAttr( "PartName" ); +OUString const g_aContentTypeAttr( "ContentType" ); OFOPXMLHelper_Impl::OFOPXMLHelper_Impl( sal_uInt16 nFormat ) : m_nFormat( nFormat ) diff --git a/comphelper/source/xml/xmltools.cxx b/comphelper/source/xml/xmltools.cxx index f506bc33affa..74ad5faa67e7 100644 --- a/comphelper/source/xml/xmltools.cxx +++ b/comphelper/source/xml/xmltools.cxx @@ -19,7 +19,7 @@ namespace //Will be inside an xml comment, so can't use '-' in case '--' appears in //output, etc. Despite what *is* legal in an xml comment, just using the //base-64 subset to avoid pain with simplistic third-party parsers - static const sal_uInt8 aChaffEncoder[] = + const sal_uInt8 aChaffEncoder[] = { 'A', 'Q', 'g', 'w', 'B', 'R', 'h', 'x', 'C', 'S', 'i', 'y', 'D', 'T', 'j', 'z', diff --git a/include/comphelper/parallelsort.hxx b/include/comphelper/parallelsort.hxx index d10519cf83ca..363cdd56ee0b 100644 --- a/include/comphelper/parallelsort.hxx +++ b/include/comphelper/parallelsort.hxx @@ -26,8 +26,8 @@ namespace comphelper { -static const size_t nThreadCountGlobal = std::thread::hardware_concurrency(); -const static bool bHyperThreadingActive = cpuid::hasHyperThreading(); +const size_t nThreadCountGlobal = std::thread::hardware_concurrency(); +const bool bHyperThreadingActive = cpuid::hasHyperThreading(); static comphelper::ThreadPool& rTPool(comphelper::ThreadPool::getSharedOptimalPool()); static thread_local std::mt19937 aGenerator{ std::random_device{}() }; |