[Libreoffice-commits] .: dbaccess/source

[Libreoffice Gerrit user]

 dbaccess/source/core/dataaccess/ComponentDefinition.hxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 5a8ec562ccdc1c741ebb607e07c96e7182f147a0
Author: Noel Grandin n...@peralex.com
Date:   Mon Jan 28 11:50:03 2013 +0200

fdo#46808, fix calling convention

Change-Id: I72b7945a6a8838e97184a27661520de55ac45e73

diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.hxx 
b/dbaccess/source/core/dataaccess/ComponentDefinition.hxx
index 2e39196..fa0901d 100644
--- a/dbaccess/source/core/dataaccess/ComponentDefinition.hxx
+++ b/dbaccess/source/core/dataaccess/ComponentDefinition.hxx
@@ -126,7 +126,7 @@ public:
 // ::com::sun::star::uno::XInterface
 DECLARE_XINTERFACE( )
 
-// ::com::sun::star::lang::XServiceInfo
+// ::com::sun::star::lang::XServiceInfo
 virtual ::rtl::OUString SAL_CALL getImplementationName(  ) 
throw(::com::sun::star::uno::RuntimeException);
 virtual ::com::sun::star::uno::Sequence ::rtl::OUString  SAL_CALL 
getSupportedServiceNames(  ) throw(::com::sun::star::uno::RuntimeException);
 
@@ -136,9 +136,9 @@ public:
 Create(const ::com::sun::star::uno::Reference 
::com::sun::star::uno::XComponentContext );
 
 // XInitialization
-void initialize( com::sun::star::uno::Sequence com::sun::star::uno::Any  
const  rArguments) throw (com::sun::star::uno::Exception);
+virtual void SAL_CALL initialize( com::sun::star::uno::Sequence 
com::sun::star::uno::Any  const  rArguments) throw 
(com::sun::star::uno::Exception);
 
-// ::com::sun::star::beans::XPropertySet
+// ::com::sun::star::beans::XPropertySet
 virtual ::com::sun::star::uno::Reference 
::com::sun::star::beans::XPropertySetInfo  SAL_CALL getPropertySetInfo(  ) 
throw(::com::sun::star::uno::RuntimeException);
 
 // XColumnsSupplier
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: dbaccess/source

[Libreoffice Gerrit user]

 dbaccess/source/core/dataaccess/databasecontext.cxx   |5 -
 dbaccess/source/core/dataaccess/databaseregistrations.cxx |   12 +-
 dbaccess/source/core/dataaccess/definitioncontainer.cxx   |   12 +-
 dbaccess/source/core/dataaccess/documentcontainer.cxx |2 
 dbaccess/source/core/dataaccess/intercept.cxx |   33 +++
 dbaccess/source/core/dataaccess/myucp_datasupplier.cxx|5 -
 dbaccess/source/core/misc/DatabaseDataProvider.cxx|   60 +-
 dbaccess/source/core/misc/dsntypes.cxx|   12 +-
 dbaccess/source/core/misc/sdbcoretools.cxx|3 
 dbaccess/source/core/recovery/dbdocrecovery.cxx   |   19 +---
 dbaccess/source/core/recovery/settingsimport.cxx  |   10 --
 dbaccess/source/core/recovery/storagetextstream.cxx   |4 
 dbaccess/source/core/recovery/subcomponentloader.cxx  |2 
 dbaccess/source/core/recovery/subcomponentrecovery.cxx|   42 -
 14 files changed, 95 insertions(+), 126 deletions(-)

New commits:
commit a1808e0d38dd36d590a5bae26a02c49252d6162a
Author: Marcos Paulo de Souza marcos.souza@gmail.com
Date:   Sat Jan 26 13:25:40 2013 -0200

Remove more STRINGPARAM macros form dbaccess

Change-Id: I283ccd03dc811dda2f10963f400cd517f42ea7b3
Reviewed-on: https://gerrit.libreoffice.org/1878
Reviewed-by: Olivier Hallot olivier.hal...@alta.org.br
Tested-by: Olivier Hallot olivier.hal...@alta.org.br

diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx 
b/dbaccess/source/core/dataaccess/databasecontext.cxx
index b5372d4..8144f82 100644
--- a/dbaccess/source/core/dataaccess/databasecontext.cxx
+++ b/dbaccess/source/core/dataaccess/databasecontext.cxx
@@ -204,10 +204,9 @@ ODatabaseContext::~ODatabaseContext()
 }
 
 // Helper
-rtl::OUString ODatabaseContext::getImplementationName_static() throw( 
RuntimeException )
-
+OUString ODatabaseContext::getImplementationName_static() throw( 
RuntimeException )
 {
-return 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.comp.dba.ODatabaseContext));
+return OUString(com.sun.star.comp.dba.ODatabaseContext);
 }
 
 Reference XInterface  ODatabaseContext::Create(const Reference 
XComponentContext  _rxContext)
diff --git a/dbaccess/source/core/dataaccess/databaseregistrations.cxx 
b/dbaccess/source/core/dataaccess/databaseregistrations.cxx
index 344c15c..5886fbd 100644
--- a/dbaccess/source/core/dataaccess/databaseregistrations.cxx
+++ b/dbaccess/source/core/dataaccess/databaseregistrations.cxx
@@ -53,21 +53,21 @@ namespace dbaccess
 using ::com::sun::star::uno::XAggregation;
 /** === end UNO using === **/
 
-static const ::rtl::OUString getConfigurationRootPath()
+static const OUString getConfigurationRootPath()
 {
-static ::rtl::OUString 
s_sNodeName(RTL_CONSTASCII_USTRINGPARAM(org.openoffice.Office.DataAccess/RegisteredNames));
+static OUString 
s_sNodeName(org.openoffice.Office.DataAccess/RegisteredNames);
 return s_sNodeName;
 }
 
-const ::rtl::OUString getLocationNodeName()
+const OUString getLocationNodeName()
 {
-static ::rtl::OUString 
s_sNodeName(RTL_CONSTASCII_USTRINGPARAM(Location));
+static OUString s_sNodeName(Location);
 return s_sNodeName;
 }
 
-const ::rtl::OUString getNameNodeName()
+const OUString getNameNodeName()
 {
-static ::rtl::OUString 
s_sNodeName(RTL_CONSTASCII_USTRINGPARAM(Name));
+static OUString s_sNodeName(Name);
 return s_sNodeName;
 }
 
diff --git a/dbaccess/source/core/dataaccess/definitioncontainer.cxx 
b/dbaccess/source/core/dataaccess/definitioncontainer.cxx
index 928f2cf..8c8cd98 100644
--- a/dbaccess/source/core/dataaccess/definitioncontainer.cxx
+++ b/dbaccess/source/core/dataaccess/definitioncontainer.cxx
@@ -159,16 +159,16 @@ ODefinitionContainer::~ODefinitionContainer()
 IMPLEMENT_FORWARD_XINTERFACE2( 
ODefinitionContainer,OContentHelper,ODefinitionContainer_Base)
 
IMPLEMENT_TYPEPROVIDER2(ODefinitionContainer,OContentHelper,ODefinitionContainer_Base);
 // XServiceInfo
-::rtl::OUString SAL_CALL ODefinitionContainer::getImplementationName(  ) 
throw(RuntimeException)
+OUString SAL_CALL ODefinitionContainer::getImplementationName(  ) 
throw(RuntimeException)
 {
-return 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.sdb.ODefinitionContainer));
+return OUString(com.sun.star.sdb.ODefinitionContainer);
 }
 
-Sequence ::rtl::OUString  SAL_CALL 
ODefinitionContainer::getSupportedServiceNames(  ) throw(RuntimeException)
+Sequence OUString  SAL_CALL ODefinitionContainer::getSupportedServiceNames(  
) throw(RuntimeException)
 {
-Sequence ::rtl::OUString  aReturn(2);
-aReturn.getArray()[0] = 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.sdb.DefinitionContainer));
-aReturn.getArray()[1] = 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.ucb.Content));
+Sequence OUString  aReturn(2);
+ 

[Libreoffice-commits] .: dbaccess/source

[Libreoffice Gerrit user]

 dbaccess/source/core/dataaccess/ContentHelper.cxx|   47 +++
 dbaccess/source/core/dataaccess/ModelImpl.cxx|   24 ++-
 dbaccess/source/core/dataaccess/ModelImpl.hxx|2 
 dbaccess/source/core/dataaccess/SharedConnection.hxx |   10 +--
 dbaccess/source/core/dataaccess/bookmarkcontainer.cxx|   10 +--
 dbaccess/source/core/dataaccess/commandcontainer.cxx |4 -
 dbaccess/source/core/dataaccess/commanddefinition.cxx|   10 +--
 dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx |   18 ++---
 8 files changed, 48 insertions(+), 77 deletions(-)

New commits:
commit 188c2d34422936a6a19dcbb7ffc3e77bfebaee33
Author: Marcos Paulo de Souza marcos.souza@gmail.com
Date:   Sat Jan 19 13:36:05 2013 -0200

Remove more STRINGPARAM macros from dbaccess

Change-Id: I5a5af27d7c980f6b71011c33531a49a82d79fbc8
Reviewed-on: https://gerrit.libreoffice.org/1771
Reviewed-by: Olivier Hallot olivier.hal...@alta.org.br
Tested-by: Olivier Hallot olivier.hal...@alta.org.br

diff --git a/dbaccess/source/core/dataaccess/ContentHelper.cxx 
b/dbaccess/source/core/dataaccess/ContentHelper.cxx
index 20a535f..87b6480 100644
--- a/dbaccess/source/core/dataaccess/ContentHelper.cxx
+++ b/dbaccess/source/core/dataaccess/ContentHelper.cxx
@@ -93,10 +93,8 @@ IMPLEMENT_IMPLEMENTATION_ID(OContentHelper)
 Reference XContentIdentifier  SAL_CALL OContentHelper::getIdentifier(  ) 
throw (RuntimeException)
 {
 ::osl::MutexGuard aGuard(m_aMutex);
-::rtl::OUStringBuffer aIdentifier;
-aIdentifier.appendAscii( private: );
-aIdentifier.append( impl_getHierarchicalName( true ) );
-return new ::ucbhelper::ContentIdentifier( 
aIdentifier.makeStringAndClear() );
+OUString aIdentifier( private: + impl_getHierarchicalName( true ) );
+return new ::ucbhelper::ContentIdentifier( aIdentifier );
 }
 
 ::rtl::OUString OContentHelper::impl_getHierarchicalName( bool 
_includingRootContainer ) const
@@ -114,9 +112,7 @@ Reference XContentIdentifier  SAL_CALL 
OContentHelper::getIdentifier(  ) throw
 xProp-getPropertyValue( PROPERTY_NAME ) = sName;
 
 ::rtl::OUString sPrevious = aHierarchicalName.makeStringAndClear();
-aHierarchicalName.append( sName );
-aHierarchicalName.append( sal_Unicode( '/' ) );
-aHierarchicalName.append( sPrevious );
+aHierarchicalName.append( sName + / + sPrevious );
 }
 }
 ::rtl::OUString sHierarchicalName( aHierarchicalName.makeStringAndClear() 
);
@@ -352,28 +348,19 @@ Sequence Any  OContentHelper::setPropertyValues(const 
Sequence PropertyValue
 if ( rValue.Name == ContentType )
 {
 // Read-only property!
-aRet[ n ] = IllegalAccessException(
-::rtl::OUString(
-RTL_CONSTASCII_USTRINGPARAM(Property is 
read-only!)
-),
+aRet[ n ] = IllegalAccessException(Property is read-only!,
 static_cast cppu::OWeakObject * ( this ) );
 }
 else if ( rValue.Name == IsDocument )
 {
 // Read-only property!
-aRet[ n ] = IllegalAccessException(
-::rtl::OUString(
-RTL_CONSTASCII_USTRINGPARAM(Property is 
read-only!)
-),
+aRet[ n ] = IllegalAccessException(Property is read-only!,
 static_cast cppu::OWeakObject * ( this ) );
 }
 else if ( rValue.Name == IsFolder )
 {
 // Read-only property!
-aRet[ n ] = IllegalAccessException(
-::rtl::OUString(
-RTL_CONSTASCII_USTRINGPARAM(Property is 
read-only!)
-),
+aRet[ n ] = IllegalAccessException(Property is read-only!,
 static_cast cppu::OWeakObject * ( this ) );
 }
 else if ( rValue.Name == Title )
@@ -407,20 +394,14 @@ Sequence Any  OContentHelper::setPropertyValues(const 
Sequence PropertyValue
 }
 else
 {
-aRet[ n ] = IllegalTypeException(
-::rtl::OUString(
-RTL_CONSTASCII_USTRINGPARAM(Property 
value has wrong type!)
-),
+aRet[ n ] = IllegalTypeException(Property value has wrong 
type!,
 static_cast cppu::OWeakObject * ( this ) );
 }
 }
 
 else
 {
-aRet[ n ] = Exception(
-::rtl::OUString(
-RTL_CONSTASCII_USTRINGPARAM(No property 
set for storing the value!)
-),
+aRet[ n ] = Exception(No property set for storing the value!,
   

[Libreoffice-commits] .: dbaccess/source

[Libreoffice Gerrit user]

 dbaccess/source/ui/querydesign/QueryDesignView.cxx |   51 +
 1 file changed, 33 insertions(+), 18 deletions(-)

New commits:
commit 8f766122f0c5fbbb5442e1a5dd6f4eab9744d5cd
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Fri Jan 18 18:44:22 2013 +0100

mark *all* tables of a nested join as added

Else, if the n^{th} (with n2) table also appears in a (non-NATURAL) INNER 
JOIN, it is repeated later, leading to an error from the database engine

Change-Id: I03e0f0ef51f45be9d7ddfa63a9dbe09dc500f8dd

diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx 
b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 9ef92b9..5507634 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -476,10 +476,29 @@ namespace
 return BuildJoin(_xConnection, rRh, BuildTable(_xConnection,pLh), 
data);
 }
 
//--
+typedef ::std::map ::rtl::OUString,sal_Bool,::comphelper::UStringMixLess 
tableNames_t;
+
//--
+void addConnectionTableNames( const Reference XConnection _xConnection,
+  const OQueryTableConnection* const 
pEntryConn,
+  tableNames_t _rTableNames )
+{
+// insert tables into table list to avoid double entries
+const OQueryTableWindow* const pEntryTabFrom = 
static_castOQueryTableWindow*(pEntryConn-GetSourceWin());
+const OQueryTableWindow* const pEntryTabTo = 
static_castOQueryTableWindow*(pEntryConn-GetDestWin());
+
+::rtl::OUString sTabName(BuildTable(_xConnection,pEntryTabFrom));
+if(_rTableNames.find(sTabName) == _rTableNames.end())
+_rTableNames[sTabName] = sal_True;
+sTabName = BuildTable(_xConnection,pEntryTabTo);
+if(_rTableNames.find(sTabName) == _rTableNames.end())
+_rTableNames[sTabName] = sal_True;
+}
+
//--
 void GetNextJoin(   const Reference XConnection _xConnection,
 OQueryTableConnection* pEntryConn,
 OQueryTableWindow* pEntryTabTo,
-::rtl::OUString aJoin)
+::rtl::OUString aJoin,
+tableNames_t _rTableNames)
 {
 OQueryTableConnectionData* pEntryConnData = 
static_castOQueryTableConnectionData*(pEntryConn-GetData().get());
 if ( pEntryConnData-GetJoinType() == INNER_JOIN  
!pEntryConnData-isNatural() )
@@ -487,15 +506,18 @@ namespace
 
 if(aJoin.isEmpty())
 {
+addConnectionTableNames(_xConnection, pEntryConn, _rTableNames);
 OQueryTableWindow* pEntryTabFrom = 
static_castOQueryTableWindow*(pEntryConn-GetSourceWin());
 aJoin = 
BuildJoin(_xConnection,pEntryTabFrom,pEntryTabTo,pEntryConnData);
 }
 else if(pEntryTabTo == pEntryConn-GetDestWin())
 {
+addConnectionTableNames(_xConnection, pEntryConn, _rTableNames);
 aJoin = BuildJoin(_xConnection,aJoin,pEntryTabTo,pEntryConnData);
 }
 else if(pEntryTabTo == pEntryConn-GetSourceWin())
 {
+addConnectionTableNames(_xConnection, pEntryConn, _rTableNames);
 aJoin = BuildJoin(_xConnection,pEntryTabTo,aJoin,pEntryConnData);
 }
 
@@ -514,7 +536,7 @@ namespace
 // exists there a connection to a OQueryTableWindow that holds 
a connection that has been already visited
 JoinCycle(_xConnection,pNext,pEntryTab,aJoin);
 if(!pNext-IsVisited())
-GetNextJoin(_xConnection,pNext,pEntryTab,aJoin);
+GetNextJoin(_xConnection, pNext, pEntryTab, aJoin, 
_rTableNames);
 }
 }
 
@@ -532,7 +554,7 @@ namespace
 // exists there a connection to a OQueryTableWindow that 
holds a connection that has been already visited
 JoinCycle(_xConnection,pNext,pEntryTab,aJoin);
 if(!pNext-IsVisited())
-GetNextJoin(_xConnection,pNext,pEntryTab,aJoin);
+GetNextJoin(_xConnection, pNext, pEntryTab, aJoin, 
_rTableNames);
 }
 }
 }
@@ -1014,7 +1036,7 @@ namespace
 
//--
 void searchAndAppendName(const Reference XConnection _xConnection,
  const OQueryTableWindow* _pTableWindow,
- ::std::map 
::rtl::OUString,sal_Bool,::comphelper::UStringMixLess _rTableNames,
+ tableNames_t _rTableNames,
  ::rtl::OUString 

[Libreoffice-commits] .: dbaccess/source

[Libreoffice Gerrit user]

 dbaccess/source/core/api/CacheSet.cxx   |   23 +---
 dbaccess/source/core/api/OptimisticSet.cxx  |   84 +---
 dbaccess/source/core/api/View.cxx   |2 
 dbaccess/source/core/api/query.cxx  |4 
 dbaccess/source/core/api/querycomposer.cxx  |4 
 dbaccess/source/core/api/querycontainer.cxx |2 
 dbaccess/source/core/dataaccess/ComponentDefinition.cxx |   10 -
 dbaccess/source/filter/xml/xmlDataSourceSetting.cxx |7 -
 dbaccess/source/filter/xml/xmlServerDatabase.cxx|   37 ++-
 dbaccess/source/ui/uno/composerdialogs.cxx  |   10 -
 dbaccess/source/ui/uno/textconnectionsettings_uno.cxx   |   12 +-
 11 files changed, 72 insertions(+), 123 deletions(-)

New commits:
commit 1cf1f9338cc37895e2a68b411ffdc44d66357822
Author: Marcos Paulo de Souza marcos.souza@gmail.com
Date:   Tue Jan 15 22:40:04 2013 -0200

fdo#57950: dbaccess: STRINGPARAM and more chained appends

Change-Id: Iab1ba5eb6702d386e2775d7426c3398b606d2d97
Reviewed-on: https://gerrit.libreoffice.org/1706
Reviewed-by: Luboš Luňák l.lu...@suse.cz
Tested-by: Luboš Luňák l.lu...@suse.cz

diff --git a/dbaccess/source/core/api/CacheSet.cxx 
b/dbaccess/source/core/api/CacheSet.cxx
index 8b8e924..5974d4a 100644
--- a/dbaccess/source/core/api/CacheSet.cxx
+++ b/dbaccess/source/core/api/CacheSet.cxx
@@ -156,14 +156,12 @@ void OCacheSet::fillTableName(const 
ReferenceXPropertySet _xTable)  throw(SQL
 void SAL_CALL OCacheSet::insertRow( const ORowSetRow _rInsertRow,const 
connectivity::OSQLTable _xTable ) throw(SQLException, RuntimeException)
 {
 RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, dbaccess, ocke.jans...@sun.com, 
OCacheSet::insertRow );
-::rtl::OUStringBuffer aSql(::rtl::OUString(INSERT INTO ));
+OUStringBuffer aSql(INSERT INTO  + m_aComposedTableName +  ( );
 ReferenceXPropertySet xSet(_xTable,UNO_QUERY);
 fillTableName(xSet);
 
-aSql.append(m_aComposedTableName);
-aSql.append(::rtl::OUString( ( ));
 // set values and column names
-::rtl::OUStringBuffer aValues = ::rtl::OUString( VALUES ( );
+::rtl::OUStringBuffer aValues( VALUES ( );
 static ::rtl::OUString aPara(?,);
 ::rtl::OUString aQuote = getIdentifierQuoteString();
 static ::rtl::OUString aComma(,);
@@ -172,8 +170,7 @@ void SAL_CALL OCacheSet::insertRow( const ORowSetRow 
_rInsertRow,const connecti
 connectivity::ORowVector ORowSetValue  ::Vector::iterator aEnd = 
_rInsertRow-get().end();
 for(; aIter != aEnd;++aIter)
 {
-aSql.append(::dbtools::quoteName( 
aQuote,m_xSetMetaData-getColumnName(i++)));
-aSql.append(aComma);
+aSql.append(::dbtools::quoteName( 
aQuote,m_xSetMetaData-getColumnName(i++)) + aComma);
 aValues.append(aPara);
 }
 
@@ -280,8 +277,7 @@ void OCacheSet::fillParameters( const ORowSetRow _rRow
 }
 if(aIter-isModified())
 {
-_sParameter.append(::dbtools::quoteName( aQuote,aColumnName));
-_sParameter.append(aPara);
+_sParameter.append(::dbtools::quoteName( aQuote,aColumnName) + 
aPara);
 }
 }
 }
@@ -292,9 +288,7 @@ void SAL_CALL OCacheSet::updateRow(const ORowSetRow 
_rInsertRow ,const ORowSetR
 ReferenceXPropertySet xSet(_xTable,UNO_QUERY);
 fillTableName(xSet);
 
-::rtl::OUStringBuffer aSql = ::rtl::OUString(UPDATE );
-aSql.append(m_aComposedTableName);
-aSql.append(::rtl::OUString( SET ));
+OUStringBuffer aSql(UPDATE  + m_aComposedTableName +  SET );
 // list all cloumns that should be set
 
 ::rtl::OUStringBuffer aCondition;
@@ -305,8 +299,7 @@ void SAL_CALL OCacheSet::updateRow(const ORowSetRow 
_rInsertRow ,const ORowSetR
 {
 aCondition.setLength(aCondition.getLength()-5);
 
-aSql.append(::rtl::OUString( WHERE ));
-aSql.append(aCondition.makeStringAndClear());
+aSql.append( WHERE  + aCondition.makeStringAndClear());
 }
 else
 ::dbtools::throwSQLException(
@@ -340,9 +333,7 @@ void SAL_CALL OCacheSet::deleteRow(const ORowSetRow 
_rDeleteRow ,const connecti
 ReferenceXPropertySet xSet(_xTable,UNO_QUERY);
 fillTableName(xSet);
 
-::rtl::OUStringBuffer aSql = ::rtl::OUString(DELETE FROM );
-aSql.append(m_aComposedTableName);
-aSql.append(::rtl::OUString( WHERE ));
+OUStringBuffer aSql(DELETE FROM  + m_aComposedTableName +  WHERE );
 
 // list all cloumns that should be set
 ::rtl::OUString aQuote  = getIdentifierQuoteString();
diff --git a/dbaccess/source/core/api/OptimisticSet.cxx 
b/dbaccess/source/core/api/OptimisticSet.cxx
index ca6f1b5..e68cc7e 100644
--- a/dbaccess/source/core/api/OptimisticSet.cxx
+++ b/dbaccess/source/core/api/OptimisticSet.cxx
@@ -74,12 +74,12 @@ namespace
 {
 ::rtl::OUStringBuffer rKeyCondition = io_aKeyConditions[i_sTableName];
 if ( rKeyCondition.getLength() )
-

[Libreoffice-commits] .: dbaccess/source

[Libreoffice Gerrit user]

 dbaccess/source/core/dataaccess/documentdefinition.cxx |   52 -
 1 file changed, 25 insertions(+), 27 deletions(-)

New commits:
commit 8fcd3360f195736d636eb1f1ba58d51cf053beae
Author: Marcos Paulo de Souza marcos.souza@gmail.com
Date:   Tue Jan 15 23:11:30 2013 -0200

Sanitize/simplify some parameters of functions in dbaccess

Some functions have parameters of OUString, so, we don't need this type of 
junk:
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( LayoutManager )

and we can use directly:
LayoutManager

I believe this brings some simplification to the code, at first glance!

Also in this patch, changed some equalsAsciiL to ==, this simplifies more 
code yet.

Change-Id: I38b8076afb84d77ed51c7be407c7f899d80829ff
Reviewed-on: https://gerrit.libreoffice.org/1707
Reviewed-by: Luboš Luňák l.lu...@suse.cz
Tested-by: Luboš Luňák l.lu...@suse.cz

diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx 
b/dbaccess/source/core/dataaccess/documentdefinition.cxx
index 120ffdb..e6cff05 100644
--- a/dbaccess/source/core/dataaccess/documentdefinition.cxx
+++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx
@@ -401,8 +401,7 @@ namespace dbaccess
 ::rtl::OUString aEntryDocName;
 
 if (( xObjConfig-getByName( aClassIDs[nInd] ) = 
xObjectProps )  xObjectProps.is()
-  ( 
xObjectProps-getByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ObjectDocumentServiceName))
-  ) = aEntryDocName )
+  ( 
xObjectProps-getByName(ObjectDocumentServiceName) = aEntryDocName )
   aEntryDocName.equals( sResult ) )
 {
 _rClassId = 
aConfigHelper.GetSequenceClassIDRepresentation(aClassIDs[nInd]);
@@ -713,7 +712,7 @@ namespace
 {
 Reference XPropertySet  xPropSet( xFrame, UNO_QUERY_THROW );
 m_xLayoutManager.set(
-xPropSet-getPropertyValue( ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM( LayoutManager ) ) ),
+xPropSet-getPropertyValue( LayoutManager ),
 UNO_QUERY_THROW );
 m_xLayoutManager-lock();
 
@@ -759,14 +758,14 @@ void ODocumentDefinition::impl_initFormEditView( const 
Reference XController 
 LayoutManagerLock aLockLayout( _rxController );
 
 // setting of the visual properties
-
xViewSettings-setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ShowRulers)),makeAny(sal_True));
-
xViewSettings-setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ShowVertRuler)),makeAny(sal_True));
-
xViewSettings-setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ShowHoriRuler)),makeAny(sal_True));
-
xViewSettings-setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(IsRasterVisible)),makeAny(sal_True));
-
xViewSettings-setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(IsSnapToRaster)),makeAny(sal_True));
-
xViewSettings-setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ShowOnlineLayout)),makeAny(sal_True));
-
xViewSettings-setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(RasterSubdivisionX)),makeAny(sal_Int32(5)));
-
xViewSettings-setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(RasterSubdivisionY)),makeAny(sal_Int32(5)));
+xViewSettings-setPropertyValue(ShowRulers,makeAny(sal_True));
+xViewSettings-setPropertyValue(ShowVertRuler,makeAny(sal_True));
+xViewSettings-setPropertyValue(ShowHoriRuler,makeAny(sal_True));
+xViewSettings-setPropertyValue(IsRasterVisible,makeAny(sal_True));
+xViewSettings-setPropertyValue(IsSnapToRaster,makeAny(sal_True));
+xViewSettings-setPropertyValue(ShowOnlineLayout,makeAny(sal_True));
+
xViewSettings-setPropertyValue(RasterSubdivisionX,makeAny(sal_Int32(5)));
+
xViewSettings-setPropertyValue(RasterSubdivisionY,makeAny(sal_Int32(5)));
 }
 catch( const Exception )
 {
@@ -950,9 +949,9 @@ Any ODocumentDefinition::onCommandOpenSomething( const Any 
_rOpenArgument, cons
 if ( xModule.is() )
 {
 if ( m_bForm )
-xModule-setIdentifier( ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM( com.sun.star.sdb.FormDesign ) ) );
+xModule-setIdentifier( com.sun.star.sdb.FormDesign );
 else if ( !xReportDefinition.is() )
-xModule-setIdentifier( ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM( com.sun.star.sdb.TextReportDesign ) ) );
+xModule-setIdentifier( com.sun.star.sdb.TextReportDesign );
 
 updateDocumentTitle();
 }
@@ -993,9 +992,9 @@ Any SAL_CALL ODocumentDefinition::execute( const Command 
aCommand, sal_Int32 Co
 {
 Any aRet;
 
-sal_Bool bOpen = aCommand.Name.equalsAsciiL( 

[Libreoffice-commits] .: dbaccess/source

[Libreoffice Gerrit user]

 dbaccess/source/filter/xml/xmlDataSourceSetting.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 92376b09e9c55b140dcd3241c9c881b8f1302527
Author: Luboš Luňák l.lu...@suse.cz
Date:   Wed Jan 16 21:13:13 2013 +0100

fix build

Change-Id: I1697e761061c21826f57d4b2f4694ee03cdfb05d

diff --git a/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx 
b/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
index 02ea80b..8838104 100644
--- a/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
+++ b/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
@@ -182,9 +182,9 @@ Any OXMLDataSourceSetting::convertString(const 
::com::sun::star::uno::Type _rEx
 sal_Bool bSuccess =
 #endif
 ::sax::Converter::convertBool(bValue, _rReadCharacters);
-OSL_ENSURE(bSuccess, 
OString(OXMLDataSourceSetting::convertString: could not convert \) +
+OSL_ENSURE(bSuccess, 
OString(OString(OXMLDataSourceSetting::convertString: could not convert \) +
  OUStringToOString(_rReadCharacters, 
RTL_TEXTENCODING_ASCII_US) +
- OString(\ into a boolean!));
+ OString(\ into a boolean!)).getStr());
 aReturn = bValue;
 }
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: dbaccess/source

[Libreoffice Gerrit user]

 dbaccess/source/filter/xml/xmlDataSourceSetting.cxx |   35 
 1 file changed, 14 insertions(+), 21 deletions(-)

New commits:
commit 47d95d7591ec6218ad3c3ce75b232ee15d00c174
Author: Michael Stahl mst...@redhat.com
Date:   Wed Jan 16 21:11:31 2013 +0100

OXMLDataSourceSetting::convertString: try to make Clang tb happy

Change-Id: I8b2509f28206fd5b6c20c88d9186a9a18f76f7a5

diff --git a/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx 
b/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
index 8838104..1246adb 100644
--- a/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
+++ b/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
@@ -178,13 +178,11 @@ Any OXMLDataSourceSetting::convertString(const 
::com::sun::star::uno::Type _rEx
 case TypeClass_BOOLEAN: // sal_Bool
 {
 bool bValue(false);
-#if OSL_DEBUG_LEVEL  0
-sal_Bool bSuccess =
-#endif
+bool const bSuccess =
 ::sax::Converter::convertBool(bValue, _rReadCharacters);
-OSL_ENSURE(bSuccess, 
OString(OString(OXMLDataSourceSetting::convertString: could not convert \) +
- OUStringToOString(_rReadCharacters, 
RTL_TEXTENCODING_ASCII_US) +
- OString(\ into a boolean!)).getStr());
+SAL_WARN_IF(!bSuccess, dbaccess,
+OXMLDataSourceSetting::convertString: could not convert \
+ _rReadCharacters  \ into a boolean!);
 aReturn = bValue;
 }
 break;
@@ -192,14 +190,11 @@ Any OXMLDataSourceSetting::convertString(const 
::com::sun::star::uno::Type _rEx
 case TypeClass_LONG:// sal_Int32
 {   // it's a real int32/16 property
 sal_Int32 nValue(0);
-#if OSL_DEBUG_LEVEL  0
-sal_Bool bSuccess =
-#endif
+bool const bSuccess =
 ::sax::Converter::convertNumber(nValue, _rReadCharacters);
-OSL_ENSURE(bSuccess,
-
::rtl::OStringBuffer(OXMLDataSourceSetting::convertString: could not convert 
\)
-.append(::rtl::OUStringToOString(_rReadCharacters, 
RTL_TEXTENCODING_ASCII_US))
-.append(\ into an integer!).getStr());
+SAL_WARN_IF(!bSuccess, dbaccess,
+OXMLDataSourceSetting::convertString: could not convert 
\
+ _rReadCharacters  \ into an integer!);
 if (TypeClass_SHORT == _rExpectedType.getTypeClass())
 aReturn = (sal_Int16)nValue;
 else
@@ -214,14 +209,11 @@ Any OXMLDataSourceSetting::convertString(const 
::com::sun::star::uno::Type _rEx
 case TypeClass_DOUBLE:
 {
 double nValue = 0.0;
-#if OSL_DEBUG_LEVEL  0
-sal_Bool bSuccess =
-#endif
+bool const bSuccess =
 ::sax::Converter::convertDouble(nValue, _rReadCharacters);
-OSL_ENSURE(bSuccess,
-
::rtl::OStringBuffer(OXMLDataSourceSetting::convertString: could not convert 
\)
-.append(rtl::OUStringToOString(_rReadCharacters, 
RTL_TEXTENCODING_ASCII_US))
-.append(\ into a double!).getStr());
+SAL_WARN_IF(!bSuccess, dbaccess,
+OXMLDataSourceSetting::convertString: could not convert \
+ _rReadCharacters  \ into a double!);
 aReturn = (double)nValue;
 }
 break;
@@ -229,7 +221,8 @@ Any OXMLDataSourceSetting::convertString(const 
::com::sun::star::uno::Type _rEx
 aReturn = _rReadCharacters;
 break;
 default:
-OSL_FAIL(OXMLDataSourceSetting::convertString: invalid type 
class!);
+SAL_WARN(dbaccess,
+OXMLDataSourceSetting::convertString: invalid type class!);
 }
 
 return aReturn;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: dbaccess/source

[Libreoffice Gerrit user]

 dbaccess/source/ui/querydesign/querycontroller.cxx |  170 +
 dbaccess/source/ui/uno/copytablewizard.cxx |  139 +++--
 dbaccess/source/ui/uno/unosqlmessage.cxx   |8 
 3 files changed, 143 insertions(+), 174 deletions(-)

New commits:
commit b7d0dd5252bdec31fcc925037aa7916b9fffeca7
Author: Marcos Paulo de Souza marcos.souza@gmail.com
Date:   Tue Jan 8 00:30:44 2013 -0200

Remove some RTL_* macros, rtl:: prefixes and simplification in dbaccess

Change-Id: I2a4381cbe1e716cd2de1fb596053646d1a74d4b0
Signed-off-by: Marcos Paulo de Souza marcos.souza@gmai.com
Reviewed-on: https://gerrit.libreoffice.org/1572
Reviewed-by: Luboš Luňák l.lu...@suse.cz
Tested-by: Luboš Luňák l.lu...@suse.cz

diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx 
b/dbaccess/source/ui/querydesign/querycontroller.cxx
index 22109df..d56b51b 100644
--- a/dbaccess/source/ui/querydesign/querycontroller.cxx
+++ b/dbaccess/source/ui/querydesign/querycontroller.cxx
@@ -100,12 +100,12 @@ namespace dbaui
 class OViewController : public OQueryController
 {
 
//--
-virtual ::rtl::OUString SAL_CALL getImplementationName() throw( 
RuntimeException )
+virtual OUString SAL_CALL getImplementationName() throw( 
RuntimeException )
 {
 return getImplementationName_Static();
 }
 
//-
-virtual Sequence ::rtl::OUString SAL_CALL getSupportedServiceNames() 
throw(RuntimeException)
+virtual Sequence OUString SAL_CALL getSupportedServiceNames() 
throw(RuntimeException)
 {
 return getSupportedServiceNames_Static();
 }
@@ -113,14 +113,14 @@ namespace dbaui
 OViewController(const Reference XMultiServiceFactory  _rM) : 
OQueryController(_rM){}
 
 // need by registration
-static ::rtl::OUString getImplementationName_Static() throw( 
RuntimeException )
+static OUString getImplementationName_Static() throw( RuntimeException 
)
 {
-return 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(org.openoffice.comp.dbu.OViewDesign));
+return OUString(org.openoffice.comp.dbu.OViewDesign);
 }
-static Sequence ::rtl::OUString  
getSupportedServiceNames_Static(void) throw( RuntimeException )
+static Sequence OUString  getSupportedServiceNames_Static(void) 
throw( RuntimeException )
 {
-Sequence ::rtl::OUString aSupported(1);
-aSupported.getArray()[0] = 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.sdb.ViewDesign));
+Sequence OUString aSupported(1);
+aSupported.getArray()[0] = com.sun.star.sdb.ViewDesign;
 return aSupported;
 }
 static Reference XInterface  SAL_CALL Create(const Reference 
XMultiServiceFactory  _rM)
@@ -143,15 +143,12 @@ namespace dbaui
 // 
-
 void insertParseTree(SvTreeListBox* 
_pBox,::connectivity::OSQLParseNode* _pNode,SvTreeListEntry* _pParent = NULL)
 {
-::rtl::OUString rString;
+OUString rString;
 if (!_pNode-isToken())
 {
 // Regelnamen als rule: ...
-rString = 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(RULE_ID: ));
-rString += ::rtl::OUString::valueOf( 
(sal_Int32)_pNode-getRuleID());
-rString+= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(());
-rString += OSQLParser::RuleIDToStr(_pNode-getRuleID());
-rString+= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM()));
+rString = RULE_ID:  + OUString::valueOf( 
(sal_Int32)_pNode-getRuleID() ) +
+  ( + OSQLParser::RuleIDToStr(_pNode-getRuleID()) + 
);
 
 
 _pParent = _pBox-InsertEntry(rString,_pParent);
@@ -172,54 +169,45 @@ namespace dbaui
 
 case SQL_NODE_KEYWORD:
 {
-rString += 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SQL_KEYWORD:));
-::rtl::OString sT = 
OSQLParser::TokenIDToStr(_pNode-getTokenID());
-rString += ::rtl::OStringToOUString(sT, 
RTL_TEXTENCODING_UTF8);
+rString += SQL_KEYWORD:;
+OString sT = 
OSQLParser::TokenIDToStr(_pNode-getTokenID());
+rString += OStringToOUString(sT, 
RTL_TEXTENCODING_UTF8);
  break;}
 
 case SQL_NODE_COMPARISON:
 {
-rString+= 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SQL_COMPARISON:));
-rString += _pNode-getTokenValue(); // haenge 
Nodevalue an
+

[Libreoffice-commits] .: dbaccess/source

[Libreoffice Gerrit user]

 dbaccess/source/core/api/KeySet.cxx |  211 +++-
 1 file changed, 93 insertions(+), 118 deletions(-)

New commits:
commit 2e22005234867e5e3036841a9c6c87c557011386
Author: Marcos Paulo de Souza marcos.souza@gmail.com
Date:   Sat Jan 5 19:12:07 2013 -0200

fdo#57950: Remove some chained appends and more in dbaccess

 - Sanitized some OUStringBuilder, avoiding creating a new one and after
make some appends
 - Removed some ::rtl prefixes
 - Remove RTL_* macro

Change-Id: Ide3d78f20c68774cd4864b82cb8d29784228d1cd
Signed-off-by: Marcos Paulo de Souza marcos.souza@gmail.com
Reviewed-on: https://gerrit.libreoffice.org/1552
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz

diff --git a/dbaccess/source/core/api/KeySet.cxx 
b/dbaccess/source/core/api/KeySet.cxx
index 21b897b..3b7ca89 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -105,7 +105,7 @@ DBG_NAME(OKeySet)
 
 OKeySet::OKeySet(const connectivity::OSQLTable _xTable,
  const Reference XIndexAccess _xTableKeys,
- const ::rtl::OUString _rUpdateTableName,// this can be 
the alias or the full qualified name
+ const OUString _rUpdateTableName,// this can be the 
alias or the full qualified name
  const Reference XSingleSelectQueryAnalyzer  _xComposer,
  const ORowSetValueVector _aParameterValueForCache,
  sal_Int32 i_nMaxRows,
@@ -149,13 +149,13 @@ void OKeySet::initColumns()
 
 SAL_WNODEPRECATED_DECLARATIONS_PUSH
 void OKeySet::findTableColumnsMatching_throw(   const Any i_aTable,
-const ::rtl::OUString 
i_rUpdateTableName,
+const OUString 
i_rUpdateTableName,
 const 
ReferenceXDatabaseMetaData i_xMeta,
 const ReferenceXNameAccess 
i_xQueryColumns,
 
::std::auto_ptrSelectColumnsMetaData o_pKeyColumnNames)
 {
 // first ask the database itself for the best columns which can be used
-Sequence ::rtl::OUString aBestColumnNames;
+Sequence OUString aBestColumnNames;
 ReferenceXNameAccess xKeyColumns  = getPrimaryKeyColumns_throw(i_aTable);
 if ( xKeyColumns.is() )
 aBestColumnNames = xKeyColumns-getElementNames();
@@ -166,14 +166,14 @@ void OKeySet::findTableColumnsMatching_throw(   const 
Any i_aTable,
 ReferenceXParametersSupplier xParaSup(m_xComposer,UNO_QUERY);
 ReferenceXIndexAccess xQueryParameters = xParaSup-getParameters();
 const sal_Int32 nParaCount = xQueryParameters-getCount();
-Sequence ::rtl::OUString aParameterColumns(nParaCount);
+Sequence OUString aParameterColumns(nParaCount);
 for(sal_Int32 i = 0; i nParaCount;++i)
 {
 ReferenceXPropertySet 
xPara(xQueryParameters-getByIndex(i),UNO_QUERY_THROW);
 xPara-getPropertyValue(PROPERTY_REALNAME) = aParameterColumns[i];
 }
 
-::rtl::OUString sUpdateTableName( i_rUpdateTableName );
+OUString sUpdateTableName( i_rUpdateTableName );
 if ( sUpdateTableName.isEmpty() )
 {
 OSL_FAIL( OKeySet::findTableColumnsMatching_throw: This is a fallback 
only - it won't work when the table has an alias name. );
@@ -186,7 +186,7 @@ void OKeySet::findTableColumnsMatching_throw(   const Any 
i_aTable,
 // by sUpdateTableName. Since the latter is table, but the columns 
only know that they belong to a table
 // named alias, there will be no matching - so getColumnPositions 
wouldn't find anything.
 
-::rtl::OUString sCatalog, sSchema, sTable;
+OUString sCatalog, sSchema, sTable;
 ReferenceXPropertySet xTableProp( i_aTable, UNO_QUERY_THROW );
 xTableProp-getPropertyValue( PROPERTY_CATALOGNAME )= sCatalog;
 xTableProp-getPropertyValue( PROPERTY_SCHEMANAME ) = sSchema;
@@ -200,7 +200,7 @@ void OKeySet::findTableColumnsMatching_throw(   const Any 
i_aTable,
 
 if ( o_pKeyColumnNames-empty() )
 {
-::dbtools::throwGenericSQLException( ::rtl::OUString( Could not find 
any key column.  ), *this );
+::dbtools::throwGenericSQLException( OUString( Could not find any key 
column.  ), *this );
 }
 
 for (   SelectColumnsMetaData::const_iterator keyColumn = 
o_pKeyColumnNames-begin();
@@ -221,21 +221,13 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
 
 namespace
 {
-void appendOneKeyColumnClause( const ::rtl::OUString tblName, const 
::rtl::OUString colName, ::rtl::OUStringBuffer o_buf )
+void appendOneKeyColumnClause( const OUString tblName, const OUString 
colName, OUStringBuffer o_buf )
 {
-static ::rtl::OUString s_sDot(.);
-static ::rtl::OUString s_sParam0( ( 1 = ? AND );
-static ::rtl::OUString s_sParam1( = ? OR 1 = ? AND );

[Libreoffice-commits] .: dbaccess/source

[Libreoffice Gerrit user]

 dbaccess/source/core/api/SingleSelectQueryComposer.cxx |  309 +++--
 1 file changed, 144 insertions(+), 165 deletions(-)

New commits:
commit 2b0b5f7df0e3c7deab2fdccec49b6bbb4186f58a
Author: Marcos Paulo de Souza marcos.souza@gmail.com
Date:   Mon Jan 7 08:44:24 2013 -0200

fdo#57950: More fixes for chained appends in dbaccess

And also:
Remove some RTL_* macros
Remove ::rtl prefix

Change-Id: I9c3902672518559e8a139c37bc1933843bebfe5d
Signed-off-by: Marcos Paulo de Souza marcos.souza@gmail.com
Reviewed-on: https://gerrit.libreoffice.org/1561
Reviewed-by: Luboš Luňák l.lu...@suse.cz
Tested-by: Luboš Luňák l.lu...@suse.cz

diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx 
b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index 6f1c57f..aff9dde 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -80,18 +80,18 @@ namespace dbaccess {
 namespace BooleanComparisonMode = ::com::sun::star::sdb::BooleanComparisonMode;
 }
 
-#define STR_SELECT  ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SELECT ))
-#define STR_FROM::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( FROM ))
-#define STR_WHERE   ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( WHERE ))
-#define STR_GROUP_BY::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( GROUP BY 
))
-#define STR_HAVING  ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( HAVING 
))
-#define STR_ORDER_BY::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ORDER BY 
))
-#define STR_AND ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( AND ))
-#define STR_OR  ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( OR ))
-#define STR_LIKE::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( LIKE ))
-#define L_BRACKET   ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(())
-#define R_BRACKET   ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM()))
-#define COMMA   ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(,))
+#define STR_SELECT  SELECT 
+#define STR_FROM FROM 
+#define STR_WHEREWHERE 
+#define STR_GROUP_BY GROUP BY 
+#define STR_HAVING   HAVING 
+#define STR_ORDER_BY ORDER BY 
+#define STR_AND  AND 
+#define STR_OR   OR 
+#define STR_LIKEOUString( LIKE )
+#define L_BRACKET   (
+#define R_BRACKET   )
+#define COMMA   ,
 
 namespace
 {
@@ -100,14 +100,14 @@ namespace
 
 If the statement cannot be parsed, an error is thrown.
 */
-const OSQLParseNode* parseStatement_throwError( OSQLParser _rParser, 
const ::rtl::OUString _rStatement, const Reference XInterface  _rxContext )
+const OSQLParseNode* parseStatement_throwError( OSQLParser _rParser, 
const OUString _rStatement, const Reference XInterface  _rxContext )
 {
 RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, dbaccess, 
frank.schoenh...@sun.com, 
SingleSelectQueryComposer.cxx::parseStatement_throwError );
-::rtl::OUString aErrorMsg;
+OUString aErrorMsg;
 const OSQLParseNode* pNewSqlParseNode = _rParser.parseTree( aErrorMsg, 
_rStatement );
 if ( !pNewSqlParseNode )
 {
-::rtl::OUString sSQLStateGeneralError( getStandardSQLState( 
SQL_GENERAL_ERROR ) );
+OUString sSQLStateGeneralError( getStandardSQLState( 
SQL_GENERAL_ERROR ) );
 SQLException aError2( aErrorMsg, _rxContext, 
sSQLStateGeneralError, 1000, Any() );
 SQLException aError1( _rStatement, _rxContext, 
sSQLStateGeneralError, 1000, makeAny( aError2 ) );
 throw 
SQLException(_rParser.getContext().getErrorMessage(OParseContext::ERROR_GENERAL),_rxContext,sSQLStateGeneralError,1000,makeAny(aError1));
@@ -120,7 +120,7 @@ namespace
 an error if not
 */
 void checkForSingleSelect_throwError( const OSQLParseNode* pStatementNode, 
OSQLParseTreeIterator _rIterator,
-const Reference XInterface  _rxContext, const ::rtl::OUString 
_rOriginatingCommand )
+const Reference XInterface  _rxContext, const OUString 
_rOriginatingCommand )
 {
 const OSQLParseNode* pOldNode = _rIterator.getParseTree();
 
@@ -146,7 +146,7 @@ namespace
 // .
 /** combines parseStatement_throwError and checkForSingleSelect_throwError
 */
-void parseAndCheck_throwError( OSQLParser _rParser, const 
::rtl::OUString _rStatement,
+void parseAndCheck_throwError( OSQLParser _rParser, const OUString 
_rStatement,
 OSQLParseTreeIterator _rIterator, const Reference XInterface  
_rxContext )
 {
 RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, dbaccess, 
frank.schoenh...@sun.com, 
SingleSelectQueryComposer.cxx::parseAndCheck_throwError );
@@ -158,9 +158,9 @@ namespace
 /** transforms a parse node describing a complete statement into a pure 
select
 statement, without any filter/order/groupby/having clauses
 

[Libreoffice-commits] .: dbaccess/source

[Libreoffice Gerrit user]

 dbaccess/source/core/api/SingleSelectQueryComposer.cxx |   16 
 1 file changed, 4 insertions(+), 12 deletions(-)

New commits:
commit 36e1e0ce128a25ce63743bed18a599a6915f3ec3
Author: Marcos Paulo de Souza marcos.souza@gmail.com
Date:   Mon Jan 7 07:45:44 2013 -0200

fdo#57950: Remove some chained appends in dbaccess

Also simplify logic a little bit.

Change-Id: I342f8d1d22e70023d23c6c8ca3976d501e18fb90
Signed-off-by: Marcos Paulo de Souza marcos.souza@gmail.com
Reviewed-on: https://gerrit.libreoffice.org/1559
Reviewed-by: Luboš Luňák l.lu...@suse.cz
Tested-by: Luboš Luňák l.lu...@suse.cz

diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx 
b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index aff9dde..f398a46 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -765,25 +765,17 @@ Reference XNameAccess  SAL_CALL 
OSingleSelectQueryComposer::getColumns(  ) thr
 bCase = m_xMetaData-supportsMixedCaseQuotedIdentifiers();
 aSelectColumns = m_aSqlIterator.getSelectColumns();
 
-::rtl::OUStringBuffer aSQL;
-aSQL.append( m_aPureSelectSQL );
-aSQL.append( STR_WHERE );
+OUStringBuffer aSQL( m_aPureSelectSQL + STR_WHERE +  ( 0 = 1 ));
 
 // preserve the original WHERE clause
 // #i102234#
-::rtl::OUString sOriginalWhereClause = getSQLPart( Where, 
m_aSqlIterator, sal_False );
+OUString sOriginalWhereClause = getSQLPart( Where, m_aSqlIterator, 
sal_False );
 if ( !sOriginalWhereClause.isEmpty() )
 {
-aSQL.appendAscii(  ( 0 = 1 ) AND (  );
-aSQL.append( sOriginalWhereClause );
-aSQL.appendAscii(  )  );
-}
-else
-{
-aSQL.appendAscii(  ( 0 = 1 )  );
+aSQL.append(  AND (  + sOriginalWhereClause +  )  );
 }
 
-::rtl::OUString sGroupBy = getSQLPart( Group, m_aSqlIterator, sal_True 
);
+OUString sGroupBy = getSQLPart( Group, m_aSqlIterator, sal_True );
 if ( !sGroupBy.isEmpty() )
 aSQL.append( sGroupBy );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: dbaccess/source

[Libreoffice Gerrit user]

 dbaccess/source/ui/browser/genericcontroller.cxx |1 -
 dbaccess/source/ui/uno/unosqlmessage.cxx |4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 63894cb4fed44aed01092cdee1fe30463eb5223e
Author: Noel Grandin n...@peralex.com
Date:   Mon Dec 31 11:49:50 2012 +0200

fix fdo#58451

I introduced this bug during my shiny UNO conversions.
We pass around SQLException as an Any in the IDL, so we need to treat
it like that it the service code.

Change-Id: Ib55b1e156c93fb1488b21ab4d1423b25cb13a5cf

diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx 
b/dbaccess/source/ui/browser/genericcontroller.cxx
index 3260f2f..69cd586 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -889,7 +889,6 @@ void OGenericUnoController::disposing()
 
 m_xMasterDispatcher = NULL;
 m_xSlaveDispatcher = NULL;
-m_xServiceFactory = NULL;
 m_xTitleHelper.clear();
 m_xUrlTransformer.clear();
 m_aInitParameters.clear();
diff --git a/dbaccess/source/ui/uno/unosqlmessage.cxx 
b/dbaccess/source/ui/uno/unosqlmessage.cxx
index 6e52da9..6a56624 100644
--- a/dbaccess/source/ui/uno/unosqlmessage.cxx
+++ b/dbaccess/source/ui/uno/unosqlmessage.cxx
@@ -100,13 +100,13 @@ void OSQLMessageDialog::initialize(SequenceAny const  
args) throw (com::sun::
 {
   OUString title;
   Reference com::sun::star::awt::XWindow  parentWindow;
-  Reference com::sun::star::sdbc::SQLException  sqlException;
+  com::sun::star::uno::Any sqlException;
 
   if ((args.getLength() == 3)  (args[0] = title)  (args[1] = 
parentWindow)  (args[2] = sqlException)) {
 SequenceAny s(3);
 s[0] = PropertyValue( Title, -1, makeAny(title), 
PropertyState_DIRECT_VALUE);
 s[1] = PropertyValue( ParentWindow, -1, makeAny(parentWindow), 
PropertyState_DIRECT_VALUE);
-s[2] = PropertyValue( SQLException, -1, makeAny(sqlException), 
PropertyState_DIRECT_VALUE);
+s[2] = PropertyValue( SQLException, -1, sqlException, 
PropertyState_DIRECT_VALUE);
 OGenericUnoDialog::initialize(s);
   } else {
 OGenericUnoDialog::initialize(args);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: dbaccess/source

[Libreoffice Gerrit user]

 dbaccess/source/ui/querydesign/QueryDesignView.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 9f82a20777b6d16b2ea541619c3ad270e08e258c
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date:   Fri Dec 28 23:38:57 2012 +0100

fdo#58842 Handle case of non-distinct statment

Change-Id: I1797dd4e0bc6a2e4ec475c860e6b903085d2aae1

diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx 
b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 20a6ebd..9ef92b9 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -2083,6 +2083,10 @@ namespace
 rController.setDistinct(sal_True);
 
rController.InvalidateFeature(SID_QUERY_DISTINCT_VALUES);
 }
+else
+{
+rController.setDistinct(sal_False);
+}
 if ( (eErrorCode = InstallFields(_pView,pParseTree, 
pTableView-GetTabWinMap())) == eOk )
 {
 // GetSelectionCriteria must be called before 
GetHavingCriteria
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: dbaccess/source

[Libreoffice Gerrit user]

 dbaccess/source/ui/dlg/adodatalinks.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit a6077f6d7e79c4aeba59c749da21319fe0256d57
Author: Lubos Lunak l.lu...@suse.cz
Date:   Wed Dec 26 19:20:24 2012 +0100

fix windows PCH build

diff --git a/dbaccess/source/ui/dlg/adodatalinks.cxx 
b/dbaccess/source/ui/dlg/adodatalinks.cxx
index bbc2964..f56b2cd 100644
--- a/dbaccess/source/ui/dlg/adodatalinks.cxx
+++ b/dbaccess/source/ui/dlg/adodatalinks.cxx
@@ -24,6 +24,9 @@
 #pragma warning(push, 1)
 #pragma warning(disable: 4917)
 #endif
+// LO/windows.h conflict
+#undef WB_LEFT
+#undef WB_RIGHT
 #include msdasc.h// OLE DB Service Component header
 #if defined _MSC_VER
 #pragma warning(push, 1)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: dbaccess/source sw/source

[Libreoffice Gerrit user]

 dbaccess/source/ui/browser/brwctrlr.cxx |2 --
 dbaccess/source/ui/inc/brwctrlr.hxx |1 -
 sw/source/core/text/porexp.cxx  |2 +-
 sw/source/core/text/porexp.hxx  |1 -
 sw/source/core/text/porftn.hxx  |3 +--
 sw/source/core/text/txtftn.cxx  |7 +++
 6 files changed, 5 insertions(+), 11 deletions(-)

New commits:
commit 68aecf0dd81b6660e78e8dd758ec9431727f4f0b
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Sun Dec 23 15:15:36 2012 +0100

remove unused variables [-Werror,-Wunused-private-field]

Change-Id: I3cb08dd52c5a34be6585ac9fc0c4b6bb04b6ae8c

diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx 
b/dbaccess/source/ui/browser/brwctrlr.cxx
index 13b5960..f0bccc5 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -619,7 +619,6 @@ SbaXDataBrowserController::SbaXDataBrowserController(const 
Reference ::com::sun
 ,m_sStateUndoRecord(ModuleRes(RID_STR_UNDO_MODIFY_RECORD))
 ,m_sModuleIdentifier( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
com.sun.star.sdb.DataSourceBrowser ) ) )
 ,m_pFormControllerImpl(NULL)
-,m_nPendingLoadFinished(0)
 ,m_nFormActionNestingLevel(0)
 ,m_bLoadCanceled( sal_False )
 ,m_bCannotSelectUnfiltered( true )
@@ -1293,7 +1292,6 @@ void SbaXDataBrowserController::elementReplaced(const 
::com::sun::star::containe
 sal_Bool SbaXDataBrowserController::suspend(sal_Bool /*bSuspend*/) throw( 
RuntimeException )
 {
 RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, dbaui, ocke.jans...@sun.com, 
SbaXDataBrowserController::suspend );
-OSL_ENSURE(m_nPendingLoadFinished == 0, 
SbaXDataBrowserController::suspend : there shouldn't be a pending load !);
 
 m_aAsyncGetCellFocus.CancelCall();
 m_aAsyncDisplayError.CancelCall();
diff --git a/dbaccess/source/ui/inc/brwctrlr.hxx 
b/dbaccess/source/ui/inc/brwctrlr.hxx
index 27df5e6..4563d97 100644
--- a/dbaccess/source/ui/inc/brwctrlr.hxx
+++ b/dbaccess/source/ui/inc/brwctrlr.hxx
@@ -111,7 +111,6 @@ namespace dbaui
 // members for asynchronous load operations
 FormControllerImpl* m_pFormControllerImpl;  // implementing the 
XFormController
 
-sal_uLong   m_nPendingLoadFinished; // the 
event used to tell ourself that the load is finished
 sal_uInt16  m_nFormActionNestingLevel;  // see 
enter-/leaveFormAction
 
 sal_Boolm_bLoadCanceled : 1;// the load 
was canceled somehow
diff --git a/sw/source/core/text/porexp.cxx b/sw/source/core/text/porexp.cxx
index 0bb0f7d..b5aa30f 100644
--- a/sw/source/core/text/porexp.cxx
+++ b/sw/source/core/text/porexp.cxx
@@ -252,7 +252,7 @@ void SwBlankPortion::HandlePortion( SwPortionHandler rPH ) 
const
  */
 
 SwPostItsPortion::SwPostItsPortion( sal_Bool bScrpt )
-: nViewWidth(0), bScript( bScrpt )
+: bScript( bScrpt )
 {
 nLineLength = 1;
 SetWhichPor( POR_POSTITS );
diff --git a/sw/source/core/text/porexp.hxx b/sw/source/core/text/porexp.hxx
index 33506bf..cb7aa02 100644
--- a/sw/source/core/text/porexp.hxx
+++ b/sw/source/core/text/porexp.hxx
@@ -79,7 +79,6 @@ public:
 
 class SwPostItsPortion : public SwExpandPortion
 {
-KSHORT  nViewWidth;
 sal_BoolbScript;
 public:
 SwPostItsPortion( sal_Bool bScrpt );
diff --git a/sw/source/core/text/porftn.hxx b/sw/source/core/text/porftn.hxx
index 75b660f..d342eb3 100644
--- a/sw/source/core/text/porftn.hxx
+++ b/sw/source/core/text/porftn.hxx
@@ -30,14 +30,13 @@ class SwTxtFtn;
 
 class SwFtnPortion : public SwFldPortion
 {
-SwTxtFrm *pFrm; // To be able to call RemoveFtn in the dtor
 SwTxtFtn *pFtn;
 KSHORT nOrigHeight;
 // #i98418#
 bool mbPreferredScriptTypeSet;
 sal_uInt8 mnPreferredScriptType;
 public:
-SwFtnPortion( const XubString rExpand, SwTxtFrm *pFrm, SwTxtFtn *pFtn,
+SwFtnPortion( const XubString rExpand, SwTxtFtn *pFtn,
   KSHORT nOrig = KSHRT_MAX );
 inline KSHORT Orig() { return nOrigHeight; }
 
diff --git a/sw/source/core/text/txtftn.cxx b/sw/source/core/text/txtftn.cxx
index 0c3f056..b4aa5ef 100644
--- a/sw/source/core/text/txtftn.cxx
+++ b/sw/source/core/text/txtftn.cxx
@@ -850,7 +850,7 @@ SwFtnPortion *SwTxtFormatter::NewFtnPortion( 
SwTxtFormatInfo rInf,
 SwDoc *pDoc = pFrm-GetNode()-GetDoc();
 
 if( rInf.IsTest() )
-return new SwFtnPortion( rFtn.GetViewNumStr( *pDoc ), pFrm, pFtn );
+return new SwFtnPortion( rFtn.GetViewNumStr( *pDoc ), pFtn );
 
 SWAP_IF_SWAPPED( pFrm )
 
@@ -970,7 +970,7 @@ SwFtnPortion *SwTxtFormatter::NewFtnPortion( 
SwTxtFormatInfo rInf,
 }
 // Endlich: FtnPortion anlegen und raus hier...
 SwFtnPortion *pRet = new SwFtnPortion( rFtn.GetViewNumStr( *pDoc ),
-pFrm, pFtn, nReal );
+   

[Libreoffice-commits] .: dbaccess/source extensions/source

[Libreoffice Gerrit user]

 dbaccess/source/ui/uno/composerdialogs.cxx|3 +--
 dbaccess/source/ui/uno/composerdialogs.hxx|2 +-
 extensions/source/update/check/updatecheck.cxx|2 +-
 extensions/source/update/check/updatecheckjob.cxx |2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 40e526e497cb449441149062f9cec4e6f823732c
Author: Noel Grandin n...@peralex.com
Date:   Fri Dec 21 11:09:51 2012 +0200

Fixes for my UNO commits

- fix missing SAL_CALL annotations
- fix missing namespace usage

Change-Id: I8fa462bcbeaad63ad6a73cba68236b74bbe97e70

diff --git a/dbaccess/source/ui/uno/composerdialogs.cxx 
b/dbaccess/source/ui/uno/composerdialogs.cxx
index d3bad7a..99645b4 100644
--- a/dbaccess/source/ui/uno/composerdialogs.cxx
+++ b/dbaccess/source/ui/uno/composerdialogs.cxx
@@ -149,8 +149,7 @@ namespace dbaui
 return new DlgFilterCrit( _pParent, m_aContext.getUNOContext(), 
_rxConnection, m_xComposer, _rxColumns );
 }
 
-void RowsetFilterDialog::initialize( const Sequence Any  aArguments )
-throw (com::sun::star::uno::Exception, 
com::sun::star::uno::RuntimeException)
+void SAL_CALL RowsetFilterDialog::initialize( const Sequence Any  
aArguments ) throw (Exception, RuntimeException)
 {
 if( aArguments.getLength() == 3 )
 {
diff --git a/dbaccess/source/ui/uno/composerdialogs.hxx 
b/dbaccess/source/ui/uno/composerdialogs.hxx
index 9a718c0..8dc83d0 100644
--- a/dbaccess/source/ui/uno/composerdialogs.hxx
+++ b/dbaccess/source/ui/uno/composerdialogs.hxx
@@ -98,7 +98,7 @@ namespace dbaui
 
 // OGenericUnoDialog overridables
 virtual void executedDialog( sal_Int16 _nExecutionResult );
-virtual void initialize( const ::com::sun::star::uno::Sequence 
com::sun::star::uno::Any  aArguments )
+virtual void SAL_CALL initialize( const 
::com::sun::star::uno::Sequence com::sun::star::uno::Any  aArguments )
 throw (com::sun::star::uno::Exception, 
com::sun::star::uno::RuntimeException);
 
 };
diff --git a/extensions/source/update/check/updatecheck.cxx 
b/extensions/source/update/check/updatecheck.cxx
index 3deb846..540b98e 100644
--- a/extensions/source/update/check/updatecheck.cxx
+++ b/extensions/source/update/check/updatecheck.cxx
@@ -724,7 +724,7 @@ ShutdownThread::run()
 xQuickStarter-setFastPropertyValue(0, uno::makeAny(false));
 
 // Shutdown the office
-uno::Reference frame::XDesktop2  xDesktop = Desktop::create(m_xContext);
+uno::Reference frame::XDesktop2  xDesktop = 
frame::Desktop::create(m_xContext);
 
 xDesktop-terminate();
 }
diff --git a/extensions/source/update/check/updatecheckjob.cxx 
b/extensions/source/update/check/updatecheckjob.cxx
index 62913cf..1d33c7b 100644
--- a/extensions/source/update/check/updatecheckjob.cxx
+++ b/extensions/source/update/check/updatecheckjob.cxx
@@ -152,7 +152,7 @@ void InitUpdateCheckJobThread::setTerminating() {
 UpdateCheckJob::UpdateCheckJob( const uno::Referenceuno::XComponentContext 
xContext ) :
 m_xContext(xContext)
 {
-m_xDesktop.set( Desktop::create(xContext) );
+m_xDesktop.set( frame::Desktop::create(xContext) );
 m_xDesktop-addTerminateListener( this );
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: dbaccess/source

[Libreoffice Gerrit user]

 dbaccess/source/ui/uno/composerdialogs.cxx |2 +-
 dbaccess/source/ui/uno/composerdialogs.hxx |3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 10cad89df88b1b9a4bca85928319918f5bc79e2a
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Dec 20 16:13:33 2012 +0100

Drop useless typedef

Change-Id: I0521f9ead0ee317f4eafefafb9c91f942b977cd1

diff --git a/dbaccess/source/ui/uno/composerdialogs.cxx 
b/dbaccess/source/ui/uno/composerdialogs.cxx
index 213bccb..5f65656 100644
--- a/dbaccess/source/ui/uno/composerdialogs.cxx
+++ b/dbaccess/source/ui/uno/composerdialogs.cxx
@@ -60,7 +60,7 @@ namespace dbaui
 DBG_NAME(ComposerDialog)
 //-
 ComposerDialog::ComposerDialog(const Reference XMultiServiceFactory  
_rxORB)
-:ComposerDialog_BASE( _rxORB )
+:OGenericUnoDialog( _rxORB )
 {
 DBG_CTOR(ComposerDialog,NULL);
 
diff --git a/dbaccess/source/ui/uno/composerdialogs.hxx 
b/dbaccess/source/ui/uno/composerdialogs.hxx
index 64be0b0..b7e94cc 100644
--- a/dbaccess/source/ui/uno/composerdialogs.hxx
+++ b/dbaccess/source/ui/uno/composerdialogs.hxx
@@ -39,11 +39,10 @@ namespace dbaui
 //= ComposerDialog
 //=
 class ComposerDialog;
-typedef ::svt::OGenericUnoDialog
ComposerDialog_BASE;
 typedef ::comphelper::OPropertyArrayUsageHelper ComposerDialog   
ComposerDialog_PBASE;
 
 class ComposerDialog
-:public ComposerDialog_BASE
+:public svt::OGenericUnoDialog
 ,public ComposerDialog_PBASE
 {
 OModuleClient m_aModuleClient;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: dbaccess/source extensions/source svtools/source

[Libreoffice Gerrit user]

 dbaccess/source/core/dataaccess/databasecontext.cxx  |2 -
 dbaccess/source/inc/stringconstants.hrc  |1 
 dbaccess/source/inc/stringconstants.inc  |1 
 dbaccess/source/ui/browser/genericcontroller.cxx |8 ++-
 dbaccess/source/ui/dlg/DbAdminImpl.cxx   |8 +--
 extensions/source/propctrlr/formcomponenthandler.cxx |   20 +++
 extensions/source/propctrlr/formstrings.hxx  |1 
 svtools/source/dialogs/addresstemplate.cxx   |3 --
 8 files changed, 15 insertions(+), 29 deletions(-)

New commits:
commit 495111b249e1ef17be96dbdfbc5a13de6d5dd5f9
Author: Noel Grandin n...@peralex.com
Date:   Mon Dec 3 11:10:46 2012 +0200

fdo#46808, use service constructor for sdb::DatabaseContext

Change-Id: I4d845f289f324912b0fc4d8e26a2947e2d2f889e

diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx 
b/dbaccess/source/core/dataaccess/databasecontext.cxx
index 798262f..c4c625f 100644
--- a/dbaccess/source/core/dataaccess/databasecontext.cxx
+++ b/dbaccess/source/core/dataaccess/databasecontext.cxx
@@ -218,7 +218,7 @@ Reference XInterface  ODatabaseContext::Create(const 
Reference XComponentCont
 Sequence rtl::OUString  
ODatabaseContext::getSupportedServiceNames_static(void) throw( RuntimeException 
)
 {
 Sequence ::rtl::OUString  aSNS( 1 );
-aSNS[0] = SERVICE_SDB_DATABASECONTEXT;
+aSNS[0] = com.sun.star.sdb.DatabaseContext;
 return aSNS;
 }
 
diff --git a/dbaccess/source/inc/stringconstants.hrc 
b/dbaccess/source/inc/stringconstants.hrc
index d8a9ceb..6926f60 100644
--- a/dbaccess/source/inc/stringconstants.hrc
+++ b/dbaccess/source/inc/stringconstants.hrc
@@ -355,7 +355,6 @@ DECLARE_CONSTASCII_USTRING(SERVICE_SDB_COLUMNSETTINGS);
 DECLARE_CONSTASCII_USTRING(SERVICE_SDB_RESULTCOLUMN);
 DECLARE_CONSTASCII_USTRING(SERVICE_SDB_DATACOLUMN);
 DECLARE_CONSTASCII_USTRING(SERVICE_SDB_DATAACCESSCONNECTION);
-DECLARE_CONSTASCII_USTRING(SERVICE_SDB_DATABASECONTEXT);
 DECLARE_CONSTASCII_USTRING(SERVICE_SDB_DATASOURCE);
 DECLARE_CONSTASCII_USTRING(SERVICE_SDB_ROWSET);
 DECLARE_CONSTASCII_USTRING(SERVICE_SDB_RESULTSET);
diff --git a/dbaccess/source/inc/stringconstants.inc 
b/dbaccess/source/inc/stringconstants.inc
index 9d6e79e..010fd63 100644
--- a/dbaccess/source/inc/stringconstants.inc
+++ b/dbaccess/source/inc/stringconstants.inc
@@ -193,7 +193,6 @@ 
IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDBCX_COLUMNDESCRIPTOR, com.sun.star.sdbcx
 IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDB_COLUMNSETTINGS, 
com.sun.star.sdb.ColumnSettings);
 IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDB_RESULTCOLUMN, 
com.sun.star.sdb.ResultColumn);
 IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDB_DATACOLUMN, 
com.sun.star.sdb.DataColumn);
-IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDB_DATABASECONTEXT, 
com.sun.star.sdb.DatabaseContext);
 IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDB_DATASOURCE, 
com.sun.star.sdb.DataSource);
 IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDB_RESULTSET, 
com.sun.star.sdb.ResultSet);
 IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDB_ROWSET, com.sun.star.sdb.RowSet);
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx 
b/dbaccess/source/ui/browser/genericcontroller.cxx
index 58345e6..76df18a 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -258,15 +258,13 @@ sal_Bool OGenericUnoController::Construct(Window* 
/*pParent*/)
 {
 m_xDatabaseContext = 
DatabaseContext::create(comphelper::getComponentContext(getORB()));
 }
-catch(Exception)
+catch(const Exception)
 {
 OSL_FAIL(OGenericUnoController::Construct: could not create (or start 
listening at) the database context!);
+// at least notify the user. Though the whole component does not make 
any sense without the database context ...
+ShowServiceNotAvailableError(getView(), 
String(com.sun.star.sdb.DatabaseContext), sal_True);
 }
 
-if (!m_xDatabaseContext.is())
-{   // at least notify the user. Though the whole component does not 
make any sense without the database context ...
-ShowServiceNotAvailableError(getView(), 
String(SERVICE_SDB_DATABASECONTEXT), sal_True);
-}
 return sal_True;
 }
 
//--
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx 
b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
index 9082417..2b5cbfe 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
@@ -210,13 +210,9 @@ 
ODbDataSourceAdministrationHelper::ODbDataSourceAdministrationHelper(const Refer
 {
 m_xDatabaseContext = 
DatabaseContext::create(comphelper::getComponentContext(m_xORB));
 }
-catch(Exception)
-{
-}
-
-if ( !m_xDatabaseContext.is() )
+catch(const Exception)
 {
-ShowServiceNotAvailableError(_pParent-GetParent(), 
String(SERVICE_SDB_DATABASECONTEXT), sal_True);
+

[Libreoffice-commits] .: dbaccess/source

[Libreoffice Gerrit user]

 dbaccess/source/ui/inc/unosqlmessage.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4b90e055067a829f504b53d59aadc2e97138a79b
Author: Noel Grandin n...@peralex.com
Date:   Thu Dec 6 17:00:48 2012 +0200

fix missing SAL_CALL attribute on method

Change-Id: Idd0581d104c5a3e1286763c2deb8d385e04e207b

diff --git a/dbaccess/source/ui/inc/unosqlmessage.hxx 
b/dbaccess/source/ui/inc/unosqlmessage.hxx
index c738b73..f8b4bf2 100644
--- a/dbaccess/source/ui/inc/unosqlmessage.hxx
+++ b/dbaccess/source/ui/inc/unosqlmessage.hxx
@@ -64,7 +64,7 @@ public:
 virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const;
 
 protected:
-virtual void initialize(com::sun::star::uno::Sequence 
::com::sun::star::uno::Any  const  args) throw 
(com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException);
+virtual void SAL_CALL initialize(com::sun::star::uno::Sequence 
::com::sun::star::uno::Any  const  args) throw 
(com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException);
 
 // OPropertySetHelper overridables
 // (overwrittin these three, because we have some special handling for our 
property)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: dbaccess/source

[Libreoffice Gerrit user]

 dbaccess/source/ui/browser/dsbrowserDnD.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 6e27a552b257c042ef1a6a0ec097636362d1760d
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Mon Dec 3 20:21:02 2012 +0200

WaE: BaseReference::_pInterface may be used uninitialized in this function

Change-Id: Ic9424fd0cac9f2ff91866549b370080a9a88aeea

diff --git a/dbaccess/source/ui/browser/dsbrowserDnD.cxx 
b/dbaccess/source/ui/browser/dsbrowserDnD.cxx
index a3da512..c177474 100644
--- a/dbaccess/source/ui/browser/dsbrowserDnD.cxx
+++ b/dbaccess/source/ui/browser/dsbrowserDnD.cxx
@@ -109,7 +109,8 @@ namespace dbaui
 if ( eEntryType == etTableContainer  ensureConnection( 
pHitEntry, xConnection )  xConnection.is() )
 {
 ReferenceXChild xChild(xConnection,UNO_QUERY);
-ReferenceXStorable xStore(xChild.is() ? 
getDataSourceOrModel(xChild-getParent()) : ReferenceXInterface(),UNO_QUERY);
+ReferenceXStorable xStore;
+xStore = ReferenceXStorable( xChild.is() ? 
getDataSourceOrModel(xChild-getParent()) : ReferenceXInterface(),UNO_QUERY );
 // check for the concrete type
 if ( xStore.is()  !xStore-isReadonly()  
::std::find_if(_rFlavors.begin(),_rFlavors.end(),TAppSupportedSotFunctor(E_TABLE,sal_True))
 != _rFlavors.end())
 return DND_ACTION_COPY;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: dbaccess/source

[Libreoffice Gerrit user]

 dbaccess/source/ui/querydesign/QueryDesignView.cxx |   15 +--
 1 file changed, 9 insertions(+), 6 deletions(-)

New commits:
commit 63614919195934a764eacb509d75d15f8b243a48
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Sun Dec 2 18:55:44 2012 +0100

WaE: explicitly do nothing when nothing needs to be done

Removes compiler warning

Change-Id: Ied96ef294f25cca54887ca6a86ec07ecb2b1fae0

diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx 
b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 8ba3912..816991a 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -463,12 +463,15 @@ namespace
 OQueryTableConnectionData data(*pData);
 switch (data.GetJoinType())
 {
-case LEFT_JOIN:
-data.SetJoinType(RIGHT_JOIN);
-break;
-case RIGHT_JOIN:
-data.SetJoinType(LEFT_JOIN);
-break;
+case LEFT_JOIN:
+data.SetJoinType(RIGHT_JOIN);
+break;
+case RIGHT_JOIN:
+data.SetJoinType(LEFT_JOIN);
+break;
+default:
+// the other join types are symmetric, so nothing to change
+break;
 }
 return BuildJoin(_xConnection, rRh, BuildTable(_xConnection,pLh), 
data);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: dbaccess/source

[Libreoffice Gerrit user]

 dbaccess/source/ui/dlg/paramdialog.cxx |   16 
 dbaccess/source/ui/dlg/sqlmessage.cxx  |4 ++--
 dbaccess/source/ui/inc/paramdialog.hxx |2 +-
 dbaccess/source/ui/inc/sqlmessage.hxx  |6 +++---
 4 files changed, 14 insertions(+), 14 deletions(-)

New commits:
commit dd4edd93696140b7fae61268511886845d777645
Author: Ricardo Montania rica...@linuxafundo.com.br
Date:   Fri Nov 30 18:01:26 2012 -0200

fdo##38838 UniString Removal in dbaccess

Change-Id: I6c4f8e9834fdd78851f5274ce2b141cfb49e6458
Reviewed-on: https://gerrit.libreoffice.org/1208
Reviewed-by: Olivier Hallot olivier.hal...@alta.org.br
Tested-by: Olivier Hallot olivier.hal...@alta.org.br

diff --git a/dbaccess/source/ui/dlg/paramdialog.cxx 
b/dbaccess/source/ui/dlg/paramdialog.cxx
index 1453c84..694cdea 100644
--- a/dbaccess/source/ui/dlg/paramdialog.cxx
+++ b/dbaccess/source/ui/dlg/paramdialog.cxx
@@ -110,7 +110,7 @@ DBG_NAME(OParameterDialog)
 if (!pValues-Value.hasValue())
 // it won't have a value, 'cause it's default constructed. 
But may be later we support
 // initializing this dialog with values
-pValues-Value = makeAny(::rtl::OUString());
+pValues-Value = makeAny( OUString() );
 // default the values to an empty string
 
 m_aVisitedParams.push_back(0);
@@ -182,14 +182,14 @@ DBG_NAME(OParameterDialog)
 }
 
 // transform the current string according to the param field type
-::rtl::OUString sTransformedText(m_aParam.GetText());
+OUString sTransformedText(m_aParam.GetText());
 Reference XPropertySet   xParamAsSet;
 m_xParams-getByIndex(m_nCurrentlySelected) = xParamAsSet;
 if (xParamAsSet.is())
 {
 if (m_xConnection.is()  m_xFormatter.is())
 {
-::rtl::OUString sParamValue( m_aParam.GetText() );
+OUString sParamValue( m_aParam.GetText() );
 sal_Bool bValid = m_aPredicateInput.normalizePredicateString( 
sParamValue, xParamAsSet );
 m_aParam.SetText( sParamValue );
 if ( bValid )
@@ -205,7 +205,7 @@ DBG_NAME(OParameterDialog)
 
 m_bNeedErrorOnCurrent = sal_False;  // will be reset in 
OnValueModified
 
-::rtl::OUString sName;
+OUString sName;
 try
 {
 sName = 
::comphelper::getString(xParamAsSet-getPropertyValue(PROPERTY_NAME));
@@ -220,7 +220,7 @@ DBG_NAME(OParameterDialog)
 LocalResourceAccess aDummy(DLG_PARAMETERS, 
RSC_MODALDIALOG);
 sMessage = 
String(ModuleRes(STR_COULD_NOT_CONVERT_PARAM));
 }
-sMessage.SearchAndReplaceAll(rtl::OUString($name$), 
sName);
+sMessage.SearchAndReplaceAll( OUString($name$), sName );
 ErrorBox(NULL, WB_OK, sMessage).Execute();
 m_aParam.GrabFocus();
 return 1L;
@@ -265,9 +265,9 @@ DBG_NAME(OParameterDialog)
 Reference XPropertySet   xParamAsSet;
 m_xParams-getByIndex(i) = xParamAsSet;
 
-::rtl::OUString sValue;
+OUString sValue;
 pValues-Value = sValue;
-pValues-Value = ::rtl::OUString( 
m_aPredicateInput.getPredicateValue( sValue, xParamAsSet, sal_False ) );
+pValues-Value = OUString( 
m_aPredicateInput.getPredicateValue( sValue, xParamAsSet, sal_False ) );
 }
 }
 catch(Exception)
@@ -324,7 +324,7 @@ DBG_NAME(OParameterDialog)
 return 1L;
 }
 
-m_aFinalValues[m_nCurrentlySelected].Value = 
::rtl::OUString(m_aParam.GetText());
+m_aFinalValues[m_nCurrentlySelected].Value = 
OUString(m_aParam.GetText());
 }
 
 // initialize the controls with the new values
diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx 
b/dbaccess/source/ui/dlg/sqlmessage.cxx
index 210d5e6..9c3ecc8 100644
--- a/dbaccess/source/ui/dlg/sqlmessage.cxx
+++ b/dbaccess/source/ui/dlg/sqlmessage.cxx
@@ -716,7 +716,7 @@ OSQLMessageBox::OSQLMessageBox(Window* _pParent, const 
SQLExceptionInfo _rExcep
 }
 
 
//--
-OSQLMessageBox::OSQLMessageBox( Window* _pParent, const UniString _rTitle, 
const UniString _rMessage, WinBits _nStyle, MessageType _eType, const 
::dbtools::SQLExceptionInfo* _pAdditionalErrorInfo )
+OSQLMessageBox::OSQLMessageBox( Window* _pParent, const OUString _rTitle, 
const OUString _rMessage, WinBits _nStyle, MessageType _eType, const 
::dbtools::SQLExceptionInfo* _pAdditionalErrorInfo )
 :ButtonDialog( _pParent, WB_HORZ | WB_STDDIALOG )
 

[Libreoffice-commits] .: dbaccess/source

[Libreoffice Gerrit user]

 dbaccess/source/ui/uno/copytablewizard.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 064ef013dc4498b6a546b153d22c5711bc29bde3
Author: Tor Lillqvist t...@iki.fi
Date:   Wed Nov 28 22:40:26 2012 +0200

OUString::replaceAt() does not modify in-place

Change-Id: I59ebf6dc5bc75f8ded82b19dbc736a6aae48e74b

diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx 
b/dbaccess/source/ui/uno/copytablewizard.cxx
index bc5804f..e06f91e 100644
--- a/dbaccess/source/ui/uno/copytablewizard.cxx
+++ b/dbaccess/source/ui/uno/copytablewizard.cxx
@@ -1351,8 +1351,8 @@ void CopyTableWizard::impl_copyRows_throw( const 
Reference XResultSet  _rxSou
 {
 ::rtl::OUString aMessage( String( ModuleRes( 
STR_CTW_UNSUPPORTED_COLUMN_TYPE ) ) );
 
-aMessage.replaceAt( aMessage.indexOfAsciiL( $type$, 
6 ), 6, ::rtl::OUString::valueOf( aSourceColTypes[ nSourceColumn ] ) );
-aMessage.replaceAt( aMessage.indexOfAsciiL( $pos$, 5 
), 5, ::rtl::OUString::valueOf( nSourceColumn ) );
+aMessage = aMessage.replaceAt( aMessage.indexOfAsciiL( 
$type$, 6 ), 6, ::rtl::OUString::valueOf( aSourceColTypes[ nSourceColumn ] ) 
);
+aMessage = aMessage.replaceAt( aMessage.indexOfAsciiL( 
$pos$, 5 ), 5, ::rtl::OUString::valueOf( nSourceColumn ) );
 
 ::dbtools::throwSQLException(
 aMessage,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: dbaccess/source fpicker/source framework/source odk/examples qadevOOo/objdsc sdext/source sfx2/source vcl/inc vcl/source vcl/unx wizards/com

[Libreoffice Gerrit user]

 dbaccess/source/ui/dlg/ConnectionPage.cxx |1 
 dbaccess/source/ui/dlg/ConnectionPageSetup.cxx|1 
 dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx |1 
 dbaccess/source/ui/dlg/TextConnectionHelper.cxx   |1 
 fpicker/source/aqua/FPentry.mm|1 
 fpicker/source/aqua/SalAquaFolderPicker.hxx   |   11 +--
 fpicker/source/aqua/SalAquaFolderPicker.mm|4 -
 fpicker/source/office/OfficeFolderPicker.cxx  |   11 +--
 fpicker/source/office/OfficeFolderPicker.hxx  |   32 
+++---
 fpicker/source/win32/filepicker/FPentry.cxx   |3 
 fpicker/source/win32/folderpicker/FolderPicker.hxx|1 
 fpicker/source/win32/folderpicker/WinFOPImpl.cxx  |2 
 fpicker/source/win32/folderpicker/workbench/Test_fops.cxx |6 -
 framework/source/services/backingwindow.hxx   |1 
 odk/examples/DevelopersGuide/GUI/SystemDialog.java|4 -
 odk/examples/java/Inspector/Inspector.java|4 -
 qadevOOo/objdsc/fop/com.sun.star.comp.ui.dialogs.FolderPicker.csv |2 
 sdext/source/minimizer/fileopendialog.cxx |1 
 sfx2/source/dialog/filedlghelper.cxx  |1 
 vcl/inc/salinst.hxx   |6 -
 vcl/inc/unx/gtk/gtkinst.hxx   |2 
 vcl/inc/vcl/svapp.hxx |4 -
 vcl/source/app/svapp.cxx  |2 
 vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx|4 -
 vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx|7 --
 vcl/unx/gtk/fpicker/SalGtkPicker.hxx  |5 -
 wizards/com/sun/star/wizards/common/SystemDialog.java |4 -
 27 files changed, 49 insertions(+), 73 deletions(-)

New commits:
commit cc360f0a483e7c68ece7a30424f204d660d74b1c
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Nov 27 10:39:28 2012 +0100

fdo#46808: Missing adaptions to XFolderPicker2

c988da288ec473a28f61ebb53aa3ff82bab11ef4 fdo#46808, Adapt
ui::dialogs::FolderPicker UNO service to new style had left some 
FolderPicker
implementations at XFolderPicker, so creating them caused 
DeploymentExceptions.

Change-Id: I3463161f9bb87a69a2777c331eb5b93d487790b0

diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx 
b/dbaccess/source/ui/dlg/ConnectionPage.cxx
index 50e26bf..1b717c8 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx
@@ -41,7 +41,6 @@
 #include dsselect.hxx
 #include svl/filenotation.hxx
 #include dbustrings.hrc
-#include com/sun/star/ui/dialogs/XFolderPicker.hpp
 #include com/sun/star/sdbc/XRow.hpp
 #include com/sun/star/awt/XWindow.hpp
 #include com/sun/star/task/XInteractionHandler.hpp
diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx 
b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
index 019a5b9..9f966ee 100644
--- a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
@@ -41,7 +41,6 @@
 #include dsselect.hxx
 #include svl/filenotation.hxx
 #include dbustrings.hrc
-#include com/sun/star/ui/dialogs/XFolderPicker.hpp
 #include com/sun/star/sdbc/XRow.hpp
 #include com/sun/star/awt/XWindow.hpp
 #include com/sun/star/task/XInteractionHandler.hpp
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx 
b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
index 0168f22..07e0bfb 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
@@ -39,7 +39,6 @@
 #include dbadmin.hxx
 #include comphelper/types.hxx
 
-#include com/sun/star/ui/dialogs/XFolderPicker.hpp
 #include com/sun/star/task/XInteractionHandler.hpp
 #include com/sun/star/sdbc/XDriverAccess.hpp
 #include dbustrings.hrc
diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx 
b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
index 88a24f5..ff38363 100644
--- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
@@ -40,7 +40,6 @@
 #include dbadmin.hxx
 #include comphelper/string.hxx
 #include comphelper/types.hxx
-#include com/sun/star/ui/dialogs/XFolderPicker.hpp
 #include com/sun/star/task/XInteractionHandler.hpp
 #include svl/filenotation.hxx
 #include unotools/localfilehelper.hxx
diff --git a/fpicker/source/aqua/FPentry.mm b/fpicker/source/aqua/FPentry.mm
index d514868..7f9a3e1 100644
--- a/fpicker/source/aqua/FPentry.mm
+++ b/fpicker/source/aqua/FPentry.mm
@@ -33,7 +33,6 @@ using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::registry;
 using namespace ::cppu;
 using 

[Libreoffice-commits] .: dbaccess/source

[Libreoffice Gerrit user]

 dbaccess/source/ui/misc/TokenWriter.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a7396e4654f9720c763505ea2da7460c9243f864
Author: Michael Meeks michael.me...@suse.com
Date:   Sun Nov 25 17:14:50 2012 +

fixup trailing token error.

Change-Id: Idf7d0f4490dc419171e3e60252e31e07b6ce4e97

diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx 
b/dbaccess/source/ui/misc/TokenWriter.cxx
index eff9330..d1a1d65 100644
--- a/dbaccess/source/ui/misc/TokenWriter.cxx
+++ b/dbaccess/source/ui/misc/TokenWriter.cxx
@@ -887,7 +887,7 @@ void OHTMLImportExport::WriteTables()
 IncIndent(-1);
 
 
WriteCell(pFormat[i],pColWidth[i],nHeight,pHorJustify[i],*pIter,OOO_STRING_SVTOOLS_HTML_tableheader);
-}libreOffice SetModifyHdl
+}
 
 IncIndent(-1);
 TAG_OFF_LF( OOO_STRING_SVTOOLS_HTML_tablerow );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: dbaccess/source

[Libreoffice Gerrit user]

 dbaccess/source/core/misc/userinformation.cxx |7 ++-
 1 file changed, 2 insertions(+), 5 deletions(-)

New commits:
commit cd52a285c183db9da7a2e40a0c314f6258f1d7af
Author: Eike Rathke er...@redhat.com
Date:   Sat Nov 17 01:33:52 2012 +0100

use LanguageTag

Change-Id: Iea2c5ae21c8d7c143f9f4a0e3c42c963cfc28d33

diff --git a/dbaccess/source/core/misc/userinformation.cxx 
b/dbaccess/source/core/misc/userinformation.cxx
index 88d0c82..fc4e96a 100644
--- a/dbaccess/source/core/misc/userinformation.cxx
+++ b/dbaccess/source/core/misc/userinformation.cxx
@@ -21,7 +21,7 @@
 #include userinformation.hxx
 
 #include osl/diagnose.h
-#include i18npool/mslangid.hxx
+#include i18npool/languagetag.hxx
 #include unotools/configmgr.hxx
 
 using namespace ::utl;
@@ -30,10 +30,7 @@ using namespace ::com::sun::star::lang;
 
 //--
 UserInformation::UserInformation():
-m_aUserLocale(
-MsLangId::convertLanguageToLocale(
-MsLangId::convertIsoStringToLanguage(
-ConfigManager::getLocale(), '-')))
+m_aUserLocale( LanguageTag( ConfigManager::getLocale()).getLocale())
 {}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: dbaccess/source

[Libreoffice Gerrit user]

 dbaccess/source/core/dataaccess/documentdefinition.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit f3aa69b0257744df7105606c1a8f0d1b44ac8d0a
Author: Julien Nabet serval2...@yahoo.fr
Date:   Sun Nov 11 16:16:01 2012 +0100

Fix the scope of the variable 'pApprove' can be reduced

Change-Id: I1ce2682224fbb0c93bc7ec97a31a59020ac6be02

diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx 
b/dbaccess/source/core/dataaccess/documentdefinition.cxx
index 5abe8f8..47c6cd3 100644
--- a/dbaccess/source/core/dataaccess/documentdefinition.cxx
+++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx
@@ -1287,10 +1287,9 @@ sal_Bool ODocumentDefinition::save(sal_Bool _bApprove)
 pDocuSave = new ODocumentSaveContinuation;
 pRequest-addContinuation(pDocuSave);
 }
-OInteraction XInteractionApprove * pApprove = NULL;
 if ( _bApprove )
 {
-pApprove = new OInteraction XInteractionApprove ;
+OInteraction XInteractionApprove * pApprove = new 
OInteraction XInteractionApprove ;
 pRequest-addContinuation(pApprove);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: dbaccess/source

[Libreoffice Gerrit user]

 dbaccess/source/core/api/querycomposer.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit afb28ae04ab818721e848e254ae89b2185318435
Author: Norbert Thiebaud nthieb...@gmail.com
Date:   Mon Oct 1 16:08:10 2012 -0500

missing system header

Change-Id: Icba29c0ebfd30af36b18eb59a23643287985f8c8

diff --git a/dbaccess/source/core/api/querycomposer.cxx 
b/dbaccess/source/core/api/querycomposer.cxx
index 336e726..d84e771 100644
--- a/dbaccess/source/core/api/querycomposer.cxx
+++ b/dbaccess/source/core/api/querycomposer.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
+#include string.h
 #include com/sun/star/lang/DisposedException.hpp
 #include com/sun/star/util/XNumberFormatter.hpp
 #include com/sun/star/sdbc/ColumnSearch.hpp
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: dbaccess/source

[Libreoffice Gerrit user]

 dbaccess/source/core/api/RowSet.cxx|2 +-
 dbaccess/source/core/api/SingleSelectQueryComposer.cxx |2 +-
 dbaccess/source/core/dataaccess/ContentHelper.cxx  |1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit df706c23dcdc81f0cfaa8c2b106afd6accc03ad5
Author: Norbert Thiebaud nthieb...@gmail.com
Date:   Mon Oct 1 16:11:22 2012 -0500

missing system header

Change-Id: Ieb97d877238941d06aab1aa2ef67186bbc3a995a

diff --git a/dbaccess/source/core/api/RowSet.cxx 
b/dbaccess/source/core/api/RowSet.cxx
index a75a155..1042d84 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
+#include string.h
 #include RowSet.hxx
 #include dbastrings.hrc
 #include sdbcoretools.hxx
diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx 
b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index 55aa752..faef308 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
+#include string.h
 #include composertools.hxx
 #include core_resource.hrc
 #include core_resource.hxx
diff --git a/dbaccess/source/core/dataaccess/ContentHelper.cxx 
b/dbaccess/source/core/dataaccess/ContentHelper.cxx
index fed2637..08cdd7e 100644
--- a/dbaccess/source/core/dataaccess/ContentHelper.cxx
+++ b/dbaccess/source/core/dataaccess/ContentHelper.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include string.h
 #include ContentHelper.hxx
 #include ucbhelper/cancelcommandexecution.hxx
 #include comphelper/property.hxx
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: dbaccess/source

[Libreoffice Gerrit user]

 dbaccess/source/core/api/RowSet.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 522b4c65dcc90719288b4f7aa7eb565c15b64e86
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Thu Sep 13 16:24:38 2012 +0200

fdo#37529 clear DataColumns read-only information when we clear DataColumns

Change-Id: I6f3b4f1646df1244d97ae98f56ba054bc26e3314

diff --git a/dbaccess/source/core/api/RowSet.cxx 
b/dbaccess/source/core/api/RowSet.cxx
index 7b21b40..c2e4959 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -558,6 +558,8 @@ void ORowSet::freeResources( bool _bComplete )
 // the columns must be disposed before the querycomposer is disposed 
because
 // their owner can be the composer
 TDataColumns().swap(m_aDataColumns);// clear and resize capacity
+::std::vectorbool().swap(m_aReadOnlyDataColumns);
+
 m_xColumns  = NULL;
 if ( m_pColumns )
 m_pColumns-disposing();
@@ -1239,6 +1241,7 @@ void ORowSet::impl_setDataColumnsWriteable_throw()
 
 void ORowSet::impl_restoreDataColumnsWriteable_throw()
 {
+assert(m_aDataColumns.size() == m_aReadOnlyDataColumns.size() || 
m_aReadOnlyDataColumns.size() == 0 );
 TDataColumns::iterator aIter = m_aDataColumns.begin();
 ::std::vectorbool, std::allocatorbool ::iterator aReadIter = 
m_aReadOnlyDataColumns.begin();
 for(;aReadIter != m_aReadOnlyDataColumns.end();++aIter,++aReadIter)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: dbaccess/source

[Libreoffice Gerrit user]

 dbaccess/source/core/api/KeySet.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit cdadb1b4fb207392961a24788d44bd7ffa529046
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Fri Aug 31 18:14:59 2012 +0200

fdo#53557: use metadata's idea of column count to allocate a row

m_pColumnNames contains only the columns that come straight from a table, 
not calculated columns

Change-Id: I2706790e8c1447d1c4e144bbdef773deeca3e2e8

diff --git a/dbaccess/source/core/api/KeySet.cxx 
b/dbaccess/source/core/api/KeySet.cxx
index 6d8f58e..c2dadcd 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -1441,11 +1441,12 @@ sal_Bool OKeySet::fetchRow()
 bRet = m_xDriverSet-next();
 if ( bRet )
 {
+const int cc = m_xSetMetaData-getColumnCount();
+
 ORowSetRow aKeyRow = new connectivity::ORowVector ORowSetValue 
((*m_pKeyColumnNames).size() + m_pForeignColumnNames-size());
-ORowSetRow aFullRow = new connectivity::ORowVector ORowSetValue 
(m_pColumnNames-size());
+ORowSetRow aFullRow = new connectivity::ORowVector ORowSetValue (cc);
 
 // Fetch the columns only once and in order, to satisfy restrictive 
backends such as ODBC
-const int cc = m_xSetMetaData-getColumnCount();
 connectivity::ORowVector ORowSetValue ::Vector::iterator aFRIter = 
aFullRow-get().begin();
 // Column 0 is reserved for the bookmark; unused here.
 ++aFRIter;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: dbaccess/source

[Libreoffice Gerrit user]

 dbaccess/source/ui/dlg/queryfilter.cxx |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit c556c5bbd2627aafeb895cb1eb3fb7281d67357d
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Thu Aug 30 05:55:35 2012 +0200

fdo#53887 convert filter value as LIKE pattern only on (NOT) LIKE

Change-Id: I24d1f3af5d428e735a94fc9a69960244d0225513

diff --git a/dbaccess/source/ui/dlg/queryfilter.cxx 
b/dbaccess/source/ui/dlg/queryfilter.cxx
index ed22f5a..a869637 100644
--- a/dbaccess/source/ui/dlg/queryfilter.cxx
+++ b/dbaccess/source/ui/dlg/queryfilter.cxx
@@ -358,7 +358,9 @@ sal_Bool DlgFilterCrit::getCondition(const ListBox 
_rField,const ListBox _rCom
 if ( SQLFilterOperator::SQLNULL != _rFilter.Handle  _rFilter.Handle != 
SQLFilterOperator::NOT_SQLNULL )
 {
 String sPredicateValue = m_aPredicateInput.getPredicateValue( 
_rValue.GetText(), getMatchingColumn( _rValue ), sal_False );
-::Replace_OS_PlaceHolder( sPredicateValue );
+if ( _rFilter.Handle == SQLFilterOperator::LIKE ||
+ _rFilter.Handle == SQLFilterOperator::NOT_LIKE )
+::Replace_OS_PlaceHolder( sPredicateValue );
 _rFilter.Value = ::rtl::OUString(sPredicateValue);
 }
 return bHaving;
@@ -469,7 +471,9 @@ void DlgFilterCrit::SetLine( sal_uInt16 nIdx,const 
PropertyValue _rItem,sal_Boo
 ::rtl::OUString aCondition;
 _rItem.Value = aCondition;
 String aStr = aCondition;
-::Replace_SQL_PlaceHolder(aStr);
+if ( _rItem.Handle == SQLFilterOperator::LIKE ||
+ _rItem.Handle == SQLFilterOperator::NOT_LIKE )
+::Replace_SQL_PlaceHolder(aStr);
 aStr = comphelper::string::stripEnd(aStr, ' ');
 
 Reference XPropertySet  xColumn = getColumn( _rItem.Name );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: dbaccess/source

[Cédric Bosdonnat]

 dbaccess/source/ui/inc/FieldDescControl.hxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ea7b1af01511d147ba7bfea925d407e72723a7db
Author: Philipp Riemer ruderphil...@gmail.com
Date:   Sun Aug 12 18:58:02 2012 +0200

Moved method declaration in class definition

The following method was added at the bottom and is now moved to all
other methods marked as protected.

This is a follow-up patch of 401a454c2da7560d5ec41ef07ac116403956c55a.

Change-Id: Ib536f93f1565a128a3bb5dff12496005c51acb83

diff --git a/dbaccess/source/ui/inc/FieldDescControl.hxx 
b/dbaccess/source/ui/inc/FieldDescControl.hxx
index 98d9561..a43f0cc 100644
--- a/dbaccess/source/ui/inc/FieldDescControl.hxx
+++ b/dbaccess/source/ui/inc/FieldDescControl.hxx
@@ -171,6 +171,8 @@ namespace dbaui
 
 const OPropColumnEditCtrl*  getColumnCtrl() const { return 
m_pColumnName; }
 
+voidimplFocusLost(Window* _pWhich);
+
 public:
 OFieldDescControl( Window* pParent, OTableDesignHelpBar* pHelpBar);
 OFieldDescControl( Window* pParent, const ResId rResId, 
OTableDesignHelpBar* pHelpBar);
@@ -205,8 +207,6 @@ namespace dbaui
 String  getControlDefault( const OFieldDescription* 
_pFieldDescr ,sal_Bool _bCheck = sal_True) const;
 
 inline void setEditWidth(sal_Int32 _nWidth) { m_nWidth = _nWidth; }
-protected:
-voidimplFocusLost(Window* _pWhich);
 };
 }
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: dbaccess/source

[Miklos Vajna]

 dbaccess/source/ui/inc/FieldDescControl.hxx |2 --
 dbaccess/source/ui/inc/RtfReader.hxx|1 -
 2 files changed, 3 deletions(-)

New commits:
commit b3a7f6d51bd437ddb93ec45b38b27f27b42343eb
Author: Philipp Riemer ruderphil...@gmail.com
Date:   Sun Aug 12 18:57:23 2012 +0200

removed commented out calls

This is a follow-up patch of 401a454c2da7560d5ec41ef07ac116403956c55a.

Change-Id: I5304467333c9d1554ed4426962e42d7c0ce58b9f

diff --git a/dbaccess/source/ui/inc/FieldDescControl.hxx 
b/dbaccess/source/ui/inc/FieldDescControl.hxx
index 991a85a..98d9561 100644
--- a/dbaccess/source/ui/inc/FieldDescControl.hxx
+++ b/dbaccess/source/ui/inc/FieldDescControl.hxx
@@ -177,10 +177,8 @@ namespace dbaui
 virtual ~OFieldDescControl();
 
 voidDisplayData(OFieldDescription* pFieldDescr );
-//  voidDisplayData(const OColumn* pColumn);
 
 voidSaveData( OFieldDescription* pFieldDescr );
-//  voidSaveData( OColumn* pColumn);
 
 voidSetControlText( sal_uInt16 nControlId, const 
String rText );
 String  GetControlText( sal_uInt16 nControlId );
diff --git a/dbaccess/source/ui/inc/RtfReader.hxx 
b/dbaccess/source/ui/inc/RtfReader.hxx
index 22ae95a..af33779 100644
--- a/dbaccess/source/ui/inc/RtfReader.hxx
+++ b/dbaccess/source/ui/inc/RtfReader.hxx
@@ -32,7 +32,6 @@ namespace dbaui
 {
 ::std::vectorsal_Int32m_vecColor;
 
-//  void insertValueIntoColumn();
 protected:
 virtual sal_BoolCreateTable(int nToken);
 virtual voidNextToken( int nToken ); // base class
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: dbaccess/source

[Philipp Riemer]

 dbaccess/source/ui/inc/DExport.hxx   |   22 ++---
 dbaccess/source/ui/inc/FieldDescControl.hxx  |7 +---
 dbaccess/source/ui/inc/HtmlReader.hxx|   12 +++
 dbaccess/source/ui/inc/JoinExchange.hxx  |2 -
 dbaccess/source/ui/inc/JoinTableView.hxx |   30 ++
 dbaccess/source/ui/inc/QEnumTypes.hxx|3 +
 dbaccess/source/ui/inc/QueryTableView.hxx|   37 ---
 dbaccess/source/ui/inc/RelationTableView.hxx |4 +-
 dbaccess/source/ui/inc/RtfReader.hxx |   10 +++---
 dbaccess/source/ui/inc/TableConnection.hxx   |9 +++--
 dbaccess/source/ui/inc/TableConnectionData.hxx   |   10 +++---
 dbaccess/source/ui/inc/TableDesignControl.hxx|4 +-
 dbaccess/source/ui/inc/TableDesignHelpBar.hxx|5 +--
 dbaccess/source/ui/inc/TableFieldDescription.hxx |4 +-
 14 files changed, 84 insertions(+), 75 deletions(-)

New commits:
commit 401a454c2da7560d5ec41ef07ac116403956c55a
Author: Daniel Herde dan...@dher.de
Date:   Fri Aug 10 21:24:32 2012 +0200

fdo#39468: Translate German comments in dbaccess/source/ui/inc

Change-Id: Ibf6993a5b935d4ca4e0c792e8676b293ab224d68

diff --git a/dbaccess/source/ui/inc/DExport.hxx 
b/dbaccess/source/ui/inc/DExport.hxx
index 9b1fa8b..974d7c3 100644
--- a/dbaccess/source/ui/inc/DExport.hxx
+++ b/dbaccess/source/ui/inc/DExport.hxx
@@ -60,8 +60,8 @@ namespace dbaui
 typedef ::std::vector ::std::pairsal_Int32,sal_Int32TPositions;
 
 protected:
-TPositions  m_vColumns; // Welche Spalten 
ubernommen werden sollen
-::std::vectorsal_Int32m_vColumnTypes; // FeldTypen fur 
schnelleren Zugriff
+TPositions  m_vColumns; // columns to be used
+::std::vectorsal_Int32m_vColumnTypes; // ColumnTypes for 
faster access
 ::std::vectorsal_Int32m_vColumnSize;
 ::std::vectorsal_Int16m_vNumberFormat;
 ::com::sun::star::lang::Locale  m_aLocale;
@@ -84,20 +84,20 @@ namespace dbaui
 //for save the selected tablename
 ::rtl::OUString m_sDefaultTableName;
 
-String  m_sTextToken;   // Zellen Inhalt
+String  m_sTextToken;   /// cell content
 String  m_sNumToken;/// SDNUM value
 String  m_sValToken;/// SDVAL value
 TOTypeInfoSPm_pTypeInfo;// contains the default type
 const TColumnVector* m_pColumnList;
 const OTypeInfoMap* m_pInfoMap;
-sal_Int32   m_nColumnPos;   // aktuelle Spaltenposition
-sal_Int32   m_nRows;// Anzahl der Zeilen die 
durchsucht werden sollen
+sal_Int32   m_nColumnPos;   // current column position
+sal_Int32   m_nRows;// number of rows to be searched
 sal_Int32   m_nRowCount;// current count of rows
-rtl_TextEncodingm_nDefToken;// Sprache
-sal_Boolm_bError;   // Fehler und Abbruchstatus
-sal_Boolm_bInTbl;   // Ist gesetzt, wenn der 
Parser sich in der RTF Tabelle befindet
-sal_Boolm_bHead;// ist true, wenn die Kopfzeile 
noch nicht gelesen wurde
-sal_Boolm_bDontAskAgain;// Falls beim Einfugen ein Fehler 
auftritt, soll die Fehlermeldung nicht
+rtl_TextEncodingm_nDefToken;// language
+sal_Boolm_bError;   // error and termination code
+sal_Boolm_bInTbl;   // true, if parser is in RTF 
table
+sal_Boolm_bHead;// true, if the header hasn't been 
read yet
+sal_Boolm_bDontAskAgain;// if there is an error when 
pasting, don't show it again
 sal_Boolm_bIsAutoIncrement; // if PKey is set by user
 sal_Boolm_bFoundTable;  // set to true when a table 
was found
 sal_Boolm_bCheckOnly;
@@ -139,7 +139,7 @@ namespace dbaui
 SvStream _rInputStream
 );
 
-// wird fur auto. Typ-Erkennung gebraucht
+// required for automatic type recognition
 ODatabaseExport(
 sal_Int32 nRows,
 const TPositions _rColumnPositions,
diff --git a/dbaccess/source/ui/inc/FieldDescControl.hxx 
b/dbaccess/source/ui/inc/FieldDescControl.hxx
index 69c6bc8..e19baf1 100644
--- a/dbaccess/source/ui/inc/FieldDescControl.hxx
+++ b/dbaccess/source/ui/inc/FieldDescControl.hxx
@@ -26,7 +26,7 @@
 #include TypeInfo.hxx
 
 //--
-// die Spalten einer Feld-Beschreibung einer Tabelle
+// field description columns of a table
 #define FIELD_NAME  1
 #define FIELD_TYPE  2
 #define HELP_TEXT   3
@@ 

[Libreoffice-commits] .: dbaccess/source

[Philipp Riemer]

 dbaccess/source/ui/inc/DExport.hxx   |   47 +-
 dbaccess/source/ui/inc/HtmlReader.hxx|6 -
 dbaccess/source/ui/inc/JoinTableView.hxx |  104 +++
 dbaccess/source/ui/inc/QueryTableView.hxx|   44 -
 dbaccess/source/ui/inc/RelationTableView.hxx |   13 +-
 dbaccess/source/ui/inc/RtfReader.hxx |4 
 dbaccess/source/ui/inc/TableConnection.hxx   |   19 ++--
 dbaccess/source/ui/inc/TableConnectionData.hxx   |   22 ++--
 dbaccess/source/ui/inc/TableDesignControl.hxx|5 -
 dbaccess/source/ui/inc/TableFieldDescription.hxx |8 -
 10 files changed, 139 insertions(+), 133 deletions(-)

New commits:
commit 5c293bfa9023fcc4fbb104c49e9ef28d23b38594
Author: Philipp Riemer ruderphil...@gmail.com
Date:   Sun Aug 12 18:22:40 2012 +0200

convert comments into doxygen style + reformat some existing ones

Change-Id: Ia9580f8d6ef19025654b5486816e5a75f76f1174

diff --git a/dbaccess/source/ui/inc/DExport.hxx 
b/dbaccess/source/ui/inc/DExport.hxx
index 974d7c3..5b6c72f 100644
--- a/dbaccess/source/ui/inc/DExport.hxx
+++ b/dbaccess/source/ui/inc/DExport.hxx
@@ -60,46 +60,46 @@ namespace dbaui
 typedef ::std::vector ::std::pairsal_Int32,sal_Int32TPositions;
 
 protected:
-TPositions  m_vColumns; // columns to be used
-::std::vectorsal_Int32m_vColumnTypes; // ColumnTypes for 
faster access
+TPositions  m_vColumns; /// columns to be used
+::std::vectorsal_Int32m_vColumnTypes; /// ColumnTypes for 
faster access
 ::std::vectorsal_Int32m_vColumnSize;
 ::std::vectorsal_Int16m_vNumberFormat;
 ::com::sun::star::lang::Locale  m_aLocale;
 
-TColumnsm_aDestColumns; // container for new 
created columns
+TColumnsm_aDestColumns; /// container for new 
created columns
 TColumnVector   m_vDestVector;
 
-::com::sun::star::uno::Reference 
::com::sun::star::beans::XPropertySetm_xTable;   // dest table
-::com::sun::star::uno::Reference 
::com::sun::star::container::XNameAccess m_xTables;  // container
-SharedConnection   
 m_xConnection;  // dest conn
+::com::sun::star::uno::Reference 
::com::sun::star::beans::XPropertySetm_xTable;   /// dest table
+::com::sun::star::uno::Reference 
::com::sun::star::container::XNameAccess m_xTables;  /// container
+SharedConnection   
 m_xConnection;  /// dest conn
 
 ::boost::shared_ptrIUpdateHelper 
 m_pUpdateHelper;
-::com::sun::star::uno::Reference ::com::sun::star::sdbc::XResultSet  
 m_xResultSet;   //
-::com::sun::star::uno::Reference 
::com::sun::star::util::XNumberFormatter m_xFormatter;   // a number 
formatter working with the connection's NumberFormatsSupplier
+::com::sun::star::uno::Reference ::com::sun::star::sdbc::XResultSet  
 m_xResultSet;
+::com::sun::star::uno::Reference 
::com::sun::star::util::XNumberFormatter m_xFormatter;   /// a number 
formatter working with the connection's NumberFormatsSupplier
 ::com::sun::star::uno::Reference 
::com::sun::star::lang::XMultiServiceFactory m_xFactory;
 ::com::sun::star::util::Date   
 m_aNullDate;
 
 SvNumberFormatter*  m_pFormatter;
 SvStream   m_rInputStream;
-//for save the selected tablename
+/// for saving the selected tablename
 ::rtl::OUString m_sDefaultTableName;
 
-String  m_sTextToken;   /// cell content
-String  m_sNumToken;/// SDNUM value
-String  m_sValToken;/// SDVAL value
-TOTypeInfoSPm_pTypeInfo;// contains the default type
+String  m_sTextToken;   /// cell content
+String  m_sNumToken;/// SDNUM value
+String  m_sValToken;/// SDVAL value
+TOTypeInfoSPm_pTypeInfo;/// contains the default type
 const TColumnVector* m_pColumnList;
 const OTypeInfoMap* m_pInfoMap;
-sal_Int32   m_nColumnPos;   // current column position
-sal_Int32   m_nRows;// number of rows to be searched
-sal_Int32   m_nRowCount;// current count of rows
-rtl_TextEncodingm_nDefToken;// language
-sal_Boolm_bError;   // error and termination code
-sal_Boolm_bInTbl;   // true, if parser is in RTF 
table
-sal_Boolm_bHead;// true, if the 

[Libreoffice-commits] .: dbaccess/source sfx2/inc solenv/inc svtools/source sw/source toolkit/inc

[Thomas Arnhold]

 dbaccess/source/filter/xml/xmlHelper.hxx |2 +-
 sfx2/inc/sfx2/linksrc.hxx|4 ++--
 solenv/inc/starview.hid  |2 ++
 svtools/source/filter/wmf/winmtf.hxx |   23 +++
 sw/source/ui/dialog/regionsw.src |7 +++
 toolkit/inc/toolkit/helper/property.hxx  |   14 +-
 6 files changed, 36 insertions(+), 16 deletions(-)

New commits:
commit 10ada83716e7c7d591d2c7d5c19cc5920db38faf
Author: Thomas Arnhold tho...@arnhold.org
Date:   Sun Jul 29 19:22:59 2012 +0200

Partially revert Remove unused defines

This partially reverts 00240d049790d11c4ef35de7a294819107197efd

http://lists.freedesktop.org/archives/libreoffice/2012-July/035331.html

Change-Id: Ib682cd258cca12e742be5fb1715b2aecfe0a761e

diff --git a/dbaccess/source/filter/xml/xmlHelper.hxx 
b/dbaccess/source/filter/xml/xmlHelper.hxx
index f835c9e..aa7a76e 100644
--- a/dbaccess/source/filter/xml/xmlHelper.hxx
+++ b/dbaccess/source/filter/xml/xmlHelper.hxx
@@ -25,7 +25,7 @@
 
 #include memory
 
-//  CTF_DB_ROWHEIGHT(XML_DB_CTF_START + 1)
+#define CTF_DB_ROWHEIGHT(XML_DB_CTF_START + 1)
 #define CTF_DB_ISVISIBLE(XML_DB_CTF_START + 2)
 #define CTF_DB_MASTERPAGENAME   (XML_DB_CTF_START + 3)
 #define CTF_DB_NUMBERFORMAT (XML_DB_CTF_START + 4)
diff --git a/sfx2/inc/sfx2/linksrc.hxx b/sfx2/inc/sfx2/linksrc.hxx
index f152c0d..4ff77b6 100644
--- a/sfx2/inc/sfx2/linksrc.hxx
+++ b/sfx2/inc/sfx2/linksrc.hxx
@@ -39,9 +39,9 @@ class String;
 #ifndef ADVISEMODE_NODATA
 // Must be the same value as Ole2 ADVF_*
 #define ADVISEMODE_NODATA   0x01
-//  ADVISEMODE_PRIMEFIRST   0x02
+#define ADVISEMODE_PRIMEFIRST   0x02
 #define ADVISEMODE_ONLYONCE 0x04
-//  ADVISEMODE_DATAONSTOP   0x40
+#define ADVISEMODE_DATAONSTOP   0x40
 #endif
 
 namespace sfx2
diff --git a/solenv/inc/starview.hid b/solenv/inc/starview.hid
index d090951..651a830 100644
--- a/solenv/inc/starview.hid
+++ b/solenv/inc/starview.hid
@@ -310,7 +310,9 @@
 #define accelerator96
 #define Accelerator96
 #define ACCELERATOR 96
+#define acceleratoritem97
 #define AcceleratorItem97
+#define ACCELERATORITEM 97
 
 #define SfxStyleFamilies 98
 #define SfxStyleFamilyItem 99
diff --git a/svtools/source/filter/wmf/winmtf.hxx 
b/svtools/source/filter/wmf/winmtf.hxx
index 8e2194c..bf81be5 100644
--- a/svtools/source/filter/wmf/winmtf.hxx
+++ b/svtools/source/filter/wmf/winmtf.hxx
@@ -77,11 +77,11 @@
 #define BLACK_PEN   7
 #define NULL_PEN8
 #define OEM_FIXED_FONT  10
-//  ANSI_FIXED_FONT 11
-//  ANSI_VAR_FONT   12
-//  SYSTEM_FONT 13
-//  DEVICE_DEFAULT_FONT 14
-//  DEFAULT_PALETTE 15
+#define ANSI_FIXED_FONT 11
+#define ANSI_VAR_FONT   12
+#define SYSTEM_FONT 13
+#define DEVICE_DEFAULT_FONT 14
+#define DEFAULT_PALETTE 15
 #define SYSTEM_FIXED_FONT   16
 
 
@@ -122,10 +122,12 @@
 #define BLACKONWHITE1
 #define WHITEONBLACK2
 #define COLORONCOLOR3
+#define HALFTONE4
 #define MAXSTRETCHBLTMODE   4
 #define STRETCH_ANDSCANSBLACKONWHITE
 #define STRETCH_ORSCANS WHITEONBLACK
 #define STRETCH_DELETESCANS COLORONCOLOR
+#define STRETCH_HALFTONEHALFTONE
 
 #define LF_FACESIZE 32
 
@@ -185,6 +187,11 @@ struct WMF_EXTERNALHEADER;
 #define PS_ALTERNATE8
 #define PS_STYLE_MASK   15
 
+#define PS_ENDCAP_ROUND 0x000
+#define PS_ENDCAP_SQUARE0x100
+#define PS_ENDCAP_FLAT  0x200
+#define PS_ENDCAP_MASK  0xF00
+
 #define PS_JOIN_ROUND   0x
 #define PS_JOIN_BEVEL   0x1000
 #define PS_JOIN_MITER   0x2000
@@ -220,9 +227,9 @@ struct WMF_EXTERNALHEADER;
 /*WINVER = 0x0400*/
 #define ETO_GLYPH_INDEX 0x0010
 #define ETO_RTLREADING  0x0080
-//  ETO_NUMERICSLOCAL   0x0400
-//  ETO_NUMERICSLATIN   0x0800
-//  ETO_IGNORELANGUAGE  0x1000
+#define ETO_NUMERICSLOCAL   0x0400
+#define ETO_NUMERICSLATIN   0x0800
+#define ETO_IGNORELANGUAGE  0x1000
 /*_WIN32_WINNT = 0x0500*/
 #define ETO_PDY 0x2000
 
diff --git a/sw/source/ui/dialog/regionsw.src b/sw/source/ui/dialog/regionsw.src
index 2f728dd..f97ec06 100644
--- a/sw/source/ui/dialog/regionsw.src
+++ b/sw/source/ui/dialog/regionsw.src
@@ -67,6 +67,13 @@
 #define FT_FILE_TEXT \
 Text [ en-US ] = ~File name ;\
 
+
+#define GB_HIDE_TEXT \
+Text [ en-US ] = Hide;\
+
+#define GB_OPTIONS_TEXT \
+Text [ en-US ] = Options ;\
+
 #define FL_PROTECT_TEXT \
 Text [ en-US ] = Write protection;\
 
diff --git a/toolkit/inc/toolkit/helper/property.hxx 
b/toolkit/inc/toolkit/helper/property.hxx
index a681640..dd4bdd1 100644
--- a/toolkit/inc/toolkit/helper/property.hxx
+++ 

[Libreoffice-commits] .: dbaccess/source sfx2/source

[Takeshi Abe]

 dbaccess/source/ui/inc/TablesSingleDlg.hxx |3 ---
 dbaccess/source/ui/inc/querycontroller.hxx |1 -
 sfx2/source/inc/workwin.hxx|2 --
 3 files changed, 6 deletions(-)

New commits:
commit 2aecedd79e1cd579e6e494138eb79f76c3a6c6cc
Author: Takeshi Abe t...@fixedpoint.jp
Date:   Tue Jul 17 21:25:28 2012 +0900

removed unused forward declarations of class

Change-Id: I9762e198825fbc697f4049a7da5755d72c14e481

diff --git a/dbaccess/source/ui/inc/TablesSingleDlg.hxx 
b/dbaccess/source/ui/inc/TablesSingleDlg.hxx
index de3542f..31de1f1 100644
--- a/dbaccess/source/ui/inc/TablesSingleDlg.hxx
+++ b/dbaccess/source/ui/inc/TablesSingleDlg.hxx
@@ -31,9 +31,6 @@ namespace com { namespace sun { namespace star {
 namespace beans {
 class XPropertySet;
 }
-namespace sdbc {
-class XConnection;
-}
 namespace lang {
 class XMultiServiceFactory;
 }
diff --git a/dbaccess/source/ui/inc/querycontroller.hxx 
b/dbaccess/source/ui/inc/querycontroller.hxx
index c0915dc..43f7753 100644
--- a/dbaccess/source/ui/inc/querycontroller.hxx
+++ b/dbaccess/source/ui/inc/querycontroller.hxx
@@ -50,7 +50,6 @@ namespace comphelper
 namespace dbaui
 {
 class OQueryContainerWindow;
-class OQueryTableWindow;
 
 class OQueryController;
 typedef ::comphelper::OPropertyContainer
OQueryController_PBase;
diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx
index b7f0441..4f17bac 100644
--- a/sfx2/source/inc/workwin.hxx
+++ b/sfx2/source/inc/workwin.hxx
@@ -39,8 +39,6 @@
 #include sfx2/ctrlitem.hxx
 #include sfx2/viewfrm.hxx
 
-class SfxInPlaceEnv_Impl;
-class SfxPlugInEnv_Impl;
 class SfxSplitWindow;
 class SfxWorkWindow;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: dbaccess/source

[Andras Timar]

 dbaccess/source/ui/dlg/directsql.cxx |   55 +--
 dbaccess/source/ui/dlg/directsql.hrc |3 +
 dbaccess/source/ui/dlg/directsql.src |   41 +++---
 dbaccess/source/ui/inc/directsql.hxx |8 +
 4 files changed, 95 insertions(+), 12 deletions(-)

New commits:
commit 10a7bcdf97c7634922626a2d858539a2f8bb0f7b
Author: Phil Hart html.wal...@gmail.com
Date:   Fri Jun 29 11:00:59 2012 +0800

fdo#51497 Show output from SELECT statements in Execute SQL dialog.

These changes allow the user to optionally display the output
from SQL SELECT statements in the Execute SQL Statement
dialog.

Change-Id: I9209a9e3b5ed100a88fa467078deb9f38c571d42

diff --git a/dbaccess/source/ui/dlg/directsql.cxx 
b/dbaccess/source/ui/dlg/directsql.cxx
index 9fbce80..6fdbc05 100644
--- a/dbaccess/source/ui/dlg/directsql.cxx
+++ b/dbaccess/source/ui/dlg/directsql.cxx
@@ -27,6 +27,7 @@
 #include osl/mutex.hxx
 #include tools/diagnose_ex.h
 #include rtl/strbuf.hxx
+#include com/sun/star/sdbc/XRow.hpp
 
 //
 namespace dbaui
@@ -82,6 +83,9 @@ DBG_NAME(DirectSQLDialog)
 ,m_pSQLHistory(new LargeEntryListBox(this, ModuleRes(LB_HISTORY)))
 ,m_aStatusFrame (this, ModuleRes(FL_STATUS))
 ,m_aStatus  (this, ModuleRes(ME_STATUS))
+,m_pShowOutput(new CheckBox(this, ModuleRes(CB_SHOWOUTPUT)))
+,m_aOutputFrame (this, ModuleRes(FL_OUTPUT))
+,m_aOutput  (this, ModuleRes(ME_OUTPUT))
 ,m_aButtonSeparator (this, ModuleRes(FL_BUTTONS))
 ,m_aHelp(this, ModuleRes(PB_HELP))
 ,m_aClose   (this, ModuleRes(PB_CLOSE))
@@ -214,15 +218,51 @@ DBG_NAME(DirectSQLDialog)
 ::osl::MutexGuard aGuard(m_aMutex);
 
 String sStatus;
+::com::sun::star::uno::Reference ::com::sun::star::sdbc::XResultSet  
xResultSet;
 try
 {
 // create a statement
 Reference XStatement  xStatement = 
m_xConnection-createStatement();
 OSL_ENSURE(xStatement.is(), 
DirectSQLDialog::implExecuteStatement: no statement returned by the 
connection!);
 
-// execute it
+// clear the output box
+m_aOutput.SetText(String::CreateFromAscii());
 if (xStatement.is())
-xStatement-execute(_rStatement);
+{
+if 
(::rtl::OUString(_rStatement).toAsciiUpperCase().compareTo(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SELECT)),6)==0
  m_pShowOutput-IsChecked())
+{
+// execute it as a query
+xResultSet = xStatement-executeQuery(_rStatement);
+// get a handle for the rows
+::com::sun::star::uno::Reference 
::com::sun::star::sdbc::XRow  xRow( xResultSet, 
::com::sun::star::uno::UNO_QUERY );
+// work through each of the rows
+while (xResultSet-next())
+{
+// initialise the output line for each row
+String out = 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM());
+// work along the columns until that are none left
+int i = 1;
+try
+{
+for (;;)
+{
+// be dumb, treat everything as a string
+out += xRow-getString(i) + 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(,));
+i++;
+}
+}
+// trap for when we fall off the end of the row
+catch (const SQLException e)
+{
+}
+// report the output
+addOutputText(::rtl::OUString(out));
+}
+} else {
+// execute it
+xStatement-execute(_rStatement);
+}
+}
 
 // successfull
 sStatus = String(ModuleRes(STR_COMMAND_EXECUTED_SUCCESSFULLY));
@@ -259,6 +299,17 @@ DBG_NAME(DirectSQLDialog)
 }
 
 //
+void DirectSQLDialog::addOutputText(const String _rMessage)
+{
+String sAppendMessage = _rMessage;
+sAppendMessage += String::CreateFromAscii(\n);
+
+String sCompleteMessage = m_aOutput.GetText();
+sCompleteMessage += sAppendMessage;
+m_aOutput.SetText(sCompleteMessage);
+}
+
+//
 void DirectSQLDialog::executeCurrent()
 {
 CHECK_INVARIANTS(DirectSQLDialog::executeCurrent);
diff 

[Libreoffice-commits] .: dbaccess/source

[Michael Stahl]

 dbaccess/source/core/api/KeySet.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 1ca20c89c0a1f1ca34de4939d6fef66fb68ceff9
Author: Michael Stahl mst...@redhat.com
Date:   Mon Jun 4 20:07:26 2012 +0200

KeySet.cxx: fix boost include; also...

... BOOST_STATIC_ASSERT_MSG was added in boost 1.46, while the internal
boost is still at version 1.44, so use BOOST_STATIC_ASSERT instead.

Change-Id: I14f8e48e31956b34a1a907cd2c4e454a5715889b

diff --git a/dbaccess/source/core/api/KeySet.cxx 
b/dbaccess/source/core/api/KeySet.cxx
index 5d863a8..3a114a9 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -48,6 +48,7 @@
 #include com/sun/star/sdbcx/KeyType.hpp
 #include connectivity/dbtools.hxx
 #include connectivity/dbexception.hxx
+#include boost/static_assert.hpp
 #include list
 #include algorithm
 #include string.h
@@ -1458,7 +1459,7 @@ sal_Bool OKeySet::fetchRow()
 connectivity::ORowVector ORowSetValue ::Vector::iterator aFRIter = 
aFullRow-get().begin();
 // Column 0 is reserved for the bookmark; unused here.
 ++aFRIter;
-BOOST_STATIC_ASSERT_MSG(sizeof(int) = sizeof(sal_Int32), At least a 
32 bit word expecteed);
+BOOST_STATIC_ASSERT(sizeof(int) = sizeof(sal_Int32)); // At least a 
32 bit word expected
 for (int i = 1; i = cc; ++i, ++aFRIter )
 {
 aFRIter-fill(i, m_xSetMetaData-getColumnType(i), m_xDriverRow);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: dbaccess/source xmerge/source

[Julien Nabet]

 dbaccess/source/core/api/KeySet.cxx
|2 +-
 
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenDecoder.java
 |2 +-
 
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenEncoder.java
 |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit dcd5136b80891e02a28939572f0f62e182f0fb76
Author: Julien Nabet serval2...@yahoo.fr
Date:   Mon May 28 14:50:51 2012 +0200

Fix typos

Change-Id: I39d54e3f635be6cb7a42fc9a0f7055619c885950

diff --git a/dbaccess/source/core/api/KeySet.cxx 
b/dbaccess/source/core/api/KeySet.cxx
index 26112cf..7399cb5 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -292,7 +292,7 @@ void OKeySet::construct(const Reference XResultSet 
_xDriverSet,const ::rtl::O
 
findTableColumnsMatching_throw(makeAny(m_xTable),m_sUpdateTableName,xMeta,xQueryColumns,m_pKeyColumnNames);
 
 // the first row is empty because it's now easier for us to distinguish 
when we are beforefirst or first
-// without extra varaible to be set
+// without extra variable to be set
 
m_aKeyMap.insert(OKeySetMatrix::value_type(0,OKeySetValue(NULL,::std::pairsal_Int32,ReferenceXRow
 (0,NULL;
 m_aKeyIter = m_aKeyMap.begin();
 
diff --git 
a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenDecoder.java
 
b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenDecoder.java
index e18c1d1..ee678ed 100644
--- 
a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenDecoder.java
+++ 
b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenDecoder.java
@@ -47,7 +47,7 @@ import 
org.openoffice.xmerge.converter.xml.sxc.pexcel.records.Workbook;
  * Operands Floating point's, Cell references (absolute and relative),
  *  cell rangesbr
  * Operators+,-,*,/,lt;,gt;.lt;=,gt;=,lt;gt;br
- * FunctionsAll pexcel fixed and varaible argument functions
+ * FunctionsAll pexcel fixed and variable argument functions
  *
  */
 public class TokenDecoder {
diff --git 
a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenEncoder.java
 
b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenEncoder.java
index 249e14a..ef9d0b1 100644
--- 
a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenEncoder.java
+++ 
b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenEncoder.java
@@ -44,7 +44,7 @@ import 
org.openoffice.xmerge.converter.xml.sxc.pexcel.records.DefinedName;
  * Operands Floating point's, Cell references (absolute and relative),
  *  cell ranges
  * Operators+,-,*,/,lt;,gt;.lt;=,gt;=,lt;gt;
- * FunctionsAll pexcel fixed and varaible argument functions
+ * FunctionsAll pexcel fixed and variable argument functions
  *
  */
 public class TokenEncoder {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: dbaccess/source

[Michael Meeks]

 dbaccess/source/core/misc/dsntypes.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3c648396567a2832c757d8d37432803a3f8e1818
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Thu Feb 9 22:20:12 2012 +0100

fdo#45580 crash on connect to existing database wizard

diff --git a/dbaccess/source/core/misc/dsntypes.cxx 
b/dbaccess/source/core/misc/dsntypes.cxx
index 76f339d..0989ab5 100644
--- a/dbaccess/source/core/misc/dsntypes.cxx
+++ b/dbaccess/source/core/misc/dsntypes.cxx
@@ -173,7 +173,7 @@ bool ODsnTypeCollection::isConnectionUrlRequired(const 
::rtl::OUString _sURL) c
 sOldPattern = *aIter;
 }
 }
-return sRet.GetChar(sRet.Len()-1) == '*';
+return sRet.Len()  0  sRet.GetChar(sRet.Len()-1) == '*';
 }
 // 
-
 String ODsnTypeCollection::getMediaType(const ::rtl::OUString _sURL) const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: dbaccess/source

[Julien Nabet]

 dbaccess/source/core/api/KeySet.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e34d9be24e72649a78639314145bd9aaabd7ea83
Author: Julien Nabet serval2...@yahoo.fr
Date:   Sun Apr 29 16:34:25 2012 +0200

Prefix ++/-- operators for non-primitive types

Change-Id: I827e539c65a7463709af6425d39ccaaedaa73a8d

diff --git a/dbaccess/source/core/api/KeySet.cxx 
b/dbaccess/source/core/api/KeySet.cxx
index fe3a2b1..309d6d8 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -1229,7 +1229,7 @@ sal_Bool OKeySet::absolute_checked( sal_Int32 
row,sal_Bool i_bFetchRow )
 fillAllRows();
 
 for(;row  0  m_aKeyIter != m_aKeyMap.begin();++row)
-m_aKeyIter--;
+--m_aKeyIter;
 }
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: dbaccess/source

[Philipp Weissenbacher]

 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

[Takeshi Abe]

 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

[Lionel Elie Mamane]

 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

[Lionel Elie Mamane]

 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

[Stephan Bergmann]

 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

[Michael Meeks]

 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

[Lionel Elie Mamane]

 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

[Stephan Bergmann]

 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

[Lionel Elie Mamane]

 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

[Lionel Elie Mamane]

 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

[Matteo Casalin]

 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

[Lionel Elie Mamane]

 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

[Julien Nabet]

 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

[Lionel Elie Mamane]

 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

[Lionel Elie Mamane]

 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

[Lionel Elie Mamane]

 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

[Ivan Timofeev]

 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

[Andras Timar]

 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

[Julien Nabet]

 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

[Julien Nabet]

 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

[Julien Nabet]

 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

[Tor Lillqvist]

 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

[Lior Kaplan]

 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

[August Sodora]

 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

[Bjoern Michaelsen]

 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

[Julien Nabet]

 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