[Libreoffice-commits] core.git: 3 commits - configure.ac officecfg/registry sd/source vcl/source

[Michael Meeks]

 configure.ac                                                 |    9 +++++
 officecfg/registry/schema/org/openoffice/Office/Common.xcs   |    2 -
 sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx |    3 -
 vcl/source/window/window.cxx                                 |   17 +++++------
 4 files changed, 20 insertions(+), 11 deletions(-)

New commits:
commit 7b4bdab8252200e89a05294bdcdebef2ab9feb81
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Tue Aug 6 16:52:04 2013 +0200

    MPLv2 subset improvement.
    
    Change-Id: I96efcab67f05407923b022dfd95a94fd8c2169ed

diff --git a/configure.ac b/configure.ac
index 9ed63e2..93e2316 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12247,6 +12247,15 @@ AC_MSG_CHECKING([MPL subset])
 MPL_SUBSET=
 
 if test "$enable_mpl_subset" = "yes"; then
+   warn_report=false
+   if test "$enable_report_builder" != "no" -a "$with_java" != "no"; then
+        warn_report=true
+   elif test "x$ENABLE_REPORTBUILDER" = "xTRUE"; then
+        warn_report=true
+   fi
+   if test "$warn_report" = "true"; then
+        AC_MSG_ERROR([need to --disable-report-builder - extended database report builder.])
+   fi
    if test "x$enable_postgresql_sdbc" != "xno"; then
         AC_MSG_ERROR([need to --disable-postgresql-sdbc - the postgress database backend.])
    fi
commit 457bc1ebdf327685fcf2ccac8d6c87c839c43200
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Sat Aug 3 13:35:19 2013 +0200

    fdo#67707 - avoid crash with sidebar when switching to writer from impress.
    
    Change-Id: I0010663951fe67bfb864ffdaecb251b3da5a3ac3

diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
index ca0ff0b..c1b1e1a 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
 #include "controller/SlsSelectionFunction.hxx"
 
 #include "SlideSorter.hxx"
@@ -439,7 +438,7 @@ sal_Bool SelectionFunction::KeyInput (const KeyEvent& rEvent)
                     mpModeHandler->SetCurrentPage(pDescriptor);
                     mpModeHandler->SwitchView(pDescriptor);
                 }
-                else
+                else if (pViewShell->GetDispatcher() != NULL)
                 {
                     pViewShell->GetDispatcher()->Execute(
                         SID_INSERTPAGE,
commit 0acdeacbe774b7e05323ad80b556e7102a083192
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Wed Jul 31 17:27:43 2013 +0100

    Disable auto-detection of high-contrast mode by default
    
    Lots of Linux themes are rather 'black' anyway, and yet want the
    icon set they selected and the colours too. If this is needed it
    can still be forced either by changing the setting back, changing
    the setting back in the UI, and/or exporting SAL_FORCE_HC=1
    
    Change-Id: Ia034942db7ec2fdd27b4a0b43f2f19269e05f5c6

diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index cc6da7d..64661b5 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -6138,7 +6138,7 @@
           implicitly, which is recognized if the option is set.</desc>
           <label>detect system's high contrast</label>
         </info>
-        <value>true</value>
+        <value>false</value>
       </prop>
       <prop oor:name="IsForPagePreviews" oor:type="xs:boolean" oor:nillable="false">
         <info>
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index aa3db23..5a7d571 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -625,6 +625,8 @@ void Window::ImplUpdateGlobalSettings( AllSettings& rSettings, sal_Bool bCallHdl
 
     rSettings.SetStyleSettings( aStyleSettings );
 
+    bool bForceHCMode = false;
+
     // auto detect HC mode; if the system already set it to "yes"
     // (see above) then accept that
     if( !rSettings.GetStyleSettings().GetHighContrastMode() )
@@ -641,20 +643,19 @@ void Window::ImplUpdateGlobalSettings( AllSettings& rSettings, sal_Bool bCallHdl
         }
         if( bAutoHCMode )
         {
-            if( rSettings.GetStyleSettings().GetFaceColor().IsDark()
-             || rSettings.GetStyleSettings().GetWindowColor().IsDark() )
-            {
-                aStyleSettings = rSettings.GetStyleSettings();
-                aStyleSettings.SetHighContrastMode( sal_True );
-                aStyleSettings.SetSymbolsStyle( STYLE_SYMBOLS_HICONTRAST );
-                rSettings.SetStyleSettings( aStyleSettings );
-            }
+            if( rSettings.GetStyleSettings().GetFaceColor().IsDark() ||
+                rSettings.GetStyleSettings().GetWindowColor().IsDark() )
+                bForceHCMode = true;
         }
     }
 
     static const char* pEnvHC = getenv( "SAL_FORCE_HC" );
     if( pEnvHC && *pEnvHC )
+        bForceHCMode = true;
+
+    if( bForceHCMode )
     {
+        aStyleSettings = rSettings.GetStyleSettings();
         aStyleSettings.SetHighContrastMode( sal_True );
         aStyleSettings.SetSymbolsStyle( STYLE_SYMBOLS_HICONTRAST );
         rSettings.SetStyleSettings( aStyleSettings );