ooo-build r13425 - in branches/ooo-build-2-4-1: . patches/vba
- From: tml svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r13425 - in branches/ooo-build-2-4-1: . patches/vba
- Date: Tue, 29 Jul 2008 09:42:10 +0000 (UTC)
Author: tml
Date: Tue Jul 29 09:42:10 2008
New Revision: 13425
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13425&view=rev
Log:
2008-07-29 Tor Lillqvist <tml novell com>
Novell Edition Windows build OOo-2.4.1-9 at this point.
2008-07-29 Tor Lillqvist <tml novell com>
* patches/vba/vba-register-macro-fix.diff: Small change to fix
compilation error. Thanks to Noel and Fong.
Modified:
branches/ooo-build-2-4-1/ChangeLog
branches/ooo-build-2-4-1/patches/vba/vba-register-macro-fix.diff
Modified: branches/ooo-build-2-4-1/patches/vba/vba-register-macro-fix.diff
==============================================================================
--- branches/ooo-build-2-4-1/patches/vba/vba-register-macro-fix.diff (original)
+++ branches/ooo-build-2-4-1/patches/vba/vba-register-macro-fix.diff Tue Jul 29 09:42:10 2008
@@ -1,14 +1,12 @@
--- sc/source/filter/excel/xlocx.cxx.orig 2008-07-11 16:17:23.000000000 +0800
+++ sc/source/filter/excel/xlocx.cxx 2008-07-11 16:19:20.000000000 +0800
-@@ -363,7 +363,13 @@ void XclImpOcxConverter::RegisterOleMacr
+@@ -363,7 +363,11 @@ void XclImpOcxConverter::RegisterOleMacr
if ( rxModel.is() )
{
// Need to search basic for macro's named e.g. ControlButton1_Click
- OUString sSearchString = rOcxCtrlObj.GetObjectName();
+ String sObjectName = rOcxCtrlObj.GetObjectName();
-+ const XclImpRoot& rRoot = rOcxCtrlObj;
-+ XclImpObjectManager& rObjectManager = rRoot.GetObjectManager();
-+ String sOverRide( rObjectManager.GetOleNameOverride( rOcxCtrlObj.GetObjId() ) );
++ String sOverRide( GetObjectManager().GetOleNameOverride( rOcxCtrlObj.GetObjId() ) );
+ if ( sOverRide.Len() > 0 )
+ sObjectName = sOverRide;
+ OUString sSearchString = sObjectName;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]