From 947356b09d84b537ec72bf77b5421f60c52d642f Mon Sep 17 00:00:00 2001
From: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Date: Tue, 21 Apr 2020 17:19:29 +0200
Subject: Remove collect usage info from GUI

Change-Id: I1a7420c557187097b424d298c020bcb837a8261c
---
 cui/source/options/optgdlg.cxx    | 12 ------------
 cui/source/options/optgdlg.hxx    |  2 --
 cui/uiconfig/ui/optgeneralpage.ui | 41 ---------------------------------------
 3 files changed, 55 deletions(-)

(limited to 'cui')

diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index f765bef9c289..146a9604483d 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -279,7 +279,6 @@ OfaMiscTabPage::OfaMiscTabPage(vcl::Window* pParent, const SfxItemSet& rSet)
     get(m_pYearFrame, "yearframe");
     get(m_pYearValueField, "year");
     get(m_pToYearFT, "toyear");
-    get(m_pCollectUsageInfo, "collectusageinfo");
     get(m_pQuickStarterFrame, "quickstarter");
 
 #if defined(UNX)
@@ -323,7 +322,6 @@ void OfaMiscTabPage::dispose()
     m_pYearFrame.clear();
     m_pYearValueField.clear();
     m_pToYearFT.clear();
-    m_pCollectUsageInfo.clear();
     m_pQuickStarterFrame.clear();
     m_pQuickLaunchCB.clear();
     SfxTabPage::dispose();
@@ -372,12 +370,6 @@ bool OfaMiscTabPage::FillItemSet( SfxItemSet* rSet )
         rSet->Put( SfxUInt16Item( SID_ATTR_YEAR2000, nNum ) );
     }
 
-    if (m_pCollectUsageInfo->IsValueChangedFromSaved())
-    {
-        officecfg::Office::Common::Misc::CollectUsageInformation::set(m_pCollectUsageInfo->IsChecked(), batch);
-        bModified = true;
-    }
-
     batch->commit();
 
     if( m_pQuickLaunchCB->IsValueChangedFromSaved())
@@ -414,10 +406,6 @@ void OfaMiscTabPage::Reset( const SfxItemSet* rSet )
     else
         m_pYearFrame->Enable(false);
 
-    m_pCollectUsageInfo->Check(officecfg::Office::Common::Misc::CollectUsageInformation::get());
-    m_pCollectUsageInfo->Enable(!officecfg::Office::Common::Misc::CollectUsageInformation::isReadOnly());
-    m_pCollectUsageInfo->SaveValue();
-
     SfxItemState eState = rSet->GetItemState( SID_ATTR_QUICKLAUNCHER, false, &pItem );
     if ( SfxItemState::SET == eState )
         m_pQuickLaunchCB->Check( static_cast<const SfxBoolItem*>(pItem)->GetValue() );
diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index f6296ff87679..6918258ab6d8 100644
--- a/cui/source/options/optgdlg.hxx
+++ b/cui/source/options/optgdlg.hxx
@@ -56,8 +56,6 @@ private:
 
     OUString             m_aStrDateInfo;
 
-    VclPtr<CheckBox>     m_pCollectUsageInfo;
-
     VclPtr<VclContainer> m_pQuickStarterFrame;
     VclPtr<CheckBox>     m_pQuickLaunchCB;
 
diff --git a/cui/uiconfig/ui/optgeneralpage.ui b/cui/uiconfig/ui/optgeneralpage.ui
index 022fb620bcdd..9756ede62816 100644
--- a/cui/uiconfig/ui/optgeneralpage.ui
+++ b/cui/uiconfig/ui/optgeneralpage.ui
@@ -274,47 +274,6 @@
         <property name="top_attach">4</property>
       </packing>
     </child>
-    <child>
-      <object class="GtkFrame" id="privacyframe">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="label_xalign">0</property>
-        <property name="shadow_type">none</property>
-        <child>
-          <object class="GtkAlignment" id="alignment6">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="top_padding">6</property>
-            <property name="left_padding">12</property>
-            <child>
-              <object class="GtkCheckButton" id="collectusageinfo">
-                <property name="label" translatable="yes" context="optgeneralpage|collectusageinfo">Collect usage data and send it to The Document Foundation</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_underline">True</property>
-                <property name="xalign">0</property>
-                <property name="draw_indicator">True</property>
-              </object>
-            </child>
-          </object>
-        </child>
-        <child type="label">
-          <object class="GtkLabel" id="label7">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes" context="optgeneralpage|label7">Help Improve %PRODUCTNAME</property>
-            <attributes>
-              <attribute name="weight" value="bold"/>
-            </attributes>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="left_attach">0</property>
-        <property name="top_attach">5</property>
-      </packing>
-    </child>
     <child>
       <object class="GtkFrame" id="quickstarter">
         <property name="visible">True</property>
-- 
cgit