diff options
author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-25 22:51:59 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-26 04:56:16 -0600 |
commit | d9f0af83b7f0abe7119eefca62cbbca7eff818ef (patch) | |
tree | 19b6ed4d3b1dd538bb46205880505e59f8bb8002 /vcl/unx | |
parent | fdo#72563 : PAGEREF field tag not preserved during Roundtrip (diff) | |
download | core-d9f0af83b7f0abe7119eefca62cbbca7eff818ef.tar.gz core-d9f0af83b7f0abe7119eefca62cbbca7eff818ef.zip |
Remove visual noise from vcl
Conflicts:
vcl/source/app/settings.cxx
vcl/source/window/dockmgr.cxx
vcl/source/window/dockwin.cxx
vcl/source/window/floatwin.cxx
vcl/source/window/toolbox2.cxx
Change-Id: Ie67681549a76e77064b09d4b5bf80fe4c6010341
Reviewed-on: https://gerrit.libreoffice.org/8339
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/unx')
30 files changed, 168 insertions, 168 deletions
diff --git a/vcl/unx/generic/app/i18n_cb.cxx b/vcl/unx/generic/app/i18n_cb.cxx index 1c798ae8ec6a..ac62b621275d 100644 --- a/vcl/unx/generic/app/i18n_cb.cxx +++ b/vcl/unx/generic/app/i18n_cb.cxx @@ -39,9 +39,9 @@ #include "salframe.hxx" -// + // i. preedit start callback -// + int @@ -59,9 +59,9 @@ PreeditStartCallback ( XIC, XPointer client_data, XPointer ) } -// + // ii. preedit done callback -// + void @@ -77,15 +77,15 @@ PreeditDoneCallback ( XIC, XPointer client_data, XPointer ) } -// + // iii. preedit draw callback -// -// + + // Handle deletion of text in a preedit_draw_callback // from and howmuch are guaranteed to be nonnegative -// + void Preedit_DeleteText(preedit_text_t *ptext, int from, int howmuch) @@ -148,10 +148,10 @@ enlarge_buffer ( preedit_text_t *ptext, int nnewlimit ) nnewsize * sizeof(XIMFeedback)); } -// + // Handle insertion of text in a preedit_draw_callback // string field of XIMText struct is guaranteed to be != NULL -// + void Preedit_InsertText(preedit_text_t *pText, XIMText *pInsertText, int where) @@ -241,9 +241,9 @@ Preedit_InsertText(preedit_text_t *pText, XIMText *pInsertText, int where) pText->pUnicodeBuffer[pText->nLength] = (sal_Unicode)0; } -// + // Handle the change of attributes in a preedit_draw_callback -// + void Preedit_UpdateAttributes ( preedit_text_t* ptext, XIMFeedback* feedback, int from, int amount ) @@ -376,9 +376,9 @@ PreeditDrawCallback(XIC ic, XPointer client_data, } } - // + // build the SalExtTextInputEvent and send it up - // + pPreeditData->aInputEv.mnTime = 0; pPreeditData->aInputEv.mpTextAttr = Preedit_FeedbackToSAL( pPreeditData->aText.pCharStyle, pPreeditData->aText.nLength, pPreeditData->aInputFlags); @@ -402,9 +402,9 @@ PreeditDrawCallback(XIC ic, XPointer client_data, void GetPreeditSpotLocation(XIC ic, XPointer client_data) { - // + // Send SalEventExtTextInputPos event to get spotlocation - // + SalExtTextInputPosEvent mPosEvent; preedit_data_t* pPreeditData = (preedit_data_t*)client_data; @@ -424,9 +424,9 @@ GetPreeditSpotLocation(XIC ic, XPointer client_data) } -// + // iv. preedit caret callback -// + #if OSL_DEBUG_LEVEL > 1 @@ -473,10 +473,10 @@ PreeditCaretCallback ( XIC, XPointer,XIMPreeditCaretCallbackStruct* ) } -// + // v. commit string callback: convert an extended text input (iiimp ... ) // into an ordinary key-event -// + Bool @@ -489,9 +489,9 @@ IsControlCode(sal_Unicode nChar) } -// + // vi. status callbacks: for now these are empty, they are just needed for turbo linux -// + void @@ -558,9 +558,9 @@ SwitchIMCallback (XIC, XPointer, XPointer call_data) } -// + // vii. destroy callbacks: internally disable all IC/IM calls -// + void diff --git a/vcl/unx/generic/app/i18n_ic.cxx b/vcl/unx/generic/app/i18n_ic.cxx index d486066e82b8..4430caaef58b 100644 --- a/vcl/unx/generic/app/i18n_ic.cxx +++ b/vcl/unx/generic/app/i18n_ic.cxx @@ -57,10 +57,10 @@ static void sendEmptyCommit( SalFrame* pFrame ) } -// + // Constructor / Destructor, the InputContext is bound to the SalFrame, as it // needs the shell window as a focus window -// + SalI18N_InputContext::~SalI18N_InputContext() @@ -134,9 +134,9 @@ get_font_set( Display *p_display ) } -// + // Constructor for a InputContext (IC) -// + SalI18N_InputContext::SalI18N_InputContext ( SalFrame *pFrame ) : @@ -196,9 +196,9 @@ SalI18N_InputContext::SalI18N_InputContext ( SalFrame *pFrame ) : maClientData.aText.nCursorPos = 0; maClientData.aText.nLength = 0; - // + // Status attributes - // + switch ( mnStatusStyle ) { @@ -236,9 +236,9 @@ SalI18N_InputContext::SalI18N_InputContext ( SalFrame *pFrame ) : break; } - // + // set preedit attributes - // + switch ( mnPreeditStyle ) { @@ -374,10 +374,10 @@ SalI18N_InputContext::SalI18N_InputContext ( SalFrame *pFrame ) : } -// + // In Solaris 8 the status window does not unmap if the frame unmapps, so // unmap it the hard way -// + void @@ -420,10 +420,10 @@ SalI18N_InputContext::Map( SalFrame *pFrame ) } -// + // Handle DestroyCallbacks // in fact this is a callback called from the XNDestroyCallback -// + void @@ -434,10 +434,10 @@ SalI18N_InputContext::HandleDestroyIM() } -// + // make sure, the input method gets all the X-Events it needs, this is only // called once on each frame, it relys on a valid maContext -// + void @@ -461,9 +461,9 @@ SalI18N_InputContext::ExtendEventMask( XLIB_Window aFocusWindow ) } -// + // tune the styles provided by the input method with the supported one -// + unsigned int @@ -548,9 +548,9 @@ SalI18N_InputContext::SupportInputMethodStyle( XIMStyles *pIMStyles ) } -// + // handle extended and normal key input -// + int @@ -604,11 +604,11 @@ SalI18N_InputContext::UpdateSpotLocation() } -// + // set and unset the focus for the Input Context // the context may be NULL despite it is useable if the framewindow is // in unmapped state -// + void @@ -656,9 +656,9 @@ SalI18N_InputContext::UnsetICFocus( SalFrame* pFrame ) } -// + // multi byte input method only -// + void diff --git a/vcl/unx/generic/app/i18n_im.cxx b/vcl/unx/generic/app/i18n_im.cxx index 576023b3621b..04c88e0c8deb 100644 --- a/vcl/unx/generic/app/i18n_im.cxx +++ b/vcl/unx/generic/app/i18n_im.cxx @@ -49,10 +49,10 @@ extern "C" char * XSetIMValues(XIM im, ...); #endif -// + // kinput2 IME needs special key handling since key release events are filtered in // preeditmode and XmbResetIC does not work -// + bool @@ -144,9 +144,9 @@ XKeyEventOp::match (const XKeyEvent &rEvent) const } -// + // locale handling -// + // Locale handling of the operating system layer @@ -263,9 +263,9 @@ SalI18N_InputMethod::PosixLocale() } -// + // Constructor / Destructor / Initialisation -// + SalI18N_InputMethod::SalI18N_InputMethod( ) : mbUseable( bUseInputMethodDefault ), @@ -286,10 +286,10 @@ SalI18N_InputMethod::~SalI18N_InputMethod() XCloseIM ( maMethod ); } -// + // XXX // debug routine: lets have a look at the provided method styles -// + #if OSL_DEBUG_LEVEL > 1 @@ -352,10 +352,10 @@ PrintInputStyle( XIMStyles *pStyle ) #endif -// + // this is the real constructing routine, since locale setting has to be done // prior to xopendisplay, the xopenim call has to be delayed -// + bool SalI18N_InputMethod::CreateMethod ( Display *pDisplay ) @@ -401,9 +401,9 @@ SalI18N_InputMethod::CreateMethod ( Display *pDisplay ) return mbUseable; } -// + // give IM the opportunity to look at the event, and possibly hide it -// + bool SalI18N_InputMethod::FilterEvent( XEvent *pEvent, XLIB_Window window ) @@ -447,14 +447,14 @@ SalI18N_InputMethod::HandleDestroyIM() } -// + // add a connection watch into the SalXLib yieldTable to allow iiimp // connection processing: soffice waits in select() not in XNextEvent(), so // there may be requests pending on the iiimp internal connection that will // not be processed until XNextEvent is called the next time. If we do not // have the focus because the atok12 lookup choice aux window has it we stay // deaf and dump otherwise. -// + int diff --git a/vcl/unx/generic/app/keysymnames.cxx b/vcl/unx/generic/app/keysymnames.cxx index 0bdebe44c81e..50c53696acce 100644 --- a/vcl/unx/generic/app/keysymnames.cxx +++ b/vcl/unx/generic/app/keysymnames.cxx @@ -52,13 +52,13 @@ namespace vcl_sal { int nReplacements; }; - // ==================================================================== - // + + // CAUTION CAUTION CAUTION // every string value in the replacements tables must be in UTF8 // be careful with your editor ! - // - // ==================================================================== + + static const struct KeysymNameReplacement aImplReplacements_English[] = { diff --git a/vcl/unx/generic/dtrans/X11_clipboard.hxx b/vcl/unx/generic/dtrans/X11_clipboard.hxx index eaff1710a4c6..180631f3474a 100644 --- a/vcl/unx/generic/dtrans/X11_clipboard.hxx +++ b/vcl/unx/generic/dtrans/X11_clipboard.hxx @@ -27,7 +27,7 @@ #include <com/sun/star/datatransfer/clipboard/XSystemClipboard.hpp> #include <cppuhelper/compbase2.hxx> -// ------------------------------------------------------------------------ + #define X11_CLIPBOARD_IMPLEMENTATION_NAME "com.sun.star.datatransfer.X11ClipboardSupport" @@ -118,13 +118,13 @@ namespace x11 { virtual com::sun::star::uno::Reference< XInterface > getReference() throw(); }; -// ------------------------------------------------------------------------ + Sequence< OUString > SAL_CALL X11Clipboard_getSupportedServiceNames(); com::sun::star::uno::Reference< XInterface > SAL_CALL X11Clipboard_createInstance( const com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & xMultiServiceFactory); -// ------------------------------------------------------------------------ + } // namepspace diff --git a/vcl/unx/generic/dtrans/X11_selection.hxx b/vcl/unx/generic/dtrans/X11_selection.hxx index cb968f24f147..db8c8741b9e1 100644 --- a/vcl/unx/generic/dtrans/X11_selection.hxx +++ b/vcl/unx/generic/dtrans/X11_selection.hxx @@ -49,7 +49,7 @@ namespace x11 { class PixmapHolder; // in bmp.hxx -// ------------------------------------------------------------------------ + rtl_TextEncoding getTextPlainEncoding( const OUString& rMimeType ); class SelectionAdaptor @@ -507,7 +507,7 @@ namespace x11 { throw( ::com::sun::star::uno::RuntimeException ); }; -// ------------------------------------------------------------------------ + ::com::sun::star::uno::Sequence< OUString > SAL_CALL Xdnd_getSupportedServiceNames(); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Xdnd_createInstance( @@ -517,7 +517,7 @@ namespace x11 { ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Xdnd_dropTarget_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & xMultiServiceFactory); -// ------------------------------------------------------------------------ + } diff --git a/vcl/unx/generic/dtrans/X11_transferable.cxx b/vcl/unx/generic/dtrans/X11_transferable.cxx index 34bdd27a0068..4ecac7165a36 100644 --- a/vcl/unx/generic/dtrans/X11_transferable.cxx +++ b/vcl/unx/generic/dtrans/X11_transferable.cxx @@ -46,13 +46,13 @@ X11Transferable::X11Transferable( { } -//================================================================================================== + X11Transferable::~X11Transferable() { } -//================================================================================================== + Any SAL_CALL X11Transferable::getTransferData( const DataFlavor& rFlavor ) throw(UnsupportedFlavorException, IOException, RuntimeException) @@ -85,7 +85,7 @@ Any SAL_CALL X11Transferable::getTransferData( const DataFlavor& rFlavor ) return aRet; } -//================================================================================================== + Sequence< DataFlavor > SAL_CALL X11Transferable::getTransferDataFlavors() throw(RuntimeException) @@ -98,7 +98,7 @@ Sequence< DataFlavor > SAL_CALL X11Transferable::getTransferDataFlavors() return aFlavorList; } -//================================================================================================== + sal_Bool SAL_CALL X11Transferable::isDataFlavorSupported( const DataFlavor& aFlavor ) throw(RuntimeException) diff --git a/vcl/unx/generic/gdi/gcach_xpeer.cxx b/vcl/unx/generic/gdi/gcach_xpeer.cxx index 44e82c5b44c9..51dd9b58ed29 100644 --- a/vcl/unx/generic/gdi/gcach_xpeer.cxx +++ b/vcl/unx/generic/gdi/gcach_xpeer.cxx @@ -29,7 +29,7 @@ #include "gcach_xpeer.hxx" #include "xrender_peer.hxx" -// =========================================================================== + X11GlyphPeer::X11GlyphPeer() { @@ -62,7 +62,7 @@ X11GlyphPeer::~X11GlyphPeer() } } -// =========================================================================== + X11GlyphCache::X11GlyphCache( X11GlyphPeer& rPeer ) : GlyphCache( rPeer ) @@ -118,13 +118,13 @@ void X11GlyphCache::KillInstance() return theGlyphCacheHolder::get().release(); } -// =========================================================================== + void X11SalGraphics::releaseGlyphPeer() { X11GlyphCache::KillInstance(); } -// =========================================================================== + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx index 2bc1c65a16a0..a8da77564967 100644 --- a/vcl/unx/generic/gdi/salgdi.cxx +++ b/vcl/unx/generic/gdi/salgdi.cxx @@ -594,7 +594,7 @@ bool X11SalGraphics::setClipRegion( const Region& i_rClip ) // aRect.y = (short)nY; // aRect.width = (unsigned short)nW; // aRect.height = (unsigned short)nH; - // + // XUnionRectWithRegion( &aRect, mpClipRegion, mpClipRegion ); // } // bRegionRect = i_rClip.ImplGetNextRect( aInfo, nX, nY, nW, nH ); diff --git a/vcl/unx/generic/gdi/salgdi3.cxx b/vcl/unx/generic/gdi/salgdi3.cxx index 7f40deb81377..c234973d4330 100644 --- a/vcl/unx/generic/gdi/salgdi3.cxx +++ b/vcl/unx/generic/gdi/salgdi3.cxx @@ -92,9 +92,9 @@ struct _XRegion }; -// + // X11SalGraphics -// + GC @@ -468,9 +468,9 @@ bool X11SalGraphics::GetImplFontCapabilities(vcl::FontCapabilities &rGetImplFont } -// + // SalGraphics -// + sal_uInt16 X11SalGraphics::SetFont( FontSelectPattern *pEntry, int nFallbackLevel ) diff --git a/vcl/unx/generic/gdi/xrender_peer.hxx b/vcl/unx/generic/gdi/xrender_peer.hxx index 3ea71a3af5e9..172fb1fb35a6 100644 --- a/vcl/unx/generic/gdi/xrender_peer.hxx +++ b/vcl/unx/generic/gdi/xrender_peer.hxx @@ -76,7 +76,7 @@ public: const _XTrap*, int nCount ) const; }; -//===================================================================== + inline XRenderPictFormat* XRenderPeer::GetStandardFormatA8() const { @@ -189,7 +189,7 @@ inline void XRenderPeer::AddTraps( Picture aDst, int nXOfs, int nYOfs, XRenderAddTraps( mpDisplay, aDst, nXOfs, nYOfs, pTraps, nCount ); } -//===================================================================== + inline XRenderColor GetXRenderColor( const SalColor& rSalColor, double fTransparency = 0.0 ) { @@ -214,7 +214,7 @@ inline XRenderColor GetXRenderColor( const SalColor& rSalColor, double fTranspar return aRetVal; } -//===================================================================== + #endif // INCLUDED_VCL_UNX_GENERIC_GDI_XRENDER_PEER_HXX diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index 7a0bdcca3d31..4bfd29a169d5 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -3316,9 +3316,9 @@ long X11SalFrame::HandleKeyEvent( XKeyEvent *pEvent ) } } - // + // update the spot location for PreeditPosition IME style - // + if (! aDeleteWatch.isDeleted()) { if (mpInputContext != NULL && mpInputContext->UseContext()) diff --git a/vcl/unx/generic/window/salobj.cxx b/vcl/unx/generic/window/salobj.cxx index f718ed30eb43..a06a7df96a40 100644 --- a/vcl/unx/generic/window/salobj.cxx +++ b/vcl/unx/generic/window/salobj.cxx @@ -39,7 +39,7 @@ #include <salwtype.hxx> -// ======================================================================= + // SalInstance member to create and destroy a SalObject SalObject* X11SalInstance::CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, sal_Bool bShow ) @@ -180,7 +180,7 @@ void X11SalInstance::DestroyObject( SalObject* pObject ) } -// ====================================================================== + // SalClipRegion is a member of SalObject // definition of SalClipRegion my be found in unx/inc/salobj.h @@ -230,7 +230,7 @@ SalClipRegion::UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) } -// ======================================================================= + // SalObject Implementation diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx index 7b7fe395eb8a..da9f630b57bb 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx @@ -370,7 +370,7 @@ void SalGtkFilePicker::impl_controlStateChanged( FilePickerEvent aEvent ) if (m_xListener.is()) m_xListener->controlStateChanged( aEvent ); } -//===================================================================== + struct FilterEntry { @@ -406,7 +406,7 @@ public: const UnoFilterEntry* endSubFilters() const { return m_aSubFilters.getConstArray() + m_aSubFilters.getLength(); } }; -//===================================================================== + FilterEntry::FilterEntry( const OUString& _rTitle, const UnoFilterList& _rSubFilters ) @@ -506,7 +506,7 @@ dialog_remove_buttons( GtkDialog *pDialog ) namespace { - //................................................................................ + struct FilterTitleMatch : public ::std::unary_function< FilterEntry, bool > { protected: @@ -515,7 +515,7 @@ namespace { public: FilterTitleMatch( const OUString& _rTitle ) : rTitle( _rTitle ) { } - //............................................................................ + bool operator () ( const FilterEntry& _rEntry ) { bool bMatch; @@ -596,7 +596,7 @@ void SalGtkFilePicker::ensureFilterList( const OUString& _rInitialCurrentFilter -// + void SAL_CALL SalGtkFilePicker::appendFilter( const OUString& aTitle, const OUString& aFilter ) @@ -617,7 +617,7 @@ void SAL_CALL SalGtkFilePicker::appendFilter( const OUString& aTitle, const OUSt } -// + void SAL_CALL SalGtkFilePicker::setCurrentFilter( const OUString& aTitle ) @@ -643,7 +643,7 @@ void SAL_CALL SalGtkFilePicker::setCurrentFilter( const OUString& aTitle ) } -// + void SalGtkFilePicker::updateCurrentFilterFromName(const gchar* filtername) @@ -785,7 +785,7 @@ uno::Sequence<OUString> SAL_CALL SalGtkFilePicker::getFiles() throw( uno::Runtim uno::Sequence< OUString > aFiles = getSelectedFiles(); /* The previous multiselection API design was completely broken - and unimplementable for some hetrogenous pseudo-URIs eg. search:// + and unimplementable for some hetrogenous pseudo-URIs eg. search: Thus crop unconditionally to a single selection. */ aFiles.realloc (1); diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx index 4e25b0e14df8..c40355f8791f 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx +++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx @@ -33,9 +33,9 @@ #include "gtk/fpicker/SalGtkPicker.hxx" -//---------------------------------------------------------- + // Implementation class for the XFilePicker Interface -//---------------------------------------------------------- + struct FilterEntry; struct ElementEntry_Impl; @@ -46,9 +46,9 @@ typedef ::com::sun::star::beans::StringPair UnoFilterEntry; typedef ::com::sun::star::uno::Sequence< UnoFilterEntry > UnoFilterList; // can be transported more effectively -//---------------------------------------------------------- + // class declaration -//---------------------------------------------------------- + typedef cppu::WeakComponentImplHelper5< ::com::sun::star::ui::dialogs::XFilePickerControlAccess, @@ -65,18 +65,18 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base // constructor SalGtkFilePicker( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xServiceMgr ); - //------------------------------------------------------------------------------------ + // XFilePickerNotifier - //------------------------------------------------------------------------------------ + virtual void SAL_CALL addFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener ) throw( ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL removeFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener ) throw( ::com::sun::star::uno::RuntimeException ); - //------------------------------------------------------------------------------------ + // XExecutableDialog functions - //------------------------------------------------------------------------------------ + virtual void SAL_CALL setTitle( const OUString& aTitle ) throw( ::com::sun::star::uno::RuntimeException ); @@ -84,9 +84,9 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base virtual sal_Int16 SAL_CALL execute() throw( ::com::sun::star::uno::RuntimeException ); - //------------------------------------------------------------------------------------ + // XFilePicker functions - //------------------------------------------------------------------------------------ + virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode ) throw( ::com::sun::star::uno::RuntimeException ); @@ -104,16 +104,16 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFiles( ) throw( ::com::sun::star::uno::RuntimeException ); - //------------------------------------------------------------------------------------ + // XFilePicker2 functions - //------------------------------------------------------------------------------------ + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSelectedFiles() throw (::com::sun::star::uno::RuntimeException); - //------------------------------------------------------------------------------------ + // XFilterManager functions - //------------------------------------------------------------------------------------ + virtual void SAL_CALL appendFilter( const OUString& aTitle, const OUString& aFilter ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); @@ -124,16 +124,16 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base virtual OUString SAL_CALL getCurrentFilter( ) throw( ::com::sun::star::uno::RuntimeException ); - //------------------------------------------------------------------------------------ + // XFilterGroupManager functions - //------------------------------------------------------------------------------------ + virtual void SAL_CALL appendFilterGroup( const OUString& sGroupTitle, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair >& aFilters ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - //------------------------------------------------------------------------------------ + // XFilePickerControlAccess functions - //------------------------------------------------------------------------------------ + virtual void SAL_CALL setValue( sal_Int16 nControlId, sal_Int16 nControlAction, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::uno::RuntimeException); @@ -150,9 +150,9 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base virtual OUString SAL_CALL getLabel( sal_Int16 nControlId ) throw (::com::sun::star::uno::RuntimeException); - //------------------------------------------------ + // XFilePreview - //------------------------------------------------ + virtual ::com::sun::star::uno::Sequence< sal_Int16 > SAL_CALL getSupportedImageFormats( ) throw (::com::sun::star::uno::RuntimeException); @@ -175,31 +175,31 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base virtual sal_Bool SAL_CALL getShowState( ) throw (::com::sun::star::uno::RuntimeException); - //------------------------------------------------ + // XInitialization - //------------------------------------------------ + virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - //------------------------------------------------ + // XCancellable - //------------------------------------------------ + virtual void SAL_CALL cancel( ) throw( ::com::sun::star::uno::RuntimeException ); - //------------------------------------------------ + // XEventListener - //------------------------------------------------ + using cppu::WeakComponentImplHelperBase::disposing; virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException); - //------------------------------------------------------------------------------------ + // FilePicker Event functions - //------------------------------------------------------------------------------------ + private: // prevent copy and assignment diff --git a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx index 9e7689e0f363..c0921dfd7a3c 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx +++ b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx @@ -37,9 +37,9 @@ class SalGtkFolderPicker : // constructor SalGtkFolderPicker( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xServiceMgr ); - //------------------------------------------------------------------------------------ + // XExecutableDialog functions - //------------------------------------------------------------------------------------ + virtual void SAL_CALL setTitle( const OUString& aTitle ) throw( ::com::sun::star::uno::RuntimeException ); @@ -47,9 +47,9 @@ class SalGtkFolderPicker : virtual sal_Int16 SAL_CALL execute( ) throw( ::com::sun::star::uno::RuntimeException ); - //------------------------------------------------------------------------------------ + // XFolderPicker functions - //------------------------------------------------------------------------------------ + virtual void SAL_CALL setDisplayDirectory( const OUString& rDirectory ) throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::uno::RuntimeException ); @@ -63,16 +63,16 @@ class SalGtkFolderPicker : virtual void SAL_CALL setDescription( const OUString& rDescription ) throw( com::sun::star::uno::RuntimeException ); - //------------------------------------------------ + // XCancellable - //------------------------------------------------ + virtual void SAL_CALL cancel( ) throw( ::com::sun::star::uno::RuntimeException ); - //------------------------------------------------ + // XEventListener - //------------------------------------------------ + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException); diff --git a/vcl/unx/gtk/fpicker/eventnotification.hxx b/vcl/unx/gtk/fpicker/eventnotification.hxx index 33a9db0877b9..209343526218 100644 --- a/vcl/unx/gtk/fpicker/eventnotification.hxx +++ b/vcl/unx/gtk/fpicker/eventnotification.hxx @@ -23,14 +23,14 @@ #include <com/sun/star/uno/XInterface.hpp> #include <com/sun/star/uno/Reference.hxx> -//----------------------------------- + // encapsulate a filepicker event // notification, because there are // two types of filepicker notifications // with and without parameter // this is an application of the // "command" pattern see GoF -//----------------------------------- + class CEventNotification { diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx index c73131b0898a..22b8794cba2e 100644 --- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx @@ -1991,7 +1991,7 @@ bool GtkSalGraphics::NWPaintGTKScrollbar( ControlType, ControlPart nPart, bool forwardButtonInsensitive = rScrollbarVal.mnMax == 0 || rScrollbarVal.mnCur + rScrollbarVal.mnVisibleSize >= rScrollbarVal.mnMax; - // ----------------- BUTTON 1 // + // ----------------- BUTTON 1 if ( has_backward ) { NWConvertVCLStateToGTKState( rScrollbarVal.mnButton1State, &stateType, &shadowType ); diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx index 265070c0823f..285809042ab7 100644 --- a/vcl/unx/gtk/window/gtksalframe.cxx +++ b/vcl/unx/gtk/window/gtksalframe.cxx @@ -1817,10 +1817,10 @@ void GtkSalFrame::Show( sal_Bool bVisible, sal_Bool bNoActivate ) //For these floating windows we don't want the main window to lose focus, and metacity has... // metacity-2.24.0/src/core/window.c - // + // if ((focus_window != NULL) && XSERVER_TIME_IS_BEFORE (compare, focus_window->net_wm_user_time)) // "compare" window focus prevented by other activity - // + // where "compare" is this window // which leads to... @@ -1833,7 +1833,7 @@ void GtkSalFrame::Show( sal_Bool bVisible, sal_Bool bNoActivate ) // "The focus window %s is an ancestor of the newly mapped " // "window %s which isn't being focused. Unfocusing the " // "ancestor.\n", - // + // i.e. having a time < that of the toplevel frame means that the toplevel frame gets unfocused. // awesome. if( nUserTime == 0 ) @@ -2721,7 +2721,7 @@ void GtkSalFrame::grabPointer( bool bGrab, bool bOwnerEvents ) // FIXME: for some unknown reason gdk_pointer_grab does not // really produce owner events for GtkPlug windows // the cause is yet unknown - // + // this is of course a bad hack, especially as we cannot // set the right cursor this way if( !pEnv || !*pEnv ) @@ -3564,7 +3564,7 @@ gboolean GtkSalFrame::signalFocus( GtkWidget*, GdkEventFocus* pEvent, gpointer f // while we have the pointer grabbed, this should not come from // the window manager. Is this an event that was still queued ? // The focus does not seem to get set inside our process - // + // in the meantime do not propagate focus get/lose if floats are open if( m_nFloats == 0 ) pThis->CallCallback( pEvent->in ? SALEVENT_GETFOCUS : SALEVENT_LOSEFOCUS, NULL ); diff --git a/vcl/unx/gtk/window/gtksalmenu.cxx b/vcl/unx/gtk/window/gtksalmenu.cxx index 258e1d97cfac..ae83e26a2879 100644 --- a/vcl/unx/gtk/window/gtksalmenu.cxx +++ b/vcl/unx/gtk/window/gtksalmenu.cxx @@ -780,7 +780,7 @@ void GtkSalMenu::GetSystemMenuData( SystemMenuData* ) { } -// ======================================================================= + /* * GtkSalMenuItem diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx index 300385e7666e..311746d92f3b 100644 --- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx @@ -431,7 +431,7 @@ void GtkSalGraphics::PaintScrollbar(GtkStyleContext *context, bool forwardButtonInsensitive = pScrollbarVal->mnMax == 0 || pScrollbarVal->mnCur + pScrollbarVal->mnVisibleSize >= pScrollbarVal->mnMax; - // ----------------- BUTTON 1 // + // ----------------- BUTTON 1 if ( has_backward ) { NWConvertVCLStateToGTKState( pScrollbarVal->mnButton1State, &stateFlags, &shadowType ); diff --git a/vcl/unx/kde/UnxCommandThread.cxx b/vcl/unx/kde/UnxCommandThread.cxx index 4d63289e908d..f10eac36f379 100644 --- a/vcl/unx/kde/UnxCommandThread.cxx +++ b/vcl/unx/kde/UnxCommandThread.cxx @@ -29,9 +29,9 @@ using namespace ::com::sun::star; -////////////////////////////////////////////////////////////////////////// + // UnxFilePickerCommandThread -////////////////////////////////////////////////////////////////////////// + UnxFilePickerCommandThread::UnxFilePickerCommandThread( UnxFilePickerNotifyThread *pNotifyThread, int nReadFD ) : m_pNotifyThread( pNotifyThread ), diff --git a/vcl/unx/kde/UnxFilePicker.cxx b/vcl/unx/kde/UnxFilePicker.cxx index cfd5e3783b8f..ca378f6534fc 100644 --- a/vcl/unx/kde/UnxFilePicker.cxx +++ b/vcl/unx/kde/UnxFilePicker.cxx @@ -60,9 +60,9 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::ui::dialogs; using namespace ::com::sun::star::ui::dialogs::TemplateDescription; -////////////////////////////////////////////////////////////////////////// + // helper functions -////////////////////////////////////////////////////////////////////////// + namespace { @@ -80,9 +80,9 @@ namespace } } -////////////////////////////////////////////////////////////////////////// + // UnxFilePicker -////////////////////////////////////////////////////////////////////////// + UnxFilePicker::UnxFilePicker( const uno::Reference<uno::XComponentContext>& ) : UnxFilePicker_Base( m_rbHelperMtx ), diff --git a/vcl/unx/kde/UnxNotifyThread.cxx b/vcl/unx/kde/UnxNotifyThread.cxx index 60eb14933082..0b43d2afda1e 100644 --- a/vcl/unx/kde/UnxNotifyThread.cxx +++ b/vcl/unx/kde/UnxNotifyThread.cxx @@ -22,9 +22,9 @@ using namespace ::com::sun::star; -////////////////////////////////////////////////////////////////////////// + // UnxFilePickerNotifyThread -////////////////////////////////////////////////////////////////////////// + UnxFilePickerNotifyThread::UnxFilePickerNotifyThread( UnxFilePicker *pUnxFilePicker ) : m_pUnxFilePicker( pUnxFilePicker ), diff --git a/vcl/unx/kde/fpicker/kdecommandthread.cxx b/vcl/unx/kde/fpicker/kdecommandthread.cxx index 55559d2117f1..b2e47786faa4 100644 --- a/vcl/unx/kde/fpicker/kdecommandthread.cxx +++ b/vcl/unx/kde/fpicker/kdecommandthread.cxx @@ -35,9 +35,9 @@ #include <iostream> #endif -////////////////////////////////////////////////////////////////////////// + // CommandEvent -////////////////////////////////////////////////////////////////////////// + KDECommandEvent::KDECommandEvent( const QString &qCommand, QStringList *pStringList ) : QCustomEvent( TypeId, pStringList ), @@ -73,9 +73,9 @@ KDECommandEvent::KDECommandEvent( const QString &qCommand, QStringList *pStringL m_eCommand = pIdx->eType; } -////////////////////////////////////////////////////////////////////////// + // CommandThread -////////////////////////////////////////////////////////////////////////// + KDECommandThread::KDECommandThread( QWidget *pObject ) : m_pObject( pObject ) diff --git a/vcl/unx/kde/fpicker/kdefilepicker.cxx b/vcl/unx/kde/fpicker/kdefilepicker.cxx index 4dafb1ef0e4e..73210557980b 100644 --- a/vcl/unx/kde/fpicker/kdefilepicker.cxx +++ b/vcl/unx/kde/fpicker/kdefilepicker.cxx @@ -89,9 +89,9 @@ #include <algorithm> #include <iostream> -////////////////////////////////////////////////////////////////////////// + // KDEFileDialog -////////////////////////////////////////////////////////////////////////// + KDEFileDialog::KDEFileDialog( const QString &startDir, const QString &filter, QWidget *parent, const char *name ) diff --git a/vcl/unx/kde/fpicker/kdefpmain.cxx b/vcl/unx/kde/fpicker/kdefpmain.cxx index ed01febd3057..03ea2c1a293a 100644 --- a/vcl/unx/kde/fpicker/kdefpmain.cxx +++ b/vcl/unx/kde/fpicker/kdefpmain.cxx @@ -56,9 +56,9 @@ #define KLocale TDELocale #endif // ENABLE_TDE -////////////////////////////////////////////////////////////////////////// + // Main -////////////////////////////////////////////////////////////////////////// + static const KCmdLineOptions sOptions[] = { diff --git a/vcl/unx/kde/fpicker/kdemodalityfilter.cxx b/vcl/unx/kde/fpicker/kdemodalityfilter.cxx index 57e889a58460..da938183867f 100644 --- a/vcl/unx/kde/fpicker/kdemodalityfilter.cxx +++ b/vcl/unx/kde/fpicker/kdemodalityfilter.cxx @@ -33,9 +33,9 @@ #include <X11/Xlib.h> #include <X11/Xutil.h> -////////////////////////////////////////////////////////////////////////// + // Modality filter -////////////////////////////////////////////////////////////////////////// + KDEModalityFilter::KDEModalityFilter( WId nWinId ) : m_nWinId( nWinId ) diff --git a/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx index 54f7458d55bc..e8ddaebd5464 100644 --- a/vcl/unx/kde4/KDE4FilePicker.cxx +++ b/vcl/unx/kde4/KDE4FilePicker.cxx @@ -80,9 +80,9 @@ using namespace ::com::sun::star::uno; #define ALLOW_REMOTE_URLS 0 #endif -////////////////////////////////////////////////////////////////////////// + // helper functions -////////////////////////////////////////////////////////////////////////// + #include <QDebug> @@ -109,9 +109,9 @@ QString toQString(const OUString& s) return QString::fromUtf16(s.getStr(), s.getLength()); } -////////////////////////////////////////////////////////////////////////// + // KDE4FilePicker -////////////////////////////////////////////////////////////////////////// + KDE4FilePicker::KDE4FilePicker( const uno::Reference<uno::XComponentContext>& ) : KDE4FilePicker_Base(_helperMutex) diff --git a/vcl/unx/x11/xlimits.cxx b/vcl/unx/x11/xlimits.cxx index 71b99831c4b4..2d3606d7090a 100644 --- a/vcl/unx/x11/xlimits.cxx +++ b/vcl/unx/x11/xlimits.cxx @@ -17,7 +17,7 @@ Pixmap limitXCreatePixmap(Display *display, Drawable d, unsigned int width, unsi // limits of the Xserver; which we should catch by a failed XCreatePixmap // call. However extra large values should be caught here since we'd run into // 16 bit truncation here without noticing. - // + // see, e.g. moz#424333 if (width > SAL_MAX_INT16 || height > SAL_MAX_INT16) { |