diff options
Diffstat (limited to 'svtools/source/misc')
| -rw-r--r-- | svtools/source/misc/cliplistener.cxx | 1 | ||||
| -rw-r--r-- | svtools/source/misc/dialogclosedlistener.cxx | 1 | ||||
| -rw-r--r-- | svtools/source/misc/dialogcontrolling.cxx | 1 | ||||
| -rw-r--r-- | svtools/source/misc/ehdl.cxx | 11 | ||||
| -rw-r--r-- | svtools/source/misc/embedtransfer.cxx | 3 | ||||
| -rw-r--r-- | svtools/source/misc/imagemgr.cxx | 1 | ||||
| -rw-r--r-- | svtools/source/misc/imap3.cxx | 1 | ||||
| -rw-r--r-- | svtools/source/misc/langtab.cxx | 3 | ||||
| -rw-r--r-- | svtools/source/misc/openfiledroptargetlistener.cxx | 7 | ||||
| -rw-r--r-- | svtools/source/misc/templatefoldercache.cxx | 3 | ||||
| -rw-r--r-- | svtools/source/misc/transfer.cxx | 101 | ||||
| -rw-r--r-- | svtools/source/misc/transfer2.cxx | 50 | ||||
| -rw-r--r-- | svtools/source/misc/unitconv.cxx | 40 | ||||
| -rw-r--r-- | svtools/source/misc/xwindowitem.cxx | 5 |
14 files changed, 0 insertions, 228 deletions
diff --git a/svtools/source/misc/cliplistener.cxx b/svtools/source/misc/cliplistener.cxx index 13f4bf06a255..9720e16bf5f6 100644 --- a/svtools/source/misc/cliplistener.cxx +++ b/svtools/source/misc/cliplistener.cxx @@ -30,7 +30,6 @@ using namespace ::com::sun::star; - TransferableClipboardListener::TransferableClipboardListener( const Link<TransferableDataHelper*,void>& rCallback ) : aLink( rCallback ) { diff --git a/svtools/source/misc/dialogclosedlistener.cxx b/svtools/source/misc/dialogclosedlistener.cxx index 704839f02c63..7f4cbdd9f5c5 100644 --- a/svtools/source/misc/dialogclosedlistener.cxx +++ b/svtools/source/misc/dialogclosedlistener.cxx @@ -56,5 +56,4 @@ namespace svt } // namespace svt - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/misc/dialogcontrolling.cxx b/svtools/source/misc/dialogcontrolling.cxx index 8ab29197b385..73a286c28968 100644 --- a/svtools/source/misc/dialogcontrolling.cxx +++ b/svtools/source/misc/dialogcontrolling.cxx @@ -28,7 +28,6 @@ namespace svt { - //= IWindowOperator diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx index f98407097ae1..6f805ec303d6 100644 --- a/svtools/source/misc/ehdl.cxx +++ b/svtools/source/misc/ehdl.cxx @@ -141,7 +141,6 @@ static sal_uInt16 aWndFunc( } - SfxErrorHandler::SfxErrorHandler(sal_uInt16 nIdP, sal_uLong lStartP, sal_uLong lEndP, ResMgr *pMgrP) : lStart(lStartP), lEnd(lEndP), nId(nIdP), pMgr(pMgrP), pFreeMgr( nullptr ) @@ -155,14 +154,12 @@ SfxErrorHandler::SfxErrorHandler(sal_uInt16 nIdP, sal_uLong lStartP, sal_uLong l } - SfxErrorHandler::~SfxErrorHandler() { delete pFreeMgr; } - bool SfxErrorHandler::CreateString( const ErrorInfo *pErr, OUString &rStr, sal_uInt16& nFlags) const @@ -207,7 +204,6 @@ bool SfxErrorHandler::CreateString( } - class ResString: public OUString /* [Description] @@ -226,7 +222,6 @@ class ResString: public OUString }; - ResString::ResString(ResId & rId): OUString(rId.SetAutoRelease(false).toString()), nFlags(0) @@ -240,7 +235,6 @@ ResString::ResString(ResId & rId): } - struct ErrorResource_Impl : private Resource /* [Description] @@ -286,7 +280,6 @@ void SfxErrorHandler::GetClassString(sal_uLong lClassId, OUString &rStr) const } - bool SfxErrorHandler::GetMessageString( sal_uLong lErrId, OUString &rStr, sal_uInt16 &nFlags) const @@ -315,7 +308,6 @@ bool SfxErrorHandler::GetMessageString( } - bool SfxErrorHandler::GetErrorString( sal_uLong lErrId, OUString &rStr, sal_uInt16 &nFlags) const @@ -363,7 +355,6 @@ bool SfxErrorHandler::GetErrorString( } - SfxErrorContext::SfxErrorContext( sal_uInt16 nCtxIdP, vcl::Window *pWindow, sal_uInt16 nResIdP, ResMgr *pMgrP) : ErrorContext(pWindow), nCtxId(nCtxIdP), nResId(nResIdP), pMgr(pMgrP) @@ -373,7 +364,6 @@ SfxErrorContext::SfxErrorContext( } - SfxErrorContext::SfxErrorContext( sal_uInt16 nCtxIdP, const OUString &aArg1P, vcl::Window *pWindow, sal_uInt16 nResIdP, ResMgr *pMgrP) @@ -385,7 +375,6 @@ SfxErrorContext::SfxErrorContext( } - bool SfxErrorContext::GetString(sal_uLong nErrId, OUString &rStr) /* [Description] diff --git a/svtools/source/misc/embedtransfer.cxx b/svtools/source/misc/embedtransfer.cxx index a0a952388a1c..666e43a878fc 100644 --- a/svtools/source/misc/embedtransfer.cxx +++ b/svtools/source/misc/embedtransfer.cxx @@ -55,7 +55,6 @@ SvEmbedTransferHelper::SvEmbedTransferHelper( const uno::Reference< embed::XEmbe } - SvEmbedTransferHelper::~SvEmbedTransferHelper() { if ( m_pGraphic ) @@ -80,7 +79,6 @@ void SvEmbedTransferHelper::AddSupportedFormats() } - bool SvEmbedTransferHelper::GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) { bool bRet = false; @@ -196,7 +194,6 @@ bool SvEmbedTransferHelper::GetData( const css::datatransfer::DataFlavor& rFlavo } - void SvEmbedTransferHelper::ObjectReleased() { m_xObj.clear(); diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx index 7f011fb29430..58ce528e57db 100644 --- a/svtools/source/misc/imagemgr.cxx +++ b/svtools/source/misc/imagemgr.cxx @@ -194,7 +194,6 @@ static SvtFactory2ExtensionMapping_Impl const Fac2ExtMap_Impl[] = }; - static OUString GetImageExtensionByFactory_Impl( const OUString& rURL ) { INetURLObject aObj( rURL ); diff --git a/svtools/source/misc/imap3.cxx b/svtools/source/misc/imap3.cxx index 31246d3caf28..49e8dd9b4aba 100644 --- a/svtools/source/misc/imap3.cxx +++ b/svtools/source/misc/imap3.cxx @@ -84,5 +84,4 @@ IMapCompat::~IMapCompat() } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/misc/langtab.cxx b/svtools/source/misc/langtab.cxx index fc8c7b8bcfdd..6b35a0d1953f 100644 --- a/svtools/source/misc/langtab.cxx +++ b/svtools/source/misc/langtab.cxx @@ -183,7 +183,6 @@ OUString SvtLanguageTable::GetLanguageString( const LanguageType eType, bool bUs } - LanguageType SvtLanguageTableImpl::GetType( const OUString& rStr ) const { LanguageType eType = LANGUAGE_DONTKNOW; @@ -206,7 +205,6 @@ LanguageType SvtLanguageTable::GetLanguageType( const OUString& rStr ) } - sal_uInt32 SvtLanguageTableImpl::GetEntryCount() const { return Count(); @@ -218,7 +216,6 @@ sal_uInt32 SvtLanguageTable::GetLanguageEntryCount() } - LanguageType SvtLanguageTableImpl::GetTypeAtIndex( sal_uInt32 nIndex ) const { LanguageType nType = LANGUAGE_DONTKNOW; diff --git a/svtools/source/misc/openfiledroptargetlistener.cxx b/svtools/source/misc/openfiledroptargetlistener.cxx index 671c9668fb9c..efbd8b6e2dc8 100644 --- a/svtools/source/misc/openfiledroptargetlistener.cxx +++ b/svtools/source/misc/openfiledroptargetlistener.cxx @@ -45,7 +45,6 @@ OpenFileDropTargetListener::OpenFileDropTargetListener( const css::uno::Referenc } - OpenFileDropTargetListener::~OpenFileDropTargetListener() { m_xTargetFrame.clear(); @@ -55,7 +54,6 @@ OpenFileDropTargetListener::~OpenFileDropTargetListener() } - void SAL_CALL OpenFileDropTargetListener::disposing( const css::lang::EventObject& ) throw( css::uno::RuntimeException, std::exception ) { m_xTargetFrame.clear(); @@ -63,7 +61,6 @@ void SAL_CALL OpenFileDropTargetListener::disposing( const css::lang::EventObjec } - void SAL_CALL OpenFileDropTargetListener::drop( const css::datatransfer::dnd::DropTargetDropEvent& dtde ) throw( css::uno::RuntimeException, std::exception ) { const sal_Int8 nAction = dtde.DropAction; @@ -98,7 +95,6 @@ void SAL_CALL OpenFileDropTargetListener::drop( const css::datatransfer::dnd::Dr } - void SAL_CALL OpenFileDropTargetListener::dragEnter( const css::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) throw( css::uno::RuntimeException, std::exception ) { try @@ -113,7 +109,6 @@ void SAL_CALL OpenFileDropTargetListener::dragEnter( const css::datatransfer::dn } - void SAL_CALL OpenFileDropTargetListener::dragExit( const css::datatransfer::dnd::DropTargetEvent& ) throw( css::uno::RuntimeException, std::exception ) { try @@ -126,7 +121,6 @@ void SAL_CALL OpenFileDropTargetListener::dragExit( const css::datatransfer::dnd } - void SAL_CALL OpenFileDropTargetListener::dragOver( const css::datatransfer::dnd::DropTargetDragEvent& dtde ) throw( css::uno::RuntimeException, std::exception ) { try @@ -145,7 +139,6 @@ void SAL_CALL OpenFileDropTargetListener::dragOver( const css::datatransfer::dnd } - void SAL_CALL OpenFileDropTargetListener::dropActionChanged( const css::datatransfer::dnd::DropTargetDragEvent& ) throw( css::uno::RuntimeException, std::exception ) { } diff --git a/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx index 1bceffc6f5bf..dd56ccebb715 100644 --- a/svtools/source/misc/templatefoldercache.cxx +++ b/svtools/source/misc/templatefoldercache.cxx @@ -160,8 +160,6 @@ namespace svt }; - - TemplateContent::TemplateContent( const INetURLObject& _rURL ) :m_aURL( _rURL ) { @@ -504,7 +502,6 @@ namespace svt } - void TemplateFolderCacheImpl::normalize( TemplateFolderContent& _rState ) { SubContentSort()( _rState ); diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx index 3177a8c45126..72e4b52554ac 100644 --- a/svtools/source/misc/transfer.cxx +++ b/svtools/source/misc/transfer.cxx @@ -64,7 +64,6 @@ #include <memory> - using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::frame; @@ -74,8 +73,6 @@ using namespace ::com::sun::star::datatransfer::clipboard; using namespace ::com::sun::star::datatransfer::dnd; - - #define TOD_SIG1 0x01234567 #define TOD_SIG2 0x89abcdef @@ -159,7 +156,6 @@ static OUString ImplGetParameterString( const TransferableObjectDescriptor& rObj } - static void ImplSetParameterString( TransferableObjectDescriptor& rObjDesc, const DataFlavorEx& rFlavorEx ) { Reference< XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); @@ -230,41 +226,33 @@ static void ImplSetParameterString( TransferableObjectDescriptor& rObjDesc, cons } - - TransferableHelper::TerminateListener::TerminateListener( TransferableHelper& rTransferableHelper ) : mrParent( rTransferableHelper ) { } - TransferableHelper::TerminateListener::~TerminateListener() { } - void SAL_CALL TransferableHelper::TerminateListener::disposing( const EventObject& ) throw( RuntimeException, std::exception ) { } - void SAL_CALL TransferableHelper::TerminateListener::queryTermination( const EventObject& ) throw( TerminationVetoException, RuntimeException, std::exception ) { } - void SAL_CALL TransferableHelper::TerminateListener::notifyTermination( const EventObject& ) throw( RuntimeException, std::exception ) { mrParent.ImplFlush(); } - - TransferableHelper::TransferableHelper() : mpFormats( new DataFlavorExVector ), mpObjDesc( nullptr ) @@ -272,7 +260,6 @@ TransferableHelper::TransferableHelper() : } - TransferableHelper::~TransferableHelper() { delete mpObjDesc; @@ -405,7 +392,6 @@ Any SAL_CALL TransferableHelper::getTransferData2( const DataFlavor& rFlavor, co } - Sequence< DataFlavor > SAL_CALL TransferableHelper::getTransferDataFlavors() throw( RuntimeException, std::exception ) { const SolarMutexGuard aGuard; @@ -423,7 +409,6 @@ Sequence< DataFlavor > SAL_CALL TransferableHelper::getTransferDataFlavors() thr } - sal_Bool SAL_CALL TransferableHelper::isDataFlavorSupported( const DataFlavor& rFlavor ) throw( RuntimeException, std::exception ) { const SolarMutexGuard aGuard; @@ -451,7 +436,6 @@ sal_Bool SAL_CALL TransferableHelper::isDataFlavorSupported( const DataFlavor& r } - void SAL_CALL TransferableHelper::lostOwnership( const Reference< XClipboard >&, const Reference< XTransferable >& ) throw( RuntimeException, std::exception ) { const SolarMutexGuard aGuard; @@ -474,13 +458,11 @@ void SAL_CALL TransferableHelper::lostOwnership( const Reference< XClipboard >&, } - void SAL_CALL TransferableHelper::disposing( const EventObject& ) throw( RuntimeException, std::exception ) { } - void SAL_CALL TransferableHelper::dragDropEnd( const DragSourceDropEvent& rDSDE ) throw( RuntimeException, std::exception ) { const SolarMutexGuard aGuard; @@ -496,31 +478,26 @@ void SAL_CALL TransferableHelper::dragDropEnd( const DragSourceDropEvent& rDSDE } - void SAL_CALL TransferableHelper::dragEnter( const DragSourceDragEvent& ) throw( RuntimeException, std::exception ) { } - void SAL_CALL TransferableHelper::dragExit( const DragSourceEvent& ) throw( RuntimeException, std::exception ) { } - void SAL_CALL TransferableHelper::dragOver( const DragSourceDragEvent& ) throw( RuntimeException, std::exception ) { } - void SAL_CALL TransferableHelper::dropActionChanged( const DragSourceDragEvent& ) throw( RuntimeException, std::exception ) { } - sal_Int64 SAL_CALL TransferableHelper::getSomething( const Sequence< sal_Int8 >& rId ) throw( RuntimeException, std::exception ) { sal_Int64 nRet; @@ -537,7 +514,6 @@ sal_Int64 SAL_CALL TransferableHelper::getSomething( const Sequence< sal_Int8 >& } - void TransferableHelper::ImplFlush() { if( mxClipboard.is() ) @@ -558,7 +534,6 @@ void TransferableHelper::ImplFlush() } - void TransferableHelper::AddFormat( SotClipboardFormatId nFormat ) { DataFlavor aFlavor; @@ -568,7 +543,6 @@ void TransferableHelper::AddFormat( SotClipboardFormatId nFormat ) } - void TransferableHelper::AddFormat( const DataFlavor& rFlavor ) { bool bAdd = true; @@ -625,7 +599,6 @@ void TransferableHelper::AddFormat( const DataFlavor& rFlavor ) } - void TransferableHelper::RemoveFormat( SotClipboardFormatId nFormat ) { DataFlavor aFlavor; @@ -635,7 +608,6 @@ void TransferableHelper::RemoveFormat( SotClipboardFormatId nFormat ) } - void TransferableHelper::RemoveFormat( const DataFlavor& rFlavor ) { DataFlavorExVector::iterator aIter( mpFormats->begin() ); @@ -650,7 +622,6 @@ void TransferableHelper::RemoveFormat( const DataFlavor& rFlavor ) } - bool TransferableHelper::HasFormat( SotClipboardFormatId nFormat ) { bool bRet = false; @@ -668,7 +639,6 @@ bool TransferableHelper::HasFormat( SotClipboardFormatId nFormat ) } - void TransferableHelper::ClearFormats() { mpFormats->clear(); @@ -676,7 +646,6 @@ void TransferableHelper::ClearFormats() } - bool TransferableHelper::SetAny( const Any& rAny, const DataFlavor& ) { maAny = rAny; @@ -684,7 +653,6 @@ bool TransferableHelper::SetAny( const Any& rAny, const DataFlavor& ) } - bool TransferableHelper::SetString( const OUString& rString, const DataFlavor& rFlavor ) { DataFlavor aFileFlavor; @@ -707,7 +675,6 @@ bool TransferableHelper::SetString( const OUString& rString, const DataFlavor& r } - bool TransferableHelper::SetBitmapEx( const BitmapEx& rBitmapEx, const DataFlavor& rFlavor ) { if( !rBitmapEx.IsEmpty() ) @@ -736,7 +703,6 @@ bool TransferableHelper::SetBitmapEx( const BitmapEx& rBitmapEx, const DataFlavo } - bool TransferableHelper::SetGDIMetaFile( const GDIMetaFile& rMtf, const DataFlavor& ) { if( rMtf.GetActionSize() ) @@ -751,7 +717,6 @@ bool TransferableHelper::SetGDIMetaFile( const GDIMetaFile& rMtf, const DataFlav } - bool TransferableHelper::SetGraphic( const Graphic& rGraphic, const DataFlavor& ) { if( rGraphic.GetType() != GRAPHIC_NONE ) @@ -768,7 +733,6 @@ bool TransferableHelper::SetGraphic( const Graphic& rGraphic, const DataFlavor& } - bool TransferableHelper::SetImageMap( const ImageMap& rIMap, const css::datatransfer::DataFlavor& ) { SvMemoryStream aMemStm( 8192, 8192 ); @@ -781,7 +745,6 @@ bool TransferableHelper::SetImageMap( const ImageMap& rIMap, const css::datatran } - bool TransferableHelper::SetTransferableObjectDescriptor( const TransferableObjectDescriptor& rDesc, const css::datatransfer::DataFlavor& ) { @@ -796,7 +759,6 @@ bool TransferableHelper::SetTransferableObjectDescriptor( const TransferableObje } - bool TransferableHelper::SetINetBookmark( const INetBookmark& rBmk, const css::datatransfer::DataFlavor& rFlavor ) { @@ -886,7 +848,6 @@ bool TransferableHelper::SetINetBookmark( const INetBookmark& rBmk, } - bool TransferableHelper::SetINetImage( const INetImage& rINtImg, const css::datatransfer::DataFlavor& rFlavor ) { @@ -901,7 +862,6 @@ bool TransferableHelper::SetINetImage( const INetImage& rINtImg, } - bool TransferableHelper::SetObject( void* pUserObject, SotClipboardFormatId nUserObjectId, const DataFlavor& rFlavor ) { tools::SvRef<SotStorageStream> xStm( new SotStorageStream( OUString() ) ); @@ -932,7 +892,6 @@ bool TransferableHelper::SetObject( void* pUserObject, SotClipboardFormatId nUse } - bool TransferableHelper::WriteObject( tools::SvRef<SotStorageStream>&, void*, SotClipboardFormatId, const DataFlavor& ) { OSL_FAIL( "TransferableHelper::WriteObject( ... ) not implemented" ); @@ -940,19 +899,16 @@ bool TransferableHelper::WriteObject( tools::SvRef<SotStorageStream>&, void*, So } - void TransferableHelper::DragFinished( sal_Int8 ) { } - void TransferableHelper::ObjectReleased() { } - void TransferableHelper::PrepareOLE( const TransferableObjectDescriptor& rObjDesc ) { delete mpObjDesc; @@ -963,7 +919,6 @@ void TransferableHelper::PrepareOLE( const TransferableObjectDescriptor& rObjDes } - void TransferableHelper::CopyToClipboard( vcl::Window *pWindow ) const { DBG_ASSERT( pWindow, "Window pointer is NULL" ); @@ -994,7 +949,6 @@ void TransferableHelper::CopyToClipboard( vcl::Window *pWindow ) const } - void TransferableHelper::CopyToSelection( vcl::Window *pWindow ) const { DBG_ASSERT( pWindow, "Window pointer is NULL" ); @@ -1022,7 +976,6 @@ void TransferableHelper::CopyToSelection( vcl::Window *pWindow ) const } - void TransferableHelper::StartDrag( vcl::Window* pWindow, sal_Int8 nDnDSourceActions, sal_Int32 nDnDPointer, sal_Int32 nDnDImage ) @@ -1066,7 +1019,6 @@ void TransferableHelper::StartDrag( vcl::Window* pWindow, sal_Int8 nDnDSourceAct } - void TransferableHelper::ClearSelection( vcl::Window *pWindow ) { DBG_ASSERT( pWindow, "Window pointer is NULL" ); @@ -1077,7 +1029,6 @@ void TransferableHelper::ClearSelection( vcl::Window *pWindow ) } - Reference< XClipboard> TransferableHelper::GetSystemClipboard() { vcl::Window *pFocusWindow = Application::GetFocusWindow(); @@ -1099,8 +1050,6 @@ const Sequence< sal_Int8 >& TransferableHelper::getUnoTunnelId() } - - class TransferableClipboardNotifier : public ::cppu::WeakImplHelper< XClipboardListener > { private: @@ -1129,7 +1078,6 @@ public: }; - TransferableClipboardNotifier::TransferableClipboardNotifier( const Reference< XClipboard >& _rxClipboard, TransferableDataHelper& _rListener, ::osl::Mutex& _rMutex ) :mrMutex( _rMutex ) ,mxNotifier( _rxClipboard, UNO_QUERY ) @@ -1147,7 +1095,6 @@ TransferableClipboardNotifier::TransferableClipboardNotifier( const Reference< X } - void SAL_CALL TransferableClipboardNotifier::changedContents( const clipboard::ClipboardEvent& event ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -1161,7 +1108,6 @@ void SAL_CALL TransferableClipboardNotifier::changedContents( const clipboard::C } - void SAL_CALL TransferableClipboardNotifier::disposing( const EventObject& ) throw (RuntimeException, std::exception) { // clipboard is being disposed. Hmm. Okay, become disfunctional myself. @@ -1169,7 +1115,6 @@ void SAL_CALL TransferableClipboardNotifier::disposing( const EventObject& ) thr } - void TransferableClipboardNotifier::dispose() { ::osl::MutexGuard aGuard( mrMutex ); @@ -1184,8 +1129,6 @@ void TransferableClipboardNotifier::dispose() } - - struct TransferableDataHelper_Impl { ::osl::Mutex maMutex; @@ -1198,8 +1141,6 @@ struct TransferableDataHelper_Impl }; - - TransferableDataHelper::TransferableDataHelper() : mpFormats( new DataFlavorExVector ), mpObjDesc( new TransferableObjectDescriptor ), @@ -1208,7 +1149,6 @@ TransferableDataHelper::TransferableDataHelper() : } - TransferableDataHelper::TransferableDataHelper( const Reference< css::datatransfer::XTransferable >& rxTransferable ) : mxTransfer( rxTransferable ), mpFormats( new DataFlavorExVector ), @@ -1219,7 +1159,6 @@ TransferableDataHelper::TransferableDataHelper( const Reference< css::datatransf } - TransferableDataHelper::TransferableDataHelper( const TransferableDataHelper& rDataHelper ) : mxTransfer( rDataHelper.mxTransfer ), mxClipboard( rDataHelper.mxClipboard ), @@ -1230,7 +1169,6 @@ TransferableDataHelper::TransferableDataHelper( const TransferableDataHelper& rD } - TransferableDataHelper& TransferableDataHelper::operator=( const TransferableDataHelper& rDataHelper ) { if ( this != &rDataHelper ) @@ -1255,7 +1193,6 @@ TransferableDataHelper& TransferableDataHelper::operator=( const TransferableDat } - TransferableDataHelper::~TransferableDataHelper() { StopClipboardListening( ); @@ -1267,7 +1204,6 @@ TransferableDataHelper::~TransferableDataHelper() } - void TransferableDataHelper::FillDataFlavorExVector( const Sequence< DataFlavor >& rDataFlavorSeq, DataFlavorExVector& rDataFlavorExVector ) { @@ -1361,7 +1297,6 @@ void TransferableDataHelper::FillDataFlavorExVector( const Sequence< DataFlavor } - void TransferableDataHelper::InitFormats() { SolarMutexGuard aSolarGuard; @@ -1386,7 +1321,6 @@ void TransferableDataHelper::InitFormats() } - bool TransferableDataHelper::HasFormat( SotClipboardFormatId nFormat ) const { ::osl::MutexGuard aGuard( mpImpl->maMutex ); @@ -1407,7 +1341,6 @@ bool TransferableDataHelper::HasFormat( SotClipboardFormatId nFormat ) const } - bool TransferableDataHelper::HasFormat( const DataFlavor& rFlavor ) const { ::osl::MutexGuard aGuard( mpImpl->maMutex ); @@ -1428,7 +1361,6 @@ bool TransferableDataHelper::HasFormat( const DataFlavor& rFlavor ) const } - sal_uInt32 TransferableDataHelper::GetFormatCount() const { ::osl::MutexGuard aGuard( mpImpl->maMutex ); @@ -1436,8 +1368,6 @@ sal_uInt32 TransferableDataHelper::GetFormatCount() const } - - SotClipboardFormatId TransferableDataHelper::GetFormat( sal_uInt32 nFormat ) const { ::osl::MutexGuard aGuard( mpImpl->maMutex ); @@ -1446,7 +1376,6 @@ SotClipboardFormatId TransferableDataHelper::GetFormat( sal_uInt32 nFormat ) con } - DataFlavor TransferableDataHelper::GetFormatDataFlavor( sal_uInt32 nFormat ) const { ::osl::MutexGuard aGuard( mpImpl->maMutex ); @@ -1461,7 +1390,6 @@ DataFlavor TransferableDataHelper::GetFormatDataFlavor( sal_uInt32 nFormat ) con } - Reference< XTransferable > TransferableDataHelper::GetXTransferable() const { Reference< XTransferable > xRet; @@ -1486,7 +1414,6 @@ Reference< XTransferable > TransferableDataHelper::GetXTransferable() const } - Any TransferableDataHelper::GetAny( SotClipboardFormatId nFormat, const OUString& rDestDoc ) const { Any aReturn; @@ -1499,8 +1426,6 @@ Any TransferableDataHelper::GetAny( SotClipboardFormatId nFormat, const OUString } - - Any TransferableDataHelper::GetAny( const DataFlavor& rFlavor, const OUString& rDestDoc ) const { ::osl::MutexGuard aGuard( mpImpl->maMutex ); @@ -1549,7 +1474,6 @@ Any TransferableDataHelper::GetAny( const DataFlavor& rFlavor, const OUString& r } - bool TransferableDataHelper::GetString( SotClipboardFormatId nFormat, OUString& rStr ) { DataFlavor aFlavor; @@ -1557,7 +1481,6 @@ bool TransferableDataHelper::GetString( SotClipboardFormatId nFormat, OUString& } - bool TransferableDataHelper::GetString( const DataFlavor& rFlavor, OUString& rStr ) { Any aAny = GetAny(rFlavor, OUString()); @@ -1593,7 +1516,6 @@ bool TransferableDataHelper::GetString( const DataFlavor& rFlavor, OUString& rSt } - bool TransferableDataHelper::GetBitmapEx( SotClipboardFormatId nFormat, BitmapEx& rBmpEx ) { if(SotClipboardFormatId::BITMAP == nFormat) @@ -1615,7 +1537,6 @@ bool TransferableDataHelper::GetBitmapEx( SotClipboardFormatId nFormat, BitmapEx } - bool TransferableDataHelper::GetBitmapEx( const DataFlavor& rFlavor, BitmapEx& rBmpEx ) { tools::SvRef<SotStorageStream> xStm; @@ -1719,7 +1640,6 @@ bool TransferableDataHelper::GetBitmapEx( const DataFlavor& rFlavor, BitmapEx& r } - bool TransferableDataHelper::GetGDIMetaFile(SotClipboardFormatId nFormat, GDIMetaFile& rMtf, size_t nMaxActions) { DataFlavor aFlavor; @@ -1729,7 +1649,6 @@ bool TransferableDataHelper::GetGDIMetaFile(SotClipboardFormatId nFormat, GDIMet } - bool TransferableDataHelper::GetGDIMetaFile( const DataFlavor& rFlavor, GDIMetaFile& rMtf ) { tools::SvRef<SotStorageStream> xStm; @@ -1774,7 +1693,6 @@ bool TransferableDataHelper::GetGDIMetaFile( const DataFlavor& rFlavor, GDIMetaF } - bool TransferableDataHelper::GetGraphic( SotClipboardFormatId nFormat, Graphic& rGraphic ) { if(SotClipboardFormatId::BITMAP == nFormat) @@ -1796,7 +1714,6 @@ bool TransferableDataHelper::GetGraphic( SotClipboardFormatId nFormat, Graphic& } - bool TransferableDataHelper::GetGraphic( const css::datatransfer::DataFlavor& rFlavor, Graphic& rGraphic ) { DataFlavor aFlavor; @@ -1849,7 +1766,6 @@ bool TransferableDataHelper::GetGraphic( const css::datatransfer::DataFlavor& rF } - bool TransferableDataHelper::GetImageMap( SotClipboardFormatId nFormat, ImageMap& rIMap ) { DataFlavor aFlavor; @@ -1857,7 +1773,6 @@ bool TransferableDataHelper::GetImageMap( SotClipboardFormatId nFormat, ImageMap } - bool TransferableDataHelper::GetImageMap( const css::datatransfer::DataFlavor& rFlavor, ImageMap& rIMap ) { tools::SvRef<SotStorageStream> xStm; @@ -1873,7 +1788,6 @@ bool TransferableDataHelper::GetImageMap( const css::datatransfer::DataFlavor& r } - bool TransferableDataHelper::GetTransferableObjectDescriptor( SotClipboardFormatId nFormat, TransferableObjectDescriptor& rDesc ) { DataFlavor aFlavor; @@ -1881,7 +1795,6 @@ bool TransferableDataHelper::GetTransferableObjectDescriptor( SotClipboardFormat } - bool TransferableDataHelper::GetTransferableObjectDescriptor( const css::datatransfer::DataFlavor&, TransferableObjectDescriptor& rDesc ) { rDesc = *mpObjDesc; @@ -1889,7 +1802,6 @@ bool TransferableDataHelper::GetTransferableObjectDescriptor( const css::datatra } - bool TransferableDataHelper::GetINetBookmark( SotClipboardFormatId nFormat, INetBookmark& rBmk ) { DataFlavor aFlavor; @@ -1897,7 +1809,6 @@ bool TransferableDataHelper::GetINetBookmark( SotClipboardFormatId nFormat, INet } - bool TransferableDataHelper::GetINetBookmark( const css::datatransfer::DataFlavor& rFlavor, INetBookmark& rBmk ) { bool bRet = false; @@ -2033,7 +1944,6 @@ bool TransferableDataHelper::GetINetBookmark( const css::datatransfer::DataFlavo } - bool TransferableDataHelper::GetINetImage( SotClipboardFormatId nFormat, INetImage& rINtImg ) { @@ -2042,7 +1952,6 @@ bool TransferableDataHelper::GetINetImage( SotClipboardFormatId nFormat, } - bool TransferableDataHelper::GetINetImage( const css::datatransfer::DataFlavor& rFlavor, INetImage& rINtImg ) @@ -2056,7 +1965,6 @@ bool TransferableDataHelper::GetINetImage( } - bool TransferableDataHelper::GetFileList( SotClipboardFormatId nFormat, FileList& rFileList ) { @@ -2065,7 +1973,6 @@ bool TransferableDataHelper::GetFileList( SotClipboardFormatId nFormat, } - bool TransferableDataHelper::GetFileList( const css::datatransfer::DataFlavor&, FileList& rFileList ) @@ -2101,7 +2008,6 @@ bool TransferableDataHelper::GetFileList( } - Sequence<sal_Int8> TransferableDataHelper::GetSequence( SotClipboardFormatId nFormat, const OUString& rDestDoc ) { DataFlavor aFlavor; @@ -2126,7 +2032,6 @@ Sequence<sal_Int8> TransferableDataHelper::GetSequence( const DataFlavor& rFlavo } - bool TransferableDataHelper::GetSotStorageStream( SotClipboardFormatId nFormat, tools::SvRef<SotStorageStream>& rxStream ) { DataFlavor aFlavor; @@ -2134,7 +2039,6 @@ bool TransferableDataHelper::GetSotStorageStream( SotClipboardFormatId nFormat, } - bool TransferableDataHelper::GetSotStorageStream( const DataFlavor& rFlavor, tools::SvRef<SotStorageStream>& rxStream ) { Sequence<sal_Int8> aSeq = GetSequence(rFlavor, OUString()); @@ -2176,7 +2080,6 @@ void TransferableDataHelper::Rebind( const Reference< XTransferable >& _rxNewCon } - bool TransferableDataHelper::StartClipboardListening( ) { ::osl::MutexGuard aGuard( mpImpl->maMutex ); @@ -2190,7 +2093,6 @@ bool TransferableDataHelper::StartClipboardListening( ) } - void TransferableDataHelper::StopClipboardListening( ) { ::osl::MutexGuard aGuard( mpImpl->maMutex ); @@ -2204,7 +2106,6 @@ void TransferableDataHelper::StopClipboardListening( ) } - TransferableDataHelper TransferableDataHelper::CreateFromSystemClipboard( vcl::Window * pWindow ) { DBG_ASSERT( pWindow, "Window pointer is NULL" ); @@ -2237,8 +2138,6 @@ TransferableDataHelper TransferableDataHelper::CreateFromSystemClipboard( vcl::W } - - TransferableDataHelper TransferableDataHelper::CreateFromSelection( vcl::Window* pWindow ) { DBG_ASSERT( pWindow, "Window pointer is NULL" ); diff --git a/svtools/source/misc/transfer2.cxx b/svtools/source/misc/transfer2.cxx index 09d9a891e3d0..444476b4a66b 100644 --- a/svtools/source/misc/transfer2.cxx +++ b/svtools/source/misc/transfer2.cxx @@ -34,8 +34,6 @@ #include <svtools/transfer.hxx> - - using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::io; @@ -44,27 +42,22 @@ using namespace ::com::sun::star::datatransfer::clipboard; using namespace ::com::sun::star::datatransfer::dnd; - - DragSourceHelper::DragGestureListener::DragGestureListener( DragSourceHelper& rDragSourceHelper ) : mrParent( rDragSourceHelper ) { } - DragSourceHelper::DragGestureListener::~DragGestureListener() { } - void SAL_CALL DragSourceHelper::DragGestureListener::disposing( const EventObject& ) throw( RuntimeException, std::exception ) { } - void SAL_CALL DragSourceHelper::DragGestureListener::dragGestureRecognized( const DragGestureEvent& rDGE ) throw( RuntimeException, std::exception ) { const SolarMutexGuard aGuard; @@ -74,8 +67,6 @@ void SAL_CALL DragSourceHelper::DragGestureListener::dragGestureRecognized( cons } - - DragSourceHelper::DragSourceHelper( vcl::Window* pWindow ) : mxDragGestureRecognizer( pWindow->GetDragGestureRecognizer() ) { @@ -87,7 +78,6 @@ DragSourceHelper::DragSourceHelper( vcl::Window* pWindow ) : } - DragSourceHelper::~DragSourceHelper() { if( mxDragGestureRecognizer.is() ) @@ -95,14 +85,11 @@ DragSourceHelper::~DragSourceHelper() } - void DragSourceHelper::StartDrag( sal_Int8, const Point& ) { } - - DropTargetHelper::DropTargetListener::DropTargetListener( DropTargetHelper& rDropTargetHelper ) : mrParent( rDropTargetHelper ), mpLastDragOverEvent( nullptr ) @@ -110,20 +97,17 @@ DropTargetHelper::DropTargetListener::DropTargetListener( DropTargetHelper& rDro } - DropTargetHelper::DropTargetListener::~DropTargetListener() { delete mpLastDragOverEvent; } - void SAL_CALL DropTargetHelper::DropTargetListener::disposing( const EventObject& ) throw( RuntimeException, std::exception ) { } - void SAL_CALL DropTargetHelper::DropTargetListener::drop( const DropTargetDropEvent& rDTDE ) throw( RuntimeException, std::exception ) { const SolarMutexGuard aGuard; @@ -173,7 +157,6 @@ void SAL_CALL DropTargetHelper::DropTargetListener::drop( const DropTargetDropEv } - void SAL_CALL DropTargetHelper::DropTargetListener::dragEnter( const DropTargetDragEnterEvent& rDTDEE ) throw( RuntimeException, std::exception ) { const SolarMutexGuard aGuard; @@ -190,7 +173,6 @@ void SAL_CALL DropTargetHelper::DropTargetListener::dragEnter( const DropTargetD } - void SAL_CALL DropTargetHelper::DropTargetListener::dragOver( const DropTargetDragEvent& rDTDE ) throw( RuntimeException, std::exception ) { const SolarMutexGuard aGuard; @@ -215,7 +197,6 @@ void SAL_CALL DropTargetHelper::DropTargetListener::dragOver( const DropTargetDr } - void SAL_CALL DropTargetHelper::DropTargetListener::dragExit( const DropTargetEvent& ) throw( RuntimeException, std::exception ) { const SolarMutexGuard aGuard; @@ -238,15 +219,11 @@ void SAL_CALL DropTargetHelper::DropTargetListener::dragExit( const DropTargetEv } - - void SAL_CALL DropTargetHelper::DropTargetListener::dropActionChanged( const DropTargetDragEvent& ) throw( RuntimeException, std::exception ) { } - - DropTargetHelper::DropTargetHelper( vcl::Window* pWindow ) : mxDropTarget( pWindow->GetDropTarget() ), mpFormats( new DataFlavorExVector ) @@ -255,7 +232,6 @@ DropTargetHelper::DropTargetHelper( vcl::Window* pWindow ) : } - DropTargetHelper::DropTargetHelper( const Reference< XDropTarget >& rxDropTarget ) : mxDropTarget( rxDropTarget ), mpFormats( new DataFlavorExVector ) @@ -264,7 +240,6 @@ DropTargetHelper::DropTargetHelper( const Reference< XDropTarget >& rxDropTarget } - DropTargetHelper::~DropTargetHelper() { if( mxDropTarget.is() ) @@ -274,7 +249,6 @@ DropTargetHelper::~DropTargetHelper() } - void DropTargetHelper::ImplConstruct() { if( mxDropTarget.is() ) @@ -286,7 +260,6 @@ void DropTargetHelper::ImplConstruct() } - void DropTargetHelper::ImplBeginDrag( const Sequence< DataFlavor >& rSupportedDataFlavors ) { mpFormats->clear(); @@ -294,28 +267,24 @@ void DropTargetHelper::ImplBeginDrag( const Sequence< DataFlavor >& rSupportedDa } - void DropTargetHelper::ImplEndDrag() { mpFormats->clear(); } - sal_Int8 DropTargetHelper::AcceptDrop( const AcceptDropEvent& ) { return( DNDConstants::ACTION_NONE ); } - sal_Int8 DropTargetHelper::ExecuteDrop( const ExecuteDropEvent& ) { return( DNDConstants::ACTION_NONE ); } - bool DropTargetHelper::IsDropFormatSupported( SotClipboardFormatId nFormat ) { DataFlavorExVector::iterator aIter( mpFormats->begin() ), aEnd( mpFormats->end() ); @@ -334,7 +303,6 @@ bool DropTargetHelper::IsDropFormatSupported( SotClipboardFormatId nFormat ) } - // TransferDataContainer @@ -345,11 +313,9 @@ struct TDataCntnrEntry_Impl }; - typedef ::std::list< TDataCntnrEntry_Impl > TDataCntnrEntryList; - struct TransferDataContainer_Impl { TDataCntnrEntryList aFmtList; @@ -370,27 +336,23 @@ struct TransferDataContainer_Impl }; - TransferDataContainer::TransferDataContainer() : pImpl( new TransferDataContainer_Impl ) { } - TransferDataContainer::~TransferDataContainer() { delete pImpl; } - void TransferDataContainer::AddSupportedFormats() { } - bool TransferDataContainer::GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& /*rDestDoc*/ ) { @@ -438,7 +400,6 @@ bool TransferDataContainer::GetData( } - void TransferDataContainer::CopyINetBookmark( const INetBookmark& rBkmk ) { if( !pImpl->pBookmk ) @@ -455,7 +416,6 @@ void TransferDataContainer::CopyINetBookmark( const INetBookmark& rBkmk ) } - void TransferDataContainer::CopyAnyData( SotClipboardFormatId nFormatId, const sal_Char* pData, sal_uLong nLen ) { @@ -473,7 +433,6 @@ void TransferDataContainer::CopyAnyData( SotClipboardFormatId nFormatId, } - void TransferDataContainer::CopyByteString( SotClipboardFormatId nFormatId, const OString& rStr ) { @@ -481,7 +440,6 @@ void TransferDataContainer::CopyByteString( SotClipboardFormatId nFormatId, } - void TransferDataContainer::CopyINetImage( const INetImage& rINtImg ) { SvMemoryStream aMemStm( 1024, 1024 ); @@ -492,7 +450,6 @@ void TransferDataContainer::CopyINetImage( const INetImage& rINtImg ) } - void TransferDataContainer::CopyImageMap( const ImageMap& rImgMap ) { SvMemoryStream aMemStm( 8192, 8192 ); @@ -503,7 +460,6 @@ void TransferDataContainer::CopyImageMap( const ImageMap& rImgMap ) } - void TransferDataContainer::CopyGraphic( const Graphic& rGrf ) { GraphicType nType = rGrf.GetType(); @@ -529,7 +485,6 @@ void TransferDataContainer::CopyGraphic( const Graphic& rGrf ) } - void TransferDataContainer::CopyString( SotClipboardFormatId nFmt, const OUString& rStr ) { if( !rStr.isEmpty() ) @@ -544,14 +499,12 @@ void TransferDataContainer::CopyString( SotClipboardFormatId nFmt, const OUStrin } - void TransferDataContainer::CopyString( const OUString& rStr ) { CopyString( SotClipboardFormatId::STRING, rStr ); } - void TransferDataContainer::CopyAny( SotClipboardFormatId nFmt, const css::uno::Any& rAny ) { @@ -563,7 +516,6 @@ void TransferDataContainer::CopyAny( SotClipboardFormatId nFmt, } - bool TransferDataContainer::HasAnyData() const { return pImpl->aFmtList.begin() != pImpl->aFmtList.end() || @@ -571,7 +523,6 @@ bool TransferDataContainer::HasAnyData() const } - void TransferDataContainer::StartDrag( vcl::Window* pWindow, sal_Int8 nDragSourceActions, const Link<sal_Int8,void>& rLnk, sal_Int32 nDragPointer, sal_Int32 nDragImage ) @@ -582,7 +533,6 @@ void TransferDataContainer::StartDrag( } - void TransferDataContainer::DragFinished( sal_Int8 nDropAction ) { pImpl->aFinshedLnk.Call( nDropAction ); diff --git a/svtools/source/misc/unitconv.cxx b/svtools/source/misc/unitconv.cxx index 190cb0f8d05b..dd13dad23701 100644 --- a/svtools/source/misc/unitconv.cxx +++ b/svtools/source/misc/unitconv.cxx @@ -20,7 +20,6 @@ #include <svtools/unitconv.hxx> - void SetFieldUnit( MetricField& rField, FieldUnit eUnit, bool bAll ) { sal_Int64 nFirst = rField.Denormalize( rField.GetFirst( FUNIT_TWIP ) ); @@ -80,7 +79,6 @@ void SetFieldUnit( MetricField& rField, FieldUnit eUnit, bool bAll ) } - void SetFieldUnit( MetricBox& rBox, FieldUnit eUnit, bool bAll ) { sal_Int64 nMin = rBox.Denormalize( rBox.GetMin( FUNIT_TWIP ) ); @@ -126,7 +124,6 @@ void SetMetricValue( MetricField& rField, long nCoreValue, SfxMapUnit eUnit ) } - long GetCoreValue( const MetricField& rField, SfxMapUnit eUnit ) { sal_Int64 nVal = rField.GetValue( FUNIT_100TH_MM ); @@ -152,7 +149,6 @@ long GetCoreValue( const MetricField& rField, SfxMapUnit eUnit ) } - long CalcToUnit( float nIn, SfxMapUnit eUnit ) { // nIn ist in Points @@ -184,7 +180,6 @@ long CalcToUnit( float nIn, SfxMapUnit eUnit ) } - long ItemToControl( long nIn, SfxMapUnit eItem, FieldUnit eCtrl ) { long nOut = 0; @@ -241,14 +236,12 @@ long ItemToControl( long nIn, SfxMapUnit eItem, FieldUnit eCtrl ) } - long ControlToItem( long nIn, FieldUnit eCtrl, SfxMapUnit eItem ) { return ItemToControl( nIn, eItem, eCtrl ); } - FieldUnit MapToFieldUnit( const SfxMapUnit eUnit ) { switch ( eUnit ) @@ -278,7 +271,6 @@ FieldUnit MapToFieldUnit( const SfxMapUnit eUnit ) } - long CalcToPoint( long nIn, SfxMapUnit eUnit, sal_uInt16 nFactor ) { DBG_ASSERT( eUnit == SFX_MAPUNIT_TWIP || @@ -317,7 +309,6 @@ long CalcToPoint( long nIn, SfxMapUnit eUnit, sal_uInt16 nFactor ) } - long CMToTwips( long nIn ) { long nRet = 0; @@ -328,7 +319,6 @@ long CMToTwips( long nIn ) } - long MMToTwips( long nIn ) { long nRet = 0; @@ -339,7 +329,6 @@ long MMToTwips( long nIn ) } - long InchToTwips( long nIn ) { long nRet = 0; @@ -350,7 +339,6 @@ long InchToTwips( long nIn ) } - long PointToTwips( long nIn ) { long nRet = 0; @@ -361,7 +349,6 @@ long PointToTwips( long nIn ) } - long PicaToTwips( long nIn ) { long nRet = 0; @@ -372,7 +359,6 @@ long PicaToTwips( long nIn ) } - long TwipsToCM( long nIn ) { long nRet = nIn / 567; @@ -380,7 +366,6 @@ long TwipsToCM( long nIn ) } - long InchToCM( long nIn ) { long nRet = 0; @@ -391,7 +376,6 @@ long InchToCM( long nIn ) } - long MMToCM( long nIn ) { long nRet = nIn / 10; @@ -399,7 +383,6 @@ long MMToCM( long nIn ) } - long PointToCM( long nIn ) { long nRet = 0; @@ -410,7 +393,6 @@ long PointToCM( long nIn ) } - long PicaToCM( long nIn) { long nRet = 0; @@ -421,7 +403,6 @@ long PicaToCM( long nIn) } - long TwipsToMM( long nIn ) { long nRet = 0; @@ -432,7 +413,6 @@ long TwipsToMM( long nIn ) } - long CMToMM( long nIn ) { long nRet = 0; @@ -443,7 +423,6 @@ long CMToMM( long nIn ) } - long InchToMM( long nIn ) { long nRet = 0; @@ -454,7 +433,6 @@ long InchToMM( long nIn ) } - long PointToMM( long nIn ) { long nRet = 0; @@ -465,7 +443,6 @@ long PointToMM( long nIn ) } - long PicaToMM( long nIn ) { long nRet = 0; @@ -476,7 +453,6 @@ long PicaToMM( long nIn ) } - long TwipsToInch( long nIn ) { long nRet = nIn / 1440; @@ -484,7 +460,6 @@ long TwipsToInch( long nIn ) } - long CMToInch( long nIn ) { long nRet = 0; @@ -495,7 +470,6 @@ long CMToInch( long nIn ) } - long MMToInch( long nIn ) { long nRet = 0; @@ -506,7 +480,6 @@ long MMToInch( long nIn ) } - long PointToInch( long nIn ) { long nRet = nIn / 72; @@ -514,7 +487,6 @@ long PointToInch( long nIn ) } - long PicaToInch( long nIn ) { long nRet = nIn / 6; @@ -522,7 +494,6 @@ long PicaToInch( long nIn ) } - long TwipsToPoint( long nIn ) { long nRet = nIn / 20; @@ -530,7 +501,6 @@ long TwipsToPoint( long nIn ) } - long InchToPoint( long nIn ) { long nRet = 0; @@ -541,7 +511,6 @@ long InchToPoint( long nIn ) } - long CMToPoint( long nIn ) { long nRet = 0; @@ -552,7 +521,6 @@ long CMToPoint( long nIn ) } - long MMToPoint( long nIn ) { long nRet = 0; @@ -563,7 +531,6 @@ long MMToPoint( long nIn ) } - long PicaToPoint( long nIn ) { long nRet = nIn / 12; @@ -571,7 +538,6 @@ long PicaToPoint( long nIn ) } - long TwipsToPica( long nIn ) { long nRet = nIn / 240; @@ -579,7 +545,6 @@ long TwipsToPica( long nIn ) } - long InchToPica( long nIn ) { long nRet = 0; @@ -590,7 +555,6 @@ long InchToPica( long nIn ) } - long PointToPica( long nIn ) { long nRet = 0; @@ -601,7 +565,6 @@ long PointToPica( long nIn ) } - long CMToPica( long nIn ) { long nRet = 0; @@ -612,7 +575,6 @@ long CMToPica( long nIn ) } - long MMToPica( long nIn ) { long nRet = 0; @@ -623,7 +585,6 @@ long MMToPica( long nIn ) } - long Nothing( long nIn ) { long nRet = nIn; @@ -642,7 +603,6 @@ FUNC_CONVERT ConvertTable[6][6] = }; - long TransformMetric( long nVal, FieldUnit aOld, FieldUnit aNew ) { if ( aOld == FUNIT_NONE || aNew == FUNIT_NONE || diff --git a/svtools/source/misc/xwindowitem.cxx b/svtools/source/misc/xwindowitem.cxx index fd862053606d..96ab3b4e8535 100644 --- a/svtools/source/misc/xwindowitem.cxx +++ b/svtools/source/misc/xwindowitem.cxx @@ -26,8 +26,6 @@ using namespace ::com::sun::star; - - XWindowItem::XWindowItem() : SfxPoolItem() { @@ -61,7 +59,4 @@ bool XWindowItem::operator == ( const SfxPoolItem & rAttr ) const } - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |