summaryrefslogtreecommitdiff
path: root/vcl/unx/generic
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/unx/generic')
-rw-r--r--vcl/unx/generic/app/i18n_cb.cxx28
-rw-r--r--vcl/unx/generic/app/i18n_ic.cxx44
-rw-r--r--vcl/unx/generic/app/i18n_im.cxx16
-rw-r--r--vcl/unx/generic/app/i18n_status.cxx24
-rw-r--r--vcl/unx/generic/app/saldisp.cxx2
-rw-r--r--vcl/unx/generic/app/salinst.cxx2
-rw-r--r--vcl/unx/generic/dtrans/X11_clipboard.cxx28
-rw-r--r--vcl/unx/generic/dtrans/X11_droptarget.cxx22
-rw-r--r--vcl/unx/generic/dtrans/X11_selection.cxx110
-rw-r--r--vcl/unx/generic/dtrans/X11_service.cxx6
-rw-r--r--vcl/unx/generic/gdi/gcach_xpeer.cxx6
-rw-r--r--vcl/unx/generic/gdi/salbmp.cxx76
-rw-r--r--vcl/unx/generic/gdi/salgdi2.cxx2
-rw-r--r--vcl/unx/generic/gdi/salgdi3.cxx40
-rw-r--r--vcl/unx/generic/gdi/xrender_peer.cxx6
-rw-r--r--vcl/unx/generic/printer/ppdparser.cxx40
-rw-r--r--vcl/unx/generic/printer/printerinfomanager.cxx36
-rw-r--r--vcl/unx/generic/window/salframe.cxx8
-rw-r--r--vcl/unx/generic/window/salobj.cxx4
19 files changed, 250 insertions, 250 deletions
diff --git a/vcl/unx/generic/app/i18n_cb.cxx b/vcl/unx/generic/app/i18n_cb.cxx
index b5c2f7775050..1c798ae8ec6a 100644
--- a/vcl/unx/generic/app/i18n_cb.cxx
+++ b/vcl/unx/generic/app/i18n_cb.cxx
@@ -38,11 +38,11 @@
#include "unx/i18n_im.hxx"
#include "salframe.hxx"
-// -------------------------------------------------------------------------
+
//
// i. preedit start callback
//
-// -------------------------------------------------------------------------
+
int
PreeditStartCallback ( XIC, XPointer client_data, XPointer )
@@ -58,11 +58,11 @@ PreeditStartCallback ( XIC, XPointer client_data, XPointer )
return -1;
}
-// -------------------------------------------------------------------------
+
//
// ii. preedit done callback
//
-// -------------------------------------------------------------------------
+
void
PreeditDoneCallback ( XIC, XPointer client_data, XPointer )
@@ -76,11 +76,11 @@ PreeditDoneCallback ( XIC, XPointer client_data, XPointer )
pPreeditData->eState = ePreeditStatusStartPending;
}
-// -------------------------------------------------------------------------
+
//
// iii. preedit draw callback
//
-// -------------------------------------------------------------------------
+
//
// Handle deletion of text in a preedit_draw_callback
@@ -423,11 +423,11 @@ GetPreeditSpotLocation(XIC ic, XPointer client_data)
return;
}
-// -------------------------------------------------------------------------
+
//
// iv. preedit caret callback
//
-// -------------------------------------------------------------------------
+
#if OSL_DEBUG_LEVEL > 1
void
@@ -472,12 +472,12 @@ PreeditCaretCallback ( XIC, XPointer,XIMPreeditCaretCallbackStruct* )
#endif
}
-// -----------------------------------------------------------------------
+
//
// v. commit string callback: convert an extended text input (iiimp ... )
// into an ordinary key-event
//
-// -----------------------------------------------------------------------
+
Bool
IsControlCode(sal_Unicode nChar)
@@ -488,11 +488,11 @@ IsControlCode(sal_Unicode nChar)
return False;
}
-// ----------------------------------------------------------------------------------
+
//
// vi. status callbacks: for now these are empty, they are just needed for turbo linux
//
-// ----------------------------------------------------------------------------------
+
void
StatusStartCallback (XIC, XPointer, XPointer)
@@ -557,11 +557,11 @@ SwitchIMCallback (XIC, XPointer, XPointer call_data)
::vcl::I18NStatus::get().changeIM( OStringToOUString(pCallData->to->name, RTL_TEXTENCODING_UTF8) );
}
-// ----------------------------------------------------------------------------------
+
//
// vii. destroy callbacks: internally disable all IC/IM calls
//
-// ----------------------------------------------------------------------------------
+
void
IC_IMDestroyCallback (XIM, XPointer client_data, XPointer)
diff --git a/vcl/unx/generic/app/i18n_ic.cxx b/vcl/unx/generic/app/i18n_ic.cxx
index 84d2e441a436..d486066e82b8 100644
--- a/vcl/unx/generic/app/i18n_ic.cxx
+++ b/vcl/unx/generic/app/i18n_ic.cxx
@@ -56,12 +56,12 @@ static void sendEmptyCommit( SalFrame* pFrame )
pFrame->CallCallback( SALEVENT_ENDEXTTEXTINPUT, NULL );
}
-// ---------------------------------------------------------------------------
+
//
// Constructor / Destructor, the InputContext is bound to the SalFrame, as it
// needs the shell window as a focus window
//
-// ----------------------------------------------------------------------------
+
SalI18N_InputContext::~SalI18N_InputContext()
{
@@ -80,9 +80,9 @@ SalI18N_InputContext::~SalI18N_InputContext()
free(maClientData.aText.pCharStyle);
}
-// ----------------------------------------------------------------------------
+
// convenience routine to add items to a XVaNestedList
-// ----------------------------------------------------------------------------
+
static XVaNestedList
XVaAddToNestedList( XVaNestedList a_srclist, char* name, XPointer value )
@@ -111,9 +111,9 @@ XVaAddToNestedList( XVaNestedList a_srclist, char* name, XPointer value )
return a_dstlist != NULL ? a_dstlist : a_srclist ;
}
-// ----------------------------------------------------------------------------
+
// convenience routine to create a fontset
-// ----------------------------------------------------------------------------
+
static XFontSet
get_font_set( Display *p_display )
@@ -133,11 +133,11 @@ get_font_set( Display *p_display )
return p_font_set;
}
-// ---------------------------------------------------------------------------
+
//
// Constructor for a InputContext (IC)
//
-// ----------------------------------------------------------------------------
+
SalI18N_InputContext::SalI18N_InputContext ( SalFrame *pFrame ) :
mbUseable( True ),
@@ -373,12 +373,12 @@ 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
SalI18N_InputContext::Unmap( SalFrame* pFrame )
@@ -419,12 +419,12 @@ SalI18N_InputContext::Map( SalFrame *pFrame )
}
}
-// --------------------------------------------------------------------------
+
//
// Handle DestroyCallbacks
// in fact this is a callback called from the XNDestroyCallback
//
-// --------------------------------------------------------------------------
+
void
SalI18N_InputContext::HandleDestroyIM()
@@ -433,12 +433,12 @@ SalI18N_InputContext::HandleDestroyIM()
mbUseable = False;
}
-// ---------------------------------------------------------------------------
+
//
// 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
SalI18N_InputContext::ExtendEventMask( XLIB_Window aFocusWindow )
@@ -460,11 +460,11 @@ SalI18N_InputContext::ExtendEventMask( XLIB_Window aFocusWindow )
}
}
-// ---------------------------------------------------------------------------
+
//
// tune the styles provided by the input method with the supported one
//
-// ---------------------------------------------------------------------------
+
unsigned int
SalI18N_InputContext::GetWeightingOfIMStyle( XIMStyle nStyle ) const
@@ -547,11 +547,11 @@ SalI18N_InputContext::SupportInputMethodStyle( XIMStyles *pIMStyles )
return (mnPreeditStyle != 0) && (mnStatusStyle != 0) ;
}
-// ---------------------------------------------------------------------------
+
//
// handle extended and normal key input
//
-// ---------------------------------------------------------------------------
+
int
SalI18N_InputContext::CommitKeyEvent(sal_Unicode* pText, sal_Size nLength)
@@ -603,13 +603,13 @@ SalI18N_InputContext::UpdateSpotLocation()
return 0;
}
-// ---------------------------------------------------------------------------
+
//
// 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
SalI18N_InputContext::SetICFocus( SalFrame* pFocusFrame )
@@ -655,11 +655,11 @@ SalI18N_InputContext::UnsetICFocus( SalFrame* pFrame )
}
}
-// ---------------------------------------------------------------------------
+
//
// multi byte input method only
//
-// ---------------------------------------------------------------------------
+
void
SalI18N_InputContext::SetLanguage(LanguageType)
diff --git a/vcl/unx/generic/app/i18n_im.cxx b/vcl/unx/generic/app/i18n_im.cxx
index 9d91943e468b..576023b3621b 100644
--- a/vcl/unx/generic/app/i18n_im.cxx
+++ b/vcl/unx/generic/app/i18n_im.cxx
@@ -48,12 +48,12 @@ using namespace vcl;
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
IMServerKinput2 ()
@@ -143,11 +143,11 @@ XKeyEventOp::match (const XKeyEvent &rEvent) const
&& same_screen == rEvent.same_screen;
}
-// -------------------------------------------------------------------------
+
//
// locale handling
//
-// -------------------------------------------------------------------------
+
// Locale handling of the operating system layer
@@ -262,11 +262,11 @@ SalI18N_InputMethod::PosixLocale()
return False;
}
-// ------------------------------------------------------------------------
+
//
// Constructor / Destructor / Initialisation
//
-// ------------------------------------------------------------------------
+
SalI18N_InputMethod::SalI18N_InputMethod( ) : mbUseable( bUseInputMethodDefault ),
maMethod( (XIM)NULL ),
@@ -446,7 +446,7 @@ SalI18N_InputMethod::HandleDestroyIM()
maMethod = NULL;
}
-// ------------------------------------------------------------------------
+
//
// add a connection watch into the SalXLib yieldTable to allow iiimp
// connection processing: soffice waits in select() not in XNextEvent(), so
@@ -455,7 +455,7 @@ SalI18N_InputMethod::HandleDestroyIM()
// have the focus because the atok12 lookup choice aux window has it we stay
// deaf and dump otherwise.
//
-// ------------------------------------------------------------------------
+
int
InputMethod_HasPendingEvent(int nFileDescriptor, void *pData)
diff --git a/vcl/unx/generic/app/i18n_status.cxx b/vcl/unx/generic/app/i18n_status.cxx
index 3446d18472dc..995c25b645c6 100644
--- a/vcl/unx/generic/app/i18n_status.cxx
+++ b/vcl/unx/generic/app/i18n_status.cxx
@@ -75,7 +75,7 @@ void StatusWindow::setPosition( SalFrame* )
{
}
-// --------------------------------------------------------------------------
+
namespace vcl {
@@ -301,7 +301,7 @@ OUString XIMStatusWindow::getText() const
return m_aStatusText.GetText();
}
-// --------------------------------------------------------------------------
+
namespace vcl {
@@ -470,7 +470,7 @@ void IIIMPStatusWindow::GetFocus()
}
}
-// --------------------------------------------------------------------------
+
IMPL_LINK( IIIMPStatusWindow, SelectHdl, MenuButton*, pBtn )
{
@@ -516,14 +516,14 @@ I18NStatus& I18NStatus::get()
return *pInstance;
}
-// --------------------------------------------------------------------------
+
bool I18NStatus::exists()
{
return pInstance != NULL;
}
-// --------------------------------------------------------------------------
+
void I18NStatus::free()
{
@@ -531,7 +531,7 @@ void I18NStatus::free()
delete pInstance, pInstance = NULL;
}
-// --------------------------------------------------------------------------
+
I18NStatus::I18NStatus() :
m_pParent( NULL ),
@@ -539,7 +539,7 @@ I18NStatus::I18NStatus() :
{
}
-// --------------------------------------------------------------------------
+
I18NStatus::~I18NStatus()
{
@@ -549,7 +549,7 @@ I18NStatus::~I18NStatus()
pInstance = NULL;
}
-// --------------------------------------------------------------------------
+
void I18NStatus::setParent( SalFrame* pParent )
{
@@ -567,7 +567,7 @@ void I18NStatus::setParent( SalFrame* pParent )
m_pStatusWindow->setPosition( m_pParent );
}
-// --------------------------------------------------------------------------
+
void I18NStatus::show( bool bShow, ShowReason eReason )
{
@@ -578,7 +578,7 @@ void I18NStatus::show( bool bShow, ShowReason eReason )
}
}
-// --------------------------------------------------------------------------
+
void I18NStatus::setStatusText( const OUString& rText )
{
@@ -615,14 +615,14 @@ void I18NStatus::setStatusText( const OUString& rText )
}
}
-// --------------------------------------------------------------------------
+
void I18NStatus::changeIM( const OUString& rIM )
{
m_aCurrentIM = rIM;
}
-// --------------------------------------------------------------------------
+
SalFrame* I18NStatus::getStatusFrame() const
{
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index 2ea2c4c61141..23d296c0ed7b 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -146,7 +146,7 @@ static bool sal_GetVisualInfo( Display *pDisplay, XID nVID, XVisualInfo &rVI )
return true;
}
-// ---------------------------------------------------------------------------
+
extern "C" srv_vendor_t
sal_GetServerVendor( Display *p_display )
{
diff --git a/vcl/unx/generic/app/salinst.cxx b/vcl/unx/generic/app/salinst.cxx
index 487cd637f45d..02066a6b074e 100644
--- a/vcl/unx/generic/app/salinst.cxx
+++ b/vcl/unx/generic/app/salinst.cxx
@@ -78,7 +78,7 @@ X11SalInstance::~X11SalInstance()
}
-// --------------------------------------------------------
+
// AnyInput from sv/mow/source/app/svapp.cxx
struct PredicateReturn
diff --git a/vcl/unx/generic/dtrans/X11_clipboard.cxx b/vcl/unx/generic/dtrans/X11_clipboard.cxx
index 10863b26f470..521c8b404095 100644
--- a/vcl/unx/generic/dtrans/X11_clipboard.cxx
+++ b/vcl/unx/generic/dtrans/X11_clipboard.cxx
@@ -71,7 +71,7 @@ X11Clipboard::X11Clipboard( SelectionManager& rManager, Atom aSelection ) :
}
}
-// ------------------------------------------------------------------------
+
X11Clipboard::~X11Clipboard()
{
@@ -90,7 +90,7 @@ X11Clipboard::~X11Clipboard()
}
-// ------------------------------------------------------------------------
+
void X11Clipboard::fireChangedContentsEvent()
{
@@ -111,7 +111,7 @@ void X11Clipboard::fireChangedContentsEvent()
}
}
-// ------------------------------------------------------------------------
+
void X11Clipboard::clearContents()
{
@@ -134,7 +134,7 @@ void X11Clipboard::clearContents()
xOwner->lostOwnership(xThis, m_aContents);
}
-// ------------------------------------------------------------------------
+
Reference< XTransferable > SAL_CALL X11Clipboard::getContents()
throw(RuntimeException)
@@ -146,7 +146,7 @@ Reference< XTransferable > SAL_CALL X11Clipboard::getContents()
return m_aContents;
}
-// ------------------------------------------------------------------------
+
void SAL_CALL X11Clipboard::setContents(
const Reference< XTransferable >& xTrans,
@@ -181,7 +181,7 @@ void SAL_CALL X11Clipboard::setContents(
fireChangedContentsEvent();
}
-// ------------------------------------------------------------------------
+
OUString SAL_CALL X11Clipboard::getName()
throw(RuntimeException)
@@ -189,7 +189,7 @@ OUString SAL_CALL X11Clipboard::getName()
return m_rSelectionManager.getString( m_aSelection );
}
-// ------------------------------------------------------------------------
+
sal_Int8 SAL_CALL X11Clipboard::getRenderingCapabilities()
throw(RuntimeException)
@@ -198,7 +198,7 @@ sal_Int8 SAL_CALL X11Clipboard::getRenderingCapabilities()
}
-// ------------------------------------------------------------------------
+
void SAL_CALL X11Clipboard::addClipboardListener( const Reference< XClipboardListener >& listener )
throw(RuntimeException)
{
@@ -206,7 +206,7 @@ void SAL_CALL X11Clipboard::addClipboardListener( const Reference< XClipboardLis
m_aListeners.push_back( listener );
}
-// ------------------------------------------------------------------------
+
void SAL_CALL X11Clipboard::removeClipboardListener( const Reference< XClipboardListener >& listener )
throw(RuntimeException)
@@ -216,35 +216,35 @@ void SAL_CALL X11Clipboard::removeClipboardListener( const Reference< XClipboard
}
-// ------------------------------------------------------------------------
+
Reference< XTransferable > X11Clipboard::getTransferable()
{
return getContents();
}
-// ------------------------------------------------------------------------
+
void X11Clipboard::clearTransferable()
{
clearContents();
}
-// ------------------------------------------------------------------------
+
void X11Clipboard::fireContentsChanged()
{
fireChangedContentsEvent();
}
-// ------------------------------------------------------------------------
+
Reference< XInterface > X11Clipboard::getReference() throw()
{
return Reference< XInterface >( static_cast< OWeakObject* >(this) );
}
-// ------------------------------------------------------------------------
+
OUString SAL_CALL X11Clipboard::getImplementationName( )
throw(RuntimeException)
diff --git a/vcl/unx/generic/dtrans/X11_droptarget.cxx b/vcl/unx/generic/dtrans/X11_droptarget.cxx
index f8463ab7dedd..9c593a487d34 100644
--- a/vcl/unx/generic/dtrans/X11_droptarget.cxx
+++ b/vcl/unx/generic/dtrans/X11_droptarget.cxx
@@ -46,7 +46,7 @@ DropTarget::~DropTarget()
m_pSelectionManager->deregisterDropTarget( m_aTargetWindow );
}
-// --------------------------------------------------------------------------
+
void DropTarget::initialize( const Sequence< Any >& arguments ) throw( ::com::sun::star::uno::Exception )
{
@@ -76,7 +76,7 @@ void DropTarget::initialize( const Sequence< Any >& arguments ) throw( ::com::su
}
}
-// --------------------------------------------------------------------------
+
void DropTarget::addDropTargetListener( const Reference< XDropTargetListener >& xListener ) throw()
{
@@ -85,7 +85,7 @@ void DropTarget::addDropTargetListener( const Reference< XDropTargetListener >&
m_aListeners.push_back( xListener );
}
-// --------------------------------------------------------------------------
+
void DropTarget::removeDropTargetListener( const Reference< XDropTargetListener >& xListener ) throw()
{
@@ -94,14 +94,14 @@ void DropTarget::removeDropTargetListener( const Reference< XDropTargetListener
m_aListeners.remove( xListener );
}
-// --------------------------------------------------------------------------
+
sal_Bool DropTarget::isActive() throw()
{
return m_bActive;
}
-// --------------------------------------------------------------------------
+
void DropTarget::setActive( sal_Bool active ) throw()
{
@@ -110,14 +110,14 @@ void DropTarget::setActive( sal_Bool active ) throw()
m_bActive = active;
}
-// --------------------------------------------------------------------------
+
sal_Int8 DropTarget::getDefaultActions() throw()
{
return m_nDefaultActions;
}
-// --------------------------------------------------------------------------
+
void DropTarget::setDefaultActions( sal_Int8 actions ) throw()
{
@@ -126,7 +126,7 @@ void DropTarget::setDefaultActions( sal_Int8 actions ) throw()
m_nDefaultActions = actions;
}
-// --------------------------------------------------------------------------
+
void DropTarget::drop( const DropTargetDropEvent& dtde ) throw()
{
@@ -140,7 +140,7 @@ void DropTarget::drop( const DropTargetDropEvent& dtde ) throw()
}
}
-// --------------------------------------------------------------------------
+
void DropTarget::dragEnter( const DropTargetDragEnterEvent& dtde ) throw()
{
@@ -154,7 +154,7 @@ void DropTarget::dragEnter( const DropTargetDragEnterEvent& dtde ) throw()
}
}
-// --------------------------------------------------------------------------
+
void DropTarget::dragExit( const DropTargetEvent& dte ) throw()
{
@@ -168,7 +168,7 @@ void DropTarget::dragExit( const DropTargetEvent& dte ) throw()
}
}
-// --------------------------------------------------------------------------
+
void DropTarget::dragOver( const DropTargetDragEvent& dtde ) throw()
{
diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx
index 9ae8e0ebbd4e..ff8e07a80ba0 100644
--- a/vcl/unx/generic/dtrans/X11_selection.cxx
+++ b/vcl/unx/generic/dtrans/X11_selection.cxx
@@ -199,7 +199,7 @@ rtl_TextEncoding x11::getTextPlainEncoding( const OUString& rMimeType )
return aEncoding;
}
-// ------------------------------------------------------------------------
+
::boost::unordered_map< OUString, SelectionManager*, OUStringHash >& SelectionManager::getInstances()
{
@@ -207,7 +207,7 @@ rtl_TextEncoding x11::getTextPlainEncoding( const OUString& rMimeType )
return aInstances;
}
-// ------------------------------------------------------------------------
+
SelectionManager::SelectionManager() :
m_nIncrementalThreshold( 15*1024 ),
@@ -461,7 +461,7 @@ void SelectionManager::initialize( const Sequence< Any >& arguments ) throw (::c
}
}
-// ------------------------------------------------------------------------
+
SelectionManager::~SelectionManager()
{
@@ -526,7 +526,7 @@ SelectionManager::~SelectionManager()
}
}
-// ------------------------------------------------------------------------
+
SelectionAdaptor* SelectionManager::getAdaptor( Atom selection )
{
@@ -535,7 +535,7 @@ SelectionAdaptor* SelectionManager::getAdaptor( Atom selection )
return it != m_aSelections.end() ? it->second->m_pAdaptor : NULL;
}
-// ------------------------------------------------------------------------
+
OUString SelectionManager::convertFromCompound( const char* pText, int nLen )
{
@@ -566,7 +566,7 @@ OUString SelectionManager::convertFromCompound( const char* pText, int nLen )
return aRet;
}
-// ------------------------------------------------------------------------
+
OString SelectionManager::convertToCompound( const OUString& rText )
{
@@ -606,7 +606,7 @@ OString SelectionManager::convertToCompound( const OUString& rText )
return aRet;
}
-// ------------------------------------------------------------------------
+
bool SelectionManager::convertData(
const css::uno::Reference< XTransferable >& xTransferable,
@@ -686,7 +686,7 @@ bool SelectionManager::convertData(
return bSuccess;
}
-// ------------------------------------------------------------------------
+
SelectionManager& SelectionManager::get( const OUString& rDisplayName )
{
@@ -705,7 +705,7 @@ SelectionManager& SelectionManager::get( const OUString& rDisplayName )
return *pInstance;
}
-// ------------------------------------------------------------------------
+
const OUString& SelectionManager::getString( Atom aAtom )
{
@@ -726,7 +726,7 @@ const OUString& SelectionManager::getString( Atom aAtom )
return m_aAtomToString[ aAtom ];
}
-// ------------------------------------------------------------------------
+
Atom SelectionManager::getAtom( const OUString& rString )
{
@@ -743,7 +743,7 @@ Atom SelectionManager::getAtom( const OUString& rString )
return m_aStringToAtom[ rString ];
}
-// ------------------------------------------------------------------------
+
bool SelectionManager::requestOwnership( Atom selection )
{
@@ -787,7 +787,7 @@ bool SelectionManager::requestOwnership( Atom selection )
return bSuccess;
}
-// ------------------------------------------------------------------------
+
void SelectionManager::convertTypeToNative( const OUString& rType, Atom selection, int& rFormat, ::std::list< Atom >& rConversions, bool bPushFront )
{
@@ -830,7 +830,7 @@ void SelectionManager::convertTypeToNative( const OUString& rType, Atom selectio
rConversions.push_back( getAtom( rType ) );
};
-// ------------------------------------------------------------------------
+
void SelectionManager::getNativeTypeList( const Sequence< DataFlavor >& rTypes, std::list< Atom >& rOutTypeList, Atom targetselection )
{
@@ -861,7 +861,7 @@ void SelectionManager::getNativeTypeList( const Sequence< DataFlavor >& rTypes,
rOutTypeList.push_back( m_nMULTIPLEAtom );
}
-// ------------------------------------------------------------------------
+
OUString SelectionManager::convertTypeFromNative( Atom nType, Atom selection, int& rFormat )
{
@@ -882,7 +882,7 @@ OUString SelectionManager::convertTypeFromNative( Atom nType, Atom selection, in
return getString( nType );
}
-// ------------------------------------------------------------------------
+
bool SelectionManager::getPasteData( Atom selection, Atom type, Sequence< sal_Int8 >& rData )
{
@@ -1020,7 +1020,7 @@ bool SelectionManager::getPasteData( Atom selection, Atom type, Sequence< sal_In
return bSuccess;
}
-// ------------------------------------------------------------------------
+
bool SelectionManager::getPasteData( Atom selection, const OUString& rType, Sequence< sal_Int8 >& rData )
{
@@ -1235,7 +1235,7 @@ bool SelectionManager::getPasteData( Atom selection, const OUString& rType, Sequ
return bSuccess;
}
-// ------------------------------------------------------------------------
+
bool SelectionManager::getPasteDataTypes( Atom selection, Sequence< DataFlavor >& rTypes )
{
@@ -1440,7 +1440,7 @@ bool SelectionManager::getPasteDataTypes( Atom selection, Sequence< DataFlavor >
return bSuccess;
}
-// ------------------------------------------------------------------------
+
PixmapHolder* SelectionManager::getPixmapHolder( Atom selection )
{
@@ -1600,7 +1600,7 @@ bool SelectionManager::sendData( SelectionAdaptor* pAdaptor,
return bConverted;
}
-// ------------------------------------------------------------------------
+
bool SelectionManager::handleSelectionRequest( XSelectionRequestEvent& rRequest )
{
@@ -1809,7 +1809,7 @@ bool SelectionManager::handleSelectionRequest( XSelectionRequestEvent& rRequest
return true;
}
-// ------------------------------------------------------------------------
+
bool SelectionManager::handleReceivePropertyNotify( XPropertyEvent& rNotify )
{
@@ -1928,7 +1928,7 @@ bool SelectionManager::handleReceivePropertyNotify( XPropertyEvent& rNotify )
return bHandled;
}
-// ------------------------------------------------------------------------
+
bool SelectionManager::handleSendPropertyNotify( XPropertyEvent& rNotify )
{
@@ -2028,7 +2028,7 @@ bool SelectionManager::handleSendPropertyNotify( XPropertyEvent& rNotify )
return bHandled;
}
-// ------------------------------------------------------------------------
+
bool SelectionManager::handleSelectionNotify( XSelectionEvent& rNotify )
{
@@ -2121,7 +2121,7 @@ bool SelectionManager::handleSelectionNotify( XSelectionEvent& rNotify )
return bHandled;
}
-// ------------------------------------------------------------------------
+
bool SelectionManager::handleDropEvent( XClientMessageEvent& rMessage )
{
@@ -2371,7 +2371,7 @@ void SelectionManager::dropComplete( bool bSuccess, XLIB_Window aDropWindow, XLI
* methods for XDropTargetDragContext
*/
-// ------------------------------------------------------------------------
+
void SelectionManager::sendDragStatus( Atom nDropAction )
{
@@ -2440,14 +2440,14 @@ void SelectionManager::sendDragStatus( Atom nDropAction )
}
}
-// ------------------------------------------------------------------------
+
sal_Int8 SelectionManager::getUserDragAction() const
{
return (m_nTargetAcceptAction != DNDConstants::ACTION_DEFAULT) ? m_nTargetAcceptAction : m_nUserDragAction;
}
-// ------------------------------------------------------------------------
+
bool SelectionManager::updateDragAction( int modifierState )
{
@@ -2500,7 +2500,7 @@ bool SelectionManager::updateDragAction( int modifierState )
return bRet;
}
-// ------------------------------------------------------------------------
+
void SelectionManager::sendDropPosition( bool bForce, XLIB_Time eventTime )
{
@@ -2560,7 +2560,7 @@ void SelectionManager::sendDropPosition( bool bForce, XLIB_Time eventTime )
}
}
-// ------------------------------------------------------------------------
+
bool SelectionManager::handleDragEvent( XEvent& rMessage )
{
@@ -2881,7 +2881,7 @@ bool SelectionManager::handleDragEvent( XEvent& rMessage )
return bHandled;
}
-// ------------------------------------------------------------------------
+
void SelectionManager::accept( sal_Int8 dragOperation, XLIB_Window aDropWindow, XLIB_Time )
{
@@ -2903,7 +2903,7 @@ void SelectionManager::accept( sal_Int8 dragOperation, XLIB_Window aDropWindow,
}
}
-// ------------------------------------------------------------------------
+
void SelectionManager::reject( XLIB_Window aDropWindow, XLIB_Time )
{
@@ -2937,7 +2937,7 @@ sal_Bool SelectionManager::isDragImageSupported() throw()
return sal_False;
}
-// ------------------------------------------------------------------------
+
sal_Int32 SelectionManager::getDefaultCursor( sal_Int8 dragAction ) throw()
{
@@ -2951,7 +2951,7 @@ sal_Int32 SelectionManager::getDefaultCursor( sal_Int8 dragAction ) throw()
return aCursor;
}
-// ------------------------------------------------------------------------
+
int SelectionManager::getXdndVersion( XLIB_Window aWindow, XLIB_Window& rProxy )
{
@@ -3022,7 +3022,7 @@ int SelectionManager::getXdndVersion( XLIB_Window aWindow, XLIB_Window& rProxy )
return nVersion;
}
-// ------------------------------------------------------------------------
+
void SelectionManager::updateDragWindow( int nX, int nY, XLIB_Window aRoot )
{
@@ -3181,7 +3181,7 @@ void SelectionManager::updateDragWindow( int nX, int nY, XLIB_Window aRoot )
}
}
-// ------------------------------------------------------------------------
+
void SelectionManager::startDrag(
const DragGestureEvent& trigger,
@@ -3527,7 +3527,7 @@ sal_Int32 SelectionManager::getCurrentCursor()
return m_aCurrentCursor;
}
-// ------------------------------------------------------------------------
+
void SelectionManager::setCursor( sal_Int32 cursor, XLIB_Window aDropWindow, XLIB_Time )
{
@@ -3543,13 +3543,13 @@ void SelectionManager::setCursor( sal_Int32 cursor, XLIB_Window aDropWindow, XLI
}
}
-// ------------------------------------------------------------------------
+
void SelectionManager::setImage( sal_Int32, XLIB_Window, XLIB_Time )
{
}
-// ------------------------------------------------------------------------
+
void SelectionManager::transferablesFlavorsChanged()
{
@@ -3602,7 +3602,7 @@ void SelectionManager::transferablesFlavorsChanged()
* dispatch loop
*/
-// ------------------------------------------------------------------------
+
bool SelectionManager::handleXEvent( XEvent& rEvent )
{
@@ -3688,7 +3688,7 @@ bool SelectionManager::handleXEvent( XEvent& rEvent )
return bHandled;
}
-// ------------------------------------------------------------------------
+
void SelectionManager::dispatchEvent( int millisec )
{
@@ -3730,7 +3730,7 @@ void SelectionManager::dispatchEvent( int millisec )
}
}
-// ------------------------------------------------------------------------
+
void SelectionManager::run( void* pThis )
{
@@ -3855,7 +3855,7 @@ void SelectionManager::shutdown() throw()
m_xDropTransferable.clear();
}
-// ------------------------------------------------------------------------
+
sal_Bool SelectionManager::handleEvent( const Any& event ) throw()
{
@@ -3915,7 +3915,7 @@ void SAL_CALL SelectionManager::notifyTermination( const ::com::sun::star::lang:
disposing(rEvent);
}
-// ------------------------------------------------------------------------
+
void SelectionManager::registerHandler( Atom selection, SelectionAdaptor& rAdaptor )
{
@@ -3927,7 +3927,7 @@ void SelectionManager::registerHandler( Atom selection, SelectionAdaptor& rAdapt
m_aSelections[ selection ] = pNewSelection;
}
-// ------------------------------------------------------------------------
+
void SelectionManager::deregisterHandler( Atom selection )
{
@@ -3943,7 +3943,7 @@ void SelectionManager::deregisterHandler( Atom selection )
}
}
-// ------------------------------------------------------------------------
+
static bool bWasError = false;
@@ -3999,7 +3999,7 @@ void SelectionManager::registerDropTarget( XLIB_Window aWindow, DropTarget* pTar
OSL_FAIL( "attempt to register None as drop target" );
}
-// ------------------------------------------------------------------------
+
void SelectionManager::deregisterDropTarget( XLIB_Window aWindow )
{
@@ -4055,27 +4055,27 @@ css::uno::Reference< XTransferable > SelectionManager::getTransferable() throw()
return m_xDragSourceTransferable;
}
-// ------------------------------------------------------------------------
+
void SelectionManager::clearTransferable() throw()
{
m_xDragSourceTransferable.clear();
}
-// ------------------------------------------------------------------------
+
void SelectionManager::fireContentsChanged() throw()
{
}
-// ------------------------------------------------------------------------
+
css::uno::Reference< XInterface > SelectionManager::getReference() throw()
{
return css::uno::Reference< XInterface >( static_cast<OWeakObject*>(this) );
}
-// ------------------------------------------------------------------------
+
/*
* SelectionManagerHolder
@@ -4089,13 +4089,13 @@ SelectionManagerHolder::SelectionManagerHolder() :
{
}
-// ------------------------------------------------------------------------
+
SelectionManagerHolder::~SelectionManagerHolder()
{
}
-// ------------------------------------------------------------------------
+
void SelectionManagerHolder::initialize( const Sequence< Any >& arguments ) throw( ::com::sun::star::uno::Exception )
{
@@ -4126,14 +4126,14 @@ sal_Bool SelectionManagerHolder::isDragImageSupported() throw()
return m_xRealDragSource.is() ? m_xRealDragSource->isDragImageSupported() : sal_False;
}
-// ------------------------------------------------------------------------
+
sal_Int32 SelectionManagerHolder::getDefaultCursor( sal_Int8 dragAction ) throw()
{
return m_xRealDragSource.is() ? m_xRealDragSource->getDefaultCursor( dragAction ) : 0;
}
-// ------------------------------------------------------------------------
+
void SelectionManagerHolder::startDrag(
const ::com::sun::star::datatransfer::dnd::DragGestureEvent& trigger,
@@ -4146,13 +4146,13 @@ void SelectionManagerHolder::startDrag(
m_xRealDragSource->startDrag( trigger, sourceActions, cursor, image, transferable, listener );
}
-// ------------------------------------------------------------------------
+
/*
* XServiceInfo
*/
-// ------------------------------------------------------------------------
+
OUString SelectionManagerHolder::getImplementationName() throw()
{
diff --git a/vcl/unx/generic/dtrans/X11_service.cxx b/vcl/unx/generic/dtrans/X11_service.cxx
index 644e88db036f..0ed55666cd97 100644
--- a/vcl/unx/generic/dtrans/X11_service.cxx
+++ b/vcl/unx/generic/dtrans/X11_service.cxx
@@ -57,7 +57,7 @@ Sequence< OUString > SAL_CALL x11::Xdnd_dropTarget_getSupportedServiceNames()
return aRet;
}
-// ------------------------------------------------------------------------
+
css::uno::Reference< XInterface > X11SalInstance::CreateClipboard( const Sequence< Any >& arguments )
{
@@ -86,14 +86,14 @@ css::uno::Reference< XInterface > X11SalInstance::CreateClipboard( const Sequenc
return static_cast<OWeakObject*>(pClipboard);
}
-// ------------------------------------------------------------------------
+
css::uno::Reference< XInterface > X11SalInstance::CreateDragSource()
{
return css::uno::Reference < XInterface >( ( OWeakObject * ) new SelectionManagerHolder() );
}
-// ------------------------------------------------------------------------
+
css::uno::Reference< XInterface > X11SalInstance::CreateDropTarget()
{
diff --git a/vcl/unx/generic/gdi/gcach_xpeer.cxx b/vcl/unx/generic/gdi/gcach_xpeer.cxx
index 49ba13ee747c..44e82c5b44c9 100644
--- a/vcl/unx/generic/gdi/gcach_xpeer.cxx
+++ b/vcl/unx/generic/gdi/gcach_xpeer.cxx
@@ -35,7 +35,7 @@ X11GlyphPeer::X11GlyphPeer()
{
}
-// ---------------------------------------------------------------------------
+
X11GlyphPeer::~X11GlyphPeer()
{
@@ -69,7 +69,7 @@ X11GlyphCache::X11GlyphCache( X11GlyphPeer& rPeer )
{
}
-// ---------------------------------------------------------------------------
+
namespace
{
@@ -111,7 +111,7 @@ X11GlyphCache& X11GlyphCache::GetInstance()
return theGlyphCacheHolder::get().getGlyphCache();
}
-// ---------------------------------------------------------------------------
+
void X11GlyphCache::KillInstance()
{
diff --git a/vcl/unx/generic/gdi/salbmp.cxx b/vcl/unx/generic/gdi/salbmp.cxx
index 00538b00f9fe..d748e6a94ce6 100644
--- a/vcl/unx/generic/gdi/salbmp.cxx
+++ b/vcl/unx/generic/gdi/salbmp.cxx
@@ -48,9 +48,9 @@
#include <valgrind/memcheck.h>
#endif
-// -------------
+
// - SalBitmap -
-// -------------
+
SalBitmap* X11SalInstance::CreateSalBitmap()
{
@@ -60,7 +60,7 @@ SalBitmap* X11SalInstance::CreateSalBitmap()
ImplSalBitmapCache* X11SalBitmap::mpCache = NULL;
sal_uLong X11SalBitmap::mnCacheInstCount = 0;
-// -----------------------------------------------------------------------------
+
X11SalBitmap::X11SalBitmap()
: mpDIB( NULL )
@@ -69,14 +69,14 @@ X11SalBitmap::X11SalBitmap()
{
}
-// -----------------------------------------------------------------------------
+
X11SalBitmap::~X11SalBitmap()
{
Destroy();
}
-// -----------------------------------------------------------------------------
+
void X11SalBitmap::ImplCreateCache()
{
@@ -84,7 +84,7 @@ void X11SalBitmap::ImplCreateCache()
mpCache = new ImplSalBitmapCache;
}
-// -----------------------------------------------------------------------------
+
void X11SalBitmap::ImplDestroyCache()
{
@@ -94,7 +94,7 @@ void X11SalBitmap::ImplDestroyCache()
delete mpCache, mpCache = NULL;
}
-// -----------------------------------------------------------------------------
+
void X11SalBitmap::ImplRemovedFromCache()
{
@@ -120,7 +120,7 @@ namespace
}
#endif
-// -----------------------------------------------------------------------------
+
BitmapBuffer* X11SalBitmap::ImplCreateDIB(
const Size& rSize,
@@ -211,7 +211,7 @@ BitmapBuffer* X11SalBitmap::ImplCreateDIB(
return pDIB;
}
-// -----------------------------------------------------------------------------
+
BitmapBuffer* X11SalBitmap::ImplCreateDIB(
Drawable aDrawable,
@@ -386,7 +386,7 @@ BitmapBuffer* X11SalBitmap::ImplCreateDIB(
return pDIB;
}
-// -----------------------------------------------------------------------------
+
XImage* X11SalBitmap::ImplCreateXImage(
SalDisplay *pSalDisp,
@@ -562,7 +562,7 @@ XImage* X11SalBitmap::ImplCreateXImage(
return pImage;
}
-// -----------------------------------------------------------------------------
+
bool X11SalBitmap::ImplCreateFromDrawable(
Drawable aDrawable,
SalX11Screen nScreen,
@@ -579,7 +579,7 @@ bool X11SalBitmap::ImplCreateFromDrawable(
return( mpDDB != NULL );
}
-// -----------------------------------------------------------------------------
+
ImplSalDDB* X11SalBitmap::ImplGetDDB(
Drawable aDrawable,
@@ -678,7 +678,7 @@ ImplSalDDB* X11SalBitmap::ImplGetDDB(
return mpDDB;
}
-// -----------------------------------------------------------------------------
+
void X11SalBitmap::ImplDraw(
Drawable aDrawable,
@@ -693,7 +693,7 @@ void X11SalBitmap::ImplDraw(
mpDDB->ImplDraw( aDrawable, nDrawableDepth, rTwoRect, rGC );
}
-// -----------------------------------------------------------------------------
+
bool X11SalBitmap::Create( const Size& rSize, sal_uInt16 nBitCount, const BitmapPalette& rPal )
{
@@ -703,7 +703,7 @@ bool X11SalBitmap::Create( const Size& rSize, sal_uInt16 nBitCount, const Bitmap
return( mpDIB != NULL );
}
-// -----------------------------------------------------------------------------
+
bool X11SalBitmap::Create( const SalBitmap& rSSalBmp )
{
@@ -744,21 +744,21 @@ bool X11SalBitmap::Create( const SalBitmap& rSSalBmp )
( rSalBmp.mpDDB && ( mpDDB != NULL ) ) );
}
-// -----------------------------------------------------------------------------
+
bool X11SalBitmap::Create( const SalBitmap&, SalGraphics* )
{
return false;
}
-// -----------------------------------------------------------------------------
+
bool X11SalBitmap::Create( const SalBitmap&, sal_uInt16 )
{
return false;
}
-// -----------------------------------------------------------------------------
+
bool X11SalBitmap::Create(
const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapCanvas > xBitmapCanvas,
@@ -799,7 +799,7 @@ bool X11SalBitmap::Create(
return false;
}
-// -----------------------------------------------------------------------------
+
void X11SalBitmap::Destroy()
{
@@ -816,7 +816,7 @@ void X11SalBitmap::Destroy()
mpCache->ImplRemove( this );
}
-// -----------------------------------------------------------------------------
+
Size X11SalBitmap::GetSize() const
{
@@ -830,7 +830,7 @@ Size X11SalBitmap::GetSize() const
return aSize;
}
-// -----------------------------------------------------------------------------
+
sal_uInt16 X11SalBitmap::GetBitCount() const
{
@@ -846,7 +846,7 @@ sal_uInt16 X11SalBitmap::GetBitCount() const
return nBitCount;
}
-// -----------------------------------------------------------------------------
+
BitmapBuffer* X11SalBitmap::AcquireBuffer( bool )
{
@@ -866,7 +866,7 @@ BitmapBuffer* X11SalBitmap::AcquireBuffer( bool )
return mpDIB;
}
-// -----------------------------------------------------------------------------
+
void X11SalBitmap::ReleaseBuffer( BitmapBuffer*, bool bReadOnly )
{
@@ -880,7 +880,7 @@ void X11SalBitmap::ReleaseBuffer( BitmapBuffer*, bool bReadOnly )
}
}
-// -----------------------------------------------------------------------------
+
bool X11SalBitmap::GetSystemData( BitmapSystemData& rData )
{
@@ -898,9 +898,9 @@ bool X11SalBitmap::GetSystemData( BitmapSystemData& rData )
return false;
}
-// --------------
+
// - ImplSalDDB -
-// --------------
+
ImplSalDDB::ImplSalDDB( XImage* pImage, Drawable aDrawable,
SalX11Screen nXScreen, const SalTwoRect& rTwoRect )
@@ -932,7 +932,7 @@ ImplSalDDB::ImplSalDDB( XImage* pImage, Drawable aDrawable,
}
}
-// -----------------------------------------------------------------------------
+
ImplSalDDB::ImplSalDDB(
Drawable aDrawable,
@@ -973,7 +973,7 @@ ImplSalDDB::ImplSalDDB(
}
}
-// -----------------------------------------------------------------------------
+
ImplSalDDB::~ImplSalDDB()
{
@@ -981,7 +981,7 @@ ImplSalDDB::~ImplSalDDB()
XFreePixmap( GetGenericData()->GetSalDisplay()->GetDisplay(), maPixmap );
}
-// -----------------------------------------------------------------------------
+
bool ImplSalDDB::ImplMatches( SalX11Screen nXScreen, long nDepth, const SalTwoRect& rTwoRect ) const
{
@@ -1017,7 +1017,7 @@ bool ImplSalDDB::ImplMatches( SalX11Screen nXScreen, long nDepth, const SalTwoRe
return bRet;
}
-// -----------------------------------------------------------------------------
+
void ImplSalDDB::ImplDraw(
Drawable aDrawable,
@@ -1032,7 +1032,7 @@ void ImplSalDDB::ImplDraw(
rTwoRect.mnDestX, rTwoRect.mnDestY, rGC );
}
-// -----------------------------------------------------------------------------
+
void ImplSalDDB::ImplDraw(
Drawable aSrcDrawable,
@@ -1062,9 +1062,9 @@ void ImplSalDDB::ImplDraw(
}
}
-// ----------------------
+
// - ImplSalBitmapCache -
-// ----------------------
+
struct ImplBmpObj
{
@@ -1076,21 +1076,21 @@ struct ImplBmpObj
mpBmp( pBmp ), mnMemSize( nMemSize ), mnFlags( nFlags ) {}
};
-// -----------------------------------------------------------------------------
+
ImplSalBitmapCache::ImplSalBitmapCache() :
mnTotalSize( 0UL )
{
}
-// -----------------------------------------------------------------------------
+
ImplSalBitmapCache::~ImplSalBitmapCache()
{
ImplClear();
}
-// -----------------------------------------------------------------------------
+
void ImplSalBitmapCache::ImplAdd( X11SalBitmap* pBmp, sal_uLong nMemSize, sal_uLong nFlags )
{
@@ -1118,7 +1118,7 @@ void ImplSalBitmapCache::ImplAdd( X11SalBitmap* pBmp, sal_uLong nMemSize, sal_uL
maBmpList.push_back( new ImplBmpObj( pBmp, nMemSize, nFlags ) );
}
-// -----------------------------------------------------------------------------
+
void ImplSalBitmapCache::ImplRemove( X11SalBitmap* pBmp )
{
@@ -1138,7 +1138,7 @@ void ImplSalBitmapCache::ImplRemove( X11SalBitmap* pBmp )
}
}
-// -----------------------------------------------------------------------------
+
void ImplSalBitmapCache::ImplClear()
{
diff --git a/vcl/unx/generic/gdi/salgdi2.cxx b/vcl/unx/generic/gdi/salgdi2.cxx
index 3daf71bbae57..e4b853f2eb99 100644
--- a/vcl/unx/generic/gdi/salgdi2.cxx
+++ b/vcl/unx/generic/gdi/salgdi2.cxx
@@ -423,7 +423,7 @@ void X11SalGraphics::copyBits( const SalTwoRect& rPosAry,
}
}
-// --------------------------------------------------------------------------
+
void X11SalGraphics::copyArea ( long nDestX, long nDestY,
long nSrcX, long nSrcY,
diff --git a/vcl/unx/generic/gdi/salgdi3.cxx b/vcl/unx/generic/gdi/salgdi3.cxx
index e0e1ff4bcc2a..7f40deb81377 100644
--- a/vcl/unx/generic/gdi/salgdi3.cxx
+++ b/vcl/unx/generic/gdi/salgdi3.cxx
@@ -91,11 +91,11 @@ struct _XRegion
BOX extents;
};
-// ----------------------------------------------------------------------------
+
//
// X11SalGraphics
//
-// ----------------------------------------------------------------------------
+
GC
X11SalGraphics::GetFontGC()
@@ -124,7 +124,7 @@ X11SalGraphics::GetFontGC()
return pFontGC_;
}
-//--------------------------------------------------------------------------
+
bool X11SalGraphics::setFont( const FontSelectPattern *pEntry, int nFallbackLevel )
{
@@ -194,7 +194,7 @@ void ImplServerFontEntry::HandleFontOptions( void )
mpServerFont->SetFontOptions( mpFontOptions );
}
-//--------------------------------------------------------------------------
+
CairoFontsCache::LRUFonts CairoFontsCache::maLRUFonts;
int CairoFontsCache::mnRefCount = 0;
@@ -449,7 +449,7 @@ void X11SalGraphics::DrawServerFontLayout( const ServerFontLayout& rLayout )
cairo_destroy(cr);
}
-//--------------------------------------------------------------------------
+
const ImplFontCharMap* X11SalGraphics::GetImplFontCharMap() const
{
@@ -467,11 +467,11 @@ bool X11SalGraphics::GetImplFontCapabilities(vcl::FontCapabilities &rGetImplFont
return mpServerFont[0]->GetFontCapabilities(rGetImplFontCapabilities);
}
-// ----------------------------------------------------------------------------
+
//
// SalGraphics
//
-// ----------------------------------------------------------------------------
+
sal_uInt16 X11SalGraphics::SetFont( FontSelectPattern *pEntry, int nFallbackLevel )
{
@@ -483,7 +483,7 @@ sal_uInt16 X11SalGraphics::SetFont( FontSelectPattern *pEntry, int nFallbackLeve
return nRetVal;
}
-// ----------------------------------------------------------------------------
+
void
X11SalGraphics::SetTextColor( SalColor nSalColor )
@@ -496,7 +496,7 @@ X11SalGraphics::SetTextColor( SalColor nSalColor )
}
}
-// ----------------------------------------------------------------------------
+
bool X11SalGraphics::AddTempDevFont( ImplDevFontList* pFontList,
const OUString& rFileURL, const OUString& rFontName )
@@ -575,7 +575,7 @@ void X11SalGraphics::GetDevFontList( ImplDevFontList *pList )
ImplGetSVData()->maGDIData.mbNativeFontConfig = true;
}
-// ----------------------------------------------------------------------------
+
void cairosubcallback(void* pPattern)
{
@@ -600,7 +600,7 @@ ImplFontOptions* GetFCFontOptions( const ImplFontAttributes& rFontAttributes, in
return rPFM.getFontOptions(aInfo, nSize, cairosubcallback);
}
-// ----------------------------------------------------------------------------
+
void
X11SalGraphics::GetFontMetric( ImplFontMetricData *pMetric, int nFallbackLevel )
@@ -615,7 +615,7 @@ X11SalGraphics::GetFontMetric( ImplFontMetricData *pMetric, int nFallbackLevel )
}
}
-// ---------------------------------------------------------------------------
+
bool X11SalGraphics::GetGlyphBoundRect( sal_GlyphId aGlyphId, Rectangle& rRect )
{
@@ -647,7 +647,7 @@ bool X11SalGraphics::GetGlyphBoundRect( sal_GlyphId aGlyphId, Rectangle& rRect )
return true;
}
-// ---------------------------------------------------------------------------
+
bool X11SalGraphics::GetGlyphOutline( sal_GlyphId aGlyphId,
::basegfx::B2DPolyPolygon& rPolyPoly )
@@ -667,7 +667,7 @@ bool X11SalGraphics::GetGlyphOutline( sal_GlyphId aGlyphId,
return false;
}
-//--------------------------------------------------------------------------
+
SalLayout* X11SalGraphics::GetTextLayout( ImplLayoutArgs& rArgs, int nFallbackLevel )
{
@@ -691,7 +691,7 @@ SalLayout* X11SalGraphics::GetTextLayout( ImplLayoutArgs& rArgs, int nFallbackLe
return pLayout;
}
-//--------------------------------------------------------------------------
+
SystemFontData X11SalGraphics::GetSysFontData( int nFallbacklevel ) const
{
@@ -716,7 +716,7 @@ SystemFontData X11SalGraphics::GetSysFontData( int nFallbacklevel ) const
return aSysFontData;
}
-//--------------------------------------------------------------------------
+
bool X11SalGraphics::CreateFontSubset(
const OUString& rToFile,
@@ -746,7 +746,7 @@ bool X11SalGraphics::CreateFontSubset(
return bSuccess;
}
-//--------------------------------------------------------------------------
+
const void* X11SalGraphics::GetEmbedFontData( const PhysicalFontFace* pFont, const sal_Ucs* pUnicodes, sal_Int32* pWidths, FontSubsetInfo& rInfo, long* pDataLen )
{
@@ -759,14 +759,14 @@ const void* X11SalGraphics::GetEmbedFontData( const PhysicalFontFace* pFont, con
return GenPspGraphics::DoGetEmbedFontData( aFont, pUnicodes, pWidths, rInfo, pDataLen );
}
-//--------------------------------------------------------------------------
+
void X11SalGraphics::FreeEmbedFontData( const void* pData, long nLen )
{
GenPspGraphics::DoFreeEmbedFontData( pData, nLen );
}
-//--------------------------------------------------------------------------
+
const Ucs2SIntMap* X11SalGraphics::GetFontEncodingVector( const PhysicalFontFace* pFont, const Ucs2OStrMap** pNonEncoded )
{
@@ -779,7 +779,7 @@ const Ucs2SIntMap* X11SalGraphics::GetFontEncodingVector( const PhysicalFontFace
return GenPspGraphics::DoGetFontEncodingVector( aFont, pNonEncoded );
}
-//--------------------------------------------------------------------------
+
void X11SalGraphics::GetGlyphWidths( const PhysicalFontFace* pFont,
bool bVertical,
diff --git a/vcl/unx/generic/gdi/xrender_peer.cxx b/vcl/unx/generic/gdi/xrender_peer.cxx
index 75fb57f02cee..03974a859caf 100644
--- a/vcl/unx/generic/gdi/xrender_peer.cxx
+++ b/vcl/unx/generic/gdi/xrender_peer.cxx
@@ -29,7 +29,7 @@
using namespace rtl;
-// ---------------------------------------------------------------------------
+
XRenderPeer::XRenderPeer()
: mpDisplay( GetGenericData()->GetSalDisplay()->GetDisplay() )
@@ -38,7 +38,7 @@ XRenderPeer::XRenderPeer()
InitRenderLib();
}
-// ---------------------------------------------------------------------------
+
XRenderPeer& XRenderPeer::GetInstance()
{
@@ -46,7 +46,7 @@ XRenderPeer& XRenderPeer::GetInstance()
return aPeer;
}
-// ---------------------------------------------------------------------------
+
void XRenderPeer::InitRenderLib()
{
diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx
index 5204b036c9ba..cbfe171b173b 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -1530,20 +1530,20 @@ PPDKey::PPDKey( const OUString& rKey ) :
{
}
-// -------------------------------------------------------------------
+
PPDKey::~PPDKey()
{
}
-// -------------------------------------------------------------------
+
const PPDValue* PPDKey::getValue( int n ) const
{
return ((unsigned int)n < m_aOrderedValues.size() && n >= 0) ? m_aOrderedValues[n] : NULL;
}
-// -------------------------------------------------------------------
+
const PPDValue* PPDKey::getValue( const OUString& rOption ) const
{
@@ -1551,7 +1551,7 @@ const PPDValue* PPDKey::getValue( const OUString& rOption ) const
return it != m_aValues.end() ? &it->second : NULL;
}
-// -------------------------------------------------------------------
+
const PPDValue* PPDKey::getValueCaseInsensitive( const OUString& rOption ) const
{
@@ -1566,7 +1566,7 @@ const PPDValue* PPDKey::getValueCaseInsensitive( const OUString& rOption ) const
return pValue;
}
-// -------------------------------------------------------------------
+
void PPDKey::eraseValue( const OUString& rOption )
{
@@ -1585,7 +1585,7 @@ void PPDKey::eraseValue( const OUString& rOption )
m_aValues.erase( it );
}
-// -------------------------------------------------------------------
+
PPDValue* PPDKey::insertValue( const OUString& rOption, PPDValueType eType )
{
@@ -1601,7 +1601,7 @@ PPDValue* PPDKey::insertValue( const OUString& rOption, PPDValueType eType )
return pValue;
}
-// -------------------------------------------------------------------
+
/*
* PPDContext
@@ -1612,7 +1612,7 @@ PPDContext::PPDContext( const PPDParser* pParser ) :
{
}
-// -------------------------------------------------------------------
+
PPDContext& PPDContext::operator=( const PPDContext& rCopy )
{
@@ -1621,13 +1621,13 @@ PPDContext& PPDContext::operator=( const PPDContext& rCopy )
return *this;
}
-// -------------------------------------------------------------------
+
PPDContext::~PPDContext()
{
}
-// -------------------------------------------------------------------
+
const PPDKey* PPDContext::getModifiedKey( int n ) const
{
@@ -1637,7 +1637,7 @@ const PPDKey* PPDContext::getModifiedKey( int n ) const
return it != m_aCurrentValues.end() ? it->first : NULL;
}
-// -------------------------------------------------------------------
+
void PPDContext::setParser( const PPDParser* pParser )
{
@@ -1648,7 +1648,7 @@ void PPDContext::setParser( const PPDParser* pParser )
}
}
-// -------------------------------------------------------------------
+
const PPDValue* PPDContext::getValue( const PPDKey* pKey ) const
{
@@ -1670,7 +1670,7 @@ const PPDValue* PPDContext::getValue( const PPDKey* pKey ) const
return pValue;
}
-// -------------------------------------------------------------------
+
const PPDValue* PPDContext::setValue( const PPDKey* pKey, const PPDValue* pValue, bool bDontCareForConstraints )
{
@@ -1720,7 +1720,7 @@ const PPDValue* PPDContext::setValue( const PPDKey* pKey, const PPDValue* pValue
return pValue;
}
-// -------------------------------------------------------------------
+
bool PPDContext::checkConstraints( const PPDKey* pKey, const PPDValue* pValue )
{
@@ -1744,7 +1744,7 @@ bool PPDContext::checkConstraints( const PPDKey* pKey, const PPDValue* pValue )
return bRet;
}
-// -------------------------------------------------------------------
+
bool PPDContext::resetValue( const PPDKey* pKey, bool bDefaultable )
{
@@ -1762,7 +1762,7 @@ bool PPDContext::resetValue( const PPDKey* pKey, bool bDefaultable )
return bRet;
}
-// -------------------------------------------------------------------
+
bool PPDContext::checkConstraints( const PPDKey* pKey, const PPDValue* pNewValue, bool bDoReset )
{
@@ -1850,7 +1850,7 @@ bool PPDContext::checkConstraints( const PPDKey* pKey, const PPDValue* pNewValue
return true;
}
-// -------------------------------------------------------------------
+
char* PPDContext::getStreamableBuffer( sal_uLong& rBytes ) const
{
@@ -1896,7 +1896,7 @@ char* PPDContext::getStreamableBuffer( sal_uLong& rBytes ) const
return pBuffer;
}
-// -------------------------------------------------------------------
+
void PPDContext::rebuildFromStreamBuffer( char* pBuffer, sal_uLong nBytes )
{
@@ -1932,7 +1932,7 @@ void PPDContext::rebuildFromStreamBuffer( char* pBuffer, sal_uLong nBytes )
}
}
-// -------------------------------------------------------------------
+
int PPDContext::getRenderResolution() const
{
@@ -1958,7 +1958,7 @@ int PPDContext::getRenderResolution() const
return nDPI;
}
-// -------------------------------------------------------------------
+
void PPDContext::getPageSize( OUString& rPaper, int& rWidth, int& rHeight ) const
{
diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx
index bd3379ad30b3..0c6e7138977f 100644
--- a/vcl/unx/generic/printer/printerinfomanager.cxx
+++ b/vcl/unx/generic/printer/printerinfomanager.cxx
@@ -82,7 +82,7 @@ namespace psp
* class PrinterInfoManager
*/
-// -----------------------------------------------------------------
+
PrinterInfoManager& PrinterInfoManager::get()
{
@@ -110,7 +110,7 @@ void PrinterInfoManager::release()
pSalData->m_pPIManager = NULL;
}
-// -----------------------------------------------------------------
+
PrinterInfoManager::PrinterInfoManager( Type eType ) :
m_pQueueInfo( NULL ),
@@ -125,7 +125,7 @@ PrinterInfoManager::PrinterInfoManager( Type eType ) :
initSystemDefaultPaper();
}
-// -----------------------------------------------------------------
+
PrinterInfoManager::~PrinterInfoManager()
{
@@ -135,14 +135,14 @@ PrinterInfoManager::~PrinterInfoManager()
#endif
}
-// -----------------------------------------------------------------
+
bool PrinterInfoManager::isCUPSDisabled() const
{
return m_bDisableCUPS;
}
-// -----------------------------------------------------------------
+
void PrinterInfoManager::setCUPSDisabled( bool bDisable )
{
@@ -153,7 +153,7 @@ void PrinterInfoManager::setCUPSDisabled( bool bDisable )
checkPrintersChanged( true );
}
-// -----------------------------------------------------------------
+
void PrinterInfoManager::initSystemDefaultPaper()
{
@@ -162,7 +162,7 @@ void PrinterInfoManager::initSystemDefaultPaper()
RTL_TEXTENCODING_UTF8);
}
-// -----------------------------------------------------------------
+
bool PrinterInfoManager::checkPrintersChanged( bool bWait )
{
@@ -212,7 +212,7 @@ bool PrinterInfoManager::checkPrintersChanged( bool bWait )
return bChanged;
}
-// -----------------------------------------------------------------
+
void PrinterInfoManager::initialize()
{
@@ -583,7 +583,7 @@ void PrinterInfoManager::initialize()
}
}
-// -----------------------------------------------------------------
+
void PrinterInfoManager::listPrinters( ::std::list< OUString >& rList ) const
{
@@ -593,7 +593,7 @@ void PrinterInfoManager::listPrinters( ::std::list< OUString >& rList ) const
rList.push_back( it->first );
}
-// -----------------------------------------------------------------
+
const PrinterInfo& PrinterInfoManager::getPrinterInfo( const OUString& rPrinter ) const
{
@@ -605,7 +605,7 @@ const PrinterInfo& PrinterInfoManager::getPrinterInfo( const OUString& rPrinter
return it != m_aPrinters.end() ? it->second.m_aInfo : aEmptyInfo;
}
-// -----------------------------------------------------------------
+
void PrinterInfoManager::changePrinterInfo( const OUString& rPrinter, const PrinterInfo& rNewInfo )
{
@@ -621,7 +621,7 @@ void PrinterInfoManager::changePrinterInfo( const OUString& rPrinter, const Prin
}
}
-// -----------------------------------------------------------------
+
// need to check writeability / creatability of config files
static bool checkWriteability( const OUString& rUniPath )
@@ -771,7 +771,7 @@ bool PrinterInfoManager::writePrinterConfig()
return true;
}
-// -----------------------------------------------------------------
+
bool PrinterInfoManager::addPrinter( const OUString& rPrinterName, const OUString& rDriverName )
{
@@ -827,7 +827,7 @@ bool PrinterInfoManager::addPrinter( const OUString& rPrinterName, const OUStrin
return bSuccess;
}
-// -----------------------------------------------------------------
+
bool PrinterInfoManager::removePrinter( const OUString& rPrinterName, bool bCheckOnly )
{
@@ -881,7 +881,7 @@ bool PrinterInfoManager::removePrinter( const OUString& rPrinterName, bool bChec
return bSuccess;
}
-// -----------------------------------------------------------------
+
bool PrinterInfoManager::setDefaultPrinter( const OUString& rPrinterName )
{
@@ -900,13 +900,13 @@ bool PrinterInfoManager::setDefaultPrinter( const OUString& rPrinterName )
return bSuccess;
}
-// -----------------------------------------------------------------
+
bool PrinterInfoManager::addOrRemovePossible() const
{
return true;
}
-// -----------------------------------------------------------------
+
void PrinterInfoManager::getSystemPrintCommands( std::list< OUString >& rCommands )
{
@@ -1027,7 +1027,7 @@ void PrinterInfoManager::setDefaultPaper( PPDContext& rContext ) const
}
}
-// -----------------------------------------------------------------
+
SystemQueueInfo::SystemQueueInfo() :
m_bChanged( false )
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index 50ba7dcbaf2f..7a0bdcca3d31 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -2392,14 +2392,14 @@ void X11SalFrame::SetTitle( const OUString& rTitle )
}
}
-// -----------------------------------------------------------------------
+
void X11SalFrame::Flush()
{
XFlush( GetDisplay()->GetDisplay() );
}
-// -----------------------------------------------------------------------
+
void X11SalFrame::Sync()
{
@@ -2445,7 +2445,7 @@ void X11SalFrame::SetInputContext( SalInputContext* pContext )
return;
}
-// -----------------------------------------------------------------------
+
void X11SalFrame::EndExtTextInput( sal_uInt16 nFlags )
{
@@ -2453,7 +2453,7 @@ void X11SalFrame::EndExtTextInput( sal_uInt16 nFlags )
mpInputContext->EndExtTextInput( nFlags );
}
-// -----------------------------------------------------------------------
+
OUString X11SalFrame::GetKeyName( sal_uInt16 nKeyCode )
{
diff --git a/vcl/unx/generic/window/salobj.cxx b/vcl/unx/generic/window/salobj.cxx
index a694b91bd91b..f718ed30eb43 100644
--- a/vcl/unx/generic/window/salobj.cxx
+++ b/vcl/unx/generic/window/salobj.cxx
@@ -364,7 +364,7 @@ X11SalObject::GetClipRegionType()
return maClipRegion.GetClipRegionType();
}
-// -----------------------------------------------------------------------
+
void
X11SalObject::SetPosSize( long nX, long nY, long nWidth, long nHeight )
@@ -410,7 +410,7 @@ void X11SalObject::GrabFocus()
CurrentTime );
}
-// -----------------------------------------------------------------------
+
const SystemEnvData* X11SalObject::GetSystemData() const
{