[Libreoffice-commits] core.git: 2 commits - canvas/source sdext/source

[Caolán McNamara]

 canvas/source/cairo/cairo_cairo.cxx               |    2 +-
 canvas/source/cairo/cairo_quartz_cairo.cxx        |    2 +-
 canvas/source/cairo/cairo_win32_cairo.cxx         |    2 +-
 sdext/source/presenter/PresenterAccessibility.cxx |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit ef2d6401ad702da8839bf9cc7292ff2f76756cd8
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Mar 18 02:05:25 2015 +0000

    fix higher debug levels
    
    Change-Id: I10556946c4bd6c60adcd9f662462b0f4b73781a2

diff --git a/sdext/source/presenter/PresenterAccessibility.cxx b/sdext/source/presenter/PresenterAccessibility.cxx
index a1ccb22..148e566 100644
--- a/sdext/source/presenter/PresenterAccessibility.cxx
+++ b/sdext/source/presenter/PresenterAccessibility.cxx
@@ -1582,7 +1582,7 @@ Sequence<css::beans::PropertyValue> SAL_CALL
     ThrowIfDisposed();
 
 #if OSL_DEBUG_LEVEL > 1
-    OSL_TRACE("PresenterAccessible::AccessibleParagraph::getCharacterAttributes at %x,%d returns empty set\r",
+    OSL_TRACE("PresenterAccessible::AccessibleParagraph::getCharacterAttributes at %p,%d returns empty set\r",
         this,nIndex);
     for (sal_Int32 nAttributeIndex(0),nAttributeCount(rRequestedAttributes.getLength());
          nAttributeIndex<nAttributeCount;
commit bf56e080cc092cacc779add9dfc7e7df291eef41
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Mar 17 20:33:00 2015 +0000

    OpenOffice.org->LibreOffice
    
    Change-Id: I0ba431b9227b3717b25f99c3ad6da552073bb712

diff --git a/canvas/source/cairo/cairo_cairo.cxx b/canvas/source/cairo/cairo_cairo.cxx
index cb5eeb9..ff78a8d 100644
--- a/canvas/source/cairo/cairo_cairo.cxx
+++ b/canvas/source/cairo/cairo_cairo.cxx
@@ -25,7 +25,7 @@
 namespace cairo
 {
  /***************************************************************************************
- * Platform independent part of surface backends for OpenOffice.org Cairo Canvas        *
+ * Platform independent part of surface backends for LibreOffice Cairo Canvas           *
  * For the rest of the functions (and the platform-specific derived                     *
  *  Surface classes), see platform specific cairo_<platform>_cairo.cxx                  *
  ****************************************************************************************/
diff --git a/canvas/source/cairo/cairo_quartz_cairo.cxx b/canvas/source/cairo/cairo_quartz_cairo.cxx
index b87b993..006bfc7 100644
--- a/canvas/source/cairo/cairo_quartz_cairo.cxx
+++ b/canvas/source/cairo/cairo_quartz_cairo.cxx
@@ -19,7 +19,7 @@
 
 #if defined MACOSX || defined IOS
 /************************************************************************
- * Mac OS X/Quartz and iOS surface backend for OpenOffice.org Cairo Canvas      *
+ * Mac OS X/Quartz and iOS surface backend for LibreOffice Cairo Canvas *
  ************************************************************************/
 
 #include <osl/diagnose.h>
diff --git a/canvas/source/cairo/cairo_win32_cairo.cxx b/canvas/source/cairo/cairo_win32_cairo.cxx
index 6e1cf6f..d00cc38 100644
--- a/canvas/source/cairo/cairo_win32_cairo.cxx
+++ b/canvas/source/cairo/cairo_win32_cairo.cxx
@@ -19,7 +19,7 @@
 
 #ifdef WNT
 /************************************************************************
- * Win32 surface backend for OpenOffice.org Cairo Canvas                *
+ * Win32 surface backend for LibreOffice Cairo Canvas                   *
  ************************************************************************/
 
 #include <osl/diagnose.h>