[Libreoffice-commits] .: vcl/unx
David Tardon
dtardon at kemper.freedesktop.org
Tue Jan 4 00:07:53 PST 2011
vcl/unx/gtk/a11y/atktable.cxx | 2
vcl/unx/gtk/a11y/atktext.cxx | 14 +---
vcl/unx/gtk/a11y/atktextattributes.cxx | 96 +------------------------------
vcl/unx/gtk/a11y/atktextattributes.hxx | 3
vcl/unx/gtk/a11y/atkutil.cxx | 57 ------------------
vcl/unx/gtk/a11y/atkwrapper.cxx | 60 -------------------
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 37 -----------
vcl/unx/gtk/window/gtkframe.cxx | 9 --
vcl/unx/kde/kdedata.cxx | 2
vcl/unx/source/app/i18n_cb.cxx | 15 ----
vcl/unx/source/app/saldisp.cxx | 30 +--------
vcl/unx/source/dtrans/X11_selection.cxx | 7 --
vcl/unx/source/gdi/salgdi.cxx | 17 +----
vcl/unx/source/gdi/xfont.cxx | 1
vcl/unx/source/printer/ppdparser.cxx | 6 -
vcl/unx/source/printergfx/common_gfx.cxx | 4 -
vcl/unx/source/window/salframe.cxx | 33 ++++------
17 files changed, 52 insertions(+), 341 deletions(-)
New commits:
commit 442eb4beb0fe10329ce59100bf1ea273fb425002
Author: Robert Roth <robert.roth.off at gmail.com>
Date: Fri Dec 31 18:44:07 2010 +0200
Bogus comments and commented code removal from Unix VCL
diff --git a/vcl/unx/gtk/a11y/atktable.cxx b/vcl/unx/gtk/a11y/atktable.cxx
index b9c41e7..290ce1d 100644
--- a/vcl/unx/gtk/a11y/atktable.cxx
+++ b/vcl/unx/gtk/a11y/atktable.cxx
@@ -447,8 +447,6 @@ table_wrapper_get_summary( AtkTable *table )
if( pTable )
{
- // FIXME: Summary ??
-// AtkObject* summary;
return atk_object_wrapper_conditional_ref( pTable->getAccessibleSummary() );
}
}
diff --git a/vcl/unx/gtk/a11y/atktext.cxx b/vcl/unx/gtk/a11y/atktext.cxx
index 81f5669..1b21fa6 100644
--- a/vcl/unx/gtk/a11y/atktext.cxx
+++ b/vcl/unx/gtk/a11y/atktext.cxx
@@ -455,7 +455,7 @@ text_wrapper_set_caret_offset (AtkText *text,
return FALSE;
}
-// --> OD 2010-03-04 #i92232#
+// #i92232#
AtkAttributeSet*
handle_text_markup_as_run_attribute( accessibility::XAccessibleTextMarkup* pTextMarkup,
const gint nTextMarkupType,
@@ -531,7 +531,6 @@ handle_text_markup_as_run_attribute( accessibility::XAccessibleTextMarkup* pText
return pSet;
}
-// <--
static AtkAttributeSet *
text_wrapper_get_run_attributes( AtkText *text,
@@ -552,26 +551,22 @@ text_wrapper_get_run_attributes( AtkText *text,
pTextAttributes->getRunAttributes( offset, uno::Sequence< rtl::OUString > () );
pSet = attribute_set_new_from_property_values( aAttributeList, true, text );
- // --> OD 2009-06-22 #i100938#
+ // #i100938#
// - always provide start_offset and end_offset
-// if( pSet )
- // <--
{
accessibility::TextSegment aTextSegment =
pText->getTextAtIndex(offset, accessibility::AccessibleTextType::ATTRIBUTE_RUN);
*start_offset = aTextSegment.SegmentStart;
- // --> OD 2009-06-22 #i100938#
+ // #i100938#
// Do _not_ increment the end_offset provide by <accessibility::TextSegment> instance
-// *end_offset = aTextSegment.SegmentEnd + 1; // FIXME: TESTME
*end_offset = aTextSegment.SegmentEnd;
- // <--
bOffsetsAreValid = true;
}
}
// Special handling for misspelled text
- // --> OD 2010-03-01 #i92232#
+ // #i92232#
// - add special handling for tracked changes and refactor the
// corresponding code for handling misspelled text.
accessibility::XAccessibleTextMarkup* pTextMarkup = getTextMarkup( text );
@@ -604,7 +599,6 @@ text_wrapper_get_run_attributes( AtkText *text,
com::sun::star::text::TextMarkupType::TRACK_CHANGE_FORMATCHANGE,
offset, pSet, start_offset, end_offset );
}
- // <--
}
catch(const uno::Exception& e){
diff --git a/vcl/unx/gtk/a11y/atktextattributes.cxx b/vcl/unx/gtk/a11y/atktextattributes.cxx
index 2c8887c..bcf8801 100644
--- a/vcl/unx/gtk/a11y/atktextattributes.cxx
+++ b/vcl/unx/gtk/a11y/atktextattributes.cxx
@@ -75,12 +75,10 @@ static AtkTextAttribute atk_text_attribute_tab_stops = ATK_TEXT_ATTR_INVALID;
static AtkTextAttribute atk_text_attribute_writing_mode = ATK_TEXT_ATTR_INVALID;
static AtkTextAttribute atk_text_attribute_vertical_align = ATK_TEXT_ATTR_INVALID;
static AtkTextAttribute atk_text_attribute_misspelled = ATK_TEXT_ATTR_INVALID;
-// --> OD 2010-03-01 #i92232#
+// #i92232#
static AtkTextAttribute atk_text_attribute_tracked_change = ATK_TEXT_ATTR_INVALID;
-// <--
-// --> OD 2010-03-05 #i92233#
+// #i92233#
static AtkTextAttribute atk_text_attribute_mm_to_pixel_ratio = ATK_TEXT_ATTR_INVALID;
-// <--
/*****************************************************************************/
@@ -110,9 +108,8 @@ enum ExportedAttribute
TEXT_ATTRIBUTE_STRIKETHROUGH,
TEXT_ATTRIBUTE_UNDERLINE,
TEXT_ATTRIBUTE_WEIGHT,
- // --> OD 2010-03-05 #i92233#
+ // #i92233#
TEXT_ATTRIBUTE_MM_TO_PIXEL_RATIO,
- // <--
TEXT_ATTRIBUTE_JUSTIFICATION,
TEXT_ATTRIBUTE_BOTTOM_MARGIN,
TEXT_ATTRIBUTE_FIRST_LINE_INDENT,
@@ -177,7 +174,6 @@ get_value( const uno::Sequence< beans::PropertyValue >& rAttributeList,
#define get_bool_value( list, index ) get_value( list, index, Bool2String )
#define get_short_value( list, index ) get_value( list, index, Short2String )
-//#define get_long_value( list, index ) get_value( list, index, Long2String ) pb: not used (warning on linux)
#define get_height_value( list, index ) get_value( list, index, Float2String )
#define get_justification_value( list, index ) get_value( list, index, Adjust2Justification )
#define get_cmm_value( list, index ) get_value( list, index, CMM2UnitString )
@@ -190,36 +186,6 @@ get_value( const uno::Sequence< beans::PropertyValue >& rAttributeList,
#define get_weight_value( list, index ) get_value( list, index, Weight2String )
#define get_language_string( list, index ) get_value( list, index, Locale2String )
-/*
-static gchar*
-dump_value( const uno::Sequence< beans::PropertyValue >& rAttributeList, sal_Int32 nIndex )
-{
- if( nIndex != -1 )
- {
- rtl::OString aName = rtl::OUStringToOString(rAttributeList[nIndex].Name, RTL_TEXTENCODING_UTF8);
-
- if( rAttributeList[nIndex].Value.has<sal_Int16> () )
- OSL_TRACE( "%s = %d (short value)", aName.getStr(),
- rAttributeList[nIndex].Value.get<sal_Int16> () );
-
- else if( rAttributeList[nIndex].Value.has<sal_Int8> () )
- OSL_TRACE( "%s = %d (byte value)", aName.getStr(),
- rAttributeList[nIndex].Value.get<sal_Int8> () );
-
- else if( rAttributeList[nIndex].Value.has<sal_Bool> () )
- OSL_TRACE( "%s = %s (bool value)", aName.getStr(),
- rAttributeList[nIndex].Value.get<sal_Bool> () ? "true" : "false" );
-
- else if( rAttributeList[nIndex].Value.has<rtl::OUString> () )
- OSL_TRACE( "%s = %s", aName.getStr(),
- rtl::OUStringToOString(rAttributeList[nIndex].Value.get<rtl::OUString> (),
- RTL_TEXTENCODING_UTF8).getStr() );
- }
-
- return NULL;
-}
-*/
-
static inline
double toPoint(sal_Int16 n)
{
@@ -230,14 +196,6 @@ double toPoint(sal_Int16 n)
/*****************************************************************************/
-/*
-static gchar*
-NullString(const uno::Any&)
-{
- return NULL;
-}
-*/
-
static bool
InvalidValue( uno::Any&, const gchar * )
{
@@ -266,48 +224,6 @@ String2Float( uno::Any& rAny, const gchar * value )
/*****************************************************************************/
-/*
-static gchar*
-Short2String(const uno::Any& rAny)
-{
- return g_strdup_printf( "%d", rAny.get<sal_Int16>() );
-}
-
-static bool
-String2Short( uno::Any& rAny, const gchar * value )
-{
- sal_Int32 lval;
-
- if( 1 != sscanf( value, "%d", &lval ) )
- return false;
-
- rAny = uno::makeAny( (sal_Int16) lval );
- return true;
-}
-*/
-
-/*****************************************************************************/
-/* pb: not used (warning on linux)
-static gchar*
-Long2String(const uno::Any& rAny)
-{
- return g_strdup_printf( "%ld", rAny.get<sal_Int32>() );
-}
-
-static bool
-String2Long( uno::Any& rAny, const gchar * value )
-{
- sal_Int32 lval;
-
- if( 1 != sscanf( value, "%ld", &lval ) )
- return false;
-
- rAny = uno::makeAny( lval );
- return true;
-}
-*/
-/*****************************************************************************/
-
static accessibility::XAccessibleComponent*
getComponent( AtkText *pText ) throw (uno::RuntimeException)
{
@@ -1306,13 +1222,12 @@ attribute_set_new_from_property_values(
attribute_set = attribute_set_prepend(attribute_set, atk_text_attribute_tab_stops,
get_value(rAttributeList, aIndexList[TEXT_ATTRIBUTE_TAB_STOPS], TabStops2String));
- // --> OD 2010-03-05 #i92233#
+ // #i92233#
if( ATK_TEXT_ATTR_INVALID == atk_text_attribute_mm_to_pixel_ratio )
atk_text_attribute_mm_to_pixel_ratio = atk_text_attribute_register("mm-to-pixel-ratio");
attribute_set = attribute_set_prepend( attribute_set, atk_text_attribute_mm_to_pixel_ratio,
get_value(rAttributeList, aIndexList[TEXT_ATTRIBUTE_MM_TO_PIXEL_RATIO], Float2String));
- // <--
return attribute_set;
}
@@ -1329,7 +1244,7 @@ AtkAttributeSet* attribute_set_prepend_misspelled( AtkAttributeSet* attribute_se
return attribute_set;
}
-// --> OD 2010-03-01 #i92232#
+// #i92232#
AtkAttributeSet* attribute_set_prepend_tracked_change_insertion( AtkAttributeSet* attribute_set )
{
if ( ATK_TEXT_ATTR_INVALID == atk_text_attribute_tracked_change )
@@ -1371,7 +1286,6 @@ AtkAttributeSet* attribute_set_prepend_tracked_change_formatchange( AtkAttribute
return attribute_set;
}
-// <--
/*****************************************************************************/
diff --git a/vcl/unx/gtk/a11y/atktextattributes.hxx b/vcl/unx/gtk/a11y/atktextattributes.hxx
index 6e74318..1366fb8 100644
--- a/vcl/unx/gtk/a11y/atktextattributes.hxx
+++ b/vcl/unx/gtk/a11y/atktextattributes.hxx
@@ -46,11 +46,10 @@ attribute_set_map_to_property_values(
com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rValueList );
AtkAttributeSet* attribute_set_prepend_misspelled( AtkAttributeSet* attribute_set );
-// --> OD 2010-03-01 #i92232#
+// #i92232#
AtkAttributeSet* attribute_set_prepend_tracked_change_insertion( AtkAttributeSet* attribute_set );
AtkAttributeSet* attribute_set_prepend_tracked_change_deletion( AtkAttributeSet* attribute_set );
AtkAttributeSet* attribute_set_prepend_tracked_change_formatchange( AtkAttributeSet* attribute_set );
-// <--
#endif
diff --git a/vcl/unx/gtk/a11y/atkutil.cxx b/vcl/unx/gtk/a11y/atkutil.cxx
index ac28e4d..f27dba9 100644
--- a/vcl/unx/gtk/a11y/atkutil.cxx
+++ b/vcl/unx/gtk/a11y/atkutil.cxx
@@ -40,7 +40,6 @@
#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
-// --> OD 2009-04-14 #i93269#
#include <com/sun/star/accessibility/XAccessibleText.hpp>
// <--
#include <cppuhelper/implbase1.hxx>
@@ -92,7 +91,7 @@ atk_wrapper_focus_idle_handler (gpointer data)
fprintf(stderr, "notifying focus event for %p\n", atk_obj);
#endif
atk_focus_tracker_notify(atk_obj);
- // --> OD 2009-04-14 #i93269#
+ // #i93269#
// emit text_caret_moved event for <XAccessibleText> object,
// if cursor is inside the <XAccessibleText> object.
// also emit state-changed:focused event under the same condition.
@@ -119,7 +118,6 @@ atk_wrapper_focus_idle_handler (gpointer data)
}
}
}
- // <--
g_object_unref(atk_obj);
}
}
@@ -196,16 +194,12 @@ public:
void DocumentFocusListener::disposing( const lang::EventObject& aEvent )
throw (uno::RuntimeException)
{
-// fprintf(stderr, "In DocumentFocusListener::disposing (%p)\n", this);
-// fprintf(stderr, "m_aRefList has %d entries\n", m_aRefList.size());
// Unref the object here, but do not remove as listener since the object
// might no longer be in a state that safely allows this.
if( aEvent.Source.is() )
m_aRefList.erase(aEvent.Source);
-// fprintf(stderr, "m_aRefList has %d entries\n", m_aRefList.size());
-
}
/*****************************************************************************/
@@ -242,12 +236,6 @@ void DocumentFocusListener::notifyEvent( const accessibility::AccessibleEventObj
break;
case accessibility::AccessibleEventId::INVALIDATE_ALL_CHILDREN:
-/* {
- uno::Reference< accessibility::XAccessible > xAccessible( getAccessible(aEvent) );
- detachRecursive(xAccessible);
- attachRecursive(xAccessible);
- }
-*/
g_warning( "Invalidate all children called\n" );
break;
default:
@@ -504,27 +492,6 @@ static void handle_toolbox_buttonchange(VclWindowEvent const *pEvent)
}
}
-/*****************************************************************************/
-
-/* currently not needed anymore...
-static void create_wrapper_for_children(Window *pWindow)
-{
- if( pWindow && pWindow->IsReallyVisible() )
- {
- uno::Reference< accessibility::XAccessible > xAccessible(pWindow->GetAccessible());
- if( xAccessible.is() )
- {
- uno::Reference< accessibility::XAccessibleContext > xContext(xAccessible->getAccessibleContext());
- if( xContext.is() )
- {
- sal_Int32 nChildren = xContext->getAccessibleChildCount();
- for( sal_Int32 i = 0; i < nChildren; ++i )
- create_wrapper_for_child(xContext, i);
- }
- }
- }
-}
-*/
/*****************************************************************************/
@@ -633,43 +600,26 @@ long WindowEventHandler(void *, ::VclSimpleEvent const * pEvent)
switch (pEvent->GetId())
{
case VCLEVENT_WINDOW_SHOW:
-// fprintf(stderr, "got VCLEVENT_WINDOW_SHOW for %p\n",
-// static_cast< ::VclWindowEvent const * >(pEvent)->GetWindow());
break;
case VCLEVENT_WINDOW_HIDE:
-// fprintf(stderr, "got VCLEVENT_WINDOW_HIDE for %p\n",
-// static_cast< ::VclWindowEvent const * >(pEvent)->GetWindow());
break;
case VCLEVENT_WINDOW_CLOSE:
-// fprintf(stderr, "got VCLEVENT_WINDOW_CLOSE for %p\n",
-// static_cast< ::VclWindowEvent const * >(pEvent)->GetWindow());
break;
case VCLEVENT_WINDOW_GETFOCUS:
handle_get_focus(static_cast< ::VclWindowEvent const * >(pEvent));
break;
case VCLEVENT_WINDOW_LOSEFOCUS:
-// fprintf(stderr, "got VCLEVENT_WINDOW_LOSEFOCUS for %p\n",
-// static_cast< ::VclWindowEvent const * >(pEvent)->GetWindow());
break;
case VCLEVENT_WINDOW_MINIMIZE:
-// fprintf(stderr, "got VCLEVENT_WINDOW_MINIMIZE for %p\n",
-// static_cast< ::VclWindowEvent const * >(pEvent)->GetWindow());
break;
case VCLEVENT_WINDOW_NORMALIZE:
-// fprintf(stderr, "got VCLEVENT_WINDOW_NORMALIZE for %p\n",
-// static_cast< ::VclWindowEvent const * >(pEvent)->GetWindow());
break;
case VCLEVENT_WINDOW_KEYINPUT:
case VCLEVENT_WINDOW_KEYUP:
case VCLEVENT_WINDOW_COMMAND:
case VCLEVENT_WINDOW_MOUSEMOVE:
break;
- /*
- fprintf(stderr, "got VCLEVENT_WINDOW_COMMAND (%d) for %p\n",
- static_cast< ::CommandEvent const * > (
- static_cast< ::VclWindowEvent const * >(pEvent)->GetData())->GetCommand(),
- static_cast< ::VclWindowEvent const * >(pEvent)->GetWindow());
- */
+
case VCLEVENT_MENU_HIGHLIGHT:
if (const VclMenuEvent* pMenuEvent = dynamic_cast<const VclMenuEvent*>(pEvent))
{
@@ -703,7 +653,7 @@ long WindowEventHandler(void *, ::VclSimpleEvent const * pEvent)
break;
case VCLEVENT_COMBOBOX_SETTEXT:
- // MT 2010/02: This looks quite strange to me. Stumbled over this when fixing #i104290#.
+ // This looks quite strange to me. Stumbled over this when fixing #i104290#.
// This kicked in when leaving the combobox in the toolbar, after that the events worked.
// I guess this was a try to work around missing combobox events, which didn't do the full job, and shouldn't be necessary anymore.
// Fix for #i104290# was done in toolkit/source/awt/vclxaccessiblecomponent, FOCUSED state for compound controls in general.
@@ -711,7 +661,6 @@ long WindowEventHandler(void *, ::VclSimpleEvent const * pEvent)
break;
default:
-// OSL_TRACE("got event %d \n", pEvent->GetId());
break;
}
return 0;
diff --git a/vcl/unx/gtk/a11y/atkwrapper.cxx b/vcl/unx/gtk/a11y/atkwrapper.cxx
index 3b74af8..1066917 100644
--- a/vcl/unx/gtk/a11y/atkwrapper.cxx
+++ b/vcl/unx/gtk/a11y/atkwrapper.cxx
@@ -508,64 +508,6 @@ wrapper_ref_relation_set( AtkObject *atk_obj )
return pSet;
}
-/*****************************************************************************/
-
-#if 0
-
-#include <sal/macros.h>
-struct {
- sal_Int16 value;
- const sal_Char* name;
-} aStateTypeTable[] = {
- { accessibility::AccessibleStateType::INVALID, "INVALID" },
- { accessibility::AccessibleStateType::ACTIVE, "ACTIVE" },
- { accessibility::AccessibleStateType::ARMED, "ARMED" },
- { accessibility::AccessibleStateType::BUSY, "BUSY" },
- { accessibility::AccessibleStateType::CHECKED, "CHECKED" },
- { accessibility::AccessibleStateType::DEFUNC, "DEFUNC" },
- { accessibility::AccessibleStateType::EDITABLE, "EDITABLE" },
- { accessibility::AccessibleStateType::ENABLED, "ENABLED" },
- { accessibility::AccessibleStateType::EXPANDABLE, "EXPANDABLE" },
- { accessibility::AccessibleStateType::EXPANDED, "EXPANDED" },
- { accessibility::AccessibleStateType::FOCUSABLE, "FOCUSABLE" },
- { accessibility::AccessibleStateType::FOCUSED, "FOCUSED" },
- { accessibility::AccessibleStateType::HORIZONTAL, "HORIZONTAL" },
- { accessibility::AccessibleStateType::ICONIFIED, "ICONIFIED" },
- { accessibility::AccessibleStateType::INDETERMINATE, "INDETERMINATE" },
- { accessibility::AccessibleStateType::MANAGES_DESCENDANTS, "MANAGES_DESCENDANTS" },
- { accessibility::AccessibleStateType::MODAL, "MODAL" },
- { accessibility::AccessibleStateType::MULTI_LINE, "MULTI_LINE" },
- { accessibility::AccessibleStateType::MULTI_SELECTABLE, "MULTI_SELECTABLE" },
- { accessibility::AccessibleStateType::OPAQUE, "OPAQUE" },
- { accessibility::AccessibleStateType::PRESSED, "PRESSED" },
- { accessibility::AccessibleStateType::RESIZABLE, "RESIZABLE" },
- { accessibility::AccessibleStateType::SELECTABLE, "SELECTABLE" },
- { accessibility::AccessibleStateType::SELECTED, "SELECTED" },
- { accessibility::AccessibleStateType::SENSITIVE, "SENSITIVE" },
- { accessibility::AccessibleStateType::SHOWING, "SHOWING" },
- { accessibility::AccessibleStateType::SINGLE_LINE, "SINGLE_LINE" },
- { accessibility::AccessibleStateType::STALE, "STALE" },
- { accessibility::AccessibleStateType::TRANSIENT, "TRANSIENT" },
- { accessibility::AccessibleStateType::VERTICAL, "VERTICAL" },
- { accessibility::AccessibleStateType::VISIBLE, "VISIBLE" }
-};
-
-static void printStates(const uno::Sequence<sal_Int16>& rStates)
-{
- sal_Int32 n = rStates.getLength();
- size_t nTypes = SAL_N_ELEMENTS(aStateTypeTable);
- for (sal_Int32 i = 0; i < n; ++i)
- {
- for (size_t j = 0; j < nTypes; ++j)
- {
- if (aStateTypeTable[j].value == rStates[i])
- printf("%s ", aStateTypeTable[j].name);
- }
- }
- printf("\n");
-}
-#endif
-
static AtkStateSet *
wrapper_ref_state_set( AtkObject *atk_obj )
{
@@ -782,8 +724,6 @@ ensureTypeFor( uno::XInterface *pAccessible )
aTypeName += aTypeTable[i].name;
bTypes[i] = TRUE;
}
-// g_message( "Accessible %p has type '%s' (%d)",
-// pAccessible, aTypeTable[i].name, bTypes[i] );
}
GType nType = g_type_from_name( aTypeName );
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index f7a1cf2..09efe7a 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -1245,29 +1245,6 @@ BOOL GtkSalGraphics::NWPaintGTKButton(
&clipRect, gWidgetData[m_nScreen].gBtnWidget, "button", xi, yi, wi, hi );
}
}
-#if 0 // VCL draws focus rects
- // Draw focus rect
- if ( (nState & CTRL_STATE_FOCUSED) && (nState & CTRL_STATE_ENABLED) && bDrawFocus )
- {
- if (interiorFocus)
- {
- x += gWidgetData[m_nScreen].gBtnWidget->style->xthickness + focusPad;
- y += gWidgetData[m_nScreen].gBtnWidget->style->ythickness + focusPad;
- w -= 2 * (gWidgetData[m_nScreen].gBtnWidget->style->xthickness + focusPad);
- h -= 2 * (gWidgetData[m_nScreen].gBtnWidget->style->xthickness + focusPad);
- }
- else
- {
- x -= focusWidth + focusPad;
- y -= focusWidth + focusPad;
- w += 2 * (focusWidth + focusPad);
- h += 2 * (focusWidth + focusPad);
- }
- if ( !interiorFocus )
- gtk_paint_focus( gWidgetData[m_nScreen].gBtnWidget->style, gdkDrawable, stateType, &clipRect,
- gWidgetData[m_nScreen].gBtnWidget, "button", x, y, w, h );
- }
-#endif
return( TRUE );
}
@@ -1920,10 +1897,6 @@ static void NWPaintOneEditBox( int nScreen,
NWEnsureGTKScrolledWindow( nScreen );
NWConvertVCLStateToGTKState( nState, &stateType, &shadowType );
- /* border's shadowType for gtk entries is always GTK_SHADOW_IN (see gtkentry.c)
- shadowType = GTK_SHADOW_IN;
- */
-
switch ( nType )
{
case CTRL_SPINBOX:
@@ -2349,7 +2322,7 @@ BOOL GtkSalGraphics::NWPaintGTKTabItem( ControlType nType, ControlPart,
// Allow the tab to draw a right border if needed
tabRect.Right() -= 1;
- // #129732# avoid degenerate cases which might lead to crashes
+ // avoid degenerate cases which might lead to crashes
if( tabRect.GetWidth() <= 1 || tabRect.GetHeight() <= 1 )
return false;
}
@@ -2365,9 +2338,6 @@ BOOL GtkSalGraphics::NWPaintGTKTabItem( ControlType nType, ControlPart,
return NWRenderPixmapToScreen( pixmap, pixmapRect );
}
-
-// gtk_widget_set_state( gWidgetData[m_nScreen].gNotebookWidget, stateType );
-
pixmap = gdk_pixmap_new( NULL, pixmapRect.GetWidth(), pixmapRect.GetHeight(),
GetX11SalData()->GetDisplay()->GetVisual( m_nScreen ).GetDepth() );
GdkRectangle paintRect;
@@ -2715,7 +2685,7 @@ BOOL GtkSalGraphics::NWPaintGTKMenubar(
if ( nState & CTRL_STATE_ENABLED )
GTK_WIDGET_SET_FLAGS( gWidgetData[m_nScreen].gMenubarWidget, GTK_SENSITIVE );
- // #118704# for translucent menubar styles paint background first
+ // for translucent menubar styles paint background first
gtk_paint_flat_box( gWidgetData[m_nScreen].gMenubarWidget->style,
gdkDrawable,
GTK_STATE_NORMAL,
@@ -2802,7 +2772,7 @@ BOOL GtkSalGraphics::NWPaintGTKPopupMenu(
if( nPart == PART_ENTIRE_CONTROL )
{
- // #118704# for translucent menubar styles paint background first
+ // for translucent menubar styles paint background first
gtk_paint_flat_box( gWidgetData[m_nScreen].gMenuWidget->style,
gdkDrawable,
GTK_STATE_NORMAL,
@@ -3597,7 +3567,6 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings )
const cairo_font_options_t* pNewOptions = NULL;
if( GdkScreen* pScreen = gdk_display_get_screen( gdk_display_get_default(), m_nScreen ) )
{
-//#if !GTK_CHECK_VERSION(2,8,1)
#if !GTK_CHECK_VERSION(2,9,0)
static cairo_font_options_t* (*gdk_screen_get_font_options)(GdkScreen*) =
(cairo_font_options_t*(*)(GdkScreen*))osl_getAsciiFunctionSymbol( GetSalData()->m_pPlugin, "gdk_screen_get_font_options" );
diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index cb8e542..636450c 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.cxx
@@ -868,7 +868,6 @@ void GtkSalFrame::Init( SalFrame* pParent, ULONG nStyle )
{
/* #i99360# ugly workaround an X11 library bug */
nUserTime= getDisplay()->GetLastUserEventTime( true );
- // nUserTime = gdk_x11_get_server_time(GTK_WIDGET (m_pWindow)->window);
}
lcl_set_user_time(GTK_WIDGET(m_pWindow)->window, nUserTime);
}
@@ -2090,7 +2089,6 @@ void GtkSalFrame::ToTop( USHORT nFlags )
gtk_window_present( GTK_WINDOW(m_pWindow) );
else
{
- // gdk_window_focus( m_pWindow->window, gdk_x11_get_server_time(GTK_WIDGET (m_pWindow)->window) );
/* #i99360# ugly workaround an X11 library bug */
guint32 nUserTime= getDisplay()->GetLastUserEventTime( true );
gdk_window_focus( m_pWindow->window, nUserTime );
@@ -2213,7 +2211,7 @@ void GtkSalFrame::SetPointerPos( long nX, long nY )
GdkScreen *pScreen = gtk_window_get_screen( GTK_WINDOW(pFrame->m_pWindow) );
GdkDisplay *pDisplay = gdk_screen_get_display( pScreen );
- /* #87921# when the application tries to center the mouse in the dialog the
+ /* when the application tries to center the mouse in the dialog the
* window isn't mapped already. So use coordinates relative to the root window.
*/
unsigned int nWindowLeft = maGeometry.nX + nX;
@@ -3830,9 +3828,7 @@ gboolean GtkSalFrame::IMHandler::signalIMDeleteSurrounding( GtkIMContext*, gint
if (xText.is())
{
sal_uInt32 nPosition = xText->getCaretPosition();
- // --> OD 2010-06-04 #i111768# - apply patch from kstribley:
- // range checking
-// xText->deleteText(nPosition + offset, nPosition + offset + nchars);
+ // #i111768# range checking
sal_Int32 nDeletePos = nPosition + offset;
sal_Int32 nDeleteEnd = nDeletePos + nchars;
if (nDeletePos < 0)
@@ -3843,7 +3839,6 @@ gboolean GtkSalFrame::IMHandler::signalIMDeleteSurrounding( GtkIMContext*, gint
nDeleteEnd = xText->getCharacterCount();
xText->deleteText(nDeletePos, nDeleteEnd);
- // <--
return TRUE;
}
diff --git a/vcl/unx/kde/kdedata.cxx b/vcl/unx/kde/kdedata.cxx
index 3204450..1cc7dd4 100644
--- a/vcl/unx/kde/kdedata.cxx
+++ b/vcl/unx/kde/kdedata.cxx
@@ -96,7 +96,7 @@ SalKDEDisplay::~SalKDEDisplay()
KDEXLib::~KDEXLib()
{
- // #158056# on 64 bit linux using libXRandr.so.2 will crash in
+ // on 64 bit linux using libXRandr.so.2 will crash in
// XCloseDisplay when freeing extension data
// no known work around, therefor currently leak. Hopefully
// this does not make problems since we're shutting down anyway
diff --git a/vcl/unx/source/app/i18n_cb.cxx b/vcl/unx/source/app/i18n_cb.cxx
index 5cb51b1..a6bfaa8 100644
--- a/vcl/unx/source/app/i18n_cb.cxx
+++ b/vcl/unx/source/app/i18n_cb.cxx
@@ -126,7 +126,6 @@ Preedit_DeleteText(preedit_text_t *ptext, int from, int howmuch)
ptext->nLength -= howmuch;
}
else
- // if ( to > pText->nLength )
{
// XXX this indicates an error, are we out of sync ?
fprintf(stderr, "Preedit_DeleteText( from=%i to=%i length=%i )\n",
@@ -326,13 +325,6 @@ Preedit_FeedbackToSAL ( XIMFeedback* pfeedback, int nlength, std::vector<USHORT>
if (nfeedback & XIMTertiary) // same as 2ery
nval |= SAL_EXTTEXTINPUT_ATTR_DASHDOTUNDERLINE;
- /*
- // visibility feedback not supported now
- if ( (nfeedback & XIMVisibleToForward)
- || (nfeedback & XIMVisibleToBackward)
- || (nfeedback & XIMVisibleCenter) )
- { }
- */
}
// copy in list
psalattr[npos] = nval;
@@ -353,7 +345,7 @@ PreeditDrawCallback(XIC ic, XPointer client_data,
|| pPreeditData->pFrame == NULL )
return;
- // #88564# Solaris 7 deletes the preedit buffer after commit
+ // Solaris 7 deletes the preedit buffer after commit
// since the next call to preeditstart will have the same effect just skip this.
// if (pPreeditData->eState == ePreeditStatusStartPending && call_data->text == NULL)
// return;
@@ -509,8 +501,7 @@ PreeditCaretCallback ( XIC, XPointer,XIMPreeditCaretCallbackStruct* )
Bool
IsControlCode(sal_Unicode nChar)
{
- if ( nChar <= 0x1F // C0 controls
- /* || (0x80 <= nChar && nChar <= 0x9F) C1 controls */ )
+ if ( nChar <= 0x1F // C0 controls )
return True;
else
return False;
@@ -524,7 +515,7 @@ CommitStringCallback( XIC ic, XPointer client_data, XPointer call_data )
XIMUnicodeText *cbtext = (XIMUnicodeText *)call_data;
sal_Unicode *p_unicode_data = (sal_Unicode*)cbtext->string.utf16_char;
- // #86964# filter unexpected pure control events
+ // filter unexpected pure control events
if (cbtext->length == 1 && IsControlCode(p_unicode_data[0]) )
{
if( pPreeditData->pFrame )
diff --git a/vcl/unx/source/app/saldisp.cxx b/vcl/unx/source/app/saldisp.cxx
index a50b2c1..1dbcfaf 100644
--- a/vcl/unx/source/app/saldisp.cxx
+++ b/vcl/unx/source/app/saldisp.cxx
@@ -783,8 +783,7 @@ void SalDisplay::initScreen( int nScreen ) const
XSetFunction( pDisp_, rSD.m_aAndInvertedGC, GXandInverted );
XSetFunction( pDisp_, rSD.m_aAndGC, GXand );
- // #44556# PowerPC Solaris 2.5 (XSun 3500) Bug: GXor = GXnop
- //XSetFunction( pDisp_, pOrGC_, GXor );
+ // PowerPC Solaris 2.5 (XSun 3500) Bug: GXor = GXnop
XSetFunction( pDisp_, rSD.m_aOrGC, GXxor );
if( 1 == rSD.m_aVisual.GetDepth() )
@@ -1597,13 +1596,6 @@ USHORT SalDisplay::GetKeyCode( KeySym keysym, char*pcPrintable ) const
case XK_Menu:
nKey = KEY_CONTEXTMENU;
break;
-/*
- case XK_Break:
- case XK_Select:
- case XK_Execute:
- case XK_Print:
- case XK_Cancel:
-*/
}
}
else if( IsISOKey( keysym ) ) // XK_ISO_
@@ -1685,9 +1677,6 @@ USHORT SalDisplay::GetKeyCode( KeySym keysym, char*pcPrintable ) const
nKey = KEY_SEMICOLON;
*pcPrintable = ';';
break;
-// case XK_Linefeed:
-// *pcPrintable = '\n';
-// break;
// - - - - - - - - - - - - - Apollo - - - - - - - - - - - - - 0x1000
case 0x1000FF02: // apXK_Copy
nKey = KEY_COPY;
@@ -1809,7 +1798,7 @@ KeySym SalDisplay::GetKeySym( XKeyEvent *pEvent,
/* unhandled error */
break;
case XLookupKeySym:
- /* #72223# this is a strange one: on exceed sometimes
+ /* this is a strange one: on exceed sometimes
* no printable is returned for the first char entered,
* just to retry lookup solves the problem. The problem
* is not yet fully understood, so restrict 2nd lookup
@@ -2166,7 +2155,7 @@ XLIB_Cursor SalDisplay::GetPointer( int ePointerStyle )
MAKE_CURSOR( vertcurs_ );
break;
- // --> FME 2004-07-30 #i32329# Enhanced table selection
+ // #i32329# Enhanced table selection
case POINTER_TAB_SELECT_S:
MAKE_CURSOR( tblsels_ );
break;
@@ -2182,13 +2171,11 @@ XLIB_Cursor SalDisplay::GetPointer( int ePointerStyle )
case POINTER_TAB_SELECT_SW:
MAKE_CURSOR( tblselsw_ );
break;
- // <--
- // --> FME 2004-08-16 #i20119# Paintbrush tool
+ // #i20119# Paintbrush tool
case POINTER_PAINTBRUSH :
MAKE_CURSOR( paintbrush_ );
break;
- // <--
default:
DBG_ERROR("pointer not implemented");
@@ -3120,17 +3107,12 @@ SalColormap::SalColormap( const SalDisplay *pDisplay, Colormap hColormap, int nS
GetXPixels( aColor, 0xC0, 0xC0, 0xC0 );
// light colors: 3 * 2 = 6
-// GetXPixels( aColor, 0x00, 0x00, 0x00 );
+
GetXPixels( aColor, 0x00, 0x00, 0xFF );
GetXPixels( aColor, 0x00, 0xFF, 0x00 );
GetXPixels( aColor, 0x00, 0xFF, 0xFF );
-// GetXPixels( aColor, 0xFF, 0x00, 0x00 );
-// GetXPixels( aColor, 0xFF, 0x00, 0xFF );
-// GetXPixels( aColor, 0xFF, 0xFF, 0x00 );
-// GetXPixels( aColor, 0xFF, 0xFF, 0xFF );
// standard colors: 7 * 2 = 14
-// GetXPixels( aColor, 0x00, 0x00, 0x00 );
GetXPixels( aColor, 0x00, 0x00, 0x80 );
GetXPixels( aColor, 0x00, 0x80, 0x00 );
GetXPixels( aColor, 0x00, 0x80, 0x80 );
@@ -3138,7 +3120,7 @@ SalColormap::SalColormap( const SalDisplay *pDisplay, Colormap hColormap, int nS
GetXPixels( aColor, 0x80, 0x00, 0x80 );
GetXPixels( aColor, 0x80, 0x80, 0x00 );
GetXPixels( aColor, 0x80, 0x80, 0x80 );
- GetXPixels( aColor, 0x00, 0xB8, 0xFF ); // Blau 7
+ GetXPixels( aColor, 0x00, 0xB8, 0xFF ); // Blue 7
// cube: 6*6*6 - 8 = 208
for( r = 0; r < 0x100; r += 0x33 ) // 0x33, 0x66, 0x99, 0xCC, 0xFF
diff --git a/vcl/unx/source/dtrans/X11_selection.cxx b/vcl/unx/source/dtrans/X11_selection.cxx
index 8e155e3..165d016 100644
--- a/vcl/unx/source/dtrans/X11_selection.cxx
+++ b/vcl/unx/source/dtrans/X11_selection.cxx
@@ -387,7 +387,6 @@ void SelectionManager::initialize( const Sequence< Any >& arguments ) throw (::c
m_nCOMPOUNDAtom = getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("COMPOUND_TEXT")) );
m_nMULTIPLEAtom = getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("MULTIPLE")) );
m_nUTF16Atom = getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("ISO10646-1")) );
-// m_nUTF16Atom = getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("text/plain;charset=ISO-10646-UCS-2")) );
m_nImageBmpAtom = getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("image/bmp")) );
// Atoms for Xdnd protocol
@@ -604,7 +603,7 @@ OString SelectionManager::convertToCompound( const OUString& rText )
aRet = (char*)aProp.value;
XFree( aProp.value );
#ifdef SOLARIS
- /* #97070#
+ /*
* for currently unknown reasons XmbTextListToTextProperty on Solaris returns
* no data in ISO8859-n encodings (at least for n = 1, 15)
* in these encodings the directly converted text does the
@@ -1442,7 +1441,6 @@ bool SelectionManager::getPasteDataTypes( Atom selection, Sequence< DataFlavor >
}
#if OSL_DEBUG_LEVEL > 1
-// if( selection != m_nCLIPBOARDAtom )
{
fprintf( stderr, "SelectionManager::getPasteDataTypes( %s ) = %s\n", OUStringToOString( getString( selection ), RTL_TEXTENCODING_ISO_8859_1 ).getStr(), bSuccess ? "true" : "false" );
for( int i = 0; i < rTypes.getLength(); i++ )
@@ -2613,7 +2611,6 @@ bool SelectionManager::handleDragEvent( XEvent& rMessage )
fprintf( stderr, "handleDragEvent: %s\n", OUStringToOString( getString( rMessage.xclient.message_type ), RTL_TEXTENCODING_ISO_8859_1 ).getStr() );
break;
case MotionNotify:
-// fprintf( stderr, "handleDragEvent: MotionNotify\n" );
break;
case EnterNotify:
fprintf( stderr, "handleDragEvent: EnterNotify\n" );
@@ -3641,7 +3638,7 @@ bool SelectionManager::handleXEvent( XEvent& rEvent )
* to get client messages it is essential not to dispatch
* events twice that we get on both connections
*
- * #95201# between dispatching ButtonPress and startDrag
+ * between dispatching ButtonPress and startDrag
* the user can already have released the mouse. The ButtonRelease
* will then be dispatched in VCLs queue and never turn up here.
* Which is not so good, since startDrag will XGrabPointer and
diff --git a/vcl/unx/source/gdi/salgdi.cxx b/vcl/unx/source/gdi/salgdi.cxx
index 4746e94..9b4c20c 100644
--- a/vcl/unx/source/gdi/salgdi.cxx
+++ b/vcl/unx/source/gdi/salgdi.cxx
@@ -249,10 +249,8 @@ void X11SalGraphics::SetClipRegion( GC pGC, XLIB_Region pXReg ) const
int n = 0;
XLIB_Region Regions[3];
- if( pClipRegion_ /* && !XEmptyRegion( pClipRegion_ ) */ )
+ if( pClipRegion_ )
Regions[n++] = pClipRegion_;
-// if( pPaintRegion_ /* && !XEmptyRegion( pPaintRegion_ ) */ )
-// Regions[n++] = pPaintRegion_;
if( pXReg && !XEmptyRegion( pXReg ) )
Regions[n++] = pXReg;
@@ -265,8 +263,7 @@ void X11SalGraphics::SetClipRegion( GC pGC, XLIB_Region pXReg ) const
{
XLIB_Region pTmpRegion = XCreateRegion();
XIntersectRegion( Regions[0], Regions[1], pTmpRegion );
-// if( 3 == n )
-// XIntersectRegion( Regions[2], pTmpRegion, pTmpRegion );
+
XSetRegion( pDisplay, pGC, pTmpRegion );
XDestroyRegion( pTmpRegion );
}
@@ -311,7 +308,6 @@ GC X11SalGraphics::SelectBrush()
if( !pBrushGC_ )
{
XGCValues values;
- // values.subwindow_mode = IncludeInferiors;
values.subwindow_mode = ClipByChildren;
values.fill_rule = EvenOddRule; // Pict import/ Gradient
values.graphics_exposures = False;
@@ -526,14 +522,11 @@ void X11SalGraphics::GetResolution( sal_Int32 &rDPIX, sal_Int32 &rDPIY ) // cons
{
// different x- and y- resolutions are usually artifacts of
// a wrongly calculated screen size.
- //if( (13*rDPIX >= 10*rDPIY) && (13*rDPIY >= 10*rDPIX) ) //+-30%
- {
#ifdef DEBUG
- printf("Forcing Resolution from %" SAL_PRIdINT32 "x%" SAL_PRIdINT32 " to %" SAL_PRIdINT32 "x%" SAL_PRIdINT32 "\n",
- rDPIX,rDPIY,rDPIY,rDPIY);
+ printf("Forcing Resolution from %" SAL_PRIdINT32 "x%" SAL_PRIdINT32 " to %" SAL_PRIdINT32 "x%" SAL_PRIdINT32 "\n",
+ rDPIX,rDPIY,rDPIY,rDPIY);
#endif
- rDPIX = rDPIY; // y-resolution is more trustworthy
- }
+ rDPIX = rDPIY; // y-resolution is more trustworthy
}
}
diff --git a/vcl/unx/source/gdi/xfont.cxx b/vcl/unx/source/gdi/xfont.cxx
index a999eaf..e932431 100644
--- a/vcl/unx/source/gdi/xfont.cxx
+++ b/vcl/unx/source/gdi/xfont.cxx
@@ -141,7 +141,6 @@ ExtendedFontStruct::LoadEncoding( rtl_TextEncoding nEncoding )
return nIdx;
// limit font height that gets requested from the XServer
- // see BugId #44528# FontWork (-> #45038#) and as well Bug #47127#
int nReqPixelHeight = maPixelSize.Height();
if( nReqPixelHeight > GetMaxFontHeight() )
nReqPixelHeight = GetMaxFontHeight();
diff --git a/vcl/unx/source/printer/ppdparser.cxx b/vcl/unx/source/printer/ppdparser.cxx
index 5fee6f9..c3b6ba8 100644
--- a/vcl/unx/source/printer/ppdparser.cxx
+++ b/vcl/unx/source/printer/ppdparser.cxx
@@ -1267,7 +1267,7 @@ void PPDParser::parseConstraint( const ByteString& rLine )
}
else
// constraint for nonexistent keys; this happens
- // e.g. in HP4PLUS3 (#75636#)
+ // e.g. in HP4PLUS3
bFailed = true;
}
}
@@ -1315,13 +1315,9 @@ bool PPDParser::getMargins(
ImLLy = StringToDouble( GetCommandLineToken( 1, aArea ) );
ImURx = StringToDouble( GetCommandLineToken( 2, aArea ) );
ImURy = StringToDouble( GetCommandLineToken( 3, aArea ) );
-// sscanf( m_pImageableAreas->getValue( nImArea )->m_aValue.GetStr(),
-// "%lg%lg%lg%lg", &ImLLx, &ImLLy, &ImURx, &ImURy );
aArea = m_pPaperDimensions->getValue( nPDim )->m_aValue;
PDWidth = StringToDouble( GetCommandLineToken( 0, aArea ) );
PDHeight = StringToDouble( GetCommandLineToken( 1, aArea ) );
-// sscanf( m_pPaperDimensions->getValue( nPDim )->m_aValue.GetStr(),
-// "%lg%lg", &PDWidth, &PDHeight );
rLeft = (int)(ImLLx + 0.5);
rLower = (int)(ImLLy + 0.5);
rUpper = (int)(PDHeight - ImURy + 0.5);
diff --git a/vcl/unx/source/printergfx/common_gfx.cxx b/vcl/unx/source/printergfx/common_gfx.cxx
index abeacdd..57f642d 100644
--- a/vcl/unx/source/printergfx/common_gfx.cxx
+++ b/vcl/unx/source/printergfx/common_gfx.cxx
@@ -144,7 +144,7 @@ PrinterGfx::PrinterGfx() :
PrinterGfx::~PrinterGfx()
{
/*
- * #95810# the original reasoning why mpFontSubstitutes is a pointer was
+ * the original reasoning why mpFontSubstitutes is a pointer was
* that applications should release all PrinterGfx when printers change
* because they are really invalid; the corresponding printers may have
* changed their settings or even not exist anymore.
@@ -646,7 +646,7 @@ PrinterGfx::DrawPolyPolygonBezier (sal_uInt32 nPoly, const sal_uInt32 * pPoints,
for (unsigned int i=0; i<nPoly;i++)
{
sal_uInt32 nPoints = pPoints[i];
- // #112689# sanity check
+ // sanity check
if( nPoints == 0 || pPtAry[i] == NULL )
continue;
diff --git a/vcl/unx/source/window/salframe.cxx b/vcl/unx/source/window/salframe.cxx
index e033cfd..f52f780 100644
--- a/vcl/unx/source/window/salframe.cxx
+++ b/vcl/unx/source/window/salframe.cxx
@@ -498,7 +498,7 @@ void X11SalFrame::Init( ULONG nSalFrameStyle, int nScreen, SystemParentData* pPa
nAttrMask,
&Attributes );
// FIXME: see above: fake shell window for now to own window
- if( /*! IsSysChildWindow() &&*/ pParentData == NULL )
+ if( pParentData == NULL )
{
mhShellWindow = mhWindow;
}
@@ -1174,7 +1174,6 @@ void X11SalFrame::Show( BOOL bVisible, BOOL bNoActivate )
GetDisplay()->getWMAdaptor()->frameIsMapping( this );
/*
- * #95097#
* Actually this is rather exotic and currently happens only in conjunction
* with the basic dialogue editor,
* which shows a frame and instantly hides it again. After that the
@@ -1259,7 +1258,6 @@ void X11SalFrame::Show( BOOL bVisible, BOOL bNoActivate )
if( IsFloatGrabWindow() )
{
/*
- * #95453#
* Sawfish and twm can be switched to enter-exit focus behaviour. In this case
* we must grab the pointer else the dumb WM will put the focus to the
* override-redirect float window. The application window will be deactivated
@@ -1310,7 +1308,7 @@ void X11SalFrame::Show( BOOL bVisible, BOOL bNoActivate )
nShowState_ = SHOWSTATE_NORMAL;
/*
- * #98107# plugged windows don't necessarily get the
+ * plugged windows don't necessarily get the
* focus on show because the parent may already be mapped
* and have the focus. So try to set the focus
* to the child on Show(TRUE)
@@ -2449,7 +2447,7 @@ void X11SalFrame::StartPresentation( BOOL bStart )
}
#endif
}
- else // if( !bStart ) // end of show
+ else
{
if( nScreenSaversTimeout_ )
{
@@ -2491,7 +2489,7 @@ void X11SalFrame::SetPointer( PointerStyle ePointerStyle )
void X11SalFrame::SetPointerPos(long nX, long nY)
{
- /* #87921# when the application tries to center the mouse in the dialog the
+ /* when the application tries to center the mouse in the dialog the
* window isn't mapped already. So use coordinates relative to the root window.
*/
unsigned int nWindowLeft = maGeometry.nX + nX;
@@ -2929,8 +2927,6 @@ long X11SalFrame::HandleMouseEvent( XEvent *pEvent )
if( LeaveNotify == pEvent->type || EnterNotify == pEvent->type )
{
/*
- * #89075# #89335#
- *
* some WMs (and/or) applications have a passive grab on
* mouse buttons (XGrabButton). This leads to enter/leave notifies
* with mouse buttons pressed in the state mask before the actual
@@ -2939,7 +2935,6 @@ long X11SalFrame::HandleMouseEvent( XEvent *pEvent )
* decides that a pressed button in a MouseMove belongs to
* a drag operation which leads to doing things differently.
*
- * #95901#
* ignore Enter/LeaveNotify resulting from grabs so that
* help windows do not disappear just after appearing
*
@@ -3460,17 +3455,17 @@ long X11SalFrame::HandleKeyEvent( XKeyEvent *pEvent )
// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
long X11SalFrame::HandleFocusEvent( XFocusChangeEvent *pEvent )
{
- // #107739# ReflectionX in Windows mode changes focus while mouse is grabbed
+ // ReflectionX in Windows mode changes focus while mouse is grabbed
if( nVisibleFloats > 0 && GetDisplay()->getWMAdaptor()->getWindowManagerName().EqualsAscii( "ReflectionX Windows" ) )
return 1;
- /* #55691# ignore focusout resulting from keyboard grabs
+ /* ignore focusout resulting from keyboard grabs
* we do not grab it and are not interested when
* someone else does CDE e.g. does a XGrabKey on arrow keys
- * #73179# handle focus events with mode NotifyWhileGrabbed
+ * handle focus events with mode NotifyWhileGrabbed
* because with CDE alt-tab focus changing we do not get
* normal focus events
- * #71791# cast focus event to the input context, otherwise the
+ * cast focus event to the input context, otherwise the
* status window does not follow the application frame
*/
@@ -3735,7 +3730,7 @@ long X11SalFrame::HandleReparentEvent( XReparentEvent *pEvent )
GetDisplay()->GetXLib()->PushXErrorLevel( true );
/*
- * #89186# don't rely on the new parent from the event.
+ * don't rely on the new parent from the event.
* the event may be "out of date", that is the window manager
* window may not exist anymore. This can happen if someone
* shows a frame and hides it again quickly (not that that would
@@ -3756,7 +3751,7 @@ long X11SalFrame::HandleReparentEvent( XReparentEvent *pEvent )
hWM_Parent = GetShellWindow();
break;
}
- /* #107048# this sometimes happens if a Show(TRUE) is
+ /* this sometimes happens if a Show(TRUE) is
* immediately followed by Show(FALSE) (which is braindead anyway)
*/
if( hDummy == hWM_Parent )
@@ -4133,7 +4128,7 @@ long X11SalFrame::Dispatch( XEvent *pEvent )
break;
case ButtonPress:
- // #74406# if we loose the focus in presentation mode
+ // if we loose the focus in presentation mode
// there are good chances that we never get it back
// since the WM ignores us
if( IsOverrideRedirect() )
@@ -4165,7 +4160,7 @@ long X11SalFrame::Dispatch( XEvent *pEvent )
if( nShowState_ == SHOWSTATE_HIDDEN )
{
/*
- * #95097# workaround for (at least) KWin 2.2.2
+ * workaround for (at least) KWin 2.2.2
* which will map windows that were once transient
* even if they are withdrawn when the respective
* document is mapped.
@@ -4204,12 +4199,12 @@ long X11SalFrame::Dispatch( XEvent *pEvent )
}
bool bSetFocus = m_bSetFocusOnMap;
- /* #99570# another workaround for sawfish: if a transient window for the same parent is shown
+ /* another workaround for sawfish: if a transient window for the same parent is shown
* sawfish does not set the focus to it. Applies only for click to focus mode.
*/
if( ! (nStyle_ & SAL_FRAME_STYLE_FLOAT ) && mbInShow && GetDisplay()->getWMAdaptor()->getWindowManagerName().EqualsAscii( "Sawfish" ) )
{
- // #101775# don't set the focus into the IME status window
+ // don't set the focus into the IME status window
// since this will lead to a parent loose-focus, close status,
// reget focus, open status, .... flicker loop
if ( (I18NStatus::get().getStatusFrame() != this) )
More information about the Libreoffice-commits
mailing list