Attachment #48254 for issue #81612

View | Details | Raw Unified | Return to issue 81612
Collapse All | Expand All

Lines 369-375 Link Here

(-)extensions/source/abpilot/abspilot.cxx (-2 / +14 lines)
369	case AST_MORK :	369	case AST_MORK :
370	case AST_THUNDERBIRD: pGuess = "Personal Address Book"; break;	370	case AST_THUNDERBIRD: pGuess = "Personal Address Book"; break;
371	case AST_LDAP : pGuess = "LDAP Directory"; break;	371	case AST_LDAP : pGuess = "LDAP Directory"; break;
372	}	372	case AST_EVOLUTION:
		373	case AST_EVOLUTION_GROUPWISE:
		374	case AST_EVOLUTION_LDAP:
		375	case AST_KAB:
		376	case AST_MACAB:
		377	case AST_OUTLOOK:
		378	case AST_OE:
		379	case AST_OTHER:
		380	case AST_INVALID:
		381	break;
		382	}
373	const ::rtl::OUString sGuess = ::rtl::OUString::createFromAscii( pGuess );	383	const ::rtl::OUString sGuess = ::rtl::OUString::createFromAscii( pGuess );
374	if ( rTableNames.end() != rTableNames.find( sGuess ) )	384	if ( rTableNames.end() != rTableNames.find( sGuess ) )
375	getSettings().sSelectedTable = sGuess;	385	getSettings().sSelectedTable = sGuess;
Lines 444-450 Link Here
444	case AST_OTHER:	454	case AST_OTHER:
445	m_aNewDataSource = aContext.createNewDBase( m_aSettings.sDataSourceName );	455	m_aNewDataSource = aContext.createNewDBase( m_aSettings.sDataSourceName );
446	break;	456	break;
447	}	457	case AST_INVALID:
		458	break;
		459	}
448	m_eNewDataSourceType = m_aSettings.eType;	460	m_eNewDataSourceType = m_aSettings.eType;
449	}	461	}
450		462

Lines 97-104 Link Here

(-)extensions/source/abpilot/admininvokationpage.cxx (-2 lines)
97	//---------------------------------------------------------------------	97	//---------------------------------------------------------------------
98	void AdminDialogInvokationPage::implTryConnect()	98	void AdminDialogInvokationPage::implTryConnect()
99	{	99	{
100	sal_Bool bConnected = getDialog()->connectToDataSource( sal_True );
101
102	// show our error message if and only if we could not connect	100	// show our error message if and only if we could not connect
103	implUpdateErrorMessage();	101	implUpdateErrorMessage();
104		102

Lines 304-310 Link Here

(-)extensions/source/abpilot/fieldmappingimpl.cxx (-1 / +1 lines)
304	const ::rtl::OUString sProgrammaticNodeName = ::rtl::OUString::createFromAscii( "ProgrammaticFieldName" );	304	const ::rtl::OUString sProgrammaticNodeName = ::rtl::OUString::createFromAscii( "ProgrammaticFieldName" );
305	const ::rtl::OUString sAssignedNodeName = ::rtl::OUString::createFromAscii( "AssignedFieldName" );	305	const ::rtl::OUString sAssignedNodeName = ::rtl::OUString::createFromAscii( "AssignedFieldName" );
306		306
307	for (pExistentFields; pExistentFields != pExistentFieldsEnd; ++pExistentFields)	307	for (; pExistentFields != pExistentFieldsEnd; ++pExistentFields)
308	{	308	{
309	#ifdef DBG_UTIL	309	#ifdef DBG_UTIL
310	::rtl::OUString sRedundantProgrammaticName;	310	::rtl::OUString sRedundantProgrammaticName;

Lines 70-78 Link Here

(-)extensions/source/abpilot/typeselectionpage.cxx (-1 / +1 lines)
70	,m_aTypeSep (this, ModuleRes(FL_TYPE))	70	,m_aTypeSep (this, ModuleRes(FL_TYPE))
71	,m_aMORK (this, ModuleRes(RB_MORK))	71	,m_aMORK (this, ModuleRes(RB_MORK))
72	,m_aThunderbird (this, ModuleRes(RB_THUNDERBIRD))	72	,m_aThunderbird (this, ModuleRes(RB_THUNDERBIRD))
73	,m_aEvolution (this, ModuleRes(RB_EVOLUTION))
74	,m_aEvolutionGroupwise (this, ModuleRes(RB_EVOLUTION_GROUPWISE))	73	,m_aEvolutionGroupwise (this, ModuleRes(RB_EVOLUTION_GROUPWISE))
75	,m_aEvolutionLdap (this, ModuleRes(RB_EVOLUTION_LDAP))	74	,m_aEvolutionLdap (this, ModuleRes(RB_EVOLUTION_LDAP))
		75	,m_aEvolution (this, ModuleRes(RB_EVOLUTION))
76	,m_aKab (this, ModuleRes(RB_KAB))	76	,m_aKab (this, ModuleRes(RB_KAB))
77	,m_aMacab (this, ModuleRes(RB_MACAB))	77	,m_aMacab (this, ModuleRes(RB_MACAB))
78	,m_aLDAP (this, ModuleRes(RB_LDAP))	78	,m_aLDAP (this, ModuleRes(RB_LDAP))

Lines 364-370 Link Here

(-)extensions/source/bibliography/bibbeam.cxx (-1 lines)
364	//---------------------------------------------------------------------	364	//---------------------------------------------------------------------
365	IMPL_LINK( BibBeamer, RecalcLayout_Impl, void*, pVoid )	365	IMPL_LINK( BibBeamer, RecalcLayout_Impl, void*, pVoid )
366	{	366	{
367	long nHeight = pToolBar->GetSizePixel().Height();
368	SetItemSize( ID_TOOLBAR, pToolBar->GetSizePixel().Height() );	367	SetItemSize( ID_TOOLBAR, pToolBar->GetSizePixel().Height() );
369	return 0L;	368	return 0L;
370	}	369	}




	const OUString* pNodeNames = aNodeNames.getConstArray();
	for(sal_Int32 nNode = 0; nNode < aNodeNames.getLength(); nNode++)
	{
		Sequence<OUString> aNames(3);
		OUString* pNames = aNames.getArray();
		OUString sPrefix(C2U(cDataSourceHistory));
		sPrefix += C2U("/");

		pNames[1] += sTable;
		pNames[2] = sPrefix;
		pNames[2] += sCommandType;
		Sequence<Any> aValues = GetProperties(aNames);
		const Any* pValues = aValues.getConstArray();
		if(aValues.getLength() == aNames.getLength())
		{
			Mapping* pMapping = new Mapping;
			sal_Int32 nColumnIndex = 0;
			pValues[0] >>= pMapping->sURL;
			pValues[1] >>= pMapping->sTableName;
			pValues[2] >>= pMapping->nCommandType;

	Sequence<Any> aValues(aNames.getLength());
	Any* pValues = aValues.getArray();

	const Type& rType = ::getBooleanCppuType();
	for(int nProp = 0; nProp < aNames.getLength(); nProp++)
	{
		switch(nProp)





	rtl::OUString 	sQueryField;
	rtl::OUString 	sQueryText;
	MappingArray*				pMappingsArr;
    long 			nBeamerSize;
	long 			nViewSize;
    sal_Bool        bShowColumnAssignmentWarning;

	MappingArray*				pMappingsArr;
	rtl::OUString 				aColumnDefaults[COLUMN_COUNT];

	com::sun::star::uno::Sequence<rtl::OUString>& GetPropertyNames();





		::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > 				xTopPeerRef;
		::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > 				xBottomPeerRef;
		sal_Bool					bFirstTime;

		BibDataManager*			pDatMan;
		BibWindowContainer*		pTopWin;
		BibWindowContainer*		pBottomWin;
		sal_Bool					bFirstTime;
		HdlBibModul				pBibMod;
		Timer					aTimer;


Lines 125-131 Link Here

(-)extensions/source/bibliography/bibview.cxx (-2 / +2 lines)
125	if ( xResUpd.is() )	125	if ( xResUpd.is() )
126	{	126	{
127	Any aModified = xProps->getPropertyValue( C2U( "IsModified" ) );	127	Any aModified = xProps->getPropertyValue( C2U( "IsModified" ) );
128	sal_Bool bFlag;	128	sal_Bool bFlag = sal_False;
129	if ( ( aModified >>= bFlag ) && bFlag )	129	if ( ( aModified >>= bFlag ) && bFlag )
130	{	130	{
131		131
Lines 140-146 Link Here
140	}	140	}
141	catch( const uno::Exception& rEx)	141	catch( const uno::Exception& rEx)
142	{	142	{
143	rEx;	143	(void) rEx;
144	}	144	}
145	}	145	}
146	}	146	}




        }
        catch(Exception eEx)
        {
            (void) eEx;	// make compiler happy
            DBG_ERROR("Exception caught in ODatabaseContext::getRegisteredObject()")
        }
	}

		}
		catch(Exception& e )
		{
            (void) e;	// make compiler happy
		}

	}

	}
	catch(Exception& e )
	{
        (void) e;	// make compiler happy
		DBG_ERROR("exception in getConnection");
	}


 --------------------------------------------------*/
class MappingDialog_Impl : public ModalDialog
{
    BibDataManager* pDatMan;
	OKButton		aOKBT;
	CancelButton	aCancelBT;
    HelpButton		aHelpBT;
    FixedLine		aMapGB;
	FixedText		aIdentifierFT;
	ListBox 		aIdentifierLB;
	FixedText		aAuthorityTypeFT;
	ListBox 		aAuthorityTypeLB;
    FixedText       aYearFT;
	ListBox 		aYearLB;
    FixedText       aAuthorFT;
	ListBox 		aAuthorLB;
	FixedText		aTitleFT;
	ListBox 		aTitleLB;
    FixedText       aMonthFT;
	ListBox 		aMonthLB;
    FixedText       aYearFT;
	ListBox 		aYearLB;
    FixedText       aISBNFT;
	ListBox 		aISBNLB;
    FixedText       aBooktitleFT;
	ListBox 		aBooktitleLB;
    FixedText       aChapterFT;
	ListBox 		aChapterLB;
    FixedText       aPagesFT;
	ListBox 		aPagesLB;
    FixedText       aEditorFT;
	ListBox 		aEditorLB;
    FixedText       aEditionFT;
	ListBox 		aEditionLB;
    FixedText       aEditorFT;
	ListBox 		aEditorLB;
    FixedText       aVolumeFT;
	ListBox 		aVolumeLB;
    FixedText       aHowpublishedFT;
	ListBox 		aHowpublishedLB;
    FixedText       aOrganizationsFT;
	ListBox 		aOrganizationsLB;
    FixedText       aInstitutionFT;
	ListBox 		aInstitutionLB;
    FixedText       aSchoolFT;
	ListBox 		aSchoolLB;
    FixedText       aReportTypeFT;
	ListBox 		aReportTypeLB;
    FixedText       aMonthFT;
	ListBox 		aMonthLB;
    FixedText       aJournalFT;
	ListBox 		aJournalLB;
    FixedText       aNoteFT;
	ListBox 		aNoteLB;
    FixedText       aAnnoteFT;
	ListBox 		aAnnoteLB;
    FixedText       aNumberFT;
	ListBox 		aNumberLB;
    FixedText       aOrganizationsFT;
	ListBox 		aOrganizationsLB;
    FixedText       aPagesFT;
	ListBox 		aPagesLB;
    FixedText       aPublisherFT;
	ListBox 		aPublisherLB;
    FixedText       aAddressFT;
	ListBox 		aAddressLB;
    FixedText       aSchoolFT;
	ListBox 		aSchoolLB;
    FixedText       aSeriesFT;
	ListBox 		aSeriesLB;
    FixedText       aReportTypeFT;
	ListBox 		aReportTypeLB;
    FixedText       aVolumeFT;
	ListBox 		aVolumeLB;
    FixedText       aURLFT;
	ListBox 		aURLLB;
    FixedText       aCustom1FT;

	ListBox 		aCustom4LB;
	FixedText		aCustom5FT;
	ListBox 		aCustom5LB;

	OKButton		aOKBT;
	CancelButton	aCancelBT;
	HelpButton		aHelpBT;

	ListBox*		aListBoxes[COLUMN_COUNT];
	String			sNone;

	sal_Bool		bModified;

	

	DECL_LINK(OkHdl, OKButton*);
	DECL_LINK(ListBoxSelectHdl, ListBox*);

 --------------------------------------------------*/
class DBChangeDialog_Impl : public ModalDialog
{
	FixedLine		aSelectionGB;
	SvTabListBox	aSelectionLB;
	HeaderBar		aSelectionHB;

	OKButton		aOKBT;
	CancelButton	aCancelBT;
	HelpButton		aHelpBT;
	FixedLine		aSelectionGB;
	SvTabListBox	aSelectionLB;
	HeaderBar		aSelectionHB;
	DBChangeDialogConfig_Impl	aConfig;
	String			aEntryST;
	String			aURLST;

	}
	catch(Exception& e )
	{
		(void) e;	// make compiler happy
        DBG_ERROR("Exception in BibDataManager::DBChangeDialog_Impl::DBChangeDialog_Impl")
	}




BibDataManager::BibDataManager()
	:BibDataManager_Base( GetMutex() )
	,pToolbar(0)
	,pBibView( NULL )
	,m_aLoadListeners(m_aMutex)
	// #100312# --------------
	,m_pInterceptorHelper( NULL )
    ,m_aLoadListeners(m_aMutex)
	,pBibView( NULL )
	,pToolbar(0)
{
}

/* --------------------------------------------------

 --------------------------------------------------*/

	}
	catch(Exception& e )
	{
		(void) e;	// make compiler happy
        DBG_ERROR("Exception in BibDataManager::InsertFields")
	}
}
/* --------------------------------------------------

	}
	catch(Exception& e )
	{
		(void) e;	// make compiler happy
        DBG_ERROR("::updateGridModel: something went wrong !");
	}



	}
	catch(Exception& e )
	{
		(void) e;	// make compiler happy
        DBG_ERROR("::createDatabaseForm: something went wrong !");
	}



	}
	catch(Exception& e )
	{
		(void) e;	// make compiler happy
        DBG_ERROR("::getDataSources: something went wrong !");
	}



	}
	catch(Exception& e )
	{
		(void) e;	// make compiler happy
        DBG_ERROR("::setFilterOnActiveDataSource: something went wrong !");
	}



	}
	catch(Exception& e )
	{
		(void) e;	// make compiler happy
        DBG_ERROR("::getFilterOnActiveDataSource: something went wrong !");
	}



	}
	catch(Exception& e )
	{
		(void) e;	// make compiler happy
        DBG_ERROR("::setActiveDataTable: something went wrong !");
	}

}

	}
	catch(Exception& e )
	{
		(void) e;	// make compiler happy
        DBG_ERROR("::createGridModel: something went wrong !");
	}



			::rtl::OUString sCurrentModelType;
			const ::rtl::OUString sType(C2U("Type"));
			sal_Int32 nFormatKey = 0;
			sal_Bool bIsFormatted			= sal_False;
			sal_Bool bFormattedIsNumeric	= sal_True;
			xField->getPropertyValue(sType) >>= nFormatKey;

			::rtl::OUString aInstanceName(C2U("com.sun.star.form.component."));

	}
	catch(Exception& e )
	{
        (void) e;	// make compiler happy
        DBG_ERROR("::loadControlModel: something went wrong !");
	}
	return xModel;
}

		}
		catch(Exception& e )
		{
			(void) e;	// make compiler happy
            DBG_ERROR("::saveCtrModel: something went wrong !");
		}
	}


	}
	catch(Exception& e )
	{
		(void) e;	// make compiler happy
        DBG_ERROR("::propertyChange: something went wrong !");
	}



}
catch(Exception& e )
{
	(void) e;	// make compiler happy
    DBG_ERROR("Exception in BibDataManager::SetMeAsUidListener")
}



}
catch(Exception& e )
{
	(void) e;	// make compiler happy
    DBG_ERROR("Exception in BibDataManager::RemoveMeAsUidListener")
}



	}
	catch(Exception& e )
	{
		(void) e;	// make compiler happy
        DBG_ERROR("Exception in BibDataManager::moveRelative")
	}

	return bRet;

Lines 142-149 Link Here

(-)extensions/source/bibliography/formcontrolcontainer.cxx (-2 / +2 lines)
142	}	142	}
143	catch( const Exception& e)	143	catch( const Exception& e)
144	{	144	{
145	e; // make compiler happy	145	(void) e; // make compiler happy
146	DBG_ERROR( "FormControlContainer::implSetDesignMode: caught an exception!" );	146	DBG_ERROR( "FormControlContainer::implSetDesignMode: caught an exception!" );
147	}	147	}
148	}	148	}
149		149




{
    const CmdToInfoCache& rCmdCache = GetCommandToInfoCache();
    
    sal_Int32                                   i( 0 );
    sal_Bool                                    bGroupFound( sal_False );
    frame::DispatchInformation                  aDispatchInfo;
    std::list< frame::DispatchInformation >     aDispatchInfoList;

		BibStatusDispatch *pObj = aStatusListeners[n];
		if ( pObj->aURL.Path == C2U("Bib/removeFilter") )
		{
			FeatureStateEvent  aEvent;
			aEvent.FeatureURL = pObj->aURL;
			aEvent.IsEnabled  = sal_False;
			aEvent.Requery	  = sal_False;

		}
		else if(pObj->aURL.Path == C2U("Bib/query"))
		{
			FeatureStateEvent aEvent;
			aEvent.FeatureURL = pObj->aURL;
			aEvent.IsEnabled  = sal_True;
			aEvent.Requery	  = sal_False;

		}
		else if(COMPARE_EQUAL == pObj->aURL.Path.compareToAscii("Bib/query"))
		{
			FeatureStateEvent aEvent;
			aEvent.FeatureURL = pObj->aURL;
			aEvent.IsEnabled  = sal_True;
			aEvent.Requery	  = sal_False;




	}
	catch(Exception& rEx)
	{
		(void) rEx;	// make compiler happy
        DBG_ERROR("BibPosListener::positioned: something went wrong !");
	}
}
/* -----------------------------04.01.00 11:28--------------------------------

 --------------------------------------------------*/
BibGeneralPage::BibGeneralPage(Window* pParent, BibDataManager* pMan):
	BibTabPage(pParent,BibResId(RID_TP_GENERAL)),
	pDatMan(pMan),
	aControlParentWin(this, WB_DIALOGCONTROL),
	aIdentifierFT(&aControlParentWin,	BibResId(FT_IDENTIFIER 	)),
	aAuthTypeFT(&aControlParentWin, 	BibResId(FT_AUTHTYPE		)),
	aAuthorFT(&aControlParentWin,		BibResId(FT_AUTHOR 		)),
	aMonthFT(&aControlParentWin,		BibResId(FT_MONTH			)),
	aYearFT(&aControlParentWin, 		BibResId(FT_YEAR			)),
	aAuthorFT(&aControlParentWin,		BibResId(FT_AUTHOR 		)),
	aTitleFT(&aControlParentWin,		BibResId(FT_TITLE			)),
	aPublisherFT(&aControlParentWin,	BibResId(FT_PUBLISHER		)),
	aISBNFT(&aControlParentWin, 		BibResId(FT_ISBN			)),

	aAddressFT(&aControlParentWin,		BibResId(FT_ADDRESS		)),
	aISBNFT(&aControlParentWin, 		BibResId(FT_ISBN			)),
	aBooktitleFT(&aControlParentWin,	BibResId(FT_BOOKTITLE		)),
	aChapterFT(&aControlParentWin,		BibResId(FT_CHAPTER		)),
	aPagesFT(&aControlParentWin,		BibResId(FT_PAGE			)),
    aFirstFL(&aControlParentWin,        BibResId(FL_1        )),
	aEditorFT(&aControlParentWin,		BibResId(FT_EDITOR 		)),
	aEditionFT(&aControlParentWin,		BibResId(FT_EDITION		)),
	aBooktitleFT(&aControlParentWin,	BibResId(FT_BOOKTITLE		)),
	aVolumeFT(&aControlParentWin,		BibResId(FT_VOLUME 		)),
	aHowpublishedFT(&aControlParentWin, BibResId(FT_HOWPUBLISHED	)),
	aOrganizationsFT(&aControlParentWin,BibResId(FT_ORGANIZATION	)),
	aInstitutionFT(&aControlParentWin,	BibResId(FT_INSTITUTION	)),
	aSchoolFT(&aControlParentWin,		BibResId(FT_SCHOOL 		)),
	aReportTypeFT(&aControlParentWin,	BibResId(FT_REPORT 		)),
	aMonthFT(&aControlParentWin,		BibResId(FT_MONTH			)),
    aSecondFL(&aControlParentWin,       BibResId(FL_2        )),
	aJournalFT(&aControlParentWin,		BibResId(FT_JOURNAL		)),
	aNoteFT(&aControlParentWin, 		BibResId(FT_NOTE			)),
	aNumberFT(&aControlParentWin,		BibResId(FT_NUMBER 		)),
	aOrganizationsFT(&aControlParentWin,BibResId(FT_ORGANIZATION	)),
	aPagesFT(&aControlParentWin,		BibResId(FT_PAGE			)),
	aSchoolFT(&aControlParentWin,		BibResId(FT_SCHOOL 		)),
	aSeriesFT(&aControlParentWin,		BibResId(FT_SERIES 		)),
	aAnnoteFT(&aControlParentWin,		BibResId(FT_ANNOTE 		)),
	aNoteFT(&aControlParentWin, 		BibResId(FT_NOTE			)),
	aVolumeFT(&aControlParentWin,		BibResId(FT_VOLUME 		)),
	aURLFT(&aControlParentWin,			BibResId(FT_URL			)),
    aThirdFL(&aControlParentWin,        BibResId(FL_3        )),
	aCustom1FT(&aControlParentWin,		BibResId(FT_CUSTOM1		)),
	aCustom2FT(&aControlParentWin,		BibResId(FT_CUSTOM2		)),
	aCustom3FT(&aControlParentWin,		BibResId(FT_CUSTOM3		)),
	aCustom4FT(&aControlParentWin,		BibResId(FT_CUSTOM4		)),
	aCustom5FT(&aControlParentWin,		BibResId(FT_CUSTOM5		)),
    aFirstFL(&aControlParentWin,        BibResId(FL_1        )),
    aSecondFL(&aControlParentWin,       BibResId(FL_2        )),
    aThirdFL(&aControlParentWin,        BibResId(FL_3        )),
	aHoriScroll(this, WB_HORZ),
	aVertScroll(this, WB_VERT),
	sErrorPrefix(BibResId(ST_ERROR_PREFIX)),
	pDatMan(pMan)
{
	aControlParentWin.Show();
	aControlParentWin.SetHelpId(HID_BIB_CONTROL_PARENT);

				if(bTypeListBox)
				{
					//uno::Reference< beans::XPropertySet >  xPropSet(xControl, UNO_QUERY);
					uno::Any aAny;
					aAny <<= (sal_Int16)1;
					xPropSet->setPropertyValue(C2U("BoundColumn"), aAny);
					ListSourceType eSet = ListSourceType_VALUELIST;

	}
	catch(Exception& rEx)
	{
		(void) rEx;	// make compiler happy
        DBG_ERROR("BibGeneralPage::AddXControl: something went wrong !");
	}
	return xCtrModel;
}

Lines 68-78 Link Here

(-)extensions/source/bibliography/loadlisteneradapter.hxx (-3 / +2 lines)
68	private:	68	private:
69	OComponentAdapterBase* m_pAdapter;	69	OComponentAdapterBase* m_pAdapter;
70	::osl::Mutex& m_rMutex;	70	::osl::Mutex& m_rMutex;
71
72	protected:	71	protected:
73	OComponentListener( ::osl::Mutex& _rMutex )	72	OComponentListener( ::osl::Mutex& _rMutex )
74	:m_rMutex( _rMutex )	73	:m_pAdapter( NULL )
75	,m_pAdapter( NULL )	74	,m_rMutex( _rMutex )
76	{	75	{
77	}	76	}
78		77






BibToolBarListener::BibToolBarListener(BibToolBar *pTB,rtl::OUString aStr,sal_uInt16 nId):
		pToolBar(pTB),
		nIndex(nId),
		aCommand(aStr),
        pToolBar(pTB)
{
}



BibToolBar::BibToolBar(Window* pParent, Link aLink, WinBits nStyle):
	ToolBox(pParent,BibResId(RID_BIB_TOOLBAR)),
	aFtSource(this,WB_VCENTER),
	aLBSource(this,WB_DROPDOWN),
	aFtQuery(this,WB_VCENTER),
	aEdQuery(this),
    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),
	aEdQuery(this),
	nMenuId(0),
	nSelMenuItem(0),
	aLayoutManager( aLink ),
	nSymbolsSize( SFX_SYMBOLS_SIZE_SMALL ),
	nOutStyle( 0 )

		EndSelection(); 	// vor SetDropMode (SetDropMode ruft SetItemImage)

		SetItemDown(TBC_BT_AUTOFILTER,sal_True);
		nId = aPopupMenu.Execute(this, GetItemRect(TBC_BT_AUTOFILTER));


		if(nId>0)

Lines 481-490 Link Here

(-)extensions/source/dbpilots/controlwizard.cxx (-4 / +4 lines)
481	}	481	}
482	else	482	else
483	{ // can be a draw/impress doc only	483	{ // can be a draw/impress doc only
484	Reference< XDrawView > xView(xController, UNO_QUERY);	484	Reference< XDrawView > xAnotherView(xController, UNO_QUERY);
485	DBG_ASSERT(xView.is(), "OControlWizard::implDeterminePage: no alternatives left ... can't determine the page!");	485	DBG_ASSERT(xAnotherView.is(), "OControlWizard::implDeterminePage: no alternatives left ... can't determine the page!");
486	if (xView.is())	486	if (xAnotherView.is())
487	xPage = xView->getCurrentPage();	487	xPage = xAnotherView->getCurrentPage();
488	}	488	}
489	}	489	}
490	}	490	}

Lines 225-231 Link Here

(-)extensions/source/dbpilots/gridwizard.cxx (-1 / +1 lines)
225	ConstStringArrayIterator pColumnServiceName = aColumnServiceNames.begin();	225	ConstStringArrayIterator pColumnServiceName = aColumnServiceNames.begin();
226	ConstStringArrayIterator pColumnLabelPostfix = aColumnLabelPostfixes.begin();	226	ConstStringArrayIterator pColumnLabelPostfix = aColumnLabelPostfixes.begin();
227	ConstStringArrayIterator pFormFieldName = aFormFieldNames.begin();	227	ConstStringArrayIterator pFormFieldName = aFormFieldNames.begin();
228	ConstStringArrayIterator pEnd = aColumnServiceNames.end();	228	pEnd = aColumnServiceNames.end();
229		229
230	for (;pColumnServiceName < pEnd; ++pColumnServiceName, ++pColumnLabelPostfix, ++pFormFieldName)	230	for (;pColumnServiceName < pEnd; ++pColumnServiceName, ++pColumnLabelPostfix, ++pFormFieldName)
231	{	231	{

Lines 387-394 Link Here

(-)extensions/source/dbpilots/groupboxwiz.cxx (-1 / +1 lines)
387	,m_aFrame (this, ModuleRes(FL_DEFAULTSELECTION))	387	,m_aFrame (this, ModuleRes(FL_DEFAULTSELECTION))
388	,m_aDefaultSelectionLabel (this, ModuleRes(FT_DEFAULTSELECTION))	388	,m_aDefaultSelectionLabel (this, ModuleRes(FT_DEFAULTSELECTION))
389	,m_aDefSelYes (this, ModuleRes(RB_DEFSELECTION_YES))	389	,m_aDefSelYes (this, ModuleRes(RB_DEFSELECTION_YES))
390	,m_aDefSelection (this, ModuleRes(LB_DEFSELECTIONFIELD))
391	,m_aDefSelNo (this, ModuleRes(RB_DEFSELECTION_NO))	390	,m_aDefSelNo (this, ModuleRes(RB_DEFSELECTION_NO))
		391	,m_aDefSelection (this, ModuleRes(LB_DEFSELECTIONFIELD))
392	{	392	{
393	FreeResource();	393	FreeResource();
394		394

Lines 129-135 Link Here

(-)extensions/source/dbpilots/optiongrouplayouter.cxx (-1 lines)
129	sal_Int32 nRadioButtons = _rSettings.aLabels.size();	129	sal_Int32 nRadioButtons = _rSettings.aLabels.size();
130		130
131	sal_Int32 nTopSpace = 0;	131	sal_Int32 nTopSpace = 0;
132	sal_Int32 nButtonSpace = 0;
133		132
134	// the shape of the groupbox	133	// the shape of the groupbox
135	::com::sun::star::awt::Size aControlShapeSize = _rContext.xObjectShape->getSize();	134	::com::sun::star::awt::Size aControlShapeSize = _rContext.xObjectShape->getSize();

Lines 153-159 Link Here

(-)extensions/source/logging/plaintextformatter.cxx (-1 / +1 lines)
153	aLogEntry.appendAscii( " " );	153	aLogEntry.appendAscii( " " );
154		154
155	::rtl::OString sThreadID( ::rtl::OUStringToOString( _rRecord.ThreadID, osl_getThreadTextEncoding() ) );	155	::rtl::OString sThreadID( ::rtl::OUStringToOString( _rRecord.ThreadID, osl_getThreadTextEncoding() ) );
156	snprintf( buffer, buffer_size, "%08s", sThreadID.getStr() );	156	snprintf( buffer, buffer_size, "%8s", sThreadID.getStr() );
157	aLogEntry.appendAscii( buffer );	157	aLogEntry.appendAscii( buffer );
158	aLogEntry.appendAscii( " " );	158	aLogEntry.appendAscii( " " );
159		159




MacPluginComm::~MacPluginComm()
{
	NPP_Shutdown();
	if( m_nCommPID != -1 && m_nCommPID != 0 )
    {
        int status = 16777216;
        pid_t nExit = waitpid( m_nCommPID, &status, WUNTRACED );
#if OSL_DEBUG_LEVEL > 1
        fprintf( stderr, "child %d (plugin app child %d) exited with status %d\n", nExit, m_nCommPID, WEXITSTATUS(status) );
#endif
    }
}

NPError MacPluginComm::NPP_Destroy( NPP instance, 

    return 0;
}

void* MacPluginComm::NPP_GetJavaClass()
{
    return 0;
}

Lines 63-72 Link Here

(-)extensions/source/plugin/base/context.cxx (-1 / +1 lines)
63	private:	63	private:
64	Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xSMgr;	64	Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xSMgr;
65	FILE* fp;	65	FILE* fp;
66	Reference< ::com::sun::star::plugin::XPlugin > m_xPlugin;
67	::rtl::OUString m_aMIMEType;	66	::rtl::OUString m_aMIMEType;
68	::rtl::OUString m_aTarget;	67	::rtl::OUString m_aTarget;
69	::rtl::OUString m_aFileName;	68	::rtl::OUString m_aFileName;
		69	Reference< ::com::sun::star::plugin::XPlugin > m_xPlugin;
70		70
71	public:	71	public:
72	FileSink( const Reference< ::com::sun::star::lang::XMultiServiceFactory > &,	72	FileSink( const Reference< ::com::sun::star::lang::XMultiServiceFactory > &,

Lines 46-54 Link Here

(-)extensions/source/plugin/base/multiplx.cxx (-2 / +2 lines)
46	const Reference< ::com::sun::star::awt::XWindow > & rControl	46	const Reference< ::com::sun::star::awt::XWindow > & rControl
47	, const Reference< ::com::sun::star::awt::XWindow > & rPeer	47	, const Reference< ::com::sun::star::awt::XWindow > & rPeer
48	)	48	)
49	: aListenerHolder( aMutex )	49	: xPeer( rPeer )
50	, xPeer( rPeer )
51	, xControl( Reference< ::com::sun::star::awt::XControl >( rControl, UNO_QUERY ) )	50	, xControl( Reference< ::com::sun::star::awt::XControl >( rControl, UNO_QUERY ) )
		51	, aListenerHolder( aMutex )
52	{	52	{
53	}	53	}
54		54




//--------------------------------------------------------------------------------------------------
PluginControl_Impl::PluginControl_Impl() :
	_pMultiplexer( NULL )
	, _bVisible( sal_False )
	, _bInDesignMode( sal_False )
	, _bEnable( sal_True )
	, _nX( 0 )
	, _nY( 0 )
	, _nWidth( 100 )
	, _nHeight( 100 )
	, _nFlags( WINDOW_POSSIZE_ALL )
	, _bVisible( sal_False )
	, _bInDesignMode( sal_False )
	, _bEnable( sal_True )
{
}


Lines 154-163 Link Here

(-)extensions/source/plugin/base/plmodel.cxx (-3 / +6 lines)
154	{	154	{
155	if( nHandle == 1 \|\| nHandle == 2 )	155	if( nHandle == 1 \|\| nHandle == 2 )
156	{	156	{
157	if( rValue.getValueTypeClass() == typelib_TypeClass_STRING )	157	// inc/offuh/com/sun/star/uno/TypeClass.hdl: TypeClass_STRING = 12
		158	// inc/typelib/typeclass.h: typelib_TypeClass_STRING = 12
		159	if( (short)rValue.getValueTypeClass() == (short)typelib_TypeClass_STRING )
158	{	160	{
159	rConvertedValue = rValue;	161	rConvertedValue = rValue;
160	if( nHandle = 2 )	162	if( nHandle == 2 )
161	rOldValue <<= m_aCreationURL;	163	rOldValue <<= m_aCreationURL;
162	else if( nHandle == 1 )	164	else if( nHandle == 1 )
163	rOldValue <<= m_aMimeType;	165	rOldValue <<= m_aMimeType;
Lines 171-177 Link Here
171	const Any& rValue )	173	const Any& rValue )
172	throw()	174	throw()
173	{	175	{
174	if( rValue.getValueTypeClass() == typelib_TypeClass_STRING ) // FIXME wrong type!	176
		177	if( (short)rValue.getValueTypeClass() == (short)typelib_TypeClass_STRING )
175		178
176	{	179	{
177	if( nHandle == 2 )	180	if( nHandle == 2 )






XPlugin_Impl::XPlugin_Impl( const uno::Reference< com::sun::star::lang::XMultiServiceFactory >  & rSMgr) :
        m_xSMgr( rSMgr ),
        PluginControl_Impl(),
        m_xSMgr( rSMgr ),
        m_pPluginComm( NULL ),
        m_aEncoding( gsl_getSystemTextEncoding() ),
        m_pArgv( NULL ),
        m_pArgn( NULL ),
        m_nArgs( 0 ),
        m_aPluginMode( NP_FULL ),
        m_nProvidingState( PROVIDING_NONE ),
        m_nCalledFromPlugin( 0 ),
        m_pDisposer( NULL ),
        m_bIsDisposed( sal_False )
        m_aEncoding( gsl_getSystemTextEncoding() )
{
    memset( &m_aInstance, 0, sizeof( m_aInstance ) );
    memset( &m_aNPWindow, 0, sizeof( m_aNPWindow ) );

    std::list<XPlugin_Impl*>::iterator iter;

    {
//        Guard< Mutex > aGuard( PluginManager::get().getPluginMutex() );
        for( iter = rList.begin(); iter != rList.end(); ++iter )
        {
            if( *iter == this )

    uno::Reference< com::sun::star::beans::XPropertySet >  xPS( m_xModel, UNO_QUERY );
    xPS->removePropertyChangeListener( OUString(), this );
    {
//      Guard< Mutex > aGuard( PluginManager::get().getPluginMutex() );
        rList.remove( this );
    }
    m_aNPWindow.window = NULL;

        }
    }

    int nDescr = -1;

    int nPos = rURL.lastIndexOf( (sal_Unicode)'.' );
    OUString aExt = rURL.copy( nPos ).toAsciiLowerCase();
    if( nPos != -1 )

Lines 70-76 Link Here

(-)extensions/source/plugin/inc/plugin/aqua/sysplug.hxx (-1 / +1 lines)
70	virtual NPError NPP_Destroy( NPP instance, NPSavedData** save );	70	virtual NPError NPP_Destroy( NPP instance, NPSavedData** save );
71	virtual NPError NPP_DestroyStream( NPP instance, NPStream* stream,	71	virtual NPError NPP_DestroyStream( NPP instance, NPStream* stream,
72	NPError reason );	72	NPError reason );
73	virtual jref NPP_GetJavaClass();	73	virtual void* NPP_GetJavaClass();
74	virtual NPError NPP_Initialize();	74	virtual NPError NPP_Initialize();
75	virtual NPError NPP_New( NPMIMEType pluginType, NPP instance,	75	virtual NPError NPP_New( NPMIMEType pluginType, NPP instance,
76	uint16 mode, int16 argc,	76	uint16 mode, int16 argc,

Lines 89-100 Link Here

(-)extensions/source/propctrlr/browserline.cxx (-5 / +5 lines)
89	,m_pControlWindow( NULL )	89	,m_pControlWindow( NULL )
90	,m_pBrowseButton(NULL)	90	,m_pBrowseButton(NULL)
91	,m_pAdditionalBrowseButton( NULL )	91	,m_pAdditionalBrowseButton( NULL )
92	,m_bIndentTitle( false )
93	,m_bReadOnly( false )
94	,m_nNameWidth(0)
95	,m_pTheParent(pParent)
96	,m_pClickListener( NULL )	92	,m_pClickListener( NULL )
		93	,m_pTheParent(pParent)
		94	,m_nNameWidth(0)
97	,m_nEnableFlags( 0xFFFF )	95	,m_nEnableFlags( 0xFFFF )
		96	,m_bIndentTitle( false )
		97	,m_bReadOnly( false )
98	{	98	{
99	DBG_CTOR(OBrowserLine,NULL);	99	DBG_CTOR(OBrowserLine,NULL);
100	m_aFtTitle.Show();	100	m_aFtTitle.Show();
Lines 601-607 Link Here
601	sMessage += ::rtl::OString( e.Message.getStr(), e.Message.getLength(), osl_getThreadTextEncoding() );	601	sMessage += ::rtl::OString( e.Message.getStr(), e.Message.getLength(), osl_getThreadTextEncoding() );
602	OSL_ENSURE( false, sMessage );	602	OSL_ENSURE( false, sMessage );
603	#else	603	#else
604	e; // make compiler happy	604	(void) e; // make compiler happy
605	#endif	605	#endif
606	}	606	}
607	}	607	}




            ,m_pHelpWindow( new InspectorHelpWindow( this ) )
			,m_pLineListener(NULL)
            ,m_pControlObserver( NULL )
			,m_bUpdate(sal_True)
			,m_bIsActive(sal_False)
			,m_nYOffset(0)
            ,m_nCurrentPreferredHelpHeight(0)
			,m_nTheNameSize(0)
			,m_bIsActive(sal_False)
			,m_bUpdate(sal_True)
            ,m_pControlContextImpl( new PropertyControlContext_Impl( *this ) )
	{
		DBG_CTOR(OBrowserListBox,NULL);

        	sMessage += ::rtl::OString( e.Message.getStr(), e.Message.getLength(), osl_getThreadTextEncoding() );
        	OSL_ENSURE( false, sMessage );
        #else
        	(void) e; // make compiler happy
        #endif
        }
    }

        	sMessage += ::rtl::OString( e.Message.getStr(), e.Message.getLength(), osl_getThreadTextEncoding() );
        	OSL_ENSURE( false, sMessage );
        #else
        	(void) e; // make compiler happy
        #endif
        }
        return aPropertyValue;

            	sMessage += ::rtl::OString( e.Message.getStr(), e.Message.getLength(), osl_getThreadTextEncoding() );
            	OSL_ENSURE( false, sMessage );
            #else
            	(void) e; // make compiler happy
            #endif
            }
        }

Lines 517-524 Link Here

(-)extensions/source/propctrlr/eformspropertyhandler.cxx (-2 lines)
517	if ( !m_pHelper.get() )	517	if ( !m_pHelper.get() )
518	return InteractiveSelectionResult_Cancelled;	518	return InteractiveSelectionResult_Cancelled;
519		519
520	PropertyId nPropId( impl_getPropertyId_throw( _rPropertyName ) );
521
522	OSL_ENSURE( ( PROPERTY_ID_BINDING_NAME == nPropId )	520	OSL_ENSURE( ( PROPERTY_ID_BINDING_NAME == nPropId )
523	\|\| ( PROPERTY_ID_BIND_EXPRESSION == nPropId )	521	\|\| ( PROPERTY_ID_BIND_EXPRESSION == nPropId )
524	\|\| ( PROPERTY_ID_XSD_REQUIRED == nPropId )	522	\|\| ( PROPERTY_ID_XSD_REQUIRED == nPropId )




    //====================================================================
    EventDescription::EventDescription( EventId _nId, const sal_Char* _pListenerNamespaceAscii, const sal_Char* _pListenerClassAsciiName,
            const sal_Char* _pListenerMethodAsciiName, sal_uInt16 _nDisplayNameResId, sal_Int32 _nHelpId, sal_Int32 _nUniqueBrowseId )
        :sDisplayName( String( PcrRes( _nDisplayNameResId ) ) )
        ,sListenerMethodName( ::rtl::OUString::createFromAscii( _pListenerMethodAsciiName ) )
        ,sDisplayName( String( PcrRes( _nDisplayNameResId ) ) )
        ,nHelpId( _nHelpId )
        ,nUniqueBrowseId( _nUniqueBrowseId )
        ,nId( _nId )
    {
        ::rtl::OUStringBuffer aQualifiedListenerClass;
        aQualifiedListenerClass.appendAscii( "com.sun.star." );

    EventHandler::EventHandler( const Reference< XComponentContext >& _rxContext )
        :EventHandler_Base( m_aMutex )
        ,m_aContext( _rxContext )
        ,m_aPropertyListeners( m_aMutex )
        ,m_bEventsMapInitialized( false )
        ,m_bIsDialogElement( false )
        ,m_aPropertyListeners( m_aMutex )
    {
        DBG_CTOR( EventHandler, NULL );
    }

        	sMessage += ::rtl::OString( e.Message.getStr(), e.Message.getLength(), osl_getThreadTextEncoding() );
        	OSL_ENSURE( false, sMessage );
        #else
        	(void) e; // make compiler happy
        #endif
        }


        	sMessage += ::rtl::OString( e.Message.getStr(), e.Message.getLength(), osl_getThreadTextEncoding() );
        	OSL_ENSURE( false, sMessage );
        #else
        	(void) e; // make compiler happy
        #endif
        }
    }

Lines 85-93 Link Here

(-)extensions/source/propctrlr/eventhandler.hxx (-2 / +2 lines)
85	EventId nId;	85	EventId nId;
86		86
87	EventDescription()	87	EventDescription()
88	:nId( 0 )	88	:nHelpId( 0 )
89	,nHelpId( 0 )
90	,nUniqueBrowseId( 0 )	89	,nUniqueBrowseId( 0 )
		90	,nId( 0 )
91	{	91	{
92	}	92	}
93		93

Lines 463-469 Link Here

(-)extensions/source/propctrlr/fontdialog.cxx (-2 / +2 lines)
463	lcl_pushBackPropertyValue( _out_properties, PROPERTY_FONT_UNDERLINE,makeAny(nUnderline));	463	lcl_pushBackPropertyValue( _out_properties, PROPERTY_FONT_UNDERLINE,makeAny(nUnderline));
464		464
465	// the text line color is transported in this item, too	465	// the text line color is transported in this item, too
466	sal_Int32 nColor = rUnderlineItem.GetColor().GetColor();	466	sal_uInt32 nColor = rUnderlineItem.GetColor().GetColor();
467		467
468	Any aUnoColor;	468	Any aUnoColor;
469	if (COL_AUTO != nColor)	469	if (COL_AUTO != nColor)
Lines 508-514 Link Here
508	const SvxColorItem& rColorItem =	508	const SvxColorItem& rColorItem =
509	static_cast<const SvxColorItem&>(_rSet.Get(CFID_CHARCOLOR));	509	static_cast<const SvxColorItem&>(_rSet.Get(CFID_CHARCOLOR));
510		510
511	sal_Int32 nColor = rColorItem.GetValue().GetColor();	511	sal_uInt32 nColor = rColorItem.GetValue().GetColor();
512		512
513	Any aUnoColor;	513	Any aUnoColor;
514	if (COL_AUTO != nColor)	514	if (COL_AUTO != nColor)

Lines 597-604 Link Here

(-)extensions/source/propctrlr/formmetadata.cxx (-1 / +1 lines)
597	//--------------------------------------------------------------------	597	//--------------------------------------------------------------------
598	DefaultEnumRepresentation::DefaultEnumRepresentation( const IPropertyInfoService& _rInfo, const Type& _rType, sal_Int32 _nPropertyId )	598	DefaultEnumRepresentation::DefaultEnumRepresentation( const IPropertyInfoService& _rInfo, const Type& _rType, sal_Int32 _nPropertyId )
599	:m_refCount( 0 )	599	:m_refCount( 0 )
600	,m_aType( _rType )
601	,m_rMetaData( _rInfo )	600	,m_rMetaData( _rInfo )
		601	,m_aType( _rType )
602	,m_nPropertyId( _nPropertyId )	602	,m_nPropertyId( _nPropertyId )
603	{	603	{
604	DBG_CTOR( DefaultEnumRepresentation, NULL );	604	DBG_CTOR( DefaultEnumRepresentation, NULL );




    class EnumRepresentation : public IPropertyEnumRepresentation
    {
    private:
        Type                                m_aEnumType;
        oslInterlockedCount                 m_refCount;
        Reference< XEnumTypeDescription >   m_xTypeDescription;
        Type                                m_aEnumType;

    public:
        EnumRepresentation( const Reference< XComponentContext >& _rxContext, const Type& _rEnumType );

    GenericPropertyHandler::GenericPropertyHandler( const Reference< XComponentContext >& _rxContext )
        :GenericPropertyHandler_Base( m_aMutex )
        ,m_aContext( _rxContext )
        ,m_bPropertyMapInitialized( false )
        ,m_aPropertyListeners( m_aMutex )
        ,m_bPropertyMapInitialized( false )
    {
        DBG_CTOR( GenericPropertyHandler, NULL );


Lines 329-335 Link Here

(-)extensions/source/propctrlr/handlerhelper.cxx (-2 / +2 lines)
329	sMessage += ::rtl::OString( e.Message.getStr(), e.Message.getLength(), osl_getThreadTextEncoding() );	329	sMessage += ::rtl::OString( e.Message.getStr(), e.Message.getLength(), osl_getThreadTextEncoding() );
330	OSL_ENSURE( false, sMessage );	330	OSL_ENSURE( false, sMessage );
331	#else	331	#else
332	e; // make compiler happy	332	(void) e; // make compiler happy
333	#endif	333	#endif
334	}	334	}
335	}	335	}
Lines 351-357 Link Here
351	sMessage += ::rtl::OString( e.Message.getStr(), e.Message.getLength(), osl_getThreadTextEncoding() );	351	sMessage += ::rtl::OString( e.Message.getStr(), e.Message.getLength(), osl_getThreadTextEncoding() );
352	OSL_ENSURE( false, sMessage );	352	OSL_ENSURE( false, sMessage );
353	#else	353	#else
354	e; // make compiler happy	354	(void) e; // make compiler happy
355	#endif	355	#endif
356	}	356	}
357	return pInspectorWindow;	357	return pInspectorWindow;

Lines 925-931 Link Here

(-)extensions/source/propctrlr/propcontroller.cxx (-2 / +2 lines)
925	sMessage += ::rtl::OString( e.Message.getStr(), e.Message.getLength(), osl_getThreadTextEncoding() );	925	sMessage += ::rtl::OString( e.Message.getStr(), e.Message.getLength(), osl_getThreadTextEncoding() );
926	OSL_ENSURE( false, sMessage );	926	OSL_ENSURE( false, sMessage );
927	#else	927	#else
928	e; // make compiler happy	928	(void) e; // make compiler happy
929	#endif	929	#endif
930	}	930	}
931	}	931	}
Lines 1390-1396 Link Here
1390	sMessage += ::rtl::OString( e.Message.getStr(), e.Message.getLength(), osl_getThreadTextEncoding() );	1390	sMessage += ::rtl::OString( e.Message.getStr(), e.Message.getLength(), osl_getThreadTextEncoding() );
1391	OSL_ENSURE( false, sMessage );	1391	OSL_ENSURE( false, sMessage );
1392	#else	1392	#else
1393	e; // make compiler happy	1393	(void) e; // make compiler happy
1394	#endif	1394	#endif
1395	}	1395	}
1396	}	1396	}




    //--------------------------------------------------------------------
    PropertyHandler::PropertyHandler( const Reference< XComponentContext >& _rxContext )
        :PropertyHandler_Base( m_aMutex )
        ,m_aContext( _rxContext )
        ,m_pInfoService  ( new OPropertyInfoService )
        ,m_bSupportedPropertiesAreKnown( false )
        ,m_aPropertyListeners( m_aMutex )
        ,m_aContext( _rxContext )
        ,m_pInfoService  ( new OPropertyInfoService )
    {
        DBG_CTOR( PropertyHandler, NULL );
        

    //--------------------------------------------------------------------
    PropertyHandler::PropertyHandler( const Reference< XMultiServiceFactory >& _rxLegacyFactory )
        :PropertyHandler_Base( m_aMutex )
        ,m_aContext( _rxLegacyFactory )
        ,m_pInfoService  ( new OPropertyInfoService )
        ,m_bSupportedPropertiesAreKnown( false )
        ,m_aPropertyListeners( m_aMutex )
        ,m_aContext( _rxLegacyFactory )
        ,m_pInfoService  ( new OPropertyInfoService )
    {
        DBG_CTOR( PropertyHandler, NULL );
        

Lines 1083-1090 Link Here

(-)extensions/source/propctrlr/standardcontrol.cxx (-1 / +1 lines)
1083	DropDownEditControl::DropDownEditControl( Window* _pParent, WinBits _nStyle )	1083	DropDownEditControl::DropDownEditControl( Window* _pParent, WinBits _nStyle )
1084	:DropDownEditControl_Base( _pParent, _nStyle )	1084	:DropDownEditControl_Base( _pParent, _nStyle )
1085	,m_pFloatingEdit( NULL )	1085	,m_pFloatingEdit( NULL )
1086	,m_pDropdownButton( NULL )
1087	,m_pImplEdit( NULL )	1086	,m_pImplEdit( NULL )
		1087	,m_pDropdownButton( NULL )
1088	,m_bDropdown( sal_False )	1088	,m_bDropdown( sal_False )
1089	{	1089	{
1090	SetCompoundControl( TRUE );	1090	SetCompoundControl( TRUE );




    TabOrderDialog::TabOrderDialog( Window* _pParent, const Reference< XTabControllerModel >& _rxTabModel,
                    const Reference< XControlContainer >& _rxControlCont, const Reference< XMultiServiceFactory >& _rxORB )
        :ModalDialog( _pParent, PcrRes( RID_DLG_TABORDER ) )
        ,m_xModel( _rxTabModel )
        ,m_xControlContainer( _rxControlCont )
        ,m_xORB( _rxORB )
        ,aFT_Controls( this, PcrRes( FT_CONTROLS ) )
        ,aLB_Controls( this, PcrRes( CTRL_TREE ) )
        ,aPB_OK( this, PcrRes( PB_OK ) )
        ,aPB_CANCEL( this, PcrRes( PB_CANCEL ) )
        ,aPB_HELP( this, PcrRes( PB_HELP ) )
        ,aFT_Controls( this, PcrRes( FT_CONTROLS ) )
        ,aPB_MoveUp( this, PcrRes( PB_MOVE_UP ) )
        ,aPB_MoveDown( this, PcrRes( PB_MOVE_DOWN ) )
        ,aPB_AutoOrder( this, PcrRes( PB_AUTO_ORDER ) )
        ,aLB_Controls( this, PcrRes( CTRL_TREE ) )
        ,pImageList( NULL )
        ,m_xModel( _rxTabModel )
        ,m_xControlContainer( _rxControlCont )
        ,m_xORB( _rxORB )
    {
        DBG_CTOR(TabOrderDialog,NULL);


Lines 269-275 Link Here

(-)extensions/source/resource/resource.cxx (-2 / +2 lines)
269	OGuard aGuard( Application::GetSolarMutex() );	269	OGuard aGuard( Application::GetSolarMutex() );
270	for( sal_Int32 n = 0; n < nElements; n++ )	270	for( sal_Int32 n = 0; n < nElements; n++ )
271	{	271	{
272	sal_Int32 nId;	272	sal_Int32 nId = 0;
273	if( !(pIn[n] >>= nId) )	273	if( !(pIn[n] >>= nId) )
274	{	274	{
275	if( xC.is() )	275	if( xC.is() )
Lines 322-328 Link Here
322	Reference< XTypeConverter > xC = getTypeConverter();	322	Reference< XTypeConverter > xC = getTypeConverter();
323	OGuard aGuard( Application::GetSolarMutex() );	323	OGuard aGuard( Application::GetSolarMutex() );
324		324
325	sal_Int32 nId;	325	sal_Int32 nId = 0;
326	if( !(Params.getConstArray()[0] >>= nId) )	326	if( !(Params.getConstArray()[0] >>= nId) )
327	{	327	{
328	if( xC.is() )	328	if( xC.is() )

Lines 356-362 Link Here

(-)extensions/source/scanner/grid.cxx (-1 lines)
356	{	356	{
357	char pBuf[256];	357	char pBuf[256];
358	SetLineColor( Color( COL_BLACK ) );	358	SetLineColor( Color( COL_BLACK ) );
359	TextAlign aAlign = GetTextAlign();
360	// draw vertical lines	359	// draw vertical lines
361	for( double fX = m_fMinChunkX; fX < m_fMaxX; fX += m_fChunkX )	360	for( double fX = m_fMinChunkX; fX < m_fMaxX; fX += m_fChunkX )
362	{	361	{




}

Sane::Sane() :
		maHandle( 0 ),
		mppOptions( 0 ),
		mnOptions( 0 ),
		mnDevice( -1 ),
		maHandle( 0 )
{
	if( ! nRefCount || ! pSaneLib )
		Init();

		fprintf( stderr, "Error: sane driver returned %s while reading number of options !\n", p_strstatus( nStatus ) );

	mnOptions = pOptions[ 0 ];
	if( (unsigned int) pZero->size > sizeof( SANE_Word ) )
		fprintf( stderr, "driver returned number of options with larger size than SANE_Word !!!\n" );
	if( mppOptions )
		delete [] mppOptions;
	mppOptions = (const SANE_Option_Descriptor**)new SANE_Option_Descriptor*[ mnOptions ];

		delete [] pFixedSet;
		return FALSE;
	}
	for( unsigned int i = 0; i < mppOptions[n]->size/sizeof(SANE_Word); i++ )
	{
		if( mppOptions[n]->type == SANE_TYPE_FIXED )
			pSet[i] = SANE_UNFIX( pFixedSet[i] );

						  mppOptions[n]->type != SANE_TYPE_FIXED ) )
		return FALSE;
	SANE_Word* pFixedSet = new SANE_Word[mppOptions[n]->size/sizeof(SANE_Word)];
	for( unsigned int i = 0; i < mppOptions[n]->size/sizeof(SANE_Word); i++ )
	{
		if( mppOptions[n]->type == SANE_TYPE_FIXED )
			pFixedSet[i] = SANE_FIX( pSet[i] );

								aConverter << nValue;
								aConverter.SeekRel( 2 );
								break;
                            case SANE_FRAME_GRAY:
                            case SANE_FRAME_RGB:
                                break;
                        }
					}
				}
 				int nGap = aConverter.Tell() & 3;

{
	String aText;
	SANE_Unit nUnit = mppOptions[n]->unit;
	if( nUnit < 0 || nUnit > static_cast<int>(sizeof( ppUnits )/sizeof( ppUnits[0]) ) )
		aText = String::CreateFromAscii( "[unknown units]" );
	else
		aText = String( ppUnits[ nUnit ], gsl_getSystemTextEncoding() );




SaneDlg::SaneDlg( Window* pParent, Sane& rSane ) :
		ModalDialog( pParent, SaneResId( RID_SANE_DIALOG ) ),
		mrSane( rSane ),
		mpRange( 0 ),
		maMapMode( MAP_APPFONT ),
		mbIsDragging( FALSE ),
		mbDragDrawn( FALSE ),
		maMapMode( MAP_APPFONT ),
		maOKButton( this, SaneResId( RID_SCAN_OK ) ),
		maCancelButton( this, SaneResId( RID_SCAN_CANCEL ) ),
		maPreviewButton( this, SaneResId( RID_PREVIEW_BTN ) ),
		maDeviceInfoButton( this, SaneResId( RID_DEVICEINFO_BTN ) ),
		maPreviewButton( this, SaneResId( RID_PREVIEW_BTN ) ),
		maButtonOption( this, SaneResId( RID_SCAN_BUTTON_OPTION_BTN ) ),
		maDeviceBoxTxt( this, SaneResId( RID_DEVICE_BOX_TXT ) ),
		maScanLeftTxt( this, SaneResId( RID_SCAN_LEFT_TXT ) ),
		maScanTopTxt( this, SaneResId( RID_SCAN_TOP_TXT ) ),
		maRightTxt( this, SaneResId( RID_SCAN_RIGHT_TXT ) ),
		maBottomTxt( this, SaneResId( RID_SCAN_BOTTOM_TXT ) ),
		maReslTxt( this, SaneResId( RID_SCAN_RESOLUTION_TXT ) ),
		maOptionTitle( this, SaneResId( RID_SCAN_OPTIONTITLE_TXT ) ),
		maOptionsTxt( this, SaneResId( RID_SCAN_OPTION_TXT ) ),
		maOptionTitle( this, SaneResId( RID_SCAN_OPTIONTITLE_TXT ) ),
		maOptionDescTxt( this, SaneResId( RID_SCAN_OPTION_DESC_TXT ) ),
		maVectorTxt( this, SaneResId( RID_SCAN_NUMERIC_VECTOR_TXT ) ),
		maScanLeftTxt( this, SaneResId( RID_SCAN_LEFT_TXT ) ),
		maLeftField( this, SaneResId( RID_SCAN_LEFT_BOX ) ),
		maScanTopTxt( this, SaneResId( RID_SCAN_TOP_TXT ) ),
		maTopField( this, SaneResId( RID_SCAN_TOP_BOX ) ),
		maRightTxt( this, SaneResId( RID_SCAN_RIGHT_TXT ) ),
		maRightField( this, SaneResId( RID_SCAN_RIGHT_BOX ) ),
		maBottomTxt( this, SaneResId( RID_SCAN_BOTTOM_TXT ) ),
		maBottomField( this, SaneResId( RID_SCAN_BOTTOM_BOX ) ),
		maDeviceBoxTxt( this, SaneResId( RID_DEVICE_BOX_TXT ) ),
		maDeviceBox( this, SaneResId( RID_DEVICE_BOX ) ),
		maReslTxt( this, SaneResId( RID_SCAN_RESOLUTION_TXT ) ),
		maReslBox( this, SaneResId( RID_SCAN_RESOLUTION_BOX ) ),
		maAdvancedTxt( this, SaneResId( RID_SCAN_ADVANCED_TXT ) ),
		maAdvancedBox( this, SaneResId( RID_SCAN_ADVANCED_BOX ) ),
		maVectorBox( this, SaneResId( RID_SCAN_NUMERIC_VECTOR_BOX ) ),
		maQuantumRangeBox( this, SaneResId( RID_SCAN_QUANTUM_RANGE_BOX ) ),
		maStringRangeBox( this, SaneResId( RID_SCAN_STRING_RANGE_BOX ) ),
		maPreviewBox( this, SaneResId( RID_PREVIEW_BOX ) ),
		maAreaBox( this, SaneResId( RID_SCANAREA_BOX ) ),
		maBoolCheckBox( this, SaneResId( RID_SCAN_BOOL_OPTION_BOX ) ),
		maStringEdit( this, SaneResId( RID_SCAN_STRING_OPTION_EDT ) ),
		maNumericEdit( this, SaneResId( RID_SCAN_NUMERIC_OPTION_EDT ) ),
		maOptionBox( this, SaneResId( RID_SCAN_OPTION_BOX ) ),
		mpRange( 0 )
		maAdvancedBox( this, SaneResId( RID_SCAN_ADVANCED_BOX ) ),
		maAdvancedTxt( this, SaneResId( RID_SCAN_ADVANCED_TXT ) )
{
	if( Sane::IsSane() )
	{

	if( ! Sane::IsSane() )
		return;

	int nOption, i, nValue;
	unsigned int n;
    double fValue;
	BOOL bSuccess = FALSE;
	char *ppSpecialOptions[] = {
		"resolution",

                    break;
                case SANE_TYPE_FIXED:
                case SANE_TYPE_INT:
                case SANE_TYPE_BOOL:
                case SANE_TYPE_STRING:
                case SANE_TYPE_GROUP:
                {
					int nElements = mrSane.GetOptionElements( mnCurrentOption );
                    double* x = new double[ nElements ];

		"br-y"
	};
	for( int i = 0;
		 i < (int)(sizeof(pSaveOptions)/sizeof(pSaveOptions[0]));
		 i++ )
	{
		ByteString aOption = pSaveOptions[i];




// --------------

FastString::FastString( sal_uInt32 nInitLen, sal_uInt32 nIncrement ) :
	mpBuffer( new sal_Unicode[ nInitLen * sizeof( sal_Unicode ) ] ),
	mnBufLen( nInitLen ),
	mnCurLen( 0 ),
	mnBufInc( nIncrement ),
	mpBuffer( new sal_Unicode[ nInitLen * sizeof( sal_Unicode ) ] ),
	mnPartPos( 0 )
{
	DBG_ASSERT( nInitLen, "invalid initial length" );

		sal_Char*		pTmpSrc = pBufferForBase64Encoding;
		sal_Unicode*	pTmpDst = mpBuffer;

		for( sal_uInt32 i = 0; i < nQuadCount; i++ )
		{
			const sal_Int32 nA = *pTmpSrc++;
			const sal_Int32 nB = *pTmpSrc++;

	mrExport( rExport ),
	mrMtf( rMtf ),
	mpContext( NULL ),
	mbClipAttrChanged( sal_False ),
	mnCurClipId( 1 ),
	mbClipAttrChanged( sal_False ),
	mbDoublePoints( bWriteDoublePoints )
{
	if( pParentVDev )

{
	if( rPolyPoly.Count() )
	{
		SvXMLElementExport	aElemG( mrExport, XML_NAMESPACE_NONE, aXMLElemG, TRUE, TRUE );
		FastString			aClipId;
		FastString			aClipStyle;


Lines 858-864 Link Here

(-)extensions/source/update/check/updatecheck.cxx (-1 lines)
858	rtl::OUString aInstallImage(m_aImageName);	858	rtl::OUString aInstallImage(m_aImageName);
859	osl::FileBase::getSystemPathFromFileURL(aInstallImage, aInstallImage);	859	osl::FileBase::getSystemPathFromFileURL(aInstallImage, aInstallImage);
860	xShellExecute->execute(aInstallImage, rtl::OUString(), c3s::SystemShellExecuteFlags::DEFAULTS);	860	xShellExecute->execute(aInstallImage, rtl::OUString(), c3s::SystemShellExecuteFlags::DEFAULTS);
861	ShutdownThread *pShutdownThread = new ShutdownThread( m_xContext );
862	}	861	}
863	} catch(c3s::SystemShellExecuteException&) {	862	} catch(c3s::SystemShellExecuteException&) {
864	m_aUpdateHandler->setErrorMessage( m_aUpdateHandler->getDefaultInstErrMsg() );	863	m_aUpdateHandler->setErrorMessage( m_aUpdateHandler->getDefaultInstErrMsg() );




bool 
UpdateCheckConfig::isAutoCheckEnabled() const
{
    sal_Bool nValue = sal_False;
    const_cast < UpdateCheckConfig *> (this)->getByName( UNISTRING( AUTOCHECK_ENABLED ) ) >>= nValue;
    return nValue;
}

bool 
UpdateCheckConfig::isAutoDownloadEnabled() const
{
    sal_Bool nValue = sal_False;
    const_cast < UpdateCheckConfig *> (this)->getByName( UNISTRING( AUTODOWNLOAD_ENABLED ) ) >>= nValue;
    return nValue;
}

sal_Int64
UpdateCheckConfig::getLastChecked() const
{
    sal_Int64 nValue = 0;
    
    // getByName is defined as non const in XNameAccess
    const_cast < UpdateCheckConfig *> (this)->getByName( UNISTRING( LAST_CHECK ) ) >>= nValue;

sal_Int64
UpdateCheckConfig::getCheckInterval() const
{
    sal_Int64 nValue = 0;
    
    // getByName is defined as non const in XNameAccess
    const_cast < UpdateCheckConfig *> (this)->getByName( UNISTRING( CHECK_INTERVAL ) ) >>= nValue;

                // FIXME: use non IgnoreAsciiCase version as soon as it becomes available
                if( aString.endsWithIgnoreAsciiCaseAsciiL(AUTOCHECK_ENABLED "']", sizeof(AUTOCHECK_ENABLED)+1) )
                {
                    sal_Bool bEnabled = sal_False;
                    aChangesSet[i].Element >>= bEnabled;
                    m_rListener->autoCheckStatusChanged(sal_True == bEnabled);
                }




            throw lang::IllegalArgumentException();
    }
    else if (rPropertyName.compareToAscii( PROPERTY_SHOW_MENUICON ) == 0) {
        bool bShowMenuIcon = sal_False;
        rValue >>= bShowMenuIcon;
        if ( bShowMenuIcon != mbShowMenuIcon )
        {

                               | WB_OWNERDRAWDECORATION
                               | WB_NOBORDER
                    )
    , maMaxTextSize( TEXT_MAX_WIDTH, TEXT_MAX_HEIGHT )
    , maBubbleTitle( rTitle )
    , maBubbleText( rText )
    , maBubbleImage( rImage )
    , maMaxTextSize( TEXT_MAX_WIDTH, TEXT_MAX_HEIGHT )
    , mnTipOffset( 0 )
{
    SetBackground( Wallpaper( GetSettings().GetStyleSettings().GetHelpColor() ) );

Return to issue 81612

Lines 430-436 Link Here

(-)extensions/source/bibliography/framectr.cxx (-4 lines)
430	{	430	{
431	const CmdToInfoCache& rCmdCache = GetCommandToInfoCache();	431	const CmdToInfoCache& rCmdCache = GetCommandToInfoCache();
432		432
433	sal_Int32 i( 0 );
434	sal_Bool bGroupFound( sal_False );	433	sal_Bool bGroupFound( sal_False );
435	frame::DispatchInformation aDispatchInfo;	434	frame::DispatchInformation aDispatchInfo;
436	std::list< frame::DispatchInformation > aDispatchInfoList;	435	std::list< frame::DispatchInformation > aDispatchInfoList;
Lines 967-973 Link Here
967	BibStatusDispatch *pObj = aStatusListeners[n];	966	BibStatusDispatch *pObj = aStatusListeners[n];
968	if ( pObj->aURL.Path == C2U("Bib/removeFilter") )	967	if ( pObj->aURL.Path == C2U("Bib/removeFilter") )
969	{	968	{
970	FeatureStateEvent aEvent;
971	aEvent.FeatureURL = pObj->aURL;	969	aEvent.FeatureURL = pObj->aURL;
972	aEvent.IsEnabled = sal_False;	970	aEvent.IsEnabled = sal_False;
973	aEvent.Requery = sal_False;	971	aEvent.Requery = sal_False;
Lines 977-983 Link Here
977	}	975	}
978	else if(pObj->aURL.Path == C2U("Bib/query"))	976	else if(pObj->aURL.Path == C2U("Bib/query"))
979	{	977	{
980	FeatureStateEvent aEvent;
981	aEvent.FeatureURL = pObj->aURL;	978	aEvent.FeatureURL = pObj->aURL;
982	aEvent.IsEnabled = sal_True;	979	aEvent.IsEnabled = sal_True;
983	aEvent.Requery = sal_False;	980	aEvent.Requery = sal_False;
Lines 1042-1048 Link Here
1042	}	1039	}
1043	else if(COMPARE_EQUAL == pObj->aURL.Path.compareToAscii("Bib/query"))	1040	else if(COMPARE_EQUAL == pObj->aURL.Path.compareToAscii("Bib/query"))
1044	{	1041	{
1045	FeatureStateEvent aEvent;
1046	aEvent.FeatureURL = pObj->aURL;	1042	aEvent.FeatureURL = pObj->aURL;
1047	aEvent.IsEnabled = sal_True;	1043	aEvent.IsEnabled = sal_True;
1048	aEvent.Requery = sal_False;	1044	aEvent.Requery = sal_False;

Lines 403-413 Link Here

(-)extensions/source/propctrlr/browserlistbox.cxx (-5 / +5 lines)
403	,m_pHelpWindow( new InspectorHelpWindow( this ) )	403	,m_pHelpWindow( new InspectorHelpWindow( this ) )
404	,m_pLineListener(NULL)	404	,m_pLineListener(NULL)
405	,m_pControlObserver( NULL )	405	,m_pControlObserver( NULL )
406	,m_bUpdate(sal_True)
407	,m_bIsActive(sal_False)
408	,m_nYOffset(0)	406	,m_nYOffset(0)
409	,m_nCurrentPreferredHelpHeight(0)	407	,m_nCurrentPreferredHelpHeight(0)
410	,m_nTheNameSize(0)	408	,m_nTheNameSize(0)
		409	,m_bIsActive(sal_False)
		410	,m_bUpdate(sal_True)
411	,m_pControlContextImpl( new PropertyControlContext_Impl( *this ) )	411	,m_pControlContextImpl( new PropertyControlContext_Impl( *this ) )
412	{	412	{
413	DBG_CTOR(OBrowserListBox,NULL);	413	DBG_CTOR(OBrowserListBox,NULL);
Lines 986-992 Link Here
986	sMessage += ::rtl::OString( e.Message.getStr(), e.Message.getLength(), osl_getThreadTextEncoding() );	986	sMessage += ::rtl::OString( e.Message.getStr(), e.Message.getLength(), osl_getThreadTextEncoding() );
987	OSL_ENSURE( false, sMessage );	987	OSL_ENSURE( false, sMessage );
988	#else	988	#else
989	e; // make compiler happy	989	(void) e; // make compiler happy
990	#endif	990	#endif
991	}	991	}
992	}	992	}
Lines 1021-1027 Link Here
1021	sMessage += ::rtl::OString( e.Message.getStr(), e.Message.getLength(), osl_getThreadTextEncoding() );	1021	sMessage += ::rtl::OString( e.Message.getStr(), e.Message.getLength(), osl_getThreadTextEncoding() );
1022	OSL_ENSURE( false, sMessage );	1022	OSL_ENSURE( false, sMessage );
1023	#else	1023	#else
1024	e; // make compiler happy	1024	(void) e; // make compiler happy
1025	#endif	1025	#endif
1026	}	1026	}
1027	return aPropertyValue;	1027	return aPropertyValue;
Lines 1124-1130 Link Here
1124	sMessage += ::rtl::OString( e.Message.getStr(), e.Message.getLength(), osl_getThreadTextEncoding() );	1124	sMessage += ::rtl::OString( e.Message.getStr(), e.Message.getLength(), osl_getThreadTextEncoding() );
1125	OSL_ENSURE( false, sMessage );	1125	OSL_ENSURE( false, sMessage );
1126	#else	1126	#else
1127	e; // make compiler happy	1127	(void) e; // make compiler happy
1128	#endif	1128	#endif
1129	}	1129	}
1130	}	1130	}

Lines 213-223 Link Here

(-)extensions/source/propctrlr/eventhandler.cxx (-5 / +5 lines)
213	//====================================================================	213	//====================================================================
214	EventDescription::EventDescription( EventId _nId, const sal_Char* _pListenerNamespaceAscii, const sal_Char* _pListenerClassAsciiName,	214	EventDescription::EventDescription( EventId _nId, const sal_Char* _pListenerNamespaceAscii, const sal_Char* _pListenerClassAsciiName,
215	const sal_Char* _pListenerMethodAsciiName, sal_uInt16 _nDisplayNameResId, sal_Int32 _nHelpId, sal_Int32 _nUniqueBrowseId )	215	const sal_Char* _pListenerMethodAsciiName, sal_uInt16 _nDisplayNameResId, sal_Int32 _nHelpId, sal_Int32 _nUniqueBrowseId )
216	:nId( _nId )	216	:sDisplayName( String( PcrRes( _nDisplayNameResId ) ) )
217	,sListenerMethodName( ::rtl::OUString::createFromAscii( _pListenerMethodAsciiName ) )	217	,sListenerMethodName( ::rtl::OUString::createFromAscii( _pListenerMethodAsciiName ) )
218	,sDisplayName( String( PcrRes( _nDisplayNameResId ) ) )
219	,nHelpId( _nHelpId )	218	,nHelpId( _nHelpId )
220	,nUniqueBrowseId( _nUniqueBrowseId )	219	,nUniqueBrowseId( _nUniqueBrowseId )
		220	,nId( _nId )
221	{	221	{
222	::rtl::OUStringBuffer aQualifiedListenerClass;	222	::rtl::OUStringBuffer aQualifiedListenerClass;
223	aQualifiedListenerClass.appendAscii( "com.sun.star." );	223	aQualifiedListenerClass.appendAscii( "com.sun.star." );
Lines 588-596 Link Here
588	EventHandler::EventHandler( const Reference< XComponentContext >& _rxContext )	588	EventHandler::EventHandler( const Reference< XComponentContext >& _rxContext )
589	:EventHandler_Base( m_aMutex )	589	:EventHandler_Base( m_aMutex )
590	,m_aContext( _rxContext )	590	,m_aContext( _rxContext )
		591	,m_aPropertyListeners( m_aMutex )
591	,m_bEventsMapInitialized( false )	592	,m_bEventsMapInitialized( false )
592	,m_bIsDialogElement( false )	593	,m_bIsDialogElement( false )
593	,m_aPropertyListeners( m_aMutex )
594	{	594	{
595	DBG_CTOR( EventHandler, NULL );	595	DBG_CTOR( EventHandler, NULL );
596	}	596	}
Lines 1020-1026 Link Here
1020	sMessage += ::rtl::OString( e.Message.getStr(), e.Message.getLength(), osl_getThreadTextEncoding() );	1020	sMessage += ::rtl::OString( e.Message.getStr(), e.Message.getLength(), osl_getThreadTextEncoding() );
1021	OSL_ENSURE( false, sMessage );	1021	OSL_ENSURE( false, sMessage );
1022	#else	1022	#else
1023	e; // make compiler happy	1023	(void) e; // make compiler happy
1024	#endif	1024	#endif
1025	}	1025	}
1026		1026
Lines 1295-1301 Link Here
1295	sMessage += ::rtl::OString( e.Message.getStr(), e.Message.getLength(), osl_getThreadTextEncoding() );	1295	sMessage += ::rtl::OString( e.Message.getStr(), e.Message.getLength(), osl_getThreadTextEncoding() );
1296	OSL_ENSURE( false, sMessage );	1296	OSL_ENSURE( false, sMessage );
1297	#else	1297	#else
1298	e; // make compiler happy	1298	(void) e; // make compiler happy
1299	#endif	1299	#endif
1300	}	1300	}
1301	}	1301	}

Lines 175-181 Link Here

(-)extensions/source/bibliography/bibconfig.cxx (-5 lines)
175	const OUString* pNodeNames = aNodeNames.getConstArray();	175	const OUString* pNodeNames = aNodeNames.getConstArray();
176	for(sal_Int32 nNode = 0; nNode < aNodeNames.getLength(); nNode++)	176	for(sal_Int32 nNode = 0; nNode < aNodeNames.getLength(); nNode++)
177	{	177	{
178	Sequence<OUString> aNames(3);
179	OUString* pNames = aNames.getArray();	178	OUString* pNames = aNames.getArray();
180	OUString sPrefix(C2U(cDataSourceHistory));	179	OUString sPrefix(C2U(cDataSourceHistory));
181	sPrefix += C2U("/");	180	sPrefix += C2U("/");
Lines 187-198 Link Here
187	pNames[1] += sTable;	186	pNames[1] += sTable;
188	pNames[2] = sPrefix;	187	pNames[2] = sPrefix;
189	pNames[2] += sCommandType;	188	pNames[2] += sCommandType;
190	Sequence<Any> aValues = GetProperties(aNames);
191	const Any* pValues = aValues.getConstArray();
192	if(aValues.getLength() == aNames.getLength())	189	if(aValues.getLength() == aNames.getLength())
193	{	190	{
194	Mapping* pMapping = new Mapping;	191	Mapping* pMapping = new Mapping;
195	sal_Int32 nColumnIndex = 0;
196	pValues[0] >>= pMapping->sURL;	192	pValues[0] >>= pMapping->sURL;
197	pValues[1] >>= pMapping->sTableName;	193	pValues[1] >>= pMapping->sTableName;
198	pValues[2] >>= pMapping->nCommandType;	194	pValues[2] >>= pMapping->nCommandType;
Lines 282-288 Link Here
282	Sequence<Any> aValues(aNames.getLength());	278	Sequence<Any> aValues(aNames.getLength());
283	Any* pValues = aValues.getArray();	279	Any* pValues = aValues.getArray();
284		280
285	const Type& rType = ::getBooleanCppuType();
286	for(int nProp = 0; nProp < aNames.getLength(); nProp++)	281	for(int nProp = 0; nProp < aNames.getLength(); nProp++)
287	{	282	{
288	switch(nProp)	283	switch(nProp)

Lines 108-118 Link Here

(-)extensions/source/bibliography/bibconfig.hxx (-2 / +2 lines)
108		108
109	rtl::OUString sQueryField;	109	rtl::OUString sQueryField;
110	rtl::OUString sQueryText;	110	rtl::OUString sQueryText;
111	long nBeamerSize;	111	MappingArray* pMappingsArr;
		112	long nBeamerSize;
112	long nViewSize;	113	long nViewSize;
113	sal_Bool bShowColumnAssignmentWarning;	114	sal_Bool bShowColumnAssignmentWarning;
114		115
115	MappingArray* pMappingsArr;
116	rtl::OUString aColumnDefaults[COLUMN_COUNT];	116	rtl::OUString aColumnDefaults[COLUMN_COUNT];
117		117
118	com::sun::star::uno::Sequence<rtl::OUString>& GetPropertyNames();	118	com::sun::star::uno::Sequence<rtl::OUString>& GetPropertyNames();

Lines 94-104 Link Here

(-)extensions/source/bibliography/bibcont.hxx (-2 / +2 lines)
94		94
95	::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > xTopPeerRef;	95	::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > xTopPeerRef;
96	::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > xBottomPeerRef;	96	::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > xBottomPeerRef;
97	sal_Bool bFirstTime;
98		97
		98	BibDataManager* pDatMan;
99	BibWindowContainer* pTopWin;	99	BibWindowContainer* pTopWin;
100	BibWindowContainer* pBottomWin;	100	BibWindowContainer* pBottomWin;
101	BibDataManager* pDatMan;	101	sal_Bool bFirstTime;
102	HdlBibModul pBibMod;	102	HdlBibModul pBibMod;
103	Timer aTimer;	103	Timer aTimer;
104		104

Lines 246-251 Link Here

(-)extensions/source/bibliography/datman.cxx (-75 / +72 lines)
246	}	246	}
247	catch(Exception eEx)	247	catch(Exception eEx)
248	{	248	{
		249	(void) eEx; // make compiler happy
249	DBG_ERROR("Exception caught in ODatabaseContext::getRegisteredObject()")	250	DBG_ERROR("Exception caught in ODatabaseContext::getRegisteredObject()")
250	}	251	}
251	}	252	}
Lines 277-283 Link Here
277	}	278	}
278	catch(Exception& e )	279	catch(Exception& e )
279	{	280	{
280	e; // make compiler happy	281	(void) e; // make compiler happy
281	}	282	}
282		283
283	}	284	}
Lines 304-310 Link Here
304	}	305	}
305	catch(Exception& e )	306	catch(Exception& e )
306	{	307	{
307	e; // make compiler happy	308	(void) e; // make compiler happy
308	DBG_ERROR("exception in getConnection");	309	DBG_ERROR("exception in getConnection");
309	}	310	}
310		311
Lines 366-422 Link Here
366	--------------------------------------------------*/	367	--------------------------------------------------*/
367	class MappingDialog_Impl : public ModalDialog	368	class MappingDialog_Impl : public ModalDialog
368	{	369	{
369	FixedLine aMapGB;	370	BibDataManager* pDatMan;
		371	OKButton aOKBT;
		372	CancelButton aCancelBT;
		373	HelpButton aHelpBT;
		374	FixedLine aMapGB;
370	FixedText aIdentifierFT;	375	FixedText aIdentifierFT;
371	ListBox aIdentifierLB;	376	ListBox aIdentifierLB;
372	FixedText aAuthorityTypeFT;	377	FixedText aAuthorityTypeFT;
373	ListBox aAuthorityTypeLB;	378	ListBox aAuthorityTypeLB;
374	FixedText aYearFT;
375	ListBox aYearLB;
376	FixedText aAuthorFT;	379	FixedText aAuthorFT;
377	ListBox aAuthorLB;	380	ListBox aAuthorLB;
378	FixedText aTitleFT;	381	FixedText aTitleFT;
379	ListBox aTitleLB;	382	ListBox aTitleLB;
380	FixedText aPublisherFT;	383	FixedText aMonthFT;
381	ListBox aPublisherLB;	384	ListBox aMonthLB;
382	FixedText aAddressFT;	385	FixedText aYearFT;
383	ListBox aAddressLB;	386	ListBox aYearLB;
384	FixedText aISBNFT;	387	FixedText aISBNFT;
385	ListBox aISBNLB;	388	ListBox aISBNLB;
		389	FixedText aBooktitleFT;
		390	ListBox aBooktitleLB;
386	FixedText aChapterFT;	391	FixedText aChapterFT;
387	ListBox aChapterLB;	392	ListBox aChapterLB;
388	FixedText aPagesFT;
389	ListBox aPagesLB;
390	FixedText aEditorFT;
391	ListBox aEditorLB;
392	FixedText aEditionFT;	393	FixedText aEditionFT;
393	ListBox aEditionLB;	394	ListBox aEditionLB;
394	FixedText aBooktitleFT;	395	FixedText aEditorFT;
395	ListBox aBooktitleLB;	396	ListBox aEditorLB;
396	FixedText aVolumeFT;
397	ListBox aVolumeLB;
398	FixedText aHowpublishedFT;	397	FixedText aHowpublishedFT;
399	ListBox aHowpublishedLB;	398	ListBox aHowpublishedLB;
400	FixedText aOrganizationsFT;
401	ListBox aOrganizationsLB;
402	FixedText aInstitutionFT;	399	FixedText aInstitutionFT;
403	ListBox aInstitutionLB;	400	ListBox aInstitutionLB;
404	FixedText aSchoolFT;
405	ListBox aSchoolLB;
406	FixedText aReportTypeFT;
407	ListBox aReportTypeLB;
408	FixedText aMonthFT;
409	ListBox aMonthLB;
410	FixedText aJournalFT;	401	FixedText aJournalFT;
411	ListBox aJournalLB;	402	ListBox aJournalLB;
		403	FixedText aNoteFT;
		404	ListBox aNoteLB;
		405	FixedText aAnnoteFT;
		406	ListBox aAnnoteLB;
412	FixedText aNumberFT;	407	FixedText aNumberFT;
413	ListBox aNumberLB;	408	ListBox aNumberLB;
		409	FixedText aOrganizationsFT;
		410	ListBox aOrganizationsLB;
		411	FixedText aPagesFT;
		412	ListBox aPagesLB;
		413	FixedText aPublisherFT;
		414	ListBox aPublisherLB;
		415	FixedText aAddressFT;
		416	ListBox aAddressLB;
		417	FixedText aSchoolFT;
		418	ListBox aSchoolLB;
414	FixedText aSeriesFT;	419	FixedText aSeriesFT;
415	ListBox aSeriesLB;	420	ListBox aSeriesLB;
416	FixedText aAnnoteFT;	421	FixedText aReportTypeFT;
417	ListBox aAnnoteLB;	422	ListBox aReportTypeLB;
418	FixedText aNoteFT;	423	FixedText aVolumeFT;
419	ListBox aNoteLB;	424	ListBox aVolumeLB;
420	FixedText aURLFT;	425	FixedText aURLFT;
421	ListBox aURLLB;	426	ListBox aURLLB;
422	FixedText aCustom1FT;	427	FixedText aCustom1FT;
Lines 429-445 Link Here
429	ListBox aCustom4LB;	434	ListBox aCustom4LB;
430	FixedText aCustom5FT;	435	FixedText aCustom5FT;
431	ListBox aCustom5LB;	436	ListBox aCustom5LB;
432
433	OKButton aOKBT;
434	CancelButton aCancelBT;
435	HelpButton aHelpBT;
436
437	ListBox* aListBoxes[COLUMN_COUNT];	437	ListBox* aListBoxes[COLUMN_COUNT];
438	String sNone;	438	String sNone;
439		439
440	sal_Bool bModified;	440	sal_Bool bModified;
441		441
442	BibDataManager* pDatMan;	442
443		443
444	DECL_LINK(OkHdl, OKButton*);	444	DECL_LINK(OkHdl, OKButton*);
445	DECL_LINK(ListBoxSelectHdl, ListBox*);	445	DECL_LINK(ListBoxSelectHdl, ListBox*);
Lines 712-725 Link Here
712	--------------------------------------------------*/	712	--------------------------------------------------*/
713	class DBChangeDialog_Impl : public ModalDialog	713	class DBChangeDialog_Impl : public ModalDialog
714	{	714	{
715	FixedLine aSelectionGB;
716	SvTabListBox aSelectionLB;
717	HeaderBar aSelectionHB;
718
719	OKButton aOKBT;	715	OKButton aOKBT;
720	CancelButton aCancelBT;	716	CancelButton aCancelBT;
721	HelpButton aHelpBT;	717	HelpButton aHelpBT;
722		718	FixedLine aSelectionGB;
		719	SvTabListBox aSelectionLB;
		720	HeaderBar aSelectionHB;
723	DBChangeDialogConfig_Impl aConfig;	721	DBChangeDialogConfig_Impl aConfig;
724	String aEntryST;	722	String aEntryST;
725	String aURLST;	723	String aURLST;
Lines 785-792 Link Here
785	}	783	}
786	catch(Exception& e )	784	catch(Exception& e )
787	{	785	{
788	e; // make compiler happy	786	(void) e; // make compiler happy
789	DBG_ERROR("Exception in BibDataManager::DBChangeDialog_Impl::DBChangeDialog_Impl")	787	DBG_ERROR("Exception in BibDataManager::DBChangeDialog_Impl::DBChangeDialog_Impl")
790	}	788	}
791		789
792		790
Lines 918-930 Link Here
918		916
919	BibDataManager::BibDataManager()	917	BibDataManager::BibDataManager()
920	:BibDataManager_Base( GetMutex() )	918	:BibDataManager_Base( GetMutex() )
921	,pToolbar(0)
922	,pBibView( NULL )
923	,m_aLoadListeners(m_aMutex)
924	// #100312# --------------	919	// #100312# --------------
925	,m_pInterceptorHelper( NULL )	920	,m_pInterceptorHelper( NULL )
		921	,m_aLoadListeners(m_aMutex)
		922	,pBibView( NULL )
		923	,pToolbar(0)
926	{	924	{
927	}	925	}
		926
928	/* --------------------------------------------------	927	/* --------------------------------------------------
929		928
930	--------------------------------------------------*/	929	--------------------------------------------------*/
Lines 1036-1043 Link Here
1036	}	1035	}
1037	catch(Exception& e )	1036	catch(Exception& e )
1038	{	1037	{
1039	e; // make compiler happy	1038	(void) e; // make compiler happy
1040	DBG_ERROR("Exception in BibDataManager::InsertFields")	1039	DBG_ERROR("Exception in BibDataManager::InsertFields")
1041	}	1040	}
1042	}	1041	}
1043	/* --------------------------------------------------	1042	/* --------------------------------------------------
Lines 1075-1082 Link Here
1075	}	1074	}
1076	catch(Exception& e )	1075	catch(Exception& e )
1077	{	1076	{
1078	e; // make compiler happy	1077	(void) e; // make compiler happy
1079	DBG_ERROR("::updateGridModel: something went wrong !");	1078	DBG_ERROR("::updateGridModel: something went wrong !");
1080	}	1079	}
1081		1080
1082		1081
Lines 1161-1168 Link Here
1161	}	1160	}
1162	catch(Exception& e )	1161	catch(Exception& e )
1163	{	1162	{
1164	e; // make compiler happy	1163	(void) e; // make compiler happy
1165	DBG_ERROR("::createDatabaseForm: something went wrong !");	1164	DBG_ERROR("::createDatabaseForm: something went wrong !");
1166	}	1165	}
1167		1166
1168		1167
Lines 1184-1191 Link Here
1184	}	1183	}
1185	catch(Exception& e )	1184	catch(Exception& e )
1186	{	1185	{
1187	e; // make compiler happy	1186	(void) e; // make compiler happy
1188	DBG_ERROR("::getDataSources: something went wrong !");	1187	DBG_ERROR("::getDataSources: something went wrong !");
1189	}	1188	}
1190		1189
1191		1190
Lines 1215-1222 Link Here
1215	}	1214	}
1216	catch(Exception& e )	1215	catch(Exception& e )
1217	{	1216	{
1218	e; // make compiler happy	1217	(void) e; // make compiler happy
1219	DBG_ERROR("::setFilterOnActiveDataSource: something went wrong !");	1218	DBG_ERROR("::setFilterOnActiveDataSource: something went wrong !");
1220	}	1219	}
1221		1220
1222		1221
Lines 1238-1245 Link Here
1238	}	1237	}
1239	catch(Exception& e )	1238	catch(Exception& e )
1240	{	1239	{
1241	e; // make compiler happy	1240	(void) e; // make compiler happy
1242	DBG_ERROR("::getFilterOnActiveDataSource: something went wrong !");	1241	DBG_ERROR("::getFilterOnActiveDataSource: something went wrong !");
1243	}	1242	}
1244		1243
1245		1244
Lines 1438-1445 Link Here
1438	}	1437	}
1439	catch(Exception& e )	1438	catch(Exception& e )
1440	{	1439	{
1441	e; // make compiler happy	1440	(void) e; // make compiler happy
1442	DBG_ERROR("::setActiveDataTable: something went wrong !");	1441	DBG_ERROR("::setActiveDataTable: something went wrong !");
1443	}	1442	}
1444		1443
1445	}	1444	}
Lines 1571-1578 Link Here
1571	}	1570	}
1572	catch(Exception& e )	1571	catch(Exception& e )
1573	{	1572	{
1574	e; // make compiler happy	1573	(void) e; // make compiler happy
1575	DBG_ERROR("::createGridModel: something went wrong !");	1574	DBG_ERROR("::createGridModel: something went wrong !");
1576	}	1575	}
1577		1576
1578		1577
Lines 1643-1650 Link Here
1643	::rtl::OUString sCurrentModelType;	1642	::rtl::OUString sCurrentModelType;
1644	const ::rtl::OUString sType(C2U("Type"));	1643	const ::rtl::OUString sType(C2U("Type"));
1645	sal_Int32 nFormatKey = 0;	1644	sal_Int32 nFormatKey = 0;
1646	sal_Bool bIsFormatted = sal_False;
1647	sal_Bool bFormattedIsNumeric = sal_True;
1648	xField->getPropertyValue(sType) >>= nFormatKey;	1645	xField->getPropertyValue(sType) >>= nFormatKey;
1649		1646
1650	::rtl::OUString aInstanceName(C2U("com.sun.star.form.component."));	1647	::rtl::OUString aInstanceName(C2U("com.sun.star.form.component."));
Lines 1696-1703 Link Here
1696	}	1693	}
1697	catch(Exception& e )	1694	catch(Exception& e )
1698	{	1695	{
1699	e; // make compiler happy	1696	(void) e; // make compiler happy
1700	DBG_ERROR("::loadControlModel: something went wrong !");	1697	DBG_ERROR("::loadControlModel: something went wrong !");
1701	}	1698	}
1702	return xModel;	1699	return xModel;
1703	}	1700	}
Lines 1719-1726 Link Here
1719	}	1716	}
1720	catch(Exception& e )	1717	catch(Exception& e )
1721	{	1718	{
1722	e; // make compiler happy	1719	(void) e; // make compiler happy
1723	DBG_ERROR("::saveCtrModel: something went wrong !");	1720	DBG_ERROR("::saveCtrModel: something went wrong !");
1724	}	1721	}
1725	}	1722	}
1726		1723
Lines 1755-1762 Link Here
1755	}	1752	}
1756	catch(Exception& e )	1753	catch(Exception& e )
1757	{	1754	{
1758	e; // make compiler happy	1755	(void) e; // make compiler happy
1759	DBG_ERROR("::propertyChange: something went wrong !");	1756	DBG_ERROR("::propertyChange: something went wrong !");
1760	}	1757	}
1761		1758
1762		1759
Lines 1800-1807 Link Here
1800	}	1797	}
1801	catch(Exception& e )	1798	catch(Exception& e )
1802	{	1799	{
1803	e; // make compiler happy	1800	(void) e; // make compiler happy
1804	DBG_ERROR("Exception in BibDataManager::SetMeAsUidListener")	1801	DBG_ERROR("Exception in BibDataManager::SetMeAsUidListener")
1805	}	1802	}
1806		1803
1807		1804
Lines 1846-1853 Link Here
1846	}	1843	}
1847	catch(Exception& e )	1844	catch(Exception& e )
1848	{	1845	{
1849	e; // make compiler happy	1846	(void) e; // make compiler happy
1850	DBG_ERROR("Exception in BibDataManager::RemoveMeAsUidListener")	1847	DBG_ERROR("Exception in BibDataManager::RemoveMeAsUidListener")
1851	}	1848	}
1852		1849
1853		1850
Lines 1871-1878 Link Here
1871	}	1868	}
1872	catch(Exception& e )	1869	catch(Exception& e )
1873	{	1870	{
1874	e; // make compiler happy	1871	(void) e; // make compiler happy
1875	DBG_ERROR("Exception in BibDataManager::moveRelative")	1872	DBG_ERROR("Exception in BibDataManager::moveRelative")
1876	}	1873	}
1877		1874
1878	return bRet;	1875	return bRet;

Lines 245-252 Link Here

(-)extensions/source/bibliography/general.cxx (-25 / +22 lines)
245	}	245	}
246	catch(Exception& rEx)	246	catch(Exception& rEx)
247	{	247	{
248	rEx;	248	(void) rEx; // make compiler happy
249	DBG_ERROR("BibPosListener::positioned: something went wrong !");	249	DBG_ERROR("BibPosListener::positioned: something went wrong !");
250	}	250	}
251	}	251	}
252	/* -----------------------------04.01.00 11:28--------------------------------	252	/* -----------------------------04.01.00 11:28--------------------------------
Lines 261-307 Link Here
261	--------------------------------------------------*/	261	--------------------------------------------------*/
262	BibGeneralPage::BibGeneralPage(Window* pParent, BibDataManager* pMan):	262	BibGeneralPage::BibGeneralPage(Window* pParent, BibDataManager* pMan):
263	BibTabPage(pParent,BibResId(RID_TP_GENERAL)),	263	BibTabPage(pParent,BibResId(RID_TP_GENERAL)),
264	pDatMan(pMan),
265	aControlParentWin(this, WB_DIALOGCONTROL),	264	aControlParentWin(this, WB_DIALOGCONTROL),
266	aIdentifierFT(&aControlParentWin, BibResId(FT_IDENTIFIER )),	265	aIdentifierFT(&aControlParentWin, BibResId(FT_IDENTIFIER )),
267	aAuthTypeFT(&aControlParentWin, BibResId(FT_AUTHTYPE )),	266	aAuthTypeFT(&aControlParentWin, BibResId(FT_AUTHTYPE )),
268	aAuthorFT(&aControlParentWin, BibResId(FT_AUTHOR )),
269	aMonthFT(&aControlParentWin, BibResId(FT_MONTH )),
270	aYearFT(&aControlParentWin, BibResId(FT_YEAR )),	267	aYearFT(&aControlParentWin, BibResId(FT_YEAR )),
271		268	aAuthorFT(&aControlParentWin, BibResId(FT_AUTHOR )),
		269	aTitleFT(&aControlParentWin, BibResId(FT_TITLE )),
272	aPublisherFT(&aControlParentWin, BibResId(FT_PUBLISHER )),	270	aPublisherFT(&aControlParentWin, BibResId(FT_PUBLISHER )),
273	aISBNFT(&aControlParentWin, BibResId(FT_ISBN )),
274
275	aAddressFT(&aControlParentWin, BibResId(FT_ADDRESS )),	271	aAddressFT(&aControlParentWin, BibResId(FT_ADDRESS )),
276	aAnnoteFT(&aControlParentWin, BibResId(FT_ANNOTE )),	272	aISBNFT(&aControlParentWin, BibResId(FT_ISBN )),
277	aBooktitleFT(&aControlParentWin, BibResId(FT_BOOKTITLE )),
278	aChapterFT(&aControlParentWin, BibResId(FT_CHAPTER )),	273	aChapterFT(&aControlParentWin, BibResId(FT_CHAPTER )),
279	aEditionFT(&aControlParentWin, BibResId(FT_EDITION )),	274	aPagesFT(&aControlParentWin, BibResId(FT_PAGE )),
		275	aFirstFL(&aControlParentWin, BibResId(FL_1 )),
280	aEditorFT(&aControlParentWin, BibResId(FT_EDITOR )),	276	aEditorFT(&aControlParentWin, BibResId(FT_EDITOR )),
		277	aEditionFT(&aControlParentWin, BibResId(FT_EDITION )),
		278	aBooktitleFT(&aControlParentWin, BibResId(FT_BOOKTITLE )),
		279	aVolumeFT(&aControlParentWin, BibResId(FT_VOLUME )),
281	aHowpublishedFT(&aControlParentWin, BibResId(FT_HOWPUBLISHED )),	280	aHowpublishedFT(&aControlParentWin, BibResId(FT_HOWPUBLISHED )),
		281	aOrganizationsFT(&aControlParentWin,BibResId(FT_ORGANIZATION )),
282	aInstitutionFT(&aControlParentWin, BibResId(FT_INSTITUTION )),	282	aInstitutionFT(&aControlParentWin, BibResId(FT_INSTITUTION )),
		283	aSchoolFT(&aControlParentWin, BibResId(FT_SCHOOL )),
		284	aReportTypeFT(&aControlParentWin, BibResId(FT_REPORT )),
		285	aMonthFT(&aControlParentWin, BibResId(FT_MONTH )),
		286	aSecondFL(&aControlParentWin, BibResId(FL_2 )),
283	aJournalFT(&aControlParentWin, BibResId(FT_JOURNAL )),	287	aJournalFT(&aControlParentWin, BibResId(FT_JOURNAL )),
284	aNoteFT(&aControlParentWin, BibResId(FT_NOTE )),
285	aNumberFT(&aControlParentWin, BibResId(FT_NUMBER )),	288	aNumberFT(&aControlParentWin, BibResId(FT_NUMBER )),
286	aOrganizationsFT(&aControlParentWin,BibResId(FT_ORGANIZATION )),
287	aPagesFT(&aControlParentWin, BibResId(FT_PAGE )),
288	aSchoolFT(&aControlParentWin, BibResId(FT_SCHOOL )),
289	aSeriesFT(&aControlParentWin, BibResId(FT_SERIES )),	289	aSeriesFT(&aControlParentWin, BibResId(FT_SERIES )),
290	aTitleFT(&aControlParentWin, BibResId(FT_TITLE )),	290	aAnnoteFT(&aControlParentWin, BibResId(FT_ANNOTE )),
291	aReportTypeFT(&aControlParentWin, BibResId(FT_REPORT )),	291	aNoteFT(&aControlParentWin, BibResId(FT_NOTE )),
292	aVolumeFT(&aControlParentWin, BibResId(FT_VOLUME )),
293	aURLFT(&aControlParentWin, BibResId(FT_URL )),	292	aURLFT(&aControlParentWin, BibResId(FT_URL )),
		293	aThirdFL(&aControlParentWin, BibResId(FL_3 )),
294	aCustom1FT(&aControlParentWin, BibResId(FT_CUSTOM1 )),	294	aCustom1FT(&aControlParentWin, BibResId(FT_CUSTOM1 )),
295	aCustom2FT(&aControlParentWin, BibResId(FT_CUSTOM2 )),	295	aCustom2FT(&aControlParentWin, BibResId(FT_CUSTOM2 )),
296	aCustom3FT(&aControlParentWin, BibResId(FT_CUSTOM3 )),	296	aCustom3FT(&aControlParentWin, BibResId(FT_CUSTOM3 )),
297	aCustom4FT(&aControlParentWin, BibResId(FT_CUSTOM4 )),	297	aCustom4FT(&aControlParentWin, BibResId(FT_CUSTOM4 )),
298	aCustom5FT(&aControlParentWin, BibResId(FT_CUSTOM5 )),	298	aCustom5FT(&aControlParentWin, BibResId(FT_CUSTOM5 )),
299	aFirstFL(&aControlParentWin, BibResId(FL_1 )),
300	aSecondFL(&aControlParentWin, BibResId(FL_2 )),
301	aThirdFL(&aControlParentWin, BibResId(FL_3 )),
302	aHoriScroll(this, WB_HORZ),	299	aHoriScroll(this, WB_HORZ),
303	aVertScroll(this, WB_VERT),	300	aVertScroll(this, WB_VERT),
304	sErrorPrefix(BibResId(ST_ERROR_PREFIX))	301	sErrorPrefix(BibResId(ST_ERROR_PREFIX)),
		302	pDatMan(pMan)
305	{	303	{
306	aControlParentWin.Show();	304	aControlParentWin.Show();
307	aControlParentWin.SetHelpId(HID_BIB_CONTROL_PARENT);	305	aControlParentWin.SetHelpId(HID_BIB_CONTROL_PARENT);
Lines 578-584 Link Here
578	if(bTypeListBox)	576	if(bTypeListBox)
579	{	577	{
580	//uno::Reference< beans::XPropertySet > xPropSet(xControl, UNO_QUERY);	578	//uno::Reference< beans::XPropertySet > xPropSet(xControl, UNO_QUERY);
581	uno::Any aAny;
582	aAny <<= (sal_Int16)1;	579	aAny <<= (sal_Int16)1;
583	xPropSet->setPropertyValue(C2U("BoundColumn"), aAny);	580	xPropSet->setPropertyValue(C2U("BoundColumn"), aAny);
584	ListSourceType eSet = ListSourceType_VALUELIST;	581	ListSourceType eSet = ListSourceType_VALUELIST;
Lines 644-651 Link Here
644	}	641	}
645	catch(Exception& rEx)	642	catch(Exception& rEx)
646	{	643	{
647	rEx;	644	(void) rEx; // make compiler happy
648	DBG_ERROR("BibGeneralPage::AddXControl: something went wrong !");	645	DBG_ERROR("BibGeneralPage::AddXControl: something went wrong !");
649	}	646	}
650	return xCtrModel;	647	return xCtrModel;
651	}	648	}

Lines 95-103 Link Here

(-)extensions/source/bibliography/toolbar.cxx (-8 / +8 lines)
95		95
96		96
97	BibToolBarListener::BibToolBarListener(BibToolBar *pTB,rtl::OUString aStr,sal_uInt16 nId):	97	BibToolBarListener::BibToolBarListener(BibToolBar *pTB,rtl::OUString aStr,sal_uInt16 nId):
98	pToolBar(pTB),
99	nIndex(nId),	98	nIndex(nId),
100	aCommand(aStr)	99	aCommand(aStr),
		100	pToolBar(pTB)
101	{	101	{
102	}	102	}
103		103
Lines 251-266 Link Here
251		251
252	BibToolBar::BibToolBar(Window* pParent, Link aLink, WinBits nStyle):	252	BibToolBar::BibToolBar(Window* pParent, Link aLink, WinBits nStyle):
253	ToolBox(pParent,BibResId(RID_BIB_TOOLBAR)),	253	ToolBox(pParent,BibResId(RID_BIB_TOOLBAR)),
254	aFtSource(this,WB_VCENTER),
255	aLBSource(this,WB_DROPDOWN),
256	aFtQuery(this,WB_VCENTER),
257	aEdQuery(this),
258	aImgLst(BibResId( RID_TOOLBAR_IMGLIST )),	254	aImgLst(BibResId( RID_TOOLBAR_IMGLIST )),
259	aImgLstHC(BibResId(RID_TOOLBAR_IMGLIST_HC )),	255	aImgLstHC(BibResId(RID_TOOLBAR_IMGLIST_HC )),
260	aBigImgLst(BibResId( RID_TOOLBAR_BIGIMGLIST )),	256	aBigImgLst(BibResId( RID_TOOLBAR_BIGIMGLIST )),
261	aBigImgLstHC(BibResId( RID_TOOLBAR_BIGIMGLIST_HC )),	257	aBigImgLstHC(BibResId( RID_TOOLBAR_BIGIMGLIST_HC )),
262	nSelMenuItem(0),	258	aFtSource(this,WB_VCENTER),
		259	aLBSource(this,WB_DROPDOWN),
		260	aFtQuery(this,WB_VCENTER),
		261	aEdQuery(this),
263	nMenuId(0),	262	nMenuId(0),
		263	nSelMenuItem(0),
264	aLayoutManager( aLink ),	264	aLayoutManager( aLink ),
265	nSymbolsSize( SFX_SYMBOLS_SIZE_SMALL ),	265	nSymbolsSize( SFX_SYMBOLS_SIZE_SMALL ),
266	nOutStyle( 0 )	266	nOutStyle( 0 )
Lines 561-567 Link Here
561	EndSelection(); // vor SetDropMode (SetDropMode ruft SetItemImage)	561	EndSelection(); // vor SetDropMode (SetDropMode ruft SetItemImage)
562		562
563	SetItemDown(TBC_BT_AUTOFILTER,sal_True);	563	SetItemDown(TBC_BT_AUTOFILTER,sal_True);
564	sal_uInt16 nId = aPopupMenu.Execute(this, GetItemRect(TBC_BT_AUTOFILTER));	564	nId = aPopupMenu.Execute(this, GetItemRect(TBC_BT_AUTOFILTER));
565		565
566		566
567	if(nId>0)	567	if(nId>0)

Lines 101-114 Link Here

(-)extensions/source/plugin/aqua/sysplug.cxx (-6 / +1 lines)
101	MacPluginComm::~MacPluginComm()	101	MacPluginComm::~MacPluginComm()
102	{	102	{
103	NPP_Shutdown();	103	NPP_Shutdown();
104	if( m_nCommPID != -1 && m_nCommPID != 0 )
105	{
106	int status = 16777216;
107	pid_t nExit = waitpid( m_nCommPID, &status, WUNTRACED );
108	#if OSL_DEBUG_LEVEL > 1	104	#if OSL_DEBUG_LEVEL > 1
109	fprintf( stderr, "child %d (plugin app child %d) exited with status %d\n", nExit, m_nCommPID, WEXITSTATUS(status) );	105	fprintf( stderr, "child %d (plugin app child %d) exited with status %d\n", nExit, m_nCommPID, WEXITSTATUS(status) );
110	#endif	106	#endif
111	}
112	}	107	}
113		108
114	NPError MacPluginComm::NPP_Destroy( NPP instance,	109	NPError MacPluginComm::NPP_Destroy( NPP instance,
Lines 124-130 Link Here
124	return 0;	119	return 0;
125	}	120	}
126		121
127	jref MacPluginComm::NPP_GetJavaClass()	122	void* MacPluginComm::NPP_GetJavaClass()
128	{	123	{
129	return 0;	124	return 0;
130	}	125	}

Lines 62-75 Link Here

(-)extensions/source/plugin/base/plctrl.cxx (-3 / +3 lines)
62	//--------------------------------------------------------------------------------------------------	62	//--------------------------------------------------------------------------------------------------
63	PluginControl_Impl::PluginControl_Impl() :	63	PluginControl_Impl::PluginControl_Impl() :
64	_pMultiplexer( NULL )	64	_pMultiplexer( NULL )
65	, _bVisible( sal_False )
66	, _bInDesignMode( sal_False )
67	, _bEnable( sal_True )
68	, _nX( 0 )	65	, _nX( 0 )
69	, _nY( 0 )	66	, _nY( 0 )
70	, _nWidth( 100 )	67	, _nWidth( 100 )
71	, _nHeight( 100 )	68	, _nHeight( 100 )
72	, _nFlags( WINDOW_POSSIZE_ALL )	69	, _nFlags( WINDOW_POSSIZE_ALL )
		70	, _bVisible( sal_False )
		71	, _bInDesignMode( sal_False )
		72	, _bEnable( sal_True )
73	{	73	{
74	}	74	}
75		75

Lines 120-137 Link Here

(-)extensions/source/plugin/base/xplugin.cxx (-8 / +6 lines)
120		120
121		121
122	XPlugin_Impl::XPlugin_Impl( const uno::Reference< com::sun::star::lang::XMultiServiceFactory > & rSMgr) :	122	XPlugin_Impl::XPlugin_Impl( const uno::Reference< com::sun::star::lang::XMultiServiceFactory > & rSMgr) :
123	m_xSMgr( rSMgr ),
124	PluginControl_Impl(),	123	PluginControl_Impl(),
		124	m_xSMgr( rSMgr ),
125	m_pPluginComm( NULL ),	125	m_pPluginComm( NULL ),
126	m_pArgn( NULL ),	126	m_aEncoding( gsl_getSystemTextEncoding() ),
127	m_pArgv( NULL ),	127	m_pArgv( NULL ),
		128	m_pArgn( NULL ),
128	m_nArgs( 0 ),	129	m_nArgs( 0 ),
129	m_aPluginMode( NP_FULL ),	130	m_aPluginMode( NP_FULL ),
130	m_nProvidingState( PROVIDING_NONE ),	131	m_nProvidingState( PROVIDING_NONE ),
131	m_nCalledFromPlugin( 0 ),	132	m_nCalledFromPlugin( 0 ),
132	m_pDisposer( NULL ),	133	m_pDisposer( NULL ),
133	m_bIsDisposed( sal_False ),	134	m_bIsDisposed( sal_False )
134	m_aEncoding( gsl_getSystemTextEncoding() )
135	{	135	{
136	memset( &m_aInstance, 0, sizeof( m_aInstance ) );	136	memset( &m_aInstance, 0, sizeof( m_aInstance ) );
137	memset( &m_aNPWindow, 0, sizeof( m_aNPWindow ) );	137	memset( &m_aNPWindow, 0, sizeof( m_aNPWindow ) );
Lines 206-212 Link Here
206	std::list<XPlugin_Impl*>::iterator iter;	206	std::list<XPlugin_Impl*>::iterator iter;
207		207
208	{	208	{
209	Guard< Mutex > aGuard( PluginManager::get().getPluginMutex() );	209	// Guard< Mutex > aGuard( PluginManager::get().getPluginMutex() );
210	for( iter = rList.begin(); iter != rList.end(); ++iter )	210	for( iter = rList.begin(); iter != rList.end(); ++iter )
211	{	211	{
212	if( *iter == this )	212	if( *iter == this )
Lines 226-232 Link Here
226	uno::Reference< com::sun::star::beans::XPropertySet > xPS( m_xModel, UNO_QUERY );	226	uno::Reference< com::sun::star::beans::XPropertySet > xPS( m_xModel, UNO_QUERY );
227	xPS->removePropertyChangeListener( OUString(), this );	227	xPS->removePropertyChangeListener( OUString(), this );
228	{	228	{
229	Guard< Mutex > aGuard( PluginManager::get().getPluginMutex() );	229	// Guard< Mutex > aGuard( PluginManager::get().getPluginMutex() );
230	rList.remove( this );	230	rList.remove( this );
231	}	231	}
232	m_aNPWindow.window = NULL;	232	m_aNPWindow.window = NULL;
Lines 936-943 Link Here
936	}	936	}
937	}	937	}
938		938
939	int nDescr = -1;
940
941	int nPos = rURL.lastIndexOf( (sal_Unicode)'.' );	939	int nPos = rURL.lastIndexOf( (sal_Unicode)'.' );
942	OUString aExt = rURL.copy( nPos ).toAsciiLowerCase();	940	OUString aExt = rURL.copy( nPos ).toAsciiLowerCase();
943	if( nPos != -1 )	941	if( nPos != -1 )

Lines 111-119 Link Here

(-)extensions/source/propctrlr/genericpropertyhandler.cxx (-2 / +2 lines)
111	class EnumRepresentation : public IPropertyEnumRepresentation	111	class EnumRepresentation : public IPropertyEnumRepresentation
112	{	112	{
113	private:	113	private:
		114	Type m_aEnumType;
114	oslInterlockedCount m_refCount;	115	oslInterlockedCount m_refCount;
115	Reference< XEnumTypeDescription > m_xTypeDescription;	116	Reference< XEnumTypeDescription > m_xTypeDescription;
116	Type m_aEnumType;
117		117
118	public:	118	public:
119	EnumRepresentation( const Reference< XComponentContext >& _rxContext, const Type& _rEnumType );	119	EnumRepresentation( const Reference< XComponentContext >& _rxContext, const Type& _rEnumType );
Lines 347-354 Link Here
347	GenericPropertyHandler::GenericPropertyHandler( const Reference< XComponentContext >& _rxContext )	347	GenericPropertyHandler::GenericPropertyHandler( const Reference< XComponentContext >& _rxContext )
348	:GenericPropertyHandler_Base( m_aMutex )	348	:GenericPropertyHandler_Base( m_aMutex )
349	,m_aContext( _rxContext )	349	,m_aContext( _rxContext )
350	,m_bPropertyMapInitialized( false )
351	,m_aPropertyListeners( m_aMutex )	350	,m_aPropertyListeners( m_aMutex )
		351	,m_bPropertyMapInitialized( false )
352	{	352	{
353	DBG_CTOR( GenericPropertyHandler, NULL );	353	DBG_CTOR( GenericPropertyHandler, NULL );
354		354

Lines 89-98 Link Here

(-)extensions/source/propctrlr/propertyhandler.cxx (-4 / +4 lines)
89	//--------------------------------------------------------------------	89	//--------------------------------------------------------------------
90	PropertyHandler::PropertyHandler( const Reference< XComponentContext >& _rxContext )	90	PropertyHandler::PropertyHandler( const Reference< XComponentContext >& _rxContext )
91	:PropertyHandler_Base( m_aMutex )	91	:PropertyHandler_Base( m_aMutex )
92	,m_aContext( _rxContext )
93	,m_pInfoService ( new OPropertyInfoService )
94	,m_bSupportedPropertiesAreKnown( false )	92	,m_bSupportedPropertiesAreKnown( false )
95	,m_aPropertyListeners( m_aMutex )	93	,m_aPropertyListeners( m_aMutex )
		94	,m_aContext( _rxContext )
		95	,m_pInfoService ( new OPropertyInfoService )
96	{	96	{
97	DBG_CTOR( PropertyHandler, NULL );	97	DBG_CTOR( PropertyHandler, NULL );
98		98
Lines 105-114 Link Here
105	//--------------------------------------------------------------------	105	//--------------------------------------------------------------------
106	PropertyHandler::PropertyHandler( const Reference< XMultiServiceFactory >& _rxLegacyFactory )	106	PropertyHandler::PropertyHandler( const Reference< XMultiServiceFactory >& _rxLegacyFactory )
107	:PropertyHandler_Base( m_aMutex )	107	:PropertyHandler_Base( m_aMutex )
108	,m_aContext( _rxLegacyFactory )
109	,m_pInfoService ( new OPropertyInfoService )
110	,m_bSupportedPropertiesAreKnown( false )	108	,m_bSupportedPropertiesAreKnown( false )
111	,m_aPropertyListeners( m_aMutex )	109	,m_aPropertyListeners( m_aMutex )
		110	,m_aContext( _rxLegacyFactory )
		111	,m_pInfoService ( new OPropertyInfoService )
112	{	112	{
113	DBG_CTOR( PropertyHandler, NULL );	113	DBG_CTOR( PropertyHandler, NULL );
114		114

Lines 119-136 Link Here

(-)extensions/source/propctrlr/taborder.cxx (-5 / +5 lines)
119	TabOrderDialog::TabOrderDialog( Window* _pParent, const Reference< XTabControllerModel >& _rxTabModel,	119	TabOrderDialog::TabOrderDialog( Window* _pParent, const Reference< XTabControllerModel >& _rxTabModel,
120	const Reference< XControlContainer >& _rxControlCont, const Reference< XMultiServiceFactory >& _rxORB )	120	const Reference< XControlContainer >& _rxControlCont, const Reference< XMultiServiceFactory >& _rxORB )
121	:ModalDialog( _pParent, PcrRes( RID_DLG_TABORDER ) )	121	:ModalDialog( _pParent, PcrRes( RID_DLG_TABORDER ) )
		122	,m_xModel( _rxTabModel )
		123	,m_xControlContainer( _rxControlCont )
		124	,m_xORB( _rxORB )
		125	,aFT_Controls( this, PcrRes( FT_CONTROLS ) )
		126	,aLB_Controls( this, PcrRes( CTRL_TREE ) )
122	,aPB_OK( this, PcrRes( PB_OK ) )	127	,aPB_OK( this, PcrRes( PB_OK ) )
123	,aPB_CANCEL( this, PcrRes( PB_CANCEL ) )	128	,aPB_CANCEL( this, PcrRes( PB_CANCEL ) )
124	,aPB_HELP( this, PcrRes( PB_HELP ) )	129	,aPB_HELP( this, PcrRes( PB_HELP ) )
125	,aFT_Controls( this, PcrRes( FT_CONTROLS ) )
126	,aPB_MoveUp( this, PcrRes( PB_MOVE_UP ) )	130	,aPB_MoveUp( this, PcrRes( PB_MOVE_UP ) )
127	,aPB_MoveDown( this, PcrRes( PB_MOVE_DOWN ) )	131	,aPB_MoveDown( this, PcrRes( PB_MOVE_DOWN ) )
128	,aPB_AutoOrder( this, PcrRes( PB_AUTO_ORDER ) )	132	,aPB_AutoOrder( this, PcrRes( PB_AUTO_ORDER ) )
129	,aLB_Controls( this, PcrRes( CTRL_TREE ) )
130	,pImageList( NULL )	133	,pImageList( NULL )
131	,m_xModel( _rxTabModel )
132	,m_xControlContainer( _rxControlCont )
133	,m_xORB( _rxORB )
134	{	134	{
135	DBG_CTOR(TabOrderDialog,NULL);	135	DBG_CTOR(TabOrderDialog,NULL);
136		136

Lines 170-179 Link Here

(-)extensions/source/scanner/sane.cxx (-8 / +11 lines)
170	}	170	}
171		171
172	Sane::Sane() :	172	Sane::Sane() :
173	maHandle( 0 ),
174	mppOptions( 0 ),	173	mppOptions( 0 ),
175	mnOptions( 0 ),	174	mnOptions( 0 ),
176	mnDevice( -1 )	175	mnDevice( -1 ),
		176	maHandle( 0 )
177	{	177	{
178	if( ! nRefCount \|\| ! pSaneLib )	178	if( ! nRefCount \|\| ! pSaneLib )
179	Init();	179	Init();
Lines 283-290 Link Here
283	fprintf( stderr, "Error: sane driver returned %s while reading number of options !\n", p_strstatus( nStatus ) );	283	fprintf( stderr, "Error: sane driver returned %s while reading number of options !\n", p_strstatus( nStatus ) );
284		284
285	mnOptions = pOptions[ 0 ];	285	mnOptions = pOptions[ 0 ];
286	if( pZero->size > sizeof( SANE_Word ) )	286	if( (unsigned int) pZero->size > sizeof( SANE_Word ) )
287	fprintf( stderr, "driver returned numer of options with larger size tha SANE_Word !!!\n" );	287	fprintf( stderr, "driver returned number of options with larger size than SANE_Word !!!\n" );
288	if( mppOptions )	288	if( mppOptions )
289	delete [] mppOptions;	289	delete [] mppOptions;
290	mppOptions = (const SANE_Option_Descriptor*)new SANE_Option_Descriptor[ mnOptions ];	290	mppOptions = (const SANE_Option_Descriptor*)new SANE_Option_Descriptor[ mnOptions ];
Lines 431-437 Link Here
431	delete [] pFixedSet;	431	delete [] pFixedSet;
432	return FALSE;	432	return FALSE;
433	}	433	}
434	for( int i = 0; i <mppOptions[n]->size/sizeof(SANE_Word); i++ )	434	for( unsigned int i = 0; i < mppOptions[n]->size/sizeof(SANE_Word); i++ )
435	{	435	{
436	if( mppOptions[n]->type == SANE_TYPE_FIXED )	436	if( mppOptions[n]->type == SANE_TYPE_FIXED )
437	pSet[i] = SANE_UNFIX( pFixedSet[i] );	437	pSet[i] = SANE_UNFIX( pFixedSet[i] );
Lines 504-510 Link Here
504	mppOptions[n]->type != SANE_TYPE_FIXED ) )	504	mppOptions[n]->type != SANE_TYPE_FIXED ) )
505	return FALSE;	505	return FALSE;
506	SANE_Word* pFixedSet = new SANE_Word[mppOptions[n]->size/sizeof(SANE_Word)];	506	SANE_Word* pFixedSet = new SANE_Word[mppOptions[n]->size/sizeof(SANE_Word)];
507	for( int i = 0; i < mppOptions[n]->size/sizeof(SANE_Word); i++ )	507	for( unsigned int i = 0; i < mppOptions[n]->size/sizeof(SANE_Word); i++ )
508	{	508	{
509	if( mppOptions[n]->type == SANE_TYPE_FIXED )	509	if( mppOptions[n]->type == SANE_TYPE_FIXED )
510	pFixedSet[i] = SANE_FIX( pSet[i] );	510	pFixedSet[i] = SANE_FIX( pSet[i] );
Lines 863-869 Link Here
863	aConverter << nValue;	863	aConverter << nValue;
864	aConverter.SeekRel( 2 );	864	aConverter.SeekRel( 2 );
865	break;	865	break;
866	}	866	case SANE_FRAME_GRAY:
		867	case SANE_FRAME_RGB:
		868	break;
		869	}
867	}	870	}
868	}	871	}
869	int nGap = aConverter.Tell() & 3;	872	int nGap = aConverter.Tell() & 3;
Lines 987-993 Link Here
987	{	990	{
988	String aText;	991	String aText;
989	SANE_Unit nUnit = mppOptions[n]->unit;	992	SANE_Unit nUnit = mppOptions[n]->unit;
990	if( nUnit < 0 \|\| nUnit > sizeof( ppUnits )/sizeof( ppUnits[0] ) )	993	if( nUnit < 0 \|\| nUnit > static_cast<int>(sizeof( ppUnits )/sizeof( ppUnits[0]) ) )
991	aText = String::CreateFromAscii( "[unknown units]" );	994	aText = String::CreateFromAscii( "[unknown units]" );
992	else	995	else
993	aText = String( ppUnits[ nUnit ], gsl_getSystemTextEncoding() );	996	aText = String( ppUnits[ nUnit ], gsl_getSystemTextEncoding() );

Lines 61-102 Link Here

(-)extensions/source/scanner/sanedlg.cxx (-22 / +26 lines)
61	SaneDlg::SaneDlg( Window* pParent, Sane& rSane ) :	61	SaneDlg::SaneDlg( Window* pParent, Sane& rSane ) :
62	ModalDialog( pParent, SaneResId( RID_SANE_DIALOG ) ),	62	ModalDialog( pParent, SaneResId( RID_SANE_DIALOG ) ),
63	mrSane( rSane ),	63	mrSane( rSane ),
64	mpRange( 0 ),
65	maMapMode( MAP_APPFONT ),
66	mbIsDragging( FALSE ),	64	mbIsDragging( FALSE ),
67	mbDragDrawn( FALSE ),	65	mbDragDrawn( FALSE ),
		66	maMapMode( MAP_APPFONT ),
68	maOKButton( this, SaneResId( RID_SCAN_OK ) ),	67	maOKButton( this, SaneResId( RID_SCAN_OK ) ),
69	maCancelButton( this, SaneResId( RID_SCAN_CANCEL ) ),	68	maCancelButton( this, SaneResId( RID_SCAN_CANCEL ) ),
70	maPreviewButton( this, SaneResId( RID_PREVIEW_BTN ) ),
71	maDeviceInfoButton( this, SaneResId( RID_DEVICEINFO_BTN ) ),	69	maDeviceInfoButton( this, SaneResId( RID_DEVICEINFO_BTN ) ),
72	maPreviewBox( this, SaneResId( RID_PREVIEW_BOX ) ),	70	maPreviewButton( this, SaneResId( RID_PREVIEW_BTN ) ),
73	maAreaBox( this, SaneResId( RID_SCANAREA_BOX ) ),	71	maButtonOption( this, SaneResId( RID_SCAN_BUTTON_OPTION_BTN ) ),
74	maDeviceBoxTxt( this, SaneResId( RID_DEVICE_BOX_TXT ) ),
75	maScanLeftTxt( this, SaneResId( RID_SCAN_LEFT_TXT ) ),
76	maScanTopTxt( this, SaneResId( RID_SCAN_TOP_TXT ) ),
77	maRightTxt( this, SaneResId( RID_SCAN_RIGHT_TXT ) ),
78	maBottomTxt( this, SaneResId( RID_SCAN_BOTTOM_TXT ) ),
79	maReslTxt( this, SaneResId( RID_SCAN_RESOLUTION_TXT ) ),
80	maOptionTitle( this, SaneResId( RID_SCAN_OPTIONTITLE_TXT ) ),
81	maOptionsTxt( this, SaneResId( RID_SCAN_OPTION_TXT ) ),	72	maOptionsTxt( this, SaneResId( RID_SCAN_OPTION_TXT ) ),
		73	maOptionTitle( this, SaneResId( RID_SCAN_OPTIONTITLE_TXT ) ),
82	maOptionDescTxt( this, SaneResId( RID_SCAN_OPTION_DESC_TXT ) ),	74	maOptionDescTxt( this, SaneResId( RID_SCAN_OPTION_DESC_TXT ) ),
83	maVectorTxt( this, SaneResId( RID_SCAN_NUMERIC_VECTOR_TXT ) ),	75	maVectorTxt( this, SaneResId( RID_SCAN_NUMERIC_VECTOR_TXT ) ),
		76	maScanLeftTxt( this, SaneResId( RID_SCAN_LEFT_TXT ) ),
84	maLeftField( this, SaneResId( RID_SCAN_LEFT_BOX ) ),	77	maLeftField( this, SaneResId( RID_SCAN_LEFT_BOX ) ),
		78	maScanTopTxt( this, SaneResId( RID_SCAN_TOP_TXT ) ),
85	maTopField( this, SaneResId( RID_SCAN_TOP_BOX ) ),	79	maTopField( this, SaneResId( RID_SCAN_TOP_BOX ) ),
		80	maRightTxt( this, SaneResId( RID_SCAN_RIGHT_TXT ) ),
86	maRightField( this, SaneResId( RID_SCAN_RIGHT_BOX ) ),	81	maRightField( this, SaneResId( RID_SCAN_RIGHT_BOX ) ),
		82	maBottomTxt( this, SaneResId( RID_SCAN_BOTTOM_TXT ) ),
87	maBottomField( this, SaneResId( RID_SCAN_BOTTOM_BOX ) ),	83	maBottomField( this, SaneResId( RID_SCAN_BOTTOM_BOX ) ),
		84	maDeviceBoxTxt( this, SaneResId( RID_DEVICE_BOX_TXT ) ),
88	maDeviceBox( this, SaneResId( RID_DEVICE_BOX ) ),	85	maDeviceBox( this, SaneResId( RID_DEVICE_BOX ) ),
89	maOptionBox( this, SaneResId( RID_SCAN_OPTION_BOX ) ),	86	maReslTxt( this, SaneResId( RID_SCAN_RESOLUTION_TXT ) ),
90	maReslBox( this, SaneResId( RID_SCAN_RESOLUTION_BOX ) ),	87	maReslBox( this, SaneResId( RID_SCAN_RESOLUTION_BOX ) ),
91	maBoolCheckBox( this, SaneResId( RID_SCAN_BOOL_OPTION_BOX ) ),	88	maAdvancedTxt( this, SaneResId( RID_SCAN_ADVANCED_TXT ) ),
92	maStringEdit( this, SaneResId( RID_SCAN_STRING_OPTION_EDT ) ),	89	maAdvancedBox( this, SaneResId( RID_SCAN_ADVANCED_BOX ) ),
		90	maVectorBox( this, SaneResId( RID_SCAN_NUMERIC_VECTOR_BOX ) ),
93	maQuantumRangeBox( this, SaneResId( RID_SCAN_QUANTUM_RANGE_BOX ) ),	91	maQuantumRangeBox( this, SaneResId( RID_SCAN_QUANTUM_RANGE_BOX ) ),
94	maStringRangeBox( this, SaneResId( RID_SCAN_STRING_RANGE_BOX ) ),	92	maStringRangeBox( this, SaneResId( RID_SCAN_STRING_RANGE_BOX ) ),
		93	maPreviewBox( this, SaneResId( RID_PREVIEW_BOX ) ),
		94	maAreaBox( this, SaneResId( RID_SCANAREA_BOX ) ),
		95	maBoolCheckBox( this, SaneResId( RID_SCAN_BOOL_OPTION_BOX ) ),
		96	maStringEdit( this, SaneResId( RID_SCAN_STRING_OPTION_EDT ) ),
95	maNumericEdit( this, SaneResId( RID_SCAN_NUMERIC_OPTION_EDT ) ),	97	maNumericEdit( this, SaneResId( RID_SCAN_NUMERIC_OPTION_EDT ) ),
96	maButtonOption( this, SaneResId( RID_SCAN_BUTTON_OPTION_BTN ) ),	98	maOptionBox( this, SaneResId( RID_SCAN_OPTION_BOX ) ),
97	maVectorBox( this, SaneResId( RID_SCAN_NUMERIC_VECTOR_BOX ) ),	99	mpRange( 0 )
98	maAdvancedBox( this, SaneResId( RID_SCAN_ADVANCED_BOX ) ),
99	maAdvancedTxt( this, SaneResId( RID_SCAN_ADVANCED_TXT ) )
100	{	100	{
101	if( Sane::IsSane() )	101	if( Sane::IsSane() )
102	{	102	{
Lines 181-188 Link Here
181	if( ! Sane::IsSane() )	181	if( ! Sane::IsSane() )
182	return;	182	return;
183		183
184	int nOption, i, n, nValue;	184	int nOption, i, nValue;
185	double fValue;	185	unsigned int n;
		186	double fValue;
186	BOOL bSuccess = FALSE;	187	BOOL bSuccess = FALSE;
187	char *ppSpecialOptions[] = {	188	char *ppSpecialOptions[] = {
188	"resolution",	189	"resolution",
Lines 442-447 Link Here
442	break;	443	break;
443	case SANE_TYPE_FIXED:	444	case SANE_TYPE_FIXED:
444	case SANE_TYPE_INT:	445	case SANE_TYPE_INT:
		446	case SANE_TYPE_BOOL:
		447	case SANE_TYPE_STRING:
		448	case SANE_TYPE_GROUP:
445	{	449	{
446	int nElements = mrSane.GetOptionElements( mnCurrentOption );	450	int nElements = mrSane.GetOptionElements( mnCurrentOption );
447	double* x = new double[ nElements ];	451	double* x = new double[ nElements ];
Lines 1308-1314 Link Here
1308	"br-y"	1312	"br-y"
1309	};	1313	};
1310	for( int i = 0;	1314	for( int i = 0;
1311	i < (sizeof(pSaveOptions)/sizeof(pSaveOptions[0]));	1315	i < (int)(sizeof(pSaveOptions)/sizeof(pSaveOptions[0]));
1312	i++ )	1316	i++ )
1313	{	1317	{
1314	ByteString aOption = pSaveOptions[i];	1318	ByteString aOption = pSaveOptions[i];

Lines 100-109 Link Here

(-)extensions/source/svg/svgaction.cxx (-4 / +3 lines)
100	// --------------	100	// --------------
101		101
102	FastString::FastString( sal_uInt32 nInitLen, sal_uInt32 nIncrement ) :	102	FastString::FastString( sal_uInt32 nInitLen, sal_uInt32 nIncrement ) :
		103	mpBuffer( new sal_Unicode[ nInitLen * sizeof( sal_Unicode ) ] ),
103	mnBufLen( nInitLen ),	104	mnBufLen( nInitLen ),
104	mnCurLen( 0 ),	105	mnCurLen( 0 ),
105	mnBufInc( nIncrement ),	106	mnBufInc( nIncrement ),
106	mpBuffer( new sal_Unicode[ nInitLen * sizeof( sal_Unicode ) ] ),
107	mnPartPos( 0 )	107	mnPartPos( 0 )
108	{	108	{
109	DBG_ASSERT( nInitLen, "invalid initial length" );	109	DBG_ASSERT( nInitLen, "invalid initial length" );
Lines 129-135 Link Here
129	sal_Char* pTmpSrc = pBufferForBase64Encoding;	129	sal_Char* pTmpSrc = pBufferForBase64Encoding;
130	sal_Unicode* pTmpDst = mpBuffer;	130	sal_Unicode* pTmpDst = mpBuffer;
131		131
132	for( sal_uInt32 i = 0, nCharCount = 0; i < nQuadCount; i++ )	132	for( sal_uInt32 i = 0; i < nQuadCount; i++ )
133	{	133	{
134	const sal_Int32 nA = *pTmpSrc++;	134	const sal_Int32 nA = *pTmpSrc++;
135	const sal_Int32 nB = *pTmpSrc++;	135	const sal_Int32 nB = *pTmpSrc++;
Lines 434-441 Link Here
434	mrExport( rExport ),	434	mrExport( rExport ),
435	mrMtf( rMtf ),	435	mrMtf( rMtf ),
436	mpContext( NULL ),	436	mpContext( NULL ),
437	mbClipAttrChanged( sal_False ),
438	mnCurClipId( 1 ),	437	mnCurClipId( 1 ),
		438	mbClipAttrChanged( sal_False ),
439	mbDoublePoints( bWriteDoublePoints )	439	mbDoublePoints( bWriteDoublePoints )
440	{	440	{
441	if( pParentVDev )	441	if( pParentVDev )
Lines 737-743 Link Here
737	{	737	{
738	if( rPolyPoly.Count() )	738	if( rPolyPoly.Count() )
739	{	739	{
740	SvXMLElementExport aElemG( mrExport, XML_NAMESPACE_NONE, aXMLElemG, TRUE, TRUE );
741	FastString aClipId;	740	FastString aClipId;
742	FastString aClipStyle;	741	FastString aClipStyle;
743		742

Lines 318-324 Link Here

(-)extensions/source/update/check/updatecheckconfig.cxx (-5 / +5 lines)
318	bool	318	bool
319	UpdateCheckConfig::isAutoCheckEnabled() const	319	UpdateCheckConfig::isAutoCheckEnabled() const
320	{	320	{
321	sal_Bool nValue;	321	sal_Bool nValue = sal_False;
322	const_cast < UpdateCheckConfig *> (this)->getByName( UNISTRING( AUTOCHECK_ENABLED ) ) >>= nValue;	322	const_cast < UpdateCheckConfig *> (this)->getByName( UNISTRING( AUTOCHECK_ENABLED ) ) >>= nValue;
323	return nValue;	323	return nValue;
324	}	324	}
Lines 328-334 Link Here
328	bool	328	bool
329	UpdateCheckConfig::isAutoDownloadEnabled() const	329	UpdateCheckConfig::isAutoDownloadEnabled() const
330	{	330	{
331	sal_Bool nValue;	331	sal_Bool nValue = sal_False;
332	const_cast < UpdateCheckConfig *> (this)->getByName( UNISTRING( AUTODOWNLOAD_ENABLED ) ) >>= nValue;	332	const_cast < UpdateCheckConfig *> (this)->getByName( UNISTRING( AUTODOWNLOAD_ENABLED ) ) >>= nValue;
333	return nValue;	333	return nValue;
334	}	334	}
Lines 351-357 Link Here
351	sal_Int64	351	sal_Int64
352	UpdateCheckConfig::getLastChecked() const	352	UpdateCheckConfig::getLastChecked() const
353	{	353	{
354	sal_Int64 nValue;	354	sal_Int64 nValue = 0;
355		355
356	// getByName is defined as non const in XNameAccess	356	// getByName is defined as non const in XNameAccess
357	const_cast < UpdateCheckConfig *> (this)->getByName( UNISTRING( LAST_CHECK ) ) >>= nValue;	357	const_cast < UpdateCheckConfig *> (this)->getByName( UNISTRING( LAST_CHECK ) ) >>= nValue;
Lines 364-370 Link Here
364	sal_Int64	364	sal_Int64
365	UpdateCheckConfig::getCheckInterval() const	365	UpdateCheckConfig::getCheckInterval() const
366	{	366	{
367	sal_Int64 nValue;	367	sal_Int64 nValue = 0;
368		368
369	// getByName is defined as non const in XNameAccess	369	// getByName is defined as non const in XNameAccess
370	const_cast < UpdateCheckConfig *> (this)->getByName( UNISTRING( CHECK_INTERVAL ) ) >>= nValue;	370	const_cast < UpdateCheckConfig *> (this)->getByName( UNISTRING( CHECK_INTERVAL ) ) >>= nValue;
Lines 630-636 Link Here
630	// FIXME: use non IgnoreAsciiCase version as soon as it becomes available	630	// FIXME: use non IgnoreAsciiCase version as soon as it becomes available
631	if( aString.endsWithIgnoreAsciiCaseAsciiL(AUTOCHECK_ENABLED "']", sizeof(AUTOCHECK_ENABLED)+1) )	631	if( aString.endsWithIgnoreAsciiCaseAsciiL(AUTOCHECK_ENABLED "']", sizeof(AUTOCHECK_ENABLED)+1) )
632	{	632	{
633	sal_Bool bEnabled;	633	sal_Bool bEnabled = sal_False;
634	aChangesSet[i].Element >>= bEnabled;	634	aChangesSet[i].Element >>= bEnabled;
635	m_rListener->autoCheckStatusChanged(sal_True == bEnabled);	635	m_rListener->autoCheckStatusChanged(sal_True == bEnabled);
636	}	636	}

Lines 512-518 Link Here

(-)extensions/source/update/ui/updatecheckui.cxx (-2 / +2 lines)
512	throw lang::IllegalArgumentException();	512	throw lang::IllegalArgumentException();
513	}	513	}
514	else if (rPropertyName.compareToAscii( PROPERTY_SHOW_MENUICON ) == 0) {	514	else if (rPropertyName.compareToAscii( PROPERTY_SHOW_MENUICON ) == 0) {
515	bool bShowMenuIcon;	515	bool bShowMenuIcon = sal_False;
516	rValue >>= bShowMenuIcon;	516	rValue >>= bShowMenuIcon;
517	if ( bShowMenuIcon != mbShowMenuIcon )	517	if ( bShowMenuIcon != mbShowMenuIcon )
518	{	518	{
Lines 817-826 Link Here
817	\| WB_OWNERDRAWDECORATION	817	\| WB_OWNERDRAWDECORATION
818	\| WB_NOBORDER	818	\| WB_NOBORDER
819	)	819	)
820	, maMaxTextSize( TEXT_MAX_WIDTH, TEXT_MAX_HEIGHT )
821	, maBubbleTitle( rTitle )	820	, maBubbleTitle( rTitle )
822	, maBubbleText( rText )	821	, maBubbleText( rText )
823	, maBubbleImage( rImage )	822	, maBubbleImage( rImage )
		823	, maMaxTextSize( TEXT_MAX_WIDTH, TEXT_MAX_HEIGHT )
824	, mnTipOffset( 0 )	824	, mnTipOffset( 0 )
825	{	825	{
826	SetBackground( Wallpaper( GetSettings().GetStyleSettings().GetHelpColor() ) );	826	SetBackground( Wallpaper( GetSettings().GetStyleSettings().GetHelpColor() ) );