Issue 86812 - to-be-DEV300_m2: svtools/source/uno/genericunodialog.cxx
Summary: to-be-DEV300_m2: svtools/source/uno/genericunodialog.cxx
Status: CLOSED FIXED
Alias: None
Product: Build Tools
Classification: Code
Component: code (show other issues)
Version: OOo 1.0.0
Hardware: All All
: P1 (highest) Trivial (vote)
Target Milestone: OOo 3.0
Assignee: Frank Schönheit
QA Contact: issues@tools
URL:
Keywords:
: 86835 86836 (view as issue list)
Depends on:
Blocks:
 
Reported: 2008-03-08 16:23 UTC by pavel
Modified: 2008-03-11 11:55 UTC (History)
3 users (show)

See Also:
Issue Type: PATCH
Latest Confirmation in: ---
Developer Difficulty: ---

Attachments
proper patch (1.01 KB, patch)
2008-03-09 21:45 UTC, Frank Schönheit 		no flags Details | Diff
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this issue.
Description pavel 2008-03-08 16:23:11 UTC 
ooo_DEV300_m2_src/svtools/source/uno/genericunodialog.cxx:93: error: class 
'svt::OGenericUnoDialog' does not have any field named 'm_xContext'

This helps

diff -urN ooo_DEV300_m2_src.orig/svtools/source/uno/genericunodialog.cxx 
ooo_DEV300_m2_src/svtools/source/uno/genericunodialog.cxx
--- ooo_DEV300_m2_src.orig/svtools/source/uno/genericunodialog.cxx      2008-03-08 
17:11:38.000000000 +0100
+++ ooo_DEV300_m2_src/svtools/source/uno/genericunodialog.cxx   2008-03-08 
17:12:01.000000000 +0100
@@ -90,7 +90,7 @@
         ,m_bInitialized( false )
         ,m_bNeedInitialization( false )
                ,m_xORB( _rxContext->getServiceManager(), UNO_QUERY_THROW )
-        ,m_xContext(_rxContext)
+//        ,m_xContext(_rxContext)
 {
        registerProperty(::rtl::OUString::createFromAscii(UNODIALOG_PROPERTY_TITLE), 
UNODIALOG_PROPERTY_ID_TITLE, PropertyAttribute::TRANSIENT,
                &m_sTitle, getCppuType(&m_sTitle));
Comment 1 pavel 2008-03-08 17:17:02 UTC 
Another problem:

/home/oo/BuildDir/ooo_DEV300_m2_src/extensions/source/propctrlr/MasterDetailLinkDialog.cxx:125: 
error: 'm_xContext' was not declared in this scope
Comment 2 pavel 2008-03-08 20:58:53 UTC 
Similar:

/home/oo/BuildDir/ooo_DEV300_m2_src/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx:125: 
error: 'm_xContext' was not declared in this scope
Comment 3 Frank Schönheit 2008-03-09 21:44:00 UTC 
Bad conincidence. CWS rptchart01 introduced a member m_xContext in
OGenericUnoDialog, CWS odbmacros2 moved the header file to from svtools/inc to
svtools/inc/svtools. Isn't it that intgration should have caught this? Be it.

The straight-forward solution would be to merge the changes 1.8->1.9 from
svtools/inc/genericunodialog.hxx to svtools/inc/svtools/genericunodialog.cxx.
Going to attach a patch, and to write an issue which addresses the problem I
have with this new member (which is why I said "straight-forward" - there could
be another patch which would also address this problem ...)
Comment 4 Frank Schönheit 2008-03-09 21:45:24 UTC 
Created attachment 51992 [details]
proper patch
Comment 5 Frank Schönheit 2008-03-09 21:45:54 UTC 
fs->kz: please assign the attached patch, it should fix the problem.
Comment 6 Frank Schönheit 2008-03-09 21:51:36 UTC 
for the record: issze 86850 is for cleaning up the m_xContext thingie.
Comment 7 oliver.bolte 2008-03-10 09:09:00 UTC 
reassign to mysef
Comment 8 oliver.bolte 2008-03-10 09:09:55 UTC 
fixed
Comment 9 oliver.bolte 2008-03-10 09:10:28 UTC 
@
Comment 10 oliver.bolte 2008-03-10 09:11:36 UTC 
->fs: verify, please
Comment 11 Frank Schönheit 2008-03-10 09:20:24 UTC 
found fix in svtools/inc/svtools/genericunodialog.hxx integrated on HEAD.
Comment 12 pavel 2008-03-11 11:48:40 UTC 
yes, closing.
Comment 13 rt 2008-03-11 11:52:13 UTC 
*** Issue 86835 has been marked as a duplicate of this issue. ***
Comment 14 rt 2008-03-11 11:55:29 UTC 
*** Issue 86836 has been marked as a duplicate of this issue. ***