cui/source/options/optsave.cxx | 11 ----------
cui/source/options/optsave.hxx | 1
cui/uiconfig/ui/optsavepage.ui | 43 ++++++++++++-----------------------------
3 files changed, 13 insertions(+), 42 deletions(-)
New commits:
commit 111a2b94fd6f217d91c9a057086b3d2dfa752c5b
Author: Samuel Mehrbrodt <s.mehrbr...@gmail.com>
Date: Thu Sep 26 20:56:15 2013 +0200
fdo#54812 Remove option 'Size optimization for ODF format'
Change-Id: I1aee738a0ecd761efaecf4b1b1c53918d8f9cf01
Reviewed-on: https://gerrit.libreoffice.org/6044
Reviewed-by: Michael Stahl <mst...@redhat.com>
Tested-by: Michael Stahl <mst...@redhat.com>
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index 094f636..31a164d 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -98,7 +98,6 @@ SfxSaveTabPage::SfxSaveTabPage( Window* pParent, const
SfxItemSet& rCoreSet ) :
get(aRelativeInetCB, "relative_inet");
get(aODFVersionLB, "odfversion");
- get(aSizeOptimizationCB, "sizeoptimization");
get(aWarnAlienFormatCB, "warnalienformat");
get(aDocTypeLB, "doctype");
get(aSaveAsFT, "saveas_label");
@@ -271,12 +270,6 @@ sal_Bool SfxSaveTabPage::FillItemSet( SfxItemSet& rSet )
bModified |= sal_True;
}
- if ( aSizeOptimizationCB->IsChecked() !=
aSizeOptimizationCB->GetSavedValue() )
- {
- rSet.Put( SfxBoolItem( GetWhich( SID_ATTR_PRETTYPRINTING ),
!aSizeOptimizationCB->IsChecked() ) );
- bModified |= sal_True;
- }
-
if ( aAutoSaveCB->IsChecked() != aAutoSaveCB->GetSavedValue() )
{
rSet.Put( SfxBoolItem( GetWhich( SID_ATTR_AUTOSAVE ),
@@ -478,9 +471,6 @@ void SfxSaveTabPage::Reset( const SfxItemSet& )
aWarnAlienFormatCB->Check(aSaveOpt.IsWarnAlienFormat());
aWarnAlienFormatCB->Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_WARNALIENFORMAT));
- // the pretty printing
- aSizeOptimizationCB->Check( !aSaveOpt.IsPrettyPrinting());
-
aAutoSaveEdit->SetValue( aSaveOpt.GetAutoSaveTime() );
// save relatively
@@ -497,7 +487,6 @@ void SfxSaveTabPage::Reset( const SfxItemSet& )
aDocInfoCB->SaveValue();
aBackupCB->SaveValue();
aWarnAlienFormatCB->SaveValue();
- aSizeOptimizationCB->SaveValue();
aAutoSaveCB->SaveValue();
aAutoSaveEdit->SaveValue();
diff --git a/cui/source/options/optsave.hxx b/cui/source/options/optsave.hxx
index eef46ba..69dfbb0 100644
--- a/cui/source/options/optsave.hxx
+++ b/cui/source/options/optsave.hxx
@@ -55,7 +55,6 @@ private:
CheckBox* aRelativeInetCB;
ListBox* aODFVersionLB;
- CheckBox* aSizeOptimizationCB;
CheckBox* aWarnAlienFormatCB;
ListBox* aDocTypeLB;
FixedText* aSaveAsFT;
diff --git a/cui/uiconfig/ui/optsavepage.ui b/cui/uiconfig/ui/optsavepage.ui
index cfaffad..afedb0b 100644
--- a/cui/uiconfig/ui/optsavepage.ui
+++ b/cui/uiconfig/ui/optsavepage.ui
@@ -1,6 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkAdjustment" id="adjustment1">
+ <property name="lower">1</property>
+ <property name="upper">60</property>
+ <property name="value">15</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
<object class="GtkGrid" id="OptSavePage">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -287,23 +294,6 @@
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
<child>
- <object class="GtkCheckButton" id="sizeoptimization">
- <property name="label" translatable="yes">Size
optimization for ODF format</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>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- <property name="width">2</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
<object class="GtkCheckButton" id="warnalienformat">
<property name="label" translatable="yes">Warn when not
saving in ODF or default format</property>
<property name="visible">True</property>
@@ -315,7 +305,7 @@
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">2</property>
+ <property name="top_attach">1</property>
<property name="width">2</property>
<property name="height">1</property>
</packing>
@@ -355,7 +345,7 @@
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">5</property>
+ <property name="top_attach">4</property>
<property name="width">2</property>
<property name="height">1</property>
</packing>
@@ -407,7 +397,7 @@
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">4</property>
+ <property name="top_attach">3</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
@@ -430,7 +420,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="top_attach">3</property>
+ <property name="top_attach">2</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
@@ -444,7 +434,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="top_attach">4</property>
+ <property name="top_attach">3</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
@@ -460,7 +450,7 @@
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">3</property>
+ <property name="top_attach">2</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
@@ -488,11 +478,4 @@
</packing>
</child>
</object>
- <object class="GtkAdjustment" id="adjustment1">
- <property name="lower">1</property>
- <property name="upper">60</property>
- <property name="value">15</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
</interface>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
