diff options
| author | Jacek Wolszczak <shutdownrunner@gmail.com> | 2011-05-10 09:56:23 +0200 |
|---|---|---|
| committer | Kohei Yoshida <kyoshida@novell.com> | 2011-05-17 16:59:27 -0400 |
| commit | 622db59048fbcc04a9ff950c2a2bcdd458c7df87 (patch) | |
| tree | c776ffbeaba8a7b23c9b176a94b7a93d618246f9 /sw/source/ui/lingu | |
| parent | 03cf5c4a5d74dbeb151cf27c26adc2b9a1163cb8 (diff) | |
Replace #ifdef DEBUG with #if OSL_DEBUG_LEVEL > 1
Diffstat (limited to 'sw/source/ui/lingu')
| -rw-r--r-- | sw/source/ui/lingu/hhcwrp.cxx | 10 | ||||
| -rw-r--r-- | sw/source/ui/lingu/olmenu.cxx | 5 |
2 files changed, 6 insertions, 9 deletions
diff --git a/sw/source/ui/lingu/hhcwrp.cxx b/sw/source/ui/lingu/hhcwrp.cxx index 715d7c2f1851..1eddd5a149ac 100644 --- a/sw/source/ui/lingu/hhcwrp.cxx +++ b/sw/source/ui/lingu/hhcwrp.cxx @@ -304,7 +304,7 @@ void SwHHCWrapper::ChangeText( const String &rNewText, { nChgLen = nIndex - nChgPos; nConvChgLen = nPos - nConvChgPos; -#ifdef DEBUG +#if OSL_DEBUG_LEVEL > 1 String aInOrig( rOrigText.copy( nChgPos, nChgLen ) ); #endif String aInNew( rNewText.Copy( nConvChgPos, nConvChgLen ) ); @@ -314,7 +314,7 @@ void SwHHCWrapper::ChangeText( const String &rNewText, OSL_ENSURE( rWrtShell.GetCrsr()->HasMark(), "cursor misplaced (nothing selected)" ); rWrtShell.GetCrsr()->GetMark()->nContent.Assign( pStartTxtNode, nChgInNodeStartIndex ); rWrtShell.GetCrsr()->GetPoint()->nContent.Assign( pStartTxtNode, nChgInNodeStartIndex + nChgLen ); -#ifdef DEBUG +#if OSL_DEBUG_LEVEL > 1 String aSelTxt1( rWrtShell.GetSelTxt() ); #endif @@ -369,7 +369,7 @@ void SwHHCWrapper::ChangeText_impl( const String &rNewText, sal_Bool bKeepAttrib // restore those for the new text rWrtShell.GetCurAttr( aItemSet ); -#ifdef DEBUG +#if OSL_DEBUG_LEVEL > 1 String aSelTxt1( rWrtShell.GetSelTxt() ); #endif rWrtShell.Delete(); @@ -380,7 +380,7 @@ void SwHHCWrapper::ChangeText_impl( const String &rNewText, sal_Bool bKeepAttrib rWrtShell.GetCrsr()->SetMark(); SwPosition *pMark = rWrtShell.GetCrsr()->GetMark(); pMark->nContent = pMark->nContent.GetIndex() - rNewText.Len(); -#ifdef DEBUG +#if OSL_DEBUG_LEVEL > 1 String aSelTxt2( rWrtShell.GetSelTxt() ); #endif @@ -497,7 +497,7 @@ void SwHHCWrapper::ReplaceUnit( pRuby->SetPosition( bRubyBelow ); pRuby->SetAdjustment( RubyAdjust_CENTER ); -#ifdef DEBUG +#if OSL_DEBUG_LEVEL > 1 SwPaM *pPaM = rWrtShell.GetCrsr(); (void)pPaM; #endif diff --git a/sw/source/ui/lingu/olmenu.cxx b/sw/source/ui/lingu/olmenu.cxx index e01ecfdfb9ec..550b706e2ee6 100644 --- a/sw/source/ui/lingu/olmenu.cxx +++ b/sw/source/ui/lingu/olmenu.cxx @@ -166,7 +166,7 @@ LanguageType lcl_CheckLanguage( aLangList[2] = rSettings.GetLanguage(); // en-US aLangList[3] = LANGUAGE_ENGLISH_US; -#ifdef DEBUG +#if OSL_DEBUG_LEVEL > 1 lang::Locale a0( SvxCreateLocale( aLangList[0] ) ); lang::Locale a1( SvxCreateLocale( aLangList[1] ) ); lang::Locale a2( SvxCreateLocale( aLangList[2] ) ); @@ -327,9 +327,6 @@ static Image lcl_GetImageFromPngUrl( const OUString &rFileUrl ) Image aRes; OUString aTmp; osl::FileBase::getSystemPathFromFileURL( rFileUrl, aTmp ); -#if defined(WNT) - -#endif Graphic aGraphic; const String aFilterName( RTL_CONSTASCII_USTRINGPARAM( IMP_PNG ) ); if( GRFILTER_OK == GraphicFilter::LoadGraphic( aTmp, aFilterName, aGraphic ) ) |