Apache OpenOffice (AOO) Bugzilla – Issue 87926
to-be-DEV300_m6: dbaccess mismerged?
Last modified: 2008-04-09 05:54:50 UTC
in to-be-m6, there are many strange compile issues. I suspect that the file inc/genericcontroller.hxx is mismerged... Please investigate. ... time passes ... yes: oo@octopus:~/BuildDir/ooo_DEV300_m6_src/dbaccess> grep -r "<<<<" * source/ui/misc/singledoccontroller.cxx~:<<<<<<< singledoccontroller.cxx source/ui/misc/singledoccontroller.cxx:<<<<<<< singledoccontroller.cxx oo@octopus:~/BuildDir/ooo_DEV300_m6_src/dbaccess>
Created attachment 52602 [details] suggested patch
Seems titles02 was somewhat old at time of integration (m1) ... Pavel, does the attached patch fix the problem?
Hi, Still a big breakage in dbaccess. If I'm not wrong, the is a last concerned module in DEV300_m6 after masterfixes from kz. Some issues in dbaccess/in/genericcontroller.hxx and source/ui/misc/singledoccontroller.cxx 1) Looks like there is a missing typedef ::cppu::WeakComponentImplHelper9 ... 2) some apparent confusion between OGenericUnoController_COMPBASE , OGenericUnoController_base and probably some other; ... etc. I'd vote for a resync issue ? FYI, the complete log of the breakage : DSHAREDLIB -D_DLL_ -fexceptions -fno-enforce-eh-specs -DEXCEPTIONS_ON -o ../../../unxmacxi.pro/slo/singledoccontroller.o /Users/ericb/Desktop/DEV300_m6/dbaccess/source/ui/misc/singledoccontroller.cxx ../../../inc/genericcontroller.hxx:208: error: expected class-name before ',' token ../../../inc/genericcontroller.hxx:209: error: expected class-name before ',' token ../../../inc/genericcontroller.hxx: In member function 'osl::Mutex& dbaui::OGenericUnoController::getMutex()': ../../../inc/genericcontroller.hxx:265: error: 'OGenericUnoController_MBASE' has not been declared ../../../inc/genericcontroller.hxx:265: error: 'm_aMutex' was not declared in this scope ../../../inc/genericcontroller.hxx: In member function 'cppu::OBroadcastHelper& dbaui::OGenericUnoController::getBroadcastHelper()': ../../../inc/genericcontroller.hxx:266: error: 'OGenericUnoController_Base' has not been declared ../../../inc/genericcontroller.hxx:266: error: 'rBHelper' was not declared in this scope /Users/ericb/Desktop/DEV300_m6/dbaccess/source/ui/misc/singledoccontroller.cxx: In member function 'virtual void dbaui::OSingleDocumentController::impl_initialize()': /Users/ericb/Desktop/DEV300_m6/dbaccess/source/ui/misc/singledoccontroller.cxx:235: error: 'XUntitledNumbers' was not declared in this scope /Users/ericb/Desktop/DEV300_m6/dbaccess/source/ui/misc/singledoccontroller.cxx:235: error: template argument 1 is invalid /Users/ericb/Desktop/DEV300_m6/dbaccess/source/ui/misc/singledoccontroller.cxx:235: error: invalid type in declaration before '(' token /Users/ericb/Desktop/DEV300_m6/dbaccess/source/ui/misc/singledoccontroller.cxx:235: error: initializer expression list treated as compound expression /Users/ericb/Desktop/DEV300_m6/dbaccess/source/ui/misc/singledoccontroller.cxx:237: error: request for member 'is' in 'xUntitledProvider', which is of non-class type 'int' /Users/ericb/Desktop/DEV300_m6/dbaccess/source/ui/misc/singledoccontroller.cxx:238: error: base operand of '->' is not a pointer /Users/ericb/Desktop/DEV300_m6/dbaccess/source/ui/misc/singledoccontroller.cxx:238: error: expected type-specifier before 'XWeak' /Users/ericb/Desktop/DEV300_m6/dbaccess/source/ui/misc/singledoccontroller.cxx:238: error: expected `>' before 'XWeak' /Users/ericb/Desktop/DEV300_m6/dbaccess/source/ui/misc/singledoccontroller.cxx:238: error: expected `(' before 'XWeak' /Users/ericb/Desktop/DEV300_m6/dbaccess/source/ui/misc/singledoccontroller.cxx:238: error: 'XWeak' was not declared in this scope /Users/ericb/Desktop/DEV300_m6/dbaccess/source/ui/misc/singledoccontroller.cxx:238: error: expected primary-expression before '>' token /Users/ericb/Desktop/DEV300_m6/dbaccess/source/ui/misc/singledoccontroller.cxx: In member function 'virtual com::sun::star::uno::Reference<com::sun::star::document::XEmbeddedScripts> dbaui::OSingleDocumentController::getScriptContainer()': /Users/ericb/Desktop/DEV300_m6/dbaccess/source/ui/misc/singledoccontroller.cxx:655: error: 'm_aMutex' was not declared in this scope /Users/ericb/Desktop/DEV300_m6/dbaccess/source/ui/misc/singledoccontroller.cxx: At global scope: /Users/ericb/Desktop/DEV300_m6/dbaccess/source/ui/misc/singledoccontroller.cxx:663: error: 'uno' has not been declared /Users/ericb/Desktop/DEV300_m6/dbaccess/source/ui/misc/singledoccontroller.cxx:663: error: 'frame' has not been declared /Users/ericb/Desktop/DEV300_m6/dbaccess/source/ui/misc/singledoccontroller.cxx:671: error: 'uno' has not been declared /Users/ericb/Desktop/DEV300_m6/dbaccess/source/ui/misc/singledoccontroller.cxx: In member function 'virtual rtl::OUString dbaui::OSingleDocumentController::getTitle()': /Users/ericb/Desktop/DEV300_m6/dbaccess/source/ui/misc/singledoccontroller.cxx:673: error: 'm_aMutex' was not declared in this scope /Users/ericb/Desktop/DEV300_m6/dbaccess/source/ui/misc/singledoccontroller.cxx:678: error: 'XTitle' was not declared in this scope /Users/ericb/Desktop/DEV300_m6/dbaccess/source/ui/misc/singledoccontroller.cxx:678: error: template argument 1 is invalid /Users/ericb/Desktop/DEV300_m6/dbaccess/source/ui/misc/singledoccontroller.cxx:678: error: invalid type in declaration before '(' token /Users/ericb/Desktop/DEV300_m6/dbaccess/source/ui/misc/singledoccontroller.cxx:678: error: 'uno' has not been declared /Users/ericb/Desktop/DEV300_m6/dbaccess/source/ui/misc/singledoccontroller.cxx:678: error: initializer expression list treated as compound expression /Users/ericb/Desktop/DEV300_m6/dbaccess/source/ui/misc/singledoccontroller.cxx:679: error: request for member 'is' in 'xTitle', which is of non-class type 'int' /Users/ericb/Desktop/DEV300_m6/dbaccess/source/ui/misc/singledoccontroller.cxx:681: error: base operand of '->' is not a pointer dmake: Error code 1, while making '../../../unxmacxi.pro/slo/singledoccontroller.obj' ERROR: Error 65280 occurred while making /Users/ericb/Desktop/DEV300_m6/dbaccess/source/ui/misc HTH
The other breakage is addressed in issue 88015, see my comments there. I'm working on a fix.
fs->kz: please set to FIXED when you committed all our changes. Thanks.
.
Verified, closing.