summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--extensions/source/bibliography/datman.cxx30
-rw-r--r--extensions/source/bibliography/toolbar.cxx7
-rw-r--r--extensions/source/bibliography/toolbar.hxx1
-rw-r--r--extensions/source/dbpilots/controlwizard.cxx25
-rw-r--r--extensions/source/dbpilots/groupboxwiz.cxx6
-rw-r--r--extensions/source/ole/ole2uno.cxx16
-rw-r--r--extensions/source/ole/unoconversionutilities.hxx7
-rw-r--r--extensions/source/ole/unotypewrapper.hxx4
-rw-r--r--extensions/source/oooimprovement/invite_job.cxx9
-rw-r--r--extensions/source/propctrlr/browserview.hxx2
-rw-r--r--extensions/source/propctrlr/taborder.cxx2
-rw-r--r--extensions/source/scanner/sane.cxx1
-rw-r--r--extensions/source/scanner/scanwin.cxx14
-rw-r--r--extensions/source/svg/svgwriter.cxx4
14 files changed, 10 insertions, 118 deletions
diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx
index 4d180a2b8..b0c822779 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -134,19 +134,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&)
{
@@ -582,7 +575,6 @@ class DBChangeDialog_Impl : public ModalDialog
BibDataManager* pDatMan;
-// DECL_LINK(EndDragHdl, HeaderBar*);
DECL_LINK(DoubleClickHdl, SvTabListBox*);
public:
DBChangeDialog_Impl(Window* pParent, BibDataManager* pMan );
@@ -651,16 +643,6 @@ IMPL_LINK(DBChangeDialog_Impl, DoubleClickHdl, SvTabListBox*, /*pLB*/)
return 0;
}
-/*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;
-};*/
-
DBChangeDialog_Impl::~DBChangeDialog_Impl()
{
}
@@ -676,7 +658,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)
{
@@ -762,7 +743,6 @@ void SAL_CALL BibInterceptorHelper::setMasterDispatchProvider( const ::com::sun:
BibDataManager::BibDataManager()
:BibDataManager_Base( GetMutex() )
- // #100312# --------------
,m_pInterceptorHelper( NULL )
,m_aLoadListeners(m_aMutex)
,pBibView( NULL )
@@ -791,7 +771,6 @@ BibDataManager::~BibDataManager()
xConnection->dispose();
m_xForm = NULL;
}
- // #100312# ----------------
if( m_pInterceptorHelper )
{
m_pInterceptorHelper->ReleaseInterceptor();
@@ -910,9 +889,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 ) );
}
@@ -1513,7 +1489,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() )
{
@@ -1674,9 +1649,6 @@ void BibDataManager::CreateMappingDialog(Window* pParent)
if(RET_OK == pDlg->Execute() && pBibView)
{
reload();
-// unload();
-// pBibView->UpdatePages();
-// load();
}
delete pDlg;
}
@@ -1746,13 +1718,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!" );
diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx
index ae5af0b1c..152bace79 100644
--- a/extensions/source/bibliography/toolbar.cxx
+++ b/extensions/source/bibliography/toolbar.cxx
@@ -84,10 +84,6 @@ 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;*/
}
};
@@ -166,7 +162,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);
}
}
@@ -460,7 +455,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();
diff --git a/extensions/source/bibliography/toolbar.hxx b/extensions/source/bibliography/toolbar.hxx
index 07775e31f..63c4e9b95 100644
--- a/extensions/source/bibliography/toolbar.hxx
+++ b/extensions/source/bibliography/toolbar.hxx
@@ -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/dbpilots/controlwizard.cxx b/extensions/source/dbpilots/controlwizard.cxx
index 45e436d28..b9698fb1c 100644
--- a/extensions/source/dbpilots/controlwizard.cxx
+++ b/extensions/source/dbpilots/controlwizard.cxx
@@ -745,31 +745,6 @@ namespace dbp
// lemme see ...
return (0 == getContext().aFieldNames.getLength());
// if we got fields, the data source is valid ...
-// try
-// {
-// // first, we need a valid data source name
-// ::rtl::OUString sDataSourceName;
-// m_aContext.xForm->getPropertyValue(::rtl::OUString::createFromAscii("DataSourceName")) >>= sDataSourceName;
-// if (m_aContext.xDatasourceContext.is() && m_aContext.xDatasourceContext->hasByName(sDataSourceName))
-// { // at least the data source name is valid ...
-// // then, a CommandType "table" would be nice ...
-// sal_Int32 nCommandType = CommandType::COMMAND;
-// m_aContext.xForm->getPropertyValue(::rtl::OUString::createFromAscii("CommandType")) >>= nCommandType;
-// if (CommandType::TABLE == nCommandType)
-// { // okay ....
-// // now the table itself should be valid
-// ::rtl::OUString sTableName;
-// m_aContext.xForm->getPropertyValue(::rtl::OUString::createFromAscii("Command")) >>= sTableName;
-// if (m_aContext.xObjectContainer.is() && m_aContext.xObjectContainer->hasByName(sTableName))
-// return sal_False;
-// }
-// }
-// }
-// catch(Exception&)
-// {
-// DBG_ERROR("OControlWizard::needDatasourceSelection: caught an exception while checking the form settings!");
-// }
-// return sal_True;
}
//.........................................................................
diff --git a/extensions/source/dbpilots/groupboxwiz.cxx b/extensions/source/dbpilots/groupboxwiz.cxx
index 8bda68c04..6387c6280 100644
--- a/extensions/source/dbpilots/groupboxwiz.cxx
+++ b/extensions/source/dbpilots/groupboxwiz.cxx
@@ -84,9 +84,6 @@ namespace dbp
{
switch (_nState)
{
-// case GBW_STATE_DATASELECTION:
-// return new OTableSelectionPage(this);
-//
case GBW_STATE_OPTIONLIST:
return new ORadioSelectionPage(this);
@@ -111,9 +108,6 @@ namespace dbp
{
switch (_nCurrentState)
{
-// case GBW_STATE_DATASELECTION:
-// return GBW_STATE_OPTIONLIST;
-//
case GBW_STATE_OPTIONLIST:
return GBW_STATE_DEFAULTOPTION;
diff --git a/extensions/source/ole/ole2uno.cxx b/extensions/source/ole/ole2uno.cxx
index 16060432a..741634e07 100644
--- a/extensions/source/ole/ole2uno.cxx
+++ b/extensions/source/ole/ole2uno.cxx
@@ -55,22 +55,6 @@ Mutex * getBridgeMutex()
}
-// Mutex* getBridgeMutex()
-// {
-// static Mutex* pMutex= NULL;
-
-// if( ! pMutex)
-// {
-// MutexGuard guard( Mutex::getGlobalMutex() );
-// if( !pMutex)
-// {
-// static Mutex aMutex;
-// pMutex= &aMutex;
-// }
-// }
-// return pMutex;
-// }
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/ole/unoconversionutilities.hxx b/extensions/source/ole/unoconversionutilities.hxx
index 1970b08fd..afca47fd2 100644
--- a/extensions/source/ole/unoconversionutilities.hxx
+++ b/extensions/source/ole/unoconversionutilities.hxx
@@ -563,13 +563,6 @@ void UnoConversionUtilities<T>::variantToAny( const VARIANTARG* pArg, Any& rAny,
bFail = true;
break;
default:
-// case TypeClass_SERVICE: break; // meta construct
-// case TypeClass_TYPEDEF: break;
-// case TypeClass_UNION: break;
-// case TypeClass_MODULE: break; // module
-// case TypeClass_EXCEPTION: break;
-// case TypeClass_ARRAY: break; // there's no Array at the moment
-// case TypeClass_UNKNOWN: break;
bCannotConvert = true;
break;
}
diff --git a/extensions/source/ole/unotypewrapper.hxx b/extensions/source/ole/unotypewrapper.hxx
index f09fd9bfb..4e75ccf19 100644
--- a/extensions/source/ole/unotypewrapper.hxx
+++ b/extensions/source/ole/unotypewrapper.hxx
@@ -35,8 +35,8 @@
#define STRICT
#define _WIN32_WINNT 0x0403
#define _WIN32_DCOM
-#if OSL_DEBUG_LEVEL > 0
-//#define _ATL_DEBUG_INTERFACES
+#if OSL_DEBUG_LEVEL > 2
+#define _ATL_DEBUG_INTERFACES
#endif
#include <atlbase.h>
extern CComModule _Module;
diff --git a/extensions/source/oooimprovement/invite_job.cxx b/extensions/source/oooimprovement/invite_job.cxx
index 59c84acde..dd5b358d4 100644
--- a/extensions/source/oooimprovement/invite_job.cxx
+++ b/extensions/source/oooimprovement/invite_job.cxx
@@ -65,12 +65,6 @@ namespace
namespace oooimprovement
{
-// InviteJob::InviteJob(const Reference<XComponentContext>& context)
-// : m_ServiceFactory(Reference<XMultiServiceFactory>(
-// context->getServiceManager()->createInstanceWithContext(
-// OUString::createFromAscii("com.sun.star.lang.XMultiServiceFactory"), context),
-// UNO_QUERY))
-// { }
InviteJob::InviteJob(const Reference<XMultiServiceFactory>& sf)
: m_ServiceFactory(sf)
@@ -126,9 +120,6 @@ namespace oooimprovement
return aServiceNames;
}
-// Reference<XInterface> InviteJob::Create(const Reference<XComponentContext>& context)
-// { return *(new InviteJob(context)); }
-
Reference<XInterface> InviteJob::Create(const Reference<XMultiServiceFactory>& sm)
{ return *(new InviteJob(sm)); }
}
diff --git a/extensions/source/propctrlr/browserview.hxx b/extensions/source/propctrlr/browserview.hxx
index 5e7801f92..c7d301e4e 100644
--- a/extensions/source/propctrlr/browserview.hxx
+++ b/extensions/source/propctrlr/browserview.hxx
@@ -33,7 +33,6 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <vcl/window.hxx>
#include <tools/resid.hxx>
-// #95343# --------------------
#include <com/sun/star/awt/Size.hpp>
//............................................................................
@@ -74,7 +73,6 @@ namespace pcr
void setPageActivationHandler(const Link& _rHdl) { m_aPageActivationHandler = _rHdl; }
Link getPageActivationHandler() const { return m_aPageActivationHandler; }
- // #95343# ------------------
::com::sun::star::awt::Size getMinimumSize();
protected:
diff --git a/extensions/source/propctrlr/taborder.cxx b/extensions/source/propctrlr/taborder.cxx
index 62b2bfdba..0485b0478 100644
--- a/extensions/source/propctrlr/taborder.cxx
+++ b/extensions/source/propctrlr/taborder.cxx
@@ -300,9 +300,7 @@ namespace pcr
}
// TODO: UNO action (to bracket all the single actions which are being created)
-// pDrawModel->BegUndo(PcrRes(RID_STR_UNDO_TABORDER));
m_xModel->setControlModels( aSortedControlModelSeq );
-// pDrawModel->EndUndo();
EndDialog( sal_True );
return 0;
diff --git a/extensions/source/scanner/sane.cxx b/extensions/source/scanner/sane.cxx
index 717cf4c61..ee9bc638d 100644
--- a/extensions/source/scanner/sane.cxx
+++ b/extensions/source/scanner/sane.cxx
@@ -160,7 +160,6 @@ SANE_Status Sane::ControlOption( int nOption, SANE_Action nAction,
pAction );
}
#endif
-// if( nInfo & ( SANE_INFO_RELOAD_OPTIONS | SANE_INFO_RELOAD_PARAMS ) )
if( nInfo & SANE_INFO_RELOAD_OPTIONS )
ReloadOptions();
return nStatus;
diff --git a/extensions/source/scanner/scanwin.cxx b/extensions/source/scanner/scanwin.cxx
index a23181a66..7da716d0e 100644
--- a/extensions/source/scanner/scanwin.cxx
+++ b/extensions/source/scanner/scanwin.cxx
@@ -222,7 +222,7 @@ ImpTwain::ImpTwain( ScannerManager& rMgr, const Link& rNotifyLink ) :
hTwainWnd = CreateWindowEx( WS_EX_TOPMOST, aWc.lpszClassName, "TWAIN", 0, 0, 0, 0, 0, HWND_DESKTOP, NULL, aWc.hInstance, 0 );
hTwainHook = SetWindowsHookEx( WH_GETMESSAGE, &TwainMsgProc, NULL, GetCurrentThreadId() );
- // #107835# block destruction until ImplDestroyHdl is called
+ // block destruction until ImplDestroyHdl is called
mxSelfRef = static_cast< ::cppu::OWeakObject* >( this );
}
@@ -347,7 +347,7 @@ bool ImpTwain::ImplEnableSource()
aNotifyLink.Call( (void*) TWAIN_EVENT_SCANNING );
nCurState = 5;
- // #107835# register as vetoable close listener, to prevent application to die under us
+ // register as vetoable close listener, to prevent application to die under us
ImplRegisterCloseListener();
if( PFUNC( &aAppIdent, &aSrcIdent, DG_CONTROL, DAT_USERINTERFACE, MSG_ENABLEDS, &aUI ) == TWRC_SUCCESS )
@@ -358,7 +358,7 @@ bool ImpTwain::ImplEnableSource()
{
nCurState = 4;
- // #107835# deregister as vetoable close listener, dialog failed
+ // deregister as vetoable close listener, dialog failed
ImplDeregisterCloseListener();
}
}
@@ -506,7 +506,7 @@ IMPL_LINK( ImpTwain, ImplFallbackHdl, void*, pData )
PFUNC( &aAppIdent, &aSrcIdent, DG_CONTROL, DAT_USERINTERFACE, MSG_DISABLEDS, &aUI );
nCurState = 4;
- // #107835# deregister as vetoable close listener
+ // deregister as vetoable close listener
ImplDeregisterCloseListener();
}
break;
@@ -559,7 +559,7 @@ IMPL_LINK( ImpTwain, ImplDestroyHdl, void*, /*p*/ )
if( hTwainHook )
UnhookWindowsHookEx( hTwainHook );
- // #107835# permit destruction of ourselves (normally, refcount
+ // permit destruction of ourselves (normally, refcount
// should drop to zero exactly here)
mxSelfRef = NULL;
pImpTwainInstance = NULL;
@@ -787,7 +787,7 @@ bool Twain::SelectSource( ScannerManager& rMgr )
if( !mpImpTwain )
{
- // #107835# hold reference to ScannerManager, to prevent premature death
+ // hold reference to ScannerManager, to prevent premature death
mxMgr = uno::Reference< scanner::XScannerManager >( static_cast< OWeakObject* >( const_cast< ScannerManager* >( mpCurMgr = &rMgr ) ),
uno::UNO_QUERY ),
@@ -809,7 +809,7 @@ bool Twain::PerformTransfer( ScannerManager& rMgr, const uno::Reference< lang::X
if( !mpImpTwain )
{
- // #107835# hold reference to ScannerManager, to prevent premature death
+ // hold reference to ScannerManager, to prevent premature death
mxMgr = uno::Reference< scanner::XScannerManager >( static_cast< OWeakObject* >( const_cast< ScannerManager* >( mpCurMgr = &rMgr ) ),
uno::UNO_QUERY ),
diff --git a/extensions/source/svg/svgwriter.cxx b/extensions/source/svg/svgwriter.cxx
index 3116199d9..5c8f4cb1c 100644
--- a/extensions/source/svg/svgwriter.cxx
+++ b/extensions/source/svg/svgwriter.cxx
@@ -54,7 +54,6 @@ protected:
public:
- // #110680#
SVGMtfExport(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceFactory,
const REF( NMSP_SAX::XDocumentHandler )& rxHandler );
@@ -66,7 +65,6 @@ public:
// -----------------------------------------------------------------------------
-// #110680#
SVGMtfExport::SVGMtfExport(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceFactory,
const REF( NMSP_SAX::XDocumentHandler )& rxHandler )
@@ -167,8 +165,6 @@ void SAL_CALL SVGWriter::write( const REF( NMSP_SAX::XDocumentHandler )& rxDocHa
const REF( NMSP_SAX::XDocumentHandler ) xDocumentHandler( rxDocHandler );
- // #110680#
- // SVGMtfExport* pWriter = new SVGMtfExport( xDocumentHandler );
SVGMtfExport* pWriter = new SVGMtfExport( mxFact, xDocumentHandler );
pWriter->writeMtf( aMtf );
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-22 00:11:49 +0000