[Libreoffice-commits] core.git: compilerplugins/clang filter/source framework/inc framework/source xmlhelp/source

Noel Grandin (via logerrit) logerrit at kemper.freedesktop.org
Mon Sep 7 20:16:10 UTC 2020


 compilerplugins/clang/singlevalfields.could-be-bool.results |    2 
 compilerplugins/clang/singlevalfields.results               |  138 ++++++++----
 filter/source/xsltdialog/xmlfilterjar.cxx                   |    3 
 filter/source/xsltdialog/xmlfilterjar.hxx                   |    3 
 framework/inc/xml/saxnamespacefilter.hxx                    |    4 
 framework/source/fwe/xml/saxnamespacefilter.cxx             |    8 
 xmlhelp/source/cxxhelp/inc/tvread.hxx                       |    1 
 xmlhelp/source/cxxhelp/provider/databases.cxx               |   17 -
 xmlhelp/source/cxxhelp/provider/databases.hxx               |    2 
 xmlhelp/source/treeview/tvread.cxx                          |   11 
 10 files changed, 124 insertions(+), 65 deletions(-)

New commits:
commit db37d8b625807103c95326286ff085f79bf3d971
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Mon Sep 7 15:27:11 2020 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Mon Sep 7 22:15:23 2020 +0200

    loplugin:singlevalfields
    
    Change-Id: Ib3c8dc4e98ca46026ec9a8171bae4066bcec7b22
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102176
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/compilerplugins/clang/singlevalfields.could-be-bool.results b/compilerplugins/clang/singlevalfields.could-be-bool.results
index 43891ddc59f8..50576deb04e7 100644
--- a/compilerplugins/clang/singlevalfields.could-be-bool.results
+++ b/compilerplugins/clang/singlevalfields.could-be-bool.results
@@ -1,4 +1,4 @@
-chart2/source/view/inc/PlottingPositionHelper.hxx:206
+chart2/source/view/inc/PlottingPositionHelper.hxx:205
     chart::PolarPlottingPositionHelper m_fRadiusOffset
     double
 connectivity/source/inc/dbase/dindexnode.hxx:120
diff --git a/compilerplugins/clang/singlevalfields.results b/compilerplugins/clang/singlevalfields.results
index dc00798c88b6..54d8292cf9d3 100644
--- a/compilerplugins/clang/singlevalfields.results
+++ b/compilerplugins/clang/singlevalfields.results
@@ -10,31 +10,31 @@ avmedia/source/framework/soundhandler.hxx:114
 basctl/source/basicide/baside2.hxx:83
     basctl::EditorWindow aHighlighter
     0
-basctl/source/inc/dlged.hxx:132
+basctl/source/inc/dlged.hxx:131
     basctl::DlgEditor aMarkIdle
     basctl DlgEditor Mark
-binaryurp/source/proxy.hxx:81
+binaryurp/source/proxy.hxx:80
     binaryurp::Proxy references_
     1
-binaryurp/source/writerstate.hxx:41
+binaryurp/source/writerstate.hxx:40
     binaryurp::WriterState typeCache
     256
-binaryurp/source/writerstate.hxx:43
+binaryurp/source/writerstate.hxx:42
     binaryurp::WriterState oidCache
     256
-binaryurp/source/writerstate.hxx:45
+binaryurp/source/writerstate.hxx:44
     binaryurp::WriterState tidCache
     256
-bridges/inc/bridge.hxx:90
+bridges/inc/bridge.hxx:89
     bridges::cpp_uno::shared::Bridge nRef
     1
-bridges/inc/cppinterfaceproxy.hxx:83
+bridges/inc/cppinterfaceproxy.hxx:82
     bridges::cpp_uno::shared::CppInterfaceProxy nRef
     1
-bridges/inc/unointerfaceproxy.hxx:84
+bridges/inc/unointerfaceproxy.hxx:83
     bridges::cpp_uno::shared::UnoInterfaceProxy nRef
     1
-bridges/source/jni_uno/jni_bridge.h:53
+bridges/source/jni_uno/jni_bridge.h:52
     jni_uno::Bridge m_ref
     1
 bridges/source/jni_uno/jni_uno2java.cxx:391
@@ -55,19 +55,19 @@ canvas/inc/rendering/irendermodule.hxx:37
 chart2/source/controller/dialogs/DataBrowser.cxx:209
     chart::impl::SeriesHeader m_aUpdateDataTimer
     UpdateDataTimer
-chart2/source/controller/inc/ChartController.hxx:378
+chart2/source/controller/inc/ChartController.hxx:377
     chart::ChartController m_aLifeTimeManager
     0
-chart2/source/controller/inc/TitleDialogData.hxx:34
+chart2/source/controller/inc/TitleDialogData.hxx:33
     chart::TitleDialogData aPossibilityList
     7
-chart2/source/controller/inc/TitleDialogData.hxx:35
+chart2/source/controller/inc/TitleDialogData.hxx:34
     chart::TitleDialogData aExistenceList
     7
-chart2/source/controller/inc/TitleDialogData.hxx:36
+chart2/source/controller/inc/TitleDialogData.hxx:35
     chart::TitleDialogData aTextList
     7
-chart2/source/model/main/DataPoint.hxx:108
+chart2/source/model/main/DataPoint.hxx:107
     chart::DataPoint m_bNoParentPropAllowed
     0
 comphelper/source/misc/threadpool.cxx:40
@@ -112,10 +112,10 @@ cppu/source/uno/copy.hxx:39
 cui/source/inc/acccfg.hxx:100
     SfxAcceleratorConfigPage m_aUpdateDataTimer
     UpdateDataTimer
-cui/source/inc/AdditionsDialog.hxx:58
+cui/source/inc/AdditionsDialog.hxx:69
     AdditionsDialog m_aSearchDataTimer
     SearchDataTimer
-cui/source/inc/cfg.hxx:375
+cui/source/inc/cfg.hxx:371
     SvxConfigPage m_aUpdateDataTimer
     UpdateDataTimer
 cui/source/inc/linkdlg.hxx:46
@@ -178,6 +178,12 @@ filter/source/msfilter/msdffimp.cxx:2630
 filter/source/msfilter/viscache.hxx:30
     Impl_OlePres nFormat
     3
+filter/source/xsltdialog/xmlfilterjar.hxx:47
+    XMLFilterJarHelper sVndSunStarPackage
+    vnd.sun.star.Package:
+framework/inc/xml/saxnamespacefilter.hxx:74
+    framework::SaxNamespaceFilter m_aXMLAttributeNamespace
+    xmlns
 framework/source/services/autorecovery.cxx:398
     (anonymous namespace)::AutoRecovery m_aTimer
     Auto save timer
@@ -355,6 +361,12 @@ io/qa/textinputstream.cxx:97
 libreofficekit/source/gtk/lokdocview.cxx:86
     (anonymous namespace)::LOKDocViewPrivateImpl m_bIsLoading
     0
+odk/source/unoapploader/unx/unoapploader.c:39
+    /home/noel/libo2/odk/source/unoapploader/unx/unoapploader.c PATHSEPARATOR
+    :
+odk/source/unoapploader/unx/unoapploader.c:81
+    main ENVVARNAME
+    LD_LIBRARY_PATH
 oox/source/core/contexthandler2.cxx:36
     oox::core::ElementInfo maChars
     0
@@ -382,6 +394,9 @@ sal/osl/unx/sockimpl.hxx:39
 sal/qa/osl/condition/osl_Condition_Const.h:41
     /home/noel/libo2/sal/qa/osl/condition/osl_Condition.cxx aTestCon
     testcondition
+sal/qa/osl/file/osl_File_Const.h:115
+    extern aPreURL
+    file:///
 sal/qa/osl/file/osl_File_Const.h:128
     extern aCanURL3
     ca@#;+.,$//tmp/678nonical//name
@@ -448,6 +463,24 @@ sal/qa/rtl/process/rtl_Process_Const.h:33
 sal/qa/rtl/strings/test_ostring_stringliterals.cxx:22
     /home/noel/libo2/sal/qa/rtl/strings/test_ostring_stringliterals.cxx rtl_string_unittest_non_const_literal_function
     0
+sal/qa/rtl/strings/test_strings_replace.cxx:24
+    (anonymous) s_bar
+    bar
+sal/qa/rtl/strings/test_strings_replace.cxx:25
+    (anonymous) s_bars
+    bars
+sal/qa/rtl/strings/test_strings_replace.cxx:26
+    (anonymous) s_foo
+    foo
+sal/qa/rtl/strings/test_strings_replace.cxx:27
+    (anonymous) s_other
+    other
+sal/qa/rtl/strings/test_strings_replace.cxx:28
+    (anonymous) s_xa
+    xa
+sal/qa/rtl/strings/test_strings_replace.cxx:29
+    (anonymous) s_xx
+    xx
 sax/source/tools/fastserializer.hxx:231
     sax_fastparser::FastSaxSerializer mbXescape
     1
@@ -553,10 +586,10 @@ sd/source/ui/inc/DrawController.hxx:292
 sd/source/ui/inc/pubdlg.hxx:151
     SdPublishingDlg aAssistentFunc
     6
-sd/source/ui/inc/View.hxx:240
+sd/source/ui/inc/View.hxx:263
     sd::View maDropErrorIdle
     sd View DropError
-sd/source/ui/inc/View.hxx:241
+sd/source/ui/inc/View.hxx:264
     sd::View maDropInsertFileIdle
     sd View DropInsertFile
 sd/source/ui/inc/ViewTabBar.hxx:146
@@ -580,7 +613,7 @@ sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx:92
 sdext/source/pdfimport/pdfparse/pdfparse.cxx:60
     (anonymous namespace)::StringEmitContext m_aBuf
     256
-sfx2/inc/autoredactdialog.hxx:104
+sfx2/inc/autoredactdialog.hxx:97
     SfxAutoRedactDialog m_bIsValidState
     1
 sfx2/source/appl/lnkbase2.cxx:79
@@ -592,16 +625,16 @@ sfx2/source/appl/lnkbase2.cxx:84
 sfx2/source/appl/lnkbase2.cxx:103
     sfx2::(anonymous namespace)::ImplDdeItem bIsInDTOR
     1
-sfx2/source/appl/newhelp.hxx:97
+sfx2/source/appl/newhelp.hxx:93
     IndexTabPage_Impl aFactoryIdle
     sfx2 appl IndexTabPage_Impl Factory
-sfx2/source/appl/newhelp.hxx:98
+sfx2/source/appl/newhelp.hxx:94
     IndexTabPage_Impl aAutoCompleteIdle
     sfx2 appl IndexTabPage_Impl AutoComplete
-sfx2/source/appl/newhelp.hxx:235
+sfx2/source/appl/newhelp.hxx:226
     SfxHelpIndexWindow_Impl aIdle
     sfx2 appl SfxHelpIndexWindow_Impl
-sfx2/source/appl/newhelp.hxx:355
+sfx2/source/appl/newhelp.hxx:346
     SfxHelpTextWindow_Impl aSelectIdle
     sfx2 appl SfxHelpTextWindow_Impl Select
 sfx2/source/control/itemdel.cxx:31
@@ -745,7 +778,7 @@ sw/inc/view.hxx:696
 sw/inc/viewopt.hxx:193
     SwViewOption m_bTest10
     0
-sw/source/core/bastyp/calc.cxx:94
+sw/source/core/bastyp/calc.cxx:99
     CalcOp eOp
     0
 sw/source/core/doc/docredln.cxx:64
@@ -907,10 +940,10 @@ sw/source/filter/ww8/ww8scan.hxx:1509
 sw/source/filter/ww8/ww8scan.hxx:1514
     WW8Fib m_lcbHplxsdr
     0
-sw/source/filter/ww8/ww8struc.hxx:532
+sw/source/filter/ww8/ww8struc.hxx:542
     WW8_TCell fUnused
     0
-sw/source/filter/ww8/ww8struc.hxx:889
+sw/source/filter/ww8/ww8struc.hxx:899
     WW8_TablePos nSp37
     2
 sw/source/ui/envelp/labfmt.hxx:69
@@ -979,9 +1012,6 @@ vcl/inc/salwtype.hxx:162
 vcl/inc/svdata.hxx:315
     ImplSVNWFData mbMenuBarDockingAreaCommonBG
     0
-vcl/inc/svimpbox.hxx:128
-    SvImpLBox m_bContextMenuHandling
-    0
 vcl/source/bitmap/bitmap.cxx:140
     Bitmap::~Bitmap save
     0
@@ -991,16 +1021,16 @@ vcl/source/bitmap/BitmapTools.cxx:1059
 vcl/source/bitmap/BitmapTools.cxx:1075
     vcl::bitmap::get_premultiply_table inited
     1
-vcl/source/control/imivctl.hxx:120
+vcl/source/control/imivctl.hxx:119
     SvxIconChoiceCtrl_Impl aAutoArrangeIdle
     svtools contnr SvxIconChoiceCtrl_Impl AutoArrange
-vcl/source/control/imivctl.hxx:121
+vcl/source/control/imivctl.hxx:120
     SvxIconChoiceCtrl_Impl aDocRectChangedIdle
     svtools contnr SvxIconChoiceCtrl_Impl DocRectChanged
-vcl/source/control/imivctl.hxx:122
+vcl/source/control/imivctl.hxx:121
     SvxIconChoiceCtrl_Impl aVisRectChangedIdle
     svtools contnr SvxIconChoiceCtrl_Impl VisRectChanged
-vcl/source/control/imivctl.hxx:123
+vcl/source/control/imivctl.hxx:122
     SvxIconChoiceCtrl_Impl aCallSelectHdlIdle
     svtools contnr SvxIconChoiceCtrl_Impl CallSelectHdl
 vcl/source/control/roadmapwizard.cxx:60
@@ -1075,16 +1105,16 @@ vcl/source/gdi/dibtools.cxx:120
 vcl/source/gdi/pdfwriter_impl.hxx:756
     vcl::PDFWriterImpl m_DocDigest
     0
-vcl/source/outdev/bitmap.cxx:1243
+vcl/source/outdev/bitmap.cxx:1247
     OutputDevice::DrawTransformedBitmapEx bAllowPreferDirectPaint
     1
 vcl/unx/gtk3/a11y/gtk3atkutil.cxx:694
     ooo_atk_util_ensure_event_listener bInited
     1
-vcl/unx/gtk3/gtk3gtkinst.cxx:15466
+vcl/unx/gtk3/gtk3gtkinst.cxx:15506
     (anonymous namespace)::ensure_intercept_drawing_area_accessibility bDone
     1
-vcl/unx/gtk3/gtk3gtkinst.cxx:15494
+vcl/unx/gtk3/gtk3gtkinst.cxx:15534
     (anonymous namespace)::ensure_disable_ctrl_page_up_down_bindings bDone
     1
 workdir/LexTarget/l10ntools/source/xrmlex.cxx:706
@@ -1111,6 +1141,42 @@ writerfilter/source/rtftok/rtftokenizer.hxx:61
 writerfilter/source/rtftok/rtftokenizer.hxx:64
     writerfilter::rtftok::RTFTokenizer s_bMathControlWordsSorted
     1
+xmlhelp/source/cxxhelp/inc/tvread.hxx:49
+    treeview::ConfigData prodName
+    %PRODUCTNAME
+xmlhelp/source/cxxhelp/inc/tvread.hxx:49
+    treeview::ConfigData vendName
+    %VENDORNAME
+xmlhelp/source/cxxhelp/inc/tvread.hxx:49
+    treeview::ConfigData vendVersion
+    %VENDORVERSION
+xmlhelp/source/cxxhelp/inc/tvread.hxx:49
+    treeview::ConfigData vendShort
+    %VENDORSHORT
+xmlhelp/source/cxxhelp/inc/tvread.hxx:49
+    treeview::ConfigData prodVersion
+    %PRODUCTVERSION
+xmlhelp/source/cxxhelp/provider/databases.hxx:243
+    chelp::Databases newProdName
+    $[officename]
+xmlhelp/source/cxxhelp/provider/databases.hxx:243
+    chelp::Databases newProdVersion
+    $[officeversion]
+xmlhelp/source/cxxhelp/provider/databases.hxx:244
+    chelp::Databases prodName
+    %PRODUCTNAME
+xmlhelp/source/cxxhelp/provider/databases.hxx:244
+    chelp::Databases vendShort
+    %VENDORSHORT
+xmlhelp/source/cxxhelp/provider/databases.hxx:244
+    chelp::Databases prodVersion
+    %PRODUCTVERSION
+xmlhelp/source/cxxhelp/provider/databases.hxx:244
+    chelp::Databases vendName
+    %VENDORNAME
+xmlhelp/source/cxxhelp/provider/databases.hxx:244
+    chelp::Databases vendVersion
+    %VENDORVERSION
 xmloff/source/text/XMLIndexTemplateContext.hxx:57
     /home/noel/libo2/xmloff/source/text/XMLIndexTemplateContext.cxx aLevelNameTableMap
     0
diff --git a/filter/source/xsltdialog/xmlfilterjar.cxx b/filter/source/xsltdialog/xmlfilterjar.cxx
index fa8690824d3f..7bc05b27e093 100644
--- a/filter/source/xsltdialog/xmlfilterjar.cxx
+++ b/filter/source/xsltdialog/xmlfilterjar.cxx
@@ -59,9 +59,10 @@ using namespace com::sun::star::io;
 
 using ::rtl::Uri;
 
+const OUStringLiteral sVndSunStarPackage(u"vnd.sun.star.Package:");
+
 XMLFilterJarHelper::XMLFilterJarHelper( const Reference< XComponentContext >& rxContext )
 : mxContext( rxContext ),
-    sVndSunStarPackage( "vnd.sun.star.Package:" ),
     sXSLTPath( "$(user)/xslt/" ),
     sTemplatePath( "$(user)/template/" ),
     sProgPath( "$(prog)/" )
diff --git a/filter/source/xsltdialog/xmlfilterjar.hxx b/filter/source/xsltdialog/xmlfilterjar.hxx
index da081387a181..7e469fb202fb 100644
--- a/filter/source/xsltdialog/xmlfilterjar.hxx
+++ b/filter/source/xsltdialog/xmlfilterjar.hxx
@@ -39,12 +39,11 @@ private:
     /// @throws css::uno::Exception
     void addFile( css::uno::Reference< css::uno::XInterface > const & xRootFolder, css::uno::Reference< css::lang::XSingleServiceFactory > const & xFactory, const OUString& rSourceFile );
 
-    bool copyFile( const css::uno::Reference< css::container::XHierarchicalNameAccess >& xIfc, OUString& rURL, const OUString& rTargetURL );
+    static bool copyFile( const css::uno::Reference< css::container::XHierarchicalNameAccess >& xIfc, OUString& rURL, const OUString& rTargetURL );
     bool copyFiles( const css::uno::Reference< css::container::XHierarchicalNameAccess >& xIfc, filter_info_impl* pFilter );
 
     css::uno::Reference< css::uno::XComponentContext > mxContext;
 
-    OUString sVndSunStarPackage;
     OUString sXSLTPath;
     OUString sTemplatePath;
     OUString sProgPath;
diff --git a/framework/inc/xml/saxnamespacefilter.hxx b/framework/inc/xml/saxnamespacefilter.hxx
index 1ed4c34dd44f..157b20eb7a3c 100644
--- a/framework/inc/xml/saxnamespacefilter.hxx
+++ b/framework/inc/xml/saxnamespacefilter.hxx
@@ -70,10 +70,6 @@ class SaxNamespaceFilter final : public SaxNamespaceFilter_Base
         css::uno::Reference< css::xml::sax::XLocator >          m_xLocator;
         css::uno::Reference< css::xml::sax::XDocumentHandler>   xDocumentHandler;
         NamespaceStack                                          m_aNamespaceStack;
-
-        OUString m_aXMLAttributeNamespace;
-        OUString m_aXMLAttributeType;
-
 };
 
 }
diff --git a/framework/source/fwe/xml/saxnamespacefilter.cxx b/framework/source/fwe/xml/saxnamespacefilter.cxx
index bf464c663cac..6649ed21b98d 100644
--- a/framework/source/fwe/xml/saxnamespacefilter.cxx
+++ b/framework/source/fwe/xml/saxnamespacefilter.cxx
@@ -36,9 +36,7 @@ using namespace ::com::sun::star::uno;
 namespace framework{
 
 SaxNamespaceFilter::SaxNamespaceFilter( Reference< XDocumentHandler > const & rSax1DocumentHandler ) :
-     xDocumentHandler( rSax1DocumentHandler ),
-     m_aXMLAttributeNamespace( "xmlns" ),
-     m_aXMLAttributeType( "CDATA" )
+     xDocumentHandler( rSax1DocumentHandler )
 {
 }
 
@@ -70,7 +68,7 @@ void SAL_CALL SaxNamespaceFilter::startElement(
         for ( sal_Int16 i=0; i< xAttribs->getLength(); i++ )
         {
             OUString aName = xAttribs->getNameByIndex( i );
-            if ( aName.startsWith( m_aXMLAttributeNamespace ) )
+            if ( aName.startsWith( "xmlns" ) )
                 aXMLNamespaces.addNamespace( aName, xAttribs->getValueByIndex( i ));
             else
                 aAttributeIndexes.push_back( i );
@@ -88,7 +86,7 @@ void SAL_CALL SaxNamespaceFilter::startElement(
             OUString aAttributeName           = xAttribs->getNameByIndex(attributeIndex);
             OUString aValue                   = xAttribs->getValueByIndex(attributeIndex);
             OUString aNamespaceAttributeName = aXMLNamespaces.applyNSToAttributeName( aAttributeName );
-            pNewList->AddAttribute( aNamespaceAttributeName, m_aXMLAttributeType, aValue );
+            pNewList->AddAttribute( aNamespaceAttributeName, "CDATA", aValue );
         }
     }
     catch ( SAXException& e )
diff --git a/xmlhelp/source/cxxhelp/inc/tvread.hxx b/xmlhelp/source/cxxhelp/inc/tvread.hxx
index 0419ce0ab185..6f8ac1d38b7b 100644
--- a/xmlhelp/source/cxxhelp/inc/tvread.hxx
+++ b/xmlhelp/source/cxxhelp/inc/tvread.hxx
@@ -46,7 +46,6 @@ namespace treeview {
         ConfigData();
         int                    m_vAdd[5] = {};
         OUString          m_vReplacement[5];
-        OUString          prodName,prodVersion,vendName,vendVersion,vendShort;
 
         std::vector< sal_uInt64 >       vFileLen;
         std::vector< OUString >    vFileURL;
diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx
index 7a25dba31640..5c42fa2349e5 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.cxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.cxx
@@ -114,6 +114,14 @@ OUString Databases::expandURL( const OUString& aURL, const Reference< uno::XComp
     return aRetURL;
 }
 
+const char vendVersion[] = "%VENDORVERSION";
+const char vendName[] = "%VENDORNAME";
+const char prodVersion[] = "%PRODUCTVERSION";
+const char vendShort[] = "%VENDORSHORT";
+const char prodName[] = "%PRODUCTNAME";
+const char newProdVersion[] = "$[officeversion]";
+const char newProdName[] = "$[officename]";
+
 Databases::Databases( bool showBasic,
                       const OUString& instPath,
                       const OUString& productName,
@@ -122,14 +130,7 @@ Databases::Databases( bool showBasic,
                       Reference< uno::XComponentContext > const & xContext )
     : m_xContext( xContext ),
       m_bShowBasic(showBasic),
-      m_aCSS(styleSheet.toAsciiLowerCase()),
-      newProdName( "$[officename]" ),
-      newProdVersion( "$[officeversion]" ),
-      prodName( "%PRODUCTNAME" ),
-      prodVersion( "%PRODUCTVERSION" ),
-      vendName( "%VENDORNAME" ),
-      vendVersion( "%VENDORVERSION" ),
-      vendShort( "%VENDORSHORT" )
+      m_aCSS(styleSheet.toAsciiLowerCase())
 {
     m_xSMgr = m_xContext->getServiceManager();
 
diff --git a/xmlhelp/source/cxxhelp/provider/databases.hxx b/xmlhelp/source/cxxhelp/provider/databases.hxx
index 6edf6a0ce78d..f45032da7e12 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.hxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.hxx
@@ -240,8 +240,6 @@ namespace chelp {
 
         int                    m_vAdd[7];
         OUString          m_vReplacement[7];
-        OUString          newProdName,newProdVersion,
-            prodName,prodVersion,vendName,vendVersion,vendShort;
 
         OUString          m_aInstallDirectory;                // Installation directory
 
diff --git a/xmlhelp/source/treeview/tvread.cxx b/xmlhelp/source/treeview/tvread.cxx
index 2b09cc452c31..08bbdf5dd1b4 100644
--- a/xmlhelp/source/treeview/tvread.cxx
+++ b/xmlhelp/source/treeview/tvread.cxx
@@ -155,12 +155,13 @@ using namespace com::sun::star::util;
 using namespace com::sun::star::container;
 using namespace com::sun::star::deployment;
 
+const char prodName[] = "%PRODUCTNAME";
+const char vendName[] = "%VENDORNAME";
+const char vendVersion[] = "%VENDORVERSION";
+const char vendShort[] = "%VENDORSHORT";
+const char prodVersion[] = "%PRODUCTVERSION";
+
 ConfigData::ConfigData()
-    : prodName("%PRODUCTNAME"),
-      prodVersion("%PRODUCTVERSION"),
-      vendName("%VENDORNAME"),
-      vendVersion("%VENDORVERSION"),
-      vendShort("%VENDORSHORT")
 {
 }
 


More information about the Libreoffice-commits mailing list