Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
6b74e2c6
Kaydet (Commit)
6b74e2c6
authored
Eki 10, 2012
tarafından
Markus Mohrhard
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
make also the condition edit fields ref input fields
Change-Id: I1246d9ef7ef129901dbcdb92ae9b8fed171fb343
üst
da7edb8b
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
60 additions
and
10 deletions
+60
-10
condformatdlg.cxx
sc/source/ui/condformat/condformatdlg.cxx
+41
-6
condformatdlgentry.cxx
sc/source/ui/condformat/condformatdlgentry.cxx
+6
-0
condformatdlg.hxx
sc/source/ui/inc/condformatdlg.hxx
+7
-1
condformatdlgentry.hxx
sc/source/ui/inc/condformatdlgentry.hxx
+6
-3
No files found.
sc/source/ui/condformat/condformatdlg.cxx
Dosyayı görüntüle @
6b74e2c6
...
...
@@ -198,15 +198,24 @@ IMPL_LINK(ScCondFormatList, ColFormatTypeHdl, ListBox*, pBox)
{
case
0
:
if
(
itr
->
GetType
()
!=
condformat
::
entry
::
COLORSCALE2
)
{
maEntries
.
replace
(
itr
,
new
ScColorScale2FrmtEntry
(
this
,
mpDoc
,
maPos
)
);
static_cast
<
ScCondFormatDlg
*>
(
GetParent
())
->
InvalidateRefData
();
}
break
;
case
1
:
if
(
itr
->
GetType
()
!=
condformat
::
entry
::
COLORSCALE3
)
{
maEntries
.
replace
(
itr
,
new
ScColorScale3FrmtEntry
(
this
,
mpDoc
,
maPos
)
);
static_cast
<
ScCondFormatDlg
*>
(
GetParent
())
->
InvalidateRefData
();
}
break
;
case
2
:
if
(
itr
->
GetType
()
!=
condformat
::
entry
::
DATABAR
)
{
maEntries
.
replace
(
itr
,
new
ScDataBarFrmtEntry
(
this
,
mpDoc
,
maPos
)
);
static_cast
<
ScCondFormatDlg
*>
(
GetParent
())
->
InvalidateRefData
();
}
break
;
default
:
break
;
...
...
@@ -232,14 +241,17 @@ IMPL_LINK(ScCondFormatList, TypeListHdl, ListBox*, pBox)
{
case
0
:
maEntries
.
replace
(
itr
,
new
ScColorScale3FrmtEntry
(
this
,
mpDoc
,
maPos
));
static_cast
<
ScCondFormatDlg
*>
(
GetParent
())
->
InvalidateRefData
();
itr
->
SetActive
();
break
;
case
1
:
maEntries
.
replace
(
itr
,
new
ScConditionFrmtEntry
(
this
,
mpDoc
,
maPos
));
static_cast
<
ScCondFormatDlg
*>
(
GetParent
())
->
InvalidateRefData
();
itr
->
SetActive
();
break
;
case
2
:
maEntries
.
replace
(
itr
,
new
ScFormulaFrmtEntry
(
this
,
mpDoc
,
maPos
));
static_cast
<
ScCondFormatDlg
*>
(
GetParent
())
->
InvalidateRefData
();
itr
->
SetActive
();
break
;
}
...
...
@@ -255,6 +267,7 @@ IMPL_LINK_NOARG( ScCondFormatList, AddBtnHdl )
{
itr
->
SetInactive
();
}
static_cast
<
ScCondFormatDlg
*>
(
GetParent
())
->
InvalidateRefData
();
pNewEntry
->
SetActive
();
RecalcAll
();
return
0
;
...
...
@@ -270,6 +283,7 @@ IMPL_LINK_NOARG( ScCondFormatList, RemoveBtnHdl )
break
;
}
}
static_cast
<
ScCondFormatDlg
*>
(
GetParent
())
->
InvalidateRefData
();
RecalcAll
();
return
0
;
}
...
...
@@ -280,6 +294,7 @@ IMPL_LINK( ScCondFormatList, EntrySelectHdl, ScCondFrmtEntry*, pEntry )
{
itr
->
SetInactive
();
}
static_cast
<
ScCondFormatDlg
*>
(
GetParent
())
->
InvalidateRefData
();
pEntry
->
SetActive
();
RecalcAll
();
return
0
;
...
...
@@ -309,6 +324,7 @@ ScCondFormatDlg::ScCondFormatDlg(SfxBindings* pB, SfxChildWindow* pCW, Window* p
maPos
(
rPos
),
mpDoc
(
pDoc
),
mpFormat
(
pFormat
),
mpLastEdit
(
NULL
),
meType
(
eType
)
{
rtl
::
OUStringBuffer
aTitle
(
GetText
()
);
...
...
@@ -323,6 +339,7 @@ ScCondFormatDlg::ScCondFormatDlg(SfxBindings* pB, SfxChildWindow* pCW, Window* p
maBtnOk
.
SetClickHdl
(
LINK
(
this
,
ScCondFormatDlg
,
OkBtnHdl
)
);
maBtnCancel
.
SetClickHdl
(
LINK
(
this
,
ScCondFormatDlg
,
CancelBtnHdl
)
);
maEdRange
.
SetGetFocusHdl
(
LINK
(
this
,
ScCondFormatDlg
,
RangeGetFocusHdl
)
);
maEdRange
.
SetLoseFocusHdl
(
LINK
(
this
,
ScCondFormatDlg
,
RangeLoseFocusHdl
)
);
FreeResource
();
maEdRange
.
SetText
(
aRangeString
);
...
...
@@ -334,7 +351,11 @@ ScCondFormatDlg::~ScCondFormatDlg()
void
ScCondFormatDlg
::
SetActive
()
{
maEdRange
.
GrabFocus
();
if
(
mpLastEdit
)
mpLastEdit
->
GrabFocus
();
else
maEdRange
.
GrabFocus
();
RefInputDone
();
}
...
...
@@ -355,14 +376,18 @@ sal_Bool ScCondFormatDlg::IsRefInputMode() const
void
ScCondFormatDlg
::
SetReference
(
const
ScRange
&
rRef
,
ScDocument
*
)
{
if
(
maEdRange
.
IsEnabled
()
)
formula
::
RefEdit
*
pEdit
=
mpLastEdit
;
if
(
!
mpLastEdit
)
pEdit
=
&
maEdRange
;
if
(
pEdit
->
IsEnabled
()
)
{
if
(
rRef
.
aStart
!=
rRef
.
aEnd
)
RefInputStart
(
&
maEdRange
);
RefInputStart
(
pEdit
);
rtl
::
OUString
aRefStr
;
rRef
.
Format
(
aRefStr
,
ABS_DREF
,
mpDoc
,
ScAddress
::
Details
(
mpDoc
->
GetAddressConvention
(),
0
,
0
)
);
maEdRange
.
SetRefString
(
aRefStr
);
pEdit
->
SetRefString
(
aRefStr
);
}
}
...
...
@@ -379,6 +404,11 @@ ScConditionalFormat* ScCondFormatDlg::GetConditionalFormat() const
return
pFormat
;
}
void
ScCondFormatDlg
::
InvalidateRefData
()
{
mpLastEdit
=
NULL
;
}
IMPL_LINK
(
ScCondFormatDlg
,
EdRangeModifyHdl
,
Edit
*
,
pEdit
)
{
rtl
::
OUString
aRangeStr
=
pEdit
->
GetText
();
...
...
@@ -427,16 +457,21 @@ IMPL_LINK_NOARG( ScCondFormatDlg, OkBtnHdl )
IMPL_LINK_NOARG
(
ScCondFormatDlg
,
CancelBtnHdl
)
{
Close
();
return
0
;
}
IMPL_LINK
_NOARG
(
ScCondFormatDlg
,
RangeGetFocusHdl
)
IMPL_LINK
(
ScCondFormatDlg
,
RangeGetFocusHdl
,
formula
::
RefEdit
*
,
pEdit
)
{
mpLastEdit
=
pEdit
;
return
0
;
}
IMPL_LINK_NOARG
(
ScCondFormatDlg
,
RangeLoseFocusHdl
)
{
//mpLastEdit = NULL;
return
0
;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
sc/source/ui/condformat/condformatdlgentry.cxx
Dosyayı görüntüle @
6b74e2c6
...
...
@@ -224,6 +224,10 @@ ScConditionFrmtEntry::ScConditionFrmtEntry( Window* pParent, ScDocument* pDoc, c
void
ScConditionFrmtEntry
::
Init
()
{
maLbStyle
.
SetSeparatorPos
(
0
);
maEdVal1
.
SetGetFocusHdl
(
LINK
(
GetParent
()
->
GetParent
(),
ScCondFormatDlg
,
RangeGetFocusHdl
)
);
maEdVal2
.
SetGetFocusHdl
(
LINK
(
GetParent
()
->
GetParent
(),
ScCondFormatDlg
,
RangeGetFocusHdl
)
);
maEdVal1
.
SetLoseFocusHdl
(
LINK
(
GetParent
()
->
GetParent
(),
ScCondFormatDlg
,
RangeLoseFocusHdl
)
);
maEdVal2
.
SetLoseFocusHdl
(
LINK
(
GetParent
()
->
GetParent
(),
ScCondFormatDlg
,
RangeLoseFocusHdl
)
);
maEdVal1
.
SetStyle
(
maEdVal1
.
GetStyle
()
|
WB_FORCECTRLBACKGROUND
);
maEdVal2
.
SetStyle
(
maEdVal2
.
GetStyle
()
|
WB_FORCECTRLBACKGROUND
);
...
...
@@ -405,6 +409,8 @@ ScFormulaFrmtEntry::ScFormulaFrmtEntry( Window* pParent, ScDocument* pDoc, const
void
ScFormulaFrmtEntry
::
Init
()
{
maLbStyle
.
SetSeparatorPos
(
0
);
maEdFormula
.
SetGetFocusHdl
(
LINK
(
GetParent
()
->
GetParent
(),
ScCondFormatDlg
,
RangeGetFocusHdl
)
);
maEdFormula
.
SetLoseFocusHdl
(
LINK
(
GetParent
()
->
GetParent
(),
ScCondFormatDlg
,
RangeLoseFocusHdl
)
);
SfxStyleSheetIterator
aStyleIter
(
mpDoc
->
GetStyleSheetPool
(),
SFX_STYLE_FAMILY_PARA
);
for
(
SfxStyleSheetBase
*
pStyle
=
aStyleIter
.
First
();
pStyle
;
pStyle
=
aStyleIter
.
Next
()
)
...
...
sc/source/ui/inc/condformatdlg.hxx
Dosyayı görüntüle @
6b74e2c6
...
...
@@ -114,12 +114,13 @@ private:
const
ScConditionalFormat
*
mpFormat
;
formula
::
RefEdit
*
mpLastEdit
;
condformat
::
dialog
::
ScCondFormatDialogType
meType
;
DECL_LINK
(
EdRangeModifyHdl
,
Edit
*
);
DECL_LINK
(
OkBtnHdl
,
void
*
);
DECL_LINK
(
CancelBtnHdl
,
void
*
);
DECL_LINK
(
RangeGetFocusHdl
,
void
*
);
virtual
sal_Bool
Close
();
protected
:
...
...
@@ -138,6 +139,11 @@ public:
virtual
sal_Bool
IsRefInputMode
()
const
;
virtual
void
SetActive
();
virtual
sal_Bool
IsTableLocked
()
const
{
return
sal_True
;
}
void
InvalidateRefData
();
DECL_LINK
(
RangeGetFocusHdl
,
formula
::
RefEdit
*
);
DECL_LINK
(
RangeLoseFocusHdl
,
void
*
);
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
sc/source/ui/inc/condformatdlgentry.hxx
Dosyayı görüntüle @
6b74e2c6
...
...
@@ -9,6 +9,7 @@
#include "colorscale.hxx"
#include "conditio.hxx"
#include <formula/funcutl.hxx>
namespace
condformat
{
...
...
@@ -76,8 +77,8 @@ class ScConditionFrmtEntry : public ScCondFrmtEntry
//cond format ui elements
ListBox
maLbCondType
;
Edit
maEdVal1
;
Edit
maEdVal2
;
formula
::
Ref
Edit
maEdVal1
;
formula
::
Ref
Edit
maEdVal2
;
FixedText
maFtStyle
;
ListBox
maLbStyle
;
SvxFontPrevWindow
maWdPreview
;
...
...
@@ -87,6 +88,7 @@ class ScConditionFrmtEntry : public ScCondFrmtEntry
void
Init
();
DECL_LINK
(
StyleSelectHdl
,
void
*
);
DECL_LINK
(
ConditionTypeSelectHdl
,
void
*
);
public
:
ScConditionFrmtEntry
(
Window
*
pParent
,
ScDocument
*
pDoc
,
const
ScAddress
&
rPos
,
const
ScCondFormatEntry
*
pFormatEntry
=
NULL
);
...
...
@@ -102,12 +104,13 @@ class ScFormulaFrmtEntry : public ScCondFrmtEntry
FixedText
maFtStyle
;
ListBox
maLbStyle
;
SvxFontPrevWindow
maWdPreview
;
Edit
maEdFormula
;
formula
::
Ref
Edit
maEdFormula
;
ScFormatEntry
*
createFormulaEntry
()
const
;
void
Init
();
DECL_LINK
(
StyleSelectHdl
,
void
*
);
public
:
ScFormulaFrmtEntry
(
Window
*
pParent
,
ScDocument
*
PDoc
,
const
ScAddress
&
rPos
,
const
ScCondFormatEntry
*
pFormatEntry
=
NULL
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment