[Libreoffice-commits] .: libcdr/libcdr-0.0.6.patch libcdr/libcdr-0.0.7.patch libcdr/makefile.mk ooo.lst.in
libcdr/libcdr-0.0.6.patch | 20 libcdr/libcdr-0.0.7.patch | 20 libcdr/makefile.mk|4 ++-- ooo.lst.in|2 +- 4 files changed, 23 insertions(+), 23 deletions(-) New commits: commit 17d08197761567f72f8b58c8aa71bac31701968e Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Tue Apr 24 15:54:12 2012 +0200 uploading new shiny libcdr-0.0.7 release diff --git a/libcdr/libcdr-0.0.6.patch b/libcdr/libcdr-0.0.6.patch deleted file mode 100644 index d8bd05c..000 --- a/libcdr/libcdr-0.0.6.patch +++ /dev/null @@ -1,20 +0,0 @@ misc/libcdr-0.0.6/src/lib/libcdr_utils.h 2012-03-07 13:51:21.0 +0100 -+++ misc/build/libcdr-0.0.6/src/lib/libcdr_utils.h 2012-03-08 12:46:38.194534604 +0100 -@@ -54,17 +54,8 @@ - - #else - --#ifdef HAVE_CONFIG_H --#include config.h --#endif -- --#ifdef HAVE_STDINT_H - #include stdint.h --#endif -- --#ifdef HAVE_INTTYPES_H - #include inttypes.h --#endif - - #endif - diff --git a/libcdr/libcdr-0.0.7.patch b/libcdr/libcdr-0.0.7.patch new file mode 100644 index 000..40d021a --- /dev/null +++ b/libcdr/libcdr-0.0.7.patch @@ -0,0 +1,20 @@ +--- misc/libcdr-0.0.7/src/lib/libcdr_utils.h 2012-03-07 13:51:21.0 +0100 misc/build/libcdr-0.0.7/src/lib/libcdr_utils.h 2012-03-08 12:46:38.194534604 +0100 +@@ -54,17 +54,8 @@ + + #else + +-#ifdef HAVE_CONFIG_H +-#include config.h +-#endif +- +-#ifdef HAVE_STDINT_H + #include stdint.h +-#endif +- +-#ifdef HAVE_INTTYPES_H + #include inttypes.h +-#endif + + #endif + diff --git a/libcdr/makefile.mk b/libcdr/makefile.mk index cf8c414..85c8025 100644 --- a/libcdr/makefile.mk +++ b/libcdr/makefile.mk @@ -59,8 +59,8 @@ INCPRE+=$(LCMS2_CFLAGS) INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/lcms2 .ENDIF -TARFILE_NAME=libcdr-0.0.6 -TARFILE_MD5=44d0c579b342f6cdbc0f76534c5d29b2 +TARFILE_NAME=libcdr-0.0.7 +TARFILE_MD5=c216ded0275129ccfef44fbc236ac16a PATCH_FILES=\ $(TARFILE_NAME).patch diff --git a/ooo.lst.in b/ooo.lst.in index 04dfa6b..170ee57 100644 --- a/ooo.lst.in +++ b/ooo.lst.in @@ -90,7 +90,7 @@ f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 2fa6028324347860e684e75310818d43-libvisio-0.0.16.tar.bz2 e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip 7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz -44d0c579b342f6cdbc0f76534c5d29b2-libcdr-0.0.6.tar.bz2 +c216ded0275129ccfef44fbc236ac16a-libcdr-0.0.7.tar.bz2 327348d67c979c88c2dec59a23a17d85-lcms2-2.3.tar.gz @GOOGLE_DOCS_EXTENSION_PACK@ @FREETYPE_TARBALL@ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: libcdr/libcdr-0.0.7-clang.patch libcdr/makefile.mk
libcdr/libcdr-0.0.7-clang.patch | 112
libcdr/makefile.mk |3 -
2 files changed, 114 insertions(+), 1 deletion(-)
New commits:
commit 9886c392383007ff86c849f61c641e4603f13259
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Tue Apr 24 16:57:51 2012 +0200
Patch to build libcdr with clang
diff --git a/libcdr/libcdr-0.0.7-clang.patch b/libcdr/libcdr-0.0.7-clang.patch
new file mode 100644
index 000..fd5e163
--- /dev/null
+++ b/libcdr/libcdr-0.0.7-clang.patch
@@ -0,0 +1,112 @@
+--- misc/libcdr-0.0.7/src/lib/CDRCollector.cpp 2012-04-24 13:25:22.0
+0200
misc/build/libcdr-0.0.7/src/lib/CDRCollector.cpp 2012-04-24
16:54:16.083829620 +0200
+@@ -30,6 +30,7 @@
+ #include math.h
+ #include string.h
+ #include CDRCollector.h
++#include libcdr_utils.h
+
+ libcdr::CDRParserState::CDRParserState()
+ : m_fillStyles(), m_lineStyles(), m_bmps(), m_patterns(), m_vects(),
m_pages(),
+--- misc/libcdr-0.0.7/src/lib/CDRCollector.h 2012-04-24 13:12:28.0
+0200
misc/build/libcdr-0.0.7/src/lib/CDRCollector.h 2012-04-24
16:54:16.084829635 +0200
+@@ -42,32 +42,7 @@
+
+ namespace
+ {
+-int cdr_round(double d)
+-{
+- return (d0) ? int(d+0.5) : int(d-0.5);
+-}
+-
+-void writeU16(WPXBinaryData buffer, const int value)
+-{
+- buffer.append((unsigned char)(value 0xFF));
+- buffer.append((unsigned char)((value 8) 0xFF));
+-}
+-
+-void writeU32(WPXBinaryData buffer, const int value)
+-{
+- buffer.append((unsigned char)(value 0xFF));
+- buffer.append((unsigned char)((value 8) 0xFF));
+- buffer.append((unsigned char)((value 16) 0xFF));
+- buffer.append((unsigned char)((value 24) 0xFF));
+-}
+-
+-void writeU8(WPXBinaryData buffer, const int value)
+-{
+- buffer.append((unsigned char)(value 0xFF));
+-}
+-
+ #include CDRColorProfiles.h
+-
+ }
+
+ namespace libcdr
+--- misc/libcdr-0.0.7/src/lib/CDRParser.cpp2012-04-24 15:40:42.0
+0200
misc/build/libcdr-0.0.7/src/lib/CDRParser.cpp 2012-04-24
16:54:16.084829635 +0200
+@@ -466,7 +466,7 @@
+ m_collector-collectObject(level);
+ else if (listType == FOURCC_grp)
+ m_collector-collectGroup(level);
+- else if ((listType 0xff) == FOURCC_CDR || (listType 0xff)
== FOURCC_cdr)
++ else if ((listType 0xff) == FOURCC_CDR || (listType 0xff)
== FOURCC_cdr)
+ m_version = getCDRVersion((listType 0xff00) 24);
+ else if (listType == FOURCC_vect)
+ m_collector-collectVect(level);
+--- misc/libcdr-0.0.7/src/lib/libcdr_utils.cpp 2012-04-24 13:11:13.0
+0200
misc/build/libcdr-0.0.7/src/lib/libcdr_utils.cpp 2012-04-24
16:54:16.085829649 +0200
+@@ -139,6 +139,30 @@
+ return ((double)fixedPointNumberIntegerPart +
fixedPointNumberFractionalPart);
+ }
+
++int libcdr::cdr_round(double d)
++{
++ return (d0) ? int(d+0.5) : int(d-0.5);
++}
++
++void libcdr::writeU16(WPXBinaryData buffer, const int value)
++{
++ buffer.append((unsigned char)(value 0xFF));
++ buffer.append((unsigned char)((value 8) 0xFF));
++}
++
++void libcdr::writeU32(WPXBinaryData buffer, const int value)
++{
++ buffer.append((unsigned char)(value 0xFF));
++ buffer.append((unsigned char)((value 8) 0xFF));
++ buffer.append((unsigned char)((value 16) 0xFF));
++ buffer.append((unsigned char)((value 24) 0xFF));
++}
++
++void libcdr::writeU8(WPXBinaryData buffer, const int value)
++{
++ buffer.append((unsigned char)(value 0xFF));
++}
++
+ #ifdef DEBUG
+ const char *libcdr::toFourCC(unsigned value, bool bigEndian)
+ {
+--- misc/libcdr-0.0.7/src/lib/libcdr_utils.h 2012-04-24 16:54:56.803806935
+0200
misc/build/libcdr-0.0.7/src/lib/libcdr_utils.h 2012-04-24
16:54:16.085829649 +0200
+@@ -35,6 +35,7 @@
+ #include string
+ #include math.h
+ #include libwpd-stream/libwpd-stream.h
++#include libwpd/libwpd.h
+
+ #ifndef M_PI
+ #define M_PI 3.14159265358979323846
+@@ -90,6 +91,12 @@
+
+ double readFixedPoint(WPXInputStream *input, bool bigEndian=false);
+
++int cdr_round(double d);
++
++void writeU8(WPXBinaryData buffer, const int value);
++void writeU16(WPXBinaryData buffer, const int value);
++void writeU32(WPXBinaryData buffer, const int value);
++
+ #ifdef DEBUG
+ const char *toFourCC(unsigned value, bool bigEndian=false);
+ #endif
diff --git a/libcdr/makefile.mk b/libcdr/makefile.mk
index 85c8025..62eeb70 100644
--- a/libcdr/makefile.mk
+++ b/libcdr/makefile.mk
@@ -63,7 +63,8 @@ TARFILE_NAME=libcdr-0.0.7
TARFILE_MD5=c216ded0275129ccfef44fbc236ac16a
PATCH_FILES=\
-$(TARFILE_NAME).patch
+$(TARFILE_NAME).patch \
+ $(TARFILE_NAME)-clang.patch
BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
BUILD_DIR=src$/lib
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: writerperfect/Library_wpftwriter.mk writerperfect/source
writerperfect/Library_wpftwriter.mk |1
writerperfect/source/writer/MSWorksImportFilter.cxx | 19 ++--
writerperfect/source/writer/MSWorksImportFilter.hxx | 11 +-
writerperfect/source/writer/WordPerfectImportFilter.cxx | 47 ---
writerperfect/source/writer/WordPerfectImportFilter.hxx | 21 +---
writerperfect/source/writer/wpftwriter_genericfilter.cxx | 64 ---
6 files changed, 65 insertions(+), 98 deletions(-)
New commits:
commit 0853a4d868bd2dff171c73cc1e495fa03320f7b1
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Fri Apr 20 15:37:25 2012 +0200
Monkey sberg's work for the other writerperfect library
diff --git a/writerperfect/Library_wpftwriter.mk
b/writerperfect/Library_wpftwriter.mk
index 6110035..047f2cf 100644
--- a/writerperfect/Library_wpftwriter.mk
+++ b/writerperfect/Library_wpftwriter.mk
@@ -41,6 +41,7 @@ $(eval $(call gb_Library_use_api,wpftwriter,\
))
$(eval $(call gb_Library_use_libraries,wpftwriter,\
+ comphelper \
cppu \
cppuhelper \
vcl \
diff --git a/writerperfect/source/writer/MSWorksImportFilter.cxx
b/writerperfect/source/writer/MSWorksImportFilter.cxx
index 2cca078..5712703 100644
--- a/writerperfect/source/writer/MSWorksImportFilter.cxx
+++ b/writerperfect/source/writer/MSWorksImportFilter.cxx
@@ -32,26 +32,30 @@
#include osl/diagnose.h
#include rtl/tencinfo.h
-#include com/sun/star/lang/XMultiServiceFactory.hpp
#include com/sun/star/io/XInputStream.hpp
#include com/sun/star/xml/sax/XAttributeList.hpp
#include com/sun/star/xml/sax/XDocumentHandler.hpp
#include com/sun/star/xml/sax/InputSource.hpp
#include com/sun/star/xml/sax/XParser.hpp
+#include com/sun/star/io/XSeekable.hpp
+#include com/sun/star/uno/Reference.h
#include com/sun/star/ucb/XCommandEnvironment.hpp
+#include comphelper/componentcontext.hxx
#include xmloff/attrlist.hxx
#include ucbhelper/content.hxx
+#include libwps/libwps.h
+
#include filter/FilterInternal.hxx
#include filter/DocumentHandler.hxx
#include filter/OdtGenerator.hxx
+#include MSWorksImportFilter.hxx
#include stream/WPXSvStream.h
-#include libwps/WPSDocument.h
-#include MSWorksImportFilter.hxx
+#include iostream
-// using namespace ::rtl;
+using namespace ::com::sun::star::uno;
using rtl::OString;
using rtl::OUString;
using com::sun::star::uno::Sequence;
@@ -61,7 +65,6 @@ using com::sun::star::uno::UNO_QUERY;
using com::sun::star::uno::XInterface;
using com::sun::star::uno::Exception;
using com::sun::star::uno::RuntimeException;
-using com::sun::star::lang::XMultiServiceFactory;
using com::sun::star::beans::PropertyValue;
using com::sun::star::document::XFilter;
using com::sun::star::document::XExtendedFilterDetection;
@@ -102,7 +105,7 @@ throw (RuntimeException)
// An XML import service: what we push sax messages to..
OUString sXMLImportService ( RTL_CONSTASCII_USTRINGPARAM (
com.sun.star.comp.Writer.XMLOasisImporter ) );
-Reference XDocumentHandler xInternalHandler( mxMSF-createInstance(
sXMLImportService ), UNO_QUERY );
+Reference XDocumentHandler xInternalHandler(
comphelper::ComponentContext( mxContext ).createComponent( sXMLImportService ),
UNO_QUERY );
// The XImporter sets up an empty target document for XDocumentHandler to
write to..
Reference XImporter xImporter(xInternalHandler, UNO_QUERY);
@@ -251,10 +254,10 @@ throw (RuntimeException)
#undef SERVICE_NAME2
#undef SERVICE_NAME1
-Reference XInterface SAL_CALL MSWorksImportFilter_createInstance( const
Reference XMultiServiceFactory rSMgr)
+Reference XInterface SAL_CALL MSWorksImportFilter_createInstance( const
Reference XComponentContext rContext)
throw( Exception )
{
-return (cppu::OWeakObject *) new MSWorksImportFilter( rSMgr );
+return (cppu::OWeakObject *) new MSWorksImportFilter( rContext );
}
// XServiceInfo
diff --git a/writerperfect/source/writer/MSWorksImportFilter.hxx
b/writerperfect/source/writer/MSWorksImportFilter.hxx
index 6ef5485..db679eb 100644
--- a/writerperfect/source/writer/MSWorksImportFilter.hxx
+++ b/writerperfect/source/writer/MSWorksImportFilter.hxx
@@ -35,6 +35,7 @@
#include com/sun/star/document/XExtendedFilterDetection.hpp
#include com/sun/star/lang/XInitialization.hpp
#include com/sun/star/lang/XServiceInfo.hpp
+#include com/sun/star/uno/XComponentContext.hpp
#include com/sun/star/xml/sax/XDocumentHandler.hpp
#include cppuhelper/implbase5.hxx
@@ -51,8 +52,7 @@ class MSWorksImportFilter : public cppu::WeakImplHelper5
{
protected:
-// oo.org declares
-::com::sun::star::uno::Reference
::com::sun::star::lang::XMultiServiceFactory mxMSF;
+::com::sun::star::uno::Reference ::com::sun::star::uno::XComponentContext
mxContext;
::com::sun::star::uno::Reference ::com::sun::star::lang::XComponent
mxDoc;
::rtl::OUString msFilterName;
::com::sun::star::uno::Reference
::com::sun::star::xml::sax::XDocumentHandler
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 3 commits - sax/qa sax/source xmloff/source
sax/qa/cppunit/test_converter.cxx | 72 +
sax/source/tools/converter.cxx| 155 +++---
xmloff/source/core/xmluconv.cxx |2
3 files changed, 217 insertions(+), 12 deletions(-)
New commits:
commit 3186b307260cf4e633c252022b803dcf6f31273c
Author: Michael Stahl mst...@redhat.com
Date: Fri Apr 20 18:39:36 2012 +0200
fdo#48969: add unit test for Converter::convertDouble
Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch
diff --git a/sax/qa/cppunit/test_converter.cxx
b/sax/qa/cppunit/test_converter.cxx
index 4a3d364..a8dad87 100644
--- a/sax/qa/cppunit/test_converter.cxx
+++ b/sax/qa/cppunit/test_converter.cxx
@@ -39,11 +39,13 @@
#include com/sun/star/util/DateTime.hpp
#include com/sun/star/util/Date.hpp
#include com/sun/star/util/Duration.hpp
+#include com/sun/star/util/MeasureUnit.hpp
#include sax/tools/converter.hxx
using namespace ::com::sun::star;
+using namespace ::com::sun::star::util::MeasureUnit;
using sax::Converter;
@@ -58,10 +60,12 @@ public:
void testDuration();
void testDateTime();
+void testDouble();
CPPUNIT_TEST_SUITE(ConverterTest);
CPPUNIT_TEST(testDuration);
CPPUNIT_TEST(testDateTime);
+CPPUNIT_TEST(testDouble);
CPPUNIT_TEST_SUITE_END();
private:
@@ -249,6 +253,74 @@ void ConverterTest::testDateTime()
OSL_TRACE(\nSAX CONVERTER TEST END);
}
+void doTestDouble(char const*const pis, double const rd,
+sal_Int16 const nSourceUnit, sal_Int16 const nTargetUnit)
+{
+::rtl::OUString const is(::rtl::OUString::createFromAscii(pis));
+double od;
+bool bSuccess(Converter::convertDouble(od, is, nSourceUnit, nTargetUnit));
+OSL_TRACE(%f, od);
+CPPUNIT_ASSERT(bSuccess);
+CPPUNIT_ASSERT_DOUBLES_EQUAL(rd, od, 0.0001);
+::rtl::OUStringBuffer buf;
+Converter::convertDouble(buf, od, true, nTargetUnit, nSourceUnit);
+OSL_TRACE(%s,
+::rtl::OUStringToOString(buf.getStr(),
RTL_TEXTENCODING_UTF8).getStr());
+CPPUNIT_ASSERT_EQUAL(is, buf.makeStringAndClear());
+}
+
+void ConverterTest::testDouble()
+{
+doTestDouble(42, 42.0, TWIP, TWIP);
+doTestDouble(42, 42.0, POINT, POINT);
+doTestDouble(42, 42.0, MM_100TH, MM_100TH);
+doTestDouble(42, 42.0, MM_10TH, MM_10TH);
+doTestDouble(42, 42.0, MM, MM); // identity don't seem to add unit?
+doTestDouble(42, 42.0, CM, CM);
+doTestDouble(42, 42.0, INCH, INCH);
+doTestDouble(2pt, 40.0, POINT, TWIP);
+doTestDouble(20pc, 1, TWIP, POINT);
+doTestDouble(4, 2.26771653543307, MM_100TH, TWIP);
+doTestDouble(4, 22.6771653543307, MM_10TH, TWIP);
+doTestDouble(4mm, 226.771653543307, MM, TWIP);
+doTestDouble(4cm, 2267.71653543307, CM, TWIP);
+doTestDouble(4in, 5760.0, INCH, TWIP);
+doTestDouble(1440pc, 1.0, TWIP, INCH);
+doTestDouble(567pc, 1.000125, TWIP, CM);
+doTestDouble(56.7pc, 1.000125, TWIP, MM);
+doTestDouble(5.67pc, 1.000125, TWIP, MM_10TH);
+doTestDouble(0.567pc, 1.000125, TWIP, MM_100TH);
+doTestDouble(42pt, 1.48166, POINT, CM);
+doTestDouble(42pt, 14.8166, POINT, MM);
+doTestDouble(42pt, 148.166, POINT, MM_10TH);
+doTestDouble(42pt, 1481.66, POINT, MM_100TH);
+doTestDouble(72pt, 1.0, POINT, INCH);
+doTestDouble(3.5in, 8.89, INCH, CM);
+doTestDouble(3.5in, 88.9, INCH, MM);
+doTestDouble(3.5in, 889.0, INCH, MM_10TH);
+doTestDouble(3.5in, 8890.0, INCH, MM_100TH);
+doTestDouble(2in, 144, INCH, POINT);
+doTestDouble(5.08cm, 2.0, CM, INCH);
+doTestDouble(3.5cm, 3500.0, CM, MM_100TH);
+doTestDouble(3.5cm, 350.0, CM, MM_10TH);
+doTestDouble(3.5cm, 35.0, CM, MM);
+doTestDouble(10cm, 283.464566929134, CM, POINT);
+doTestDouble(0.5cm, 283.464566929134, CM, TWIP);
+doTestDouble(10mm, 28.3464566929134, MM, POINT);
+doTestDouble(0.5mm, 28.3464566929134, MM, TWIP);
+doTestDouble(10, 2.83464566929134, MM_10TH, POINT);
+doTestDouble(0.5, 2.83464566929134, MM_10TH, TWIP);
+doTestDouble(10, 0.283464566929134, MM_100TH, POINT);
+doTestDouble(0.5, 0.283464566929134, MM_100TH, TWIP);
+doTestDouble(10mm, 1.0, MM, CM);
+doTestDouble(10mm, 100.0, MM, MM_10TH);
+doTestDouble(20mm, 2000.0, MM, MM_100TH);
+doTestDouble(300, 30.0, MM_10TH, MM);
+doTestDouble(400, 4.0, MM_100TH, MM);
+doTestDouble(600, 6000.0, MM_10TH, MM_100TH);
+doTestDouble(700, 70.0, MM_100TH, MM_10TH);
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(ConverterTest);
}
commit 124881b16fee79be683507928c06ce54a5a2543e
Author: Michael Stahl mst...@redhat.com
Date: Fri Apr 20 18:36:16 2012 +0200
fdo#48969: GetConversionFactor: add inch as source unit
Also, add whole bunch of missing cases while at it.
Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch
diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx
index cf5a5b5..51be183 100644
---
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sax/qa
sax/qa/cppunit/test_converter.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 580a7f24c373cd8cf068fc92fdb153025e6d0a1d Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Fri Apr 20 22:30:26 2012 +0200 Minor backporting fix Signed-off-by: Michael Stahl mst...@redhat.com diff --git a/sax/qa/cppunit/test_converter.cxx b/sax/qa/cppunit/test_converter.cxx index a8dad87..023177f 100644 --- a/sax/qa/cppunit/test_converter.cxx +++ b/sax/qa/cppunit/test_converter.cxx @@ -266,7 +266,7 @@ void doTestDouble(char const*const pis, double const rd, Converter::convertDouble(buf, od, true, nTargetUnit, nSourceUnit); OSL_TRACE(%s, ::rtl::OUStringToOString(buf.getStr(), RTL_TEXTENCODING_UTF8).getStr()); -CPPUNIT_ASSERT_EQUAL(is, buf.makeStringAndClear()); +CPPUNIT_ASSERT(buf.makeStringAndClear().equals(is)); } void ConverterTest::testDouble() ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.in filter/Configuration_filter.mk filter/source writerperfect/Library_cdrimport.mk writerperfect/source
Exchange/value
+/prop
+prop oor:name=ClipboardFormat/
+/node
diff --git a/writerperfect/Library_cdrimport.mk
b/writerperfect/Library_cdrimport.mk
index a6b05b0..257757c 100644
--- a/writerperfect/Library_cdrimport.mk
+++ b/writerperfect/Library_cdrimport.mk
@@ -65,6 +65,7 @@ $(eval $(call gb_Library_use_externals,cdrimport,\
$(eval $(call gb_Library_add_exception_objects,cdrimport,\
writerperfect/source/cdrimp/CDRImportFilter \
+ writerperfect/source/cdrimp/CMXImportFilter \
writerperfect/source/cdrimp/cdrimport_genericfilter \
))
diff --git a/writerperfect/source/cdrimp/CDRImportFilter.cxx
b/writerperfect/source/cdrimp/CDRImportFilter.cxx
index 9187689..2476a55 100644
--- a/writerperfect/source/cdrimp/CDRImportFilter.cxx
+++ b/writerperfect/source/cdrimp/CDRImportFilter.cxx
@@ -139,7 +139,6 @@ throw (::com::sun::star::lang::IllegalArgumentException,
RuntimeException)
#ifdef DEBUG
std::cerr CDRImportFilter::setTargetDocument std::endl;
#endif
-meType = FILTER_IMPORT;
mxDoc = xDoc;
}
diff --git a/writerperfect/source/cdrimp/CDRImportFilter.hxx
b/writerperfect/source/cdrimp/CDRImportFilter.hxx
index 8f52805..56f124e 100644
--- a/writerperfect/source/cdrimp/CDRImportFilter.hxx
+++ b/writerperfect/source/cdrimp/CDRImportFilter.hxx
@@ -27,8 +27,8 @@
/* This product is not manufactured, approved, or supported by
* Corel Corporation or Corel Corporation Limited.
*/
-#ifndef _VISIOIMPORTFILTER_HXX
-#define _VISIOIMPORTFILTER_HXX
+#ifndef _CDRIMPORTFILTER_HXX
+#define _CDRIMPORTFILTER_HXX
#include com/sun/star/document/XFilter.hpp
#include com/sun/star/document/XImporter.hpp
@@ -40,11 +40,6 @@
#include stdio.h
-enum FilterType
-{
-FILTER_IMPORT,
-FILTER_EXPORT
-};
/* This component will be instantiated for both import or export. Whether it
calls
* setSourceDocument or setTargetDocument determines which Impl function the
filter
* member calls */
@@ -64,11 +59,9 @@ protected:
::rtl::OUString msFilterName;
::com::sun::star::uno::Reference
::com::sun::star::xml::sax::XDocumentHandler mxHandler;
-FilterType meType;
-
public:
CDRImportFilter( const ::com::sun::star::uno::Reference
::com::sun::star::lang::XMultiServiceFactory rxMSF)
-: mxMSF( rxMSF ), meType((FilterType)0) {}
+: mxMSF( rxMSF ) {}
virtual ~CDRImportFilter() {}
// XFilter
diff --git a/writerperfect/source/cdrimp/CMXImportFilter.cxx
b/writerperfect/source/cdrimp/CMXImportFilter.cxx
new file mode 100644
index 000..76a9d06
--- /dev/null
+++ b/writerperfect/source/cdrimp/CMXImportFilter.cxx
@@ -0,0 +1,276 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* CMXImportFilter: Sets up the filter, and calls OdgExporter
+ * to do the actual filtering
+ *
+ * Copyright (C) 2000 by Sun Microsystems, Inc.
+ * Copyright (C) 2002-2004 William Lachance (wl...@interlog.com)
+ * Copyright (C) 2004 Net Integration Technologies (http://www.net-itech.com)
+ * Copyright (C) 2004-2006 Fridrich Strba fridrich.st...@bluewin.ch
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ *
+ * Contributor(s): Martin Gallwey (gall...@sun.com)
+ *
+ */
+
+/* This product is not manufactured, approved, or supported by
+ * Corel Corporation or Corel Corporation Limited.
+ */
+
+#include osl/diagnose.h
+#include rtl/tencinfo.h
+
+#include com/sun/star/lang/XMultiServiceFactory.hpp
+#include com/sun/star/io/XInputStream.hpp
+#include com/sun/star/xml/sax/XAttributeList.hpp
+#include com/sun/star/xml/sax/XDocumentHandler.hpp
+#include com/sun/star/xml/sax/InputSource.hpp
+#include com/sun/star/xml/sax/XParser.hpp
+#include com/sun/star/io/XSeekable.hpp
+#include com/sun/star/uno/Reference.h
+
+#include xmloff/attrlist.hxx
+
+#include libcdr/libcdr.h
+#include filter/DocumentHandler.hxx
+#include filter/OdgGenerator.hxx
+#include CMXImportFilter.hxx
+#include stream/WPXSvStream.h
+
+#include iostream
+
+using namespace ::com::sun::star::uno;
+using com::sun::star::uno::Reference;
+using com::sun::star::io::XInputStream;
+using com::sun::star::io::XSeekable;
+using com::sun::star::uno::Sequence;
+using namespace ::rtl;
+using rtl::OString;
+using rtl::OUString;
+using com::sun::star::uno::Sequence;
+using com::sun::star
[Libreoffice-commits] .: writerperfect/util
writerperfect/util/cdrfilter.component |4 1 file changed, 4 insertions(+) New commits: commit 415157afaffe31090032745516e506e104aa2108 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Thu Apr 19 11:30:11 2012 +0200 cdrfilter.component has now two filters inside diff --git a/writerperfect/util/cdrfilter.component b/writerperfect/util/cdrfilter.component index 44beeae..be1e77c 100644 --- a/writerperfect/util/cdrfilter.component +++ b/writerperfect/util/cdrfilter.component @@ -5,4 +5,8 @@ service name=com.sun.star.document.ImportFilter/ service name=com.sun.star.document.ExtendedTypeDetection/ /implementation + implementation name=com.sun.star.comp.Draw.CMXImportFilter +service name=com.sun.star.document.ImportFilter/ +service name=com.sun.star.document.ExtendedTypeDetection/ + /implementation /component ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: writerperfect/source writerperfect/util
writerperfect/source/cdrimp/cdrimport_genericfilter.cxx |2 +-
writerperfect/source/vsdimp/visioimport_genericfilter.cxx |2 +-
writerperfect/source/wpdimp/wpft_genericfilter.cxx|2 +-
writerperfect/source/wpgimp/wpgimport_genericfilter.cxx |2 +-
writerperfect/source/wpsimp/msworks_genericfilter.cxx |2 +-
writerperfect/util/cdrfilter.component|2 +-
writerperfect/util/msworksfilter.component|2 +-
writerperfect/util/visiofilter.component |2 +-
writerperfect/util/wpft.component |2 +-
writerperfect/util/wpgfilter.component|2 +-
10 files changed, 10 insertions(+), 10 deletions(-)
New commits:
commit d77b839868491d2d97081be9592e7860fcdea063
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Thu Apr 19 12:00:15 2012 +0200
Prefix the UNO components in writerperfect
diff --git a/writerperfect/source/cdrimp/cdrimport_genericfilter.cxx
b/writerperfect/source/cdrimp/cdrimport_genericfilter.cxx
index ced5137..5612610 100644
--- a/writerperfect/source/cdrimp/cdrimport_genericfilter.cxx
+++ b/writerperfect/source/cdrimp/cdrimport_genericfilter.cxx
@@ -42,7 +42,7 @@ using namespace ::com::sun::star::registry;
extern C
{
-SAL_DLLPUBLIC_EXPORT void *SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void *SAL_CALL cdrfilter_component_getFactory(
const sal_Char *pImplName, void *pServiceManager, void * /*
pRegistryKey */ )
{
void *pRet = 0;
diff --git a/writerperfect/source/vsdimp/visioimport_genericfilter.cxx
b/writerperfect/source/vsdimp/visioimport_genericfilter.cxx
index bfed51a..04172b0 100644
--- a/writerperfect/source/vsdimp/visioimport_genericfilter.cxx
+++ b/writerperfect/source/vsdimp/visioimport_genericfilter.cxx
@@ -41,7 +41,7 @@ using namespace ::com::sun::star::registry;
extern C
{
-SAL_DLLPUBLIC_EXPORT void *SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void *SAL_CALL visiofilter_component_getFactory(
const sal_Char *pImplName, void *pServiceManager, void * /*
pRegistryKey */ )
{
void *pRet = 0;
diff --git a/writerperfect/source/wpdimp/wpft_genericfilter.cxx
b/writerperfect/source/wpdimp/wpft_genericfilter.cxx
index 8e3534b..5e0f141 100644
--- a/writerperfect/source/wpdimp/wpft_genericfilter.cxx
+++ b/writerperfect/source/wpdimp/wpft_genericfilter.cxx
@@ -40,7 +40,7 @@ using namespace ::com::sun::star::registry;
extern C
{
-SAL_DLLPUBLIC_EXPORT void *SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void *SAL_CALL wpft_component_getFactory(
const sal_Char *pImplName, void *pServiceManager, void * /*
pRegistryKey */ )
{
void *pRet = 0;
diff --git a/writerperfect/source/wpgimp/wpgimport_genericfilter.cxx
b/writerperfect/source/wpgimp/wpgimport_genericfilter.cxx
index 2870915..22e99d8 100644
--- a/writerperfect/source/wpgimp/wpgimport_genericfilter.cxx
+++ b/writerperfect/source/wpgimp/wpgimport_genericfilter.cxx
@@ -41,7 +41,7 @@ using namespace ::com::sun::star::registry;
extern C
{
-SAL_DLLPUBLIC_EXPORT void *SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void *SAL_CALL wpgfilter_component_getFactory(
const sal_Char *pImplName, void *pServiceManager, void * /*
pRegistryKey */ )
{
void *pRet = 0;
diff --git a/writerperfect/source/wpsimp/msworks_genericfilter.cxx
b/writerperfect/source/wpsimp/msworks_genericfilter.cxx
index b53707c..ae9c701 100644
--- a/writerperfect/source/wpsimp/msworks_genericfilter.cxx
+++ b/writerperfect/source/wpsimp/msworks_genericfilter.cxx
@@ -41,7 +41,7 @@ using namespace ::com::sun::star::registry;
extern C
{
-SAL_DLLPUBLIC_EXPORT void *SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void *SAL_CALL msworksfilter_component_getFactory(
const sal_Char *pImplName, void *pServiceManager, void * /*
pRegistryKey */ )
{
void *pRet = 0;
diff --git a/writerperfect/util/cdrfilter.component
b/writerperfect/util/cdrfilter.component
index be1e77c..902bf9a 100644
--- a/writerperfect/util/cdrfilter.component
+++ b/writerperfect/util/cdrfilter.component
@@ -1,5 +1,5 @@
?xml version=1.0 encoding=UTF-8?
-component loader=com.sun.star.loader.SharedLibrary
+component loader=com.sun.star.loader.SharedLibrary prefix=cdrfilter
xmlns=http://openoffice.org/2010/uno-components;
implementation name=com.sun.star.comp.Draw.CDRImportFilter
service name=com.sun.star.document.ImportFilter/
diff --git a/writerperfect/util/msworksfilter.component
b/writerperfect/util/msworksfilter.component
index 769eaf3..8fc2120 100644
--- a/writerperfect/util/msworksfilter.component
+++ b/writerperfect/util/msworksfilter.component
@@ -1,5 +1,5 @@
?xml version=1.0 encoding=UTF-8?
-component loader=com.sun.star.loader.SharedLibrary
+component loader=com.sun.star.loader.SharedLibrary prefix=msworksfilter
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - bin/lo-pack-sources bin/unpack-sources download
bin/lo-pack-sources | 11 +--
bin/unpack-sources | 18 +-
download| 16 +---
3 files changed, 23 insertions(+), 22 deletions(-)
New commits:
commit fcb1cc5f3788ae1ae3309159d66111767e8781fe
Author: Petr Mladek pmla...@suse.cz
Date: Mon Apr 16 17:16:32 2012 +0200
allow to download main source tarballs again
The file core.ver was removed in configure together with other core.*
files. It was ugly name. Better to use sources.ver and the variable
lo_sources_ver=...
The source version is not used in unpack-sources, so do not source the
.ver file
at all.
The source tarballs are put into major.minor.micro version subdirectory
on the download site now.
Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch
diff --git a/bin/lo-pack-sources b/bin/lo-pack-sources
index b57ae1b..11fcd74 100755
--- a/bin/lo-pack-sources
+++ b/bin/lo-pack-sources
@@ -117,14 +117,13 @@ sub run_autoreconf($$)
cd - /dev/null 21) die Error: autoreconf failed: $!\n;
}
-sub generate_version_file($$$)
+sub generate_sources_version_file($$)
{
-my ($dir, $piece, $release_version) = @_;
+my ($dir, $release_version) = @_;
-# FIXME: crazy hacks to copy libreoffice-build without too big and useless
subdirectories and to show a progress
-open (VERFILE, $dir/$piece.ver) || die Can't open $dir/lo-$piece.ver:
$!\n;
+open (VERFILE, $dir/sources.ver) || die Can't open $dir/sources.ver:
$!\n;
-print VERFILE lo_core_ver=$release_version\n;
+print VERFILE lo_sources_ver=$release_version\n;
close VERFILE;
}
@@ -248,7 +247,7 @@ sub prepare_piece_sources()
my $temp_dir = copy_lo_piece_to_tempdir($piece_dir, $piece,
$piece_tarball_name);
generate_lo_piece_changelog($piece_dir, $temp_dir/$piece_tarball_name,
$piece);
run_autoreconf($temp_dir/$piece_tarball_name, $piece) if ($piece eq
'core');
-generate_version_file($temp_dir/$piece_tarball_name, $piece,
$release_version) if ($piece eq 'core');
+generate_sources_version_file($temp_dir/$piece_tarball_name,
$release_version) if ($piece eq 'core');
return $temp_dir;
}
diff --git a/bin/unpack-sources b/bin/unpack-sources
index 271a5e3..0fe4499 100755
--- a/bin/unpack-sources
+++ b/bin/unpack-sources
@@ -78,13 +78,12 @@ if ! test -f $start_dir/Repository.mk -a -f
$start_dir/solenv/inc/target.mk ; th
exit 1;
fi
-if test ! -f $start_dir/core.ver -o -d $start_dir/.git ; then
-echo Warning: core sources are from git and not from tarball
+if test ! -f $start_dir/sources.ver -o -d $start_dir/.git ; then
+echo Warning: sources are from git and not from tarball
echo Do nothing.
exit 0;
fi
-source $start_dir/bootstrap.ver
lo_src_dir=$start_dir/src
mkdir -p $lo_src_dir
diff --git a/download b/download
index e8ebeff..b5774f1 100755
--- a/download
+++ b/download
@@ -181,15 +181,17 @@ if [ $COM = MSC ]; then
downloaditem
http://download.microsoft.com/download/a/b/c/abc45517-97a0-4cee-a362-1957be2f24e1/;
WindowsXP-KB975337-x86-ENU.exe 946d00d87e4094f3a6e425e2d538eadd
fi
-if [ -f $start_dir/core.ver -a ! -d $start_dir/.git ] ; then
-# core is from sources, so get the other source tarballs
-. $start_dir/core.ver
+if [ -f $start_dir/sources.ver -a ! -d $start_dir/.git ] ; then
+# these sources are from a tarball, so get the other source tarballs
+. $start_dir/sources.ver
+# sources are put into major.minor.micro version directory on the
dowload site, e.g. 3.5.2
+lo_bugfix_release_sources_ver=`echo $lo_sources_ver | sed -e
s/\([0-9]*\.[0-9]*\.[0-9]*\).*/\1/`
lo_src_dir=$start_dir/src
mkdir -p $lo_src_dir
for piece in `cat $start_dir/bin/repo-list` ; do
-tarname=libreoffice-$piece-$lo_core_ver
+tarname=libreoffice-$piece-$lo_sources_ver
if [ ! -f $TARFILE_LOCATION/$tarname.tar.xz ] ; then
- downloaditem
http://download.documentfoundation.org/libreoffice/src/; $tarname.tar.xz
+ downloaditem
http://download.documentfoundation.org/libreoffice/src/$lo_bugfix_release_sources_ver;
$tarname.tar.xz
fi
$start_dir/bin/unpack-sources $start_dir
$TARFILE_LOCATION/$tarname.tar.xz
done
commit de27fa7a22cf6bb08a03121c7144ac99692a5220
Author: Petr Mladek pmla...@suse.cz
Date: Fri Apr 13 16:20:55 2012 +0200
unpack-sources, download: update for .xz source tarballs
Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch
diff --git a/bin/unpack-sources b/bin/unpack-sources
index 130c9a2..271a5e3 100755
--- a/bin/unpack-sources
+++ b/bin/unpack-sources
@@ -73,13 +73,13 @@ if test -z $start_dir ; then
echo Error: Please, define where to unpack sources, try --help
fi
-if ! test -d $start_dir/src -a -f $start_dir/solenv/inc/target.mk ; then
-echo Error: $start_dir is not a valid bootstrap directory
+if ! test -f $start_dir/Repository.mk -a -f
[Libreoffice-commits] .: libvisio/libvisio-0.0.15-makefile_mk.patch libvisio/libvisio-0.0.15.patch libvisio/libvisio-0.0.16.patch libvisio/makefile.mk ooo.lst.in
libvisio/libvisio-0.0.15-makefile_mk.patch | 10 -- libvisio/libvisio-0.0.15.patch | 20 libvisio/libvisio-0.0.16.patch | 20 libvisio/makefile.mk |7 +++ ooo.lst.in |2 +- 5 files changed, 24 insertions(+), 35 deletions(-) New commits: commit df80de1f47ed555ad28d78065f1c1853feab0c85 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Mon Apr 16 12:27:38 2012 +0200 Uploading new release of libvisio (0.0.16) diff --git a/libvisio/libvisio-0.0.15-makefile_mk.patch b/libvisio/libvisio-0.0.15-makefile_mk.patch deleted file mode 100644 index a22f128..000 --- a/libvisio/libvisio-0.0.15-makefile_mk.patch +++ /dev/null @@ -1,10 +0,0 @@ misc/libvisio-0.0.15/src/lib/makefile.mk 2012-01-17 19:19:29.0 +0100 -+++ misc/build/libvisio-0.0.15/src/lib/makefile.mk 2012-02-20 10:36:43.448244813 +0100 -@@ -45,6 +45,7 @@ - $(SLO)$/VSDXParser.obj \ - $(SLO)$/VSDXShapeList.obj \ - $(SLO)$/VSDXStencils.obj \ -+ $(SLO)$/VSDStringVector.obj \ - $(SLO)$/VSDXStylesCollector.obj \ - $(SLO)$/VSDXStyles.obj - diff --git a/libvisio/libvisio-0.0.15.patch b/libvisio/libvisio-0.0.15.patch deleted file mode 100644 index fbebce9..000 --- a/libvisio/libvisio-0.0.15.patch +++ /dev/null @@ -1,20 +0,0 @@ misc/libvisio-0.0.15/src/lib/libvisio_utils.h -+++ misc/build/libvisio-0.0.15/src/lib/libvisio_utils.h -@@ -42,17 +42,8 @@ - - #else - --#ifdef HAVE_CONFIG_H --#include config.h --#endif -- --#ifdef HAVE_STDINT_H - #include stdint.h --#endif -- --#ifdef HAVE_INTTYPES_H - #include inttypes.h --#endif - - #endif - diff --git a/libvisio/libvisio-0.0.16.patch b/libvisio/libvisio-0.0.16.patch new file mode 100644 index 000..6a8824f --- /dev/null +++ b/libvisio/libvisio-0.0.16.patch @@ -0,0 +1,20 @@ +--- misc/libvisio-0.0.16/src/lib/libvisio_utils.h misc/build/libvisio-0.0.16/src/lib/libvisio_utils.h +@@ -42,17 +42,8 @@ + + #else + +-#ifdef HAVE_CONFIG_H +-#include config.h +-#endif +- +-#ifdef HAVE_STDINT_H + #include stdint.h +-#endif +- +-#ifdef HAVE_INTTYPES_H + #include inttypes.h +-#endif + + #endif + diff --git a/libvisio/makefile.mk b/libvisio/makefile.mk index c2064ce..f428918 100644 --- a/libvisio/makefile.mk +++ b/libvisio/makefile.mk @@ -54,12 +54,11 @@ INCPRE+=$(WPG_CFLAGS) INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpg .ENDIF -TARFILE_NAME=libvisio-0.0.15 -TARFILE_MD5=d28864eb2b59bb57b034c0d4662a3cee +TARFILE_NAME=libvisio-0.0.16 +TARFILE_MD5=2fa6028324347860e684e75310818d43 PATCH_FILES=\ -$(TARFILE_NAME).patch \ -$(TARFILE_NAME)-makefile_mk.patch +$(TARFILE_NAME).patch BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS) diff --git a/ooo.lst.in b/ooo.lst.in index eef3c26..1d6bfde 100644 --- a/ooo.lst.in +++ b/ooo.lst.in @@ -87,7 +87,7 @@ c01351d7db2b205de755d58769288224-libwpd-0.9.4.tar.bz2 f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz 3bf481ca95109b14435125c0dd1f2217-graphite2-1.0.3.tgz -d28864eb2b59bb57b034c0d4662a3cee-libvisio-0.0.15.tar.bz2 +2fa6028324347860e684e75310818d43-libvisio-0.0.16.tar.bz2 e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip 7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz 44d0c579b342f6cdbc0f76534c5d29b2-libcdr-0.0.6.tar.bz2 ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: zlib/makefile.mk
zlib/makefile.mk |4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) New commits: commit 0d34f0ebcaf75863daaa608cc962ee888b2fa7e6 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Fri Apr 13 17:04:37 2012 +0200 no need of minizip headers here too diff --git a/zlib/makefile.mk b/zlib/makefile.mk index 6165ccc..8ec3a5e 100644 --- a/zlib/makefile.mk +++ b/zlib/makefile.mk @@ -57,9 +57,7 @@ BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS) OUT2INC= \ zlib.h \ -zconf.h \ -contrib$/minizip$/unzip.h \ -contrib$/minizip$/ioapi.h +zconf.h PATCHED_HEADERS=$(INCCOM)$/patched$/zlib.h ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: writerperfect/source
writerperfect/source/filter/OdgGenerator.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit c227447b9ab253a1d263b315ad0a7dbba4b08ff1
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Mon Apr 9 23:49:31 2012 +0200
Write out the groupping
diff --git a/writerperfect/source/filter/OdgGenerator.cxx
b/writerperfect/source/filter/OdgGenerator.cxx
index 897ce4e..da6d64d 100644
--- a/writerperfect/source/filter/OdgGenerator.cxx
+++ b/writerperfect/source/filter/OdgGenerator.cxx
@@ -805,10 +805,12 @@ void OdgGenerator::setStyle(const ::WPXPropertyList
propList, const ::WPXProper
void OdgGenerator::startLayer(const ::WPXPropertyList /* propList */)
{
+mpImpl-mBodyElements.push_back(new TagOpenElement(draw:g));
}
void OdgGenerator::endLayer()
{
+mpImpl-mBodyElements.push_back(new TagCloseElement(draw:g));
}
void OdgGenerator::drawRectangle(const ::WPXPropertyList propList)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'features/base-preview' - boost/makefile.mk
boost/makefile.mk | 49 +++-- 1 file changed, 47 insertions(+), 2 deletions(-) New commits: commit d34b86cd91654199724c400e43822619c7d70576 Author: Fridrich Sch Strba fridrich.st...@bluewin.ch Date: Wed Apr 4 16:18:09 2012 +0200 Be sure all boost headers are copied to output directory diff --git a/boost/makefile.mk b/boost/makefile.mk index 3ba21d8..fa11589 100644 --- a/boost/makefile.mk +++ b/boost/makefile.mk @@ -94,36 +94,81 @@ $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) : $(PACKAGE_DIR)$/$(BUILD_FLAG_FILE) -@$(MKDIRHIER) $(INCCOM)$/$(PRJNAME) @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/*.h $(INCCOM)$/$(PRJNAME) @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/*.hpp $(INCCOM)$/$(PRJNAME) +@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/accumulators $(INCCOM)$/$(PRJNAME) @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/algorithm $(INCCOM)$/$(PRJNAME) +@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/archive $(INCCOM)$/$(PRJNAME) +@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/asio $(INCCOM)$/$(PRJNAME) @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/assign $(INCCOM)$/$(PRJNAME) +@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/bimap $(INCCOM)$/$(PRJNAME) @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/bind $(INCCOM)$/$(PRJNAME) +@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/circular_buffer $(INCCOM)$/$(PRJNAME) +@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/compatibility $(INCCOM)$/$(PRJNAME) @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/concept $(INCCOM)$/$(PRJNAME) +@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/concept_check $(INCCOM)$/$(PRJNAME) @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/config $(INCCOM)$/$(PRJNAME) @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/date_time $(INCCOM)$/$(PRJNAME) @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/detail $(INCCOM)$/$(PRJNAME) @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/dynamic_bitset $(INCCOM)$/$(PRJNAME) @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/exception $(INCCOM)$/$(PRJNAME) +@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/filesystem $(INCCOM)$/$(PRJNAME) +@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/flyweight $(INCCOM)$/$(PRJNAME) +@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/format $(INCCOM)$/$(PRJNAME) @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/function $(INCCOM)$/$(PRJNAME) @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/functional $(INCCOM)$/$(PRJNAME) -@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/io $(INCCOM)$/$(PRJNAME) +@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/function_types $(INCCOM)$/$(PRJNAME) +@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/fusion $(INCCOM)$/$(PRJNAME) +@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/gil $(INCCOM)$/$(PRJNAME) +@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/graph $(INCCOM)$/$(PRJNAME) @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/integer $(INCCOM)$/$(PRJNAME) +@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/interprocess $(INCCOM)$/$(PRJNAME) +@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/intrusive $(INCCOM)$/$(PRJNAME) +@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/io $(INCCOM)$/$(PRJNAME) +@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/iostreams $(INCCOM)$/$(PRJNAME) @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/iterator $(INCCOM)$/$(PRJNAME) +@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/lambda $(INCCOM)$/$(PRJNAME) +@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/logic $(INCCOM)$/$(PRJNAME) +@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/math $(INCCOM)$/$(PRJNAME) +@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/mpi $(INCCOM)$/$(PRJNAME) @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/mpl $(INCCOM)$/$(PRJNAME) +@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/msm $(INCCOM)$/$(PRJNAME) +@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/multi_array $(INCCOM)$/$(PRJNAME) +@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/multi_index $(INCCOM)$/$(PRJNAME) @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/numeric $(INCCOM)$/$(PRJNAME) @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/optional $(INCCOM)$/$(PRJNAME) +@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/parameter $(INCCOM)$/$(PRJNAME) @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/pending $(INCCOM)$/$(PRJNAME) +@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/polygon $(INCCOM)$/$(PRJNAME) @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/pool $(INCCOM)$/$(PRJNAME)
[Libreoffice-commits] .: filter/source
filter/source/svg/parserfragments.cxx |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 333cb00a6399bcafa0248a64922757da4a7d
Author: Christina Rossmanith chrrossman...@web.de
Date: Sun Apr 1 21:14:10 2012 +0200
SVG: treat skewX and skewY correct
diff --git a/filter/source/svg/parserfragments.cxx
b/filter/source/svg/parserfragments.cxx
index d70eaad..3de3d4b 100644
--- a/filter/source/svg/parserfragments.cxx
+++ b/filter/source/svg/parserfragments.cxx
@@ -93,16 +93,16 @@ void calcRotation(std::vectorgeometry::AffineMatrix2D
rTransforms,
void calcSkewX(std::vectorgeometry::AffineMatrix2D rTransforms,
double fSkewAngle)
{
-geometry::AffineMatrix2D aMat(1.0,0.0,0.0,
- tan(fSkewAngle*M_PI/180),1.0,0.0);
+geometry::AffineMatrix2D aMat(1.0,tan(fSkewAngle*M_PI/180),0.0,
+ 0.0,1.0,0.0);
rTransforms.push_back(aMat);
}
void calcSkewY(std::vectorgeometry::AffineMatrix2D rTransforms,
double fSkewAngle)
{
-geometry::AffineMatrix2D aMat(1.0,tan(fSkewAngle*M_PI/180),0.0,
- 0.0,1.0,0.0);
+geometry::AffineMatrix2D aMat(1.0,0.0,0.0,
+ tan(fSkewAngle*M_PI/180),1.0,0.0);
rTransforms.push_back(aMat);
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - libcdr/libcdr-0.0.5.patch libcdr/libcdr-0.0.5-zip.patch libcdr/libcdr-0.0.6.patch libcdr/makefile.mk ooo.lst.in
libcdr/libcdr-0.0.5-zip.patch | 214 --
libcdr/libcdr-0.0.5.patch | 20 ---
libcdr/libcdr-0.0.6.patch | 20 +++
libcdr/makefile.mk|7 -
ooo.lst.in|2
5 files changed, 24 insertions(+), 239 deletions(-)
New commits:
commit 54a1a17597031e95a3d785beebfe57a098412eb5
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Mon Apr 2 15:41:48 2012 +0200
Fetch the right libcdr
diff --git a/ooo.lst.in b/ooo.lst.in
index 5de0e5a..00f57db 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -90,7 +90,7 @@ f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
d28864eb2b59bb57b034c0d4662a3cee-libvisio-0.0.15.tar.bz2
e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip
7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz
-4def42cfe3527ed7c515bea8cc3f23b8-libcdr-0.0.5.tar.bz2
+44d0c579b342f6cdbc0f76534c5d29b2-libcdr-0.0.6.tar.bz2
327348d67c979c88c2dec59a23a17d85-lcms2-2.3.tar.gz
@GOOGLE_DOCS_EXTENSION_PACK@
@FREETYPE_TARBALL@
commit 4bbb2cd002d018d5e3bc3d6de85067e6fc6ae236
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Mon Apr 2 15:36:14 2012 +0200
Uploading new shiny libcdr 0.0.6
diff --git a/libcdr/libcdr-0.0.5-zip.patch b/libcdr/libcdr-0.0.5-zip.patch
deleted file mode 100644
index 0354cf9..000
--- a/libcdr/libcdr-0.0.5-zip.patch
+++ /dev/null
@@ -1,214 +0,0 @@
misc/libcdr-0.0.5/src/lib/CDRInternalStream.cpp2012-03-15
11:30:05.0 +0100
-+++ misc/build/libcdr-0.0.5/src/lib/CDRInternalStream.cpp 2012-03-22
09:51:18.381882859 +0100
-@@ -49,19 +49,19 @@
- m_offset(0),
- m_buffer()
- {
-- unsigned long tmpNumBytesRead = 0;
--
-- const unsigned char *tmpBuffer = 0;
-+ if (!size)
-+return;
-
- if (!compressed)
- {
--tmpBuffer = input-read(size, tmpNumBytesRead);
-+unsigned long tmpNumBytesRead = 0;
-+const unsigned char *tmpBuffer = input-read(size, tmpNumBytesRead);
-
- if (size != tmpNumBytesRead)
- return;
-
- m_buffer = std::vectorunsigned char(size);
--memcpy(m_buffer[0], tmpBuffer[0], size);
-+memcpy(m_buffer[0], tmpBuffer, size);
- }
- else
- {
-@@ -80,7 +80,8 @@
- if (ret != Z_OK)
- return;
-
--tmpBuffer = input-read(size, tmpNumBytesRead);
-+unsigned long tmpNumBytesRead = 0;
-+const unsigned char *tmpBuffer = input-read(size, tmpNumBytesRead);
-
- if (size != tmpNumBytesRead)
- return;
-@@ -99,6 +100,7 @@
- case Z_DATA_ERROR:
- case Z_MEM_ERROR:
- (void)inflateEnd(strm);
-+m_buffer.clear();
- return;
- }
-
-@@ -109,7 +111,7 @@
-
- }
- while (strm.avail_out == 0);
--
-+(void)inflateEnd(strm);
- }
- }
-
misc/libcdr-0.0.5/src/lib/CDRZipStream.cpp 2012-03-16 11:20:15.0
+0100
-+++ misc/build/libcdr-0.0.5/src/lib/CDRZipStream.cpp 2012-03-22
09:51:00.332335588 +0100
-@@ -30,6 +30,7 @@
-
-
- #include string.h
-+#include zlib.h
- #include CDRZipStream.h
- #include CDRInternalStream.h
- #include libcdr_utils.h
-@@ -231,9 +232,9 @@
- return true;
- }
-
--static bool findCentralDirectoryEnd(WPXInputStream *input, long startOffset)
-+static bool findCentralDirectoryEnd(WPXInputStream *input)
- {
-- input-seek(startOffset, WPX_SEEK_SET);
-+ input-seek(0, WPX_SEEK_SET);
- try
- {
- while (!input-atEOS())
-@@ -242,7 +243,6 @@
- if (signature == CDIR_END_SIG)
- {
- input-seek(-4, WPX_SEEK_CUR);
--startOffset = input-tell();
- return true;
- }
- else
-@@ -256,9 +256,9 @@
- return false;
- }
-
--static bool isZipStream(WPXInputStream *input, long startOffset)
-+static bool isZipStream(WPXInputStream *input)
- {
-- if (!findCentralDirectoryEnd(input, startOffset))
-+ if (!findCentralDirectoryEnd(input))
- return false;
- CentralDirectoryEnd end;
- if (!readCentralDirectoryEnd(input, end))
-@@ -276,17 +276,16 @@
- return true;
- }
-
--static bool findDataStream(WPXInputStream *input, unsigned size, bool
compressed, long startOffset, const char *name)
-+static bool findDataStream(WPXInputStream *input, CentralDirectoryEntry
entry, const char *name)
- {
- unsigned short name_size = strlen(name);
-- if (!findCentralDirectoryEnd(input, startOffset))
-+ if (!findCentralDirectoryEnd(input))
- return false;
- CentralDirectoryEnd end;
- if (!readCentralDirectoryEnd(input, end))
- return false;
- input-seek(end.cdir_offset, WPX_SEEK_SET);
-- CentralDirectoryEntry entry;
-- while (!input-atEOS() input-tell() startOffset input-tell()
end.cdir_offset + end.cdir_size)
-+ while (!input-atEOS() (unsigned)input-tell() end.cdir_offset +
end.cdir_size)
- {
- if (!readCentralDirectoryEntry(input, entry))
- return false;
-@@ -303,17 +302,63 @@
- return false;
- if (!areHeadersConsistent(header, entry))
- return false;
-- size = entry.uncompressed_size;
-- compressed = (entry.compression != 0);
- return
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - distro-configs/LibreOfficeMinGW.conf distro-configs/LibreOfficeWin32.conf distro-configs/LibreOfficeWin64.conf
distro-configs/LibreOfficeMinGW.conf |1 + distro-configs/LibreOfficeWin32.conf |1 + distro-configs/LibreOfficeWin64.conf |1 + 3 files changed, 3 insertions(+) New commits: commit 92330ae0ae1c584903f8024b24d89e9723cbf6a6 Author: Michael Meeks michael.me...@suse.com Date: Thu Mar 29 11:09:24 2012 +0100 Disable cairo canvas on Windows fdo#46901 fdo#46532 We never used cairocanvas on Win, this got accidentally enabled due to configure.in cleanups. Not that we shouldn't, but it needs some more fixing ( Analog of Thorsten's Mac commit for fdo#45584 ) Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch diff --git a/distro-configs/LibreOfficeMinGW.conf b/distro-configs/LibreOfficeMinGW.conf index fcca57a..e0529e4 100644 --- a/distro-configs/LibreOfficeMinGW.conf +++ b/distro-configs/LibreOfficeMinGW.conf @@ -22,6 +22,7 @@ --without-myspell-dicts --disable-activex --disable-binfilter +--disable-cairo-canvas --disable-build-mozilla --disable-directx --disable-extension-integration diff --git a/distro-configs/LibreOfficeWin32.conf b/distro-configs/LibreOfficeWin32.conf index f608e9b..9bf7609 100644 --- a/distro-configs/LibreOfficeWin32.conf +++ b/distro-configs/LibreOfficeWin32.conf @@ -8,6 +8,7 @@ --with-java-target-version=1.5 --disable-activex-component --enable-binfilter +--disable-cairo-canvas --enable-ext-scripting-beanshell --enable-ext-scripting-javascript --enable-ext-wiki-publisher diff --git a/distro-configs/LibreOfficeWin64.conf b/distro-configs/LibreOfficeWin64.conf index b4e21c6..66404d4 100644 --- a/distro-configs/LibreOfficeWin64.conf +++ b/distro-configs/LibreOfficeWin64.conf @@ -2,6 +2,7 @@ --without-agfa-monotype-fonts --with-java-target-version=1.5 --enable-cl-x64 +--disable-cairo-canvas --disable-activex-component --enable-ext-scripting-beanshell --enable-ext-scripting-javascript ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5-2' - 3 commits - scripting/examples scripting/Jar_HelloWorld.mk scripting/Jar_Highlight.mk scripting/Jar_MemoryUsage.mk scripting/Jar_ScriptFramework.m
scripting/Jar_HelloWorld.mk |2 scripting/Jar_Highlight.mk |2 scripting/Jar_MemoryUsage.mk |2 scripting/Jar_ScriptFramework.mk |2 scripting/Jar_ScriptProviderForBeanShell.mk |4 scripting/Jar_ScriptProviderForJava.mk |5 + scripting/Jar_ScriptProviderForJavaScript.mk |2 scripting/examples/java/HelloWorld/HelloWorld.java |2 scripting/examples/java/HelloWorld/parcel-descriptor.xml |2 scripting/examples/java/Highlight/HighlightText.java |2 scripting/examples/java/Highlight/parcel-descriptor.xml |2 scripting/examples/java/MemoryUsage/MemoryUsage.java |2 scripting/examples/java/MemoryUsage/parcel-descriptor.xml |2 scripting/examples/java/Newsgroup/MimeConfiguration.java |2 scripting/examples/java/Newsgroup/NewsGroup.java |2 scripting/examples/java/Newsgroup/OfficeAttachment.java |2 scripting/examples/java/Newsgroup/PostNewsgroup.java |2 scripting/examples/java/Newsgroup/Sender.java |2 scripting/examples/java/Newsgroup/StatusWindow.java |2 scripting/examples/java/Newsgroup/SubscribedNewsgroups.java |2 scripting/examples/java/debugger/DebugRunner.java |2 scripting/examples/java/debugger/OOBeanShellDebugger.java |2 scripting/examples/java/debugger/OORhinoDebugger.java |2 scripting/examples/java/debugger/OOScriptDebugger.java |2 scripting/examples/java/debugger/parcel-descriptor.xml |2 scripting/examples/java/selector/ScriptSelector.java |2 scripting/examples/java/selector/parcel-descriptor.xml |2 scripting/java/Framework/MANIFEST.MF |2 scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java | 46 +- scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java |6 - scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java |3 scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java |3 scripting/java/com/sun/star/script/framework/provider/java/MANIFEST.MF |2 scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java |2 scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java |3 35 files changed, 109 insertions(+), 17 deletions(-) New commits: commit a574a38a73b252498ac061dcf08d96a84b48b6af Author: Stephan Bergmann sberg...@redhat.com Date: Fri Mar 23 16:05:24 2012 +0100 fdo#46102: Load Java scripts with class loaders that actually find them ScriptMetaData.createURL produces weird URLs (ending in /ucb/, and potentially still containing vnd.sun.star.expand: prefix) that are apparently good for loading documents for editing via UCBStreamHandler, but cannot meaningfully be passed to a URLClassLoader. It is unclear to me how the Java script provider shall ever have found the script jars in the past. (cherry picked from commit dd6c4f4db1d62268d73e09ae52d23f760a967dcc) Signed-off-by: Michael Stahl mst...@redhat.com Signed-off-by: Petr Mladek pmla...@suse.cz Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch diff --git a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java index 1cf99d7..178f480 100755 --- a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java +++
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - xmloff/source
xmloff/source/draw/xexptran.cxx | 10 ++
1 file changed, 10 insertions(+)
New commits:
commit db3597cef07a0f659be5617d9148069c7fb4a5a8
Author: Thorsten Behrens tbehr...@suse.com
Date: Fri Mar 23 17:46:43 2012 +0100
Fix fdo#47406 incorrect relative moves after closePath
I missed the fact that odf export still uses the old exporter in
xmloff/source/draw/xexptran.cxx, which was not fixed wrt. the update
of current position in basegfx/source/polygon/b2dsvgpolypolygon.cxx
Conflicts:
xmloff/source/draw/xexptran.cxx
diff --git a/xmloff/source/draw/xexptran.cxx b/xmloff/source/draw/xexptran.cxx
index 98fb45a..a2c46fe 100644
--- a/xmloff/source/draw/xexptran.cxx
+++ b/xmloff/source/draw/xexptran.cxx
@@ -1607,6 +1607,7 @@ void SdXMLImExSvgDElement::AddPolygon(
// bezier poly, handle curves
bool bDidWriteStart(false);
+sal_Int32 nStartX(0), nStartY(0);
for(sal_Int32 a(0L); a nCnt; a++)
{
@@ -2081,6 +2082,8 @@ void SdXMLImExSvgDElement::AddPolygon(
// remember start written
bDidWriteStart = true;
+nStartX = nX;
+nStartY = nY;
}
// remember new last position
@@ -2101,6 +2104,13 @@ void SdXMLImExSvgDElement::AddPolygon(
aNewString += String(sal_Unicode('z'));
else
aNewString += String(sal_Unicode('Z'));
+
+// update current point - we're back at the start
+if( bDidWriteStart )
+{
+mnLastX = nStartX;
+mnLastY = nStartY;
+}
}
// append new string
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - basegfx/inc basegfx/source xmloff/inc xmloff/source
basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx |7 ++-
basegfx/source/polygon/b2dsvgpolypolygon.cxx|4 ++--
xmloff/inc/xexptran.hxx |3 ++-
xmloff/source/draw/xexptran.cxx | 15 +--
xmloff/source/draw/ximp3dobject.cxx |3 +--
xmloff/source/draw/ximpshap.cxx |6 ++
xmloff/source/style/MarkerStyle.cxx |3 +--
xmloff/source/text/XMLTextFrameContext.cxx |3 +--
8 files changed, 28 insertions(+), 16 deletions(-)
New commits:
commit b8fb2df5491937ccc7eb422544e25f18a6bc787c
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Mon Mar 26 12:55:44 2012 +0200
Compatibility option for incorrect relative moves after closePath
(fdo#47406)
Signed-off-by: Thorsten Behrens tbehr...@suse.com
diff --git a/basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx
b/basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx
index 37d2cb5..5a59c3a 100644
--- a/basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx
+++ b/basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx
@@ -131,10 +131,15 @@ namespace basegfx
@param rSvgDAttribute
A valid SVG-D attribute string
+@param rWrongPositionAfterZ
+Indicates wheter the generator interprets wrongly
+the position in the path after Z or z elements
+https://bugs.freedesktop.org/show_bug.cgi?id=47406
+
@return true, if the string was successfully parsed
*/
BASEGFX_DLLPUBLIC bool importFromSvgD( B2DPolyPolygon
o_rPolyPoly,
- const ::rtl::OUString rSvgDAttribute );
+ const ::rtl::OUString rSvgDAttribute, bool
bWrongPositionAfterZ = false );
/** Read poly-polygon from SVG.
diff --git a/basegfx/source/polygon/b2dsvgpolypolygon.cxx
b/basegfx/source/polygon/b2dsvgpolypolygon.cxx
index 863adf5..2928364 100644
--- a/basegfx/source/polygon/b2dsvgpolypolygon.cxx
+++ b/basegfx/source/polygon/b2dsvgpolypolygon.cxx
@@ -210,7 +210,7 @@ namespace basegfx
}
}
-bool importFromSvgD(B2DPolyPolygon o_rPolyPolygon, const
::rtl::OUString rSvgDStatement)
+bool importFromSvgD(B2DPolyPolygon o_rPolyPolygon, const
::rtl::OUString rSvgDStatement, bool bWrongPositionAfterZ)
{
o_rPolyPolygon.clear();
const sal_Int32 nLen(rSvgDStatement.getLength());
@@ -241,7 +241,7 @@ namespace basegfx
bIsClosed = true;
// update current point - we're back at the start
-if( aCurrPoly.count() )
+if( aCurrPoly.count() !bWrongPositionAfterZ)
{
const B2DPoint aFirst( aCurrPoly.getB2DPoint(0) );
nLastX = aFirst.getX();
diff --git a/xmloff/inc/xexptran.hxx b/xmloff/inc/xexptran.hxx
index 814ad2a..86883cf 100644
--- a/xmloff/inc/xexptran.hxx
+++ b/xmloff/inc/xexptran.hxx
@@ -36,6 +36,7 @@
#include com/sun/star/awt/Size.hpp
#include com/sun/star/drawing/HomogenMatrix.hpp
#include tools/mapunit.hxx
+#include xmloff/xmlimp.hxx
#include vector
@@ -171,7 +172,7 @@ public:
const SdXMLImExViewBox rViewBox,
const com::sun::star::awt::Point rObjectPos,
const com::sun::star::awt::Size rObjectSize,
-const SvXMLUnitConverter rConv);
+const SvXMLImport rImport);
void AddPolygon(
com::sun::star::drawing::PointSequence* pPoints,
diff --git a/xmloff/source/draw/xexptran.cxx b/xmloff/source/draw/xexptran.cxx
index a2c46fe..e49d971 100644
--- a/xmloff/source/draw/xexptran.cxx
+++ b/xmloff/source/draw/xexptran.cxx
@@ -2122,7 +2122,7 @@ SdXMLImExSvgDElement::SdXMLImExSvgDElement(const
OUString rNew,
const SdXMLImExViewBox rViewBox,
const awt::Point rObjectPos,
const awt::Size rObjectSize,
-const SvXMLUnitConverter /*rConv*/)
+const SvXMLImport rImport)
: msString( rNew ),
mrViewBox( rViewBox ),
mbIsClosed( false ),
@@ -2131,9 +2131,20 @@ SdXMLImExSvgDElement::SdXMLImExSvgDElement(const
OUString rNew,
mnLastY( 0L ),
maPoly()
{
+bool bWrongPositionAfterZ( false );
+ sal_Int32 nUPD( 0 );
+ sal_Int32 nBuildId( 0 );
+ if ( rImport.getBuildIds( nUPD, nBuildId )
+ ( ( nUPD == 641 ) || ( nUPD == 645 ) || ( nUPD == 680 ) || ( nUPD ==
300 ) ||
+ ( nUPD == 310 ) || ( nUPD == 320 ) || ( nUPD == 330 ) || ( nUPD ==
340 ) ||
+ ( nUPD == 350 nBuildId 202 ) ) )
+{
+bWrongPositionAfterZ = true;
+}
+
// convert string to polygon
basegfx::B2DPolyPolygon aPoly;
-basegfx::tools::importFromSvgD(aPoly,msString);
+basegfx::tools::importFromSvgD(aPoly,msString,bWrongPositionAfterZ);
mbIsCurve = aPoly.areControlPointsUsed();
mbIsClosed = aPoly.isClosed();
diff
[Libreoffice-commits] .: Branch 'libreoffice-3-5-2' - extras/source
extras/source/palettes/standard.soe |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit 5ce6fc0ff62c8a1dbe6ae22300639ccb1d4900ba Author: Regina Henschel rb.hensc...@t-online.de Date: Sun Mar 25 21:12:52 2012 +0200 Adapt arrowhead pathes to corrected svg path z hangling Signed-off-by: Michael Meeks michael.me...@suse.com Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch diff --git a/extras/source/palettes/standard.soe b/extras/source/palettes/standard.soe index 5a8acd9..4b576b1 100644 --- a/extras/source/palettes/standard.soe +++ b/extras/source/palettes/standard.soe @@ -13,11 +13,11 @@ draw:marker draw:name=Square 45 svg:viewBox=0 0 1131 1131 svg:d=m0 564 564 567 567-567-567-564z / draw:marker draw:name=Arrow concave svg:viewBox=0 0 1131 1580 svg:d=m1013 1491 118 89-567-1580-564 1580 114-85 136-68 148-46 161-17 161 13 153 46z/draw:marker draw:marker draw:name=Short line Arrow svg:viewBox=0 0 3000 3000 svg:d=m1500 0 1500 2789v211h-114l-1286-2392v2392h-200v-2392l-1286 2392h-114v-211z/draw:marker - draw:marker draw:name=Triangle unfilled svg:viewBox=0 0 3000 3000 svg:d=m1500 0 1500 3000h-3000zm1500-2553-1176 2353h2353z/draw:marker - draw:marker draw:name=Diamond unfilled svg:viewBox=0 0 3000 6000 svg:d=m1500 0 1500 3000-1500 3000-1500-3000zm1500-2553-1276 2553 1276 2553 1276-2553z/draw:marker + draw:marker draw:name=Triangle unfilled svg:viewBox=0 0 3000 3000 svg:d=m1500 0 1500 3000h-3000zm0 447-1176 2353h2353z/draw:marker + draw:marker draw:name=Diamond unfilled svg:viewBox=0 0 3000 6000 svg:d=m1500 0 1500 3000-1500 3000-1500-3000zm0 447-1276 2553 1276 2553 1276-2553z/draw:marker draw:marker draw:name=Diamond svg:viewBox=0 0 3000 6000 svg:d=m1500 0 1500 3000-1500 3000-1500-3000z/draw:marker draw:marker draw:name=Circle unfilled svg:viewBox=0 0 3000 3000 svg:d=m1500 3000c-276 0-511-63-750-201s-411-310-549-549-201-474-201-750 63-511 201-750 310-411 549-549 474-201 750-201 511 63 750 201 411 310 549 549 201 474 201 750-63 511-201 750-310 411-549 549-474 201-750 201zm0-200c-239 0-443-55-650-174s-356-269-476-476-174-411-174-650 55-443 174-650 269-356 476-476c207-119 411-174 650-174s443 55 650 174c207 120 356 269 476 476s174 411 174 650-55 443-174 650-269 356-476 476c-207 119-411 174-650 174z/draw:marker - draw:marker draw:name=Square 45 unfilled svg:viewBox=0 0 3000 3000 svg:d=m1500 3000-1500-1500 1500-1500 1500 1500zm-1500 1215-1215-1215 1215-1215 1215 1215z/draw:marker - draw:marker draw:name=Square unfilled svg:viewBox=0 0 300 300 svg:d=m0 0h300v300h-300zm20-280h260v260h-260z/draw:marker + draw:marker draw:name=Square 45 unfilled svg:viewBox=0 0 3000 3000 svg:d=m1500 3000-1500-1500 1500-1500 1500 1500zm0-285 -1215-1215 1215-1215 1215 1215z/draw:marker + draw:marker draw:name=Square unfilled svg:viewBox=0 0 300 300 svg:d=m0 0h300v300h-300zm20 20h260v260h-260z/draw:marker draw:marker draw:name=Half Circle unfilled svg:viewBox=0 0 15000 8746 svg:d=m14971 0c21 229 29 423 29 653 0 690-79 1328-244 1943-165 614-416 1206-761 1804-345 597-733 1110-1183 1560-451 450-964 837-1562 1182-598 345-1190 596-1806 760-600 161-1223 240-1894 244v600h-100v-600c-671-4-1294-83-1894-244-616-164-1208-415-1806-760-598-345--732-1562-1182-450-450-838-963-1183-1560-345-598-596-1190-761-1804-165-615-244-1253-244-1943 0-230 8-424 29-653l298 26 299 26c-18 211-26 390-26 601 0 635 72 1222 224 1787 151 566 383 1110 700 1659 318 550 674 1022 1088 1437 415 414 888 769 1438 1087 550 317 1095 548 1661 700 566 151 1154 223 1789 223s1223-72 1789-223c566-152 -383 1661-700 550-318 1023-673 1438-1087 414-415 770-887 1088-1437 317-549 549-1093 700-1659 152-565 224-1152 224-1787 0-211-8-390-26-601l299-26z / /office:marker-table \ No newline at end of file ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: extensions/source
extensions/source/macosx/spotlight/OOoSpotlightImporter.m |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit a7c11707cf43b13d75a039cae918fae7f268cbf0
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Fri Mar 23 14:03:25 2012 +0100
Hop, a logical error
diff --git a/extensions/source/macosx/spotlight/OOoSpotlightImporter.m
b/extensions/source/macosx/spotlight/OOoSpotlightImporter.m
index 7339639..4049d71 100644
--- a/extensions/source/macosx/spotlight/OOoSpotlightImporter.m
+++ b/extensions/source/macosx/spotlight/OOoSpotlightImporter.m
@@ -441,7 +441,7 @@ NSData *getUncompressedData(NSFileHandle *file, NSString
*name)
{
NSFileHandle* unzipFile = nil;
-if ([pathToFile length] == 0)
+if ([pathToFile length] != 0)
{
unzipFile = [NSFileHandle fileHandleForReadingAtPath: pathToFile];
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/core/layout/paintfrm.cxx | 143 -
1 file changed, 65 insertions(+), 78 deletions(-)
New commits:
commit e94c4ab5523c7dcbee2f1b7fd47685529498e774
Author: Bartosz Kosiorek gan...@poczta.onet.pl
Date: Fri Mar 16 20:47:09 2012 +0100
Conver SV VARARR to std::deque for sw module.
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index 958e279..ad0e241 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -32,7 +32,6 @@
#include vcl/sound.hxx
#include vcl/lazydelete.hxx
#include tools/poly.hxx
-#include svl/svstdarr.hxx
#include svx/xoutbmp.hxx
#include sfx2/progress.hxx
#include editeng/brshitem.hxx
@@ -48,7 +47,6 @@
#include switerator.hxx
#include fmtsrnd.hxx
#include fmtclds.hxx
-#include tools/shl.hxx
#include comcore.hrc
#include swmodule.hxx
#include rootfrm.hxx
@@ -81,7 +79,6 @@
#include dbg_lay.hxx
#include accessibilityoptions.hxx
#include docsh.hxx
-#include swtable.hxx
#include svx/svdogrp.hxx
#include sortedobjs.hxx
#include EnhancedPDFExportHelper.hxx
@@ -99,14 +96,14 @@
#include ndole.hxx
#include svtools/chartprettypainter.hxx
#include PostItMgr.hxx
-#include tools/color.hxx
#include vcl/svapp.hxx
#define COL_NOTES_SIDEPANE RGB_COLORDATA(230,230,230)
#define COL_NOTES_SIDEPANE_BORDER RGB_COLORDATA(200,200,200)
#define COL_NOTES_SIDEPANE_SCROLLAREA RGB_COLORDATA(230,230,220)
-#include svtools/borderhelper.hxx
+#include svtools/borderhelper.hxx //Need for svtools::DrawLine
+#include swtable.hxx //Need for svtools::DrawLine
#include pagefrm.hrc
#include drawinglayer/geometry/viewinformation2d.hxx
@@ -125,6 +122,7 @@
#include basegfx/polygon/b2dpolygon.hxx
#include basegfx/color/bcolortools.hxx
+#include deque
#include algorithm
#include wrtsh.hxx
#include edtwin.hxx
@@ -133,8 +131,6 @@
using namespace ::editeng;
using namespace ::com::sun::star;
-#define GETOBJSHELL() ((SfxObjectShell*)rSh.GetDoc()-GetDocShell())
-
//subsidiary lines enabled?
#define IS_SUBS_TABLE \
(pGlobalShell-GetViewOptions()-IsTable() \
@@ -157,8 +153,6 @@ using namespace ::com::sun::star;
!pGlobalShell-GetViewOptions()-IsFormView() \
SwViewOption::IsObjectBoundaries())
-#define SW_MAXBORDERCACHE 20
-
//Class declaration; here because they are only used in this file
#define SUBCOL_PAGE 0x01//Helplines of the page
@@ -195,25 +189,24 @@ public:
sal_Bool MakeUnion( const SwRect rRect );
};
-SV_DECL_VARARR( SwLRects, SwLineRect, 100 )
-
-class SwLineRects : public SwLRects
+class SwLineRects : public std::deque SwLineRect
{
-sal_uInt16 nLastCount; //avoid unnecessary cycles in PaintLines
+std::deque SwLineRect ::iterator nLastCount; //avoid unnecessary cycles
in PaintLines
public:
-SwLineRects() : nLastCount( 0 ) {}
+SwLineRects() : nLastCount( this-begin() ) {}
void AddLineRect( const SwRect rRect, const Color *pColor, const
SvxBorderStyle nStyle,
const SwTabFrm *pTab, const sal_uInt8 nSCol );
void ConnectEdges( OutputDevice *pOut );
void PaintLines ( OutputDevice *pOut );
void LockLines( sal_Bool bLock );
-sal_uInt16 Free() const { return nFree; }
+//Limit lines to 100
+bool isFull() const { return this-size()100 ? true : false; }
};
class SwSubsRects : public SwLineRects
{
-void RemoveSuperfluousSubsidiaryLines( const SwLineRects rRects ); //;-)
+void RemoveSuperfluousSubsidiaryLines( const SwLineRects rRects );
public:
void PaintSubsidiary( OutputDevice *pOut, const SwLineRects *pRects );
@@ -436,7 +429,6 @@ SwSavePaintStatics::~SwSavePaintStatics()
//- Implementation for the table borders --
-SV_IMPL_VARARR( SwLRects, SwLineRect );
SwLineRect::SwLineRect( const SwRect rRect, const Color *pCol, const
SvxBorderStyle nStyl,
const SwTabFrm *pT, const sal_uInt8 nSCol ) :
@@ -496,9 +488,10 @@ void SwLineRects::AddLineRect( const SwRect rRect, const
Color *pCol, const Svx
//Loop backwards because lines which can be combined, can usually be
painted
//in the same context.
-for ( sal_uInt16 i = Count(); i ; )
+
+for (SwLineRects::iterator it = this-end(); it != this-begin(); --it)
{
-SwLineRect rLRect = operator[](--i);
+SwLineRect rLRect = (*it);
// Test for the orientation, color, table
if ( rLRect.GetTab() == pTab
!rLRect.IsPainted() rLRect.GetSubColor() == nSCol
@@ -510,7 +503,7 @@ void SwLineRects::AddLineRect( const SwRect rRect, const
Color *pCol, const Svx
return;
}
}
-Insert( SwLineRect( rRect, pCol, nStyle, pTab, nSCol ), Count() );
+this-push_back( SwLineRect( rRect, pCol, nStyle, pTab, nSCol ) );
}
void SwLineRects::ConnectEdges( OutputDevice *pOut )
@@
[Libreoffice-commits] .: basctl/source
basctl/source/basicide/basides1.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 0589dd3fb5c5bf2fdcdbccfab31fbe26c0a9727d
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Thu Mar 22 09:22:42 2012 +0100
fix debug build
diff --git a/basctl/source/basicide/basides1.cxx
b/basctl/source/basicide/basides1.cxx
index 6702f93..d9f5b63 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -468,6 +468,7 @@ void BasicIDEShell::ExecuteGlobal( SfxRequest rReq )
if ( aIDEWindowTable.find( rTabId.GetValue() ) !=
aIDEWindowTable.end() )
{
IDEBaseWindow* pWin = aIDEWindowTable[ rTabId.GetValue() ];
+DBG_ASSERT( pWin, Window nicht im Liste, aber in TabBar ? );
::rtl::OUString aNewName( rModName.GetValue() );
::rtl::OUString aOldName( pWin-GetName() );
if ( aNewName != aOldName )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: libcdr/libcdr-0.0.5-zip.patch libcdr/makefile.mk
libcdr/libcdr-0.0.5-zip.patch | 214 ++
libcdr/makefile.mk|3
2 files changed, 216 insertions(+), 1 deletion(-)
New commits:
commit be79f65e92626a4c6dcda9b31922c53bc7e03349
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Thu Mar 22 09:54:00 2012 +0100
Some changes in libcdr to appease valgrind
diff --git a/libcdr/libcdr-0.0.5-zip.patch b/libcdr/libcdr-0.0.5-zip.patch
new file mode 100644
index 000..0354cf9
--- /dev/null
+++ b/libcdr/libcdr-0.0.5-zip.patch
@@ -0,0 +1,214 @@
+--- misc/libcdr-0.0.5/src/lib/CDRInternalStream.cpp2012-03-15
11:30:05.0 +0100
misc/build/libcdr-0.0.5/src/lib/CDRInternalStream.cpp 2012-03-22
09:51:18.381882859 +0100
+@@ -49,19 +49,19 @@
+ m_offset(0),
+ m_buffer()
+ {
+- unsigned long tmpNumBytesRead = 0;
+-
+- const unsigned char *tmpBuffer = 0;
++ if (!size)
++return;
+
+ if (!compressed)
+ {
+-tmpBuffer = input-read(size, tmpNumBytesRead);
++unsigned long tmpNumBytesRead = 0;
++const unsigned char *tmpBuffer = input-read(size, tmpNumBytesRead);
+
+ if (size != tmpNumBytesRead)
+ return;
+
+ m_buffer = std::vectorunsigned char(size);
+-memcpy(m_buffer[0], tmpBuffer[0], size);
++memcpy(m_buffer[0], tmpBuffer, size);
+ }
+ else
+ {
+@@ -80,7 +80,8 @@
+ if (ret != Z_OK)
+ return;
+
+-tmpBuffer = input-read(size, tmpNumBytesRead);
++unsigned long tmpNumBytesRead = 0;
++const unsigned char *tmpBuffer = input-read(size, tmpNumBytesRead);
+
+ if (size != tmpNumBytesRead)
+ return;
+@@ -99,6 +100,7 @@
+ case Z_DATA_ERROR:
+ case Z_MEM_ERROR:
+ (void)inflateEnd(strm);
++m_buffer.clear();
+ return;
+ }
+
+@@ -109,7 +111,7 @@
+
+ }
+ while (strm.avail_out == 0);
+-
++(void)inflateEnd(strm);
+ }
+ }
+
+--- misc/libcdr-0.0.5/src/lib/CDRZipStream.cpp 2012-03-16 11:20:15.0
+0100
misc/build/libcdr-0.0.5/src/lib/CDRZipStream.cpp 2012-03-22
09:51:00.332335588 +0100
+@@ -30,6 +30,7 @@
+
+
+ #include string.h
++#include zlib.h
+ #include CDRZipStream.h
+ #include CDRInternalStream.h
+ #include libcdr_utils.h
+@@ -231,9 +232,9 @@
+ return true;
+ }
+
+-static bool findCentralDirectoryEnd(WPXInputStream *input, long startOffset)
++static bool findCentralDirectoryEnd(WPXInputStream *input)
+ {
+- input-seek(startOffset, WPX_SEEK_SET);
++ input-seek(0, WPX_SEEK_SET);
+ try
+ {
+ while (!input-atEOS())
+@@ -242,7 +243,6 @@
+ if (signature == CDIR_END_SIG)
+ {
+ input-seek(-4, WPX_SEEK_CUR);
+-startOffset = input-tell();
+ return true;
+ }
+ else
+@@ -256,9 +256,9 @@
+ return false;
+ }
+
+-static bool isZipStream(WPXInputStream *input, long startOffset)
++static bool isZipStream(WPXInputStream *input)
+ {
+- if (!findCentralDirectoryEnd(input, startOffset))
++ if (!findCentralDirectoryEnd(input))
+ return false;
+ CentralDirectoryEnd end;
+ if (!readCentralDirectoryEnd(input, end))
+@@ -276,17 +276,16 @@
+ return true;
+ }
+
+-static bool findDataStream(WPXInputStream *input, unsigned size, bool
compressed, long startOffset, const char *name)
++static bool findDataStream(WPXInputStream *input, CentralDirectoryEntry
entry, const char *name)
+ {
+ unsigned short name_size = strlen(name);
+- if (!findCentralDirectoryEnd(input, startOffset))
++ if (!findCentralDirectoryEnd(input))
+ return false;
+ CentralDirectoryEnd end;
+ if (!readCentralDirectoryEnd(input, end))
+ return false;
+ input-seek(end.cdir_offset, WPX_SEEK_SET);
+- CentralDirectoryEntry entry;
+- while (!input-atEOS() input-tell() startOffset input-tell()
end.cdir_offset + end.cdir_size)
++ while (!input-atEOS() (unsigned)input-tell() end.cdir_offset +
end.cdir_size)
+ {
+ if (!readCentralDirectoryEntry(input, entry))
+ return false;
+@@ -303,17 +302,63 @@
+ return false;
+ if (!areHeadersConsistent(header, entry))
+ return false;
+- size = entry.uncompressed_size;
+- compressed = (entry.compression != 0);
+ return true;
+ }
+
++WPXInputStream *getSubstream(WPXInputStream *input, const char *name)
++{
++ CentralDirectoryEntry entry;
++ if (!findDataStream(input, entry, name))
++return 0;
++ if (!entry.compression)
++return new CDRInternalStream(input, entry.compressed_size);
++ else
++ {
++int ret;
++z_stream strm;
++
++/* allocate inflate state */
++strm.zalloc = Z_NULL;
++strm.zfree = Z_NULL;
++strm.opaque = Z_NULL;
++strm.avail_in = 0;
++strm.next_in = Z_NULL;
++ret = inflateInit2(strm,-MAX_WBITS);
++if (ret != Z_OK)
++ return 0;
++
++unsigned long numBytesRead = 0;
++const unsigned char *compressedData = input-read(entry.compressed_size,
numBytesRead);
++if (numBytesRead != entry.compressed_size)
++ return 0;
++
++strm.avail_in = numBytesRead;
++
[Libreoffice-commits] .: oowintool
oowintool | 10 +-
1 file changed, 1 insertion(+), 9 deletions(-)
New commits:
commit a75fd2d50e8c0ad82bcd0bbfeafd6a7f0153b7ba
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Thu Mar 22 10:41:44 2012 +0100
Look for properly registered windows sdks instead for random version numbers
diff --git a/oowintool b/oowintool
index ce55e88..06e6607 100755
--- a/oowintool
+++ b/oowintool
@@ -96,15 +96,7 @@ sub print_windows_sdk_home()
{
my ($value, $key);
-$value = reg_get_value ('HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft
SDKs/Windows/v6.1/InstallationFolder');
-
-if (!defined $value) {
-$value = reg_get_value
('HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft
SDKs/Windows/v7.1/InstallationFolder');
-}
-
-if (!defined $value) {
-$value = reg_get_value
('HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft
SDKs/Windows/CurrentInstallFolder');
-}
+$value = reg_get_value ('HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft
SDKs/Windows/CurrentInstallFolder');
if (!defined $value) {
$value = reg_get_value
('HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/MicrosoftSDK/Directories/Install Dir');
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/core/doc/docdraw.cxx|3 --
sw/source/core/doc/docedt.cxx |9 ++
sw/source/core/docnode/ndcopy.cxx | 56 +++---
sw/source/core/inc/mvsave.hxx |5 +--
4 files changed, 34 insertions(+), 39 deletions(-)
New commits:
commit db51589575d37ca608067ad9904dcc6a09651e8c
Author: Bartosz Kosiorek gan...@poczta.onet.pl
Date: Thu Mar 15 07:26:54 2012 +0100
Convert SVARRAY SORT into STL set
diff --git a/sw/source/core/doc/docdraw.cxx b/sw/source/core/doc/docdraw.cxx
index 2d5671c..cbff064 100644
--- a/sw/source/core/doc/docdraw.cxx
+++ b/sw/source/core/doc/docdraw.cxx
@@ -76,9 +76,6 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::linguistic2;
-
-SV_IMPL_VARARR_SORT( _ZSortFlys, _ZSortFly )
-
/*
|*
|* SwDoc::GroupSelection / SwDoc::UnGroupSelection
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index 26a2ad8..6c73ba1 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -163,7 +163,6 @@ struct _SaveRedline
SV_DECL_PTRARR_DEL( _SaveRedlines, _SaveRedline*, 0 )
-SV_IMPL_VARARR( _SaveFlyArr, _SaveFly )
SV_IMPL_PTRARR( _SaveRedlines, _SaveRedline* )
bool lcl_MayOverwrite( const SwTxtNode *pNode, const xub_StrLen nPos )
@@ -191,7 +190,7 @@ void _RestFlyInRange( _SaveFlyArr rArr, const
SwNodeIndex rSttIdx,
const SwNodeIndex* pInsertPos )
{
SwPosition aPos( rSttIdx );
-for( sal_uInt16 n = 0; n rArr.Count(); ++n )
+for( size_t n = 0; n rArr.size(); ++n )
{
// create new anchor
_SaveFly rSave = rArr[n];
@@ -234,7 +233,7 @@ void _SaveFlyInRange( const SwNodeRange rRg, _SaveFlyArr
rArr )
{
_SaveFly aSave( pAPos-nNode.GetIndex() - rRg.aStart.GetIndex(),
pFmt, sal_False );
-rArr.Insert( aSave, rArr.Count());
+rArr.push_back( aSave );
pFmt-DelFrms();
rFmts.Remove( n--, 1 );
}
@@ -295,7 +294,7 @@ void _SaveFlyInRange( const SwPaM rPam, const SwNodeIndex
rInsPos,
{
_SaveFly aSave( pAPos-nNode.GetIndex() - rSttNdIdx.GetIndex(),
pFmt, bInsPos );
-rArr.Insert( aSave, rArr.Count());
+rArr.push_back( aSave );
pFmt-DelFrms();
rFmts.Remove( n--, 1 );
}
@@ -1188,7 +1187,7 @@ bool SwDoc::MoveNodeRange( SwNodeRange rRange,
SwNodeIndex rPos,
}
// move the Flys to the new position
-if( aSaveFlyArr.Count() )
+if( !aSaveFlyArr.empty() )
_RestFlyInRange( aSaveFlyArr, aIdx, NULL );
// Add the Bookmarks back to the Document
diff --git a/sw/source/core/docnode/ndcopy.cxx
b/sw/source/core/docnode/ndcopy.cxx
index 4aabfba..97557f2 100644
--- a/sw/source/core/docnode/ndcopy.cxx
+++ b/sw/source/core/docnode/ndcopy.cxx
@@ -53,6 +53,8 @@
#include pagedesc.hxx
#include poolfmt.hxx
#include SwNodeNum.hxx
+#include set
+#include vector
#ifdef DBG_UTIL
#define CHECK_TABLE(t) (t).CheckConsistency();
@@ -328,7 +330,7 @@ sal_Bool lcl_CopyTblLine( const SwTableLine* rpLine, void*
pPara );
sal_Bool lcl_CopyTblBox( const SwTableBox* rpBox, void* pPara )
{
-_CopyTable* pCT = (_CopyTable*)pPara;
+_CopyTable* pCT = reinterpret_cast _CopyTable* (pPara);
SwTableBoxFmt* pBoxFmt = (SwTableBoxFmt*)rpBox-GetFrmFmt();
pCT-rMapArr.ForEach( lcl_SrchNew, pBoxFmt );
@@ -392,7 +394,7 @@ sal_Bool lcl_CopyTblBox( const SwTableBox* rpBox, void*
pPara )
sal_Bool lcl_CopyTblLine( const SwTableLine* rpLine, void* pPara )
{
-_CopyTable* pCT = (_CopyTable*)pPara;
+_CopyTable* pCT = reinterpret_cast _CopyTable* (pPara);
SwTableLineFmt* pLineFmt = (SwTableLineFmt*)rpLine-GetFrmFmt();
pCT-rMapArr.ForEach( lcl_SrchNew, pLineFmt );
if( pLineFmt == rpLine-GetFrmFmt() ) // ein neues anlegen ??
@@ -1403,7 +1405,7 @@ void SwDoc::CopyFlyInFlyImpl( const SwNodeRange rRg,
//die Ordnungsnummer (wird nur im DrawModel verwaltet)
//beibehalten.
SwDoc *const pDest = rStartIdx.GetNode().GetDoc();
-_ZSortFlys aArr;
+::std::set _ZSortFly aSet;
sal_uInt16 nArrLen = GetSpzFrmFmts()-Count();
for ( sal_uInt16 n = 0; n nArrLen; ++n )
@@ -1467,22 +1469,20 @@ void SwDoc::CopyFlyInFlyImpl( const SwNodeRange rRg,
}
}
if( bAdd )
-aArr.Insert( _ZSortFly( pFmt, pAnchor, nArrLen + aArr.Count()
));
+aSet.insert( _ZSortFly( pFmt, pAnchor, nArrLen + aSet.size()
));
}
}
//Alle kopierten (also die neu erzeugten) Rahmen in ein weiteres Array
//stopfen. Dort sizten sie passend zu den Originalen, damit hinterher
//die Chains entsprechend aufgebaut werden koennen.
-SvPtrarr aNewArr( 10 );
+::std::vector
[Libreoffice-commits] .: basctl/source
basctl/source/basicide/basides1.cxx |1 -
1 file changed, 1 deletion(-)
New commits:
commit 0a8596dd8ebbbc80e87d4bdfafe3cf53355b7d43
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Thu Mar 22 14:46:02 2012 +0100
Revert fix debug build
This reverts commit 0589dd3fb5c5bf2fdcdbccfab31fbe26c0a9727d.
Given the find above, this assert will never be triggered anyway
diff --git a/basctl/source/basicide/basides1.cxx
b/basctl/source/basicide/basides1.cxx
index d9f5b63..6702f93 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -468,7 +468,6 @@ void BasicIDEShell::ExecuteGlobal( SfxRequest rReq )
if ( aIDEWindowTable.find( rTabId.GetValue() ) !=
aIDEWindowTable.end() )
{
IDEBaseWindow* pWin = aIDEWindowTable[ rTabId.GetValue() ];
-DBG_ASSERT( pWin, Window nicht im Liste, aber in TabBar ? );
::rtl::OUString aNewName( rModName.GetValue() );
::rtl::OUString aOldName( pWin-GetName() );
if ( aNewName != aOldName )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: shell/source
shell/source/win32/zipfile/zipfile.cxx |2 -- 1 file changed, 2 deletions(-) New commits: commit e6aa2b67d4c0f1a65fcddabb77186c75a3ae1c1a Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Wed Mar 21 10:52:07 2012 +0100 Remove unused define diff --git a/shell/source/win32/zipfile/zipfile.cxx b/shell/source/win32/zipfile/zipfile.cxx index de99aa6..e443313 100644 --- a/shell/source/win32/zipfile/zipfile.cxx +++ b/shell/source/win32/zipfile/zipfile.cxx @@ -416,8 +416,6 @@ ZipFile::~ZipFile() delete m_pStream; } -#define CHUNK 16384 - /** Provides an interface to read the uncompressed data of a content of the zip file @precondThe specified content must exist in this file ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: shell/source
shell/source/win32/zipfile/zipfile.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit baebdaa48e88949bf6aa92c478733518bede5c6e Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Wed Mar 21 13:42:38 2012 +0100 Call inflateInit2 instead of inflateInit for the zip stream diff --git a/shell/source/win32/zipfile/zipfile.cxx b/shell/source/win32/zipfile/zipfile.cxx index e443313..1154e54 100644 --- a/shell/source/win32/zipfile/zipfile.cxx +++ b/shell/source/win32/zipfile/zipfile.cxx @@ -464,7 +464,7 @@ void ZipFile::GetUncompressedContent( strm.opaque = Z_NULL; strm.avail_in = 0; strm.next_in = Z_NULL; -ret = inflateInit(strm); +ret = inflateInit2(strm,-MAX_WBITS); if (ret != Z_OK) return; ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: shell/source
shell/source/win32/zipfile/zipfile.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit f729d2d83034167db9727c2de2f4e5a32a7374d8 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Wed Mar 21 22:42:43 2012 +0100 Appease valgrind diff --git a/shell/source/win32/zipfile/zipfile.cxx b/shell/source/win32/zipfile/zipfile.cxx index 1154e54..452c17a 100644 --- a/shell/source/win32/zipfile/zipfile.cxx +++ b/shell/source/win32/zipfile/zipfile.cxx @@ -487,6 +487,7 @@ void ZipFile::GetUncompressedContent( ContentBuffer.clear(); return; } + (void)inflateEnd(strm); } } ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sdext/source
sdext/source/presenter/PresenterSprite.cxx |2 --
sdext/source/presenter/PresenterSprite.hxx |1 -
2 files changed, 3 deletions(-)
New commits:
commit e55595d0e081ccdca41f621177e1b32eb9a649e3
Author: Christina Rossmanith chrrossman...@web.de
Date: Tue Mar 20 20:35:01 2012 +0100
maTransform had to go ( was always = identity)
diff --git a/sdext/source/presenter/PresenterSprite.cxx
b/sdext/source/presenter/PresenterSprite.cxx
index aa396eb..2164566 100644
--- a/sdext/source/presenter/PresenterSprite.cxx
+++ b/sdext/source/presenter/PresenterSprite.cxx
@@ -44,7 +44,6 @@ PresenterSprite::PresenterSprite (void)
mxSprite(),
maSize(0,0),
maLocation(0,0),
- maTransform(1,0,0, 0,1,0),
mbIsVisible(false),
mnPriority(0),
mnAlpha(1.0)
@@ -142,7 +141,6 @@ void PresenterSprite::ProvideSprite (void)
mxSprite = mxSpriteFactory-createCustomSprite(maSize);
if (mxSprite.is())
{
-mxSprite-transform(maTransform);
mxSprite-move(maLocation,
rendering::ViewState(
geometry::AffineMatrix2D(1,0,0, 0,1,0),
diff --git a/sdext/source/presenter/PresenterSprite.hxx
b/sdext/source/presenter/PresenterSprite.hxx
index 2896712..0478d43 100644
--- a/sdext/source/presenter/PresenterSprite.hxx
+++ b/sdext/source/presenter/PresenterSprite.hxx
@@ -73,7 +73,6 @@ private:
::css::uno::Referencecss::rendering::XCustomSprite mxSprite;
css::geometry::RealSize2D maSize;
css::geometry::RealPoint2D maLocation;
-css::geometry::AffineMatrix2D maTransform;
bool mbIsVisible;
double mnPriority;
double mnAlpha;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: basctl/source
basctl/source/basicide/basides1.cxx| 54 +++--
basctl/source/basicide/basides2.cxx| 20 ++--
basctl/source/basicide/basides3.cxx| 27 --
basctl/source/basicide/basidesh.cxx| 117 +++--
basctl/source/basicide/basobj2.cxx |2
basctl/source/basicide/basobj3.cxx |7 -
basctl/source/basicide/bastypes.cxx|8 -
basctl/source/basicide/localizationmgr.cxx |5 -
basctl/source/inc/basidesh.hxx |7 -
9 files changed, 137 insertions(+), 110 deletions(-)
New commits:
commit 000bb6af72e934d7f0fd2291cea919437cfd5e2f
Author: Noel Grandin n...@peralex.com
Date: Tue Mar 20 10:03:56 2012 +0200
Convert tools/table.hxx usage to std::map in Basic IDE module
diff --git a/basctl/source/basicide/basides1.cxx
b/basctl/source/basicide/basides1.cxx
index d78f43a..d0c9fba 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -146,6 +146,7 @@ void BasicIDEShell::ExecuteCurrent( SfxRequest rReq )
DBG_ASSERT( nWhich, Wich fuer SearchItem ? );
const SfxPoolItem rItem = pArgs-Get( nWhich );
DBG_ASSERT( rItem.ISA( SvxSearchItem ), Kein Searchitem! );
+IDEWindowTable::const_iterator it;
if ( rItem.ISA( SvxSearchItem ) )
{
// memorize item because of the adjustments...
@@ -155,22 +156,20 @@ void BasicIDEShell::ExecuteCurrent( SfxRequest rReq )
if ( ((const SvxSearchItem)rItem).GetCommand() ==
SVX_SEARCHCMD_REPLACE_ALL )
{
sal_uInt16 nActModWindows = 0;
-IDEBaseWindow* pWin = aIDEWindowTable.First();
-while ( pWin )
+for( it = aIDEWindowTable.begin(); it !=
aIDEWindowTable.end(); ++it )
{
+IDEBaseWindow* pWin = it-second;
if ( !pWin-IsSuspended() pWin-IsA( TYPE(
ModulWindow ) ) )
nActModWindows++;
-pWin = aIDEWindowTable.Next();
}
if ( ( nActModWindows = 1 ) || ( !((const
SvxSearchItem)rItem).GetSelection() QueryBox( pCurWin,
WB_YES_NO|WB_DEF_YES, String( IDEResId( RID_STR_SEARCHALLMODULES ) )
).Execute() == RET_YES ) )
{
-pWin = aIDEWindowTable.First();
-while ( pWin )
+for( it = aIDEWindowTable.begin(); it !=
aIDEWindowTable.end(); ++it )
{
+IDEBaseWindow* pWin = it-second;
if ( !pWin-IsSuspended() pWin-IsA( TYPE(
ModulWindow ) ) )
nFound = nFound +
((ModulWindow*)pWin)-StartSearchAndReplace( (const SvxSearchItem)rItem );
-pWin = aIDEWindowTable.Next();
}
}
else
@@ -187,8 +186,15 @@ void BasicIDEShell::ExecuteCurrent( SfxRequest rReq )
{
// search other modules...
sal_Bool bChangeCurWindow = sal_False;
-aIDEWindowTable.Seek( pCurWin );
-IDEBaseWindow* pWin = aIDEWindowTable.Next();
+for( it = aIDEWindowTable.begin(); it !=
aIDEWindowTable.end(); ++it )
+if ( it-second == pCurWin)
+break;
+if ( it != aIDEWindowTable.end() )
+++it;
+IDEBaseWindow* pWin = NULL;
+if ( it != aIDEWindowTable.end() )
+pWin = it-second;
+
sal_Bool bSearchedFromStart = sal_False;
while ( !nFound !bCanceled ( pWin ||
!bSearchedFromStart ) )
{
@@ -200,7 +206,9 @@ void BasicIDEShell::ExecuteCurrent( SfxRequest rReq )
QueryBox aQuery(pParent,
WB_YES_NO|WB_DEF_YES, ResId::toString(IDEResId(RID_STR_SEARCHFROMSTART)));
if ( aQuery.Execute() == RET_YES )
{
-pWin = aIDEWindowTable.First();
+it = aIDEWindowTable.begin();
+if ( it != aIDEWindowTable.end() )
+pWin = it-second;
bSearchedFromStart = sal_True;
}
else
@@ -222,7 +230,11 @@ void
[Libreoffice-commits] .: 2 commits - sc/source
sc/source/filter/html/htmlpars.cxx | 86 +++--
sc/source/filter/inc/eeimport.hxx |6 +-
sc/source/filter/inc/htmlpars.hxx |6 ++
sc/source/filter/rtf/eeimpars.cxx | 18 +++
4 files changed, 71 insertions(+), 45 deletions(-)
New commits:
commit 7d7e2c3636661c52ff708eb7799f481db5f98dfc
Author: Noel Grandin n...@peralex.com
Date: Mon Mar 19 11:12:51 2012 +0200
Convert tools/table.hxx to std::map in class ScHTMLLayoutParser
diff --git a/sc/source/filter/html/htmlpars.cxx
b/sc/source/filter/html/htmlpars.cxx
index b9f9fb8..aaae381 100644
--- a/sc/source/filter/html/htmlpars.cxx
+++ b/sc/source/filter/html/htmlpars.cxx
@@ -282,8 +282,8 @@ ScHTMLLayoutParser::~ScHTMLLayoutParser()
delete pColOffset;
if ( pTables )
{
-for ( Table* pT = (Table*) pTables-First(); pT; pT = (Table*)
pTables-Next() )
-delete pT;
+for( OuterMap::const_iterator it = pTables-begin(); it !=
pTables-end(); ++it)
+delete it-second;
delete pTables;
}
}
@@ -539,7 +539,7 @@ void ScHTMLLayoutParser::Adjust()
SCROW nNextRow = 0;
SCROW nCurRow = 0;
sal_uInt16 nPageWidth = (sal_uInt16) aPageSize.Width();
-Table* pTab = NULL;
+InnerMap* pTab = NULL;
for ( size_t i = 0, nListSize = maList.size(); i nListSize; ++i )
{
ScEEParseEntry* pE = maList[ i ];
@@ -556,7 +556,12 @@ void ScHTMLLayoutParser::Adjust()
}
delete pS;
nTab = pE-nTab;
-pTab = (pTables ? (Table*) pTables-Get( nTab ) : NULL);
+if (pTables)
+{
+OuterMap::const_iterator it = pTables-find( nTab );
+if ( it != pTables-end() )
+pTab = it-second;
+}
}
SCROW nRow = pE-nRow;
@@ -566,8 +571,14 @@ void ScHTMLLayoutParser::Adjust()
pE-nRow = nCurRow = nNextRow;
else
nCurRow = nNextRow = pE-nRow;
-SCROW nR;
-if ( pTab ((nR = (SCROW)(sal_uLong)pTab-Get( nCurRow )) != 0) )
+SCROW nR = 0;
+if ( pTab )
+{
+InnerMap::const_iterator it = pTab-find( nCurRow );
+if ( it != pTab-end() )
+nR = it-second;
+}
+if ( nR )
nNextRow += nR;
else
nNextRow++;
@@ -580,10 +591,21 @@ void ScHTMLLayoutParser::Adjust()
aStack.push( new ScHTMLAdjustStackEntry(
nLastCol, nNextRow, nCurRow ) );
nTab = pE-nTab;
-pTab = (pTables ? (Table*) pTables-Get( nTab ) : NULL);
+if ( pTables )
+{
+OuterMap::const_iterator it = pTables-find( nTab );
+if ( it != pTables-end() )
+pTab = it-second;
+}
// neuer Zeilenabstand
-SCROW nR;
-if ( pTab ((nR = (SCROW)(sal_uLong)pTab-Get( nCurRow )) != 0) )
+SCROW nR = 0;
+if ( pTab )
+{
+InnerMap::const_iterator it = pTab-find( nCurRow );
+if ( it != pTab-end() )
+nR = it-second;
+}
+if ( nR )
nNextRow = nCurRow + nR;
else
nNextRow = nCurRow + 1;
@@ -597,7 +619,10 @@ void ScHTMLLayoutParser::Adjust()
SCROW nRowSpan = pE-nRowOverlap;
for ( SCROW j=0; j nRowSpan; j++ )
{ // aus merged Zeilen resultierendes RowSpan
-SCROW nRows = (SCROW)(sal_uLong)pTab-Get( nRow+j );
+SCROW nRows = 0;
+InnerMap::const_iterator it = pTab-find( nRow+j );
+if ( it != pTab-end() )
+nRows = it-second;
if ( nRows 1 )
{
pE-nRowOverlap += nRows - 1;
@@ -1229,14 +1254,17 @@ void ScHTMLLayoutParser::TableOff( ImportInfo* pInfo )
SCROW nRow = pS-nRowCnt;
sal_uInt16 nTab = pS-nTable;
if ( !pTables )
-pTables = new Table;
+pTables = new OuterMap;
// Hoehen der aeusseren Table
-Table* pTab1 = (Table*) pTables-Get( nTab );
-if ( !pTab1 )
+OuterMap::const_iterator it = pTables-find( nTab );
+InnerMap* pTab1;
+if ( it == pTables-end() )
{
-pTab1 = new Table;
-pTables-Insert( nTab, pTab1 );
+pTab1 = new InnerMap;
+(*pTables)[ nTab ] = pTab1;
}
+else
+pTab1 = it-second;
SCROW nRowSpan = pE-nRowOverlap;
SCROW nRowKGV;
SCROW nRowsPerRow1;
[Libreoffice-commits] .: filter/source
filter/source/svg/svgreader.cxx |9 +
1 file changed, 5 insertions(+), 4 deletions(-)
New commits:
commit 11ccf88eeb8e4148ca532e3a42ddca356ebde811
Author: Christina Rossmanith chrrossman...@web.de
Date: Sat Mar 17 22:06:22 2012 +0100
SVG import: keep aspect ratio when transforming viewbox to viewport
diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx
index 5d46c7c..cd5da23 100644
--- a/filter/source/svg/svgreader.cxx
+++ b/filter/source/svg/svgreader.cxx
@@ -293,12 +293,13 @@ struct AnnotatingVisitor
maCurrState.maViewBox.getWidth() != 0.0
maCurrState.maViewBox.getHeight() != 0.0 )
{
-// transform aViewBox into viewport, such that they
-// coincide
+// transform aViewBox into viewport, keep aspect ratio
aLocalTransform.translate(-maCurrState.maViewBox.getMinX(),
-maCurrState.maViewBox.getMinY());
-
aLocalTransform.scale(maCurrState.maViewport.getWidth()/maCurrState.maViewBox.getWidth(),
-
maCurrState.maViewport.getHeight()/maCurrState.maViewBox.getHeight());
+double scaleW =
maCurrState.maViewport.getWidth()/maCurrState.maViewBox.getWidth();
+double scaleH =
maCurrState.maViewport.getHeight()/maCurrState.maViewBox.getHeight();
+double scale = (scaleW scaleH) ? scaleW : scaleH;
+aLocalTransform.scale(scale,scale);
}
maCurrState.maCTM =
maCurrState.maCTM*maCurrState.maTransform*aLocalTransform;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - shell/inc shell/source zlib/prj zlib/zlib-1.2.5.patch
shell/inc/internal/basereader.hxx |2
shell/inc/internal/contentreader.hxx |3
shell/inc/internal/metainforeader.hxx |2
shell/inc/internal/stream_helper.hxx | 24
shell/inc/internal/types.hxx | 17
shell/inc/internal/zipfile.hxx| 29
shell/source/win32/ooofilereader/basereader.cxx |4
shell/source/win32/ooofilereader/contentreader.cxx|4
shell/source/win32/ooofilereader/metainforeader.cxx |4
shell/source/win32/shlxthandler/makefile.mk |2
shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx | 11
shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx |2
shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx | 190 ++---
shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx |5
shell/source/win32/zipfile/zipfile.cxx| 473 +++---
zlib/prj/d.lst|2
zlib/zlib-1.2.5.patch | 10
17 files changed, 550 insertions(+), 234 deletions(-)
New commits:
commit e515cc938e21dd033d7e36440e20eb7cf561c293
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Mon Mar 19 15:22:04 2012 +0100
Don't build unnecessary files
diff --git a/zlib/prj/d.lst b/zlib/prj/d.lst
index dc223ae..4f4996b 100644
--- a/zlib/prj/d.lst
+++ b/zlib/prj/d.lst
@@ -3,8 +3,6 @@ mkdir: %_DEST%\lib\x64
..\%__SRC%\inc\patched\zlib.h %_DEST%\inc\external\zlib\zlib.h
..\%__SRC%\inc\unzip.h %_DEST%\inc\external\zlib\unzip.h
-..\%__SRC%\inc\ioapi.h %_DEST%\inc\external\zlib\ioapi.h
-..\%__SRC%\inc\zconf.h %_DEST%\inc\external\zlib\zconf.h
..\%__SRC%\lib\libzlib.a %_DEST%\lib\libzlib.a
..\%__SRC%\slb\zlib.lib %_DEST%\lib\zlib.lib
diff --git a/zlib/zlib-1.2.5.patch b/zlib/zlib-1.2.5.patch
index 7021a2c..3389b88 100644
--- a/zlib/zlib-1.2.5.patch
+++ b/zlib/zlib-1.2.5.patch
@@ -1,6 +1,6 @@
--- misc/zlib-1.2.5/makefile.mkFri Mar 14 10:17:06 2008
+++ misc/build/zlib-1.2.5/makefile.mk Fri Mar 14 10:16:56 2008
-@@ -1 +1,67 @@
+@@ -1 +1,63 @@
-dummy
+#*
+#
@@ -31,9 +31,7 @@
+ $(SLO)$/inflate.obj \
+ $(SLO)$/inftrees.obj\
+ $(SLO)$/trees.obj \
-+ $(SLO)$/zutil.obj \
-+ $(SLO)$/unzip.obj \
-+ $(SLO)$/ioapi.obj
++ $(SLO)$/zutil.obj
+
+
+LIB1TARGET=$(SLB)$/$(TARGET).lib
@@ -49,9 +47,7 @@
+ $(SLO_X64)$/inflate.obj \
+ $(SLO_X64)$/inftrees.obj\
+ $(SLO_X64)$/trees.obj \
-+ $(SLO_X64)$/zutil.obj \
-+ $(SLO_X64)$/unzip.obj \
-+ $(SLO_X64)$/ioapi.obj
++ $(SLO_X64)$/zutil.obj
+
+LIB1TARGET_X64=$(SLB_X64)$/$(TARGET).lib
+LIB1OBJFILES_X64=$(SLOFILES_X64)
commit 04366df3bca16d4e0cbe254551e44427ae6338bb
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Mon Mar 19 15:09:34 2012 +0100
Simple Zip file-format implementation to avoid the need of minizip
diff --git a/shell/inc/internal/basereader.hxx
b/shell/inc/internal/basereader.hxx
index bb5c276..7a15410 100644
--- a/shell/inc/internal/basereader.hxx
+++ b/shell/inc/internal/basereader.hxx
@@ -46,7 +46,7 @@ public:
protected: // protected because its only an implementation relevant class
CBaseReader( const std::string DocumentName );
-CBaseReader( void* stream, zlib_filefunc_def* fa );
+CBaseReader( StreamInterface *stream );
virtual void start_document();
diff --git a/shell/inc/internal/contentreader.hxx
b/shell/inc/internal/contentreader.hxx
index 6a7dc59..e55a760 100644
--- a/shell/inc/internal/contentreader.hxx
+++ b/shell/inc/internal/contentreader.hxx
@@ -32,6 +32,7 @@
#include internal/basereader.hxx
class ITag;
+class StreamInterface;
class CContentReader : public CBaseReader
{
@@ -40,7 +41,7 @@ public:
CContentReader( const std::string DocumentName, LocaleSet_t const
DocumentLocale );
-CContentReader( void* stream, LocaleSet_t const DocumentLocale,
zlib_filefunc_def* fa );
+CContentReader( StreamInterface* stream, LocaleSet_t const
DocumentLocale );
/** Get the chunkbuffer.
diff --git a/shell/inc/internal/metainforeader.hxx
b/shell/inc/internal/metainforeader.hxx
index 5162245..a0ed7d9 100644
--- a/shell/inc/internal/metainforeader.hxx
+++ b/shell/inc/internal/metainforeader.hxx
@@ -44,7 +44,7 @@ public:
CMetaInfoReader( const std::string DocumentName );
-CMetaInfoReader( void* stream, zlib_filefunc_def* fa);
+CMetaInfoReader( StreamInterface* stream );
/**
[Libreoffice-commits] .: zlib/prj
zlib/prj/d.lst |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e1b8187d598cba25503f9c56740eb6109b2c355c Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Mon Mar 19 15:44:46 2012 +0100 OOps diff --git a/zlib/prj/d.lst b/zlib/prj/d.lst index 4f4996b..ef40caf 100644 --- a/zlib/prj/d.lst +++ b/zlib/prj/d.lst @@ -2,7 +2,7 @@ mkdir: %_DEST%\inc\external\zlib mkdir: %_DEST%\lib\x64 ..\%__SRC%\inc\patched\zlib.h %_DEST%\inc\external\zlib\zlib.h -..\%__SRC%\inc\unzip.h %_DEST%\inc\external\zlib\unzip.h +..\%__SRC%\inc\zconf.h %_DEST%\inc\external\zlib\zconf.h ..\%__SRC%\lib\libzlib.a %_DEST%\lib\libzlib.a ..\%__SRC%\slb\zlib.lib %_DEST%\lib\zlib.lib ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: libcdr/libcdr-0.0.4.patch libcdr/libcdr-0.0.5.patch libcdr/makefile.mk libcdr/prj ooo.lst.in
libcdr/libcdr-0.0.4.patch | 20 libcdr/libcdr-0.0.5.patch | 20 libcdr/makefile.mk|4 ++-- libcdr/prj/d.lst |1 + ooo.lst.in|2 +- 5 files changed, 24 insertions(+), 23 deletions(-) New commits: commit 06427dfad309bec7aad2c60ed7c21ae9c814b403 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Fri Mar 16 15:33:21 2012 +0100 Uploading libcdr-0.0.5 diff --git a/libcdr/libcdr-0.0.4.patch b/libcdr/libcdr-0.0.4.patch deleted file mode 100644 index 9e9079d..000 --- a/libcdr/libcdr-0.0.4.patch +++ /dev/null @@ -1,20 +0,0 @@ misc/libcdr-0.0.4/src/lib/libcdr_utils.h 2012-03-07 13:51:21.0 +0100 -+++ misc/build/libcdr-0.0.4/src/lib/libcdr_utils.h 2012-03-08 12:46:38.194534604 +0100 -@@ -54,17 +54,8 @@ - - #else - --#ifdef HAVE_CONFIG_H --#include config.h --#endif -- --#ifdef HAVE_STDINT_H - #include stdint.h --#endif -- --#ifdef HAVE_INTTYPES_H - #include inttypes.h --#endif - - #endif - diff --git a/libcdr/libcdr-0.0.5.patch b/libcdr/libcdr-0.0.5.patch new file mode 100644 index 000..b622bd6 --- /dev/null +++ b/libcdr/libcdr-0.0.5.patch @@ -0,0 +1,20 @@ +--- misc/libcdr-0.0.5/src/lib/libcdr_utils.h 2012-03-07 13:51:21.0 +0100 misc/build/libcdr-0.0.5/src/lib/libcdr_utils.h 2012-03-08 12:46:38.194534604 +0100 +@@ -54,17 +54,8 @@ + + #else + +-#ifdef HAVE_CONFIG_H +-#include config.h +-#endif +- +-#ifdef HAVE_STDINT_H + #include stdint.h +-#endif +- +-#ifdef HAVE_INTTYPES_H + #include inttypes.h +-#endif + + #endif + diff --git a/libcdr/makefile.mk b/libcdr/makefile.mk index 30ffd2f..475fb2c 100644 --- a/libcdr/makefile.mk +++ b/libcdr/makefile.mk @@ -59,8 +59,8 @@ INCPRE+=$(LCMS2_CFLAGS) INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/lcms2 .ENDIF -TARFILE_NAME=libcdr-0.0.4 -TARFILE_MD5=b99553516040a6f9d5885db56e8ca79f +TARFILE_NAME=libcdr-0.0.5 +TARFILE_MD5=4def42cfe3527ed7c515bea8cc3f23b8 PATCH_FILES=\ $(TARFILE_NAME).patch diff --git a/libcdr/prj/d.lst b/libcdr/prj/d.lst index f74aa63..e3ec3bd 100644 --- a/libcdr/prj/d.lst +++ b/libcdr/prj/d.lst @@ -2,5 +2,6 @@ mkdir: %_DEST%\inc\libcdr ..\%__SRC%\misc\build\libcdr*\src\lib\libcdr.h %_DEST%\inc\libcdr ..\%__SRC%\misc\build\libcdr*\src\lib\CDRDocument.h %_DEST%\inc\libcdr\ ..\%__SRC%\misc\build\libcdr*\src\lib\CDRStringVector.h %_DEST%\inc\libcdr\ +..\%__SRC%\misc\build\libcdr*\src\lib\CMXDocument.h %_DEST%\inc\libcdr\ ..\%__SRC%\lib\*.a %_DEST%\lib\*.a ..\%__SRC%\slb\*.lib %_DEST%\lib\*.lib diff --git a/ooo.lst.in b/ooo.lst.in index a57cc20..5de0e5a 100644 --- a/ooo.lst.in +++ b/ooo.lst.in @@ -90,7 +90,7 @@ f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 d28864eb2b59bb57b034c0d4662a3cee-libvisio-0.0.15.tar.bz2 e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip 7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz -b99553516040a6f9d5885db56e8ca79f-libcdr-0.0.4.tar.bz2 +4def42cfe3527ed7c515bea8cc3f23b8-libcdr-0.0.5.tar.bz2 327348d67c979c88c2dec59a23a17d85-lcms2-2.3.tar.gz @GOOGLE_DOCS_EXTENSION_PACK@ @FREETYPE_TARBALL@ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: lcms2/makefile.mk
lcms2/makefile.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 073ea37399a3b9b44e5780c1cf2a6b76e44d8359 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Tue Mar 13 14:15:20 2012 +0100 Revert Pass /useenv to vcbuild so that rc and link find SDK headers and libs It breaks on a clean installs of Windows, and registration of SDK with Visual Studio seems to be the answer. This reverts commit f3f6c9be9864088b94f874c6ef2ce8ab1dd45f2a. Conflicts: lcms2/makefile.mk diff --git a/lcms2/makefile.mk b/lcms2/makefile.mk index 83458ca..0c7f5d5 100644 --- a/lcms2/makefile.mk +++ b/lcms2/makefile.mk @@ -55,7 +55,7 @@ BUILD_DIR=Projects/VC2010/lcms2_DLL .IF $(CCNUMVER) = 0016 BUILD_ACTION=MSBuild.exe lcms2_DLL.vcxproj /p:Configuration=Release /p:Platform=Win32 .ELSE -BUILD_ACTION=$(COMPATH)$/vcpackages$/vcbuild.exe /useenv lcms2_DLL.vcproj Release|Win32 +BUILD_ACTION=$(COMPATH)$/vcpackages$/vcbuild.exe lcms2_DLL.vcproj Release|Win32 .ENDIF .ELSE #$(GUI)$(COM)!=WNTMSC ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: writerperfect/source
writerperfect/source/filter/OdgGenerator.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 5eee7de29362ecd00d43ed9eb9ed7230606dc92a Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Mon Mar 12 10:40:10 2012 +0100 CP error diff --git a/writerperfect/source/filter/OdgGenerator.cxx b/writerperfect/source/filter/OdgGenerator.cxx index dc257a3..897ce4e 100644 --- a/writerperfect/source/filter/OdgGenerator.cxx +++ b/writerperfect/source/filter/OdgGenerator.cxx @@ -1484,9 +1484,9 @@ void OdgGeneratorPrivate::_writeGraphicsStyle() if (mxStyle[draw:fill-image-ref-point]) pStyleGraphicsPropertiesElement-addAttribute(draw:fill-image-ref-point, mxStyle[draw:fill-image-ref-point]-getStr()); if (mxStyle[draw:fill-image-ref-point-x]) - pStyleGraphicsPropertiesElement-addAttribute(draw:fill-image-ref-point-x, mxStyle[draw:fill-image-ref-point]-getStr()); + pStyleGraphicsPropertiesElement-addAttribute(draw:fill-image-ref-point-x, mxStyle[draw:fill-image-ref-point-x]-getStr()); if (mxStyle[draw:fill-image-ref-point-y]) - pStyleGraphicsPropertiesElement-addAttribute(draw:fill-image-ref-point-y, mxStyle[draw:fill-image-ref-point]-getStr()); + pStyleGraphicsPropertiesElement-addAttribute(draw:fill-image-ref-point-y, mxStyle[draw:fill-image-ref-point-y]-getStr()); } else pStyleGraphicsPropertiesElement-addAttribute(draw:fill, none); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: writerperfect/Library_cdrimport.mk
writerperfect/Library_cdrimport.mk |1 + 1 file changed, 1 insertion(+) New commits: commit 50e02e19efc37ad94646fd4bb7b7eda74bb4952c Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Thu Mar 8 13:07:15 2012 +0100 With the new libcdr, writerperfect will depend on lcms2 diff --git a/writerperfect/Library_cdrimport.mk b/writerperfect/Library_cdrimport.mk index f05990d..7904b3c 100644 --- a/writerperfect/Library_cdrimport.mk +++ b/writerperfect/Library_cdrimport.mk @@ -59,6 +59,7 @@ $(eval $(call gb_Library_use_externals,cdrimport,\ wpd \ wpg \ cdr \ + lcms2 \ zlib \ )) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: libcdr/prj
libcdr/prj/build.lst |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b64b955a38021c70b06c97c9d31b516b5e0fa3a1 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Fri Mar 9 09:55:53 2012 +0100 libcdr will depend on lcms2 diff --git a/libcdr/prj/build.lst b/libcdr/prj/build.lst index 30487b1..a3a0e2c 100644 --- a/libcdr/prj/build.lst +++ b/libcdr/prj/build.lst @@ -1,3 +1,3 @@ -cdrlibcdr : LIBWPD:libwpd LIBWPG:libwpg ZLIB:zlib soltools NULL +cdrlibcdr : LIBWPD:libwpd LIBWPG:libwpg LCMS2:lcms2 ZLIB:zlib soltools NULL cdrlibcdr usr1- all cdr_mkout NULL cdrlibcdr nmake - all cdr_libcdr NULL ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: tail_build/prj writerperfect/prj
tail_build/prj/build.lst|2 +- writerperfect/prj/build.lst |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 699b8a45d81f59e29b4b06936fb0a8538722acbf Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Fri Mar 9 09:58:52 2012 +0100 Make sure that the right libraries are there in all cases diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst index d827820..9b0442b 100644 --- a/tail_build/prj/build.lst +++ b/tail_build/prj/build.lst @@ -1,2 +1,2 @@ -tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CURL:curl FONTCONFIG:fontconfig FREETYPE:freetype GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JPEG:jpeg LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SANE:sane SAXON:saxon TRANSLATIONS:translations TWAIN:twain VIGRA:vigra X11_EXTENSIONS:x11_extensions XPDF:xpdf ZLIB:zlib basegfx bridges comphelper DBCONNECTIVITY:connectivity cppu cppuhelper cpputools i18npool i18nutil icc javaunohelper jurt jvmaccess jvmfwk offapi officecfg oovbaapi QADEVOOO:qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar rsc sal salhelper sax shell solenv soltools sot stoc svl sysui tools ucbhelper udkapi unoil unotest unotool s ure DESKTOP:xmlhelp xmlreader xsltml NULL +tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CURL:curl FONTCONFIG:fontconfig FREETYPE:freetype GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SANE:sane SAXON:saxon TRANSLATIONS:translations TWAIN:twain VIGRA:vigra X11_EXTENSIONS:x11_extensions XPDF:xpdf ZLIB:zlib basegfx bridges comphelper DBCONNECTIVITY:connectivity cppu cppuhelper cpputools i18npool i18nutil icc javaunohelper jurt jvmaccess jvmfwk offapi officecfg oovbaapi QADEVOOO:qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar rsc sal salhelper sax shell solenv soltools sot stoc svl sysui tools ucbhelper udkapi unoil uno test unotools ure DESKTOP:xmlhelp xmlreader xsltml NULL tb tail_build\prj nmake - all tb_prj NULL diff --git a/writerperfect/prj/build.lst b/writerperfect/prj/build.lst index e680fea..22a822e 100644 --- a/writerperfect/prj/build.lst +++ b/writerperfect/prj/build.lst @@ -1,3 +1,3 @@ -wp writerperfect : LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LIBCDR:libcdr sot comphelper xmloff svtools sfx2 LIBXSLT:libxslt NULL +wp writerperfect : LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LIBCDR:libcdr LCMS2:lcms2 ZLIB:zlib sot comphelper xmloff svtools sfx2 LIBXSLT:libxslt NULL wp writerperfect usr1- all wp_mkout NULL wp writerperfect\prj nmake - all wp_prj NULL ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - libcdr/libcdr-0.0.3.patch libcdr/libcdr-0.0.3-warning.patch libcdr/libcdr-0.0.4.patch libcdr/makefile.mk scp2/source
libcdr/libcdr-0.0.3-warning.patch | 31 ---
libcdr/libcdr-0.0.3.patch | 34 --
libcdr/libcdr-0.0.4.patch | 20
libcdr/makefile.mk| 18 +++---
scp2/source/ooo/makefile.mk |4
5 files changed, 35 insertions(+), 72 deletions(-)
New commits:
commit 8b0be97f13ea550fc5dae7a7b6a76ddb30218278
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Fri Mar 9 13:56:18 2012 +0100
Define SYSTEM_LCMS2 in scp2 when appropriate
diff --git a/libcdr/makefile.mk b/libcdr/makefile.mk
index b671288..a78c669 100644
--- a/libcdr/makefile.mk
+++ b/libcdr/makefile.mk
@@ -60,7 +60,7 @@ INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/lcms2
.ENDIF
TARFILE_NAME=libcdr-0.0.4
-TARFILE_MD5=6b39b6b799b0fde2b6045a9acede6d0a
+TARFILE_MD5=b94897199a84055b57fa00af46b059ec
PATCH_FILES=\
$(TARFILE_NAME).patch
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index e7e57db..0987f6f 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -113,6 +113,10 @@ SCPDEFS+=-DSYSTEM_EXPAT
SCPDEFS+=-DSYSTEM_CAIRO
.ENDIF
+.IF $(SYSTEM_LCMS2) == YES
+SCPDEFS+=-DSYSTEM_LCMS2
+.ENDIF
+
.IF $(SYSTEM_LIBXML) == YES
SCPDEFS+=-DSYSTEM_LIBXML
.ENDIF
commit 4147de18731c7637ab5654797c21b39069695ff5
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Thu Mar 8 13:05:43 2012 +0100
Upload new libcdr-0.0.4 release
diff --git a/libcdr/libcdr-0.0.3-warning.patch
b/libcdr/libcdr-0.0.3-warning.patch
deleted file mode 100644
index b98459c..000
--- a/libcdr/libcdr-0.0.3-warning.patch
+++ /dev/null
@@ -1,31 +0,0 @@
misc/libcdr-0.0.3/src/lib/CDRParser.cpp2012-02-23 07:42:39.0
+0100
-+++ misc/build/libcdr-0.0.3/src/lib/CDRParser.cpp 2012-02-23
13:44:27.970033236 +0100
-@@ -215,7 +215,7 @@
- else if (fourCC == mcfg)
- readMcfg(input);
- else if (fourCC == bmp )
--readBmp(input, length);
-+readBmp(input);
- input-seek(recordStart + length, WPX_SEEK_CUR);
- }
-
-@@ -770,7 +770,7 @@
- m_collector-collectPolygonTransform(numAngles, nextPoint, rx, ry, cx, cy);
- }
-
--void libcdr::CDRParser::readBmp(WPXInputStream *input, unsigned length)
-+void libcdr::CDRParser::readBmp(WPXInputStream *input)
- {
- unsigned imageId = readU32(input);
- input-seek(50, WPX_SEEK_CUR);
misc/libcdr-0.0.3/src/lib/CDRParser.h 2012-02-09 08:36:51.0
+0100
-+++ misc/build/libcdr-0.0.3/src/lib/CDRParser.h2012-02-23
13:45:50.667974573 +0100
-@@ -70,7 +70,7 @@
- void readPath(WPXInputStream *input);
- void readPolygonCoords(WPXInputStream *input);
- void readPolygonTransform(WPXInputStream *input);
-- void readBmp(WPXInputStream *input, unsigned length);
-+ void readBmp(WPXInputStream *input);
-
- WPXInputStream *m_input;
- CDRCollector *m_collector;
diff --git a/libcdr/libcdr-0.0.3.patch b/libcdr/libcdr-0.0.3.patch
deleted file mode 100644
index 53bc613..000
--- a/libcdr/libcdr-0.0.3.patch
+++ /dev/null
@@ -1,34 +0,0 @@
misc/libcdr-0.0.3/src/lib/libcdr_utils.h
-+++ misc/build/libcdr-0.0.3/src/lib/libcdr_utils.h
-@@ -41,17 +41,8 @@
-
- #else
-
--#ifdef HAVE_CONFIG_H
--#include config.h
--#endif
--
--#ifdef HAVE_STDINT_H
- #include stdint.h
--#endif
--
--#ifdef HAVE_INTTYPES_H
- #include inttypes.h
--#endif
-
- #endif
-
misc/libcdr-0.0.3/src/lib/makefile.mk
-+++ misc/build/libcdr-0.0.3/src/lib/makefile.mk
-@@ -28,6 +28,10 @@
- INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/libwpg
- .ENDIF
-
-+.IF $(SYSTEM_ZLIB) != YES
-+INCPRE+=-I$(SOLARVER)$/$(INPATH)$/inc$/external/zlib
-+.ENDIF
-+
- SLOFILES= \
- $(SLO)$/CDRCollector.obj \
- $(SLO)$/CDRDocument.obj \
-
diff --git a/libcdr/libcdr-0.0.4.patch b/libcdr/libcdr-0.0.4.patch
new file mode 100644
index 000..9e9079d
--- /dev/null
+++ b/libcdr/libcdr-0.0.4.patch
@@ -0,0 +1,20 @@
+--- misc/libcdr-0.0.4/src/lib/libcdr_utils.h 2012-03-07 13:51:21.0
+0100
misc/build/libcdr-0.0.4/src/lib/libcdr_utils.h 2012-03-08
12:46:38.194534604 +0100
+@@ -54,17 +54,8 @@
+
+ #else
+
+-#ifdef HAVE_CONFIG_H
+-#include config.h
+-#endif
+-
+-#ifdef HAVE_STDINT_H
+ #include stdint.h
+-#endif
+-
+-#ifdef HAVE_INTTYPES_H
+ #include inttypes.h
+-#endif
+
+ #endif
+
diff --git a/libcdr/makefile.mk b/libcdr/makefile.mk
index 18e73ed..b671288 100644
--- a/libcdr/makefile.mk
+++ b/libcdr/makefile.mk
@@ -27,8 +27,8 @@
PRJ=.
-PRJNAME=visio
-TARGET=visio
+PRJNAME=cdr
+TARGET=cdr
# --- Settings -
@@ -41,7 +41,7 @@ TARGET=visio
@echo Using system libcdr...
.ENDIF
-# libcdr depends on the libwpd and libwpg
+# libcdr depends on the libwpd, libwpg and lcms2
.IF $(SYSTEM_LIBWPD) == YES
INCPRE+=$(WPD_CFLAGS)
.ELSE
@@ -53,13 +53,17 @@ INCPRE+=$(WPG_CFLAGS)
.ELSE
INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/libwpg
.ENDIF
+.IF $(SYSTEM_LCMS2) == YES
+INCPRE+=$(LCMS2_CFLAGS)
+.ELSE
[Libreoffice-commits] .: libcdr/makefile.mk
libcdr/makefile.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 055f8eaf1276c585b06ca01c28a6fe4aee900a31 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Fri Mar 9 14:30:00 2012 +0100 Reverting accidental commit diff --git a/libcdr/makefile.mk b/libcdr/makefile.mk index a78c669..b671288 100644 --- a/libcdr/makefile.mk +++ b/libcdr/makefile.mk @@ -60,7 +60,7 @@ INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/lcms2 .ENDIF TARFILE_NAME=libcdr-0.0.4 -TARFILE_MD5=b94897199a84055b57fa00af46b059ec +TARFILE_MD5=6b39b6b799b0fde2b6045a9acede6d0a PATCH_FILES=\ $(TARFILE_NAME).patch ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: lcms2/makefile.mk
lcms2/makefile.mk |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit 347de4170751f99d92fb4f014586cd606e30887f Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Fri Mar 9 16:13:19 2012 +0100 The project files for vs2008 are identical in the two directories diff --git a/lcms2/makefile.mk b/lcms2/makefile.mk index 10ba736..9369c75 100644 --- a/lcms2/makefile.mk +++ b/lcms2/makefile.mk @@ -48,12 +48,11 @@ TARFILE_MD5=327348d67c979c88c2dec59a23a17d85 CONFIGURE_DIR=. CONFIGURE_ACTION = +BUILD_DIR=Projects/VC2010/lcms2_DLL .IF $(CCNUMVER) = 0016 -BUILD_DIR=Projects/VC2010/lcms2_DLL BUILD_ACTION=MSBuild.exe lcms2_DLL.vcxproj /p:Configuration=Release /p:Platform=Win32 .ELSE -BUILD_DIR=Projects/VC2008/lcms2_DLL BUILD_ACTION=$(COMPATH)$/vcpackages$/vcbuild.exe /useenv lcms2_DLL.vcproj Release|Win32 .ENDIF ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: config_host.mk.in
config_host.mk.in |2 ++ 1 file changed, 2 insertions(+) New commits: commit 6b84f0d0c408cbe8cac1509b5d9807ccc9634186 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Thu Mar 8 13:02:49 2012 +0100 Export the LCMS2_CFLAGS and LCMS2_LIBS diff --git a/config_host.mk.in b/config_host.mk.in index f0ea883..2839b5c 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -236,6 +236,8 @@ export KDE_GLIB_LIBS=@KDE_GLIB_LIBS@ export KDE_HAVE_GLIB=@KDE_HAVE_GLIB@ export KDE_LIBS=@KDE_LIBS@ export L10N_MODULE=@L10N_MODULE@ +export LCMS2_CFLAGS=@LCMS2_CFLAGS@ +export LCMS2_LIBS=@LCMS2_LIBS@ export LFS_CFLAGS=@LFS_CFLAGS@ export LIBBASE_JAR=@LIBBASE_JAR@ export LIBCMIS_CFLAGS=@LIBCMIS_CFLAGS@ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: config_host.mk.in configure.in lcms2/makefile.mk lcms2/prj Makefile ooo.lst.in RepositoryExternal.mk
Makefile |1 RepositoryExternal.mk | 27 + config_host.mk.in |1 configure.in | 22 +++ lcms2/makefile.mk | 97 ++ lcms2/prj/build.lst |3 + lcms2/prj/d.lst | 10 + ooo.lst.in|1 8 files changed, 162 insertions(+) New commits: commit 8a0a25dba0ac7868bbc861260698b43160fe2cdf Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Fri Mar 2 10:15:42 2012 +0100 Creating a module lcms2 diff --git a/Makefile b/Makefile index 1739a10..bad1cee 100644 --- a/Makefile +++ b/Makefile @@ -191,6 +191,7 @@ libwps\ libxml2\ libxmlsec\ libxslt\ +lcms2\ lpsolve\ lucene\ mdds\ diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 138a15b..103c1c6 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -787,6 +787,33 @@ endef endif # SYSTEM_LIBWPS +ifeq ($(SYSTEM_LCMS2),YES) + +define gb_LinkTarget__use_lcms2 +$(call gb_LinkTarget_set_include,$(1),\ + $$(INCLUDE) \ +$(LCMS2_CFLAGS) \ +) +$(call gb_LinkTarget_add_libs,$(1),$(LCMS2_LIBS)) + +endef + +else # !SYSTEM_LCMS2 + +$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ + lcms2 \ +)) + +define gb_LinkTarget__use_lcms2 +$(call gb_LinkTarget_add_linked_libs,$(1),\ + lcms2 \ +) + +endef + +endif # SYSTEM_LCMS2 + + ifeq ($(SYSTEM_LPSOLVE),YES) define gb_LinkTarget__use_lpsolve55 diff --git a/config_host.mk.in b/config_host.mk.in index d206cb5..2eed3c1 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -415,6 +415,7 @@ export SYSTEM_HYPH=@SYSTEM_HYPH@ export SYSTEM_ICU=@SYSTEM_ICU@ export SYSTEM_JFREEREPORT=@SYSTEM_JFREEREPORT@ export SYSTEM_JPEG=@SYSTEM_JPEG@ +export SYSTEM_LCMS2=@SYSTEM_LCMS2@ export SYSTEM_LIBC=@SYSTEM_LIBC@ export SYSTEM_LIBCDR=@SYSTEM_LIBCDR@ export SYSTEM_LIBCMIS=@SYSTEM_LIBCMIS@ diff --git a/configure.in b/configure.in index b0e9ce8..eef6de4 100644 --- a/configure.in +++ b/configure.in @@ -1137,6 +1137,11 @@ AC_ARG_WITH(system-libcmis, [Use libcmis already on system.]),, [with_system_libcmis=$with_system_libs]) +AC_ARG_WITH(system-lcms2, +AS_HELP_STRING([--with-system-lcms2], +[Use littlecms v2 already on system.]),, +[with_system_lcms2=$with_system_libs]) + AC_ARG_WITH(system-libcdr, AS_HELP_STRING([--with-system-libcdr], [Use libcdr already on system.]),, @@ -5801,6 +5806,23 @@ AC_SUBST(WPD_CFLAGS) AC_SUBST(WPD_LIBS) dnl === +dnl Check for system lcms2 +dnl === +AC_MSG_CHECKING([which littlecms v2 to use]) +if test $with_system_lcms2 = yes; then +AC_MSG_RESULT([external]) +SYSTEM_LCMS2=YES +PKG_CHECK_MODULES( LCMS2, lcms2 ) +else +AC_MSG_RESULT([internal]) +SYSTEM_LCMS2=NO +BUILD_TYPE=$BUILD_TYPE LCMS2 +fi +AC_SUBST(SYSTEM_LCMS2) +AC_SUBST(LCMS2_CFLAGS) +AC_SUBST(LCMS2_LIBS) + +dnl === dnl Check for system cppunit dnl === AC_MSG_CHECKING([which cppunit to use]) diff --git a/lcms2/makefile.mk b/lcms2/makefile.mk new file mode 100644 index 000..d39ae58 --- /dev/null +++ b/lcms2/makefile.mk @@ -0,0 +1,97 @@ +#* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# http://www.openoffice.org/license.html +# for a copy of the LGPLv3 License. +# +#* + +PRJ=. + +PRJNAME=lcms2 +TARGET=so_lcms2 + +# --- Settings - + +.INCLUDE : settings.mk + +# --- Files + +TARFILE_NAME=lcms2-2.3 +TARFILE_MD5=327348d67c979c88c2dec59a23a17d85 + +.IF $(SYSTEM_LCMS2) == YES +@all: +@echo Using system littlecms2... +.ENDIF + +.IF $(GUI)$(COM)==WNTMSC +CONFIGURE_DIR=. +BUILD_DIR=Projects/VC2010/lcms2_DLL +
[Libreoffice-commits] .: lcms2/makefile.mk
lcms2/makefile.mk |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit 02888164e76fd08a7a6d02e526669f1c4e3a0239 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Fri Mar 2 11:52:06 2012 +0100 Make lcms2 build on windows too diff --git a/lcms2/makefile.mk b/lcms2/makefile.mk index d39ae58..68b939f 100644 --- a/lcms2/makefile.mk +++ b/lcms2/makefile.mk @@ -52,9 +52,9 @@ CONFIGURE_ACTION = .IF $(CCNUMVER) = 0016 BUILD_DIR=Projects/VC2008/lcms2_DLL -BUILD_ACTION=cd allinone MSBuild.exe lcms2_DLL.vcxproj /p:Configuration=Release /p:Platform=Win32 +BUILD_ACTION=MSBuild.exe lcms2_DLL.vcxproj /p:Configuration=Release /p:Platform=Win32 .ELSE -BUILD_ACTION=cd allinone $(COMPATH)$/vcpackages$/vcbuild.exe lcms2_DLL.vcproj Release|Win32 +BUILD_ACTION=$(COMPATH)$/vcpackages$/vcbuild.exe lcms2_DLL.vcproj Release|Win32 .ENDIF .ELSE #$(GUI)$(COM)!=WNTMSC @@ -82,8 +82,8 @@ OUT2LIB+=src$/.libs$/liblcms2.*.dylib OUT2LIB+=src$/.libs$/liblcms2.dll.a OUT2BIN+=src$/.libs$/*.dll .ELSE -OUT2LIB+= -OUT2BIN+= +OUT2LIB+=bin$/lcms2.lib +OUT2BIN+=bin$/lcms2.dll .ENDIF .ELSE OUT2LIB+=src$/.libs$/liblcms2.so* ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - solenv/bin
solenv/bin/modules/installer/windows/msiglobal.pm | 13 +
1 file changed, 13 insertions(+)
New commits:
commit 62c6863bc037e7ea3f44852c51cf3cafd75cebf1
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Fri Mar 2 11:58:19 2012 +0100
tabs - spaces
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm
b/solenv/bin/modules/installer/windows/msiglobal.pm
index 03b31a3..64b2bb0 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -,19 +,19 @@ sub create_transforms
chdir($installdir);
$systemcall = $msidb . . -d . $basedbname . -r .
$windowslanguage;
system($systemcall);
- # fdo#46181 - zh-HK and zh-MO should have fallen back to zh-TW
not to zh-CN
- # we need to hack zh-HK and zh-MO LCIDs directly into the MSI
- if($windowslanguage eq '1028')
+# fdo#46181 - zh-HK and zh-MO should have fallen back to zh-TW not to
zh-CN
+# we need to hack zh-HK and zh-MO LCIDs directly into the MSI
+if($windowslanguage eq '1028')
{
rename 1028,3076;
- $systemcall = $msidb . . -d . $basedbname . -r
. 3076;
+$systemcall = $msidb . . -d . $basedbname . -r . 3076;
system($systemcall);
rename 3076,5124;
- $systemcall = $msidb . . -d . $basedbname . -r
. 5124;
+$systemcall = $msidb . . -d . $basedbname . -r . 5124;
system($systemcall);
$templatevalue = $templatevalue . , . 3076 . , . 5124;
rename 5124,1028;
- }
+}
chdir($from);
unlink($transformfile);
commit e90465a5316f65972bc3c6520106be0d5e5205ac
Author: Andras Timar ati...@suse.com
Date: Fri Mar 2 10:46:17 2012 +0100
fdo#46181 Use Traditional Chinese installer for zh-HK and zh-MO locales
Microsoft Installer thinks that it is a good idea to fall back to zh-CN
from zh-HK and zh-MO. It is wrong, because zh-CN uses Simplified Chinese
zh-HK and zh-MO use Traditional Chinese. So we need to fall back to zh-TW.
Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm
b/solenv/bin/modules/installer/windows/msiglobal.pm
index 96c9606..03b31a3 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -,6 +,19 @@ sub create_transforms
chdir($installdir);
$systemcall = $msidb . . -d . $basedbname . -r .
$windowslanguage;
system($systemcall);
+ # fdo#46181 - zh-HK and zh-MO should have fallen back to zh-TW
not to zh-CN
+ # we need to hack zh-HK and zh-MO LCIDs directly into the MSI
+ if($windowslanguage eq '1028')
+{
+rename 1028,3076;
+ $systemcall = $msidb . . -d . $basedbname . -r
. 3076;
+system($systemcall);
+rename 3076,5124;
+ $systemcall = $msidb . . -d . $basedbname . -r
. 5124;
+system($systemcall);
+$templatevalue = $templatevalue . , . 3076 . , . 5124;
+rename 5124,1028;
+ }
chdir($from);
unlink($transformfile);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: cairo/cairo cairo/cairo-1.10.2-oldfontconfig.patch
cairo/cairo-1.10.2-oldfontconfig.patch | 11 +++
cairo/cairo/makefile.mk|5 +++--
2 files changed, 14 insertions(+), 2 deletions(-)
New commits:
commit b5f727d3954e21fd742ad3b2da8f4d77cbd87c1f
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Mon Feb 20 23:34:21 2012 -0800
Fix build of generic unix vcl plugin with older fontconfig
diff --git a/cairo/cairo-1.10.2-oldfontconfig.patch
b/cairo/cairo-1.10.2-oldfontconfig.patch
new file mode 100644
index 000..d19258a
--- /dev/null
+++ b/cairo/cairo-1.10.2-oldfontconfig.patch
@@ -0,0 +1,11 @@
+--- misc/cairo-1.10.2/configure2012-02-20 23:25:52.0 -0800
misc/build/cairo-1.10.2/configure 2012-02-20 11:53:05.0 -0800
+@@ -29672,7 +29672,7 @@
+ fi
+
+
+-FONTCONFIG_MIN_VERSION=2.2.95
++FONTCONFIG_MIN_VERSION=2.2.3
+
# Check whether
--enable-fc was given.
+ if test ${enable_fc+set} = set; then :
+ enableval=$enable_fc; enable_fc=$enableval
diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk
index 1c06c74..8f2a359 100644
--- a/cairo/cairo/makefile.mk
+++ b/cairo/cairo/makefile.mk
@@ -49,7 +49,8 @@ TARFILE_MD5=f101a9e88b783337b20b2e26dfd26d5f
PATCH_FILES=\
..$/cairo-1.10.2.patch \
-..$/cairo.dlsym.lcdfilter.patch
+..$/cairo.dlsym.lcdfilter.patch \
+..$/cairo-1.10.2-oldfontconfig.patch
.IF $(OS)$(COM) == WNTMSC
PATCH_FILES+= ..$/$(TARFILE_NAME).wntmsc.patch
@@ -189,7 +190,7 @@ CONFIGURE_FLAGS+=--disable-valgrind
.IF $(OS)==IOS
CONFIGURE_FLAGS+=--disable-ft
.ELSE
-CONFIGURE_FLAGS+=--enable-ft
+CONFIGURE_FLAGS+=--enable-ft --enable-fc
.ENDIF
.IF $(OS)==IOS || $(OS)==ANDROID
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: libvisio/libvisio-0.0.14.patch libvisio/libvisio-0.0.15.patch libvisio/makefile.mk ooo.lst.in
libvisio/libvisio-0.0.14.patch | 20 libvisio/libvisio-0.0.15.patch | 20 libvisio/makefile.mk |4 ++-- ooo.lst.in |2 +- 4 files changed, 23 insertions(+), 23 deletions(-) New commits: commit 21366a4b95defb007ddccd409126536a6e8dc50d Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Mon Feb 20 10:03:48 2012 +0100 Uploading new release of libvisio diff --git a/libvisio/libvisio-0.0.14.patch b/libvisio/libvisio-0.0.14.patch deleted file mode 100644 index 456f5ad..000 --- a/libvisio/libvisio-0.0.14.patch +++ /dev/null @@ -1,20 +0,0 @@ misc/libvisio-0.0.14/src/lib/libvisio_utils.h -+++ misc/build/libvisio-0.0.14/src/lib/libvisio_utils.h -@@ -42,17 +42,8 @@ - - #else - --#ifdef HAVE_CONFIG_H --#include config.h --#endif -- --#ifdef HAVE_STDINT_H - #include stdint.h --#endif -- --#ifdef HAVE_INTTYPES_H - #include inttypes.h --#endif - - #endif - diff --git a/libvisio/libvisio-0.0.15.patch b/libvisio/libvisio-0.0.15.patch new file mode 100644 index 000..fbebce9 --- /dev/null +++ b/libvisio/libvisio-0.0.15.patch @@ -0,0 +1,20 @@ +--- misc/libvisio-0.0.15/src/lib/libvisio_utils.h misc/build/libvisio-0.0.15/src/lib/libvisio_utils.h +@@ -42,17 +42,8 @@ + + #else + +-#ifdef HAVE_CONFIG_H +-#include config.h +-#endif +- +-#ifdef HAVE_STDINT_H + #include stdint.h +-#endif +- +-#ifdef HAVE_INTTYPES_H + #include inttypes.h +-#endif + + #endif + diff --git a/libvisio/makefile.mk b/libvisio/makefile.mk index 9adf426..871f642 100644 --- a/libvisio/makefile.mk +++ b/libvisio/makefile.mk @@ -54,8 +54,8 @@ INCPRE+=$(WPG_CFLAGS) INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpg .ENDIF -TARFILE_NAME=libvisio-0.0.14 -TARFILE_MD5=776ad69a63ac1e99abed176e54ce25d9 +TARFILE_NAME=libvisio-0.0.15 +TARFILE_MD5=d28864eb2b59bb57b034c0d4662a3cee PATCH_FILES=\ $(TARFILE_NAME).patch diff --git a/ooo.lst.in b/ooo.lst.in index 44828d0..e6b5f0c 100644 --- a/ooo.lst.in +++ b/ooo.lst.in @@ -88,7 +88,7 @@ c01351d7db2b205de755d58769288224-libwpd-0.9.4.tar.bz2 f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz 3bf481ca95109b14435125c0dd1f2217-graphite2-1.0.3.tgz -776ad69a63ac1e99abed176e54ce25d9-libvisio-0.0.14.tar.bz2 +d28864eb2b59bb57b034c0d4662a3cee-libvisio-0.0.15.tar.bz2 e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip 7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz bb94fe29a21444369307f19015d48b82-libcdr-0.0.2.tar.bz2 ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: libvisio/libvisio-0.0.15-makefile_mk.patch libvisio/makefile.mk libvisio/prj
libvisio/libvisio-0.0.15-makefile_mk.patch | 10 ++ libvisio/makefile.mk |3 ++- libvisio/prj/d.lst |1 + 3 files changed, 13 insertions(+), 1 deletion(-) New commits: commit f241f91e03c25d337598092b21f1c1360c7731eb Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Mon Feb 20 10:40:07 2012 +0100 Fix libvisio's makefile.mk diff --git a/libvisio/libvisio-0.0.15-makefile_mk.patch b/libvisio/libvisio-0.0.15-makefile_mk.patch new file mode 100644 index 000..a22f128 --- /dev/null +++ b/libvisio/libvisio-0.0.15-makefile_mk.patch @@ -0,0 +1,10 @@ +--- misc/libvisio-0.0.15/src/lib/makefile.mk 2012-01-17 19:19:29.0 +0100 misc/build/libvisio-0.0.15/src/lib/makefile.mk 2012-02-20 10:36:43.448244813 +0100 +@@ -45,6 +45,7 @@ + $(SLO)$/VSDXParser.obj \ + $(SLO)$/VSDXShapeList.obj \ + $(SLO)$/VSDXStencils.obj \ ++ $(SLO)$/VSDStringVector.obj \ + $(SLO)$/VSDXStylesCollector.obj \ + $(SLO)$/VSDXStyles.obj + diff --git a/libvisio/makefile.mk b/libvisio/makefile.mk index 871f642..c2064ce 100644 --- a/libvisio/makefile.mk +++ b/libvisio/makefile.mk @@ -58,7 +58,8 @@ TARFILE_NAME=libvisio-0.0.15 TARFILE_MD5=d28864eb2b59bb57b034c0d4662a3cee PATCH_FILES=\ -$(TARFILE_NAME).patch +$(TARFILE_NAME).patch \ +$(TARFILE_NAME)-makefile_mk.patch BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS) diff --git a/libvisio/prj/d.lst b/libvisio/prj/d.lst index f03b25b..5680abe 100644 --- a/libvisio/prj/d.lst +++ b/libvisio/prj/d.lst @@ -1,5 +1,6 @@ mkdir: %_DEST%\inc\libvisio ..\%__SRC%\misc\build\libvisio*\src\lib\libvisio.h %_DEST%\inc\libvisio ..\%__SRC%\misc\build\libvisio*\src\lib\VisioDocument.h %_DEST%\inc\libvisio\ +..\%__SRC%\misc\build\libvisio*\src\lib\VSDStringVector.h %_DEST%\inc\libvisio\ ..\%__SRC%\lib\*.a %_DEST%\lib\*.a ..\%__SRC%\slb\*.lib %_DEST%\lib\*.lib ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - configure.in
configure.in | 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
New commits:
commit bb0f6b0c7c745264da38b91e0eca39a6f5ad934d
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Feb 20 14:30:13 2012 +0100
Improve check for broken -fthreadsafe-statics
Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch
diff --git a/configure.in b/configure.in
index 4667f0b..26a500a 100644
--- a/configure.in
+++ b/configure.in
@@ -3626,8 +3626,14 @@ if test $GCC = yes; then
dnl return n;
dnl }
dnl
-dnl Mac OS X up to at least 10.7.1 is known to have this problem:
-if test $_os = Darwin; then
+dnl Mac OS X up to at least 10.7.1 is known to have this problem, as is
+dnl at least one instance of GCC 4.2.4 (used on a Linux
+dnl ooobuild1.osuosl.org 2.6.9-101.plus.c4smp #1 SMP Thu Jul 21
19:08:15
+dnl EDT 2011 i686 i686 i386 GNU/Linux machine); see the definition of
+dnl __cxa_guard_acquire in GCC's libstdc++-v3/libsupc++/guard.cc for
+dnl what #ifdefs actually make a difference there. Conservative advice
+dnl from Jakub Jelinek is to assume it working in GCC = 4.3:
+if test $_os = Darwin -o ${GCCVER?} -lt 040300; then
unset HAVE_THREADSAFE_STATICS
AC_MSG_RESULT([broken (i.e., no)])
else
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sw/source
sw/source/core/text/itrform2.cxx |5 ++---
sw/source/core/text/txttab.cxx |4
2 files changed, 2 insertions(+), 7 deletions(-)
New commits:
commit efae3866d2f3ff23f403d81f58e719a69bf070e9
Author: Cédric Bosdonnat cedric.bosdonnat@free.fr
Date: Fri Feb 10 21:57:54 2012 +0100
fdo#45908: Cleaning up the tabs too early can cause loops
Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index 54a7825..9bf93d2 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -1375,9 +1375,8 @@ SwLinePortion *SwTxtFormatter::NewPortion(
SwTxtFormatInfo rInf )
}
}
-// Wenn eine Portion erzeugt wird, obwohl eine RestPortion ansteht,
-// dann haben wir es mit einem Feld zu tun, das sich aufgesplittet
-// hat, weil z.B. ein Tab enthalten ist.
+// if a portion is created despite there being a pending RestPortion,
+// then it is a field which has been split (e.g. because it contains a
Tab)
if( pPor rInf.GetRest() )
pPor-SetLen( 0 );
diff --git a/sw/source/core/text/txttab.cxx b/sw/source/core/text/txttab.cxx
index fceddca..8841e39 100644
--- a/sw/source/core/text/txttab.cxx
+++ b/sw/source/core/text/txttab.cxx
@@ -82,10 +82,6 @@ sal_uInt16 SwLineInfo::NumberOfTabStops() const
SwTabPortion *SwTxtFormatter::NewTabPortion( SwTxtFormatInfo rInf, bool bAuto
) const
{
SwTabPortion *pTabPor = 0;
-SwTabPortion *pLastTab = rInf.GetLastTab();
-if( pLastTab ( pLastTab-IsTabCntPortion() ||
pLastTab-IsTabDecimalPortion() ) )
-if( pLastTab-PostFormat( rInf ) )
-return 0;
xub_Unicode cFill = 0;
xub_Unicode cDec = 0;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-4' - sw/source
sw/source/core/text/itrform2.cxx |5 ++---
sw/source/core/text/txttab.cxx |4
2 files changed, 2 insertions(+), 7 deletions(-)
New commits:
commit 042e3727babc62913c753594412e7d7efbed43bf
Author: Cédric Bosdonnat cedric.bosdonnat@free.fr
Date: Fri Feb 10 21:57:54 2012 +0100
fdo#45908: Cleaning up the tabs too early can cause loops
Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index 78dd1f1..c7a6cbe 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -1383,9 +1383,8 @@ SwLinePortion *SwTxtFormatter::NewPortion(
SwTxtFormatInfo rInf )
}
}
-// Wenn eine Portion erzeugt wird, obwohl eine RestPortion ansteht,
-// dann haben wir es mit einem Feld zu tun, das sich aufgesplittet
-// hat, weil z.B. ein Tab enthalten ist.
+// if a portion is created despite there being a pending RestPortion,
+// then it is a field which has been split (e.g. because it contains a
Tab)
if( pPor rInf.GetRest() )
pPor-SetLen( 0 );
diff --git a/sw/source/core/text/txttab.cxx b/sw/source/core/text/txttab.cxx
index 5b77142..d3f4e8c 100644
--- a/sw/source/core/text/txttab.cxx
+++ b/sw/source/core/text/txttab.cxx
@@ -85,10 +85,6 @@ sal_uInt16 SwLineInfo::NumberOfTabStops() const
SwTabPortion *SwTxtFormatter::NewTabPortion( SwTxtFormatInfo rInf, bool bAuto
) const
{
SwTabPortion *pTabPor = 0;
-SwTabPortion *pLastTab = rInf.GetLastTab();
-if( pLastTab ( pLastTab-IsTabCntPortion() ||
pLastTab-IsTabDecimalPortion() ) )
-if( pLastTab-PostFormat( rInf ) )
-return 0;
xub_Unicode cFill = 0;
xub_Unicode cDec = 0;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: external/gcc3_specific
external/gcc3_specific/makefile.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9a51a7ae7153fee17013867bd7bbaacedee1980a Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Mon Feb 13 15:39:43 2012 +0100 Copy the gcc's stdlibs to solver even if not packaging them diff --git a/external/gcc3_specific/makefile.mk b/external/gcc3_specific/makefile.mk index 501acfa..b6211c4 100644 --- a/external/gcc3_specific/makefile.mk +++ b/external/gcc3_specific/makefile.mk @@ -6,7 +6,7 @@ TARGET=gcc3_specific .INCLUDE: settings.mk # -- -.IF $(SYSTEM_STDLIBS) != YES $(COMID)==gcc3 +.IF $(COMID)==gcc3 .IF $(OS)!=MACOSX $(OS)!=IOS $(OS)!=ANDROID $(OS)!=FREEBSD $(OS)!=NETBSD $(OS)!=OPENBSD $(OS)!=DRAGONFLY ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: libcdr/libcdr-0.0.1.patch libcdr/libcdr-0.0.2.patch libcdr/makefile.mk ooo.lst.in
libcdr/libcdr-0.0.1.patch | 34 -- libcdr/libcdr-0.0.2.patch | 34 ++ libcdr/makefile.mk|6 +++--- ooo.lst.in|2 +- 4 files changed, 38 insertions(+), 38 deletions(-) New commits: commit 71530f9cb01ade01505f4a5418fed28af76c8429 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Fri Feb 10 10:24:05 2012 +0100 Uploading a new shiny libcdr-0.0.2 diff --git a/libcdr/libcdr-0.0.1.patch b/libcdr/libcdr-0.0.1.patch deleted file mode 100644 index 2f9a6d4..000 --- a/libcdr/libcdr-0.0.1.patch +++ /dev/null @@ -1,34 +0,0 @@ misc/libcdr-0.0.1/src/lib/libcdr_utils.h -+++ misc/build/libcdr-0.0.1/src/lib/libcdr_utils.h -@@ -41,17 +41,8 @@ - - #else - --#ifdef HAVE_CONFIG_H --#include config.h --#endif -- --#ifdef HAVE_STDINT_H - #include stdint.h --#endif -- --#ifdef HAVE_INTTYPES_H - #include inttypes.h --#endif - - #endif - misc/libcdr-0.0.1/src/lib/makefile.mk -+++ misc/build/libcdr-0.0.1/src/lib/makefile.mk -@@ -28,6 +28,10 @@ - INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/libwpg - .ENDIF - -+.IF $(SYSTEM_ZLIB) != YES -+INCPRE+=-I$(SOLARVER)$/$(INPATH)$/inc$/external/zlib -+.ENDIF -+ - SLOFILES= \ - $(SLO)$/CDRDocument.obj \ - $(SLO)$/CDRInternalStream.obj \ - diff --git a/libcdr/libcdr-0.0.2.patch b/libcdr/libcdr-0.0.2.patch new file mode 100644 index 000..7760ddf --- /dev/null +++ b/libcdr/libcdr-0.0.2.patch @@ -0,0 +1,34 @@ +--- misc/libcdr-0.0.2/src/lib/libcdr_utils.h misc/build/libcdr-0.0.2/src/lib/libcdr_utils.h +@@ -41,17 +41,8 @@ + + #else + +-#ifdef HAVE_CONFIG_H +-#include config.h +-#endif +- +-#ifdef HAVE_STDINT_H + #include stdint.h +-#endif +- +-#ifdef HAVE_INTTYPES_H + #include inttypes.h +-#endif + + #endif + +--- misc/libcdr-0.0.2/src/lib/makefile.mk misc/build/libcdr-0.0.2/src/lib/makefile.mk +@@ -28,6 +28,10 @@ + INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/libwpg + .ENDIF + ++.IF $(SYSTEM_ZLIB) != YES ++INCPRE+=-I$(SOLARVER)$/$(INPATH)$/inc$/external/zlib ++.ENDIF ++ + SLOFILES= \ + $(SLO)$/CDRDocument.obj \ + $(SLO)$/CDRInternalStream.obj \ + diff --git a/libcdr/makefile.mk b/libcdr/makefile.mk index f94f3d0..4712276 100644 --- a/libcdr/makefile.mk +++ b/libcdr/makefile.mk @@ -54,11 +54,11 @@ INCPRE+=$(WPG_CFLAGS) INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/libwpg .ENDIF -TARFILE_NAME=libcdr-0.0.1 -TARFILE_MD5=dbf30c0dd92beee07d184738c242f073 +TARFILE_NAME=libcdr-0.0.2 +TARFILE_MD5=bb94fe29a21444369307f19015d48b82 PATCH_FILES=\ -libcdr-0.0.1.patch +libcdr-0.0.2.patch BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS) BUILD_DIR=src$/lib diff --git a/ooo.lst.in b/ooo.lst.in index 3a86f82..14c23d0 100644 --- a/ooo.lst.in +++ b/ooo.lst.in @@ -90,7 +90,7 @@ f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 776ad69a63ac1e99abed176e54ce25d9-libvisio-0.0.14.tar.bz2 e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip 7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz -dbf30c0dd92beee07d184738c242f073-libcdr-0.0.1.tar.bz2 +bb94fe29a21444369307f19015d48b82-libcdr-0.0.2.tar.bz2 @GOOGLE_DOCS_EXTENSION_PACK@ @FREETYPE_TARBALL@ @FONTCONFIG_TARBALL@ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: scp2/source
scp2/source/xsltfilter/module_xsltfilter.scp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit fe5640594eea2637b720f7311eed0c4f218a6893 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Thu Feb 2 11:42:01 2012 +0100 Chose xslt filters for default install, not for minimal though diff --git a/scp2/source/xsltfilter/module_xsltfilter.scp b/scp2/source/xsltfilter/module_xsltfilter.scp index 7854ce7..a3206b0 100644 --- a/scp2/source/xsltfilter/module_xsltfilter.scp +++ b/scp2/source/xsltfilter/module_xsltfilter.scp @@ -45,6 +45,6 @@ Module gid_Module_Optional_Xsltfiltersamples gid_File_Xsl_Export_Xhtml_Table, gid_File_Share_Registry_Xsltfilter_Xcd ); Minimal = NO; -Default = NO; +Default = YES; Styles = ( ); End ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: postgresql/makefile.mk
postgresql/makefile.mk |1 + 1 file changed, 1 insertion(+) New commits: commit 165a5bea14f538ea249ec1567d6c4aa08d5bb174 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Mon Jan 30 14:41:06 2012 +0100 Fix build of postgresql module with mozilla ldap on WNTMSC diff --git a/postgresql/makefile.mk b/postgresql/makefile.mk index 9b5cb35..0c2e3be 100644 --- a/postgresql/makefile.mk +++ b/postgresql/makefile.mk @@ -54,6 +54,7 @@ CONFIGURE_DIR=. BUILD_DIR=src CONFIGURE_ACTION = +SOLARINC += -I$(SOLARVER)$/$(INPATH)$/inc$/mozilla$/ldap BUILD_ACTION = nmake -f win32.mak USE_SSL=1 USE_LDAP=1 USE_MOZLDAP=1 .ELSE CONFIGURE_DIR=. ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: writerperfect/source
writerperfect/source/filter/OdgGenerator.cxx | 14 ++
1 file changed, 14 insertions(+)
New commits:
commit dc6953f932ffbddd5168f039e58075789b91b98b
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Mon Jan 30 11:31:32 2012 +0100
Initial support for quadratic beziers
diff --git a/writerperfect/source/filter/OdgGenerator.cxx
b/writerperfect/source/filter/OdgGenerator.cxx
index 79722e8..6d58aa4 100644
--- a/writerperfect/source/filter/OdgGenerator.cxx
+++ b/writerperfect/source/filter/OdgGenerator.cxx
@@ -858,6 +858,13 @@ void OdgGeneratorPrivate::_drawPath(const
WPXPropertyListVector path)
qx = (qx path[k][svg:x2]-getDouble()) ?
path[k][svg:x2]-getDouble() : qx;
qy = (qy path[k][svg:y2]-getDouble()) ?
path[k][svg:y2]-getDouble() : qy;
}
+if(path[k][libwpg:path-action]-getStr() == Q)
+{
+px = (px path[k][svg:x1]-getDouble()) ?
path[k][svg:x1]-getDouble() : px;
+py = (py path[k][svg:y1]-getDouble()) ?
path[k][svg:y1]-getDouble() : py;
+qx = (qx path[k][svg:x1]-getDouble()) ?
path[k][svg:x1]-getDouble() : qx;
+qy = (qy path[k][svg:y1]-getDouble()) ?
path[k][svg:y1]-getDouble() : qy;
+}
if(path[k][libwpg:path-action]-getStr() == A)
{
double xmin, xmax, ymin, ymax;
@@ -924,6 +931,13 @@ void OdgGeneratorPrivate::_drawPath(const
WPXPropertyListVector path)
(unsigned)((path[i][svg:y]-getDouble()-py)*2540));
sValue.append(sElement);
}
+else if (path[i][libwpg:path-action]-getStr() == Q)
+{
+sElement.sprintf(Q%i %i %i %i,
(unsigned)((path[i][svg:x1]-getDouble()-px)*2540),
+
(unsigned)((path[i][svg:y1]-getDouble()-py)*2540),
(unsigned)((path[i][svg:x]-getDouble()-px)*2540),
+
(unsigned)((path[i][svg:y]-getDouble()-py)*2540));
+sValue.append(sElement);
+}
else if (path[i][libwpg:path-action]-getStr() == A)
{
sElement.sprintf(A%i %i %i %i %i %i %i,
(unsigned)((path[i][svg:rx]-getDouble())*2540),
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - writerperfect/source
writerperfect/source/filter/OdtGenerator.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit a8afa224362619387cc87928d8a0392396eb8bb2
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Thu Jan 26 09:39:32 2012 +0100
Revert TEMP
Sorry, for this one, pushed by mistake :(
This reverts commit 31c02baa10f7da947aa073f8af3f8e370acabd90.
diff --git a/sc/source/filter/xml/xmlstyli.cxx
b/sc/source/filter/xml/xmlstyli.cxx
index 6e5ae54..7691c4b 100644
--- a/sc/source/filter/xml/xmlstyli.cxx
+++ b/sc/source/filter/xml/xmlstyli.cxx
@@ -26,7 +26,7 @@
*
/
-#include stdio.h
+
#include xmlstyli.hxx
#include xmloff/nmspmap.hxx
@@ -173,13 +173,9 @@ void
ScXMLCellImportPropertyMapper::finished(::std::vector XMLPropertyState
table::BorderLine2 aBorderLineWidth;
pBorderWidths[i]-maValue = aBorderLineWidth;
aBorderLine.OuterLineWidth = aBorderLineWidth.OuterLineWidth;
- printf(OuterLineWidth %f\n,
aBorderLineWidth.OuterLineWidth);
aBorderLine.InnerLineWidth = aBorderLineWidth.InnerLineWidth;
- printf(InnerLineWidth %f\n,
aBorderLineWidth.InnerLineWidth);
aBorderLine.LineDistance = aBorderLineWidth.LineDistance;
- printf(LineDistance %f\n,
aBorderLineWidth.LineDistance);
aBorderLine.LineWidth = aBorderLineWidth.LineWidth;
- printf(LineWidth %f\n,
aBorderLineWidth.LineWidth);
pBorders[i]-maValue = aBorderLine;
}
}
commit 79299dcae534943f6107afc99542ddf028d20117
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Thu Jan 26 08:57:13 2012 +0100
Fix crashes due to inexisting attribute
diff --git a/writerperfect/source/filter/OdtGenerator.cxx
b/writerperfect/source/filter/OdtGenerator.cxx
index 94e46c9..ecb29bb 100644
--- a/writerperfect/source/filter/OdtGenerator.cxx
+++ b/writerperfect/source/filter/OdtGenerator.cxx
@@ -1264,7 +1264,7 @@ void OdtGenerator::insertBinaryObject(const
WPXPropertyList propList, const WPX
else
// assuming we have a binary image or a object_ole that we can just
insert as it is
{
-if (propList[libwpg:mime-type]-getStr() == object/ole)
+if (propList[libwpd:mimetype]-getStr() == object/ole)
mpImpl-mpCurrentContentElements-push_back(new
TagOpenElement(draw:object-ole));
else
mpImpl-mpCurrentContentElements-push_back(new
TagOpenElement(draw:image));
@@ -1277,7 +1277,7 @@ void OdtGenerator::insertBinaryObject(const
WPXPropertyList propList, const WPX
mpImpl-mpCurrentContentElements-push_back(new
TagCloseElement(office:binary-data));
-if (propList[libwpg:mime-type]-getStr() == object/ole)
+if (propList[libwpd:mimetype]-getStr() == object/ole)
mpImpl-mpCurrentContentElements-push_back(new
TagCloseElement(draw:object-ole));
else
mpImpl-mpCurrentContentElements-push_back(new
TagCloseElement(draw:image));
commit 31c02baa10f7da947aa073f8af3f8e370acabd90
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Wed Jan 25 11:02:31 2012 +0100
TEMP
diff --git a/sc/source/filter/xml/xmlstyli.cxx
b/sc/source/filter/xml/xmlstyli.cxx
index 7691c4b..6e5ae54 100644
--- a/sc/source/filter/xml/xmlstyli.cxx
+++ b/sc/source/filter/xml/xmlstyli.cxx
@@ -26,7 +26,7 @@
*
/
-
+#include stdio.h
#include xmlstyli.hxx
#include xmloff/nmspmap.hxx
@@ -173,9 +173,13 @@ void
ScXMLCellImportPropertyMapper::finished(::std::vector XMLPropertyState
table::BorderLine2 aBorderLineWidth;
pBorderWidths[i]-maValue = aBorderLineWidth;
aBorderLine.OuterLineWidth = aBorderLineWidth.OuterLineWidth;
+ printf(OuterLineWidth %f\n,
aBorderLineWidth.OuterLineWidth);
aBorderLine.InnerLineWidth = aBorderLineWidth.InnerLineWidth;
+ printf(InnerLineWidth %f\n,
aBorderLineWidth.InnerLineWidth);
aBorderLine.LineDistance = aBorderLineWidth.LineDistance;
+ printf(LineDistance %f\n,
aBorderLineWidth.LineDistance);
aBorderLine.LineWidth = aBorderLineWidth.LineWidth;
+ printf(LineWidth %f\n,
aBorderLineWidth.LineWidth);
pBorders[i]-maValue = aBorderLine;
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - desktop/Executable_soffice.bin.mk desktop/Module_desktop.mk desktop/util desktop/WinResTarget_sofficebin.mk desktop/WinResTarget_soffice.mk officecf
desktop/Executable_soffice.bin.mk |2 desktop/Module_desktop.mk |1 desktop/WinResTarget_soffice.mk |2 desktop/WinResTarget_sofficebin.mk | 49 ++ desktop/util/officeloader.rc | 36 +-- officecfg/registry/data/org/openoffice/Setup.xcu | 22 ++-- reportbuilder/registry/data/org/openoffice/Setup.xcu |2 scp2/inc/macros.inc |2 scp2/source/base/registryitem_base.scp |2 scp2/source/binfilter/registryitem_binfilter.scp | 16 +-- scp2/source/calc/registryitem_calc.scp | 26 ++--- scp2/source/draw/registryitem_draw.scp | 12 +- scp2/source/impress/registryitem_impress.scp | 28 ++--- scp2/source/math/registryitem_math.scp |8 - scp2/source/ooo/registryitem_ooo.scp |4 scp2/source/writer/registryitem_writer.scp | 32 +++--- setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.cxx | 17 +-- setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.hxx |1 setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx |4 sfx2/source/appl/shutdowniconunx.cxx |6 - sfx2/source/appl/shutdowniconw32.cxx | 18 +-- vcl/inc/svids.hrc |8 - vcl/inc/vcl/syswin.hxx | 16 +-- vcl/unx/generic/window/salframe.cxx |2 24 files changed, 166 insertions(+), 150 deletions(-) New commits: commit 842f11cc651f2ab077f46323d260987de190ff57 Author: Andras Timar ati...@suse.com Date: Wed Jan 18 13:11:11 2012 +0100 fdo#37740 remove duplicate icons from soffice.bin/soffice.exe Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch diff --git a/desktop/Executable_soffice.bin.mk b/desktop/Executable_soffice.bin.mk index a4aa573..7e168aa 100644 --- a/desktop/Executable_soffice.bin.mk +++ b/desktop/Executable_soffice.bin.mk @@ -102,6 +102,6 @@ $(eval $(call gb_Executable_set_ldflags,\ endif -$(eval $(call gb_Executable_add_nativeres,$(sofficebin),soffice/src)) +$(eval $(call gb_Executable_add_nativeres,$(sofficebin),sofficebin/src)) # vim: set ts=4 sw=4 et: diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk index 7ce47f7..dd18d73 100644 --- a/desktop/Module_desktop.mk +++ b/desktop/Module_desktop.mk @@ -90,6 +90,7 @@ $(eval $(call gb_Module_add_targets,desktop,\ WinResTarget_sdraw \ WinResTarget_simpress \ WinResTarget_soffice \ +WinResTarget_sofficebin \ WinResTarget_smath \ WinResTarget_sweb \ WinResTarget_swriter \ diff --git a/desktop/WinResTarget_soffice.mk b/desktop/WinResTarget_soffice.mk index b15..fe66aa5 100644 --- a/desktop/WinResTarget_soffice.mk +++ b/desktop/WinResTarget_soffice.mk @@ -44,6 +44,6 @@ $(eval $(call gb_WinResTarget_add_dependency,soffice/src,\ sysui/desktop/icons/main_app.ico \ )) -$(eval $(call gb_WinResTarget_add_file,soffice/src,desktop/util/officeloader)) +$(eval $(call gb_WinResTarget_add_file,soffice/src,desktop/win32/source/applauncher/launcher)) # vim: set ts=4 sw=4 et: diff --git a/desktop/WinResTarget_sofficebin.mk b/desktop/WinResTarget_sofficebin.mk new file mode 100644 index 000..334c9b7 --- /dev/null +++ b/desktop/WinResTarget_sofficebin.mk @@ -0,0 +1,49 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the License); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an AS IS basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2011 Red Hat, Inc., David Tardon dtar...@redhat.com +# (initial developer) +# +# All Rights
[Libreoffice-commits] .: officecfg/registry
officecfg/registry/data/org/openoffice/VCL.xcu |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 86bf32c487852f4e466b27320e3724266cb53dba Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Tue Jan 24 16:22:15 2012 +0100 Fix build: dupplicate node/prop /VCL/DefaultFonts/bn diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu b/officecfg/registry/data/org/openoffice/VCL.xcu index 248e439..6cf60ef 100644 --- a/officecfg/registry/data/org/openoffice/VCL.xcu +++ b/officecfg/registry/data/org/openoffice/VCL.xcu @@ -856,7 +856,7 @@ valueLohit Assamese;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS/value /prop /node -node oor:name=bn oor:op=replace +node oor:name=bn-IN oor:op=replace prop oor:name=UI_SANS oor:op=replace oor:type=xs:string valueLohit Bengali;Vrinda;Lucidasans;Lucida Sans;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU/value /prop ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: qadevOOo/Jar_OOoRunnerLight.mk qadevOOo/Jar_OOoRunner.mk
qadevOOo/Jar_OOoRunner.mk |1 - qadevOOo/Jar_OOoRunnerLight.mk |1 - 2 files changed, 2 deletions(-) New commits: commit 7938b75ab7d8052b66859db05201cafc5175d95e Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Tue Jan 24 16:29:33 2012 +0100 Don't try to build inexisting file diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk index 0bb436d..43a4740 100644 --- a/qadevOOo/Jar_OOoRunner.mk +++ b/qadevOOo/Jar_OOoRunner.mk @@ -123,7 +123,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\ qadevOOo/runner/convwatch/ReportDesignerTest \ qadevOOo/runner/convwatch/SimpleFileSemaphore \ qadevOOo/runner/convwatch/StatusHelper \ -qadevOOo/runner/convwatch/StringHelper \ qadevOOo/runner/convwatch/TimeHelper \ qadevOOo/runner/convwatch/TriState \ qadevOOo/runner/convwatch/ValueNotFoundException \ diff --git a/qadevOOo/Jar_OOoRunnerLight.mk b/qadevOOo/Jar_OOoRunnerLight.mk index 2dc0c15..7a51d06 100644 --- a/qadevOOo/Jar_OOoRunnerLight.mk +++ b/qadevOOo/Jar_OOoRunnerLight.mk @@ -120,7 +120,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunnerLight,\ qadevOOo/runner/convwatch/ReportDesignerTest \ qadevOOo/runner/convwatch/SimpleFileSemaphore \ qadevOOo/runner/convwatch/StatusHelper \ -qadevOOo/runner/convwatch/StringHelper \ qadevOOo/runner/convwatch/TimeHelper \ qadevOOo/runner/convwatch/TriState \ qadevOOo/runner/convwatch/ValueNotFoundException \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - solenv/bin
solenv/bin/modules/installer/windows/msiglobal.pm | 14 +-
1 file changed, 5 insertions(+), 9 deletions(-)
New commits:
commit ccc8753d7fc573db29159ab21492b8939f0ddab8
Author: Andras Timar ati...@suse.com
Date: Thu Jan 19 23:22:38 2012 +0100
fdo#44915 MSI installer l10n bug
Unfortunately msiinfo.exe has a limitation, it truncates Language
property in Summary Information at char position 254.
The replacement, WiLangId.vbs does not have this limitation.
Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm
b/solenv/bin/modules/installer/windows/msiglobal.pm
index 43e6ee3..a743b45 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -982,14 +982,11 @@ sub create_transforms
my $msitran = msitran.exe;# Has to be in the path
my $msidb = msidb.exe;# Has to be in the path
-my $msiinfo = msiinfo.exe;# Has to be in the path
+my $wilangid = $ENV{WINDOWS_SDK_HOME} .
/Samples/SysMgmt/Msi/scripts/WiLangId.vbs;
my $from = cwd();
-my $architecture = Intel;
-if (( $allvariableshashref-{'64BITPRODUCT'} ) (
$allvariableshashref-{'64BITPRODUCT'} == 1 )) { $architecture = x64; }
-
-my $templatevalue = \ . $architecture . ;1033;
+my $templatevalue = 1033;
$installdir = installer::converter::make_path_conform($installdir);
@@ -1124,8 +1121,7 @@ sub create_transforms
}
}
-$templatevalue = $templatevalue . \; # adding
ending ''
-$systemcall = $msiinfo . . $basedbname . -p . $templatevalue;
+$systemcall = cscript.exe . $wilangid . . $basedbname . Package
. $templatevalue;
$returnvalue = system($systemcall);
@@ -1134,12 +1130,12 @@ sub create_transforms
if ($returnvalue)
{
-$infoline = ERROR: Could not execute $msiinfo!\n;
+$infoline = ERROR: Could not execute WiLangId.vbs!\n;
push( @installer::globals::logfileinfo, $infoline);
}
else
{
-$infoline = Success: Executed $msiinfo successfully!\n;
+$infoline = Success: Executed WiLangId.vbs successfully!\n;
push( @installer::globals::logfileinfo, $infoline);
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: libvisio/libvisio-0.0.13.patch libvisio/libvisio-0.0.14.patch libvisio/makefile.mk ooo.lst.in
libvisio/libvisio-0.0.13.patch | 20 libvisio/libvisio-0.0.14.patch | 20 libvisio/makefile.mk |4 ++-- ooo.lst.in |2 +- 4 files changed, 23 insertions(+), 23 deletions(-) New commits: commit 32d4f05c022d785a86c6b0c39c74bc1ad46f6e61 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Fri Jan 20 10:51:35 2012 +0100 Uploading even newer and even more shiny libvisio 0.0.14 diff --git a/libvisio/libvisio-0.0.13.patch b/libvisio/libvisio-0.0.13.patch deleted file mode 100644 index c93983b..000 --- a/libvisio/libvisio-0.0.13.patch +++ /dev/null @@ -1,20 +0,0 @@ misc/libvisio-0.0.13/src/lib/libvisio_utils.h -+++ misc/build/libvisio-0.0.13/src/lib/libvisio_utils.h -@@ -42,17 +42,8 @@ - - #else - --#ifdef HAVE_CONFIG_H --#include config.h --#endif -- --#ifdef HAVE_STDINT_H - #include stdint.h --#endif -- --#ifdef HAVE_INTTYPES_H - #include inttypes.h --#endif - - #endif - diff --git a/libvisio/libvisio-0.0.14.patch b/libvisio/libvisio-0.0.14.patch new file mode 100644 index 000..456f5ad --- /dev/null +++ b/libvisio/libvisio-0.0.14.patch @@ -0,0 +1,20 @@ +--- misc/libvisio-0.0.14/src/lib/libvisio_utils.h misc/build/libvisio-0.0.14/src/lib/libvisio_utils.h +@@ -42,17 +42,8 @@ + + #else + +-#ifdef HAVE_CONFIG_H +-#include config.h +-#endif +- +-#ifdef HAVE_STDINT_H + #include stdint.h +-#endif +- +-#ifdef HAVE_INTTYPES_H + #include inttypes.h +-#endif + + #endif + diff --git a/libvisio/makefile.mk b/libvisio/makefile.mk index 6d29b7d..9adf426 100644 --- a/libvisio/makefile.mk +++ b/libvisio/makefile.mk @@ -54,8 +54,8 @@ INCPRE+=$(WPG_CFLAGS) INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpg .ENDIF -TARFILE_NAME=libvisio-0.0.13 -TARFILE_MD5=adb5c5c8398fd89ebee2d9b4e90e061e +TARFILE_NAME=libvisio-0.0.14 +TARFILE_MD5=776ad69a63ac1e99abed176e54ce25d9 PATCH_FILES=\ $(TARFILE_NAME).patch diff --git a/ooo.lst.in b/ooo.lst.in index af2f02e..3f26b25 100644 --- a/ooo.lst.in +++ b/ooo.lst.in @@ -87,7 +87,7 @@ c01351d7db2b205de755d58769288224-libwpd-0.9.4.tar.bz2 f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz 3bf481ca95109b14435125c0dd1f2217-graphite2-1.0.3.tgz -adb5c5c8398fd89ebee2d9b4e90e061e-libvisio-0.0.13.tar.bz2 +776ad69a63ac1e99abed176e54ce25d9-libvisio-0.0.14.tar.bz2 e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip 7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz cc8eb870d6a324d36575420efd856319-libcdr-0.0.0.tar.bz2 ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - libvisio/libvisio-0.0.13.patch libvisio/libvisio-0.0.14.patch libvisio/makefile.mk ooo.lst.in writerperfect/source
libvisio/libvisio-0.0.13.patch | 20
libvisio/libvisio-0.0.14.patch | 20
libvisio/makefile.mk |4 +-
ooo.lst.in |2 -
writerperfect/source/filter/OdgGenerator.cxx | 43 +--
5 files changed, 64 insertions(+), 25 deletions(-)
New commits:
commit a61ea02511d6e81035495fefaa24e77b30701362
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Fri Jan 20 10:51:35 2012 +0100
Uploading even newer and even more shiny libvisio 0.0.14
Signed-off-by: Thorsten Behrens tbehr...@suse.com
diff --git a/libvisio/libvisio-0.0.13.patch b/libvisio/libvisio-0.0.13.patch
deleted file mode 100644
index c93983b..000
--- a/libvisio/libvisio-0.0.13.patch
+++ /dev/null
@@ -1,20 +0,0 @@
misc/libvisio-0.0.13/src/lib/libvisio_utils.h
-+++ misc/build/libvisio-0.0.13/src/lib/libvisio_utils.h
-@@ -42,17 +42,8 @@
-
- #else
-
--#ifdef HAVE_CONFIG_H
--#include config.h
--#endif
--
--#ifdef HAVE_STDINT_H
- #include stdint.h
--#endif
--
--#ifdef HAVE_INTTYPES_H
- #include inttypes.h
--#endif
-
- #endif
-
diff --git a/libvisio/libvisio-0.0.14.patch b/libvisio/libvisio-0.0.14.patch
new file mode 100644
index 000..456f5ad
--- /dev/null
+++ b/libvisio/libvisio-0.0.14.patch
@@ -0,0 +1,20 @@
+--- misc/libvisio-0.0.14/src/lib/libvisio_utils.h
misc/build/libvisio-0.0.14/src/lib/libvisio_utils.h
+@@ -42,17 +42,8 @@
+
+ #else
+
+-#ifdef HAVE_CONFIG_H
+-#include config.h
+-#endif
+-
+-#ifdef HAVE_STDINT_H
+ #include stdint.h
+-#endif
+-
+-#ifdef HAVE_INTTYPES_H
+ #include inttypes.h
+-#endif
+
+ #endif
+
diff --git a/libvisio/makefile.mk b/libvisio/makefile.mk
index 6d29b7d..9adf426 100644
--- a/libvisio/makefile.mk
+++ b/libvisio/makefile.mk
@@ -54,8 +54,8 @@ INCPRE+=$(WPG_CFLAGS)
INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpg
.ENDIF
-TARFILE_NAME=libvisio-0.0.13
-TARFILE_MD5=adb5c5c8398fd89ebee2d9b4e90e061e
+TARFILE_NAME=libvisio-0.0.14
+TARFILE_MD5=776ad69a63ac1e99abed176e54ce25d9
PATCH_FILES=\
$(TARFILE_NAME).patch
diff --git a/ooo.lst.in b/ooo.lst.in
index 3ebd860..a71ed38 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -88,7 +88,7 @@ c01351d7db2b205de755d58769288224-libwpd-0.9.4.tar.bz2
f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz
3bf481ca95109b14435125c0dd1f2217-graphite2-1.0.3.tgz
-adb5c5c8398fd89ebee2d9b4e90e061e-libvisio-0.0.13.tar.bz2
+776ad69a63ac1e99abed176e54ce25d9-libvisio-0.0.14.tar.bz2
e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip
7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz
@GOOGLE_DOCS_EXTENSION_PACK@
commit 4a49fcfe961f7f6fe78378e8fa94fb3697c53007
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Mon Jan 16 17:32:23 2012 +0100
Implementing text rotations
Signed-off-by: Thorsten Behrens tbehr...@suse.com
diff --git a/writerperfect/source/filter/OdgGenerator.cxx
b/writerperfect/source/filter/OdgGenerator.cxx
index 5681ed5..79722e8 100644
--- a/writerperfect/source/filter/OdgGenerator.cxx
+++ b/writerperfect/source/filter/OdgGenerator.cxx
@@ -1371,10 +1371,27 @@ void OdgGenerator::startTextObject(const
WPXPropertyList propList, const WPXPro
pStyleGraphicPropertiesOpenElement-addAttribute(draw:fill, none);
pStyleGraphicPropertiesOpenElement-addAttribute(draw:fill-color,
#ff);
+double x = 0.0;
+double y = 0.0;
+double height = 0.0;
+double width = 0.0;
if (propList[svg:x])
-pDrawFrameOpenElement-addAttribute(svg:x,
propList[svg:x]-getStr());
+x = propList[svg:x]-getDouble();
if (propList[svg:y])
-pDrawFrameOpenElement-addAttribute(svg:y,
propList[svg:y]-getStr());
+y = propList[svg:y]-getDouble();
+if (propList[svg:width])
+width = propList[svg:width]-getDouble();
+if (propList[svg:height])
+height = propList[svg:height]-getDouble();
+
+double angle(propList[libwpg:rotate] ? - M_PI *
propList[libwpg:rotate]-getDouble() / 180.0 : 0.0);
+if (angle != 0.0)
+{
+double deltax((width*cos(angle)+height*sin(angle)-width)/2.0);
+double deltay((-width*sin(angle)+height*cos(angle)-height)/2.0);
+x -= deltax;
+y -= deltay;
+}
if (!propList[svg:width] !propList[svg:height])
{
@@ -1452,6 +1469,28 @@ void OdgGenerator::startTextObject(const WPXPropertyList
propList, const WPXPro
pDrawFrameOpenElement-addAttribute(draw:opacity,
propList[draw:opacity]-getStr());
pStyleGraphicPropertiesOpenElement-addAttribute(draw:opacity,
propList[draw:opacity]-getStr());
}
+
+WPXProperty *svg_x = WPXPropertyFactory::newInchProp(x);
+WPXProperty *svg_y = WPXPropertyFactory::newInchProp(y);
+if (angle != 0.0)
+{
+WPXProperty *libwpg_rotate = WPXPropertyFactory::newDoubleProp(angle);
+sValue.sprintf(rotate (%s) translate(%s, %s),
+
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/platform/WNT_INTEL_MSC.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 29a3d25eb516adf3fbf73520c9196be11f5cb5e3 Author: Matus Kukan matus.ku...@gmail.com Date: Fri Jan 20 14:35:41 2012 +0100 Fix windows build of cppu diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk index 7552f09..a0559ff 100644 --- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk @@ -254,7 +254,7 @@ define gb_Helper_convert_native $(subst file:!!!,file:///, \ $(subst //,/, \ $(subst file:///,file:!!!, \ -$(subst $(REPODIR),$(gb_Helper_REPODIR_NATIVE), \ +$(subst $(REPODIR),$(pathsubst %/,%,$(gb_Helper_REPODIR_NATIVE)), \ $(subst $(SRCDIR),$(gb_Helper_SRCDIR_NATIVE), \ $(subst $(WORKDIR),$(gb_Helper_WORKDIR_NATIVE), \ $(subst $(OUTDIR),$(gb_Helper_OUTDIR_NATIVE), \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/platform/WNT_INTEL_MSC.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7514488ad4c3e8289aebe3a03bd14c293479627b Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Fri Jan 20 14:44:42 2012 +0100 Oops, my bad diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk index a0559ff..284c2eb 100644 --- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk @@ -254,7 +254,7 @@ define gb_Helper_convert_native $(subst file:!!!,file:///, \ $(subst //,/, \ $(subst file:///,file:!!!, \ -$(subst $(REPODIR),$(pathsubst %/,%,$(gb_Helper_REPODIR_NATIVE)), \ +$(subst $(REPODIR),$(patsubst %/,%,$(gb_Helper_REPODIR_NATIVE)), \ $(subst $(SRCDIR),$(gb_Helper_SRCDIR_NATIVE), \ $(subst $(WORKDIR),$(gb_Helper_WORKDIR_NATIVE), \ $(subst $(OUTDIR),$(gb_Helper_OUTDIR_NATIVE), \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sal/osl
sal/osl/w32/file_dirvol.cxx | 20
1 file changed, 20 insertions(+)
New commits:
commit 5a8a1d024bee83eff8d9a85ae6dda6c8823c3f2e
Author: Michael Meeks mme...@suse.com
Date: Fri Jan 20 15:01:14 2012 +0100
Implement osl_identicalDirectoryItem for win32
diff --git a/sal/osl/w32/file_dirvol.cxx b/sal/osl/w32/file_dirvol.cxx
index 8e3ea7f..7694818 100644
--- a/sal/osl/w32/file_dirvol.cxx
+++ b/sal/osl/w32/file_dirvol.cxx
@@ -1219,6 +1219,26 @@ oslFileError SAL_CALL osl_releaseDirectoryItem(
oslDirectoryItem Item )
return osl_File_E_None;
}
+
+sal_Bool
+SAL_CALL osl_identicalDirectoryItem( oslDirectoryItem a, oslDirectoryItem b)
+{
+DirectoryItem_Impl *pA = (DirectoryItem_Impl *) a;
+DirectoryItem_Impl *pB = (DirectoryItem_Impl *) b;
+if (a == b)
+return sal_True;
+/* same name = same item, unless renaming / moving madness has occurred */
+if (rtl_ustr_compare_WithLength(
+pA-m_pFullPath-buffer, pA-m_pFullPath-length,
+pB-m_pFullPath-buffer, pB-m_pFullPath-length ) == 0)
+return sal_True;
+
+// FIXME: as/when/if this is used in anger on Windows we could
+// do better here.
+
+return sal_False;
+}
+
//#
// volume / file info handling functions
//#
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/modules/installer/windows/msiglobal.pm |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 490301650899abec73128258569e0dffdc52d7c9
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Fri Jan 20 16:12:13 2012 +0100
Fix WiLangId.vbs operation
The script needs %TEMP% to be set in order to work properly.
Cygwin unsets TEMP which causes WiLangId.vbs to fail. Set the
TEMP variable to $TMPDIR before we call the cscript.exe.
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm
b/solenv/bin/modules/installer/windows/msiglobal.pm
index a097780..f7185d3 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -980,8 +980,10 @@ sub create_transforms
installer::logger::include_header_into_logfile(Creating Transforms);
+my $cscript = cscript.exe;# Has to be in the path
my $msitran = msitran.exe;# Has to be in the path
my $msidb = msidb.exe;# Has to be in the path
+my $tmpdir = $ENV{TMPDIR};# Variable %TEMP% will be set to it for
WiLangId.vbs to work
my $wilangid = $ENV{WINDOWS_SDK_HOME} .
/Samples/SysMgmt/Msi/scripts/WiLangId.vbs;
my $from = cwd();
@@ -1121,7 +1123,7 @@ sub create_transforms
}
}
-$systemcall = cscript.exe . $wilangid . . $basedbname . Package
. $templatevalue;
+$systemcall = TEMP= . $tmpdir . . $cscript . . $wilangid . .
$basedbname . Package . $templatevalue;
$returnvalue = system($systemcall);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - solenv/bin
solenv/bin/modules/installer/windows/msiglobal.pm |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit a4bd804fd95a4a79ec4ebb64555aade5bea63a14
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Fri Jan 20 16:12:13 2012 +0100
Fix WiLangId.vbs operation
The script needs %TEMP% to be set in order to work properly.
Cygwin unsets TEMP which causes WiLangId.vbs to fail. Set the
TEMP variable to $TMPDIR before we call the cscript.exe.
Signed-off-by: Michael Meeks mme...@suse.com
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm
b/solenv/bin/modules/installer/windows/msiglobal.pm
index a743b45..96c9606 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -980,8 +980,10 @@ sub create_transforms
installer::logger::include_header_into_logfile(Creating Transforms);
+my $cscript = cscript.exe;# Has to be in the path
my $msitran = msitran.exe;# Has to be in the path
my $msidb = msidb.exe;# Has to be in the path
+my $tmpdir = $ENV{TMPDIR};# Variable %TEMP% will be set to it for
WiLangId.vbs to work
my $wilangid = $ENV{WINDOWS_SDK_HOME} .
/Samples/SysMgmt/Msi/scripts/WiLangId.vbs;
my $from = cwd();
@@ -1121,7 +1123,7 @@ sub create_transforms
}
}
-$systemcall = cscript.exe . $wilangid . . $basedbname . Package
. $templatevalue;
+$systemcall = TEMP= . $tmpdir . . $cscript . . $wilangid . .
$basedbname . Package . $templatevalue;
$returnvalue = system($systemcall);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.5.0.1'
Tag 'libreoffice-3.5.0.1' created by Fridrich Å trba fridrich.st...@bluewin.ch at 2012-01-17 21:55 +0100 Tag 3.5.0.1 (3.5.0-rc1) -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.18 (GNU/Linux) iQIcBAABAgAGBQJPFe5CAAoJEPQ0oe+v7q6jgroQALd3rruLwq/0JCHJSKgRdmFZ jd1UM7Yv43hBjej9ALptDPf0QOJ2qluUKXwcbta0/FKgVy3KIIwZdYdTALHtQwmo G5qXzNO4ZpKgg1OdQFPcaSqZp2XWlH0i/GeE8r9bzzV69tM9dsVOThbvJk3Z8Mt5 nsaFLBfMR4MvUO5ANTC1G1hmSph0NdRLmVkUvINcQPswvUt+CMmNHDD+ApxOdC6O YUbu/8FTTzHkOmI0cz6KHBo4F3D0xqAmpcbBzGnrZb3i6KlFkm4+c00G/qxZe4B0 0DChQtTVISXtbP4LkPSiQUAk6+xHuDkvvL/s4CWQRNZNdVYSwAPvdz8y+QcJGDbl 80vEwRWnmFAUB37ztFn5fw5eq1QsrrlMGeUJxxf9fI54HcVaAU5SMEiItc069oiO M3NlxozXqG2ZeYfWyAliuvA0C5pl6l9Og22yTydbnxLekWGP2cbwaYcq5Xl6l3CC 1u+drV0z6JorQwmiA3KR5tRAyikfOF/IWsGe+TwRJ+YWZ+aeuLqLboogU2CYkjqE ss3YnnZrKG8C0m+dbnY3g44FYijf8xde6wcYF4PjWRpk42Ovxl7IVjNKUkTfxGr0 72RZ8jrCuE6Bpn+g55qiRWtl0JulLXqGM5belUlkekE/Y5F6Y7l5LD/H0PudufB7 UHDNB6QYuBSRw3bCpR/X =IMwQ -END PGP SIGNATURE- Changes since libreoffice-3-5-branch-point-595: --- 0 files changed --- ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.5.0.1'
Tag 'libreoffice-3.5.0.1' created by Fridrich Å trba fridrich.st...@bluewin.ch at 2012-01-17 21:55 +0100 Tag 3.5.0.1 (3.5.0-rc1) -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.18 (GNU/Linux) iQIcBAABAgAGBQJPFe5CAAoJEPQ0oe+v7q6jLv0P/jTnFP8pZ9tknA4CX21kIcmF tYCJnhEmQOqZQZG9ryaRiM3o8Lc7FGtBaYl5RLqqZ4MigSiP5ukMTnOoBjIQrCGW uEQLPsPZSc7KpXno2O1SM08NGUH498WviYw2ea1z7efMS1dkQx/Gvv7XKK1WBnyl /rnnL50xjl3ydJL4r7ctYi6XZ43sQR8CsHmDY3RCtZ5UilIoPXXcQmFQwzhQIo2V 20YolI4TN7GjqkxQwqphgfTpqCvvc5M5FDBCKIX+w9umUwiX5u4Z00yH3PLSPAWe mzz+gasecWHlj3hZhhbUmFu2AOsf84LjUX9AqU52XSNLJiwJUOvvIRIrXSo9pe3v 88JqZNQJqXepN0fs/zoeLL2yHigTSiSSMsALDrrB7Vd/6cw8+oZgGrJughRYt+84 sGlxkiXwoTxGfxawL0xogEXWwtxEFrLmyJoD6zkndO1N9FxrtMfExVYvzsPDajmu rSEURN1Otp9Q9G986xH+Cc/ZWmzfzCN5U1vDCq3YSzsoZawQDobqcbqjQOy0Jgpn S0JNxSz8NJc0L08PP5U2yzXoyCG2DnXsi1fy5JKU8EYDKAitQFh41CiwvVIUMsHV K3MO6jGCjM0xKD5ALyWKhMuG6ahvUpb742XAGQpA0kicA+nDo7QVwGNeZPwjgPmk 2luEExA96nYwMiHTPJT0 =7WnG -END PGP SIGNATURE- Changes since libreoffice-3-5-branch-point-24: --- 0 files changed --- ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.5.0.1'
Tag 'libreoffice-3.5.0.1' created by Fridrich Å trba fridrich.st...@bluewin.ch at 2012-01-18 08:16 +0100 Tag 3.5.0.1 (3.5.0-rc1) -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.18 (GNU/Linux) iQIcBAABAgAGBQJPFn/zAAoJEPQ0oe+v7q6j4LEP+QG/Mc93lGD6mlsoiKmMVNKc Sn737QmTBDbAHgEJWMFe1+gYOxb8A5WygymedvFT+2iWSj03UF2IbVkfIRVGYxjv uJX8wFTbuh6+5FPqabljzM2kN3hucq/rVOpTfO+0YOHoIpTmLThbeQnxmEUWw/jW /OvcD7FNLeycBhuaBc+oaTiCd8fx6rfY7FM9wLeSiVQgCPWgE3U+Fg4ovGiN98Bh fkjckq4wjL5/0bCJImOTyMHjEjYev3/dll6g8UGnwZEtlngfkAuri8SEWgkVWZ2Q I/eF2srAh4Y03phYognS44qIphcaTcgOkIw6k2BZPOimEraV05AnrjOZvkrPgg3U hLv3sACwSi11kA9+oyGvfm3TE06O6hCH+Ddb99K3oKXdG7eWwDvrXfM5D0SH4+ja GAGU7CH+6gGMkjuDhtJF/lzLt5vPfianCu0s2gf9n0PNAN7f6ZySTF2VbcVJ4gmX CNkNFbwbNl8TM5K73LdIymF34bEHhvT9WVSWm8og4rBrDoHUpzRFMNjQxRQIFX7q GU6L9Yj93UeM60S/+bEO98J1HeNhla2WBEYGSS8F+IAL/mdALndJCzpFbxjQ52aH r8U80c7wyr1TyNg5DhZIE0tan+XSiwh1mTq312BPfNLGHmSMm6pijna2P1BhS8Rg cloqphRfXYDSB+7m47Vl =hfNj -END PGP SIGNATURE- Changes since libreoffice-3-5-branch-point-37: --- 0 files changed --- ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'refs/tags/libreoffice-3.5.0.1' - 3 commits - binfilter/bf_sch binfilter/bf_sw
Rebased ref, commits from common ancestor:
commit 8c0b45513a139657678484b73112dc5eba800dac
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Wed Jan 18 09:24:57 2012 +0100
Version 3.5.0.1, tag libreoffice-3.5.0.1 (3.5.0-rc1)
commit 539d9db35d08904e03366c51105f60385f84
Author: David Tardon dtar...@redhat.com
Date: Tue Jan 10 19:32:51 2012 +0100
fix for gcc 4.7/C++11: these are not string literal operators
Signed-off-by: David Tardon dtar...@redhat.com
diff --git a/binfilter/bf_sch/source/core/sch_globfunc.cxx
b/binfilter/bf_sch/source/core/sch_globfunc.cxx
index 6a81bf1..ac87608 100644
--- a/binfilter/bf_sch/source/core/sch_globfunc.cxx
+++ b/binfilter/bf_sch/source/core/sch_globfunc.cxx
@@ -1193,7 +1193,7 @@ namespace binfilter {
/*N*/ const USHORT* pRanges = rSet.GetRanges();
/*N*/ for( long n = 0; pRanges[ n ] n32; n+=2 )
/*N*/ {
-/*N*/ snprintf( pSmallBuf, sizeof(pSmallBuf), [%SAL_PRIdINT32;
%SAL_PRIdINT32] , (sal_uInt32)pRanges[ n ], (sal_uInt32)pRanges[ n+1 ] );
+/*N*/ snprintf( pSmallBuf, sizeof(pSmallBuf), [% SAL_PRIdINT32 ; %
SAL_PRIdINT32 ] , (sal_uInt32)pRanges[ n ], (sal_uInt32)pRanges[ n+1 ] );
/*N*/ strncat( pBuf, pSmallBuf, sizeof(pBuf) - strlen(pBuf) - 1 );
/*N*/ }
/*N*/
@@ -1219,7 +1219,7 @@ namespace binfilter {
/*N*/ nCns++;
/*N*/ if( nCnt 100 )
/*N*/ {
-/*N*/ snprintf( pSmallBuf, sizeof(pSmallBuf), %SAL_PRIdINT32,
, (sal_uInt32) nWhich );
+/*N*/ snprintf( pSmallBuf, sizeof(pSmallBuf), % SAL_PRIdINT32
, , (sal_uInt32) nWhich );
/*N*/ strncat( pBuf, pSmallBuf, sizeof(pBuf) - strlen(pBuf) - 1
);
/*N*/ }
/*N*/
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
b/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
index 6548a85..3da5855 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
@@ -1646,7 +1646,7 @@ void Sw3StringPool::LoadOld( SvStream r )
/*N*/ if( pCrypter )
/*N*/ {
/*?*/ sal_Char buf[ 17 ];
-/*?*/ snprintf( buf, sizeof(buf),
%08SAL_PRIxUINT32%08SAL_PRIxUINT32, nDate, nTime );
+/*?*/ snprintf( buf, sizeof(buf), %08 SAL_PRIxUINT32 %08
SAL_PRIxUINT32, nDate, nTime );
/*?*/ rtl::OStringBuffer aTest( buf );
/*?*/ pCrypter-Encrypt( aTest );
/*?*/ return sal_Bool( !memcmp( cPasswd, aTest.getStr(), PASSWDLEN ) );
@@ -1664,7 +1664,7 @@ void Sw3StringPool::LoadOld( SvStream r )
/*N*/ {
/*?*/ pCrypter = new Crypter( pRoot-GetKey() );
/*?*/ sal_Char buf[ 17 ];
-/*?*/ snprintf( buf, sizeof(buf),
%08SAL_PRIxUINT32%08SAL_PRIxUINT32, nDate, nTime );
+/*?*/ snprintf( buf, sizeof(buf), %08 SAL_PRIxUINT32 %08
SAL_PRIxUINT32, nDate, nTime );
/*?*/ rtl::OStringBuffer aTest( buf );
/*?*/ pCrypter-Encrypt( aTest );
/*?*/ memcpy( cPasswd, aTest.getStr(), aTest.getLength() );
commit 7f15fcac486ea45c3ca77db7f93506850a022e5e
Author: Petr Mladek pmla...@suse.cz
Date: Tue Dec 6 14:15:08 2011 +0100
Branch libreoffice-3-5
This is 'libreoffice-3-5' - the stable branch for the 3.5.x releases.
The commit rules are different according to the development phase:
+ 3.5.0 beta phase:
+ any bug fixes are allowed without review
+ late features need approval by 2 people with different affiliation
+ 3.5.0 rc phase and later:
+ fixes need approval by one reviewer
+ late features need approval by 2 more people with different
affiliation
IMPORTANT: Every developer is responsible for pushing the fixes into all
appropriate branches. Note that we do not plan any merge
from this branch to master or vice versa.
Please, help use to make stable and usable release. If you want to build
something cool, unstable, and risky, use master.
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - instsetoo_native/util solenv/inc
instsetoo_native/util/openoffice.lst | 30 +++--- solenv/inc/minor.mk |4 ++-- 2 files changed, 17 insertions(+), 17 deletions(-) New commits: commit 2f1fa4abea5035cdf83331dd18b86b6fd6393d88 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Wed Jan 18 10:28:55 2012 +0100 bump product version to 3.5.0-rc1+, release number to 11 diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst index 18d804d..dba6be7 100644 --- a/instsetoo_native/util/openoffice.lst +++ b/instsetoo_native/util/openoffice.lst @@ -53,13 +53,13 @@ LibreOffice PRODUCTVERSION 3.5 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION beta3 + SHORT_PRODUCTEXTENSION rc1 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3.5 USERDIRPRODUCTVERSION 3 ABOUTBOXPRODUCTVERSION 3.5.0 - ABOUTBOXPRODUCTVERSIONSUFFIX beta3+ + ABOUTBOXPRODUCTVERSIONSUFFIX rc1+ BASEPRODUCTVERSION 3.5 PCPFILENAME libreoffice.pcp UPDATEURL http://update.libreoffice.org/check.php @@ -112,13 +112,13 @@ LibreOffice_wJRE PRODUCTVERSION 3.5 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION beta3 + SHORT_PRODUCTEXTENSION rc1 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3.5 USERDIRPRODUCTVERSION 3 ABOUTBOXPRODUCTVERSION 3.5.0 - ABOUTBOXPRODUCTVERSIONSUFFIX beta3+ + ABOUTBOXPRODUCTVERSIONSUFFIX rc1+ BASEPRODUCTVERSION 3.5 UPDATEURL http://update.libreoffice.org/check.php ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst @@ -170,14 +170,14 @@ LibreOffice_Dev PRODUCTVERSION 3.5 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION beta3 + SHORT_PRODUCTEXTENSION rc1 UNIXBASISROOTNAME lodev3.5 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3.5 USERDIRPRODUCTVERSION 3 ABOUTBOXPRODUCTVERSION 3.5.0 - ABOUTBOXPRODUCTVERSIONSUFFIX beta3+ + ABOUTBOXPRODUCTVERSIONSUFFIX rc1+ BASEPRODUCTVERSION 3.5 DEVELOPMENTPRODUCT 1 BASISPACKAGEPREFIX lodevbasis @@ -240,7 +240,7 @@ URE PRODUCTEXTENSION BRANDPACKAGEVERSION 3.5 LONG_PRODUCTEXTENSION -SHORT_PRODUCTEXTENSION beta3 +SHORT_PRODUCTEXTENSION rc1 LICENSENAME LGPL SETSTATICPATH 1 NOVERSIONINDIRNAME 1 @@ -275,7 +275,7 @@ LibreOffice_SDK PRODUCTVERSION 3.5 PRODUCTEXTENSION LONG_PRODUCTEXTENSION -SHORT_PRODUCTEXTENSION beta3 +SHORT_PRODUCTEXTENSION rc1 POSTVERSIONEXTENSION SDK POSTVERSIONEXTENSIONUNIX sdk BRANDPACKAGEVERSION 3.5 @@ -318,7 +318,7 @@ LibreOffice_Dev_SDK PRODUCTVERSION 3.5 PRODUCTEXTENSION LONG_PRODUCTEXTENSION -SHORT_PRODUCTEXTENSION beta3 +SHORT_PRODUCTEXTENSION rc1 UNIXBASISROOTNAME lodev3.5 POSTVERSIONEXTENSION SDK POSTVERSIONEXTENSIONUNIX sdk @@ -367,7 +367,7 @@ LibreOffice_Test PRODUCTVERSION 3.5 PRODUCTEXTENSION LONG_PRODUCTEXTENSION -SHORT_PRODUCTEXTENSION beta3 +SHORT_PRODUCTEXTENSION rc1 POSTVERSIONEXTENSION TEST POSTVERSIONEXTENSIONUNIX test BRANDPACKAGEVERSION 3.5 @@ -410,7 +410,7 @@ LibreOffice_Dev_Test PRODUCTVERSION 3.5 PRODUCTEXTENSION LONG_PRODUCTEXTENSION -SHORT_PRODUCTEXTENSION beta3 +SHORT_PRODUCTEXTENSION rc1 UNIXBASISROOTNAME lodev3.5 POSTVERSIONEXTENSION TEST POSTVERSIONEXTENSIONUNIX test @@ -458,13 +458,13 @@ OxygenOffice PRODUCTVERSION 3.5 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION beta3 + SHORT_PRODUCTEXTENSION rc1 POSTVERSIONEXTENSION
[Libreoffice-commits] .: 2 commits - scp2/source
scp2/source/ooo/ure.scp | 28 ++-- 1 file changed, 14 insertions(+), 14 deletions(-) New commits: commit 7f1d77d9fecdd710d2b2fd17be91a61665baf846 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Wed Jan 18 15:13:15 2012 +0100 If COM==_MSC, then OS==WNT and also GUI==WNT diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index a7cafa8..d17c0b7 100644 --- a/scp2/source/ooo/ure.scp +++ b/scp2/source/ooo/ure.scp @@ -439,7 +439,7 @@ File gid_File_Dl_LogUnoUno Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); End -#if defined WNT defined _MSC +#if defined _MSC File gid_File_Dl_Cli_Uno LIB_FILE_BODY; Dir = SCP2_URE_DL_DIR; @@ -449,7 +449,7 @@ File gid_File_Dl_Cli_Uno End #endif -#if defined WNT defined _MSC +#if defined _MSC File gid_File_Dl_Cli_Ure_Assembly TXT_FILE_BODY; @@ -466,7 +466,7 @@ End #endif -#if defined WNT defined _MSC +#if defined _MSC File gid_File_Dl_Policy_Cli_Ure_Assembly TXT_FILE_BODY; @@ -483,7 +483,7 @@ End #endif -#if defined WNT defined _MSC +#if defined _MSC File gid_File_Dl_Policy_Cli_Ure_Config TXT_FILE_BODY; @@ -495,7 +495,7 @@ End #endif -#if defined WNT defined _MSC +#if defined _MSC File gid_File_Dl_Cli_Basetypes_Assembly TXT_FILE_BODY; @@ -512,7 +512,7 @@ End #endif -#if defined WNT defined _MSC +#if defined _MSC File gid_File_Dl_Policy_Cli_Basetypes_Assembly TXT_FILE_BODY; @@ -528,7 +528,7 @@ File gid_File_Dl_Policy_Cli_Basetypes_Assembly End #endif -#if defined WNT defined _MSC +#if defined _MSC File gid_File_Dl_Policy_Cli_Basetypes_Config TXT_FILE_BODY; @@ -541,7 +541,7 @@ End #endif -#if defined WNT defined _MSC +#if defined _MSC File gid_File_Dl_Cli_Uretypes_Assembly TXT_FILE_BODY; @@ -558,7 +558,7 @@ End #endif -#if defined WNT defined _MSC +#if defined _MSC File gid_File_Dl_Policy_Cli_Uretypes_Assembly TXT_FILE_BODY; @@ -575,7 +575,7 @@ End #endif -#if defined WNT defined _MSC +#if defined _MSC File gid_File_Dl_Policy_Cli_Uretypes_Config TXT_FILE_BODY; @@ -587,7 +587,7 @@ End #endif -#if defined WNT defined _MSC +#if defined _MSC File gid_File_Lib_Cli_Cppuhelper_Assembly TXT_FILE_BODY; @@ -604,7 +604,7 @@ End #endif -#if defined WNT defined _MSC +#if defined _MSC File gid_File_Lib_Policy_Cli_Cppuhelper_Assembly TXT_FILE_BODY; @@ -621,7 +621,7 @@ End #endif -#if defined WNT defined _MSC +#if defined _MSC File gid_File_Lib_Policy_Cli_Cppuhelper_Config TXT_FILE_BODY; @@ -868,7 +868,7 @@ File gid_File_Dl_Stlport Name = SCP2_URE_DL_NORMAL(stlport_sunpro); #endif #endif -#elif defined WNT defined _MSC +#elif defined _MSC #if defined _DEBUG_RUNTIME Name = SCP2_URE_DL_NORMAL(stlport_vc71_stldebug45); #else commit aa318df8355334811649055494a03d6336becf66 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Wed Jan 18 15:08:02 2012 +0100 Package stlport on Windows when requested (fdo#37561) diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index aece726..a7cafa8 100644 --- a/scp2/source/ooo/ure.scp +++ b/scp2/source/ooo/ure.scp @@ -868,7 +868,7 @@ File gid_File_Dl_Stlport Name = SCP2_URE_DL_NORMAL(stlport_sunpro); #endif #endif -#elif defined WNT ((_MSC_VER == 1500) || (_MSC_VER == 1600)) +#elif defined WNT defined _MSC #if defined _DEBUG_RUNTIME Name = SCP2_URE_DL_NORMAL(stlport_vc71_stldebug45); #else ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.in scp2/inc scp2/source
configure.in |1 + scp2/inc/macros.inc |2 +- scp2/source/ooo/common_brand.scp |2 +- scp2/source/ooo/file_library_ooo.scp |6 +++--- scp2/source/ooo/makefile.mk |4 scp2/source/ooo/ure.scp | 28 ++-- 6 files changed, 20 insertions(+), 23 deletions(-) New commits: commit d3f17ac97d1d90069fd66ccc63caab0f0472dc7d Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Wed Jan 18 16:19:23 2012 +0100 _MSC_VER is compiler define and cpp.lcc needs to be taught about it diff --git a/configure.in b/configure.in index 251cfa8..bb8abe6 100644 --- a/configure.in +++ b/configure.in @@ -2582,6 +2582,7 @@ cygwin*) AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os]) ;; esac + SCPDEFS=$SCPDEFS -D_MSC_VER ;; darwin*) diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index c0f2eff..820a9e2 100755 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -516,7 +516,7 @@ End #define SCP2_URE_DL_COMID_NORMAL(n) n STRING(COMID) .dll #define SCP2_URE_DL_UNO_VER(n, v) n v .dll #define SCP2_URE_SHARE_DIR gid_Dir_Common_Ure -#if defined _MSC +#if defined _MSC_VER #define SCP2_URE_DL_UNO_COMID_VER(n, v) n v STRING(COMID) .dll #if defined _DEBUG_RUNTIME #define SCP2_STDLP_DEBUG d diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 474d537..6c6fb66 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -554,7 +554,7 @@ End #endif // use this for high detail file open dialog = 5.1 windows -#if defined(WNT) defined( _MSC ) +#if defined( _MSC_VER ) File gid_Brand_File_Bin_Soffice_Bin_Manifest TXT_FILE_BODY; Styles = (PACKED); diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 2565973..3d46339 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -97,7 +97,7 @@ STD_LIB_FILE(gid_File_Lib_Charttools, charttools) STD_LIB_FILE(gid_File_Lib_Chartview, chartview) -#if defined WNT defined _MSC +#if defined _MSC_VER File gid_File_Lib_Cli_Oootypes_Assembly TXT_FILE_BODY; @@ -114,7 +114,7 @@ End #endif -#if defined WNT defined _MSC +#if defined _MSC_VER File gid_File_Lib_Policy_Cli_Oootypes_Assembly TXT_FILE_BODY; Styles = (PACKED, ASSEMBLY, DONTRENAMEINPATCH); @@ -130,7 +130,7 @@ End #endif -#if defined WNT defined _MSC +#if defined _MSC_VER File gid_File_Lib_Policy_Cli_Oootypes_Config TXT_FILE_BODY; diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk index 87cc67c..ccba4f8 100644 --- a/scp2/source/ooo/makefile.mk +++ b/scp2/source/ooo/makefile.mk @@ -35,10 +35,6 @@ TARGETTYPE=CUI .INCLUDE : settings.mk .INCLUDE : i18npool/version.mk -.IF $(COM) == MSC -SCPDEFS+=-D_MSC -.ENDIF - .IF $(ENABLE_ONLINE_UPDATE)!= SCPDEFS+=-DENABLE_ONLINE_UPDATE .ENDIF diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index d17c0b7..be2418f 100644 --- a/scp2/source/ooo/ure.scp +++ b/scp2/source/ooo/ure.scp @@ -439,7 +439,7 @@ File gid_File_Dl_LogUnoUno Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); End -#if defined _MSC +#if defined _MSC_VER File gid_File_Dl_Cli_Uno LIB_FILE_BODY; Dir = SCP2_URE_DL_DIR; @@ -449,7 +449,7 @@ File gid_File_Dl_Cli_Uno End #endif -#if defined _MSC +#if defined _MSC_VER File gid_File_Dl_Cli_Ure_Assembly TXT_FILE_BODY; @@ -466,7 +466,7 @@ End #endif -#if defined _MSC +#if defined _MSC_VER File gid_File_Dl_Policy_Cli_Ure_Assembly TXT_FILE_BODY; @@ -483,7 +483,7 @@ End #endif -#if defined _MSC +#if defined _MSC_VER File gid_File_Dl_Policy_Cli_Ure_Config TXT_FILE_BODY; @@ -495,7 +495,7 @@ End #endif -#if defined _MSC +#if defined _MSC_VER File gid_File_Dl_Cli_Basetypes_Assembly TXT_FILE_BODY; @@ -512,7 +512,7 @@ End #endif -#if defined _MSC +#if defined _MSC_VER File gid_File_Dl_Policy_Cli_Basetypes_Assembly TXT_FILE_BODY; @@ -528,7 +528,7 @@ File gid_File_Dl_Policy_Cli_Basetypes_Assembly End #endif -#if defined _MSC +#if defined _MSC_VER File gid_File_Dl_Policy_Cli_Basetypes_Config TXT_FILE_BODY; @@ -541,7 +541,7 @@ End #endif -#if defined _MSC +#if defined _MSC_VER File gid_File_Dl_Cli_Uretypes_Assembly TXT_FILE_BODY; @@ -558,7 +558,7 @@ End #endif -#if defined _MSC +#if defined _MSC_VER File gid_File_Dl_Policy_Cli_Uretypes_Assembly TXT_FILE_BODY; @@ -575,7 +575,7 @@ End #endif -#if defined _MSC +#if defined _MSC_VER File gid_File_Dl_Policy_Cli_Uretypes_Config TXT_FILE_BODY; @@ -587,7 +587,7 @@ End #endif -#if defined _MSC +#if defined _MSC_VER File gid_File_Lib_Cli_Cppuhelper_Assembly TXT_FILE_BODY; @@ -604,7 +604,7 @@ End #endif -#if defined _MSC +#if defined _MSC_VER File gid_File_Lib_Policy_Cli_Cppuhelper_Assembly TXT_FILE_BODY; @@ -621,7
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - basegfx/inc basegfx/source basegfx/test
basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx |3 -
basegfx/source/polygon/b2dsvgpolypolygon.cxx| 10 +++
basegfx/test/boxclipper.cxx | 57 +---
basegfx/test/clipstate.cxx |7 +-
basegfx/test/genericclipper.cxx | 20 +--
5 files changed, 71 insertions(+), 26 deletions(-)
New commits:
commit 85c6fc38dabf227f98e3b5259188e8ccd3521739
Author: Thorsten Behrens tbehr...@suse.com
Date: Tue Jan 17 16:32:43 2012 +0100
Fix error in handling 'z' for svg:d string parsing
Previously 'z' did not update the current point to the start
point of the subpath, as required by
http://www.w3.org/TR/SVG/paths.html#PathDataClosePathCommand. Fixed
now, and adapted all the unit tests.
Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch
diff --git a/basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx
b/basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx
index 0302441..37d2cb5 100644
--- a/basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx
+++ b/basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx
@@ -123,8 +123,7 @@ namespace basegfx
/** Read poly-polygon from SVG.
This function imports a poly-polygon from an SVG-D
-attribute. Currently, elliptical arc elements are not yet
-supported (and ignored during parsing).
+attribute.
@param o_rPolyPoly
The output poly-polygon
diff --git a/basegfx/source/polygon/b2dsvgpolypolygon.cxx
b/basegfx/source/polygon/b2dsvgpolypolygon.cxx
index 7a34219..863adf5 100644
--- a/basegfx/source/polygon/b2dsvgpolypolygon.cxx
+++ b/basegfx/source/polygon/b2dsvgpolypolygon.cxx
@@ -239,6 +239,14 @@ namespace basegfx
// remember closed state of current polygon
bIsClosed = true;
+
+// update current point - we're back at the start
+if( aCurrPoly.count() )
+{
+const B2DPoint aFirst( aCurrPoly.getB2DPoint(0) );
+nLastX = aFirst.getX();
+nLastY = aFirst.getY();
+}
break;
}
@@ -1033,6 +1041,8 @@ namespace basegfx
if(aPolygon.isClosed())
{
aResult.append(lcl_getCommand('Z', 'z',
bUseRelativeCoordinates));
+// return to first point
+aCurrentSVGPosition = aPolygon.getB2DPoint(0);
}
}
}
diff --git a/basegfx/test/boxclipper.cxx b/basegfx/test/boxclipper.cxx
index 05cbb7b..c34b989 100644
--- a/basegfx/test/boxclipper.cxx
+++ b/basegfx/test/boxclipper.cxx
@@ -256,7 +256,6 @@ public:
tools::importFromSvgD(
aTmp2,
aSvg));
-
CPPUNIT_ASSERT_MESSAGE(
sName,
normalizePoly(aTmp2) == normalizePoly(aTmp1));
@@ -264,23 +263,45 @@ public:
void verifyPoly()
{
-const char* disjunct=m100 100v-200h-200v200zm1100 900v-200h-200v200z;
-const char* equal=m100 100v-200h-200v200zm200 0v-200h-200v200h200z;
-const char* intersectionN=m100 0v-100h-200v100zm200
100v-200-100h-200v100 200z;
-const char* intersectionE=m100 100v-200h-100v200zm200
0v-200h-200-100v200h100z;
-const char* intersectionS=m100 100v-200h-200v200 100h200v-100zm0
0v-100h-200v100z;
-const char* intersectionW=m0 100v-200h-100v200zm200
0v-200h-200-100v200h100z;
-const char* intersectionNE=m100 0v-100h-100v100zm200
0v-200h-200v100h-100v200h200v-100z;
-const char* intersectionSE=m200
200v-200h-100v-100h-200v200h100v100zm100-100v-100h-100v100z;
-const char* intersectionSW=m0 100v-100h-100v100zm200
0v-200h-200v100h-100v200h200v-100z;
-const char* intersectionNW=m100
100v-200h-100v-100h-200v200h100v100zm100-100v-100h-100v100z;
-const char* ringIntersection=m150 150v-100h-100v100zm300
0v-300h-200v-200h-300v300h200v100h-200v300h300v-200zm0-200v-100h-100v100z;
-const char* ringIntersection2=m-50-50v-100h-100v100zm100
200v-100h-100v100zm500
0v-300h-200v-200h-300v200h-200v300h200v200h300v-200zm-200-100v-100h100v100zm100-100v-100h-100v100zm100
200v-100h-100v100z;
-const char* ringIntersectExtraStrip=m-50-50v-100h-100v100zm100
200v-100h-100v100zm500
0v-300h-200v-200h-300v200h-200v300h200v200h300v-200zm-200-100v-100h100v25h-50v50h50v25zm150-25v-50h-150v50zm100-75v-100h-100v100zm100
200v-100h-100v100z;
-// TODO: old clipper impl. debug difference
-//const char* complexIntersections=m100 0h-100v-100 100h-100
100v100-100zm0 0zm200 0h-100v-100h-100v-100 100h-100v100h-100
100v100h100v100-100h100v-100zm0 0h-100v-100 100h-100
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - officecfg/registry sfx2/source test/user-template
officecfg/registry/schema/org/openoffice/Office/Common.xcs |7 +++
sfx2/source/doc/docfile.cxx| 30 +
test/user-template/registry/modifications.xcd | 13 +
3 files changed, 50 insertions(+)
New commits:
commit a8e838010cd167e0d709c03819e2f243b66f98a3
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Fri Jan 13 03:34:28 2012 +0100
don't create lock files for unit tests
special thanks to Stephan for the configuration part
Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 2cee667..c74e508 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -6269,6 +6269,13 @@
/info
valuetrue/value
/prop
+ prop oor:name=UseLocking oor:type=xs:boolean
+info
+ descAllows to specify whether locking should be used at all.
+ Use this setting only for debugging purpose./desc
+/info
+valuetrue/value
+ /prop
prop oor:name=ShowLinkWarningDialog oor:type=xs:boolean
info
authorTHB/author
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index fd2fb1e..b9aeb16 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -207,6 +207,31 @@ sal_Bool IsOOoLockFileUsed()
return bOOoLockFileUsed;
}
+bool IsLockingUsed()
+{
+bool bLocking = true;
+try
+{
+
+uno::Reference uno::XInterface xCommonConfig =
::comphelper::ConfigurationHelper::openConfig(
+::comphelper::getProcessServiceFactory(),
+::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
/org.openoffice.Office.Common ) ),
+::comphelper::ConfigurationHelper::E_STANDARD );
+if ( !xCommonConfig.is() )
+throw uno::RuntimeException();
+
+::comphelper::ConfigurationHelper::readRelativeKey(
+xCommonConfig,
+::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( Misc/ ) ),
+::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( UseLocking ) )
) = bLocking;
+}
+catch( const uno::Exception )
+{
+}
+
+return bLocking;
+}
+
} // anonymous namespace
//==
@@ -1001,6 +1026,11 @@ sal_Bool SfxMedium::LockOrigFileOnDemand( sal_Bool
bLoading, sal_Bool bNoUI )
// if user cancel the loading the ERROR_ABORT is set
sal_Bool bResult = sal_False;
+if (!IsLockingUsed())
+{
+return sal_True;
+}
+
if ( !GetURLObject().HasError() ) try
{
if ( pImp-m_bLocked bLoading
::utl::LocalFileHelper::IsLocalFile( GetURLObject().GetMainURL(
INetURLObject::NO_DECODE ) ) )
diff --git a/test/user-template/registry/modifications.xcd
b/test/user-template/registry/modifications.xcd
index d323645..5291c82 100644
--- a/test/user-template/registry/modifications.xcd
+++ b/test/user-template/registry/modifications.xcd
@@ -27,6 +27,19 @@
* instead of those above.
--
oor:data xmlns:oor=http://openoffice.org/2001/registry;
+ oor:component-data oor:name=Common oor:package=org.openoffice.Office
+ node oor:name=Misc
+prop oor:name=UseDocumentSystemFileLocking
+ valuefalse/value
+/prop
+prop oor:name=UseDocumentOOoLockFile
+ valuefalse/value
+/prop
+prop oor:name=UseLocking
+ valuefalse/value
+/prop
+ /node
+ /oor:component-data
oor:component-data oor:name=Paths oor:package=org.openoffice.Office
node oor:name=Paths
node oor:name=UIConfig oor:op=replace
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: writerperfect/source
writerperfect/source/filter/OdgGenerator.cxx | 43 +--
1 file changed, 41 insertions(+), 2 deletions(-)
New commits:
commit b350765be4852b8d2dc914a6048a5d273447480a
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Mon Jan 16 17:32:23 2012 +0100
Implementing text rotations
diff --git a/writerperfect/source/filter/OdgGenerator.cxx
b/writerperfect/source/filter/OdgGenerator.cxx
index 5681ed5..79722e8 100644
--- a/writerperfect/source/filter/OdgGenerator.cxx
+++ b/writerperfect/source/filter/OdgGenerator.cxx
@@ -1371,10 +1371,27 @@ void OdgGenerator::startTextObject(const
WPXPropertyList propList, const WPXPro
pStyleGraphicPropertiesOpenElement-addAttribute(draw:fill, none);
pStyleGraphicPropertiesOpenElement-addAttribute(draw:fill-color,
#ff);
+double x = 0.0;
+double y = 0.0;
+double height = 0.0;
+double width = 0.0;
if (propList[svg:x])
-pDrawFrameOpenElement-addAttribute(svg:x,
propList[svg:x]-getStr());
+x = propList[svg:x]-getDouble();
if (propList[svg:y])
-pDrawFrameOpenElement-addAttribute(svg:y,
propList[svg:y]-getStr());
+y = propList[svg:y]-getDouble();
+if (propList[svg:width])
+width = propList[svg:width]-getDouble();
+if (propList[svg:height])
+height = propList[svg:height]-getDouble();
+
+double angle(propList[libwpg:rotate] ? - M_PI *
propList[libwpg:rotate]-getDouble() / 180.0 : 0.0);
+if (angle != 0.0)
+{
+double deltax((width*cos(angle)+height*sin(angle)-width)/2.0);
+double deltay((-width*sin(angle)+height*cos(angle)-height)/2.0);
+x -= deltax;
+y -= deltay;
+}
if (!propList[svg:width] !propList[svg:height])
{
@@ -1452,6 +1469,28 @@ void OdgGenerator::startTextObject(const WPXPropertyList
propList, const WPXPro
pDrawFrameOpenElement-addAttribute(draw:opacity,
propList[draw:opacity]-getStr());
pStyleGraphicPropertiesOpenElement-addAttribute(draw:opacity,
propList[draw:opacity]-getStr());
}
+
+WPXProperty *svg_x = WPXPropertyFactory::newInchProp(x);
+WPXProperty *svg_y = WPXPropertyFactory::newInchProp(y);
+if (angle != 0.0)
+{
+WPXProperty *libwpg_rotate = WPXPropertyFactory::newDoubleProp(angle);
+sValue.sprintf(rotate (%s) translate(%s, %s),
+ libwpg_rotate-getStr().cstr(),
+ svg_x-getStr().cstr(),
+ svg_y-getStr().cstr());
+delete libwpg_rotate;
+pDrawFrameOpenElement-addAttribute(draw:transform, sValue);
+}
+else
+{
+if (propList[svg:x])
+pDrawFrameOpenElement-addAttribute(svg:x, svg_x-getStr());
+if (propList[svg:y])
+pDrawFrameOpenElement-addAttribute(svg:y, svg_y-getStr());
+}
+delete svg_x;
+delete svg_y;
mpImpl-mBodyElements.push_back(pDrawFrameOpenElement);
mpImpl-mBodyElements.push_back(new TagOpenElement(draw:text-box));
mpImpl-mGraphicsAutomaticStyles.push_back(pStyleGraphicPropertiesOpenElement);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - libvisio/libvisio-0.0.12.patch libvisio/libvisio-0.0.13.patch libvisio/makefile.mk ooo.lst.in
libvisio/libvisio-0.0.12.patch | 20 libvisio/libvisio-0.0.13.patch | 20 libvisio/makefile.mk |4 ++-- ooo.lst.in |2 +- 4 files changed, 23 insertions(+), 23 deletions(-) New commits: commit 98eda8d975cfaff8ba0d9b6f8b26a779f1bd489f Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Fri Jan 13 16:53:24 2012 +0100 Uploading a new fresh shiny libvisio 0.0.13 Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch diff --git a/libvisio/libvisio-0.0.12.patch b/libvisio/libvisio-0.0.12.patch deleted file mode 100644 index c9e626c..000 --- a/libvisio/libvisio-0.0.12.patch +++ /dev/null @@ -1,20 +0,0 @@ misc/libvisio-0.0.12/src/lib/libvisio_utils.h -+++ misc/build/libvisio-0.0.12/src/lib/libvisio_utils.h -@@ -41,17 +41,8 @@ - - #else - --#ifdef HAVE_CONFIG_H --#include config.h --#endif -- --#ifdef HAVE_STDINT_H - #include stdint.h --#endif -- --#ifdef HAVE_INTTYPES_H - #include inttypes.h --#endif - - #endif - diff --git a/libvisio/libvisio-0.0.13.patch b/libvisio/libvisio-0.0.13.patch new file mode 100644 index 000..c93983b --- /dev/null +++ b/libvisio/libvisio-0.0.13.patch @@ -0,0 +1,20 @@ +--- misc/libvisio-0.0.13/src/lib/libvisio_utils.h misc/build/libvisio-0.0.13/src/lib/libvisio_utils.h +@@ -42,17 +42,8 @@ + + #else + +-#ifdef HAVE_CONFIG_H +-#include config.h +-#endif +- +-#ifdef HAVE_STDINT_H + #include stdint.h +-#endif +- +-#ifdef HAVE_INTTYPES_H + #include inttypes.h +-#endif + + #endif + diff --git a/libvisio/makefile.mk b/libvisio/makefile.mk index a14fb8d..6d29b7d 100644 --- a/libvisio/makefile.mk +++ b/libvisio/makefile.mk @@ -54,8 +54,8 @@ INCPRE+=$(WPG_CFLAGS) INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpg .ENDIF -TARFILE_NAME=libvisio-0.0.12 -TARFILE_MD5=053a35c244bf132f806e198ac4d960aa +TARFILE_NAME=libvisio-0.0.13 +TARFILE_MD5=adb5c5c8398fd89ebee2d9b4e90e061e PATCH_FILES=\ $(TARFILE_NAME).patch diff --git a/ooo.lst.in b/ooo.lst.in index 710402c..4ca5af3 100644 --- a/ooo.lst.in +++ b/ooo.lst.in @@ -88,7 +88,7 @@ c01351d7db2b205de755d58769288224-libwpd-0.9.4.tar.bz2 f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz 3bf481ca95109b14435125c0dd1f2217-graphite2-1.0.3.tgz -053a35c244bf132f806e198ac4d960aa-libvisio-0.0.12.tar.bz2 +adb5c5c8398fd89ebee2d9b4e90e061e-libvisio-0.0.13.tar.bz2 30c468d0c27ae4784195b53f78bc6f64-LinLibertineG-20110922.zip 7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz @GOOGLE_DOCS_EXTENSION_PACK@ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: writerperfect/source
writerperfect/source/filter/OdgGenerator.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e198eea5a87bff84783bd038cf134e6ea3b764ad
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Thu Jan 12 15:01:13 2012 +0100
Logical error in writerperfect
diff --git a/writerperfect/source/filter/OdgGenerator.cxx
b/writerperfect/source/filter/OdgGenerator.cxx
index 584e8cc..fbafb02 100644
--- a/writerperfect/source/filter/OdgGenerator.cxx
+++ b/writerperfect/source/filter/OdgGenerator.cxx
@@ -948,7 +948,7 @@ void OdgGenerator::drawPath(const WPXPropertyListVector
path)
void OdgGenerator::drawGraphicObject(const ::WPXPropertyList propList, const
::WPXBinaryData binaryData)
{
-if (!propList[libwpg:mime-type]
propList[libwpg:mime-type]-getStr().len() = 0)
+if (!propList[libwpg:mime-type] ||
propList[libwpg:mime-type]-getStr().len() = 0)
return;
mpImpl-_writeGraphicsStyle();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - writerperfect/source
writerperfect/source/filter/OdgGenerator.cxx | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
New commits:
commit 5d097dfb44ab1d7a41000b8be2ff2ee680de94f9
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Thu Jan 12 15:01:13 2012 +0100
Logical error in writerperfect
Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch
diff --git a/writerperfect/source/filter/OdgGenerator.cxx
b/writerperfect/source/filter/OdgGenerator.cxx
index 584e8cc..fbafb02 100644
--- a/writerperfect/source/filter/OdgGenerator.cxx
+++ b/writerperfect/source/filter/OdgGenerator.cxx
@@ -948,7 +948,7 @@ void OdgGenerator::drawPath(const WPXPropertyListVector
path)
void OdgGenerator::drawGraphicObject(const ::WPXPropertyList propList, const
::WPXBinaryData binaryData)
{
-if (!propList[libwpg:mime-type]
propList[libwpg:mime-type]-getStr().len() = 0)
+if (!propList[libwpg:mime-type] ||
propList[libwpg:mime-type]-getStr().len() = 0)
return;
mpImpl-_writeGraphicsStyle();
commit 8d5d687354bb470033ed9ab63d8875bc4e34c096
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Thu Jan 12 12:15:29 2012 +0100
Consider the style:mirror property
Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch
diff --git a/writerperfect/source/filter/OdgGenerator.cxx
b/writerperfect/source/filter/OdgGenerator.cxx
index 4d70f8d..584e8cc 100644
--- a/writerperfect/source/filter/OdgGenerator.cxx
+++ b/writerperfect/source/filter/OdgGenerator.cxx
@@ -950,10 +950,16 @@ void OdgGenerator::drawGraphicObject(const
::WPXPropertyList propList, const ::
{
if (!propList[libwpg:mime-type]
propList[libwpg:mime-type]-getStr().len() = 0)
return;
+
+mpImpl-_writeGraphicsStyle();
+
TagOpenElement *pDrawFrameElement = new TagOpenElement(draw:frame);
WPXString sValue;
+sValue.sprintf(gr%i, mpImpl-miGraphicsStyleIndex-1);
+pDrawFrameElement-addAttribute(draw:style-name, sValue);
+
if (propList[svg:x])
pDrawFrameElement-addAttribute(svg:x, propList[svg:x]-getStr());
if (propList[svg:y])
@@ -1280,6 +1286,8 @@ void OdgGeneratorPrivate::_writeGraphicsStyle()
else
pStyleGraphicsPropertiesElement-addAttribute(draw:marker-end-width,
0.118in);
}
+if (mxStyle[style:mirror])
+pStyleGraphicsPropertiesElement-addAttribute(style:mirror,
mxStyle[style:mirror]-getStr());
mGraphicsAutomaticStyles.push_back(pStyleGraphicsPropertiesElement);
mGraphicsAutomaticStyles.push_back(new
TagCloseElement(style:graphic-properties));
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: libvisio/libvisio-0.0.11.patch libvisio/libvisio-0.0.12.patch libvisio/makefile.mk ooo.lst.in
libvisio/libvisio-0.0.11.patch | 20 libvisio/libvisio-0.0.12.patch | 20 libvisio/makefile.mk |6 +++--- ooo.lst.in |2 +- 4 files changed, 24 insertions(+), 24 deletions(-) New commits: commit 2edc5a8fdb50b8fc2916fc1501477dbfe0e5c418 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Mon Jan 9 16:53:01 2012 +0100 Uploading new release of libvisio (0.0.12) - Ability to parse and extract OLE objects embedded in Visio files - Fix a bug with overkeen path closing algorithm diff --git a/libvisio/libvisio-0.0.11.patch b/libvisio/libvisio-0.0.11.patch deleted file mode 100644 index 91e9700..000 --- a/libvisio/libvisio-0.0.11.patch +++ /dev/null @@ -1,20 +0,0 @@ misc/libvisio-0.0.11/src/lib/libvisio_utils.h -+++ misc/build/libvisio-0.0.11/src/lib/libvisio_utils.h -@@ -41,17 +41,8 @@ - - #else - --#ifdef HAVE_CONFIG_H --#include config.h --#endif -- --#ifdef HAVE_STDINT_H - #include stdint.h --#endif -- --#ifdef HAVE_INTTYPES_H - #include inttypes.h --#endif - - #endif - diff --git a/libvisio/libvisio-0.0.12.patch b/libvisio/libvisio-0.0.12.patch new file mode 100644 index 000..c9e626c --- /dev/null +++ b/libvisio/libvisio-0.0.12.patch @@ -0,0 +1,20 @@ +--- misc/libvisio-0.0.12/src/lib/libvisio_utils.h misc/build/libvisio-0.0.12/src/lib/libvisio_utils.h +@@ -41,17 +41,8 @@ + + #else + +-#ifdef HAVE_CONFIG_H +-#include config.h +-#endif +- +-#ifdef HAVE_STDINT_H + #include stdint.h +-#endif +- +-#ifdef HAVE_INTTYPES_H + #include inttypes.h +-#endif + + #endif + diff --git a/libvisio/makefile.mk b/libvisio/makefile.mk index fa99223..a14fb8d 100644 --- a/libvisio/makefile.mk +++ b/libvisio/makefile.mk @@ -54,11 +54,11 @@ INCPRE+=$(WPG_CFLAGS) INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpg .ENDIF -TARFILE_NAME=libvisio-0.0.11 -TARFILE_MD5=a8b25a0bf696fd126a08319d88998492 +TARFILE_NAME=libvisio-0.0.12 +TARFILE_MD5=053a35c244bf132f806e198ac4d960aa PATCH_FILES=\ -libvisio-0.0.11.patch +$(TARFILE_NAME).patch BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS) diff --git a/ooo.lst.in b/ooo.lst.in index 9085d9c..a8f540e 100644 --- a/ooo.lst.in +++ b/ooo.lst.in @@ -88,7 +88,7 @@ c01351d7db2b205de755d58769288224-libwpd-0.9.4.tar.bz2 f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz 3bf481ca95109b14435125c0dd1f2217-graphite2-1.0.3.tgz -a8b25a0bf696fd126a08319d88998492-libvisio-0.0.11.tar.bz2 +053a35c244bf132f806e198ac4d960aa-libvisio-0.0.12.tar.bz2 30c468d0c27ae4784195b53f78bc6f64-LinLibertineG-20110922.zip 7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz cc8eb870d6a324d36575420efd856319-libcdr-0.0.0.tar.bz2 ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - libvisio/libvisio-0.0.11.patch libvisio/libvisio-0.0.12.patch libvisio/makefile.mk ooo.lst.in
libvisio/libvisio-0.0.11.patch | 20 libvisio/libvisio-0.0.12.patch | 20 libvisio/makefile.mk |6 +++--- ooo.lst.in |2 +- 4 files changed, 24 insertions(+), 24 deletions(-) New commits: commit debcba3cbde5a44f14f83fc2ee759e96b4431a94 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Mon Jan 9 16:53:01 2012 +0100 Uploading new release of libvisio (0.0.12) - Ability to parse and extract OLE objects embedded in Visio files - Fix a bug with overkeen path closing algorithm Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch diff --git a/libvisio/libvisio-0.0.11.patch b/libvisio/libvisio-0.0.11.patch deleted file mode 100644 index 91e9700..000 --- a/libvisio/libvisio-0.0.11.patch +++ /dev/null @@ -1,20 +0,0 @@ misc/libvisio-0.0.11/src/lib/libvisio_utils.h -+++ misc/build/libvisio-0.0.11/src/lib/libvisio_utils.h -@@ -41,17 +41,8 @@ - - #else - --#ifdef HAVE_CONFIG_H --#include config.h --#endif -- --#ifdef HAVE_STDINT_H - #include stdint.h --#endif -- --#ifdef HAVE_INTTYPES_H - #include inttypes.h --#endif - - #endif - diff --git a/libvisio/libvisio-0.0.12.patch b/libvisio/libvisio-0.0.12.patch new file mode 100644 index 000..c9e626c --- /dev/null +++ b/libvisio/libvisio-0.0.12.patch @@ -0,0 +1,20 @@ +--- misc/libvisio-0.0.12/src/lib/libvisio_utils.h misc/build/libvisio-0.0.12/src/lib/libvisio_utils.h +@@ -41,17 +41,8 @@ + + #else + +-#ifdef HAVE_CONFIG_H +-#include config.h +-#endif +- +-#ifdef HAVE_STDINT_H + #include stdint.h +-#endif +- +-#ifdef HAVE_INTTYPES_H + #include inttypes.h +-#endif + + #endif + diff --git a/libvisio/makefile.mk b/libvisio/makefile.mk index fa99223..a14fb8d 100644 --- a/libvisio/makefile.mk +++ b/libvisio/makefile.mk @@ -54,11 +54,11 @@ INCPRE+=$(WPG_CFLAGS) INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpg .ENDIF -TARFILE_NAME=libvisio-0.0.11 -TARFILE_MD5=a8b25a0bf696fd126a08319d88998492 +TARFILE_NAME=libvisio-0.0.12 +TARFILE_MD5=053a35c244bf132f806e198ac4d960aa PATCH_FILES=\ -libvisio-0.0.11.patch +$(TARFILE_NAME).patch BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS) diff --git a/ooo.lst.in b/ooo.lst.in index 9760dbf..710402c 100644 --- a/ooo.lst.in +++ b/ooo.lst.in @@ -88,7 +88,7 @@ c01351d7db2b205de755d58769288224-libwpd-0.9.4.tar.bz2 f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz 3bf481ca95109b14435125c0dd1f2217-graphite2-1.0.3.tgz -a8b25a0bf696fd126a08319d88998492-libvisio-0.0.11.tar.bz2 +053a35c244bf132f806e198ac4d960aa-libvisio-0.0.12.tar.bz2 30c468d0c27ae4784195b53f78bc6f64-LinLibertineG-20110922.zip 7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz @GOOGLE_DOCS_EXTENSION_PACK@ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: cairo/cairo-1.10.2.patch
cairo/cairo-1.10.2.patch | 11 +++ 1 file changed, 11 insertions(+) New commits: commit 275e6c62917bffe65dd6c26f42e42ae6324619fe Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Tue Dec 20 09:58:07 2011 +0100 Disable cairo svg surface on windows to avoid problems with missing header diff --git a/cairo/cairo-1.10.2.patch b/cairo/cairo-1.10.2.patch index eb0885e..d13c1e4 100644 --- a/cairo/cairo-1.10.2.patch +++ b/cairo/cairo-1.10.2.patch @@ -1,3 +1,14 @@ +--- misc/cairo-1.10.2/build/Makefile.win32.features2010-08-18 09:47:30.0 +0200 misc/build/cairo-1.10.2/build/Makefile.win32.features 2011-12-20 09:57:06.428170146 +0100 +@@ -30,7 +30,7 @@ + CAIRO_HAS_FC_FONT=0 + CAIRO_HAS_PS_SURFACE=1 + CAIRO_HAS_PDF_SURFACE=1 +-CAIRO_HAS_SVG_SURFACE=1 ++CAIRO_HAS_SVG_SURFACE=0 + CAIRO_HAS_TEST_SURFACES=0 + CAIRO_HAS_TEE_SURFACE=0 + CAIRO_HAS_XML_SURFACE=0 --- misc/cairo-1.10.2/build/Makefile.win32.common 2009-06-14 23:53:24.0 +0200 +++ misc/build/cairo-1.10.2/build/Makefile.win32.common2009-06-14 23:53:24.0 +0200 @@ -22,24 +22,26 @@ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - cairo/cairo cairo/cairo-1.10.2.patch cairo/pixman cairo/pixman-0.24.0.patch
cairo/cairo-1.10.2.patch | 12
cairo/cairo/makefile.mk |2 +-
cairo/pixman-0.24.0.patch | 20
cairo/pixman/makefile.mk |2 +-
4 files changed, 26 insertions(+), 10 deletions(-)
New commits:
commit 8cf76f19c5bcaebd2e35a62d41e1d0ecd46fd94f
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Mon Dec 19 09:43:18 2011 +0100
Build ps and pdf cairo surfaces with MSVC
diff --git a/cairo/cairo-1.10.2.patch b/cairo/cairo-1.10.2.patch
index 195af16..74c139d 100644
--- a/cairo/cairo-1.10.2.patch
+++ b/cairo/cairo-1.10.2.patch
@@ -9,14 +9,10 @@
CAIRO_HAS_GL_SURFACE=0
CAIRO_HAS_DIRECTFB_SURFACE=0
CAIRO_HAS_VG_SURFACE=0
-@@ -28,9 +28,9 @@
- CAIRO_HAS_SCRIPT_SURFACE=0
- CAIRO_HAS_FT_FONT=0
+@@ -30,7 +30,7 @@
CAIRO_HAS_FC_FONT=0
--CAIRO_HAS_PS_SURFACE=1
--CAIRO_HAS_PDF_SURFACE=1
-+CAIRO_HAS_PS_SURFACE=0
-+CAIRO_HAS_PDF_SURFACE=0
+ CAIRO_HAS_PS_SURFACE=1
+ CAIRO_HAS_PDF_SURFACE=1
-CAIRO_HAS_SVG_SURFACE=1
+CAIRO_HAS_SVG_SURFACE=0
CAIRO_HAS_TEST_SURFACES=0
@@ -47,7 +43,7 @@
else
ZLIB_CFLAGS += -I$(top_srcdir)/../zlib/
-CAIRO_LIBS += $(top_builddir)/../zlib/zdll.lib
-+CAIRO_LIBS += $(top_builddir)/../zlib/zlib.lib
++CAIRO_LIBS += $(ZLIB3RDLIB)
endif
DEFAULT_CFLAGS = -nologo $(MS_MDFLAGS) $(OPT)
diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk
index 0eaef24..7f84e3d 100644
--- a/cairo/cairo/makefile.mk
+++ b/cairo/cairo/makefile.mk
@@ -100,7 +100,7 @@ BUILD_DIR=$(CONFIGURE_DIR)$/src
.ENDIF
.ELSE # WNT, not GCC
-BUILD_ACTION=$(GNUMAKE) -f Makefile.win32 CFG=release
+BUILD_ACTION=$(GNUMAKE) -f Makefile.win32 CFG=release ZLIB3RDLIB=$(ZLIB3RDLIB)
BUILD_DIR=
.ENDIF
commit b4c74957cbec8ce1fab512983f5133223376545e
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Mon Dec 19 09:42:32 2011 +0100
Fix MMX build of pixman with MSVC
diff --git a/cairo/pixman-0.24.0.patch b/cairo/pixman-0.24.0.patch
index 61ef416..a6141ac 100644
--- a/cairo/pixman-0.24.0.patch
+++ b/cairo/pixman-0.24.0.patch
@@ -122,4 +122,24 @@
#include pixman-private.h
+--- misc/pixman-0.24.0/pixman/pixman-mmx.c 2011-11-06 13:47:42.0
-0700
misc/build/pixman-0.24.0/pixman/pixman-mmx.c 2011-12-19
00:41:42.280402800 -0700
+@@ -309,7 +309,7 @@
+
+ /* Elemental unaligned loads */
+
+-static __inline__ __m64 ldq_u(uint64_t *p)
++static inline __m64 ldq_u(uint64_t *p)
+ {
+ #ifdef USE_X86_MMX
+ /* x86's alignment restrictions are very relaxed. */
+@@ -328,7 +328,7 @@
+ #endif
+ }
+
+-static __inline__ uint32_t ldl_u(uint32_t *p)
++static inline uint32_t ldl_u(uint32_t *p)
+ {
+ #ifdef USE_X86_MMX
+ /* x86's alignment restrictions are very relaxed. */
diff --git a/cairo/pixman/makefile.mk b/cairo/pixman/makefile.mk
index dcd489d..44ea09b 100644
--- a/cairo/pixman/makefile.mk
+++ b/cairo/pixman/makefile.mk
@@ -74,7 +74,7 @@ BUILD_DIR=$(CONFIGURE_DIR)
.ELSE # WNT, not GCC
BUILD_DIR=pixman
-BUILD_ACTION=$(GNUMAKE) -f Makefile.win32 MMX=off SSE2=on CFG=release
+BUILD_ACTION=$(GNUMAKE) -f Makefile.win32 MMX=on SSE2=on CFG=release
.ENDIF
.ELIF $(GUIBASE)==aqua
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - cairo/cairo cairo/cairo-1.10.2.patch cairo/pixman cairo/pixman-0.24.0.patch
cairo/cairo-1.10.2.patch | 12
cairo/cairo/makefile.mk |2 +-
cairo/pixman-0.24.0.patch | 31 +++
cairo/pixman/makefile.mk |2 +-
4 files changed, 37 insertions(+), 10 deletions(-)
New commits:
commit 2889909e1e7ab5d69391bb6c0a0b37b48adac9ef
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Mon Dec 19 09:43:18 2011 +0100
Build ps and pdf cairo surfaces with MSVC
Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch
diff --git a/cairo/cairo-1.10.2.patch b/cairo/cairo-1.10.2.patch
index 533efdf..cd6b350 100644
--- a/cairo/cairo-1.10.2.patch
+++ b/cairo/cairo-1.10.2.patch
@@ -9,14 +9,10 @@
CAIRO_HAS_GL_SURFACE=0
CAIRO_HAS_DIRECTFB_SURFACE=0
CAIRO_HAS_VG_SURFACE=0
-@@ -28,9 +28,9 @@
- CAIRO_HAS_SCRIPT_SURFACE=0
- CAIRO_HAS_FT_FONT=0
+@@ -30,7 +30,7 @@
CAIRO_HAS_FC_FONT=0
--CAIRO_HAS_PS_SURFACE=1
--CAIRO_HAS_PDF_SURFACE=1
-+CAIRO_HAS_PS_SURFACE=0
-+CAIRO_HAS_PDF_SURFACE=0
+ CAIRO_HAS_PS_SURFACE=1
+ CAIRO_HAS_PDF_SURFACE=1
-CAIRO_HAS_SVG_SURFACE=1
+CAIRO_HAS_SVG_SURFACE=0
CAIRO_HAS_TEST_SURFACES=0
@@ -47,7 +43,7 @@
else
ZLIB_CFLAGS += -I$(top_srcdir)/../zlib/
-CAIRO_LIBS += $(top_builddir)/../zlib/zdll.lib
-+CAIRO_LIBS += $(top_builddir)/../zlib/zlib.lib
++CAIRO_LIBS += $(ZLIB3RDLIB)
endif
DEFAULT_CFLAGS = -nologo $(MS_MDFLAGS) $(OPT)
diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk
index ccad5b4..fc0111c 100644
--- a/cairo/cairo/makefile.mk
+++ b/cairo/cairo/makefile.mk
@@ -96,7 +96,7 @@ BUILD_DIR=$(CONFIGURE_DIR)$/src
.ENDIF
.ELSE # WNT, not GCC
-BUILD_ACTION=$(GNUMAKE) -f Makefile.win32 CFG=release
+BUILD_ACTION=$(GNUMAKE) -f Makefile.win32 CFG=release ZLIB3RDLIB=$(ZLIB3RDLIB)
BUILD_DIR=
.ENDIF
commit 546bb6c9b79bf9571a5089a2e2a5dc8b2642164e
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Mon Dec 19 09:42:32 2011 +0100
Fix MMX build of pixman with MSVC
diff --git a/cairo/pixman-0.24.0.patch b/cairo/pixman-0.24.0.patch
index 0611962..c848666 100644
--- a/cairo/pixman-0.24.0.patch
+++ b/cairo/pixman-0.24.0.patch
@@ -103,3 +103,34 @@
{ $as_echo $as_me:$LINENO: checking whether byte ordering is bigendian 5
$as_echo_n checking whether byte ordering is bigendian... 6; }
if test ${ac_cv_c_bigendian+set} = set; then
+--- misc/pixman-0.24.0/pixman/pixman-utils.c
misc/build/pixman-0.24.0/pixman/pixman-utils.c
+@@ -27,6 +27,7 @@
+ #endif
+ #include stdio.h
+ #include stdlib.h
++#include limits.h
+
+ #include pixman-private.h
+
+--- misc/pixman-0.24.0/pixman/pixman-mmx.c 2011-11-06 13:47:42.0
-0700
misc/build/pixman-0.24.0/pixman/pixman-mmx.c 2011-12-19
00:41:42.280402800 -0700
+@@ -309,7 +309,7 @@
+
+ /* Elemental unaligned loads */
+
+-static __inline__ __m64 ldq_u(uint64_t *p)
++static inline __m64 ldq_u(uint64_t *p)
+ {
+ #ifdef USE_X86_MMX
+ /* x86's alignment restrictions are very relaxed. */
+@@ -328,7 +328,7 @@
+ #endif
+ }
+
+-static __inline__ uint32_t ldl_u(uint32_t *p)
++static inline uint32_t ldl_u(uint32_t *p)
+ {
+ #ifdef USE_X86_MMX
+ /* x86's alignment restrictions are very relaxed. */
+
diff --git a/cairo/pixman/makefile.mk b/cairo/pixman/makefile.mk
index df9c795..225ae86 100644
--- a/cairo/pixman/makefile.mk
+++ b/cairo/pixman/makefile.mk
@@ -70,7 +70,7 @@ BUILD_DIR=$(CONFIGURE_DIR)
.ELSE # WNT, not GCC
BUILD_DIR=pixman
-BUILD_ACTION=$(GNUMAKE) -f Makefile.win32 MMX=off SSE2=on CFG=release
+BUILD_ACTION=$(GNUMAKE) -f Makefile.win32 MMX=on SSE2=on CFG=release
.ENDIF
.ELIF $(GUIBASE)==aqua
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: cairo/cairo-1.10.2.patch
cairo/cairo-1.10.2.patch | 45 ++--- 1 file changed, 6 insertions(+), 39 deletions(-) New commits: commit 04417370fcd44554fce4b7c5a146b0d1613bdbae Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Mon Dec 19 19:03:04 2011 +0100 Build all default cairo features on Windows diff --git a/cairo/cairo-1.10.2.patch b/cairo/cairo-1.10.2.patch index 74c139d..6bc44c9 100644 --- a/cairo/cairo-1.10.2.patch +++ b/cairo/cairo-1.10.2.patch @@ -1,33 +1,6 @@ misc/cairo-1.10.2/build/Makefile.win32.features2010-08-18 09:47:30.0 +0200 -+++ misc/build/cairo-1.10.2/build/Makefile.win32.features 2010-08-18 09:47:30.0 +0200 -@@ -18,7 +18,7 @@ - CAIRO_HAS_DRM_XR_FUNCTIONS=0 - CAIRO_HAS_GALLIUM_SURFACE=0 - CAIRO_HAS_XCB_DRM_FUNCTIONS=0 --CAIRO_HAS_PNG_FUNCTIONS=1 -+CAIRO_HAS_PNG_FUNCTIONS=0 - CAIRO_HAS_GL_SURFACE=0 - CAIRO_HAS_DIRECTFB_SURFACE=0 - CAIRO_HAS_VG_SURFACE=0 -@@ -30,7 +30,7 @@ - CAIRO_HAS_FC_FONT=0 - CAIRO_HAS_PS_SURFACE=1 - CAIRO_HAS_PDF_SURFACE=1 --CAIRO_HAS_SVG_SURFACE=1 -+CAIRO_HAS_SVG_SURFACE=0 - CAIRO_HAS_TEST_SURFACES=0 - CAIRO_HAS_TEE_SURFACE=0 - CAIRO_HAS_XML_SURFACE=0 -@@ -37,5 +37,5 @@ - CAIRO_HAS_PTHREAD=0 - CAIRO_HAS_GOBJECT_FUNCTIONS=0 - CAIRO_HAS_TRACE=0 --CAIRO_HAS_INTERPRETER=1 -+CAIRO_HAS_INTERPRETER=0 - CAIRO_HAS_SYMBOL_LOOKUP=0 --- misc/cairo-1.10.2/build/Makefile.win32.common 2009-06-14 23:53:24.0 +0200 +++ misc/build/cairo-1.10.2/build/Makefile.win32.common2009-06-14 23:53:24.0 +0200 -@@ -22,8 +22,8 @@ +@@ -22,24 +22,26 @@ OPT := -MD -O2 endif @@ -38,7 +11,10 @@ CAIRO_LIBS = gdi32.lib msimg32.lib user32.lib ifeq ($(CAIRO_HAS_PNG_FUNCTIONS),1) -@@ -33,13 +33,15 @@ + LIBPNG_CFLAGS += -I$(top_srcdir)/../libpng/ +-CAIRO_LIBS += $(top_builddir)/../libpng/libpng.lib ++CAIRO_LIBS += libpng.lib + endif ifeq ($(CAIRO_HAS_PS_SURFACE)$(CAIRO_HAS_PDF_SURFACE),00) else ZLIB_CFLAGS += -I$(top_srcdir)/../zlib/ @@ -66,21 +42,12 @@ @mkdir -p $(CFG) --- misc/cairo-1.10.2/build/config.sub 2009-08-14 23:33:32.0 +0200 +++ misc/build/cairo-1.10.2/build/config.sub 2009-08-14 23:33:32.0 +0200 -@@ -120,7 +120,7 @@ - # Here we must recognize all the valid KERNEL-OS combinations. - maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` - case $maybe_os in -- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ -+ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ - kopensolaris*-gnu* | \ - storm-chaos* | os2-emx* | rtmk-nova*) @@ -1272,7 +1272,7 @@ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ -| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ -+| -udi* | -linux-androideabi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ ++| -udi* | -androideabi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - cairo/cairo-1.10.2.patch
cairo/cairo-1.10.2.patch | 34 +- 1 file changed, 5 insertions(+), 29 deletions(-) New commits: commit a651ccbc873436238a5c7a134d426e003133c737 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Mon Dec 19 19:03:04 2011 +0100 Build all default cairo features on Windows Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch diff --git a/cairo/cairo-1.10.2.patch b/cairo/cairo-1.10.2.patch index cd6b350..6bc44c9 100644 --- a/cairo/cairo-1.10.2.patch +++ b/cairo/cairo-1.10.2.patch @@ -1,33 +1,6 @@ misc/cairo-1.10.2/build/Makefile.win32.features2010-08-18 09:47:30.0 +0200 -+++ misc/build/cairo-1.10.2/build/Makefile.win32.features 2010-08-18 09:47:30.0 +0200 -@@ -18,7 +18,7 @@ - CAIRO_HAS_DRM_XR_FUNCTIONS=0 - CAIRO_HAS_GALLIUM_SURFACE=0 - CAIRO_HAS_XCB_DRM_FUNCTIONS=0 --CAIRO_HAS_PNG_FUNCTIONS=1 -+CAIRO_HAS_PNG_FUNCTIONS=0 - CAIRO_HAS_GL_SURFACE=0 - CAIRO_HAS_DIRECTFB_SURFACE=0 - CAIRO_HAS_VG_SURFACE=0 -@@ -30,7 +30,7 @@ - CAIRO_HAS_FC_FONT=0 - CAIRO_HAS_PS_SURFACE=1 - CAIRO_HAS_PDF_SURFACE=1 --CAIRO_HAS_SVG_SURFACE=1 -+CAIRO_HAS_SVG_SURFACE=0 - CAIRO_HAS_TEST_SURFACES=0 - CAIRO_HAS_TEE_SURFACE=0 - CAIRO_HAS_XML_SURFACE=0 -@@ -37,5 +37,5 @@ - CAIRO_HAS_PTHREAD=0 - CAIRO_HAS_GOBJECT_FUNCTIONS=0 - CAIRO_HAS_TRACE=0 --CAIRO_HAS_INTERPRETER=1 -+CAIRO_HAS_INTERPRETER=0 - CAIRO_HAS_SYMBOL_LOOKUP=0 --- misc/cairo-1.10.2/build/Makefile.win32.common 2009-06-14 23:53:24.0 +0200 +++ misc/build/cairo-1.10.2/build/Makefile.win32.common2009-06-14 23:53:24.0 +0200 -@@ -22,8 +22,8 @@ +@@ -22,24 +22,26 @@ OPT := -MD -O2 endif @@ -38,7 +11,10 @@ CAIRO_LIBS = gdi32.lib msimg32.lib user32.lib ifeq ($(CAIRO_HAS_PNG_FUNCTIONS),1) -@@ -33,13 +33,15 @@ + LIBPNG_CFLAGS += -I$(top_srcdir)/../libpng/ +-CAIRO_LIBS += $(top_builddir)/../libpng/libpng.lib ++CAIRO_LIBS += libpng.lib + endif ifeq ($(CAIRO_HAS_PS_SURFACE)$(CAIRO_HAS_PDF_SURFACE),00) else ZLIB_CFLAGS += -I$(top_srcdir)/../zlib/ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: ooo.lst.in
ooo.lst.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2c05867b7dc8d78618668ab5e0e5e1139895b875 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Fri Dec 16 12:37:05 2011 +0100 Oops, forgot to add the cairo tarball to ooo.lst.in diff --git a/ooo.lst.in b/ooo.lst.in index 184edd2..938b54f 100644 --- a/ooo.lst.in +++ b/ooo.lst.in @@ -23,7 +23,7 @@ e1c178b18f130b40494561f02bc1a948-libexttextcat-3.2.0.tar.bz2 48470d662650c3c074e1c3fabbc67bbd-README_source-9.0.0.7-bj.txt 48d8169acc35f97e05d8dcdfd45be7f2-lucene-2.3.2.tar.gz 4a660ce8466c9df01f19036435425c3a-glibc-2.1.3-stub.tar.gz -4ea70ea87b47e92d318d4e7f5b940f47-cairo-1.8.0.tar.gz +f101a9e88b783337b20b2e26dfd26d5f-cairo-1.10.2.tar.gz 599dc4cc65a07ee868cf92a667a913d2-xpdf-3.02.tar.gz 7740a8ec23878a2f50120e1faa2730f2-libxml2-2.7.6.tar.gz 7376930b0d3f3d77a685d94c4a3acda8-STLport-4.5-0119.tar.gz ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - cairo/cairo-1.10.2.patch
cairo/cairo-1.10.2.patch | 74 --- 1 file changed, 64 insertions(+), 10 deletions(-) New commits: commit 562e9e27cf8a5d86ed18063569ba467fcdd7ca01 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Fri Dec 16 14:16:23 2011 +0100 Trying to get the linking with internal zlib right diff --git a/cairo/cairo-1.10.2.patch b/cairo/cairo-1.10.2.patch index 05cab07..b848625 100644 --- a/cairo/cairo-1.10.2.patch +++ b/cairo/cairo-1.10.2.patch @@ -1,5 +1,5 @@ --- misc/cairo-1.10.2/build/Makefile.win32.common 2009-06-14 23:53:24.0 +0200 -+++ misc/build/cairo-1.10.2/build/Makefile.win32.common2011-12-16 11:50:50.600524156 +0100 misc/build/cairo-1.10.2/build/Makefile.win32.common2009-06-14 23:53:24.0 +0200 @@ -22,8 +22,8 @@ OPT := -MD -O2 endif @@ -38,7 +38,7 @@ $(CFG)/%-static.obj: %.c @mkdir -p $(CFG) --- misc/cairo-1.10.2/build/Makefile.win32.features2010-08-18 09:47:30.0 +0200 -+++ misc/build/cairo-1.10.2/build/Makefile.win32.features 2011-12-16 11:49:42.998709720 +0100 misc/build/cairo-1.10.2/build/Makefile.win32.features 2010-08-18 09:47:30.0 +0200 @@ -30,7 +30,7 @@ CAIRO_HAS_FC_FONT=0 CAIRO_HAS_PS_SURFACE=1 @@ -49,7 +49,7 @@ CAIRO_HAS_TEE_SURFACE=0 CAIRO_HAS_XML_SURFACE=0 --- misc/cairo-1.10.2/build/config.sub 2009-08-14 23:33:32.0 +0200 -+++ misc/build/cairo-1.10.2/build/config.sub 2011-12-16 11:57:32.007884203 +0100 misc/build/cairo-1.10.2/build/config.sub 2009-08-14 23:33:32.0 +0200 @@ -1272,7 +1272,7 @@ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ @@ -60,7 +60,7 @@ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ --- misc/cairo-1.10.2/configure2010-12-25 15:22:57.0 +0100 -+++ misc/build/cairo-1.10.2/configure 2011-12-16 13:21:50.143725559 +0100 misc/build/cairo-1.10.2/configure 2010-12-25 15:22:57.0 +0100 @@ -19259,61 +19259,11 @@ rm -f confcache @@ -132,8 +132,35 @@ if $PKG_CONFIG --exists $l ; then png_REQUIRES=$l use_png=yes +@@ -30121,7 +30121,7 @@ + + # The ps backend requires zlib. + use_ps=$have_libz +-ps_NONPKGCONFIG_LIBS=-lz ++ps_NONPKGCONFIG_LIBS=$ZLIB3RDLIB + + cairo_cv_ps_use=$use_ps + cairo_cv_ps_cache_vars= BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS +@@ -30549,7 +30549,7 @@ + + # The pdf backend requires zlib. + use_pdf=$have_libz +-pdf_NONPKGCONFIG_LIBS=-lz ++pdf_NONPKGCONFIG_LIBS=$ZLIB3RDLIB + + cairo_cv_pdf_use=$use_pdf + cairo_cv_pdf_cache_vars= BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS +@@ -32296,7 +32296,7 @@ + + + use_xml=$have_libz +-xml_NONPKGCONFIG_LIBS=-lz ++xml_NONPKGCONFIG_LIBS=$ZLIB3RDLIB + + cairo_cv_xml_use=$use_xml + cairo_cv_xml_cache_vars= BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS --- misc/cairo-1.10.2/configure.ac 2010-12-13 17:30:14.0 +0100 -+++ misc/build/cairo-1.10.2/configure.ac 2011-12-16 11:57:32.007884203 +0100 misc/build/cairo-1.10.2/configure.ac 2010-12-13 17:30:14.0 +0100 @@ -33,13 +33,8 @@ dnl === @@ -157,8 +184,35 @@ if $PKG_CONFIG --exists $l ; then png_REQUIRES=$l use_png=yes +@@ -505,7 +505,7 @@ + CAIRO_ENABLE_SURFACE_BACKEND(ps, PostScript, yes, [ + # The ps backend requires zlib. + use_ps=$have_libz +-ps_NONPKGCONFIG_LIBS=-lz ++ps_NONPKGCONFIG_LIBS=$ZLIB3RDLIB + ]) + + dnl === +@@ -542,7 +542,7 @@ + CAIRO_ENABLE_SURFACE_BACKEND(pdf, PDF, yes, [ + # The pdf backend requires zlib. + use_pdf=$have_libz +-pdf_NONPKGCONFIG_LIBS=-lz ++pdf_NONPKGCONFIG_LIBS=$ZLIB3RDLIB + ]) + + dnl === +@@ -623,7 +623,7 @@ + CAIRO_ENABLE_SURFACE_BACKEND(tee, tee, no) + CAIRO_ENABLE_SURFACE_BACKEND(xml, xml, no, [ + use_xml=$have_libz +-xml_NONPKGCONFIG_LIBS=-lz ++xml_NONPKGCONFIG_LIBS=$ZLIB3RDLIB + ]) + + dnl === --- misc/cairo-1.10.2/src/cairo-deflate-stream.c 2010-06-18 13:47:12.0 +0200 -+++ misc/build/cairo-1.10.2/src/cairo-deflate-stream.c 2011-12-16 11:48:52.381857312 +0100 misc/build/cairo-1.10.2/src/cairo-deflate-stream.c 2010-06-18 13:47:12.0 +0200 @@ -37,7
[Libreoffice-commits] .: cairo/cairo-1.10.2.patch
cairo/cairo-1.10.2.patch | 144 ++-
1 file changed, 81 insertions(+), 63 deletions(-)
New commits:
commit b04c1479baf77588d5eb12a56070a46b82617c68
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Fri Dec 16 14:39:03 2011 +0100
-lz was sucked in by freetype
diff --git a/cairo/cairo-1.10.2.patch b/cairo/cairo-1.10.2.patch
index b848625..d4d24d5 100644
--- a/cairo/cairo-1.10.2.patch
+++ b/cairo/cairo-1.10.2.patch
@@ -1,3 +1,14 @@
+--- misc/cairo-1.10.2/build/Makefile.win32.features2010-08-18
09:47:30.0 +0200
misc/build/cairo-1.10.2/build/Makefile.win32.features 2010-08-18
09:47:30.0 +0200
+@@ -30,7 +30,7 @@
+ CAIRO_HAS_FC_FONT=0
+ CAIRO_HAS_PS_SURFACE=1
+ CAIRO_HAS_PDF_SURFACE=1
+-CAIRO_HAS_SVG_SURFACE=1
++CAIRO_HAS_SVG_SURFACE=0
+ CAIRO_HAS_TEST_SURFACES=0
+ CAIRO_HAS_TEE_SURFACE=0
+ CAIRO_HAS_XML_SURFACE=0
--- misc/cairo-1.10.2/build/Makefile.win32.common 2009-06-14
23:53:24.0 +0200
+++ misc/build/cairo-1.10.2/build/Makefile.win32.common2009-06-14
23:53:24.0 +0200
@@ -22,8 +22,8 @@
@@ -37,17 +48,6 @@
$(CFG)/%-static.obj: %.c
@mkdir -p $(CFG)
misc/cairo-1.10.2/build/Makefile.win32.features2010-08-18
09:47:30.0 +0200
-+++ misc/build/cairo-1.10.2/build/Makefile.win32.features 2010-08-18
09:47:30.0 +0200
-@@ -30,7 +30,7 @@
- CAIRO_HAS_FC_FONT=0
- CAIRO_HAS_PS_SURFACE=1
- CAIRO_HAS_PDF_SURFACE=1
--CAIRO_HAS_SVG_SURFACE=1
-+CAIRO_HAS_SVG_SURFACE=0
- CAIRO_HAS_TEST_SURFACES=0
- CAIRO_HAS_TEE_SURFACE=0
- CAIRO_HAS_XML_SURFACE=0
--- misc/cairo-1.10.2/build/config.sub 2009-08-14 23:33:32.0 +0200
+++ misc/build/cairo-1.10.2/build/config.sub 2009-08-14 23:33:32.0
+0200
@@ -1272,7 +1272,7 @@
@@ -59,6 +59,67 @@
| -chorusos* | -chorusrdb* | -cegcc* \
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
| -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+--- misc/cairo-1.10.2/configure.ac 2010-12-13 17:30:14.0 +0100
misc/build/cairo-1.10.2/configure.ac 2010-12-13 17:30:14.0
+0100
+@@ -33,13 +33,8 @@
+
+ dnl
===
+
+-AC_CHECK_LIB(z, compress,
+- [AC_CHECK_HEADER(zlib.h, [
+ have_libz=yes
+ AC_DEFINE(HAVE_ZLIB, 1, [Define to 1 if you have zlib available])
+- ],
+- [have_libz=no (requires zlib http://www.gzip.org/zlib/)])],
+- [have_libz=no (requires zlib http://www.gzip.org/zlib/)])
+
+ AC_CHECK_LIB(dl, dlsym,
+[have_dlsym=yes; have_dl=yes],
+@@ -279,7 +271,7 @@
+ AC_ARG_VAR([png_REQUIRES], [module name for libpng to search for using
pkg-config])
+ if test x$png_REQUIRES = x; then
+ # libpng13 is GnuWin32's libpng-1.2.8 :-(
+-for l in libpng libpng14 libpng12 libpng13 libpng10; do
++for l in libpng libpng14 libpng12 libpng15 libpng13 libpng10; do
+ if $PKG_CONFIG --exists $l ; then
+ png_REQUIRES=$l
+ use_png=yes
+@@ -455,7 +455,7 @@
+ AX_COMPARE_VERSION([$FREETYPE_VERSION], [gt], [$FREETYPE_MIN_VERSION],
+ [AC_MSG_RESULT($FREETYPE_VERSION - OK)
+ ft_NONPKGCONFIG_CFLAGS=`$FREETYPE_CONFIG --cflags`
+- ft_NONPKGCONFIG_LIBS=`$FREETYPE_CONFIG --libs`],
++ ft_NONPKGCONFIG_LIBS=`$FREETYPE_CONFIG --libs | $SED
-e 's/-lz//g'`],
+ [AC_MSG_RESULT($FREETYPE_VERSION - Too old)
+ use_ft=no ($FREETYPE_VERSION found; version
$FREETYPE_MIN_VERSION from release $FREETYPE_MIN_RELEASE required)])
+ fi
+@@ -505,7 +505,7 @@
+ CAIRO_ENABLE_SURFACE_BACKEND(ps, PostScript, yes, [
+ # The ps backend requires zlib.
+ use_ps=$have_libz
+-ps_NONPKGCONFIG_LIBS=-lz
++ps_NONPKGCONFIG_LIBS=$ZLIB3RDLIB
+ ])
+
+ dnl
===
+@@ -542,7 +542,7 @@
+ CAIRO_ENABLE_SURFACE_BACKEND(pdf, PDF, yes, [
+ # The pdf backend requires zlib.
+ use_pdf=$have_libz
+-pdf_NONPKGCONFIG_LIBS=-lz
++pdf_NONPKGCONFIG_LIBS=$ZLIB3RDLIB
+ ])
+
+ dnl
===
+@@ -623,7 +623,7 @@
+ CAIRO_ENABLE_SURFACE_BACKEND(tee, tee, no)
+ CAIRO_ENABLE_SURFACE_BACKEND(xml, xml, no, [
+ use_xml=$have_libz
+-xml_NONPKGCONFIG_LIBS=-lz
++xml_NONPKGCONFIG_LIBS=$ZLIB3RDLIB
+ ])
+
+ dnl
===
--- misc/cairo-1.10.2/configure2010-12-25 15:22:57.0 +0100
+++ misc/build/cairo-1.10.2/configure 2010-12-25 15:22:57.0 +0100
@@ -19259,61 +19259,11 @@
@@ -132,6 +193,15 @@
if $PKG_CONFIG --exists $l ; then
png_REQUIRES=$l
use_png=yes
+@@ -29424,7 +29424,7 @@
+ { $as_echo $as_me:${as_lineno-$LINENO}: result:
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - cairo/cairo-1.10.2.configure_ac.patch cairo/cairo-1.10.2.patch
cairo/cairo-1.10.2.configure_ac.patch | 70 ++ cairo/cairo-1.10.2.patch | 61 - 2 files changed, 70 insertions(+), 61 deletions(-) New commits: commit 9185744651dc2c17a16e46d7766e9d2925f5ccf9 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Fri Dec 16 15:06:51 2011 +0100 Keep changes to configure.ac only as documentary evidence diff --git a/cairo/cairo-1.10.2.configure_ac.patch b/cairo/cairo-1.10.2.configure_ac.patch new file mode 100644 index 000..1305206 --- /dev/null +++ b/cairo/cairo-1.10.2.configure_ac.patch @@ -0,0 +1,70 @@ +--- misc/cairo-1.10.2/configure.ac 2010-12-13 17:30:14.0 +0100 misc/build/cairo-1.10.2/configure.ac 2010-12-13 17:30:14.0 +0100 +@@ -33,13 +33,8 @@ + + dnl === + +-AC_CHECK_LIB(z, compress, +- [AC_CHECK_HEADER(zlib.h, [ + have_libz=yes + AC_DEFINE(HAVE_ZLIB, 1, [Define to 1 if you have zlib available]) +- ], +- [have_libz=no (requires zlib http://www.gzip.org/zlib/)])], +- [have_libz=no (requires zlib http://www.gzip.org/zlib/)]) + + AC_CHECK_LIB(dl, dlsym, +[have_dlsym=yes; have_dl=yes], +@@ -279,7 +271,7 @@ + AC_ARG_VAR([png_REQUIRES], [module name for libpng to search for using pkg-config]) + if test x$png_REQUIRES = x; then + # libpng13 is GnuWin32's libpng-1.2.8 :-( +-for l in libpng libpng14 libpng12 libpng13 libpng10; do ++for l in libpng libpng14 libpng12 libpng15 libpng13 libpng10; do + if $PKG_CONFIG --exists $l ; then + png_REQUIRES=$l + use_png=yes +@@ -455,7 +455,7 @@ + AX_COMPARE_VERSION([$FREETYPE_VERSION], [gt], [$FREETYPE_MIN_VERSION], + [AC_MSG_RESULT($FREETYPE_VERSION - OK) + ft_NONPKGCONFIG_CFLAGS=`$FREETYPE_CONFIG --cflags` +- ft_NONPKGCONFIG_LIBS=`$FREETYPE_CONFIG --libs`], ++ ft_NONPKGCONFIG_LIBS=`$FREETYPE_CONFIG --libs | $SED -e 's/-lz//g'`], + [AC_MSG_RESULT($FREETYPE_VERSION - Too old) + use_ft=no ($FREETYPE_VERSION found; version $FREETYPE_MIN_VERSION from release $FREETYPE_MIN_RELEASE required)]) + fi +@@ -462,7 +462,7 @@ + fi + + ft_CFLAGS=$FREETYPE_CFLAGS +- ft_LIBS=$FREETYPE_LIBS ++ ft_LIBS=`echo $FREETYPE_LIBS | $SED -e 's/-lz//g'` + ]) + + FONTCONFIG_MIN_VERSION=2.2.95 +@@ -505,7 +505,7 @@ + CAIRO_ENABLE_SURFACE_BACKEND(ps, PostScript, yes, [ + # The ps backend requires zlib. + use_ps=$have_libz +-ps_NONPKGCONFIG_LIBS=-lz ++ps_NONPKGCONFIG_LIBS=$ZLIB3RDLIB + ]) + + dnl === +@@ -542,7 +542,7 @@ + CAIRO_ENABLE_SURFACE_BACKEND(pdf, PDF, yes, [ + # The pdf backend requires zlib. + use_pdf=$have_libz +-pdf_NONPKGCONFIG_LIBS=-lz ++pdf_NONPKGCONFIG_LIBS=$ZLIB3RDLIB + ]) + + dnl === +@@ -623,7 +623,7 @@ + CAIRO_ENABLE_SURFACE_BACKEND(tee, tee, no) + CAIRO_ENABLE_SURFACE_BACKEND(xml, xml, no, [ + use_xml=$have_libz +-xml_NONPKGCONFIG_LIBS=-lz ++xml_NONPKGCONFIG_LIBS=$ZLIB3RDLIB + ]) + + dnl === diff --git a/cairo/cairo-1.10.2.patch b/cairo/cairo-1.10.2.patch index d4d24d5..5ef91a7 100644 --- a/cairo/cairo-1.10.2.patch +++ b/cairo/cairo-1.10.2.patch @@ -59,67 +59,6 @@ | -chorusos* | -chorusrdb* | -cegcc* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ misc/cairo-1.10.2/configure.ac 2010-12-13 17:30:14.0 +0100 -+++ misc/build/cairo-1.10.2/configure.ac 2010-12-13 17:30:14.0 +0100 -@@ -33,13 +33,8 @@ - - dnl === - --AC_CHECK_LIB(z, compress, -- [AC_CHECK_HEADER(zlib.h, [ - have_libz=yes - AC_DEFINE(HAVE_ZLIB, 1, [Define to 1 if you have zlib available]) -- ], -- [have_libz=no (requires zlib http://www.gzip.org/zlib/)])], -- [have_libz=no (requires zlib http://www.gzip.org/zlib/)]) - - AC_CHECK_LIB(dl, dlsym, -[have_dlsym=yes; have_dl=yes], -@@ -279,7 +271,7 @@ - AC_ARG_VAR([png_REQUIRES], [module name for libpng to search for using pkg-config]) - if test x$png_REQUIRES = x; then - # libpng13 is GnuWin32's libpng-1.2.8 :-( --for l in libpng libpng14 libpng12 libpng13 libpng10; do -+for l in libpng libpng14 libpng12 libpng15 libpng13 libpng10; do - if $PKG_CONFIG --exists $l ; then - png_REQUIRES=$l - use_png=yes -@@ -455,7 +455,7 @@ - AX_COMPARE_VERSION([$FREETYPE_VERSION], [gt], [$FREETYPE_MIN_VERSION], -
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - cairo/cairo-1.10.2.patch cairo/pixman cairo/pixman-0.24.0.patch
cairo/cairo-1.10.2.patch |9 +++
cairo/pixman-0.24.0.patch | 58 ++
cairo/pixman/makefile.mk |2 +
3 files changed, 69 insertions(+)
New commits:
commit 40a9190ecd5c114974be8c3984837b365592bcda
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Fri Dec 16 15:03:13 2011 +0100
One more attempt to not have -lz sucked in
diff --git a/cairo/cairo-1.10.2.patch b/cairo/cairo-1.10.2.patch
index 5ef91a7..15c5c45 100644
--- a/cairo/cairo-1.10.2.patch
+++ b/cairo/cairo-1.10.2.patch
@@ -141,6 +141,15 @@
else { $as_echo $as_me:${as_lineno-$LINENO}: result: $FREETYPE_VERSION -
Too old 5
$as_echo $FREETYPE_VERSION - Too old 6; }
use_ft=no ($FREETYPE_VERSION found; version
$FREETYPE_MIN_VERSION from release $FREETYPE_MIN_RELEASE required)
+@@ -29434,7 +29434,7 @@
+ fi
+
+ ft_CFLAGS=$FREETYPE_CFLAGS
+- ft_LIBS=$FREETYPE_LIBS
++ ft_LIBS=`echo $FREETYPE_LIBS | $SED -e 's/-lz//g'`
+
+ cairo_cv_ft_use=$use_ft
+ cairo_cv_ft_cache_vars= BASE REQUIRES CFLAGS
NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS
@@ -30121,7 +30121,7 @@
# The ps backend requires zlib.
commit 8615f97870ba11c869958fa7ab0f35325e70c0b3
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Fri Dec 16 15:31:34 2011 +0100
Missing pixman file
Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch
diff --git a/cairo/pixman-0.24.0.patch b/cairo/pixman-0.24.0.patch
index 36cf368..0611962 100644
--- a/cairo/pixman-0.24.0.patch
+++ b/cairo/pixman-0.24.0.patch
@@ -1,3 +1,61 @@
+--- misc/pixman-0.24.0/Makefile.win32.common 2011-12-16 15:30:44.653987145
+0100
misc/build/pixman-0.24.0/Makefile.win32.common 2011-12-16
15:30:37.288130250 +0100
+@@ -1 +1,54 @@
+-dummy
++LIBRARY = pixman-1
++
++CC = cl
++LD = link
++AR = lib
++PERL = perl
++
++ifeq ($(top_builddir),)
++top_builddir = $(top_srcdir)
++endif
++
++CFG_VAR = $(CFG)
++ifeq ($(CFG_VAR),)
++CFG_VAR = release
++endif
++
++ifeq ($(CFG_VAR),debug)
++CFG_CFLAGS = -MDd -Od -Zi
++CFG_LDFLAGS = -DEBUG
++else
++CFG_CFLAGS = -MD -O2
++CFG_LDFLAGS =
++endif
++
++# Package definitions, to be used instead of those provided in config.h
++PKG_CFLAGS = -DPACKAGE=$(LIBRARY) -DPACKAGE_VERSION= -DPACKAGE_BUGREPORT=
++
++BASE_CFLAGS = -nologo -I. -I$(top_srcdir) -I$(top_srcdir)/pixman
++
++PIXMAN_CFLAGS = $(BASE_CFLAGS) $(PKG_CFLAGS) $(CFG_CFLAGS) $(CFLAGS)
++PIXMAN_LDFLAGS = -nologo $(CFG_LDFLAGS) $(LDFLAGS)
++PIXMAN_ARFLAGS = -nologo $(LDFLAGS)
++
++
++inform:
++ifneq ($(CFG),release)
++ifneq ($(CFG),debug)
++ifneq ($(CFG),)
++ @echo Invalid specified configuration option: $(CFG).
++ @echo
++ @echo Possible choices for configuration are 'release' and 'debug'
++ @exit 1
++endif
++ @echo Using default RELEASE configuration... (use CFG=release or
CFG=debug)
++endif
++endif
++
++
++$(CFG_VAR)/%.obj: %.c $(BUILT_SOURCES)
++ @mkdir -p $(CFG_VAR)
++ @$(CC) -c $(PIXMAN_CFLAGS) -Fo$@ $
++
++clean: inform
++ @$(RM) $(CFG_VAR)/*.{exe,ilk,lib,obj,pdb} $(BUILT_SOURCES) || exit 0
--- misc/pixman-0.24.0/Makefile.in 2011-11-06 22:11:25.0 +0100
+++ misc/build/pixman-0.24.0/Makefile.in 2011-12-16 09:06:45.317211035
+0100
@@ -272,7 +272,7 @@
diff --git a/cairo/pixman/makefile.mk b/cairo/pixman/makefile.mk
index b0595e8..fd9d960 100644
--- a/cairo/pixman/makefile.mk
+++ b/cairo/pixman/makefile.mk
@@ -48,6 +48,8 @@ PIXMANVERSION=0.24.0
TARFILE_NAME=pixman-$(PIXMANVERSION)
TARFILE_MD5=db5ffcd50064421176e8afb7b85fd1a7
+ADDITIONAL_FILES=Makefile.win32.common
+
PATCH_FILES=..$/$(TARFILE_NAME).patch
# Note: we are building static pixman library to avoid linking problems.
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: cairo/pixman
cairo/pixman/makefile.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8cb10ca24623d9c12185c62c9eda5e03a673d94a Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Fri Dec 16 16:24:09 2011 +0100 Make buid pixman on windows diff --git a/cairo/pixman/makefile.mk b/cairo/pixman/makefile.mk index fd9d960..df9c795 100644 --- a/cairo/pixman/makefile.mk +++ b/cairo/pixman/makefile.mk @@ -70,7 +70,7 @@ BUILD_DIR=$(CONFIGURE_DIR) .ELSE # WNT, not GCC BUILD_DIR=pixman -BUILD_ACTION=$(GNUMAKE) -f Makefile.win32 +BUILD_ACTION=$(GNUMAKE) -f Makefile.win32 MMX=off SSE2=on CFG=release .ENDIF .ELIF $(GUIBASE)==aqua ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - cairo/pixman
cairo/pixman/makefile.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 90eb372eec908e1bce188c6bc7c75088dfaa312e Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Fri Dec 16 16:24:09 2011 +0100 Make buid pixman on windows diff --git a/cairo/pixman/makefile.mk b/cairo/pixman/makefile.mk index fd9d960..df9c795 100644 --- a/cairo/pixman/makefile.mk +++ b/cairo/pixman/makefile.mk @@ -70,7 +70,7 @@ BUILD_DIR=$(CONFIGURE_DIR) .ELSE # WNT, not GCC BUILD_DIR=pixman -BUILD_ACTION=$(GNUMAKE) -f Makefile.win32 +BUILD_ACTION=$(GNUMAKE) -f Makefile.win32 MMX=off SSE2=on CFG=release .ENDIF .ELIF $(GUIBASE)==aqua ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: cairo/cairo cairo/cairo-1.10.2.patch cairo/cairo-1.10.2.wntmsc.patch
cairo/cairo-1.10.2.patch| 28 +--- cairo/cairo-1.10.2.wntmsc.patch | 56 cairo/cairo/makefile.mk |4 ++ 3 files changed, 84 insertions(+), 4 deletions(-) New commits: commit 19bd9a8a6dd1cf337447f69d866dfc44a8ec6f53 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Fri Dec 16 17:31:22 2011 +0100 Fix building of cairo on windows diff --git a/cairo/cairo-1.10.2.patch b/cairo/cairo-1.10.2.patch index 15c5c45..533efdf 100644 --- a/cairo/cairo-1.10.2.patch +++ b/cairo/cairo-1.10.2.patch @@ -1,14 +1,34 @@ --- misc/cairo-1.10.2/build/Makefile.win32.features2010-08-18 09:47:30.0 +0200 +++ misc/build/cairo-1.10.2/build/Makefile.win32.features 2010-08-18 09:47:30.0 +0200 -@@ -30,7 +30,7 @@ +@@ -18,7 +18,7 @@ + CAIRO_HAS_DRM_XR_FUNCTIONS=0 + CAIRO_HAS_GALLIUM_SURFACE=0 + CAIRO_HAS_XCB_DRM_FUNCTIONS=0 +-CAIRO_HAS_PNG_FUNCTIONS=1 ++CAIRO_HAS_PNG_FUNCTIONS=0 + CAIRO_HAS_GL_SURFACE=0 + CAIRO_HAS_DIRECTFB_SURFACE=0 + CAIRO_HAS_VG_SURFACE=0 +@@ -28,9 +28,9 @@ + CAIRO_HAS_SCRIPT_SURFACE=0 + CAIRO_HAS_FT_FONT=0 CAIRO_HAS_FC_FONT=0 - CAIRO_HAS_PS_SURFACE=1 - CAIRO_HAS_PDF_SURFACE=1 +-CAIRO_HAS_PS_SURFACE=1 +-CAIRO_HAS_PDF_SURFACE=1 ++CAIRO_HAS_PS_SURFACE=0 ++CAIRO_HAS_PDF_SURFACE=0 -CAIRO_HAS_SVG_SURFACE=1 +CAIRO_HAS_SVG_SURFACE=0 CAIRO_HAS_TEST_SURFACES=0 CAIRO_HAS_TEE_SURFACE=0 CAIRO_HAS_XML_SURFACE=0 +@@ -37,5 +37,5 @@ + CAIRO_HAS_PTHREAD=0 + CAIRO_HAS_GOBJECT_FUNCTIONS=0 + CAIRO_HAS_TRACE=0 +-CAIRO_HAS_INTERPRETER=1 ++CAIRO_HAS_INTERPRETER=0 + CAIRO_HAS_SYMBOL_LOOKUP=0 --- misc/cairo-1.10.2/build/Makefile.win32.common 2009-06-14 23:53:24.0 +0200 +++ misc/build/cairo-1.10.2/build/Makefile.win32.common2009-06-14 23:53:24.0 +0200 @@ -22,8 +22,8 @@ @@ -35,7 +55,7 @@ DEFAULT_CFLAGS += -I. -I$(top_srcdir) DEFAULT_CFLAGS += $(PIXMAN_CFLAGS) $(LIBPNG_CFLAGS) $(ZLIB_CFLAGS) +DEFAULT_CFLAGS += $(SOLARINC) -+DEFAULT_CFLAGS += -I$(SOLARVER)/$(INPATH)/inc/zlib -I$(SOLARVER)/$(INPATH)/inc/external/libpng -DZLIB_FIX ++DEFAULT_CFLAGS += -I$(SOLARVER)/$(INPATH)/inc/zlib -I$(SOLARVER)/$(INPATH)/inc/external/libpng -DZLIB_FIX -DDISABLE_SOME_FLOATING_POINT=1 CAIRO_CFLAGS = $(DEFAULT_CFLAGS) $(CFLAGS) diff --git a/cairo/cairo-1.10.2.wntmsc.patch b/cairo/cairo-1.10.2.wntmsc.patch new file mode 100644 index 000..1aa882a --- /dev/null +++ b/cairo/cairo-1.10.2.wntmsc.patch @@ -0,0 +1,56 @@ +--- misc/cairo-1.10.2/src/Makefile.sources 2010-12-25 07:21:34.0 -0700 misc/build/cairo-1.10.2/src/Makefile.sources 2011-12-16 08:44:19.209301900 -0700 +@@ -214,7 +214,7 @@ + cairo_pdf_headers = cairo-pdf.h + cairo_pdf_private = cairo-pdf-surface-private.h + cairo_pdf_sources = cairo-pdf-surface.c +-if CAIRO_HAS_PDF_SURFACE ++ifeq ($(CAIRO_HAS_PDF_SURFACE),1) + req_cairo_deflate_stream_sources = $(cairo_deflate_stream_sources) + endif + +@@ -248,7 +248,7 @@ + cairo-xlib-surface-private.h \ + cairo-xlib-xrender-private.h \ + $(NULL) +-if BUILD_XLIB_XCB ++ifeq ($(BUILD_XLIB_XCB),1) + cairo_xlib_sources = cairo-xlib-xcb-surface.c + else + cairo_xlib_sources = \ +@@ -273,7 +273,7 @@ + cairo-xcb-surface-core.c \ + cairo-xcb-surface-render.c \ + $(NULL) +-if BUILD_XCB_SHM ++ifeq ($(BUILD_XCB_SHM),1) + cairo_xcb_sources += \ + cairo-xcb-shm.c \ + cairo-xcb-connection-shm.c \ +@@ -322,7 +322,7 @@ + cairo-gl-gradient.c \ + cairo-gl-shaders.c \ + cairo-gl-surface.c +-if BUILD_PRIVATE_GLEW ++ifeq ($(BUILD_PRIVATE_GLEW),1) + cairo_gl_sources += glew/glew.c + endif + +@@ -373,7 +373,7 @@ + + cairo_script_headers = cairo-script.h + cairo_script_sources = cairo-script-surface.c +-if CAIRO_HAS_SCRIPT_SURFACE ++ifeq ($(CAIRO_HAS_SCRIPT_SURFACE),1) + req_cairo_deflate_stream_sources = $(cairo_deflate_stream_sources) + endif + +@@ -383,7 +383,7 @@ + + cairo_xml_headers = cairo-xml.h + cairo_xml_sources = cairo-xml-surface.c +-if CAIRO_HAS_XML_SURFACE ++ifeq ($(CAIRO_HAS_XML_SURFACE),1) + req_cairo_deflate_stream_sources = $(cairo_deflate_stream_sources) + endif + diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk index 167c704..9aeecde 100644 --- a/cairo/cairo/makefile.mk +++ b/cairo/cairo/makefile.mk @@ -49,6 +49,10 @@ TARFILE_MD5=f101a9e88b783337b20b2e26dfd26d5f PATCH_FILES=..$/$(TARFILE_NAME).patch +.IF $(OS)$(COM) == WNTMSC +PATCH_FILES+= ..$/$(TARFILE_NAME).wntmsc.patch +.ENDIF + .IF $(OS) == IOS PATCH_FILES+=..$/$(TARFILE_NAME).no-atsui.patch PATCH_FILES+=..$/$(TARFILE_NAME).ios.patch ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
