update to 4.1
Some packaging changes: * java filters are gone * agenda.jar has been converted to python * reportbuilder is not an extension anymore: merged into -base
This commit is contained in:
David Tardon
parent
d67e552164
commit
6222204cf7
3
.gitignore
vendored
3
.gitignore
vendored
@ -18,3 +18,6 @@
|
|||||||
/libreoffice-4.0.3.3.tar.xz
|
/libreoffice-4.0.3.3.tar.xz
|
||||||
/libreoffice-help-4.0.3.3.tar.xz
|
/libreoffice-help-4.0.3.3.tar.xz
|
||||||
/libreoffice-translations-4.0.3.3.tar.xz
|
/libreoffice-translations-4.0.3.3.tar.xz
|
||||||
|
/libreoffice-4.1.0.0.beta1.tar.xz
|
||||||
|
/libreoffice-help-4.1.0.0.beta1.tar.xz
|
||||||
|
/libreoffice-translations-4.1.0.0.beta1.tar.xz
|
||||||
|
|||||||
@ -1,104 +0,0 @@
|
|||||||
From 3d6424a752902bba513102834966868f609d91e6 Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
|
||||||
Date: Thu, 18 Apr 2013 13:13:43 +0100
|
|
||||||
Subject: [PATCH] Related: rhbz#761009 lp#766153 lp#892904 HandleFontOptions
|
|
||||||
crash
|
|
||||||
|
|
||||||
The mpServerFont member of a ImplServerFontEntry must not be deleted while the
|
|
||||||
ImplServerFontEntry still exists
|
|
||||||
|
|
||||||
see also 39cbce553da1834f78b77f48b2f1be9578d6cc05 for another reason a crash in
|
|
||||||
the same place can happen. Its impossible from traces in crashes before
|
|
||||||
39cbce553da1834f78b77f48b2f1be9578d6cc05 was fixed to distinguish those crashes
|
|
||||||
from this crash.
|
|
||||||
|
|
||||||
This crash is a regression due to 7a416820ab5e03f8b988656e0f6a592cb1e81d07
|
|
||||||
where we went from modifying pServerFont in X11SalGraphics::setFont directly to
|
|
||||||
modifying it/a-different-one indirectly via ImplServerFontEntry
|
|
||||||
|
|
||||||
The various font caches and font thing lifecycles of LibreOffice are somewhat
|
|
||||||
confusing.
|
|
||||||
|
|
||||||
This crash had eluded me for years, to reproduce:
|
|
||||||
insert->special chars->select a font with loads of glyphs, i.e. "AR PL UKai CN"
|
|
||||||
click on the first row of glyphs and hold down page-down until you hit the
|
|
||||||
bottom, then page-up until you hit the top. Pre patch it won't survive the
|
|
||||||
whole down+up (and valgrind will moan quite a bit)
|
|
||||||
|
|
||||||
Change-Id: Ifde0cb375f487c556b04a640d77765a7dc2f0913
|
|
||||||
---
|
|
||||||
vcl/generic/glyphs/glyphcache.cxx | 13 +++++++++++++
|
|
||||||
vcl/inc/generic/glyphcache.hxx | 3 ++-
|
|
||||||
vcl/unx/generic/gdi/salgdi3.cxx | 8 ++++----
|
|
||||||
3 files changed, 19 insertions(+), 5 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/vcl/generic/glyphs/glyphcache.cxx b/vcl/generic/glyphs/glyphcache.cxx
|
|
||||||
index fa3659a..a6849ec 100644
|
|
||||||
--- a/vcl/generic/glyphs/glyphcache.cxx
|
|
||||||
+++ b/vcl/generic/glyphs/glyphcache.cxx
|
|
||||||
@@ -411,9 +411,22 @@ ImplServerFontEntry::ImplServerFontEntry( FontSelectPattern& rFSD )
|
|
||||||
|
|
||||||
// -----------------------------------------------------------------------
|
|
||||||
|
|
||||||
+void ImplServerFontEntry::SetServerFont(ServerFont* p)
|
|
||||||
+{
|
|
||||||
+ if (p == mpServerFont)
|
|
||||||
+ return;
|
|
||||||
+ if (mpServerFont)
|
|
||||||
+ mpServerFont->Release();
|
|
||||||
+ mpServerFont = p;
|
|
||||||
+ if (mpServerFont)
|
|
||||||
+ mpServerFont->AddRef();
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
ImplServerFontEntry::~ImplServerFontEntry()
|
|
||||||
{
|
|
||||||
// TODO: remove the ServerFont here instead of in the GlyphCache
|
|
||||||
+ if (mpServerFont)
|
|
||||||
+ mpServerFont->Release();
|
|
||||||
}
|
|
||||||
|
|
||||||
// =======================================================================
|
|
||||||
diff --git a/vcl/inc/generic/glyphcache.hxx b/vcl/inc/generic/glyphcache.hxx
|
|
||||||
index 24cda3c..d9f8378 100644
|
|
||||||
--- a/vcl/inc/generic/glyphcache.hxx
|
|
||||||
+++ b/vcl/inc/generic/glyphcache.hxx
|
|
||||||
@@ -225,6 +225,7 @@ public:
|
|
||||||
private:
|
|
||||||
friend class GlyphCache;
|
|
||||||
friend class ServerFontLayout;
|
|
||||||
+ friend class ImplServerFontEntry;
|
|
||||||
friend class X11SalGraphics;
|
|
||||||
|
|
||||||
void AddRef() const { ++mnRefCount; }
|
|
||||||
@@ -302,7 +303,7 @@ private:
|
|
||||||
public:
|
|
||||||
ImplServerFontEntry( FontSelectPattern& );
|
|
||||||
virtual ~ImplServerFontEntry();
|
|
||||||
- void SetServerFont( ServerFont* p) { mpServerFont = p; }
|
|
||||||
+ void SetServerFont(ServerFont* p);
|
|
||||||
void HandleFontOptions();
|
|
||||||
};
|
|
||||||
|
|
||||||
diff --git a/vcl/unx/generic/gdi/salgdi3.cxx b/vcl/unx/generic/gdi/salgdi3.cxx
|
|
||||||
index 30a1e3b..ba6628a 100644
|
|
||||||
--- a/vcl/unx/generic/gdi/salgdi3.cxx
|
|
||||||
+++ b/vcl/unx/generic/gdi/salgdi3.cxx
|
|
||||||
@@ -194,10 +194,10 @@ bool X11SalGraphics::setFont( const FontSelectPattern *pEntry, int nFallbackLeve
|
|
||||||
|
|
||||||
// apply font specific-hint settings if needed
|
|
||||||
// TODO: also disable it for reference devices
|
|
||||||
- if( !bPrinter_ )
|
|
||||||
- {
|
|
||||||
- ImplServerFontEntry* pSFE = static_cast<ImplServerFontEntry*>( pEntry->mpFontEntry );
|
|
||||||
- pSFE->HandleFontOptions();
|
|
||||||
+ if( !bPrinter_ )
|
|
||||||
+ {
|
|
||||||
+ ImplServerFontEntry* pSFE = static_cast<ImplServerFontEntry*>( pEntry->mpFontEntry );
|
|
||||||
+ pSFE->HandleFontOptions();
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
|
||||||
--
|
|
||||||
1.8.1.2
|
|
||||||
|
|
||||||
@ -1,35 +0,0 @@
|
|||||||
From 8159a10df959638004bae19cd108f855180d00f2 Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
|
||||||
Date: Thu, 7 Mar 2013 14:30:54 +0000
|
|
||||||
Subject: [PATCH] Related: rhbz#902884 check for GetSelectedMasterPage failure
|
|
||||||
anyway
|
|
||||||
|
|
||||||
backtrace doesn't indicate that its NULL however, but the rest of
|
|
||||||
our GetSelectedMasterPage check for NULL so fix that anyway
|
|
||||||
|
|
||||||
Change-Id: I9e0b15f4a18523ff1e787ef230de1ca227aa2980
|
|
||||||
---
|
|
||||||
sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx | 7 +++++--
|
|
||||||
1 file changed, 5 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx b/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx
|
|
||||||
index 512fd1d..58fa05f 100644
|
|
||||||
--- a/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx
|
|
||||||
+++ b/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx
|
|
||||||
@@ -553,8 +553,11 @@ void MasterPagesSelector::Execute (SfxRequest& rRequest)
|
|
||||||
case SID_TP_EDIT_MASTER:
|
|
||||||
{
|
|
||||||
using namespace ::com::sun::star;
|
|
||||||
- uno::Reference<drawing::XDrawPage> xSelectedMaster (
|
|
||||||
- GetSelectedMasterPage()->getUnoPage(), uno::UNO_QUERY);
|
|
||||||
+ uno::Reference<drawing::XDrawPage> xSelectedMaster;
|
|
||||||
+ SdPage* pMasterPage = GetSelectedMasterPage();
|
|
||||||
+ assert(pMasterPage); //rhbz#902884
|
|
||||||
+ if (pMasterPage)
|
|
||||||
+ xSelectedMaster = uno::Reference<drawing::XDrawPage>(pMasterPage->getUnoPage(), uno::UNO_QUERY);
|
|
||||||
SfxViewFrame* pViewFrame = mrBase.GetViewFrame();
|
|
||||||
if (pViewFrame != NULL && xSelectedMaster.is())
|
|
||||||
{
|
|
||||||
--
|
|
||||||
1.8.1.2
|
|
||||||
|
|
||||||
@ -1,31 +0,0 @@
|
|||||||
From 02917cb57e2c2e9fcab2db8f72960023f3e4edaf Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
|
||||||
Date: Tue, 16 Apr 2013 13:40:04 +0100
|
|
||||||
Subject: [PATCH] Resolves: fdo#47209 and rhbz#927223 syntax highlighter crash
|
|
||||||
|
|
||||||
when trying to parse empty lines looking for the matching
|
|
||||||
bracket
|
|
||||||
|
|
||||||
Change-Id: I3961a3d0e804d136de286e21934c6ba5ab0496cf
|
|
||||||
---
|
|
||||||
svtools/source/edit/editsyntaxhighlighter.cxx | 4 ++++
|
|
||||||
1 file changed, 4 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/svtools/source/edit/editsyntaxhighlighter.cxx b/svtools/source/edit/editsyntaxhighlighter.cxx
|
|
||||||
index 62a7a25..3f1cd8d 100644
|
|
||||||
--- a/svtools/source/edit/editsyntaxhighlighter.cxx
|
|
||||||
+++ b/svtools/source/edit/editsyntaxhighlighter.cxx
|
|
||||||
@@ -89,6 +89,10 @@ void MultiLineEditSyntaxHighlight::DoBracketHilight(sal_uInt16 aKey)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
String aLine( GetTextEngine()->GetText( aPara ) );
|
|
||||||
+
|
|
||||||
+ if (aLine.Len() == 0)
|
|
||||||
+ continue;
|
|
||||||
+
|
|
||||||
for (sal_uInt16 i = ((unsigned long)aPara==nStartPara) ? aStartPos-1 : (sal_uInt16)(aLine.Len()-1); i>0; --i)
|
|
||||||
{
|
|
||||||
if (aLine.GetChar(i)==aChar)
|
|
||||||
--
|
|
||||||
1.8.1.2
|
|
||||||
|
|
||||||
@ -1,88 +0,0 @@
|
|||||||
From b1beaf3f7a7d332890ea3877b657cd014562cf33 Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
|
||||||
Date: Tue, 12 Mar 2013 16:33:01 +0000
|
|
||||||
Subject: [PATCH] Resolves: rhbz#920697, #i110881#, rhbz#623191 presentation
|
|
||||||
not fullscreen
|
|
||||||
|
|
||||||
Undecorated windows don't go full-screen correctly. Lets try and avoid using
|
|
||||||
gtk_window_set_decorated and rely on gtk_window_set_role to get the WM to do
|
|
||||||
the right thing.
|
|
||||||
|
|
||||||
Change-Id: I0f9e9c26372ac50398fa69c404013e3035ed637b
|
|
||||||
---
|
|
||||||
vcl/unx/gtk/window/gtkframe.cxx | 32 --------------------------------
|
|
||||||
1 file changed, 32 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
|
|
||||||
index 07f6fb3..9433ae5 100644
|
|
||||||
--- a/vcl/unx/gtk/window/gtkframe.cxx
|
|
||||||
+++ b/vcl/unx/gtk/window/gtkframe.cxx
|
|
||||||
@@ -1091,7 +1091,6 @@ void GtkSalFrame::Init( SalFrame* pParent, sal_uLong nStyle )
|
|
||||||
|
|
||||||
if( bDecoHandling )
|
|
||||||
{
|
|
||||||
- bool bNoDecor = ! (nStyle & (SAL_FRAME_STYLE_MOVEABLE | SAL_FRAME_STYLE_SIZEABLE | SAL_FRAME_STYLE_CLOSEABLE ) );
|
|
||||||
GdkWindowTypeHint eType = GDK_WINDOW_TYPE_HINT_NORMAL;
|
|
||||||
if( (nStyle & SAL_FRAME_STYLE_DIALOG) && m_pParent != 0 )
|
|
||||||
eType = GDK_WINDOW_TYPE_HINT_DIALOG;
|
|
||||||
@@ -1109,7 +1108,6 @@ void GtkSalFrame::Init( SalFrame* pParent, sal_uLong nStyle )
|
|
||||||
{
|
|
||||||
eType = GDK_WINDOW_TYPE_HINT_TOOLBAR;
|
|
||||||
lcl_set_accept_focus( GTK_WINDOW(m_pWindow), sal_False, true );
|
|
||||||
- bNoDecor = true;
|
|
||||||
}
|
|
||||||
else if( (nStyle & SAL_FRAME_STYLE_FLOAT_FOCUSABLE) )
|
|
||||||
{
|
|
||||||
@@ -1124,8 +1122,6 @@ void GtkSalFrame::Init( SalFrame* pParent, sal_uLong nStyle )
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
gtk_window_set_type_hint( GTK_WINDOW(m_pWindow), eType );
|
|
||||||
- if( bNoDecor )
|
|
||||||
- gtk_window_set_decorated( GTK_WINDOW(m_pWindow), FALSE );
|
|
||||||
gtk_window_set_gravity( GTK_WINDOW(m_pWindow), GDK_GRAVITY_STATIC );
|
|
||||||
if( m_pParent && ! (m_pParent->m_nStyle & SAL_FRAME_STYLE_PLUG) )
|
|
||||||
gtk_window_set_transient_for( GTK_WINDOW(m_pWindow), GTK_WINDOW(m_pParent->m_pWindow) );
|
|
||||||
@@ -3331,40 +3327,12 @@ gboolean GtkSalFrame::signalFocus( GtkWidget*, GdkEventFocus* pEvent, gpointer f
|
|
||||||
return sal_False;
|
|
||||||
}
|
|
||||||
|
|
||||||
-extern "C" {
|
|
||||||
-gboolean implDelayedFullScreenHdl (void *pWindow)
|
|
||||||
-{
|
|
||||||
- SolarMutexGuard aGuard;
|
|
||||||
-
|
|
||||||
- /* #i110881# workaround a gtk issue (see
|
|
||||||
- https://bugzilla.redhat.com/show_bug.cgi?id=623191#c8)
|
|
||||||
- gtk_window_fullscreen can fail due to a race condition,
|
|
||||||
- request an additional status change to fullscreen to be
|
|
||||||
- safe: if the window is now mapped ... and wasn't
|
|
||||||
- previously, ie. the race; we'll end up doing a nice
|
|
||||||
- gdk_wmspec_change_state here anyway.
|
|
||||||
- */
|
|
||||||
- if( pWindow )
|
|
||||||
- {
|
|
||||||
- gdk_window_fullscreen( GDK_WINDOW( pWindow ) );
|
|
||||||
- g_object_unref( pWindow );
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
- return FALSE;
|
|
||||||
-}
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
gboolean GtkSalFrame::signalMap( GtkWidget *pWidget, GdkEvent*, gpointer frame )
|
|
||||||
{
|
|
||||||
GtkSalFrame* pThis = (GtkSalFrame*)frame;
|
|
||||||
|
|
||||||
GTK_YIELD_GRAB();
|
|
||||||
|
|
||||||
- if( pThis->m_bFullscreen )
|
|
||||||
- g_idle_add_full( G_PRIORITY_HIGH, implDelayedFullScreenHdl,
|
|
||||||
- g_object_ref( widget_get_window( pThis->m_pWindow ) ),
|
|
||||||
- NULL );
|
|
||||||
-
|
|
||||||
bool bSetFocus = pThis->m_bSetFocusOnMap;
|
|
||||||
pThis->m_bSetFocusOnMap = false;
|
|
||||||
|
|
||||||
--
|
|
||||||
1.8.1.2
|
|
||||||
|
|
||||||
@ -1,33 +0,0 @@
|
|||||||
From b62048701cea5024383e19314592f2edcd9810fd Mon Sep 17 00:00:00 2001
|
|
||||||
From: Stephan Bergmann <sbergman@redhat.com>
|
|
||||||
Date: Sat, 16 Feb 2013 22:39:13 +0100
|
|
||||||
Subject: [PATCH] Work around problem with boost::shared_array(NULL) ctor and
|
|
||||||
Boost 1.53.0
|
|
||||||
|
|
||||||
...claiming
|
|
||||||
|
|
||||||
template<class Y> boost::shared_array<T>::shared_array(Y*)
|
|
||||||
|
|
||||||
is not a viable option due to mismatched types 'Y*' and 'long int'
|
|
||||||
|
|
||||||
Change-Id: I8db321cd25cd73c84fa2a3124c9ec1018c131d5f
|
|
||||||
---
|
|
||||||
vcl/source/gdi/svgdata.cxx | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/vcl/source/gdi/svgdata.cxx b/vcl/source/gdi/svgdata.cxx
|
|
||||||
index 01707e6..e64646f 100644
|
|
||||||
--- a/vcl/source/gdi/svgdata.cxx
|
|
||||||
+++ b/vcl/source/gdi/svgdata.cxx
|
|
||||||
@@ -166,7 +166,7 @@ SvgData::SvgData(const SvgDataArray& rSvgDataArray, sal_uInt32 nSvgDataArrayLeng
|
|
||||||
|
|
||||||
//////////////////////////////////////////////////////////////////////////////
|
|
||||||
SvgData::SvgData(const OUString& rPath):
|
|
||||||
- maSvgDataArray(NULL),
|
|
||||||
+ maSvgDataArray(),
|
|
||||||
mnSvgDataArrayLength(0),
|
|
||||||
maPath(rPath),
|
|
||||||
maRange(),
|
|
||||||
--
|
|
||||||
1.8.1.2
|
|
||||||
|
|
||||||
@ -3,10 +3,10 @@ index 6280984..ffafa6b 100644
|
|||||||
--- a/sw/Module_sw.mk
|
--- a/sw/Module_sw.mk
|
||||||
+++ b/sw/Module_sw.mk
|
+++ b/sw/Module_sw.mk
|
||||||
@@ -55,7 +55,6 @@
|
@@ -55,7 +55,6 @@
|
||||||
$(eval $(call gb_Module_add_slowcheck_targets,sw,\
|
CppunitTest_sw_htmlexport \
|
||||||
CppunitTest_sw_macros_test \
|
CppunitTest_sw_macros_test \
|
||||||
CppunitTest_sw_subsequent_ooxmlexport \
|
CppunitTest_sw_ooxmlexport \
|
||||||
- CppunitTest_sw_subsequent_ooxmlimport \
|
- CppunitTest_sw_ooxmlimport \
|
||||||
CppunitTest_sw_subsequent_ww8export \
|
CppunitTest_sw_ww8export \
|
||||||
CppunitTest_sw_subsequent_ww8import \
|
CppunitTest_sw_ww8import \
|
||||||
CppunitTest_sw_subsequent_rtfexport \
|
CppunitTest_sw_rtfexport \
|
||||||
|
|||||||
42
0001-disable-failing-perf-test.patch
Normal file
42
0001-disable-failing-perf-test.patch
Normal file
@ -0,0 +1,42 @@
|
|||||||
|
From 9f3a7f6e99a8df8b5680fd1ac3aaf11ef2cd8b7c Mon Sep 17 00:00:00 2001
|
||||||
|
From: David Tardon <dtardon@redhat.com>
|
||||||
|
Date: Thu, 23 May 2013 15:50:48 +0200
|
||||||
|
Subject: [PATCH] disable failing perf test
|
||||||
|
|
||||||
|
Change-Id: I8fabaa349be0c69ac2a1bc730bb1e134a9cde515
|
||||||
|
---
|
||||||
|
sc/qa/unit/ucalc.cxx | 4 +++-
|
||||||
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
|
||||||
|
index 36a59fa..7306bb8 100644
|
||||||
|
--- a/sc/qa/unit/ucalc.cxx
|
||||||
|
+++ b/sc/qa/unit/ucalc.cxx
|
||||||
|
@@ -284,7 +284,7 @@ public:
|
||||||
|
|
||||||
|
CPPUNIT_TEST_SUITE(Test);
|
||||||
|
#if !defined(DBG_UTIL) && !defined(_WIN32_WINNT)
|
||||||
|
- CPPUNIT_TEST(testPerf);
|
||||||
|
+ // CPPUNIT_TEST(testPerf);
|
||||||
|
#endif
|
||||||
|
CPPUNIT_TEST(testCollator);
|
||||||
|
CPPUNIT_TEST(testRangeList);
|
||||||
|
@@ -508,6 +508,7 @@ void Test::tearDown()
|
||||||
|
} \
|
||||||
|
} while (0)
|
||||||
|
|
||||||
|
+#if 0
|
||||||
|
void Test::testPerf()
|
||||||
|
{
|
||||||
|
CPPUNIT_ASSERT_MESSAGE ("failed to insert sheet", m_pDoc->InsertTab (0, "foo"));
|
||||||
|
@@ -792,6 +793,7 @@ void Test::testPerf()
|
||||||
|
|
||||||
|
m_pDoc->DeleteTab(0);
|
||||||
|
}
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
void Test::testCollator()
|
||||||
|
{
|
||||||
|
--
|
||||||
|
1.8.1.4
|
||||||
|
|
||||||
27
0001-do-not-build-LibreOffice_Test.patch
Normal file
27
0001-do-not-build-LibreOffice_Test.patch
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
From ac58f62832260af9473eca69e764586258692bb6 Mon Sep 17 00:00:00 2001
|
||||||
|
From: David Tardon <dtardon@redhat.com>
|
||||||
|
Date: Thu, 23 May 2013 14:21:31 +0200
|
||||||
|
Subject: [PATCH] do not build LibreOffice_Test
|
||||||
|
|
||||||
|
Change-Id: I74d8d5192b007432a0943d10e82d0c5dad3a605c
|
||||||
|
---
|
||||||
|
instsetoo_native/CustomTarget_install.mk | 3 ---
|
||||||
|
1 file changed, 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/instsetoo_native/CustomTarget_install.mk b/instsetoo_native/CustomTarget_install.mk
|
||||||
|
index 0962ac8..d3d922285 100644
|
||||||
|
--- a/instsetoo_native/CustomTarget_install.mk
|
||||||
|
+++ b/instsetoo_native/CustomTarget_install.mk
|
||||||
|
@@ -118,9 +118,6 @@ else # LIBO_DEV_INSTALL
|
||||||
|
ifeq (ODK,$(filter ODK,$(BUILD_TYPE)))
|
||||||
|
$(call instsetoo_native_install_command,sdkoo,en-US,_SDK,,$(PKGFORMAT))
|
||||||
|
endif
|
||||||
|
-ifeq (,$(filter WNT MACOSX,$(OS)))
|
||||||
|
- $(call instsetoo_native_install_command,not-used,en-US,_Test,,$(PKGFORMAT))
|
||||||
|
-endif
|
||||||
|
ifeq (HELP,$(filter HELP,$(BUILD_TYPE))$(filter MACOSX,$(OS)))
|
||||||
|
$(foreach lang,$(filter-out $(WITH_POOR_HELP_LOCALIZATIONS),$(instsetoo_native_WITH_LANG)), \
|
||||||
|
$(call instsetoo_native_install_command,ooohelppack,$(lang),,-helppack,$(PKGFORMAT)))
|
||||||
|
--
|
||||||
|
1.8.1.4
|
||||||
|
|
||||||
@ -1,187 +0,0 @@
|
|||||||
From d4bab97023e3569571a92551040574b20aceca7c Mon Sep 17 00:00:00 2001
|
|
||||||
From: Mark Wright <markwright@internode.on.net>
|
|
||||||
Date: Sun, 10 Feb 2013 02:04:02 +1100
|
|
||||||
Subject: [PATCH] fix compile for change to boost 1.53.0 declaring smart
|
|
||||||
pointer operator bool as explicity for C++11 compilers
|
|
||||||
|
|
||||||
Change-Id: If2c3ad68b2ffea645a9f2035cd802553edc0ee79
|
|
||||||
Reviewed-on: https://gerrit.libreoffice.org/2064
|
|
||||||
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
|
|
||||||
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
|
|
||||||
---
|
|
||||||
comphelper/inc/comphelper/scoped_disposing_ptr.hxx | 2 +-
|
|
||||||
sc/source/filter/excel/xechart.cxx | 2 +-
|
|
||||||
sc/source/filter/excel/xehelper.cxx | 2 +-
|
|
||||||
sc/source/filter/excel/xichart.cxx | 2 +-
|
|
||||||
sc/source/filter/inc/xichart.hxx | 4 ++--
|
|
||||||
slideshow/source/engine/animatedsprite.cxx | 2 +-
|
|
||||||
slideshow/source/engine/shapes/viewshape.cxx | 2 +-
|
|
||||||
slideshow/source/engine/shapesubset.cxx | 2 +-
|
|
||||||
slideshow/source/engine/slide/slideanimations.cxx | 2 +-
|
|
||||||
slideshow/source/inc/shapeattributelayer.hxx | 2 +-
|
|
||||||
slideshow/source/inc/shapeattributelayerholder.hxx | 2 +-
|
|
||||||
sw/source/core/inc/bookmrk.hxx | 2 +-
|
|
||||||
12 files changed, 13 insertions(+), 13 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/comphelper/inc/comphelper/scoped_disposing_ptr.hxx b/comphelper/inc/comphelper/scoped_disposing_ptr.hxx
|
|
||||||
index 9b4fe1b..6c34074 100644
|
|
||||||
--- a/comphelper/inc/comphelper/scoped_disposing_ptr.hxx
|
|
||||||
+++ b/comphelper/inc/comphelper/scoped_disposing_ptr.hxx
|
|
||||||
@@ -78,7 +78,7 @@ public:
|
|
||||||
|
|
||||||
operator bool () const
|
|
||||||
{
|
|
||||||
- return m_aItem;
|
|
||||||
+ return static_cast< bool >(m_aItem);
|
|
||||||
}
|
|
||||||
|
|
||||||
virtual ~scoped_disposing_ptr()
|
|
||||||
diff --git a/sc/source/filter/excel/xechart.cxx b/sc/source/filter/excel/xechart.cxx
|
|
||||||
index fd99e8b..75a2eb2 100644
|
|
||||||
--- a/sc/source/filter/excel/xechart.cxx
|
|
||||||
+++ b/sc/source/filter/excel/xechart.cxx
|
|
||||||
@@ -683,7 +683,7 @@ void XclExpChEscherFormat::Convert( const ScfPropertySet& rPropSet, XclChObjectT
|
|
||||||
|
|
||||||
bool XclExpChEscherFormat::IsValid() const
|
|
||||||
{
|
|
||||||
- return maData.mxEscherSet;
|
|
||||||
+ return static_cast< bool >(maData.mxEscherSet);
|
|
||||||
}
|
|
||||||
|
|
||||||
void XclExpChEscherFormat::Save( XclExpStream& rStrm )
|
|
||||||
diff --git a/sc/source/filter/excel/xehelper.cxx b/sc/source/filter/excel/xehelper.cxx
|
|
||||||
index c493560..81e9ac2 100644
|
|
||||||
--- a/sc/source/filter/excel/xehelper.cxx
|
|
||||||
+++ b/sc/source/filter/excel/xehelper.cxx
|
|
||||||
@@ -303,7 +303,7 @@ rtl::OUString XclExpHyperlinkHelper::ProcessUrlField( const SvxURLField& rUrlFie
|
|
||||||
if( GetBiff() == EXC_BIFF8 ) // no HLINK records in BIFF2-BIFF7
|
|
||||||
{
|
|
||||||
// there was/is already a HLINK record
|
|
||||||
- mbMultipleUrls = mxLinkRec;
|
|
||||||
+ mbMultipleUrls = static_cast< bool >(mxLinkRec);
|
|
||||||
|
|
||||||
mxLinkRec.reset( new XclExpHyperlink( GetRoot(), rUrlField, maScPos ) );
|
|
||||||
|
|
||||||
diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx
|
|
||||||
index 63c9c43..f2321bf 100644
|
|
||||||
--- a/sc/source/filter/excel/xichart.cxx
|
|
||||||
+++ b/sc/source/filter/excel/xichart.cxx
|
|
||||||
@@ -2690,7 +2690,7 @@ void XclImpChTypeGroup::Finalize()
|
|
||||||
maType.Finalize( bStockChart );
|
|
||||||
|
|
||||||
// extended type info
|
|
||||||
- maTypeInfo.Set( maType.GetTypeInfo(), mxChart3d, false );
|
|
||||||
+ maTypeInfo.Set( maType.GetTypeInfo(), static_cast< bool >(mxChart3d), false );
|
|
||||||
|
|
||||||
// reverse series order for some unstacked 2D chart types
|
|
||||||
if( maTypeInfo.mbReverseSeries && !Is3dChart() && !maType.IsStacked() && !maType.IsPercent() )
|
|
||||||
diff --git a/sc/source/filter/inc/xichart.hxx b/sc/source/filter/inc/xichart.hxx
|
|
||||||
index 57538f0..7c44412 100644
|
|
||||||
--- a/sc/source/filter/inc/xichart.hxx
|
|
||||||
+++ b/sc/source/filter/inc/xichart.hxx
|
|
||||||
@@ -1230,9 +1230,9 @@ public:
|
|
||||||
/** Returns true, if the axis contains caption labels. */
|
|
||||||
inline bool HasLabels() const { return !mxTick || mxTick->HasLabels(); }
|
|
||||||
/** Returns true, if the axis shows its major grid lines. */
|
|
||||||
- inline bool HasMajorGrid() const { return mxMajorGrid; }
|
|
||||||
+ inline bool HasMajorGrid() const { return static_cast< bool >(mxMajorGrid); }
|
|
||||||
/** Returns true, if the axis shows its minor grid lines. */
|
|
||||||
- inline bool HasMinorGrid() const { return mxMinorGrid; }
|
|
||||||
+ inline bool HasMinorGrid() const { return static_cast< bool >(mxMinorGrid); }
|
|
||||||
|
|
||||||
/** Creates an API axis object. */
|
|
||||||
XAxisRef CreateAxis( const XclImpChTypeGroup& rTypeGroup, const XclImpChAxis* pCrossingAxis ) const;
|
|
||||||
diff --git a/slideshow/source/engine/animatedsprite.cxx b/slideshow/source/engine/animatedsprite.cxx
|
|
||||||
index e63d600..5d421c2 100644
|
|
||||||
--- a/slideshow/source/engine/animatedsprite.cxx
|
|
||||||
+++ b/slideshow/source/engine/animatedsprite.cxx
|
|
||||||
@@ -151,7 +151,7 @@ namespace slideshow
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
- return mpSprite;
|
|
||||||
+ return static_cast< bool >(mpSprite);
|
|
||||||
}
|
|
||||||
|
|
||||||
void AnimatedSprite::setPixelOffset( const ::basegfx::B2DSize& rPixelOffset )
|
|
||||||
diff --git a/slideshow/source/engine/shapes/viewshape.cxx b/slideshow/source/engine/shapes/viewshape.cxx
|
|
||||||
index 20c73de..621535f 100644
|
|
||||||
--- a/slideshow/source/engine/shapes/viewshape.cxx
|
|
||||||
+++ b/slideshow/source/engine/shapes/viewshape.cxx
|
|
||||||
@@ -178,7 +178,7 @@ namespace slideshow
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
- return io_rCacheEntry.mpRenderer;
|
|
||||||
+ return static_cast< bool >(io_rCacheEntry.mpRenderer);
|
|
||||||
}
|
|
||||||
|
|
||||||
bool ViewShape::draw( const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas,
|
|
||||||
diff --git a/slideshow/source/engine/shapesubset.cxx b/slideshow/source/engine/shapesubset.cxx
|
|
||||||
index c5636cc..da28159 100644
|
|
||||||
--- a/slideshow/source/engine/shapesubset.cxx
|
|
||||||
+++ b/slideshow/source/engine/shapesubset.cxx
|
|
||||||
@@ -104,7 +104,7 @@ namespace slideshow
|
|
||||||
maTreeNode );
|
|
||||||
}
|
|
||||||
|
|
||||||
- return mpSubsetShape;
|
|
||||||
+ return static_cast< bool >(mpSubsetShape);
|
|
||||||
}
|
|
||||||
|
|
||||||
void ShapeSubset::disableSubsetShape()
|
|
||||||
diff --git a/slideshow/source/engine/slide/slideanimations.cxx b/slideshow/source/engine/slide/slideanimations.cxx
|
|
||||||
index 5f5e9f5..7d4c788 100644
|
|
||||||
--- a/slideshow/source/engine/slide/slideanimations.cxx
|
|
||||||
+++ b/slideshow/source/engine/slide/slideanimations.cxx
|
|
||||||
@@ -74,7 +74,7 @@ namespace slideshow
|
|
||||||
|
|
||||||
SHOW_NODE_TREE( mpRootNode );
|
|
||||||
|
|
||||||
- return mpRootNode;
|
|
||||||
+ return static_cast< bool >(mpRootNode);
|
|
||||||
}
|
|
||||||
|
|
||||||
bool SlideAnimations::isAnimated() const
|
|
||||||
diff --git a/slideshow/source/inc/shapeattributelayer.hxx b/slideshow/source/inc/shapeattributelayer.hxx
|
|
||||||
index 88405f8..d725255 100644
|
|
||||||
--- a/slideshow/source/inc/shapeattributelayer.hxx
|
|
||||||
+++ b/slideshow/source/inc/shapeattributelayer.hxx
|
|
||||||
@@ -467,7 +467,7 @@ namespace slideshow
|
|
||||||
// ShapeAttributeLayer(const ShapeAttributeLayer&);
|
|
||||||
// ShapeAttributeLayer& operator=( const ShapeAttributeLayer& );
|
|
||||||
|
|
||||||
- bool haveChild() const { return mpChild; }
|
|
||||||
+ bool haveChild() const { return static_cast< bool >(mpChild); }
|
|
||||||
void updateStateIds();
|
|
||||||
|
|
||||||
template< typename T > T calcValue( const T& rCurrValue,
|
|
||||||
diff --git a/slideshow/source/inc/shapeattributelayerholder.hxx b/slideshow/source/inc/shapeattributelayerholder.hxx
|
|
||||||
index e53be46..22ce4f3 100644
|
|
||||||
--- a/slideshow/source/inc/shapeattributelayerholder.hxx
|
|
||||||
+++ b/slideshow/source/inc/shapeattributelayerholder.hxx
|
|
||||||
@@ -83,7 +83,7 @@ namespace slideshow
|
|
||||||
if( mpShape )
|
|
||||||
mpAttributeLayer = mpShape->createAttributeLayer();
|
|
||||||
|
|
||||||
- return mpAttributeLayer;
|
|
||||||
+ return static_cast< bool >(mpAttributeLayer);
|
|
||||||
}
|
|
||||||
|
|
||||||
ShapeAttributeLayerSharedPtr get() const
|
|
||||||
diff --git a/sw/source/core/inc/bookmrk.hxx b/sw/source/core/inc/bookmrk.hxx
|
|
||||||
index 6937a19..bab92bb 100644
|
|
||||||
--- a/sw/source/core/inc/bookmrk.hxx
|
|
||||||
+++ b/sw/source/core/inc/bookmrk.hxx
|
|
||||||
@@ -75,7 +75,7 @@ namespace sw {
|
|
||||||
|
|
||||||
virtual bool IsCoveringPosition(const SwPosition& rPos) const;
|
|
||||||
virtual bool IsExpanded() const
|
|
||||||
- { return m_pPos2; }
|
|
||||||
+ { return static_cast< bool >(m_pPos2); }
|
|
||||||
|
|
||||||
virtual void SetName(const ::rtl::OUString& rName)
|
|
||||||
{ m_aName = rName; }
|
|
||||||
--
|
|
||||||
1.8.1.2
|
|
||||||
|
|
||||||
46
0001-fix-syntax-errors-in-python-wizards.patch
Normal file
46
0001-fix-syntax-errors-in-python-wizards.patch
Normal file
@ -0,0 +1,46 @@
|
|||||||
|
From b646f2063ab74f6c5f6a7e08baad10e446a166fb Mon Sep 17 00:00:00 2001
|
||||||
|
From: David Tardon <dtardon@redhat.com>
|
||||||
|
Date: Fri, 24 May 2013 09:54:20 +0200
|
||||||
|
Subject: [PATCH] fix syntax errors in python wizards
|
||||||
|
|
||||||
|
Change-Id: Ia237a0095c2cc783f52224bdde5d525baafacc52
|
||||||
|
---
|
||||||
|
wizards/com/sun/star/wizards/web/LogTaskListener.py | 2 +-
|
||||||
|
wizards/com/sun/star/wizards/web/export/ImpressHTMLExporter.py | 6 +++---
|
||||||
|
2 files changed, 4 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/wizards/com/sun/star/wizards/web/LogTaskListener.py b/wizards/com/sun/star/wizards/web/LogTaskListener.py
|
||||||
|
index 13b7e59..a1fba5f 100644
|
||||||
|
--- a/wizards/com/sun/star/wizards/web/LogTaskListener.py
|
||||||
|
+++ b/wizards/com/sun/star/wizards/web/LogTaskListener.py
|
||||||
|
@@ -35,7 +35,7 @@ class LogTaskListener(TaskListener, ErrorHandler):
|
||||||
|
out.println("TASK " + te.getTask().getTaskName() + " FINISHED: " + te.getTask().getSuccessfull() + "/" + te.getTask().getMax() + "Succeeded.")
|
||||||
|
|
||||||
|
#@see com.sun.star.wizards.web.status.TaskListener#taskStatusChanged(com.sun.star.wizards.web.status.TaskEvent)
|
||||||
|
- def taskStatusChanged(te)
|
||||||
|
+ def taskStatusChanged(te):
|
||||||
|
out.println("TASK " + te.getTask().getTaskName() + " status : " + te.getTask().getSuccessfull() + "(+" + te.getTask().getFailed() + ")/" + te.getTask().getMax())
|
||||||
|
|
||||||
|
#@see com.sun.star.wizards.web.status.TaskListener#subtaskNameChanged(com.sun.star.wizards.web.status.TaskEvent)
|
||||||
|
diff --git a/wizards/com/sun/star/wizards/web/export/ImpressHTMLExporter.py b/wizards/com/sun/star/wizards/web/export/ImpressHTMLExporter.py
|
||||||
|
index c60a6dd..0b620c1 100644
|
||||||
|
--- a/wizards/com/sun/star/wizards/web/export/ImpressHTMLExporter.py
|
||||||
|
+++ b/wizards/com/sun/star/wizards/web/export/ImpressHTMLExporter.py
|
||||||
|
@@ -60,11 +60,11 @@ class ImpressHTMLExporter(ConfiguredExporter):
|
||||||
|
size = session.cp_Design.cp_OptimizeDisplaySize
|
||||||
|
if (size == 0):
|
||||||
|
return self.SMALL_IMAGE
|
||||||
|
- elif (size == 1)
|
||||||
|
+ elif (size == 1):
|
||||||
|
return self.MEDIUM_IMAGE
|
||||||
|
- elif (size == 2)
|
||||||
|
+ elif (size == 2):
|
||||||
|
return self.LARGE_IMAGE
|
||||||
|
return self.MEDIUM_IMAGE
|
||||||
|
|
||||||
|
- def getSession(doc)
|
||||||
|
+ def getSession(doc):
|
||||||
|
return doc.getSettings().cp_DefaultSession
|
||||||
|
--
|
||||||
|
1.8.1.4
|
||||||
|
|
||||||
@ -1,975 +0,0 @@
|
|||||||
From e41d94885aeee12b9d00ad52611517901ff3d2c3 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Caolán McNamara <caolanm@redhat.com>
|
|
||||||
Date: Thu, 7 Feb 2013 17:18:09 +0000
|
|
||||||
Subject: [PATCH] make evolution-3.6 work with address book
|
|
||||||
|
|
||||||
Change-Id: I04d2a4d7d1520567dd0eb929ffb5d9fa53d35dd4
|
|
||||||
---
|
|
||||||
connectivity/source/drivers/evoab2/EApi.cxx | 109 ++---
|
|
||||||
connectivity/source/drivers/evoab2/EApi.h | 25 ++
|
|
||||||
.../source/drivers/evoab2/NDatabaseMetaData.cxx | 136 +++++--
|
|
||||||
connectivity/source/drivers/evoab2/NResultSet.cxx | 441 ++++++++++++++-------
|
|
||||||
connectivity/source/drivers/evoab2/NResultSet.hxx | 24 +-
|
|
||||||
.../source/core/api/SingleSelectQueryComposer.cxx | 12 +
|
|
||||||
6 files changed, 510 insertions(+), 237 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/connectivity/source/drivers/evoab2/EApi.cxx b/connectivity/source/drivers/evoab2/EApi.cxx
|
|
||||||
index 84701e1..608b1f9 100644
|
|
||||||
--- a/connectivity/source/drivers/evoab2/EApi.cxx
|
|
||||||
+++ b/connectivity/source/drivers/evoab2/EApi.cxx
|
|
||||||
@@ -22,6 +22,7 @@
|
|
||||||
#define DECLARE_FN_POINTERS 1
|
|
||||||
#include "EApi.h"
|
|
||||||
static const char *eBookLibNames[] = {
|
|
||||||
+ "libebook-1.2.so.14", // bumped again (evolution-3.6)
|
|
||||||
"libebook-1.2.so.13", // bumped again (evolution-3.4)
|
|
||||||
"libebook-1.2.so.12", // bumped again
|
|
||||||
"libebook-1.2.so.10", // bumped again
|
|
||||||
@@ -34,25 +35,23 @@ static const char *eBookLibNames[] = {
|
|
||||||
typedef void (*SymbolFunc) (void);
|
|
||||||
|
|
||||||
#define SYM_MAP(a) { #a, (SymbolFunc *)&a }
|
|
||||||
- static struct {
|
|
||||||
+struct ApiMap
|
|
||||||
+{
|
|
||||||
const char *sym_name;
|
|
||||||
SymbolFunc *ref_value;
|
|
||||||
- } aApiMap[] = {
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+static ApiMap aCommonApiMap[] =
|
|
||||||
+{
|
|
||||||
+ SYM_MAP( eds_check_version ),
|
|
||||||
SYM_MAP( e_contact_field_name ),
|
|
||||||
SYM_MAP( e_contact_get ),
|
|
||||||
SYM_MAP( e_contact_get_type ),
|
|
||||||
SYM_MAP( e_contact_field_id ),
|
|
||||||
- SYM_MAP( e_source_peek_name ),
|
|
||||||
- SYM_MAP( e_source_get_property ),
|
|
||||||
- SYM_MAP( e_source_list_peek_groups ),
|
|
||||||
- SYM_MAP( e_source_group_peek_sources ),
|
|
||||||
SYM_MAP( e_book_new ),
|
|
||||||
SYM_MAP( e_book_open ),
|
|
||||||
- SYM_MAP( e_book_get_uri ),
|
|
||||||
SYM_MAP( e_book_get_source ),
|
|
||||||
- SYM_MAP( e_book_get_addressbooks ),
|
|
||||||
SYM_MAP( e_book_get_contacts ),
|
|
||||||
- SYM_MAP( e_book_authenticate_user ),
|
|
||||||
SYM_MAP( e_book_query_field_test ),
|
|
||||||
SYM_MAP( e_book_query_and ),
|
|
||||||
SYM_MAP( e_book_query_or ),
|
|
||||||
@@ -61,26 +60,55 @@ typedef void (*SymbolFunc) (void);
|
|
||||||
SYM_MAP( e_book_query_unref ),
|
|
||||||
SYM_MAP( e_book_query_from_string ),
|
|
||||||
SYM_MAP( e_book_query_to_string ),
|
|
||||||
- SYM_MAP( e_book_query_field_exists ),
|
|
||||||
- SYM_MAP( e_source_group_peek_base_uri)
|
|
||||||
- };
|
|
||||||
+ SYM_MAP( e_book_query_field_exists )
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+//< 3-6 api
|
|
||||||
+static ApiMap aOldApiMap[] =
|
|
||||||
+{
|
|
||||||
+ SYM_MAP( e_book_get_addressbooks ),
|
|
||||||
+ SYM_MAP( e_book_get_uri ),
|
|
||||||
+ SYM_MAP( e_book_authenticate_user ),
|
|
||||||
+ SYM_MAP( e_source_group_peek_base_uri),
|
|
||||||
+ SYM_MAP( e_source_peek_name ),
|
|
||||||
+ SYM_MAP( e_source_get_property ),
|
|
||||||
+ SYM_MAP( e_source_list_peek_groups ),
|
|
||||||
+ SYM_MAP( e_source_group_peek_sources )
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+//>= 3-6 api
|
|
||||||
+static ApiMap aNewApiMap[] =
|
|
||||||
+{
|
|
||||||
+ SYM_MAP( e_source_registry_list_sources ),
|
|
||||||
+ SYM_MAP( e_source_registry_new_sync ),
|
|
||||||
+ SYM_MAP( e_source_has_extension ),
|
|
||||||
+ SYM_MAP( e_source_get_extension ),
|
|
||||||
+ SYM_MAP( e_source_backend_get_backend_name ),
|
|
||||||
+ SYM_MAP( e_source_get_display_name ),
|
|
||||||
+ SYM_MAP( e_source_get_uid ),
|
|
||||||
+ SYM_MAP( e_source_registry_ref_source),
|
|
||||||
+ SYM_MAP( e_book_client_new ),
|
|
||||||
+ SYM_MAP( e_client_open_sync ),
|
|
||||||
+ SYM_MAP( e_client_get_source ),
|
|
||||||
+ SYM_MAP( e_book_client_get_contacts_sync ),
|
|
||||||
+ SYM_MAP( e_client_util_free_object_slist )
|
|
||||||
+};
|
|
||||||
#undef SYM_MAP
|
|
||||||
|
|
||||||
static bool
|
|
||||||
-tryLink( oslModule &aModule, const char *pName )
|
|
||||||
+tryLink( oslModule &aModule, const char *pName, ApiMap *pMap, guint nEntries )
|
|
||||||
{
|
|
||||||
- for( guint i = 0; i < G_N_ELEMENTS( aApiMap ); i++ )
|
|
||||||
+ for (guint i = 0; i < nEntries; ++i)
|
|
||||||
{
|
|
||||||
- SymbolFunc aMethod;
|
|
||||||
- aMethod = (SymbolFunc) osl_getFunctionSymbol
|
|
||||||
- ( aModule, rtl::OUString::createFromAscii ( aApiMap[ i ].sym_name ).pData );
|
|
||||||
- if( !aMethod )
|
|
||||||
- {
|
|
||||||
- fprintf( stderr, "Warning: missing symbol '%s' in '%s'",
|
|
||||||
- aApiMap[ i ].sym_name, pName );
|
|
||||||
- return false;
|
|
||||||
- }
|
|
||||||
- * aApiMap[ i ].ref_value = aMethod;
|
|
||||||
+ SymbolFunc aMethod = (SymbolFunc)osl_getFunctionSymbol
|
|
||||||
+ (aModule, OUString::createFromAscii ( pMap[ i ].sym_name ).pData);
|
|
||||||
+ if( !aMethod )
|
|
||||||
+ {
|
|
||||||
+ fprintf( stderr, "Warning: missing symbol '%s' in '%s'\n",
|
|
||||||
+ pMap[ i ].sym_name, pName );
|
|
||||||
+ return false;
|
|
||||||
+ }
|
|
||||||
+ *pMap[ i ].ref_value = aMethod;
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
@@ -96,8 +124,18 @@ bool EApiInit()
|
|
||||||
SAL_LOADMODULE_DEFAULT );
|
|
||||||
if( aModule)
|
|
||||||
{
|
|
||||||
- if ( tryLink( aModule, eBookLibNames[ j ] ) )
|
|
||||||
- return true;
|
|
||||||
+ if (tryLink( aModule, eBookLibNames[ j ], aCommonApiMap, G_N_ELEMENTS(aCommonApiMap)))
|
|
||||||
+ {
|
|
||||||
+ if (eds_check_version(3, 6, 0) == NULL)
|
|
||||||
+ {
|
|
||||||
+ if (tryLink( aModule, eBookLibNames[ j ], aNewApiMap, G_N_ELEMENTS(aNewApiMap)))
|
|
||||||
+ return true;
|
|
||||||
+ }
|
|
||||||
+ else if (tryLink( aModule, eBookLibNames[ j ], aOldApiMap, G_N_ELEMENTS(aOldApiMap)))
|
|
||||||
+ {
|
|
||||||
+ return true;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
osl_unloadModule( aModule );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -105,23 +143,4 @@ bool EApiInit()
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
-#if 0
|
|
||||||
-// hjs: SOLARDEF does no longer exist please lookup the required
|
|
||||||
-// defines in a regular compile line
|
|
||||||
-/*
|
|
||||||
- * Test code - enable &
|
|
||||||
- *
|
|
||||||
- * Compile with ( after source LinuxIntelEnv.Set.sh )
|
|
||||||
- gcc $SOLARDEF -I $SOLARVER/$UPD/$INPATH/inc \
|
|
||||||
- -I. `pkg-config --cflags --libs gobject-2.0` \
|
|
||||||
- -L $SOLARVER/$UPD/$INPATH/lib -luno_sal -lstdc++ EApi.cxx
|
|
||||||
- */
|
|
||||||
-
|
|
||||||
-int main( int argc, char **argv)
|
|
||||||
-{
|
|
||||||
- return EApiInit();
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
-#endif
|
|
||||||
-
|
|
||||||
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|
|
||||||
diff --git a/connectivity/source/drivers/evoab2/EApi.h b/connectivity/source/drivers/evoab2/EApi.h
|
|
||||||
index bf3a901..8d188a9 100644
|
|
||||||
--- a/connectivity/source/drivers/evoab2/EApi.h
|
|
||||||
+++ b/connectivity/source/drivers/evoab2/EApi.h
|
|
||||||
@@ -130,6 +130,31 @@ typedef struct {
|
|
||||||
char *code;
|
|
||||||
char *country;
|
|
||||||
} EContactAddress;
|
|
||||||
+
|
|
||||||
+#define E_SOURCE_EXTENSION_ADDRESS_BOOK "Address Book"
|
|
||||||
+typedef void ESourceRegistry;
|
|
||||||
+typedef void GCancellable;
|
|
||||||
+typedef void ESourceBackend;
|
|
||||||
+typedef void EClient;
|
|
||||||
+typedef EClient EBookClient;
|
|
||||||
+EAPI_EXTERN ESourceRegistry* (*e_source_registry_new_sync) (GCancellable *cancellable, GError **error);
|
|
||||||
+EAPI_EXTERN GList* (*e_source_registry_list_sources) (ESourceRegistry *registry, const gchar *extension_name);
|
|
||||||
+EAPI_EXTERN gboolean (*e_source_has_extension) (ESource *source, const gchar *extension_name);
|
|
||||||
+EAPI_EXTERN gpointer (*e_source_get_extension) (ESource *source, const gchar *extension_name);
|
|
||||||
+EAPI_EXTERN const gchar* (*e_source_backend_get_backend_name) (ESourceBackend *extension);
|
|
||||||
+EAPI_EXTERN const gchar* (*e_source_get_display_name) (ESource *source);
|
|
||||||
+EAPI_EXTERN const gchar* (*eds_check_version) (guint required_major, guint required_minor, guint required_micro);
|
|
||||||
+EAPI_EXTERN const gchar* (*e_source_get_uid) (ESource *source);
|
|
||||||
+EAPI_EXTERN ESource* (*e_source_registry_ref_source) (ESourceRegistry *registry, const gchar *uid);
|
|
||||||
+EAPI_EXTERN EBookClient* (*e_book_client_new) (ESource *source, GError **error);
|
|
||||||
+EAPI_EXTERN gboolean (*e_client_open_sync) (EClient *client, gboolean only_if_exists, GCancellable *cancellable, GError **error);
|
|
||||||
+EAPI_EXTERN ESource* (*e_client_get_source) (EClient *client);
|
|
||||||
+EAPI_EXTERN gboolean (*e_book_client_get_contacts_sync) (EBookClient *client, const gchar *sexp, GSList **contacts, GCancellable *cancellable, GError **error);
|
|
||||||
+EAPI_EXTERN void (*e_client_util_free_object_slist) (GSList *objects);
|
|
||||||
+
|
|
||||||
+ESourceRegistry *get_e_source_registry();
|
|
||||||
+bool isSourceBackend(ESource *pSource, const char *backendname);
|
|
||||||
+
|
|
||||||
G_END_DECLS
|
|
||||||
#endif
|
|
||||||
|
|
||||||
diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
|
|
||||||
index d0198e5..a83de24 100644
|
|
||||||
--- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
|
|
||||||
+++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
|
|
||||||
@@ -1074,7 +1074,25 @@ Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getColumns(
|
|
||||||
pResultSet->setRows( getColumnRows( columnNamePattern ) );
|
|
||||||
return xResultSet;
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+ESourceRegistry *get_e_source_registry()
|
|
||||||
+{
|
|
||||||
+ static ESourceRegistry *theInstance;
|
|
||||||
+ if (!theInstance)
|
|
||||||
+ theInstance = e_source_registry_new_sync(NULL, NULL);
|
|
||||||
+ return theInstance;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
// -------------------------------------------------------------------------
|
|
||||||
+bool isSourceBackend(ESource *pSource, const char *backendname)
|
|
||||||
+{
|
|
||||||
+ if (!pSource || !e_source_has_extension (pSource, E_SOURCE_EXTENSION_ADDRESS_BOOK))
|
|
||||||
+ return false;
|
|
||||||
+
|
|
||||||
+ gpointer extension = e_source_get_extension (pSource, E_SOURCE_EXTENSION_ADDRESS_BOOK);
|
|
||||||
+ return extension && g_strcmp0 (e_source_backend_get_backend_name (extension), backendname) == 0;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTables(
|
|
||||||
const Any& /*catalog*/, const ::rtl::OUString& /*schemaPattern*/,
|
|
||||||
const ::rtl::OUString& /*tableNamePattern*/, const Sequence< ::rtl::OUString >& types ) throw(SQLException, RuntimeException)
|
|
||||||
@@ -1111,50 +1129,96 @@ Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTables(
|
|
||||||
|
|
||||||
ODatabaseMetaDataResultSet::ORows aRows;
|
|
||||||
|
|
||||||
- ESourceList *pSourceList;
|
|
||||||
- if( !e_book_get_addressbooks (&pSourceList, NULL) )
|
|
||||||
- pSourceList = NULL;
|
|
||||||
-
|
|
||||||
- GSList *g;
|
|
||||||
- for( g = e_source_list_peek_groups( pSourceList ); g; g = g->next)
|
|
||||||
+ if (eds_check_version(3, 6, 0) == NULL)
|
|
||||||
{
|
|
||||||
- GSList *s;
|
|
||||||
- const char *p = e_source_group_peek_base_uri(E_SOURCE_GROUP(g->data));
|
|
||||||
-
|
|
||||||
- switch (m_pConnection->getSDBCAddressType()) {
|
|
||||||
- case SDBCAddress::EVO_GWISE:
|
|
||||||
- if ( !strncmp( "groupwise://", p, 11 ))
|
|
||||||
- break;
|
|
||||||
- else
|
|
||||||
- continue;
|
|
||||||
- case SDBCAddress::EVO_LOCAL:
|
|
||||||
- if ( !strncmp( "file://", p, 6 ) ||
|
|
||||||
- !strncmp( "local://", p, 6 ) )
|
|
||||||
- break;
|
|
||||||
- else
|
|
||||||
- continue;
|
|
||||||
- case SDBCAddress::EVO_LDAP:
|
|
||||||
- if ( !strncmp( "ldap://", p, 6 ))
|
|
||||||
- break;
|
|
||||||
- else
|
|
||||||
- continue;
|
|
||||||
- case SDBCAddress::Unknown:
|
|
||||||
- break;
|
|
||||||
- }
|
|
||||||
- for (s = e_source_group_peek_sources (E_SOURCE_GROUP (g->data)); s; s = s->next)
|
|
||||||
- {
|
|
||||||
- ESource *pSource = E_SOURCE (s->data);
|
|
||||||
+ GList *pSources = e_source_registry_list_sources(get_e_source_registry(), E_SOURCE_EXTENSION_ADDRESS_BOOK);
|
|
||||||
|
|
||||||
- rtl::OUString aName = rtl::OStringToOUString( e_source_peek_name( pSource ),
|
|
||||||
- RTL_TEXTENCODING_UTF8 );
|
|
||||||
+ for (GList* liter = pSources; liter; liter = liter->next)
|
|
||||||
+ {
|
|
||||||
+ ESource *pSource = E_SOURCE (liter->data);
|
|
||||||
+ bool can = false;
|
|
||||||
+ switch (m_pConnection->getSDBCAddressType())
|
|
||||||
+ {
|
|
||||||
+ case SDBCAddress::EVO_GWISE:
|
|
||||||
+ can = isSourceBackend( pSource, "groupwise"); // not supported in evo/eds 3.6.x+, somehow
|
|
||||||
+ break;
|
|
||||||
+ case SDBCAddress::EVO_LOCAL:
|
|
||||||
+ can = isSourceBackend( pSource, "local");
|
|
||||||
+ break;
|
|
||||||
+ case SDBCAddress::EVO_LDAP:
|
|
||||||
+ can = isSourceBackend( pSource, "ldap");
|
|
||||||
+ break;
|
|
||||||
+ case SDBCAddress::Unknown:
|
|
||||||
+ can = true;
|
|
||||||
+ break;
|
|
||||||
+ }
|
|
||||||
+ if (!can)
|
|
||||||
+ continue;
|
|
||||||
|
|
||||||
ODatabaseMetaDataResultSet::ORow aRow(3);
|
|
||||||
aRow.reserve(6);
|
|
||||||
- aRow.push_back(new ORowSetValueDecorator(aName));
|
|
||||||
+ OUString aHumanName = OStringToOUString( e_source_get_display_name( pSource ),
|
|
||||||
+ RTL_TEXTENCODING_UTF8 );
|
|
||||||
+ aRow.push_back(new ORowSetValueDecorator(aHumanName)); //tablename
|
|
||||||
aRow.push_back(new ORowSetValueDecorator(aTable));
|
|
||||||
- aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue());
|
|
||||||
+ OUString aUID = OStringToOUString( e_source_get_uid( pSource ),
|
|
||||||
+ RTL_TEXTENCODING_UTF8 );
|
|
||||||
+ aRow.push_back(new ORowSetValueDecorator(aUID)); //comment
|
|
||||||
+ //I'd prefer to swap the comment and the human name and
|
|
||||||
+ //just use e_source_registry_ref_source(get_e_source_registry(), aUID);
|
|
||||||
+ //in open book rather than search for the name again
|
|
||||||
aRows.push_back(aRow);
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+ g_list_free_full (pSources, g_object_unref);
|
|
||||||
+ }
|
|
||||||
+ else
|
|
||||||
+ {
|
|
||||||
+ ESourceList *pSourceList;
|
|
||||||
+ if( !e_book_get_addressbooks (&pSourceList, NULL) )
|
|
||||||
+ pSourceList = NULL;
|
|
||||||
+
|
|
||||||
+ GSList *g;
|
|
||||||
+ for( g = e_source_list_peek_groups( pSourceList ); g; g = g->next)
|
|
||||||
+ {
|
|
||||||
+ GSList *s;
|
|
||||||
+ const char *p = e_source_group_peek_base_uri(E_SOURCE_GROUP(g->data));
|
|
||||||
+
|
|
||||||
+ switch (m_pConnection->getSDBCAddressType()) {
|
|
||||||
+ case SDBCAddress::EVO_GWISE:
|
|
||||||
+ if ( !strncmp( "groupwise://", p, 11 ))
|
|
||||||
+ break;
|
|
||||||
+ else
|
|
||||||
+ continue;
|
|
||||||
+ case SDBCAddress::EVO_LOCAL:
|
|
||||||
+ if ( !strncmp( "file://", p, 6 ) ||
|
|
||||||
+ !strncmp( "local://", p, 6 ) )
|
|
||||||
+ break;
|
|
||||||
+ else
|
|
||||||
+ continue;
|
|
||||||
+ case SDBCAddress::EVO_LDAP:
|
|
||||||
+ if ( !strncmp( "ldap://", p, 6 ))
|
|
||||||
+ break;
|
|
||||||
+ else
|
|
||||||
+ continue;
|
|
||||||
+ case SDBCAddress::Unknown:
|
|
||||||
+ break;
|
|
||||||
+ }
|
|
||||||
+ for (s = e_source_group_peek_sources (E_SOURCE_GROUP (g->data)); s; s = s->next)
|
|
||||||
+ {
|
|
||||||
+ ESource *pSource = E_SOURCE (s->data);
|
|
||||||
+
|
|
||||||
+ rtl::OUString aName = rtl::OStringToOUString( e_source_peek_name( pSource ),
|
|
||||||
+ RTL_TEXTENCODING_UTF8 );
|
|
||||||
+
|
|
||||||
+ ODatabaseMetaDataResultSet::ORow aRow(3);
|
|
||||||
+ aRow.reserve(6);
|
|
||||||
+ aRow.push_back(new ORowSetValueDecorator(aName));
|
|
||||||
+ aRow.push_back(new ORowSetValueDecorator(aTable));
|
|
||||||
+ aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue());
|
|
||||||
+ aRows.push_back(aRow);
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
|
|
||||||
pResult->setRows(aRows);
|
|
||||||
diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx b/connectivity/source/drivers/evoab2/NResultSet.cxx
|
|
||||||
index b5f4640..26690b1 100644
|
|
||||||
--- a/connectivity/source/drivers/evoab2/NResultSet.cxx
|
|
||||||
+++ b/connectivity/source/drivers/evoab2/NResultSet.cxx
|
|
||||||
@@ -87,109 +87,17 @@ sal_Bool SAL_CALL OEvoabResultSet::supportsService( const ::rtl::OUString& _rSer
|
|
||||||
return pSupported != pEnd;
|
|
||||||
}
|
|
||||||
|
|
||||||
-// -------------------------------------------------------------------------
|
|
||||||
-OEvoabResultSet::OEvoabResultSet( OCommonStatement* pStmt, OEvoabConnection *pConnection )
|
|
||||||
- :OResultSet_BASE(m_aMutex)
|
|
||||||
- ,::comphelper::OPropertyContainer( OResultSet_BASE::rBHelper )
|
|
||||||
- ,m_pStatement(pStmt)
|
|
||||||
- ,m_pConnection(pConnection)
|
|
||||||
- ,m_xMetaData(NULL)
|
|
||||||
- ,m_bWasNull(sal_True)
|
|
||||||
- ,m_nFetchSize(0)
|
|
||||||
- ,m_nResultSetType(ResultSetType::SCROLL_INSENSITIVE)
|
|
||||||
- ,m_nFetchDirection(FetchDirection::FORWARD)
|
|
||||||
- ,m_nResultSetConcurrency(ResultSetConcurrency::READ_ONLY)
|
|
||||||
- ,m_pContacts(NULL)
|
|
||||||
- ,m_nIndex(-1)
|
|
||||||
- ,m_nLength(0)
|
|
||||||
-{
|
|
||||||
- #define REGISTER_PROP( id, member ) \
|
|
||||||
- registerProperty( \
|
|
||||||
- OMetaConnection::getPropMap().getNameByIndex( id ), \
|
|
||||||
- id, \
|
|
||||||
- PropertyAttribute::READONLY, \
|
|
||||||
- &member, \
|
|
||||||
- ::getCppuType( &member ) \
|
|
||||||
- );
|
|
||||||
-
|
|
||||||
- REGISTER_PROP( PROPERTY_ID_FETCHSIZE, m_nFetchSize );
|
|
||||||
- REGISTER_PROP( PROPERTY_ID_RESULTSETTYPE, m_nResultSetType );
|
|
||||||
- REGISTER_PROP( PROPERTY_ID_FETCHDIRECTION, m_nFetchDirection );
|
|
||||||
- REGISTER_PROP( PROPERTY_ID_RESULTSETCONCURRENCY, m_nResultSetConcurrency );
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
-// -------------------------------------------------------------------------
|
|
||||||
-OEvoabResultSet::~OEvoabResultSet()
|
|
||||||
-{
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
-// -------------------------------------------------------------------------
|
|
||||||
-
|
|
||||||
-static ESource *
|
|
||||||
-findSource( const char *name )
|
|
||||||
+struct ComparisonData
|
|
||||||
{
|
|
||||||
- ESourceList *pSourceList = NULL;
|
|
||||||
+ const SortDescriptor& rSortOrder;
|
|
||||||
+ IntlWrapper aIntlWrapper;
|
|
||||||
|
|
||||||
- g_return_val_if_fail (name != NULL, NULL);
|
|
||||||
-
|
|
||||||
- if (!e_book_get_addressbooks (&pSourceList, NULL))
|
|
||||||
- pSourceList = NULL;
|
|
||||||
-
|
|
||||||
- for ( GSList *g = e_source_list_peek_groups (pSourceList); g; g = g->next)
|
|
||||||
+ ComparisonData( const SortDescriptor& _rSortOrder, const Reference< XComponentContext >& _rxContext )
|
|
||||||
+ :rSortOrder( _rSortOrder )
|
|
||||||
+ ,aIntlWrapper( _rxContext, SvtSysLocale().GetLanguageTag() )
|
|
||||||
{
|
|
||||||
- for (GSList *s = e_source_group_peek_sources (E_SOURCE_GROUP (g->data)); s; s = s->next)
|
|
||||||
- {
|
|
||||||
- ESource *pSource = E_SOURCE (s->data);
|
|
||||||
- if (!strcmp (e_source_peek_name (pSource), name))
|
|
||||||
- return pSource;
|
|
||||||
- }
|
|
||||||
}
|
|
||||||
- return NULL;
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
-static EBook *
|
|
||||||
-openBook( const char *abname )
|
|
||||||
-{
|
|
||||||
- ESource *pSource = findSource (abname);
|
|
||||||
- EBook *pBook = NULL;
|
|
||||||
- if (pSource)
|
|
||||||
- pBook = e_book_new (pSource, NULL);
|
|
||||||
-
|
|
||||||
- if (pBook && !e_book_open (pBook, TRUE, NULL))
|
|
||||||
- {
|
|
||||||
- g_object_unref (G_OBJECT (pBook));
|
|
||||||
- pBook = NULL;
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
- return pBook;
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
-static bool isLDAP( EBook *pBook )
|
|
||||||
-{
|
|
||||||
- return pBook && !strncmp( "ldap://", e_book_get_uri( pBook ), 6 );
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
-static bool isLocal( EBook *pBook )
|
|
||||||
-{
|
|
||||||
- return pBook && ( !strncmp( "file://", e_book_get_uri( pBook ), 6 ) ||
|
|
||||||
- !strncmp( "local:", e_book_get_uri( pBook ), 6 ) );
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
-static bool isAuthRequired( EBook *pBook )
|
|
||||||
-{
|
|
||||||
- return e_source_get_property( e_book_get_source( pBook ),
|
|
||||||
- "auth" ) != NULL;
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
-static rtl::OString getUserName( EBook *pBook )
|
|
||||||
-{
|
|
||||||
- rtl::OString aName;
|
|
||||||
- if( isLDAP( pBook ) )
|
|
||||||
- aName = e_source_get_property( e_book_get_source( pBook ), "binddn" );
|
|
||||||
- else
|
|
||||||
- aName = e_source_get_property( e_book_get_source( pBook ), "user" );
|
|
||||||
- return aName;
|
|
||||||
-}
|
|
||||||
+};
|
|
||||||
|
|
||||||
static ::rtl::OUString
|
|
||||||
valueToOUString( GValue& _rValue )
|
|
||||||
@@ -209,29 +117,6 @@ valueToBool( GValue& _rValue )
|
|
||||||
return bResult;
|
|
||||||
}
|
|
||||||
|
|
||||||
-static bool
|
|
||||||
-executeQuery (EBook* pBook, EBookQuery* pQuery, GList **ppList,
|
|
||||||
- rtl::OString &rPassword, GError **pError)
|
|
||||||
-{
|
|
||||||
- ESource *pSource = e_book_get_source( pBook );
|
|
||||||
- bool bSuccess = false;
|
|
||||||
- bool bAuthSuccess = true;
|
|
||||||
-
|
|
||||||
- *ppList = NULL;
|
|
||||||
-
|
|
||||||
- if( isAuthRequired( pBook ) )
|
|
||||||
- {
|
|
||||||
- rtl::OString aUser( getUserName( pBook ) );
|
|
||||||
- const char *pAuth = e_source_get_property( pSource, "auth" );
|
|
||||||
- bAuthSuccess = e_book_authenticate_user( pBook, aUser.getStr(), rPassword.getStr(), pAuth, pError );
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
- if (bAuthSuccess)
|
|
||||||
- bSuccess = e_book_get_contacts( pBook, pQuery, ppList, pError );
|
|
||||||
-
|
|
||||||
- return bSuccess;
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
static int
|
|
||||||
whichAddress(int value)
|
|
||||||
{
|
|
||||||
@@ -368,6 +253,7 @@ handleSplitAddress( EContact *pContact,GValue *pStackValue, int value )
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
+
|
|
||||||
static bool
|
|
||||||
getValue( EContact* pContact, sal_Int32 nColumnNum, GType nType, GValue* pStackValue, bool& _out_rWasNull )
|
|
||||||
{
|
|
||||||
@@ -420,21 +306,6 @@ getValue( EContact* pContact, sal_Int32 nColumnNum, GType nType, GValue* pStackV
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
-namespace
|
|
||||||
-{
|
|
||||||
- struct ComparisonData
|
|
||||||
- {
|
|
||||||
- const SortDescriptor& rSortOrder;
|
|
||||||
- IntlWrapper aIntlWrapper;
|
|
||||||
-
|
|
||||||
- ComparisonData( const SortDescriptor& _rSortOrder, const Reference< XComponentContext >& _rxContext )
|
|
||||||
- :rSortOrder( _rSortOrder )
|
|
||||||
- ,aIntlWrapper( _rxContext, SvtSysLocale().GetLanguageTag() )
|
|
||||||
- {
|
|
||||||
- }
|
|
||||||
- };
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
extern "C"
|
|
||||||
int CompareContacts( gconstpointer _lhs, gconstpointer _rhs, gpointer _userData )
|
|
||||||
{
|
|
||||||
@@ -493,13 +364,278 @@ int CompareContacts( gconstpointer _lhs, gconstpointer _rhs, gpointer _userData
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
-static GList*
|
|
||||||
-sortContacts( GList* _pContactList, const ComparisonData& _rCompData )
|
|
||||||
+OString OEvoabVersionHelper::getUserName( EBook *pBook )
|
|
||||||
{
|
|
||||||
- OSL_ENSURE( !_rCompData.rSortOrder.empty(), "sortContacts: no need to call this without any sort order!" );
|
|
||||||
- ENSURE_OR_THROW( _rCompData.aIntlWrapper.getCaseCollator(), "no collator for comparing strings" );
|
|
||||||
+ OString aName;
|
|
||||||
+ if( isLDAP( pBook ) )
|
|
||||||
+ aName = e_source_get_property( e_book_get_source( pBook ), "binddn" );
|
|
||||||
+ else
|
|
||||||
+ aName = e_source_get_property( e_book_get_source( pBook ), "user" );
|
|
||||||
+ return aName;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+class OEvoabVersion36Helper : public OEvoabVersionHelper
|
|
||||||
+{
|
|
||||||
+private:
|
|
||||||
+ GSList *m_pContacts;
|
|
||||||
+public:
|
|
||||||
+ OEvoabVersion36Helper()
|
|
||||||
+ : m_pContacts(NULL)
|
|
||||||
+ {
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ ~OEvoabVersion36Helper()
|
|
||||||
+ {
|
|
||||||
+ freeContacts();
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ virtual EBook* openBook(const char *abname)
|
|
||||||
+ {
|
|
||||||
+ //It would be better if here we had id to begin with, see
|
|
||||||
+ //NDatabaseMetaData.cxx
|
|
||||||
+ const char *id = NULL;
|
|
||||||
+ GList *pSources = e_source_registry_list_sources(get_e_source_registry(), E_SOURCE_EXTENSION_ADDRESS_BOOK);
|
|
||||||
+ for (GList* liter = pSources; liter; liter = liter->next)
|
|
||||||
+ {
|
|
||||||
+ ESource *pSource = E_SOURCE (liter->data);
|
|
||||||
|
|
||||||
- return g_list_sort_with_data( _pContactList, &CompareContacts, const_cast< gpointer >( static_cast< gconstpointer >( &_rCompData ) ) );
|
|
||||||
+ if (strcmp(abname, e_source_get_display_name( pSource )) == 0)
|
|
||||||
+ {
|
|
||||||
+ id = e_source_get_uid( pSource );
|
|
||||||
+ break;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ g_list_free_full (pSources, g_object_unref);
|
|
||||||
+ if (!id)
|
|
||||||
+ return NULL;
|
|
||||||
+
|
|
||||||
+ ESource *pSource = e_source_registry_ref_source(get_e_source_registry(), id);
|
|
||||||
+ EBookClient *pBook = pSource ? e_book_client_new (pSource, NULL) : NULL;
|
|
||||||
+ if (pBook && !e_client_open_sync (pBook, TRUE, NULL, NULL))
|
|
||||||
+ {
|
|
||||||
+ g_object_unref (G_OBJECT (pBook));
|
|
||||||
+ pBook = NULL;
|
|
||||||
+ }
|
|
||||||
+ if (pSource)
|
|
||||||
+ g_object_unref (pSource);
|
|
||||||
+ return pBook;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ bool isBookBackend( EBookClient *pBook, const char *backendname)
|
|
||||||
+ {
|
|
||||||
+ if (!pBook)
|
|
||||||
+ return false;
|
|
||||||
+ ESource *pSource = e_client_get_source ((EClient *) pBook);
|
|
||||||
+ return isSourceBackend(pSource, backendname);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ virtual bool isLDAP( EBook *pBook )
|
|
||||||
+ {
|
|
||||||
+ return isBookBackend(pBook, "ldap");
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ virtual bool isLocal( EBook *pBook )
|
|
||||||
+ {
|
|
||||||
+ return isBookBackend(pBook, "local");
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ virtual void freeContacts()
|
|
||||||
+ {
|
|
||||||
+ e_client_util_free_object_slist(m_pContacts);
|
|
||||||
+ m_pContacts = NULL;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ virtual bool executeQuery (EBook* pBook, EBookQuery* pQuery, OString &/*rPassword*/)
|
|
||||||
+ {
|
|
||||||
+ freeContacts();
|
|
||||||
+ char *sexp = e_book_query_to_string( pQuery );
|
|
||||||
+ bool bSuccess = e_book_client_get_contacts_sync( pBook, sexp, &m_pContacts, NULL, NULL );
|
|
||||||
+ g_free (sexp);
|
|
||||||
+ return bSuccess;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ virtual EContact *getContact(sal_Int32 nIndex)
|
|
||||||
+ {
|
|
||||||
+ gpointer pData = g_slist_nth_data (m_pContacts, nIndex);
|
|
||||||
+ return pData ? E_CONTACT (pData) : NULL;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ virtual sal_Int32 getNumContacts()
|
|
||||||
+ {
|
|
||||||
+ return g_slist_length( m_pContacts );
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ virtual bool hasContacts()
|
|
||||||
+ {
|
|
||||||
+ return m_pContacts != NULL;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ virtual void sortContacts( const ComparisonData& _rCompData )
|
|
||||||
+ {
|
|
||||||
+ OSL_ENSURE( !_rCompData.rSortOrder.empty(), "sortContacts: no need to call this without any sort order!" );
|
|
||||||
+ ENSURE_OR_THROW( _rCompData.aIntlWrapper.getCaseCollator(), "no collator for comparing strings" );
|
|
||||||
+
|
|
||||||
+ m_pContacts = g_slist_sort_with_data( m_pContacts, &CompareContacts,
|
|
||||||
+ const_cast< gpointer >( static_cast< gconstpointer >( &_rCompData ) ) );
|
|
||||||
+ }
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+class OEvoabVersion35Helper : public OEvoabVersionHelper
|
|
||||||
+{
|
|
||||||
+private:
|
|
||||||
+ GList *m_pContacts;
|
|
||||||
+
|
|
||||||
+ ESource * findSource( const char *id )
|
|
||||||
+ {
|
|
||||||
+ ESourceList *pSourceList = NULL;
|
|
||||||
+
|
|
||||||
+ g_return_val_if_fail (id != NULL, NULL);
|
|
||||||
+
|
|
||||||
+ if (!e_book_get_addressbooks (&pSourceList, NULL))
|
|
||||||
+ pSourceList = NULL;
|
|
||||||
+
|
|
||||||
+ for ( GSList *g = e_source_list_peek_groups (pSourceList); g; g = g->next)
|
|
||||||
+ {
|
|
||||||
+ for (GSList *s = e_source_group_peek_sources (E_SOURCE_GROUP (g->data)); s; s = s->next)
|
|
||||||
+ {
|
|
||||||
+ ESource *pSource = E_SOURCE (s->data);
|
|
||||||
+ if (!strcmp (e_source_peek_name (pSource), id))
|
|
||||||
+ return pSource;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ return NULL;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ bool isAuthRequired( EBook *pBook )
|
|
||||||
+ {
|
|
||||||
+ return e_source_get_property( e_book_get_source( pBook ),
|
|
||||||
+ "auth" ) != NULL;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+public:
|
|
||||||
+ OEvoabVersion35Helper()
|
|
||||||
+ : m_pContacts(NULL)
|
|
||||||
+ {
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ ~OEvoabVersion35Helper()
|
|
||||||
+ {
|
|
||||||
+ freeContacts();
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ virtual EBook* openBook(const char *abname)
|
|
||||||
+ {
|
|
||||||
+ ESource *pSource = findSource (abname);
|
|
||||||
+ EBook *pBook = pSource ? e_book_new (pSource, NULL) : NULL;
|
|
||||||
+ if (pBook && !e_book_open (pBook, TRUE, NULL))
|
|
||||||
+ {
|
|
||||||
+ g_object_unref (G_OBJECT (pBook));
|
|
||||||
+ pBook = NULL;
|
|
||||||
+ }
|
|
||||||
+ return pBook;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ virtual bool isLDAP( EBook *pBook )
|
|
||||||
+ {
|
|
||||||
+ return pBook && !strncmp( "ldap://", e_book_get_uri( pBook ), 6 );
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ virtual bool isLocal( EBook *pBook )
|
|
||||||
+ {
|
|
||||||
+ return pBook && ( !strncmp( "file://", e_book_get_uri( pBook ), 6 ) ||
|
|
||||||
+ !strncmp( "local:", e_book_get_uri( pBook ), 6 ) );
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ virtual void freeContacts()
|
|
||||||
+ {
|
|
||||||
+ g_list_free(m_pContacts);
|
|
||||||
+ m_pContacts = NULL;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ virtual bool executeQuery (EBook* pBook, EBookQuery* pQuery, OString &rPassword)
|
|
||||||
+ {
|
|
||||||
+ freeContacts();
|
|
||||||
+
|
|
||||||
+ ESource *pSource = e_book_get_source( pBook );
|
|
||||||
+ bool bSuccess = false;
|
|
||||||
+ bool bAuthSuccess = true;
|
|
||||||
+
|
|
||||||
+ if( isAuthRequired( pBook ) )
|
|
||||||
+ {
|
|
||||||
+ rtl::OString aUser( getUserName( pBook ) );
|
|
||||||
+ const char *pAuth = e_source_get_property( pSource, "auth" );
|
|
||||||
+ bAuthSuccess = e_book_authenticate_user( pBook, aUser.getStr(), rPassword.getStr(), pAuth, NULL );
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ if (bAuthSuccess)
|
|
||||||
+ bSuccess = e_book_get_contacts( pBook, pQuery, &m_pContacts, NULL );
|
|
||||||
+
|
|
||||||
+ return bSuccess;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ virtual EContact *getContact(sal_Int32 nIndex)
|
|
||||||
+ {
|
|
||||||
+ gpointer pData = g_list_nth_data (m_pContacts, nIndex);
|
|
||||||
+ return pData ? E_CONTACT (pData) : NULL;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ virtual sal_Int32 getNumContacts()
|
|
||||||
+ {
|
|
||||||
+ return g_list_length( m_pContacts );
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ virtual bool hasContacts()
|
|
||||||
+ {
|
|
||||||
+ return m_pContacts != NULL;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ virtual void sortContacts( const ComparisonData& _rCompData )
|
|
||||||
+ {
|
|
||||||
+ OSL_ENSURE( !_rCompData.rSortOrder.empty(), "sortContacts: no need to call this without any sort order!" );
|
|
||||||
+ ENSURE_OR_THROW( _rCompData.aIntlWrapper.getCaseCollator(), "no collator for comparing strings" );
|
|
||||||
+
|
|
||||||
+ m_pContacts = g_list_sort_with_data( m_pContacts, &CompareContacts,
|
|
||||||
+ const_cast< gpointer >( static_cast< gconstpointer >( &_rCompData ) ) );
|
|
||||||
+ }
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+OEvoabResultSet::OEvoabResultSet( OCommonStatement* pStmt, OEvoabConnection *pConnection )
|
|
||||||
+ :OResultSet_BASE(m_aMutex)
|
|
||||||
+ ,::comphelper::OPropertyContainer( OResultSet_BASE::rBHelper )
|
|
||||||
+ ,m_pStatement(pStmt)
|
|
||||||
+ ,m_pConnection(pConnection)
|
|
||||||
+ ,m_xMetaData(NULL)
|
|
||||||
+ ,m_bWasNull(sal_True)
|
|
||||||
+ ,m_nFetchSize(0)
|
|
||||||
+ ,m_nResultSetType(ResultSetType::SCROLL_INSENSITIVE)
|
|
||||||
+ ,m_nFetchDirection(FetchDirection::FORWARD)
|
|
||||||
+ ,m_nResultSetConcurrency(ResultSetConcurrency::READ_ONLY)
|
|
||||||
+ ,m_nIndex(-1)
|
|
||||||
+ ,m_nLength(0)
|
|
||||||
+{
|
|
||||||
+ if (eds_check_version(3, 6, 0) == NULL)
|
|
||||||
+ m_pVersionHelper = new OEvoabVersion36Helper;
|
|
||||||
+ else
|
|
||||||
+ m_pVersionHelper = new OEvoabVersion35Helper;
|
|
||||||
+
|
|
||||||
+ #define REGISTER_PROP( id, member ) \
|
|
||||||
+ registerProperty( \
|
|
||||||
+ OMetaConnection::getPropMap().getNameByIndex( id ), \
|
|
||||||
+ id, \
|
|
||||||
+ PropertyAttribute::READONLY, \
|
|
||||||
+ &member, \
|
|
||||||
+ ::getCppuType( &member ) \
|
|
||||||
+ );
|
|
||||||
+
|
|
||||||
+ REGISTER_PROP( PROPERTY_ID_FETCHSIZE, m_nFetchSize );
|
|
||||||
+ REGISTER_PROP( PROPERTY_ID_RESULTSETTYPE, m_nResultSetType );
|
|
||||||
+ REGISTER_PROP( PROPERTY_ID_FETCHDIRECTION, m_nFetchDirection );
|
|
||||||
+ REGISTER_PROP( PROPERTY_ID_RESULTSETCONCURRENCY, m_nResultSetConcurrency );
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+// -------------------------------------------------------------------------
|
|
||||||
+OEvoabResultSet::~OEvoabResultSet()
|
|
||||||
+{
|
|
||||||
}
|
|
||||||
|
|
||||||
// -------------------------------------------------------------------------
|
|
||||||
@@ -507,17 +643,16 @@ void OEvoabResultSet::construct( const QueryData& _rData )
|
|
||||||
{
|
|
||||||
ENSURE_OR_THROW( _rData.getQuery(), "internal error: no EBookQuery" );
|
|
||||||
|
|
||||||
- EBook *pBook = openBook(::rtl::OUStringToOString(_rData.sTable, RTL_TEXTENCODING_UTF8).getStr());
|
|
||||||
+ EBook *pBook = m_pVersionHelper->openBook(OUStringToOString(_rData.sTable, RTL_TEXTENCODING_UTF8).getStr());
|
|
||||||
if ( !pBook )
|
|
||||||
m_pConnection->throwGenericSQLException( STR_CANNOT_OPEN_BOOK, *this );
|
|
||||||
|
|
||||||
- g_list_free(m_pContacts);
|
|
||||||
- m_pContacts = NULL;
|
|
||||||
+ m_pVersionHelper->freeContacts();
|
|
||||||
bool bExecuteQuery = true;
|
|
||||||
switch ( _rData.eFilterType )
|
|
||||||
{
|
|
||||||
case eFilterNone:
|
|
||||||
- if ( !isLocal( pBook ) )
|
|
||||||
+ if ( !m_pVersionHelper->isLocal( pBook ) )
|
|
||||||
{
|
|
||||||
SQLError aErrorFactory( m_pConnection->getDriver().getMSFactory() );
|
|
||||||
SQLException aAsException = aErrorFactory.getSQLException( ErrorCondition::DATA_CANNOT_SELECT_UNFILTERED, *this );
|
|
||||||
@@ -541,16 +676,16 @@ void OEvoabResultSet::construct( const QueryData& _rData )
|
|
||||||
if ( bExecuteQuery )
|
|
||||||
{
|
|
||||||
rtl::OString aPassword = m_pConnection->getPassword();
|
|
||||||
- executeQuery( pBook, _rData.getQuery(), &m_pContacts, aPassword, NULL );
|
|
||||||
+ m_pVersionHelper->executeQuery(pBook, _rData.getQuery(), aPassword);
|
|
||||||
m_pConnection->setPassword( aPassword );
|
|
||||||
|
|
||||||
- if ( m_pContacts && !_rData.aSortOrder.empty() )
|
|
||||||
+ if ( m_pVersionHelper->hasContacts() && !_rData.aSortOrder.empty() )
|
|
||||||
{
|
|
||||||
ComparisonData aCompData( _rData.aSortOrder, comphelper::getComponentContext(getConnection()->getDriver().getMSFactory()) );
|
|
||||||
- m_pContacts = sortContacts( m_pContacts, aCompData );
|
|
||||||
+ m_pVersionHelper->sortContacts( aCompData );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
- m_nLength = g_list_length( m_pContacts );
|
|
||||||
+ m_nLength = m_pVersionHelper->getNumContacts();
|
|
||||||
OSL_TRACE( "Query return %d records", m_nLength );
|
|
||||||
m_nIndex = -1;
|
|
||||||
|
|
||||||
@@ -567,10 +702,10 @@ void OEvoabResultSet::disposing(void)
|
|
||||||
::comphelper::OPropertyContainer::disposing();
|
|
||||||
|
|
||||||
::osl::MutexGuard aGuard(m_aMutex);
|
|
||||||
- g_list_free(m_pContacts);
|
|
||||||
- m_pContacts = NULL;
|
|
||||||
+ delete m_pVersionHelper;
|
|
||||||
+ m_pVersionHelper = NULL;
|
|
||||||
m_pStatement = NULL;
|
|
||||||
-m_xMetaData.clear();
|
|
||||||
+ m_xMetaData.clear();
|
|
||||||
}
|
|
||||||
// -------------------------------------------------------------------------
|
|
||||||
Any SAL_CALL OEvoabResultSet::queryInterface( const Type & rType ) throw(RuntimeException)
|
|
||||||
diff --git a/connectivity/source/drivers/evoab2/NResultSet.hxx b/connectivity/source/drivers/evoab2/NResultSet.hxx
|
|
||||||
index fd049fd..c3d7ab4 100644
|
|
||||||
--- a/connectivity/source/drivers/evoab2/NResultSet.hxx
|
|
||||||
+++ b/connectivity/source/drivers/evoab2/NResultSet.hxx
|
|
||||||
@@ -45,6 +45,24 @@ namespace connectivity
|
|
||||||
{
|
|
||||||
namespace evoab
|
|
||||||
{
|
|
||||||
+ class ComparisonData;
|
|
||||||
+
|
|
||||||
+ class OEvoabVersionHelper
|
|
||||||
+ {
|
|
||||||
+ public:
|
|
||||||
+ virtual EBook* openBook(const char *abname) = 0;
|
|
||||||
+ virtual bool executeQuery (EBook* pBook, EBookQuery* pQuery, OString &rPassword) = 0;
|
|
||||||
+ virtual void freeContacts() = 0;
|
|
||||||
+ virtual bool isLDAP( EBook *pBook ) = 0;
|
|
||||||
+ virtual bool isLocal( EBook *pBook ) = 0;
|
|
||||||
+ virtual EContact *getContact(sal_Int32 nIndex) = 0;
|
|
||||||
+ virtual sal_Int32 getNumContacts() = 0;
|
|
||||||
+ virtual bool hasContacts() = 0;
|
|
||||||
+ virtual void sortContacts( const ComparisonData& _rCompData ) = 0;
|
|
||||||
+ OString getUserName( EBook *pBook );
|
|
||||||
+ virtual ~OEvoabVersionHelper() {}
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
typedef ::cppu::WeakComponentImplHelper8 < ::com::sun::star::sdbc::XResultSet
|
|
||||||
, ::com::sun::star::sdbc::XRow
|
|
||||||
, ::com::sun::star::sdbc::XResultSetMetaDataSupplier
|
|
||||||
@@ -61,6 +79,8 @@ namespace connectivity
|
|
||||||
,public ::comphelper::OPropertyContainer
|
|
||||||
,public ::comphelper::OPropertyArrayUsageHelper<OEvoabResultSet>
|
|
||||||
{
|
|
||||||
+ private:
|
|
||||||
+ OEvoabVersionHelper *m_pVersionHelper;
|
|
||||||
|
|
||||||
protected:
|
|
||||||
|
|
||||||
@@ -79,13 +99,11 @@ namespace connectivity
|
|
||||||
// </properties>
|
|
||||||
|
|
||||||
// Data & iteration
|
|
||||||
- GList *m_pContacts;
|
|
||||||
sal_Int32 m_nIndex;
|
|
||||||
sal_Int32 m_nLength;
|
|
||||||
EContact *getCur()
|
|
||||||
{
|
|
||||||
- gpointer pData = g_list_nth_data (m_pContacts, m_nIndex);
|
|
||||||
- return pData ? E_CONTACT (pData) : NULL;
|
|
||||||
+ return m_pVersionHelper->getContact(m_nIndex);
|
|
||||||
}
|
|
||||||
|
|
||||||
// OPropertyArrayUsageHelper
|
|
||||||
diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
|
|
||||||
index 837836d..ad68908 100644
|
|
||||||
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
|
|
||||||
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
|
|
||||||
@@ -955,6 +955,18 @@ Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getColumns( ) thr
|
|
||||||
|
|
||||||
} while ( false );
|
|
||||||
|
|
||||||
+ bool bMissingSomeColumnLabels = !aNames.empty() && aNames.size() != aSelectColumns->get().size();
|
|
||||||
+ SAL_WARN_IF(bMissingSomeColumnLabels, "dbaccess", "We have column labels for *some* columns but not all");
|
|
||||||
+ //^^this happens in the evolution address book where we have real column names of e.g.
|
|
||||||
+ //first_name, second_name and city. On parsing via
|
|
||||||
+ //OSQLParseTreeIterator::appendColumns it creates some labels using those real names
|
|
||||||
+ //but the evo address book gives them proper labels of First Name, Second Name and City
|
|
||||||
+ //the munge means that here we have e.g. just "City" as a label because it matches
|
|
||||||
+ //
|
|
||||||
+ //This is all a horrible mess
|
|
||||||
+ if (bMissingSomeColumnLabels)
|
|
||||||
+ aNames.clear();
|
|
||||||
+
|
|
||||||
if ( aNames.empty() )
|
|
||||||
m_aCurrentColumns[ SelectColumns ] = OPrivateColumns::createWithIntrinsicNames( aSelectColumns, bCase, *this, m_aMutex );
|
|
||||||
else
|
|
||||||
--
|
|
||||||
1.8.1
|
|
||||||
|
|
||||||
@ -1,54 +0,0 @@
|
|||||||
From ecf6b9a9020d086ce411c26a1972811002d500a5 Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
|
||||||
Date: Mon, 11 Feb 2013 15:58:42 +0000
|
|
||||||
Subject: [PATCH] no g_list_free_full in RHEL-6 glib
|
|
||||||
|
|
||||||
Change-Id: I213bb62c2a9318d98f0736cc23431dca3dfd4708
|
|
||||||
---
|
|
||||||
connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx | 3 ++-
|
|
||||||
connectivity/source/drivers/evoab2/NResultSet.cxx | 3 ++-
|
|
||||||
2 files changed, 4 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
|
|
||||||
index a83de24..11742c1 100644
|
|
||||||
--- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
|
|
||||||
+++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
|
|
||||||
@@ -1170,7 +1170,8 @@ Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTables(
|
|
||||||
aRows.push_back(aRow);
|
|
||||||
}
|
|
||||||
|
|
||||||
- g_list_free_full (pSources, g_object_unref);
|
|
||||||
+ g_list_foreach (pSources, (GFunc)g_object_unref, NULL);
|
|
||||||
+ g_list_free (pSources);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx b/connectivity/source/drivers/evoab2/NResultSet.cxx
|
|
||||||
index 4baf3ae..154db40 100644
|
|
||||||
--- a/connectivity/source/drivers/evoab2/NResultSet.cxx
|
|
||||||
+++ b/connectivity/source/drivers/evoab2/NResultSet.cxx
|
|
||||||
@@ -405,7 +405,8 @@ public:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
- g_list_free_full (pSources, g_object_unref);
|
|
||||||
+ g_list_foreach (pSources, (GFunc)g_object_unref, NULL);
|
|
||||||
+ g_list_free (pSources);
|
|
||||||
if (!id)
|
|
||||||
return NULL;
|
|
||||||
|
|
||||||
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
|
|
||||||
index a33a558..63d066a 100644
|
|
||||||
--- a/vcl/inc/unx/gtk/gtkframe.hxx
|
|
||||||
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
|
|
||||||
@@ -54,6 +54,10 @@ typedef XLIB_Window GdkNativeWindow;
|
|
||||||
#define gdk_window_foreign_new_for_display(a,b) gdk_x11_window_foreign_new_for_display(a,b)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+#if !(GLIB_MAJOR_VERSION > 2 || GLIB_MINOR_VERSION >= 26)
|
|
||||||
+ typedef void GDBusConnection;
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
class GtkSalFrame : public SalFrame
|
|
||||||
{
|
|
||||||
static const int nMaxGraphics = 2;
|
|
||||||
@ -1,124 +0,0 @@
|
|||||||
From a14eedf997daf30379ceabc1933273360d4d3188 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Stephan Bergmann <sbergman@redhat.com>
|
|
||||||
Date: Wed, 20 Feb 2013 17:49:20 +0100
|
|
||||||
Subject: [PATCH] rhbz#742780: Let make OPT_FLAGS=... override SDK
|
|
||||||
optimization/debugging flags
|
|
||||||
|
|
||||||
Change-Id: I639fa16f74342b108a395d7d0335d116f96677f1
|
|
||||||
---
|
|
||||||
odk/settings/settings.mk | 52 ++++++++++++++++++++----------------------------
|
|
||||||
1 file changed, 22 insertions(+), 30 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
|
|
||||||
index a71be27..eecde50 100644
|
|
||||||
--- a/odk/settings/settings.mk
|
|
||||||
+++ b/odk/settings/settings.mk
|
|
||||||
@@ -95,17 +95,16 @@ EMPTYSTRING=
|
|
||||||
PATH_SEPARATOR=;
|
|
||||||
|
|
||||||
# use this for release version
|
|
||||||
-CC_FLAGS_JNI=-c -MT -Zm500 -Zc:forScope,wchar_t- -wd4251 -wd4275 -wd4290 -wd4675 -wd4786 -wd4800 -Zc:forScope -GR -EHa
|
|
||||||
-CC_FLAGS=-c -MT -Zm500 -Zc:forScope,wchar_t- -wd4251 -wd4275 -wd4290 -wd4675 -wd4786 -wd4800 -Zc:forScope -GR -EHa
|
|
||||||
+ifeq "$(DEBUG)" "yes"
|
|
||||||
+OPT_FLAGS=-Zi
|
|
||||||
+endif
|
|
||||||
+CC_FLAGS_JNI=-c -MT -Zm500 -Zc:forScope,wchar_t- -wd4251 -wd4275 -wd4290 -wd4675 -wd4786 -wd4800 -Zc:forScope -GR -EHa $(OPT_FLAGS)
|
|
||||||
+CC_FLAGS=-c -MT -Zm500 -Zc:forScope,wchar_t- -wd4251 -wd4275 -wd4290 -wd4675 -wd4786 -wd4800 -Zc:forScope -GR -EHa $(OPT_FLAGS)
|
|
||||||
ifeq "$(CPP_MANIFEST)" "true"
|
|
||||||
LINK_MANIFEST=mt -manifest $@.manifest "-outputresource:$@;2"
|
|
||||||
else
|
|
||||||
LINK_MANIFEST=
|
|
||||||
endif
|
|
||||||
-ifeq "$(DEBUG)" "yes"
|
|
||||||
-CC_FLAGS_JNI+=-Zi
|
|
||||||
-CC_FLAGS+=-Zi
|
|
||||||
-endif
|
|
||||||
|
|
||||||
CC_INCLUDES=-I. -I$(OUT)/inc -I$(OUT)/inc/examples -I$(PRJ)/include
|
|
||||||
SDK_JAVA_INCLUDES = -I"$(OO_SDK_JAVA_HOME)/include" -I"$(OO_SDK_JAVA_HOME)/include/win32"
|
|
||||||
@@ -213,14 +212,13 @@ STORELIB=-lstore
|
|
||||||
EMPTYSTRING=
|
|
||||||
PATH_SEPARATOR=:
|
|
||||||
|
|
||||||
-#CC_FLAGS_JNI=-c -KPIC
|
|
||||||
-#CC_FLAGS=-c -KPIC -xldscope=hidden
|
|
||||||
-CC_FLAGS_JNI=-c -fpic
|
|
||||||
-CC_FLAGS=-c -fpic -fvisibility=hidden
|
|
||||||
ifeq "$(DEBUG)" "yes"
|
|
||||||
-CC_FLAGS_JNI+=-g
|
|
||||||
-CC_FLAGS+=-g
|
|
||||||
+OPT_FLAGS=-g
|
|
||||||
endif
|
|
||||||
+#CC_FLAGS_JNI=-c -KPIC $(OPT_FLAGS)
|
|
||||||
+#CC_FLAGS=-c -KPIC -xldscope=hidden $(OPT_FLAGS)
|
|
||||||
+CC_FLAGS_JNI=-c -fpic $(OPT_FLAGS)
|
|
||||||
+CC_FLAGS=-c -fpic -fvisibility=hidden $(OPT_FLAGS)
|
|
||||||
CC_INCLUDES=-I. -I$(OUT)/inc -I$(OUT)/inc/examples -I$(PRJ)/include
|
|
||||||
SDK_JAVA_INCLUDES = -I"$(OO_SDK_JAVA_HOME)/include" -I"$(OO_SDK_JAVA_HOME)/include/solaris"
|
|
||||||
|
|
||||||
@@ -341,16 +339,14 @@ STORELIB=-lstore
|
|
||||||
EMPTYSTRING=
|
|
||||||
PATH_SEPARATOR=:
|
|
||||||
|
|
||||||
-CC_FLAGS_JNI=-c -fpic
|
|
||||||
-CC_FLAGS=-c -fpic -fvisibility=hidden
|
|
||||||
# -O is necessary for inlining (see gcc documentation)
|
|
||||||
ifeq "$(DEBUG)" "yes"
|
|
||||||
-CC_FLAGS_JNI+=-g
|
|
||||||
-CC_FLAGS+=-g
|
|
||||||
+OPT_FLAGS=-g
|
|
||||||
else
|
|
||||||
-CC_FLAGS_JNI+=-O
|
|
||||||
-CC_FLAGS+=-O
|
|
||||||
+OPT_FLAGS=-O
|
|
||||||
endif
|
|
||||||
+CC_FLAGS_JNI=-c -fpic $(OPT_FLAGS)
|
|
||||||
+CC_FLAGS=-c -fpic -fvisibility=hidden $(OPT_FLAGS)
|
|
||||||
|
|
||||||
ifeq "$(PROCTYPE)" "ppc"
|
|
||||||
CC_FLAGS+=-fPIC
|
|
||||||
@@ -466,16 +462,14 @@ INSTALL_NAME_URELIBS_BIN=$(XCRUN) install_name_tool -change @___________________
|
|
||||||
EMPTYSTRING=
|
|
||||||
PATH_SEPARATOR=:
|
|
||||||
|
|
||||||
-CC_FLAGS_JNI=-malign-natural -c -fPIC -fno-common $(GCC_ARCH_OPTION)
|
|
||||||
-CC_FLAGS=-malign-natural -c -fPIC -fno-common $(GCC_ARCH_OPTION) -fvisibility=hidden
|
|
||||||
# -O is necessary for inlining (see gcc documentation)
|
|
||||||
ifeq "$(DEBUG)" "yes"
|
|
||||||
-CC_FLAGS_JNI+=-g
|
|
||||||
-CC_FLAGS+=-g
|
|
||||||
+OPT_FLAGS=-g
|
|
||||||
else
|
|
||||||
-CC_FLAGS_JNI+=-O
|
|
||||||
-CC_FLAGS+=-O
|
|
||||||
+OPT_FLAGS=-O
|
|
||||||
endif
|
|
||||||
+CC_FLAGS_JNI=-malign-natural -c -fPIC -fno-common $(GCC_ARCH_OPTION) $(OPT_FLAGS)
|
|
||||||
+CC_FLAGS=-malign-natural -c -fPIC -fno-common $(GCC_ARCH_OPTION) -fvisibility=hidden $(OPT_FLAGS)
|
|
||||||
|
|
||||||
SDK_JAVA_INCLUDES = -I/System/Library/Frameworks/JavaVM.framework/Versions/Current/Headers -I/System/Library/Frameworks/JavaVM.framework/Headers
|
|
||||||
CC_INCLUDES=-I. -I$(OUT)/inc -I$(OUT)/inc/examples -I$(PRJ)/include
|
|
||||||
@@ -580,16 +574,14 @@ STORELIB=-lstore
|
|
||||||
EMPTYSTRING=
|
|
||||||
PATH_SEPARATOR=:
|
|
||||||
|
|
||||||
-CC_FLAGS_JNI=-c -g -fPIC -DPIC $(PTHREAD_CFLAGS)
|
|
||||||
-CC_FLAGS=-c -g -fPIC -DPIC $(PTHREAD_CFLAGS) -fvisibility=hidden
|
|
||||||
# -O is necessary for inlining (see gcc documentation)
|
|
||||||
ifeq "$(DEBUG)" "yes"
|
|
||||||
-CC_FLAGS_JNI+=-g
|
|
||||||
-CC_FLAGS+=-g
|
|
||||||
+OPT_FLAGS=-g
|
|
||||||
else
|
|
||||||
-CC_FLAGS_JNI+=-O
|
|
||||||
-CC_FLAGS+=-O
|
|
||||||
+OPT_FLAGS=-O
|
|
||||||
endif
|
|
||||||
+CC_FLAGS_JNI=-c -g -fPIC -DPIC $(PTHREAD_CFLAGS) $(OPT_FLAGS)
|
|
||||||
+CC_FLAGS=-c -g -fPIC -DPIC $(PTHREAD_CFLAGS) -fvisibility=hidden $(OPT_FLAGS)
|
|
||||||
|
|
||||||
SDK_JAVA_INCLUDES = -I"$(OO_SDK_JAVA_HOME)/include" -I"$(OO_SDK_JAVA_HOME)/include/freebsd"
|
|
||||||
CC_INCLUDES=-I. -I$(OUT)/inc -I$(OUT)/inc/examples -I$(PRJ)/include
|
|
||||||
--
|
|
||||||
1.8.1.2
|
|
||||||
|
|
||||||
@ -1,221 +0,0 @@
|
|||||||
From f2d801284657b496d0a9498a4db825dbceaafa8c Mon Sep 17 00:00:00 2001
|
|
||||||
From: Stephan Bergmann <sbergman@redhat.com>
|
|
||||||
Date: Tue, 16 Apr 2013 13:52:02 +0200
|
|
||||||
Subject: [PATCH] rhbz#867808 Do not throw RuntimeException by pointer
|
|
||||||
|
|
||||||
(cherry picked from commit e46564a0a6a74da90785a1b910d33e2b5bfdcfd9, plus
|
|
||||||
63b4633cf7b0da9eba63e752cec72cb10ed9d93e "Related: rhbz#867808 if one person
|
|
||||||
threw by pointer..." and 336353a87e6003e685aab87ea74a158546e1f297 "Related
|
|
||||||
rhbz#867808: More apparently bogus 'throw new ...' in C++ code")
|
|
||||||
Conflicts:
|
|
||||||
bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx
|
|
||||||
bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx
|
|
||||||
sdext/source/presenter/PresenterController.cxx
|
|
||||||
stoc/source/registry_tdprovider/functiondescription.cxx
|
|
||||||
stoc/source/registry_tdprovider/methoddescription.cxx
|
|
||||||
toolkit/source/awt/vclxwindow1.cxx
|
|
||||||
|
|
||||||
Change-Id: I22b7d3d642e7ee0488d6b726a331d328065bbee7
|
|
||||||
---
|
|
||||||
.../nativethreadpool/testnativethreadpoolclient.cxx | 4 ++--
|
|
||||||
.../nativethreadpool/testnativethreadpoolserver.cxx | 2 +-
|
|
||||||
.../source/transliteration/transliteration_Numeric.cxx | 6 +++---
|
|
||||||
sdext/source/presenter/PresenterController.cxx | 2 +-
|
|
||||||
stoc/source/registry_tdprovider/functiondescription.cxx | 4 ++--
|
|
||||||
stoc/source/registry_tdprovider/methoddescription.cxx | 2 +-
|
|
||||||
testtools/source/bridgetest/cli/cli_cpp_bridgetest.cxx | 6 +++---
|
|
||||||
toolkit/source/awt/stylesettings.cxx | 2 +-
|
|
||||||
toolkit/source/awt/vclxwindow1.cxx | 14 ++++++--------
|
|
||||||
9 files changed, 20 insertions(+), 22 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx
|
|
||||||
index df0991c..b7a5ff3 100644
|
|
||||||
--- a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx
|
|
||||||
+++ b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx
|
|
||||||
@@ -74,7 +74,7 @@ sal_Int32 Client::run(css::uno::Sequence< rtl::OUString > const &)
|
|
||||||
css::uno::Reference< css::lang::XMultiComponentFactory > factory(
|
|
||||||
context->getServiceManager());
|
|
||||||
if (!factory.is()) {
|
|
||||||
- throw new css::uno::RuntimeException(
|
|
||||||
+ throw css::uno::RuntimeException(
|
|
||||||
rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no component context service manager" )),
|
|
||||||
static_cast< cppu::OWeakObject * >(this));
|
|
||||||
}
|
|
||||||
@@ -94,7 +94,7 @@ sal_Int32 Client::run(css::uno::Sequence< rtl::OUString > const &)
|
|
||||||
}
|
|
||||||
relay->start(this);
|
|
||||||
if (!data.setData(reinterpret_cast< void * >(12345))) {
|
|
||||||
- throw new css::uno::RuntimeException(
|
|
||||||
+ throw css::uno::RuntimeException(
|
|
||||||
rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "osl::ThreadData::setData failed" )),
|
|
||||||
static_cast< cppu::OWeakObject * >(this));
|
|
||||||
}
|
|
||||||
diff --git a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx
|
|
||||||
index 607a054..3952ce9 100644
|
|
||||||
--- a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx
|
|
||||||
+++ b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx
|
|
||||||
@@ -63,7 +63,7 @@ sal_Int32 Server::get() throw (css::uno::RuntimeException) {
|
|
||||||
css::uno::Reference< css::lang::XMultiComponentFactory > factory(
|
|
||||||
context->getServiceManager());
|
|
||||||
if (!factory.is()) {
|
|
||||||
- throw new css::uno::RuntimeException(
|
|
||||||
+ throw css::uno::RuntimeException(
|
|
||||||
rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no component context service manager" )),
|
|
||||||
static_cast< cppu::OWeakObject * >(this));
|
|
||||||
}
|
|
||||||
diff --git a/i18npool/source/transliteration/transliteration_Numeric.cxx b/i18npool/source/transliteration/transliteration_Numeric.cxx
|
|
||||||
index eec4236..de24368 100644
|
|
||||||
--- a/i18npool/source/transliteration/transliteration_Numeric.cxx
|
|
||||||
+++ b/i18npool/source/transliteration/transliteration_Numeric.cxx
|
|
||||||
@@ -38,21 +38,21 @@ OUString SAL_CALL
|
|
||||||
transliteration_Numeric::folding( const OUString& /*inStr*/, sal_Int32 /*startPos*/, sal_Int32 /*nCount*/, Sequence< sal_Int32 >& /*offset*/ )
|
|
||||||
throw(RuntimeException)
|
|
||||||
{
|
|
||||||
- throw (new RuntimeException());
|
|
||||||
+ throw RuntimeException();
|
|
||||||
}
|
|
||||||
|
|
||||||
sal_Bool SAL_CALL
|
|
||||||
transliteration_Numeric::equals( const OUString& /*str1*/, sal_Int32 /*pos1*/, sal_Int32 /*nCount1*/, sal_Int32& /*nMatch1*/, const OUString& /*str2*/, sal_Int32 /*pos2*/, sal_Int32 /*nCount2*/, sal_Int32& /*nMatch2*/ )
|
|
||||||
throw(RuntimeException)
|
|
||||||
{
|
|
||||||
- throw (new RuntimeException());
|
|
||||||
+ throw RuntimeException();
|
|
||||||
}
|
|
||||||
|
|
||||||
Sequence< OUString > SAL_CALL
|
|
||||||
transliteration_Numeric::transliterateRange( const OUString& /*str1*/, const OUString& /*str2*/ )
|
|
||||||
throw(RuntimeException)
|
|
||||||
{
|
|
||||||
- throw (new RuntimeException());
|
|
||||||
+ throw RuntimeException();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
diff --git a/sdext/source/presenter/PresenterController.cxx b/sdext/source/presenter/PresenterController.cxx
|
|
||||||
index 14820da..44b5bea 100644
|
|
||||||
--- a/sdext/source/presenter/PresenterController.cxx
|
|
||||||
+++ b/sdext/source/presenter/PresenterController.cxx
|
|
||||||
@@ -119,7 +119,7 @@ PresenterController::PresenterController (
|
|
||||||
OSL_ASSERT(mxController.is());
|
|
||||||
|
|
||||||
if ( ! mxSlideShowController.is())
|
|
||||||
- throw new lang::IllegalArgumentException(
|
|
||||||
+ throw lang::IllegalArgumentException(
|
|
||||||
A2S("missing slide show controller"),
|
|
||||||
static_cast<XWeak*>(this),
|
|
||||||
2);
|
|
||||||
diff --git a/stoc/source/registry_tdprovider/functiondescription.cxx b/stoc/source/registry_tdprovider/functiondescription.cxx
|
|
||||||
index 8840451..3cb9635 100644
|
|
||||||
--- a/stoc/source/registry_tdprovider/functiondescription.cxx
|
|
||||||
+++ b/stoc/source/registry_tdprovider/functiondescription.cxx
|
|
||||||
@@ -71,7 +71,7 @@ FunctionDescription::getExceptions() const {
|
|
||||||
try {
|
|
||||||
any = m_manager->getByHierarchicalName(name);
|
|
||||||
} catch (const css::container::NoSuchElementException & e) {
|
|
||||||
- throw new css::uno::RuntimeException(
|
|
||||||
+ throw css::uno::RuntimeException(
|
|
||||||
(rtl::OUString(
|
|
||||||
RTL_CONSTASCII_USTRINGPARAM(
|
|
||||||
"com.sun.star.container.NoSuchElementException: "))
|
|
||||||
@@ -81,7 +81,7 @@ FunctionDescription::getExceptions() const {
|
|
||||||
if (!(any >>= exceptions[i])
|
|
||||||
|| exceptions[i]->getTypeClass() != css::uno::TypeClass_EXCEPTION)
|
|
||||||
{
|
|
||||||
- throw new css::uno::RuntimeException(
|
|
||||||
+ throw css::uno::RuntimeException(
|
|
||||||
(rtl::OUString(
|
|
||||||
RTL_CONSTASCII_USTRINGPARAM("not an exception type: "))
|
|
||||||
+ name),
|
|
||||||
diff --git a/stoc/source/registry_tdprovider/methoddescription.cxx b/stoc/source/registry_tdprovider/methoddescription.cxx
|
|
||||||
index fd2d6c3..f018d1f 100644
|
|
||||||
--- a/stoc/source/registry_tdprovider/methoddescription.cxx
|
|
||||||
+++ b/stoc/source/registry_tdprovider/methoddescription.cxx
|
|
||||||
@@ -90,7 +90,7 @@ css::uno::Reference< css::reflection::XTypeDescription > Parameter::getType()
|
|
||||||
m_manager->getByHierarchicalName(m_typeName),
|
|
||||||
css::uno::UNO_QUERY_THROW);
|
|
||||||
} catch (const css::container::NoSuchElementException & e) {
|
|
||||||
- throw new css::uno::RuntimeException(
|
|
||||||
+ throw css::uno::RuntimeException(
|
|
||||||
(rtl::OUString(
|
|
||||||
RTL_CONSTASCII_USTRINGPARAM(
|
|
||||||
"com.sun.star.container.NoSuchElementException: "))
|
|
||||||
diff --git a/testtools/source/bridgetest/cli/cli_cpp_bridgetest.cxx b/testtools/source/bridgetest/cli/cli_cpp_bridgetest.cxx
|
|
||||||
index c2e7bda..7d08eab 100644
|
|
||||||
--- a/testtools/source/bridgetest/cli/cli_cpp_bridgetest.cxx
|
|
||||||
+++ b/testtools/source/bridgetest/cli/cli_cpp_bridgetest.cxx
|
|
||||||
@@ -799,7 +799,7 @@ static bool raiseException(XBridgeTest* xLBT )
|
|
||||||
bRet = performQueryForUnknownType( xLBT ) && bRet;
|
|
||||||
if (! bRet)
|
|
||||||
{
|
|
||||||
- throw new unoidl::com::sun::star::uno::RuntimeException(
|
|
||||||
+ throw unoidl::com::sun::star::uno::RuntimeException(
|
|
||||||
new String("error: test failed!"), 0);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -819,7 +819,7 @@ static bool raiseException(XBridgeTest* xLBT )
|
|
||||||
{
|
|
||||||
if (args->Length < 1)
|
|
||||||
{
|
|
||||||
- throw new RuntimeException(
|
|
||||||
+ throw RuntimeException(
|
|
||||||
"missing argument for bridgetest!", this );
|
|
||||||
}
|
|
||||||
Object* test_obj =
|
|
||||||
@@ -846,7 +846,7 @@ static bool raiseException(XBridgeTest* xLBT )
|
|
||||||
s->Append(exc->GetType()->Name);
|
|
||||||
s->Append(S"\n Message: ");
|
|
||||||
s->Append(exc->Message);
|
|
||||||
- throw new unoidl::com::sun::star::uno::RuntimeException(
|
|
||||||
+ throw unoidl::com::sun::star::uno::RuntimeException(
|
|
||||||
s->ToString(), 0);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
diff --git a/toolkit/source/awt/stylesettings.cxx b/toolkit/source/awt/stylesettings.cxx
|
|
||||||
index 97d5e29..fc0fbaa 100644
|
|
||||||
--- a/toolkit/source/awt/stylesettings.cxx
|
|
||||||
+++ b/toolkit/source/awt/stylesettings.cxx
|
|
||||||
@@ -116,7 +116,7 @@ namespace toolkit
|
|
||||||
{
|
|
||||||
Window* pWindow = i_rOwningWindow.GetWindow();
|
|
||||||
if ( !pWindow )
|
|
||||||
- throw new RuntimeException();
|
|
||||||
+ throw RuntimeException();
|
|
||||||
pWindow->AddEventListener( LINK( m_pData.get(), WindowStyleSettings_Data, OnWindowEvent ) );
|
|
||||||
}
|
|
||||||
|
|
||||||
diff --git a/toolkit/source/awt/vclxwindow1.cxx b/toolkit/source/awt/vclxwindow1.cxx
|
|
||||||
index f38a95c..77af1b2 100644
|
|
||||||
--- a/toolkit/source/awt/vclxwindow1.cxx
|
|
||||||
+++ b/toolkit/source/awt/vclxwindow1.cxx
|
|
||||||
@@ -46,10 +46,9 @@ void VCLXWindow::SetSystemParent_Impl( const com::sun::star::uno::Any& rHandle )
|
|
||||||
Window *pWindow = GetWindow();
|
|
||||||
if ( pWindow->GetType() != WINDOW_WORKWINDOW )
|
|
||||||
{
|
|
||||||
- ::com::sun::star::uno::Exception *pException =
|
|
||||||
- new ::com::sun::star::uno::RuntimeException;
|
|
||||||
- pException->Message = ::rtl::OUString("not a work window");
|
|
||||||
- throw pException;
|
|
||||||
+ com::sun::star::uno::Exception aException;
|
|
||||||
+ aException.Message = ::rtl::OUString("not a work window");
|
|
||||||
+ throw aException;
|
|
||||||
}
|
|
||||||
|
|
||||||
// use sal_Int64 here to accomodate all int types
|
|
||||||
@@ -77,10 +76,9 @@ void VCLXWindow::SetSystemParent_Impl( const com::sun::star::uno::Any& rHandle )
|
|
||||||
}
|
|
||||||
if( bThrow )
|
|
||||||
{
|
|
||||||
- ::com::sun::star::uno::Exception *pException =
|
|
||||||
- new ::com::sun::star::uno::RuntimeException;
|
|
||||||
- pException->Message = ::rtl::OUString("incorrect window handle type");
|
|
||||||
- throw pException;
|
|
||||||
+ com::sun::star::uno::Exception aException;
|
|
||||||
+ aException.Message = ::rtl::OUString("incorrect window handle type");
|
|
||||||
+ throw aException;
|
|
||||||
}
|
|
||||||
// create system parent data
|
|
||||||
SystemParentData aSysParentData;
|
|
||||||
--
|
|
||||||
1.8.1.4
|
|
||||||
|
|
||||||
@ -1,58 +0,0 @@
|
|||||||
From ddd2de79573ab9eee065c21a5657c8a065a05d57 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Stephan Bergmann <sbergman@redhat.com>
|
|
||||||
Date: Mon, 22 Apr 2013 16:21:57 +0200
|
|
||||||
Subject: [PATCH] rhbz#954991 Avoid static data (causing trouble at exit)
|
|
||||||
|
|
||||||
(cherry picked from commit aa1aedb2a0ef97cb6110f18a1de86abc8dbcd304)
|
|
||||||
Conflicts:
|
|
||||||
vcl/inc/unx/salinst.h
|
|
||||||
vcl/unx/generic/dtrans/X11_service.cxx
|
|
||||||
|
|
||||||
Change-Id: Ifc8275276811ba24b62f93096e7cb98a5dbf658c
|
|
||||||
---
|
|
||||||
vcl/inc/unx/salinst.h | 10 ++++++++++
|
|
||||||
vcl/unx/generic/dtrans/X11_service.cxx | 2 --
|
|
||||||
2 files changed, 10 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/vcl/inc/unx/salinst.h b/vcl/inc/unx/salinst.h
|
|
||||||
index 83ba4b8..ea997d6 100644
|
|
||||||
--- a/vcl/inc/unx/salinst.h
|
|
||||||
+++ b/vcl/inc/unx/salinst.h
|
|
||||||
@@ -27,11 +27,21 @@
|
|
||||||
#include <vcl/solarmutex.hxx>
|
|
||||||
#include "generic/geninst.h"
|
|
||||||
|
|
||||||
+#include <tools/prex.h>
|
|
||||||
+#include <X11/Xlib.h>
|
|
||||||
+#include <tools/postx.h>
|
|
||||||
+
|
|
||||||
+namespace com { namespace sun { namespace star { namespace datatransfer {
|
|
||||||
+ namespace clipboard { class XClipboard; }
|
|
||||||
+} } } }
|
|
||||||
|
|
||||||
// -=-= SalInstanceData =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
|
|
||||||
class SalXLib;
|
|
||||||
class VCLPLUG_GEN_PUBLIC X11SalInstance : public SalGenericInstance
|
|
||||||
{
|
|
||||||
+private:
|
|
||||||
+ boost::unordered_map< OUString, boost::unordered_map< Atom, com::sun::star::uno::Reference< com::sun::star::datatransfer::clipboard::XClipboard > >, OUStringHash > m_aInstances;
|
|
||||||
+
|
|
||||||
protected:
|
|
||||||
SalXLib *mpXLib;
|
|
||||||
public:
|
|
||||||
diff --git a/vcl/unx/generic/dtrans/X11_service.cxx b/vcl/unx/generic/dtrans/X11_service.cxx
|
|
||||||
index dc2ff17..5d4ac5e 100644
|
|
||||||
--- a/vcl/unx/generic/dtrans/X11_service.cxx
|
|
||||||
+++ b/vcl/unx/generic/dtrans/X11_service.cxx
|
|
||||||
@@ -62,8 +62,6 @@ Sequence< OUString > SAL_CALL x11::Xdnd_dropTarget_getSupportedServiceNames()
|
|
||||||
|
|
||||||
css::uno::Reference< XInterface > X11SalInstance::CreateClipboard( const Sequence< Any >& arguments )
|
|
||||||
{
|
|
||||||
- static boost::unordered_map< OUString, ::boost::unordered_map< Atom, Reference< XClipboard > >, ::rtl::OUStringHash > m_aInstances;
|
|
||||||
-
|
|
||||||
OUString aDisplayName;
|
|
||||||
Atom nSelection;
|
|
||||||
|
|
||||||
--
|
|
||||||
1.8.1.4
|
|
||||||
|
|
||||||
@ -17,9 +17,9 @@ index 2d506be..648cafa 100644
|
|||||||
|
|
||||||
$(eval $(call gb_Module_add_check_targets,sdext,\
|
$(eval $(call gb_Module_add_check_targets,sdext,\
|
||||||
- CppunitTest_pdfimport \
|
- CppunitTest_pdfimport \
|
||||||
CustomTarget_pdfimport \
|
|
||||||
Executable_pdf2xml \
|
Executable_pdf2xml \
|
||||||
Executable_pdfunzip \
|
Executable_pdfunzip \
|
||||||
|
))
|
||||||
--
|
--
|
||||||
1.8.0
|
1.8.0
|
||||||
|
|
||||||
|
|||||||
369
libreoffice.spec
369
libreoffice.spec
@ -1,9 +1,9 @@
|
|||||||
# download path contains version without the last (fourth) digit
|
# download path contains version without the last (fourth) digit
|
||||||
%define libo_version 4.0.3
|
%define libo_version 4.1.0
|
||||||
# Should contain .alphaX / .betaX, if this is pre-release (actually
|
# Should contain .alphaX / .betaX, if this is pre-release (actually
|
||||||
# pre-RC) version. The pre-release string is part of tarball file names,
|
# pre-RC) version. The pre-release string is part of tarball file names,
|
||||||
# so we need a way to define it easily at one place.
|
# so we need a way to define it easily at one place.
|
||||||
# %%define libo_prerelease .beta2
|
%define libo_prerelease .beta1
|
||||||
# rhbz#715152 state vendor
|
# rhbz#715152 state vendor
|
||||||
%if 0%{?rhel}
|
%if 0%{?rhel}
|
||||||
%define vendoroption --with-vendor="Red Hat, Inc."
|
%define vendoroption --with-vendor="Red Hat, Inc."
|
||||||
@ -42,8 +42,8 @@
|
|||||||
Summary: Free Software Productivity Suite
|
Summary: Free Software Productivity Suite
|
||||||
Name: libreoffice
|
Name: libreoffice
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Version: %{libo_version}.3
|
Version: %{libo_version}.0
|
||||||
Release: 3%{?libo_prerelease}%{?dist}
|
Release: 2%{?libo_prerelease}%{?dist}
|
||||||
License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic and MPLv2.0
|
License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic and MPLv2.0
|
||||||
Group: Applications/Productivity
|
Group: Applications/Productivity
|
||||||
URL: http://www.documentfoundation.org/develop
|
URL: http://www.documentfoundation.org/develop
|
||||||
@ -123,6 +123,7 @@ BuildRequires: gstreamer1-devel
|
|||||||
BuildRequires: gstreamer1-plugins-base-devel
|
BuildRequires: gstreamer1-plugins-base-devel
|
||||||
%endif
|
%endif
|
||||||
BuildRequires: gtk2-devel
|
BuildRequires: gtk2-devel
|
||||||
|
BuildRequires: harfbuzz
|
||||||
BuildRequires: hunspell-devel
|
BuildRequires: hunspell-devel
|
||||||
BuildRequires: hyphen-devel
|
BuildRequires: hyphen-devel
|
||||||
%if 0%{?fedora}
|
%if 0%{?fedora}
|
||||||
@ -146,7 +147,9 @@ BuildRequires: libidn-devel
|
|||||||
BuildRequires: libjpeg-turbo-devel
|
BuildRequires: libjpeg-turbo-devel
|
||||||
BuildRequires: liblangtag-devel >= 0.4.0
|
BuildRequires: liblangtag-devel >= 0.4.0
|
||||||
BuildRequires: libmspub-devel
|
BuildRequires: libmspub-devel
|
||||||
BuildRequires: liborcus-devel >= 0.3.0
|
BuildRequires: libmwaw-devel
|
||||||
|
BuildRequires: libodfgen-devel
|
||||||
|
BuildRequires: liborcus-devel >= 0.5.0
|
||||||
BuildRequires: libvisio-devel
|
BuildRequires: libvisio-devel
|
||||||
BuildRequires: libwpd-devel
|
BuildRequires: libwpd-devel
|
||||||
BuildRequires: libwpg-devel
|
BuildRequires: libwpg-devel
|
||||||
@ -158,7 +161,7 @@ BuildRequires: libxml2-devel
|
|||||||
BuildRequires: libxslt-devel
|
BuildRequires: libxslt-devel
|
||||||
BuildRequires: lpsolve-devel
|
BuildRequires: lpsolve-devel
|
||||||
%if 0%{?fedora} || 0%{?rhel} >= 7
|
%if 0%{?fedora} || 0%{?rhel} >= 7
|
||||||
BuildRequires: mdds-devel
|
BuildRequires: mdds-devel >= 0.8.1
|
||||||
%endif
|
%endif
|
||||||
BuildRequires: mesa-libGLU-devel
|
BuildRequires: mesa-libGLU-devel
|
||||||
%if 0%{?fedora} || 0%{?rhel} >= 7
|
%if 0%{?fedora} || 0%{?rhel} >= 7
|
||||||
@ -242,18 +245,10 @@ Patch13: libreoffice-rhel6limits.patch
|
|||||||
Patch14: libreoffice-rhel6glib.patch
|
Patch14: libreoffice-rhel6glib.patch
|
||||||
%endif
|
%endif
|
||||||
Patch15: 0001-temporarily-disable-failing-test.patch
|
Patch15: 0001-temporarily-disable-failing-test.patch
|
||||||
Patch16: 0001-make-evolution-3.6-work-with-address-book.patch
|
Patch16: 0001-rhbz-961460-Don-t-needlessly-pass-URLs-through-INetU.patch
|
||||||
Patch17: 0001-no-g_list_free_full-in-RHEL-6-glib.patch
|
Patch17: 0001-do-not-build-LibreOffice_Test.patch
|
||||||
Patch18: 0001-Work-around-problem-with-boost-shared_array-NULL-cto.patch
|
Patch18: 0001-disable-failing-perf-test.patch
|
||||||
Patch19: 0001-fix-compile-for-change-to-boost-1.53.0-declaring-sma.patch
|
Patch19: 0001-fix-syntax-errors-in-python-wizards.patch
|
||||||
Patch20: 0001-rhbz-742780-Let-make-OPT_FLAGS-.-override-SDK-optimi.patch
|
|
||||||
Patch21: 0001-Related-rhbz-902884-check-for-GetSelectedMasterPage-.patch
|
|
||||||
Patch22: 0001-Resolves-rhbz-920697-i110881-rhbz-623191-presentatio.patch
|
|
||||||
Patch23: 0001-Resolves-fdo-47209-and-rhbz-927223-syntax-highlighte.patch
|
|
||||||
Patch24: 0001-rhbz-867808-Do-not-throw-RuntimeException-by-pointer.patch
|
|
||||||
Patch25: 0001-rhbz-954991-Avoid-static-data-causing-trouble-at-exi.patch
|
|
||||||
Patch26: 0001-Related-rhbz-761009-lp-766153-lp-892904-HandleFontOp.patch
|
|
||||||
Patch27: 0001-rhbz-961460-Don-t-needlessly-pass-URLs-through-INetU.patch
|
|
||||||
|
|
||||||
%define instdir %{_libdir}
|
%define instdir %{_libdir}
|
||||||
%define baseinstdir %{instdir}/libreoffice
|
%define baseinstdir %{instdir}/libreoffice
|
||||||
@ -289,6 +284,7 @@ Requires(post): gtk2 >= 2.9.4
|
|||||||
Requires(preun): gtk2 >= 2.9.4
|
Requires(preun): gtk2 >= 2.9.4
|
||||||
Requires(postun): gtk2 >= 2.9.4
|
Requires(postun): gtk2 >= 2.9.4
|
||||||
Obsoletes: libreoffice-binfilter < 1:4.0.0.0
|
Obsoletes: libreoffice-binfilter < 1:4.0.0.0
|
||||||
|
Obsoletes: libreoffice-javafilter < 1:4.1.0.0
|
||||||
Obsoletes: libreoffice-testtools < 1:3.4.99.1
|
Obsoletes: libreoffice-testtools < 1:3.4.99.1
|
||||||
Obsoletes: autocorr-eu < 1:4.0.1.2
|
Obsoletes: autocorr-eu < 1:4.0.1.2
|
||||||
%if 0%{?rhel} && 0%{?rhel} < 7
|
%if 0%{?rhel} && 0%{?rhel} < 7
|
||||||
@ -329,6 +325,7 @@ Requires: hsqldb
|
|||||||
Requires: %{name}-ure = %{epoch}:%{version}-%{release}
|
Requires: %{name}-ure = %{epoch}:%{version}-%{release}
|
||||||
Requires: %{name}-core = %{epoch}:%{version}-%{release}
|
Requires: %{name}-core = %{epoch}:%{version}-%{release}
|
||||||
Requires: %{name}-calc = %{epoch}:%{version}-%{release}
|
Requires: %{name}-calc = %{epoch}:%{version}-%{release}
|
||||||
|
Obsoletes: %{name}-report-builder < 1:4.1.0.0
|
||||||
%if 0%{?rhel} && 0%{?rhel} < 7
|
%if 0%{?rhel} && 0%{?rhel} < 7
|
||||||
Provides: openoffice.org-base-core%{?_isa} = 1:3.3.0
|
Provides: openoffice.org-base-core%{?_isa} = 1:3.3.0
|
||||||
Provides: openoffice.org-base%{?_isa} = 1:3.3.0, broffice.org-base%{?_isa} = 1:3.3.0
|
Provides: openoffice.org-base%{?_isa} = 1:3.3.0, broffice.org-base%{?_isa} = 1:3.3.0
|
||||||
@ -574,24 +571,6 @@ Provides: openoffice.org-xsltfilter%{?_isa} = 1:3.3.0
|
|||||||
The xsltfilter module for LibreOffice, provides additional docbook and
|
The xsltfilter module for LibreOffice, provides additional docbook and
|
||||||
xhtml export transforms. Install this to enable docbook export.
|
xhtml export transforms. Install this to enable docbook export.
|
||||||
|
|
||||||
%package javafilter
|
|
||||||
Summary: Optional javafilter module for LibreOffice
|
|
||||||
Group: Applications/Productivity
|
|
||||||
Requires: %{name}-core = %{epoch}:%{version}-%{release}
|
|
||||||
%if 0%{?rhel} && 0%{?rhel} < 7
|
|
||||||
Provides: openoffice.org-javafilter%{?_isa} = 1:3.3.0
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%description javafilter
|
|
||||||
The javafilter module for LibreOffice, provides additional AportisDoc,
|
|
||||||
Pocket Excel and Pocket Word import filters.
|
|
||||||
|
|
||||||
%post javafilter
|
|
||||||
update-desktop-database %{_datadir}/applications &> /dev/null || :
|
|
||||||
|
|
||||||
%postun javafilter
|
|
||||||
update-desktop-database %{_datadir}/applications &> /dev/null || :
|
|
||||||
|
|
||||||
%if 0%{?fedora} || 0%{?rhel} >= 7
|
%if 0%{?fedora} || 0%{?rhel} >= 7
|
||||||
%package postgresql
|
%package postgresql
|
||||||
Summary: PostgreSQL connector for LibreOffice
|
Summary: PostgreSQL connector for LibreOffice
|
||||||
@ -899,6 +878,8 @@ Rules for auto-correcting common %{langname} typing errors. \
|
|||||||
%endif
|
%endif
|
||||||
%langpack -l sk -n Slovak -F -H -Y -M -A -T -X
|
%langpack -l sk -n Slovak -F -H -Y -M -A -T -X
|
||||||
%langpack -l sl -n Slovenian -F -H -Y -M -A -T -X
|
%langpack -l sl -n Slovenian -F -H -Y -M -A -T -X
|
||||||
|
%{baseinstdir}/share/wordbook/sl.dic
|
||||||
|
|
||||||
#rhbz#452379 clump serbian translations together
|
#rhbz#452379 clump serbian translations together
|
||||||
%langpack -l sr -n Serbian -F -H -Y -A -i sh
|
%langpack -l sr -n Serbian -F -H -Y -A -i sh
|
||||||
%langpack -l ss -n Swati -F -H
|
%langpack -l ss -n Swati -F -H
|
||||||
@ -943,6 +924,7 @@ Rules for auto-correcting common %{langname} typing errors. \
|
|||||||
%autocorr -l ga -n Irish
|
%autocorr -l ga -n Irish
|
||||||
%autocorr -l hr -n Croatian
|
%autocorr -l hr -n Croatian
|
||||||
%autocorr -l hu -n Hungarian
|
%autocorr -l hu -n Hungarian
|
||||||
|
%autocorr -l is -n Icelandic
|
||||||
%autocorr -l it -n Italian
|
%autocorr -l it -n Italian
|
||||||
%autocorr -l ja -n Japanese
|
%autocorr -l ja -n Japanese
|
||||||
%autocorr -l ko -n Korean
|
%autocorr -l ko -n Korean
|
||||||
@ -989,7 +971,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
|
|||||||
%patch3 -p1 -b .ooo88341.sc.verticalboxes.patch
|
%patch3 -p1 -b .ooo88341.sc.verticalboxes.patch
|
||||||
%patch4 -p1 -b .oooXXXXX.solenv.allowmissing.patch
|
%patch4 -p1 -b .oooXXXXX.solenv.allowmissing.patch
|
||||||
%patch5 -p1 -b .ooo101274.opening-a-directory.patch
|
%patch5 -p1 -b .ooo101274.opening-a-directory.patch
|
||||||
%patch6 -p1 -b .ooo105784.vcl.sniffscriptforsubs.patch
|
# %%patch6 -p1 -b .ooo105784.vcl.sniffscriptforsubs.patch
|
||||||
%patch7 -p1 -b .libreoffice-installfix.patch
|
%patch7 -p1 -b .libreoffice-installfix.patch
|
||||||
%patch8 -p1 -b .disable-failing-check.patch
|
%patch8 -p1 -b .disable-failing-check.patch
|
||||||
%if 0%{?rhel} && 0%{?rhel} < 7
|
%if 0%{?rhel} && 0%{?rhel} < 7
|
||||||
@ -1001,18 +983,10 @@ mv -f redhat.soc extras/source/palettes/standard.soc
|
|||||||
%patch14 -p1 -b .rhel6glib.patch
|
%patch14 -p1 -b .rhel6glib.patch
|
||||||
%endif
|
%endif
|
||||||
%patch15 -p1 -b .temporarily-disable-failing-test.patch
|
%patch15 -p1 -b .temporarily-disable-failing-test.patch
|
||||||
%patch16 -p1 -b .make-evolution-3.6-work-with-address-book.patch
|
%patch16 -p1 -b .rhbz-961460-Don-t-needlessly-pass-URLs-through-INetU.patch
|
||||||
%patch17 -p1 -b .no-g_list_free_full-in-RHEL-6-glib.patch
|
%patch17 -p1 -b .do-not-build-LibreOffice_Test.patch
|
||||||
%patch18 -p1 -b .Work-around-problem-with-boost-shared_array-NULL-cto.patch
|
%patch18 -p1 -b .disable-failing-perf-test.patch
|
||||||
%patch19 -p1 -b .fix-compile-for-change-to-boost-1.53.0-declaring-sma.patch
|
%patch19 -p1 -b .fix-syntax-errors-in-python-wizards.patch
|
||||||
%patch20 -p1 -b .rhbz-742780-Let-make-OPT_FLAGS-.-override-SDK-optimi.patch
|
|
||||||
%patch21 -p1 -b .rhbz-902884-check-for-GetSelectedMasterPage-.patch
|
|
||||||
%patch22 -p1 -b .rhbz-920697-i110881-rhbz-623191-presentatio.patch
|
|
||||||
%patch23 -p1 -b .fdo-47209-and-rhbz-927223-syntax-highlighte.patch
|
|
||||||
%patch24 -p1 -b .rhbz-867808-Do-not-throw-RuntimeException-by-pointer.patch
|
|
||||||
%patch25 -p1 -b .rhbz-954991-Avoid-static-data-causing-trouble-at-exi.patch
|
|
||||||
%patch26 -p1 -b .rhbz-761009-lp-766153-lp-892904-HandleFontOp.patch
|
|
||||||
%patch27 -p1 -b .rhbz-961460-Don-t-needlessly-pass-URLs-through-INetU.patch
|
|
||||||
|
|
||||||
# TODO: check this
|
# TODO: check this
|
||||||
# these are horribly incomplete--empty translations and copied english
|
# these are horribly incomplete--empty translations and copied english
|
||||||
@ -1076,6 +1050,8 @@ export PYTHON_CFLAGS=`pkg-config --cflags python`
|
|||||||
export PYTHON_LIBS=`pkg-config --libs python`
|
export PYTHON_LIBS=`pkg-config --libs python`
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
# TODO: do we still need this? Perhaps some old patch touches
|
||||||
|
# configure.ac?
|
||||||
aclocal -I m4
|
aclocal -I m4
|
||||||
autoconf
|
autoconf
|
||||||
# avoid running autogen.sh on make
|
# avoid running autogen.sh on make
|
||||||
@ -1094,26 +1070,23 @@ touch autogen.lastrun
|
|||||||
--without-system-npapi-headers --with-system-dicts \
|
--without-system-npapi-headers --with-system-dicts \
|
||||||
--with-external-dict-dir=/usr/share/myspell \
|
--with-external-dict-dir=/usr/share/myspell \
|
||||||
--without-myspell-dicts --without-fonts --without-ppds --without-afms \
|
--without-myspell-dicts --without-fonts --without-ppds --without-afms \
|
||||||
|
--with-help \
|
||||||
%{?with_lang} --with-poor-help-localizations="$POORHELPS" \
|
%{?with_lang} --with-poor-help-localizations="$POORHELPS" \
|
||||||
--with-external-tar="$EXTSRCDIR" --with-java-target-version=1.5 \
|
--with-external-tar="$EXTSRCDIR" --with-java-target-version=1.5 \
|
||||||
%{distrooptions} \
|
%{distrooptions} \
|
||||||
--disable-fetch-external
|
--disable-fetch-external
|
||||||
|
|
||||||
if ! make VERBOSE=true; then
|
make VERBOSE=true
|
||||||
# TODO Do we still need this? I think parallel build is reliable
|
|
||||||
# enough these days...
|
|
||||||
make VERBOSE=true PARALLELISM=1
|
|
||||||
fi
|
|
||||||
|
|
||||||
#generate the icons and mime type stuff
|
#generate the icons and mime type stuff
|
||||||
export DESTDIR=../../../output
|
export DESTDIR=../output
|
||||||
export KDEMAINDIR=/usr
|
export KDEMAINDIR=/usr
|
||||||
export GNOMEDIR=/usr
|
export GNOMEDIR=/usr
|
||||||
export GNOME_MIME_THEME=hicolor
|
export GNOME_MIME_THEME=hicolor
|
||||||
# TODO use empty variables? Should make the renaming hacks in %%install
|
# TODO use empty variables? Should make the renaming hacks in %%install
|
||||||
# unnecessary.
|
# unnecessary.
|
||||||
. ./bin/get_config_variables PRODUCTVERSIONSHORT PRODUCTVERSION
|
. ./bin/get_config_variables PRODUCTVERSIONSHORT PRODUCTVERSION WORKDIR
|
||||||
cd sysui/unxlng*/misc/libreoffice
|
cd $WORKDIR/CustomTarget/sysui/share/libreoffice
|
||||||
./create_tree.sh
|
./create_tree.sh
|
||||||
|
|
||||||
echo build end time is `date`, diskspace: `df -h . | tail -n 1`
|
echo build end time is `date`, diskspace: `df -h . | tail -n 1`
|
||||||
@ -1121,70 +1094,65 @@ echo build end time is `date`, diskspace: `df -h . | tail -n 1`
|
|||||||
|
|
||||||
%install
|
%install
|
||||||
# TODO investigate use of make distro-pack-install
|
# TODO investigate use of make distro-pack-install
|
||||||
. ./bin/get_config_variables `sed -n -e '/^export/s/^export \([A-Z0-9_]\+\).*/\1/p' config_host.mk`
|
|
||||||
#figure out the icon version
|
#figure out the icon version
|
||||||
export `grep "^PRODUCTVERSIONSHORT =" solenv/inc/productversion.mk | sed -e "s/ //g"`
|
. ./bin/get_config_variables PRODUCTVERSIONSHORT PRODUCTVERSION SRCDIR WORKDIR
|
||||||
export `grep "PRODUCTVERSION[ ]*=[ ]*" solenv/inc/productversion.mk | sed -e "s/ //g"`
|
export PRODUCTVERSIONSHORT PRODUCTVERSION
|
||||||
#install
|
|
||||||
cd instsetoo_native/util
|
# installation
|
||||||
#direct install
|
|
||||||
mkdir -p $RPM_BUILD_ROOT/%{instdir}
|
mkdir -p $RPM_BUILD_ROOT/%{instdir}
|
||||||
export PKGFORMAT=installed
|
if ! make instsetoo_native PKGFORMAT=installed EPM=not-used-but-must-be-set; then
|
||||||
#don't duplicate english helpcontent about the place
|
|
||||||
unset DEFAULT_TO_ENGLISH_FOR_PACKING
|
|
||||||
if dmake openoffice_en-US; then
|
|
||||||
ok=true
|
|
||||||
break
|
|
||||||
else
|
|
||||||
echo - ---dump log start---
|
echo - ---dump log start---
|
||||||
cat ../unx*.pro/LibreOffice/installed/logging/en-US/log_*_en-US.log
|
cat $ WORKDIR/installation/LibreOffice/installed/logging/en-US/log_*_en-US.log
|
||||||
echo - ---dump log end---
|
echo - ---dump log end---
|
||||||
ok=false
|
echo - ---dump log start -- SDK---
|
||||||
fi
|
cat $ WORKDIR/installation/LibreOffice_SDK/installed/logging/en-US/log_*_en-US.log
|
||||||
if [ $ok == "false" ]; then
|
echo - ---dump log end -- SDK---
|
||||||
|
echo - ---dump log start -- languagepacks---
|
||||||
|
cat $ WORKDIR/installation/LibreOffice_languagepack/installed/logging/en-US/log_*_en-US.log
|
||||||
|
echo - ---dump log end -- languagepacks---
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
mkdir -p $RPM_BUILD_ROOT/%{baseinstdir}
|
mkdir -p $RPM_BUILD_ROOT/%{baseinstdir}
|
||||||
mv ../unxlng*.pro/LibreOffice/installed/install/en-US/* $RPM_BUILD_ROOT/%{baseinstdir}
|
mv $WORKDIR/installation/LibreOffice/installed/install/en-US/* $RPM_BUILD_ROOT/%{baseinstdir}
|
||||||
|
%if %{with langpacks}
|
||||||
|
for langpack in $WORKDIR/installation/LibreOffice_languagepack/installed/install/*; do
|
||||||
|
[ `basename $langpack` = log ] && continue
|
||||||
|
cp -rp $langpack/* $RPM_BUILD_ROOT/%{baseinstdir}
|
||||||
|
rm -rf $langpack
|
||||||
|
done
|
||||||
|
%endif
|
||||||
|
mv $WORKDIR/installation/LibreOffice_SDK/installed/install/en-US/sdk $RPM_BUILD_ROOT/%{sdkinstdir}
|
||||||
chmod -R +w $RPM_BUILD_ROOT/%{baseinstdir}
|
chmod -R +w $RPM_BUILD_ROOT/%{baseinstdir}
|
||||||
|
rm -f $RPM_BUILD_ROOT/%{baseinstdir}/program/classes/smoketest.jar
|
||||||
|
|
||||||
|
# postprocessing and tweaks
|
||||||
|
|
||||||
# The installer currently sets UserInstallation to
|
# The installer currently sets UserInstallation to
|
||||||
# $ORIGIN/../libreoffice/4, which is of course total nonsense. Because I
|
# $ORIGIN/../libreoffice/4, which is of course total nonsense. Because I
|
||||||
# have no inclination to crawl through mountains of perl code to figure out
|
# have no inclination to crawl through mountains of perl code to figure out
|
||||||
# where it comes from, I am just going to replace it by a sensible
|
# where it comes from, I am just going to replace it by a sensible
|
||||||
# value here.
|
# value here.
|
||||||
sed -i -e '/UserInstallation/s@\$ORIGIN/..@$SYSUSERCONFIG@' $RPM_BUILD_ROOT/%{baseinstdir}/program/bootstraprc
|
sed -i -e '/UserInstallation/s@\$ORIGIN/..@$SYSUSERCONFIG@' $RPM_BUILD_ROOT/%{baseinstdir}/program/bootstraprc
|
||||||
%if %{with langpacks}
|
|
||||||
dmake ooolanguagepack
|
|
||||||
rm -rf ../unxlng*.pro/LibreOffice_languagepack/installed/install/log
|
|
||||||
for langpack in ../unxlng*.pro/LibreOffice_languagepack/installed/install/*; do
|
|
||||||
cp -rp $langpack/* $RPM_BUILD_ROOT/%{baseinstdir}
|
|
||||||
rm -rf $langpack
|
|
||||||
done
|
|
||||||
%endif
|
|
||||||
export WITH_LANG_LIST="en-US"
|
|
||||||
dmake sdkoo
|
|
||||||
mv ../unxlng*.pro/LibreOffice_SDK/installed/install/en-US/sdk $RPM_BUILD_ROOT/%{sdkinstdir}
|
|
||||||
cd ../../
|
|
||||||
|
|
||||||
#configure sdk
|
#configure sdk
|
||||||
pushd $RPM_BUILD_ROOT/%{sdkinstdir}
|
pushd $RPM_BUILD_ROOT/%{sdkinstdir}
|
||||||
for file in setsdkenv_unix.csh setsdkenv_unix.sh ; do
|
sed -e "s,@OO_SDK_NAME@,sdk," \
|
||||||
sed -e "s,@OO_SDK_NAME@,sdk," \
|
-e "s,@OO_SDK_HOME@,%{sdkinstdir}," \
|
||||||
-e "s,@OO_SDK_HOME@,%{sdkinstdir}," \
|
-e "s,@OFFICE_HOME@,%{baseinstdir}," \
|
||||||
-e "s,@OFFICE_HOME@,%{baseinstdir}," \
|
-e "s,@OO_SDK_URE_HOME@,%{ureinstdir}," \
|
||||||
-e "s,@OO_SDK_URE_HOME@,%{ureinstdir}," \
|
-e "s,@OO_SDK_MAKE_HOME@,/usr/bin," \
|
||||||
-e "s,@OO_SDK_MAKE_HOME@,/usr/bin," \
|
-e "s,@OO_SDK_ZIP_HOME@,/usr/bin," \
|
||||||
-e "s,@OO_SDK_ZIP_HOME@,/usr/bin," \
|
-e "s,@OO_SDK_CPP_HOME@,/usr/bin," \
|
||||||
-e "s,@OO_SDK_CPP_HOME@,/usr/bin," \
|
-e "s,@OO_SDK_CC_55_OR_HIGHER@,," \
|
||||||
-e "s,@OO_SDK_CC_55_OR_HIGHER@,," \
|
-e "s,@OO_SDK_JAVA_HOME@,$JAVA_HOME," \
|
||||||
-e "s,@OO_SDK_JAVA_HOME@,$JAVA_HOME," \
|
-e "s,@OO_SDK_OUTPUT_DIR@,\$HOME," \
|
||||||
-e "s,@OO_SDK_OUTPUT_DIR@,\$HOME," \
|
-e "s,@SDK_AUTO_DEPLOYMENT@,NO," \
|
||||||
-e "s,@SDK_AUTO_DEPLOYMENT@,NO," \
|
setsdkenv_unix.sh.in > setsdkenv_unix.sh
|
||||||
$file.in > $file
|
chmod 755 setsdkenv_unix.sh
|
||||||
chmod 755 $file
|
# we don't want to install the input file
|
||||||
done
|
rm -f setsdkenv_unix.sh.in
|
||||||
# we don't want to install the input files
|
# TODO: is this still necessary?
|
||||||
rm -f setsdkenv_unix.csh.in setsdkenv_unix.sh.in
|
|
||||||
#fix permissions
|
#fix permissions
|
||||||
find examples -type f -exec chmod -x {} \;
|
find examples -type f -exec chmod -x {} \;
|
||||||
popd
|
popd
|
||||||
@ -1336,24 +1304,19 @@ for file in *.desktop; do
|
|||||||
-e "s/$ICONVERSION//g" \
|
-e "s/$ICONVERSION//g" \
|
||||||
-e "s/$PRODUCTVERSIONSHORT//g" \
|
-e "s/$PRODUCTVERSIONSHORT//g" \
|
||||||
$file
|
$file
|
||||||
# add X-GIO-NoFuse so we get url:// instead of file://~.gvfs/
|
|
||||||
echo X-GIO-NoFuse=true >> $file
|
|
||||||
done
|
done
|
||||||
for app in base calc draw impress math writer; do
|
for app in base calc draw impress math writer; do
|
||||||
echo "StartupNotify=true" >> $app.desktop
|
|
||||||
echo "TryExec=oo$app" >> $app.desktop
|
echo "TryExec=oo$app" >> $app.desktop
|
||||||
done
|
done
|
||||||
# rhbz#156677# / rhbz#186515#
|
|
||||||
echo "NoDisplay=true" >> startcenter.desktop
|
|
||||||
# relocate the .desktop and icon files
|
# relocate the .desktop and icon files
|
||||||
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications
|
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications
|
||||||
for app in base calc draw impress javafilter math startcenter writer xsltfilter; do
|
for app in base calc draw impress math startcenter writer xsltfilter; do
|
||||||
desktop-file-validate $app.desktop
|
desktop-file-validate $app.desktop
|
||||||
cp -p $app.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/libreoffice-$app.desktop
|
cp -p $app.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/libreoffice-$app.desktop
|
||||||
done
|
done
|
||||||
popd
|
popd
|
||||||
|
|
||||||
pushd sysui/output/usr/share/
|
pushd $WORKDIR/CustomTarget/sysui/share/output/usr/share
|
||||||
#get rid of the gnome icons and other unneeded files
|
#get rid of the gnome icons and other unneeded files
|
||||||
rm -rf icons/gnome applications application-registry
|
rm -rf icons/gnome applications application-registry
|
||||||
|
|
||||||
@ -1361,11 +1324,15 @@ rm -rf icons/gnome applications application-registry
|
|||||||
# rhbz#901346 512x512 icons are not used by anything
|
# rhbz#901346 512x512 icons are not used by anything
|
||||||
for icon in `find icons -path '*/512x512' -prune -o -type f -print`; do
|
for icon in `find icons -path '*/512x512' -prune -o -type f -print`; do
|
||||||
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/`dirname $icon`
|
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/`dirname $icon`
|
||||||
cp -p $icon $RPM_BUILD_ROOT/%{_datadir}/`echo $icon | sed -e s@office$ICONVERSION@office@ | sed -e s@office$PRODUCTVERSION@office@`
|
# TODO: these should be libreoffice$PRODUCTVERSION.* . Check where
|
||||||
|
# the problem is.
|
||||||
|
cp -p $icon $RPM_BUILD_ROOT/%{_datadir}/`echo $icon | sed -e s@$ICONVERSION-@libreoffice-@ | sed -e s@$PRODUCTVERSION-@libreoffice-@`
|
||||||
done
|
done
|
||||||
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/mime-info
|
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/mime-info
|
||||||
cp -p mime-info/libreoffice$PRODUCTVERSION.keys $RPM_BUILD_ROOT/%{_datadir}/mime-info/libreoffice.keys
|
# TODO: these should be libreoffice$PRODUCTVERSION.* . Check where the
|
||||||
cp -p mime-info/libreoffice$PRODUCTVERSION.mime $RPM_BUILD_ROOT/%{_datadir}/mime-info/libreoffice.mime
|
# problem is.
|
||||||
|
cp -p mime-info/$PRODUCTVERSION.keys $RPM_BUILD_ROOT/%{_datadir}/mime-info/libreoffice.keys
|
||||||
|
cp -p mime-info/$PRODUCTVERSION.mime $RPM_BUILD_ROOT/%{_datadir}/mime-info/libreoffice.mime
|
||||||
#add our mime-types, e.g. for .oxt extensions
|
#add our mime-types, e.g. for .oxt extensions
|
||||||
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/mime/packages
|
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/mime/packages
|
||||||
cp -p mime/packages/libreoffice$PRODUCTVERSION.xml $RPM_BUILD_ROOT/%{_datadir}/mime/packages/libreoffice.xml
|
cp -p mime/packages/libreoffice$PRODUCTVERSION.xml $RPM_BUILD_ROOT/%{_datadir}/mime/packages/libreoffice.xml
|
||||||
@ -1381,7 +1348,7 @@ cp -p psprint_config/configuration/ppds/SGENPRT.PS $RPM_BUILD_ROOT/%{baseinstdir
|
|||||||
sed -i -e "s#URE_MORE_JAVA_CLASSPATH_URLS.*#& file:///usr/share/java/postgresql-jdbc.jar#" $RPM_BUILD_ROOT/%{baseinstdir}/program/fundamentalrc
|
sed -i -e "s#URE_MORE_JAVA_CLASSPATH_URLS.*#& file:///usr/share/java/postgresql-jdbc.jar#" $RPM_BUILD_ROOT/%{baseinstdir}/program/fundamentalrc
|
||||||
|
|
||||||
export DESTDIR=$RPM_BUILD_ROOT
|
export DESTDIR=$RPM_BUILD_ROOT
|
||||||
install-gdb-printers -a %{_datadir}/gdb/auto-load%{baseinstdir} -c -i %{baseinstdir} -p %{_datadir}/libreoffice/gdb
|
make cmd cmd="install-gdb-printers -a %{_datadir}/gdb/auto-load%{baseinstdir} -c -i %{baseinstdir} -p %{_datadir}/libreoffice/gdb"
|
||||||
|
|
||||||
|
|
||||||
#%check
|
#%check
|
||||||
@ -1399,29 +1366,27 @@ install-gdb-printers -a %{_datadir}/gdb/auto-load%{baseinstdir} -c -i %{baseinst
|
|||||||
%files core
|
%files core
|
||||||
%dir %{baseinstdir}
|
%dir %{baseinstdir}
|
||||||
%dir %{baseinstdir}/help
|
%dir %{baseinstdir}/help
|
||||||
%docdir %{baseinstdir}/help/en
|
%docdir %{baseinstdir}/help/en-US
|
||||||
%dir %{baseinstdir}/help/en
|
%dir %{baseinstdir}/help/en-US
|
||||||
%{baseinstdir}/help/en/default.css
|
%{baseinstdir}/help/en-US/default.css
|
||||||
%{baseinstdir}/help/en/err.html
|
%{baseinstdir}/help/en-US/err.html
|
||||||
%{baseinstdir}/help/en/highcontrast1.css
|
%{baseinstdir}/help/en-US/highcontrast1.css
|
||||||
%{baseinstdir}/help/en/highcontrast2.css
|
%{baseinstdir}/help/en-US/highcontrast2.css
|
||||||
%{baseinstdir}/help/en/highcontrastblack.css
|
%{baseinstdir}/help/en-US/highcontrastblack.css
|
||||||
%{baseinstdir}/help/en/highcontrastwhite.css
|
%{baseinstdir}/help/en-US/highcontrastwhite.css
|
||||||
%{baseinstdir}/help/en/sbasic.*
|
%{baseinstdir}/help/en-US/sbasic.*
|
||||||
%{baseinstdir}/help/en/schart.*
|
%{baseinstdir}/help/en-US/schart.*
|
||||||
%{baseinstdir}/help/en/shared.*
|
%{baseinstdir}/help/en-US/shared.*
|
||||||
%{baseinstdir}/help/idxcaption.xsl
|
%{baseinstdir}/help/idxcaption.xsl
|
||||||
%{baseinstdir}/help/idxcontent.xsl
|
%{baseinstdir}/help/idxcontent.xsl
|
||||||
%{baseinstdir}/help/main_transform.xsl
|
%{baseinstdir}/help/main_transform.xsl
|
||||||
%{baseinstdir}/presets
|
%{baseinstdir}/presets
|
||||||
%dir %{baseinstdir}/program
|
%dir %{baseinstdir}/program
|
||||||
%{baseinstdir}/program/addin
|
%{baseinstdir}/program/libbasprovlo.so
|
||||||
%{baseinstdir}/program/basprov.uno.so
|
%{baseinstdir}/program/libcairocanvaslo.so
|
||||||
%{baseinstdir}/program/cairocanvas.uno.so
|
%{baseinstdir}/program/libcanvasfactorylo.so
|
||||||
%{baseinstdir}/program/canvasfactory.uno.so
|
|
||||||
%{baseinstdir}/program/cde-open-url
|
%{baseinstdir}/program/cde-open-url
|
||||||
%dir %{baseinstdir}/program/classes
|
%dir %{baseinstdir}/program/classes
|
||||||
%{baseinstdir}/program/classes/agenda.jar
|
|
||||||
%{baseinstdir}/program/classes/commonwizards.jar
|
%{baseinstdir}/program/classes/commonwizards.jar
|
||||||
%{baseinstdir}/program/classes/form.jar
|
%{baseinstdir}/program/classes/form.jar
|
||||||
%{baseinstdir}/program/classes/query.jar
|
%{baseinstdir}/program/classes/query.jar
|
||||||
@ -1431,27 +1396,26 @@ install-gdb-printers -a %{_datadir}/gdb/auto-load%{baseinstdir} -c -i %{baseinst
|
|||||||
%{baseinstdir}/program/classes/ScriptProviderForJava.jar
|
%{baseinstdir}/program/classes/ScriptProviderForJava.jar
|
||||||
%{baseinstdir}/program/classes/table.jar
|
%{baseinstdir}/program/classes/table.jar
|
||||||
%{baseinstdir}/program/classes/unoil.jar
|
%{baseinstdir}/program/classes/unoil.jar
|
||||||
%{baseinstdir}/program/classes/web.jar
|
|
||||||
%{baseinstdir}/program/classes/XMergeBridge.jar
|
%{baseinstdir}/program/classes/XMergeBridge.jar
|
||||||
%{baseinstdir}/program/classes/xmerge.jar
|
%{baseinstdir}/program/classes/xmerge.jar
|
||||||
%{baseinstdir}/program/cmdmail.uno.so
|
%{baseinstdir}/program/libcmdmaillo.so
|
||||||
%{baseinstdir}/program/libdeployment.so
|
%{baseinstdir}/program/libdeployment.so
|
||||||
%{baseinstdir}/program/libdeploymentgui.so
|
%{baseinstdir}/program/libdeploymentgui.so
|
||||||
%{baseinstdir}/program/dlgprov.uno.so
|
%{baseinstdir}/program/libdlgprovlo.so
|
||||||
%{baseinstdir}/program/expwrap.uno.so
|
%{baseinstdir}/program/libexpwraplo.so
|
||||||
%{baseinstdir}/program/fastsax.uno.so
|
%{baseinstdir}/program/libfastsaxlo.so
|
||||||
%{baseinstdir}/program/flat_logo.svg
|
%{baseinstdir}/program/flat_logo.svg
|
||||||
%{baseinstdir}/program/fpicker.uno.so
|
%{baseinstdir}/program/libfpickerlo.so
|
||||||
%{baseinstdir}/program/fps_office.uno.so
|
%{baseinstdir}/program/libfps_officelo.so
|
||||||
%{baseinstdir}/program/gdbtrace
|
%{baseinstdir}/program/gdbtrace
|
||||||
%{baseinstdir}/program/gengal
|
%{baseinstdir}/program/gengal
|
||||||
%{baseinstdir}/program/gengal.bin
|
%{baseinstdir}/program/gengal.bin
|
||||||
%{baseinstdir}/program/gnome-open-url
|
%{baseinstdir}/program/gnome-open-url
|
||||||
%{baseinstdir}/program/gnome-open-url.bin
|
%{baseinstdir}/program/gnome-open-url.bin
|
||||||
%{baseinstdir}/program/hatchwindowfactory.uno.so
|
%{baseinstdir}/program/libhatchwindowfactorylo.so
|
||||||
%{baseinstdir}/program/kde-open-url
|
%{baseinstdir}/program/kde-open-url
|
||||||
%{baseinstdir}/program/i18nsearch.uno.so
|
%{baseinstdir}/program/libi18nsearchlo.so
|
||||||
%{baseinstdir}/program/ldapbe2.uno.so
|
%{baseinstdir}/program/libldapbe2lo.so
|
||||||
%{baseinstdir}/program/libacclo.so
|
%{baseinstdir}/program/libacclo.so
|
||||||
%{baseinstdir}/program/libavmedia*.so
|
%{baseinstdir}/program/libavmedia*.so
|
||||||
%{baseinstdir}/program/libbasctllo.so
|
%{baseinstdir}/program/libbasctllo.so
|
||||||
@ -1522,7 +1486,7 @@ install-gdb-printers -a %{_datadir}/gdb/auto-load%{baseinstdir} -c -i %{baseinst
|
|||||||
%{baseinstdir}/program/libmorklo.so
|
%{baseinstdir}/program/libmorklo.so
|
||||||
%{baseinstdir}/program/libmozbootstrap.so
|
%{baseinstdir}/program/libmozbootstrap.so
|
||||||
%{baseinstdir}/program/libmsfilterlo.so
|
%{baseinstdir}/program/libmsfilterlo.so
|
||||||
%{baseinstdir}/program/mtfrenderer.uno.so
|
%{baseinstdir}/program/libmtfrendererlo.so
|
||||||
%{baseinstdir}/program/libmysqllo.so
|
%{baseinstdir}/program/libmysqllo.so
|
||||||
%{baseinstdir}/program/libodbclo.so
|
%{baseinstdir}/program/libodbclo.so
|
||||||
%{baseinstdir}/program/libodbcbaselo.so
|
%{baseinstdir}/program/libodbcbaselo.so
|
||||||
@ -1556,7 +1520,8 @@ install-gdb-printers -a %{_datadir}/gdb/auto-load%{baseinstdir} -c -i %{baseinst
|
|||||||
%{baseinstdir}/program/libtextfdlo.so
|
%{baseinstdir}/program/libtextfdlo.so
|
||||||
%{baseinstdir}/program/libtvhlp1.so
|
%{baseinstdir}/program/libtvhlp1.so
|
||||||
%{baseinstdir}/program/libodfflatxmllo.so
|
%{baseinstdir}/program/libodfflatxmllo.so
|
||||||
%{baseinstdir}/program/libucbhelper4gcc3.so
|
# TODO: shouldn't it have lo suffix?
|
||||||
|
%{baseinstdir}/program/libucbhelper.so
|
||||||
%{baseinstdir}/program/libucpchelp1.so
|
%{baseinstdir}/program/libucpchelp1.so
|
||||||
%{baseinstdir}/program/libucpdav1.so
|
%{baseinstdir}/program/libucpdav1.so
|
||||||
%{baseinstdir}/program/libucpftp1.so
|
%{baseinstdir}/program/libucpftp1.so
|
||||||
@ -1569,7 +1534,6 @@ install-gdb-printers -a %{_datadir}/gdb/auto-load%{baseinstdir} -c -i %{baseinst
|
|||||||
%{baseinstdir}/program/libvbahelperlo.so
|
%{baseinstdir}/program/libvbahelperlo.so
|
||||||
%{baseinstdir}/program/libvclplug_genlo.so
|
%{baseinstdir}/program/libvclplug_genlo.so
|
||||||
%{baseinstdir}/program/libvclplug_gtklo.so
|
%{baseinstdir}/program/libvclplug_gtklo.so
|
||||||
%{baseinstdir}/program/libwpftdrawlo.so
|
|
||||||
%{baseinstdir}/program/libxmlfalo.so
|
%{baseinstdir}/program/libxmlfalo.so
|
||||||
%{baseinstdir}/program/libxmlfdlo.so
|
%{baseinstdir}/program/libxmlfdlo.so
|
||||||
%{baseinstdir}/program/libxoflo.so
|
%{baseinstdir}/program/libxoflo.so
|
||||||
@ -1580,17 +1544,16 @@ install-gdb-printers -a %{_datadir}/gdb/auto-load%{baseinstdir} -c -i %{baseinst
|
|||||||
%{baseinstdir}/program/libxstor.so
|
%{baseinstdir}/program/libxstor.so
|
||||||
%if 0%{?fedora} || 0%{?rhel} >= 7
|
%if 0%{?fedora} || 0%{?rhel} >= 7
|
||||||
# TODO how useful this is in Fedora?
|
# TODO how useful this is in Fedora?
|
||||||
%{baseinstdir}/program/losessioninstall.uno.so
|
%{baseinstdir}/program/liblosessioninstalllo.so
|
||||||
%endif
|
%endif
|
||||||
%{baseinstdir}/program/migrationoo2.uno.so
|
%{baseinstdir}/program/libmigrationoo2lo.so
|
||||||
%{baseinstdir}/program/migrationoo3.uno.so
|
%{baseinstdir}/program/libmigrationoo3lo.so
|
||||||
%{baseinstdir}/program/msforms.uno.so
|
%{baseinstdir}/program/libmsformslo.so
|
||||||
%{baseinstdir}/program/nsplugin
|
%{baseinstdir}/program/nsplugin
|
||||||
%{baseinstdir}/program/open-url
|
%{baseinstdir}/program/open-url
|
||||||
%{baseinstdir}/program/types/offapi.rdb
|
%{baseinstdir}/program/types/offapi.rdb
|
||||||
%{baseinstdir}/program/passwordcontainer.uno.so
|
%{baseinstdir}/program/libpasswordcontainerlo.so
|
||||||
%{baseinstdir}/program/pagein-common
|
%{baseinstdir}/program/pagein-common
|
||||||
%{baseinstdir}/program/plugin
|
|
||||||
%{baseinstdir}/program/pluginapp.bin
|
%{baseinstdir}/program/pluginapp.bin
|
||||||
%dir %{baseinstdir}/program/resource
|
%dir %{baseinstdir}/program/resource
|
||||||
%{baseinstdir}/program/resource/avmediaen-US.res
|
%{baseinstdir}/program/resource/avmediaen-US.res
|
||||||
@ -1639,25 +1602,25 @@ install-gdb-printers -a %{_datadir}/gdb/auto-load%{baseinstdir} -c -i %{baseinst
|
|||||||
%{baseinstdir}/program/senddoc
|
%{baseinstdir}/program/senddoc
|
||||||
%dir %{baseinstdir}/program/services
|
%dir %{baseinstdir}/program/services
|
||||||
%{baseinstdir}/program/services/services.rdb
|
%{baseinstdir}/program/services/services.rdb
|
||||||
%{baseinstdir}/program/simplecanvas.uno.so
|
%{baseinstdir}/program/libsimplecanvaslo.so
|
||||||
%{baseinstdir}/program/slideshow.uno.so
|
%{baseinstdir}/program/libslideshowlo.so
|
||||||
%{baseinstdir}/program/libsofficeapp.so
|
%{baseinstdir}/program/libsofficeapp.so
|
||||||
%{baseinstdir}/program/spadmin.bin
|
%{baseinstdir}/program/spadmin.bin
|
||||||
%{baseinstdir}/program/stringresource.uno.so
|
%{baseinstdir}/program/libstringresourcelo.so
|
||||||
%{baseinstdir}/program/syssh.uno.so
|
%{baseinstdir}/program/libsysshlo.so
|
||||||
%{baseinstdir}/program/tde-open-url
|
%{baseinstdir}/program/tde-open-url
|
||||||
%{baseinstdir}/program/ucpcmis1.uno.so
|
%{baseinstdir}/program/libucpcmis1lo.so
|
||||||
%{baseinstdir}/program/ucpexpand1.uno.so
|
%{baseinstdir}/program/libucpexpand1lo.so
|
||||||
%{baseinstdir}/program/ucpext.uno.so
|
%{baseinstdir}/program/libucpextlo.so
|
||||||
%{baseinstdir}/program/ucptdoc1.uno.so
|
%{baseinstdir}/program/libucptdoc1lo.so
|
||||||
%{baseinstdir}/program/unorc
|
%{baseinstdir}/program/unorc
|
||||||
%{baseinstdir}/program/updatefeed.uno.so
|
%{baseinstdir}/program/libupdatefeedlo.so
|
||||||
# TODO do we need this?
|
# TODO do we need this?
|
||||||
%{baseinstdir}/program/ui-previewer
|
%{baseinstdir}/program/ui-previewer
|
||||||
%{baseinstdir}/ure-link
|
%{baseinstdir}/ure-link
|
||||||
%{baseinstdir}/program/uri-encode
|
%{baseinstdir}/program/uri-encode
|
||||||
%{baseinstdir}/program/vbaevents.uno.so
|
%{baseinstdir}/program/libvbaeventslo.so
|
||||||
%{baseinstdir}/program/vclcanvas.uno.so
|
%{baseinstdir}/program/libvclcanvaslo.so
|
||||||
%{baseinstdir}/program/versionrc
|
%{baseinstdir}/program/versionrc
|
||||||
%dir %{baseinstdir}/share
|
%dir %{baseinstdir}/share
|
||||||
%dir %{baseinstdir}/share/Scripts
|
%dir %{baseinstdir}/share/Scripts
|
||||||
@ -1675,16 +1638,25 @@ install-gdb-printers -a %{_datadir}/gdb/auto-load%{baseinstdir} -c -i %{baseinst
|
|||||||
%{baseinstdir}/share/config/psetupl.xpm
|
%{baseinstdir}/share/config/psetupl.xpm
|
||||||
%dir %{baseinstdir}/share/config/soffice.cfg
|
%dir %{baseinstdir}/share/config/soffice.cfg
|
||||||
%{baseinstdir}/share/config/soffice.cfg/modules
|
%{baseinstdir}/share/config/soffice.cfg/modules
|
||||||
|
%if %{with langpacks}
|
||||||
# UI translations go into langpacks
|
# UI translations go into langpacks
|
||||||
%exclude %{baseinstdir}/share/config/soffice.cfg/modules/*/ui/res
|
%exclude %{baseinstdir}/share/config/soffice.cfg/modules/*/ui/res
|
||||||
|
%endif
|
||||||
%{baseinstdir}/share/config/soffice.cfg/*/ui
|
%{baseinstdir}/share/config/soffice.cfg/*/ui
|
||||||
|
%if %{with langpacks}
|
||||||
# UI translations go into langpacks
|
# UI translations go into langpacks
|
||||||
%exclude %{baseinstdir}/share/config/soffice.cfg/*/ui/res
|
%exclude %{baseinstdir}/share/config/soffice.cfg/*/ui/res
|
||||||
|
%endif
|
||||||
%{baseinstdir}/share/config/webcast
|
%{baseinstdir}/share/config/webcast
|
||||||
%{baseinstdir}/share/config/wizard
|
%{baseinstdir}/share/config/wizard
|
||||||
%dir %{baseinstdir}/share/dtd
|
%dir %{baseinstdir}/share/dtd
|
||||||
%{baseinstdir}/share/dtd/officedocument
|
%{baseinstdir}/share/dtd/officedocument
|
||||||
%{baseinstdir}/share/gallery
|
%{baseinstdir}/share/gallery
|
||||||
|
# TODO: do we want to install the glade catalog?
|
||||||
|
%dir %{baseinstdir}/share/glade
|
||||||
|
%{baseinstdir}/share/glade/libreoffice-catalog.xml
|
||||||
|
%dir %{baseinstdir}/share/labels
|
||||||
|
%{baseinstdir}/share/labels/labels.xml
|
||||||
%if 0%{?rhel} && 0%{?rhel} < 7
|
%if 0%{?rhel} && 0%{?rhel} < 7
|
||||||
%{baseinstdir}/share/liblangtag
|
%{baseinstdir}/share/liblangtag
|
||||||
%endif
|
%endif
|
||||||
@ -1710,7 +1682,6 @@ install-gdb-printers -a %{_datadir}/gdb/auto-load%{baseinstdir} -c -i %{baseinst
|
|||||||
%dir %{baseinstdir}/share/wordbook
|
%dir %{baseinstdir}/share/wordbook
|
||||||
%{baseinstdir}/share/wordbook/en-GB.dic
|
%{baseinstdir}/share/wordbook/en-GB.dic
|
||||||
%{baseinstdir}/share/wordbook/en-US.dic
|
%{baseinstdir}/share/wordbook/en-US.dic
|
||||||
%{baseinstdir}/share/wordbook/sl.dic
|
|
||||||
%{baseinstdir}/share/wordbook/technical.dic
|
%{baseinstdir}/share/wordbook/technical.dic
|
||||||
%dir %{baseinstdir}/share/xslt
|
%dir %{baseinstdir}/share/xslt
|
||||||
%{baseinstdir}/share/xslt/common
|
%{baseinstdir}/share/xslt/common
|
||||||
@ -1729,21 +1700,23 @@ install-gdb-printers -a %{_datadir}/gdb/auto-load%{baseinstdir} -c -i %{baseinst
|
|||||||
%{_datadir}/mime-info/libreoffice.*
|
%{_datadir}/mime-info/libreoffice.*
|
||||||
%{baseinstdir}/program/libxmlsecurity.so
|
%{baseinstdir}/program/libxmlsecurity.so
|
||||||
%{_datadir}/mime/packages/libreoffice.xml
|
%{_datadir}/mime/packages/libreoffice.xml
|
||||||
%{baseinstdir}/program/configmgr.uno.so
|
%{baseinstdir}/program/libconfigmgrlo.so
|
||||||
%{baseinstdir}/program/desktopbe1.uno.so
|
%{baseinstdir}/program/libdesktopbe1lo.so
|
||||||
%{baseinstdir}/program/fsstorage.uno.so
|
%{baseinstdir}/program/libfsstoragelo.so
|
||||||
%{baseinstdir}/program/gconfbe1.uno.so
|
%{baseinstdir}/program/libgconfbe1lo.so
|
||||||
%{baseinstdir}/program/i18npool.uno.so
|
%{baseinstdir}/program/libi18npoollo.so
|
||||||
%{baseinstdir}/program/libbasegfxlo.so
|
%{baseinstdir}/program/libbasegfxlo.so
|
||||||
%{baseinstdir}/program/libcomphelpgcc3.so
|
# TODO: shouldn't it have lo suffix?
|
||||||
|
%{baseinstdir}/program/libcomphelper.so
|
||||||
%{baseinstdir}/program/libfileacc.so
|
%{baseinstdir}/program/libfileacc.so
|
||||||
%{baseinstdir}/program/libfwelo.so
|
%{baseinstdir}/program/libfwelo.so
|
||||||
%{baseinstdir}/program/libfwilo.so
|
%{baseinstdir}/program/libfwilo.so
|
||||||
%{baseinstdir}/program/libfwklo.so
|
%{baseinstdir}/program/libfwklo.so
|
||||||
%{baseinstdir}/program/libfwllo.so
|
%{baseinstdir}/program/libfwllo.so
|
||||||
%{baseinstdir}/program/libfwmlo.so
|
%{baseinstdir}/program/libfwmlo.so
|
||||||
%{baseinstdir}/program/libi18nisolang*.so
|
%{baseinstdir}/program/libi18nlangtag.so
|
||||||
%{baseinstdir}/program/libi18nutilgcc3.so
|
# TODO: shouldn't it have lo suffix?
|
||||||
|
%{baseinstdir}/program/libi18nutil.so
|
||||||
%{baseinstdir}/program/libpackage2.so
|
%{baseinstdir}/program/libpackage2.so
|
||||||
%{baseinstdir}/program/libsblo.so
|
%{baseinstdir}/program/libsblo.so
|
||||||
%{baseinstdir}/program/libsfxlo.so
|
%{baseinstdir}/program/libsfxlo.so
|
||||||
@ -1760,8 +1733,8 @@ install-gdb-printers -a %{_datadir}/gdb/auto-load%{baseinstdir} -c -i %{baseinst
|
|||||||
%{baseinstdir}/program/libvcllo.so
|
%{baseinstdir}/program/libvcllo.so
|
||||||
%{baseinstdir}/program/libxmlscriptlo.so
|
%{baseinstdir}/program/libxmlscriptlo.so
|
||||||
%{baseinstdir}/program/libxolo.so
|
%{baseinstdir}/program/libxolo.so
|
||||||
%{baseinstdir}/program/localebe1.uno.so
|
%{baseinstdir}/program/liblocalebe1lo.so
|
||||||
%{baseinstdir}/program/ucpgio1.uno.so
|
%{baseinstdir}/program/libucpgio1lo.so
|
||||||
%{baseinstdir}/program/types/oovbaapi.rdb
|
%{baseinstdir}/program/types/oovbaapi.rdb
|
||||||
#share unopkg
|
#share unopkg
|
||||||
%dir %{baseinstdir}/share/extensions
|
%dir %{baseinstdir}/share/extensions
|
||||||
@ -1785,7 +1758,6 @@ install-gdb-printers -a %{_datadir}/gdb/auto-load%{baseinstdir} -c -i %{baseinst
|
|||||||
%{baseinstdir}/program/libnpsoplugin.so
|
%{baseinstdir}/program/libnpsoplugin.so
|
||||||
%{baseinstdir}/program/oosplash
|
%{baseinstdir}/program/oosplash
|
||||||
%{baseinstdir}/program/shell/
|
%{baseinstdir}/program/shell/
|
||||||
%{baseinstdir}/share/config/images_brand.zip
|
|
||||||
%{baseinstdir}/share/xdg/
|
%{baseinstdir}/share/xdg/
|
||||||
%{baseinstdir}/program/redirectrc
|
%{baseinstdir}/program/redirectrc
|
||||||
%{_datadir}/applications/libreoffice-startcenter.desktop
|
%{_datadir}/applications/libreoffice-startcenter.desktop
|
||||||
@ -1828,10 +1800,11 @@ done
|
|||||||
|
|
||||||
|
|
||||||
%files base
|
%files base
|
||||||
%{baseinstdir}/help/en/sdatabase.*
|
%{baseinstdir}/help/en-US/sdatabase.*
|
||||||
%if 0%{?fedora} || 0%{?rhel} >= 7
|
%if 0%{?fedora} || 0%{?rhel} >= 7
|
||||||
%{baseinstdir}/program/classes/hsqldb.jar
|
%{baseinstdir}/program/classes/hsqldb.jar
|
||||||
%endif
|
%endif
|
||||||
|
%{baseinstdir}/program/classes/reportbuilder.jar
|
||||||
%{baseinstdir}/program/classes/sdbc_hsqldb.jar
|
%{baseinstdir}/program/classes/sdbc_hsqldb.jar
|
||||||
%{baseinstdir}/program/libabplo.so
|
%{baseinstdir}/program/libabplo.so
|
||||||
%{baseinstdir}/program/libdbplo.so
|
%{baseinstdir}/program/libdbplo.so
|
||||||
@ -1847,6 +1820,7 @@ done
|
|||||||
%{baseinstdir}/program/resource/sdbclen-US.res
|
%{baseinstdir}/program/resource/sdbclen-US.res
|
||||||
%{baseinstdir}/program/resource/sdberren-US.res
|
%{baseinstdir}/program/resource/sdberren-US.res
|
||||||
%{baseinstdir}/share/registry/base.xcd
|
%{baseinstdir}/share/registry/base.xcd
|
||||||
|
%{baseinstdir}/share/registry/reportbuilder.xcd
|
||||||
%{baseinstdir}/program/sbase
|
%{baseinstdir}/program/sbase
|
||||||
%{_datadir}/applications/libreoffice-base.desktop
|
%{_datadir}/applications/libreoffice-base.desktop
|
||||||
%{_bindir}/oobase
|
%{_bindir}/oobase
|
||||||
@ -1857,10 +1831,6 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
|
|||||||
%postun base
|
%postun base
|
||||||
update-desktop-database %{_datadir}/applications &> /dev/null || :
|
update-desktop-database %{_datadir}/applications &> /dev/null || :
|
||||||
|
|
||||||
%files report-builder
|
|
||||||
%docdir %{baseinstdir}/share/extensions/report-builder/help
|
|
||||||
%{baseinstdir}/share/extensions/report-builder
|
|
||||||
|
|
||||||
%files bsh
|
%files bsh
|
||||||
%{baseinstdir}/program/classes/ScriptProviderForBeanShell.jar
|
%{baseinstdir}/program/classes/ScriptProviderForBeanShell.jar
|
||||||
%{baseinstdir}/program/services/scriptproviderforbeanshell.rdb
|
%{baseinstdir}/program/services/scriptproviderforbeanshell.rdb
|
||||||
@ -1881,7 +1851,7 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
|
|||||||
%{baseinstdir}/share/extensions/nlpsolver
|
%{baseinstdir}/share/extensions/nlpsolver
|
||||||
|
|
||||||
%files ogltrans
|
%files ogltrans
|
||||||
%{baseinstdir}/program/OGLTrans.uno.so
|
%{baseinstdir}/program/libOGLTranslo.so
|
||||||
%{baseinstdir}/share/config/soffice.cfg/simpress/transitions-ogl.xml
|
%{baseinstdir}/share/config/soffice.cfg/simpress/transitions-ogl.xml
|
||||||
%{baseinstdir}/share/registry/ogltrans.xcd
|
%{baseinstdir}/share/registry/ogltrans.xcd
|
||||||
|
|
||||||
@ -1890,7 +1860,7 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
|
|||||||
%{baseinstdir}/share/extensions/presentation-minimizer
|
%{baseinstdir}/share/extensions/presentation-minimizer
|
||||||
|
|
||||||
%files pdfimport
|
%files pdfimport
|
||||||
%{baseinstdir}/program/pdfimport.uno.so
|
%{baseinstdir}/program/libpdfimportlo.so
|
||||||
%{baseinstdir}/program/xpdfimport
|
%{baseinstdir}/program/xpdfimport
|
||||||
%{baseinstdir}/share/registry/pdfimport.xcd
|
%{baseinstdir}/share/registry/pdfimport.xcd
|
||||||
%dir %{baseinstdir}/share/xpdfimport
|
%dir %{baseinstdir}/share/xpdfimport
|
||||||
@ -1900,7 +1870,7 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
|
|||||||
%doc solver/unxlng*/bin/ure/LICENSE
|
%doc solver/unxlng*/bin/ure/LICENSE
|
||||||
|
|
||||||
%files calc
|
%files calc
|
||||||
%{baseinstdir}/help/en/scalc.*
|
%{baseinstdir}/help/en-US/scalc.*
|
||||||
%{baseinstdir}/program/libanalysislo.so
|
%{baseinstdir}/program/libanalysislo.so
|
||||||
%{baseinstdir}/program/libcalclo.so
|
%{baseinstdir}/program/libcalclo.so
|
||||||
%{baseinstdir}/program/libdatelo.so
|
%{baseinstdir}/program/libdatelo.so
|
||||||
@ -1919,7 +1889,7 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
|
|||||||
%{baseinstdir}/program/resource/pricingen-US.res
|
%{baseinstdir}/program/resource/pricingen-US.res
|
||||||
%{baseinstdir}/program/resource/scen-US.res
|
%{baseinstdir}/program/resource/scen-US.res
|
||||||
%{baseinstdir}/program/resource/solveren-US.res
|
%{baseinstdir}/program/resource/solveren-US.res
|
||||||
%{baseinstdir}/program/vbaobj.uno.so
|
%{baseinstdir}/program/libvbaobjlo.so
|
||||||
%{baseinstdir}/share/registry/calc.xcd
|
%{baseinstdir}/share/registry/calc.xcd
|
||||||
%{baseinstdir}/program/pagein-calc
|
%{baseinstdir}/program/pagein-calc
|
||||||
%{baseinstdir}/program/scalc
|
%{baseinstdir}/program/scalc
|
||||||
@ -1933,7 +1903,7 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
|
|||||||
update-desktop-database %{_datadir}/applications &> /dev/null || :
|
update-desktop-database %{_datadir}/applications &> /dev/null || :
|
||||||
|
|
||||||
%files draw
|
%files draw
|
||||||
%{baseinstdir}/help/en/sdraw.*
|
%{baseinstdir}/help/en-US/sdraw.*
|
||||||
%{baseinstdir}/share/registry/draw.xcd
|
%{baseinstdir}/share/registry/draw.xcd
|
||||||
%{baseinstdir}/program/pagein-draw
|
%{baseinstdir}/program/pagein-draw
|
||||||
%{baseinstdir}/program/sdraw
|
%{baseinstdir}/program/sdraw
|
||||||
@ -1952,7 +1922,7 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
|
|||||||
%{baseinstdir}/program/officehelper.py*
|
%{baseinstdir}/program/officehelper.py*
|
||||||
|
|
||||||
%files writer
|
%files writer
|
||||||
%{baseinstdir}/help/en/swriter.*
|
%{baseinstdir}/help/en-US/swriter.*
|
||||||
%{baseinstdir}/program/libhwplo.so
|
%{baseinstdir}/program/libhwplo.so
|
||||||
%{baseinstdir}/program/liblwpftlo.so
|
%{baseinstdir}/program/liblwpftlo.so
|
||||||
%{baseinstdir}/program/libmswordlo.so
|
%{baseinstdir}/program/libmswordlo.so
|
||||||
@ -1961,7 +1931,7 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
|
|||||||
%{baseinstdir}/program/libt602filterlo.so
|
%{baseinstdir}/program/libt602filterlo.so
|
||||||
%{baseinstdir}/program/libwpftwriterlo.so
|
%{baseinstdir}/program/libwpftwriterlo.so
|
||||||
%{baseinstdir}/program/libwriterfilterlo.so
|
%{baseinstdir}/program/libwriterfilterlo.so
|
||||||
%{baseinstdir}/program/vbaswobj.uno.so
|
%{baseinstdir}/program/libvbaswobjlo.so
|
||||||
%{baseinstdir}/program/resource/t602filteren-US.res
|
%{baseinstdir}/program/resource/t602filteren-US.res
|
||||||
%{baseinstdir}/share/registry/writer.xcd
|
%{baseinstdir}/share/registry/writer.xcd
|
||||||
%{baseinstdir}/program/pagein-writer
|
%{baseinstdir}/program/pagein-writer
|
||||||
@ -1976,10 +1946,10 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
|
|||||||
update-desktop-database %{_datadir}/applications &> /dev/null || :
|
update-desktop-database %{_datadir}/applications &> /dev/null || :
|
||||||
|
|
||||||
%files impress
|
%files impress
|
||||||
%{baseinstdir}/help/en/simpress.*
|
%{baseinstdir}/help/en-US/simpress.*
|
||||||
%{baseinstdir}/program/libanimcorelo.so
|
%{baseinstdir}/program/libanimcorelo.so
|
||||||
%{baseinstdir}/program/libplacewarelo.so
|
%{baseinstdir}/program/libplacewarelo.so
|
||||||
%{baseinstdir}/program/PresenterScreen.uno.so
|
%{baseinstdir}/program/libPresenterScreenlo.so
|
||||||
%dir %{baseinstdir}/share/config/soffice.cfg/simpress
|
%dir %{baseinstdir}/share/config/soffice.cfg/simpress
|
||||||
%{baseinstdir}/share/config/soffice.cfg/simpress/effects.xml
|
%{baseinstdir}/share/config/soffice.cfg/simpress/effects.xml
|
||||||
%{baseinstdir}/share/config/soffice.cfg/simpress/transitions.xml
|
%{baseinstdir}/share/config/soffice.cfg/simpress/transitions.xml
|
||||||
@ -1996,7 +1966,7 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
|
|||||||
update-desktop-database %{_datadir}/applications &> /dev/null || :
|
update-desktop-database %{_datadir}/applications &> /dev/null || :
|
||||||
|
|
||||||
%files math
|
%files math
|
||||||
%{baseinstdir}/help/en/smath.*
|
%{baseinstdir}/help/en-US/smath.*
|
||||||
%{baseinstdir}/program/libsmlo.so
|
%{baseinstdir}/program/libsmlo.so
|
||||||
%{baseinstdir}/program/libsmdlo.so
|
%{baseinstdir}/program/libsmdlo.so
|
||||||
%{baseinstdir}/program/resource/smen-US.res
|
%{baseinstdir}/program/resource/smen-US.res
|
||||||
@ -2013,7 +1983,10 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
|
|||||||
|
|
||||||
%files graphicfilter
|
%files graphicfilter
|
||||||
%{baseinstdir}/program/libflashlo.so
|
%{baseinstdir}/program/libflashlo.so
|
||||||
|
%{baseinstdir}/program/libgraphicfilterlo.so
|
||||||
%{baseinstdir}/program/libsvgfilterlo.so
|
%{baseinstdir}/program/libsvgfilterlo.so
|
||||||
|
%{baseinstdir}/program/libwpftdrawlo.so
|
||||||
|
%{baseinstdir}/program/resource/flashen-US.res
|
||||||
%{baseinstdir}/share/registry/graphicfilter.xcd
|
%{baseinstdir}/share/registry/graphicfilter.xcd
|
||||||
|
|
||||||
%files xsltfilter
|
%files xsltfilter
|
||||||
@ -2024,19 +1997,10 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
|
|||||||
%{baseinstdir}/share/registry/xsltfilter.xcd
|
%{baseinstdir}/share/registry/xsltfilter.xcd
|
||||||
%{_datadir}/applications/libreoffice-xsltfilter.desktop
|
%{_datadir}/applications/libreoffice-xsltfilter.desktop
|
||||||
|
|
||||||
%files javafilter
|
|
||||||
%{baseinstdir}/program/classes/aportisdoc.jar
|
|
||||||
%{baseinstdir}/program/classes/pexcel.jar
|
|
||||||
%{baseinstdir}/program/classes/pocketword.jar
|
|
||||||
%{_datadir}/applications/libreoffice-javafilter.desktop
|
|
||||||
%{baseinstdir}/share/registry/palm.xcd
|
|
||||||
%{baseinstdir}/share/registry/pocketexcel.xcd
|
|
||||||
%{baseinstdir}/share/registry/pocketword.xcd
|
|
||||||
|
|
||||||
%if 0%{?fedora} || 0%{?rhel} >= 7
|
%if 0%{?fedora} || 0%{?rhel} >= 7
|
||||||
%files postgresql
|
%files postgresql
|
||||||
%{baseinstdir}/program/postgresql-sdbc.uno.so
|
%{baseinstdir}/program/libpostgresql-sdbclo.so
|
||||||
%{baseinstdir}/program/postgresql-sdbc-impl.uno.so
|
%{baseinstdir}/program/libpostgresql-sdbc-impllo.so
|
||||||
%{baseinstdir}/program/postgresql-sdbc.ini
|
%{baseinstdir}/program/postgresql-sdbc.ini
|
||||||
%{baseinstdir}/program/services/postgresql-sdbc.rdb
|
%{baseinstdir}/program/services/postgresql-sdbc.rdb
|
||||||
%{baseinstdir}/share/registry/postgresqlsdbc.xcd
|
%{baseinstdir}/share/registry/postgresqlsdbc.xcd
|
||||||
@ -2063,7 +2027,7 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
|
|||||||
%files pyuno
|
%files pyuno
|
||||||
%{baseinstdir}/program/libpyuno.so
|
%{baseinstdir}/program/libpyuno.so
|
||||||
%{baseinstdir}/program/pythonloader.py*
|
%{baseinstdir}/program/pythonloader.py*
|
||||||
%{baseinstdir}/program/pythonloader.uno.so
|
%{baseinstdir}/program/libpythonloaderlo.so
|
||||||
%{baseinstdir}/program/pythonloader.unorc
|
%{baseinstdir}/program/pythonloader.unorc
|
||||||
%{baseinstdir}/program/pythonscript.py*
|
%{baseinstdir}/program/pythonscript.py*
|
||||||
%{baseinstdir}/program/pyuno.so
|
%{baseinstdir}/program/pyuno.so
|
||||||
@ -2081,11 +2045,14 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
|
|||||||
|
|
||||||
%if 0%{?fedora}
|
%if 0%{?fedora}
|
||||||
%files kde
|
%files kde
|
||||||
%{baseinstdir}/program/kde4be1.uno.so
|
%{baseinstdir}/program/libkde4be1lo.so
|
||||||
%{baseinstdir}/program/libvclplug_kde4lo.so
|
%{baseinstdir}/program/libvclplug_kde4lo.so
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri May 24 2013 David Tardon <dtardon@redhat.com> - 1:4.1.0.0-2.beta1
|
||||||
|
- 4.1.0 beta1
|
||||||
|
|
||||||
* Fri May 24 2013 Stephan Bergmann <sbergman@redhat.com> - 1:4.0.3.3-3
|
* Fri May 24 2013 Stephan Bergmann <sbergman@redhat.com> - 1:4.0.3.3-3
|
||||||
- Resolves: rhbz#961460 can't save WebDAV (davs) files
|
- Resolves: rhbz#961460 can't save WebDAV (davs) files
|
||||||
|
|
||||||
|
|||||||
@ -5,24 +5,6 @@ retrieving revision 1.17
|
|||||||
diff -u -p -r1.17 scriptitems.pm
|
diff -u -p -r1.17 scriptitems.pm
|
||||||
--- openoffice.org.orig/solenv/bin/modules/installer/scriptitems.pm 24 Feb 2005 16:21:15 -0000 1.17
|
--- openoffice.org.orig/solenv/bin/modules/installer/scriptitems.pm 24 Feb 2005 16:21:15 -0000 1.17
|
||||||
+++ openoffice.org/solenv/bin/modules/installer/scriptitems.pm 18 Mar 2005 22:39:42 -0000
|
+++ openoffice.org/solenv/bin/modules/installer/scriptitems.pm 18 Mar 2005 22:39:42 -0000
|
||||||
@@ -963,7 +963,7 @@
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
- $infoline = "ERROR: Source for $$searchfilenameref not found!\n"; # Important message in log file
|
|
||||||
+ $infoline = "WARNING: Source for $$searchfilenameref not found!\n"; # Important message in log file
|
|
||||||
}
|
|
||||||
|
|
||||||
push( @installer::globals::logfileinfo, $infoline);
|
|
||||||
@@ -1039,7 +1039,7 @@
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
- $infoline = "ERROR: Source for $$searchfilenameref not found!\n"; # Important message in log file
|
|
||||||
+ $infoline = "WARNING: Source for $$searchfilenameref not found!\n"; # Important message in log file
|
|
||||||
}
|
|
||||||
|
|
||||||
push( @installer::globals::logfileinfo, $infoline);
|
|
||||||
@@ -1356,11 +1356,10 @@
|
@@ -1356,11 +1356,10 @@
|
||||||
|
|
||||||
if ( ! $installer::globals::languagepack && !$installer::globals::helppack)
|
if ( ! $installer::globals::languagepack && !$installer::globals::helppack)
|
||||||
|
|||||||
6
sources
6
sources
@ -5,7 +5,7 @@
|
|||||||
a7983f859eafb2677d7ff386a023bc40 a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
|
a7983f859eafb2677d7ff386a023bc40 a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
|
||||||
1f24ab1d39f4a51faf22244c94a6203f 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
|
1f24ab1d39f4a51faf22244c94a6203f 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
|
||||||
0168229624cfac409e766913506961a8 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
|
0168229624cfac409e766913506961a8 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
|
||||||
7bcde561375f3bbce08f6d05451c8ad7 libreoffice-4.0.3.3.tar.xz
|
|
||||||
994b1f3015668335c30b53ddd3d60dc8 libreoffice-help-4.0.3.3.tar.xz
|
|
||||||
05b9ba0e86181bda3afeadcaba9202a3 libreoffice-translations-4.0.3.3.tar.xz
|
|
||||||
12fb8b5b0d5132726e57b9b9fc7e22c4 libreoffice-multiliblauncher.sh
|
12fb8b5b0d5132726e57b9b9fc7e22c4 libreoffice-multiliblauncher.sh
|
||||||
|
ccf58a56617b3184a547393d29844b3c libreoffice-4.1.0.0.beta1.tar.xz
|
||||||
|
94745bc3ce9585a72cb11f9f95c1f860 libreoffice-help-4.1.0.0.beta1.tar.xz
|
||||||
|
cfd16802227ae46b5cf04abbd95a49b8 libreoffice-translations-4.1.0.0.beta1.tar.xz
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user