Djam/libreoffice
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/libreoffice.git synced 2025-02-23 18:43:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Automatic import for version 3.4.5

Browse source
This commit is contained in:
Rosa 2012-04-17 15:11:02 +04:00
commit fb5fa9fe26
12 changed files with 5715 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
185d60944ea767075d27247c3162b3bc-unowinreg.dll Normal file
View file

Binary file not shown.

11
disable-qtunixeventloop.patch Normal file
View file

@ -0,0 +1,11 @@
--- ./vcl/unx/kde4/KDEXLib.cxx 2011-09-19 15:55:17.000000000 +0000
+++ ./vcl/unx/kde4/KDEXLib.cxx 2011-09-19 15:55:34.000000000 +0000
@@ -58,7 +58,7 @@
#include <stdio.h>
#if QT_VERSION >= QT_VERSION_CHECK( 4, 8, 1 )
-#define QT_UNIX_EVENT_LOOP_SUPPORT
+// #define QT_UNIX_EVENT_LOOP_SUPPORT
#ifdef KDE_HAVE_GLIB
#define GLIB_EVENT_LOOP_SUPPORT
#endif

11
glib2.31.patch Normal file
View file

@ -0,0 +1,11 @@
--- ./ucb/source/ucp/gvfs/gvfs_content.hxx 2011-11-04 18:24:28.000000000 +0000
+++ ./ucb/source/ucp/gvfs/gvfs_content.hxx 2011-11-04 18:50:10.000000000 +0000
@@ -35,7 +35,7 @@
#include <com/sun/star/ucb/XContentCreator.hpp>
#include <ucbhelper/contenthelper.hxx>
-#include <glib/gthread.h>
+#include <glib.h>
#include <libgnomevfs/gnome-vfs-ops.h>
#include <libgnomevfs/gnome-vfs-directory.h>

41
help-images-mdv64789.patch Normal file
View file

@ -0,0 +1,41 @@
--- ./xmlhelp/source/cxxhelp/provider/databases.cxx.orig3 2011-12-05 15:11:11.000000000 +0000
+++ ./xmlhelp/source/cxxhelp/provider/databases.cxx 2011-12-05 16:15:02.000000000 +0000
@@ -303,17 +303,34 @@ rtl::OString Databases::getImagesZipFile
bool bFound = false;
if ( aSymbolsStyleName.getLength() != 0 )
{
- rtl::OUString aZipName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "images_" ));
- aZipName += aSymbolsStyleName;
- aZipName += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ".zip" ));
-
+ rtl::OUString aZipName;
+ if (aSymbolsStyleName.equals( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("default")) )) {
+ aZipName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "images.zip" ));
+ } else {
+ aZipName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "images_" ));
+ aZipName += aSymbolsStyleName;
+ aZipName += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ".zip" ));
+ }
bFound = impl_getZipFile( m_aImagesZipPaths, aZipName, aImageZip );
}
+ // Fallbacks in case the configured style fle was not found
+ if ( ! bFound )
+ bFound = impl_getZipFile( m_aImagesZipPaths, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "images_oxygen.zip" )), aImageZip );
+
+ if ( ! bFound )
+ bFound = impl_getZipFile( m_aImagesZipPaths, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "images_crystal.zip" )), aImageZip );
+
if ( ! bFound )
bFound = impl_getZipFile( m_aImagesZipPaths, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "images.zip" )), aImageZip );
if ( ! bFound )
+ bFound = impl_getZipFile( m_aImagesZipPaths, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "images_tango.zip" )), aImageZip );
+
+ if ( ! bFound )
+ bFound = impl_getZipFile( m_aImagesZipPaths, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "images_hicontrast.zip" )), aImageZip );
+
+ if ( ! bFound )
aImageZip = rtl::OUString();
m_aImagesZipFileURL = rtl::OUStringToOString(

10
libreoffice-3.4.5-fpicker-kde-4.8.0-compile.patch Normal file
View file

@ -0,0 +1,10 @@
--- libreoffice-3.4.5/fpicker/source/unx/kde4/KDE4FilePicker.cxx.ark 2012-01-31 19:11:16.582876303 +0100
+++ libreoffice-3.4.5/fpicker/source/unx/kde4/KDE4FilePicker.cxx 2012-01-31 19:11:37.026875942 +0100
@@ -57,6 +57,7 @@
//kde has an enum that uses this...OO does too
#undef SETTINGS_MOUSE
+#undef SETTINGS_LOCALE
#include <kfiledialog.h>
#include <kwindowsystem.h>

25
libreoffice.rpmlintrc Normal file
View file

@ -0,0 +1,25 @@
# Lots of zero-length files in the i18n subpackages...
addFilter('E: zero-length')
# rpmlint treats some things as libraries that really aren't libraries
addFilter('E: postun-without-ldconfig')
addFilter('E: postin-without-ldconfig')
addFilter('E: non-versioned-file-in-library-package')
addFilter('E: binary-or-shlib-defines-rpath')
# Some scripts in the wizards aren't run directly - but parsed by UNO
# No need to make them executable
addFilter('E: non-executable-script')
# Let's fix builds outside the build system -- there's so many subpackages
# here that the absence of Packager: breaks the local build!
addFilter('E: no-packager-tag')
# FIXME: No idea what encoding they're really in...
addFilter('E: non-utf8-desktopfile')
addFilter('E: invalid-desktopfile')
# FIXME: Dependencies of the l10n packages should be sorted out better
# Not a priority though because directory dependencies work
addFilter('E: no-dependency-on')

5390
libreoffice.spec Normal file
View file

File diff suppressed because it is too large Load diff

138
libreoffice34-gcc462.patch Normal file
View file

@ -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);
}

11
mdv-sysui-disableslack.diff Normal file
View file

@ -0,0 +1,11 @@
--- sysui/prj/build.lst.old1 2011-08-01 18:41:26.000000000 +0000
+++ sysui/prj/build.lst 2011-08-01 18:42:37.000000000 +0000
@@ -13,7 +13,6 @@
su sysui\desktop\mandriva nmake - u su_dtmdk su_dtshare.u NULL
su sysui\desktop\freedesktop nmake - u su_dtfreedesktop su_dtredhat.u NULL
su sysui\desktop\debian nmake - u su_dtdebian su_dtshare.u NULL
-su sysui\desktop\slackware nmake - u su_dtslackware su_dtshare.u NULL
su sysui\desktop\solaris nmake - u su_dtsolaris su_dtshare.u NULL
-su sysui\desktop\util nmake - u su_desktop su_dtredhat.u su_dtsuse.u su_dtmdk.u su_dtfreedesktop.u su_dtdebian.u su_dtslackware.u NULL
+su sysui\desktop\util nmake - u su_desktop su_dtredhat.u su_dtsuse.u su_dtmdk.u su_dtfreedesktop.u su_dtdebian.u NULL
su sysui\util nmake - all su_util su_dtsolaris.u su_desktop.u su_iconsw.w NULL

31
poppler0.18.1.patch Normal file
View file

@ -0,0 +1,31 @@
--- ./sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 2011-11-14 20:32:45.000000000 +0000
+++ ./sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 2011-11-14 20:30:53.000000000 +0000
@@ -150,7 +150,7 @@ void writeBinaryBuffer( const OutputBuff
void writeJpeg_( OutputBuffer& o_rOutputBuf, Stream* str, bool bWithLinefeed )
{
// dump JPEG file as-is
-#if POPPLER_CHECK_VERSION(0, 17, 3)
+#if POPPLER_CHECK_VERSION(0, 17, 3) || POPPLER_CHECK_VERSION(0, 18, 1)
str = str->getBaseStream();
#else
str = ((DCTStream *)str)->getRawStream();
@@ -493,7 +493,7 @@ void PDFOutDev::endPage()
printf("endPage\n");
}
-#if POPPLER_CHECK_VERSION(0, 17, 0)
+#if POPPLER_CHECK_VERSION(0, 17, 0) || POPPLER_CHECK_VERSION(0, 18, 1)
void PDFOutDev::processLink(AnnotLink *link, Catalog *)
#else
void PDFOutDev::processLink(Link* link, Catalog*)
--- ./sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx 2011-11-14 20:22:04.000000000 +0000
+++ ./sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx 2011-11-14 20:22:55.000000000 +0000
@@ -201,7 +201,7 @@ namespace pdfi
// virtual void cvtDevToUser(double dx, double dy, double *ux, double *uy);
// virtual void cvtUserToDev(double ux, double uy, int *dx, int *dy);
- #if POPPLER_CHECK_VERSION(0, 17, 0)
+ #if POPPLER_CHECK_VERSION(0, 17, 0) || POPPLER_CHECK_VERSION(0, 18, 1)
virtual void processLink(AnnotLink *link, Catalog *catalog);
#else
//----- link borders

33
vbahelper.visibility.patch Normal file
View file

@ -0,0 +1,33 @@
--- vbahelper/inc/vbahelper/vbacollectionimpl.hxx 2011-01-28 20:27:51.507604173 +0000
+++ vbahelper/inc/vbahelper/vbacollectionimpl.hxx 2011-01-28 20:28:26.230045727 +0000
@@ -238,7 +238,7 @@
// including a HelperInterface implementation
template< typename Ifc1 >
-class ScVbaCollectionBase : public InheritedHelperInterfaceImpl< Ifc1 >
+class VBAHELPER_DLLPUBLIC ScVbaCollectionBase : public InheritedHelperInterfaceImpl< Ifc1 >
{
typedef InheritedHelperInterfaceImpl< Ifc1 > BaseColBase;
protected:
--- sc/Library_vbaobj.mk
+++ sc/Library_vbaobj.mk
@@ -118,7 +118,6 @@ $(eval $(call gb_Library_add_exception_objects,vbaobj,\
sc/source/ui/vba/vbaquerytable \
sc/source/ui/vba/vbarange \
sc/source/ui/vba/vbasheetobject \
- sc/source/ui/vba/vbasheetobjects \
sc/source/ui/vba/vbastyle \
sc/source/ui/vba/vbastyles \
sc/source/ui/vba/vbatextboxshape \
@@ -133,6 +132,11 @@ $(eval $(call gb_Library_add_exception_objects,vbaobj,\
sc/source/ui/vba/vbawsfunction \
))
+$(eval $(call gb_Library_add_cxxobjects,vbaobj,\
+ sc/source/ui/vba/vbasheetobjects \
+ , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
+))
+
ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD, $(OS)))
$(eval $(call gb_Library_set_ldflags,vbaobj,\
$$(LDFLAGS) \

14
xulrunner-to-mozila-plugin.pc.diff Normal file
View file

@ -0,0 +1,14 @@
diff -p -up ./extensions/source/plugin/util/makefile.pmk.orig3 ./extensions/source/plugin/util/makefile.pmk
--- extensions/source/plugin/util/makefile.pmk.orig3 2009-10-20 18:35:37.000000000 -0400
+++ extensions/source/plugin/util/makefile.pmk 2009-10-20 18:37:43.000000000 -0400
@@ -34,7 +34,9 @@ NOUNODOC=true
.IF "$(SYSTEM_MOZILLA)" == "YES"
CFLAGS+=-DSYSTEM_MOZILLA
-PKGCONFIG_MODULES+=$(MOZ_FLAVOUR)-plugin
+# our xulrunner devel package still has
+# mozila-plugin.pc intead of xulrunner-plugin.pc
+PKGCONFIG_MODULES+=mozilla-plugin
.ENDIF
.IF "$(GUIBASE)" == "unx" && "$(ENABLE_GTK)" == "TRUE"