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

Chris Sherlock chris.sherlock79 at gmail.com
Tue Jan 28 00:11:21 PST 2014


 vcl/source/app/svapp.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d6d5f6803e7433c5b7bb75e982fa066be908af4a
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date:   Tue Jan 28 19:05:30 2014 +1100

    Fix commit 4959f369d9bdcc
    
    Application::InitSettings should only assert when
    pSVData->msAppData.mpSettings is already set. There is an errant not
    symbol.
    
    Change-Id: Id18848774f3f3a1b37969f057eaf8685231ad291
    Reviewed-on: https://gerrit.libreoffice.org/7711
    Reviewed-by: Norbert Thiebaud <nthiebaud at gmail.com>
    Tested-by: Norbert Thiebaud <nthiebaud at gmail.com>

diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index ac13c73..dd4d6a9 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -628,7 +628,7 @@ void Application::InitSettings()
 {
     ImplSVData* pSVData = ImplGetSVData();
 
-    assert(!pSVData->maAppData.mpSettings);     // initialization should not happen twice!
+    assert(pSVData->maAppData.mpSettings);     // initialization should not happen twice!
 
     pSVData->maAppData.mpCfgListener = new LocaleConfigurationListener;
     pSVData->maAppData.mpSettings = new AllSettings();


More information about the Libreoffice-commits mailing list