[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - cui/uiconfig
Mike Kaganski (via logerrit)
logerrit at kemper.freedesktop.org
Thu Jun 6 10:59:07 UTC 2019
cui/uiconfig/ui/bulletandposition.ui | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 0e14c700714d505c90f84018a3362b6dc258987a
Author: Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Wed Jun 5 17:00:00 2019 +1000
Commit: Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Thu Jun 6 12:58:17 2019 +0200
Add GtkImage ids
An assert is failing without this:
ucrtbased.dll!abort() Line 61
at minkernel\crts\ucrt\src\appcrt\startup\abort.cpp(61)
ucrtbased.dll!common_assert_to_stderr<wchar_t>(const wchar_t * const expression, const wchar_t * const file_name, const unsigned int line_number) Line 187
at minkernel\crts\ucrt\src\appcrt\startup\assert.cpp(187)
ucrtbased.dll!common_assert<wchar_t>(const wchar_t * const expression, const wchar_t * const file_name, const unsigned int line_number, void * const return_address) Line 420
at minkernel\crts\ucrt\src\appcrt\startup\assert.cpp(420)
ucrtbased.dll!_wassert(const wchar_t * expression, const wchar_t * file_name, unsigned int line_number) Line 444
at minkernel\crts\ucrt\src\appcrt\startup\assert.cpp(444)
vcllo.dll!VclBuilder::get<FixedImage>(const rtl::OString & sID) Line 446
at C:\cygwin\home\user\lode\dev\core\include\vcl\builder.hxx(446)
vcllo.dll!VclBuilder::VclBuilder(vcl::Window * pParent, const rtl::OUString & sUIDir, const rtl::OUString & sUIFile, const rtl::OString & sID, const com::sun::star::uno::Reference<com::sun::star::frame::XFrame> & rFrame, bool bLegacy) Line 698
at C:\cygwin\home\user\lode\dev\core\vcl\source\window\builder.cxx(698)
vcllo.dll!SalInstanceBuilder::SalInstanceBuilder(vcl::Window * pParent, const rtl::OUString & rUIRoot, const rtl::OUString & rUIFile) Line 4995
at C:\cygwin\home\user\lode\dev\core\vcl\source\app\salvtables.cxx(4995)
vcllo.dll!SalInstance::CreateBuilder(weld::Widget * pParent, const rtl::OUString & rUIRoot, const rtl::OUString & rUIFile) Line 5260
at C:\cygwin\home\user\lode\dev\core\vcl\source\app\salvtables.cxx(5260)
vcllo.dll!Application::CreateBuilder(weld::Widget * pParent, const rtl::OUString & rUIFile) Line 146
at C:\cygwin\home\user\lode\dev\core\vcl\source\window\builder.cxx(146)
vcllo.dll!weld::GenericDialogController::GenericDialogController(weld::Widget * pParent, const rtl::OUString & rUIFile, const rtl::OString & rDialogId) Line 5347
at C:\cygwin\home\user\lode\dev\core\vcl\source\app\salvtables.cxx(5347)
sduilo.dll!SvxBulletAndPositionDlg::SvxBulletAndPositionDlg(weld::Window * pWindow, const SfxItemSet & rSet, sd::View * pView) Line 117
at C:\cygwin\home\user\lode\dev\core\sd\source\ui\dlg\BulletAndPositionDlg.cxx(117)
sduilo.dll!std::make_unique<SvxBulletAndPositionDlg,weld::Window * &,SfxItemSet const &,sd::View * &,0>(weld::Window * & <_Args_0>, const SfxItemSet & <_Args_1>, sd::View * & <_Args_2>) Line 2042
at C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.21.27702\include\memory(2042)
sduilo.dll!SdAbstractDialogFactory_Impl::CreateSvxBulletAndPositionDlg(weld::Window * pParent, const SfxItemSet * pAttr, sd::View * pView) Line 387
at C:\cygwin\home\user\lode\dev\core\sd\source\ui\dlg\sddlgfact.cxx(387)
sdlo.dll!sd::FuBulletAndPosition::DoExecute(SfxRequest & rReq) Line 92
at C:\cygwin\home\user\lode\dev\core\sd\source\ui\func\fuolbull.cxx(92)
sdlo.dll!sd::FuBulletAndPosition::Create(sd::ViewShell * pViewSh, sd::Window * pWin, sd::View * pView, SdDrawDocument * pDoc, SfxRequest & rReq) Line 57
at C:\cygwin\home\user\lode\dev\core\sd\source\ui\func\fuolbull.cxx(57)
sdlo.dll!sd::DrawViewShell::FuTemporary(SfxRequest & rReq) Line 1447
at C:\cygwin\home\user\lode\dev\core\sd\source\ui\view\drviews2.cxx(1447)
sdlo.dll!SfxStubDrawViewShellFuTemporary(SfxShell * pShell, SfxRequest & rReq) Line 1514
at C:\cygwin\home\user\lode\dev\core\workdir\SdiTarget\sd\sdi\sdslots.hxx(1514)
sfxlo.dll!SfxShell::CallExec(void(*)(SfxShell *, SfxRequest &) pFunc, SfxRequest & rReq) Line 197
at C:\cygwin\home\user\lode\dev\core\include\sfx2\shell.hxx(197)
sfxlo.dll!SfxDispatcher::Call_Impl(SfxShell & rShell, const SfxSlot & rSlot, SfxRequest & rReq, bool bRecord) Line 360
at C:\cygwin\home\user\lode\dev\core\sfx2\source\control\dispatch.cxx(360)
sfxlo.dll!SfxDispatcher::Execute_(SfxShell & rShell, const SfxSlot & rSlot, SfxRequest & rReq, SfxCallMode eCallMode) Line 857
at C:\cygwin\home\user\lode\dev\core\sfx2\source\control\dispatch.cxx(857)
sfxlo.dll!SfxBindings::Execute_Impl(SfxRequest & aReq, const SfxSlot * pSlot, SfxShell * pShell) Line 1066
at C:\cygwin\home\user\lode\dev\core\sfx2\source\control\bindings.cxx(1066)
sfxlo.dll!SfxDispatchController_Impl::dispatch(const com::sun::star::util::URL & aURL, const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> & aArgs, const com::sun::star::uno::Reference<com::sun::star::frame::XDispatchResultListener> & rListener) Line 757
at C:\cygwin\home\user\lode\dev\core\sfx2\source\control\unoctitm.cxx(757)
sfxlo.dll!SfxOfficeDispatch::dispatch(const com::sun::star::util::URL & aURL, const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> & aArgs) Line 226
at C:\cygwin\home\user\lode\dev\core\sfx2\source\control\unoctitm.cxx(226)
fwklo.dll!framework::MenuBarManager::Select(Menu * pMenu) Line 896
at C:\cygwin\home\user\lode\dev\core\framework\source\uielement\menubarmanager.cxx(896)
fwklo.dll!framework::MenuBarManager::LinkStubSelect(void * instance, Menu * data) Line 832
at C:\cygwin\home\user\lode\dev\core\framework\source\uielement\menubarmanager.cxx(832)
vcllo.dll!Link<Menu *,bool>::Call(Menu * data) Line 84
at C:\cygwin\home\user\lode\dev\core\include\tools\link.hxx(84)
vcllo.dll!Menu::Select() Line 362
at C:\cygwin\home\user\lode\dev\core\vcl\source\window\menu.cxx(362)
vcllo.dll!Menu::ImplCallSelect(void * __formal) Line 2150
at C:\cygwin\home\user\lode\dev\core\vcl\source\window\menu.cxx(2150)
vcllo.dll!Menu::LinkStubImplCallSelect(void * instance, void * data) Line 2146
at C:\cygwin\home\user\lode\dev\core\vcl\source\window\menu.cxx(2146)
vcllo.dll!Link<void *,void>::Call(void * data) Line 84
at C:\cygwin\home\user\lode\dev\core\include\tools\link.hxx(84)
vcllo.dll!ImplHandleUserEvent(ImplSVEvent * pSVEvent) Line 1961
at C:\cygwin\home\user\lode\dev\core\vcl\source\window\winproc.cxx(1961)
vcllo.dll!ImplWindowFrameProc(vcl::Window * _pWindow, SalEvent nEvent, const void * pEvent) Line 2512
at C:\cygwin\home\user\lode\dev\core\vcl\source\window\winproc.cxx(2512)
vcllo.dll!SalFrame::CallCallback(SalEvent nEvent, const void * pEvent) Line 294
at C:\cygwin\home\user\lode\dev\core\vcl\inc\salframe.hxx(294)
vclplug_winlo.dll!ImplHandleUserEvent(HWND__ * hWnd, __int64 lParam) Line 4080
at C:\cygwin\home\user\lode\dev\core\vcl\win\window\salframe.cxx(4080)
vclplug_winlo.dll!SalFrameWndProc(HWND__ * hWnd, unsigned int nMsg, unsigned __int64 wParam, __int64 lParam, bool & rDef) Line 5733
at C:\cygwin\home\user\lode\dev\core\vcl\win\window\salframe.cxx(5733)
vclplug_winlo.dll!SalFrameWndProcW(HWND__ * hWnd, unsigned int nMsg, unsigned __int64 wParam, __int64 lParam) Line 5840
at C:\cygwin\home\user\lode\dev\core\vcl\win\window\salframe.cxx(5840)
user32.dll!UserCallWinProcCheckWow()
user32.dll!CallWindowProcW()
opengl32.dll!wglWndProc ()
user32.dll!UserCallWinProcCheckWow()
user32.dll!DispatchMessageWorker()
vclplug_winlo.dll!ImplSalDispatchMessage(const tagMSG * pMsg) Line 410
at C:\cygwin\home\user\lode\dev\core\vcl\win\app\salinst.cxx(410)
vclplug_winlo.dll!ImplSalYield(bool bWait, bool bHandleAllCurrentEvents) Line 441
at C:\cygwin\home\user\lode\dev\core\vcl\win\app\salinst.cxx(441)
vclplug_winlo.dll!WinSalInstance::DoYield(bool bWait, bool bHandleAllCurrentEvents) Line 512
at C:\cygwin\home\user\lode\dev\core\vcl\win\app\salinst.cxx(512)
vcllo.dll!ImplYield(bool i_bWait, bool i_bAllEvents) Line 457
at C:\cygwin\home\user\lode\dev\core\vcl\source\app\svapp.cxx(457)
vcllo.dll!Application::Yield() Line 522
at C:\cygwin\home\user\lode\dev\core\vcl\source\app\svapp.cxx(522)
vcllo.dll!Application::Execute() Line 438
at C:\cygwin\home\user\lode\dev\core\vcl\source\app\svapp.cxx(438)
sofficeapp.dll!desktop::Desktop::Main() Line 1621
at C:\cygwin\home\user\lode\dev\core\desktop\source\app\app.cxx(1621)
vcllo.dll!ImplSVMain() Line 203
at C:\cygwin\home\user\lode\dev\core\vcl\source\app\svmain.cxx(203)
vcllo.dll!SVMain() Line 238
at C:\cygwin\home\user\lode\dev\core\vcl\source\app\svmain.cxx(238)
sofficeapp.dll!soffice_main() Line 170
at C:\cygwin\home\user\lode\dev\core\desktop\source\app\sofficemain.cxx(170)
soffice.bin!sal_main() Line 48
at C:\cygwin\home\user\lode\dev\core\desktop\source\app\main.c(48)
soffice.bin!main(int argc, char * * argv) Line 47
at C:\cygwin\home\user\lode\dev\core\desktop\source\app\main.c(47)
soffice.bin!invoke_main() Line 79
at d:\agent\_work\2\s\src\vctools\crt\vcstartup\src\startup\exe_common.inl(79)
soffice.bin!__scrt_common_main_seh() Line 288
at d:\agent\_work\2\s\src\vctools\crt\vcstartup\src\startup\exe_common.inl(288)
soffice.bin!__scrt_common_main() Line 331
at d:\agent\_work\2\s\src\vctools\crt\vcstartup\src\startup\exe_common.inl(331)
soffice.bin!mainCRTStartup() Line 17
at d:\agent\_work\2\s\src\vctools\crt\vcstartup\src\startup\exe_main.cpp(17)
kernel32.dll!BaseThreadInitThunk ()
ntdll.dll!RtlUserThreadStart ()
because the images are added with empty ids, get into the same slot of
m_pParserState->m_aStockMap, and then in VclBuilder::VclBuilder's block
labeled "fill in any stock icons in surviving images", get<FixedImage>
is called with that empty id, finding another control not having an id,
then failing dynamic_cast it to FixedImage.
Change-Id: Ie2f48ea0753998e8ed6590c45a3d916339c1fc13
Reviewed-on: https://gerrit.libreoffice.org/73531
Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
Tested-by: Mike Kaganski <mike.kaganski at collabora.com>
(cherry picked from commit ada2b5be85f8c4d16c627a990e3f362ae0663d9f)
Reviewed-on: https://gerrit.libreoffice.org/73581
Tested-by: Jenkins
diff --git a/cui/uiconfig/ui/bulletandposition.ui b/cui/uiconfig/ui/bulletandposition.ui
index ba3133a921bb..6a49673e3b8f 100644
--- a/cui/uiconfig/ui/bulletandposition.ui
+++ b/cui/uiconfig/ui/bulletandposition.ui
@@ -797,7 +797,7 @@
<property name="receives_default">True</property>
<property name="always_show_image">True</property>
<child>
- <object class="GtkImage">
+ <object class="GtkImage" id="image_justify_center">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-justify-center</property>
@@ -817,7 +817,7 @@
<property name="margin_left">88</property>
<property name="always_show_image">True</property>
<child>
- <object class="GtkImage">
+ <object class="GtkImage" id="image_justify_left">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-justify-left</property>
@@ -836,7 +836,7 @@
<property name="receives_default">True</property>
<property name="always_show_image">True</property>
<child>
- <object class="GtkImage">
+ <object class="GtkImage" id="image_justify_right">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-justify-right</property>
More information about the Libreoffice-commits
mailing list