summaryrefslogtreecommitdiff
path: root/framework/source/layoutmanager
diff options
context:
space:
mode:
authorCarsten Driesner <cd@openoffice.org>2010-06-24 11:35:00 +0200
committerCarsten Driesner <cd@openoffice.org>2010-06-24 11:35:00 +0200
commit2a40b4b78143f09358c1f319e8608dbd61bbe2d6 (patch)
tree60668145121dc3e45a60d569f9c2947afda15e30 /framework/source/layoutmanager
parent2b1c9f5c63f4d90db0137b1c8c91340bb2559115 (diff)
parent34dd33af79caf3a13ec3a4e7098616ac0b16cf50 (diff)
Merge changes
Diffstat (limited to 'framework/source/layoutmanager')
-rw-r--r--framework/source/layoutmanager/layoutmanager.cxx8
1 files changed, 8 insertions, 0 deletions
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index 4eb3d76a8f08..cc8795171de7 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -2625,6 +2625,14 @@ throw (RuntimeException)
impl_setDockingWindowVisibility( xSMGR, xFrame, aElementName, true );
}
+ else if ( aElementType.equalsIgnoreAsciiCaseAscii( "toolpanel" ))
+ {
+ ReadGuard aReadGuard( m_aLock );
+ css::uno::Reference< css::frame::XFrame > xFrame( m_xFrame );
+ aReadGuard.unlock();
+
+ ActivateToolPanel( m_xFrame, aName );
+ }
}
if ( bNotify )