sc/inc/cell.hxx | 2 -
sc/inc/formularesult.hxx | 4 +-
sc/inc/globstr.hrc | 5 ++
sc/qa/unit/filters-test.cxx | 60 ++++-----------------------------
sc/qa/unit/subsequent_filters-test.cxx | 18 ---------
sc/source/ui/inc/namedefdlg.hrc | 3 -
sc/source/ui/inc/namedefdlg.hxx | 21 +++++------
sc/source/ui/inc/namedlg.hrc | 6 ---
sc/source/ui/inc/namedlg.hxx | 29 +++++++--------
sc/source/ui/inc/namepast.hxx | 4 +-
sc/source/ui/namedlg/namedefdlg.cxx | 22 +++++-------
sc/source/ui/namedlg/namedlg.cxx | 36 +++++++------------
sc/source/ui/namedlg/namemgrtable.cxx | 2 +
sc/source/ui/namedlg/namepast.cxx | 4 +-
sc/source/ui/src/globstr.src | 8 ++++
sc/source/ui/src/namedefdlg.src | 16 --------
sc/source/ui/src/namedlg.src | 29 +--------------
17 files changed, 79 insertions(+), 190 deletions(-)
New commits:
commit c00d6519e919275b390b82b1d1a49a31fe519993
Author: Laurent Godard <lgodard.li...@laposte.net>
Date: Thu Dec 1 15:06:25 2011 +0100
String to OUString for SetHybridString method
diff --git a/sc/inc/cell.hxx b/sc/inc/cell.hxx
index 58a16b8..fa1b719 100644
--- a/sc/inc/cell.hxx
+++ b/sc/inc/cell.hxx
@@ -518,7 +518,7 @@ public:
If for whatever reason you have to use both, SetHybridDouble() and
SetHybridString() or SetHybridFormula(), use SetHybridDouble() first
for performance reasons.*/
- void SetHybridString( const String& r )
+ void SetHybridString( const rtl::OUString& r )
{ aResult.SetHybridString( r); }
/** For import only: set a temporary formula string to be compiled later.
If for whatever reason you have to use both, SetHybridDouble() and
diff --git a/sc/inc/formularesult.hxx b/sc/inc/formularesult.hxx
index 1cc5faf..2aa674c 100644
--- a/sc/inc/formularesult.hxx
+++ b/sc/inc/formularesult.hxx
@@ -200,7 +200,7 @@ public:
/** Should only be used by import filters, best in the order
SetHybridDouble(), SetHybridString()/SetHybridFormula(), or only
SetHybridFormula() for formula string to be compiled later. */
- inline void SetHybridString( const String & rStr );
+ inline void SetHybridString( const rtl::OUString & rStr );
/** Should only be used by import filters, best in the order
SetHybridDouble(), SetHybridString()/SetHybridFormula(), or only
@@ -572,7 +572,7 @@ inline void ScFormulaResult::SetHybridDouble( double f )
}
-inline void ScFormulaResult::SetHybridString( const String & rStr )
+inline void ScFormulaResult::SetHybridString( const rtl::OUString & rStr )
{
// Obtain values before changing anything.
double f = GetDouble();
commit 8e83722d93bfc49c3a5c31d55ff728842209765a
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date: Thu Dec 1 23:02:24 2011 +0100
ManageNames: remove Select button from Manage Names
diff --git a/sc/source/ui/inc/namedlg.hrc b/sc/source/ui/inc/namedlg.hrc
index 01ea06c..56a2dbe 100644
--- a/sc/source/ui/inc/namedlg.hrc
+++ b/sc/source/ui/inc/namedlg.hrc
@@ -33,7 +33,6 @@
#define BTN_DELETE 57
#define BTN_NAME_OK 62
#define BTN_NAME_CANCEL 73
-#define BTN_SELECT 74
#define FT_SCOPE 7
#define FT_RANGE 58
diff --git a/sc/source/ui/inc/namedlg.hxx b/sc/source/ui/inc/namedlg.hxx
index 5fc6fa8..90252c5 100644
--- a/sc/source/ui/inc/namedlg.hxx
+++ b/sc/source/ui/inc/namedlg.hxx
@@ -68,7 +68,6 @@ private:
PushButton maBtnAdd;
PushButton maBtnDelete;
- PushButton maBtnSelect;
HelpButton maBtnHelp;
PushButton maBtnOk;
PushButton maBtnCancel;
diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx
index e5b8440..19eb169 100644
--- a/sc/source/ui/namedlg/namedlg.cxx
+++ b/sc/source/ui/namedlg/namedlg.cxx
@@ -85,7 +85,6 @@ ScNameDlg::ScNameDlg( SfxBindings* pB, SfxChildWindow* pCW,
Window* pParent,
//
maBtnAdd ( this, ScResId( BTN_ADD ) ),
maBtnDelete ( this, ScResId( BTN_DELETE ) ),
- maBtnSelect ( this, ScResId( BTN_SELECT ) ),
maBtnHelp ( this, ScResId( BTN_HELP ) ),
maBtnOk ( this, ScResId( BTN_NAME_OK ) ),
maBtnCancel ( this, ScResId( BTN_NAME_CANCEL ) ),
@@ -180,8 +179,6 @@ void ScNameDlg::Init()
//TODO: fix the Add Button
maBtnAdd.Disable();
- //TODO: discuss the Select Range button with UX
- maBtnSelect.Disable();
}
sal_Bool ScNameDlg::IsRefInputMode() const
@@ -442,7 +439,6 @@ void ScNameDlg::SelectionChanged()
maEdAssign.Disable();
aRbAssign.Disable();
maLbScope.Disable();
- maBtnSelect.Disable();
maBtnRowHeader.Disable();
maBtnColHeader.Disable();
maBtnPrintArea.Disable();
@@ -461,7 +457,6 @@ void ScNameDlg::SelectionChanged()
maEdAssign.Enable();
aRbAssign.Enable();
maLbScope.Enable();
- maBtnSelect.Enable();
maBtnRowHeader.Enable();
maBtnColHeader.Enable();
maBtnPrintArea.Enable();
@@ -513,7 +508,6 @@ void ScNameDlg::MorePushed()
MoveWindow(maBtnHelp, nPixel);
MoveWindow(maBtnOk, nPixel);
MoveWindow(maBtnCancel, nPixel);
- MoveWindow(maBtnSelect, nPixel);
MoveWindow(maFlDiv, nPixel);
}
diff --git a/sc/source/ui/src/namedlg.src b/sc/source/ui/src/namedlg.src
index 9b3a46c..077a7cb 100644
--- a/sc/source/ui/src/namedlg.src
+++ b/sc/source/ui/src/namedlg.src
@@ -72,13 +72,6 @@ ModelessDialog RID_SCDLG_NAMES
Text [ en-US ] = "Cancel" ;
TabStop = TRUE ;
};
- PushButton BTN_SELECT
- {
- Pos = MAP_APPFONT ( 128 , 200 ) ;
- Size = MAP_APPFONT ( 90 , 15 ) ;
- Text [ en-US ] = "Select Range" ;
- TabStop = TRUE ;
- };
FixedText FT_SCOPE
{
commit 156e96d8bf7ac1228378f7ea799aa80c0f653d06
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date: Thu Dec 1 22:45:27 2011 +0100
ManageNames: move some strings to globstr
diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index 39ca0b2..2363aaf 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -596,8 +596,11 @@
#define STR_HEADER_RANGE 460
#define STR_HEADER_SCOPE 461
#define STR_GLOBAL_SCOPE 462
+#define STR_ERR_NAME_EXISTS 463
+#define STR_ERR_NAME_INVALID 464
-#define STR_COUNT 463
+
+#define STR_COUNT 465
#endif
diff --git a/sc/source/ui/inc/namedefdlg.hrc b/sc/source/ui/inc/namedefdlg.hrc
index 657795f..ec3e772 100644
--- a/sc/source/ui/inc/namedefdlg.hrc
+++ b/sc/source/ui/inc/namedefdlg.hrc
@@ -42,9 +42,6 @@
#define BTN_ROWHEADER 12
#define BTN_COLHEADER 13
#define FL_DIV 15
-#define STR_INVALIDSYMBOL 16
-#define STR_ERR_NAME_EXISTS 17
-#define STR_ERR_NAME_INVALID 18
#define STR_DEFAULT_INFO 19
#define RB_RANGE 20
#define BTN_MORE 21
diff --git a/sc/source/ui/inc/namedefdlg.hxx b/sc/source/ui/inc/namedefdlg.hxx
index bc52cc7..c08de89 100644
--- a/sc/source/ui/inc/namedefdlg.hxx
+++ b/sc/source/ui/inc/namedefdlg.hxx
@@ -70,8 +70,6 @@ private:
ScDocShell* mpDocShell;
ScAddress maCursorPos;
- const String mErrMsgInvalidSym;
- const rtl::OUString maErrMsgModifiedFailed;
const rtl::OUString maGlobalNameStr;
const rtl::OUString maErrInvalidNameStr;
const rtl::OUString maErrNameInUse;
diff --git a/sc/source/ui/inc/namedlg.hrc b/sc/source/ui/inc/namedlg.hrc
index 37212c6..01ea06c 100644
--- a/sc/source/ui/inc/namedlg.hrc
+++ b/sc/source/ui/inc/namedlg.hrc
@@ -44,17 +44,12 @@
#define ED_ASSIGN 15
#define RB_ASSIGN 16
-#define STR_INVALIDSYMBOL 23
-#define STR_MODIFYFAILED 72
-
#define BTN_CRITERIA 31
#define BTN_PRINTAREA 32
#define BTN_COLHEADER 33
#define BTN_ROWHEADER 34
#define CTRL_MANAGENAMES 66
-#define STR_ERR_NAME_EXISTS 73
-#define STR_ERR_NAME_INVALID 74
#define STR_DEFAULT_INFO 75
#define STR_MULTI_SELECT 76
diff --git a/sc/source/ui/inc/namedlg.hxx b/sc/source/ui/inc/namedlg.hxx
index 344132e..5fc6fa8 100644
--- a/sc/source/ui/inc/namedlg.hxx
+++ b/sc/source/ui/inc/namedlg.hxx
@@ -82,7 +82,6 @@ private:
ScRangeManagerCtrl maNameMgrCtrl;
ScRangeManagerTable* mpRangeManagerTable;
- const rtl::OUString maErrMsgModifiedFailed;
const rtl::OUString maGlobalNameStr;
const rtl::OUString maErrInvalidNameStr;
const rtl::OUString maErrNameInUse;
diff --git a/sc/source/ui/namedlg/namedefdlg.cxx
b/sc/source/ui/namedlg/namedefdlg.cxx
index 7fc3963..90473fd 100644
--- a/sc/source/ui/namedlg/namedefdlg.cxx
+++ b/sc/source/ui/namedlg/namedefdlg.cxx
@@ -72,10 +72,9 @@ ScNameDefDlg::ScNameDefDlg( SfxBindings* pB, SfxChildWindow*
pCW, Window* pParen
mpDocShell ( pViewData->GetDocShell() ),
maCursorPos( aCursorPos ),
- mErrMsgInvalidSym( ScResId( STR_INVALIDSYMBOL ) ),
maGlobalNameStr ( ScGlobal::GetRscString(STR_GLOBAL_SCOPE) ),
- maErrInvalidNameStr( ResId::toString(ScResId(STR_ERR_NAME_INVALID))),
- maErrNameInUse ( ResId::toString(ScResId(STR_ERR_NAME_EXISTS))),
+ maErrInvalidNameStr( ScGlobal::GetRscString(STR_ERR_NAME_INVALID)),
+ maErrNameInUse ( ScGlobal::GetRscString(STR_ERR_NAME_EXISTS)),
maStrInfoDefault ( ResId::toString(ScResId(STR_DEFAULT_INFO))),
maRangeMap( aRangeMap )
{
@@ -262,7 +261,6 @@ void ScNameDefDlg::AddPushed()
else
{
delete pNewEntry;
-
ErrorBox(this,WinBits(WB_OK|WB_DEF_OK),ResId::toString(ScResId(STR_INVALIDSYMBOL))).Execute();
Selection aCurSel = Selection( 0, SELECTION_MAX );
maEdRange.GrabFocus();
maEdRange.SetSelection( aCurSel );
diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx
index bdf8c2b..e5b8440 100644
--- a/sc/source/ui/namedlg/namedlg.cxx
+++ b/sc/source/ui/namedlg/namedlg.cxx
@@ -98,10 +98,9 @@ ScNameDlg::ScNameDlg( SfxBindings* pB, SfxChildWindow* pCW,
Window* pParent,
//
maNameMgrCtrl ( this, ScResId( CTRL_MANAGENAMES ) ),
//
- maErrMsgModifiedFailed( ResId::toString(ScResId( STR_MODIFYFAILED ) ) ),
maGlobalNameStr ( ScGlobal::GetRscString(STR_GLOBAL_SCOPE) ),
- maErrInvalidNameStr( ResId::toString(ScResId(STR_ERR_NAME_INVALID))),
- maErrNameInUse ( ResId::toString(ScResId(STR_ERR_NAME_EXISTS))),
+ maErrInvalidNameStr( ScGlobal::GetRscString(STR_ERR_NAME_INVALID)),
+ maErrNameInUse ( ScGlobal::GetRscString(STR_ERR_NAME_EXISTS)),
maStrInfoDefault ( ResId::toString(ScResId(STR_DEFAULT_INFO))),
maStrMultiSelect ( ResId::toString(ScResId(STR_MULTI_SELECT))),
//
diff --git a/sc/source/ui/src/globstr.src b/sc/source/ui/src/globstr.src
index 5462b51..464f141 100644
--- a/sc/source/ui/src/globstr.src
+++ b/sc/source/ui/src/globstr.src
@@ -1843,5 +1843,13 @@ Resource RID_GLOBSTR
{
Text [ en-US ] = "Document (Global)" ;
};
+ String STR_ERR_NAME_EXISTS
+ {
+ Text [ en-US ] = "Invalid name. Already in use for the selected
scope.";
+ };
+ String STR_ERR_NAME_INVALID
+ {
+ Text [ en-US ] = "Invalid name. Only use letters, numbers and
underscore.";
+ };
};
diff --git a/sc/source/ui/src/namedefdlg.src b/sc/source/ui/src/namedefdlg.src
index 4181015..1a19f0b 100644
--- a/sc/source/ui/src/namedefdlg.src
+++ b/sc/source/ui/src/namedefdlg.src
@@ -147,23 +147,9 @@ ModelessDialog RID_SCDLG_NAMES_DEFINE
Pos = MAP_APPFONT( 0, 95 );
Size = MAP_APPFONT(200, 3 );
};
-
- String STR_INVALIDSYMBOL
- {
- Text [ en-US ] = "Invalid expression" ;
- };
- String STR_ERR_NAME_EXISTS
- {
- Text [ en-US ] = "Invalid name. Already in use for the selected
scope.";
- };
- String STR_ERR_NAME_INVALID
- {
- Text [ en-US ] = "Invalid name. Only use letters, numbers and
underscore.";
- };
String STR_DEFAULT_INFO
{
Text [en-US] = "Define the name and range or formula expression.";
- };
-};
+ };};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/src/namedlg.src b/sc/source/ui/src/namedlg.src
index 9d15901..9b3a46c 100644
--- a/sc/source/ui/src/namedlg.src
+++ b/sc/source/ui/src/namedlg.src
@@ -120,13 +120,13 @@ ModelessDialog RID_SCDLG_NAMES
HelpID = "sc:Edit:RID_SCDLG_NAMES:ED_ASSIGN";
Border = TRUE ;
Pos = MAP_APPFONT ( 50 , 155 ) ;
- Size = MAP_APPFONT ( 155 , 12 ) ;
+ Size = MAP_APPFONT ( 152 , 12 ) ;
TabStop = TRUE ;
};
ImageButton RB_ASSIGN
{
HelpID = "sc:ImageButton:RID_SCDLG_NAMES:RB_ASSIGN";
- Pos = MAP_APPFONT ( 205 , 155 ) ;
+ Pos = MAP_APPFONT ( 202 , 155 ) ;
Size = MAP_APPFONT ( 13 , 12 ) ;
TabStop = TRUE ;
QuickHelpText [ en-US ] = "Shrink" ;
@@ -176,16 +176,6 @@ ModelessDialog RID_SCDLG_NAMES
TabStop = TRUE ;
};
- String STR_INVALIDSYMBOL
- {
- Text [ en-US ] = "Invalid expression" ;
- };
- String STR_MODIFYFAILED
- {
- Text [en-US ] = "Modifying range name failed" ;
- };
-
-
FixedText FT_INFO
{
Pos = MAP_APPFONT( 5, 127 );
@@ -200,14 +190,6 @@ ModelessDialog RID_SCDLG_NAMES
Border = TRUE;
DialogControl = TRUE;
};
- String STR_ERR_NAME_EXISTS
- {
- Text [ en-US ] = "Invalid name. Already in use for the selected
scope.";
- };
- String STR_ERR_NAME_INVALID
- {
- Text [ en-US ] = "Invalid name. Only use letters, numbers and
underscore and don't use names like cell addresses";
- };
String STR_DEFAULT_INFO
{
Text [en-US] = "Select cells in the document to update the range.";
commit 64a9481b9902f14d730cf3d6ef1398b314ec2dc3
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date: Thu Dec 1 21:26:34 2011 +0100
ManageNames: the mode switcher needs to be enabled too
diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx
index 1f9157c..bdf8c2b 100644
--- a/sc/source/ui/namedlg/namedlg.cxx
+++ b/sc/source/ui/namedlg/namedlg.cxx
@@ -460,7 +460,7 @@ void ScNameDlg::SelectionChanged()
maBtnDelete.Enable();
maEdName.Enable();
maEdAssign.Enable();
- aRbAssign.Disable();
+ aRbAssign.Enable();
maLbScope.Enable();
maBtnSelect.Enable();
maBtnRowHeader.Enable();
commit 6ff59b03023b7698b17fc53a8ac60a008709b497
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date: Thu Dec 1 21:25:40 2011 +0100
ManageNames: fix tab order in Manage Names
diff --git a/sc/source/ui/inc/namedlg.hxx b/sc/source/ui/inc/namedlg.hxx
index c6f4f4a..344132e 100644
--- a/sc/source/ui/inc/namedlg.hxx
+++ b/sc/source/ui/inc/namedlg.hxx
@@ -55,36 +55,35 @@ class ScDocument;
class ScNameDlg : public ScAnyRefDlg
{
private:
- FixedText maFtScope;
- FixedText maFtRange;
- FixedText maFtName;
- ListBox maLbScope;
-
- formula::RefEdit maEdAssign;
Edit maEdName;
+ formula::RefEdit maEdAssign;
formula::RefButton aRbAssign;
+ ListBox maLbScope;
- FixedLine maFlDiv;
+ DisclosureButton maBtnMore;
CheckBox maBtnPrintArea;
CheckBox maBtnColHeader;
CheckBox maBtnCriteria;
CheckBox maBtnRowHeader;
- ScRangeManagerCtrl maNameMgrCtrl;
- ScRangeManagerTable* mpRangeManagerTable;
-
- HelpButton maBtnHelp;
PushButton maBtnAdd;
PushButton maBtnDelete;
PushButton maBtnSelect;
+ HelpButton maBtnHelp;
PushButton maBtnOk;
PushButton maBtnCancel;
- DisclosureButton maBtnMore;
+
+ FixedText maFtScope;
+ FixedText maFtRange;
+ FixedText maFtName;
+ FixedLine maFlDiv;
FixedText maFtInfo;
- const String mErrMsgInvalidSym;
+ ScRangeManagerCtrl maNameMgrCtrl;
+ ScRangeManagerTable* mpRangeManagerTable;
+
const rtl::OUString maErrMsgModifiedFailed;
- const ::rtl::OUString maGlobalNameStr;
+ const rtl::OUString maGlobalNameStr;
const rtl::OUString maErrInvalidNameStr;
const rtl::OUString maErrNameInUse;
const rtl::OUString maStrInfoDefault;
diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx
index 1358422..1f9157c 100644
--- a/sc/source/ui/namedlg/namedlg.cxx
+++ b/sc/source/ui/namedlg/namedlg.cxx
@@ -72,33 +72,32 @@ ScNameDlg::ScNameDlg( SfxBindings* pB, SfxChildWindow* pCW,
Window* pParent,
: ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_NAMES ),
//
- maFtScope( this, ScResId(FT_SCOPE) ),
- maFtRange( this, ScResId(FT_RANGE) ),
- maFtName( this, ScResId(FT_NAME) ),
- maLbScope( this, ScResId(LB_SCOPE) ),
- //
- maEdAssign ( this, this, ScResId( ED_ASSIGN ) ),
maEdName ( this, ScResId( ED_NAME2 ) ),
+ maEdAssign ( this, this, ScResId( ED_ASSIGN ) ),
aRbAssign ( this, ScResId( RB_ASSIGN ), &maEdAssign, this ),
+ maLbScope( this, ScResId(LB_SCOPE) ),
//
- maFlDiv ( this, ScResId( FL_DIV ) ),
+ maBtnMore ( this, ScResId( BTN_MORE ) ),
maBtnPrintArea ( this, ScResId( BTN_PRINTAREA ) ),
maBtnColHeader ( this, ScResId( BTN_COLHEADER ) ),
maBtnCriteria ( this, ScResId( BTN_CRITERIA ) ),
maBtnRowHeader ( this, ScResId( BTN_ROWHEADER ) ),
//
- maNameMgrCtrl ( this, ScResId( CTRL_MANAGENAMES ) ),
- //
- maBtnHelp ( this, ScResId( BTN_HELP ) ),
maBtnAdd ( this, ScResId( BTN_ADD ) ),
maBtnDelete ( this, ScResId( BTN_DELETE ) ),
maBtnSelect ( this, ScResId( BTN_SELECT ) ),
+ maBtnHelp ( this, ScResId( BTN_HELP ) ),
maBtnOk ( this, ScResId( BTN_NAME_OK ) ),
maBtnCancel ( this, ScResId( BTN_NAME_CANCEL ) ),
- maBtnMore ( this, ScResId( BTN_MORE ) ),
+ //
+ maFtScope( this, ScResId(FT_SCOPE) ),
+ maFtRange( this, ScResId(FT_RANGE) ),
+ maFtName( this, ScResId(FT_NAME) ),
+ maFlDiv ( this, ScResId( FL_DIV ) ),
maFtInfo ( this, ScResId( FT_INFO ) ),
//
- mErrMsgInvalidSym( ScResId( STR_INVALIDSYMBOL ) ),
+ maNameMgrCtrl ( this, ScResId( CTRL_MANAGENAMES ) ),
+ //
maErrMsgModifiedFailed( ResId::toString(ScResId( STR_MODIFYFAILED ) ) ),
maGlobalNameStr ( ScGlobal::GetRscString(STR_GLOBAL_SCOPE) ),
maErrInvalidNameStr( ResId::toString(ScResId(STR_ERR_NAME_INVALID))),
commit f3ee3373cc64eb9a206dafbcffab54b85feb42be
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date: Thu Dec 1 21:17:16 2011 +0100
ManageNames: fix taborder for DefineNames dialog
the more button is not usable with the keyboard
diff --git a/sc/source/ui/inc/namedefdlg.hxx b/sc/source/ui/inc/namedefdlg.hxx
index f983e12..bc52cc7 100644
--- a/sc/source/ui/inc/namedefdlg.hxx
+++ b/sc/source/ui/inc/namedefdlg.hxx
@@ -43,26 +43,27 @@ class ScViewData;
class ScNameDefDlg : public ScAnyRefDlg
{
private:
- PushButton maBtnAdd;
- PushButton maBtnCancel;
- DisclosureButton maBtnMore;
- FixedText maFtInfo;
- FixedText maFtName;
- FixedText maFtRange;
- FixedText maFtScope;
- FixedLine maFlDiv;
-
Edit maEdName;
+
formula::RefEdit maEdRange;
formula::RefButton maRbRange;
ListBox maLbScope;
+ DisclosureButton maBtnMore;
CheckBox maBtnRowHeader;
CheckBox maBtnColHeader;
CheckBox maBtnPrintArea;
CheckBox maBtnCriteria;
+ PushButton maBtnAdd;
+ PushButton maBtnCancel;
+ FixedText maFtInfo;
+ FixedText maFtName;
+ FixedText maFtRange;
+ FixedText maFtScope;
+ FixedLine maFlDiv;
+
bool mbUndo; //if true we need to add an undo action after creating a
range name
ScDocument* mpDoc;
diff --git a/sc/source/ui/namedlg/namedefdlg.cxx
b/sc/source/ui/namedlg/namedefdlg.cxx
index c4ffc2e..7fc3963 100644
--- a/sc/source/ui/namedlg/namedefdlg.cxx
+++ b/sc/source/ui/namedlg/namedefdlg.cxx
@@ -51,22 +51,22 @@ ScNameDefDlg::ScNameDefDlg( SfxBindings* pB,
SfxChildWindow* pCW, Window* pParen
ScViewData* pViewData, std::map<rtl::OUString, ScRangeName*> aRangeMap,
const ScAddress& aCursorPos, const bool bUndo ) :
ScAnyRefDlg( pB, pCW, pParent, RID_SCDLG_NAMES_DEFINE ),
- maBtnAdd( this, ScResId( BTN_ADD ) ),
- maBtnCancel( this, ScResId( BTN_CANCEL ) ),
- maBtnMore( this, ScResId( BTN_MORE ) ),
- maFtInfo( this, ScResId( FT_INFO ) ),
- maFtName( this, ScResId( FT_NAME ) ),
- maFtRange( this, ScResId( FT_RANGE ) ),
- maFtScope( this, ScResId( FT_SCOPE ) ),
- maFlDiv( this, ScResId( FL_DIV ) ),
maEdName( this, ScResId( ED_NAME ) ),
maEdRange( this, this, ScResId( ED_RANGE ) ),
maRbRange( this, ScResId( RB_RANGE ), &maEdRange, this ),
maLbScope( this, ScResId( LB_SCOPE ) ),
+ maBtnMore( this, ScResId( BTN_MORE ) ),
maBtnRowHeader( this, ScResId( BTN_ROWHEADER ) ),
maBtnColHeader( this, ScResId( BTN_COLHEADER ) ),
maBtnPrintArea( this, ScResId( BTN_PRINTAREA ) ),
maBtnCriteria( this, ScResId( BTN_CRITERIA ) ),
+ maBtnAdd( this, ScResId( BTN_ADD ) ),
+ maBtnCancel( this, ScResId( BTN_CANCEL ) ),
+ maFtInfo( this, ScResId( FT_INFO ) ),
+ maFtName( this, ScResId( FT_NAME ) ),
+ maFtRange( this, ScResId( FT_RANGE ) ),
+ maFtScope( this, ScResId( FT_SCOPE ) ),
+ maFlDiv( this, ScResId( FL_DIV ) ),
mbUndo( bUndo ),
mpDoc( pViewData->GetDocument() ),
mpDocShell ( pViewData->GetDocShell() ),
commit b9c76854bab835ea482e8763cedaa4adb0ae1192
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date: Thu Dec 1 21:05:24 2011 +0100
ManageNames: fix tab order in Paste Names dialog
diff --git a/sc/source/ui/inc/namepast.hxx b/sc/source/ui/inc/namepast.hxx
index 1da0790..b2abb45 100644
--- a/sc/source/ui/inc/namepast.hxx
+++ b/sc/source/ui/inc/namepast.hxx
@@ -46,10 +46,10 @@ class ScNamePasteDlg : public ModalDialog
DECL_LINK( ButtonHdl, Button * );
private:
+ PushButton maBtnPasteAll;
+ PushButton maBtnPaste;
HelpButton maHelpButton;
PushButton maBtnClose;
- PushButton maBtnPaste;
- PushButton maBtnPasteAll;
FixedLine maFlDiv;
ScRangeManagerCtrl maCtrl;
diff --git a/sc/source/ui/namedlg/namepast.cxx
b/sc/source/ui/namedlg/namepast.cxx
index 4651e82..4193955 100644
--- a/sc/source/ui/namedlg/namepast.cxx
+++ b/sc/source/ui/namedlg/namepast.cxx
@@ -44,10 +44,10 @@
ScNamePasteDlg::ScNamePasteDlg( Window * pParent, ScDocShell* pShell, bool )
: ModalDialog( pParent, ScResId( RID_SCDLG_NAMES_PASTE ) ),
+ maBtnPasteAll ( this, ScResId( BTN_PASTE_ALL ) ),
+ maBtnPaste ( this, ScResId( BTN_PASTE ) ),
maHelpButton ( this, ScResId( BTN_HELP ) ),
maBtnClose ( this, ScResId( BTN_CLOSE ) ),
- maBtnPaste ( this, ScResId( BTN_PASTE ) ),
- maBtnPasteAll ( this, ScResId( BTN_PASTE_ALL ) ),
maFlDiv ( this, ScResId( FL_DIV ) ),
maCtrl ( this, ScResId( CTRL_TABLE ) )
{
commit 9edb6b2edd0535125576070fd9d071574676f19a
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date: Thu Dec 1 20:57:25 2011 +0100
ManageNames: minor problem with size of header bar
diff --git a/sc/source/ui/namedlg/namemgrtable.cxx
b/sc/source/ui/namedlg/namemgrtable.cxx
index de9e386..40bd5aa 100644
--- a/sc/source/ui/namedlg/namemgrtable.cxx
+++ b/sc/source/ui/namedlg/namemgrtable.cxx
@@ -95,6 +95,8 @@ ScRangeManagerTable::ScRangeManagerTable( Window* pWindow,
boost::ptr_map<rtl::O
CheckForFormulaString();
}
SetScrolledHdl( LINK( this, ScRangeManagerTable, ScrollHdl ) );
+ void* pNull = NULL;
+ HeaderEndDragHdl(pNull);
}
ScRangeManagerTable::~ScRangeManagerTable()
commit c55e0745d4b190487b2166a7c13410616a2c6faf
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date: Thu Dec 1 19:57:25 2011 +0100
clean up filters-test after split
diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index bffb4f6..626b038 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -30,7 +30,6 @@
#include <sal/config.h>
#include <unotest/filters-test.hxx>
#include <test/bootstrapfixture.hxx>
-#include <rtl/strbuf.hxx>
#include <osl/file.hxx>
#include <sfx2/app.hxx>
@@ -42,13 +41,18 @@
#define CALC_DEBUG_OUTPUT 0
#define TEST_BUG_FILES 0
-#include "helper/csv_handler.hxx"
#include "helper/debughelper.hxx"
-#include "orcus/csv_parser.hpp"
#include <fstream>
#include <string>
#include <sstream>
+#include "docsh.hxx"
+#include "postit.hxx"
+#include "patattr.hxx"
+#include "scitems.hxx"
+#include "document.hxx"
+#include "cellform.hxx"
+
#define ODS_FORMAT_TYPE 50331943
#define XLS_FORMAT_TYPE 318767171
#define XLSX_FORMAT_TYPE 268959811
@@ -72,45 +76,6 @@ FileFormat aFileFormats[] = {
{ "xlsx", "Calc MS Excel 2007 XML" , "MS Excel 2007 XML", XLSX_FORMAT_TYPE
}
};
-void loadFile(const rtl::OUString& aFileName, std::string& aContent)
-{
- rtl::OString aOFileName = rtl::OUStringToOString(aFileName,
RTL_TEXTENCODING_UTF8);
- std::ifstream aFile(aOFileName.getStr());
-
- rtl::OStringBuffer aErrorMsg("Could not open csv file: ");
- aErrorMsg.append(aOFileName);
- CPPUNIT_ASSERT_MESSAGE(aErrorMsg.getStr(), aFile);
- std::ostringstream aOStream;
- aOStream << aFile.rdbuf();
- aFile.close();
- aContent = aOStream.str();
-}
-
-void testFile(rtl::OUString& aFileName, ScDocument* pDoc, SCTAB nTab,
StringType aStringFormat = StringValue)
-{
- csv_handler aHandler(pDoc, nTab, aStringFormat);
- orcus::csv_parser_config aConfig;
- aConfig.delimiters.push_back(',');
- aConfig.delimiters.push_back(';');
- aConfig.text_qualifier = '"';
-
-
- std::string aContent;
- loadFile(aFileName, aContent);
- orcus::csv_parser<csv_handler> parser ( &aContent[0], aContent.size() ,
aHandler, aConfig);
- try
- {
- parser.parse();
- }
- catch (const orcus::csv_parse_error& e)
- {
- std::cout << "reading csv content file failed: " << e.what() <<
std::endl;
- rtl::OStringBuffer aErrorMsg("csv parser error: ");
- aErrorMsg.append(e.what());
- CPPUNIT_ASSERT_MESSAGE(aErrorMsg.getStr(), false);
- }
-}
-
}
/* Implementation of Filters test */
@@ -127,7 +92,6 @@ public:
const rtl::OUString &rUserData, const rtl::OUString& rTypeName,
sal_uLong nFormatType=0);
void createFileURL(const rtl::OUString& aFileBase, const rtl::OUString&
aFileExtension, rtl::OUString& rFilePath);
- void createCSVPath(const rtl::OUString& aFileBase, rtl::OUString&
rFilePath);
virtual void setUp();
virtual void tearDown();
@@ -138,7 +102,7 @@ public:
void testCVEs();
//ods, xls, xlsx filter tests
- void testRangeName();
+ void testRangeName(); // only test ods here, xls and xlsx in
subsequent_filters-test
void testContent();
#if TEST_BUG_FILES
@@ -212,14 +176,6 @@ void ScFiltersTest::createFileURL(const rtl::OUString&
aFileBase, const rtl::OUS
rFilePath = aBuffer.makeStringAndClear();
}
-void ScFiltersTest::createCSVPath(const rtl::OUString& aFileBase,
rtl::OUString& rCSVPath)
-{
- rtl::OUStringBuffer aBuffer(getSrcRootPath());
-
aBuffer.append(m_aBaseString).append(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/contentCSV/")));
-
aBuffer.append(aFileBase).append(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("csv")));
- rCSVPath = aBuffer.makeStringAndClear();
-}
-
void ScFiltersTest::testCVEs()
{
testDir(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Quattro Pro 6.0")),
diff --git a/sc/qa/unit/subsequent_filters-test.cxx
b/sc/qa/unit/subsequent_filters-test.cxx
index 0c4ac4f..4a67486 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -160,11 +160,6 @@ public:
virtual void setUp();
virtual void tearDown();
- /**
- * Ensure CVEs remain unbroken
- */
- void testCVEs();
-
//ods, xls, xlsx filter tests
void testRangeName();
void testFunctions();
@@ -179,7 +174,6 @@ public:
void testPassword();
CPPUNIT_TEST_SUITE(ScFiltersTest);
- CPPUNIT_TEST(testCVEs);
CPPUNIT_TEST(testRangeName);
CPPUNIT_TEST(testFunctions);
CPPUNIT_TEST(testDatabaseRanges);
@@ -259,18 +253,6 @@ void ScFiltersTest::createCSVPath(const rtl::OUString&
aFileBase, rtl::OUString&
rCSVPath = aBuffer.makeStringAndClear();
}
-void ScFiltersTest::testCVEs()
-{
- testDir(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Quattro Pro 6.0")),
- getURLFromSrc("/sc/qa/unit/data/qpro/"), rtl::OUString());
-
- //warning, the current "sylk filter" in sc (docsh.cxx) automatically
- //chains on failure on trying as csv, rtf, etc. so "success" may
- //not indicate that it imported as .slk.
- testDir(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SYLK")),
- getURLFromSrc("/sc/qa/unit/data/slk/"), rtl::OUString());
-}
-
namespace {
void testRangeNameImpl(ScDocument* pDoc)
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
