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
6bb7fa8d
Kaydet (Commit)
6bb7fa8d
authored
Nis 14, 2014
tarafından
Kohei Yoshida
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
fdo#76294: Fix the build.
Change-Id: I123751e9f08faaccc06649c2f8b29a9a33548312
üst
042d4f83
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
24 additions
and
4 deletions
+24
-4
Formula.cxx
reportdesign/source/ui/dlg/Formula.cxx
+4
-2
Formula.hxx
reportdesign/source/ui/inc/Formula.hxx
+10
-1
UITools.cxx
reportdesign/source/ui/misc/UITools.cxx
+10
-1
No files found.
reportdesign/source/ui/dlg/Formula.cxx
Dosyayı görüntüle @
6bb7fa8d
...
...
@@ -46,7 +46,8 @@ FormulaDialog::FormulaDialog(Window* pParent
,
const
uno
::
Reference
<
lang
::
XMultiServiceFactory
>&
_xServiceFactory
,
const
::
boost
::
shared_ptr
<
IFunctionManager
>&
_pFunctionMgr
,
const
OUString
&
_sFormula
,
const
::
com
::
sun
::
star
::
uno
::
Reference
<
::
com
::
sun
::
star
::
beans
::
XPropertySet
>&
_xRowSet
)
,
const
::
com
::
sun
::
star
::
uno
::
Reference
<
::
com
::
sun
::
star
::
beans
::
XPropertySet
>&
_xRowSet
,
svl
::
SharedStringPool
&
rStrPool
)
:
FormulaModalDialog
(
pParent
,
false
,
false
,
false
,
_pFunctionMgr
.
get
(),
this
)
,
m_aFunctionManager
(
_pFunctionMgr
)
,
m_pFormulaData
(
new
FormEditData
())
...
...
@@ -56,6 +57,7 @@ FormulaDialog::FormulaDialog(Window* pParent
,
m_sFormula
(
"="
)
,
m_nStart
(
0
)
,
m_nEnd
(
1
)
,
mrStringPool
(
rStrPool
)
{
if
(
!
_sFormula
.
isEmpty
()
)
{
...
...
@@ -255,7 +257,7 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::
std
::
auto_ptr
<
formula
::
FormulaTokenArray
>
FormulaDialog
::
convertToTokenArray
(
const
uno
::
Sequence
<
sheet
::
FormulaToken
>&
_aTokenList
)
{
::
std
::
auto_ptr
<
formula
::
FormulaTokenArray
>
pArray
(
new
FormulaTokenArray
());
pArray
->
Fill
(
_aTokenList
,
NULL
);
pArray
->
Fill
(
_aTokenList
,
mrStringPool
,
NULL
);
return
pArray
;
}
...
...
reportdesign/source/ui/inc/Formula.hxx
Dosyayı görüntüle @
6bb7fa8d
...
...
@@ -30,6 +30,11 @@ namespace com { namespace sun { namespace star { namespace lang {
class
XMultiServiceFactory
;
}
}
}
}
namespace
svl
{
class
SharedStringPool
;
}
namespace
rptui
{
...
...
@@ -51,13 +56,17 @@ class FormulaDialog : public formula::FormulaModalDialog,
sal_Int32
m_nStart
;
sal_Int32
m_nEnd
;
svl
::
SharedStringPool
&
mrStringPool
;
DECL_LINK
(
OnClickHdl
,
OAddFieldWindow
*
);
public
:
FormulaDialog
(
Window
*
pParent
,
const
::
com
::
sun
::
star
::
uno
::
Reference
<
::
com
::
sun
::
star
::
lang
::
XMultiServiceFactory
>&
_xServiceFactory
,
const
::
boost
::
shared_ptr
<
formula
::
IFunctionManager
>&
_pFunctionMgr
,
const
OUString
&
_sFormula
,
const
::
com
::
sun
::
star
::
uno
::
Reference
<
::
com
::
sun
::
star
::
beans
::
XPropertySet
>&
_xRowSet
);
,
const
::
com
::
sun
::
star
::
uno
::
Reference
<
::
com
::
sun
::
star
::
beans
::
XPropertySet
>&
_xRowSet
,
svl
::
SharedStringPool
&
rStrPool
);
virtual
~
FormulaDialog
();
// IFormulaEditorHelper
...
...
reportdesign/source/ui/misc/UITools.cxx
Dosyayı görüntüle @
6bb7fa8d
...
...
@@ -77,9 +77,11 @@
#include <svx/unoprov.hxx>
#include <unotools/pathoptions.hxx>
#include <unotools/charclass.hxx>
#include <svtools/ctrltool.hxx>
#include <svl/itempool.hxx>
#include <svl/itemset.hxx>
#include <svl/sharedstringpool.hxx>
#include <comphelper/propmultiplex.hxx>
#include <comphelper/namedvaluecollection.hxx>
...
...
@@ -1029,7 +1031,14 @@ bool openDialogFormula_nothrow( OUString& _in_out_rFormula
{
::
boost
::
shared_ptr
<
formula
::
IFunctionManager
>
pFormulaManager
(
new
FunctionManager
(
xMgr
)
);
ReportFormula
aFormula
(
_in_out_rFormula
);
FormulaDialog
aDlg
(
pParent
,
xServiceFactory
,
pFormulaManager
,
aFormula
.
getUndecoratedContent
(),
_xRowSet
);
LanguageTag
aLangTag
(
LANGUAGE_SYSTEM
);
CharClass
aCC
(
_xContext
,
aLangTag
);
svl
::
SharedStringPool
aStringPool
(
&
aCC
);
FormulaDialog
aDlg
(
pParent
,
xServiceFactory
,
pFormulaManager
,
aFormula
.
getUndecoratedContent
(),
_xRowSet
,
aStringPool
);
bSuccess
=
aDlg
.
Execute
()
==
RET_OK
;
if
(
bSuccess
)
{
...
...
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