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/browser/brwctrlr.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/browser/brwctrlr.cxx')
| -rw-r--r-- | dbaccess/source/ui/browser/brwctrlr.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx index 460b09354860..8fec4ff329c1 100644 --- a/dbaccess/source/ui/browser/brwctrlr.cxx +++ b/dbaccess/source/ui/browser/brwctrlr.cxx @@ -1923,7 +1923,7 @@ void SbaXDataBrowserController::ExecuteFilterSortCrit(sal_Bool bFilter) Reference< XConnection> xCon(xFormSet->getPropertyValue(PROPERTY_ACTIVE_CONNECTION),UNO_QUERY); if(bFilter) { - DlgFilterCrit aDlg( getBrowserView(), getORB(), xCon, xParser, xSup->getColumns() ); + DlgFilterCrit aDlg( getBrowserView(), comphelper::getComponentContext(getORB()), xCon, xParser, xSup->getColumns() ); String aFilter; if ( !aDlg.Execute() ) return; // if so we don't need to update the grid |