[Libreoffice-commits] .: Branch 'libreoffice-3-4' - patches/dev300

[Kohei Yoshida]

 patches/dev300/apply                                            |    6 -
 patches/dev300/calc-pdf-export-allow-filtered-range-filter.diff |   43 ----------
 patches/dev300/calc-pdf-export-allow-filtered-range-sc.diff     |   40 ---------
 3 files changed, 89 deletions(-)

New commits:
commit b45e924762e16216cc0d21fae96d06f58217e57f
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Fri Apr 29 13:59:16 2011 -0400

    Removed obsolete patches.
    
    The referenced bug n#585028 no longer reproducible even without the
    patches.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 9b2970f..dd51188 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1410,12 +1410,6 @@ crosswin32-writerperfect-cross.diff
 # don't throw unnecessary exceptions in sfx2
 speed-sfx2-dont-throw-too-much.diff, i#107512, jholesov
 
-[ CalcFixes ]
-
-# Allow export of filtered range selection, and show error when fails.
-calc-pdf-export-allow-filtered-range-sc.diff,     n#585028, kohei
-calc-pdf-export-allow-filtered-range-filter.diff, n#585028, kohei
-
 [ Netbook ]
 vcl-netbook.diff, rodo
 
diff --git a/patches/dev300/calc-pdf-export-allow-filtered-range-filter.diff b/patches/dev300/calc-pdf-export-allow-filtered-range-filter.diff
deleted file mode 100644
index fc3ccb6..0000000
--- a/patches/dev300/calc-pdf-export-allow-filtered-range-filter.diff
+++ /dev/null
@@ -1,43 +0,0 @@
----
- filter/source/pdf/impdialog.cxx |   24 ++++++++++++++++++++++++
- 1 files changed, 24 insertions(+), 0 deletions(-)
-
-diff --git filter/source/pdf/impdialog.cxx filter/source/pdf/impdialog.cxx
-index e508009..2430de0 100644
---- filter/source/pdf/impdialog.cxx
-+++ filter/source/pdf/impdialog.cxx
-@@ -133,7 +133,31 @@ ImpPDFTabDialog::ImpPDFTabDialog( Window* pParent,
-         {
-             Reference< view::XSelectionSupplier > xView( xController, UNO_QUERY );
-             if( xView.is() )
-+            {
-+                // In Calc, we need to treat a selection across hidden or
-+                // filtered ranges as one range, or else the export will
-+                // fail because Calc doesn't support printing of multiple
-+                // selections.
-+                Reference< beans::XPropertySet > xPropSet(xView, UNO_QUERY);
-+                if (xPropSet.is())
-+                {
-+                    sal_Bool bFilteredRange = sal_False; // Don't divide selection across filtered ranges.
-+                    uno::Any any;
-+                    any <<= bFilteredRange;
-+                    try
-+                    {
-+                        xPropSet->setPropertyValue(
-+                            rtl::OUString::createFromAscii("FilteredRangeSelection"), any);
-+                    }
-+                    catch (const beans::UnknownPropertyException&)
-+                    {
-+                        // For now, apps other than Calc fails to set this property,
-+                        // hence an exception gets thrown.
-+                    }
-+                }
-+
-                 xView->getSelection() >>= maSelection;
-+            }
-         }
-     }
-     catch( RuntimeException )
--- 
-1.7.0.1
-
diff --git a/patches/dev300/calc-pdf-export-allow-filtered-range-sc.diff b/patches/dev300/calc-pdf-export-allow-filtered-range-sc.diff
deleted file mode 100644
index a3b1cc9..0000000
--- a/patches/dev300/calc-pdf-export-allow-filtered-range-sc.diff
+++ /dev/null
@@ -1,40 +0,0 @@
- sc/source/ui/unoobj/docuno.cxx |   12 +++++++++++-
- 1 files changed, 11 insertions(+), 1 deletions(-)
-
-diff --git sc/source/ui/unoobj/docuno.cxx sc/source/ui/unoobj/docuno.cxx
-index fd60fdf..35092fd 100644
---- sc/source/ui/unoobj/docuno.cxx
-+++ sc/source/ui/unoobj/docuno.cxx
-@@ -52,6 +52,7 @@
- #include <ctype.h>
- #include <float.h>	// DBL_MAX
- 
-+#include <com/sun/star/task/ErrorCodeIOException.hpp>
- #include <com/sun/star/util/Date.hpp>
- #include <com/sun/star/sheet/XNamedRanges.hpp>
- #include <com/sun/star/sheet/XLabelRanges.hpp>
-@@ -106,6 +107,9 @@
- #include "scresid.hxx"
-
- using namespace com::sun::star;
-+using ::rtl::OUString;
-+using ::com::sun::star::uno::Reference;
-+
- #define SC_UNO_VBADOCOBJ "ThisVBADocObj" // perhaps we want to actually make this ThisWorkbook ?
-
- //------------------------------------------------------------------------
-@@ -929,7 +933,13 @@ sal_Int32 SAL_CALL ScModelObj::getRendererCount( const uno::Any& aSelection,
-     ScPrintSelectionStatus aStatus;
-     String aPagesStr;
-     if ( !FillRenderMarkData( aSelection, rOptions, aMark, aStatus, aPagesStr ) )
--        return 0;
-+    {
-+        // TODO: Right now this error code is not reaching where it's supposed
-+        // to.  Find out why and figure out how to send correct error code to
-+        // the framework code.
-+        throw task::ErrorCodeIOException(
-+            OUString(), Reference<XInterface>(), ERRCODE_IO_NOTSUPPORTED);
-+    }
- 
-     //	The same ScPrintFuncCache object in pPrintFuncCache is used as long as
-     //	the same selection is used (aStatus) and the document isn't changed