[Libreoffice-commits] .: 3 commits - rhino/makefile.mk rhino/rhino1_5R5-find_swing.patch ucb/source vcl/unx
Caolán McNamara
caolan at kemper.freedesktop.org
Fri Nov 11 08:33:31 PST 2011
rhino/makefile.mk | 4 ++--
rhino/rhino1_5R5-find_swing.patch | 5 ++---
ucb/source/ucp/cmis/cmis_provider.cxx | 2 +-
ucb/source/ucp/gio/gio_content.cxx | 14 +++++++-------
ucb/source/ucp/gio/gio_provider.cxx | 2 +-
ucb/source/ucp/gvfs/gvfs_content.cxx | 32 ++++++++++++++++----------------
ucb/source/ucp/gvfs/gvfs_directory.cxx | 2 +-
ucb/source/ucp/gvfs/gvfs_provider.cxx | 2 +-
vcl/unx/generic/gdi/salgdi3.cxx | 22 +++++++++++++++++-----
9 files changed, 48 insertions(+), 37 deletions(-)
New commits:
commit 16e959669c99432c45316cd1103512a63a11860f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Nov 11 16:32:10 2011 +0000
I don't need to hear about your every little titchy success
diff --git a/ucb/source/ucp/cmis/cmis_provider.cxx b/ucb/source/ucp/cmis/cmis_provider.cxx
index 411fef5..f733cf0 100644
--- a/ucb/source/ucp/cmis/cmis_provider.cxx
+++ b/ucb/source/ucp/cmis/cmis_provider.cxx
@@ -45,7 +45,7 @@ ContentProvider::queryContent(
throw( com::sun::star::ucb::IllegalIdentifierException,
uno::RuntimeException )
{
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
fprintf(stderr, "QueryContent: '%s'\n",
rtl::OUStringToOString
(Identifier->getContentIdentifier(), RTL_TEXTENCODING_UTF8).getStr());
diff --git a/ucb/source/ucp/gio/gio_content.cxx b/ucb/source/ucp/gio/gio_content.cxx
index fab393e..4303c59 100644
--- a/ucb/source/ucp/gio/gio_content.cxx
+++ b/ucb/source/ucp/gio/gio_content.cxx
@@ -98,7 +98,7 @@ Content::Content(
: ContentImplHelper( rxSMgr, pProvider, Identifier ),
m_pProvider( pProvider ), mpFile (NULL), mpInfo( NULL ), mbTransient(false)
{
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
fprintf(stderr, "New Content ('%s')\n", rtl::OUStringToOString(m_xIdentifier->getContentIdentifier(), RTL_TEXTENCODING_UTF8).getStr());
#endif
}
@@ -112,7 +112,7 @@ Content::Content(
: ContentImplHelper( rxSMgr, pProvider, Identifier ),
m_pProvider( pProvider ), mpFile (NULL), mpInfo( NULL ), mbTransient(true)
{
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
fprintf(stderr, "Create Content ('%s')\n", rtl::OUStringToOString(m_xIdentifier->getContentIdentifier(), RTL_TEXTENCODING_UTF8).getStr());
#endif
mpInfo = g_file_info_new();
@@ -658,7 +658,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
for ( sal_Int32 n = 0; n < nCount; ++n )
{
const beans::PropertyValue& rValue = pValues[ n ];
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
g_warning("Set prop '%s'", rtl::OUStringToOString(rValue.Name, RTL_TEXTENCODING_UTF8).getStr());
#endif
if ( rValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ContentType" ) ) ||
@@ -696,7 +696,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
if (!newName || !oldName || strcmp(newName, oldName))
{
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
g_warning ("Set new name to '%s'", newName);
#endif
@@ -910,7 +910,7 @@ uno::Any SAL_CALL Content::execute(
ucb::CommandAbortedException,
uno::RuntimeException )
{
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
fprintf(stderr, "Content::execute %s\n", rtl::OUStringToOString(aCommand.Name, RTL_TEXTENCODING_UTF8).getStr());
#endif
uno::Any aRet;
@@ -1029,7 +1029,7 @@ void Content::insert(const uno::Reference< io::XInputStream > &xInputStream,
g_file_info_has_attribute(pInfo, G_FILE_ATTRIBUTE_STANDARD_TYPE) &&
g_file_info_get_file_type(pInfo) == G_FILE_TYPE_DIRECTORY )
{
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
g_warning ("Make directory");
#endif
if( !g_file_make_directory( getGFile(), NULL, &pError))
@@ -1155,7 +1155,7 @@ uno::Reference< ucb::XContent >
return uno::Reference< ucb::XContent >();
}
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
g_warning( "createNewContent (%d)", (int) create_document );
#endif
diff --git a/ucb/source/ucp/gio/gio_provider.cxx b/ucb/source/ucp/gio/gio_provider.cxx
index d8a6382..62e8d98 100644
--- a/ucb/source/ucp/gio/gio_provider.cxx
+++ b/ucb/source/ucp/gio/gio_provider.cxx
@@ -45,7 +45,7 @@ ContentProvider::queryContent(
throw( com::sun::star::ucb::IllegalIdentifierException,
uno::RuntimeException )
{
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
fprintf(stderr, "QueryContent: '%s'",
rtl::OUStringToOString
(Identifier->getContentIdentifier(), RTL_TEXTENCODING_UTF8).getStr());
diff --git a/ucb/source/ucp/gvfs/gvfs_content.cxx b/ucb/source/ucp/gvfs/gvfs_content.cxx
index e787f37..7a9e02e 100644
--- a/ucb/source/ucp/gvfs/gvfs_content.cxx
+++ b/ucb/source/ucp/gvfs/gvfs_content.cxx
@@ -127,7 +127,7 @@ Content::Content(
m_bTransient( sal_False )
{
CLEAR_INFO (&m_info);
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
g_warning ("New Content ('%s')", getURI());
#endif
}
@@ -144,7 +144,7 @@ Content::Content(
{
CLEAR_INFO (&m_info);
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
g_warning ("New Transient content ('%s') (%d)", getURI(), IsFolder);
#endif
// m_info.name = FIXME: set name ?
@@ -298,7 +298,7 @@ uno::Any SAL_CALL Content::execute(
{
uno::Any aRet;
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
{
uno::Reference< task::XInteractionHandler > xIH;
@@ -510,7 +510,7 @@ Content::createNewContent( const ucb::ContentInfo& Info )
return uno::Reference< ucb::XContent >();
}
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
g_warning( "createNewContent (%d)", (int) create_document );
#endif
@@ -558,7 +558,7 @@ rtl::OUString Content::getParentURL()
if ( nPos1 != -1 )
aParentURL = rtl::OUString( aURL.copy( 0, nPos + 1 ) );
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
g_warning ("getParentURL '%s' -> '%s'",
getURI(), rtl::OUStringToOString
( aParentURL, RTL_TEXTENCODING_UTF8 ).getStr() );
@@ -694,7 +694,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
xRow->appendVoid( rProp );
}
}
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
g_warning ("getPropertyValues on '%s' %d properties returned (of %d)",
getURI(), 0, (int)nProps);
#endif
@@ -795,7 +795,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
for ( sal_Int32 n = 0; n < nCount; ++n ) {
const beans::PropertyValue& rValue = pValues[ n ];
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
g_warning( "Set prop '%s'", OUStringToGnome( rValue.Name ) );
#endif
if ( rValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ContentType" ) ) ||
@@ -816,7 +816,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
char *newName = OUStringToGnome( aNewTitle );
if( !newName || !m_info.name || strcmp( newName, m_info.name ) ) {
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
g_warning ("Set new name to '%s'", newName);
#endif
@@ -936,7 +936,7 @@ void Content::insert(
{
osl::ClearableGuard< osl::Mutex > aGuard( m_aMutex );
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
g_warning( "Insert '%s' (%d) (0x%x:%d)", getURI(), bReplaceExisting,
m_info.valid_fields, m_info.type );
#endif
@@ -961,7 +961,7 @@ void Content::insert(
GNOME_VFS_PERM_GROUP_READ |
GNOME_VFS_PERM_OTHER_READ );
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
g_warning ("Make directory");
#endif
result = gnome_vfs_make_directory( aURI.getStr(), perm );
@@ -1073,7 +1073,7 @@ sal_Bool Content::exchangeIdentity(
uno::Reference< ucb::XContent > xThis = this;
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
g_warning( "exchangeIdentity from '%s' to '%s'",
getURI(), OUStringToGnome( xNewId->getContentIdentifier() ) );
#endif
@@ -1144,7 +1144,7 @@ Content::getInfo( const uno::Reference< ucb::XCommandEnvironment >& xEnv )
gnome_vfs_file_info_clear( &m_info );
} else
result = GNOME_VFS_OK;
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
g_warning( "getInfo on '%s' returns '%s' (%d) (0x%x)",
getURI(), gnome_vfs_result_to_string( result ),
result, m_info.valid_fields );
@@ -1168,7 +1168,7 @@ uno::Any Content::mapVFSException( const GnomeVFSResult result, sal_Bool bWrite
rtl::OUString message;
uno::Sequence< uno::Any > aArgs( 1 );
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
g_warning ("Map VFS exception '%s' (%d)",
gnome_vfs_result_to_string( result ), result );
#endif
@@ -1556,7 +1556,7 @@ extern "C" {
{
task::XInteractionHandler *xIH;
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
g_warning ("Full authentication callback (%p) ...", callback_data);
#endif
@@ -1572,7 +1572,7 @@ extern "C" {
g_return_if_fail (sizeof (GnomeVFSModuleCallbackFullAuthenticationIn) == in_size &&
sizeof (GnomeVFSModuleCallbackFullAuthenticationOut) == out_size);
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
# define NNIL(x) (x?x:"<Null>")
g_warning (" InComing data 0x%x uri '%s' prot '%s' server '%s' object '%s' "
"port %d auth_t '%s' user '%s' domain '%s' "
@@ -1668,7 +1668,7 @@ extern "C" {
out->password = OUStringToGnome( aPassword );
out->save_password = xSupp->getRememberPasswordMode();
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
g_warning ("Got valid user/domain/password '%s' '%s' '%s', %s password",
out->username, out->domain, out->password,
out->save_password ? "save" : "don't save");
diff --git a/ucb/source/ucp/gvfs/gvfs_directory.cxx b/ucb/source/ucp/gvfs/gvfs_directory.cxx
index d0a403d..55be807 100644
--- a/ucb/source/ucp/gvfs/gvfs_directory.cxx
+++ b/ucb/source/ucp/gvfs/gvfs_directory.cxx
@@ -389,7 +389,7 @@ sal_Bool DataSupplier::getData()
gnome_vfs_file_info_unref (fileInfo);
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
g_warning ("Got %d directory entries", result);
#endif
diff --git a/ucb/source/ucp/gvfs/gvfs_provider.cxx b/ucb/source/ucp/gvfs/gvfs_provider.cxx
index 9098a95..6a1dc78 100644
--- a/ucb/source/ucp/gvfs/gvfs_provider.cxx
+++ b/ucb/source/ucp/gvfs/gvfs_provider.cxx
@@ -111,7 +111,7 @@ ContentProvider::queryContent(
throw( com::sun::star::ucb::IllegalIdentifierException,
uno::RuntimeException )
{
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
g_warning ("QueryContent: '%s'",
rtl::OUStringToOString (Identifier->getContentIdentifier(),
RTL_TEXTENCODING_UTF8).getStr() );
commit 75d3b1cbfd0fa54a944ce47c455b12909081bdd3
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Nov 11 16:00:14 2011 +0000
allow capability to render text with no XRenderPictFormat
diff --git a/vcl/unx/generic/gdi/salgdi3.cxx b/vcl/unx/generic/gdi/salgdi3.cxx
index 9d2cb4b..66a316b 100644
--- a/vcl/unx/generic/gdi/salgdi3.cxx
+++ b/vcl/unx/generic/gdi/salgdi3.cxx
@@ -84,6 +84,7 @@
#include <cairo.h>
#include <cairo-ft.h>
+#include <cairo-xlib.h>
#include <cairo-xlib-xrender.h>
struct BOX
@@ -321,14 +322,25 @@ void X11SalGraphics::DrawServerFontLayout( const ServerFontLayout& rLayout )
// find a XRenderPictFormat compatible with the Drawable
XRenderPictFormat* pVisualFormat = GetXRenderFormat();
- DBG_ASSERT( pVisualFormat!=NULL, "no matching XRenderPictFormat for text" );
- if( !pVisualFormat )
- return;
Display* pDisplay = GetXDisplay();
- cairo_surface_t *surface = cairo_xlib_surface_create_with_xrender_format (pDisplay,
- hDrawable_, ScreenOfDisplay(pDisplay, m_nScreen), pVisualFormat, SAL_MAX_INT16, SAL_MAX_INT16);
+ cairo_surface_t *surface;
+
+ if (pVisualFormat)
+ {
+ surface = cairo_xlib_surface_create_with_xrender_format (pDisplay, hDrawable_,
+ ScreenOfDisplay(pDisplay, m_nScreen), pVisualFormat, SAL_MAX_INT16, SAL_MAX_INT16);
+ }
+ else
+ {
+ surface = cairo_xlib_surface_create(pDisplay, hDrawable_,
+ GetVisual().visual, SAL_MAX_INT16, SAL_MAX_INT16);
+ }
+
+ DBG_ASSERT( surface!=NULL, "no cairo surface for text" );
+ if( !surface )
+ return;
/*
* It might be ideal to cache surface and cairo context between calls and
commit 889b6a6e00994099327b9b874c93add6f88baa0a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Nov 11 15:45:58 2011 +0000
Related: rhbz#753201 fedora ant+java-1.5.0-gcj won't resolve env variables
diff --git a/rhino/makefile.mk b/rhino/makefile.mk
index 91117d9..577d030 100644
--- a/rhino/makefile.mk
+++ b/rhino/makefile.mk
@@ -58,9 +58,9 @@ FIXED_TARFILE_LOCATION=$(TARFILE_LOCATION)
.IF "$(JAVACISGCJ)"=="yes"
JAVA_HOME=
.EXPORT : JAVA_HOME
-BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj jar
+BUILD_ACTION=$(ANT) -DTARFILE_LOCATION="$(FIXED_TARFILE_LOCATION)" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj jar
.ELSE
-BUILD_ACTION=TARFILE_LOCATION="$(FIXED_TARFILE_LOCATION)" $(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) jar
+BUILD_ACTION=$(ANT) -DTARFILE_LOCATION="$(FIXED_TARFILE_LOCATION)" -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) jar
.ENDIF
# --- Targets ------------------------------------------------------
diff --git a/rhino/rhino1_5R5-find_swing.patch b/rhino/rhino1_5R5-find_swing.patch
index 220c4f4..f074fa8 100644
--- a/rhino/rhino1_5R5-find_swing.patch
+++ b/rhino/rhino1_5R5-find_swing.patch
@@ -1,11 +1,10 @@
--- misc/rhino1_5R5/toolsrc/build.xml 2009-10-29 18:29:46.605524507 +0100
+++ misc/build/rhino1_5R5/toolsrc/build.xml 2009-10-29 18:29:26.536908810 +0100
-@@ -12,6 +12,8 @@
+@@ -12,6 +12,7 @@
<os family="unix"/>
</and>
</condition>
-+ <property environment="solenv"/>
-+ <property name="swing_zip" value="${solenv.TARFILE_LOCATION}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"/>
++ <property name="swing_zip" value="${TARFILE_LOCATION}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"/>
<path id="macPath" location="${java.home}/../Classes/classes.jar"/>
<!-- rhino.jar from OpenJDK breaks build -->
<path id="nonMacPath">
More information about the Libreoffice-commits
mailing list