summaryrefslogtreecommitdiff
path: root/l10ntools/source/help/HelpLinker.cxx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-05-16 11:19:17 +0100
committerCaolán McNamara <caolanm@redhat.com>2012-05-16 12:04:10 +0100
commit8512e5c2b3617a2c8d77381788c3864db594ce46 (patch)
treec7fde308b180a2bce971fc80958d8bd28aa123d0 /l10ntools/source/help/HelpLinker.cxx
parentc7f60050da130eaeab11a53142a65b61c92c34a1 (diff)
reduce static_initialization_and_destruction chain
Change-Id: I962aeac0c7feeabb7963016d5afcfeca5a48ccfe
Diffstat (limited to 'l10ntools/source/help/HelpLinker.cxx')
-rw-r--r--l10ntools/source/help/HelpLinker.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/l10ntools/source/help/HelpLinker.cxx b/l10ntools/source/help/HelpLinker.cxx
index 8c0d510ddb32..7656d0bcc061 100644
--- a/l10ntools/source/help/HelpLinker.cxx
+++ b/l10ntools/source/help/HelpLinker.cxx
@@ -437,11 +437,12 @@ void HelpLinker::link() throw( HelpProcessingException )
if (!bExtensionMode && xhpFileName.rfind(".xhp") != xhpFileName.length()-4)
{
// only work on .xhp - files
- std::cerr <<
+ SAL_WARN("l10ntools",
"ERROR: input list entry '"
<< xhpFileName
<< "' has the wrong extension (only files with extension .xhp "
- << "are accepted)";
+ << "are accepted)");
+
continue;
}
@@ -642,8 +643,7 @@ void HelpLinker::link() throw( HelpProcessingException )
fs::path fsAdditionalFileName( additionalFileName, fs::native );
std::string aNativeStr = fsAdditionalFileName.native_file_string();
- const char* pStr = aNativeStr.c_str();
- HCDBG(std::cerr << pStr << std::endl);
+ HCDBG(const char* pStr = aNativeStr.c_str(); std::cerr << pStr << std::endl);
fs::path fsTargetName( indexDirParentName / additionalFileKey );