i18nlangtag/source/isolang/isolang.cxx | 4 ++++
sd/source/ui/view/DocumentRenderer.cxx | 5 +++--
shell/source/win32/zipfile/zipfile.cxx | 2 +-
3 files changed, 8 insertions(+), 3 deletions(-)
New commits:
commit b9e53bc16e6377d14fd973058e0277b971d967b6
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/11472
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 e7f3dd0..8860dd9 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -1097,6 +1097,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 0dc46296fc34858209b3b99a9ac0677756107b2a
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/11511
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 52aa9c5..e1e3c7d 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 ), sal_False,
sal_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 b735fe08d04e613b031b7cd560941f729d505bbe
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/11497
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))
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
