diff options
author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-25 21:01:20 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-27 09:41:00 -0600 |
commit | a27462189d1d6a3d22be23a5eee603edca5d8ea3 (patch) | |
tree | 065df066de07f3d7194178352f3449702bc34bd5 /sw/source/ui/config/optpage.cxx | |
parent | 150420cbff39967e9376cab05b6af45b642edae8 (diff) |
Remove visual noise from sw
Conflicts:
sw/inc/unodraw.hxx
sw/inc/unoframe.hxx
sw/sdi/swriter.sdi
sw/source/core/unocore/unoframe.cxx
sw/source/core/unocore/unoparagraph.cxx
sw/source/filter/ww8/rtfexportfilter.cxx
sw/source/ui/inc/unotxvw.hxx
sw/source/ui/lingu/hyp.cxx
sw/source/ui/lingu/sdrhhcwrap.cxx
sw/source/ui/uno/swdetect.hxx
Change-Id: Ic0a3fb2392187c277c9b36915ffb10dcf0317908
Reviewed-on: https://gerrit.libreoffice.org/8322
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/source/ui/config/optpage.cxx')
-rw-r--r-- | sw/source/ui/config/optpage.cxx | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index 4b4340d66076..cd88ff2ed640 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -66,7 +66,6 @@ #include <vcl/settings.hxx> #include <vcl/svapp.hxx> - using namespace ::com::sun::star; /*-------------------------------------------------------- @@ -235,7 +234,6 @@ sal_Bool SwContentOptPage::FillItemSet(SfxItemSet& rSet) aElem.bVertRulerRight = m_pVRulerRightCBox->IsChecked(); aElem.bSmoothScroll = m_pSmoothCBox->IsChecked(); - sal_Bool bRet = !pOldAttr || aElem != *pOldAttr; if(bRet) bRet = 0 != rSet.Put(aElem); @@ -885,7 +883,6 @@ void SwStdFontTabPage::Reset( const SfxItemSet& rSet) nListHeight = (sal_Int32)rFontHeightList.GetHeight(); bListHeightDefault = SFX_ITEM_DEFAULT == pColl->GetAttrSet().GetItemState(nFontWhich, false); - pColl = pWrtShell->GetTxtCollFromPool(RES_POOLCOLL_LABEL); bLabelDefault = SFX_ITEM_DEFAULT == pColl->GetAttrSet().GetItemState(nFontWhich, false); const SvxFontItem& rFontCP = !nFontGroup ? pColl->GetFont() : @@ -1056,7 +1053,6 @@ IMPL_LINK( SwStdFontTabPage, LoseFocusHdl, ComboBox*, pBox ) return 0; } - void SwStdFontTabPage::PageCreated (SfxAllItemSet aSet) { SFX_ITEMSET_ARG (&aSet,pFlagItem,SfxUInt16Item, SID_FONTMODE_TYPE, false); @@ -1333,7 +1329,6 @@ SfxTabPage* SwShdwCrsrOptionsTabPage::Create( Window* pParent, const SfxItemSet& return new SwShdwCrsrOptionsTabPage( pParent, rSet ); } - void SwShdwCrsrOptionsTabPage::PageCreated( SfxAllItemSet aSet ) { SFX_ITEMSET_ARG (&aSet,pWrtSh,SwWrtShellItem,SID_WRT_SHELL,false); @@ -1341,7 +1336,6 @@ void SwShdwCrsrOptionsTabPage::PageCreated( SfxAllItemSet aSet ) SetWrtShell(pWrtSh->GetValue()); } - sal_Bool SwShdwCrsrOptionsTabPage::FillItemSet( SfxItemSet& rSet ) { SwShadowCursorItem aOpt; @@ -2221,8 +2215,6 @@ void SwRedlineOptionsTabPage::InitFontStyle(SvxFontPrevWindow& rExampleWin) rExampleWin.Invalidate(); } - - SwCompareOptionsTabPage::SwCompareOptionsTabPage( Window* pParent, const SfxItemSet& rSet ) : SfxTabPage( pParent,"OptComparison","modules/swriter/ui/optcomparison.ui", rSet ) { @@ -2441,9 +2433,6 @@ IMPL_LINK_NOARG_INLINE_START(SwTestTabPage, AutoClickHdl) } IMPL_LINK_NOARG_INLINE_END(SwTestTabPage, AutoClickHdl) - #endif - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |