Attachment 54425 Details for Bug 43139 – const_cast required ?

[patch] const_cast required ?

gcc4.6.2-const_cast.patch (text/plain), 2.16 KB, created by Rafael da Veiga Cabral on 2011-12-14 08:58:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rafael da Veiga Cabral

Created: 2011-12-14 08:58:16 UTC

Size: 2.16 KB

patch

obsolete

>--- ./framework/source/accelerators/acceleratorcache.cxx.orig	2011-12-14 14:54:39.614708164 -0200
>+++ ./framework/source/accelerators/acceleratorcache.cxx	2011-12-14 14:55:28.761093748 -0200
>@@ -61,7 +61,7 @@ AcceleratorCache::AcceleratorCache()
> AcceleratorCache::AcceleratorCache(const AcceleratorCache& rCopy)
>     : ThreadHelpBase(&Application::GetSolarMutex())
> {
>-    m_lCommand2Keys = rCopy.m_lCommand2Keys;
>+    m_lCommand2Keys = const_cast< framework::BaseHash<comphelper::SequenceAsVector<com::sun::star::awt::KeyEvent> >& > (rCopy.m_lCommand2Keys);
>     m_lKey2Commands = rCopy.m_lKey2Commands;
> }
> 
>@@ -78,7 +78,8 @@ void AcceleratorCache::takeOver(const Ac
>     // SAFE -> ----------------------------------
>     WriteGuard aWriteLock(m_aLock);
> 
>-    m_lCommand2Keys = rCopy.m_lCommand2Keys;
>+    m_lCommand2Keys = const_cast<framework::BaseHash<comphelper::SequenceAsVector<com::sun::star::awt::KeyEvent> >&> ( rCopy.m_lCommand2    Keys );
>+
>     m_lKey2Commands = rCopy.m_lKey2Commands;
> 
>     aWriteLock.unlock();
>--- ./framework/source/loadenv/loadenv.cxx.orig	2011-12-14 14:55:55.673757296 -0200
>+++ ./framework/source/loadenv/loadenv.cxx	2011-12-14 14:57:31.485559484 -0200
>@@ -255,7 +255,8 @@ void LoadEnv::initializeLoading(const ::
>     // take over all new parameters.
>     m_xTargetFrame.clear();
>     m_xBaseFrame                    = xBaseFrame        ;
>-    m_lMediaDescriptor              = impl_mergeMediaDescriptorWithMightExistingModelArgs(lMediaDescriptor);
>+    ::comphelper::MediaDescriptor tmp = impl_mergeMediaDescriptorWithMightExistingModelArgs(lMediaDescriptor);
>+    m_lMediaDescriptor              =  tmp;
>     m_sTarget                       = sTarget           ;
>     m_nSearchFlags                  = nSearchFlags      ;
>     m_eFeature                      = eFeature          ;
>--- ./padmin/source/prtsetup.cxx.orig	2011-12-14 14:59:17.050239740 -0200
>+++ ./padmin/source/prtsetup.cxx	2011-12-14 14:59:27.441109839 -0200
>@@ -813,7 +813,7 @@ extern "C" {
> 
>         if( aDialog.Execute() )
>         {
>-            rJobData = aDialog.getSetup();
>+            rJobData = const_cast< ::psp::PrinterInfo & > ( aDialog.getSetup() );
>             nRet = 1;
>         }
>

Actions: View

Attachments on bug 43139: 54425 | 54468 | 54528 | 54567 | 54632