summaryrefslogtreecommitdiff
path: root/extra/libreoffice/gcc462_buildfix.diff
diff options
context:
space:
mode:
Diffstat (limited to 'extra/libreoffice/gcc462_buildfix.diff')
-rw-r--r--extra/libreoffice/gcc462_buildfix.diff138
1 files changed, 138 insertions, 0 deletions
diff --git a/extra/libreoffice/gcc462_buildfix.diff b/extra/libreoffice/gcc462_buildfix.diff
new file mode 100644
index 000000000..c19e520dc
--- /dev/null
+++ b/extra/libreoffice/gcc462_buildfix.diff
@@ -0,0 +1,138 @@
+--- ./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;
+--- ./framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx.orig 2011-12-19 11:10:56.000000000 +0000
++++ ./framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx 2011-12-19 11:12:06.000000000 +0000
+@@ -185,6 +185,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;
+--- ./framework/inc/uiconfiguration/uiconfigurationmanager.hxx.orig 2011-12-19 11:14:17.000000000 +0000
++++ ./framework/inc/uiconfiguration/uiconfigurationmanager.hxx 2011-12-19 11:15:16.000000000 +0000
+@@ -171,6 +171,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 );
+ }
+
+--- ./framework/inc/classes/filtercachedata.hxx.orig 2011-12-17 13:14:22.102898902 +0000
++++ ./framework/inc/classes/filtercachedata.hxx 2011-12-17 13:17:51.524424012 +0000
+@@ -230,7 +230,7 @@
+ {
+ bPreferred = rCopy.bPreferred ;
+ sName = rCopy.sName ;
+- lUINames = rCopy.lUINames ;
++ lUINames = const_cast < framework::BaseHash<rtl::OUString>& > (rCopy.lUINames);
+ sMediaType = rCopy.sMediaType ;
+ sClipboardFormat = rCopy.sClipboardFormat;
+ nDocumentIconID = rCopy.nDocumentIconID ;
+@@ -298,7 +298,7 @@
+ nOrder = rCopy.nOrder ;
+ sName = rCopy.sName ;
+ sType = rCopy.sType ;
+- lUINames = rCopy.lUINames ;
++ lUINames = const_cast < framework::BaseHash<rtl::OUString>& > (rCopy.lUINames);
+ sDocumentService = rCopy.sDocumentService ;
+ sFilterService = rCopy.sFilterService ;
+ sUIComponent = rCopy.sUIComponent ;
+@@ -405,7 +405,7 @@
+ inline Loader& impl_copy( const Loader& rCopy )
+ {
+ sName = rCopy.sName ;
+- lUINames = rCopy.lUINames ;
++ lUINames = const_cast < framework::BaseHash<rtl::OUString>& > (rCopy.lUINames);
+ lTypes = rCopy.lTypes ;
+ return (*this);
+ }
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-07-09 07:08:25 +0000