David Tardon
13 years ago
parent
147b8c697b
commit
3885f54096
@ -1,27 +0,0 @@
|
||||
From b7d874f49b102eabe2974c4dee1272d2cf6053a3 Mon Sep 17 00:00:00 2001
|
||||
From: Ivan Timofeev <timofeev.i.s@gmail.com>
|
||||
Date: Tue, 20 Sep 2011 10:55:50 +0100
|
||||
Subject: [PATCH] Fix for fdo#35513: avoid crash while processing incorrect
|
||||
range of pages
|
||||
|
||||
---
|
||||
sw/source/core/doc/doc.cxx | 3 +++
|
||||
1 files changed, 3 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
|
||||
index 34d7a96..d83ab53 100644
|
||||
--- a/sw/source/core/doc/doc.cxx
|
||||
+++ b/sw/source/core/doc/doc.cxx
|
||||
@@ -1638,6 +1638,9 @@ void SwDoc::CalculatePagePairsForProspectPrinting(
|
||||
StringRangeEnumerator::getRangesFromString(
|
||||
aPageRange, aPagesToPrint, 1, nDocPageCount, 0 );
|
||||
|
||||
+ if (!aPagesToPrint.size())
|
||||
+ return;
|
||||
+
|
||||
// now fill the vector for calculating the page pairs with the start frames
|
||||
// from the above obtained vector
|
||||
std::vector< const SwPageFrm * > aVec;
|
||||
--
|
||||
1.7.6
|
||||
|
||||
@ -1,38 +0,0 @@
|
||||
From 911227ffc1a0f4a84afabe28f3cc5b54ab475f83 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
||||
Date: Fri, 2 Sep 2011 13:15:49 +0100
|
||||
Subject: [PATCH] Resolves: rhbz#735182 libreoffice doesn't build with
|
||||
poppler-0.17.3
|
||||
|
||||
---
|
||||
.../pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 6 +++++-
|
||||
1 files changed, 5 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
|
||||
index cf28922..3f1261c 100644
|
||||
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
|
||||
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
|
||||
@@ -150,7 +150,11 @@ void writeBinaryBuffer( const OutputBuffer& rBuffer )
|
||||
void writeJpeg_( OutputBuffer& o_rOutputBuf, Stream* str, bool bWithLinefeed )
|
||||
{
|
||||
// dump JPEG file as-is
|
||||
+#if POPPLER_CHECK_VERSION(0, 17, 3)
|
||||
+ str = str->getBaseStream();
|
||||
+#else
|
||||
str = ((DCTStream *)str)->getRawStream();
|
||||
+#endif
|
||||
str->reset();
|
||||
|
||||
int c;
|
||||
@@ -490,7 +494,7 @@ void PDFOutDev::endPage()
|
||||
}
|
||||
|
||||
#if POPPLER_CHECK_VERSION(0, 17, 0)
|
||||
-void PDFOutDev::processLink(AnnotLink *link, Catalog *catalog)
|
||||
+void PDFOutDev::processLink(AnnotLink *link, Catalog *)
|
||||
#else
|
||||
void PDFOutDev::processLink(Link* link, Catalog*)
|
||||
#endif
|
||||
--
|
||||
1.7.6
|
||||
|
||||
@ -1,100 +0,0 @@
|
||||
From ac7475b06466404ac23d5352d9226de857d83987 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
||||
Date: Wed, 13 Apr 2011 13:48:19 +0100
|
||||
Subject: [PATCH] add these back in to silence the MAXFILTER assert
|
||||
|
||||
---
|
||||
binfilter/bf_sw/source/filter/basflt/sw_fltini.cxx | 13 ++++++++++
|
||||
.../bf_sw/source/filter/basflt/sw_shellio.cxx | 24 +-------------------
|
||||
binfilter/inc/bf_sw/iodetect.hxx | 5 +--
|
||||
3 files changed, 16 insertions(+), 26 deletions(-)
|
||||
|
||||
diff --git a/binfilter/bf_sw/source/filter/basflt/sw_fltini.cxx b/binfilter/bf_sw/source/filter/basflt/sw_fltini.cxx
|
||||
index 27bfad6..6d90fac 100644
|
||||
--- a/binfilter/bf_sw/source/filter/basflt/sw_fltini.cxx
|
||||
+++ b/binfilter/bf_sw/source/filter/basflt/sw_fltini.cxx
|
||||
@@ -89,10 +89,23 @@ inline void _SetFltPtr( USHORT& rPos, SwRead pReader, const sal_Char* pNm )
|
||||
|
||||
void _InitFilter()
|
||||
{
|
||||
+ SwRead pRd;
|
||||
+
|
||||
USHORT nCnt = 0;
|
||||
_SetFltPtr( nCnt, (ReadSw3 = new Sw3Reader), FILTER_SW5 );
|
||||
_SetFltPtr( nCnt, ReadSw3, FILTER_SW4 );
|
||||
_SetFltPtr( nCnt, ReadSw3, FILTER_SW3 );
|
||||
+ _SetFltPtr( nCnt, (ReadSwg = new SwgReader), FILTER_SWG );
|
||||
+ _SetFltPtr( nCnt, ReadSwg, FILTER_SWGV );
|
||||
+ _SetFltPtr( nCnt, new Sw6Reader, sSwDos );
|
||||
+ _SetFltPtr( nCnt, (ReadAscii = new AsciiReader), FILTER_BAS );
|
||||
+ _SetFltPtr( nCnt, new W4WReader, FILTER_W4W );
|
||||
+ _SetFltPtr( nCnt, ( pRd = new ExcelReader ), sCExcel );
|
||||
+ _SetFltPtr( nCnt, pRd, sExcel );
|
||||
+ _SetFltPtr( nCnt, new LotusReader, sLotusD );
|
||||
+ _SetFltPtr( nCnt, ReadSwg, sSwg1 );
|
||||
+
|
||||
+ _SetFltPtr( nCnt, ReadAscii, FILTER_TEXT );
|
||||
|
||||
OSL_ENSURE( MAXFILTER == nCnt, "Anzahl Filter ungleich der Definierten" );
|
||||
}
|
||||
diff --git a/binfilter/bf_sw/source/filter/basflt/sw_shellio.cxx b/binfilter/bf_sw/source/filter/basflt/sw_shellio.cxx
|
||||
index 2c5557f..3399f21 100644
|
||||
--- a/binfilter/bf_sw/source/filter/basflt/sw_shellio.cxx
|
||||
+++ b/binfilter/bf_sw/source/filter/basflt/sw_shellio.cxx
|
||||
@@ -351,29 +351,7 @@ using namespace ::com::sun::star;
|
||||
/*?*/ // we cannot create a SwDocShell. We could create a
|
||||
/*?*/ // SwWebDocShell however, because this exists always
|
||||
/*?*/ // for the help.
|
||||
- OSL_ASSERT("ReadXML removed");
|
||||
-
|
||||
-// SvtModuleOptions aModuleOptions;
|
||||
-// if( aModuleOptions.IsWriter() )
|
||||
-// {
|
||||
-// SwDocShell *pDocSh =
|
||||
-// new SwDocShell ( SFX_CREATE_MODE_INTERNAL );
|
||||
-// SvEmbeddedObjectRef xDocSh = pDocSh;
|
||||
-// if( pDocSh->DoInitNew( 0 ) )
|
||||
-// {
|
||||
-// pTemplate = pDocSh->GetDoc();
|
||||
-// pTemplate->SetOle2Link( Link() );
|
||||
-// pTemplate->SetBrowseMode( bTmplBrowseMode );
|
||||
-// pTemplate->RemoveAllFmtLanguageDependencies();
|
||||
-//
|
||||
-// ReadXML->SetOrganizerMode( TRUE );
|
||||
-// SwReader aRdr( *xStor, aEmptyStr, pTemplate );
|
||||
-// aRdr.Read( *ReadXML );
|
||||
-// ReadXML->SetOrganizerMode( FALSE );
|
||||
-//
|
||||
-// pTemplate->AddLink();
|
||||
-// }
|
||||
-// }
|
||||
+ OSL_ASSERT("ReadXML removed");
|
||||
/*?*/ }
|
||||
/*?*/ else
|
||||
/*?*/ {
|
||||
diff --git a/binfilter/inc/bf_sw/iodetect.hxx b/binfilter/inc/bf_sw/iodetect.hxx
|
||||
index e91b371..94199a9 100644
|
||||
--- a/binfilter/inc/bf_sw/iodetect.hxx
|
||||
+++ b/binfilter/inc/bf_sw/iodetect.hxx
|
||||
@@ -105,7 +105,7 @@ struct SwIoDetect
|
||||
#endif
|
||||
|
||||
|
||||
-const USHORT MAXFILTER = 14;
|
||||
+const USHORT MAXFILTER = 13;
|
||||
|
||||
#define FORAMTNAME_SW4 "StarWriter 4.0"
|
||||
#define FORAMTNAME_SW3 "StarWriter 3.0"
|
||||
@@ -161,8 +161,7 @@ SwIoDetect aReaderWriter[ MAXFILTER ] = { \
|
||||
{/* 9*/ SwIoEntry(sExcel, 4, FALSE)}, \
|
||||
{/*10*/ SwIoEntry(sLotusD, 5, TRUE)}, \
|
||||
{/*11*/ SwIoEntry(sSwg1, 4, FALSE)}, \
|
||||
- {/*12*/ SwIoEntry(FILTER_XML, 4, TRUE)}, \
|
||||
- {/*13*/ SwIoEntry(FILTER_TEXT, 4, TRUE)} \
|
||||
+ {/*12*/ SwIoEntry(FILTER_TEXT, 4, TRUE)} \
|
||||
};
|
||||
|
||||
// Filter erkennung
|
||||
--
|
||||
1.7.6.4
|
||||
|
||||
@ -1,37 +0,0 @@
|
||||
From d14700853b39685e5171b5aa99142106cd658aad Mon Sep 17 00:00:00 2001
|
||||
From: David Tardon <dtardon@redhat.com>
|
||||
Date: Tue, 24 May 2011 06:30:46 +0200
|
||||
Subject: [PATCH] handle NULL display gracefully
|
||||
|
||||
---
|
||||
desktop/unx/source/splashx.c | 6 +++++-
|
||||
1 files changed, 5 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/desktop/unx/source/splashx.c b/desktop/unx/source/splashx.c
|
||||
index a8a87b0..dc88343 100755
|
||||
--- a/desktop/unx/source/splashx.c
|
||||
+++ b/desktop/unx/source/splashx.c
|
||||
@@ -574,6 +574,9 @@ static void process_events()
|
||||
// Draw the progress
|
||||
void splash_draw_progress( int progress )
|
||||
{
|
||||
+ if (!display)
|
||||
+ return;
|
||||
+
|
||||
// sanity
|
||||
if ( progress < 0 )
|
||||
progress = 0;
|
||||
@@ -604,8 +607,9 @@ void splash_draw_progress( int progress )
|
||||
// Close the window & cleanup
|
||||
void splash_close_window()
|
||||
{
|
||||
- XCloseDisplay( display );
|
||||
+ if (display)
|
||||
+ XCloseDisplay( display );
|
||||
display = NULL;
|
||||
#ifdef USE_LIBPNG
|
||||
png_destroy_read_struct( &png_ptr, &info_ptr, NULL );
|
||||
#else
|
||||
--
|
||||
1.7.5.1
|
||||
|
||||
@ -1,38 +0,0 @@
|
||||
From 6163c62a52794725188faf82ee12852f4b2cd023 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= <l.lunak@suse.cz>
|
||||
Date: Thu, 20 Oct 2011 16:41:50 +0200
|
||||
Subject: [PATCH] let Qt call XInitThreads(), so that it knows it's been
|
||||
called (fdo#40298)
|
||||
|
||||
Otherwise QPixmap complains when used outside of the main Qt thread
|
||||
and resets itself to null pixmap, eventually leading to crashes.
|
||||
---
|
||||
vcl/unx/kde4/main.cxx | 11 +++++++++++
|
||||
1 files changed, 11 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/vcl/unx/kde4/main.cxx b/vcl/unx/kde4/main.cxx
|
||||
index 9e0a361..482a212 100644
|
||||
--- a/vcl/unx/kde4/main.cxx
|
||||
+++ b/vcl/unx/kde4/main.cxx
|
||||
@@ -56,7 +56,18 @@ extern "C" {
|
||||
established, so protect X against itself
|
||||
*/
|
||||
if( ! ( pNoXInitThreads && *pNoXInitThreads ) )
|
||||
+ {
|
||||
+#if QT_VERSION >= 0x040800
|
||||
+ // let Qt call XInitThreads(), so that also Qt knows it's been used
|
||||
+ // (otherwise QPixmap may warn about threads not being initialized)
|
||||
+ QApplication::setAttribute( Qt::AA_X11InitThreads );
|
||||
+#else
|
||||
XInitThreads();
|
||||
+ // just in case somebody builds with old version and then upgrades Qt,
|
||||
+ // otherwise this is a no-op
|
||||
+ QApplication::setAttribute( static_cast< ApplicationAttribute >( 10 ));
|
||||
+#endif
|
||||
+ }
|
||||
|
||||
#if QT_VERSION < 0x050000
|
||||
// Qt 4.x support needs >= 4.1.0
|
||||
--
|
||||
1.7.6.4
|
||||
|
||||
@ -1,29 +0,0 @@
|
||||
From dcb9d674c898d33f1895871c38ec308a460e9400 Mon Sep 17 00:00:00 2001
|
||||
From: Radek Doulik <rodo@novell.com>
|
||||
Date: Thu, 1 Sep 2011 11:14:21 +0200
|
||||
Subject: [PATCH] make sure we stay in array bounds
|
||||
|
||||
---
|
||||
vcl/unx/gtk/app/gtkdata.cxx | 6 ++++--
|
||||
1 files changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx
|
||||
index b68d023..c5d12c8 100644
|
||||
--- a/vcl/unx/gtk/app/gtkdata.cxx
|
||||
+++ b/vcl/unx/gtk/app/gtkdata.cxx
|
||||
@@ -265,8 +265,10 @@ int GtkSalDisplay::GetDefaultMonitorNumber() const
|
||||
gint nMonitors = gdk_screen_get_n_monitors(pScreen);
|
||||
for (gint i = 0; i < nMonitors; ++i)
|
||||
{
|
||||
- if (g_ascii_strncasecmp (gdk_screen_get_monitor_plug_name(pScreen, i), "LVDS", 4) == 0)
|
||||
- return m_aXineramaScreenIndexMap[i];
|
||||
+ if (g_ascii_strncasecmp (gdk_screen_get_monitor_plug_name(pScreen, i), "LVDS", 4) == 0) {
|
||||
+ OSL_ASSERT( size_t(i) < m_aXineramaScreenIndexMap.size() );
|
||||
+ return (size_t(i) < m_aXineramaScreenIndexMap.size()) ? m_aXineramaScreenIndexMap[i] : 0;
|
||||
+ }
|
||||
}
|
||||
#endif
|
||||
return 0;
|
||||
--
|
||||
1.7.6.4
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
diff --git a/translations/source/bn/sfx2/source/doc.po b/translations/source/bn/sfx2/source/doc.po
|
||||
index 888f346..293ccdd 100644
|
||||
--- a/translations/source/bn/sfx2/source/doc.po
|
||||
+++ b/translations/source/bn/sfx2/source/doc.po
|
||||
@@ -308,7 +308,7 @@ msgstr "বার্তা"
|
||||
|
||||
#: doc.src#STR_NOSAVEANDCLOSE.string.text
|
||||
msgid "~Discard"
|
||||
-msgstr "বাতিল (~D)"
|
||||
+msgstr "বর্জন (~D)"
|
||||
|
||||
#: doc.src#STR_PACKNGO_NOACCESS.string.text
|
||||
msgid "Access to the current data medium not possible."
|
||||
@ -1,46 +0,0 @@
|
||||
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
|
||||
index f7741b4..df15a94 100644
|
||||
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
|
||||
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
|
||||
@@ -489,7 +489,11 @@ void PDFOutDev::endPage()
|
||||
printf("endPage\n");
|
||||
}
|
||||
|
||||
+#if POPPLER_CHECK_VERSION(0, 17, 0)
|
||||
+void PDFOutDev::processLink(AnnotLink *link, Catalog *catalog)
|
||||
+#else
|
||||
void PDFOutDev::processLink(Link* link, Catalog*)
|
||||
+#endif
|
||||
{
|
||||
assert(link);
|
||||
|
||||
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
|
||||
index 3ac0f49..0fd43c5 100644
|
||||
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
|
||||
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
|
||||
@@ -65,7 +65,10 @@ class GfxPath;
|
||||
class GfxFont;
|
||||
class PDFDoc;
|
||||
#ifndef SYSTEM_POPPLER
|
||||
+#define POPPLER_CHECK_VERSION(major,minor,micro) (0)
|
||||
typedef GString GooString;
|
||||
+#else
|
||||
+#include <glib/poppler-features.h>
|
||||
#endif
|
||||
|
||||
namespace pdfi
|
||||
@@ -193,9 +196,13 @@ namespace pdfi
|
||||
// Convert between device and user coordinates.
|
||||
// virtual void cvtDevToUser(double dx, double dy, double *ux, double *uy);
|
||||
// virtual void cvtUserToDev(double ux, double uy, int *dx, int *dy);
|
||||
-
|
||||
+
|
||||
+ #if POPPLER_CHECK_VERSION(0, 17, 0)
|
||||
+ virtual void processLink(AnnotLink *link, Catalog *catalog);
|
||||
+ #else
|
||||
//----- link borders
|
||||
virtual void processLink(Link *link, Catalog *catalog);
|
||||
+ #endif
|
||||
|
||||
//----- save/restore graphics state
|
||||
virtual void saveState(GfxState *state);
|
||||
@ -1,352 +0,0 @@
|
||||
commit 18744f661be29d5f41421c5b71b2434097e8ef4c
|
||||
Author: Caolán McNamara <caolanm@redhat.com>
|
||||
Date: Thu Sep 29 21:59:28 2011 +0100
|
||||
|
||||
help gcc 4.6.1 out with ambiguity
|
||||
|
||||
diff --git a/vcl/unx/gtk/a11y/atkutil.cxx b/vcl/unx/gtk/a11y/atkutil.cxx
|
||||
index 68bb949..e662f6e 100644
|
||||
--- a/vcl/unx/gtk/a11y/atkutil.cxx
|
||||
+++ b/vcl/unx/gtk/a11y/atkutil.cxx
|
||||
@@ -312,8 +312,12 @@ void DocumentFocusListener::attachRecursive(
|
||||
uno::Reference< accessibility::XAccessibleEventBroadcaster > xBroadcaster =
|
||||
uno::Reference< accessibility::XAccessibleEventBroadcaster >(xContext, uno::UNO_QUERY);
|
||||
|
||||
+ if (!xBroadcaster.is())
|
||||
+ return;
|
||||
+
|
||||
// If not already done, add the broadcaster to the list and attach as listener.
|
||||
- if( xBroadcaster.is() && m_aRefList.insert(xBroadcaster).second )
|
||||
+ uno::Reference< uno::XInterface > xInterface = xBroadcaster;
|
||||
+ if( m_aRefList.insert(xInterface).second )
|
||||
{
|
||||
xBroadcaster->addEventListener(static_cast< accessibility::XAccessibleEventListener *>(this));
|
||||
|
||||
commit 3c7a0b5d5455805210262529fbd9815aed6fe267
|
||||
Author: Caolán McNamara <caolanm@redhat.com>
|
||||
Date: Thu Sep 29 23:02:56 2011 +0100
|
||||
|
||||
tweak ambiguities for F-15 gcc 4.6.1-9
|
||||
|
||||
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx
|
||||
index c72d7f7..e1c7347 100644
|
||||
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
|
||||
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
|
||||
@@ -1696,10 +1696,13 @@ void ODatabaseDocument::disposing()
|
||||
::osl::ClearableMutexGuard aGuard( m_aMutex );
|
||||
|
||||
OSL_ENSURE( m_aControllers.empty(), "ODatabaseDocument::disposing: there still are controllers!" );
|
||||
- // normally, nobody should explicitly dispose, but only XCloseable::close the document. And upon
|
||||
- // closing, our controllers are closed, too
|
||||
+ // normally, nobody should explicitly dispose, but only XCloseable::close
|
||||
+ // the document. And upon closing, our controllers are closed, too
|
||||
|
||||
- aKeepAlive.push_back( m_xUIConfigurationManager );
|
||||
+ {
|
||||
+ uno::Reference<uno::XInterface> xUIInterface = m_xUIConfigurationManager;
|
||||
+ aKeepAlive.push_back( xUIInterface );
|
||||
+ }
|
||||
m_xUIConfigurationManager = NULL;
|
||||
|
||||
clearObjectContainer( m_xForms );
|
||||
@@ -1721,10 +1724,16 @@ void ODatabaseDocument::disposing()
|
||||
OSL_ENSURE( m_aControllers.empty(), "ODatabaseDocument::disposing: there still are controllers!" );
|
||||
impl_disposeControllerFrames_nothrow();
|
||||
|
||||
- aKeepAlive.push_back( m_xModuleManager );
|
||||
+ {
|
||||
+ uno::Reference<uno::XInterface> xModuleInterface = m_xModuleManager;
|
||||
+ aKeepAlive.push_back( xModuleInterface );
|
||||
+ }
|
||||
m_xModuleManager.clear();
|
||||
|
||||
- aKeepAlive.push_back( m_xTitleHelper );
|
||||
+ {
|
||||
+ uno::Reference<uno::XInterface> xTitleInterface = m_xTitleHelper;
|
||||
+ aKeepAlive.push_back( xTitleInterface );
|
||||
+ }
|
||||
m_xTitleHelper.clear();
|
||||
|
||||
m_pImpl.clear();
|
||||
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
|
||||
index 017794d..37f0880 100644
|
||||
--- a/dbaccess/source/ui/browser/unodatbr.cxx
|
||||
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
|
||||
@@ -781,7 +781,7 @@ sal_Bool SbaTableQueryBrowser::InitializeGridModel(const Reference< ::com::sun::
|
||||
if ( xSupplier.is() )
|
||||
aInitialValues.push_back( NamedValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FormatsSupplier")), makeAny( xSupplier ) ) );
|
||||
aInitialValues.push_back( NamedValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TreatAsNumber")), makeAny( (sal_Bool)bFormattedIsNumeric ) ) );
|
||||
- aCopyProperties.push_back( PROPERTY_FORMATKEY );
|
||||
+ aCopyProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_FORMATKEY) );
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -814,8 +814,8 @@ sal_Bool SbaTableQueryBrowser::InitializeGridModel(const Reference< ::com::sun::
|
||||
aInitialValues.push_back( NamedValue( sDefaultProperty, aDefault ) );
|
||||
|
||||
// transfer properties from the definition to the UNO-model :
|
||||
- aCopyProperties.push_back( PROPERTY_HIDDEN );
|
||||
- aCopyProperties.push_back( PROPERTY_WIDTH );
|
||||
+ aCopyProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_HIDDEN) );
|
||||
+ aCopyProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_WIDTH) );
|
||||
|
||||
// help text to display for the column
|
||||
Any aDescription;
|
||||
diff --git a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx
|
||||
index 9ffe63e..eac0c75 100644
|
||||
--- a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx
|
||||
+++ b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx
|
||||
@@ -254,7 +254,11 @@ namespace dbaui
|
||||
::std::vector< Reference<XInterface> > aRelations;
|
||||
aRelations.reserve(5); // just guessing
|
||||
for (; aIter != aEnd ; ++aIter )
|
||||
- aRelations.push_back(getParentChild(aIter - pConnectionList->begin()));
|
||||
+ {
|
||||
+ uno::Reference<uno::XInterface> xInterface =
|
||||
+ getParentChild(aIter - pConnectionList->begin());
|
||||
+ aRelations.push_back(xInterface);
|
||||
+ }
|
||||
|
||||
Reference<XInterface> *pRelations = aRelations.empty() ? 0 : &aRelations[0];
|
||||
Sequence< Reference<XInterface> > aSeq(pRelations, aRelations.size());
|
||||
diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx
|
||||
index b0f6db2..1f37f3a 100644
|
||||
--- a/reportdesign/source/filter/xml/xmlExport.cxx
|
||||
+++ b/reportdesign/source/filter/xml/xmlExport.cxx
|
||||
@@ -1201,15 +1201,15 @@ void ORptExport::exportAutoStyle(XPropertySet* _xProp,const Reference<XFormatted
|
||||
if ( !aPos.X )
|
||||
{
|
||||
sBorderProp = PROPERTY_BORDERLEFT;
|
||||
- aProps.push_back(PROPERTY_BORDERRIGHT);
|
||||
+ aProps.push_back(static_cast<const rtl::OUString&>(PROPERTY_BORDERRIGHT));
|
||||
}
|
||||
else
|
||||
{
|
||||
sBorderProp = PROPERTY_BORDERRIGHT;
|
||||
- aProps.push_back(PROPERTY_BORDERLEFT);
|
||||
+ aProps.push_back(static_cast<const rtl::OUString&>(PROPERTY_BORDERLEFT));
|
||||
}
|
||||
- aProps.push_back(PROPERTY_BORDERTOP);
|
||||
- aProps.push_back(PROPERTY_BORDERBOTTOM);
|
||||
+ aProps.push_back(static_cast<const rtl::OUString&>(PROPERTY_BORDERTOP));
|
||||
+ aProps.push_back(static_cast<const rtl::OUString&>(PROPERTY_BORDERBOTTOM));
|
||||
}
|
||||
else // horizontal
|
||||
{
|
||||
@@ -1217,15 +1217,15 @@ void ORptExport::exportAutoStyle(XPropertySet* _xProp,const Reference<XFormatted
|
||||
if ( (aPos.Y + aSize.Height) == nSectionHeight )
|
||||
{
|
||||
sBorderProp = PROPERTY_BORDERBOTTOM;
|
||||
- aProps.push_back(PROPERTY_BORDERTOP);
|
||||
+ aProps.push_back(static_cast<const rtl::OUString&>(PROPERTY_BORDERTOP));
|
||||
}
|
||||
else
|
||||
{
|
||||
sBorderProp = PROPERTY_BORDERTOP;
|
||||
- aProps.push_back(PROPERTY_BORDERBOTTOM);
|
||||
+ aProps.push_back(static_cast<const rtl::OUString&>(PROPERTY_BORDERBOTTOM));
|
||||
}
|
||||
- aProps.push_back(PROPERTY_BORDERRIGHT);
|
||||
- aProps.push_back(PROPERTY_BORDERLEFT);
|
||||
+ aProps.push_back(static_cast<const rtl::OUString&>(PROPERTY_BORDERRIGHT));
|
||||
+ aProps.push_back(static_cast<const rtl::OUString&>(PROPERTY_BORDERLEFT));
|
||||
}
|
||||
|
||||
xBorderProp->setPropertyValue(sBorderProp,uno::makeAny(aValue));
|
||||
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
|
||||
index 2ff973f..38407f1 100644
|
||||
--- a/reportdesign/source/ui/report/ReportController.cxx
|
||||
+++ b/reportdesign/source/ui/report/ReportController.cxx
|
||||
@@ -257,7 +257,8 @@ void lcl_getReportControlFormat(const Sequence< PropertyValue >& aArgs,
|
||||
}
|
||||
else
|
||||
{
|
||||
- _rControlsFormats.push_back(xReportControlFormat);
|
||||
+ uno::Reference<uno::XInterface> xInterface = xReportControlFormat;
|
||||
+ _rControlsFormats.push_back(xInterface);
|
||||
}
|
||||
|
||||
if ( !_xWindow.is() )
|
||||
diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx
|
||||
index 66b5658..af6947f 100644
|
||||
--- a/reportdesign/source/ui/report/ReportSection.cxx
|
||||
+++ b/reportdesign/source/ui/report/ReportSection.cxx
|
||||
@@ -726,7 +726,11 @@ void OReportSection::fillControlModelSelection(::std::vector< uno::Reference< un
|
||||
const SdrObject* pDlgEdObj = rMarkList.GetMark(i)->GetMarkedSdrObj();
|
||||
const OObjectBase* pObj = dynamic_cast<const OObjectBase*>(pDlgEdObj);
|
||||
if ( pObj )
|
||||
- _rSelection.push_back(pObj->getReportComponent());
|
||||
+ {
|
||||
+ uno::Reference<uno::XInterface> xInterface =
|
||||
+ pObj->getReportComponent();
|
||||
+ _rSelection.push_back(xInterface);
|
||||
+ }
|
||||
}
|
||||
}
|
||||
}
|
||||
commit 242f1bee6e0df3c58c257178058d61a1c349c2ed
|
||||
Author: Caolán McNamara <caolanm@redhat.com>
|
||||
Date: Thu Sep 29 21:32:08 2011 +0100
|
||||
|
||||
get this building with gcc 4.6.1
|
||||
|
||||
diff --git a/extensions/source/propctrlr/editpropertyhandler.cxx b/extensions/source/propctrlr/editpropertyhandler.cxx
|
||||
index a1693ae..363f685 100644
|
||||
--- a/extensions/source/propctrlr/editpropertyhandler.cxx
|
||||
+++ b/extensions/source/propctrlr/editpropertyhandler.cxx
|
||||
@@ -248,13 +248,13 @@ namespace pcr
|
||||
::std::vector< ::rtl::OUString > aSuperseded;
|
||||
if ( implHaveBothScrollBarProperties() )
|
||||
{
|
||||
- aSuperseded.push_back( PROPERTY_HSCROLL );
|
||||
- aSuperseded.push_back( PROPERTY_VSCROLL );
|
||||
+ aSuperseded.push_back( static_cast<const rtl::OUString&>(PROPERTY_HSCROLL) );
|
||||
+ aSuperseded.push_back( static_cast<const rtl::OUString&>(PROPERTY_VSCROLL) );
|
||||
}
|
||||
if ( implHaveTextTypeProperty() )
|
||||
{
|
||||
- aSuperseded.push_back( PROPERTY_RICHTEXT );
|
||||
- aSuperseded.push_back( PROPERTY_MULTILINE );
|
||||
+ aSuperseded.push_back( static_cast<const rtl::OUString&>(PROPERTY_RICHTEXT) );
|
||||
+ aSuperseded.push_back( static_cast<const rtl::OUString&>(PROPERTY_MULTILINE) );
|
||||
}
|
||||
if ( aSuperseded.empty() )
|
||||
return Sequence< ::rtl::OUString >();
|
||||
@@ -267,8 +267,8 @@ namespace pcr
|
||||
::osl::MutexGuard aGuard( m_aMutex );
|
||||
::std::vector< ::rtl::OUString > aInterestingActuatingProps;
|
||||
if ( implHaveTextTypeProperty() )
|
||||
- aInterestingActuatingProps.push_back( PROPERTY_TEXTTYPE );
|
||||
- aInterestingActuatingProps.push_back( PROPERTY_MULTILINE );
|
||||
+ aInterestingActuatingProps.push_back( static_cast<const rtl::OUString&>(PROPERTY_TEXTTYPE) );
|
||||
+ aInterestingActuatingProps.push_back( static_cast<const rtl::OUString&>(PROPERTY_MULTILINE) );
|
||||
return Sequence< ::rtl::OUString >( &(*aInterestingActuatingProps.begin()), aInterestingActuatingProps.size() );;
|
||||
}
|
||||
|
||||
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
|
||||
index 48d0bbe..a006ab5 100644
|
||||
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
|
||||
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
|
||||
@@ -947,28 +947,28 @@ namespace pcr
|
||||
{
|
||||
::osl::MutexGuard aGuard( m_aMutex );
|
||||
::std::vector< ::rtl::OUString > aInterestingProperties;
|
||||
- aInterestingProperties.push_back( PROPERTY_DATASOURCE );
|
||||
- aInterestingProperties.push_back( PROPERTY_COMMAND );
|
||||
- aInterestingProperties.push_back( PROPERTY_COMMANDTYPE );
|
||||
- aInterestingProperties.push_back( PROPERTY_LISTSOURCE );
|
||||
- aInterestingProperties.push_back( PROPERTY_LISTSOURCETYPE );
|
||||
- aInterestingProperties.push_back( PROPERTY_SUBMIT_ENCODING );
|
||||
- aInterestingProperties.push_back( PROPERTY_REPEAT );
|
||||
- aInterestingProperties.push_back( PROPERTY_TABSTOP );
|
||||
- aInterestingProperties.push_back( PROPERTY_BORDER );
|
||||
- aInterestingProperties.push_back( PROPERTY_CONTROLSOURCE );
|
||||
- aInterestingProperties.push_back( PROPERTY_DROPDOWN );
|
||||
- aInterestingProperties.push_back( PROPERTY_IMAGE_URL );
|
||||
- aInterestingProperties.push_back( PROPERTY_TARGET_URL );
|
||||
- aInterestingProperties.push_back( PROPERTY_STRINGITEMLIST );
|
||||
- aInterestingProperties.push_back( PROPERTY_BUTTONTYPE );
|
||||
- aInterestingProperties.push_back( PROPERTY_ESCAPE_PROCESSING );
|
||||
- aInterestingProperties.push_back( PROPERTY_TRISTATE );
|
||||
- aInterestingProperties.push_back( PROPERTY_DECIMAL_ACCURACY );
|
||||
- aInterestingProperties.push_back( PROPERTY_SHOWTHOUSANDSEP );
|
||||
- aInterestingProperties.push_back( PROPERTY_FORMATKEY );
|
||||
- aInterestingProperties.push_back( PROPERTY_EMPTY_IS_NULL );
|
||||
- aInterestingProperties.push_back( PROPERTY_TOGGLE );
|
||||
+ aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_DATASOURCE) );
|
||||
+ aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_COMMAND) );
|
||||
+ aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_COMMANDTYPE) );
|
||||
+ aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_LISTSOURCE) );
|
||||
+ aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_LISTSOURCETYPE) );
|
||||
+ aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_SUBMIT_ENCODING) );
|
||||
+ aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_REPEAT) );
|
||||
+ aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_TABSTOP) );
|
||||
+ aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_BORDER) );
|
||||
+ aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_CONTROLSOURCE) );
|
||||
+ aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_DROPDOWN) );
|
||||
+ aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_IMAGE_URL) );
|
||||
+ aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_TARGET_URL) );
|
||||
+ aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_STRINGITEMLIST) );
|
||||
+ aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_BUTTONTYPE) );
|
||||
+ aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_ESCAPE_PROCESSING) );
|
||||
+ aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_TRISTATE) );
|
||||
+ aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_DECIMAL_ACCURACY) );
|
||||
+ aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_SHOWTHOUSANDSEP) );
|
||||
+ aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_FORMATKEY) );
|
||||
+ aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_EMPTY_IS_NULL) );
|
||||
+ aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_TOGGLE) );
|
||||
return Sequence< ::rtl::OUString >( &(*aInterestingProperties.begin()), aInterestingProperties.size() );
|
||||
}
|
||||
|
||||
diff --git a/extensions/source/propctrlr/xsdvalidationhelper.cxx b/extensions/source/propctrlr/xsdvalidationhelper.cxx
|
||||
index 4ade7c5..54338a3 100644
|
||||
--- a/extensions/source/propctrlr/xsdvalidationhelper.cxx
|
||||
+++ b/extensions/source/propctrlr/xsdvalidationhelper.cxx
|
||||
@@ -271,7 +271,7 @@ namespace pcr
|
||||
Reference< XPropertySet > xNewType( getDataType( _rName ), UNO_QUERY );
|
||||
|
||||
// fire any changes in the properties which result from this new type
|
||||
- std::set< ::rtl::OUString > aFilter; aFilter.insert( PROPERTY_NAME );
|
||||
+ std::set< ::rtl::OUString > aFilter; aFilter.insert( static_cast<const rtl::OUString&>(PROPERTY_NAME) );
|
||||
firePropertyChanges( xOldType, xNewType, aFilter );
|
||||
|
||||
// fire the change in the Data Type property
|
||||
diff --git a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
|
||||
index b9ca345..31c6ba2 100644
|
||||
--- a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
|
||||
+++ b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
|
||||
@@ -247,27 +247,27 @@ namespace pcr
|
||||
::std::vector< ::rtl::OUString > aSuperfluous;
|
||||
if ( m_pHelper.get() )
|
||||
{
|
||||
- aSuperfluous.push_back( PROPERTY_CONTROLSOURCE );
|
||||
- aSuperfluous.push_back( PROPERTY_EMPTY_IS_NULL );
|
||||
- aSuperfluous.push_back( PROPERTY_FILTERPROPOSAL );
|
||||
- aSuperfluous.push_back( PROPERTY_LISTSOURCETYPE );
|
||||
- aSuperfluous.push_back( PROPERTY_LISTSOURCE );
|
||||
- aSuperfluous.push_back( PROPERTY_BOUNDCOLUMN );
|
||||
+ aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_CONTROLSOURCE) );
|
||||
+ aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_EMPTY_IS_NULL) );
|
||||
+ aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_FILTERPROPOSAL) );
|
||||
+ aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_LISTSOURCETYPE) );
|
||||
+ aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_LISTSOURCE) );
|
||||
+ aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_BOUNDCOLUMN) );
|
||||
|
||||
bool bAllowBinding = m_pHelper->canBindToAnyDataType();
|
||||
|
||||
if ( bAllowBinding )
|
||||
{
|
||||
- aSuperfluous.push_back( PROPERTY_MAXTEXTLEN );
|
||||
- aSuperfluous.push_back( PROPERTY_VALUEMIN );
|
||||
- aSuperfluous.push_back( PROPERTY_VALUEMAX );
|
||||
- aSuperfluous.push_back( PROPERTY_DECIMAL_ACCURACY );
|
||||
- aSuperfluous.push_back( PROPERTY_TIMEMIN );
|
||||
- aSuperfluous.push_back( PROPERTY_TIMEMAX );
|
||||
- aSuperfluous.push_back( PROPERTY_DATEMIN );
|
||||
- aSuperfluous.push_back( PROPERTY_DATEMAX );
|
||||
- aSuperfluous.push_back( PROPERTY_EFFECTIVE_MIN );
|
||||
- aSuperfluous.push_back( PROPERTY_EFFECTIVE_MAX );
|
||||
+ aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_MAXTEXTLEN) );
|
||||
+ aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_VALUEMIN) );
|
||||
+ aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_VALUEMAX) );
|
||||
+ aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_DECIMAL_ACCURACY) );
|
||||
+ aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_TIMEMIN) );
|
||||
+ aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_TIMEMAX) );
|
||||
+ aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_DATEMIN) );
|
||||
+ aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_DATEMAX) );
|
||||
+ aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_EFFECTIVE_MIN) );
|
||||
+ aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_EFFECTIVE_MAX) );
|
||||
}
|
||||
}
|
||||
|
||||
@@ -283,8 +283,8 @@ namespace pcr
|
||||
::std::vector< ::rtl::OUString > aInterestedInActuations( 2 );
|
||||
if ( m_pHelper.get() )
|
||||
{
|
||||
- aInterestedInActuations.push_back( PROPERTY_XSD_DATA_TYPE );
|
||||
- aInterestedInActuations.push_back( PROPERTY_XML_DATA_MODEL );
|
||||
+ aInterestedInActuations.push_back( static_cast<const rtl::OUString&>(PROPERTY_XSD_DATA_TYPE) );
|
||||
+ aInterestedInActuations.push_back( static_cast<const rtl::OUString&>(PROPERTY_XML_DATA_MODEL) );
|
||||
}
|
||||
if ( aInterestedInActuations.empty() )
|
||||
return Sequence< ::rtl::OUString >();
|
||||
Loading…
Reference in new issue