CWS-TOOLING: integrate CWS vcl114

3 files changed, 11 insertions, 127 deletions

diff --git a/svtools/inc/svtools/svtdata.hxx b/svtools/inc/svtools/svtdata.hxx
index 9faadaff7305..1501afbb6157 100644
--- a/svtools/inc/svtools/svtdata.hxx
+++ b/svtools/inc/svtools/svtdata.hxx
@@ -40,11 +40,10 @@ class ImpSvtData
 public:
     SfxItemDesruptorList_Impl * pItemDesruptList;
     ResMgr *        pResMgr;
-    ResMgr *        pPatchResMgr;
 
 private:
     ImpSvtData():
-        pItemDesruptList(0), pResMgr(0), pPatchResMgr(0)
+        pItemDesruptList(0), pResMgr(0)
     {}
 
     ~ImpSvtData();
@@ -52,25 +51,12 @@ private:
 public:
     ResMgr * GetResMgr(const ::com::sun::star::lang::Locale aLocale);
     ResMgr * GetResMgr(); // VCL dependant, only available in SVT, not in SVL!
-    ResMgr * GetPatchResMgr();
-    ResMgr * GetPatchResMgr(const ::com::sun::star::lang::Locale& aLocale);
 
     static ImpSvtData & GetSvtData();
 };
 
 //============================================================================
 
-class SvpResId: public ResId
-{
-public:
-    SvpResId( USHORT nId, const ::com::sun::star::lang::Locale aLocale ):
-        ResId( nId, *ImpSvtData::GetSvtData().GetResMgr( aLocale ) ) {}
-
-     // VCL dependant, only available in SVT, not in SVL!
-    SvpResId( USHORT nId );
-};
-
-
 class SvtResId: public ResId
 {
 public:
diff --git a/svtools/source/java/javainteractionhandler.cxx b/svtools/source/java/javainteractionhandler.cxx
index ec34ed07f25d..dc01de750b06 100644
--- a/svtools/source/java/javainteractionhandler.cxx
+++ b/svtools/source/java/javainteractionhandler.cxx
@@ -147,24 +147,8 @@ void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionReque
            // No suitable JRE found
             vos::OGuard aSolarGuard( Application::GetSolarMutex() );
             m_bJavaNotFound_Handled = true;
-            //We first try to get the patch resource svp680xxx.res
-            //If the resource is not found then svt680xxx.res is used
-            ResId idWBX = SvtResId(WARNINGBOX_JAVANOTFOUND);
-            SvpResId pidPatchWBX(WARNINGBOX_JAVANOTFOUND);
-            pidPatchWBX.SetRT(RSC_WARNINGBOX);
-            ResMgr *pMgrWB = pidPatchWBX.GetResMgr();
-            if (pMgrWB && pMgrWB->IsAvailable(pidPatchWBX))
-                idWBX = pidPatchWBX;
-            WarningBox aWarningBox( NULL, idWBX);
-
-            String aTitle;
-            SvpResId pidString(STR_WARNING_JAVANOTFOUND);
-            pidString.SetRT(RSC_STRING);
-            ResMgr *pmgr = pidString.GetResMgr();
-            if ( pmgr && pmgr->IsAvailable(pidString))
-                aTitle = String(pidString);
-            else
-                aTitle = String( SvtResId( STR_WARNING_JAVANOTFOUND ));
+            WarningBox aWarningBox( NULL, SvtResId( WARNINGBOX_JAVANOTFOUND ) );
+            String aTitle( SvtResId( STR_WARNING_JAVANOTFOUND ) );
 
             aWarningBox.SetText( aTitle );
             nResult = aWarningBox.Execute();
@@ -182,24 +166,8 @@ void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionReque
            // javavendors.xml was updated and Java has not been configured yet
             vos::OGuard aSolarGuard( Application::GetSolarMutex() );
             m_bInvalidSettings_Handled = true;
-            //We first try to get the patch resource svp680xxx.res
-            //If the resource is not found then svt680xxx.res is used
-            ResId idWBX = SvtResId(WARNINGBOX_INVALIDJAVASETTINGS);
-            SvpResId pidPatchWBX(WARNINGBOX_INVALIDJAVASETTINGS);
-            pidPatchWBX.SetRT(RSC_WARNINGBOX);
-            ResMgr *pMgrWB = pidPatchWBX.GetResMgr();
-            if (pMgrWB && pMgrWB->IsAvailable(pidPatchWBX))
-                idWBX = pidPatchWBX;
-            WarningBox aWarningBox( NULL, idWBX);
-
-            String aTitle;
-            SvpResId pidString(STR_WARNING_INVALIDJAVASETTINGS);
-            pidString.SetRT(RSC_STRING);
-            ResMgr *pmgr = pidString.GetResMgr();
-            if ( pmgr && pmgr->IsAvailable(pidString))
-                aTitle = String(pidString);
-            else
-                aTitle = String( SvtResId(STR_WARNING_INVALIDJAVASETTINGS));
+            WarningBox aWarningBox( NULL, SvtResId( WARNINGBOX_INVALIDJAVASETTINGS ) );
+            String aTitle( SvtResId(STR_WARNING_INVALIDJAVASETTINGS));
 
             aWarningBox.SetText( aTitle );
             nResult = aWarningBox.Execute();
@@ -216,27 +184,8 @@ void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionReque
             vos::OGuard aSolarGuard( Application::GetSolarMutex() );
             m_bJavaDisabled_Handled = true;
             // Java disabled. Give user a chance to enable Java inside Office.
-            //We first try to get the patch resource svp680xxx.res
-            //If the resource is not found then svt680xxx.res is used
-            ResId idQBX = SvtResId( QBX_JAVADISABLED );
-            SvpResId pidPatchQBX(QBX_JAVADISABLED);
-            pidPatchQBX.SetRT(RSC_QUERYBOX);
-            ResMgr *pMgrQB = pidPatchQBX.GetResMgr();
-
-            if (pMgrQB && pMgrQB->IsAvailable(pidPatchQBX))
-                idQBX = pidPatchQBX;
-
-            QueryBox aQueryBox(NULL, idQBX);
-
-            String aTitle;
-
-            SvpResId pidString(STR_QUESTION_JAVADISABLED);
-            pidString.SetRT(RSC_STRING);
-            ResMgr *pmgr = pidString.GetResMgr();
-            if ( pmgr && pmgr->IsAvailable(pidString))
-                aTitle = String(pidString);
-            else
-                aTitle = String( SvtResId( STR_QUESTION_JAVADISABLED ));
+            QueryBox aQueryBox( NULL, SvtResId( QBX_JAVADISABLED ) );
+            String aTitle( SvtResId( STR_QUESTION_JAVADISABLED ) );
 
             aQueryBox.SetText( aTitle );
             nResult = aQueryBox.Execute();
@@ -260,24 +209,8 @@ void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionReque
             // Java not correctly installed, or damaged
             vos::OGuard aSolarGuard( Application::GetSolarMutex() );
             m_bVMCreationFailure_Handled = true;
-            //We first try to get the patch resource svp680xxx.res
-            //If the resource is not found then svt680xxx.res is used
-            ResId idEBX = SvtResId(ERRORBOX_JVMCREATIONFAILED);
-            SvpResId pidPatchEBX(ERRORBOX_JVMCREATIONFAILED);
-            pidPatchEBX.SetRT(RSC_ERRORBOX);
-            ResMgr *pMgrEB = pidPatchEBX.GetResMgr();
-            if (pMgrEB && pMgrEB->IsAvailable(pidPatchEBX))
-                idEBX = pidPatchEBX;
-            ErrorBox aErrorBox( NULL, idEBX);
-
-            String aTitle;
-            SvpResId pidString(STR_ERROR_JVMCREATIONFAILED);
-            pidString.SetRT(RSC_STRING);
-            ResMgr *pmgr = pidString.GetResMgr();
-            if ( pmgr && pmgr->IsAvailable(pidString))
-                aTitle = String(pidString);
-            else
-                aTitle = String( SvtResId(STR_ERROR_JVMCREATIONFAILED));
+            ErrorBox aErrorBox( NULL, SvtResId( ERRORBOX_JVMCREATIONFAILED ) );
+            String aTitle( SvtResId( STR_ERROR_JVMCREATIONFAILED ) );
 
             aErrorBox.SetText( aTitle );
             nResult = aErrorBox.Execute();
@@ -295,24 +228,8 @@ void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionReque
             //before it can be used.
             vos::OGuard aSolarGuard( Application::GetSolarMutex() );
             m_bRestartRequired_Handled = true;
-            //We first try to get the patch resource svp680xxx.res
-            //If the resource is not found then svt680xxx.res is used
-            ResId idEBX = SvtResId(ERRORBOX_RESTARTREQUIRED);
-            SvpResId pidPatchEBX(ERRORBOX_RESTARTREQUIRED);
-            pidPatchEBX.SetRT(RSC_ERRORBOX);
-            ResMgr *pMgrEB = pidPatchEBX.GetResMgr();
-            if (pMgrEB && pMgrEB->IsAvailable(pidPatchEBX))
-                idEBX = pidPatchEBX;
-            ErrorBox aErrorBox(NULL, idEBX);
-
-            String aTitle;
-            SvpResId pidString(STR_ERROR_RESTARTREQUIRED);
-            pidString.SetRT(RSC_STRING);
-            ResMgr *pmgr = pidString.GetResMgr();
-            if ( pmgr && pmgr->IsAvailable(pidString))
-                aTitle = String(pidString);
-            else
-                aTitle = String( SvtResId(STR_ERROR_RESTARTREQUIRED));
+            ErrorBox aErrorBox(NULL, SvtResId( ERRORBOX_RESTARTREQUIRED ) );
+            String aTitle( SvtResId( STR_ERROR_RESTARTREQUIRED ) );
 
             aErrorBox.SetText( aTitle );
             nResult = aErrorBox.Execute();
diff --git a/svtools/source/misc/svtdata.cxx b/svtools/source/misc/svtdata.cxx
index 65715f635883..7a04b3276c9f 100644
--- a/svtools/source/misc/svtdata.cxx
+++ b/svtools/source/misc/svtdata.cxx
@@ -61,25 +61,6 @@ ResMgr * ImpSvtData::GetResMgr()
     return GetResMgr(Application::GetSettings().GetUILocale());
 }
 
-ResMgr * ImpSvtData::GetPatchResMgr(const ::com::sun::star::lang::Locale& aLocale)
-{
-    if (!pPatchResMgr)
-    {
-        pPatchResMgr = ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(svp), aLocale);
-    }
-    return pPatchResMgr;
-}
-
-ResMgr * ImpSvtData::GetPatchResMgr()
-{
-    return GetPatchResMgr(Application::GetSettings().GetUILocale());
-}
-
-SvpResId::SvpResId( USHORT nId ) :
-    ResId( nId, *ImpSvtData::GetSvtData().GetPatchResMgr() )
-{
-}
-
 //============================================================================
 // static
 ImpSvtData & ImpSvtData::GetSvtData()