summaryrefslogtreecommitdiff
path: root/filter
diff options
context:
space:
mode:
authorMarco Cecchetti <mrcekets@gmail.com>2012-06-09 19:55:50 +0200
committerMarco Cecchetti <mrcekets@gmail.com>2012-06-15 10:14:59 +0200
commita7bd0355844f5bc4a3717df059ecfa5743b041fe (patch)
tree03d8af140c9054c94ea88ea1246344a91fd5a3b8 /filter
parent61360495ac22065c5de08f55ec6dd8144a25b1aa (diff)
Fixed a bug related to text fields introduced on the last commit.
Diffstat (limited to 'filter')
-rw-r--r--filter/source/svg/presentation_engine.js10
1 files changed, 4 insertions, 6 deletions
diff --git a/filter/source/svg/presentation_engine.js b/filter/source/svg/presentation_engine.js
index 73e0bf7c6d8f..1ce3e1634b8f 100644
--- a/filter/source/svg/presentation_engine.js
+++ b/filter/source/svg/presentation_engine.js
@@ -1952,10 +1952,6 @@ PlaceholderShape.prototype.init = function()
var aTextFieldElement = getElementByClassName( this.masterPage.backgroundObjects, this.className );
if( aTextFieldElement )
{
- var sVisibility = aTextFieldElement.getAttribute( 'visibility' );
- if( sVisibility == 'hidden' )
- return;
-
var aPlaceholderElement = getElementByClassName( aTextFieldElement, 'PlaceholderText' );
if( aPlaceholderElement )
{
@@ -2131,7 +2127,8 @@ MasterPageView.prototype.createElement = function()
// (because the slide number of two slide is always different).
if( aPlaceholderShapeSet[aSlideNumberClassName] &&
aPlaceholderShapeSet[aSlideNumberClassName].isValid() &&
- this.aMetaSlide.nIsPageNumberVisible )
+ this.aMetaSlide.nIsPageNumberVisible &&
+ aTextFieldContentProviderSet[aSlideNumberClassName] )
{
this.aSlideNumberFieldHandler =
new SlideNumberFieldHandler( aPlaceholderShapeSet[aSlideNumberClassName],
@@ -2188,7 +2185,8 @@ function( sClassName, aPlaceholderShapeSet, aTextFieldContentProviderSet,
{
var aTextFieldHandler = null;
if( aPlaceholderShapeSet[sClassName] &&
- aPlaceholderShapeSet[sClassName].isValid() )
+ aPlaceholderShapeSet[sClassName].isValid()
+ && aTextFieldContentProviderSet[sClassName] )
{
var sTextFieldContentProviderId = aTextFieldContentProviderSet[sClassName].sId;
// We create only one single TextFieldHandler object (and so one only