diff options
author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2015-05-20 13:05:49 +0200 |
---|---|---|
committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2015-05-20 13:05:49 +0200 |
commit | ab465b90f6c6da5595393a0ba73f33a1e71a2b65 (patch) | |
tree | 36b77192de2799a11b4bf0b269cb3f74d0a0bb1f /sd | |
parent | 0db96caf0fcce09b87621c11b584a6d81cc7df86 (diff) |
bin/rename-sw-abbreviations.shlibreoffice-5-0-branch-point
renames the most annoying abbreviations in Writer (and partially
in the shared code too).
Change-Id: I9a62759138126c1537cc5c985ba05cf54d6132d9
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/core/drawdoc4.cxx | 2 | ||||
-rw-r--r-- | sd/source/core/sdpage.cxx | 2 | ||||
-rw-r--r-- | sd/source/core/stlpool.cxx | 2 | ||||
-rw-r--r-- | sd/source/core/stlsheet.cxx | 8 | ||||
-rw-r--r-- | sd/source/filter/xml/sdtransform.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/app/optsitem.cxx | 84 | ||||
-rw-r--r-- | sd/source/ui/app/sdmod2.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/func/fuparagr.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/inc/DrawViewShell.hxx | 4 | ||||
-rw-r--r-- | sd/source/ui/inc/optsitem.hxx | 24 | ||||
-rw-r--r-- | sd/source/ui/view/drviews3.cxx | 30 | ||||
-rw-r--r-- | sd/source/ui/view/drviews7.cxx | 10 | ||||
-rw-r--r-- | sd/source/ui/view/frmview.cxx | 8 |
13 files changed, 92 insertions, 92 deletions
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx index 2b26fda54c1e..b9b4558adf4f 100644 --- a/sd/source/core/drawdoc4.cxx +++ b/sd/source/core/drawdoc4.cxx @@ -356,7 +356,7 @@ void SdDrawDocument::CreateLayoutTemplates() pISet->Put(XFillStyleItem(drawing::FillStyle_NONE)); SvxLRSpaceItem aLRSpaceItem( EE_PARA_LRSPACE ); - aLRSpaceItem.SetTxtFirstLineOfst(600); // Indentation of first line: 6mm; right: 0 + aLRSpaceItem.SetTextFirstLineOfst(600); // Indentation of first line: 6mm; right: 0 pISet->Put(aLRSpaceItem); // Title diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index 3c8e33b0958a..5a8de34029fe 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -2164,7 +2164,7 @@ SdrObject* convertPresentationObjectImpl(SdPage& rPage, SdrObject* pSourceObj, P const SvxLRSpaceItem& rLRItem = static_cast<const SvxLRSpaceItem&>( aSet.Get(EE_PARA_LRSPACE) ); SvxLRSpaceItem aNewLRItem(rLRItem); - aNewLRItem.SetTxtLeft(0); + aNewLRItem.SetTextLeft(0); aSet.Put(aNewLRItem); pNewObj->SetMergedItemSet(aSet); diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx index 944c77ebb2d3..f4eee3948da8 100644 --- a/sd/source/core/stlpool.cxx +++ b/sd/source/core/stlpool.cxx @@ -417,7 +417,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, bool rSubtitleSet.Put( SdrTextVertAdjustItem( SDRTEXTVERTADJUST_CENTER ) ); // #i16874# enable kerning by default but only for new documents rSubtitleSet.Put( SvxAutoKernItem( true, EE_CHAR_PAIRKERNING ) ); - aSvxLRSpaceItem.SetTxtLeft(0); + aSvxLRSpaceItem.SetTextLeft(0); rSubtitleSet.Put(aSvxLRSpaceItem); vcl::Font aTmpFont( GetBulletFont() ); diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx index 223f4c39e41d..a3b018cddec7 100644 --- a/sd/source/core/stlsheet.cxx +++ b/sd/source/core/stlsheet.cxx @@ -576,11 +576,11 @@ void SdStyleSheet::AdjustToFontHeight(SfxItemSet& rSet, bool bOnlyMissingItems) if (rSet.GetItemState(EE_PARA_LRSPACE) != SfxItemState::SET || !bOnlyMissingItems) { const SvxLRSpaceItem& rLRItem = static_cast<const SvxLRSpaceItem&>(pCurSet->Get(EE_PARA_LRSPACE)); - double fIndentFraction = double(rLRItem.GetTxtLeft()) / nOldHeight; + double fIndentFraction = double(rLRItem.GetTextLeft()) / nOldHeight; SvxLRSpaceItem aNewLRItem(rLRItem); - aNewLRItem.SetTxtLeft(fIndentFraction * nNewHeight); - double fFirstIndentFraction = double(rLRItem.GetTxtFirstLineOfst()) / nOldHeight; - aNewLRItem.SetTxtFirstLineOfst((short)(fFirstIndentFraction * nNewHeight)); + aNewLRItem.SetTextLeft(fIndentFraction * nNewHeight); + double fFirstIndentFraction = double(rLRItem.GetTextFirstLineOfst()) / nOldHeight; + aNewLRItem.SetTextFirstLineOfst((short)(fFirstIndentFraction * nNewHeight)); rSet.Put(aNewLRItem); } diff --git a/sd/source/filter/xml/sdtransform.cxx b/sd/source/filter/xml/sdtransform.cxx index fa6dd6c3a4cb..46a986dee476 100644 --- a/sd/source/filter/xml/sdtransform.cxx +++ b/sd/source/filter/xml/sdtransform.cxx @@ -299,10 +299,10 @@ bool SdTransformOOo2xDocument::transformItemSet( SfxItemSet& rSet, bool bNumberi if( bNumbering ) { SvxLRSpaceItem aItem( *static_cast<const SvxLRSpaceItem*>(rSet.GetItem( EE_PARA_LRSPACE )) ); - if( (aItem.GetLeft() != 0) || (aItem.GetTxtFirstLineOfst() != 0) ) + if( (aItem.GetLeft() != 0) || (aItem.GetTextFirstLineOfst() != 0) ) { aItem.SetLeftValue( 0 ); - aItem.SetTxtFirstLineOfst( 0 ); + aItem.SetTextFirstLineOfst( 0 ); rSet.Put( aItem ); bRet = true; } diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx index f16a6af69c9e..4e8ef7296313 100644 --- a/sd/source/ui/app/optsitem.cxx +++ b/sd/source/ui/app/optsitem.cxx @@ -992,12 +992,12 @@ void SdOptionsGrid::SetDefaults() { const sal_uInt32 nVal = 1000; - SetFldDivisionX( nVal ); - SetFldDivisionY( nVal ); - SetFldDrawX( nVal ); - SetFldDrawY( nVal ); - SetFldSnapX( nVal ); - SetFldSnapY( nVal ); + SetFieldDivisionX( nVal ); + SetFieldDivisionY( nVal ); + SetFieldDrawX( nVal ); + SetFieldDrawY( nVal ); + SetFieldSnapX( nVal ); + SetFieldSnapY( nVal ); SetUseGridSnap( false ); SetSynchronize( true ); SetGridVisible( false ); @@ -1006,12 +1006,12 @@ void SdOptionsGrid::SetDefaults() bool SdOptionsGrid::operator==( const SdOptionsGrid& rOpt ) const { - return( GetFldDrawX() == rOpt.GetFldDrawX() && - GetFldDivisionX() == rOpt.GetFldDivisionX() && - GetFldDrawY() == rOpt.GetFldDrawY() && - GetFldDivisionY() == rOpt.GetFldDivisionY() && - GetFldSnapX() == rOpt.GetFldSnapX() && - GetFldSnapY() == rOpt.GetFldSnapY() && + return( GetFieldDrawX() == rOpt.GetFieldDrawX() && + GetFieldDivisionX() == rOpt.GetFieldDivisionX() && + GetFieldDrawY() == rOpt.GetFieldDrawY() && + GetFieldDivisionY() == rOpt.GetFieldDivisionY() && + GetFieldSnapX() == rOpt.GetFieldSnapX() && + GetFieldSnapY() == rOpt.GetFieldSnapY() && IsUseGridSnap() == rOpt.IsUseGridSnap() && IsSynchronize() == rOpt.IsSynchronize() && IsGridVisible() == rOpt.IsGridVisible() && @@ -1060,23 +1060,23 @@ void SdOptionsGrid::GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) bool SdOptionsGrid::ReadData( const Any* pValues ) { - if( pValues[0].hasValue() ) SetFldDrawX( *static_cast<sal_Int32 const *>(pValues[ 0 ].getValue()) ); - if( pValues[1].hasValue() ) SetFldDrawY( *static_cast<sal_Int32 const *>(pValues[ 1 ].getValue()) ); + if( pValues[0].hasValue() ) SetFieldDrawX( *static_cast<sal_Int32 const *>(pValues[ 0 ].getValue()) ); + if( pValues[1].hasValue() ) SetFieldDrawY( *static_cast<sal_Int32 const *>(pValues[ 1 ].getValue()) ); if( pValues[2].hasValue() ) { const sal_uInt32 nDivX = FRound( *static_cast<double const *>(pValues[ 2 ].getValue()) ); - SetFldDivisionX( SvxOptionsGrid::GetFldDrawX() / ( nDivX + 1 ) ); + SetFieldDivisionX( SvxOptionsGrid::GetFieldDrawX() / ( nDivX + 1 ) ); } if( pValues[3].hasValue() ) { const sal_uInt32 nDivY = FRound( *static_cast<double const *>(pValues[ 3 ].getValue()) ); - SetFldDivisionY( SvxOptionsGrid::GetFldDrawY() / ( nDivY + 1 ) ); + SetFieldDivisionY( SvxOptionsGrid::GetFieldDrawY() / ( nDivY + 1 ) ); } - if( pValues[4].hasValue() ) SetFldSnapX( *static_cast<sal_Int32 const *>(pValues[ 4 ].getValue()) ); - if( pValues[5].hasValue() ) SetFldSnapY( *static_cast<sal_Int32 const *>(pValues[ 5 ].getValue()) ); + if( pValues[4].hasValue() ) SetFieldSnapX( *static_cast<sal_Int32 const *>(pValues[ 4 ].getValue()) ); + if( pValues[5].hasValue() ) SetFieldSnapY( *static_cast<sal_Int32 const *>(pValues[ 5 ].getValue()) ); if( pValues[6].hasValue() ) SetUseGridSnap( *static_cast<sal_Bool const *>(pValues[ 6 ].getValue()) ); if( pValues[7].hasValue() ) SetSynchronize( *static_cast<sal_Bool const *>(pValues[ 7 ].getValue()) ); if( pValues[8].hasValue() ) SetGridVisible( *static_cast<sal_Bool const *>(pValues[ 8 ].getValue()) ); @@ -1087,12 +1087,12 @@ bool SdOptionsGrid::ReadData( const Any* pValues ) bool SdOptionsGrid::WriteData( Any* pValues ) const { - 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[ 0 ] <<= (sal_Int32) GetFieldDrawX(); + pValues[ 1 ] <<= (sal_Int32) GetFieldDrawY(); + pValues[ 2 ] <<= ( GetFieldDivisionX() ? ( (double) GetFieldDrawX() / GetFieldDivisionX() - 1.0 ) : (double) 0 ); + pValues[ 3 ] <<= ( GetFieldDivisionY() ? ( (double) GetFieldDrawY() / GetFieldDivisionY() - 1.0 ) : (double) 0 ); + pValues[ 4 ] <<= (sal_Int32) GetFieldSnapX(); + pValues[ 5 ] <<= (sal_Int32) GetFieldSnapY(); pValues[ 6 ] <<= IsUseGridSnap(); pValues[ 7 ] <<= IsSynchronize(); pValues[ 8 ] <<= IsGridVisible(); @@ -1115,23 +1115,23 @@ SdOptionsGridItem::SdOptionsGridItem( sal_uInt16 _nWhich, SdOptions* pOpts, ::sd if( pView ) { - SetFldDrawX( pView->GetGridCoarse().Width() ); - SetFldDrawY( pView->GetGridCoarse().Height() ); - SetFldDivisionX( pView->GetGridFine().Width() ? ( GetFldDrawX() / pView->GetGridFine().Width() - 1 ) : 0 ); - SetFldDivisionY( pView->GetGridFine().Height() ? ( GetFldDrawY() / pView->GetGridFine().Height() - 1 ) : 0 ); - SetFldSnapX( long(pView->GetSnapGridWidthX()) ); - SetFldSnapY( long(pView->GetSnapGridWidthY()) ); + SetFieldDrawX( pView->GetGridCoarse().Width() ); + SetFieldDrawY( pView->GetGridCoarse().Height() ); + SetFieldDivisionX( pView->GetGridFine().Width() ? ( GetFieldDrawX() / pView->GetGridFine().Width() - 1 ) : 0 ); + SetFieldDivisionY( pView->GetGridFine().Height() ? ( GetFieldDrawY() / pView->GetGridFine().Height() - 1 ) : 0 ); + SetFieldSnapX( long(pView->GetSnapGridWidthX()) ); + SetFieldSnapY( long(pView->GetSnapGridWidthY()) ); SetUseGridSnap( pView->IsGridSnap() ); SetGridVisible( pView->IsGridVisible() ); } else { - SetFldDrawX( pOpts->GetFldDrawX() ); - SetFldDrawY( pOpts->GetFldDrawY() ); - SetFldDivisionX( pOpts->GetFldDivisionX() ? ( pOpts->GetFldDrawX() / pOpts->GetFldDivisionX() - 1 ) : 0 ); - SetFldDivisionY( pOpts->GetFldDivisionY() ? ( pOpts->GetFldDrawY() / pOpts->GetFldDivisionY() - 1 ) : 0 ); - SetFldSnapX( pOpts->GetFldSnapX() ); - SetFldSnapY( pOpts->GetFldSnapY() ); + SetFieldDrawX( pOpts->GetFieldDrawX() ); + SetFieldDrawY( pOpts->GetFieldDrawY() ); + SetFieldDivisionX( pOpts->GetFieldDivisionX() ? ( pOpts->GetFieldDrawX() / pOpts->GetFieldDivisionX() - 1 ) : 0 ); + SetFieldDivisionY( pOpts->GetFieldDivisionY() ? ( pOpts->GetFieldDrawY() / pOpts->GetFieldDivisionY() - 1 ) : 0 ); + SetFieldSnapX( pOpts->GetFieldSnapX() ); + SetFieldSnapY( pOpts->GetFieldSnapY() ); SetUseGridSnap( pOpts->IsUseGridSnap() ); SetGridVisible( pOpts->IsGridVisible() ); } @@ -1139,12 +1139,12 @@ SdOptionsGridItem::SdOptionsGridItem( sal_uInt16 _nWhich, SdOptions* pOpts, ::sd void SdOptionsGridItem::SetOptions( SdOptions* pOpts ) const { - pOpts->SetFldDrawX( GetFldDrawX() ); - pOpts->SetFldDivisionX( GetFldDrawX() / ( GetFldDivisionX() + 1 ) ); - pOpts->SetFldDrawY( GetFldDrawY() ); - pOpts->SetFldDivisionY( GetFldDrawY() / ( GetFldDivisionY() + 1 ) ); - pOpts->SetFldSnapX( GetFldSnapX() ); - pOpts->SetFldSnapY( GetFldSnapY() ); + pOpts->SetFieldDrawX( GetFieldDrawX() ); + pOpts->SetFieldDivisionX( GetFieldDrawX() / ( GetFieldDivisionX() + 1 ) ); + pOpts->SetFieldDrawY( GetFieldDrawY() ); + pOpts->SetFieldDivisionY( GetFieldDrawY() / ( GetFieldDivisionY() + 1 ) ); + pOpts->SetFieldSnapX( GetFieldSnapX() ); + pOpts->SetFieldSnapY( GetFieldSnapY() ); pOpts->SetUseGridSnap( GetUseGridSnap() ); pOpts->SetSynchronize( GetSynchronize() ); pOpts->SetGridVisible( GetGridVisible() ); diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx index a817f5ed2767..da621f689b55 100644 --- a/sd/source/ui/app/sdmod2.cxx +++ b/sd/source/ui/app/sdmod2.cxx @@ -334,11 +334,11 @@ IMPL_LINK(SdModule, CalcFieldValueHdl, EditFieldInfo*, pInfo) svtools::ColorConfig aConfig; svtools::ColorConfigEntry eEntry = INetURLHistory::GetOrCreate()->QueryUrl( aURL ) ? svtools::LINKSVISITED : svtools::LINKS; - pInfo->SetTxtColor( aConfig.GetColorValue(eEntry).nColor ); + pInfo->SetTextColor( aConfig.GetColorValue(eEntry).nColor ); } else if ( dynamic_cast< const SdrMeasureField* >(pField)) { - pInfo->ClearFldColor(); + pInfo->ClearFieldColor(); } else { diff --git a/sd/source/ui/func/fuparagr.cxx b/sd/source/ui/func/fuparagr.cxx index 7d1393ac2108..fc4031d03d8b 100644 --- a/sd/source/ui/func/fuparagr.cxx +++ b/sd/source/ui/func/fuparagr.cxx @@ -78,7 +78,7 @@ void FuParagraph::DoExecute( SfxRequest& rReq ) aNewAttr.Put( aEditAttr ); // left border is offset - const long nOff = static_cast<const SvxLRSpaceItem&>(aNewAttr.Get( EE_PARA_LRSPACE ) ).GetTxtLeft(); + const long nOff = static_cast<const SvxLRSpaceItem&>(aNewAttr.Get( EE_PARA_LRSPACE ) ).GetTextLeft(); // conversion since TabulatorTabPage always uses Twips! SfxInt32Item aOff( SID_ATTR_TABSTOP_OFFSET, nOff ); aNewAttr.Put( aOff ); diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx index 73f17fb8577e..405e7af90876 100644 --- a/sd/source/ui/inc/DrawViewShell.hxx +++ b/sd/source/ui/inc/DrawViewShell.hxx @@ -42,7 +42,7 @@ class TransferableDataHelper; class TransferableClipboardListener; class AbstractSvxNameDialog; class SdrLayer; -class SvxClipboardFmtItem; +class SvxClipboardFormatItem; struct ESelection; namespace sd { @@ -431,7 +431,7 @@ private: content that are supported both by that content and by the DrawViewShell. */ - ::std::unique_ptr<SvxClipboardFmtItem> mpCurrentClipboardFormats; + ::std::unique_ptr<SvxClipboardFormatItem> mpCurrentClipboardFormats; /** On some occasions it is necessary to make SwitchPage calls asynchronously. diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx index f2bb07312507..4e13f9725fe0 100644 --- a/sd/source/ui/inc/optsitem.hxx +++ b/sd/source/ui/inc/optsitem.hxx @@ -456,23 +456,23 @@ public: void SetDefaults(); bool operator==( const SdOptionsGrid& rOpt ) const; - sal_uInt32 GetFldDrawX() const { Init(); return SvxOptionsGrid::GetFldDrawX(); } - sal_uInt32 GetFldDivisionX() const { Init(); return SvxOptionsGrid::GetFldDivisionX(); } - sal_uInt32 GetFldDrawY() const { Init(); return SvxOptionsGrid::GetFldDrawY(); } - sal_uInt32 GetFldDivisionY() const { Init(); return SvxOptionsGrid::GetFldDivisionY(); } - sal_uInt32 GetFldSnapX() const { Init(); return SvxOptionsGrid::GetFldSnapX(); } - sal_uInt32 GetFldSnapY() const { Init(); return SvxOptionsGrid::GetFldSnapY(); } + sal_uInt32 GetFieldDrawX() const { Init(); return SvxOptionsGrid::GetFieldDrawX(); } + sal_uInt32 GetFieldDivisionX() const { Init(); return SvxOptionsGrid::GetFieldDivisionX(); } + sal_uInt32 GetFieldDrawY() const { Init(); return SvxOptionsGrid::GetFieldDrawY(); } + sal_uInt32 GetFieldDivisionY() const { Init(); return SvxOptionsGrid::GetFieldDivisionY(); } + sal_uInt32 GetFieldSnapX() const { Init(); return SvxOptionsGrid::GetFieldSnapX(); } + sal_uInt32 GetFieldSnapY() const { Init(); return SvxOptionsGrid::GetFieldSnapY(); } bool IsUseGridSnap() const { Init(); return SvxOptionsGrid::GetUseGridSnap(); } bool IsSynchronize() const { Init(); return SvxOptionsGrid::GetSynchronize(); } bool IsGridVisible() const { Init(); return SvxOptionsGrid::GetGridVisible(); } bool IsEqualGrid() const { Init(); return SvxOptionsGrid::GetEqualGrid(); } - void SetFldDrawX( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFldDrawX() ) { OptionsChanged(); SvxOptionsGrid::SetFldDrawX( nSet ); } } - void SetFldDivisionX( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFldDivisionX() ) { OptionsChanged(); SvxOptionsGrid::SetFldDivisionX( nSet ); } } - void SetFldDrawY( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFldDrawY() ) { OptionsChanged(); SvxOptionsGrid::SetFldDrawY( nSet ); } } - void SetFldDivisionY( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFldDivisionY() ) { OptionsChanged(); SvxOptionsGrid::SetFldDivisionY( nSet ); } } - void SetFldSnapX( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFldSnapX() ) { OptionsChanged(); SvxOptionsGrid::SetFldSnapX( nSet ); } } - void SetFldSnapY( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFldSnapY() ) { OptionsChanged(); SvxOptionsGrid::SetFldSnapY( nSet ); } } + void SetFieldDrawX( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFieldDrawX() ) { OptionsChanged(); SvxOptionsGrid::SetFieldDrawX( nSet ); } } + void SetFieldDivisionX( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFieldDivisionX() ) { OptionsChanged(); SvxOptionsGrid::SetFieldDivisionX( nSet ); } } + void SetFieldDrawY( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFieldDrawY() ) { OptionsChanged(); SvxOptionsGrid::SetFieldDrawY( nSet ); } } + void SetFieldDivisionY( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFieldDivisionY() ) { OptionsChanged(); SvxOptionsGrid::SetFieldDivisionY( nSet ); } } + void SetFieldSnapX( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFieldSnapX() ) { OptionsChanged(); SvxOptionsGrid::SetFieldSnapX( nSet ); } } + void SetFieldSnapY( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFieldSnapY() ) { OptionsChanged(); SvxOptionsGrid::SetFieldSnapY( nSet ); } } void SetUseGridSnap( bool bSet ) { if( bSet != SvxOptionsGrid::GetUseGridSnap() ) { OptionsChanged(); SvxOptionsGrid::SetUseGridSnap( bSet ); } } void SetSynchronize( bool bSet ) { if( bSet != SvxOptionsGrid::GetSynchronize() ) { OptionsChanged(); SvxOptionsGrid::SetSynchronize( bSet ); } } void SetGridVisible( bool bSet ) { if( bSet != SvxOptionsGrid::GetGridVisible() ) { OptionsChanged(); SvxOptionsGrid::SetGridVisible( bSet ); } } diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx index ac9ecbca1f6a..22ca54640576 100644 --- a/sd/source/ui/view/drviews3.cxx +++ b/sd/source/ui/view/drviews3.cxx @@ -782,8 +782,8 @@ void DrawViewShell::ExecRuler(SfxRequest& rReq) nId = EE_PARA_LRSPACE; SvxLRSpaceItem aLRSpaceItem( rItem.GetLeft(), - rItem.GetRight(), rItem.GetTxtLeft(), - rItem.GetTxtFirstLineOfst(), nId ); + rItem.GetRight(), rItem.GetTextLeft(), + rItem.GetTextFirstLineOfst(), nId ); const sal_Int16 nOutlineLevel = static_cast<const SfxInt16Item&>(aEditAttr.Get( EE_PARA_OUTLLEVEL )).GetValue(); const SvxLRSpaceItem& rOrigLRSpaceItem = static_cast<const SvxLRSpaceItem&>( aEditAttr.Get( EE_PARA_LRSPACE )); @@ -801,28 +801,28 @@ void DrawViewShell::ExecRuler(SfxRequest& rReq) // become negative - EditEngine really does not // like that. const short nAbsLSpace=aFormat.GetAbsLSpace(); - const long nTxtLeft=rItem.GetTxtLeft(); + const long nTxtLeft=rItem.GetTextLeft(); const long nLeftIndent=std::max(0L,nTxtLeft - nAbsLSpace); - aLRSpaceItem.SetTxtLeft(nLeftIndent); + aLRSpaceItem.SetTextLeft(nLeftIndent); // control for clipped left indent - remainder // reduces number format first line indent aFormat.SetAbsLSpace(nTxtLeft - nLeftIndent); // negative first line indent goes to the number // format, positive to the lrSpace item - if( rItem.GetTxtFirstLineOfst() < 0 ) + if( rItem.GetTextFirstLineOfst() < 0 ) { aFormat.SetFirstLineOffset( - rItem.GetTxtFirstLineOfst() - - rOrigLRSpaceItem.GetTxtFirstLineOfst() + rItem.GetTextFirstLineOfst() + - rOrigLRSpaceItem.GetTextFirstLineOfst() + aFormat.GetCharTextDistance()); - aLRSpaceItem.SetTxtFirstLineOfst(0); + aLRSpaceItem.SetTextFirstLineOfst(0); } else { aFormat.SetFirstLineOffset(0); - aLRSpaceItem.SetTxtFirstLineOfst( - rItem.GetTxtFirstLineOfst() + aLRSpaceItem.SetTextFirstLineOfst( + rItem.GetTextFirstLineOfst() - aFormat.GetFirstLineOffset() + aFormat.GetCharTextDistance()); } @@ -916,8 +916,8 @@ void DrawViewShell::GetRulerState(SfxItemSet& rSet) const SvxLRSpaceItem& rLRSpaceItem = static_cast<const SvxLRSpaceItem&>( aEditAttr.Get( EE_PARA_LRSPACE ) ); sal_uInt16 nId = SID_ATTR_PARA_LRSPACE; SvxLRSpaceItem aLRSpaceItem( rLRSpaceItem.GetLeft(), - rLRSpaceItem.GetRight(), rLRSpaceItem.GetTxtLeft(), - rLRSpaceItem.GetTxtFirstLineOfst(), nId ); + rLRSpaceItem.GetRight(), rLRSpaceItem.GetTextLeft(), + rLRSpaceItem.GetTextFirstLineOfst(), nId ); const sal_Int16 nOutlineLevel = static_cast<const SfxInt16Item&>( aEditAttr.Get( EE_PARA_OUTLLEVEL )).GetValue(); const SvxNumBulletItem& rNumBulletItem = static_cast<const SvxNumBulletItem&>( aEditAttr.Get( EE_PARA_NUMBULLET ) ); @@ -926,9 +926,9 @@ void DrawViewShell::GetRulerState(SfxItemSet& rSet) rNumBulletItem.GetNumRule()->GetLevelCount() > nOutlineLevel ) { const SvxNumberFormat& rFormat = rNumBulletItem.GetNumRule()->GetLevel(nOutlineLevel); - aLRSpaceItem.SetTxtLeft(rFormat.GetAbsLSpace() + rLRSpaceItem.GetTxtLeft()); - aLRSpaceItem.SetTxtFirstLineOfst( - rLRSpaceItem.GetTxtFirstLineOfst() + rFormat.GetFirstLineOffset() + aLRSpaceItem.SetTextLeft(rFormat.GetAbsLSpace() + rLRSpaceItem.GetTextLeft()); + aLRSpaceItem.SetTextFirstLineOfst( + rLRSpaceItem.GetTextFirstLineOfst() + rFormat.GetFirstLineOffset() - rFormat.GetCharTextDistance()); } diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx index 183b09808415..8b6d968a3bcb 100644 --- a/sd/source/ui/view/drviews7.cxx +++ b/sd/source/ui/view/drviews7.cxx @@ -93,13 +93,13 @@ using namespace ::com::sun::star::linguistic2; /** Create a list of clipboard formats that are supported both from the current clipboard content and the DrawViewShell. - The list is stored in a new instance of SvxClipboardFmtItem. + The list is stored in a new instance of SvxClipboardFormatItem. */ -::std::unique_ptr<SvxClipboardFmtItem> GetSupportedClipboardFormats ( +::std::unique_ptr<SvxClipboardFormatItem> GetSupportedClipboardFormats ( TransferableDataHelper& rDataHelper) { - ::std::unique_ptr<SvxClipboardFmtItem> pResult ( - new SvxClipboardFmtItem(SID_CLIPBOARD_FORMAT_ITEMS)); + ::std::unique_ptr<SvxClipboardFormatItem> pResult ( + new SvxClipboardFormatItem(SID_CLIPBOARD_FORMAT_ITEMS)); sal_uInt32 nFormatCount (rDataHelper.GetFormatCount()); for (sal_uInt32 i=0; i<nFormatCount; i++) @@ -193,7 +193,7 @@ IMPL_LINK( DrawViewShell, ClipboardChanged, TransferableDataHelper*, pDataHelper // exit immediately. TransferableDataHelper aDataHelper ( TransferableDataHelper::CreateFromSystemClipboard(GetActiveWindow())); - ::std::unique_ptr<SvxClipboardFmtItem> pFormats (GetSupportedClipboardFormats(aDataHelper)); + ::std::unique_ptr<SvxClipboardFormatItem> pFormats (GetSupportedClipboardFormats(aDataHelper)); if (mpDrawView == NULL) return 0; mpCurrentClipboardFormats = std::move(pFormats); diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx index 44338eb2763d..329fa9cff449 100644 --- a/sd/source/ui/view/frmview.cxx +++ b/sd/source/ui/view/frmview.cxx @@ -298,10 +298,10 @@ void FrameView::Update(SdOptions* pOptions) SetSolidDragging( pOptions->IsSolidDragging() ); - SetGridCoarse( Size( pOptions->GetFldDrawX(), pOptions->GetFldDrawY() ) ); - SetGridFine( Size( pOptions->GetFldDivisionX(), pOptions->GetFldDivisionY() ) ); - Fraction aFractX(pOptions->GetFldDrawX(), pOptions->GetFldDrawX() / ( pOptions->GetFldDivisionX() ? pOptions->GetFldDivisionX() : 1 )); - Fraction aFractY(pOptions->GetFldDrawY(), pOptions->GetFldDrawY() / ( pOptions->GetFldDivisionY() ? pOptions->GetFldDivisionY() : 1 )); + SetGridCoarse( Size( pOptions->GetFieldDrawX(), pOptions->GetFieldDrawY() ) ); + SetGridFine( Size( pOptions->GetFieldDivisionX(), pOptions->GetFieldDivisionY() ) ); + Fraction aFractX(pOptions->GetFieldDrawX(), pOptions->GetFieldDrawX() / ( pOptions->GetFieldDivisionX() ? pOptions->GetFieldDivisionX() : 1 )); + Fraction aFractY(pOptions->GetFieldDrawY(), pOptions->GetFieldDrawY() / ( pOptions->GetFieldDivisionY() ? pOptions->GetFieldDivisionY() : 1 )); SetSnapGridWidth(aFractX, aFractY); SetQuickEdit(pOptions->IsQuickEdit()); |