[Libreoffice-commits] core.git: 4 commits - helpcontent2 sc/inc sc/source sc/uiconfig sc/UI_scalc.mk
Caolán McNamara
caolanm at redhat.com
Wed Apr 10 06:17:26 PDT 2013
helpcontent2 | 2
sc/UI_scalc.mk | 1
sc/inc/sc.hrc | 2
sc/inc/scabstdlg.hxx | 4
sc/source/ui/attrdlg/scdlgfact.cxx | 19 --
sc/source/ui/attrdlg/scdlgfact.hxx | 4
sc/source/ui/inc/delcodlg.hxx | 23 +-
sc/source/ui/inc/miscdlgs.hrc | 11 -
sc/source/ui/miscdlgs/delcodlg.cxx | 104 +++++--------
sc/source/ui/src/miscdlgs.src | 101 ------------
sc/source/ui/view/cellsh1.cxx | 2
sc/uiconfig/scalc/ui/deletecontents.ui | 259 +++++++++++++++++++++++++++++++++
12 files changed, 328 insertions(+), 204 deletions(-)
New commits:
commit 1a14d95627b5ea66822485f102c3b9e942d64d82
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Apr 10 14:15:15 2013 +0100
fix Delete Contents title
Change-Id: I193f1cad5938550c576909802c945448ee41d17e
diff --git a/sc/uiconfig/scalc/ui/deletecontents.ui b/sc/uiconfig/scalc/ui/deletecontents.ui
index fd8f4e6..a5dbb99 100644
--- a/sc/uiconfig/scalc/ui/deletecontents.ui
+++ b/sc/uiconfig/scalc/ui/deletecontents.ui
@@ -4,12 +4,12 @@
<object class="GtkDialog" id="DeleteContentsDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Import Options</property>
+ <property name="title" translatable="yes">Delete Contents</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
<property name="can_focus">False</property>
- <property name="spacing">2</property>
+ <property name="spacing">12</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area1">
<property name="can_focus">False</property>
@@ -18,13 +18,11 @@
<child>
<object class="GtkButton" id="ok">
<property name="label">gtk-ok</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -36,11 +34,9 @@
<child>
<object class="GtkButton" id="cancel">
<property name="label">gtk-cancel</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -52,11 +48,9 @@
<child>
<object class="GtkButton" id="help">
<property name="label">gtk-help</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -96,14 +90,14 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
+ <property name="spacing">6</property>
<child>
<object class="GtkCheckButton" id="deleteall">
<property name="label" translatable="yes">Delete _all</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
+ <property name="margin_bottom">6</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -117,11 +111,9 @@
<child>
<object class="GtkCheckButton" id="text">
<property name="label" translatable="yes">_Text</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -135,11 +127,9 @@
<child>
<object class="GtkCheckButton" id="numbers">
<property name="label" translatable="yes">_Numbers</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -153,11 +143,9 @@
<child>
<object class="GtkCheckButton" id="datetime">
<property name="label" translatable="yes">_Date & time</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -171,11 +159,9 @@
<child>
<object class="GtkCheckButton" id="formulas">
<property name="label" translatable="yes">_Formulas</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -189,11 +175,9 @@
<child>
<object class="GtkCheckButton" id="comments">
<property name="label" translatable="yes">_Comments</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -207,11 +191,9 @@
<child>
<object class="GtkCheckButton" id="formats">
<property name="label" translatable="yes">For_mats</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -225,11 +207,9 @@
<child>
<object class="GtkCheckButton" id="objects">
<property name="label" translatable="yes">_Objects</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
commit 86a62b361fb60bdb859c9e9c52b25ee5097b58bf
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Apr 9 16:17:59 2013 +0100
we can remove RID_SCDLG_DELCONT
Change-Id: I8edc9210bc172cd285fe4dce54d30606ecc7c716
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 0b460be..9d85a5a 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -953,7 +953,7 @@
#define RID_SCDLG_SPEC_FILTER (SC_DIALOGS_START + 9)
#define RID_SCDLG_DELCELL (SC_DIALOGS_START + 11)
#define RID_SCDLG_INSCELL (SC_DIALOGS_START + 12)
-#define RID_SCDLG_DELCONT (SC_DIALOGS_START + 13)
+
#define RID_SCDLG_INSCONT (SC_DIALOGS_START + 14)
#define RID_SCDLG_MOVETAB (SC_DIALOGS_START + 15)
#define RID_SCDLG_STRINPUT (SC_DIALOGS_START + 16)
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 14de680..7b6c602 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -363,8 +363,8 @@ public:
//for dataform
virtual AbstractScDataFormDlg * CreateScDataFormDlg( Window* pParent, int nId, ScTabViewShell* pTabViewShell ) = 0 ; //add for ScDataFormDlg
- virtual AbstractScDeleteContentsDlg * CreateScDeleteContentsDlg(Window* pParent,int nId, //add for ScDeleteContentsDlg
- sal_uInt16 nCheckDefaults = 0 ) = 0;
+ virtual AbstractScDeleteContentsDlg * CreateScDeleteContentsDlg(Window* pParent, //add for ScDeleteContentsDlg
+ sal_uInt16 nCheckDefaults = 0) = 0;
virtual AbstractScFillSeriesDlg * CreateScFillSeriesDlg( Window* pParent, //add for ScFillSeriesDlg
ScDocument& rDocument,
FillDir eFillDir,
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx
index 9ca906a..b6ce1f8 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -873,22 +873,11 @@ AbstractScDataFormDlg* ScAbstractDialogFactory_Impl::CreateScDataFormDlg( Window
-AbstractScDeleteContentsDlg* ScAbstractDialogFactory_Impl::CreateScDeleteContentsDlg(Window* pParent,int nId,
- sal_uInt16 nCheckDefaults )
+AbstractScDeleteContentsDlg* ScAbstractDialogFactory_Impl::CreateScDeleteContentsDlg(Window* pParent,
+ sal_uInt16 nCheckDefaults)
{
- ScDeleteContentsDlg * pDlg=NULL;
- switch ( nId )
- {
- case RID_SCDLG_DELCONT :
- pDlg = new ScDeleteContentsDlg( pParent, nCheckDefaults );
- break;
- default:
- break;
- }
-
- if ( pDlg )
- return new AbstractScDeleteContentsDlg_Impl( pDlg );
- return 0;
+ ScDeleteContentsDlg* pDlg = new ScDeleteContentsDlg(pParent, nCheckDefaults);
+ return new AbstractScDeleteContentsDlg_Impl( pDlg );
}
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx
index 65298a3..823eaeb 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -430,8 +430,8 @@ public:
//for dataform
virtual AbstractScDataFormDlg * CreateScDataFormDlg( Window* pParent, int nId, ScTabViewShell* pTabViewShell); //add for ScDeleteCellDlg
- virtual AbstractScDeleteContentsDlg * CreateScDeleteContentsDlg(Window* pParent,int nId, //add for ScDeleteContentsDlg
- sal_uInt16 nCheckDefaults = 0 );
+ virtual AbstractScDeleteContentsDlg * CreateScDeleteContentsDlg(Window* pParent, //add for ScDeleteContentsDlg
+ sal_uInt16 nCheckDefaults = 0);
virtual AbstractScFillSeriesDlg * CreateScFillSeriesDlg( Window* pParent, //add for ScFillSeriesDlg
ScDocument& rDocument,
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index 4377c80..04d6eb9 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -359,7 +359,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "ScAbstractFactory create fail!");
- AbstractScDeleteContentsDlg* pDlg = pFact->CreateScDeleteContentsDlg( pTabViewShell->GetDialogParent(), RID_SCDLG_DELCONT );
+ AbstractScDeleteContentsDlg* pDlg = pFact->CreateScDeleteContentsDlg(pTabViewShell->GetDialogParent());
OSL_ENSURE(pDlg, "Dialog create fail!");
ScDocument* pDoc = GetViewData()->GetDocument();
SCTAB nTab = GetViewData()->GetTabNo();
commit 88cf2853462b7eb14bfef77b5ad9f3e22397c36b
Author: Albert Thuswaldner <albert.thuswaldner at gmail.com>
Date: Mon Apr 8 17:25:17 2013 +0200
Convert scalc delete contents dialog to .ui
Change-Id: I1c84fe3c57fdd72880b16a2d69aa44cda0fc4f4f
diff --git a/sc/UI_scalc.mk b/sc/UI_scalc.mk
index 7dcec58..f7c13f0 100644
--- a/sc/UI_scalc.mk
+++ b/sc/UI_scalc.mk
@@ -12,6 +12,7 @@ $(eval $(call gb_UI_UI,modules/scalc))
$(eval $(call gb_UI_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/cellprotectionpage \
sc/uiconfig/scalc/ui/definename \
+ sc/uiconfig/scalc/ui/deletecontents \
sc/uiconfig/scalc/ui/formatcellsdialog \
sc/uiconfig/scalc/ui/insertname \
sc/uiconfig/scalc/ui/insertsheet \
diff --git a/sc/source/ui/inc/delcodlg.hxx b/sc/source/ui/inc/delcodlg.hxx
index 2034ec9..1cb4882 100644
--- a/sc/source/ui/inc/delcodlg.hxx
+++ b/sc/source/ui/inc/delcodlg.hxx
@@ -21,7 +21,6 @@
#define SC_DELCODLG_HXX
#include <vcl/dialog.hxx>
-#include <vcl/fixed.hxx>
#include <vcl/button.hxx>
#include "global.hxx"
@@ -30,18 +29,15 @@
class ScDeleteContentsDlg : public ModalDialog
{
private:
- FixedLine aFlFrame;
- CheckBox aBtnDelAll;
- CheckBox aBtnDelStrings;
- CheckBox aBtnDelNumbers;
- CheckBox aBtnDelDateTime;
- CheckBox aBtnDelFormulas;
- CheckBox aBtnDelNotes;
- CheckBox aBtnDelAttrs;
- CheckBox aBtnDelObjects;
- OKButton aBtnOk;
- CancelButton aBtnCancel;
- HelpButton aBtnHelp;
+ CheckBox* aBtnDelAll;
+ CheckBox* aBtnDelStrings;
+ CheckBox* aBtnDelNumbers;
+ CheckBox* aBtnDelDateTime;
+ CheckBox* aBtnDelFormulas;
+ CheckBox* aBtnDelNotes;
+ CheckBox* aBtnDelAttrs;
+ CheckBox* aBtnDelObjects;
+ OKButton* aBtnOk;
sal_Bool bObjectsDisabled;
@@ -63,5 +59,4 @@ public:
#endif // SC_DELCODLG_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/miscdlgs.hrc b/sc/source/ui/inc/miscdlgs.hrc
index b11a517..e98582f 100644
--- a/sc/source/ui/inc/miscdlgs.hrc
+++ b/sc/source/ui/inc/miscdlgs.hrc
@@ -19,7 +19,6 @@
#include "sc.hrc" // -> RID_SCDLG_DELCELL
// -> RID_SCDLG_INSCELL
- // -> RID_SCDLG_DELCONT
// -> RID_SCDLG_INSCONT
// -> RID_SCDLG_MOVETAB
// -> RID_SCDLG_STRINPUT
@@ -49,15 +48,7 @@
#define BTN_INSROWS 16
#define BTN_INSCOLS 17
-// Insert/Delete Contents Dialog
-#define BTN_DELALL 10
-#define BTN_DELSTRINGS 11
-#define BTN_DELNUMBERS 12
-#define BTN_DELDATETIME 13
-#define BTN_DELFORMULAS 14
-#define BTN_DELATTRS 15
-#define BTN_DELNOTES 16
-#define BTN_DELOBJECTS 17
+// Insert Contents Dialog
#define BTN_INSALL 20
#define BTN_INSSTRINGS 21
#define BTN_INSNUMBERS 22
diff --git a/sc/source/ui/miscdlgs/delcodlg.cxx b/sc/source/ui/miscdlgs/delcodlg.cxx
index 6f65d50..5a4673c 100644
--- a/sc/source/ui/miscdlgs/delcodlg.cxx
+++ b/sc/source/ui/miscdlgs/delcodlg.cxx
@@ -17,11 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#undef SC_DLLIMPLEMENTATION
-
-
//------------------------------------------------------------------
#include "delcodlg.hxx"
@@ -40,50 +37,45 @@ sal_uInt16 ScDeleteContentsDlg::nPreviousChecks = (IDF_DATETIME | IDF_STRING
ScDeleteContentsDlg::ScDeleteContentsDlg( Window* pParent,
sal_uInt16 nCheckDefaults ) :
- ModalDialog ( pParent, ScResId( RID_SCDLG_DELCONT ) ),
+ ModalDialog ( pParent, "DeleteContentsDialog", "modules/scalc/ui/deletecontents.ui" ),
//
- aFlFrame ( this, ScResId( FL_FRAME ) ),
- aBtnDelAll ( this, ScResId( BTN_DELALL ) ),
- aBtnDelStrings ( this, ScResId( BTN_DELSTRINGS ) ),
- aBtnDelNumbers ( this, ScResId( BTN_DELNUMBERS ) ),
- aBtnDelDateTime ( this, ScResId( BTN_DELDATETIME ) ),
- aBtnDelFormulas ( this, ScResId( BTN_DELFORMULAS ) ),
- aBtnDelNotes ( this, ScResId( BTN_DELNOTES ) ),
- aBtnDelAttrs ( this, ScResId( BTN_DELATTRS ) ),
- aBtnDelObjects ( this, ScResId( BTN_DELOBJECTS ) ),
- aBtnOk ( this, ScResId( BTN_OK ) ),
- aBtnCancel ( this, ScResId( BTN_CANCEL ) ),
- aBtnHelp ( this, ScResId( BTN_HELP ) ),
bObjectsDisabled( false )
{
+ get( aBtnDelAll, "deleteall" );
+ get( aBtnDelStrings, "text" );
+ get( aBtnDelNumbers, "numbers" );
+ get( aBtnDelDateTime, "datetime" );
+ get( aBtnDelFormulas, "formulas" );
+ get( aBtnDelNotes, "comments" );
+ get( aBtnDelAttrs, "formats" );
+ get( aBtnDelObjects, "objects" );
+ get( aBtnOk, "ok" );
+
if ( nCheckDefaults != 0 )
{
ScDeleteContentsDlg::nPreviousChecks = nCheckDefaults;
ScDeleteContentsDlg::bPreviousAllCheck = false;
}
- aBtnDelAll.Check ( ScDeleteContentsDlg::bPreviousAllCheck );
- aBtnDelStrings.Check ( IS_SET( IDF_STRING,
+ aBtnDelAll->Check ( ScDeleteContentsDlg::bPreviousAllCheck );
+ aBtnDelStrings->Check ( IS_SET( IDF_STRING,
ScDeleteContentsDlg::nPreviousChecks ) );
- aBtnDelNumbers.Check ( IS_SET( IDF_VALUE,
+ aBtnDelNumbers->Check ( IS_SET( IDF_VALUE,
ScDeleteContentsDlg::nPreviousChecks ) );
- aBtnDelDateTime.Check( IS_SET( IDF_DATETIME,
+ aBtnDelDateTime->Check( IS_SET( IDF_DATETIME,
ScDeleteContentsDlg::nPreviousChecks ) );
- aBtnDelFormulas.Check( IS_SET( IDF_FORMULA,
+ aBtnDelFormulas->Check( IS_SET( IDF_FORMULA,
ScDeleteContentsDlg::nPreviousChecks ) );
- aBtnDelNotes.Check ( IS_SET( IDF_NOTE,
+ aBtnDelNotes->Check ( IS_SET( IDF_NOTE,
ScDeleteContentsDlg::nPreviousChecks ) );
- aBtnDelAttrs.Check ( IS_SET( IDF_ATTRIB,
+ aBtnDelAttrs->Check ( IS_SET( IDF_ATTRIB,
ScDeleteContentsDlg::nPreviousChecks ) );
- aBtnDelObjects.Check ( IS_SET( IDF_OBJECTS,
+ aBtnDelObjects->Check ( IS_SET( IDF_OBJECTS,
ScDeleteContentsDlg::nPreviousChecks ) );
- DisableChecks( aBtnDelAll.IsChecked() );
+ DisableChecks( aBtnDelAll->IsChecked() );
- aBtnDelAll.SetClickHdl( LINK( this, ScDeleteContentsDlg, DelAllHdl ) );
-
- //-------------
- FreeResource();
+ aBtnDelAll->SetClickHdl( LINK( this, ScDeleteContentsDlg, DelAllHdl ) );
}
//------------------------------------------------------------------------
@@ -92,22 +84,22 @@ sal_uInt16 ScDeleteContentsDlg::GetDelContentsCmdBits() const
{
ScDeleteContentsDlg::nPreviousChecks = 0;
- if ( aBtnDelStrings.IsChecked() )
+ if ( aBtnDelStrings->IsChecked() )
ScDeleteContentsDlg::nPreviousChecks = IDF_STRING;
- if ( aBtnDelNumbers.IsChecked() )
+ if ( aBtnDelNumbers->IsChecked() )
ScDeleteContentsDlg::nPreviousChecks |= IDF_VALUE;
- if ( aBtnDelDateTime.IsChecked())
+ if ( aBtnDelDateTime->IsChecked())
ScDeleteContentsDlg::nPreviousChecks |= IDF_DATETIME;
- if ( aBtnDelFormulas.IsChecked())
+ if ( aBtnDelFormulas->IsChecked())
ScDeleteContentsDlg::nPreviousChecks |= IDF_FORMULA;
- if ( aBtnDelNotes.IsChecked() )
+ if ( aBtnDelNotes->IsChecked() )
ScDeleteContentsDlg::nPreviousChecks |= IDF_NOTE;
- if ( aBtnDelAttrs.IsChecked() )
+ if ( aBtnDelAttrs->IsChecked() )
ScDeleteContentsDlg::nPreviousChecks |= IDF_ATTRIB;
- if ( aBtnDelObjects.IsChecked() )
+ if ( aBtnDelObjects->IsChecked() )
ScDeleteContentsDlg::nPreviousChecks |= IDF_OBJECTS;
- ScDeleteContentsDlg::bPreviousAllCheck = aBtnDelAll.IsChecked();
+ ScDeleteContentsDlg::bPreviousAllCheck = aBtnDelAll->IsChecked();
return ( (ScDeleteContentsDlg::bPreviousAllCheck)
? IDF_ALL
@@ -120,26 +112,26 @@ void ScDeleteContentsDlg::DisableChecks( sal_Bool bDelAllChecked )
{
if ( bDelAllChecked )
{
- aBtnDelStrings.Disable();
- aBtnDelNumbers.Disable();
- aBtnDelDateTime.Disable();
- aBtnDelFormulas.Disable();
- aBtnDelNotes.Disable();
- aBtnDelAttrs.Disable();
- aBtnDelObjects.Disable();
+ aBtnDelStrings->Disable();
+ aBtnDelNumbers->Disable();
+ aBtnDelDateTime->Disable();
+ aBtnDelFormulas->Disable();
+ aBtnDelNotes->Disable();
+ aBtnDelAttrs->Disable();
+ aBtnDelObjects->Disable();
}
else
{
- aBtnDelStrings.Enable();
- aBtnDelNumbers.Enable();
- aBtnDelDateTime.Enable();
- aBtnDelFormulas.Enable();
- aBtnDelNotes.Enable();
- aBtnDelAttrs.Enable();
+ aBtnDelStrings->Enable();
+ aBtnDelNumbers->Enable();
+ aBtnDelDateTime->Enable();
+ aBtnDelFormulas->Enable();
+ aBtnDelNotes->Enable();
+ aBtnDelAttrs->Enable();
if (bObjectsDisabled)
- aBtnDelObjects.Disable();
+ aBtnDelObjects->Disable();
else
- aBtnDelObjects.Enable();
+ aBtnDelObjects->Enable();
}
}
@@ -148,15 +140,15 @@ void ScDeleteContentsDlg::DisableChecks( sal_Bool bDelAllChecked )
void ScDeleteContentsDlg::DisableObjects()
{
bObjectsDisabled = sal_True;
- aBtnDelObjects.Check(false);
- aBtnDelObjects.Disable();
+ aBtnDelObjects->Check(false);
+ aBtnDelObjects->Disable();
}
//------------------------------------------------------------------------
IMPL_LINK_NOARG_INLINE_START(ScDeleteContentsDlg, DelAllHdl)
{
- DisableChecks( aBtnDelAll.IsChecked() );
+ DisableChecks( aBtnDelAll->IsChecked() );
return 0;
}
@@ -166,6 +158,4 @@ ScDeleteContentsDlg::~ScDeleteContentsDlg()
{
}
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/src/miscdlgs.src b/sc/source/ui/src/miscdlgs.src
index e3ab4060..8dcf44a 100644
--- a/sc/source/ui/src/miscdlgs.src
+++ b/sc/source/ui/src/miscdlgs.src
@@ -155,107 +155,6 @@ ModalDialog RID_SCDLG_INSCELL
};
};
-ModalDialog RID_SCDLG_DELCONT
-{
- OutputSize = TRUE ;
- HelpId = CMD_SID_DELETE ;
- SVLook = TRUE ;
- Size = MAP_APPFONT ( 161 , 130 ) ;
- Text [ en-US ] = "Delete Contents" ;
- Moveable = TRUE ;
- Closeable = FALSE ;
- OKButton BTN_OK
- {
- Pos = MAP_APPFONT ( 105 , 6 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- DefButton = TRUE ;
- };
- CancelButton BTN_CANCEL
- {
- Pos = MAP_APPFONT ( 105 , 23 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- };
- HelpButton BTN_HELP
- {
- Pos = MAP_APPFONT ( 105 , 43 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- };
- CheckBox BTN_DELALL
- {
- HelpID = "sc:CheckBox:RID_SCDLG_DELCONT:BTN_DELALL";
- Pos = MAP_APPFONT ( 12 , 14 ) ;
- Size = MAP_APPFONT ( 83 , 10 ) ;
- Text [ en-US ] = "Delete ~all" ;
- TabStop = TRUE ;
- };
- CheckBox BTN_DELSTRINGS
- {
- HelpID = "sc:CheckBox:RID_SCDLG_DELCONT:BTN_DELSTRINGS";
- Pos = MAP_APPFONT ( 12 , 30 ) ;
- Size = MAP_APPFONT ( 83 , 10 ) ;
- Text [ en-US ] = "~Text" ;
- TabStop = TRUE ;
- };
- CheckBox BTN_DELNUMBERS
- {
- HelpID = "sc:CheckBox:RID_SCDLG_DELCONT:BTN_DELNUMBERS";
- Pos = MAP_APPFONT ( 12 , 44 ) ;
- Size = MAP_APPFONT ( 83 , 10 ) ;
- Text [ en-US ] = "~Numbers" ;
- TabStop = TRUE ;
- };
- CheckBox BTN_DELDATETIME
- {
- HelpID = "sc:CheckBox:RID_SCDLG_DELCONT:BTN_DELDATETIME";
- Pos = MAP_APPFONT ( 12 , 58 ) ;
- Size = MAP_APPFONT ( 83 , 10 ) ;
- Text [ en-US ] = "~Date & time" ;
- TabStop = TRUE ;
- };
- CheckBox BTN_DELFORMULAS
- {
- HelpID = "sc:CheckBox:RID_SCDLG_DELCONT:BTN_DELFORMULAS";
- Pos = MAP_APPFONT ( 12 , 72 ) ;
- Size = MAP_APPFONT ( 83 , 10 ) ;
- Text [ en-US ] = "~Formulas" ;
- TabStop = TRUE ;
- };
- CheckBox BTN_DELATTRS
- {
- HelpID = "sc:CheckBox:RID_SCDLG_DELCONT:BTN_DELATTRS";
- Pos = MAP_APPFONT ( 12 , 100 ) ;
- Size = MAP_APPFONT ( 83 , 10 ) ;
- Text [ en-US ] = "For~mats" ;
- TabStop = TRUE ;
- };
- CheckBox BTN_DELNOTES
- {
- HelpID = "sc:CheckBox:RID_SCDLG_DELCONT:BTN_DELNOTES";
- Pos = MAP_APPFONT ( 12 , 86 ) ;
- Size = MAP_APPFONT ( 83 , 10 ) ;
- Text [ en-US ] = "~Comments" ;
- TabStop = TRUE ;
- };
- CheckBox BTN_DELOBJECTS
- {
- HelpID = "sc:CheckBox:RID_SCDLG_DELCONT:BTN_DELOBJECTS";
- Pos = MAP_APPFONT ( 12 , 114 ) ;
- Size = MAP_APPFONT ( 83 , 10 ) ;
- Text [ en-US ] = "~Objects" ;
- TabStop = TRUE ;
- };
- FixedLine FL_FRAME
- {
- Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 93 , 8 ) ;
- Text [ en-US ] = "Selection" ;
- };
-};
-
-
ModalDialog RID_SCDLG_INSCONT
{
OutputSize = TRUE ;
diff --git a/sc/uiconfig/scalc/ui/deletecontents.ui b/sc/uiconfig/scalc/ui/deletecontents.ui
new file mode 100644
index 0000000..fd8f4e6
--- /dev/null
+++ b/sc/uiconfig/scalc/ui/deletecontents.ui
@@ -0,0 +1,279 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkDialog" id="DeleteContentsDialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+ <property name="title" translatable="yes">Import Options</property>
+ <property name="type_hint">dialog</property>
+ <child internal-child="vbox">
+ <object class="GtkBox" id="dialog-vbox1">
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area1">
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="layout_style">start</property>
+ <child>
+ <object class="GtkButton" id="ok">
+ <property name="label">gtk-ok</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="cancel">
+ <property name="label">gtk-cancel</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="help">
+ <property name="label">gtk-help</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkFrame" id="frame2">
+ <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="alignment1">
+ <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="GtkBox" id="box2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkCheckButton" id="deleteall">
+ <property name="label" translatable="yes">Delete _all</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="text">
+ <property name="label" translatable="yes">_Text</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="numbers">
+ <property name="label" translatable="yes">_Numbers</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="datetime">
+ <property name="label" translatable="yes">_Date & time</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="formulas">
+ <property name="label" translatable="yes">_Formulas</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">5</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="comments">
+ <property name="label" translatable="yes">_Comments</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">6</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="formats">
+ <property name="label" translatable="yes">For_mats</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">7</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="objects">
+ <property name="label" translatable="yes">_Objects</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">8</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Selection</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="0">ok</action-widget>
+ <action-widget response="0">cancel</action-widget>
+ <action-widget response="0">help</action-widget>
+ </action-widgets>
+ </object>
+</interface>
commit 9b7a69d6e65572f04cfb47797c749e944544da0e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Apr 10 12:47:51 2013 +0100
Updated core
Project: help 68d0b1b6fc3fe84b2750018fe1c966486499f85c
diff --git a/helpcontent2 b/helpcontent2
index a4e6169..68d0b1b 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit a4e6169aed45fa4b0cb1ba2c5ec784ea63a3a874
+Subproject commit 68d0b1b6fc3fe84b2750018fe1c966486499f85c
More information about the Libreoffice-commits
mailing list