Hello community,
here is the log from the commit of package libreoffice-bootstrap for
openSUSE:Factory
checked in at Tue Jun 28 09:19:02 CEST 2011.
--------
--- libreoffice-bootstrap/libreoffice-bootstrap.changes 2011-03-18
18:58:54.000000000 +0100
+++
/mounts/work_src_done/STABLE/libreoffice-bootstrap/libreoffice-bootstrap.changes
2011-06-27 16:43:07.000000000 +0200
@@ -1,0 +2,50 @@
+Wed Jun 8 17:29:54 CEST 2011 - [email protected]
+
+- updated to libreoffice-3.3.3.1 (3.3.3-rc1):
+ * build
+ * lost check boxes status during DOC import/export (fdo#34908)
+ * fixed regression of copy-paste of Writer table formulas (bnc#675961)
+ * calc
+ * sheet deletion crasher (bnc#680272)
+ * disabled auto-complete in Calc filter dialog (fdo#34898)
+ * PRODUCT function doesn't calculate correctly (lp#775608)
+ * extras
+ * replace SO icons to LO icons in Web Wizard (fdo#33229)
+ * filters
+ * avoid possibility of accessing out of range ObjTimes
+ * impress
+ * crash after printing (fdo#33947)
+ * send document as E-mail crasher (bnc#694119)
+ * libs-core
+ * updated license information (fdo#37001)
+ * fix evolution local addressbook integration
+ * potentially bogus file: URIs (fdo#33970, i#109096)
+ * replace "seagull" icons to LibreOffice icons (fdo#37617)
+ * use full path for kdefilepicker helper binary (fdo#31109)
+ * libs-extern
+ * crash in es thesaurus (rhbz#675806)
+ * libs-extern-sys
+ * update de_CH and de_AT dictionaries (fdo#33751)
+ * libs-gui
+ * hidden tabs in Impress tasks panel (fdo#34718)
+ * ure
+ * prefer gcc __sync functions over pthread
+ * allow .NET clients to bootstrap LibreOffice (fdo#35108)
+ * writer
+ * freeze/hang on mailmerge to attached PDF (fdo#32553)
+ * fix the positions of imported fields to avoid crashes (bnc#663622)
+ * correct ODT MIME type and PDF export filter (fdo#31792, fdo#32553)
+- fixed build with gcc-4.6
+
+-------------------------------------------------------------------
+Tue Apr 26 21:06:32 CEST 2011 - [email protected]
+
+- added hack to disable KDE4 on openSUSE-11.1-Evergreen but not on SLED11-SP1;
+ KDE4 was too old on openSUSE
+
+-------------------------------------------------------------------
+Wed Mar 23 20:08:17 CET 2011 - [email protected]
+
+- libreoffice-3.3.2.2 == 3.3.2-rc2 == final
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
kde3-fpicker.diff
libreoffice-bootstrap-3.3.2.2.tar.bz2
libreoffice-build-3.3.2.2.tar.gz
New:
----
build-gcc-4.6-autodoc.diff
build-gcc-4.6-basegfx.diff
build-gcc-4.6-chart2.diff
build-gcc-4.6-cosv.diff
build-gcc-4.6-dbaccess.diff
build-gcc-4.6-hwpfilter.diff
build-gcc-4.6-libwpd.diff
build-gcc-4.6-lotuswordpro.diff
build-gcc-4.6-sc.diff
build-gcc-4.6-sot.diff
build-gcc-4.6-vbahelper.diff
build-gcc-4.6-writerperfect.diff
libreoffice-bootstrap-3.3.3.1.tar.bz2
libreoffice-build-3.3.3.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libreoffice-bootstrap.spec ++++++
--- /var/tmp/diff_new_pack.gsunos/_old 2011-06-28 09:08:12.000000000 +0200
+++ /var/tmp/diff_new_pack.gsunos/_new 2011-06-28 09:08:12.000000000 +0200
@@ -183,8 +183,8 @@
# we would like to support also a non-conflicting OOo2 package
%define ooo_bin_suffix no
#
-%define ooo_build_version 3.3.2.2
-%define ooo_piece_version 3.3.2.2
+%define ooo_build_version 3.3.3.1
+%define ooo_piece_version 3.3.3.1
%define ooo_build_dir build
%define ooo_sourcedirname libreoffice-%ooo_piece_version
%define ooo_prefix %_libdir
@@ -192,7 +192,7 @@
%define ooo_basis_dir basis3.3
License: Artistic ; BSD3c ; GPLv2+ ; LPPL .. ; LGPLv2.1+ ; LGPLv3 ; MPL
.. ; MIT
Group: Productivity/Office/Suite
-Version: 3.3.2.2
+Version: 3.3.3.1
Release: 1
AutoReqProv: on
# we use the tool "free" to detect the available memory and reduce the
parallelism is needed
@@ -228,8 +228,19 @@
Patch903: officecfg-help-in-usr-share.diff
# FIXME: temporary disable mono-loader build until the dependency on
comphelper is removed
Patch904: cli_ure-disable-mono-loader.diff
-# find KDE3 filepicker helper binary (bnc#680382)
-Patch905: kde3-fpicker.diff
+# gcc-4.6 fixes
+Patch950: build-gcc-4.6-cosv.diff
+Patch951: build-gcc-4.6-autodoc.diff
+Patch952: build-gcc-4.6-libwpd.diff
+Patch953: build-gcc-4.6-basegfx.diff
+Patch954: build-gcc-4.6-sot.diff
+Patch955: build-gcc-4.6-writerperfect.diff
+Patch956: build-gcc-4.6-lotuswordpro.diff
+Patch957: build-gcc-4.6-hwpfilter.diff
+Patch958: build-gcc-4.6-chart2.diff
+Patch959: build-gcc-4.6-dbaccess.diff
+Patch960: build-gcc-4.6-vbahelper.diff
+Patch961: build-gcc-4.6-sc.diff
#
# patches against the upstream sources, must be -p0
# Patch1000: bug-123456-fix-foo.diff # example
@@ -270,7 +281,19 @@
cp %{P:902} patches/hotfixes
cp %{P:903} patches/hotfixes
cp %{P:904} patches/hotfixes
-cp %{P:905} patches/hotfixes
+# gcc-4.6 fixes
+cp %{P:950} patches/hotfixes
+cp %{P:951} patches/hotfixes
+cp %{P:952} patches/hotfixes
+cp %{P:953} patches/hotfixes
+cp %{P:954} patches/hotfixes
+cp %{P:955} patches/hotfixes
+cp %{P:956} patches/hotfixes
+cp %{P:957} patches/hotfixes
+cp %{P:958} patches/hotfixes
+cp %{P:959} patches/hotfixes
+cp %{P:960} patches/hotfixes
+cp %{P:961} patches/hotfixes
%endif
%build
@@ -306,6 +329,11 @@
with_distro="SUSE"
%endif
#
+# disable KDE4 on openSUSE-11.1-Evergreen but not on SLED11
+%define libkde4_devel_ver %(rpm -q --queryformat '%{VERSION}' libkde4-devel)
+DISABLE_KDE4=
+test "%{libkde4_devel_ver}" = "4.1.3" && DISABLE_KDE4="--disable-kde4"
+#
# run autoreconf to make sure that everything works correctly on current system
# also the autoconf stuff might have been patched
autoreconf -fi
@@ -375,6 +403,7 @@
%if 0%{?meego_version}
--disable-kde \
%endif
+ $DISABLE_KDE4 \
%if 0%{?suse_version} > 01130
--disable-mono \
%endif
++++++ build-gcc-4.6-autodoc.diff ++++++
commit 6af1fd3ef81554e62eb0c7d9b0f234669fd1430c
Author: David Tardon <[email protected]>
Date: Tue Jan 25 08:04:59 2011 +0100
WaE: reference cannot be declared mutable
diff --git a/autodoc/source/display/idl/hi_linkhelper.hxx
b/autodoc/source/display/idl/hi_linkhelper.hxx
index c08be55..1cdfaa7 100644
--- autodoc/source/display/idl/hi_linkhelper.hxx
+++ autodoc/source/display/idl/hi_linkhelper.hxx
@@ -85,9 +85,7 @@ class LinkHelper
const String & XrefsSuffix() const;
private:
- // DATA
- mutable HtmlEnvironment_Idl &
- rEnv;
+ HtmlEnvironment_Idl & rEnv;
};
inline const ary::idl::CodeEntity *
commit 824435ce89b4db541379451facb73792677d5cd0
Author: David Tardon <[email protected]>
Date: Tue Jan 25 08:27:35 2011 +0100
WaE: uninitialized const
diff --git a/autodoc/source/ary/idl/i_ce.cxx b/autodoc/source/ary/idl/i_ce.cxx
index c586d2e..497d7c7 100644
--- autodoc/source/ary/idl/i_ce.cxx
+++ autodoc/source/ary/idl/i_ce.cxx
@@ -40,13 +40,6 @@ namespace ary
namespace idl
{
-namespace
-{
- const Ce_2s aConstCe2sDummy;
-}
-
-
-
CodeEntity::CodeEntity()
: aDocu(),
p2s(0)
@@ -60,9 +53,7 @@ CodeEntity::~CodeEntity()
const Ce_2s &
CodeEntity::Secondaries() const
{
- if (p2s)
- return *p2s;
- return aConstCe2sDummy;
+ return const_cast<CodeEntity*>(this)->Secondaries();
}
Ce_2s &
@@ -74,9 +65,6 @@ CodeEntity::Secondaries()
return *p2s;
}
-
-
-
} // namespace idl
} // namespace ary
++++++ build-gcc-4.6-basegfx.diff ++++++
commit e1e800fa535fa54257aac571e41cb17b86f3e6dd
Author: Caolán McNamara <[email protected]>
Date: Mon Jan 24 11:11:23 2011 +0000
WaE: gcc 4.6.0 various warnings
diff --git a/basegfx/source/polygon/b2dpolygon.cxx
b/basegfx/source/polygon/b2dpolygon.cxx
index f88069b..4e578a9 100644
--- basegfx/source/polygon/b2dpolygon.cxx
+++ basegfx/source/polygon/b2dpolygon.cxx
@@ -257,6 +257,8 @@ class ControlVectorPair2D
basegfx::B2DVector
maNextVector;
public:
+ ControlVectorPair2D() {}
+
const basegfx::B2DVector& getPrevVector() const
{
return maPrevVector;
diff --git a/basegfx/source/range/b2drangeclipper.cxx
b/basegfx/source/range/b2drangeclipper.cxx
index 978f31e..674003f 100644
--- basegfx/source/range/b2drangeclipper.cxx
+++ basegfx/source/range/b2drangeclipper.cxx
@@ -600,7 +600,6 @@ namespace basegfx
std::vector<B2DRange>::const_reverse_iterator
aCurrRectR=rRanges.rbegin();
std::vector<B2VectorOrientation>::const_reverse_iterator
aCurrOrientationR=rOrientations.rbegin();
const std::vector<B2DRange>::const_reverse_iterator
aEndR=rRanges.rend();
- const std::vector<B2VectorOrientation>::const_reverse_iterator
aEndOrientationR=rOrientations.rend();
while( aCurrRectR != aEndR )
{
const B2DRectangle& rCurrRect( *aCurrRectR++ );
++++++ build-gcc-4.6-chart2.diff ++++++
commit 43cd488840131fc2b30e1606ddc6504666e27a43
Author: Caolán McNamara <[email protected]>
Date: Mon Jan 24 14:43:59 2011 +0000
WaE: gcc 4.6.0 various warnings
diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
index cfb5ce5..3f3c22f 100644
--- chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
+++ chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
@@ -230,7 +230,6 @@ void SAL_CALL
UpDownBarWrapper::removeVetoableChangeListener( const ::rtl::OUStr
void SAL_CALL UpDownBarWrapper::setPropertyValues( const uno::Sequence<
::rtl::OUString >& rNameSeq, const uno::Sequence< uno::Any >& rValueSeq )
throw (beans::PropertyVetoException,
lang::IllegalArgumentException, lang::WrappedTargetException,
uno::RuntimeException)
{
- bool bUnknownProperty = false;
sal_Int32 nMinCount = std::min( rValueSeq.getLength(),
rNameSeq.getLength() );
for(sal_Int32 nN=0; nN<nMinCount; nN++)
{
@@ -242,7 +241,6 @@ void SAL_CALL UpDownBarWrapper::setPropertyValues( const
uno::Sequence< ::rtl::O
catch( beans::UnknownPropertyException& ex )
{
ASSERT_EXCEPTION( ex );
- bUnknownProperty = true;
}
}
//todo: store unknown properties elsewhere
diff --git a/chart2/source/controller/main/ChartController.hxx
b/chart2/source/controller/main/ChartController.hxx
index 3927da9..93b1706 100644
--- chart2/source/controller/main/ChartController.hxx
+++ chart2/source/controller/main/ChartController.hxx
@@ -545,7 +545,7 @@ private:
TheModel* operator->() const { return m_pTheModel; }
private:
TheModel* m_pTheModel;
- mutable ::osl::Mutex& m_rModelMutex;
+ ::osl::Mutex& m_rModelMutex;
};
private:
diff --git a/chart2/source/controller/main/DragMethod_RotateDiagram.cxx
b/chart2/source/controller/main/DragMethod_RotateDiagram.cxx
index 5b2ca0b..9fdfdb1 100644
--- chart2/source/controller/main/DragMethod_RotateDiagram.cxx
+++ chart2/source/controller/main/DragMethod_RotateDiagram.cxx
@@ -85,7 +85,6 @@ DragMethod_RotateDiagram::DragMethod_RotateDiagram(
DrawViewWrapper& rDrawViewWr
if(pObj && m_pScene)
{
m_aReferenceRect = pObj->GetLogicRect();
- Rectangle aTemp = m_pScene->GetLogicRect();
m_aWireframePolyPolygon = m_pScene->CreateWireframe();
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index 48295c6..bbee292 100644
--- sc/source/core/data/dpobject.cxx
+++ sc/source/core/data/dpobject.cxx
@@ -1592,6 +1592,7 @@ void ScDPObject::ToggleDetails(const
DataPilotTableHeaderData& rElemDesc, ScDPOb
}
DBG_ASSERT( bFound, "member not found" );
+ (void)bFound;
//! use Hierarchy and Level in SaveData !!!!
diff --git a/sc/source/filter/inc/xeroot.hxx b/sc/source/filter/inc/xeroot.hxx
index cac22f4..dc8652e 100644
--- sc/source/filter/inc/xeroot.hxx
+++ sc/source/filter/inc/xeroot.hxx
@@ -168,7 +168,7 @@ private:
XclExpRootData::XclExpLinkMgrRef GetLocalLinkMgrRef() const;
private:
- mutable XclExpRootData& mrExpData; /// Reference to the global export
data struct.
+ XclExpRootData& mrExpData; /// Reference to the global export data
struct.
};
// ============================================================================
diff --git a/sc/source/filter/inc/xiroot.hxx b/sc/source/filter/inc/xiroot.hxx
index 1b4153e..83953e3 100644
--- sc/source/filter/inc/xiroot.hxx
+++ sc/source/filter/inc/xiroot.hxx
@@ -218,7 +218,7 @@ public:
void ReadCodeName( XclImpStream& rStrm, bool bGlobals );
private:
- mutable XclImpRootData& mrImpData; /// Reference to the global import
data struct.
+ XclImpRootData& mrImpData; /// Reference to the global import data
struct.
};
// ============================================================================
diff --git a/sc/source/filter/inc/xlroot.hxx b/sc/source/filter/inc/xlroot.hxx
index 5e132fa..3f9f6fa 100644
--- sc/source/filter/inc/xlroot.hxx
+++ sc/source/filter/inc/xlroot.hxx
@@ -285,7 +285,7 @@ public:
inline void IncCurrScTab() { ++mrData.mnScTab; }
private:
- mutable XclRootData& mrData; /// Reference to the global data
struct.
+ XclRootData& mrData; /// Reference to the global data struct.
};
// ============================================================================
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index 7f67ce7..c161aa1 100644
--- sc/source/ui/vba/vbarange.cxx
+++ sc/source/ui/vba/vbarange.cxx
@@ -5574,7 +5574,7 @@ ScVbaRange:: ClearOutline( ) throw
(script::BasicErrorException, uno::RuntimeEx
RangeHelper thisRange( mxRange );
table::CellRangeAddress thisAddress =
thisRange.getCellRangeAddressable()->getRangeAddress();
uno::Reference< sheet::XSheetOutline > xSheetOutline(
thisRange.getSpreadSheet(), uno::UNO_QUERY_THROW );
- xSheetOutline->clearOutline();
+ xSheetOutline->clearOutline();
}
void
diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx
index 33f34c2..96e8298 100644
--- sc/source/ui/view/drawview.cxx
+++ sc/source/ui/view/drawview.cxx
@@ -378,7 +378,6 @@ void ScDrawView::MarkListHasChanged()
SdrOle2Obj* pOle2Obj = NULL;
SdrGrafObj* pGrafObj = NULL;
- SdrMediaObj* pMediaObj = NULL;
const SdrMarkList& rMarkList = GetMarkedObjectList();
ULONG nMarkCount = rMarkList.GetMarkCount();
@@ -411,7 +410,6 @@ void ScDrawView::MarkListHasChanged()
}
else if (pObj->GetObjIdentifier() == OBJ_MEDIA)
{
- pMediaObj = (SdrMediaObj*) pObj;
pViewSh->SetMediaShell(TRUE);
bSubShellSet = TRUE;
}
++++++ build-gcc-4.6-cosv.diff ++++++
commit e3efe8e0ac7d4cfcb296bca5ad00732309e298ac
Author: Caolán McNamara <[email protected]>
Date: Mon Jan 24 10:41:27 2011 +0000
WaE: gcc 4.6.0 various warnings
diff --git a/cosv/inc/cosv/tpl/vvector.hxx b/cosv/inc/cosv/tpl/vvector.hxx
index 4848d97..1903dce 100644
--- cosv/inc/cosv/tpl/vvector.hxx
+++ cosv/inc/cosv/tpl/vvector.hxx
@@ -132,7 +132,7 @@ class VirtualVector
typedef VirtualVector<XX,PTRDEL> self;
typedef std::vector< DYN XX* > impl_type;
typedef typename impl_type::size_type size_type;
- typedef ptrdiff_t difference_type;
+ typedef std::ptrdiff_t difference_type;
class const_iterator;
class iterator;
++++++ build-gcc-4.6-dbaccess.diff ++++++
Just part of the commit
commit 6e2243eb77b39c3e8d2ce03f00f06943000d4a3f
Author: Caolán McNamara <[email protected]>
Date: Mon Jan 24 14:46:09 2011 +0000
WaE: gcc 4.6.0 various warnings
diff --git a/dbaccess/source/core/dataaccess/documentdefinition.hxx
b/dbaccess/source/core/dataaccess/documentdefinition.hxx
index f74b6ac..e51b959 100644
--- dbaccess/source/core/dataaccess/documentdefinition.hxx
+++ dbaccess/source/core/dataaccess/documentdefinition.hxx
@@ -374,7 +374,7 @@ private:
ODocumentDefinition& m_rDocumentDefinition;
const ::com::sun::star::uno::Any m_aOldValue;
const ::com::sun::star::uno::Any m_aNewValue;
- mutable ::osl::ResettableMutexGuard& m_rClearForNotify;
+ ::osl::ResettableMutexGuard& m_rClearForNotify;
void impl_fireEvent_throw( const sal_Bool i_bVetoable );
};
++++++ build-gcc-4.6-hwpfilter.diff ++++++
Just part of the commit!
commit 237dff0e35a0b7ef0ded9c64d170f27260610808
Author: Caolán McNamara <[email protected]>
Date: Mon Jan 24 10:41:00 2011 +0000
WaE: gcc 4.6.0 various warnings
diff --git a/hwpfilter/source/list.hxx b/hwpfilter/source/list.hxx
index 043a214..02f6e00 100644
--- hwpfilter/source/list.hxx
+++ hwpfilter/source/list.hxx
@@ -41,6 +41,7 @@
* re-implements the same functionality, based on the STL.
*/
+#include <cstddef>
#include <vector>
template<class T>
++++++ build-gcc-4.6-libwpd.diff ++++++
--- libwpd/libwpd-0.9.1-gcc-4.6.patch.old 2011-06-02 13:47:59.000000000
+0200
+++ libwpd/libwpd-0.9.1-gcc-4.6.patch 2011-06-02 13:45:59.000000000 +0200
@@ -0,0 +1,11 @@
+--- misc/libwpd-0.9.1/src/lib/WP5GraphicsInformationPacket.h.old
2010-08-26 13:35:21.000000000 +0200
++++ misc/build/libwpd-0.9.1/src/lib/WP5GraphicsInformationPacket.h
2011-06-02 13:43:16.000000000 +0200
+@@ -37,7 +37,7 @@ public:
+ ~WP5GraphicsInformationPacket();
+ void _readContents(WPXInputStream *input, WPXEncryption *encryption,
uint32_t dataSize);
+ const std::vector<WPXBinaryData *> &getImages() const { return
m_images; }
+- const WPXBinaryData *getImage( unsigned long imageIndex ) const { if
(imageIndex < m_images.size()) return m_images[imageIndex]; return NULL; }
++ const WPXBinaryData *getImage( unsigned long imageIndex ) const { if
(imageIndex < m_images.size()) return m_images[imageIndex]; return 0; }
+
+ private:
+ std::vector<WPXBinaryData *> m_images;
--- libwpd/makefile.mk.old 2011-06-02 13:47:43.000000000 +0200
+++ libwpd/makefile.mk 2011-06-02 13:48:51.000000000 +0200
@@ -43,6 +43,8 @@ TARGET=wpd
TARFILE_NAME=libwpd-0.9.1
TARFILE_MD5=5ff846847dab351604ad859e2fd4ed3c
+PATCH_FILES=libwpd-0.9.1-gcc-4.6.patch
+
BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
BUILD_DIR=src$/lib
++++++ build-gcc-4.6-lotuswordpro.diff ++++++
commit 580ee28500128b2c7b8078cd36a84f38d1c50ec8
Author: David Tardon <[email protected]>
Date: Thu Dec 23 11:15:31 2010 +0100
fix use of temporary value
diff --git a/lotuswordpro/source/filter/xfilter/xfparastyle.hxx
b/lotuswordpro/source/filter/xfilter/xfparastyle.hxx
index fde03ae..ead40ff 100644
--- lotuswordpro/source/filter/xfilter/xfparastyle.hxx
+++ lotuswordpro/source/filter/xfilter/xfparastyle.hxx
@@ -235,10 +235,7 @@ public:
sal_uInt32 GetFlag(){ return m_nFlag; }
- /**
- * @descr return margins.
- */
- XFMargins GetMargins(){return m_aMargin;}
+ XFMargins& GetMargins(){return m_aMargin;}
virtual enumXFStyle GetStyleFamily();
++++++ build-gcc-4.6-sc.diff ++++++
--- sc/source/ui/vba/makefile.mk.old 2011-06-13 18:28:59.000000000 +0200
+++ sc/source/ui/vba/makefile.mk 2011-06-13 19:07:47.000000000 +0200
@@ -46,6 +46,10 @@ INCPRE=$(INCCOM)$/$(TARGET)
# ------------------------------------------------------------------
+.IF "$(CCNUMVER)">="000300060000"
+CFLAGS+= -O0
+.ENDIF
+
SLOFILES= \
$(SLO)$/excelvbahelper.obj \
$(SLO)$/service.obj \
++++++ build-gcc-4.6-sot.diff ++++++
This is just small part of the commit!
commit bb35dab1d6e2193d38a6908bfc06cfacb13bcadc
Author: Caolán McNamara <[email protected]>
Date: Tue Jan 25 10:23:14 2011 +0000
WaE: gcc 4.6.0 various warnings
diff --git a/comphelper/inc/comphelper/oslfile2streamwrap.hxx
b/comphelper/inc/comphelper/oslfile2streamwrap.hxx
index d636666..4d6c454 100644
--- comphelper/inc/comphelper/oslfile2streamwrap.hxx
+++ comphelper/inc/comphelper/oslfile2streamwrap.hxx
@@ -44,10 +44,7 @@ namespace comphelper
// FmUnoIOStream,
// stream zum schreiben un lesen von Daten, basieren auf File
//==================================================================
-struct InputStreamWrapper_Base : public
::cppu::WeakImplHelper1<stario::XInputStream>
-{};
-
-class COMPHELPER_DLLPUBLIC OSLInputStreamWrapper : public
InputStreamWrapper_Base
+class COMPHELPER_DLLPUBLIC OSLInputStreamWrapper : public
::cppu::WeakImplHelper1<stario::XInputStream>
{
::osl::Mutex m_aMutex;
::osl::File* m_pFile;
@@ -58,14 +55,6 @@ public:
OSLInputStreamWrapper(::osl::File* pStream, sal_Bool bOwner=sal_False);
virtual ~OSLInputStreamWrapper();
-// UNO Anbindung
- virtual void SAL_CALL acquire() throw()
- { InputStreamWrapper_Base::acquire(); }
- virtual void SAL_CALL release() throw()
- { InputStreamWrapper_Base::release(); }
- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const
::com::sun::star::uno::Type& _rType) throw
(::com::sun::star::uno::RuntimeException)
- { return InputStreamWrapper_Base::queryInterface(_rType); }
-
// stario::XInputStream
virtual sal_Int32 SAL_CALL readBytes(staruno::Sequence< sal_Int8
>& aData, sal_Int32 nBytesToRead) throw(stario::NotConnectedException,
stario::BufferSizeExceededException, staruno::RuntimeException);
virtual sal_Int32 SAL_CALL readSomeBytes(staruno::Sequence<
sal_Int8 >& aData, sal_Int32 nMaxBytesToRead)
throw(stario::NotConnectedException, stario::BufferSizeExceededException,
staruno::RuntimeException);
@@ -78,24 +67,13 @@ public:
// FmUnoOutStream,
// Datensenke fuer Files
//==================================================================
-struct OutputStreamWrapper_Base : public
::cppu::WeakImplHelper1<stario::XOutputStream>
-{};
-
-class COMPHELPER_DLLPUBLIC OSLOutputStreamWrapper : public
OutputStreamWrapper_Base
+class COMPHELPER_DLLPUBLIC OSLOutputStreamWrapper : public
::cppu::WeakImplHelper1<stario::XOutputStream>
{
::osl::File& rFile;
public:
OSLOutputStreamWrapper(::osl::File& _rFile) :rFile(_rFile) { }
-// UNO Anbindung
- virtual void SAL_CALL acquire() throw()
- { OutputStreamWrapper_Base::acquire(); }
- virtual void SAL_CALL release() throw()
- { OutputStreamWrapper_Base::release(); }
- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const
::com::sun::star::uno::Type& _rType) throw
(::com::sun::star::uno::RuntimeException)
- { return OutputStreamWrapper_Base::queryInterface(_rType); }
-
// stario::XOutputStream
virtual void SAL_CALL writeBytes(const staruno::Sequence< sal_Int8 >&
aData) throw(stario::NotConnectedException,
stario::BufferSizeExceededException, staruno::RuntimeException);
virtual void SAL_CALL flush() throw(stario::NotConnectedException,
stario::BufferSizeExceededException, staruno::RuntimeException);
diff --git a/unotools/inc/unotools/streamwrap.hxx
b/unotools/inc/unotools/streamwrap.hxx
index 80cde76..4b53500 100644
--- unotools/inc/unotools/streamwrap.hxx
+++ unotools/inc/unotools/streamwrap.hxx
@@ -51,7 +51,7 @@ namespace utl
//==================================================================
typedef ::cppu::WeakImplHelper1 < stario::XInputStream
> InputStreamWrapper_Base;
- // needed for some compilers
+// needed for some compilers
/// helper class for wrapping an SvStream into an <type
scope="com.sun.star.io">XInputStream</type>
class UNOTOOLS_DLLPUBLIC OInputStreamWrapper : public InputStreamWrapper_Base
{
@@ -69,9 +69,6 @@ public:
OInputStreamWrapper(SvStream* pStream, sal_Bool bOwner=sal_False);
virtual ~OInputStreamWrapper();
-// UNO Anbindung
- DECLARE_UNO3_AGG_DEFAULTS(OInputStreamWrapper, InputStreamWrapper_Base);
-
// stario::XInputStream
virtual sal_Int32 SAL_CALL readBytes(staruno::Sequence< sal_Int8
>& aData, sal_Int32 nBytesToRead) throw(stario::NotConnectedException,
stario::BufferSizeExceededException, staruno::RuntimeException);
virtual sal_Int32 SAL_CALL readSomeBytes(staruno::Sequence<
sal_Int8 >& aData, sal_Int32 nMaxBytesToRead)
throw(stario::NotConnectedException, stario::BufferSizeExceededException,
staruno::RuntimeException);
@@ -122,9 +119,6 @@ protected:
public:
OOutputStreamWrapper(SvStream& _rStream) :rStream(_rStream) { }
-// UNO Anbindung
- DECLARE_UNO3_AGG_DEFAULTS(OOutputStreamWrapper, OutputStreamWrapper_Base);
-
// stario::XOutputStream
virtual void SAL_CALL writeBytes(const staruno::Sequence< sal_Int8 >&
aData) throw(stario::NotConnectedException,
stario::BufferSizeExceededException, staruno::RuntimeException);
virtual void SAL_CALL flush() throw(stario::NotConnectedException,
stario::BufferSizeExceededException, staruno::RuntimeException);
++++++ build-gcc-4.6-vbahelper.diff ++++++
--- vbahelper/inc/vbahelper/vbacollectionimpl.hxx 2011-01-28
20:27:51.507604173 +0000
+++ vbahelper/inc/vbahelper/vbacollectionimpl.hxx 2011-01-28
20:28:26.230045727 +0000
@@ -238,7 +238,7 @@
// including a HelperInterface implementation
template< typename Ifc1 >
-class ScVbaCollectionBase : public InheritedHelperInterfaceImpl< Ifc1 >
+class VBAHELPER_DLLPUBLIC ScVbaCollectionBase : public
InheritedHelperInterfaceImpl< Ifc1 >
{
typedef InheritedHelperInterfaceImpl< Ifc1 > BaseColBase;
protected:
++++++ build-gcc-4.6-writerperfect.diff ++++++
commit cd9904ffe58135bd7a389b1149ae9f6dd852fe94
Author: David Tardon <[email protected]>
Date: Mon May 9 13:21:17 2011 +0200
WaE: NULL was not declared in this scope
diff --git a/writerperfect/source/filter/Style.hxx
b/writerperfect/source/filter/Style.hxx
index 41afe52..d68ed26 100644
--- writerperfect/source/filter/Style.hxx
+++ writerperfect/source/filter/Style.hxx
@@ -27,6 +27,7 @@
#ifndef _STYLE_H
#define _STYLE_H
+#include <cstdlib>
#include <libwpd/libwpd.h>
#include "DocumentElement.hxx"
++++++ libreoffice-bootstrap-3.3.2.2.tar.bz2 ->
libreoffice-bootstrap-3.3.3.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libreoffice-bootstrap-3.3.2.2/ChangeLog
new/libreoffice-bootstrap-3.3.3.1/ChangeLog
--- old/libreoffice-bootstrap-3.3.2.2/ChangeLog 2011-03-15 17:53:33.000000000
+0100
+++ new/libreoffice-bootstrap-3.3.3.1/ChangeLog 2011-05-31 17:45:27.000000000
+0200
@@ -1,24 +1,22 @@
-2011-03-15 Petr Mladek <[email protected]>
[e4e1e143677a13ab1e087159994f8a0be3810779]
+2011-05-31 Petr Mladek <[email protected]>
[9eb93e0b33972cbc08de56a1055fd4598b9b5517]
-Version 3.3.2.2, tag libreoffice-3.3.2.2 (3.3.2-rc2)
+Version 3.3.3.1, tag libreoffice-3.3.3.1 (3.3.3-rc1)
-2011-03-15 Petr Mladek <[email protected]>
[62cd43a502624bf166d5e420188bc60c179b55a7]
+2011-05-31 Petr Mladek <[email protected]>
[0aecdc4b68cd5765f1b88ed8dbb94426e7e6af43]
+
+bump product version to 3.3.3-rc1, release number to 301
-bump product version to 3.3.2rc2, release number to 202
+2011-04-09 Kalman Szalai - KAMI <[email protected]>
[a4402e07b6a06f7911580bbafb10b0f18cd9f78c]
-2011-03-08 Petr Mladek <[email protected]>
[c5d66af2e7edaafc30bb301f6fee2922248d4ff3]
+Remove already integrated Lin* fonts.
-Branch libreoffice-3-3-2
-This is 'libreoffice-3-3-2' - the stable branch for the 3.3.2 release.
-Only very safe changes, reviewed by three people are allowed.
+2011-04-05 Petr Mladek <[email protected]>
[1492720646d125b338fd341f756afdf78a145401]
-If you want to commit more complicated fix for the next 3.3.x release,
-please use the 'libreoffice-3-3' branch.
+bump product version to 3.3.2rc2, release number to 202
-If you want to build something cool, unstable, and risky, use master.
2011-03-08 Petr Mladek <[email protected]>
[4215649b045643e8153f2f26c79479aa81dd7e07]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libreoffice-bootstrap-3.3.2.2/instsetoo_native/util/openoffice.lst
new/libreoffice-bootstrap-3.3.3.1/instsetoo_native/util/openoffice.lst
--- old/libreoffice-bootstrap-3.3.2.2/instsetoo_native/util/openoffice.lst
2011-03-15 17:38:48.000000000 +0100
+++ new/libreoffice-bootstrap-3.3.3.1/instsetoo_native/util/openoffice.lst
2011-05-31 14:28:46.000000000 +0200
@@ -5,7 +5,7 @@
variables
{
OOOBASEVERSION 3.3
- OOOPACKAGEVERSION 3.3.2
+ OOOPACKAGEVERSION 3.3.3
UREPACKAGEVERSION 1.7.0
URELAYERVERSION 1
BASISROOTNAME LibreOffice
@@ -57,12 +57,12 @@
PRODUCTVERSION 3.3
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc2
+ SHORT_PRODUCTEXTENSION rc1
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3
USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.3.2
+ ABOUTBOXPRODUCTVERSION 3.3.3
BASEPRODUCTVERSION 3.3
PCPFILENAME openoffice.pcp
UPDATEURL
http://update.libreoffice.org/ProductUpdateService/check.Update
@@ -74,7 +74,7 @@
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 3.3.2
+ PACKAGEVERSION 3.3.3
PACKAGEREVISION {milestone}
LICENSENAME LGPL
SERVICESPROJEKT 1
@@ -126,12 +126,12 @@
PRODUCTVERSION 3.3
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc2
+ SHORT_PRODUCTEXTENSION rc1
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3
USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.3.2
+ ABOUTBOXPRODUCTVERSION 3.3.3
BASEPRODUCTVERSION 3.3
UPDATEURL
http://update.libreoffice.org/ProductUpdateService/check.Update
ODFNOTIFYURL
http://odfnotify.libreoffice.org/OOo3.0/notification.jsp?version=ODF
@@ -142,7 +142,7 @@
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 3.3.2
+ PACKAGEVERSION 3.3.3
PACKAGEREVISION {milestone}
LICENSENAME LGPL
SERVICESPROJEKT 1
@@ -191,14 +191,14 @@
PRODUCTVERSION 3.3
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc2
+ SHORT_PRODUCTEXTENSION rc1
BASISROOTNAME LibO-dev
UNIXBASISROOTNAME lo-dev
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3
USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.3.2
+ ABOUTBOXPRODUCTVERSION 3.3.3
BASEPRODUCTVERSION 3.3
DEVELOPMENTPRODUCT 1
BASISPACKAGEPREFIX libobasis-dev
@@ -213,7 +213,7 @@
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 3.3.2
+ PACKAGEVERSION 3.3.3
PACKAGEREVISION {milestone}
LICENSENAME LGPL
SERVICESPROJEKT 1
@@ -269,7 +269,7 @@
PRODUCTEXTENSION
BRANDPACKAGEVERSION 3
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc2
+ SHORT_PRODUCTEXTENSION rc1
LICENSENAME LGPL
SERVICESPROJEKT 1
SETSTATICPATH 1
@@ -310,11 +310,11 @@
PRODUCTVERSION 3.3
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc2
+ SHORT_PRODUCTEXTENSION rc1
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 3
- PACKAGEVERSION 3.3.2
+ PACKAGEVERSION 3.3.3
PACKAGEREVISION {milestone}
PACK_INSTALLED 1
POOLPRODUCT 0
@@ -355,13 +355,13 @@
PRODUCTVERSION 3.3
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc2
+ SHORT_PRODUCTEXTENSION rc1
BASISROOTNAME LibO-dev
UNIXBASISROOTNAME lo-dev
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 3
- PACKAGEVERSION 3.3.2
+ PACKAGEVERSION 3.3.3
PACKAGEREVISION {milestone}
BASISPACKAGEPREFIX libobasis-dev
UREPACKAGEPREFIX lodev
@@ -407,12 +407,12 @@
PRODUCTVERSION 3.3
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc2
+ SHORT_PRODUCTEXTENSION rc1
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3
USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.3.2
+ ABOUTBOXPRODUCTVERSION 3.3.3
BASEPRODUCTVERSION 3.3
PCPFILENAME openoffice.pcp
UPDATEURL
http://update.libreoffice.org/ProductUpdateService/check.Update
@@ -424,7 +424,7 @@
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 3.3.2
+ PACKAGEVERSION 3.3.3
PACKAGEREVISION {milestone}
LICENSENAME LGPL
SERVICESPROJEKT 1
@@ -476,12 +476,12 @@
PRODUCTVERSION 3.3
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc2
+ SHORT_PRODUCTEXTENSION rc1
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3
USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.3.2
+ ABOUTBOXPRODUCTVERSION 3.3.3
BASEPRODUCTVERSION 3.3
UPDATEURL
http://update.libreoffice.org/ProductUpdateService/check.Update
ODFNOTIFYURL
http://odfnotify.libreoffice.org/OOo3.0/notification.jsp?version=ODF
@@ -492,7 +492,7 @@
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 3.3.2
+ PACKAGEVERSION 3.3.3
PACKAGEREVISION {milestone}
LICENSENAME LGPL
SERVICESPROJEKT 1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libreoffice-bootstrap-3.3.2.2/scp2/source/accessories/file_font_accessories.scp
new/libreoffice-bootstrap-3.3.3.1/scp2/source/accessories/file_font_accessories.scp
---
old/libreoffice-bootstrap-3.3.2.2/scp2/source/accessories/file_font_accessories.scp
2010-11-30 21:17:23.000000000 +0100
+++
new/libreoffice-bootstrap-3.3.3.1/scp2/source/accessories/file_font_accessories.scp
2011-05-30 13:24:16.000000000 +0200
@@ -880,22 +880,3 @@
STD_FONT_FILE( gid_File_Fnt_Verina_Serif, Verina_Serif.otf, Verina Serif )
#endif
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_MagyarLinBiolinum, MagyarLinBiolinum.ttf, Magyar
Linux Biolinum)
-STD_FONT_FILE( gid_File_Fnt_MagyarLinBiolinumB, MagyarLinBiolinumB.ttf, Magyar
Linux Biolinum Bold)
-STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertine, MagyarLinLibertine.ttf, Magyar
Linux Libertine)
-STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineB, MagyarLinLibertineB.ttf,
Magyar Linux Libertine Bold)
-STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineBI, MagyarLinLibertineBI.ttf,
Magyar Linux Libertine Bold Italic)
-STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineC, MagyarLinLibertineC_Re.ttf,
Magyar Linux Libertine Capital)
-STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineG, MagyarLinLibertineG.ttf,
Magyar Linux Libertine Graphite)
-STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineGB, MagyarLinLibertineGB.ttf,
Magyar Linux Libertine Bold Graphite)
-STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineGBI, MagyarLinLibertineGBI.ttf,
Magyar Linux Libertine Bold Italic Graphite)
-STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineGI, MagyarLinLibertineGI.ttf,
Magyar Linux Libertine Italic Graphite)
-STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineI, MagyarLinLibertineI.ttf,
Magyar Linux Libertine Italic)
-STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineN, MagyarLinLibertineN.ttf,
Magyar Linux N Libertine)
-STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineNB, MagyarLinLibertineNB.ttf,
Magyar Linux Libertine N Bold)
-STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineNBI, MagyarLinLibertineNBI.ttf,
Magyar Linux Libertine N Bold Italic)
-STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineNI, MagyarLinLibertineNI.ttf,
Magyar Linux Libertine N Italic)
-STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineNC, MagyarLinLibertineNC_Re.ttf,
Magyar Linux Libertine N Capital)
-#endif
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libreoffice-bootstrap-3.3.2.2/solenv/inc/minor.mk
new/libreoffice-bootstrap-3.3.3.1/solenv/inc/minor.mk
--- old/libreoffice-bootstrap-3.3.2.2/solenv/inc/minor.mk 2011-03-15
17:38:48.000000000 +0100
+++ new/libreoffice-bootstrap-3.3.3.1/solenv/inc/minor.mk 2011-05-31
14:26:45.000000000 +0200
@@ -1,5 +1,5 @@
RSCVERSION=330
-RSCREVISION=330m19(Build:202)
-BUILD=202
+RSCREVISION=330m19(Build:301)
+BUILD=301
LAST_MINOR=m19
SOURCEVERSION=OOO330
++++++ libreoffice-build-3.3.2.2.tar.gz -> libreoffice-build-3.3.3.1.tar.gz
++++++
libreoffice-bootstrap/libreoffice-build-3.3.2.2.tar.gz
/mounts/work_src_done/STABLE/libreoffice-bootstrap/libreoffice-build-3.3.3.1.tar.gz
differ: char 5, line 1
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
