diff options
Diffstat (limited to 'vcl/unx')
85 files changed, 0 insertions, 928 deletions
diff --git a/vcl/unx/generic/app/i18n_cb.cxx b/vcl/unx/generic/app/i18n_cb.cxx index ac62b621275d..015f226ed8fb 100644 --- a/vcl/unx/generic/app/i18n_cb.cxx +++ b/vcl/unx/generic/app/i18n_cb.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <stdio.h> #include <string.h> @@ -38,12 +37,8 @@ #include "unx/i18n_im.hxx" #include "salframe.hxx" - - // i. preedit start callback - - int PreeditStartCallback ( XIC, XPointer client_data, XPointer ) { @@ -58,12 +53,8 @@ PreeditStartCallback ( XIC, XPointer client_data, XPointer ) return -1; } - - // ii. preedit done callback - - void PreeditDoneCallback ( XIC, XPointer client_data, XPointer ) { @@ -76,17 +67,11 @@ PreeditDoneCallback ( XIC, XPointer client_data, XPointer ) pPreeditData->eState = ePreeditStatusStartPending; } - - // 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,11 +133,9 @@ 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,7 +224,6 @@ 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 @@ -376,7 +358,6 @@ PreeditDrawCallback(XIC ic, XPointer client_data, } } - // build the SalExtTextInputEvent and send it up pPreeditData->aInputEv.mnTime = 0; @@ -423,12 +404,8 @@ GetPreeditSpotLocation(XIC ic, XPointer client_data) return; } - - // iv. preedit caret callback - - #if OSL_DEBUG_LEVEL > 1 void PreeditCaretCallback ( XIC ic, XPointer client_data, @@ -472,13 +449,9 @@ 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,12 +461,8 @@ 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,12 +526,8 @@ 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 4430caaef58b..8c429d50ac39 100644 --- a/vcl/unx/generic/app/i18n_ic.cxx +++ b/vcl/unx/generic/app/i18n_ic.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <stdio.h> #include <sal/alloca.h> @@ -56,13 +55,9 @@ 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() { if ( maContext != NULL ) @@ -80,10 +75,8 @@ 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,10 +104,8 @@ 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,12 +124,8 @@ get_font_set( Display *p_display ) return p_font_set; } - - // Constructor for a InputContext (IC) - - SalI18N_InputContext::SalI18N_InputContext ( SalFrame *pFrame ) : mbUseable( True ), maContext( (XIC)NULL ), @@ -196,10 +183,8 @@ SalI18N_InputContext::SalI18N_InputContext ( SalFrame *pFrame ) : maClientData.aText.nCursorPos = 0; maClientData.aText.nLength = 0; - // Status attributes - switch ( mnStatusStyle ) { case XIMStatusCallbacks: @@ -236,10 +221,8 @@ SalI18N_InputContext::SalI18N_InputContext ( SalFrame *pFrame ) : break; } - // set preedit attributes - switch ( mnPreeditStyle ) { case XIMPreeditCallbacks: @@ -373,13 +356,9 @@ 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,13 +398,9 @@ SalI18N_InputContext::Map( SalFrame *pFrame ) } } - - // Handle DestroyCallbacks // in fact this is a callback called from the XNDestroyCallback - - void SalI18N_InputContext::HandleDestroyIM() { @@ -433,13 +408,9 @@ 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,12 +431,8 @@ 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,12 +514,8 @@ 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,14 +566,10 @@ 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,12 +614,8 @@ SalI18N_InputContext::UnsetICFocus( SalFrame* pFrame ) } } - - // multi byte input method only - - void SalI18N_InputContext::SetLanguage(LanguageType) { @@ -689,5 +644,4 @@ SalI18N_InputContext::EndExtTextInput( sal_uInt16 /*nFlags*/ ) } } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/unx/generic/app/i18n_im.cxx b/vcl/unx/generic/app/i18n_im.cxx index 04c88e0c8deb..e08ea6aae38b 100644 --- a/vcl/unx/generic/app/i18n_im.cxx +++ b/vcl/unx/generic/app/i18n_im.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <stdio.h> #include <string.h> @@ -48,13 +47,9 @@ 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,12 +138,8 @@ XKeyEventOp::match (const XKeyEvent &rEvent) const && same_screen == rEvent.same_screen; } - - // locale handling - - // Locale handling of the operating system layer static char* @@ -262,12 +253,8 @@ SalI18N_InputMethod::PosixLocale() return False; } - - // Constructor / Destructor / Initialisation - - SalI18N_InputMethod::SalI18N_InputMethod( ) : mbUseable( bUseInputMethodDefault ), maMethod( (XIM)NULL ), mpStyles( (XIMStyles*)NULL ) @@ -286,11 +273,9 @@ SalI18N_InputMethod::~SalI18N_InputMethod() XCloseIM ( maMethod ); } - // XXX // debug routine: lets have a look at the provided method styles - #if OSL_DEBUG_LEVEL > 1 extern "C" char* @@ -352,11 +337,9 @@ 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,10 +384,8 @@ 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 ) { @@ -446,8 +427,6 @@ 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 // there may be requests pending on the iiimp internal connection that will @@ -455,8 +434,6 @@ 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_keysym.cxx b/vcl/unx/generic/app/i18n_keysym.cxx index a720658335a2..2ce0e08ef439 100644 --- a/vcl/unx/generic/app/i18n_keysym.cxx +++ b/vcl/unx/generic/app/i18n_keysym.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <X11/X.h> #include <sal/types.h> diff --git a/vcl/unx/generic/app/i18n_status.cxx b/vcl/unx/generic/app/i18n_status.cxx index b6b2bbd8e08c..b5a286a46c96 100644 --- a/vcl/unx/generic/app/i18n_status.cxx +++ b/vcl/unx/generic/app/i18n_status.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #if OSL_DEBUG_LEVEL > 1 #include <stdio.h> #endif @@ -75,8 +74,6 @@ void StatusWindow::setPosition( SalFrame* ) { } - - namespace vcl { class XIMStatusWindow : public StatusWindow @@ -301,8 +298,6 @@ OUString XIMStatusWindow::getText() const return m_aStatusText.GetText(); } - - namespace vcl { class IIIMPStatusWindow : public StatusWindow @@ -470,8 +465,6 @@ void IIIMPStatusWindow::GetFocus() } } - - IMPL_LINK( IIIMPStatusWindow, SelectHdl, MenuButton*, pBtn ) { if( pBtn == & m_aStatusBtn ) @@ -516,31 +509,23 @@ I18NStatus& I18NStatus::get() return *pInstance; } - - bool I18NStatus::exists() { return pInstance != NULL; } - - void I18NStatus::free() { if( pInstance ) delete pInstance, pInstance = NULL; } - - I18NStatus::I18NStatus() : m_pParent( NULL ), m_pStatusWindow( NULL ) { } - - I18NStatus::~I18NStatus() { if( m_pStatusWindow ) @@ -549,8 +534,6 @@ I18NStatus::~I18NStatus() pInstance = NULL; } - - void I18NStatus::setParent( SalFrame* pParent ) { m_pParent = pParent; @@ -567,8 +550,6 @@ void I18NStatus::setParent( SalFrame* pParent ) m_pStatusWindow->setPosition( m_pParent ); } - - void I18NStatus::show( bool bShow, ShowReason eReason ) { if( m_pStatusWindow ) @@ -578,8 +559,6 @@ void I18NStatus::show( bool bShow, ShowReason eReason ) } } - - void I18NStatus::setStatusText( const OUString& rText ) { if( m_pStatusWindow ) @@ -615,15 +594,11 @@ void I18NStatus::setStatusText( const OUString& rText ) } } - - void I18NStatus::changeIM( const OUString& rIM ) { m_aCurrentIM = rIM; } - - SalFrame* I18NStatus::getStatusFrame() const { SalFrame* pRet = NULL; diff --git a/vcl/unx/generic/app/keysymnames.cxx b/vcl/unx/generic/app/keysymnames.cxx index a2d411786c28..27efa557b141 100644 --- a/vcl/unx/generic/app/keysymnames.cxx +++ b/vcl/unx/generic/app/keysymnames.cxx @@ -52,14 +52,10 @@ 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[] = { { XK_Control_L, "Ctrl" }, diff --git a/vcl/unx/generic/app/saldata.cxx b/vcl/unx/generic/app/saldata.cxx index 49933496f349..bcb04d0bcd51 100644 --- a/vcl/unx/generic/app/saldata.cxx +++ b/vcl/unx/generic/app/saldata.cxx @@ -316,7 +316,6 @@ bool X11SalData::ErrorTrapPop( bool bIgnoreError ) return err; } - void X11SalData::PushXErrorLevel( bool bIgnore ) { m_aXErrorHandlerStack.push_back( XErrorStackEntry() ); @@ -545,7 +544,6 @@ void X11SalData::XError( Display *pDisplay, XErrorEvent *pEvent ) ) return; - if( pDisplay != GetGenericData()->GetSalDisplay()->GetDisplay() ) return; diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx index 51063cba3ffb..d96fd205fd41 100644 --- a/vcl/unx/generic/app/saldisp.cxx +++ b/vcl/unx/generic/app/saldisp.cxx @@ -81,7 +81,6 @@ Status XineramaGetInfo(Display*, int, XRectangle*, unsigned char*, int*); using namespace vcl_sal; - #define SALCOLOR_WHITE MAKE_SALCOLOR( 0xFF, 0xFF, 0xFF ) #define SALCOLOR_BLACK MAKE_SALCOLOR( 0x00, 0x00, 0x00 ) @@ -147,7 +146,6 @@ static bool sal_GetVisualInfo( Display *pDisplay, XID nVID, XVisualInfo &rVI ) return true; } - extern "C" srv_vendor_t sal_GetServerVendor( Display *p_display ) { @@ -2267,7 +2265,6 @@ void SalDisplay::InitXinerama() #endif } - extern "C" { static Bool timestamp_predicate( Display*, XEvent* i_pEvent, XPointer i_pArg ) diff --git a/vcl/unx/generic/app/salinst.cxx b/vcl/unx/generic/app/salinst.cxx index 02066a6b074e..fd11d1d1377b 100644 --- a/vcl/unx/generic/app/salinst.cxx +++ b/vcl/unx/generic/app/salinst.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <string.h> #include <stdio.h> #include <stdlib.h> @@ -77,8 +76,6 @@ X11SalInstance::~X11SalInstance() GetGenericData()->Dispose(); } - - // AnyInput from sv/mow/source/app/svapp.cxx struct PredicateReturn @@ -235,8 +232,6 @@ static void getServerDirectories( std::list< OString >& o_rFontPaths ) #endif } - - void X11SalInstance::FillFontPathList( std::list< OString >& o_rFontPaths ) { Display *pDisplay = GetGenericData()->GetSalDisplay()->GetDisplay(); diff --git a/vcl/unx/generic/app/saltimer.cxx b/vcl/unx/generic/app/saltimer.cxx index c337510daafe..19b44955cfe0 100644 --- a/vcl/unx/generic/app/saltimer.cxx +++ b/vcl/unx/generic/app/saltimer.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <stdio.h> #include <sys/time.h> #include <sys/times.h> diff --git a/vcl/unx/generic/app/sm.cxx b/vcl/unx/generic/app/sm.cxx index 223bdef545f0..51a1bc392bef 100644 --- a/vcl/unx/generic/app/sm.cxx +++ b/vcl/unx/generic/app/sm.cxx @@ -165,7 +165,6 @@ static SmProp** ppSmProps = NULL; static int nSmProps = 0; static unsigned char *pSmRestartHint = NULL; - static void BuildSmPropertyList() { if( ! pSmProps ) @@ -413,7 +412,6 @@ void SessionManagerClient::saveDone() } } - void SessionManagerClient::open(SalSession * pSession) { assert(!m_pSession && !m_pICEConnectionObserver && !m_pSmcConnection); @@ -527,7 +525,6 @@ void SessionManagerClient::interactionDone( bool bCancelShutdown ) } } - OUString SessionManagerClient::getExecName() { OUString aExec, aSysExec; @@ -539,7 +536,6 @@ OUString SessionManagerClient::getExecName() return aSysExec; } - OString SessionManagerClient::getPreviousSessionID() { OString aPrevId; diff --git a/vcl/unx/generic/app/wmadaptor.cxx b/vcl/unx/generic/app/wmadaptor.cxx index a89e21a42cf1..787bb3c7162c 100644 --- a/vcl/unx/generic/app/wmadaptor.cxx +++ b/vcl/unx/generic/app/wmadaptor.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <string.h> #include <stdio.h> #include <stdlib.h> @@ -98,7 +97,6 @@ struct WMAdaptorProtocol int nProtocol; }; - /* * table must be sorted ascending in strings * since it is use with bsearch @@ -218,7 +216,6 @@ WMAdaptor* WMAdaptor::createWMAdaptor( SalDisplay* pSalDisplay ) return pAdaptor; } - /* * WMAdaptor constructor */ diff --git a/vcl/unx/generic/desktopdetect/desktopdetector.cxx b/vcl/unx/generic/desktopdetect/desktopdetector.cxx index 1d5d223fee29..aa1c84a30846 100644 --- a/vcl/unx/generic/desktopdetect/desktopdetector.cxx +++ b/vcl/unx/generic/desktopdetect/desktopdetector.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <prex.h> #include <X11/Xatom.h> #include <postx.h> @@ -36,7 +35,6 @@ #include <unistd.h> #include <string.h> - static bool is_gnome_desktop( Display* pDisplay ) { bool ret = false; diff --git a/vcl/unx/generic/dtrans/X11_clipboard.cxx b/vcl/unx/generic/dtrans/X11_clipboard.cxx index 2e2cc9071eb8..4e6b953e1728 100644 --- a/vcl/unx/generic/dtrans/X11_clipboard.cxx +++ b/vcl/unx/generic/dtrans/X11_clipboard.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <X11/Xatom.h> #include <X11_clipboard.hxx> #include <X11_transferable.hxx> @@ -45,7 +44,6 @@ using namespace cppu; using namespace osl; using namespace x11; - X11Clipboard::X11Clipboard( SelectionManager& rManager, Atom aSelection ) : ::cppu::WeakComponentImplHelper2< ::com::sun::star::datatransfer::clipboard::XSystemClipboard, @@ -71,8 +69,6 @@ X11Clipboard::X11Clipboard( SelectionManager& rManager, Atom aSelection ) : } } - - X11Clipboard::~X11Clipboard() { MutexGuard aGuard( *Mutex::getGlobalMutex() ); @@ -89,9 +85,6 @@ X11Clipboard::~X11Clipboard() } } - - - void X11Clipboard::fireChangedContentsEvent() { ClearableMutexGuard aGuard( m_rSelectionManager.getMutex() ); @@ -111,8 +104,6 @@ void X11Clipboard::fireChangedContentsEvent() } } - - void X11Clipboard::clearContents() { ClearableMutexGuard aGuard(m_rSelectionManager.getMutex()); @@ -134,8 +125,6 @@ void X11Clipboard::clearContents() xOwner->lostOwnership(xThis, m_aContents); } - - Reference< XTransferable > SAL_CALL X11Clipboard::getContents() throw(RuntimeException, std::exception) { @@ -146,8 +135,6 @@ Reference< XTransferable > SAL_CALL X11Clipboard::getContents() return m_aContents; } - - void SAL_CALL X11Clipboard::setContents( const Reference< XTransferable >& xTrans, const Reference< XClipboardOwner >& xClipboardOwner ) @@ -181,24 +168,18 @@ void SAL_CALL X11Clipboard::setContents( fireChangedContentsEvent(); } - - OUString SAL_CALL X11Clipboard::getName() throw(RuntimeException, std::exception) { return m_rSelectionManager.getString( m_aSelection ); } - - sal_Int8 SAL_CALL X11Clipboard::getRenderingCapabilities() throw(RuntimeException, std::exception) { return RenderingCapabilities::Delayed; } - - void SAL_CALL X11Clipboard::addClipboardListener( const Reference< XClipboardListener >& listener ) throw(RuntimeException, std::exception) { @@ -206,8 +187,6 @@ void SAL_CALL X11Clipboard::addClipboardListener( const Reference< XClipboardLis m_aListeners.push_back( listener ); } - - void SAL_CALL X11Clipboard::removeClipboardListener( const Reference< XClipboardListener >& listener ) throw(RuntimeException, std::exception) { @@ -215,37 +194,26 @@ void SAL_CALL X11Clipboard::removeClipboardListener( const Reference< XClipboard m_aListeners.remove( listener ); } - - - 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, std::exception) { diff --git a/vcl/unx/generic/dtrans/X11_clipboard.hxx b/vcl/unx/generic/dtrans/X11_clipboard.hxx index f2758222c9f2..5852321dbb24 100644 --- a/vcl/unx/generic/dtrans/X11_clipboard.hxx +++ b/vcl/unx/generic/dtrans/X11_clipboard.hxx @@ -27,8 +27,6 @@ #include <com/sun/star/datatransfer/clipboard/XSystemClipboard.hpp> #include <cppuhelper/compbase2.hxx> - - #define X11_CLIPBOARD_IMPLEMENTATION_NAME "com.sun.star.datatransfer.X11ClipboardSupport" namespace x11 { @@ -50,7 +48,6 @@ namespace x11 { protected: - friend class SelectionManager; void fireChangedContentsEvent(); @@ -118,14 +115,10 @@ namespace x11 { virtual com::sun::star::uno::Reference< XInterface > getReference() throw() SAL_OVERRIDE; }; - - 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 #endif diff --git a/vcl/unx/generic/dtrans/X11_dndcontext.cxx b/vcl/unx/generic/dtrans/X11_dndcontext.cxx index 5b77bd7e2824..19df17212532 100644 --- a/vcl/unx/generic/dtrans/X11_dndcontext.cxx +++ b/vcl/unx/generic/dtrans/X11_dndcontext.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <X11_dndcontext.hxx> #include <X11_selection.hxx> @@ -58,7 +57,6 @@ void DropTargetDropContext::dropComplete( sal_Bool success ) throw(std::exceptio m_rManager.dropComplete( success, m_aDropWindow, m_nTimestamp ); } - /* * DropTargetDragContext */ diff --git a/vcl/unx/generic/dtrans/X11_droptarget.cxx b/vcl/unx/generic/dtrans/X11_droptarget.cxx index d90e8a58ad84..51bd3c0a352a 100644 --- a/vcl/unx/generic/dtrans/X11_droptarget.cxx +++ b/vcl/unx/generic/dtrans/X11_droptarget.cxx @@ -26,7 +26,6 @@ using namespace com::sun::star::awt; using namespace com::sun::star::datatransfer; using namespace com::sun::star::datatransfer::dnd; - DropTarget::DropTarget() : ::cppu::WeakComponentImplHelper3< XDropTarget, @@ -46,8 +45,6 @@ DropTarget::~DropTarget() m_pSelectionManager->deregisterDropTarget( m_aTargetWindow ); } - - void DropTarget::initialize( const Sequence< Any >& arguments ) throw( ::com::sun::star::uno::Exception, std::exception ) { if( arguments.getLength() > 1 ) @@ -76,8 +73,6 @@ void DropTarget::initialize( const Sequence< Any >& arguments ) throw( ::com::su } } - - void DropTarget::addDropTargetListener( const Reference< XDropTargetListener >& xListener ) throw(std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( m_aMutex ); @@ -85,8 +80,6 @@ void DropTarget::addDropTargetListener( const Reference< XDropTargetListener >& m_aListeners.push_back( xListener ); } - - void DropTarget::removeDropTargetListener( const Reference< XDropTargetListener >& xListener ) throw(std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( m_aMutex ); @@ -94,15 +87,11 @@ void DropTarget::removeDropTargetListener( const Reference< XDropTargetListener m_aListeners.remove( xListener ); } - - sal_Bool DropTarget::isActive() throw(std::exception) { return m_bActive; } - - void DropTarget::setActive( sal_Bool active ) throw(std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( m_aMutex ); @@ -110,15 +99,11 @@ void DropTarget::setActive( sal_Bool active ) throw(std::exception) m_bActive = active; } - - sal_Int8 DropTarget::getDefaultActions() throw(std::exception) { return m_nDefaultActions; } - - void DropTarget::setDefaultActions( sal_Int8 actions ) throw(std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( m_aMutex ); @@ -126,8 +111,6 @@ void DropTarget::setDefaultActions( sal_Int8 actions ) throw(std::exception) m_nDefaultActions = actions; } - - void DropTarget::drop( const DropTargetDropEvent& dtde ) throw() { osl::ClearableGuard< ::osl::Mutex > aGuard( m_aMutex ); @@ -140,8 +123,6 @@ void DropTarget::drop( const DropTargetDropEvent& dtde ) throw() } } - - void DropTarget::dragEnter( const DropTargetDragEnterEvent& dtde ) throw() { osl::ClearableGuard< ::osl::Mutex > aGuard( m_aMutex ); @@ -154,8 +135,6 @@ void DropTarget::dragEnter( const DropTargetDragEnterEvent& dtde ) throw() } } - - void DropTarget::dragExit( const DropTargetEvent& dte ) throw() { osl::ClearableGuard< ::osl::Mutex > aGuard( m_aMutex ); @@ -168,8 +147,6 @@ void DropTarget::dragExit( const DropTargetEvent& dte ) throw() } } - - void DropTarget::dragOver( const DropTargetDragEvent& dtde ) throw() { osl::ClearableGuard< ::osl::Mutex > aGuard( m_aMutex ); diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx index 396f49619a90..9922696d8b7b 100644 --- a/vcl/unx/generic/dtrans/X11_selection.cxx +++ b/vcl/unx/generic/dtrans/X11_selection.cxx @@ -87,7 +87,6 @@ using namespace cppu; using namespace x11; - // stubs to satisfy solaris compiler's rather rigid linking warning extern "C" { @@ -102,7 +101,6 @@ extern "C" } } - static const long nXdndProtocolRevision = 5; // mapping between mime types (or what the office thinks of mime types) @@ -202,16 +200,12 @@ rtl_TextEncoding x11::getTextPlainEncoding( const OUString& rMimeType ) return aEncoding; } - - ::boost::unordered_map< OUString, SelectionManager*, OUStringHash >& SelectionManager::getInstances() { static ::boost::unordered_map< OUString, SelectionManager*, OUStringHash > aInstances; return aInstances; } - - SelectionManager::SelectionManager() : m_nIncrementalThreshold( 15*1024 ), m_pDisplay( NULL ), @@ -436,9 +430,6 @@ void SelectionManager::initialize( const Sequence< Any >& arguments ) throw (::c nodrop_curs_x_hot, nodrop_curs_y_hot ); - - - // just interested in SelectionClear/Notify/Request and PropertyChange XSelectInput( m_pDisplay, m_aWindow, PropertyChangeMask ); // create the transferable for Drag operations @@ -464,8 +455,6 @@ void SelectionManager::initialize( const Sequence< Any >& arguments ) throw (::c } } - - SelectionManager::~SelectionManager() { #if OSL_DEBUG_LEVEL > 1 @@ -529,8 +518,6 @@ SelectionManager::~SelectionManager() } } - - SelectionAdaptor* SelectionManager::getAdaptor( Atom selection ) { ::boost::unordered_map< Atom, Selection* >::iterator it = @@ -538,8 +525,6 @@ SelectionAdaptor* SelectionManager::getAdaptor( Atom selection ) return it != m_aSelections.end() ? it->second->m_pAdaptor : NULL; } - - OUString SelectionManager::convertFromCompound( const char* pText, int nLen ) { osl::MutexGuard aGuard( m_aMutex ); @@ -569,8 +554,6 @@ OUString SelectionManager::convertFromCompound( const char* pText, int nLen ) return aRet; } - - OString SelectionManager::convertToCompound( const OUString& rText ) { osl::MutexGuard aGuard( m_aMutex ); @@ -609,8 +592,6 @@ OString SelectionManager::convertToCompound( const OUString& rText ) return aRet; } - - bool SelectionManager::convertData( const css::uno::Reference< XTransferable >& xTransferable, Atom nType, @@ -689,8 +670,6 @@ bool SelectionManager::convertData( return bSuccess; } - - SelectionManager& SelectionManager::get( const OUString& rDisplayName ) { osl::MutexGuard aGuard( *osl::Mutex::getGlobalMutex() ); @@ -708,8 +687,6 @@ SelectionManager& SelectionManager::get( const OUString& rDisplayName ) return *pInstance; } - - const OUString& SelectionManager::getString( Atom aAtom ) { osl::MutexGuard aGuard(m_aMutex); @@ -729,8 +706,6 @@ const OUString& SelectionManager::getString( Atom aAtom ) return m_aAtomToString[ aAtom ]; } - - Atom SelectionManager::getAtom( const OUString& rString ) { osl::MutexGuard aGuard(m_aMutex); @@ -746,8 +721,6 @@ Atom SelectionManager::getAtom( const OUString& rString ) return m_aStringToAtom[ rString ]; } - - bool SelectionManager::requestOwnership( Atom selection ) { bool bSuccess = false; @@ -790,8 +763,6 @@ bool SelectionManager::requestOwnership( Atom selection ) return bSuccess; } - - void SelectionManager::convertTypeToNative( const OUString& rType, Atom selection, int& rFormat, ::std::list< Atom >& rConversions, bool bPushFront ) { NativeTypeEntry* pTab = selection == m_nXdndSelection ? aXdndConversionTab : aNativeConversionTab; @@ -833,8 +804,6 @@ 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 ) { rOutTypeList.clear(); @@ -864,8 +833,6 @@ void SelectionManager::getNativeTypeList( const Sequence< DataFlavor >& rTypes, rOutTypeList.push_back( m_nMULTIPLEAtom ); } - - OUString SelectionManager::convertTypeFromNative( Atom nType, Atom selection, int& rFormat ) { NativeTypeEntry* pTab = (selection == m_nXdndSelection) ? aXdndConversionTab : aNativeConversionTab; @@ -885,8 +852,6 @@ OUString SelectionManager::convertTypeFromNative( Atom nType, Atom selection, in return getString( nType ); } - - bool SelectionManager::getPasteData( Atom selection, Atom type, Sequence< sal_Int8 >& rData ) { osl::ResettableMutexGuard aGuard(m_aMutex); @@ -1023,8 +988,6 @@ bool SelectionManager::getPasteData( Atom selection, Atom type, Sequence< sal_In return bSuccess; } - - bool SelectionManager::getPasteData( Atom selection, const OUString& rType, Sequence< sal_Int8 >& rData ) { bool bSuccess = false; @@ -1238,8 +1201,6 @@ bool SelectionManager::getPasteData( Atom selection, const OUString& rType, Sequ return bSuccess; } - - bool SelectionManager::getPasteDataTypes( Atom selection, Sequence< DataFlavor >& rTypes ) { ::boost::unordered_map< Atom, Selection* >::iterator it; @@ -1443,8 +1404,6 @@ bool SelectionManager::getPasteDataTypes( Atom selection, Sequence< DataFlavor > return bSuccess; } - - PixmapHolder* SelectionManager::getPixmapHolder( Atom selection ) { boost::unordered_map< Atom, Selection* >::const_iterator it = m_aSelections.find( selection ); @@ -1603,8 +1562,6 @@ bool SelectionManager::sendData( SelectionAdaptor* pAdaptor, return bConverted; } - - bool SelectionManager::handleSelectionRequest( XSelectionRequestEvent& rRequest ) { osl::ResettableMutexGuard aGuard( m_aMutex ); @@ -1812,8 +1769,6 @@ bool SelectionManager::handleSelectionRequest( XSelectionRequestEvent& rRequest return true; } - - bool SelectionManager::handleReceivePropertyNotify( XPropertyEvent& rNotify ) { osl::MutexGuard aGuard( m_aMutex ); @@ -1931,8 +1886,6 @@ bool SelectionManager::handleReceivePropertyNotify( XPropertyEvent& rNotify ) return bHandled; } - - bool SelectionManager::handleSendPropertyNotify( XPropertyEvent& rNotify ) { osl::MutexGuard aGuard( m_aMutex ); @@ -2031,8 +1984,6 @@ bool SelectionManager::handleSendPropertyNotify( XPropertyEvent& rNotify ) return bHandled; } - - bool SelectionManager::handleSelectionNotify( XSelectionEvent& rNotify ) { osl::MutexGuard aGuard( m_aMutex ); @@ -2124,8 +2075,6 @@ bool SelectionManager::handleSelectionNotify( XSelectionEvent& rNotify ) return bHandled; } - - bool SelectionManager::handleDropEvent( XClientMessageEvent& rMessage ) { osl::ResettableMutexGuard aGuard(m_aMutex); @@ -2374,8 +2323,6 @@ void SelectionManager::dropComplete( bool bSuccess, XLIB_Window aDropWindow, XLI * methods for XDropTargetDragContext */ - - void SelectionManager::sendDragStatus( Atom nDropAction ) { osl::ClearableMutexGuard aGuard(m_aMutex); @@ -2443,15 +2390,11 @@ 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 ) { bool bRet = false; @@ -2503,8 +2446,6 @@ bool SelectionManager::updateDragAction( int modifierState ) return bRet; } - - void SelectionManager::sendDropPosition( bool bForce, XLIB_Time eventTime ) { osl::ClearableMutexGuard aGuard(m_aMutex); @@ -2563,8 +2504,6 @@ void SelectionManager::sendDropPosition( bool bForce, XLIB_Time eventTime ) } } - - bool SelectionManager::handleDragEvent( XEvent& rMessage ) { if( ! m_xDragSourceListener.is() ) @@ -2884,8 +2823,6 @@ bool SelectionManager::handleDragEvent( XEvent& rMessage ) return bHandled; } - - void SelectionManager::accept( sal_Int8 dragOperation, XLIB_Window aDropWindow, XLIB_Time ) { if( aDropWindow == m_aCurrentDropWindow ) @@ -2906,8 +2843,6 @@ void SelectionManager::accept( sal_Int8 dragOperation, XLIB_Window aDropWindow, } } - - void SelectionManager::reject( XLIB_Window aDropWindow, XLIB_Time ) { if( aDropWindow == m_aCurrentDropWindow ) @@ -2940,8 +2875,6 @@ sal_Bool SelectionManager::isDragImageSupported() throw(std::exception) return false; } - - sal_Int32 SelectionManager::getDefaultCursor( sal_Int8 dragAction ) throw(std::exception) { XLIB_Cursor aCursor = m_aNoneCursor; @@ -2954,8 +2887,6 @@ sal_Int32 SelectionManager::getDefaultCursor( sal_Int8 dragAction ) throw(std::e return aCursor; } - - int SelectionManager::getXdndVersion( XLIB_Window aWindow, XLIB_Window& rProxy ) { Atom* pProperties = NULL; @@ -3025,8 +2956,6 @@ int SelectionManager::getXdndVersion( XLIB_Window aWindow, XLIB_Window& rProxy ) return nVersion; } - - void SelectionManager::updateDragWindow( int nX, int nY, XLIB_Window aRoot ) { osl::ResettableMutexGuard aGuard( m_aMutex ); @@ -3071,7 +3000,6 @@ void SelectionManager::updateDragWindow( int nX, int nY, XLIB_Window aRoot ) } } - DragSourceDragEvent dsde; dsde.Source = static_cast< OWeakObject* >(this); dsde.DragSourceContext = new DragSourceContext( m_aDropWindow, m_nDragTimestamp, *this ); @@ -3184,8 +3112,6 @@ void SelectionManager::updateDragWindow( int nX, int nY, XLIB_Window aRoot ) } } - - void SelectionManager::startDrag( const DragGestureEvent& trigger, sal_Int8 sourceActions, @@ -3280,7 +3206,6 @@ void SelectionManager::startDrag( aParent = aChild; } while( aChild != None ); - #if OSL_DEBUG_LEVEL > 1 fprintf( stderr, "try to grab pointer ... " ); #endif @@ -3534,8 +3459,6 @@ sal_Int32 SelectionManager::getCurrentCursor() return m_aCurrentCursor; } - - void SelectionManager::setCursor( sal_Int32 cursor, XLIB_Window aDropWindow, XLIB_Time ) { osl::MutexGuard aGuard( m_aMutex ); @@ -3550,14 +3473,10 @@ void SelectionManager::setCursor( sal_Int32 cursor, XLIB_Window aDropWindow, XLI } } - - void SelectionManager::setImage( sal_Int32, XLIB_Window, XLIB_Time ) { } - - void SelectionManager::transferablesFlavorsChanged() { osl::MutexGuard aGuard(m_aMutex); @@ -3609,8 +3528,6 @@ void SelectionManager::transferablesFlavorsChanged() * dispatch loop */ - - bool SelectionManager::handleXEvent( XEvent& rEvent ) { /* @@ -3695,8 +3612,6 @@ bool SelectionManager::handleXEvent( XEvent& rEvent ) return bHandled; } - - void SelectionManager::dispatchEvent( int millisec ) { // acquire the mutex to prevent other threads @@ -3737,8 +3652,6 @@ void SelectionManager::dispatchEvent( int millisec ) } } - - void SelectionManager::run( void* pThis ) { #if OSL_DEBUG_LEVEL > 1 @@ -3862,8 +3775,6 @@ void SelectionManager::shutdown() throw() m_xDropTransferable.clear(); } - - sal_Bool SelectionManager::handleEvent( const Any& event ) throw(std::exception) { Sequence< sal_Int8 > aSeq; @@ -3922,8 +3833,6 @@ void SAL_CALL SelectionManager::notifyTermination( const ::com::sun::star::lang: disposing(rEvent); } - - void SelectionManager::registerHandler( Atom selection, SelectionAdaptor& rAdaptor ) { osl::MutexGuard aGuard(m_aMutex); @@ -3934,8 +3843,6 @@ void SelectionManager::registerHandler( Atom selection, SelectionAdaptor& rAdapt m_aSelections[ selection ] = pNewSelection; } - - void SelectionManager::deregisterHandler( Atom selection ) { osl::MutexGuard aGuard(m_aMutex); @@ -3950,8 +3857,6 @@ void SelectionManager::deregisterHandler( Atom selection ) } } - - static bool bWasError = false; extern "C" @@ -4006,8 +3911,6 @@ void SelectionManager::registerDropTarget( XLIB_Window aWindow, DropTarget* pTar OSL_FAIL( "attempt to register None as drop target" ); } - - void SelectionManager::deregisterDropTarget( XLIB_Window aWindow ) { osl::ClearableMutexGuard aGuard(m_aMutex); @@ -4062,28 +3965,20 @@ 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 */ @@ -4096,14 +3991,10 @@ SelectionManagerHolder::SelectionManagerHolder() : { } - - SelectionManagerHolder::~SelectionManagerHolder() { } - - void SelectionManagerHolder::initialize( const Sequence< Any >& arguments ) throw( ::com::sun::star::uno::Exception, std::exception ) { OUString aDisplayName; @@ -4133,15 +4024,11 @@ sal_Bool SelectionManagerHolder::isDragImageSupported() throw(std::exception) return m_xRealDragSource.is() ? m_xRealDragSource->isDragImageSupported() : false; } - - sal_Int32 SelectionManagerHolder::getDefaultCursor( sal_Int8 dragAction ) throw(std::exception) { return m_xRealDragSource.is() ? m_xRealDragSource->getDefaultCursor( dragAction ) : 0; } - - void SelectionManagerHolder::startDrag( const ::com::sun::star::datatransfer::dnd::DragGestureEvent& trigger, sal_Int8 sourceActions, sal_Int32 cursor, sal_Int32 image, @@ -4153,14 +4040,10 @@ void SelectionManagerHolder::startDrag( m_xRealDragSource->startDrag( trigger, sourceActions, cursor, image, transferable, listener ); } - - /* * XServiceInfo */ - - OUString SelectionManagerHolder::getImplementationName() throw(std::exception) { return OUString(XDND_IMPLEMENTATION_NAME); diff --git a/vcl/unx/generic/dtrans/X11_selection.hxx b/vcl/unx/generic/dtrans/X11_selection.hxx index 4f0aa4e429c7..2bfc632f8113 100644 --- a/vcl/unx/generic/dtrans/X11_selection.hxx +++ b/vcl/unx/generic/dtrans/X11_selection.hxx @@ -49,7 +49,6 @@ namespace x11 { class PixmapHolder; // in bmp.hxx - rtl_TextEncoding getTextPlainEncoding( const OUString& rMimeType ); class SelectionAdaptor @@ -146,7 +145,6 @@ namespace x11 { }; - class SelectionManager : public ::cppu::WeakImplHelper4< ::com::sun::star::datatransfer::dnd::XDragSource, @@ -259,7 +257,6 @@ namespace x11 { sal_Int32 m_nSelectionTimeout; XLIB_Time m_nSelectionTimestamp; - // members used for Xdnd // drop only @@ -324,14 +321,12 @@ namespace x11 { XLIB_Cursor m_aNoneCursor; XLIB_Cursor m_aCurrentCursor; - // drag and drop int m_nCurrentProtocolVersion; ::boost::unordered_map< XLIB_Window, DropTargetEntry > m_aDropTargets; - // some special atoms that are needed often Atom m_nCLIPBOARDAtom; Atom m_nTARGETSAtom; @@ -435,7 +430,6 @@ namespace x11 { Display * getDisplay() { return m_pDisplay; }; XLIB_Window getWindow() { return m_aWindow; }; - void registerHandler( Atom selection, SelectionAdaptor& rAdaptor ); void deregisterHandler( Atom selection ); bool requestOwnership( Atom selection ); @@ -443,7 +437,6 @@ namespace x11 { // allow for synchronization over one mutex for XClipboard osl::Mutex& getMutex() { return m_aMutex; } - Atom getAtom( const OUString& rString ); const OUString& getString( Atom nAtom ); @@ -507,8 +500,6 @@ namespace x11 { throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; - - ::com::sun::star::uno::Sequence< OUString > SAL_CALL Xdnd_getSupportedServiceNames(); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Xdnd_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & xMultiServiceFactory); @@ -517,8 +508,6 @@ 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); - - } #endif diff --git a/vcl/unx/generic/dtrans/X11_service.cxx b/vcl/unx/generic/dtrans/X11_service.cxx index 0ed55666cd97..36b1b9cbf2d4 100644 --- a/vcl/unx/generic/dtrans/X11_service.cxx +++ b/vcl/unx/generic/dtrans/X11_service.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "unx/salinst.h" #include <X11_clipboard.hxx> @@ -35,7 +34,6 @@ using namespace com::sun::star::datatransfer::clipboard; using namespace com::sun::star::awt; using namespace x11; - Sequence< OUString > SAL_CALL x11::X11Clipboard_getSupportedServiceNames() { Sequence< OUString > aRet(1); @@ -57,8 +55,6 @@ Sequence< OUString > SAL_CALL x11::Xdnd_dropTarget_getSupportedServiceNames() return aRet; } - - css::uno::Reference< XInterface > X11SalInstance::CreateClipboard( const Sequence< Any >& arguments ) { SelectionManager& rManager = SelectionManager::get(); @@ -86,19 +82,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() { return css::uno::Reference < XInterface >( ( OWeakObject * ) new DropTarget() ); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/unx/generic/dtrans/X11_transferable.cxx b/vcl/unx/generic/dtrans/X11_transferable.cxx index e913e8d83821..29493126884f 100644 --- a/vcl/unx/generic/dtrans/X11_transferable.cxx +++ b/vcl/unx/generic/dtrans/X11_transferable.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #if OSL_DEBUG_LEVEL > 1 #include <stdio.h> #endif @@ -35,8 +34,6 @@ using namespace osl; using namespace x11; - - X11Transferable::X11Transferable( SelectionManager& rManager, Atom selection @@ -46,14 +43,10 @@ X11Transferable::X11Transferable( { } - - X11Transferable::~X11Transferable() { } - - Any SAL_CALL X11Transferable::getTransferData( const DataFlavor& rFlavor ) throw(UnsupportedFlavorException, IOException, RuntimeException, std::exception) { @@ -85,8 +78,6 @@ Any SAL_CALL X11Transferable::getTransferData( const DataFlavor& rFlavor ) return aRet; } - - Sequence< DataFlavor > SAL_CALL X11Transferable::getTransferDataFlavors() throw(RuntimeException, std::exception) { @@ -98,8 +89,6 @@ Sequence< DataFlavor > SAL_CALL X11Transferable::getTransferDataFlavors() return aFlavorList; } - - sal_Bool SAL_CALL X11Transferable::isDataFlavorSupported( const DataFlavor& aFlavor ) throw(RuntimeException, std::exception) { diff --git a/vcl/unx/generic/dtrans/bmp.cxx b/vcl/unx/generic/dtrans/bmp.cxx index a6a7f43370e3..0e8a2e52426d 100644 --- a/vcl/unx/generic/dtrans/bmp.cxx +++ b/vcl/unx/generic/dtrans/bmp.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <unistd.h> #include <cstdio> #include <cstring> diff --git a/vcl/unx/generic/dtrans/config.cxx b/vcl/unx/generic/dtrans/config.cxx index d4a4633f0976..92f672b3359c 100644 --- a/vcl/unx/generic/dtrans/config.cxx +++ b/vcl/unx/generic/dtrans/config.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <cstdio> #include <unotools/configitem.hxx> @@ -48,7 +47,6 @@ using namespace com::sun::star::lang; using namespace com::sun::star::uno; using namespace x11; - sal_Int32 SelectionManager::getSelectionTimeout() { if( m_nSelectionTimeout < 1 ) @@ -128,5 +126,4 @@ void DtransX11ConfigItem::Notify( const Sequence< OUString >& /*rPropertyNames*/ { } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/unx/generic/gdi/gcach_xpeer.cxx b/vcl/unx/generic/gdi/gcach_xpeer.cxx index 51dd9b58ed29..6148912b8652 100644 --- a/vcl/unx/generic/gdi/gcach_xpeer.cxx +++ b/vcl/unx/generic/gdi/gcach_xpeer.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "rtl/ustring.hxx" #include "osl/module.h" #include "osl/thread.h" @@ -29,14 +28,10 @@ #include "gcach_xpeer.hxx" #include "xrender_peer.hxx" - - X11GlyphPeer::X11GlyphPeer() { } - - X11GlyphPeer::~X11GlyphPeer() { if( !ImplGetSVData() ) @@ -62,15 +57,11 @@ X11GlyphPeer::~X11GlyphPeer() } } - - X11GlyphCache::X11GlyphCache( X11GlyphPeer& rPeer ) : GlyphCache( rPeer ) { } - - namespace { struct GlyphCacheHolder @@ -111,20 +102,14 @@ X11GlyphCache& X11GlyphCache::GetInstance() return theGlyphCacheHolder::get().getGlyphCache(); } - - 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/salbmp.cxx b/vcl/unx/generic/gdi/salbmp.cxx index 7e7aef3cf911..0b1c5bd0df6f 100644 --- a/vcl/unx/generic/gdi/salbmp.cxx +++ b/vcl/unx/generic/gdi/salbmp.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <string.h> #include <stdio.h> #include <errno.h> @@ -52,7 +51,6 @@ // - SalBitmap - - SalBitmap* X11SalInstance::CreateSalBitmap() { return new X11SalBitmap(); @@ -61,8 +59,6 @@ SalBitmap* X11SalInstance::CreateSalBitmap() ImplSalBitmapCache* X11SalBitmap::mpCache = NULL; sal_uLong X11SalBitmap::mnCacheInstCount = 0; - - X11SalBitmap::X11SalBitmap() : mpDIB( NULL ) , mpDDB( NULL ) @@ -70,23 +66,17 @@ X11SalBitmap::X11SalBitmap() { } - - X11SalBitmap::~X11SalBitmap() { Destroy(); } - - void X11SalBitmap::ImplCreateCache() { if( !mnCacheInstCount++ ) mpCache = new ImplSalBitmapCache; } - - void X11SalBitmap::ImplDestroyCache() { DBG_ASSERT( mnCacheInstCount, "X11SalBitmap::ImplDestroyCache(): underflow" ); @@ -95,8 +85,6 @@ void X11SalBitmap::ImplDestroyCache() delete mpCache, mpCache = NULL; } - - void X11SalBitmap::ImplRemovedFromCache() { if( mpDDB ) @@ -121,8 +109,6 @@ namespace } #endif - - BitmapBuffer* X11SalBitmap::ImplCreateDIB( const Size& rSize, sal_uInt16 nBitCount, @@ -212,8 +198,6 @@ BitmapBuffer* X11SalBitmap::ImplCreateDIB( return pDIB; } - - BitmapBuffer* X11SalBitmap::ImplCreateDIB( Drawable aDrawable, SalX11Screen nScreen, @@ -387,8 +371,6 @@ BitmapBuffer* X11SalBitmap::ImplCreateDIB( return pDIB; } - - XImage* X11SalBitmap::ImplCreateXImage( SalDisplay *pSalDisp, SalX11Screen nScreen, @@ -563,7 +545,6 @@ XImage* X11SalBitmap::ImplCreateXImage( return pImage; } - bool X11SalBitmap::ImplCreateFromDrawable( Drawable aDrawable, SalX11Screen nScreen, @@ -581,7 +562,6 @@ bool X11SalBitmap::ImplCreateFromDrawable( return( mpDDB != NULL ); } - ImplSalDDB* X11SalBitmap::ImplGetDDB( Drawable aDrawable, SalX11Screen nXScreen, @@ -679,8 +659,6 @@ ImplSalDDB* X11SalBitmap::ImplGetDDB( return mpDDB; } - - void X11SalBitmap::ImplDraw( Drawable aDrawable, SalX11Screen nXScreen, @@ -694,8 +672,6 @@ void X11SalBitmap::ImplDraw( mpDDB->ImplDraw( aDrawable, nDrawableDepth, rTwoRect, rGC ); } - - bool X11SalBitmap::Create( const Size& rSize, sal_uInt16 nBitCount, const BitmapPalette& rPal ) { Destroy(); @@ -704,8 +680,6 @@ bool X11SalBitmap::Create( const Size& rSize, sal_uInt16 nBitCount, const Bitmap return( mpDIB != NULL ); } - - bool X11SalBitmap::Create( const SalBitmap& rSSalBmp ) { Destroy(); @@ -745,22 +719,16 @@ 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, Size& rSize, @@ -800,8 +768,6 @@ bool X11SalBitmap::Create( return false; } - - void X11SalBitmap::Destroy() { if( mpDIB ) @@ -817,8 +783,6 @@ void X11SalBitmap::Destroy() mpCache->ImplRemove( this ); } - - Size X11SalBitmap::GetSize() const { Size aSize; @@ -831,8 +795,6 @@ Size X11SalBitmap::GetSize() const return aSize; } - - sal_uInt16 X11SalBitmap::GetBitCount() const { sal_uInt16 nBitCount; @@ -847,8 +809,6 @@ sal_uInt16 X11SalBitmap::GetBitCount() const return nBitCount; } - - BitmapBuffer* X11SalBitmap::AcquireBuffer( bool ) { if( !mpDIB && mpDDB ) @@ -867,8 +827,6 @@ BitmapBuffer* X11SalBitmap::AcquireBuffer( bool ) return mpDIB; } - - void X11SalBitmap::ReleaseBuffer( BitmapBuffer*, bool bReadOnly ) { if( !bReadOnly ) @@ -881,8 +839,6 @@ void X11SalBitmap::ReleaseBuffer( BitmapBuffer*, bool bReadOnly ) } } - - bool X11SalBitmap::GetSystemData( BitmapSystemData& rData ) { if( mpDDB ) @@ -899,10 +855,8 @@ bool X11SalBitmap::GetSystemData( BitmapSystemData& rData ) return false; } - // - ImplSalDDB - - ImplSalDDB::ImplSalDDB( XImage* pImage, Drawable aDrawable, SalX11Screen nXScreen, const SalTwoRect& rTwoRect ) : maPixmap ( 0 ) @@ -933,8 +887,6 @@ ImplSalDDB::ImplSalDDB( XImage* pImage, Drawable aDrawable, } } - - ImplSalDDB::ImplSalDDB( Drawable aDrawable, SalX11Screen nXScreen, @@ -974,16 +926,12 @@ ImplSalDDB::ImplSalDDB( } } - - ImplSalDDB::~ImplSalDDB() { if( maPixmap && ImplGetSVData() ) XFreePixmap( GetGenericData()->GetSalDisplay()->GetDisplay(), maPixmap ); } - - bool ImplSalDDB::ImplMatches( SalX11Screen nXScreen, long nDepth, const SalTwoRect& rTwoRect ) const { bool bRet = false; @@ -1018,8 +966,6 @@ bool ImplSalDDB::ImplMatches( SalX11Screen nXScreen, long nDepth, const SalTwoRe return bRet; } - - void ImplSalDDB::ImplDraw( Drawable aDrawable, long nDrawableDepth, @@ -1033,8 +979,6 @@ void ImplSalDDB::ImplDraw( rTwoRect.mnDestX, rTwoRect.mnDestY, rGC ); } - - void ImplSalDDB::ImplDraw( Drawable aSrcDrawable, long nSrcDrawableDepth, @@ -1063,10 +1007,8 @@ void ImplSalDDB::ImplDraw( } } - // - ImplSalBitmapCache - - struct ImplBmpObj { X11SalBitmap* mpBmp; @@ -1077,22 +1019,16 @@ 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 ) { ImplBmpObj* pObj = NULL; @@ -1119,8 +1055,6 @@ void ImplSalBitmapCache::ImplAdd( X11SalBitmap* pBmp, sal_uLong nMemSize, sal_uL maBmpList.push_back( new ImplBmpObj( pBmp, nMemSize, nFlags ) ); } - - void ImplSalBitmapCache::ImplRemove( X11SalBitmap* pBmp ) { for( @@ -1139,8 +1073,6 @@ void ImplSalBitmapCache::ImplRemove( X11SalBitmap* pBmp ) } } - - void ImplSalBitmapCache::ImplClear() { for( diff --git a/vcl/unx/generic/gdi/salgdi2.cxx b/vcl/unx/generic/gdi/salgdi2.cxx index 66eecb4a389e..ef76996c8c27 100644 --- a/vcl/unx/generic/gdi/salgdi2.cxx +++ b/vcl/unx/generic/gdi/salgdi2.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <stdio.h> #include <poll.h> @@ -236,7 +235,6 @@ extern "C" } } - void X11SalGraphics::YieldGraphicsExpose() { // get frame if necessary @@ -422,8 +420,6 @@ void X11SalGraphics::copyBits( const SalTwoRect& rPosAry, } } - - void X11SalGraphics::copyArea ( long nDestX, long nDestY, long nSrcX, long nSrcY, long nSrcWidth, long nSrcHeight, diff --git a/vcl/unx/generic/gdi/salgdi3.cxx b/vcl/unx/generic/gdi/salgdi3.cxx index 05e9de371c15..841aeef8a2ee 100644 --- a/vcl/unx/generic/gdi/salgdi3.cxx +++ b/vcl/unx/generic/gdi/salgdi3.cxx @@ -83,12 +83,8 @@ struct _XRegion BOX extents; }; - - // X11SalGraphics - - GC X11SalGraphics::GetFontGC() { @@ -116,8 +112,6 @@ X11SalGraphics::GetFontGC() return pFontGC_; } - - bool X11SalGraphics::setFont( const FontSelectPattern *pEntry, int nFallbackLevel ) { // release all no longer needed font resources @@ -184,8 +178,6 @@ void ImplServerFontEntry::HandleFontOptions( void ) mpServerFont->SetFontOptions( mpFontOptions ); } - - CairoFontsCache::LRUFonts CairoFontsCache::maLRUFonts; int CairoFontsCache::mnRefCount = 0; @@ -439,8 +431,6 @@ void X11SalGraphics::DrawServerFontLayout( const ServerFontLayout& rLayout ) cairo_destroy(cr); } - - const ImplFontCharMap* X11SalGraphics::GetImplFontCharMap() const { if( !mpServerFont[0] ) @@ -457,12 +447,8 @@ bool X11SalGraphics::GetImplFontCapabilities(vcl::FontCapabilities &rGetImplFont return mpServerFont[0]->GetFontCapabilities(rGetImplFontCapabilities); } - - // SalGraphics - - sal_uInt16 X11SalGraphics::SetFont( FontSelectPattern *pEntry, int nFallbackLevel ) { sal_uInt16 nRetVal = 0; @@ -473,8 +459,6 @@ sal_uInt16 X11SalGraphics::SetFont( FontSelectPattern *pEntry, int nFallbackLeve return nRetVal; } - - void X11SalGraphics::SetTextColor( SalColor nSalColor ) { @@ -486,8 +470,6 @@ X11SalGraphics::SetTextColor( SalColor nSalColor ) } } - - bool X11SalGraphics::AddTempDevFont( PhysicalFontCollection* pFontCollection, const OUString& rFileURL, const OUString& rFontName ) @@ -566,8 +548,6 @@ void X11SalGraphics::GetDevFontList( PhysicalFontCollection* pFontCollection ) ImplGetSVData()->maGDIData.mbNativeFontConfig = true; } - - void cairosubcallback(void* pPattern) { const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); @@ -591,8 +571,6 @@ ImplFontOptions* GetFCFontOptions( const ImplFontAttributes& rFontAttributes, in return rPFM.getFontOptions(aInfo, nSize, cairosubcallback); } - - void X11SalGraphics::GetFontMetric( ImplFontMetricData *pMetric, int nFallbackLevel ) { @@ -606,8 +584,6 @@ X11SalGraphics::GetFontMetric( ImplFontMetricData *pMetric, int nFallbackLevel ) } } - - bool X11SalGraphics::GetGlyphBoundRect( sal_GlyphId aGlyphId, Rectangle& rRect ) { const int nLevel = aGlyphId >> GF_FONTSHIFT; @@ -638,8 +614,6 @@ bool X11SalGraphics::GetGlyphBoundRect( sal_GlyphId aGlyphId, Rectangle& rRect ) return true; } - - bool X11SalGraphics::GetGlyphOutline( sal_GlyphId aGlyphId, ::basegfx::B2DPolyPolygon& rPolyPoly ) { @@ -658,8 +632,6 @@ bool X11SalGraphics::GetGlyphOutline( sal_GlyphId aGlyphId, return false; } - - SalLayout* X11SalGraphics::GetTextLayout( ImplLayoutArgs& rArgs, int nFallbackLevel ) { SalLayout* pLayout = NULL; @@ -682,8 +654,6 @@ SalLayout* X11SalGraphics::GetTextLayout( ImplLayoutArgs& rArgs, int nFallbackLe return pLayout; } - - SystemFontData X11SalGraphics::GetSysFontData( int nFallbacklevel ) const { SystemFontData aSysFontData; @@ -707,8 +677,6 @@ SystemFontData X11SalGraphics::GetSysFontData( int nFallbacklevel ) const return aSysFontData; } - - bool X11SalGraphics::CreateFontSubset( const OUString& rToFile, const PhysicalFontFace* pFont, @@ -737,8 +705,6 @@ bool X11SalGraphics::CreateFontSubset( return bSuccess; } - - const void* X11SalGraphics::GetEmbedFontData( const PhysicalFontFace* pFont, const sal_Ucs* pUnicodes, sal_Int32* pWidths, FontSubsetInfo& rInfo, long* pDataLen ) { // in this context the pFont->GetFontId() is a valid PSP @@ -750,15 +716,11 @@ 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 ) { // in this context the pFont->GetFontId() is a valid PSP @@ -770,8 +732,6 @@ const Ucs2SIntMap* X11SalGraphics::GetFontEncodingVector( const PhysicalFontFace return GenPspGraphics::DoGetFontEncodingVector( aFont, pNonEncoded ); } - - void X11SalGraphics::GetGlyphWidths( const PhysicalFontFace* pFont, bool bVertical, Int32Vector& rWidths, diff --git a/vcl/unx/generic/gdi/salvd.cxx b/vcl/unx/generic/gdi/salvd.cxx index a858223c939b..56aa036c8266 100644 --- a/vcl/unx/generic/gdi/salvd.cxx +++ b/vcl/unx/generic/gdi/salvd.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <vcl/sysdata.hxx> #include <prex.h> diff --git a/vcl/unx/generic/gdi/xrender_peer.cxx b/vcl/unx/generic/gdi/xrender_peer.cxx index 03974a859caf..111b20a8e161 100644 --- a/vcl/unx/generic/gdi/xrender_peer.cxx +++ b/vcl/unx/generic/gdi/xrender_peer.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <stdio.h> #include <rtl/ustring.hxx> @@ -29,8 +28,6 @@ using namespace rtl; - - XRenderPeer::XRenderPeer() : mpDisplay( GetGenericData()->GetSalDisplay()->GetDisplay() ) , mpStandardFormatA8( NULL ) @@ -38,16 +35,12 @@ XRenderPeer::XRenderPeer() InitRenderLib(); } - - XRenderPeer& XRenderPeer::GetInstance() { static XRenderPeer aPeer; return aPeer; } - - void XRenderPeer::InitRenderLib() { int nDummy; diff --git a/vcl/unx/generic/gdi/xrender_peer.hxx b/vcl/unx/generic/gdi/xrender_peer.hxx index 172fb1fb35a6..cb71889bb7f9 100644 --- a/vcl/unx/generic/gdi/xrender_peer.hxx +++ b/vcl/unx/generic/gdi/xrender_peer.hxx @@ -76,8 +76,6 @@ public: const _XTrap*, int nCount ) const; }; - - inline XRenderPictFormat* XRenderPeer::GetStandardFormatA8() const { return mpStandardFormatA8; @@ -174,7 +172,6 @@ inline void XRenderPeer::FillRectangle( int a, Picture b, const XRenderColor* c, XRenderFillRectangle( mpDisplay, a, b, c, d, e, f, g ); } - inline void XRenderPeer::CompositeTrapezoids( int nOp, Picture aSrc, Picture aDst, const XRenderPictFormat* pXRPF, int nXSrc, int nYSrc, const XTrapezoid* pXT, int nCount ) const @@ -189,8 +186,6 @@ 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 ) { XRenderColor aRetVal; @@ -214,8 +209,6 @@ inline XRenderColor GetXRenderColor( const SalColor& rSalColor, double fTranspar return aRetVal; } - - #endif // INCLUDED_VCL_UNX_GENERIC_GDI_XRENDER_PEER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/unx/generic/printer/cupsmgr.cxx b/vcl/unx/generic/printer/cupsmgr.cxx index de8a5606be27..d39196e15cf0 100644 --- a/vcl/unx/generic/printer/cupsmgr.cxx +++ b/vcl/unx/generic/printer/cupsmgr.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <cups/cups.h> #include <cups/http.h> #include <cups/ipp.h> @@ -44,7 +43,6 @@ using namespace psp; using namespace osl; - struct GetPPDAttribs { osl::Condition m_aCondition; @@ -322,7 +320,6 @@ void CUPSManager::initialize() aPrinter.m_aInfo.m_aLocation=OStringToOUString(pDest->options[k].value, aEncoding); } - OUStringBuffer aBuf( 256 ); aBuf.appendAscii( "CUPS:" ); aBuf.append( aPrinterName ); @@ -686,7 +683,6 @@ bool CUPSManager::endSpool( const OUString& rPrintername, const OUString& rJobTi return nJobID != 0; } - void CUPSManager::changePrinterInfo( const OUString& rPrinter, const PrinterInfo& rNewInfo ) { PrinterInfoManager::changePrinterInfo( rPrinter, rNewInfo ); diff --git a/vcl/unx/generic/printer/jobdata.cxx b/vcl/unx/generic/printer/jobdata.cxx index 4ee83c5aadc1..389f74dc8be8 100644 --- a/vcl/unx/generic/printer/jobdata.cxx +++ b/vcl/unx/generic/printer/jobdata.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <officecfg/Office/Common.hxx> #include "vcl/jobdata.hxx" #include "vcl/printerinfomanager.hxx" diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx index 42eeffc2e3a0..471649c6e155 100644 --- a/vcl/unx/generic/printer/ppdparser.cxx +++ b/vcl/unx/generic/printer/ppdparser.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <stdlib.h> #include <stdio.h> @@ -79,7 +78,6 @@ namespace psp PPDTranslator() {} ~PPDTranslator() {} - void insertValue( const OUString& i_rKey, const OUString& i_rOption, @@ -264,7 +262,6 @@ namespace psp using namespace psp; - namespace { struct thePPDCache : public rtl::Static<PPDCache, thePPDCache> {}; @@ -1482,29 +1479,21 @@ 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 { PPDKey::hash_type::const_iterator it = m_aValues.find( rOption ); return it != m_aValues.end() ? &it->second : NULL; } - - const PPDValue* PPDKey::getValueCaseInsensitive( const OUString& rOption ) const { const PPDValue* pValue = getValue( rOption ); @@ -1518,8 +1507,6 @@ const PPDValue* PPDKey::getValueCaseInsensitive( const OUString& rOption ) const return pValue; } - - void PPDKey::eraseValue( const OUString& rOption ) { PPDKey::hash_type::iterator it = m_aValues.find( rOption ); @@ -1561,8 +1548,6 @@ PPDContext::PPDContext( const PPDParser* pParser ) : { } - - PPDContext& PPDContext::operator=( const PPDContext& rCopy ) { m_pParser = rCopy.m_pParser; @@ -1570,14 +1555,10 @@ PPDContext& PPDContext::operator=( const PPDContext& rCopy ) return *this; } - - PPDContext::~PPDContext() { } - - const PPDKey* PPDContext::getModifiedKey( int n ) const { hash_type::const_iterator it; @@ -1586,8 +1567,6 @@ const PPDKey* PPDContext::getModifiedKey( int n ) const return it != m_aCurrentValues.end() ? it->first : NULL; } - - void PPDContext::setParser( const PPDParser* pParser ) { if( pParser != m_pParser ) @@ -1597,8 +1576,6 @@ void PPDContext::setParser( const PPDParser* pParser ) } } - - const PPDValue* PPDContext::getValue( const PPDKey* pKey ) const { if( ! m_pParser ) @@ -1619,8 +1596,6 @@ const PPDValue* PPDContext::getValue( const PPDKey* pKey ) const return pValue; } - - const PPDValue* PPDContext::setValue( const PPDKey* pKey, const PPDValue* pValue, bool bDontCareForConstraints ) { if( ! m_pParser || ! pKey ) @@ -1669,8 +1644,6 @@ const PPDValue* PPDContext::setValue( const PPDKey* pKey, const PPDValue* pValue return pValue; } - - bool PPDContext::checkConstraints( const PPDKey* pKey, const PPDValue* pValue ) { if( ! m_pParser || ! pKey || ! pValue ) @@ -1693,8 +1666,6 @@ bool PPDContext::checkConstraints( const PPDKey* pKey, const PPDValue* pValue ) return bRet; } - - bool PPDContext::resetValue( const PPDKey* pKey, bool bDefaultable ) { if( ! pKey || ! m_pParser || ! m_pParser->hasKey( pKey ) ) @@ -1711,8 +1682,6 @@ bool PPDContext::resetValue( const PPDKey* pKey, bool bDefaultable ) return bRet; } - - bool PPDContext::checkConstraints( const PPDKey* pKey, const PPDValue* pNewValue, bool bDoReset ) { if( ! pNewValue ) @@ -1799,8 +1768,6 @@ bool PPDContext::checkConstraints( const PPDKey* pKey, const PPDValue* pNewValue return true; } - - char* PPDContext::getStreamableBuffer( sal_uLong& rBytes ) const { rBytes = 0; @@ -1845,8 +1812,6 @@ char* PPDContext::getStreamableBuffer( sal_uLong& rBytes ) const return pBuffer; } - - void PPDContext::rebuildFromStreamBuffer( char* pBuffer, sal_uLong nBytes ) { if( ! m_pParser ) @@ -1881,8 +1846,6 @@ void PPDContext::rebuildFromStreamBuffer( char* pBuffer, sal_uLong nBytes ) } } - - int PPDContext::getRenderResolution() const { // initialize to reasonable default, if parser is not set @@ -1907,8 +1870,6 @@ int PPDContext::getRenderResolution() const return nDPI; } - - void PPDContext::getPageSize( OUString& rPaper, int& rWidth, int& rHeight ) const { // initialize to reasonable default, if parser is not set diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx index a38627f7216f..8c05206206f2 100644 --- a/vcl/unx/generic/printer/printerinfomanager.cxx +++ b/vcl/unx/generic/printer/printerinfomanager.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <unistd.h> #include <sys/wait.h> #include <signal.h> @@ -53,7 +52,6 @@ using namespace psp; using namespace osl; - namespace psp { class SystemQueueInfo : public Thread @@ -82,8 +80,6 @@ namespace psp * class PrinterInfoManager */ - - PrinterInfoManager& PrinterInfoManager::get() { SalData* pSalData = GetSalData(); @@ -110,8 +106,6 @@ void PrinterInfoManager::release() pSalData->m_pPIManager = NULL; } - - PrinterInfoManager::PrinterInfoManager( Type eType ) : m_pQueueInfo( NULL ), m_eType( eType ), @@ -139,8 +133,6 @@ void PrinterInfoManager::initSystemDefaultPaper() RTL_TEXTENCODING_UTF8); } - - bool PrinterInfoManager::checkPrintersChanged( bool bWait ) { // check if files were created, deleted or modified since initialize() @@ -189,8 +181,6 @@ bool PrinterInfoManager::checkPrintersChanged( bool bWait ) return bChanged; } - - void PrinterInfoManager::initialize() { m_bUseIncludeFeature = false; @@ -303,7 +293,6 @@ void PrinterInfoManager::initialize() continue; aDirectory.close(); - FileBase::getFileURLFromSystemPath( aFile.PathToFileName(), aUniPath ); FileStatus aStatus( osl_FileStatus_Mask_ModifyTime ); DirectoryItem aItem; @@ -550,8 +539,6 @@ void PrinterInfoManager::initialize() } } - - void PrinterInfoManager::listPrinters( ::std::list< OUString >& rList ) const { ::boost::unordered_map< OUString, Printer, OUStringHash >::const_iterator it; @@ -560,8 +547,6 @@ void PrinterInfoManager::listPrinters( ::std::list< OUString >& rList ) const rList.push_back( it->first ); } - - const PrinterInfo& PrinterInfoManager::getPrinterInfo( const OUString& rPrinter ) const { static PrinterInfo aEmptyInfo; @@ -572,8 +557,6 @@ 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 ) { ::boost::unordered_map< OUString, Printer, OUStringHash >::iterator it = m_aPrinters.find( rPrinter ); @@ -588,8 +571,6 @@ void PrinterInfoManager::changePrinterInfo( const OUString& rPrinter, const Prin } } - - // need to check writeability / creatability of config files static bool checkWriteability( const OUString& rUniPath ) { @@ -737,8 +718,6 @@ bool PrinterInfoManager::writePrinterConfig() return true; } - - bool PrinterInfoManager::addPrinter( const OUString& rPrinterName, const OUString& rDriverName ) { bool bSuccess = false; @@ -793,8 +772,6 @@ bool PrinterInfoManager::addPrinter( const OUString& rPrinterName, const OUStrin return bSuccess; } - - bool PrinterInfoManager::removePrinter( const OUString& rPrinterName, bool bCheckOnly ) { bool bSuccess = true; @@ -806,7 +783,6 @@ bool PrinterInfoManager::removePrinter( const OUString& rPrinterName, bool bChec { // this printer already exists in a config file - // check writeability of config file(s) if( ! checkWriteability( it->second.m_aFile ) ) bSuccess = false; @@ -847,8 +823,6 @@ bool PrinterInfoManager::removePrinter( const OUString& rPrinterName, bool bChec return bSuccess; } - - bool PrinterInfoManager::setDefaultPrinter( const OUString& rPrinterName ) { bool bSuccess = false; @@ -985,8 +959,6 @@ void PrinterInfoManager::setDefaultPaper( PPDContext& rContext ) const } } - - SystemQueueInfo::SystemQueueInfo() : m_bChanged( false ) { diff --git a/vcl/unx/generic/window/FWS.cxx b/vcl/unx/generic/window/FWS.cxx index 43f1130c68e3..b6887dae7a67 100644 --- a/vcl/unx/generic/window/FWS.cxx +++ b/vcl/unx/generic/window/FWS.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -116,7 +115,6 @@ WMSupportsFWS (Display *display, int screen) #endif XFree (propData); - if (XGetWindowProperty (display, DefaultRootWindow (display), FWS_PROTOCOLS, 0, 10, False, AnyPropertyType, &propType, diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index a292449b66db..3a60c1ff6a35 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <signal.h> #include <string.h> #include <stdio.h> @@ -893,7 +892,6 @@ X11SalFrame::~X11SalFrame() delete pFreeGraphics_; } - XDestroyWindow( GetXDisplay(), mhWindow ); /* @@ -1807,7 +1805,6 @@ bool X11SalFrame::GetWindowState( SalFrameState* pState ) pState->mnMask = _FRAMESTATE_MASK_GEOMETRY | WINDOWSTATE_MASK_STATE; - if (! maRestorePosSize.IsEmpty() ) { GetPosSize( aPosSize ); @@ -2287,7 +2284,6 @@ void X11SalFrame::StartPresentation( bool bStart ) doReparentPresentationDialogues( GetDisplay() ); hPresentationWindow = (bStart && IsOverrideRedirect() ) ? GetWindow() : None; - // needs static here to save DPMS settings int dummy; static bool DPMSExtensionAvailable = @@ -2304,7 +2300,6 @@ void X11SalFrame::StartPresentation( bool bStart ) static CARD16 dpms_suspend_timeout=0; static CARD16 dpms_off_timeout=0; - if( bStart || nScreenSaversTimeout_ || DPMSEnabled) { if( hPresentationWindow ) @@ -2322,7 +2317,6 @@ void X11SalFrame::StartPresentation( bool bStart ) &prefer_blanking, &allow_exposures ); - // get the DPMS state right before the start if (DPMSExtensionAvailable) { @@ -2460,15 +2454,11 @@ void X11SalFrame::SetTitle( const OUString& rTitle ) } } - - void X11SalFrame::Flush() { XFlush( GetDisplay()->GetDisplay() ); } - - void X11SalFrame::Sync() { XSync( GetDisplay()->GetDisplay(), False ); @@ -2513,16 +2503,12 @@ void X11SalFrame::SetInputContext( SalInputContext* pContext ) return; } - - void X11SalFrame::EndExtTextInput( sal_uInt16 nFlags ) { if (mpInputContext != NULL) mpInputContext->EndExtTextInput( nFlags ); } - - OUString X11SalFrame::GetKeyName( sal_uInt16 nKeyCode ) { return GetDisplay()->GetKeyName( nKeyCode ); @@ -2779,7 +2765,6 @@ long X11SalFrame::HandleMouseEvent( XEvent *pEvent ) } } - if( LeaveNotify == pEvent->type || EnterNotify == pEvent->type ) { /* @@ -3386,7 +3371,6 @@ long X11SalFrame::HandleKeyEvent( XKeyEvent *pEvent ) } } - // update the spot location for PreeditPosition IME style if (! aDeleteWatch.isDeleted()) @@ -3430,7 +3414,6 @@ long X11SalFrame::HandleFocusEvent( XFocusChangeEvent *pEvent ) } } - if ( pEvent->mode == NotifyNormal || pEvent->mode == NotifyWhileGrabbed || ( ( nStyle_ & SAL_FRAME_STYLE_PLUG ) && pEvent->window == GetShellWindow() ) ) @@ -3444,8 +3427,6 @@ long X11SalFrame::HandleFocusEvent( XFocusChangeEvent *pEvent ) mbInputFocus = True; ImplSVData* pSVData = ImplGetSVData(); - - long nRet = CallCallback( SALEVENT_GETFOCUS, 0 ); if ((mpParent != NULL && nStyle_ == 0) && pSVData->maWinData.mpFirstFloat ) @@ -3613,7 +3594,6 @@ long X11SalFrame::HandleSizeEvent( XConfigureEvent *pEvent ) return 1; } - if( ( nStyle_ & SAL_FRAME_STYLE_PLUG ) && pEvent->window == GetShellWindow() ) { // just update the children's positions @@ -4133,7 +4113,6 @@ long X11SalFrame::Dispatch( XEvent *pEvent ) CurrentTime ); } - RestackChildren(); mbInShow = false; m_bSetFocusOnMap = false; diff --git a/vcl/unx/generic/window/salobj.cxx b/vcl/unx/generic/window/salobj.cxx index 4588321affc1..7a61bd1c92bd 100644 --- a/vcl/unx/generic/window/salobj.cxx +++ b/vcl/unx/generic/window/salobj.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #if OSL_DEBUG_LEVEL > 1 #include <stdio.h> #endif @@ -38,8 +37,6 @@ #include <salwtype.hxx> - - // SalInstance member to create and destroy a SalObject SalObject* X11SalInstance::CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, bool bShow ) @@ -173,18 +170,14 @@ X11SalObject* X11SalObject::CreateObject( SalFrame* pParent, SystemWindowData* p return pObject; } - void X11SalInstance::DestroyObject( SalObject* pObject ) { delete pObject; } - - // SalClipRegion is a member of SalObject // definition of SalClipRegion my be found in unx/inc/salobj.h - SalClipRegion::SalClipRegion() { ClipRectangleList = NULL; @@ -193,14 +186,12 @@ SalClipRegion::SalClipRegion() nClipRegionType = SAL_OBJECT_CLIP_INCLUDERECTS; } - SalClipRegion::~SalClipRegion() { if ( ClipRectangleList ) delete [] ClipRectangleList; } - void SalClipRegion::BeginSetClipRegion( sal_uLong nRects ) { @@ -212,7 +203,6 @@ SalClipRegion::BeginSetClipRegion( sal_uLong nRects ) maxClipRectangles = nRects; } - void SalClipRegion::UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) { @@ -269,7 +259,6 @@ X11SalObject::~X11SalObject() GetGenericData()->ErrorTrapPop(); } - void X11SalObject::ResetClipRegion() { @@ -302,21 +291,18 @@ X11SalObject::ResetClipRegion() op, ordering ); } - void X11SalObject::BeginSetClipRegion( sal_uLong nRectCount ) { maClipRegion.BeginSetClipRegion ( nRectCount ); } - void X11SalObject::UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) { maClipRegion.UnionClipRegion ( nX, nY, nWidth, nHeight ); } - void X11SalObject::EndSetClipRegion() { @@ -354,15 +340,12 @@ X11SalObject::EndSetClipRegion() op, ordering ); } - sal_uInt16 X11SalObject::GetClipRegionType() { return maClipRegion.GetClipRegionType(); } - - void X11SalObject::SetPosSize( long nX, long nY, long nWidth, long nHeight ) { @@ -377,7 +360,6 @@ X11SalObject::SetPosSize( long nX, long nY, long nWidth, long nHeight ) } } - void X11SalObject::Show( bool bVisible ) { @@ -407,8 +389,6 @@ void X11SalObject::GrabFocus() CurrentTime ); } - - const SystemEnvData* X11SalObject::GetSystemData() const { return &maSystemChildData; diff --git a/vcl/unx/gtk/a11y/atkaction.cxx b/vcl/unx/gtk/a11y/atkaction.cxx index fb613daffc68..01f2365c365c 100644 --- a/vcl/unx/gtk/a11y/atkaction.cxx +++ b/vcl/unx/gtk/a11y/atkaction.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "atkwrapper.hxx" #include <com/sun/star/accessibility/XAccessibleAction.hpp> @@ -209,7 +208,6 @@ appendKeyStrokes(OStringBuffer& rBuffer, const uno::Sequence< awt::KeyStroke >& } } - static G_CONST_RETURN gchar * action_wrapper_get_keybinding (AtkAction *action, gint i) diff --git a/vcl/unx/gtk/a11y/atkbridge.cxx b/vcl/unx/gtk/a11y/atkbridge.cxx index c63ef828444b..c82b1e18ddb2 100644 --- a/vcl/unx/gtk/a11y/atkbridge.cxx +++ b/vcl/unx/gtk/a11y/atkbridge.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <unx/gtk/atkbridge.hxx> #include <unx/gtk/gtkframe.hxx> diff --git a/vcl/unx/gtk/a11y/atkcomponent.cxx b/vcl/unx/gtk/a11y/atkcomponent.cxx index 53797f3350a3..222f4b609e65 100644 --- a/vcl/unx/gtk/a11y/atkcomponent.cxx +++ b/vcl/unx/gtk/a11y/atkcomponent.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "atkwrapper.hxx" #include <com/sun/star/accessibility/XAccessibleComponent.hpp> diff --git a/vcl/unx/gtk/a11y/atkeditabletext.cxx b/vcl/unx/gtk/a11y/atkeditabletext.cxx index d72988f09f89..2918da6496e6 100644 --- a/vcl/unx/gtk/a11y/atkeditabletext.cxx +++ b/vcl/unx/gtk/a11y/atkeditabletext.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "atkwrapper.hxx" #include "atktextattributes.hxx" @@ -48,7 +47,6 @@ static accessibility::XAccessibleEditableText* return NULL; } - /*****************************************************************************/ extern "C" { diff --git a/vcl/unx/gtk/a11y/atkfactory.cxx b/vcl/unx/gtk/a11y/atkfactory.cxx index 2b05c763a55b..01a55a72ac8f 100644 --- a/vcl/unx/gtk/a11y/atkfactory.cxx +++ b/vcl/unx/gtk/a11y/atkfactory.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <unx/gtk/gtkframe.hxx> #include <vcl/window.hxx> #include "atkwrapper.hxx" diff --git a/vcl/unx/gtk/a11y/atkhypertext.cxx b/vcl/unx/gtk/a11y/atkhypertext.cxx index f1fac6be1889..c4c5a5383bed 100644 --- a/vcl/unx/gtk/a11y/atkhypertext.cxx +++ b/vcl/unx/gtk/a11y/atkhypertext.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "atkwrapper.hxx" #include <com/sun/star/accessibility/XAccessibleHypertext.hpp> @@ -26,7 +25,6 @@ using namespace ::com::sun::star; - // ---------------------- AtkHyperlink ---------------------- typedef struct { @@ -212,7 +210,6 @@ static accessibility::XAccessibleHypertext* return NULL; } - static AtkHyperlink * hypertext_get_link( AtkHypertext *hypertext, gint link_index) diff --git a/vcl/unx/gtk/a11y/atkimage.cxx b/vcl/unx/gtk/a11y/atkimage.cxx index d9f93edc4a9d..524a26895c59 100644 --- a/vcl/unx/gtk/a11y/atkimage.cxx +++ b/vcl/unx/gtk/a11y/atkimage.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "atkwrapper.hxx" #include <com/sun/star/accessibility/XAccessibleImage.hpp> diff --git a/vcl/unx/gtk/a11y/atklistener.cxx b/vcl/unx/gtk/a11y/atklistener.cxx index ebdac0053ed6..3349be84925f 100644 --- a/vcl/unx/gtk/a11y/atklistener.cxx +++ b/vcl/unx/gtk/a11y/atklistener.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifdef AIX #define _LINUX_SOURCE_COMPAT #include <sys/timer.h> @@ -40,7 +39,6 @@ using namespace com::sun::star; - AtkListener::AtkListener( AtkObjectWrapper* pWrapper ) : mpWrapper( pWrapper ) { if( mpWrapper ) diff --git a/vcl/unx/gtk/a11y/atkselection.cxx b/vcl/unx/gtk/a11y/atkselection.cxx index 1d0994131cef..016cb03447ec 100644 --- a/vcl/unx/gtk/a11y/atkselection.cxx +++ b/vcl/unx/gtk/a11y/atkselection.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "atkwrapper.hxx" #include <com/sun/star/accessibility/XAccessibleSelection.hpp> diff --git a/vcl/unx/gtk/a11y/atktable.cxx b/vcl/unx/gtk/a11y/atktable.cxx index 7094a7caf4b9..12b598bf9fa3 100644 --- a/vcl/unx/gtk/a11y/atktable.cxx +++ b/vcl/unx/gtk/a11y/atktable.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "atkwrapper.hxx" #include <com/sun/star/accessibility/XAccessibleTable.hpp> @@ -638,7 +637,6 @@ table_wrapper_set_column_description( AtkTable *, gint, const gchar * ) { // meaningless helper } - /*****************************************************************************/ static void @@ -646,7 +644,6 @@ table_wrapper_set_column_header( AtkTable *, gint, AtkObject * ) { // meaningless helper } - /*****************************************************************************/ static void diff --git a/vcl/unx/gtk/a11y/atktext.cxx b/vcl/unx/gtk/a11y/atktext.cxx index c90a9447c78d..b3ee4f21c6f8 100644 --- a/vcl/unx/gtk/a11y/atktext.cxx +++ b/vcl/unx/gtk/a11y/atktext.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "atkwrapper.hxx" #include "atktextattributes.hxx" #include <algorithm> diff --git a/vcl/unx/gtk/a11y/atktextattributes.cxx b/vcl/unx/gtk/a11y/atktextattributes.cxx index 54e8f8f0a542..0d7cdc0e7785 100644 --- a/vcl/unx/gtk/a11y/atktextattributes.cxx +++ b/vcl/unx/gtk/a11y/atktextattributes.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "atktextattributes.hxx" #include <com/sun/star/awt/FontSlant.hpp> @@ -50,7 +49,6 @@ typedef bool (* TextPropertyValueFunc) ( uno::Any& rAny, const gchar * value ) #define STRNCMP_PARAM( s ) s,sizeof( s )-1 - /*****************************************************************************/ static AtkTextAttribute atk_text_attribute_paragraph_style = ATK_TEXT_ATTR_INVALID; @@ -147,7 +145,6 @@ static const char * ExportedTextAttributes[TEXT_ATTRIBUTE_LAST] = "WritingMode" // TEXT_ATTRIBUTE_WRITING_MODE }; - /*****************************************************************************/ static gchar* @@ -180,7 +177,6 @@ double toPoint(sal_Int16 n) return (double) (n * 72) / 2540; } - /*****************************************************************************/ static bool @@ -380,7 +376,6 @@ String2Weight( uno::Any& rAny, const gchar * value ) return true; } - /*****************************************************************************/ static gchar* @@ -770,7 +765,6 @@ get_font_effect(const uno::Sequence< beans::PropertyValue >& rAttributeList, // @see http://www.w3.org/TR/REC-CSS2/text.html#lining-striking-props - enum { DECORATION_NONE = 0, @@ -779,7 +773,6 @@ enum DECORATION_LINE_THROUGH }; - static const gchar * decorations[] = { "none", "blink", "underline", "line-through" }; static gchar * @@ -818,7 +811,6 @@ get_text_decoration(const uno::Sequence< beans::PropertyValue >& rAttributeList, return g_strjoinv(" ", value_list); } - /*****************************************************************************/ // @see http://www.w3.org/TR/REC-CSS2/text.html#propdef-text-shadow @@ -1219,7 +1211,6 @@ attribute_set_new_from_property_values( return attribute_set; } - AtkAttributeSet* attribute_set_prepend_misspelled( AtkAttributeSet* attribute_set ) { if( ATK_TEXT_ATTR_INVALID == atk_text_attribute_misspelled ) diff --git a/vcl/unx/gtk/a11y/atkutil.cxx b/vcl/unx/gtk/a11y/atkutil.cxx index e9309aa40fc8..f662bbdc7bdd 100644 --- a/vcl/unx/gtk/a11y/atkutil.cxx +++ b/vcl/unx/gtk/a11y/atkutil.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifdef AIX #define _LINUX_SOURCE_COMPAT #include <sys/timer.h> @@ -494,7 +493,6 @@ static void handle_toolbox_buttonchange(VclWindowEvent const *pEvent) } } - /*****************************************************************************/ static std::set< Window * > g_aWindowList; @@ -758,5 +756,4 @@ ooo_atk_util_get_type (void) return type; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/unx/gtk/a11y/atkvalue.cxx b/vcl/unx/gtk/a11y/atkvalue.cxx index 44416fa19982..7e1256e334c3 100644 --- a/vcl/unx/gtk/a11y/atkvalue.cxx +++ b/vcl/unx/gtk/a11y/atkvalue.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "atkwrapper.hxx" #include <com/sun/star/accessibility/XAccessibleValue.hpp> diff --git a/vcl/unx/gtk/a11y/atkwindow.cxx b/vcl/unx/gtk/a11y/atkwindow.cxx index e60ef0bbe491..92b89509ffb6 100644 --- a/vcl/unx/gtk/a11y/atkwindow.cxx +++ b/vcl/unx/gtk/a11y/atkwindow.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <unx/gtk/gtkframe.hxx> #include <vcl/svapp.hxx> #include <vcl/window.hxx> diff --git a/vcl/unx/gtk/a11y/atkwrapper.cxx b/vcl/unx/gtk/a11y/atkwrapper.cxx index b01abcdc575e..a4125fa53e9f 100644 --- a/vcl/unx/gtk/a11y/atkwrapper.cxx +++ b/vcl/unx/gtk/a11y/atkwrapper.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Type.hxx> #include <com/sun/star/uno/Sequence.hxx> @@ -121,7 +120,6 @@ static AtkRelationType mapRelationType( sal_Int16 nRelation ) return type; } - AtkStateType mapAtkState( sal_Int16 nState ) { AtkStateType type = ATK_STATE_INVALID; @@ -321,7 +319,6 @@ static AtkRole mapToAtkRole( sal_Int16 nRole ) return role; } - /*****************************************************************************/ extern "C" { @@ -558,7 +555,6 @@ wrapper_ref_state_set( AtkObject *atk_obj ) /*****************************************************************************/ - static void atk_object_wrapper_finalize (GObject *obj) { @@ -777,7 +773,6 @@ atk_object_wrapper_ref( const uno::Reference< accessibility::XAccessible > &rxAc return NULL; } - AtkObject * atk_object_wrapper_new( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rxAccessible, AtkObject* parent ) @@ -847,7 +842,6 @@ atk_object_wrapper_new( const ::com::sun::star::uno::Reference< ::com::sun::star } } - /*****************************************************************************/ void atk_object_wrapper_add_child(AtkObjectWrapper* wrapper, AtkObject *child, gint index) diff --git a/vcl/unx/gtk/a11y/atkwrapper.hxx b/vcl/unx/gtk/a11y/atkwrapper.hxx index 02126cbc541f..5886674f1d1d 100644 --- a/vcl/unx/gtk/a11y/atkwrapper.hxx +++ b/vcl/unx/gtk/a11y/atkwrapper.hxx @@ -43,7 +43,6 @@ namespace com { namespace sun { namespace star { namespace accessibility { class XAccessibleValue; } } } } - struct _AtkObjectWrapper { AtkObject aParent; diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx index 5787caf45367..bef0510da4a4 100644 --- a/vcl/unx/gtk/app/gtkdata.cxx +++ b/vcl/unx/gtk/app/gtkdata.cxx @@ -48,7 +48,6 @@ using namespace vcl_sal; - /*************************************************************** * class GtkSalDisplay * ***************************************************************/ @@ -493,7 +492,6 @@ int GtkSalDisplay::CaptureMouse( SalFrame* pSFrame ) return 1; } - /********************************************************************** * class GtkData * **********************************************************************/ diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/app/gtkinst.cxx index 83e0d1f801a8..6389cf06febd 100644 --- a/vcl/unx/gtk/app/gtkinst.cxx +++ b/vcl/unx/gtk/app/gtkinst.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <stack> #include <string.h> #include <osl/module.h> @@ -293,7 +292,6 @@ SalPrinter* GtkInstance::CreatePrinter( SalInfoPrinter* pInfoPrinter ) #endif } - GtkYieldMutex::GtkYieldMutex() { } diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx index 2365565ce614..1f3dfb65980c 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx @@ -50,10 +50,8 @@ #include "gtk/fpicker/SalGtkFilePicker.hxx" - // namespace directives - using namespace ::com::sun::star; using namespace ::com::sun::star::ui::dialogs; using namespace ::com::sun::star::ui::dialogs::TemplateDescription; @@ -312,10 +310,8 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference< uno::XComponentContext gtk_file_chooser_set_preview_widget_active( GTK_FILE_CHOOSER( m_pDialog ), true); } - // XFilePickerNotifier - void SAL_CALL SalGtkFilePicker::addFilePickerListener( const uno::Reference<XFilePickerListener>& xListener ) throw( uno::RuntimeException, std::exception ) { @@ -334,10 +330,8 @@ void SAL_CALL SalGtkFilePicker::removeFilePickerListener( const uno::Reference<X m_xListener.clear(); } - // XEventListener - void SAL_CALL SalGtkFilePicker::disposing( const lang::EventObject& aEvent ) throw( uno::RuntimeException ) { // no member access => no mutex needed @@ -348,10 +342,8 @@ void SAL_CALL SalGtkFilePicker::disposing( const lang::EventObject& aEvent ) thr removeFilePickerListener( xFilePickerListener ); } - // FilePicker Event functions - void SalGtkFilePicker::impl_fileSelectionChanged( FilePickerEvent aEvent ) { OSL_TRACE( "file selection changed"); @@ -370,8 +362,6 @@ void SalGtkFilePicker::impl_controlStateChanged( FilePickerEvent aEvent ) if (m_xListener.is()) m_xListener->controlStateChanged( aEvent ); } - - struct FilterEntry { protected: @@ -406,22 +396,17 @@ public: const UnoFilterEntry* endSubFilters() const { return m_aSubFilters.getConstArray() + m_aSubFilters.getLength(); } }; - - - FilterEntry::FilterEntry( const OUString& _rTitle, const UnoFilterList& _rSubFilters ) :m_sTitle( _rTitle ) ,m_aSubFilters( _rSubFilters ) { } - bool FilterEntry::hasSubFilters() const { return( 0 < m_aSubFilters.getLength() ); } - sal_Int32 FilterEntry::getSubFilters( UnoFilterList& _rSubFilterList ) { _rSubFilterList = m_aSubFilters; @@ -504,7 +489,6 @@ dialog_remove_buttons( GtkDialog *pDialog ) g_list_free( pChildren ); } - namespace { struct FilterTitleMatch : public ::std::unary_function< FilterEntry, bool > @@ -515,7 +499,6 @@ namespace { public: FilterTitleMatch( const OUString& _rTitle ) : rTitle( _rTitle ) { } - bool operator () ( const FilterEntry& _rEntry ) { bool bMatch; @@ -542,8 +525,6 @@ namespace { }; } - - bool SalGtkFilePicker::FilterNameExists( const OUString& rTitle ) { bool bRet = false; @@ -559,7 +540,6 @@ bool SalGtkFilePicker::FilterNameExists( const OUString& rTitle ) return bRet; } - bool SalGtkFilePicker::FilterNameExists( const UnoFilterList& _rGroupedFilters ) { bool bRet = false; @@ -581,7 +561,6 @@ bool SalGtkFilePicker::FilterNameExists( const UnoFilterList& _rGroupedFilters ) return bRet; } - void SalGtkFilePicker::ensureFilterList( const OUString& _rInitialCurrentFilter ) { if( !m_pFilterList ) @@ -594,11 +573,6 @@ void SalGtkFilePicker::ensureFilterList( const OUString& _rInitialCurrentFilter } } - - - - - void SAL_CALL SalGtkFilePicker::appendFilter( const OUString& aTitle, const OUString& aFilter ) throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception ) { @@ -616,10 +590,6 @@ void SAL_CALL SalGtkFilePicker::appendFilter( const OUString& aTitle, const OUSt m_pFilterList->insert( m_pFilterList->end(), FilterEntry( aTitle, aFilter ) ); } - - - - void SAL_CALL SalGtkFilePicker::setCurrentFilter( const OUString& aTitle ) throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception ) { @@ -642,10 +612,6 @@ void SAL_CALL SalGtkFilePicker::setCurrentFilter( const OUString& aTitle ) // TODO m_pImpl->setCurrentFilter( aTitle ); } - - - - void SalGtkFilePicker::updateCurrentFilterFromName(const gchar* filtername) { OUString aFilterName(filtername, strlen(filtername), RTL_TEXTENCODING_UTF8); @@ -703,10 +669,8 @@ OUString SAL_CALL SalGtkFilePicker::getCurrentFilter() throw( uno::RuntimeExcept return m_aCurrentFilter; } - // XFilterGroupManager functions - void SAL_CALL SalGtkFilePicker::appendFilterGroup( const OUString& /*sGroupTitle*/, const uno::Sequence<beans::StringPair>& aFilters ) throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception ) { @@ -735,10 +699,8 @@ void SAL_CALL SalGtkFilePicker::appendFilterGroup( const OUString& /*sGroupTitle } - // XFilePicker functions - void SAL_CALL SalGtkFilePicker::setMultiSelectionMode( sal_Bool bMode ) throw( uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -956,10 +918,8 @@ uno::Sequence<OUString> SAL_CALL SalGtkFilePicker::getSelectedFiles() throw( uno return aSelectedFiles; } - // XExecutableDialog functions - void SAL_CALL SalGtkFilePicker::setTitle( const OUString& rTitle ) throw( uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -1128,8 +1088,6 @@ sal_Int16 SAL_CALL SalGtkFilePicker::execute() throw( uno::RuntimeException, std return retVal; } - - // cf. offapi/com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.idl GtkWidget *SalGtkFilePicker::getWidget( sal_Int16 nControlId, GType *pType ) { @@ -1181,9 +1139,6 @@ GtkWidget *SalGtkFilePicker::getWidget( sal_Int16 nControlId, GType *pType ) return pWidget; } - - - // XFilePickerControlAccess functions static void HackWidthToFirst(GtkComboBox *pWidget) @@ -1469,10 +1424,8 @@ OUString SAL_CALL SalGtkFilePicker::getLabel( sal_Int16 nControlId ) return OStringToOUString( aTxt, RTL_TEXTENCODING_UTF8 ); } - // XFilePreview functions - uno::Sequence<sal_Int16> SAL_CALL SalGtkFilePicker::getSupportedImageFormats() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -1655,10 +1608,8 @@ sal_Bool SAL_CALL SalGtkFilePicker::getShowState() throw( uno::RuntimeException, return mbPreviewState; } - // XInitialization - void SAL_CALL SalGtkFilePicker::initialize( const uno::Sequence<uno::Any>& aArguments ) throw( uno::Exception, uno::RuntimeException, std::exception ) { @@ -1820,10 +1771,8 @@ void SalGtkFilePicker::preview_toggled_cb( GObject *cb, SalGtkFilePicker* pobjFP pobjFP->setShowState( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( cb ) ) ); } - // XCancellable - void SAL_CALL SalGtkFilePicker::cancel() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -1833,7 +1782,6 @@ void SAL_CALL SalGtkFilePicker::cancel() throw( uno::RuntimeException, std::exce // TODO m_pImpl->cancel(); } - // Misc void SalGtkFilePicker::SetCurFilter( const OUString& rFilter ) diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx index 94634ca7dd7a..b4f4dbd09ac5 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx +++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx @@ -33,10 +33,8 @@ #include "gtk/fpicker/SalGtkPicker.hxx" - // Implementation class for the XFilePicker Interface - struct FilterEntry; struct ElementEntry_Impl; @@ -45,11 +43,8 @@ typedef ::std::list < ElementEntry_Impl > ElementList; 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, ::com::sun::star::ui::dialogs::XFilePreview, @@ -65,29 +60,23 @@ 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, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL removeFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XExecutableDialog functions - virtual void SAL_CALL setTitle( const OUString& aTitle ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Int16 SAL_CALL execute() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XFilePicker functions - virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -104,17 +93,13 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFiles( ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XFilePicker2 functions - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSelectedFiles() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XFilterManager functions - virtual void SAL_CALL appendFilter( const OUString& aTitle, const OUString& aFilter ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -124,17 +109,13 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base virtual OUString SAL_CALL getCurrentFilter( ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // 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, std::exception) SAL_OVERRIDE; - // 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, std::exception) SAL_OVERRIDE; @@ -150,10 +131,8 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base virtual OUString SAL_CALL getLabel( sal_Int16 nControlId ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XFilePreview - virtual ::com::sun::star::uno::Sequence< sal_Int16 > SAL_CALL getSupportedImageFormats( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -175,32 +154,24 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base virtual sal_Bool SAL_CALL getShowState( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // 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, std::exception) SAL_OVERRIDE; - // XCancellable - virtual void SAL_CALL cancel( ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // 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 SalGtkFilePicker( const SalGtkFilePicker& ); diff --git a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx index b30334408c5c..a77d1c9512f2 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx @@ -47,7 +47,6 @@ using namespace ::com::sun::star::ui::dialogs; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; - // constructor SalGtkFolderPicker::SalGtkFolderPicker( const uno::Reference< uno::XComponentContext >& xContext ) : @@ -65,10 +64,8 @@ SalGtkFolderPicker::SalGtkFolderPicker( const uno::Reference< uno::XComponentCon gtk_file_chooser_set_select_multiple( GTK_FILE_CHOOSER( m_pDialog ), false ); } - // XEventListener - void SAL_CALL SalGtkFolderPicker::disposing( const lang::EventObject& ) throw( uno::RuntimeException ) { @@ -128,10 +125,8 @@ void SAL_CALL SalGtkFolderPicker::setDescription( const OUString& /*rDescription { } - // XExecutableDialog functions - void SAL_CALL SalGtkFolderPicker::setTitle( const OUString& aTitle ) throw( uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -177,10 +172,8 @@ sal_Int16 SAL_CALL SalGtkFolderPicker::execute() throw( uno::RuntimeException, s return retVal; } - // XCancellable - void SAL_CALL SalGtkFolderPicker::cancel() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard g; diff --git a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx index a7081c382be4..1acdd66c4abf 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx +++ b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx @@ -37,20 +37,16 @@ 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, std::exception ) SAL_OVERRIDE; virtual sal_Int16 SAL_CALL execute( ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XFolderPicker functions - virtual void SAL_CALL setDisplayDirectory( const OUString& rDirectory ) throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -63,17 +59,13 @@ class SalGtkFolderPicker : virtual void SAL_CALL setDescription( const OUString& rDescription ) throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XCancellable - virtual void SAL_CALL cancel( ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // 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 209343526218..50ad540887be 100644 --- a/vcl/unx/gtk/fpicker/eventnotification.hxx +++ b/vcl/unx/gtk/fpicker/eventnotification.hxx @@ -23,7 +23,6 @@ #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 @@ -31,7 +30,6 @@ // this is an application of the // "command" pattern see GoF - class CEventNotification { public: diff --git a/vcl/unx/gtk/fpicker/resourceprovider.cxx b/vcl/unx/gtk/fpicker/resourceprovider.cxx index f4e144a9b118..9727a9cf9654 100644 --- a/vcl/unx/gtk/fpicker/resourceprovider.cxx +++ b/vcl/unx/gtk/fpicker/resourceprovider.cxx @@ -30,7 +30,6 @@ using namespace ::com::sun::star::ui::dialogs::ExtendedFilePickerElementIds; using namespace ::com::sun::star::ui::dialogs::CommonFilePickerElementIds; - // translate control ids to resource ids static const struct diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx index be7b35e53c5b..a2b332620088 100644 --- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx @@ -61,7 +61,6 @@ GtkSalGraphics::~GtkSalGraphics() { } - /************************************* * Cached native widget objects *************************************/ @@ -172,7 +171,6 @@ static const GtkBorder aDefDefBorder = { 1, 1, 1, 1 }; #define BTN_CHILD_SPACING 1 #define MIN_SPIN_ARROW_WIDTH 6 - static void NWEnsureGTKRadio ( SalX11Screen nScreen ); static void NWEnsureGTKButton ( SalX11Screen nScreen ); static void NWEnsureGTKCheck ( SalX11Screen nScreen ); @@ -205,13 +203,11 @@ static void NWCalcArrowRect( const Rectangle& rButton, Rectangle& rArrow ); * */ - static Rectangle NWGetButtonArea( SalX11Screen nScreen, ControlType nType, ControlPart nPart, Rectangle aAreaRect, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption ); static Rectangle NWGetTabItemRect( SalX11Screen nScreen, Rectangle aAreaRect ); - static Rectangle NWGetEditBoxPixmapRect( SalX11Screen nScreen, ControlType nType, ControlPart nPart, Rectangle aAreaRect, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption ); @@ -230,7 +226,6 @@ static void NWPaintOneSpinButton( SalX11Screen nScreen, GdkPixmap * pixmap, Cont static Rectangle NWGetComboBoxButtonRect( SalX11Screen nScreen, ControlType nType, ControlPart nPart, Rectangle aAreaRect, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption ); - static Rectangle NWGetListBoxButtonRect( SalX11Screen nScreen, ControlType nType, ControlPart nPart, Rectangle aAreaRect, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption ); @@ -247,10 +242,8 @@ static Rectangle NWGetToolbarRect( SalX11Screen nScreen, static int getFrameWidth(GtkWidget* widget); - static Rectangle NWGetScrollButtonRect( SalX11Screen nScreen, ControlPart nPart, Rectangle aAreaRect ); - /********************************************************* * PixmapCache *********************************************************/ @@ -317,7 +310,6 @@ void NWPixmapCacheData::SetPixmap( GdkPixmap* pPixmap ) g_object_ref( m_pixmap ); } - NWPixmapCache::NWPixmapCache( SalX11Screen nScreen ) { m_idx = 0; @@ -373,7 +365,6 @@ void NWPixmapCache::Fill( ControlType aType, ControlState aState, const Rectangl pData[m_idx].SetPixmap( pPixmap ); } - void NWPixmapCacheList::AddCache( NWPixmapCache* pCache ) { mCaches.push_back( pCache ); @@ -395,7 +386,6 @@ void NWPixmapCacheList::ThemeChanged( ) } } - /********************************************************* * Make border manipulation easier *********************************************************/ @@ -407,7 +397,6 @@ inline void NW_gtk_border_set_from_border( GtkBorder& aDst, const GtkBorder * pS aDst.bottom = pSrc->bottom; } - /********************************************************* * Initialize GTK and local stuff *********************************************************/ @@ -474,7 +463,6 @@ void GtkData::initNWF( void ) #endif } - /********************************************************* * Release GTK and local stuff *********************************************************/ @@ -502,7 +490,6 @@ void GtkData::deInitNWF( void ) } } - /********************************************************** * track clip region **********************************************************/ @@ -654,7 +641,6 @@ bool GtkSalGraphics::IsNativeControlSupported( ControlType nType, ControlPart nP return false; } - /* * HitTestNativeControl() * @@ -766,7 +752,6 @@ bool GtkSalGraphics::hitTestNativeControl( ControlType nType, } } - /* * DrawNativeControl() * @@ -1622,8 +1607,6 @@ static Rectangle NWGetTabItemRect( SalX11Screen nScreen, Rectangle aAreaRect ) return Rectangle( Point( x, y ), Size( w, h ) ); } - - bool GtkSalGraphics::NWPaintGTKRadio( GdkDrawable* gdkDrawable, ControlType, ControlPart, const Rectangle& rControlRectangle, @@ -1680,8 +1663,6 @@ bool GtkSalGraphics::NWPaintGTKRadio( GdkDrawable* gdkDrawable, return true; } - - bool GtkSalGraphics::NWPaintGTKCheck( GdkDrawable* gdkDrawable, ControlType, ControlPart, const Rectangle& rControlRectangle, @@ -1727,7 +1708,6 @@ bool GtkSalGraphics::NWPaintGTKCheck( GdkDrawable* gdkDrawable, return true; } - static void NWCalcArrowRect( const Rectangle& rButton, Rectangle& rArrow ) { // Size the arrow appropriately @@ -2068,8 +2048,6 @@ bool GtkSalGraphics::NWPaintGTKScrollbar( ControlType, ControlPart nPart, return true; } - - static Rectangle NWGetScrollButtonRect( SalX11Screen nScreen, ControlPart nPart, Rectangle aAreaRect ) { gint slider_width; @@ -2151,8 +2129,6 @@ static Rectangle NWGetScrollButtonRect( SalX11Screen nScreen, ControlPart nPa return( buttonRect ); } - - bool GtkSalGraphics::NWPaintGTKEditBox( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, @@ -2181,7 +2157,6 @@ bool GtkSalGraphics::NWPaintGTKEditBox( GdkDrawable* gdkDrawable, return true; } - /* Take interior/exterior focus into account and return * the bounding rectangle of the edit box including * any focus requirements. @@ -2215,7 +2190,6 @@ static Rectangle NWGetEditBoxPixmapRect(SalX11Screen nScreen, return( pixmapRect ); } - /* Paint a GTK Entry widget into the specified GdkPixmap. * All coordinates should be local to the Pixmap, NOT * screen/window coordinates. @@ -2288,10 +2262,6 @@ static void NWPaintOneEditBox( SalX11Screen nScreen, } - - - - bool GtkSalGraphics::NWPaintGTKSpinBox( ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, const clipList&, @@ -2340,7 +2310,6 @@ bool GtkSalGraphics::NWPaintGTKSpinBox( ControlType nType, ControlPart nPart, else pixmapRect = rControlRectangle; - pixmap = NWGetPixmapFromScreen( pixmapRect ); if ( !pixmap ) return false; @@ -2396,8 +2365,6 @@ bool GtkSalGraphics::NWPaintGTKSpinBox( ControlType nType, ControlPart nPart, return true; } - - static Rectangle NWGetSpinButtonRect( SalX11Screen nScreen, ControlType, ControlPart nPart, @@ -2487,9 +2454,6 @@ static void NWPaintOneSpinButton( SalX11Screen nScreen, arrowRect.GetWidth(), arrowRect.GetHeight() ); } - - - bool GtkSalGraphics::NWPaintGTKComboBox( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, @@ -2568,8 +2532,6 @@ bool GtkSalGraphics::NWPaintGTKComboBox( GdkDrawable* gdkDrawable, return true; } - - static Rectangle NWGetComboBoxButtonRect( SalX11Screen nScreen, ControlType, ControlPart nPart, @@ -2626,10 +2588,6 @@ static Rectangle NWGetComboBoxButtonRect( SalX11Screen nScreen, return( aButtonRect ); } - - - - bool GtkSalGraphics::NWPaintGTKTabItem( ControlType nType, ControlPart, const Rectangle& rControlRectangle, const clipList&, @@ -2781,8 +2739,6 @@ bool GtkSalGraphics::NWPaintGTKTabItem( ControlType nType, ControlPart, return bSuccess; } - - bool GtkSalGraphics::NWPaintGTKListBox( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, @@ -3032,8 +2988,6 @@ bool GtkSalGraphics::NWPaintGTKToolbar( return true; } - - bool GtkSalGraphics::NWPaintGTKMenubar( GdkDrawable* gdkDrawable, ControlType, ControlPart nPart, @@ -3528,15 +3482,12 @@ bool GtkSalGraphics::NWPaintGTKSlider( eOri ); } - bool bRet = NWRenderPixmapToScreen( pixmap, rControlRectangle ); g_object_unref( pixmap ); return bRet; } - - static int getFrameWidth(GtkWidget* widget) { return widget->style->xthickness; @@ -3605,8 +3556,6 @@ static Rectangle NWGetListBoxButtonRect( SalX11Screen nScreen, return( aPartRect ); } - - static Rectangle NWGetListBoxIndicatorRect( SalX11Screen nScreen, ControlType, ControlPart, @@ -4104,7 +4053,6 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings ) rSettings.SetStyleSettings( aStyleSet ); } - /************************************************************************ * Create a GdkPixmap filled with the contents of an area of an Xlib window ************************************************************************/ @@ -4138,9 +4086,6 @@ GdkPixmap* GtkSalGraphics::NWGetPixmapFromScreen( Rectangle srcRect ) return( pPixmap ); } - - - /************************************************************************ * Copy an alpha pixmap to screen using a gc with clipping ************************************************************************/ @@ -4170,7 +4115,6 @@ bool GtkSalGraphics::NWRenderPixmapToScreen( GdkPixmap* pPixmap, Rectangle dstRe return true; } - /************************************************************************ * State conversion ************************************************************************/ @@ -4224,8 +4168,6 @@ static void NWSetWidgetState( GtkWidget* widget, ControlState nState, GtkStateTy * Widget ensure functions - make sure cached objects are valid ************************************************************************/ - - static void NWAddWidgetToCacheWindow( GtkWidget* widget, SalX11Screen nScreen ) { NWFWidgetData& rData = gWidgetData[nScreen]; @@ -4257,8 +4199,6 @@ static void NWAddWidgetToCacheWindow( GtkWidget* widget, SalX11Screen nScreen ) gWidgetDefaultFlags[ (long)widget ] = GTK_WIDGET_FLAGS( widget ); } - - static void NWEnsureGTKButton( SalX11Screen nScreen ) { if ( !gWidgetData[nScreen].gBtnWidget ) @@ -4268,8 +4208,6 @@ static void NWEnsureGTKButton( SalX11Screen nScreen ) } } - - static void NWEnsureGTKRadio( SalX11Screen nScreen ) { if ( !gWidgetData[nScreen].gRadioWidget || !gWidgetData[nScreen].gRadioWidgetSibling ) @@ -4281,8 +4219,6 @@ static void NWEnsureGTKRadio( SalX11Screen nScreen ) } } - - static void NWEnsureGTKCheck( SalX11Screen nScreen ) { if ( !gWidgetData[nScreen].gCheckWidget ) @@ -4292,8 +4228,6 @@ static void NWEnsureGTKCheck( SalX11Screen nScreen ) } } - - static void NWEnsureGTKScrollbars( SalX11Screen nScreen ) { if ( !gWidgetData[nScreen].gScrollHorizWidget ) @@ -4309,8 +4243,6 @@ static void NWEnsureGTKScrollbars( SalX11Screen nScreen ) } } - - static void NWEnsureGTKArrow( SalX11Screen nScreen ) { if ( !gWidgetData[nScreen].gArrowWidget || !gWidgetData[nScreen].gDropdownWidget ) @@ -4324,8 +4256,6 @@ static void NWEnsureGTKArrow( SalX11Screen nScreen ) } } - - static void NWEnsureGTKEditBox( SalX11Screen nScreen ) { if ( !gWidgetData[nScreen].gEditBoxWidget ) @@ -4335,8 +4265,6 @@ static void NWEnsureGTKEditBox( SalX11Screen nScreen ) } } - - static void NWEnsureGTKSpinButton( SalX11Screen nScreen ) { if ( !gWidgetData[nScreen].gSpinButtonWidget ) @@ -4352,8 +4280,6 @@ static void NWEnsureGTKSpinButton( SalX11Screen nScreen ) } } - - static void NWEnsureGTKNotebook( SalX11Screen nScreen ) { if ( !gWidgetData[nScreen].gNotebookWidget ) @@ -4363,8 +4289,6 @@ static void NWEnsureGTKNotebook( SalX11Screen nScreen ) } } - - static void NWEnsureGTKOptionMenu( SalX11Screen nScreen ) { if ( !gWidgetData[nScreen].gOptionMenuWidget ) @@ -4374,8 +4298,6 @@ static void NWEnsureGTKOptionMenu( SalX11Screen nScreen ) } } - - static void NWEnsureGTKCombo( SalX11Screen nScreen ) { if ( !gWidgetData[nScreen].gComboWidget ) @@ -4394,8 +4316,6 @@ static void NWEnsureGTKCombo( SalX11Screen nScreen ) } } - - static void NWEnsureGTKScrolledWindow( SalX11Screen nScreen ) { if ( !gWidgetData[nScreen].gScrolledWindowWidget ) @@ -4408,8 +4328,6 @@ static void NWEnsureGTKScrolledWindow( SalX11Screen nScreen ) } } - - static void NWEnsureGTKToolbar( SalX11Screen nScreen ) { if( !gWidgetData[nScreen].gToolbarWidget ) @@ -4439,8 +4357,6 @@ static void NWEnsureGTKToolbar( SalX11Screen nScreen ) } } - - static void NWEnsureGTKMenubar( SalX11Screen nScreen ) { if( !gWidgetData[nScreen].gMenubarWidget ) diff --git a/vcl/unx/gtk/gdi/salprn-gtk.cxx b/vcl/unx/gtk/gdi/salprn-gtk.cxx index eb6609098960..0251ffd29841 100644 --- a/vcl/unx/gtk/gdi/salprn-gtk.cxx +++ b/vcl/unx/gtk/gdi/salprn-gtk.cxx @@ -114,7 +114,6 @@ private: boost::shared_ptr<GtkPrintWrapper> m_pWrapper; }; - struct GtkSalPrinter_Impl { OString m_sSpoolFile; @@ -126,14 +125,12 @@ struct GtkSalPrinter_Impl ~GtkSalPrinter_Impl(); }; - GtkSalPrinter_Impl::GtkSalPrinter_Impl() : m_pPrinter(0) , m_pSettings(0) { } - GtkSalPrinter_Impl::~GtkSalPrinter_Impl() { if (m_pPrinter) @@ -173,7 +170,6 @@ GtkSalPrinter::GtkSalPrinter(SalInfoPrinter* const i_pInfoPrinter) { } - bool GtkSalPrinter::impl_doJob( const OUString* const i_pFileName, @@ -207,7 +203,6 @@ GtkSalPrinter::impl_doJob( return bJobStarted; } - bool GtkSalPrinter::StartJob( const OUString* const i_pFileName, @@ -266,7 +261,6 @@ GtkSalPrinter::StartJob( return impl_doJob(&aFileName, i_rJobName, i_rAppName, io_pSetupData, nCopies, bCollate, io_rController); } - bool GtkSalPrinter::EndJob() { @@ -316,7 +310,6 @@ GtkSalPrinter::EndJob() return bRet; } - namespace { @@ -337,7 +330,6 @@ lcl_setHelpText( #endif } - static GtkWidget* lcl_makeFrame( GtkWidget* const i_pChild, @@ -415,7 +407,6 @@ GtkPrintDialog::GtkPrintDialog(vcl::PrinterController& io_rController) impl_readFromSettings(); } - void GtkPrintDialog::impl_initDialog() { @@ -448,7 +439,6 @@ GtkPrintDialog::impl_initDialog() )); } - void GtkPrintDialog::impl_initCustomTab() { @@ -761,7 +751,6 @@ GtkPrintDialog::impl_initCustomTab() } } - void GtkPrintDialog::impl_initPrintContent(uno::Sequence<sal_Bool> const& i_rDisabled) { @@ -815,7 +804,6 @@ GtkPrintDialog::impl_initPrintContent(uno::Sequence<sal_Bool> const& i_rDisabled } } - void GtkPrintDialog::impl_checkOptionalControlDependencies() { @@ -826,7 +814,6 @@ GtkPrintDialog::impl_checkOptionalControlDependencies() } } - beans::PropertyValue* GtkPrintDialog::impl_queryPropertyValue(GtkWidget* const i_pWidget) const { @@ -844,7 +831,6 @@ GtkPrintDialog::impl_queryPropertyValue(GtkWidget* const i_pWidget) const return pVal; } - void GtkPrintDialog::impl_UIOption_CheckHdl(GtkWidget* const i_pWidget) { @@ -858,7 +844,6 @@ GtkPrintDialog::impl_UIOption_CheckHdl(GtkWidget* const i_pWidget) } } - void GtkPrintDialog::impl_UIOption_RadioHdl(GtkWidget* const i_pWidget) { @@ -877,7 +862,6 @@ GtkPrintDialog::impl_UIOption_RadioHdl(GtkWidget* const i_pWidget) } } - void GtkPrintDialog::impl_UIOption_SelectHdl(GtkWidget* const i_pWidget) { @@ -891,7 +875,6 @@ GtkPrintDialog::impl_UIOption_SelectHdl(GtkWidget* const i_pWidget) } } - bool GtkPrintDialog::run() { @@ -951,7 +934,6 @@ void GtkPrintDialog::ExportAsPDF(const OUString &rFileURL, GtkPrintSettings *pSe aFilterData[1].Name = "FirstPageOnLeft"; aFilterData[1].Value <<= sal_False; - const gchar *pStr = gtk_print_settings_get(pSettings, GTK_PRINT_SETTINGS_PRINT_PAGES); if (pStr && !strcmp(pStr, "ranges")) { @@ -1052,7 +1034,6 @@ void GtkPrintDialog::ExportAsPDF(const OUString &rFileURL, GtkPrintSettings *pSe } #endif - void GtkPrintDialog::updateControllerPrintRange() { @@ -1104,13 +1085,11 @@ GtkPrintDialog::updateControllerPrintRange() g_object_unref(G_OBJECT(pSettings)); } - GtkPrintDialog::~GtkPrintDialog() { gtk_widget_destroy(m_pDialog); } - void GtkPrintDialog::impl_readFromSettings() { @@ -1147,7 +1126,6 @@ GtkPrintDialog::impl_readFromSettings() g_object_unref(G_OBJECT(pSettings)); } - void GtkPrintDialog::impl_storeToSettings() const @@ -1170,7 +1148,6 @@ const pItem->Commit(); } - sal_uLong GtkSalInfoPrinter::GetCapabilities( const ImplJobSetup* const i_pSetupData, diff --git a/vcl/unx/gtk/window/gloactiongroup.cxx b/vcl/unx/gtk/window/gloactiongroup.cxx index 00ce9338d32b..e6c10b709391 100644 --- a/vcl/unx/gtk/window/gloactiongroup.cxx +++ b/vcl/unx/gtk/window/gloactiongroup.cxx @@ -15,7 +15,6 @@ #include <unx/gtk/gtkinst.hxx> #include <unx/gtk/gtkframe.hxx> - /* * GLOAction */ @@ -158,7 +157,6 @@ g_lo_action_group_query_action (GActionGroup *group, if (action == NULL) return FALSE; - if (enabled) { GtkSalFrame* pFrame = lo_group->priv->frame; diff --git a/vcl/unx/gtk/window/glomenu.cxx b/vcl/unx/gtk/window/glomenu.cxx index e012aa0d8247..76c617bead13 100644 --- a/vcl/unx/gtk/window/glomenu.cxx +++ b/vcl/unx/gtk/window/glomenu.cxx @@ -40,7 +40,6 @@ struct item GHashTable* links; // Item links. }; - static void g_lo_menu_struct_item_init (struct item *menu_item) { @@ -511,7 +510,6 @@ g_lo_menu_new_submenu_in_item_in_section (GLOMenu *menu, } } - void g_lo_menu_set_submenu_to_item_in_section (GLOMenu *menu, gint section, diff --git a/vcl/unx/gtk/window/gtkobject.cxx b/vcl/unx/gtk/window/gtkobject.cxx index f585c73c904d..a8fe4aba09dd 100644 --- a/vcl/unx/gtk/window/gtkobject.cxx +++ b/vcl/unx/gtk/window/gtkobject.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifdef AIX #define _LINUX_SOURCE_COMPAT #include <sys/timer.h> diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx index 8d3a5134dc42..f22b54eea818 100644 --- a/vcl/unx/gtk/window/gtksalframe.cxx +++ b/vcl/unx/gtk/window/gtksalframe.cxx @@ -1669,7 +1669,6 @@ void GtkSalFrame::SetIcon( sal_uInt16 nIcon ) ImpBitmap *pIconImpBitmap = aIcon.ImplGetBitmapImpBitmap(); ImpBitmap *pIconImpMask = aIcon.ImplGetMaskImpBitmap(); - if( pIconImpBitmap && pIconImpMask ) { SalBitmap *pIconBitmap = @@ -3524,7 +3523,6 @@ gboolean GtkSalFrame::signalDraw( GtkWidget*, cairo_t *cr, gpointer frame ) } #endif // GTK_CHECK_VERSION(3,0,0) - gboolean GtkSalFrame::signalExpose( GtkWidget*, GdkEventExpose* pEvent, gpointer frame ) { GtkSalFrame* pThis = (GtkSalFrame*)frame; @@ -3947,10 +3945,8 @@ void GtkSalFrame::signalDestroy( GtkWidget* pObj, gpointer frame ) } } - // GtkSalFrame::IMHandler - GtkSalFrame::IMHandler::IMHandler( GtkSalFrame* pFrame ) : m_pFrame(pFrame), m_nPrevKeyPresses( 0 ), diff --git a/vcl/unx/gtk/window/gtksalmenu.cxx b/vcl/unx/gtk/window/gtksalmenu.cxx index d63fdd31c16a..203b9b42794d 100644 --- a/vcl/unx/gtk/window/gtksalmenu.cxx +++ b/vcl/unx/gtk/window/gtksalmenu.cxx @@ -379,7 +379,6 @@ void GtkSalMenu::UpdateFull() ImplUpdate( TRUE ); } - /* * GtkSalMenu */ @@ -712,7 +711,6 @@ void GtkSalMenu::Activate() ActivateAllSubmenus(static_cast<MenuBar*>(mpVCLMenu)); } - void GtkSalMenu::Deactivate( const gchar* aMenuCommand ) { if ( !mbMenuBar ) @@ -765,7 +763,6 @@ void GtkSalMenu::ShowItem( unsigned nPos, bool bShow ) ( ( GtkSalMenuItem* ) maItems[ nPos ] )->mbVisible = bShow; } - void GtkSalMenu::SetItemText( unsigned, SalMenuItem*, const OUString& ) { } @@ -782,8 +779,6 @@ void GtkSalMenu::GetSystemMenuData( SystemMenuData* ) { } - - /* * GtkSalMenuItem */ diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx index 9ddeda38e27a..2a1f4e7f4584 100644 --- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx @@ -1436,7 +1436,6 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings ) fprintf( stderr, "Theme name is \"%s\"\n", pThemeName ); #endif - } bool GtkSalGraphics::IsNativeControlSupported( ControlType nType, ControlPart nPart ) diff --git a/vcl/unx/kde/UnxCommandThread.cxx b/vcl/unx/kde/UnxCommandThread.cxx index f10eac36f379..7b907dea9c66 100644 --- a/vcl/unx/kde/UnxCommandThread.cxx +++ b/vcl/unx/kde/UnxCommandThread.cxx @@ -29,10 +29,8 @@ using namespace ::com::sun::star; - // UnxFilePickerCommandThread - UnxFilePickerCommandThread::UnxFilePickerCommandThread( UnxFilePickerNotifyThread *pNotifyThread, int nReadFD ) : m_pNotifyThread( pNotifyThread ), m_nReadFD( nReadFD ) diff --git a/vcl/unx/kde/UnxFilePicker.cxx b/vcl/unx/kde/UnxFilePicker.cxx index 43dec15789fa..ff902787779d 100644 --- a/vcl/unx/kde/UnxFilePicker.cxx +++ b/vcl/unx/kde/UnxFilePicker.cxx @@ -60,10 +60,8 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::ui::dialogs; using namespace ::com::sun::star::ui::dialogs::TemplateDescription; - // helper functions - namespace { uno::Sequence<OUString> SAL_CALL FilePicker_getSupportedServiceNames() @@ -80,10 +78,8 @@ namespace } } - // UnxFilePicker - UnxFilePicker::UnxFilePicker( const uno::Reference<uno::XComponentContext>& ) : UnxFilePicker_Base( m_rbHelperMtx ), m_nFilePickerPid( -1 ), diff --git a/vcl/unx/kde/UnxNotifyThread.cxx b/vcl/unx/kde/UnxNotifyThread.cxx index 0b43d2afda1e..f500767e9d1d 100644 --- a/vcl/unx/kde/UnxNotifyThread.cxx +++ b/vcl/unx/kde/UnxNotifyThread.cxx @@ -22,10 +22,8 @@ using namespace ::com::sun::star; - // UnxFilePickerNotifyThread - UnxFilePickerNotifyThread::UnxFilePickerNotifyThread( UnxFilePicker *pUnxFilePicker ) : m_pUnxFilePicker( pUnxFilePicker ), m_bExit( false ), diff --git a/vcl/unx/kde/fpicker/kdecommandthread.cxx b/vcl/unx/kde/fpicker/kdecommandthread.cxx index b2e47786faa4..533950abd9f7 100644 --- a/vcl/unx/kde/fpicker/kdecommandthread.cxx +++ b/vcl/unx/kde/fpicker/kdecommandthread.cxx @@ -35,10 +35,8 @@ #include <iostream> #endif - // CommandEvent - KDECommandEvent::KDECommandEvent( const QString &qCommand, QStringList *pStringList ) : QCustomEvent( TypeId, pStringList ), m_eCommand( Unknown ) @@ -73,10 +71,8 @@ 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 73210557980b..6b27ae4afb52 100644 --- a/vcl/unx/kde/fpicker/kdefilepicker.cxx +++ b/vcl/unx/kde/fpicker/kdefilepicker.cxx @@ -89,10 +89,8 @@ #include <algorithm> #include <iostream> - // KDEFileDialog - KDEFileDialog::KDEFileDialog( const QString &startDir, const QString &filter, QWidget *parent, const char *name ) : KFileDialog( startDir, filter, parent, name, true, m_pCustomWidget = new QVBox() ), @@ -750,7 +748,6 @@ QString KDEFileDialog::escapeString( const QString &rString ) return qString; } - void KDEFileFilterComboHack::setCurrentFilter( const QString& filter ) { setCurrentText( filter ); diff --git a/vcl/unx/kde/fpicker/kdefpmain.cxx b/vcl/unx/kde/fpicker/kdefpmain.cxx index 03ea2c1a293a..d7152a53ae85 100644 --- a/vcl/unx/kde/fpicker/kdefpmain.cxx +++ b/vcl/unx/kde/fpicker/kdefpmain.cxx @@ -56,10 +56,8 @@ #define KLocale TDELocale #endif // ENABLE_TDE - // Main - static const KCmdLineOptions sOptions[] = { { "winid <argument>", I18N_NOOP("Window ID to which is the fpicker modal"), "0" }, diff --git a/vcl/unx/kde/fpicker/kdemodalityfilter.cxx b/vcl/unx/kde/fpicker/kdemodalityfilter.cxx index da938183867f..1262f3e9e7c2 100644 --- a/vcl/unx/kde/fpicker/kdemodalityfilter.cxx +++ b/vcl/unx/kde/fpicker/kdemodalityfilter.cxx @@ -33,10 +33,8 @@ #include <X11/Xlib.h> #include <X11/Xutil.h> - // Modality filter - KDEModalityFilter::KDEModalityFilter( WId nWinId ) : m_nWinId( nWinId ) { diff --git a/vcl/unx/kde/salnativewidgets-kde.cxx b/vcl/unx/kde/salnativewidgets-kde.cxx index 5e58799fcd9e..6f51fad7035c 100644 --- a/vcl/unx/kde/salnativewidgets-kde.cxx +++ b/vcl/unx/kde/salnativewidgets-kde.cxx @@ -1263,7 +1263,6 @@ bool KDESalGraphics::IsNativeControlSupported( ControlType nType, ControlPart nP ; } - /** Test whether the position is in the native widget. If the return value is true, bIsInside contains information whether @@ -1365,7 +1364,6 @@ bool KDESalGraphics::hitTestNativeControl( ControlType nType, ControlPart nPart, return false; } - /** Draw the requested control described by nPart/nState. @param rControlRegion @@ -1715,10 +1713,8 @@ bool KDESalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPar return bReturn; } - // KDESalFrame implementation - KDESalFrame::KDESalFrame( SalFrame* pParent, sal_uLong nStyle ) : X11SalFrame( pParent, nStyle ) { @@ -2089,10 +2085,8 @@ KDESalFrame::GraphicsHolder::~GraphicsHolder() delete pGraphics; } - // KDESalInstance implementation - SalFrame * KDESalInstance::CreateFrame( SalFrame *pParent, sal_uLong nStyle ) { @@ -2106,10 +2100,8 @@ uno::Reference< ui::dialogs::XFilePicker2 > KDESalInstance::createFilePicker( new UnxFilePicker( xMSF ) ); } - // KDESalData pieces - // Create the widget painter so we have some control over // the destruction sequence, so Qt doesn't die in action. diff --git a/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx index 4f819fb4c0a1..969fd2c082e3 100644 --- a/vcl/unx/kde4/KDE4FilePicker.cxx +++ b/vcl/unx/kde4/KDE4FilePicker.cxx @@ -80,10 +80,8 @@ using namespace ::com::sun::star::uno; #define ALLOW_REMOTE_URLS 0 #endif - // helper functions - #include <QDebug> namespace @@ -109,10 +107,8 @@ QString toQString(const OUString& s) return QString::fromUtf16(s.getStr(), s.getLength()); } - // KDE4FilePicker - KDE4FilePicker::KDE4FilePicker( const uno::Reference<uno::XComponentContext>& ) : KDE4FilePicker_Base(_helperMutex) , _resMgr( ResMgr::CreateResMgr("fps_office") ) diff --git a/vcl/unx/kde4/KDEData.cxx b/vcl/unx/kde4/KDEData.cxx index 0e87c6209cf6..dff67e3e870e 100644 --- a/vcl/unx/kde4/KDEData.cxx +++ b/vcl/unx/kde4/KDEData.cxx @@ -29,7 +29,6 @@ #include "KDEXLib.hxx" #include "KDESalDisplay.hxx" - KDEData::~KDEData() { } diff --git a/vcl/unx/kde4/KDESalDisplay.cxx b/vcl/unx/kde4/KDESalDisplay.cxx index 650b2662005d..e55169f5bd28 100644 --- a/vcl/unx/kde4/KDESalDisplay.cxx +++ b/vcl/unx/kde4/KDESalDisplay.cxx @@ -88,5 +88,4 @@ bool SalKDEDisplay::checkDirectInputEvent( XEvent* ev ) return false; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/unx/kde4/KDESalFrame.cxx b/vcl/unx/kde4/KDESalFrame.cxx index 25b092a17106..bd99e2d5a1fc 100644 --- a/vcl/unx/kde4/KDESalFrame.cxx +++ b/vcl/unx/kde4/KDESalFrame.cxx @@ -337,7 +337,6 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings ) rSettings.SetStyleSettings( style ); } - void KDESalFrame::ReleaseGraphics( SalGraphics *pGraphics ) { for( int i = 0; i < nMaxGraphics; i++ ) diff --git a/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx index 4fbe79bf24f1..173479622103 100644 --- a/vcl/unx/kde4/KDESalGraphics.cxx +++ b/vcl/unx/kde4/KDESalGraphics.cxx @@ -990,5 +990,4 @@ bool KDESalGraphics::hitTestNativeControl( ControlType nType, ControlPart nPart, return FALSE; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/unx/kde4/main.cxx b/vcl/unx/kde4/main.cxx index 1061e39e5580..38b5422879ea 100644 --- a/vcl/unx/kde4/main.cxx +++ b/vcl/unx/kde4/main.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #define Region QtXRegion #include <QApplication> #undef Region diff --git a/vcl/unx/x11/x11sys.cxx b/vcl/unx/x11/x11sys.cxx index 7a08533a2b32..add2b60384b8 100644 --- a/vcl/unx/x11/x11sys.cxx +++ b/vcl/unx/x11/x11sys.cxx @@ -31,7 +31,6 @@ #include <rtl/ustrbuf.hxx> #include <osl/thread.h> - SalSystem* X11SalInstance::CreateSalSystem() { return new X11SalSystem(); |