[Libreoffice-commits] core.git: filter/source sc/source
filter/source/pdf/pdfexport.cxx |6 + sc/source/ui/unoobj/docuno.cxx | 131 ++-- 2 files changed, 131 insertions(+), 6 deletions(-) New commits: commit c11d96f0b521ee7df77576963b60178d2c40431b Author: Muhammet Kara AuthorDate: Mon Sep 30 20:39:39 2019 +0300 Commit: Muhammet Kara CommitDate: Fri Oct 11 10:13:22 2019 +0200 Handle SinglePageSheets option for pdf export When the single page sheets option is selected on the pdf export dialog of Calc, a pdf for general preview of the document is created, which is not meant for printing. Each sheet is exported as a single page, thus causing the resulting pdf to have pages with different sizes. This is a follow-up to commit 079cd016408d54d91 Change-Id: I038761f06bbf4b0425df89bcda4ee111a61be1d5 Reviewed-on: https://gerrit.libreoffice.org/79895 Tested-by: Jenkins CollaboraOffice Reviewed-by: Muhammet Kara Reviewed-on: https://gerrit.libreoffice.org/80635 Tested-by: Jenkins diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx index b0a91ace6e4f..2cf302bda668 100644 --- a/filter/source/pdf/pdfexport.cxx +++ b/filter/source/pdf/pdfexport.cxx @@ -860,7 +860,7 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >& pPDFExtOutDevData->SetIsReduceImageResolution( mbReduceImageResolution ); pPDFExtOutDevData->SetIsExportNamedDestinations( mbExportBmkToDest ); -Sequence< PropertyValue > aRenderOptions( 7 ); +Sequence< PropertyValue > aRenderOptions( 8 ); aRenderOptions[ 0 ].Name = "RenderDevice"; aRenderOptions[ 0 ].Value <<= uno::Reference(xDevice.get()); aRenderOptions[ 1 ].Name = "ExportNotesPages"; @@ -876,6 +876,8 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >& aRenderOptions[ 5 ].Value <<= aPageRange; aRenderOptions[ 6 ].Name = "ExportPlaceholders"; aRenderOptions[ 6 ].Value <<= mbExportPlaceholders; +aRenderOptions[ 7 ].Name = "SinglePageSheets"; +aRenderOptions[ 7 ].Value <<= mbSinglePageSheets; if( !aPageRange.isEmpty() || !aSelection.hasValue() ) { @@ -925,7 +927,7 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >& } const bool bExportPages = !bExportNotesPages || !mbExportOnlyNotesPages; -if( aPageRange.isEmpty() ) +if( aPageRange.isEmpty() || mbSinglePageSheets) { aPageRange = OUString::number( 1 ) + "-" + OUString::number(nPageCount ); } diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index 58fdad8890f2..e312f9e59ea5 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -1594,13 +1594,22 @@ sal_Int32 SAL_CALL ScModelObj::getRendererCount(const uno::Any& aSelection, maValidPages.clear(); sal_Int32 nContent = 0; +bool bSinglePageSheets = false; for ( const auto& rValue : rOptions) { if ( rValue.Name == "PrintRange" ) { rValue.Value >>= nContent; -break; } +else if ( rValue.Name == "SinglePageSheets" ) +{ +rValue.Value >>= bSinglePageSheets; +} +} + +if (bSinglePageSheets) +{ +return pDocShell->GetDocument().GetTableCount(); } bool bIsPrintEvenPages = nContent != 3; @@ -1660,6 +1669,7 @@ uno::Sequence SAL_CALL ScModelObj::getRenderer( sal_Int32 // #i115266# if FillRenderMarkData fails, keep nTotalPages at 0, but still handle getRenderer(0) below long nTotalPages = 0; bool bRenderToGraphic = false; +bool bSinglePageSheets = false; if ( FillRenderMarkData( aSelection, rOptions, aMark, aStatus, aPagesStr, bRenderToGraphic ) ) { if ( !pPrintFuncCache || !pPrintFuncCache->IsSameSelection( aStatus ) ) @@ -1668,7 +1678,21 @@ uno::Sequence SAL_CALL ScModelObj::getRenderer( sal_Int32 } nTotalPages = pPrintFuncCache->GetPageCount(); } + +for ( const auto& rValue : rOptions) +{ +if ( rValue.Name == "SinglePageSheets" ) +{ +rValue.Value >>= bSinglePageSheets; +break; +} +} + +if (bSinglePageSheets) +nTotalPages = pDocShell->GetDocument().GetTableCount(); + sal_Int32 nRenderer = lcl_GetRendererNum( nSelRenderer, aPagesStr, nTotalPages ); + if ( nRenderer < 0 ) { if ( nSelRenderer != 0 ) @@ -1713,7 +1737,9 @@ uno::Sequence SAL_CALL ScModelObj::getRenderer( sal_Int32 // printer is used as device (just for page layout), draw view is not needed SCTAB nTab; -if ( !maValidPages.empty() ) +
[Libreoffice-commits] core.git: filter/source sc/source sw/source
filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl |2 +- filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl |2 +- sc/source/ui/unoobj/chart2uno.cxx |2 +- sw/source/core/inc/anchoredobjectposition.hxx |2 +- sw/source/core/inc/flowfrm.hxx |4 ++-- sw/source/core/layout/flowfrm.cxx |2 +- sw/source/core/layout/laycache.cxx |2 +- sw/source/core/layout/trvlfrm.cxx |4 ++-- sw/source/core/objectpositioning/anchoredobjectposition.cxx |2 +- 9 files changed, 11 insertions(+), 11 deletions(-) New commits: commit f08828f26b19c486f074182833e2e674b681745c Author: Andrea GelminiDate: Wed Jan 24 18:31:43 2018 +0100 Fix typos Change-Id: I18d224557173b9ae5f20399b05132f45f08022a4 Reviewed-on: https://gerrit.libreoffice.org/48544 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl b/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl index 87c8744d2a0e..be331280ed72 100644 --- a/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl +++ b/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl @@ -807,7 +807,7 @@ padding : - + diff --git a/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl b/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl index 791a2bcd391b..da123b1e5146 100644 --- a/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl +++ b/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl @@ -94,7 +94,7 @@ : - + diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx index d5dce02cd4f7..96f527efca71 100644 --- a/sc/source/ui/unoobj/chart2uno.cxx +++ b/sc/source/ui/unoobj/chart2uno.cxx @@ -3113,7 +3113,7 @@ uno::Sequence< OUString > SAL_CALL ScChart2DataSequence::generateLabel(chart2::d SCCOL nCols = func.getCols(); SCROW nRows = func.getRows(); -// Detemine whether this is column-major or row-major. +// Determine whether this is column-major or row-major. bool bColumn = true; if ((eOrigin == chart2::data::LabelOrigin_SHORT_SIDE) || (eOrigin == chart2::data::LabelOrigin_LONG_SIDE)) diff --git a/sw/source/core/inc/anchoredobjectposition.hxx b/sw/source/core/inc/anchoredobjectposition.hxx index 382cb5a57591..74705465d54a 100644 --- a/sw/source/core/inc/anchoredobjectposition.hxx +++ b/sw/source/core/inc/anchoredobjectposition.hxx @@ -374,7 +374,7 @@ namespace objectpositioning const bool _bEvenPage ) const; -/** detemine, if object has to draw aside given fly frame +/** determine, if object has to draw aside given fly frame method used by diff --git a/sw/source/core/inc/flowfrm.hxx b/sw/source/core/inc/flowfrm.hxx index e2963d859336..818f0fb4f597 100644 --- a/sw/source/core/inc/flowfrm.hxx +++ b/sw/source/core/inc/flowfrm.hxx @@ -96,14 +96,14 @@ class SwFlowFrame */ const SwFrame* GetPrevFrameForUpperSpaceCalc_( const SwFrame* _pProposedPrevFrame = nullptr ) const; -/** method to detemine the upper space amount, which is considered for +/** method to determine the upper space amount, which is considered for the previous frame #i11860# */ SwTwips GetUpperSpaceAmountConsideredForPrevFrame() const; -/** method to detemine the upper space amount, which is considered for +/** method to determine the upper space amount, which is considered for the page grid #i11860# diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx index 30d92bb3fae4..75a064fa6e55 100644 --- a/sw/source/core/layout/flowfrm.cxx +++ b/sw/source/core/layout/flowfrm.cxx @@ -1529,7 +1529,7 @@ SwTwips SwFlowFrame::CalcUpperSpace( const SwBorderAttrs *pAttrs, return nUpper; } -/** method to detemine the upper space amount, which is considered for +/** method to determine the upper space amount, which is considered for the page grid OD 2004-03-12 #i11860# diff --git a/sw/source/core/layout/laycache.cxx b/sw/source/core/layout/laycache.cxx index e7ee8d1f21a0..ec13fdc99ea9 100644 --- a/sw/source/core/layout/laycache.cxx +++ b/sw/source/core/layout/laycache.cxx @@ -504,7 +504,7 @@ bool
[Libreoffice-commits] core.git: filter/source sc/source
filter/source/graphicfilter/itiff/ccidecom.cxx |2 +- filter/source/graphicfilter/itiff/itiff.cxx|4 ++-- filter/source/msfilter/msdffimp.cxx|4 ++-- sc/source/filter/lotus/lotread.cxx |4 ++-- sc/source/filter/qpro/qpro.cxx |2 +- 5 files changed, 8 insertions(+), 8 deletions(-) New commits: commit 129852d379fa03c36886b5f48d6a10e530a9c3de Author: Caolán McNamaraDate: Wed Nov 22 10:27:36 2017 + turn some eof checks to eof or error Change-Id: I4592d7aa86c2cc2f420bccc622ffb95aa5cefa17 Reviewed-on: https://gerrit.libreoffice.org/45077 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/filter/source/graphicfilter/itiff/ccidecom.cxx b/filter/source/graphicfilter/itiff/ccidecom.cxx index 815a75e5deba..9d638c0260c3 100644 --- a/filter/source/graphicfilter/itiff/ccidecom.cxx +++ b/filter/source/graphicfilter/itiff/ccidecom.cxx @@ -769,7 +769,7 @@ bool CCIDecompressor::ReadEOL() while ( nInputBitsBufSize < 12 ) { pIStream->ReadUChar( nByte ); -if ( pIStream->eof() ) +if (!pIStream->good()) return false; if ( pIStream->Tell() > nMaxPos ) return false; diff --git a/filter/source/graphicfilter/itiff/itiff.cxx b/filter/source/graphicfilter/itiff/itiff.cxx index 988e791a6431..12e53b314478 100644 --- a/filter/source/graphicfilter/itiff/itiff.cxx +++ b/filter/source/graphicfilter/itiff/itiff.cxx @@ -1234,7 +1234,7 @@ bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & rGraphic ) nMaxPos = std::max(nOrigPos + nOffset + DataTypeSize() * nDataLen, nMaxPos); } pTIFF->ReadUInt32( nOffset ); -if ( pTIFF->eof() ) +if (!pTIFF->good()) nOffset = 0; nMaxPos = std::max( pTIFF->Tell(), nMaxPos ); @@ -1325,7 +1325,7 @@ bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & rGraphic ) break; } pTIFF->ReadUInt32( nNextIfd ); -if ( pTIFF->eof() ) +if (!pTIFF->good()) nNextIfd = 0; } if ( !nBitsPerSample || ( nBitsPerSample > 32 ) ) diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index ebc214ef36fb..eac8803da7f4 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -6774,7 +6774,7 @@ bool SvxMSDffManager::ConvertToOle2( SvStream& rStm, sal_uInt32 nReadLen, nBytesRead += 6 * sizeof( sal_uInt32 ) + nStrLen + nDataLen; -if( !rStm.eof() && nReadLen > nBytesRead && nDataLen ) +if (rStm.good() && nReadLen > nBytesRead && nDataLen) { if( xOle10Stm.is() ) { @@ -6828,7 +6828,7 @@ bool SvxMSDffManager::ConvertToOle2( SvStream& rStm, sal_uInt32 nReadLen, else rStm.SeekRel( nDataLen ); } -} while( !rStm.eof() && nReadLen >= nBytesRead ); +} while (rStm.good() && nReadLen >= nBytesRead); if( !bMtfRead && pMtf ) { diff --git a/sc/source/filter/lotus/lotread.cxx b/sc/source/filter/lotus/lotread.cxx index afb176ec7f19..7878c97288c0 100644 --- a/sc/source/filter/lotus/lotread.cxx +++ b/sc/source/filter/lotus/lotread.cxx @@ -61,7 +61,7 @@ ErrCode ImportLotus::Read() { pIn->ReadUInt16( nOp ).ReadUInt16( nRecLen ); -if( pIn->eof() || nNextRec > SAL_MAX_UINT32 - nRecLen - 4 ) +if (!pIn->good() || nNextRec > SAL_MAX_UINT32 - nRecLen - 4) eAkt = S_END; nNextRec += nRecLen + 4; @@ -245,7 +245,7 @@ ErrCode ImportLotus::Read(SvStream& rIn) { pIn->ReadUInt16( nOp ).ReadUInt16( nRecLen ); -if( pIn->eof() || nNextRec > SAL_MAX_UINT32 - nRecLen - 4 ) +if (!pIn->good() || nNextRec > SAL_MAX_UINT32 - nRecLen - 4) bRead = false; else { diff --git a/sc/source/filter/qpro/qpro.cxx b/sc/source/filter/qpro/qpro.cxx index 6326aae08cf6..0c1d18d59ffd 100644 --- a/sc/source/filter/qpro/qpro.cxx +++ b/sc/source/filter/qpro/qpro.cxx @@ -225,7 +225,7 @@ ErrCode ScQProReader::import( ScDocument *pDoc ) bool ScQProReader::recordsLeft() { -return mpStream && !mpStream->eof(); +return mpStream && mpStream->good(); } bool ScQProReader::nextRecord() ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/source sc/source sc/util
filter/source/config/fragments/filters/calc_Gnumeric.xcu |2 +- sc/source/filter/orcus/filterdetect.cxx |2 +- sc/source/ui/docshell/docsh.cxx |8 sc/util/scfilt.component |2 +- 4 files changed, 11 insertions(+), 3 deletions(-) New commits: commit 2db1e3447298f2b25287ff6ad4c5dda1e675f5e3 Author: Markus MohrhardDate: Sat Oct 10 01:24:23 2015 +0200 fix gnumeric import Change-Id: I65e4d4df9b75304096ec51e07f5985023ad3071c diff --git a/filter/source/config/fragments/filters/calc_Gnumeric.xcu b/filter/source/config/fragments/filters/calc_Gnumeric.xcu index 4210615..cc350fd 100644 --- a/filter/source/config/fragments/filters/calc_Gnumeric.xcu +++ b/filter/source/config/fragments/filters/calc_Gnumeric.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -IMPORT ALIEN 3RDPARTYFILTER PREFERRED +IMPORT ALIEN PREFERRED diff --git a/sc/source/filter/orcus/filterdetect.cxx b/sc/source/filter/orcus/filterdetect.cxx index 8c84a5d..7273df5 100644 --- a/sc/source/filter/orcus/filterdetect.cxx +++ b/sc/source/filter/orcus/filterdetect.cxx @@ -102,7 +102,7 @@ OUString OrcusFormatDetect::detect(css::uno::Sequence } extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_comp_oox_sc_OrcusFormatDetect_get_implementation(::com::sun::star::uno::XComponentContext* , +com_sun_star_comp_sc_OrcusFormatDetect_get_implementation(::com::sun::star::uno::XComponentContext* , ::com::sun::star::uno::Sequence const &) { return cppu::acquire(new OrcusFormatDetect()); diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index b3fd054..524bd34 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -1153,6 +1153,14 @@ bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) else bRet = true; } +else if (aFltName == "Gnumeric Spreadsheet") +{ +ScOrcusFilters* pOrcus = ScFormatFilter::Get().GetOrcusFilters(); +if (!pOrcus) +return false; + +bRet = pOrcus->importGnumeric(aDocument, rMedium); +} else if (aFltName == pFilterAscii) { SfxItemSet* pSet = rMedium.GetItemSet(); diff --git a/sc/util/scfilt.component b/sc/util/scfilt.component index 0df939f..5528935 100644 --- a/sc/util/scfilt.component +++ b/sc/util/scfilt.component @@ -28,7 +28,7 @@ constructor="com_sun_star_comp_oox_xls_FormulaParser_get_implementation"> - ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/source sc/source solenv/bin vcl/inc xmloff/inc
filter/source/msfilter/msdffimp.cxx |2 +- filter/source/xslt/export/wordml/ooo2wordml_draw.xsl |2 +- sc/source/ui/navipi/navipi.cxx |2 +- solenv/bin/modules/installer/windows/file.pm |2 +- vcl/inc/osx/salframe.h |2 +- xmloff/inc/MultiPropertySetHelper.hxx|2 +- 6 files changed, 6 insertions(+), 6 deletions(-) New commits: commit c1a7e72110e48fa5d7ca38af2d36505b647a11e4 Author: Andras Timar andras.ti...@collabora.com Date: Fri Oct 10 14:11:21 2014 +0200 typo: follwing - following Change-Id: Ia201473c84dc0923e8f4bee6329ad926cd6addd6 diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 26db18f..96b5554 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -3545,7 +3545,7 @@ void SvxMSDffManager::ReadObjText( SvStream rStream, SdrObject* pObj ) } // sj: I just want to set a string for a text object that may contain multiple -// paragraphs. If I now take a look at the follwing code I get the impression that +// paragraphs. If I now take a look at the following code I get the impression that // our outliner is too complicate to be used properly, void SvxMSDffManager::ReadObjText( const OUString rText, SdrObject* pObj ) { diff --git a/filter/source/xslt/export/wordml/ooo2wordml_draw.xsl b/filter/source/xslt/export/wordml/ooo2wordml_draw.xsl index f1d17b9..160e769 100644 --- a/filter/source/xslt/export/wordml/ooo2wordml_draw.xsl +++ b/filter/source/xslt/export/wordml/ooo2wordml_draw.xsl @@ -320,7 +320,7 @@ /xsl:call-template /xsl:variable xsl:choose - !-- if we got to the last node, return it directly, or return the max window of current one and follwing ones -- + !-- if we got to the last node, return it directly, or return the max window of current one and following ones -- xsl:when test=$CurrPos = count($nodeSet) xsl:value-of select=$CurrNodeWindow/ /xsl:when diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx index 6dde76c..1f5c137 100644 --- a/sc/source/ui/navipi/navipi.cxx +++ b/sc/source/ui/navipi/navipi.cxx @@ -527,7 +527,7 @@ ScNavigatorDialogWrapper::ScNavigatorDialogWrapper( { case NAV_LMODE_SCENARIOS: nCmdId = IID_SCENARIOS; break; case NAV_LMODE_AREAS: nCmdId = IID_AREAS; break; -// The follwing case can never be reach due to how eNavMode is set-up +// The following case can never be reach due to how eNavMode is set-up //case NAV_LMODE_DOCS:nCmdId = IID_DOCS; break; //case NAV_LMODE_DBAREAS: nCmdId = IID_DBAREAS; break; default:nCmdId = 0; diff --git a/solenv/bin/modules/installer/windows/file.pm b/solenv/bin/modules/installer/windows/file.pm index ce34592..457b31a 100644 --- a/solenv/bin/modules/installer/windows/file.pm +++ b/solenv/bin/modules/installer/windows/file.pm @@ -621,7 +621,7 @@ sub get_sequence_for_file # my $sequence = $number + 1; # Idea: Each component is packed into a cab file. -# This requires that all files in one cab file have sequences directly follwing each other, +# This requires that all files in one cab file have sequences directly following each other, # for instance from 1456 to 1466. Then in the media table the LastSequence for this cab file # is 1466. # Because all files belonging to one component are directly behind each other in the file diff --git a/vcl/inc/osx/salframe.h b/vcl/inc/osx/salframe.h index 905b089..82bd117 100644 --- a/vcl/inc/osx/salframe.h +++ b/vcl/inc/osx/salframe.h @@ -180,7 +180,7 @@ public: void getResolution( sal_Int32 o_rDPIX, sal_Int32 o_rDPIY ); -// actually the follwing methods do the same thing: flipping y coordinates +// actually the following methods do the same thing: flipping y coordinates // but having two of them makes clearer what the coordinate system // is supposed to be before and after void VCLToCocoa( NSRect io_rRect, bool bRelativeToScreen = true ); diff --git a/xmloff/inc/MultiPropertySetHelper.hxx b/xmloff/inc/MultiPropertySetHelper.hxx index c467bba..8467c16 100644 --- a/xmloff/inc/MultiPropertySetHelper.hxx +++ b/xmloff/inc/MultiPropertySetHelper.hxx @@ -32,7 +32,7 @@ namespace com { namespace sun { namespace star { /** - * The MultiPropertySetHelper performs the follwing functions: + * The MultiPropertySetHelper performs the following functions: * * Given a list of property names (as sal_Char** or OUString*), it can * query an XMultiPropertySet (or XPropertySet) which of these properties ___ Libreoffice-commits mailing list