diff options
| author | sj <sj@openoffice.org> | 2010-08-13 15:02:26 +0200 |
|---|---|---|
| committer | sj <sj@openoffice.org> | 2010-08-13 15:02:26 +0200 |
| commit | e91eb75f9e7f7788e648a0d270f2166222ed54ab (patch) | |
| tree | 1d3724109b0dd67b4f0a7930fd4f6bc03b6cd353 /svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx | |
| parent | e316ce7a8f784231ff39bb069ec6eac0aefca9ce (diff) | |
| parent | 0e6f37318dd855bd04e3281435d1af751398c98f (diff) | |
impress186: merge with DEV300m86
Diffstat (limited to 'svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx')
| -rw-r--r-- | svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx index 2320944afd03..089f75aa8ade 100644 --- a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx @@ -77,8 +77,16 @@ namespace if(pPage && pPage->GetModel()) { - const sal_uInt16 nPageCount(pPage->GetModel()->GetPageCount()); - nRetval = ((sal_Int16)nPageCount - 1) / 2; + if( (pPage->GetPageNum() == 0) && !pPage->IsMasterPage() ) + { + // handout page! + return pPage->GetModel()->getHandoutPageCount(); + } + else + { + const sal_uInt16 nPageCount(pPage->GetModel()->GetPageCount()); + nRetval = ((sal_Int16)nPageCount - 1) / 2; + } } return nRetval; |