[Libreoffice-commits] .: libcdr/libcdr-0.0.7-clang.patch libcdr/makefile.mk

[Fridrich Strba]

 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 
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 
+ #include 
+ #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 (d>0) ? 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 (d>0) ? 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 
+ #include 
+ #include 
++#include 
+ 
+ #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] .: libcdr/libcdr-0.0.6.patch libcdr/libcdr-0.0.7.patch libcdr/makefile.mk ooo.lst.in

[Fridrich Strba]

 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 
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 
--#endif
--
--#ifdef HAVE_STDINT_H
- #include 
--#endif
--
--#ifdef HAVE_INTTYPES_H
- #include 
--#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 
+-#endif
+-
+-#ifdef HAVE_STDINT_H
+ #include 
+-#endif
+-
+-#ifdef HAVE_INTTYPES_H
+ #include 
+-#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] .: Branch 'libreoffice-3-5' - sax/qa

[Fridrich Strba]

 sax/qa/cppunit/test_converter.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 580a7f24c373cd8cf068fc92fdb153025e6d0a1d
Author: Fridrich Å trba 
Date:   Fri Apr 20 22:30:26 2012 +0200

Minor backporting fix

Signed-off-by: Michael Stahl 

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] .: Branch 'libreoffice-3-5' - 3 commits - sax/qa sax/source xmloff/source

[Fridrich Strba]

 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 
Date:   Fri Apr 20 18:39:36 2012 +0200

fdo#48969: add unit test for Converter::convertDouble

Signed-off-by: Fridrich Å trba 

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 
 #include 
 #include 
+#include 
 
 #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 
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 

diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx
index cf5a5b5..51be183 100644
--- a/sax/source/tools/converter.cxx
+++ b/sax/source/tools/converter.cxx
@@ -1820,9 +1820,16 @@ double 
Converter::GetConversionFac

[Libreoffice-commits] .: writerperfect/Library_wpftwriter.mk writerperfect/source

[Fridrich Strba]

 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 
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 
 #include 
 
-#include 
 #include 
 #include 
 #include 
 #include 
 #include 
+#include 
+#include 
 #include 
 
+#include 
 #include 
 #include 
 
+#include 
+
 #include "filter/FilterInternal.hxx"
 #include "filter/DocumentHandler.hxx"
 #include "filter/OdtGenerator.hxx"
+#include "MSWorksImportFilter.hxx"
 #include "stream/WPXSvStream.h"
 
-#include 
-#include "MSWorksImportFilter.hxx"
+#include 
 
-// 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 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -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 > mxHandler;
@@ -61,9 +61,8 @@ protected:
 throw (::com::sun::star::uno::RuntimeException);
 
 public:
-MSWorksImportFilter( const ::com::sun::star::uno::Reference< 
::com::sun::star::lang::XMultiServiceFactory > &rxMSF)
-: mxMSF( rxMSF )
-{}
+MSWorksImportFilter( const ::com::sun::star::uno::Reference< 
::com::sun::star::uno::XComponentContext > &rxContext )
+: mxContext( rxContext ) {}
 virtual ~MSWorksImportFilter() {}
 
 // XFilter
@@ -104,7 +103,7 @@ throw ( ::com::sun::star::uno::RuntimeException );
 throw ( ::com::sun::star::uno::RuntimeException );
 
 ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface 

[Libreoffice-commits] .: writerperfect/source writerperfect/util

[Fridrich Strba]

 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 
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 @@
 
-http://openoffice.org/2010/uno-components";>
   
 
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 @@
 
-http://openoffice.org/2010/uno-components";>
   
 
diff --git a/writerperfect/util/visiofilter.component 
b/writerperfect/util/visiofilter.component
index 6b19b28..a1842d9 100644
--- a/writerperfect/util/visiofilter.component
+++ b/writerperfect/util/visiofilter.component
@@ -1,5 +1,5 @@
 
-http://openoffice.org/2010/uno-components";>
   
 
diff --git a/writerperfect/util/wpft.component 
b/writerperfect/util/wpft.component
index 2d8a013..57cb3a4 100644
--- a/writerp

[Libreoffice-commits] .: writerperfect/util

[Fridrich Strba]

 writerperfect/util/cdrfilter.component |4 
 1 file changed, 4 insertions(+)

New commits:
commit 415157afaffe31090032745516e506e104aa2108
Author: Fridrich Å trba 
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 @@
 
 
   
+  
+
+
+  
 
___
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

[Fridrich Strba]

imp/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 
 #include 
@@ -40,11 +40,6 @@
 
 #include 
 
-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 
+ *
+ * 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 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+
+#include 
+#include "filter/DocumentHandler.hxx"
+#include "filter/OdgGenerator.hxx"
+#include "CMXImportFilter.hxx"
+#include "stream/WPXSvStream.h"
+
+#include 
+
+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::uno::Reference;
+using com::sun::star::uno::Any;
+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;
+
+using com::sun::star::io::XInputStream;
+using com::sun::star::document::XImporter;
+using com::sun::star::xml::sax::InputSource;
+using com::sun::star::xml::sax::XAttributeList;
+using com::sun::star::xml::sax::XDocumentHandler;
+using com::sun::star::xml::sax::XParser;
+
+
+sal_Bool SAL_CALL CMXImportFilter::filter( const Sequence< 
::com::sun::star::beans::PropertyValue >& aDescriptor )
+throw (RuntimeException)
+{
+#ifdef DEBUG
+std::cerr << "CMXImportFilter::filter" << std::endl;
+#endif
+sal_Int32 nLength = aDescriptor.getLength();
+const PropertyValue *pValue = aDescriptor.getConstArray();
+OUString sURL;
+Reference < XIn

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - bin/lo-pack-sources bin/unpack-sources download

[Fridrich Strba]

 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 
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 

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 2>&1") && 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 
Date:   Fri Apr 13 16:20:55 2012 +0200

unpack-sources, download: update for .xz source tarballs

Signed-off-by: Fridrich Å trba 

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 

[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

[Fridrich Strba]

 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 
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 
--#endif
--
--#ifdef HAVE_STDINT_H
- #include 
--#endif
--
--#ifdef HAVE_INTTYPES_H
- #include 
--#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 
+-#endif
+-
+-#ifdef HAVE_STDINT_H
+ #include 
+-#endif
+-
+-#ifdef HAVE_INTTYPES_H
+ #include 
+-#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

[Fridrich Strba]

 zlib/makefile.mk |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 0d34f0ebcaf75863daaa608cc962ee888b2fa7e6
Author: Fridrich Å trba 
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] .: cairo/pixman cairo/pixman-0.24.0.android.patch cairo/pixman-0.24.0.patch cairo/pixman-0.24.4.android.patch cairo/pixman-0.24.4.patch ooo.lst.in

[Fridrich Strba]

 cairo/pixman-0.24.0.android.patch |   13 ---
 cairo/pixman-0.24.0.patch |  145 --
 cairo/pixman-0.24.4.android.patch |   13 +++
 cairo/pixman-0.24.4.patch |  145 ++
 cairo/pixman/makefile.mk  |4 -
 ooo.lst.in|2 
 6 files changed, 161 insertions(+), 161 deletions(-)

New commits:
commit 619b314317ae370fbff54900524adbae397cb860
Author: Fridrich Å trba 
Date:   Tue Apr 10 14:06:19 2012 +0200

Upgrade pixman to 0.24.4

diff --git a/cairo/pixman-0.24.0.android.patch 
b/cairo/pixman-0.24.0.android.patch
deleted file mode 100644
index f9a52f0..000
--- a/cairo/pixman-0.24.0.android.patch
+++ /dev/null
@@ -1,13 +0,0 @@
 misc/pixman-0.24.0/ltmain.sh
-+++ misc/build/pixman-0.24.0/ltmain.sh
-@@ -3228,6 +3228,10 @@
-   fi
-   else
- 
-+  # Force no versioning suffix for Android
-+
-+  version_type=none
-+
-   # Parse the version information argument.
-   save_ifs="$IFS"; IFS=':'
-   set dummy $vinfo 0 0 0
diff --git a/cairo/pixman-0.24.0.patch b/cairo/pixman-0.24.0.patch
deleted file mode 100644
index 39122cd..000
--- a/cairo/pixman-0.24.0.patch
+++ /dev/null
@@ -1,145 +0,0 @@
 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  = -MD -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 @@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--SUBDIRS = pixman demos test
-+SUBDIRS = pixman
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = pixman-1.pc
- GPGKEY = 6FF7C1A8
 misc/pixman-0.24.0/config.sub  2008-08-30 00:27:25.0 +0200
-+++ misc/build/pixman-0.24.0/config.sub2011-12-16 09:05:14.595773609 
+0100
-@@ -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* | \
-   storm-chaos* | os2-emx* | rtmk-nova*)
- os=-$maybe_os
-@@ -1247,7 +1247,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* \
- | -chorusos* | -chorusrdb* \
- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
 misc/pixman-0.24.0/configure   2011-11-06 22:11:27.0 +0100
-+++ misc/build/pixman-0.24.0/configure 2011-12-16 09:06:16.482898083 +0100
-@@ -20202,6 +20202,13 @@
- 
- 
- 
-+# getisax is falsely detected when using OOo build script on Linux/FBSD...
-+case "$build_os" in
-+ linux-gnu*)
-+  ;;
-+ freebsd*)
-+  ;;
-+ *)
- 
- for ac_func in getisax
- do
-@@ -20304,6 +20311,8 @@
- done
- 
- 
-+  ;;
-+esac
-  { $as_echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
- $as_echo_n "checking wheth

[Libreoffice-commits] .: writerperfect/source

[Fridrich Strba]

 writerperfect/source/filter/OdgGenerator.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit c227447b9ab253a1d263b315ad0a7dbba4b08ff1
Author: Fridrich Å trba 
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] .: writerperfect/source

[Fridrich Strba]

 writerperfect/source/wpdimp/WordPerfectImportFilter.cxx |   21 ++--
 1 file changed, 19 insertions(+), 2 deletions(-)

New commits:
commit e79c9c4c5a84f0409362361901fbdcb6a574ed87
Author: Fridrich Å trba 
Date:   Sun Apr 8 22:11:52 2012 +0200

Generate SVG preview of embedded WPG image

diff --git a/writerperfect/source/wpdimp/WordPerfectImportFilter.cxx 
b/writerperfect/source/wpdimp/WordPerfectImportFilter.cxx
index a82338f..2dab43a 100644
--- a/writerperfect/source/wpdimp/WordPerfectImportFilter.cxx
+++ b/writerperfect/source/wpdimp/WordPerfectImportFilter.cxx
@@ -85,7 +85,7 @@ using com::sun::star::xml::sax::XParser;
 void callHandler(uno::Reference < XDocumentHandler > xDocHandler);
 
 
-static bool handleEmbeddedWPG(const WPXBinaryData &data, OdfDocumentHandler 
*pHandler,  const OdfStreamType streamType)
+static bool handleEmbeddedWPGObject(const WPXBinaryData &data, 
OdfDocumentHandler *pHandler,  const OdfStreamType streamType)
 {
 OdgGenerator exporter(pHandler, streamType);
 
@@ -97,6 +97,22 @@ static bool handleEmbeddedWPG(const WPXBinaryData &data, 
OdfDocumentHandler *pHa
 return libwpg::WPGraphics::parse(const_cast(data.getDataStream()), &exporter, fileFormat);
 }
 
+static bool handleEmbeddedWPGImage(const WPXBinaryData &input, WPXBinaryData 
&output)
+{
+WPXString svgOutput;
+libwpg::WPGFileFormat fileFormat = libwpg::WPG_AUTODETECT;
+
+if (!libwpg::WPGraphics::isSupported(const_cast(input.getDataStream(
+fileFormat = libwpg::WPG_WPG1;
+
+if (!libwpg::WPGraphics::generateSVG(const_cast(input.getDataStream()), svgOutput, fileFormat))
+return false;
+
+output.clear();
+output.append((unsigned char *)svgOutput.cstr(), strlen(svgOutput.cstr()));
+return true;
+}
+
 sal_Bool SAL_CALL WordPerfectImportFilter::importImpl( const Sequence< 
::com::sun::star::beans::PropertyValue >& aDescriptor )
 throw (RuntimeException)
 {
@@ -159,7 +175,8 @@ throw (RuntimeException)
 DocumentHandler xHandler(xInternalHandler);
 
 OdtGenerator collector(&xHandler, ODF_FLAT_XML);
-collector.registerEmbeddedObjectHandler("image/x-wpg", &handleEmbeddedWPG);
+   collector.registerEmbeddedObjectHandler("image/x-wpg", 
&handleEmbeddedWPGObject);
+   collector.registerEmbeddedImageHandler("image/x-wpg", 
&handleEmbeddedWPGImage);
 if (WPD_OK == WPDocument::parse(&input, &collector, aUtf8Passwd.isEmpty() 
? 0 : aUtf8Passwd.getStr()))
 return sal_True;
 return sal_False;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: writerperfect/source

[Fridrich Strba]

 writerperfect/source/filter/OdtGenerator.cxx |   58 ++-
 writerperfect/source/filter/OdtGenerator.hxx |2 
 2 files changed, 50 insertions(+), 10 deletions(-)

New commits:
commit 04950bf3c339f074588fbcff7121fdff76f00163
Author: Fridrich Å trba 
Date:   Sun Apr 8 21:56:42 2012 +0200

Allow conversion of embedded images to another binary image format

diff --git a/writerperfect/source/filter/OdtGenerator.cxx 
b/writerperfect/source/filter/OdtGenerator.cxx
index ecb29bb..8f6ae1b 100644
--- a/writerperfect/source/filter/OdtGenerator.cxx
+++ b/writerperfect/source/filter/OdtGenerator.cxx
@@ -118,6 +118,7 @@ public:
 void _closeListLevel();
 
 OdfEmbeddedObject _findEmbeddedObjectHandler(const WPXString &mimeType);
+OdfEmbeddedImage _findEmbeddedImageHandler(const WPXString &mimeType);
 
 OdfDocumentHandler *mpHandler;
 bool mbUsed; // whether or not it has been before (you can only use me 
once!)
@@ -148,6 +149,7 @@ public:
 
 // embedded object handlers
 std::map mObjectHandlers;
+std::map mImageHandlers;
 
 // metadata
 std::vector mMetaData;
@@ -187,7 +189,7 @@ OdtGeneratorPrivate::OdtGeneratorPrivate(OdfDocumentHandler 
*pHandler, const Odf
 mWriterListStates(),
 mParagraphManager(), mSpanManager(), mFontManager(),
 mSectionStyles(), mTableStyles(), mFrameStyles(), mFrameAutomaticStyles(),
-mObjectHandlers(), mMetaData(),
+mObjectHandlers(), mImageHandlers(), mMetaData(),
 miNumListStyles(0),
 mBodyElements(),
 mpCurrentContentElements(&mBodyElements),
@@ -267,6 +269,15 @@ OdfEmbeddedObject 
OdtGeneratorPrivate::_findEmbeddedObjectHandler(const WPXStrin
 return 0;
 }
 
+OdfEmbeddedImage OdtGeneratorPrivate::_findEmbeddedImageHandler(const 
WPXString &mimeType)
+{
+std::map::iterator i = 
mImageHandlers.find(mimeType);
+if (i != mImageHandlers.end())
+return i->second;
+
+return 0;
+}
+
 OdtGenerator::OdtGenerator(OdfDocumentHandler *pHandler, const OdfStreamType 
streamType) :
 mpImpl(new OdtGeneratorPrivate(pHandler, streamType))
 {
@@ -1247,18 +1258,40 @@ void OdtGenerator::insertBinaryObject(const 
WPXPropertyList &propList, const WPX
 return;
 
 OdfEmbeddedObject tmpObjectHandler = 
mpImpl->_findEmbeddedObjectHandler(propList["libwpd:mimetype"]->getStr());
+OdfEmbeddedImage tmpImageHandler = 
mpImpl->_findEmbeddedImageHandler(propList["libwpd:mimetype"]->getStr());
 
-if (tmpObjectHandler)
+if (tmpObjectHandler || tmpImageHandler)
 {
-std::vector tmpContentElements;
-InternalHandler tmpHandler(&tmpContentElements);
-
-if (tmpObjectHandler(data, &tmpHandler, ODF_FLAT_XML) && 
!tmpContentElements.empty())
+if (tmpObjectHandler)
 {
-mpImpl->mpCurrentContentElements->push_back(new 
TagOpenElement("draw:object"));
-for (std::vector::const_iterator iter = 
tmpContentElements.begin(); iter != tmpContentElements.end(); ++iter)
-mpImpl->mpCurrentContentElements->push_back(*iter);
-mpImpl->mpCurrentContentElements->push_back(new 
TagCloseElement("draw:object"));
+std::vector tmpContentElements;
+InternalHandler tmpHandler(&tmpContentElements);
+
+if (tmpObjectHandler(data, &tmpHandler, ODF_FLAT_XML) && 
!tmpContentElements.empty())
+{
+mpImpl->mpCurrentContentElements->push_back(new 
TagOpenElement("draw:object"));
+for (std::vector::const_iterator iter = 
tmpContentElements.begin(); iter != tmpContentElements.end(); ++iter)
+mpImpl->mpCurrentContentElements->push_back(*iter);
+mpImpl->mpCurrentContentElements->push_back(new 
TagCloseElement("draw:object"));
+}
+}
+if (tmpImageHandler)
+{
+WPXBinaryData output;
+if (tmpImageHandler(data, output))
+{
+mpImpl->mpCurrentContentElements->push_back(new 
TagOpenElement("draw:image"));
+
+mpImpl->mpCurrentContentElements->push_back(new 
TagOpenElement("office:binary-data"));
+
+WPXString binaryBase64Data = output.getBase64Data();
+
+mpImpl->mpCurrentContentElements->push_back(new 
CharDataElement(binaryBase64Data.cstr()));
+
+mpImpl->mpCurrentContentElements->push_back(new 
TagCloseElement("office:binary-data"));
+
+mpImpl->mpCurrentContentElements->push_back(new 
TagCloseElement("draw:image"));
+}
 }
 }
 else
@@ -1346,4 +1379,9 @@ void OdtGenerator::registerEmbeddedObjectHandler(const 
WPXString &mimeType, OdfE
 mpImpl->mObjectHandlers[mimeType] = objectHandler;
 }
 
+void OdtGenerator::registerEmbeddedImageHandler(const WPXString &mimeType, 
OdfEmbeddedImage imageHandler)
+{
+mpImpl->mImageHandlers[mimeType] = imageHandler;
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerperfec

[Libreoffice-commits] .: Branch 'features/base-preview' - boost/makefile.mk

[Fridrich Strba]

 boost/makefile.mk |   49 +++--
 1 file changed, 47 insertions(+), 2 deletions(-)

New commits:
commit d34b86cd91654199724c400e43822619c7d70576
Author: Fridrich Sch Strba 
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)
 @$(GNUCOPY) -r $(PACKA

[Libreoffice-commits] .: filter/source

[Fridrich Strba]

 filter/source/svg/parserfragments.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 333cb00a6399bcafa0248a64922757da4a7d
Author: Christina Rossmanith 
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::vector& 
rTransforms,
 void calcSkewX(std::vector& 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::vector& 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

[Fridrich Strba]

 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 
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 
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::vector(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 
-+#include 
- #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 *getSubstr

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - distro-configs/LibreOfficeMinGW.conf distro-configs/LibreOfficeWin32.conf distro-configs/LibreOfficeWin64.conf

[Fridrich Strba]

 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 
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 

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

[Fridrich Strba]

 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 
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 
Signed-off-by: Petr Mladek 
Signed-off-by: Fridrich Å trba 

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
+++ b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
@@ -50

[Libreoffice-commits] .: Branch 'libreoffice-3-5-2' - extras/source

[Fridrich Strba]

 extras/source/palettes/standard.soe |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 5ce6fc0ff62c8a1dbe6ae22300639ccb1d4900ba
Author: Regina Henschel 
Date:   Sun Mar 25 21:12:52 2012 +0200

Adapt arrowhead pathes to corrected svg path z hangling

Signed-off-by: Michael Meeks 
Signed-off-by: Fridrich Å trba 

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 @@
   
   
   
-  
-  
+  
+  
   
   
-  
-  
+  
+  
   
 
\ 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] .: Branch 'libreoffice-3-5' - basegfx/inc basegfx/source xmloff/inc xmloff/source

[Fridrich Strba]

 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 
Date:   Mon Mar 26 12:55:44 2012 +0200

Compatibility option for incorrect relative moves after closePath 
(fdo#47406)

Signed-off-by: Thorsten Behrens 

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 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -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 --git a/xmloff/source/draw/ximp3dobject.cxx 
b/xmloff/source/draw/ximp3dobject.cxx
index 3051578..efeb89e 100644
--- a/

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - xmloff/source

[Fridrich Strba]

 xmloff/source/draw/xexptran.cxx |   10 ++
 1 file changed, 10 insertions(+)

New commits:
commit db3597cef07a0f659be5617d9148069c7fb4a5a8
Author: Thorsten Behrens 
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] .: basegfx/inc basegfx/source xmloff/inc xmloff/source

[Fridrich Strba]

 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 7a19798c73fd39d8d69ff6364f0696e68cdd1381
Author: Fridrich Å trba 
Date:   Mon Mar 26 12:55:44 2012 +0200

Compatibility option for incorrect relative moves after closePath 
(fdo#47406)

diff --git a/basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx 
b/basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx
index 54437ba..091614a 100644
--- a/basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx
+++ b/basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx
@@ -118,10 +118,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 590b8db..e3e60cd 100644
--- a/basegfx/source/polygon/b2dsvgpolypolygon.cxx
+++ b/basegfx/source/polygon/b2dsvgpolypolygon.cxx
@@ -209,7 +209,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());
@@ -240,7 +240,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 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -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 6032984..80a61ac 100644
--- a/xmloff/source/draw/xexptran.cxx
+++ b/xmloff/source/draw/xexptran.cxx
@@ -2121,7 +2121,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 ),
@@ -2130,9 +2130,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 --git a/xmloff/source/draw/ximp3dobject.cxx 
b/xmloff/source/draw/ximp3dobject.cxx
index 1d84030..eacf1df 100644
--- a/xmloff/source/draw/ximp3dobject.cxx
+++ b/

[Libreoffice-commits] .: extensions/source

[Fridrich Strba]

 extensions/source/macosx/spotlight/OOoSpotlightImporter.m |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a7c11707cf43b13d75a039cae918fae7f268cbf0
Author: Fridrich Å trba 
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] .: basctl/source

[Fridrich Strba]

 basctl/source/basicide/basides1.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 0a8596dd8ebbbc80e87d4bdfafe3cf53355b7d43
Author: Fridrich Å trba 
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] .: sw/source

[Fridrich Strba]

 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 
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 
 #include 
 #include 
+#include 
+#include 
 
 #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< SwFrmFmt* > aVecSwFrmFmt;
 
-  

[Libreoffice-commits] .: oowintool

[Fridrich Strba]

 oowintool |   10 +-
 1 file changed, 1 insertion(+), 9 deletions(-)

New commits:
commit a75fd2d50e8c0ad82bcd0bbfeafd6a7f0153b7ba
Author: Fridrich Å trba 
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] .: libcdr/libcdr-0.0.5-zip.patch libcdr/makefile.mk

[Fridrich Strba]

 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 
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::vector(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 
++#include 
+ #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;
++strm.next_in = (Bytef

[Libreoffice-commits] .: basctl/source

[Fridrich Strba]

 basctl/source/basicide/basides1.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 0589dd3fb5c5bf2fdcdbccfab31fbe26c0a9727d
Author: Fridrich Å trba 
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] .: sw/source

[Fridrich Strba]

 sw/source/core/layout/paintfrm.cxx |  143 -
 1 file changed, 65 insertions(+), 78 deletions(-)

New commits:
commit e94c4ab5523c7dcbee2f1b7fd47685529498e774
Author: Bartosz Kosiorek 
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 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -48,7 +47,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -81,7 +79,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -99,14 +96,14 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 
 #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 
+#include  //Need for svtools::DrawLine
+#include  //Need for svtools::DrawLine
 
 #include "pagefrm.hrc"
 #include 
@@ -125,6 +122,7 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
 #include 
@@ -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 )
@@ -526,9 +519,9 @@ void SwLineRects::ConnectEdges( OutputDevice *pOut )
 
 SvPtrarr   aCheck( 64 );
 
-for ( int i = 0; i < (int)Count(); ++i )
+for (SwLineRects::iterator it = this->begin(); it != this->end(); ++it)
 {
-SwLineRect &rL1 = operator[](sal_uInt16(i));
+SwLineRect &rL1 = (*it);
 if ( !rL1.GetTab() || rL1.IsPainted() || rL1.IsLocked() )
 continue;
 
@@ -549,9 +542,9 @@ void SwLineRects::ConnectEdges( OutputDevice *pOut )
 }
 
 // Collect all lines to possibly link with i1
-for ( s

[Libreoffice-commits] .: 5 commits - sc/source

[Fridrich Strba]

 sc/source/ui/unoobj/chart2uno.cxx |  112 --
 1 file changed, 49 insertions(+), 63 deletions(-)

New commits:
commit db3786ee3aa0d8911042c9bbcea02cf36d96dfa1
Author: Noel Grandin 
Date:   Fri Mar 16 14:56:53 2012 +0200

Convert tools/table.hxx to std::map in Chart2PositionMap class

diff --git a/sc/source/ui/unoobj/chart2uno.cxx 
b/sc/source/ui/unoobj/chart2uno.cxx
index 0c86655..469eb1d 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -47,7 +47,6 @@
 #include "formula/opcode.hxx"
 
 #include 
-#include 
 #include 
 
 #include 
@@ -249,12 +248,14 @@ vector* TokenTable::getAllRanges() const
 }
 
 // 
+typedef std::map ScTokenPtrMap;
+typedef std::map ChartTokenMap;
 
 class Chart2PositionMap
 {
 public:
 Chart2PositionMap(SCCOL nColCount, SCROW nRowCount,
-  bool bFillRowHeader, bool bFillColumnHeader, Table& 
rCols,
+  bool bFillRowHeader, bool bFillColumnHeader, 
ChartTokenMap& rCols,
   ScDocument* pDoc );
 ~Chart2PositionMap();
 
@@ -282,7 +283,7 @@ private:
 };
 
 Chart2PositionMap::Chart2PositionMap(SCCOL nAllColCount,  SCROW nAllRowCount,
- bool bFillRowHeader, bool 
bFillColumnHeader, Table& rCols, ScDocument* pDoc)
+ bool bFillRowHeader, bool 
bFillColumnHeader, ChartTokenMap& rCols, ScDocument* pDoc)
 {
 // if bFillRowHeader is true, at least the first column serves as a row 
header.
 //  If more than one column is pure text all the first pure text columns 
are used as header.
@@ -299,16 +300,18 @@ Chart2PositionMap::Chart2PositionMap(SCCOL nAllColCount,  
SCROW nAllRowCount,
 SCROW nSmallestValueRowIndex = nAllRowCount;
 bool bFoundValues = false;
 bool bFoundAnything = false;
-Table* pCol = static_cast(rCols.First());
+ChartTokenMap::iterator aColIter = rCols.begin();
 for (SCCOL nCol = 0; !bFoundValues && nCol < nAllColCount; ++nCol)
 {
-if (pCol && nCol>=nHeaderColCount)
+if (aColIter != rCols.end() && nCol>=nHeaderColCount)
 {
-ScToken* pToken = static_cast(pCol->First());
+ScTokenPtrMap* pCol = aColIter->second;
+ScTokenPtrMap::iterator tokenIter = pCol->begin();
 for (SCROW nRow = 0; !bFoundValues && nRow < 
nSmallestValueRowIndex; ++nRow)
 {
-if (pToken && nRow>=nHeaderRowCount)
+if (tokenIter != pCol->end() && nRow>=nHeaderRowCount)
 {
+ScToken* pToken = tokenIter->second;
 ScRange aRange;
 bool bExternal = false;
 StackVar eType = pToken->GetType();
@@ -331,12 +334,14 @@ Chart2PositionMap::Chart2PositionMap(SCCOL nAllColCount,  
SCROW nAllRowCount,
 bFoundAnything = true;
 }
 }
-pToken = static_cast(pCol->Next());
+if (tokenIter != pCol->end() )
+++tokenIter;
 }
 if(!bFoundValues && nHeaderColCount>0)
 nHeaderColCount++;
 }
-pCol = static_cast(rCols.Next());
+if (aColIter != rCols.end())
+++aColIter;
 }
 if( bFoundAnything )
 {
@@ -360,15 +365,16 @@ Chart2PositionMap::Chart2PositionMap(SCCOL nAllColCount,  
SCROW nAllRowCount,
 maRowHeaders.init(nHeaderColCount,mnDataRowCount);
 maData.init(mnDataColCount,mnDataRowCount);
 
-Table* pCol = static_cast(rCols.First());
-FormulaToken* pToken = NULL;
+ChartTokenMap::iterator aColIter = rCols.begin();
 for (SCCOL nCol = 0; nCol < nAllColCount; ++nCol)
 {
-if (pCol)
+if (aColIter != rCols.end())
 {
-pToken = static_cast(pCol->First());
+ScTokenPtrMap* pCol = aColIter->second;
+ScTokenPtrMap::iterator tokenIter = pCol->begin();
 for (SCROW nRow = 0; nRow < nAllRowCount; ++nRow)
 {
+FormulaToken* pToken = 
static_cast(tokenIter->second);
 if( nCol < nHeaderColCount )
 {
 if( nRow < nHeaderRowCount )
@@ -380,11 +386,10 @@ Chart2PositionMap::Chart2PositionMap(SCCOL nAllColCount,  
SCROW nAllRowCount,
 maColHeaders.push_back(pToken);
 else
 maData.push_back(pToken);
-
-pToken = static_cast(pCol->Next());
+++tokenIter;
 }
+++aColIter;
 }
-pCol = static_cast(rCols.Next());
 }
 }
 
@@ -715,10 +720,7 @@ void Chart2Positioner::createPositionMap()
 glueState();

[Libreoffice-commits] .: filter/source

[Fridrich Strba]

 filter/source/svg/svgreader.cxx |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 11ccf88eeb8e4148ca532e3a42ddca356ebde811
Author: Christina Rossmanith 
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 - sc/source

[Fridrich Strba]

 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 
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;
  

[Libreoffice-commits] .: basctl/source

[Fridrich Strba]

 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 
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

[Libreoffice-commits] .: sdext/source

[Fridrich Strba]

 sdext/source/presenter/PresenterSprite.cxx |2 --
 sdext/source/presenter/PresenterSprite.hxx |1 -
 2 files changed, 3 deletions(-)

New commits:
commit e55595d0e081ccdca41f621177e1b32eb9a649e3
Author: Christina Rossmanith 
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::Reference 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] .: shell/source

[Fridrich Strba]

 shell/source/win32/zipfile/zipfile.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit f729d2d83034167db9727c2de2f4e5a32a7374d8
Author: Fridrich Å trba 
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] .: shell/source

[Fridrich Strba]

 shell/source/win32/zipfile/zipfile.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit baebdaa48e88949bf6aa92c478733518bede5c6e
Author: Fridrich Å trba 
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

[Fridrich Strba]

 shell/source/win32/zipfile/zipfile.cxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit e6aa2b67d4c0f1a65fcddabb77186c75a3ae1c1a
Author: Fridrich Å trba 
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] .: zlib/prj

[Fridrich Strba]

 zlib/prj/d.lst |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e1b8187d598cba25503f9c56740eb6109b2c355c
Author: Fridrich Å trba 
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] .: 2 commits - shell/inc shell/source zlib/prj zlib/zlib-1.2.5.patch

[Fridrich Strba]

 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 
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 
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 );
 
 /** check if the Tag is in the target meta.xml fil

[Libreoffice-commits] .: libcdr/libcdr-0.0.4.patch libcdr/libcdr-0.0.5.patch libcdr/makefile.mk libcdr/prj ooo.lst.in

[Fridrich Strba]

 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 
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 
--#endif
--
--#ifdef HAVE_STDINT_H
- #include 
--#endif
--
--#ifdef HAVE_INTTYPES_H
- #include 
--#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 
+-#endif
+-
+-#ifdef HAVE_STDINT_H
+ #include 
+-#endif
+-
+-#ifdef HAVE_INTTYPES_H
+ #include 
+-#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

[Fridrich Strba]

 lcms2/makefile.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 073ea37399a3b9b44e5780c1cf2a6b76e44d8359
Author: Fridrich Å trba 
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

[Fridrich Strba]

 writerperfect/source/filter/OdgGenerator.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5eee7de29362ecd00d43ed9eb9ed7230606dc92a
Author: Fridrich Å trba 
Date:   Mon Mar 12 10:40:10 2012 +0100

C&P 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] .: lcms2/makefile.mk

[Fridrich Strba]

 lcms2/makefile.mk |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 347de4170751f99d92fb4f014586cd606e30887f
Author: Fridrich Å trba 
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] .: libcdr/libcdr-0.0.3.patch libcdr/libcdr-0.0.3-warning.patch libcdr/libcdr-0.0.4.patch libcdr/makefile.mk ooo.lst.in

[Fridrich Strba]

 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 +++---
 ooo.lst.in|2 +-
 5 files changed, 32 insertions(+), 73 deletions(-)

New commits:
commit 1390a2ce01b8458a53abf95df9091c64af422cb4
Author: Fridrich Å trba 
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 
--#endif
--
--#ifdef HAVE_STDINT_H
- #include 
--#endif
--
--#ifdef HAVE_INTTYPES_H
- #include 
--#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 
+-#endif
+-
+-#ifdef HAVE_STDINT_H
+ #include 
+-#endif
+-
+-#ifdef HAVE_INTTYPES_H
+ #include 
+-#endif
+ 
+ #endif
+ 
diff --git a/libcdr/makefile.mk b/libcdr/makefile.mk
index 18e73ed..30ffd2f 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
+INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/lcms2
+.ENDIF
 
-TARFILE_NAME=libcdr-0.0.3
-TARFILE_MD5=e5f1ef00a113d2edfd88af616934f293
+TARFILE_NAME=libcdr-0.0.4
+TARFILE_MD5=b99553516040a6f9d5885db56e8ca79f
 
 PATCH_FILES=\
-$(TARFILE_NAME).patch \
-$(TARFILE_NAME)-warning.patch
+$(TARFILE_NAME).patch
 
 BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
 BUILD_DIR=src$/lib
diff --git a/ooo.lst.in b/ooo.lst.in
index 81ce0a2..a57cc20 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
-e5f1ef00a113d2edfd88af616934f293-libcdr-0.0.3.tar.bz2
+b99553516040a6f9d5885db56e8ca79f-libcdr-0.0.4.tar.bz2
 327348d67c979c88c2dec59a23a17d85-lcms2-2.3.tar.gz
 @GOOGLE_DOCS_EXTENSION_PACK@
 @FREETYPE_TARBALL@
___
Libreoffice-commi

[Libreoffice-commits] .: libcdr/libcdr-0.0.3.patch libcdr/libcdr-0.0.3-warning.patch libcdr/libcdr-0.0.4.patch libcdr/makefile.mk

[Fridrich Strba]

 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 +++---
 4 files changed, 72 insertions(+), 31 deletions(-)

New commits:
commit a5f27616ed0ce486558e9a281568c65fda7afeb2
Author: Fridrich Å trba 
Date:   Fri Mar 9 14:31:00 2012 +0100

Revert "Upload new libcdr-0.0.4 release"

This reverts commit 4147de18731c7637ab5654797c21b39069695ff5.

diff --git a/libcdr/libcdr-0.0.3-warning.patch 
b/libcdr/libcdr-0.0.3-warning.patch
new file mode 100644
index 000..b98459c
--- /dev/null
+++ b/libcdr/libcdr-0.0.3-warning.patch
@@ -0,0 +1,31 @@
+--- 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
new file mode 100644
index 000..53bc613
--- /dev/null
+++ b/libcdr/libcdr-0.0.3.patch
@@ -0,0 +1,34 @@
+--- 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 
+-#endif
+-
+-#ifdef HAVE_STDINT_H
+ #include 
+-#endif
+-
+-#ifdef HAVE_INTTYPES_H
+ #include 
+-#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
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 
--#endif
--
--#ifdef HAVE_STDINT_H
- #include 
--#endif
--
--#ifdef HAVE_INTTYPES_H
- #include 
--#endif
- 
- #endif
- 
diff --git a/libcdr/makefile.mk b/libcdr/makefile.mk
index b671288..18e73ed 100644
--- a/libcdr/makefile.mk
+++ b/libcdr/makefile.mk
@@ -27,8 +27,8 @@
 
 PRJ=.
 
-PRJNAME=cdr
-TARGET=cdr
+PRJNAME=visio
+TARGET=visio
 
 # --- Settings -
 
@@ -41,7 +41,7 @@ TARGET=cdr
 @echo "Using system libcdr..."
 .ENDIF
 
-# libcdr depends on the libwpd, libwpg and lcms2
+# libcdr depends on the libwpd and libwpg
 .IF "$(SYSTEM_LIBWPD)" == "YES"
 INCPRE+=$(WPD_CFLAGS)
 .ELSE
@@ -53,17 +53,13 @@ INCPRE+=$(WPG_CFLAGS)
 .ELSE
 INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/libwpg
 .ENDIF
-.IF "$(SYSTEM_LCMS2)" == "YES"
-INCPRE+=$(LCMS2_CFLAGS)
-.ELSE
-INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/lcms2
-.ENDIF
 
-TARFILE_NAME=libcdr-0.0.4
-TARFILE_MD5=6b39b6b799b0fde2b6045a9acede6d0a
+TARFILE_NAME=libcdr-0.0.3
+TARFILE_MD5=e5f1ef00a113d2edfd88af616934f293
 
 PATCH_FILES=\
-$(TARFILE_NAME).patch
+$(TARFILE_NAME).patch \
+$(TARFILE_NAME)-warning.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] .: libcdr/makefile.mk

[Fridrich Strba]

 libcdr/makefile.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 055f8eaf1276c585b06ca01c28a6fe4aee900a31
Author: Fridrich Å trba 
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] .: 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

[Fridrich Strba]

 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 
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 
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 
--#endif
--
--#ifdef HAVE_STDINT_H
- #include 
--#endif
--
--#ifdef HAVE_INTTYPES_H
- #include 
--#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 
+-#endif
+-
+-#ifdef HAVE_STDINT_H
+ #include 
+-#endif
+-
+-#ifdef HAVE_INTTYPES_H
+ #include 
+-#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
+INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/lcms2
+.ENDIF
 
-TARFILE_NAME=libcdr-0.0.3
-T

[Libreoffice-commits] .: writerperfect/source

[Fridrich Strba]

 writerperfect/source/filter/OdgGenerator.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 3daa764ee4ef8dc81d82507a204e1ac6be2a93c8
Author: Fridrich Å trba 
Date:   Fri Mar 9 13:18:12 2012 +0100

Use information about position and offsets of the bitmap fill

diff --git a/writerperfect/source/filter/OdgGenerator.cxx 
b/writerperfect/source/filter/OdgGenerator.cxx
index 8115f05..dc257a3 100644
--- a/writerperfect/source/filter/OdgGenerator.cxx
+++ b/writerperfect/source/filter/OdgGenerator.cxx
@@ -1481,6 +1481,12 @@ void OdgGeneratorPrivate::_writeGraphicsStyle()
 
pStyleGraphicsPropertiesElement->addAttribute("draw:fill-image-height", 
mxStyle["svg:height"]->getStr());
 if (mxStyle["style:repeat"])
 pStyleGraphicsPropertiesElement->addAttribute("style:repeat", 
mxStyle["style:repeat"]->getStr());
+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());
+if (mxStyle["draw:fill-image-ref-point-y"])
+
pStyleGraphicsPropertiesElement->addAttribute("draw:fill-image-ref-point-y", 
mxStyle["draw:fill-image-ref-point"]->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] .: tail_build/prj writerperfect/prj

[Fridrich Strba]

 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 
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] .: libcdr/prj

[Fridrich Strba]

 libcdr/prj/build.lst |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b64b955a38021c70b06c97c9d31b516b5e0fa3a1
Author: Fridrich Å trba 
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] .: writerperfect/Library_cdrimport.mk

[Fridrich Strba]

 writerperfect/Library_cdrimport.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 50e02e19efc37ad94646fd4bb7b7eda74bb4952c
Author: Fridrich Å trba 
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] .: 2 commits - scp2/source writerperfect/source

[Fridrich Strba]

 scp2/source/ooo/file_library_ooo.scp |   23 +++
 scp2/source/ooo/mingw_dlls.scp   |4 
 writerperfect/source/filter/OdgGenerator.cxx |  179 +--
 3 files changed, 172 insertions(+), 34 deletions(-)

New commits:
commit 7ee86ca95f9b9fd788b808e5fd72f00ec4d4700a
Author: Fridrich Å trba 
Date:   Thu Mar 8 16:43:48 2012 +0100

Cubic and quadratic bezier bounding boxes

diff --git a/writerperfect/source/filter/OdgGenerator.cxx 
b/writerperfect/source/filter/OdgGenerator.cxx
index ef54b93..8115f05 100644
--- a/writerperfect/source/filter/OdgGenerator.cxx
+++ b/writerperfect/source/filter/OdgGenerator.cxx
@@ -46,13 +46,16 @@
 // remove this
 #define MULTIPAGE_WORKAROUND 1
 
+namespace
+{
+
 static inline double getAngle(double bx, double by)
 {
 return fmod(2*M_PI + (by > 0.0 ? 1.0 : -1.0) * acos( bx / sqrt(bx * bx + 
by * by) ), 2*M_PI);
 }
 
-static void getEllipticalArcBBox(double x1, double y1,
- double rx, double ry, double phi, bool 
largeArc, bool sweep, double x2, double y2,
+static void getEllipticalArcBBox(double x0, double y0,
+ double rx, double ry, double phi, bool 
largeArc, bool sweep, double x, double y,
  double &xmin, double &ymin, double &xmax, 
double &ymax)
 {
 phi *= M_PI/180;
@@ -63,16 +66,16 @@ static void getEllipticalArcBBox(double x1, double y1,
 
 if (rx == 0.0 || ry == 0.0)
 {
-xmin = (x1 < x2 ? x1 : x2);
-xmax = (x1 > x2 ? x1 : x2);
-ymin = (y1 < y2 ? y1 : y2);
-ymax = (y1 > y2 ? y1 : y2);
+xmin = (x0 < x ? x0 : x);
+xmax = (x0 > x ? x0 : x);
+ymin = (y0 < y ? y0 : y);
+ymax = (y0 > y ? y0 : y);
 return;
 }
 
 // F.6.5.1
-const double x1prime = cos(phi)*(x1 - x2)/2 + sin(phi)*(y1 - y2)/2;
-const double y1prime = -sin(phi)*(x1 - x2)/2 + cos(phi)*(y1 - y2)/2;
+const double x1prime = cos(phi)*(x0 - x)/2 + sin(phi)*(y0 - y)/2;
+const double y1prime = -sin(phi)*(x0 - x)/2 + cos(phi)*(y0 - y)/2;
 
 // F.6.5.2
 double radicant = (rx*rx*ry*ry - rx*rx*y1prime*y1prime - 
ry*ry*x1prime*x1prime)/(rx*rx*y1prime*y1prime + ry*ry*x1prime*x1prime);
@@ -84,10 +87,10 @@ static void getEllipticalArcBBox(double x1, double y1,
 radicant = y1prime*y1prime + x1prime*x1prime/(ratio*ratio);
 if (radicant < 0.0)
 {
-xmin = (x1 < x2 ? x1 : x2);
-xmax = (x1 > x2 ? x1 : x2);
-ymin = (y1 < y2 ? y1 : y2);
-ymax = (y1 > y2 ? y1 : y2);
+xmin = (x0 < x ? x0 : x);
+xmax = (x0 > x ? x0 : x);
+ymin = (y0 < y ? y0 : y);
+ymax = (y0 > y ? y0 : y);
 return;
 }
 ry=sqrt(radicant);
@@ -102,8 +105,8 @@ static void getEllipticalArcBBox(double x1, double y1,
 }
 
 // F.6.5.3
-double cx = cxprime*cos(phi) - cyprime*sin(phi) + (x1 + x2)/2;
-double cy = cxprime*sin(phi) + cyprime*cos(phi) + (y1 + y2)/2;
+double cx = cxprime*cos(phi) - cyprime*sin(phi) + (x0 + x)/2;
+double cy = cxprime*sin(phi) + cyprime*cos(phi) + (y0 + y)/2;
 
 // now compute bounding box of the whole ellipse
 
@@ -180,8 +183,8 @@ static void getEllipticalArcBBox(double x1, double y1,
 std::swap(ymin,ymax);
 std::swap(tymin,tymax);
 }
-double angle1 = getAngle(x1 - cx, y1 - cy);
-double angle2 = getAngle(x2 - cx, y2 - cy);
+double angle1 = getAngle(x0 - cx, y0 - cy);
+double angle2 = getAngle(x - cx, y - cy);
 
 // for sweep == 0 it is normal to have delta theta < 0
 // but we don't care about the rotation direction for bounding box
@@ -201,18 +204,121 @@ static void getEllipticalArcBBox(double x1, double y1,
 
 // Check txmin
 if ((!otherArc && (angle1 > txmin || angle2 < txmin)) || (otherArc && 
!(angle1 > txmin || angle2 < txmin)))
-xmin = x1 < x2 ? x1 : x2;
+xmin = x0 < x ? x0 : x;
 // Check txmax
 if ((!otherArc && (angle1 > txmax || angle2 < txmax)) || (otherArc && 
!(angle1 > txmax || angle2 < txmax)))
-xmax = x1 > x2 ? x1 : x2;
+xmax = x0 > x ? x0 : x;
 // Check tymin
 if ((!otherArc && (angle1 > tymin || angle2 < tymin)) || (otherArc && 
!(angle1 > tymin || angle2 < tymin)))
-ymin = y1 < y2 ? y1 : y2;
+ymin = y0 < y ? y0 : y;
 // Check tymax
 if ((!otherArc && (angle1 > tymax || angle2 < tymax)) || (otherArc && 
!(angle1 > tymax || angle2 < tymax)))
-ymax = y1 > y2 ? y1 : y2;
+ymax = y0 > y ? y0 : y;
+}
+
+static inline double quadraticExtreme(double t, double a, double b, double c)
+{
+return (1.0-t)*(1.0-t)*a + 2.0*(1.0-t)*t*b + t*t*c;
+}
+
+static inline double quadraticDerivative(double a, double b, double c)
+{
+double denominator = a - 2.0*b + c;
+if (fabs(denominator) != 0.0)
+return (a - b)/denominator;
+return -1.0;
 }
 
+static void getQuadraticBezie

[Libreoffice-commits] .: config_host.mk.in

[Fridrich Strba]

 config_host.mk.in |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 6b84f0d0c408cbe8cac1509b5d9807ccc9634186
Author: Fridrich Å trba 
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] .: writerperfect/source

[Fridrich Strba]

 writerperfect/source/filter/OdgGenerator.cxx |   48 +++
 1 file changed, 48 insertions(+)

New commits:
commit 6c2581db2d2d03e8b12e5adacdf9ca4394ec9cc5
Author: Fridrich Å trba 
Date:   Fri Mar 2 18:48:04 2012 +0100

Initial support of bitmap fills in OdgGenerator

diff --git a/writerperfect/source/filter/OdgGenerator.cxx 
b/writerperfect/source/filter/OdgGenerator.cxx
index 52f1329..ef54b93 100644
--- a/writerperfect/source/filter/OdgGenerator.cxx
+++ b/writerperfect/source/filter/OdgGenerator.cxx
@@ -248,6 +248,7 @@ public:
 // graphics styles
 std::vector mGraphicsStrokeDashStyles;
 std::vector mGraphicsGradientStyles;
+std::vector mGraphicsBitmapStyles;
 std::vector mGraphicsMarkerStyles;
 std::vector mGraphicsAutomaticStyles;
 
@@ -270,6 +271,7 @@ public:
 ::WPXPropertyListVector mxGradient;
 ::WPXPropertyListVector mxMarker;
 int miGradientIndex;
+int miBitmapIndex;
 int miStartMarkerIndex;
 int miEndMarkerIndex;
 int miDashIndex;
@@ -289,6 +291,7 @@ OdgGeneratorPrivate::OdgGeneratorPrivate(OdfDocumentHandler 
*pHandler, const Odf
 mBodyElements(),
 mGraphicsStrokeDashStyles(),
 mGraphicsGradientStyles(),
+mGraphicsBitmapStyles(),
 mGraphicsAutomaticStyles(),
 mPageAutomaticStyles(),
 mPageMasterStyles(),
@@ -299,6 +302,7 @@ OdgGeneratorPrivate::OdgGeneratorPrivate(OdfDocumentHandler 
*pHandler, const Odf
 mxStyle(), mxGradient(),
 mxMarker(),
 miGradientIndex(1),
+miBitmapIndex(1),
 miStartMarkerIndex(1),
 miEndMarkerIndex(1),
 miDashIndex(1),
@@ -342,6 +346,12 @@ OdgGeneratorPrivate::~OdgGeneratorPrivate()
 delete((*iterGraphicsGradientStyles));
 }
 
+for (std::vector::iterator iterGraphicsBitmapStyles = 
mGraphicsBitmapStyles.begin();
+iterGraphicsBitmapStyles != mGraphicsBitmapStyles.end(); 
++iterGraphicsBitmapStyles)
+{
+delete((*iterGraphicsBitmapStyles));
+}
+
 for (std::vector::iterator iterGraphicsMarkerStyles = 
mGraphicsMarkerStyles.begin();
 iterGraphicsMarkerStyles != mGraphicsMarkerStyles.end(); 
++iterGraphicsMarkerStyles)
 {
@@ -453,6 +463,12 @@ OdgGenerator::~OdgGenerator()
 (*iterGraphicsGradientStyles)->write(mpImpl->mpHandler);
 }
 
+for (std::vector::const_iterator 
iterGraphicsBitmapStyles = mpImpl->mGraphicsBitmapStyles.begin();
+iterGraphicsBitmapStyles != 
mpImpl->mGraphicsBitmapStyles.end(); ++iterGraphicsBitmapStyles)
+{
+(*iterGraphicsBitmapStyles)->write(mpImpl->mpHandler);
+}
+
 for (std::vector::const_iterator 
iterGraphicsMarkerStyles = mpImpl->mGraphicsMarkerStyles.begin();
 iterGraphicsMarkerStyles != 
mpImpl->mGraphicsMarkerStyles.end(); ++iterGraphicsMarkerStyles)
 {
@@ -1234,6 +1250,20 @@ void OdgGeneratorPrivate::_writeGraphicsStyle()
 delete pDrawOpacityElement;
 }
 
+if(mxStyle["draw:fill"] && mxStyle["draw:fill"]->getStr() == "bitmap" &&
+mxStyle["draw:fill-image"] && mxStyle["libwpg:mime-type"])
+{
+TagOpenElement *pDrawBitmapElement = new 
TagOpenElement("draw:fill-image");
+WPXString sValue;
+sValue.sprintf("Bitmap_%i", miBitmapIndex++);
+pDrawBitmapElement->addAttribute("draw:name", sValue);
+mGraphicsBitmapStyles.push_back(pDrawBitmapElement);
+mGraphicsBitmapStyles.push_back(new 
TagOpenElement("office:binary-data"));
+mGraphicsBitmapStyles.push_back(new 
CharDataElement(mxStyle["draw:fill-image"]->getStr()));
+mGraphicsBitmapStyles.push_back(new 
TagCloseElement("office:binary-data"));
+mGraphicsBitmapStyles.push_back(new 
TagCloseElement("draw:fill-image"));
+}
+
 TagOpenElement *pStyleStyleElement = new TagOpenElement("style:style");
 WPXString sValue;
 sValue.sprintf("gr%i",  miGraphicsStyleIndex);
@@ -1327,6 +1357,24 @@ void OdgGeneratorPrivate::_writeGraphicsStyle()
 }
 }
 
+if(mxStyle["draw:fill"] && mxStyle["draw:fill"]->getStr() == "bitmap")
+{
+if (mxStyle["draw:fill-image"] && mxStyle["libwpg:mime-type"])
+{
+pStyleGraphicsPropertiesElement->addAttribute("draw:fill", 
"bitmap");
+sValue.sprintf("Bitmap_%i", miBitmapIndex-1);
+
pStyleGraphicsPropertiesElement->addAttribute("draw:fill-image-name", sValue);
+if (mxStyle["svg:width"])
+
pStyleGraphicsPropertiesElement->addAttribute("draw:fill-image-width", 
mxStyle["svg:width"]->getStr());
+if (mxStyle["svg:height"])
+
pStyleGraphicsPropertiesElement->addAttribute("draw:fill-image-height", 
mxStyle["svg:height"]->getStr());
+if (mxStyle["style:repeat"])
+pStyleGraphicsPropertiesElement->addAttribute("style:repeat", 
mxStyle["style:repeat"]->getStr());
+}
+else
+pStyleGraphicsPropertiesElement->ad

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - solenv/bin

[Fridrich Strba]

 solenv/bin/modules/installer/windows/msiglobal.pm |   13 +
 1 file changed, 13 insertions(+)

New commits:
commit 62c6863bc037e7ea3f44852c51cf3cafd75cebf1
Author: Fridrich Å trba 
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 
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 

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] .: lcms2/makefile.mk

[Fridrich Strba]

 lcms2/makefile.mk |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 02888164e76fd08a7a6d02e526669f1c4e3a0239
Author: Fridrich Å trba 
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] .: config_host.mk.in configure.in lcms2/makefile.mk lcms2/prj Makefile ooo.lst.in RepositoryExternal.mk

[Fridrich Strba]

 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 
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
+# 
+# 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
+
+CONFIGURE_ACTI

[Libreoffice-commits] .: libcdr/libcdr-0.0.3.patch libcdr/libcdr-0.0.3-warning.patch libcdr/makefile.mk

[Fridrich Strba]

 libcdr/libcdr-0.0.3-warning.patch |   31 +++
 libcdr/libcdr-0.0.3.patch |4 ++--
 libcdr/makefile.mk|3 ++-
 3 files changed, 35 insertions(+), 3 deletions(-)

New commits:
commit 2fefaa2852da33e4d4cf33628b76bbe302ecbfdf
Author: Fridrich Å trba 
Date:   Thu Feb 23 13:51:54 2012 +0100

And silence warnings in libcdr too

diff --git a/libcdr/libcdr-0.0.3-warning.patch 
b/libcdr/libcdr-0.0.3-warning.patch
new file mode 100644
index 000..b98459c
--- /dev/null
+++ b/libcdr/libcdr-0.0.3-warning.patch
@@ -0,0 +1,31 @@
+--- 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
index 3eda64b..53bc613 100644
--- a/libcdr/libcdr-0.0.3.patch
+++ b/libcdr/libcdr-0.0.3.patch
@@ -29,6 +29,6 @@
 +.ENDIF
 +
  SLOFILES= \
- $(SLO)$/CDRDocument.obj \
-   $(SLO)$/CDRInternalStream.obj \
+ $(SLO)$/CDRCollector.obj \
+ $(SLO)$/CDRDocument.obj \
 
diff --git a/libcdr/makefile.mk b/libcdr/makefile.mk
index 74a9f8d..18e73ed 100644
--- a/libcdr/makefile.mk
+++ b/libcdr/makefile.mk
@@ -58,7 +58,8 @@ TARFILE_NAME=libcdr-0.0.3
 TARFILE_MD5=e5f1ef00a113d2edfd88af616934f293
 
 PATCH_FILES=\
-libcdr-0.0.3.patch
+$(TARFILE_NAME).patch \
+$(TARFILE_NAME)-warning.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] .: libcdr/libcdr-0.0.2.patch libcdr/libcdr-0.0.3.patch libcdr/libcdr-msvc.patch libcdr/makefile.mk libcdr/prj ooo.lst.in

[Fridrich Strba]

 libcdr/libcdr-0.0.2.patch |   34 
 libcdr/libcdr-0.0.3.patch |   34 
 libcdr/libcdr-msvc.patch  |   64 --
 libcdr/makefile.mk|7 ++---
 libcdr/prj/d.lst  |1 
 ooo.lst.in|2 -
 6 files changed, 39 insertions(+), 103 deletions(-)

New commits:
commit ada908ab14b10fd15a0e172809546c5fffc7d952
Author: Fridrich Å trba 
Date:   Thu Feb 23 13:33:49 2012 +0100

New release of libcdr 0.0.3, the best FOSS CDR converter ever

diff --git a/libcdr/libcdr-0.0.2.patch b/libcdr/libcdr-0.0.2.patch
deleted file mode 100644
index 7760ddf..000
--- a/libcdr/libcdr-0.0.2.patch
+++ /dev/null
@@ -1,34 +0,0 @@
 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 
--#endif
--
--#ifdef HAVE_STDINT_H
- #include 
--#endif
--
--#ifdef HAVE_INTTYPES_H
- #include 
--#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/libcdr-0.0.3.patch b/libcdr/libcdr-0.0.3.patch
new file mode 100644
index 000..3eda64b
--- /dev/null
+++ b/libcdr/libcdr-0.0.3.patch
@@ -0,0 +1,34 @@
+--- 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 
+-#endif
+-
+-#ifdef HAVE_STDINT_H
+ #include 
+-#endif
+-
+-#ifdef HAVE_INTTYPES_H
+ #include 
+-#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)$/CDRDocument.obj \
+   $(SLO)$/CDRInternalStream.obj \
+
diff --git a/libcdr/libcdr-msvc.patch b/libcdr/libcdr-msvc.patch
deleted file mode 100644
index d5419e4..000
--- a/libcdr/libcdr-msvc.patch
+++ /dev/null
@@ -1,64 +0,0 @@
 misc/libcdr-0.0.2/src/lib/CDRCollector.cpp 2012-02-10 13:53:41.35104 
+
-+++ misc/build/libcdr-0.0.2/src/lib/CDRCollector.cpp   2012-02-10 
14:07:38.966966400 +
-@@ -35,6 +35,13 @@
- #define M_PI 3.14159265358979323846
- #endif
- 
-+//http://msdn.microsoft.com/en-us/library/7wsh95e5%28VS.80%29.aspx
-+//msvc 2005 doesn't have round
-+inline double myround( double d )
-+{
-+return floor( d + 0.5 );
-+}
-+
- libcdr::CDRCollector::CDRCollector(libwpg::WPGPaintInterface *painter) :
-   m_painter(painter),
-   m_isPageProperties(false),
-@@ -354,9 +361,9 @@
-   satGreen = 0.0;
-   satBlue = (double)(360 - hue) / 60.0;
- }
--red = (unsigned char)round(255*(1 - saturation + saturation * (satRed > 1 
? 1 : satRed)) * brightness);
--green = (unsigned char)round(255*(1 - saturation + saturation * (satGreen 
> 1 ? 1 : satGreen)) * brightness);
--blue = (unsigned char)round(255*(1 - saturation + saturation * (satBlue > 
1 ? 1 : satBlue)) * brightness);
-+red = (unsigned char)myround(255*(1 - saturation + saturation * (satRed > 
1 ? 1 : satRed)) * brightness);
-+green = (unsigned char)myround(255*(1 - saturation + saturation * 
(satGreen > 1 ? 1 : satGreen)) * brightness);
-+blue = (unsigned char)myround(255*(1 - saturation + saturation * (satBlue 
> 1 ? 1 : satBlue)) * brightness);
-   }
-   else if (colorModel == 0x07) // HLS
-   {
-@@ -394,15 +401,15 @@
- 
- if (lightness < 0.5)
- {
--  red = (unsigned char)round(255.0*lightness*tmpRed);
--  green = (unsigned char)round(255.0*lightness*tmpGreen);
--  blue = (unsigned char)round(255.0*lightness*tmpBlue);
-+  red = (unsigned char)myround(255.0*lightness*tmpRed);
-+  green = (unsigned char)myround(255.0*lightness*tmpGreen);
-+  blue = (unsigned char)myround(255.0*lightness*tmpBlue);
- }
- else
- {
--  red = (unsigned char)round(255*((1 - lightness) * tmpRed + 2 * 
lightness - 1));
--  green = (unsigned char)round(255*((1 - lightness) * tmpGreen + 2 * 
lightness - 1));
--  blue = (unsigned char)round(255*((1 - lightness) * tmpBlue + 2 * 
lightness - 1));
-+  red = (unsigned char)myround(255*((1 - lightness) * tmpRed + 2 * 
lightness - 1));
-+  green = (unsigned char)myround(255*((1 - lightness) * tmpGreen + 2 * 
lightness - 1));
-+  blue = (unsigned char)myround(255*((1 - lightness) * tmpBlue + 2 * 
lightness - 1));
- }
-   }
-   else if (colorModel == 0x09) // Grayscale
 misc/libcdr-0.0.2/src/lib/CDRParser.cpp2012-02-10 13:53:41.411126400 
+
-+++ misc/build/libcdr-0.0.2/src/lib/CDRP

[Libreoffice-commits] .: scp2/source setup_native/source

[Fridrich Strba]

 scp2/source/ooo/makefile.mk   |1 
 scp2/source/ooo/stdlib.scp|   59 ++
 scp2/source/ooo/ure.scp   |   30 -
 setup_native/source/packinfo/packinfo_ure.txt |   12 +
 4 files changed, 72 insertions(+), 30 deletions(-)

New commits:
commit 91f255df4e526bc9045793b52005339eb5aba39f
Author: Fridrich Å trba 
Date:   Wed Feb 22 10:12:42 2012 +0100

Separate stdlib package (work in progress)

diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index 244cf55..08ba316 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -328,6 +328,7 @@ PARFILES=  \
 profile_ooo.par\
 profileitem_ooo.par\
 ure.par\
+stdlib.par \
 ure_into_ooo.par   \
 ure_standalone.par \
 common_brand.par   \
diff --git a/scp2/source/ooo/stdlib.scp b/scp2/source/ooo/stdlib.scp
new file mode 100644
index 000..700b35b
--- /dev/null
+++ b/scp2/source/ooo/stdlib.scp
@@ -0,0 +1,59 @@
+/*
+ *
+ * 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
+ * 
+ * for a copy of the LGPLv3 License.
+ *
+ /
+
+#include "macros.inc"
+
+#if defined _gcc3 && !(defined FREEBSD || defined NETBSD || defined OPENBSD \
+   || defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT) || 
defined(DRAGONFLY))
+File gid_File_Dl_GccS
+LIB_FILE_BODY;
+Dir = SCP2_URE_DL_DIR;
+#ifdef AIX
+Name = "libgcc_s.a";
+#else
+Name = SCP2_URE_DL_VER("gcc_s", STRING(SHORTSTDC3));
+#endif
+Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+// CompID = "C601D04B-2194-4F1B-BB09-7B4930D6E1DB";
+End
+#endif
+
+#if defined _gcc3 && !(defined FREEBSD || defined NETBSD || defined OPENBSD \
+   || defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT) || 
defined(DRAGONFLY))
+File gid_File_Dl_Stdcpp
+Dir = SCP2_URE_DL_DIR;
+LIB_FILE_BODY;
+#ifdef AIX
+Name = "libstdc++.a";
+#else
+Name = SCP2_URE_DL_VER("stdc++", STRING(SHORTSTDCPP3));
+#endif
+Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+// CompID = "89740D6A-38EE-41AF-A6A2-A8F7ABBE4996";
+End
+#endif
+
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 3667ed4..6993a79 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -880,36 +880,6 @@ File gid_File_Dl_Stlport
 End
 #endif
 
-#if defined _gcc3 && !(defined FREEBSD || defined NETBSD || defined OPENBSD \
-   || defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT) || 
defined(DRAGONFLY))
-File gid_File_Dl_GccS
-LIB_FILE_BODY;
-Dir = SCP2_URE_DL_DIR;
-#ifdef AIX
-Name = "libgcc_s.a";
-#else
-Name = SCP2_URE_DL_VER("gcc_s", STRING(SHORTSTDC3));
-#endif
-Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-// CompID = "C601D04B-2194-4F1B-BB09-7B4930D6E1DB";
-End
-#endif
-
-#if defined _gcc3 && !(defined FREEBSD || defined NETBSD || defined OPENBSD \
-   || defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT) || 
defined(DRAGONFLY))
-File gid_File_Dl_Stdcpp
-Dir = SCP2_URE_DL_DIR;
-LIB_FILE_BODY;
-#ifdef AIX
-Name = "libstdc++.a";
-#else
-Name = SCP2_URE_DL_VER("stdc++", STRING(SHORTSTDCPP3));
-#endif
-Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-// CompID = "89740D6A-38EE-41AF-A6A2-A8F7ABBE4996";
-End
-#endif
-
 #if defined(WNT) && defined( _gcc3 )
 
 #if defined(MINGW_GCCDLL)
diff --git a/setup_native/source/packinfo/packinfo_ure.txt 
b/setup_native/source/packinfo/packinfo_ure.txt
index a6c3435..a597d5f 100755
--- a/setup_native/source/packinfo/packinfo_ure.txt
+++ b/setup_native/source/packinfo/packinfo_ure.txt
@@ -50,3 +50,15 @@ description = "UNO Runtime Environment"
 destpath = "/opt"
 packageversion = "%UREPACKAGEVERSION"
 End
+
+Start
+module = "gid_Module_Optional_Stdlib"
+solarispackagename = "%

[Libreoffice-commits] .: distro-configs/LibreOfficeLinux.conf distro-configs/OxygenOfficeLinux.conf external/gcc3_specific

[Fridrich Strba]

 distro-configs/LibreOfficeLinux.conf  |1 +
 distro-configs/OxygenOfficeLinux.conf |1 +
 external/gcc3_specific/makefile.mk|2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 33eefb2c5e15b6eb69629632cf5dc7c2f3452df8
Author: Fridrich Å trba 
Date:   Wed Feb 22 09:25:20 2012 +0100

Bundle again C++ stdlibs with generic Linux build

diff --git a/distro-configs/LibreOfficeLinux.conf 
b/distro-configs/LibreOfficeLinux.conf
index 8f0b415..4b77cba 100644
--- a/distro-configs/LibreOfficeLinux.conf
+++ b/distro-configs/LibreOfficeLinux.conf
@@ -2,6 +2,7 @@
 --with-system-dicts
 --without-unix-wrapper
 --without-system-zlib
+--without-system-stdlibs
 --without-system-poppler
 --without-system-openssl
 --without-system-mozilla
diff --git a/distro-configs/OxygenOfficeLinux.conf 
b/distro-configs/OxygenOfficeLinux.conf
index b937f05..d3d5496 100644
--- a/distro-configs/OxygenOfficeLinux.conf
+++ b/distro-configs/OxygenOfficeLinux.conf
@@ -50,6 +50,7 @@
 --with-jdk-home=/usr/local/jdk1.6.0_23/
 --without-system-dicts
 --without-system-zlib
+--without-system-stdlibs
 --without-system-poppler
 --without-system-openssl
 --without-system-mozilla
diff --git a/external/gcc3_specific/makefile.mk 
b/external/gcc3_specific/makefile.mk
index b6211c4..501acfa 100644
--- a/external/gcc3_specific/makefile.mk
+++ b/external/gcc3_specific/makefile.mk
@@ -6,7 +6,7 @@ TARGET=gcc3_specific
 .INCLUDE: settings.mk
 # --
 
-.IF "$(COMID)"=="gcc3"
+.IF "$(SYSTEM_STDLIBS)" != "YES" && "$(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] .: cairo/cairo cairo/cairo-1.10.2-oldfontconfig.patch

[Fridrich Strba]

 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 
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] .: Branch 'libreoffice-3-5' - configure.in

[Fridrich Strba]

 configure.in |   10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

New commits:
commit bb0f6b0c7c745264da38b91e0eca39a6f5ad934d
Author: Stephan Bergmann 
Date:   Mon Feb 20 14:30:13 2012 +0100

Improve check for broken -fthreadsafe-statics

Signed-off-by: Fridrich Å trba 

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] .: libvisio/libvisio-0.0.15-makefile_mk.patch libvisio/makefile.mk libvisio/prj

[Fridrich Strba]

 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 
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] .: libvisio/libvisio-0.0.14.patch libvisio/libvisio-0.0.15.patch libvisio/makefile.mk ooo.lst.in

[Fridrich Strba]

 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 
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 
--#endif
--
--#ifdef HAVE_STDINT_H
- #include 
--#endif
--
--#ifdef HAVE_INTTYPES_H
- #include 
--#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 
+-#endif
+-
+-#ifdef HAVE_STDINT_H
+ #include 
+-#endif
+-
+-#ifdef HAVE_INTTYPES_H
+ #include 
+-#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] .: Branch 'libreoffice-3-4' - sw/source

[Fridrich Strba]

 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 
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 

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] .: Branch 'libreoffice-3-5' - sw/source

[Fridrich Strba]

 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 
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 

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] .: external/gcc3_specific

[Fridrich Strba]

 external/gcc3_specific/makefile.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9a51a7ae7153fee17013867bd7bbaacedee1980a
Author: Fridrich Å trba 
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

[Fridrich Strba]

 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 
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 
--#endif
--
--#ifdef HAVE_STDINT_H
- #include 
--#endif
--
--#ifdef HAVE_INTTYPES_H
- #include 
--#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 
+-#endif
+-
+-#ifdef HAVE_STDINT_H
+ #include 
+-#endif
+-
+-#ifdef HAVE_INTTYPES_H
+ #include 
+-#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

[Fridrich Strba]

 scp2/source/xsltfilter/module_xsltfilter.scp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fe5640594eea2637b720f7311eed0c4f218a6893
Author: Fridrich Å trba 
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] .: libcdr/libcdr-0.0.0.patch libcdr/libcdr-0.0.1.patch libcdr/makefile.mk ooo.lst.in

[Fridrich Strba]

 libcdr/libcdr-0.0.0.patch |   34 --
 libcdr/libcdr-0.0.1.patch |   34 ++
 libcdr/makefile.mk|6 +++---
 ooo.lst.in|2 +-
 4 files changed, 38 insertions(+), 38 deletions(-)

New commits:
commit 377beefb047e90fdaabb63ca9feb0f8640ec1117
Author: Fridrich Å trba 
Date:   Tue Jan 31 15:23:02 2012 +0100

Uploading libcdr-0.0.1 that makes the converter actually do something

diff --git a/libcdr/libcdr-0.0.0.patch b/libcdr/libcdr-0.0.0.patch
deleted file mode 100644
index 3258740..000
--- a/libcdr/libcdr-0.0.0.patch
+++ /dev/null
@@ -1,34 +0,0 @@
 misc/libcdr-0.0.0/src/lib/libcdr_utils.h
-+++ misc/build/libcdr-0.0.0/src/lib/libcdr_utils.h
-@@ -41,17 +41,8 @@
- 
- #else
- 
--#ifdef HAVE_CONFIG_H
--#include 
--#endif
--
--#ifdef HAVE_STDINT_H
- #include 
--#endif
--
--#ifdef HAVE_INTTYPES_H
- #include 
--#endif
- 
- #endif
- 
 misc/libcdr-0.0.0/src/lib/makefile.mk
-+++ misc/build/libcdr-0.0.0/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.1.patch b/libcdr/libcdr-0.0.1.patch
new file mode 100644
index 000..2f9a6d4
--- /dev/null
+++ b/libcdr/libcdr-0.0.1.patch
@@ -0,0 +1,34 @@
+--- 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 
+-#endif
+-
+-#ifdef HAVE_STDINT_H
+ #include 
+-#endif
+-
+-#ifdef HAVE_INTTYPES_H
+ #include 
+-#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/makefile.mk b/libcdr/makefile.mk
index 8da337f..f94f3d0 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.0
-TARFILE_MD5=cc8eb870d6a324d36575420efd856319
+TARFILE_NAME=libcdr-0.0.1
+TARFILE_MD5=dbf30c0dd92beee07d184738c242f073
 
 PATCH_FILES=\
-libcdr-0.0.0.patch
+libcdr-0.0.1.patch
 
 BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
 BUILD_DIR=src$/lib
diff --git a/ooo.lst.in b/ooo.lst.in
index 3f26b25..3a86f82 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
-cc8eb870d6a324d36575420efd856319-libcdr-0.0.0.tar.bz2
+dbf30c0dd92beee07d184738c242f073-libcdr-0.0.1.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] .: postgresql/makefile.mk

[Fridrich Strba]

 postgresql/makefile.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 165a5bea14f538ea249ec1567d6c4aa08d5bb174
Author: Fridrich Å trba 
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

[Fridrich Strba]

 writerperfect/source/filter/OdgGenerator.cxx |   14 ++
 1 file changed, 14 insertions(+)

New commits:
commit dc6953f932ffbddd5168f039e58075789b91b98b
Author: Fridrich Å trba 
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] .: 2 commits - filter/source lotuswordpro/source writerperfect/source

[Fridrich Strba]

 filter/source/config/cache/typedetection.cxx|4 ++--
 lotuswordpro/source/filter/LotusWordProImportFilter.hxx |4 ++--
 writerperfect/source/wpsimp/MSWorksImportFilter.hxx |4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 0d9aa8cce792d69d5147a2230b61b1cbdc089206
Author: Fridrich Å trba 
Date:   Thu Jan 26 14:30:24 2012 +0100

Sort the catch-all detection at the end

diff --git a/filter/source/config/cache/typedetection.cxx 
b/filter/source/config/cache/typedetection.cxx
index f1a835d..7a5ec96 100644
--- a/filter/source/config/cache/typedetection.cxx
+++ b/filter/source/config/cache/typedetection.cxx
@@ -814,9 +814,9 @@ namespace
 if (rA == rB)
 return false;
 if 
(rA.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.FormatDetector")))
-return true;
-if 
(rB.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.FormatDetector")))
 return false;
+if 
(rB.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.FormatDetector")))
+return true;
 return rA < rB;
 }
 }
commit 1f65dc9ef52436bb34a6fd7ebc16c629fc9ac70c
Author: Fridrich Å trba 
Date:   Thu Jan 26 14:29:10 2012 +0100

Use the right define

diff --git a/lotuswordpro/source/filter/LotusWordProImportFilter.hxx 
b/lotuswordpro/source/filter/LotusWordProImportFilter.hxx
index b0e8806..8fa89b6 100644
--- a/lotuswordpro/source/filter/LotusWordProImportFilter.hxx
+++ b/lotuswordpro/source/filter/LotusWordProImportFilter.hxx
@@ -29,8 +29,8 @@
  * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
  * instead of those above.
  */
-#ifndef _WORDPERFECTIMPORTFILTER_HXX
-#define _WORDPERFECTIMPORTFILTER_HXX
+#ifndef _LOTUSWORDPROIMPORTFILTER_HXX
+#define _LOTUSWORDPROIMPORTFILTER_HXX
 
 #include 
 #include 
diff --git a/writerperfect/source/wpsimp/MSWorksImportFilter.hxx 
b/writerperfect/source/wpsimp/MSWorksImportFilter.hxx
index 4de92f3..b75f669 100644
--- a/writerperfect/source/wpsimp/MSWorksImportFilter.hxx
+++ b/writerperfect/source/wpsimp/MSWorksImportFilter.hxx
@@ -27,8 +27,8 @@
 /* "This product is not manufactured, approved, or supported by
  * Corel Corporation or Corel Corporation Limited."
  */
-#ifndef _WORDPERFECTIMPORTFILTER_HXX
-#define _WORDPERFECTIMPORTFILTER_HXX
+#ifndef _MSWORKSIMPORTFILTER_HXX
+#define _MSWORKSIMPORTFILTER_HXX
 
 #include 
 #include 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 3 commits - writerperfect/source

[Fridrich Strba]

 writerperfect/source/filter/OdtGenerator.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a8afa224362619387cc87928d8a0392396eb8bb2
Author: Fridrich Å trba 
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 
+
 
 #include "xmlstyli.hxx"
 #include 
@@ -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 
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 
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 
 
 #include "xmlstyli.hxx"
 #include 
@@ -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' - extensions/source scp2/source

[Fridrich Strba]

 extensions/source/nsplugin/source/makefile.mk |4 
 scp2/source/ooo/common_brand.scp  |2 +-
 scp2/source/ooo/file_ooo.scp  |3 ---
 3 files changed, 1 insertion(+), 8 deletions(-)

New commits:
commit 04caf572d6847ff1efce2942b1ba5058797aef9c
Author: Fridrich Å trba 
Date:   Wed Jan 25 10:20:07 2012 +0100

Fix building and packaging of the mozilla plugin

signed-off-by: Tomas Chvatal 

diff --git a/extensions/source/nsplugin/source/makefile.mk 
b/extensions/source/nsplugin/source/makefile.mk
index 3d52234..5b74764 100644
--- a/extensions/source/nsplugin/source/makefile.mk
+++ b/extensions/source/nsplugin/source/makefile.mk
@@ -36,8 +36,6 @@ USE_DEFFILE=TRUE
 
 .INCLUDE : settings.mk
 
-.IF "$(WITH_MOZILLA)" != "NO"
-
 .IF "$(SYSTEM_MOZILLA_HEADERS)" == "YES"
 INCPRE+=$(MOZILLA_HEADERS_CFLAGS)
 .ELSE
@@ -160,8 +158,6 @@ DEF2EXPORTFILE=exports.dxp
 DEF2EXPORTFILE=exports_wnt.dxp
 .ENDIF
 
-.ENDIF # $(WITH_MOZILLA) != "NO"
-
 # --- Targets --
 
 .INCLUDE : target.mk
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 6c6fb66..aa8c77a 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -642,7 +642,7 @@ File gid_Brand_File_Bin_Libxml2
 End
 #endif
 
-#if !defined WITHOUT_MOZILLA && defined ENABLE_NSPLUGIN
+#ifdef ENABLE_NSPLUGIN
 File gid_Brand_File_Lib_Npsoplugin
 BIN_FILE_BODY;
 Name = SPECIAL_NAME(npsoplugin);
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 091415b..e7bc85a 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -108,8 +108,6 @@ File gid_File_Basic_Tutorials
 Name = "basicsrvtutorials.zip";
 End
 
-#ifndef WITHOUT_MOZILLA
-
 #ifdef ENABLE_NSPLUGIN
 File gid_File_Exe_Nsplugin
 BIN_FILE_BODY;
@@ -122,7 +120,6 @@ File gid_File_Exe_Nsplugin
   #endif
 End
 #endif
-#endif
 
 #if !defined(WITHOUT_MOZILLA) && defined(UNX) && !defined(QUARTZ)
 
___
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

[Fridrich Strba]

 qadevOOo/Jar_OOoRunner.mk  |1 -
 qadevOOo/Jar_OOoRunnerLight.mk |1 -
 2 files changed, 2 deletions(-)

New commits:
commit 7938b75ab7d8052b66859db05201cafc5175d95e
Author: Fridrich Å trba 
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] .: officecfg/registry

[Fridrich Strba]

 officecfg/registry/data/org/openoffice/VCL.xcu |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 86bf32c487852f4e466b27320e3724266cb53dba
Author: Fridrich Å trba 
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 @@
 Lohit Assamese;Tahoma;Lucidasans;Lucida Sans;Arial Unicode 
MS
   
 
-
+
   
 Lohit Bengali;Vrinda;Lucidasans;Lucida Sans;Andale Sans 
UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU
   
___
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

[Fridrich Strba]

 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 
Date:   Wed Jan 18 13:11:11 2012 +0100

fdo#37740 remove duplicate icons from soffice.bin/soffice.exe

Signed-off-by: Fridrich Å trba 

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 
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git re

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - solenv/bin

[Fridrich Strba]

 solenv/bin/modules/installer/windows/msiglobal.pm |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit a4bd804fd95a4a79ec4ebb64555aade5bea63a14
Author: Fridrich Å trba 
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 

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] .: solenv/bin

[Fridrich Strba]

 solenv/bin/modules/installer/windows/msiglobal.pm |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 490301650899abec73128258569e0dffdc52d7c9
Author: Fridrich Å trba 
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] .: sal/osl

[Fridrich Strba]

 sal/osl/w32/file_dirvol.cxx |   20 
 1 file changed, 20 insertions(+)

New commits:
commit 5a8a1d024bee83eff8d9a85ae6dda6c8823c3f2e
Author: Michael Meeks 
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/gbuild

[Fridrich Strba]

 solenv/gbuild/platform/WNT_INTEL_MSC.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7514488ad4c3e8289aebe3a03bd14c293479627b
Author: Fridrich Å trba 
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] .: solenv/gbuild

[Fridrich Strba]

 solenv/gbuild/platform/WNT_INTEL_MSC.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 29a3d25eb516adf3fbf73520c9196be11f5cb5e3
Author: Matus Kukan 
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] .: 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

[Fridrich Strba]

 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 
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 

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 
--#endif
--
--#ifdef HAVE_STDINT_H
- #include 
--#endif
--
--#ifdef HAVE_INTTYPES_H
- #include 
--#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 
+-#endif
+-
+-#ifdef HAVE_STDINT_H
+ #include 
+-#endif
+-
+-#ifdef HAVE_INTTYPES_H
+ #include 
+-#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 
Date:   Mon Jan 16 17:32:23 2012 +0100

Implementing text rotations

Signed-off-by: Thorsten Behrens 

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(),
+

[Libreoffice-commits] .: libvisio/libvisio-0.0.13.patch libvisio/libvisio-0.0.14.patch libvisio/makefile.mk ooo.lst.in

[Fridrich Strba]

 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 
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 
--#endif
--
--#ifdef HAVE_STDINT_H
- #include 
--#endif
--
--#ifdef HAVE_INTTYPES_H
- #include 
--#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 
+-#endif
+-
+-#ifdef HAVE_STDINT_H
+ #include 
+-#endif
+-
+-#ifdef HAVE_INTTYPES_H
+ #include 
+-#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' - solenv/bin

[Fridrich Strba]

 solenv/bin/modules/installer/windows/msiglobal.pm |   14 +-
 1 file changed, 5 insertions(+), 9 deletions(-)

New commits:
commit ccc8753d7fc573db29159ab21492b8939f0ddab8
Author: Andras Timar 
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 

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] .: Branch 'libreoffice-3-5' - sal/systools

[Fridrich Strba]

 sal/systools/win32/uwinapi/legacy.cpp  |   46 +
 sal/systools/win32/uwinapi/makefile.mk |5 +++
 sal/systools/win32/uwinapi/uwinapi.dxp |   25 +
 3 files changed, 76 insertions(+)

New commits:
commit d823fef9b9f7ad0d0dcd834a3f2c47c3f018f523
Author: Fridrich Å trba 
Date:   Thu Jan 19 02:13:47 2012 -0700

Make older Duden Korrektor work with LO (fdo#37561)

signed-off-by: Michael Meeks 

Signed-off-by: Fridrich Å trba 

diff --git a/sal/systools/win32/uwinapi/legacy.cpp 
b/sal/systools/win32/uwinapi/legacy.cpp
new file mode 100755
index 000..2218d1d
--- /dev/null
+++ b/sal/systools/win32/uwinapi/legacy.cpp
@@ -0,0 +1,46 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * 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. 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.
+ *
+ * The Initial Developer of the Original Code is
+ *   Fridrich Strba  
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#define WIN32_LEAN_AND_MEAN
+#include 
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1400)
+#pragma warning(disable:4273)   // inconsistent dll linkage
+#endif
+
+EXTERN_C DWORD WINAPI GetShortPathNameW(LPCWSTR lpszLongPath,LPWSTR 
lpszShortPath,DWORD cchBuffer)
+{
+typedef DWORD (WINAPI * GetShortPathNameW_t) (LPCWSTR,LPWSTR,DWORD);
+
+GetShortPathNameW_t p_GetShortPathNameW =
+(GetShortPathNameW_t) GetProcAddress (
+GetModuleHandle ("kernel32.dll"), "GetShortPathNameW");
+
+if (p_GetShortPathNameW)
+return p_GetShortPathNameW(lpszLongPath,lpszShortPath,cchBuffer);
+else
+return 0;
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/makefile.mk 
b/sal/systools/win32/uwinapi/makefile.mk
index 0989b61..7b5c93b 100644
--- a/sal/systools/win32/uwinapi/makefile.mk
+++ b/sal/systools/win32/uwinapi/makefile.mk
@@ -48,6 +48,7 @@ CFLAGSCXX+=-Wno-unused-parameter -Wno-return-type
 .ENDIF
 
 SLOFILES=\
+$(SLO)$/legacy.obj\
 $(SLO)$/snprintf.obj\
 $(SLO)$/snwprintf.obj
 
@@ -55,6 +56,10 @@ SHL1TARGET=$(TARGET)
 SHL1IMPLIB=$(SHL1TARGET)
 SHL1DEF=$(MISC)/$(SHL1TARGET).def
 DEF1NAME=$(SHL1TARGET)
+.IF "$(COM)"=="MSC"
+DEF1EXPORTFILE=\
+$(SHL1TARGET).dxp
+.ENDIF
 DEF1DEPN=\
 $(DEF1EXPORTFILE)\
 makefile.mk
diff --git a/sal/systools/win32/uwinapi/uwinapi.dxp 
b/sal/systools/win32/uwinapi/uwinapi.dxp
new file mode 100755
index 000..0eeb2a3
--- /dev/null
+++ b/sal/systools/win32/uwinapi/uwinapi.dxp
@@ -0,0 +1,25 @@
+;
+; 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.
+;
+; The Initial Developer of the Original Code is
+;   Fridrich Strba  
+;
+; Alternatively, the contents of this file may be used under the terms of
+; either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+; the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+; in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+; instead of those above.
+;
+;*
+
+GetShortPathNameW
___
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 basegfx/test

[Fridrich Strba]

 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 
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 

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 100v100-100h100zm0 
0v-

[Libreoffice-commits] .: configure.in scp2/inc scp2/source

[Fridrich Strba]

 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 
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] .: 2 commits - scp2/source

[Fridrich Strba]

 scp2/source/ooo/ure.scp |   28 ++--
 1 file changed, 14 insertions(+), 14 deletions(-)

New commits:
commit 7f1d77d9fecdd710d2b2fd17be91a61665baf846
Author: Fridrich Å trba 
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 
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] .: Branch 'libreoffice-3-5' - extensions/source

[Fridrich Strba]

 extensions/source/nsplugin/source/so_env.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0d995e135d1548b4bed8272340a8f39d2b1f4d69
Author: Bjoern Michaelsen 
Date:   Wed Jan 18 00:49:51 2012 +0100

lp#711673: mozilla-libreoffice mislabeled as OpenOffice.org Plug-in

Signed-off-by: Fridrich Å trba 

diff --git a/extensions/source/nsplugin/source/so_env.cxx 
b/extensions/source/nsplugin/source/so_env.cxx
index 322a2ff..92faaa2 100644
--- a/extensions/source/nsplugin/source/so_env.cxx
+++ b/extensions/source/nsplugin/source/so_env.cxx
@@ -63,7 +63,7 @@
 #include "ns_debug.hxx"
 #include 
 
-#define PLUGIN_NAME "OpenOffice.org"
+#define PLUGIN_NAME "LibreOffice"
 
 // Tranform all strings like %20 in pPath to one char like space
 /*int retoreUTF8(char* pPath)
___
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

[Fridrich Strba]

 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 
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
 POSTVERSIONEXTENSIONU

[Libreoffice-commits] .: Branch 'libreoffice-3-5' -

[Fridrich Strba]

 0 files changed

New commits:
commit 8c0b45513a139657678484b73112dc5eba800dac
Author: Fridrich Å trba 
Date:   Wed Jan 18 09:24:57 2012 +0100

Version 3.5.0.1, tag libreoffice-3.5.0.1 (3.5.0-rc1)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .:

[Fridrich Strba]

 0 files changed

New commits:
commit 65c2974092301ed5e4c893299b29e6d1f3d9160b
Author: Fridrich Å trba 
Date:   Wed Jan 18 09:15:49 2012 +0100

Version 3.5.0.1, tag libreoffice-3.5.0.1 (3.5.0-rc1)
___
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

[Fridrich Strba]

Rebased ref, commits from common ancestor:
commit 8c0b45513a139657678484b73112dc5eba800dac
Author: Fridrich Å trba 
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 
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 

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 ] && n<32; 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), 
"%08"SAL_PRIxUINT32"%08"SAL_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), 
"%08"SAL_PRIxUINT32"%08"SAL_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 
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] Changes to 'refs/tags/libreoffice-3.5.0.1'

[Fridrich Strba]

Tag 'libreoffice-3.5.0.1' created by Fridrich Å trba 
 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] Changes to 'refs/tags/libreoffice-3.5.0.1'

[Fridrich Strba]

Tag 'libreoffice-3.5.0.1' created by Fridrich Å trba 
 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