Attachment 54468 Details for Bug 43139 – complete fix porpouse - tested also with gcc 4.6.1

[patch] complete fix porpouse - tested also with gcc 4.6.1

libreoffice34-gcc462.patch (text/plain), 3.84 KB, created by Rafael da Veiga Cabral on 2011-12-15 09:22:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rafael da Veiga Cabral

Created: 2011-12-15 09:22:29 UTC

Size: 3.84 KB

patch

obsolete

>--- ./framework/source/accelerators/acceleratorcache.cxx.orig	2011-12-15 15:08:41.329168423 -0200
>+++ ./framework/source/accelerators/acceleratorcache.cxx	2011-12-15 15:17:59.473190664 -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,7 @@ 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_lCommand2Keys);
>     m_lKey2Commands = rCopy.m_lKey2Commands;
>     
>     aWriteLock.unlock();
>--- ./framework/source/loadenv/loadenv.cxx.orig	2011-12-15 15:08:15.771487938 -0200
>+++ ./framework/source/loadenv/loadenv.cxx	2011-12-15 15:19:06.038358483 -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          ;
>--- ./framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx.orig	2011-12-15 15:08:49.033072112 -0200
>+++ ./framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx	2011-12-15 15:11:07.209344668 -0200
>@@ -175,6 +175,15 @@ namespace framework
>                 sal_Int16                                                         nElementType;
>                 UIElementDataHashMap                                              aElementsHashMap;
>                 com::sun::star::uno::Reference< com::sun::star::embed::XStorage > xStorage;
>+                UIElementType& operator=(const UIElementType& rRight) {
>+                        bModified = rRight.bModified;
>+                        bLoaded = rRight.bLoaded;
>+                        bDefaultLayer = rRight.bDefaultLayer;
>+                        nElementType = rRight.nElementType;
>+                        aElementsHashMap = rRight.aElementsHashMap;
>+                        xStorage = rRight.xStorage;
>+                        return *this;
>+                };
>             };
> 
>             typedef ::std::vector< UIElementType > UIElementTypesVector;
>--- ./padmin/source/prtsetup.cxx.orig	2011-12-15 15:09:05.133870823 -0200
>+++ ./padmin/source/prtsetup.cxx	2011-12-15 15:13:55.626239170 -0200
>@@ -813,7 +813,7 @@ extern "C" {
> 
>         if( aDialog.Execute() )
>         {
>-            rJobData = aDialog.getSetup();
>+            rJobData = const_cast< ::psp::PrinterInfo & > ( aDialog.getSetup() );
>             nRet = 1;
>         }
> 
>--- ./sfx2/source/doc/guisaveas.cxx.orig	2011-12-15 15:08:58.332955848 -0200
>+++ ./sfx2/source/doc/guisaveas.cxx	2011-12-15 15:12:39.953185212 -0200
>@@ -731,7 +731,7 @@ sal_Int8 ModelData_Impl::CheckFilter( co
>         if ( aFilterName.getLength() )
>             m_pOwner->GetFilterConfiguration()->getByName( aFilterName ) >>= aFilterProps;
> 
>-        aFiltPropsHM = ::comphelper::SequenceAsHashMap( aFilterProps );
>+        aFiltPropsHM <<  aFilterProps;
>         nFiltFlags = aFiltPropsHM.getUnpackedValueOrDefault( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Flags")), (sal_Int32)0 );
>     }
>

Actions: View

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