summaryrefslogtreecommitdiffstats
path: root/sfx2
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2011-09-20 10:18:12 +0200
committerFridrich Štrba <fridrich.strba@bluewin.ch>2011-09-21 09:28:39 +0200
commitbe6a8677a6ddb6387272a78406ec2149c4319f3d (patch)
tree0e6be3608de08f831f596a5c2dc5a3590d4a62c6 /sfx2
parentchange font name in Thai fall-back font lists in VCL.xcu (diff)
downloadcore-be6a8677a6ddb6387272a78406ec2149c4319f3d.tar.gz
core-be6a8677a6ddb6387272a78406ec2149c4319f3d.zip
OSL_TRACE: Remove trailing newlines
Done with perl regex: s/(\n\s*OSL_TRACE\(\s*\"[^\n]+?)\s*(\\n)+(\"[^\n]*\)\;\n)/$1$3/gs; - removed trailing whitespaces and (multiple) newlines
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/qa/cppunit/test_metadatable.cxx4
-rw-r--r--sfx2/source/doc/Metadatable.cxx18
2 files changed, 11 insertions, 11 deletions
diff --git a/sfx2/qa/cppunit/test_metadatable.cxx b/sfx2/qa/cppunit/test_metadatable.cxx
index c17e82f746ec..e5175ac57a84 100644
--- a/sfx2/qa/cppunit/test_metadatable.cxx
+++ b/sfx2/qa/cppunit/test_metadatable.cxx
@@ -103,7 +103,7 @@ static bool operator==(beans::StringPair p1, beans::StringPair p2)
void MetadatableTest::test()
{
- OSL_TRACE("SwMetadatable test(): start\n");
+ OSL_TRACE("SwMetadatable test(): start");
::std::auto_ptr< ::sfx2::IXmlIdRegistry > const pReg(
::sfx2::createXmlIdRegistry(false) );
::std::auto_ptr< ::sfx2::IXmlIdRegistry > const pRegClip(
@@ -270,7 +270,7 @@ void MetadatableTest::test()
CPPUNIT_ASSERT_MESSAGE("auto-detect (styles)",
m5.GetMetadataReference() == id4);
- OSL_TRACE("sfx2::Metadatable test(): finished\n");
+ OSL_TRACE("sfx2::Metadatable test(): finished");
}
diff --git a/sfx2/source/doc/Metadatable.cxx b/sfx2/source/doc/Metadatable.cxx
index ea1878f53d1c..595e80fdc8e7 100644
--- a/sfx2/source/doc/Metadatable.cxx
+++ b/sfx2/source/doc/Metadatable.cxx
@@ -728,7 +728,7 @@ XmlIdRegistryDocument::TryRegisterMetadatable(Metadatable & i_rObject,
void
XmlIdRegistryDocument::RegisterMetadatableAndCreateID(Metadatable & i_rObject)
{
- OSL_TRACE("RegisterMetadatableAndCreateID: %p\n", &i_rObject);
+ OSL_TRACE("RegisterMetadatableAndCreateID: %p", &i_rObject);
OSL_ENSURE(!dynamic_cast<MetadatableUndo*>(&i_rObject),
"RegisterMetadatableAndCreateID called for MetadatableUndo?");
@@ -771,7 +771,7 @@ XmlIdRegistryDocument::RegisterMetadatableAndCreateID(Metadatable & i_rObject)
void XmlIdRegistryDocument::UnregisterMetadatable(const Metadatable& i_rObject)
{
- OSL_TRACE("UnregisterMetadatable: %p\n", &i_rObject);
+ OSL_TRACE("UnregisterMetadatable: %p", &i_rObject);
::rtl::OUString path;
::rtl::OUString idref;
@@ -789,7 +789,7 @@ void XmlIdRegistryDocument::UnregisterMetadatable(const Metadatable& i_rObject)
void XmlIdRegistryDocument::RemoveXmlIdForElement(const Metadatable& i_rObject)
{
- OSL_TRACE("RemoveXmlIdForElement: %p\n", &i_rObject);
+ OSL_TRACE("RemoveXmlIdForElement: %p", &i_rObject);
const XmlIdReverseMap_t::iterator iter(
m_pImpl->m_XmlIdReverseMap.find(&i_rObject) );
@@ -849,7 +849,7 @@ void XmlIdRegistryDocument::RegisterCopy(Metadatable const& i_rSource,
::boost::shared_ptr<MetadatableUndo>
XmlIdRegistryDocument::CreateUndo(Metadatable const& i_rObject)
{
- OSL_TRACE("CreateUndo: %p\n", &i_rObject);
+ OSL_TRACE("CreateUndo: %p", &i_rObject);
return ::boost::shared_ptr<MetadatableUndo>(
new MetadatableUndo(i_rObject.IsInContent()) );
@@ -876,7 +876,7 @@ void
XmlIdRegistryDocument::JoinMetadatables(
Metadatable & i_rMerged, Metadatable const & i_rOther)
{
- OSL_TRACE("JoinMetadatables: %p <- %p\n", &i_rMerged, &i_rOther);
+ OSL_TRACE("JoinMetadatables: %p <- %p", &i_rMerged, &i_rOther);
bool mergedOwnsRef;
::rtl::OUString path;
@@ -1161,7 +1161,7 @@ XmlIdRegistryClipboard::TryRegisterMetadatable(Metadatable & i_rObject,
void
XmlIdRegistryClipboard::RegisterMetadatableAndCreateID(Metadatable & i_rObject)
{
- OSL_TRACE("RegisterMetadatableAndCreateID: %p\n", &i_rObject);
+ OSL_TRACE("RegisterMetadatableAndCreateID: %p", &i_rObject);
OSL_ENSURE(!dynamic_cast<MetadatableUndo*>(&i_rObject),
"RegisterMetadatableAndCreateID called for MetadatableUndo?");
@@ -1195,7 +1195,7 @@ XmlIdRegistryClipboard::RegisterMetadatableAndCreateID(Metadatable & i_rObject)
void XmlIdRegistryClipboard::UnregisterMetadatable(const Metadatable& i_rObject)
{
- OSL_TRACE("UnregisterMetadatable: %p\n", &i_rObject);
+ OSL_TRACE("UnregisterMetadatable: %p", &i_rObject);
::rtl::OUString path;
::rtl::OUString idref;
@@ -1215,7 +1215,7 @@ void XmlIdRegistryClipboard::UnregisterMetadatable(const Metadatable& i_rObject)
void XmlIdRegistryClipboard::RemoveXmlIdForElement(const Metadatable& i_rObject)
{
- OSL_TRACE("RemoveXmlIdForElement: %p\n", &i_rObject);
+ OSL_TRACE("RemoveXmlIdForElement: %p", &i_rObject);
ClipboardXmlIdReverseMap_t::iterator iter(
m_pImpl->m_XmlIdReverseMap.find(&i_rObject) );
@@ -1232,7 +1232,7 @@ void XmlIdRegistryClipboard::RemoveXmlIdForElement(const Metadatable& i_rObject)
::boost::shared_ptr<MetadatableClipboard>
XmlIdRegistryClipboard::CreateClipboard(const bool i_isInContent)
{
- OSL_TRACE("CreateClipboard: \n");
+ OSL_TRACE("CreateClipboard:");
return ::boost::shared_ptr<MetadatableClipboard>(
new MetadatableClipboard(i_isInContent) );