mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upcoming improved loplugin:staticanonymous -> redundantstatic: dbaccess

Browse Source 
Change-Id: I49932a9d89d2933bebd313d3f1f64af84f0e52cf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97552
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Stephan Bergmann
2020-06-30 23:04:07 +02:00
parent b9127aa389
commit 4dfa47b25c
9 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
dbaccess/qa/unit/tdf119625.cxx
View File

@@ -52,9 +52,8 @@ struct expect_t
the level we are testing, this test will have to allow for or set the level we are testing, this test will have to allow for or set
the destination timezone. the destination timezone.
*/ */
static const expect_t expect[] const expect_t expect[] = { { 0, 15, 10, 10 }, { 1, 23, 30, 30 }, { 2, 5, 0, 0 }, { 3, 4, 30, 0 },
= { { 0, 15, 10, 10 }, { 1, 23, 30, 30 }, { 2, 5, 0, 0 }, { 3, 4, 30, 0 }, { 4, 3, 15, 10 }, { 5, 5, 0, 0 }, { 6, 3, 22, 22 } };
{ 4, 3, 15, 10 }, { 5, 5, 0, 0 }, { 6, 3, 22, 22 } };
void Tdf119625Test::testTime() void Tdf119625Test::testTime()
{ {

2
dbaccess/qa/unit/tdf126268.cxx
View File

@@ -44,7 +44,7 @@ struct expect_t
}; };
} }
static const expect_t expect[] = { const expect_t expect[] = {
{ 1, "0.00" }, { 2, "25.00" }, { 3, "26.00" }, { 4, "30.4" }, { 5, "45.8" }, { 1, "0.00" }, { 2, "25.00" }, { 3, "26.00" }, { 4, "30.4" }, { 5, "45.8" },
{ 6, "-25.00" }, { 7, "-26.00" }, { 8, "-30.4" }, { 9, "-45.8" }, { 6, "-25.00" }, { 7, "-26.00" }, { 8, "-30.4" }, { 9, "-45.8" },
}; };

2
dbaccess/source/core/dataaccess/databasedocument.cxx
View File

@@ -316,7 +316,7 @@ namespace
} }
} }
static const char sPictures[] = "Pictures"; const char sPictures[] = "Pictures";
// base documents seem to have a different behaviour to other documents, the // base documents seem to have a different behaviour to other documents, the
// root storage contents at least seem to be re-used over different saves, thus if there is a // root storage contents at least seem to be re-used over different saves, thus if there is a

4
dbaccess/source/core/recovery/dbdocrecovery.cxx
View File

@@ -86,9 +86,9 @@ namespace dbaccess
return true; return true;
} }
static const char sRecoveryDataSubStorageName[] = "recovery"; const char sRecoveryDataSubStorageName[] = "recovery";
static const char sObjectMapStreamName[] = "storage-component-map.ini"; const char sObjectMapStreamName[] = "storage-component-map.ini";
void lcl_writeObjectMap_throw( const Reference<XComponentContext> & i_rContext, const Reference< XStorage >& i_rStorage, void lcl_writeObjectMap_throw( const Reference<XComponentContext> & i_rContext, const Reference< XStorage >& i_rStorage,
const MapStringToCompDesc& i_mapStorageToCompDesc ) const MapStringToCompDesc& i_mapStorageToCompDesc )

2
dbaccess/source/core/recovery/storagetextstream.cxx
View File

@@ -36,7 +36,7 @@ namespace dbaccess
Reference< XTextOutputStream2 > xTextOutput; Reference< XTextOutputStream2 > xTextOutput;
}; };
static const char sLineFeed[] = "\n"; const char sLineFeed[] = "\n";
// StorageTextOutputStream // StorageTextOutputStream
StorageTextOutputStream::StorageTextOutputStream( const Reference<XComponentContext>& i_rContext, StorageTextOutputStream::StorageTextOutputStream( const Reference<XComponentContext>& i_rContext,

4
dbaccess/source/core/recovery/subcomponentrecovery.cxx
View File

@@ -160,8 +160,8 @@ namespace dbaccess
return xCommandProcessor; return xCommandProcessor;
} }
static const char sSettingsStreamName[] = "settings.xml"; const char sSettingsStreamName[] = "settings.xml";
static const char sCurrentQueryDesignName[] = "ooo:current-query-design"; const char sCurrentQueryDesignName[] = "ooo:current-query-design";
} }
namespace { namespace {

2
dbaccess/source/ui/dlg/indexfieldscontrol.cxx
View File

@@ -29,7 +29,7 @@
namespace dbaui namespace dbaui
{ {
static constexpr auto BROWSER_STANDARD_FLAGS = BrowserMode::COLUMNSELECTION | BrowserMode::HLINES | BrowserMode::VLINES | constexpr auto BROWSER_STANDARD_FLAGS = BrowserMode::COLUMNSELECTION | BrowserMode::HLINES | BrowserMode::VLINES |
BrowserMode::HIDECURSOR | BrowserMode::HIDESELECT | BrowserMode::AUTO_HSCROLL | BrowserMode::AUTO_VSCROLL; BrowserMode::HIDECURSOR | BrowserMode::HIDESELECT | BrowserMode::AUTO_HSCROLL | BrowserMode::AUTO_VSCROLL;
#define COLUMN_ID_FIELDNAME 1 #define COLUMN_ID_FIELDNAME 1

4
dbaccess/source/ui/querydesign/QueryDesignView.cxx
View File

@@ -65,8 +65,8 @@ using namespace ::com::sun::star::container;
// please look at the book LargeScale C++ to know why // please look at the book LargeScale C++ to know why
namespace namespace
{ {
static const char C_AND[] = " AND "; const char C_AND[] = " AND ";
static const char C_OR[] = " OR "; const char C_OR[] = " OR ";
bool InsertJoin( const OQueryDesignView* _pView, bool InsertJoin( const OQueryDesignView* _pView,
const ::connectivity::OSQLParseNode *pNode); const ::connectivity::OSQLParseNode *pNode);

2
dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
View File

@@ -2060,7 +2060,7 @@ long OSelectionBrowseBox::GetRealRow(long nRowId) const
return i; return i;
} }
static const long nVisibleRowMask[] = const long nVisibleRowMask[] =
{ {
0x0001, 0x0001,
0x0002, 0x0002,