Skip to content

C
core
Kaydet (Commit) fae7a3d0 authored tarafından Lionel Elie Mamane's avatar Lionel Elie Mamane
Dosyalara gözat
Seçenekler

String -> OUString 

Change-Id: Ibf566a11a383b77a930d46967e496752c88b39e4
üst e9ae448b
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
dbaccess/source/ui/inc/QueryDesignView.hxx
Dosyayı görüntüle @ fae7a3d0
...@@ -141,7 +141,7 @@ namespace dbaui ...@@ -141,7 +141,7 @@ namespace dbaui
); );
::connectivity::OSQLParseNode* getPredicateTreeFromEntry( OTableFieldDescRef pEntry, ::connectivity::OSQLParseNode* getPredicateTreeFromEntry( OTableFieldDescRef pEntry,
const String& _sCriteria, const OUString& _sCriteria,
OUString& _rsErrorMessage, OUString& _rsErrorMessage,
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxColumn) const; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxColumn) const;
......
dbaccess/source/ui/querydesign/QueryDesignView.cxx
Dosyayı görüntüle @ fae7a3d0
...@@ -3072,7 +3072,7 @@ void OQueryDesignView::SaveUIConfig() ...@@ -3072,7 +3072,7 @@ void OQueryDesignView::SaveUIConfig()
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
OSQLParseNode* OQueryDesignView::getPredicateTreeFromEntry(OTableFieldDescRef pEntry, OSQLParseNode* OQueryDesignView::getPredicateTreeFromEntry(OTableFieldDescRef pEntry,
const String& _sCriteria, const OUString& _sCriteria,
OUString& _rsErrorMessage, OUString& _rsErrorMessage,
Reference<XPropertySet>& _rxColumn) const Reference<XPropertySet>& _rxColumn) const
{ {
...@@ -3086,7 +3086,6 @@ OSQLParseNode* OQueryDesignView::getPredicateTreeFromEntry(OTableFieldDescRef pE ...@@ -3086,7 +3086,6 @@ OSQLParseNode* OQueryDesignView::getPredicateTreeFromEntry(OTableFieldDescRef pE
::connectivity::OSQLParser& rParser( static_cast<OQueryController&>(getController()).getParser() ); ::connectivity::OSQLParser& rParser( static_cast<OQueryController&>(getController()).getParser() );
OQueryTableWindow* pWin = static_cast<OQueryTableWindow*>(pEntry->GetTabWindow()); OQueryTableWindow* pWin = static_cast<OQueryTableWindow*>(pEntry->GetTabWindow());
String sTest(_sCriteria);
// special handling for functions // special handling for functions
if ( pEntry->GetFunctionType() & (FKT_OTHER | FKT_AGGREGATE | FKT_NUMERIC) ) if ( pEntry->GetFunctionType() & (FKT_OTHER | FKT_AGGREGATE | FKT_NUMERIC) )
{ {
...@@ -3157,6 +3156,7 @@ OSQLParseNode* OQueryDesignView::getPredicateTreeFromEntry(OTableFieldDescRef pE ...@@ -3157,6 +3156,7 @@ OSQLParseNode* OQueryDesignView::getPredicateTreeFromEntry(OTableFieldDescRef pE
} }
} }
OUString sTest(_sCriteria);
OSQLParseNode* pParseNode = rParser.predicateTree( _rsErrorMessage, OSQLParseNode* pParseNode = rParser.predicateTree( _rsErrorMessage,
sTest, sTest,
static_cast<OQueryController&>(getController()).getNumberFormatter(), static_cast<OQueryController&>(getController()).getNumberFormatter(),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment