summaryrefslogtreecommitdiff
path: root/vcl/unx/gtk/gdi
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2014-04-02 16:45:44 +0300
committerTor Lillqvist <tml@collabora.com>2014-04-02 16:54:18 +0300
commit50bf123ddbeb457b89636621a99c971834adf3ab (patch)
treeb7782261998ca0b6bece98543e2c66e3c96f4d3c /vcl/unx/gtk/gdi
parentdb1c9e4dadc90c5afe3190776a60cc5dcbbce3ac (diff)
Kill superfluous vertical whitespace
Change-Id: I81ce8fd7022bf283db668705efdfb0666f87bde9
Diffstat (limited to 'vcl/unx/gtk/gdi')
-rw-r--r--vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx84
-rw-r--r--vcl/unx/gtk/gdi/salprn-gtk.cxx23
2 files changed, 0 insertions, 107 deletions
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index be7b35e53c5b..a2b332620088 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -61,7 +61,6 @@ GtkSalGraphics::~GtkSalGraphics()
{
}
-
/*************************************
* Cached native widget objects
*************************************/
@@ -172,7 +171,6 @@ static const GtkBorder aDefDefBorder = { 1, 1, 1, 1 };
#define BTN_CHILD_SPACING 1
#define MIN_SPIN_ARROW_WIDTH 6
-
static void NWEnsureGTKRadio ( SalX11Screen nScreen );
static void NWEnsureGTKButton ( SalX11Screen nScreen );
static void NWEnsureGTKCheck ( SalX11Screen nScreen );
@@ -205,13 +203,11 @@ static void NWCalcArrowRect( const Rectangle& rButton, Rectangle& rArrow );
*
*/
-
static Rectangle NWGetButtonArea( SalX11Screen nScreen, ControlType nType, ControlPart nPart, Rectangle aAreaRect, ControlState nState,
const ImplControlValue& aValue, const OUString& rCaption );
static Rectangle NWGetTabItemRect( SalX11Screen nScreen, Rectangle aAreaRect );
-
static Rectangle NWGetEditBoxPixmapRect( SalX11Screen nScreen, ControlType nType, ControlPart nPart, Rectangle aAreaRect, ControlState nState,
const ImplControlValue& aValue, const OUString& rCaption );
@@ -230,7 +226,6 @@ static void NWPaintOneSpinButton( SalX11Screen nScreen, GdkPixmap * pixmap, Cont
static Rectangle NWGetComboBoxButtonRect( SalX11Screen nScreen, ControlType nType, ControlPart nPart, Rectangle aAreaRect, ControlState nState,
const ImplControlValue& aValue, const OUString& rCaption );
-
static Rectangle NWGetListBoxButtonRect( SalX11Screen nScreen, ControlType nType, ControlPart nPart, Rectangle aAreaRect, ControlState nState,
const ImplControlValue& aValue, const OUString& rCaption );
@@ -247,10 +242,8 @@ static Rectangle NWGetToolbarRect( SalX11Screen nScreen,
static int getFrameWidth(GtkWidget* widget);
-
static Rectangle NWGetScrollButtonRect( SalX11Screen nScreen, ControlPart nPart, Rectangle aAreaRect );
-
/*********************************************************
* PixmapCache
*********************************************************/
@@ -317,7 +310,6 @@ void NWPixmapCacheData::SetPixmap( GdkPixmap* pPixmap )
g_object_ref( m_pixmap );
}
-
NWPixmapCache::NWPixmapCache( SalX11Screen nScreen )
{
m_idx = 0;
@@ -373,7 +365,6 @@ void NWPixmapCache::Fill( ControlType aType, ControlState aState, const Rectangl
pData[m_idx].SetPixmap( pPixmap );
}
-
void NWPixmapCacheList::AddCache( NWPixmapCache* pCache )
{
mCaches.push_back( pCache );
@@ -395,7 +386,6 @@ void NWPixmapCacheList::ThemeChanged( )
}
}
-
/*********************************************************
* Make border manipulation easier
*********************************************************/
@@ -407,7 +397,6 @@ inline void NW_gtk_border_set_from_border( GtkBorder& aDst, const GtkBorder * pS
aDst.bottom = pSrc->bottom;
}
-
/*********************************************************
* Initialize GTK and local stuff
*********************************************************/
@@ -474,7 +463,6 @@ void GtkData::initNWF( void )
#endif
}
-
/*********************************************************
* Release GTK and local stuff
*********************************************************/
@@ -502,7 +490,6 @@ void GtkData::deInitNWF( void )
}
}
-
/**********************************************************
* track clip region
**********************************************************/
@@ -654,7 +641,6 @@ bool GtkSalGraphics::IsNativeControlSupported( ControlType nType, ControlPart nP
return false;
}
-
/*
* HitTestNativeControl()
*
@@ -766,7 +752,6 @@ bool GtkSalGraphics::hitTestNativeControl( ControlType nType,
}
}
-
/*
* DrawNativeControl()
*
@@ -1622,8 +1607,6 @@ static Rectangle NWGetTabItemRect( SalX11Screen nScreen, Rectangle aAreaRect )
return Rectangle( Point( x, y ), Size( w, h ) );
}
-
-
bool GtkSalGraphics::NWPaintGTKRadio( GdkDrawable* gdkDrawable,
ControlType, ControlPart,
const Rectangle& rControlRectangle,
@@ -1680,8 +1663,6 @@ bool GtkSalGraphics::NWPaintGTKRadio( GdkDrawable* gdkDrawable,
return true;
}
-
-
bool GtkSalGraphics::NWPaintGTKCheck( GdkDrawable* gdkDrawable,
ControlType, ControlPart,
const Rectangle& rControlRectangle,
@@ -1727,7 +1708,6 @@ bool GtkSalGraphics::NWPaintGTKCheck( GdkDrawable* gdkDrawable,
return true;
}
-
static void NWCalcArrowRect( const Rectangle& rButton, Rectangle& rArrow )
{
// Size the arrow appropriately
@@ -2068,8 +2048,6 @@ bool GtkSalGraphics::NWPaintGTKScrollbar( ControlType, ControlPart nPart,
return true;
}
-
-
static Rectangle NWGetScrollButtonRect( SalX11Screen nScreen, ControlPart nPart, Rectangle aAreaRect )
{
gint slider_width;
@@ -2151,8 +2129,6 @@ static Rectangle NWGetScrollButtonRect( SalX11Screen nScreen, ControlPart nPa
return( buttonRect );
}
-
-
bool GtkSalGraphics::NWPaintGTKEditBox( GdkDrawable* gdkDrawable,
ControlType nType, ControlPart nPart,
const Rectangle& rControlRectangle,
@@ -2181,7 +2157,6 @@ bool GtkSalGraphics::NWPaintGTKEditBox( GdkDrawable* gdkDrawable,
return true;
}
-
/* Take interior/exterior focus into account and return
* the bounding rectangle of the edit box including
* any focus requirements.
@@ -2215,7 +2190,6 @@ static Rectangle NWGetEditBoxPixmapRect(SalX11Screen nScreen,
return( pixmapRect );
}
-
/* Paint a GTK Entry widget into the specified GdkPixmap.
* All coordinates should be local to the Pixmap, NOT
* screen/window coordinates.
@@ -2288,10 +2262,6 @@ static void NWPaintOneEditBox( SalX11Screen nScreen,
}
-
-
-
-
bool GtkSalGraphics::NWPaintGTKSpinBox( ControlType nType, ControlPart nPart,
const Rectangle& rControlRectangle,
const clipList&,
@@ -2340,7 +2310,6 @@ bool GtkSalGraphics::NWPaintGTKSpinBox( ControlType nType, ControlPart nPart,
else
pixmapRect = rControlRectangle;
-
pixmap = NWGetPixmapFromScreen( pixmapRect );
if ( !pixmap )
return false;
@@ -2396,8 +2365,6 @@ bool GtkSalGraphics::NWPaintGTKSpinBox( ControlType nType, ControlPart nPart,
return true;
}
-
-
static Rectangle NWGetSpinButtonRect( SalX11Screen nScreen,
ControlType,
ControlPart nPart,
@@ -2487,9 +2454,6 @@ static void NWPaintOneSpinButton( SalX11Screen nScreen,
arrowRect.GetWidth(), arrowRect.GetHeight() );
}
-
-
-
bool GtkSalGraphics::NWPaintGTKComboBox( GdkDrawable* gdkDrawable,
ControlType nType, ControlPart nPart,
const Rectangle& rControlRectangle,
@@ -2568,8 +2532,6 @@ bool GtkSalGraphics::NWPaintGTKComboBox( GdkDrawable* gdkDrawable,
return true;
}
-
-
static Rectangle NWGetComboBoxButtonRect( SalX11Screen nScreen,
ControlType,
ControlPart nPart,
@@ -2626,10 +2588,6 @@ static Rectangle NWGetComboBoxButtonRect( SalX11Screen nScreen,
return( aButtonRect );
}
-
-
-
-
bool GtkSalGraphics::NWPaintGTKTabItem( ControlType nType, ControlPart,
const Rectangle& rControlRectangle,
const clipList&,
@@ -2781,8 +2739,6 @@ bool GtkSalGraphics::NWPaintGTKTabItem( ControlType nType, ControlPart,
return bSuccess;
}
-
-
bool GtkSalGraphics::NWPaintGTKListBox( GdkDrawable* gdkDrawable,
ControlType nType, ControlPart nPart,
const Rectangle& rControlRectangle,
@@ -3032,8 +2988,6 @@ bool GtkSalGraphics::NWPaintGTKToolbar(
return true;
}
-
-
bool GtkSalGraphics::NWPaintGTKMenubar(
GdkDrawable* gdkDrawable,
ControlType, ControlPart nPart,
@@ -3528,15 +3482,12 @@ bool GtkSalGraphics::NWPaintGTKSlider(
eOri );
}
-
bool bRet = NWRenderPixmapToScreen( pixmap, rControlRectangle );
g_object_unref( pixmap );
return bRet;
}
-
-
static int getFrameWidth(GtkWidget* widget)
{
return widget->style->xthickness;
@@ -3605,8 +3556,6 @@ static Rectangle NWGetListBoxButtonRect( SalX11Screen nScreen,
return( aPartRect );
}
-
-
static Rectangle NWGetListBoxIndicatorRect( SalX11Screen nScreen,
ControlType,
ControlPart,
@@ -4104,7 +4053,6 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings )
rSettings.SetStyleSettings( aStyleSet );
}
-
/************************************************************************
* Create a GdkPixmap filled with the contents of an area of an Xlib window
************************************************************************/
@@ -4138,9 +4086,6 @@ GdkPixmap* GtkSalGraphics::NWGetPixmapFromScreen( Rectangle srcRect )
return( pPixmap );
}
-
-
-
/************************************************************************
* Copy an alpha pixmap to screen using a gc with clipping
************************************************************************/
@@ -4170,7 +4115,6 @@ bool GtkSalGraphics::NWRenderPixmapToScreen( GdkPixmap* pPixmap, Rectangle dstRe
return true;
}
-
/************************************************************************
* State conversion
************************************************************************/
@@ -4224,8 +4168,6 @@ static void NWSetWidgetState( GtkWidget* widget, ControlState nState, GtkStateTy
* Widget ensure functions - make sure cached objects are valid
************************************************************************/
-
-
static void NWAddWidgetToCacheWindow( GtkWidget* widget, SalX11Screen nScreen )
{
NWFWidgetData& rData = gWidgetData[nScreen];
@@ -4257,8 +4199,6 @@ static void NWAddWidgetToCacheWindow( GtkWidget* widget, SalX11Screen nScreen )
gWidgetDefaultFlags[ (long)widget ] = GTK_WIDGET_FLAGS( widget );
}
-
-
static void NWEnsureGTKButton( SalX11Screen nScreen )
{
if ( !gWidgetData[nScreen].gBtnWidget )
@@ -4268,8 +4208,6 @@ static void NWEnsureGTKButton( SalX11Screen nScreen )
}
}
-
-
static void NWEnsureGTKRadio( SalX11Screen nScreen )
{
if ( !gWidgetData[nScreen].gRadioWidget || !gWidgetData[nScreen].gRadioWidgetSibling )
@@ -4281,8 +4219,6 @@ static void NWEnsureGTKRadio( SalX11Screen nScreen )
}
}
-
-
static void NWEnsureGTKCheck( SalX11Screen nScreen )
{
if ( !gWidgetData[nScreen].gCheckWidget )
@@ -4292,8 +4228,6 @@ static void NWEnsureGTKCheck( SalX11Screen nScreen )
}
}
-
-
static void NWEnsureGTKScrollbars( SalX11Screen nScreen )
{
if ( !gWidgetData[nScreen].gScrollHorizWidget )
@@ -4309,8 +4243,6 @@ static void NWEnsureGTKScrollbars( SalX11Screen nScreen )
}
}
-
-
static void NWEnsureGTKArrow( SalX11Screen nScreen )
{
if ( !gWidgetData[nScreen].gArrowWidget || !gWidgetData[nScreen].gDropdownWidget )
@@ -4324,8 +4256,6 @@ static void NWEnsureGTKArrow( SalX11Screen nScreen )
}
}
-
-
static void NWEnsureGTKEditBox( SalX11Screen nScreen )
{
if ( !gWidgetData[nScreen].gEditBoxWidget )
@@ -4335,8 +4265,6 @@ static void NWEnsureGTKEditBox( SalX11Screen nScreen )
}
}
-
-
static void NWEnsureGTKSpinButton( SalX11Screen nScreen )
{
if ( !gWidgetData[nScreen].gSpinButtonWidget )
@@ -4352,8 +4280,6 @@ static void NWEnsureGTKSpinButton( SalX11Screen nScreen )
}
}
-
-
static void NWEnsureGTKNotebook( SalX11Screen nScreen )
{
if ( !gWidgetData[nScreen].gNotebookWidget )
@@ -4363,8 +4289,6 @@ static void NWEnsureGTKNotebook( SalX11Screen nScreen )
}
}
-
-
static void NWEnsureGTKOptionMenu( SalX11Screen nScreen )
{
if ( !gWidgetData[nScreen].gOptionMenuWidget )
@@ -4374,8 +4298,6 @@ static void NWEnsureGTKOptionMenu( SalX11Screen nScreen )
}
}
-
-
static void NWEnsureGTKCombo( SalX11Screen nScreen )
{
if ( !gWidgetData[nScreen].gComboWidget )
@@ -4394,8 +4316,6 @@ static void NWEnsureGTKCombo( SalX11Screen nScreen )
}
}
-
-
static void NWEnsureGTKScrolledWindow( SalX11Screen nScreen )
{
if ( !gWidgetData[nScreen].gScrolledWindowWidget )
@@ -4408,8 +4328,6 @@ static void NWEnsureGTKScrolledWindow( SalX11Screen nScreen )
}
}
-
-
static void NWEnsureGTKToolbar( SalX11Screen nScreen )
{
if( !gWidgetData[nScreen].gToolbarWidget )
@@ -4439,8 +4357,6 @@ static void NWEnsureGTKToolbar( SalX11Screen nScreen )
}
}
-
-
static void NWEnsureGTKMenubar( SalX11Screen nScreen )
{
if( !gWidgetData[nScreen].gMenubarWidget )
diff --git a/vcl/unx/gtk/gdi/salprn-gtk.cxx b/vcl/unx/gtk/gdi/salprn-gtk.cxx
index eb6609098960..0251ffd29841 100644
--- a/vcl/unx/gtk/gdi/salprn-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salprn-gtk.cxx
@@ -114,7 +114,6 @@ private:
boost::shared_ptr<GtkPrintWrapper> m_pWrapper;
};
-
struct GtkSalPrinter_Impl
{
OString m_sSpoolFile;
@@ -126,14 +125,12 @@ struct GtkSalPrinter_Impl
~GtkSalPrinter_Impl();
};
-
GtkSalPrinter_Impl::GtkSalPrinter_Impl()
: m_pPrinter(0)
, m_pSettings(0)
{
}
-
GtkSalPrinter_Impl::~GtkSalPrinter_Impl()
{
if (m_pPrinter)
@@ -173,7 +170,6 @@ GtkSalPrinter::GtkSalPrinter(SalInfoPrinter* const i_pInfoPrinter)
{
}
-
bool
GtkSalPrinter::impl_doJob(
const OUString* const i_pFileName,
@@ -207,7 +203,6 @@ GtkSalPrinter::impl_doJob(
return bJobStarted;
}
-
bool
GtkSalPrinter::StartJob(
const OUString* const i_pFileName,
@@ -266,7 +261,6 @@ GtkSalPrinter::StartJob(
return impl_doJob(&aFileName, i_rJobName, i_rAppName, io_pSetupData, nCopies, bCollate, io_rController);
}
-
bool
GtkSalPrinter::EndJob()
{
@@ -316,7 +310,6 @@ GtkSalPrinter::EndJob()
return bRet;
}
-
namespace
{
@@ -337,7 +330,6 @@ lcl_setHelpText(
#endif
}
-
static GtkWidget*
lcl_makeFrame(
GtkWidget* const i_pChild,
@@ -415,7 +407,6 @@ GtkPrintDialog::GtkPrintDialog(vcl::PrinterController& io_rController)
impl_readFromSettings();
}
-
void
GtkPrintDialog::impl_initDialog()
{
@@ -448,7 +439,6 @@ GtkPrintDialog::impl_initDialog()
));
}
-
void
GtkPrintDialog::impl_initCustomTab()
{
@@ -761,7 +751,6 @@ GtkPrintDialog::impl_initCustomTab()
}
}
-
void
GtkPrintDialog::impl_initPrintContent(uno::Sequence<sal_Bool> const& i_rDisabled)
{
@@ -815,7 +804,6 @@ GtkPrintDialog::impl_initPrintContent(uno::Sequence<sal_Bool> const& i_rDisabled
}
}
-
void
GtkPrintDialog::impl_checkOptionalControlDependencies()
{
@@ -826,7 +814,6 @@ GtkPrintDialog::impl_checkOptionalControlDependencies()
}
}
-
beans::PropertyValue*
GtkPrintDialog::impl_queryPropertyValue(GtkWidget* const i_pWidget) const
{
@@ -844,7 +831,6 @@ GtkPrintDialog::impl_queryPropertyValue(GtkWidget* const i_pWidget) const
return pVal;
}
-
void
GtkPrintDialog::impl_UIOption_CheckHdl(GtkWidget* const i_pWidget)
{
@@ -858,7 +844,6 @@ GtkPrintDialog::impl_UIOption_CheckHdl(GtkWidget* const i_pWidget)
}
}
-
void
GtkPrintDialog::impl_UIOption_RadioHdl(GtkWidget* const i_pWidget)
{
@@ -877,7 +862,6 @@ GtkPrintDialog::impl_UIOption_RadioHdl(GtkWidget* const i_pWidget)
}
}
-
void
GtkPrintDialog::impl_UIOption_SelectHdl(GtkWidget* const i_pWidget)
{
@@ -891,7 +875,6 @@ GtkPrintDialog::impl_UIOption_SelectHdl(GtkWidget* const i_pWidget)
}
}
-
bool
GtkPrintDialog::run()
{
@@ -951,7 +934,6 @@ void GtkPrintDialog::ExportAsPDF(const OUString &rFileURL, GtkPrintSettings *pSe
aFilterData[1].Name = "FirstPageOnLeft";
aFilterData[1].Value <<= sal_False;
-
const gchar *pStr = gtk_print_settings_get(pSettings, GTK_PRINT_SETTINGS_PRINT_PAGES);
if (pStr && !strcmp(pStr, "ranges"))
{
@@ -1052,7 +1034,6 @@ void GtkPrintDialog::ExportAsPDF(const OUString &rFileURL, GtkPrintSettings *pSe
}
#endif
-
void
GtkPrintDialog::updateControllerPrintRange()
{
@@ -1104,13 +1085,11 @@ GtkPrintDialog::updateControllerPrintRange()
g_object_unref(G_OBJECT(pSettings));
}
-
GtkPrintDialog::~GtkPrintDialog()
{
gtk_widget_destroy(m_pDialog);
}
-
void
GtkPrintDialog::impl_readFromSettings()
{
@@ -1147,7 +1126,6 @@ GtkPrintDialog::impl_readFromSettings()
g_object_unref(G_OBJECT(pSettings));
}
-
void
GtkPrintDialog::impl_storeToSettings()
const
@@ -1170,7 +1148,6 @@ const
pItem->Commit();
}
-
sal_uLong
GtkSalInfoPrinter::GetCapabilities(
const ImplJobSetup* const i_pSetupData,