← Back to branch summary

~ubuntu-branches/ubuntu/maverick/scribus-ng/maverick-backports

« back to all changes in this revision

Viewing changes to scribus/page.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Oleksandr Moskalenko
  • Date: 2010-07-15 12:43:00 UTC
  • mfrom: (0.1.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20100715124300-2u304r2rvy55vpkv
Tags: 1.3.7.dfsg~svn20100715-1
* Upstream svn. update.
* debian/scribus-ng.lintian: Updated overrides.
* debian/control: Updated standards version to 3.9.0.

Show diffs side-by-side

added added

removed removed

Lines of Context:
scribus/page.cpp
360
360
        m_initialWidth = sourcePage->m_initialWidth;
361
361
        m_initialHeight = sourcePage->m_initialHeight;
362
362
 
363
 
        Margins.Top = pageMargins.Top;
 
363
        Margins.Top    = pageMargins.Top;
364
364
        Margins.Bottom = pageMargins.Bottom;
365
 
        Margins.Left = pageMargins.Left;//todo fix for layouts
366
 
        Margins.Right = pageMargins.Right;
367
 
        initialMargins.Top = pageMargins.Top;
368
 
        initialMargins.Bottom = pageMargins.Bottom;
369
 
        initialMargins.Left = pageMargins.Left;
370
 
        initialMargins.Right = pageMargins.Right;
 
365
        Margins.Left   = pageMargins.Left;//todo fix for layouts
 
366
        Margins.Right  = pageMargins.Right;
 
367
        // #8859 do not get initialMargins from pageMargins otherwise
 
368
        // margins may be inverted when applying master pages
 
369
        initialMargins.Top    = sourcePage->initialMargins.Top;
 
370
        initialMargins.Bottom = sourcePage->initialMargins.Bottom;
 
371
        initialMargins.Left   = sourcePage->initialMargins.Left;
 
372
        initialMargins.Right  = sourcePage->initialMargins.Right;
371
373
}