[Libreoffice-commits] core.git: 3 commits - solenv/bin vcl/inc vcl/source

[Tor Lillqvist]

 solenv/bin/native-code.py       |    1 +
 vcl/inc/graphite_static.hxx     |    1 -
 vcl/inc/quartz/salgdicommon.hxx |    2 ++
 vcl/inc/regionband.hxx          |    4 ++--
 vcl/inc/salglyphid.hxx          |    8 +++++---
 vcl/source/app/svmain.cxx       |   13 ++++---------
 6 files changed, 14 insertions(+), 15 deletions(-)

New commits:
commit 7cfb65451a2aa9b993fd4366b611b8c46e0c8b40
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Mar 6 10:31:30 2014 +0200

    Fix up a few Emacs and vim mode lines
    
    Change-Id: I813b3638d6e368e73d8733f652db553a6e1cb029

diff --git a/vcl/inc/graphite_static.hxx b/vcl/inc/graphite_static.hxx
index 4c70cf1..f7a826e 100644
--- a/vcl/inc/graphite_static.hxx
+++ b/vcl/inc/graphite_static.hxx
@@ -14,4 +14,3 @@
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
-
diff --git a/vcl/inc/quartz/salgdicommon.hxx b/vcl/inc/quartz/salgdicommon.hxx
index c20f991..a45a253 100644
--- a/vcl/inc/quartz/salgdicommon.hxx
+++ b/vcl/inc/quartz/salgdicommon.hxx
@@ -90,3 +90,5 @@ private:
 };
 
 #endif // INCLUDED_VCL_INC_QUARTZ_SALGDICOMMON_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/regionband.hxx b/vcl/inc/regionband.hxx
index d8e29ac..199e174 100644
--- a/vcl/inc/regionband.hxx
+++ b/vcl/inc/regionband.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
  * This file is part of the LibreOffice project.
  *
@@ -80,5 +81,4 @@ public:
 
 #endif // INCLUDED_VCL_INC_REGIONBAND_HXX
 
-
-//eof
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/salglyphid.hxx b/vcl/inc/salglyphid.hxx
index d7d7d7c..fa9f593 100644
--- a/vcl/inc/salglyphid.hxx
+++ b/vcl/inc/salglyphid.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
  * This file is part of the LibreOffice project.
  *
@@ -15,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SV_SALGLYPHID_HXX
-#define _SV_SALGLYPHID_HXX
+#ifndef INCLUDED_VCL_INC_SALGLYPHID_HXX
+#define INCLUDED_VCL_INC_SALGLYPHID_HXX
 
 // TODO: sal_GlyphId should become a class...
 typedef sal_uInt32 sal_GlyphId;
@@ -41,5 +42,6 @@ typedef sal_uInt32 sal_GlyphId;
 
 #define GF_DROPPED  0xFFFFFFFF
 
-#endif // _SV_SALGLYPHID_HXX
+#endif // INCLUDED_VCL_INC_SALGLYPHID_HXX
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 485163703b22318e1aabc903bd0261851d677a9d
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Mar 6 10:02:01 2014 +0200

    Cosmetics and bin some pointless SAL_INFOs
    
    Change-Id: I444cfdafce5cbd4d6f0ca12b05e477c48237a889

diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index 65ca649..029f051 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
 #include "rtl/logfile.hxx"
 
 #include <osl/file.hxx>
@@ -140,8 +139,6 @@ oslSignalAction SAL_CALL VCLExceptionSignal_impl( void* /*pData*/, oslSignalInfo
 int ImplSVMain()
 {
     // The 'real' SVMain()
-    SAL_INFO( "vcl.app", "vcl (ss112471) ::SVMain" );
-
     ImplSVData* pSVData = ImplGetSVData();
 
     DBG_ASSERT( pSVData->mpApp, "no instance of class Application" );
@@ -192,9 +189,11 @@ int SVMain()
     else
         return ImplSVMain();
 }
+
 // This variable is set, when no Application object is instantiated
 // before SVInit is called
 static Application *        pOwnSvApp = NULL;
+
 // Exception handler. pExceptionHandler != NULL => VCL already inited
 oslSignalHandler   pExceptionHandler = NULL;
 
@@ -236,8 +235,6 @@ uno::Any SAL_CALL DesktopEnvironmentContext::getValueByName( const OUString& Nam
 
 bool InitVCL()
 {
-    SAL_INFO( "vcl.app", "vcl (ss112471) ::InitVCL" );
-
     if( pExceptionHandler != NULL )
         return false;
 
@@ -261,11 +258,9 @@ bool InitVCL()
     pSVData->mnMainThreadId = ::osl::Thread::getCurrentIdentifier();
 
     // Initialize Sal
-    SAL_INFO( "vcl.app", "{ ::CreateSalInstance" );
     pSVData->mpDefInst = CreateSalInstance();
     if ( !pSVData->mpDefInst )
         return false;
-    SAL_INFO( "vcl.app", "} ::CreateSalInstance" );
 
     // Desktop Environment context (to be able to get value of "system.desktop-environment" as soon as possible)
     com::sun::star::uno::setCurrentContext(
@@ -357,7 +352,7 @@ void DeInitVCL()
     delete pSVData->mpImeStatus;
     pSVData->mpImeStatus = NULL;
 
-    #if OSL_DEBUG_LEVEL > 0
+#if OSL_DEBUG_LEVEL > 0
     OStringBuffer aBuf( 256 );
     aBuf.append( "DeInitVCL: some top Windows are still alive\n" );
     long nTopWindowCount = Application::GetTopWindowCount();
@@ -381,7 +376,7 @@ void DeInitVCL()
         }
     }
     DBG_ASSERT( nBadTopWindows==0, aBuf.getStr() );
-    #endif
+#endif
 
     ImplImageTreeSingletonRef()->shutDown();
 
commit 856066bb2c56a918ba0f9176a48974746614c206
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Mar 5 17:32:41 2014 +0200

    Add drawinglayer
    
    Change-Id: I48c8d110666e0404b49e3a7816c134a7f06fb929

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index c696ae6b..bf3add6 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -25,6 +25,7 @@ core_factory_list = [
     ("libchartcorelo.a", "chartcore_component_getFactory"),
     ("libcomphelper.a", "comphelp_component_getFactory"),
     ("libconfigmgrlo.a", "configmgr_component_getFactory"),
+    ("libdrawinglayerlo.a", "drawinglayer_component_getFactory"),
     ("libfilterconfiglo.a", "filterconfig1_component_getFactory"),
     ("libfsstoragelo.a", "fsstorage_component_getFactory"),
     ("libhyphenlo.a", "hyphen_component_getFactory"),