[ooo-build-commit] 5 commits - patches/vba
Tor Lillqvist
tml at kemper.freedesktop.org
Tue Aug 11 23:04:53 PDT 2009
patches/vba/calc-vba-volatile-user-func.diff | 18 ++++--------
patches/vba/vba-application-quit.diff | 6 +---
patches/vba/vba-currentcomponent-rework.diff | 4 --
patches/vba/vba-fixup-macrosearch.diff | 6 +---
patches/vba/vba-word-support-part2.diff | 40 +++------------------------
5 files changed, 16 insertions(+), 58 deletions(-)
New commits:
commit 3e6914826ad6599c3f6261441cad10f19f897e8c
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Wed Aug 12 09:02:42 2009 +0300
Adapt vba-application-quit.diff for dev300-m54
* patches/vba/vba-application-quit.diff: Comments have gone from
Deutsch to English comments in dev300-m54.
diff --git a/patches/vba/vba-application-quit.diff b/patches/vba/vba-application-quit.diff
index da8d15b..6d2bad1 100644
--- a/patches/vba/vba-application-quit.diff
+++ b/patches/vba/vba-application-quit.diff
@@ -1,11 +1,9 @@
-diff --git basic/inc/basic/sbstar.hxx basic/inc/basic/sbstar.hxx
-index ea7e75e..f610f56 100644
--- basic/inc/basic/sbstar.hxx
+++ basic/inc/basic/sbstar.hxx
@@ -75,6 +75,7 @@ class StarBASIC : public SbxObject
BOOL bVBAEnabled;
- BasicLibInfo* pLibInfo; // Infoblock fuer Basic-Manager
- SbLanguageMode eLanguageMode; // LanguageMode des Basic-Objekts
+ BasicLibInfo* pLibInfo; // Info block for basic manager
+ SbLanguageMode eLanguageMode; // LanguageMode of the basic object
+ BOOL bQuit;
SbxObjectRef pVBAGlobals;
commit 8bc0f040afae13509939ce39ea32bff24ec57827
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Wed Aug 12 09:01:15 2009 +0300
Adapt vba-currentcomponent-rework.diff for dev300-m54
* patches/vba/vba-currentcomponent-rework.diff: Adapt for dev300-m54.
diff --git a/patches/vba/vba-currentcomponent-rework.diff b/patches/vba/vba-currentcomponent-rework.diff
index 4cdc998..5fc2c1f 100644
--- a/patches/vba/vba-currentcomponent-rework.diff
+++ b/patches/vba/vba-currentcomponent-rework.diff
@@ -20,8 +20,6 @@ index 846682b..4d1db8b 100644
}
}
}
-diff --git sc/source/ui/unoobj/docuno.cxx sc/source/ui/unoobj/docuno.cxx
-index 3149254..f2f1eb5 100644
--- sc/source/ui/unoobj/docuno.cxx
+++ sc/source/ui/unoobj/docuno.cxx
@@ -102,6 +102,7 @@
@@ -37,7 +35,7 @@ index 3149254..f2f1eb5 100644
{MAP_CHAR_LEN(SC_UNO_BASICLIBRARIES), 0, &getCppuType((uno::Reference< script::XLibraryContainer >*)0), beans::PropertyAttribute::READONLY, 0},
{MAP_CHAR_LEN(SC_UNO_DIALOGLIBRARIES), 0, &getCppuType((uno::Reference< script::XLibraryContainer >*)0), beans::PropertyAttribute::READONLY, 0},
+ {MAP_CHAR_LEN(SC_UNO_VBADOCOBJ), 0, &getCppuType((beans::PropertyValue*)0), beans::PropertyAttribute::READONLY, 0},
- {MAP_CHAR_LEN(SC_UNO_CALCASSHOWN), 0, &getBooleanCppuType(), 0, 0},
+ {MAP_CHAR_LEN(SC_UNO_CALCASSHOWN), PROP_UNO_CALCASSHOWN, &getBooleanCppuType(), 0, 0},
{MAP_CHAR_LEN(SC_UNONAME_CLOCAL), 0, &getCppuType((lang::Locale*)0), 0, 0},
{MAP_CHAR_LEN(SC_UNO_CJK_CLOCAL), 0, &getCppuType((lang::Locale*)0), 0, 0},
@@ -1555,6 +1557,13 @@ uno::Any SAL_CALL ScModelObj::getPropertyValue( const rtl::OUString& aPropertyNa
commit 219589adcf5a1719868b73191a64c0e05286f9af
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Wed Aug 12 08:59:24 2009 +0300
Adapt vba-fixup-macrosearch.diff for dev300-m54
* patches/vba/vba-fixup-macrosearch.diff: Adapt for dev300-m54.
diff --git a/patches/vba/vba-fixup-macrosearch.diff b/patches/vba/vba-fixup-macrosearch.diff
index 58b9259..79c1f87 100644
--- a/patches/vba/vba-fixup-macrosearch.diff
+++ b/patches/vba/vba-fixup-macrosearch.diff
@@ -847,8 +847,6 @@ index 5875cf7..d02746f 100644
+ return bRes;
+}
} } // vba // ooo
-diff --git sw/inc/doc.hxx sw/inc/doc.hxx
-index 5ee662e..68c5660 100644
--- sw/inc/doc.hxx
+++ sw/inc/doc.hxx
@@ -417,6 +417,7 @@ class SW_DLLPUBLIC SwDoc :
@@ -865,9 +863,9 @@ index 5ee662e..68c5660 100644
}
+ void SetVBATemplateToProjectCache( com::sun::star::uno::Reference< com::sun::star::container::XNameContainer >& xCache ) { m_xTemplateToProjectCache = xCache; };
+ com::sun::star::uno::Reference< com::sun::star::container::XNameContainer > GetVBATemplateToProjectCache() { return m_xTemplateToProjectCache; };
- };
-
+ ::sfx2::IXmlIdRegistry& GetXmlIdRegistry();
+ SwDoc* CreateCopy() const;
diff --git sw/inc/unocoll.hxx sw/inc/unocoll.hxx
index e9da66c..2c6bd02 100644
--- sw/inc/unocoll.hxx
commit 87295337a9a1a0bfd02daa4bb3245b68ce72893f
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Wed Aug 12 08:57:02 2009 +0300
Adapt vba-word-support-part2.diff for dev300-m54
* patches/vba/vba-word-support-part2.diff: Adapt for dev300-m54.
diff --git a/patches/vba/vba-word-support-part2.diff b/patches/vba/vba-word-support-part2.diff
index f0bab04..d3cf7d3 100644
--- a/patches/vba/vba-word-support-part2.diff
+++ b/patches/vba/vba-word-support-part2.diff
@@ -7633,8 +7633,6 @@ index 119a6ea..37c75fb 100644
+..\inc\svx\msvbahelper.hxx %_DEST%\inc%_EXT%\svx\msvbahelper.hxx
..\%__SRC%\bin\*-layout.zip %_DEST%\pck%_EXT%\*.*
-diff --git svx/source/msfilter/makefile.mk svx/source/msfilter/makefile.mk
-index 05188c1..0ab63d7 100644
--- svx/source/msfilter/makefile.mk
+++ svx/source/msfilter/makefile.mk
@@ -58,6 +58,7 @@ LIB1OBJFILES= \
@@ -7643,8 +7641,8 @@ index 05188c1..0ab63d7 100644
$(SLO)$/mstoolbar.obj\
+ $(SLO)$/msvbahelper.obj\
- LIB2TARGET= $(SLB)$/$(TARGET)-core.lib
- LIB2OBJFILES= \
+ EXCEPTIONSFILES= \
+ $(SLO)$/eschesdo.obj \
@@ -76,6 +77,7 @@ EXCEPTIONSFILES= \
$(SLO)$/svxmsbas.obj \
$(SLO)$/msfiltertracer.obj\
@@ -7906,14 +7904,12 @@ index 60667ed..cfe547a 100644
// decompress the stream
std::auto_ptr< SvMemoryStream > xCmpDir;
xCmpDir.reset( MSLZSS::decompressAsStream( xDir, 0 ) );
-diff --git sw/inc/unocoll.hxx sw/inc/unocoll.hxx
-index 06fe329..e9da66c 100644
--- sw/inc/unocoll.hxx
+++ sw/inc/unocoll.hxx
@@ -40,6 +40,7 @@
- #include <cppuhelper/implbase2.hxx> // helper for implementations
- #include <cppuhelper/implbase3.hxx> // helper for implementations
#include <cppuhelper/implbase4.hxx> // helper for implementations
+ #include <IMark.hxx>
+ #include <unobaseclass.hxx>
+#include "swdllapi.h"
/***************************************************
***************************************************
@@ -7927,8 +7923,6 @@ index 06fe329..e9da66c 100644
public SwUnoCollection
{
protected:
-diff --git sw/inc/unotbl.hxx sw/inc/unotbl.hxx
-index c75e005..bed7e6a 100644
--- sw/inc/unotbl.hxx
+++ sw/inc/unotbl.hxx
@@ -214,14 +214,13 @@ typedef cppu::WeakImplHelper3<
@@ -7941,7 +7935,7 @@ index c75e005..bed7e6a 100644
,public OTextCursorHelper
{
SwDepend aCrsrDepend;
- SfxItemPropertySet aPropSet;
+ const SfxItemPropertySet* m_pPropSet;
- SwFrmFmt* GetFrmFmt() const { return (SwFrmFmt*)GetRegisteredIn(); }
// SwUnoCrsr* GetCrsr() const { return (SwUnoCrsr*)aCrsrDepend.GetRegisteredIn(); }
@@ -7955,30 +7949,6 @@ index c75e005..bed7e6a 100644
};
/*-----------------11.12.97 09:38-------------------
-diff --git sw/source/filter/ww8/ww8graf.cxx sw/source/filter/ww8/ww8graf.cxx
-index 6fdafff..2853bcc 100644
---- sw/source/filter/ww8/ww8graf.cxx
-+++ sw/source/filter/ww8/ww8graf.cxx
-@@ -2749,6 +2749,8 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp )
- if ( bMoveToBackgrd )
- aFlySet.Put(SvxOpaqueItem(RES_OPAQUE,false));
-
-+ String aObjName = pObject->GetName();
-+
- SwFrmFmt* pRetFrmFmt = 0;
- if (bReplaceable)
- {
-@@ -2834,6 +2836,10 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp )
- // <--
- if (!IsInlineEscherHack())
- MapWrapIntoFlyFmt(pRecord, pRetFrmFmt);
-+
-+ // Set frame name with object name
-+ if( aObjName.Len() )
-+ pRetFrmFmt->SetName( aObjName );
- return AddAutoAnchor(pRetFrmFmt);
- }
-
diff --git sw/source/filter/ww8/ww8par.cxx sw/source/filter/ww8/ww8par.cxx
index 65da983..90efd7b 100644
--- sw/source/filter/ww8/ww8par.cxx
commit 5e5d0495609d687e83819e7ff268de6cd9ab0ca7
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Wed Aug 12 08:50:46 2009 +0300
Adapt calc-vba-volatile-user-func.diff for dev300-m54
* patches/vba/calc-vba-volatile-user-func.diff: Adapt for dev300-m54.
diff --git a/patches/vba/calc-vba-volatile-user-func.diff b/patches/vba/calc-vba-volatile-user-func.diff
index e1192d3..685b6d9 100644
--- a/patches/vba/calc-vba-volatile-user-func.diff
+++ b/patches/vba/calc-vba-volatile-user-func.diff
@@ -116,8 +116,6 @@ index a0a1c1a..72e6409 100644
}
if (SC_OPCODE_START_NO_PAR <= eOp && eOp < SC_OPCODE_STOP_NO_PAR)
{
-diff --git sc/inc/document.hxx sc/inc/document.hxx
-index 407851d..5353a79 100644
--- sc/inc/document.hxx
+++ sc/inc/document.hxx
@@ -96,6 +96,7 @@ class ScDrawLayer;
@@ -134,9 +132,9 @@ index 407851d..5353a79 100644
::std::auto_ptr<ScExternalRefManager> pExternalRefMgr;
+ ::std::auto_ptr<ScMacroManager> mpMacroMgr;
+
- String aDocName; // opt: Dokumentname
- String aDocCodeName; // opt: Dokumentname
- ScRangePairListRef xColNameRanges;
+
+ // mutable for lazy construction
+ mutable ::std::auto_ptr< ScFormulaParserPool >
@@ -1510,6 +1513,7 @@ public:
SC_DLLPUBLIC ScLkUpdMode GetLinkMode() const { return eLinkMode ;}
void SetLinkMode( ScLkUpdMode nSet ) { eLinkMode = nSet;}
@@ -221,8 +219,6 @@ index 0000000..35a3b2d
+
+#endif
+
-diff --git sc/source/core/data/cell.cxx sc/source/core/data/cell.cxx
-index d28de5e..0e9a981 100644
--- sc/source/core/data/cell.cxx
+++ sc/source/core/data/cell.cxx
@@ -54,6 +54,7 @@
@@ -246,7 +242,7 @@ index d28de5e..0e9a981 100644
@@ -1721,6 +1725,36 @@ void ScFormulaCell::InterpretTail( ScInterpretTailParameter eTailParam )
// Reschedule verlangsamt das ganze erheblich, nur bei Prozentaenderung ausfuehren
ScProgress::GetInterpretProgress()->SetStateCountDownOnPercent(
- pDocument->GetFormulaCodeInTree() );
+ pDocument->GetFormulaCodeInTree()/MIN_NO_CODES_PER_PROGRESS_UPDATE );
+
+ switch (p->GetVolatileType())
+ {
@@ -280,8 +276,6 @@ index d28de5e..0e9a981 100644
}
else
{
-diff --git sc/source/core/data/documen2.cxx sc/source/core/data/documen2.cxx
-index 28b07af..33a9b80 100644
--- sc/source/core/data/documen2.cxx
+++ sc/source/core/data/documen2.cxx
@@ -96,6 +96,7 @@
@@ -290,12 +284,12 @@ index 28b07af..33a9b80 100644
#include "clipparam.hxx"
+#include "macromgr.hxx"
#include <com/sun/star/document/XVbaEventsHelper.hpp>
+ #include "formulaparserpool.hxx"
- // pImpl because including lookupcache.hxx in document.hxx isn't wanted, and
@@ -157,6 +158,7 @@ ScDocument::ScDocument( ScDocumentMode eMode,
+ pCacheFieldEditEngine( NULL ),
pDocProtection( NULL ),
mpClipParam( NULL ),
- pExternalRefMgr( NULL ),
+ mpMacroMgr( NULL ),
pViewOptions( NULL ),
pDocOptions( NULL ),
More information about the ooo-build-commit
mailing list