[Libreoffice-commits] core.git: 3 commits - dbaccess/source tools/inc vcl/source

[Chris]

 dbaccess/source/ui/dlg/dbwizsetup.cxx   |   10 +++++-----
 tools/inc/tools/debug.hxx               |    5 ++---
 vcl/source/glyphs/graphite_features.cxx |    5 +++--
 3 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 3c61c08757208fb9735814dd62ac80f23cf51b86
Author: Chris <chris.sherlock79 at gmail.com>
Date:   Thu Mar 21 23:55:36 2013 +1100

    Move setupwizard modify handler code.
    
    Move setupwizard code into the conditional below it. You can only work
    on pPage if it isn't a null pointer anyway, to my mind this looks a
    lot cleaner.
    
    Change-Id: If8d910c15c5a1c1da5eb204b5922d074c454978b
    Reviewed-on: https://gerrit.libreoffice.org/2890
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>

diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index 338e7c0..cb53dfd 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -587,13 +587,13 @@ TabPage* ODbTypeWizDialogSetup::createPage(WizardState _nState)
             break;
     }
 
-    if (pPage && (_nState != PAGE_DBSETUPWIZARD_INTRO) && (_nState != PAGE_DBSETUPWIZARD_AUTHENTIFICATION))
-    {
-        pPage->SetModifiedHandler(LINK( this, ODbTypeWizDialogSetup, ImplModifiedHdl ) );
-    }
-
     if ( pPage )
     {
+        if ((_nState != PAGE_DBSETUPWIZARD_INTRO) && (_nState != PAGE_DBSETUPWIZARD_AUTHENTIFICATION))
+        {
+            pPage->SetModifiedHandler(LINK( this, ODbTypeWizDialogSetup, ImplModifiedHdl ) );
+        }
+
         pPage->SetServiceFactory( m_pImpl->getORB() );
         pPage->SetAdminDialog(this, this);
 
commit f9af9abe628dc8886e320fa27421a125886f37a6
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Thu Mar 21 19:10:52 2013 +0100

    debug: remove binfilter debug macro
    
    Change-Id: I419c37860a21ae5ab416a2c8ec3c742fbaf6a980

diff --git a/tools/inc/tools/debug.hxx b/tools/inc/tools/debug.hxx
index e956d65..5416050 100644
--- a/tools/inc/tools/debug.hxx
+++ b/tools/inc/tools/debug.hxx
@@ -32,8 +32,8 @@
     steps taken while executing some protocol) should use the facilities
     provided by sal/log.hxx.
 
-    Because the assertion macros (DBG_ASSERT, DBG_BF_ASSERT) have been used for
-    true assertions as well as to log warnings, they map to SAL_WARN instead of
+    Because the assertion macro (DBG_ASSERT) has been used for
+    true assertions as well as to log warnings, it maps to SAL_WARN instead of
     standard assert.  The warning and error macros (DBG_ASSERTWARNING,
     DBG_WARNING, DBG_WARNING1, ..., DBG_WARNING3, DBG_ERRORFILE) all map to
     SAL_INFO.
@@ -477,7 +477,6 @@ typedef const sal_Char* (*DbgUsr)(const void* pThis );
 
 #define DBG_ASSERTWARNING( sCon, aWarning ) ((void)0)
 #define DBG_ASSERT( sCon, aError ) ((void)0)
-#define DBG_BF_ASSERT( sCon, aError ) ((void)0)
 #define DBG_WARNING( aWarning ) ((void)0)
 #define DBG_WARNING1( aWarning, x1 ) ((void)0)
 #define DBG_WARNING2( aWarning, x1, x2 ) ((void)0)
commit 51890613b7cdeddff9ad3360a91908ded28bc5f0
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Thu Mar 21 19:10:02 2013 +0100

    vcl: use OSL_BIGENDIAN
    
    Change-Id: Ifdf54d30cca94d0d65d78f94d5fac31edf8c6df2

diff --git a/vcl/source/glyphs/graphite_features.cxx b/vcl/source/glyphs/graphite_features.cxx
index ca10807..1bff1e4 100644
--- a/vcl/source/glyphs/graphite_features.cxx
+++ b/vcl/source/glyphs/graphite_features.cxx
@@ -24,6 +24,7 @@
 
 
 #include <sal/types.h>
+#include <osl/endian.h>
 
 #ifdef WNT
 #include <windows.h>
@@ -88,7 +89,7 @@ GrFeatureParser::GrFeatureParser(const gr_face * pFace, const ::rtl::OString fea
                     gr_uint32 nFaceLang = gr_face_lang_by_index(pFace, i);
                     FeatId aSupportedLang;
                     aSupportedLang.num = nFaceLang;
-#ifdef __BIG_ENDIAN__
+#ifdef OSL_BIGENDIAN
                     // here we only expect full 3 letter codes
                     if (aLang.label[0] == aSupportedLang.label[0] &&
                         aLang.label[1] == aSupportedLang.label[1] &&
@@ -163,7 +164,7 @@ void GrFeatureParser::setLang(const gr_face * pFace, const rtl::OString & lang)
             FeatId aSupportedLang;
             aSupportedLang.num = nFaceLang;
             // here we only expect full 2 & 3 letter codes
-#ifdef __BIG_ENDIAN__
+#ifdef OSL_BIGENDIAN
             if (aLang.label[0] == aSupportedLang.label[0] &&
                 aLang.label[1] == aSupportedLang.label[1] &&
                 aLang.label[2] == aSupportedLang.label[2] &&