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 /sc/source/ui/view/cellsh.cxx | |
| parent | 0db96caf0fcce09b87621c11b584a6d81cc7df86 (diff) | |
bin/rename-sw-abbreviations.sh
libreoffice-5-0-branch-point
renames the most annoying abbreviations in Writer (and partially
in the shared code too).
Change-Id: I9a62759138126c1537cc5c985ba05cf54d6132d9
Diffstat (limited to 'sc/source/ui/view/cellsh.cxx')
| -rw-r--r-- | sc/source/ui/view/cellsh.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx index b8627ba945c1..aba13687fb3f 100644 --- a/sc/source/ui/view/cellsh.cxx +++ b/sc/source/ui/view/cellsh.cxx @@ -365,7 +365,7 @@ void ScCellShell::GetCellState( SfxItemSet& rSet ) } } -static bool lcl_TestFormat( SvxClipboardFmtItem& rFormats, const TransferableDataHelper& rDataHelper, +static bool lcl_TestFormat( SvxClipboardFormatItem& rFormats, const TransferableDataHelper& rDataHelper, SotClipboardFormatId nFormatId ) { if ( rDataHelper.HasFormat( nFormatId ) ) @@ -399,7 +399,7 @@ static bool lcl_TestFormat( SvxClipboardFmtItem& rFormats, const TransferableDat return false; } -void ScCellShell::GetPossibleClipboardFormats( SvxClipboardFmtItem& rFormats ) +void ScCellShell::GetPossibleClipboardFormats( SvxClipboardFormatItem& rFormats ) { vcl::Window* pWin = GetViewData()->GetActiveWin(); bool bDraw = ( ScDrawTransferObj::GetOwnClipboard( pWin ) != NULL ); @@ -569,7 +569,7 @@ void ScCellShell::GetClipState( SfxItemSet& rSet ) } else if ( rSet.GetItemState( SID_CLIPBOARD_FORMAT_ITEMS ) != SfxItemState::UNKNOWN ) { - SvxClipboardFmtItem aFormats( SID_CLIPBOARD_FORMAT_ITEMS ); + SvxClipboardFormatItem aFormats( SID_CLIPBOARD_FORMAT_ITEMS ); GetPossibleClipboardFormats( aFormats ); rSet.Put( aFormats ); } |