desktop/source/app/officeipcthread.cxx | 2 -
desktop/source/deployment/registry/dp_registry.cxx | 2 -
desktop/source/splash/unxsplash.cxx | 6 ++---
include/vcl/toolbox.hxx | 1
unotools/source/config/fontcfg.cxx | 2 -
vcl/source/window/toolbox.cxx | 23 +++++++++++++++------
6 files changed, 24 insertions(+), 12 deletions(-)
New commits:
commit ea943b3badeaf2a68ef08d0911e95603f0b889fc
Author: Caolán McNamara <caol...@redhat.com>
Date: Sun Mar 13 20:47:30 2016 +0000
quieten debugging soffice startup
Change-Id: I3f9ef32d789b7b344cc09bbed6f344e428a31ca4
diff --git a/desktop/source/app/officeipcthread.cxx
b/desktop/source/app/officeipcthread.cxx
index e9ad39b..1e02113 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -249,7 +249,7 @@ rtl::Reference< OfficeIPCThread >
OfficeIPCThread::pGlobalOfficeIPCThread;
// Into a hex string of well known length ff132a86...
OUString CreateMD5FromString( const OUString& aMsg )
{
- SAL_WARN("desktop.app", "create md5 from '" << aMsg << "'");
+ SAL_INFO("desktop.app", "create md5 from '" << aMsg << "'");
rtlDigest handle = rtl_digest_create( rtl_Digest_AlgorithmMD5 );
if ( handle )
diff --git a/desktop/source/deployment/registry/dp_registry.cxx
b/desktop/source/deployment/registry/dp_registry.cxx
index 8d203f6..8d02f77 100644
--- a/desktop/source/deployment/registry/dp_registry.cxx
+++ b/desktop/source/deployment/registry/dp_registry.cxx
@@ -397,7 +397,7 @@ Reference<deployment::XPackageRegistry>
PackageRegistryImpl::create(
buf.append( Reference<lang::XServiceInfo>(
xBackend, UNO_QUERY_THROW )
->getImplementationName() );
- dp_misc::writeConsole( buf.makeStringAndClear() + "\n");
+ dp_misc::TRACE( buf.makeStringAndClear() + "\n");
}
dp_misc::TRACE( "> [dp_registry.cxx] ambiguous backends:\n\n" );
for ( t_registryset::const_iterator iPos(
diff --git a/desktop/source/splash/unxsplash.cxx
b/desktop/source/splash/unxsplash.cxx
index 4018535..7bc5f54 100644
--- a/desktop/source/splash/unxsplash.cxx
+++ b/desktop/source/splash/unxsplash.cxx
@@ -36,7 +36,7 @@ namespace desktop
UnxSplashScreen::~UnxSplashScreen()
{
- SAL_WARN("desktop.splash", "UnxSplashScreen::~UnxSplashScreen()");
+ SAL_INFO("desktop.splash", "UnxSplashScreen::~UnxSplashScreen()");
if ( m_pOutFd )
{
fclose( m_pOutFd );
@@ -52,7 +52,7 @@ void SAL_CALL UnxSplashScreen::start( const OUString&
/*aText*/, sal_Int32 /*nRa
void SAL_CALL UnxSplashScreen::end()
throw ( uno::RuntimeException, std::exception )
{
- SAL_WARN("desktop.splash", "UnxSplashScreen::end()");
+ SAL_INFO("desktop.splash", "UnxSplashScreen::end()");
if( !m_pOutFd )
return;
@@ -101,7 +101,7 @@ UnxSplashScreen::initialize( const css::uno::Sequence<
css::uno::Any>& )
{
int fd = aNum.toInt32();
m_pOutFd = fdopen( fd, "w" );
- SAL_WARN("desktop.splash", "Got argument '--splash-pipe=" << fd <<
" ('"
+ SAL_INFO("desktop.splash", "Got argument '--splash-pipe=" << fd <<
" ('"
<< aNum << "') ("
<< static_cast<void *>(m_pOutFd) << ")");
}
diff --git a/unotools/source/config/fontcfg.cxx
b/unotools/source/config/fontcfg.cxx
index 62913d1..b4585c8 100644
--- a/unotools/source/config/fontcfg.cxx
+++ b/unotools/source/config/fontcfg.cxx
@@ -392,7 +392,7 @@ FontSubstConfiguration::FontSubstConfiguration() :
m_xConfigProvider.clear();
m_xConfigAccess.clear();
}
- SAL_WARN("unotools.config", "config provider: " <<
static_cast<bool>(m_xConfigProvider.is())
+ SAL_INFO("unotools.config", "config provider: " <<
static_cast<bool>(m_xConfigProvider.is())
<< ", config access: " << static_cast<bool>(m_xConfigAccess.is()));
}
commit a6435dc298a7dec944eedadd46a17fa6d76e5169
Author: Caolán McNamara <caol...@redhat.com>
Date: Sun Mar 13 20:42:13 2016 +0000
coverity#1355505 Uninitialized pointer field
Change-Id: I95259c8a572529f47ef4fddf59f9ca29d078b6f4
diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx
index da057b8..b0a686f 100644
--- a/include/vcl/toolbox.hxx
+++ b/include/vcl/toolbox.hxx
@@ -159,6 +159,7 @@ private:
bool bInvalidateLower = true);
SAL_DLLPRIVATE void InvalidateMenuButton();
+ SAL_DLLPRIVATE void ImplInitToolBoxData();
SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits
nStyle );
using DockingWindow::ImplInitSettings;
SAL_DLLPRIVATE void ImplInitSettings( bool bFont, bool
bForeground, bool bBackground );
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 075e44e..b638fc7 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -1343,11 +1343,11 @@ IMPL_LINK_TYPED( ImplTBDragMgr, SelectHdl,
Accelerator&, rAccel, void )
EndDragging();
}
-void ToolBox::ImplInit( vcl::Window* pParent, WinBits nStyle )
+void ToolBox::ImplInitToolBoxData()
{
// initialize variables
- ImplGetWindowImpl()->mbToolBox = true;
- mpData = new ImplToolBoxPrivateData;
+ ImplGetWindowImpl()->mbToolBox = true;
+ mpData = new ImplToolBoxPrivateData;
mpFloatWin = nullptr;
mnDX = 0;
mnDY = 0;
@@ -1383,18 +1383,18 @@ void ToolBox::ImplInit( vcl::Window* pParent, WinBits
nStyle )
mbFormat = false;
mbFullPaint = false;
mbHorz = true;
- mbScroll = (nStyle & WB_SCROLL) != 0;
+ mbScroll = false;
mbCustomize = false;
mbCustomizeMode = false;
mbDragging = false;
mbMenuStrings = false;
- mbIsShift = false;
+ mbIsShift = false;
mbIsKeyEvent = false;
mbChangingHighlight = false;
meButtonType = ButtonType::SYMBOLONLY;
meAlign = WindowAlign::Top;
meLastStyle = PointerStyle::Arrow;
- mnWinStyle = nStyle;
+ mnWinStyle = 0;
meLayoutMode = TBX_LAYOUT_NORMAL;
mnLastFocusItemId = 0;
mnKeyModifier = 0;
@@ -1408,6 +1408,13 @@ void ToolBox::ImplInit( vcl::Window* pParent, WinBits
nStyle )
// set timeout and handler for dropdown items
mpData->maDropdownTimer.SetTimeout( 250 );
mpData->maDropdownTimer.SetTimeoutHdl( LINK( this, ToolBox,
ImplDropdownLongClickHdl ) );
+}
+
+void ToolBox::ImplInit( vcl::Window* pParent, WinBits nStyle )
+{
+ // initialize variables
+ mbScroll = (nStyle & WB_SCROLL) != 0;
+ mnWinStyle = nStyle;
DockingWindow::ImplInit( pParent, nStyle & ~(WB_BORDER) );
@@ -1604,6 +1611,7 @@ void ToolBox::doDeferredInit(WinBits nBits)
ToolBox::ToolBox( vcl::Window* pParent, WinBits nStyle ) :
DockingWindow( WINDOW_TOOLBOX )
{
+ ImplInitToolBoxData();
ImplInit( pParent, nStyle );
}
@@ -1611,6 +1619,7 @@ ToolBox::ToolBox( vcl::Window* pParent, const ResId&
rResId ) :
DockingWindow( WINDOW_TOOLBOX )
{
SAL_INFO( "vcl.window", "vcl: ToolBox::ToolBox( vcl::Window* pParent,
const ResId& rResId )" );
+ ImplInitToolBoxData();
rResId.SetRT( RSC_TOOLBOX );
WinBits nStyle = ImplInitRes( rResId );
@@ -1632,6 +1641,8 @@ ToolBox::ToolBox(vcl::Window* pParent, const OString& rID,
const OUString& rUIXMLDescription, const
css::uno::Reference<css::frame::XFrame> &rFrame)
: DockingWindow(WINDOW_TOOLBOX)
{
+ ImplInitToolBoxData();
+
loadUI(pParent, rID, rUIXMLDescription, rFrame);
// calculate size of floating windows and switch if the
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
