summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-05-22 15:38:10 +0100
committerCaolán McNamara <caolanm@redhat.com>2012-09-28 08:48:21 +0100
commit3747d670f91ae36e6005b166e3067c23a9a3393d (patch)
treeb094ca37b5704d31fa6facce05f126bcc748024f
parent9a121accd1199156a1701b3130a2c3ed90b26caa (diff)
put the cui zoom dialog into the right place
-rw-r--r--cui/Package_uiconfig.mk2
-rw-r--r--sfx2/source/dialog/basedlgs.cxx2
2 files changed, 2 insertions, 2 deletions
diff --git a/cui/Package_uiconfig.mk b/cui/Package_uiconfig.mk
index 4f3e80904ba8..524a542ef20d 100644
--- a/cui/Package_uiconfig.mk
+++ b/cui/Package_uiconfig.mk
@@ -27,6 +27,6 @@
$(eval $(call gb_Package_Package,cui_uiconfig,$(SRCDIR)/cui/uiconfig))
-$(eval $(call gb_Package_add_file,cui_uiconfig,xml/uiconfig/ui/10000.ui,ui/10000.ui))
+$(eval $(call gb_Package_add_file,cui_uiconfig,xml/uiconfig/cui/ui/10000.ui,ui/10000.ui))
# vim: set noet sw=4 ts=4:
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index c79819411401..b1ff8781d922 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -201,7 +201,7 @@ SfxModalDialog::SfxModalDialog(Window* pParent, const ResId &rResId )
sal_Int32 nUIid = static_cast<sal_Int32>(nUniqId);
rtl::OUString sPath = rtl::OUStringBuffer(getUIRootDir()).
append(rResId.GetResMgr()->getPrefixName()).
- append('/').
+ append("/ui/").
append(nUIid).
appendAscii(".ui").
makeStringAndClear();