diff options
| author | Lionel Elie Mamane <lionel@mamane.lu> | 2013-04-26 02:59:26 +0200 |
|---|---|---|
| committer | Lionel Elie Mamane <lionel@mamane.lu> | 2013-04-26 16:49:47 +0200 |
| commit | fae7a3d060664e6540dbdfc3babd54ac9ccb45bf (patch) | |
| tree | 2dff1e37507a51aa6da8ba537493af429390a5e8 | |
| parent | e9ae448b1ed4424aadc183397d9f45b873ee3bc2 (diff) | |
String -> OUString
Change-Id: Ibf566a11a383b77a930d46967e496752c88b39e4
| -rw-r--r-- | dbaccess/source/ui/inc/QueryDesignView.hxx | 2 | ||||
| -rw-r--r-- | dbaccess/source/ui/querydesign/QueryDesignView.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/dbaccess/source/ui/inc/QueryDesignView.hxx b/dbaccess/source/ui/inc/QueryDesignView.hxx index 4b8821295faa..f49614b5b2ae 100644 --- a/dbaccess/source/ui/inc/QueryDesignView.hxx +++ b/dbaccess/source/ui/inc/QueryDesignView.hxx @@ -141,7 +141,7 @@ namespace dbaui ); ::connectivity::OSQLParseNode* getPredicateTreeFromEntry( OTableFieldDescRef pEntry, - const String& _sCriteria, + const OUString& _sCriteria, OUString& _rsErrorMessage, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxColumn) const; diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx index 6f37036213b8..fe27a4151a21 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx +++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx @@ -3072,7 +3072,7 @@ void OQueryDesignView::SaveUIConfig() } // ----------------------------------------------------------------------------- OSQLParseNode* OQueryDesignView::getPredicateTreeFromEntry(OTableFieldDescRef pEntry, - const String& _sCriteria, + const OUString& _sCriteria, OUString& _rsErrorMessage, Reference<XPropertySet>& _rxColumn) const { @@ -3086,7 +3086,6 @@ OSQLParseNode* OQueryDesignView::getPredicateTreeFromEntry(OTableFieldDescRef pE ::connectivity::OSQLParser& rParser( static_cast<OQueryController&>(getController()).getParser() ); OQueryTableWindow* pWin = static_cast<OQueryTableWindow*>(pEntry->GetTabWindow()); - String sTest(_sCriteria); // special handling for functions if ( pEntry->GetFunctionType() & (FKT_OTHER | FKT_AGGREGATE | FKT_NUMERIC) ) { @@ -3157,6 +3156,7 @@ OSQLParseNode* OQueryDesignView::getPredicateTreeFromEntry(OTableFieldDescRef pE } } + OUString sTest(_sCriteria); OSQLParseNode* pParseNode = rParser.predicateTree( _rsErrorMessage, sTest, static_cast<OQueryController&>(getController()).getNumberFormatter(), |