Tag: cws_src680_dba201d User: oj Date: 05/10/03 22:45:15 Modified: /dba/dbaccess/source/filter/xml/ makefile.mk /dba/dbaccess/source/ui/querydesign/ SelectionBrowseBox.cxx, query.src /dba/dbaccess/source/ui/uno/ ColumnPeer.cxx
Log: commit from dba201c File Changes: Directory: /dba/dbaccess/source/filter/xml/ =========================================== File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/makefile.mk?r1=1.4&r2=1.4.2.1 Delta lines: +4 -4 ------------------- --- makefile.mk 23 Sep 2005 12:08:08 -0000 1.4 +++ makefile.mk 4 Oct 2005 05:45:11 -0000 1.4.2.1 @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.4 $ +# $Revision: 1.4.2.1 $ # -# last change: $Author: hr $ $Date: 2005/09/23 12:08:08 $ +# last change: $Author: oj $ $Date: 2005/10/04 05:45:11 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -101,7 +101,6 @@ SHL1TARGET=$(TARGET)$(UPD)$(DLLPOSTFIX) SHL1STDLIBS=\ - $(SVXLIB) \ $(XMLOFFLIB) \ $(VCLLIB) \ $(UNOTOOLSLIB) \ @@ -113,6 +112,7 @@ $(UCBHELPERLIB) \ $(SFXLIB) \ $(SVLLIB) \ + $(SVTOOLLIB) \ $(SOTLIB) \ $(SO2LIB) \ $(SALLIB) Directory: /dba/dbaccess/source/ui/querydesign/ =============================================== File [changed]: SelectionBrowseBox.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx?r1=1.63&r2=1.63.2.1 Delta lines: +18 -3 -------------------- --- SelectionBrowseBox.cxx 23 Sep 2005 12:43:59 -0000 1.63 +++ SelectionBrowseBox.cxx 4 Oct 2005 05:45:11 -0000 1.63.2.1 @@ -4,9 +4,9 @@ * * $RCSfile: SelectionBrowseBox.cxx,v $ * - * $Revision: 1.63 $ + * $Revision: 1.63.2.1 $ * - * last change: $Author: hr $ $Date: 2005/09/23 12:43:59 $ + * last change: $Author: oj $ $Date: 2005/10/04 05:45:11 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -247,6 +247,21 @@ Reference< XConnection> xConnection = static_cast<OQueryController*>(getDesignView()->getController())->getConnection(); if(xConnection.is()) { + const IParseContext& rContext = static_cast<OQueryController*>(getDesignView()->getController())->getParser()->getContext(); + IParseContext::InternationalKeyCode eFunctions[] = { IParseContext::KEY_AVG,IParseContext::KEY_COUNT,IParseContext::KEY_MAX,IParseContext::KEY_MIN,IParseContext::KEY_SUM }; + + String sGroup = m_aFunctionStrings.GetToken(m_aFunctionStrings.GetTokenCount() - 1); + m_aFunctionStrings = m_aFunctionStrings.GetToken(0); + + for (sal_Int32 i = 0; i < sizeof(eFunctions)/sizeof(eFunctions[0]) ; ++i) + { + m_aFunctionStrings += String(RTL_CONSTASCII_USTRINGPARAM(";")); + m_aFunctionStrings += String(ByteString(rContext.getIntlKeywordAscii(eFunctions[i])),RTL_TEXTENCODING_UTF8); + + } // for (sal_Int32 i = 0; i < sizeof(eFunctions)/sizeof(eFunctions[0]) ; ++i) + m_aFunctionStrings += String(RTL_CONSTASCII_USTRINGPARAM(";")); + m_aFunctionStrings += sGroup; + // Diese Funktionen stehen nur unter CORE zur Verfügung if ( lcl_SupportsCoreSQLGrammar(xConnection) ) { File [changed]: query.src Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/querydesign/query.src?r1=1.94&r2=1.94.2.1 Delta lines: +5 -6 ------------------- --- query.src 23 Sep 2005 14:18:09 -0000 1.94 +++ query.src 4 Oct 2005 05:45:11 -0000 1.94.2.1 @@ -4,9 +4,9 @@ * * $RCSfile: query.src,v $ * - * $Revision: 1.94 $ + * $Revision: 1.94.2.1 $ * - * last change: $Author: hr $ $Date: 2005/09/23 14:18:09 $ + * last change: $Author: oj $ $Date: 2005/10/04 05:45:11 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -237,9 +237,8 @@ String STR_QUERY_FUNCTIONS { - /* Gleiche Textreihenfolge fuer die Funtkionen wie in common.src */ - Text [ de ] = "(keine Funktion);Durchschnitt;Anzahl;Maximum;Minimum;Summe;Gruppierung"; - Text [ en-US ] = "(no function);Average;Count;Maximum;Minimum;Sum;Group"; + Text [ de ] = "(keine Funktion);Gruppierung"; + Text [ en-US ] = "(no function);Group"; Text [ x-comment ] = " "; }; String STR_QUERY_NOTABLE Directory: /dba/dbaccess/source/ui/uno/ ======================================= File [changed]: ColumnPeer.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/uno/ColumnPeer.cxx?r1=1.5&r2=1.5.10.1 Delta lines: +4 -4 ------------------- --- ColumnPeer.cxx 8 Sep 2005 16:47:23 -0000 1.5 +++ ColumnPeer.cxx 4 Oct 2005 05:45:12 -0000 1.5.10.1 @@ -4,9 +4,9 @@ * * $RCSfile: ColumnPeer.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.5.10.1 $ * - * last change: $Author: rt $ $Date: 2005/09/08 16:47:23 $ + * last change: $Author: oj $ $Date: 2005/10/04 05:45:12 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -65,8 +65,8 @@ osl_incrementInterlockedCount( &m_refCount ); { OColumnControlWindow* pFieldControl = new OColumnControlWindow(_pParent,m_xORB); - pFieldControl->Show(); pFieldControl->SetComponentInterface(this); + pFieldControl->Show(); } osl_decrementInterlockedCount( &m_refCount ); } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
