diff options
| author | Samuel Mehrbrodt <s.mehrbrodt@gmail.com> | 2013-07-27 15:11:32 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-07-29 13:05:56 +0000 |
| commit | 4e3f7d32b80fcb44f20abe634a2035d2c90c9e08 (patch) | |
| tree | 3fe76a82fb73584a6ea96e0f7905edc939a21ed9 /cui/source/tabpages/numpages.cxx | |
| parent | 15dc66c81a5a0af8db52a98e51e289f8f134d8c4 (diff) | |
fdo#67274 Always embed images from gallery
This patch removes the options to link images from the gallery.
Users should never link to the gallery. The links wouldn't work anymore if you just change the operating system, because the gallery is on a different place.
Changes:
* Removed option in "Bullets and Numbering" dialog to link graphical bullets
* Change the Gallery image context menu.
Before:
Insert
Copy
Link
Background
Page
Paragraph
...
Now:
Insert
Insert as Background
Page
Paragraph
...
Change-Id: I699042a7d7a27369775f9ee4c14c4a6964489a92
Reviewed-on: https://gerrit.libreoffice.org/5141
Reviewed-by: Luboš Luňák <l.lunak@suse.cz>
Tested-by: Luboš Luňák <l.lunak@suse.cz>
Diffstat (limited to 'cui/source/tabpages/numpages.cxx')
| -rw-r--r-- | cui/source/tabpages/numpages.cxx | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 2f879e45ad31..75aca2e95ab0 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -792,11 +792,9 @@ SvxBitmapPickTabPage::SvxBitmapPickTabPage(Window* pParent, { SetExchangeSupport(); get(m_pErrorText, "errorft"); - get(m_pLinkedCB, "linkgraphics"); get(m_pExamplesVS, "valueset"); m_pExamplesVS->SetSelectHdl(LINK(this, SvxBitmapPickTabPage, NumSelectHdl_Impl)); m_pExamplesVS->SetDoubleClickHdl(LINK(this, SvxBitmapPickTabPage, DoubleClickHdl_Impl)); - m_pLinkedCB->SetClickHdl(LINK(this, SvxBitmapPickTabPage, LinkBmpHdl_Impl)); eCoreUnit = rSet.GetPool()->GetMetric(rSet.GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE)); @@ -921,16 +919,6 @@ void SvxBitmapPickTabPage::Reset( const SfxItemSet& rSet ) pActNum = new SvxNumRule(*pSaveNum); else if(*pSaveNum != *pActNum) *pActNum = *pSaveNum; - if(!pActNum->IsFeatureSupported(NUM_ENABLE_LINKED_BMP)) - { - m_pLinkedCB->Check(sal_False); - m_pLinkedCB->Enable(sal_False); - } - else if(!pActNum->IsFeatureSupported(NUM_ENABLE_EMBEDDED_BMP)) - { - m_pLinkedCB->Check(sal_True); - m_pLinkedCB->Enable(sal_False); - } } IMPL_LINK_NOARG(SvxBitmapPickTabPage, NumSelectHdl_Impl) @@ -944,8 +932,6 @@ IMPL_LINK_NOARG(SvxBitmapPickTabPage, NumSelectHdl_Impl) sal_uInt16 nMask = 1; String aEmptyStr; sal_uInt16 nSetNumberingType = SVX_NUM_BITMAP; - if(m_pLinkedCB->IsChecked()) - nSetNumberingType |= LINK_TOKEN; for(sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++) { if(nActNumLvl & nMask) @@ -984,15 +970,6 @@ IMPL_LINK_NOARG(SvxBitmapPickTabPage, DoubleClickHdl_Impl) return 0; } -IMPL_LINK_NOARG(SvxBitmapPickTabPage, LinkBmpHdl_Impl) -{ - if(!m_pExamplesVS->IsNoSelection()) - { - NumSelectHdl_Impl(m_pExamplesVS); - } - return 0; -} - // static void SvxNumOptionsTabPage::GetI18nNumbering( ListBox& rFmtLB, sal_uInt16 nDoNotRemove ) { |
