diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2017-01-10 08:10:42 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2017-01-10 08:10:42 +0100 |
commit | 5637e56cc68b36c9a9484580e9053cca5c04a771 (patch) | |
tree | 0cc926f12e186b8d97f72d1e01b3b7f704d636d5 /sd | |
parent | 0999f6469ee5ce148f2f81b26fc703a3ff65a101 (diff) |
New loplugin:conststringvar: sd
Change-Id: I7aa74260f1456a22bae368738e3947ead1ecc7be
Diffstat (limited to 'sd')
-rw-r--r-- | sd/qa/unit/tiledrendering/tiledrendering.cxx | 2 | ||||
-rw-r--r-- | sd/source/filter/html/htmlex.cxx | 16 | ||||
-rw-r--r-- | sd/source/ui/remotecontrol/BluetoothServer.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/remotecontrol/BluetoothServiceRecord.hxx | 2 |
4 files changed, 11 insertions, 11 deletions
diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx b/sd/qa/unit/tiledrendering/tiledrendering.cxx index 7eb13a8e60f9..58dc9e62c802 100644 --- a/sd/qa/unit/tiledrendering/tiledrendering.cxx +++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx @@ -45,7 +45,7 @@ using namespace css; -static const char* DATA_DIRECTORY = "/sd/qa/unit/tiledrendering/data/"; +static const char* const DATA_DIRECTORY = "/sd/qa/unit/tiledrendering/data/"; class SdTiledRenderingTest : public SdModelTestBase, public XmlTestTools { diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx index 56fa1974d3c4..9c62a04d7a5c 100644 --- a/sd/source/filter/html/htmlex.cxx +++ b/sd/source/filter/html/htmlex.cxx @@ -2239,7 +2239,7 @@ OUString const & HtmlExport::getDocumentTitle() return mDocTitle; } -static const char* JS_NavigateAbs = +static const char JS_NavigateAbs[] = "function NavigateAbs( nPage )\r\n" "{\r\n" " frames[\"show\"].location.href = \"img\" + nPage + \".$EXT\";\r\n" @@ -2259,7 +2259,7 @@ static const char* JS_NavigateAbs = " }\r\n" "}\r\n\r\n"; -static const char* JS_NavigateRel = +static const char JS_NavigateRel[] = "function NavigateRel( nDelta )\r\n" "{\r\n" " var nPage = parseInt(nCurrentPage) + parseInt(nDelta);\r\n" @@ -2269,14 +2269,14 @@ static const char* JS_NavigateRel = " }\r\n" "}\r\n\r\n"; -static const char* JS_ExpandOutline = +static const char JS_ExpandOutline[] = "function ExpandOutline()\r\n" "{\r\n" " frames[\"navbar2\"].location.href = \"navbar4.$EXT\";\r\n" " frames[\"outline\"].location.href = \"outline1.$EXT\";\r\n" "}\r\n\r\n"; -static const char * JS_CollapseOutline = +static const char JS_CollapseOutline[] = "function CollapseOutline()\r\n" "{\r\n" " frames[\"navbar2\"].location.href = \"navbar3.$EXT\";\r\n" @@ -2304,7 +2304,7 @@ bool HtmlExport::CreateFrames() aStr.append(OUString::number(mnSdPageCount)); aStr.append(";\r\n\r\n"); - OUString aFunction = OUString::createFromAscii(JS_NavigateAbs); + OUString aFunction = JS_NavigateAbs; if(mbNotes) { @@ -2316,17 +2316,17 @@ bool HtmlExport::CreateFrames() aFunction = aFunction.replaceAll(aPlaceHolder, maHTMLExtension); aStr.append(aFunction); - aTmp = OUString::createFromAscii(JS_NavigateRel); + aTmp = JS_NavigateRel; aTmp = aTmp.replaceAll(aPlaceHolder, maHTMLExtension); aStr.append(aTmp); if(mbImpress) { - aTmp = OUString::createFromAscii(JS_ExpandOutline); + aTmp = JS_ExpandOutline; aTmp = aTmp.replaceAll(aPlaceHolder, maHTMLExtension); aStr.append(aTmp); - aTmp = OUString::createFromAscii(JS_CollapseOutline); + aTmp = JS_CollapseOutline; aTmp = aTmp.replaceAll(aPlaceHolder, maHTMLExtension); aStr.append(aTmp); } diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx index 30021606e989..d51591109f9d 100644 --- a/sd/source/ui/remotecontrol/BluetoothServer.cxx +++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx @@ -219,7 +219,7 @@ getBluez5Adapter(DBusConnection *pConnection) if (!pMsg) return nullptr; - const gchar* pInterfaceType = "org.bluez.Adapter1"; + const gchar* const pInterfaceType = "org.bluez.Adapter1"; pMsg = sendUnrefAndWaitForReply( pConnection, pMsg ); diff --git a/sd/source/ui/remotecontrol/BluetoothServiceRecord.hxx b/sd/source/ui/remotecontrol/BluetoothServiceRecord.hxx index d85f25771351..722f4f9d3d02 100644 --- a/sd/source/ui/remotecontrol/BluetoothServiceRecord.hxx +++ b/sd/source/ui/remotecontrol/BluetoothServiceRecord.hxx @@ -21,7 +21,7 @@ // for numbers see: // https://www.bluetooth.org/Technical/AssignedNumbers/service_discovery.htm -static const char *bluetooth_service_record = +static const char * const bluetooth_service_record = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" "<record>" "<attribute id=\"0x0001\">" // Service class ID list |