rpms/libreoffice
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolves: fdo#81113 always run the detection

Browse Source
This commit is contained in:
David Tardon 2014-07-18 10:38:57 +02:00
parent dab66d4ff3
commit f439225b96
2 changed files with 70 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
0001-fdo-81113-always-run-the-actual-detection.patch Normal file
View File

@ -0,0 +1,69 @@
From c10390a681a4d4696d45a6d38f7d01829f368daa Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Wed, 16 Jul 2014 15:13:36 +0200
Subject: [PATCH] fdo#81113 always run the actual detection
The old code only run detection if an UCBContent property was passed.
That means that any time the function got only InputStream, it claimed
that it was a Keynote presentation.
Change-Id: I377828229e7e95384257bde247612d7768307581
---
.../source/impress/KeynoteImportFilter.cxx | 36 +++++++++++-----------
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/writerperfect/source/impress/KeynoteImportFilter.cxx b/writerperfect/source/impress/KeynoteImportFilter.cxx
index 5edbfa9..4b7b029 100644
--- a/writerperfect/source/impress/KeynoteImportFilter.cxx
+++ b/writerperfect/source/impress/KeynoteImportFilter.cxx
@@ -247,29 +247,29 @@ throw( com::sun::star::uno::RuntimeException, std::exception )
{
return OUString();
}
+ }
- libetonyek::EtonyekDocument::Type type = libetonyek::EtonyekDocument::TYPE_UNKNOWN;
- const libetonyek::EtonyekDocument::Confidence confidence = libetonyek::EtonyekDocument::isSupported( input.get(), &type );
- if ((libetonyek::EtonyekDocument::CONFIDENCE_NONE == confidence) || (libetonyek::EtonyekDocument::TYPE_KEYNOTE != type))
- return OUString();
+ libetonyek::EtonyekDocument::Type type = libetonyek::EtonyekDocument::TYPE_UNKNOWN;
+ const libetonyek::EtonyekDocument::Confidence confidence = libetonyek::EtonyekDocument::isSupported( input.get(), &type );
+ if ((libetonyek::EtonyekDocument::CONFIDENCE_NONE == confidence) || (libetonyek::EtonyekDocument::TYPE_KEYNOTE != type))
+ return OUString();
- if ( confidence == libetonyek::EtonyekDocument::CONFIDENCE_SUPPORTED_PART )
- {
- assert( !bIsPackage );
+ if ( confidence == libetonyek::EtonyekDocument::CONFIDENCE_SUPPORTED_PART )
+ {
+ assert( !bIsPackage );
- const Reference < container::XChild > xChild( xContent, UNO_QUERY );
- if ( xChild.is() )
+ const Reference < container::XChild > xChild( xContent, UNO_QUERY );
+ if ( xChild.is() )
+ {
+ const Reference < ucb::XContent > xPackageContent( xChild->getParent(), UNO_QUERY );
+ if ( xPackageContent.is() )
{
- const Reference < ucb::XContent > xPackageContent( xChild->getParent(), UNO_QUERY );
- if ( xPackageContent.is() )
+ input.reset( new writerperfect::DirectoryStream( xPackageContent ) );
+ if ( libetonyek::EtonyekDocument::CONFIDENCE_EXCELLENT == libetonyek::EtonyekDocument::isSupported( input.get() ) )
{
- input.reset( new writerperfect::DirectoryStream( xPackageContent ) );
- if ( libetonyek::EtonyekDocument::CONFIDENCE_EXCELLENT == libetonyek::EtonyekDocument::isSupported( input.get() ) )
- {
- xContent = xPackageContent;
- bUCBContentChanged = true;
- bIsPackage = true;
- }
+ xContent = xPackageContent;
+ bUCBContentChanged = true;
+ bIsPackage = true;
}
}
}
--
1.9.3

1
libreoffice.spec
View File

@ -309,6 +309,7 @@ Patch18: 0001-Resolves-fdo-80911-toggle-original-page-orientation-.patch
Patch19: 0001-scrolling-very-slow-in-calc.patch
Patch20: 0001-Related-rhbz-1117853-nStartPara-of-EE_PARA_NOT_FOUND.patch
Patch21: 0001-Resolves-fdo-81487-pasting-into-outline-view-crashes.patch
Patch22: 0001-fdo-81113-always-run-the-actual-detection.patch
%define instdir %{_libdir}
%define baseinstdir %{instdir}/libreoffice