Tag: cws_src680_oj14 User: oj Date: 2006/07/04 00:46:17 Modified: dba/dbaccess/source/ui/app/AppDetailView.cxx
Log: RESYNC: (1.15-1.17); FILE MERGED File Changes: Directory: /dba/dbaccess/source/ui/app/ ======================================= File [changed]: AppDetailView.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppDetailView.cxx?r1=1.12.4.4&r2=1.12.4.5 Delta lines: +8 -7 ------------------- --- AppDetailView.cxx 25 Apr 2006 13:00:33 -0000 1.12.4.4 +++ AppDetailView.cxx 4 Jul 2006 07:46:15 -0000 1.12.4.5 @@ -172,7 +172,6 @@ // try to let the focus rect start before the bitmap item - this looks better SvLBoxItem* pBitmapItem = _pEntry->GetFirstItem( SV_ITEM_ID_LBOXCONTEXTBMP ); - USHORT nTabPos = 0; SvLBoxTab* pTab = pBitmapItem ? GetTab( _pEntry, pBitmapItem ) : NULL; SvViewDataItem* pItemData = pBitmapItem ? GetViewDataItem( _pEntry, pBitmapItem ) : NULL; DBG_ASSERT( pTab && pItemData, "OCreationList::GetFocusRect: could not find the first bitmap item!" ); @@ -186,7 +185,7 @@ return aRect; } // ----------------------------------------------------------------------------- -void OCreationList::StartDrag( sal_Int8 _nAction, const Point& _rPosPixel ) +void OCreationList::StartDrag( sal_Int8 /*_nAction*/, const Point& /*_rPosPixel*/ ) { // don't give this to the base class, it does a ReleaseMouse as very first action // Though I think this is a bug (it should ReleaseMouse only if it is going to do @@ -440,7 +439,7 @@ m_aHelpText.SetText(String()); } // ----------------------------------------------------------------------------- -IMPL_LINK(OTasksWindow, OnEntrySelectHdl, SvTreeListBox*, _pTreeBox) +IMPL_LINK(OTasksWindow, OnEntrySelectHdl, SvTreeListBox*, /*_pTreeBox*/) { DBG_CHKTHIS(OTasksWindow,NULL); SvLBoxEntry* pEntry = m_aCreation.GetHdlEntry(); @@ -651,6 +650,9 @@ void OApplicationDetailView::createTablesPage(const Reference< XConnection>& _xConnection) { DBG_CHKTHIS(OApplicationDetailView,NULL); + + m_pControlHelper->createTablesPage(_xConnection); + TResourceStruct aList; aList.reserve(4); aList.push_back( TResourceStruct::value_type(ModuleRes(RID_STR_NEW_TABLE),TResourcePair(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DBNewTable")),RID_STR_TABLES_HELP_TEXT_DESIGN))); @@ -661,7 +663,6 @@ static_cast<OTasksWindow*>(m_aTasks.getChildWindow())->fillCreationNew( aList ); - m_pControlHelper->createTablesPage(_xConnection); m_aContainer.setTitle(RID_STR_TABLES_CONTAINER); Resize(); } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
