Kaydet (Commit) d077b30d authored tarafından Markus Mohrhard's avatar Markus Mohrhard

make the UI element IDs locally unique in impress header footer dlg

Change-Id: I368405acc7dfbd210cfc0115e58e993846ab9497
Reviewed-on: https://gerrit.libreoffice.org/60985
Tested-by: Jenkins
Reviewed-by: 's avatarMarkus Mohrhard <markus.mohrhard@googlemail.com>
üst 4e02fee0
...@@ -385,6 +385,27 @@ void HeaderFooterDialog::change( SdUndoGroup* pUndoGroup, SdPage* pPage, const H ...@@ -385,6 +385,27 @@ void HeaderFooterDialog::change( SdUndoGroup* pUndoGroup, SdPage* pPage, const H
pPage->setHeaderFooterSettings( rNewSettings ); pPage->setHeaderFooterSettings( rNewSettings );
} }
namespace {
void recursive_rename_ui_element(vcl::Window& rWindow, const OUString& rPrefix)
{
OUString aID = rWindow.get_id();
if (aID.isEmpty())
{
rWindow.set_id(rPrefix + aID);
}
size_t nChildCount = rWindow.GetChildCount();
for (size_t i = 0; i < nChildCount; ++i)
{
vcl::Window* pChild = rWindow.GetChild(i);
if (pChild)
recursive_rename_ui_element(*pChild, rPrefix);
}
}
}
HeaderFooterTabPage::HeaderFooterTabPage( vcl::Window* pWindow, SdDrawDocument* pDoc, SdPage* pActualPage, bool bHandoutMode ) : HeaderFooterTabPage::HeaderFooterTabPage( vcl::Window* pWindow, SdDrawDocument* pDoc, SdPage* pActualPage, bool bHandoutMode ) :
TabPage( pWindow, "HeaderFooterTab", "modules/simpress/ui/headerfootertab.ui" ), TabPage( pWindow, "HeaderFooterTab", "modules/simpress/ui/headerfootertab.ui" ),
mpDoc(pDoc), mpDoc(pDoc),
...@@ -443,6 +464,11 @@ HeaderFooterTabPage::HeaderFooterTabPage( vcl::Window* pWindow, SdDrawDocument* ...@@ -443,6 +464,11 @@ HeaderFooterTabPage::HeaderFooterTabPage( vcl::Window* pWindow, SdDrawDocument*
mpCBDateTimeLanguage->SelectLanguage( meOldLanguage ); mpCBDateTimeLanguage->SelectLanguage( meOldLanguage );
FillFormatList(0); FillFormatList(0);
if (mbHandoutMode)
recursive_rename_ui_element(*this, "handout");
else
recursive_rename_ui_element(*this, "slide");
} }
HeaderFooterTabPage::~HeaderFooterTabPage() HeaderFooterTabPage::~HeaderFooterTabPage()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment