diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-11-10 15:06:12 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-11-10 15:06:12 +0000 |
| commit | f62287f17796d08d34b0099b9e89b388de5169ae (patch) | |
| tree | 6e45a0108112686df5c94b708c2be3c2f5325035 | |
| parent | 568308cc6c84ed198ddd58c4a478c68ddf216daa (diff) | |
CWS-TOOLING: integrate CWS cmcfixes50
2008-11-10 13:31:50 +0100 cmc r263517 : gio doesn't do anything useful for remote stuff wrt info
2008-11-06 00:11:47 +0100 cmc r263359 : #i93436# pile of other 64bit new gcc warnings
2008-11-05 00:39:03 +0100 cmc r263340 : i95856 let a ppc64 vanilla build succeed
2008-11-04 14:00:25 +0100 cmc r263320 : #i93436# useless const
2008-11-04 11:53:10 +0100 cmc r263314 : #i93436# ambiguous
2008-11-04 11:48:05 +0100 cmc r263313 : #i93436# add some braces
2008-11-04 11:29:24 +0100 cmc r263312 : #i93436# ambiguous
2008-11-04 10:53:46 +0100 cmc r263311 :
101 files changed, 312 insertions, 306 deletions
diff --git a/basic/source/app/app.cxx b/basic/source/app/app.cxx index cdf4d3ae1f..1252c5bc22 100644 --- a/basic/source/app/app.cxx +++ b/basic/source/app/app.cxx @@ -306,7 +306,7 @@ void BasicApp::Main( ) // Install filter for OSLAsserts DbgPrintMsgBox = DbgGetPrintMsgBox(); DbgSetPrintTestTool( DBG_TestToolDebugMessageFilter ); - DBG_INSTOUTERROR( DBG_OUT_TESTTOOL ) + DBG_INSTOUTERROR( DBG_OUT_TESTTOOL ); if ( osl_setDebugMessageFunc( osl_TestToolDebugMessageFilter ) ) DBG_ERROR("osl_setDebugMessageFunc returns non NULL pointer"); diff --git a/basic/source/app/appwin.cxx b/basic/source/app/appwin.cxx index 7d9e3732dc..b187e95e44 100644 --- a/basic/source/app/appwin.cxx +++ b/basic/source/app/appwin.cxx @@ -623,7 +623,7 @@ BOOL AppWin::Close() // uncomment to avoid compiler warning // break; default: - DBG_ERROR("Not Implemented in AppWin::Close") + DBG_ERROR("Not Implemented in AppWin::Close"); return FALSE; } } diff --git a/basic/source/app/dialogs.cxx b/basic/source/app/dialogs.cxx index 05442f9b28..e38c399604 100644 --- a/basic/source/app/dialogs.cxx +++ b/basic/source/app/dialogs.cxx @@ -1010,7 +1010,7 @@ IMPL_LINK( GenericOptions, CheckButtonsHdl, ComboBox*, pCB ) void GenericOptions::Save( Config &aConfig ) { (void) aConfig; /* avoid warning about unused parameter */ - DBG_ASSERT( &aConfig == &aConf, "Saving to different Configuration" ) + DBG_ASSERT( &aConfig == &aConf, "Saving to different Configuration" ); // eventuelle �nderungen Speichern LINK( this, GenericOptions, LoadGroup ).Call( NULL ); diff --git a/basic/source/app/textedit.cxx b/basic/source/app/textedit.cxx index ce602bded8..48865c209f 100644 --- a/basic/source/app/textedit.cxx +++ b/basic/source/app/textedit.cxx @@ -564,7 +564,7 @@ SbxBase* TextEditImp::GetSbxAtMousePos( String &aWord ) pAppEdit->GetBasicFrame()->Basic().DebugFindNoErrors( TRUE ); SbxBase* pSBX = StarBASIC::FindSBXInCurrentScope( aWord ); pAppEdit->GetBasicFrame()->Basic().DebugFindNoErrors( FALSE ); - DBG_ASSERT( !( !bWasError && SbxBase::IsError()), "Error generated while retrieving Variable data for viewing" ) + DBG_ASSERT( !( !bWasError && SbxBase::IsError()), "Error generated while retrieving Variable data for viewing" ); if ( !bWasError && SbxBase::IsError() ) SbxBase::ResetError(); diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx index c3d4c05917..952beabd62 100644 --- a/basic/source/classes/sbxmod.cxx +++ b/basic/source/classes/sbxmod.cxx @@ -808,7 +808,7 @@ USHORT SbModule::Run( SbMethod* pMeth ) // beim Programm-Ende freigeben, damit nichts gehalten wird. ClearUnoObjectsInRTL_Impl( xBasic ); - DBG_ASSERT(pINST->nCallLvl==0,"BASIC-Call-Level > 0") + DBG_ASSERT(pINST->nCallLvl==0,"BASIC-Call-Level > 0"); delete pINST, pINST = NULL, bDelInst = FALSE; // #i30690 diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx index 8b4ff8930e..e4d667ecc0 100644 --- a/basic/source/runtime/iosys.cxx +++ b/basic/source/runtime/iosys.cxx @@ -638,7 +638,7 @@ void UCBStream::SetSize( ULONG nSize ) { (void)nSize; - DBG_ERROR( "not allowed to call from basic" ) + DBG_ERROR( "not allowed to call from basic" ); SetError( ERRCODE_IO_GENERAL ); } diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx index 86b17e6748..0945400a00 100644 --- a/basic/source/uno/namecont.cxx +++ b/basic/source/uno/namecont.cxx @@ -1154,7 +1154,7 @@ sal_Bool SfxLibraryContainer::init_Impl( // #i93163 if( bCleanUp ) { - DBG_ERROR( "Upgrade of Basic installation failed somehow" ) + DBG_ERROR( "Upgrade of Basic installation failed somehow" ); static char strErrorSavFolderName[] = "__basic_80_err"; INetURLObject aPrevUserBasicInetObj_Err( aUserBasicInetObj ); diff --git a/configmgr/source/inc/simpleinteractionrequest.hxx b/configmgr/source/inc/simpleinteractionrequest.hxx index 204ff4ddc8..852216ff88 100644 --- a/configmgr/source/inc/simpleinteractionrequest.hxx +++ b/configmgr/source/inc/simpleinteractionrequest.hxx @@ -74,7 +74,7 @@ namespace apihelper { * @return the continuation choosen by an interaction handler or * CONTINUATION_UNKNOWN, if the request was not (yet) handled. */ - const sal_uInt32 getResponse() const; + sal_uInt32 getResponse() const; }; /** These are the constants that can be passed to the constructor of class diff --git a/configmgr/source/misc/simpleinteractionrequest.cxx b/configmgr/source/misc/simpleinteractionrequest.cxx index 4a3ddf1329..67deee34b1 100644 --- a/configmgr/source/misc/simpleinteractionrequest.cxx +++ b/configmgr/source/misc/simpleinteractionrequest.cxx @@ -74,7 +74,7 @@ SimpleInteractionRequest::SimpleInteractionRequest( } //========================================================================= -const sal_uInt32 SimpleInteractionRequest::getResponse() const +sal_uInt32 SimpleInteractionRequest::getResponse() const { uno::Reference< task::XInteractionContinuation > xSelection = this->getSelection(); if ( xSelection.is() ) diff --git a/connectivity/inc/connectivity/FValue.hxx b/connectivity/inc/connectivity/FValue.hxx index 11201fedd6..974556971f 100644 --- a/connectivity/inc/connectivity/FValue.hxx +++ b/connectivity/inc/connectivity/FValue.hxx @@ -255,8 +255,8 @@ namespace connectivity ORowSetValue& operator=(const ::com::sun::star::uno::Any& _rAny); operator sal_Bool() const { return isNull() ? sal_False : getBool(); } - operator sal_Int8() const { return isNull() ? 0 : getInt8(); } - operator sal_Int16() const { return isNull() ? 0 : getInt16(); } + operator sal_Int8() const { return isNull() ? static_cast<sal_Int8>(0) : getInt8(); } + operator sal_Int16() const { return isNull() ? static_cast<sal_Int16>(0) : getInt16(); } operator sal_Int32() const { return isNull() ? 0 : getInt32(); } operator sal_Int64() const { return isNull() ? 0 : getLong(); } operator float() const { return isNull() ? (float)0.0: getFloat(); } @@ -301,10 +301,10 @@ namespace connectivity } sal_Bool isBound() const { return m_bBound; } - void setBound(sal_Bool _bBound) { m_bBound = _bBound; } + void setBound(sal_Bool _bBound) { m_bBound = _bBound ? true : false; } sal_Bool isModified() const { return m_bModified; } - void setModified(sal_Bool _bMod=sal_True){ m_bModified = _bMod; } + void setModified(sal_Bool _bMod=sal_True){ m_bModified = _bMod ? true : false; } sal_Bool isSigned() const { return m_bSigned; } void setSigned(sal_Bool _bMod=sal_True); diff --git a/connectivity/source/drivers/file/fcomp.cxx b/connectivity/source/drivers/file/fcomp.cxx index 9436510087..c3dd5eb478 100644 --- a/connectivity/source/drivers/file/fcomp.cxx +++ b/connectivity/source/drivers/file/fcomp.cxx @@ -410,7 +410,7 @@ OOperand* OPredicateCompiler::execute_BETWEEN(OSQLParseNode* pPredicateNode) thr OOperand* OPredicateCompiler::execute_ISNULL(OSQLParseNode* pPredicateNode) throw(SQLException, RuntimeException) { DBG_ASSERT(pPredicateNode->count() >= 3,"OFILECursor: Fehler im Parse Tree"); - DBG_ASSERT(SQL_ISTOKEN(pPredicateNode->getChild(1),IS),"OFILECursor: Fehler im Parse Tree") + DBG_ASSERT(SQL_ISTOKEN(pPredicateNode->getChild(1),IS),"OFILECursor: Fehler im Parse Tree"); sal_Int32 ePredicateType; if (SQL_ISTOKEN(pPredicateNode->getChild(2),NOT)) diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx index 435f1dec66..973ae1ddff 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx @@ -112,7 +112,7 @@ namespace const char* pProfileByEnv = getenv( ProductRootEnvironmentVariable[ productIndex ] ); if ( pProfileByEnv ) { - sProductPath = ::rtl::OUString( pProfileByEnv, strlen( pProfileByEnv ), osl_getThreadTextEncoding() ); + sProductPath = ::rtl::OUString( pProfileByEnv, rtl_str_getLength( pProfileByEnv ), osl_getThreadTextEncoding() ); // asume that this is fine, no further checks } else @@ -162,7 +162,7 @@ namespace return lcl_guessProfileRoot( product ); } - +#ifndef MINIMAL_PROFILEDISCOVER // ----------------------------------------------------------------------- ::rtl::OUString getRegistryFileName(MozillaProductType product) { @@ -171,5 +171,4 @@ namespace return getRegistryDir(product) + ::rtl::OUString::createFromAscii(APP_REGISTRY_NAME); } - - +#endif diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.hxx index a042a76cba..1bc4b9c2c2 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.hxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.hxx @@ -41,7 +41,9 @@ #include <rtl/ustring.hxx> ::rtl::OUString getRegistryDir(::com::sun::star::mozilla::MozillaProductType product); +#ifndef MINIMAL_PROFILEDISCOVER ::rtl::OUString getRegistryFileName(::com::sun::star::mozilla::MozillaProductType product); +#endif #endif diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx index d15c969057..7c71ab1041 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx @@ -166,7 +166,7 @@ sal_Bool MNS_InitXPCOM(sal_Bool* aProfileExists) nsCOMPtr<nsIEventQueueService> eventQService( do_GetService(NS_EVENTQUEUESERVICE_CONTRACTID, &rv)); if (NS_FAILED(rv)) - return NS_SUCCEEDED( rv ); + return NS_SUCCEEDED( rv ) ? sal_True : sal_False; eventQService->CreateThreadEventQueue(); diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx index 5847dd2b0a..3ac42b4c5b 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx @@ -150,7 +150,7 @@ namespace connectivity //load mozilla profiles to m_ProductProfileList LoadMozillaProfiles(); #endif - sal_Int32 count=m_ProductProfileList[MozillaProductType_Mozilla].mProfileList.size(); + sal_Int32 count=static_cast<sal_Int32>(m_ProductProfileList[MozillaProductType_Mozilla].mProfileList.size()); //load thunderbird profiles to m_ProductProfileList count += LoadXPToolkitProfiles(MozillaProductType_Thunderbird); @@ -362,7 +362,7 @@ namespace connectivity } } - return m_Product.mProfileList.size(); + return static_cast< ::sal_Int32 >(m_Product.mProfileList.size()); } ::rtl::OUString ProfileAccess::getProfilePath( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) @@ -382,13 +382,13 @@ namespace connectivity { sal_Int32 index=product; ProductStruct &m_Product = m_ProductProfileList[index]; - return m_Product.mProfileList.size(); + return static_cast< ::sal_Int32 >(m_Product.mProfileList.size()); } ::sal_Int32 ProfileAccess::getProfileList( ::com::sun::star::mozilla::MozillaProductType product, ::com::sun::star::uno::Sequence< ::rtl::OUString >& list ) throw (::com::sun::star::uno::RuntimeException) { sal_Int32 index=product; ProductStruct &m_Product = m_ProductProfileList[index]; - list.realloc(m_Product.mProfileList.size()); + list.realloc(static_cast<sal_Int32>(m_Product.mProfileList.size())); sal_Int32 i=0; for(ProfileList::iterator itor=m_Product.mProfileList.begin(); itor != m_Product.mProfileList.end(); @@ -399,7 +399,7 @@ namespace connectivity i++; } - return m_Product.mProfileList.size(); + return static_cast< ::sal_Int32 >(m_Product.mProfileList.size()); } ::rtl::OUString ProfileAccess::getDefaultProfile( ::com::sun::star::mozilla::MozillaProductType product ) throw (::com::sun::star::uno::RuntimeException) diff --git a/connectivity/source/drivers/mozab/bootstrap/makefile.mk b/connectivity/source/drivers/mozab/bootstrap/makefile.mk index 4148e6b073..80ca89d28e 100644 --- a/connectivity/source/drivers/mozab/bootstrap/makefile.mk +++ b/connectivity/source/drivers/mozab/bootstrap/makefile.mk @@ -67,6 +67,7 @@ SLOFILES += \ CDEFS+=-DMINIMAL_PROFILEDISCOVER SHL1TARGET=$(TARGET) +SHL1VERSIONMAP= $(TARGET).map SHL1OBJS=$(SLOFILES) SHL1STDLIBS=\ diff --git a/connectivity/source/drivers/mozab/bootstrap/mozbootstrap.map b/connectivity/source/drivers/mozab/bootstrap/mozbootstrap.map new file mode 100644 index 0000000000..750db5d4af --- /dev/null +++ b/connectivity/source/drivers/mozab/bootstrap/mozbootstrap.map @@ -0,0 +1,8 @@ +MOZBOOTSTRAP_1_0 { + global: + component_getImplementationEnvironment; + component_writeInfo; + component_getFactory; + local: + *; +}; diff --git a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx index 6df6030e88..3f5581a169 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx @@ -685,7 +685,7 @@ MDatabaseMetaDataHelper::testLDAPConnection( OConnection* _pCon ) sal_Int32 pos = sAbURI.indexOf( MOZ_SCHEMA ); if ( pos != -1 ) { - sAbURI = sAbURI.replaceAt (pos, strlen( MOZ_SCHEMA ), ::rtl::OString(LDAP_SCHEMA) ); + sAbURI = sAbURI.replaceAt (pos, rtl_str_getLength( MOZ_SCHEMA ), ::rtl::OString(LDAP_SCHEMA) ); } pos = sAbURI.indexOf( QUERY_CHAR ); @@ -730,7 +730,7 @@ MDatabaseMetaDataHelper::testLDAPConnection( OConnection* _pCon ) } } setError( STR_COULD_NOT_CONNECT_LDAP ); - return NS_SUCCEEDED( rv ); + return NS_SUCCEEDED( rv ) ? sal_True : sal_False; } sal_Bool MDatabaseMetaDataHelper::NewAddressBook(OConnection* _pCon,const ::rtl::OUString & aTableName) @@ -767,7 +767,7 @@ sal_Bool MDatabaseMetaDataHelper::NewAddressBook(OConnection* _pCon,const ::rtl: setAbSpecificError( _pCon, !bIsMozillaAB ); } OSL_TRACE( "OUT MDatabaseMetaDataHelper::NewAddressBook()\n" ); - return( NS_SUCCEEDED(rv) ); + return( NS_SUCCEEDED(rv) ? sal_True : sal_False ); } nsresult NewAddressBook(const ::rtl::OUString * aName) { diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx index 7027252134..b1f2eaa49f 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx @@ -267,7 +267,7 @@ void MLDAPMessageListener::setConnectionStatus( sal_Bool _good ) NS_IMETHODIMP MLDAPMessageListener::OnLDAPInit(nsILDAPConnection* /*aConn*/, nsresult aStatus ) { - setConnectionStatus( NS_SUCCEEDED( aStatus ) ); + setConnectionStatus( NS_SUCCEEDED( aStatus ) ? sal_True : sal_False ); return aStatus; } diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx b/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx index 7ec900425f..c31c45d483 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx @@ -800,7 +800,7 @@ MQuery::resyncRow(sal_Int32 nDBRow) args.arg2 = (void*)&nDBRow; nsresult rv = xMProxy.StartProxy(&args,m_Product,m_Profile); setError( m_aQueryHelper->getErrorResourceId() ); - return NS_SUCCEEDED( rv ); + return NS_SUCCEEDED( rv ) ? sal_True : sal_False; } sal_Int32 diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx index 6cc2a42d17..80738adc1a 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx @@ -390,7 +390,7 @@ MQueryHelper::getResultCount() const else { OSL_TRACE( "\tOUT MQueryHelper::getResultCount() = %d\n", m_aResults.size() ); - return m_aResults.size(); + return static_cast<sal_Int32>(m_aResults.size()); } } @@ -400,7 +400,7 @@ sal_uInt32 MQueryHelper::getRealCount() const { OSL_TRACE( "IN/OUT MQueryHelper::getRealCount() = %d\n", m_aResults.size() ); - return m_aResults.size(); + return static_cast<sal_Int32>(m_aResults.size()); } // ------------------------------------------------------------------------- @@ -996,6 +996,6 @@ sal_Int32 MQueryHelper::createNewCard() nsCOMPtr <nsIAbCard> card = do_CreateInstance(NS_ABCARDPROPERTY_CONTRACTID, &rv); //set default values getCardValues(card); - return m_aResults.size(); + return static_cast<sal_Int32>(m_aResults.size()); } diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx index a4fd907404..768d033ac1 100644 --- a/desktop/source/app/appinit.cxx +++ b/desktop/source/app/appinit.cxx @@ -133,7 +133,8 @@ static bool configureUcb(bool bServer, rtl::OUString const & rPortalConnect) bool ret = ::ucbhelper::ContentBroker::initialize( xServiceFactory, aArgs ) != false; - + +#ifdef GNOME_VFS_ENABLED // register GnomeUCP if necessary ::ucbhelper::ContentBroker* cb = ::ucbhelper::ContentBroker::get(); if(cb) { @@ -191,6 +192,7 @@ static bool configureUcb(bool bServer, rtl::OUString const & rPortalConnect) } catch (RuntimeException e) { } } +#endif // GNOME_VFS_ENABLED return ret;; } diff --git a/desktop/source/app/makefile.mk b/desktop/source/app/makefile.mk index 7ae735148e..f0948baf64 100644 --- a/desktop/source/app/makefile.mk +++ b/desktop/source/app/makefile.mk @@ -40,6 +40,10 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk +.IF "$(ENABLE_GNOMEVFS)"=="TRUE" +CFLAGS+=-DGNOME_VFS_ENABLED +.ENDIF + SHL1TARGET = sofficeapp SHL1OBJS = \ $(SLO)$/app.obj \ diff --git a/fpicker/source/unx/gnome/SalGtkFilePicker.cxx b/fpicker/source/unx/gnome/SalGtkFilePicker.cxx index 38c3bdddad..2a47da4c0d 100644 --- a/fpicker/source/unx/gnome/SalGtkFilePicker.cxx +++ b/fpicker/source/unx/gnome/SalGtkFilePicker.cxx @@ -999,13 +999,13 @@ sal_Int16 SAL_CALL SalGtkFilePicker::execute() throw( uno::RuntimeException ) uno::Reference< awt::XExtendedToolkit > xToolkit( m_xServiceMgr->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.awt.Toolkit") ), uno::UNO_QUERY); - RunDialog* pRunInMain = new RunDialog(m_pDialog, xToolkit); - uno::Reference < awt::XTopWindowListener > xLifeCycle(pRunInMain); + RunDialog* pRunDialog = new RunDialog(m_pDialog, xToolkit); + uno::Reference < awt::XTopWindowListener > xLifeCycle(pRunDialog); while( GTK_RESPONSE_NO == btn ) { btn = GTK_RESPONSE_YES; // we dont want to repeat unless user clicks NO for file save. - gint nStatus = pRunInMain->runandwaitforresult(); + gint nStatus = pRunDialog->run(); switch( nStatus ) { case GTK_RESPONSE_ACCEPT: @@ -1032,9 +1032,9 @@ sal_Int16 SAL_CALL SalGtkFilePicker::execute() throw( uno::RuntimeException ) OUStringToOString(aResProvider.getResString(FILE_PICKER_TITLE_SAVE ), RTL_TEXTENCODING_UTF8 ).getStr() ); - RunDialog* pAnotherRunInMain = new RunDialog(dlg, xToolkit); - uno::Reference < awt::XTopWindowListener > xAnotherLifeCycle(pAnotherRunInMain); - btn = pAnotherRunInMain->runandwaitforresult(); + RunDialog* pAnotherDialog = new RunDialog(dlg, xToolkit); + uno::Reference < awt::XTopWindowListener > xAnotherLifeCycle(pAnotherDialog); + btn = pAnotherDialog->run(); gtk_widget_destroy( dlg ); } diff --git a/fpicker/source/unx/gnome/SalGtkFolderPicker.cxx b/fpicker/source/unx/gnome/SalGtkFolderPicker.cxx index 0abce004f6..a19f1cc29d 100644 --- a/fpicker/source/unx/gnome/SalGtkFolderPicker.cxx +++ b/fpicker/source/unx/gnome/SalGtkFolderPicker.cxx @@ -176,9 +176,9 @@ sal_Int16 SAL_CALL SalGtkFolderPicker::execute() throw( uno::RuntimeException ) uno::Reference< awt::XExtendedToolkit > xToolkit( m_xServiceMgr->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.awt.Toolkit") ), uno::UNO_QUERY); - RunDialog* pRunInMain = new RunDialog(m_pDialog, xToolkit); - uno::Reference < awt::XTopWindowListener > xLifeCycle(pRunInMain); - gint nStatus = pRunInMain->runandwaitforresult(); + RunDialog* pRunDialog = new RunDialog(m_pDialog, xToolkit); + uno::Reference < awt::XTopWindowListener > xLifeCycle(pRunDialog); + gint nStatus = pRunDialog->run(); switch( nStatus ) { case GTK_RESPONSE_ACCEPT: diff --git a/fpicker/source/unx/gnome/SalGtkPicker.cxx b/fpicker/source/unx/gnome/SalGtkPicker.cxx index 71c9fab41a..d517e465a5 100644 --- a/fpicker/source/unx/gnome/SalGtkPicker.cxx +++ b/fpicker/source/unx/gnome/SalGtkPicker.cxx @@ -124,7 +124,7 @@ extern "C" RunDialog::RunDialog( GtkWidget *pDialog, uno::Reference< awt::XExtendedToolkit >& rToolkit ) : cppu::WeakComponentImplHelper1< awt::XTopWindowListener >( maLock ), - mbFinished(false), mpDialog(pDialog), mpCreatedParent(NULL), mxToolkit(rToolkit) + mpDialog(pDialog), mpCreatedParent(NULL), mxToolkit(rToolkit) { awt::SystemDependentXWindow aWindowHandle; @@ -178,39 +178,20 @@ void RunDialog::cancel() gtk_widget_hide( mpDialog ); } -void RunDialog::run() +gint RunDialog::run() { if (mxToolkit.is()) mxToolkit->addTopWindowListener(this); - mnStatus = gtk_dialog_run( GTK_DIALOG( mpDialog ) ); + gint nStatus = gtk_dialog_run( GTK_DIALOG( mpDialog ) ); if (mxToolkit.is()) mxToolkit->removeTopWindowListener(this); - - if (mnStatus != 1) //PLAY + if (nStatus != 1) //PLAY gtk_widget_hide( mpDialog ); - maLock.acquire(); - mbFinished = true; - maLock.release(); - - Application::EndYield(); -} - -gint RunDialog::runandwaitforresult() -{ - g_timeout_add_full(G_PRIORITY_HIGH_IDLE, 0, (GSourceFunc)rundialog, this, NULL); - while (1) - { - maLock.acquire(); - if (mbFinished) - break; - maLock.release(); - Application::Yield(); - } - return mnStatus; + return nStatus; } SalGtkPicker::~SalGtkPicker() diff --git a/fpicker/source/unx/gnome/SalGtkPicker.hxx b/fpicker/source/unx/gnome/SalGtkPicker.hxx index a9dfca150f..a520117c0e 100644 --- a/fpicker/source/unx/gnome/SalGtkPicker.hxx +++ b/fpicker/source/unx/gnome/SalGtkPicker.hxx @@ -74,8 +74,7 @@ class SalGtkPicker static rtl::OString unicodetouri(const rtl::OUString &rURL); }; -//Run the Gtk Dialog in the "Main Thread" for us to avoid threading conflict and -//report back to this thread. Watch for any "new windows" created while we're +//Run the Gtk Dialog. Watch for any "new windows" created while we're //executing and consider that a CANCEL event to avoid e.g. "file cannot be opened" //modal dialogs and this one getting locked if some other API call causes this //to happen while we're opened waiting for user input, e.g. @@ -84,9 +83,7 @@ class RunDialog : public cppu::WeakComponentImplHelper1< ::com::sun::star::awt::XTopWindowListener > { private: - bool mbFinished; osl::Mutex maLock; - gint mnStatus; GtkWidget *mpDialog; GdkWindow *mpCreatedParent; ::com::sun::star::uno::Reference< ::com::sun::star::awt::XExtendedToolkit> mxToolkit; @@ -112,8 +109,7 @@ public: throw (::com::sun::star::uno::RuntimeException) {} public: RunDialog(GtkWidget *pDialog, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XExtendedToolkit > &rToolkit); - gint runandwaitforresult(); - void run(); + gint run(); void cancel(); ~RunDialog(); }; diff --git a/framework/source/services/backingwindow.cxx b/framework/source/services/backingwindow.cxx index 3432ee5d98..b6b1624e33 100644 --- a/framework/source/services/backingwindow.cxx +++ b/framework/source/services/backingwindow.cxx @@ -446,7 +446,7 @@ void BackingWindow::initControls() maOpenButton, maOpenText, aMnemns, maOpenString ); nYPos += 10; - DBG_ASSERT( nYPos < maControlRect.GetHeight(), "misformatting !" ) + DBG_ASSERT( nYPos < maControlRect.GetHeight(), "misformatting !" ); if( mnColumnWidth[0] + mnColumnWidth[1] + nBtnPos + 20 > maControlRect.GetWidth() ) maControlRect.Right() = maControlRect.Left() + mnColumnWidth[0] + mnColumnWidth[1] + nBtnPos + 20; diff --git a/idl/source/cmptools/hash.cxx b/idl/source/cmptools/hash.cxx index add4906770..97f5960b13 100644 --- a/idl/source/cmptools/hash.cxx +++ b/idl/source/cmptools/hash.cxx @@ -122,7 +122,7 @@ BOOL SvHashTable::Test_Insert( const void * pElement, BOOL bInsert, if( bInsert ) { - DBG_ASSERT( nMax != nLoop, "Hash table full" ) + DBG_ASSERT( nMax != nLoop, "Hash table full" ); if( nMax != nLoop ) { nFill++; @@ -177,7 +177,7 @@ SvStringHashTable::~SvStringHashTable() #ifdef DBG_UTIL while( pPos != pEnd ) { - DBG_ASSERT( pPos->GetRefCount() == 1, "Reference count != 1" ) + DBG_ASSERT( pPos->GetRefCount() == 1, "Reference count != 1" ); pPos++; } #endif diff --git a/idl/source/objects/basobj.cxx b/idl/source/objects/basobj.cxx index 952c7a4a43..68a4706138 100644 --- a/idl/source/objects/basobj.cxx +++ b/idl/source/objects/basobj.cxx @@ -207,7 +207,7 @@ void SvMetaName::Load( SvPersistStream & rStm ) if( nMask >= 0x20 ) { rStm.SetError( SVSTREAM_FILEFORMAT_ERROR ); - DBG_ERROR( "wrong format" ) + DBG_ERROR( "wrong format" ); return; } if( nMask & 0x01 ) rStm >> aName; @@ -570,7 +570,7 @@ void SvMetaReference::Load( SvPersistStream & rStm ) if( nMask >= 0x2 ) { rStm.SetError( SVSTREAM_FILEFORMAT_ERROR ); - DBG_ERROR( "wrong format" ) + DBG_ERROR( "wrong format" ); return; } if( nMask & 0x01 ) @@ -620,7 +620,7 @@ void SvMetaExtern::Load( SvPersistStream & rStm ) if( nMask >= 0x20 ) { rStm.SetError( SVSTREAM_FILEFORMAT_ERROR ); - DBG_ERROR( "wrong format" ) + DBG_ERROR( "wrong format" ); return; } if( nMask & 0x01 ) rStm >> pModule; @@ -656,7 +656,7 @@ void SvMetaExtern::Save( SvPersistStream & rStm ) *************************************************************************/ SvMetaModule * SvMetaExtern::GetModule() const { - DBG_ASSERT( pModule != NULL, "module not set" ) + DBG_ASSERT( pModule != NULL, "module not set" ); return pModule; } diff --git a/idl/source/objects/bastype.cxx b/idl/source/objects/bastype.cxx index a2d49da5f0..35059a939a 100644 --- a/idl/source/objects/bastype.cxx +++ b/idl/source/objects/bastype.cxx @@ -140,7 +140,7 @@ SvStream& operator >> (SvStream & rStm, SvBOOL & rb ) if( n & ~0x03 ) { rStm.SetError( SVSTREAM_FILEFORMAT_ERROR ); - DBG_ERROR( "format error" ) + DBG_ERROR( "format error" ); } return rStm; } diff --git a/idl/source/objects/module.cxx b/idl/source/objects/module.cxx index 492d829a81..eeb59e4279 100644 --- a/idl/source/objects/module.cxx +++ b/idl/source/objects/module.cxx @@ -87,7 +87,7 @@ void SvMetaModule::Load( SvPersistStream & rStm ) USHORT nVer; rStm >> nVer; // Version - DBG_ASSERT( (nVer & ~IDL_WRITE_MASK) == MODULE_VER, "false version" ) + DBG_ASSERT( (nVer & ~IDL_WRITE_MASK) == MODULE_VER, "false version" ); rStm >> aClassList; rStm >> aTypeList; @@ -103,7 +103,7 @@ void SvMetaModule::Load( SvPersistStream & rStm ) rStm >> nCmpLen; #ifdef IDL_COMPILER DBG_ASSERT( (nVer & IDL_WRITE_MASK) == IDL_WRITE_COMPILER, - "no idl compiler format" ) + "no idl compiler format" ); rStm >> aBeginName; rStm >> aEndName; rStm >> aNextName; diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx index cc921ff6c2..18a5a23894 100644 --- a/idl/source/objects/object.cxx +++ b/idl/source/objects/object.cxx @@ -65,7 +65,7 @@ void SvClassElement::Load( SvPersistStream & rStm ) if( nMask >= 0x08 ) { rStm.SetError( SVSTREAM_FILEFORMAT_ERROR ); - DBG_ERROR( "wrong format" ) + DBG_ERROR( "wrong format" ); return; } if( nMask & 0x01 ) rStm >> aAutomation; @@ -124,7 +124,7 @@ void SvMetaClass::Load( SvPersistStream & rStm ) if( nMask >= 0x20 ) { rStm.SetError( SVSTREAM_FILEFORMAT_ERROR ); - DBG_ERROR( "wrong format" ) + DBG_ERROR( "wrong format" ); return; } if( nMask & 0x01 ) rStm >> aAttrList; @@ -597,7 +597,7 @@ void SvMetaClass::Write( SvIdlDataBase & rBase, SvStream & rOutStm, { case WRITE_ODL: { - DBG_ERROR( "Not supported anymore!" ) + DBG_ERROR( "Not supported anymore!" ); /* // Schreibt die Attribute SvMetaName::Write( rBase, rOutStm, nTab, nT, nA ); @@ -635,7 +635,7 @@ void SvMetaClass::Write( SvIdlDataBase & rBase, SvStream & rOutStm, case WRITE_C_SOURCE: case WRITE_C_HEADER: { - DBG_ERROR( "Not supported anymore!" ) + DBG_ERROR( "Not supported anymore!" ); /* StringList aSuperList; if( nT == WRITE_C_SOURCE ) diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx index 8b8442f66a..cf84ba229b 100644 --- a/idl/source/objects/types.cxx +++ b/idl/source/objects/types.cxx @@ -229,7 +229,7 @@ BOOL SvMetaAttribute::GetReadOnlyDoc() const BOOL SvMetaAttribute::IsMethod() const { SvMetaType * pType = GetType(); - DBG_ASSERT( pType, "no type for attribute" ) + DBG_ASSERT( pType, "no type for attribute" ); return pType->GetType() == TYPE_METHOD; } @@ -253,7 +253,7 @@ ByteString SvMetaAttribute::GetMangleName( BOOL ) const void SvMetaAttribute::FillSbxObject( SbxInfo * pInfo, USHORT nSbxFlags ) { SvMetaType * pType = GetType(); - DBG_ASSERT( pType, "no type for attribute" ) + DBG_ASSERT( pType, "no type for attribute" ); if( !nSbxFlags ) { // Flags koennen vom Aufrufer ueberschrieben werden if( pType->GetOut() ) @@ -266,7 +266,7 @@ void SvMetaAttribute::FillSbxObject( SbxInfo * pInfo, USHORT nSbxFlags ) nSbxFlags |= SBX_READ; } SvMetaType * pBaseType = pType->GetBaseType(); - DBG_ASSERT( pBaseType, "no base type for attribute" ) + DBG_ASSERT( pBaseType, "no base type for attribute" ); if( pBaseType->GetType() == TYPE_STRUCT ) { const SvMetaAttributeMemberList & rList = pBaseType->GetAttrList(); @@ -296,9 +296,9 @@ void SvMetaAttribute::FillSbxObject( SvIdlDataBase & rBase, if( bVariable && IsVariable() ) { SvMetaType * pType = GetType(); - DBG_ASSERT( pType, "no type for attribute" ) + DBG_ASSERT( pType, "no type for attribute" ); SvMetaType * pBaseType = pType->GetBaseType(); - DBG_ASSERT( pBaseType, "no base type for attribute" ) + DBG_ASSERT( pBaseType, "no base type for attribute" ); if( pBaseType->GetType() == TYPE_STRUCT ) { @@ -522,9 +522,9 @@ void SvMetaAttribute::WriteParam( SvIdlDataBase & rBase, WriteType nT ) { SvMetaType * pType = GetType(); - DBG_ASSERT( pType, "no type for attribute" ) + DBG_ASSERT( pType, "no type for attribute" ); SvMetaType * pBaseType = pType->GetBaseType(); - DBG_ASSERT( pBaseType, "no base type for attribute" ) + DBG_ASSERT( pBaseType, "no base type for attribute" ); if( nT == WRITE_ODL || nT == WRITE_DOCU || nT == WRITE_C_HEADER || nT == WRITE_C_SOURCE ) @@ -797,9 +797,9 @@ void SvMetaAttribute::Write( SvIdlDataBase & rBase, SvStream & rOutStm, bVariable = IsVariable(); SvMetaType * pType = GetType(); - DBG_ASSERT( pType, "no type for attribute" ) + DBG_ASSERT( pType, "no type for attribute" ); SvMetaType * pBaseType = pType->GetBaseType(); - DBG_ASSERT( pBaseType, "no base type for attribute" ) + DBG_ASSERT( pBaseType, "no base type for attribute" ); int nBType = pBaseType->GetType(); if( nT == WRITE_ODL ) @@ -976,9 +976,9 @@ void SvMetaAttribute::Write( SvIdlDataBase & rBase, SvStream & rOutStm, ULONG SvMetaAttribute::MakeSfx( ByteString * pAttrArray ) { SvMetaType * pType = GetType(); - DBG_ASSERT( pType, "no type for attribute" ) + DBG_ASSERT( pType, "no type for attribute" ); SvMetaType * pBaseType = pType->GetBaseType(); - DBG_ASSERT( pBaseType, "no base type for attribute" ) + DBG_ASSERT( pBaseType, "no base type for attribute" ); if( pBaseType->GetType() == TYPE_STRUCT ) return pBaseType->MakeSfx( pAttrArray ); else @@ -1183,8 +1183,8 @@ SvMetaType * SvMetaType::GetBaseType() const *************************************************************************/ SvMetaType * SvMetaType::GetReturnType() const { - DBG_ASSERT( GetType() == TYPE_METHOD, "no method" ) - DBG_ASSERT( GetRef(), "no return type" ) + DBG_ASSERT( GetType() == TYPE_METHOD, "no method" ); + DBG_ASSERT( GetRef(), "no return type" ); return (SvMetaType *)GetRef(); } @@ -1285,7 +1285,7 @@ void SvMetaType::SetCall0( int e ) else { DBG_ASSERT( nType == TYPE_POINTER || nType == TYPE_BASE, - "set no base type to pointer" ) + "set no base type to pointer" ); SetType( TYPE_POINTER ); } } @@ -1319,7 +1319,7 @@ void SvMetaType::SetCall1( int e ) else { DBG_ASSERT( nType == TYPE_POINTER || nType == TYPE_BASE, - "set no base type to pointer" ) + "set no base type to pointer" ); SetType( TYPE_POINTER ); } } @@ -2071,7 +2071,7 @@ void SvMetaType::WriteMethodArgs default: { - DBG_ASSERT( FALSE, "WriteType not implemented" ) + DBG_ASSERT( FALSE, "WriteType not implemented" ); } } pAttr = pAttrList->Next(); @@ -2150,7 +2150,7 @@ void SvMetaType::WriteTypePrefix( SvIdlDataBase & rBase, SvStream & rOutStm, { SvMetaType * pBaseType = GetBaseType(); - DBG_ASSERT( pBaseType, "no base type for attribute" ) + DBG_ASSERT( pBaseType, "no base type for attribute" ); if( pBaseType->GetType() == TYPE_METHOD ) pBaseType->GetReturnType()->WriteTypePrefix( @@ -2181,7 +2181,7 @@ void SvMetaType::WriteTypePrefix( SvIdlDataBase & rBase, SvStream & rOutStm, { SvMetaType * pBaseType = GetBaseType(); - DBG_ASSERT( pBaseType, "no base type for attribute" ) + DBG_ASSERT( pBaseType, "no base type for attribute" ); if( pBaseType->GetType() == TYPE_METHOD ) { @@ -2201,7 +2201,7 @@ void SvMetaType::WriteTypePrefix( SvIdlDataBase & rBase, SvStream & rOutStm, default: { - DBG_ASSERT( FALSE, "WriteType not implemented" ) + DBG_ASSERT( FALSE, "WriteType not implemented" ); } } } @@ -2337,7 +2337,7 @@ void SvMetaEnumValue::Load( SvPersistStream & rStm ) if( nMask >= 0x02 ) { rStm.SetError( SVSTREAM_FILEFORMAT_ERROR ); - DBG_ERROR( "wrong format" ) + DBG_ERROR( "wrong format" ); return; } if( nMask & 0x01 ) rStm.ReadByteString( aEnumValue ); @@ -2425,7 +2425,7 @@ void SvMetaTypeEnum::Load( SvPersistStream & rStm ) if( nMask >= 0x04 ) { rStm.SetError( SVSTREAM_FILEFORMAT_ERROR ); - DBG_ERROR( "wrong format" ) + DBG_ERROR( "wrong format" ); return; } if( nMask & 0x01 ) rStm >> aEnumValueList; diff --git a/idl/source/prj/database.cxx b/idl/source/prj/database.cxx index 4883f6ca78..fc436b9182 100644 --- a/idl/source/prj/database.cxx +++ b/idl/source/prj/database.cxx @@ -174,7 +174,7 @@ BOOL SvIdlDataBase::IsBinaryFormat( SvStream & rStm ) *************************************************************************/ void SvIdlDataBase::Load( SvStream & rStm ) { - DBG_ASSERT( aTypeList.Count() == 0, "type list already initialized" ) + DBG_ASSERT( aTypeList.Count() == 0, "type list already initialized" ); SvPersistStream aPStm( *IDLAPP->pClassMgr, &rStm ); USHORT nVersion = 0; @@ -574,7 +574,7 @@ SvMetaType * SvIdlDataBase::ReadKnownType( SvTokenStream & rInStm ) // Ist genau dieser Typ return pType; - DBG_ASSERT( aTmpTypeList.First(), "mindestens ein Element" ) + DBG_ASSERT( aTmpTypeList.First(), "mindestens ein Element" ); SvMetaTypeRef xType = new SvMetaType( pType->GetName(), 'h', "dummy" ); xType->SetRef( pType ); xType->SetIn( bIn ); @@ -778,7 +778,7 @@ void SvIdlDataBase::WriteError( SvTokenStream & rInStm ) WriteError( "error", ByteString( aFileName, RTL_TEXTENCODING_UTF8 ), aErrorText, nRow, nColumn ); - DBG_ASSERT( pTok, "token must be found" ) + DBG_ASSERT( pTok, "token must be found" ); if( !pTok ) return; diff --git a/linguistic/source/convdic.cxx b/linguistic/source/convdic.cxx index a0829f4f7f..8a544d0450 100644 --- a/linguistic/source/convdic.cxx +++ b/linguistic/source/convdic.cxx @@ -187,7 +187,7 @@ BOOL IsConvDic( const String &rFileURL, INT16 &nLang, sal_Int16 &nConvType ) ReadThroughDic( rFileURL, *pImport ); // will implicitly add the entries bRes = pImport->GetLanguage() != LANGUAGE_NONE && pImport->GetConversionType() != -1; - DBG_ASSERT( bRes, "conversion dictionary corrupted?" ) + DBG_ASSERT( bRes, "conversion dictionary corrupted?" ); if (bRes) { diff --git a/linguistic/source/dicimp.cxx b/linguistic/source/dicimp.cxx index 5620212383..2481c29406 100644 --- a/linguistic/source/dicimp.cxx +++ b/linguistic/source/dicimp.cxx @@ -701,7 +701,7 @@ BOOL DictionaryNeo::addEntry_Impl(const uno::Reference< XDictionaryEntry > xDicE if (bAddEntry) { - DBG_ASSERT(!bNeedEntries, "lng : entries still not loaded") + DBG_ASSERT(!bNeedEntries, "lng : entries still not loaded"); if (nCount >= aEntries.getLength()) aEntries.realloc( Max(2 * nCount, nCount + 32) ); @@ -951,7 +951,7 @@ sal_Bool SAL_CALL DictionaryNeo::remove( const OUString& aWord ) // entry to be removed uno::Reference< XDictionaryEntry > xDicEntry( aEntries.getConstArray()[ nPos ] ); - DBG_ASSERT(xDicEntry.is(), "lng : dictionary entry is NULL") + DBG_ASSERT(xDicEntry.is(), "lng : dictionary entry is NULL"); nCount--; diff --git a/linguistic/source/misc.cxx b/linguistic/source/misc.cxx index b11238a71e..3a45feac83 100644 --- a/linguistic/source/misc.cxx +++ b/linguistic/source/misc.cxx @@ -105,7 +105,7 @@ LocaleDataWrapper & GetLocaleDataWrapper( INT16 nLang ) */ rtl_TextEncoding GetTextEncoding( INT16 nLanguage ) { - DBG_ASSERT( nLanguage != LANGUAGE_NONE, "invalid language argument" ) + DBG_ASSERT( nLanguage != LANGUAGE_NONE, "invalid language argument" ); static INT16 nLastLanguage = LANGUAGE_NONE; // set default value for unknown languages diff --git a/sfx2/source/appl/appdde.cxx b/sfx2/source/appl/appdde.cxx index 759d9fb810..45e1e23d55 100644 --- a/sfx2/source/appl/appdde.cxx +++ b/sfx2/source/appl/appdde.cxx @@ -462,7 +462,7 @@ long SfxViewFrame::DdeSetData BOOL SfxApplication::InitializeDde() { DBG_ASSERT( !pAppData_Impl->pDdeService, - "Dde kann nicht mehrfach initialisiert werden" ) + "Dde kann nicht mehrfach initialisiert werden" ); pAppData_Impl->pDdeService = new ImplDdeService( Application::GetAppName() ); int nError = pAppData_Impl->pDdeService->GetError(); @@ -498,7 +498,7 @@ void SfxAppData_Impl::DeInitDDE() void SfxApplication::AddDdeTopic( SfxObjectShell* pSh ) { - DBG_ASSERT( pAppData_Impl->pDocTopics, "es gibt gar keinen Dde-Service" ) + DBG_ASSERT( pAppData_Impl->pDocTopics, "es gibt gar keinen Dde-Service" ); //OV: Im Serverbetrieb ist DDE abgeklemmt! if( !pAppData_Impl->pDocTopics ) return; @@ -530,7 +530,7 @@ void SfxApplication::AddDdeTopic( SfxObjectShell* pSh ) void SfxApplication::RemoveDdeTopic( SfxObjectShell* pSh ) { - DBG_ASSERT( pAppData_Impl->pDocTopics, "es gibt gar keinen Dde-Service" ) + DBG_ASSERT( pAppData_Impl->pDocTopics, "es gibt gar keinen Dde-Service" ); //OV: Im Serverbetrieb ist DDE abgeklemmt! if( !pAppData_Impl->pDocTopics ) return; diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx index cd280a2aaf..d56b707e55 100644 --- a/sfx2/source/appl/appuno.cxx +++ b/sfx2/source/appl/appuno.cxx @@ -503,7 +503,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque { Reference< ::com::sun::star::task::XStatusIndicator > xVal; sal_Bool bOK = ((rProp.Value >>= xVal) && xVal.is()); - DBG_ASSERT( bOK, "invalid type for StatusIndicator" ) + DBG_ASSERT( bOK, "invalid type for StatusIndicator" ); if (bOK) rSet.Put( SfxUnoAnyItem( SID_PROGRESS_STATUSBAR_CONTROL, rProp.Value ) ); } @@ -511,7 +511,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque { Reference< ::com::sun::star::task::XInteractionHandler > xVal; sal_Bool bOK = ((rProp.Value >>= xVal) && xVal.is()); - DBG_ASSERT( bOK, "invalid type for InteractionHandler" ) + DBG_ASSERT( bOK, "invalid type for InteractionHandler" ); if (bOK) rSet.Put( SfxUnoAnyItem( SID_INTERACTIONHANDLER, rProp.Value ) ); } @@ -523,7 +523,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque { Reference< XInputStream > xVal; sal_Bool bOK = ((rProp.Value >>= xVal) && xVal.is()); - DBG_ASSERT( bOK, "invalid type for InputStream" ) + DBG_ASSERT( bOK, "invalid type for InputStream" ); if (bOK) rSet.Put( SfxUnoAnyItem( SID_INPUTSTREAM, rProp.Value ) ); } @@ -531,7 +531,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque { Reference< XInputStream > xVal; sal_Bool bOK = ((rProp.Value >>= xVal) && xVal.is()); - DBG_ASSERT( bOK, "invalid type for Stream" ) + DBG_ASSERT( bOK, "invalid type for Stream" ); if (bOK) rSet.Put( SfxUnoAnyItem( SID_STREAM, rProp.Value ) ); } @@ -539,7 +539,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque { Reference< XContent > xVal; sal_Bool bOK = ((rProp.Value >>= xVal) && xVal.is()); - DBG_ASSERT( bOK, "invalid type for UCBContent" ) + DBG_ASSERT( bOK, "invalid type for UCBContent" ); if (bOK) rSet.Put( SfxUnoAnyItem( SID_CONTENT, rProp.Value ) ); } @@ -547,7 +547,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque { Reference< XOutputStream > xVal; sal_Bool bOK = ((rProp.Value >>= xVal) && xVal.is()); - DBG_ASSERT( bOK, "invalid type for OutputStream" ) + DBG_ASSERT( bOK, "invalid type for OutputStream" ); if (bOK) rSet.Put( SfxUnoAnyItem( SID_OUTPUTSTREAM, rProp.Value ) ); } @@ -555,7 +555,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque { Reference< XInputStream > xVal; sal_Bool bOK = (rProp.Value >>= xVal); - DBG_ASSERT( bOK, "invalid type for PostData" ) + DBG_ASSERT( bOK, "invalid type for PostData" ); if (bOK) rSet.Put( SfxUnoAnyItem( SID_POSTDATA, rProp.Value ) ); } @@ -563,7 +563,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque { Reference< XFrame > xVal; sal_Bool bOK = (rProp.Value >>= xVal); - DBG_ASSERT( bOK, "invalid type for Frame" ) + DBG_ASSERT( bOK, "invalid type for Frame" ); if (bOK) rSet.Put( SfxUnoAnyItem( SID_FILLFRAME, rProp.Value ) ); } @@ -571,7 +571,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque { sal_Bool bVal = sal_False; sal_Bool bOK = (rProp.Value >>= bVal); - DBG_ASSERT( bOK, "invalid type for AsTemplate" ) + DBG_ASSERT( bOK, "invalid type for AsTemplate" ); if (bOK) rSet.Put( SfxBoolItem( SID_TEMPLATE, bVal ) ); } @@ -579,7 +579,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque { sal_Bool bVal = sal_False; sal_Bool bOK = (rProp.Value >>= bVal); - DBG_ASSERT( bOK, "invalid type for OpenNewView" ) + DBG_ASSERT( bOK, "invalid type for OpenNewView" ); if (bOK) rSet.Put( SfxBoolItem( SID_OPEN_NEW_VIEW, bVal ) ); } @@ -587,7 +587,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque { sal_Int16 nVal = -1; sal_Bool bOK = ((rProp.Value >>= nVal) && (nVal != -1)); - DBG_ASSERT( bOK, "invalid type for ViewId" ) + DBG_ASSERT( bOK, "invalid type for ViewId" ); if (bOK) rSet.Put( SfxUInt16Item( SID_VIEW_ID, nVal ) ); } @@ -595,7 +595,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque { sal_Int16 nVal = -1; sal_Bool bOK = ((rProp.Value >>= nVal) && (nVal != -1)); - DBG_ASSERT( bOK, "invalid type for PluginMode" ) + DBG_ASSERT( bOK, "invalid type for PluginMode" ); if (bOK) rSet.Put( SfxUInt16Item( SID_PLUGIN_MODE, nVal ) ); } @@ -603,7 +603,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque { sal_Bool bVal = sal_False; sal_Bool bOK = (rProp.Value >>= bVal); - DBG_ASSERT( bOK, "invalid type for ReadOnly" ) + DBG_ASSERT( bOK, "invalid type for ReadOnly" ); if (bOK) rSet.Put( SfxBoolItem( SID_DOC_READONLY, bVal ) ); } @@ -611,7 +611,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque { sal_Bool bVal = sal_False; sal_Bool bOK = (rProp.Value >>= bVal); - DBG_ASSERT( bOK, "invalid type for StartPresentation" ) + DBG_ASSERT( bOK, "invalid type for StartPresentation" ); if (bOK) rSet.Put( SfxBoolItem( SID_DOC_STARTPRESENTATION, bVal ) ); } @@ -619,7 +619,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque { sal_Bool bVal = sal_False; sal_Bool bOK = (rProp.Value >>= bVal); - DBG_ASSERT( bOK, "invalid type for SelectionOnly" ) + DBG_ASSERT( bOK, "invalid type for SelectionOnly" ); if (bOK) rSet.Put( SfxBoolItem( SID_SELECTION, bVal ) ); } @@ -627,7 +627,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque { sal_Bool bVal = sal_False; sal_Bool bOK = (rProp.Value >>= bVal); - DBG_ASSERT( bOK, "invalid type for Hidden" ) + DBG_ASSERT( bOK, "invalid type for Hidden" ); if (bOK) rSet.Put( SfxBoolItem( SID_HIDDEN, bVal ) ); } @@ -635,7 +635,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque { sal_Bool bVal = sal_False; sal_Bool bOK = (rProp.Value >>= bVal); - DBG_ASSERT( bOK, "invalid type for Minimized" ) + DBG_ASSERT( bOK, "invalid type for Minimized" ); if (bOK) rSet.Put( SfxBoolItem( SID_MINIMIZED, bVal ) ); } @@ -643,7 +643,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque { sal_Bool bVal = sal_False; sal_Bool bOK = (rProp.Value >>= bVal); - DBG_ASSERT( bOK, "invalid type for Silent" ) + DBG_ASSERT( bOK, "invalid type for Silent" ); if (bOK) rSet.Put( SfxBoolItem( SID_SILENT, bVal ) ); } @@ -651,7 +651,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque { sal_Bool bVal = sal_False; sal_Bool bOK = (rProp.Value >>= bVal); - DBG_ASSERT( bOK, "invalid type for Preview" ) + DBG_ASSERT( bOK, "invalid type for Preview" ); if (bOK) rSet.Put( SfxBoolItem( SID_PREVIEW, bVal ) ); } @@ -659,7 +659,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque { sal_Bool bVal = sal_False; sal_Bool bOK = (rProp.Value >>= bVal); - DBG_ASSERT( bOK, "invalid type for ViewOnly" ) + DBG_ASSERT( bOK, "invalid type for ViewOnly" ); if (bOK) rSet.Put( SfxBoolItem( SID_VIEWONLY, bVal ) ); } @@ -667,7 +667,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque { sal_Bool bVal = sal_False; sal_Bool bOK = (rProp.Value >>= bVal); - DBG_ASSERT( bOK, "invalid type for ViewOnly" ) + DBG_ASSERT( bOK, "invalid type for ViewOnly" ); if (bOK) rSet.Put( SfxBoolItem( SID_EDITDOC, !bVal ) ); } @@ -675,7 +675,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque { sal_Bool bVal = sal_False; sal_Bool bOK = (rProp.Value >>= bVal); - DBG_ASSERT( bOK, "invalid type for ViewOnly" ) + DBG_ASSERT( bOK, "invalid type for ViewOnly" ); if (bOK) rSet.Put( SfxBoolItem( SID_FILE_DIALOG, bVal ) ); } @@ -683,7 +683,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque { ::rtl::OUString sVal; sal_Bool bOK = ((rProp.Value >>= sVal) && sVal.getLength()); - DBG_ASSERT( bOK, "invalid type or value for FileName" ) + DBG_ASSERT( bOK, "invalid type or value for FileName" ); if (bOK) rSet.Put( SfxStringItem( SID_STANDARD_DIR, sVal ) ); } @@ -691,7 +691,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque { ::rtl::OUString sVal; sal_Bool bOK = ((rProp.Value >>= sVal) && sVal.getLength()); - DBG_ASSERT( bOK, "invalid type or value for FileName" ) + DBG_ASSERT( bOK, "invalid type or value for FileName" ); if (bOK) rSet.Put( SfxStringItem( SID_FILE_NAME, sVal ) ); } @@ -699,7 +699,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque { ::rtl::OUString sVal; sal_Bool bOK = (rProp.Value >>= sVal); - DBG_ASSERT( bOK, "invalid type or value for SalvageURL" ) + DBG_ASSERT( bOK, "invalid type or value for SalvageURL" ); if (bOK) rSet.Put( SfxStringItem( SID_DOC_SALVAGE, sVal ) ); } @@ -707,7 +707,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque { ::rtl::OUString sVal; sal_Bool bOK = (rProp.Value >>= sVal); - DBG_ASSERT( bOK, "invalid type or value for SalvageURL" ) + DBG_ASSERT( bOK, "invalid type or value for SalvageURL" ); if (bOK) rSet.Put( SfxStringItem( SID_PATH, sVal ) ); } @@ -715,7 +715,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque { ::rtl::OUString sVal; sal_Bool bOK = (rProp.Value >>= sVal); - DBG_ASSERT( bOK, "invalid type for FrameName" ) + DBG_ASSERT( bOK, "invalid type for FrameName" ); if (bOK && sVal.getLength()) rSet.Put( SfxStringItem( SID_TARGETNAME, sVal ) ); } @@ -723,7 +723,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque { ::rtl::OUString sVal; sal_Bool bOK = ((rProp.Value >>= sVal) && sVal.getLength()); - DBG_ASSERT( bOK, "invalid type or value for MediaType" ) + DBG_ASSERT( bOK, "invalid type or value for MediaType" ); if (bOK) rSet.Put( SfxStringItem( SID_CONTENTTYPE, sVal ) ); } @@ -731,7 +731,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque { ::rtl::OUString sVal; sal_Bool bOK = ((rProp.Value >>= sVal) && sVal.getLength()); - DBG_ASSERT( bOK, "invalid type or value for WindowState" ) + DBG_ASSERT( bOK, "invalid type or value for WindowState" ); if (bOK) rSet.Put( SfxStringItem( SID_WIN_POSSIZE, sVal ) ); } @@ -739,7 +739,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque { ::rtl::OUString sVal; sal_Bool bOK = ((rProp.Value >>= sVal) && sVal.getLength()); - DBG_ASSERT( bOK, "invalid type or value for TemplateName" ) + DBG_ASSERT( bOK, "invalid type or value for TemplateName" ); if (bOK) rSet.Put( SfxStringItem( SID_TEMPLATE_NAME, sVal ) ); } @@ -747,7 +747,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque { ::rtl::OUString sVal; sal_Bool bOK = ((rProp.Value >>= sVal) && sVal.getLength()); - DBG_ASSERT( bOK, "invalid type or value for TemplateRegionName" ) + DBG_ASSERT( bOK, "invalid type or value for TemplateRegionName" ); if (bOK) rSet.Put( SfxStringItem( SID_TEMPLATE_REGIONNAME, sVal ) ); } @@ -755,7 +755,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque { ::rtl::OUString sVal; sal_Bool bOK = ((rProp.Value >>= sVal) && sVal.getLength()); - DBG_ASSERT( bOK, "invalid type or value for JumpMark" ) + DBG_ASSERT( bOK, "invalid type or value for JumpMark" ); if (bOK) rSet.Put( SfxStringItem( SID_JUMPMARK, sVal ) ); } @@ -763,7 +763,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque { ::rtl::OUString sVal; sal_Bool bOK = ((rProp.Value >>= sVal) && sVal.getLength()); - DBG_ASSERT( bOK, "invalid type or value for CharacterSet" ) + DBG_ASSERT( bOK, "invalid type or value for CharacterSet" ); if (bOK) rSet.Put( SfxStringItem( SID_CHARSET, sVal ) ); } @@ -771,7 +771,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque { ::rtl::OUString sVal; sal_Bool bOK = ((rProp.Value >>= sVal) && sVal.getLength()); - DBG_ASSERT( bOK, "invalid type or value for FilterFlags" ) + DBG_ASSERT( bOK, "invalid type or value for FilterFlags" ); if (bOK) rSet.Put( SfxStringItem( SID_FILE_FILTEROPTIONS, sVal ) ); } @@ -779,7 +779,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque { sal_Int16 nVal =-1; sal_Bool bOK = ((rProp.Value >>= nVal) && (nVal != -1)); - DBG_ASSERT( bOK, "invalid type for MacroExecMode" ) + DBG_ASSERT( bOK, "invalid type for MacroExecMode" ); if (bOK) rSet.Put( SfxUInt16Item( SID_MACROEXECMODE, nVal ) ); } @@ -787,7 +787,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque { sal_Int16 nVal =-1; sal_Bool bOK = ((rProp.Value >>= nVal) && (nVal != -1)); - DBG_ASSERT( bOK, "invalid type for UpdateDocMode" ) + DBG_ASSERT( bOK, "invalid type for UpdateDocMode" ); if (bOK) rSet.Put( SfxUInt16Item( SID_UPDATEDOCMODE, nVal ) ); } @@ -795,7 +795,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque { sal_Bool bVal = sal_False; sal_Bool bOK = (rProp.Value >>= bVal); - DBG_ASSERT( bOK, "invalid type for RepairPackage" ) + DBG_ASSERT( bOK, "invalid type for RepairPackage" ); if (bOK) rSet.Put( SfxBoolItem( SID_REPAIRPACKAGE, bVal ) ); } @@ -803,7 +803,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque { ::rtl::OUString sVal; sal_Bool bOK = ((rProp.Value >>= sVal) && sVal.getLength()); - DBG_ASSERT( bOK, "invalid type or value for DocumentTitle" ) + DBG_ASSERT( bOK, "invalid type or value for DocumentTitle" ); if (bOK) rSet.Put( SfxStringItem( SID_DOCINFO_TITLE, sVal ) ); } @@ -812,7 +812,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque ::rtl::OUString sVal; // the base url can be set to empty ( for embedded objects for example ) sal_Bool bOK = (rProp.Value >>= sVal); - DBG_ASSERT( bOK, "invalid type or value for DocumentBaseURL" ) + DBG_ASSERT( bOK, "invalid type or value for DocumentBaseURL" ); if (bOK) rSet.Put( SfxStringItem( SID_DOC_BASEURL, sVal ) ); } @@ -820,7 +820,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque { ::rtl::OUString sVal; sal_Bool bOK = ((rProp.Value >>= sVal) && sVal.getLength()); - DBG_ASSERT( bOK, "invalid type or value for HierarchicalDocumentName" ) + DBG_ASSERT( bOK, "invalid type or value for HierarchicalDocumentName" ); if (bOK) rSet.Put( SfxStringItem( SID_DOC_HIERARCHICALNAME, sVal ) ); } @@ -828,7 +828,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque { sal_Bool bVal = sal_False; sal_Bool bOK = (rProp.Value >>= bVal); - DBG_ASSERT( bOK, "invalid type for CopyStreamIfPossible" ) + DBG_ASSERT( bOK, "invalid type for CopyStreamIfPossible" ); if (bOK) rSet.Put( SfxBoolItem( SID_COPY_STREAM_IF_POSSIBLE, bVal ) ); } @@ -836,7 +836,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque { sal_Bool bVal = sal_False; sal_Bool bOK = (rProp.Value >>= bVal); - DBG_ASSERT( bOK, "invalid type for NoAutoSave" ) + DBG_ASSERT( bOK, "invalid type for NoAutoSave" ); if (bOK) rSet.Put( SfxBoolItem( SID_NOAUTOSAVE, bVal ) ); } diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx index e2b28e64c6..de1c524ec7 100644 --- a/sfx2/source/appl/linkmgr2.cxx +++ b/sfx2/source/appl/linkmgr2.cxx @@ -185,7 +185,7 @@ BOOL SvLinkManager::InsertDDELink( SvBaseLink * pLink, BOOL SvLinkManager::InsertDDELink( SvBaseLink * pLink ) { - DBG_ASSERT( OBJECT_CLIENT_SO & pLink->GetObjType(), "no OBJECT_CLIENT_SO" ) + DBG_ASSERT( OBJECT_CLIENT_SO & pLink->GetObjType(), "no OBJECT_CLIENT_SO" ); if( !( OBJECT_CLIENT_SO & pLink->GetObjType() ) ) return FALSE; diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx index 6858ef4ad3..41a139d19b 100644 --- a/sfx2/source/appl/lnkbase2.cxx +++ b/sfx2/source/appl/lnkbase2.cxx @@ -260,8 +260,8 @@ IMPL_LINK( SvBaseLink, EndEditHdl, String*, _pNewName ) void SvBaseLink::SetObjType( USHORT nObjTypeP ) { - DBG_ASSERT( nObjType != OBJECT_CLIENT_DDE, "type already set" ) - DBG_ASSERT( !xObj.Is(), "object exist" ) + DBG_ASSERT( nObjType != OBJECT_CLIENT_DDE, "type already set" ); + DBG_ASSERT( !xObj.Is(), "object exist" ); nObjType = nObjTypeP; } @@ -299,7 +299,7 @@ void SvBaseLink::SetObj( SvLinkSource * pObj ) DBG_ASSERT( (nObjType & OBJECT_CLIENT_SO && pImplData->ClientType.bIntrnlLnk) || nObjType == OBJECT_CLIENT_GRF, - "no intern link" ) + "no intern link" ); xObj = pObj; } @@ -425,7 +425,7 @@ void SvBaseLink::_GetRealObject( BOOL bConnect) if( !pImpl->m_pLinkMgr ) return; - DBG_ASSERT( !xObj.Is(), "object already exist" ) + DBG_ASSERT( !xObj.Is(), "object already exist" ); if( OBJECT_CLIENT_DDE == nObjType ) { diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx index 31e1f20a85..d6bfb67c4b 100644 --- a/sfx2/source/appl/workwin.cxx +++ b/sfx2/source/appl/workwin.cxx @@ -667,7 +667,7 @@ void SfxWorkWindow::Lock_Impl( BOOL bLock ) --m_nLock; if ( m_nLock<0 ) { - DBG_ERROR("Lock count underflow!") + DBG_ERROR("Lock count underflow!"); m_nLock = 0; } diff --git a/sfx2/source/bastyp/progress.cxx b/sfx2/source/bastyp/progress.cxx index 800683bba0..2b74482051 100644 --- a/sfx2/source/bastyp/progress.cxx +++ b/sfx2/source/bastyp/progress.cxx @@ -769,7 +769,7 @@ void SfxProgress::EnterLock() void SfxProgress::LeaveLock() { SfxAppData_Impl *pImp = SFX_APP()->Get_Impl(); - DBG_ASSERT( 0 != pImp->nRescheduleLocks, "SFxProgress::LeaveLock but no locks" ) + DBG_ASSERT( 0 != pImp->nRescheduleLocks, "SFxProgress::LeaveLock but no locks" ); pImp->nRescheduleLocks--; } diff --git a/sfx2/source/config/evntconf.cxx b/sfx2/source/config/evntconf.cxx index 0354c8fcae..03d5c6f483 100644 --- a/sfx2/source/config/evntconf.cxx +++ b/sfx2/source/config/evntconf.cxx @@ -794,9 +794,9 @@ void SfxEventConfiguration::PropagateEvent_Impl( SfxObjectShell *pDoc, xEvents->replaceByName( aEventName, aEventData ); } catch( ::com::sun::star::lang::IllegalArgumentException ) - { DBG_ERRORFILE( "PropagateEvents_Impl: caught IllegalArgumentException" ) } + { DBG_ERRORFILE( "PropagateEvents_Impl: caught IllegalArgumentException" ); } catch( ::com::sun::star::container::NoSuchElementException ) - { DBG_ERRORFILE( "PropagateEvents_Impl: caught NoSuchElementException" ) } + { DBG_ERRORFILE( "PropagateEvents_Impl: caught NoSuchElementException" ); } } else { DBG_WARNING( "PropagateEvents_Impl: Got unkown event" ); diff --git a/sfx2/source/control/macro.cxx b/sfx2/source/control/macro.cxx index 1815e3714c..2afd8d6d55 100644 --- a/sfx2/source/control/macro.cxx +++ b/sfx2/source/control/macro.cxx @@ -604,7 +604,7 @@ void SfxMacro::Replace { DBG_ASSERT( pImp->eMode != SFX_MACRO_EXISTING, "invalid call to non-recording SfxMacro" ); - DBG_ASSERT( pImp->aList.Count(), "no replaceable statement available" ) + DBG_ASSERT( pImp->aList.Count(), "no replaceable statement available" ); pImp->aList.Remove( pImp->aList.Count() - 1 ); pImp->aList.C40_INSERT( SfxMacroStatement,pStatement, pImp->aList.Count() ); } @@ -645,7 +645,7 @@ void SfxMacro::Remove() { DBG_ASSERT( pImp->eMode != SFX_MACRO_EXISTING, "invalid call to non-recording SfxMacro" ); - DBG_ASSERT( pImp->aList.Count(), "no replaceable statement available" ) + DBG_ASSERT( pImp->aList.Count(), "no replaceable statement available" ); pImp->aList.Remove( pImp->aList.Count() - 1 ); } diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index 61728de25f..2f4eed0b03 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -1325,8 +1325,10 @@ sal_Int16 FileDialogHelper_Impl::implDoExecute() sal_Int16 nRet = ExecutableDialogResults::CANCEL; -#if !(defined(MACOSX) && defined(QUARTZ)) //On MacOSX the native file picker has to run in the primordial thread because of drawing issues +//On Linux the native gtk file picker, when backed by gnome-vfs2, needs to be run in the same +//primordial thread as the ucb gnome-vfs2 provider was initialized in. +#ifdef WNT if ( mbSystemPicker ) { PickerThread_Impl* pThread = new PickerThread_Impl( mxFileDlg ); diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index 3ea24031ff..84f764e03d 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -373,7 +373,7 @@ void SfxObjectShell::SetModified( sal_Bool bModifiedP ) { #ifdef DBG_UTIL if ( !bModifiedP && !IsEnableSetModified() ) - DBG_WARNING( "SFX_PERSIST: SetModified( sal_False ), obwohl IsEnableSetModified() == sal_False" ) + DBG_WARNING( "SFX_PERSIST: SetModified( sal_False ), obwohl IsEnableSetModified() == sal_False" ); #endif if( !IsEnableSetModified() ) diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx index e2c5edf141..d1487d3ebb 100644 --- a/sfx2/source/view/frame.cxx +++ b/sfx2/source/view/frame.cxx @@ -329,7 +329,7 @@ SfxFrame* SfxFrame::GetChildFrame( sal_uInt16 nPos ) const { if ( pChildArr && pChildArr->Count() > nPos ) { - DBG_ASSERT( nPos < pChildArr->Count(), "Falscher Index!") + DBG_ASSERT( nPos < pChildArr->Count(), "Falscher Index!"); return (*pChildArr)[nPos]; } diff --git a/svx/source/dialog/SpellDialog.cxx b/svx/source/dialog/SpellDialog.cxx index 019939a9f7..b2b81714dc 100644 --- a/svx/source/dialog/SpellDialog.cxx +++ b/svx/source/dialog/SpellDialog.cxx @@ -1374,7 +1374,7 @@ long SentenceEditWindow_Impl::PreNotify( NotifyEvent& rNEvt ) bool bIsErrorActive = pErrorAttr && pErrorAttr->GetStart() == m_nErrorStart || pErrorAttrLeft && pErrorAttrLeft->GetStart() == m_nErrorStart; - DBG_ASSERT(nSelectionType != INVALID, "selection type not set!") + DBG_ASSERT(nSelectionType != INVALID, "selection type not set!"); const KeyCode& rKeyCode = rKeyEvt.GetKeyCode(); bool bDelete = rKeyCode.GetCode() == KEY_DELETE; @@ -1453,7 +1453,7 @@ long SentenceEditWindow_Impl::PreNotify( NotifyEvent& rNEvt ) } if(nAction == ACTION_EXPAND) { - DBG_ASSERT(pErrorAttrLeft || pErrorAttr, "where is the error") + DBG_ASSERT(pErrorAttrLeft || pErrorAttr, "where is the error"); //text has been added on the right and only the 'error attribute has to be corrected if(pErrorAttrLeft) { @@ -1649,7 +1649,7 @@ void SentenceEditWindow_Impl::ChangeMarkedWord(const String& rNewWord, LanguageT ExtTextEngine* pTextEngine = GetTextEngine(); pTextEngine->UndoActionStart( TEXTUNDO_INSERT ); const TextCharAttrib* pErrorAttrib = pTextEngine->FindCharAttrib( TextPaM(0, m_nErrorStart), TEXTATTR_SPELL_ERROR ); - DBG_ASSERT(pErrorAttrib, "no error attribute found") + DBG_ASSERT(pErrorAttrib, "no error attribute found"); // Reference <XSpellAlternatives> xAlternatives; const SpellErrorDescription* pSpellErrorDescription = 0; if(pErrorAttrib) @@ -1741,7 +1741,7 @@ void SentenceEditWindow_Impl::SetAlternatives( Reference< XSpellAlternatives> xA { TextPaM aCursor(0, m_nErrorStart); DBG_ASSERT(static_cast<const SpellErrorAttrib*>( - GetTextEngine()->FindAttrib( aCursor, TEXTATTR_SPELL_ERROR)), "no error set?") + GetTextEngine()->FindAttrib( aCursor, TEXTATTR_SPELL_ERROR)), "no error set?"); ::rtl::OUString aWord; lang::Locale aLocale; @@ -1866,7 +1866,7 @@ svx::SpellPortions SentenceEditWindow_Impl::CreateSpellPortions() const //start should always be Null eLang = aStart->eLanguage; USHORT nStart = aStart->nPosition; - DBG_ASSERT(!nStart, "invalid start position - language attribute missing?") + DBG_ASSERT(!nStart, "invalid start position - language attribute missing?"); ++aStart; while(aStart != aBreakPositions.end()) @@ -1917,7 +1917,7 @@ svx::SpellPortions SentenceEditWindow_Impl::CreateSpellPortions() const void SentenceEditWindow_Impl::Undo() { SfxUndoManager& rUndoMgr = GetTextEngine()->GetUndoManager(); - DBG_ASSERT(GetUndoActionCount(), "no undo actions available" ) + DBG_ASSERT(GetUndoActionCount(), "no undo actions available" ); if(!GetUndoActionCount()) return; bool bSaveUndoEdit = IsUndoEditMode(); @@ -1985,7 +1985,7 @@ void SentenceEditWindow_Impl::MoveErrorEnd(long nOffset) -----------------------------------------------------------------------*/ void SentenceEditWindow_Impl::SetUndoEditMode(bool bSet) { - DBG_ASSERT(!bSet || m_bIsUndoEditMode != bSet, "SetUndoEditMode with equal values?") + DBG_ASSERT(!bSet || m_bIsUndoEditMode != bSet, "SetUndoEditMode with equal values?"); m_bIsUndoEditMode = bSet; //disable all buttons except the Change SpellDialog* pSpellDialog = GetSpellDialog(); diff --git a/svx/source/dialog/SpellDialogChildWindow.cxx b/svx/source/dialog/SpellDialogChildWindow.cxx index f7d9f9d849..95688f8255 100644 --- a/svx/source/dialog/SpellDialogChildWindow.cxx +++ b/svx/source/dialog/SpellDialogChildWindow.cxx @@ -95,7 +95,7 @@ void SpellDialogChildWindow::AddAutoCorrection( const String& /*rNew*/, LanguageType /*eLanguage*/) { - DBG_ERROR("AutoCorrection should have been overloaded - if available") + DBG_ERROR("AutoCorrection should have been overloaded - if available"); } /*-- 16.06.2008 10:11:57--------------------------------------------------- @@ -109,7 +109,7 @@ bool SpellDialogChildWindow::HasGrammarChecking() -----------------------------------------------------------------------*/ bool SpellDialogChildWindow::IsGrammarChecking() { - DBG_ERROR("Grammar checking should have been overloaded - if available") + DBG_ERROR("Grammar checking should have been overloaded - if available"); return false; } /*-- 18.06.2008 12:26:35--------------------------------------------------- @@ -117,7 +117,7 @@ bool SpellDialogChildWindow::IsGrammarChecking() -----------------------------------------------------------------------*/ void SpellDialogChildWindow::SetGrammarChecking(bool ) { - DBG_ERROR("Grammar checking should have been overloaded - if available") + DBG_ERROR("Grammar checking should have been overloaded - if available"); } /*-- 16.06.2008 10:12:22--------------------------------------------------- diff --git a/svx/source/dialog/autocdlg.cxx b/svx/source/dialog/autocdlg.cxx index 076b9a59f4..9078e27028 100644 --- a/svx/source/dialog/autocdlg.cxx +++ b/svx/source/dialog/autocdlg.cxx @@ -927,7 +927,7 @@ void OfaACorrCheckListBox::SetCheckButtonState( SvLBoxEntry* pEntry, USHORT nCol { SvLBoxButton* pItem = (SvLBoxButton*)(pEntry->GetItem(nCol + 1)); - DBG_ASSERT(pItem,"SetCheckButton:Item not found") + DBG_ASSERT(pItem,"SetCheckButton:Item not found"); if (((SvLBoxItem*)pItem)->IsA() == SV_ITEM_ID_LBOXBUTTON) { switch( eState ) @@ -956,7 +956,7 @@ SvButtonState OfaACorrCheckListBox::GetCheckButtonState( SvLBoxEntry* pEntry, US { SvButtonState eState = SV_BUTTON_UNCHECKED; SvLBoxButton* pItem = (SvLBoxButton*)(pEntry->GetItem(nCol + 1)); - DBG_ASSERT(pItem,"GetChButnState:Item not found") + DBG_ASSERT(pItem,"GetChButnState:Item not found"); if (((SvLBoxItem*)pItem)->IsA() == SV_ITEM_ID_LBOXBUTTON) { @@ -1446,7 +1446,7 @@ IMPL_LINK(OfaAutocorrReplacePage, NewDelHdl, PushButton*, pBtn) SvLBoxEntry* _pEntry = aReplaceTLB.FirstSelected(); if(pBtn == &aDeleteReplacePB) { - DBG_ASSERT(_pEntry, "keine Eintrag selektiert") + DBG_ASSERT(_pEntry, "keine Eintrag selektiert"); if(_pEntry) { aReplaceTLB.GetModel()->Remove(_pEntry); diff --git a/svx/source/dialog/backgrnd.cxx b/svx/source/dialog/backgrnd.cxx index 33dc4995b7..8cad4292dd 100644 --- a/svx/source/dialog/backgrnd.cxx +++ b/svx/source/dialog/backgrnd.cxx @@ -983,7 +983,7 @@ BOOL SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet ) { const SfxPoolItem* pOldChar = GetOldItem( rCoreSet, SID_ATTR_BRUSH_CHAR ); - DBG_ASSERT(pParaBck_Impl, "pParaBck_Impl == NULL ?") + DBG_ASSERT(pParaBck_Impl, "pParaBck_Impl == NULL ?"); if ( pOldChar && //#111173# crash report shows that pParaBck_Impl can be NULL, the cause is unknown pParaBck_Impl && diff --git a/svx/source/dialog/chardlg.cxx b/svx/source/dialog/chardlg.cxx index 9344e50946..b41b180dfc 100644 --- a/svx/source/dialog/chardlg.cxx +++ b/svx/source/dialog/chardlg.cxx @@ -807,7 +807,7 @@ const FontList* SvxCharNamePage::GetFontList() const if ( pItem != NULL ) { DBG_ASSERT(NULL != ( (SvxFontListItem*)pItem )->GetFontList(), - "Where is the font list?") + "Where is the font list?"); m_pImpl->m_pFontList = static_cast<const SvxFontListItem*>(pItem )->GetFontList()->Clone(); m_pImpl->m_bMustDelete = TRUE; } diff --git a/svx/source/dialog/dbregister.cxx b/svx/source/dialog/dbregister.cxx index 07b3ba09a4..0a38f57481 100644 --- a/svx/source/dialog/dbregister.cxx +++ b/svx/source/dialog/dbregister.cxx @@ -468,7 +468,7 @@ String DbRegistrationOptionsPage::getFileLocation(const String& _sLocation) } catch( Exception& ) { - DBG_ERRORFILE( "DbRegistrationOptionsPage::EditLocationHdl: exception from folder picker" ) + DBG_ERRORFILE( "DbRegistrationOptionsPage::EditLocationHdl: exception from folder picker" ); } return String(); diff --git a/svx/source/dialog/fontsubs.cxx b/svx/source/dialog/fontsubs.cxx index 637d50bd71..1c2fe6f9e7 100644 --- a/svx/source/dialog/fontsubs.cxx +++ b/svx/source/dialog/fontsubs.cxx @@ -578,7 +578,7 @@ void SvxFontSubstCheckListBox::SetCheckButtonState( SvLBoxEntry* pEntry, USHORT { SvLBoxButton* pItem = (SvLBoxButton*)(pEntry->GetItem(nCol + 1)); - DBG_ASSERT(pItem,"SetCheckButton:Item not found") + DBG_ASSERT(pItem,"SetCheckButton:Item not found"); if (((SvLBoxItem*)pItem)->IsA() == SV_ITEM_ID_LBOXBUTTON) { switch( eState ) @@ -607,7 +607,7 @@ SvButtonState SvxFontSubstCheckListBox::GetCheckButtonState( SvLBoxEntry* pEntry { SvButtonState eState = SV_BUTTON_UNCHECKED; SvLBoxButton* pItem = (SvLBoxButton*)(pEntry->GetItem(nCol + 1)); - DBG_ASSERT(pItem,"GetChButnState:Item not found") + DBG_ASSERT(pItem,"GetChButnState:Item not found"); if (((SvLBoxItem*)pItem)->IsA() == SV_ITEM_ID_LBOXBUTTON) { diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx index 277245137d..88bbbb8ef2 100644 --- a/svx/source/dialog/frmsel.cxx +++ b/svx/source/dialog/frmsel.cxx @@ -526,7 +526,7 @@ const FrameBorder& FrameSelectorImpl::GetBorder( FrameBorderType eBorder ) const size_t nIndex = GetIndexFromFrameBorderType( eBorder ); if( nIndex < maAllBorders.size() ) return *maAllBorders[ nIndex ]; - DBG_ERRORFILE( "svx::FrameSelectorImpl::GetBorder - unknown border type" ) + DBG_ERRORFILE( "svx::FrameSelectorImpl::GetBorder - unknown border type" ); return maTop; } diff --git a/svx/source/dialog/grfpage.cxx b/svx/source/dialog/grfpage.cxx index 5031deec37..aabc03766f 100644 --- a/svx/source/dialog/grfpage.cxx +++ b/svx/source/dialog/grfpage.cxx @@ -757,7 +757,7 @@ void SvxGrfCropPage::GraphicHasChanged( BOOL bFound ) IMPL_LINK( SvxGrfCropPage, Timeout, Timer *, EMPTYARG ) { - DBG_ASSERT(pLastCropField,"Timeout ohne Feld?") + DBG_ASSERT(pLastCropField,"Timeout ohne Feld?"); CropHdl(pLastCropField); pLastCropField = 0; return 0; diff --git a/svx/source/dialog/hangulhanjadlg.cxx b/svx/source/dialog/hangulhanjadlg.cxx index 01b2cd191d..1ee49881f0 100644 --- a/svx/source/dialog/hangulhanjadlg.cxx +++ b/svx/source/dialog/hangulhanjadlg.cxx @@ -964,7 +964,7 @@ namespace svx if ( m_pHangulBelow->IsChecked() ) return HHC::eRubyHangulBelow; - DBG_ERROR( "HangulHanjaConversionDialog::GetConversionFormat: no radio checked?" ) + DBG_ERROR( "HangulHanjaConversionDialog::GetConversionFormat: no radio checked?" ); return HHC::eSimpleConversion; } diff --git a/svx/source/dialog/hyphen.cxx b/svx/source/dialog/hyphen.cxx index b7ffd3b2f2..81ae5961cf 100644 --- a/svx/source/dialog/hyphen.cxx +++ b/svx/source/dialog/hyphen.cxx @@ -303,7 +303,7 @@ String SvxHyphenWordDialog::EraseUnusableHyphens_Impl( } } } - DBG_ASSERT(nIdx != STRING_NOTFOUND, "no usable hyphenation position") + DBG_ASSERT(nIdx != STRING_NOTFOUND, "no usable hyphenation position"); // remove not usable hyphens from string nPos = nIdx == STRING_NOTFOUND ? 0 : nIdx + 1; diff --git a/svx/source/dialog/linkdlg.cxx b/svx/source/dialog/linkdlg.cxx index 6d8dc805c6..cb4fe626f8 100644 --- a/svx/source/dialog/linkdlg.cxx +++ b/svx/source/dialog/linkdlg.cxx @@ -176,9 +176,9 @@ IMPL_LINK( SvBaseLinksDlg, LinksSelectHdl, SvTabListBox *, pSvTabListBox ) { pEntry = i == 0 ? pSvTabListBox->FirstSelected() : pSvTabListBox->NextSelected(pEntry); - DBG_ASSERT(pEntry, "Wo ist der Entry?") + DBG_ASSERT(pEntry, "Wo ist der Entry?"); pLink = (SvBaseLink*)pEntry->GetUserData(); - DBG_ASSERT(pLink, "Wo ist der Link?") + DBG_ASSERT(pLink, "Wo ist der Link?"); if( (OBJECT_CLIENT_FILE & pLink->GetObjType()) != OBJECT_CLIENT_FILE ) pSvTabListBox->Select( pEntry, FALSE ); @@ -343,7 +343,7 @@ IMPL_LINK( SvBaseLinksDlg, UpdateNowClickHdl, PushButton *, EMPTYARG ) /* IMPL_LINK_INLINE_START( SvBaseLinksDlg, OpenSourceClickHdl, PushButton *, pPushButton ) { - DBG_ASSERT( !this, "Open noch nicht impl." ) + DBG_ASSERT( !this, "Open noch nicht impl." ); return 0; } IMPL_LINK_INLINE_END( SvBaseLinksDlg, OpenSourceClickHdl, PushButton *, pPushButton ) @@ -379,9 +379,9 @@ IMPL_LINK( SvBaseLinksDlg, ChangeSourceClickHdl, PushButton *, pPushButton ) pEntry = i==0 ? Links().FirstSelected() : Links().NextSelected( pEntry ); - DBG_ASSERT(pEntry,"Wo ist der Entry") + DBG_ASSERT(pEntry,"Wo ist der Entry"); pLink = (SvBaseLink*)pEntry->GetUserData(); - DBG_ASSERT(pLink,"Wo ist der Link") + DBG_ASSERT(pLink,"Wo ist der Link"); pLinkMgr->GetDisplayNames( pLink, &sType, &sFile, &sLinkName, &sFilter ); INetURLObject aUrl_(sFile); INetURLObject aUrl2(aPath, INET_PROT_FILE); diff --git a/svx/source/dialog/numpages.cxx b/svx/source/dialog/numpages.cxx index 93d0553670..68318b5fa3 100644 --- a/svx/source/dialog/numpages.cxx +++ b/svx/source/dialog/numpages.cxx @@ -141,7 +141,7 @@ Reference<XDefaultNumberingProvider> lcl_GetNumberingProvider() Reference < XInterface > xI = xMSF->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.text.DefaultNumberingProvider" ) ); Reference<XDefaultNumberingProvider> xRet(xI, UNO_QUERY); - DBG_ASSERT(xRet.is(), "service missing: \"com.sun.star.text.DefaultNumberingProvider\"") + DBG_ASSERT(xRet.is(), "service missing: \"com.sun.star.text.DefaultNumberingProvider\""); return xRet; } @@ -392,7 +392,7 @@ void SvxSingleNumPickTabPage::Reset( const SfxItemSet& rSet ) nNumItemId = rSet.GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE); eState = rSet.GetItemState(nNumItemId, FALSE, &pItem); } - DBG_ASSERT(eState == SFX_ITEM_SET, "kein Item gefunden!") + DBG_ASSERT(eState == SFX_ITEM_SET, "kein Item gefunden!"); delete pSaveNum; pSaveNum = new SvxNumRule(*((SvxNumBulletItem*)pItem)->GetNumRule()); @@ -412,7 +412,7 @@ IMPL_LINK(SvxSingleNumPickTabPage, NumSelectHdl_Impl, ValueSet*, EMPTYARG) bPreset = FALSE; bModified = TRUE; USHORT nIdx = pExamplesVS->GetSelectItemId() - 1; - DBG_ASSERT(aNumSettingsArr.Count() > nIdx, "wrong index") + DBG_ASSERT(aNumSettingsArr.Count() > nIdx, "wrong index"); if(aNumSettingsArr.Count() <= nIdx) return 0; SvxNumSettings_ImplPtr _pSet = aNumSettingsArr.GetObject(nIdx); @@ -583,7 +583,7 @@ void SvxBulletPickTabPage::Reset( const SfxItemSet& rSet ) nNumItemId = rSet.GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE); eState = rSet.GetItemState(nNumItemId, FALSE, &pItem); } - DBG_ASSERT(eState == SFX_ITEM_SET, "kein Item gefunden!") + DBG_ASSERT(eState == SFX_ITEM_SET, "kein Item gefunden!"); delete pSaveNum; pSaveNum = new SvxNumRule(*((SvxNumBulletItem*)pItem)->GetNumRule()); @@ -813,7 +813,7 @@ void SvxNumPickTabPage::Reset( const SfxItemSet& rSet ) nNumItemId = rSet.GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE); eState = rSet.GetItemState(nNumItemId, FALSE, &pItem); } - DBG_ASSERT(eState == SFX_ITEM_SET, "kein Item gefunden!") + DBG_ASSERT(eState == SFX_ITEM_SET, "kein Item gefunden!"); delete pSaveNum; pSaveNum = new SvxNumRule(*((SvxNumBulletItem*)pItem)->GetNumRule()); @@ -1118,7 +1118,7 @@ void SvxBitmapPickTabPage::Reset( const SfxItemSet& rSet ) nNumItemId = rSet.GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE); eState = rSet.GetItemState(nNumItemId, FALSE, &pItem); } - DBG_ASSERT(eState == SFX_ITEM_SET, "kein Item gefunden!") + DBG_ASSERT(eState == SFX_ITEM_SET, "kein Item gefunden!"); delete pSaveNum; pSaveNum = new SvxNumRule(*((SvxNumBulletItem*)pItem)->GetNumRule()); @@ -1550,7 +1550,7 @@ void SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet ) nNumItemId = rSet.GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE); eState = rSet.GetItemState(nNumItemId, FALSE, &pItem); } - DBG_ASSERT(eState == SFX_ITEM_SET, "kein Item gefunden!") + DBG_ASSERT(eState == SFX_ITEM_SET, "kein Item gefunden!"); delete pSaveNum; pSaveNum = new SvxNumRule(*((SvxNumBulletItem*)pItem)->GetNumRule()); @@ -3451,7 +3451,7 @@ void SvxNumPositionTabPage::Reset( const SfxItemSet& rSet ) nNumItemId = rSet.GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE); eState = rSet.GetItemState(nNumItemId, FALSE, &pItem); } - DBG_ASSERT(eState == SFX_ITEM_SET, "kein Item gefunden!") + DBG_ASSERT(eState == SFX_ITEM_SET, "kein Item gefunden!"); delete pSaveNum; pSaveNum = new SvxNumRule(*((SvxNumBulletItem*)pItem)->GetNumRule()); diff --git a/svx/source/dialog/opengrf.cxx b/svx/source/dialog/opengrf.cxx index 26db7df62d..f6564449ae 100644 --- a/svx/source/dialog/opengrf.cxx +++ b/svx/source/dialog/opengrf.cxx @@ -258,7 +258,7 @@ sal_Bool SvxOpenGraphicDialog::IsAsLink() const if( mpImpl->xCtrlAcc.is() ) { Any aVal = mpImpl->xCtrlAcc->getValue( ExtendedFilePickerElementIds::CHECKBOX_LINK, 0 ); - DBG_ASSERT(aVal.hasValue(), "Value CBX_INSERT_AS_LINK not found") + DBG_ASSERT(aVal.hasValue(), "Value CBX_INSERT_AS_LINK not found"); return aVal.hasValue() ? *(sal_Bool*) aVal.getValue() : sal_False; } } diff --git a/svx/source/dialog/optasian.cxx b/svx/source/dialog/optasian.cxx index abf87fc665..82ada7f5a4 100644 --- a/svx/source/dialog/optasian.cxx +++ b/svx/source/dialog/optasian.cxx @@ -123,7 +123,7 @@ sal_Bool SvxAsianLayoutPage_Impl::hasForbiddenCharacters(LanguageType eLang) SvxForbiddenChars_Impl* SvxAsianLayoutPage_Impl::getForbiddenCharacters(LanguageType eLang) { SvxForbiddenChars_Impl* pImp = aChangedLanguagesTbl.Get(eLang); - DBG_ASSERT(pImp, "language not available") + DBG_ASSERT(pImp, "language not available"); if(pImp) return pImp; return 0; @@ -251,7 +251,7 @@ BOOL SvxAsianLayoutPage::FillItemSet( SfxItemSet& ) } catch(Exception&) { - DBG_ERROR("exception in XForbiddenCharacters") + DBG_ERROR("exception in XForbiddenCharacters"); } } eLastUsedLanguageTypeForForbiddenCharacters = aLanguageLB.GetSelectLanguage(); @@ -389,7 +389,7 @@ IMPL_LINK(SvxAsianLayoutPage, LanguageHdl, SvxLanguageBox*, EMPTYARG ) } catch(Exception&) { - DBG_ERROR("exception in XForbiddenCharacters") + DBG_ERROR("exception in XForbiddenCharacters"); } } } @@ -458,7 +458,7 @@ IMPL_LINK(SvxAsianLayoutPage, ModifyHdl, Edit*, pEdit) } catch(Exception&) { - DBG_ERROR("exception in XForbiddenCharacters") + DBG_ERROR("exception in XForbiddenCharacters"); } } pImpl->aConfig.SetStartEndChars( aLocale, bEnable ? &sStart : 0, bEnable ? &sEnd : 0); diff --git a/svx/source/dialog/optcolor.cxx b/svx/source/dialog/optcolor.cxx index 01cec72b52..6a2f305775 100644 --- a/svx/source/dialog/optcolor.cxx +++ b/svx/source/dialog/optcolor.cxx @@ -1018,7 +1018,7 @@ ColorConfigCtrl_Impl::~ColorConfigCtrl_Impl() ---------------------------------------------------------------------------*/ void ColorConfigCtrl_Impl::Update() { - DBG_ASSERT(pColorConfig, "Configuration not set" ) + DBG_ASSERT(pColorConfig, "Configuration not set" ); sal_Int32 i; for( i = 0; i < ColorConfigEntryCount; i++ ) { @@ -1237,7 +1237,7 @@ void ColorConfigCtrl_Impl::DataChanged( const DataChangedEvent& rDCEvt ) ---------------------------------------------------------------------------*/ IMPL_LINK(ColorConfigCtrl_Impl, ClickHdl, CheckBox*, pBox) { - DBG_ASSERT(pColorConfig, "Configuration not set" ) + DBG_ASSERT(pColorConfig, "Configuration not set" ); for( sal_Int32 i = 0; i < ColorConfigEntryCount; i++ ) { @@ -1258,7 +1258,7 @@ IMPL_LINK(ColorConfigCtrl_Impl, ClickHdl, CheckBox*, pBox) ---------------------------------------------------------------------------*/ IMPL_LINK(ColorConfigCtrl_Impl, ColorHdl, ColorListBox*, pBox) { - DBG_ASSERT(pColorConfig, "Configuration not set" ) + DBG_ASSERT(pColorConfig, "Configuration not set" ); sal_Int32 i = 0; for( ; i < ColorConfigEntryCount; i++ ) { @@ -1514,7 +1514,7 @@ IMPL_LINK(SvxColorOptionsTabPage, SaveDeleteHdl_Impl, PushButton*, pButton ) } else { - DBG_ASSERT(aColorSchemeLB.GetEntryCount() > 1, "don't delete the last scheme") + DBG_ASSERT(aColorSchemeLB.GetEntryCount() > 1, "don't delete the last scheme"); QueryBox aQuery(pButton, SVX_RES(RID_SVXQB_DELETE_COLOR_CONFIG)); aQuery.SetText(String(SVX_RES(RID_SVXSTR_COLOR_CONFIG_DELETE))); if(RET_YES == aQuery.Execute()) diff --git a/svx/source/dialog/optdict.cxx b/svx/source/dialog/optdict.cxx index 8404621e86..d1cdff343a 100644 --- a/svx/source/dialog/optdict.cxx +++ b/svx/source/dialog/optdict.cxx @@ -602,7 +602,7 @@ IMPL_LINK(SvxEditDictionaryDialog, NewDelHdl, PushButton*, pBtn) if(pBtn == &aDeletePB) { - DBG_ASSERT(pEntry, "keine Eintrag selektiert") + DBG_ASSERT(pEntry, "keine Eintrag selektiert"); String aStr; aWordED.SetText(aStr); diff --git a/svx/source/dialog/optfltr.cxx b/svx/source/dialog/optfltr.cxx index 6e9167641e..f8d185f107 100644 --- a/svx/source/dialog/optfltr.cxx +++ b/svx/source/dialog/optfltr.cxx @@ -360,7 +360,7 @@ void OfaMSFilterTabPage2::MSFltrSimpleTable::SetCheckButtonState( { SvLBoxButton* pItem = (SvLBoxButton*)(pEntry->GetItem(nCol + 1)); - DBG_ASSERT(pItem,"SetCheckButton:Item not found") + DBG_ASSERT(pItem,"SetCheckButton:Item not found"); if (((SvLBoxItem*)pItem)->IsA() == SV_ITEM_ID_LBOXBUTTON) { switch( eState ) @@ -388,7 +388,7 @@ SvButtonState OfaMSFilterTabPage2::MSFltrSimpleTable::GetCheckButtonState( { SvButtonState eState = SV_BUTTON_UNCHECKED; SvLBoxButton* pItem = (SvLBoxButton*)(pEntry->GetItem(nCol + 1)); - DBG_ASSERT(pItem,"GetChButnState:Item not found") + DBG_ASSERT(pItem,"GetChButnState:Item not found"); if (((SvLBoxItem*)pItem)->IsA() == SV_ITEM_ID_LBOXBUTTON) { diff --git a/svx/source/dialog/optinet2.cxx b/svx/source/dialog/optinet2.cxx index 6d52210fad..21fd8cc466 100644 --- a/svx/source/dialog/optinet2.cxx +++ b/svx/source/dialog/optinet2.cxx @@ -991,7 +991,7 @@ IMPL_LINK( SvxSearchTabPage, DeleteSearchHdl_Impl, PushButton *, EMPTYARG) { aChangePB.Enable(FALSE); //add by BerryJia for fixing Bug102610 Time:2002-8-29 11:00 (China Standard Time GMT+08:00) USHORT nPos = aSearchLB.GetSelectEntryPos(); - DBG_ASSERT(nPos != LISTBOX_ENTRY_NOTFOUND, "kein Eintrag selektiert!") + DBG_ASSERT(nPos != LISTBOX_ENTRY_NOTFOUND, "kein Eintrag selektiert!"); aSearchConfig.RemoveData(aSearchLB.GetSelectEntry()); aSearchLB.RemoveEntry(nPos); aSearchLB.SelectEntryPos(0); @@ -1012,7 +1012,7 @@ IMPL_LINK( SvxSearchTabPage, SearchEntryHdl_Impl, ListBox*, pBox ) return 0; const SvxSearchEngineData* pData = aSearchConfig.GetData(sSelection); - DBG_ASSERT(pData, "SearchEngine not available") + DBG_ASSERT(pData, "SearchEngine not available"); if(pData) { aSearchNameED.SetText(sSelection); diff --git a/svx/source/dialog/optpath.cxx b/svx/source/dialog/optpath.cxx index 15eaf6a511..54695490fa 100644 --- a/svx/source/dialog/optpath.cxx +++ b/svx/source/dialog/optpath.cxx @@ -644,7 +644,7 @@ IMPL_LINK( SvxPathTabPage, PathHdl_Impl, PushButton *, EMPTYARG ) } catch( Exception& ) { - DBG_ERRORFILE( "SvxPathTabPage::PathHdl_Impl: exception from folder picker" ) + DBG_ERRORFILE( "SvxPathTabPage::PathHdl_Impl: exception from folder picker" ); } } return 0; diff --git a/svx/source/dialog/optsave.cxx b/svx/source/dialog/optsave.cxx index acd9a63c66..2ef0d21407 100644 --- a/svx/source/dialog/optsave.cxx +++ b/svx/source/dialog/optsave.cxx @@ -150,7 +150,7 @@ SvxAlienFilterWarningConfig_Impl::SvxAlienFilterWarningConfig_Impl() : aPropNames.getArray()[0] = C2U("ShowAlienFilterWarning"); Sequence<Any> aValues = GetProperties(aPropNames); const Any* pValues = aValues.getConstArray(); - DBG_ASSERT(aValues.getLength() == aPropNames.getLength(), "GetProperties failed") + DBG_ASSERT(aValues.getLength() == aPropNames.getLength(), "GetProperties failed"); if(aValues.getLength() == aPropNames.getLength() && pValues[0].hasValue() && pValues[0].getValueType() == ::getBooleanCppuType()) @@ -555,7 +555,7 @@ void SfxSaveTabPage::Reset( const SfxItemSet& ) pImpl->xFact = Reference<XNameContainer>( xMSF->createInstance(C2U("com.sun.star.document.FilterFactory")), UNO_QUERY); - DBG_ASSERT(pImpl->xFact.is(), "service com.sun.star.document.FilterFactory unavailable") + DBG_ASSERT(pImpl->xFact.is(), "service com.sun.star.document.FilterFactory unavailable"); Reference< XContainerQuery > xQuery(pImpl->xFact, UNO_QUERY); if(xQuery.is()) { @@ -609,7 +609,7 @@ void SfxSaveTabPage::Reset( const SfxItemSet& ) } catch(Exception& ) { - DBG_ERROR("exception in FilterFactory access") + DBG_ERROR("exception in FilterFactory access"); } pImpl->bInitialized = sal_True; diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx index 3898a94ad7..495366ead5 100644 --- a/svx/source/dialog/rubydialog.cxx +++ b/svx/source/dialog/rubydialog.cxx @@ -384,7 +384,7 @@ void SvxRubyDialog::Activate() } catch(Exception&) { - DBG_ERROR("exception in style access") + DBG_ERROR("exception in style access"); } if(sCharStyleSelect.Len()) aCharStyleLB.SelectEntry(sCharStyleSelect); @@ -443,7 +443,7 @@ void SvxRubyDialog::GetText() aEditArr[i + 1]->GetText() != aEditArr[i + 1]->GetSavedValue())) { Sequence<PropertyValues>& aRubyValues = pImpl->GetRubyValues(); - DBG_ASSERT(aRubyValues.getLength() > (i / 2 + nTempLastPos), "wrong index" ) + DBG_ASSERT(aRubyValues.getLength() > (i / 2 + nTempLastPos), "wrong index" ); SetModified(TRUE); Sequence<PropertyValue> &rProps = aRubyValues.getArray()[i / 2 + nTempLastPos]; PropertyValue* pProps = rProps.getArray(); @@ -591,7 +591,7 @@ IMPL_LINK(SvxRubyDialog, ApplyHdl_Impl, PushButton*, EMPTYARG) } catch(Exception& ) { - DBG_ERROR("Exception caught") + DBG_ERROR("Exception caught"); } } return 0; diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx index f6d2cde4de..13f571e45b 100644 --- a/svx/source/dialog/svxbmpnumvalueset.cxx +++ b/svx/source/dialog/svxbmpnumvalueset.cxx @@ -294,7 +294,7 @@ void SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt ) } catch(Exception&) { - DBG_ERROR("Exception in DefaultNumberingProvider::makeNumberingString") + DBG_ERROR("Exception in DefaultNumberingProvider::makeNumberingString"); } } // knapp neben dem linken Rand beginnen @@ -366,7 +366,7 @@ void SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt ) } catch(Exception&) { - DBG_ERROR("Exception in DefaultNumberingProvider::makeNumberingString") + DBG_ERROR("Exception in DefaultNumberingProvider::makeNumberingString"); } aLeft.Y() -= (pDev->GetTextHeight()/2); @@ -450,7 +450,7 @@ void SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt ) static sal_Bool bAssert = FALSE; if(!bAssert) { - DBG_ERROR("exception in ::UserDraw") + DBG_ERROR("exception in ::UserDraw"); bAssert = sal_True; } } diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx index 5202efc024..13d479b294 100644 --- a/svx/source/dialog/svxruler.cxx +++ b/svx/source/dialog/svxruler.cxx @@ -1504,7 +1504,7 @@ long SvxRuler::GetLeftFrameMargin() const { // #126721# for some unknown reason the current column is set to 0xffff DBG_ASSERT(!pColumnItem || pColumnItem->GetActColumn() < pColumnItem->Count(), - "issue #126721# - invalid current column!") + "issue #126721# - invalid current column!"); long nLeft = pColumnItem && pColumnItem->Count() && pColumnItem->GetActColumn() < pColumnItem->Count() ? (*pColumnItem)[pColumnItem->GetActColumn()].nStart : 0; diff --git a/svx/source/dialog/swframeposstrings.cxx b/svx/source/dialog/swframeposstrings.cxx index cb4092f314..1b1b40fc05 100644 --- a/svx/source/dialog/swframeposstrings.cxx +++ b/svx/source/dialog/swframeposstrings.cxx @@ -72,7 +72,7 @@ SvxSwFramePosString::~SvxSwFramePosString() -----------------------------------------------------------------------*/ const String& SvxSwFramePosString::GetString(StringId eId) { - DBG_ASSERT(eId >= 0 && eId < STR_MAX, "invalid StringId") + DBG_ASSERT(eId >= 0 && eId < STR_MAX, "invalid StringId"); if(!(eId >= 0 && eId < STR_MAX)) eId = LEFT; return pImpl->aStrings[eId]; diff --git a/svx/source/dialog/swpossizetabpage.cxx b/svx/source/dialog/swpossizetabpage.cxx index b88c581d74..338ca71988 100644 --- a/svx/source/dialog/swpossizetabpage.cxx +++ b/svx/source/dialog/swpossizetabpage.cxx @@ -1874,7 +1874,7 @@ void SvxSwPosSizeTabPage::SetView( const SdrView* pSdrView ) m_pSdrView = pSdrView; if(!m_pSdrView) { - DBG_ERROR("No SdrView* set") + DBG_ERROR("No SdrView* set"); return; } @@ -1942,7 +1942,7 @@ void SvxSwPosSizeTabPage::SetView( const SdrView* pSdrView ) ( eKind==OBJ_TEXT || eKind==OBJ_TITLETEXT || eKind==OBJ_OUTLINETEXT) && ( (SdrTextObj*) pObj )->HasText() ) { - DBG_ERROR("AutoWidth/AutoHeight should be enabled") + DBG_ERROR("AutoWidth/AutoHeight should be enabled"); } } else diff --git a/svx/source/dialog/treeopt.cxx b/svx/source/dialog/treeopt.cxx index d42dcaf315..80009e6cf1 100644 --- a/svx/source/dialog/treeopt.cxx +++ b/svx/source/dialog/treeopt.cxx @@ -1101,7 +1101,7 @@ IMPL_LINK( OfaTreeOptionsDialog, SelectHdl_Impl, Timer*, EMPTYARG ) SvLBoxEntry* pParent = pBox->GetParent(pEntry); pBox->EndSelection(); - DBG_ASSERT(!bInSelectHdl_Impl, "Timeout handler called twice") + DBG_ASSERT(!bInSelectHdl_Impl, "Timeout handler called twice"); if(bInSelectHdl_Impl || pCurrentPageEntry == pEntry) return 0; //#111938# lock the SelectHdl_Impl to prevent multiple executes @@ -1242,7 +1242,7 @@ IMPL_LINK( OfaTreeOptionsDialog, SelectHdl_Impl, Timer*, EMPTYARG ) rColPage.Construct(); } - DBG_ASSERT( pPageInfo->m_pPage, "tabpage could not created") + DBG_ASSERT( pPageInfo->m_pPage, "tabpage could not created"); if ( pPageInfo->m_pPage ) { SvtViewOptions aTabPageOpt( E_TABPAGE, String::CreateFromInt32( pPageInfo->m_nPageId ) ); diff --git a/svx/source/editeng/acorrcfg.cxx b/svx/source/editeng/acorrcfg.cxx index 3e7eb771fd..0745a5e259 100644 --- a/svx/source/editeng/acorrcfg.cxx +++ b/svx/source/editeng/acorrcfg.cxx @@ -146,7 +146,7 @@ void SvxBaseAutoCorrCfg::Load(sal_Bool bInit) if(bInit) EnableNotification(aNames); const Any* pValues = aValues.getConstArray(); - DBG_ASSERT(aValues.getLength() == aNames.getLength(), "GetProperties failed") + DBG_ASSERT(aValues.getLength() == aNames.getLength(), "GetProperties failed"); if(aValues.getLength() == aNames.getLength()) { long nFlags = 0; // default alles aus @@ -417,7 +417,7 @@ void SvxSwAutoCorrCfg::Load(sal_Bool bInit) if(bInit) EnableNotification(aNames); const Any* pValues = aValues.getConstArray(); - DBG_ASSERT(aValues.getLength() == aNames.getLength(), "GetProperties failed") + DBG_ASSERT(aValues.getLength() == aNames.getLength(), "GetProperties failed"); if(aValues.getLength() == aNames.getLength()) { SvxSwAutoFmtFlags& rSwFlags = rParent.pAutoCorrect->GetSwFlags(); diff --git a/svx/source/editeng/editdoc.cxx b/svx/source/editeng/editdoc.cxx index 726a6ae220..cbc443cea4 100644 --- a/svx/source/editeng/editdoc.cxx +++ b/svx/source/editeng/editdoc.cxx @@ -640,8 +640,8 @@ BOOL EditSelection::IsInvalid() const BOOL EditSelection::Adjust( const ContentList& rNodes ) { - DBG_ASSERT( aStartPaM.GetIndex() <= aStartPaM.GetNode()->Len(), "Index im Wald in Adjust(1)" ) - DBG_ASSERT( aEndPaM.GetIndex() <= aEndPaM.GetNode()->Len(), "Index im Wald in Adjust(2)" ) + DBG_ASSERT( aStartPaM.GetIndex() <= aStartPaM.GetNode()->Len(), "Index im Wald in Adjust(1)" ); + DBG_ASSERT( aEndPaM.GetIndex() <= aEndPaM.GetNode()->Len(), "Index im Wald in Adjust(2)" ); ContentNode* pStartNode = aStartPaM.GetNode(); ContentNode* pEndNode = aEndPaM.GetNode(); @@ -649,8 +649,8 @@ BOOL EditSelection::Adjust( const ContentList& rNodes ) USHORT nStartNode = rNodes.GetPos( pStartNode ); USHORT nEndNode = rNodes.GetPos( pEndNode ); - DBG_ASSERT( nStartNode != USHRT_MAX, "Node im Wald in Adjust(1)" ) - DBG_ASSERT( nEndNode != USHRT_MAX, "Node im Wald in Adjust(2)" ) + DBG_ASSERT( nStartNode != USHRT_MAX, "Node im Wald in Adjust(1)" ); + DBG_ASSERT( nEndNode != USHRT_MAX, "Node im Wald in Adjust(2)" ); BOOL bSwap = FALSE; if ( nStartNode > nEndNode ) diff --git a/svx/source/editeng/impedit2.cxx b/svx/source/editeng/impedit2.cxx index cc71eb5730..ce740ad01e 100644 --- a/svx/source/editeng/impedit2.cxx +++ b/svx/source/editeng/impedit2.cxx @@ -2242,7 +2242,7 @@ EditPaM ImpEditEngine::ImpConnectParagraphs( ContentNode* pLeft, ContentNode* pR EditPaM ImpEditEngine::DeleteLeftOrRight( const EditSelection& rSel, BYTE nMode, BYTE nDelMode ) { - DBG_ASSERT( !EditSelection( rSel ).DbgIsBuggy( aEditDoc ), "Index im Wald in DeleteLeftOrRight" ) + DBG_ASSERT( !EditSelection( rSel ).DbgIsBuggy( aEditDoc ), "Index im Wald in DeleteLeftOrRight" ); if ( rSel.HasRange() ) // dann nur Sel. loeschen return ImpDeleteSelection( rSel ); @@ -2337,8 +2337,8 @@ EditPaM ImpEditEngine::ImpDeleteSelection( EditSelection aSel ) CursorMoved( aStartPaM.GetNode() ); // nur damit neu eingestellte Attribute verschwinden... CursorMoved( aEndPaM.GetNode() ); // nur damit neu eingestellte Attribute verschwinden... - DBG_ASSERT( aStartPaM.GetIndex() <= aStartPaM.GetNode()->Len(), "Index im Wald in ImpDeleteSelection" ) - DBG_ASSERT( aEndPaM.GetIndex() <= aEndPaM.GetNode()->Len(), "Index im Wald in ImpDeleteSelection" ) + DBG_ASSERT( aStartPaM.GetIndex() <= aStartPaM.GetNode()->Len(), "Index im Wald in ImpDeleteSelection" ); + DBG_ASSERT( aEndPaM.GetIndex() <= aEndPaM.GetNode()->Len(), "Index im Wald in ImpDeleteSelection" ); USHORT nStartNode = aEditDoc.GetPos( aStartPaM.GetNode() ); USHORT nEndNode = aEditDoc.GetPos( aEndPaM.GetNode() ); diff --git a/svx/source/editeng/impedit3.cxx b/svx/source/editeng/impedit3.cxx index 3b1f2a1a94..753db3208e 100644 --- a/svx/source/editeng/impedit3.cxx +++ b/svx/source/editeng/impedit3.cxx @@ -2107,7 +2107,7 @@ void ImpEditEngine::ImpFindKashidas( ContentNode* pNode, USHORT nStart, USHORT n ( 0x629 == cCh || 0x62D == cCh || 0x62F == cCh || 0x627 == cCh || 0x644 == cCh || 0x643 == cCh ) ) { - DBG_ASSERT( 0 != cPrevCh, "No previous character" ) + DBG_ASSERT( 0 != cPrevCh, "No previous character" ); // check if character is connectable to previous character, if ( lcl_ConnectToPrev( cCh, cPrevCh ) ) @@ -2121,7 +2121,7 @@ void ImpEditEngine::ImpFindKashidas( ContentNode* pNode, USHORT nStart, USHORT n // before media Bah if ( nIdx && nIdx + 1 < aWord.Len() && 0x628 == cCh ) { - DBG_ASSERT( 0 != cPrevCh, "No previous character" ) + DBG_ASSERT( 0 != cPrevCh, "No previous character" ); // check if next character is Reh, Yeh or Alef Maksura xub_Unicode cNextCh = aWord.GetChar( nIdx + 1 ); @@ -2140,7 +2140,7 @@ void ImpEditEngine::ImpFindKashidas( ContentNode* pNode, USHORT nStart, USHORT n if ( nIdx && nIdx + 1 == aWord.Len() && 0x60C <= cCh && 0x6FE >= cCh ) { - DBG_ASSERT( 0 != cPrevCh, "No previous character" ) + DBG_ASSERT( 0 != cPrevCh, "No previous character" ); // check if character is connectable to previous character, if ( lcl_ConnectToPrev( cCh, cPrevCh ) ) diff --git a/svx/source/editeng/impedit4.cxx b/svx/source/editeng/impedit4.cxx index b4823d6f34..e7975bb7fd 100644 --- a/svx/source/editeng/impedit4.cxx +++ b/svx/source/editeng/impedit4.cxx @@ -1945,7 +1945,7 @@ void ImpEditEngine::EndSpelling() -----------------------------------------------------------------------*/ void ImpEditEngine::StartSpelling(EditView& rEditView, sal_Bool bMultipleDoc) { - DBG_ASSERT(!pSpellInfo, "pSpellInfo already set?") + DBG_ASSERT(!pSpellInfo, "pSpellInfo already set?"); pSpellInfo = new SpellInfo; pSpellInfo->bMultipleDoc = bMultipleDoc; rEditView.pImpEditView->SetEditSelection( aEditDoc.GetStartPaM() ); @@ -2178,7 +2178,7 @@ void ImpEditEngine::ApplyChangedSentence(EditView& rEditView, const ::svx::Spell { #ifdef SVX_LIGHT #else - DBG_ASSERT(pSpellInfo, "pSpellInfo not initialized") + DBG_ASSERT(pSpellInfo, "pSpellInfo not initialized"); if(pSpellInfo) { UndoActionStart( EDITUNDO_INSERT ); diff --git a/svx/source/editeng/svxacorr.cxx b/svx/source/editeng/svxacorr.cxx index db0152d520..b7861e9154 100644 --- a/svx/source/editeng/svxacorr.cxx +++ b/svx/source/editeng/svxacorr.cxx @@ -1388,7 +1388,7 @@ void SvxAutoCorrect::SaveCplSttExceptList( LanguageType eLang ) #ifndef PRODUCT else { - DBG_ERROR("speichern einer leeren Liste?") + DBG_ERROR("speichern einer leeren Liste?"); } #endif } @@ -1404,7 +1404,7 @@ void SvxAutoCorrect::SaveWrdSttExceptList(LanguageType eLang) #ifndef PRODUCT else { - DBG_ERROR("speichern einer leeren Liste?") + DBG_ERROR("speichern einer leeren Liste?"); } #endif } @@ -1424,7 +1424,7 @@ BOOL SvxAutoCorrect::AddCplSttException( const String& rNew, { pLists = pLangTable->Seek(ULONG(LANGUAGE_DONTKNOW)); } - DBG_ASSERT(pLists, "keine Autokorrekturdatei") + DBG_ASSERT(pLists, "keine Autokorrekturdatei"); return pLists->AddToCplSttExceptList(rNew); } @@ -1441,7 +1441,7 @@ BOOL SvxAutoCorrect::AddWrtSttException( const String& rNew, else if(pLangTable->IsKeyValid(ULONG(LANGUAGE_DONTKNOW))|| CreateLanguageFile(LANGUAGE_DONTKNOW, TRUE)) pLists = pLangTable->Seek(ULONG(LANGUAGE_DONTKNOW)); - DBG_ASSERT(pLists, "keine Autokorrekturdatei") + DBG_ASSERT(pLists, "keine Autokorrekturdatei"); return pLists->AddToWrdSttExceptList(rNew); } @@ -1524,7 +1524,7 @@ BOOL SvxAutoCorrect::GetPrevAutoCorrWord( SvxAutoCorrDoc& rDoc, BOOL SvxAutoCorrect::CreateLanguageFile( LanguageType eLang, BOOL bNewFile ) { - DBG_ASSERT(!pLangTable->IsKeyValid(ULONG(eLang)), "Sprache ist bereits vorhanden") + DBG_ASSERT(!pLangTable->IsKeyValid(ULONG(eLang)), "Sprache ist bereits vorhanden"); String sUserDirFile( GetAutoCorrFileName( eLang, TRUE, FALSE )), sShareDirFile( sUserDirFile ); diff --git a/svx/source/editeng/unolingu.cxx b/svx/source/editeng/unolingu.cxx index 89e040b97e..78005d69ca 100644 --- a/svx/source/editeng/unolingu.cxx +++ b/svx/source/editeng/unolingu.cxx @@ -249,7 +249,7 @@ void SvxLinguConfigUpdate::UpdateAll( sal_Bool bForceCheck ) DBG_ASSERT( nNeedUpdating == 1, "SvxLinguConfigUpdate::UpdateAll already updated!" ); uno::Reference< XLinguServiceManager > xLngSvcMgr( GetLngSvcMgr_Impl() ); - DBG_ASSERT( xLngSvcMgr.is(), "service manager missing") + DBG_ASSERT( xLngSvcMgr.is(), "service manager missing"); if (!xLngSvcMgr.is()) return; diff --git a/svx/source/items/frmitems.cxx b/svx/source/items/frmitems.cxx index c721d7431d..5b1bef3c9c 100644 --- a/svx/source/items/frmitems.cxx +++ b/svx/source/items/frmitems.cxx @@ -4426,7 +4426,7 @@ CntWallpaperItem* SvxBrushItem::CreateCntWallpaperItem() const ---------------------------------------------------------------------------*/ void SvxBrushItem::ApplyGraphicTransparency_Impl() { - DBG_ASSERT(pImpl->pGraphicObject, "no GraphicObject available" ) + DBG_ASSERT(pImpl->pGraphicObject, "no GraphicObject available" ); if(pImpl->pGraphicObject) { GraphicAttr aAttr(pImpl->pGraphicObject->GetAttr()); diff --git a/svx/source/items/numitem.cxx b/svx/source/items/numitem.cxx index 022f41d172..5a4a7c916d 100644 --- a/svx/source/items/numitem.cxx +++ b/svx/source/items/numitem.cxx @@ -86,7 +86,7 @@ SvxNumberType::SvxNumberType(sal_Int16 nType) : Reference < XInterface > xI = xMSF->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.text.DefaultNumberingProvider" ) ); Reference<XDefaultNumberingProvider> xRet(xI, UNO_QUERY); - DBG_ASSERT(xRet.is(), "service missing: \"com.sun.star.text.DefaultNumberingProvider\"") + DBG_ASSERT(xRet.is(), "service missing: \"com.sun.star.text.DefaultNumberingProvider\""); xFormatter = Reference<XNumberingFormatter> (xRet, UNO_QUERY); } catch(Exception& ) @@ -960,7 +960,7 @@ int SvxNumRule::operator==( const SvxNumRule& rCopy) const * --------------------------------------------------*/ const SvxNumberFormat* SvxNumRule::Get(USHORT nLevel)const { - DBG_ASSERT(nLevel < SVX_MAX_NUM, "falsches Level" ) + DBG_ASSERT(nLevel < SVX_MAX_NUM, "falsches Level" ); if( nLevel < SVX_MAX_NUM ) return aFmtsSet[nLevel] ? aFmts[nLevel] : 0; else @@ -977,7 +977,7 @@ const SvxNumberFormat& SvxNumRule::GetLevel(USHORT nLevel)const pStdOutlineNumFmt = new SvxNumberFormat(SVX_NUM_NUMBER_NONE); } - DBG_ASSERT(nLevel < SVX_MAX_NUM, "falsches Level" ) + DBG_ASSERT(nLevel < SVX_MAX_NUM, "falsches Level" ); return ( ( nLevel < SVX_MAX_NUM ) && aFmts[nLevel] ) ? *aFmts[nLevel] : eNumberingType == SVX_RULETYPE_NUMBERING ? @@ -989,7 +989,7 @@ const SvxNumberFormat& SvxNumRule::GetLevel(USHORT nLevel)const * --------------------------------------------------*/ void SvxNumRule::SetLevel( USHORT i, const SvxNumberFormat& rNumFmt, BOOL bIsValid ) { - DBG_ASSERT(i < SVX_MAX_NUM, "falsches Level" ) + DBG_ASSERT(i < SVX_MAX_NUM, "falsches Level" ); if( (i < SVX_MAX_NUM) && (!aFmtsSet[i] || !(rNumFmt == *Get( i ))) ) { @@ -1004,7 +1004,7 @@ void SvxNumRule::SetLevel( USHORT i, const SvxNumberFormat& rNumFmt, BOOL bIsVal * --------------------------------------------------*/ void SvxNumRule::SetLevel(USHORT nLevel, const SvxNumberFormat* pFmt) { - DBG_ASSERT(nLevel < SVX_MAX_NUM, "falsches Level" ) + DBG_ASSERT(nLevel < SVX_MAX_NUM, "falsches Level" ); if( nLevel < SVX_MAX_NUM ) { diff --git a/svx/source/msfilter/msdffimp.cxx b/svx/source/msfilter/msdffimp.cxx index 3afadc6359..683457b680 100644 --- a/svx/source/msfilter/msdffimp.cxx +++ b/svx/source/msfilter/msdffimp.cxx @@ -346,11 +346,11 @@ void Impl_OlePres::Write( SvStream & rStm ) // Immer auf 1/100 mm, bis Mtf-Loesung gefunden // Annahme (keine Skalierung, keine Org-Verschiebung) DBG_ASSERT( pMtf->GetPrefMapMode().GetScaleX() == Fraction( 1, 1 ), - "X-Skalierung im Mtf" ) + "X-Skalierung im Mtf" ); DBG_ASSERT( pMtf->GetPrefMapMode().GetScaleY() == Fraction( 1, 1 ), - "Y-Skalierung im Mtf" ) + "Y-Skalierung im Mtf" ); DBG_ASSERT( pMtf->GetPrefMapMode().GetOrigin() == Point(), - "Origin-Verschiebung im Mtf" ) + "Origin-Verschiebung im Mtf" ); MapUnit nMU = pMtf->GetPrefMapMode().GetMapUnit(); if( MAP_100TH_MM != nMU ) { @@ -367,7 +367,7 @@ void Impl_OlePres::Write( SvStream & rStm ) } else { - DBG_ERROR( "unknown format" ) + DBG_ERROR( "unknown format" ); } ULONG nEndPos = rStm.Tell(); rStm.Seek( nPos ); diff --git a/svx/source/msfilter/msocximex.cxx b/svx/source/msfilter/msocximex.cxx index fac5e6884a..415c5b4bec 100644 --- a/svx/source/msfilter/msocximex.cxx +++ b/svx/source/msfilter/msocximex.cxx @@ -1348,7 +1348,7 @@ const uno::Reference< container::XIndexContainer >& xFormPropSet->setPropertyValue( WW8_ASCII2STR("Name"), aTmp ); uno::Reference< form::XForm > xForm( xCreate, uno::UNO_QUERY ); - DBG_ASSERT(xForm.is(), "keine Form?") + DBG_ASSERT(xForm.is(), "keine Form?"); uno::Reference< container::XIndexContainer > xForms( xNameCont, uno::UNO_QUERY ); diff --git a/svx/source/options/htmlcfg.cxx b/svx/source/options/htmlcfg.cxx index af5df740bd..d88542e014 100644 --- a/svx/source/options/htmlcfg.cxx +++ b/svx/source/options/htmlcfg.cxx @@ -128,7 +128,7 @@ SvxHtmlOptions::SvxHtmlOptions() : const Sequence<OUString>& aNames = GetPropertyNames(); Sequence<Any> aValues = GetProperties(aNames); const Any* pValues = aValues.getConstArray(); - DBG_ASSERT(aValues.getLength() == aNames.getLength(), "GetProperties failed") + DBG_ASSERT(aValues.getLength() == aNames.getLength(), "GetProperties failed"); if(aValues.getLength() == aNames.getLength()) { pImp->nFlags = 0; diff --git a/svx/source/options/optlingu.cxx b/svx/source/options/optlingu.cxx index adcd0afc96..4fef35c855 100644 --- a/svx/source/options/optlingu.cxx +++ b/svx/source/options/optlingu.cxx @@ -297,7 +297,7 @@ void lcl_SetCheckButton( SvLBoxEntry* pEntry, BOOL bCheck ) { SvLBoxButton* pItem = (SvLBoxButton*)(pEntry->GetFirstItem(SV_ITEM_ID_LBOXBUTTON)); - DBG_ASSERT(pItem,"SetCheckButton:Item not found") + DBG_ASSERT(pItem,"SetCheckButton:Item not found"); if (((SvLBoxItem*)pItem)->IsA() == SV_ITEM_ID_LBOXBUTTON) { if (bCheck) @@ -732,7 +732,7 @@ void lcl_MergeDisplayArray( { DBG_ASSERT( !pEntry->xSpell.is() && pEntry->sSpellImplName.getLength() == 0, - "merge conflict" ) + "merge conflict" ); pEntry->sSpellImplName = rToAdd.sSpellImplName; pEntry->xSpell = rToAdd.xSpell; } @@ -740,7 +740,7 @@ void lcl_MergeDisplayArray( { DBG_ASSERT( !pEntry->xHyph.is() && pEntry->sHyphImplName.getLength() == 0, - "merge conflict" ) + "merge conflict" ); pEntry->sHyphImplName = rToAdd.sHyphImplName; pEntry->xHyph = rToAdd.xHyph; } @@ -748,7 +748,7 @@ void lcl_MergeDisplayArray( { DBG_ASSERT( !pEntry->xThes.is() && pEntry->sThesImplName.getLength() == 0, - "merge conflict" ) + "merge conflict" ); pEntry->sThesImplName = rToAdd.sThesImplName; pEntry->xThes = rToAdd.xThes; } @@ -769,7 +769,7 @@ SvxLinguData_Impl::SvxLinguData_Impl() : uno::Reference < XInterface > xI = xMSF->createInstance( C2U( "com.sun.star.linguistic2.LinguServiceManager" ) ); xLinguSrvcMgr = uno::Reference<XLinguServiceManager>(xI, UNO_QUERY); - DBG_ASSERT(xLinguSrvcMgr.is(), "No linguistic service available!") + DBG_ASSERT(xLinguSrvcMgr.is(), "No linguistic service available!"); if(xLinguSrvcMgr.is()) { Locale aCurrentLocale; diff --git a/svx/source/options/srchcfg.cxx b/svx/source/options/srchcfg.cxx index b66baa6cb2..60ef1a1143 100644 --- a/svx/source/options/srchcfg.cxx +++ b/svx/source/options/srchcfg.cxx @@ -240,7 +240,7 @@ sal_uInt16 SvxSearchConfig::Count() ---------------------------------------------------------------------------*/ const SvxSearchEngineData& SvxSearchConfig::GetData(sal_uInt16 nPos) { - DBG_ASSERT(nPos < pImpl->aEngineArr.Count(), "wrong array index") + DBG_ASSERT(nPos < pImpl->aEngineArr.Count(), "wrong array index"); return *pImpl->aEngineArr[nPos]; } /* -----------------------------19.03.01 10:38-------------------------------- diff --git a/svx/source/outliner/outliner.cxx b/svx/source/outliner/outliner.cxx index d055a2c9c5..9e29502f25 100644 --- a/svx/source/outliner/outliner.cxx +++ b/svx/source/outliner/outliner.cxx @@ -147,7 +147,7 @@ Paragraph* Outliner::Insert(const XubString& rText, ULONG nAbsPos, sal_Int16 nDe pEditEngine->SetUpdateMode( bUpdate ); } bFirstParaIsEmpty = FALSE; - DBG_ASSERT(pEditEngine->GetParagraphCount()==pParaList->GetParagraphCount(),"SetText failed") + DBG_ASSERT(pEditEngine->GetParagraphCount()==pParaList->GetParagraphCount(),"SetText failed"); return pPara; } @@ -393,7 +393,7 @@ OutlinerParaObject* Outliner::CreateParaObject( USHORT nStartPara, USHORT nCount void Outliner::SetText( const XubString& rText, Paragraph* pPara ) { DBG_CHKTHIS(Outliner,0); - DBG_ASSERT(pPara,"SetText:No Para") + DBG_ASSERT(pPara,"SetText:No Para"); BOOL bUpdate = pEditEngine->GetUpdateMode(); pEditEngine->SetUpdateMode( FALSE ); @@ -470,7 +470,7 @@ void Outliner::SetText( const XubString& rText, Paragraph* pPara ) } } - DBG_ASSERT(pParaList->GetParagraphCount()==pEditEngine->GetParagraphCount(),"SetText failed!") + DBG_ASSERT(pParaList->GetParagraphCount()==pEditEngine->GetParagraphCount(),"SetText failed!"); bFirstParaIsEmpty = FALSE; ImplBlockInsertionCallbacks( FALSE ); pEditEngine->SetUpdateMode( bUpdate ); @@ -597,8 +597,8 @@ void Outliner::SetText( const OutlinerParaObject& rPObj ) ImplBlockInsertionCallbacks( FALSE ); pEditEngine->SetUpdateMode( bUpdate ); - DBG_ASSERT( pParaList->GetParagraphCount()==rPObj.Count(),"SetText failed") - DBG_ASSERT( pEditEngine->GetParagraphCount()==rPObj.Count(),"SetText failed") + DBG_ASSERT( pParaList->GetParagraphCount()==rPObj.Count(),"SetText failed"); + DBG_ASSERT( pEditEngine->GetParagraphCount()==rPObj.Count(),"SetText failed"); } void Outliner::AddText( const OutlinerParaObject& rPObj ) @@ -629,7 +629,7 @@ void Outliner::AddText( const OutlinerParaObject& rPObj ) pPara = new Paragraph( rPObj.pParagraphDataArr[ n ] ); pParaList->Insert( pPara, LIST_APPEND ); USHORT nP = sal::static_int_cast< USHORT >(nPara+n); - DBG_ASSERT(pParaList->GetAbsPos(pPara)==nP,"AddText:Out of sync") + DBG_ASSERT(pParaList->GetAbsPos(pPara)==nP,"AddText:Out of sync"); ImplInitDepth( nP, pPara->GetDepth(), FALSE ); } DBG_ASSERT( pEditEngine->GetParagraphCount()==pParaList->GetParagraphCount(), "SetText: OutOfSync" ); @@ -1409,7 +1409,7 @@ void Outliner::DepthChangedHdl() ULONG Outliner::GetAbsPos( Paragraph* pPara ) { DBG_CHKTHIS(Outliner,0); - DBG_ASSERT(pPara,"GetAbsPos:No Para") + DBG_ASSERT(pPara,"GetAbsPos:No Para"); return pParaList->GetAbsPos( pPara ); } diff --git a/svx/source/outliner/outlobj.cxx b/svx/source/outliner/outlobj.cxx index 8eebbd05cf..5097e944d6 100644 --- a/svx/source/outliner/outlobj.cxx +++ b/svx/source/outliner/outlobj.cxx @@ -169,10 +169,10 @@ OutlinerParaObject* OutlinerParaObject::Create( SvStream& rStream, SfxItemPool* while ( nCount ) { EditTextObject* pText = EditTextObject::Create( rStream, NULL ); - DBG_ASSERT(pText,"CreateEditTextObject failed") + DBG_ASSERT(pText,"CreateEditTextObject failed"); sal_uInt32 nSync = 0; rStream >> nSync; - DBG_ASSERT(nSync==nSyncRef,"Stream out of sync") + DBG_ASSERT(nSync==nSyncRef,"Stream out of sync"); USHORT nDepth; rStream >> nDepth; Paragraph* pPara = new Paragraph( nDepth ); @@ -216,7 +216,7 @@ OutlinerParaObject* OutlinerParaObject::Create( SvStream& rStream, SfxItemPool* { sal_uInt32 _nSync = 0; rStream >> _nSync; - DBG_ASSERT(_nSync==nSyncRef,"Stream out of sync") + DBG_ASSERT(_nSync==nSyncRef,"Stream out of sync"); } } if( nVersion == 3 ) diff --git a/svx/source/outliner/outlvw.cxx b/svx/source/outliner/outlvw.cxx index 1456c638ae..705d219166 100644 --- a/svx/source/outliner/outlvw.cxx +++ b/svx/source/outliner/outlvw.cxx @@ -648,7 +648,7 @@ void OutlinerView::Indent( short nDiff ) // Absatz gesucht und aufgeplustert. #ifdef DBG_UTIL Paragraph* _pPara = pOwner->pParaList->GetParagraph( aSel.nStartPara ); - DBG_ASSERT(_pPara->IsVisible(),"Selected Paragraph invisible ?!") + DBG_ASSERT(_pPara->IsVisible(),"Selected Paragraph invisible ?!"); #endif Paragraph* pPrev= pOwner->pParaList->GetParagraph( aSel.nStartPara-1 ); diff --git a/svx/source/stbctrls/zoomsliderctrl.cxx b/svx/source/stbctrls/zoomsliderctrl.cxx index 8a03c1c183..a452521ed2 100644 --- a/svx/source/stbctrls/zoomsliderctrl.cxx +++ b/svx/source/stbctrls/zoomsliderctrl.cxx @@ -227,7 +227,7 @@ void SvxZoomSliderControl::StateChanged( USHORT /*nSID*/, SfxItemState eState, c mpImpl->mnMinZoom < mpImpl->mnSliderCenter && mpImpl->mnMaxZoom >= mpImpl->mnCurrentZoom && mpImpl->mnMaxZoom > mpImpl->mnSliderCenter, - "Looks like the zoom slider item is corrupted" ) + "Looks like the zoom slider item is corrupted" ); const com::sun::star::uno::Sequence < sal_Int32 > rSnappingPoints = static_cast<const SvxZoomSliderItem*>( pState )->GetSnappingPoints(); mpImpl->maSnappingPointOffsets.clear(); diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index b34ba12ccf..be501563c5 100644 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -294,7 +294,7 @@ SdrTextObj::~SdrTextObj() void SdrTextObj::FitFrameToTextSize() { - DBG_ASSERT(pModel!=NULL,"SdrTextObj::FitFrameToTextSize(): pModel=NULL!") + DBG_ASSERT(pModel!=NULL,"SdrTextObj::FitFrameToTextSize(): pModel=NULL!"); ImpJustifyRect(aRect); SdrText* pText = getActiveText(); diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx index 206d263033..dca3dd00e7 100644 --- a/svx/source/tbxctrls/linectrl.cxx +++ b/svx/source/tbxctrls/linectrl.cxx @@ -273,7 +273,7 @@ void SvxLineWidthToolBoxControl::StateChanged( if ( eState == SFX_ITEM_AVAILABLE ) { - DBG_ASSERT( pState->ISA(XLineWidthItem), "falscher ItemType" ) + DBG_ASSERT( pState->ISA(XLineWidthItem), "falscher ItemType" ); // Core-Unit an MetricField uebergeben // Darf nicht in CreateItemWin() geschehen! diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 36c79be32f..1d0b4c155c 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -1821,7 +1821,7 @@ struct SvxStyleToolBoxControl::Impl } catch(const uno::Exception& ) { - DBG_ERROR("error while initializing style names") + DBG_ERROR("error while initializing style names"); } } }; @@ -2127,7 +2127,7 @@ void SvxStyleToolBoxControl::Update() if ( !pItem ) { - DBG_WARNING( "Unknown Family" ) // can happen + DBG_WARNING( "Unknown Family" ); // can happen } } else if ( pPool != pStyleSheetPool ) diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx index 612482ae9e..c07f7ae35b 100644 --- a/svx/source/unodraw/unoprov.cxx +++ b/svx/source/unodraw/unoprov.cxx @@ -955,7 +955,7 @@ void SvxUnoPropertyMapProvider::Sort(USHORT nId) SfxItemPropertyMap* SvxUnoPropertyMapProvider::GetMap(UINT16 nPropertyId) { - DBG_ASSERT(nPropertyId < SVXMAP_END, "Id ?" ) + DBG_ASSERT(nPropertyId < SVXMAP_END, "Id ?" ); if(!aMapArr[nPropertyId]) { switch(nPropertyId) { case SVXMAP_SHAPE: aMapArr[SVXMAP_SHAPE]=ImplGetSvxShapePropertyMap(); break; diff --git a/ucb/source/ucp/gio/gio_seekable.cxx b/ucb/source/ucp/gio/gio_seekable.cxx index fb6148b335..6c3b680121 100644 --- a/ucb/source/ucp/gio/gio_seekable.cxx +++ b/ucb/source/ucp/gio/gio_seekable.cxx @@ -94,22 +94,33 @@ sal_Int64 SAL_CALL Seekable::getLength() throw( io::IOException, uno::RuntimeExc if (!mpStream) throw io::NotConnectedException(); + bool bOk = false; + sal_uInt64 nSize = 0; + GFileInfo* pInfo = G_IS_FILE_INPUT_STREAM(mpStream) ? g_file_input_stream_query_info(G_FILE_INPUT_STREAM(mpStream), const_cast<char*>(G_FILE_ATTRIBUTE_STANDARD_SIZE), NULL, NULL) : g_file_output_stream_query_info(G_FILE_OUTPUT_STREAM(mpStream), const_cast<char*>(G_FILE_ATTRIBUTE_STANDARD_SIZE), NULL, NULL); - if (!pInfo) - throw io::IOException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Getting attributes unsupported")), - static_cast< cppu::OWeakObject * >(this)); - - bool bOk = true; - sal_uInt64 nSize = 0; - if (g_file_info_has_attribute(pInfo, G_FILE_ATTRIBUTE_STANDARD_SIZE)) - nSize = g_file_info_get_size(pInfo); - else - bOk = false; + if (pInfo) + { + if (g_file_info_has_attribute(pInfo, G_FILE_ATTRIBUTE_STANDARD_SIZE)) + { + nSize = g_file_info_get_size(pInfo); + bOk = true; + } + g_object_unref(pInfo); + } - g_object_unref(pInfo); + if (!bOk) + { + GError *pError=NULL; + sal_Int64 nCurr = getPosition(); + if (!g_seekable_seek(mpStream, 0, G_SEEK_END, NULL, &pError)) + convertToException(pError, static_cast< cppu::OWeakObject * >(this)); + nSize = getPosition(); + seek(nCurr); + bOk = true; + } if (!bOk) throw io::IOException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Getting size unsupported")), diff --git a/xmloff/source/draw/XMLNumberStyles.cxx b/xmloff/source/draw/XMLNumberStyles.cxx index 56352e8bef..37e515fef2 100644 --- a/xmloff/source/draw/XMLNumberStyles.cxx +++ b/xmloff/source/draw/XMLNumberStyles.cxx @@ -399,7 +399,7 @@ static void SdXMLExportStyle( SdXMLExport& rExport, const SdXMLFixedDataStyle* p void SdXMLNumberStylesExporter::exportTimeStyle( SdXMLExport& rExport, sal_Int32 nStyle ) { - DBG_ASSERT( (nStyle >= 0) && (nStyle < SdXMLTimeFormatCount), "Unknown time style!" ) + DBG_ASSERT( (nStyle >= 0) && (nStyle < SdXMLTimeFormatCount), "Unknown time style!" ); if( (nStyle >= 0) && (nStyle < SdXMLTimeFormatCount) ) SdXMLExportStyle( rExport, aSdXMLFixedTimeFormats[ nStyle ] ); } diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx index 8b8c29dcff..f5436a3345 100644 --- a/xmloff/source/text/txtparae.cxx +++ b/xmloff/source/text/txtparae.cxx @@ -567,7 +567,7 @@ OUString XMLTextParagraphExport::FindTextStyleAndHyperlink( } OUString sParent; // AutoStyles should not have parents! sName = GetAutoStylePool().Find( XML_STYLE_FAMILY_TEXT_TEXT, sParent, xPropStates ); - DBG_ASSERT( sName.getLength(), "AutoStyle could not be found" ) + DBG_ASSERT( sName.getLength(), "AutoStyle could not be found" ); rbHasAutoStyle = sal_True; } |