mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename sfx2 log area to sfx

Browse Source 
not like there never was a sfx1 anyway... perhaps we should rename the
whole module...

Change-Id: I50c7302f84f15a1d778eca19507694a3bd070b22
This commit is contained in:
Michael Stahl 2013-07-08 18:44:42 +02:00
parent 969bc57244
commit d38cb53e3b
33 changed files with 160 additions and 160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
include/sal/log-areas.dox
View File

@ -194,18 +194,18 @@ certain functionality.
@li @c sdext.pdfimport.pdfparse
@li @c sdext.presenter
@section sfx2
@section sfx
@li @c sfx2
@li @c sfx2.appl
@li @c sfx2.bastyp
@li @c sfx2.config
@li @c sfx2.control
@li @c sfx2.dialog
@li @c sfx2.doc
@li @c sfx2.notify
@li @c sfx2.sidebar
@li @c sfx2.view
@li @c sfx
@li @c sfx.appl
@li @c sfx.bastyp
@li @c sfx.config
@li @c sfx.control
@li @c sfx.dialog
@li @c sfx.doc
@li @c sfx.notify
@li @c sfx.sidebar
@li @c sfx.view
@section slideshow

14
sfx2/source/appl/app.cxx
View File

@ -148,7 +148,7 @@ SfxApplication* SfxApplication::GetOrCreate()
::osl::MutexGuard aGuard(theApplicationMutex::get());
if (!pApp)
{
SAL_INFO( "sfx2.appl", "sfx2 (mb93783) ::SfxApplication::SetApp" );
SAL_INFO( "sfx.appl", "sfx2 (mb93783) ::SfxApplication::SetApp" );
pApp = new SfxApplication;
@ -182,7 +182,7 @@ SfxApplication* SfxApplication::GetOrCreate()
SfxApplication::SfxApplication()
: pAppData_Impl( 0 )
{
SAL_INFO( "sfx2.appl", "sfx2 (mb93783) ::SfxApplication::SfxApplication" );
SAL_INFO( "sfx.appl", "sfx2 (mb93783) ::SfxApplication::SfxApplication" );
SetName( OUString("StarOffice") );
SvtViewOptions::AcquireOptions();
@ -190,7 +190,7 @@ SfxApplication::SfxApplication()
pAppData_Impl = new SfxAppData_Impl( this );
pAppData_Impl->m_xImeStatusWindow->init();
SAL_INFO( "sfx2.appl", "{ initialize DDE" );
SAL_INFO( "sfx.appl", "{ initialize DDE" );
sal_Bool bOk = InitializeDde();
@ -217,7 +217,7 @@ SfxApplication::SfxApplication()
pBasic = new BasicDLL;
StarBASIC::SetGlobalErrorHdl( LINK( this, SfxApplication, GlobalBasicErrorHdl_Impl ) );
#endif
SAL_INFO( "sfx2.appl", "} initialize DDE" );
SAL_INFO( "sfx.appl", "} initialize DDE" );
}
SfxApplication::~SfxApplication()
@ -570,7 +570,7 @@ SfxApplication::ChooseScript()
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
if ( pFact )
{
SAL_INFO( "sfx2.appl", "create selector dialog");
SAL_INFO( "sfx.appl", "create selector dialog");
const SfxViewFrame* pViewFrame = SfxViewFrame::Current();
const SfxFrame* pFrame = pViewFrame ? &pViewFrame->GetFrame() : NULL;
@ -579,11 +579,11 @@ SfxApplication::ChooseScript()
AbstractScriptSelectorDialog* pDlg =
pFact->CreateScriptSelectorDialog( NULL, sal_False, xFrame );
SAL_INFO( "sfx2.appl", "done, now exec it");
SAL_INFO( "sfx.appl", "done, now exec it");
sal_uInt16 nRet = pDlg->Execute();
SAL_INFO( "sfx2.appl", "has returned");
SAL_INFO( "sfx.appl", "has returned");
if ( nRet == RET_OK )
{

2
sfx2/source/appl/appcfg.cxx
View File

@ -864,7 +864,7 @@ void SfxApplication::SetOptions(const SfxItemSet &rSet)
case SvtPathOptions::PATH_TEMPLATE: aPathOptions.SetTemplatePath( sValue );break;
case SvtPathOptions::PATH_USERCONFIG: aPathOptions.SetUserConfigPath( sValue );break;
case SvtPathOptions::PATH_WORK: aPathOptions.SetWorkPath( sValue );break;
default: SAL_WARN( "sfx2.appl", "SfxApplication::SetOptions_Impl() Invalid path number found for set directories!" );
default: SAL_WARN( "sfx.appl", "SfxApplication::SetOptions_Impl() Invalid path number found for set directories!" );
}
}
}

2
sfx2/source/appl/appdde.cxx
View File

@ -104,7 +104,7 @@ namespace
}
catch( const uno::Exception& )
{
SAL_WARN( "sfx2.appl", "Any other exception" );
SAL_WARN( "sfx.appl", "Any other exception" );
}
return bRet;

2
sfx2/source/appl/appinit.cxx
View File

@ -208,7 +208,7 @@ String GetSpecialCharsForEdit(Window* pParent, const Font& rFont)
bool SfxApplication::Initialize_Impl()
{
SAL_INFO( "sfx2.appl", "sfx2 (mb93783) ::SfxApplication::Initialize_Impl" );
SAL_INFO( "sfx.appl", "sfx2 (mb93783) ::SfxApplication::Initialize_Impl" );
#ifdef TLX_VALIDATE
StgIo::SetErrorLink( LINK( this, SfxStorageErrHdl, Error ) );

4
sfx2/source/appl/appserv.cxx
View File

@ -189,7 +189,7 @@ namespace
}
catch (const Exception & e)
{
SAL_INFO( "sfx2.appl",
SAL_INFO( "sfx.appl",
"trying to load bibliography database, caught " << e.Message);
}
}
@ -1094,7 +1094,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
}
catch( const ::com::sun::star::uno::Exception& )
{
SAL_WARN( "sfx2.appl", "SfxApplication::OfaExec_Impl(SID_MORE_DICTIONARIES): caught an exception!" );
SAL_WARN( "sfx.appl", "SfxApplication::OfaExec_Impl(SID_MORE_DICTIONARIES): caught an exception!" );
}
break;
}

2
sfx2/source/appl/fileobj.cxx
View File

@ -549,7 +549,7 @@ IMPL_LINK( SvFileObject, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg )
}
else
{
SAL_WARN( "sfx2.appl", "SvFileObject::DialogClosedHdl(): wrong file type" );
SAL_WARN( "sfx.appl", "SvFileObject::DialogClosedHdl(): wrong file type" );
}
if ( aEndEditLink.IsSet() )

4
sfx2/source/appl/module.cxx
View File

@ -197,7 +197,7 @@ void SfxModule::RegisterChildWindow(SfxChildWinFactory *pFact)
if (pFact->nId == (*pImpl->pFactArr)[nFactory]->nId)
{
pImpl->pFactArr->erase( pImpl->pFactArr->begin() + nFactory );
SAL_WARN("sfx2.appl", "ChildWindow registered multiple times!");
SAL_WARN("sfx.appl", "ChildWindow registered multiple times!");
return;
}
}
@ -391,7 +391,7 @@ FieldUnit SfxModule::GetCurrentFieldUnit()
eUnit = (FieldUnit)( (SfxUInt16Item*)pItem )->GetValue();
}
else
SAL_WARN( "sfx2.appl", "GetModuleFieldUnit(): no module found" );
SAL_WARN( "sfx.appl", "GetModuleFieldUnit(): no module found" );
return eUnit;
}

12
sfx2/source/appl/newhelp.cxx
View File

@ -2200,7 +2200,7 @@ void SfxHelpTextWindow_Impl::InitOnStartupBox( bool bOnlyText )
}
catch( Exception& )
{
SAL_WARN( "sfx2.appl", "SfxHelpTextWindow_Impl::InitOnStartupBox(): unexpected exception" );
SAL_WARN( "sfx.appl", "SfxHelpTextWindow_Impl::InitOnStartupBox(): unexpected exception" );
}
sModuleName = String( sTemp );
}
@ -2483,7 +2483,7 @@ IMPL_LINK( SfxHelpTextWindow_Impl, CheckHdl, CheckBox*, pBox )
}
catch( Exception& )
{
SAL_WARN( "sfx2.appl", "SfxHelpTextWindow_Impl::CheckHdl(): unexpected exception" );
SAL_WARN( "sfx.appl", "SfxHelpTextWindow_Impl::CheckHdl(): unexpected exception" );
}
}
@ -2644,7 +2644,7 @@ void SfxHelpTextWindow_Impl::GetFocus()
}
catch( Exception& )
{
SAL_WARN( "sfx2.appl", "SfxHelpTextWindow_Impl::GetFocus(): unexpected exception" );
SAL_WARN( "sfx.appl", "SfxHelpTextWindow_Impl::GetFocus(): unexpected exception" );
}
}
}
@ -2741,13 +2741,13 @@ void SfxHelpTextWindow_Impl::SetPageStyleHeaderOff() const
}
catch( Exception& )
{
SAL_WARN( "sfx2.appl", "SfxHelpTextWindow_Impl::SetPageStyleHeaderOff(): unexpected exception" );
SAL_WARN( "sfx.appl", "SfxHelpTextWindow_Impl::SetPageStyleHeaderOff(): unexpected exception" );
}
#ifdef DBG_UTIL
if ( !bSetOff )
{
SAL_WARN( "sfx2.appl", "SfxHelpTextWindow_Impl::SetPageStyleHeaderOff(): set off failed" );
SAL_WARN( "sfx.appl", "SfxHelpTextWindow_Impl::SetPageStyleHeaderOff(): set off failed" );
}
#endif
}
@ -3365,7 +3365,7 @@ void SfxHelpWindow_Impl::CloseWindow()
}
catch( Exception& )
{
SAL_WARN( "sfx2.appl", "SfxHelpWindow_Impl::CloseWindow(): caught an exception" );
SAL_WARN( "sfx.appl", "SfxHelpWindow_Impl::CloseWindow(): caught an exception" );
}
}

8
sfx2/source/appl/sfxhelp.cxx
View File

@ -188,7 +188,7 @@ sal_Bool GetHelpAnchor_Impl( const OUString& _rURL, OUString& _rAnchor )
}
else
{
SAL_WARN( "sfx2.appl", "Property 'AnchorName' is missing" );
SAL_WARN( "sfx.appl", "Property 'AnchorName' is missing" );
}
}
catch (const ::com::sun::star::uno::Exception&)
@ -282,7 +282,7 @@ OUString getDefaultModule_Impl()
sDefaultModule = "sdatabase";
else
{
SAL_WARN( "sfx2.appl", "getDefaultModule_Impl(): no module installed" );
SAL_WARN( "sfx.appl", "getDefaultModule_Impl(): no module installed" );
}
return sDefaultModule;
}
@ -307,7 +307,7 @@ OUString getCurrentModuleIdentifier_Impl()
}
catch (const Exception&)
{
SAL_WARN( "sfx2.appl", "SfxHelp::getCurrentModuleIdentifier_Impl(): exception of XModuleManager::identify()" );
SAL_WARN( "sfx.appl", "SfxHelp::getCurrentModuleIdentifier_Impl(): exception of XModuleManager::identify()" );
}
}
@ -338,7 +338,7 @@ OUString SfxHelp::GetHelpModuleName_Impl()
}
catch (const Exception&)
{
SAL_WARN( "sfx2.appl", "SfxHelp::GetHelpModuleName_Impl(): exception of XNameAccess::getByName()" );
SAL_WARN( "sfx.appl", "SfxHelp::GetHelpModuleName_Impl(): exception of XNameAccess::getByName()" );
}
}

2
sfx2/source/appl/shutdownicon.cxx
View File

@ -664,7 +664,7 @@ void SAL_CALL ShutdownIcon::disposing( const ::com::sun::star::lang::EventObject
void SAL_CALL ShutdownIcon::queryTermination( const ::com::sun::star::lang::EventObject& )
throw(::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException)
{
SAL_INFO("sfx2.appl", "ShutdownIcon::queryTermination: veto is " << m_bVeto);
SAL_INFO("sfx.appl", "ShutdownIcon::queryTermination: veto is " << m_bVeto);
::osl::ClearableMutexGuard aGuard( m_aMutex );
if ( m_bVeto )

8
sfx2/source/bastyp/fltfnc.cxx
View File

@ -791,7 +791,7 @@ const SfxFilter* SfxFilterMatcher::GetFilter4FilterName( const String& rName, Sf
sal_uInt16 nIndex = aName.SearchAscii(": ");
if ( nIndex != STRING_NOTFOUND )
{
SAL_WARN( "sfx2.bastyp", "Old filter name used!");
SAL_WARN( "sfx.bastyp", "Old filter name used!");
aName = rName.Copy( nIndex + 2 );
}
@ -1073,7 +1073,7 @@ void SfxFilterContainer::ReadSingleFilter_Impl(
sal_Int32 nStartRealName = sFilterName.indexOf( ": ", 0 );
if( nStartRealName != -1 )
{
SAL_WARN( "sfx2.bastyp", "Old format, not supported!");
SAL_WARN( "sfx.bastyp", "Old format, not supported!");
sFilterName = sFilterName.copy( nStartRealName+2 );
}
@ -1122,7 +1122,7 @@ void SfxFilterContainer::ReadSingleFilter_Impl(
void SfxFilterContainer::ReadFilters_Impl( sal_Bool bUpdate )
{
SAL_INFO( "sfx2.bastyp", "sfx2 (as96863) ::SfxFilterContainer::ReadFilters" );
SAL_INFO( "sfx.bastyp", "sfx2 (as96863) ::SfxFilterContainer::ReadFilters" );
if ( !pFilterArr )
CreateFilterArr();
@ -1180,7 +1180,7 @@ void SfxFilterContainer::ReadFilters_Impl( sal_Bool bUpdate )
}
catch(const uno::Exception&)
{
SAL_WARN( "sfx2.bastyp", "SfxFilterContainer::ReadFilter()\nException detected. Possible not all filters could be cached.\n" );
SAL_WARN( "sfx.bastyp", "SfxFilterContainer::ReadFilter()\nException detected. Possible not all filters could be cached.\n" );
}
if ( bUpdate )

16
sfx2/source/bastyp/helper.cxx
View File

@ -77,11 +77,11 @@ std::vector<OUString> SfxContentHelper::GetResultSet( const OUString& rURL )
}
catch( const ucb::CommandAbortedException& )
{
SAL_WARN( "sfx2.bastyp", "GetResultSet: CommandAbortedException" );
SAL_WARN( "sfx.bastyp", "GetResultSet: CommandAbortedException" );
}
catch( const uno::Exception& )
{
SAL_WARN( "sfx2.bastyp", "GetResultSet: Any other exception" );
SAL_WARN( "sfx.bastyp", "GetResultSet: Any other exception" );
}
@ -106,17 +106,17 @@ std::vector<OUString> SfxContentHelper::GetResultSet( const OUString& rURL )
}
catch( const ucb::CommandAbortedException& )
{
SAL_WARN( "sfx2.bastyp", "XContentAccess::next(): CommandAbortedException" );
SAL_WARN( "sfx.bastyp", "XContentAccess::next(): CommandAbortedException" );
}
catch( const uno::Exception& )
{
SAL_WARN( "sfx2.bastyp", "XContentAccess::next(): Any other exception" );
SAL_WARN( "sfx.bastyp", "XContentAccess::next(): Any other exception" );
}
}
}
catch( const uno::Exception& e )
{
SAL_WARN( "sfx2.bastyp", "GetResultSet: Any other exception: " << e.Message );
SAL_WARN( "sfx.bastyp", "GetResultSet: Any other exception: " << e.Message );
}
return aList;
@ -232,7 +232,7 @@ bool SfxContentHelper::IsHelpErrorDocument( const OUString& rURL )
comphelper::getProcessComponentContext() );
if ( !( aCnt.getPropertyValue( "IsErrorDocument" ) >>= bRet ) )
{
SAL_WARN( "sfx2.bastyp", "Property 'IsErrorDocument' is missing" );
SAL_WARN( "sfx.bastyp", "Property 'IsErrorDocument' is missing" );
}
}
catch( const uno::Exception& )
@ -256,11 +256,11 @@ sal_Int64 SfxContentHelper::GetSize( const OUString& rContent )
}
catch( const ucb::CommandAbortedException& )
{
SAL_WARN( "sfx2.bastyp", "CommandAbortedException" );
SAL_WARN( "sfx.bastyp", "CommandAbortedException" );
}
catch( const uno::Exception& )
{
SAL_WARN( "sfx2.bastyp", "Any other exception" );
SAL_WARN( "sfx.bastyp", "Any other exception" );
}
return nSize;
}

6
sfx2/source/config/evntconf.cxx
View File

@ -209,7 +209,7 @@ uno::Any CreateEventData_Impl( const SvxMacro *pMacro )
}
else
{
SAL_WARN( "sfx2.config", "CreateEventData_Impl(): ScriptType not supported!");
SAL_WARN( "sfx.config", "CreateEventData_Impl(): ScriptType not supported!");
}
}
else
@ -249,11 +249,11 @@ void PropagateEvent_Impl( SfxObjectShell *pDoc, OUString aEventName, const SvxMa
}
catch( const ::com::sun::star::lang::IllegalArgumentException& )
{
SAL_WARN( "sfx2.config", "PropagateEvents_Impl: caught IllegalArgumentException" );
SAL_WARN( "sfx.config", "PropagateEvents_Impl: caught IllegalArgumentException" );
}
catch( const ::com::sun::star::container::NoSuchElementException& )
{
SAL_WARN( "sfx2.config", "PropagateEvents_Impl: caught NoSuchElementException" );
SAL_WARN( "sfx.config", "PropagateEvents_Impl: caught NoSuchElementException" );
}
}
else {

4
sfx2/source/control/dispatch.cxx
View File

@ -1462,7 +1462,7 @@ void SfxDispatcher::_Update_Impl( sal_Bool bUIActive, sal_Bool bIsMDIApp, sal_Bo
{
sal_uInt32 nId = pIFace->GetChildWindowId(nNo);
const SfxSlot *pSlot = pSlotPool->GetSlot( (sal_uInt16) nId );
SAL_WARN_IF( !pSlot, "sfx2.control", "Childwindow slot missing: " << nId );
SAL_WARN_IF( !pSlot, "sfx.control", "Childwindow slot missing: " << nId );
if ( bReadOnlyShell )
{
// only show ChildWindows if their slot is allowed for readonly documents
@ -1659,7 +1659,7 @@ void SfxDispatcher::FlushImpl()
for (sal_uInt16 n=0; n<SFX_OBJECTBAR_MAX; n++)
pImp->aFixedObjBars[n].nResId = 0;
SAL_INFO("sfx2.control", "SfxDispatcher(" << this << ")::Flush() done");
SAL_INFO("sfx.control", "SfxDispatcher(" << this << ")::Flush() done");
}
//--------------------------------------------------------------------

6
sfx2/source/dialog/dinfdlg.cxx
View File

@ -424,13 +424,13 @@ void SfxDocumentInfoItem::UpdateDocumentInfo(
}
catch ( Exception& )
{
SAL_WARN( "sfx2.dialog", "SfxDocumentInfoItem::updateDocumentInfo(): exception while adding custom properties" );
SAL_WARN( "sfx.dialog", "SfxDocumentInfoItem::updateDocumentInfo(): exception while adding custom properties" );
}
}
}
catch ( Exception& )
{
SAL_WARN( "sfx2.dialog", "SfxDocumentInfoItem::updateDocumentInfo(): exception while removing custom properties" );
SAL_WARN( "sfx.dialog", "SfxDocumentInfoItem::updateDocumentInfo(): exception while removing custom properties" );
}
}
@ -657,7 +657,7 @@ sal_Bool SfxDocumentDescPage::FillItemSet(SfxItemSet &rSet)
if ( !pInfo )
{
SAL_WARN( "sfx2.dialog", "SfxDocumentDescPage::FillItemSet(): no item found" );
SAL_WARN( "sfx.dialog", "SfxDocumentDescPage::FillItemSet(): no item found" );
return sal_False;
}

24
sfx2/source/dialog/filedlghelper.cxx
View File

@ -271,7 +271,7 @@ OUString FileDialogHelper_Impl::handleHelpRequested( const FilePickerEvent& aEve
break;
default:
SAL_WARN( "sfx2.dialog", "invalid element id" );
SAL_WARN( "sfx.dialog", "invalid element id" );
}
OUString aHelpText;
@ -508,7 +508,7 @@ void FileDialogHelper_Impl::updateExportButton()
}
catch( const IllegalArgumentException& )
{
SAL_WARN( "sfx2.dialog", "FileDialogHelper_Impl::updateExportButton: caught an exception!" );
SAL_WARN( "sfx.dialog", "FileDialogHelper_Impl::updateExportButton: caught an exception!" );
}
}
}
@ -618,7 +618,7 @@ void FileDialogHelper_Impl::updatePreviewState( sal_Bool _bUpdatePreviewWindow )
}
catch( const Exception& )
{
SAL_WARN( "sfx2.dialog", "FileDialogHelper_Impl::updatePreviewState: caught an exception!" );
SAL_WARN( "sfx.dialog", "FileDialogHelper_Impl::updatePreviewState: caught an exception!" );
}
}
}
@ -1048,7 +1048,7 @@ FileDialogHelper_Impl::FileDialogHelper_Impl(
break;
default:
SAL_WARN( "sfx2.dialog", "FileDialogHelper::ctor with unknown type" );
SAL_WARN( "sfx.dialog", "FileDialogHelper::ctor with unknown type" );
break;
}
@ -1194,7 +1194,7 @@ void SAL_CALL PickerThread_Impl::run()
catch( const RuntimeException& )
{
SetReturnValue( ExecutableDialogResults::CANCEL );
SAL_WARN( "sfx2.dialog", "RuntimeException caught" );
SAL_WARN( "sfx.dialog", "RuntimeException caught" );
}
}
@ -1338,7 +1338,7 @@ sal_Int16 FileDialogHelper_Impl::implDoExecute()
}
catch( const Exception& )
{
SAL_WARN( "sfx2.dialog", "FileDialogHelper_Impl::implDoExecute: caught an exception!" );
SAL_WARN( "sfx.dialog", "FileDialogHelper_Impl::implDoExecute: caught an exception!" );
}
}
@ -1367,7 +1367,7 @@ void FileDialogHelper_Impl::implStartExecute()
}
catch( const Exception& )
{
SAL_WARN( "sfx2.dialog", "FileDialogHelper_Impl::implDoExecute: caught an exception!" );
SAL_WARN( "sfx.dialog", "FileDialogHelper_Impl::implDoExecute: caught an exception!" );
}
}
}
@ -1657,7 +1657,7 @@ void FileDialogHelper_Impl::verifyPath()
return;
}
if (maFileName.indexOf('/') != -1) {
SAL_WARN("sfx2.dialog", maFileName << " contains /");
SAL_WARN("sfx.dialog", maFileName << " contains /");
return;
}
url.insertName(
@ -1830,7 +1830,7 @@ void FileDialogHelper_Impl::addFilters( const String& rFactory,
}
catch( const uno::Exception& )
{
SAL_WARN( "sfx2.dialog", "Could not get filters from the configuration!" );
SAL_WARN( "sfx.dialog", "Could not get filters from the configuration!" );
}
TSortedFilterList aIter (xResult);
@ -1867,7 +1867,7 @@ void FileDialogHelper_Impl::addFilter( const OUString& rFilterName,
}
catch( const IllegalArgumentException& )
{
SAL_WARN( "sfx2.dialog", "Could not append Filter" << rFilterName );
SAL_WARN( "sfx.dialog", "Could not append Filter" << rFilterName );
}
}
@ -1920,7 +1920,7 @@ void FileDialogHelper_Impl::addGraphicFilter()
}
catch( const IllegalArgumentException& )
{
SAL_WARN( "sfx2.dialog", "Could not append Filter" );
SAL_WARN( "sfx.dialog", "Could not append Filter" );
}
// Now add the filter
@ -1949,7 +1949,7 @@ void FileDialogHelper_Impl::addGraphicFilter()
}
catch( const IllegalArgumentException& )
{
SAL_WARN( "sfx2.dialog", "Could not append Filter" );
SAL_WARN( "sfx.dialog", "Could not append Filter" );
}
}
}

8
sfx2/source/dialog/filtergrouping.cxx
View File

@ -935,7 +935,7 @@ namespace sfx2
}
catch( const IllegalArgumentException& )
{
SAL_WARN( "sfx2.dialog", "Could not append DefaultFilter" << sUIName );
SAL_WARN( "sfx.dialog", "Could not append DefaultFilter" << sUIName );
}
for ( const SfxFilter* pFilter = _rFilterMatcher.First(); pFilter; pFilter = _rFilterMatcher.Next() )
@ -955,7 +955,7 @@ namespace sfx2
}
catch( const IllegalArgumentException& )
{
SAL_WARN( "sfx2.dialog", "Could not append Filter" << sUIName );
SAL_WARN( "sfx.dialog", "Could not append Filter" << sUIName );
}
}
}
@ -1104,7 +1104,7 @@ namespace sfx2
}
catch( const IllegalArgumentException& )
{
SAL_WARN( "sfx2.dialog", "Could not append Filter" << sUIName );
SAL_WARN( "sfx.dialog", "Could not append Filter" << sUIName );
}
}
@ -1122,7 +1122,7 @@ namespace sfx2
}
catch( const IllegalArgumentException& )
{
SAL_WARN( "sfx2.dialog", "Could not append Filter" << sUIName );
SAL_WARN( "sfx.dialog", "Could not append Filter" << sUIName );
}
}
}

2
sfx2/source/dialog/mailmodel.cxx
View File

@ -738,7 +738,7 @@ void SfxMailModel::AddAddress( const String& rAddress, AddressRole eRole )
}
else
{
SAL_WARN( "sfx2.dialog", "invalid address role" );
SAL_WARN( "sfx.dialog", "invalid address role" );
}
if ( pList )

8
sfx2/source/dialog/tabdlg.cxx
View File

@ -980,7 +980,7 @@ void SfxTabDialog::RemoveTabPage( sal_uInt16 nId )
}
else
{
SAL_INFO( "sfx2.dialog", "TabPage-Id not known" );
SAL_INFO( "sfx.dialog", "TabPage-Id not known" );
}
}
@ -1134,7 +1134,7 @@ SfxItemSet* SfxTabDialog::CreateInputItemSet( sal_uInt16 )
*/
{
SAL_WARN( "sfx2.dialog", "CreateInputItemSet not implemented" );
SAL_WARN( "sfx.dialog", "CreateInputItemSet not implemented" );
return new SfxAllItemSet( SFX_APP()->GetPool() );
}
@ -1150,7 +1150,7 @@ const SfxItemSet* SfxTabDialog::GetRefreshedSet()
*/
{
SAL_INFO ( "sfx2.dialog", "GetRefreshedSet not implemented" );
SAL_INFO ( "sfx.dialog", "GetRefreshedSet not implemented" );
return 0;
}
@ -1561,7 +1561,7 @@ const sal_uInt16* SfxTabDialog::GetInputRanges( const SfxItemPool& rPool )
{
if ( pSet )
{
SAL_WARN( "sfx2.dialog", "Set already exists!" );
SAL_WARN( "sfx.dialog", "Set already exists!" );
return pSet->GetRanges();
}

2
sfx2/source/dialog/taskpane.cxx
View File

@ -664,7 +664,7 @@ namespace sfx2
const CustomToolPanel* pCustomPanel = dynamic_cast< const CustomToolPanel* >( pPanel.get() );
if ( !pCustomPanel )
{
SAL_WARN( "sfx2.dialog", "ModuleTaskPane_Impl::GetPanelPos: illegal panel implementation!" );
SAL_WARN( "sfx.dialog", "ModuleTaskPane_Impl::GetPanelPos: illegal panel implementation!" );
continue;
}

42
sfx2/source/doc/docfile.cxx
View File

@ -510,7 +510,7 @@ Reference < XContent > SfxMedium::GetContent() const
}
else
{
// TODO: SAL_WARN( "sfx2.doc", "SfxMedium::GetContent()\nCreate Content? This code exists as fallback only. Please clarify, why its used.");
// TODO: SAL_WARN( "sfx.doc", "SfxMedium::GetContent()\nCreate Content? This code exists as fallback only. Please clarify, why its used.");
OUString aURL;
if ( !pImp->m_aName.isEmpty() )
::utl::LocalFileHelper::ConvertPhysicalNameToURL( pImp->m_aName, aURL );
@ -753,7 +753,7 @@ sal_Bool SfxMedium::IsStorage()
OUString aURL;
if ( !::utl::LocalFileHelper::ConvertPhysicalNameToURL( pImp->m_aName, aURL ) )
{
SAL_WARN( "sfx2.doc", "Physical name not convertible!");
SAL_WARN( "sfx.doc", "Physical name not convertible!");
}
pImp->bIsStorage = SotStorage::IsStorageFile( aURL ) && !SotStorage::IsOLEStorage( aURL);
if ( !pImp->bIsStorage )
@ -864,7 +864,7 @@ void SfxMedium::SetEncryptionDataToStorage_Impl()
}
catch( const uno::Exception& )
{
SAL_WARN( "sfx2.doc", "It must be possible to set a common password for the storage" );
SAL_WARN( "sfx.doc", "It must be possible to set a common password for the storage" );
// TODO/LATER: set the error code in case of problem
// SetError( ERRCODE_IO_GENERAL, OUString( OSL_LOG_PREFIX ) );
}
@ -1238,7 +1238,7 @@ bool SfxMedium::LockOrigFileOnDemand( sal_Bool bLoading, sal_Bool bNoUI )
}
catch( const uno::Exception& )
{
SAL_WARN( "sfx2.doc", "Locking exception: high probability, that the content has not been created" );
SAL_WARN( "sfx.doc", "Locking exception: high probability, that the content has not been created" );
}
return bResult;
#endif
@ -1433,7 +1433,7 @@ uno::Reference< embed::XStorage > SfxMedium::GetZipStorageToSign_Impl( sal_Bool
}
catch( const uno::Exception& )
{
SAL_WARN( "sfx2.doc", "No possibility to get readonly version of storage from medium!" );
SAL_WARN( "sfx.doc", "No possibility to get readonly version of storage from medium!" );
}
if ( GetError() ) // do not remove warnings
@ -1469,7 +1469,7 @@ void SfxMedium::CloseStorage()
xComp->dispose();
} catch( const uno::Exception& )
{
SAL_WARN( "sfx2.doc", "Medium's storage is already disposed!" );
SAL_WARN( "sfx.doc", "Medium's storage is already disposed!" );
}
}
@ -1801,12 +1801,12 @@ void SfxMedium::Transfer_Impl()
{
// makes sence only in case logic name is set
if ( !::utl::LocalFileHelper::ConvertPhysicalNameToURL( pImp->m_aName, aNameURL ) )
SAL_WARN( "sfx2.doc", "The medium name is not convertible!" );
SAL_WARN( "sfx.doc", "The medium name is not convertible!" );
}
if ( !aNameURL.isEmpty() && ( !pImp->m_eError || (pImp->m_eError & ERRCODE_WARNING_MASK) ) )
{
SAL_INFO( "sfx2.doc", "sfx2 (mv76033) SfxMedium::Transfer_Impl, copying to target" );
SAL_INFO( "sfx.doc", "sfx2 (mv76033) SfxMedium::Transfer_Impl, copying to target" );
Reference < ::com::sun::star::ucb::XCommandEnvironment > xEnv;
Reference< XOutputStream > rOutStream;
@ -1862,7 +1862,7 @@ void SfxMedium::Transfer_Impl()
}
else
{
SAL_WARN( "sfx2.doc", "Illegal Output stream parameter!" );
SAL_WARN( "sfx.doc", "Illegal Output stream parameter!" );
SetError( ERRCODE_IO_GENERAL, OUString( OSL_LOG_PREFIX ) );
}
@ -1935,7 +1935,7 @@ void SfxMedium::Transfer_Impl()
if ( aFile.open( osl_File_OpenFlag_Write ) == osl::FileBase::E_None )
{
aFile.sync();
SAL_INFO( "sfx2.doc", "fsync'd saved file '" << aDestURL << "'" );
SAL_INFO( "sfx.doc", "fsync'd saved file '" << aDestURL << "'" );
aFile.close();
}
}
@ -2089,7 +2089,7 @@ void SfxMedium::DoInternalBackup_Impl( const ::ucbhelper::Content& aOriginalCont
const OUString& aExtension,
const OUString& aDestDir )
{
SAL_INFO( "sfx2.doc", "sfx2 (mv76033) SfxMedium::DoInternalBackup_Impl( with destdir )" );
SAL_INFO( "sfx.doc", "sfx2 (mv76033) SfxMedium::DoInternalBackup_Impl( with destdir )" );
if ( !pImp->m_aBackupURL.isEmpty() )
return; // the backup was done already
@ -2184,7 +2184,7 @@ void SfxMedium::DoInternalBackup_Impl( const ::ucbhelper::Content& aOriginalCont
//------------------------------------------------------------------
void SfxMedium::DoBackup_Impl()
{
SAL_INFO( "sfx2.doc", "sfx2 (mv76033) SfxMedium::DoBackup_Impl" );
SAL_INFO( "sfx.doc", "sfx2 (mv76033) SfxMedium::DoBackup_Impl" );
// source file name is the logical name of this medium
INetURLObject aSource( GetURLObject() );
@ -2259,7 +2259,7 @@ void SfxMedium::ClearBackup_Impl()
else
{
SAL_WARN( "sfx2.doc", "Couldn't remove backup file!");
SAL_WARN( "sfx.doc", "Couldn't remove backup file!");
}
}
}
@ -2339,7 +2339,7 @@ void SfxMedium::GetMedium_Impl()
{
if ( !::utl::LocalFileHelper::ConvertPhysicalNameToURL( pImp->m_aName, aFileName ) )
{
SAL_WARN( "sfx2.doc", "Physical name not convertible!");
SAL_WARN( "sfx.doc", "Physical name not convertible!");
}
}
else
@ -2505,7 +2505,7 @@ void SfxMedium::Init_Impl()
INetProtocol eProt = aUrl.GetProtocol();
if ( eProt == INET_PROT_NOT_VALID )
{
SAL_WARN( "sfx2.doc", "Unknown protocol!" );
SAL_WARN( "sfx.doc", "Unknown protocol!" );
}
else
{
@ -2541,7 +2541,7 @@ void SfxMedium::Init_Impl()
|| !pImp->m_aLogicName.startsWith("private:stream")) )
{
pImp->m_pSet->ClearItem( SID_OUTPUTSTREAM );
SAL_WARN( "sfx2.doc", "Unexpected Output stream parameter!\n" );
SAL_WARN( "sfx.doc", "Unexpected Output stream parameter!\n" );
}
if (!pImp->m_aLogicName.isEmpty())
@ -2936,7 +2936,7 @@ SfxMedium::SfxMedium( const uno::Sequence<beans::PropertyValue>& aArgs ) :
}
else
{
SAL_WARN( "sfx2.doc", "Can not create a new temporary file for crash recovery!\n" );
SAL_WARN( "sfx.doc", "Can not create a new temporary file for crash recovery!\n" );
}
}
}
@ -3004,12 +3004,12 @@ SfxMedium::~SfxMedium()
OUString aTemp;
if ( !::utl::LocalFileHelper::ConvertPhysicalNameToURL( pImp->m_aName, aTemp ))
{
SAL_WARN( "sfx2.doc", "Physical name not convertible!");
SAL_WARN( "sfx.doc", "Physical name not convertible!");
}
if ( !::utl::UCBContentHelper::Kill( aTemp ) )
{
SAL_WARN( "sfx2.doc", "Couldn't remove temporary file!");
SAL_WARN( "sfx.doc", "Couldn't remove temporary file!");
}
}
@ -3510,7 +3510,7 @@ sal_Bool SfxMedium::SignContents_Impl( sal_Bool bScriptingContent, const OUStrin
}
catch ( const uno::Exception& )
{
SAL_WARN( "sfx2.doc", "Couldn't use signing functionality!\n" );
SAL_WARN( "sfx.doc", "Couldn't use signing functionality!\n" );
}
CloseAndRelease();
@ -3526,7 +3526,7 @@ sal_Bool SfxMedium::SignContents_Impl( sal_Bool bScriptingContent, const OUStrin
}
catch( const uno::Exception& )
{
SAL_WARN( "sfx2.doc", "Couldn't use signing functionality!\n" );
SAL_WARN( "sfx.doc", "Couldn't use signing functionality!\n" );
}
}

6
sfx2/source/doc/doctempl.cxx
View File

@ -584,7 +584,7 @@ sal_Bool SfxDocumentTemplates::CopyOrMove
if ( nSourceRegion == nTargetRegion )
{
SAL_WARN( "sfx2.doc", "Don't know, what to do!" );
SAL_WARN( "sfx.doc", "Don't know, what to do!" );
return sal_False;
}
@ -1338,7 +1338,7 @@ const OUString& DocTempl_EntryData_Impl::GetTargetURL()
}
else
{
SAL_WARN( "sfx2.doc", "GetTargetURL(): Could not create hierarchy content!" );
SAL_WARN( "sfx.doc", "GetTargetURL(): Could not create hierarchy content!" );
}
}
@ -1777,7 +1777,7 @@ void SfxDocTemplate_Impl::Rescan()
}
catch( const Exception& )
{
SAL_WARN( "sfx2.doc", "SfxDocTemplate_Impl::Rescan: caught an exception while doing the update!" );
SAL_WARN( "sfx.doc", "SfxDocTemplate_Impl::Rescan: caught an exception while doing the update!" );
}
}

16
sfx2/source/doc/doctemplates.cxx
View File

@ -443,7 +443,7 @@ void SfxDocTplService_Impl::init_Impl()
m_xDocProps.set(document::DocumentProperties::create(
::comphelper::getProcessComponentContext()));
} catch (uno::RuntimeException const& e) {
SAL_WARN("sfx2.doc", "SfxDocTplService_Impl::init_Impl: "
SAL_WARN("sfx.doc", "SfxDocTplService_Impl::init_Impl: "
"cannot create DocumentProperties service:" << e.Message);
}
@ -476,7 +476,7 @@ void SfxDocTplService_Impl::init_Impl()
}
else
{
SAL_WARN( "sfx2.doc", "init_Impl(): Could not create root" );
SAL_WARN( "sfx.doc", "init_Impl(): Could not create root" );
}
mbIsInitialized = bIsInitialized;
@ -792,11 +792,11 @@ sal_Bool SfxDocTplService_Impl::createFolder( const OUString& rNewFolderURL,
}
catch( RuntimeException& )
{
SAL_WARN( "sfx2.doc", "createFolder(): got runtime exception" );
SAL_WARN( "sfx.doc", "createFolder(): got runtime exception" );
}
catch( Exception& )
{
SAL_WARN( "sfx2.doc", "createFolder(): Could not create new folder" );
SAL_WARN( "sfx.doc", "createFolder(): Could not create new folder" );
}
}
else if ( bCreateParent )
@ -996,10 +996,10 @@ sal_Bool SfxDocTplService_Impl::setProperty( Content& rContent,
}
catch( PropertyExistException& ) {}
catch( IllegalTypeException& ) {
SAL_WARN( "sfx2.doc", "IllegalTypeException" );
SAL_WARN( "sfx.doc", "IllegalTypeException" );
}
catch( IllegalArgumentException& ) {
SAL_WARN( "sfx2.doc", "IllegalArgumentException" );
SAL_WARN( "sfx.doc", "IllegalArgumentException" );
}
}
}
@ -2416,7 +2416,7 @@ void SfxDocTplService_Impl::addHierGroup( GroupList_Impl& rList,
}
catch ( ContentCreationException& )
{
SAL_WARN( "sfx2.doc", "addHierGroup: ContentCreationException" );
SAL_WARN( "sfx.doc", "addHierGroup: ContentCreationException" );
}
catch ( Exception& ) {}
@ -2449,7 +2449,7 @@ void SfxDocTplService_Impl::addHierGroup( GroupList_Impl& rList,
sal_Bool bDocHasTitle = sal_False;
if( !getTitleFromURL( aTargetDir, aTmpTitle, aType, bDocHasTitle ) )
{
SAL_WARN( "sfx2.doc", "addHierGroup(): template of alien format" );
SAL_WARN( "sfx.doc", "addHierGroup(): template of alien format" );
continue;
}

4
sfx2/source/doc/guisaveas.cxx
View File

@ -633,7 +633,7 @@ sal_Bool ModelData_Impl::ExecuteFilterDialog_Impl( const OUString& aFilterName )
}
catch( const uno::Exception& e )
{
SAL_WARN("sfx2.doc", "ignoring UNO exception " << e.Message);
SAL_WARN("sfx.doc", "ignoring UNO exception " << e.Message);
}
return bDialogUsed;
@ -1819,7 +1819,7 @@ void SfxStoringHelper::SetDocInfoState(
}
catch (const uno::Exception& e)
{
SAL_INFO("sfx2.doc", "SetDocInfoState: caught exception: " << e.Message);
SAL_INFO("sfx.doc", "SetDocInfoState: caught exception: " << e.Message);
}
// set the modified flag back if required

2
sfx2/source/doc/objcont.cxx
View File

@ -744,7 +744,7 @@ void SfxObjectShell::UpdateFromTemplate_Impl( )
}
catch (const Exception& e)
{
SAL_INFO("sfx2.doc", "caught exception" << e.Message);
SAL_INFO("sfx.doc", "caught exception" << e.Message);
}
// if modify date was read successfully

60
sfx2/source/doc/objstor.cxx
View File

@ -157,7 +157,7 @@ void impl_addToModelCollection(const css::uno::Reference< css::frame::XModel >&
}
catch ( uno::Exception& )
{
SAL_WARN( "sfx2.doc", "The document seems to be in the collection already!\n" );
SAL_WARN( "sfx.doc", "The document seems to be in the collection already!\n" );
}
}
@ -287,7 +287,7 @@ OUString SfxObjectShell::CreateTempCopyOfStorage_Impl( const uno::Reference< emb
}
catch ( uno::Exception& )
{
SAL_WARN( "sfx2.doc", "Creation of a storage copy is failed!" );
SAL_WARN( "sfx.doc", "Creation of a storage copy is failed!" );
::utl::UCBContentHelper::Kill( aTempURL );
aTempURL = OUString();
@ -322,14 +322,14 @@ sal_uInt32 GetChartVersion( sal_Int32 nVersion, bool bTemplate )
{
if (bTemplate)
{
SAL_WARN("sfx2", "no chart template support yet");
SAL_WARN("sfx", "no chart template support yet");
return SOT_FORMATSTR_ID_STARCHART_8;
}
else
return SOT_FORMATSTR_ID_STARCHART_8;
}
SAL_WARN("sfx2", "unsupported version");
SAL_WARN("sfx", "unsupported version");
return 0;
}
@ -459,7 +459,7 @@ sal_Bool SfxObjectShell::GeneralInit_Impl( const uno::Reference< embed::XStorage
}
catch ( uno::Exception& )
{
SAL_WARN( "sfx2.doc", "Can't check storage's mediatype!" );
SAL_WARN( "sfx.doc", "Can't check storage's mediatype!" );
}
}
else
@ -1102,8 +1102,8 @@ sal_Bool SfxObjectShell::SaveTo_Impl
*/
{
SAL_INFO( "sfx2.doc", "PERFORMANCE SfxObjectShell::SaveTo_Impl" );
SAL_INFO( "sfx2.doc", "saving \"" << rMedium.GetName() << "\"" );
SAL_INFO( "sfx.doc", "PERFORMANCE SfxObjectShell::SaveTo_Impl" );
SAL_INFO( "sfx.doc", "saving \"" << rMedium.GetName() << "\"" );
AddLog( OUString( OSL_LOG_PREFIX "Begin" ) );
@ -1114,7 +1114,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl
{
// if no filter was set, use the default filter
// this should be changed in the feature, it should be an error!
SAL_WARN( "sfx2.doc","No filter set!");
SAL_WARN( "sfx.doc","No filter set!");
pFilter = GetFactory().GetFilterContainer()->GetAnyFilter( SFX_FILTER_IMPORT | SFX_FILTER_EXPORT );
rMedium.SetFilter(pFilter);
}
@ -1397,7 +1397,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl
}
catch( uno::Exception& )
{
SAL_WARN( "sfx2.doc", "Setting of common encryption key failed!" );
SAL_WARN( "sfx.doc", "Setting of common encryption key failed!" );
SetError( ERRCODE_IO_GENERAL, OUString( OSL_LOG_PREFIX ) );
}
}
@ -1447,7 +1447,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl
xMedStorage ) )
{
// TODO: error handling
SAL_WARN( "sfx2.doc", "Couldn't store thumbnail representation!" );
SAL_WARN( "sfx.doc", "Couldn't store thumbnail representation!" );
}
}
@ -1486,7 +1486,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl
catch( uno::Exception& )
{
AddLog( OUString( OSL_LOG_PREFIX "Preserve versions has failed." ) );
SAL_WARN( "sfx2.doc", "Couldn't copy versions!" );
SAL_WARN( "sfx.doc", "Couldn't copy versions!" );
bOk = sal_False;
// TODO/LATER: a specific error could be set
}
@ -1640,7 +1640,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl
{
// it should not happen, the copies signature is invalid!
// throw the changes away
SAL_WARN( "sfx2.doc", "An invalid signature was copied!" );
SAL_WARN( "sfx.doc", "An invalid signature was copied!" );
}
}
}
@ -1752,7 +1752,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl
//------------------------------------------------------------------------
sal_Bool SfxObjectShell::DisconnectStorage_Impl( SfxMedium& rSrcMedium, SfxMedium& rTargetMedium )
{
SAL_INFO( "sfx2.doc", "sfx2 (mv76033) SfxObjectShell::DisconnectStorage_Impl" );
SAL_INFO( "sfx.doc", "sfx2 (mv76033) SfxObjectShell::DisconnectStorage_Impl" );
// this method disconnects the storage from source medium, and attaches it to the backup created by the target medium
@ -1810,7 +1810,7 @@ sal_Bool SfxObjectShell::ConnectTmpStorage_Impl(
*/
{
SAL_INFO( "sfx2.doc", "sfx2 (mv76033) SfxObjectShell::ConnectTmpStorage_Impl" );
SAL_INFO( "sfx.doc", "sfx2 (mv76033) SfxObjectShell::ConnectTmpStorage_Impl" );
sal_Bool bResult = sal_False;
@ -1899,7 +1899,7 @@ sal_Bool SfxObjectShell::DoSaveObjectAs( SfxMedium& rMedium, sal_Bool bCommit )
OUString aMediaType;
if ( !(a>>=aMediaType) || aMediaType.isEmpty() )
{
SAL_WARN( "sfx2.doc", "The mediatype must be set already!" );
SAL_WARN( "sfx.doc", "The mediatype must be set already!" );
SetupStorage( xNewStor, SOFFICE_FILEFORMAT_CURRENT, sal_False, false );
}
@ -1914,7 +1914,7 @@ sal_Bool SfxObjectShell::DoSaveObjectAs( SfxMedium& rMedium, sal_Bool bCommit )
}
catch( uno::Exception& )
{
SAL_WARN( "sfx2.doc", "The strotage was not commited on DoSaveAs!" );
SAL_WARN( "sfx.doc", "The strotage was not commited on DoSaveAs!" );
}
}
}
@ -1947,7 +1947,7 @@ sal_Bool SfxObjectShell::DoSaveAs( SfxMedium& rMedium )
sal_Bool SfxObjectShell::DoSaveCompleted( SfxMedium* pNewMed )
{
SAL_INFO( "sfx2.doc", "sfx2 (mv76033) SfxObjectShell::DoSaveCompleted" );
SAL_INFO( "sfx.doc", "sfx2 (mv76033) SfxObjectShell::DoSaveCompleted" );
sal_Bool bOk = sal_True;
sal_Bool bMedChanged = pNewMed && pNewMed!=pMedium;
@ -2766,7 +2766,7 @@ sal_Bool SfxObjectShell::PreDoSaveAs_Impl
#ifdef DBG_UTIL
if ( pMergedParams->GetItemState( SID_DOC_SALVAGE) >= SFX_ITEM_SET )
SAL_WARN( "sfx2.doc","Salvage item present in Itemset, check the parameters!");
SAL_WARN( "sfx.doc","Salvage item present in Itemset, check the parameters!");
#endif
// should be unneccessary - too hot to handle!
@ -2870,7 +2870,7 @@ sal_Bool SfxObjectShell::PreDoSaveAs_Impl
sal_Bool SfxObjectShell::LoadFrom( SfxMedium& /*rMedium*/ )
{
SAL_WARN( "sfx2.doc", "Base implementation, must not be called in general!" );
SAL_WARN( "sfx.doc", "Base implementation, must not be called in general!" );
return sal_True;
}
@ -3020,8 +3020,8 @@ void SfxObjectShell::SetSecurityOptOpenReadOnly( sal_Bool _b )
sal_Bool SfxObjectShell::LoadOwnFormat( SfxMedium& rMedium )
{
SAL_INFO( "sfx2.doc", "PERFORMANCE SfxObjectShell::LoadOwnFormat" );
SAL_INFO( "sfx2.doc", "loading \" " << rMedium.GetName() << "\"" );
SAL_INFO( "sfx.doc", "PERFORMANCE SfxObjectShell::LoadOwnFormat" );
SAL_INFO( "sfx.doc", "loading \" " << rMedium.GetName() << "\"" );
uno::Reference< embed::XStorage > xStorage = rMedium.GetStorage();
if ( xStorage.is() )
@ -3112,7 +3112,7 @@ uno::Reference< embed::XStorage > SfxObjectShell::GetStorage()
sal_Bool SfxObjectShell::SaveChildren( sal_Bool bObjectsOnly )
{
SAL_INFO( "sfx2.doc", "sfx2 (mv76033) SfxObjectShell::SaveChildren" );
SAL_INFO( "sfx.doc", "sfx2 (mv76033) SfxObjectShell::SaveChildren" );
sal_Bool bResult = sal_True;
if ( pImp->mpObjectContainer )
@ -3126,7 +3126,7 @@ sal_Bool SfxObjectShell::SaveChildren( sal_Bool bObjectsOnly )
sal_Bool SfxObjectShell::SaveAsChildren( SfxMedium& rMedium )
{
SAL_INFO( "sfx2.doc", "sfx2 (mv76033) SfxObjectShell::SaveAsChildren" );
SAL_INFO( "sfx.doc", "sfx2 (mv76033) SfxObjectShell::SaveAsChildren" );
sal_Bool bResult = sal_True;
@ -3152,7 +3152,7 @@ sal_Bool SfxObjectShell::SaveAsChildren( SfxMedium& rMedium )
sal_Bool SfxObjectShell::SaveCompletedChildren( sal_Bool bSuccess )
{
SAL_INFO( "sfx2.doc", "sfx2 (mv76033) SfxObjectShell::SaveCompletedChildren" );
SAL_INFO( "sfx.doc", "sfx2 (mv76033) SfxObjectShell::SaveCompletedChildren" );
sal_Bool bResult = sal_True;
@ -3189,7 +3189,7 @@ sal_Bool SfxObjectShell::SaveCompletedChildren( sal_Bool bSuccess )
sal_Bool SfxObjectShell::SwitchChildrenPersistance( const uno::Reference< embed::XStorage >& xStorage,
sal_Bool bForceNonModified )
{
SAL_INFO( "sfx2.doc", "sfx2 (mv76033) SfxObjectShell::SwitchChildrenPersistence" );
SAL_INFO( "sfx.doc", "sfx2 (mv76033) SfxObjectShell::SwitchChildrenPersistence" );
if ( !xStorage.is() )
{
@ -3208,7 +3208,7 @@ sal_Bool SfxObjectShell::SwitchChildrenPersistance( const uno::Reference< embed:
// Never call this method directly, always use the DoSaveCompleted call
sal_Bool SfxObjectShell::SaveCompleted( const uno::Reference< embed::XStorage >& xStorage )
{
SAL_INFO( "sfx2.doc", "sfx2 (mv76033) SfxObjectShell::SaveCompleted" );
SAL_INFO( "sfx.doc", "sfx2 (mv76033) SfxObjectShell::SaveCompleted" );
sal_Bool bResult = sal_False;
sal_Bool bSendNotification = sal_False;
@ -3351,7 +3351,7 @@ sal_Bool StoragesOfUnknownMediaTypeAreCopied_Impl( const uno::Reference< embed::
}
catch( uno::Exception& )
{
SAL_WARN( "sfx2.doc", "Cant check storage consistency!" );
SAL_WARN( "sfx.doc", "Cant check storage consistency!" );
}
return sal_True;
@ -3360,7 +3360,7 @@ sal_Bool StoragesOfUnknownMediaTypeAreCopied_Impl( const uno::Reference< embed::
sal_Bool SfxObjectShell::SwitchPersistance( const uno::Reference< embed::XStorage >& xStorage )
{
SAL_INFO( "sfx2.doc", "sfx2 (mv76033) SfxObjectShell::SwitchPersistance" );
SAL_INFO( "sfx.doc", "sfx2 (mv76033) SfxObjectShell::SwitchPersistance" );
sal_Bool bResult = sal_False;
#ifdef DBG_UTIL
@ -3395,7 +3395,7 @@ sal_Bool SfxObjectShell::SwitchPersistance( const uno::Reference< embed::XStorag
sal_Bool SfxObjectShell::CopyStoragesOfUnknownMediaType( const uno::Reference< embed::XStorage >& xSource,
const uno::Reference< embed::XStorage >& xTarget )
{
SAL_INFO( "sfx2.doc", "sfx2 (mv76033) SfxObjectShell::CopyStoragesOfUnknownMediaType" );
SAL_INFO( "sfx.doc", "sfx2 (mv76033) SfxObjectShell::CopyStoragesOfUnknownMediaType" );
// This method does not commit the target storage and should not do it
sal_Bool bResult = sal_True;
@ -3510,7 +3510,7 @@ sal_Bool SfxObjectShell::GenerateAndStoreThumbnail( sal_Bool bEncrypted,
sal_Bool bIsTemplate,
const uno::Reference< embed::XStorage >& xStor )
{
SAL_INFO( "sfx2.doc", "sfx2 (mv76033) SfxObjectShell::GenerateAndStoreThumbnail" );
SAL_INFO( "sfx.doc", "sfx2 (mv76033) SfxObjectShell::GenerateAndStoreThumbnail" );
bIsInGenerateThumbnail = sal_True;//optimize thumbnail generate and store procedure to improve odt saving performance, i120030

10
sfx2/source/doc/oleprops.cxx
View File

@ -651,7 +651,7 @@ SfxOleThumbnailProperty::SfxOleThumbnailProperty(
void SfxOleThumbnailProperty::ImplLoad( SvStream& )
{
SAL_WARN( "sfx2.doc", "SfxOleThumbnailProperty::ImplLoad - not implemented" );
SAL_WARN( "sfx.doc", "SfxOleThumbnailProperty::ImplLoad - not implemented" );
SetError( SVSTREAM_INVALID_ACCESS );
}
@ -685,7 +685,7 @@ void SfxOleThumbnailProperty::ImplSave( SvStream& rStrm )
}
else
{
SAL_WARN( "sfx2.doc", "SfxOleThumbnailProperty::ImplSave - invalid thumbnail property" );
SAL_WARN( "sfx.doc", "SfxOleThumbnailProperty::ImplSave - invalid thumbnail property" );
SetError( SVSTREAM_INVALID_ACCESS );
}
}
@ -701,7 +701,7 @@ SfxOleBlobProperty::SfxOleBlobProperty( sal_Int32 nPropId,
void SfxOleBlobProperty::ImplLoad( SvStream& )
{
SAL_WARN( "sfx2.doc", "SfxOleBlobProperty::ImplLoad - not implemented" );
SAL_WARN( "sfx.doc", "SfxOleBlobProperty::ImplLoad - not implemented" );
SetError( SVSTREAM_INVALID_ACCESS );
}
@ -710,7 +710,7 @@ void SfxOleBlobProperty::ImplSave( SvStream& rStrm )
if (IsValid()) {
rStrm.Write( mData.getConstArray(), mData.getLength() );
} else {
SAL_WARN( "sfx2.doc", "SfxOleBlobProperty::ImplSave - invalid BLOB property" );
SAL_WARN( "sfx.doc", "SfxOleBlobProperty::ImplSave - invalid BLOB property" );
SetError( SVSTREAM_INVALID_ACCESS );
}
}
@ -1284,7 +1284,7 @@ const SvGlobalName& SfxOlePropertySet::GetSectionGuid( SfxOleSectionType eSectio
case SECTION_GLOBAL: return saGlobalGuid;
case SECTION_BUILTIN: return saBuiltInGuid;
case SECTION_CUSTOM: return saCustomGuid;
default: SAL_WARN( "sfx2.doc", "SfxOlePropertySet::GetSectionGuid - unknown section type" );
default: SAL_WARN( "sfx.doc", "SfxOlePropertySet::GetSectionGuid - unknown section type" );
}
return saEmptyGuid;
}

4
sfx2/source/doc/sfxbasemodel.cxx
View File

@ -3179,7 +3179,7 @@ void SfxBaseModel::postEvent_Impl( const OUString& aName, const Reference< frame
m_pData->m_aInterfaceContainer.getContainer( ::getCppuType( (const Reference< document::XDocumentEventListener >*)0 ) );
if ( pIC )
{
SAL_INFO("sfx2.doc", "SfxDocumentEvent: " + aName);
SAL_INFO("sfx.doc", "SfxDocumentEvent: " + aName);
document::DocumentEvent aDocumentEvent( (frame::XModel*)this, aName, xController, Any() );
@ -3192,7 +3192,7 @@ void SfxBaseModel::postEvent_Impl( const OUString& aName, const Reference< frame
pIC = m_pData->m_aInterfaceContainer.getContainer( ::getCppuType( (const Reference< document::XEventListener >*)0 ) );
if ( pIC )
{
SAL_INFO("sfx2.doc", "SfxEvent: " + aName);
SAL_INFO("sfx.doc", "SfxEvent: " + aName);
document::EventObject aEvent( (frame::XModel*)this, aName );

6
sfx2/source/notify/eventsupplier.cxx
View File

@ -267,7 +267,7 @@ static void Execute( uno::Any& aEventData, const document::DocumentEvent& aTrigg
}
else
{
SAL_WARN( "sfx2.notify", "notifyEvent(): Unsupported event type" );
SAL_WARN( "sfx.notify", "notifyEvent(): Unsupported event type" );
}
}
}
@ -390,7 +390,7 @@ SvxMacro* SfxEvents_Impl::ConvertToMacro( const uno::Any& rElement, SfxObjectShe
else if ( aType == SVX_MACRO_LANGUAGE_JAVASCRIPT )
eType = JAVASCRIPT;
else {
SAL_WARN( "sfx2.notify", "ConvertToMacro: Unknown macro type" );
SAL_WARN( "sfx.notify", "ConvertToMacro: Unknown macro type" );
}
if ( !aMacroName.isEmpty() )
@ -456,7 +456,7 @@ void SfxEvents_Impl::NormalizeMacro( const ::comphelper::NamedValueCollection& i
}
else
{
SAL_WARN( "sfx2.notify", "ConvertToMacro: Unknown macro url format" );
SAL_WARN( "sfx.notify", "ConvertToMacro: Unknown macro url format" );
}
}
}

2
sfx2/source/sidebar/SidebarController.cxx
View File

@ -720,7 +720,7 @@ Reference<ui::XUIElement> SidebarController::CreateUIElement (
}
catch(const Exception& rException)
{
SAL_WARN("sfx2.sidebar", "Cannot create panel: " << rException.Message);
SAL_WARN("sfx.sidebar", "Cannot create panel: " << rException.Message);
return NULL;
}
}

4
sfx2/source/view/frmload.cxx
View File

@ -310,7 +310,7 @@ SfxObjectShellRef SfxFrameLoader_Impl::impl_findObjectShell( const Reference< XM
}
}
SAL_WARN( "sfx2.view", "SfxFrameLoader_Impl::impl_findObjectShell: model is not based on SfxObjectShell - wrong frame loader usage!" );
SAL_WARN( "sfx.view", "SfxFrameLoader_Impl::impl_findObjectShell: model is not based on SfxObjectShell - wrong frame loader usage!" );
return NULL;
}
@ -514,7 +514,7 @@ sal_Bool SAL_CALL SfxFrameLoader_Impl::load( const Sequence< PropertyValue >& rA
SolarMutexGuard aGuard;
SAL_INFO( "sfx2.view", "sfx2 (mb93783) ::SfxFrameLoader::load" );
SAL_INFO( "sfx.view", "sfx2 (mb93783) ::SfxFrameLoader::load" );
::comphelper::NamedValueCollection aDescriptor( rArgs );

6
sfx2/source/view/viewfrm.cxx
View File

@ -2693,7 +2693,7 @@ void SfxViewFrame::AddDispatchMacroToBasic_Impl( const OUString& sMacro )
if(!xLibCont.is())
{
SAL_WARN( "sfx2.view", "couldn't get access to the basic lib container. Adding of macro isn't possible." );
SAL_WARN( "sfx.view", "couldn't get access to the basic lib container. Adding of macro isn't possible." );
return;
}
@ -3414,7 +3414,7 @@ bool SfxViewFrame::IsSidebarEnabled()
try {
bEnabled = officecfg::Office::Common::Misc::ExperimentalSidebar::get( xContext );
} catch (const uno::Exception &) {
SAL_WARN("sfx2.view", "don't have experimental sidebar option installed");
SAL_WARN("sfx.view", "don't have experimental sidebar option installed");
}
// rip out the services from framework/ for good measure
@ -3436,7 +3436,7 @@ bool SfxViewFrame::IsSidebarEnabled()
}
catch ( const uno::Exception &e )
{
SAL_WARN( "sfx2.view", "Exception de-registering sidebar factories " << e.Message );
SAL_WARN( "sfx.view", "Exception de-registering sidebar factories " << e.Message );
}
}