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
35afee4d
Kaydet (Commit)
35afee4d
authored
Kas 29, 2013
tarafından
Noel Grandin
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
convert IFormulaEditorHelper::*Selection methods from xub_StrLen to sal_Int32
Change-Id: Ia7a6241c651106427e636bdc08085b97a2a41407
üst
af63fbbf
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
29 additions
and
26 deletions
+29
-26
formula.cxx
formula/source/ui/dlg/formula.cxx
+12
-12
IFunctionDescription.hxx
include/formula/IFunctionDescription.hxx
+2
-2
Formula.cxx
reportdesign/source/ui/dlg/Formula.cxx
+3
-3
Formula.hxx
reportdesign/source/ui/inc/Formula.hxx
+4
-4
formula.cxx
sc/source/ui/formdlg/formula.cxx
+6
-3
formula.hxx
sc/source/ui/inc/formula.hxx
+2
-2
No files found.
formula/source/ui/dlg/formula.cxx
Dosyayı görüntüle @
35afee4d
...
...
@@ -127,7 +127,7 @@ namespace formula
sal_Bool
UpdateParaWin
(
Selection
&
_rSelection
);
void
UpdateParaWin
(
const
Selection
&
_rSelection
,
const
OUString
&
_sRefStr
);
void
SetData
(
xub_StrLen
nFStart
,
xub_StrLen
nNextFStart
,
xub_StrLen
nNextFEnd
,
xub_StrLen
&
PrivStart
,
xub_StrLen
&
PrivEnd
);
void
SetData
(
sal_Int32
nFStart
,
xub_StrLen
nNextFStart
,
xub_StrLen
nNextFEnd
,
sal_Int32
&
PrivStart
,
sal_Int32
&
PrivEnd
);
void
PreNotify
(
NotifyEvent
&
rNEvt
);
RefEdit
*
GetCurrRefEdit
();
...
...
@@ -848,7 +848,7 @@ void FormulaDlg_Impl::FillControls(sal_Bool &rbNext, sal_Bool &rbPrev)
pMEdit
->
SetHelpId
(
aHelpId
);
}
xub_StrLen
nOldStart
,
nOldEnd
;
sal_Int32
nOldStart
,
nOldEnd
;
m_pHelper
->
getSelection
(
nOldStart
,
nOldEnd
);
if
(
nOldStart
!=
nNextFStart
||
nOldEnd
!=
nNextFEnd
)
{
...
...
@@ -859,7 +859,7 @@ void FormulaDlg_Impl::FillControls(sal_Bool &rbNext, sal_Bool &rbPrev)
if
(
!
bEditFlag
)
pMEdit
->
SetText
(
m_pHelper
->
getCurrentFormula
());
xub_StrLen
PrivStart
,
PrivEnd
;
sal_Int32
PrivStart
,
PrivEnd
;
m_pHelper
->
getSelection
(
PrivStart
,
PrivEnd
);
if
(
!
bEditFlag
)
pMEdit
->
SetSelection
(
Selection
(
PrivStart
,
PrivEnd
));
...
...
@@ -1061,9 +1061,9 @@ IMPL_LINK_NOARG(FormulaDlg_Impl, DblClkHdl)
// --------------------------------------------------------------------------
// Functions for right Page
// --------------------------------------------------------------------------
void
FormulaDlg_Impl
::
SetData
(
xub_StrLen
nFStart
,
xub_StrLen
nNextFStart
,
xub_StrLen
nNextFEnd
,
xub_StrLen
&
PrivStart
,
xub_StrLen
&
PrivEnd
)
void
FormulaDlg_Impl
::
SetData
(
sal_Int32
nFStart
,
xub_StrLen
nNextFStart
,
xub_StrLen
nNextFEnd
,
sal_Int32
&
PrivStart
,
sal_Int32
&
PrivEnd
)
{
xub_StrLen
nFEnd
;
sal_Int32
nFEnd
;
// Notice and set new selection
m_pHelper
->
getSelection
(
nFStart
,
nFEnd
);
...
...
@@ -1111,8 +1111,8 @@ void FormulaDlg_Impl::EditThisFunc(xub_StrLen nFStart)
bFound
=
m_aFormulaHelper
.
GetNextFunc
(
aFormula
,
sal_False
,
nNextFStart
,
&
nNextFEnd
);
if
(
bFound
)
{
xub_StrLen
PrivStart
,
PrivEnd
;
SetData
(
nFStart
,
nNextFStart
,
nNextFEnd
,
PrivStart
,
PrivEnd
);
sal_Int32
PrivStart
,
PrivEnd
;
SetData
(
nFStart
,
nNextFStart
,
nNextFEnd
,
PrivStart
,
PrivEnd
);
m_pHelper
->
showReference
(
aFormula
.
copy
(
PrivStart
,
PrivEnd
-
PrivStart
));
}
else
...
...
@@ -1155,8 +1155,8 @@ void FormulaDlg_Impl::EditNextFunc( sal_Bool bForward, xub_StrLen nFStart )
if
(
bFound
)
{
xub_StrLen
PrivStart
,
PrivEnd
;
SetData
(
nFStart
,
nNextFStart
,
nNextFEnd
,
PrivStart
,
PrivEnd
);
sal_Int32
PrivStart
,
PrivEnd
;
SetData
(
nFStart
,
nNextFStart
,
nNextFEnd
,
PrivStart
,
PrivEnd
);
}
}
...
...
@@ -1374,10 +1374,10 @@ void FormulaDlg_Impl::UpdateSelection()
m_pHelper
->
setSelection
((
xub_StrLen
)
aFuncSel
.
Min
(),(
xub_StrLen
)
aFuncSel
.
Max
());
m_pHelper
->
setCurrentFormula
(
pFuncDesc
->
getFormula
(
m_aArguments
)
);
pMEdit
->
SetText
(
m_pHelper
->
getCurrentFormula
());
xub_StrLen
PrivStart
,
PrivEnd
;
sal_Int32
PrivStart
,
PrivEnd
;
m_pHelper
->
getSelection
(
PrivStart
,
PrivEnd
);
aFuncSel
.
Min
()
=
PrivStart
;
aFuncSel
.
Max
()
=
PrivEnd
;
aFuncSel
.
Min
()
=
PrivStart
;
aFuncSel
.
Max
()
=
PrivEnd
;
nArgs
=
pFuncDesc
->
getSuppressedArgumentCount
();
...
...
include/formula/IFunctionDescription.hxx
Dosyayı görüntüle @
35afee4d
...
...
@@ -135,8 +135,8 @@ namespace formula
virtual
OUString
getCurrentFormula
()
const
=
0
;
virtual
void
setCurrentFormula
(
const
OUString
&
_sReplacement
)
=
0
;
virtual
void
getSelection
(
xub_StrLen
&
_nStart
,
xub_StrLen
&
_nEnd
)
const
=
0
;
virtual
void
setSelection
(
xub_StrLen
_nStart
,
xub_StrLen
_nEnd
)
=
0
;
virtual
void
getSelection
(
sal_Int32
&
_nStart
,
sal_Int32
&
_nEnd
)
const
=
0
;
virtual
void
setSelection
(
sal_Int32
_nStart
,
sal_Int32
_nEnd
)
=
0
;
virtual
FormEditData
*
getFormEditData
()
const
=
0
;
virtual
bool
calculateValue
(
const
OUString
&
_sExpression
,
OUString
&
_rResult
)
=
0
;
...
...
reportdesign/source/ui/dlg/Formula.cxx
Dosyayı görüntüle @
35afee4d
...
...
@@ -138,7 +138,7 @@ FormEditData* FormulaDialog::getFormEditData() const
}
void
FormulaDialog
::
setCurrentFormula
(
const
OUString
&
_sReplacement
)
{
const
xub_StrLen
nOldLen
=
m_nEnd
-
m_nStart
;
const
sal_Int32
nOldLen
=
m_nEnd
-
m_nStart
;
const
sal_Int32
nNewLen
=
_sReplacement
.
getLength
();
if
(
nOldLen
)
m_sFormula
=
m_sFormula
.
replaceAt
(
m_nStart
,
nOldLen
,
""
);
...
...
@@ -146,7 +146,7 @@ void FormulaDialog::setCurrentFormula(const OUString& _sReplacement)
m_sFormula
=
m_sFormula
.
replaceAt
(
m_nStart
,
0
,
_sReplacement
);
m_nEnd
=
m_nStart
+
nNewLen
;
}
void
FormulaDialog
::
setSelection
(
xub_StrLen
_nStart
,
xub_StrLen
_nEnd
)
void
FormulaDialog
::
setSelection
(
sal_Int32
_nStart
,
sal_Int32
_nEnd
)
{
if
(
_nStart
<=
_nEnd
)
{
...
...
@@ -159,7 +159,7 @@ void FormulaDialog::setSelection(xub_StrLen _nStart,xub_StrLen _nEnd)
m_nStart
=
_nEnd
;
}
}
void
FormulaDialog
::
getSelection
(
xub_StrLen
&
_nStart
,
xub_StrLen
&
_nEnd
)
const
void
FormulaDialog
::
getSelection
(
sal_Int32
&
_nStart
,
sal_Int32
&
_nEnd
)
const
{
_nStart
=
m_nStart
;
_nEnd
=
m_nEnd
;
...
...
reportdesign/source/ui/inc/Formula.hxx
Dosyayı görüntüle @
35afee4d
...
...
@@ -48,8 +48,8 @@ class FormulaDialog : public formula::FormulaModalDialog,
::
com
::
sun
::
star
::
uno
::
Reference
<
::
com
::
sun
::
star
::
sheet
::
XFormulaOpCodeMapper
>
m_xOpCodeMapper
;
formula
::
RefEdit
*
m_pEdit
;
OUString
m_sFormula
;
xub_StrLen
m_nStart
;
xub_StrLen
m_nEnd
;
sal_Int32
m_nStart
;
sal_Int32
m_nEnd
;
DECL_LINK
(
OnClickHdl
,
OAddFieldWindow
*
);
public
:
...
...
@@ -75,8 +75,8 @@ public:
virtual
void
switchBack
();
virtual
formula
::
FormEditData
*
getFormEditData
()
const
;
virtual
void
setCurrentFormula
(
const
OUString
&
_sReplacement
);
virtual
void
setSelection
(
xub_StrLen
_nStart
,
xub_StrLen
_nEnd
);
virtual
void
getSelection
(
xub_StrLen
&
_nStart
,
xub_StrLen
&
_nEnd
)
const
;
virtual
void
setSelection
(
sal_Int32
_nStart
,
sal_Int32
_nEnd
);
virtual
void
getSelection
(
sal_Int32
&
_nStart
,
sal_Int32
&
_nEnd
)
const
;
virtual
OUString
getCurrentFormula
()
const
;
virtual
formula
::
IFunctionManager
*
getFunctionManager
();
...
...
sc/source/ui/formdlg/formula.cxx
Dosyayı görüntüle @
35afee4d
...
...
@@ -627,15 +627,18 @@ void ScFormulaDlg::setCurrentFormula(const OUString& _sReplacement)
}
pScMod
->
InputReplaceSelection
(
_sReplacement
);
}
void
ScFormulaDlg
::
setSelection
(
xub_StrLen
_nStart
,
xub_StrLen
_nEnd
)
void
ScFormulaDlg
::
setSelection
(
sal_Int32
_nStart
,
sal_Int32
_nEnd
)
{
ScModule
*
pScMod
=
SC_MOD
();
pScMod
->
InputSetSelection
(
_nStart
,
_nEnd
);
}
void
ScFormulaDlg
::
getSelection
(
xub_StrLen
&
_nStart
,
xub_StrLen
&
_nEnd
)
const
void
ScFormulaDlg
::
getSelection
(
sal_Int32
&
_nStart
,
sal_Int32
&
_nEnd
)
const
{
ScModule
*
pScMod
=
SC_MOD
();
pScMod
->
InputGetSelection
(
_nStart
,
_nEnd
);
sal_uInt16
nStart1
=
_nStart
,
nEnd1
=
_nEnd
;
pScMod
->
InputGetSelection
(
nStart1
,
nEnd1
);
_nStart
=
nStart1
;
_nEnd
=
nEnd1
;
}
OUString
ScFormulaDlg
::
getCurrentFormula
()
const
{
...
...
sc/source/ui/inc/formula.hxx
Dosyayı görüntüle @
35afee4d
...
...
@@ -73,8 +73,8 @@ public:
virtual
void
switchBack
();
virtual
formula
::
FormEditData
*
getFormEditData
()
const
;
virtual
void
setCurrentFormula
(
const
OUString
&
_sReplacement
);
virtual
void
setSelection
(
xub_StrLen
_nStart
,
xub_StrLen
_nEnd
);
virtual
void
getSelection
(
xub_StrLen
&
_nStart
,
xub_StrLen
&
_nEnd
)
const
;
virtual
void
setSelection
(
sal_Int32
_nStart
,
sal_Int32
_nEnd
);
virtual
void
getSelection
(
sal_Int32
&
_nStart
,
sal_Int32
&
_nEnd
)
const
;
virtual
OUString
getCurrentFormula
()
const
;
virtual
formula
::
IFunctionManager
*
getFunctionManager
();
...
...
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