MasterPageContainer.cxx (02c50d82) MasterPageContainer.cxx (b862c97c)
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 685 unchanged lines hidden (view full) ---

694 // The default aspect ratio is 4:3
695 int nWidth (4);
696 int nHeight (3);
697
698 // Search for the first entry with an existing master page.
699 MasterPageContainerType::const_iterator iDescriptor;
700 MasterPageContainerType::const_iterator iContainerEnd(maContainer.end());
701 for (iDescriptor=maContainer.begin(); iDescriptor!=iContainerEnd; ++iDescriptor)
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 685 unchanged lines hidden (view full) ---

694 // The default aspect ratio is 4:3
695 int nWidth (4);
696 int nHeight (3);
697
698 // Search for the first entry with an existing master page.
699 MasterPageContainerType::const_iterator iDescriptor;
700 MasterPageContainerType::const_iterator iContainerEnd(maContainer.end());
701 for (iDescriptor=maContainer.begin(); iDescriptor!=iContainerEnd; ++iDescriptor)
702 if (*iDescriptor!=NULL && (*iDescriptor)->mpMasterPage != NULL)
702 if( bool(*iDescriptor) && (*iDescriptor)->mpMasterPage != NULL)
703 {
704 Size aPageSize ((*iDescriptor)->mpMasterPage->GetSize());
705 nWidth = aPageSize.Width();
706 nHeight = aPageSize.Height();
707 mbFirstPageObjectSeen = true;
708 break;
709 }
710

--- 502 unchanged lines hidden ---
703 {
704 Size aPageSize ((*iDescriptor)->mpMasterPage->GetSize());
705 nWidth = aPageSize.Width();
706 nHeight = aPageSize.Height();
707 mbFirstPageObjectSeen = true;
708 break;
709 }
710

--- 502 unchanged lines hidden ---