diff options
Diffstat (limited to 'cui/source/dialogs')
41 files changed, 57 insertions, 184 deletions
diff --git a/cui/source/dialogs/SpellAttrib.cxx b/cui/source/dialogs/SpellAttrib.cxx index f3098f0688de..34dd071e50e9 100644 --- a/cui/source/dialogs/SpellAttrib.cxx +++ b/cui/source/dialogs/SpellAttrib.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <SpellAttrib.hxx> #include <vcl/font.hxx> #include <com/sun/star/uno/Reference.hxx> diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index 871a59925111..e18f2e3f13e1 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <tools/ref.hxx> diff --git a/cui/source/dialogs/commonlingui.cxx b/cui/source/dialogs/commonlingui.cxx index 58b0bc163e0b..99c7079a53eb 100644 --- a/cui/source/dialogs/commonlingui.cxx +++ b/cui/source/dialogs/commonlingui.cxx @@ -26,8 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" #include "commonlingui.hxx" #include <cuires.hrc> diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx index 93ce5e7ca44e..9ec9c84253b7 100644 --- a/cui/source/dialogs/cuicharmap.cxx +++ b/cui/source/dialogs/cuicharmap.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <stdio.h> @@ -349,7 +346,6 @@ SvxCharMapData::SvxCharMapData( SfxModalDialog* pDialog, BOOL bOne_, ResMgr* pRe // left align aShowText field int nLeftEdge = aSymbolText.GetPosPixel().X(); nLeftEdge += aSymbolText.GetTextWidth( aSymbolText.GetText() ); - Size aNewSize = aShowText.GetOutputSizePixel(); aShowText.SetPosPixel( Point( nLeftEdge+4, aShowText.GetPosPixel().Y() ) ); } diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx index bac1d9d897e7..7d38ea63ca8d 100644 --- a/cui/source/dialogs/cuifmsearch.cxx +++ b/cui/source/dialogs/cuifmsearch.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <tools/debug.hxx> #include <vcl/msgbox.hxx> #include <vcl/svapp.hxx> @@ -240,7 +237,7 @@ FmSearchDialog::~FmSearchDialog() //------------------------------------------------------------------------ void FmSearchDialog::Init(const UniString& strVisibleFields, const UniString& sInitialText) { - // die Initialisierung all der Controls + //the initialization of all the Controls m_rbSearchForText.SetClickHdl(LINK(this, FmSearchDialog, OnClickedFieldRadios)); m_rbSearchForNull.SetClickHdl(LINK(this, FmSearchDialog, OnClickedFieldRadios)); m_rbSearchForNotNull.SetClickHdl(LINK(this, FmSearchDialog, OnClickedFieldRadios)); @@ -268,8 +265,8 @@ void FmSearchDialog::Init(const UniString& strVisibleFields, const UniString& sI m_aHalfFullFormsCJK.SetToggleHdl(LINK(this, FmSearchDialog, OnCheckBoxToggled)); m_aSoundsLikeCJK.SetToggleHdl(LINK(this, FmSearchDialog, OnCheckBoxToggled)); - // die Listboxen fuellen - // die Methoden des Feldvergleiches + // fill the listboxes + // method of field comparison USHORT nResIds[] = { RID_STR_SEARCH_ANYWHERE, RID_STR_SEARCH_BEGINNING, @@ -280,7 +277,7 @@ void FmSearchDialog::Init(const UniString& strVisibleFields, const UniString& sI m_lbPosition.InsertEntry( String( CUI_RES( nResIds[i] ) ) ); m_lbPosition.SelectEntryPos(MATCHING_ANYWHERE); - // die Feld-Listbox + // the field listbox for (USHORT i=0; i<strVisibleFields.GetTokenCount(';'); ++i) m_lbField.InsertEntry(strVisibleFields.GetToken(i, ';')); @@ -289,14 +286,15 @@ void FmSearchDialog::Init(const UniString& strVisibleFields, const UniString& sI LoadParams(); m_cmbSearchText.SetText(sInitialText); - // wenn die Edit-Zeile den Text veraendert hat (weil er zum Beispiel Steuerzeichen enthielt, wie das bei Memofeldern der Fall - // sein kann), nehme ich einen leeren UniString + // if the Edit-line has changed the text (e.g. because it contains + // control characters, as can be the case with memo fields), I use + // an empty UniString. UniString sRealSetText = m_cmbSearchText.GetText(); if (!sRealSetText.Equals(sInitialText)) m_cmbSearchText.SetText(UniString()); LINK(this, FmSearchDialog, OnSearchTextModified).Call(&m_cmbSearchText); - // initial die ganzen UI-Elemente fuer die Suche an + // initial m_aDelayedPaint.SetTimeoutHdl(LINK(this, FmSearchDialog, OnDelayedPaint)); m_aDelayedPaint.SetTimeout(500); EnableSearchUI(sal_True); @@ -310,8 +308,10 @@ void FmSearchDialog::Init(const UniString& strVisibleFields, const UniString& sI //------------------------------------------------------------------------ sal_Bool FmSearchDialog::Close() { - // Wenn der Close-Button disabled ist und man im Dialog ESC drueckt, dann wird irgendwo vom Frame trotzdem Close aufgerufen, - // was ich allerdings nicht will, wenn ich gerade mitten in einer (eventuell in einem extra Thread laufenden) Suche bin + // If the close button is disabled and ESC is pressed in a dialog, + // then Frame will call Close anyway, which I don't want to happen + // while I'm in the middle of a search (maybe one that's running + // in its own thread) if (!m_pbClose.IsEnabled()) return sal_False; return ModalDialog::Close(); @@ -325,7 +325,7 @@ IMPL_LINK(FmSearchDialog, OnClickedFieldRadios, Button*, pButton) EnableSearchForDependees(sal_True); } else - // die Feldlistbox entsprechend en- oder disablen + // en- or disable field list box accordingly if (pButton == &m_rbSingleField) { m_lbField.Enable(); diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index 43f0f5dc5845..bd5240e1e7c4 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <algorithm> #include <ucbhelper/content.hxx> #include <osl/mutex.hxx> @@ -194,12 +191,12 @@ void SearchThread::ImplSearch( const INetURLObject& rStartURL, { SolarMutexGuard aGuard; - mpBrowser->aFoundList.Insert( - new String( aFoundURL.GetMainURL( INetURLObject::NO_DECODE ) ), - LIST_APPEND ); + mpBrowser->aFoundList.push_back( + new String( aFoundURL.GetMainURL( INetURLObject::NO_DECODE ) ) + ); mpBrowser->aLbxFound.InsertEntry( GetReducedString( aFoundURL, 50 ), - (USHORT) mpBrowser->aFoundList.Count() - 1 ); + (USHORT) mpBrowser->aFoundList.size() - 1 ); } } } @@ -315,9 +312,9 @@ void SAL_CALL TakeThread::run() { // kompletten Filenamen aus FoundList holen if( mpBrowser->bTakeAll ) - aURL = INetURLObject(*mpBrowser->aFoundList.GetObject( nPos = i )); + aURL = INetURLObject( *mpBrowser->aFoundList[ nPos = i ] ); else - aURL = INetURLObject(*mpBrowser->aFoundList.GetObject( nPos = mpBrowser->aLbxFound.GetSelectEntryPos( i ) )); + aURL = INetURLObject(*mpBrowser->aFoundList[ nPos = mpBrowser->aLbxFound.GetSelectEntryPos( i ) ]); // Position in Taken-Liste uebernehmen mrTakenList.Insert( (void*) (ULONG)nPos, LIST_APPEND ); @@ -384,7 +381,7 @@ IMPL_LINK( TakeProgress, ClickCancelBtn, void*, EMPTYARG ) IMPL_LINK( TakeProgress, CleanUpHdl, void*, EMPTYARG ) { TPGalleryThemeProperties* mpBrowser = (TPGalleryThemeProperties*) GetParent(); - ::std::bit_vector aRemoveEntries( mpBrowser->aFoundList.Count(), false ); + ::std::vector<bool, std::allocator<bool> > aRemoveEntries( mpBrowser->aFoundList.size(), false ); ::std::vector< String > aRemainingVector; sal_uInt32 i, nCount; @@ -401,15 +398,14 @@ IMPL_LINK( TakeProgress, CleanUpHdl, void*, EMPTYARG ) // refill found list for( i = 0, nCount = aRemoveEntries.size(); i < nCount; ++i ) if( !aRemoveEntries[ i ] ) - aRemainingVector.push_back( *mpBrowser->aFoundList.GetObject( i ) ); - - for( String* pStr = mpBrowser->aFoundList.First(); pStr; pStr = mpBrowser->aFoundList.Next() ) - delete pStr; + aRemainingVector.push_back( *mpBrowser->aFoundList[ i ] ); - mpBrowser->aFoundList.Clear(); + for ( i = 0, nCount = mpBrowser->aFoundList.size(); i < nCount; ++i ) + delete mpBrowser->aFoundList[ i ]; + mpBrowser->aFoundList.clear(); for( i = 0, nCount = aRemainingVector.size(); i < nCount; ++i ) - mpBrowser->aFoundList.Insert( new String( aRemainingVector[ i ] ), LIST_APPEND ); + mpBrowser->aFoundList.push_back( new String( aRemainingVector[ i ] ) ); aRemainingVector.clear(); @@ -818,8 +814,8 @@ TPGalleryThemeProperties::~TPGalleryThemeProperties() xMediaPlayer.clear(); xDialogListener.clear(); - for( String* pStr = aFoundList.First(); pStr; pStr = aFoundList.Next() ) - delete pStr; + for ( size_t i = 0, n = aFoundList.size(); i < n; ++i ) + delete aFoundList[ i ]; for( void* pEntry = aFilterEntryList.First(); pEntry; pEntry = aFilterEntryList.Next() ) delete (FilterEntry*) pEntry; @@ -997,10 +993,10 @@ void TPGalleryThemeProperties::SearchFiles() { SearchProgress* pProgress = new SearchProgress( this, aURL ); - for( String* pStr = aFoundList.First(); pStr; pStr = aFoundList.Next() ) - delete pStr; + for ( size_t i = 0, n = aFoundList.size(); i < n; ++i ) + delete aFoundList[ i ]; + aFoundList.clear(); - aFoundList.Clear(); aLbxFound.Clear(); pProgress->SetFileType( aCbbFileType.GetText() ); @@ -1061,9 +1057,7 @@ IMPL_LINK( TPGalleryThemeProperties, ClickSearchHdl, void *, EMPTYARG ) } catch(IllegalArgumentException) { -#ifdef DBG_UTIL - DBG_ERROR( "Folder picker failed with illegal arguments" ); -#endif + OSL_FAIL( "Folder picker failed with illegal arguments" ); } } @@ -1115,7 +1109,7 @@ void TPGalleryThemeProperties::DoPreview() if( aString != aPreviewString ) { - INetURLObject _aURL( *aFoundList.GetObject( aLbxFound.GetEntryPos( aString ) ) ); + INetURLObject _aURL( *aFoundList[ aLbxFound.GetEntryPos( aString ) ] ); bInputAllowed = FALSE; if ( !aWndPreview.SetGraphic( _aURL ) ) @@ -1197,7 +1191,7 @@ IMPL_LINK( TPGalleryThemeProperties, SelectFoundHdl, void *, EMPTYARG ) else aCbxPreview.Disable(); - if( aFoundList.Count() ) + if( aFoundList.size() ) aBtnTakeAll.Enable(); else aBtnTakeAll.Disable(); @@ -1238,7 +1232,7 @@ IMPL_LINK( TPGalleryThemeProperties, PreviewTimerHdl, void *, EMPTYARG ) IMPL_LINK( TPGalleryThemeProperties, EndSearchProgressHdl, SearchProgress *, EMPTYARG ) { - if( aFoundList.Count() ) + if( aFoundList.size() ) { aLbxFound.SelectEntryPos( 0 ); aBtnTakeAll.Enable(); diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx index beb0774c7bd0..82e95178a2bb 100644 --- a/cui/source/dialogs/cuigrfflt.cxx +++ b/cui/source/dialogs/cuigrfflt.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <tools/shl.hxx> #include <vcl/msgbox.hxx> #include <sfx2/viewfrm.hxx> @@ -450,7 +447,7 @@ Graphic GraphicFilterEmboss::GetFilteredGraphic( const Graphic& rGraphic, switch( maCtlLight.GetActualRP() ) { - default: DBG_ERROR("svx::GraphicFilterEmboss::GetFilteredGraphic(), unknown Reference Point!" ); + default: OSL_FAIL("svx::GraphicFilterEmboss::GetFilteredGraphic(), unknown Reference Point!" ); case( RP_LT ): nAzim = 4500, nElev = 4500; break; case( RP_MT ): nAzim = 9000, nElev = 4500; break; case( RP_RT ): nAzim = 13500, nElev = 4500; break; diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx index eb80960da935..7c38c610b639 100644 --- a/cui/source/dialogs/cuihyperdlg.cxx +++ b/cui/source/dialogs/cuihyperdlg.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <vcl/settings.hxx> #include <unotools/viewoptions.hxx> diff --git a/cui/source/dialogs/cuiimapwnd.cxx b/cui/source/dialogs/cuiimapwnd.cxx index d52476bf221e..f04dc998bedd 100644 --- a/cui/source/dialogs/cuiimapwnd.cxx +++ b/cui/source/dialogs/cuiimapwnd.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <tools/urlobj.hxx> #include <vcl/msgbox.hxx> #include <vcl/help.hxx> diff --git a/cui/source/dialogs/cuitbxform.cxx b/cui/source/dialogs/cuitbxform.cxx index 4d0f2d91d12f..aa1fd6ab285f 100644 --- a/cui/source/dialogs/cuitbxform.cxx +++ b/cui/source/dialogs/cuitbxform.cxx @@ -26,10 +26,7 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - -#include <string> // HACK: prevent conflict between STLPORT and Workshop headers +#include <string> #include <tools/ref.hxx> #include <tools/shl.hxx> #include <svl/intitem.hxx> diff --git a/cui/source/dialogs/dlgname.cxx b/cui/source/dialogs/dlgname.cxx index ac6cdd178eae..e624b0ef2d5d 100644 --- a/cui/source/dialogs/dlgname.cxx +++ b/cui/source/dialogs/dlgname.cxx @@ -26,11 +26,7 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <tools/ref.hxx> -#include <tools/list.hxx> #include <tools/shl.hxx> #include <tools/debug.hxx> #include <vcl/msgbox.hxx> @@ -227,7 +223,7 @@ void SvxMessDialog::SetButtonText( USHORT nBtnId, const String& rNewTxt ) break; default: - DBG_ERROR( "Falsche Button-Nummer!!!" ); + OSL_FAIL( "Falsche Button-Nummer!!!" ); } } diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index bc16fa576d04..01d01525bc1f 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include "hangulhanjadlg.hxx" #include "hangulhanjadlg.hrc" #include "commonlingui.hxx" @@ -58,15 +55,6 @@ namespace svx { //............................................................................. -/* - using HangulHanjaConversion::eSimpleConversion; - using HangulHanjaConversion::eHangulBracketed; - using HangulHanjaConversion::eHanjaBracketed; - using HangulHanjaConversion::eRubyHanjaAbove; - using HangulHanjaConversion::eRubyHanjaBelow; - using HangulHanjaConversion::eRubyHangulAbove; - using HangulHanjaConversion::eRubyHangulBelow; -*/ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::linguistic2; @@ -918,7 +906,7 @@ namespace svx case HHC::eRubyHangulAbove: m_pHangulAbove->Check(); break; case HHC::eRubyHangulBelow: m_pHangulBelow->Check(); break; default: - DBG_ERROR( "HangulHanjaConversionDialog::SetConversionFormat: unknown type!" ); + OSL_FAIL( "HangulHanjaConversionDialog::SetConversionFormat: unknown type!" ); } } @@ -940,7 +928,7 @@ namespace svx if ( m_pHangulBelow->IsChecked() ) return HHC::eRubyHangulBelow; - DBG_ERROR( "HangulHanjaConversionDialog::GetConversionFormat: no radio checked?" ); + OSL_FAIL( "HangulHanjaConversionDialog::GetConversionFormat: no radio checked?" ); return HHC::eSimpleConversion; } @@ -1758,13 +1746,13 @@ namespace svx //fill found entries into boxes sal_uInt32 nCnt = aEntries.getLength(); - sal_uInt32 n = 0; if( nCnt ) { if( !m_pSuggestions ) m_pSuggestions = new SuggestionList( MAXNUM_SUGGESTIONS ); const OUString* pSugg = aEntries.getConstArray(); + sal_uInt32 n = 0; while( nCnt ) { m_pSuggestions->Set( pSugg[ n ], sal_uInt16( n ) ); diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx index b3983caf9596..3d7942f4dadc 100644 --- a/cui/source/dialogs/hldocntp.cxx +++ b/cui/source/dialogs/hldocntp.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include "hldocntp.hxx" #include <sfx2/viewfrm.hxx> #include <sfx2/docfac.hxx> diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx index a196730d9eb9..770736162f0b 100644 --- a/cui/source/dialogs/hldoctp.cxx +++ b/cui/source/dialogs/hldoctp.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include "cuihyperdlg.hxx" #include <unotools/localfilehelper.hxx> #include <sfx2/filedlghelper.hxx> diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx index 881a75bf5692..4109846bff4c 100644 --- a/cui/source/dialogs/hlinettp.cxx +++ b/cui/source/dialogs/hlinettp.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <unotools/pathoptions.hxx> #include <unotools/useroptions.hxx> #include <svl/adrparse.hxx> diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx index 5312ccbdc830..0a2f7af154d5 100644 --- a/cui/source/dialogs/hlmailtp.cxx +++ b/cui/source/dialogs/hlmailtp.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/frame/FrameSearchFlag.hpp> diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx index 9c0264bfc17b..a19309b4a7d7 100644 --- a/cui/source/dialogs/hlmarkwn.cxx +++ b/cui/source/dialogs/hlmarkwn.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <vcl/wrkwin.hxx> #include <dialmgr.hxx> #include <sfx2/docfile.hxx> diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx index 60dc605de4d0..0b4abd3a03f9 100644 --- a/cui/source/dialogs/hltpbase.cxx +++ b/cui/source/dialogs/hltpbase.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <sfx2/frame.hxx> #include <sfx2/viewfrm.hxx> #include <sot/formats.hxx> @@ -535,7 +532,7 @@ BOOL SvxHyperlinkTabPageBase::FileExists( const INetURLObject& rURL ) } catch( ... ) { - DBG_ERROR( "FileExists: ucb error" ); + OSL_FAIL( "FileExists: ucb error" ); } } diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx index be532c66f482..1b9b63bf8231 100644 --- a/cui/source/dialogs/hyphen.cxx +++ b/cui/source/dialogs/hyphen.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include "hyphen.hxx" #include "hyphen.hrc" #include "cuires.hrc" @@ -40,7 +37,6 @@ #include <svtools/langtab.hxx> #include <svx/dialmgr.hxx> #include <svx/dlgutil.hxx> -#include <tools/list.hxx> #include <tools/shl.hxx> #include <vcl/msgbox.hxx> diff --git a/cui/source/dialogs/hyphen.src b/cui/source/dialogs/hyphen.src index 5a727fb096df..06547352b35d 100755 --- a/cui/source/dialogs/hyphen.src +++ b/cui/source/dialogs/hyphen.src @@ -31,8 +31,6 @@ String RID_SVXSTR_HMERR_CHECKINSTALL { - /* ### ACHTUNG: Neuer Text in Resource? ist für die Prüfung nicht verfügbar. \nÃœberprüfen Sie bitte Ihre Installation und installieren Sie \ngegebenenfalls die gewünschte Sprache : ist f³r die Pr³fung nicht verf³gbar. \nšberpr³fen Sie bitte Ihre Installation und installieren Sie \ngegebenenfalls die gew³nschte Sprache */ - /* ### ACHTUNG: Neuer Text in Resource? ist für die Prüfung nicht verfügbar. \nÃœberprüfen Sie bitte Ihre Installation und installieren Sie \ngegebenenfalls die gewünschte Sprache : ist f³r die Pr³fung nicht verf³gbar. \nšberpr³fen Sie bitte Ihre Installation und installieren Sie \ngegebenenfalls die gew³nschte Sprache */ Text [ en-US ] = "is not available for spellchecking\nPlease check your installation and install the desired language\n" ; }; diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx index f8822c8d5f6f..ddeb7040bbdd 100644 --- a/cui/source/dialogs/iconcdlg.cxx +++ b/cui/source/dialogs/iconcdlg.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <sfx2/app.hxx> #include <tools/rc.h> #include <tools/shl.hxx> @@ -877,6 +874,7 @@ void IconChoiceDialog::ActivatePageImpl () DBG_ASSERT( !maPageList.empty(), "keine Pages angemeldet" ); IconChoicePageData* pData = GetPageData ( mnCurrentPageId ); DBG_ASSERT( pData, "Id nicht bekannt" ); + BOOL bReadOnly = FALSE; if ( pData ) { if ( !pData->pPage ) @@ -916,11 +914,11 @@ void IconChoiceDialog::ActivatePageImpl () if ( pExampleSet ) pData->pPage->ActivatePage( *pExampleSet ); + SetHelpId( pData->pPage->GetHelpId() ); + bReadOnly = pData->pPage->IsReadOnly(); } - SetHelpId( pData->pPage->GetHelpId() ); - BOOL bReadOnly = pData->pPage->IsReadOnly(); if ( bReadOnly || bHideResetBtn ) aResetBtn.Hide(); else diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx index 935876869f5d..041ef64e5d26 100644 --- a/cui/source/dialogs/insdlg.cxx +++ b/cui/source/dialogs/insdlg.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp> #include <com/sun/star/ui/dialogs/XFilePicker.hpp> @@ -367,7 +364,7 @@ short SvInsertOleDlg::Execute() } else { - OSL_ASSERT( "Can not get InteractionHandler!\n" ); + OSL_FAIL( "Can not get InteractionHandler!\n" ); aMedium.realloc( 1 ); } @@ -679,7 +676,7 @@ short SvInsertAppletDialog::Execute() } catch ( uno::Exception& ) { - DBG_ERROR( "No Applet!" ); + OSL_FAIL( "No Applet!" ); } } else @@ -729,7 +726,7 @@ short SvInsertAppletDialog::Execute() } catch ( uno::Exception& ) { - DBG_ERROR( "No Applet!" ); + OSL_FAIL( "No Applet!" ); } } } @@ -912,7 +909,7 @@ short SfxInsertFloatingFrameDialog::Execute() } catch ( uno::Exception& ) { - DBG_ERROR( "No IFrame!" ); + OSL_FAIL( "No IFrame!" ); } } else @@ -999,7 +996,7 @@ short SfxInsertFloatingFrameDialog::Execute() } catch ( uno::Exception& ) { - DBG_ERROR( "No IFrame!" ); + OSL_FAIL( "No IFrame!" ); } } } diff --git a/cui/source/dialogs/insrc.cxx b/cui/source/dialogs/insrc.cxx index 588b105d26d5..e6653d01b6b9 100644 --- a/cui/source/dialogs/insrc.cxx +++ b/cui/source/dialogs/insrc.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <dialmgr.hxx> #include <svx/svxdlg.hxx> #include <cuires.hrc> diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx index a07b29722747..eb1fe3432895 100644 --- a/cui/source/dialogs/linkdlg.cxx +++ b/cui/source/dialogs/linkdlg.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <linkdlg.hxx> #include <vcl/svapp.hxx> #include "helpid.hrc" @@ -115,7 +112,7 @@ SvBaseLinksDlg::SvBaseLinksDlg( Window * pParent, LinkManager* pMgr, BOOL bHtml aTbLinks.SetTabs( &nTabs[0], MAP_APPFONT ); aTbLinks.Resize(); // OS: Hack fuer richtige Selektion - //JP 24.02.99: UpdateTimer fuer DDE-/Grf-Links, auf die gewarted wird + // UpdateTimer fuer DDE-/Grf-Links, auf die gewarted wird aUpdateTimer.SetTimeoutHdl( LINK( this, SvBaseLinksDlg, UpdateWaitingHdl ) ); aUpdateTimer.SetTimeout( 1000 ); diff --git a/cui/source/dialogs/multifil.cxx b/cui/source/dialogs/multifil.cxx index 3470d22188c2..4c34d9338fe8 100644 --- a/cui/source/dialogs/multifil.cxx +++ b/cui/source/dialogs/multifil.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <tools/shl.hxx> #include <vcl/msgbox.hxx> diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx index ffdc3834dc6c..030a88b617d8 100644 --- a/cui/source/dialogs/multipat.cxx +++ b/cui/source/dialogs/multipat.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <tools/debug.hxx> #include <tools/urlobj.hxx> diff --git a/cui/source/dialogs/newtabledlg.cxx b/cui/source/dialogs/newtabledlg.cxx index cdd36aeb1b1b..b387b4f87369 100644 --- a/cui/source/dialogs/newtabledlg.cxx +++ b/cui/source/dialogs/newtabledlg.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include "cuires.hrc" diff --git a/cui/source/dialogs/passwdomdlg.cxx b/cui/source/dialogs/passwdomdlg.cxx index f10ac3586baf..e4bd2dd52de7 100644 --- a/cui/source/dialogs/passwdomdlg.cxx +++ b/cui/source/dialogs/passwdomdlg.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include "passwdomdlg.hrc" diff --git a/cui/source/dialogs/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx index 1360e9093276..007ffa82762b 100644 --- a/cui/source/dialogs/pastedlg.cxx +++ b/cui/source/dialogs/pastedlg.cxx @@ -26,8 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" #include <com/sun/star/embed/Aspects.hpp> #include <pastedlg.hxx> diff --git a/cui/source/dialogs/plfilter.cxx b/cui/source/dialogs/plfilter.cxx index e94528f18d91..e00ed70cc1a7 100644 --- a/cui/source/dialogs/plfilter.cxx +++ b/cui/source/dialogs/plfilter.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <set> #include <map> #include <unotools/processfactory.hxx> diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx index ab4fdb0d3f1f..0255e3c9fc55 100644 --- a/cui/source/dialogs/postdlg.cxx +++ b/cui/source/dialogs/postdlg.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <tools/shl.hxx> #include <tools/date.hxx> diff --git a/cui/source/dialogs/postdlg.src b/cui/source/dialogs/postdlg.src index c8262ab5f7a1..2a3dc5e98a00 100644 --- a/cui/source/dialogs/postdlg.src +++ b/cui/source/dialogs/postdlg.src @@ -121,7 +121,6 @@ ModalDialog RID_SVXDLG_POSTIT }; String STR_NOTIZ_INSERT { - /* ### ACHTUNG: Neuer Text in Resource? Notiz einfügen : Notiz einf³gen */ Text [ en-US ] = "Insert note" ; }; }; diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index 355017889b65..40b5ecaf20e1 100644 --- a/cui/source/dialogs/scriptdlg.cxx +++ b/cui/source/dialogs/scriptdlg.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <memory> #include <sfx2/objsh.hxx> diff --git a/cui/source/dialogs/sdrcelldlg.cxx b/cui/source/dialogs/sdrcelldlg.cxx index 44ae64458d1f..52b9f43bd0e8 100644 --- a/cui/source/dialogs/sdrcelldlg.cxx +++ b/cui/source/dialogs/sdrcelldlg.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <svl/cjkoptions.hxx> #include <svx/flagsdef.hxx> #include "cuires.hrc" diff --git a/cui/source/dialogs/sdrcelldlg.src b/cui/source/dialogs/sdrcelldlg.src index 223028d45b40..7f03cc9010bc 100644 --- a/cui/source/dialogs/sdrcelldlg.src +++ b/cui/source/dialogs/sdrcelldlg.src @@ -100,7 +100,6 @@ TabDialog RID_SVX_FORMAT_CELLS_DLG { Pos = MAP_APPFONT ( 169 , 151 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; - /* ### ACHTUNG: Neuer Text in Resource? Zurück : Zur³ck */ Text [ de ] = "Zurück" ; Text [ en-US ] = "Return" ; TabStop = TRUE ; diff --git a/cui/source/dialogs/showcols.cxx b/cui/source/dialogs/showcols.cxx index 95f631ce03d8..f5b9affb4d80 100644 --- a/cui/source/dialogs/showcols.cxx +++ b/cui/source/dialogs/showcols.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include "showcols.hxx" #include "fmsearch.hrc" @@ -86,7 +83,7 @@ IMPL_LINK( FmShowColsDialog, OnClickedOk, Button*, EMPTYARG ) } catch(...) { - DBG_ERROR("FmShowColsDialog::OnClickedOk Exception occurred!"); + OSL_FAIL("FmShowColsDialog::OnClickedOk Exception occurred!"); } } } @@ -120,11 +117,11 @@ void FmShowColsDialog::SetColumns(const ::com::sun::star::uno::Reference< ::com: ::rtl::OUString sName; xCurCol->getPropertyValue(CUIFM_PROP_LABEL) >>= sName; - sCurName = (const sal_Unicode*)sName; + sCurName = sName; } catch(...) { - DBG_ERROR("FmShowColsDialog::SetColumns Exception occurred!"); + OSL_FAIL("FmShowColsDialog::SetColumns Exception occurred!"); } // if the col is hidden, put it into the list diff --git a/cui/source/dialogs/splitcelldlg.cxx b/cui/source/dialogs/splitcelldlg.cxx index ffa88f5bf3c7..81591e13317f 100644 --- a/cui/source/dialogs/splitcelldlg.cxx +++ b/cui/source/dialogs/splitcelldlg.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <sfx2/dispatch.hxx> #include <svl/intitem.hxx> #include <svl/eitem.hxx> diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx index 85a4b8a9a02c..c503061a1f44 100644 --- a/cui/source/dialogs/srchxtra.cxx +++ b/cui/source/dialogs/srchxtra.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include "srchxtra.hxx" diff --git a/cui/source/dialogs/svuidlg.src b/cui/source/dialogs/svuidlg.src index dc3469a468a5..6a943a3530f2 100644 --- a/cui/source/dialogs/svuidlg.src +++ b/cui/source/dialogs/svuidlg.src @@ -127,7 +127,6 @@ ModalDialog MD_UPDATE_BASELINKS { Pos = MAP_APPFONT ( 83 , 6 ) ; Size = MAP_APPFONT ( 63 , 10 ) ; - /* ### ACHTUNG: Neuer Text in Resource? Element: : Verknüpfungen */ Text [ en-US ] = "Element:" ; }; FixedText FT_TYPE @@ -211,7 +210,6 @@ ModalDialog MD_UPDATE_BASELINKS { Pos = MAP_APPFONT ( 133 , 150 ) ; Size = MAP_APPFONT ( 60 , 10 ) ; - /* ### ACHTUNG: Neuer Text in Resource? ~Manuell : Ma~nuell */ Text [ en-US ] = "Ma~nual" ; }; FixedText FT_FULL_FILE_NAME diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx index 0fa4b8dbaea6..6c28969d43f8 100644 --- a/cui/source/dialogs/thesdlg.cxx +++ b/cui/source/dialogs/thesdlg.cxx @@ -26,10 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove - -#include "precompiled_cui.hxx" - #include "thesdlg.hrc" #include "thesdlg.hxx" #include "thesdlg_impl.hxx" diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx index 38a03773c7f7..42eda26ff2ff 100644 --- a/cui/source/dialogs/zoom.cxx +++ b/cui/source/dialogs/zoom.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <tools/shl.hxx> @@ -142,7 +139,7 @@ void SvxZoomDialog::SetButtonText( USHORT nBtnId, const String& rNewTxt ) break; default: - DBG_ERROR( "wrong button number" ); + OSL_FAIL( "wrong button number" ); } } @@ -165,7 +162,7 @@ void SvxZoomDialog::HideButton( USHORT nBtnId ) break; default: - DBG_ERROR( "Falsche Button-Nummer!!!" ); + OSL_FAIL( "Falsche Button-Nummer!!!" ); } } @@ -427,7 +424,7 @@ IMPL_LINK( SvxZoomDialog, ViewLayoutUserHdl, RadioButton *, pBtn ) } else { - DBG_ERROR( "Wrong Button" ); + OSL_FAIL( "Wrong Button" ); return 0; } @@ -509,7 +506,7 @@ IMPL_LINK( SvxZoomDialog, OKHdl, Button *, pBtn ) } else { - DBG_ERROR( "Wrong Button" ); + OSL_FAIL( "Wrong Button" ); return 0; } pOutSet = new SfxItemSet( rSet ); |