diff options
| author | Andras Timar <atimar@suse.com> | 2012-11-11 18:24:14 +0100 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2012-11-11 18:24:14 +0100 |
| commit | 06ec1c089519ef3249464aa09eadf03a8db93a39 (patch) | |
| tree | 85b2eb6d8ba6ca95e18e1ff82151224cb14106f6 /dbaccess/source/ui/dlg/queryfilter.cxx | |
| parent | Add some check to renewpo (diff) | |
| parent | oox: ZipStorage: better exception tracing (diff) | |
| download | core-06ec1c089519ef3249464aa09eadf03a8db93a39.tar.gz core-06ec1c089519ef3249464aa09eadf03a8db93a39.zip | |
Merge branch 'master' into feature/killsdf
Conflicts:
Repository.mk
RepositoryFixes.mk
connectivity/prj/build.lst
extensions/prj/build.lst
filter/prj/build.lst
fpicker/prj/build.lst
l10ntools/StaticLibrary_transex.mk
saxon/build.xml
shell/prj/build.lst
solenv/gbuild/AllLangResTarget.mk
solenv/gbuild/Configuration.mk
solenv/gbuild/UI.mk
ucb/source/ucp/webdav/webdavcontent.cxx
Diffstat (limited to 'dbaccess/source/ui/dlg/queryfilter.cxx')
| -rw-r--r-- | dbaccess/source/ui/dlg/queryfilter.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dbaccess/source/ui/dlg/queryfilter.cxx b/dbaccess/source/ui/dlg/queryfilter.cxx index a8696374338d..c6a38f75ba16 100644 --- a/dbaccess/source/ui/dlg/queryfilter.cxx +++ b/dbaccess/source/ui/dlg/queryfilter.cxx @@ -66,7 +66,7 @@ void Replace_SQL_PlaceHolder(String& aString) DBG_NAME(DlgFilterCrit); DlgFilterCrit::DlgFilterCrit(Window * pParent, - const Reference< XMultiServiceFactory >& _rxORB, + const Reference< XComponentContext >& rxContext, const Reference< XConnection>& _rxConnection, const Reference< XSingleSelectQueryComposer >& _rxComposer, const Reference< XNameAccess>& _rxCols @@ -97,7 +97,7 @@ DlgFilterCrit::DlgFilterCrit(Window * pParent, ,m_xColumns( _rxCols ) ,m_xConnection( _rxConnection ) ,m_xMetaData( _rxConnection->getMetaData() ) - ,m_aPredicateInput( _rxORB, _rxConnection, getParseContext() ) + ,m_aPredicateInput( rxContext, _rxConnection, getParseContext() ) { DBG_CTOR(DlgFilterCrit,NULL); // Write the String for noEntry into the ListBoxes of the field names |