Kaydet (Commit) 8bc49ff1 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Use more specific tag in SAL_INFO and SAL_WARN here

Surely we shouldn't be using the very generic "sw" for such a
feature-specific part of the Writer code.

Change-Id: Id8913b9121a419f5da1f46a552fab95c903a3b13
üst d24e83aa
...@@ -518,6 +518,7 @@ certain functionality. ...@@ -518,6 +518,7 @@ certain functionality.
@li @c sw.tiled @li @c sw.tiled
@li @c sw.ui @li @c sw.ui
@li @c sw.uno - Writer UNO interfaces @li @c sw.uno - Writer UNO interfaces
@li @c sw.vba - Writer VBA
@li @c sw.ww8 - .doc/.docx export filter, .doc import filter (not writerfilter) @li @c sw.ww8 - .doc/.docx export filter, .doc import filter (not writerfilter)
@li @c sw.ww8.level2 - further info for sw.ww8 @li @c sw.ww8.level2 - further info for sw.ww8
@li @c sw.xml - Writer .odt import/export @li @c sw.xml - Writer .odt import/export
......
...@@ -31,7 +31,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * vbaswobj_component_getFactory( ...@@ -31,7 +31,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * vbaswobj_component_getFactory(
void* pRet = sdecl::component_getFactoryHelper(pImplName, void* pRet = sdecl::component_getFactoryHelper(pImplName,
{&globals::serviceDecl, &::document::serviceDecl, {&globals::serviceDecl, &::document::serviceDecl,
&wrapformat::serviceDecl, &vbaeventshelper::serviceDecl} ); &wrapformat::serviceDecl, &vbaeventshelper::serviceDecl} );
SAL_INFO("sw", "Ret is " << pRet); SAL_INFO("sw.vba", "Ret is " << pRet);
return pRet; return pRet;
} }
......
...@@ -35,7 +35,7 @@ static uno::Reference< container::XIndexAccess > lcl_getAddinCollection( const u ...@@ -35,7 +35,7 @@ static uno::Reference< container::XIndexAccess > lcl_getAddinCollection( const u
SvtPathOptions aPathOpt; SvtPathOptions aPathOpt;
// FIXME: temporary the STARTUP path is located in $OO/basic3.1/program/addin // FIXME: temporary the STARTUP path is located in $OO/basic3.1/program/addin
OUString aAddinPath = aPathOpt.GetAddinPath(); OUString aAddinPath = aPathOpt.GetAddinPath();
SAL_INFO("sw", "lcl_getAddinCollection: " << aAddinPath ); SAL_INFO("sw.vba", "lcl_getAddinCollection: " << aAddinPath );
if( xSFA->isFolder( aAddinPath ) ) if( xSFA->isFolder( aAddinPath ) )
{ {
uno::Sequence< OUString > sEntries = xSFA->getFolderContents( aAddinPath, false ); uno::Sequence< OUString > sEntries = xSFA->getFolderContents( aAddinPath, false );
......
...@@ -445,7 +445,7 @@ SwVbaDocument::getIntrospection( ) ...@@ -445,7 +445,7 @@ SwVbaDocument::getIntrospection( )
uno::Any SAL_CALL uno::Any SAL_CALL
SwVbaDocument::invoke( const OUString& aFunctionName, const uno::Sequence< uno::Any >& /*aParams*/, uno::Sequence< ::sal_Int16 >& /*aOutParamIndex*/, uno::Sequence< uno::Any >& /*aOutParam*/ ) SwVbaDocument::invoke( const OUString& aFunctionName, const uno::Sequence< uno::Any >& /*aParams*/, uno::Sequence< ::sal_Int16 >& /*aOutParamIndex*/, uno::Sequence< uno::Any >& /*aOutParam*/ )
{ {
SAL_INFO("sw", "** will barf " << aFunctionName ); SAL_INFO("sw.vba", "** will barf " << aFunctionName );
throw uno::RuntimeException(); // unsupported operation throw uno::RuntimeException(); // unsupported operation
} }
......
...@@ -300,7 +300,7 @@ public: ...@@ -300,7 +300,7 @@ public:
} }
catch (const uno::Exception&) catch (const uno::Exception&)
{ {
SAL_WARN("sw", "Got exception"); SAL_WARN("sw.vba", "Got exception");
} }
uno::Any aReturn; uno::Any aReturn;
if ( rPropName == "LineCount" ) // special processing needed if ( rPropName == "LineCount" ) // special processing needed
...@@ -837,7 +837,7 @@ public: ...@@ -837,7 +837,7 @@ public:
virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override
{ {
SAL_INFO("sw", "hasByName(" << aName << ") returns " << mxUserDefinedProp->getPropertySetInfo()->hasPropertyByName( aName ) ); SAL_INFO("sw.vba", "hasByName(" << aName << ") returns " << mxUserDefinedProp->getPropertySetInfo()->hasPropertyByName( aName ) );
return mxUserDefinedProp->getPropertySetInfo()->hasPropertyByName( aName ); return mxUserDefinedProp->getPropertySetInfo()->hasPropertyByName( aName );
} }
...@@ -855,13 +855,13 @@ public: ...@@ -855,13 +855,13 @@ public:
virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) override virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) override
{ {
// create a map of properties ( the key doesn't matter ) // create a map of properties ( the key doesn't matter )
SAL_INFO("sw", "Creating an enumeration"); SAL_INFO("sw.vba", "Creating an enumeration");
sal_Int32 key = 0; sal_Int32 key = 0;
sal_Int32 nElem = getCount(); sal_Int32 nElem = getCount();
DocProps simpleDocPropSnapShot; DocProps simpleDocPropSnapShot;
for ( ; key < nElem; ++key ) for ( ; key < nElem; ++key )
simpleDocPropSnapShot[ key ].set( getByIndex( key ), uno::UNO_QUERY_THROW ); simpleDocPropSnapShot[ key ].set( getByIndex( key ), uno::UNO_QUERY_THROW );
SAL_INFO("sw", "After creating the enumeration"); SAL_INFO("sw.vba", "After creating the enumeration");
return new DocPropEnumeration( simpleDocPropSnapShot ); return new DocPropEnumeration( simpleDocPropSnapShot );
} }
......
...@@ -317,7 +317,7 @@ SwVbaFields::Add( const css::uno::Reference< ::ooo::vba::word::XRange >& Range, ...@@ -317,7 +317,7 @@ SwVbaFields::Add( const css::uno::Reference< ::ooo::vba::word::XRange >& Range,
{ {
SwVbaReadFieldParams aReadParam(sText); SwVbaReadFieldParams aReadParam(sText);
sFieldName = aReadParam.GetFieldName(); sFieldName = aReadParam.GetFieldName();
SAL_INFO("sw", "the field name is " << sFieldName ); SAL_INFO("sw.vba", "the field name is " << sFieldName );
} }
uno::Reference< text::XTextContent > xTextField; uno::Reference< text::XTextContent > xTextField;
...@@ -430,7 +430,7 @@ uno::Reference< text::XTextField > SwVbaFields::Create_Field_DocProperty( const ...@@ -430,7 +430,7 @@ uno::Reference< text::XTextField > SwVbaFields::Create_Field_DocProperty( const
} }
} }
aDocProperty = aDocProperty.replaceAll("\"", ""); aDocProperty = aDocProperty.replaceAll("\"", "");
SAL_INFO("sw", "SwVbaFields::Create_Field_DocProperty, the document property name is " << aDocProperty ); SAL_INFO("sw.vba", "SwVbaFields::Create_Field_DocProperty, the document property name is " << aDocProperty );
if( aDocProperty.isEmpty() ) if( aDocProperty.isEmpty() )
{ {
throw uno::RuntimeException(); throw uno::RuntimeException();
......
...@@ -35,7 +35,7 @@ using namespace ::ooo::vba; ...@@ -35,7 +35,7 @@ using namespace ::ooo::vba;
SwVbaGlobals::SwVbaGlobals( uno::Sequence< uno::Any > const& aArgs, uno::Reference< uno::XComponentContext >const& rxContext ) : SwVbaGlobals_BASE( uno::Reference< XHelperInterface >(), rxContext, "WordDocumentContext" ) SwVbaGlobals::SwVbaGlobals( uno::Sequence< uno::Any > const& aArgs, uno::Reference< uno::XComponentContext >const& rxContext ) : SwVbaGlobals_BASE( uno::Reference< XHelperInterface >(), rxContext, "WordDocumentContext" )
{ {
SAL_INFO("sw", "SwVbaGlobals::SwVbaGlobals()"); SAL_INFO("sw.vba", "SwVbaGlobals::SwVbaGlobals()");
uno::Sequence< beans::PropertyValue > aInitArgs( 2 ); uno::Sequence< beans::PropertyValue > aInitArgs( 2 );
aInitArgs[ 0 ].Name = "Application"; aInitArgs[ 0 ].Name = "Application";
aInitArgs[ 0 ].Value <<= getApplication(); aInitArgs[ 0 ].Value <<= getApplication();
...@@ -47,7 +47,7 @@ SwVbaGlobals::SwVbaGlobals( uno::Sequence< uno::Any > const& aArgs, uno::Refere ...@@ -47,7 +47,7 @@ SwVbaGlobals::SwVbaGlobals( uno::Sequence< uno::Any > const& aArgs, uno::Refere
SwVbaGlobals::~SwVbaGlobals() SwVbaGlobals::~SwVbaGlobals()
{ {
SAL_INFO("sw", "SwVbaGlobals::~SwVbaGlobals"); SAL_INFO("sw.vba", "SwVbaGlobals::~SwVbaGlobals");
} }
// XGlobals // XGlobals
...@@ -55,7 +55,7 @@ SwVbaGlobals::~SwVbaGlobals() ...@@ -55,7 +55,7 @@ SwVbaGlobals::~SwVbaGlobals()
uno::Reference<word::XApplication > const & uno::Reference<word::XApplication > const &
SwVbaGlobals::getApplication() SwVbaGlobals::getApplication()
{ {
SAL_INFO("sw", "In SwVbaGlobals::getApplication"); SAL_INFO("sw.vba", "In SwVbaGlobals::getApplication");
if ( !mxApplication.is() ) if ( !mxApplication.is() )
mxApplication.set( new SwVbaApplication( mxContext) ); mxApplication.set( new SwVbaApplication( mxContext) );
......
...@@ -81,7 +81,7 @@ void SwVbaListHelper::Init() ...@@ -81,7 +81,7 @@ void SwVbaListHelper::Init()
// get the numbering style // get the numbering style
uno::Reference< style::XStyleFamiliesSupplier > xStyleSupplier( mxTextDocument, uno::UNO_QUERY_THROW ); uno::Reference< style::XStyleFamiliesSupplier > xStyleSupplier( mxTextDocument, uno::UNO_QUERY_THROW );
mxStyleFamily.set( xStyleSupplier->getStyleFamilies()->getByName("NumberingStyles"), uno::UNO_QUERY_THROW ); mxStyleFamily.set( xStyleSupplier->getStyleFamilies()->getByName("NumberingStyles"), uno::UNO_QUERY_THROW );
SAL_INFO("sw", "numbering style name: " << msStyleName ); SAL_INFO("sw.vba", "numbering style name: " << msStyleName );
if( mxStyleFamily->hasByName( msStyleName ) ) if( mxStyleFamily->hasByName( msStyleName ) )
{ {
mxStyleProps.set( mxStyleFamily->getByName( msStyleName ), uno::UNO_QUERY_THROW ); mxStyleProps.set( mxStyleFamily->getByName( msStyleName ), uno::UNO_QUERY_THROW );
......
...@@ -339,7 +339,7 @@ SwVbaStyles::Item( const uno::Any& Index1, const uno::Any& Index2 ) ...@@ -339,7 +339,7 @@ SwVbaStyles::Item( const uno::Any& Index1, const uno::Any& Index2 )
} }
else else
{ {
SAL_WARN("sw", "the builtin style type is not implemented"); SAL_WARN("sw.vba", "the builtin style type is not implemented");
throw uno::RuntimeException("Not implemented" ); throw uno::RuntimeException("Not implemented" );
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment