diff options
Diffstat (limited to 'extensions/source/bibliography')
| -rw-r--r-- | extensions/source/bibliography/bib.hrc | 3 | ||||
| -rw-r--r-- | extensions/source/bibliography/bibconfig.cxx | 22 | ||||
| -rw-r--r-- | extensions/source/bibliography/bibconfig.hxx | 2 | ||||
| -rw-r--r-- | extensions/source/bibliography/bibload.cxx | 38 | ||||
| -rw-r--r-- | extensions/source/bibliography/bibview.cxx | 14 | ||||
| -rw-r--r-- | extensions/source/bibliography/datman.cxx | 87 | ||||
| -rw-r--r-- | extensions/source/bibliography/formcontrolcontainer.cxx | 22 | ||||
| -rw-r--r-- | extensions/source/bibliography/framectr.cxx | 32 | ||||
| -rw-r--r-- | extensions/source/bibliography/general.cxx | 22 | ||||
| -rw-r--r-- | extensions/source/bibliography/toolbar.cxx | 21 | ||||
| -rw-r--r-- | extensions/source/bibliography/toolbar.hxx | 3 | ||||
| -rw-r--r-- | extensions/source/bibliography/toolbar.src | 13 |
12 files changed, 25 insertions, 254 deletions
diff --git a/extensions/source/bibliography/bib.hrc b/extensions/source/bibliography/bib.hrc index eb6afcb44..09b98992c 100644 --- a/extensions/source/bibliography/bib.hrc +++ b/extensions/source/bibliography/bib.hrc @@ -45,9 +45,8 @@ #define RID_BIB_CONTROLS (RID_BIB_START + 100) #define RID_BIB_TOOLBAR (RID_BIB_CONTROLS+ 1) #define RID_TOOLBAR_IMGLIST (RID_BIB_CONTROLS+ 2) -#define RID_TOOLBAR_IMGLIST_HC (RID_BIB_CONTROLS+ 3) +// free #define RID_TOOLBAR_BIGIMGLIST (RID_BIB_CONTROLS+ 4) -#define RID_TOOLBAR_BIGIMGLIST_HC (RID_BIB_CONTROLS+ 5) //Menu(100) #define RID_BIB_MENU (RID_BIB_CONTROLS + 100) diff --git a/extensions/source/bibliography/bibconfig.cxx b/extensions/source/bibliography/bibconfig.cxx index adf7ef75c..849d2b1fa 100644 --- a/extensions/source/bibliography/bibconfig.cxx +++ b/extensions/source/bibliography/bibconfig.cxx @@ -44,9 +44,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; -/* -----------------11.11.99 14:34------------------- - --------------------------------------------------*/ typedef Mapping* MappingPtr; SV_DECL_PTRARR_DEL(MappingArray, MappingPtr, 2, 2) SV_IMPL_PTRARR(MappingArray, MappingPtr); @@ -54,9 +52,7 @@ SV_IMPL_PTRARR(MappingArray, MappingPtr); #define C2U(cChar) OUString::createFromAscii(cChar) const char* cDataSourceHistory = "DataSourceHistory"; -/* -----------------------------13.11.00 12:21-------------------------------- - ---------------------------------------------------------------------------*/ Sequence<OUString> BibConfig::GetPropertyNames() { static Sequence<OUString> aNames; @@ -75,9 +71,7 @@ Sequence<OUString> BibConfig::GetPropertyNames() } return aNames; } -/* -----------------------------13.11.00 11:00-------------------------------- - ---------------------------------------------------------------------------*/ BibConfig::BibConfig() : ConfigItem(C2U("Office.DataAccess/Bibliography"), CONFIG_MODE_DELAYED_UPDATE), pMappingsArr(new MappingArray), @@ -211,18 +205,14 @@ BibConfig::BibConfig() : } } } -/* -----------------------------13.11.00 11:00-------------------------------- - ---------------------------------------------------------------------------*/ BibConfig::~BibConfig() { if(IsModified()) Commit(); delete pMappingsArr; } -/* -----------------------------13.11.00 12:08-------------------------------- - ---------------------------------------------------------------------------*/ BibDBDescriptor BibConfig::GetBibliographyURL() { BibDBDescriptor aRet; @@ -231,9 +221,7 @@ BibDBDescriptor BibConfig::GetBibliographyURL() aRet.nCommandType = nTblOrQuery; return aRet; }; -/* -----------------------------13.11.00 12:20-------------------------------- - ---------------------------------------------------------------------------*/ void BibConfig::SetBibliographyURL(const BibDBDescriptor& rDesc) { sDataSource = rDesc.sDataSource; @@ -321,9 +309,7 @@ void BibConfig::Commit() } } } -/* -----------------------------13.11.00 12:23-------------------------------- - ---------------------------------------------------------------------------*/ const Mapping* BibConfig::GetMapping(const BibDBDescriptor& rDesc) const { for(sal_uInt16 i = 0; i < pMappingsArr->Count(); i++) @@ -335,9 +321,7 @@ const Mapping* BibConfig::GetMapping(const BibDBDescriptor& rDesc) const } return 0; } -/* -----------------------------13.11.00 12:23-------------------------------- - ---------------------------------------------------------------------------*/ void BibConfig::SetMapping(const BibDBDescriptor& rDesc, const Mapping* pSetMapping) { for(sal_uInt16 i = 0; i < pMappingsArr->Count(); i++) @@ -354,21 +338,15 @@ void BibConfig::SetMapping(const BibDBDescriptor& rDesc, const Mapping* pSetMapp pMappingsArr->Insert(pNew, pMappingsArr->Count()); SetModified(); } -/* -----------------------------20.11.00 11:56-------------------------------- - ---------------------------------------------------------------------------*/ DBChangeDialogConfig_Impl::DBChangeDialogConfig_Impl() { } -/* -----------------------------20.11.00 11:57-------------------------------- - ---------------------------------------------------------------------------*/ DBChangeDialogConfig_Impl::~DBChangeDialogConfig_Impl() { } -/* -----------------------------14.03.01 12:53-------------------------------- - ---------------------------------------------------------------------------*/ const Sequence<OUString>& DBChangeDialogConfig_Impl::GetDataSourceNames() { if(!aSourceNames.getLength()) diff --git a/extensions/source/bibliography/bibconfig.hxx b/extensions/source/bibliography/bibconfig.hxx index 18af8fed5..dd18549af 100644 --- a/extensions/source/bibliography/bibconfig.hxx +++ b/extensions/source/bibliography/bibconfig.hxx @@ -140,9 +140,7 @@ public: void SetShowColumnAssignmentWarning(sal_Bool bSet) { bShowColumnAssignmentWarning = bSet;} }; -/* -----------------------------20.11.00 11:47-------------------------------- - ---------------------------------------------------------------------------*/ class DBChangeDialogConfig_Impl { com::sun::star::uno::Sequence<rtl::OUString> aSourceNames; diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx index 776f50a03..a64d63467 100644 --- a/extensions/source/bibliography/bibload.cxx +++ b/extensions/source/bibliography/bibload.cxx @@ -227,13 +227,12 @@ extern "C" { try { - rtl::OUString sKey = rtl::OUString::createFromAscii("/"); + rtl::OUString sKey(RTL_CONSTASCII_USTRINGPARAM("/")); sKey += BibliographyLoader::getImplementationName_Static(); //creates the impl key: /com.sun.star.extensions.Bibliography Reference< registry::XRegistryKey > xImplKey = pRegistryKey->createKey(sKey); - //sKey += rtl::OUString::createFromAscii("/UNO/SERVICES"); Reference< registry::XRegistryKey > xNewKey = xImplKey->createKey( C2U("/UNO/SERVICES") ); Sequence< rtl::OUString > aServices = BibliographyLoader::getSupportedServiceNames_Static(); for( INT32 i = 0; i < aServices.getLength(); i++ ) @@ -411,9 +410,7 @@ void BibliographyLoader::loadView(const Reference< XFrame > & rFrame, const rtl: if ( xLayoutManager.is() ) xLayoutManager->createElement( OUString( RTL_CONSTASCII_USTRINGPARAM( "private:resource/menubar/menubar" ))); } -/* -----------------06.12.99 14:37------------------- - --------------------------------------------------*/ BibDataManager* BibliographyLoader::GetDataManager()const { if(!m_pDatMan) @@ -425,9 +422,7 @@ BibDataManager* BibliographyLoader::GetDataManager()const } return m_pDatMan; } -/* -----------------06.12.99 14:39------------------- - --------------------------------------------------*/ Reference< XNameAccess > BibliographyLoader::GetDataColumns() const { if (!m_xColumns.is()) @@ -483,9 +478,7 @@ Reference< XNameAccess > BibliographyLoader::GetDataColumns() const return m_xColumns; } -/* -----------------17.12.99 12:29------------------- - --------------------------------------------------*/ Reference< sdb::XColumn > BibliographyLoader::GetIdentifierColumn() const { BibDataManager* pDatMan = GetDataManager(); @@ -501,9 +494,6 @@ Reference< sdb::XColumn > BibliographyLoader::GetIdentifierColumn() const return xReturn; } -/* -----------------06.12.99 15:05------------------- - - --------------------------------------------------*/ Reference< XResultSet > BibliographyLoader::GetDataCursor() const { if (!m_xCursor.is()) @@ -513,9 +503,6 @@ Reference< XResultSet > BibliographyLoader::GetDataCursor() const return m_xCursor; } -/*-- 17.11.99 12:51:38--------------------------------------------------- - - -----------------------------------------------------------------------*/ rtl::OUString lcl_AddProperty(Reference< XNameAccess > xColumns, const Mapping* pMapping, const String& rColumnName) { @@ -595,9 +582,7 @@ Any BibliographyLoader::getByName(const rtl::OUString& rName) throw } return aRet; } -/*-- 17.11.99 12:51:39--------------------------------------------------- - -----------------------------------------------------------------------*/ Sequence< rtl::OUString > BibliographyLoader::getElementNames(void) throw ( RuntimeException ) { Sequence< rtl::OUString > aRet(10); @@ -632,9 +617,7 @@ Sequence< rtl::OUString > BibliographyLoader::getElementNames(void) throw ( Runt aRet.realloc(nRealNameCount); return aRet; } -/*-- 17.11.99 12:51:39--------------------------------------------------- - -----------------------------------------------------------------------*/ sal_Bool BibliographyLoader::hasByName(const rtl::OUString& rName) throw ( RuntimeException ) { sal_Bool bRet = sal_False; @@ -663,16 +646,12 @@ sal_Bool BibliographyLoader::hasByName(const rtl::OUString& rName) throw ( Runti } return bRet; } -/*-- 17.11.99 12:51:39--------------------------------------------------- - -----------------------------------------------------------------------*/ Type BibliographyLoader::getElementType(void) throw ( RuntimeException ) { return ::getCppuType((Sequence<PropertyValue>*)0); } -/*-- 17.11.99 12:51:40--------------------------------------------------- - -----------------------------------------------------------------------*/ sal_Bool BibliographyLoader::hasElements(void) throw ( RuntimeException ) { Reference< XResultSet > xCursor = GetDataCursor(); @@ -680,9 +659,6 @@ sal_Bool BibliographyLoader::hasElements(void) throw ( RuntimeException ) return xColumns.is() && (xColumns->getElementNames().getLength() != 0); } -/*-- 07.12.99 14:28:39--------------------------------------------------- - - -----------------------------------------------------------------------*/ Reference< XPropertySetInfo > BibliographyLoader::getPropertySetInfo(void) throw ( RuntimeException ) { @@ -695,9 +671,7 @@ Reference< XPropertySetInfo > BibliographyLoader::getPropertySetInfo(void) thro SfxItemPropertySet(aBibProps_Impl).getPropertySetInfo(); return xRet; } -/*-- 07.12.99 14:28:39--------------------------------------------------- - -----------------------------------------------------------------------*/ void BibliographyLoader::setPropertyValue(const rtl::OUString& /*PropertyName*/, const Any& /*aValue*/) throw( UnknownPropertyException, PropertyVetoException, @@ -706,9 +680,7 @@ void BibliographyLoader::setPropertyValue(const rtl::OUString& /*PropertyName*/, throw UnknownPropertyException(); //no changeable properties } -/*-- 07.12.99 14:28:39--------------------------------------------------- - -----------------------------------------------------------------------*/ Any BibliographyLoader::getPropertyValue(const rtl::OUString& rPropertyName) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ) { @@ -763,36 +735,28 @@ Any BibliographyLoader::getPropertyValue(const rtl::OUString& rPropertyName) throw UnknownPropertyException(); return aRet; } -/*-- 07.12.99 14:28:40--------------------------------------------------- - -----------------------------------------------------------------------*/ void BibliographyLoader::addPropertyChangeListener( const rtl::OUString& /*PropertyName*/, const Reference< XPropertyChangeListener > & /*aListener*/) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ) { //no bound properties } -/*-- 07.12.99 14:28:40--------------------------------------------------- - -----------------------------------------------------------------------*/ void BibliographyLoader::removePropertyChangeListener( const rtl::OUString& /*PropertyName*/, const Reference< XPropertyChangeListener > & /*aListener*/) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ) { //no bound properties } -/*-- 07.12.99 14:28:40--------------------------------------------------- - -----------------------------------------------------------------------*/ void BibliographyLoader::addVetoableChangeListener( const rtl::OUString& /*PropertyName*/, const Reference< XVetoableChangeListener > & /*aListener*/) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ) { //no vetoable properties } -/*-- 07.12.99 14:28:40--------------------------------------------------- - -----------------------------------------------------------------------*/ void BibliographyLoader::removeVetoableChangeListener( const rtl::OUString& /*PropertyName*/, const Reference< XVetoableChangeListener > & /*aListener*/) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ) diff --git a/extensions/source/bibliography/bibview.cxx b/extensions/source/bibliography/bibview.cxx index 44c94cb1a..317afaf54 100644 --- a/extensions/source/bibliography/bibview.cxx +++ b/extensions/source/bibliography/bibview.cxx @@ -32,7 +32,6 @@ #include "bib.hrc" #include "bibcont.hxx" #include "bibbeam.hxx" -#include "bibmod.hxx" #include "general.hxx" #include "bibview.hxx" #include "datman.hxx" @@ -114,9 +113,6 @@ namespace bib m_xGeneralPage = NULL; } - /* -----------------16.11.99 13:13------------------- - - --------------------------------------------------*/ void BibView::UpdatePages() { // TODO: @@ -168,8 +164,6 @@ namespace bib } } } - //--------------------------------------------------------------------- - //--- 19.10.01 16:55:49 ----------------------------------------------- void BibView::_loaded( const EventObject& _rEvent ) { @@ -183,17 +177,12 @@ namespace bib FormControlContainer::_loaded( _rEvent ); } - /* -----------------------------02.02.00 16:49-------------------------------- - - ---------------------------------------------------------------------------*/ IMPL_STATIC_LINK( BibView, CallMappingHdl, BibView*, EMPTYARG ) { pThis->m_pDatMan->CreateMappingDialog( pThis ); return 0; } - /* -----------------------------13.04.00 16:12-------------------------------- - ---------------------------------------------------------------------------*/ void BibView::Resize() { if ( m_pGeneralPage ) @@ -204,9 +193,6 @@ namespace bib Window::Resize(); } - //--------------------------------------------------------------------- - //--- 18.10.01 18:52:45 ----------------------------------------------- - Reference< awt::XControlContainer > BibView::getControlContainer() { Reference< awt::XControlContainer > xReturn; diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx index 1290431f7..1b3ef90e5 100644 --- a/extensions/source/bibliography/datman.cxx +++ b/extensions/source/bibliography/datman.cxx @@ -64,7 +64,6 @@ #include <svtools/headbar.hxx> #include <vcl/dialog.hxx> #include <vcl/button.hxx> -#include <vcl/lstbox.hxx> #include <vcl/fixed.hxx> #include <vcl/group.hxx> #include <vcl/lstbox.hxx> @@ -76,7 +75,6 @@ #include "bibmod.hxx" #include "bibview.hxx" // #100312# --------- -#include "bibbeam.hxx" #include "bibprop.hrc" #include "toolbar.hxx" #include "toolbar.hrc" @@ -105,10 +103,6 @@ using namespace ::ucb; #define MAP_TOKEN ';' #define PAIR_TOKEN ':' - -/* -----------------17.01.00 14:38------------------- - - --------------------------------------------------*/ Reference< XConnection > getConnection(const ::rtl::OUString& _rURL) { // first get the sdb::DataSource corresponding to the url @@ -138,19 +132,12 @@ Reference< XConnection > getConnection(const ::rtl::OUString& _rURL) ::rtl::OUString sUser, sPwd; Reference< XPropertySet > xDataSourceProps(xDataSource, UNO_QUERY); Reference< XCompletedConnection > xComplConn(xDataSource, UNO_QUERY); -/* Reference< XPropertySetInfo > xInfo = xDataSourceProps.is() ? xDataSourceProps->getPropertySetInfo() : Reference< XPropertySetInfo > (); - if (xInfo.is() && xInfo->hasPropertyByName(C2U("User"))) - xDataSourceProps->getPropertyValue(C2U("User")) >>= sUser; - if (xInfo.is() && xInfo->hasPropertyByName(C2U("Password"))) - xDataSourceProps->getPropertyValue(C2U("Password"))>>= sPwd; -*/ try { Reference<XInterface> xHdl = xMgr->createInstance(C2U("com.sun.star.task.InteractionHandler")); Reference<task::XInteractionHandler> xIHdl(xHdl, UNO_QUERY); xConn = xComplConn->connectWithCompletion(xIHdl); -// xConn = xDataSource->getConnection(sUser, sPwd); } catch(SQLException&) { @@ -165,9 +152,6 @@ Reference< XConnection > getConnection(const ::rtl::OUString& _rURL) return xConn; } -/* -----------------17.01.00 14:46------------------- - - --------------------------------------------------*/ Reference< XConnection > getConnection(const Reference< XInterface > & xRowSet) { Reference< XConnection > xConn; @@ -191,9 +175,7 @@ Reference< XConnection > getConnection(const Reference< XInterface > & xRowSet) return xConn; } -/* -----------------17.01.00 16:07------------------- - --------------------------------------------------*/ Reference< XNameAccess > getColumns(const Reference< XForm > & _rxForm) { Reference< XNameAccess > xReturn; @@ -242,9 +224,6 @@ Reference< XNameAccess > getColumns(const Reference< XForm > & _rxForm) return xReturn; } -/* -----------------11.11.99 15:54------------------- - - --------------------------------------------------*/ class MappingDialog_Impl : public ModalDialog { BibDataManager* pDatMan; @@ -331,9 +310,7 @@ public: void SetModified() {bModified = TRUE;} }; -/* -----------------11.11.99 16:42------------------- - --------------------------------------------------*/ sal_uInt16 lcl_FindLogicalName(BibConfig* pConfig , const ::rtl::OUString& rLogicalColumnName) { @@ -532,14 +509,10 @@ MappingDialog_Impl::MappingDialog_Impl(Window* pParent, BibDataManager* pMan) : } } } -/* -----------------11.11.99 16:44------------------- - --------------------------------------------------*/ MappingDialog_Impl::~MappingDialog_Impl() {} -/* -----------------15.11.99 10:38------------------- - --------------------------------------------------*/ IMPL_LINK(MappingDialog_Impl, ListBoxSelectHdl, ListBox*, pListBox) { sal_uInt16 nEntryPos = pListBox->GetSelectEntryPos(); @@ -554,9 +527,7 @@ IMPL_LINK(MappingDialog_Impl, ListBoxSelectHdl, ListBox*, pListBox) SetModified(); return 0; } -/* -----------------12.11.99 14:50------------------- - --------------------------------------------------*/ IMPL_LINK(MappingDialog_Impl, OkHdl, OKButton*, EMPTYARG) { if(bModified) @@ -587,9 +558,7 @@ IMPL_LINK(MappingDialog_Impl, OkHdl, OKButton*, EMPTYARG) EndDialog(bModified ? RET_OK : RET_CANCEL); return 0; } -/* -----------------18.11.99 10:23------------------- - --------------------------------------------------*/ class DBChangeDialog_Impl : public ModalDialog { OKButton aOKBT; @@ -604,7 +573,6 @@ class DBChangeDialog_Impl : public ModalDialog BibDataManager* pDatMan; -// DECL_LINK(EndDragHdl, HeaderBar*); DECL_LINK(DoubleClickHdl, SvTabListBox*); public: DBChangeDialog_Impl(Window* pParent, BibDataManager* pMan ); @@ -613,9 +581,6 @@ public: String GetCurrentURL()const; }; -/*-- 18.11.99 10:35:20--------------------------------------------------- - - -----------------------------------------------------------------------*/ DBChangeDialog_Impl::DBChangeDialog_Impl(Window* pParent, BibDataManager* pMan ) : ModalDialog(pParent, BibResId(RID_DLG_DBCHANGE) ), aOKBT(this, BibResId( BT_OK )), @@ -669,36 +634,17 @@ DBChangeDialog_Impl::DBChangeDialog_Impl(Window* pParent, BibDataManager* pMan ) } -/* -----------------06.12.99 12:09------------------- - --------------------------------------------------*/ IMPL_LINK(DBChangeDialog_Impl, DoubleClickHdl, SvTabListBox*, /*pLB*/) { EndDialog(RET_OK); return 0; } -/* -----------------18.11.99 11:17------------------- - --------------------------------------------------*/ -/*IMPL_LINK(DBChangeDialog_Impl, EndDragHdl, HeaderBar*, pHB) -{ - long nTabs[3]; - nTabs[0] = 2;// Number of Tabs - nTabs[1] = 0; - nTabs[2] = pHB->GetItemSize( 1 ); - aSelectionLB.SetTabs( &nTabs[0], MAP_PIXEL ); - return 0; -};*/ - -/*-- 18.11.99 10:35:20--------------------------------------------------- - - -----------------------------------------------------------------------*/ DBChangeDialog_Impl::~DBChangeDialog_Impl() { } -/* -----------------18.11.99 12:36------------------- - --------------------------------------------------*/ String DBChangeDialog_Impl::GetCurrentURL()const { String sRet; @@ -710,7 +656,6 @@ String DBChangeDialog_Impl::GetCurrentURL()const return sRet; } -// #100312# -------------------------------------------------------------------- // XDispatchProvider BibInterceptorHelper::BibInterceptorHelper( ::bib::BibBeamer* pBibBeamer, ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDispatch) { @@ -796,7 +741,6 @@ void SAL_CALL BibInterceptorHelper::setMasterDispatchProvider( const ::com::sun: BibDataManager::BibDataManager() :BibDataManager_Base( GetMutex() ) - // #100312# -------------- ,m_pInterceptorHelper( NULL ) ,m_aLoadListeners(m_aMutex) ,pBibView( NULL ) @@ -825,7 +769,6 @@ BibDataManager::~BibDataManager() xConnection->dispose(); m_xForm = NULL; } - // #100312# ---------------- if( m_pInterceptorHelper ) { m_pInterceptorHelper->ReleaseInterceptor(); @@ -944,9 +887,6 @@ Reference< awt::XControlModel > BibDataManager::updateGridModel(const Reference< m_xGridModel = createGridModel( gGridName ); Reference< XNameContainer > xNameCont(xDbForm, UNO_QUERY); -// if (xNameCont->hasByName(sName)) -// xNameCont->removeByName(sName); -// xNameCont->insertByName( sName, makeAny( m_xGridModel ) ); } @@ -1163,9 +1103,7 @@ void BibDataManager::startQueryWith(const ::rtl::OUString& rQuery) } setFilter(aQueryString); } -/* -----------------03.12.99 15:05------------------- - --------------------------------------------------*/ void BibDataManager::setActiveDataSource(const ::rtl::OUString& rURL) { ::rtl::OUString uTable; @@ -1435,7 +1373,7 @@ Reference< awt::XControlModel > BibDataManager::createGridModel(const ::rtl::OUS Reference< XPropertySetInfo > xPropInfo = xPropSet->getPropertySetInfo(); if (xPropInfo->hasPropertyByName(uProp)) { - ::rtl::OUString sId = ::rtl::OUString::createFromAscii( "HID:" ); + ::rtl::OUString sId(RTL_CONSTASCII_USTRINGPARAM( "HID:" )); sId += ::rtl::OUString::valueOf( (sal_Int32) HID_BIB_DB_GRIDCTRL ); xPropSet->setPropertyValue( uProp, makeAny( ::rtl::OUString( sId ) ) ); } @@ -1549,7 +1487,6 @@ Reference< awt::XControlModel > BibDataManager::loadControlModel( // (as an anologon to the XStatusListener semantics). // // But this would be way too risky for this last-day fix here. - // 97140 - 30.01.2002 - fs@openoffice.org Reference< XLoadable > xLoad( m_xForm, UNO_QUERY ); if ( xLoad.is() && xLoad->isLoaded() ) { @@ -1587,7 +1524,6 @@ void BibDataManager::propertyChange(const beans::PropertyChangeEvent& evt) throw { try { - sal_Bool bFlag=sal_False; if(evt.PropertyName == FM_PROP_VALUE) { if( evt.NewValue.getValueType() == ::getCppuType((Reference<io::XInputStream>*)0) ) @@ -1601,7 +1537,7 @@ void BibDataManager::propertyChange(const beans::PropertyChangeEvent& evt) throw Reference< XRowLocate > xLocate(xBibCursor, UNO_QUERY); DBG_ASSERT(xLocate.is(), "BibDataManager::propertyChange : invalid cursor !"); - bFlag = xLocate->moveToBookmark(aUID); + xLocate->moveToBookmark(aUID); } } catch(Exception& e ) @@ -1703,18 +1639,13 @@ catch(Exception& e ) } -/* -----------------11.11.99 15:51------------------- - --------------------------------------------------*/ void BibDataManager::CreateMappingDialog(Window* pParent) { MappingDialog_Impl* pDlg = new MappingDialog_Impl(pParent, this); if(RET_OK == pDlg->Execute() && pBibView) { reload(); -// unload(); -// pBibView->UpdatePages(); -// load(); } delete pDlg; } @@ -1736,17 +1667,13 @@ void BibDataManager::CreateMappingDialog(Window* pParent) delete pDlg; return uRet; } -/*-- 18.05.2004 15:20:15--------------------------------------------------- - -----------------------------------------------------------------------*/ void BibDataManager::DispatchDBChangeDialog() { if(pToolbar) pToolbar->SendDispatch(TBC_BT_CHANGESOURCE, Sequence< PropertyValue >()); } -/* -----------------06.12.99 15:11------------------- - --------------------------------------------------*/ const ::rtl::OUString& BibDataManager::GetIdentifierMapping() { if(!sIdentifierMapping.getLength()) @@ -1772,18 +1699,14 @@ const ::rtl::OUString& BibDataManager::GetIdentifierMapping() } return sIdentifierMapping; } -/* -----------------------------20.11.00 10:31-------------------------------- - ---------------------------------------------------------------------------*/ void BibDataManager::SetToolbar(BibToolBar* pSet) { pToolbar = pSet; if(pToolbar) pToolbar->SetDatMan(*this); } -/* -----------------------------08.05.2002 09:26------------------------------ - ---------------------------------------------------------------------------*/ uno::Reference< form::runtime::XFormController > BibDataManager::GetFormController() { if(!m_xFormCtrl.is()) @@ -1792,13 +1715,11 @@ uno::Reference< form::runtime::XFormController > BibDataManager::GetFormControll m_xFormCtrl = uno::Reference< form::runtime::XFormController > ( xMgr->createInstance(C2U("com.sun.star.form.runtime.FormController")), UNO_QUERY); m_xFormCtrl->setModel(uno::Reference< awt::XTabControllerModel > (getForm(), UNO_QUERY)); - // #100312# ------------- m_xFormDispatch = uno::Reference< frame::XDispatch > ( m_xFormCtrl, UNO_QUERY); } return m_xFormCtrl; } -// #100312# ---------- void BibDataManager::RegisterInterceptor( ::bib::BibBeamer* pBibBeamer) { DBG_ASSERT( !m_pInterceptorHelper, "BibDataManager::RegisterInterceptor: called twice!" ); @@ -1809,9 +1730,7 @@ void BibDataManager::RegisterInterceptor( ::bib::BibBeamer* pBibBeamer) m_pInterceptorHelper->acquire(); } -/*-- 18.05.2004 17:04:20--------------------------------------------------- - -----------------------------------------------------------------------*/ sal_Bool BibDataManager::HasActiveConnection()const { sal_Bool bRet = sal_False; @@ -1824,9 +1743,7 @@ sal_Bool BibDataManager::HasActiveConnection()const } return bRet; } -/*-- 04.06.2004 14:37:29--------------------------------------------------- - -----------------------------------------------------------------------*/ sal_Bool BibDataManager::HasActiveConnection() { return getConnection( m_xForm ).is(); diff --git a/extensions/source/bibliography/formcontrolcontainer.cxx b/extensions/source/bibliography/formcontrolcontainer.cxx index 22ee46485..8794a5b19 100644 --- a/extensions/source/bibliography/formcontrolcontainer.cxx +++ b/extensions/source/bibliography/formcontrolcontainer.cxx @@ -54,8 +54,6 @@ namespace bib { } - //--------------------------------------------------------------------- - //--- 18.10.01 18:54:57 ----------------------------------------------- FormControlContainer::~FormControlContainer( ) { DBG_ASSERT( !isFormConnected(), "FormControlContainer::~FormControlContainer: you should disconnect in your derived class!" ); @@ -63,8 +61,6 @@ namespace bib disconnectForm(); } - //--------------------------------------------------------------------- - //--- 18.10.01 17:03:14 ----------------------------------------------- void FormControlContainer::disconnectForm() { ::osl::MutexGuard aGuard( m_aMutex ); @@ -77,8 +73,6 @@ namespace bib } } - //--------------------------------------------------------------------- - //--- 18.10.01 16:56:01 ----------------------------------------------- void FormControlContainer::connectForm( const Reference< XLoadable >& _rxForm ) { DBG_ASSERT( !isFormConnected(), "FormControlContainer::connectForm: already connected!" ); @@ -96,8 +90,6 @@ namespace bib m_xForm = _rxForm; } - //--------------------------------------------------------------------- - //--- 18.10.01 18:50:14 ----------------------------------------------- struct ControlModeSwitch : public ::std::unary_function< Reference< XControl >, void > { sal_Bool bDesign; @@ -110,8 +102,6 @@ namespace bib } }; - //--------------------------------------------------------------------- - //--- 18.10.01 18:49:57 ----------------------------------------------- void FormControlContainer::implSetDesignMode( sal_Bool _bDesign ) { try @@ -134,42 +124,30 @@ namespace bib } } - //--------------------------------------------------------------------- - //--- 18.10.01 18:16:54 ----------------------------------------------- void FormControlContainer::ensureDesignMode() { implSetDesignMode( !m_xForm.is() || !m_xForm->isLoaded() ); } - //--------------------------------------------------------------------- - //--- 18.10.01 16:45:33 ----------------------------------------------- void FormControlContainer::_loaded( const ::com::sun::star::lang::EventObject& /*_rEvent*/ ) { implSetDesignMode( sal_False ); } - //--------------------------------------------------------------------- - //--- 18.10.01 16:45:35 ----------------------------------------------- void FormControlContainer::_unloading( const ::com::sun::star::lang::EventObject& /*_rEvent*/ ) { implSetDesignMode( sal_True ); } - //--------------------------------------------------------------------- - //--- 18.10.01 16:45:36 ----------------------------------------------- void FormControlContainer::_unloaded( const ::com::sun::star::lang::EventObject& /*_rEvent*/ ) { } - //--------------------------------------------------------------------- - //--- 18.10.01 16:45:36 ----------------------------------------------- void FormControlContainer::_reloading( const ::com::sun::star::lang::EventObject& /*_rEvent*/ ) { implSetDesignMode( sal_True ); } - //--------------------------------------------------------------------- - //--- 18.10.01 16:45:37 ----------------------------------------------- void FormControlContainer::_reloaded( const ::com::sun::star::lang::EventObject& /*_rEvent*/ ) { implSetDesignMode( sal_False ); diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx index 495362294..cf0339c1b 100644 --- a/extensions/source/bibliography/framectr.cxx +++ b/extensions/source/bibliography/framectr.cxx @@ -31,7 +31,6 @@ #include <vcl/waitobj.hxx> #include <cppuhelper/interfacecontainer.hxx> #include <com/sun/star/util/URL.hpp> -#include <osl/mutex.hxx> #include <vcl/msgbox.hxx> #include <tools/debug.hxx> #include <vcl/stdtext.hxx> @@ -62,7 +61,7 @@ #include <vcl/edit.hxx> #include <osl/mutex.hxx> -#include <hash_map> +#include <boost/unordered_map.hpp> using namespace osl; using namespace cppu; @@ -111,7 +110,7 @@ static DispatchInfo SupportedCommandsArray[] = { 0 , 0 , sal_False } }; -typedef ::std::hash_map< ::rtl::OUString, CacheDispatchInfo, rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > CmdToInfoCache; +typedef ::boost::unordered_map< ::rtl::OUString, CacheDispatchInfo, rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > CmdToInfoCache; SV_IMPL_PTRARR( BibStatusDispatchArr, BibStatusDispatchPtr ); @@ -218,14 +217,14 @@ BibFrameController_Impl::~BibFrameController_Impl() ::rtl::OUString SAL_CALL BibFrameController_Impl::getImplementationName() throw (::com::sun::star::uno::RuntimeException) { - return ::rtl::OUString::createFromAscii("com.sun.star.comp.extensions.Bibliography"); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.extensions.Bibliography")); } sal_Bool SAL_CALL BibFrameController_Impl::supportsService( const ::rtl::OUString& sServiceName ) throw (::com::sun::star::uno::RuntimeException) { return ( - sServiceName.equalsAscii("com.sun.star.frame.Bibliography") || - sServiceName.equalsAscii("com.sun.star.frame.Controller") + sServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.frame.Bibliography")) || + sServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.frame.Controller")) ); } @@ -234,7 +233,7 @@ sal_Bool SAL_CALL BibFrameController_Impl::supportsService( const ::rtl::OUStrin // return only top level services ... // base services are included there and should be asked by uno-rtti. ::com::sun::star::uno::Sequence< ::rtl::OUString > lNames(1); - lNames[0] = ::rtl::OUString::createFromAscii("com.sun.star.frame.Bibliography"); + lNames[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Bibliography")); return lNames; } @@ -379,14 +378,11 @@ sal_Bool canInsertRecords(const Reference< beans::XPropertySet>& _rxCursorSet) _rxCursorSet->getPropertyValue(C2U("Privileges")) >>= nPriv; return ((_rxCursorSet.is() && (nPriv & sdbcx::Privilege::INSERT) != 0)); } -/* -----------------------------08.05.2002 08:58------------------------------ - ---------------------------------------------------------------------------*/ sal_Bool BibFrameController_Impl::SaveModified(const Reference< form::runtime::XFormController>& xController) { if (!xController.is()) return sal_False; - sal_Bool bInserted = sal_False; Reference< XResultSetUpdate> _xCursor = Reference< XResultSetUpdate>(xController->getModel(), UNO_QUERY); @@ -397,7 +393,7 @@ sal_Bool BibFrameController_Impl::SaveModified(const Reference< form::runtime::X if (!_xSet.is()) return sal_False; - // muß gespeichert werden ? + // need to save? sal_Bool bIsNew = ::comphelper::getBOOL(_xSet->getPropertyValue(C2U("IsNew"))); sal_Bool bIsModified = ::comphelper::getBOOL(_xSet->getPropertyValue(C2U("IsModified"))); sal_Bool bResult = !bIsModified; @@ -413,10 +409,8 @@ sal_Bool BibFrameController_Impl::SaveModified(const Reference< form::runtime::X } catch(Exception&) { - DBG_ERROR("SaveModified: Exception occured!"); + DBG_ERROR("SaveModified: Exception occurred!"); } - - bInserted = bIsNew && bResult; } return bResult; } @@ -513,27 +507,27 @@ void BibFrameController_Impl::dispatch(const util::URL& _rURL, const uno::Sequen Sequence< Any > aDialogCreationArgs( 3 ); Any* pDialogCreationArgs = aDialogCreationArgs.getArray(); // the query composer - *pDialogCreationArgs++ <<= beans::PropertyValue( ::rtl::OUString::createFromAscii( "QueryComposer" ), + *pDialogCreationArgs++ <<= beans::PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "QueryComposer" )), -1, makeAny( pDatMan->getParser() ), beans::PropertyState_DIRECT_VALUE ); // the rowset - *pDialogCreationArgs++ <<= beans::PropertyValue( ::rtl::OUString::createFromAscii( "RowSet" ), + *pDialogCreationArgs++ <<= beans::PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "RowSet" )), -1, makeAny( pDatMan->getForm() ), beans::PropertyState_DIRECT_VALUE ); // the parent window for the dialog - *pDialogCreationArgs++ <<= beans::PropertyValue( ::rtl::OUString::createFromAscii( "ParentWindow" ), + *pDialogCreationArgs++ <<= beans::PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ParentWindow" )), -1, makeAny( xWindow ), beans::PropertyState_DIRECT_VALUE ); // create the dialog object - const ::rtl::OUString sDialogServiceName = ::rtl::OUString::createFromAscii( "com.sun.star.sdb.FilterDialog" ); + const ::rtl::OUString sDialogServiceName(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdb.FilterDialog" )); uno::Reference< uno::XInterface > xDialog = xORB->createInstanceWithArguments( sDialogServiceName, aDialogCreationArgs @@ -750,7 +744,7 @@ void BibFrameController_Impl::addStatusListener( else if(aURL.Path == C2U("Bib/sdbsource") || aURL.Path == C2U("Bib/Mapping") || aURL.Path == C2U("Bib/autoFilter") || - aURL.Path.equalsAscii("Bib/standardFilter")) + aURL.Path.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Bib/standardFilter"))) { aEvent.IsEnabled = sal_True; } diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx index c699aff5d..0b8cf2847 100644 --- a/extensions/source/bibliography/general.cxx +++ b/extensions/source/bibliography/general.cxx @@ -51,7 +51,6 @@ #include "bibtools.hxx" #include "bibliography.hrc" #include <tools/debug.hxx> -#include <vcl/mnemonic.hxx> #include <vcl/svapp.hxx> #include <vcl/i18nhelp.hxx> #include <vcl/mnemonic.hxx> @@ -93,9 +92,7 @@ OUString lcl_GetColumnName( const Mapping* pMapping, sal_uInt16 nIndexPos ) } return sRet; } -/* -----------------------------04.01.00 10:54-------------------------------- - ---------------------------------------------------------------------------*/ class BibPosListener :public cppu::WeakImplHelper1 <sdbc::XRowSetListener> { BibGeneralPage* pParentPage; @@ -111,16 +108,12 @@ public: virtual void SAL_CALL disposing(const lang::EventObject& Source) throw( uno::RuntimeException ); }; -/* -----------------------------04.01.00 10:57-------------------------------- - ---------------------------------------------------------------------------*/ BibPosListener::BibPosListener(BibGeneralPage* pParent) : pParentPage(pParent) { } -/* -----------------------------04.01.00 10:57-------------------------------- - ---------------------------------------------------------------------------*/ void BibPosListener::cursorMoved(const lang::EventObject& /*aEvent*/) throw( uno::RuntimeException ) { try @@ -193,16 +186,11 @@ void BibPosListener::cursorMoved(const lang::EventObject& /*aEvent*/) throw( uno DBG_ERROR("BibPosListener::positioned: something went wrong !"); } } -/* -----------------------------04.01.00 11:28-------------------------------- - ---------------------------------------------------------------------------*/ void BibPosListener::disposing(const lang::EventObject& /*Source*/) throw( uno::RuntimeException ) { } -/* -----------------16.11.99 13:06------------------- - - --------------------------------------------------*/ BibGeneralPage::BibGeneralPage(Window* pParent, BibDataManager* pMan): BibTabPage(pParent,BibResId(RID_TP_GENERAL)), aControlParentWin(this, WB_DIALOGCONTROL), @@ -432,11 +420,9 @@ BibGeneralPage::~BibGeneralPage() xRowSet->removeRowSetListener(xPosListener); } } - /* -----------------------------14.04.00 13:11-------------------------------- - ---------------------------------------------------------------------------*/ - void BibGeneralPage::RemoveListeners() - { +void BibGeneralPage::RemoveListeners() +{ for(USHORT i = 0; i < FIELD_COUNT; i++) { if(aControls[i].is()) @@ -446,10 +432,8 @@ BibGeneralPage::~BibGeneralPage() aControls[i] = 0; } } - } -/* -----------------------------21.01.00 17:05-------------------------------- +} - ---------------------------------------------------------------------------*/ void BibGeneralPage::CommitActiveControl() { uno::Reference< form::runtime::XFormController > xFormCtrl = pDatMan->GetFormController(); diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx index dc801d27f..8899f9878 100644 --- a/extensions/source/bibliography/toolbar.cxx +++ b/extensions/source/bibliography/toolbar.cxx @@ -29,7 +29,6 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_extensions.hxx" #include <comphelper/processfactory.hxx> -#include <osl/mutex.hxx> #include <tools/urlobj.hxx> #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> @@ -84,14 +83,10 @@ void BibToolBarListener::statusChanged(const ::com::sun::star::frame::FeatureSta pToolBar->CheckItem(nIndex, bChecked); } - /* - rtl::OUString FeatureDescriptor; - sal_Bool Requery; - ::com::sun::star::uno::Any State;*/ } }; -rtl::OUString BibToolBarListener::GetCommand() +rtl::OUString BibToolBarListener::GetCommand() const { return aCommand; } @@ -166,7 +161,6 @@ void BibTBQueryMenuListener::statusChanged(const frame::FeatureStateEvent& rEvt) sal_uInt16 nID=pToolBar->InsertFilterItem(String(pStringArray[i])); if(pStringArray[i]==rEvt.FeatureDescriptor) { -// XubString aStr = rEvt.FeatureDescriptor; pToolBar->SelectFilterItem(nID); } } @@ -204,9 +198,7 @@ SV_IMPL_PTRARR( BibToolBarListenerArr, BibToolBarListenerPtr); BibToolBar::BibToolBar(Window* pParent, Link aLink, WinBits nStyle): ToolBox(pParent,BibResId(RID_BIB_TOOLBAR)), aImgLst(BibResId( RID_TOOLBAR_IMGLIST )), - aImgLstHC(BibResId(RID_TOOLBAR_IMGLIST_HC )), aBigImgLst(BibResId( RID_TOOLBAR_BIGIMGLIST )), - aBigImgLstHC(BibResId( RID_TOOLBAR_BIGIMGLIST_HC )), aFtSource(this,WB_VCENTER), aLBSource(this,WB_DROPDOWN), aFtQuery(this,WB_VCENTER), @@ -224,7 +216,6 @@ BibToolBar::BibToolBar(Window* pParent, Link aLink, WinBits nStyle): ApplyImageList(); SetStyle(GetStyle()|nStyle); SetOutStyle(TOOLBOX_STYLE_FLAT); - Size aSize=GetSizePixel(); Size a2Size(GetOutputSizePixel()); a2Size.Width()=100; aLBSource.SetSizePixel(a2Size); @@ -462,7 +453,7 @@ long BibToolBar::PreNotify( NotifyEvent& rNEvt ) long nResult=sal_True; sal_uInt16 nSwitch=rNEvt.GetType(); - if(aEdQuery.HasFocus() && nSwitch==EVENT_KEYINPUT)// || nSwitch==EVENT_KEYUP) + if(aEdQuery.HasFocus() && nSwitch==EVENT_KEYINPUT) { const KeyCode& aKeyCode=rNEvt.GetKeyEvent()->GetKeyCode(); sal_uInt16 nKey = aKeyCode.GetCode(); @@ -551,9 +542,7 @@ void BibToolBar::statusChanged(const frame::FeatureStateEvent& rEvent) (*pListener)->statusChanged(rEvent); } } -/* -----------------------------07.05.2002 15:08------------------------------ - ---------------------------------------------------------------------------*/ void BibToolBar::DataChanged( const DataChangedEvent& rDCEvt ) { if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && @@ -561,8 +550,6 @@ void BibToolBar::DataChanged( const DataChangedEvent& rDCEvt ) ApplyImageList(); ToolBox::DataChanged( rDCEvt ); } -/* -----------------------------07.05.2002 15:09------------------------------ - ---------------------------------------------------------------------------*/ IMPL_LINK( BibToolBar, OptionsChanged_Impl, void*, /*pVoid*/ ) { @@ -614,8 +601,8 @@ void BibToolBar::RebuildToolbar() void BibToolBar::ApplyImageList() { ImageList& rList = ( nSymbolsSize == SFX_SYMBOLS_SIZE_SMALL ) ? - ( GetSettings().GetStyleSettings().GetHighContrastMode() ? aImgLstHC : aImgLst ) : - ( GetSettings().GetStyleSettings().GetHighContrastMode() ? aBigImgLstHC : aBigImgLst ); + ( aImgLst ) : + ( aBigImgLst ); SetItemImage(TBC_BT_AUTOFILTER , rList.GetImage(SID_FM_AUTOFILTER)); SetItemImage(TBC_BT_FILTERCRIT , rList.GetImage(SID_FM_FILTERCRIT)); diff --git a/extensions/source/bibliography/toolbar.hxx b/extensions/source/bibliography/toolbar.hxx index 07775e31f..4601fca0d 100644 --- a/extensions/source/bibliography/toolbar.hxx +++ b/extensions/source/bibliography/toolbar.hxx @@ -60,7 +60,7 @@ public: BibToolBarListener(BibToolBar *pTB,rtl::OUString aStr,sal_uInt16 nId); ~BibToolBarListener(); - rtl::OUString GetCommand(); + rtl::OUString GetCommand() const; // ::com::sun::star::lang::XEventListener // we do not hold References to dispatches, so there is nothing to do on disposal @@ -120,7 +120,6 @@ class BibToolBar: public ToolBox BibToolBarListenerArr aListenerArr; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > xController; Timer aTimer; -// Timer aMenuTimer; ImageList aImgLst; ImageList aImgLstHC; ImageList aBigImgLst; diff --git a/extensions/source/bibliography/toolbar.src b/extensions/source/bibliography/toolbar.src index 9016a4570..95681c7d5 100644 --- a/extensions/source/bibliography/toolbar.src +++ b/extensions/source/bibliography/toolbar.src @@ -212,12 +212,6 @@ ImageList RID_TOOLBAR_IMGLIST MASKCOLOR BIB_IMAGES }; -ImageList RID_TOOLBAR_IMGLIST_HC -{ - Prefix = "sch"; - MASKCOLOR - BIB_IMAGES -}; ImageList RID_TOOLBAR_BIGIMGLIST { @@ -225,13 +219,6 @@ ImageList RID_TOOLBAR_BIGIMGLIST MASKCOLOR BIB_IMAGES }; -ImageList RID_TOOLBAR_BIGIMGLIST_HC -{ - Prefix = "lch"; - MASKCOLOR - BIB_IMAGES -}; - |