[Libreoffice-commits] core.git: 2 commits - vcl/inc vcl/README.vars vcl/source

[Khaled Hosny]

 vcl/README.vars              |    1 -
 vcl/inc/svids.hrc            |    3 ---
 vcl/source/app/svapp.cxx     |    8 --------
 vcl/source/gdi/sallayout.cxx |    3 +--
 vcl/source/src/app.src       |   15 ---------------
 5 files changed, 1 insertion(+), 29 deletions(-)

New commits:
commit d76bd987ca2b853b85a9464787ae1fdc19321f5b
Author: Khaled Hosny <khaledhosny at eglug.org>
Date:   Sat Nov 26 20:10:21 2016 +0200

    Do not check for SAL_NO_COMMON_LAYOUT any more
    
    It has no effect except on Windows, and this will go out soon.
    
    Change-Id: I238518624e3288dea259e5ec9d5d76c8f691fd8c

diff --git a/vcl/README.vars b/vcl/README.vars
index d50a03b..e97d85d 100644
--- a/vcl/README.vars
+++ b/vcl/README.vars
@@ -6,7 +6,6 @@ SAL_USE_VCLPLUGIN - use a VCL plugin
 SAL_NO_NWF - disable native widgets
 SAL_FORCEDPI - force a specific DPI (gtk & gtk3 plugins only)
 SAL_FORCE_HC - force high-contrast mode
-SAL_NO_COMMON_LAYOUT - disable CommonSalLayout layout engine for text layout
 
 VCL_DOUBLEBUFFERING_AVOID_PAINT - don't paint the buffer, useful to see where we do direct painting
 VCL_DOUBLEBUFFERING_FORCE_ENABLE - enable double buffered painting
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index d879df0..ebae19b 100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -772,8 +772,7 @@ bool SalLayout::IsSpacingGlyph( sal_GlyphId nGlyph )
 
 bool SalLayout::UseCommonLayout()
 {
-    static bool bUse = getenv("SAL_NO_COMMON_LAYOUT") == nullptr;
-    return bUse;
+    return true;
 }
 
 GenericSalLayout::GenericSalLayout()
commit e17302a110c0dd143a4ea11855a3d2c736e49fdd
Author: Khaled Hosny <khaledhosny at eglug.org>
Date:   Sat Nov 26 20:08:53 2016 +0200

    Revert "Add layout engine info to the About dialog"
    
    This reverts commit f351b3624de79b5806a066202a3a0d6fa59c8469.

diff --git a/vcl/inc/svids.hrc b/vcl/inc/svids.hrc
index fa27f8b..891fe57 100644
--- a/vcl/inc/svids.hrc
+++ b/vcl/inc/svids.hrc
@@ -180,9 +180,6 @@
 #define SV_APP_GL                                   10803
 #define SV_APP_DEFAULT                              10804
 #define SV_APP_VCLBACKEND                           10805
-#define SV_APP_LAYOUT_ENGINE                        10806
-#define SV_APP_LAYOUT_NEW                           10807
-#define SV_APP_LAYOUT_OLD                           10808
 
 #define SV_ICON_SIZE48_START                        20000
 #define SV_ICON_SIZE32_START                        21000
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 2efd08f..af80c7c 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -57,7 +57,6 @@
 
 #include "salinst.hxx"
 #include "salframe.hxx"
-#include "sallayout.hxx"
 #include "salsys.hxx"
 #include "svdata.hxx"
 #include "salimestatus.hxx"
@@ -1219,13 +1218,6 @@ OUString Application::GetHWOSConfInfo()
     aDetails.append( "; " );
 #endif
 
-    aDetails.append( VclResId(SV_APP_LAYOUT_ENGINE).toString() );
-    if (SalLayout::UseCommonLayout())
-        aDetails.append( VclResId(SV_APP_LAYOUT_NEW).toString() );
-    else
-        aDetails.append( VclResId(SV_APP_LAYOUT_OLD).toString() );
-    aDetails.append( "; " );
-
     return aDetails.makeStringAndClear();
 }
 
diff --git a/vcl/source/src/app.src b/vcl/source/src/app.src
index 0197d98..b36686d 100644
--- a/vcl/source/src/app.src
+++ b/vcl/source/src/app.src
@@ -39,19 +39,4 @@ String SV_APP_VCLBACKEND
     Text [ en-US ] = "VCL: ";
 };
 
-String SV_APP_LAYOUT_ENGINE
-{
-    Text [ en-US ] = "Layout Engine: ";
-};
-
-String SV_APP_LAYOUT_NEW
-{
-    Text [ en-US ] = "new";
-};
-
-String SV_APP_LAYOUT_OLD
-{
-    Text [ en-US ] = "old";
-};
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */