Resolves: rhbz#702635 set correct page number when exporting selected pages

f41
David Tardon 14 years ago
parent 05b58588d0
commit 98df4624ec

@ -0,0 +1,42 @@
From 6b8151cf40be1257db1c5165c5015490390cab6f Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Tue, 10 May 2011 09:55:55 +0200
Subject: [PATCH] rhbz#702635 set correct page number when exporting selected
pages
---
filter/source/pdf/pdfexport.cxx | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx
index bffd26c..5de0cbc 100644
--- a/filter/source/pdf/pdfexport.cxx
+++ b/filter/source/pdf/pdfexport.cxx
@@ -193,6 +193,7 @@ sal_Bool PDFExport::ExportSelection( vcl::PDFWriter& rPDFWriter, Reference< com:
if ( nPageCount )
{
sal_Int32 nSel = aMultiSelection.FirstSelected();
+ sal_Int32 nCurrentPage(0);
while ( nSel != sal_Int32(SFX_ENDOFSELECTION) )
{
Sequence< PropertyValue > aRenderer( rRenderable->getRenderer( nSel - 1, rSelection, rRenderOptions ) );
@@ -204,7 +205,7 @@ sal_Bool PDFExport::ExportSelection( vcl::PDFWriter& rPDFWriter, Reference< com:
aRenderer[ nProperty].Value >>= aPageSize;
}
- pPDFExtOutDevData->SetCurrentPageNumber( nSel - 1 );
+ pPDFExtOutDevData->SetCurrentPageNumber( nCurrentPage );
GDIMetaFile aMtf;
const MapMode aMapMode( MAP_100TH_MM );
@@ -242,6 +243,7 @@ sal_Bool PDFExport::ExportSelection( vcl::PDFWriter& rPDFWriter, Reference< com:
*pFirstPage <<= sal_False;
++mnProgressValue;
+ ++nCurrentPage;
}
}
else
--
1.7.5.1

@ -15,7 +15,7 @@ Summary: Free Software Productivity Suite
Name: libreoffice Name: libreoffice
Epoch: 1 Epoch: 1
Version: 3.3.99.4 Version: 3.3.99.4
Release: 2%{?dist} Release: 3%{?dist}
License: LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and (CDDL or GPLv2) and Public Domain License: LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and (CDDL or GPLv2) and Public Domain
Group: Applications/Productivity Group: Applications/Productivity
URL: http://www.documentfoundation.org/develop URL: http://www.documentfoundation.org/develop
@ -86,6 +86,7 @@ Patch11: kde4configure.patch
Patch12: 0001-Resolves-rhbz-695509-crash-in-RefreshDocumentLB.patch Patch12: 0001-Resolves-rhbz-695509-crash-in-RefreshDocumentLB.patch
Patch13: 0001-bubble-down-configure-test-findings-on-visibility.patch Patch13: 0001-bubble-down-configure-test-findings-on-visibility.patch
Patch14: vbahelper.visibility.patch Patch14: vbahelper.visibility.patch
Patch15: 0001-rhbz-702635-set-correct-page-number-when-exporting-s.patch
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
%define instdir %{_libdir} %define instdir %{_libdir}
@ -701,6 +702,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
%patch12 -p1 -b .rhbz695509-crash-in-RefreshDocumentLB.patch %patch12 -p1 -b .rhbz695509-crash-in-RefreshDocumentLB.patch
%patch13 -p1 -b .bubble-down-configure-test-findings-on-visibility.patch %patch13 -p1 -b .bubble-down-configure-test-findings-on-visibility.patch
%patch14 -p0 -b .vbahelper.visibility.patch %patch14 -p0 -b .vbahelper.visibility.patch
%patch15 -p1 -b .rhbz702635-set-correct-page-number-when-exporting-s.patch
# these are horribly incomplete--empty translations and copied english # these are horribly incomplete--empty translations and copied english
# strings with spattering of translated strings # strings with spattering of translated strings
@ -2005,6 +2007,10 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
%{basisinstdir}/program/kde-open-url %{basisinstdir}/program/kde-open-url
%changelog %changelog
* Tue May 10 2011 David Tardon <dtardon@redhat.com> - 3.3.99.4-3
- Resolves: rhbz#702635 set correct page number when exporting selected
pages
* Sat May 07 2011 Christopher Aillon <caillon@redhat.com> - 3.3.99.4-2 * Sat May 07 2011 Christopher Aillon <caillon@redhat.com> - 3.3.99.4-2
- Update icon cache scriptlet - Update icon cache scriptlet

Loading…
Cancel
Save