chart2/CppunitTest_chart2_xshape.mk | 1
connectivity/source/drivers/file/FPreparedStatement.cxx | 2
dictionaries | 2
filter/source/graphicfilter/ieps/ieps.cxx | 2
i18nlangtag/source/isolang/isolang.cxx | 4 +
include/com/sun/star/uno/Reference.h | 4 -
oox/source/drawingml/graphicshapecontext.cxx | 40 +++++++----
oox/source/ppt/timenode.cxx | 2
sc/qa/unit/ucalc_pivottable.cxx | 52 +++++++--------
sc/source/core/data/dpoutput.cxx | 9 ++
sd/source/filter/ppt/pptinanimations.cxx | 2
sd/source/ui/unoidl/unosrch.cxx | 2
sd/source/ui/view/DocumentRenderer.cxx | 5 -
shell/source/win32/zipfile/zipfile.cxx | 2
solenv/gbuild/UnpackedTarball.mk | 2
svtools/source/uno/treecontrolpeer.cxx | 1
writerfilter/source/dmapper/DomainMapperTableManager.cxx | 2
17 files changed, 81 insertions(+), 53 deletions(-)
New commits:
commit 4b64885379a0250dccd646cad626425873f2765a
Author: Olivier R <olivier.nore...@gmail.com>
Date: Sat Sep 20 10:39:06 2014 +0200
Updated core
Project: dictionaries 263a052f82c085b480a1518ab4e6ef0c4c566044
diff --git a/dictionaries b/dictionaries
index 3d394a9..263a052 160000
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 3d394a9aee8a882f9a002a83495104ba52c96a49
+Subproject commit 263a052f82c085b480a1518ab4e6ef0c4c566044
commit f25e416ad2461293c413f0aa5c08374fc918ed91
Author: Eike Rathke <er...@redhat.com>
Date: Tue Sep 16 13:50:27 2014 +0200
fdo#81357 no fallback for special codes without country
Thanks to Justin Luth for the hint.
Change-Id: I97bde18814368e589e2a1c275457489a0d7392d4
(cherry picked from commit 3ff2e4dc1d0ba922e06f0d5c90c85fee33623784)
Reviewed-on: https://gerrit.libreoffice.org/11471
Reviewed-by: Matúš Kukan <matus.ku...@collabora.com>
Tested-by: Matúš Kukan <matus.ku...@collabora.com>
diff --git a/i18nlangtag/source/isolang/isolang.cxx
b/i18nlangtag/source/isolang/isolang.cxx
index 141d913..e91b09e 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -1105,6 +1105,10 @@ com::sun::star::lang::Locale
MsLangId::Conversion::getLocale( const IsoLanguageS
case LANGUAGE_USER_LOJBAN:
case LANGUAGE_KASHMIRI:
case LANGUAGE_USER_KEYID:
+ // And the special codes without country.
+ case LANGUAGE_MULTIPLE:
+ case LANGUAGE_UNDETERMINED:
+ case LANGUAGE_NONE:
return getLocale( pEntry); // may override
default:
; // nothing
commit 0c65e3460fc15ab368c30608da464ac8dcd9ee00
Author: Zolnai Tamás <tamas.zol...@collabora.com>
Date: Thu Aug 7 13:09:20 2014 +0200
Fix tarball.rebuild on windows
Change-Id: I0a649548088428bd1a1fcedab76325fffa6b72a0
(cherry picked from commit 91bfacea9058b0a00feb58879c14666d31089c21)
Reviewed-on: https://gerrit.libreoffice.org/11475
Reviewed-by: Matúš Kukan <matus.ku...@collabora.com>
Tested-by: Matúš Kukan <matus.ku...@collabora.com>
diff --git a/solenv/gbuild/UnpackedTarball.mk b/solenv/gbuild/UnpackedTarball.mk
index 6021acb..a91ce57 100644
--- a/solenv/gbuild/UnpackedTarball.mk
+++ b/solenv/gbuild/UnpackedTarball.mk
@@ -412,7 +412,7 @@ endef
%.rebuild :
if [ -f $(call gb_UnpackedTarball_get_target,$*) ] ; then \
touch $(call gb_UnpackedTarball_get_target,$*) ; \
- make ;\
+ $(MAKE) ;\
fi
%.genpatch :
commit 485ea37bc98e276b7f7286799704fae4adafaca8
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Sep 18 11:40:26 2014 +0100
IsDraw doesn't mean the app/page is Draw
it means a slide in impress.
commit 7b31e45ec7106d2cfbdbb7915d97667ba710f81c
Date: Mon Jun 23 20:55:21 2014 +0100
Make Draw use paper size when printing - fdo#63905
Previously, Draw/Impress use the default size from the printer.
Now Draw uses the paper size (specified in page formatting).
Impress still uses the old method - not sure if this is correct
but printing handouts etc probably complicate print/paper size.
suggests the intent is for this to not affect Impress and to only
affect Draw, so this does that
(cherry picked from commit f1f89f0202232635e7fbbd7ca47de51755b2bce0)
Conflicts:
sd/source/ui/view/DocumentRenderer.cxx
Change-Id: I481a824ef244fd837992c893f6de0c051af0a26b
Reviewed-on: https://gerrit.libreoffice.org/11510
Reviewed-by: Matúš Kukan <matus.ku...@collabora.com>
Tested-by: Matúš Kukan <matus.ku...@collabora.com>
diff --git a/sd/source/ui/view/DocumentRenderer.cxx
b/sd/source/ui/view/DocumentRenderer.cxx
index 7080e9d..b843f2e 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -1409,6 +1409,7 @@ private:
PrintInfo& rInfo)
{
SdDrawDocument* pDocument = mrBase.GetMainViewShell()->GetDoc();
+ bool bIsDraw = pDocument->GetDocumentType() == DOCUMENT_TYPE_DRAW;
rInfo.meOrientation = ORIENTATION_PORTRAIT;
if( ! mpOptions->IsBooklet())
@@ -1420,7 +1421,7 @@ private:
// Draw should abide by specified paper size
Size aPaperSize;
- if (mpOptions->IsDraw())
+ if (bIsDraw)
{
aPaperSize.setWidth(rInfo.maPageSize.Width());
aPaperSize.setHeight(rInfo.maPageSize.Height());
@@ -1497,7 +1498,7 @@ private:
aInfo.msTimeDate +=
GetSdrGlobalData().GetLocaleData()->getTime( Time( Time::SYSTEM ), false, false
);
// Draw should use specified paper size when printing
- if (mpOptions->IsDraw())
+ if (mrBase.GetDocShell()->GetDocumentType() == DOCUMENT_TYPE_DRAW)
{
aInfo.maPrintSize = mrBase.GetDocument()->GetSdPage(0,
PK_STANDARD)->GetSize();
maPrintSize = awt::Size(aInfo.maPrintSize.Width(),
commit 1afbf688bc73640110d14253a3a3df02f9919456
Author: Andras Timar <andras.ti...@collabora.com>
Date: Thu Sep 18 00:46:16 2014 +0200
bnc#887307 ODF files not showing up on Windows search
Under Windows 7, ODF and OpenOffice.org 1.1 files were not found,
when the folder containing them was not indexed, and full text
search was switched on. The problem did not occur under Windows 8.
Apparently there is a bug in Windows 7, reading beyond the end of a
BufferStream resulted in 0 bytes read. So we take care not to read
beyond the end of stream.
Change-Id: Id01b08922121dabbb7b49c54f8ef11cb0e4ac413
(cherry picked from commit ae4c836b49a8ac41312f855e24f20b0b050fcbd4)
Reviewed-on: https://gerrit.libreoffice.org/11498
Reviewed-by: Michael Meeks <michael.me...@collabora.com>
Tested-by: Michael Meeks <michael.me...@collabora.com>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/shell/source/win32/zipfile/zipfile.cxx
b/shell/source/win32/zipfile/zipfile.cxx
index 270fbe1..5dcc02a 100644
--- a/shell/source/win32/zipfile/zipfile.cxx
+++ b/shell/source/win32/zipfile/zipfile.cxx
@@ -304,7 +304,7 @@ static bool findCentralDirectoryEnd(StreamInterface *stream)
try
{
- for (long nOffset = nLength - BLOCK_SIZE;
+ for (long nOffset = nLength - BLOCK_SIZE - 4;
nOffset > 0; nOffset -= BLOCK_SIZE)
{
if (findSignatureAtOffset(stream, nOffset))
commit bd14225bbfc7eee330fe6d39c46a797f9a9a1651
Author: Kohei Yoshida <kohei.yosh...@collabora.com>
Date: Wed Sep 17 11:24:56 2014 -0400
bnc#592918: Display data description in pivot table.
When there are no column fields and exactly one data field.
Change-Id: I10d2af7e626f98a4d8a981e078e99e7da9207d1c
(cherry picked from commit 902564bfe52e7699cefc80b3334c2eb0a8cacdcf)
Reviewed-on: https://gerrit.libreoffice.org/11491
Reviewed-by: Eike Rathke <er...@redhat.com>
Tested-by: Eike Rathke <er...@redhat.com>
diff --git a/sc/qa/unit/ucalc_pivottable.cxx b/sc/qa/unit/ucalc_pivottable.cxx
index 5f742a1..2dd42b4 100644
--- a/sc/qa/unit/ucalc_pivottable.cxx
+++ b/sc/qa/unit/ucalc_pivottable.cxx
@@ -1076,7 +1076,7 @@ void Test::testPivotTableNormalGrouping()
{
// Expected output table content. 0 = empty cell
const char* aOutputCheck[][2] = {
- { "Name", 0 },
+ { "Name", "Sum - Value" },
{ "A", "1" },
{ "B", "2" },
{ "C", "3" },
@@ -1124,7 +1124,7 @@ void Test::testPivotTableNormalGrouping()
{
// Expected output table content. 0 = empty cell
const char* aOutputCheck[][3] = {
- { "Name2", "Name", 0 },
+ { "Name2", "Name", "Sum - Value" },
{ "D", "D", "4" },
{ "E", "E", "5" },
{ "F", "F", "6" },
@@ -1161,7 +1161,7 @@ void Test::testPivotTableNormalGrouping()
{
// Expected output table content. 0 = empty cell
const char* aOutputCheck[][3] = {
- { "Name2", "Name", 0 },
+ { "Name2", "Name", "Sum - Value" },
{ "G", "G", "7" },
{ "Group1", "A", "1" },
{ 0, "B", "2" },
@@ -1258,7 +1258,7 @@ void Test::testPivotTableNumberGrouping()
{
// Expected output table content. 0 = empty cell
const char* aOutputCheck[][2] = {
- { "Order", 0 },
+ { "Order", "Sum - Score" },
{ "<30", "423" },
{ "30-39", "87" },
{ "40-49", "241" },
@@ -1373,7 +1373,7 @@ void Test::testPivotTableDateGrouping()
{
// Expected output table content. 0 = empty cell
const char* aOutputCheck[][4] = {
- { "Years", "Quarters", "Date", 0 },
+ { "Years", "Quarters", "Date", "Sum - Value" },
{ "2011", "Q1", "Jan", "1" },
{ 0, 0, "Mar", "2" },
{ 0, "Q3", "Sep", "7" },
@@ -1405,7 +1405,7 @@ void Test::testPivotTableDateGrouping()
{
// Expected output table content. 0 = empty cell
const char* aOutputCheck[][4] = {
- { "Years", "Quarters", "Date", 0 },
+ { "Years", "Quarters", "Date", "Sum - Value" },
{ "2011", "Q1", "Jan", "1" },
{ 0, 0, "Mar", "2" },
{ 0, "Q3", "Sep", "7" },
@@ -1429,7 +1429,7 @@ void Test::testPivotTableDateGrouping()
{
// Expected output table content. 0 = empty cell
const char* aOutputCheck[][2] = {
- { "Date", 0 },
+ { "Date", "Sum - Value" },
{ "2011-01-01", "1" },
{ "2011-03-02", "2" },
{ "2011-09-03", "7" },
@@ -1497,7 +1497,7 @@ void Test::testPivotTableEmptyRows()
{
// Expected output table content. 0 = empty cell
const char* aOutputCheck[][2] = {
- { "Name", 0 },
+ { "Name", "Sum - Value" },
{ "A", "1" },
{ "B", "2" },
{ "C", "3" },
@@ -1520,7 +1520,7 @@ void Test::testPivotTableEmptyRows()
{
// Expected output table content. 0 = empty cell
const char* aOutputCheck[][2] = {
- { "Name", 0 },
+ { "Name", "Sum - Value" },
{ "A", "1" },
{ "B", "2" },
{ "C", "3" },
@@ -1547,7 +1547,7 @@ void Test::testPivotTableEmptyRows()
{
// Expected output table content. 0 = empty cell
const char* aOutputCheck[][2] = {
- { "Name", 0 },
+ { "Name", "Sum - Value" },
{ "B", "3" },
{ "C", "3" },
{ "D", "4" },
@@ -1625,7 +1625,7 @@ void Test::testPivotTableTextNumber()
{
// Expected output table content. 0 = empty cell
const char* aOutputCheck[][2] = {
- { "Name", 0 },
+ { "Name", "Sum - Value" },
{ "0001", "1" },
{ "0002", "2" },
{ "0003", "3" },
@@ -1709,7 +1709,7 @@ void Test::testPivotTableCaseInsensitiveStrings()
{
// Expected output table content. 0 = empty cell
const char* aOutputCheck[][2] = {
- { "Name", 0 },
+ { "Name", "Sum - Value" },
{ "A", "3" },
{ "Total Result", "3" },
};
@@ -1872,7 +1872,7 @@ void Test::testPivotTableFieldReference()
{
// Expected output table content. 0 = empty cell
const char* aOutputCheck[][2] = {
- { "Name", 0 },
+ { "Name", "Sum - Value" },
{ "A", "1" },
{ "B", "2" },
{ "C", "4" },
@@ -1899,7 +1899,7 @@ void Test::testPivotTableFieldReference()
{
// Expected output table content. 0 = empty cell
const char* aOutputCheck[][2] = {
- { "Name", 0 },
+ { "Name", "Sum - Value" },
{ "A", 0 },
{ "B", "1" },
{ "C", "3" },
@@ -1919,7 +1919,7 @@ void Test::testPivotTableFieldReference()
{
// Expected output table content. 0 = empty cell
const char* aOutputCheck[][2] = {
- { "Name", 0 },
+ { "Name", "Sum - Value" },
{ "A", "100.00%" },
{ "B", "200.00%" },
{ "C", "400.00%" },
@@ -1939,7 +1939,7 @@ void Test::testPivotTableFieldReference()
{
// Expected output table content. 0 = empty cell
const char* aOutputCheck[][2] = {
- { "Name", 0 },
+ { "Name", "Sum - Value" },
{ "A", 0 },
{ "B", "100.00%" },
{ "C", "300.00%" },
@@ -1959,7 +1959,7 @@ void Test::testPivotTableFieldReference()
{
// Expected output table content. 0 = empty cell
const char* aOutputCheck[][2] = {
- { "Name", 0 },
+ { "Name", "Sum - Value" },
{ "A", "1" },
{ "B", "3" },
{ "C", "7" },
@@ -1979,7 +1979,7 @@ void Test::testPivotTableFieldReference()
{
// Expected output table content. 0 = empty cell
const char* aOutputCheck[][2] = {
- { "Name", 0 },
+ { "Name", "Sum - Value" },
{ "A", "6.67%" },
{ "B", "13.33%" },
{ "C", "26.67%" },
@@ -2044,7 +2044,7 @@ void Test::testPivotTableDocFunc()
{
// Expected output table content. 0 = empty cell
const char* aOutputCheck[][2] = {
- { "Name", 0 },
+ { "Name", "Sum - Value" },
{ "Apple", "16" },
{ "Microsoft", "32" },
{ "Oracle", "2" },
@@ -2113,7 +2113,7 @@ void Test::testFuncGETPIVOTDATA()
{
// Expected output table content. 0 = empty cell
const char* aOutputCheck[][2] = {
- { "Name", 0 },
+ { "Name", "Sum - Value" },
{ "A", "6" },
{ "B", "15" },
{ "Total Result", "21" },
@@ -2271,12 +2271,12 @@ void Test::testFuncGETPIVOTDATALeafAccess()
{
// Expected output table content. 0 = empty cell
const char* aOutputCheck[][3] = {
- { "Type", "Member", 0 },
- { "A", "Anna", "1" },
- { 0, "Cecilia", "3" },
- { "B", "Brittany", "2" },
- { 0, "Donna", "4" },
- { "Total Result", 0, "10" },
+ { "Type", "Member", "Sum - Value" },
+ { "A", "Anna", "1" },
+ { 0, "Cecilia", "3" },
+ { "B", "Brittany", "2" },
+ { 0, "Donna", "4" },
+ { "Total Result", 0, "10" },
};
bSuccess = checkDPTableOutput<3>(m_pDoc, aOutRange, aOutputCheck,
"Pivot table refreshed");
diff --git a/sc/source/core/data/dpoutput.cxx b/sc/source/core/data/dpoutput.cxx
index 21e958f..1185319 100644
--- a/sc/source/core/data/dpoutput.cxx
+++ b/sc/source/core/data/dpoutput.cxx
@@ -1130,6 +1130,15 @@ void ScDPOutput::Output()
}
}
+ if (nColCount == 1 && nRowCount > 0 && nColFieldCount == 0)
+ {
+ // the table contains excatly one data field and no column fields.
+ // Display data description at top right corner.
+ ScSetStringParam aParam;
+ aParam.setTextInput();
+ pDoc->SetString(nDataStartCol, nDataStartRow-1, nTab,
aDataDescription, &aParam);
+ }
+
// output data results:
for (long nRow=0; nRow<nRowCount; nRow++)
commit dff26a5d23b274d722e20271edb9e3bf97e9e6a7
Author: Björgvin Ragnarsson <nifgr...@gmail.com>
Date: Thu Sep 4 00:43:04 2014 +0300
fdo#81592 Use 24-bit color depth, not 256 colors when converting an
EPS-file.
This regression was introduced in f5c3f5601a3739dead635f9abc446951b385018f.
Change-Id: Ica48732398cd5d225b433b177ff6e6fff649e732
(cherry picked from commit 0791335cf007e04de25e03c0a6e0aa53fa66016a)
Reviewed-on: https://gerrit.libreoffice.org/11465
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
Tested-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/filter/source/graphicfilter/ieps/ieps.cxx
b/filter/source/graphicfilter/ieps/ieps.cxx
index c361bc2c..945ae5d 100644
--- a/filter/source/graphicfilter/ieps/ieps.cxx
+++ b/filter/source/graphicfilter/ieps/ieps.cxx
@@ -347,7 +347,7 @@ static bool RenderAsBMPThroughGS(const sal_uInt8* pBuf,
sal_uInt32 nBytesRead,
OUString arg6("-dTextAlphaBits=4");
OUString arg7("-dGraphicsAlphaBits=4");
OUString arg8("-r300x300");
- OUString arg9("-sDEVICE=bmp256");
+ OUString arg9("-sDEVICE=bmp16m");
OUString arg10("-sOutputFile=-");
OUString arg11("-");
rtl_uString *args[] =
commit 124194c74ef025a1b1ef9aba98de19486e2f0b92
Author: Matúš Kukan <matus.ku...@collabora.com>
Date: Fri Sep 12 16:08:34 2014 +0200
bnc#591147: OOXML import: Import video file too.
Change-Id: Ie9b6c5ff866269e5d7a26d025cb1c0d884ff1134
(cherry picked from commit b7006f3c2f8f71f4d4721c6e5cdc122628c756f0)
Reviewed-on: https://gerrit.libreoffice.org/11469
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
Tested-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/oox/source/drawingml/graphicshapecontext.cxx
b/oox/source/drawingml/graphicshapecontext.cxx
index db04d5c..4b7905e 100644
--- a/oox/source/drawingml/graphicshapecontext.cxx
+++ b/oox/source/drawingml/graphicshapecontext.cxx
@@ -47,6 +47,22 @@ using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::xml::sax;
using namespace ::oox::core;
+static OUString lcl_CopyToTempFile(const OUString& rStream, const
oox::core::XmlFilterBase& rFilter)
+{
+ if (rStream.isEmpty())
+ return OUString();
+
+ Reference< XInputStream > xInStrm( rFilter.openInputStream(rStream),
UNO_SET_THROW );
+ Reference< XTempFile > xTempFile(
TempFile::create(rFilter.getComponentContext()) );
+ Reference< XOutputStream > xOutStrm( xTempFile->getOutputStream(),
UNO_SET_THROW );
+ oox::BinaryXOutputStream aOutStrm( xOutStrm, false );
+ oox::BinaryXInputStream aInStrm( xInStrm, false );
+ aInStrm.copyToStream( aOutStrm );
+
+ xTempFile->setRemoveFile( false );
+ return xTempFile->getUri();
+}
+
namespace oox {
namespace drawingml {
@@ -70,19 +86,17 @@ ContextHandlerRef GraphicShapeContext::onCreateContext(
sal_Int32 aElementToken,
case XML_wavAudioFile:
{
getEmbeddedWAVAudioFile( getRelations(),
rAttribs.getFastAttributeList(), mpShapePtr->getGraphicProperties().maAudio );
- if( !mpShapePtr->getGraphicProperties().maAudio.msEmbed.isEmpty() )
- {
- Reference< XComponentContext > xContext =
comphelper::getProcessComponentContext();
- Reference< XInputStream > xInStrm(
getFilter().openInputStream( mpShapePtr->getGraphicProperties().maAudio.msEmbed
), UNO_SET_THROW );
- Reference< XTempFile > xTempFile( TempFile::create(xContext) );
- Reference< XOutputStream > xOutStrm(
xTempFile->getOutputStream(), UNO_SET_THROW );
- BinaryXOutputStream aOutStrm( xOutStrm, false );
- BinaryXInputStream aInStrm( xInStrm, false );
- aInStrm.copyToStream( aOutStrm );
-
- xTempFile->setRemoveFile( false );
- mpShapePtr->getGraphicProperties().maAudio.msEmbed =
xTempFile->getUri();
- }
+ mpShapePtr->getGraphicProperties().maAudio.msEmbed =
+ lcl_CopyToTempFile(
mpShapePtr->getGraphicProperties().maAudio.msEmbed, getFilter() );
+ }
+ break;
+ case XML_audioFile:
+ case XML_videoFile:
+ {
+ OUString rPath = getRelations().getFragmentPathFromRelId(
+ rAttribs.getString(R_TOKEN(link)).get() );
+ mpShapePtr->getGraphicProperties().maAudio.msEmbed =
+ lcl_CopyToTempFile( rPath, getFilter() );
}
break;
}
commit 9688231e6be24de39750307bb779641057f7507a
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Mon Jun 16 10:22:31 2014 +0200
SAL_WARN_UNUSED_RESULT for static Reference::query function
...which the recent loplugin:staticcall changes showed was occasionally used
apparently under the assumption that it was non-static and changed the
object
it was called on.
(cherry picked from commit 7242fe6e3360843f9ef5ce07b447de729323a3c8)
Conflicts:
include/com/sun/star/uno/Reference.h
svtools/source/uno/treecontrolpeer.cxx
Change-Id: I989a2a4ed3886d7f370855c9e8c1867e646c059b
diff --git a/include/com/sun/star/uno/Reference.h
b/include/com/sun/star/uno/Reference.h
index b1299fd..636a339 100644
--- a/include/com/sun/star/uno/Reference.h
+++ b/include/com/sun/star/uno/Reference.h
@@ -546,13 +546,13 @@ public:
@param rRef interface reference
@return interface reference of demanded type (may be null)
*/
- inline static Reference< interface_type > SAL_CALL query( const
BaseReference & rRef ) SAL_THROW( (RuntimeException) );
+ inline static SAL_WARN_UNUSED_RESULT Reference< interface_type > SAL_CALL
query( const BaseReference & rRef ) SAL_THROW( (RuntimeException) );
/** Queries given interface for type interface_type.
@param pInterface interface pointer
@return interface reference of demanded type (may be null)
*/
- inline static Reference< interface_type > SAL_CALL query( XInterface *
pInterface ) SAL_THROW( (RuntimeException) );
+ inline static SAL_WARN_UNUSED_RESULT Reference< interface_type > SAL_CALL
query( XInterface * pInterface ) SAL_THROW( (RuntimeException) );
};
/// @cond INTERNAL
diff --git a/svtools/source/uno/treecontrolpeer.cxx
b/svtools/source/uno/treecontrolpeer.cxx
index 1dc40e8..b4cbb4d 100644
--- a/svtools/source/uno/treecontrolpeer.cxx
+++ b/svtools/source/uno/treecontrolpeer.cxx
@@ -1450,7 +1450,6 @@ bool TreeControlPeer::loadImage( const OUString& rURL,
Image& rImage )
{
Reference< XComponentContext > xContext(
::comphelper::getProcessComponentContext() );
Reference< XInterface > x( graphic::GraphicProvider::create(xContext)
);
- mxGraphicProvider.query( x );
mxGraphicProvider = Reference< XGraphicProvider >( x, UNO_QUERY );
}
commit e0dd5d238cbe59800502cf76981cff0cfdb59a4e
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Wed Sep 17 09:06:40 2014 +0200
css::uno::Reference::query does not have side effects
partial cherry-pick of c6eb208473109234886600ac299f0cc75ee94e9c
"loplugin:staticcall"
Change-Id: Icb2ee78db94ba3a87a5c8ff35d72d191f01d4900
diff --git a/sd/source/filter/ppt/pptinanimations.cxx
b/sd/source/filter/ppt/pptinanimations.cxx
index be60d65..813d04f 100644
--- a/sd/source/filter/ppt/pptinanimations.cxx
+++ b/sd/source/filter/ppt/pptinanimations.cxx
@@ -597,7 +597,7 @@ void AnimationImporter::fixMainSequenceTiming( const
::com::sun::star::uno::Refe
// with node
xE2->nextElement() >>= xEA2;
if( xEA2.is() )
- xE2.query( xEA2->createEnumeration() );
+ xE2.set(xEA2->createEnumeration(),
css::uno::UNO_QUERY);
else
xE2.clear();
diff --git a/sd/source/ui/unoidl/unosrch.cxx b/sd/source/ui/unoidl/unosrch.cxx
index 65804c2..587a600 100644
--- a/sd/source/ui/unoidl/unosrch.cxx
+++ b/sd/source/ui/unoidl/unosrch.cxx
@@ -498,7 +498,7 @@ uno::Reference< text::XTextRange >
SdUnoSearchReplaceShape::Search( uno::Refere
{
uno::Reference< text::XTextContent > xParagraph(
xParaEnum->nextElement(), uno::UNO_QUERY );
if( xParagraph.is() )
- xEnumAccess.query( xParagraph );
+ xEnumAccess.set(xParagraph, css::uno::UNO_QUERY);
else
xEnumAccess.clear();
commit 05ad5e2c0cc5b0181f869a4dc42ca280aab7131a
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Jun 13 17:50:50 2014 +0200
loplugin:staticcall
Change-Id: I1d428ccd434b7b6f61461ea29447291759c3a7bf
(cherry picked from commit 732e7bdfa2d0e7b0296599517f53d194c02acfee)
diff --git a/oox/source/ppt/timenode.cxx b/oox/source/ppt/timenode.cxx
index ff31be2..0070367 100644
--- a/oox/source/ppt/timenode.cxx
+++ b/oox/source/ppt/timenode.cxx
@@ -138,7 +138,7 @@ namespace oox { namespace ppt {
// with node
xE2->nextElement() >>= xEA2;
if( xEA2.is() )
- xE2.query( xEA2->createEnumeration() );
+ xE2.set(xEA2->createEnumeration(),
css::uno::UNO_QUERY);
else
xE2.clear();
commit b0519f90310b855183980fbe9676371ac104590d
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Jun 27 15:08:54 2014 +0200
Missing include dir
Change-Id: Id1d1ed3639548b335dff2d9fa5689b90f1ae5f61
(cherry picked from commit af70a45633b34eaae4eb4577b763dadfc48c74b6)
diff --git a/chart2/CppunitTest_chart2_xshape.mk
b/chart2/CppunitTest_chart2_xshape.mk
index 12d0952..6149353a 100644
--- a/chart2/CppunitTest_chart2_xshape.mk
+++ b/chart2/CppunitTest_chart2_xshape.mk
@@ -60,6 +60,7 @@ $(eval $(call gb_CppunitTest_use_libraries,chart2_xshape, \
$(eval $(call gb_CppunitTest_set_include,chart2_xshape,\
-I$(SRCDIR)/chart2/qa/extras \
+ -I$(SRCDIR)/chart2/inc \
$$(INCLUDE) \
))
commit b78a9e0fd6c062474c1581057d2941f028882a69
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Sep 15 16:53:43 2014 +0100
Resolves: fdo#66496 don't crash on loading specific .docx
Change-Id: I4db5dfeb0ce1494039a051f552ce3f69b2b5dae3
(cherry picked from commit 48a679cbc5775a7a033dfe494c2a0a513aba9b1f)
Reviewed-on: https://gerrit.libreoffice.org/11459
Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk>
Tested-by: Miklos Vajna <vmik...@collabora.co.uk>
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index 121ea21..22c7a62 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -515,7 +515,7 @@ void DomainMapperTableManager::endLevel( )
oCurrentWidth.reset(m_aCellWidths.back()->back());
m_aCellWidths.pop_back( );
// And push it back to the right level.
- if (oCurrentWidth)
+ if (oCurrentWidth && !m_aCellWidths.empty() &&
!m_aCellWidths.back()->empty())
m_aCellWidths.back()->push_back(*oCurrentWidth);
m_nCell.pop_back( );
commit 63efdb8875f8ca62c0403a28b57c80de71a24b8e
Author: Michael Stahl <mst...@redhat.com>
Date: Fri Sep 12 17:59:49 2014 +0200
STL assert in
connectivity::file::OPreparedStatement::checkAndResizeParameters
Change-Id: I48f4ceaf1d01d449eba169534f6512f9aadca886
(cherry picked from commit 7ce8ba33f38671d7cae8b0e759c38b4a8668488a)
Reviewed-on: https://gerrit.libreoffice.org/11424
Reviewed-by: Lionel Elie Mamane <lio...@mamane.lu>
Tested-by: Lionel Elie Mamane <lio...@mamane.lu>
diff --git a/connectivity/source/drivers/file/FPreparedStatement.cxx
b/connectivity/source/drivers/file/FPreparedStatement.cxx
index 81ac7a9..be91ac3 100644
--- a/connectivity/source/drivers/file/FPreparedStatement.cxx
+++ b/connectivity/source/drivers/file/FPreparedStatement.cxx
@@ -412,7 +412,7 @@ void OPreparedStatement::checkAndResizeParameters(sal_Int32
parameterIndex)
{
sal_Int32 i = m_aParameterRow->get().size();
(m_aParameterRow->get()).resize(parameterIndex+1);
- for ( ;i <= parameterIndex+1; ++i )
+ for ( ; i <= parameterIndex; ++i)
{
if ( !(m_aParameterRow->get())[i].is() )
(m_aParameterRow->get())[i] = new ORowSetValueDecorator;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
