[Libreoffice-commits] .: dbaccess/source
dbaccess/source/ui/browser/sbagrid.cxx |2
dbaccess/source/ui/control/FieldDescControl.cxx | 114 +++-
dbaccess/source/ui/control/RelationControl.cxx | 34 +++
3 files changed, 74 insertions(+), 76 deletions(-)
New commits:
commit 5dfb6381c63b51e41cd8a80b767c8f6154f59b59
Author: Philipp Weissenbacher p.weissenbac...@gmail.com
Date: Fri Apr 13 14:39:59 2012 +0200
Translate German comments
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx
b/dbaccess/source/ui/browser/sbagrid.cxx
index 63cbc0f..4ed826d 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -1014,7 +1014,7 @@ void SbaGridControl::PostExecuteRowContextMenu(sal_uInt16
nRow, const PopupMenu
//---
void SbaGridControl::Select()
{
-// irgendeine Selektion hat sich geaendert
+// Some selection has changed ...
FmGridControl::Select();
if (m_pMasterListener)
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx
b/dbaccess/source/ui/control/FieldDescControl.cxx
index fc77e3f..4b300ba 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -74,7 +74,7 @@ using namespace ::com::sun::star::util;
//==
-// fuer die Controls auf der OFieldDescGenPage
+// For the Controls on the OFieldDescGenPage
#define CONTROL_SPACING_X 18 // 6
#define CONTROL_SPACING_Y 4
#define CONTROL_WIDTH_1 160 // 100
@@ -254,7 +254,7 @@ OFieldDescControl::~OFieldDescControl()
pLastFocusWindow = NULL;
//
-// Children zerstoeren
+// Destroy children
DeactivateAggregate( tpDefault );
DeactivateAggregate( tpRequired );
DeactivateAggregate( tpTextLen );
@@ -289,7 +289,7 @@ String OFieldDescControl::BoolStringUI(const String
rPersistentString) const
static String aOne('1');
static String aNone(ModuleRes(STR_VALUE_NONE));
-// aeltere Versionen haben eventuell einen sprachabhaengigen String als
Default gespeichert
+// Older versions may store a language dependend string as a default
if (rPersistentString.Equals(aYes) || rPersistentString.Equals(aNo))
return rPersistentString;
@@ -329,7 +329,7 @@ namespace
//--
void OFieldDescControl::CheckScrollBars()
{
-// ein paar Berechnungen zur neuen Position der ScrollBars
+// Calculate the ScrollBars' new position
Size szOverallSize = GetSizePixel();
long nHScrollHeight = m_pHorzScroll-GetSizePixel().Height();
long nVScrollWidth = m_pVertScroll-GetSizePixel().Width();
@@ -339,8 +339,8 @@ void OFieldDescControl::CheckScrollBars()
sal_Bool bNeedHScrollBar(sal_False), bNeedVScrollBar(sal_False);
-// die Bereiche anpassen
-// brauche ich ScrollBars eigentlich ?
+// Adjust the areas
+// Do I actually need ScrollBars?
// horizontal :
long lMaxXPosition = 0;
Control* ppAggregates[] = { pRequired, pNumType, pAutoIncrement, pDefault,
pTextLen, pLength, pScale, pFormat, m_pColumnName,
m_pType,m_pAutoIncrementValue};
@@ -352,12 +352,12 @@ void OFieldDescControl::CheckScrollBars()
long lMaxXAvailable = szOverallSize.Width();
bNeedHScrollBar = lMaxXPosition lMaxXAvailable;
-// aendert sich vielleicht noch
+// Might change
-// vertikal
-// wieviel Controls habe ich
+// Vertical
+// How many Controls do I have?
sal_uInt16 nActive = CountActiveAggregates();
-// welches ist das letzte, was ganz drauf passt ?
+// Which one is the last one that fits?
sal_uInt16 nLastVisible;
const sal_Int32 nControlHeight = GetMaxControlHeight();
const sal_Int32 nControl_Spacing_y = LogicToPixel(Size(0,
CONTROL_SPACING_Y),MAP_APPFONT).Height();
@@ -369,20 +369,19 @@ void OFieldDescControl::CheckScrollBars()
if (bNeedVScrollBar)
{
-// in die urspruengliche Berechnung von lMaxXAvailable ist nicht mit
eingegangen, dass ich eine VScrollBar habe, also muss ich
-// das nachholen
+// When originally calculating lMaxXAvailable we did not take into
account that we have a VScrollBar, so we need to do that now
lMaxXAvailable -= nVScrollWidth;
if (!bNeedHScrollBar (lMaxXPosition lMaxXAvailable))
{
-// durch die vertikale brauche ich jetzt ploetzlich doch eine
horizontale
+// The vertical one now necessitates a horizontal one
bNeedHScrollBar = sal_True;
-// nLastVisible anpassen
+// Adjust nLastVisible
nLastVisible = static_castsal_uInt16((szOverallSize.Height() -
nControl_Spacing_y - nHScrollHeight) / (nControl_Spacing_y + nControlHeight));
-
[Libreoffice-commits] .: dbaccess/source editeng/source sfx2/source
dbaccess/source/ui/browser/sbagrid.cxx |7 --- dbaccess/source/ui/control/FieldDescControl.cxx |6 -- dbaccess/source/ui/misc/UITools.cxx |6 -- editeng/source/outliner/outlvw.cxx |9 - editeng/source/uno/unonrule.cxx |3 --- sfx2/source/doc/guisaveas.cxx |2 -- 6 files changed, 33 deletions(-) New commits: commit b905ac19da5d4168c06f42c21418ccdb2a5d9290 Author: Takeshi Abe t...@fixedpoint.jp Date: Wed Apr 4 08:55:31 2012 +0900 removed unused defines diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx index 926f53d..534a1a8 100644 --- a/dbaccess/source/ui/browser/sbagrid.cxx +++ b/dbaccess/source/ui/browser/sbagrid.cxx @@ -31,13 +31,6 @@ #include svx/svxids.hrc -#define ITEMID_HORJUSTIFY SID_ATTR_ALIGN_HOR_JUSTIFY -#define ITEMID_VERJUSTIFY SID_ATTR_ALIGN_VER_JUSTIFY -#define ITEMID_LINEBREAKSID_ATTR_ALIGN_LINEBREAK -#define ITEMID_MARGIN SID_ATTR_ALIGN_MARGIN -#define ITEMID_NUMBERINFO SID_ATTR_NUMBERFORMAT_INFO - - #include svx/numinf.hxx #include svx/dbaexchange.hxx #include com/sun/star/ui/dialogs/XExecutableDialog.hpp diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx index 30a0bad..fc77e3f 100644 --- a/dbaccess/source/ui/control/FieldDescControl.cxx +++ b/dbaccess/source/ui/control/FieldDescControl.cxx @@ -26,12 +26,6 @@ * / - -#define ITEMID_HORJUSTIFY SID_ATTR_ALIGN_HOR_JUSTIFY -#define ITEMID_VERJUSTIFY SID_ATTR_ALIGN_VER_JUSTIFY -#define ITEMID_LINEBREAKSID_ATTR_ALIGN_LINEBREAK -#define ITEMID_MARGIN SID_ATTR_ALIGN_MARGIN - #include FieldDescControl.hxx #include FieldControls.hxx #include tools/diagnose_ex.h diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx index 2deb607..431f142 100644 --- a/dbaccess/source/ui/misc/UITools.cxx +++ b/dbaccess/source/ui/misc/UITools.cxx @@ -82,12 +82,6 @@ #include svx/svxids.hrc -#define ITEMID_HORJUSTIFY SID_ATTR_ALIGN_HOR_JUSTIFY -#define ITEMID_VERJUSTIFY SID_ATTR_ALIGN_VER_JUSTIFY -#define ITEMID_LINEBREAKSID_ATTR_ALIGN_LINEBREAK -#define ITEMID_MARGIN SID_ATTR_ALIGN_MARGIN -#define ITEMID_NUMBERINFO SID_ATTR_NUMBERFORMAT_INFO - #include svl/itempool.hxx #include tools/string.hxx #include dbaccess_helpid.hrc diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx index a61ec1a..85b1b26 100644 --- a/editeng/source/outliner/outlvw.cxx +++ b/editeng/source/outliner/outlvw.cxx @@ -54,15 +54,6 @@ #include svl/itemset.hxx #include editeng/editstat.hxx - -// Width of the border zones within which is scrolled during Drag and Drop -#define OL_SCROLL_LRBORDERWIDTHPIX 10 -#define OL_SCROLL_TBBORDERWIDTHPIX 10 - -// Value to the window content when scrolling during Drag and Drop -#define OL_SCROLL_HOROFFSET 20 /* in % of VisibleSize.Width */ -#define OL_SCROLL_VEROFFSET 20 /* in % of VisibleSize.Height */ - using namespace ::com::sun::star; DBG_NAME(OutlinerView) diff --git a/editeng/source/uno/unonrule.cxx b/editeng/source/uno/unonrule.cxx index e39bb60..45983f6 100644 --- a/editeng/source/uno/unonrule.cxx +++ b/editeng/source/uno/unonrule.cxx @@ -26,9 +26,6 @@ * / - -#define PROPERTY_NONE 0 - #include com/sun/star/text/HoriOrientation.hpp #include com/sun/star/awt/XBitmap.hpp diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx index 5795c8d..2a34c89 100644 --- a/sfx2/source/doc/guisaveas.cxx +++ b/sfx2/source/doc/guisaveas.cxx @@ -89,8 +89,6 @@ #include ../appl/app.hrc -#define DOCPROPSNUM 17 - // flags that specify requested operation #define EXPORT_REQUESTED1 #define PDFEXPORT_REQUESTED 2 ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: dbaccess/source
dbaccess/source/ui/querydesign/QueryDesignView.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 80c235510aeb19d4df6a07be7499e70122313bbf
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Thu Mar 15 11:22:32 2012 +0100
fdo#46843 look for order by clause as fifth child of select_statement
Since commit 33b9b857ea6cb5a6f731de68f58e532242c43d30 (dba34c: #i20306#
support for window function and limit fetch first, ... added), order by is the
fifth child. It was the fourth one before.
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 397cedb..267c7a9 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -2319,9 +2319,9 @@ namespace
const ::connectivity::OSQLParseNode* pParseRoot )
{
SqlParseError eErrorCode = eOk;
-if (!pParseRoot-getChild(3)-getChild(4)-isLeaf())
+if (!pParseRoot-getChild(3)-getChild(5)-isLeaf())
{
-::connectivity::OSQLParseNode* pNode =
pParseRoot-getChild(3)-getChild(4)-getChild(2);
+::connectivity::OSQLParseNode* pNode =
pParseRoot-getChild(3)-getChild(5)-getChild(2);
::connectivity::OSQLParseNode* pParamRef = NULL;
OQueryController rController =
static_castOQueryController(_pView-getController());
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: dbaccess/source
dbaccess/source/ui/querydesign/QueryDesignView.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 08ba87c55858335094c24ca4e610a13da10c
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Thu Mar 15 18:54:17 2012 +0100
fixup: use introduced preprocessor constant instead of hardcoded constant
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 267c7a9..12b5b29 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -2319,9 +2319,9 @@ namespace
const ::connectivity::OSQLParseNode* pParseRoot )
{
SqlParseError eErrorCode = eOk;
-if (!pParseRoot-getChild(3)-getChild(5)-isLeaf())
+if (!pParseRoot-getChild(3)-getChild(ORDER_BY_CHILD_POS)-isLeaf())
{
-::connectivity::OSQLParseNode* pNode =
pParseRoot-getChild(3)-getChild(5)-getChild(2);
+::connectivity::OSQLParseNode* pNode =
pParseRoot-getChild(3)-getChild(ORDER_BY_CHILD_POS)-getChild(2);
::connectivity::OSQLParseNode* pParamRef = NULL;
OQueryController rController =
static_castOQueryController(_pView-getController());
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: dbaccess/source
dbaccess/source/core/dataaccess/documenteventnotifier.cxx |7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
New commits:
commit 490f83d4807a4223bae61d34913e5bd2bf952f3a
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Mar 9 09:12:54 2012 +0100
fdo#47021: the naive join attempt leads to deadlock
...something better is required (getting rid of the solar mutex?).
diff --git a/dbaccess/source/core/dataaccess/documenteventnotifier.cxx
b/dbaccess/source/core/dataaccess/documenteventnotifier.cxx
index 2b7cf9b..2c10ff1 100644
--- a/dbaccess/source/core/dataaccess/documenteventnotifier.cxx
+++ b/dbaccess/source/core/dataaccess/documenteventnotifier.cxx
@@ -165,7 +165,12 @@ namespace dbaccess
{
m_pEventBroadcaster-removeEventsForProcessor( this );
m_pEventBroadcaster-terminate();
-m_pEventBroadcaster-join();
+//TODO: a protocol is missing how to join with the thread
before
+// exit(3), to ensure the thread is no longer relying on any
+// infrastructure while that infrastructure is being shut down
+// in atexit handlers; simply calling join here leads to
+// deadlock, as this thread holds the solar mutex while the
+// other thread is typically blocked waiting for the solar
mutex
m_pEventBroadcaster.clear();
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: dbaccess/source oox/inc oox/source unusedcode.easy
dbaccess/source/core/api/OptimisticSet.cxx | 10 --
dbaccess/source/core/api/OptimisticSet.hxx | 12 ---
oox/inc/oox/xls/externallinkbuffer.hxx |2 -
oox/inc/oox/xls/formulabase.hxx|8 -
oox/inc/oox/xls/stylesbuffer.hxx |4 --
oox/inc/oox/xls/workbookhelper.hxx |8 -
oox/inc/oox/xls/worksheethelper.hxx| 26
oox/source/xls/externallinkbuffer.cxx |6 ---
oox/source/xls/formulabase.cxx |9 -
oox/source/xls/formulaparser.cxx | 14
oox/source/xls/stylesbuffer.cxx| 12 ---
oox/source/xls/workbookhelper.cxx | 25 ---
oox/source/xls/worksheethelper.cxx | 46 -
unusedcode.easy| 16 --
14 files changed, 198 deletions(-)
New commits:
commit eab072e468506f9759a9aeddd631fbd97908e6f8
Author: Elton Chung el...@layerjet.com
Date: Mon Feb 20 21:21:13 2012 +0800
Remove unused code
diff --git a/dbaccess/source/core/api/OptimisticSet.cxx
b/dbaccess/source/core/api/OptimisticSet.cxx
index 801daeb..99cfcd4 100644
--- a/dbaccess/source/core/api/OptimisticSet.cxx
+++ b/dbaccess/source/core/api/OptimisticSet.cxx
@@ -452,16 +452,6 @@ void OptimisticSet::executeDelete(const ORowSetRow
_rDeleteRow,const ::rtl::OUS
}
}
-::rtl::OUString OptimisticSet::getComposedTableName(const ::rtl::OUString
/*_sCatalog*/,
- const ::rtl::OUString
/*_sSchema*/,
- const ::rtl::OUString
/*_sTable*/)
-{
-RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, dbaccess, ocke.jans...@sun.com,
OptimisticSet::getComposedTableName );
-::rtl::OUString aComposedName;
-
-return aComposedName;
-}
-
void OptimisticSet::fillJoinedColumns_throw(const ::std::vector TNodePair
i_aJoinColumns)
{
::std::vector TNodePair ::const_iterator aIter = i_aJoinColumns.begin();
diff --git a/dbaccess/source/core/api/OptimisticSet.hxx
b/dbaccess/source/core/api/OptimisticSet.hxx
index 4e44de6..dac366f 100644
--- a/dbaccess/source/core/api/OptimisticSet.hxx
+++ b/dbaccess/source/core/api/OptimisticSet.hxx
@@ -53,18 +53,6 @@ namespace dbaccess
mutable bool m_bResultSetChanged;
-/**
-getComposedTableName return the composed table name for the query
-@param _sCatalogthe catalogname may be empty
-@param _sSchema the schemaname may be empty
-@param _sTable the tablename
-
-@return the composed name
-*/
-::rtl::OUString getComposedTableName( const ::rtl::OUString _sCatalog,
- const ::rtl::OUString _sSchema,
- const ::rtl::OUString _sTable);
-
void impl_convertValue_throw(const ORowSetRow _rInsertRow,const
SelectColumnDescription i_aMetaData);
void executeDelete(const ORowSetRow _rDeleteRow,const
::rtl::OUString i_sSQL,const ::rtl::OUString i_sTableName);
diff --git a/oox/inc/oox/xls/externallinkbuffer.hxx
b/oox/inc/oox/xls/externallinkbuffer.hxx
index 8e1e42f..071b251 100644
--- a/oox/inc/oox/xls/externallinkbuffer.hxx
+++ b/oox/inc/oox/xls/externallinkbuffer.hxx
@@ -362,8 +362,6 @@ public:
ExternalLinkRef importExternSheet( BiffInputStream rStrm );
/** Imports the EXTERNALBOOK record from the passed stream. */
ExternalLinkRef importExternalBook( BiffInputStream rStrm );
-/** Imports the EXTERNALNAME record from the passed stream. */
-voidimportExternalName( BiffInputStream rStrm );
/** Imports the BIFF8 EXTERNSHEET record from the passed stream. */
voidimportExternSheet8( BiffInputStream rStrm );
diff --git a/oox/inc/oox/xls/formulabase.hxx b/oox/inc/oox/xls/formulabase.hxx
index 610b227..1d34343 100644
--- a/oox/inc/oox/xls/formulabase.hxx
+++ b/oox/inc/oox/xls/formulabase.hxx
@@ -701,14 +701,6 @@ public:
//
-/** Generates a cell range string in Calc's absolute $Sheet.$A$1:$A$
-notation from the passed cell range address.
-
-@param rRange The cell range address to be converted to a string.
- */
-::rtl::OUString generateApiRangeString(
-const ::com::sun::star::table::CellRangeAddress
rRange ) const;
-
/** Generates a string in Calc formula notation from the passed string.
@param rString The string value.
diff --git a/oox/inc/oox/xls/stylesbuffer.hxx b/oox/inc/oox/xls/stylesbuffer.hxx
index 365474a..68d7431 100644
--- a/oox/inc/oox/xls/stylesbuffer.hxx
+++ b/oox/inc/oox/xls/stylesbuffer.hxx
@@ -830,10 +830,6 @@ public:
/** Inserts a new number format code. */
voidimportNumFmt( const AttributeList rAttribs );
-/** Sets all attributes
[Libreoffice-commits] .: dbaccess/source
dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx |9 +
1 file changed, 5 insertions(+), 4 deletions(-)
New commits:
commit 53ca46cdff7b6e0ed5c6d97b86855a406c54895f
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Thu Feb 9 18:47:32 2012 +0100
translate german comments
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index f3140b0..b7cf65e 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -211,14 +211,15 @@ void OSelectionBrowseBox::initialize()
m_aFunctionStrings += String(RTL_CONSTASCII_USTRINGPARAM(;));
m_aFunctionStrings += sGroup;
-// Diese Funktionen stehen nur unter CORE zur Verf�gung
+// Aggregate functions in general available only with Core SQL
+// We slip in a few optionals one, too.
if ( lcl_SupportsCoreSQLGrammar(xConnection) )
{
xub_StrLen nCount =
comphelper::string::getTokenCount(m_aFunctionStrings, ';');
for (xub_StrLen nIdx = 0; nIdx nCount; nIdx++)
m_pFunctionCell-InsertEntry(m_aFunctionStrings.GetToken(nIdx));
}
-else // sonst nur COUNT(*)
+else // else only COUNT(*) and COUNT(table.*)
{
m_pFunctionCell-InsertEntry(m_aFunctionStrings.GetToken(0));
m_pFunctionCell-InsertEntry(m_aFunctionStrings.GetToken(2)); // 2
- COUNT
@@ -2736,7 +2737,7 @@ void
OSelectionBrowseBox::setFunctionCell(OTableFieldDescRef _pEntry)
Reference XConnection xConnection =
static_castOQueryController(getDesignView()-getController()).getConnection();
if ( xConnection.is() )
{
-// Diese Funktionen stehen nur unter CORE zur Verf�gung
+// Aggregate functions in general only available with Core SQL
if ( lcl_SupportsCoreSQLGrammar(xConnection) )
{
// if we have an asterix, no other function than count is allowed
@@ -2767,7 +2768,7 @@ void
OSelectionBrowseBox::setFunctionCell(OTableFieldDescRef _pEntry)
}
else
{
-// nur COUNT(*) erlaubt
+// only COUNT(*) and COUNT(table.*) allowed
sal_Bool bCountRemoved = !isFieldNameAsterix(_pEntry-GetField());
if ( bCountRemoved )
m_pFunctionCell-RemoveEntry(1);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: dbaccess/source
dbaccess/source/core/api/RowSetCache.cxx |9 -
1 file changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 23151ab53574e0e893f4507313ff15388638746a
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Feb 8 21:51:38 2012 +0100
Tentative fix for invalid iterator range regression
37b5dce665a03d3404e6a710b82bef16d740d178 re-wrote a std::rotate call to
cause
an error: function requires a valid iterator range [__middle, __last)
abort
from debug-mode GCC libstdc++ during smoketest. Lionel should check whether
this fix is actually good -- at least, it causes make check to succeed
again.
diff --git a/dbaccess/source/core/api/RowSetCache.cxx
b/dbaccess/source/core/api/RowSetCache.cxx
index df833a2..77eae6e 100644
--- a/dbaccess/source/core/api/RowSetCache.cxx
+++ b/dbaccess/source/core/api/RowSetCache.cxx
@@ -940,7 +940,14 @@ sal_Bool ORowSetCache::moveWindow()
bCheck = fill(aIter, aNewEnd, nPos, bCheck);
}
-::std::rotate(m_pMatrix-begin(), aEnd, aNewEnd);
+if ( aEnd = aNewEnd )
+{
+::std::rotate(m_pMatrix-begin(), aEnd, aNewEnd);
+}
+else
+{
+::std::rotate(m_pMatrix-begin(), aNewEnd, aEnd);
+}
// now correct the iterator in our iterator vector
// rotateCacheIterator(aEnd-m_pMatrix-begin()); //can't be
used because they decrement and here we need to increment
ORowSetCacheMap::iterator aCacheIter =
m_aCacheIterators.begin();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: dbaccess/source
dbaccess/source/core/api/KeySet.cxx | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit f96a392d2ee541cbaac6517b1e4f75a49f9f49f2
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Tue Jan 31 21:32:55 2012 +0100
fdo#45453: use integers rather than booleans
for always-true and always-false tests.
Some databases have poor or no support for booleans.
diff --git a/dbaccess/source/core/api/KeySet.cxx
b/dbaccess/source/core/api/KeySet.cxx
index a7d9abe..1903110 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -228,8 +228,8 @@ namespace
void appendOneKeyColumnClause( const ::rtl::OUString tblName, const
::rtl::OUString colName, ::rtl::OUStringBuffer o_buf )
{
static ::rtl::OUString s_sDot(RTL_CONSTASCII_USTRINGPARAM(.));
-static ::rtl::OUString s_sParam0(RTL_CONSTASCII_USTRINGPARAM( ( TRUE
= ? AND ));
-static ::rtl::OUString s_sParam1(RTL_CONSTASCII_USTRINGPARAM( = ? OR
TRUE = ? AND ));
+static ::rtl::OUString s_sParam0(RTL_CONSTASCII_USTRINGPARAM( ( 1 = ?
AND ));
+static ::rtl::OUString s_sParam1(RTL_CONSTASCII_USTRINGPARAM( = ? OR
1 = ? AND ));
static ::rtl::OUString s_sParam2(RTL_CONSTASCII_USTRINGPARAM( IS NULL
) ));
o_buf.append(s_sParam0);
o_buf.append(tblName);
@@ -247,16 +247,16 @@ void OKeySet::setOneKeyColumnParameter( sal_Int32 nPos,
const Reference XParam
{
if ( _rValue.isNull() )
{
-_xParameter-setBoolean( nPos++, false );
+_xParameter-setByte( nPos++, 0 );
// We do the full call so that the right sqlType is passed to setNull
setParameter( nPos++, _xParameter, _rValue, _nType, _nScale );
-_xParameter-setBoolean( nPos++, true );
+_xParameter-setByte( nPos++, 1 );
}
else
{
-_xParameter-setBoolean( nPos++, true );
+_xParameter-setByte( nPos++, 1 );
setParameter( nPos++, _xParameter, _rValue, _nType, _nScale );
-_xParameter-setBoolean( nPos++, false );
+_xParameter-setByte( nPos++, 0 );
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: dbaccess/source
dbaccess/source/core/api/RowSetCache.cxx | 26 --
dbaccess/source/core/api/RowSetCache.hxx |2 +-
2 files changed, 21 insertions(+), 7 deletions(-)
New commits:
commit 5f34f5a8596335d8509fde8fd7ef1ab0418ec3be
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Tue Jan 31 22:53:31 2012 +0100
ORowSetCache: keep m_nEndPos better up-to-date
diff --git a/dbaccess/source/core/api/RowSetCache.cxx
b/dbaccess/source/core/api/RowSetCache.cxx
index 4cc1811..acd2908 100644
--- a/dbaccess/source/core/api/RowSetCache.cxx
+++ b/dbaccess/source/core/api/RowSetCache.cxx
@@ -452,13 +452,18 @@ void ORowSetCache::setFetchSize(sal_Int32 _nSize)
else if (m_nStartPos m_nPosition m_nPosition = m_nEndPos)
{
sal_Int32 nNewSt = -1;
-fillMatrix(nNewSt,_nSize);
+_nSize += m_nStartPos;
+fillMatrix(nNewSt, _nSize);
if (nNewSt = 0)
{
m_nStartPos = nNewSt;
-m_nEndPos = nNewSt + _nSize;
+m_nEndPos = _nSize;
m_aMatrixIter = calcPosition();
}
+else
+{
+m_nEndPos = m_nStartPos + m_nFetchSize;
+}
}
else
{
@@ -746,7 +751,7 @@ sal_Bool ORowSetCache::afterLast( )
return sal_True;
}
-sal_Bool ORowSetCache::fillMatrix(sal_Int32 _nNewStartPos,sal_Int32
_nNewEndPos)
+sal_Bool ORowSetCache::fillMatrix(sal_Int32 _nNewStartPos, sal_Int32
_nNewEndPos)
{
OSL_ENSURE(_nNewStartPos != _nNewEndPos,ORowSetCache::fillMatrix:
StartPos and EndPos can not be equal!);
// If _nNewStartPos = 0, then fill the whole window with new data
@@ -791,7 +796,16 @@ sal_Bool ORowSetCache::fillMatrix(sal_Int32
_nNewStartPos,sal_Int32 _nNewEndPos
}
const ORowSetMatrix::iterator aEnd = aIter;
ORowSetMatrix::iterator aRealEnd = m_pMatrix-end();
-sal_Int32 nPos = (m_nRowCount m_nFetchSize) ? (m_nRowCount -
m_nFetchSize) : 0;
+sal_Int32 nPos;
+if (m_nRowCount = m_nFetchSize)
+{
+nPos = m_nRowCount - m_nFetchSize;
+}
+else
+{
+nPos = 0;
+_nNewEndPos = m_nRowCount;
+}
_nNewStartPos = nPos;
++nPos;
bCheck = m_pCacheSet-absolute(nPos);
@@ -1655,6 +1669,7 @@ void ORowSetCache::deregisterOldRow(const
TORowSetOldRowHelperRef _rRow)
sal_Bool ORowSetCache::reFillMatrix(sal_Int32 _nNewStartPos,sal_Int32
_nNewEndPos)
{
+OSL_ENSURE( _nNewEndPos - _nNewStartPos == m_nFetchSize, reFillMatrix
called with Start/EndPos not m_nFetchSize apart);
const TOldRowSetRows::const_iterator aOldRowEnd = m_aOldRows.end();
for (TOldRowSetRows::iterator aOldRowIter = m_aOldRows.begin();
aOldRowIter != aOldRowEnd; ++aOldRowIter)
{
@@ -1664,8 +1679,7 @@ sal_Bool ORowSetCache::reFillMatrix(sal_Int32
_nNewStartPos,sal_Int32 _nNewEndPo
sal_Int32 nNewSt = _nNewStartPos;
sal_Bool bRet = fillMatrix(nNewSt,_nNewEndPos);
m_nStartPos = nNewSt;
-m_nEndPos = nNewSt + (_nNewEndPos - _nNewStartPos);
-OSL_ENSURE( _nNewEndPos - _nNewStartPos == m_nFetchSize, reFillMatrix
called with Start/EndPos not m_nFetchSize apart);
+m_nEndPos = _nNewEndPos;
rotateCacheIterator(static_castORowSetMatrix::difference_type(m_nFetchSize+1));
// invalidate every iterator
return bRet;
}
diff --git a/dbaccess/source/core/api/RowSetCache.hxx
b/dbaccess/source/core/api/RowSetCache.hxx
index fc41495..850849f 100644
--- a/dbaccess/source/core/api/RowSetCache.hxx
+++ b/dbaccess/source/core/api/RowSetCache.hxx
@@ -111,7 +111,7 @@ namespace dbaccess
sal_Bool fill(ORowSetMatrix::iterator _aIter,const
ORowSetMatrix::const_iterator _aEnd,sal_Int32 _nPos,sal_Bool _bCheck);
sal_Bool reFillMatrix(sal_Int32 _nNewStartPos,sal_Int32 nNewEndPos);
-sal_Bool fillMatrix(sal_Int32 _nNewStartPos,sal_Int32 _nNewEndPos);
+sal_Bool fillMatrix(sal_Int32 _nNewStartPos,sal_Int32 _nNewEndPos);
sal_Bool moveWindow();
// returns true when a keyset needs to be created.
sal_Bool impl_createBookmarkSet_nothrow(const
::com::sun::star::uno::Reference ::com::sun::star::sdbc::XResultSet _xRs);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: dbaccess/source reportdesign/source
dbaccess/source/ui/control/VertSplitView.cxx |1 +
dbaccess/source/ui/inc/QueryTextView.hxx |1 -
dbaccess/source/ui/inc/VertSplitView.hxx |4 +++-
reportdesign/source/ui/inc/ReportWindow.hxx |2 --
4 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 648f6ac7c51656a21cd2df29eec21f9610b4657f
Author: Matteo Casalin matteo.casa...@poste.it
Date: Wed Jan 25 00:23:05 2012 +0100
Do not forward declare Splitter or include its header file if unneeded
diff --git a/dbaccess/source/ui/control/VertSplitView.cxx
b/dbaccess/source/ui/control/VertSplitView.cxx
index e04aafe..c1f7384 100644
--- a/dbaccess/source/ui/control/VertSplitView.cxx
+++ b/dbaccess/source/ui/control/VertSplitView.cxx
@@ -29,6 +29,7 @@
#include VertSplitView.hxx
#include tools/debug.hxx
+#include vcl/split.hxx
#define SPLITTER_WIDTH 80
diff --git a/dbaccess/source/ui/inc/QueryTextView.hxx
b/dbaccess/source/ui/inc/QueryTextView.hxx
index d541e97..03670be 100644
--- a/dbaccess/source/ui/inc/QueryTextView.hxx
+++ b/dbaccess/source/ui/inc/QueryTextView.hxx
@@ -31,7 +31,6 @@
#include queryview.hxx
#include querycontainerwindow.hxx
-class Splitter;
namespace dbaui
{
class OSqlEdit;
diff --git a/dbaccess/source/ui/inc/VertSplitView.hxx
b/dbaccess/source/ui/inc/VertSplitView.hxx
index b9d52b3..e25c6d4 100644
--- a/dbaccess/source/ui/inc/VertSplitView.hxx
+++ b/dbaccess/source/ui/inc/VertSplitView.hxx
@@ -28,7 +28,9 @@
#ifndef DBAUI_VERTSPLITVIEW_HXX
#define DBAUI_VERTSPLITVIEW_HXX
-#include vcl/split.hxx
+#include vcl/window.hxx
+
+class Splitter;
namespace dbaui
{
diff --git a/reportdesign/source/ui/inc/ReportWindow.hxx
b/reportdesign/source/ui/inc/ReportWindow.hxx
index 27200bd..87d549b 100644
--- a/reportdesign/source/ui/inc/ReportWindow.hxx
+++ b/reportdesign/source/ui/inc/ReportWindow.hxx
@@ -42,8 +42,6 @@
#include MarkedSection.hxx
#include ViewsWindow.hxx
-class Splitter;
-
namespace rptui
{
class ODesignView;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: dbaccess/source
dbaccess/source/core/api/RowSetCache.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 520b8118f4a2d54e4849929d94091f29a6434346
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Mon Jan 23 10:19:55 2012 +0100
ORowSetCache::fillMatrix(): fix case m_nFetchsize table size
When lowering m_nStartPos, do not duplicate rows above its old value
diff --git a/dbaccess/source/core/api/RowSetCache.cxx
b/dbaccess/source/core/api/RowSetCache.cxx
index 87655f4..4cc1811 100644
--- a/dbaccess/source/core/api/RowSetCache.cxx
+++ b/dbaccess/source/core/api/RowSetCache.cxx
@@ -796,7 +796,7 @@ sal_Bool ORowSetCache::fillMatrix(sal_Int32
_nNewStartPos,sal_Int32 _nNewEndPos
++nPos;
bCheck = m_pCacheSet-absolute(nPos);
-for(;bCheck aIter != aRealEnd;++aIter)
+for(;bCheck nPos = m_nStartPos aIter != aRealEnd; ++aIter)
{
if(!aIter-is())
*aIter = new
ORowSetValueVector(m_xMetaData-getColumnCount());
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: dbaccess/source
dbaccess/source/ui/browser/unodatbr.cxx | 18 --
1 file changed, 8 insertions(+), 10 deletions(-)
New commits:
commit 82a061079ae03f841713fd26c809d45621a59836
Author: Julien Nabet serval2...@yahoo.fr
Date: Mon Jan 23 21:09:24 2012 +0100
Fix fdo#44040 VIEWING: Crash when page preview after f4 (data sources)
Caolán fixed Iterator management which was buggy. (thank you !)
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx
b/dbaccess/source/ui/browser/unodatbr.cxx
index 4d980a0..6e31141 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -1410,24 +1410,22 @@ void SAL_CALL SbaTableQueryBrowser::disposing( const
EventObject _rSource ) thr
Reference XDispatch xSource(_rSource.Source, UNO_QUERY);
if(xSource.is())
{
-for ( ExternalFeaturesMap::iterator aLoop =
m_aExternalFeatures.begin();
- aLoop != m_aExternalFeatures.end();
- ++aLoop
-)
+ExternalFeaturesMap::iterator aLoop = m_aExternalFeatures.begin();
+ExternalFeaturesMap::iterator aEnd = m_aExternalFeatures.end();
+while (aLoop != aEnd)
{
-if ( aLoop-second.xDispatcher.get() == xSource.get() )
+ExternalFeaturesMap::iterator aI = aLoop++;
+if ( aI-second.xDispatcher.get() == xSource.get() )
{
-ExternalFeaturesMap::iterator aPrevious = aLoop;
---aPrevious;
+sal_uInt16 nSlot = aI-first;
// remove it
-m_aExternalFeatures.erase( aLoop );
+m_aExternalFeatures.erase(aI);
// maybe update the UI
-implCheckExternalSlot(aLoop-first);
+implCheckExternalSlot(nSlot);
// continue, the same XDispatch may be resposible for more
than one URL
-aLoop = aPrevious;
}
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: dbaccess/source
dbaccess/source/core/api/RowSetCache.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b026e5a4a17babd43cac266b06ad49e12f9aa225
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Sun Jan 22 01:35:58 2012 +0100
ORowSetCache::fillMatrix(): correct off-by-one error
Symptom: segfault.
Thanks to Julien Nabet for precise pointer to problematic code.
diff --git a/dbaccess/source/core/api/RowSetCache.cxx
b/dbaccess/source/core/api/RowSetCache.cxx
index bcc8652..87655f4 100644
--- a/dbaccess/source/core/api/RowSetCache.cxx
+++ b/dbaccess/source/core/api/RowSetCache.cxx
@@ -760,7 +760,7 @@ sal_Bool ORowSetCache::fillMatrix(sal_Int32
_nNewStartPos,sal_Int32 _nNewEndPos
if ( _nNewStartPos == -1 )
{
aIter = m_pMatrix-begin() + (m_nEndPos - m_nStartPos);
-i = m_nEndPos;
+i = m_nEndPos + 1;
}
else
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: dbaccess/source
dbaccess/source/core/api/KeySet.cxx | 80 +++-
dbaccess/source/core/api/KeySet.hxx |1
2 files changed, 26 insertions(+), 55 deletions(-)
New commits:
commit 773668c6ab0963f56f98270b29d595f5df7c4bb2
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Wed Jan 18 13:10:12 2012 +0100
OKeySet: tryRefetch and refreshRow share most of their code
diff --git a/dbaccess/source/core/api/KeySet.cxx
b/dbaccess/source/core/api/KeySet.cxx
index 46444e9..d55f075 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -881,45 +881,9 @@ void OKeySet::tryRefetch(const ORowSetRow
_rInsertRow,bool bRefetch)
{
if ( bRefetch )
{
-// we just areassign the base members
try
{
-Reference XParameters xParameter(m_xStatement,UNO_QUERY);
-OSL_ENSURE(xParameter.is(),No Parameter interface!);
-xParameter-clearParameters();
-
-sal_Int32 nPos=1;
-connectivity::ORowVector ORowSetValue ::Vector::const_iterator
aParaIter;
-connectivity::ORowVector ORowSetValue ::Vector::const_iterator
aParaEnd;
-OUpdatedParameter::iterator aUpdateFind =
m_aUpdatedParameter.find(m_aKeyIter-first);
-if ( aUpdateFind == m_aUpdatedParameter.end() )
-{
-aParaIter = m_aParameterValueForCache.get().begin();
-aParaEnd = m_aParameterValueForCache.get().end();
-}
-else
-{
-aParaIter = aUpdateFind-second.get().begin();
-aParaEnd = aUpdateFind-second.get().end();
-}
-
-for(++aParaIter;aParaIter != aParaEnd;++aParaIter,++nPos)
-{
-::dbtools::setObjectWithInfo( xParameter, nPos,
aParaIter-makeAny(), aParaIter-getTypeKind() );
-}
-connectivity::ORowVector ORowSetValue ::Vector::const_iterator
aIter2 = m_aKeyIter-second.first-get().begin();
-SelectColumnsMetaData::const_iterator aPosIter =
(*m_pKeyColumnNames).begin();
-SelectColumnsMetaData::const_iterator aPosEnd =
(*m_pKeyColumnNames).end();
-for(;aPosIter != aPosEnd;++aPosIter,++aIter2)
-
setOneKeyColumnParameter(nPos,xParameter,*aIter2,aPosIter-second.nType,aPosIter-second.nScale);
-aPosIter = (*m_pForeignColumnNames).begin();
-aPosEnd = (*m_pForeignColumnNames).end();
-for(;aPosIter != aPosEnd;++aPosIter,++aIter2)
-
setOneKeyColumnParameter(nPos,xParameter,*aIter2,aPosIter-second.nType,aPosIter-second.nScale);
-
-m_xSet = m_xStatement-executeQuery();
-OSL_ENSURE(m_xSet.is(),No resultset form statement!);
-bRefetch = m_xSet-next();
+bRefetch = doTryRefetch_throw();
}
catch(const Exception)
{
@@ -1327,22 +1291,9 @@ sal_Bool SAL_CALL OKeySet::previous( )
throw(SQLException, RuntimeException)
return previous_checked(sal_True);
}
-//
-
-void SAL_CALL OKeySet::refreshRow() throw(SQLException, RuntimeException)
+bool OKeySet::doTryRefetch_throw() throw(SQLException, RuntimeException)
{
-RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, dbaccess, ocke.jans...@sun.com,
OKeySet::refreshRow );
-if(isBeforeFirst() || isAfterLast() || !m_xStatement.is())
-return;
-
-m_xRow = NULL;
-::comphelper::disposeComponent(m_xSet);
-
-if ( m_aKeyIter-second.second.second.is() )
-{
-m_xRow = m_aKeyIter-second.second.second;
-return;
-}
-// we just areassign the base members
+// we just reassign the base members
Reference XParameters xParameter(m_xStatement,UNO_QUERY);
OSL_ENSURE(xParameter.is(),No Parameter interface!);
xParameter-clearParameters();
@@ -1379,8 +1330,27 @@ void SAL_CALL OKeySet::refreshRow() throw(SQLException,
RuntimeException)
setOneKeyColumnParameter(nPos,xParameter,*aIter,aPosIter-second.nType,aPosIter-second.nScale);
m_xSet = m_xStatement-executeQuery();
-OSL_ENSURE(m_xSet.is(),No resultset form statement!);
-sal_Bool bOK = m_xSet-next();
+OSL_ENSURE(m_xSet.is(),No resultset from statement!);
+return m_xSet-next()
+}
+
+//
-
+void SAL_CALL OKeySet::refreshRow() throw(SQLException, RuntimeException)
+{
+RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, dbaccess, ocke.jans...@sun.com,
OKeySet::refreshRow );
+if(isBeforeFirst() || isAfterLast() || !m_xStatement.is())
+return;
+
+m_xRow = NULL;
+::comphelper::disposeComponent(m_xSet);
+
+if ( m_aKeyIter-second.second.second.is() )
+{
+m_xRow = m_aKeyIter-second.second.second;
+return;
+}
+
+sal_Bool bOK = doTryRefetch_throw();
if ( !bOK )
{
OKeySetMatrix::iterator aTemp
[Libreoffice-commits] .: dbaccess/source
dbaccess/source/core/api/KeySet.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ef08c38172f0a19063759a52dd94b70ebd962ed4 Author: Lionel Elie Mamane lio...@mamane.lu Date: Wed Jan 18 13:51:14 2012 +0100 Oups... where is my brown paper bag? diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx index d55f075..a7d9abe 100644 --- a/dbaccess/source/core/api/KeySet.cxx +++ b/dbaccess/source/core/api/KeySet.cxx @@ -1331,7 +1331,7 @@ bool OKeySet::doTryRefetch_throw() throw(SQLException, RuntimeException) m_xSet = m_xStatement-executeQuery(); OSL_ENSURE(m_xSet.is(),No resultset from statement!); -return m_xSet-next() +return m_xSet-next(); } // - ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: dbaccess/source svtools/inc svtools/source
dbaccess/source/ui/dlg/CollectionView.cxx |2 -
svtools/inc/svtools/fileview.hxx |7 +--
svtools/source/contnr/fileview.cxx| 60 +++---
svtools/source/contnr/templwin.cxx|2 -
4 files changed, 26 insertions(+), 45 deletions(-)
New commits:
commit f10fc42189b3d3f6dd180234da9777e53e92b7e4
Author: Ivan Timofeev timofeev@gmail.com
Date: Wed Dec 28 20:00:03 2011 +0400
fdo#44204: shrink the first column in the open dialog, remove unused flags
diff --git a/dbaccess/source/ui/dlg/CollectionView.cxx
b/dbaccess/source/ui/dlg/CollectionView.cxx
index 8370e39..a41a366 100644
--- a/dbaccess/source/ui/dlg/CollectionView.cxx
+++ b/dbaccess/source/ui/dlg/CollectionView.cxx
@@ -80,7 +80,7 @@ OCollectionView::OCollectionView( Window * pParent
, m_aFTCurrentPath( this, ModuleRes( FT_EXPLORERFILE_CURRENTPATH ) )
, m_aNewFolder( this, ModuleRes( BTN_EXPLORERFILE_NEWFOLDER ) )
, m_aUp(this, ModuleRes( BTN_EXPLORERFILE_UP ) )
-, m_aView( this, ModuleRes( CTRL_VIEW ) ,FILEVIEW_SHOW_TITLE )
+, m_aView( this, ModuleRes( CTRL_VIEW ), FILEVIEW_SHOW_ONLYTITLE )
, m_aFTName(this, ModuleRes( FT_EXPLORERFILE_FILENAME ) )
, m_aName( this, ModuleRes( ED_EXPLORERFILE_FILENAME ) )
, m_aFL(this, ModuleRes( FL_1 ) )
diff --git a/svtools/inc/svtools/fileview.hxx b/svtools/inc/svtools/fileview.hxx
index d56826f..ec40c05 100644
--- a/svtools/inc/svtools/fileview.hxx
+++ b/svtools/inc/svtools/fileview.hxx
@@ -43,11 +43,8 @@
#define FILEVIEW_ONLYFOLDER 0x0001
#define FILEVIEW_MULTISELECTION 0x0002
-#define FILEVIEW_SHOW_TITLE 0x0010
-#define FILEVIEW_SHOW_SIZE 0x0020
-#define FILEVIEW_SHOW_DATE 0x0040
-#define FILEVIEW_SHOW_ALL 0x0070
-#define FILEVIEW_SHOW_NONE 0x0080
+#define FILEVIEW_SHOW_ONLYTITLE 0x0010
+#define FILEVIEW_SHOW_NONE 0x0020
class ViewTabListBox_Impl;
class SvtFileView_Impl;
diff --git a/svtools/source/contnr/fileview.cxx
b/svtools/source/contnr/fileview.cxx
index 4f17f34..f726a09 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -722,24 +722,29 @@ ViewTabListBox_Impl::ViewTabListBox_Impl( Window*
pParentWin,
mbEnableRename ( sal_True )
{
-sal_Bool bViewHeader = true;
+const bool bViewHeader = (nFlags FILEVIEW_SHOW_NONE) == 0;
Size aBoxSize = pParentWin-GetSizePixel();
mpHeaderBar = new HeaderBar( pParentWin, WB_BUTTONSTYLE | WB_BOTTOMBORDER
);
mpHeaderBar-SetPosSizePixel( Point( 0, 0 ),
mpHeaderBar-CalcWindowSizePixel() );
HeaderBarItemBits nBits = ( HIB_LEFT | HIB_VCENTER | HIB_CLICKABLE );
-if ((nFlags FILEVIEW_SHOW_NONE) == FILEVIEW_SHOW_NONE)
-bViewHeader = false;
+if (nFlags FILEVIEW_SHOW_ONLYTITLE)
+{
+long pTabs[] = { 2, 20, 600 };
+SetTabs(pTabs[0], MAP_PIXEL);
+
+mpHeaderBar-InsertItem(COLUMN_TITLE,
String(SvtResId(STR_SVT_FILEVIEW_COLUMN_TITLE)), 600, nBits | HIB_UPARROW);
+}
else
{
-if (nFlags FILEVIEW_SHOW_TITLE)
-mpHeaderBar-InsertItem(COLUMN_TITLE,
String(SvtResId(STR_SVT_FILEVIEW_COLUMN_TITLE)), 600, nBits | HIB_UPARROW);
-if (nFlags FILEVIEW_SHOW_ALL)
-mpHeaderBar-InsertItem(COLUMN_TYPE,
String(SvtResId(STR_SVT_FILEVIEW_COLUMN_TYPE)), 140, nBits);
-if (nFlags FILEVIEW_SHOW_SIZE)
-mpHeaderBar-InsertItem(COLUMN_SIZE,
String(SvtResId(STR_SVT_FILEVIEW_COLUMN_SIZE)), 80, nBits);
-if (nFlags FILEVIEW_SHOW_DATE)
-mpHeaderBar-InsertItem(COLUMN_DATE,
String(SvtResId(STR_SVT_FILEVIEW_COLUMN_DATE)), 500, nBits);
+long pTabs[] = { 5, 20, 180, 320, 400, 600 };
+SetTabs(pTabs[0], MAP_PIXEL);
+SetTabJustify(2, AdjustRight); // column Size
+
+mpHeaderBar-InsertItem(COLUMN_TITLE,
String(SvtResId(STR_SVT_FILEVIEW_COLUMN_TITLE)), 180, nBits | HIB_UPARROW);
+mpHeaderBar-InsertItem(COLUMN_TYPE,
String(SvtResId(STR_SVT_FILEVIEW_COLUMN_TYPE)), 140, nBits);
+mpHeaderBar-InsertItem(COLUMN_SIZE,
String(SvtResId(STR_SVT_FILEVIEW_COLUMN_SIZE)), 80, nBits);
+mpHeaderBar-InsertItem(COLUMN_DATE,
String(SvtResId(STR_SVT_FILEVIEW_COLUMN_DATE)), 500, nBits);
}
Size aHeadSize = mpHeaderBar-GetSizePixel();
@@ -748,6 +753,8 @@ ViewTabListBox_Impl::ViewTabListBox_Impl( Window*
pParentWin,
InitHeaderBar( mpHeaderBar );
SetHighlightRange();
SetEntryHeight( ROW_HEIGHT );
+if (nFlags FILEVIEW_MULTISELECTION)
+SetSelectionMode( MULTIPLE_SELECTION );
Show();
if( bViewHeader )
@@ -1211,7 +1218,7 @@ SvtFileView::SvtFileView( Window* pParent, const ResId
rResId,
Control( pParent, rResId )
{
-sal_Int8 nFlags = FILEVIEW_SHOW_ALL;
+sal_Int8 nFlags = 0;
if ( bOnlyFolder )
nFlags |= FILEVIEW_ONLYFOLDER;
if ( bMultiSelection )
@@
[Libreoffice-commits] .: dbaccess/source
dbaccess/source/ui/dlg/indexdialog.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 43100964840d0a18dad8b655de2ce94ce5fa42eb
Author: Andras Timar ati...@suse.com
Date: Mon Dec 26 22:34:08 2011 +0100
missing icons in Index Design dialog fdo#38435
diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx
b/dbaccess/source/ui/dlg/indexdialog.cxx
index 6293772..10d5c42 100644
--- a/dbaccess/source/ui/dlg/indexdialog.cxx
+++ b/dbaccess/source/ui/dlg/indexdialog.cxx
@@ -882,7 +882,7 @@ DBG_NAME(DbaIndexDialog)
{
nN = IMG_INDEX_DLG_LC;
}
-return ImageList( nN );
+return ImageList(ModuleRes(nN));
}
//--
void DbaIndexDialog::resizeControls(const Size _rDiff)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: dbaccess/source
dbaccess/source/core/resource/core_resource.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 444eb68e8a6b35752bac4ff12fc83e44f36bb44b Author: Julien Nabet serval2...@yahoo.fr Date: Mon Dec 12 22:31:09 2011 +0100 Remove ByteString diff --git a/dbaccess/source/core/resource/core_resource.cxx b/dbaccess/source/core/resource/core_resource.cxx index 975096e..a7cd085 100644 --- a/dbaccess/source/core/resource/core_resource.cxx +++ b/dbaccess/source/core/resource/core_resource.cxx @@ -56,9 +56,9 @@ namespace dbaccess ::com::sun::star::lang::Locale aLocale = Application::GetSettings().GetUILocale(); -ByteString sFileName(dba); +rtl::OString sFileName(dba); -m_pImpl = ResMgr::CreateResMgr(sFileName.GetBuffer(), aLocale); +m_pImpl = ResMgr::CreateResMgr(sFileName.getStr(), aLocale); } //-- ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: dbaccess/source
dbaccess/source/ui/dlg/directsql.cxx |3 +++
dbaccess/source/ui/inc/directsql.hxx |2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 15f8fce9860100505c4c6a54f5f003375fbd8275
Author: Julien Nabet serval2...@yahoo.fr
Date: Sun Dec 11 16:36:38 2011 +0100
Remove ByteString
diff --git a/dbaccess/source/ui/dlg/directsql.cxx
b/dbaccess/source/ui/dlg/directsql.cxx
index f0d6f0d..e650fb3 100644
--- a/dbaccess/source/ui/dlg/directsql.cxx
+++ b/dbaccess/source/ui/dlg/directsql.cxx
@@ -36,6 +36,7 @@
#include vcl/svapp.hxx
#include osl/mutex.hxx
#include tools/diagnose_ex.h
+#include rtl/strbuf.hxx
//
namespace dbaui
@@ -46,6 +47,8 @@ namespace dbaui
using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::lang;
+using ::rtl::OStringBuffer;
+
//
//= LargeEntryListBox
//
diff --git a/dbaccess/source/ui/inc/directsql.hxx
b/dbaccess/source/ui/inc/directsql.hxx
index 250c667..96c2ebc 100644
--- a/dbaccess/source/ui/inc/directsql.hxx
+++ b/dbaccess/source/ui/inc/directsql.hxx
@@ -126,7 +126,7 @@ namespace dbaui
{ \
const sal_Char* pError = impl_CheckInvariants();\
if (pError) \
-OSL_FAIL((ByteString(methodname) += ByteString(: ) +=
ByteString(pError)).GetBuffer()); \
+OSL_FAIL(rtl::OStringBuffer(methodname).append(:
).append(pError). makeStringAndClear().getStr()); \
}
#else
#define CHECK_INVARIANTS(methodname)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: dbaccess/source
dbaccess/source/ui/misc/moduledbu.cxx |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 5c4503898742a151e7521cae0649ff5eb6f19220
Author: Julien Nabet serval2...@yahoo.fr
Date: Sun Dec 11 20:38:34 2011 +0100
Remove ByteString
diff --git a/dbaccess/source/ui/misc/moduledbu.cxx
b/dbaccess/source/ui/misc/moduledbu.cxx
index dfd95ae..18c2888 100644
--- a/dbaccess/source/ui/misc/moduledbu.cxx
+++ b/dbaccess/source/ui/misc/moduledbu.cxx
@@ -86,8 +86,7 @@ ResMgr* OModuleImpl::getResManager()
if (!m_pRessources)
{
// create a manager with a fixed prefix
-ByteString aMgrName = ByteString( dbu );
-m_pRessources = ResMgr::CreateResMgr(aMgrName.GetBuffer());
+m_pRessources = ResMgr::CreateResMgr(rtl::OString(dbu).getStr());
}
return m_pRessources;
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: dbaccess/source embeddedobj/source framework/source svx/source sw/source vcl/inc vcl/source vcl/win
dbaccess/source/ui/inc/dbu_resource.hrc|2 +-
embeddedobj/source/general/docholder.cxx |4 ++--
framework/source/uielement/langselectionmenucontroller.cxx |2 +-
svx/source/mnuctrls/SmartTagCtl.cxx|2 +-
sw/source/ui/smartmenu/stmenu.cxx |2 +-
vcl/inc/svdata.hxx |2 +-
vcl/inc/vcl/menu.hxx |4 ++--
vcl/source/window/decoview.cxx |2 +-
vcl/source/window/floatwin.cxx |2 +-
vcl/source/window/menu.cxx |4 ++--
vcl/source/window/window.cxx |8
vcl/source/window/winproc.cxx |2 +-
vcl/win/source/window/salframe.cxx |8
vcl/win/source/window/salmenu.cxx |8
14 files changed, 26 insertions(+), 26 deletions(-)
New commits:
commit 181b1815f807635ecdd8e5f8bbd2c5798f8d7703
Author: Michael T. Whiteley m...@whiteley.org
Date: Tue Dec 6 23:04:19 2011 -0800
Change menues to menus
diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc
b/dbaccess/source/ui/inc/dbu_resource.hrc
index 7ba85bc..e2cb7fc 100644
--- a/dbaccess/source/ui/inc/dbu_resource.hrc
+++ b/dbaccess/source/ui/inc/dbu_resource.hrc
@@ -286,7 +286,7 @@
// free
//
-// menues
+// menus
#define MENU_TABLETREE_POPUPRID_MENU_START + 0
#define MENU_DATASOURCELIST_POPUP RID_MENU_START + 1
diff --git a/embeddedobj/source/general/docholder.cxx
b/embeddedobj/source/general/docholder.cxx
index 5e24643..036c2d6 100644
--- a/embeddedobj/source/general/docholder.cxx
+++ b/embeddedobj/source/general/docholder.cxx
@@ -747,11 +747,11 @@ sal_Bool DocumentHolder::ShowUI( const uno::Reference
::com::sun::star::frame::
// as long as the LM is invisible and locked an empty tool
space will be used on resizing
xOwnLM-setDockingAreaAcceptor( xDocAreaAcc );
-// try to merge menues; don't do anything else if it fails
+// try to merge menus; don't do anything else if it fails
if ( MergeMenues_Impl( xOwnLM, xContainerLM, xContainerDP,
aContModuleName ) )
{
// make sure that the container LM does not control the
size of the containers window anymore
-// this must be done after merging menues as we won't get
the container menu otherwise
+// this must be done after merging menus as we won't get
the container menu otherwise
xContainerLM-setDockingAreaAcceptor( uno::Reference
ui::XDockingAreaAcceptor () );
// prevent further changes at this LM
diff --git a/framework/source/uielement/langselectionmenucontroller.cxx
b/framework/source/uielement/langselectionmenucontroller.cxx
index 4b04b5c..b5f1566 100644
--- a/framework/source/uielement/langselectionmenucontroller.cxx
+++ b/framework/source/uielement/langselectionmenucontroller.cxx
@@ -260,7 +260,7 @@ void LanguageSelectionMenuController::fillPopupMenu(
Reference css::awt::XPopup
m_nScriptType, m_aCurLang, m_aKeyboardLang, m_aGuessedTextLang );
// now add menu entries
-// the different menues purpose will be handled by the different string
+// the different menus purpose will be handled by the different string
// for aCmd_Dialog and aCmd_Language
sal_Int16 nItemId = 1; // in this control the item id is not important
for executing the command
diff --git a/svx/source/mnuctrls/SmartTagCtl.cxx
b/svx/source/mnuctrls/SmartTagCtl.cxx
index 8d83ae3..ffe8ad3 100644
--- a/svx/source/mnuctrls/SmartTagCtl.cxx
+++ b/svx/source/mnuctrls/SmartTagCtl.cxx
@@ -103,7 +103,7 @@ void SvxSmartTagsControl::FillMenu()
const rtl::OUString aSmartTagType = xAction-getSmartTagName(
nSmartTagIndex );
const rtl::OUString aSmartTagCaption = xAction-getSmartTagCaption(
nSmartTagIndex, rLocale );
-// no sub-menues if there's only one smart tag type listed:
+// no sub-menus if there's only one smart tag type listed:
PopupMenu* pSbMenu = mpMenu;
if ( 1 rActionComponentsSequence.getLength() )
{
diff --git a/sw/source/ui/smartmenu/stmenu.cxx
b/sw/source/ui/smartmenu/stmenu.cxx
index 144dcae..201ec88 100644
--- a/sw/source/ui/smartmenu/stmenu.cxx
+++ b/sw/source/ui/smartmenu/stmenu.cxx
@@ -95,7 +95,7 @@ SwSmartTagPopup::SwSmartTagPopup( SwView* pSwView,
const rtl::OUString aSmartTagType = xAction-getSmartTagName(
nSmartTagIndex );
const rtl::OUString aSmartTagCaption = xAction-getSmartTagCaption(
nSmartTagIndex, aLocale );
-// no sub-menues if there's only one smart tag type listed:
+
[Libreoffice-commits] .: dbaccess/source
dbaccess/source/ui/dlg/dbadmin.src |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 3a9271b8fc70f263d1d7ffb8caae915447c32228
Author: Lior Kaplan kaplanl...@gmail.com
Date: Mon Dec 5 03:11:19 2011 +0200
Add missing space
diff --git a/dbaccess/source/ui/dlg/dbadmin.src
b/dbaccess/source/ui/dlg/dbadmin.src
index d3a356f..8bacdec 100644
--- a/dbaccess/source/ui/dlg/dbadmin.src
+++ b/dbaccess/source/ui/dlg/dbadmin.src
@@ -692,7 +692,7 @@ TabPage PAGE_LDAP
{
Pos = MAP_APPFONT ( 6 , 2*UNRELATED_CONTROLS + RELATED_CONTROLS +
2*FIXEDTEXT_HEIGHT) ;
Size = MAP_APPFONT ( PAGE_X - 12 , CHECKBOX_HEIGHT ) ;
-Text [ en-US ] = Use secure connection(SSL);
+Text [ en-US ] = Use secure connection (SSL);
HelpId = HID_DSADMIN_USESSL_LDAP;
};
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: dbaccess/source
dbaccess/source/filter/xml/xmlExport.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ecbed27f6a2b61a6544c92178367eacfa2ea0b50
Author: August Sodora aug...@gmail.com
Date: Thu Dec 1 11:23:42 2011 -0500
Check length before operator[]
diff --git a/dbaccess/source/filter/xml/xmlExport.cxx
b/dbaccess/source/filter/xml/xmlExport.cxx
index 50bf0b1..9da1a0e 100644
--- a/dbaccess/source/filter/xml/xmlExport.cxx
+++ b/dbaccess/source/filter/xml/xmlExport.cxx
@@ -565,7 +565,7 @@ void ODBExport::exportConnectionData()
{
::svt::OFileNotation aTransformer( sFileName );
::rtl::OUStringBuffer sURL( aTransformer.get(
::svt::OFileNotation::N_URL ) );
-if (sURL[sURL.getLength() - 1] != '/')
+if (sURL.getLength() == 0 || sURL[sURL.getLength() - 1] !=
'/')
sURL.append('/');
AddAttribute(XML_NAMESPACE_XLINK,XML_HREF,GetRelativeReference(sURL.makeStringAndClear()));
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: dbaccess/source
dbaccess/source/ui/browser/dbtreeview.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 6bfc7f28e6d3454fa90d6c32b36cd9bf898ba933
Author: Michael Meeks michael.me...@suse.com
Date: Tue Nov 15 17:35:36 2011 +0100
Address data source ordering x#62860
information from the apply file:
patchname: addrbk-datasrc-ordering.diff
issues:
author: michael
section: Misc
comment:
Address data source ordering x#62860
sectioncomment:
git log from build repository:
commit bfa619922b90a021e5d856333dd398512389ad67
Author: Jan Holesovsky ke...@suse.cz
Date: Mon Jun 21 22:11:19 2010 +0200
Update patches to dev300-m83.
* [...]
commit 256381886a238d80b9ddab795b500576d92404cc
Author: Jan Holesovsky ke...@suse.cz
Date: Wed May 19 12:16:00 2010 +0200
Updated patches do dev300-m77.
* [...]
commit df913735fd729978d20f0282fe32d14bf597891f
Author: Jan Holesovsky ke...@suse.cz
Date: Mon May 17 01:21:36 2010 +0200
Patches adopted to the tabs - spaces fixes + trailing whitespace
cleanup.
* [...]
commit c6847e9b022184e98942391a2b5711c31eb25ba3
Author: Jan Holesovsky ke...@suse.cz
Date: Fri May 14 14:32:23 2010 +0200
Convert tabs to spaces in all the code introduced by the patches.
* [...]
commit 09774df8a62bf886c78c0f84d56b2d518ae8107e
Author: Jan Holesovsky ke...@suse.cz
Date: Tue Apr 29 14:04:53 2008 +
Src680/
* Some cleaning action: src680/* - dev300/
* patches/dev300/gstreamer-sd.diff,
patches/dev300/gstreamer-slideshow.diff,
patches/dev300/letter-wizard-resource-id.diff: Moved to
patches/gstreamer.
* patches/dev300/mono-build.diff: Moved to patches/mono.
* patches/dev300/sc-hacky-handle-boolean.diff,
patches/dev300/vba-workbook-worksheet-events.diff: Moved to
patches/vba.
* patches/src680/unittesting-*: Moved...
patches/unittesting/*: ...here.
* patches/src680/*: Moved...
patches/dev300/*: ...here.
* patches/dev300/apply,
patches/Makefile.am: Add the unittesting subdir, remove src680.
diff --git a/dbaccess/source/ui/browser/dbtreeview.cxx
b/dbaccess/source/ui/browser/dbtreeview.cxx
index b69c67b..25fee5b 100644
--- a/dbaccess/source/ui/browser/dbtreeview.cxx
+++ b/dbaccess/source/ui/browser/dbtreeview.cxx
@@ -53,7 +53,7 @@ DBTreeView::DBTreeView( Window* pParent, const Reference
XMultiServiceFactory
{
DBG_CTOR(DBTreeView,NULL);
-m_pTreeListBox = new DBTreeListBox(this, _rxORB ,WB_HASLINES | WB_SORT |
WB_HASBUTTONS | WB_HSCROLL |WB_HASBUTTONSATROOT,sal_True);
+m_pTreeListBox = new DBTreeListBox(this, _rxORB ,WB_BORDER | WB_HASLINES |
WB_HASLINESATROOT | WB_HASBUTTONS | WB_HSCROLL |WB_HASBUTTONSATROOT);
m_pTreeListBox-EnableCheckButton(NULL);
m_pTreeListBox-SetDragDropMode( 0 );
m_pTreeListBox-EnableInplaceEditing( sal_True );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: dbaccess/source
dbaccess/source/ui/querydesign/QueryDesignView.cxx | 13 -
1 file changed, 12 insertions(+), 1 deletion(-)
New commits:
commit 48cdc0318b348c51742339b243dc05546148b335
Author: Julien Nabet serval2...@yahoo.fr
Date: Sat Oct 22 11:26:20 2011 +0200
Fix fdo#38286. Perhaps it could be simplified
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 8fc9e70..44c2503 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -3213,7 +3213,18 @@ void OQueryDesignView::fillFunctionInfo( const
::connectivity::OSQLParseNode* p
OQueryController rController =
static_castOQueryController(getController());
sal_Int32 nDataType = DataType::DOUBLE;
::rtl::OUString sFieldName = sFunctionTerm;
-OSQLParseNode* pFunctionName = pNode-getChild(0);
+const OSQLParseNode* pFunctionName;
+// Fix fdo#38286 : crash when constant in the query
+// TODO : is it possible to have a child or children in the pNode ?
+// if not this part could be simplified
+if (pNode-count())
+{
+pFunctionName = pNode-getChild(0);
+}
+else
+{
+pFunctionName = pNode;
+}
if ( !SQL_ISPUNCTUATION(pFunctionName,{) )
{
if ( SQL_ISRULEOR2(pNode,length_exp,char_value_fct) )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
