This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new 5829e3e Fixed typos, removed whitespace
5829e3e is described below
commit 5829e3e65d041dae4777b7e48d9eac1549ff4f1a
Author: mseidel <msei...@apache.org>
AuthorDate: Thu Dec 9 15:34:28 2021 +0100
Fixed typos, removed whitespace
---
main/sd/source/ui/app/optsitem.cxx | 278 +++++++++++++++++--------------------
main/sd/source/ui/app/sddll2.cxx | 36 +++--
main/sd/source/ui/app/sdmod.cxx | 96 ++++++-------
main/sd/source/ui/app/sdmod2.cxx | 208 ++++++++++++++-------------
main/sd/source/ui/app/sdpopup.cxx | 32 ++---
5 files changed, 298 insertions(+), 352 deletions(-)
diff --git a/main/sd/source/ui/app/optsitem.cxx
b/main/sd/source/ui/app/optsitem.cxx
index 543e235..e75f1ac 100644
--- a/main/sd/source/ui/app/optsitem.cxx
+++ b/main/sd/source/ui/app/optsitem.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -198,18 +198,16 @@ void SdOptionsGeneric::Store()
bool SdOptionsGeneric::isMetricSystem()
{
SvtSysLocale aSysLocale;
- MeasurementSystem eSys =
aSysLocale.GetLocaleDataPtr()->getMeasurementSystemEnum();
+ MeasurementSystem eSys =
aSysLocale.GetLocaleDataPtr()->getMeasurementSystemEnum();
return ( eSys == MEASURE_METRIC );
}
/*************************************************************************
-|*
|* SdOptionsLayout
-|*
\************************************************************************/
-SdOptionsLayout::SdOptionsLayout( sal_uInt16 nConfigId, sal_Bool bUseConfig )
:
+SdOptionsLayout::SdOptionsLayout( sal_uInt16 nConfigId, sal_Bool bUseConfig ) :
SdOptionsGeneric( nConfigId, bUseConfig ?
( ( SDCFG_DRAW == nConfigId ) ?
B2U( "Office.Draw/Layout" ) :
@@ -221,7 +219,7 @@ SdOptionsLayout::SdOptionsLayout( sal_uInt16 nConfigId,
sal_Bool bUseConfig ) :
bHandlesBezier( sal_False ),
bHelplines( sal_True ),
nMetric((sal_uInt16)(isMetricSystem() ? FUNIT_CM : FUNIT_INCH)),
- nDefTab( 1250 )
+ nDefTab( 1250 )
{
EnableModify( sal_True );
}
@@ -304,9 +302,7 @@ sal_Bool SdOptionsLayout::WriteData( Any* pValues ) const
}
/*************************************************************************
-|*
|* SdOptionsLayoutItem
-|*
\************************************************************************/
SdOptionsLayoutItem::SdOptionsLayoutItem( sal_uInt16 _nWhich )
@@ -358,7 +354,7 @@ SfxPoolItem* SdOptionsLayoutItem::Clone( SfxItemPool* )
const
int SdOptionsLayoutItem::operator==( const SfxPoolItem& rAttr ) const
{
const bool bSameType = SfxPoolItem::operator==( rAttr );
- DBG_ASSERT( bSameType, "SdOptionsLayoutItem::operator==(), differen
pool item type!" );
+ DBG_ASSERT( bSameType, "SdOptionsLayoutItem::operator==(), different
pool item type!" );
return bSameType && ( maOptionsLayout == static_cast< const
SdOptionsLayoutItem& >( rAttr ).maOptionsLayout );
}
@@ -379,9 +375,7 @@ void SdOptionsLayoutItem::SetOptions( SdOptions* pOpts )
const
}
/*************************************************************************
-|*
|* SdOptionsContents
-|*
\************************************************************************/
SdOptionsContents::SdOptionsContents( sal_uInt16 nConfigId, sal_Bool
bUseConfig ) :
@@ -398,7 +392,7 @@ SdOptionsContents::SdOptionsContents( sal_uInt16 nConfigId,
sal_Bool bUseConfig
sal_Bool SdOptionsContents::operator==(const SdOptionsContents&) const
{
- return true;
+ return true;
}
//
-----------------------------------------------------------------------------
@@ -438,9 +432,7 @@ sal_Bool SdOptionsContents::WriteData( Any* pValues ) const
}
/*************************************************************************
-|*
|* SdOptionsContentsItem
-|*
\************************************************************************/
SdOptionsContentsItem::SdOptionsContentsItem(sal_uInt16 _nWhich, SdOptions*,
::sd::FrameView*)
@@ -461,7 +453,7 @@ SfxPoolItem* SdOptionsContentsItem::Clone( SfxItemPool* )
const
int SdOptionsContentsItem::operator==( const SfxPoolItem& rAttr ) const
{
const bool bSameType = SfxPoolItem::operator==(rAttr);
- DBG_ASSERT( bSameType, "SdOptionsContentsItem::operator==(), differen
pool item type!" );
+ DBG_ASSERT( bSameType, "SdOptionsContentsItem::operator==(), different
pool item type!" );
return bSameType && ( maOptionsContents == static_cast<const
SdOptionsContentsItem&>( rAttr ).maOptionsContents );
}
@@ -472,9 +464,7 @@ void SdOptionsContentsItem::SetOptions(SdOptions*) const
}
/*************************************************************************
-|*
|* SdOptionsMisc
-|*
\************************************************************************/
SdOptionsMisc::SdOptionsMisc( sal_uInt16 nConfigId, sal_Bool bUseConfig ) :
@@ -494,18 +484,18 @@ SdOptionsMisc::SdOptionsMisc( sal_uInt16 nConfigId,
sal_Bool bUseConfig ) :
bMasterPageCache( sal_True ),
bDragWithCopy( sal_False ),
bPickThrough( sal_True ),
- bBigHandles( sal_True ), // new default: Use big handles
+ bBigHandles( sal_True ), // new default: Use big handles
bDoubleClickTextEdit( sal_True ),
bClickChangeRotation( sal_False ),
bStartWithActualPage( sal_False ),
- bStartWithPresenterScreen( sal_True ), // default: Enable the Presenter
Screen
+ bStartWithPresenterScreen( sal_True ), // default: Enable the Presenter
Screen
bSolidDragging( sal_True ),
- bSolidMarkHdl( sal_True ), // default: Use nice handles
+ bSolidMarkHdl( sal_True ), // default: Use nice handles
bSummationOfParagraphs( sal_False ),
// #90356#
bShowUndoDeleteWarning( sal_True ),
- bSlideshowRespectZOrder( sal_True ),
- bShowComments( sal_True ),
+ bSlideshowRespectZOrder( sal_True ),
+ bShowComments( sal_True ),
bPreviewNewEffects( sal_True ),
bPreviewChangedEffects( sal_False ),
bPreviewTransitions( sal_True ),
@@ -514,7 +504,7 @@ SdOptionsMisc::SdOptionsMisc( sal_uInt16 nConfigId,
sal_Bool bUseConfig ) :
mnPenWidth( 150.0 ),
// The default for 6.1-and-above documents is to use printer-independent
- // formatting.
+ // formatting.
mnPrinterIndependentLayout (1)
{
EnableModify( sal_True );
@@ -536,7 +526,7 @@ sal_Bool SdOptionsMisc::operator==( const SdOptionsMisc&
rOpt ) const
IsDoubleClickTextEdit() == rOpt.IsDoubleClickTextEdit()
&&
IsClickChangeRotation() == rOpt.IsClickChangeRotation()
&&
IsStartWithActualPage() == rOpt.IsStartWithActualPage()
&&
- IsStartWithPresenterScreen() == rOpt.IsStartWithPresenterScreen()
&&
+ IsStartWithPresenterScreen() ==
rOpt.IsStartWithPresenterScreen() &&
IsSummationOfParagraphs() ==
rOpt.IsSummationOfParagraphs() &&
IsSolidDragging() == rOpt.IsSolidDragging() &&
IsSolidMarkHdl() == rOpt.IsSolidMarkHdl() &&
@@ -580,7 +570,7 @@ void SdOptionsMisc::GetPropNameArray( const char**&
ppNames, sal_uLong& rCount )
"DefaultObjectSize/Width",
"DefaultObjectSize/Height",
- "Compatibility/PrinterIndependentLayout",
+ "Compatibility/PrinterIndependentLayout",
"ShowComments",
@@ -590,7 +580,7 @@ void SdOptionsMisc::GetPropNameArray( const char**&
ppNames, sal_uLong& rCount )
"Compatibility/AddBetween",
// #90356#
"ShowUndoDeleteWarning",
- "SlideshowRespectZOrder",
+ "SlideshowRespectZOrder",
"PreviewNewEffects",
"PreviewChangedEffects",
@@ -601,7 +591,7 @@ void SdOptionsMisc::GetPropNameArray( const char**&
ppNames, sal_uLong& rCount )
"PenColor",
"PenWidth",
- "Start/PresenterScreen"
+ "Start/PresenterScreen"
};
rCount = ( ( GetConfigId() == SDCFG_IMPRESS ) ? 28 : 16 );
@@ -621,7 +611,7 @@ sal_Bool SdOptionsMisc::ReadData( const Any* pValues )
if( pValues[6].hasValue() ) SetBigHandles( *(sal_Bool*) pValues[ 6
].getValue() );
if( pValues[7].hasValue() ) SetDoubleClickTextEdit( *(sal_Bool*)
pValues[ 7 ].getValue() );
if( pValues[8].hasValue() ) SetClickChangeRotation( *(sal_Bool*)
pValues[ 8 ].getValue() );
- // if( pValues[9].hasValue() ) SetPreviewQuality( FRound( *(double*)
pValues[ 9 ].getValue() ) );
+ // if( pValues[9].hasValue() ) SetPreviewQuality( FRound(
*(double*) pValues[ 9 ].getValue() ) );
if( pValues[10].hasValue() ) SetSolidDragging( *(sal_Bool*) pValues[ 10
].getValue() );
if( pValues[11].hasValue() ) SetSolidMarkHdl( *(sal_Bool*) pValues[ 11
].getValue() );
// #97016#
@@ -629,8 +619,8 @@ sal_Bool SdOptionsMisc::ReadData( const Any* pValues )
if( pValues[13].hasValue() ) SetDefaultObjectSizeHeight( *(sal_uInt32*)
pValues[ 13 ].getValue() );
if( pValues[14].hasValue() ) SetPrinterIndependentLayout(
*(sal_uInt16*) pValues[ 14 ].getValue() );
- if( pValues[15].hasValue() )
- SetShowComments( *(sal_Bool*) pValues[ 15 ].getValue() );
+ if( pValues[15].hasValue() )
+ SetShowComments( *(sal_Bool*) pValues[ 15 ].getValue() );
// just for Impress
if( GetConfigId() == SDCFG_IMPRESS )
@@ -642,11 +632,11 @@ sal_Bool SdOptionsMisc::ReadData( const Any* pValues )
if( pValues[18].hasValue() )
SetSummationOfParagraphs( *(sal_Bool*) pValues[ 18
].getValue() );
// #90356#
- if( pValues[19].hasValue() )
+ if( pValues[19].hasValue() )
SetShowUndoDeleteWarning( *(sal_Bool*) pValues[ 19
].getValue() );
if( pValues[20].hasValue() )
- SetSlideshowRespectZOrder(*(sal_Bool*) pValues[ 20 ].getValue());
+ SetSlideshowRespectZOrder(*(sal_Bool*) pValues[ 20
].getValue());
if( pValues[21].hasValue() )
SetPreviewNewEffects(*(sal_Bool*) pValues[ 21
].getValue());
@@ -666,8 +656,8 @@ sal_Bool SdOptionsMisc::ReadData( const Any* pValues )
if( pValues[26].hasValue() )
SetPresentationPenWidth( getSafeValue< double >(
pValues[ 26 ] ) );
- if( pValues[27].hasValue() )
- SetStartWithPresenterScreen( *(sal_Bool*) pValues[ 27 ].getValue()
);
+ if( pValues[27].hasValue() )
+ SetStartWithPresenterScreen( *(sal_Bool*) pValues[ 27
].getValue() );
}
return sal_True;
@@ -686,7 +676,7 @@ sal_Bool SdOptionsMisc::WriteData( Any* pValues ) const
pValues[ 6 ] <<= IsBigHandles();
pValues[ 7 ] <<= IsDoubleClickTextEdit();
pValues[ 8 ] <<= IsClickChangeRotation();
- // The preview is not supported anymore. Use a dummy value.
+ // The preview is not supported anymore. Use a dummy value.
pValues[ 9 ] <<= (double)0;// GetPreviewQuality();
pValues[ 10 ] <<= IsSolidDragging();
pValues[ 11 ] <<= IsSolidMarkHdl();
@@ -694,8 +684,8 @@ sal_Bool SdOptionsMisc::WriteData( Any* pValues ) const
pValues[ 12 ] <<= GetDefaultObjectSizeWidth();
pValues[ 13 ] <<= GetDefaultObjectSizeHeight();
pValues[ 14 ] <<= GetPrinterIndependentLayout();
- pValues[ 15 ] <<= (sal_Bool)IsShowComments();
-
+ pValues[ 15 ] <<= (sal_Bool)IsShowComments();
+
// just for Impress
if( GetConfigId() == SDCFG_IMPRESS )
{
@@ -715,16 +705,14 @@ sal_Bool SdOptionsMisc::WriteData( Any* pValues ) const
pValues[ 25 ] <<= GetPresentationPenColor();
pValues[ 26 ] <<= GetPresentationPenWidth();
- pValues[ 27 ] <<= IsStartWithPresenterScreen();
+ pValues[ 27 ] <<= IsStartWithPresenterScreen();
}
return sal_True;
}
/*************************************************************************
-|*
|* SdOptionsMiscItem
-|*
\************************************************************************/
SdOptionsMiscItem::SdOptionsMiscItem( sal_uInt16 _nWhich )
@@ -743,7 +731,7 @@ SdOptionsMiscItem::SdOptionsMiscItem( sal_uInt16 _nWhich,
SdOptions* pOpts, ::sd
{
maOptionsMisc.SetStartWithTemplate(
pOpts->IsStartWithTemplate() );
maOptionsMisc.SetStartWithActualPage(
pOpts->IsStartWithActualPage() );
- maOptionsMisc.SetStartWithPresenterScreen(
pOpts->IsStartWithPresenterScreen() );
+ maOptionsMisc.SetStartWithPresenterScreen(
pOpts->IsStartWithPresenterScreen() );
maOptionsMisc.SetSummationOfParagraphs(
pOpts->IsSummationOfParagraphs() );
// #90356#
maOptionsMisc.SetShowUndoDeleteWarning(
pOpts->IsShowUndoDeleteWarning() );
@@ -811,7 +799,7 @@ SfxPoolItem* SdOptionsMiscItem::Clone( SfxItemPool* ) const
int SdOptionsMiscItem::operator==( const SfxPoolItem& rAttr ) const
{
const bool bSameType = SfxPoolItem::operator==(rAttr);
- DBG_ASSERT( bSameType, "SdOptionsMiscItem::operator==(), differen pool
item type!" );
+ DBG_ASSERT( bSameType, "SdOptionsMiscItem::operator==(), different pool
item type!" );
return bSameType && ( maOptionsMisc == static_cast< const
SdOptionsMiscItem& >(rAttr).maOptionsMisc );
}
@@ -833,7 +821,7 @@ void SdOptionsMiscItem::SetOptions( SdOptions* pOpts ) const
pOpts->SetDoubleClickTextEdit(
maOptionsMisc.IsDoubleClickTextEdit() );
pOpts->SetClickChangeRotation(
maOptionsMisc.IsClickChangeRotation() );
pOpts->SetStartWithActualPage(
maOptionsMisc.IsStartWithActualPage() );
- pOpts->SetStartWithPresenterScreen(
maOptionsMisc.IsStartWithPresenterScreen() );
+ pOpts->SetStartWithPresenterScreen(
maOptionsMisc.IsStartWithPresenterScreen() );
pOpts->SetSummationOfParagraphs(
maOptionsMisc.IsSummationOfParagraphs() );
pOpts->SetSolidDragging( maOptionsMisc.IsSolidDragging() );
pOpts->SetSolidMarkHdl( maOptionsMisc.IsSolidMarkHdl() );
@@ -850,22 +838,20 @@ void SdOptionsMiscItem::SetOptions( SdOptions* pOpts )
const
pOpts->SetPreviewTransitions(
maOptionsMisc.IsPreviewTransitions() );
pOpts->SetDisplay( maOptionsMisc.GetDisplay() );
-
+
pOpts->SetPresentationPenColor(
maOptionsMisc.GetPresentationPenColor() );
pOpts->SetPresentationPenWidth(
maOptionsMisc.GetPresentationPenWidth() );
}
}
/*************************************************************************
-|*
|* SdOptionsSnap
-|*
\************************************************************************/
SdOptionsSnap::SdOptionsSnap( sal_uInt16 nConfigId, sal_Bool bUseConfig ) :
- SdOptionsGeneric( nConfigId, bUseConfig ?
- ( ( SDCFG_DRAW == nConfigId ) ?
- B2U( "Office.Draw/Snap" ) :
+ SdOptionsGeneric( nConfigId, bUseConfig ?
+ ( ( SDCFG_DRAW == nConfigId ) ?
+ B2U( "Office.Draw/Snap" ) :
B2U( "Office.Impress/Snap" ) ) :
OUString() ),
bSnapHelplines( sal_True ),
@@ -916,7 +902,7 @@ void SdOptionsSnap::GetPropNameArray( const char**&
ppNames, sal_uLong& rCount )
"Position/RotatingValue",
"Position/PointReduction"
};
-
+
rCount = 10;
ppNames = aPropNames;
}
@@ -925,16 +911,16 @@ void SdOptionsSnap::GetPropNameArray( const char**&
ppNames, sal_uLong& rCount )
sal_Bool SdOptionsSnap::ReadData( const Any* pValues )
{
- if( pValues[0].hasValue() ) SetSnapHelplines( *(sal_Bool*) pValues[ 0
].getValue() );
- if( pValues[1].hasValue() ) SetSnapBorder( *(sal_Bool*)pValues[ 1
].getValue() );
- if( pValues[2].hasValue() ) SetSnapFrame( *(sal_Bool*) pValues[ 2
].getValue() );
- if( pValues[3].hasValue() ) SetSnapPoints( *(sal_Bool*) pValues[ 3
].getValue() );
- if( pValues[4].hasValue() ) SetOrtho( *(sal_Bool*) pValues[ 4
].getValue() );
- if( pValues[5].hasValue() ) SetBigOrtho( *(sal_Bool*) pValues[ 5
].getValue() );
- if( pValues[6].hasValue() ) SetRotate( *(sal_Bool*) pValues[ 6
].getValue() );
- if( pValues[7].hasValue() ) SetSnapArea( (sal_Int16) *(sal_Int32*)
pValues[ 7 ].getValue() );
- if( pValues[8].hasValue() ) SetAngle( (sal_Int16) *(sal_Int32*)
pValues[ 8 ].getValue() );
- if( pValues[9].hasValue() ) SetEliminatePolyPointLimitAngle(
(sal_Int16) *(sal_Int32*) pValues[ 9 ].getValue() );
+ if( pValues[0].hasValue() ) SetSnapHelplines( *(sal_Bool*) pValues[ 0
].getValue() );
+ if( pValues[1].hasValue() ) SetSnapBorder( *(sal_Bool*)pValues[ 1
].getValue() );
+ if( pValues[2].hasValue() ) SetSnapFrame( *(sal_Bool*) pValues[ 2
].getValue() );
+ if( pValues[3].hasValue() ) SetSnapPoints( *(sal_Bool*) pValues[ 3
].getValue() );
+ if( pValues[4].hasValue() ) SetOrtho( *(sal_Bool*) pValues[ 4
].getValue() );
+ if( pValues[5].hasValue() ) SetBigOrtho( *(sal_Bool*) pValues[ 5
].getValue() );
+ if( pValues[6].hasValue() ) SetRotate( *(sal_Bool*) pValues[ 6
].getValue() );
+ if( pValues[7].hasValue() ) SetSnapArea( (sal_Int16) *(sal_Int32*)
pValues[ 7 ].getValue() );
+ if( pValues[8].hasValue() ) SetAngle( (sal_Int16) *(sal_Int32*)
pValues[ 8 ].getValue() );
+ if( pValues[9].hasValue() ) SetEliminatePolyPointLimitAngle(
(sal_Int16) *(sal_Int32*) pValues[ 9 ].getValue() );
return sal_True;
}
@@ -943,24 +929,22 @@ sal_Bool SdOptionsSnap::ReadData( const Any* pValues )
sal_Bool SdOptionsSnap::WriteData( Any* pValues ) const
{
- pValues[ 0 ] <<= IsSnapHelplines();
- pValues[ 1 ] <<= IsSnapBorder();
- pValues[ 2 ] <<= IsSnapFrame();
- pValues[ 3 ] <<= IsSnapPoints();
- pValues[ 4 ] <<= IsOrtho();
- pValues[ 5 ] <<= IsBigOrtho();
- pValues[ 6 ] <<= IsRotate();
- pValues[ 7 ] <<= (sal_Int32) GetSnapArea();
- pValues[ 8 ] <<= (sal_Int32) GetAngle();
- pValues[ 9 ] <<= (sal_Int32) GetEliminatePolyPointLimitAngle();
+ pValues[ 0 ] <<= IsSnapHelplines();
+ pValues[ 1 ] <<= IsSnapBorder();
+ pValues[ 2 ] <<= IsSnapFrame();
+ pValues[ 3 ] <<= IsSnapPoints();
+ pValues[ 4 ] <<= IsOrtho();
+ pValues[ 5 ] <<= IsBigOrtho();
+ pValues[ 6 ] <<= IsRotate();
+ pValues[ 7 ] <<= (sal_Int32) GetSnapArea();
+ pValues[ 8 ] <<= (sal_Int32) GetAngle();
+ pValues[ 9 ] <<= (sal_Int32) GetEliminatePolyPointLimitAngle();
return sal_True;
}
/*************************************************************************
-|*
|* SdOptionsSnapItem
-|*
\************************************************************************/
SdOptionsSnapItem::SdOptionsSnapItem( sal_uInt16 _nWhich )
@@ -1016,7 +1000,7 @@ SfxPoolItem* SdOptionsSnapItem::Clone( SfxItemPool* )
const
int SdOptionsSnapItem::operator==( const SfxPoolItem& rAttr ) const
{
const bool bSameType = SfxPoolItem::operator==(rAttr);
- DBG_ASSERT( bSameType, "SdOptionsSnapItem::operator==(), differen pool
item type!" );
+ DBG_ASSERT( bSameType, "SdOptionsSnapItem::operator==(), different pool
item type!" );
return bSameType && ( maOptionsSnap == static_cast< const
SdOptionsSnapItem& >(rAttr).maOptionsSnap );
}
@@ -1040,18 +1024,16 @@ void SdOptionsSnapItem::SetOptions( SdOptions* pOpts )
const
}
/*************************************************************************
-|*
|* SdOptionsZoom
-|*
\************************************************************************/
SdOptionsZoom::SdOptionsZoom( sal_uInt16 nConfigId, sal_Bool bUseConfig ) :
- SdOptionsGeneric( nConfigId, ( bUseConfig && ( SDCFG_DRAW == nConfigId
) ) ?
- B2U(
"Office.Draw/Zoom" ) :
- OUString() ),
+ SdOptionsGeneric( nConfigId, ( bUseConfig && ( SDCFG_DRAW == nConfigId
) ) ?
+ B2U(
"Office.Draw/Zoom" ) :
+ OUString() ),
nX( 1 ),
- nY( 1 )
-
+ nY( 1 )
+
{
EnableModify( sal_True );
}
@@ -1065,7 +1047,7 @@ sal_Bool SdOptionsZoom::operator==( const SdOptionsZoom&
rOpt ) const
GetScale( nX1, nY1 );
rOpt.GetScale( nX2, nY2 );
- return( ( nX1 == nX2 ) &&
+ return( ( nX1 == nX2 ) &&
( nY1 == nY2 ) );
}
@@ -1078,7 +1060,7 @@ void SdOptionsZoom::GetPropNameArray( const char**&
ppNames, sal_uLong& rCount )
"ScaleX",
"ScaleY"
};
-
+
rCount = ( GetConfigId() == SDCFG_DRAW ) ? 2 : 0;
ppNames = aPropNames;
}
@@ -1089,9 +1071,9 @@ sal_Bool SdOptionsZoom::ReadData( const Any* pValues )
{
sal_Int32 x = 1, y = 1;
- if( pValues[0].hasValue() ) x = ( *(sal_Int32*) pValues[ 0 ].getValue()
);
- if( pValues[1].hasValue() ) y = ( *(sal_Int32*) pValues[ 1 ].getValue()
);
-
+ if( pValues[0].hasValue() ) x = ( *(sal_Int32*) pValues[ 0 ].getValue()
);
+ if( pValues[1].hasValue() ) y = ( *(sal_Int32*) pValues[ 1 ].getValue()
);
+
SetScale( x, y );
return sal_True;
@@ -1105,22 +1087,20 @@ sal_Bool SdOptionsZoom::WriteData( Any* pValues ) const
GetScale( x, y );
- pValues[ 0 ] <<= (sal_Int32) x;
- pValues[ 1 ] <<= (sal_Int32) y;
+ pValues[ 0 ] <<= (sal_Int32) x;
+ pValues[ 1 ] <<= (sal_Int32) y;
return sal_True;
}
/*************************************************************************
-|*
|* SdOptionsGrid
-|*
\************************************************************************/
SdOptionsGrid::SdOptionsGrid( sal_uInt16 nConfigId, sal_Bool bUseConfig ) :
- SdOptionsGeneric( nConfigId, bUseConfig ?
- ( ( SDCFG_DRAW == nConfigId ) ?
- B2U( "Office.Draw/Grid" ) :
+ SdOptionsGeneric( nConfigId, bUseConfig ?
+ ( ( SDCFG_DRAW == nConfigId ) ?
+ B2U( "Office.Draw/Grid" ) :
B2U( "Office.Impress/Grid" ) ) :
OUString() )
{
@@ -1213,27 +1193,27 @@ void SdOptionsGrid::GetPropNameArray( const char**&
ppNames, sal_uLong& rCount )
sal_Bool SdOptionsGrid::ReadData( const Any* pValues )
{
- if( pValues[0].hasValue() ) SetFldDrawX( *(sal_Int32*) pValues[ 0
].getValue() );
- if( pValues[1].hasValue() ) SetFldDrawY( *(sal_Int32*) pValues[ 1
].getValue() );
+ if( pValues[0].hasValue() ) SetFldDrawX( *(sal_Int32*) pValues[ 0
].getValue() );
+ if( pValues[1].hasValue() ) SetFldDrawY( *(sal_Int32*) pValues[ 1
].getValue() );
if( pValues[2].hasValue() )
{
const sal_uInt32 nDivX = FRound( *(double*) pValues[ 2
].getValue() );
- SetFldDivisionX( SvxOptionsGrid::GetFldDrawX() / ( nDivX + 1 )
);
+ SetFldDivisionX( SvxOptionsGrid::GetFldDrawX() / ( nDivX + 1 )
);
}
if( pValues[3].hasValue() )
{
const sal_uInt32 nDivY = FRound( *(double*) pValues[ 3
].getValue() );
- SetFldDivisionY( SvxOptionsGrid::GetFldDrawY() / ( nDivY + 1 )
);
+ SetFldDivisionY( SvxOptionsGrid::GetFldDrawY() / ( nDivY + 1 )
);
}
- if( pValues[4].hasValue() ) SetFldSnapX( *(sal_Int32*) pValues[ 4
].getValue() );
- if( pValues[5].hasValue() ) SetFldSnapY( *(sal_Int32*) pValues[ 5
].getValue() );
- if( pValues[6].hasValue() ) SetUseGridSnap( *(sal_Bool*) pValues[ 6
].getValue() );
- if( pValues[7].hasValue() ) SetSynchronize( *(sal_Bool*) pValues[ 7
].getValue() );
- if( pValues[8].hasValue() ) SetGridVisible( *(sal_Bool*) pValues[ 8
].getValue() );
- if( pValues[9].hasValue() ) SetEqualGrid( *(sal_Bool*) pValues[ 9
].getValue() );
+ if( pValues[4].hasValue() ) SetFldSnapX( *(sal_Int32*) pValues[ 4
].getValue() );
+ if( pValues[5].hasValue() ) SetFldSnapY( *(sal_Int32*) pValues[ 5
].getValue() );
+ if( pValues[6].hasValue() ) SetUseGridSnap( *(sal_Bool*) pValues[ 6
].getValue() );
+ if( pValues[7].hasValue() ) SetSynchronize( *(sal_Bool*) pValues[ 7
].getValue() );
+ if( pValues[8].hasValue() ) SetGridVisible( *(sal_Bool*) pValues[ 8
].getValue() );
+ if( pValues[9].hasValue() ) SetEqualGrid( *(sal_Bool*) pValues[ 9
].getValue() );
return sal_True;
}
@@ -1242,24 +1222,22 @@ sal_Bool SdOptionsGrid::ReadData( const Any* pValues )
sal_Bool SdOptionsGrid::WriteData( Any* pValues ) const
{
- pValues[ 0 ] <<= (sal_Int32) GetFldDrawX();
- pValues[ 1 ] <<= (sal_Int32) GetFldDrawY();
+ pValues[ 0 ] <<= (sal_Int32) GetFldDrawX();
+ pValues[ 1 ] <<= (sal_Int32) GetFldDrawY();
pValues[ 2 ] <<= ( GetFldDivisionX() ? ( (double) GetFldDrawX() /
GetFldDivisionX() - 1.0 ) : (double) 0 );
pValues[ 3 ] <<= ( GetFldDivisionY() ? ( (double) GetFldDrawY() /
GetFldDivisionY() - 1.0 ) : (double) 0 );
- pValues[ 4 ] <<= (sal_Int32) GetFldSnapX();
- pValues[ 5 ] <<= (sal_Int32) GetFldSnapY();
- pValues[ 6 ] <<= IsUseGridSnap();
- pValues[ 7 ] <<= IsSynchronize();
- pValues[ 8 ] <<= IsGridVisible();
- pValues[ 9 ] <<= IsEqualGrid();
+ pValues[ 4 ] <<= (sal_Int32) GetFldSnapX();
+ pValues[ 5 ] <<= (sal_Int32) GetFldSnapY();
+ pValues[ 6 ] <<= IsUseGridSnap();
+ pValues[ 7 ] <<= IsSynchronize();
+ pValues[ 8 ] <<= IsGridVisible();
+ pValues[ 9 ] <<= IsEqualGrid();
return sal_True;
}
/*************************************************************************
-|*
|* SdOptionsGridItem
-|*
\************************************************************************/
SdOptionsGridItem::SdOptionsGridItem( sal_uInt16 _nWhich, SdOptions* pOpts,
::sd::FrameView* pView ) :
@@ -1309,15 +1287,13 @@ void SdOptionsGridItem::SetOptions( SdOptions* pOpts )
const
}
/*************************************************************************
-|*
|* SdOptionsPrint
-|*
\************************************************************************/
SdOptionsPrint::SdOptionsPrint( sal_uInt16 nConfigId, sal_Bool bUseConfig ) :
- SdOptionsGeneric( nConfigId, bUseConfig ?
- ( ( SDCFG_DRAW == nConfigId ) ?
- B2U( "Office.Draw/Print" ) :
+ SdOptionsGeneric( nConfigId, bUseConfig ?
+ ( ( SDCFG_DRAW == nConfigId ) ?
+ B2U( "Office.Draw/Print" ) :
B2U( "Office.Impress/Print" ) )
:
OUString() ),
bDraw( sal_True ),
@@ -1436,25 +1412,25 @@ void SdOptionsPrint::GetPropNameArray( const char**&
ppNames, sal_uLong& rCount
sal_Bool SdOptionsPrint::ReadData( const Any* pValues )
{
- if( pValues[0].hasValue() ) SetDate( *(sal_Bool*) pValues[ 0
].getValue() );
- if( pValues[1].hasValue() ) SetTime( *(sal_Bool*) pValues[ 1
].getValue() );
- if( pValues[2].hasValue() ) SetPagename( *(sal_Bool*) pValues[ 2
].getValue() );
- if( pValues[3].hasValue() ) SetHiddenPages( *(sal_Bool*) pValues[ 3
].getValue() );
- if( pValues[4].hasValue() ) SetPagesize( *(sal_Bool*) pValues[ 4
].getValue() );
- if( pValues[5].hasValue() ) SetPagetile( *(sal_Bool*) pValues[ 5
].getValue() );
- if( pValues[6].hasValue() ) SetBooklet( *(sal_Bool*) pValues[ 6
].getValue() );
- if( pValues[7].hasValue() ) SetFrontPage( *(sal_Bool*) pValues[ 7
].getValue() );
- if( pValues[8].hasValue() ) SetBackPage( *(sal_Bool*) pValues[ 8
].getValue() );
- if( pValues[9].hasValue() ) SetPaperbin( *(sal_Bool*) pValues[ 9
].getValue() );
- if( pValues[10].hasValue() ) SetOutputQuality( (sal_uInt16)
*(sal_Int32*) pValues[ 10 ].getValue() );
- if( pValues[11].hasValue() ) SetDraw( *(sal_Bool*) pValues[ 11
].getValue() );
-
- // just for impress
+ if( pValues[0].hasValue() ) SetDate( *(sal_Bool*) pValues[ 0
].getValue() );
+ if( pValues[1].hasValue() ) SetTime( *(sal_Bool*) pValues[ 1
].getValue() );
+ if( pValues[2].hasValue() ) SetPagename( *(sal_Bool*) pValues[ 2
].getValue() );
+ if( pValues[3].hasValue() ) SetHiddenPages( *(sal_Bool*) pValues[ 3
].getValue() );
+ if( pValues[4].hasValue() ) SetPagesize( *(sal_Bool*) pValues[ 4
].getValue() );
+ if( pValues[5].hasValue() ) SetPagetile( *(sal_Bool*) pValues[ 5
].getValue() );
+ if( pValues[6].hasValue() ) SetBooklet( *(sal_Bool*) pValues[ 6
].getValue() );
+ if( pValues[7].hasValue() ) SetFrontPage( *(sal_Bool*) pValues[ 7
].getValue() );
+ if( pValues[8].hasValue() ) SetBackPage( *(sal_Bool*) pValues[ 8
].getValue() );
+ if( pValues[9].hasValue() ) SetPaperbin( *(sal_Bool*) pValues[ 9
].getValue() );
+ if( pValues[10].hasValue() ) SetOutputQuality( (sal_uInt16)
*(sal_Int32*) pValues[ 10 ].getValue() );
+ if( pValues[11].hasValue() ) SetDraw( *(sal_Bool*) pValues[ 11
].getValue() );
+
+ // just for Impress
if( GetConfigId() == SDCFG_IMPRESS )
{
- if( pValues[12].hasValue() ) SetNotes( *(sal_Bool*) pValues[ 12
].getValue() );
- if( pValues[13].hasValue() ) SetHandout( *(sal_Bool*) pValues[
13 ].getValue() );
- if( pValues[14].hasValue() ) SetOutline( *(sal_Bool*) pValues[
14 ].getValue() );
+ if( pValues[12].hasValue() ) SetNotes( *(sal_Bool*) pValues[ 12
].getValue() );
+ if( pValues[13].hasValue() ) SetHandout( *(sal_Bool*) pValues[
13 ].getValue() );
+ if( pValues[14].hasValue() ) SetOutline( *(sal_Bool*) pValues[
14 ].getValue() );
if( pValues[15].hasValue() ) SetHandoutHorizontal( *(sal_Bool*)
pValues[15].getValue() );
if( pValues[16].hasValue() ) SetHandoutPages(
(sal_uInt16)*(sal_Int32*) pValues[16].getValue() );
}
@@ -1466,25 +1442,25 @@ sal_Bool SdOptionsPrint::ReadData( const Any* pValues )
sal_Bool SdOptionsPrint::WriteData( Any* pValues ) const
{
- pValues[ 0 ] <<= IsDate();
- pValues[ 1 ] <<= IsTime();
+ pValues[ 0 ] <<= IsDate();
+ pValues[ 1 ] <<= IsTime();
pValues[ 2 ] <<= IsPagename();
pValues[ 3 ] <<= IsHiddenPages();
- pValues[ 4 ] <<= IsPagesize();
+ pValues[ 4 ] <<= IsPagesize();
pValues[ 5 ] <<= IsPagetile();
pValues[ 6 ] <<= IsBooklet();
- pValues[ 7 ] <<= IsFrontPage();
- pValues[ 8 ] <<= IsBackPage();
+ pValues[ 7 ] <<= IsFrontPage();
+ pValues[ 8 ] <<= IsBackPage();
pValues[ 9 ] <<= IsPaperbin();
- pValues[ 10 ] <<= (sal_Int32) GetOutputQuality();
+ pValues[ 10 ] <<= (sal_Int32) GetOutputQuality();
pValues[ 11 ] <<= IsDraw();
-
- // just for impress
+
+ // just for Impress
if( GetConfigId() == SDCFG_IMPRESS )
{
- pValues[ 12 ] <<= IsNotes();
- pValues[ 13 ] <<= IsHandout();
- pValues[ 14 ] <<= IsOutline();
+ pValues[ 12 ] <<= IsNotes();
+ pValues[ 13 ] <<= IsHandout();
+ pValues[ 14 ] <<= IsOutline();
pValues[ 15 ] <<= IsHandoutHorizontal();
pValues[ 16 ] <<= GetHandoutPages();
}
@@ -1493,9 +1469,7 @@ sal_Bool SdOptionsPrint::WriteData( Any* pValues ) const
}
/*************************************************************************
-|*
|* SdOptionsPrintItem
-|*
\************************************************************************/
SdOptionsPrintItem::SdOptionsPrintItem( sal_uInt16 _nWhich )
@@ -1546,7 +1520,7 @@ SfxPoolItem* SdOptionsPrintItem::Clone( SfxItemPool* )
const
int SdOptionsPrintItem::operator==( const SfxPoolItem& rAttr ) const
{
const bool bSameType = SfxPoolItem::operator==(rAttr);
- DBG_ASSERT( bSameType, "SdOptionsPrintItem::operator==(), differen pool
item type!" );
+ DBG_ASSERT( bSameType, "SdOptionsPrintItem::operator==(), different
pool item type!" );
return bSameType && ( maOptionsPrint == static_cast< const
SdOptionsPrintItem& >( rAttr ).maOptionsPrint );
}
@@ -1579,9 +1553,7 @@ void SdOptionsPrintItem::SetOptions( SdOptions* pOpts )
const
}
/*************************************************************************
-|*
|* SdOptions
-|*
\************************************************************************/
SdOptions::SdOptions( sal_uInt16 nConfigId ) :
diff --git a/main/sd/source/ui/app/sddll2.cxx b/main/sd/source/ui/app/sddll2.cxx
index d6c0034..0fe768b 100644
--- a/main/sd/source/ui/app/sddll2.cxx
+++ b/main/sd/source/ui/app/sddll2.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -85,9 +85,7 @@
#include "tmplctrl.hxx"
/*************************************************************************
-|*
|* Register all Controllers
-|*
\************************************************************************/
@@ -120,8 +118,8 @@ void SdDLL::RegisterControllers()
SdTbxCtlGlueEscDir::RegisterControl( SID_GLUE_ESCDIR, pMod );
::sd::AnimationChildWindow::RegisterChildWindow(0, pMod);
- ::sd::NavigatorChildWindow::RegisterChildWindowContext( (sal_uInt16)
::sd::DrawViewShell::GetInterfaceId(), pMod );
- ::sd::NavigatorChildWindow::RegisterChildWindowContext( (sal_uInt16)
::sd::GraphicViewShell::GetInterfaceId(), pMod );
+ ::sd::NavigatorChildWindow::RegisterChildWindowContext( (sal_uInt16)
::sd::DrawViewShell::GetInterfaceId(), pMod );
+ ::sd::NavigatorChildWindow::RegisterChildWindowContext( (sal_uInt16)
::sd::GraphicViewShell::GetInterfaceId(), pMod );
::sd::LayerDialogChildWindow::RegisterChildWindow(0, pMod);
Svx3DChildWindow::RegisterChildWindow(0, pMod);
@@ -137,7 +135,7 @@ void SdDLL::RegisterControllers()
::avmedia::MediaPlayer::RegisterChildWindow(0, pMod);
::sd::LeftPaneImpressChildWindow::RegisterChildWindow(0, pMod);
::sd::LeftPaneDrawChildWindow::RegisterChildWindow(0, pMod);
- ::sfx2::sidebar::SidebarChildWindow::RegisterChildWindow(NULL, pMod);
+ ::sfx2::sidebar::SidebarChildWindow::RegisterChildWindow(NULL, pMod);
SvxFillToolBoxControl::RegisterControl(0, pMod);
SvxLineStyleToolBoxControl::RegisterControl(0, pMod);
@@ -160,21 +158,21 @@ void SdDLL::RegisterControllers()
SvxGrafContrastToolBoxControl::RegisterControl( SID_ATTR_GRAF_CONTRAST,
pMod );
SvxGrafGammaToolBoxControl::RegisterControl( SID_ATTR_GRAF_GAMMA, pMod
);
SvxGrafTransparenceToolBoxControl::RegisterControl(
SID_ATTR_GRAF_TRANSPARENCE, pMod );
- SvxVertTextTbxCtrl::RegisterControl(SID_TEXTDIRECTION_TOP_TO_BOTTOM, pMod);
- SvxVertTextTbxCtrl::RegisterControl(SID_TEXTDIRECTION_LEFT_TO_RIGHT, pMod);
- SvxVertTextTbxCtrl::RegisterControl(SID_DRAW_CAPTION_VERTICAL, pMod);
- SvxVertTextTbxCtrl::RegisterControl(SID_DRAW_FONTWORK_VERTICAL, pMod);
- SvxVertTextTbxCtrl::RegisterControl(SID_DRAW_TEXT_VERTICAL, pMod);
- SvxVertTextTbxCtrl::RegisterControl(SID_TEXT_FITTOSIZE_VERTICAL, pMod);
- SvxCTLTextTbxCtrl::RegisterControl(SID_ATTR_PARA_LEFT_TO_RIGHT, pMod);
- SvxCTLTextTbxCtrl::RegisterControl(SID_ATTR_PARA_RIGHT_TO_LEFT, pMod);
+ SvxVertTextTbxCtrl::RegisterControl(SID_TEXTDIRECTION_TOP_TO_BOTTOM,
pMod);
+ SvxVertTextTbxCtrl::RegisterControl(SID_TEXTDIRECTION_LEFT_TO_RIGHT,
pMod);
+ SvxVertTextTbxCtrl::RegisterControl(SID_DRAW_CAPTION_VERTICAL, pMod);
+ SvxVertTextTbxCtrl::RegisterControl(SID_DRAW_FONTWORK_VERTICAL, pMod);
+ SvxVertTextTbxCtrl::RegisterControl(SID_DRAW_TEXT_VERTICAL, pMod);
+ SvxVertTextTbxCtrl::RegisterControl(SID_TEXT_FITTOSIZE_VERTICAL, pMod);
+ SvxCTLTextTbxCtrl::RegisterControl(SID_ATTR_PARA_LEFT_TO_RIGHT, pMod);
+ SvxCTLTextTbxCtrl::RegisterControl(SID_ATTR_PARA_RIGHT_TO_LEFT, pMod);
// StatusBarControls registrieren
SvxZoomStatusBarControl::RegisterControl( SID_ATTR_ZOOM, pMod );
SvxPosSizeStatusBarControl::RegisterControl( SID_ATTR_SIZE, pMod );
SvxModifyControl::RegisterControl( SID_DOC_MODIFIED, pMod );
//SvxInsertStatusBarControl::RegisterControl(0, pModd);
- SvxZoomSliderControl::RegisterControl( SID_ATTR_ZOOMSLIDER, pMod );
+ SvxZoomSliderControl::RegisterControl( SID_ATTR_ZOOMSLIDER, pMod );
// MenuControls fuer PopupMenu
SvxFontMenuControl::RegisterControl( SID_ATTR_CHAR_FONT, pMod );
@@ -188,7 +186,7 @@ void SdDLL::RegisterControllers()
SvxUndoRedoControl::RegisterControl( SID_UNDO , pMod );
SvxUndoRedoControl::RegisterControl( SID_REDO , pMod );
- svx::FormatPaintBrushToolBoxControl::RegisterControl(SID_FORMATPAINTBRUSH,
pMod );
+
svx::FormatPaintBrushToolBoxControl::RegisterControl(SID_FORMATPAINTBRUSH, pMod
);
SvxClipBoardControl::RegisterControl( SID_PASTE, pMod );
diff --git a/main/sd/source/ui/app/sdmod.cxx b/main/sd/source/ui/app/sdmod.cxx
index 92064a4..e9b296d 100644
--- a/main/sd/source/ui/app/sdmod.cxx
+++ b/main/sd/source/ui/app/sdmod.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -50,7 +50,7 @@
#include <svx/xmlsecctrl.hxx>
-#define _SD_DLL // fuer SD_MOD()
+#define _SD_DLL // fuer SD_MOD()
#include "sderror.hxx"
#include "sdmod.hxx"
#include "sddll.hxx"
@@ -77,26 +77,24 @@ SFX_IMPL_INTERFACE(SdModule, SfxModule,
SdResId(STR_APPLICATIONOBJECTBAR))
}
/*************************************************************************
-|*
|* Ctor
-|*
\************************************************************************/
SdModule::SdModule(SfxObjectFactory* pFact1, SfxObjectFactory* pFact2 )
-: SfxModule( SfxApplication::CreateResManager("sd"), sal_False,
+: SfxModule( SfxApplication::CreateResManager("sd"), sal_False,
pFact1, pFact2, NULL ),
pTransferClip(NULL),
pTransferDrag(NULL),
- pTransferSelection(NULL),
+ pTransferSelection(NULL),
pImpressOptions(NULL),
pDrawOptions(NULL),
pSearchItem(NULL),
pNumberFormatter( NULL ),
bWaterCan(sal_False),
- mpResourceContainer(new ::sd::SdGlobalResourceContainer())
+ mpResourceContainer(new ::sd::SdGlobalResourceContainer())
{
SetName( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM(
"StarDraw" ) ) ); // Nicht uebersetzen!
- pSearchItem = new SvxSearchItem(SID_SEARCH_ITEM);
+ pSearchItem = new SvxSearchItem(SID_SEARCH_ITEM);
pSearchItem->SetAppFlag(SVX_SEARCHAPP_DRAW);
StartListening( *SFX_APP() );
SvxErrorHandler::Get();
@@ -105,57 +103,53 @@ SdModule::SdModule(SfxObjectFactory* pFact1,
SfxObjectFactory* pFact2 )
ERRCODE_AREA_SD_END,
GetResMgr() );
- // Create a new ref device and (by calling SetReferenceDevice())
- // set its resolution to 600 DPI. This leads to a visually better
- // formatting of text in small sizes (6 point and below.)
- VirtualDevice* pDevice = new VirtualDevice;
- mpVirtualRefDevice = pDevice;
- pDevice->SetMapMode( MAP_100TH_MM );
- pDevice->SetReferenceDevice ( VirtualDevice::REFDEV_MODE06 );
+ // Create a new ref device and (by calling SetReferenceDevice())
+ // set its resolution to 600 DPI. This leads to a visually better
+ // formatting of text in small sizes (6 point and below.)
+ VirtualDevice* pDevice = new VirtualDevice;
+ mpVirtualRefDevice = pDevice;
+ pDevice->SetMapMode( MAP_100TH_MM );
+ pDevice->SetReferenceDevice ( VirtualDevice::REFDEV_MODE06 );
}
/*************************************************************************
-|*
|* Dtor
-|*
\************************************************************************/
SdModule::~SdModule()
{
- delete pSearchItem;
+ delete pSearchItem;
- if( pNumberFormatter )
+ if( pNumberFormatter )
delete pNumberFormatter;
- ::sd::DrawDocShell* pDocShell = PTR_CAST(::sd::DrawDocShell,
SfxObjectShell::Current());
- if( pDocShell )
- {
- ::sd::ViewShell* pViewShell = pDocShell->GetViewShell();
- if (pViewShell)
- {
- // Removing our event listener
- Application::RemoveEventListener( LINK( this, SdModule,
EventListenerHdl ) );
- }
- }
-
- mpResourceContainer.reset();
-
- // Mark the module in the global AppData structure as deleted.
- SdModule** ppShellPointer = (SdModule**)GetAppData(SHL_DRAW);
- if (ppShellPointer != NULL)
- (*ppShellPointer) = NULL;
-
- delete mpErrorHdl;
- delete static_cast< VirtualDevice* >( mpVirtualRefDevice );
+ ::sd::DrawDocShell* pDocShell = PTR_CAST(::sd::DrawDocShell,
SfxObjectShell::Current());
+ if( pDocShell )
+ {
+ ::sd::ViewShell* pViewShell = pDocShell->GetViewShell();
+ if (pViewShell)
+ {
+ // Removing our event listener
+ Application::RemoveEventListener( LINK( this, SdModule,
EventListenerHdl ) );
+ }
+ }
+
+ mpResourceContainer.reset();
+
+ // Mark the module in the global AppData structure as deleted.
+ SdModule** ppShellPointer = (SdModule**)GetAppData(SHL_DRAW);
+ if (ppShellPointer != NULL)
+ (*ppShellPointer) = NULL;
+
+ delete mpErrorHdl;
+ delete static_cast< VirtualDevice* >( mpVirtualRefDevice );
}
/*************************************************************************
-|*
|* get notifications
-|*
\************************************************************************/
void SdModule::Notify( SfxBroadcaster&, const SfxHint& rHint )
@@ -169,9 +163,7 @@ void SdModule::Notify( SfxBroadcaster&, const SfxHint&
rHint )
}
/*************************************************************************
-|*
-|* Optionen zurueckgeben
-|*
+|* return options
\************************************************************************/
SdOptions* SdModule::GetSdOptions(DocumentType eDocType)
@@ -209,11 +201,9 @@ SdOptions* SdModule::GetSdOptions(DocumentType eDocType)
}
/*************************************************************************
-|*
|* Optionen-Stream fuer interne Options oeffnen und zurueckgeben;
|* falls der Stream zum Lesen geoeffnet wird, aber noch nicht
|* angelegt wurde, wird ein 'leeres' RefObject zurueckgegeben
-|*
\************************************************************************/
SvStorageStreamRef SdModule::GetOptionStream( const String& rOptionName,
@@ -247,7 +237,7 @@ SvStorageStreamRef SdModule::GetOptionStream( const String&
rOptionName,
aStmName += rOptionName;
if( SD_OPTION_STORE == eMode || xOptionStorage->IsContained(
aStmName ) )
- xStm = xOptionStorage->OpenSotStream( aStmName );
+ xStm = xOptionStorage->OpenSotStream( aStmName );
}
return xStm;
@@ -271,13 +261,13 @@ SvNumberFormatter* SdModule::GetNumberFormatter()
OutputDevice* SdModule::GetVirtualRefDevice (void)
{
- return mpVirtualRefDevice;
+ return mpVirtualRefDevice;
}
/** This method is deprecated and only an alias to
- <member>GetVirtualRefDevice()</member>. The given argument is ignored.
+ <member>GetVirtualRefDevice()</member>. The given argument is ignored.
*/
OutputDevice* SdModule::GetRefDevice (::sd::DrawDocShell& )
{
- return GetVirtualRefDevice();
+ return GetVirtualRefDevice();
}
diff --git a/main/sd/source/ui/app/sdmod2.cxx b/main/sd/source/ui/app/sdmod2.cxx
index f1cbfcf..21f0e8f 100644
--- a/main/sd/source/ui/app/sdmod2.cxx
+++ b/main/sd/source/ui/app/sdmod2.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -50,7 +50,7 @@
#include <svx/sdr/contact/displayinfo.hxx>
-#define _SD_DLL // fuer SD_MOD()
+#define _SD_DLL // fuer SD_MOD()
#include "sdmod.hxx"
#include "sddll.hxx"
#include "app.hrc"
@@ -104,19 +104,19 @@ static SdPage* GetCurrentPage( sd::ViewShell* pViewSh,
EditFieldInfo* pInfo, boo
if( pViewSh && pViewSh->ISA(sd::OutlineViewShell))
pSdView = static_cast<sd::OutlineView*>
(static_cast<sd::OutlineViewShell*>(pViewSh)->GetView());
- if (pSdView != NULL && (pOutliner == pSdView->GetOutliner()))
- {
- // outline mode
- int nPgNum = 0;
- Outliner* pOutl = pSdView->GetOutliner();
- long nPos = pInfo->GetPara();
- sal_uLong nParaPos = 0;
+ if (pSdView != NULL && (pOutliner == pSdView->GetOutliner()))
+ {
+ // outline mode
+ int nPgNum = 0;
+ Outliner* pOutl = pSdView->GetOutliner();
+ long nPos = pInfo->GetPara();
+ sal_uLong nParaPos = 0;
- for( Paragraph* pPara = pOutl->GetParagraph( 0 ); pPara && nPos >= 0;
pPara = pOutl->GetParagraph( ++nParaPos ), nPos-- )
- {
- if( pOutl->HasParaFlag( pPara, PARAFLAG_ISPAGE ) )
- nPgNum++;
- }
+ for( Paragraph* pPara = pOutl->GetParagraph( 0 ); pPara && nPos
>= 0; pPara = pOutl->GetParagraph( ++nParaPos ), nPos-- )
+ {
+ if( pOutl->HasParaFlag( pPara, PARAFLAG_ISPAGE ) )
+ nPgNum++;
+ }
pPage = pViewSh->GetDoc()->GetSdPage( (sal_uInt16)nPgNum,
PK_STANDARD );
}
@@ -132,7 +132,7 @@ static SdPage* GetCurrentPage( sd::ViewShell* pViewSh,
EditFieldInfo* pInfo, boo
// is no longer needed. I debugged and checked all usages of
PageNumber decompositions
// which all use the new possibility of setting the visualized
page at the SdrOutliner.
- // if all else failed, geht the current page from the object
that is
+ // if all else failed, get the current page from the object
that is
// currently formatted from the document
if(!pPage)
{
@@ -154,9 +154,7 @@ static SdPage* GetCurrentPage( sd::ViewShell* pViewSh,
EditFieldInfo* pInfo, boo
}
/*************************************************************************
-|*
|* Link fuer CalcFieldValue des Outliners
-|*
\************************************************************************/
IMPL_LINK(SdModule, CalcFieldValueHdl, EditFieldInfo*, pInfo)
@@ -164,23 +162,23 @@ IMPL_LINK(SdModule, CalcFieldValueHdl, EditFieldInfo*,
pInfo)
if (pInfo)
{
const SvxFieldData* pField = pInfo->GetField().GetField();
- ::sd::DrawDocShell* pDocShell = NULL;
+ ::sd::DrawDocShell* pDocShell = NULL;
SdDrawDocument* pDoc = 0;
SdrOutliner* pSdrOutliner = dynamic_cast< SdrOutliner* >(
pInfo->GetOutliner() );
- if( pSdrOutliner )
- {
- const SdrTextObj* pTextObj = pSdrOutliner->GetTextObj();
+ if( pSdrOutliner )
+ {
+ const SdrTextObj* pTextObj = pSdrOutliner->GetTextObj();
if( pTextObj )
pDoc = dynamic_cast< SdDrawDocument* >(
pTextObj->GetModel() );
if( pDoc )
- pDocShell = pDoc->GetDocSh();
- }
+ pDocShell = pDoc->GetDocSh();
+ }
- if( !pDocShell )
- pDocShell = dynamic_cast< ::sd::DrawDocShell *>(
SfxObjectShell::Current() );
+ if( !pDocShell )
+ pDocShell = dynamic_cast< ::sd::DrawDocShell *>(
SfxObjectShell::Current() );
const SvxDateField* pDateField = 0;
const SvxExtTimeField* pExtTimeField = 0;
@@ -213,32 +211,32 @@ IMPL_LINK(SdModule, CalcFieldValueHdl, EditFieldInfo*,
pInfo)
pInfo->SetRepresentation( pExtFileField->GetFormatted()
);
}
- else if( (pAuthorField = dynamic_cast< const SvxAuthorField* >(
pField )) != 0 )
+ else if( (pAuthorField = dynamic_cast< const SvxAuthorField* >(
pField )) != 0 )
{
if( pAuthorField->GetType() != SVXAUTHORTYPE_FIX )
{
- SvtUserOptions aUserOptions;
- SvxAuthorField aAuthorField(
- aUserOptions.GetFirstName(),
aUserOptions.GetLastName(), aUserOptions.GetID(),
- pAuthorField->GetType(), pAuthorField->GetFormat() );
+ SvtUserOptions aUserOptions;
+ SvxAuthorField aAuthorField(
+ aUserOptions.GetFirstName(),
aUserOptions.GetLastName(), aUserOptions.GetID(),
+ pAuthorField->GetType(),
pAuthorField->GetFormat() );
- *(const_cast< SvxAuthorField* >(pAuthorField)) = aAuthorField;
+ *(const_cast< SvxAuthorField* >(pAuthorField))
= aAuthorField;
}
pInfo->SetRepresentation( pAuthorField->GetFormatted()
);
}
- else if( dynamic_cast< const SvxPageField* >(pField) )
+ else if( dynamic_cast< const SvxPageField* >(pField) )
{
String aRepresentation;
aRepresentation += sal_Unicode( ' ' );
::sd::ViewShell* pViewSh = pDocShell ?
pDocShell->GetViewShell() : NULL;
if(pViewSh == NULL)
- {
- ::sd::ViewShellBase* pBase = PTR_CAST(::sd::ViewShellBase,
SfxViewShell::Current());
- if(pBase)
- pViewSh = pBase->GetMainViewShell().get();
- }
+ {
+ ::sd::ViewShellBase* pBase =
PTR_CAST(::sd::ViewShellBase, SfxViewShell::Current());
+ if(pBase)
+ pViewSh =
pBase->GetMainViewShell().get();
+ }
if( !pDoc && pViewSh )
pDoc = pViewSh->GetDoc();
@@ -267,40 +265,40 @@ IMPL_LINK(SdModule, CalcFieldValueHdl, EditFieldInfo*,
pInfo)
pInfo->SetRepresentation( aRepresentation );
}
- else if( dynamic_cast< const SvxPagesField* >(pField) )
+ else if( dynamic_cast< const SvxPagesField* >(pField) )
{
String aRepresentation;
aRepresentation += sal_Unicode( ' ' );
::sd::ViewShell* pViewSh = pDocShell ?
pDocShell->GetViewShell() : NULL;
if(pViewSh == NULL)
- {
- ::sd::ViewShellBase* pBase = PTR_CAST(::sd::ViewShellBase,
SfxViewShell::Current());
- if(pBase)
- pViewSh = pBase->GetMainViewShell().get();
- }
+ {
+ ::sd::ViewShellBase* pBase =
PTR_CAST(::sd::ViewShellBase, SfxViewShell::Current());
+ if(pBase)
+ pViewSh =
pBase->GetMainViewShell().get();
+ }
if( !pDoc && pViewSh )
pDoc = pViewSh->GetDoc();
bool bMasterView;
SdPage* pPage = GetCurrentPage( pViewSh, pInfo,
bMasterView );
- sal_uInt16 nPageCount = 0;
-
- if( !bMasterView )
- {
- if( pPage && (pPage->GetPageKind() == PK_HANDOUT)
&& pViewSh )
- {
- nPageCount =
pViewSh->GetPrintedHandoutPageCount();
- }
- else if( pDoc )
- {
- nPageCount = (sal_uInt16)pDoc->GetSdPageCount(PK_STANDARD);
- }
- }
-
- if( nPageCount > 0 )
- {
+ sal_uInt16 nPageCount = 0;
+
+ if( !bMasterView )
+ {
+ if( pPage && (pPage->GetPageKind() ==
PK_HANDOUT) && pViewSh )
+ {
+ nPageCount =
pViewSh->GetPrintedHandoutPageCount();
+ }
+ else if( pDoc )
+ {
+ nPageCount =
(sal_uInt16)pDoc->GetSdPageCount(PK_STANDARD);
+ }
+ }
+
+ if( nPageCount > 0 )
+ {
aRepresentation =
pDoc->CreatePageNumValue(nPageCount);
}
else
@@ -327,9 +325,9 @@ IMPL_LINK(SdModule, CalcFieldValueHdl, EditFieldInfo*,
pInfo)
String aURL = pURLField->GetURL();
- svtools::ColorConfig aConfig;
- svtools::ColorConfigEntry eEntry =
- INetURLHistory::GetOrCreate()->QueryUrl( aURL ) ?
svtools::LINKSVISITED : svtools::LINKS;
+ svtools::ColorConfig aConfig;
+ svtools::ColorConfigEntry eEntry =
+ INetURLHistory::GetOrCreate()->QueryUrl( aURL )
? svtools::LINKSVISITED : svtools::LINKS;
pInfo->SetTxtColor(
aConfig.GetColorValue(eEntry).nColor );
}
else if ( dynamic_cast< const SdrMeasureField* >(pField))
@@ -401,7 +399,7 @@ IMPL_LINK(SdModule, CalcFieldValueHdl, EditFieldInfo*,
pInfo)
DBG_ERROR("sd::SdModule::CalcFieldValueHdl(),
unknown field type!");
}
- if( aRepresentation.Len() == 0 )
// TODO: Edit engine doesn't handle empty fields?
+ if( aRepresentation.Len() == 0 ) // TODO: Edit engine
doesn't handle empty fields?
aRepresentation += sal_Unicode( ' ' );
pInfo->SetRepresentation( aRepresentation );
}
@@ -413,9 +411,7 @@ IMPL_LINK(SdModule, CalcFieldValueHdl, EditFieldInfo*,
pInfo)
/*************************************************************************
-|*
|* virt. Methoden fuer Optionendialog
-|*
\************************************************************************/
SfxItemSet* SdModule::CreateItemSet( sal_uInt16 nSlot )
{
@@ -441,7 +437,7 @@ SfxItemSet* SdModule::CreateItemSet( sal_uInt16 nSlot )
pViewShell = pDocSh->GetViewShell();
if (pViewShell != NULL)
- pViewShell->WriteFrameViewData();
+ pViewShell->WriteFrameViewData();
}
SdOptions* pOptions = GetSdOptions(eDocType);
@@ -492,13 +488,13 @@ SfxItemSet* SdModule::CreateItemSet( sal_uInt16
nSlot )
pRet->Put( SdOptionsContentsItem( ATTR_OPTIONS_CONTENTS, pOptions,
pFrameView ) );
// TP_OPTIONS_MISC:
- SdOptionsMiscItem aSdOptionsMiscItem( ATTR_OPTIONS_MISC, pOptions,
pFrameView );
- if ( pFrameView )
- {
- aSdOptionsMiscItem.GetOptionsMisc().SetSummationOfParagraphs(
pDoc->IsSummationOfParagraphs() );
- aSdOptionsMiscItem.GetOptionsMisc().SetPrinterIndependentLayout (
- (sal_uInt16)pDoc->GetPrinterIndependentLayout());
- }
+ SdOptionsMiscItem aSdOptionsMiscItem( ATTR_OPTIONS_MISC, pOptions,
pFrameView );
+ if ( pFrameView )
+ {
+ aSdOptionsMiscItem.GetOptionsMisc().SetSummationOfParagraphs(
pDoc->IsSummationOfParagraphs() );
+ aSdOptionsMiscItem.GetOptionsMisc().SetPrinterIndependentLayout
(
+ (sal_uInt16)pDoc->GetPrinterIndependentLayout());
+ }
pRet->Put( aSdOptionsMiscItem );
@@ -520,7 +516,7 @@ SfxItemSet* SdModule::CreateItemSet( sal_uInt16 nSlot )
if(pFrameView)
{
- const Fraction& rFraction = pDoc->GetUIScale();
+ const Fraction& rFraction = pDoc->GetUIScale();
nX=rFraction.GetNumerator();
nY=rFraction.GetDenominator();
}
@@ -571,8 +567,8 @@ void SdModule::ApplyItemSet( sal_uInt16 nSlot, const
SfxItemSet& rSet )
pFrameView = pDocSh->GetFrameView();
pViewShell = pDocSh->GetViewShell();
- if (pViewShell != NULL)
- pViewShell->WriteFrameViewData();
+ if (pViewShell != NULL)
+ pViewShell->WriteFrameViewData();
}
SdOptions* pOptions = GetSdOptions(eDocType);
// Raster
@@ -608,26 +604,26 @@ void SdModule::ApplyItemSet( sal_uInt16 nSlot, const
SfxItemSet& rSet )
bNewDefTab = sal_True;
}
- // Massstab
- if( SFX_ITEM_SET == rSet.GetItemState( ATTR_OPTIONS_SCALE_X, sal_False,
&pItem ) )
- {
- sal_Int32 nX = ( (SfxInt32Item*) pItem )->GetValue();
- if( SFX_ITEM_SET == rSet.GetItemState( ATTR_OPTIONS_SCALE_Y,
sal_False, &pItem ) )
- {
- sal_Int32 nY = ( (SfxInt32Item*) pItem )->GetValue();
- pOptions->SetScale( nX, nY );
-
- // #92067# Apply to document only if doc type match
- if( pDocSh && pDoc && eDocType == pDoc->GetDocumentType() )
- {
- pDoc->SetUIScale( Fraction( nX, nY ) );
- if( pViewShell )
- pViewShell->SetRuler( pViewShell->HasRuler() );
- }
- }
- }
-
- // Contents (Inhalte)
+ // Massstab
+ if( SFX_ITEM_SET == rSet.GetItemState( ATTR_OPTIONS_SCALE_X, sal_False,
&pItem ) )
+ {
+ sal_Int32 nX = ( (SfxInt32Item*) pItem )->GetValue();
+ if( SFX_ITEM_SET == rSet.GetItemState( ATTR_OPTIONS_SCALE_Y,
sal_False, &pItem ) )
+ {
+ sal_Int32 nY = ( (SfxInt32Item*) pItem )->GetValue();
+ pOptions->SetScale( nX, nY );
+
+ // #92067# Apply to document only if doc type match
+ if( pDocSh && pDoc && eDocType ==
pDoc->GetDocumentType() )
+ {
+ pDoc->SetUIScale( Fraction( nX, nY ) );
+ if( pViewShell )
+ pViewShell->SetRuler(
pViewShell->HasRuler() );
+ }
+ }
+ }
+
+ // Contents
const SdOptionsContentsItem* pContentsItem = NULL;
if( SFX_ITEM_SET == rSet.GetItemState( ATTR_OPTIONS_CONTENTS,
sal_False, (const
SfxPoolItem**) &pContentsItem ))
@@ -635,7 +631,7 @@ void SdModule::ApplyItemSet( sal_uInt16 nSlot, const
SfxItemSet& rSet )
pContentsItem->SetOptions( pOptions );
}
- // Misc (Sonstiges)
+ // Misc
const SdOptionsMiscItem* pMiscItem = NULL;
if( SFX_ITEM_SET == rSet.GetItemState( ATTR_OPTIONS_MISC,
sal_False, (const
SfxPoolItem**) &pMiscItem ))
@@ -670,8 +666,8 @@ void SdModule::ApplyItemSet( sal_uInt16 nSlot, const
SfxItemSet& rSet )
SfxFlagItem aFlagItem( SID_PRINTER_CHANGESTODOC );
sal_uInt16 nFlags = 0;
- nFlags = (aPrintItem.GetOptionsPrint().IsWarningSize() ?
SFX_PRINTER_CHG_SIZE : 0) |
-
(aPrintItem.GetOptionsPrint().IsWarningOrientation() ?
SFX_PRINTER_CHG_ORIENTATION : 0);
+ nFlags = (aPrintItem.GetOptionsPrint().IsWarningSize() ?
SFX_PRINTER_CHG_SIZE : 0) |
+
(aPrintItem.GetOptionsPrint().IsWarningOrientation() ?
SFX_PRINTER_CHG_ORIENTATION : 0);
aFlagItem.SetValue( nFlags );
aPrintSet.Put( aPrintItem );
@@ -689,7 +685,7 @@ void SdModule::ApplyItemSet( sal_uInt16 nSlot, const
SfxItemSet& rSet )
pDocSh->GetPrinter(sal_True)->SetOptions( aPrintSet );
}
- // Am Model den DefTab setzen
+ // Am Modell den DefTab setzen
if( bNewDefTab )
{
SdDrawDocument* pDocument = pDocSh->GetDoc();
@@ -705,7 +701,7 @@ void SdModule::ApplyItemSet( sal_uInt16 nSlot, const
SfxItemSet& rSet )
}
if ( bMiscOptions )
{
- pDoc->SetSummationOfParagraphs(
pMiscItem->GetOptionsMisc().IsSummationOfParagraphs() );
+ pDoc->SetSummationOfParagraphs(
pMiscItem->GetOptionsMisc().IsSummationOfParagraphs() );
sal_uInt32 nSum =
pMiscItem->GetOptionsMisc().IsSummationOfParagraphs() ?
EE_CNTRL_ULSPACESUMMATION : 0;
sal_uInt32 nCntrl;
@@ -726,9 +722,9 @@ void SdModule::ApplyItemSet( sal_uInt16 nSlot, const
SfxItemSet& rSet )
pOutl->SetControlWord( nCntrl | nSum );
}
- // Set printer independent layout mode.
+ // Set printer independent layout mode.
if( pDoc->GetPrinterIndependentLayout() !=
pMiscItem->GetOptionsMisc().GetPrinterIndependentLayout() )
- pDoc->SetPrinterIndependentLayout
(pMiscItem->GetOptionsMisc().GetPrinterIndependentLayout());
+ pDoc->SetPrinterIndependentLayout
(pMiscItem->GetOptionsMisc().GetPrinterIndependentLayout());
}
}
diff --git a/main/sd/source/ui/app/sdpopup.cxx
b/main/sd/source/ui/app/sdpopup.cxx
index 50c9e6c..c20e0e0 100644
--- a/main/sd/source/ui/app/sdpopup.cxx
+++ b/main/sd/source/ui/app/sdpopup.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -42,9 +42,7 @@
#include "DrawDocShell.hxx"
/*************************************************************************
-|*
|* PopupMenu zum Bearbeiten von Feldbefehlen
-|*
\************************************************************************/
SdFieldPopup::SdFieldPopup( const SvxFieldData* pInField, LanguageType
eLanguage ) :
@@ -55,9 +53,7 @@ SdFieldPopup::SdFieldPopup( const SvxFieldData* pInField,
LanguageType eLanguage
}
/*************************************************************************
-|*
|* Dtor
-|*
\************************************************************************/
SdFieldPopup::~SdFieldPopup()
@@ -65,9 +61,7 @@ SdFieldPopup::~SdFieldPopup()
}
/*************************************************************************
-|*
|* Fill
-|*
\************************************************************************/
void SdFieldPopup::Fill( LanguageType eLanguage )
@@ -88,8 +82,8 @@ void SdFieldPopup::Fill( LanguageType eLanguage )
else
CheckItem( 2 );
- //SVXDATEFORMAT_APPDEFAULT, // Wird nicht benutzt
- //SVXDATEFORMAT_SYSTEM, // Wird nicht benutzt
+ //SVXDATEFORMAT_APPDEFAULT, // Wird nicht benutzt
+ //SVXDATEFORMAT_SYSTEM, // Wird nicht benutzt
InsertItem( nID++, String( SdResId( STR_STANDARD_SMALL ) ),
nStyle );
InsertItem( nID++, String( SdResId( STR_STANDARD_BIG ) ),
nStyle );
@@ -120,8 +114,8 @@ void SdFieldPopup::Fill( LanguageType eLanguage )
else
CheckItem( 2 );
- //SVXTIMEFORMAT_APPDEFAULT, // Wird nicht benutzt
- //SVXTIMEFORMAT_SYSTEM, // Wird nicht benutzt
+ //SVXTIMEFORMAT_APPDEFAULT, // Wird nicht benutzt
+ //SVXTIMEFORMAT_SYSTEM, // Wird nicht benutzt
InsertItem( nID++, String( SdResId( STR_STANDARD_NORMAL ) ),
nStyle );
SvNumberFormatter* pNumberFormatter =
SD_MOD()->GetNumberFormatter();
@@ -181,10 +175,8 @@ void SdFieldPopup::Fill( LanguageType eLanguage )
}
/*************************************************************************
-|*
|* Gibt das neue Feld zurueck, gehoert dem Caller.
|* Liefert NULL, wenn sich nichts geaendert hat.
-|*
\************************************************************************/
SvxFieldData* SdFieldPopup::GetField()
@@ -282,7 +274,7 @@ SvxFieldData* SdFieldPopup::GetField()
pFileField->GetType() != eType )
{
::sd::DrawDocShell* pDocSh =
PTR_CAST(::sd::DrawDocShell,
- SfxObjectShell::Current() );
+ SfxObjectShell::Current() );
if( pDocSh )
{
@@ -322,13 +314,11 @@ SvxFieldData* SdFieldPopup::GetField()
pAuthorField->GetType() != eType )
{
// #91225# Get current state of address, not the old one
- SvtUserOptions aUserOptions;
- pNewField = new SvxAuthorField( aUserOptions.GetFirstName(),
aUserOptions.GetLastName(), aUserOptions.GetID() );
+ SvtUserOptions aUserOptions;
+ pNewField = new SvxAuthorField(
aUserOptions.GetFirstName(), aUserOptions.GetLastName(), aUserOptions.GetID() );
( (SvxAuthorField*) pNewField )->SetType( eType );
( (SvxAuthorField*) pNewField )->SetFormat( eFormat );
}
}
return( pNewField );
}
-
-
