You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by or...@apache.org on 2013/03/18 13:53:42 UTC
svn commit: r1457743 - in
/openoffice/branches/sidebar/main/sw/source/ui/sidebar:
PagePropertyPanel.cxx PagePropertyPanel.hxx
Author: orw
Date: Mon Mar 18 12:53:41 2013
New Revision: 1457743
URL: http://svn.apache.org/r1457743
Log:
#121793# - correction: no SID_ATTR_PAGE invalidation during SID_ATTR_PAGE_SIZE notification during initial 'pull' of page style's attributes
Modified:
openoffice/branches/sidebar/main/sw/source/ui/sidebar/PagePropertyPanel.cxx
openoffice/branches/sidebar/main/sw/source/ui/sidebar/PagePropertyPanel.hxx
Modified: openoffice/branches/sidebar/main/sw/source/ui/sidebar/PagePropertyPanel.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sw/source/ui/sidebar/PagePropertyPanel.cxx?rev=1457743&r1=1457742&r2=1457743&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sw/source/ui/sidebar/PagePropertyPanel.cxx (original)
+++ openoffice/branches/sidebar/main/sw/source/ui/sidebar/PagePropertyPanel.cxx Mon Mar 18 12:53:41 2013
@@ -152,8 +152,11 @@ PagePropertyPanel::PagePropertyPanel(
, mpMarginPopup()
, mpSizePopup()
, mpColumnPopup()
+
+ , mbInvalidateSIDAttrPageOnSIDAttrPageSizeNotify( false )
{
Initialize();
+ mbInvalidateSIDAttrPageOnSIDAttrPageSizeNotify = true;
FreeResource();
}
@@ -563,7 +566,10 @@ void PagePropertyPanel::NotifyItemUpdate
break;
case SID_ATTR_PAGE_SIZE:
- mpBindings->Invalidate( SID_ATTR_PAGE, sal_True, sal_False );
+ if ( mbInvalidateSIDAttrPageOnSIDAttrPageSizeNotify )
+ {
+ mpBindings->Invalidate( SID_ATTR_PAGE, sal_True, sal_False );
+ }
if ( eState >= SFX_ITEM_AVAILABLE &&
pState && pState->ISA(SvxSizeItem) )
{
Modified: openoffice/branches/sidebar/main/sw/source/ui/sidebar/PagePropertyPanel.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sw/source/ui/sidebar/PagePropertyPanel.hxx?rev=1457743&r1=1457742&r2=1457743&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sw/source/ui/sidebar/PagePropertyPanel.hxx (original)
+++ openoffice/branches/sidebar/main/sw/source/ui/sidebar/PagePropertyPanel.hxx Mon Mar 18 12:53:41 2013
@@ -210,6 +210,8 @@ namespace sw { namespace sidebar {
::boost::scoped_ptr< ::svx::sidebar::Popup > mpSizePopup;
::boost::scoped_ptr< ::svx::sidebar::Popup > mpColumnPopup;
+ bool mbInvalidateSIDAttrPageOnSIDAttrPageSizeNotify;
+
// handler for popup toolboxes to show the popups
DECL_LINK(ClickOrientationHdl, ToolBox* );
DECL_LINK(ClickMarginHdl, ToolBox* );