Commits

Anonymous committed 458cd1b Merge

vbasupportdev300_HG: resolve multiple heads ( merge with pulled chnages )
hg: enter commit message. Lines beginning with 'HG:' are removed.

Comments (0)

Files changed (5)

sc/source/core/data/documen2.cxx

             // helper will always be created successfully.
             mxVbaEventsHelper.set( ooo::vba::createVBAUnoAPIServiceWithArgs( pShell, "com.sun.star.sheet.SpreadsheetDocumentVbaEventsHelper" , aArgs ), uno::UNO_QUERY_THROW );
         }
-        catch( uno::Exception& e )
+        catch( uno::Exception& )
         {
         }
 	}

sc/source/ui/vba/vbaapplication.cxx

 	else
 	{
 		ScAppOptions& rAppOpt = const_cast< ScAppOptions& >(SC_MOD()->GetAppOptions());
-		rAppOpt.SetTabCountInNewSpreadsheet( SheetsInNewWorkbook );
+		rAppOpt.SetTabCountInNewSpreadsheet( static_cast< sal_Int16 >( SheetsInNewWorkbook ) );
 	}
 }
 

sc/source/ui/vba/vbaeventshelper.cxx

     if( pWindow )
     {
         Window::PointerState aPointerState = pWindow->GetPointerState();
-        if( !aPointerState.mnState & ( MOUSE_LEFT | MOUSE_MIDDLE | MOUSE_RIGHT ) )
+        if( (aPointerState.mnState & ( MOUSE_LEFT | MOUSE_MIDDLE | MOUSE_RIGHT )) == 0 )
             return sal_True; 
     }
     return sal_False;

sw/source/ui/vba/vbadocument.cxx

     xParaProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaHyphenationMaxHyphens")), uno::makeAny( nHyphensLimit ) );
 }
 
+void SAL_CALL SwVbaDocument::Protect( const uno::Any& Password ) throw (uno::RuntimeException)
+{
+    throw uno::RuntimeException();
+}
+
 void SAL_CALL SwVbaDocument::Protect( ::sal_Int32 /*Type*/, const uno::Any& /*NOReset*/, const uno::Any& /*Password*/, const uno::Any& /*UseIRM*/, const uno::Any& /*EnforceStyleLock*/ ) throw (uno::RuntimeException)
 {
     // Seems not support in Writer

sw/source/ui/vba/vbadocument.hxx

     virtual void SAL_CALL setHyphenationZone( ::sal_Int32 _hyphenationzone ) throw (css::uno::RuntimeException);
     virtual ::sal_Int32 SAL_CALL getConsecutiveHyphensLimit() throw (css::uno::RuntimeException);
     virtual void SAL_CALL setConsecutiveHyphensLimit( ::sal_Int32 _consecutivehyphenslimit ) throw (css::uno::RuntimeException);
+    virtual void SAL_CALL Protect( const css::uno::Any& Password ) throw (css::uno::RuntimeException);
     virtual void SAL_CALL Protect( ::sal_Int32 Type, const css::uno::Any& NOReset, const css::uno::Any& Password, const css::uno::Any& UseIRM, const css::uno::Any& EnforceStyleLock ) throw (css::uno::RuntimeException);
     virtual void SAL_CALL PrintOut( const css::uno::Any& Background, const css::uno::Any& Append, const css::uno::Any& Range, const css::uno::Any& OutputFileName, const css::uno::Any& From, const css::uno::Any& To, const css::uno::Any& Item, const css::uno::Any& Copies, const css::uno::Any& Pages, const css::uno::Any& PageType, const css::uno::Any& PrintToFile, const css::uno::Any& Collate, const css::uno::Any& FileName, const css::uno::Any& ActivePrinterMacGX, const css::uno::Any& ManualDuplexPrint, const css::uno::Any& PrintZoomColumn, const css::uno::Any& PrintZoomRow, const css::uno::Any& PrintZoomPaperWidth, const css::uno::Any& PrintZoomPaperHeight ) throw (css::uno::RuntimeException);
     virtual void SAL_CALL PrintPreview(  ) throw (css::uno::RuntimeException);