[Libreoffice-commits] core.git: vcl/osx vcl/unx
Stephan Bergmann
sbergman at redhat.com
Thu Aug 13 07:00:03 PDT 2015
vcl/osx/a11yfocustracker.cxx | 4 -
vcl/unx/gtk/a11y/atkcomponent.cxx | 34 ----------
vcl/unx/gtk/a11y/atktable.cxx | 128 --------------------------------------
vcl/unx/gtk/a11y/atktext.cxx | 32 ---------
vcl/unx/gtk/a11y/atkutil.cxx | 13 ---
vcl/unx/gtk/a11y/atkwrapper.cxx | 9 --
6 files changed, 220 deletions(-)
New commits:
commit 5045f2be71b9a548e9fb754831a9cca497db9002
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Aug 13 15:58:55 2015 +0200
Remove #ifdef ENABLE_TRACING code
...assumming nobody actively uses it for debugging anymore, anyway
Change-Id: I097c0cca791a48844550be4c326fa2483a3df231
diff --git a/vcl/osx/a11yfocustracker.cxx b/vcl/osx/a11yfocustracker.cxx
index 47dd652..0f3182d 100644
--- a/vcl/osx/a11yfocustracker.cxx
+++ b/vcl/osx/a11yfocustracker.cxx
@@ -254,10 +254,6 @@ void AquaA11yFocusTracker::window_got_focus(vcl::Window *pWindow)
m_aDocumentWindowList.insert(pWindow);
m_xDocumentFocusListener->attachRecursive(xAccessible, xContext, xStateSet);
}
-#ifdef ENABLE_TRACING
- else
- fprintf(stderr, "Window %p already in the list\n", pWindow );
-#endif
}
}
diff --git a/vcl/unx/gtk/a11y/atkcomponent.cxx b/vcl/unx/gtk/a11y/atkcomponent.cxx
index 08fd93a..fe8afec 100644
--- a/vcl/unx/gtk/a11y/atkcomponent.cxx
+++ b/vcl/unx/gtk/a11y/atkcomponent.cxx
@@ -21,10 +21,6 @@
#include <com/sun/star/accessibility/XAccessibleComponent.hpp>
-#ifdef ENABLE_TRACING
-#include <stdio.h>
-#endif
-
using namespace ::com::sun::star;
static accessibility::XAccessibleComponent*
@@ -55,12 +51,6 @@ translatePoint( accessibility::XAccessibleComponent *pComponent,
awt::Point aOrigin( 0, 0 );
if( t == ATK_XY_SCREEN )
aOrigin = pComponent->getLocationOnScreen();
-
-#ifdef ENABLE_TRACING
- fprintf(stderr, "coordinates ( %u, %u ) translated to: ( %u, %u )\n",
- x, y, x - aOrigin.X, y - aOrigin.Y);
-#endif
-
return awt::Point( x - aOrigin.X, y - aOrigin.Y );
}
@@ -127,22 +117,6 @@ component_wrapper_ref_accessible_at_point (AtkComponent *component,
uno::Reference< accessibility::XAccessible > xAccessible;
xAccessible = pComponent->getAccessibleAtPoint(
translatePoint( pComponent, x, y, coord_type ) );
-
-#ifdef ENABLE_TRACING
- fprintf(stderr, "getAccessibleAtPoint( %u, %u ) returned %p\n",
- x, y, xAccessible.get());
-
- uno::Reference< accessibility::XAccessibleComponent > xComponent(
- xAccessible->getAccessibleContext(), uno::UNO_QUERY );
-
- if( xComponent.is() )
- {
- awt::Rectangle rect = xComponent->getBounds();
- fprintf(stderr, "%p->getBounds() returned: ( %u, %u, %u, %u )\n",
- xAccessible.get(), rect.X, rect.Y, rect.Width, rect.Height );
- }
-#endif
-
return atk_object_wrapper_ref( xAccessible );
}
}
@@ -176,10 +150,6 @@ component_wrapper_get_position (AtkComponent *component,
*x = aPos.X;
*y = aPos.Y;
-
-#ifdef ENABLE_TRACING
- fprintf(stderr, "getLocation[OnScreen]() returned: ( %u, %u )\n", *x, *y );
-#endif
}
}
catch( const uno::Exception & )
@@ -203,10 +173,6 @@ component_wrapper_get_size (AtkComponent *component,
awt::Size aSize = pComponent->getSize();
*width = aSize.Width;
*height = aSize.Height;
-
-#ifdef ENABLE_TRACING
- fprintf(stderr, "getSize() returned: ( %u, %u )\n", *width, *height );
-#endif
}
}
catch( const uno::Exception & )
diff --git a/vcl/unx/gtk/a11y/atktable.cxx b/vcl/unx/gtk/a11y/atktable.cxx
index 13ee31d..9696b6b 100644
--- a/vcl/unx/gtk/a11y/atktable.cxx
+++ b/vcl/unx/gtk/a11y/atktable.cxx
@@ -26,10 +26,6 @@ using namespace ::com::sun::star;
static inline AtkObject *
atk_object_wrapper_conditional_ref( const uno::Reference< accessibility::XAccessible >& rxAccessible )
{
-#ifdef ENABLE_TRACING
- SAL_INFO( "vcl.a11y", ": " << rxAccessible.get() << "\n");
-#endif
-
if( rxAccessible.is() )
return atk_object_wrapper_ref( rxAccessible );
@@ -82,15 +78,6 @@ table_wrapper_ref_at (AtkTable *table,
{
try {
accessibility::XAccessibleTable* pTable = getTable( table );
-
-#ifdef ENABLE_TRACING
- if( pTable )
- SAL_INFO( "vcl.a11y", "getAccessibleCellAt( " << row << ", " << column << " ) returns\n");
-
- if( column >= 255 )
- SAL_INFO( "vcl.a11y", "getAccessibleCellAt( " << row << ", " << column << " ) returns\n");
-#endif
-
if( pTable )
return atk_object_wrapper_conditional_ref( pTable->getAccessibleCellAt( row, column ) );
}
@@ -111,12 +98,6 @@ table_wrapper_get_index_at (AtkTable *table,
{
try {
accessibility::XAccessibleTable* pTable = getTable( table );
-
-#ifdef ENABLE_TRACING
- if( pTable )
- SAL_INFO( "vcl.a11y", "getAccessibleIndex( " << row << ", " << column << " ) returns " << pTable->getAccessibleIndex( row, column ) << "\n");
-#endif
-
if( pTable )
return pTable->getAccessibleIndex( row, column );
}
@@ -135,12 +116,6 @@ table_wrapper_get_column_at_index (AtkTable *table,
{
try {
accessibility::XAccessibleTable* pTable = getTable( table );
-
-#ifdef ENABLE_TRACING
- if( pTable )
- SAL_INFO( "vcl.a11y", "getAccessibleColumn( " << nIndex << " ) returns " << pTable->getAccessibleColumn( nIndex ) << "\n");
-#endif
-
if( pTable )
return pTable->getAccessibleColumn( nIndex );
}
@@ -159,12 +134,6 @@ table_wrapper_get_row_at_index( AtkTable *table,
{
try {
accessibility::XAccessibleTable* pTable = getTable( table );
-
-#ifdef ENABLE_TRACING
- if( pTable )
- SAL_INFO( "vcl.a11y", "getAccessibleRow( " << nIndex << " ) returns " << pTable->getAccessibleRow( nIndex ) << "\n");
-#endif
-
if( pTable )
return pTable->getAccessibleRow( nIndex );
}
@@ -182,12 +151,6 @@ table_wrapper_get_n_columns( AtkTable *table )
{
try {
accessibility::XAccessibleTable* pTable = getTable( table );
-
-#ifdef ENABLE_TRACING
- if( pTable )
- SAL_INFO( "vcl.a11y", "XAccessibleTable::getAccessibleColumnCount returns " << pTable->getAccessibleColumnCount() << "\n");
-#endif
-
if( pTable )
return pTable->getAccessibleColumnCount();
}
@@ -205,12 +168,6 @@ table_wrapper_get_n_rows( AtkTable *table )
{
try {
accessibility::XAccessibleTable* pTable = getTable( table );
-
-#ifdef ENABLE_TRACING
- if( pTable )
- SAL_INFO( "vcl.a11y", "getAccessibleRowCount returns " << pTable->getAccessibleRowCount() << "\n");
-#endif
-
if( pTable )
return pTable->getAccessibleRowCount();
}
@@ -230,13 +187,6 @@ table_wrapper_get_column_extent_at( AtkTable *table,
{
try {
accessibility::XAccessibleTable* pTable = getTable( table );
-
-#ifdef ENABLE_TRACING
- if( pTable )
- SAL_INFO( "vcl.a11y", "getAccessibleColumnExtentAt ( " << row << ", " << column << " ) returns "
- << pTable->getAccessibleColumnExtentAt( row, column ) << "\n");;
-#endif
-
if( pTable )
return pTable->getAccessibleColumnExtentAt( row, column );
}
@@ -256,13 +206,6 @@ table_wrapper_get_row_extent_at( AtkTable *table,
{
try {
accessibility::XAccessibleTable* pTable = getTable( table );
-
-#ifdef ENABLE_TRACING
- if( pTable )
- SAL_INFO( "vcl.a11y", "getAccessibleRowExtentAt ( " << row << ", " << column << " ) returns "
- << pTable->getAccessibleRowExtentAt( row, column ) << "\n");;
-#endif
-
if( pTable )
return pTable->getAccessibleRowExtentAt( row, column );
}
@@ -280,12 +223,6 @@ table_wrapper_get_caption( AtkTable *table )
{
try {
accessibility::XAccessibleTable* pTable = getTable( table );
-
-#ifdef ENABLE_TRACING
- if( pTable )
- SAL_INFO( "vcl.a11y", "getAccessibleCaption() returns\n");
-#endif
-
if( pTable )
return atk_object_wrapper_conditional_ref( pTable->getAccessibleCaption() );
}
@@ -305,12 +242,6 @@ table_wrapper_get_row_description( AtkTable *table,
{
try {
accessibility::XAccessibleTable* pTable = getTable( table );
-
-#ifdef ENABLE_TRACING
- if( pTable )
- SAL_INFO( "vcl.a11y", "getAccessibleRowDescription( " << row << " ) returns " << getAsConst(pTable->getAccessibleRowDescription(row)) << "\n");
-#endif
-
if( pTable )
return getAsConst( pTable->getAccessibleRowDescription( row ) );
}
@@ -329,12 +260,6 @@ table_wrapper_get_column_description( AtkTable *table,
{
try {
accessibility::XAccessibleTable* pTable = getTable( table );
-
-#ifdef ENABLE_TRACING
- if( pTable )
- SAL_INFO( "vcl.a11y", "getAccessibleColumnDescription( " << column << " ) returns " << getAsConst(pTable->getAccessibleColumnDescription(column)) << "\n");
-#endif
-
if( pTable )
return getAsConst( pTable->getAccessibleColumnDescription( column ) );
}
@@ -356,14 +281,6 @@ table_wrapper_get_row_header( AtkTable *table,
if( pTable )
{
uno::Reference< accessibility::XAccessibleTable > xRowHeaders( pTable->getAccessibleRowHeaders() );
-
-#ifdef ENABLE_TRACING
- if( xRowHeaders.is() )
- SAL_INFO( "vcl.a11y", "getAccessibleRowHeader( " << row << ")->getAccessibleCellAt( 0, " << row << " ) returns\n");
- else
- SAL_INFO( "vcl.a11y", "getAccessibleRowHeader( " << row << ") returns " << xRowHeaders.get() << "\n");
-#endif
-
if( xRowHeaders.is() )
return atk_object_wrapper_conditional_ref( xRowHeaders->getAccessibleCellAt( row, 0 ) );
}
@@ -387,14 +304,6 @@ table_wrapper_get_column_header( AtkTable *table,
if( pTable )
{
uno::Reference< accessibility::XAccessibleTable > xColumnHeaders( pTable->getAccessibleColumnHeaders() );
-
-#ifdef ENABLE_TRACING
- if( xColumnHeaders.is() )
- SAL_INFO( "vcl.a11y", "getAccessibleColumnHeader( " << column << " )->getAccessibleCellAt( 0, " << column << " ) returns\n");
- else
- SAL_INFO( "vcl.a11y", "getAccessibleColumnHeader( " << column << " ) returns " << xColumnHeaders.get() << "\n");
-#endif
-
if( xColumnHeaders.is() )
return atk_object_wrapper_conditional_ref( xColumnHeaders->getAccessibleCellAt( 0, column ) );
}
@@ -413,12 +322,6 @@ table_wrapper_get_summary( AtkTable *table )
{
try {
accessibility::XAccessibleTable* pTable = getTable( table );
-
-#ifdef ENABLE_TRACING
- if( pTable )
- SAL_INFO( "vcl.a11y", "getAccessibleSummary() returns\n");
-#endif
-
if( pTable )
{
return atk_object_wrapper_conditional_ref( pTable->getAccessibleSummary() );
@@ -456,12 +359,6 @@ table_wrapper_get_selected_columns( AtkTable *table,
*pSelected = NULL;
try {
accessibility::XAccessibleTable* pTable = getTable( table );
-
-#ifdef ENABLE_TRACING
- if( pTable )
- SAL_INFO( "vcl.a11y", "getSelectedAccessibleColumns()\n");
-#endif
-
if( pTable )
return convertToGIntArray( pTable->getSelectedAccessibleColumns(), pSelected );
}
@@ -481,12 +378,6 @@ table_wrapper_get_selected_rows( AtkTable *table,
*pSelected = NULL;
try {
accessibility::XAccessibleTable* pTable = getTable( table );
-
-#ifdef ENABLE_TRACING
- if( pTable )
- SAL_INFO( "vcl.a11y", "getSelectedAccessibleRows()\n");
-#endif
-
if( pTable )
return convertToGIntArray( pTable->getSelectedAccessibleRows(), pSelected );
}
@@ -505,12 +396,6 @@ table_wrapper_is_column_selected( AtkTable *table,
{
try {
accessibility::XAccessibleTable* pTable = getTable( table );
-
-#ifdef ENABLE_TRACING
- if( pTable )
- SAL_INFO( "vcl.a11y", "isAccessibleColumnSelected( " << column << " ) returns " << pTable->isAccessibleColumnSelected( column ) ? "true" : "false" << "\n");
-#endif
-
if( pTable )
return pTable->isAccessibleColumnSelected( column );
}
@@ -529,12 +414,6 @@ table_wrapper_is_row_selected( AtkTable *table,
{
try {
accessibility::XAccessibleTable* pTable = getTable( table );
-
-#ifdef ENABLE_TRACING
- if( pTable )
- SAL_INFO( "vcl.a11y", "isAccessibleRowSelected( " << row << " ) returns " << pTable->isAccessibleRowSelected( row ) ? "true" : "false" << "\n");
-#endif
-
if( pTable )
return pTable->isAccessibleRowSelected( row );
}
@@ -554,13 +433,6 @@ table_wrapper_is_selected( AtkTable *table,
{
try {
accessibility::XAccessibleTable* pTable = getTable( table );
-
-#ifdef ENABLE_TRACING
- if( pTable )
- SAL_INFO( "vcl.a11y", "isAccessibleSelected( " << row << ", " << column
- << " ) returns " << pTable->isAccessibleSelected( row , column ) ? "true" : "false" << "\n");
-#endif
-
if( pTable )
return pTable->isAccessibleSelected( row, column );
}
diff --git a/vcl/unx/gtk/a11y/atktext.cxx b/vcl/unx/gtk/a11y/atktext.cxx
index 2a919ee..c944e11 100644
--- a/vcl/unx/gtk/a11y/atktext.cxx
+++ b/vcl/unx/gtk/a11y/atktext.cxx
@@ -31,12 +31,6 @@
#include <com/sun/star/accessibility/XAccessibleTextMarkup.hpp>
#include <com/sun/star/text/TextMarkupType.hpp>
-// #define ENABLE_TRACING
-
-#ifdef ENABLE_TRACING
-#include <stdio.h>
-#endif
-
using namespace ::com::sun::star;
static sal_Int16
@@ -134,12 +128,6 @@ adjust_boundaries( accessibility::XAccessibleText* pText,
*start_offset = start;
*end_offset = end;
-#ifdef ENABLE_TRACING
- fprintf(stderr, "adjust_boundaries( %d, %d, %d ) returns %d, %d\n",
- rTextSegment.SegmentStart, rTextSegment.SegmentEnd, boundary_type,
- start, end);
-#endif
-
return OUStringToGChar(aString);
}
@@ -299,9 +287,6 @@ text_wrapper_get_text (AtkText *text,
g_warning( "Exception in getText()" );
}
-#ifdef ENABLE_TRACING
- fprintf(stderr, "text_wrapper_get_text( %d,%d ) returns %s\n", start_offset, end_offset, ret ? ret : "null" );
-#endif
return ret;
}
@@ -422,10 +407,6 @@ text_wrapper_get_caret_offset (AtkText *text)
g_warning( "Exception in getCaretPosition()" );
}
-#ifdef ENABLE_TRACING
- fprintf(stderr, "get_caret_offset(%p) returns %d\n", text, offset);
-#endif
-
return offset;
}
@@ -668,11 +649,6 @@ text_wrapper_get_character_extents( AtkText *text,
*y = aRect.Y + origin_y;
*width = aRect.Width;
*height = aRect.Height;
-
-#ifdef ENABLE_TRACING
- fprintf(stderr, "get_character_extents(%d, %d) returns: %d,%d,%d,%d ",
- offset, coords, *x, *y, *width, *height);
-#endif
}
}
catch(const uno::Exception&) {
@@ -694,10 +670,6 @@ text_wrapper_get_character_count (AtkText *text)
g_warning( "Exception in getCharacterCount" );
}
-#ifdef ENABLE_TRACING
- fprintf(stderr, "get_character_count(%p) returns: %d\n", text, rv);
-#endif
-
return rv;
}
@@ -748,10 +720,6 @@ text_wrapper_get_n_selections (AtkText *text)
g_warning( "Exception in getSelectionEnd() or getSelectionStart()" );
}
-#ifdef ENABLE_TRACING
- fprintf(stderr, "get_n_selections(%p) returns %d\n", text, rv);
-#endif
-
return rv;
}
diff --git a/vcl/unx/gtk/a11y/atkutil.cxx b/vcl/unx/gtk/a11y/atkutil.cxx
index d816a80..c2e8ffb 100644
--- a/vcl/unx/gtk/a11y/atkutil.cxx
+++ b/vcl/unx/gtk/a11y/atkutil.cxx
@@ -46,12 +46,6 @@
#include <set>
-// #define ENABLE_TRACING
-
-#ifdef ENABLE_TRACING
-#include <stdio.h>
-#endif
-
using namespace ::com::sun::star;
namespace
@@ -82,9 +76,6 @@ atk_wrapper_focus_idle_handler (gpointer data)
// Gail does not notify focus changes to NULL, so do we ..
if( atk_obj )
{
-#ifdef ENABLE_TRACING
- fprintf(stderr, "notifying focus event for %p\n", atk_obj);
-#endif
SAL_WNODEPRECATED_DECLARATIONS_PUSH
atk_focus_tracker_notify(atk_obj);
SAL_WNODEPRECATED_DECLARATIONS_POP
@@ -559,10 +550,6 @@ static void handle_get_focus(::VclWindowEvent const * pEvent)
g_warning( "Exception caught processing focus events" );
}
}
-#ifdef ENABLE_TRACING
- else
- fprintf(stderr, "Window %p already in the list\n", pWindow );
-#endif
}
}
diff --git a/vcl/unx/gtk/a11y/atkwrapper.cxx b/vcl/unx/gtk/a11y/atkwrapper.cxx
index ad27b6a..efb3dd8 100644
--- a/vcl/unx/gtk/a11y/atkwrapper.cxx
+++ b/vcl/unx/gtk/a11y/atkwrapper.cxx
@@ -65,10 +65,6 @@
#include "atklistener.hxx"
#include "atktextattributes.hxx"
-#ifdef ENABLE_TRACING
-#include <stdio.h>
-#endif
-
#include <string.h>
using namespace ::com::sun::star;
@@ -490,11 +486,6 @@ wrapper_get_index_in_parent( AtkObject *atk_obj )
uno::Reference< accessibility::XAccessibleContext > xContext(obj->mpContext);
try {
i = xContext->getAccessibleIndexInParent();
-
-#ifdef ENABLE_TRACING
- fprintf(stderr, "%p->getAccessibleIndexInParent() returned: %u\n",
- obj->mpAccessible, i);
-#endif
}
catch(const uno::Exception&) {
g_warning( "Exception in getAccessibleIndexInParent()" );
More information about the Libreoffice-commits
mailing list