summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--boost/boost.windows.patch12
-rw-r--r--boost/makefile.mk2
-rw-r--r--framework/source/services/autorecovery.cxx5
-rw-r--r--instsetoo_native/util/openoffice.lst16
-rw-r--r--mdds/makefile.mk2
-rw-r--r--mdds/mdds_0.5.3.patch54
-rw-r--r--sc/qa/unit/ucalc.cxx7
-rw-r--r--sc/source/core/data/dpobject.cxx7
-rw-r--r--sdext/source/presenter/registry/schema/org/openoffice/Office/extension/PresenterScreen.xcs16
-rw-r--r--sfx2/source/config/evntconf.cxx2
-rw-r--r--solenv/inc/minor.mk4
-rw-r--r--svtools/source/filter.vcl/wmf/enhwmf.cxx2
12 files changed, 102 insertions, 27 deletions
diff --git a/boost/boost.windows.patch b/boost/boost.windows.patch
new file mode 100644
index 000000000000..c0054c8de244
--- /dev/null
+++ b/boost/boost.windows.patch
@@ -0,0 +1,12 @@
+--- misc/build/boost_1_44_0/boost/pool/detail/mutex.hpp
++++ misc/build/boost_1_44_0/boost/pool/detail/mutex.hpp
+@@ -46,7 +46,9 @@
+
+ #ifndef BOOST_NO_MT
+ # ifdef BOOST_WINDOWS
++# define NOMINMAX
+ # include <windows.h>
++# undef NOMINMAX
+ # endif
+ # if defined(_POSIX_THREADS) || defined(BOOST_HAS_PTHREADS)
+ # include <pthread.h>
diff --git a/boost/makefile.mk b/boost/makefile.mk
index b1f054b64e67..b9feb7b9540a 100644
--- a/boost/makefile.mk
+++ b/boost/makefile.mk
@@ -60,6 +60,8 @@ PATCH_FILES+=unordered_map-doesnt-support-cp-ctor.patch
#http://gcc.gnu.org/bugzilla/show_bug.cgi?id=47679
PATCH_FILES+=boost.gcc47679.patch
+PATCH_FILES+=boost.windows.patch
+
ADDITIONAL_FILES= \
libs/thread/src/win32/makefile.mk
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index e61ae11c6bd6..a6e1a7af40bc 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -2639,7 +2639,10 @@ void AutoRecovery::implts_openOneDoc(const ::rtl::OUString& sURL
// put the filter name into the descriptor - we're not going to involve any type detection, so
// the document might be lost without the FilterName property
- lDescriptor[ ::comphelper::MediaDescriptor::PROP_FILTERNAME() ] <<= rInfo.RealFilter;
+ if ( (rInfo.DocumentState & AutoRecovery::E_TRY_LOAD_ORIGINAL) == AutoRecovery::E_TRY_LOAD_ORIGINAL)
+ lDescriptor[ ::comphelper::MediaDescriptor::PROP_FILTERNAME() ] <<= rInfo.RealFilter;
+ else
+ lDescriptor[ ::comphelper::MediaDescriptor::PROP_FILTERNAME() ] <<= rInfo.DefaultFilter;
if ( sURL == rInfo.FactoryURL )
{
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index 20d76c558939..8ca1ebc614a2 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -57,7 +57,7 @@ LibreOffice
PRODUCTVERSION 3.4
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc2
+ SHORT_PRODUCTEXTENSION rc3
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.4
@@ -125,7 +125,7 @@ LibreOffice_wJRE
PRODUCTVERSION 3.4
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc2
+ SHORT_PRODUCTEXTENSION rc3
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.4
@@ -189,7 +189,7 @@ LibreOffice_Dev
PRODUCTVERSION 3.4
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc2
+ SHORT_PRODUCTEXTENSION rc3
BASISROOTNAME LibO-dev
UNIXBASISROOTNAME lo-dev
POSTVERSIONEXTENSION
@@ -266,7 +266,7 @@ URE
PRODUCTEXTENSION
BRANDPACKAGEVERSION 3.4
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc2
+ SHORT_PRODUCTEXTENSION rc3
LICENSENAME LGPL
SETSTATICPATH 1
NOVERSIONINDIRNAME 1
@@ -305,7 +305,7 @@ LibreOffice_SDK
PRODUCTVERSION 3.4
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc2
+ SHORT_PRODUCTEXTENSION rc3
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 3.4
@@ -351,7 +351,7 @@ LibreOffice_Dev_SDK
PRODUCTVERSION 3.4
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc2
+ SHORT_PRODUCTEXTENSION rc3
BASISROOTNAME LibO-dev
UNIXBASISROOTNAME lo-dev
POSTVERSIONEXTENSION SDK
@@ -403,7 +403,7 @@ OxygenOffice
PRODUCTVERSION 3.4
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc2
+ SHORT_PRODUCTEXTENSION rc3
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.4
@@ -473,7 +473,7 @@ OxygenOffice_wJRE
PRODUCTVERSION 3.4
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc2
+ SHORT_PRODUCTEXTENSION rc3
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.4
diff --git a/mdds/makefile.mk b/mdds/makefile.mk
index fc0bc753e188..b759886d66bc 100644
--- a/mdds/makefile.mk
+++ b/mdds/makefile.mk
@@ -38,7 +38,7 @@ TARGET=mdds
TARFILE_NAME=mdds_0.5.3
TARFILE_MD5=0ff7d225d087793c8c2c680d77aac3e7
-PATCH_FILES=
+PATCH_FILES=mdds_0.5.3.patch
CONFIGURE_DIR=
CONFIGURE_ACTION=
diff --git a/mdds/mdds_0.5.3.patch b/mdds/mdds_0.5.3.patch
new file mode 100644
index 000000000000..7903431609fd
--- /dev/null
+++ b/mdds/mdds_0.5.3.patch
@@ -0,0 +1,54 @@
+--- misc/mdds_0.5.3/include/mdds/mixed_type_matrix_def.inl 2011-07-13 13:26:27.000000000 -0600
++++ misc/build/mdds_0.5.3/include/mdds/mixed_type_matrix_def.inl 2011-07-20 02:02:21.164198900 -0600
+@@ -216,8 +216,8 @@
+ // assignment to self.
+ return;
+
+- size_t row_count = ::std::min(mp_storage->rows(), r.mp_storage->rows());
+- size_t col_count = ::std::min(mp_storage->cols(), r.mp_storage->cols());
++ size_t row_count = (::std::min)(mp_storage->rows(), r.mp_storage->rows());
++ size_t col_count = (::std::min)(mp_storage->cols(), r.mp_storage->cols());
+ for (size_t i = 0; i < row_count; ++i)
+ for (size_t j = 0; j < col_count; ++j)
+ mp_storage->get_element(i, j) = r.mp_storage->get_element(i, j);
+--- misc/mdds_0.5.3/include/mdds/mixed_type_matrix_storage_filled_linear.inl 2011-07-13 13:26:27.000000000 -0600
++++ misc/build/mdds_0.5.3/include/mdds/mixed_type_matrix_storage_filled_linear.inl 2011-07-20 02:02:21.179798900 -0600
+@@ -354,8 +354,8 @@
+ }
+
+ array_type new_array(new_size, &m_init_elem);
+- size_t min_rows = ::std::min(row, m_rows);
+- size_t min_cols = ::std::min(col, m_cols);
++ size_t min_rows = (::std::min)(row, m_rows);
++ size_t min_cols = (::std::min)(col, m_cols);
+ for (size_t i = 0; i < min_rows; ++i)
+ {
+ for (size_t j = 0; j < min_cols; ++j)
+@@ -612,8 +612,8 @@
+ }
+
+ array_type new_array(new_size, element(0.0));
+- size_t min_rows = ::std::min(row, m_rows);
+- size_t min_cols = ::std::min(col, m_cols);
++ size_t min_rows = (::std::min)(row, m_rows);
++ size_t min_cols = (::std::min)(col, m_cols);
+ for (size_t i = 0; i < min_rows; ++i)
+ {
+ for (size_t j = 0; j < min_cols; ++j)
+--- misc/mdds_0.5.3/include/mdds/point_quad_tree.hpp 2011-07-13 13:26:27.000000000 -0600
++++ misc/build/mdds_0.5.3/include/mdds/point_quad_tree.hpp 2011-07-20 02:04:36.088835900 -0600
+@@ -623,10 +623,10 @@
+ template<typename _Key, typename _Data>
+ void point_quad_tree<_Key,_Data>::insert(key_type x, key_type y, data_type data)
+ {
+- m_xrange.first = ::std::min(m_xrange.first, x);
+- m_xrange.second = ::std::max(m_xrange.second, x);
+- m_yrange.first = ::std::min(m_yrange.first, y);
+- m_yrange.second = ::std::max(m_yrange.second, y);
++ m_xrange.first = (::std::min)(m_xrange.first, x);
++ m_xrange.second = (::std::max)(m_xrange.second, x);
++ m_yrange.first = (::std::min)(m_yrange.first, y);
++ m_yrange.second = (::std::max)(m_yrange.second, y);
+
+ if (!m_root)
+ {
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index e589ec004871..7b1c9b45aa75 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -88,6 +88,13 @@
#include <iostream>
#include <vector>
+#ifdef WNT
+#define NOMINMAX
+#include <prewin.h>
+#include <postwin.h>
+#undef NOMINMAX
+#endif
+
#define MDDS_HASH_CONTAINER_BOOST 1
#include <mdds/mixed_type_matrix.hpp>
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index eda6c16baa2e..4490d999c665 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -84,7 +84,6 @@
using namespace com::sun::star;
using ::std::vector;
using ::std::unary_function;
-using ::std::remove_if;
using ::boost::shared_ptr;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::uno::Reference;
@@ -2561,7 +2560,7 @@ namespace {
/**
* Unary predicate to match DP objects by the table ID.
*/
-class MatchByTable : public unary_function<bool, ScDPObject>
+class MatchByTable : public unary_function<ScDPObject, bool>
{
SCTAB mnTab;
public:
@@ -2612,9 +2611,7 @@ bool ScDPCollection::ClearCache(ScDPObject* pDPObj)
void ScDPCollection::DeleteOnTab( SCTAB nTab )
{
- maTables.erase(
- remove_if(maTables.begin(), maTables.end(), MatchByTable(nTab)),
- maTables.end());
+ maTables.erase_if(MatchByTable(nTab));
}
void ScDPCollection::UpdateReference( UpdateRefMode eUpdateRefMode,
diff --git a/sdext/source/presenter/registry/schema/org/openoffice/Office/extension/PresenterScreen.xcs b/sdext/source/presenter/registry/schema/org/openoffice/Office/extension/PresenterScreen.xcs
index 0e68614234f1..deba55ab258b 100644
--- a/sdext/source/presenter/registry/schema/org/openoffice/Office/extension/PresenterScreen.xcs
+++ b/sdext/source/presenter/registry/schema/org/openoffice/Office/extension/PresenterScreen.xcs
@@ -38,7 +38,7 @@
<prop oor:name="Name" oor:type="xs:string">
<info><desc>Name of the bitmap. Used to look-up the bitmap in a container.</desc></info>
</prop>
- <prop oor:name="Text" oor:type="xs:string">
+ <prop oor:name="Text" oor:type="xs:string" oor:localized="true">
<info><desc>Text that is displayed together with the icon.</desc></info>
</prop>
<prop oor:name="NormalFileName" oor:type="xs:string">
@@ -169,7 +169,7 @@
<node-ref oor:name="Icon" oor:node-type="BitmapDescriptor">
<info><desc>The icon to display.</desc></info>
</node-ref>
- <prop oor:name="Text" oor:type="xs:string">
+ <prop oor:name="Text" oor:type="xs:string" oor:localized="true">
<info><desc>The text to display.</desc></info>
</prop>
<prop oor:name="Action" oor:type="xs:string">
@@ -212,7 +212,7 @@
<node-ref oor:name="Icon" oor:node-type="BitmapDescriptor">
<info><desc>The icon to display.</desc></info>
</node-ref>
- <prop oor:name="Text" oor:type="xs:string">
+ <prop oor:name="Text" oor:type="xs:string" oor:localized="true">
<info><desc>The text to display.</desc></info>
</prop>
<prop oor:name="Action" oor:type="xs:string">
@@ -220,10 +220,10 @@
</prop>
</group>
<group oor:name="HelpEntry">
- <prop oor:name="Left" oor:type="xs:string">
+ <prop oor:name="Left" oor:type="xs:string" oor:localized="true">
<info><desc>Typically a list of keyboard key names.</desc></info>
</prop>
- <prop oor:name="Right" oor:type="xs:string">
+ <prop oor:name="Right" oor:type="xs:string" oor:localized="true">
<info><desc>Typically a description of the action triggered by pressing the keys on the left.</desc></info>
</prop>
</group>
@@ -289,7 +289,7 @@
</group>
<group oor:name="PresenterString">
<info><desc></desc></info>
- <prop oor:name="String" oor:type="xs:string">
+ <prop oor:name="String" oor:type="xs:string" oor:localized="true">
</prop>
</group>
<group oor:name="ViewDescription">
@@ -301,12 +301,12 @@
<prop oor:name="StyleName" oor:type="xs:string">
<info><desc>Name of a view style.</desc></info>
</prop>
- <prop oor:name="Title" oor:type="xs:string">
+ <prop oor:name="Title" oor:type="xs:string" oor:localized="true">
<info><desc>Title displayed for the component. An empty or missing
title means that no title is displayed.</desc></info>
<value></value>
</prop>
- <prop oor:name="AccessibleTitle" oor:type="xs:string">
+ <prop oor:name="AccessibleTitle" oor:type="xs:string" oor:localized="true">
<info><desc>Title displayed for the component when accessibility support is active.
An empty or missing title means that no title is displayed.</desc></info>
<value></value>
diff --git a/sfx2/source/config/evntconf.cxx b/sfx2/source/config/evntconf.cxx
index eb13788aba94..88e284ea4e27 100644
--- a/sfx2/source/config/evntconf.cxx
+++ b/sfx2/source/config/evntconf.cxx
@@ -60,7 +60,7 @@
// -----------------------------------------------------------------------
TYPEINIT1(SfxEventHint, SfxHint);
TYPEINIT1(SfxEventNamesItem, SfxPoolItem);
-TYPEINIT1(SfxViewEventHint, SfxHint);
+TYPEINIT1(SfxViewEventHint, SfxEventHint);
using namespace com::sun::star;
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index fce0a2b27a49..e6da70e72dd2 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
RSCVERSION=340
-RSCREVISION=340m1(Build:202)
-BUILD=202
+RSCREVISION=340m1(Build:203)
+BUILD=203
LAST_MINOR=m1
SOURCEVERSION=OOO340
diff --git a/svtools/source/filter.vcl/wmf/enhwmf.cxx b/svtools/source/filter.vcl/wmf/enhwmf.cxx
index 3f83a3c0daab..8d7c621228d4 100644
--- a/svtools/source/filter.vcl/wmf/enhwmf.cxx
+++ b/svtools/source/filter.vcl/wmf/enhwmf.cxx
@@ -275,7 +275,7 @@ void EnhWMFReader::ReadEMFPlusComment(sal_uInt32 length, sal_Bool& bHaveDC)
sal_uInt32 nRemainder = length >= 4 ? length-4 : length;
const size_t nRequiredHeaderSize = 12;
- while (nRemainder > nRequiredHeaderSize)
+ while (nRemainder >= nRequiredHeaderSize)
{
sal_uInt16 type(0), flags(0);
sal_uInt32 size(0), dataSize(0);
generated by cgit (git 2.34.1) at 2024-04-27 16:29:46 +0000