mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fdo#76294: Fix the build.

Browse Source 
Change-Id: I123751e9f08faaccc06649c2f8b29a9a33548312
This commit is contained in:
Kohei Yoshida 2014-04-14 18:56:12 -04:00
parent 042d4f8300
commit 6bb7fa8df5
3 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
reportdesign/source/ui/dlg/Formula.cxx
View File

@ -46,7 +46,8 @@ FormulaDialog::FormulaDialog(Window* pParent
, const uno::Reference<lang::XMultiServiceFactory>& _xServiceFactory , const uno::Reference<lang::XMultiServiceFactory>& _xServiceFactory
, const ::boost::shared_ptr< IFunctionManager >& _pFunctionMgr , const ::boost::shared_ptr< IFunctionManager >& _pFunctionMgr
, const OUString& _sFormula , 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) : FormulaModalDialog( pParent, false,false,false,_pFunctionMgr.get(),this)
,m_aFunctionManager(_pFunctionMgr) ,m_aFunctionManager(_pFunctionMgr)
,m_pFormulaData(new FormEditData()) ,m_pFormulaData(new FormEditData())
@ -56,6 +57,7 @@ FormulaDialog::FormulaDialog(Window* pParent
,m_sFormula("=") ,m_sFormula("=")
,m_nStart(0) ,m_nStart(0)
,m_nEnd(1) ,m_nEnd(1)
,mrStringPool(rStrPool)
{ {
if ( !_sFormula.isEmpty() ) 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> FormulaDialog::convertToTokenArray(const uno::Sequence< sheet::FormulaToken >& _aTokenList)
{ {
::std::auto_ptr<formula::FormulaTokenArray> pArray(new FormulaTokenArray()); ::std::auto_ptr<formula::FormulaTokenArray> pArray(new FormulaTokenArray());
pArray->Fill(_aTokenList, NULL); pArray->Fill(_aTokenList, mrStringPool, NULL);
return pArray; return pArray;
} }

11
reportdesign/source/ui/inc/Formula.hxx
View File

@ -30,6 +30,11 @@ namespace com { namespace sun { namespace star { namespace lang {
class XMultiServiceFactory; class XMultiServiceFactory;
} } } } } } } }
namespace svl {
class SharedStringPool;
}
namespace rptui namespace rptui
{ {
@ -51,13 +56,17 @@ class FormulaDialog : public formula::FormulaModalDialog,
sal_Int32 m_nStart; sal_Int32 m_nStart;
sal_Int32 m_nEnd; sal_Int32 m_nEnd;
svl::SharedStringPool& mrStringPool;
DECL_LINK( OnClickHdl, OAddFieldWindow*); DECL_LINK( OnClickHdl, OAddFieldWindow*);
public: public:
FormulaDialog( Window* pParent FormulaDialog( Window* pParent
, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _xServiceFactory , const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _xServiceFactory
, const ::boost::shared_ptr< formula::IFunctionManager >& _pFunctionMgr , const ::boost::shared_ptr< formula::IFunctionManager >& _pFunctionMgr
, const OUString& _sFormula , 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(); virtual ~FormulaDialog();
// IFormulaEditorHelper // IFormulaEditorHelper

11
reportdesign/source/ui/misc/UITools.cxx
View File

@ -77,9 +77,11 @@
#include <svx/unoprov.hxx> #include <svx/unoprov.hxx>
#include <unotools/pathoptions.hxx> #include <unotools/pathoptions.hxx>
#include <unotools/charclass.hxx>
#include <svtools/ctrltool.hxx> #include <svtools/ctrltool.hxx>
#include <svl/itempool.hxx> #include <svl/itempool.hxx>
#include <svl/itemset.hxx> #include <svl/itemset.hxx>
#include <svl/sharedstringpool.hxx>
#include <comphelper/propmultiplex.hxx> #include <comphelper/propmultiplex.hxx>
#include <comphelper/namedvaluecollection.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) ); ::boost::shared_ptr< formula::IFunctionManager > pFormulaManager(new FunctionManager(xMgr) );
ReportFormula aFormula( _in_out_rFormula ); 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; bSuccess = aDlg.Execute() == RET_OK;
if ( bSuccess ) if ( bSuccess )
{ {