diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:11:16 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:11:16 +0200 |
commit | 0553d10867217e30a86c88c17ccb15a06030ce07 (patch) | |
tree | 4d85a5a78ea132f8fd53b26ce93e94ae30dad1f9 /sd/source/ui/view/frmview.cxx | |
parent | d0ac8f1e7866c637be15f081b59ef456aacb954a (diff) |
recreated tag OOO_BUILD_3_2_98_1 which had these commits:
commit c0de36f21ef8f0afd7667f53a5d97dbc264a1cfb (tag: refs/tags/OOO_BUILD_3_2_98_1)
Author: Petr Mladek <pmladek@walk.suse.cz>
Date: Wed Sep 15 19:03:26 2010 +0200
Release ooo-build-3.2.98.1, tag OOO_BUILD_3_2_98_1 (3.3-alpha1)
commit e31a45314a5a2f1e7e2bbea4a2bb6eca7beb7962
Merge: 7234327 29a7259
Author: Jan Holesovsky <kendy@suse.cz>
Date: Wed Sep 8 11:34:03 2010 +0200
Merge commit 'ooo/OOO330_m7'
commit 29a72592b0046498a30e87a7beedae4d29161f9b (tag: refs/tags/ooo/OOO330_m7)
Merge: 10146e0 6b04480
Author: Kurt Zenker <kz@openoffice.org>
Date: Tue Aug 31 15:10:03 2010 +0200
CWS-TOOLING: integrate CWS impress197
commit 6b04480dd88a5bd048d12874dc8c07630670c239
Author: sj <sj@openoffice.org>
Date: Mon Aug 9 14:11:58 2010 +0200
impress197: #163250# fixed string handling, improved polygon splitting
sd/source/filter/ppt/propread.cxx | 128 ++++++++++++++++++++++++-------------
1 files changed, 83 insertions(+), 45 deletions(-)
commit a37d85f979d1616b158c918762821ed82b1e0691
Merge: 1380a03 d766efe
Author: Christian Lippka <christian.lippka@sun.com>
Date: Fri Aug 6 14:53:07 2010 +0200
merge
commit 1380a03aaf7464643eb99de1488ab5b372663ccd
Author: Christian Lippka <christian.lippka@sun.com>
Date: Wed Aug 4 10:48:35 2010 +0200
#i113603# only change layout shape size on init or of user call is set
sd/source/core/sdpage.cxx | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit d766efe9f601a65cd22b46e0f4131d9acd74b1a8
Author: Andre Fischer<andre.f.fischer <Andre Fischer<andre.f.fischer@oracle.com>
Date: Thu Jan 1 00:00:00 1970 +0000
impress197: #i112420# Create accessibility object of ToolPanelViewShell in constructor.
sd/source/ui/toolpanel/ToolPanelViewShell.cxx | 17 +++++++++++++++--
sd/source/ui/view/sdwindow.cxx | 4 ++--
2 files changed, 17 insertions(+), 4 deletions(-)
Notes
Notes:
split repo tag: impress_OOO_BUILD_3_2_98_1
Diffstat (limited to 'sd/source/ui/view/frmview.cxx')
-rw-r--r-- | sd/source/ui/view/frmview.cxx | 76 |
1 files changed, 38 insertions, 38 deletions
diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx index aca0130624ce..f2c32ac2022f 100644 --- a/sd/source/ui/view/frmview.cxx +++ b/sd/source/ui/view/frmview.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -126,7 +126,7 @@ FrameView::FrameView(SdDrawDocument* pDrawDoc, FrameView* pFrameView /* = NULK * { default: // case ViewShell::ST_IMPRESS: -// case ViewShell::ST_NOTES: +// case ViewShell::ST_NOTES: // case ViewShell::ST_HANDOUT: mnPresViewShellId = SID_VIEWSHELL0; break; @@ -183,7 +183,7 @@ FrameView::FrameView(SdDrawDocument* pDrawDoc, FrameView* pFrameView /* = NULK * SetEliminatePolyPointLimitAngle( pFrameView->GetEliminatePolyPointLimitAngle() ); SetEliminatePolyPoints( pFrameView->IsEliminatePolyPoints() ); // #110094#-7 -// SetMasterPagePaintCaching( pFrameView->IsMasterPagePaintCaching() ); +// SetMasterPagePaintCaching( pFrameView->IsMasterPagePaintCaching() ); SetDesignMode( pFrameView->IsDesignMode() ); SetSolidMarkHdl( pFrameView->IsSolidMarkHdl() ); @@ -209,12 +209,12 @@ FrameView::FrameView(SdDrawDocument* pDrawDoc, FrameView* pFrameView /* = NULK * SetViewShEditModeOnLoad(pFrameView->GetViewShEditModeOnLoad()); mbLayerMode = pFrameView->IsLayerMode(); mbQuickEdit = pFrameView->IsQuickEdit(); - + // #i26631# SetMasterPagePaintCaching( pFrameView->IsMasterPagePaintCaching() ); - + SetDragWithCopy( pFrameView->IsDragWithCopy() ); - mbBigHandles = pFrameView->IsBigHandles(); + mbBigHandles = pFrameView->IsBigHandles(); mbDoubleClickTextEdit = pFrameView->IsDoubleClickTextEdit(); mbClickChangeRotation = pFrameView->IsClickChangeRotation(); mnSlidesPerRow = pFrameView->GetSlidesPerRow(); @@ -352,7 +352,7 @@ void FrameView::Update(SdOptions* pOptions) SetOrtho( pOptions->IsOrtho() ); SetEliminatePolyPointLimitAngle( pOptions->GetEliminatePolyPointLimitAngle() ); // #110094#-7 -// SetMasterPagePaintCaching( pOptions->IsMasterPagePaintCaching() ); +// SetMasterPagePaintCaching( pOptions->IsMasterPagePaintCaching() ); GetModel()->SetPickThroughTransparentTextFrames( pOptions->IsPickThrough() ); SetSolidMarkHdl( pOptions->IsSolidMarkHdl() ); @@ -364,10 +364,10 @@ void FrameView::Update(SdOptions* pOptions) Fraction aFractY(pOptions->GetFldDrawY(), pOptions->GetFldDrawY() / ( pOptions->GetFldDivisionY() ? pOptions->GetFldDivisionY() : 1 )); SetSnapGridWidth(aFractX, aFractY); SetQuickEdit(pOptions->IsQuickEdit()); - + // #i26631# SetMasterPagePaintCaching( pOptions->IsMasterPagePaintCaching() ); - + SetDragWithCopy(pOptions->IsDragWithCopy()); SetBigHandles( pOptions->IsBigHandles() ); SetDoubleClickTextEdit( pOptions->IsDoubleClickTextEdit() ); @@ -491,38 +491,38 @@ void FrameView::WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com: aUserData.addValue( sUNO_View_IsSnapToObjectFrame, makeAny( (sal_Bool)IsOFrmSnap() ) ); aUserData.addValue( sUNO_View_IsSnapToObjectPoints, makeAny( (sal_Bool)IsOPntSnap() ) ); -// pValue->Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( sUNO_View_IsSnapLinesVisible ) ); -// pValue->Value <<= (sal_Bool)IsHlplVisible(); +// pValue->Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( sUNO_View_IsSnapLinesVisible ) ); +// pValue->Value <<= (sal_Bool)IsHlplVisible(); // pValue++;nIndex++; -// pValue->Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( sUNO_View_IsDragStripes ) ); -// pValue->Value <<= (sal_Bool)IsDragStripes(); +// pValue->Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( sUNO_View_IsDragStripes ) ); +// pValue->Value <<= (sal_Bool)IsDragStripes(); // pValue++;nIndex++; aUserData.addValue( sUNO_View_IsPlusHandlesAlwaysVisible, makeAny( (sal_Bool)IsPlusHandlesAlwaysVisible() ) ); aUserData.addValue( sUNO_View_IsFrameDragSingles, makeAny( (sal_Bool)IsFrameDragSingles() ) ); -// pValue->Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( sUNO_View_IsMarkedHitMovesAlways ) ); -// pValue->Value <<= (sal_Bool)IsMarkedHitMovesAlways(); +// pValue->Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( sUNO_View_IsMarkedHitMovesAlways ) ); +// pValue->Value <<= (sal_Bool)IsMarkedHitMovesAlways(); // pValue++;nIndex++; aUserData.addValue( sUNO_View_EliminatePolyPointLimitAngle, makeAny( (sal_Int32)GetEliminatePolyPointLimitAngle() ) ); aUserData.addValue( sUNO_View_IsEliminatePolyPoints, makeAny( (sal_Bool)IsEliminatePolyPoints() ) ); -// pValue->Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( sUNO_View_IsLineDraft ) ); -// pValue->Value <<= (sal_Bool)IsLineDraft(); +// pValue->Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( sUNO_View_IsLineDraft ) ); +// pValue->Value <<= (sal_Bool)IsLineDraft(); // pValue++;nIndex++; -// pValue->Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( sUNO_View_IsFillDraft ) ); -// pValue->Value <<= (sal_Bool)IsFillDraft(); +// pValue->Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( sUNO_View_IsFillDraft ) ); +// pValue->Value <<= (sal_Bool)IsFillDraft(); // pValue++;nIndex++; -// pValue->Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( sUNO_View_IsTextDraft ) ); -// pValue->Value <<= (sal_Bool)IsTextDraft(); +// pValue->Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( sUNO_View_IsTextDraft ) ); +// pValue->Value <<= (sal_Bool)IsTextDraft(); // pValue++;nIndex++; -// pValue->Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( sUNO_View_IsGrafDraft ) ); -// pValue->Value <<= (sal_Bool)IsGrafDraft(); +// pValue->Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( sUNO_View_IsGrafDraft ) ); +// pValue->Value <<= (sal_Bool)IsGrafDraft(); // pValue++;nIndex++; Any aAny; @@ -552,16 +552,16 @@ void FrameView::WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com: aUserData.addValue( sUNO_View_SelectedPage, makeAny( (sal_Int16)GetSelectedPage() ) ); aUserData.addValue( sUNO_View_IsLayerMode, makeAny( (sal_Bool)IsLayerMode() ) ); -// pValue->Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( sUNO_View_IsQuickEdit ) ); -// pValue->Value <<= (sal_Bool)IsQuickEdit(); +// pValue->Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( sUNO_View_IsQuickEdit ) ); +// pValue->Value <<= (sal_Bool)IsQuickEdit(); // pValue++;nIndex++; aUserData.addValue( sUNO_View_IsBigHandles, makeAny( (sal_Bool)IsBigHandles() ) ); aUserData.addValue( sUNO_View_IsDoubleClickTextEdit, makeAny( (sal_Bool)IsDoubleClickTextEdit() ) ); aUserData.addValue( sUNO_View_IsClickChangeRotation, makeAny( (sal_Bool)IsClickChangeRotation() ) ); -// pValue->Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( sUNO_View_IsDragWithCopy ) ); -// pValue->Value <<= (sal_Bool)IsDragWithCopy(); +// pValue->Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( sUNO_View_IsDragWithCopy ) ); +// pValue->Value <<= (sal_Bool)IsDragWithCopy(); // pValue++;nIndex++; aUserData.addValue( sUNO_View_SlidesPerRow, makeAny( (sal_Int16)GetSlidesPerRow() ) ); @@ -761,14 +761,14 @@ void FrameView::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < : SetLayerMode( bBool ); } } -/* else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsQuickEdit ) ) ) +/* else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsQuickEdit ) ) ) { if( pValue->Value >>= bBool ) { SetQuickEdit( bBool ); } } -*/ else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsBigHandles ) ) ) +*/ else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsBigHandles ) ) ) { if( pValue->Value >>= bBool ) { @@ -789,14 +789,14 @@ void FrameView::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < : SetClickChangeRotation( bBool ); } } -/* else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsDragWithCopy ) ) ) +/* else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsDragWithCopy ) ) ) { if( pValue->Value >>= bBool ) { SetDragWithCopy( bBool ); } } -*/ else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_SlidesPerRow ) ) ) +*/ else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_SlidesPerRow ) ) ) { if( pValue->Value >>= nInt16 ) { @@ -949,7 +949,7 @@ void FrameView::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < : SetOPntSnap( bBool ); } } -/* else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsSnapLinesVisible ) ) ) +/* else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsSnapLinesVisible ) ) ) { if( pValue->Value >>= bBool ) { @@ -963,7 +963,7 @@ void FrameView::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < : SetDragStripes( bBool ); } } -*/ else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsPlusHandlesAlwaysVisible ) ) ) +*/ else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsPlusHandlesAlwaysVisible ) ) ) { if( pValue->Value >>= bBool ) { @@ -977,14 +977,14 @@ void FrameView::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < : SetFrameDragSingles( bBool ); } } -/* else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsMarkedHitMovesAlways ) ) ) +/* else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsMarkedHitMovesAlways ) ) ) { if( pValue->Value >>= bBool ) { SetMarkedHitMovesAlways( bBool ); } } -*/ else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_EliminatePolyPointLimitAngle ) ) ) +*/ else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_EliminatePolyPointLimitAngle ) ) ) { if( pValue->Value >>= nInt32 ) { @@ -1182,8 +1182,8 @@ ViewShell::ShellType FrameView::GetViewShellTypeOnLoad (void) const void FrameView::SetSelectedPage(USHORT nPage) -{ - mnSelectedPage = nPage; +{ + mnSelectedPage = nPage; } @@ -1191,7 +1191,7 @@ void FrameView::SetSelectedPage(USHORT nPage) USHORT FrameView::GetSelectedPage (void) const { - return mnSelectedPage; + return mnSelectedPage; } |