diff options
| -rw-r--r-- | include/tools/errinf.hxx | 10 | ||||
| -rw-r--r-- | sfx2/source/appl/appinit.cxx | 6 | ||||
| -rw-r--r-- | sfx2/source/appl/appquit.cxx | 3 | ||||
| -rw-r--r-- | sfx2/source/inc/appdata.hxx | 3 | ||||
| -rw-r--r-- | tools/source/ref/errinf.cxx | 32 | ||||
| -rw-r--r-- | unusedcode.easy | 1 |
6 files changed, 0 insertions, 55 deletions
diff --git a/include/tools/errinf.hxx b/include/tools/errinf.hxx index 54dc0acb0d48..3b0ec00d798c 100644 --- a/include/tools/errinf.hxx +++ b/include/tools/errinf.hxx @@ -165,16 +165,6 @@ public: static void RegisterDisplay( WindowDisplayErrorFunc* ); }; -class TOOLS_DLLPUBLIC SimpleErrorHandler : private ErrorHandler -{ -protected: - virtual bool CreateString( const ErrorInfo*, OUString &, - sal_uInt16 &nMask ) const; - -public: - SimpleErrorHandler(); -}; - #endif #endif diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx index 5cbf85cd557a..610a1e119ff2 100644 --- a/sfx2/source/appl/appinit.cxx +++ b/sfx2/source/appl/appinit.cxx @@ -226,12 +226,6 @@ bool SfxApplication::Initialize_Impl() Application::EnableAutoMnemonic ( aLocalisation.IsAutoMnemonic() ); Application::SetDialogScaleX ( (short)(aLocalisation.GetDialogScale()) ); - -#ifdef DBG_UTIL - // The SimplerErrorHandler is for debugging. In the Product errors - // not processed are given to SFX as Errorcode 1. - pAppData_Impl->m_pSimpleErrorHdl = new SimpleErrorHandler; -#endif pAppData_Impl->m_pToolsErrorHdl = new SfxErrorHandler( RID_ERRHDL, ERRCODE_AREA_TOOLS, ERRCODE_AREA_LIB1); diff --git a/sfx2/source/appl/appquit.cxx b/sfx2/source/appl/appquit.cxx index 696e39d32b5d..6f586f1c70f4 100644 --- a/sfx2/source/appl/appquit.cxx +++ b/sfx2/source/appl/appquit.cxx @@ -155,9 +155,6 @@ void SfxApplication::Deinitialize() #endif delete pAppData_Impl->m_pSoErrorHdl; delete pAppData_Impl->m_pToolsErrorHdl; -#ifdef DBG_UTIL - delete pAppData_Impl->m_pSimpleErrorHdl; -#endif } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/inc/appdata.hxx b/sfx2/source/inc/appdata.hxx index b9e287b0ff53..29b82b2eb1fe 100644 --- a/sfx2/source/inc/appdata.hxx +++ b/sfx2/source/inc/appdata.hxx @@ -91,9 +91,6 @@ public: ResMgr* pBasicResMgr; #endif ResMgr* pSvtResMgr; -#ifdef DBG_UTIL - SimpleErrorHandler *m_pSimpleErrorHdl; -#endif SfxErrorHandler *m_pToolsErrorHdl; SfxErrorHandler *m_pSoErrorHdl; #ifndef DISABLE_SCRIPTING diff --git a/tools/source/ref/errinf.cxx b/tools/source/ref/errinf.cxx index be016b38ba79..c73539d17674 100644 --- a/tools/source/ref/errinf.cxx +++ b/tools/source/ref/errinf.cxx @@ -372,36 +372,4 @@ bool ErrHdl_Impl::CreateString( const ErrorHandler *pStart, return false; } -bool SimpleErrorHandler::CreateString( - const ErrorInfo *pInfo, OUString &rStr, sal_uInt16 &) const -{ - sal_uIntPtr nId = pInfo->GetErrorCode(); - OStringBuffer aStr("Id "); - aStr.append(static_cast<sal_Int32>(nId)); - aStr.append(" only handled by SimpleErrorHandler"); - aStr.append("\nErrorCode: "); - aStr.append(static_cast<sal_Int32>( - nId & ((1L << ERRCODE_CLASS_SHIFT) - 1 ))); - aStr.append("\nErrorClass: "); - aStr.append(static_cast<sal_Int32>( - (nId & ERRCODE_CLASS_MASK) >> ERRCODE_CLASS_SHIFT)); - aStr.append("\nErrorArea: "); - aStr.append(static_cast<sal_Int32>((nId & ERRCODE_ERROR_MASK & - ~((1 << ERRCODE_AREA_SHIFT ) -1 ) ) >> ERRCODE_AREA_SHIFT)); - DynamicErrorInfo *pDyn=PTR_CAST(DynamicErrorInfo,pInfo); - if(pDyn) - { - aStr.append("\nDId "); - aStr.append(static_cast<sal_Int32>(*pDyn)); - } - rStr = OStringToOUString(aStr.makeStringAndClear(), - RTL_TEXTENCODING_ASCII_US); - return true; -} - -SimpleErrorHandler::SimpleErrorHandler() - : ErrorHandler() -{ -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unusedcode.easy b/unusedcode.easy index b69758a2d71d..98a819e541f3 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -35,7 +35,6 @@ SdrItemBrowser::ForceParent() SdrItemBrowser::SdrItemBrowser(SdrView&) SfxAppMenuControl_Impl::RegisterControl(unsigned short, SfxModule*) SfxInt64Item::SetValue(long) -SimpleErrorHandler::SimpleErrorHandler() StyleSettings::SetActiveColor2(Color const&) StyleSettings::SetCursorSize(long) StyleSettings::SetDeactiveColor2(Color const&) |