subject:"\[Libreoffice\-commits\] .\: ucb\/source"

[Libreoffice-commits] .: ucb/source

2012-04-17 Thread Noel Power

 ucb/source/ucp/file/shell.cxx |   77 +-
 1 file changed, 40 insertions(+), 37 deletions(-)

New commits:
commit 45b57a9dfb5df8b9c4a1974cb6e848d4f3b57ea3
Author: Noel Power noel.po...@novell.com
Date:   Tue Apr 17 15:50:35 2012 +0100

prevent getFileURL()  getLinkTargetURL() asserting for broken links

diff --git a/ucb/source/ucp/file/shell.cxx b/ucb/source/ucp/file/shell.cxx
index 1cb03b3..1907d16 100644
--- a/ucb/source/ucp/file/shell.cxx
+++ b/ucb/source/ucp/file/shell.cxx
@@ -2491,54 +2491,57 @@ shell::getv(
  osl_FileStatus_Mask_FileURL |
  osl_FileStatus_Mask_Type |
  osl_FileStatus_Mask_LinkTargetURL );
-aDirItem.getFileStatus( aFileStatus );
-aUnqPath = aFileStatus.getFileURL();
 
-// If the directory item type is a link retrieve the type of the target
-
-if ( aFileStatus.getFileType() == osl::FileStatus::Link )
+osl::FileBase::RC aRes = aDirItem.getFileStatus( aFileStatus );
+if ( aRes == osl::FileBase::E_None )
 {
-// Assume failure
-aIsRegular = false;
-osl::FileBase::RC result = osl::FileBase::E_INVAL;
-osl::DirectoryItem aTargetItem;
-osl::DirectoryItem::get( aFileStatus.getLinkTargetURL(), aTargetItem );
-if ( aTargetItem.is() )
+aUnqPath = aFileStatus.getFileURL();
+
+// If the directory item type is a link retrieve the type of the target
+
+if ( aFileStatus.getFileType() == osl::FileStatus::Link )
 {
-osl::FileStatus aTargetStatus( osl_FileStatus_Mask_Type );
+// Assume failure
+aIsRegular = false;
+osl::FileBase::RC result = osl::FileBase::E_INVAL;
+osl::DirectoryItem aTargetItem;
+osl::DirectoryItem::get( aFileStatus.getLinkTargetURL(), 
aTargetItem );
+if ( aTargetItem.is() )
+{
+osl::FileStatus aTargetStatus( osl_FileStatus_Mask_Type );
 
-if ( osl::FileBase::E_None ==
- ( result = aTargetItem.getFileStatus( aTargetStatus ) ) )
-aIsRegular =
-aTargetStatus.getFileType() == osl::FileStatus::Regular;
+if ( osl::FileBase::E_None ==
+ ( result = aTargetItem.getFileStatus( aTargetStatus ) ) )
+aIsRegular =
+aTargetStatus.getFileType() == 
osl::FileStatus::Regular;
+}
 }
-}
-else
-aIsRegular = aFileStatus.getFileType() == osl::FileStatus::Regular;
+else
+aIsRegular = aFileStatus.getFileType() == osl::FileStatus::Regular;
 
-registerNotifier( aUnqPath,pNotifier );
-insertDefaultProperties( aUnqPath );
-{
-osl::MutexGuard aGuard( m_aMutex );
+registerNotifier( aUnqPath,pNotifier );
+insertDefaultProperties( aUnqPath );
+{
+osl::MutexGuard aGuard( m_aMutex );
 
-shell::ContentMap::iterator it = m_aContent.find( aUnqPath );
-commit( it,aFileStatus );
+shell::ContentMap::iterator it = m_aContent.find( aUnqPath );
+commit( it,aFileStatus );
 
-shell::PropertySet::iterator it1;
-PropertySet propset = *(it-second.properties);
+shell::PropertySet::iterator it1;
+PropertySet propset = *(it-second.properties);
 
-for( sal_Int32 i = 0; i  seq.getLength(); ++i )
-{
-MyProperty readProp( properties[i].Name );
-it1 = propset.find( readProp );
-if( it1 == propset.end() )
-seq[i] = uno::Any();
-else
-seq[i] = it1-getValue();
+for( sal_Int32 i = 0; i  seq.getLength(); ++i )
+{
+MyProperty readProp( properties[i].Name );
+it1 = propset.find( readProp );
+if( it1 == propset.end() )
+seq[i] = uno::Any();
+else
+seq[i] = it1-getValue();
+}
 }
+deregisterNotifier( aUnqPath,pNotifier );
 }
-deregisterNotifier( aUnqPath,pNotifier );
-
 XRow_impl* p = new XRow_impl( this,seq );
 return uno::Reference sdbc::XRow ( p );
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: ucb/source

2012-03-21 Thread David Tardon

 ucb/source/ucp/gio/gio_provider.cxx   |6 ++
 ucb/source/ucp/odma/odma_provider.cxx |5 ++---
 2 files changed, 4 insertions(+), 7 deletions(-)

New commits:
commit f7d571d2eefea079be3d89f3253ed90cbd9fa07f
Author: David Tardon dtar...@redhat.com
Date:   Wed Mar 21 07:37:51 2012 +0100

this requires string literals now

diff --git a/ucb/source/ucp/gio/gio_provider.cxx 
b/ucb/source/ucp/gio/gio_provider.cxx
index 62e8d98..14bdbd0 100644
--- a/ucb/source/ucp/gio/gio_provider.cxx
+++ b/ucb/source/ucp/gio/gio_provider.cxx
@@ -94,10 +94,8 @@ XTYPEPROVIDER_IMPL_3( ContentProvider,
   com::sun::star::ucb::XContentProvider );
 
 XSERVICEINFO_IMPL_1( ContentProvider,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-   com.sun.star.comp.GIOContentProvider )),
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-   com.sun.star.ucb.GIOContentProvider )) );
+   com.sun.star.comp.GIOContentProvider,
+   com.sun.star.ucb.GIOContentProvider );
 
 ONE_INSTANCE_SERVICE_FACTORY_IMPL( ContentProvider );
 
diff --git a/ucb/source/ucp/odma/odma_provider.cxx 
b/ucb/source/ucp/odma/odma_provider.cxx
index da09d11..702851f 100644
--- a/ucb/source/ucp/odma/odma_provider.cxx
+++ b/ucb/source/ucp/odma/odma_provider.cxx
@@ -149,9 +149,8 @@ XTYPEPROVIDER_IMPL_3( ContentProvider,
 // @@@ Adjust implementation name. Keep the prefix com.sun.star.comp.!
 // @@@ Adjust service name.
 XSERVICEINFO_IMPL_1( ContentProvider,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-com.sun.star.comp.odma.ContentProvider )),
- 
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ODMA_CONTENT_PROVIDER_SERVICE_NAME) ) 
);
+com.sun.star.comp.odma.ContentProvider,
+ ODMA_CONTENT_PROVIDER_SERVICE_NAME );
 
 //=
 //
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: ucb/source

2012-03-20 Thread Lubos Lunak

 ucb/source/ucp/gvfs/gvfs_provider.cxx |6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 186ab8e77bd7c7a42ffcca6fa7f8e1819ad04b7d
Author: LuboÅ¡ LuÅÃ¡k l.lu...@suse.cz
Date:   Wed Mar 21 06:30:24 2012 +0100

fix after recent XSERVICEINFO_IMPL_1 change

diff --git a/ucb/source/ucp/gvfs/gvfs_provider.cxx 
b/ucb/source/ucp/gvfs/gvfs_provider.cxx
index 7552a20..c34cbe7 100644
--- a/ucb/source/ucp/gvfs/gvfs_provider.cxx
+++ b/ucb/source/ucp/gvfs/gvfs_provider.cxx
@@ -84,10 +84,8 @@ XTYPEPROVIDER_IMPL_3( ContentProvider,
 //=
 
 XSERVICEINFO_IMPL_1( ContentProvider,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-com.sun.star.comp.GnomeVFSContentProvider )),
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-com.sun.star.ucb.GnomeVFSContentProvider )) );
+com.sun.star.comp.GnomeVFSContentProvider,
+com.sun.star.ucb.GnomeVFSContentProvider );
 //=
 //
 // Service factory implementation.
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: ucb/source

2012-02-27 Thread Caolán McNamara

 ucb/source/ucp/webdav/NeonLockStore.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c58882fda80b63baac3360001b0fdf251d96e0eb
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Feb 27 11:03:02 2012 +

fix msvc2005 build

diff --git a/ucb/source/ucp/webdav/NeonLockStore.cxx 
b/ucb/source/ucp/webdav/NeonLockStore.cxx
index 3c84ad3..77e6258 100644
--- a/ucb/source/ucp/webdav/NeonLockStore.cxx
+++ b/ucb/source/ucp/webdav/NeonLockStore.cxx
@@ -80,7 +80,7 @@ void TickerThread::execute()
 TimeValue aTV;
 aTV.Seconds = 0;
 aTV.Nanosec = 10 / nNth;
-osl::Thread::wait( aTV );
+salhelper::Thread::wait( aTV );
 }
 
 OSL_TRACE( TickerThread: stop. );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: ucb/source xmlhelp/source

2012-02-23 Thread Thomas Arnhold

 ucb/source/ucp/file/filglob.cxx   |3 ---
 ucb/source/ucp/file/shell.cxx |4 
 xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx  |4 
 xmlhelp/source/cxxhelp/provider/databases.hxx |6 --
 xmlhelp/source/cxxhelp/provider/resultsetbase.hxx |3 ---
 xmlhelp/source/treeview/tvread.hxx|3 ---
 6 files changed, 23 deletions(-)

New commits:
commit d8fc1770099c5bd96ac518561f10840a7dfd62d1
Author: Thomas Arnhold tho...@arnhold.org
Date:   Thu Feb 23 12:22:39 2012 +0100

remove all other deprecated header guards

diff --git a/ucb/source/ucp/file/filglob.cxx b/ucb/source/ucp/file/filglob.cxx
index c55cc84..d436fa0 100644
--- a/ucb/source/ucp/file/filglob.cxx
+++ b/ucb/source/ucp/file/filglob.cxx
@@ -32,10 +32,7 @@
 #include shell.hxx
 #include bc.hxx
 #include osl/file.hxx
-#ifndef INCLUDED_STL_VECTOR
 #include vector
-#define INCLUDED_STL_VECTOR
-#endif
 #include ucbhelper/cancelcommandexecution.hxx
 #include com/sun/star/ucb/CommandAbortedException.hpp
 #include com/sun/star/ucb/UnsupportedCommandException.hpp
diff --git a/ucb/source/ucp/file/shell.cxx b/ucb/source/ucp/file/shell.cxx
index a54d4dd..725820d 100644
--- a/ucb/source/ucp/file/shell.cxx
+++ b/ucb/source/ucp/file/shell.cxx
@@ -26,11 +26,7 @@
  *
  /
 
-#ifndef INCLUDED_STL_STACK
 #include stack
-#define INCLUDED_STL_STACK
-#endif
-
 #include osl/diagnose.h
 #include rtl/uri.hxx
 #include rtl/ustrbuf.hxx
diff --git a/xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx 
b/xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx
index aaa7244..5f28e8e 100644
--- a/xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx
+++ b/xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx
@@ -28,14 +28,10 @@
 #ifndef _XMLSEARCH_UTIL_DECOMPRESSOR_HXX_
 #define _XMLSEARCH_UTIL_DECOMPRESSOR_HXX_
 
-#ifndef INCLUDED_STL_VECTOR
 #include vector
-#define INCLUDED_STL_VECTOR
-#endif
 #include excep/XmlSearchExceptions.hxx
 #include util/RandomAccessStream.hxx
 
-
 namespace xmlsearch {
 
 namespace util {
diff --git a/xmlhelp/source/cxxhelp/provider/databases.hxx 
b/xmlhelp/source/cxxhelp/provider/databases.hxx
index d9c333f..028fad1 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.hxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.hxx
@@ -29,14 +29,8 @@
 #ifndef _DATABASES_HXX_
 #define _DATABASES_HXX_
 
-#ifndef INCLUDED_STL_SET
 #include set
-#define INCLUDED_STL_SET
-#endif
-#ifndef INCLUDED_STL_VECTOR
 #include vector
-#define INCLUDED_STL_VECTOR
-#endif
 #include boost/unordered_map.hpp
 #include boost/unordered_set.hpp
 #include osl/mutex.hxx
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx 
b/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx
index c7cf7f6..98772c1 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx
@@ -28,10 +28,7 @@
 #ifndef _RESULTSETBASE_HXX
 #define _RESULTSETBASE_HXX
 
-#ifndef INCLUDED_STL_VECTOR
 #include vector
-#define INCLUDED_STL_VECTOR
-#endif
 #include cppuhelper/weak.hxx
 #include cppuhelper/interfacecontainer.hxx
 #include com/sun/star/lang/XComponent.hpp
diff --git a/xmlhelp/source/treeview/tvread.hxx 
b/xmlhelp/source/treeview/tvread.hxx
index 847e5fd..a6bd751 100644
--- a/xmlhelp/source/treeview/tvread.hxx
+++ b/xmlhelp/source/treeview/tvread.hxx
@@ -29,10 +29,7 @@
 #ifndef _TREEVIEW_TVREAD_HXX_
 #define _TREEVIEW_TVREAD_HXX_
 
-#ifndef INCLUDED_STL_VECTOR
 #include vector
-#define INCLUDED_STL_VECTOR
-#endif
 #include rtl/ref.hxx
 #include rtl/ustring.hxx
 #include ucbhelper/macros.hxx
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: ucb/source

2012-01-30 Thread Julien Nabet

 ucb/source/ucp/gio/gio_datasupplier.cxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 400f715ad7ebecb9c657fed4ade40bd5135efde2
Author: Julien Nabet serval2...@yahoo.fr
Date:   Mon Jan 30 22:05:13 2012 +0100

Don't repeat a return !

diff --git a/ucb/source/ucp/gio/gio_datasupplier.cxx 
b/ucb/source/ucp/gio/gio_datasupplier.cxx
index 252cbbf..57e4300 100644
--- a/ucb/source/ucp/gio/gio_datasupplier.cxx
+++ b/ucb/source/ucp/gio/gio_datasupplier.cxx
@@ -138,8 +138,6 @@ DataSupplier::~DataSupplier()
 
 maResults[ nIndex ]-aId = aId;
 return aId;
-
-return aId;
 }
 
 return ::rtl::OUString();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: ucb/source

2012-01-16 Thread Julien Nabet

 ucb/source/ucp/webdav/LockEntrySequence.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9dfa70c22d4f3ad480ffb98c0c8e1ea40f03dc18
Author: Julien Nabet serval2...@yahoo.fr
Date:   Mon Jan 16 20:45:44 2012 +0100

Fix Same expression on both sides of '||'

diff --git a/ucb/source/ucp/webdav/LockEntrySequence.cxx 
b/ucb/source/ucp/webdav/LockEntrySequence.cxx
index 49e5547..075af01 100644
--- a/ucb/source/ucp/webdav/LockEntrySequence.cxx
+++ b/ucb/source/ucp/webdav/LockEntrySequence.cxx
@@ -171,7 +171,7 @@ extern C int LockEntrySequence_endelement_callback(
 break;
 
 case STATE_LOCKENTRY:
-if ( !pCtx-hasType || !pCtx-hasType )
+if ( !pCtx-hasType || !pCtx-hasScope )
 return 1; // abort
 break;
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: ucb/source

2011-10-08 Thread Fridrich Strba

 ucb/source/ucp/cmis/makefile.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 5f981343a5fcd2c66bd874422ecb5e6918f1d11f
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Sat Oct 8 15:13:43 2011 +0200

When building with system libcmis, look for headers where they are

diff --git a/ucb/source/ucp/cmis/makefile.mk b/ucb/source/ucp/cmis/makefile.mk
index ebaf703..4f43c29 100644
--- a/ucb/source/ucp/cmis/makefile.mk
+++ b/ucb/source/ucp/cmis/makefile.mk
@@ -41,6 +41,7 @@ DLLPRE =
 
 .IF $(SYSTEM_LIBCMIS)==YES
 CMISLIB=$(LIBCMIS_LIBS)
+INCPRE+=$(LIBCMIS_CFLAGS)
 .ELSE
 CMISLIB=-lcmislib
 .ENDIF
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: ucb/source

2011-10-05 Thread Jan Holesovsky

 ucb/source/ucp/odma/odma_datasupplier.cxx |4 ++--
 ucb/source/ucp/odma/odma_provider.cxx |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit a8f868af45d4d2ed24dec2bc20bed4b9a78f93c4
Author: Jan Holesovsky ke...@suse.cz
Date:   Wed Oct 5 14:44:14 2011 +0200

Fix MinGW build.

diff --git a/ucb/source/ucp/odma/odma_datasupplier.cxx 
b/ucb/source/ucp/odma/odma_datasupplier.cxx
index 0003d93..50a1c8b 100644
--- a/ucb/source/ucp/odma/odma_datasupplier.cxx
+++ b/ucb/source/ucp/odma/odma_datasupplier.cxx
@@ -281,10 +281,10 @@ sal_Bool DataSupplier::getResult( sal_uInt32 nIndex )
 ODMSTATUS odm = NODMGetDMS(ODMA_ODMA_REGNAME, lpszDMSList);
 lpszDMSList[strlen(lpszDMSList)+1] = '\0';
 
-::rtl::OString sQuery(SELECT ODM_DOCID_LATEST, ODM_NAME);
+const char sQuery[] = SELECT ODM_DOCID_LATEST, ODM_NAME;
 
 DWORD dwFlags = ODM_SPECIFIC;
-odm = NODMQueryExecute(ContentProvider::getHandle(), sQuery,dwFlags, 
lpszDMSList, pQueryId );
+odm = NODMQueryExecute(ContentProvider::getHandle(), sQuery, dwFlags, 
lpszDMSList, pQueryId );
 if(odm != ODM_SUCCESS) {
 delete[] pQueryId;
 delete[] lpszDMSList;
diff --git a/ucb/source/ucp/odma/odma_provider.cxx 
b/ucb/source/ucp/odma/odma_provider.cxx
index 20da599..7ad0a14 100644
--- a/ucb/source/ucp/odma/odma_provider.cxx
+++ b/ucb/source/ucp/odma/odma_provider.cxx
@@ -444,7 +444,7 @@ void ContentProvider::append(const 
::rtl::ReferenceContentProperties _rProp)
 sQuery += ';
 
 DWORD dwFlags = ODM_SPECIFIC;
-odm = NODMQueryExecute(getHandle(), sQuery,dwFlags, lpszDMSList, 
pQueryId );
+odm = NODMQueryExecute(getHandle(), sQuery.getStr(), dwFlags, 
lpszDMSList, pQueryId );
 if(odm == ODM_SUCCESS)
 {
 sal_uInt16 nCount   = 10;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: ucb/source

2011-10-04 Thread Tor Lillqvist

 ucb/source/cacher/cachedcontentresultset.cxx  |2 +-
 ucb/source/cacher/contentresultsetwrapper.cxx |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 73a038df3769f5c6776dcd8f4e36d6d0165b8554
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Tue Oct 4 17:19:36 2011 +0300

WaE: unreferenced local variable

diff --git a/ucb/source/cacher/cachedcontentresultset.cxx 
b/ucb/source/cacher/cachedcontentresultset.cxx
index 6a296c4..c26eed6 100644
--- a/ucb/source/cacher/cachedcontentresultset.cxx
+++ b/ucb/source/cacher/cachedcontentresultset.cxx
@@ -792,7 +792,7 @@ sal_Bool SAL_CALL CachedContentResultSet
 return bValid;
 }
 }
-catch (const SQLException rEx)
+catch (const SQLException)
 {
 if( !bAfterLastApplied  !bAfterLast  nRow  nLastAppliedPos  
impl_isForwardOnly() )
 {
diff --git a/ucb/source/cacher/contentresultsetwrapper.cxx 
b/ucb/source/cacher/contentresultsetwrapper.cxx
index fbed827..326ade7 100644
--- a/ucb/source/cacher/contentresultsetwrapper.cxx
+++ b/ucb/source/cacher/contentresultsetwrapper.cxx
@@ -613,7 +613,7 @@ void SAL_CALL ContentResultSetWrapper
 m_xPropertySetOrigin-addPropertyChangeListener(
 OUString(), static_cast XPropertyChangeListener * ( 
m_pMyListenerImpl ) );
 }
-catch( Exception rEx )
+catch( Exception )
 {
 m_pPropertyChangeListeners-removeInterface( aPropertyName, 
xListener );
 throw;
@@ -664,7 +664,7 @@ void SAL_CALL ContentResultSetWrapper
 m_xPropertySetOrigin-addVetoableChangeListener(
 OUString(), static_cast XVetoableChangeListener * ( 
m_pMyListenerImpl ) );
 }
-catch( Exception rEx )
+catch( Exception )
 {
 m_pVetoableChangeListeners-removeInterface( rPropertyName, 
xListener );
 throw;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: ucb/source

2011-09-26 Thread Tor Lillqvist

 ucb/source/ucp/webdav/NeonUri.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit dd5f1c23331a8dbb4db35472be0a3cc47294feca
Author: Tor Lillqvist t...@iki.fi
Date:   Mon Sep 26 16:03:37 2011 +0300

Do as the comment says: use the pragma for gcc = 4.2.1

diff --git a/ucb/source/ucp/webdav/NeonUri.cxx 
b/ucb/source/ucp/webdav/NeonUri.cxx
index fd88795..5eb0f25 100644
--- a/ucb/source/ucp/webdav/NeonUri.cxx
+++ b/ucb/source/ucp/webdav/NeonUri.cxx
@@ -52,7 +52,7 @@ using namespace webdav_ucp;
  + __GNUC_MINOR__ * 100 \
  + __GNUC_PATCHLEVEL__)
 /* Diagnostics pragma was introduced with gcc-4.2.1 */
-#if GCC_VERSION  40201
+#if GCC_VERSION = 40201
 #pragma GCC diagnostic ignored -Wwrite-strings
 #endif
 #endif
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: ucb/source

[Libreoffice-commits] .: ucb/source

[Libreoffice-commits] .: ucb/source

[Libreoffice-commits] .: ucb/source

[Libreoffice-commits] .: ucb/source xmlhelp/source

[Libreoffice-commits] .: ucb/source

[Libreoffice-commits] .: ucb/source

[Libreoffice-commits] .: ucb/source

[Libreoffice-commits] .: ucb/source

[Libreoffice-commits] .: ucb/source

[Libreoffice-commits] .: ucb/source

11 matches

Site Navigation

Mail list logo

Footer information