diff options
34 files changed, 105 insertions, 431 deletions
diff --git a/vcl/generic/fontmanager/fontmanager.cxx b/vcl/generic/fontmanager/fontmanager.cxx index 12bc30713155..3936c881e88c 100644 --- a/vcl/generic/fontmanager/fontmanager.cxx +++ b/vcl/generic/fontmanager/fontmanager.cxx @@ -97,16 +97,6 @@ inline sal_uInt16 getUInt16BE( const sal_uInt8*& pBuffer ) return nRet; } -inline sal_uInt32 getUInt32BE( const sal_uInt8*& pBuffer ) -{ - sal_uInt32 nRet = (((sal_uInt32)pBuffer[0]) << 24) | - (((sal_uInt32)pBuffer[1]) << 16) | - (((sal_uInt32)pBuffer[2]) << 8) | - (((sal_uInt32)pBuffer[3]) ); - pBuffer += 4; - return nRet; -} - static FontWeight parseWeight( const OString& rWeight ) { FontWeight eWeight = WEIGHT_DONTKNOW; diff --git a/vcl/generic/fontmanager/fontsubst.cxx b/vcl/generic/fontmanager/fontsubst.cxx index 269fd9292719..8ac1e1e54221 100644 --- a/vcl/generic/fontmanager/fontsubst.cxx +++ b/vcl/generic/fontmanager/fontsubst.cxx @@ -37,12 +37,6 @@ // platform specific font substitution hooks -struct FontSelectPatternAttributesHash -{ - size_t operator()(const FontSelectPatternAttributes& rAttributes) const - { return rAttributes.hashCode(); } -}; - class FcPreMatchSubstititution : public ImplPreMatchFontSubstitution { diff --git a/vcl/generic/fontmanager/parseAFM.cxx b/vcl/generic/fontmanager/parseAFM.cxx index 8d5690e7120a..145fe1b8e281 100644 --- a/vcl/generic/fontmanager/parseAFM.cxx +++ b/vcl/generic/fontmanager/parseAFM.cxx @@ -110,11 +110,6 @@ class FileInputStream if( m_nPos > 0 ) m_nPos--; } - unsigned int tell() const { return m_nPos; } - void seek( unsigned int nPos ) - // NOTE: do not check input data since only results of tell() - // get seek()ed in this file - { m_nPos = nPos; } }; FileInputStream::FileInputStream( const char* pFilename ) : diff --git a/vcl/generic/print/bitmap_gfx.cxx b/vcl/generic/print/bitmap_gfx.cxx index 4b7017b6b70f..a7bac3439cdb 100644 --- a/vcl/generic/print/bitmap_gfx.cxx +++ b/vcl/generic/print/bitmap_gfx.cxx @@ -64,8 +64,6 @@ private: sal_uInt32 mnOffset; sal_Char mpFileBuffer[nBufferSize + 16]; - HexEncoder (); /* dont use */ - public: HexEncoder (osl::File* pFile); @@ -135,8 +133,6 @@ private: sal_uInt32 mnOffset; sal_Char mpFileBuffer[nBufferSize + 16]; - Ascii85Encoder (); /* dont use */ - inline void PutByte (sal_uInt8 nByte); inline void PutEOD (); void ConvertToAscii85 (); @@ -286,7 +282,6 @@ private: sal_uInt32 mnOffset; sal_uInt32 mdwShift; - LZWEncoder (); void WriteBits (sal_uInt16 nCode, sal_uInt16 nCodeLen); public: diff --git a/vcl/generic/print/genprnpsp.cxx b/vcl/generic/print/genprnpsp.cxx index 2b92a6466b9c..f7e5a8646f83 100644 --- a/vcl/generic/print/genprnpsp.cxx +++ b/vcl/generic/print/genprnpsp.cxx @@ -987,18 +987,18 @@ struct PDFNewJobParameters sal_uInt16 i_nPaperBin = 0xffff ) : maPageSize( i_rSize ), mnPaperBin( i_nPaperBin ) {} - bool operator!=(const PDFNewJobParameters& rComp ) const + bool operator==(const PDFNewJobParameters& rComp ) const { Size aCompLSSize( rComp.maPageSize.Height(), rComp.maPageSize.Width() ); return - (maPageSize != rComp.maPageSize && maPageSize != aCompLSSize) - || mnPaperBin != rComp.mnPaperBin + (maPageSize == rComp.maPageSize || maPageSize == aCompLSSize) + && mnPaperBin == rComp.mnPaperBin ; } - bool operator==(const PDFNewJobParameters& rComp) const + bool operator!=(const PDFNewJobParameters& rComp) const { - return ! this->operator!=(rComp); + return ! this->operator==(rComp); } }; diff --git a/vcl/generic/print/genpspgraphics.cxx b/vcl/generic/print/genpspgraphics.cxx index 33846e2f88c3..1678852c0c14 100644 --- a/vcl/generic/print/genpspgraphics.cxx +++ b/vcl/generic/print/genpspgraphics.cxx @@ -72,8 +72,6 @@ private: sal_uInt32 ColorOf (BitmapColor& rColor) const; sal_uInt8 GrayOf (BitmapColor& rColor) const; - SalPrinterBmp (); - public: SalPrinterBmp (BitmapBuffer* pBitmap); @@ -568,7 +566,6 @@ public: virtual sal_IntPtr GetFontId() const SAL_OVERRIDE { return mnFontId; } virtual PhysicalFontFace* Clone() const SAL_OVERRIDE { return new ImplPspFontData( *this ); } virtual ImplFontEntry* CreateFontInstance( FontSelectPattern& ) const SAL_OVERRIDE; - static bool CheckFontData( const PhysicalFontFace& r ) { return r.CheckMagic( PSPFD_MAGIC ); } }; ImplPspFontData::ImplPspFontData( const psp::FastPrintFontInfo& rInfo ) diff --git a/vcl/headless/svpprn.cxx b/vcl/headless/svpprn.cxx index eaba04bf8713..ea481e344c2b 100644 --- a/vcl/headless/svpprn.cxx +++ b/vcl/headless/svpprn.cxx @@ -58,8 +58,6 @@ static OUString getPdfDir( const PrinterInfo& rInfo ) inline int PtTo10Mu( int nPoints ) { return (int)((((double)nPoints)*35.27777778)+0.5); } -inline int TenMuToPt( int nUnits ) { return (int)((((double)nUnits)/35.27777778)+0.5); } - static void copyJobDataToJobSetup( ImplJobSetup* pJobSetup, JobData& rData ) { pJobSetup->meOrientation = (Orientation)(rData.m_eOrientation == orientation::Landscape ? ORIENTATION_LANDSCAPE : ORIENTATION_PORTRAIT); diff --git a/vcl/inc/factory.hxx b/vcl/inc/factory.hxx new file mode 100644 index 000000000000..056a6c8b7604 --- /dev/null +++ b/vcl/inc/factory.hxx @@ -0,0 +1,81 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +#ifndef INCLUDED_VCL_INC_FACTORY_HXX +#define INCLUDED_VCL_INC_FACTORY_HXX + +#include <sal/config.h> + +#include <com/sun/star/uno/Reference.hxx> +#include <com/sun/star/uno/Sequence.hxx> +#include <rtl/ustring.hxx> +#include <sal/types.h> + +namespace com { namespace sun { namespace star { + namespace lang { + class XMultiServiceFactory; + class XSingleServiceFactory; + } + namespace uno { class XInterface; } +} } } + +css::uno::Sequence<OUString> SAL_CALL vcl_session_getSupportedServiceNames(); + +OUString SAL_CALL vcl_session_getImplementationName(); + +css::uno::Reference<css::uno::XInterface> SAL_CALL vcl_session_createInstance( + css::uno::Reference<css::lang::XMultiServiceFactory > const &); + +namespace vcl { + +css::uno::Sequence<OUString> SAL_CALL +FontIdentificator_getSupportedServiceNames(); + +OUString SAL_CALL FontIdentificator_getImplementationName(); + +css::uno::Reference<css::uno::XInterface> SAL_CALL +FontIdentificator_createInstance( + css::uno::Reference<css::lang::XMultiServiceFactory > const &); + +OUString SAL_CALL Clipboard_getImplementationName(); + +css::uno::Reference<css::lang::XSingleServiceFactory> SAL_CALL +Clipboard_createFactory( + css::uno::Reference<css::lang::XMultiServiceFactory > const &); + +css::uno::Sequence<OUString> SAL_CALL DragSource_getSupportedServiceNames(); + +OUString SAL_CALL DragSource_getImplementationName(); + +css::uno::Reference<css::uno::XInterface> SAL_CALL DragSource_createInstance( + css::uno::Reference<css::lang::XMultiServiceFactory > const &); + +css::uno::Sequence<OUString> SAL_CALL DropTarget_getSupportedServiceNames(); + +OUString SAL_CALL DropTarget_getImplementationName(); + +css::uno::Reference<css::uno::XInterface> SAL_CALL DropTarget_createInstance( + css::uno::Reference<css::lang::XMultiServiceFactory > const &); + +} + + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx index 59ac13572005..706271fb1507 100644 --- a/vcl/inc/svdata.hxx +++ b/vcl/inc/svdata.hxx @@ -61,7 +61,6 @@ class ImplFontCache; class HelpTextWindow; class ImplTBDragMgr; class ImplIdleMgr; -class DbgWindow; class FloatingWindow; class AllSettings; class KeyCode; diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx index ae084a7b0cf4..68daec683d89 100644 --- a/vcl/source/app/dbggui.cxx +++ b/vcl/source/app/dbggui.cxx @@ -205,26 +205,6 @@ static const sal_Char* pDbgHelpText[] = NULL }; -#define DBGWIN_MAXLINES 100 - -class DbgWindow : public WorkWindow -{ -private: - ListBox maLstBox; - -public: - DbgWindow(); - - virtual bool Close() SAL_OVERRIDE; - virtual void Resize() SAL_OVERRIDE; - virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - void InsertLine( const OUString& rLine ); - void Update() { WorkWindow::Update(); maLstBox.Update(); } - -private: - void GetAssertionEntryRange( sal_uInt16 nInbetweenEntry, sal_uInt16& nFirst, sal_uInt16& nLast ); -}; - class DbgInfoDialog : public ModalDialog { private: @@ -257,143 +237,6 @@ public: void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; }; -DbgWindow::DbgWindow() : - WorkWindow( NULL, WB_STDWORK ), - maLstBox( this, WB_AUTOHSCROLL ) -{ - DbgData* pData = DbgGetData(); - - maLstBox.Show(); - maLstBox.SetPosPixel( Point( 0, 0 ) ); - - SetOutputSizePixel( Size( 600, 480 ) ); - if ( pData->aDbgWinState[0] ) - { - OString aState( pData->aDbgWinState ); - SetWindowState( aState ); - } - - SetText("StarView Debug Window"); - Show(); - Update(); -} - -bool DbgWindow::Close() -{ - // remember window position - OString aState( GetWindowState() ); - DbgData* pData = DbgGetData(); - size_t nCopy = (sizeof( pData->aDbgWinState ) < size_t(aState.getLength() + 1U )) - ? sizeof( pData->aDbgWinState ) : size_t(aState.getLength() + 1U ); - strncpy( pData->aDbgWinState, aState.getStr(), nCopy ); - pData->aDbgWinState[ sizeof( pData->aDbgWinState ) - 1 ] = 0; - // and save for next session - DbgSaveData( *pData ); - - delete this; - return true; -} - -void DbgWindow::Resize() -{ - maLstBox.SetSizePixel( GetOutputSizePixel() ); -} - -void DbgWindow::GetAssertionEntryRange( sal_uInt16 nInbetweenEntry, sal_uInt16& nFirst, sal_uInt16& nLast ) -{ - nFirst = nInbetweenEntry; - while ( nFirst > 0 ) - { - if ( maLstBox.GetEntryData( nFirst ) != NULL ) - break; - --nFirst; - } - sal_uInt16 nEntryCount = maLstBox.GetEntryCount(); - nLast = nInbetweenEntry + 1; - while ( nLast < nEntryCount ) - { - if ( maLstBox.GetEntryData( nLast ) != NULL ) - break; - ++nLast; - } -} - -bool DbgWindow::PreNotify( NotifyEvent& rNEvt ) -{ - if ( rNEvt.GetType() == EVENT_COMMAND ) - { - if ( maLstBox.IsWindowOrChild( rNEvt.GetWindow() ) ) - { - const CommandEvent& rCommand = *rNEvt.GetCommandEvent(); - if ( rCommand.GetCommand() == COMMAND_CONTEXTMENU ) - { - PopupMenu aMenu; - aMenu.InsertItem( 1, OUString("copy to clipboard") ); - - Point aPos; - if ( rCommand.IsMouseEvent() ) - aPos = rCommand.GetMousePosPixel(); - else - { - Rectangle aEntryRect( maLstBox.GetBoundingRectangle( maLstBox.GetSelectEntryPos() ) ); - aPos = aEntryRect.Center(); - } - sal_uInt16 nSelected = aMenu.Execute( rNEvt.GetWindow(), aPos ); - if ( nSelected == 1 ) - { - // search all entries which belong to this assertion - sal_uInt16 nAssertionFirst = 0; - sal_uInt16 nAssertionLast = 0; - GetAssertionEntryRange( maLstBox.GetSelectEntryPos(), nAssertionFirst, nAssertionLast ); - - // build the string to copy to the clipboard - OUStringBuffer sAssertion; - OUString sLineFeed = convertLineEnd( - OUString("\n"), - GetSystemLineEnd()); - while ( nAssertionFirst < nAssertionLast ) - { - sAssertion.append(maLstBox.GetEntry( nAssertionFirst++ )); - sAssertion.append(sLineFeed); - } - - ::vcl::unohelper::TextDataObject::CopyStringTo( - sAssertion.makeStringAndClear(), GetClipboard()); - } - } - return true; // handled - } - } - return WorkWindow::PreNotify( rNEvt ); -} - -void DbgWindow::InsertLine( const OUString& rLine ) -{ - OUString aStr = convertLineEnd(rLine, LINEEND_LF); - sal_Int32 nPos = aStr.indexOf( '\n' ); - bool bFirstEntry = true; - while ( nPos != -1 ) - { - if ( maLstBox.GetEntryCount() >= DBGWIN_MAXLINES ) - maLstBox.RemoveEntry( 0 ); - - sal_uInt16 nInsertionPos = maLstBox.InsertEntry( aStr.copy( 0, nPos ) ); - if ( bFirstEntry ) - maLstBox.SetEntryData( nInsertionPos, reinterpret_cast< void* >( 1 ) ); - bFirstEntry = false; - - aStr = aStr.replaceAt( 0, nPos+1, "" ); - nPos = aStr.indexOf( '\n' ); - } - if ( maLstBox.GetEntryCount() >= DBGWIN_MAXLINES ) - maLstBox.RemoveEntry( 0 ); - sal_uInt16 nInsertionPos = maLstBox.InsertEntry( aStr ); - if ( bFirstEntry ) - maLstBox.SetEntryData( nInsertionPos, reinterpret_cast< void* >( 1 ) ); - maLstBox.SetTopEntry( DBGWIN_MAXLINES-1 ); - maLstBox.Update(); -} - DbgDialog::DbgDialog() : ModalDialog( NULL, WB_STDMODAL | WB_SYSTEMWINDOW ), maRes( this ), diff --git a/vcl/source/app/session.cxx b/vcl/source/app/session.cxx index ac6e6c4bb810..145eafb66e83 100644 --- a/vcl/source/app/session.cxx +++ b/vcl/source/app/session.cxx @@ -27,6 +27,7 @@ #include <vcl/svapp.hxx> +#include <factory.hxx> #include <svdata.hxx> #include <salinst.hxx> #include <salsession.hxx> diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index 4a724e5447ee..dd213197d482 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -166,10 +166,12 @@ struct ImplPostEventData mnEvent( nEvent ), mpWin( pWin ), mnEventId( 0 ), maKeyEvent( rKeyEvent ) {} ImplPostEventData( sal_uLong nEvent, const Window* pWin, const MouseEvent& rMouseEvent ) : mnEvent( nEvent ), mpWin( pWin ), mnEventId( 0 ), maMouseEvent( rMouseEvent ) {} +#if !HAVE_FEATURE_DESKTOP ImplPostEventData( sal_uLong nEvent, const Window* pWin, const ZoomEvent& rZoomEvent ) : mnEvent( nEvent ), mpWin( pWin ), mnEventId( 0 ), maZoomEvent( rZoomEvent ) {} ImplPostEventData( sal_uLong nEvent, const Window* pWin, const ScrollEvent& rScrollEvent ) : mnEvent( nEvent ), mpWin( pWin ), mnEventId( 0 ), maScrollEvent( rScrollEvent ) {} +#endif ~ImplPostEventData() {} }; diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx index b899ec73816d..6ff25c5b726a 100644 --- a/vcl/source/app/svdata.cxx +++ b/vcl/source/app/svdata.cxx @@ -235,37 +235,6 @@ BlendFrameCache* ImplGetBlendFrameCache() return pSVData->mpBlendFrameCache; } -class AccessBridgeCurrentContext: public cppu::WeakImplHelper1< com::sun::star::uno::XCurrentContext > -{ -public: - AccessBridgeCurrentContext( - const com::sun::star::uno::Reference< com::sun::star::uno::XCurrentContext > &context ) : - m_prevContext( context ) {} - - // XCurrentContext - virtual com::sun::star::uno::Any SAL_CALL getValueByName( const OUString& Name ) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; -private: - com::sun::star::uno::Reference< com::sun::star::uno::XCurrentContext > m_prevContext; -}; - -com::sun::star::uno::Any AccessBridgeCurrentContext::getValueByName( const OUString & Name ) - throw (com::sun::star::uno::RuntimeException, std::exception) -{ - com::sun::star::uno::Any ret; - if ( Name == "java-vm.interaction-handler" ) - { - // Currently, for accessbility no interaction handler shall be offered. - // There may be introduced later on a handler using native toolkits - // jbu->obr: Instantiate here your interaction handler - } - else if( m_prevContext.is() ) - { - ret = m_prevContext->getValueByName( Name ); - } - return ret; -} - #ifdef _WIN32 bool HasAtHook(); #endif diff --git a/vcl/source/components/dtranscomp.cxx b/vcl/source/components/dtranscomp.cxx index 35065ad43975..5b443e264971 100644 --- a/vcl/source/components/dtranscomp.cxx +++ b/vcl/source/components/dtranscomp.cxx @@ -21,6 +21,7 @@ #include "vcl/svapp.hxx" +#include "factory.hxx" #include "svdata.hxx" #include "salinst.hxx" @@ -61,9 +62,6 @@ class GenericClipboard : Reference< ::com::sun::star::datatransfer::clipboard::XClipboardOwner > m_aOwner; std::list< Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener > > m_aListeners; - void fireChangedContentsEvent(); - void clearContents(); - public: GenericClipboard() : cppu::WeakComponentImplHelper2< @@ -291,6 +289,7 @@ public: // XInitialization virtual void SAL_CALL initialize( const Sequence< Any >& arguments ) throw( ::com::sun::star::uno::Exception, std::exception ) SAL_OVERRIDE; +#if !defined UNX static Sequence< OUString > getSupportedServiceNames_static() { Sequence< OUString > aRet( 1 ); @@ -302,6 +301,7 @@ public: { return OUString("com.sun.star.datatransfer.dnd.VclGenericDragSource"); } +#endif }; GenericDragSource::~GenericDragSource() @@ -401,6 +401,7 @@ public: virtual sal_Int8 SAL_CALL getDefaultActions() throw(std::exception) SAL_OVERRIDE; virtual void SAL_CALL setDefaultActions( sal_Int8 actions ) throw(std::exception) SAL_OVERRIDE; +#if !defined UNX static Sequence< OUString > getSupportedServiceNames_static() { Sequence< OUString > aRet( 1 ); @@ -412,6 +413,7 @@ public: { return OUString("com.sun.star.datatransfer.dnd.VclGenericDropTarget"); } +#endif }; GenericDropTarget::~GenericDropTarget() diff --git a/vcl/source/components/factory.cxx b/vcl/source/components/factory.cxx index c078f510bd2b..e2adb731b48e 100644 --- a/vcl/source/components/factory.cxx +++ b/vcl/source/components/factory.cxx @@ -25,33 +25,11 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <vcl/dllapi.h> +#include <factory.hxx> + using namespace com::sun::star::uno; using namespace com::sun::star::lang; -// service implementation -extern Sequence< OUString > SAL_CALL vcl_session_getSupportedServiceNames(); -extern OUString SAL_CALL vcl_session_getImplementationName(); -extern Reference< XInterface > SAL_CALL vcl_session_createInstance( const Reference< XMultiServiceFactory > & ); - -namespace vcl -{ -extern Sequence< OUString > SAL_CALL FontIdentificator_getSupportedServiceNames(); -extern OUString SAL_CALL FontIdentificator_getImplementationName(); -extern Reference< XInterface > SAL_CALL FontIdentificator_createInstance( const Reference< XMultiServiceFactory > & ); - -extern OUString SAL_CALL Clipboard_getImplementationName(); -extern Reference< XSingleServiceFactory > SAL_CALL Clipboard_createFactory( const Reference< XMultiServiceFactory > & ); - -extern Sequence< OUString > SAL_CALL DragSource_getSupportedServiceNames(); -extern OUString SAL_CALL DragSource_getImplementationName(); -extern Reference< XInterface > SAL_CALL DragSource_createInstance( const Reference< XMultiServiceFactory > & ); - -extern Sequence< OUString > SAL_CALL DropTarget_getSupportedServiceNames(); -extern OUString SAL_CALL DropTarget_getImplementationName(); -extern Reference< XInterface > SAL_CALL DropTarget_createInstance( const Reference< XMultiServiceFactory > & ); - -} - extern "C" { VCL_DLLPUBLIC void* SAL_CALL vcl_component_getFactory( diff --git a/vcl/source/components/fontident.cxx b/vcl/source/components/fontident.cxx index 683eef4c5fe5..dce92d30bf3b 100644 --- a/vcl/source/components/fontident.cxx +++ b/vcl/source/components/fontident.cxx @@ -20,6 +20,7 @@ #include "vcl/svapp.hxx" #include "vcl/font.hxx" +#include "factory.hxx" #include "svdata.hxx" #include <com/sun/star/lang/XServiceInfo.hpp> diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx index 4e1deac8a0bb..727489027583 100644 --- a/vcl/source/edit/vclmedit.cxx +++ b/vcl/source/edit/vclmedit.cxx @@ -67,15 +67,11 @@ public: virtual void GetFocus() SAL_OVERRIDE; virtual void LoseFocus() SAL_OVERRIDE; - bool IsAutoFocusHide() const { return mbFocusSelectionHide; } void SetAutoFocusHide( bool bAutoHide ) { mbFocusSelectionHide = bAutoHide; } - bool IsIgnoreTab() const { return mbIgnoreTab; } void SetIgnoreTab( bool bIgnore ) { mbIgnoreTab = bIgnore; } void DisableSelectionOnFocus() { mbSelectOnTab = false; } - - void SetTextSelectable( bool bTextSelectable ) { mbTextSelectable = bTextSelectable; } }; class ImpVclMEdit : public SfxListener @@ -115,8 +111,6 @@ public: void SetMaxTextWidth( sal_uLong nMaxWidth ); - bool IsInsertMode() const; - void InsertText( const OUString& rStr ); OUString GetSelected() const; OUString GetSelected( LineEnd aSeparator ) const; diff --git a/vcl/source/filter/jpeg/JpegWriter.cxx b/vcl/source/filter/jpeg/JpegWriter.cxx index 0f7f52940034..ab2f045c5356 100644 --- a/vcl/source/filter/jpeg/JpegWriter.cxx +++ b/vcl/source/filter/jpeg/JpegWriter.cxx @@ -31,11 +31,6 @@ #define BUFFER_SIZE 4096 -void* GetScanline( void* pJPEGWriter, long nY ) -{ - return ( (JPEGWriter*) pJPEGWriter )->GetScanline( nY ); -} - struct DestinationManagerStruct { jpeg_destination_mgr pub; /* public fields */ diff --git a/vcl/source/filter/jpeg/jpeg.cxx b/vcl/source/filter/jpeg/jpeg.cxx index e8310666f481..2f448e141fa0 100644 --- a/vcl/source/filter/jpeg/jpeg.cxx +++ b/vcl/source/filter/jpeg/jpeg.cxx @@ -19,6 +19,7 @@ #include "JpegReader.hxx" #include "JpegWriter.hxx" +#include "jpeg.hxx" #include <vcl/bmpacc.hxx> #include <vcl/FilterConfigItem.hxx> diff --git a/vcl/source/filter/sgvspln.cxx b/vcl/source/filter/sgvspln.cxx index f68652843759..4d8e86d05c07 100644 --- a/vcl/source/filter/sgvspln.cxx +++ b/vcl/source/filter/sgvspln.cxx @@ -22,6 +22,8 @@ #include <tools/poly.hxx> #include <boost/scoped_array.hpp> +#include <sgvspln.hxx> + extern "C" { /*.pn 277 */ diff --git a/vcl/source/fontsubset/cff.cxx b/vcl/source/fontsubset/cff.cxx index 854784ec6fe6..a1d7dbd1d541 100644 --- a/vcl/source/fontsubset/cff.cxx +++ b/vcl/source/fontsubset/cff.cxx @@ -332,7 +332,6 @@ public: // used by charstring converter void setCharStringType( int); - void fakeLocalSubrCount( int nLocalSubrs ) { maCffLocal[0].mnLocalSubrCount=nLocalSubrs;} protected: int convert2Type1Ops( CffLocal*, const U8* pType2Ops, int nType2Len, U8* pType1Ops); private: @@ -372,7 +371,6 @@ private: const char* getGlyphName( int nGlyphIndex); void read2push( void); - void pop2write( void); void writeType1Val( ValType); void writeTypeOp( int nTypeOp); void writeTypeEsc( int nTypeOp); @@ -385,19 +383,13 @@ public: // TODO: is public really needed? // TODO: add more checks void push( ValType nVal) { mnValStack[ mnStackIdx++] = nVal;} ValType popVal( void) { return ((mnStackIdx>0) ? mnValStack[ --mnStackIdx] : 0);} - ValType peekVal( void) const { return ((mnStackIdx>0) ? mnValStack[ mnStackIdx-1] : 0);} ValType getVal( int nIndex) const { return mnValStack[ nIndex];} int popInt( void); - int peekInt( void) const; - int getInt( int nIndex) const; int size( void) const { return mnStackIdx;} - bool empty( void) const { return !mnStackIdx;} void clear( void) { mnStackIdx = 0;} // accessing the charstring hints void addHints( bool bVerticalHints); - int getHorzHintCount( void) const { return (mnHorzHintSize/2);} - int getVertHintCount( void) const { return (mnHintSize-mnHorzHintSize)/2;} // accessing other charstring specifics bool hasCharWidth( void) const { return (maCharWidth > 0);} @@ -445,22 +437,6 @@ inline int CffSubsetterContext::popInt( void) return nInt; } -inline int CffSubsetterContext::peekInt( void) const -{ - const ValType aVal = peekVal(); - const int nInt = static_cast<int>(aVal); - assert( nInt == aVal); - return nInt; -} - -inline int CffSubsetterContext::getInt( int nIndex) const -{ - const ValType aVal = getVal( nIndex); - const int nInt = static_cast<int>(aVal); - assert( nInt == aVal); - return nInt; -} - inline void CffSubsetterContext::updateWidth( bool bUseFirstVal) { #if 1 // TODO: is this still needed? @@ -723,12 +699,6 @@ void CffSubsetterContext::writeType1Val( ValType aVal) mpWritePtr = pOut; } -inline void CffSubsetterContext::pop2write( void) -{ - const ValType aVal = popVal(); - writeType1Val( aVal); -} - inline void CffSubsetterContext::writeTypeOp( int nTypeOp) { *(mpWritePtr++) = static_cast<U8>(nTypeOp); diff --git a/vcl/source/gdi/bmpfast.cxx b/vcl/source/gdi/bmpfast.cxx index 3c668b02c445..dc907e55e012 100644 --- a/vcl/source/gdi/bmpfast.cxx +++ b/vcl/source/gdi/bmpfast.cxx @@ -34,7 +34,6 @@ public: void SetRawPtr( PIXBYTE* pRawPtr ) { mpPixel = pRawPtr; } PIXBYTE* GetRawPtr( void ) const { return mpPixel; } void AddByteOffset( int nByteOffset ) { mpPixel += nByteOffset; } - bool operator<( const BasePixelPtr& rCmp ) const { return (mpPixel < rCmp.mpPixel); } protected: PIXBYTE* mpPixel; diff --git a/vcl/source/gdi/impvect.cxx b/vcl/source/gdi/impvect.cxx index 87a15e422048..05a8bf51d615 100644 --- a/vcl/source/gdi/impvect.cxx +++ b/vcl/source/gdi/impvect.cxx @@ -84,21 +84,8 @@ struct ImplColorSet BitmapColor maColor; sal_uInt16 mnIndex; bool mbSet; - - bool operator<( const ImplColorSet& rSet ) const; - bool operator>( const ImplColorSet& rSet ) const; }; -inline bool ImplColorSet::operator<( const ImplColorSet& rSet ) const -{ - return( mbSet && ( !rSet.mbSet || ( maColor.GetLuminance() > rSet.maColor.GetLuminance() ) ) ); -} - -inline bool ImplColorSet::operator>( const ImplColorSet& rSet ) const -{ - return( !mbSet || ( rSet.mbSet && maColor.GetLuminance() < rSet.maColor.GetLuminance() ) ); -} - extern "C" int SAL_CALL ImplColorSetCmpFnc( const void* p1, const void* p2 ) { ImplColorSet* pSet1 = (ImplColorSet*) p1; @@ -197,8 +184,6 @@ private: long mnWidth; long mnHeight; - ImplVectMap() {}; - public: ImplVectMap( long nWidth, long nHeight ); diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx index faac7782b899..20a0ff656e31 100644 --- a/vcl/source/gdi/sallayout.cxx +++ b/vcl/source/gdi/sallayout.cxx @@ -36,6 +36,7 @@ #include <i18nlangtag/lang.h> #include <tools/debug.hxx> +#include <vcl/svapp.hxx> #include <limits.h> diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx index a382e809b595..799fcbe1934e 100644 --- a/vcl/source/window/dockmgr.cxx +++ b/vcl/source/window/dockmgr.cxx @@ -68,8 +68,6 @@ public: virtual void setPosSizePixel( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags = WINDOW_POSSIZE_ALL ) SAL_OVERRIDE; - - sal_uLong GetLastTicks() const { return mnLastTicks; } }; ImplDockFloatWin2::ImplDockFloatWin2( Window* pParent, WinBits nWinBits, diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx index b8bc4988fd23..7f067c30a147 100644 --- a/vcl/source/window/dockwin.cxx +++ b/vcl/source/window/dockwin.cxx @@ -80,8 +80,6 @@ public: virtual void PopupModeEnd() SAL_OVERRIDE; virtual void Resizing( Size& rSize ) SAL_OVERRIDE; virtual bool Close() SAL_OVERRIDE; - - sal_uLong GetLastTicks() const { return mnLastTicks; } }; ImplDockFloatWin::ImplDockFloatWin( Window* pParent, WinBits nWinBits, diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index fb6f98203366..5c4bb1635b12 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -554,7 +554,6 @@ public: sal_uInt16 GetHighlightedItem() const { return nHighlightedItem; } void SetPosInParent( sal_uInt16 nPos ) { nPosInParent = nPos; } - sal_uInt16 GetPosInParent() const { return nPosInParent; } virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; }; @@ -743,7 +742,6 @@ public: void SetMenu( MenuBar* pMenu ); void KillActivePopup(); - PopupMenu* GetActivePopup() const { return pActivePopup; } void PopupClosed( Menu* pMenu ); sal_uInt16 GetHighlightedItem() const { return nHighlightedItem; } virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index b8d4841e0b4f..51eb9d99743e 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -100,7 +100,6 @@ private: sal_uInt16 mnLineMode; sal_uInt16 mnStartLines; void* mpCustomizeData; - bool mbCustomizeMode; bool mbResizeMode; bool mbShowDragRect; @@ -133,9 +132,6 @@ public: void HideDragRect() { if ( mbShowDragRect ) mpDragBox->HideTracking(); } void UpdateDragRect(); DECL_LINK( SelectHdl, Accelerator* ); - - bool IsCustomizeMode() { return mbCustomizeMode; } - bool IsResizeMode() { return mbResizeMode; } }; static ImplTBDragMgr* ImplGetTBDragMgr() @@ -1131,7 +1127,6 @@ ImplTBDragMgr::ImplTBDragMgr() , mnLineMode(0) , mnStartLines(0) , mpCustomizeData(NULL) - , mbCustomizeMode(false) , mbResizeMode(false) , mbShowDragRect(false) { diff --git a/vcl/unx/generic/app/i18n_im.cxx b/vcl/unx/generic/app/i18n_im.cxx index e08ea6aae38b..acbca6909e51 100644 --- a/vcl/unx/generic/app/i18n_im.cxx +++ b/vcl/unx/generic/app/i18n_im.cxx @@ -50,16 +50,6 @@ extern "C" char * XSetIMValues(XIM im, ...); // kinput2 IME needs special key handling since key release events are filtered in // preeditmode and XmbResetIC does not work -bool -IMServerKinput2 () -{ - const static char* p_xmodifiers = getenv ("XMODIFIERS"); - const static bool b_kinput2 = (p_xmodifiers != NULL) - && (strcmp(p_xmodifiers, "@im=kinput2") == 0); - - return b_kinput2; -} - class XKeyEventOp : XKeyEvent { private: @@ -427,82 +417,4 @@ 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 -// not be processed until XNextEvent is called the next time. If we do not -// have the focus because the atok12 lookup choice aux window has it we stay -// deaf and dump otherwise. - -int -InputMethod_HasPendingEvent(int nFileDescriptor, void *pData) -{ - if (pData == NULL) - return 0; - - struct pollfd aFileDescriptor; - #ifdef SOLARIS - nfds_t nNumDescriptor = 1; - #else - unsigned int nNumDescriptor = 1; - #endif - aFileDescriptor.fd = nFileDescriptor; - aFileDescriptor.events = POLLRDNORM; - aFileDescriptor.revents = 0; - - int nPoll = poll (&aFileDescriptor, nNumDescriptor, 0 /* timeout */ ); - - if (nPoll > 0) - { - /* at least some conditions in revent are set */ - if ( (aFileDescriptor.revents & POLLHUP) - || (aFileDescriptor.revents & POLLERR) - || (aFileDescriptor.revents & POLLNVAL)) - return 0; /* oops error condition set */ - - if (aFileDescriptor.revents & POLLRDNORM) - return 1; /* success */ - } - - /* nPoll == 0 means timeout, nPoll < 0 means error */ - return 0; -} - -int -InputMethod_IsEventQueued(int nFileDescriptor, void *pData) -{ - return InputMethod_HasPendingEvent (nFileDescriptor, pData); -} - -int -InputMethod_HandleNextEvent(int nFileDescriptor, void *pData) -{ - if (pData != NULL) - XProcessInternalConnection((Display*)pData, nFileDescriptor); - - return 0; -} - -extern "C" void -InputMethod_ConnectionWatchProc (Display *pDisplay, XPointer pClientData, - int nFileDescriptor, Bool bOpening, XPointer*) -{ - SalXLib *pConnectionHandler = (SalXLib*)pClientData; - - if (pConnectionHandler == NULL) - return; - - if (bOpening) - { - pConnectionHandler->Insert (nFileDescriptor, pDisplay, - InputMethod_HasPendingEvent, - InputMethod_IsEventQueued, - InputMethod_HandleNextEvent); - } - else - { - pConnectionHandler->Remove (nFileDescriptor); - } -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx index 3394c0ff230e..c838d567d9fb 100644 --- a/vcl/unx/generic/gdi/salgdi.cxx +++ b/vcl/unx/generic/gdi/salgdi.cxx @@ -60,17 +60,12 @@ class SalPolyLine XPoint Points_[STATIC_POINTS]; XPoint *pFirst_; public: - inline SalPolyLine( sal_uLong nPoints ); inline SalPolyLine( sal_uLong nPoints, const SalPoint *p ); inline ~SalPolyLine(); inline XPoint &operator [] ( sal_uLong n ) const { return pFirst_[n]; } }; -inline SalPolyLine::SalPolyLine( sal_uLong nPoints ) - : pFirst_( nPoints+1 > STATIC_POINTS ? new XPoint[nPoints+1] : Points_ ) -{} - inline SalPolyLine::SalPolyLine( sal_uLong nPoints, const SalPoint *p ) : pFirst_( nPoints+1 > STATIC_POINTS ? new XPoint[nPoints+1] : Points_ ) { diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx index 471649c6e155..201f5e7b6e3d 100644 --- a/vcl/unx/generic/printer/ppdparser.cxx +++ b/vcl/unx/generic/printer/ppdparser.cxx @@ -20,6 +20,7 @@ #include <stdlib.h> #include <stdio.h> +#include <boost/noncopyable.hpp> #include <boost/unordered_map.hpp> #include <comphelper/string.hxx> @@ -267,16 +268,12 @@ namespace struct thePPDCache : public rtl::Static<PPDCache, thePPDCache> {}; } -class PPDDecompressStream +class PPDDecompressStream: private boost::noncopyable { SvFileStream* mpFileStream; SvMemoryStream* mpMemStream; OUString maFileName; - // forbid copying - PPDDecompressStream( const PPDDecompressStream& ); - PPDDecompressStream& operator=(const PPDDecompressStream& ); - public: PPDDecompressStream( const OUString& rFile ); ~PPDDecompressStream(); diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index 3a60c1ff6a35..a504baa2837e 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -2528,11 +2528,6 @@ LanguageType X11SalFrame::GetInputLanguage() // Settings -inline Color getColorFromLong( long nColor ) -{ - return Color( (nColor & 0xff), (nColor & 0xff00)>>8, (nColor & 0xff0000)>>16); -} - void X11SalFrame::UpdateSettings( AllSettings& rSettings ) { StyleSettings aStyleSettings = rSettings.GetStyleSettings(); diff --git a/vcl/unx/gtk/app/gtksys.cxx b/vcl/unx/gtk/app/gtksys.cxx index 0a72054aeb9d..058b5f53b7fa 100644 --- a/vcl/unx/gtk/app/gtksys.cxx +++ b/vcl/unx/gtk/app/gtksys.cxx @@ -107,7 +107,9 @@ GtkSalSystem::countScreenMonitors() // Including gdkx.h kills us with the Window / XWindow conflict extern "C" { +#if GTK_CHECK_VERSION(3,0,0) GType gdk_x11_display_get_type (void); +#endif int gdk_x11_screen_get_screen_number (GdkScreen *screen); } diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx index 1f3dfb65980c..558eba0b63e6 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx @@ -377,8 +377,6 @@ public: { } - FilterEntry( const OUString& _rTitle, const UnoFilterList& _rSubFilters ); - OUString getTitle() const { return m_sTitle; } OUString getFilter() const { return m_sFilter; } @@ -396,12 +394,6 @@ 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() ); |