[ooo-build-commit] .: patches/vba

[Noel Power]

 patches/vba/cws-vbasupportdev300.diff |   47 ----------------------------------
 1 file changed, 47 deletions(-)

New commits:
commit 53fee07ea5c8aa1f937f5579a34b0dfc69dd01cd
Author: Noel Power <noel.power at novell.com>
Date:   Thu Sep 2 15:35:58 2010 +0100

    remove some of our old hooks for before pring messages

diff --git a/patches/vba/cws-vbasupportdev300.diff b/patches/vba/cws-vbasupportdev300.diff
index 3db8e47..146ff49 100644
--- a/patches/vba/cws-vbasupportdev300.diff
+++ b/patches/vba/cws-vbasupportdev300.diff
@@ -26244,53 +26244,6 @@ diff --git sfx2/source/view/viewprn.cxx sfx2/source/view/viewprn.cxx
 index 43c9c8b..5cc2ce8 100644
 --- sfx2/source/view/viewprn.cxx
 +++ sfx2/source/view/viewprn.cxx
-@@ -700,14 +700,18 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq )
-         case SID_PRINTDOCDIRECT:
-         {
-             SfxObjectShell* pDoc = GetObjectShell();
--
--            // derived class may decide to abort this
--            if( !pDoc->QuerySlotExecutable( nId ) )
--            {
--                rReq.SetReturnValue( SfxBoolItem( 0, FALSE ) );
--                return;
--            }
--
-+// #FIXME Figure out the new event mumbojumbo
-+/*
-+                uno::Reference< document::XDocumentEventCompatibleHelper > xVbaEventHelper( pDoc->GetModel(), uno::UNO_QUERY );
-+                if( xVbaEventHelper.is() )
-+                {
-+                    if( xVbaEventHelper->processCompatibleEvent( nId ) )
-+                    {
-+                        rReq.SetReturnValue(SfxBoolItem(0,FALSE));
-+                        return;
-+                    }
-+                }
-+*/
-             bool bDetectHidden = ( !bSilent && pDoc );
-             if ( bDetectHidden && pDoc->QueryHiddenInformation( WhenPrinting, NULL ) != RET_YES )
-                 break;
-@@ -769,6 +773,19 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq )
-         case SID_SETUPPRINTER :
-         case SID_PRINTER_NAME : // only for recorded macros
-         {
-+            // #TODO FIXME is this necessary at all ?
-+            // #Not sure of the impact of the new Oracle code
-+            if( nId == SID_PRINTDOC )
-+            {
-+                SfxObjectShell* pDoc = GetObjectShell();
-+                // derived class may decide to abort this
-+                if( !pDoc->QuerySlotExecutable( nId ) )
-+                {
-+                    rReq.SetReturnValue( SfxBoolItem( 0, FALSE ) );
-+                    return;
-+                }
-+            }
-+
-             // get printer and printer settings from the document
-             SfxPrinter *pDocPrinter = GetPrinter(TRUE);
- 
 @@ -874,6 +888,10 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq )
                          aReq.AppendItem( SfxStringItem( SID_PRINTER_NAME, pDlgPrinter->GetName() ) );
                          aReq.Done();