[Libreoffice-commits] core.git: sc/AllLangResTarget_sc.mk sc/inc sc/source sc/uiconfig sc/UIConfig_scalc.mk
Csikós Tamás
csks.tomi at gmail.com
Wed Jul 24 12:29:40 PDT 2013
sc/AllLangResTarget_sc.mk | 1
sc/UIConfig_scalc.mk | 1
sc/inc/sc.hrc | 2
sc/source/ui/inc/crnrdlg.hrc | 39 ---
sc/source/ui/inc/crnrdlg.hxx | 30 +-
sc/source/ui/miscdlgs/crnrdlg.cxx | 373 +++++++++++++++----------------
sc/source/ui/src/crnrdlg.src | 137 -----------
sc/uiconfig/scalc/ui/namerangesdialog.ui | 345 ++++++++++++++++++++++++++++
8 files changed, 546 insertions(+), 382 deletions(-)
New commits:
commit cc464d66fe3448e54eeef1ea57a78edce4ddc1ac
Author: Csikós Tamás <csks.tomi at gmail.com>
Date: Wed Jul 24 14:01:37 2013 +0200
modern .ui widgetlayout for crnrdlg
Change-Id: If7e7e18339d50af4a677fcd8ad7d88c5820f6bab
Reviewed-on: https://gerrit.libreoffice.org/5064
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/sc/AllLangResTarget_sc.mk b/sc/AllLangResTarget_sc.mk
index 23e1a59..03fd7bd 100644
--- a/sc/AllLangResTarget_sc.mk
+++ b/sc/AllLangResTarget_sc.mk
@@ -44,7 +44,6 @@ $(eval $(call gb_SrsTarget_add_files,sc/res,\
sc/source/ui/src/sc.src \
sc/source/ui/src/pseudo.src \
sc/source/ui/src/subtdlg.src \
- sc/source/ui/src/crnrdlg.src \
sc/source/ui/src/hdrcont.src \
sc/source/ui/src/scerrors.src \
sc/source/ui/src/simpref.src \
diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index ea74595..3244ea2 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -85,6 +85,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/insertsheet \
sc/uiconfig/scalc/ui/leftfooterdialog \
sc/uiconfig/scalc/ui/leftheaderdialog \
+ sc/uiconfig/scalc/ui/namerangesdialog \
sc/uiconfig/scalc/ui/managenamesdialog \
sc/uiconfig/scalc/ui/optcalculatepage \
sc/uiconfig/scalc/ui/optchangespage \
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 6df1a87..7ee45d0 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -1057,8 +1057,6 @@
#define RID_SCDLG_SHOW_TAB (SC_DIALOGS_START + 109)
-#define RID_SCDLG_COLROWNAMERANGES (SC_DIALOGS_START + 112)
-
#define RID_SCPAGE_CONTENT (SC_DIALOGS_START + 113)
#define RID_SCPAGE_LAYOUT (SC_DIALOGS_START + 114)
diff --git a/sc/source/ui/inc/crnrdlg.hrc b/sc/source/ui/inc/crnrdlg.hrc
deleted file mode 100644
index 9d170c0d..0000000
--- a/sc/source/ui/inc/crnrdlg.hrc
+++ /dev/null
@@ -1,39 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "sc.hrc" // -> RID_SCDLG_COLROWNAMERANGES
-
-#define BTN_OK 1
-#define BTN_CANCEL 2
-#define BTN_ADD 3
-#define BTN_REMOVE 4
-#define BTN_HELP 5
-
-#define LB_RANGE 11
-
-#define FL_ASSIGN 12
-#define ED_AREA 13
-#define RB_AREA 14
-#define BTN_COLHEAD 15
-#define BTN_ROWHEAD 16
-#define ED_DATA 17
-#define RB_DATA 18
-#define FT_DATA_LABEL 19
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/crnrdlg.hxx b/sc/source/ui/inc/crnrdlg.hxx
index 498de19..c2efd2d 100644
--- a/sc/source/ui/inc/crnrdlg.hxx
+++ b/sc/source/ui/inc/crnrdlg.hxx
@@ -47,22 +47,20 @@ public:
virtual sal_Bool Close();
private:
- FixedLine aFlAssign;
- ListBox aLbRange;
-
- formula::RefEdit aEdAssign;
- formula::RefButton aRbAssign;
- RadioButton aBtnColHead;
- RadioButton aBtnRowHead;
- FixedText aFtAssign2;
- formula::RefEdit aEdAssign2;
- formula::RefButton aRbAssign2;
-
- OKButton aBtnOk;
- CancelButton aBtnCancel;
- HelpButton aBtnHelp;
- PushButton aBtnAdd;
- PushButton aBtnRemove;
+ ListBox* pLbRange;
+
+ formula::RefEdit* pEdAssign;
+ formula::RefButton* pRbAssign;
+ RadioButton* pBtnColHead;
+ RadioButton* pBtnRowHead;
+ formula::RefEdit* pEdAssign2;
+ formula::RefButton* pRbAssign2;
+
+ OKButton* pBtnOk;
+ CancelButton* pBtnCancel;
+ HelpButton* pBtnHelp;
+ PushButton* pBtnAdd;
+ PushButton* pBtnRemove;
ScRange theCurArea;
ScRange theCurData;
diff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx b/sc/source/ui/miscdlgs/crnrdlg.cxx
index e692f3d..0e38a24 100644
--- a/sc/source/ui/miscdlgs/crnrdlg.cxx
+++ b/sc/source/ui/miscdlgs/crnrdlg.cxx
@@ -21,7 +21,6 @@
#include "document.hxx"
#include "scresid.hxx"
#include "globstr.hrc"
-#include "crnrdlg.hrc"
#include "docsh.hxx"
#define _CRNRDLG_CXX
@@ -68,24 +67,7 @@ ScColRowNameRangesDlg::ScColRowNameRangesDlg( SfxBindings* pB,
Window* pParent,
ScViewData* ptrViewData )
- : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_COLROWNAMERANGES ),
-
- aFlAssign ( this, ScResId( FL_ASSIGN ) ),
- aLbRange ( this, ScResId( LB_RANGE ) ),
-
- aEdAssign ( this, this, &aFlAssign, ScResId( ED_AREA ) ),
- aRbAssign ( this, ScResId( RB_AREA ), &aEdAssign, this ),
- aBtnColHead ( this, ScResId( BTN_COLHEAD ) ),
- aBtnRowHead ( this, ScResId( BTN_ROWHEAD ) ),
- aFtAssign2 ( this, ScResId( FT_DATA_LABEL ) ),
- aEdAssign2 ( this, this, &aFtAssign2, ScResId( ED_DATA ) ),
- aRbAssign2 ( this, ScResId( RB_DATA ), &aEdAssign2, this ),
-
- aBtnOk ( this, ScResId( BTN_OK ) ),
- aBtnCancel ( this, ScResId( BTN_CANCEL ) ),
- aBtnHelp ( this, ScResId( BTN_HELP ) ),
- aBtnAdd ( this, ScResId( BTN_ADD ) ),
- aBtnRemove ( this, ScResId( BTN_REMOVE ) ),
+ : ScAnyRefDlg ( pB, pCW, pParent, "NameRangesDialog" , "modules/scalc/ui/namerangesdialog.ui" ),
pViewData ( ptrViewData ),
pDoc ( ptrViewData->GetDocument() ),
@@ -93,13 +75,28 @@ ScColRowNameRangesDlg::ScColRowNameRangesDlg( SfxBindings* pB,
pEdActive ( NULL ),
bDlgLostFocus ( false )
{
+ get(pLbRange,"range");
+
+ get(pEdAssign,"edassign");
+ get(pRbAssign,"rbassign");
+ pRbAssign->SetReferences(this, pEdAssign);
+ get(pBtnColHead,"colhead");
+ get(pBtnRowHead,"rowhead");
+ get(pEdAssign2,"edassign2");
+ get(pRbAssign2,"rbassign2");
+ pRbAssign2->SetReferences(this, pEdAssign2);
+
+ get(pBtnOk,"ok");
+ get(pBtnCancel,"cancel");
+ get(pBtnAdd,"add");
+ get(pBtnRemove,"delete");
+
xColNameRanges = pDoc->GetColNameRanges()->Clone();
xRowNameRanges = pDoc->GetRowNameRanges()->Clone();
Init();
- FreeResource();
- aRbAssign.SetAccessibleRelationMemberOf(&aEdAssign);
- aRbAssign2.SetAccessibleRelationMemberOf(&aEdAssign);
+ pRbAssign->SetAccessibleRelationMemberOf(pEdAssign);
+ pRbAssign2->SetAccessibleRelationMemberOf(pEdAssign);
}
@@ -140,29 +137,31 @@ ScColRowNameRangesDlg::~ScColRowNameRangesDlg()
void ScColRowNameRangesDlg::Init()
{
- aBtnOk.SetClickHdl ( LINK( this, ScColRowNameRangesDlg, OkBtnHdl ) );
- aBtnCancel.SetClickHdl ( LINK( this, ScColRowNameRangesDlg, CancelBtnHdl ) );
- aBtnAdd.SetClickHdl ( LINK( this, ScColRowNameRangesDlg, AddBtnHdl ) );
- aBtnRemove.SetClickHdl ( LINK( this, ScColRowNameRangesDlg, RemoveBtnHdl ) );
- aLbRange.SetSelectHdl ( LINK( this, ScColRowNameRangesDlg, Range1SelectHdl ) );
- aEdAssign.SetModifyHdl ( LINK( this, ScColRowNameRangesDlg, Range1DataModifyHdl ) );
- aBtnColHead.SetClickHdl ( LINK( this, ScColRowNameRangesDlg, ColClickHdl ) );
- aBtnRowHead.SetClickHdl ( LINK( this, ScColRowNameRangesDlg, RowClickHdl ) );
- aEdAssign2.SetModifyHdl ( LINK( this, ScColRowNameRangesDlg, Range2DataModifyHdl ) );
+ pBtnOk->SetClickHdl ( LINK( this, ScColRowNameRangesDlg, OkBtnHdl ) );
+ pBtnCancel->SetClickHdl ( LINK( this, ScColRowNameRangesDlg, CancelBtnHdl ) );
+ pBtnAdd->SetClickHdl ( LINK( this, ScColRowNameRangesDlg, AddBtnHdl ) );
+ pBtnRemove->SetClickHdl ( LINK( this, ScColRowNameRangesDlg, RemoveBtnHdl ) );
+ pLbRange->SetSelectHdl ( LINK( this, ScColRowNameRangesDlg, Range1SelectHdl ) );
+ pEdAssign->SetModifyHdl ( LINK( this, ScColRowNameRangesDlg, Range1DataModifyHdl ) );
+ pBtnColHead->SetClickHdl ( LINK( this, ScColRowNameRangesDlg, ColClickHdl ) );
+ pBtnRowHead->SetClickHdl ( LINK( this, ScColRowNameRangesDlg, RowClickHdl ) );
+ pEdAssign2->SetModifyHdl ( LINK( this, ScColRowNameRangesDlg, Range2DataModifyHdl ) );
Link aLink = LINK( this, ScColRowNameRangesDlg, GetFocusHdl );
- aEdAssign.SetGetFocusHdl( aLink );
- aRbAssign.SetGetFocusHdl( aLink );
- aEdAssign2.SetGetFocusHdl( aLink );
- aRbAssign2.SetGetFocusHdl( aLink );
+ pEdAssign->SetGetFocusHdl( aLink );
+ pRbAssign->SetGetFocusHdl( aLink );
+ pEdAssign2->SetGetFocusHdl( aLink );
+ pRbAssign2->SetGetFocusHdl( aLink );
aLink = LINK( this, ScColRowNameRangesDlg, LoseFocusHdl );
- aEdAssign.SetLoseFocusHdl( aLink );
- aRbAssign.SetLoseFocusHdl( aLink );
- aEdAssign2.SetLoseFocusHdl( aLink );
- aRbAssign2.SetLoseFocusHdl( aLink );
+ pEdAssign->SetLoseFocusHdl( aLink );
+ pRbAssign->SetLoseFocusHdl( aLink );
+ pEdAssign2->SetLoseFocusHdl( aLink );
+ pRbAssign2->SetLoseFocusHdl( aLink );
+
+ pLbRange->SetDropDownLineCount(10);
- pEdActive = &aEdAssign;
+ pEdActive = pEdAssign;
UpdateNames();
@@ -181,18 +180,18 @@ void ScColRowNameRangesDlg::Init()
}
else
{
- aBtnColHead.Check( sal_True );
- aBtnRowHead.Check( false );
- aEdAssign.SetText( EMPTY_STRING );
- aEdAssign2.SetText( EMPTY_STRING );
+ pBtnColHead->Check( sal_True );
+ pBtnRowHead->Check( false );
+ pEdAssign->SetText( EMPTY_STRING );
+ pEdAssign2->SetText( EMPTY_STRING );
}
- aLbRange.SetBorderStyle( WINDOW_BORDER_MONO );
- aBtnColHead.Enable();
- aBtnRowHead.Enable();
- aEdAssign.Enable();
- aEdAssign.GrabFocus();
- aRbAssign.Enable();
+ pLbRange->SetBorderStyle( WINDOW_BORDER_MONO );
+ pBtnColHead->Enable();
+ pBtnRowHead->Enable();
+ pEdAssign->Enable();
+ pEdAssign->GrabFocus();
+ pRbAssign->Enable();
Range1SelectHdl( 0 );
}
@@ -224,8 +223,8 @@ void ScColRowNameRangesDlg::SetColRowData( const ScRange& rLabelRange,sal_Bool b
SCROW nRow2 = theCurArea.aEnd.Row();
if ( (static_cast<SCCOLROW>(nCol2 - nCol1) >= nRow2 - nRow1) || (nCol1 == 0 && nCol2 == MAXCOL) )
{ // Spaltenkoepfe und Grenzfall gesamte Tabelle
- aBtnColHead.Check( sal_True );
- aBtnRowHead.Check( false );
+ pBtnColHead->Check( sal_True );
+ pBtnRowHead->Check( false );
if ( nRow2 == MAXROW )
{
if ( nRow1 == 0 )
@@ -244,8 +243,8 @@ void ScColRowNameRangesDlg::SetColRowData( const ScRange& rLabelRange,sal_Bool b
}
else
{ // Zeilenkoepfe
- aBtnRowHead.Check( sal_True );
- aBtnColHead.Check( false );
+ pBtnRowHead->Check( sal_True );
+ pBtnColHead->Check( false );
if ( nCol2 == MAXCOL )
{ // Head rechts, Data links
theCurData.aStart.SetCol( 0 );
@@ -264,17 +263,17 @@ void ScColRowNameRangesDlg::SetColRowData( const ScRange& rLabelRange,sal_Bool b
theCurArea.Format( aStr, SCR_ABS_3D, pDoc, eConv );
if(bRef)
- aEdAssign.SetRefString( aStr );
+ pEdAssign->SetRefString( aStr );
else
- aEdAssign.SetText( aStr );
+ pEdAssign->SetText( aStr );
- aEdAssign.SetSelection( Selection( SELECTION_MAX, SELECTION_MAX ) );
+ pEdAssign->SetSelection( Selection( SELECTION_MAX, SELECTION_MAX ) );
theCurData.Format( aStr, SCR_ABS_3D, pDoc, eConv );
if(bRef)
- aEdAssign2.SetRefString( aStr );
+ pEdAssign2->SetRefString( aStr );
else
- aEdAssign2.SetText( aStr );
+ pEdAssign2->SetText( aStr );
}
else
{
@@ -282,19 +281,19 @@ void ScColRowNameRangesDlg::SetColRowData( const ScRange& rLabelRange,sal_Bool b
if(bRef)
{
- aEdAssign.SetRefString( EMPTY_STRING );
- aEdAssign2.SetRefString( EMPTY_STRING );
+ pEdAssign->SetRefString( EMPTY_STRING );
+ pEdAssign2->SetRefString( EMPTY_STRING );
}
else
{
- aEdAssign.SetText( EMPTY_STRING );
- aEdAssign2.SetText( EMPTY_STRING );
+ pEdAssign->SetText( EMPTY_STRING );
+ pEdAssign2->SetText( EMPTY_STRING );
}
- aBtnColHead.Disable();
- aBtnRowHead.Disable();
- aEdAssign2.Disable();
- aRbAssign2.Disable();
+ pBtnColHead->Disable();
+ pBtnRowHead->Disable();
+ pEdAssign2->Disable();
+ pRbAssign2->Disable();
}
}
@@ -317,7 +316,7 @@ void ScColRowNameRangesDlg::SetColRowData( const ScRange& rLabelRange,sal_Bool b
void ScColRowNameRangesDlg::AdjustColRowData( const ScRange& rDataRange,sal_Bool bRef)
{
theCurData = rDataRange;
- if ( aBtnColHead.IsChecked() )
+ if ( pBtnColHead->IsChecked() )
{ // Datenbereich gleiche Spalten wie Koepfe
theCurData.aStart.SetCol( theCurArea.aStart.Col() );
theCurData.aEnd.SetCol( theCurArea.aEnd.Col() );
@@ -367,11 +366,11 @@ void ScColRowNameRangesDlg::AdjustColRowData( const ScRange& rDataRange,sal_Bool
theCurData.Format( aStr, SCR_ABS_3D, pDoc, pDoc->GetAddressConvention() );
if(bRef)
- aEdAssign2.SetRefString( aStr );
+ pEdAssign2->SetRefString( aStr );
else
- aEdAssign2.SetText( aStr );
+ pEdAssign2->SetText( aStr );
- aEdAssign2.SetSelection( Selection( SELECTION_MAX, SELECTION_MAX ) );
+ pEdAssign2->SetSelection( Selection( SELECTION_MAX, SELECTION_MAX ) );
}
@@ -399,14 +398,14 @@ void ScColRowNameRangesDlg::SetReference( const ScRange& rRef, ScDocument* /* pD
if ( rRef.aStart != rRef.aEnd )
RefInputStart( pEdActive );
- if ( pEdActive == &aEdAssign )
+ if ( pEdActive == pEdAssign )
SetColRowData( rRef, sal_True );
else
AdjustColRowData( rRef, sal_True );
- aBtnColHead.Enable();
- aBtnRowHead.Enable();
- aBtnAdd.Enable();
- aBtnRemove.Disable();
+ pBtnColHead->Enable();
+ pBtnRowHead->Enable();
+ pBtnAdd->Enable();
+ pBtnRemove->Disable();
}
}
@@ -456,9 +455,9 @@ void ScColRowNameRangesDlg::SetActive()
else
GrabFocus();
- if( pEdActive == &aEdAssign )
+ if( pEdActive == pEdAssign )
Range1DataModifyHdl( 0 );
- else if( pEdActive == &aEdAssign2 )
+ else if( pEdActive == pEdAssign2 )
Range2DataModifyHdl( 0 );
RefInputDone();
@@ -481,11 +480,11 @@ void ScColRowNameRangesDlg::SetActive()
void ScColRowNameRangesDlg::UpdateNames()
{
- aLbRange.SetUpdateMode( false );
+ pLbRange->SetUpdateMode( false );
//-----------------------------------------------------------
- aLbRange.Clear();
+ pLbRange->Clear();
aRangeMap.clear();
- aEdAssign.SetText( EMPTY_STRING );
+ pEdAssign->SetText( EMPTY_STRING );
size_t nCount, j;
sal_uInt16 nPos; //@008 Hilfsvariable q eingefuegt
@@ -505,8 +504,8 @@ void ScColRowNameRangesDlg::UpdateNames()
aString = strDelim;
aString += ScGlobal::GetRscString( STR_COLUMN );
aString += strDelim;
- nPos = aLbRange.InsertEntry( aString );
- aLbRange.SetEntryData( nPos, (void*)nEntryDataDelim );
+ nPos = pLbRange->InsertEntry( aString );
+ pLbRange->SetEntryData( nPos, (void*)nEntryDataDelim );
if ( (nCount = xColNameRanges->size()) > 0 )
{
ScRangePair** ppSortArray = xColNameRanges->CreateNameSortedArray(
@@ -543,17 +542,17 @@ void ScColRowNameRangesDlg::UpdateNames()
//@008 String einfuegen in Listbox
String aInsStr = aString;
aInsStr += strShow;
- nPos = aLbRange.InsertEntry( aInsStr );
+ nPos = pLbRange->InsertEntry( aInsStr );
aRangeMap.insert( NameRangeMap::value_type(aInsStr, aRange) );
- aLbRange.SetEntryData( nPos, (void*)nEntryDataCol );
+ pLbRange->SetEntryData( nPos, (void*)nEntryDataCol );
}
delete [] ppSortArray;
}
aString = strDelim;
aString += ScGlobal::GetRscString( STR_ROW );
aString += strDelim;
- nPos = aLbRange.InsertEntry( aString );
- aLbRange.SetEntryData( nPos, (void*)nEntryDataDelim );
+ nPos = pLbRange->InsertEntry( aString );
+ pLbRange->SetEntryData( nPos, (void*)nEntryDataDelim );
if ( (nCount = xRowNameRanges->size()) > 0 )
{
ScRangePair** ppSortArray = xRowNameRanges->CreateNameSortedArray(
@@ -588,15 +587,15 @@ void ScColRowNameRangesDlg::UpdateNames()
String aInsStr = aString;
aInsStr += strShow;
- nPos = aLbRange.InsertEntry( aInsStr );
+ nPos = pLbRange->InsertEntry( aInsStr );
aRangeMap.insert( NameRangeMap::value_type(aInsStr, aRange) );
- aLbRange.SetEntryData( nPos, (void*)nEntryDataRow );
+ pLbRange->SetEntryData( nPos, (void*)nEntryDataRow );
}
delete [] ppSortArray;
}
//-----------------------------------------------------------
- aLbRange.SetUpdateMode( sal_True );
- aLbRange.Invalidate();
+ pLbRange->SetUpdateMode( sal_True );
+ pLbRange->Invalidate();
}
@@ -630,24 +629,24 @@ void ScColRowNameRangesDlg::UpdateRangeData( const ScRange& rRange, sal_Bool bCo
String aStr;
theCurArea = rRange;
theCurArea.Format( aStr, SCR_ABS_3D, pDoc, eConv );
- aEdAssign.SetText( aStr );
- aBtnAdd.Disable();
- aBtnRemove.Enable();
- aBtnColHead.Check( bColName );
- aBtnRowHead.Check( !bColName );
+ pEdAssign->SetText( aStr );
+ pBtnAdd->Disable();
+ pBtnRemove->Enable();
+ pBtnColHead->Check( bColName );
+ pBtnRowHead->Check( !bColName );
theCurData = pPair->GetRange(1);
theCurData.Format( aStr, SCR_ABS_3D, pDoc, eConv );
- aEdAssign2.SetText( aStr );
+ pEdAssign2->SetText( aStr );
}
else
{
- aBtnAdd.Enable();
- aBtnRemove.Disable();
+ pBtnAdd->Enable();
+ pBtnRemove->Disable();
}
- aBtnColHead.Enable();
- aBtnRowHead.Enable();
- aEdAssign2.Enable();
- aRbAssign2.Enable();
+ pBtnColHead->Enable();
+ pBtnRowHead->Enable();
+ pEdAssign2->Enable();
+ pRbAssign2->Enable();
}
@@ -749,8 +748,8 @@ IMPL_LINK_NOARG_INLINE_END(ScColRowNameRangesDlg, CancelBtnHdl)
IMPL_LINK_NOARG(ScColRowNameRangesDlg, AddBtnHdl)
{
- String aNewArea( aEdAssign.GetText() );
- String aNewData( aEdAssign2.GetText() );
+ String aNewArea( pEdAssign->GetText() );
+ String aNewData( pEdAssign2->GetText() );
if ( aNewArea.Len() > 0 && aNewData.Len() > 0 )
{
@@ -773,20 +772,20 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, AddBtnHdl)
xRowNameRanges->Remove( pPair );
delete pPair;
}
- if ( aBtnColHead.IsChecked() )
+ if ( pBtnColHead->IsChecked() )
xColNameRanges->Join( ScRangePair( theCurArea, theCurData ) );
else
xRowNameRanges->Join( ScRangePair( theCurArea, theCurData ) );
UpdateNames();
- aEdAssign.GrabFocus();
- aBtnAdd.Disable();
- aBtnRemove.Disable();
- aEdAssign.SetText( EMPTY_STRING );
- aBtnColHead.Check( sal_True );
- aBtnRowHead.Check( false );
- aEdAssign2.SetText( EMPTY_STRING );
+ pEdAssign->GrabFocus();
+ pBtnAdd->Disable();
+ pBtnRemove->Disable();
+ pEdAssign->SetText( EMPTY_STRING );
+ pBtnColHead->Check( sal_True );
+ pBtnRowHead->Check( false );
+ pEdAssign2->SetText( EMPTY_STRING );
theCurArea = ScRange();
theCurData = theCurArea;
Range1SelectHdl( 0 );
@@ -795,9 +794,9 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, AddBtnHdl)
{
ERRORBOX( ScGlobal::GetRscString(STR_INVALIDTABNAME) );
if ( !bOk1 )
- aEdAssign.GrabFocus();
+ pEdAssign->GrabFocus();
else
- aEdAssign2.GrabFocus();
+ pEdAssign2->GrabFocus();
}
}
return 0;
@@ -821,10 +820,10 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, AddBtnHdl)
IMPL_LINK_NOARG(ScColRowNameRangesDlg, RemoveBtnHdl)
{
- String aRangeStr = aLbRange.GetSelectEntry();
- sal_uInt16 nSelectPos = aLbRange.GetSelectEntryPos();
+ String aRangeStr = pLbRange->GetSelectEntry();
+ sal_uInt16 nSelectPos = pLbRange->GetSelectEntryPos();
sal_Bool bColName =
- ((sal_uLong)aLbRange.GetEntryData( nSelectPos ) == nEntryDataCol);
+ ((sal_uLong)pLbRange->GetEntryData( nSelectPos ) == nEntryDataCol);
NameRangeMap::const_iterator itr = aRangeMap.find(aRangeStr);
if (itr == aRangeMap.end())
return 0;
@@ -853,7 +852,7 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, RemoveBtnHdl)
delete pPair;
UpdateNames();
- sal_uInt16 nCnt = aLbRange.GetEntryCount();
+ sal_uInt16 nCnt = pLbRange->GetEntryCount();
if ( nSelectPos >= nCnt )
{
if ( nCnt )
@@ -861,19 +860,19 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, RemoveBtnHdl)
else
nSelectPos = 0;
}
- aLbRange.SelectEntryPos( nSelectPos );
+ pLbRange->SelectEntryPos( nSelectPos );
if ( nSelectPos &&
- (sal_uLong)aLbRange.GetEntryData( nSelectPos ) == nEntryDataDelim )
- aLbRange.SelectEntryPos( --nSelectPos ); // ---Zeile---
+ (sal_uLong)pLbRange->GetEntryData( nSelectPos ) == nEntryDataDelim )
+ pLbRange->SelectEntryPos( --nSelectPos ); // ---Zeile---
- aLbRange.GrabFocus();
- aBtnAdd.Disable();
- aBtnRemove.Disable();
- aEdAssign.SetText( EMPTY_STRING );
+ pLbRange->GrabFocus();
+ pBtnAdd->Disable();
+ pBtnRemove->Disable();
+ pEdAssign->SetText( EMPTY_STRING );
theCurArea = theCurData = ScRange();
- aBtnColHead.Check( sal_True );
- aBtnRowHead.Check( false );
- aEdAssign2.SetText( EMPTY_STRING );
+ pBtnColHead->Check( sal_True );
+ pBtnRowHead->Check( false );
+ pEdAssign2->SetText( EMPTY_STRING );
Range1SelectHdl( 0 );
}
}
@@ -899,69 +898,69 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, RemoveBtnHdl)
IMPL_LINK_NOARG(ScColRowNameRangesDlg, Range1SelectHdl)
{
- sal_uInt16 nSelectPos = aLbRange.GetSelectEntryPos();
- sal_uInt16 nCnt = aLbRange.GetEntryCount();
+ sal_uInt16 nSelectPos = pLbRange->GetSelectEntryPos();
+ sal_uInt16 nCnt = pLbRange->GetEntryCount();
sal_uInt16 nMoves = 0;
while ( nSelectPos < nCnt
- && (sal_uLong)aLbRange.GetEntryData( nSelectPos ) == nEntryDataDelim )
+ && (sal_uLong)pLbRange->GetEntryData( nSelectPos ) == nEntryDataDelim )
{ // skip Delimiter
++nMoves;
- aLbRange.SelectEntryPos( ++nSelectPos );
+ pLbRange->SelectEntryPos( ++nSelectPos );
}
- String aRangeStr = aLbRange.GetSelectEntry();
+ String aRangeStr = pLbRange->GetSelectEntry();
if ( nMoves )
{
if ( nSelectPos > 1 && nSelectPos >= nCnt )
{ // am Ende nicht auf dem " --- Zeile --- " Delimiter stehenbleiben
// wenn davor Eintraege existieren
nSelectPos = nCnt - 2;
- aLbRange.SelectEntryPos( nSelectPos );
- aRangeStr = aLbRange.GetSelectEntry();
+ pLbRange->SelectEntryPos( nSelectPos );
+ aRangeStr = pLbRange->GetSelectEntry();
}
else if ( nSelectPos > 2 && nSelectPos < nCnt && aRangeStr.Len()
- && OUString(aRangeStr) == aEdAssign.GetText() )
+ && OUString(aRangeStr) == pEdAssign->GetText() )
{ // nach oben wandern statt nach unten auf die vorherige Position
nSelectPos -= 2;
- aLbRange.SelectEntryPos( nSelectPos );
- aRangeStr = aLbRange.GetSelectEntry();
+ pLbRange->SelectEntryPos( nSelectPos );
+ aRangeStr = pLbRange->GetSelectEntry();
}
}
NameRangeMap::const_iterator itr = aRangeMap.find(aRangeStr);
if ( itr != aRangeMap.end() )
{
sal_Bool bColName =
- ((sal_uLong)aLbRange.GetEntryData( nSelectPos ) == nEntryDataCol);
+ ((sal_uLong)pLbRange->GetEntryData( nSelectPos ) == nEntryDataCol);
UpdateRangeData( itr->second, bColName );
- aBtnAdd.Disable();
- aBtnRemove.Enable();
+ pBtnAdd->Disable();
+ pBtnRemove->Enable();
}
else
{
- if ( !aEdAssign.GetText().isEmpty() )
+ if ( !pEdAssign->GetText().isEmpty() )
{
- if ( !aEdAssign2.GetText().isEmpty() )
- aBtnAdd.Enable();
+ if ( !pEdAssign2->GetText().isEmpty() )
+ pBtnAdd->Enable();
else
- aBtnAdd.Disable();
- aBtnColHead.Enable();
- aBtnRowHead.Enable();
- aEdAssign2.Enable();
- aRbAssign2.Enable();
+ pBtnAdd->Disable();
+ pBtnColHead->Enable();
+ pBtnRowHead->Enable();
+ pEdAssign2->Enable();
+ pRbAssign2->Enable();
}
else
{
- aBtnAdd.Disable();
- aBtnColHead.Disable();
- aBtnRowHead.Disable();
- aEdAssign2.Disable();
- aRbAssign2.Disable();
+ pBtnAdd->Disable();
+ pBtnColHead->Disable();
+ pBtnRowHead->Disable();
+ pEdAssign2->Disable();
+ pRbAssign2->Disable();
}
- aBtnRemove.Disable();
- aEdAssign.GrabFocus();
+ pBtnRemove->Disable();
+ pEdAssign->GrabFocus();
}
- aEdAssign.Enable();
- aRbAssign.Enable();
+ pEdAssign->Enable();
+ pRbAssign->Enable();
return 0;
}
@@ -984,7 +983,7 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, Range1SelectHdl)
IMPL_LINK_NOARG(ScColRowNameRangesDlg, Range1DataModifyHdl)
{
- String aNewArea( aEdAssign.GetText() );
+ String aNewArea( pEdAssign->GetText() );
sal_Bool bValid = false;
if ( aNewArea.Len() > 0 )
{
@@ -997,21 +996,21 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, Range1DataModifyHdl)
}
if ( bValid )
{
- aBtnAdd.Enable();
- aBtnColHead.Enable();
- aBtnRowHead.Enable();
- aEdAssign2.Enable();
- aRbAssign2.Enable();
+ pBtnAdd->Enable();
+ pBtnColHead->Enable();
+ pBtnRowHead->Enable();
+ pEdAssign2->Enable();
+ pRbAssign2->Enable();
}
else
{
- aBtnAdd.Disable();
- aBtnColHead.Disable();
- aBtnRowHead.Disable();
- aEdAssign2.Disable();
- aRbAssign2.Disable();
+ pBtnAdd->Disable();
+ pBtnColHead->Disable();
+ pBtnRowHead->Disable();
+ pEdAssign2->Disable();
+ pRbAssign2->Disable();
}
- aBtnRemove.Disable();
+ pBtnRemove->Disable();
return 0;
}
@@ -1033,21 +1032,21 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, Range1DataModifyHdl)
IMPL_LINK_NOARG(ScColRowNameRangesDlg, Range2DataModifyHdl)
{
- String aNewData( aEdAssign2.GetText() );
+ String aNewData( pEdAssign2->GetText() );
if ( aNewData.Len() > 0 )
{
ScRange aRange;
if ( (aRange.ParseAny( aNewData, pDoc, pDoc->GetAddressConvention() ) & SCA_VALID) == SCA_VALID )
{
AdjustColRowData( aRange );
- aBtnAdd.Enable();
+ pBtnAdd->Enable();
}
else
- aBtnAdd.Disable();
+ pBtnAdd->Disable();
}
else
{
- aBtnAdd.Disable();
+ pBtnAdd->Disable();
}
return 0;
}
@@ -1071,16 +1070,16 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, Range2DataModifyHdl)
IMPL_LINK_NOARG(ScColRowNameRangesDlg, ColClickHdl)
{
- if ( !aBtnColHead.GetSavedValue() )
+ if ( !pBtnColHead->GetSavedValue() )
{
- aBtnColHead.Check( sal_True );
- aBtnRowHead.Check( false );
+ pBtnColHead->Check( sal_True );
+ pBtnRowHead->Check( false );
if ( theCurArea.aStart.Row() == 0 && theCurArea.aEnd.Row() == MAXROW )
{
theCurArea.aEnd.SetRow( MAXROW - 1 );
String aStr;
theCurArea.Format( aStr, SCR_ABS_3D, pDoc, pDoc->GetAddressConvention() );
- aEdAssign.SetText( aStr );
+ pEdAssign->SetText( aStr );
}
ScRange aRange( theCurData );
aRange.aStart.SetRow( std::min( (long)(theCurArea.aEnd.Row() + 1), (long)MAXROW ) );
@@ -1109,16 +1108,16 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, ColClickHdl)
IMPL_LINK_NOARG(ScColRowNameRangesDlg, RowClickHdl)
{
- if ( !aBtnRowHead.GetSavedValue() )
+ if ( !pBtnRowHead->GetSavedValue() )
{
- aBtnRowHead.Check( sal_True );
- aBtnColHead.Check( false );
+ pBtnRowHead->Check( sal_True );
+ pBtnColHead->Check( false );
if ( theCurArea.aStart.Col() == 0 && theCurArea.aEnd.Col() == MAXCOL )
{
theCurArea.aEnd.SetCol( MAXCOL - 1 );
String aStr;
theCurArea.Format( aStr, SCR_ABS_3D, pDoc, pDoc->GetAddressConvention() );
- aEdAssign.SetText( aStr );
+ pEdAssign->SetText( aStr );
}
ScRange aRange( theCurData );
aRange.aStart.SetCol( static_cast<SCCOL>(std::min( (long)(theCurArea.aEnd.Col() + 1), (long)MAXCOL )) );
@@ -1131,10 +1130,10 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, RowClickHdl)
IMPL_LINK( ScColRowNameRangesDlg, GetFocusHdl, Control*, pCtrl )
{
- if( (pCtrl == (Control*)&aEdAssign) || (pCtrl == (Control*)&aRbAssign) )
- pEdActive = &aEdAssign;
- else if( (pCtrl == (Control*)&aEdAssign2) || (pCtrl == (Control*)&aRbAssign2) )
- pEdActive = &aEdAssign2;
+ if( (pCtrl == (Control*)pEdAssign) || (pCtrl == (Control*)pRbAssign) )
+ pEdActive = pEdAssign;
+ else if( (pCtrl == (Control*)pEdAssign2) || (pCtrl == (Control*)pRbAssign2) )
+ pEdActive = pEdAssign2;
else
pEdActive = NULL;
diff --git a/sc/source/ui/src/crnrdlg.src b/sc/source/ui/src/crnrdlg.src
deleted file mode 100644
index 96486e3..0000000
--- a/sc/source/ui/src/crnrdlg.src
+++ /dev/null
@@ -1,137 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#include "crnrdlg.hrc"
-
-ModelessDialog RID_SCDLG_COLROWNAMERANGES
-{
- OutputSize = TRUE ;
- Hide = TRUE ;
- SVLook = TRUE ;
- Size = MAP_APPFONT ( 256 , 181 ) ;
- HelpId = HID_COLROWNAMERANGES ;
- Moveable = TRUE ;
- // Closeable = TRUE; // Dieser Dialog hat einen Cancel-Button !
- FixedLine FL_ASSIGN
- {
- Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 188 , 8 ) ;
- Text [ en-US ] = "Range" ;
- };
- ListBox LB_RANGE
- {
- HelpID = "sc:ListBox:RID_SCDLG_COLROWNAMERANGES:LB_RANGE";
- Pos = MAP_APPFONT ( 12 , 14 ) ;
- Size = MAP_APPFONT ( 179 , 85 ) ;
- TabStop = TRUE ;
- VScroll = TRUE ;
- Border = TRUE ;
- };
- Edit ED_AREA
- {
- HelpID = "sc:Edit:RID_SCDLG_COLROWNAMERANGES:ED_AREA";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 12 , 105 ) ;
- Size = MAP_APPFONT ( 165 , 12 ) ;
- TabStop = TRUE ;
- };
- ImageButton RB_AREA
- {
- HelpID = "sc:ImageButton:RID_SCDLG_COLROWNAMERANGES:RB_AREA";
- Pos = MAP_APPFONT ( 179 , 104 ) ;
- Size = MAP_APPFONT ( 13 , 15 ) ;
- TabStop = FALSE ;
- QuickHelpText [ en-US ] = "Shrink" ;
- };
- RadioButton BTN_COLHEAD
- {
- HelpID = "sc:RadioButton:RID_SCDLG_COLROWNAMERANGES:BTN_COLHEAD";
- Pos = MAP_APPFONT ( 20 , 121 ) ;
- Size = MAP_APPFONT ( 171 , 10 ) ;
- TabStop = TRUE ;
- Text [ en-US ] = "Contains ~column labels" ;
- };
- RadioButton BTN_ROWHEAD
- {
- HelpID = "sc:RadioButton:RID_SCDLG_COLROWNAMERANGES:BTN_ROWHEAD";
- Pos = MAP_APPFONT ( 20 , 135 ) ;
- Size = MAP_APPFONT ( 171 , 10 ) ;
- TabStop = TRUE ;
- Text [ en-US ] = "Contains ~row labels" ;
- };
- FixedText FT_DATA_LABEL
- {
- Pos = MAP_APPFONT ( 12 , 151 ) ;
- Size = MAP_APPFONT ( 179 , 8 ) ;
- Text [ en-US ] = "For ~data range" ;
- };
- Edit ED_DATA
- {
- HelpID = "sc:Edit:RID_SCDLG_COLROWNAMERANGES:ED_DATA";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 12 , 162 ) ;
- Size = MAP_APPFONT ( 165 , 12 ) ;
- TabStop = TRUE ;
- };
- ImageButton RB_DATA
- {
- HelpID = "sc:ImageButton:RID_SCDLG_COLROWNAMERANGES:RB_DATA";
- Pos = MAP_APPFONT ( 179 , 161 ) ;
- Size = MAP_APPFONT ( 13 , 15 ) ;
- TabStop = FALSE ;
- QuickHelpText [ en-US ] = "Shrink" ;
- };
- OKButton BTN_OK
- {
- Pos = MAP_APPFONT ( 200 , 6 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- };
- CancelButton BTN_CANCEL
- {
- Pos = MAP_APPFONT ( 200 , 23 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- };
- PushButton BTN_ADD
- {
- HelpID = "sc:PushButton:RID_SCDLG_COLROWNAMERANGES:BTN_ADD";
- Pos = MAP_APPFONT ( 200 , 104 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- Text [ en-US ] = "~Add" ;
- TabStop = TRUE ;
- DefButton = TRUE ;
- };
- PushButton BTN_REMOVE
- {
- HelpID = "sc:PushButton:RID_SCDLG_COLROWNAMERANGES:BTN_REMOVE";
- Pos = MAP_APPFONT ( 200 , 122 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- Text [ en-US ] = "~Delete" ;
- TabStop = TRUE ;
- };
- HelpButton BTN_HELP
- {
- Pos = MAP_APPFONT ( 200 , 43 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- };
- Text [ en-US ] = "Define Label Range" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/uiconfig/scalc/ui/namerangesdialog.ui b/sc/uiconfig/scalc/ui/namerangesdialog.ui
new file mode 100644
index 0000000..f81b8fc
--- /dev/null
+++ b/sc/uiconfig/scalc/ui/namerangesdialog.ui
@@ -0,0 +1,345 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkDialog" id="NameRangesDialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+ <property name="title" translatable="yes">Define Label Range</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="orientation">vertical</property>
+ <property name="spacing">12</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area1">
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="ok">
+ <property name="label">gtk-ok</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_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="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">True</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="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">True</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="GtkFrame" id="frame1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</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="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkGrid" id="grid1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkGrid" id="grid2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="foruilo-RefEdit" id="edassign">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="invisible_char">â—</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="foruilo-RefButton" id="rbassign">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="grid3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkRadioButton" id="colhead">
+ <property name="label" translatable="yes">Contains _column labels</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="hexpand">True</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">rowhead</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="rowhead">
+ <property name="label" translatable="yes">Contains _row labels</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="hexpand">True</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">colhead</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">For _data range</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">edassign2</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="grid4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="foruilo-RefEdit" id="edassign2">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="invisible_char">â—</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="foruilo-RefButton" id="rbassign2">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">4</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButtonBox" id="buttonbox1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="spacing">12</property>
+ <property name="layout_style">center</property>
+ <child>
+ <object class="GtkButton" id="add">
+ <property name="label">gtk-add</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</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="delete">
+ <property name="label">gtk-delete</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</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>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">5</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkTreeView" id="range:border">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection1"/>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Range</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">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>
More information about the Libreoffice-commits
mailing list