[ooo-build-commit] .: patches/dev300 patches/vba
Noel Power
noelp at kemper.freedesktop.org
Fri Feb 19 04:25:36 PST 2010
patches/dev300/calc-subtotal-function-update.diff | 5 +-
patches/vba/vba-fixup-moduleinfo.diff | 41 +++++++++++-----------
2 files changed, 24 insertions(+), 22 deletions(-)
New commits:
commit 6582fb485f90afd7450c85607c74dddd448a67d5
Author: Noel Power <noel.power at novell.com>
Date: Fri Feb 19 12:25:16 2010 +0000
tweak non-applying calc patch fix embedd image bug in moduleinfo stuff
* patches/dev300/calc-subtotal-function-update.diff:
* patches/vba/vba-fixup-moduleinfo.diff:
diff --git a/patches/dev300/calc-subtotal-function-update.diff b/patches/dev300/calc-subtotal-function-update.diff
index 1bfe57d..9d2b9f9 100644
--- a/patches/dev300/calc-subtotal-function-update.diff
+++ b/patches/dev300/calc-subtotal-function-update.diff
@@ -10,11 +10,12 @@ index 82b1582..237e3f8 100644
public:
SC_DLLPUBLIC ULONG GetCellCount() const; // alle Zellen
-@@ -1783,6 +1784,11 @@ public:
+@@ -1783,8 +1784,12 @@ public:
{ return eStorageGrammar; }
SfxUndoManager* GetUndoManager();
-+
+ bool IsInVBAMode() const;
+
+ void AddSubTotalCell(ScFormulaCell* pCell);
+ void RemoveSubTotalCell(ScFormulaCell* pCell);
+ void SetSubTotalCellsDirty(const ScRange& rDirtyRange);
diff --git a/patches/vba/vba-fixup-moduleinfo.diff b/patches/vba/vba-fixup-moduleinfo.diff
index e1d95d1..ac20381 100644
--- a/patches/vba/vba-fixup-moduleinfo.diff
+++ b/patches/vba/vba-fixup-moduleinfo.diff
@@ -12,7 +12,7 @@ index 2ec681c..ebba146 100644
switch( xModule->GetModuleType() )
{
diff --git basctl/source/basicide/baside3.cxx basctl/source/basicide/baside3.cxx
-index 211c105..e50baad 100644
+index 211c105..a3300b2 100644
--- basctl/source/basicide/baside3.cxx
+++ basctl/source/basicide/baside3.cxx
@@ -740,7 +740,7 @@ BOOL DialogWindow::SaveDialog()
@@ -20,7 +20,7 @@ index 211c105..e50baad 100644
OSL_ASSERT( xProps.is() );
OSL_VERIFY( xProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xContext );
- Reference< XInputStreamProvider > xISP = ::xmlscript::exportDialogModel( xDialogModel, xContext, GetDocument().getDocument() );
-+ Reference< XInputStreamProvider > xISP = ::xmlscript::exportDialogModel( xDialogModel, xContext, GetDocument().isInVBAMode() ? GetDocument().getDocument() : Reference< frame::XModel >() );
++ Reference< XInputStreamProvider > xISP = ::xmlscript::exportDialogModel( xDialogModel, xContext, GetDocument().isDocument() ? GetDocument().getDocument() : Reference< frame::XModel >() );
Reference< XInputStream > xInput( xISP->createInputStream() );
Reference< XSimpleFileAccess > xSFI( xMSF->createInstance
@@ -29,7 +29,7 @@ index 211c105..e50baad 100644
OSL_ASSERT( xProps.is() );
OSL_VERIFY( xProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xContext );
- ::xmlscript::importDialogModel( xInput, xDialogModel, xContext, rDocument.getDocument() );
-+ ::xmlscript::importDialogModel( xInput, xDialogModel, xContext, rDocument.isInVBAMode() ? rDocument.getDocument() : Reference< frame::XModel >() );
++ ::xmlscript::importDialogModel( xInput, xDialogModel, xContext, rDocument.isDocument() ? rDocument.getDocument() : Reference< frame::XModel >() );
String aXmlDlgName;
Reference< beans::XPropertySet > xDialogModelPropSet( xDialogModel, UNO_QUERY );
@@ -38,7 +38,7 @@ index 211c105..e50baad 100644
}
- Reference< XInputStreamProvider > xISP = ::xmlscript::exportDialogModel( xDialogModel, xContext, rDocument.getDocument() );
-+ Reference< XInputStreamProvider > xISP = ::xmlscript::exportDialogModel( xDialogModel, xContext, rDocument.isInVBAMode() ? rDocument.getDocument() : Reference< frame::XModel >() );
++ Reference< XInputStreamProvider > xISP = ::xmlscript::exportDialogModel( xDialogModel, xContext, rDocument.isDocument() ? rDocument.getDocument() : Reference< frame::XModel >() );
bool bSuccess = rDocument.insertDialog( aLibName, aNewDlgName, xISP );
if( bSuccess )
{
@@ -47,7 +47,7 @@ index 211c105..e50baad 100644
OSL_ASSERT( xProps.is() );
OSL_VERIFY( xProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xContext );
- Reference< XInputStreamProvider > xISP = ::xmlscript::exportDialogModel( xDialogModel, xContext, GetDocument().getDocument() );
-+ Reference< XInputStreamProvider > xISP = ::xmlscript::exportDialogModel( xDialogModel, xContext, GetDocument().isInVBAMode() ? GetDocument().getDocument() : Reference< frame::XModel >() );
++ Reference< XInputStreamProvider > xISP = ::xmlscript::exportDialogModel( xDialogModel, xContext, GetDocument().isDocument() ? GetDocument().getDocument() : Reference< frame::XModel >() );
xLib->replaceByName( ::rtl::OUString( GetName() ), makeAny( xISP ) );
}
}
@@ -80,7 +80,7 @@ index 7096170..dde14a6 100644
uno::Reference< lang::XServiceInfo > xServiceInfo( aObject, uno::UNO_QUERY );
if( xServiceInfo.is() && xServiceInfo->supportsService( rtl::OUString::createFromAscii( "ooo.vba.excel.Worksheet" ) ) )
diff --git basctl/source/basicide/basides3.cxx basctl/source/basicide/basides3.cxx
-index 23f70e0..d523563 100644
+index 23f70e0..e28b567 100644
--- basctl/source/basicide/basides3.cxx
+++ basctl/source/basicide/basides3.cxx
@@ -99,7 +99,7 @@ DialogWindow* BasicIDEShell::CreateDlgWin( const ScriptDocument& rDocument, cons
@@ -88,7 +88,7 @@ index 23f70e0..d523563 100644
OSL_ASSERT( xProps.is() );
OSL_VERIFY( xProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xContext );
- ::xmlscript::importDialogModel( xInput, xDialogModel, xContext, rDocument.getDocument() );
-+ ::xmlscript::importDialogModel( xInput, xDialogModel, xContext, rDocument.isInVBAMode() ? rDocument.getDocument() : Reference< frame::XModel >() );
++ ::xmlscript::importDialogModel( xInput, xDialogModel, xContext, rDocument.isDocument() ? rDocument.getDocument() : Reference< frame::XModel >() );
LocalizationMgr::setStringResourceAtDialog( rDocument, rLibName, aDlgName, xDialogModel );
// new dialog window
@@ -233,7 +233,7 @@ index ab34938..6c083bb 100644
ImpCreateLibSubEntriesInVBAMode( pLibRootEntry, rDocument, rLibName );
else
diff --git basctl/source/basicide/moduldlg.cxx basctl/source/basicide/moduldlg.cxx
-index cf38077..7ccec2e 100644
+index cf38077..59ddd7a 100644
--- basctl/source/basicide/moduldlg.cxx
+++ basctl/source/basicide/moduldlg.cxx
@@ -315,7 +315,7 @@ void BasicIDEShell::CopyDialogResources( Reference< io::XInputStreamProvider >&
@@ -241,7 +241,7 @@ index cf38077..7ccec2e 100644
OSL_ASSERT( xProps.is() );
OSL_VERIFY( xProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xContext );
- ::xmlscript::importDialogModel( xInput, xDialogModel, xContext, rSourceDoc.getDocument() );
-+ ::xmlscript::importDialogModel( xInput, xDialogModel, xContext, rSourceDoc.isInVBAMode() ? rSourceDoc.getDocument() : Reference< frame::XModel >() );
++ ::xmlscript::importDialogModel( xInput, xDialogModel, xContext, rSourceDoc.isDocument() ? rSourceDoc.getDocument() : Reference< frame::XModel >() );
if( xDialogModel.is() )
{
@@ -250,7 +250,7 @@ index cf38077..7ccec2e 100644
LocalizationMgr::setResourceIDsForDialog( xDialogModel, xDestMgr );
}
- io_xISP = ::xmlscript::exportDialogModel( xDialogModel, xContext, rDestDoc.getDocument() );
-+ io_xISP = ::xmlscript::exportDialogModel( xDialogModel, xContext, rDestDoc.isInVBAMode() ? rDestDoc.getDocument() : Reference< frame::XModel >() );
++ io_xISP = ::xmlscript::exportDialogModel( xDialogModel, xContext, rDestDoc.isDocument() ? rDestDoc.getDocument() : Reference< frame::XModel >() );
}
}
@@ -275,7 +275,7 @@ index cf38077..7ccec2e 100644
// add the new module in the "Modules" entry
SvLBoxEntry* pLibSubEntry = rBasicBox.FindEntry( pLibEntry, String( IDEResId( RID_STR_NORMAL_MODULES ) ) , OBJ_TYPE_NORMAL_MODULES );
diff --git basctl/source/basicide/scriptdocument.cxx basctl/source/basicide/scriptdocument.cxx
-index afa4240..a7343b4 100644
+index afa4240..e95e87f 100644
--- basctl/source/basicide/scriptdocument.cxx
+++ basctl/source/basicide/scriptdocument.cxx
@@ -56,7 +56,8 @@
@@ -329,7 +329,7 @@ index afa4240..a7343b4 100644
{
Reference< XInputStream > xInput( xISP->createInputStream(), UNO_QUERY_THROW );
- ::xmlscript::importDialogModel( xInput, xDialogModel, aContext.getUNOContext(), getDocument() );
-+ ::xmlscript::importDialogModel( xInput, xDialogModel, aContext.getUNOContext(), isInVBAMode() ? getDocument() : Reference< XModel >() );
++ ::xmlscript::importDialogModel( xInput, xDialogModel, aContext.getUNOContext(), isDocument() ? getDocument() : Reference< XModel >() );
}
// set new name as property
@@ -338,7 +338,7 @@ index afa4240..a7343b4 100644
// export dialog model
- xISP = ::xmlscript::exportDialogModel( xDialogModel, aContext.getUNOContext(), getDocument() );
-+ xISP = ::xmlscript::exportDialogModel( xDialogModel, aContext.getUNOContext(), isInVBAMode() ? getDocument() : Reference< XModel >() );
++ xISP = ::xmlscript::exportDialogModel( xDialogModel, aContext.getUNOContext(), isDocument() ? getDocument() : Reference< XModel >() );
aElement <<= xISP;
}
@@ -381,7 +381,7 @@ index afa4240..a7343b4 100644
// export dialog model
- _out_rDialogProvider = ::xmlscript::exportDialogModel( xDialogModel, aContext.getUNOContext(), getDocument() );
-+ _out_rDialogProvider = ::xmlscript::exportDialogModel( xDialogModel, aContext.getUNOContext(), isInVBAMode() ? getDocument() : Reference< XModel >() );
++ _out_rDialogProvider = ::xmlscript::exportDialogModel( xDialogModel, aContext.getUNOContext(), isDocument() ? getDocument() : Reference< XModel >() );
// insert dialog into library
xLib->insertByName( _rDialogName, makeAny( _out_rDialogProvider ) );
@@ -892,19 +892,20 @@ index 4e6d8e6..e843e86 100644
# ------------------------------------------------------------------
diff --git sc/inc/document.hxx sc/inc/document.hxx
-index 237e3f8..fb8491f 100644
+index 3075abc..74999f6 100644
--- sc/inc/document.hxx
+++ sc/inc/document.hxx
-@@ -1784,6 +1784,7 @@ public:
+@@ -1780,6 +1780,8 @@ public:
{ return eStorageGrammar; }
SfxUndoManager* GetUndoManager();
+ bool IsInVBAMode() const;
++
+ private: // CLOOK-Impl-Methoden
- void AddSubTotalCell(ScFormulaCell* pCell);
- void RemoveSubTotalCell(ScFormulaCell* pCell);
+ /**
diff --git sc/source/core/data/document.cxx sc/source/core/data/document.cxx
-index 917ddf9..e3638fb 100644
+index 320239b..6bc2923 100644
--- sc/source/core/data/document.cxx
+++ sc/source/core/data/document.cxx
@@ -55,6 +55,7 @@
@@ -915,7 +916,7 @@ index 917ddf9..e3638fb 100644
#include "document.hxx"
#include "table.hxx"
-@@ -5302,4 +5303,13 @@ void ScDocument::EnableUndo( bool bVal )
+@@ -5250,4 +5251,13 @@ void ScDocument::EnableUndo( bool bVal )
mbUndoEnabled = bVal;
}
More information about the ooo-build-commit
mailing list