[Libreoffice-commits] core.git: Branch 'private/tml/opencl-default-1' - 2 commits - officecfg/registry sc/source

[Tor Lillqvist]

 officecfg/registry/schema/org/openoffice/Office/Calc.xcs |    2 +-
 sc/source/ui/optdlg/calcoptionsdlg.cxx                   |   15 ---------------
 sc/source/ui/optdlg/calcoptionsdlg.hxx                   |   15 ---------------
 3 files changed, 1 insertion(+), 31 deletions(-)

New commits:
commit 53094c9c2ac4feba8ab29157419873bfac3e3410
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Nov 6 08:41:49 2014 +0200

    D'oh, it's oor:separator. Thanks to dtardon for pointing it out to me
    
    I guess it would be futile to expect some warning at run-time about an
    unrecognized attribute.
    
    Change-Id: I04ccaa6df8ec932f747384486174c1fd23eb110a

diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index ba44e30..46edbf2 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -1401,7 +1401,7 @@
           <info>
             <desc>Like OpenCLWhiteList, but for combinations known to be bad.</desc>
           </info>
-          <value separator=";">Windows/*/Intel(R) Corporation/9.17.10.2884;SuperOS/1.0/Big Corp, Inc./2.3\/beta</value>
+          <value oor:separator=";">Windows/*/Intel(R) Corporation/9.17.10.2884;SuperOS/1.0/Big Corp, Inc./2.3\/beta</value>
         </prop>
       </group>
       <group oor:name="Syntax">
commit 2b19cdd8fa57bc0e7f0ce918ab61bdeb08ee4eb1
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Nov 6 08:40:49 2014 +0200

    Bin unnecessary variables
    
    Doing .ui "manually" is not *that* verbose;)
    
    Change-Id: Ide50258174e86cc94975a33c5c0e5c663ae8d77c

diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx b/sc/source/ui/optdlg/calcoptionsdlg.cxx
index e1de436..286cc7f 100644
--- a/sc/source/ui/optdlg/calcoptionsdlg.cxx
+++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx
@@ -201,21 +201,6 @@ ScCalcOptionsDialog::ScCalcOptionsDialog(vcl::Window* pParent, const ScCalcConfi
     maCaptionOpenCLBlackList = get<vcl::Window>("opencl_blacklist")->GetText();
     maDescOpenCLBlackList = get<vcl::Window>("opencl_blacklist_desc")->GetText();
 
-    maCaptionOS = get<vcl::Window>("oslabel")->GetText();
-    maDescOS = get<vcl::Window>("os_desc")->GetText();
-
-    maCaptionOSVersion = get<vcl::Window>("osversionlabel")->GetText();
-    maDescOSVersion = get<vcl::Window>("osversion_desc")->GetText();
-
-    maCaptionOpenCLVendor = get<vcl::Window>("openclvendorlabel")->GetText();
-    maDescOpenCLVendor = get<vcl::Window>("openclvendor_desc")->GetText();
-
-    maCaptionOpenCLDevice = get<vcl::Window>("opencldevicelabel")->GetText();
-    maDescOpenCLDevice = get<vcl::Window>("opencldevice_desc")->GetText();
-
-    maCaptionOpenCLDriverVersion = get<vcl::Window>("opencldriverversionlabel")->GetText();
-    maDescOpenCLDriverVersion = get<vcl::Window>("opencldriverversion_desc")->GetText();
-
     maSoftware = get<vcl::Window>("software")->GetText();
 
     mpLbSettings->set_height_request(8 * mpLbSettings->GetTextHeight());
diff --git a/sc/source/ui/optdlg/calcoptionsdlg.hxx b/sc/source/ui/optdlg/calcoptionsdlg.hxx
index a4aa684..860f943 100644
--- a/sc/source/ui/optdlg/calcoptionsdlg.hxx
+++ b/sc/source/ui/optdlg/calcoptionsdlg.hxx
@@ -129,21 +129,6 @@ private:
     OUString maCaptionOpenCLBlackList;
     OUString maDescOpenCLBlackList;
 
-    OUString maCaptionOS;
-    OUString maDescOS;
-
-    OUString maCaptionOSVersion;
-    OUString maDescOSVersion;
-
-    OUString maCaptionOpenCLVendor;
-    OUString maDescOpenCLVendor;
-
-    OUString maCaptionOpenCLDevice;
-    OUString maDescOpenCLDevice;
-
-    OUString maCaptionOpenCLDriverVersion;
-    OUString maDescOpenCLDriverVersion;
-
     OUString maSoftware;
 
     ScCalcConfig maConfig;